diff --git a/lib/Makefile b/lib/Makefile
deleted file mode 100644
index d40edd1da..000000000
--- a/lib/Makefile
+++ /dev/null
@@ -1,338 +0,0 @@
-#	$NetBSD: Makefile,v 1.235 2015/09/28 17:12:12 christos Exp $
-#	from: @(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
-
-.include <bsd.own.mk>
-
-SUBDIR=		csu .WAIT
-
-.if (${MKGCC} != "no")
-SUBDIR+=	../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libgcc .WAIT
-.endif
-
-.if defined(__MINIX)
-#LSC MINIX libc depends on
-# - libmthread because of sys/lib/libunwind
-SUBDIR+=	.WAIT
-
-SUBDIR+=	../minix/lib/libsys
-SUBDIR+=	../minix/lib/libmthread
-SUBDIR+=	.WAIT
-.endif # defined(__MINIX)
-SUBDIR+=	libc
-SUBDIR+=	.WAIT
-
-.if defined(__MINIX)
-SUBDIR+=	../minix/lib/libasyn \
-		../minix/lib/libaudiodriver \
-		../minix/lib/libbdev \
-		../minix/lib/libblockdriver \
-		../minix/lib/libchardriver \
-		../minix/lib/libddekit \
-		../minix/lib/libdevman \
-		../minix/lib/libexec \
-		../minix/lib/libfsdriver \
-		../minix/lib/libinputdriver \
-		../minix/lib/liblwip \
-		../minix/lib/libminc \
-		../minix/lib/libminixfs \
-		../minix/lib/libnetdriver \
-		../minix/lib/libsffs \
-		../minix/lib/libsockdriver \
-		../minix/lib/libsockevent \
-		../minix/lib/libtimers \
-		../minix/lib/libusb \
-		../minix/lib/libvtreefs
-
-.if (${HAVE_LIBGCC} == "no")
-SUBDIR+=	../minix/lib/libgcc_s_empty
-.endif
-
-.if (${MACHINE_ARCH} == "i386")
-SUBDIR+=	../minix/lib/libacpi \
-		../minix/lib/libhgfs \
-		../minix/lib/libvassert \
-		../minix/lib/libvboxfs \
-		../minix/lib/libvirtio
-.endif
-
-.if (${MACHINE_ARCH} == "earm")
-SUBDIR+=	../minix/lib/libclkconf \
-		../minix/lib/libgpio \
-		../minix/lib/libi2cdriver
-.endif
-
-.if (${MKMAGIC} == "yes")
-SUBDIR+=	../minix/lib/libmagicrt
-.endif
-
-.endif # defined(__MINIX)
-#
-# The SUBDIRs above are included here for completeness but should be built
-# and installed prior to make(dependall) in this file, as libraries listed
-# below will depend on versions from DESTDIR only.
-#
-
-SUBDIR+=	i18n_module
-
-SUBDIR+=	\
-		libbz2 \
-		libcrypt \
-		libintl libkvm libm \
-		libpci libprop \
-		libpuffs librmt \
-		libtelnet libterminfo \
-		libutil libwrap libz
-
-.if !defined(BSD_MK_COMPAT_FILE)
-#SUBDIR+=	libkern
-.endif
-
-.if (${MACHINE_CPU} == "arm" || ${MACHINE_CPU} == "aarch64")
-LIBC_MACHINE_ARCH?=${MACHINE_ARCH}
-LIBC_MACHINE_CPU?=${MACHINE_CPU}
-.if ${LIBC_MACHINE_CPU} == "arm" && empty(LIBC_MACHINE_ARCH:M*hf*)
-.if !defined(__MINIX)
-SUBDIR+=	libc_vfp
-.endif # !defined(__MINIX)
-.endif
-.endif
-.if (${MKRUMP} != "no")
-SUBDIR+=	librumpclient
-.endif
-.if (${MKSKEY} != "no")
-SUBDIR+=	libskey
-.endif
-
-.if (${MKMDNS} != "no")
-SUBDIR+=	../external/apache2/mDNSResponder/lib
-.endif
-
-#SUBDIR+=	../external/bsd/am-utils/lib
-SUBDIR+=	../external/bsd/blacklist/lib
-
-SUBDIR+=	../external/bsd/flex/lib
-#SUBDIR+=	../external/bsd/tre/lib
-SUBDIR+=	../external/bsd/elftoolchain/lib/libelf
-#SUBDIR+=	../external/bsd/liblzf/lib
-SUBDIR+=	../external/bsd/libpcap/lib
-
-.if ${MKSLJIT} != "no"
-SUBDIR+=	../external/bsd/sljit/lib
-SUBDIR+=	libbpfjit
-.endif
-
-.if (${MKZFS} != "no")
-SUBDIR+=        ../external/cddl/osnet/lib/libavl
-SUBDIR+=        ../external/cddl/osnet/lib/libnvpair
-SUBDIR+=        ../external/cddl/osnet/lib/libumem
-SUBDIR+=        ../external/cddl/osnet/lib/libuutil
-.endif
-
-SUBDIR+=	../external/mit/expat/lib
-
-SUBDIR+=	../external/public-domain/sqlite/lib
-
-#SUBDIR+=	../gnu/lib/libmalloc
-
-.if (${MKGCC} != "no")
-. if !defined(__MINIX) || ${MKLIBSTDCXX} == "yes"
-SUBDIR+=	../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libobjc
-SUBDIR+=	../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libgomp
-#SUBDIR+=	../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libmudflap
-#SUBDIR+=	../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libmudflapth
-. endif # !defined(__MINIX) || ${MKLIBSTDCXX} == "yes"
-. if !defined(__MINIX) || ${MKLIBSTDCXX} == "yes"
-# Should probably move GMP, MPFR and MPC builds into the GCC >= 4.5
-# specific build area, but we get better parallelism this way.
-# We don't build compat versions of these.
-. if !defined(MLIBDIR)
-SUBDIR+=	../external/lgpl3/gmp/lib/libgmp
-SUBDIR+=	../external/lgpl3/mpfr/lib/libmpfr
-SUBDIR+=	../external/lgpl3/mpc/lib/libmpc
-.   endif # !defined(__MINIX) || ${MKLIBSTDCXX} == "yes"
-. endif
-.endif
-
-#
-# Libraries that depend upon any listed previously
-# (and those that depend upon these [and ...])
-#
-#==================== 1st library dependency barrier ====================
-SUBDIR+=	.WAIT
-
-.if ${MKDTRACE} != "no"
-SUBDIR+=	../external/bsd/librtld_db/lib		# depends on libutil
-.endif
-
-.if ${MKDTRACE} != "no" || ${MKCTF} != "no"
-SUBDIR+=        ../external/cddl/osnet/lib/libctf
-.endif
-
-SUBDIR+=	../external/public-domain/xz/lib	# depends on libpthread
-
-.if (${MKCRYPTO} != "no")
-SUBDIR+=	../crypto/external/bsd/netpgp/libmj
-SUBDIR+=	../crypto/external/bsd/netpgp/lib/verify # depends on libz
-.endif
-
-#SUBDIR+=	../external/bsd/libdwarf/lib # depends on libelf
-SUBDIR+=	../external/mit/lua/lib # depends on libm
-SUBDIR+=	libcurses	# depends on libterminfo
-#SUBDIR+=	libdm		# depends on libprop
-SUBDIR+=	libedit		# depends on libterminfo
-SUBDIR+=	libexecinfo 	# depends on libelf
-#SUBDIR+=	libppath	# depends on libprop
-#SUBDIR+=	libperfuse	# depends on libpuffs
-#SUBDIR+=	libquota	# depends on libprop and librpcsvc
-SUBDIR+=	librefuse	# depends on libpuffs
-#SUBDIR+=	libisns 	# depends on libpthread
-.if (${MKRUMP} != "no")
-SUBDIR+=	librumpuser	# depends on libpthread
-SUBDIR+=	librumphijack	# depends on librumpclient and libpthread
-.endif
-
-.if (${MKNPF} != "no")
-SUBDIR+=	libnpf		# depends on libprop
-.endif
-
-.if (${MKCRYPTO} != "no")
-SUBDIR+=	../crypto/external/bsd/openssl/lib # depends on libcrypt
-.endif
-
-SUBDIR+=	../external/bsd/file/lib	# depends on libz
-
-.if (${MKISCSI} != "no")
-SUBDIR+=	../external/bsd/iscsi/lib	# depends on libpthread
-.endif
-
-.if (${MKZFS} != "no")
-SUBDIR+=        ../external/cddl/osnet/lib/libzfs
-SUBDIR+=        ../external/cddl/osnet/lib/libzpool
-.endif
-
-.if (${MKLVM} != "no")
-SUBDIR+=	../external/gpl2/lvm2/lib	# depends on libprop
-.endif
-
-.if (${MKBINUTILS} != "no")
-SUBDIR+=	../external/gpl3/binutils/lib	# libbfd depends on libz
-.endif
-
-.if (${MKLIBCXX} != "no")
-SUBDIR+=	../external/bsd/libc++
-.endif
-
-.if (${MKGCC} != "no" && ${MKCXX} != "no" && ${MKLIBSTDCXX} != "no")
-SUBDIR+=	../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
-SUBDIR+=	../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libsupc++
-.endif
-
-#==================== 2nd library dependency barrier ====================
-SUBDIR+=	.WAIT
-
-SANITIZER_DIR=../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libasan
-.if exists(${SANITIZER_DIR})
-#SUBDIR+=	${SANITIZER_DIR}
-.endif
-
-SUBDIR+=	../external/bsd/libarchive/lib	# depends on libxz
-
-.if (${MKNPF} != "no")
-SUBDIR+=	npf		# depends on libnpf
-.endif
-
-.if (${MKATF} != "no")
-SUBDIR+=	../external/bsd/atf/lib		# depends on libstdc++
-.endif
-
-.if (${MKKYUA} != "no")
-SUBDIR+=	../external/bsd/lutok/lib	# depends on lua and libstdc++
-.endif
-
-SUBDIR+=	libform		# depends on libcurses
-SUBDIR+=	libmenu		# depends on libcurses
-#SUBDIR+=	libradius	# depends on libcrypto if (${MKCRYPTO} != "no")
-.if (${MKRUMP} != "no")
-SUBDIR+=	librump		# depends on librumpuser
-.endif
-
-.if (${MKKERBEROS} != "no")
-SUBDIR+=	../crypto/external/bsd/heimdal/lib	# depends on libcrypto
-							# libedit, libterminfo,
-.endif
-
-.if (${MKCRYPTO} != "no")
-#SUBDIR+=	../crypto/external/bsd/openssh/lib # depends on libcrypto, libz
-SUBDIR+=	../crypto/external/bsd/netpgp/lib  # depends on libcrypto, ...
-.endif
-
-SUBDIR+=	../external/bsd/libevent/lib	# depends on libcrypto
-.if ${MKDTRACE} != "no"
-SUBDIR+=	../external/bsd/libproc/lib	# depends on libstdc++, libctf
-.endif
-SUBDIR+=	../external/bsd/fetch/lib	# depends on libssl
-
-.if (${MKLDAP} != "no")
-SUBDIR+=	../external/bsd/openldap/lib	# depends on libcrypto, ...
-.endif
-
-#==================== 3rd library dependency barrier ====================
-SUBDIR+=	.WAIT
-
-SUBDIR+=	../external/bsd/bind/lib	# depends on heimdal, libcrypto
-
-.if ${MKDTRACE} != "no"
-SUBDIR+=        ../external/cddl/osnet/lib/libdtrace	# depends on libproc
-.endif
-
-.if (${MKRUMP} != "no")
-SUBDIR+=	librumpdev	# depends on librump
-SUBDIR+=	librumpnet	# depends on librump
-SUBDIR+=	librumpvfs	# depends on librump
-.endif
-
-.if (${MKPAM} != "no")
-SUBDIR+=	libpam		# depends on heimdal
-.endif
-
-.if (${MKCRYPTO} != "no")
-SUBDIR+=	../crypto/external/bsd/libsaslc	# depends on heimdal, openssl
-.endif
-
-SUBDIR+=	../external/bsd/mdocml/lib
-
-.if (${MKRUMP} != "no")
-#==================== 4th library dependency barrier ====================
-SUBDIR+=	.WAIT
-
-SUBDIR+=	libukfs		# depends on librumpvfs, librump
-
-.if (${MKTPM} != "no")
-SUBDIR+=	../crypto/external/cpl/trousers/lib
-.endif
-
-#==================== 5th library dependency barrier ====================
-SUBDIR+=	.WAIT
-
-SUBDIR+=	libp2k		# depends on libukfs, librumpvfs, libpuffs
-
-.if (${MKTPM} != "no")
-SUBDIR+=	../crypto/external/cpl/tpm-tools/lib	# depends on trousers
-.endif
-
-.if !defined(BSD_MK_COMPAT_FILE)
-SUBDIR+=	../sys/rump/dev/lib
-SUBDIR+=	../sys/rump/fs/lib
-SUBDIR+=	../sys/rump/kern/lib
-SUBDIR+=	../sys/rump/net/lib
-.endif
-.endif
-
-# Lua bindings come last, they might depend on anything
-SUBDIR+=	lua
-
-# Needed by rump and rescue which are outside the smbfs tree
-#SUBDIR+=	../external/bsd/smbfs/lib
-
-.include <bsd.buildinstall.mk>
-.include <bsd.subdir.mk>
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
deleted file mode 100644
index 66295152a..000000000
--- a/lib/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.7 2012/03/21 05:39:21 matt Exp $
-
-WARNS?=		5
diff --git a/lib/bumpversion b/lib/bumpversion
deleted file mode 100755
index cc8d1296c..000000000
--- a/lib/bumpversion
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/sh
-# $NetBSD: bumpversion,v 1.10 2003/07/26 19:24:24 salo Exp $
-#
-# Copyright (c) 1993 Christopher G. Demetriou
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#          This product includes software developed for the
-#          NetBSD Project.  See http://www.NetBSD.org/ for
-#          information about NetBSD.
-# 4. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
-
-while :
-	do case "$1" in
-		# -c says to create new shlib_version files
-		-c)
-			create=TRUE
-			shift ;;
-
-		# -n sets 'do nothing mode'
-		-n)
-			donothing=TRUE
-			shift ;;
-
-		# -m says to bump major number, rather than minor number
-		-m)
-			bumpmajor=TRUE
-			shift ;;
-
-		*)
-			break ;;
-	esac
-done
-
-if [ $# = 0 ] ; then
-	echo "usage: $0 [-c] [-m] [-n] dir ..."
-	exit 2
-fi
-
-TMP=/tmp/bump$$
-error=0
-
-trap 'rm -f $TMP ; exit 1' 1 2 3 13 15
-
-for dir in $@ ; do
-	versf=$dir/shlib_version
-
-	if [ "X$create" != "X" ] ; then
-		if [ ! -d $dir ] ; then
-		        echo $0: $dir is not a directory 1>&2
-		        error=1
-			continue
-		fi
-		if [ -e $versf ] ; then
-		        echo $0: $versf exists\; not replacing 1>&2
-		        error=1
-			continue
-		fi
-	else
-		if [ ! -e $versf ] ; then
-		        echo $0: $versf does not exist 1>&2
-		        error=1
-			continue
-		fi
-		if [ ! -f $versf ] ; then
-		        echo $0: $versf is not a regular file 1>&2
-		        error=1
-			continue
-		fi
-		if [ ! -r $versf ] ; then
-		        echo $0: $versf is not readable 1>&2
-		        error=1
-			continue
-		fi
-		if [ ! -w $versf ] ; then
-		        echo $0: $versf is not a writable 1>&2
-		        error=1
-			continue
-		fi
-
-		. $versf
-	fi
-
-	if [ "X$create" != "X" ] ; then
-		nmajor=0
-		nminor=0
-	elif [ "X$bumpmajor" != "X" ] ; then
-		nmajor=`expr $major + 1`
-		nminor=0
-	else
-		nmajor=$major
-		nminor=`expr $minor + 1`
-	fi
-
-	if [ "X$donothing" = "X" ] ; then
-		echo major=$nmajor > $TMP
-		echo minor=$nminor >> $TMP
-		mv $TMP $versf
-	else
-		echo "$0: $versf -> $nmajor.$nminor"
-	fi
-done
-
-exit $error
diff --git a/lib/checkoldver b/lib/checkoldver
deleted file mode 100755
index 6bd7eb18a..000000000
--- a/lib/checkoldver
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/sh
-#	$NetBSD: checkoldver,v 1.3 2008/04/30 13:10:50 martin Exp $
-#
-# Copyright (c) 2002 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Christos Zoulas.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# checkoldver [dir ...]
-#
-# Looks in the given directories for old shared libraries and lists them
-# Useful for: 'checkoldver /usr/lib | xargs rm -f'
-
-delete() {
-	obsol="$1.so"
-	if [ ! -z "$2" ]
-	then
-		obsol="$obsol.$2"
-	fi
-	if [ ! -z "$3" ]
-	then
-		obsol="$obsol.$3"
-	fi
-	if [ ! -z "$4" ]
-	then
-		obsol="$obsol.$4"
-	fi
-	echo $PWD/$obsol
-}
-
-comparelib() {
-	OIFS="$IFS"
-	IFS="$IFS."
-	set -- $1
-	IFS="$OIFS"
-	if [ "$3" = "[0-9]*" ]
-	then
-		return
-	fi
-
-	if [ -z "$libmajor" ]
-	then
-		libname="$1"
-		libmajor="$3"
-		libminor="$4"
-		libtiny="$5"
-		return
-	fi
-	if [ "$libmajor" -lt "$3" ]
-	then
-		delete "$libname" "$libmajor" "$libminor" "$libtiny"
-		libmajor="$3"
-		libminor="$4"
-		libtiny="$5"
-		return
-	elif [ "$3" -lt "$libmajor" ]
-	then
-		delete "$libname" "$3" "$4" "$5"
-		return
-	fi
-
-	if [ -z "$libminor" ]
-	then
-		return
-	fi
-	if [ "$libminor" -lt "$4" ]
-	then
-		delete "$libname" "$libmajor" "$libminor" "$libtiny"
-		libmajor="$3"
-		libminor="$4"
-		libtiny="$5"
-		return
-	elif [ "$4" -lt "$libminor" ]
-	then
-		delete "$libname" "$3" "$4" "$5"
-		return
-	fi
-
-	if [ -z "$libtiny" ]
-	then
-		return
-	fi
-	if [ "$libtiny" -lt "$5" ]
-	then
-		delete "$libname" "$libmajor" "$libminor" "$libtiny"
-		libmajor="$3"
-		libminor="$4"
-		libtiny="$5"
-		return
-	elif [ "$5" -lt "$libminor" ]
-	then
-		delete "$libname" "$3" "$4" "$5"
-		return
-	fi
-}
-
-processonedir() {
-	cd "$1"
-	for lib in lib*.so
-	do
-		lib="${lib#lib}"
-		lib="${lib%.so}"
-
-		libmajor=
-		libminor=
-		libtiny=
-		for link in lib$lib.so.[0-9]*.[0-9]*.[0-9]*
-		do
-			comparelib "$link"
-		done
-
-		libmajor=
-		libminor=
-		libtiny=
-		for link in lib$lib.so.[0-9]*.[0-9]*
-		do
-			comparelib "$link"
-		done
-
-		libmajor=
-		libminor=
-		libtiny=
-		for link in lib$lib.so.[0-9]*
-		do
-			comparelib "$link"
-		done
-	done
-}
-
-for i
-do
-	processonedir "$i"
-done
diff --git a/lib/checkver b/lib/checkver
deleted file mode 100755
index e7ad92017..000000000
--- a/lib/checkver
+++ /dev/null
@@ -1,232 +0,0 @@
-#!/bin/sh
-#	$NetBSD: checkver,v 1.16 2013/02/17 02:36:21 christos Exp $
-#
-# Copyright (c) 1998 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Eric Haszlakiewicz.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#--------------------------------------------------------------------#
-# checkver - 
-#	Check for libraries that appear to be newer than the
-#	one we're about to install.
-#
-# checkver [-q] [-v shlib_version_file] -d [installedlibdir [library name]]"
-# checkver [-q] [-v shlib_version_file] -s [setlistdir [library name]]"
-# checkver [-q] [-v shlib_version_file] -f liblistfile [library name]"
-#
-# One of -d, -s or -f must be specified.
-#
-# all: If library name is not specified it is assumed to
-#	be the name of the current directory.
-#
-# -d: Checks the version against the installed libraries.
-#	If no further arguments are given "/usr/lib" is
-#	used as the location of installed libraries.
-#
-# -s: Checks the version against the sets.  If no argument
-#	follows the sets directory defaults to "/usr/src/distrib/sets/lists".
-#	The directory may be specified as either the top of the
-#	source tree or as the lists directory.
-#
-# -f: Checks the version against the provided list.  A filename
-#	must be supplied.
-#
-# -v: Specify the filename of the shlib_version file.  Defaults
-#     to "./shlib_version".
-#
-# This script produces no output if all library version are not
-# large than the source version.  If an installed library with a
-# version greater than the source is found, checkver prints a
-# header and a list of the names of the offending installed libraries.
-#
-# The header may be supressed by passing "-q" as the first argument.
-#
-
-TMP=/tmp/checkver.$$
-PROG="$(basename "$0")"
-# Can't trap 11 (SEGV) in the Real Bourne Shell, since it uses it for
-# internal malloc!
-trap "exit 2" 1 2 3 4 5 6 7 8 10 12 13 14 15
-trap "[ -d $TMP ] && rm -rf $TMP" 0
-
-Usage() {
-cat << EOF 1>&2
-Usage: $PROG [-q] [-v version_file] -d [installedlibdir [library name]]
-       $PROG [-q] [-v version_file] -s [setlistdir [library name]]
-       $PROG [-q] [-v version_file] -f liblistfile [library name]
-       $PROG is a script that looks for installed libraries with
-       versions greater than that in the version file.
-       For more information, read the comments.
-EOF
-	exit 1
-}
-
-basedir=/usr/src
-setsdir=$basedir/distrib/sets/lists
-libdir=/usr/lib
-shlib_version=./shlib_version
-
-error=0
-quiet=0
-usedir=0
-usefile=0
-usesets=0
-CWD=$(pwd)
-
-fixone() {
-	local instmajor=$(basename $1 | awk 'BEGIN { FS="." } { print $3 }')
-	local instminor=$(basename $1 | awk 'BEGIN { FS="." } { print $4 }')
-	local instteeny=$(basename $1 | awk 'BEGIN { FS="." } { print $5 + 0 }')
-	local ms="The following libraries have versions greater than the source"
-
-	# If they're greater than the source, complain.
-	if [ "0$major" -eq "0$instmajor" ]; then
-		if [ "0$minor" -eq "0$instminor" ]; then
-			if [ "0$teeny" -lt "0$instteeny" ]; then
-				if [ $error -eq 0 -a $quiet -eq 0 ]; then
-					echo "$ms" 1>&2
-				fi
-				echo $1 1>&2
-				error=1
-			fi
-		elif [ "0$minor" -lt "0$instminor" ]; then
-			if [ $error -eq 0 -a $quiet -eq 0 ]; then
-				echo "$ms" 1>&2
-			fi
-			echo $1 1>&2
-			error=1
-		fi
-	elif [ "0$major" -lt "0$instmajor" ]; then
-		if [ $error -eq 0 -a $quiet -eq 0 ]; then
-			echo "$ms" 1>&2
-		fi
-		echo $1 1>&2
-		error=1
-	fi
-}
-
-while getopts df:shqv: f; do
-	case $f in
-	d)	usedir=1 
-		if [ $usefile -eq 1 -o $usesets -eq 1 ]; then
-			Usage
-		fi;;
-	f)	usefile=1; arg1=$OPTARG
-		if [ $usedir -eq 1 -o $usesets -eq 1 ]; then
-			Usage 
-		fi;;
-	s)	usesets=1 
-		if [ $usedir -eq 1 -o $usefile -eq 1 ]; then
-			Usage
-		fi;;
-	v)	shlib_version=$OPTARG;;
-	q)	quiet=1;;
-	*)	Usage;;
-	esac
-done
-
-shift $(($OPTIND - 1))
-
-if [ $usedir -eq 0 -a $usefile -eq 0 -a $usesets -eq 0 ]; then
-	Usage
-fi
-
-if [ $usefile -eq 1 ]; then
-	LIBLIST="$arg1"
-else
-	if ! mkdir -m 0700 $TMP; then
-		echo "$PROG: Unable to create temp directory." 1>&2
-		exit 2
-	fi
-	LIBLIST=$TMP/libs.lst
-fi
-
-# Build list from the installed libraries.
-if [ $usedir -eq 1 ]; then
-	if [ -n "$1" ]; then
-		libdir="$1"
-	fi
-	for f in $libdir; do
-		ls $f/lib*.so.*.*
-	done > $LIBLIST 2> /dev/null
-fi
-
-# Build list from set lists.  Parameter may be either
-# the "lists" directory or the top of the source tree.
-if [ $usesets -eq 1 ]; then
-	if [ -n "$1" ]; then
-		setsdir="$1"
-		if [ -d "$setsdir/distrib/sets/lists" ]; then
-			setsdir="$setsdir/distrib/sets/lists"
-		fi
-	fi
-	(cd $setsdir;
-	 cat */[a-z]* |
-	 grep '^./usr/lib/lib.*\.so\.[0-9][0-9]*\.[0-9][0-9]*' |
-	 sort -u > $LIBLIST)
-fi
-
-#
-# The file $LIBLIST now contains a list of libraries.
-#
-if [ -z "$2" ]; then
-	makefile=$CWD/Makefile
-	libname=$(grep '^LIB=' $makefile | sed -e 's/^LIB=[[:space:]]*//')
-
-	# Assume the library name is the name of the current directory.
-	if [ -z "$libname" ]; then
-		libname=$(basename $CWD)
-	fi
-else
-	    libname="$2"
-fi
-echo $libname | grep "^lib" 1>&2 2> /dev/null
-if [ $? != 0 ]; then
-	libname="lib$libname"
-fi
-
-
-if [ ! -f $shlib_version ]; then
-	echo "$PROG: unable to find $shlib_version" 1>&2
-	exit 2
-fi
-
-# Grab major and minor numbers from the source.
-. $shlib_version
-
-if [ -z "$minor" -o -z "$major" ]; then
-	echo "$PROG: $shlib_version doesn't contain the version." 1>&2
-	exit 2
-fi
-
-# Find every shared object library with the same base name.
-for instlib in $(grep $libname.so "$LIBLIST"); do
-	# Grab the major and minor from the installed library.
-	fixone "$instlib"
-done
-
-exit $error
diff --git a/lib/checkvers b/lib/checkvers
deleted file mode 100755
index ebf27ff30..000000000
--- a/lib/checkvers
+++ /dev/null
@@ -1,210 +0,0 @@
-#!/bin/ksh
-#	$NetBSD: checkvers,v 1.7 2008/04/30 13:10:50 martin Exp $
-#
-# Copyright (c) 1998 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Eric Haszlakiewicz.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#--------------------------------------------------------------------#
-# checkvers [-q] [systemlibdir [library name]]
-#
-# This is a wrapper script around checkver.  It will find
-# all directories withing the current directory containing
-# a shlib_version file and call checkver for each.
-#
-# As with checkver, a list of directories of installed libraries
-# may be specified.  This will replace the default of "/usr/lib"
-# and search there instead.
-#
-# A library name may also be specified.  However, this script
-# will not work correctly if it finds shlib_version files
-# corresponding to a different library.
-#
-# This script produces no output if all library version are ok.
-# If the versions aren't ok the header will be displayed once
-# followed by a list of problematic libraries.
-#
-
-# checkvers:
-#	if "-s", build list, pass with -f to checkver.
-#	if "-d", build list, pass with -f to checkver.
-#	if "-f", pass with -f to checkver.
-
-
-# Cleanup on exit.
-TMP=/tmp/checkvers.$$
-trap "exit 2" 1 2 3 4 5 6 7 8 10 11 12 13 14 15
-trap "rm -rf $TMP" 0
-
-Usage ( ) {
-    echo "Usage: $1 [-q] -d [installedlibdir [library name]]"
-    echo "       $1 [-q] -s [setlistdir [library name]]"
-    echo "       $1 [-q] -f liblistfile [library name]"
-}
-
-basedir=/usr/src
-setsdir=$basedir/distrib/sets/lists
-libdir=/usr/lib
-
-error=0
-quiet=0
-usedir=0
-usefile=0
-usesets=0
-CWD=`pwd`
-args=`getopt "df:shq" "$@"`
-if [ $? -ne 0 ] ; then
-    Usage $0
-    exit 0
-fi
-
-set -- $args
-
-while . ; do
-    case "$1" in
-	-d) usedir=1 ; shift
-	    if [ $usefile -eq 1 -o $usesets -eq 1 ]; then
-		Usage $0 ; exit 2
-	    fi;;
-	-f) usefile=1 ; arg1=$2 ; shift ; shift
-	    if [ $usedir -eq 1 -o $usesets -eq 1 ]; then
-		Usage $0 ; exit 2
-	    fi;;
-	-s) usesets=1 ; shift
-	    if [ $usedir -eq 1 -o $usefile -eq 1 ]; then
-		Usage $0 ; exit 2
-	    fi;;
-	-h) Usage $0 ; exit 0;;
-	-q) quiet=1 ; shift;;
-	--) shift ; break;;
-    esac
-done
-
-if [ $usedir -eq 0 -a $usefile -eq 0 -a $usesets -eq 0 ] ; then
-    Usage $0 ; exit 2
-fi
-if [ $usefile -eq 0 -a $# -gt 2 ] ; then
-    Usage $0 ; exit 2
-fi
-if [ $usefile -eq 1 -a $# -gt 1 ] ; then
-    Usage $0 ; exit 2
-fi
-
-#-------------------------#
-
-QUIET=
-LIBNAME=
-
-# Supress header.
-if [ quiet -eq 1 ] ; then
-    QUIET="-q"
-fi
-
-if ! mkdir -m 700 $TMP ; then
-    echo "$0: Unable to create temp directory."
-    exit 2
-fi
-
-if [ $usefile -eq 1 ] ; then
-    # Just pass the file name to checkver.
-    LIBLIST="$arg1"
-else
-    LIBLIST=$TMP/libs.lst
-fi
-
-# Build list from the installed libraries.
-if [ $usedir -eq 1 ] ; then
-    if [ "X$1" != "X" ] ; then
-	libdir="$1"
-    fi
-    for f in $libdir ; do
-	ls $f/lib*.so.*.*
-    done > $LIBLIST 2> /dev/null
-fi
-
-# Build list from set lists.  Parameter may be either
-# the "lists" directory or the top of the source tree.
-if [ $usesets -eq 1 ] ; then
-    if [ "X$1" != "X" ] ; then
-	setsdir="$1"
-	if [ -d "$setsdir/distrib/sets/lists" ] ; then
-	    setsdir="$setsdir/distrib/sets/lists"
-	fi
-    fi
-    (cd $setsdir ;
-     cat */[a-z]* | grep '^./usr/lib/lib.*\.so\.[0-9][0-9]*\.[0-9][0-9]*' \
-		  | sort -u > $LIBLIST
-    )
-fi
-
-if [ "X$2" != "X" ] ; then
-    LIBNAME="$2"
-fi
-
-EXECDIR=`eval "(cd \`dirname $0\` ; pwd)"`
-
-CWD=`pwd`
-VERFILES=`find $CWD -name shlib_version -print`
-
-for f in $VERFILES ; do
-    # Call checkver.  We always have a list of libraries
-    # here, whether given to us or built, so always
-    # pass the -f flag.
-    (cd `dirname $f` ;
-    "sh $EXECDIR"/checkver $QUIET -f "$LIBLIST" "$LIBNAME" ;
-    exit $?)
-    ERR=$?
-    if [ $ERR -eq 2 ] ; then
-	echo "$0: checkver failed. LIBLIST=$LIBLIST $LIBNAME=$LIBNAME"
-	exit 2
-    fi
-    if [ $ERR -ne 0 ] ; then
-	QUIET="-q"
-	error=1
-    fi
-
-    if [ "X$LIBNAME" = "X" ] ; then
-	# Build the library name from the directory it's in.
-	libname=`dirname $f`
-	libname=`basename $libname`
-	if ! echo $libname | grep -q "^lib" ; then
-	    libname="lib$libname"
-	fi
-    else
-	libname="$LIBNAME"
-    fi
-
-    if [ -e $TMP/$libname ] ; then
-	echo "Warning: $libname sources encountered multiple times."
-	echo "         Previous location: `cat $TMP/$libname`"
-	echo "         Current location: `dirname $f`"
-    fi
-    echo "`dirname $f`" > $TMP/$libname
-
-done
-
-exit $error
diff --git a/lib/csu/Makefile b/lib/csu/Makefile
deleted file mode 100644
index 8659714a5..000000000
--- a/lib/csu/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-#	$NetBSD: Makefile,v 1.35 2014/08/10 23:25:49 matt Exp $
-
-.include <bsd.own.mk>
-
-.if defined(__MINIX)
-USE_BITCODE:=	no
-.endif # defined(__MINIX)
-
-CSU_MACHINE_ARCH?=	${MACHINE_ARCH}
-CSU_MACHINE_CPU?=	${MACHINE_CPU}
-
-.if !empty(CSU_MACHINE_ARCH:Mearm*)
-ARCHDIR:=	${.CURDIR}/arch/earm
-.elif exists(${.CURDIR}/arch/${CSU_MACHINE_ARCH}/Makefile.inc)
-ARCHDIR:=	${.CURDIR}/arch/${CSU_MACHINE_ARCH}
-.elif exists(${.CURDIR}/arch/${CSU_MACHINE_CPU}/Makefile.inc)
-ARCHDIR:=	${.CURDIR}/arch/${CSU_MACHINE_CPU}
-.else
-.error Architecture (${CSU_MACHINE_ARCH} or ${CSU_MACHINE_CPU}) unsupported
-.endif
-
-
-.PATH:	${ARCHDIR}
-.include "${ARCHDIR}/Makefile.inc"
-.include "${.CURDIR}/common/Makefile.inc"
diff --git a/lib/csu/arch/aarch64/Makefile.inc b/lib/csu/arch/aarch64/Makefile.inc
deleted file mode 100644
index b957404a8..000000000
--- a/lib/csu/arch/aarch64/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/08/10 05:47:36 matt Exp $
-
-CPPFLAGS+=	-I${ARCHDIR}
-CPPFLAGS+=	-DHAVE_INITFINI_ARRAY
-#CPPFLAGS+=	-DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"
diff --git a/lib/csu/arch/aarch64/crt0.S b/lib/csu/arch/aarch64/crt0.S
deleted file mode 100644
index 4fff4f77e..000000000
--- a/lib/csu/arch/aarch64/crt0.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: crt0.S,v 1.1 2014/08/10 05:47:36 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <aarch64/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.1 2014/08/10 05:47:36 matt Exp $")
-
-STRONG_ALIAS(_start,__start)
-
-_ENTRY(__start)
-	/*
-	 * void ___start(void (*cleanup)(void), const Obj_Entry *obj,
-	 *    struct ps_strings *ps_strings);
-	 */
-	b	___start
-END(__start)
diff --git a/lib/csu/arch/aarch64/crtbegin.h b/lib/csu/arch/aarch64/crtbegin.h
deleted file mode 100644
index ffef0ada2..000000000
--- a/lib/csu/arch/aarch64/crtbegin.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $NetBSD: crtbegin.h,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-static void __do_global_ctors_aux(void) __attribute__((__constructor__)) __used;
-#ifdef SHARED
-static void __do_global_dtors_aux(void) __attribute__((__destructor__)) __used;
-#endif
diff --git a/lib/csu/arch/aarch64/crtend.S b/lib/csu/arch/aarch64/crtend.S
deleted file mode 100644
index f90161f48..000000000
--- a/lib/csu/arch/aarch64/crtend.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.1 2014/08/10 05:47:36 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <aarch64/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.1 2014/08/10 05:47:36 matt Exp $")
-
-	.section	.eh_frame, "a", %progbits
-	.p2align 3
-	.global		__EH_FRAME_END__
-	.hidden 	__EH_FRAME_END__
-__EH_FRAME_END__:
-	.space	8
-
-	.section	.jcr, "aw", %progbits
-	.p2align 3
-	.global		__JCR_END__
-	.hidden 	__JCR_END__
-__JCR_END__:
-	.space	8
diff --git a/lib/csu/arch/aarch64/crti.S b/lib/csu/arch/aarch64/crti.S
deleted file mode 100644
index 32e4dbf47..000000000
--- a/lib/csu/arch/aarch64/crti.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: crti.S,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <aarch64/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.1 2014/08/10 05:47:36 matt Exp $")
-
-#include "sysident.S"
-
-/*
- * Since ARM EABI uses .init_array/.fini_array,
- * there is no need for .init/.fini
- */
diff --git a/lib/csu/arch/aarch64/crtn.S b/lib/csu/arch/aarch64/crtn.S
deleted file mode 100644
index 8986480ab..000000000
--- a/lib/csu/arch/aarch64/crtn.S
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: crtn.S,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-/* no need for anything here since AAPCS64 uses .init_array/.fini_array */
diff --git a/lib/csu/arch/alpha/Makefile.inc b/lib/csu/arch/alpha/Makefile.inc
deleted file mode 100644
index d30d4e602..000000000
--- a/lib/csu/arch/alpha/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2013/07/11 16:40:27 matt Exp $
-
-CPPFLAGS+=	-I${ARCHDIR} -DELFSIZE=64
diff --git a/lib/csu/arch/alpha/crt0.S b/lib/csu/arch/alpha/crt0.S
deleted file mode 100644
index 69caabf86..000000000
--- a/lib/csu/arch/alpha/crt0.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $NetBSD: crt0.S,v 1.1 2013/07/11 16:40:27 matt Exp $ */
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <alpha/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.1 2013/07/11 16:40:27 matt Exp $")
-
-STRONG_ALIAS(_start,__start)
-
-/*
- *	Assumes kernel (or ld_elf.so) passes the following parameters to
- *	user-space in registers:
- *
- *	a0      stack pointer
- *	a1      cleanup
- *	a2      Obj_Entry
- *	a3      ps_strings
- */
-
-LEAF(__start, 4)
-	LDGP(pv)
-	mov	a1, a0		/* cleanup */
-	mov	a2, a1		/* Obj_Entry */
-	mov	a3, a2		/* ps_strings */
-	CALL(___start)
-END(__start)
diff --git a/lib/csu/arch/alpha/crtbegin.h b/lib/csu/arch/alpha/crtbegin.h
deleted file mode 100644
index 89571766f..000000000
--- a/lib/csu/arch/alpha/crtbegin.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $NetBSD: crtbegin.h,v 1.1 2013/07/11 16:40:27 matt Exp $ */
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#include <alpha/asm.h>
-
-/* Assume we need to reload our GP. */
-__asm(		".pushsection .init"
-"\n\t"		"br	$29, 1f"
-"\n\t"	"1:	ldgp	$29, 0($29)"
-"\n\t"		"unop"
-"\n\t"		"jsr	$26, __do_global_ctors_aux"
-"\n\t"		".p2align 3"
-"\n\t"		".popsection");
-
-/* Assume we need to reload our GP. */
-__asm(		".pushsection .fini"
-"\n\t"		"br	$29, 1f"
-"\n\t"	"1:	ldgp	$29, 0($29)"
-"\n\t"		"unop"
-"\n\t"		"jsr	$26, __do_global_dtors_aux"
-"\n\t"		".p2align 3"
-"\n\t"		".popsection");
diff --git a/lib/csu/arch/alpha/crtend.S b/lib/csu/arch/alpha/crtend.S
deleted file mode 100644
index 931cb86ff..000000000
--- a/lib/csu/arch/alpha/crtend.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.1 2013/07/11 16:40:27 matt Exp $	*/
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <alpha/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.1 2013/07/11 16:40:27 matt Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.p2align 3
-	.global		__CTOR_LIST_END__
-	.hidden 	__CTOR_LIST_END__
-__CTOR_LIST_END__:
-	.word		0
-
-	.section	.dtors, "aw", @progbits
-	.p2align 3
-	.global		__DTOR_LIST_END__
-	.hidden 	__DTOR_LIST_END__
-__DTOR_LIST_END__:
-	.word		0
-
-	.section	.eh_frame, "a", @progbits
-	.p2align 3
-	.word		0
-
-	.section	.jcr, "aw", @progbits
-	.p2align 3
-	.word		0
diff --git a/lib/csu/arch/alpha/crtfm.c b/lib/csu/arch/alpha/crtfm.c
deleted file mode 100644
index bfafe484f..000000000
--- a/lib/csu/arch/alpha/crtfm.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: crtfm.c,v 1.1 2013/08/05 13:38:35 matt Exp $	*/
-
-/*
- * Copyright (c) 2002 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project by
- *	Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Support for the GCC "-ffast-math" option on the Alpha.
- */
-
-#include <sys/types.h>
-
-#include <machine/fpu.h>
-#include <machine/sysarch.h>
-
-/*
- * Must provide this wrapper around sysarch(2) so that statically-linked
- * programs work properly.
- */
-
-extern void __alpha_sysarch(int, void *);
-
-__asm(".ent __alpha_sysarch 0	;\n"
-"__alpha_sysarch:		;\n"
-"	ldiq	$0, 165		;\n" /* v0 = SYS_sysarch */
-"	call_pal 0x0083		;\n" /* PAL_OSF1_callsys */
-"	ret	$31,($26),1	;\n"
-".end __alpha_sysarch");
-
-static void __attribute__((__constructor__))
-__alpha_set_fast_math(void)
-{
-	struct alpha_fp_c_args args;
-
-	args.fp_c = IEEE_MAP_DMZ|IEEE_MAP_UMZ;
-	__alpha_sysarch(ALPHA_SET_FP_C, &args);
-}
diff --git a/lib/csu/arch/alpha/crti.S b/lib/csu/arch/alpha/crti.S
deleted file mode 100644
index 5385d8ccb..000000000
--- a/lib/csu/arch/alpha/crti.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/* $NetBSD: crti.S,v 1.1 2013/07/11 16:40:27 matt Exp $ */
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <alpha/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.1 2013/07/11 16:40:27 matt Exp $")
-
-#include "sysident.S"
-
-	.section ".init", "ax", @progbits
-	.global _init
-	.type _init, @function
-_init:
-	LDGP(pv)
-	lda     sp, -32(sp)
-	stq     ra, 0(sp)
-	stq     gp, 8(sp)
-	.p2align 5
-
-	.section ".fini", "ax", @progbits
-	.global _fini
-	.type _fini, @function
-_fini:
-	LDGP(pv)
-	lda     sp, -32(sp)
-	stq     ra, 0(sp)
-	stq     gp, 8(sp)
-	.p2align 5
diff --git a/lib/csu/arch/alpha/crtn.S b/lib/csu/arch/alpha/crtn.S
deleted file mode 100644
index 1cebc5a97..000000000
--- a/lib/csu/arch/alpha/crtn.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: crtn.S,v 1.1 2013/07/11 16:40:27 matt Exp $ */
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <alpha/asm.h>
-
-RCSID("$NetBSD: crtn.S,v 1.1 2013/07/11 16:40:27 matt Exp $")
-
-	.section ".init", "ax", @progbits
-	ldq     gp, 8(sp)
-	ldq     ra, 0(sp)
-	lda     sp, 32(sp)
-	RET
-
-	.section ".fini", "ax", @progbits
-	ldq     gp, 8(sp)
-	ldq     ra, 0(sp)
-	lda     sp, 32(sp)
-	RET
diff --git a/lib/csu/arch/arm/Makefile.inc b/lib/csu/arch/arm/Makefile.inc
deleted file mode 100644
index 8950d1e13..000000000
--- a/lib/csu/arch/arm/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.7 2013/09/10 22:00:01 matt Exp $
-
-CPPFLAGS+=	-I${ARCHDIR}
-.if (!empty(CPUFLAGS) && ${CPUFLAGS:M-mabi=aapcs*} != "")
-CPPFLAGS+=      -DHAVE_INITFINI_ARRAY
-.endif
-CPPFLAGS+=	-DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"
diff --git a/lib/csu/arch/arm/crt0.S b/lib/csu/arch/arm/crt0.S
deleted file mode 100644
index a8f7d1961..000000000
--- a/lib/csu/arch/arm/crt0.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: crt0.S,v 1.3 2012/08/11 07:25:44 matt Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.3 2012/08/11 07:25:44 matt Exp $")
-
-STRONG_ALIAS(_start,__start)
-
-_ENTRY(__start)
-	/*
-	 * We need to swap ps_strings and cleanup
- 	 */
-	mov	ip, r0		/* ps_strings -> tmp */
-	mov	r0, r2		/* cleanup -> ps_strings */
-	mov	r2, ip		/* tmp -> ps_strings */
-
-	/* Ensure the stack is properly aligned before calling C code. */
-	bic	sp, sp, #7
-
-	/*
-	 * void ___start(void (*cleanup)(void),
-	 *    const Obj_Entry *obj,
-	 *    struct ps_strings *ps_strings);
-	 */
-
-	b	___start
diff --git a/lib/csu/arch/arm/crtbegin.h b/lib/csu/arch/arm/crtbegin.h
deleted file mode 100644
index 134eecc38..000000000
--- a/lib/csu/arch/arm/crtbegin.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $NetBSD: crtbegin.h,v 1.1 2013/06/27 21:24:39 matt Exp $ */
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-__asm(
-	".pushsection	.init, \"ax\", %progbits"
-"\n\t"	"bl	__do_global_ctors_aux"
-"\n\t"	".popsection");
-
-__asm(
-	".pushsection	.fini, \"ax\", %progbits"
-"\n\t"	"bl	__do_global_dtors_aux"
-"\n\t"	".popsection");
diff --git a/lib/csu/arch/arm/crtend.S b/lib/csu/arch/arm/crtend.S
deleted file mode 100644
index fd8a62a7d..000000000
--- a/lib/csu/arch/arm/crtend.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.2 2012/08/11 07:26:25 matt Exp $	*/
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.2 2012/08/11 07:26:25 matt Exp $")
-
-	.section	.ctors, "aw", %progbits
-	.p2align 2
-	.global		__CTOR_LIST_END__
-	.hidden 	__CTOR_LIST_END__
-__CTOR_LIST_END__:
-	.space	4
-
-	.section	.dtors, "aw", %progbits
-	.p2align 2
-	.global		__DTOR_LIST_END__
-	.hidden 	__DTOR_LIST_END__
-__DTOR_LIST_END__:
-	.space	4
-
-	.section	.eh_frame, "a", %progbits
-	.p2align 2
-	.space	4
-
-	.section	.jcr, "aw", %progbits
-	.p2align 2
-	.space	4
diff --git a/lib/csu/arch/arm/crti.S b/lib/csu/arch/arm/crti.S
deleted file mode 100644
index 1e576fdbe..000000000
--- a/lib/csu/arch/arm/crti.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $NetBSD: crti.S,v 1.2 2012/08/11 01:33:36 matt Exp $ */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.2 2012/08/11 01:33:36 matt Exp $")
-
-#include "sysident.S"
-
-	.section ".init", "ax", %progbits
-	.align 0
-	.globl _init
-	.type _init,%function
-_init:
-	mov	ip, sp
-	stmfd	sp!, {fp, ip, lr, pc}
-	sub	fp, ip, #4
-
-	.section ".fini", "ax", %progbits
-	.align 0
-	.globl _fini
-	.type _fini,%function
-_fini:
-	mov	ip, sp
-	stmfd	sp!, {fp, ip, lr, pc}
-	sub	fp, ip, #4
diff --git a/lib/csu/arch/arm/crtn.S b/lib/csu/arch/arm/crtn.S
deleted file mode 100644
index ce0939975..000000000
--- a/lib/csu/arch/arm/crtn.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $NetBSD: crtn.S,v 1.2 2012/08/11 01:33:36 matt Exp $ */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtn.S,v 1.2 2012/08/11 01:33:36 matt Exp $")
-
-	.section ".init", "ax", %progbits
-	ldmea	fp, {fp, sp, pc}
-
-	.section ".fini", "ax", %progbits
-	ldmea	fp, {fp, sp, pc}
diff --git a/lib/csu/arch/earm/Makefile.inc b/lib/csu/arch/earm/Makefile.inc
deleted file mode 100644
index f70405821..000000000
--- a/lib/csu/arch/earm/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.3 2013/09/10 16:45:33 matt Exp $
-
-CPPFLAGS+=	-I${ARCHDIR}
-CPPFLAGS+=	-DHAVE_INITFINI_ARRAY
-CPPFLAGS+=	-DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"
diff --git a/lib/csu/arch/earm/crt0.S b/lib/csu/arch/earm/crt0.S
deleted file mode 100644
index 8c1ae23ed..000000000
--- a/lib/csu/arch/earm/crt0.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: crt0.S,v 1.3 2013/09/05 00:27:38 matt Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.3 2013/09/05 00:27:38 matt Exp $")
-
-STRONG_ALIAS(_start,__start)
-
-_ENTRY(__start)
-	/*
-	 * We need to swap ps_strings and cleanup
- 	 */
-	mov	ip, r0		/* ps_strings -> tmp */
-	mov	r0, r2		/* cleanup -> ps_strings */
-	mov	r2, ip		/* tmp -> ps_strings */
-
-	/* Ensure the stack is properly aligned before calling C code. */
-#if !defined(__thumb__)
-	bic	sp, sp, #7
-#else
-	movs	r6, #7
-	mov	r7, sp
-	bics	r7, r7, r6
-	mov	sp, r7
-#endif
-
-	/*
-	 * void ___start(void (*cleanup)(void),
-	 *    const Obj_Entry *obj,
-	 *    struct ps_strings *ps_strings);
-	 */
-
-	b	___start
diff --git a/lib/csu/arch/earm/crtbegin.h b/lib/csu/arch/earm/crtbegin.h
deleted file mode 100644
index c786bafa5..000000000
--- a/lib/csu/arch/earm/crtbegin.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $NetBSD: crtbegin.h,v 1.2 2014/05/06 16:02:10 joerg Exp $ */
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-static void __do_global_ctors_aux(void) __attribute__((__constructor__)) __used;
-#ifdef SHARED
-static void __do_global_dtors_aux(void) __attribute__((__destructor__)) __used;
-#endif
-
-#if !defined(SHARED) && !defined(__ARM_DWARF_EH__)
-static const void *find_exidx(void *, int *) __used;
-
-static const void *
-find_exidx(void * pc, int * pcount)
-{
-	extern __dso_hidden const char __exidx_start[];
-	extern __dso_hidden const char __exidx_end[];
-
-	*pcount = (__exidx_end - __exidx_start) / 8;
-	return __exidx_start;
-}
-
-__weak_alias(__gnu_Uwind_find_exidx,find_exidx)
-#endif /* !SHARED && !__ARM_DWARF_EH__ */
diff --git a/lib/csu/arch/earm/crtend.S b/lib/csu/arch/earm/crtend.S
deleted file mode 100644
index f196954e4..000000000
--- a/lib/csu/arch/earm/crtend.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.2 2013/12/20 15:35:48 joerg Exp $	*/
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.2 2013/12/20 15:35:48 joerg Exp $")
-
-	.eabi_attribute 18, 4		/* sizeof(wchar_t) */
-	.eabi_attribute 23, 0		/* doesn't use floating point */
-	.eabi_attribute 24, 1		/* 8 byte alignment permitted */
-	.eabi_attribute 25, 1		/* preserves 8-byte alignment */
-	.eabi_attribute 26, 2		/* enums are 32-bits */
-
-	.section	.eh_frame, "a", %progbits
-	.p2align 2
-	.global		__EH_FRAME_END__
-	.hidden 	__EH_FRAME_END__
-__EH_FRAME_END__:
-	.space	4
-
-	.section	.jcr, "aw", %progbits
-	.p2align 2
-	.global		__JCR_END__
-	.hidden 	__JCR_END__
-__JCR_END__:
-	.space	4
diff --git a/lib/csu/arch/earm/crti.S b/lib/csu/arch/earm/crti.S
deleted file mode 100644
index 6bec16b0f..000000000
--- a/lib/csu/arch/earm/crti.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: crti.S,v 1.1 2012/08/13 02:49:04 matt Exp $ */
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.1 2012/08/13 02:49:04 matt Exp $")
-
-#include "sysident.S"
-
-/*
- * Since ARM EABI uses .init_array/.fini_array,
- * there is no need for .init/.fini
- */
diff --git a/lib/csu/arch/earm/crtn.S b/lib/csu/arch/earm/crtn.S
deleted file mode 100644
index 0544e7b63..000000000
--- a/lib/csu/arch/earm/crtn.S
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: crtn.S,v 1.1 2012/08/13 02:49:04 matt Exp $ */
-
-/* no need for anything here since ARM EABI uses .init_array/.fini_array */
diff --git a/lib/csu/arch/hppa/Makefile.inc b/lib/csu/arch/hppa/Makefile.inc
deleted file mode 100644
index 454c25576..000000000
--- a/lib/csu/arch/hppa/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2013/07/13 18:52:35 skrll Exp $
-
-CPPFLAGS+=	-DELFSIZE=32 -I${ARCHDIR}
diff --git a/lib/csu/arch/hppa/crt0.S b/lib/csu/arch/hppa/crt0.S
deleted file mode 100644
index 2d954ea4b..000000000
--- a/lib/csu/arch/hppa/crt0.S
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: crt0.S,v 1.1 2013/07/13 18:52:35 skrll Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nick Hudson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.1 2013/07/13 18:52:35 skrll Exp $")
-
-	.import	_GLOBAL_OFFSET_TABLE_
-	.hidden	___start
-
-STRONG_ALIAS(__start,_start)
-
-/*
- * void _start(struct ps_strings *ps_strings,
- *    void (*cleanup)(void),
- *    const Obj_Entry *obj);
- */
-_ENTRY(_start)
-	.callinfo frame=0, calls
-	.entry
-
-	bl      L$lpc, %r27
-	depi    0, 31, 2, %r27
-L$lpc:	addil   L'_GLOBAL_OFFSET_TABLE_ - ($PIC_pcrel$0 - 8), %r27
-	ldo     R'_GLOBAL_OFFSET_TABLE_ - ($PIC_pcrel$0 - 12)(%r1),%r27
-	copy	%r27, %r19
-
-	/*
-	 * void ___start(void (*cleanup)(void),
-	 *    const Obj_Entry *obj,
-	 *    struct ps_strings *ps_strings);
-	 */
-	copy	%arg0, %arg3		; ps_strings -> tmp
-	copy	%arg1, %arg0		; cleanup -> arg0
-	copy	%arg2, %arg1		; obj -> arg1
-	b	___start
-	copy	%arg3, %arg2		; ps_strings (tmp) -> arg2
-
-EXIT(_start)
diff --git a/lib/csu/arch/hppa/crtbegin.h b/lib/csu/arch/hppa/crtbegin.h
deleted file mode 100644
index 9bbf129d1..000000000
--- a/lib/csu/arch/hppa/crtbegin.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$NetBSD*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nick Hudson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-__asm(	"\n\t"
-	".pushsection .init, \"ax\", @progbits"			"\n\t"
-	"bl __do_global_ctors_aux, %rp"				"\n\t"
-	" nop"							"\n\t"
-	".popsection");
-
-__asm(	"\n\t"
-	".pushsection .fini, \"ax\", @progbits"			"\n\t"
-	"bl __do_global_dtors_aux, %rp"				"\n\t"
-	" nop"							"\n\t"
-	".popsection");
-
diff --git a/lib/csu/arch/hppa/crtend.S b/lib/csu/arch/hppa/crtend.S
deleted file mode 100644
index 9623c5000..000000000
--- a/lib/csu/arch/hppa/crtend.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.1 2013/07/13 18:52:35 skrll Exp $	*/
-
-/*-
- * Copyright (c) 2010 Joerg Sonnenberger <joerg@NetBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.1 2013/07/13 18:52:35 skrll Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.align 4
-	.global		__CTOR_LIST_END__
-	.hidden 	__CTOR_LIST_END__
-__CTOR_LIST_END__:
-	.long 0
-
-	.section	.dtors, "aw", @progbits
-	.align 4
-	.global		__DTOR_LIST_END__
-	.hidden 	__DTOR_LIST_END__
-__DTOR_LIST_END__:
-	.long 0
-
-	.section	.eh_frame, "a", @progbits
-	.align 4
-	.long 0
-
-	.section	.jcr, "aw", @progbits
-	.align 4
-	.long 0
diff --git a/lib/csu/arch/hppa/crti.S b/lib/csu/arch/hppa/crti.S
deleted file mode 100644
index 925facc27..000000000
--- a/lib/csu/arch/hppa/crti.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: crti.S,v 1.1 2013/07/13 18:52:35 skrll Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nick Hudson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.1 2013/07/13 18:52:35 skrll Exp $")
-
-#include "sysident.S"
-
-#define	MD_SECTION_PROLOGUE(sect, entry_pt)			\
-	.section sect,"ax",@progbits				! \
-	.global entry_pt					! \
-	.proc							! \
-	.callinfo frame=HPPA_FRAME_SIZE, calls, save_rp, save_sp, entry_gr=3 ! \
-	.entry							! \
-	entry_pt:						! \
-	stw	%rp, HPPA_FRAME_CRP(%sp)			! \
-	copy	%r3, %r1					! \
-	copy	%sp, %r3					! \
-	stw,ma	%r1, HPPA_FRAME_SIZE(%sp)			! \
-	/* fall thru */						! \
-	.exit							! \
-	.procend						! \
-	.previous
-
-MD_SECTION_PROLOGUE(.init, _init)
-MD_SECTION_PROLOGUE(.fini, _fini)
diff --git a/lib/csu/arch/hppa/crtn.S b/lib/csu/arch/hppa/crtn.S
deleted file mode 100644
index e1ac472b6..000000000
--- a/lib/csu/arch/hppa/crtn.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: crtn.S,v 1.1 2013/07/13 18:52:35 skrll Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nick Hudson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtn.S,v 1.1 2013/07/13 18:52:35 skrll Exp $")
-
-#define	MD_SECTION_EPILOGUE(sect)			\
-	.section #sect,"ax",@progbits			! \
-	ldw	HPPA_FRAME_CRP(%r3) ,%rp		! \
-	ldo	HPPA_FRAME_SIZE(%r3), %sp		! \
-	ldw,mb	-HPPA_FRAME_SIZE(%sp), %r3		! \
-	bv,n	%r0(%rp)				! \
-	.previous
-
-MD_SECTION_EPILOGUE(.init)
-MD_SECTION_EPILOGUE(.fini)
diff --git a/lib/csu/arch/i386/Makefile.inc b/lib/csu/arch/i386/Makefile.inc
deleted file mode 100644
index 77519435c..000000000
--- a/lib/csu/arch/i386/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2010/08/07 18:01:33 joerg Exp $
-
-CPPFLAGS+=	-DELFSIZE=32
-
-
diff --git a/lib/csu/arch/i386/crt0.S b/lib/csu/arch/i386/crt0.S
deleted file mode 100644
index 9adabdd21..000000000
--- a/lib/csu/arch/i386/crt0.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $NetBSD: crt0.S,v 1.3 2011/07/01 02:59:05 joerg Exp $ */
-
-/*
- * Copyright (c) 1998 Christos Zoulas
- * 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.3 2011/07/01 02:59:05 joerg Exp $")
-
-	.hidden ___start
-
-STRONG_ALIAS(_start,__start)
-_ENTRY(__start)
-	pushl	%ebx
-	pushl	%ecx
-	pushl	%edx
-	call	___start
diff --git a/lib/csu/arch/i386/crtbegin.S b/lib/csu/arch/i386/crtbegin.S
deleted file mode 100644
index 0f44ed264..000000000
--- a/lib/csu/arch/i386/crtbegin.S
+++ /dev/null
@@ -1,174 +0,0 @@
-/*	$NetBSD: crtbegin.S,v 1.1 2010/08/07 18:01:33 joerg Exp $	*/
-/*-
- * Copyright (c) 2010 Joerg Sonnenberger <joerg@NetBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtbegin.S,v 1.1 2010/08/07 18:01:33 joerg Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.align 4
-__CTOR_LIST__:
-	.long -1
-
-	.section	.dtors, "aw", @progbits
-	.align 4
-__DTOR_LIST__:
-	.long -1
-
-	.section	.eh_frame, "a", @progbits
-	.align 4
-__EH_FRAME_LIST__:
-
-	.section	.jcr, "aw", @progbits
-	.align 4
-__JCR_LIST__:
-
-	.section	.data.rel, "aw", @progbits
-	.align 4
-	.type	__dso_handle, @object
-	.size	__dso_handle, 4
-	.globl	__dso_handle
-	.hidden	__dso_handle
-__dso_handle:
-#ifdef SHARED
-	.long	__dso_handle
-#else
-	.long	0
-#endif
-
-__dwarf_eh_object:
-	.zero	32
-
-__initialized:
-	.zero	1
-__finished:
-	.zero	1
-
-	.text
-	.weak	__cxa_finalize
-	.weak	__deregister_frame_info
-	.weak	__register_frame_info
-	.weak	_Jv_RegisterClasses
-
-__get_thunk:
-	movl	(%esp), %ebx
-	ret
-
-__do_global_dtors_aux:
-	pushl	%ebx
-	pushl	%edi
-	subl	$8, %esp
-	call	__get_thunk
-	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
-
-	cmpb	$0, __finished@GOTOFF(%ebx)
-	jne	4f
-	movb	$1, __finished@GOTOFF(%ebx)
-
-#ifdef SHARED
-	cmpl	$0, __cxa_finalize@GOT(%ebx)
-	je	1f
-	movl	__dso_handle@GOTOFF(%ebx), %eax
-	movl	%eax, (%esp)
-	call	__cxa_finalize@PLT
-1:
-#endif
-
-	leal	4+__DTOR_LIST__@GOTOFF(%ebx), %edi
-2:
-	movl	(%edi), %eax
-	testl	%eax, %eax
-	je	3f
-	call	*%eax
-	addl	$8, %edi
-	jmp	2b
-3:
-
-	cmpl	$0, __deregister_frame_info@GOT(%ebx)
-	je	4f
-	leal	__EH_FRAME_LIST__@GOTOFF(%ebx), %eax
-	movl	%eax, (%esp)
-	call	__deregister_frame_info@PLT
-4:
-	addl	$8, %esp
-	popl	%edi
-	popl	%ebx
-	ret
-
-
-__do_global_ctors_aux:
-	pushl	%ebx
-	pushl	%edi
-	subl	$8, %esp
-	call	__get_thunk
-	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
-
-	cmpb	$0, __initialized@GOTOFF(%ebx)
-	jne	4f
-	movb	$1, __initialized@GOTOFF(%ebx)
-
-	cmpl	$0, __register_frame_info@GOT(%ebx)
-	je	1f
-	leal	__dwarf_eh_object@GOTOFF(%ebx), %edi
-	movl	%edi, 4(%esp)
-	leal	__EH_FRAME_LIST__@GOTOFF(%ebx), %edi
-	movl	%edi, (%esp)
-	call	__register_frame_info@PLT
-
-1:
-	cmpl	$0, _Jv_RegisterClasses@GOT(%ebx)
-	je	2f
-	leal	__JCR_LIST__@GOTOFF(%ebx), %edi
-	movl	(%edi), %edi
-	testl	%edi, %edi
-	je 	2f
-	movl	%edi, (%esp)
-	call	_Jv_RegisterClasses@PLT
-2:
-
-	leal	-4+__CTOR_LIST_END__@GOTOFF(%ebx), %edi
-3:
-	movl	(%edi), %eax
-	cmpl	$-1, %eax
-	je	4f
-	call	*%eax
-	subl	$4, %edi
-	jmp	3b
-
-4:
-	addl	$8, %esp
-	popl	%edi
-	popl	%ebx
-	ret
-
-	.section	.init, "ax", @progbits
-	call	__do_global_ctors_aux
-	.section	.fini, "ax", @progbits
-	call	__do_global_dtors_aux
diff --git a/lib/csu/arch/i386/crtend.S b/lib/csu/arch/i386/crtend.S
deleted file mode 100644
index adef13d07..000000000
--- a/lib/csu/arch/i386/crtend.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.1 2010/08/07 18:01:33 joerg Exp $	*/
-/*-
- * Copyright (c) 2010 Joerg Sonnenberger <joerg@NetBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.1 2010/08/07 18:01:33 joerg Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.align 4
-	.global		__CTOR_LIST_END__
-	.hidden 	__CTOR_LIST_END__
-__CTOR_LIST_END__:
-	.long 0
-
-	.section	.dtors, "aw", @progbits
-	.align 4
-	.long 0
-
-	.section	.eh_frame, "a", @progbits
-	.align 4
-	.long 0
-
-	.section	.jcr, "aw", @progbits
-	.align 4
-	.long 0
diff --git a/lib/csu/arch/i386/crti.S b/lib/csu/arch/i386/crti.S
deleted file mode 100644
index fbc5ddd72..000000000
--- a/lib/csu/arch/i386/crti.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $NetBSD: crti.S,v 1.1 2010/08/07 18:01:33 joerg Exp $ */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.1 2010/08/07 18:01:33 joerg Exp $")
-
-#include "sysident.S"
-
-	.section ".init", "ax", @progbits
-	.align 16
-	.globl _init
-_init:
-	pushl	%ebp
-	movl	%esp, %ebp
-
-	.section ".fini", "ax", @progbits
-	.align 16
-	.globl _fini
-_fini:
-	pushl	%ebp
-	movl	%esp, %ebp
diff --git a/lib/csu/arch/i386/crtn.S b/lib/csu/arch/i386/crtn.S
deleted file mode 100644
index 644d6a63e..000000000
--- a/lib/csu/arch/i386/crtn.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: crtn.S,v 1.1 2010/08/07 18:01:34 joerg Exp $ */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtn.S,v 1.1 2010/08/07 18:01:34 joerg Exp $")
-
-	.section ".init", "ax", @progbits
-	leave
-	ret
-
-	.section ".fini", "ax", @progbits
-	leave
-	ret
diff --git a/lib/csu/arch/ia64/Makefile.inc b/lib/csu/arch/ia64/Makefile.inc
deleted file mode 100644
index 9e5deaf99..000000000
--- a/lib/csu/arch/ia64/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2014/03/14 18:15:02 cherry Exp $
-
-CPPFLAGS+=	-DELFSIZE=64 -I${ARCHDIR}
diff --git a/lib/csu/arch/ia64/crt0.S b/lib/csu/arch/ia64/crt0.S
deleted file mode 100644
index 992a5ba8a..000000000
--- a/lib/csu/arch/ia64/crt0.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $NetBSD: crt0.S,v 1.1 2014/03/14 18:15:02 cherry Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Cherry G. Mathew of Backyard Innovations, UK, Ltd.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-
-RCSID("$NetBSD: crt0.S,v 1.1 2014/03/14 18:15:02 cherry Exp $")
-
-STRONG_ALIAS(_start,__start)
-	
-.proc __start
-.global __start
-
-/*
- * Called with:
- * 	in0 = cleanup
- * 	in1 = obj
- * 	in2 = ps_strings
- * 	in3 = sp
- * See: sys/arch/ia64/ia64/machdep.c:setregs()
- */
-	
-__start:
-	.regstk 4, 0, 0, 0
-
-	mov sp = in3 /* Setup Memory Stack Pointer. */
-	alloc r31 = ar.pfs, 3, 0, 0, 0 /* Adjust backingstore for ___start() */
-	br.call.sptk.many rp = ___start
-
diff --git a/lib/csu/arch/ia64/crtbegin.h b/lib/csu/arch/ia64/crtbegin.h
deleted file mode 100644
index aaa1b3640..000000000
--- a/lib/csu/arch/ia64/crtbegin.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry and
- * Cherry G. Mathew of Backyard Innovations, UK, Ltd.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-__asm(	"\n\t"
-	".pushsection .init, \"ax\", @progbits"			"\n\t"
-	"br.call.sptk.many b0 = __do_global_ctors_aux"				"\n\t"
-	" nop 0"							"\n\t"
-	".popsection");
-
-__asm(	"\n\t"
-	".pushsection .fini, \"ax\", @progbits"			"\n\t"
-	"br.call.sptk.many b0 = __do_global_dtors_aux"				"\n\t"
-	" nop 0"							"\n\t"
-	".popsection");
diff --git a/lib/csu/arch/ia64/crtend.S b/lib/csu/arch/ia64/crtend.S
deleted file mode 100644
index 73b028f4d..000000000
--- a/lib/csu/arch/ia64/crtend.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.1 2014/03/14 18:15:02 cherry Exp $	*/
-/*-
- * Copyright (c) 2010 Joerg Sonnenberger <joerg@NetBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.1 2014/03/14 18:15:02 cherry Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.align 8
-	.global		__CTOR_LIST_END__
-	.hidden 	__CTOR_LIST_END__
-__CTOR_LIST_END__:
-	.quad 0
-
-	.section	.dtors, "aw", @progbits
-	.align 8
-	.global		__DTOR_LIST_END__
-	.hidden 	__DTOR_LIST_END__
-__DTOR_LIST_END__:
-	.quad 0
-
-	.section	.eh_frame, "a", @progbits
-	.align 8
-	.quad 0
-
-	.section	.jcr, "aw", @progbits
-	.align 8
-	.quad 0
diff --git a/lib/csu/arch/ia64/crti.S b/lib/csu/arch/ia64/crti.S
deleted file mode 100644
index 1511cea78..000000000
--- a/lib/csu/arch/ia64/crti.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/* $NetBSD: crti.S,v 1.1 2014/03/14 18:15:02 cherry Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Cherry G. Mathew of Backyard Innovations, UK, Ltd.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-
-RCSID("$NetBSD: crti.S,v 1.1 2014/03/14 18:15:02 cherry Exp $")
-
-#include "sysident.S"
-
-	.section ".init", "ax", @progbits
-	.align 64
-	.proc _init
-	.global _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 /* return addr */
-	.endp _init
-	
-	.section ".fini", "ax", @progbits
-	.align 64
-	.proc _fini
-	.global _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 /* return addr */
-	.endp _fini
-
-
diff --git a/lib/csu/arch/ia64/crtn.S b/lib/csu/arch/ia64/crtn.S
deleted file mode 100644
index a01536fa6..000000000
--- a/lib/csu/arch/ia64/crtn.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: crtn.S,v 1.1 2014/03/14 18:15:02 cherry Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Cherry G. Mathew of Backyard Innovations, UK, Ltd.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-
-RCSID("$NetBSD: crtn.S,v 1.1 2014/03/14 18:15:02 cherry Exp $")
-
-	.section ".init", "ax", @progbits
-	.regstk 0, 2, 0, 0
-	mov b0 = loc0
-	mov ar.pfs = loc1
-	br.ret.sptk.many b0
-
-	.section ".fini", "ax", @progbits
-	.regstk 0, 2, 0, 0
-	mov b0 = loc0
-	mov ar.pfs = loc1
-	br.ret.sptk.many b0
diff --git a/lib/csu/arch/m68k/Makefile.inc b/lib/csu/arch/m68k/Makefile.inc
deleted file mode 100644
index 2bc42704c..000000000
--- a/lib/csu/arch/m68k/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.2 2013/07/11 17:07:35 matt Exp $
-
-CPPFLAGS+=	-I${ARCHDIR} -DELFSIZE=32
-
-
diff --git a/lib/csu/arch/m68k/crt0.S b/lib/csu/arch/m68k/crt0.S
deleted file mode 100644
index e27662228..000000000
--- a/lib/csu/arch/m68k/crt0.S
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <machine/asm.h>
-
-/*
- * Copyright (c) 1999 Klaus Klein
- * 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-RCSID("$NetBSD: crt0.S,v 1.4 2013/07/26 19:49:19 matt Exp $")
-
-STRONG_ALIAS(_start,__start)
-
-_ENTRY(__start)
-	movl	%a2,-(%sp)		| ps_strings
-	movl	%a0,-(%sp)		| obj
-	movl	%a1,-(%sp)		| cleanup
-	| call: ___start(cleanup, obj, ps_strings)
-	jbsr	___start
-END(__start)
diff --git a/lib/csu/arch/m68k/crtbegin.h b/lib/csu/arch/m68k/crtbegin.h
deleted file mode 100644
index 167ea0804..000000000
--- a/lib/csu/arch/m68k/crtbegin.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: crtbegin.h,v 1.4 2013/07/27 13:07:06 martin Exp $ */
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-__asm(	".pushsection .init"
-#ifdef __pic__
-"\n\t"	"bsrl	__do_global_ctors_aux"
-#else
-"\n\t"	"jsr	__do_global_ctors_aux"
-#endif
-"\n\t"	".popsection");
-
-__asm(	".pushsection .fini"
-#ifdef __pic__
-"\n\t"	"bsrl	__do_global_dtors_aux"
-#else
-"\n\t"	"jsr	__do_global_dtors_aux"
-#endif
-"\n\t"	".popsection");
diff --git a/lib/csu/arch/m68k/crtend.S b/lib/csu/arch/m68k/crtend.S
deleted file mode 100644
index 864d0bd7c..000000000
--- a/lib/csu/arch/m68k/crtend.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.1 2013/07/11 17:07:35 matt Exp $	*/
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <m68k/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.1 2013/07/11 17:07:35 matt Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.p2align 2
-	.global		__CTOR_LIST_END__
-	.hidden 	__CTOR_LIST_END__
-__CTOR_LIST_END__:
-	.long 0
-
-	.section	.dtors, "aw", @progbits
-	.p2align 2
-	.global		__DTOR_LIST_END__
-	.hidden 	__DTOR_LIST_END__
-__DTOR_LIST_END__:
-	.long 0
-
-	.section	.eh_frame, "a", @progbits
-	.p2align 2
-	.long 0
-
-	.section	.jcr, "aw", @progbits
-	.p2align 2
-	.long 0
diff --git a/lib/csu/arch/m68k/crti.S b/lib/csu/arch/m68k/crti.S
deleted file mode 100644
index df84a46ca..000000000
--- a/lib/csu/arch/m68k/crti.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $NetBSD: crti.S,v 1.1 2010/08/07 18:01:34 joerg Exp $ */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.1 2010/08/07 18:01:34 joerg Exp $")
-
-#include "sysident.S"
-
-	.section ".init", "ax", @progbits
-	.align 2
-	.globl _init
-_init:
-
-	.section ".fini", "ax", @progbits
-	.align 2
-	.globl _fini
-_fini:
diff --git a/lib/csu/arch/m68k/crtn.S b/lib/csu/arch/m68k/crtn.S
deleted file mode 100644
index 9614561a0..000000000
--- a/lib/csu/arch/m68k/crtn.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $NetBSD: crtn.S,v 1.1 2010/08/07 18:01:34 joerg Exp $ */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtn.S,v 1.1 2010/08/07 18:01:34 joerg Exp $")
-
-	.section ".init", "ax", @progbits
-	rts
-
-	.section ".fini", "ax", @progbits
-	rts
diff --git a/lib/csu/arch/mips/Makefile.inc b/lib/csu/arch/mips/Makefile.inc
deleted file mode 100644
index 80826ffe5..000000000
--- a/lib/csu/arch/mips/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2013/07/10 15:05:46 matt Exp $
-
-CPPFLAGS+=	-I${ARCHDIR} -DELFSIZE=_MIPS_SZPTR
diff --git a/lib/csu/arch/mips/crt0.S b/lib/csu/arch/mips/crt0.S
deleted file mode 100644
index ef7c8ddf3..000000000
--- a/lib/csu/arch/mips/crt0.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $NetBSD: crt0.S,v 1.3 2013/12/08 06:32:36 matt Exp $ */
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <mips/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.3 2013/12/08 06:32:36 matt Exp $")
-
-STRONG_ALIAS(_start,__start)
-
-/*
- *	Assumes kernel (or ld_elf.so) passes the following parameters to
- *	user-space in registers:
- *
- *	a0      stack pointer (0 if setregs didn't fill this in)
- *	a1      cleanup
- *	a2      Obj_Entry
- *	a3      ps_strings
- *
- *      XXX Does this violate the ABI?
- *      as well as the usual registers (pc, sp, and t9 == pc for ABI).
- */
-
-NESTED_NOPROFILE(__start, CALLFRAME_SIZ, ra)
-	SETUP_GP
-	SETUP_GP64(t3, __start)
-	move	a0, a1		/* cleanup */
-	move	a1, a2		/* Obj_Entry */
-	PTR_L	t9,%call16(_C_LABEL(___start))(gp)
-	 move	a2, a3		/* ps_strings */
-	.reloc  1f,R_MIPS_JALR,___start
-1:	jr	t9
-END(__start)
diff --git a/lib/csu/arch/mips/crtbegin.h b/lib/csu/arch/mips/crtbegin.h
deleted file mode 100644
index cd8ac21f1..000000000
--- a/lib/csu/arch/mips/crtbegin.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-__asm(	"\n\t"
-	".pushsection .init, \"ax\", @progbits"			"\n\t"
-#ifdef __mips_o32
-	".set noreorder"					"\n\t"
-	".set nomacro"						"\n\t"
-	"move	$28,$16" 					"\n\t"
-	"lw	$25,%got(__do_global_ctors_aux)($28)"		"\n\t"
-	"nop"							"\n\t"
-	"addiu   $25,$25,%lo(__do_global_ctors_aux)"		"\n\t"
-	".reloc	1f,R_MIPS_JALR,__do_global_ctors_aux"		"\n\t"
-	"1:	jalr	$25"					"\n\t"
-        "nop"							"\n\t"
-	".set macro"						"\n\t"
-	".set reorder"						"\n\t"
-#else
-	"jal	__do_global_ctors_aux"				"\n\t"
-#endif
-	".popsection");
-
-__asm(	"\n\t"
-	".pushsection .fini, \"ax\", @progbits" "\n\t"
-#ifdef __mips_o32
-	".set noreorder"					"\n\t"
-	".set nomacro"						"\n\t"
-	"move	$28,$16" 					"\n\t"
-	"lw	$25,%got(__do_global_dtors_aux)($28)"		"\n\t"
-	"nop"							"\n\t"
-	"addiu   $25,$25,%lo(__do_global_dtors_aux)"		"\n\t"
-	".reloc	1f,R_MIPS_JALR,__do_global_dtors_aux"		"\n\t"
-	"1:	jalr	$25"					"\n\t"
-        "nop"							"\n\t"
-	".set macro"						"\n\t"
-	".set reorder"						"\n\t"
-#else
-	"jal	__do_global_dtors_aux"				"\n\t"
-#endif
-	".popsection");
diff --git a/lib/csu/arch/mips/crtend.S b/lib/csu/arch/mips/crtend.S
deleted file mode 100644
index 59b4f32b7..000000000
--- a/lib/csu/arch/mips/crtend.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.3 2013/09/05 00:28:11 matt Exp $	*/
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <mips/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.3 2013/09/05 00:28:11 matt Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.p2align 	PTR_SCALESHIFT
-	.global		__CTOR_LIST_END__
-	.hidden 	__CTOR_LIST_END__
-__CTOR_LIST_END__:
-	.word		0
-
-	.section	.dtors, "aw", @progbits
-	.p2align 	PTR_SCALESHIFT
-	.global		__DTOR_LIST_END__
-	.hidden 	__DTOR_LIST_END__
-__DTOR_LIST_END__:
-	.word		0
-
-	.section	.eh_frame, "aw", @progbits
-	.p2align	 PTR_SCALESHIFT
-	.space		_MIPS_SZPTR / 8
-
-	.section	.jcr, "aw", @progbits
-	.p2align	 PTR_SCALESHIFT
-	.space		_MIPS_SZPTR / 8
diff --git a/lib/csu/arch/mips/crti.S b/lib/csu/arch/mips/crti.S
deleted file mode 100644
index 8c3485313..000000000
--- a/lib/csu/arch/mips/crti.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/* $NetBSD: crti.S,v 1.3 2015/05/01 21:35:56 matt Exp $ */
-
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <mips/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.3 2015/05/01 21:35:56 matt Exp $")
-
-#include "sysident.S"
-
-	.section ".init", "ax", @progbits
-	.p2align 2
-NESTED_NOPROFILE(_init, CALLFRAME_SIZ, ra)
-        SETUP_GP
-        PTR_SUBU sp, sp, CALLFRAME_SIZ	# allocate stack frame
-	REG_S	ra, CALLFRAME_RA(sp)	# save RA
-#ifdef __mips_o32
-	REG_S	s0, CALLFRAME_S0(sp)	# save s0
-	move	s0, gp 
-#endif
-        SETUP_GP64(CALLFRAME_GP, _init)
-END(_init)
-
-	.section ".fini", "ax", @progbits
-	.p2align 2
-NESTED_NOPROFILE(_fini, CALLFRAME_SIZ, ra)
-        SETUP_GP
-        PTR_SUBU sp, sp, CALLFRAME_SIZ	# allocate stack frame
-	REG_S	ra, CALLFRAME_RA(sp)	# save RA
-#ifdef __mips_o32
-	REG_S	s0, CALLFRAME_S0(sp)	# save s0
-	move	s0, gp 
-#endif
-        SETUP_GP64(CALLFRAME_GP, _fini)
-END(_fini)
diff --git a/lib/csu/arch/mips/crtn.S b/lib/csu/arch/mips/crtn.S
deleted file mode 100644
index 66f0efedc..000000000
--- a/lib/csu/arch/mips/crtn.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <mips/asm.h>
-
-RCSID("$NetBSD: crtn.S,v 1.2 2013/06/30 08:00:34 matt Exp $")
-
-	.section ".init", "ax", @progbits
-	REG_L	ra, CALLFRAME_RA(sp)
-#if defined(__mips_o32) || defined(__mips_o64)
-	REG_L	s0, CALLFRAME_S0(sp)
-#else
-	REG_L	gp, CALLFRAME_GP(sp)
-#endif
-	PTR_ADDU sp, sp, CALLFRAME_SIZ
-	jr	ra
-
-	.section ".fini", "ax", @progbits
-	REG_L	ra, CALLFRAME_RA(sp)
-#ifdef __mips_o32
-	REG_L	s0, CALLFRAME_S0(sp)
-#else
-	REG_L	gp, CALLFRAME_GP(sp)
-#endif
-	PTR_ADDU sp, sp, CALLFRAME_SIZ
-	jr	ra
diff --git a/lib/csu/arch/or1k/Makefile.inc b/lib/csu/arch/or1k/Makefile.inc
deleted file mode 100644
index db2c13cd5..000000000
--- a/lib/csu/arch/or1k/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/09/03 19:34:25 matt Exp $
-
-CPPFLAGS+=	-I${ARCHDIR}
-CPPFLAGS+=	-DHAVE_INITFINI_ARRAY
-#CPPFLAGS+=	-DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"
diff --git a/lib/csu/arch/or1k/crt0.S b/lib/csu/arch/or1k/crt0.S
deleted file mode 100644
index 4247100be..000000000
--- a/lib/csu/arch/or1k/crt0.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: crt0.S,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <or1k/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.1 2014/09/03 19:34:25 matt Exp $")
-
-STRONG_ALIAS(_start,__start)
-
-_ENTRY(__start)
-	/*
-	 * void ___start(void (*cleanup)(void), const Obj_Entry *obj,
-	 *    struct ps_strings *ps_strings);
-	 */
-	l.jal	___start
-END(__start)
diff --git a/lib/csu/arch/or1k/crtbegin.h b/lib/csu/arch/or1k/crtbegin.h
deleted file mode 100644
index 4905fa8fe..000000000
--- a/lib/csu/arch/or1k/crtbegin.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $NetBSD: crtbegin.h,v 1.1 2014/09/03 19:34:25 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-static void __do_global_ctors_aux(void) __attribute__((__constructor__)) __used;
-#ifdef SHARED
-static void __do_global_dtors_aux(void) __attribute__((__destructor__)) __used;
-#endif
diff --git a/lib/csu/arch/or1k/crtend.S b/lib/csu/arch/or1k/crtend.S
deleted file mode 100644
index f2572e537..000000000
--- a/lib/csu/arch/or1k/crtend.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.1 2014/09/03 19:34:25 matt Exp $")
-
-	.section	.eh_frame, "a", @progbits
-	.p2align 2
-	.global		__EH_FRAME_END__
-	.hidden 	__EH_FRAME_END__
-__EH_FRAME_END__:
-	.space	4
-
-	.section	.jcr, "aw", @progbits
-	.p2align 2
-	.global		__JCR_END__
-	.hidden 	__JCR_END__
-__JCR_END__:
-	.space	4
diff --git a/lib/csu/arch/or1k/crti.S b/lib/csu/arch/or1k/crti.S
deleted file mode 100644
index 2b7df72b6..000000000
--- a/lib/csu/arch/or1k/crti.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: crti.S,v 1.1 2014/09/03 19:34:25 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.1 2014/09/03 19:34:25 matt Exp $")
-
-#include "sysident.S"
-
-/*
- * Since OR1K for NetBSD uses .init_array/.fini_array,
- * there is no need for .init/.fini
- */
diff --git a/lib/csu/arch/or1k/crtn.S b/lib/csu/arch/or1k/crtn.S
deleted file mode 100644
index f46929451..000000000
--- a/lib/csu/arch/or1k/crtn.S
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: crtn.S,v 1.1 2014/09/03 19:34:25 matt Exp $ */
-
-/* no need for anything here since OR1K for NetBSD uses .init_array/.fini_array */
diff --git a/lib/csu/arch/powerpc/Makefile.inc b/lib/csu/arch/powerpc/Makefile.inc
deleted file mode 100644
index 1ebb11de2..000000000
--- a/lib/csu/arch/powerpc/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.2 2013/06/27 21:24:39 matt Exp $
-
-CPPFLAGS+=	-I${ARCHDIR}
diff --git a/lib/csu/arch/powerpc/crt0.S b/lib/csu/arch/powerpc/crt0.S
deleted file mode 100644
index dc6175aeb..000000000
--- a/lib/csu/arch/powerpc/crt0.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <powerpc/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.6 2014/02/27 18:01:51 matt Exp $")
-
-STRONG_ALIAS(_start,__start)
-
-	.hidden ___start
-
-#ifndef _LP64
-	.weak	_SDA_BASE_
-#endif
-
-ENTRY_NOPROFILE(__start)
-#ifndef _LP64
-	bcl	20,31,1f
-1:
-	mflr	%r11
-	/* SVR4 ABI says small data is in r13 */
-	addis	%r13,%r11,_SDA_BASE_-1b@ha
-	addi	%r13,%r13,_SDA_BASE_-1b@l
-#endif
-
-	mr	%r3,%r7		/* cleanup */
-	mr	%r4,%r6		/* obj */
-	mr	%r5,%r8		/* ps_strings */
-
-	CALL(___start)
-END(__start)
diff --git a/lib/csu/arch/powerpc/crtbegin.h b/lib/csu/arch/powerpc/crtbegin.h
deleted file mode 100644
index 8f0700aab..000000000
--- a/lib/csu/arch/powerpc/crtbegin.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $NetBSD: crtbegin.h,v 1.1 2013/06/27 21:24:39 matt Exp $ */
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-__asm( ".pushsection	.init, \"ax\", @progbits"
-"\n\t"	"bl	__do_global_ctors_aux"
-"\n\t"	".popsection");
-
-__asm( ".pushsection	.fini, \"ax\", @progbits"
-"\n\t"	"bl	__do_global_dtors_aux"
-"\n\t"	".popsection");
diff --git a/lib/csu/arch/powerpc/crtend.S b/lib/csu/arch/powerpc/crtend.S
deleted file mode 100644
index 19d89c0a6..000000000
--- a/lib/csu/arch/powerpc/crtend.S
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.3 2014/02/27 16:47:48 matt Exp $	*/
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <powerpc/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.3 2014/02/27 16:47:48 matt Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.p2align P2SZREG
-	.global		__CTOR_LIST_END__
-	.hidden 	__CTOR_LIST_END__
-__CTOR_LIST_END__:
-#ifdef _LP64
-	.quad 0
-#else
-	.long 0
-#endif
-
-	.section	.dtors, "aw", @progbits
-	.p2align P2SZREG
-	.global		__DTOR_LIST_END__
-	.hidden 	__DTOR_LIST_END__
-__DTOR_LIST_END__:
-#ifdef _LP64
-	.quad 0
-#else
-	.long 0
-#endif
-
-	.section	.eh_frame, "a", @progbits
-	.p2align P2SZREG
-#ifdef _LP64
-	.quad 0
-#else
-	.long 0
-#endif
-
-	.section	.jcr, "aw", @progbits
-	.p2align P2SZREG
-#ifdef _LP64
-	.quad 0
-#else
-	.long 0
-#endif
diff --git a/lib/csu/arch/powerpc/crti.S b/lib/csu/arch/powerpc/crti.S
deleted file mode 100644
index f9306328f..000000000
--- a/lib/csu/arch/powerpc/crti.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $NetBSD: crti.S,v 1.4 2014/03/06 19:05:59 matt Exp $ */
-
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <powerpc/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.4 2014/03/06 19:05:59 matt Exp $")
-
-#include "sysident.S"
-
-	.section ".init", "ax", @progbits
-_XENTRY(_init)
-	mflr	%r0
-#ifdef _LP64
-	stdu	%r1, -(6*SZREG)(%r1)
-	std	%r0, (2*SZREG)(%r1)
-#else
-	stw	%r0, (1*SZREG)(%r1)
-	stwu	%r1, -(4*SZREG)(%r1)
-#endif
-
-	.section ".fini", "ax", @progbits
-_XENTRY(_fini)
-	mflr	%r0
-#ifdef _LP64
-	stdu	%r1, -(6*SZREG)(%r1)
-	std	%r0, (2*SZREG)(%r1)
-#else
-	stw	%r0, (1*SZREG)(%r1)
-	stwu	%r1, -(4*SZREG)(%r1)
-#endif
diff --git a/lib/csu/arch/powerpc/crtn.S b/lib/csu/arch/powerpc/crtn.S
deleted file mode 100644
index 161268310..000000000
--- a/lib/csu/arch/powerpc/crtn.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <powerpc/asm.h>
-
-RCSID("$NetBSD: crtn.S,v 1.2 2014/02/27 16:47:48 matt Exp $")
-
-	.section ".init", "ax", @progbits
-#ifdef _LP64
-	ldreg	%r0, (2*SZREG)(%r1)
-	addi	%r1, %r1, (6*SZREG)
-#else
-	addi	%r1, %r1, (4*SZREG)
-	lwz	%r0, (1*SZREG)(%r1)
-#endif
-	mtlr	%r0
-	blr
-
-	.section ".fini", "ax", @progbits
-#ifdef _LP64
-	ldreg	%r0, (2*SZREG)(%r1)
-	addi	%r1, %r1, (6*SZREG)
-#else
-	addi	%r1, %r1, (4*SZREG)
-	lwz	%r0, (1*SZREG)(%r1)
-#endif
-	mtlr	%r0
-	blr
diff --git a/lib/csu/arch/riscv/Makefile.inc b/lib/csu/arch/riscv/Makefile.inc
deleted file mode 100644
index 8c2c2c6c5..000000000
--- a/lib/csu/arch/riscv/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/09/19 17:36:25 matt Exp $
-
-CPPFLAGS+=	-I${ARCHDIR}
-CPPFLAGS+=	-DHAVE_INITFINI_ARRAY
-#CPPFLAGS+=	-DELF_NOTE_MARCH_DESC=\"${CSU_MACHINE_ARCH}\"
diff --git a/lib/csu/arch/riscv/crt0.S b/lib/csu/arch/riscv/crt0.S
deleted file mode 100644
index 8e29152b6..000000000
--- a/lib/csu/arch/riscv/crt0.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: crt0.S,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.1 2014/09/19 17:36:25 matt Exp $")
-
-STRONG_ALIAS(_start,__start)
-
-_ENTRY(__start)
-	/*
-	 * void ___start(void (*cleanup)(void), const Obj_Entry *obj,
-	 *    struct ps_strings *ps_strings);
-	 */
-	j	___start
-END(__start)
diff --git a/lib/csu/arch/riscv/crtbegin.h b/lib/csu/arch/riscv/crtbegin.h
deleted file mode 100644
index 633b651b0..000000000
--- a/lib/csu/arch/riscv/crtbegin.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $NetBSD: crtbegin.h,v 1.1 2014/09/19 17:36:25 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-static void __do_global_ctors_aux(void) __attribute__((__constructor__)) __used;
-#ifdef SHARED
-static void __do_global_dtors_aux(void) __attribute__((__destructor__)) __used;
-#endif
diff --git a/lib/csu/arch/riscv/crtend.S b/lib/csu/arch/riscv/crtend.S
deleted file mode 100644
index feb9896f2..000000000
--- a/lib/csu/arch/riscv/crtend.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.1 2014/09/19 17:36:25 matt Exp $")
-
-	.section	.eh_frame, "a", @progbits
-	.p2align PTR_SCALESHIFT
-	.global		__EH_FRAME_END__
-	.hidden 	__EH_FRAME_END__
-__EH_FRAME_END__:
-	.space	(1 << PTR_SCALESHIFT)
-
-	.section	.jcr, "aw", @progbits
-	.p2align PTR_SCALESHIFT
-	.global		__JCR_END__
-	.hidden 	__JCR_END__
-__JCR_END__:
-	.space	(1 << PTR_SCALESHIFT)
diff --git a/lib/csu/arch/riscv/crti.S b/lib/csu/arch/riscv/crti.S
deleted file mode 100644
index 3b77fa5da..000000000
--- a/lib/csu/arch/riscv/crti.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: crti.S,v 1.1 2014/09/19 17:36:25 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.1 2014/09/19 17:36:25 matt Exp $")
-
-#include "sysident.S"
-
-/*
- * Since OR1K for NetBSD uses .init_array/.fini_array,
- * there is no need for .init/.fini
- */
diff --git a/lib/csu/arch/riscv/crtn.S b/lib/csu/arch/riscv/crtn.S
deleted file mode 100644
index 000824a9e..000000000
--- a/lib/csu/arch/riscv/crtn.S
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: crtn.S,v 1.1 2014/09/19 17:36:25 matt Exp $ */
-
-/* no need for anything here since OR1K for NetBSD uses .init_array/.fini_array */
diff --git a/lib/csu/arch/sh3/Makefile.inc b/lib/csu/arch/sh3/Makefile.inc
deleted file mode 100644
index ade41715e..000000000
--- a/lib/csu/arch/sh3/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2010/08/07 18:01:34 joerg Exp $
-
-CPPFLAGS+=	-DELFSIZE=32
-
-
diff --git a/lib/csu/arch/sh3/crt0.S b/lib/csu/arch/sh3/crt0.S
deleted file mode 100644
index c4c9b4c0a..000000000
--- a/lib/csu/arch/sh3/crt0.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $NetBSD: crt0.S,v 1.4 2012/01/31 20:17:57 uwe Exp $ */
-
-/*
- * Copyright (c) 1998 Christos Zoulas
- * 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.4 2012/01/31 20:17:57 uwe Exp $")
-
-STRONG_ALIAS(_start,__start)
-
-/*
- * Kernel setregs() passes arguments for the 6-argument version of
- * ___start (but with 5th and 6th in registers, to avoid copyout).
- * Since we now use 3-argument version of ___start - that obtains
- * argc, argv and environ from ps_strings - move its arguments to
- * proper registers.
- */
-_ENTRY(__start)
-	mov.l	.L___start, r0
-	mov	r7, r4		! void (*cleanup)(void)
-	mov	r8, r5		! const Obj_Entry *obj
-	jmp	@r0
-	 mov	r9, r6		! struct ps_strings *ps_strings
-
-	.p2align 2
-.L___start:	.long	_C_LABEL(___start)
diff --git a/lib/csu/arch/sh3/crtbegin.S b/lib/csu/arch/sh3/crtbegin.S
deleted file mode 100644
index aa7a879cd..000000000
--- a/lib/csu/arch/sh3/crtbegin.S
+++ /dev/null
@@ -1,366 +0,0 @@
-/*	$NetBSD: crtbegin.S,v 1.3 2013/09/12 15:36:14 joerg Exp $	*/
-/*-
- * Copyright (c) 2012 Valeriy E. Ushakov
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtbegin.S,v 1.3 2013/09/12 15:36:14 joerg Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.p2align 2
-__CTOR_LIST__:
-	.long -1
-
-	.section	.dtors, "aw", @progbits
-	.p2align 2
-__DTOR_LIST__:
-	.long -1
-
-	.section	.eh_frame, "a", @progbits
-	.p2align 2
-__EH_FRAME_LIST__:
-
-	.section	.jcr, "aw", @progbits
-	.p2align 2
-__JCR_LIST__:
-
-	.section	.data.rel, "aw", @progbits
-	.p2align 2
-	.globl	__dso_handle
-	.hidden	__dso_handle
-	.type	__dso_handle, @object
-	.size	__dso_handle, 4
-__dso_handle:
-#ifdef SHARED
-	.long	__dso_handle
-#else
-	.long	0
-#endif
-
-__dwarf_eh_object:
-	.zero	32
-
-__initialized:
-	.zero	1
-__finished:
-	.zero	1
-
-	.text
-	.weak	__cxa_finalize
-	.weak	__deregister_frame_info
-	.weak	__register_frame_info
-	.weak	_Jv_RegisterClasses
-
-/*
- * A bit of CPP syntactic sugar for accessing variables.
- *
- * For PIC we are obliged to use @(r0, r12) since r12 has the GOT
- * address and only r0 can be used in @(r0, Rm) addressing mode, so we
- * always load variable address to r0.
- */
-#ifdef __PIC__
-#define VAR_DATUM(var)	var@GOTOFF
-#define FUNC_DATUM(f)	f@GOT
-#define R0VAR		(r0, r12)
-#else
-#define VAR_DATUM(var)	var
-#define FUNC_DATUM(f)	f
-#define R0VAR		r0
-#endif
-
-
-__do_global_ctors_aux:
-        mov.l   r8, @-sp
-        mov.l   r9, @-sp
-#ifdef __PIC__
-        mov.l   r12, @-sp
-        mov.l   .Lc_got, r12
-        mova    .Lc_got, r0
-        add     r0, r12
-#endif
-        mov.l   r14, @-sp
-        sts.l   pr, @-sp
-	mov     sp, r14
-
-	!! if (__initialized) return;
-	mov.l	.Lc___initialized, r0
-	mov.b	@R0VAR, r1
-	tst	r1, r1
-	bf	.Lc_return
-
-	!! __initialized = 1;
-	mov	#1, r1
-	mov.b	r1, @R0VAR
-
-
-	!! if (__register_frame_info)
-	!!     __register_frame_info(&__EH_FRAME_LIST__[0], &__dwarf_eh_object)
-#ifdef __PIC__
-	mov.l	.Lc___register_frame_info_GOT, r0
-	mov.l	@R0VAR, r1
-	tst	r1, r1
-	bt	.Lc___register_frame_info_done
-	mov.l	.Lc___register_frame_info, r0
-	mov.l	.Lc___EH_FRAME_LIST__, r4
-	mov.l	.Lc___dwarf_eh_object, r5
-	add	r12, r4
-.Lc___register_frame_info_call:
-	CALL	r0
-	 add	r12, r5
-#else /* !PIC */
-	mov.l	.Lc___register_frame_info, r0
-	tst	r0, r0
-	bt	.Lc___register_frame_info_done
-	mov.l	.Lc___EH_FRAME_LIST__, r4
-	mov.l	.Lc___dwarf_eh_object, r5
-	CALL	r0
-	 nop
-#endif
-.Lc___register_frame_info_done:
-
-	!!  if (_Jv_RegisterClasses && __JCR_LIST__[0])
-	!!      _Jv_RegisterClasses(&__JCR_LIST__[0]);
-#ifdef __PIC__
-	mov.l	.Lc__Jv_RegisterClasses_GOT, r0
-	mov.l	@R0VAR, r1
-	tst	r1, r1
-	bt	.Lc__Jv_RegisterClasses_done
-
-	mov.l	.Lc___JCR_LIST__, r0
-	mov.l	@R0VAR, r1
-	tst	r1, r1
-	bt	.Lc__Jv_RegisterClasses_done
-
-	mov.l	.Lc__Jv_RegisterClasses, r2
-	mov	r0, r4
-.Lc__Jv_RegisterClasses_call:
-	CALL	r2
-	 add	r12, r4
-
-#else /* !PIC */
-	mov.l	.Lc__Jv_RegisterClasses, r2
-	tst	r2, r2
-	bt	.Lc__Jv_RegisterClasses_done
-
-	mov.l	.Lc___JCR_LIST__, r0
-	mov.l	@R0VAR, r1
-	tst	r1, r1
-	bt	.Lc__Jv_RegisterClasses_done
-
-	mov	r0, r4
-.Lc__Jv_RegisterClasses_call:
-	CALL	r2
-	 add	r12, r4
-#endif
-.Lc__Jv_RegisterClasses_done:
-
-
-	!! call all constructors on __CTOR_LIST__ in reverse order
-	mov.l	.Lc___CTOR_LIST_END__, r8
-#ifdef __PIC__
-	add	r12, r8
-#endif
-	add	#-4, r8
-	mov.l	@r8, r9
-	not	r9, r0		! sentinel at __CTOR_LIST__[0] is -1
-.Lc_ctor_list_loop:
-	tst	r0, r0
-	bt.s	.Lc_ctor_list_done
-	 add	#-4, r8
-	jsr	@r9
-	 mov.l	@r8, r9
-	bra	.Lc_ctor_list_loop
-	 not	r9, r0
-.Lc_ctor_list_done:
-
-.Lc_return:
-	mov	r14, sp
-	lds.l	@sp+, pr
-	mov.l	@sp+, r14
-#ifdef __PIC__
-	mov.l	@sp+, r12
-#endif
-	mov.l	@sp+, r9
-	rts
-	 mov.l	@sp+, r8
-
-	.p2align 2
-.Lc_got:
-	PIC_GOT_DATUM
-.Lc___initialized:
-	.long	VAR_DATUM(__initialized)
-#ifdef __PIC__
-.Lc___register_frame_info_GOT:
-	.long	__register_frame_info@GOT
-#endif
-.Lc___register_frame_info:
-	CALL_DATUM(__register_frame_info, .Lc___register_frame_info_call)
-.Lc___EH_FRAME_LIST__:
-	.long	VAR_DATUM(__EH_FRAME_LIST__)
-.Lc___dwarf_eh_object:
-	.long	VAR_DATUM(__dwarf_eh_object)
-#ifdef __PIC__
-.Lc__Jv_RegisterClasses_GOT:
-	.long	_Jv_RegisterClasses@GOT
-#endif
-.Lc__Jv_RegisterClasses:
-	CALL_DATUM(_Jv_RegisterClasses, .Lc__Jv_RegisterClasses_call)
-.Lc___JCR_LIST__:
-	.long	VAR_DATUM(__JCR_LIST__)
-.Lc___CTOR_LIST_END__:
-	.long	VAR_DATUM(__CTOR_LIST_END__)
-
-
-__do_global_dtors_aux:
-        mov.l   r8, @-sp
-        mov.l   r9, @-sp
-#ifdef __PIC__
-        mov.l   r12, @-sp
-        mov.l   .Ld_got, r12
-        mova    .Ld_got, r0
-        add     r0, r12
-#endif
-        mov.l   r14, @-sp
-        sts.l   pr, @-sp
-	mov     sp, r14
-
-	!! if (__finished) return;
-	mov.l	.Ld___finished, r0
-	mov.b	@R0VAR, r1
-	tst	r1, r1
-	bf	.Ld_return
-
-	!! __finished = 1;
-	mov	#1, r1
-	mov.b	r1, @R0VAR
-
-#ifdef SHARED /* implies PIC */
-	!! if (__cxa_finalize)
-	!!     __cxa_finalize(&__dso_handle);
-	mov.l	.Ld___cxa_finalize_GOT, r0
-	mov.l	@R0VAR, r1
-	tst	r1, r1
-	bt	.Ld___cxa_finalize_done
-	mov.l	.Ld___cxa_finalize, r0
-	mov.l	.Ld___dso_handle, r4
-.Ld___cxa_finalize_call:
-	CALL	r0
-	 add	r12, r4
-.Ld___cxa_finalize_done:
-#endif	/* SHARED */
-
-	!! call all destructors on __DTOR_LIST__
-	mov.l	.Ld___DTOR_LIST__, r8
-#ifdef __PIC__
-	add	r12, r8
-#endif
-	add	#4, r8		! skip first entry that we know to be -1
-	mov.l	@r8+, r9
-	tst	r9, r9
-.Ld_dtor_list_loop:
-	bt	.Ld_dtor_list_done
-	jsr	@r9
-	 mov.l	@r8+, r9
-	bra	.Ld_dtor_list_loop
-	 tst	r9, r9
-.Ld_dtor_list_done:
-
-	!! if (__deregister_frame_info)
-	!!     __deregister_frame_info(&__EH_FRAME_LIST__[0]);
-#ifdef __PIC__
-	mov.l	.Ld___deregister_frame_info_GOT, r0
-	mov.l	@R0VAR, r1
-	tst	r1, r1
-	bt	.Ld___deregister_frame_info_done
-	mov.l	.Ld___deregister_frame_info, r0
-	mov.l	.Ld___EH_FRAME_LIST__, r4
-.Ld___deregister_frame_info_call:
-	CALL	r0
-	 add	r12, r4
-#else /* !PIC */
-	mov.l	.Ld___deregister_frame_info, r0
-	tst	r0, r0
-	bt	.Ld___deregister_frame_info_done
-	mov.l	.Ld___EH_FRAME_LIST__, r4
-	CALL	r0
-	 nop
-#endif
-.Ld___deregister_frame_info_done:
-
-.Ld_return:
-	mov	r14, sp
-	lds.l	@sp+, pr
-	mov.l	@sp+, r14
-#ifdef __PIC__
-	mov.l	@sp+, r12
-#endif
-	mov.l	@sp+, r9
-	rts
-	 mov.l	@sp+, r8
-
-	.p2align 2
-.Ld_got:
-	PIC_GOT_DATUM
-.Ld___finished:
-	.long	VAR_DATUM(__finished)
-#ifdef SHARED /* implies PIC */
-.Ld___cxa_finalize_GOT:
-	.long	__cxa_finalize@GOT
-.Ld___cxa_finalize:
-	CALL_DATUM(__cxa_finalize, .Ld___cxa_finalize_call)
-.Ld___dso_handle:
-	.long	VAR_DATUM(__dso_handle)
-#endif
-.Ld___DTOR_LIST__:
-	.long	VAR_DATUM(__DTOR_LIST__)
-#ifdef __PIC__
-.Ld___deregister_frame_info_GOT:
-	.long	__deregister_frame_info@GOT
-#endif
-.Ld___deregister_frame_info:
-	CALL_DATUM(__deregister_frame_info, .Ld___deregister_frame_info_call)
-.Ld___EH_FRAME_LIST__:
-	.long	VAR_DATUM(__EH_FRAME_LIST__)
-
-
-
-#define _CALL_INIT_FINI_FUNCTION(func)					\
-	mov.l	1f, r1;							\
-	mova	2f, r0;							\
-0:	braf	r1;	/* NB: branch, not call ... */			\
-	 lds	r0, pr;	/* skip the following .long when returning */	\
-	.p2align 2;							\
-1:	.long func - (0b+4);						\
-2:	;
-
-	.section	.init, "ax", @progbits
-	_CALL_INIT_FINI_FUNCTION(__do_global_ctors_aux)
-
-	.section	.fini, "ax", @progbits
-	_CALL_INIT_FINI_FUNCTION(__do_global_dtors_aux)
diff --git a/lib/csu/arch/sh3/crtend.S b/lib/csu/arch/sh3/crtend.S
deleted file mode 100644
index c7c37f269..000000000
--- a/lib/csu/arch/sh3/crtend.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.2 2012/01/31 20:12:47 uwe Exp $	*/
-/*-
- * Copyright (c) 2010 Joerg Sonnenberger <joerg@NetBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.2 2012/01/31 20:12:47 uwe Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.p2align 2
-	.global		__CTOR_LIST_END__
-	.hidden 	__CTOR_LIST_END__
-__CTOR_LIST_END__:
-	.long 0
-
-	.section	.dtors, "aw", @progbits
-	.p2align 2
-	.long 0
-
-	.section	.eh_frame, "a", @progbits
-	.p2align 2
-	.long 0
-
-	.section	.jcr, "aw", @progbits
-	.p2align 2
-	.long 0
diff --git a/lib/csu/arch/sh3/crti.S b/lib/csu/arch/sh3/crti.S
deleted file mode 100644
index 7966c7f32..000000000
--- a/lib/csu/arch/sh3/crti.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/* $NetBSD: crti.S,v 1.3 2012/01/31 20:12:47 uwe Exp $ */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.3 2012/01/31 20:12:47 uwe Exp $")
-
-#include "sysident.S"
-
-
-/*
- * Provide function prologues for the code in .init and .fini sections.
- * Corresponding epilogues are in crtn.S
- */
-
-	.section ".init", "ax", @progbits
-	.p2align 2
-	.globl _init
-_init:
-	mov.l	r14, @-sp
-	sts.l	pr, @-sp
-	mov	sp, r14
-
-	.section ".fini", "ax", @progbits
-	.p2align 2
-	.globl _fini
-_fini:
-	mov.l	r14, @-sp
-	sts.l	pr, @-sp
-	mov	sp, r14
diff --git a/lib/csu/arch/sh3/crtn.S b/lib/csu/arch/sh3/crtn.S
deleted file mode 100644
index f950e1521..000000000
--- a/lib/csu/arch/sh3/crtn.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $NetBSD: crtn.S,v 1.2 2012/01/28 12:45:43 uwe Exp $ */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtn.S,v 1.2 2012/01/28 12:45:43 uwe Exp $")
-
-
-/*
- * Provide function epilogues for the code in .init and .fini sections.
- * Corresponding prologues are in crti.S
- */
-
-	.section ".init", "ax", @progbits
-	mov	r14, sp
-	lds.l	@sp+, pr
-	rts
-	 mov.l	@sp+, r14
-
-	.section ".fini", "ax", @progbits
-	mov	r14, sp
-	lds.l	@sp+, pr
-	rts
-	 mov.l	@sp+, r14
diff --git a/lib/csu/arch/sparc/Makefile.inc b/lib/csu/arch/sparc/Makefile.inc
deleted file mode 100644
index 51ce1cb8c..000000000
--- a/lib/csu/arch/sparc/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.2 2013/07/11 06:57:15 martin Exp $
-
-CPPFLAGS+=	-DELFSIZE=32 -I${ARCHDIR}
-
-
diff --git a/lib/csu/arch/sparc/crt0.S b/lib/csu/arch/sparc/crt0.S
deleted file mode 100644
index 4789aafea..000000000
--- a/lib/csu/arch/sparc/crt0.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $NetBSD: crt0.S,v 1.2 2013/07/11 06:57:15 martin Exp $ */
-
-/*
- * Copyright (c) 1998 Christos Zoulas
- * 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.2 2013/07/11 06:57:15 martin Exp $")
-
-STRONG_ALIAS(_start,__start)
-
-	! called with:
-	!  %g3 = cleanup
-	!  %g2 = obj
-	!  %g1 = ps_strings
-	! call: ___start(cleanup, obj, ps_strings)
-_ENTRY(__start)
-	mov	0, %fp
-	andn	%sp, 7,	%sp		! align stack
-	sub	%sp, 24, %sp		! expand to standard stack frame size
-	mov	%g3, %o0
-	mov	%g2, %o1
-	call	___start
-	 mov	%g1, %o2
-
diff --git a/lib/csu/arch/sparc/crtbegin.h b/lib/csu/arch/sparc/crtbegin.h
deleted file mode 100644
index e3676ddcf..000000000
--- a/lib/csu/arch/sparc/crtbegin.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-__asm(	"\n\t"
-	".pushsection .init, \"ax\", @progbits"			"\n\t"
-	"call	__do_global_ctors_aux"				"\n\t"
-	" nop"							"\n\t"
-	".popsection");
-
-__asm(	"\n\t"
-	".pushsection .fini, \"ax\", @progbits" "\n\t"
-	"call	__do_global_dtors_aux"				"\n\t"
-	" nop"							"\n\t"
-	".popsection");
diff --git a/lib/csu/arch/sparc/crtend.S b/lib/csu/arch/sparc/crtend.S
deleted file mode 100644
index 8e92494e3..000000000
--- a/lib/csu/arch/sparc/crtend.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.1 2013/07/11 06:57:15 martin Exp $	*/
-/*-
- * Copyright (c) 2010 Joerg Sonnenberger <joerg@NetBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.1 2013/07/11 06:57:15 martin Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.align 4
-	.global		__CTOR_LIST_END__
-	.hidden 	__CTOR_LIST_END__
-__CTOR_LIST_END__:
-	.long 0
-
-	.section	.dtors, "aw", @progbits
-	.align 4
-	.global		__DTOR_LIST_END__
-	.hidden 	__DTOR_LIST_END__
-__DTOR_LIST_END__:
-	.long 0
-
-	.section	.eh_frame, "a", @progbits
-	.align 4
-	.long 0
-
-	.section	.jcr, "aw", @progbits
-	.align 4
-	.long 0
diff --git a/lib/csu/arch/sparc/crti.S b/lib/csu/arch/sparc/crti.S
deleted file mode 100644
index 8f8128a7e..000000000
--- a/lib/csu/arch/sparc/crti.S
+++ /dev/null
@@ -1,78 +0,0 @@
-/* $NetBSD: crti.S,v 1.1 2010/08/07 18:01:34 joerg Exp $ */
-
-/*
- * Copyright (c) 2001 Matthew R. Green
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.1 2010/08/07 18:01:34 joerg Exp $")
-
-#include "sysident.S"
-
-	.section ".init", "ax", @progbits
-	.align 4
-	.globl _init
-_init:
-	save    %sp, -96, %sp
-
-	.section ".fini", "ax", @progbits
-	.align 4
-	.globl _fini
-_fini:
-	save    %sp, -96, %sp
diff --git a/lib/csu/arch/sparc/crtn.S b/lib/csu/arch/sparc/crtn.S
deleted file mode 100644
index d86319a99..000000000
--- a/lib/csu/arch/sparc/crtn.S
+++ /dev/null
@@ -1,74 +0,0 @@
-/* $NetBSD: crtn.S,v 1.1 2010/08/07 18:01:34 joerg Exp $ */
-
-/*
- * Copyright (c) 2001 Matthew R. Green
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtn.S,v 1.1 2010/08/07 18:01:34 joerg Exp $")
-
-	.section ".init", "ax", @progbits
-	.align 4
-	ret
-	 restore
-
-	.section ".fini", "ax", @progbits
-	.align 4
-	ret
-	 restore
diff --git a/lib/csu/arch/sparc64/Makefile.inc b/lib/csu/arch/sparc64/Makefile.inc
deleted file mode 100644
index 71a9b3af2..000000000
--- a/lib/csu/arch/sparc64/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2013/07/11 06:57:15 martin Exp $
-
-CPPFLAGS+=	-DELFSIZE=64 -I${ARCHDIR}
-
-
diff --git a/lib/csu/arch/sparc64/crt0.S b/lib/csu/arch/sparc64/crt0.S
deleted file mode 100644
index db5b17bae..000000000
--- a/lib/csu/arch/sparc64/crt0.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $NetBSD: crt0.S,v 1.1 2013/07/11 06:57:15 martin Exp $ */
-
-/*
- * Copyright (c) 1998 Christos Zoulas
- * 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.1 2013/07/11 06:57:15 martin Exp $")
-
-STRONG_ALIAS(_start,__start)
-
-	.align 4
-	.register %g3,#scratch
-	.register %g2,#scratch
-
-	! called with:
-	!  %g3 = cleanup
-	!  %g2 = obj
-	!  %g1 = ps_strings
-	! call: ___start(cleanup, obj, ps_strings)
-_ENTRY(__start)
-	clr	%fp
-	clr	%g4			! data base for some memory models
-	mov	%g3, %o0
-	mov	%g2, %o1
-	ba,pt	%icc,___start
-	 mov	%g1, %o2
-
diff --git a/lib/csu/arch/sparc64/crtbegin.h b/lib/csu/arch/sparc64/crtbegin.h
deleted file mode 100644
index bb8272138..000000000
--- a/lib/csu/arch/sparc64/crtbegin.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-__asm(	"\n\t"
-	".pushsection .init, \"ax\", @progbits"			"\n\t"
-	"call __do_global_ctors_aux"				"\n\t"
-	" nop"							"\n\t"
-	".popsection");
-
-__asm(	"\n\t"
-	".pushsection .fini, \"ax\", @progbits"			"\n\t"
-	"call __do_global_dtors_aux"				"\n\t"
-	" nop"							"\n\t"
-	".popsection");
diff --git a/lib/csu/arch/sparc64/crtend.S b/lib/csu/arch/sparc64/crtend.S
deleted file mode 100644
index 96cd5e4c8..000000000
--- a/lib/csu/arch/sparc64/crtend.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.1 2013/07/11 06:57:15 martin Exp $	*/
-/*-
- * Copyright (c) 2010 Joerg Sonnenberger <joerg@NetBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.1 2013/07/11 06:57:15 martin Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.align 8
-	.global		__CTOR_LIST_END__
-	.hidden 	__CTOR_LIST_END__
-__CTOR_LIST_END__:
-	.quad 0
-
-	.section	.dtors, "aw", @progbits
-	.align 8
-	.global		__DTOR_LIST_END__
-	.hidden 	__DTOR_LIST_END__
-__DTOR_LIST_END__:
-	.quad 0
-
-	.section	.eh_frame, "a", @progbits
-	.align 8
-	.quad 0
-
-	.section	.jcr, "aw", @progbits
-	.align 8
-	.quad 0
diff --git a/lib/csu/arch/sparc64/crti.S b/lib/csu/arch/sparc64/crti.S
deleted file mode 100644
index 472ac5cf6..000000000
--- a/lib/csu/arch/sparc64/crti.S
+++ /dev/null
@@ -1,78 +0,0 @@
-/* $NetBSD: crti.S,v 1.1 2013/07/11 06:57:15 martin Exp $ */
-
-/*
- * Copyright (c) 2001 Matthew R. Green
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.1 2013/07/11 06:57:15 martin Exp $")
-
-#include "sysident.S"
-
-	.section ".init", "ax", @progbits
-	.align 4
-	.globl _init
-_init:
-	save    %sp, -176, %sp
-
-	.section ".fini", "ax", @progbits
-	.align 4
-	.globl _fini
-_fini:
-	save    %sp, -176, %sp
diff --git a/lib/csu/arch/sparc64/crtn.S b/lib/csu/arch/sparc64/crtn.S
deleted file mode 100644
index f7306017e..000000000
--- a/lib/csu/arch/sparc64/crtn.S
+++ /dev/null
@@ -1,74 +0,0 @@
-/* $NetBSD: crtn.S,v 1.1 2013/07/11 06:57:15 martin Exp $ */
-
-/*
- * Copyright (c) 2001 Matthew R. Green
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtn.S,v 1.1 2013/07/11 06:57:15 martin Exp $")
-
-	.section ".init", "ax", @progbits
-	.align 4
-	ret
-	 restore
-
-	.section ".fini", "ax", @progbits
-	.align 4
-	ret
-	 restore
diff --git a/lib/csu/arch/vax/Makefile.inc b/lib/csu/arch/vax/Makefile.inc
deleted file mode 100644
index b659a66c1..000000000
--- a/lib/csu/arch/vax/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.3 2013/06/25 00:30:07 matt Exp $
-
-CPPFLAGS+=	-I${ARCHDIR}
diff --git a/lib/csu/arch/vax/crt0.S b/lib/csu/arch/vax/crt0.S
deleted file mode 100644
index 04e90fb0b..000000000
--- a/lib/csu/arch/vax/crt0.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $NetBSD: crt0.S,v 1.3 2013/06/21 15:54:08 matt Exp $ */
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <vax/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.3 2013/06/21 15:54:08 matt Exp $")
-
-STRONG_ALIAS(_start,__start)
-
-_ENTRY(__start, 0x0101)
-	movq	%r8,-(%sp)	/* ps_strings / obj */
-	pushl	%r7		/* cleanup */
-	calls	$3,___start
-END(__start)
diff --git a/lib/csu/arch/vax/crtbegin.S b/lib/csu/arch/vax/crtbegin.S
deleted file mode 100644
index 208c4658a..000000000
--- a/lib/csu/arch/vax/crtbegin.S
+++ /dev/null
@@ -1,182 +0,0 @@
-/*	$NetBSD: crtbegin.S,v 1.7 2014/03/16 11:41:30 joerg Exp $	*/
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <vax/asm.h>
-
-RCSID("$NetBSD: crtbegin.S,v 1.7 2014/03/16 11:41:30 joerg Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.p2align 2
-__CTOR_LIST__:		/* symbol is not used */
-	.long -1
-
-	.section	.dtors, "aw", @progbits
-	.p2align 2
-__DTOR_LIST__:
-	.long -1
-
-	.section	.eh_frame, "a", @progbits
-	.p2align 2
-__EH_FRAME_LIST__:
-
-	.section	.jcr, "aw", @progbits
-	.p2align 2
-__JCR_LIST__:
-
-	.section	.data.rel, "aw", @progbits
-	.p2align 2
-	.type	__dso_handle, @object
-	.size	__dso_handle, 4
-	.globl	__dso_handle
-	.hidden	__dso_handle
-__dso_handle:
-#ifdef SHARED
-	.long	__dso_handle
-#else
-	.long	0
-#endif
-
-	.local	__dwarf_eh_object
-	.comm	__dwarf_eh_object,32
-	.local	__initialized
-	.comm	__initialized,1
-	.local	__finished
-	.comm	__finished,1
-
-	.text
-/*
- * All variables are local to this DSO so we can skip using GOT references
- * and instead use PCREL references to access them.  We do this regardless
- * of being PIC since it isn't any additional overhead to do so.
- *
- * We don't setup a TOC since all of ours calls are indirect so it isn't
- * needed.
- */
-
-	.hidden __do_global_dtors_aux
-
-_ENTRY(__do_global_dtors_aux, 0x0100)		/* save r8 */
-	tstb	__finished			/* done this already? */
-	bneq	4f
-	movb	$1, __finished			/* mark it as done */
-
-#ifdef SHARED
-	/*
-	 * if (__cxa_finalize)
-	 *	__cxa_finalize(&__dso_handle);
-	 */
-	movab	__cxa_finalize, %r0
-	beql	1f
-	pushal	__dso_handle	
-	calls	$0, (%r0)
-1:
-#endif /* SHARED */
-
-	/*
-	 * We use load with postincrement to advance the pointer along.
-	 * We know the list ends with 0.  If we load one, we must be done.
-	 */
-	moval	__DTOR_LIST__+4, %r8	/* skip first entry */
-2:	movl	(%r8)+, %r0		/* r0 = *r8++; */
-	beql	3f
-	calls	$0, (%r0)
-	brb	2b
-3:
-
-#ifdef SHARED
-	/*
-	 * if (__deregister_frame_info)
-	 *     __deregister_frame_info(&__EH_FRAME_LIST__[0]);
-	 */
-	moval	__deregister_frame_info, %r0
-	beql	4f
-	pushal	__EH_FRAME_LIST__
-	calls	$0, (%r0)
-#endif /* SHARED */
-
-4:	ret
-END(__do_global_dtors_aux)
-
-	.weak	__deregister_frame_info
-	.weak	__cxa_finalize
-
-	.weak	__register_frame_info
-	.weak	_Jv_RegisterClasses
-
-	.hidden __do_global_ctors_aux
-
-_ENTRY(__do_global_ctors_aux, 0x0800)
-	tstb	__initialized
-	bneq	4f
-	movb	$1, __initialized
-
-	/*
-	 * if (__register_frame_info)
-	 *     __register_frame_info(&__EH_FRAME_LIST__[0], &__dwarf_eh_object)
-	 */
-	movab	__register_frame_info, %r0
-	beql	1f
-
-	pushal	__dwarf_eh_object
-	pushal	__EH_FRAME_LIST__
-	calls	$0, (%r0)
-1:
-
-	/*
-	 * if (_Jv_RegisterClasses && __JCR_LIST__[0])
-	 *     _Jv_RegisterClasses(&__JCR_LIST__[0]);
-	 */
-	movab	_Jv_RegisterClasses, %r0
-	beql	2f
-
-	pushal	__JCR_LIST__
-	calls	$0, (%r0)
-2:
-
-	/*
-	 * Get the end of the CTOR list.  The first entry is -1 so if we
-	 * load a negative address, we know we are done.
-	 */
-
-	moval	__CTOR_LIST_END__, %r8	/* get end of list */
-3:	movl	-(%r8), %r0		/* get function pointer with predec */
-	blss	4f			/*  negative?  done. */
-	calls	$0, (%r0)		/* call it */
-	brb	3b			/* get next one */
-
-4:	ret
-END(__do_global_ctors_aux)
-
-	.hidden	_C_LABEL(__CTOR_LIST_END__)
-
-	.section	.init, "ax", @progbits
-	calls	$0, __do_global_ctors_aux
-	.section	.fini, "ax", @progbits
-	calls	$0, __do_global_dtors_aux
diff --git a/lib/csu/arch/vax/crtbegin.h b/lib/csu/arch/vax/crtbegin.h
deleted file mode 100644
index 5bb3687e8..000000000
--- a/lib/csu/arch/vax/crtbegin.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-__asm(	".pushsection	.init, \"ax\", @progbits"	"\n\t"
-	"calls	$0, __do_global_ctors_aux"		"\n\t"
-	".popsection"					"\n\t"
-	".pushsection	.fini, \"ax\", @progbits"	"\n\t"
-	"calls	$0, __do_global_dtors_aux"		"\n\t"
-	".popsection"
-	);
diff --git a/lib/csu/arch/vax/crtend.S b/lib/csu/arch/vax/crtend.S
deleted file mode 100644
index 23d54f749..000000000
--- a/lib/csu/arch/vax/crtend.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.2 2013/06/25 00:30:07 matt Exp $	*/
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <vax/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.2 2013/06/25 00:30:07 matt Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.p2align 2
-	.global		__CTOR_LIST_END__
-	.hidden 	__CTOR_LIST_END__
-__CTOR_LIST_END__:
-	.long		0
-
-	.section	.dtors, "aw", @progbits
-	.p2align 2
-	.global		__DTOR_LIST_END__
-	.hidden 	__DTOR_LIST_END__
-__DTOR_LIST_END__:
-	.long		0
-
-	.section	.eh_frame, "a", @progbits
-	.p2align 2
-	.space	4
-
-	.section	.jcr, "aw", @progbits
-	.p2align 2
-	.space	4
diff --git a/lib/csu/arch/vax/crti.S b/lib/csu/arch/vax/crti.S
deleted file mode 100644
index 6a554539a..000000000
--- a/lib/csu/arch/vax/crti.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $NetBSD: crti.S,v 1.1 2010/08/07 18:01:34 joerg Exp $ */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.1 2010/08/07 18:01:34 joerg Exp $")
-
-#include "sysident.S"
-
-	.section ".init", "ax", @progbits
-	.align 1
-	.globl _init
-_init:
-	.word 0
-
-	.section ".fini", "ax", @progbits
-	.align 1
-	.globl _fini
-_fini:
-	.word 0
diff --git a/lib/csu/arch/vax/crtn.S b/lib/csu/arch/vax/crtn.S
deleted file mode 100644
index 3cfb46693..000000000
--- a/lib/csu/arch/vax/crtn.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $NetBSD: crtn.S,v 1.1 2010/08/07 18:01:34 joerg Exp $ */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtn.S,v 1.1 2010/08/07 18:01:34 joerg Exp $")
-
-	.section ".init", "ax", @progbits
-	ret
-
-	.section ".fini", "ax", @progbits
-	ret
diff --git a/lib/csu/arch/x86_64/Makefile.inc b/lib/csu/arch/x86_64/Makefile.inc
deleted file mode 100644
index 2cb588f95..000000000
--- a/lib/csu/arch/x86_64/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2010/08/07 18:01:34 joerg Exp $
-
-CPPFLAGS+=	-DELFSIZE=64
diff --git a/lib/csu/arch/x86_64/crt0.S b/lib/csu/arch/x86_64/crt0.S
deleted file mode 100644
index 8ee9871a5..000000000
--- a/lib/csu/arch/x86_64/crt0.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $NetBSD: crt0.S,v 1.3 2011/07/01 02:59:05 joerg Exp $ */
-
-/*
- * Copyright (c) 1998 Christos Zoulas
- * 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crt0.S,v 1.3 2011/07/01 02:59:05 joerg Exp $")
-
-STRONG_ALIAS(_start,__start)
-	.hidden ___start
-
-_ENTRY(__start)
-	andq    $~15,%rsp
-	subq    $8,%rsp
-	movq	%rdx, %rdi
-	movq	%rcx, %rsi
-	movq	%rbx, %rdx
-	jmp	___start
diff --git a/lib/csu/arch/x86_64/crtbegin.S b/lib/csu/arch/x86_64/crtbegin.S
deleted file mode 100644
index 7efba6881..000000000
--- a/lib/csu/arch/x86_64/crtbegin.S
+++ /dev/null
@@ -1,156 +0,0 @@
-/*	$NetBSD: crtbegin.S,v 1.2 2010/11/30 18:37:59 joerg Exp $	*/
-/*-
- * Copyright (c) 2010 Joerg Sonnenberger <joerg@NetBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtbegin.S,v 1.2 2010/11/30 18:37:59 joerg Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.align 8
-__CTOR_LIST__:
-	.quad -1
-
-	.section	.dtors, "aw", @progbits
-	.align 8
-__DTOR_LIST__:
-	.quad -1
-
-	.section	.eh_frame, "a", @progbits
-	.align 8
-__EH_FRAME_LIST__:
-
-	.section	.jcr, "aw", @progbits
-	.align 8
-__JCR_LIST__:
-
-	.section	.data.rel, "aw", @progbits
-	.align 8
-	.type	__dso_handle, @object
-	.size	__dso_handle, 8
-	.globl	__dso_handle
-	.hidden	__dso_handle
-__dso_handle:
-#ifdef SHARED
-	.quad	__dso_handle
-#else
-	.quad	0
-#endif
-
-__dwarf_eh_object:
-	.zero	64
-
-__initialized:
-	.zero	1
-__finished:
-	.zero	1
-
-	.text
-	.weak	__cxa_finalize
-	.weak	__deregister_frame_info
-	.weak	__register_frame_info
-	.weak	_Jv_RegisterClasses
-
-__do_global_dtors_aux:
-	cmpb	$0, __finished(%rip)
-	je	1f
-	ret
-1:
-	pushq	%rbx
-	movb	$1, __finished(%rip)
-
-
-#ifdef SHARED
-	cmpq	$0, __cxa_finalize@GOTPCREL(%rip)
-	je	2f
-	movq	__dso_handle(%rip), %rdi
-	call	__cxa_finalize@PLT
-2:
-#endif
-
-	leaq	8+__DTOR_LIST__(%rip), %rbx
-3:
-	movq	(%rbx), %rax
-	testq	%rax, %rax
-	je	4f
-	call	*%rax
-	addq	$8, %rbx
-	jmp	3b	
-4:
-
-	cmpq	$0, __deregister_frame_info@GOTPCREL(%rip)
-	je	5f
-	leaq	__EH_FRAME_LIST__(%rip), %rdi
-	call	__deregister_frame_info@PLT
-5:
-	popq	%rbx
-	ret
-
-
-__do_global_ctors_aux:
-	cmpb	$0, __initialized(%rip)
-	je	1f
-	ret
-1:
-	pushq	%rbx
-	movb	$1, __initialized(%rip)
-
-	cmpq	$0, __register_frame_info@GOTPCREL(%rip)
-	je	2f
-	leaq	__dwarf_eh_object(%rip), %rsi
-	leaq	__EH_FRAME_LIST__(%rip), %rdi
-	call	__register_frame_info@PLT
-
-2:
-	cmpq	$0, _Jv_RegisterClasses@GOTPCREL(%rip)
-	je	3f
-	leaq	__JCR_LIST__(%rip), %rdi
-	cmpq	$0, (%rdi)
-	je 	3f
-	call	_Jv_RegisterClasses@PLT
-3:
-
-	leaq	-8+__CTOR_LIST_END__(%rip), %rbx
-4:
-	movq	(%rbx), %rax
-	cmpq	$-1, %rax
-	je	5f
-	call	*%rax
-	subq	$8, %rbx
-	jmp	4b
-
-5:
-	popq	%rbx
-
-	ret
-
-	.section	.init, "ax", @progbits
-	call	__do_global_ctors_aux
-	.section	.fini, "ax", @progbits
-	call	__do_global_dtors_aux
diff --git a/lib/csu/arch/x86_64/crtend.S b/lib/csu/arch/x86_64/crtend.S
deleted file mode 100644
index ae7f1e405..000000000
--- a/lib/csu/arch/x86_64/crtend.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: crtend.S,v 1.1 2010/08/07 18:01:34 joerg Exp $	*/
-/*-
- * Copyright (c) 2010 Joerg Sonnenberger <joerg@NetBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtend.S,v 1.1 2010/08/07 18:01:34 joerg Exp $")
-
-	.section	.ctors, "aw", @progbits
-	.align 8
-	.global		__CTOR_LIST_END__
-	.hidden 	__CTOR_LIST_END__
-__CTOR_LIST_END__:
-	.quad 0
-
-	.section	.dtors, "aw", @progbits
-	.align 8
-	.quad 0
-
-	.section	.eh_frame, "a", @progbits
-	.align 8
-	.quad 0
-
-	.section	.jcr, "aw", @progbits
-	.align 8
-	.quad 0
diff --git a/lib/csu/arch/x86_64/crti.S b/lib/csu/arch/x86_64/crti.S
deleted file mode 100644
index 1b00f5aa9..000000000
--- a/lib/csu/arch/x86_64/crti.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $NetBSD: crti.S,v 1.1 2010/08/07 18:01:35 joerg Exp $ */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crti.S,v 1.1 2010/08/07 18:01:35 joerg Exp $")
-
-#include "sysident.S"
-
-	.section ".init", "ax", @progbits
-	.align 16
-	.globl _init
-_init:
-	subq	$8, %rsp
-
-	.section ".fini", "ax", @progbits
-	.align 16
-	.globl _fini
-_fini:
-	subq	$8, %rsp
diff --git a/lib/csu/arch/x86_64/crtn.S b/lib/csu/arch/x86_64/crtn.S
deleted file mode 100644
index 3119cbdbf..000000000
--- a/lib/csu/arch/x86_64/crtn.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: crtn.S,v 1.1 2010/08/07 18:01:35 joerg Exp $ */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: crtn.S,v 1.1 2010/08/07 18:01:35 joerg Exp $")
-
-	.section ".init", "ax", @progbits
-	addq	$8, %rsp
-	ret
-
-	.section ".fini", "ax", @progbits
-	addq	$8, %rsp
-	ret
diff --git a/lib/csu/common/Makefile.inc b/lib/csu/common/Makefile.inc
deleted file mode 100644
index 56762ce65..000000000
--- a/lib/csu/common/Makefile.inc
+++ /dev/null
@@ -1,134 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.25 2014/03/04 17:57:56 joerg Exp $
-
-.include <bsd.own.mk>
-
-# XXX: FIXME: This is defined in bsd.lib.mk
-PICFLAGS ?= -fPIC
-
-COMMON_DIR:=	${.CURDIR}/common
-.PATH:		${COMMON_DIR}
-
-CPPFLAGS+=	-I${NETBSDSRCDIR}/libexec/ld.elf_so -I${COMMON_DIR} -I.
-
-OBJS+=		crt0.o gcrt0.o crti.o crtn.o
-OBJS+=		crtbegin.o crtend.o
-
-.if ${MKPIC} == "yes"
-OBJS+=		crtbeginS.o
-CFLAGS.crtbegin.c+= -fPIE
-.endif
-.if ${MACHINE_ARCH} == "alpha"
-OBJS+=		crtfm.o
-.endif
-
-.if ${CSU_MACHINE_ARCH} == "sparc64"
-# create helper objects for the compiler to mark compiler memory models
-.for m in medlow medmid medany
-sparc_mc${m}.o:	compident.S sysident_assym.h
-	${CC} ${ASFLAGS} -I. -DCONTENT=\"${m}\\0\\0\" -DCONTENTLENGTH=8 -c \
-		-o $@ ${COMMON_DIR}/compident.S
-.endfor
-OBJS += sparc_mcmedlow.o sparc_mcmedmid.o sparc_mcmedany.o
-.endif
-
-realall: ${OBJS}
-
-.if exists(${ARCHDIR}/crtbegin.S)
-crtbegin.o: crtbegin.S
-	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${ARCHDIR}/crtbegin.S -o ${.TARGET}.o
-.else
-crtbegin.o: crtbegin.c crtbegin.h
-	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${CFLAGS.crtbegin.c} ${COMMON_DIR}/crtbegin.c -o ${.TARGET}.o
-.endif
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET} 
-	rm -f ${.TARGET}.o
-.if ${MKSTRIPIDENT} != "no"
-	${OBJCOPY} -R .ident ${.TARGET}
-.endif
-
-.if exists(${ARCHDIR}/crtbegin.S)
-crtbeginS.o: crtbegin.S
-	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${PICFLAGS} -DSHARED ${ARCHDIR}/crtbegin.S -o ${.TARGET}.o
-.else
-crtbeginS.o: crtbegin.c crtbegin.h
-	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${PICFLAGS} -DSHARED ${COMMON_DIR}/crtbegin.c -o ${.TARGET}.o
-.endif
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET} 
-	rm -f ${.TARGET}.o
-.if ${MKSTRIPIDENT} != "no"
-	${OBJCOPY} -R .ident ${.TARGET}
-.endif
-
-crtend.o: crtend.S
-	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${ARCHDIR}/crtend.S -o ${.TARGET}.o
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET} 
-	rm -f ${.TARGET}.o
-.if ${MKSTRIPIDENT} != "no"
-	${OBJCOPY} -R .ident ${.TARGET}
-.endif
-
-.if ${MKPIC} != "no"
-MY_PICFLAGS=	${PICFLAGS}
-.else
-MY_PICFLAGS=
-.endif
-
-crt0.o: crt0.S crt0-common.c
-	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${ARCHDIR}/crt0.S -o ${.TARGET}.S.o
-	${COMPILE.c} ${MY_PICFLAGS} ${COMMON_DIR}/crt0-common.c -o ${.TARGET}.c.o
-	${LD} -r -o ${.TARGET}.o ${.TARGET}.S.o ${.TARGET}.c.o
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET} 
-	rm -f ${.TARGET}.S.o ${.TARGET}.c.o ${.TARGET}.o
-.if ${MKSTRIPIDENT} != "no"
-	${OBJCOPY} -R .ident ${.TARGET}
-.endif
-
-gcrt0.o: crt0.S crt0-common.c
-	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${ARCHDIR}/crt0.S -o ${.TARGET}.S.o
-	${COMPILE.c} ${MY_PICFLAGS} -DMCRT0 ${COMMON_DIR}/crt0-common.c -o ${.TARGET}.c.o
-	${LD} -r -o ${.TARGET}.o ${.TARGET}.S.o ${.TARGET}.c.o
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET} 
-	rm -f ${.TARGET}.S.o ${.TARGET}.c.o ${.TARGET}.o
-.if ${MKSTRIPIDENT} != "no"
-	${OBJCOPY} -R .ident ${.TARGET}
-.endif
-
-.if ${MACHINE_ARCH} == "alpha"
-# can't do this in Makefile.inc otherwise it will before realall:
-crtfm.o: crtfm.c
-	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${.ALLSRC} -o ${.TARGET}.o
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET} 
-	rm -f ${.TARGET}.o
-.endif
-
-GENASSYM_CONF=	${COMMON_DIR}/sysident_assym.cf 
-sysident_assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS} ${NETBSDSRCDIR}/sys/sys/param.h
-	${_MKTARGET_CREATE}
-	cat ${COMMON_DIR}/sysident_assym.cf | \
-	    ${TOOL_GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \
-	    ${GENASSYM_CPPFLAGS} > sysident_assym.h.tmp && \
-	mv -f sysident_assym.h.tmp sysident_assym.h
-
-CLEANFILES+=	sysident_assym.h
-
-crti.o: crti.S sysident_assym.h sysident.S
-crtn.o: crtn.S
-
-FILES=${OBJS}
-FILESDIR=${LIBDIR}
-CLEANFILES+=${OBJS}
-
-.if ${MKPIC} == "yes"
-SYMLINKS+=	crtbegin.o ${LIBDIR}/crtbeginT.o
-SYMLINKS+=	crtend.o ${LIBDIR}/crtendS.o
-.endif
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/common/compident.S b/lib/csu/common/compident.S
deleted file mode 100644
index aebea82b1..000000000
--- a/lib/csu/common/compident.S
+++ /dev/null
@@ -1,66 +0,0 @@
-/* $NetBSD: compident.S,v 1.3 2014/05/14 14:59:14 joerg Exp $ */
-
-/*-
- * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Martin Husemann <martin@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-/*
- * This file is used to generate a note describing the code model in use by
- * the compiler on some architectures where this has consequences for the
- * VA layout applied by the kernel. On sparc64 the topdown VA layout can
- * only be enabled for processes compiled with -mcmodel=medany or greater,
- * but not for processes without this note or -mcmodel=medlow.
- *
- * The note looks similar to the .note.netbsd.march note used (for example)
- * on arm to note the ABI used by the process.
- *
- * [NOTE HEADER]
- *	long		name size
- *	long		content size
- *	long		note type
- *
- * [NOTE DATUM]
- *	string		code model (for sparc64: medlow, medmid, medany,
- *			the embedany model is never PIC, so not used here)
- *
- * The DATUM fields should be padded out such that their actual (not
- * declared) sizes % 4 == 0.
- */
-
-#include "sysident_assym.h"
-
-	.section .note.netbsd.mcmodel,"aM",@note,3*4+CONTENTLENGTH+ELF_NOTE_MCMODEL_NAMESZ+1
-	.p2align 2
-
-	.long	ELF_NOTE_MCMODEL_NAMESZ
-	.long	CONTENTLENGTH
-	.long	ELF_NOTE_TYPE_MCMODEL_TAG
-	.ascii	"NetBSD\0\0"
-	.ascii	CONTENT
-	.p2align 2
diff --git a/lib/csu/common/crt0-common.c b/lib/csu/common/crt0-common.c
deleted file mode 100644
index 86f782398..000000000
--- a/lib/csu/common/crt0-common.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/* $NetBSD: crt0-common.c,v 1.13 2013/01/31 22:24:25 matt Exp $ */
-
-/*
- * Copyright (c) 1998 Christos Zoulas
- * 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: crt0-common.c,v 1.13 2013/01/31 22:24:25 matt Exp $");
-
-#include <sys/types.h>
-#include <sys/exec.h>
-#if !defined(__minix)
-#include <sys/syscall.h>
-#else
-#include <string.h>
-#endif /* !defined(__minix) */
-#include <machine/profile.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "rtld.h"
-
-extern int main(int, char **, char **);
-
-#ifndef HAVE_INITFINI_ARRAY
-extern void	_init(void);
-extern void	_fini(void);
-#endif
-extern void	_libc_init(void);
-
-/*
- * Arrange for _DYNAMIC to be weak and undefined (and therefore to show up
- * as being at address zero, unless something else defines it).  That way,
- * if we happen to be compiling without -static but with without any
- * shared libs present, things will still work.
- */
-
-__weakref_visible int rtld_DYNAMIC __weak_reference(_DYNAMIC);
-
-#ifdef MCRT0
-extern void	monstartup(u_long, u_long);
-extern void	_mcleanup(void);
-extern unsigned char __etext, __eprol;
-#endif /* MCRT0 */
-
-char		**environ;
-struct ps_strings *__ps_strings = 0;
-
-static char	 empty_string[] = "";
-char		*__progname = empty_string;
-
-__dead __dso_hidden void ___start(void (*)(void), const Obj_Entry *,
-			 struct ps_strings *);
-
-#if !defined(__minix)
-#define	write(fd, s, n)	__syscall(SYS_write, (fd), (s), (n))
-#else
-#define	write(fd, s, n) /* NO write() from here on minix */
-#endif /* !defined(__minix) */
-
-#define	_FATAL(str)				\
-do {						\
-	write(2, str, sizeof(str)-1);		\
-	_exit(1);				\
-} while (0)
-
-#ifdef HAVE_INITFINI_ARRAY
-/*
- * If we are using INIT_ARRAY/FINI_ARRAY and we are linked statically,
- * we have to process these instead of relying on RTLD to do it for us.
- *
- * Since we don't need .init or .fini sections, just code them in C
- * to make life easier.
- */
-__weakref_visible const fptr_t preinit_array_start[1]
-    __weak_reference(__preinit_array_start);
-__weakref_visible const fptr_t preinit_array_end[1]
-    __weak_reference(__preinit_array_end);
-__weakref_visible const fptr_t init_array_start[1]
-    __weak_reference(__init_array_start);
-__weakref_visible const fptr_t init_array_end[1]
-    __weak_reference(__init_array_end);
-__weakref_visible const fptr_t fini_array_start[1]
-    __weak_reference(__fini_array_start);
-__weakref_visible const fptr_t fini_array_end[1]
-    __weak_reference(__fini_array_end);
-
-static inline void
-_preinit(void)
-{
-	for (const fptr_t *f = preinit_array_start; f < preinit_array_end; f++) {
-		(*f)();
-	}
-}
-
-static inline void
-_init(void)
-{
-	for (const fptr_t *f = init_array_start; f < init_array_end; f++) {
-		(*f)();
-	}
-}
-
-static void
-_fini(void)
-{
-	for (const fptr_t *f = fini_array_start; f < fini_array_end; f++) {
-		(*f)();
-	}
-}
-#endif /* HAVE_INITFINI_ARRAY */
-
-void
-___start(void (*cleanup)(void),			/* from shared loader */
-    const Obj_Entry *obj,			/* from shared loader */
-    struct ps_strings *ps_strings)
-{
-
-	if (ps_strings == NULL)
-		_FATAL("ps_strings missing\n");
-	__ps_strings = ps_strings;
-
-	environ = ps_strings->ps_envstr;
-
-	if (ps_strings->ps_argvstr[0] != NULL) {
-		char *c;
-		__progname = ps_strings->ps_argvstr[0];
-		for (c = ps_strings->ps_argvstr[0]; *c; ++c) {
-			if (*c == '/')
-				__progname = c + 1;
-		}
-	} else {
-		__progname = empty_string;
-	}
-
-	if (&rtld_DYNAMIC != NULL) {
-		if (obj == NULL)
-			_FATAL("NULL Obj_Entry pointer in GOT\n");
-		if (obj->magic != RTLD_MAGIC)
-			_FATAL("Corrupt Obj_Entry pointer in GOT\n");
-		if (obj->version != RTLD_VERSION)
-			_FATAL("Dynamic linker version mismatch\n");
-		atexit(cleanup);
-	}
-
-	_libc_init();
-
-#ifdef HAVE_INITFINI_ARRAY
-	_preinit();
-#endif
-
-#ifdef MCRT0
-	atexit(_mcleanup);
-	monstartup((u_long)&__eprol, (u_long)&__etext);
-#endif
-
-	atexit(_fini);
-	_init();
-
-	exit(main(ps_strings->ps_nargvstr, ps_strings->ps_argvstr, environ));
-}
diff --git a/lib/csu/common/crtbegin.c b/lib/csu/common/crtbegin.c
deleted file mode 100644
index bf43358b5..000000000
--- a/lib/csu/common/crtbegin.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: crtbegin.c,v 1.9 2014/05/06 16:02:10 joerg Exp $");
-
-#include "crtbegin.h"
-
-typedef void (*fptr_t)(void);
-
-__dso_hidden const fptr_t __JCR_LIST__[0] __section(".jcr");
-
-__weakref_visible void Jv_RegisterClasses(const fptr_t *)
-	__weak_reference(_Jv_RegisterClasses);
-
-#if !defined(HAVE_INITFINI_ARRAY)
-__dso_hidden const fptr_t __aligned(sizeof(void *)) __CTOR_LIST__[] __section(".ctors") = {
-	(fptr_t) -1,
-};
-__dso_hidden extern const fptr_t __CTOR_LIST_END__[];
-#endif
-
-#ifdef SHARED
-__dso_hidden void *__dso_handle = &__dso_handle;
-
-__weakref_visible void cxa_finalize(void *)
-	__weak_reference(__cxa_finalize);
-#else
-__dso_hidden void *__dso_handle;
-#endif
-
-#if !defined(__ARM_EABI__) || defined(__ARM_DWARF_EH__)
-__dso_hidden
-#if !defined(__mips__)
-	const
-#endif
-	long __EH_FRAME_LIST__[0] __section(".eh_frame");
-
-__weakref_visible void register_frame_info(const void *, const void *)
-	__weak_reference(__register_frame_info);
-__weakref_visible void deregister_frame_info(const void *)
-	__weak_reference(__deregister_frame_info);
-
-static long dwarf_eh_object[8];
-#endif
-
-static void __do_global_ctors_aux(void) __used;
-
-static void __section(".text.startup")
-__do_global_ctors_aux(void)
-{
-	static unsigned char __initialized;
-
-	if (__initialized)
-		return;
-
-	__initialized = 1;
-
-#if !defined(__ARM_EABI__) || defined(__ARM_DWARF_EH__)
-	if (register_frame_info)
-		register_frame_info(__EH_FRAME_LIST__, &dwarf_eh_object);
-#endif
-
-	if (Jv_RegisterClasses && __JCR_LIST__[0] != 0)
-		Jv_RegisterClasses(__JCR_LIST__);
-
-#if !defined(HAVE_INITFINI_ARRAY)
-	for (const fptr_t *p = __CTOR_LIST_END__; p > __CTOR_LIST__ + 1; ) {
-		(*(*--p))();
-	}
-#endif
-}
-
-#if !defined(__ARM_EABI__) || defined(SHARED) || defined(__ARM_DWARF_EH__)
-#if !defined(HAVE_INITFINI_ARRAY)
-__dso_hidden const fptr_t __aligned(sizeof(void *)) __DTOR_LIST__[] __section(".dtors") = {
-	(fptr_t) -1,
-};
-__dso_hidden extern const fptr_t __DTOR_LIST_END__[];
-#endif
-
-static void __do_global_dtors_aux(void) __used;
-
-static void __section(".text.exit")
-__do_global_dtors_aux(void)
-{
-	static unsigned char __finished;
-
-	if (__finished)
-		return;
-
-	__finished = 1;
-
-#ifdef SHARED
-	if (cxa_finalize)
-		(*cxa_finalize)(__dso_handle);
-#endif
-
-#if !defined(HAVE_INITFINI_ARRAY)
-	for (const fptr_t *p = __DTOR_LIST__ + 1; p < __DTOR_LIST_END__; ) {
-		(*(*p++))();
-	}
-#endif
-
-#if !defined(__ARM_EABI__) || defined(__ARM_DWARF_EH__)
-	if (deregister_frame_info)
-		deregister_frame_info(__EH_FRAME_LIST__);
-#endif
-}
-#endif /* !__ARM_EABI__ || SHARED || __ARM_DWARF_EH__ */
diff --git a/lib/csu/common/sysident.S b/lib/csu/common/sysident.S
deleted file mode 100644
index fa261acac..000000000
--- a/lib/csu/common/sysident.S
+++ /dev/null
@@ -1,94 +0,0 @@
-/* $NetBSD: sysident.S,v 1.3 2014/05/14 14:59:14 joerg Exp $ */
-
-/*
- * Copyright (c) 1997 Christopher G. Demetriou
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *          This product includes software developed for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-/*
- * Here we define the NetBSD OS Version in an ELF .note section, structured
- * like:
- *
- * [NOTE HEADER]
- *	long		name size
- *	long		description size
- *	long		note type
- *
- * [NOTE DATUM]
- *	string		OS name
- *
- * OSVERSION notes also have:
- *	long		OS version (__NetBSD_Version__ constant from param.h)
- *
- * The DATUM fields should be padded out such that their actual (not
- * declared) sizes % 4 == 0.
- *
- * These are used by the kernel to determine if this binary is really a
- * NetBSD binary, or some other OS's.
- */
-
-#include "sysident_assym.h"
-
-	.section ".note.netbsd.ident", "a"
-	.p2align 2
-
-	.long	ELF_NOTE_NETBSD_NAMESZ
-	.long	ELF_NOTE_NETBSD_DESCSZ
-	.long	ELF_NOTE_TYPE_NETBSD_TAG
-#if defined(__minix)
-	.ascii	"Minix\0\0\0"	/* ELF_NOTE_NETBSD_NAME */
-	.long	300400000 /* Minix version as in "%d%03d%03d", MAJ-MIN-TEENY */
-#else
-	.ascii	"NetBSD\0\0"	/* ELF_NOTE_NETBSD_NAME */
-	.long	__NetBSD_Version__
-#endif /* defined(__minix) */
-
-	.section ".note.netbsd.pax", "a"
-	.p2align 2
-
-	.long	ELF_NOTE_PAX_NAMESZ
-	.long	ELF_NOTE_PAX_DESCSZ
-	.long	ELF_NOTE_TYPE_PAX_TAG
-	.ascii	"PaX\0"		/* ELF_NOTE_PAX_NAME */
-	.long	0
-
-#ifdef ELF_NOTE_MARCH_DESC
-	.section ".note.netbsd.march", "a"
-	.p2align 2
-
-	.long	ELF_NOTE_MARCH_NAMESZ
-	.long	ELF_NOTE_MARCH_DESCSZ
-	.long	ELF_NOTE_TYPE_MARCH_TAG
-	.ascii	"NetBSD\0\0"
-	.asciz	ELF_NOTE_MARCH_DESC
-	.p2align 2
-#endif
diff --git a/lib/csu/common/sysident_assym.cf b/lib/csu/common/sysident_assym.cf
deleted file mode 100644
index 2d4717def..000000000
--- a/lib/csu/common/sysident_assym.cf
+++ /dev/null
@@ -1,23 +0,0 @@
-include <sys/param.h>
-include <sys/exec_elf.h>
-
-define	ELF_NOTE_NETBSD_NAMESZ		ELF_NOTE_NETBSD_NAMESZ
-define	ELF_NOTE_NETBSD_DESCSZ		ELF_NOTE_NETBSD_DESCSZ
-define	ELF_NOTE_TYPE_NETBSD_TAG	ELF_NOTE_TYPE_NETBSD_TAG
-#define	ELF_NOTE_NETBSD_NAME		ELF_NOTE_NETBSD_NAME
-define	__NetBSD_Version__		__NetBSD_Version__
-define	ELF_NOTE_PAX_NAMESZ		ELF_NOTE_PAX_NAMESZ
-define	ELF_NOTE_PAX_DESCSZ		ELF_NOTE_PAX_DESCSZ
-define	ELF_NOTE_TYPE_PAX_TAG		ELF_NOTE_TYPE_PAX_TAG
-#define	ELF_NOTE_PAX_NAME		ELF_NOTE_PAX_NAME
-
-ifdef ELF_NOTE_MARCH_DESC
-define	ELF_NOTE_MARCH_NAMESZ		ELF_NOTE_MARCH_NAMESZ
-define	ELF_NOTE_MARCH_DESCSZ		sizeof(ELF_NOTE_MARCH_DESC)
-define	ELF_NOTE_TYPE_MARCH_TAG		ELF_NOTE_TYPE_MARCH_TAG
-#define	ELF_NOTE_MARCH_NAME		ELF_NOTE_MARCH_NAME
-#define	ELF_NOTE_MARCH_DESC		ELF_NOTE_MARCH_DESC
-endif
-
-define	ELF_NOTE_MCMODEL_NAMESZ		ELF_NOTE_MCMODEL_NAMESZ
-define	ELF_NOTE_TYPE_MCMODEL_TAG	ELF_NOTE_TYPE_MCMODEL_TAG
diff --git a/lib/i18n_module/BIG5/Makefile b/lib/i18n_module/BIG5/Makefile
deleted file mode 100644
index 17d26b258..000000000
--- a/lib/i18n_module/BIG5/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/11/22 23:38:27 tnozaki Exp $
-
-SRCS=	citrus_big5.c citrus_prop.c
-
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/DECHanyu/Makefile b/lib/i18n_module/DECHanyu/Makefile
deleted file mode 100644
index e01737f0c..000000000
--- a/lib/i18n_module/DECHanyu/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2007/04/01 18:52:31 tnozaki Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/EUC/Makefile b/lib/i18n_module/EUC/Makefile
deleted file mode 100644
index 4eec40960..000000000
--- a/lib/i18n_module/EUC/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2002/03/17 22:14:15 tshiozak Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/EUCTW/Makefile b/lib/i18n_module/EUCTW/Makefile
deleted file mode 100644
index 4eec40960..000000000
--- a/lib/i18n_module/EUCTW/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2002/03/17 22:14:15 tshiozak Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/GBK2K/Makefile b/lib/i18n_module/GBK2K/Makefile
deleted file mode 100644
index cb58cffa2..000000000
--- a/lib/i18n_module/GBK2K/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2003/03/25 18:26:54 tshiozak Exp $
-
-SRCPRE=citrus_
-#CFLAGS+=-g
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/HZ/Makefile b/lib/i18n_module/HZ/Makefile
deleted file mode 100644
index 7d1fa0b98..000000000
--- a/lib/i18n_module/HZ/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2006/11/22 23:38:27 tnozaki Exp $
-
-SRCS=	citrus_hz.c citrus_prop.c
-
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/ISO2022/Makefile b/lib/i18n_module/ISO2022/Makefile
deleted file mode 100644
index e12fd3a45..000000000
--- a/lib/i18n_module/ISO2022/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2002/03/17 22:14:16 tshiozak Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/JOHAB/Makefile b/lib/i18n_module/JOHAB/Makefile
deleted file mode 100644
index 43ba852a1..000000000
--- a/lib/i18n_module/JOHAB/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2006/10/18 17:54:55 tnozaki Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/MSKanji/Makefile b/lib/i18n_module/MSKanji/Makefile
deleted file mode 100644
index e12fd3a45..000000000
--- a/lib/i18n_module/MSKanji/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2002/03/17 22:14:16 tshiozak Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/Makefile b/lib/i18n_module/Makefile
deleted file mode 100644
index 2928533e2..000000000
--- a/lib/i18n_module/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$NetBSD: Makefile,v 1.8 2007/04/01 18:52:31 tnozaki Exp $
-
-SUBDIR=	BIG5 DECHanyu EUC EUCTW GBK2K HZ ISO2022 JOHAB MSKanji UES UTF1632 UTF8 UTF7 VIQR ZW
-SUBDIR+=iconv_none iconv_std
-SUBDIR+=mapper_646 mapper_none mapper_serial mapper_parallel mapper_std \
-	mapper_zone
-
-.include <bsd.subdir.mk>
diff --git a/lib/i18n_module/Makefile.inc b/lib/i18n_module/Makefile.inc
deleted file mode 100644
index f36470194..000000000
--- a/lib/i18n_module/Makefile.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.14 2012/08/23 21:21:15 joerg Exp $
-
-NOLINT=		# defined
-NOPICINSTALL=	# defined
-NOPROFILE=	# defined
-
-NOCLANGERROR=	# defined
-
-.include <bsd.own.mk>
-
-SHLIB_VERSION_FILE=	${NETBSDSRCDIR}/lib/i18n_module/shlib_version
-.if defined(MLIBDIR)
-LIBDIR=		/usr/lib/${MLIBDIR}/i18n
-SHLIBDIR=	/usr/lib/${MLIBDIR}/i18n
-SHLIBINSTALLDIR=/usr/lib/${MLIBDIR}/i18n
-.else
-LIBDIR=		/usr/lib/i18n
-SHLIBDIR=	/usr/lib/i18n
-SHLIBINSTALLDIR=/usr/lib/i18n
-.endif
-CPPFLAGS+=	-I${NETBSDSRCDIR}/lib/libc/citrus
-CPPFLAGS+=	-DLOCALEMOD_MAJOR=${SHLIB_MAJOR}
-CPPFLAGS+=	-DLIBC_SCCS
-BASENAME=	${.CURDIR:T}
-LIB=		${BASENAME}
-SRCS?=		${SRCPRE:tl}${BASENAME:tl}.c
-
-.PATH:	${NETBSDSRCDIR}/lib/libc/citrus ${NETBSDSRCDIR}/lib/libc/citrus/modules
diff --git a/lib/i18n_module/UES/Makefile b/lib/i18n_module/UES/Makefile
deleted file mode 100644
index 9eea834c9..000000000
--- a/lib/i18n_module/UES/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2006/11/13 15:16:31 tnozaki Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/UTF1632/Makefile b/lib/i18n_module/UTF1632/Makefile
deleted file mode 100644
index b203319a0..000000000
--- a/lib/i18n_module/UTF1632/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2003/06/25 10:38:03 tshiozak Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/UTF7/Makefile b/lib/i18n_module/UTF7/Makefile
deleted file mode 100644
index 712c1515d..000000000
--- a/lib/i18n_module/UTF7/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$NetBSD: Makefile,v 1.4 2011/06/20 06:52:36 mrg Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
-
-.if ${MACHINE_ARCH} == "vax" && defined(HAVE_GCC)
-COPTS.citrus_utf7.c+=	-O0
-.endif
diff --git a/lib/i18n_module/UTF8/Makefile b/lib/i18n_module/UTF8/Makefile
deleted file mode 100644
index 4ae199661..000000000
--- a/lib/i18n_module/UTF8/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2002/03/17 22:14:17 tshiozak Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/VIQR/Makefile b/lib/i18n_module/VIQR/Makefile
deleted file mode 100644
index 9eea834c9..000000000
--- a/lib/i18n_module/VIQR/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2006/11/13 15:16:31 tnozaki Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/ZW/Makefile b/lib/i18n_module/ZW/Makefile
deleted file mode 100644
index 6b2859209..000000000
--- a/lib/i18n_module/ZW/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2006/11/22 23:38:27 tnozaki Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/iconv_none/Makefile b/lib/i18n_module/iconv_none/Makefile
deleted file mode 100644
index 20b61d5b6..000000000
--- a/lib/i18n_module/iconv_none/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2003/06/25 10:38:04 tshiozak Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/iconv_std/Makefile b/lib/i18n_module/iconv_std/Makefile
deleted file mode 100644
index 20b61d5b6..000000000
--- a/lib/i18n_module/iconv_std/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2003/06/25 10:38:04 tshiozak Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/mapper_646/Makefile b/lib/i18n_module/mapper_646/Makefile
deleted file mode 100644
index 20b61d5b6..000000000
--- a/lib/i18n_module/mapper_646/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2003/06/25 10:38:04 tshiozak Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/mapper_none/Makefile b/lib/i18n_module/mapper_none/Makefile
deleted file mode 100644
index 2fc2ff512..000000000
--- a/lib/i18n_module/mapper_none/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2003/06/25 10:38:05 tshiozak Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/mapper_parallel/Makefile b/lib/i18n_module/mapper_parallel/Makefile
deleted file mode 100644
index 804d1772d..000000000
--- a/lib/i18n_module/mapper_parallel/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2003/06/25 10:38:05 tshiozak Exp $
-
-SRCS=citrus_mapper_serial.c
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/mapper_serial/Makefile b/lib/i18n_module/mapper_serial/Makefile
deleted file mode 100644
index 2fc2ff512..000000000
--- a/lib/i18n_module/mapper_serial/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2003/06/25 10:38:05 tshiozak Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/mapper_std/Makefile b/lib/i18n_module/mapper_std/Makefile
deleted file mode 100644
index 21f2782d5..000000000
--- a/lib/i18n_module/mapper_std/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2003/06/25 10:38:06 tshiozak Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/mapper_zone/Makefile b/lib/i18n_module/mapper_zone/Makefile
deleted file mode 100644
index 21f2782d5..000000000
--- a/lib/i18n_module/mapper_zone/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2003/06/25 10:38:06 tshiozak Exp $
-
-SRCPRE=citrus_
-.include <bsd.lib.mk>
diff --git a/lib/i18n_module/shlib_version b/lib/i18n_module/shlib_version
deleted file mode 100644
index af2e1da43..000000000
--- a/lib/i18n_module/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.6 2009/01/11 03:07:47 christos Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=5
-minor=0
diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile
deleted file mode 100644
index 11b6c1b49..000000000
--- a/lib/libbz2/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#	$NetBSD: Makefile,v 1.18 2014/07/05 19:22:42 dholland Exp $
-
-USE_FORT?= yes	# data driven bugs?
-
-NOMAN=		# defined
-
-.include <bsd.own.mk>
-
-LIB=		bz2
-DIST=		${NETBSDSRCDIR}/external/bsd/bzip2/dist
-.PATH:		${DIST}
-
-SRCS=		blocksort.c huffman.c crctable.c randtable.c compress.c \
-		decompress.c bzlib.c
-INCS=		bzlib.h
-INCSDIR=	/usr/include
-
-.if defined(__MINIX)
-.if !empty(DBG:M-Og) || !empty(CFLAGS:M-Og) || \
-	!empty(DBG:M-g) || !empty(CFLAGS:M-g)
-#LSC: -Wno-maybe-uninitialized while compiling with -DNDEBUG -Og
-CWARNFLAGS.gcc+=	-Wno-maybe-uninitialized
-.endif
-.endif # defined(__MINIX)
-
-# XXX huffman.c gets mis-compiled with 2.95.3
-.if ${MACHINE_ARCH} == "vax"
-COPTS+=		-O0
-.endif
-
-# XXX blocksort.c gets mis-compiled with 4.1
-.if (${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb") && \
-    defined(HAVE_GCC)
-COPTS.blocksort.c+=	-fno-loop-optimize
-.endif
-
-.if ${MKSHARE} != "no"
-FILESDIR=	/usr/share/doc/reference/ref1/bzip2
-FILES=		manual.html
-.endif
-
-.include <bsd.info.mk>
-.include <bsd.lib.mk>
diff --git a/lib/libbz2/shlib_version b/lib/libbz2/shlib_version
deleted file mode 100644
index 45ca00de4..000000000
--- a/lib/libbz2/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.4 2008/03/19 17:10:52 bjs Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=1
-minor=1
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
deleted file mode 100644
index 76a8a37c1..000000000
--- a/lib/libc/Makefile
+++ /dev/null
@@ -1,186 +0,0 @@
-#	$NetBSD: Makefile,v 1.169 2015/06/15 14:24:01 christos Exp $
-#	@(#)Makefile	8.2 (Berkeley) 2/3/94
-#
-# All library objects contain sccsid strings by default; they may be
-# excluded as a space-saving measure.  To produce a library that does
-# not contain these strings, delete -DLIBC_SCCS and -DSYSLIBC_SCCS
-# from CPPFLAGS below.  To remove these strings from just the system call
-# stubs, remove just -DSYSLIBC_SCCS from CPPFLAGS.
-#
-# The NLS (message catalog) functions are always in libc.  To choose that
-# strerror(), perror(), strsignal(), psignal(), etc. actually call the NLS
-# functions, put -DNLS on the CPPFLAGS line below.
-#
-# The YP functions are always in libc. To choose that getpwent() and friends
-# actually call the YP functions, put -DYP on the CPPFLAGS line below.
-#
-# The Hesiod functions are always in libc. To choose that getpwent() and friends
-# actually call the Hesiod functions, put -DHESIOD on the CPPFLAGS line below.
-
-.include "Makefile.inc"
-
-LIB=		c
-CPPFLAGS+=	-I${.CURDIR}/include -I${.CURDIR}
-
-LIBCDIR=	${.CURDIR}
-
-.if exists (${ARCHDIR}/Makefile.inc)
-.PATH:	${ARCHDIR}
-.include "${ARCHDIR}/Makefile.inc"
-.endif
-
-.if exists (${ARCHDIR}/genassym.cf)
-DPSRCS+=	assym.h
-CLEANFILES+=	assym.h assym.h.tmp
-
-assym.h: ${ARCHDIR}/genassym.cf
-	${_MKTARGET_CREATE}
-	${TOOL_GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} \
-		${CPPFLAGS} ${CPPFLAGS.assym.h} ${PROF} \
-		${GENASSYM_CPPFLAGS} < ${ARCHDIR}/genassym.cf > assym.h.tmp && \
-	mv -f assym.h.tmp assym.h
-.endif
-
-# The following controls how to build compatibility code for old NetBSD
-# binaries. If BUILD_LEGACY is yes, then we build a separate library; otherwise
-# we include the code in libc.
-BUILD_LEGACY?= no
-.if "${BUILD_LEGACY}" == "yes"
-SUBDIR=compat
-.include <bsd.subdir.mk>
-.else
-COMPATDIR=${.CURDIR}/compat
-.include "${.CURDIR}/compat/Makefile.inc"
-# Marker for compat code that can't be easily isolated
-CPPFLAGS+=	-D__BUILD_LEGACY
-.endif
-
-.if defined(__MINIX) && 0
-SUBDIR+= pkgconfig
-.include <bsd.subdir.mk>
-.endif # defined(__MINIX)
-
-.include "${.CURDIR}/../../common/lib/libc/Makefile.inc"
-.include "${.CURDIR}/atomic/Makefile.inc"
-.include "${.CURDIR}/cdb/Makefile.inc"
-.include "${.CURDIR}/db/Makefile.inc"
-.include "${.CURDIR}/citrus/Makefile.inc"
-.include "${.CURDIR}/compat-43/Makefile.inc"
-.include "${.CURDIR}/compiler_rt/Makefile.inc"
-.include "${.CURDIR}/dlfcn/Makefile.inc"
-.include "${.CURDIR}/gdtoa/Makefile.inc"
-.include "${.CURDIR}/gen/Makefile.inc"
-.if defined(__MINIX)
-# gmon needs profil()
-.else
-.include "${.CURDIR}/gmon/Makefile.inc"
-.endif # defined(__MINIX)
-.include "${.CURDIR}/hash/Makefile.inc"
-.include "${.CURDIR}/iconv/Makefile.inc"
-.include "${.CURDIR}/inet/Makefile.inc"
-.include "${.CURDIR}/isc/Makefile.inc"
-.include "${.CURDIR}/locale/Makefile.inc"
-.include "${.CURDIR}/md/Makefile.inc"
-.include "${.CURDIR}/misc/Makefile.inc"
-.include "${.CURDIR}/net/Makefile.inc"
-.include "${.CURDIR}/nameser/Makefile.inc"
-.include "${.CURDIR}/nls/Makefile.inc"
-.if (${USE_LIBTRE} == "yes")
-.include "${NETBSDSRCDIR}/external/bsd/tre/Makefile.inc"
-.else
-.include "${.CURDIR}/regex/Makefile.inc"
-.endif
-.include "${.CURDIR}/resolv/Makefile.inc"
-.if defined(__MINIX)
-# RPC needs pollts() and a reserved port allocator.
-.else
-.include "${.CURDIR}/rpc/Makefile.inc"
-.endif # defined(__MINIX)
-.include "${.CURDIR}/ssp/Makefile.inc"
-.include "${.CURDIR}/stdio/Makefile.inc"
-.include "${.CURDIR}/stdlib/Makefile.inc"
-.include "${.CURDIR}/string/Makefile.inc"
-.include "${.CURDIR}/termios/Makefile.inc"
-.include "${.CURDIR}/thread-stub/Makefile.inc"
-.include "${.CURDIR}/time/Makefile.inc"
-.if defined(__MINIX)
-.include "${NETBSDSRCDIR}/minix/lib/libc/sys/Makefile.inc"
-.else
-.if ${RUMPRUN} != "yes"
-.include "${.CURDIR}/tls/Makefile.inc"
-.endif
-.endif # defined(__MINIX)
-.include "${.CURDIR}/sys/Makefile.inc"
-.if ${HAVE_LIBGCC_EH} == "no"
-.include "${NETBSDSRCDIR}/sys/lib/libunwind/Makefile.inc"
-.endif
-.include "${.CURDIR}/uuid/Makefile.inc"
-.if (${MKYP} != "no")
-.include "${.CURDIR}/yp/Makefile.inc"
-.endif
-
-# Remove from SRCS the .c files for any .S files added by the MD makefiles,
-# also remove from SRCS the .c files for the .S and .c files in NO_SRCS.
-# Add the .c file for .S files (in both variables) to LSRCS so that the
-# 'normal' .c file for assembly files is used for the lint librray.
-#
-# Usage:
-# Add .S files to NO_SRSC when another .S file provides the entry points.
-# Add .c files to NO_SRSC when another .c file provides the entry points.
-# (lint is run on all .c files in SRCS)
-
-.for check_file in ${SRCS:M*.S} ${NO_SRCS}
-unwanted_file := ${SRCS:M${check_file:.S=.c}}
-.if "${unwanted_file}" != ""
-SRCS := ${SRCS:N${unwanted_file}}
-.if "${unwanted_file}" != "${check_file}"
-LSRCS := ${LSRCS} ${unwanted_file}
-.endif
-.endif
-.endfor
-
-NLS=	C.msg Pig.msg ca.msg cs.msg de.msg es.msg fi.msg fr.msg nl.msg \
-	no.msg pl.msg sk.msg sv.msg
-
-.if defined(__MINIX)
-realall: 
-.else
-.if ${MKREPRO:Uno} == "yes"
-REGEX_SPECIALS=[][)(^$$.?*\\;]
-MKREPRO_SED=   -e 's;${NETBSDSRCDIR:C/${REGEX_SPECIALS}/\\\\&/g};/usr/src;'
-.endif
-
-.if !defined(MLIBDIR) && ${RUMPRUN} != "yes"
-realall: tags
-tags: ${SRCS}
-	${_MKTARGET_CREATE}
-	-${TOOL_CTAGS} -f ${.TARGET}.tmp -w ${.ALLSRC:M*.c}
-	-egrep "^ENTRY(.*)|^FUNC(.*)|^SYSCALL(.*)" /dev/null ${.ALLSRC:M*.S} | \
-	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
-           >> ${.TARGET}.tmp
-.if ${MKREPRO:Uno} == "yes"
-	sed ${MKREPRO_SED} <${.TARGET}.tmp | sort -o ${.TARGET}
-.else
-	sort -o ${.TARGET} ${.TARGET}.tmp
-.endif
-	rm -f ${.TARGET}.tmp
-
-FILES=		tags
-FILESNAME=	libc.tags
-FILESDIR=	/var/db
-.endif
-
-
-# workaround for I18N stuffs: build singlebyte setlocale() for libc.a,
-# multibyte for libc.so.  the quirk should be removed when we support
-# dlopen() from within statically linked binaries.
-CSHLIBFLAGS+=	-D_I18N_DYNAMIC
-.endif # defined(__MINIX)
-
-.include <bsd.lib.mk>
-
-# force the dynamic linker to initialize libc first
-SHLIB_SHFLAGS+=	-Wl,-z,initfirst
-.if ${HAVE_LIBGCC} == "no"
-SHLIB_SHFLAGS+= -Wl,-z,defs
-.endif
diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc
deleted file mode 100644
index 66e5cb402..000000000
--- a/lib/libc/Makefile.inc
+++ /dev/null
@@ -1,79 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.18 2015/08/28 11:45:02 joerg Exp $
-#	@(#)Makefile	8.2 (Berkeley) 2/3/94
-#
-# All library objects contain sccsid strings by default; they may be
-# excluded as a space-saving measure.  To produce a library that does
-# not contain these strings, delete -DLIBC_SCCS and -DSYSLIBC_SCCS
-# from CPPFLAGS below.  To remove these strings from just the system call
-# stubs, remove just -DSYSLIBC_SCCS from CPPFLAGS.
-#
-# The NLS (message catalog) functions are always in libc.  To choose that
-# strerror(), perror(), strsignal(), psignal(), etc. actually call the NLS
-# functions, put -DNLS on the CPPFLAGS line below.
-#
-# The YP functions are always in libc. To choose that getpwent() and friends
-# actually call the YP functions, put -DYP on the CPPFLAGS line below.
-#
-# The Hesiod functions are always in libc. To choose that getpwent() and friends
-# actually call the Hesiod functions, put -DHESIOD on the CPPFLAGS line below.
-.if defined(__MINIX)
-MKYP=no #requires RPC
-USE_JEMALLOC=no
-USE_FORT=no
-USE_LIBTRE=no
-
-# BJG too many warnings
-NOGCCERROR?=    yes
-NOCLANGERROR?=  yes
-.endif # defined(__MINIX)
-
-USE_FORT?=	yes
-
-USE_SHLIBDIR=	yes
-
-.include <bsd.own.mk>
-
-# build libc suitable for rumprun software stack, i.e. are system calls
-# rump kernel function calls instead of kernel traps?
-RUMPRUN?=	no
-
-WARNS=5
-.if !defined(__MINIX)
-CPPFLAGS+=	-D_LIBC -DLIBC_SCCS -DSYSLIBC_SCCS -D_REENTRANT
-CPPFLAGS+=	-D_DIAGNOSTIC
-.else
-CPPFLAGS+=	-D_LIBC
-.if defined(MLIBDIR)
-CPPFLAGS+=	-DMLIBDIR=\"${MLIBDIR}\"
-.endif
-.endif # !defined(__minix)
-
-.if (${USE_HESIOD} != "no")
-CPPFLAGS+=	-DHESIOD
-.endif
-
-.if (${USE_INET6} != "no")
-CPPFLAGS+=	-DINET6
-.endif
-
-CPPFLAGS+=	-DNLS
-
-.if (${USE_YP} != "no")
-CPPFLAGS+=	-DYP
-.endif
-
-# Set lint to exit on warnings
-#LINTFLAGS+=	-w
-# ignore 'empty translation unit' warnings.
-LINTFLAGS+=	-X 272
-
-.include "libcincludes.mk"
-
-ARCHDIR=	${.CURDIR}/arch/${ARCHSUBDIR}
-AFLAGS+=	-I${ARCHDIR}
-CLEANFILES+=	tags
-
-# Don't try to lint the C library against itself when creating llib-lc.ln
-LLIBS=
-
-INCSDIR=	/usr/include
diff --git a/lib/libc/arch/aarch64/Makefile.inc b/lib/libc/arch/aarch64/Makefile.inc
deleted file mode 100644
index ff1c7dab7..000000000
--- a/lib/libc/arch/aarch64/Makefile.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.2 2015/04/15 19:13:46 mrg Exp $
-
-SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
-#SRCS+= qdivrem.c
-
-CPPFLAGS += -I.
-
-.PATH: ${ARCHDIR}/softfloat
-SRCS+=	qp.c
-CPPFLAGS+=	-DSOFTFLOATAARCH64_FOR_GCC -DEXCEPTIONS_WITH_SOFTFLOAT
-CPPFLAGS+=	-DSOFTFLOAT_NEED_FIXUNS
-#
-# Can't directly use softfloat.c due to .PATH issues with the other source
-# in softfloat. Just provide a wrapper which pulls it in via a #include
-SRCS.softfloat= softfloat-wrapper.c
-SRCS+= ${SRCS.softfloat}
-CPPFLAGS+=      -I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat \
-		-I${.CURDIR}/softfloat/bits64
diff --git a/lib/libc/arch/aarch64/SYS.h b/lib/libc/arch/aarch64/SYS.h
deleted file mode 100644
index f70112472..000000000
--- a/lib/libc/arch/aarch64/SYS.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* $NetBSD: SYS.h,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-
-#ifndef __STDC__
-#error __STDC__ not defined
-#endif
-
-#define SYSTRAP(x)	svc #(SYS_ ## x)
-
-#define _SYSCALL_NOERROR(x,y)						\
-	ENTRY(x);							\
-	SYSTRAP(y)
-
-#define _INVOKE_CERROR()						\
-	b.cs	_C_LABEL(__cerror)
-
-#define _SYSCALL(x, y)							\
-	_SYSCALL_NOERROR(x,y);						\
-	_INVOKE_CERROR()
-
-#define SYSCALL_NOERROR(x)						\
-	_SYSCALL_NOERROR(x,x)
-
-#define SYSCALL(x)							\
-	_SYSCALL(x,x)
-
-#define PSEUDO_NOERROR(x,y)						\
-	_SYSCALL_NOERROR(x,y);						\
-	ret;								\
-	END(x)
-
-#define PSEUDO(x,y)							\
-	_SYSCALL(x,y);							\
-	ret;								\
-	END(x)
-
-#define RSYSCALL_NOERROR(x)						\
-	PSEUDO_NOERROR(x,x)
-
-#define RSYSCALL(x)							\
-	PSEUDO(x,x)
-
-#define	WSYSCALL(weak,strong)						\
-	WEAK_ALIAS(weak,strong);					\
-	PSEUDO(strong,weak)
-
-	.hidden	__cerror
-	.globl	__cerror
diff --git a/lib/libc/arch/aarch64/gdtoa/Makefile.inc b/lib/libc/arch/aarch64/gdtoa/Makefile.inc
deleted file mode 100644
index 844c4584c..000000000
--- a/lib/libc/arch/aarch64/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/08/10 05:47:36 matt Exp $
-
-SRCS+=	strtof.c
-SRCS+=	strtold_pQ.c
-SRCS+=	strtopQ.c
diff --git a/lib/libc/arch/aarch64/gdtoa/arith.h b/lib/libc/arch/aarch64/gdtoa/arith.h
deleted file mode 100644
index 40cb7d935..000000000
--- a/lib/libc/arch/aarch64/gdtoa/arith.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-#ifdef __AARCH64EB__
-#define IEEE_BIG_ENDIAN
-#else
-#define IEEE_LITTLE_ENDIAN
-#endif
diff --git a/lib/libc/arch/aarch64/gdtoa/gd_qnan.h b/lib/libc/arch/aarch64/gdtoa/gd_qnan.h
deleted file mode 100644
index ffeaefde0..000000000
--- a/lib/libc/arch/aarch64/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-#define f_QNAN 0x7fc00000
-#ifdef __AARCH64EB__
-#define d_QNAN0 0x7ff80000
-#define d_QNAN1 0x0
-#define ld_QNAN0 0x7ff80000
-#define ld_QNAN1 0x0
-#define ld_QNAN2 0x0
-#define ld_QNAN3 0x0
-#else
-#define d_QNAN0 0x0
-#define d_QNAN1 0x7ff80000
-#define ld_QNAN0 0x0
-#define ld_QNAN1 0x0
-#define ld_QNAN2 0x0
-#define ld_QNAN3 0x7ff80000
-#endif
diff --git a/lib/libc/arch/aarch64/gen/Makefile.inc b/lib/libc/arch/aarch64/gen/Makefile.inc
deleted file mode 100644
index ffb5b87e1..000000000
--- a/lib/libc/arch/aarch64/gen/Makefile.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.2 2015/07/07 21:40:19 matt Exp $
-
-SRCS+=	byte_swap_2.S byte_swap_4.S byte_swap_8.S
-SRCS+=	flt_rounds.c
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c infinityl_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c fpclassifyl_ieee754.c
-SRCS+=	fpgetmask.c fpgetround.c fpgetsticky.c
-SRCS+=	fpsetmask.c fpsetround.c fpsetsticky.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c isfinitel_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c isinfl_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c isnanl_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c signbitl_ieee754.c
-SRCS+=	fixunsgen_ieee754.c fixunsgen64_ieee754.c
-SRCS+=	fixunstfsi_ieee754.c fixunstfdi_ieee754.c
-SRCS+=	fabs_ieee754.S
-#SRCS+=	fabsf_ieee754.S fabsl_ieee754.c
-
-SRCS+=	nanf.c
-
-SRCS+=	setjmp.S
-SRCS+=	_setjmp.S
-SRCS+=	sigsetjmp.S
-
-SRCS+=	makecontext.c resumecontext.c swapcontext.S
-
-SRCS+=	_lwp.c
-
-#LSRCS.arm.gen=	Lint_bswap16.c Lint_bswap32.c Lint_swapcontext.c
-#LSRCS+=		${LSRCS.arm.gen}
-#DPSRCS+=	${LSRCS.arm.gen}
-#CLEANFILES+=	${LSRCS.arm.gen}
diff --git a/lib/libc/arch/aarch64/gen/_lwp.c b/lib/libc/arch/aarch64/gen/_lwp.c
deleted file mode 100644
index e9a578ec3..000000000
--- a/lib/libc/arch/aarch64/gen/_lwp.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $NetBSD: _lwp.c,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.1 2014/08/10 05:47:36 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *),
-    void *arg, void *private, caddr_t stack_base, size_t stack_size)
-{
-	getcontext(u);
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-	uintptr_t sp = (uintptr_t)stack_base + stack_size;
-
-	/*
-	 * Note: We make sure the stack is 16-byte aligned, here.
-	 */
-
-	u->uc_mcontext.__gregs[_REG_X0] = (__greg_t)(uintptr_t)arg;
-	u->uc_mcontext.__gregs[_REG_SP] = ((__greg_t)sp) & -16;
-	u->uc_mcontext.__gregs[_REG_X29] = (__greg_t)(uintptr_t)_lwp_exit;
-	u->uc_mcontext.__gregs[_REG_PC] = (__greg_t)(uintptr_t)start;
-	u->uc_mcontext.__gregs[_REG_TPIDR] = (__greg_t)(uintptr_t)private;
-}
diff --git a/lib/libc/arch/aarch64/gen/_setjmp.S b/lib/libc/arch/aarch64/gen/_setjmp.S
deleted file mode 100644
index e7722f123..000000000
--- a/lib/libc/arch/aarch64/gen/_setjmp.S
+++ /dev/null
@@ -1,117 +0,0 @@
-/* $NetBSD: _setjmp.S,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-#include "assym.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.
- * The previous signal state is NOT restored.
- *
- * Note: x0 is the return value
- */
-	.section	.rodata.cst8,"aM",@progbits,8
-	.align	3
-.L_MAGIC:
-	.xword	_JB_MAGIC_AARCH64__SETJMP
-
-ENTRY(_setjmp)
-	adrp	x7, .L_MAGIC
-	ldr	x7, [x7, #:lo12:.L_MAGIC]
-
-	mov	x3, sp
-
-	stp	x7, x3, [x0, #_JB_MAGIC]
-
-	stp	x19, x20, [x0, #_JB_X19]
-	stp	x21, x22, [x0, #_JB_X21]
-	stp	x23, x24, [x0, #_JB_X23]
-	stp	x25, x26, [x0, #_JB_X25]
-	stp	x27, x28, [x0, #_JB_X27]
-	stp	x29, x30, [x0, #_JB_X29]
-
-	mrs	x5, tpidr_el0
-	str	x5, [x0, #_JB_TPIDR]
-
-	stp	d8,  d9,  [x0, #_JB_D8]
-	stp	d10, d11, [x0, #_JB_D10]
-	stp	d12, d13, [x0, #_JB_D12]
-	stp	d14, d15, [x0, #_JB_D14]
-
-        mov	x0, xzr
-        ret
-END(_setjmp)
-
-ENTRY(_longjmp)
-	adrp	x7, .L_MAGIC
-	ldr	x7, [x7, #:lo12:.L_MAGIC]
-
-	ldp	x2, x3, [x0, #_JB_MAGIC]
-	ldp	x4, x5, [x0, #_JB_X29]
-
-	cbz	x3, .Lbotch
-	cbz	x4, .Lbotch
-	cbz	x5, .Lbotch
-	cmp	x2, x7
-	b.ne	.Lbotch
-
-	ldp	x19, x20, [x0, #_JB_X19]
-	ldp	x21, x22, [x0, #_JB_X21]
-	ldp	x23, x24, [x0, #_JB_X23]
-	ldp	x25, x26, [x0, #_JB_X25]
-	ldp	x27, x28, [x0, #_JB_X27]
-
-	ldr	x5, [x0, #_JB_TPIDR]
-	msr	tpidr_el0, x5
-
-	ldp	d8,  d9,  [x0, #_JB_D8]
-	ldp	d10, d11, [x0, #_JB_D10]
-	ldp	d12, d13, [x0, #_JB_D12]
-	ldp	d14, d15, [x0, #_JB_D14]
-
-	mov	sp, x3
-	mov	x29, x4
-	mov	x30, x5
-
-        mov	x0, x1
-        ret
-
-	/* validation failed, die die die. */
-.Lbotch:
-	bl	_C_LABEL(longjmperror)
-	bl	_C_LABEL(abort)
-1:	b	1b		/* Cannot get here */
-END(_longjmp)
diff --git a/lib/libc/arch/aarch64/gen/fabs_ieee754.S b/lib/libc/arch/aarch64/gen/fabs_ieee754.S
deleted file mode 100644
index 0f90dbd49..000000000
--- a/lib/libc/arch/aarch64/gen/fabs_ieee754.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $NetBSD: fabs_ieee754.S,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: fabs_ieee754.S,v 1.1 2014/08/10 05:47:36 matt Exp $")
-
-ENTRY(fabs)
-	fabs	d0, d0
-	ret
-END(fabs)
diff --git a/lib/libc/arch/aarch64/gen/flt_rounds.c b/lib/libc/arch/aarch64/gen/flt_rounds.c
deleted file mode 100644
index 9c59a6ed2..000000000
--- a/lib/libc/arch/aarch64/gen/flt_rounds.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* $NetBSD: flt_rounds.c,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.1 2014/08/10 05:47:36 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#include <aarch64/armreg.h>
-
-
-/*
- * Return the current FP rounding mode
- *
- * Returns:
- *	0 - round to zero
- *	1 - round to nearest
- *	2 - round to postive infinity
- *	3 - round to negative infinity
- *
- * However, the rounding modes stored in the FPCR are:
- *	0 - round to nearest
- *	1 - round to postive infinity
- *	2 - round to negative infinity
- *	3 - round to zero
- *
- * To convert, just add 1 and then mask with 3.
- */
-
-int __flt_rounds(void);
-
-int
-__flt_rounds(void)
-{
-	return (__SHIFTOUT(reg_fpcr_read(), FPCR_RMODE) + 1) & 3;
-}
diff --git a/lib/libc/arch/aarch64/gen/fpgetmask.c b/lib/libc/arch/aarch64/gen/fpgetmask.c
deleted file mode 100644
index 72edba770..000000000
--- a/lib/libc/arch/aarch64/gen/fpgetmask.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2015 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-__RCSID("$NetBSD: fpgetmask.c,v 1.1 2015/07/05 22:07:09 matt Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bitops.h>
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#include <aarch64/armreg.h>
-
-__weak_alias(fpgetmask,_fpgetmask);
-
-fp_except_t
-fpgetmask(void)
-{
-	return __SHIFTOUT(reg_fpcr_read(), FPCR_ESUM);
-}
diff --git a/lib/libc/arch/aarch64/gen/fpgetround.c b/lib/libc/arch/aarch64/gen/fpgetround.c
deleted file mode 100644
index 63ab49a1f..000000000
--- a/lib/libc/arch/aarch64/gen/fpgetround.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2015 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-__RCSID("$NetBSD: fpgetround.c,v 1.1 2015/07/05 22:07:09 matt Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bitops.h>
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#include <aarch64/armreg.h>
-
-__weak_alias(fpgetround,_fpgetround);
-
-fp_rnd_t
-fpgetround(void)
-{
-	return __SHIFTOUT(reg_fpcr_read(), FPCR_RMODE);
-}
diff --git a/lib/libc/arch/aarch64/gen/fpgetsticky.c b/lib/libc/arch/aarch64/gen/fpgetsticky.c
deleted file mode 100644
index a27ce39a8..000000000
--- a/lib/libc/arch/aarch64/gen/fpgetsticky.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2015 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-__RCSID("$NetBSD: fpgetsticky.c,v 1.1 2015/07/05 22:07:09 matt Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bitops.h>
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#include <aarch64/armreg.h>
-
-__weak_alias(fpgetsticky,_fpgetsticky)
-
-fp_except_t
-fpgetsticky(void)
-{
-	return __SHIFTOUT(reg_fpsr_read(), FPSR_CSUM);
-}
diff --git a/lib/libc/arch/aarch64/gen/fpsetmask.c b/lib/libc/arch/aarch64/gen/fpsetmask.c
deleted file mode 100644
index 8662d58bd..000000000
--- a/lib/libc/arch/aarch64/gen/fpsetmask.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2015 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-__RCSID("$NetBSD: fpsetmask.c,v 1.1 2015/07/07 21:40:19 matt Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bitops.h>
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#include <aarch64/armreg.h>
-
-__weak_alias(fpsetmask,_fpsetmask);
-
-fp_except_t
-fpsetmask(fp_except_t mask)
-{
-	const uint32_t old_fpcr = reg_fpcr_read();
-	const uint32_t new_fpcr = (old_fpcr & ~FPCR_ESUM)
-	    | __SHIFTIN(mask, FPCR_ESUM);
-	reg_fpcr_write(new_fpcr);
-	return __SHIFTOUT(old_fpcr, FPCR_ESUM);
-}
diff --git a/lib/libc/arch/aarch64/gen/fpsetround.c b/lib/libc/arch/aarch64/gen/fpsetround.c
deleted file mode 100644
index c554ace1d..000000000
--- a/lib/libc/arch/aarch64/gen/fpsetround.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2015 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-__RCSID("$NetBSD: fpsetround.c,v 1.1 2015/07/07 21:40:19 matt Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bitops.h>
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#include <aarch64/armreg.h>
-
-__weak_alias(fpsetround,_fpsetround);
-
-fp_rnd_t
-fpsetround(fp_rnd_t rnd)
-{
-	const uint32_t old_fpcr = reg_fpcr_read();
-	const uint32_t new_fpcr = (~old_fpcr & ~FPCR_RMODE)
-	    | __SHIFTIN(rnd, FPCR_RMODE);
-	reg_fpcr_write(new_fpcr);
-	return __SHIFTOUT(old_fpcr, FPCR_RMODE);
-}
diff --git a/lib/libc/arch/aarch64/gen/fpsetsticky.c b/lib/libc/arch/aarch64/gen/fpsetsticky.c
deleted file mode 100644
index 4af29e508..000000000
--- a/lib/libc/arch/aarch64/gen/fpsetsticky.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2015 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-__RCSID("$NetBSD: fpsetsticky.c,v 1.1 2015/07/07 21:40:19 matt Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bitops.h>
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#include <aarch64/armreg.h>
-
-__weak_alias(fpsetsticky,_fpsetsticky)
-
-fp_except_t
-fpsetsticky(fp_except_t sticky)
-{
-	const uint32_t old_fpsr = reg_fpsr_read();
-	const uint32_t new_fpsr = (old_fpsr & ~FPSR_CSUM)
-	   | __SHIFTIN(sticky, FPSR_CSUM);
-	reg_fpsr_write(new_fpsr);
-	return __SHIFTOUT(old_fpsr, FPSR_CSUM);
-}
diff --git a/lib/libc/arch/aarch64/gen/makecontext.c b/lib/libc/arch/aarch64/gen/makecontext.c
deleted file mode 100644
index ac7bb729c..000000000
--- a/lib/libc/arch/aarch64/gen/makecontext.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* $NetBSD: makecontext.c,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.1 2014/08/10 05:47:36 matt Exp $");
-#endif
-
-#include <stddef.h>
-#include <inttypes.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#include <stdarg.h>
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t * const gr = ucp->uc_mcontext.__gregs;
-	__uint64_t *sp;
-
-	/* Compute and align stack pointer. */
-	sp = (uint64_t *)
-	    (((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size) & -16LL);
-	/* Allocate necessary stack space for arguments exceeding x0-7. */
-	if (argc > 8)
-		sp -= argc - 8;
-	gr[_REG_SP] = (__greg_t)(uintptr_t)sp;
-	/* Wipe out frame pointer. */
-	gr[_REG_X29] = 0;
-	/* Arrange for return via the trampoline code. */
-	gr[_REG_X30] = (__greg_t)(uintptr_t)_resumecontext;
-	gr[_REG_PC] = (__greg_t)(uintptr_t)func;
-
-	va_list ap;
-	va_start(ap, argc);
-
-	/* Pass up to four arguments in r0-3. */
-	for (int i = 0; i < argc && i < 8; i++) {
-		gr[_REG_X0 + i] = va_arg(ap, int);
-	}
-
-	/* Pass any additional arguments on the stack. */
-	for (int i = 8; i < argc; i++) {
-		*sp++ = va_arg(ap, uint64_t);
-	}
-	va_end(ap);
-}
diff --git a/lib/libc/arch/aarch64/gen/nanf.c b/lib/libc/arch/aarch64/gen/nanf.c
deleted file mode 100644
index 9edcb9e04..000000000
--- a/lib/libc/arch/aarch64/gen/nanf.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: nanf.c,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.1 2014/08/10 05:47:36 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-#ifdef __AARCH64EB__
-		{ { 0x7f, 0xc0,    0,    0 } };
-#else
-		{ {    0,    0, 0xc0, 0x7f } };
-#endif
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/aarch64/gen/resumecontext.c b/lib/libc/arch/aarch64/gen/resumecontext.c
deleted file mode 100644
index 33d48584c..000000000
--- a/lib/libc/arch/aarch64/gen/resumecontext.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $NetBSD: resumecontext.c,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: resumecontext.c,v 1.1 2014/08/10 05:47:36 matt Exp $");
-#endif
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <ucontext.h>
-#include <unistd.h>
-#include "extern.h"
-
-void
-_resumecontext(void)
-{
-	ucontext_t uct;
-
-	(void)getcontext(&uct);
-	if (uct.uc_link == NULL) 
-		exit(0);
-	(void)setcontext(uct.uc_link);
-	_exit(-1);
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/aarch64/gen/setjmp.S b/lib/libc/arch/aarch64/gen/setjmp.S
deleted file mode 100644
index 2c31db879..000000000
--- a/lib/libc/arch/aarch64/gen/setjmp.S
+++ /dev/null
@@ -1,133 +0,0 @@
-/*.$NetBSD: setjmp.S,v 1.1 2014/08/10 05:47:36 matt Exp $.*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-#include "assym.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.
- * The previous signal state is restored.
- */
-
-	.section	.rodata.cst8,"aM",@progbits,8
-	.align	3
-.L_MAGIC:
-	.xword	_JB_MAGIC_AARCH64_SETJMP
-
-ENTRY(__setjmp14)
-	adrp	x7, .L_MAGIC
-	ldr	x7, [x7, #:lo12:.L_MAGIC]
-
-	mov	x3, sp
-	stp	x7,  x3,  [x0, #_JB_MAGIC]
-
-	stp	x19, x20, [x0, #_JB_X19]
-	stp	x21, x22, [x0, #_JB_X21]
-	stp	x23, x24, [x0, #_JB_X23]
-	stp	x25, x26, [x0, #_JB_X25]
-	stp	x27, x28, [x0, #_JB_X27]
-	stp	x29, x30, [x0, #_JB_X29]
-
-	mrs	x5, tpidr_el0
-	str	x5, [x0, #_JB_TPIDR]
-
-	stp	d8,  d9,  [x0, #_JB_D8]
-	stp	d10, d11, [x0, #_JB_D10]
-	stp	d12, d13, [x0, #_JB_D12]
-	stp	d14, d15, [x0, #_JB_D14]
-
-	/* Get the signal mask. */
-	add	x2, x0, #_JB_SIGMASK
-	mov	x1, #0
-	mov	x0, #0
-
-	stp	x29, x30, [sp, #-16]!
-	mov	x29, sp
-	bl	_C_LABEL(__sigprocmask14)
-	ldp	x29, x30, [sp], #16
-
-	mov	x0, xzr
-	ret
-END(__setjmp14)
-
-ENTRY(__longjmp14)
-	adrp	x7, .L_MAGIC
-	ldr	x7, [x7, #:lo12:.L_MAGIC]
-	ldp	x2, x3, [x0, #_JB_MAGIC]
-	cmp	x2, x7
-	b.ne	.Lbotch
-
-	ldp	x4,  x5,  [x0, #_JB_X29]
-	cbz	x3, .Lbotch
-	cbz	x4, .Lbotch
-	cbz	x5, .Lbotch
-
-	ldp	x19, x20, [x0, #_JB_X19]
-	ldp	x21, x22, [x0, #_JB_X21]
-	ldp	x23, x24, [x0, #_JB_X23]
-	ldp	x25, x26, [x0, #_JB_X25]
-	ldp	x27, x28, [x0, #_JB_X27]
-
-	ldr	x5, [x0, #_JB_TPIDR]
-	msr	tpidr_el0, x5 
-
-	ldp	d8,  d9,  [x0, #_JB_D8]
-	ldp	d10, d11, [x0, #_JB_D10]
-	ldp	d12, d13, [x0, #_JB_D12]
-	ldp	d14, d15, [x0, #_JB_D14]
-
-	sub	sp, x3, #32
-
-	stp	x4, x5, [sp, #16]
-	str	x1, [sp, #8]
-	add	x29, sp, #16
-
-	mov	x2, #0
-	add	x1, x0, #_JB_SIGMASK
-	mov	x0, #3				/* SIG_SETMASK */
-	bl	_C_LABEL(__sigprocmask14)
-
-	ldp	x29, x30, [sp, #16]
-	ldr	x0, [sp, #8]
-	add	sp, sp, #32
-	ret
-
-	/* validation failed, die die die. */
-.Lbotch:
-	bl	_C_LABEL(longjmperror)
-	bl	_C_LABEL(abort)
-1:	b	1b		/* Cannot get here */
-END(__longjmp14)
diff --git a/lib/libc/arch/aarch64/gen/sigsetjmp.S b/lib/libc/arch/aarch64/gen/sigsetjmp.S
deleted file mode 100644
index 16bbb21cd..000000000
--- a/lib/libc/arch/aarch64/gen/sigsetjmp.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $NetBSD: sigsetjmp.S,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-#include "assym.h"
-
-#if (_JB_MAGIC_AARCH64__SETJMP ^ _JB_MAGIC_AARCH64_SETJMP) != 1
-#error _JB_MAGIC botch
-#endif
-
-/* LINTSTUB: int __sigsetjmp14(sigjmp_buf *, int); */
-
-ENTRY(__sigsetjmp14)
-	cbnz	w1, _C_LABEL(__setjmp14)
-	b	_C_LABEL(_setjmp)
-END(__sigsetjmp14)
-
-/* LINTSTUB: int __sigsetlong14(sigjmp_buf *, int); */
-
-ENTRY(__siglongjmp14)
-	ldr	x3, [x0, #_JB_MAGIC]
-	tbz	x3, #0, _C_LABEL(__longjmp14)
-	b	_C_LABEL(_longjmp)
-END(__siglongjmp14)
diff --git a/lib/libc/arch/aarch64/gen/swapcontext.S b/lib/libc/arch/aarch64/gen/swapcontext.S
deleted file mode 100644
index 7554afec0..000000000
--- a/lib/libc/arch/aarch64/gen/swapcontext.S
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $NetBSD: swapcontext.S,v 1.1 2014/08/10 05:47:36 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-        RCSID("$NetBSD: swapcontext.S,v 1.1 2014/08/10 05:47:36 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-/* LINTSTUB: int swapcontext(ucontext_t * restrict, ucontext_t * restrict); */
-
-ENTRY(swapcontext)
-	sub	sp, sp, #32		/* allocate stack frame */
-	stp	x29, x30, [sp, #16]	/* save FP & RA */
-	add	x29, sp, #16		/* new FP */
-	stp	x0, x1, [sp, #0]	/* save oucp & ucp */
-
-	bl	_C_LABEL(_getcontext)	/* getcontext(oucp) */
-	mov	x3, x0			/* save return value */
-
-	ldp	x2, x0, [sp, #0]	/* restore oucp & ucp */
-	ldp	x29, x30, [sp, #16]	/* restore FP & RA */
-	add	sp, sp, #32		/* free stack frame */
-
-	/*
-	 * Assume _getcontext succeeded.
-	 */
-	mov	x4, sp			/* Get SP */
-	str	x4, [x2, #_UC_REGS_SP]	/* Adjust saved SP. */
-	str	x30, [x2, #_UC_REGS_PC]	/* Adjust saved LR. */
-
-	cbz	x3, _C_LABEL(setcontext)/* setcontext if getcontext succeeded */
-	mov	x0, x3			/* restore getcontext return value */
-	ret				/* return on error from getcontext */
-END(swapcontext)
diff --git a/lib/libc/arch/aarch64/genassym.cf b/lib/libc/arch/aarch64/genassym.cf
deleted file mode 100644
index ffb5d0bb1..000000000
--- a/lib/libc/arch/aarch64/genassym.cf
+++ /dev/null
@@ -1,65 +0,0 @@
-# $NetBSD: genassym.cf,v 1.1 2014/08/10 05:47:36 matt Exp $
-
-#-
-# Copyright (c) 2014 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Matt Thomas of 3am Software Foundry.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-include <sys/types.h>
-include <ucontext.h>
-include <setjmp.h>
-
-define _UC_REGS_X0	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X0])
-define _UC_REGS_SP	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_SP])
-define _UC_REGS_PC	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_PC])
-
-define _JB_MAGIC_AARCH64__SETJMP _JB_MAGIC_AARCH64__SETJMP
-define _JB_MAGIC_AARCH64_SETJMP _JB_MAGIC_AARCH64_SETJMP
-define _JB_MAGIC	sizeof(_BSD_JBSLOT_T_ [_JB_MAGIC])
-define _JB_SP		sizeof(_BSD_JBSLOT_T_ [_JB_SP])
-define _JB_X19		sizeof(_BSD_JBSLOT_T_ [_JB_X19])
-define _JB_X20		sizeof(_BSD_JBSLOT_T_ [_JB_X20])
-define _JB_X21		sizeof(_BSD_JBSLOT_T_ [_JB_X21])
-define _JB_X22		sizeof(_BSD_JBSLOT_T_ [_JB_X22])
-define _JB_X23		sizeof(_BSD_JBSLOT_T_ [_JB_X23])
-define _JB_X24		sizeof(_BSD_JBSLOT_T_ [_JB_X24])
-define _JB_X25		sizeof(_BSD_JBSLOT_T_ [_JB_X25])
-define _JB_X26		sizeof(_BSD_JBSLOT_T_ [_JB_X26])
-define _JB_X27		sizeof(_BSD_JBSLOT_T_ [_JB_X27])
-define _JB_X28		sizeof(_BSD_JBSLOT_T_ [_JB_X29])
-define _JB_X29		sizeof(_BSD_JBSLOT_T_ [_JB_X29])
-define _JB_X30		sizeof(_BSD_JBSLOT_T_ [_JB_X30])
-define _JB_TPIDR	sizeof(_BSD_JBSLOT_T_ [_JB_TPIDR])
-define _JB_D8		sizeof(_BSD_JBSLOT_T_ [_JB_D8])
-define _JB_D9		sizeof(_BSD_JBSLOT_T_ [_JB_D9])
-define _JB_D10		sizeof(_BSD_JBSLOT_T_ [_JB_D10])
-define _JB_D11		sizeof(_BSD_JBSLOT_T_ [_JB_D11])
-define _JB_D12		sizeof(_BSD_JBSLOT_T_ [_JB_D12])
-define _JB_D13		sizeof(_BSD_JBSLOT_T_ [_JB_D13])
-define _JB_D14		sizeof(_BSD_JBSLOT_T_ [_JB_D14])
-define _JB_D15		sizeof(_BSD_JBSLOT_T_ [_JB_D15])
-define _JB_SIGMASK	sizeof(_BSD_JBSLOT_T_ [_JB_SIGMASK])
diff --git a/lib/libc/arch/aarch64/net/Makefile.inc b/lib/libc/arch/aarch64/net/Makefile.inc
deleted file mode 100644
index 3fcab6fb0..000000000
--- a/lib/libc/arch/aarch64/net/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/08/10 05:47:36 matt Exp $
-
-# hton* and nto* functions provided by ../gen/byte_swap_*.S
diff --git a/lib/libc/arch/aarch64/softfloat/aarch64-gcc.h b/lib/libc/arch/aarch64/softfloat/aarch64-gcc.h
deleted file mode 100644
index fb543137c..000000000
--- a/lib/libc/arch/aarch64/softfloat/aarch64-gcc.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* $NetBSD: aarch64-gcc.h,v 1.1 2014/08/10 05:47:37 matt Exp $	*/
-
-/*
--------------------------------------------------------------------------------
-One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
--------------------------------------------------------------------------------
-*/
-#include <machine/endian.h>
-#if _BYTE_ORDER == _BIG_ENDIAN
-#define BIGENDIAN
-#endif
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#define LITTLEENDIAN
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `BITS64' can be defined to indicate that 64-bit integer types are
-supported by the compiler.
--------------------------------------------------------------------------------
-*/
-#define BITS64
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines the most convenient type that holds
-integers of at least as many bits as specified.  For example, `uint8' should
-be the most convenient type that can hold unsigned integers of as many as
-8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
-implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
-to the same as `int'.
--------------------------------------------------------------------------------
-*/
-typedef int flag;
-typedef int uint8;
-typedef int int8;
-typedef int uint16;
-typedef int int16;
-typedef unsigned int uint32;
-typedef signed int int32;
-#ifdef BITS64
-typedef unsigned long long int uint64;
-typedef signed long long int int64;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines a type that holds integers
-of _exactly_ the number of bits specified.  For instance, for most
-implementation of C, `bits16' and `sbits16' should be `typedef'ed to
-`unsigned short int' and `signed short int' (or `short int'), respectively.
--------------------------------------------------------------------------------
-*/
-typedef unsigned char bits8;
-typedef signed char sbits8;
-typedef unsigned short int bits16;
-typedef signed short int sbits16;
-typedef unsigned int bits32;
-typedef signed int sbits32;
-#ifdef BITS64
-typedef unsigned long long int bits64;
-typedef signed long long int sbits64;
-#endif
-
-#ifdef BITS64
-/*
--------------------------------------------------------------------------------
-The `LIT64' macro takes as its argument a textual integer literal and
-if necessary ``marks'' the literal as having a 64-bit integer type.
-For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
-appended with the letters `LL' standing for `long long', which is `gcc's
-name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
-defined as the identity macro:  `#define LIT64( a ) a'.
--------------------------------------------------------------------------------
-*/
-#define LIT64( a ) a##LL
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `INLINE' can be used before functions that should be inlined.  If
-a compiler does not support explicit inlining, this macro should be defined
-to be `static'.
--------------------------------------------------------------------------------
-*/
-#define INLINE static inline
-
-#define FLOAT64_DEMANGLE(a)	(a)
-#define FLOAT64_MANGLE(a)	(a)
diff --git a/lib/libc/arch/aarch64/softfloat/milieu.h b/lib/libc/arch/aarch64/softfloat/milieu.h
deleted file mode 100644
index d615bc5a1..000000000
--- a/lib/libc/arch/aarch64/softfloat/milieu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $NetBSD: milieu.h,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "aarch64-gcc.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
diff --git a/lib/libc/arch/aarch64/softfloat/qp.c b/lib/libc/arch/aarch64/softfloat/qp.c
deleted file mode 100644
index 4e7fd4f49..000000000
--- a/lib/libc/arch/aarch64/softfloat/qp.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/* $NetBSD: qp.c,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-
-#include "milieu.h"
-#include "softfloat.h"
-
-/*
- * This file provides wrappers for the softfloat functions.  We can't use
- * invoke them directly since long double arguments are passed in FP/SIMD
- * as well as being returned in them while float128 arguments are passed
- * in normal registers.
- */
-
-long double __addtf3(long double, long double);
-long double __divtf3(long double, long double);
-long double __modtf3(long double, long double);
-long double __multf3(long double, long double);
-long double __negtf2(long double);
-long double __subtf3(long double, long double);
-
-int __getf2(long double, long double);
-int __lttf2(long double, long double);
-int __gttf2(long double, long double);
-int __letf2(long double, long double);
-int __eqtf2(long double, long double);
-int __netf2(long double, long double);
-int __unordtf2(long double, long double);
-
-double __trunctfdf2(long double);
-float __trunctfsf2(long double);
-
-long double __extendsftf2(float);
-long double __extenddftf2(double);
-
-long double __floatsitf(int32_t);
-long double __floatditf(int64_t);
-
-long double __floatunsitf(uint32_t);
-long double __floatunditf(uint64_t);
-
-int32_t __fixtfsi(long double);
-int64_t __fixtfdi(long double);
-
-uint32_t __fixuntfsi(long double);
-uint64_t __fixuntfdi(long double);
-
-#if 0
-long double __floattitf(int128_t);
-long double __floatuntitf(uint128_t);
-int128_t __fixtfti(long double);
-uint128_t __fixuntfti(long double);
-#endif
-
-union sf_ieee_flt_u {
-	float fltu_f;
-	float32 fltu_f32;
-};
-
-union sf_ieee_dbl_u {
-	double dblu_d;
-	float64 dblu_f64;
-};
-
-union sf_ieee_ldbl_u {
-	long double ldblu_ld;
-	float128 ldblu_f128;
-};
-
-long double
-__addtf3(long double ld_a, long double ld_b)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_ldbl_u b = { .ldblu_ld = ld_b };
-	const union sf_ieee_ldbl_u c = {
-	    .ldblu_f128 = float128_add(a.ldblu_f128, b.ldblu_f128)
-	};
-
-	return c.ldblu_ld;
-}
-
-long double
-__divtf3(long double ld_a, long double ld_b)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_ldbl_u b = { .ldblu_ld = ld_b };
-	const union sf_ieee_ldbl_u c = {
-	    .ldblu_f128 = float128_div(a.ldblu_f128, b.ldblu_f128)
-	};
-
-	return c.ldblu_ld;
-}
-
-long double
-__multf3(long double ld_a, long double ld_b)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_ldbl_u b = { .ldblu_ld = ld_b };
-	const union sf_ieee_ldbl_u c = {
-	    .ldblu_f128 = float128_mul(a.ldblu_f128, b.ldblu_f128)
-	};
-
-	return c.ldblu_ld;
-}
-
-long double
-__negtf2(long double ld_a)
-{
-	const union sf_ieee_ldbl_u zero = { .ldblu_ld = 0.0 };
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_ldbl_u b = {
-	    .ldblu_f128 = float128_div(zero.ldblu_f128, a.ldblu_f128)
-	};
-
-	return b.ldblu_ld;
-}
-
-long double
-__subtf3(long double ld_a, long double ld_b)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_ldbl_u b = { .ldblu_ld = ld_b };
-	const union sf_ieee_ldbl_u c = {
-	    .ldblu_f128 = float128_sub(a.ldblu_f128, b.ldblu_f128)
-	};
-
-	return c.ldblu_ld;
-}
-
-#if 0
-int
-__cmptf3(float128 *a, float128 *b)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_ldbl_u b = { .ldblu_ld = ld_b };
-
-	if (float128_eq(*a, *b))
-		return 0;
-
-	if (float128_le(*a, *b))
-		return 1;
-
-	return 2;
-}
-
-
-/*
- * XXX 
- */
-int
-_Qp_cmpe(float128 *a, float128 *b)
-{
-	return _Qp_cmp(a, b);
-}
-#endif
-
-int
-__eqtf2(long double ld_a, long double ld_b)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_ldbl_u b = { .ldblu_ld = ld_b };
-
-	return float128_eq(a.ldblu_f128, b.ldblu_f128);
-}
-
-int
-__getf2(long double ld_a, long double ld_b)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_ldbl_u b = { .ldblu_ld = ld_b };
-
-	return float128_le(b.ldblu_f128, a.ldblu_f128);
-}
-
-int
-__gttf2(long double ld_a, long double ld_b)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_ldbl_u b = { .ldblu_ld = ld_b };
-
-	return float128_lt(b.ldblu_f128, a.ldblu_f128);
-}
-
-int
-__letf2(long double ld_a, long double ld_b)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_ldbl_u b = { .ldblu_ld = ld_b };
-
-	return float128_le(a.ldblu_f128, b.ldblu_f128);
-}
-
-int
-__lttf2(long double ld_a, long double ld_b)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_ldbl_u b = { .ldblu_ld = ld_b };
-
-	return float128_lt(a.ldblu_f128, b.ldblu_f128);
-}
-
-int
-__netf2(long double ld_a, long double ld_b)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_ldbl_u b = { .ldblu_ld = ld_b };
-
-	return !float128_eq(a.ldblu_f128, b.ldblu_f128);
-}
-
-float
-__trunctfsf2(long double ld_a)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_flt_u c = {
-		.fltu_f32 = float128_to_float32(a.ldblu_f128),
-	};
-
-	return c.fltu_f;
-}
-
-double
-__trunctfdf2(long double ld_a)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_dbl_u c = {
-		.dblu_f64 = float128_to_float64(a.ldblu_f128),
-	};
-
-	return c.dblu_d;
-}
-
-int32_t
-__fixtfsi(long double ld_a)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	return float128_to_int32_round_to_zero(a.ldblu_f128);
-}
-
-int64_t
-__fixtfdi(long double ld_a)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-
-	return float128_to_int64_round_to_zero(a.ldblu_f128);
-}
-
-#if 0
-uint32_t
-__fixuntfsi(long double ld_a)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-
-	return float128_to_uint32_round_to_zero(a.ldblu_f128);
-}
-
-uint64_t
-__fixuntfdi(long double ld_a)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-
-	return float128_to_uint64_round_to_zero(a.ldblu_f128);
-}
-#endif
-
-long double
-__extendsftf2(float f_a)
-{
-	const union sf_ieee_flt_u a = { .fltu_f = f_a };
-	const union sf_ieee_ldbl_u c = {
-		.ldblu_f128 = float32_to_float128(a.fltu_f32)
-	};
-
-	return c.ldblu_ld;
-}
-
-long double
-__extenddftf2(double d_a)
-{
-	const union sf_ieee_dbl_u a = { .dblu_d = d_a };
-	const union sf_ieee_ldbl_u c = {
-		.ldblu_f128 = float64_to_float128(a.dblu_f64)
-	};
-
-	return c.ldblu_ld;
-}
-
-long double
-__floatunsitf(uint32_t a)
-{
-	const union sf_ieee_ldbl_u c = {
-		.ldblu_f128 = int64_to_float128(a)
-	};
-
-	return c.ldblu_ld;
-}
-
-long double
-__floatunditf(uint64_t a)
-{
-	union sf_ieee_ldbl_u c;
-	const uint64_t msb64 = 1LL << 63;
-
-	if (a & msb64) {
-		static const union sf_ieee_ldbl_u two63 = {
-			.ldblu_ld = 0x1.0p63
-		};
-		
-		c.ldblu_f128 = int64_to_float128(a ^ msb64);
-		c.ldblu_f128 = float128_add(c.ldblu_f128, two63.ldblu_f128);
-	} else {
-		c.ldblu_f128 = int64_to_float128(a);
-	}
-	return c.ldblu_ld;
-}
-
-long double
-__floatsitf(int32_t a)
-{
-	const union sf_ieee_ldbl_u c = {
-		.ldblu_f128 = int64_to_float128(a)
-	};
-
-	return c.ldblu_ld;
-}
-
-long double
-__floatditf(int64_t a)
-{
-	const union sf_ieee_ldbl_u c = {
-		.ldblu_f128 = int64_to_float128(a)
-	};
-
-	return c.ldblu_ld;
-}
-
-int
-__unordtf2(long double ld_a, long double ld_b)
-{
-	const union sf_ieee_ldbl_u a = { .ldblu_ld = ld_a };
-	const union sf_ieee_ldbl_u b = { .ldblu_ld = ld_b };
-
-	/*
-	 * The comparison is unordered if either input is a NaN.
-	 * Test for this by comparing each operand with itself.
-	 * We must perform both comparisons to correctly check for
-	 * signalling NaNs.
-	 */
-	return 1 ^ (float128_eq(a.ldblu_f128, a.ldblu_f128) & float128_eq(b.ldblu_f128, b.ldblu_f128));
-}
diff --git a/lib/libc/arch/aarch64/softfloat/softfloat-qp.h b/lib/libc/arch/aarch64/softfloat/softfloat-qp.h
deleted file mode 100644
index 9169889a1..000000000
--- a/lib/libc/arch/aarch64/softfloat/softfloat-qp.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Get everything SOFTFLOAT_FOR_GCC normally would rename out of the users
- * namespace. Much of this isn't used but to avoid dissecting softloat.c
- * all of it is pulled in even for just the _Qp* case
- */
-
-#if defined(SOFTFLOATAARCH64_FOR_GCC) && !defined(SOFTFLOAT_FOR_GCC)
-#define float_exception_flags   _softfloat_float_exception_flags
-#define float_rounding_mode     _softfloat_float_rounding_mode
-#define float_raise             _softfloat_float_raise
-
-#define float32_eq              _softfloat_float32_eq
-#define float32_le              _softfloat_float32_le
-#define float32_lt              _softfloat_float32_lt
-#define float64_eq              _softfloat_float64_eq
-#define float64_le              _softfloat_float64_le
-#define float64_lt              _softfloat_float64_lt
-
-#define float32_add			_softfloat_float32_add
-#define float64_add			_softfloat_float64_add
-#define float32_sub			_softfloat_float32_sub
-#define float64_sub			_softfloat_float64_sub
-#define float32_mul			_softfloat_float32_mul
-#define float64_mul			_softfloat_float64_mul
-#define float32_div			_softfloat_float32_div
-#define float64_div			_softfloat_float64_div
-#define int32_to_float32		_softfloat_int32_to_float32
-#define int32_to_float64		_softfloat_int32_to_float64
-#define int64_to_float32		_softfloat_int64_to_float32
-#define int64_to_float64		_softfloat_int64_to_float64
-#define float32_to_int32_round_to_zero	_softfloat_float32_to_int32_round_to_zero
-#define float64_to_int32_round_to_zero	_softfloat_float64_to_int32_round_to_zero
-#define float32_to_int64_round_to_zero	_softfloat_float32_to_int64_round_to_zero
-#define float64_to_int64_round_to_zero	_softfloat_float64_to_int64_round_to_zero
-#define float32_to_uint32_round_to_zero	_softfloat_float32_to_uint32_round_to_zero
-#define float64_to_uint32_round_to_zero	_softfloat_float64_to_uint32_round_to_zero
-#define float32_to_float64		_softfloat_float32_to_float64
-#define float64_to_float32		_softfloat_float64_to_float32
-#define float32_is_signaling_nan	_softfloat_float32_is_signaling_nan
-#define float64_is_signaling_nan	_softfloat_float64_is_signaling_nan
-
-#endif /* SOFTFLOATAARCH64_FOR_GCC and !SOFTFLOAT_FOR_GCC */
-
-/*
- * The following will always end up in the namespace if FLOAT128 is
- * defined and SOFTFLOAT_FOR_GCC isn't. So rename them out of the user's
- * namespace.
- */
-
-#ifdef SOFTFLOATAARCH64_FOR_GCC
-#define	float128_add			_softfloat_float128_add
-#define	float128_div			_softfloat_float128_div
-#define	float128_eq			_softfloat_float128_eq
-#define	float128_eq_signaling		_softfloat_float128_eq_signaling
-#define	float128_is_nan			_softfloat_float128_is_nan
-#define	float128_is_signaling_nan	_softfloat_float128_is_signaling_nan
-#define	float128_le			_softfloat_float128_le
-#define	float128_le_quiet		_softfloat_float128_le_quiet
-#define	float128_lt			_softfloat_float128_lt
-#define	float128_lt_quiet		_softfloat_float128_lt_quiet
-#define	float128_mul			_softfloat_float128_mul
-#define	float128_rem			_softfloat_float128_rem
-#define	float128_round_to_int		_softfloat_float128_round_to_int
-#define	float128_sqrt			_softfloat_float128_sqrt
-#define	float128_sub			_softfloat_float128_sub
-#define	float128_to_float32		_softfloat_float128_to_float32
-#define	float128_to_float64		_softfloat_float128_to_float64
-#define	float128_to_int32		_softfloat_float128_to_int32
-#define	float128_to_int32_round_to_zero	_softfloat_float128_to_int32_round_to_zero
-#define	float128_to_int64		_softfloat_float128_to_int64
-#define	float128_to_int64_round_to_zero	_softfloat_float128_to_int64_round_to_zero
-#define	float128_to_uint64_round_to_zero	_softfloat_float128_to_uint64_round_to_zero
-#define	float32_to_float128		_softfloat_float32_to_float128
-#define	float64_to_float128		_softfloat_float64_to_float128
-#define	int32_to_float128		_softfloat_int32_to_float128
-#define	int64_to_float128		_softfloat_int64_to_float128
-
-/*
- * If this isn't defined go ahead and set it now since this is now past
- * anywhere define's are happening and this will conditionally compile out
- * a lot of extraneous code in softfloat.c
- */
-
-#ifndef SOFTFLOAT_FOR_GCC
-#define SOFTFLOAT_FOR_GCC
-#endif
-
-#endif /* SOFTFLOATAARCH64_FOR_GCC */
diff --git a/lib/libc/arch/aarch64/softfloat/softfloat-wrapper.c b/lib/libc/arch/aarch64/softfloat/softfloat-wrapper.c
deleted file mode 100644
index ac5582aff..000000000
--- a/lib/libc/arch/aarch64/softfloat/softfloat-wrapper.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <softfloat.c>
diff --git a/lib/libc/arch/aarch64/softfloat/softfloat.h b/lib/libc/arch/aarch64/softfloat/softfloat.h
deleted file mode 100644
index a317bd766..000000000
--- a/lib/libc/arch/aarch64/softfloat/softfloat.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/* $NetBSD: softfloat.h,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/* This is a derivative work. */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.  The same applies to
-the `FLOAT128' macro and the quadruple-precision format `float128'.
--------------------------------------------------------------------------------
-*/
-/* #define FLOATX80 */
-#define FLOAT128
-
-#include "softfloat-qp.h"
-
-#include <machine/ieeefp.h>
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef unsigned int float32;
-typedef unsigned long long float64;
-#ifdef FLOATX80
-typedef struct {
-    unsigned short high;
-    unsigned long long low;
-} floatx80;
-#endif
-#ifdef FLOAT128
-typedef struct {
-    unsigned long long high, low;
-} float128;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-#ifndef SOFTFLOAT_FOR_GCC
-extern int8 float_detect_tininess;
-#endif
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern fp_rnd float_rounding_mode;
-#define float_round_nearest_even FP_RN
-#define float_round_to_zero      FP_RZ
-#define float_round_down         FP_RM
-#define float_round_up           FP_RP
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-*/
-extern fp_except float_exception_flags;
-extern fp_except float_exception_mask;
-enum {
-    float_flag_inexact   = FP_X_IMP,
-    float_flag_underflow = FP_X_UFL,
-    float_flag_overflow  = FP_X_OFL,
-    float_flag_divbyzero = FP_X_DZ,
-    float_flag_invalid   = FP_X_INV
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( fp_except );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int32 );
-float32 uint32_to_float32( uint32 );
-float64 int32_to_float64( int32 );
-float64 uint32_to_float64( uint32 );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( int32 );
-floatx80 uint32_to_floatx80( uint32 );
-#endif
-#ifdef FLOAT128
-float128 int32_to_float128( int32 );
-float128 uint32_to_float128( uint32 );
-#endif
-float32 int64_to_float32( long long );
-float64 int64_to_float64( long long );
-#ifdef FLOATX80
-floatx80 int64_to_floatx80( long long );
-#endif
-#ifdef FLOAT128
-float128 int64_to_float128( long long );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float32_to_int32( float32 );
-int float32_to_int32_round_to_zero( float32 );
-unsigned int float32_to_uint32_round_to_zero( float32 );
-long long float32_to_int64( float32 );
-long long float32_to_int64_round_to_zero( float32 );
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-#ifdef FLOAT128
-float128 float32_to_float128( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-flag float32_eq( float32, float32 );
-flag float32_le( float32, float32 );
-flag float32_lt( float32, float32 );
-flag float32_eq_signaling( float32, float32 );
-flag float32_le_quiet( float32, float32 );
-flag float32_lt_quiet( float32, float32 );
-flag float32_is_signaling_nan( float32 );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float64_to_int32( float64 );
-int float64_to_int32_round_to_zero( float64 );
-unsigned int float64_to_uint32_round_to_zero( float64 );
-long long float64_to_int64( float64 );
-long long float64_to_int64_round_to_zero( float64 );
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-#ifdef FLOAT128
-float128 float64_to_float128( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-flag float64_eq( float64, float64 );
-flag float64_le( float64, float64 );
-flag float64_lt( float64, float64 );
-flag float64_eq_signaling( float64, float64 );
-flag float64_le_quiet( float64, float64 );
-flag float64_lt_quiet( float64, float64 );
-flag float64_is_signaling_nan( float64 );
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int floatx80_to_int32( floatx80 );
-int floatx80_to_int32_round_to_zero( floatx80 );
-long long floatx80_to_int64( floatx80 );
-long long floatx80_to_int64_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-#ifdef FLOAT128
-float128 floatx80_to_float128( floatx80 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern int floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-flag floatx80_eq( floatx80, floatx80 );
-flag floatx80_le( floatx80, floatx80 );
-flag floatx80_lt( floatx80, floatx80 );
-flag floatx80_eq_signaling( floatx80, floatx80 );
-flag floatx80_le_quiet( floatx80, floatx80 );
-flag floatx80_lt_quiet( floatx80, floatx80 );
-flag floatx80_is_signaling_nan( floatx80 );
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float128_to_int32( float128 );
-int float128_to_int32_round_to_zero( float128 );
-long long float128_to_int64( float128 );
-long long float128_to_int64_round_to_zero( float128 );
-unsigned long long float128_to_uint64_round_to_zero( float128 );
-float32 float128_to_float32( float128 );
-float64 float128_to_float64( float128 );
-#ifdef FLOATX80
-floatx80 float128_to_floatx80( float128 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision operations.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 );
-float128 float128_add( float128, float128 );
-float128 float128_sub( float128, float128 );
-float128 float128_mul( float128, float128 );
-float128 float128_div( float128, float128 );
-float128 float128_rem( float128, float128 );
-float128 float128_sqrt( float128 );
-flag float128_eq( float128, float128 );
-flag float128_le( float128, float128 );
-flag float128_lt( float128, float128 );
-flag float128_eq_signaling( float128, float128 );
-flag float128_le_quiet( float128, float128 );
-flag float128_lt_quiet( float128, float128 );
-flag float128_is_signaling_nan( float128 );
-flag float128_is_nan( float128 );
-
-#endif
diff --git a/lib/libc/arch/aarch64/stdlib/Makefile.inc b/lib/libc/arch/aarch64/stdlib/Makefile.inc
deleted file mode 100644
index 4bcaf502f..000000000
--- a/lib/libc/arch/aarch64/stdlib/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/08/10 05:47:37 matt Exp $
diff --git a/lib/libc/arch/aarch64/string/Makefile.inc b/lib/libc/arch/aarch64/string/Makefile.inc
deleted file mode 100644
index 4bcaf502f..000000000
--- a/lib/libc/arch/aarch64/string/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/08/10 05:47:37 matt Exp $
diff --git a/lib/libc/arch/aarch64/sys/__clone.S b/lib/libc/arch/aarch64/sys/__clone.S
deleted file mode 100644
index e852f2856..000000000
--- a/lib/libc/arch/aarch64/sys/__clone.S
+++ /dev/null
@@ -1,78 +0,0 @@
-/* $NetBSD: __clone.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-#include <sys/errno.h>
-
-WEAK_ALIAS(clone, __clone)
-
-/*
- * int __clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-ENTRY(__clone)
-
-	/* test stack and function are not null */
-	cbz	x0, .Leinval
-	cbz	x1, .Leinval
-
-	/* place the arg and func onto the child's stack */
-	stp	x3, x0, [x1, #-16]!
-	
-	/* syscall expects (flags, stack) */
-	mov	x0, x2
-
-	SYSTRAP(__clone)
-	_INVOKE_CERROR()
-
-	/*
-	 * x1 and x0 are the same as from fork:
-	 * x1 == 0 in parent process, x1 == 1 in child process.
-	 * x0 == pid of child in parent, x0 == pid of parent in child.
-	 */
-	/* if this is the parent then just return the pid */
-	cbnz	x1, 1f
-
-	/*
-	 * This is the child
-	 * load the function and arg off the stack
-	 */
-	ldp	x0, x1, [sp], #16
-
-	/* call the function */
-	blr	x1
-
-	/* call _exit with the returned value */
-	bl	_C_LABEL(_exit)
-1:	ret
-.Leinval:
-	mov	x0, #EINVAL
-	b	_C_LABEL(__cerror)
-END(__clone)
diff --git a/lib/libc/arch/aarch64/sys/__sigaction14_sigtramp.c b/lib/libc/arch/aarch64/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index 339dbd86e..000000000
--- a/lib/libc/arch/aarch64/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.1 2014/08/10 05:47:37 matt Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.1 2014/08/10 05:47:37 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern const int __sigtramp_siginfo_2[];
-
-	/*
-	 * If no sigaction, use the "default" trampoline since it won't
-	 * be used.
-	 */
-	if (act == NULL)
-		return  __sigaction_sigtramp(sig, act, oact, NULL, 0);
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the non-SA_SIGINFO trampoline if SA_SIGINFO is not
-	 * set in the sigaction.
-	 */
-	if ((act->sa_flags & SA_SIGINFO) == 0) {
-		extern const int __sigtramp_sigcontext_1[];
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-		    __sigtramp_sigcontext_1, 1);
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	/*
-	 * If SA_SIGINFO was specificed or the compatibility trampolines
-	 * can't be used, use the siginfo trampoline.
-	 */
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/aarch64/sys/__sigtramp2.S b/lib/libc/arch/aarch64/sys/__sigtramp2.S
deleted file mode 100755
index 005884c67..000000000
--- a/lib/libc/arch/aarch64/sys/__sigtramp2.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $NetBSD: __sigtramp2.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-/*
- * The ARM signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, the stack looks like:
- *
- *		ucontext structure
- *	sp->	siginfo structure
- * and x28 points to the ucontext
- */
-ENTRY_NP(__sigtramp_siginfo_2)
-	mov	x0, x28				/* set the arg         */
-	SYSTRAP(setcontext)			/* and call setcontext */
-
-	/* If that failed, exit with the error code. */
-	SYSTRAP(exit)
-END(__sigtramp_siginfo_2)
diff --git a/lib/libc/arch/aarch64/sys/__syscall.S b/lib/libc/arch/aarch64/sys/__syscall.S
deleted file mode 100644
index 461b08690..000000000
--- a/lib/libc/arch/aarch64/sys/__syscall.S
+++ /dev/null
@@ -1,71 +0,0 @@
-/* $NetBSD: __syscall.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#ifndef FUNCNAME
-#define	FUNCNAME	__syscall
-#define SYSTRAP_SYSCALL	SYSTRAP(__syscall)
-#endif
-
-#if SYS_MAXSYSARGS > 8
-#error SYS_MAXSYSARGS is greater than 8
-#endif
-
-ENTRY(FUNCNAME)
-	/*
-	 * AAPCS64 supplies the first 8 arguments in registers but since
-	 * the first argument is the syscall #, we only have room for 7
-	 * arguments.  Thus if the syscall uses all 8 arguments, the last
-	 * argument will have been placed on the stack.  Rather than
-	 * complicating the kernel syscall code to deal with that, we fixup
-	 * things here.
-	 *
-	 * First we move the syscall number to x17 freeing a register.
-	 * Then we move the rest of the arguments to their proper register.
-	 * Finally, load x7 from the stack.
-	 *
-	 * Now everything looks as if the syscall wrapper was directly called.
-	 * (unless it was for pipe, fork, vfork, ptrace, or __clone).
-	 */
-	mov	x17, x0
-	mov	x0, x1
-	mov	x1, x2
-	mov	x2, x3
-	mov	x3, x4
-	mov	x4, x5
-	mov	x5, x6
-	mov	x6, x7
-	ldr	x7, [sp, #0]
-	SYSTRAP_SYSCALL
-	_INVOKE_CERROR()
-	ret
-END(FUNCNAME)
diff --git a/lib/libc/arch/aarch64/sys/__vfork14.S b/lib/libc/arch/aarch64/sys/__vfork14.S
deleted file mode 100644
index 77a8ef2b5..000000000
--- a/lib/libc/arch/aarch64/sys/__vfork14.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $NetBSD: __vfork14.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-/*
- * pid = vfork();
- *
- * On return from the SWI:
- * r1 == 0 in parent process, r1 == 1 in child process.
- * r0 == pid of child in parent, r0 == pid of parent in child.
- */
-ENTRY(__vfork14)
-	mov	x8, x30
-	SYSTRAP(__vfork14)
-	_INVOKE_CERROR()
-	sub	w1, w1, #1	/* r1 == 0xffffffff if parent, 0 if child */
-	and	w0, w0, w1	/* r0 == 0 if child, else unchanged */
-	ret	x8
-END(__vfork14)
diff --git a/lib/libc/arch/aarch64/sys/brk.S b/lib/libc/arch/aarch64/sys/brk.S
deleted file mode 100644
index 518a586eb..000000000
--- a/lib/libc/arch/aarch64/sys/brk.S
+++ /dev/null
@@ -1,72 +0,0 @@
-/* $NetBSD: brk.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-	.globl	_C_LABEL(_end)
-	.globl	_C_LABEL(__curbrk)
-
-WEAK_ALIAS(brk, _brk)
-
-	.data
-	.globl	_C_LABEL(__minbrk)
-	.hidden	_C_LABEL(__minbrk)
-	.type	_C_LABEL(__minbrk),#object
-	.align	3
-_C_LABEL(__minbrk):
-	.xword	_C_LABEL(_end)
-	.size	_C_LABEL(__minbrk), 8
-
-/*
- * Change the data segment size
- */
-ENTRY(_brk)
-	adr	x9, _C_LABEL(__minbrk)
-	ldr	x10, [x9, #:lo12:_C_LABEL(__minbrk)]
-
-	/*
-	 * Valid the address specified and set to the minimum
-	 * if the address is below minbrk.
-	 */
-	cmp	x0, x10
-	csel	x0, x10, x0, lt
-	mov	x11, x0
-	SYSTRAP(break)
-	_INVOKE_CERROR()
-
-	/* Store the new address in curbrk */
-	adr	x9, _C_LABEL(__curbrk)
-	str	x11, [x9, #:lo12:_C_LABEL(__curbrk)]
-
-	/* Return 0 for success */
-	mov	x0, xzr
-	ret
-END(_brk)
diff --git a/lib/libc/arch/aarch64/sys/cerror.S b/lib/libc/arch/aarch64/sys/cerror.S
deleted file mode 100644
index 5d30791de..000000000
--- a/lib/libc/arch/aarch64/sys/cerror.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $NetBSD: cerror.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-ENTRY_NP(__cerror)
-	.cfi_startproc
-	stp	x19, x30, [sp, #-16]!
-	.cfi_def_cfa sp, 16
-	.cfi_offset x19, 0
-	.cfi_offset x30, -8
-	mov	w19, w0
-	bl	_C_LABEL(__errno)
-	str	w19, [x0]
-	ldp	x19, x30, [sp], #16
-	mvn	w0,wzr
-	ret
-	.cfi_endproc
-END(__cerror)
diff --git a/lib/libc/arch/aarch64/sys/exect.S b/lib/libc/arch/aarch64/sys/exect.S
deleted file mode 100644
index 54b12569e..000000000
--- a/lib/libc/arch/aarch64/sys/exect.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $NetBSD: exect.S,v 1.1 2014/08/10 05:47:37 matt Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)exect.s	5.1 (Berkeley) 4/23/90
- */
-
-#include "SYS.h"
-
-PSEUDO(exect,execve)
diff --git a/lib/libc/arch/aarch64/sys/fork.S b/lib/libc/arch/aarch64/sys/fork.S
deleted file mode 100644
index be9830e61..000000000
--- a/lib/libc/arch/aarch64/sys/fork.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: fork.S,v 1.1 2014/08/10 05:47:37 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-/*
- * pid = fork();
- *
- * On return from the SWI:
- * r1 == 0 in parent process, r1 == 1 in child process.
- * r0 == pid of child in parent, r0 == pid of parent in child.
- */
-
-_SYSCALL(__fork,fork)
-	sub	w1, w1, #1	/* r1 == 0xffffffff if parent, 0 if child */
-	and	w0, w0, w1	/* r0 == 0 if child, else unchanged */
-	ret
-END(__fork)
diff --git a/lib/libc/arch/aarch64/sys/getcontext.S b/lib/libc/arch/aarch64/sys/getcontext.S
deleted file mode 100644
index d6aac82df..000000000
--- a/lib/libc/arch/aarch64/sys/getcontext.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $NetBSD: getcontext.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: getcontext.S,v 1.1 2014/08/10 05:47:37 matt Exp $")
-#endif /* SYSLIBC_SCCS && !lint */
-
-WEAK_ALIAS(getcontext, _getcontext)
-
-ENTRY(_getcontext)
-	mov	x9, x0			/* Must save argument pointer. */
-	SYSTRAP (getcontext)
-	_INVOKE_CERROR()
-	str	x30, [x9, #_UC_REGS_PC]	/* Adjust PC. */
-#ifdef SOFTFLOAT
-	/* Ahem. */
-	/* Judging from the softfloat code we should at least save
-	   the exception codes and rounding mode here. */
-#endif
-	mov	x0, xzr
-	str	x0, [x9, #_UC_REGS_X0]	/* Return 0. */
-	ret
-END(_getcontext)
diff --git a/lib/libc/arch/aarch64/sys/pipe.S b/lib/libc/arch/aarch64/sys/pipe.S
deleted file mode 100644
index 878130a4e..000000000
--- a/lib/libc/arch/aarch64/sys/pipe.S
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $NetBSD: pipe.S,v 1.1 2014/08/10 05:47:37 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WEAK_ALIAS(pipe, _pipe)
-
-ENTRY(_pipe)
-	mov	x9, x0
-	SYSTRAP(pipe)
-	_INVOKE_CERROR()
-	stp	w0, w1, [x9]
-	mov	w0, wzr
-	RET
-END(_pipe)
diff --git a/lib/libc/arch/aarch64/sys/ptrace.S b/lib/libc/arch/aarch64/sys/ptrace.S
deleted file mode 100644
index 6b86db3cc..000000000
--- a/lib/libc/arch/aarch64/sys/ptrace.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $NetBSD: ptrace.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-ENTRY(ptrace)
-	sub	sp, sp, #48
-	stp	x29, x30, [sp, #32]!
-	add	x29, sp, #32
-	stp	x0, x1, [sp, #0]
-	stp	x2, x3, [sp, #16]
-
-	bl	_C_LABEL(__errno)
-	str	wzr, [x0]
-
-	ldp	x2, x3, [sp, #16]
-	ldp	x0, x1, [sp, #0]
-
-	ldp	x29, x30, [sp, #32]
-	add	sp, sp, #48
-
-	SYSTRAP(ptrace)
-	_INVOKE_CERROR()
-	ret
-END(ptrace)
diff --git a/lib/libc/arch/aarch64/sys/sbrk.S b/lib/libc/arch/aarch64/sys/sbrk.S
deleted file mode 100644
index 90f1d4e77..000000000
--- a/lib/libc/arch/aarch64/sys/sbrk.S
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $NetBSD: sbrk.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-	.globl	_C_LABEL(_end)
-
-WEAK_ALIAS(sbrk, _sbrk)
-
-	.data
-	.align	3
-	.globl	_C_LABEL(__curbrk)
-	.hidden	_C_LABEL(__curbrk)
-	.type	_C_LABEL(__curbrk),#object
-_C_LABEL(__curbrk):
-	.xword	_C_LABEL(_end)
-	.size	_C_LABEL(_end), 8
-
-/*
- * Change the data segment size
- */
-ENTRY(_sbrk)
-	/* get address or offset to __curbrk */
-	adrp	x9, _C_LABEL(__curbrk)
-
-	/* Get the current brk address */
-	ldr	x1, [x9, #:lo12:_C_LABEL(__curbrk)]
-
-	/* Calculate new value */
-	mov	x10, x0
-	add	x0, x0, x1
-	SYSTRAP(break)
-	_INVOKE_CERROR()
-
-	/* Store new curbrk value */
-	ldr	x0, [x9, #:lo12:_C_LABEL(__curbrk)]
-	add	x1, x0, x10
-	str	x1, [x9, #:lo12:_C_LABEL(__curbrk)]
-
-	/* Return old curbrk value */
-	ret
-END(_sbrk)
diff --git a/lib/libc/arch/aarch64/sys/shmat.S b/lib/libc/arch/aarch64/sys/shmat.S
deleted file mode 100644
index cb8a99b91..000000000
--- a/lib/libc/arch/aarch64/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $NetBSD: shmat.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/aarch64/sys/syscall.S b/lib/libc/arch/aarch64/sys/syscall.S
deleted file mode 100644
index 25f25c7e3..000000000
--- a/lib/libc/arch/aarch64/sys/syscall.S
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $NetBSD: syscall.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-#define FUNCNAME	syscall
-#define	SYSTRAP_SYSCALL	SYSTRAP(syscall)
-
-#include "__syscall.S"
diff --git a/lib/libc/arch/alpha/Makefile.inc b/lib/libc/arch/alpha/Makefile.inc
deleted file mode 100644
index a89768201..000000000
--- a/lib/libc/arch/alpha/Makefile.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.20 2008/10/26 07:43:07 mrg Exp $
-
-SRCS+=	__longjmp14.c
-SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
-
-# `source' files built from m4 source
-SRCS+=	__divqu.S __divq.S __divlu.S __divl.S
-SRCS+=	__remqu.S __remq.S __remlu.S __reml.S
-CLEANFILES+=	__divqu.S __divq.S __divlu.S __divl.S
-CLEANFILES+=	__remqu.S __remq.S __remlu.S __reml.S
-
-__divqu.S: ${LIBCDIR}/arch/alpha/gen/divrem.m4
-	${TOOL_M4} -DNAME=__divqu -DOP=div -DS=false -DWORDSIZE=64 \
-		${.ALLSRC} > ${.TARGET}
-
-__divq.S: ${LIBCDIR}/arch/alpha/gen/divrem.m4
-	${TOOL_M4} -DNAME=__divq -DOP=div -DS=true -DWORDSIZE=64 \
-		${.ALLSRC} > ${.TARGET}
-
-__divlu.S: ${LIBCDIR}/arch/alpha/gen/divrem.m4
-	${TOOL_M4} -DNAME=__divlu -DOP=div -DS=false -DWORDSIZE=32 \
-		${.ALLSRC} > ${.TARGET}
-
-__divl.S: ${LIBCDIR}/arch/alpha/gen/divrem.m4
-	${TOOL_M4} -DNAME=__divl -DOP=div -DS=true -DWORDSIZE=32 \
-		${.ALLSRC} > ${.TARGET}
-
-__remqu.S: ${LIBCDIR}/arch/alpha/gen/divrem.m4
-	${TOOL_M4} -DNAME=__remqu -DOP=rem -DS=false -DWORDSIZE=64 \
-		${.ALLSRC} > ${.TARGET}
-
-__remq.S: ${LIBCDIR}/arch/alpha/gen/divrem.m4
-	${TOOL_M4} -DNAME=__remq -DOP=rem -DS=true -DWORDSIZE=64 \
-		${.ALLSRC} > ${.TARGET}
-
-__remlu.S: ${LIBCDIR}/arch/alpha/gen/divrem.m4
-	${TOOL_M4} -DNAME=__remlu -DOP=rem -DS=false -DWORDSIZE=32 \
-		${.ALLSRC} > ${.TARGET}
-
-__reml.S: ${LIBCDIR}/arch/alpha/gen/divrem.m4
-	${TOOL_M4} -DNAME=__reml -DOP=rem -DS=true -DWORDSIZE=32 \
-		${.ALLSRC} > ${.TARGET}
-
-CPPFLAGS+= -I.
diff --git a/lib/libc/arch/alpha/SYS.h b/lib/libc/arch/alpha/SYS.h
deleted file mode 100644
index 2cd48391a..000000000
--- a/lib/libc/arch/alpha/SYS.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* $NetBSD: SYS.h,v 1.8 2002/01/14 00:55:55 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>
-#include <sys/syscall.h>
-
-
-#define	CALLSYS_ERROR(name)					\
-	CALLSYS_NOERROR(name);					\
-	br	gp, LLABEL(name,0);				\
-LLABEL(name,0):							\
-	LDGP(gp);						\
-	beq	a3, LLABEL(name,1);				\
-	jmp	zero, __cerror;					\
-LLABEL(name,1):
-
-
-#define	SYSCALL(name)						\
-LEAF(name,0);				/* XXX # of args? */	\
-	CALLSYS_ERROR(name)
-
-#define	SYSCALL_NOERROR(name)					\
-LEAF(name,0);				/* XXX # of args? */	\
-	CALLSYS_NOERROR(name)
-
-#define	PSEUDO(label,name)					\
-LEAF(label,0);				/* XXX # of args? */	\
-	CALLSYS_ERROR(name);					\
-	RET;							\
-END(label);
-
-#define	PSEUDO_NOERROR(label,name)				\
-LEAF(label,0);				/* XXX # of args? */	\
-	CALLSYS_NOERROR(name);					\
-	RET;							\
-END(label);
-
-#define RSYSCALL(name)						\
-	SYSCALL(name);						\
-	RET;							\
-END(name)
-
-#define RSYSCALL_NOERROR(name)					\
-	SYSCALL_NOERROR(name);					\
-	RET;							\
-END(name)
-
-#define	WSYSCALL(weak,strong)					\
-	WEAK_ALIAS(weak,strong);				\
-	PSEUDO(strong,weak)
diff --git a/lib/libc/arch/alpha/gdtoa/Makefile.inc b/lib/libc/arch/alpha/gdtoa/Makefile.inc
deleted file mode 100644
index 1d786e010..000000000
--- a/lib/libc/arch/alpha/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/03/15 17:35:18 kleink Exp $
-
-SRCS+=	strtof.c
diff --git a/lib/libc/arch/alpha/gdtoa/arith.h b/lib/libc/arch/alpha/gdtoa/arith.h
deleted file mode 100644
index 650a936eb..000000000
--- a/lib/libc/arch/alpha/gdtoa/arith.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define IEEE_LITTLE_ENDIAN
-#ifndef _IEEE_FP
-#define Sudden_Underflow
-#endif
diff --git a/lib/libc/arch/alpha/gdtoa/gd_qnan.h b/lib/libc/arch/alpha/gdtoa/gd_qnan.h
deleted file mode 100644
index 36cb4afa4..000000000
--- a/lib/libc/arch/alpha/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x0
-#define d_QNAN1 0x7ff80000
diff --git a/lib/libc/arch/alpha/gen/Makefile.inc b/lib/libc/arch/alpha/gen/Makefile.inc
deleted file mode 100644
index c3f59d946..000000000
--- a/lib/libc/arch/alpha/gen/Makefile.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.22 2009/12/06 07:12:17 uebayasi Exp $
-
-SRCS+=	fabs.S 
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c infinityl_dbl_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
-
-SRCS+=	nanf.c
-
-SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
-	fpsetround.c fpsetsticky.c
-SRCS+=	__setjmp14.S
-SRCS+=	__sigsetjmp14.S
-SRCS+=	byte_swap_2.S byte_swap_4.S bswap64.c
-SRCS+=	_resumecontext.S
-
-LSRCS.alpha.gen=	Lint_bswap16.c Lint_bswap32.c Lint_swapcontext.c
-LSRCS+=		${LSRCS.alpha.gen}
-DPSRCS+=	${LSRCS.alpha.gen}
-CLEANFILES+=	${LSRCS.alpha.gen}
-
-SRCS+=	makecontext.c resumecontext.c swapcontext.S _lwp.c
-
diff --git a/lib/libc/arch/alpha/gen/__longjmp14.c b/lib/libc/arch/alpha/gen/__longjmp14.c
deleted file mode 100644
index b641a0769..000000000
--- a/lib/libc/arch/alpha/gen/__longjmp14.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*	$NetBSD: __longjmp14.c,v 1.7 2013/03/13 08:05:46 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christian Limpach and Matt Thomas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <machine/reg.h>
-#include <machine/alpha_cpu.h>
-
-#define __LIBC12_SOURCE__
-#include <setjmp.h>
-#include <compat/include/setjmp.h>
-
-void
-__longjmp14(jmp_buf env, int val)
-{
-	struct sigcontext *sc = (void *)env;
-	ucontext_t uc;
-
-	/* Ensure non-zero SP */
-	if (sc->sc_sp == 0 || sc->sc_regs[R_ZERO] != 0xacedbade)
-		goto err;
-
-	/* Ensure non-zero return value */
-	if (val == 0)
-		val = -1;
-
-	/* Set _UC_SIGMASK and _UC_CPU */
-	uc.uc_flags = _UC_SIGMASK | _UC_CPU;
-
-	/* Clear uc_link */
-	uc.uc_link = 0;
-
-	/* Save return value in context */
-	uc.uc_mcontext.__gregs[_REG_V0] = val;
-
-	/* Copy saved registers */
-	uc.uc_mcontext.__gregs[_REG_S0] = sc->sc_regs[R_S0];
-	uc.uc_mcontext.__gregs[_REG_S1] = sc->sc_regs[R_S1];
-	uc.uc_mcontext.__gregs[_REG_S2] = sc->sc_regs[R_S2];
-	uc.uc_mcontext.__gregs[_REG_S3] = sc->sc_regs[R_S3];
-	uc.uc_mcontext.__gregs[_REG_S4] = sc->sc_regs[R_S4];
-	uc.uc_mcontext.__gregs[_REG_S5] = sc->sc_regs[R_S5];
-	uc.uc_mcontext.__gregs[_REG_S6] = sc->sc_regs[R_S6];
-	uc.uc_mcontext.__gregs[_REG_RA] = sc->sc_regs[R_RA];
-	uc.uc_mcontext.__gregs[_REG_GP] = sc->sc_regs[R_GP];
-	uc.uc_mcontext.__gregs[_REG_SP] = sc->sc_sp;
-	uc.uc_mcontext.__gregs[_REG_PC] = sc->sc_pc;
-	uc.uc_mcontext.__gregs[_REG_PS] =
-	   (sc->sc_ps | ALPHA_PSL_USERSET) & ~ALPHA_PSL_USERCLR;
-
-	/* Copy FP state */
-	if (sc->sc_ownedfp) {
-		memcpy(&uc.uc_mcontext.__fpregs.__fp_fr,
-		    &sc->sc_fpregs, 31 * sizeof(unsigned long));
-		uc.uc_mcontext.__fpregs.__fp_fpcr = sc->sc_fpcr;
-		/* XXX sc_fp_control */
-		uc.uc_flags |= _UC_FPU;
-	}
-
-	/* Copy signal mask */
-	uc.uc_sigmask = sc->sc_mask;
-
-	setcontext(&uc);
- err:
-	longjmperror();
-	abort();
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/alpha/gen/__setjmp14.S b/lib/libc/arch/alpha/gen/__setjmp14.S
deleted file mode 100644
index f9f193421..000000000
--- a/lib/libc/arch/alpha/gen/__setjmp14.S
+++ /dev/null
@@ -1,123 +0,0 @@
-/* $NetBSD: __setjmp14.S,v 1.7 2014/01/23 03:08:50 christos 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>
-#include "assym.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.
- */
-
-	.set	noreorder
-
-LEAF(__setjmp14, 1)
-	LDGP(pv)
-	stq	ra, SC_PC(a0)			/* sc_pc = return address */
-	stq	s0, (SC_REGS+_REG_S0)(a0)	/* saved bits of sc_regs */
-	stq	s1, (SC_REGS+_REG_S1)(a0)
-	stq	s2, (SC_REGS+_REG_S2)(a0)
-	stq	s3, (SC_REGS+_REG_S3)(a0)
-	stq	s4, (SC_REGS+_REG_S4)(a0)
-	stq	s5, (SC_REGS+_REG_S5)(a0)
-	stq	s6, (SC_REGS+_REG_S6)(a0)
-	stq	ra, (SC_REGS+_REG_RA)(a0)
-	stq	sp, (SC_REGS+_REG_SP)(a0)
-	stq	gp, (SC_REGS+_REG_GP)(a0)
-
-	/*
-	 * get signal information
-	 */
-	mov	a0, s0				/* squirrel away ptr to sc */
-
-	/* see what's blocked */
-	mov	zero, a0			/* how (insignificant) */
-	mov	zero, a1			/* set (NULL) */
-	lda	a2, SC_MASK(s0)			/* point to mask in sc */
-	CALL(__sigprocmask14)
-
-	lda	sp, -24(sp)			/* sizeof struct sigaltstack */
-	mov	zero, a0
-	mov	sp, a1
-	CALL(__sigaltstack14)
-	ldl	t0, 16(sp)			/* offset of ss_flags */
-	lda	sp, 24(sp)			/* sizeof struct sigaltstack */
-	ldq	ra, (SC_REGS+_REG_RA)(s0)	/* restore return address */
-	blt	v0, botch			/* check for error */
-	and	t0, 0x1, t0			/* get SA_ONSTACK flag */
-	stq	t0, SC_ONSTACK(s0)		/* and save it in sc_onstack */
-	/*
-	 * Restore old s0 and a0, and continue saving registers
-	 */
-	mov	s0, a0
-	ldq	s0, (SC_REGS+_REG_S0)(a0)
-
-	ldq	t0, magic		 	/* sigcontext magic number */
-	stq	t0, (SC_REGS+_REG_UNIQUE)(a0)	/* magic in sc_regs[31] */
-	/* Too bad we can't check if we actually used FP */
-	ldiq	t0, 1
-	stq	t0, SC_OWNEDFP(a0)		/* say we've used FP.  */
-	stt	fs0, (2*8 + SC_FPREGS)(a0)	/* saved bits of sc_fpregs */
-	stt	fs1, (3*8 + SC_FPREGS)(a0)
-	stt	fs2, (4*8 + SC_FPREGS)(a0)
-	stt	fs3, (5*8 + SC_FPREGS)(a0)
-	stt	fs4, (6*8 + SC_FPREGS)(a0)
-	stt	fs5, (7*8 + SC_FPREGS)(a0)
-	stt	fs6, (8*8 + SC_FPREGS)(a0)
-	stt	fs7, (9*8 + SC_FPREGS)(a0)
-	excb					/* required 4.7.8.1 Alpha ARM */
-	mf_fpcr	ft0				/* get FP control reg */
-	excb					/* required 4.7.8.1 Alpha ARM */
-	stt	ft0, SC_FPCR(a0)		/* and store it in sc_fpcr */
-	stq	zero, SC_FP_CONTROL(a0)		/* FP software control XXX */
-	stq	zero, (SC_RESERVED + 0*8)(a0)	/* sc_reserved[0] */
-	stq	zero, (SC_RESERVED + 1*8)(a0)	/* sc_reserved[1] */
-	stq	zero, (SC_XXX + 0*8)(a0)	/* sc_xxx[0] */
-	stq	zero, (SC_XXX + 1*8)(a0)	/* sc_xxx[1] */
-	stq	zero, (SC_XXX + 2*8)(a0)	/* sc_xxx[2] */
-	stq	zero, (SC_XXX + 3*8)(a0)	/* sc_xxx[3] */
-	stq	zero, (SC_XXX + 4*8)(a0)	/* sc_xxx[4] */
-	stq	zero, (SC_XXX + 5*8)(a0)	/* sc_xxx[5] */
-	stq	zero, (SC_XXX + 6*8)(a0)	/* sc_xxx[6] */
-	stq	zero, (SC_XXX + 7*8)(a0)	/* sc_xxx[7] */
-
-	mov	zero, v0			/* return zero */
-	RET
-botch:
-	CALL(abort)
-	RET					/* "can't" get here... */
-magic:
-	.quad	0xacedbade		 	/* sigcontext magic number */
-END(__setjmp14)
diff --git a/lib/libc/arch/alpha/gen/__sigsetjmp14.S b/lib/libc/arch/alpha/gen/__sigsetjmp14.S
deleted file mode 100644
index 4460f7e99..000000000
--- a/lib/libc/arch/alpha/gen/__sigsetjmp14.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/* $NetBSD: __sigsetjmp14.S,v 1.2 2000/06/14 06:49:01 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>
-
-/*
- * 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.
- */
-
-	.set	noreorder
-
-LEAF(__sigsetjmp14, 2)
-	LDGP(pv)
-	stq	a1, (83 * 8)(a0)		/* save the mask */
-	bne	a1, Lsavesig			/* if !zero, save signals */
-	jmp	zero, _setjmp				/* else don't. */
-Lsavesig:
-	jmp	zero, __setjmp14
-END(__sigsetjmp14)
-
-LEAF(__siglongjmp14, 2)
-	LDGP(pv)
-	ldq	t0, (83 * 8)(a0)		/* get the mask */
-	bne	t0, Lrestoresig			/* if !zero, restore signals */
-	jmp	zero, _longjmp
-Lrestoresig:
-	jmp	zero, __longjmp14
-END(__siglongjmp14)
diff --git a/lib/libc/arch/alpha/gen/_lwp.c b/lib/libc/arch/alpha/gen/_lwp.c
deleted file mode 100644
index c2a7ce412..000000000
--- a/lib/libc/arch/alpha/gen/_lwp.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.7 2012/09/12 14:13:43 manu Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nathan J. Williams.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.7 2012/09/12 14:13:43 manu Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *),
-    void *arg, void *private, caddr_t stack_base, size_t stack_size)
-{
-	__greg_t *gr;
-
-	getcontext(u);
-	gr = u->uc_mcontext.__gregs;
-
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-	gr[_REG_PC] = (unsigned long)start;
-	gr[_REG_T12] = (unsigned long) start;
-	gr[_REG_RA] = (unsigned long) _lwp_exit;
-	gr[_REG_A0] = (unsigned long) arg;
-	gr[_REG_SP] = ((unsigned long) (stack_base + stack_size)) & ~0x7;
-	gr[_REG_S6] = 0;
-	gr[_REG_UNIQUE] = (unsigned long)private;
-
-	u->uc_flags |= _UC_TLSBASE;
-}
diff --git a/lib/libc/arch/alpha/gen/_resumecontext.S b/lib/libc/arch/alpha/gen/_resumecontext.S
deleted file mode 100644
index 8babf1596..000000000
--- a/lib/libc/arch/alpha/gen/_resumecontext.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $NetBSD: _resumecontext.S,v 1.3 2008/04/22 04:47:44 dogcow Exp $ */
-	
-/*
- * Copyright (c) 2004
- *	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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING 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>
-
-LEAF_NOPROFILE(__resumecontext, 0)
-	LDGP(ra)
-	CALL(_resumecontext)
-END(__resumecontext)
-
diff --git a/lib/libc/arch/alpha/gen/divrem.m4 b/lib/libc/arch/alpha/gen/divrem.m4
deleted file mode 100644
index d8a1d2bd0..000000000
--- a/lib/libc/arch/alpha/gen/divrem.m4
+++ /dev/null
@@ -1,197 +0,0 @@
-/* $NetBSD: divrem.m4,v 1.9 2002/01/21 23:40:41 ross 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.
- */
-
-/*
- * Division and remainder.
- *
- * The use of m4 is modeled after the sparc code, but the algorithm is
- * simple binary long division.
- *
- * Note that the loops could probably benefit from unrolling.
- */
-
-/*
- * M4 Parameters
- * NAME		name of function to generate
- * OP		OP=div: t10 / t11 -> t12; OP=rem: t10 % t11 -> t12
- * S		S=true: signed; S=false: unsigned
- * WORDSIZE	total number of bits
- */
-
-define(A, `t10')
-define(B, `t11')
-define(RESULT, `t12')
-
-define(BIT, `t0')
-define(I, `t1')
-define(CC, `t2')
-define(T_0, `t3')
-ifelse(S, `true', `define(NEG, `t4')')
-
-#include <machine/asm.h>
-
-LEAF(NAME, 0)					/* XXX */
-	lda	sp, -64(sp)
-	stq	BIT, 0(sp)
-	stq	I, 8(sp)
-	stq	CC, 16(sp)
-	stq	T_0, 24(sp)
-ifelse(S, `true',
-`	stq	NEG, 32(sp)')
-	stq	A, 40(sp)
-	stq	B, 48(sp)
-	mov	zero, RESULT			/* Initialize result to zero */
-
-ifelse(S, `true',
-`
-	/* Compute sign of result.  If either is negative, this is easy.  */
-	or	A, B, NEG			/* not the sign, but... */
-	srl	NEG, WORDSIZE - 1, NEG		/* rather, or of high bits */
-	blbc	NEG, Ldoit			/* neither negative? do it! */
-
-ifelse(OP, `div',
-`	xor	A, B, NEG			/* THIS is the sign! */
-', `	mov	A, NEG				/* sign follows A. */
-')
-	srl	NEG, WORDSIZE - 1, NEG		/* make negation the low bit. */
-
-	srl	A, WORDSIZE - 1, I		/* is A negative? */
-	blbc	I, LnegB			/* no. */
-	/* A is negative; flip it. */
-ifelse(WORDSIZE, `32', `
-	/* top 32 bits may be random junk */
-	zap	A, 0xf0, A
-')
-	subq	zero, A, A
-	srl	B, WORDSIZE - 1, I		/* is B negative? */
-	blbc	I, Ldoit			/* no. */
-LnegB:
-	/* B is definitely negative, no matter how we got here. */
-ifelse(WORDSIZE, `32', `
-	/* top 32 bits may be random junk */
-	zap	B, 0xf0, B
-')
-	subq	zero, B, B
-Ldoit:
-')
-ifelse(WORDSIZE, `32', `
-	/*
-	 * Clear the top 32 bits of each operand, as they may
-	 * sign extension (if negated above), or random junk.
-	 */
-	zap	A, 0xf0, A
-	zap	B, 0xf0, B
-')
-
-	/* kill the special cases. */
-	beq	B, Ldotrap			/* division by zero! */
-
-	cmpult	A, B, CC			/* A < B? */
-	/* RESULT is already zero, from above.  A is untouched. */
-	bne	CC, Lret_result
-
-	cmpeq	A, B, CC			/* A == B? */
-	cmovne	CC, 1, RESULT
-	cmovne	CC, zero, A
-	bne	CC, Lret_result
-
-	/*
-	 * Find out how many bits of zeros are at the beginning of the divisor.
-	 */
-LBbits:
-	ldiq	T_0, 1				/* I = 0; BIT = 1<<WORDSIZE-1 */
-	mov	zero, I
-	sll	T_0, WORDSIZE-1, BIT
-LBloop:
-	and	B, BIT, CC			/* if bit in B is set, done. */
-	bne	CC, LAbits
-	addq	I, 1, I				/* increment I, shift bit */
-	srl	BIT, 1, BIT
-	cmplt	I, WORDSIZE-1, CC		/* if I leaves one bit, done. */
-	bne	CC, LBloop
-
-LAbits:
-	beq	I, Ldodiv			/* If I = 0, divide now.  */
-	ldiq	T_0, 1				/* BIT = 1<<WORDSIZE-1 */
-	sll	T_0, WORDSIZE-1, BIT
-
-LAloop:
-	and	A, BIT, CC			/* if bit in A is set, done. */
-	bne	CC, Ldodiv
-	subq	I, 1, I				/* decrement I, shift bit */
-	srl     BIT, 1, BIT 
-	bne	I, LAloop			/* If I != 0, loop again */
-
-Ldodiv:
-	sll	B, I, B				/* B <<= i */
-	ldiq	T_0, 1
-	sll	T_0, I, BIT
-
-Ldivloop:
-	cmpult	A, B, CC
-	or	RESULT, BIT, T_0
-	cmoveq	CC, T_0, RESULT
-	subq	A, B, T_0
-	cmoveq	CC, T_0, A
-	srl	BIT, 1, BIT	
-	srl	B, 1, B
-	beq	A, Lret_result
-	bne	BIT, Ldivloop
-
-Lret_result:
-ifelse(OP, `div',
-`', `	mov	A, RESULT
-')
-ifelse(S, `true',
-`
-	/* Check to see if we should negate it. */
-	subq	zero, RESULT, T_0
-	cmovlbs	NEG, T_0, RESULT
-')
-
-	ldq	BIT, 0(sp)
-	ldq	I, 8(sp)
-	ldq	CC, 16(sp)
-	ldq	T_0, 24(sp)
-ifelse(S, `true',
-`	ldq	NEG, 32(sp)')
-	ldq	A, 40(sp)
-	ldq	B, 48(sp)
-	lda	sp, 64(sp)
-	ret	zero, (t9), 1
-
-Ldotrap:
-	ldiq	a0, -2			/* This is the signal to SIGFPE! */
-	call_pal PAL_gentrap
-ifelse(OP, `div',
-`', `	mov	zero, A			/* so that zero will be returned */
-')
-	br	zero, Lret_result
-
-END(NAME)
diff --git a/lib/libc/arch/alpha/gen/fabs.S b/lib/libc/arch/alpha/gen/fabs.S
deleted file mode 100644
index 8ba84badb..000000000
--- a/lib/libc/arch/alpha/gen/fabs.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $NetBSD: fabs.S,v 1.3 2000/06/14 06:49:02 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>
-
-LEAF(fabs, 1)
-	cpys	fzero, fa0, fv0
-	RET
-END(fabs)
diff --git a/lib/libc/arch/alpha/gen/flt_rounds.c b/lib/libc/arch/alpha/gen/flt_rounds.c
deleted file mode 100644
index 84887d11a..000000000
--- a/lib/libc/arch/alpha/gen/flt_rounds.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* $NetBSD: flt_rounds.c,v 1.10 2014/08/03 19:14:24 wiz 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.10 2014/08/03 19:14:24 wiz Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <machine/ieeefp.h>
-#include <machine/float.h>
-
-/*
- * These come from <float.h> definition
- */
-#define	FLT_ROUND_MAP \
-	( (0 << (FP_RZ*2))	/* round to zero */			\
-	| (1 << (FP_RN*2))	/* round to nearest */			\
-	| (3 << (FP_RM*2))	/* round to negative infinity */	\
-	| (2 << (FP_RP*2)))	/* round to positive infinity */
-
-int
-__flt_rounds(void)
-{
-	union {
-		double d;
-		uint64_t u64;
-	} fpcrval;
-	uint64_t old;
-
-	__asm("excb; mf_fpcr %0; excb" : "=f" (fpcrval.d));
-	old = (fpcrval.u64 >> 58) & 3;
-
-	return (FLT_ROUND_MAP >> (old << 1)) & 3;
-}
diff --git a/lib/libc/arch/alpha/gen/fpgetmask.c b/lib/libc/arch/alpha/gen/fpgetmask.c
deleted file mode 100644
index b0fd56bd3..000000000
--- a/lib/libc/arch/alpha/gen/fpgetmask.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: fpgetmask.c,v 1.5 2005/06/12 05:21:25 lukem Exp $	*/
-
-/*
- * Copyright (c) 1999 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Ross Harvey
- *	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 <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetmask.c,v 1.5 2005/06/12 05:21:25 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#include <machine/sysarch.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetmask,_fpgetmask)
-#endif
-
-fp_except
-fpgetmask __P((void))
-{
-	return sysarch(ALPHA_FPGETMASK, 0L);
-}
diff --git a/lib/libc/arch/alpha/gen/fpgetround.c b/lib/libc/arch/alpha/gen/fpgetround.c
deleted file mode 100644
index 263b195f7..000000000
--- a/lib/libc/arch/alpha/gen/fpgetround.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* $NetBSD: fpgetround.c,v 1.11 2012/03/21 20:07:52 he 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.11 2012/03/21 20:07:52 he Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetround,_fpgetround)
-#endif
-
-fp_rnd
-fpgetround(void)
-{
-	union {
-		double d;
-		uint64_t u64;
-	} fpcrval;
-
-	__asm("excb; mf_fpcr %0; excb" : "=f" (fpcrval.d));
-
-	return ((fp_rnd)(fpcrval.u64 >> 58) & 0x3);
-}
diff --git a/lib/libc/arch/alpha/gen/fpgetsticky.c b/lib/libc/arch/alpha/gen/fpgetsticky.c
deleted file mode 100644
index 55d7e660a..000000000
--- a/lib/libc/arch/alpha/gen/fpgetsticky.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $NetBSD: fpgetsticky.c,v 1.9 2008/05/10 15:31:04 martin Exp $ */
-
-/*-
- * Copyright (c) 2001 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetsticky.c,v 1.9 2008/05/10 15:31:04 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#include <machine/sysarch.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-fp_except
-fpgetsticky(void)
-{
-	return sysarch(ALPHA_FPGETSTICKY, 0L);
-}
diff --git a/lib/libc/arch/alpha/gen/fpsetmask.c b/lib/libc/arch/alpha/gen/fpsetmask.c
deleted file mode 100644
index 8ceec5fe4..000000000
--- a/lib/libc/arch/alpha/gen/fpsetmask.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: fpsetmask.c,v 1.5 2013/11/02 23:54:04 christos Exp $	*/
-
-/*
- * Copyright (c) 1995 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Ross Harvey
- *	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 <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetmask.c,v 1.5 2013/11/02 23:54:04 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#include <machine/sysarch.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetmask,_fpsetmask)
-#endif
-
-fp_except
-fpsetmask(fp_except mask)
-{
-	struct alpha_fp_except_args a;
-
-	a.mask = mask;
-	return sysarch(ALPHA_FPSETMASK, &a);
-}
diff --git a/lib/libc/arch/alpha/gen/fpsetround.c b/lib/libc/arch/alpha/gen/fpsetround.c
deleted file mode 100644
index ec9b11e98..000000000
--- a/lib/libc/arch/alpha/gen/fpsetround.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $NetBSD: fpsetround.c,v 1.12 2012/03/21 20:07:52 he 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.12 2012/03/21 20:07:52 he Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetround,_fpsetround)
-#endif
-
-fp_rnd
-fpsetround(fp_rnd rnd_dir)
-{
-	union {
-		double d;
-		uint64_t u64;
-	} fpcrval;
-	fp_rnd old;
-
-	__asm("excb; mf_fpcr %0; excb" : "=f" (fpcrval.d));
-	old = (fp_rnd)(fpcrval.u64 >> 58) & 0x3;
-
-	rnd_dir ^= old;
-
-	fpcrval.u64 ^= (long)rnd_dir << 58;
-
-	__asm("excb; mt_fpcr %0; excb" : : "f" (fpcrval.d));
-
-	return old;
-}
diff --git a/lib/libc/arch/alpha/gen/fpsetsticky.c b/lib/libc/arch/alpha/gen/fpsetsticky.c
deleted file mode 100644
index 8f3b82bdb..000000000
--- a/lib/libc/arch/alpha/gen/fpsetsticky.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: fpsetsticky.c,v 1.5 2013/11/02 23:54:04 christos Exp $	*/
-
-/*
- * Copyright (c) 1999 Ross Harvey
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Ross Harvey
- *	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 <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetsticky.c,v 1.5 2013/11/02 23:54:04 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#include <machine/sysarch.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetsticky,_fpsetsticky)
-#endif
-
-fp_except
-fpsetsticky(fp_except sticky)
-{
-	struct alpha_fp_except_args a;
-
-	a.mask = sticky;
-	return sysarch(ALPHA_FPSETSTICKY, &a);
-}
diff --git a/lib/libc/arch/alpha/gen/makecontext.c b/lib/libc/arch/alpha/gen/makecontext.c
deleted file mode 100644
index aeabddf26..000000000
--- a/lib/libc/arch/alpha/gen/makecontext.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.6 2011/09/20 08:42:29 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.6 2011/09/20 08:42:29 joerg Exp $");
-#endif
-
-#include <stddef.h>
-#include <inttypes.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#include <stdarg.h>
-
-void __resumecontext(void) __dead;
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	int i;
-	unsigned long *sp;
-	va_list ap;
-
-	/* Compute and align stack pointer. */
-	sp = (unsigned long *)
-	    (((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size) & ~0x7);
-	/* Allocate necessary stack space for arguments exceeding a0-5. */
-	if (argc > 6)
-		sp -= (argc - 6);
-	gr[_REG_SP] = (__greg_t)sp;
-	/* Arrange for return via the trampoline code. */
-	gr[_REG_RA] = (__greg_t)__resumecontext;
-	gr[_REG_PC] = (__greg_t)func;
-	gr[_REG_PV] = (__greg_t)func;
-
-	va_start(ap, argc);
-	/* Pass up to six arguments in a0-5. */
-	for (i = 0; i < argc && i < 6; i++)
-		gr[_REG_A0 + i] = va_arg(ap, unsigned long);
-	/* Pass any additional arguments on the stack. */
-	for (argc -= i; argc > 0; argc--)
-		*sp++ = va_arg(ap, unsigned long);
-	va_end(ap);
-}
diff --git a/lib/libc/arch/alpha/gen/nanf.c b/lib/libc/arch/alpha/gen/nanf.c
deleted file mode 100644
index 7a5b3a2f0..000000000
--- a/lib/libc/arch/alpha/gen/nanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: nanf.c,v 1.5 2009/02/22 01:34:01 martin Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.5 2009/02/22 01:34:01 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-		{ {    0,    0, 0xc0, 0x7f } };
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/alpha/gen/resumecontext.c b/lib/libc/arch/alpha/gen/resumecontext.c
deleted file mode 100644
index d5b745c99..000000000
--- a/lib/libc/arch/alpha/gen/resumecontext.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:57 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:57 joerg Exp $");
-#endif
-
-#include "namespace.h"
-#include <ucontext.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include "extern.h"
-
-void
-_resumecontext(void)
-{
-	ucontext_t uct;
-
-	(void)getcontext(&uct);
-	if (!uct.uc_link) {
-		exit(0);
-		/* NOTREACHED */
-	}
-
-	(void)setcontext(uct.uc_link);
-	/* NOTREACHED */
-
-	/* something is wrong, pull the brake */
-	_exit(-1);
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/alpha/gen/swapcontext.S b/lib/libc/arch/alpha/gen/swapcontext.S
deleted file mode 100644
index 2a91164c1..000000000
--- a/lib/libc/arch/alpha/gen/swapcontext.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.3 2008/04/28 20:22:55 martin Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-
-NESTED(swapcontext, 2, 24, ra, IM_RA|IM_A0|IM_A1, 0)
-	LDGP(pv)
-	lda	sp, -24(sp)
-	stq	ra, (24- 8)(sp)		/* must save ra, oucp, ucp */
-	stq	a0, (24-16)(sp)
-	stq	a1, (24-24)(sp)
-	CALL(_getcontext)		/* getcontext(oucp) */
-	ldq	t0, (24-16)(sp)
-	bne	v0, Lerr
-	ldq	t1, (24- 8)(sp)
-	stq	t1, (56 + 26 * 8)(t0)	/* Adjust saved RA */
-	stq	t1, (56 + 32 * 8)(t0)	/* Adjust saved PC */
-	lda	t1, 24(sp)
-	stq	t1, (56 + 30 * 8)(t0)	/* Adjust saved SP */
-
-	ldq	a0, (24-24)(sp)
-	CALL(setcontext)		/* setcontext(ucp) */
-Lerr:
-	ldq	ra, (24- 8)(sp)
-	lda	sp, 24(sp)
-	RET
-END(swapcontext)
diff --git a/lib/libc/arch/alpha/genassym.cf b/lib/libc/arch/alpha/genassym.cf
deleted file mode 100644
index 64d4ed09a..000000000
--- a/lib/libc/arch/alpha/genassym.cf
+++ /dev/null
@@ -1,84 +0,0 @@
-#	$NetBSD: genassym.cf,v 1.2 2008/04/28 20:22:55 martin Exp $
-
-#
-# Copyright (c) 2001 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Matt Thomas <matt@3am-sfotware.com>.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-include <sys/types.h>
-include <machine/reg.h>
-include <ucontext.h>
-include <signal.h>
-
-define _REG_V0		8*_REG_V0	/* 0 */
-define _REG_T0		8*_REG_T0	/* 1 */
-define _REG_T1		8*_REG_T1	/* 2 */
-define _REG_T2		8*_REG_T2	/* 3 */
-define _REG_T3		8*_REG_T3	/* 4 */
-define _REG_T4		8*_REG_T4	/* 5 */
-define _REG_T5		8*_REG_T5	/* 6 */
-define _REG_T6		8*_REG_T6	/* 7 */
-define _REG_T7		8*_REG_T7	/* 8 */
-define _REG_S0		8*_REG_S0	/* 9 */
-define _REG_S1		8*_REG_S1	/* 10 */
-define _REG_S2		8*_REG_S2	/* 11 */
-define _REG_S3		8*_REG_S3	/* 12 */
-define _REG_S4		8*_REG_S4	/* 13 */
-define _REG_S5		8*_REG_S5	/* 14 */
-define _REG_S6		8*_REG_S6	/* 15 */
-define _REG_A0		8*_REG_A0	/* 16 */
-define _REG_A1		8*_REG_A1	/* 17 */
-define _REG_A2		8*_REG_A2	/* 18 */
-define _REG_A3		8*_REG_A3	/* 19 */
-define _REG_A4		8*_REG_A4	/* 20 */
-define _REG_A5		8*_REG_A5	/* 21 */
-define _REG_T8		8*_REG_T8	/* 22 */
-define _REG_T9		8*_REG_T9	/* 23 */
-define _REG_T10		8*_REG_T10	/* 24 */
-define _REG_T11		8*_REG_T11	/* 25 */
-define _REG_RA		8*_REG_RA	/* 26 */
-define _REG_T12		8*_REG_T12	/* 27 */
-define _REG_PV		8*_REG_PV	/* 27 */
-define _REG_AT		8*_REG_AT	/* 28 */
-define _REG_GP		8*_REG_GP	/* 29 */
-define _REG_SP		8*_REG_SP	/* 30 */
-define _REG_UNIQUE	8*_REG_UNIQUE	/* 31 */
-define _REG_PC		8*_REG_PC	/* 32 */
-define _REG_PS		8*_REG_PS	/* 33 */
-
-define	SC_ONSTACK	offsetof(struct sigcontext, sc_onstack)
-define	SC_SP		offsetof(struct sigcontext, sc_sp)
-define	SC_PC		offsetof(struct sigcontext, sc_pc)
-define	SC_PS		offsetof(struct sigcontext, sc_ps)
-define	SC_REGS		offsetof(struct sigcontext, sc_regs)
-define	SC_OWNEDFP	offsetof(struct sigcontext, sc_regs)
-define	SC_FPREGS	offsetof(struct sigcontext, sc_fpregs)
-define	SC_FPCR		offsetof(struct sigcontext, sc_fpcr)
-define	SC_FP_CONTROL	offsetof(struct sigcontext, sc_fp_control)
-define	SC_MASK		offsetof(struct sigcontext, sc_mask)
-define	SC_RESERVED	offsetof(struct sigcontext, sc_reserved)
-define	SC_XXX		offsetof(struct sigcontext, sc_xxx)
diff --git a/lib/libc/arch/alpha/gmon/Makefile.inc b/lib/libc/arch/alpha/gmon/Makefile.inc
deleted file mode 100644
index 35d0bfd2a..000000000
--- a/lib/libc/arch/alpha/gmon/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2000/09/05 16:28:31 thorpej Exp $
-
-SRCS+=	_mcount.S
diff --git a/lib/libc/arch/alpha/net/Makefile.inc b/lib/libc/arch/alpha/net/Makefile.inc
deleted file mode 100644
index 9f1a4381e..000000000
--- a/lib/libc/arch/alpha/net/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2009/12/06 07:12:17 uebayasi Exp $
-
-# objects built from assembler sources (need lint stubs)
-# hton* and nto* functions provided by ../gen/byte_swap_*.S
-SRCS+=  
-
-LSRCS.alpha.net=	Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c
-LSRCS+=		${LSRCS.alpha.net}
-DPSRCS+=	${LSRCS.alpha.net}
-CLEANFILES+=	${LSRCS.alpha.net}
diff --git a/lib/libc/arch/alpha/stdlib/Makefile.inc b/lib/libc/arch/alpha/stdlib/Makefile.inc
deleted file mode 100644
index 0dbbca485..000000000
--- a/lib/libc/arch/alpha/stdlib/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2009/07/31 20:39:59 dsl Exp $
diff --git a/lib/libc/arch/alpha/string/Makefile.inc b/lib/libc/arch/alpha/string/Makefile.inc
deleted file mode 100644
index d7c479478..000000000
--- a/lib/libc/arch/alpha/string/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.6 2009/07/30 20:57:15 dsl Exp $
-
-SRCS+=	bcopy.S bzero.S ffs.S 
-
-SRCS+=	memcpy.S memmove.S
diff --git a/lib/libc/arch/alpha/sys/__clone.S b/lib/libc/arch/alpha/sys/__clone.S
deleted file mode 100644
index 824d1c967..000000000
--- a/lib/libc/arch/alpha/sys/__clone.S
+++ /dev/null
@@ -1,91 +0,0 @@
-/*	$NetBSD: __clone.S,v 1.3 2008/04/28 20:22:55 martin Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(clone, __clone)
-#endif
-
-/*
- * int __clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-LEAF(__clone, 4)
-	br	pv, 1f
-1:	LDGP(pv)
-	
-	/*
-	 * Sanity checks: func and stack may not be NULL.
-	 */
-	beq	a0, 9f
-	beq	a1, 9f
-
-	/*
-	 * We need to be able to get at the func and arg arguments
-	 * in the child.  Luckily, we have a convenient place to
-	 * do this; the child's stack.
-	 */
-	subq	a1, 16, a1
-	stq	a0, 0(a1)
-	stq	a3, 8(a1)
-
-	/*
-	 * The system call expects (flags, stack).
-	 */
-	mov	a2, a0
-	CALLSYS_ERROR(__clone)
-
-	beq	a4, 8f		/* a4 (rv[1]) == 0, parent, child pid in v0 */
-
-	/*
-	 * Fetch the function and argument from the new stack, and
-	 * pop it back.
-	 */
-	ldq	pv, 0(sp)
-	ldq	a0, 8(sp)
-	addq	sp, 16, sp
-
-	/* Call the clone's entry point. */
-	CALL((pv))
-
-	/* Pass return value to _exit(). */
-	mov	v0, a0
-	CALL(_exit)
-
-	/* NOTREACHED */
-
-8:	RET
-
-9:	ldiq	v0, EINVAL
-	jmp	zero, __cerror
-	END(__clone)
diff --git a/lib/libc/arch/alpha/sys/__sigaction14_sigtramp.c b/lib/libc/arch/alpha/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index 77d089609..000000000
--- a/lib/libc/arch/alpha/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.7 2008/04/28 20:22:55 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern const int __sigtramp_siginfo_2[];
-
-	/*
-	 * If no sigaction, use the "default" trampoline since it won't
-	 * be used.
-	 */
-	if (act == NULL)
-		return  __sigaction_sigtramp(sig, act, oact, NULL, 0);
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the non-SA_SIGINFO trampoline if SA_SIGINFO is not
-	 * set in the sigaction.
-	 */
-	if ((act->sa_flags & SA_SIGINFO) == 0) {
-		extern const int __sigtramp_sigcontext_1[];
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-		    __sigtramp_sigcontext_1, 1);
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	/*
-	 * If SA_SIGINFO was specified or the compatibility trampolines
-	 * can't be used, use the siginfo trampoline.
-	 */
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/alpha/sys/__sigtramp2.S b/lib/libc/arch/alpha/sys/__sigtramp2.S
deleted file mode 100644
index 4c94fb2fd..000000000
--- a/lib/libc/arch/alpha/sys/__sigtramp2.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.2 2006/11/08 21:16:40 drochner Exp $	*/
-
-/*
- * 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.h"
-
-/*
- * The Alpha signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, the stack looks like:
- *
- *		ucontext structure	[128] == sp + sizeof(siginfo_t)]
- *	sp->	siginfo structure	[0]
- */
-NESTED_NOPROFILE(__sigtramp_siginfo_2,0,0,ra,0,0)
-	ldgp	gp,0(ra)
-	lda	a0,(128)(sp)		/* get pointer to ucontext */
-	CALLSYS_NOERROR(setcontext)	/* and call setcontext() with it */
-	ldiq	a0,-1			/* if that failed, set an exit code */
-	CALLSYS_NOERROR(exit)		/* and call exit() */
-END(__sigtramp_siginfo_2)
diff --git a/lib/libc/arch/alpha/sys/__syscall.S b/lib/libc/arch/alpha/sys/__syscall.S
deleted file mode 100644
index ca2b60017..000000000
--- a/lib/libc/arch/alpha/sys/__syscall.S
+++ /dev/null
@@ -1,32 +0,0 @@
-/* $NetBSD: __syscall.S,v 1.1 2000/12/13 07:49:17 mycroft 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.h"
-
-RSYSCALL(__syscall)
diff --git a/lib/libc/arch/alpha/sys/__vfork14.S b/lib/libc/arch/alpha/sys/__vfork14.S
deleted file mode 100644
index 2b4022c3c..000000000
--- a/lib/libc/arch/alpha/sys/__vfork14.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $NetBSD: __vfork14.S,v 1.2 2000/06/14 06:49:03 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.h"
-
-SYSCALL(__vfork14)
-	cmovne	a4, zero, v0		/* a4 (rv[1]) != 0, child */
-	RET
-END(__vfork14)
diff --git a/lib/libc/arch/alpha/sys/brk.S b/lib/libc/arch/alpha/sys/brk.S
deleted file mode 100644
index 032640f65..000000000
--- a/lib/libc/arch/alpha/sys/brk.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $NetBSD: brk.S,v 1.9 2001/05/07 17:19:17 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.
- */
-
-#include "SYS.h"
-
-	.globl	_end
-IMPORT(__curbrk, 8)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
-#endif
-
-	.data
-EXPORT(__minbrk)
-	.quad	_end
-
-	.text
-LEAF(_brk, 1)
-	br	pv, L1				/* XXX profiling */
-L1:	LDGP(pv)
-	ldq	v0, __minbrk
-	cmpult  a0, v0, t0
-	cmovne  t0, v0, a0
-	CALLSYS_ERROR(break)
-	stq	a0, __curbrk
-	mov	zero, v0
-	RET
-END(_brk)
diff --git a/lib/libc/arch/alpha/sys/cerror.S b/lib/libc/arch/alpha/sys/cerror.S
deleted file mode 100644
index 18788635b..000000000
--- a/lib/libc/arch/alpha/sys/cerror.S
+++ /dev/null
@@ -1,65 +0,0 @@
-/* $NetBSD: cerror.S,v 1.6 2000/06/14 06:49:03 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.h"
-
-#ifdef _REENTRANT
-#define	FRAME_SIZE		16
-#define	FRAME_RA_OFFSET		0
-#define	FRAME_V0_OFFSET		8
-#endif
-
-#ifdef _REENTRANT
-NESTED(__cerror, 0, FRAME_SIZE, ra, IM_RA|IM_V0, 0)
-#else
-LEAF(__cerror, 0)
-#endif
-	br	t0, L1
-L1:	LDGP(t0)
-
-#ifdef _REENTRANT
-	lda	sp, -FRAME_SIZE(sp)
-	stq	ra, FRAME_RA_OFFSET(sp)
-	stq	v0, FRAME_V0_OFFSET(sp)
-
-	CALL(__errno)
-
-	ldq	t0, FRAME_V0_OFFSET(sp)
-	stl	t0, 0(v0)
-#else
-	stl	v0, errno
-#endif
-
-	ldiq	v0, -1
-#ifdef _REENTRANT
-	ldq	ra, FRAME_RA_OFFSET(sp)
-	lda	sp, FRAME_SIZE(sp)
-#endif
-	RET
-END(__cerror)
diff --git a/lib/libc/arch/alpha/sys/exect.S b/lib/libc/arch/alpha/sys/exect.S
deleted file mode 100644
index 57db0fa0f..000000000
--- a/lib/libc/arch/alpha/sys/exect.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $NetBSD: exect.S,v 1.3 2000/06/14 06:49:03 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.h"
-
-LEAF(exect, 3)
-	CALLSYS_ERROR(execve)
-	RET
-END(exect)
diff --git a/lib/libc/arch/alpha/sys/fork.S b/lib/libc/arch/alpha/sys/fork.S
deleted file mode 100644
index 2b93d7bea..000000000
--- a/lib/libc/arch/alpha/sys/fork.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $NetBSD: fork.S,v 1.5 2003/02/13 02:50:48 nathanw 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.h"
-
-LEAF(__fork, 0)
-	CALLSYS_ERROR(fork)
-	cmovne	a4, zero, v0		/* a4 (rv[1]) != 0, child */
-	RET
-END(__fork)
diff --git a/lib/libc/arch/alpha/sys/getcontext.S b/lib/libc/arch/alpha/sys/getcontext.S
deleted file mode 100644
index b97395745..000000000
--- a/lib/libc/arch/alpha/sys/getcontext.S
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.3 2008/04/28 20:22:55 martin Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext, _getcontext)
-#endif
-
-LEAF(_getcontext, 1)
-	CALLSYS_ERROR(getcontext)
-	stq	ra, (56 + 32 * 8)(a0)	/* Adjust saved PC */
-	stq	zero, (56 + 0 * 8)(a0)	/* Arrange for a return value of 0 */
-	RET
-END(_getcontext)
diff --git a/lib/libc/arch/alpha/sys/pipe.S b/lib/libc/arch/alpha/sys/pipe.S
deleted file mode 100644
index cddc812c5..000000000
--- a/lib/libc/arch/alpha/sys/pipe.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $NetBSD: pipe.S,v 1.4 2001/05/07 17:19:18 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.
- */
-
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-#endif
-
-LEAF(_pipe, 0)
-	CALLSYS_ERROR(pipe)
-	stl	v0, 0(a0)
-	stl	a4, 4(a0)
-	mov	zero, v0
-	RET
-END(_pipe)
diff --git a/lib/libc/arch/alpha/sys/ptrace.S b/lib/libc/arch/alpha/sys/ptrace.S
deleted file mode 100644
index 46eff5b7f..000000000
--- a/lib/libc/arch/alpha/sys/ptrace.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $NetBSD: ptrace.S,v 1.5 2000/06/14 06:49:03 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.h"
-
-LEAF(ptrace, 4)
-	LDGP(pv)
-	stl	zero, errno
-	CALLSYS_ERROR(ptrace)
-	RET
-END(ptrace)
diff --git a/lib/libc/arch/alpha/sys/sbrk.S b/lib/libc/arch/alpha/sys/sbrk.S
deleted file mode 100644
index afd80c4a2..000000000
--- a/lib/libc/arch/alpha/sys/sbrk.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $NetBSD: sbrk.S,v 1.9 2001/05/07 17:19:18 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.
- */
-
-#include "SYS.h"
-
-	.globl	_end
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-	.data
-EXPORT(__curbrk)
-	.quad	_end
-
-	.text
-LEAF(_sbrk, 1)
-	br	pv, L1				/* XXX profiling */
-L1:	LDGP(pv)
-	ldq	a1, __curbrk
-	addq	a0, a1, a0
-	CALLSYS_ERROR(break)
-	stq	a0, __curbrk
-	mov	a1, v0
-	RET
-END(_sbrk)
diff --git a/lib/libc/arch/alpha/sys/shmat.S b/lib/libc/arch/alpha/sys/shmat.S
deleted file mode 100644
index 90e318516..000000000
--- a/lib/libc/arch/alpha/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2000/07/07 08:20:51 itohy Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/alpha/sys/syscall.S b/lib/libc/arch/alpha/sys/syscall.S
deleted file mode 100644
index b97ef3fbf..000000000
--- a/lib/libc/arch/alpha/sys/syscall.S
+++ /dev/null
@@ -1,32 +0,0 @@
-/* $NetBSD: syscall.S,v 1.2 2000/06/14 06:49:03 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.h"
-
-RSYSCALL(syscall)
diff --git a/lib/libc/arch/arm/Makefile.inc b/lib/libc/arch/arm/Makefile.inc
deleted file mode 100644
index b5ac83156..000000000
--- a/lib/libc/arch/arm/Makefile.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.28 2015/08/20 16:13:40 pooka Exp $
-
-.include <bsd.own.mk>
-
-.if ${RUMPRUN} != "yes" && !defined(__MINIX)
-SRCS+=	__aeabi_read_tp.S __sigaction14_sigtramp.c __sigtramp2.S
-.endif
-
-.if empty(LIBC_MACHINE_ARCH:Mearmv7*)
-AFLAGS+= -marm
-.endif
-
-CPPFLAGS += -I.
-
-.if !empty(LIBC_MACHINE_ARCH:Mearm*)
-SRCS+=	arm_initfini.c
-.endif
-
-.if ${MKSOFTFLOAT} != "no"
-CPPFLAGS += -DSOFTFLOAT
-
-# for earm, use the 64-bit softfloat
-.if ${LIBC_MACHINE_ARCH} == "arm" || ${LIBC_MACHINE_ARCH} == "armeb"
-SOFTFLOAT_BITS=32
-SRCS+=	floatunsidf_ieee754.c floatunsisf_ieee754.c
-.endif
-
-.include <softfloat/Makefile.inc>
-.else
-.PATH : ${ARCHDIR}/hardfloat
-SRCS.hardfloat+=	fpgetround.c fpgetsticky.S fpgetmask.S fabs_ieee754.S
-SRCS.hardfloat+=	fpsetround.c fpsetmask.S fpsetsticky.S
-.for f in ${SRCS.hardfloat}
-CPPFLAGS.${f} += -mfpu=vfp
-.endfor
-SRCS+=	${SRCS.hardfloat}
-.endif
diff --git a/lib/libc/arch/arm/SYS.h b/lib/libc/arch/arm/SYS.h
deleted file mode 100644
index 528988ba8..000000000
--- a/lib/libc/arch/arm/SYS.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.15 2013/08/19 22:13:34 matt Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)SYS.h	5.5 (Berkeley) 5/7/91
- */
-
-#define _TEXT_SECTION	.section .text.hot, "ax"
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-#include <arm/swi.h>
-
-#ifndef __STDC__
-#error __STDC__ not defined
-#endif
-
-#if !defined(__thumb__)
-#define SYSTRAP(x)	svc #SWI_OS_NETBSD | SYS_ ## x
-#else
-.macro	emitsvc	x
-	mov	ip, r0
-.ifeq	\x / 256
-	movs	r0, #\x
-.else
-#if defined(_ARM_ARCH_7)
-	movw	r0, #\x
-#else
-.ifeq (\x & 3)
-	movs	r0, #(\x / 4)
-	lsls	r0, r0, #3
-.else
-.ifeq (\x & 1)
-	movs	r0, #(\x / 2)
-	lsls	r0, r0, #1
-.else
-	movs	r0, #(\x / 256)
-	lsls	r0, r0, #8
-	adds	r0, r0, #(\x & 255)
-.endif
-.endif
-#endif /* !_ARM_ARCH_7 */
-.endif
-	svc	#255
-.endm
-#define SYSTRAP(x)	emitsvc SYS_ ## x
-#endif /* __thumb__ */
-
-#define	CERROR		_C_LABEL(__cerror)
-#define	CURBRK		_C_LABEL(__curbrk)
-
-#define _SYSCALL_NOERROR(x,y)						\
-	ENTRY(x);							\
-	SYSTRAP(y)
-
-#if  !defined(__thumb__) || defined(_ARM_ARCH_T2)
-#define	_INVOKE_CERROR()	bcs CERROR
-#else
-#define	_INVOKE_CERROR()	\
-	bcc 86f; push {r3,lr}; bl CERROR; pop {r3,pc}; 86:
-#endif
-#define _SYSCALL(x, y)							\
-	_SYSCALL_NOERROR(x,y);						\
-	_INVOKE_CERROR()
-
-#define SYSCALL_NOERROR(x)						\
-	_SYSCALL_NOERROR(x,x)
-
-#define SYSCALL(x)							\
-	_SYSCALL(x,x)
-
-
-#define PSEUDO_NOERROR(x,y)						\
-	_SYSCALL_NOERROR(x,y);						\
-	RET;								\
-	END(x)
-
-#define PSEUDO(x,y)							\
-	_SYSCALL(x,y);							\
-	RET;								\
-	END(x)
-
-
-#define RSYSCALL_NOERROR(x)						\
-	PSEUDO_NOERROR(x,x)
-
-#define RSYSCALL(x)							\
-	PSEUDO(x,x)
-
-#ifdef WEAK_ALIAS
-#define	WSYSCALL(weak,strong)						\
-	WEAK_ALIAS(weak,strong);					\
-	PSEUDO(strong,weak)
-#else
-#define	WSYSCALL(weak,strong)						\
-	PSEUDO(weak,weak)
-#endif
-
-	.hidden	CERROR
-	.globl	CERROR
diff --git a/lib/libc/arch/arm/gdtoa/Makefile.inc b/lib/libc/arch/arm/gdtoa/Makefile.inc
deleted file mode 100644
index 1d786e010..000000000
--- a/lib/libc/arch/arm/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/03/15 17:35:18 kleink Exp $
-
-SRCS+=	strtof.c
diff --git a/lib/libc/arch/arm/gdtoa/arith.h b/lib/libc/arch/arm/gdtoa/arith.h
deleted file mode 100644
index 40d3ed1fa..000000000
--- a/lib/libc/arch/arm/gdtoa/arith.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#include <machine/endian.h>
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define IEEE_BIG_ENDIAN
-#else
-#define IEEE_LITTLE_ENDIAN
-#endif
diff --git a/lib/libc/arch/arm/gdtoa/gd_qnan.h b/lib/libc/arch/arm/gdtoa/gd_qnan.h
deleted file mode 100644
index 9554f4991..000000000
--- a/lib/libc/arch/arm/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#include <machine/endian.h>
-
-#define f_QNAN 0x7fc00000
-#if BYTE_ORDER == BIG_ENDIAN
-#define d_QNAN0 0x7ff80000
-#define d_QNAN1 0x0
-#else
-#define d_QNAN0 0x0
-#define d_QNAN1 0x7ff80000
-#endif
diff --git a/lib/libc/arch/arm/gen/Makefile.inc b/lib/libc/arch/arm/gen/Makefile.inc
deleted file mode 100644
index 0eb81bf43..000000000
--- a/lib/libc/arch/arm/gen/Makefile.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.28 2014/01/29 23:37:18 joerg Exp $
-
-SRCS+=	alloca.S byte_swap_2.S byte_swap_4.S bswap64.c \
-	fabs_ieee754.c flt_rounds.c
-
-CPUFLAGS.divide.S+=		-marm
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c infinityl_dbl_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
-
-.if !empty(LIBC_MACHINE_ARCH:Mearm*)
-SRCS+=	__aeabi_fcmpun.c __aeabi_dcmpun.c
-SRCS+=	__aeabi_idiv0.c __aeabi_ldiv0.c
-.endif
-
-AFLAGS._setjmp.S=	-mfpu=vfp
-AFLAGS.setjmp.S=	-mfpu=vfp
-
-SRCS+=	nanf.c
-
-SRCS+=	setjmp.S
-SRCS+=	_setjmp.S
-SRCS+=	sigsetjmp.S
-
-.if defined(__MINIX)
-# Already defined in minix/lib/libc/arch/arm/sys
-.else
-SRCS+=	makecontext.c resumecontext.c swapcontext.S
-
-SRCS+=	_lwp.c
-.endif
-
-LSRCS.arm.gen=	Lint_bswap16.c Lint_bswap32.c Lint_swapcontext.c
-LSRCS+=		${LSRCS.arm.gen}
-DPSRCS+=	${LSRCS.arm.gen}
-CLEANFILES+=	${LSRCS.arm.gen}
diff --git a/lib/libc/arch/arm/gen/__aeabi_dcmpun.c b/lib/libc/arch/arm/gen/__aeabi_dcmpun.c
deleted file mode 100644
index 43354be19..000000000
--- a/lib/libc/arch/arm/gen/__aeabi_dcmpun.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __aeabi_dcmpun.c,v 1.1 2013/01/26 07:04:22 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <arm/aeabi.h>
-#include <arm/ieee.h>
-
-#include <math.h>
-
-/*
- * result (1, 0) denotes (?, <=>) [2], use for C99 isunordered()
- */
-
-int
-__aeabi_dcmpun(double x, double y)
-{
-	const union ieee_double_u ux = { .dblu_d = x };
-	const union ieee_double_u uy = { .dblu_d = y };
-
-	return (ux.dblu_dbl.dbl_exp == DBL_EXP_INFNAN
-		&& (ux.dblu_dbl.dbl_frach|ux.dblu_dbl.dbl_fracl) != 0)
-	    || (uy.dblu_dbl.dbl_exp == DBL_EXP_INFNAN
-		&& (uy.dblu_dbl.dbl_frach|uy.dblu_dbl.dbl_fracl) != 0);
-}
diff --git a/lib/libc/arch/arm/gen/__aeabi_fcmpun.c b/lib/libc/arch/arm/gen/__aeabi_fcmpun.c
deleted file mode 100644
index 771bb4871..000000000
--- a/lib/libc/arch/arm/gen/__aeabi_fcmpun.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __aeabi_fcmpun.c,v 1.1 2013/01/26 07:04:22 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <arm/aeabi.h>
-#include <arm/ieee.h>
-
-#include <math.h>
-
-/*
- * result (1, 0) denotes (?, <=>) [2], use for C99 isunordered()
- */
-
-int
-__aeabi_fcmpun(float x, float y)
-{
-	const union ieee_single_u ux = { .sngu_f = x };
-	const union ieee_single_u uy = { .sngu_f = y };
-
-	return (ux.sngu_sng.sng_exp == SNG_EXP_INFNAN
-		&& ux.sngu_sng.sng_frac != 0)
-	    || (uy.sngu_sng.sng_exp == SNG_EXP_INFNAN
-		&& uy.sngu_sng.sng_frac != 0);
-}
diff --git a/lib/libc/arch/arm/gen/_lwp.c b/lib/libc/arch/arm/gen/_lwp.c
deleted file mode 100644
index 8ff945c59..000000000
--- a/lib/libc/arch/arm/gen/_lwp.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.8 2012/03/22 09:32:04 he Exp $	*/
-
-/*
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project by
- *	Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.8 2012/03/22 09:32:04 he Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *),
-    void *arg, void *private, caddr_t stack_base, size_t stack_size)
-{
-	uintptr_t sp;
-
-	getcontext(u);
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-	sp = (uintptr_t)stack_base + stack_size;
-	/*
-	 * Note: We make sure the stack is 8-byte aligned, here.
-	 */
-
-	u->uc_mcontext.__gregs[_REG_R0] = (__greg_t)(uintptr_t)arg;
-	u->uc_mcontext.__gregs[_REG_SP] = ((__greg_t)sp) & ~7;
-	u->uc_mcontext.__gregs[_REG_LR] = (__greg_t)(uintptr_t)_lwp_exit;
-	u->uc_mcontext.__gregs[_REG_PC] = (__greg_t)(uintptr_t)start;
-	u->uc_mcontext._mc_tlsbase = (__greg_t)(uintptr_t)private;
-	u->uc_flags |= _UC_TLSBASE;
-}
diff --git a/lib/libc/arch/arm/gen/_setjmp.S b/lib/libc/arch/arm/gen/_setjmp.S
deleted file mode 100644
index 37a968375..000000000
--- a/lib/libc/arch/arm/gen/_setjmp.S
+++ /dev/null
@@ -1,194 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.16 2013/11/30 20:20:42 joerg Exp $	*/
-
-/*
- * Copyright (c) 1997 Mark Brinicombe
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Mark Brinicombe
- * 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 AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (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(__SOFTFP__) && !defined(__VFP_FP__) && !defined(__ARM_PCS)
-#error FPA is not supported anymore
-#endif
-
-#if defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)
-	.fpu	vfp
-#endif
-
-#include <machine/asm.h>
-#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.
- * The previous signal state is NOT restored.
- *
- * Note: r0 is the return value
- *       r1-r3,ip are scratch registers in functions
- */
-
-ENTRY(_setjmp)
-	ldr	r1, .L_setjmp_magic
-
-#if defined(__ARM_EABI__) && (!defined(__thumb__) || defined(_ARM_ARCH_T2))
-	ldr	r2, .Lfpu_present
-#ifdef __PIC__
-	add	r2, r2, pc	/* pc = &.LPIC0 */
-#endif
-	ldr	r2, [r2]
-.LPIC0:
-#if defined(__thumb__) && defined(_ARM_ARCH_T2)
-	cbz	r2, 1f
-#else
-	cmp	r2, #0		/* do we have a FPU? */
-	beq	1f		/*   no, don't save VFP registers */
-#endif
-
-	orrs	r1, r1, #(_JB_MAGIC__SETJMP ^ _JB_MAGIC__SETJMP_VFP)
-				/* change magic to VFP magic */
-	adds	r2, r0, #(_JB_REG_D8 * 4)
-	vstmia	r2, {d8-d15}
-	vmrs	r2, fpscr
-	str	r2, [r0, #(_JB_REG_FPSCR * 4)]
-1:
-#endif /* __ARM_EABI__ && (_ARM_ARCH_T2 || !__thumb__) */
-
-	str	r1, [r0]
-
-	adds	r0, r0, #(_JB_REG_R4 * 4)
-	/* Store integer registers */
-#if !defined(__thumb__) || defined(_ARCH_ARCH_T2)
-        stmia	r0, {r4-r14}
-#else
-        stmia	r0!, {r4-r7}
-	mov	r1, r8
-	mov	r2, r9
-	mov	r3, r10
-	stmia	r0!, {r1-r3}
-	mov	r2, r11
-	mov	r3, r12
-	stmia	r0!, {r2-r3}
-	mov	r2, sp
-	mov	r3, lr
-	stmia	r0!, {r2-r3}
-#endif
-
-        movs	r0, #0
-        RET
-
-#if defined(__ARM_EABI__) && (!defined(__thumb__) || defined(_ARM_ARCH_T2))
-	.align	0
-.Lfpu_present:
-	.word	REL_SYM(_libc_arm_fpu_present, .LPIC0)
-#endif /* __ARM_EABI__ && (_ARM_ARCH_T2 || !__thumb__) */
-END(_setjmp)
-
-ENTRY(_longjmp)
-	ldr	r2, [r0]			/* get magic from jmp_buf */
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-	bics	r3, r2, #(_JB_MAGIC__SETJMP ^ _JB_MAGIC__SETJMP_VFP)
-						/* ignore VFP-ness of magic */
-	ldr	ip, .L_setjmp_magic		/* load magic */
-#else
-	ldr	r3, .L_setjmp_magic		/* load magic */
-	mov	ip, r3
-	movs	r3, #(_JB_MAGIC__SETJMP ^ _JB_MAGIC__SETJMP_VFP)
-	ands	r3, r3, r2
-	eors	r3, r3, r2			/* ignore VFP-ness of magic */
-#endif
-	cmp	ip, r3				/* magic correct? */
-	bne	botch				/*   no, botch */
-
-#if defined(__ARM_EABI__) && (!defined(__thumb__) || defined(_ARM_ARCH_T2))
-	cmp	r3, r2				/* did magic change? */
-	beq	1f				/*   no, don't restore VFP */
-	adds	r3, r0, #(_JB_REG_D8 * 4)
-	vldmia	r3, {d8-d15}
-	ldr	r3, [r0, #(_JB_REG_FPSCR * 4)]
-	vmsr	fpscr, r3
-1:
-#endif /* __ARM_EABI__ && (_ARM_ARCH_T2 || !__thumb__) */
-
-	adds	r0, r0, #(_JB_REG_R4 * 4)
-       	/* Restore integer registers */
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-        ldmia	r0!, {r4-r12}
-#else
-	ldmia	r0!, {r4-r7}
-	ldmia	r0!, {r2-r3}
-	mov	r8, r2
-	mov	r9, r3
-	ldmia	r0!, {r2-r3}
-	mov	r10, r2
-	mov	r1, r3
-	adds	r0, r0, #4		/* skip r12 */
-#endif
-	ldmia	r0!, {r2-r3}		/* r2 = sp, r3 = lr */
-
-	/* Validate sp and r14 */
-#if defined(__thumb__) && defined(_ARM_ARCH_T2)
-	cbz	r2, botch
-#else
-	cmp	r2, #0
-	beq	botch
-#endif
-	mov	sp, r2
-
-#if defined(__thumb__) && defined(_ARM_ARCH_T2)
-	cbz	r3, botch
-#else
-	cmp	r3, #0
-	beq	botch
-#endif
-	mov	lr, r3
-
-	/* Set return value */
-	movs	r0, r1
-#ifdef __thumb__
-	bne	1f
-	movs	r0, #1
-1:
-#else
-	moveq	r0, #1
-#endif
-	RET
-
-	/* validation failed, die die die. */
-botch:
-	bl	PLT_SYM(_C_LABEL(longjmperror))
-	bl	PLT_SYM(_C_LABEL(abort))
-1:	b	1b		/* Cannot get here */
-
-	.align	0
-.L_setjmp_magic:
-	.word	_JB_MAGIC__SETJMP
-END(_longjmp)
diff --git a/lib/libc/arch/arm/gen/alloca.S b/lib/libc/arch/arm/gen/alloca.S
deleted file mode 100644
index 65d1cdb69..000000000
--- a/lib/libc/arch/arm/gen/alloca.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: alloca.S,v 1.5 2013/08/17 01:07:45 matt Exp $	*/
-
-/*
- * Copyright (c) 1995 Mark Brinicombe
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Mark Brinicombe
- * 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 AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* like alloc, but automatic automatic free in return */
-
-#include <machine/asm.h>
-
-ENTRY(alloca)
-	adds	r0, r0, #7	/* round up to next 8 byte alignment */
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-	bics	r0, r0, #7
-	sub	sp, sp, r0	/* Adjust the stack pointer */
-	mov	r0, sp		/* r0 = base of new space */
-#else
-	lsrs	r0, r0, #3
-	lsls	r0, r0, #3
-	mov	r1, sp
-	subs	r0, r1, r0	/* Adjust the stack pointer */
-	mov	sp, r0		/* r0 = base of new space */
-#endif
-	RET
-END(alloca)
diff --git a/lib/libc/arch/arm/gen/flt_rounds.c b/lib/libc/arch/arm/gen/flt_rounds.c
deleted file mode 100644
index f9e6a79ce..000000000
--- a/lib/libc/arch/arm/gen/flt_rounds.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: flt_rounds.c,v 1.5 2015/03/19 21:22:59 joerg Exp $	*/
-
-/*
- * Copyright (c) 1996 Mark Brinicombe
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Mark Brinicombe
- *	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 <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.5 2015/03/19 21:22:59 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ieeefp.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	2,	/* round to positive infinity */
-	3,	/* round to negative infinity */
-	0	/* round to zero */
-};
-
-/*
- * Return the current FP rounding mode
- *
- * Returns:
- *	0 - round to zero
- *	1 - round to nearest
- *	2 - round to postive infinity
- *	3 - round to negative infinity
- *
- * ok all we need to do is get the current FP rounding mode
- * index our map table and return the appropriate value.
- *
- * HOWEVER:
- * The ARM FPA codes the rounding mode into the actual FP instructions
- * so there is no such thing as a global rounding mode.
- * The default is round to nearest if rounding is not explicitly specified.
- * FP instructions generated by GCC will not explicitly specify a rounding
- * mode.
- *
- * So the best we can do it to return the rounding mode FP instructions
- * use if rounding is not specified which is round to nearest.
- *
- * This could change in the future with new floating point emulators or
- * soft float FP libraries.
- */
-
-int __flt_rounds(void);
-
-int
-__flt_rounds(void)
-{
-	return(map[fpgetround()]);
-}
diff --git a/lib/libc/arch/arm/gen/makecontext.c b/lib/libc/arch/arm/gen/makecontext.c
deleted file mode 100644
index 40cef0614..000000000
--- a/lib/libc/arch/arm/gen/makecontext.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.4 2012/03/21 14:03:06 christos Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.4 2012/03/21 14:03:06 christos Exp $");
-#endif
-
-#include <stddef.h>
-#include <inttypes.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#include <stdarg.h>
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	int i;
-	unsigned int *sp;
-	va_list ap;
-
-	/* Compute and align stack pointer. */
-	sp = (unsigned int *)
-	    (((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size) & ~7);
-	/* Allocate necessary stack space for arguments exceeding r0-3. */
-	if (argc > 4)
-		sp -= argc - 4;
-	gr[_REG_SP] = (__greg_t)(uintptr_t)sp;
-	/* Wipe out frame pointer. */
-	gr[_REG_FP] = 0;
-	/* Arrange for return via the trampoline code. */
-	gr[_REG_LR] = (__greg_t)(uintptr_t)_resumecontext;
-	gr[_REG_PC] = (__greg_t)(uintptr_t)func;
-
-	va_start(ap, argc);
-	/* Pass up to four arguments in r0-3. */
-	for (i = 0; i < argc && i < 4; i++)
-		gr[_REG_R0 + i] = va_arg(ap, int);
-	/* Pass any additional arguments on the stack. */
-	for (argc -= i; argc > 0; argc--)
-		*sp++ = va_arg(ap, int);
-	va_end(ap);
-}
diff --git a/lib/libc/arch/arm/gen/nanf.c b/lib/libc/arch/arm/gen/nanf.c
deleted file mode 100644
index 0be7edddb..000000000
--- a/lib/libc/arch/arm/gen/nanf.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*	$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:01 martin Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:01 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-#if BYTE_ORDER == BIG_ENDIAN
-		{ { 0x7f, 0xc0,    0,    0 } };
-#else
-		{ {    0,    0, 0xc0, 0x7f } };
-#endif
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/arm/gen/resumecontext.c b/lib/libc/arch/arm/gen/resumecontext.c
deleted file mode 100644
index 66781b68f..000000000
--- a/lib/libc/arch/arm/gen/resumecontext.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:57 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:57 joerg Exp $");
-#endif
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <ucontext.h>
-#include <unistd.h>
-#include "extern.h"
-
-void
-_resumecontext(void)
-{
-	ucontext_t uct;
-
-	(void)getcontext(&uct);
-	if (uct.uc_link == NULL) 
-		exit(0);
-	(void)setcontext(uct.uc_link);
-	_exit(-1);
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/arm/gen/setjmp.S b/lib/libc/arch/arm/gen/setjmp.S
deleted file mode 100644
index 84a77c134..000000000
--- a/lib/libc/arch/arm/gen/setjmp.S
+++ /dev/null
@@ -1,228 +0,0 @@
-/*	$NetBSD: setjmp.S,v 1.17 2013/11/30 20:20:42 joerg Exp $	*/
-
-/*
- * Copyright (c) 1997 Mark Brinicombe
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Mark Brinicombe
- * 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 AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (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(__SOFTFP__) && !defined(__VFP_FP__) && !defined(__ARM_PCS)
-#error FPA is not supported anymore
-#endif
-
-#if defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)
-	.fpu	vfp
-#endif
-
-#include <machine/asm.h>
-#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.
- * The previous signal state is restored.
- */
-
-ENTRY(__setjmp14)
-	/* Get the signal mask. */
-	push	{r0-r2, lr}
-#if !defined(__thumb__)
-	adds	r2, r0, #(_JB_SIGMASK * 4)
-#else
-	mov	r2, r0
-	adds	r2, r2, #(_JB_SIGMASK * 4)
-#endif
-	movs	r1, #0
-	movs	r0, #0
-	bl	PLT_SYM(_C_LABEL(__sigprocmask14))
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-	pop	{r0-r2, lr}
-#else
-	pop	{r0-r3}
-	mov	lr, r3
-#endif
-
-	ldr	r1, .Lsetjmp_magic
-
-#if defined(__ARM_EABI__) && (!defined(__thumb__) || defined(_ARM_ARCH_T2))
-	ldr	r2, .Lfpu_present
-#ifdef __PIC__
-	add	r2, r2, pc	/* pc = &.LPIC0 */
-#endif
-	ldr	r2, [r2]
-.LPIC0:
-#if defined(__thumb__) && defined(_ARM_ARCH_T2)
-	cbz	r2, 1f		/* don't save if we don't have a FPU */
-#else
-	cmp	r2, #0		/* do we have a FPU? */
-	beq	1f		/*   no, don't save VFP registers */
-#endif
-
-	orrs	r1, r1, #(_JB_MAGIC_SETJMP ^ _JB_MAGIC_SETJMP_VFP)
-				/* change magic to VFP magic */
-	adds	r2, r0, #(_JB_REG_D8 * 4)
-	vstmia	r2, {d8-d15}
-	vmrs	r2, fpscr
-	str	r2, [r0, #(_JB_REG_FPSCR * 4)]
-1:
-#endif /* __ARM_EABI__ && (!__thumb__ || _ARM_ARCH_T2) */
-
-	str	r1, [r0]		/* store magic */
-
-	/* Store integer registers */
-	adds	r0, r0, #(_JB_REG_R4 * 4)
-#if !defined(__thumb__)
-	stmia	r0!, {r4-lr}
-#else
-	stmia	r0!, {r4-r7}
-	mov	r2, r8
-	mov	r3, r9
-	stmia	r0!, {r2-r3}
-	mov	r2, r10
-	mov	r3, r11
-	stmia	r0!, {r2-r3}
-	mov	r2, sp
-	mov	r3, lr
-	str	r2, [r0, #4]
-	str	r3, [r0, #8]
-#endif
-	movs	r0, #0
-	RET
-
-#if defined(__ARM_EABI__) && (!defined(__thumb__) || defined(_ARM_ARCH_T2))
-	.align	0
-.Lfpu_present:
-	.word	REL_SYM(_libc_arm_fpu_present, .LPIC0)
-#endif /* __ARM_EABI__ && (!__thumb__ || _ARM_ARCH_T2) */
-END(__setjmp14)
-
-ENTRY(__longjmp14)
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-	ldr	r2, [r0]
-	ldr	ip, .Lsetjmp_magic
-	bic	r3, r2, #(_JB_MAGIC_SETJMP ^ _JB_MAGIC_SETJMP_VFP)
-#else
-	ldr	r3, .Lsetjmp_magic
-	mov	ip, r3
-	ldr	r3, [r0]
-	movs	r2, #(_JB_MAGIC_SETJMP ^ _JB_MAGIC_SETJMP_VFP)
-	bics	r3, r2 
-	/* r2 is not the magic but we don't need it since we can't do VFP */
-#endif
-	cmp	r3, ip
-	bne	.Lbotch
-
-	/* Restore the signal mask. */
-	push	{r0-r2, lr}
-	movs	r2, #0
-#if !defined(__thumb__)
-	adds	r1, r0, #(_JB_SIGMASK * 4)
-#else
-	mov	r1, r0
-	adds	r1, r1, #(_JB_SIGMASK * 4)
-#endif
-	movs	r0, #3				/* SIG_SETMASK */
-	bl	PLT_SYM(_C_LABEL(__sigprocmask14))
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-	pop	{r0-r2, lr}
-#else
-	pop	{r0-r3}
-	mov	lr, r3
-#endif
-
-#if defined(__ARM_EABI__) && (!defined(__thumb__) || defined(_ARM_ARCH_T2))
-	tst	r2, #(_JB_MAGIC_SETJMP ^ _JB_MAGIC_SETJMP_VFP)
-						/* is this a VFP magic? */
-	beq	1f				/*   no, don't restore VFP */
-	adds	r2, r0, #(_JB_REG_D8 * 4)
-	vldmia	r2, {d8-d15}
-	ldr	r2, [r0, #(_JB_REG_FPSCR * 4)]
-	vmsr	fpscr, r2
-1:
-#endif /* __ARM_EABI__ && (!__thumb__ || _ARM_ARCH_T2) */
-
-	adds	r0, r0, #(_JB_REG_R4 * 4)
-	/* Restore integer registers */
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-	ldmia	r0!, {r4-r12}
-#else
-	ldmia	r0!, {r4-r7}
-	ldmia	r0!, {r2-r3}
-	mov	r8, r2
-	mov	r9, r3
-	ldmia	r0!, {r2-r3}
-	mov	r10, r2
-	mov	r11, r3
-	adds	r0, r0, #4	/* skip ip(r12) */
-#endif
-
-	ldmia	r0!, {r2-r3}
-
-	/* Validate sp and lr */
-#if defined(__thumb__) && defined(_ARM_ARCH_T2)
-	cbz	r2, .Lbotch
-#else
-	cmp	r2, #0
-	beq	.Lbotch
-#endif
-	mov	sp, r2
-
-#if defined(__thumb__) && defined(_ARM_ARCH_T2)
-	cbz	r3, .Lbotch
-#else
-	cmp	r3, #0
-	beq	.Lbotch
-#endif
-	mov	lr, r3
-
-	/* Set return value */
-	movs	r0, r1
-#if !defined(__thumb__)
-	moveq	r0, #1
-#else
-	bne	1f
-	movs	r0, #1
-1:
-#endif
-	RET
-
-	/* validation failed, die die die. */
-.Lbotch:
-	bl	PLT_SYM(_C_LABEL(longjmperror))
-	bl	PLT_SYM(_C_LABEL(abort))
-1:	b	1b		/* Cannot get here */
-
-	.align	0
-.Lsetjmp_magic:
-	.word	_JB_MAGIC_SETJMP
-END(__longjmp14)
diff --git a/lib/libc/arch/arm/gen/sigsetjmp.S b/lib/libc/arch/arm/gen/sigsetjmp.S
deleted file mode 100644
index 94ad813f5..000000000
--- a/lib/libc/arch/arm/gen/sigsetjmp.S
+++ /dev/null
@@ -1,95 +0,0 @@
-/*	$NetBSD: sigsetjmp.S,v 1.8 2013/11/30 20:20:42 joerg Exp $	*/
-
-/*
- * Copyright (c) 1997 Mark Brinicombe
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Mark Brinicombe
- * 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 AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING 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 <machine/setjmp.h>
-
-/*
- * C library -- sigsetjmp, siglongjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v)" from the last call to
- *	setjmp(a, m)
- * by restoring registers from the stack.
- * The previous signal state is restored.
- */
-
-ENTRY(__sigsetjmp14)
-#if defined(__thumb__) && defined(_ARM_ARCH_T2)
-	cbnz	r1, 1f
-	b	PLT_SYM(_C_LABEL(_setjmp))
-1:	b	PLT_SYM(_C_LABEL(__setjmp14))
-#elif !defined(__thumb__)
-	cmp	r1, #0
-	beq	PLT_SYM(_C_LABEL(_setjmp))
-	b	PLT_SYM(_C_LABEL(__setjmp14))
-#else
-	push	{r3, lr}
-	beq	1f
-	bl	PLT_SYM(_C_LABEL(__setjmp14))
-	b	2f
-1:	bl	PLT_SYM(_C_LABEL(_setjmp))
-2:	pop	{r3, pc}
-#endif
-END(__sigsetjmp14)
-
-ENTRY(__siglongjmp14)
-	ldr	r3, [r0]
-#if !defined(__thumb__)
-	bics	r3, r3, #(_JB_MAGIC_SETJMP ^ _JB_MAGIC_SETJMP_VFP)
-#else
-	movs	r2, #(_JB_MAGIC_SETJMP ^ _JB_MAGIC_SETJMP_VFP)
-	bics	r3, r3, r2
-#endif
-	ldr	r2, .L_setjmp_magic
-	cmp	r2, r3
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-#ifdef __thumb__
-	it	eq
-#endif
-	beq	PLT_SYM(_C_LABEL(_longjmp))
-	b	PLT_SYM(_C_LABEL(__longjmp14))
-#else
-	push	{r3, lr}
-	beq	11f
-	bl	PLT_SYM(_C_LABEL(__longjmp14))
-	pop	{r3, pc}
-11:	bl	PLT_SYM(_C_LABEL(_longjmp))
-	pop	{r3, pc}
-#endif
-
-	.align	0
-.L_setjmp_magic:
-	.word	_JB_MAGIC__SETJMP
-END(__siglongjmp14)
diff --git a/lib/libc/arch/arm/gen/swapcontext.S b/lib/libc/arch/arm/gen/swapcontext.S
deleted file mode 100644
index 31289da90..000000000
--- a/lib/libc/arch/arm/gen/swapcontext.S
+++ /dev/null
@@ -1,95 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.14 2013/11/30 20:20:42 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-        RCSID("$NetBSD: swapcontext.S,v 1.14 2013/11/30 20:20:42 joerg Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-ENTRY(swapcontext)
-#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
-	.fnstart
-	.cfi_startproc
-#endif
-	push	{r0-r2, lr}	/* Must save oucp, ucp, lr. */
-#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
-	.save	{r0-r2, lr}
-	.cfi_def_cfa_offset 16
-	.cfi_offset 14, -4
-	.cfi_offset 2, -8
-	.cfi_offset 1, -12
-	.cfi_offset 0, -16
-#endif
-	bl	PLT_SYM(_C_LABEL(_getcontext))  /* getcontext(oucp) */
-	cmp	r0, #0
-#if !defined(__thumb__)
-	pop	{r0-r2, lr}
-#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
-	.cfi_def_cfa_offset 0
-#endif
-	RETc(ne)
-#else
-	pop	{r0-r3}
-	beq	1f
-#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
-	.cfi_def_cfa_offset 0
-	.cfi_register 14, 3
-#endif
-	RETr(r3)
-1:
-#endif
-#if !defined(__thumb__)
-	str	sp, [r0, #_UC_REGS_SP]	/* Adjust saved SP. */
-	str	lr, [r0, #_UC_REGS_PC]	/* Adjust saved SP. */
-#else
-	mov	r2, sp
-	str	r2, [r0, #_UC_REGS_SP]	/* Adjust saved SP. */
-	str	r3, [r0, #_UC_REGS_PC]	/* Adjust saved PC. */
-	mov	lr, r3
-#endif
-#ifdef SOFTFLOAT
-	/* Ahem. */
-#endif
-	mov	r0, r1
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-	b	PLT_SYM(_C_LABEL(setcontext))
-#else
-	push	{lr}
-	bl	PLT_SYM(_C_LABEL(setcontext))
-	pop	{pc}
-#endif
-#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
-	.cfi_endproc
-	.fnend
-#endif
-END(swapcontext)
diff --git a/lib/libc/arch/arm/hardfloat/fabs_ieee754.S b/lib/libc/arch/arm/hardfloat/fabs_ieee754.S
deleted file mode 100644
index 0e1c1f426..000000000
--- a/lib/libc/arch/arm/hardfloat/fabs_ieee754.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-
-RCSID("$NetBSD: fabs_ieee754.S,v 1.1 2014/01/17 22:19:46 joerg Exp $")
-
-	.fpu	vfp
-
-ENTRY(fabsl)
-ENTRY(fabs)
-	vabs.f64	d0, d0
-	RET
-END(fabs)
diff --git a/lib/libc/arch/arm/hardfloat/fpgetmask.S b/lib/libc/arch/arm/hardfloat/fpgetmask.S
deleted file mode 100644
index 2faa3307d..000000000
--- a/lib/libc/arch/arm/hardfloat/fpgetmask.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: fpgetmask.S,v 1.7 2013/08/02 02:07:00 matt Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __VFP_FP__
-#error FPA is not supported anymore
-#endif
-#include <arm/asm.h>
-#include <arm/vfpreg.h>
-
-/*
- * Return the current FP exception enable mask
- */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpgetmask, _fpgetmask)
-#define fpgetmask	_fpgetmask
-#endif
-
-ENTRY(fpgetmask)
-	vmrs    r0, fpscr
-	mov	r0, r0, lsr #8
-	and	r0, r0, #VFP_FPSCR_CSUM
-	RET
-END(fpgetmask)
diff --git a/lib/libc/arch/arm/hardfloat/fpgetround.c b/lib/libc/arch/arm/hardfloat/fpgetround.c
deleted file mode 100644
index 70d467a22..000000000
--- a/lib/libc/arch/arm/hardfloat/fpgetround.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: fpgetround.c,v 1.6 2013/01/11 13:55:26 matt Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __VFP_FP__
-#error FPA is not supported anymore
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.6 2013/01/11 13:55:26 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#include <arm/vfpreg.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetround,_fpgetround)
-#endif
-
-/*
- * Return the current FP rounding mode
- */
-
-fp_rnd
-fpgetround(void)
-{
-	__CTASSERT(__SHIFTOUT(VFP_FPSCR_RN, VFP_FPSCR_RMODE) == FP_RN);
-	__CTASSERT(__SHIFTOUT(VFP_FPSCR_RP, VFP_FPSCR_RMODE) == FP_RP);
-	__CTASSERT(__SHIFTOUT(VFP_FPSCR_RM, VFP_FPSCR_RMODE) == FP_RM);
-	__CTASSERT(__SHIFTOUT(VFP_FPSCR_RZ, VFP_FPSCR_RMODE) == FP_RZ);
-	uint32_t fpscr; 
-	__asm __volatile("vmrs %0, fpscr" : "=r" (fpscr));
-	return __SHIFTOUT(fpscr, VFP_FPSCR_RMODE);
-}
diff --git a/lib/libc/arch/arm/hardfloat/fpgetsticky.S b/lib/libc/arch/arm/hardfloat/fpgetsticky.S
deleted file mode 100644
index d0382e282..000000000
--- a/lib/libc/arch/arm/hardfloat/fpgetsticky.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: fpgetsticky.S,v 1.6 2013/01/11 13:55:26 matt Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef __VFP_FP__
-#error FPA is not supported anymore
-#endif
-
-#include <arm/asm.h>
-#include <arm/vfpreg.h>
-
-/*
- * Return the current FP cumulative flags
- */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpgetsticky, _fpgetsticky)
-#define	fpgetsticky	_fpgetsticky
-#endif
-
-ENTRY(fpgetsticky)
-	vmrs	r0, fpscr
-	and	r0, r0, #VFP_FPSCR_CSUM
-	RET
-END(fpgetsticky)
diff --git a/lib/libc/arch/arm/hardfloat/fpsetmask.S b/lib/libc/arch/arm/hardfloat/fpsetmask.S
deleted file mode 100644
index 943d23005..000000000
--- a/lib/libc/arch/arm/hardfloat/fpsetmask.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: fpsetmask.S,v 1.7 2014/01/23 00:00:16 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __VFP_FP__
-#error FPA is not supported anymore
-#endif
-
-#include <arm/asm.h>
-#include <arm/vfpreg.h>
-
-/*
- * Set the current FP exception enable mask
- */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpsetmask, _fpsetmask)
-#define	fpsetmask	_fpsetmask
-#endif
-
-ENTRY(fpsetmask)
-	and	r2, r0, #VFP_FPSCR_CSUM
-	vmrs	r1, fpscr
-	mov	r0, r1, lsr #8		/* Return old mask */
-	bic	r1, r1, #VFP_FPSCR_ESUM
-	orr	r1, r1, r2, lsl #8
-	vmsr	fpscr, r1
-	and	r0, r0, #VFP_FPSCR_CSUM
-	RET
-END(fpsetmask)
diff --git a/lib/libc/arch/arm/hardfloat/fpsetround.c b/lib/libc/arch/arm/hardfloat/fpsetround.c
deleted file mode 100644
index cd4f95416..000000000
--- a/lib/libc/arch/arm/hardfloat/fpsetround.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: fpsetround.c,v 1.8 2013/02/03 01:50:54 matt Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __VFP_FP__
-#error FPA is not supported anymore
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.8 2013/02/03 01:50:54 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#include <arm/vfpreg.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetround,_fpsetround)
-#endif
-
-/*
- * Return the current FP rounding mode
- */
-
-fp_rnd
-fpsetround(fp_rnd new_rnd)
-{
-	__CTASSERT(__SHIFTOUT(VFP_FPSCR_RN, VFP_FPSCR_RMODE) == FP_RN);
-	__CTASSERT(__SHIFTOUT(VFP_FPSCR_RP, VFP_FPSCR_RMODE) == FP_RP);
-	__CTASSERT(__SHIFTOUT(VFP_FPSCR_RM, VFP_FPSCR_RMODE) == FP_RM);
-	__CTASSERT(__SHIFTOUT(VFP_FPSCR_RZ, VFP_FPSCR_RMODE) == FP_RZ);
-	uint32_t fpscr; 
-	__asm __volatile("vmrs %0, fpscr" : "=r" (fpscr));
-	fp_rnd old_rnd = __SHIFTOUT(fpscr, VFP_FPSCR_RMODE);
-	fpscr ^= __SHIFTIN(new_rnd ^ old_rnd, VFP_FPSCR_RMODE);
-	__asm __volatile("vmsr fpscr, %0" :: "r" (fpscr));
-	return old_rnd;
-}
diff --git a/lib/libc/arch/arm/hardfloat/fpsetsticky.S b/lib/libc/arch/arm/hardfloat/fpsetsticky.S
deleted file mode 100644
index 2b4d01c86..000000000
--- a/lib/libc/arch/arm/hardfloat/fpsetsticky.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: fpsetsticky.S,v 1.6 2013/01/11 13:55:26 matt Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __VFP_FP__
-#error FPA is not supported anymore
-#endif
-
-#include <arm/asm.h>
-#include <arm/vfpreg.h>
-
-/*
- * Set the current FP cumulative flags
- */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpsetsticky, _fpsetsticky)
-#define	fpsetsticky	_fpsetsticky
-#endif
-
-ENTRY(fpsetsticky)
-	and	r1, r0, #VFP_FPSCR_CSUM
-	vmrs	r0, fpscr
-	bic	r2, r0, #VFP_FPSCR_CSUM
-	orr	r1, r1, r2
-	vmsr	fpscr, r1
-	and	r0, r0, #VFP_FPSCR_CSUM
-	RET
-END(fpsetsticky)
diff --git a/lib/libc/arch/arm/misc/arm_initfini.c b/lib/libc/arch/arm/misc/arm_initfini.c
deleted file mode 100644
index 28109be89..000000000
--- a/lib/libc/arch/arm/misc/arm_initfini.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-__RCSID("$NetBSD: arm_initfini.c,v 1.7 2013/09/08 13:15:53 matt Exp $");
-
-#include "namespace.h"
-
-/*
- * To properly implement setjmp/longjmp for the ARM AAPCS ABI, it has to be
- * aware of whether there is a FPU is present or not.  Regardless of whether
- * the hard-float ABI is being used, setjmp needs to save D8-D15.  But it can
- * only do this if those instructions won't cause an exception.
- */
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <stdbool.h>
-#include <stddef.h>
-
-__dso_hidden int _libc_arm_fpu_present;
-#ifndef __ARM_ARCH_EXT_IDIV__
-__dso_hidden int _libc_arm_hwdiv_present;
-#endif
-static bool _libc_aapcs_initialized;
-
-void	_libc_aapcs_init(void) __attribute__((__constructor__, __used__));
-
-void __section(".text.startup")
-_libc_aapcs_init(void)
-{
-	if (!_libc_aapcs_initialized) {
-#if !defined(__minix)
-		size_t len = sizeof(_libc_arm_fpu_present);
-#endif
-		_libc_aapcs_initialized = true;
-#if !defined(__minix)
-		(void)sysctlbyname("machdep.fpu_present",
-		    &_libc_arm_fpu_present, &len, NULL, 0);
-#ifndef __ARM_ARCH_EXT_IDIV__
-		(void)sysctlbyname("machdep.hwdiv_present",
-		    &_libc_arm_hwdiv_present, &len, NULL, 0);
-#endif
-#endif /* !defined(__minix) */
-	}
-}
diff --git a/lib/libc/arch/arm/net/Makefile.inc b/lib/libc/arch/arm/net/Makefile.inc
deleted file mode 100644
index 10fabd39b..000000000
--- a/lib/libc/arch/arm/net/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2000/12/29 20:13:53 bjh21 Exp $
-
-# hton* and nto* functions provided by ../gen/byte_swap_*.S
-SRCS+= 
diff --git a/lib/libc/arch/arm/softfloat/__aeabi_dcmpeq.c b/lib/libc/arch/arm/softfloat/__aeabi_dcmpeq.c
deleted file mode 100644
index 6725c668b..000000000
--- a/lib/libc/arch/arm/softfloat/__aeabi_dcmpeq.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $NetBSD: __aeabi_dcmpeq.c,v 1.1 2013/04/16 10:37:39 matt Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __aeabi_dcmpeq.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-int __aeabi_dcmpeq(float64, float64);
-
-int
-__aeabi_dcmpeq(float64 a, float64 b)
-{
-
-	return float64_eq(a, b);
-}
diff --git a/lib/libc/arch/arm/softfloat/__aeabi_dcmpge.c b/lib/libc/arch/arm/softfloat/__aeabi_dcmpge.c
deleted file mode 100644
index 01dd38a89..000000000
--- a/lib/libc/arch/arm/softfloat/__aeabi_dcmpge.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $NetBSD: __aeabi_dcmpge.c,v 1.2 2013/04/16 13:38:34 matt Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __aeabi_dcmpge.c,v 1.2 2013/04/16 13:38:34 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-int __aeabi_dcmpge(float64, float64);
-
-int
-__aeabi_dcmpge(float64 a, float64 b)
-{
-
-	return !float64_lt(a, b) && float64_eq(a, a) && float64_eq(b, b);
-}
diff --git a/lib/libc/arch/arm/softfloat/__aeabi_dcmpgt.c b/lib/libc/arch/arm/softfloat/__aeabi_dcmpgt.c
deleted file mode 100644
index e1782129c..000000000
--- a/lib/libc/arch/arm/softfloat/__aeabi_dcmpgt.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $NetBSD: __aeabi_dcmpgt.c,v 1.2 2013/04/16 13:38:34 matt Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __aeabi_dcmpgt.c,v 1.2 2013/04/16 13:38:34 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-int __aeabi_dcmpgt(float64, float64);
-
-int
-__aeabi_dcmpgt(float64 a, float64 b)
-{
-
-	return !float64_le(a, b) && float64_eq(a, a) && float64_eq(b, b);
-}
diff --git a/lib/libc/arch/arm/softfloat/__aeabi_dcmple.c b/lib/libc/arch/arm/softfloat/__aeabi_dcmple.c
deleted file mode 100644
index c8202f870..000000000
--- a/lib/libc/arch/arm/softfloat/__aeabi_dcmple.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $NetBSD: __aeabi_dcmple.c,v 1.1 2013/04/16 10:37:39 matt Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __aeabi_dcmple.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-int __aeabi_dcmple(float64, float64);
-
-int
-__aeabi_dcmple(float64 a, float64 b)
-{
-
-	return float64_le(a, b);
-}
diff --git a/lib/libc/arch/arm/softfloat/__aeabi_dcmplt.c b/lib/libc/arch/arm/softfloat/__aeabi_dcmplt.c
deleted file mode 100644
index 99b80d858..000000000
--- a/lib/libc/arch/arm/softfloat/__aeabi_dcmplt.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $NetBSD: __aeabi_dcmplt.c,v 1.1 2013/04/16 10:37:39 matt Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __aeabi_dcmplt.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-int __aeabi_dcmplt(float64, float64);
-
-int
-__aeabi_dcmplt(float64 a, float64 b)
-{
-
-	return float64_lt(a, b);
-}
diff --git a/lib/libc/arch/arm/softfloat/__aeabi_dcmpun.c b/lib/libc/arch/arm/softfloat/__aeabi_dcmpun.c
deleted file mode 100644
index 7b13d0106..000000000
--- a/lib/libc/arch/arm/softfloat/__aeabi_dcmpun.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: __aeabi_dcmpun.c,v 1.1 2013/04/16 10:37:39 matt Exp $ */
-
-/*
- * Written by Richard Earnshaw, 2003.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __aeabi_dcmpun.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-int __aeabi_dcmpun(float64, float64);
-
-int
-__aeabi_dcmpun(float64 a, float64 b)
-{
-	/*
-	 * The comparison is unordered if either input is a NaN.
-	 * Test for this by comparing each operand with itself.
-	 * We must perform both comparisons to correctly check for
-	 * signalling NaNs.
-	 */
-	return !float64_eq(a, a) || !float64_eq(b, b);
-}
diff --git a/lib/libc/arch/arm/softfloat/__aeabi_fcmpeq.c b/lib/libc/arch/arm/softfloat/__aeabi_fcmpeq.c
deleted file mode 100644
index 02f5f0b69..000000000
--- a/lib/libc/arch/arm/softfloat/__aeabi_fcmpeq.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $NetBSD: __aeabi_fcmpeq.c,v 1.1 2013/04/16 10:37:39 matt Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __aeabi_fcmpeq.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-int __aeabi_fcmpeq(float32, float32);
-
-int
-__aeabi_fcmpeq(float32 a, float32 b)
-{
-
-	return float32_eq(a, b);
-}
diff --git a/lib/libc/arch/arm/softfloat/__aeabi_fcmpge.c b/lib/libc/arch/arm/softfloat/__aeabi_fcmpge.c
deleted file mode 100644
index 3d52d907d..000000000
--- a/lib/libc/arch/arm/softfloat/__aeabi_fcmpge.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $NetBSD: __aeabi_fcmpge.c,v 1.2 2013/04/16 13:38:34 matt Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __aeabi_fcmpge.c,v 1.2 2013/04/16 13:38:34 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-int __aeabi_fcmpge(float32, float32);
-
-int
-__aeabi_fcmpge(float32 a, float32 b)
-{
-
-	return !float32_lt(a, b) && float32_eq(a, a) && float32_eq(b, b);
-}
diff --git a/lib/libc/arch/arm/softfloat/__aeabi_fcmpgt.c b/lib/libc/arch/arm/softfloat/__aeabi_fcmpgt.c
deleted file mode 100644
index 71c28534e..000000000
--- a/lib/libc/arch/arm/softfloat/__aeabi_fcmpgt.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $NetBSD: __aeabi_fcmpgt.c,v 1.2 2013/04/16 13:38:34 matt Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __aeabi_fcmpgt.c,v 1.2 2013/04/16 13:38:34 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-int __aeabi_fcmpgt(float32, float32);
-
-int
-__aeabi_fcmpgt(float32 a, float32 b)
-{
-
-	return !float32_le(a, b) && float32_eq(a, a) && float32_eq(b, b);
-}
diff --git a/lib/libc/arch/arm/softfloat/__aeabi_fcmple.c b/lib/libc/arch/arm/softfloat/__aeabi_fcmple.c
deleted file mode 100644
index a51b29118..000000000
--- a/lib/libc/arch/arm/softfloat/__aeabi_fcmple.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $NetBSD: __aeabi_fcmple.c,v 1.1 2013/04/16 10:37:39 matt Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __aeabi_fcmple.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-int __aeabi_fcmple(float32, float32);
-
-int
-__aeabi_fcmple(float32 a, float32 b)
-{
-
-	return float32_le(a, b);
-}
diff --git a/lib/libc/arch/arm/softfloat/__aeabi_fcmplt.c b/lib/libc/arch/arm/softfloat/__aeabi_fcmplt.c
deleted file mode 100644
index c734fe5e3..000000000
--- a/lib/libc/arch/arm/softfloat/__aeabi_fcmplt.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $NetBSD: __aeabi_fcmplt.c,v 1.1 2013/04/16 10:37:39 matt Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __aeabi_fcmplt.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-int __aeabi_fcmplt(float32, float32);
-
-int
-__aeabi_fcmplt(float32 a, float32 b)
-{
-
-	return float32_lt(a, b);
-}
diff --git a/lib/libc/arch/arm/softfloat/__aeabi_fcmpun.c b/lib/libc/arch/arm/softfloat/__aeabi_fcmpun.c
deleted file mode 100644
index 7b71b3aab..000000000
--- a/lib/libc/arch/arm/softfloat/__aeabi_fcmpun.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: __aeabi_fcmpun.c,v 1.1 2013/04/16 10:37:39 matt Exp $ */
-
-/*
- * Written by Richard Earnshaw, 2003.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __aeabi_fcmpun.c,v 1.1 2013/04/16 10:37:39 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-int __aeabi_fcmpun(float32, float32);
-
-int
-__aeabi_fcmpun(float32 a, float32 b)
-{
-	/*
-	 * The comparison is unordered if either input is a NaN.
-	 * Test for this by comparing each operand with itself.
-	 * We must perform both comparisons to correctly check for
-	 * signalling NaNs.
-	 */
-	return !float32_eq(a, a) || !float32_eq(b, b);
-}
diff --git a/lib/libc/arch/arm/softfloat/arm-gcc.h b/lib/libc/arch/arm/softfloat/arm-gcc.h
deleted file mode 100644
index c52f5b8be..000000000
--- a/lib/libc/arch/arm/softfloat/arm-gcc.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $NetBSD: arm-gcc.h,v 1.4 2013/01/26 07:08:14 matt Exp $ */
-
-/*
--------------------------------------------------------------------------------
-One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
--------------------------------------------------------------------------------
-*/
-#ifdef __ARMEB__
-#define BIGENDIAN
-#else
-#define LITTLEENDIAN
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `BITS64' can be defined to indicate that 64-bit integer types are
-supported by the compiler.
--------------------------------------------------------------------------------
-*/
-#define BITS64
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines the most convenient type that holds
-integers of at least as many bits as specified.  For example, `uint8' should
-be the most convenient type that can hold unsigned integers of as many as
-8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
-implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
-to the same as `int'.
--------------------------------------------------------------------------------
-*/
-typedef int flag;
-typedef int uint8;
-typedef int int8;
-typedef int uint16;
-typedef int int16;
-typedef unsigned int uint32;
-typedef signed int int32;
-#ifdef BITS64
-typedef unsigned long long int uint64;
-typedef signed long long int int64;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines a type that holds integers
-of _exactly_ the number of bits specified.  For instance, for most
-implementation of C, `bits16' and `sbits16' should be `typedef'ed to
-`unsigned short int' and `signed short int' (or `short int'), respectively.
--------------------------------------------------------------------------------
-*/
-typedef unsigned char bits8;
-typedef signed char sbits8;
-typedef unsigned short int bits16;
-typedef signed short int sbits16;
-typedef unsigned int bits32;
-typedef signed int sbits32;
-#ifdef BITS64
-typedef unsigned long long int bits64;
-typedef signed long long int sbits64;
-#endif
-
-#ifdef BITS64
-/*
--------------------------------------------------------------------------------
-The `LIT64' macro takes as its argument a textual integer literal and
-if necessary ``marks'' the literal as having a 64-bit integer type.
-For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
-appended with the letters `LL' standing for `long long', which is `gcc's
-name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
-defined as the identity macro:  `#define LIT64( a ) a'.
--------------------------------------------------------------------------------
-*/
-#define LIT64( a ) a##ULL
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `INLINE' can be used before functions that should be inlined.  If
-a compiler does not support explicit inlining, this macro should be defined
-to be `static'.
--------------------------------------------------------------------------------
-*/
-#define INLINE static inline
-
-/*
--------------------------------------------------------------------------------
-The ARM FPA is odd in that it stores doubles high-order word first, no matter
-what the endianness of the CPU.  VFP is sane.
--------------------------------------------------------------------------------
-*/
-#if defined(SOFTFLOAT_FOR_GCC)
-#if defined(__VFP_FP__) || defined(__ARMEB__)
-#define FLOAT64_DEMANGLE(a)	(a)
-#define FLOAT64_MANGLE(a)	(a)
-#else
-#define FLOAT64_DEMANGLE(a)	(((a) << 32) | ((a) >> 32))
-#define FLOAT64_MANGLE(a)	FLOAT64_DEMANGLE(a)
-#endif
-#endif
diff --git a/lib/libc/arch/arm/softfloat/milieu.h b/lib/libc/arch/arm/softfloat/milieu.h
deleted file mode 100644
index a3f829c42..000000000
--- a/lib/libc/arch/arm/softfloat/milieu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $NetBSD: milieu.h,v 1.1 2000/12/29 20:13:54 bjh21 Exp $ */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "arm-gcc.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
diff --git a/lib/libc/arch/arm/softfloat/softfloat.h b/lib/libc/arch/arm/softfloat/softfloat.h
deleted file mode 100644
index b45649d43..000000000
--- a/lib/libc/arch/arm/softfloat/softfloat.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/*	$NetBSD: softfloat.h,v 1.10 2013/04/24 18:04:46 matt Exp $	*/
-
-/* This is a derivative work. */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.  The same applies to
-the `FLOAT128' macro and the quadruple-precision format `float128'.
--------------------------------------------------------------------------------
-*/
-/* #define FLOATX80 */
-/* #define FLOAT128 */
-
-#include <stdint.h>
-#include <machine/ieeefp.h>
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef unsigned int float32;
-typedef unsigned long long float64;
-#ifdef FLOATX80
-typedef struct {
-    unsigned short high;
-    unsigned long long low;
-} floatx80;
-#endif
-#ifdef FLOAT128
-typedef struct {
-    unsigned long long high, low;
-} float128;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-#ifndef SOFTFLOAT_FOR_GCC
-extern int float_detect_tininess;
-#endif
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern fp_rnd float_rounding_mode;
-#define float_round_nearest_even FP_RN
-#define float_round_to_zero      FP_RZ
-#define float_round_down         FP_RM
-#define float_round_up           FP_RP
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-*/
-extern fp_except float_exception_flags;
-extern fp_except float_exception_mask;
-enum {
-    float_flag_inexact   = FP_X_IMP,
-    float_flag_underflow = FP_X_UFL,
-    float_flag_overflow  = FP_X_OFL,
-    float_flag_divbyzero = FP_X_DZ,
-    float_flag_invalid   = FP_X_INV
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( fp_except );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int32 );
-float32 uint32_to_float32( uint32 );
-float64 int32_to_float64( int32 );
-float64 uint32_to_float64( uint32 );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( int32 );
-floatx80 uint32_to_floatx80( uint32 );
-#endif
-#ifdef FLOAT128
-float128 int32_to_float128( int32 );
-float128 uint32_to_float128( uint32 );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __floatdi?f is in libgcc2.c */
-float32 int64_to_float32( long long );
-float64 int64_to_float64( long long );
-#ifdef FLOATX80
-floatx80 int64_to_floatx80( long long );
-#endif
-#ifdef FLOAT128
-float128 int64_to_float128( long long );
-#endif
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float32_to_int32( float32 );
-int float32_to_int32_round_to_zero( float32 );
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
-unsigned int float32_to_uint32_round_to_zero( float32 );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __fix?fdi provided by libgcc2.c */
-long long float32_to_int64( float32 );
-long long float32_to_int64_round_to_zero( float32 );
-#endif
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-#ifdef FLOAT128
-float128 float32_to_float128( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-int float32_eq( float32, float32 );
-int float32_le( float32, float32 );
-int float32_lt( float32, float32 );
-int float32_eq_signaling( float32, float32 );
-int float32_le_quiet( float32, float32 );
-int float32_lt_quiet( float32, float32 );
-#ifndef SOFTFLOAT_FOR_GCC
-int float32_is_signaling_nan( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float64_to_int32( float64 );
-int float64_to_int32_round_to_zero( float64 );
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
-unsigned int float64_to_uint32_round_to_zero( float64 );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __fix?fdi provided by libgcc2.c */
-long long float64_to_int64( float64 );
-long long float64_to_int64_round_to_zero( float64 );
-#endif
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-#ifdef FLOAT128
-float128 float64_to_float128( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-int float64_eq( float64, float64 );
-int float64_le( float64, float64 );
-int float64_lt( float64, float64 );
-int float64_eq_signaling( float64, float64 );
-int float64_le_quiet( float64, float64 );
-int float64_lt_quiet( float64, float64 );
-#ifndef SOFTFLOAT_FOR_GCC
-int float64_is_signaling_nan( float64 );
-#endif
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int floatx80_to_int32( floatx80 );
-int floatx80_to_int32_round_to_zero( floatx80 );
-long long floatx80_to_int64( floatx80 );
-long long floatx80_to_int64_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-#ifdef FLOAT128
-float128 floatx80_to_float128( floatx80 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern int floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-int floatx80_eq( floatx80, floatx80 );
-int floatx80_le( floatx80, floatx80 );
-int floatx80_lt( floatx80, floatx80 );
-int floatx80_eq_signaling( floatx80, floatx80 );
-int floatx80_le_quiet( floatx80, floatx80 );
-int floatx80_lt_quiet( floatx80, floatx80 );
-int floatx80_is_signaling_nan( floatx80 );
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float128_to_int32( float128 );
-int float128_to_int32_round_to_zero( float128 );
-long long float128_to_int64( float128 );
-long long float128_to_int64_round_to_zero( float128 );
-float32 float128_to_float32( float128 );
-float64 float128_to_float64( float128 );
-#ifdef FLOATX80
-floatx80 float128_to_floatx80( float128 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision operations.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 );
-float128 float128_add( float128, float128 );
-float128 float128_sub( float128, float128 );
-float128 float128_mul( float128, float128 );
-float128 float128_div( float128, float128 );
-float128 float128_rem( float128, float128 );
-float128 float128_sqrt( float128 );
-int float128_eq( float128, float128 );
-int float128_le( float128, float128 );
-int float128_lt( float128, float128 );
-int float128_eq_signaling( float128, float128 );
-int float128_le_quiet( float128, float128 );
-int float128_lt_quiet( float128, float128 );
-int float128_is_signaling_nan( float128 );
-
-#endif
-
diff --git a/lib/libc/arch/arm/stdlib/Makefile.inc b/lib/libc/arch/arm/stdlib/Makefile.inc
deleted file mode 100644
index d1dda0262..000000000
--- a/lib/libc/arch/arm/stdlib/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 2009/07/31 20:39:59 dsl Exp $
diff --git a/lib/libc/arch/arm/string/Makefile.inc b/lib/libc/arch/arm/string/Makefile.inc
deleted file mode 100644
index ac3055860..000000000
--- a/lib/libc/arch/arm/string/Makefile.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.9 2013/08/21 03:05:35 matt Exp $
-
-SRCS.string+=	memcmp.S memcpy.S memmove.S memset.S
-SRCS.string+=	ffs.S
-SRCS.string+=	bcopy.S bzero.S
-SRCS.string+=	strcat.S
-SRCS.string+=	strcpy.S strlcpy.S strncpy.S
-.if empty(LIBC_MACHINE_ARCH:M*v7*)
-SRCS.string+=	strcmp.S strncmp.S 
-SRCS.string+=	strlen.S strnlen.S 
-SRCS.string+=	strchr.S strrchr.S 
-.endif
-
-.for f in ${SRCS.string}
-CPUFLAGS.${f}+=		-marm
-.for s in o po pico ln d
-${f:.S=.${s}}:		${ARCHDIR}/string/Makefile.inc
-.endfor
-.endfor
-
-.if !empty(LIBC_MACHINE_ARCH:M*v7*)
-SRCS.string+=	strcmp.S strncmp.S 
-SRCS.string+=	strlen.S strnlen.S 
-SRCS.string+=	strchr.S strrchr.S 
-.endif
-
-SRCS.string+=	strlcat.S
-
-SRCS+=	${SRCS.string}
diff --git a/lib/libc/arch/arm/string/bcopy.S b/lib/libc/arch/arm/string/bcopy.S
deleted file mode 100644
index 71fb90905..000000000
--- a/lib/libc/arch/arm/string/bcopy.S
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	$NetBSD: bcopy.S,v 1.3 2003/10/14 07:51:45 scw Exp $	*/
-
-#define _BCOPY
-#include "memmove.S"
diff --git a/lib/libc/arch/arm/string/bzero.S b/lib/libc/arch/arm/string/bzero.S
deleted file mode 100644
index 1c9d39085..000000000
--- a/lib/libc/arch/arm/string/bzero.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: bzero.S,v 1.4 2008/04/28 20:22:55 martin Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-
-#define _BZERO
-#include "memset.S"
diff --git a/lib/libc/arch/arm/string/strncat_naive.S b/lib/libc/arch/arm/string/strncat_naive.S
deleted file mode 100644
index 2d7e8a73e..000000000
--- a/lib/libc/arch/arm/string/strncat_naive.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: strncat_naive.S,v 1.1 2013/01/23 05:44:52 matt Exp $")
-
-/* LINTSTUB: char *strncat(char *, const char *, size_t) */
-ENTRY(strncat)
-	teq	r2, #0			/* count is 0? */
-	RETc(eq)			/*   yes, just return dst */
-	mov	ip, r0			/* need to preserve r0 */
-1:	ldrb	r3, [ip], #1		/* load next byte */
-	teq	r3, #0			/* was it a NUL? */
-	bne	1b			/*   no, get next byte */
-	sub	ip, ip, #1		/* back up one to the NUL */
-2:	subs	r2, r2, #1		/* subtract 1 from the count */
-	blt	3f			/*   <0? write terminating NUL */
-	ldrb	r3, [r1], #1		/* load next byte from append */
-	strb	r3, [ip], #1		/* store it */
-	teq	r3, #0			/* was it a NUL? */
-	bne	2b			/*   no, get next byte */
-	RET				/* return */
-3:	mov	r3, #0			/* load a NUL */
-	strb	r3, [ip]		/* store it */
-	RET				/* return */
-END(strncat)
diff --git a/lib/libc/arch/arm/sys/__aeabi_read_tp.S b/lib/libc/arch/arm/sys/__aeabi_read_tp.S
deleted file mode 100644
index 725692fdb..000000000
--- a/lib/libc/arch/arm/sys/__aeabi_read_tp.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: __aeabi_read_tp.S,v 1.5 2013/08/19 22:10:51 matt Exp $ */
-
-#undef __thumb__
-#include "SYS.h"
-
-/*
- * Implementations of this function should corrupt only the result register
- * (r0) and the non-parameter integer core registers allowed to be corrupted
- * by the [AAPCS] (ip, lr, and CPSR).
- */
-ARM_ENTRY(__aeabi_read_tp)
-	mrc	p15, 0, r0, c13, c0, 3
-#ifndef _ARM_ARCH_6
-	cmp	r0, #0			/* was it zero? */
-	RETc(ne)			/* return it's not zero */
-	mov	ip, r1			/* syscall zeroes r1 */
-	SYSTRAP(_lwp_getprivate)	/* can't fail */
-	mov	r1, ip			/* restore r1 */
-#endif
-	RET
-END(__aeabi_read_tp)
diff --git a/lib/libc/arch/arm/sys/__clone.S b/lib/libc/arch/arm/sys/__clone.S
deleted file mode 100644
index df9a6cbfa..000000000
--- a/lib/libc/arch/arm/sys/__clone.S
+++ /dev/null
@@ -1,128 +0,0 @@
-/* $NetBSD: __clone.S,v 1.9 2013/11/30 20:20:42 joerg Exp $ */
-
-/*
- * Copyright (c) 2001 Christopher Gilbert
- * All rights reserved.
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY 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.h"
-#include <sys/errno.h>
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(clone, __clone)
-#endif
-
-/*
- * int __clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-ENTRY(__clone)
-
-	/* test stack and function are not null */
-#if defined(__thumb__) && defined(_ARM_ARCH_T2)
-	cbz	r0, .Leinval
-	cbz	r1, .Leinval
-#elif !defined(__thumb__)
-	cmp	r0, #0x00
-	cmpne	r1, #0x00
-	beq	.Leinval
-#else
-	cmp	r0, #0x00
-	beq	.Leinval
-	cmp	r1, #0x00
-	beq	.Leinval
-#endif
-
-	/* place the func and its arg onto the child's stack */
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-	stmfd	r1!, {r0, r3} 
-#else
-	subs	r1, r1, #8
-	stmia	r1!, {r0, r3} 
-#endif
-	
-	/* syscall expects (flags, stack) */
-	mov	r0, r2
-
-	SYSTRAP(__clone)
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-	_INVOKE_CERROR()
-#else
-	bcs	.Lcerror
-#endif
-
-	/*
-	 * r1 and r0 are the same as from fork:
-	 * r1 == 0 in parent process, r1 == 1 in child process.
-	 * r0 == pid of child in parent, r0 == pid of parent in child.
-	 */
-	/* if this is the parent then just return the pid */
-#if defined(__thumb__)
-#if defined(_ARM_ARCH_T2)
-	cbz	r1, 1f
-#else
-	cmp	r1, #0x00
-	bne	1f
-#endif
-	RET
-1:
-#else
-	cmp	r1, #0x00
-	RETc(eq)
-#endif
-
-	/*
-	 * This is the child
-	 * load the function and arg off the stack
-	 */
-	pop	{r1, r2}
-
-	/* place arg in r0 */
-	mov	r0, r2
-
-	/* call the function */
-#ifdef _ARM_ARCH_5T
-	blx	r1
-#else
-	/* setup return address */
-	mov	lr, pc
-	RETr(r1)
-#endif
-	/* call _exit with the returned value */
-	bl	PLT_SYM(_C_LABEL(_exit))
-
-	/* NOTREACHED */
-
-	/* error handler if func or stack is NULL */
-	.align	0
-.Leinval:
-	movs	r0, #EINVAL
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-	b	CERROR
-#else
-.Lcerror:
-	push	{lr}
-	bl	CERROR
-	pop	{pc}
-#endif
-END(__clone)
diff --git a/lib/libc/arch/arm/sys/__sigaction14_sigtramp.c b/lib/libc/arch/arm/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index 615ebe816..000000000
--- a/lib/libc/arch/arm/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.7 2008/04/28 20:22:55 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.7 2008/04/28 20:22:55 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern const int __sigtramp_siginfo_2[];
-
-	/*
-	 * If no sigaction, use the "default" trampoline since it won't
-	 * be used.
-	 */
-	if (act == NULL)
-		return  __sigaction_sigtramp(sig, act, oact, NULL, 0);
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the non-SA_SIGINFO trampoline if SA_SIGINFO is not
-	 * set in the sigaction.
-	 */
-	if ((act->sa_flags & SA_SIGINFO) == 0) {
-		extern const int __sigtramp_sigcontext_1[];
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-		    __sigtramp_sigcontext_1, 1);
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	/*
-	 * If SA_SIGINFO was specificed or the compatibility trampolines
-	 * can't be used, use the siginfo trampoline.
-	 */
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/arm/sys/__sigtramp2.S b/lib/libc/arch/arm/sys/__sigtramp2.S
deleted file mode 100755
index 4ee638e35..000000000
--- a/lib/libc/arch/arm/sys/__sigtramp2.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.3 2013/08/16 23:20:59 matt Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-/*
- * The ARM signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, the stack looks like:
- *
- *		ucontext structure
- *	sp->	siginfo structure
- * and  r5 points to the ucontext
- */
-ENTRY_NP(__sigtramp_siginfo_2)
-	mov r0, r5				/* set the arg         */
-	SYSTRAP(setcontext)			/* and call setcontext */
-
-	/* If that failed, exit with the error code. */
-	SYSTRAP(exit)
-END(__sigtramp_siginfo_2)
diff --git a/lib/libc/arch/arm/sys/__syscall.S b/lib/libc/arch/arm/sys/__syscall.S
deleted file mode 100644
index 563aaad57..000000000
--- a/lib/libc/arch/arm/sys/__syscall.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: __syscall.S,v 1.4 2003/08/07 16:42:03 agc Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)syscall.s	5.1 (Berkeley) 4/23/90
- */
-
-#include "SYS.h"
-
-RSYSCALL(__syscall)
diff --git a/lib/libc/arch/arm/sys/__vfork14.S b/lib/libc/arch/arm/sys/__vfork14.S
deleted file mode 100644
index 2bb1dfca6..000000000
--- a/lib/libc/arch/arm/sys/__vfork14.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: __vfork14.S,v 1.10 2013/09/03 00:30:19 matt Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)Ovfork.s	5.1 (Berkeley) 4/23/90
- */
-
-#include "SYS.h"
-
-/*
- * pid = vfork();
- *
- * On return from the SWI:
- * r1 == 0 in parent process, r1 == 1 in child process.
- * r0 == pid of child in parent, r0 == pid of parent in child.
- */
-ENTRY(__vfork14)
-	mov	r2, lr
-	SYSTRAP(__vfork14)
-	_INVOKE_CERROR()
-	subs	r1, r1, #1	/* r1 == 0xffffffff if parent, 0 if child */
-	ands	r0, r0, r1	/* r0 == 0 if child, else unchanged */
-	RETr(r2)
-END(__vfork14)
diff --git a/lib/libc/arch/arm/sys/brk.S b/lib/libc/arch/arm/sys/brk.S
deleted file mode 100644
index 347c3f7b4..000000000
--- a/lib/libc/arch/arm/sys/brk.S
+++ /dev/null
@@ -1,95 +0,0 @@
-/*	$NetBSD: brk.S,v 1.13 2013/09/12 15:36:15 joerg Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)brk.s	5.2 (Berkeley) 12/17/90
- */
-
-#include "SYS.h"
-
-	.globl	_C_LABEL(_end)
-	.globl	_C_LABEL(__curbrk)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
-#endif
-
-	.data
-	.align	0
-	.globl	_C_LABEL(__minbrk)
-	.hidden	_C_LABEL(__minbrk)
-	.type	_C_LABEL(__minbrk),#object
-_C_LABEL(__minbrk):
-	.word	_C_LABEL(_end)
-
-/*
- * Change the data segment size
- */
-ENTRY(_brk)
-	ldr	r1, .Lminbrk
-#ifdef __PIC__
-	adr	r3, .Lminbrk
-	adds	r1, r1, r3
-#endif
-	/* Get the minimum allowable brk address */
-	ldr	r1, [r1]
-
-	/*
-	 * Valid the address specified and set to the minimum
-	 * if the address is below minbrk.
-	 */
-	cmp	r0, r1
-#ifdef __thumb__
-	bcs	1f
-	mov	r0, r1
-1:
-#else
-	movcc	r0, r1
-#endif
-	mov	r2, r0
-	SYSTRAP(break)
-	_INVOKE_CERROR()
-
-	ldr	r1, .Lcurbrk
-#ifdef __PIC__
-	adds	r1, r1, r3
-#endif
-	/* Store the new address in curbrk */
-	str	r2, [r1]
-
-	/* Return 0 for success */
-	movs	r0, #0
-	RET
-
-	.align	0
-.Lminbrk:
-	.word	REL_SYM(_C_LABEL(__minbrk), .Lminbrk)
-.Lcurbrk:
-	.word	REL_SYM(_C_LABEL(__curbrk), .Lminbrk)
-END(_brk)
diff --git a/lib/libc/arch/arm/sys/cerror.S b/lib/libc/arch/arm/sys/cerror.S
deleted file mode 100644
index 04d48b777..000000000
--- a/lib/libc/arch/arm/sys/cerror.S
+++ /dev/null
@@ -1,102 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.13 2013/11/30 20:20:42 joerg Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)cerror.s	5.1 (Berkeley) 4/23/90
- */
-
-#include "SYS.h"
-
-ENTRY_NP(CERROR)
-#ifdef _REENTRANT
-#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
-	.fnstart
-	.cfi_startproc
-#endif
-	push	{r4, lr}
-#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
-	.save	{r4, lr}
-	.cfi_def_cfa_offset 8
-	.cfi_offset 14, -4
-	.cfi_offset 4, -8
-#endif
-	mov	r4, r0
-	bl	PLT_SYM(_C_LABEL(__errno))
-	str	r4, [r0]
-#ifdef __thumb__
-	movs	r0, #0
-	mvns	r0, r0
-#else
-	mvn	r0, #0
-#endif
-	mov	r1, r0
-	pop	{r4, pc}
-#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
-	.cfi_endproc
-	.fnend
-#endif
-#else /* !_REENTRANT */
-#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
-	.fnstart
-	.cfi_startproc
-#endif
-#ifdef __PIC__
-	/* Setup the GOT */
-	ldr	r3, .Lgot
-	add	r3, r3, pc	/* pc = &.LPIC0 */
-	ldr	r1, .Lerrno
-.LPIC0:	ldr	r1, [r3, r1]
-#else
-	ldr	r1, .Lerrno
-#endif /* __PIC__ */
-	str	r0, [r1]
-#ifdef __thumb__
-	movs	r0, #0
-	mvns	r0, r0
-#else
-	mvn	r0, #0
-#endif /* __thumb__ */
-	mov	r1, r0
-	RET
-#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
-	.cfi_endproc
-	.fnend
-#endif
-
-#ifdef __PIC__
-	.align	0
-.Lgot:
-	.word	_C_LABEL(_GLOBAL_OFFSET_TABLE_) - .LPIC0
-#endif /* __PIC__ */
-	.globl	_C_LABEL(errno)
-
-.Lerrno:
-	.word	PIC_SYM(_C_LABEL(errno), GOT)
-#endif /* _REENTRANT */
-END(CERROR)
diff --git a/lib/libc/arch/arm/sys/exect.S b/lib/libc/arch/arm/sys/exect.S
deleted file mode 100644
index 07d9c5d86..000000000
--- a/lib/libc/arch/arm/sys/exect.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: exect.S,v 1.4 2003/08/07 16:42:04 agc Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)exect.s	5.1 (Berkeley) 4/23/90
- */
-
-#include "SYS.h"
-
-PSEUDO(exect,execve)
diff --git a/lib/libc/arch/arm/sys/fork.S b/lib/libc/arch/arm/sys/fork.S
deleted file mode 100644
index 3f1a80e91..000000000
--- a/lib/libc/arch/arm/sys/fork.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: fork.S,v 1.7 2013/08/16 22:28:05 matt Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)fork.s	5.1 (Berkeley) 4/23/90
- */
-
-#include "SYS.h"
-
-/*
- * pid = fork();
- *
- * On return from the SWI:
- * r1 == 0 in parent process, r1 == 1 in child process.
- * r0 == pid of child in parent, r0 == pid of parent in child.
- */
-
-_SYSCALL(__fork,fork)
-	subs	r1, r1, #1	/* r1 == 0xffffffff if parent, 0 if child */
-	ands	r0, r0, r1	/* r0 == 0 if child, else unchanged */
-	RET
-END(__fork)
diff --git a/lib/libc/arch/arm/sys/getcontext.S b/lib/libc/arch/arm/sys/getcontext.S
deleted file mode 100644
index 446477076..000000000
--- a/lib/libc/arch/arm/sys/getcontext.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.10 2013/09/03 00:30:19 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: getcontext.S,v 1.10 2013/09/03 00:30:19 matt Exp $")
-#endif /* SYSLIBC_SCCS && !lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext, _getcontext)
-#endif
-
-ENTRY(_getcontext)
-	mov	r2, r0			/* Must save argument pointer. */
-	SYSTRAP (getcontext)
-	_INVOKE_CERROR()
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-	str	lr, [r2, #_UC_REGS_PC]	/* Adjust PC. */
-#else
-	mov	r3, lr
-	str	r3, [r2, #_UC_REGS_PC]	/* Adjust PC. */
-#endif
-#ifdef SOFTFLOAT
-	/* Ahem. */
-	/* Judging from the softfloat code we should at least save
-	   the exception codes and rounding mode here. */
-#endif
-	movs	r0, #0
-	str	r0, [r2, #_UC_REGS_R0]	/* Return 0. */
-	RET
-END(_getcontext)
diff --git a/lib/libc/arch/arm/sys/pipe.S b/lib/libc/arch/arm/sys/pipe.S
deleted file mode 100644
index cc0d98b01..000000000
--- a/lib/libc/arch/arm/sys/pipe.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.8 2013/08/16 22:21:59 matt Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)pipe.s	5.1 (Berkeley) 4/23/90
- */
-
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-#endif
-
-ENTRY(_pipe)
-	mov	r2, r0
-	SYSTRAP(pipe)
-	_INVOKE_CERROR()
-	stmia	r2!, {r0-r1}
-	movs	r0, #0
-	RET
-END(_pipe)
diff --git a/lib/libc/arch/arm/sys/ptrace.S b/lib/libc/arch/arm/sys/ptrace.S
deleted file mode 100644
index a01078658..000000000
--- a/lib/libc/arch/arm/sys/ptrace.S
+++ /dev/null
@@ -1,86 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.12 2013/11/30 20:20:42 joerg Exp $ */
-
-/*-
- * 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.
- *
- *	from: @(#)ptrace.s	5.1 (Berkeley) 4/23/90
- */
-
-#include "SYS.h"
-
-ENTRY(ptrace)
-#ifdef _REENTRANT
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-	push	{r0-r3, lr}
-#else
-	push	{r0-r4}
-	mov	r4, lr
-#endif
-	sub	sp, sp, #4	/* align stack */
-	bl	PLT_SYM(_C_LABEL(__errno))
-	add	sp, sp, #4	/* unalign stack */
-	movs	r1, #0
-	str	r1, [r0]
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-	pop	{r0-r3, lr}
-#else
-	mov	lr, r4
-	pop	{r0-r4}
-#endif
-#else
-	push	{r0, r1}
-#ifdef __PIC__
-	/* Setup the GOT */
-	ldr	r0, .Lgot
-	adr	r1, .Lgot
-	add	r0, r0, r1
-	ldr	r1, .Lerrno
-	ldr	r1, [r0, r1]
-#else
-	ldr	r1, .Lerrno
-#endif /* __PIC__ */
-	movs	r0, #0
-	str	r0, [r1]
-	pop	{r0, r1}
-#endif /* _REENTRANT */
-
-	SYSTRAP(ptrace)
-	_INVOKE_CERROR()
-	RET
-
-#ifndef _REENTRANT
-#ifdef __PIC__
-	.align	0
-.Lgot:
-	.word	_C_LABEL(_GLOBAL_OFFSET_TABLE_) - .Lgot
-#endif /* __PIC__ */
-
-.Lerrno:
-	.word	PIC_SYM(_C_LABEL(errno), GOT)
-#endif /* !_REENTRANT */
-END(ptrace)
diff --git a/lib/libc/arch/arm/sys/sbrk.S b/lib/libc/arch/arm/sys/sbrk.S
deleted file mode 100644
index c9008dfe0..000000000
--- a/lib/libc/arch/arm/sys/sbrk.S
+++ /dev/null
@@ -1,80 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.12 2013/09/12 15:36:15 joerg Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)sbrk.s	5.1 (Berkeley) 4/23/90
- */
-
-#include "SYS.h"
-
-	.globl	_C_LABEL(_end)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-	.data
-	.align	0
-	.globl	_C_LABEL(__curbrk)
-	.hidden	_C_LABEL(__curbrk)
-	.type	_C_LABEL(__curbrk),#object
-_C_LABEL(__curbrk):
-	.word	_C_LABEL(_end)
-
-/*
- * Change the data segment size
- */
-ENTRY(_sbrk)
-	/* get address or offset to __curbrk */
-	ldr	r2, .Lcurbrk
-#ifdef __PIC__
-	add	r2, r2, pc	/* pc = &.LPIC0 */
-#endif
-
-	/* Get the current brk address */
-	ldr	r1, [r2]
-
-	/* Calculate new value */
-.LPIC0:	mov	r3, r0
-	adds	r0, r0, r1
-	SYSTRAP(break)
-	_INVOKE_CERROR()
-
-	/* Store new curbrk value */
-	ldr	r0, [r2]
-	adds	r1, r0, r3
-	str	r1, [r2]
-
-	/* Return old curbrk value */
-	RET
-
-	.align	0
-.Lcurbrk:
-	.word	REL_SYM(_C_LABEL(__curbrk), .LPIC0)
-END(_sbrk)
diff --git a/lib/libc/arch/arm/sys/shmat.S b/lib/libc/arch/arm/sys/shmat.S
deleted file mode 100644
index 13bdd0d87..000000000
--- a/lib/libc/arch/arm/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2000/12/29 20:14:04 bjh21 Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/arm/sys/syscall.S b/lib/libc/arch/arm/sys/syscall.S
deleted file mode 100644
index 43c826145..000000000
--- a/lib/libc/arch/arm/sys/syscall.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.4 2003/08/07 16:42:05 agc Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)syscall.s	5.1 (Berkeley) 4/23/90
- */
-
-#include "SYS.h"
-
-RSYSCALL(syscall)
diff --git a/lib/libc/arch/hppa/DEFS.h b/lib/libc/arch/hppa/DEFS.h
deleted file mode 100644
index 6e0125943..000000000
--- a/lib/libc/arch/hppa/DEFS.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: DEFS.h,v 1.1 2002/06/06 20:31:20 fredette Exp $	*/
-
-#include <machine/asm.h>
diff --git a/lib/libc/arch/hppa/Makefile.inc b/lib/libc/arch/hppa/Makefile.inc
deleted file mode 100644
index 56254ab7d..000000000
--- a/lib/libc/arch/hppa/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.10 2014/02/19 13:01:51 skrll Exp $
-
-#	$OpenBSD: Makefile.inc,v 1.3 1999/12/25 06:02:10 mickey Exp $
-
-SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
-
-SRCS+= bcopy.c
-
-CPPFLAGS+= -I.
diff --git a/lib/libc/arch/hppa/SYS.h b/lib/libc/arch/hppa/SYS.h
deleted file mode 100644
index 77287d3fe..000000000
--- a/lib/libc/arch/hppa/SYS.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.9 2014/03/06 19:02:58 skrll Exp $	*/
-
-/*	$OpenBSD: SYS.h,v 1.9 2001/09/20 20:52:09 millert Exp $	*/
-
-/*
- * Copyright (c) 1998-2002 Michael Shalayeff
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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 MIND
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/syscall.h>
-#include <machine/asm.h>
-#include <machine/vmparam.h>
-#undef _LOCORE
-#define _LOCORE
-#include <machine/frame.h>
-
-#define	SYSENTRY(x)	LEAF_ENTRY(x)
-#define	SYSEXIT(x)	EXIT(x)
-
-#define	SYSCALL(x)				!\
-	stw	%rp, HPPA_FRAME_ERP(%sr0,%sp)	!\
-	ldil	L%SYSCALLGATE, %r1		!\
-	ble	4(%sr2, %r1)			!\
-	ldi	__CONCAT(SYS_,x), %t1		!\
-	.import __cerror, code			!\
-	comb,<>	%r0, %t1, __cerror		!\
-	ldw	HPPA_FRAME_ERP(%sr0,%sp), %rp
-
-#define	PSEUDO(x,y)				!\
-SYSENTRY(x)					!\
-	SYSCALL(y)				!\
-	bv	%r0(%rp)			!\
-	nop					!\
-SYSEXIT(x)
-
-#define	PSEUDO_NOERROR(x,y)			!\
-SYSENTRY(x)					!\
-	stw	%rp, HPPA_FRAME_ERP(%sr0,%sp)	!\
-	ldil	L%SYSCALLGATE, %r1		!\
-	ble	4(%sr2, %r1)			!\
-	ldi	__CONCAT(SYS_,y), %t1		!\
-	ldw	HPPA_FRAME_ERP(%sr0,%sp), %rp	!\
-	bv	%r0(%rp)			!\
-	nop					!\
-SYSEXIT(x)
-
-#define RSYSCALL(x)		PSEUDO(x,x)
-#define	RSYSCALL_NOERROR(x)	PSEUDO_NOERROR(x,x)
-
-#ifdef WEAK_ALIAS
-#define WSYSCALL(weak,strong)		!\
-	WEAK_ALIAS(weak,strong)		!\
-	PSEUDO(strong,weak)
-#else
-#define WSYSCALL(weak,strong)		!\
-	PSEUDO(weak,weak)
-#endif
diff --git a/lib/libc/arch/hppa/gdtoa/Makefile.inc b/lib/libc/arch/hppa/gdtoa/Makefile.inc
deleted file mode 100644
index 1d786e010..000000000
--- a/lib/libc/arch/hppa/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/03/15 17:35:18 kleink Exp $
-
-SRCS+=	strtof.c
diff --git a/lib/libc/arch/hppa/gdtoa/arith.h b/lib/libc/arch/hppa/gdtoa/arith.h
deleted file mode 100644
index 4674f629c..000000000
--- a/lib/libc/arch/hppa/gdtoa/arith.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define IEEE_BIG_ENDIAN
diff --git a/lib/libc/arch/hppa/gdtoa/gd_qnan.h b/lib/libc/arch/hppa/gdtoa/gd_qnan.h
deleted file mode 100644
index b9e91e70f..000000000
--- a/lib/libc/arch/hppa/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define f_QNAN 0x7fa00000
-#define d_QNAN0 0x7ff40000
-#define d_QNAN1 0x0
-#ifdef _LP64
-#define ld_QNAN0 0x7fff4000
-#define ld_QNAN1 0x0
-#define ld_QNAN2 0x0
-#define ld_QNAN3 0x0
-#endif
diff --git a/lib/libc/arch/hppa/gen/Makefile.inc b/lib/libc/arch/hppa/gen/Makefile.inc
deleted file mode 100644
index 24ab0e5cc..000000000
--- a/lib/libc/arch/hppa/gen/Makefile.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.15 2006/06/28 14:46:32 drochner Exp $
-
-SRCS+=	bswap16.c bswap32.c bswap64.c
-SRCS+=	fabs.c
-SRCS+=	__sigsetjmp14.S __setjmp14.S _setjmp.S __longjmp14.c
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c infinityl_dbl_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
-
-SRCS+=	nanf.c
-
-SRCS+=	makecontext.c resumecontext.c _resumecontext.S swapcontext.S _lwp.c
-
-SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
-	fpsetround.c fpsetsticky.c
diff --git a/lib/libc/arch/hppa/gen/__longjmp14.c b/lib/libc/arch/hppa/gen/__longjmp14.c
deleted file mode 100644
index 04ab4ee73..000000000
--- a/lib/libc/arch/hppa/gen/__longjmp14.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*	$NetBSD: __longjmp14.c,v 1.5 2012/03/22 12:31:32 skrll Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christian Limpach.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define __LIBC12_SOURCE__
-#include <setjmp.h>
-#include <compat/include/setjmp.h>
-
-#include <stdio.h>
-#include <unistd.h>
-
-ssize_t _sys_write(int, void *, size_t);
-
-void
-__longjmp14(jmp_buf env, int val)
-{
-	ucontext_t uc;
-	struct sigcontext *sc = (void *)env;
-	register_t *regs = (void *)(sc + 1);
-	register register_t dp __asm("r27");
-
-	/* Ensure non-zero SP */
-	if (sc->sc_sp == 0)
-		goto err;
-
-	/* Make return value non-zero */
-	if (val == 0)
-		val = 1;
-
-	/* Copy callee-saved regs */
-	regs -= 3;
-	uc.uc_mcontext.__gregs[3] = regs[3];
-	uc.uc_mcontext.__gregs[4] = regs[4];
-	uc.uc_mcontext.__gregs[5] = regs[5];
-	uc.uc_mcontext.__gregs[6] = regs[6];
-	uc.uc_mcontext.__gregs[7] = regs[7];
-	uc.uc_mcontext.__gregs[8] = regs[8];
-	uc.uc_mcontext.__gregs[9] = regs[9];
-	uc.uc_mcontext.__gregs[10] = regs[10];
-	uc.uc_mcontext.__gregs[11] = regs[11];
-	uc.uc_mcontext.__gregs[12] = regs[12];
-	uc.uc_mcontext.__gregs[13] = regs[13];
-	uc.uc_mcontext.__gregs[14] = regs[14];
-	uc.uc_mcontext.__gregs[15] = regs[15];
-	uc.uc_mcontext.__gregs[16] = regs[16];
-	uc.uc_mcontext.__gregs[17] = regs[17];
-	uc.uc_mcontext.__gregs[18] = regs[18];
-
-	/* Preserve the current value of DP */
-	/* LINTED dp is r27, so is "initialized" */
-	uc.uc_mcontext.__gregs[27] = dp;
-
-	/* Set the desired return value. */
-	uc.uc_mcontext.__gregs[_REG_RET0] = val;
-
-	/*
-	 * Set _UC_{SET,CLR}STACK according to SS_ONSTACK.
-	 *
-	 * Restore the signal mask with sigprocmask() instead of _UC_SIGMASK,
-	 * since libpthread may want to interpose on signal handling.
-	 */
-	uc.uc_flags = _UC_CPU | (sc->sc_onstack ? _UC_SETSTACK : _UC_CLRSTACK);
-
-	sigprocmask(SIG_SETMASK, &sc->sc_mask, NULL);
-
-	/* Clear uc_link */
-	uc.uc_link = 0;
-
-	/* Copy signal mask */
-	uc.uc_sigmask = sc->sc_mask;
-
-	/* Copy special regs */
-	uc.uc_mcontext.__gregs[_REG_PSW] = sc->sc_ps;
-	uc.uc_mcontext.__gregs[_REG_SP] = sc->sc_sp;
-	uc.uc_mcontext.__gregs[_REG_PCSQH] = sc->sc_pcsqh;
-	uc.uc_mcontext.__gregs[_REG_PCOQH] = sc->sc_pcoqh;
-	uc.uc_mcontext.__gregs[_REG_PCSQT] = sc->sc_pcsqt;
-	uc.uc_mcontext.__gregs[_REG_PCOQT] = sc->sc_pcoqt;
-
-	setcontext(&uc);
- err:
-	longjmperror();
-	abort();
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/hppa/gen/__setjmp14.S b/lib/libc/arch/hppa/gen/__setjmp14.S
deleted file mode 100644
index 4777b21f8..000000000
--- a/lib/libc/arch/hppa/gen/__setjmp14.S
+++ /dev/null
@@ -1,131 +0,0 @@
-/*	$NetBSD: __setjmp14.S,v 1.5 2008/04/28 20:22:55 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matthew Fredette.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-/* XXX fredette - this is awful */
-#define _LOCORE
-#include <machine/frame.h>
-#undef _LOCORE
-#include <machine/psl.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __setjmp14.S,v 1.5 2008/04/28 20:22:55 martin Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * 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 a struct sigcontext, see <signal.h>
- */
-
-ENTRY(__setjmp14,0)
-	/* Finish our stack frame. */
-	stw	%rp, HPPA_FRAME_CRP(%sp)
-	stw	%arg0, HPPA_FRAME_ARG(0)(%sp)
-
-	/* A sigcontext is at the beginning of our jmp_buf. */
-	stw	%r0, 4(%arg0)		; unused word (old style signal mask)
-	stw	%sp, 8(%arg0)		; sc.sc_sp = %sp
-	stw	%r0, 16(%arg0)		; sc.sc_ap = NULL
-	mfsp	%sr0, %r1
-	stw	%r1, 20(%arg0)		; sc.sc_pcsqh = %sr0
-	stw	%rp, 24(%arg0)		; sc.sc_pcoqh = %rp
-	stw	%r1, 28(%arg0)		; sc.sc_pcsqh = %sr0
-	ldo	4(%rp), %r1
-	stw	%r1, 32(%arg0)		; sc.sc_pcoqt = %rp + 4
-#define PSW_MBS (PSW_C|PSW_Q|PSW_P|PSW_D|PSW_I)
-	ldil	L%PSW_MBS, %r1
-	ldo	R%PSW_MBS(%r1), %r1
-	stw	%r1, 36(%arg0)		; set sc.sc_ps
-
-	/* We store all callee-saved registers after the sigcontext. */
-	ldo	56(%arg0), %r1
-	stwm	%r3, 4(%r1)
-	stwm	%r4, 4(%r1)
-	stwm	%r5, 4(%r1)
-	stwm	%r6, 4(%r1)
-	stwm	%r7, 4(%r1)
-	stwm	%r8, 4(%r1)
-	stwm	%r9, 4(%r1)
-	stwm	%r10, 4(%r1)
-	stwm	%r11, 4(%r1)
-	stwm	%r12, 4(%r1)
-	stwm	%r13, 4(%r1)
-	stwm	%r14, 4(%r1)
-	stwm	%r15, 4(%r1)
-	stwm	%r16, 4(%r1)
-	stwm	%r17, 4(%r1)
-	stwm	%r18, 4(%r1)
-
-	/*
-	 * Start the stack frame for the calls we will make.
-	 * The minimum frame is 48 bytes, but the stack must
-	 * always be 64-byte aligned; we use the top 4 bytes
-	 * to save our caller's %r3, and the following 12 bytes
-	 * as the stack_t for our sigaltstack call.
-	 * XXX - this assumes that sizeof(stack_t) <= 12
-	 */
-	copy	%r3, %r1
-	copy	%sp, %r3
-	stwm	%r1, HPPA_FRAME_SIZE(%sp)
-
-	/* Get signal stack info. */
-	ldo	4(%r3), %arg1		; set up oss
-	bl	__sigaltstack14, %rp
-	copy	%r0, %arg0		; set up ss
-
-	/* Recover our jmp_buf and extract SS_ONSTACK */
-	ldw	HPPA_FRAME_ARG(0)(%r3), %arg0
-	ldw	12(%r3), %r1		; get ss_flags
-	ldi	1, %r20			; SS_ONSTACK
-	and	%r1, %r20, %r1
-	stw	%r1, 0(%arg0)		; sc.sc_onstack
-	
-	/* Get the signal mask. */
-	ldo	40(%arg0), %arg2	; oset = &sc.sc_mask	
-	copy	%r0, %arg1		; set = NULL
-	bl	__sigprocmask14, %rp
-	copy	%r0, %arg0		; action = 0 <ignored>
-
-	/* Return 0. */
-	ldo	HPPA_FRAME_SIZE(%r3),%sp
-	ldwm	-HPPA_FRAME_SIZE(%sp),%r3
-	ldw	HPPA_FRAME_CRP(%sp), %rp
-	bv	%r0(%rp)
-	copy	%r0, %ret0
-EXIT(__setjmp14)
-
-	.end
diff --git a/lib/libc/arch/hppa/gen/__sigsetjmp14.S b/lib/libc/arch/hppa/gen/__sigsetjmp14.S
deleted file mode 100644
index 6e1f154e3..000000000
--- a/lib/libc/arch/hppa/gen/__sigsetjmp14.S
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: __sigsetjmp14.S,v 1.2 2008/04/28 20:22:55 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matthew Fredette.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __sigsetjmp14.S,v 1.2 2008/04/28 20:22:55 martin Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * C library -- sigsetjmp, siglongjmp
- *
- *	siglongjmp(a,v)
- * will generate a "return(v)" from
- * the last call to
- *	sigsetjmp(a,m)
- * by restoring registers from the stack,
- * The previous signal state is restored if 'm' was non-zero.
- */
-
-/* grab _JBLEN */
-#include <machine/setjmp.h>
-
-ENTRY(__sigsetjmp14,0)
-	stw	%arg1, (_JBLEN * 4)(%arg0)	; save mask at end of area
-	add,<>	%r0, %arg0, %r0
-	b,n	_setjmp
-	b,n	__setjmp14
-EXIT(__sigsetjmp14)
-
-
-ENTRY(__siglongjmp14,0)
-	ldw	(_JBLEN * 4)(%arg0), %r1
-	add,<>	%r0, %r1, %r0
-	b,n	_longjmp
-	b,n	__longjmp14
-EXIT(__siglongjmp14)
-
-	.end
diff --git a/lib/libc/arch/hppa/gen/_lwp.c b/lib/libc/arch/hppa/gen/_lwp.c
deleted file mode 100644
index 631ce8b66..000000000
--- a/lib/libc/arch/hppa/gen/_lwp.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.5 2011/02/24 04:28:42 joerg Exp $	*/
-
-/*
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Wayne Knowles
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.5 2011/02/24 04:28:42 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-#include <machine/frame.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *),
-	void *arg, void *private, caddr_t stack_base, size_t stack_size)
-{
-	caddr_t sp;
-	__greg_t *gr;
-	__greg_t *gp;
-	__greg_t fp;
-
-	getcontext(u);
-	gr = u->uc_mcontext.__gregs;
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-	sp = stack_base + HPPA_FRAME_SIZE;
-
-	fp = (__greg_t)start;
-	if (fp & 2) {
-		gp = (__greg_t *)(fp & ~3);
-		fp = gp[0];
-		gr[_REG_R19] = gp[1];
-	}
-	gr[_REG_PCOQH] = fp | HPPA_PC_PRIV_USER;
-	gr[_REG_PCOQT] = (fp + 4) | HPPA_PC_PRIV_USER;
-	gr[_REG_RP] = (__greg_t) _lwp_exit;
-	gr[_REG_ARG0] = (__greg_t) arg;
-	gr[_REG_SP] = (__greg_t) sp;
-	gr[_REG_CR27] = (__greg_t) private;
-}
diff --git a/lib/libc/arch/hppa/gen/_resumecontext.S b/lib/libc/arch/hppa/gen/_resumecontext.S
deleted file mode 100644
index 2209e13ed..000000000
--- a/lib/libc/arch/hppa/gen/_resumecontext.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: _resumecontext.S,v 1.4 2013/09/12 15:36:15 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Wayne Knowles.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#include <machine/asm.h>
-#include <machine/mcontext.h>
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: _resumecontext.S,v 1.4 2013/09/12 15:36:15 joerg Exp $")
-#endif /* SYSLIBC_SCCS && !lint */
-
-	.import	_resumecontext, code
-
-LEAF_ENTRY_NOPROFILE(__resumecontext)
-#ifdef __PIC__
-	ldw	HPPA_FRAME_EDP(%sp), %r19
-	addil	LT%_C_LABEL(_resumecontext), %r19
-	ldw	RT%_C_LABEL(_resumecontext)(%r1), %r1
-#else
-	ldil	L%_C_LABEL(_resumecontext), %r1
-	ldo	R%_C_LABEL(_resumecontext)(%r1), %r1
-#endif
-	bv,n	%r0(%r1)
-EXIT(__resumecontext)
-	.end
diff --git a/lib/libc/arch/hppa/gen/_setjmp.S b/lib/libc/arch/hppa/gen/_setjmp.S
deleted file mode 100644
index 9d7c74cb4..000000000
--- a/lib/libc/arch/hppa/gen/_setjmp.S
+++ /dev/null
@@ -1,128 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.4 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matthew Fredette.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-/* XXX fredette - this is awful */
-#define _LOCORE
-#include <machine/frame.h>
-#undef _LOCORE
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: _setjmp.S,v 1.4 2008/04/28 20:22:56 martin Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * 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 a struct sigcontext, see <signal.h>
- */
-
-ENTRY(_setjmp,0)
-	/* A sigcontext is at the beginning of our jmp_buf. */
-	stw	%r0, 0(%arg0)		; no onstack
-	stw	%r0, 4(%arg0)		; unused word (old style signal mask)
-	stw	%sp, 8(%arg0)		; sc.sc_sp = %sp
-	stw	%r0, 16(%arg0)		; sc.sc_ap = NULL
-	mfsp	%sr0, %r1
-	stw	%r1, 20(%arg0)		; sc.sc_pcsqh = %sr0
-	stw	%rp, 24(%arg0)		; sc.sc_pcoqh = %rp
-	stw	%r1, 28(%arg0)		; sc.sc_pcsqh = %sr0
-	ldo	4(%rp), %r1
-	stw	%r1, 32(%arg0)		; sc.sc_pcoqt = %rp + 4
-	stw	%r0, 36(%arg0)		; set sc.sc_ps
-
-	/* We store all callee-saved registers after the sigcontext. */
-	ldo	56(%arg0), %r1
-	stwm	%r3, 4(%r1)
-	stwm	%r4, 4(%r1)
-	stwm	%r5, 4(%r1)
-	stwm	%r6, 4(%r1)
-	stwm	%r7, 4(%r1)
-	stwm	%r8, 4(%r1)
-	stwm	%r9, 4(%r1)
-	stwm	%r10, 4(%r1)
-	stwm	%r11, 4(%r1)
-	stwm	%r12, 4(%r1)
-	stwm	%r13, 4(%r1)
-	stwm	%r14, 4(%r1)
-	stwm	%r15, 4(%r1)
-	stwm	%r16, 4(%r1)
-	stwm	%r17, 4(%r1)
-	stwm	%r18, 4(%r1)
-
-	/* Return 0. */
-	bv	%r0(%rp)
-	copy	%r0, %ret0
-EXIT(_setjmp)
-
-ENTRY(_longjmp,0)
-	ldw	8(%arg0), %r1		; ensure non-zero SP
-	combt,=,n	%r0, %r1, botch	; oops!
-	add,<>	%r0, %arg1, %ret0	; ensure return value non-zero
-	ldi	1, %ret0
-
-	/* restore callee-saved registers */
-	ldo	56(%arg0), %r1
-	ldwm	4(%r1), %r3
-	ldwm	4(%r1), %r4
-	ldwm	4(%r1), %r5
-	ldwm	4(%r1), %r6
-	ldwm	4(%r1), %r7
-	ldwm	4(%r1), %r8
-	ldwm	4(%r1), %r9
-	ldwm	4(%r1), %r10
-	ldwm	4(%r1), %r11
-	ldwm	4(%r1), %r12
-	ldwm	4(%r1), %r13
-	ldwm	4(%r1), %r14
-	ldwm	4(%r1), %r15
-	ldwm	4(%r1), %r16
-	ldwm	4(%r1), %r17
-	ldwm	4(%r1), %r18
-
-	/* restore the rest */
-	ldw	8(%arg0), %sp
-	ldw	24(%arg0), %rp
-	bv	%r0(%rp)
-	nop
-botch:
-	bl	longjmperror, %rp
-	nop
-	bl	abort, %rp
-	nop
-EXIT(_longjmp)
-
-	.end
diff --git a/lib/libc/arch/hppa/gen/fabs.c b/lib/libc/arch/hppa/gen/fabs.c
deleted file mode 100644
index f08f504c2..000000000
--- a/lib/libc/arch/hppa/gen/fabs.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*	$NetBSD: fabs.c,v 1.4 2005/12/24 21:42:32 perry Exp $	*/
-
-/*	$OpenBSD: fabs.c,v 1.3 2002/10/21 18:41:05 mickey Exp $	*/
-
-/*
- * Written by Miodrag Vallat.  Public domain
- */
-
-#include <math.h>
-
-double
-fabs(double val)
-{
-
-	__asm volatile("fabs,dbl %0,%0" : "+f" (val));
-	return (val);
-}
diff --git a/lib/libc/arch/hppa/gen/flt_rounds.c b/lib/libc/arch/hppa/gen/flt_rounds.c
deleted file mode 100644
index 179fb60b0..000000000
--- a/lib/libc/arch/hppa/gen/flt_rounds.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*	$NetBSD: flt_rounds.c,v 1.5 2012/03/23 09:34:09 skrll Exp $	*/
-
-/*	$OpenBSD: flt_rounds.c,v 1.3 2002/10/21 18:41:05 mickey Exp $	*/
-
-/*
- * Written by Miodrag Vallat.  Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.5 2012/03/23 09:34:09 skrll Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <machine/float.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	0,	/* round to zero */
-	2,	/* round to positive infinity */
-	3	/* round to negative infinity */
-};
-
-int
-__flt_rounds(void)
-{
-	uint64_t fpsr;
-
-	__asm volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
-	return map[(unsigned int)(fpsr >> 41) & 0x03];
-}
diff --git a/lib/libc/arch/hppa/gen/fpgetmask.c b/lib/libc/arch/hppa/gen/fpgetmask.c
deleted file mode 100644
index cedf4797a..000000000
--- a/lib/libc/arch/hppa/gen/fpgetmask.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*	$NetBSD: fpgetmask.c,v 1.5 2012/03/23 09:34:09 skrll Exp $	*/
-
-/*	$OpenBSD: fpgetmask.c,v 1.3 2002/10/21 18:41:05 mickey Exp $	*/
-
-/*
- * Written by Miodrag Vallat.  Public domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetmask.c,v 1.5 2012/03/23 09:34:09 skrll Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_except
-fpgetmask(void)
-{
-	uint64_t fpsr;
-
-	__asm volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
-	return ((fp_except)(fpsr >> 32) & 0x1f);
-}
diff --git a/lib/libc/arch/hppa/gen/fpgetround.c b/lib/libc/arch/hppa/gen/fpgetround.c
deleted file mode 100644
index f0feb3167..000000000
--- a/lib/libc/arch/hppa/gen/fpgetround.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*	$NetBSD: fpgetround.c,v 1.5 2012/03/23 09:34:09 skrll Exp $	*/
-
-/*	$OpenBSD: fpgetround.c,v 1.3 2002/10/21 18:41:05 mickey Exp $	*/
-
-/*
- * Written by Miodrag Vallat.  Public domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.5 2012/03/23 09:34:09 skrll Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_rnd
-fpgetround(void)
-{
-	uint64_t fpsr;
-
-	__asm volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
-	return ((fp_rnd)(fpsr >> 41) & 0x3);
-}
diff --git a/lib/libc/arch/hppa/gen/fpgetsticky.c b/lib/libc/arch/hppa/gen/fpgetsticky.c
deleted file mode 100644
index 9e424abeb..000000000
--- a/lib/libc/arch/hppa/gen/fpgetsticky.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*	$NetBSD: fpgetsticky.c,v 1.5 2012/03/23 09:34:09 skrll Exp $	*/
-
-/*	$OpenBSD: fpgetsticky.c,v 1.3 2002/10/21 18:41:05 mickey Exp $	*/
-
-/*
- * Written by Miodrag Vallat.  Public domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetsticky.c,v 1.5 2012/03/23 09:34:09 skrll Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_except
-fpgetsticky(void)
-{
-	uint64_t fpsr;
-
-	__asm volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
-	return ((fp_except)(fpsr >> 59) & 0x1f);
-}
diff --git a/lib/libc/arch/hppa/gen/fpsetmask.c b/lib/libc/arch/hppa/gen/fpsetmask.c
deleted file mode 100644
index b1761b07e..000000000
--- a/lib/libc/arch/hppa/gen/fpsetmask.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*	$NetBSD: fpsetmask.c,v 1.6 2012/03/23 09:34:09 skrll Exp $	*/
-
-/*	$OpenBSD: fpsetmask.c,v 1.4 2004/01/05 06:06:16 otto Exp $	*/
-
-/*
- * Written by Miodrag Vallat.  Public domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetmask.c,v 1.6 2012/03/23 09:34:09 skrll Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_except
-fpsetmask(fp_except mask)
-{
-	uint64_t fpsr;
-	fp_except old;
-
-	__asm volatile("fstd %%fr0,0(%1)" : "=m"(fpsr) : "r"(&fpsr) : "memory");
-	old = (fp_except)(fpsr >> 32) & 0x1f;
-	fpsr = (fpsr & 0xffffffe000000000LL) | ((uint64_t)(mask & 0x1f) << 32);
-	__asm volatile("fldd 0(%0),%%fr0" : : "r"(&fpsr) : "memory");
-	return (old);
-}
diff --git a/lib/libc/arch/hppa/gen/fpsetround.c b/lib/libc/arch/hppa/gen/fpsetround.c
deleted file mode 100644
index f9f631666..000000000
--- a/lib/libc/arch/hppa/gen/fpsetround.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*	$NetBSD: fpsetround.c,v 1.6 2012/03/23 09:34:09 skrll Exp $	*/
-
-/*	$OpenBSD: fpsetround.c,v 1.3 2002/10/21 18:41:05 mickey Exp $	*/
-
-/*
- * Written by Miodrag Vallat.  Public domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.6 2012/03/23 09:34:09 skrll Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_rnd
-fpsetround(fp_rnd rnd_dir)
-{
-	uint64_t fpsr;
-	fp_rnd old;
-
-	__asm volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr) : "memory");
-	old = (fp_rnd)(fpsr >> 41) & 0x03;
-	fpsr = (fpsr & 0xfffff9ff00000000LL) |
-	    ((uint64_t)(rnd_dir & 0x03) << 41);
-	__asm volatile("fldd 0(%0),%%fr0" : : "r" (&fpsr) : "memory");
-	return (old);
-}
diff --git a/lib/libc/arch/hppa/gen/fpsetsticky.c b/lib/libc/arch/hppa/gen/fpsetsticky.c
deleted file mode 100644
index c9dce7a73..000000000
--- a/lib/libc/arch/hppa/gen/fpsetsticky.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*	$NetBSD: fpsetsticky.c,v 1.6 2012/03/23 09:34:09 skrll Exp $	*/
-
-/*	$OpenBSD: fpsetsticky.c,v 1.4 2004/01/05 06:06:16 otto Exp $	*/
-
-/*
- * Written by Miodrag Vallat.  Public domain
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetsticky.c,v 1.6 2012/03/23 09:34:09 skrll Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_except
-fpsetsticky(fp_except mask)
-{
-	uint64_t fpsr;
-	fp_except old;
-
-	__asm volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr) : "memory");
-	old = (fp_except)(fpsr >> 59) & 0x1f;
-	fpsr = (fpsr & 0x07ffffff00000000LL) | ((uint64_t)(mask & 0x1f) << 59);
-	__asm volatile("fldd 0(%0),%%fr0" : : "r" (&fpsr) : "memory");
-
-	return (old);
-}
diff --git a/lib/libc/arch/hppa/gen/makecontext.c b/lib/libc/arch/hppa/gen/makecontext.c
deleted file mode 100644
index 5a03f2388..000000000
--- a/lib/libc/arch/hppa/gen/makecontext.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.6 2012/03/22 12:31:32 skrll Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.6 2012/03/22 12:31:32 skrll Exp $");
-#endif
-
-#include <inttypes.h>
-#include <stddef.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#include <stdarg.h>
-
-#include <sys/types.h>
-#include <machine/frame.h>
-
-void __resumecontext(void) __dead;
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	__greg_t *gp, rp, fp;
-	register __greg_t dp __asm("r27");
-	uintptr_t *sp;
-	int i;
-	va_list ap;
-
-	/* LINTED uintptr_t is safe */
-	sp  = (uintptr_t *)ucp->uc_stack.ss_sp;
-	/* LINTED uintptr_t is safe */
-	sp += 16;			/* standard frame */
-	sp += (argc >= 4 ? argc : 4);	/* Make room for >=4 arguments. */
-	sp  = (uintptr_t *)
-	      ((uintptr_t)(sp + 16) & ~0x3f);	/* Align on 64-byte boundary. */
-
-	/* Save away the registers that we'll need. */
-	gr[_REG_SP] = (__greg_t)sp;
-	rp = (__greg_t)__resumecontext;
-	if (rp & 2) {
-		gp = (__greg_t *)(rp & ~3);
-		rp = gp[0];
-		sp[-8] = gp[1];
-	}
-	gr[_REG_RP] = rp;
-	fp = (__greg_t)func;
-	if (fp & 2) {
-		gp = (__greg_t *)(fp & ~3);
-		fp = gp[0];
-		gr[_REG_R19] = gp[1];
-	}
-	gr[_REG_PCOQH] = fp | HPPA_PC_PRIV_USER;
-	gr[_REG_PCOQT] = (fp + 4) | HPPA_PC_PRIV_USER;
-	/* LINTED dp is reg27, ref. above, so initialized */
-	gr[_REG_DP] = dp;
-
-	/* Construct argument list. */
-	va_start(ap, argc);
-	/* Up to the first four arguments are passed in %arg0-3. */
-	for (i = 0; i < argc && i < 4; i++) {
-		/* LINTED uintptr_t is safe */
-		gr[_REG_ARG0 - i] = va_arg(ap, uintptr_t);
-	}
-	/* Pass remaining arguments on the stack below the %arg0-3 gap. */
-	for (; i < argc; i++) {
-		/* LINTED uintptr_t is safe */
-		sp[-9 - i] = va_arg(ap, uintptr_t);
-	}
-	va_end(ap);
-}
diff --git a/lib/libc/arch/hppa/gen/nanf.c b/lib/libc/arch/hppa/gen/nanf.c
deleted file mode 100644
index b95319bf9..000000000
--- a/lib/libc/arch/hppa/gen/nanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: nanf.c,v 1.2 2009/02/22 01:34:01 martin Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.2 2009/02/22 01:34:01 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-		{ { 0x7f, 0xa0,    0,    0 } };
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/hppa/gen/resumecontext.c b/lib/libc/arch/hppa/gen/resumecontext.c
deleted file mode 100644
index c01ed2f17..000000000
--- a/lib/libc/arch/hppa/gen/resumecontext.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: resumecontext.c,v 1.5 2013/08/24 07:12:13 skrll Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: resumecontext.c,v 1.5 2013/08/24 07:12:13 skrll Exp $");
-#endif
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <ucontext.h>
-#include <unistd.h>
-#include "extern.h"
-
-void
-_resumecontext(void)
-{
-	ucontext_t uct;
-
-	(void)getcontext(&uct);
-	if (uct.uc_link == NULL)
-		exit(0);
-	(void)setcontext(uct.uc_link);
-	_exit(-1);
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/hppa/gen/swapcontext.S b/lib/libc/arch/hppa/gen/swapcontext.S
deleted file mode 100644
index 7d20617ba..000000000
--- a/lib/libc/arch/hppa/gen/swapcontext.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.6 2014/02/19 13:01:51 skrll Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#include <machine/mcontext.h>
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: swapcontext.S,v 1.6 2014/02/19 13:01:51 skrll Exp $")
-#endif /* SYSLIBC_SCCS && !lint */
-
-LEAF_ENTRY(swapcontext)
-	stw	%rp, HPPA_FRAME_CRP(%sp)
-	stw	%arg0, HPPA_FRAME_ARG(0)(%sp)
-	stw	%arg1, HPPA_FRAME_ARG(1)(%sp)
-	SYSCALL(getcontext)
-
-	ldw	HPPA_FRAME_ARG(0)(%sp), %arg1
-	ldw	HPPA_FRAME_ARG(1)(%sp), %arg0
-
-	ldw	HPPA_FRAME_CRP(%sp), %rp
-	ldo	4(%rp), %r1
-	stw	%r1, (_OFFSETOF_UC_GREGS + _REG_PCOQT * SZREG)(%arg1)
-	stw	%rp, (_OFFSETOF_UC_GREGS + _REG_PCOQH * SZREG)(%arg1)
-	bl	setcontext, %rp
-	stw	%r0, (_OFFSETOF_UC_GREGS + _REG_RET0 * SZREG)(%arg1)
-
-	ldw	HPPA_FRAME_CRP(%sp), %rp
-	bv,n	%r0(%rp)
-EXIT(swapcontext)
-	.end
diff --git a/lib/libc/arch/hppa/genassym.cf b/lib/libc/arch/hppa/genassym.cf
deleted file mode 100644
index ac3221044..000000000
--- a/lib/libc/arch/hppa/genassym.cf
+++ /dev/null
@@ -1,39 +0,0 @@
-#	$NetBSD: genassym.cf,v 1.1 2014/02/19 13:01:51 skrll Exp $
-
-#
-# Copyright (c) 2014 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Nick Hudson
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-include <sys/types.h>
-include <ucontext.h>
-
-define _REG_PCOQH	_REG_PCOQH
-define _REG_PCOQT	_REG_PCOQT
-define _REG_RET0	_REG_RET0
-
-define _OFFSETOF_UC_GREGS	offsetof(ucontext_t, uc_mcontext.__gregs[0])
diff --git a/lib/libc/arch/hppa/net/Makefile.inc b/lib/libc/arch/hppa/net/Makefile.inc
deleted file mode 100644
index e3e9f6774..000000000
--- a/lib/libc/arch/hppa/net/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2002/06/06 20:31:21 fredette Exp $
-
-SRCS += ntohl.c ntohs.c htons.c htonl.c
-
diff --git a/lib/libc/arch/hppa/stdlib/Makefile.inc b/lib/libc/arch/hppa/stdlib/Makefile.inc
deleted file mode 100644
index d1dda0262..000000000
--- a/lib/libc/arch/hppa/stdlib/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 2009/07/31 20:39:59 dsl Exp $
diff --git a/lib/libc/arch/hppa/string/Makefile.inc b/lib/libc/arch/hppa/string/Makefile.inc
deleted file mode 100644
index f00669afd..000000000
--- a/lib/libc/arch/hppa/string/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2009/07/30 20:57:16 dsl Exp $
-
-#	$OpenBSD: Makefile.inc,v 1.4 1999/09/14 00:46:18 mickey Exp $
-
-SRCS+=	bcmp.S bzero.S ffs.S
-
-# NetBSD doesn't currently let archs supply a strlcpy.S.
-# plus, the one that fredette made is untested.
-#SRCS+=	strlcpy.S
-
diff --git a/lib/libc/arch/hppa/string/bcmp.S b/lib/libc/arch/hppa/string/bcmp.S
deleted file mode 100644
index 6e2263fe8..000000000
--- a/lib/libc/arch/hppa/string/bcmp.S
+++ /dev/null
@@ -1,84 +0,0 @@
-/*	$NetBSD: bcmp.S,v 1.2 2003/10/06 05:30:21 matt Exp $	*/
-
-/*	$OpenBSD: bcmp.S,v 1.3 2001/06/04 23:14:02 mickey Exp $	*/
-
-/*
- * Copyright 1996 1995 by Open Software Foundation, Inc.   
- *              All Rights Reserved 
- *  
- * Permission to use, copy, modify, and distribute this software and 
- * its documentation for any purpose and without fee is hereby granted, 
- * provided that the above copyright notice appears in all copies and 
- * that both the copyright notice and this permission notice appear in 
- * supporting documentation. 
- *  
- * OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE 
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
- * FOR A PARTICULAR PURPOSE. 
- *  
- * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR 
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM 
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT, 
- * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION 
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
- */
-/*
- *  (c) Copyright 1988 HEWLETT-PACKARD COMPANY
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *  for any purpose is hereby granted without fee, provided that
- *  the above copyright notice and this notice appears in all
- *  copies, and that the name of Hewlett-Packard Company not be
- *  used in advertising or publicity pertaining to distribution
- *  of the software without specific, written prior permission.
- *  Hewlett-Packard Company makes no representations about the
- *  suitability of this software for any purpose.
- */
-/*
- * Copyright (c) 1990,1991,1994 The University of Utah and
- * the Computer Systems Laboratory (CSL).  All rights reserved.
- *
- * THE UNIVERSITY OF UTAH AND CSL PROVIDE THIS SOFTWARE IN ITS "AS IS"
- * CONDITION, AND DISCLAIM ANY LIABILITY OF ANY KIND FOR ANY DAMAGES
- * WHATSOEVER RESULTING FROM ITS USE.
- *
- * CSL requests users of this software to return to csl-dist@cs.utah.edu any
- * improvements that they make and grant CSL redistribution rights.
- *
- * 	Utah Hdr: movc.s 1.26 94/12/14
- */
-
-#include <machine/asm.h>
-
-#ifdef SYSLIBC_SCCS
-	.text
-	.asciz "$OpenBSD: bcmp.S,v 1.3 2001/06/04 23:14:02 mickey Exp $"
-	.align	4
-#endif
-
-/*
- * int
- * bcmp(src, dst, count)
- *	vaddr_t	src;
- *	vaddr_t	dst;
- *	size_t	count;
- */
-LEAF_ENTRY(bcmp)
-        comb,>= %r0,%arg2,$bcmp_exit
-	copy	%t1,%t2
-
-$bcmp_loop:
-	ldbs,ma	1(%arg0),%t1
-	ldbs,ma	1(%arg1),%t2
-	comb,<>,n %t1,%t2,$bcmp_exit
-	addib,<> -1,%arg2,$bcmp_loop
-	nop
-
-$bcmp_exit:
-	bv	0(%r2)
-	sub	%t1,%t2,%ret0
-
-EXIT(bcmp)
-
diff --git a/lib/libc/arch/hppa/string/bzero.S b/lib/libc/arch/hppa/string/bzero.S
deleted file mode 100644
index c14de6205..000000000
--- a/lib/libc/arch/hppa/string/bzero.S
+++ /dev/null
@@ -1,119 +0,0 @@
-/*	$NetBSD: bzero.S,v 1.2 2003/10/06 05:30:21 matt Exp $	*/
-
-/*	$OpenBSD: bzero.S,v 1.3 2001/06/04 23:14:02 mickey Exp $	*/
-
-/*
- *  (c) Copyright 1988 HEWLETT-PACKARD COMPANY
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *  for any purpose is hereby granted without fee, provided that
- *  the above copyright notice and this notice appears in all
- *  copies, and that the name of Hewlett-Packard Company not be
- *  used in advertising or publicity pertaining to distribution
- *  of the software without specific, written prior permission.
- *  Hewlett-Packard Company makes no representations about the
- *  suitability of this software for any purpose.
- */
-/*
- * Copyright (c) 1990,1994 The University of Utah and
- * the Computer Systems Laboratory (CSL).  All rights reserved.
- *
- * THE UNIVERSITY OF UTAH AND CSL PROVIDE THIS SOFTWARE IN ITS "AS IS"
- * CONDITION, AND DISCLAIM ANY LIABILITY OF ANY KIND FOR ANY DAMAGES
- * WHATSOEVER RESULTING FROM ITS USE.
- *
- * CSL requests users of this software to return to csl-dist@cs.utah.edu any
- * improvements that they make and grant CSL redistribution rights.
- *
- * 	Utah $Hdr: bzero.s 1.9 94/12/14$
- *	Author: Bob Wheeler, University of Utah CSL
- */
-
-#include <machine/asm.h>
-
-#ifdef SYSLIBC_SCCS
-	.text
-	.asciz "$OpenBSD: bzero.S,v 1.3 2001/06/04 23:14:02 mickey Exp $"
-	.align	4
-#endif
-
-/*
- * void 
- * bzero(dst, count)
- *	void *dst;
- *	size_t count;
- */
-LEAF_ENTRY(bzero)
-        comb,>=,n %r0,%arg1,$bzero_exit
-
-	/*
-	 * If we need to clear less than a word do it a byte at a time
-	 */
-
-	comib,>>,n 4,%arg1,$bzero_bytes
-
-	/*
-	 * Since we are only clearing memory the alignment restrictions 
-	 * are simplified. Figure out how many "extra" bytes we need to
-	 * store with stbys.
-	 */
-
-        extru   %arg0,31,2,%t1
-        add     %arg1,%t1,%arg1
-
-	/*
-	 * We will zero the destination in blocks of 16 bytes as long as we 
-	 * can and then we'll go to the 4 byte moves.
-	 */
-
-	comib,>>=	15, %arg1, $bzero_word
-	addi		-16, %arg1, %arg1
-
-$bzero_loop_16:
-        stbys,b,m %r0,4(%arg0)
-        stwm    %r0,4(%arg0)
-        stwm    %r0,4(%arg0)
-        stwm    %r0,4(%arg0)
-	comib,<<	15, %arg1, $bzero_loop_16
-	addi		-16, %arg1, %arg1
-
-	/*
-	 * see if there is anything left that needs to be zeroed in a word 
-	 * move. Since the count was decremented by 16, add 12 to test if 
-	 * there are any full word moves left to do.
-	 */
-
-$bzero_word:
-        addib,<,n 12,%arg1,$bzero_cleanup
-
-$bzero_loop_4:
-        addib,>= -4,%arg1,$bzero_loop_4
-        stbys,b,m %r0,4(%arg0)
-
-	/*
-	 * zero the last bytes that may be unaligned on a word boundary
-	 */
-
-$bzero_cleanup:
-        addib,=,n 4,%arg1,$bzero_exit
-        add	%arg0,%arg1,%arg0
-        b       $bzero_exit
-        stbys,e %r0,0(%arg0)
-	b,n	$bzero_exit
-
-
-	/*
-	 * zero by bytes
-	 */
-
-$bzero_bytes:
-        addib,> -1,%arg1,$bzero_bytes
-        stbs,ma %r0,1(%arg0) 
-
-$bzero_exit:
-	bv,n	%r0(%rp)
-EXIT(bzero)
-
-	.end
diff --git a/lib/libc/arch/hppa/string/ffs.S b/lib/libc/arch/hppa/string/ffs.S
deleted file mode 100644
index a4754a721..000000000
--- a/lib/libc/arch/hppa/string/ffs.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: ffs.S,v 1.3 2004/07/18 20:30:04 chs Exp $	*/
-
-/*	$OpenBSD: ffs.S,v 1.3 2001/06/04 23:14:02 mickey Exp $	*/
-
-/* 
- * Copyright (c) 1990, 1991, 1992, 1994, The University of Utah and
- * the Computer Systems Laboratory at the University of Utah (CSL).
- * 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.
- *
- * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS
- * IS" CONDITION.  THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF
- * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * CSL requests users of this software to return to csl-dist@cs.utah.edu any
- * improvements that they make and grant CSL redistribution rights.
- *
- */
-
-#include <machine/asm.h>
-
-#ifdef SYSLIBC_SCCS
-	.text
-	.asciz "$OpenBSD: ffs.S,v 1.3 2001/06/04 23:14:02 mickey Exp $"
-	.align	4
-#endif
-
-/*
- * ffs(bitmask)
- *
- * Return the position of the "most significant" bit in `bitmask'.
- * Since this is similar to the VAX ffs instruction, bits in a word
- * are numbered as "32, 31, ... 1", 0 is returned if no bits are set.
- */
-
-LEAF_ENTRY(ffs)
-	comb,=	%arg0,%r0,ffsdone	; If arg0 is 0
-	or	%r0,%r0,%ret0		;   return 0
-	ldi	32,%ret0		; Set return to high bit
-	extru,=	%arg0,31,16,%r0		; If low 16 bits are non-zero
-	addi,tr	-16,%ret0,%ret0		;   subtract 16 from bitpos
-	shd	%r0,%arg0,16,%arg0	; else shift right 16 bits
-	extru,=	%arg0,31,8,%r0		; If low 8 bits are non-zero
-	addi,tr	-8,%ret0,%ret0		;   subtract 8 from bitpos
-	shd	%r0,%arg0,8,%arg0	; else shift right 8 bits
-	extru,=	%arg0,31,4,%r0		; If low 4 bits are non-zero
-	addi,tr	-4,%ret0,%ret0		;   subtract 4 from bitpos
-	shd	%r0,%arg0,4,%arg0	; else shift right 4 bits
-	extru,=	%arg0,31,2,%r0		; If low 2 bits are non-zero
-	addi,tr	-2,%ret0,%ret0		;   subtract 2 from bitpos
-	shd	%r0,%arg0,2,%arg0	; else shift right 2 bits
-	extru,=	%arg0,31,1,%r0		; If low bit is non-zero
-	addi	-1,%ret0,%ret0		;   subtract 1 from bitpos
-ffsdone:
-	bv,n	%r0(%rp)
-EXIT(ffs)
-
-	.end
diff --git a/lib/libc/arch/hppa/string/strlcpy.S b/lib/libc/arch/hppa/string/strlcpy.S
deleted file mode 100644
index ec199b13a..000000000
--- a/lib/libc/arch/hppa/string/strlcpy.S
+++ /dev/null
@@ -1,84 +0,0 @@
-/*	$NetBSD: strlcpy.S,v 1.3 2008/04/28 20:22:56 martin Exp $	*/
-
-/*
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matthew Fredette.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
- 
-#if defined(LIBC_SCCS) && !defined(lint) 
-        RCSID("$NetBSD: strlcpy.S,v 1.3 2008/04/28 20:22:56 martin Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * size_t strlcpy(char *dst, const char *src, size_t size);
- */
-LEAF_ENTRY(_strlcpy)
-	.weak strlcpy
-	strlcpy = _strlcpy
-
-	/* Always load the first byte of the source string. */
-	ldbs,ma		1(%arg1), %r1
-
-	/*
-	 * If our dst buffer is zero bytes, branch immediately
-	 * to the code that counts the (remaining) length
-	 * of the src string.
-	 */
-	comb,=		%r0, %arg2, $strlcpy_dst_done
-	copy		%arg1, %ret0
-
-	/*
-	 * If our dst buffer is one byte, branch immediately 
-	 * to the code that NUL-terminates the dst buffer and
-	 * counts the (remaining) length of the src string.
-	 */
-	addib,=,n	-1, %arg2, $strlcpy_dst_full
-
-	/*
-	 * Loop copying bytes.  At the top of this loop,
-	 * %arg2 is always the number of bytes we can still 
-	 * store, and %r1 holds the next byte to store.
-	 */
-$strlcpy_loop:
-	comb,=		%r0, %r1, $strlcpy_exit
-	stbs,ma		%r1, 1(%arg0)
-	addib,<>	-1, %arg2, $strlcpy_loop
-	ldbs,ma		1(%arg1), %r1
-
-$strlcpy_dst_full:
-	stbs,ma		%r0, 1(%arg0)
-
-$strlcpy_dst_done:
-	comb,<>,n	%r0, %r1, $strlcpy_dst_done
-	ldbs,ma		1(%arg1), %r1
-	
-$strlcpy_exit:
-	bv		%r0(%rp)
-	sub		%arg1, %ret0, %ret0
-EXIT(strlcpy)
diff --git a/lib/libc/arch/hppa/sys/__clone.S b/lib/libc/arch/hppa/sys/__clone.S
deleted file mode 100644
index b3ee7a2ea..000000000
--- a/lib/libc/arch/hppa/sys/__clone.S
+++ /dev/null
@@ -1,87 +0,0 @@
-/*	$NetBSD: __clone.S,v 1.6 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Fredette.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-	WEAK_ALIAS(clone, __clone)
-#endif
-
-	.import	__cerror, code
-
-/*
- * int clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-ENTRY(__clone, 0)
-
-	/*
-	 * Sanity checks: func and stack may not be NULL.
-	 */
-	ldi	EINVAL, %t1
-	comb,=	%r0, %arg0, __cerror
-	nop
-	comb,=	%r0, %arg1, __cerror
-	nop
-
-	/*
-	 * Put the func and arg arguments into a frame in the child's stack.
-	 */
-	ldo	(HPPA_FRAME_SIZE * 2)(%arg1), %arg1
-	stw	%arg0, HPPA_FRAME_ARG(0)(%arg1)
-	stw	%arg3, HPPA_FRAME_ARG(1)(%arg1)
-
-	/*
-	 * The system call expects (flags, stack).
-	 */
-	copy	%arg2, %arg0
-	SYSCALL(__clone)
-	comb,<>,n %r0, %ret1, 9f
-	bv,n	%r0(%rp)
-
-9:	/*
-	 * Child: Reload the function and argument from the new stack.
-	 */
-	ldw	HPPA_FRAME_ARG(0)(%sp), %r22
-	ldw	HPPA_FRAME_ARG(1)(%sp), %arg0
-
-	/* Call the clone's entry point. */
-	stw	%r19, HPPA_FRAME_ARG(2)(%sp)
-	bl	$$dyncall, %r31
-	copy	%r31, %rp
-	ldw	HPPA_FRAME_ARG(2)(%sp), %r19
-
-	/* Pass the return value to _exit(). */
-	copy	%ret0, %arg0
-	PIC_CALL(_exit)
-
-	/* NOTREACHED */
-EXIT(__clone)
diff --git a/lib/libc/arch/hppa/sys/__sigaction14_sigtramp.c b/lib/libc/arch/hppa/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index dbfb30046..000000000
--- a/lib/libc/arch/hppa/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.4 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.4 2008/04/28 20:22:56 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define	__LIBC12_SOURCE__
-
-#include <sys/types.h>
-#include <signal.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern int __sigtramp_siginfo_2[];
-
-	return (__sigaction_sigtramp(sig, act, oact,
-				     __sigtramp_siginfo_2, 2));
-}
diff --git a/lib/libc/arch/hppa/sys/__sigtramp2.S b/lib/libc/arch/hppa/sys/__sigtramp2.S
deleted file mode 100644
index b76a48706..000000000
--- a/lib/libc/arch/hppa/sys/__sigtramp2.S
+++ /dev/null
@@ -1,133 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.5 2014/03/06 19:02:58 skrll Exp $	*/
-
-/*
- * Copyright (c) 1998-2001 Michael Shalayeff
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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 HIS RELATIVES BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Portitions of this file are derived from other sources, see
- * the copyrights and acknowledgements below.
- */
-/*
- * Copyright (c) 1990,1991,1992,1994 The University of Utah and
- * the Computer Systems Laboratory (CSL).  All rights reserved.
- *
- * THE UNIVERSITY OF UTAH AND CSL PROVIDE THIS SOFTWARE IN ITS "AS IS"
- * CONDITION, AND DISCLAIM ANY LIABILITY OF ANY KIND FOR ANY DAMAGES
- * WHATSOEVER RESULTING FROM ITS USE.
- *
- * CSL requests users of this software to return to csl-dist@cs.utah.edu any
- * improvements that they make and grant CSL redistribution rights.
- *
- *	Utah $Hdr: locore.s 1.62 94/12/15$
- */
-/*
- *  (c) Copyright 1988 HEWLETT-PACKARD COMPANY
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *  for any purpose is hereby granted without fee, provided that
- *  the above copyright notice and this notice appears in all
- *  copies, and that the name of Hewlett-Packard Company not be
- *  used in advertising or publicity pertaining to distribution
- *  of the software without specific, written prior permission.
- *  Hewlett-Packard Company makes no representations about the
- *  suitability of this software for any purpose.
- */
-
-#include "SYS.h"
-
-/*
- * The hppa signal trampoline is required to call the handler
- * possibily via a PLABEL.
- *
- * On entry, stack looks like:
- *
- *	sp->					[x]
- * r3,arg2->	ucontext structure
- *    arg1->	siginfo structure		[0]
- *
- * where
- *	x = HPPA_FRAME_ROUND(sizeof(sigframe_siginfo))
- *
- * and
- * 	struct sigframe_siginfo {
- *		siginfo_t sf_si;
- *		ucontext_t sf_uc;
- *	};
- */
-
-ENTRY_NOPROFILE(__sigtramp_siginfo_2, 0)
-	.call
-
-	/*
-	 * Our sendsig() places the address of the signal handler in %arg3.
-	 * It may actually be a PLABEL.
-	 */
-	bb,>=,n	%arg3, 30, L$sigcode_bounce	; branch if not a PLABEL
-	depi	0, 31, 2, %arg3			; zero L bit in PLABEL pointer
-	ldw	4(%arg3), %r19			; load shared library linkage
-	ldw	0(%arg3), %arg3			; load real catcher address
-
-L$sigcode_bounce:
-
-	/*
-	 * This blr puts the address of the following nop in rp.
-	 * It also schedules the nop for execution, which is why
-	 * that instruction has to be a nop, or, rather, not any
-	 * instruction only meant to execute once the signal handler
-	 * returns.
-	 */
-	blr	%r0, %rp
-
-	/*
-	 * This bv schedules the instruction pointed to by arg3
-	 * for execution.  So, arg3 is the address of the signal
-	 * handler.
-	 */
-	bv,n	%r0(%arg3)
-	nop
-
-	/*
-	 * The signal handler has returned.  Since r3 is on the list
-	 * of callee-saved registers, it's whatever the sendsig
-	 * code wanted it set to.  Since we copy it into arg0,
-	 * it looks like sendsig leaves r3 holding the desired
-	 * single argument to sys_setcontext, i.e., the ucontext_t *.
-	 */
-
-	/* Make a SYS_setcontext system call. */
-	copy	%r3, %arg0
-	ldil	L%SYSCALLGATE, %r1
-	.call
-	ble	4(%sr2, %r1)
-	ldi	SYS_setcontext, %t1
-
-	/* Make a SYS_exit system call. */
-	copy	%ret0, %arg0
-	ldil	L%SYSCALLGATE, %r1
-	.call
-	ble	4(%sr2, %r1)
-	ldi	SYS_exit, %t1
-EXIT(__sigtramp_siginfo_2)
diff --git a/lib/libc/arch/hppa/sys/__syscall.S b/lib/libc/arch/hppa/sys/__syscall.S
deleted file mode 100644
index bdef76fdd..000000000
--- a/lib/libc/arch/hppa/sys/__syscall.S
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	$NetBSD: __syscall.S,v 1.1 2002/06/06 20:31:23 fredette Exp $	*/
-
-#include "SYS.h"
-RSYSCALL(__syscall)
diff --git a/lib/libc/arch/hppa/sys/__vfork14.S b/lib/libc/arch/hppa/sys/__vfork14.S
deleted file mode 100644
index 41d156683..000000000
--- a/lib/libc/arch/hppa/sys/__vfork14.S
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: __vfork14.S,v 1.6 2014/03/06 19:02:58 skrll Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Fredette.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-#include "SYS.h"
-
-ENTRY(__vfork14, 0)
-	/*
-	 * NB: __vfork14 is a tricky syscall.  We can't save
-	 * any values on the stack, because the stack will be 
-	 * trashed by the child, leaving garbage for when the
-	 * parent returns.
-	 *
-	 * So we must save values in registers, specifically,
-	 * registers that the kernel is willing to preserve
-	 * across the syscall.  Normally, this would be callee-
-	 * saved registers, with the kernel being the callee,
-	 * but the problem is that we, too, are a callee, and
-	 * would have to save that very same register somewhere,
-	 * because *our* caller is counting on us to do so.
-	 *
-	 * What we need is a normally caller-saved register,
-	 * that the kernel is willing to save for us.  The 
-	 * syscall entry code in locore.S has been modified 
-	 * to do just this for the t4 register.
-	 */
-	.import	__cerror, code
-
-	copy	%rp, %t4
-	ldil	L%SYSCALLGATE, %r1
-	ble	4(%sr2, %r1)
-	ldi	SYS___vfork14, %t1
-	comb,<>	%r0, %t1, __cerror
-	copy	%t4, %rp
-	addi	-1, %ret1, %ret1
-	bv	%r0(%rp)
-	and	%ret0, %ret1, %ret0
-EXIT(__vfork14)
diff --git a/lib/libc/arch/hppa/sys/brk.S b/lib/libc/arch/hppa/sys/brk.S
deleted file mode 100644
index d16612706..000000000
--- a/lib/libc/arch/hppa/sys/brk.S
+++ /dev/null
@@ -1,78 +0,0 @@
-/*	$NetBSD: brk.S,v 1.6 2013/09/12 15:36:15 joerg Exp $	*/
-
-/*	$OpenBSD: brk.S,v 1.7 2001/06/04 23:14:04 mickey Exp $	*/
-
-/*
- * Copyright (c) 1999 Michael Shalayeff
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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 HIS RELATIVES BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: brk.S,v 1.6 2013/09/12 15:36:15 joerg Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-	.import	curbrk, data
-	.global	_end
-
-#ifdef WEAK_ALIAS
-	WEAK_ALIAS(brk, _brk) 
-#endif
-
-	.data
-	.export	__minbrk, data
-__minbrk:
-	.long	_end
-
-ENTRY(_brk,0)
-#ifdef __PIC__
-	addil	LT%__minbrk, %r19
-	ldw	RT%__minbrk(%r1), %r1
-	ldw	0(%r1), %t2
-#else  /* !__PIC__ */
-	ldil	L%__minbrk, %t1
-	ldw	R%__minbrk(%t1), %t2
-#endif /* !__PIC__ */
-	sub,<<	%t2, %arg0, %r0
-	copy	%t2, %arg0
-	stw	%arg0, HPPA_FRAME_ARG(0)(%sp)
-
-	SYSCALL(break)
-
-	ldw	HPPA_FRAME_ARG(0)(%sp), %arg0
-#ifdef __PIC__
-	addil	LT%curbrk, %r19
-	ldw	RT%curbrk(%r1), %r1
-	bv	%r0(%rp)
-	stw	%arg0, 0(%r1)
-#else  /* !__PIC__ */
-	ldil	L%curbrk, %t1
-	bv	%r0(%rp)
-	stw	%arg0, R%curbrk(%t1)
-#endif /* !__PIC__ */
-EXIT(brk)
-
-	.end
-
diff --git a/lib/libc/arch/hppa/sys/cerror.S b/lib/libc/arch/hppa/sys/cerror.S
deleted file mode 100644
index 47d8f157c..000000000
--- a/lib/libc/arch/hppa/sys/cerror.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.5 2013/09/12 15:36:15 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nick Hudson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#ifdef _REENTRANT
-ENTRY(__cerror,HPPA_FRAME_SIZE)
-#else
-LEAF_ENTRY(__cerror)
-#endif
-#ifdef _REENTRANT
-	stw	%rp, HPPA_FRAME_CRP(%sp)
-	stw	%t1, HPPA_FRAME_ARG(0)(%sp)
-	ldo	HPPA_FRAME_SIZE(%sp),%sp
-	bl	__errno, %rp
-	nop
-	ldo	-HPPA_FRAME_SIZE(%sp), %sp
-	ldw	HPPA_FRAME_ARG(0)(%sp), %t1
-	ldw	HPPA_FRAME_CRP(%sp), %rp
-	stw	%t1, 0(%ret0)
-#else
-#ifdef __PIC__
-	addil	LT%errno, %r19
-	ldw	RT%errno(%r1), %r1
-	stw	%t1, 0(%r1)
-#else
-	ldil	L%errno, %r1
-	stw	%t1, R%errno(%r1)
-#endif
-#endif
-	ldi	-1, %ret0
-	bv	%r0(%rp)
-	ldi	-1, %ret1
-EXIT(__cerror)
diff --git a/lib/libc/arch/hppa/sys/exect.S b/lib/libc/arch/hppa/sys/exect.S
deleted file mode 100644
index 5bb0ce1e5..000000000
--- a/lib/libc/arch/hppa/sys/exect.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*	$NetBSD: exect.S,v 1.2 2009/11/03 05:07:25 snj Exp $	*/
-
-/*	$OpenBSD: exect.S,v 1.5 2001/03/29 01:43:52 mickey Exp $	*/
-
-/*
- * Copyright (c) 1999 Michael Shalayeff
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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 HIS RELATIVES BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: exect.S,v 1.2 2009/11/03 05:07:25 snj Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/* we do no tracing yet */
-PSEUDO(exect,execve)
-
-	.end
diff --git a/lib/libc/arch/hppa/sys/fork.S b/lib/libc/arch/hppa/sys/fork.S
deleted file mode 100644
index 0ee7ddf54..000000000
--- a/lib/libc/arch/hppa/sys/fork.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: fork.S,v 1.4 2009/11/03 05:07:25 snj Exp $	*/
-
-/*	$OpenBSD: fork.S,v 1.7 2001/06/04 23:14:04 mickey Exp $	*/
-
-/*
- * Copyright (c) 1999 Michael Shalayeff
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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 HIS RELATIVES BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: fork.S,v 1.4 2009/11/03 05:07:25 snj Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-ENTRY(__fork,0)
-	SYSCALL(fork)
-	addi	-1, %ret1, %ret1
-	bv	%r0(%rp)
-	and	%ret0, %ret1, %ret0
-EXIT(__fork)
-
-	.end
diff --git a/lib/libc/arch/hppa/sys/getcontext.S b/lib/libc/arch/hppa/sys/getcontext.S
deleted file mode 100644
index ee13db61e..000000000
--- a/lib/libc/arch/hppa/sys/getcontext.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.5 2014/02/19 13:01:51 skrll Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Fredette.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext, _getcontext)
-#endif
-
-ENTRY(_getcontext, 0)
-	SYSCALL(getcontext)
-	stw	%rp, (_OFFSETOF_UC_GREGS + _REG_PCOQH * SZREG)(%arg0)
-	ldo	4(%rp), %r1
-	stw	%r1, (_OFFSETOF_UC_GREGS + _REG_PCOQT * SZREG)(%arg0)
-	bv	%r0(%rp)
-	stw	%r0, (_OFFSETOF_UC_GREGS + _REG_RET0 * SZREG)(%arg0)
-EXIT(_getcontext)
diff --git a/lib/libc/arch/hppa/sys/pipe.S b/lib/libc/arch/hppa/sys/pipe.S
deleted file mode 100644
index 00970ae79..000000000
--- a/lib/libc/arch/hppa/sys/pipe.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.3 2003/10/06 05:30:21 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)pipe.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: pipe.S,v 1.3 2003/10/06 05:30:21 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef WEAK_ALIAS
-	WEAK_ALIAS(pipe, _pipe)
-#endif
-
-ENTRY(_pipe,0)
-	stw	%arg0, HPPA_FRAME_ARG(0)(%sp)
-	SYSCALL(pipe)
-	ldw	HPPA_FRAME_ARG(0)(%sp), %arg0
-	stw	%ret0, 0(%arg0)
-	stw	%ret1, 4(%arg0)
-	bv	%r0(%rp)
-	copy	%r0, %ret0
-EXIT(_pipe)
diff --git a/lib/libc/arch/hppa/sys/ptrace.S b/lib/libc/arch/hppa/sys/ptrace.S
deleted file mode 100644
index 623525993..000000000
--- a/lib/libc/arch/hppa/sys/ptrace.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.6 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Fredette.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-#include "SYS.h"
-
-	.import __cerror, code
-
-/*
- * int ptrace(int request, pid_t pid, void * addr, int data);
- */
-
-ENTRY(ptrace, HPPA_FRAME_SIZE)
-	stw	%rp, HPPA_FRAME_CRP(%sp)
-	stw	%arg0, HPPA_FRAME_ARG(0)(%sp)
-	stw	%arg1, HPPA_FRAME_ARG(1)(%sp)
-	stw	%arg2, HPPA_FRAME_ARG(2)(%sp)
-	stw	%arg3, HPPA_FRAME_ARG(3)(%sp)
-	ldo	HPPA_FRAME_SIZE(%sp),%sp
-	bl	__cerror, %rp
-	 copy	%r0, %t1
-	ldo	-HPPA_FRAME_SIZE(%sp), %sp
-	ldw	HPPA_FRAME_ARG(0)(%sp), %arg0
-	ldw	HPPA_FRAME_ARG(1)(%sp), %arg1
-	ldw	HPPA_FRAME_ARG(2)(%sp), %arg2
-	ldw	HPPA_FRAME_ARG(3)(%sp), %arg3
-	ldw	HPPA_FRAME_CRP(%sp), %rp
-
-	SYSCALL(ptrace)
-	bv,n	%r0(%rp)
-EXIT(ptrace)
diff --git a/lib/libc/arch/hppa/sys/sbrk.S b/lib/libc/arch/hppa/sys/sbrk.S
deleted file mode 100644
index 592141387..000000000
--- a/lib/libc/arch/hppa/sys/sbrk.S
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.6 2013/09/12 15:36:15 joerg Exp $	*/
-
-/*	$OpenBSD: sbrk.S,v 1.7 2001/06/04 23:14:04 mickey Exp $	*/
-
-/*
- * Copyright (c) 1999 Michael Shalayeff
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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 HIS RELATIVES BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: sbrk.S,v 1.6 2013/09/12 15:36:15 joerg Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-	.global	_end
-
-#ifdef WEAK_ALIAS
-	WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-	.data
-	.export	curbrk, data
-curbrk:
-	.long	_end
-
-ENTRY(_sbrk,0)
-#ifdef __PIC__
-	addil	LT%curbrk, %r19
-	ldw	RT%curbrk(%r1), %r1
-	ldw	0(%r1), %t2
-#else  /* !__PIC__ */
-	ldil	L%curbrk, %t1
-	ldw	R%curbrk(%t1), %t2
-#endif /* !__PIC__ */
-	add	%arg0, %t2, %arg0
-	stw	%arg0, HPPA_FRAME_ARG(0)(%sp)
-
-	SYSCALL(break)
-
-#ifdef __PIC__
-	addil	LT%curbrk, %r19
-	ldw	RT%curbrk(%r1), %r1
-#else  /* !__PIC__ */
-	ldil	L%curbrk, %t1
-	ldo	R%curbrk(%t1), %r1
-#endif /* !__PIC__ */
-	ldw	0(%r1), %ret0
-	ldw	HPPA_FRAME_ARG(0)(%sp), %arg0
-	bv	%r0(%rp)
-	stw	%arg0, 0(%r1)
-
-EXIT(sbrk)
-
-	.end
diff --git a/lib/libc/arch/hppa/sys/shmat.S b/lib/libc/arch/hppa/sys/shmat.S
deleted file mode 100644
index 0eaf832c3..000000000
--- a/lib/libc/arch/hppa/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.3 2004/07/18 20:48:04 chs Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/hppa/sys/syscall.S b/lib/libc/arch/hppa/sys/syscall.S
deleted file mode 100644
index fbf8ee412..000000000
--- a/lib/libc/arch/hppa/sys/syscall.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.2 2009/11/03 05:07:25 snj Exp $	*/
-
-/*	$OpenBSD: syscall.S,v 1.4 2001/03/29 01:43:53 mickey Exp $	*/
-
-/*
- * Copyright (c) 1999 Michael Shalayeff
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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 HIS RELATIVES BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: syscall.S,v 1.2 2009/11/03 05:07:25 snj Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-RSYSCALL(syscall)
-
-	.end
diff --git a/lib/libc/arch/i386/Makefile.inc b/lib/libc/arch/i386/Makefile.inc
deleted file mode 100644
index 80d6db9fa..000000000
--- a/lib/libc/arch/i386/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.21 2015/07/15 14:27:49 pooka Exp $
-
-.if ${RUMPRUN} != "yes" && !defined(__MINIX)
-SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
-.endif
diff --git a/lib/libc/arch/i386/SYS.h b/lib/libc/arch/i386/SYS.h
deleted file mode 100644
index 9188871c5..000000000
--- a/lib/libc/arch/i386/SYS.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.25 2014/05/23 02:17:43 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Andrew Doran.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)SYS.h	5.5 (Berkeley) 5/7/91
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-
-#ifdef __STDC__
-#define _SYSNAM(x)	$(SYS_ ## x)
-#else
-#define	_SYSNAM(x)	$(SYS_/**/x)
-#endif
-
-#define OSYSTRAP(x)			\
-	movl _SYSNAM(x),%eax		;\
-	int $0x80
-
-#ifdef I686_LIBC
-#define SYSTRAP(x)			\
-	pushl	%ebx			;\
-	movl	_SYSNAM(x),%eax		;\
-	movl	$123f,%edx		;\
-	movl	%esp,%ecx		;\
-	sysenter			;\
-123:	movl	%ebx,%edx		;\
-	popl	%ebx
-#else	/* I686_LIBC */
-#define SYSTRAP(x)	OSYSTRAP(x)
-#endif	/* I686_LIBC */
-
-#ifdef __ELF__
-#define CERROR		_C_LABEL(__cerror)
-#define CURBRK		_C_LABEL(__curbrk)
-#else
-#define CERROR		_ASM_LABEL(cerror)
-#define CURBRK		_ASM_LABEL(curbrk)
-#endif
-
-#define _SYSCALL_NOERROR(x,y)						\
-	ENTRY(x);							\
-	SYSTRAP(y)
-
-#ifdef __PIC__
-#define _SYSCALL_ERR							\
-	PIC_PROLOGUE;							\
-	mov PIC_GOT(CERROR), %ecx;					\
-	PIC_EPILOGUE;							\
-	jmp *%ecx
-#else
-#define _SYSCALL_ERR							\
-	jmp CERROR
-#endif
-
-#define _SYSCALL(x,y)							\
-	.text; _ALIGN_TEXT;						\
-	2: _SYSCALL_ERR;						\
-	_SYSCALL_NOERROR(x,y);						\
-	jc 2b
-
-#define SYSCALL_NOERROR(x)						\
-	_SYSCALL_NOERROR(x,x)
-
-#define SYSCALL(x)							\
-	_SYSCALL(x,x)
-
-#define PSEUDO_NOERROR(x,y)						\
-	_SYSCALL_NOERROR(x,y);						\
-	ret;								\
-	END(x)
-
-#define PSEUDO(x,y)							\
-	_SYSCALL_NOERROR(x,y);						\
-	jc 2f;								\
-	ret;								\
-	2: _SYSCALL_ERR;						\
-	END(x)
-
-#define RSYSCALL_NOERROR(x)						\
-	PSEUDO_NOERROR(x,x)
-
-#define RSYSCALL(x)							\
-	PSEUDO(x,x)
-
-#ifdef WEAK_ALIAS
-#define	WSYSCALL(weak,strong)						\
-	WEAK_ALIAS(weak,strong);					\
-	PSEUDO(strong,weak)
-#else
-#define	WSYSCALL(weak,strong)						\
-	PSEUDO(weak,weak)
-#endif
-
-	.globl	CERROR
diff --git a/lib/libc/arch/i386/gdtoa/Makefile.inc b/lib/libc/arch/i386/gdtoa/Makefile.inc
deleted file mode 100644
index ce2f4854d..000000000
--- a/lib/libc/arch/i386/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/03/15 17:35:18 kleink Exp $
-
-SRCS+=	strtof.c strtold_px.c
-SRCS+=	strtopx.c
diff --git a/lib/libc/arch/i386/gdtoa/arith.h b/lib/libc/arch/i386/gdtoa/arith.h
deleted file mode 100644
index 1513f1fd2..000000000
--- a/lib/libc/arch/i386/gdtoa/arith.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define IEEE_LITTLE_ENDIAN
diff --git a/lib/libc/arch/i386/gdtoa/gd_qnan.h b/lib/libc/arch/i386/gdtoa/gd_qnan.h
deleted file mode 100644
index 915d0ced5..000000000
--- a/lib/libc/arch/i386/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.2 2011/06/05 14:43:12 christos Exp $ */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x0
-#define d_QNAN1 0x7ff80000
-#define ldus_QNAN0 0x0
-#define ldus_QNAN1 0x0
-#define ldus_QNAN2 0x0
-#define ldus_QNAN3 0xc000
-#define ldus_QNAN4 0x7fff
-/* 2 bytes of tail padding follow, per i386 ABI */
diff --git a/lib/libc/arch/i386/gen/Makefile.inc b/lib/libc/arch/i386/gen/Makefile.inc
deleted file mode 100644
index 1b3df5fc9..000000000
--- a/lib/libc/arch/i386/gen/Makefile.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.29 2015/07/15 14:27:49 pooka Exp $
-
-# objects built from assembler sources (need lint stubs)
-SRCS+=	alloca.S byte_swap_2.S byte_swap_4.S fabs.S \
-	flt_rounds.S fpgetmask.S fpgetround.S fpgetsticky.S \
-	fpsetmask.S fpsetround.S fpsetsticky.S fpgetprec.S \
-	fpsetprec.S
-
-SRCS+=	setjmp.S _setjmp.S sigsetjmp.S
-
-.if ${RUMPRUN} != "yes" && ! defined(__MINIX)
-# Already defined in minix/lib/libc/arch/i386/sys
-SRCS+=	resumecontext.S swapcontext.S
-SRCS+=	_lwp.c makecontext.c
-.endif
-
-SRCS+=	bswap64.c
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
-
-SRCS+=	nanf.c infinityl.c
-SRCS+=	fpclassifyl.c isfinitel.c isinfl.c isnanl.c signbitl.c
-
-# "internal" objects (don't provide part of the user-visible API)
-SRCS+=	divsi3.S fixdfsi.S fixunsdfsi.S udivsi3.S
-
-LSRCS.i386.gen=\
-	Lint__setjmp.c Lint_alloca.c Lint_bswap16.c Lint_bswap32.c \
-	Lint_fabs.c \
-	Lint___setjmp14.c Lint___sigsetjmp14.c Lint_flt_rounds.c \
-	Lint_fpgetmask.c Lint_fpgetround.c Lint_fpgetsticky.c \
-	Lint_fpsetmask.c Lint_fpsetround.c Lint_fpsetsticky.c \
-	Lint_resumecontext.c Lint_swapcontext.c Lint__setjmp.c
-LSRCS+=		${LSRCS.i386.gen}
-DPSRCS+=	${LSRCS.i386.gen}
-CLEANFILES+=	${LSRCS.i386.gen}
diff --git a/lib/libc/arch/i386/gen/_lwp.c b/lib/libc/arch/i386/gen/_lwp.c
deleted file mode 100644
index a8b486d5f..000000000
--- a/lib/libc/arch/i386/gen/_lwp.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.8 2012/08/31 20:57:24 drochner Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nathan J. Williams.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.8 2012/08/31 20:57:24 drochner Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <inttypes.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *),
-    void *arg, void *private, caddr_t stack_base, size_t stack_size)
-{
-	void **sp;
-
-	getcontext(u);
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-	/* LINTED uintptr_t is safe */
-	u->uc_mcontext.__gregs[_REG_EIP] = (uintptr_t)start;
-	
-	/* Align to a 16-byte boundary for SSE */
-	/* LINTED uintptr_t is safe */
-	sp = (void **) (((uintptr_t)(stack_base + stack_size - 4) & ~0xf) + 4);
-	
-	*--sp = arg;
-	*--sp = (void *) _lwp_exit;
-	
-	/* LINTED uintptr_t is safe */
-	u->uc_mcontext.__gregs[_REG_UESP] = (uintptr_t) sp;
-
-	u->uc_mcontext._mc_tlsbase = (uintptr_t)private;
-	u->uc_flags |= _UC_TLSBASE;
-}
diff --git a/lib/libc/arch/i386/gen/_setjmp.S b/lib/libc/arch/i386/gen/_setjmp.S
deleted file mode 100644
index ef7b8e341..000000000
--- a/lib/libc/arch/i386/gen/_setjmp.S
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.9 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)_setjmp.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: _setjmp.S,v 1.9 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-/*
- * 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.
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	movl	4(%esp),%eax
-	movl	0(%esp),%edx
-	movl	%edx, 0(%eax)		/* rta */
-	movl	%ebx, 4(%eax)
-	movl	%esp, 8(%eax)
-	movl	%ebp,12(%eax)
-	movl	%esi,16(%eax)
-	movl	%edi,20(%eax)
-	xorl	%eax,%eax
-	ret
-END(_setjmp)
-
-ENTRY(_longjmp)
-	movl	4(%esp),%edx
-	movl	8(%esp),%eax
-	movl	0(%edx),%ecx
-	movl	4(%edx),%ebx
-	movl	8(%edx),%esp
-	movl	12(%edx),%ebp
-	movl	16(%edx),%esi
-	movl	20(%edx),%edi
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movl	%ecx,0(%esp)
-	ret
-END(_longjmp)
diff --git a/lib/libc/arch/i386/gen/alloca.S b/lib/libc/arch/i386/gen/alloca.S
deleted file mode 100644
index 0b975bc34..000000000
--- a/lib/libc/arch/i386/gen/alloca.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: alloca.S,v 1.9 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)alloca.s	5.2 (Berkeley) 5/14/90
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: alloca.S,v 1.9 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-/* like alloc, but automatic free in return */
-
-ENTRY(alloca)
-	popl	%edx		/*  pop return addr */
-	popl	%eax		/*  pop amount to allocate */
-	movl	%esp,%ecx
-	addl	$3,%eax		/*  round up to next word */
-	andl	$-4,%eax
-	subl	%eax,%esp
-	movl	%esp,%eax	/* base of newly allocated space */
-	pushl	8(%ecx)		/* copy possible saved registers */
-	pushl	4(%ecx)
-	pushl	0(%ecx)
-	pushl	%eax		/* dummy to pop at callsite */
-	jmp	*%edx		/* "return" */
-END(alloca)
diff --git a/lib/libc/arch/i386/gen/divsi3.S b/lib/libc/arch/i386/gen/divsi3.S
deleted file mode 100644
index b00571edd..000000000
--- a/lib/libc/arch/i386/gen/divsi3.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: divsi3.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)divsi3.s	5.1 (Berkeley) 5/15/90
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: divsi3.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-ENTRY(__divsi3)
-	movl 4(%esp),%eax
-	cltd
-	idivl 8(%esp)
-	ret
-END(__divsi3)
diff --git a/lib/libc/arch/i386/gen/fabs.S b/lib/libc/arch/i386/gen/fabs.S
deleted file mode 100644
index d97314209..000000000
--- a/lib/libc/arch/i386/gen/fabs.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: fabs.S,v 1.6 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)fabs.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: fabs.S,v 1.6 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-ENTRY(fabs)
-	fldl	4(%esp)
-	fabs
-	ret
-END(fabs)
diff --git a/lib/libc/arch/i386/gen/fixdfsi.S b/lib/libc/arch/i386/gen/fixdfsi.S
deleted file mode 100644
index a26896eef..000000000
--- a/lib/libc/arch/i386/gen/fixdfsi.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: fixdfsi.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * 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.
- * 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.
- *
- *	from: @(#)fixdfsi.s	5.4 (Berkeley) 4/12/91
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: fixdfsi.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-ENTRY(__fixdfsi)
-	fldl	4(%esp)
-	fistpl	4(%esp)
-	movl	4(%esp),%eax
-	ret
-END(__fixdfsi)
diff --git a/lib/libc/arch/i386/gen/fixunsdfsi.S b/lib/libc/arch/i386/gen/fixunsdfsi.S
deleted file mode 100644
index f2d0e2603..000000000
--- a/lib/libc/arch/i386/gen/fixunsdfsi.S
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: fixunsdfsi.S,v 1.14 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)fixunsdfsi.s	5.1	12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: fixunsdfsi.S,v 1.14 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-ENTRY(__fixunsdfsi)
-	fldl	4(%esp)		/* argument double to accum stack */
-	frndint			/* create integer */
-#ifdef __PIC__
-	PIC_PROLOGUE
-	leal	PIC_GOTOFF(fbiggestsigned),%eax
-	PIC_EPILOGUE
-	fcoml	(%eax)
-#else
-	fcoml	fbiggestsigned	/* bigger than biggest signed? */
-#endif
-	fstsw	%ax
-	sahf
-	jnb	2f
-
-	fistpl	4(%esp)
-	movl	4(%esp),%eax
-	ret
-
-2:
-#ifdef __PIC__
-	PIC_PROLOGUE
-	leal	PIC_GOTOFF(fbiggestsigned),%eax
-	PIC_EPILOGUE
-	fsubl	(%eax)
-#else
-	fsubl	fbiggestsigned	/* reduce for proper conversion */
-#endif
-	fistpl	4(%esp)		/* convert */
-	movl	4(%esp),%eax
-	orl	$0x80000000,%eax	/* restore bias */
-	ret
-END(__fixunsdfsi)
-
-fbiggestsigned:	.double	2147483648.0
diff --git a/lib/libc/arch/i386/gen/flt_rounds.S b/lib/libc/arch/i386/gen/flt_rounds.S
deleted file mode 100644
index 140394eea..000000000
--- a/lib/libc/arch/i386/gen/flt_rounds.S
+++ /dev/null
@@ -1,22 +0,0 @@
-/*	$NetBSD: flt_rounds.S,v 1.10 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-#include <machine/asm.h>
-
-/*
- * 00 0 round to zero 
- * 01 1 round to nearest
- * 10 2 round to positive infinity
- * 11 3 round to negative infinity
- */
-	.text
-	_ALIGN_TEXT
-ENTRY(__flt_rounds)
-	fnstcw	-4(%esp)
-	movl	-4(%esp), %ecx
-	shrl	$9, %ecx
-	andl	$6, %ecx
-	movl	$0x2d, %eax	/* 0x2d = 00.10.11.01 */
-	sarl	%cl, %eax	/* 0,1,2,3 -> 1,3,2,0 */
-	andl	$3, %eax
-	ret
-END(__flt_rounds)
diff --git a/lib/libc/arch/i386/gen/fpclassifyl.c b/lib/libc/arch/i386/gen/fpclassifyl.c
deleted file mode 100644
index 185ee0c5b..000000000
--- a/lib/libc/arch/i386/gen/fpclassifyl.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: fpclassifyl.c,v 1.3 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpclassifyl.c,v 1.3 2008/04/28 20:22:56 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <assert.h>
-#include <math.h>
-
-/*
- * 7.12.3.1 fpclassify - classify real floating type
- *          IEEE 754 compatible 80-bit extended-precision Intel 386 version
- */
-int
-__fpclassifyl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	_DIAGASSERT(u.extu_ext.ext_exp == 0 ||
-	    (u.extu_ext.ext_frach & 0x80000000));
-
-	if (u.extu_ext.ext_exp == 0) {
-		if ((u.extu_ext.ext_frach & 0x7fffffff) == 0 &&
-		    u.extu_ext.ext_fracl == 0)
-			return FP_ZERO;
-		else
-			return FP_SUBNORMAL;
-	} else if (u.extu_ext.ext_exp == EXT_EXP_INFNAN) {
-		if ((u.extu_ext.ext_frach & 0x7fffffff) == 0 &&
-		    u.extu_ext.ext_fracl == 0)
-			return FP_INFINITE;
-		else
-			return FP_NAN;
-	}
-
-	return FP_NORMAL;
-}
diff --git a/lib/libc/arch/i386/gen/fpgetmask.S b/lib/libc/arch/i386/gen/fpgetmask.S
deleted file mode 100644
index 04cac7d2d..000000000
--- a/lib/libc/arch/i386/gen/fpgetmask.S
+++ /dev/null
@@ -1,27 +0,0 @@
-/*	$NetBSD: fpgetmask.S,v 1.5 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 4, 1995
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpgetmask, _fpgetmask)
-ENTRY(_fpgetmask)
-#else
-ENTRY(fpgetmask)
-#endif
-	subl $4,%esp
-	fnstcw (%esp)
-	movl (%esp),%eax
-	notl %eax
-	andl $63,%eax
-	addl $4,%esp
-	ret
-#ifdef WEAK_ALIAS
-END(_fpgetmask)
-#else
-END(fpgetmask)
-#endif
diff --git a/lib/libc/arch/i386/gen/fpgetprec.S b/lib/libc/arch/i386/gen/fpgetprec.S
deleted file mode 100644
index aa7974e7c..000000000
--- a/lib/libc/arch/i386/gen/fpgetprec.S
+++ /dev/null
@@ -1,27 +0,0 @@
-/*	$NetBSD: fpgetprec.S,v 1.2 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 4, 1995
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpgetprec, _fpgetprec)
-ENTRY(_fpgetprec)
-#else
-ENTRY(fpgetprec)
-#endif
-	subl $4,%esp
-	fnstcw (%esp)
-	movl (%esp),%eax
-	rorl $8,%eax
-	andl $3,%eax
-	addl $4,%esp
-	ret
-#ifdef WEAK_ALIAS
-END(_fpgetprec)
-#else
-END(fpgetprec)
-#endif
diff --git a/lib/libc/arch/i386/gen/fpgetround.S b/lib/libc/arch/i386/gen/fpgetround.S
deleted file mode 100644
index c934fd31a..000000000
--- a/lib/libc/arch/i386/gen/fpgetround.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/*	$NetBSD: fpgetround.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 4, 1995
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-/*
- * XXX load only x87 state.
- */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpgetround, _fpgetround)
-ENTRY(_fpgetround)
-#else
-ENTRY(fpgetround)
-#endif
-	fnstcw -4(%esp)
-	movl -4(%esp), %eax
-	andl $0x00000c00, %eax
-	ret
-#ifdef WEAK_ALIAS
-END(_fpgetround)
-#else
-END(fpgetround)
-#endif
diff --git a/lib/libc/arch/i386/gen/fpgetsticky.S b/lib/libc/arch/i386/gen/fpgetsticky.S
deleted file mode 100644
index 977957ffe..000000000
--- a/lib/libc/arch/i386/gen/fpgetsticky.S
+++ /dev/null
@@ -1,26 +0,0 @@
-/*	$NetBSD: fpgetsticky.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 4, 1995
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpgetsticky, _fpgetsticky)
-ENTRY(_fpgetsticky)
-#else
-ENTRY(fpgetsticky)
-#endif
-	subl $4,%esp
-	fnstsw (%esp)
-	movl (%esp),%eax
-	andl $63,%eax
-	addl $4,%esp
-	ret
-#ifdef WEAK_ALIAS
-END(_fpgetsticky)
-#else
-END(fpgetsticky)
-#endif
diff --git a/lib/libc/arch/i386/gen/fpsetmask.S b/lib/libc/arch/i386/gen/fpsetmask.S
deleted file mode 100644
index 81cc7f195..000000000
--- a/lib/libc/arch/i386/gen/fpsetmask.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: fpsetmask.S,v 1.5 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*
- * Written by Charles M. Hannum, Apr 9, 1995
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpsetmask, _fpsetmask)
-ENTRY(_fpsetmask)
-#else
-ENTRY(fpsetmask)
-#endif
-	subl $4,%esp
-
-	fnstcw (%esp)
-	movl (%esp),%eax
-	movl %eax,%edx
-
-	notl %eax
-	andl $63,%eax
-
-	addl %eax,%edx
-	movl 8(%esp),%ecx
-	andl $63,%ecx
-	subl %ecx,%edx
-	movl %edx,(%esp)
-	fldcw (%esp)
-
-	addl $4,%esp
-	ret
-#ifdef WEAK_ALIAS
-END(_fpsetmask)
-#else
-END(fpsetmask)
-#endif
diff --git a/lib/libc/arch/i386/gen/fpsetprec.S b/lib/libc/arch/i386/gen/fpsetprec.S
deleted file mode 100644
index 19e88246f..000000000
--- a/lib/libc/arch/i386/gen/fpsetprec.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*	$NetBSD: fpsetprec.S,v 1.2 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*
- * Written by Charles M. Hannum, Apr 9, 1995
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpsetprec, _fpsetprec)
-ENTRY(_fpsetprec)
-#else
-ENTRY(fpsetprec)
-#endif
-	subl $4,%esp
-
-	fnstcw (%esp)
-	movl (%esp),%eax
-
-	rorl $8,%eax
-	movl %eax,%edx
-	andl $3,%eax
-
-	subl %eax,%edx
-	movl 8(%esp),%ecx
-	andl $3,%ecx
-	orl %ecx,%edx
-	roll $8,%edx
-	movl %edx,(%esp)
-	fldcw (%esp)
-
-	addl $4,%esp
-	ret
-#ifdef WEAK_ALIAS
-END(_fpsetprec)
-#else
-END(fpsetprec)
-#endif
diff --git a/lib/libc/arch/i386/gen/fpsetround.S b/lib/libc/arch/i386/gen/fpsetround.S
deleted file mode 100644
index 578d37645..000000000
--- a/lib/libc/arch/i386/gen/fpsetround.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: fpsetround.S,v 1.6 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*
- * Written by Frank van der Linden at Wasabi Systems for NetBSD.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-/*
- * XXX set both the x87 control word
- * Applications should only set exception and round flags
- */ 
-
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpsetround, _fpsetround)
-ENTRY(_fpsetround)
-#else
-ENTRY(fpsetround)
-#endif
-
-	fnstcw	-4(%esp)
-	movl	-4(%esp), %edx
-	movl	%edx, %eax
-	andl	$0x00000c00, %eax	
-	andl	$0xfffff3ff, %edx
-	movl	4(%esp), %ecx
-	orl	%ecx, %edx
-	movl	%edx, -4(%esp)
-	fldcw	-4(%esp)
-
-	ret
-#ifdef WEAK_ALIAS
-END(_fpsetround)
-#else
-END(fpsetround)
-#endif
diff --git a/lib/libc/arch/i386/gen/fpsetsticky.S b/lib/libc/arch/i386/gen/fpsetsticky.S
deleted file mode 100644
index acdd8503a..000000000
--- a/lib/libc/arch/i386/gen/fpsetsticky.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: fpsetsticky.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*
- * Written by Charles M. Hannum, Apr 9, 1995
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpsetsticky, _fpsetsticky)
-ENTRY(_fpsetsticky)
-#else
-ENTRY(fpsetsticky)
-#endif
-	subl $28,%esp
-
-	fnstenv (%esp)
-	movl 4(%esp),%eax
-	movl %eax,%edx
-
-	andl $63,%eax
-
-	subl %eax,%edx
-	movl 32(%esp),%ecx
-	andl $63,%ecx
-	addl %ecx,%edx
-	movl %edx,4(%esp)
-	fldenv (%esp)
-
-	addl $28,%esp
-	ret
-#ifdef WEAK_ALIAS
-END(_fpsetsticky)
-#else
-END(fpsetsticky)
-#endif
diff --git a/lib/libc/arch/i386/gen/infinityl.c b/lib/libc/arch/i386/gen/infinityl.c
deleted file mode 100644
index de21245c5..000000000
--- a/lib/libc/arch/i386/gen/infinityl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	$NetBSD: infinityl.c,v 1.4 2011/06/06 17:02:30 drochner Exp $	*/
-
-/*
- * IEEE-compatible infinityl.c for little-endian 80-bit format -- public domain.
- * Note that the representation includes 16 bits of tail padding per i386 ABI.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: infinityl.c,v 1.4 2011/06/06 17:02:30 drochner Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-
-const union __long_double_u __infinityl =
-	{ { 0, 0, 0, 0, 0, 0, 0, 0x80, 0xff, 0x7f, 0, 0 } };
diff --git a/lib/libc/arch/i386/gen/isfinitel.c b/lib/libc/arch/i386/gen/isfinitel.c
deleted file mode 100644
index 8b0c8a7d2..000000000
--- a/lib/libc/arch/i386/gen/isfinitel.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: isfinitel.c,v 1.3 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: isfinitel.c,v 1.3 2008/04/28 20:22:56 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <assert.h>
-#include <math.h>
-
-/*
- * 7.12.3.2 isfinite - determine whether an argument has finite value
- *          IEEE 754 compatible 80-bit extended-precision Intel 386 version
- */
-int
-__isfinitel(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	_DIAGASSERT(u.extu_ext.ext_exp == 0 ||
-	    (u.extu_ext.ext_frach & 0x80000000));
-
-	if (u.extu_ext.ext_exp == EXT_EXP_INFNAN)
-		return 0;
-
-	return 1;
-}
diff --git a/lib/libc/arch/i386/gen/isinfl.c b/lib/libc/arch/i386/gen/isinfl.c
deleted file mode 100644
index b1675e921..000000000
--- a/lib/libc/arch/i386/gen/isinfl.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: isinfl.c,v 1.6 2007/02/02 23:14:09 christos 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.
- * 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.
- *
- * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isinfl.c,v 1.6 2007/02/02 23:14:09 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.3 isinf - test for infinity
- *          IEEE 754 compatible 80-bit extended-precision Intel 386 version
- */
-int
-__isinfl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	return (u.extu_ext.ext_exp == EXT_EXP_INFNAN &&
-	     u.extu_ext.ext_frach == 0x80000000 && u.extu_ext.ext_fracl == 0);
-}
diff --git a/lib/libc/arch/i386/gen/isnanl.c b/lib/libc/arch/i386/gen/isnanl.c
deleted file mode 100644
index 045798c8d..000000000
--- a/lib/libc/arch/i386/gen/isnanl.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: isnanl.c,v 1.8 2011/06/05 14:43:13 christos 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.
- * 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.
- *
- * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isnanl.c,v 1.8 2011/06/05 14:43:13 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.4 isnan - test for a NaN
- *          IEEE 754 compatible 80-bit extended-precision Intel 386 version
- */
-int
-__isnanl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	return (u.extu_ext.ext_exp == EXT_EXP_INFNAN &&
-	    (u.extu_ext.ext_frach & 0x80000000) != 0 &&
-	    (u.extu_ext.ext_frach != 0x80000000 || u.extu_ext.ext_fracl != 0));
-}
diff --git a/lib/libc/arch/i386/gen/makecontext.c b/lib/libc/arch/i386/gen/makecontext.c
deleted file mode 100644
index 11e8ec711..000000000
--- a/lib/libc/arch/i386/gen/makecontext.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.4 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.4 2008/04/28 20:22:56 martin Exp $");
-#endif
-
-#include <inttypes.h>
-#include <stddef.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-
-void
-#if __STDC__
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-#else
-makecontext(ucp, func, argc, va_alist)
-	ucontext_t *ucp;
-	void (*func)();
-	int argc;
-	va_dcl
-#endif
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	unsigned int *sp;
-	va_list ap;
-
-	/* LINTED __greg_t is safe */
-	gr[_REG_EIP] = (__greg_t)func;
-
-	/* LINTED uintptr_t is safe */
-	sp  = (unsigned int *)((uintptr_t)ucp->uc_stack.ss_sp +
-	    ucp->uc_stack.ss_size);
-	/* Align on word boundary. */
-	/* LINTED uintptr_t is safe */
-	sp  = (unsigned int *)((uintptr_t)sp & ~0x3);
-	sp -= argc + 1;			/* Make room for ret and args. */
-	/* LINTED __greg_t is safe */
-	gr[_REG_UESP] = (__greg_t)sp;
-	gr[_REG_EBP] = (__greg_t)0;	/* Wipe out frame pointer. */
-
-	/* Put return address on top of stack. */
-	/* LINTED uintptr_t is safe */
-	*sp++ = (uintptr_t)_resumecontext;
-
-	/* Construct argument list. */
-#if __STDC__
-	va_start(ap, argc);
-#else
-	va_start(ap);
-#endif
-	while (argc-- > 0) {
-		/* LINTED uintptr_t is safe */
-		*sp++ = va_arg(ap, uintptr_t);
-	}
-	va_end(ap);
-}
diff --git a/lib/libc/arch/i386/gen/nanf.c b/lib/libc/arch/i386/gen/nanf.c
deleted file mode 100644
index ac1fde339..000000000
--- a/lib/libc/arch/i386/gen/nanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:01 martin Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:01 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-		{ {    0,    0, 0xc0, 0x7f } };
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/i386/gen/resumecontext.S b/lib/libc/arch/i386/gen/resumecontext.S
deleted file mode 100644
index 0a847c7bc..000000000
--- a/lib/libc/arch/i386/gen/resumecontext.S
+++ /dev/null
@@ -1,84 +0,0 @@
-/*	$NetBSD: resumecontext.S,v 1.8 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1999 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.
- */
-
-#include <machine/asm.h>
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: resumecontext.S,v 1.8 2014/05/23 02:34:19 uebayasi Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-/*
- * This assembly-language implementation differs from the (obvious)
- * C-language implementation only in not clobbering the previous
- * function's return address (us), which is the point of the exercise.
- */
-
-NENTRY(_resumecontext)	/* profiling prologue would clobber TOS */
-	leal	-(4 + 776)(%esp),%ecx	/* retaddr + sizeof (ucontext_t) */
-	andl	$~(0xf),%ecx		/* align on _UC_UCONTEXT_ALIGN */
-	movl	%ecx,%esp
-	PIC_PROLOGUE
-	pushl	%ecx
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(_getcontext))
-#else
-	call	_C_LABEL(_getcontext)
-#endif
-	addl	$4,%esp
-	PIC_EPILOGUE
-	movl	4(%esp),%ecx		/* uc_link */
-	PIC_PROLOGUE
-	pushl	%ecx	/* argument for exit() or setcontext() */
-	testl	%ecx,%ecx		/* link end? */
-	jnz	9f	/* watch out for local label use in PIC_* */
-
-	/* normal exit */
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(exit))
-#else
-	call	_C_LABEL(exit)
-#endif
-	/* NOTREACHED */
-
-9:
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(setcontext))
-#else
-	call	_C_LABEL(setcontext)
-#endif
-	/* NOTREACHED */
-
-	/* something is wrong, pull the brake */
-	pushl	$-1
-	pushl	%eax	/* unused return address */
-	SYSTRAP(exit)
-END(_resumecontext)
diff --git a/lib/libc/arch/i386/gen/setjmp.S b/lib/libc/arch/i386/gen/setjmp.S
deleted file mode 100644
index 0bc6ce0e8..000000000
--- a/lib/libc/arch/i386/gen/setjmp.S
+++ /dev/null
@@ -1,111 +0,0 @@
-/*	$NetBSD: setjmp.S,v 1.17 2014/05/23 03:05:56 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)setjmp.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: setjmp.S,v 1.17 2014/05/23 03:05:56 uebayasi Exp $")
-#endif
-
-/*
- * 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.
- * The previous signal state is restored.
- */
-
-ENTRY(__setjmp14)
-	movl	4(%esp),%ecx
-	movl	0(%esp),%edx
-	movl	%edx, 0(%ecx)
-	movl	%ebx, 4(%ecx)
-	movl	%esp, 8(%ecx)
-	movl	%ebp,12(%ecx)
-	movl	%esi,16(%ecx)
-	movl	%edi,20(%ecx)
-
-	/* Get the signal mask. */
-	leal	24(%ecx),%edx
-
-	PIC_PROLOGUE
-	pushl	%edx
-	pushl	$0
-	pushl	$0
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(__sigprocmask14))
-#else
-	call	_C_LABEL(__sigprocmask14)
-#endif
-	addl	$12,%esp
-	PIC_EPILOGUE
-
-	xorl	%eax,%eax
-	ret
-END(__setjmp14)
-
-ENTRY(__longjmp14)
-	/* Restore the signal mask. */
-	movl	4(%esp),%ecx
-	leal	24(%ecx),%edx
-
-	PIC_PROLOGUE
-	pushl	$0
-	pushl	%edx
-	pushl	$3			/* SIG_SETMASK */
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(__sigprocmask14))
-#else
-	call	_C_LABEL(__sigprocmask14)
-#endif
-	addl	$12,%esp
-	PIC_EPILOGUE
-
-	movl	4(%esp),%edx
-	movl	8(%esp),%eax
-	movl	0(%edx),%ecx
-	movl	4(%edx),%ebx
-	movl	8(%edx),%esp
-	movl	12(%edx),%ebp
-	movl	16(%edx),%esi
-	movl	20(%edx),%edi
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movl	%ecx,0(%esp)
-	ret
-END(__longjmp14)
diff --git a/lib/libc/arch/i386/gen/signbitl.c b/lib/libc/arch/i386/gen/signbitl.c
deleted file mode 100644
index 8ea9a1f4e..000000000
--- a/lib/libc/arch/i386/gen/signbitl.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: signbitl.c,v 1.2 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: signbitl.c,v 1.2 2008/04/28 20:22:56 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.6 signbit - determine whether the sign of an argument is negative
- *          IEEE 754 compatible 80-bit extended-precision Intel 386 version
- */
-int
-__signbitl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	return (u.extu_ext.ext_sign == 1);
-}
diff --git a/lib/libc/arch/i386/gen/sigsetjmp.S b/lib/libc/arch/i386/gen/sigsetjmp.S
deleted file mode 100644
index 25924de52..000000000
--- a/lib/libc/arch/i386/gen/sigsetjmp.S
+++ /dev/null
@@ -1,111 +0,0 @@
-/*	$NetBSD: sigsetjmp.S,v 1.18 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)setjmp.s	5.1 (Berkeley) 4/23/90"
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: sigsetjmp.S,v 1.18 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-ENTRY(__sigsetjmp14)
-	movl	4(%esp),%ecx
-	movl	0(%esp),%edx
-	movl	%edx, 0(%ecx)
-	movl	%ebx, 4(%ecx)
-	movl	%esp, 8(%ecx)
-	movl	%ebp,12(%ecx)
-	movl	%esi,16(%ecx)
-	movl	%edi,20(%ecx)
-
-	/* Check if we should save the signal mask, and remember it. */
-	movl	8(%esp),%eax
-	movl	%eax,40(%ecx)
-	testl	%eax,%eax
-	jz	2f			/* no, skip */
-
-	/* Get the signal mask. */
-	leal	24(%ecx),%edx
-
-	PIC_PROLOGUE
-	pushl	%edx
-	pushl	$0
-	pushl	$0
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(__sigprocmask14))
-#else
-	call	_C_LABEL(__sigprocmask14)
-#endif
-	addl	$12,%esp
-	PIC_EPILOGUE
-
-2:	xorl	%eax,%eax
-	ret
-END(__sigsetjmp14)
-
-ENTRY(__siglongjmp14)
-	/* Check to see if we need to restore the signal mask. */
-	movl	4(%esp),%ecx
-	cmpl	$0,40(%ecx)
-	jz	2f			/* no, skip */
-
-	/* Restore the signal mask. */
-	leal	24(%ecx),%edx
-
-	PIC_PROLOGUE
-	pushl	$0
-	pushl	%edx
-	pushl	$3			/* SIG_SETMASK */
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(__sigprocmask14))
-#else
-	call	_C_LABEL(__sigprocmask14)
-#endif
-	addl	$12,%esp
-	PIC_EPILOGUE
-
-2:	movl	4(%esp),%edx
-	movl	8(%esp),%eax
-	movl	0(%edx),%ecx
-	movl	4(%edx),%ebx
-	movl	8(%edx),%esp
-	movl	12(%edx),%ebp
-	movl	16(%edx),%esi
-	movl	20(%edx),%edi
-	testl	%eax,%eax
-	jnz	3f
-	incl	%eax
-3:	movl	%ecx,0(%esp)
-	ret
-END(__siglongjmp14)
diff --git a/lib/libc/arch/i386/gen/swapcontext.S b/lib/libc/arch/i386/gen/swapcontext.S
deleted file mode 100644
index 94180bb75..000000000
--- a/lib/libc/arch/i386/gen/swapcontext.S
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.8 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1999 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.
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: swapcontext.S,v 1.8 2014/05/23 02:34:19 uebayasi Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-ENTRY(swapcontext)
-	movl	4(%esp),%ecx
-	PIC_PROLOGUE
-	pushl	%ecx			/* push oucp */
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(_getcontext))
-#else
-	call	_C_LABEL(_getcontext)
-#endif
-	addl	$4,%esp			/* pop oucp */
-	PIC_EPILOGUE
-	testl	%eax,%eax
-	jnz	2f
-	movl	4(%esp),%ecx
-	movl	0(%esp),%edx
-	movl	%edx,(36 + 14 * 4)(%ecx)	/*  Adjust saved %eip ... */
-#ifdef __PIC__
-	movl	%ebx,(36 +  8 * 4)(%ecx)	/* ... clobbered PIC reg ... */
-#endif
-	leal	4(%esp),%edx
-	movl	%edx,(36 + 17 * 4)(%ecx)	/* ... and %esp. */
-	/* Note: oucp->%eax has been cleared by getcontext(). */
-	movl	8(%esp),%ecx
-	PIC_PROLOGUE
-	pushl	%ecx			/* push ucp */
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(setcontext))
-#else
-	call	_C_LABEL(setcontext)
-#endif
-	addl	$4,%esp			/* pop ucp */
-	PIC_EPILOGUE
-	/* No need to error-check: setcontext() must have failed. */
-2:	ret	
-END(swapcontext)
diff --git a/lib/libc/arch/i386/gen/udivsi3.S b/lib/libc/arch/i386/gen/udivsi3.S
deleted file mode 100644
index d22609866..000000000
--- a/lib/libc/arch/i386/gen/udivsi3.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: udivsi3.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)udivsi3.s	5.1 (Berkeley) 5/15/90
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: udivsi3.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-ENTRY(__udivsi3)
-	movl 4(%esp),%eax
-	xorl %edx,%edx
-	divl 8(%esp)
-	ret
-END(__udivsi3)
diff --git a/lib/libc/arch/i386/net/Makefile.inc b/lib/libc/arch/i386/net/Makefile.inc
deleted file mode 100644
index 0185ca659..000000000
--- a/lib/libc/arch/i386/net/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2009/12/06 07:12:17 uebayasi Exp $
-
-# objects built from assembler sources (need lint stubs)
-# hton* and nto* functions provided by ../gen/byte_swap_*.S
-SRCS+=  
-
-LSRCS.i386.net=	Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c
-LSRCS+=		${LSRCS.i386.net}
-DPSRCS+=	${LSRCS.i386.net}
-CLEANFILES+=	${LSRCS.i386.net}
diff --git a/lib/libc/arch/i386/stdlib/Makefile.inc b/lib/libc/arch/i386/stdlib/Makefile.inc
deleted file mode 100644
index 189f574a9..000000000
--- a/lib/libc/arch/i386/stdlib/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.9 2009/08/11 17:30:43 dsl Exp $
-
-# objects built from assembler sources
-SRCS+=	abs.S div.S labs.S ldiv.S llabs.S
-NO_SRCS+= imaxabs.S
diff --git a/lib/libc/arch/i386/stdlib/abs.S b/lib/libc/arch/i386/stdlib/abs.S
deleted file mode 100644
index 356ea60fb..000000000
--- a/lib/libc/arch/i386/stdlib/abs.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: abs.S,v 1.8 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)abs.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: abs.S,v 1.8 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-ENTRY(abs)
-	movl	4(%esp),%eax
-	testl	%eax,%eax
-	jns	1f
-	negl	%eax
-1:	ret
-END(abs)
diff --git a/lib/libc/arch/i386/stdlib/div.S b/lib/libc/arch/i386/stdlib/div.S
deleted file mode 100644
index ae46c3601..000000000
--- a/lib/libc/arch/i386/stdlib/div.S
+++ /dev/null
@@ -1,25 +0,0 @@
-/*	$NetBSD: div.S,v 1.10 2014/05/23 02:34:19 uebayasi Exp $	*/
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-RCSID("$NetBSD: div.S,v 1.10 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-ENTRY(div)
-	pushl	%ebx
-	movl	8(%esp),%ebx
-	movl	12(%esp),%eax
-	movl	16(%esp),%ecx
-	cdq
-	idiv	%ecx
-	movl	%eax,(%ebx)
-	movl	%edx,4(%ebx)
-	movl	%ebx,%eax
-	popl	%ebx
-	ret	$4
-END(div)
diff --git a/lib/libc/arch/i386/stdlib/labs.S b/lib/libc/arch/i386/stdlib/labs.S
deleted file mode 100644
index e308ed970..000000000
--- a/lib/libc/arch/i386/stdlib/labs.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: labs.S,v 1.8 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)abs.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: labs.S,v 1.8 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-ENTRY(labs)
-	movl	4(%esp),%eax
-	testl	%eax,%eax
-	jns	1f
-	negl	%eax
-1:	ret
-END(labs)
diff --git a/lib/libc/arch/i386/stdlib/ldiv.S b/lib/libc/arch/i386/stdlib/ldiv.S
deleted file mode 100644
index 94085f472..000000000
--- a/lib/libc/arch/i386/stdlib/ldiv.S
+++ /dev/null
@@ -1,25 +0,0 @@
-/*	$NetBSD: ldiv.S,v 1.10 2014/05/23 02:34:19 uebayasi Exp $	*/
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-RCSID("$NetBSD: ldiv.S,v 1.10 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-ENTRY(ldiv)
-	pushl	%ebx
-	movl	8(%esp),%ebx
-	movl	12(%esp),%eax
-	movl	16(%esp),%ecx
-	cdq
-	idiv	%ecx
-	movl	%eax,(%ebx)
-	movl	%edx,4(%ebx)
-	movl	%ebx,%eax
-	popl	%ebx
-	ret	$4
-END(ldiv)
diff --git a/lib/libc/arch/i386/stdlib/llabs.S b/lib/libc/arch/i386/stdlib/llabs.S
deleted file mode 100644
index d1d0ba2cb..000000000
--- a/lib/libc/arch/i386/stdlib/llabs.S
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: llabs.S,v 1.6 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)abs.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: llabs.S,v 1.6 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(llabs, _llabs)
-WEAK_ALIAS(imaxabs, _llabs)
-#endif
-
-#ifdef WEAK_ALIAS
-ENTRY(_llabs)
-#else
-STRONG_ALIAS(imaxabs, llabs)
-ENTRY(llabs)
-#endif
-	movl	8(%esp),%edx
-	movl	4(%esp),%eax
-	testl	%edx,%edx
-	jns	1f
-	negl	%eax
-	adcl	$0,%edx
-	negl	%edx
-1:	ret
-#ifdef WEAK_ALIAS
-END(_llabs)
-#else
-END(llabs)
-#endif
diff --git a/lib/libc/arch/i386/string/Makefile.inc b/lib/libc/arch/i386/string/Makefile.inc
deleted file mode 100644
index c1611747a..000000000
--- a/lib/libc/arch/i386/string/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2009/07/30 20:57:16 dsl Exp $
-
-# objects built from assembler sources
-SRCS+=	bcmp.S bcopy.S bzero.S ffs.S memchr.S memcmp.S \
-	memcpy.S memmove.S memset.S strcat.S strchr.S \
-	strcmp.S strcpy.S strlen.S strncmp.S strrchr.S swab.S
diff --git a/lib/libc/arch/i386/string/bcmp.S b/lib/libc/arch/i386/string/bcmp.S
deleted file mode 100644
index 85c682356..000000000
--- a/lib/libc/arch/i386/string/bcmp.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: bcmp.S,v 1.10 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-ENTRY(bcmp)
-	pushl	%edi
-	pushl	%esi
-	movl	12(%esp),%edi
-	movl	16(%esp),%esi
-	xorl	%eax,%eax		/* clear return value */
-
-	movl	20(%esp),%ecx		/* compare by words */
-	shrl	$2,%ecx
-	repe
-	cmpsl
-	jne	L1
-
-	movl	20(%esp),%ecx		/* compare remainder by bytes */
-	andl	$3,%ecx
-	repe
-	cmpsb
-	je	L2
-
-L1:	incl	%eax
-L2:	popl	%esi
-	popl	%edi
-	ret
-END(bcmp)
diff --git a/lib/libc/arch/i386/string/bcopy.S b/lib/libc/arch/i386/string/bcopy.S
deleted file mode 100644
index 35fb1df2d..000000000
--- a/lib/libc/arch/i386/string/bcopy.S
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	$NetBSD: bcopy.S,v 1.15 2005/02/09 18:15:16 christos Exp $	*/
-
-#define BCOPY
-#include "memcpy.S"
diff --git a/lib/libc/arch/i386/string/bzero.S b/lib/libc/arch/i386/string/bzero.S
deleted file mode 100644
index f83744741..000000000
--- a/lib/libc/arch/i386/string/bzero.S
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	$NetBSD: bzero.S,v 1.12 2005/02/09 18:15:16 christos Exp $	*/
-
-#define BZERO
-#include "memset.S"
diff --git a/lib/libc/arch/i386/string/index.S b/lib/libc/arch/i386/string/index.S
deleted file mode 100644
index bda26bbe1..000000000
--- a/lib/libc/arch/i386/string/index.S
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: index.S,v 1.14 2005/02/09 18:15:16 christos Exp $ */
-
-#define INDEX
-#include "strchr.S"
diff --git a/lib/libc/arch/i386/string/rindex.S b/lib/libc/arch/i386/string/rindex.S
deleted file mode 100644
index f39cc2c47..000000000
--- a/lib/libc/arch/i386/string/rindex.S
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: rindex.S,v 1.14 2005/02/09 18:15:16 christos Exp $ */
-
-#define RINDEX
-#include "strrchr.S"
diff --git a/lib/libc/arch/i386/string/strncmp.S b/lib/libc/arch/i386/string/strncmp.S
deleted file mode 100644
index 12be5b791..000000000
--- a/lib/libc/arch/i386/string/strncmp.S
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: strncmp.S,v 1.15 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-/*
- * NOTE: I've unrolled the loop eight times: large enough to make a
- * significant difference, and small enough not to totally trash the
- * cache.
- */
-
-ENTRY(strncmp)
-	pushl	%ebx
-	movl	8(%esp),%eax
-	movl	12(%esp),%ecx
-	movl	16(%esp),%edx
-	testl	%edx,%edx
-	jmp	L2			/* Jump into the loop! */
-
-	_ALIGN_TEXT,0x90
-L1:	incl	%eax
-	incl	%ecx
-	decl	%edx
-L2:	jz	L4			/* strings are equal */
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	je	L1
-
-	_ALIGN_TEXT,0x90
-L3:	movzbl	(%eax),%eax		/* unsigned comparison */
-	movzbl	(%ecx),%ecx
-	subl	%ecx,%eax
-	popl	%ebx
-	ret
-	_ALIGN_TEXT,0x90
-L4:	xorl	%eax,%eax
-	popl	%ebx
-	ret
-END(strncmp)
diff --git a/lib/libc/arch/i386/string/swab.S b/lib/libc/arch/i386/string/swab.S
deleted file mode 100644
index f9ba179af..000000000
--- a/lib/libc/arch/i386/string/swab.S
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: swab.S,v 1.14 2014/05/23 02:34:19 uebayasi Exp $")
-#endif
-
-/*
- * On the i486, this code is negligibly faster than the code generated
- * by gcc at about half the size.  If my i386 databook is correct, it
- * should be considerably faster than the gcc code on a i386.
- */
-
-ENTRY(swab)
-	pushl	%esi
-	pushl	%edi
-	movl	12(%esp),%esi
-	movl	16(%esp),%edi
-	movl	20(%esp),%ecx
-
-	shrl	$1,%ecx
-	testl	$7,%ecx			# copy first group of 1 to 7 words
-	jz	L2			# while swapping alternate bytes.
-	_ALIGN_TEXT,0x90
-L1:	lodsw
-	rorw	$8,%ax
-	stosw
-	decl	%ecx
-	testl	$7,%ecx
-	jnz	L1
-
-L2:	shrl	$3,%ecx			# copy remainder 8 words at a time
-	jz	L4			# while swapping alternate bytes.
-	_ALIGN_TEXT,0x90
-L3:	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	decl	%ecx
-	jnz	L3
-
-L4:	popl	%edi
-	popl	%esi
-	ret
-END(swab)
diff --git a/lib/libc/arch/i386/sys/__clone.S b/lib/libc/arch/i386/sys/__clone.S
deleted file mode 100644
index 077347850..000000000
--- a/lib/libc/arch/i386/sys/__clone.S
+++ /dev/null
@@ -1,104 +0,0 @@
-/*	$NetBSD: __clone.S,v 1.6 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Frank van der Linden for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-#include <sys/errno.h>
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(clone, __clone)
-#endif
-	.text
-
-/*
- * int clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-ENTRY(__clone)
-	pushl	%ebp
-
-	/*
-	 * Sanity checks: func and stack may not be NULL.
-	 */
-	movl	8(%esp), %ebp
-	cmpl	$0,%ebp		/* function */
-	je	3f
-	movl	12(%esp),%eax	/* stack */
-	cmpl	$0,%eax
-	je	3f
-
-	/*
-	 * Set up the stack for the clone.
-	 */
-	movl	20(%esp),%ecx
-	movl	%ecx,-4(%eax)	/* argument */
-	leal	-4(%eax),%eax	/* sp points to arg */
-
-	pushl	%eax		/* stack */
-	pushl	20(%esp)	/* flags */
-	pushl	$0		/* dummy return address */
-
-	SYSTRAP(__clone)
-	jc	4f
-	cmpl	$0,%eax
-	jne	2f		/* we're the parent */
-	call	*%ebp		/* this is the clone, call the function */
-
-#ifdef __PIC__
-	PIC_PROLOGUE
-	pushl	%eax		/* clone does _exit(func(arg)); */
-	call	PIC_PLT(_C_LABEL(_exit))
-	addl	$4,%esp
-	PIC_EPILOGUE
-#else
-	pushl	%eax
-	call	_C_LABEL(_exit)
-	addl	$4,%esp
-#endif
-
-2:
-	addl	$12,%esp
-	popl	%ebp
-	ret
-3:
-	movl	$EINVAL,%eax
-	jmp	5f
-4:
-	addl	$12,%esp
-5:
-	popl	%ebp
-	jmp	CERROR
-END(__clone)
diff --git a/lib/libc/arch/i386/sys/__sigaction14_sigtramp.c b/lib/libc/arch/i386/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index dab72d14b..000000000
--- a/lib/libc/arch/i386/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.12 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.12 2008/04/28 20:22:56 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern const int __sigtramp_siginfo_2[];
-
-	/*
-	 * If no sigaction, use the "default" trampoline since it won't
-	 * be used.
-	 */
-	if (act == NULL)
-		return  __sigaction_sigtramp(sig, act, oact, NULL, 0);
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the non-SA_SIGINFO trampoline if SA_SIGINFO is not
-	 * set in the sigaction.
-	 */
-	if ((act->sa_flags & SA_SIGINFO) == 0) {
-		extern const int __sigtramp_sigcontext_1[];
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-		    __sigtramp_sigcontext_1, 1);
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	/*
-	 * If SA_SIGINFO was specified or the compatibility trampolines
-	 * can't be used, use the siginfo trampoline.
-	 */
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/i386/sys/__sigtramp2.S b/lib/libc/arch/i386/sys/__sigtramp2.S
deleted file mode 100644
index d1a8415b5..000000000
--- a/lib/libc/arch/i386/sys/__sigtramp2.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.5 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-/*
- * The i386 signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, stack looks like:
- *
- *		ucontext structure			[12+sizeof(siginfo_t)]
- *		siginfo structure			[12]
- *		pointer to ucontext structure		[8]
- *		pointer to siginfo structure		[4]
- *	sp->	signal number				[0]
- */
-NENTRY(__sigtramp_siginfo_2)
-	leal	12+128(%esp),%eax	/* get address of ucontext */
-	movl	%eax,4(%esp)	/* put it in the argument slot */
-				/* fake return address already there */
-	SYSTRAP(setcontext)	/* do setcontext */
-	movl	$-1,4(%esp)	/* if we return here, something is wrong */
-	SYSTRAP(exit)		/* exit */
-END(__sigtramp_siginfo_2)
diff --git a/lib/libc/arch/i386/sys/__syscall.S b/lib/libc/arch/i386/sys/__syscall.S
deleted file mode 100644
index 796e56e26..000000000
--- a/lib/libc/arch/i386/sys/__syscall.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: __syscall.S,v 1.5 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)syscall.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __syscall.S,v 1.5 2014/05/23 02:34:19 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-ENTRY(__syscall)
-	pop	%ecx	/* rta */
-	pop	%eax	/* syscall number */
-	pop	%edx	/* junk */
-	push	%ecx
-	int	$0x80
-	push	%ecx	/* Keep stack frame consistant */
-	push	%ecx	/* Keep stack frame consistant */
-	jc	err
-	ret
-err:
-	jmp	CERROR
-END(__syscall)
diff --git a/lib/libc/arch/i386/sys/__vfork14.S b/lib/libc/arch/i386/sys/__vfork14.S
deleted file mode 100644
index d3e923ff8..000000000
--- a/lib/libc/arch/i386/sys/__vfork14.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: __vfork14.S,v 1.10 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)Ovfork.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __vfork14.S,v 1.10 2014/05/23 02:34:19 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-/*
- * pid = vfork();
- *
- * %edx == 0 in parent process, %edx == 1 in child process.
- * %eax == pid of child in parent, %eax == pid of parent in child.
- *
- */
-ENTRY(__vfork14)
-	popl	%ecx		/* my rta into %ecx */
-	OSYSTRAP(__vfork14)	/* don't clobber %ecx */
-	jc	err
-	decl	%edx
-	andl	%edx,%eax
-	jmp	*%ecx
-err:
-	pushl	%ecx
-	jmp	CERROR
-END(__vfork14)
diff --git a/lib/libc/arch/i386/sys/brk.S b/lib/libc/arch/i386/sys/brk.S
deleted file mode 100644
index e4761a41a..000000000
--- a/lib/libc/arch/i386/sys/brk.S
+++ /dev/null
@@ -1,93 +0,0 @@
-/*	$NetBSD: brk.S,v 1.24 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)brk.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: brk.S,v 1.24 2014/05/23 02:34:19 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-	.globl	_end
-	.globl	_C_LABEL(__minbrk)
-	.globl	CURBRK
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
-#endif
-
-	.data
-_C_LABEL(__minbrk):
-	.long	_end
-	.text
-
-ENTRY(_brk)
-#ifdef __PIC__
-	movl	4(%esp),%ecx
-	PIC_PROLOGUE
-	movl	PIC_GOT(_C_LABEL(__minbrk)),%edx
-	PIC_EPILOGUE
-	cmpl	%ecx,(%edx)
-	jb	1f
-	movl	(%edx),%ecx
-	movl	%ecx,4(%esp)
-1:
-	OSYSTRAP(break)	/* don't clobber %ecx */
-	jc	err
-	PIC_PROLOGUE
-	movl	PIC_GOT(CURBRK),%edx	# set up GOT addressing
-	PIC_EPILOGUE
-	movl	%ecx,(%edx)
-	xorl	%eax,%eax
-	ret
-err:
-	jmp	CERROR
-#else
-	movl	4(%esp),%ecx
-	cmpl	%ecx,_C_LABEL(__minbrk)
-	jb	1f
-	movl	_C_LABEL(__minbrk),%ecx
-	movl	%ecx,4(%esp)
-1:
-	OSYSTRAP(break)	/* don't clobber %ecx */
-	jc	err
-	movl	%ecx,CURBRK
-	xorl	%eax,%eax
-	ret
-err:
-	jmp	CERROR
-#endif
-END(_brk)
diff --git a/lib/libc/arch/i386/sys/cerror.S b/lib/libc/arch/i386/sys/cerror.S
deleted file mode 100644
index 927d6f80f..000000000
--- a/lib/libc/arch/i386/sys/cerror.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.18 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)cerror.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: cerror.S,v 1.18 2014/05/23 02:34:19 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-	.globl	_C_LABEL(__errno)
-	.protected	CERROR
-
-_ENTRY(CERROR)
-	pushl	%eax
-#ifdef __PIC__
-	PIC_PROLOGUE
-	call	PIC_PLT(_C_LABEL(__errno))
-	PIC_EPILOGUE
-#else
-	call	_C_LABEL(__errno)
-#endif /* __PIC__ */
-	popl	(%eax)
-	movl	$-1,%eax
-	movl	$-1,%edx
-	ret
-END(CERROR)
diff --git a/lib/libc/arch/i386/sys/exect.S b/lib/libc/arch/i386/sys/exect.S
deleted file mode 100644
index 63e53806a..000000000
--- a/lib/libc/arch/i386/sys/exect.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: exect.S,v 1.15 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)exect.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: exect.S,v 1.15 2014/05/23 02:34:19 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-#include <machine/psl.h>
-
-ENTRY(exect)
-	pushfl
-	orb	$(PSL_T>>8),1(%esp)
-	popfl
-	SYSTRAP(execve)
-	jmp	CERROR
-END(exect)
diff --git a/lib/libc/arch/i386/sys/fork.S b/lib/libc/arch/i386/sys/fork.S
deleted file mode 100644
index 61dd06ff8..000000000
--- a/lib/libc/arch/i386/sys/fork.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: fork.S,v 1.10 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)fork.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: fork.S,v 1.10 2014/05/23 02:34:19 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-_SYSCALL(__fork,fork)
-	decl	%edx	/* from 1 to 0 in child, 0 to -1 in parent */
-	andl	%edx,%eax
-	ret		/* pid = fork(); */
-END(__fork)
diff --git a/lib/libc/arch/i386/sys/getcontext.S b/lib/libc/arch/i386/sys/getcontext.S
deleted file mode 100644
index deb05098a..000000000
--- a/lib/libc/arch/i386/sys/getcontext.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.4 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1999 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: getcontext.S,v 1.4 2014/05/23 02:34:19 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS && !lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext, _getcontext)
-#endif
-
-_SYSCALL(_getcontext,getcontext)
-	movl	4(%esp),%ecx
-	movl	0(%esp),%edx
-	movl	%edx,(36 + 14 * 4)(%ecx)	/* Adjust saved %eip ... */
-	leal	4(%esp),%edx
-	movl	%edx,(36 + 17 * 4)(%ecx)	/* ... and %esp. */
-	movl	$0,(36 + 11 * 4)(%ecx)		/* Arrange for return of 0. */
-	xorl	%eax,%eax
-	ret
-END(_getcontext)
diff --git a/lib/libc/arch/i386/sys/pipe.S b/lib/libc/arch/i386/sys/pipe.S
deleted file mode 100644
index f6b30bf9b..000000000
--- a/lib/libc/arch/i386/sys/pipe.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)pipe.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: pipe.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-#endif
-
-_SYSCALL(_pipe,pipe)
-	movl	4(%esp),%ecx
-	movl	%eax,(%ecx)
-	movl	%edx,4(%ecx)
-	xorl	%eax,%eax
-	ret
-END(_pipe)
diff --git a/lib/libc/arch/i386/sys/ptrace.S b/lib/libc/arch/i386/sys/ptrace.S
deleted file mode 100644
index 7f5e4e507..000000000
--- a/lib/libc/arch/i386/sys/ptrace.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.19 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)ptrace.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: ptrace.S,v 1.19 2014/05/23 02:34:19 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-	.globl	_C_LABEL(__errno)
-
-ENTRY(ptrace)
-#ifdef __PIC__
-	PIC_PROLOGUE
-	call	PIC_PLT(_C_LABEL(__errno))
-	PIC_EPILOGUE
-#else
-	call	_C_LABEL(__errno)
-#endif /* __PIC__ */
-	xorl	%edx,%edx
-	movl	%edx,(%eax)
-	SYSTRAP(ptrace)
-	jc	err
-	ret
-err:
-	jmp	CERROR
-END(ptrace)
diff --git a/lib/libc/arch/i386/sys/sbrk.S b/lib/libc/arch/i386/sys/sbrk.S
deleted file mode 100644
index 35b9d18a3..000000000
--- a/lib/libc/arch/i386/sys/sbrk.S
+++ /dev/null
@@ -1,92 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.22 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sbrk.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: sbrk.S,v 1.22 2014/05/23 02:34:19 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-	.globl	_end
-	.globl	CURBRK
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-	.data
-CURBRK:	.long	_end
-	.text
-
-ENTRY(_sbrk)
-#ifdef __PIC__
-	movl	4(%esp),%ecx
-	PIC_PROLOGUE
-	movl	PIC_GOT(CURBRK),%edx
-	PIC_EPILOGUE
-	movl	(%edx),%eax
-	test	%ecx,%ecx
-	jz	out
-	addl	%eax,%ecx
-	movl	%ecx,4(%esp)
-	OSYSTRAP(break)	/* don't clobber %ecx */
-	jc	err
-	PIC_PROLOGUE
-	movl	PIC_GOT(CURBRK),%edx
-	PIC_EPILOGUE
-	movl	(%edx),%eax
-	movl	%ecx,(%edx)
-out:
-	ret
-err:
-	jmp CERROR
-#else
-	movl	4(%esp),%ecx
-	movl	CURBRK,%eax
-	test	%ecx,%ecx
-	jz	out
-	addl	%eax,4(%esp)
-	OSYSTRAP(break)	/* don't clobber %ecx */
-	jc	err
-	movl	CURBRK,%eax
-	addl	%ecx,CURBRK
-out:
-	ret
-err:
-	jmp	CERROR
-#endif
-END(_sbrk)
diff --git a/lib/libc/arch/i386/sys/shmat.S b/lib/libc/arch/i386/sys/shmat.S
deleted file mode 100644
index 0e7842254..000000000
--- a/lib/libc/arch/i386/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2000/07/07 08:20:52 itohy Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/i386/sys/syscall.S b/lib/libc/arch/i386/sys/syscall.S
deleted file mode 100644
index 86b7c4dcf..000000000
--- a/lib/libc/arch/i386/sys/syscall.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.13 2014/05/23 02:34:19 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)syscall.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: syscall.S,v 1.13 2014/05/23 02:34:19 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-ENTRY(syscall)
-	pop	%ecx	/* rta */
-	pop	%eax	/* syscall number */
-	push	%ecx
-	int	$0x80
-	push	%ecx	/* Keep stack frame consistant */
-	jc	err
-	ret
-err:
-	jmp	CERROR
-END(syscall)
diff --git a/lib/libc/arch/ia64/Makefile.inc b/lib/libc/arch/ia64/Makefile.inc
deleted file mode 100644
index 6c135b17b..000000000
--- a/lib/libc/arch/ia64/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2006/09/23 17:39:34 cherry Exp $
-
-SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
diff --git a/lib/libc/arch/ia64/SYS.h b/lib/libc/arch/ia64/SYS.h
deleted file mode 100644
index 8ee7fb443..000000000
--- a/lib/libc/arch/ia64/SYS.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* $NetBSD: SYS.h,v 1.1 2006/09/10 21:22:33 cherry 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>
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-
-#define RET { br.ret.sptk.few rp;; }
-
-#define CALLSYS_ERROR(name)					\
-	CALLSYS_NOERROR(name)					\
-{	cmp.ne  p6,p0=r0,r10;					\
-(p6)    br.cond.sptk.few __cerror ;; }
-
-#define	SYSCALL(name)						\
-ENTRY(name,0);				/* XXX # of args? */	\
-	CALLSYS_ERROR(name)
-
-#define	SYSCALL_NOERROR(name)					\
-ENTRY(name,0);				/* XXX # of args? */	\
-	CALLSYS_NOERROR(name)
-
-#define	PSEUDO(label,name)					\
-ENTRY(label,0);				/* XXX # of args? */	\
-	CALLSYS_ERROR(name);					\
-	RET;							\
-END(label);
-
-#define	PSEUDO_NOERROR(label,name)				\
-ENTRY(label,0);				/* XXX # of args? */	\
-	CALLSYS_NOERROR(name);					\
-	RET;							\
-END(label);
-
-#define RSYSCALL(name)						\
-	SYSCALL(name);						\
-	RET;							\
-END(name)
-
-#define RSYSCALL_NOERROR(name)					\
-	SYSCALL_NOERROR(name);					\
-	RET;							\
-END(name)
-
-#define	WSYSCALL(weak,strong)					\
-	WEAK_ALIAS(weak,strong);				\
-	PSEUDO(strong,weak)
diff --git a/lib/libc/arch/ia64/gdtoa/Makefile.inc b/lib/libc/arch/ia64/gdtoa/Makefile.inc
deleted file mode 100644
index 43505eaa3..000000000
--- a/lib/libc/arch/ia64/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2006/09/22 12:09:24 cherry Exp $
-
-SRCS+=	strtof.c
diff --git a/lib/libc/arch/ia64/gdtoa/arith.h b/lib/libc/arch/ia64/gdtoa/arith.h
deleted file mode 100644
index 4fb91e5d4..000000000
--- a/lib/libc/arch/ia64/gdtoa/arith.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*	$NetBSD: arith.h,v 1.1 2006/09/10 21:22:33 cherry Exp $	*/
-
-#define IEEE_LITTLE_ENDIAN
-#ifndef _IEEE_FP
-#define Sudden_Underflow
-#endif
diff --git a/lib/libc/arch/ia64/gdtoa/gd_qnan.h b/lib/libc/arch/ia64/gdtoa/gd_qnan.h
deleted file mode 100644
index 92b073466..000000000
--- a/lib/libc/arch/ia64/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2006/09/10 21:22:33 cherry Exp $ */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x0
-#define d_QNAN1 0x7ff80000
diff --git a/lib/libc/arch/ia64/gen/Makefile.inc b/lib/libc/arch/ia64/gen/Makefile.inc
deleted file mode 100644
index b6a01e782..000000000
--- a/lib/libc/arch/ia64/gen/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.6 2015/04/17 12:51:05 martin Exp $
-
-SRCS+=	_lwp.c
-SRCS+=	bswap16.c bswap32.c bswap64.c
-SRCS+=	setjmp.S _setjmp.S sigsetjmp.S
-SRCS+=	flt_rounds.c fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-
diff --git a/lib/libc/arch/ia64/gen/_lwp.c b/lib/libc/arch/ia64/gen/_lwp.c
deleted file mode 100644
index f3c5f10fd..000000000
--- a/lib/libc/arch/ia64/gen/_lwp.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.1 2015/04/17 12:51:05 martin Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nathan J. Williams.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.1 2015/04/17 12:51:05 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *),
-    void *arg, void *private, caddr_t stack_base, size_t stack_size)
-{
-#if 0
-	__greg_t *gr;
-
-	getcontext(u);
-	gr = u->uc_mcontext.__gregs;
-
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-	gr[_REG_PC] = (unsigned long)start;
-	gr[_REG_T12] = (unsigned long) start;
-	gr[_REG_RA] = (unsigned long) _lwp_exit;
-	gr[_REG_A0] = (unsigned long) arg;
-	gr[_REG_SP] = ((unsigned long) (stack_base + stack_size)) & ~0x7;
-	gr[_REG_S6] = 0;
-	gr[_REG_UNIQUE] = (unsigned long)private;
-
-	u->uc_flags |= _UC_TLSBASE;
-#endif
-}
diff --git a/lib/libc/arch/ia64/gen/_setjmp.S b/lib/libc/arch/ia64/gen/_setjmp.S
deleted file mode 100644
index 227fb42a8..000000000
--- a/lib/libc/arch/ia64/gen/_setjmp.S
+++ /dev/null
@@ -1,308 +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>
-RCSID("$NetBSD: _setjmp.S,v 1.1 2015/04/17 12:51:05 martin Exp $");
-
-#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'.
-//
-
-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/arch/ia64/gen/flt_rounds.c b/lib/libc/arch/ia64/gen/flt_rounds.c
deleted file mode 100644
index a48a42376..000000000
--- a/lib/libc/arch/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: src/lib/libc/ia64/gen/flt_rounds.c,v 1.1 2004/07/19 08:17:24 das Exp $"); */
-
-#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/arch/ia64/gen/fpgetmask.c b/lib/libc/arch/ia64/gen/fpgetmask.c
deleted file mode 100644
index 6bf750cbd..000000000
--- a/lib/libc/arch/ia64/gen/fpgetmask.c
+++ /dev/null
@@ -1,41 +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: src/lib/libc/ia64/gen/fpgetmask.c,v 1.4 2003/10/22 09:00:07 marcel Exp $"); */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-/* XXX: Move to sysarchs() */
-fp_except
-fpgetmask(void)
-{
-	uint64_t fpsr;
-
-	__asm __volatile("mov %0=ar.fpsr" : "=r" (fpsr));
-	return (~fpsr & 0x3d);
-}
diff --git a/lib/libc/arch/ia64/gen/fpgetround.c b/lib/libc/arch/ia64/gen/fpgetround.c
deleted file mode 100644
index 407edce74..000000000
--- a/lib/libc/arch/ia64/gen/fpgetround.c
+++ /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.
- *
- * $FreeBSD: src/lib/libc/ia64/gen/fpgetround.c,v 1.1 2003/01/11 07:24:54 marcel Exp $
- */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_rnd
-fpgetround(void)
-{
-	uint64_t fpsr;
-
-	__asm __volatile("mov %0=ar.fpsr" : "=r"(fpsr));
-	return ((fp_rnd)((fpsr >> 10) & 3));
-}
diff --git a/lib/libc/arch/ia64/gen/fpsetmask.c b/lib/libc/arch/ia64/gen/fpsetmask.c
deleted file mode 100644
index ea87938c1..000000000
--- a/lib/libc/arch/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: src/lib/libc/ia64/gen/fpsetmask.c,v 1.4 2003/10/22 09:00:07 marcel Exp $"); */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_except
-fpsetmask(fp_except mask)
-{
-	int64_t fpsr;
-	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/arch/ia64/gen/fpsetround.c b/lib/libc/arch/ia64/gen/fpsetround.c
deleted file mode 100644
index 695540692..000000000
--- a/lib/libc/arch/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: src/lib/libc/ia64/gen/fpsetround.c,v 1.1 2003/01/11 07:24:54 marcel Exp $
- */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_rnd
-fpsetround(fp_rnd rnd)
-{
-	uint64_t fpsr;
-	fp_rnd prev;
-
-	__asm __volatile("mov %0=ar.fpsr" : "=r"(fpsr));
-	prev = (fp_rnd)((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/arch/ia64/gen/setjmp.S b/lib/libc/arch/ia64/gen/setjmp.S
deleted file mode 100644
index f35e8cd57..000000000
--- a/lib/libc/arch/ia64/gen/setjmp.S
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: setjmp.S,v 1.1 2015/04/17 12:51:05 martin 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.
- */
-
-#define _LOCORE
-#include <machine/asm.h>
-
-RCSID("$NetBSD: setjmp.S,v 1.1 2015/04/17 12:51:05 martin Exp $")
-
-#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(__setjmp14, 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___sigprocmask14
-	;;
-	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(__setjmp14)
-
-ENTRY(__longjmp14, 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___sigprocmask14
-	;;
-	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(__longjmp14)
diff --git a/lib/libc/arch/ia64/gen/sigsetjmp.S b/lib/libc/arch/ia64/gen/sigsetjmp.S
deleted file mode 100644
index 1ac0dc149..000000000
--- a/lib/libc/arch/ia64/gen/sigsetjmp.S
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: sigsetjmp.S,v 1.1 2015/04/17 12:51:05 martin 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>
-RCSID("$NetBSD: sigsetjmp.S,v 1.1 2015/04/17 12:51:05 martin Exp $");
-
-#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(__sigsetjmp14, 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 __setjmp14
-(p7)	br.cond.dpnt.many _setjmp		
-END(__sigsetjmp14)
-
-ENTRY(__siglongjmp14, 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 __longjmp14
-(p7)	br.cond.dpnt.many _longjmp		
-END(__siglongjmp14)
diff --git a/lib/libc/arch/ia64/net/Makefile.inc b/lib/libc/arch/ia64/net/Makefile.inc
deleted file mode 100644
index fa364cfe5..000000000
--- a/lib/libc/arch/ia64/net/Makefile.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/09/10 21:22:33 cherry Exp $
-#	XXX: Stub
diff --git a/lib/libc/arch/ia64/stdlib/Makefile.inc b/lib/libc/arch/ia64/stdlib/Makefile.inc
deleted file mode 100644
index d1dda0262..000000000
--- a/lib/libc/arch/ia64/stdlib/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 2009/07/31 20:39:59 dsl Exp $
diff --git a/lib/libc/arch/ia64/string/Makefile.inc b/lib/libc/arch/ia64/string/Makefile.inc
deleted file mode 100644
index eebf40a43..000000000
--- a/lib/libc/arch/ia64/string/Makefile.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 2009/07/30 20:57:16 dsl Exp $
-
diff --git a/lib/libc/arch/ia64/sys/__clone.S b/lib/libc/arch/ia64/sys/__clone.S
deleted file mode 100644
index a62702e14..000000000
--- a/lib/libc/arch/ia64/sys/__clone.S
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: __clone.S,v 1.1 2006/09/10 21:22:34 cherry Exp $ */
-	
-/* XXX:	 Stub */
\ No newline at end of file
diff --git a/lib/libc/arch/ia64/sys/__sigaction14_sigtramp.c b/lib/libc/arch/ia64/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index 77451d093..000000000
--- a/lib/libc/arch/ia64/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.2 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern const int __sigtramp_siginfo_2[];
-
-	/*
-	 * If no sigaction, use the "default" trampoline since it won't
-	 * be used.
-	 */
-	if (act == NULL)
-		return  __sigaction_sigtramp(sig, act, oact, NULL, 0);
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the non-SA_SIGINFO trampoline if SA_SIGINFO is not
-	 * set in the sigaction.
-	 */
-	if ((act->sa_flags & SA_SIGINFO) == 0) {
-		extern const int __sigtramp_sigcontext_1[];
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-		    __sigtramp_sigcontext_1, 1);
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	/*
-	 * If SA_SIGINFO was specified or the compatibility trampolines
-	 * can't be used, use the siginfo trampoline.
-	 */
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/ia64/sys/__sigtramp2.S b/lib/libc/arch/ia64/sys/__sigtramp2.S
deleted file mode 100644
index a305ed4ff..000000000
--- a/lib/libc/arch/ia64/sys/__sigtramp2.S
+++ /dev/null
@@ -1,12 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.1 2006/09/23 17:39:34 cherry Exp $	*/
-
-#include "SYS.h"
-
-/* XXX:	 Fix this when we look at signal handling */
-	
-ENTRY(__sigtramp_siginfo_2, 2)
-	/* XXX:	 get pointer to ucontext */
-	/* setcontext() ie. CALLSYS_NOERROR(setcontext)  */ 
-	/* get error code */
-	CALLSYS_NOERROR(exit) /* exit */
-END(__sigtramp_siginfo_2)
\ No newline at end of file
diff --git a/lib/libc/arch/ia64/sys/__syscall.S b/lib/libc/arch/ia64/sys/__syscall.S
deleted file mode 100644
index e3312dbea..000000000
--- a/lib/libc/arch/ia64/sys/__syscall.S
+++ /dev/null
@@ -1,7 +0,0 @@
-/*	$NetBSD: __syscall.S,v 1.2 2006/09/22 12:09:25 cherry Exp $	*/
-
-#include "SYS.h"
-
-	
-RSYSCALL(__syscall)
-
diff --git a/lib/libc/arch/ia64/sys/__vfork14.S b/lib/libc/arch/ia64/sys/__vfork14.S
deleted file mode 100644
index 324396f02..000000000
--- a/lib/libc/arch/ia64/sys/__vfork14.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $NetBSD: __vfork14.S,v 1.2 2006/09/22 17:59:47 cherry Exp $ */
-
-#include "SYS.h"
-
-SYSCALL(__vfork14)
-	/* XXX: watchout for return values for child/parent */ 
-	RET
-END(__vfork14)	
diff --git a/lib/libc/arch/ia64/sys/brk.S b/lib/libc/arch/ia64/sys/brk.S
deleted file mode 100644
index 8be7e907f..000000000
--- a/lib/libc/arch/ia64/sys/brk.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: brk.S,v 1.2 2006/09/23 17:39:34 cherry 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: src/lib/libc/ia64/sys/brk.S,v 1.4 2003/05/16 21:26:39 marcel Exp $"); */
-
-#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/arch/ia64/sys/cerror.S b/lib/libc/arch/ia64/sys/cerror.S
deleted file mode 100644
index 769824104..000000000
--- a/lib/libc/arch/ia64/sys/cerror.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $NetBSD: cerror.S,v 1.2 2006/09/22 17:59:47 cherry Exp $ */
-	
-/*-
- * 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: src/lib/libc/ia64/sys/cerror.S,v 1.2 2003/03/03 01:09:46 obrien Exp $"); */
-
-
-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=__errno
-	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/arch/ia64/sys/exect.S b/lib/libc/arch/ia64/sys/exect.S
deleted file mode 100644
index 5a78ec0eb..000000000
--- a/lib/libc/arch/ia64/sys/exect.S
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: exect.S,v 1.1 2006/09/10 21:22:34 cherry Exp $ */
-	
-/* XXX:	 Stub */
\ No newline at end of file
diff --git a/lib/libc/arch/ia64/sys/fork.S b/lib/libc/arch/ia64/sys/fork.S
deleted file mode 100644
index c0df388ee..000000000
--- a/lib/libc/arch/ia64/sys/fork.S
+++ /dev/null
@@ -1,9 +0,0 @@
-/* $NetBSD: fork.S,v 1.2 2006/09/23 17:39:34 cherry Exp $ */
-	
-#include "SYS.h"
-
-ENTRY(__fork, 0)
-	CALLSYS_ERROR(fork)
-	/* XXX:	 get return value for child */
-	RET
-END(__fork)
\ No newline at end of file
diff --git a/lib/libc/arch/ia64/sys/getcontext.S b/lib/libc/arch/ia64/sys/getcontext.S
deleted file mode 100644
index ea491ab90..000000000
--- a/lib/libc/arch/ia64/sys/getcontext.S
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: getcontext.S,v 1.1 2006/09/10 21:22:34 cherry Exp $ */
-	
-/* XXX:	 Stub */
\ No newline at end of file
diff --git a/lib/libc/arch/ia64/sys/pipe.S b/lib/libc/arch/ia64/sys/pipe.S
deleted file mode 100644
index e545e5a50..000000000
--- a/lib/libc/arch/ia64/sys/pipe.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.2 2006/09/23 17:39:34 cherry 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: src/lib/libc/ia64/sys/pipe.S,v 1.4 2003/05/16 21:26:39 marcel Exp $"); */
-
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-#endif
-/* XXX:	 Relook  param passing	*/
-	
-ENTRY(_pipe, 1)
-	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(_pipe)
diff --git a/lib/libc/arch/ia64/sys/ptrace.S b/lib/libc/arch/ia64/sys/ptrace.S
deleted file mode 100644
index bea78b23a..000000000
--- a/lib/libc/arch/ia64/sys/ptrace.S
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: ptrace.S,v 1.1 2006/09/10 21:22:34 cherry Exp $ */
-	
-/* XXX:	 Stub */
\ No newline at end of file
diff --git a/lib/libc/arch/ia64/sys/sbrk.S b/lib/libc/arch/ia64/sys/sbrk.S
deleted file mode 100644
index 2340e2fa4..000000000
--- a/lib/libc/arch/ia64/sys/sbrk.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.2 2006/09/23 17:39:34 cherry 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: src/lib/libc/ia64/sys/sbrk.S,v 1.5 2003/05/16 21:26:39 marcel Exp $"); */
-
-#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/arch/ia64/sys/shmat.S b/lib/libc/arch/ia64/sys/shmat.S
deleted file mode 100644
index cacc70093..000000000
--- a/lib/libc/arch/ia64/sys/shmat.S
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: shmat.S,v 1.1 2006/09/10 21:22:34 cherry Exp $ */
-	
-/* XXX:	 Stub */
\ No newline at end of file
diff --git a/lib/libc/arch/ia64/sys/syscall.S b/lib/libc/arch/ia64/sys/syscall.S
deleted file mode 100644
index 21359c595..000000000
--- a/lib/libc/arch/ia64/sys/syscall.S
+++ /dev/null
@@ -1,7 +0,0 @@
-/* $NetBSD: syscall.S,v 1.2 2006/09/22 12:09:25 cherry Exp $ */
-	
-#include "SYS.h"
-
-	
-RSYSCALL(syscall)
-
diff --git a/lib/libc/arch/m68k/DEFS.h b/lib/libc/arch/m68k/DEFS.h
deleted file mode 100644
index 1abc2d6b0..000000000
--- a/lib/libc/arch/m68k/DEFS.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: DEFS.h,v 1.3 1995/12/13 22:21:23 thorpej Exp $ */
-
-#include <machine/asm.h>
diff --git a/lib/libc/arch/m68k/Makefile.inc b/lib/libc/arch/m68k/Makefile.inc
deleted file mode 100644
index 34657e9e9..000000000
--- a/lib/libc/arch/m68k/Makefile.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.17 2014/03/04 06:30:40 matt Exp $
-
-SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S __m68k_read_tp.S __mmap.S
-
-ASM+=	_lwp_getprivate.S mremap.S
-
-CPPFLAGS+= -I.		# for assym.h
-
-.if ${MKSOFTFLOAT} != "no"
-#CPPFLAGS+= -DSOFTFLOAT_NEED_FIXUNS
-CPPFLAGS+= -DSOFTFLOAT -DSOFTFLOATM68K_FOR_GCC
-.  include <softfloat/Makefile.inc>
-.elif ${MACHINE_ARCH} != "m68000"
-.PATH : ${ARCHDIR}/hardfloat
-.  include "${ARCHDIR}/hardfloat/Makefile.inc"
-.endif
diff --git a/lib/libc/arch/m68k/SYS.h b/lib/libc/arch/m68k/SYS.h
deleted file mode 100644
index e3393c695..000000000
--- a/lib/libc/arch/m68k/SYS.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.18 2013/07/24 15:38:07 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	from: @(#)SYS.h	5.5 (Berkeley) 5/7/91
- */
-
-#include <sys/syscall.h>
-#include <machine/asm.h>
-
-#ifdef __STDC__
-#define	IMMEDIATE	#
-#define SYSTRAP(x)	movl IMMEDIATE SYS_ ## x ## ,%d0; trap IMMEDIATE 0
-#else
-#define SYSTRAP(x)	movl #SYS_/**/x,%d0; trap #0
-#endif
-
-#define CERROR		_C_LABEL(__cerror)
-
-#define _SYSCALL_NOERROR(x,y)						\
-	ENTRY(x);							\
-	SYSTRAP(y)
-
-#define _SYSCALL(x,y)							\
-	_SYSCALL_NOERROR(x,y);						\
-	jcs CERROR
-
-#define SYSCALL_NOERROR(x)						\
-	_SYSCALL_NOERROR(x,x)
-
-#define SYSCALL(x)							\
-	_SYSCALL(x,x)
-
-#define PSEUDO_NOERROR(x,y)						\
-	_SYSCALL_NOERROR(x,y);						\
-	rts;								\
-	END(x)
-
-#define PSEUDO(x,y)							\
-	_SYSCALL(x,y);							\
-	rts;								\
-	END(x)
-
-#define RSYSCALL_NOERROR(x)						\
-	PSEUDO_NOERROR(x,x)
-
-#define RSYSCALL(x)							\
-	PSEUDO(x,x)
-
-#ifdef WEAK_ALIAS
-#define	WSYSCALL(weak,strong)						\
-	WEAK_ALIAS(weak,strong);					\
-	PSEUDO(strong,weak)
-#else
-#define	WSYSCALL(weak,strong)						\
-	PSEUDO(weak,weak)
-#endif
-
-#define	ASMSTR		.asciz
-
-	.globl	CERROR
-	.hidden	CERROR
diff --git a/lib/libc/arch/m68k/gdtoa/Makefile.inc b/lib/libc/arch/m68k/gdtoa/Makefile.inc
deleted file mode 100644
index ee69deb22..000000000
--- a/lib/libc/arch/m68k/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2014/03/18 18:20:37 riastradh Exp $
-
-SRCS+=	strtof.c
-
-.if ${MACHINE_ARCH} == "m68k"
-SRCS+=	strtold_pxL.c
-SRCS+=	strtopxL.c
-.endif
diff --git a/lib/libc/arch/m68k/gdtoa/arith.h b/lib/libc/arch/m68k/gdtoa/arith.h
deleted file mode 100644
index 4674f629c..000000000
--- a/lib/libc/arch/m68k/gdtoa/arith.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define IEEE_BIG_ENDIAN
diff --git a/lib/libc/arch/m68k/gdtoa/gd_qnan.h b/lib/libc/arch/m68k/gdtoa/gd_qnan.h
deleted file mode 100644
index eb22e0b82..000000000
--- a/lib/libc/arch/m68k/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x7ff80000
-#define d_QNAN1 0x0
-#ifndef __mc68010__
-#define ld_QNAN0 0x7fff0000
-#define ld_QNAN1 0x40000000
-#define ld_QNAN2 0x0
-#endif
diff --git a/lib/libc/arch/m68k/gen/Makefile.inc b/lib/libc/arch/m68k/gen/Makefile.inc
deleted file mode 100644
index 8ff2517f4..000000000
--- a/lib/libc/arch/m68k/gen/Makefile.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.33 2014/03/18 18:20:37 riastradh Exp $
-
-SRCS+=	alloca.S fabs.S
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
-
-SRCS+=	nanf.c
-
-# 68000-based machines use a double-extended `long double' type
-# for which the generic ieee754 versions can be used
-.if	${MACHINE_ARCH} != "m68k"
-SRCS+=	infinityl_dbl_ieee754.c
-.else
-SRCS+=	infinityl.c
-SRCS+=	fpclassifyl.c isfinitel.c isinfl.c isnanl.c signbitl.c
-.endif
-
-SRCS+=	ashlsi3.S ashrsi3.S \
-	lshlsi3.S lshrsi3.S \
-	negdf2.S negsf2.S
-SRCS+=	bswap16.S bswap32.S bswap64.S
-SRCS+=	_lwp.c
-CPPFLAGS._lwp.c	+= -D_LIBC_SOURCE
-
-# 68000-based machines build with a libgcc that includes
-# much of the (soft)float and integer support that would 
-# otherwise be compiled here.
-.if	(${MACHINE_ARCH} == "m68000" || ${MKSOFTFLOAT} == "yes")
-SRCS+=	modf_ieee754.c			# generic ieee754 version
-SRCS+=	flt_rounds_softfloat.S
-.if ${MKSOFTFLOAT} != "yes"
-SRCS+=	fpfake.c
-.endif
-.endif
-
-.if ${MACHINE_ARCH} == "m68k"
-SRCS+=	divsi3.S modsi3.S mulsi3.S udivsi3.S umodsi3.S umulsi3.S
-.endif
-
-SRCS+=	setjmp.S longjmp.c
-SRCS+=	_setjmp.S
-SRCS+=	sigsetjmp.S
-
-SRCS+=	makecontext.c resumecontext.S swapcontext.S
-
-SRCS+=	ldexp_ieee754.c			# generic ieee754 version
-
-LSRCS.m68k.gen=	Lint_bswap16.c Lint_bswap32.c Lint_bswap64.c \
-		Lint_resumecontext.c Lint_swapcontext.c
-LSRCS+=		${LSRCS.m68k.gen}
-DPSRCS+=	${LSRCS.m68k.gen}
-CLEANFILES+=	${LSRCS.m68k.gen}
diff --git a/lib/libc/arch/m68k/gen/_lwp.c b/lib/libc/arch/m68k/gen/_lwp.c
deleted file mode 100644
index ce0e16d47..000000000
--- a/lib/libc/arch/m68k/gen/_lwp.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.8 2012/03/18 16:26:34 christos Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nathan J. Williams and Steve C. Woodford.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.8 2012/03/18 16:26:34 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/tls.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *),
-    void *arg, void *tcb, caddr_t stack_base, size_t stack_size)
-{
-	void **sp;
-
-	getcontext(u);
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-	u->uc_mcontext.__gregs[_REG_PC] = (int)start;
-	
-	sp = (void **)(void *)(stack_base + stack_size);
-	
-	*--sp = arg;
-	*--sp = (void *) _lwp_exit;
-
-	u->uc_mcontext.__gregs[_REG_A7] = (int) sp;
-	u->uc_mcontext._mc_tlsbase = (uintptr_t)tcb + TLS_TP_OFFSET +
-	    sizeof(struct tls_tcb);
-	u->uc_flags |= _UC_TLSBASE;
-}
diff --git a/lib/libc/arch/m68k/gen/_setjmp.S b/lib/libc/arch/m68k/gen/_setjmp.S
deleted file mode 100644
index 99add3220..000000000
--- a/lib/libc/arch/m68k/gen/_setjmp.S
+++ /dev/null
@@ -1,90 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.9 2013/07/16 22:12:20 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)_setjmp.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: _setjmp.S,v 1.9 2013/07/16 22:12:20 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * 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,
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	movl	4(%sp),%a0	/* save area pointer */
-	clrl	(%a0)+		/* no old onstack */
-	clrl	(%a0)+		/* no old sigmask */
-	movl	%sp,(%a0)+	/* save old SP */
-	movl	%a6,(%a0)+	/* save old FP */
-	clrl	(%a0)+		/* no old AP */
-	movl	(%sp),(%a0)+	/* save old PC */
-	clrl	(%a0)+		/* clear PS */
-	moveml	#0x3CFC,(%a0)	/* save other non-scratch regs */
-	clrl	%d0		/* return zero */
-	rts
-END(_setjmp)
-
-ENTRY(_longjmp)
-	movl	4(%sp),%a0	/* save area pointer */
-	addql	#8,%a0		/* skip onstack/sigmask */
-	tstl	(%a0)		/* ensure non-zero SP */
-	jeq	botch		/* oops! */
-	movl	8(%sp),%d0	/* grab return value */
-	jne	ok		/* non-zero ok */
-	moveq	#1,%d0		/* else make non-zero */
-ok:
-	movl	(%a0)+,%sp	/* restore SP */
-	movl	(%a0)+,%a6	/* restore FP */
-	addql	#4,%a0		/* skip AP */
-	movl	(%a0)+,(%sp)	/* restore PC */
-	moveml	4(%a0),#0x3CFC	/* restore non-scratch regs */
-	rts
-
-botch:
-	jbsr	PIC_PLT(_C_LABEL(longjmperror))
-	stop	#0
-END(_longjmp)
diff --git a/lib/libc/arch/m68k/gen/alloca.S b/lib/libc/arch/m68k/gen/alloca.S
deleted file mode 100644
index 106edad5d..000000000
--- a/lib/libc/arch/m68k/gen/alloca.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: alloca.S,v 1.9 2013/07/17 04:57:55 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)alloca.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: alloca.S,v 1.9 2013/07/17 04:57:55 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* like alloc, but automatic free in return */
-
-ENTRY(alloca)
-	movl	(%sp),%a1	/* save return addr */
-	movl	%sp,%d0		/* get current SP value */
-	subl	4(%sp),%d0	/* allocate requested space */
-	movql	#-4,%d1		/* sign extend a mask */
-	andl	%d1,%d0		/* longword align for efficiency */
-	addql	#8,%d0		/* reuse space of call frame */
-	movl	%d0,%sp		/* set new SP value */
-	subql	#4,%sp		/* account for argument pop in caller */
-#ifdef __SVR4_ABI__
-	moveal	%d0,%a0
-#endif
-	jmp 	(%a1)		/* funny return */
-END(alloca)
diff --git a/lib/libc/arch/m68k/gen/ashlsi3.S b/lib/libc/arch/m68k/gen/ashlsi3.S
deleted file mode 100644
index 15dd43947..000000000
--- a/lib/libc/arch/m68k/gen/ashlsi3.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: ashlsi3.S,v 1.7 2013/07/16 22:12:20 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)ashlsi3.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: ashlsi3.S,v 1.7 2013/07/16 22:12:20 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* int << int */
-ENTRY(__ashlsi3)
-	movel	8(%sp),%d1
-	movel	4(%sp),%d0
-	asll	%d1,%d0
-	rts
-END(__ashlsi3)
diff --git a/lib/libc/arch/m68k/gen/ashrsi3.S b/lib/libc/arch/m68k/gen/ashrsi3.S
deleted file mode 100644
index c8556e19b..000000000
--- a/lib/libc/arch/m68k/gen/ashrsi3.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: ashrsi3.S,v 1.7 2013/07/16 22:12:20 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)ashrsi3.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: ashrsi3.S,v 1.7 2013/07/16 22:12:20 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* int >> int */
-ENTRY(__ashrsi3)
-	movel	8(%sp),%d1
-	movel	4(%sp),%d0
-	asrl	%d1,%d0
-	rts
-END(__ashrsi3)
diff --git a/lib/libc/arch/m68k/gen/fabs.S b/lib/libc/arch/m68k/gen/fabs.S
deleted file mode 100644
index faee6429a..000000000
--- a/lib/libc/arch/m68k/gen/fabs.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: fabs.S,v 1.11 2013/07/17 06:43:32 matt Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by 
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: fabs.S,v 1.11 2013/07/17 06:43:32 matt Exp $")
-
-ENTRY(fabs)
-#if defined(__SVR4_ABI__) && defined(__HAVE_FPU__)
-	bclr	#31,4(%sp)
-	fmoved	4(%sp),%fp0
-#else
-	movl	4(%sp),%d0
-	movl	8(%sp),%d1
-	bclr	#31,%d0
-#endif
-	rts
-END(fabs)
diff --git a/lib/libc/arch/m68k/gen/flt_rounds_softfloat.S b/lib/libc/arch/m68k/gen/flt_rounds_softfloat.S
deleted file mode 100644
index c3c5755ed..000000000
--- a/lib/libc/arch/m68k/gen/flt_rounds_softfloat.S
+++ /dev/null
@@ -1,30 +0,0 @@
-/*	$NetBSD: flt_rounds_softfloat.S,v 1.6 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 6, 1995
- * Public domain.
-
- * Broken by Bruce O'Neel Aug 4 2003
-	gcc no longer seems to export fpCCR so this fails.
-	for now just return 0.
- */
-
-#include <machine/asm.h>
-
-	.text
-#if 0
-	/* NB: this is tied to the gcc-2.95 lb1sf68.asm: */
-_map:
-	.byte 1		/* round to nearest */
-	.byte 0		/* round to zero */
-	.byte 2		/* round to positive infinity */
-	.byte 3		/* round to negative infinity */
-#endif
-
-ENTRY(__flt_rounds)
-	/* lea	_C_LABEL(_fpCCR),%a0	| check the rounding mode */
-	/* movew	6(%a0),%d0	| rounding mode in d0 */
-	/* lea	_map,%a0 */
-	moveb	#0,%d0
-	rts
-END(__flt_rounds)
diff --git a/lib/libc/arch/m68k/gen/fpclassifyl.c b/lib/libc/arch/m68k/gen/fpclassifyl.c
deleted file mode 100644
index 5caeebf56..000000000
--- a/lib/libc/arch/m68k/gen/fpclassifyl.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: fpclassifyl.c,v 1.3 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpclassifyl.c,v 1.3 2008/04/28 20:22:56 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <assert.h>
-#include <math.h>
-
-/*
- * 7.12.3.1 fpclassify - classify real floating type
- *          IEEE 754 compatible 80-bit extended-precision Motorola 68k version
- */
-int
-__fpclassifyl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	_DIAGASSERT(u.extu_ext.ext_zero == 0);
-
-	if (u.extu_ext.ext_exp == 0 &&
-	    (u.extu_ext.ext_frach & 0x80000000) == 0) {
-		if ((u.extu_ext.ext_frach & 0x7fffffff) == 0 &&
-		    u.extu_ext.ext_fracl == 0)
-			return FP_ZERO;
-		else
-			return FP_SUBNORMAL;
-	} else if (u.extu_ext.ext_exp == EXT_EXP_INFNAN) {
-		if ((u.extu_ext.ext_frach & 0x7fffffff) == 0 &&
-		    u.extu_ext.ext_fracl == 0)
-			return FP_INFINITE;
-		else
-			return FP_NAN;
-	}
-
-	return FP_NORMAL;
-}
diff --git a/lib/libc/arch/m68k/gen/fpfake.c b/lib/libc/arch/m68k/gen/fpfake.c
deleted file mode 100644
index 6911f0173..000000000
--- a/lib/libc/arch/m68k/gen/fpfake.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <ieeefp.h>
-
-fp_except
-fpgetmask(void)
-{
-	return 0;
-}
-
-fp_rnd
-fpgetround(void)
-{
-	return 0;
-}
-
-fp_except
-fpgetsticky(void)
-{
-	return 0;
-}
-
-/* ARGSUSED */
-fp_except
-fpsetmask(fp_except mask)
-{
-	return 0;
-}
-
-/* ARGSUSED */
-fp_rnd
-fpsetround(fp_rnd rnd_dir)
-{
-	return 0;
-}
-
-/* ARGSUSED */
-fp_except
-fpsetsticky(fp_except sticky)
-{
-	return 0;
-}
diff --git a/lib/libc/arch/m68k/gen/infinityl.c b/lib/libc/arch/m68k/gen/infinityl.c
deleted file mode 100644
index 775388c04..000000000
--- a/lib/libc/arch/m68k/gen/infinityl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*	$NetBSD: infinityl.c,v 1.2 2005/06/12 05:21:26 lukem Exp $	*/
-
-/*
- * IEEE-compatible infinityl.c for Motorola 68k 80-bit format -- public domain.
- * Note that the representation includes 16 bits of padding between exponent
- * and mantissa.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: infinityl.c,v 1.2 2005/06/12 05:21:26 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-
-const union __long_double_u __infinityl =
-	{ { 0x7f, 0xff, 0, 0, 0x80, 0, 0, 0, 0, 0, 0, 0 } };
diff --git a/lib/libc/arch/m68k/gen/isfinitel.c b/lib/libc/arch/m68k/gen/isfinitel.c
deleted file mode 100644
index 8b1fd9781..000000000
--- a/lib/libc/arch/m68k/gen/isfinitel.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: isfinitel.c,v 1.2 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: isfinitel.c,v 1.2 2008/04/28 20:22:56 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <assert.h>
-#include <math.h>
-
-/*
- * 7.12.3.2 isfinite - determine whether an argument has finite value
- *          IEEE 754 compatible 80-bit extended-precision Motorola 68k version
- */
-int
-__isfinitel(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	_DIAGASSERT(u.extu_ext.ext_zero == 0);
-
-	if (u.extu_ext.ext_exp == EXT_EXP_INFNAN)
-		return 0;
-
-	return 1;
-}
diff --git a/lib/libc/arch/m68k/gen/isinfl.c b/lib/libc/arch/m68k/gen/isinfl.c
deleted file mode 100644
index b67676f22..000000000
--- a/lib/libc/arch/m68k/gen/isinfl.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: isinfl.c,v 1.6 2009/01/30 07:00:45 mhitch 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.
- * 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.
- *
- * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isinfl.c,v 1.6 2009/01/30 07:00:45 mhitch Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.3 isinf - test for infinity
- *          IEEE 754 compatible 80-bit extended-precision Motorola 68k version
- */
-int
-__isinfl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	/* Note: the explicit integer bit is "don't care". */
-	return (u.extu_ext.ext_exp == EXT_EXP_INFNAN &&
-	    ((u.extu_ext.ext_frach & 0x7fffffff) == 0 && u.extu_ext.ext_fracl == 0));
-}
diff --git a/lib/libc/arch/m68k/gen/isnanl.c b/lib/libc/arch/m68k/gen/isnanl.c
deleted file mode 100644
index d046f7d33..000000000
--- a/lib/libc/arch/m68k/gen/isnanl.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: isnanl.c,v 1.5 2004/03/04 23:42:38 kleink 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.
- * 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.
- *
- * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isnanl.c,v 1.5 2004/03/04 23:42:38 kleink Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.4 isnan - test for a NaN
- *          IEEE 754 compatible 80-bit extended-precision Motorola 68k version
- */
-int
-__isnanl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	/* Note: the explicit integer bit is "don't care". */
-	return (u.extu_ext.ext_exp == EXT_EXP_INFNAN &&
-	    (u.extu_ext.ext_frach != 0 || u.extu_ext.ext_fracl != 0));
-}
diff --git a/lib/libc/arch/m68k/gen/ldexp_881.c b/lib/libc/arch/m68k/gen/ldexp_881.c
deleted file mode 100644
index ab4a0a4e1..000000000
--- a/lib/libc/arch/m68k/gen/ldexp_881.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: ldexp_881.c,v 1.3 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ldexp_881.c,v 1.3 2008/04/28 20:22:56 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * ldexp(value, exp): return value * (2 ** exp).
- */
-double
-ldexp(value, exp2)
-	double value;
-	int exp2;
-{
-	double temp;
-
-	__asm ("fscalel %2,%1"
-		: "=f" (temp)
-		: "0" (value), "g" (exp2));
-	return (temp);
-}
diff --git a/lib/libc/arch/m68k/gen/longjmp.c b/lib/libc/arch/m68k/gen/longjmp.c
deleted file mode 100644
index e8d5d0387..000000000
--- a/lib/libc/arch/m68k/gen/longjmp.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*	$NetBSD: longjmp.c,v 1.2 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christian Limpach.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define __LIBC12_SOURCE__
-#include <setjmp.h>
-#include <compat/include/setjmp.h>
-
-typedef struct {
-	__greg_t	__data[6];
-	__greg_t	__addr[4];
-} __jmp_buf_regs_t;
-
-void
-__longjmp14(jmp_buf env, int val)
-{
-	struct sigcontext *sc = (void *)env;
-	__jmp_buf_regs_t *r = (void *)&sc[1];
-	ucontext_t uc;
-
-	/* Ensure non-zero SP */
-	if (sc->sc_sp == 0)
-		goto err;
-
-	/* Make return value non-zero */
-	if (val == 0)
-		val = 1;
-
-	/* Save return value in context */
-	uc.uc_mcontext.__gregs[_REG_D0] = val;
-
-	/*
-	 * Set _UC_SIGMASK, _UC_CPU and _UC_M68K_UC_USER
-	 * Set _UC_{SET,CLR}STACK according to SS_ONSTACK
-	 */
-	uc.uc_flags = _UC_SIGMASK | _UC_CPU | _UC_M68K_UC_USER |
-		(sc->sc_onstack ? _UC_SETSTACK : _UC_CLRSTACK);
-
-	/* Clear uc_link */
-	uc.uc_link = 0;
-
-	/* Copy signal mask */
-	uc.uc_sigmask = sc->sc_mask;
-
-	/* Copy SP/PC/PS/FP */
-	uc.uc_mcontext.__gregs[_REG_A7] = sc->sc_sp;
-	uc.uc_mcontext.__gregs[_REG_PC] = sc->sc_pc;
-	uc.uc_mcontext.__gregs[_REG_PS] = sc->sc_ps;
-	uc.uc_mcontext.__gregs[_REG_A6] = sc->sc_fp;
-
-	/* Copy remaining non-scratch regs. */
-	memcpy(&uc.uc_mcontext.__gregs[_REG_D2],
-	    &r->__data, sizeof(r->__data));
-	memcpy(&uc.uc_mcontext.__gregs[_REG_A2],
-	    &r->__addr, sizeof(r->__addr));
-
-	setcontext(&uc);
- err:
-	longjmperror();
-	abort();
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/m68k/gen/lshlsi3.S b/lib/libc/arch/m68k/gen/lshlsi3.S
deleted file mode 100644
index 7a20b8092..000000000
--- a/lib/libc/arch/m68k/gen/lshlsi3.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: lshlsi3.S,v 1.7 2013/07/16 22:12:20 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)lshlsi3.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: lshlsi3.S,v 1.7 2013/07/16 22:12:20 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* unsigned << unsigned */
-ENTRY(__lshlsi3)
-	movel	8(%sp),%d1
-	movel	4(%sp),%d0
-	lsll	%d1,%d0
-	rts
-END(__lshlsi3)
diff --git a/lib/libc/arch/m68k/gen/lshrsi3.S b/lib/libc/arch/m68k/gen/lshrsi3.S
deleted file mode 100644
index 53601346b..000000000
--- a/lib/libc/arch/m68k/gen/lshrsi3.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: lshrsi3.S,v 1.7 2013/07/16 22:12:20 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)lshrsi3.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: lshrsi3.S,v 1.7 2013/07/16 22:12:20 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* unsigned >> unsigned */
-ENTRY(__lshrsi3)
-	movel	8(%sp),%d1
-	movel	4(%sp),%d0
-	lsrl	%d1,%d0
-	rts
-END(__lshrsi3)
diff --git a/lib/libc/arch/m68k/gen/makecontext.c b/lib/libc/arch/m68k/gen/makecontext.c
deleted file mode 100644
index 173904ea6..000000000
--- a/lib/libc/arch/m68k/gen/makecontext.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.3 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.3 2008/04/28 20:22:56 martin Exp $");
-#endif
-
-#include <sys/types.h>
-#include <inttypes.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#include <stdarg.h>
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	mcontext_t *mcp = &ucp->uc_mcontext;
-	int *sp;
-	va_list ap;
-
-	mcp->__gregs[_REG_PC] = (__greg_t)func;
-
-	sp  = (int *)((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
-	sp  = (int *)((uintptr_t)sp & ~0x3);	/* Align on word boundary. */
-	sp -= (argc + 1);		/* Make room for retaddr and args. */
-	mcp->__gregs[_REG_A7] = (__greg_t)sp;
-	mcp->__gregs[_REG_A6] = 0;		/* Wipe out frame pointer. */
-
-	*sp++ = (int)_resumecontext;
-
-	va_start(ap, argc);
-	while (argc-- > 0)
-		*sp++ = va_arg(ap, int);
-	va_end(ap);
-}
diff --git a/lib/libc/arch/m68k/gen/nanf.c b/lib/libc/arch/m68k/gen/nanf.c
deleted file mode 100644
index 8516c1b23..000000000
--- a/lib/libc/arch/m68k/gen/nanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:01 martin Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:01 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-		{ { 0x7f, 0xc0,    0,    0 } };
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/m68k/gen/negdf2.S b/lib/libc/arch/m68k/gen/negdf2.S
deleted file mode 100644
index 0ea21656e..000000000
--- a/lib/libc/arch/m68k/gen/negdf2.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: negdf2.S,v 1.10 2013/07/17 06:43:32 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)negdf2.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: negdf2.S,v 1.10 2013/07/17 06:43:32 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* -double */
-ENTRY(__negdf2)
-#if defined(__SVR4_ABI__) && defined(__HAVE_FPU__)
-	fnegd	4(%sp),%fp0
-#else
-	movel	4(%sp),%d0
-	movel	8(%sp),%d1
-	bchg	#31,%d0
-#endif
-	rts
-END(__negdf2)
diff --git a/lib/libc/arch/m68k/gen/negsf2.S b/lib/libc/arch/m68k/gen/negsf2.S
deleted file mode 100644
index 9c2384b1d..000000000
--- a/lib/libc/arch/m68k/gen/negsf2.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: negsf2.S,v 1.10 2013/07/17 06:43:32 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID"from: @(#)negsf2.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: negsf2.S,v 1.10 2013/07/17 06:43:32 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* -single */
-ENTRY(__negsf2)
-#if defined(__SVR4_ABI__) && defined(__HAVE_FPU__)
-	fnegs	4(%sp),%fp0
-#else
-	movel	4(%sp),%d0
-	bchg	#31,%d0
-#endif
-	rts
-END(__negsf2)
diff --git a/lib/libc/arch/m68k/gen/resumecontext.S b/lib/libc/arch/m68k/gen/resumecontext.S
deleted file mode 100644
index 6169eed63..000000000
--- a/lib/libc/arch/m68k/gen/resumecontext.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: resumecontext.S,v 1.8 2013/07/17 03:04:54 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <machine/asm.h>
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: resumecontext.S,v 1.8 2013/07/17 03:04:54 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-/*
- * This assembly-language implementation differs from the (obvious)
- * C-language implementation only in not clobbering the previous
- * function's return address (us), which is the point of the exercise.
- */
-
-ENTRY(_resumecontext)
-	subl	#(4 + UC_SIZE),%sp	/* retaddr preservation + ucontext_t */
-	lea	(%sp),%a0
-	movl	%a0,-(%sp)
-	jbsr	PIC_PLT(_C_LABEL(_getcontext))
-	movl	(4 + UC_LINK)(%sp),(%sp)	/* uc_link */
-	tstl	(%sp)			/* check for NULL */
-	jne	1f
-	jbsr	PIC_PLT(_C_LABEL(exit))	/* cleanly exit(0) */
-	jmp	2f
-1:	jbsr	PIC_PLT(_C_LABEL(setcontext))
-	/* NOTREACHED */
-	/* But just in case... */
-2:	movl	#-1,(%sp)
-	jbsr	PIC_PLT(_C_LABEL(_exit))
-	/* NOTREACHED */
-END(_resumecontext)
diff --git a/lib/libc/arch/m68k/gen/setjmp.S b/lib/libc/arch/m68k/gen/setjmp.S
deleted file mode 100644
index 3b6ff8d7d..000000000
--- a/lib/libc/arch/m68k/gen/setjmp.S
+++ /dev/null
@@ -1,94 +0,0 @@
-/*	$NetBSD: setjmp.S,v 1.15 2013/07/17 03:05:41 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)setjmp.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: setjmp.S,v 1.15 2013/07/17 03:05:41 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * 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 a struct sigcontext, see <signal.h>
- */
-
-ENTRY(__setjmp14)
-	/* Get signal stack info.  Note overlay of ss_sp and ss_size! */
-	lea	-12(%sp),%sp	/* sizeof(stack_t) */
-	clrl	(%sp)		/* ss = NULL */
-	movl	%sp,4(%sp)	/* oss = stack_t on stack */
-	jbsr	PIC_PLT(_C_LABEL(__sigaltstack14))
-
-	movl	8(%sp),%d0	/* ss_flags */
-	andl	#1,%d0		/* extract SS_ONSTACK */
-	lea	12(%sp),%sp	/* pop stack_t */
-
-	/* Get pointer to jmp_buf; a sigcontext is at the beginning. */
-	movl	4(%sp),%a0
-	movl	%d0,SC_ONSTACK(%a0) /* store onstack */
-	clrl	SC___MASK13(%a0) /* unused word (old style signal mask) */
-
-	/* Get the signal mask. */
-	pea	SC_MASK(%a0)	/* oset = &sc.sc_mask */
-	movl	#0,-(%sp)	/* set = NULL */
-	movl	#0,-(%sp)	/* action = 0 <ignored> */
-	jbsr	PIC_PLT(_C_LABEL(__sigprocmask14))
-	addl	#12,%sp
-
-	movl	4(%sp),%a0	/* get jmp_buf pointer again */
-	lea	4(%sp),%a1	/* adjust SP since we won't rts */
-	movl	%a1,SC_SP(%a0)	/* save SP */
-	movl	%a6,SC_FP(%a0)	/* save FP */
-	clrl	SC_AP(%a0)	/* no AP */
-	movl	(%sp),SC_PC(%a0)/* save return PC */
-	clrl	SC_PS(%a0)	/* clear PS */
-
-	/* Save remaining non-scratch regs after signal mask. */
-	moveml	#0x3CFC,SC_SIZE(%a0)
-
-	clrl	%d0		/* return 0 */
-	rts
-END(__setjmp14)
diff --git a/lib/libc/arch/m68k/gen/signbitl.c b/lib/libc/arch/m68k/gen/signbitl.c
deleted file mode 100644
index 157471634..000000000
--- a/lib/libc/arch/m68k/gen/signbitl.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: signbitl.c,v 1.2 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: signbitl.c,v 1.2 2008/04/28 20:22:56 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.6 signbit - determine whether the sign of an argument is negative
- *          IEEE 754 compatible 80-bit extended-precision Motorola 68k version
- */
-int
-__signbitl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	return (u.extu_ext.ext_sign == 1);
-}
diff --git a/lib/libc/arch/m68k/gen/sigsetjmp.S b/lib/libc/arch/m68k/gen/sigsetjmp.S
deleted file mode 100644
index 5f9af733a..000000000
--- a/lib/libc/arch/m68k/gen/sigsetjmp.S
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: sigsetjmp.S,v 1.10 2013/07/16 22:12:20 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)_setjmp.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: sigsetjmp.S,v 1.10 2013/07/16 22:12:20 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * C library -- sigsetjmp, siglongjmp
- *
- *	siglongjmp(a,v)
- * will generate a "return(v)" from
- * the last call to
- *	sigsetjmp(a,m)
- * by restoring registers from the stack,
- * The previous signal state is restored if 'm' was non-zero.
- */
-
-/* grab _JBLEN */
-#include <m68k/setjmp.h>
-
-ENTRY(__sigsetjmp14)
-	movl	8(%sp),%d1	/* grab the mask */
-        movl	4(%sp),%a0	/* grab the area pointer */
-	movl	%d1,(_JBLEN * 4)(%a0)	/* save at end of area */
-	tstl	%d1
-	bne	dosig
-	jra	PIC_PLT(_C_LABEL(_setjmp))
-dosig:
-	jra	PIC_PLT(_C_LABEL(__setjmp14))
-END(__sigsetjmp14)
-
-
-ENTRY(__siglongjmp14)
-	movl	4(%sp),%a0	/* save area pointer */
-	tstl	(_JBLEN * 4)(%a0) /* check mask... */
-	bne	didsig
-	jra	PIC_PLT(_C_LABEL(_longjmp))
-didsig:
-	jra	PIC_PLT(_C_LABEL(__longjmp14))
-END(__siglongjmp14)
diff --git a/lib/libc/arch/m68k/gen/swapcontext.S b/lib/libc/arch/m68k/gen/swapcontext.S
deleted file mode 100644
index 142e311e6..000000000
--- a/lib/libc/arch/m68k/gen/swapcontext.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.6 2013/07/17 03:05:17 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: swapcontext.S,v 1.6 2013/07/17 03:05:17 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-ENTRY(swapcontext)
-	movl	4(%sp),-(%sp)		| push oucp on stack
-	jbsr	PIC_PLT(_C_LABEL(_getcontext))	| getcontext(oucp)
-	tstl	%d0			| OK?
-	jne	L1
-	movl	(%sp),%a0
-	addql	#8,UC_MCONTEXT_SP(%a0)	| adjust saved stack pointer (again)
-	movl	%sp@(4),UC_MCONTEXT_PC(%a0) | adjust saved program counter (again)
-	movl	12(%sp),(%sp)		| push ucp on stack
-	jbsr	PIC_PLT(_C_LABEL(setcontext))	| setcontext(ucp)
-L1:	addql	#4,%sp			| pop ucp
-	rts
-END(swapcontext)
diff --git a/lib/libc/arch/m68k/gen/umulsi3.S b/lib/libc/arch/m68k/gen/umulsi3.S
deleted file mode 100644
index a60790302..000000000
--- a/lib/libc/arch/m68k/gen/umulsi3.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: umulsi3.S,v 1.7 2013/07/16 22:12:20 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)umulsi3.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: umulsi3.S,v 1.7 2013/07/16 22:12:20 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* unsigned * unsigned */
-ENTRY(__umulsi3)
-	movel	4(%sp),%d0
-	mulul	8(%sp),%d0
-	rts
-END(__umulsi3)
diff --git a/lib/libc/arch/m68k/genassym.cf b/lib/libc/arch/m68k/genassym.cf
deleted file mode 100644
index a9cad0aa4..000000000
--- a/lib/libc/arch/m68k/genassym.cf
+++ /dev/null
@@ -1,52 +0,0 @@
-#	$NetBSD: genassym.cf,v 1.1 2013/07/17 01:41:17 matt Exp $
-
-#
-# Copyright (c) 2013 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Matt Thomas <matt@3am-sfotware.com>.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-include <sys/types.h>
-include <machine/reg.h>
-include <ucontext.h>
-include <signal.h>
-
-define	UC_LINK		offsetof(ucontext_t, uc_link)
-define	UC_SIGMASK	offsetof(ucontext_t, uc_sigmask)
-define	UC_MCONTEXT_D0	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_D0])
-define	UC_MCONTEXT_SP	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_A7])
-define	UC_MCONTEXT_PC	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_PC])
-define	UC_SIZE		sizeof(ucontext_t)
-
-define	SC_ONSTACK	offsetof(struct sigcontext, sc_onstack)
-define	SC___MASK13	offsetof(struct sigcontext, __sc_mask13)
-define	SC_SP		offsetof(struct sigcontext, sc_sp)
-define	SC_FP		offsetof(struct sigcontext, sc_fp)
-define	SC_AP		offsetof(struct sigcontext, sc_ap)
-define	SC_PC		offsetof(struct sigcontext, sc_pc)
-define	SC_PS		offsetof(struct sigcontext, sc_ps)
-define	SC_MASK		offsetof(struct sigcontext, sc_mask)
-define	SC_SIZE		sizeof(struct sigcontext)
diff --git a/lib/libc/arch/m68k/hardfloat/Makefile.inc b/lib/libc/arch/m68k/hardfloat/Makefile.inc
deleted file mode 100644
index 16af53557..000000000
--- a/lib/libc/arch/m68k/hardfloat/Makefile.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2014/03/18 18:20:37 riastradh Exp $
-
-SRCS+=	modf.S
-SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
-	fpsetround.c fpsetsticky.c
-#
-# These allow softfloat programs to use the FPU.
-#
-SRCS+=	adddf3.S addsf3.S cmpdf2.S cmpsf2.S divdf3.S divsf3.S \
-	extendsfdf2.S fixdfsi.S fixunsdfsi.S fixunssfsi.S floatsidf.S \
-	muldf3.S mulsf3.S subdf3.S subsf3.S truncdfsf2.S
-
-SRCS+=	floatunsidf.S floatunsisf.S
-
-SRCS+=	lesf2.S ltsf2.S nesf2.S unordsf2.S
-SRCS+=	ledf2.S ltdf2.S nedf2.S unorddf2.S
diff --git a/lib/libc/arch/m68k/hardfloat/adddf3.S b/lib/libc/arch/m68k/hardfloat/adddf3.S
deleted file mode 100644
index 7cc8dc39a..000000000
--- a/lib/libc/arch/m68k/hardfloat/adddf3.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: adddf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)adddf3.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: adddf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* double + double */
-ENTRY(__adddf3)
-	fmoved	4(%sp),%fp0
-	faddd	12(%sp),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,-(%sp)
-	movel	(%sp)+,%d0
-	movel	(%sp)+,%d1
-#endif
-	rts
-END(__adddf3)
diff --git a/lib/libc/arch/m68k/hardfloat/addsf3.S b/lib/libc/arch/m68k/hardfloat/addsf3.S
deleted file mode 100644
index 27893dcaf..000000000
--- a/lib/libc/arch/m68k/hardfloat/addsf3.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: addsf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)addsf3.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: addsf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* single + single */
-ENTRY(__addsf3)
-	fmoves	4(%sp),%fp0
-	fadds	8(%sp),%fp0
-#ifndef __SVR4_ABI__
-	fmoves	%fp0,%d0
-#endif
-	rts
-END(__addsf3)
diff --git a/lib/libc/arch/m68k/hardfloat/cmpdf2.S b/lib/libc/arch/m68k/hardfloat/cmpdf2.S
deleted file mode 100644
index e75b9d673..000000000
--- a/lib/libc/arch/m68k/hardfloat/cmpdf2.S
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: cmpdf2.S,v 1.3 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)cmpdf2.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: cmpdf2.S,v 1.3 2014/03/18 18:20:37 riastradh Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* double > double: 1 */
-/* double < double: -1 */
-/* double == double: 0 */
-ENTRY(__cmpdf2)
-	fmoved	4(%sp),%fp0
-	fcmpd	12(%sp),%fp0
-	fbgt	Lbgt
-#ifdef __mcoldfire__
-	fbeq	Lbeq
-	movql	#-1,%d0
-#else
-	fslt	%d0
-	extbl	%d0
-#endif
-	rts
-Lbgt:
-	moveq	#1,%d0
-	rts
-#ifdef __mcoldfire__
-Lbeq:
-	clrl	%d0
-	rts
-#endif
-END(__cmpdf2)
diff --git a/lib/libc/arch/m68k/hardfloat/cmpsf2.S b/lib/libc/arch/m68k/hardfloat/cmpsf2.S
deleted file mode 100644
index 934d364e2..000000000
--- a/lib/libc/arch/m68k/hardfloat/cmpsf2.S
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: cmpsf2.S,v 1.3 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)cmpsf2.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: cmpsf2.S,v 1.3 2014/03/18 18:20:37 riastradh Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* single > single: 1 */
-/* single < single: -1 */
-/* single == single: 0 */
-ENTRY(__cmpsf2)
-	fmoves	4(%sp),%fp0
-	fcmps	8(%sp),%fp0
-	fbgt	Lbgt
-#ifdef __mcoldfire__
-	fbeq	Lbeq
-	movql	#-1,%d0
-#else
-	fslt	%d0
-	extbl	%d0
-#endif
-	rts
-Lbgt:
-	moveq	#1,%d0
-	rts
-#ifdef __mcoldfire__
-Lbeq:
-	clrl	%d0
-	rts
-#endif
-END(__cmpsf2)
diff --git a/lib/libc/arch/m68k/hardfloat/divdf3.S b/lib/libc/arch/m68k/hardfloat/divdf3.S
deleted file mode 100644
index 222d22367..000000000
--- a/lib/libc/arch/m68k/hardfloat/divdf3.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: divdf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)divdf3.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: divdf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* double / double */
-ENTRY(__divdf3)
-	fmoved	4(%sp),%fp0
-	fdivd	12(%sp),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,-(%sp)
-	movel	(%sp)+,%d0
-	movel	(%sp)+,%d1
-#endif
-	rts
-END(__divdf3)
diff --git a/lib/libc/arch/m68k/hardfloat/divsf3.S b/lib/libc/arch/m68k/hardfloat/divsf3.S
deleted file mode 100644
index 0ee7b5c6d..000000000
--- a/lib/libc/arch/m68k/hardfloat/divsf3.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: divsf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)divsf3.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: divsf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* single / single */
-ENTRY(__divsf3)
-	fmoves	4(%sp),%fp0
-	fdivs	8(%sp),%fp0
-#ifndef __SVR4_ABI__
-	fmoves	%fp0,%d0
-#endif
-	rts
-END(__divsf3)
diff --git a/lib/libc/arch/m68k/hardfloat/extendsfdf2.S b/lib/libc/arch/m68k/hardfloat/extendsfdf2.S
deleted file mode 100644
index e3088d513..000000000
--- a/lib/libc/arch/m68k/hardfloat/extendsfdf2.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: extendsfdf2.S,v 1.1 2013/07/17 06:39:06 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)extendsfdf2.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: extendsfdf2.S,v 1.1 2013/07/17 06:39:06 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* (double) float */
-ENTRY(__extendsfdf2)
-	fmoves	4(%sp),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,-(%sp)
-	movel	(%sp)+,%d0
-	movel	(%sp)+,%d1
-#endif
-	rts
-END(__extendsfdf2)
diff --git a/lib/libc/arch/m68k/hardfloat/fixdfsi.S b/lib/libc/arch/m68k/hardfloat/fixdfsi.S
deleted file mode 100644
index 1303c786e..000000000
--- a/lib/libc/arch/m68k/hardfloat/fixdfsi.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: fixdfsi.S,v 1.1 2013/07/17 06:39:06 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)fixdfsi.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: fixdfsi.S,v 1.1 2013/07/17 06:39:06 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* (int) double */
-ENTRY(__fixdfsi)
-	fintrzd	4(%sp),%fp0
-	fmovel	%fp0,%d0
-	rts
-END(__fixdfsi)
diff --git a/lib/libc/arch/m68k/hardfloat/fixunsdfsi.S b/lib/libc/arch/m68k/hardfloat/fixunsdfsi.S
deleted file mode 100644
index f4f3f18aa..000000000
--- a/lib/libc/arch/m68k/hardfloat/fixunsdfsi.S
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: fixunsdfsi.S,v 1.3 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)fixunsdfsi.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: fixunsdfsi.S,v 1.3 2014/03/18 18:20:37 riastradh Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __mcoldfire__
-	.section .rodata,"a"
-	.p2align 4
-L2G:	.double 0r2147483648.0
-#endif
-
-/* (unsigned) double */
-ENTRY(__fixunsdfsi)
-	fintrzd	4(%sp),%fp0
-#ifdef __mcoldfire__
-	LEA_LCL(L2G,%a0)
-	fmoved	(%a0),%fp1
-	fcmpd	%fp1,%fp0
-#else
-	fmoved	#0r2147483648.0,%fp1
-	fcmpx	%fp1,%fp0
-#endif
-	fbge	Lwaybig
-	fmovel	%fp0,%d0
-	rts
-Lwaybig:
-#ifdef __mcoldfire__
-	fsubd	%fp1,%fp0
-#else
-	fsubx	%fp1,%fp0
-#endif
-	fmovel	%fp0,%d0
-	bset	#31,%d0
-	rts
-END(__fixunsdfsi)
diff --git a/lib/libc/arch/m68k/hardfloat/fixunssfsi.S b/lib/libc/arch/m68k/hardfloat/fixunssfsi.S
deleted file mode 100644
index 5c77bee8b..000000000
--- a/lib/libc/arch/m68k/hardfloat/fixunssfsi.S
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: fixunssfsi.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)fixunssfsi.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: fixunssfsi.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __mcoldfire__
-	.section .rodata,"a"
-	.p2align 4
-L2G:	.double 0r2147483648.0
-#endif
-
-/* single -> unsigned */
-ENTRY(__fixunssfsi)
-	fintrzs	4(%sp),%fp0
-#ifdef __mcoldfire__
-	LEA_LCL(L2G,%a0)
-	fmoved	(%a0),%fp1
-	fcmpd	%fp1,%fp0
-#else
-	fmoved	#0r2147483648.0,%fp1
-	fcmpx	%fp1,%fp0
-#endif
-	fbge	Lwaybig
-	fmovel	%fp0,%d0
-	rts
-Lwaybig:
-#ifdef __mcoldfire__
-	fsubd	%fp1,%fp0
-#else
-	fsubx	%fp1,%fp0
-#endif
-	fmovel	%fp0,%d0
-	bset	#31,%d0
-	rts
-END(__fixunssfsi)
diff --git a/lib/libc/arch/m68k/hardfloat/floatsidf.S b/lib/libc/arch/m68k/hardfloat/floatsidf.S
deleted file mode 100644
index 08f07a129..000000000
--- a/lib/libc/arch/m68k/hardfloat/floatsidf.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: floatsidf.S,v 1.1 2013/07/17 06:39:06 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)floatsidf.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: floatsidf.S,v 1.1 2013/07/17 06:39:06 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* (double) int */
-ENTRY(__floatsidf)
-	fmovel	4(%sp),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,-(%sp)
-	movel	(%sp)+,%d0
-	movel	(%sp)+,%d1
-#endif
-	rts
-END(__floatsidf)
diff --git a/lib/libc/arch/m68k/hardfloat/floatunsidf.S b/lib/libc/arch/m68k/hardfloat/floatunsidf.S
deleted file mode 100644
index 10a337f73..000000000
--- a/lib/libc/arch/m68k/hardfloat/floatunsidf.S
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: floatunsidf.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: floatunsidf.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __mcoldfire__
-	.section .rodata,"a"
-	.p2align 2
-L2G:	.double 0r2147483648.0
-#endif
-
-/* LINTSTUB: double __floatunsidf(unsigned int); */
-ENTRY(__floatunsidf)
-	movl	4(%sp),%d0
-	jpl	1f
-	fmovel	%d0,%fp0
-#ifdef __SVR4_ABI__
-	rts
-#else
-	jra	Lret
-#endif
-1:
-	bclr	#31,%d0
-	fmovel	%d0,%fp0
-#ifdef __mcoldfire__
-	LEA_LCL(L2G,%a0)
-	faddd	(%a0),%fp0
-#else
-	faddd	#0r2147483648.0,%fp0
-#endif
-#ifndef __SVR4_ABI__
-Lret:
-	fmoved	%fp0,-(%sp)
-	movel	(%sp)+,%d0
-	movel	(%sp)+,%d1
-#endif
-	rts
-END(__floatunsidf)
diff --git a/lib/libc/arch/m68k/hardfloat/floatunsisf.S b/lib/libc/arch/m68k/hardfloat/floatunsisf.S
deleted file mode 100644
index 864b5cc1d..000000000
--- a/lib/libc/arch/m68k/hardfloat/floatunsisf.S
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: floatunsisf.S,v 1.3 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: floatunsisf.S,v 1.3 2014/03/18 18:20:37 riastradh Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __mcoldfire__
-	.section .rodata,"a"
-	.p2align 2
-L2G:	.double 0r2147483648.0
-#endif
-
-/* LINTSTUB: double __floatunsisf(unsigned int); */
-ENTRY(__floatunsisf)
-	movl	4(%sp),%d0
-	jpl	1f
-	fmovel	%d0,%fp0
-#ifndef __SVR4_ABI__
-	fmoves	%fp0,%d0
-#endif
-	rts
-1:
-	bclr	#31,%d0
-	fmovel	%d0,%fp0
-#ifdef __mcoldfire__
-	LEA_LCL(L2G,%a0)
-	faddd	(%a0),%fp0
-#else
-	faddd	#0r2147483648.0,%fp0
-#endif
-#ifndef __SVR4_ABI__
-	fmoves	%fp0,%d0
-#endif
-	rts
-END(__floatunsisf)
diff --git a/lib/libc/arch/m68k/hardfloat/flt_rounds.c b/lib/libc/arch/m68k/hardfloat/flt_rounds.c
deleted file mode 100644
index 81aaef6b0..000000000
--- a/lib/libc/arch/m68k/hardfloat/flt_rounds.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#include <m68k/fpreg.h>
-
-int	__flt_rounds(void);
-
-int
-__flt_rounds(void)
-{
-	int fpcr;
-
-	__asm("fmovel %%fpcr,%0" : "=d"(fpcr));
-
-	return __SHIFTOUT(fpcr, FPCR_ROUND) ^ 1;
-}
diff --git a/lib/libc/arch/m68k/hardfloat/fpgetmask.c b/lib/libc/arch/m68k/hardfloat/fpgetmask.c
deleted file mode 100644
index 48adb2ab4..000000000
--- a/lib/libc/arch/m68k/hardfloat/fpgetmask.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#include <m68k/fpreg.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetmask,_fpgetmask)
-#endif
-
-fp_except
-_fpgetmask(void)
-{
-	int fpcr;
-
-	__asm("fmovel %%fpcr,%0" : "=d"(fpcr));
-
-	return __SHIFTOUT(fpcr, FPCR_EXCP2);
-}
diff --git a/lib/libc/arch/m68k/hardfloat/fpgetround.c b/lib/libc/arch/m68k/hardfloat/fpgetround.c
deleted file mode 100644
index 9965d1102..000000000
--- a/lib/libc/arch/m68k/hardfloat/fpgetround.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#include <m68k/fpreg.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetround,_fpgetround)
-#endif
-
-fp_rnd
-_fpgetround(void)
-{
-	int fpcr;
-
-	__asm("fmovel %%fpcr,%0" : "=d"(fpcr));
-
-	return __SHIFTOUT(fpcr, FPCR_ROUND);
-}
diff --git a/lib/libc/arch/m68k/hardfloat/fpgetsticky.c b/lib/libc/arch/m68k/hardfloat/fpgetsticky.c
deleted file mode 100644
index 69973abe2..000000000
--- a/lib/libc/arch/m68k/hardfloat/fpgetsticky.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#include <m68k/fpreg.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-fp_except
-_fpgetsticky(void)
-{
-	int fpsr;
-
-	__asm("fmovel %%fpsr,%0" : "=d"(fpsr));
-
-	return __SHIFTOUT(fpsr, FPSR_AEX);
-}
diff --git a/lib/libc/arch/m68k/hardfloat/fpsetmask.c b/lib/libc/arch/m68k/hardfloat/fpsetmask.c
deleted file mode 100644
index b619224de..000000000
--- a/lib/libc/arch/m68k/hardfloat/fpsetmask.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#include <m68k/fpreg.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetmask,_fpsetmask)
-#endif
-
-fp_except
-_fpsetmask(fp_except new)
-{
-	int old_fpcr, new_fpcr;
-
-	__asm("fmovel %%fpcr,%0" : "=d"(old_fpcr));
-
-	new_fpcr = (old_fpcr & ~FPCR_EXCP2) | __SHIFTIN(new, FPCR_EXCP2);
-
-	__asm("fmovel %0,%%fpcr" :: "d"(new_fpcr));
-
-	return __SHIFTOUT(old_fpcr, FPCR_EXCP2);
-}
diff --git a/lib/libc/arch/m68k/hardfloat/fpsetround.c b/lib/libc/arch/m68k/hardfloat/fpsetround.c
deleted file mode 100644
index 2c93f39ac..000000000
--- a/lib/libc/arch/m68k/hardfloat/fpsetround.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#include <m68k/fpreg.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetround,_fpsetround)
-#endif
-
-fp_rnd
-_fpsetround(fp_rnd new)
-{
-	int old_fpcr, new_fpcr;
-
-	__asm("fmovel %%fpcr,%0" : "=d"(old_fpcr));
-
-	new_fpcr = (old_fpcr & ~FPCR_ROUND) | __SHIFTIN(new, FPCR_ROUND);
-
-	__asm("fmovel %0,%%fpcr" :: "d"(new_fpcr));
-
-	return __SHIFTOUT(old_fpcr, FPCR_ROUND);
-}
diff --git a/lib/libc/arch/m68k/hardfloat/fpsetsticky.c b/lib/libc/arch/m68k/hardfloat/fpsetsticky.c
deleted file mode 100644
index f202ef926..000000000
--- a/lib/libc/arch/m68k/hardfloat/fpsetsticky.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#include <m68k/fpreg.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetsticky,_fpsetsticky)
-#endif
-
-fp_except
-_fpsetsticky(fp_except new)
-{
-	int old_fpsr, new_fpsr;
-
-	__asm("fmovel %%fpsr,%0" : "=d"(old_fpsr));
-
-	new_fpsr = (old_fpsr & ~FPSR_AEX) | __SHIFTIN(new, FPSR_AEX);
-
-	__asm("fmovel %0,%%fpsr" :: "d"(new_fpsr));
-
-	return __SHIFTOUT(old_fpsr, FPSR_AEX);
-}
diff --git a/lib/libc/arch/m68k/hardfloat/ldexp_881.c b/lib/libc/arch/m68k/hardfloat/ldexp_881.c
deleted file mode 100644
index 319271a5c..000000000
--- a/lib/libc/arch/m68k/hardfloat/ldexp_881.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: ldexp_881.c,v 1.1 2013/07/17 06:39:06 matt Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ldexp_881.c,v 1.1 2013/07/17 06:39:06 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * ldexp(value, exp): return value * (2 ** exp).
- */
-double
-ldexp(value, exp2)
-	double value;
-	int exp2;
-{
-	double temp;
-
-	__asm ("fscalel %2,%1"
-		: "=f" (temp)
-		: "0" (value), "g" (exp2));
-	return (temp);
-}
diff --git a/lib/libc/arch/m68k/hardfloat/ledf2.S b/lib/libc/arch/m68k/hardfloat/ledf2.S
deleted file mode 100644
index 434a23485..000000000
--- a/lib/libc/arch/m68k/hardfloat/ledf2.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: ledf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: ledf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-STRONG_ALIAS(__gtdf2,__ledf2)
-
-/* libgcc1.c says a > b */
-/* libgcc1.c says 1 - (a <= b) */
-ENTRY(__ledf2)
-	fmoved	4(%sp),%fp0
-	fcmpd	12(%sp),%fp0
-	fbgt	Lbgt
-	movql	#1,%d0
-	rts
-Lbgt:
-	clrl	%d0
-	rts
-END(__ledf2)
diff --git a/lib/libc/arch/m68k/hardfloat/lesf2.S b/lib/libc/arch/m68k/hardfloat/lesf2.S
deleted file mode 100644
index 33b89b3fe..000000000
--- a/lib/libc/arch/m68k/hardfloat/lesf2.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: lesf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: lesf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-STRONG_ALIAS(__gtsf2,__lesf2)
-
-/* libgcc1.c says a > b */
-/* libgcc1.c says 1 - (a <= b) */
-ENTRY(__lesf2)
-	fmoves	4(%sp),%fp0
-	fcmps	8(%sp),%fp0
-	fbgt	Lbgt
-	movql	#1,%d0
-	rts
-Lbgt:
-	clrl	%d0
-	rts
-END(__lesf2)
diff --git a/lib/libc/arch/m68k/hardfloat/ltdf2.S b/lib/libc/arch/m68k/hardfloat/ltdf2.S
deleted file mode 100644
index 5a99e3e0a..000000000
--- a/lib/libc/arch/m68k/hardfloat/ltdf2.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: ltdf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: ltdf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-STRONG_ALIAS(__gedf2,__ltdf2)
-
-/* libgcc1.c says (a >= b) - 1 */
-/* libgcc1.c says -(a < b) */
-ENTRY(__ltdf2)
-	fmoved	4(%sp),%fp0
-	fcmpd	12(%sp),%fp0
-	fbge	Lbge
-	movql	#-1,%d0
-	rts
-Lbge:
-	clrl	%d0
-	rts
-END(__ltdf2)
diff --git a/lib/libc/arch/m68k/hardfloat/ltsf2.S b/lib/libc/arch/m68k/hardfloat/ltsf2.S
deleted file mode 100644
index 43a4103f3..000000000
--- a/lib/libc/arch/m68k/hardfloat/ltsf2.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: ltsf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: ltsf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-STRONG_ALIAS(__gesf2,__ltsf2)
-
-/* libgcc1.c says (a >= b) - 1 */
-/* libgcc1.c says -(a < b) */
-ENTRY(__ltsf2)
-	fmoves	4(%sp),%fp0
-	fcmps	8(%sp),%fp0
-	fbge	Lbge
-	movql	#-1,%d0
-	rts
-Lbge:
-	clrl	%d0
-	rts
-END(__ltsf2)
diff --git a/lib/libc/arch/m68k/hardfloat/modf.S b/lib/libc/arch/m68k/hardfloat/modf.S
deleted file mode 100644
index 6ef2d89ad..000000000
--- a/lib/libc/arch/m68k/hardfloat/modf.S
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: modf.S,v 1.3 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)modf.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: modf.S,v 1.3 2014/03/18 18:20:37 riastradh Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * double modf(val, iptr)
- * returns: xxx and n (in *iptr) where val == n.xxx
- */
-ENTRY(modf)
-	fmoved	4(%sp),%fp0
-	movel	12(%sp),%a0
-#ifdef __mcoldfire__
-	fintrzd	%fp0,%fp1
-#else
-	fintrzx	%fp0,%fp1
-#endif
-	fmoved	%fp1,(%a0)
-#ifdef __mcoldfire__
-	fsubd	%fp1,%fp0
-#else
-	fsubx	%fp1,%fp0
-#endif
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,-(%sp)
-	movel	(%sp)+,%d0
-	movel	(%sp)+,%d1
-#endif
-	rts
-END(modf)
diff --git a/lib/libc/arch/m68k/hardfloat/muldf3.S b/lib/libc/arch/m68k/hardfloat/muldf3.S
deleted file mode 100644
index 13c5f9492..000000000
--- a/lib/libc/arch/m68k/hardfloat/muldf3.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: muldf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)muldf3.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: muldf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* double * double */
-ENTRY(__muldf3)
-	fmoved	4(%sp),%fp0
-	fmuld	12(%sp),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,-(%sp)
-	movel	(%sp)+,%d0
-	movel	(%sp)+,%d1
-#endif
-	rts
-END(__muldf3)
diff --git a/lib/libc/arch/m68k/hardfloat/mulsf3.S b/lib/libc/arch/m68k/hardfloat/mulsf3.S
deleted file mode 100644
index 896c370a0..000000000
--- a/lib/libc/arch/m68k/hardfloat/mulsf3.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: mulsf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)mulsf3.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: mulsf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* single * single */
-ENTRY(__mulsf3)
-	fmoves	4(%sp),%fp0
-	fmuls	8(%sp),%fp0
-#ifndef __SVR4_ABI__
-	fmoves	%fp0,%d0
-#endif
-	rts
-END(__mulsf3)
diff --git a/lib/libc/arch/m68k/hardfloat/nedf2.S b/lib/libc/arch/m68k/hardfloat/nedf2.S
deleted file mode 100644
index 9ed331b43..000000000
--- a/lib/libc/arch/m68k/hardfloat/nedf2.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: nedf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: nedf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-STRONG_ALIAS(__eqdf2,__nedf2)
-
-/* single != single: 1 */
-/* single == single: 0 */
-ENTRY(__nedf2)
-	fmoved	4(%sp),%fp0
-	fcmpd	12(%sp),%fp0
-	fbeq	Lbeq
-	movql	#1,%d0
-	rts
-Lbeq:
-	clrl	%d0
-	rts
-END(__nedf2)
diff --git a/lib/libc/arch/m68k/hardfloat/nesf2.S b/lib/libc/arch/m68k/hardfloat/nesf2.S
deleted file mode 100644
index 311062a88..000000000
--- a/lib/libc/arch/m68k/hardfloat/nesf2.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: nesf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: nesf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-STRONG_ALIAS(__eqsf2,__nesf2)
-
-/* single != single: 1 */
-/* single == single: 0 */
-ENTRY(__nesf2)
-	fmoves	4(%sp),%fp0
-	fcmps	8(%sp),%fp0
-	fbeq	Lbeq
-	movql	#1,%d0
-	rts
-Lbeq:
-	clrl	%d0
-	rts
-END(__nesf2)
diff --git a/lib/libc/arch/m68k/hardfloat/subdf3.S b/lib/libc/arch/m68k/hardfloat/subdf3.S
deleted file mode 100644
index 7f2b988e7..000000000
--- a/lib/libc/arch/m68k/hardfloat/subdf3.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: subdf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)subdf3.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: subdf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* double - double */
-ENTRY(__subdf3)
-	fmoved	4(%sp),%fp0
-	fsubd	12(%sp),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,-(%sp)
-	movel	(%sp)+,%d0
-	movel	(%sp)+,%d1
-#endif
-	rts
-END(__subdf3)
diff --git a/lib/libc/arch/m68k/hardfloat/subsf3.S b/lib/libc/arch/m68k/hardfloat/subsf3.S
deleted file mode 100644
index 10e7af8b5..000000000
--- a/lib/libc/arch/m68k/hardfloat/subsf3.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: subsf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)subsf3.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: subsf3.S,v 1.1 2013/07/17 06:39:06 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* single - single */
-ENTRY(__subsf3)
-	fmoves	4(%sp),%fp0
-	fsubs	8(%sp),%fp0
-#ifndef __SVR4_ABI__
-	fmoves	%fp0,%d0
-#endif
-	rts
-END(__subsf3)
diff --git a/lib/libc/arch/m68k/hardfloat/truncdfsf2.S b/lib/libc/arch/m68k/hardfloat/truncdfsf2.S
deleted file mode 100644
index 234d617e4..000000000
--- a/lib/libc/arch/m68k/hardfloat/truncdfsf2.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: truncdfsf2.S,v 1.1 2013/07/17 06:39:06 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)truncdfsf2.s	5.1 (Berkeley) 6/7/90")
-#else
-	RCSID("$NetBSD: truncdfsf2.S,v 1.1 2013/07/17 06:39:06 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* (float) double */
-ENTRY(__truncdfsf2)
-	fmoved	4(%sp),%fp0
-#ifndef __SVR4_ABI__
-	fmoves	%fp0,%d0
-#endif
-	rts
-END(__truncdfsf2)
diff --git a/lib/libc/arch/m68k/hardfloat/unorddf2.S b/lib/libc/arch/m68k/hardfloat/unorddf2.S
deleted file mode 100644
index d407a267f..000000000
--- a/lib/libc/arch/m68k/hardfloat/unorddf2.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: unorddf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: unorddf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/* libgcc1.c says 0 if both are ordered */
-ENTRY(__unordsf2)
-	fmoves	4(%sp),%fp0
-	fcmps	8(%sp),%fp0
-	fbor	Lbor
-	movql	#1,%d0
-	rts
-Lbor:
-	clrl	%d0
-	rts
-END(__unordsf2)
diff --git a/lib/libc/arch/m68k/hardfloat/unordsf2.S b/lib/libc/arch/m68k/hardfloat/unordsf2.S
deleted file mode 100644
index 38756b00b..000000000
--- a/lib/libc/arch/m68k/hardfloat/unordsf2.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: unordsf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: unordsf2.S,v 1.2 2014/03/18 18:20:37 riastradh Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/* libgcc1.c says (a >= b) - 1 */
-/* libgcc1.c says -(a < b) */
-ENTRY(__unorddf2)
-	fmoved	4(%sp),%fp0
-	fcmpd	12(%sp),%fp0
-	fbor	Lbor
-	movql	#1,%d0
-	rts
-Lbor:
-	clrl	%d0
-	rts
-END(__unorddf2)
diff --git a/lib/libc/arch/m68k/net/Makefile.inc b/lib/libc/arch/m68k/net/Makefile.inc
deleted file mode 100644
index dc2ddf344..000000000
--- a/lib/libc/arch/m68k/net/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 1995/02/25 14:58:55 cgd Exp $
-
-SRCS+=  htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/arch/m68k/quad/ashldi3.S b/lib/libc/arch/m68k/quad/ashldi3.S
deleted file mode 100644
index f3b654822..000000000
--- a/lib/libc/arch/m68k/quad/ashldi3.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: ashldi3.S,v 1.8 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-
-| d0 msw
-| d1 lsw
-| d2 shift
-| d3 offset (32 - shift)
-
-ENTRY(__ashldi3)
-	link	%fp,#-12
-	moveml	%d2-%d4,(%sp)
-	movel	8(%fp),%d0
-	movel	12(%fp),%d1
-	movel	16(%fp),%d2
-	moveq	#32,%d3
-	subl	%d2,%d3
-	jgt	L2
-	negl	%d3
-	movel	%d1,%d0
-	asll	%d3,%d0
-	clrl	%d1
-	jra	L3
-L2:	asll	%d2,%d0
-	movel	%d1,%d4
-	lsrl	%d3,%d4
-	orl	%d4,%d0
-	asll	%d2,%d1
-L3:	moveml	-12(%fp),%d2-%d4
-	unlk	%fp
-	rts
-END(__ashldi3)
diff --git a/lib/libc/arch/m68k/quad/ashrdi3.S b/lib/libc/arch/m68k/quad/ashrdi3.S
deleted file mode 100644
index 354488af4..000000000
--- a/lib/libc/arch/m68k/quad/ashrdi3.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: ashrdi3.S,v 1.8 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-
-| d0 msw
-| d1 lsw
-| d2 shift
-| d3 offset (32 - shift)
-
-ENTRY(__ashrdi3)
-	link	%fp,#-12
-	moveml	%d2-%d4,(%sp)
-	movel	8(%fp),%d0
-	movel	12(%fp),%d1
-	movel	16(%fp),%d2
-	moveq	#32,%d3
-	subl	%d2,%d3
-	jgt	L2
-	negl	%d3
-	movel	%d0,%d1
-	asrl	%d3,%d1
-	smi	%d0
-	extbl	%d0
-	jra	L3
-L2:	lsrl	%d2,%d1
-	movel	%d0,%d4
-	asll	%d3,%d4
-	orl	%d4,%d1
-	asrl	%d2,%d0
-L3:	moveml	-12(%fp),%d2-%d4
-	unlk	%fp
-	rts
-END(__ashrdi3)
diff --git a/lib/libc/arch/m68k/quad/lshrdi3.S b/lib/libc/arch/m68k/quad/lshrdi3.S
deleted file mode 100644
index 1ff0aa7c3..000000000
--- a/lib/libc/arch/m68k/quad/lshrdi3.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: lshrdi3.S,v 1.9 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-
-| d0 msw
-| d1 lsw
-| d2 shift
-| d3 offset (32 - shift)
-
-ENTRY(__lshrdi3)
-	link	%fp,#-12
-	moveml	%d2-%d4,(%sp)
-	movel	8(%fp),%d0
-	movel	12(%fp),%d1
-	movel	16(%fp),%d2
-	moveq	#32,%d3
-	subl	%d2,%d3
-	jgt	L2
-	negl	%d3
-	movel	%d0,%d1
-	lsrl	%d3,%d1
-	clrl	%d0
-	jra	L3
-L2:	lsrl	%d2,%d1
-	movel	%d0,%d4
-	asll	%d3,%d4
-	orl	%d4,%d1
-	lsrl	%d2,%d0
-L3:	moveml	-12(%fp),%d2-%d4
-	unlk	%fp
-	rts
-END(__lshrdi3)
diff --git a/lib/libc/arch/m68k/softfloat/m68k-gcc.h b/lib/libc/arch/m68k/softfloat/m68k-gcc.h
deleted file mode 100644
index 07bd45b37..000000000
--- a/lib/libc/arch/m68k/softfloat/m68k-gcc.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$NetBSD: m68k-gcc.h,v 1.2 2005/12/24 21:11:16 perry Exp $	*/
-
-/*
--------------------------------------------------------------------------------
-One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
--------------------------------------------------------------------------------
-*/
-#include <machine/endian.h>
-#if _BYTE_ORDER == _BIG_ENDIAN
-#define BIGENDIAN
-#endif
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#define LITTLEENDIAN
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `BITS64' can be defined to indicate that 64-bit integer types are
-supported by the compiler.
--------------------------------------------------------------------------------
-*/
-#define BITS64
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines the most convenient type that holds
-integers of at least as many bits as specified.  For example, `uint8' should
-be the most convenient type that can hold unsigned integers of as many as
-8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
-implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
-to the same as `int'.
--------------------------------------------------------------------------------
-*/
-typedef int flag;
-typedef int uint8;
-typedef int int8;
-typedef int uint16;
-typedef int int16;
-typedef unsigned int uint32;
-typedef signed int int32;
-#ifdef BITS64
-typedef unsigned long long int uint64;
-typedef signed long long int int64;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines a type that holds integers
-of _exactly_ the number of bits specified.  For instance, for most
-implementation of C, `bits16' and `sbits16' should be `typedef'ed to
-`unsigned short int' and `signed short int' (or `short int'), respectively.
--------------------------------------------------------------------------------
-*/
-typedef unsigned char bits8;
-typedef signed char sbits8;
-typedef unsigned short int bits16;
-typedef signed short int sbits16;
-typedef unsigned int bits32;
-typedef signed int sbits32;
-#ifdef BITS64
-typedef unsigned long long int bits64;
-typedef signed long long int sbits64;
-#endif
-
-#ifdef BITS64
-/*
--------------------------------------------------------------------------------
-The `LIT64' macro takes as its argument a textual integer literal and
-if necessary ``marks'' the literal as having a 64-bit integer type.
-For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
-appended with the letters `LL' standing for `long long', which is `gcc's
-name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
-defined as the identity macro:  `#define LIT64( a ) a'.
--------------------------------------------------------------------------------
-*/
-#define LIT64( a ) a##LL
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `INLINE' can be used before functions that should be inlined.  If
-a compiler does not support explicit inlining, this macro should be defined
-to be `static'.
--------------------------------------------------------------------------------
-*/
-#define INLINE static inline
-
-#define FLOAT64_DEMANGLE(a)	(a)
-#define FLOAT64_MANGLE(a)	(a)
diff --git a/lib/libc/arch/m68k/softfloat/milieu.h b/lib/libc/arch/m68k/softfloat/milieu.h
deleted file mode 100644
index 462472b23..000000000
--- a/lib/libc/arch/m68k/softfloat/milieu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: milieu.h,v 1.1 2004/09/26 21:13:27 jmmv Exp $	*/
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "m68k-gcc.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
diff --git a/lib/libc/arch/m68k/softfloat/softfloat.h b/lib/libc/arch/m68k/softfloat/softfloat.h
deleted file mode 100644
index 054a236e5..000000000
--- a/lib/libc/arch/m68k/softfloat/softfloat.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*	$NetBSD: softfloat.h,v 1.7 2014/09/01 07:33:31 matt Exp $	*/
-
-/* This is a derivative work. */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.  The same applies to
-the `FLOAT128' macro and the quadruple-precision format `float128'.
--------------------------------------------------------------------------------
-*/
-#ifndef __mcoldfire__
-#define FLOATX80
-#endif
-/* #define FLOAT128 */
-
-#include <machine/ieeefp.h>
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef unsigned int float32;
-typedef unsigned long long float64;
-#ifdef FLOATX80
-typedef struct {
-    unsigned short high;
-    unsigned long long low;
-} floatx80;
-#endif
-#ifdef FLOAT128
-typedef struct {
-    unsigned long long high, low;
-} float128;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-#ifndef SOFTFLOAT_FOR_GCC
-extern int8 float_detect_tininess;
-#endif
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern fp_rnd float_rounding_mode;
-#define float_round_nearest_even FP_RN
-#define float_round_to_zero      FP_RZ
-#define float_round_down         FP_RM
-#define float_round_up           FP_RP
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-*/
-extern fp_except float_exception_flags;
-extern fp_except float_exception_mask;
-enum {
-    float_flag_inexact   = FP_X_IMP,
-    float_flag_underflow = FP_X_UFL,
-    float_flag_overflow  = FP_X_OFL,
-    float_flag_divbyzero = FP_X_DZ,
-    float_flag_invalid   = FP_X_INV
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( fp_except );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int32 );
-float32 uint32_to_float32( uint32 );
-float64 int32_to_float64( int32 );
-float64 uint32_to_float64( uint32 );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( int32 );
-floatx80 uint32_to_floatx80( uint32 );
-#endif
-#ifdef FLOAT128
-float128 int32_to_float128( int32 );
-float128 uint32_to_float128( uint32 );
-#endif
-float32 int64_to_float32( long long );
-float64 int64_to_float64( long long );
-#ifdef FLOATX80
-floatx80 int64_to_floatx80( long long );
-#endif
-#ifdef FLOAT128
-float128 int64_to_float128( long long );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float32_to_int32( float32 );
-int float32_to_int32_round_to_zero( float32 );
-unsigned int float32_to_uint32_round_to_zero( float32 );
-long long float32_to_int64( float32 );
-long long float32_to_int64_round_to_zero( float32 );
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-#ifdef FLOAT128
-float128 float32_to_float128( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-flag float32_eq( float32, float32 );
-flag float32_le( float32, float32 );
-flag float32_lt( float32, float32 );
-flag float32_eq_signaling( float32, float32 );
-flag float32_le_quiet( float32, float32 );
-flag float32_lt_quiet( float32, float32 );
-#if !defined(SOFTFLOAT_FOR_GCC) || defined(SOFTFLOATM68K_FOR_GCC)
-flag float32_is_signaling_nan( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float64_to_int32( float64 );
-int float64_to_int32_round_to_zero( float64 );
-unsigned int float64_to_uint32_round_to_zero( float64 );
-long long float64_to_int64( float64 );
-long long float64_to_int64_round_to_zero( float64 );
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-#ifdef FLOAT128
-float128 float64_to_float128( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-flag float64_eq( float64, float64 );
-flag float64_le( float64, float64 );
-flag float64_lt( float64, float64 );
-flag float64_eq_signaling( float64, float64 );
-flag float64_le_quiet( float64, float64 );
-flag float64_lt_quiet( float64, float64 );
-flag float64_is_signaling_nan( float64 );
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int floatx80_to_int32( floatx80 );
-int floatx80_to_int32_round_to_zero( floatx80 );
-long long floatx80_to_int64( floatx80 );
-long long floatx80_to_int64_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-#ifdef FLOAT128
-float128 floatx80_to_float128( floatx80 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern int floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-flag floatx80_eq( floatx80, floatx80 );
-flag floatx80_le( floatx80, floatx80 );
-flag floatx80_lt( floatx80, floatx80 );
-flag floatx80_eq_signaling( floatx80, floatx80 );
-flag floatx80_le_quiet( floatx80, floatx80 );
-flag floatx80_lt_quiet( floatx80, floatx80 );
-flag floatx80_is_signaling_nan( floatx80 );
-flag floatx80_is_nan( floatx80 );
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float128_to_int32( float128 );
-int float128_to_int32_round_to_zero( float128 );
-long long float128_to_int64( float128 );
-long long float128_to_int64_round_to_zero( float128 );
-float32 float128_to_float32( float128 );
-float64 float128_to_float64( float128 );
-#ifdef FLOATX80
-floatx80 float128_to_floatx80( float128 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision operations.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 );
-float128 float128_add( float128, float128 );
-float128 float128_sub( float128, float128 );
-float128 float128_mul( float128, float128 );
-float128 float128_div( float128, float128 );
-float128 float128_rem( float128, float128 );
-float128 float128_sqrt( float128 );
-flag float128_eq( float128, float128 );
-flag float128_le( float128, float128 );
-flag float128_lt( float128, float128 );
-flag float128_eq_signaling( float128, float128 );
-flag float128_le_quiet( float128, float128 );
-flag float128_lt_quiet( float128, float128 );
-flag float128_is_signaling_nan( float128 );
-
-#endif
diff --git a/lib/libc/arch/m68k/stdlib/Makefile.inc b/lib/libc/arch/m68k/stdlib/Makefile.inc
deleted file mode 100644
index 4945ed9a0..000000000
--- a/lib/libc/arch/m68k/stdlib/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.7 2009/08/11 17:30:43 dsl Exp $
-
-SRCS+=	abs.S llabs.S
-NO_SRCS+= labs.S imaxabs.S
diff --git a/lib/libc/arch/m68k/stdlib/abs.S b/lib/libc/arch/m68k/stdlib/abs.S
deleted file mode 100644
index 835b406e1..000000000
--- a/lib/libc/arch/m68k/stdlib/abs.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: abs.S,v 1.8 2013/07/16 21:48:32 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)abs.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: abs.S,v 1.8 2013/07/16 21:48:32 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* labs - long int absolute value */
-
-ENTRY_NOPROFILE(labs)
-/* fall through to: */
-
-/* abs - int absolute value */
-
-ENTRY(abs)
-	movl	4(%sp),%d0
-	jge	L1
-	negl	%d0
-L1:
-	rts
-END(abs)
diff --git a/lib/libc/arch/m68k/stdlib/llabs.S b/lib/libc/arch/m68k/stdlib/llabs.S
deleted file mode 100644
index 5b456cae1..000000000
--- a/lib/libc/arch/m68k/stdlib/llabs.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: llabs.S,v 1.6 2013/07/16 21:48:32 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)abs.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: llabs.S,v 1.6 2013/07/16 21:48:32 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-WEAK_ALIAS(llabs, _llabs)
-WEAK_ALIAS(imaxabs, _llabs)
-
-/* llabs - long long int absolute value */
-
-ENTRY(_llabs)
-	movl	8(%sp),%d1
-	movl	4(%sp),%d0
-	jge	L1
-	negl	%d1
-	negxl	%d0
-L1:
-	rts
-END(_llabs)
diff --git a/lib/libc/arch/m68k/string/Makefile.inc b/lib/libc/arch/m68k/string/Makefile.inc
deleted file mode 100644
index 239dce29d..000000000
--- a/lib/libc/arch/m68k/string/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2009/07/30 20:57:16 dsl Exp $
-
-SRCS+=	bcmp.S bcopy.S bzero.S ffs.S memcmp.S memset.S \
-	strcat.S strcmp.S strcpy.S strlen.S \
-	strncmp.S strncpy.S \
-	swab.S
-SRCS+=	memcpy.S memccpy.S memmove.S strchr.S strrchr.S
diff --git a/lib/libc/arch/m68k/string/memccpy.S b/lib/libc/arch/m68k/string/memccpy.S
deleted file mode 100644
index c453f3a78..000000000
--- a/lib/libc/arch/m68k/string/memccpy.S
+++ /dev/null
@@ -1,99 +0,0 @@
-/*	$NetBSD: memccpy.S,v 1.5 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*
- * Copyright (C) 1999 Scott Reynolds.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: memccpy.S,v 1.5 2014/03/18 18:20:37 riastradh Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-ENTRY(memccpy)
-	movl	16(%sp),%d0		| count
-	jeq	Lmcbail			| nothing to do
-
-	movl	4(%sp),%a0		| a0 = toaddr
-#ifndef __mcoldfire__
-	subql	#1,%d0			|   prepare count for DBcc loop
-#endif
-	movl	8(%sp),%a1		| a1 = fromaddr
-	movl	12(%sp),%d1		| d1 = terminator
-	jeq	Lmcloop			|   handle ASCII NUL specially
-
-	movl	%d2,-(%sp)		| save scratch register
-Lmcnzloop:
-	movb	(%a1)+,%d2		| move a byte
-	movb	%d2,(%a0)+
-	cmpb	%d2,%d1			| found the terminator?
-#ifndef __mcoldfire__
-	dbeq	%d0,Lmcnzloop		| if not, keep transferring,
-#endif
-	jeq	Lmcnzdone		|   otherwise done
-#ifdef __mcoldfire__
-	subql	#1,%d0
-	jne	Lmcnzloop
-#else
-	clrw	%d0			| check to see if more to do
-	subql	#1,%d0
-	jcc	Lmcnzloop		| yes, keep going...
-#endif
-
-	movl	(%sp)+,%d2		| restore scratch register
-	movql	#0,%d0			| no terminator found, return NULL
-#ifdef __SVR4_ABI__
-	movl	%d0,%a0			| XXX maybe use lea to avoid stall?
-#endif
-	rts
-
-Lmcloop:
-	movb	(%a1)+,(%a0)+		| move a byte; was it NUL?
-#ifndef __mcoldfire__
-	dbeq	%d0,Lmcloop		| if not, keep transferring,
-#endif
-	jeq	Lmcdone			|   otherwise done
-#ifdef __mcoldfire__
-	subql	#1,%d0
-	jne	Lmcloop
-#else
-	clrw	%d0			| check to see if more to do
-	subql	#1,%d0
-	jcc	Lmcloop			| yes, keep going...
-#endif
-					| Note: %d0 is now -1!
-	movql	#0,%d0			| no terminator found, return NULL
-Lmcbail:
-#ifdef __SVR4_ABI__
-	movl	%d0,%a0			| XXX maybe use lea to avoid stall?
-#endif
-	rts
-
-Lmcnzdone:
-	movl	(%sp)+,%d2		| restore scratch register
-Lmcdone:
-	movl	%a0,%d0
-	rts
-END(memccpy)
diff --git a/lib/libc/arch/m68k/string/swab.S b/lib/libc/arch/m68k/string/swab.S
deleted file mode 100644
index abb33a69f..000000000
--- a/lib/libc/arch/m68k/string/swab.S
+++ /dev/null
@@ -1,27 +0,0 @@
-/*	$NetBSD: swab.S,v 1.11 2014/03/18 18:20:37 riastradh Exp $	*/
-
-#include <machine/asm.h>
-
-ENTRY(swab)
-	movl	4(%sp),%a0		| source
-	movl	8(%sp),%a1		| destination
-	movl	12(%sp),%d0		| count
-	lsrl	#1,%d0			| count is in bytes; we need words
-	jeq	swdone
-
-swloop:
-#ifdef __mcoldfire__
-	movb	(%a0)+,1(%a1)
-	movb	(%a0)+,(%a1)
-	addql	#2,%a1
-#else
-	movw	(%a0)+,%d1
-	rorw	#8,%d1
-	movw	%d1,(%a1)+
-#endif
-	subql	#1,%d0
-	jne	swloop
-
-swdone:
-	rts
-END(swab)
diff --git a/lib/libc/arch/m68k/sys/__clone.S b/lib/libc/arch/m68k/sys/__clone.S
deleted file mode 100644
index 9eaa6c78d..000000000
--- a/lib/libc/arch/m68k/sys/__clone.S
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: __clone.S,v 1.5 2013/07/16 23:00:15 matt Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Steve C. Woodford.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(clone, __clone)
-#endif
-
-/*
- * int clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-ENTRY(__clone)
-	movl	4(%sp),%d0	/* NULL function pointer? */
-	jeq	2f		/* Yup, bomb out */
-	movl	%d0,%a1
-	movl	8(%sp),%d0	/* NULL stack? */
-	jeq	2f		/* Yup, bomb out */
-	movl	%d0,%a0
-	movl	16(%sp),-(%a0)	/* Push clone's `arg' on its new stack */
-	lea	-12(%a0),%a0	/* Fake syscall args for the clone */
-	movl	%a0,-(%sp)	/* Syscall arg: stack */
-	movl	16(%sp),-(%sp)	/* Syscall arg: flags */
-	clrl	-(%sp)		/* Fake return address */
-	SYSTRAP(__clone)	/* Note: `fn' in (a1) is preserved */
-	lea	12(%sp),%sp	/* Zap syscall args */
-	jcs	3f		/* Punt if syscall failed */
-	tstl	%d0
-	jne	1f		/* We're the parent, just return. */
-	jsr	(%a1)		/* We're the clone, call the function */
-	movl	%d0,-(%sp)	/* If clone returns, invoke _exit(3) */
-	jbsr	PIC_PLT(_C_LABEL(_exit))
-	/* NOTREACHED */
-1:	rts
-2:	movl	#EINVAL,%d0
-3:	jbra	CERROR
-END(__clone)
diff --git a/lib/libc/arch/m68k/sys/__m68k_read_tp.S b/lib/libc/arch/m68k/sys/__m68k_read_tp.S
deleted file mode 100644
index 5eebab60b..000000000
--- a/lib/libc/arch/m68k/sys/__m68k_read_tp.S
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "SYS.h"
-
-ENTRY(__m68k_read_tp)
-	SYSTRAP(_lwp_getprivate)
-	movl	%d0,%a0
-	rts
-END(__m68k_read_tp)
diff --git a/lib/libc/arch/m68k/sys/__mmap.S b/lib/libc/arch/m68k/sys/__mmap.S
deleted file mode 100644
index bba2da734..000000000
--- a/lib/libc/arch/m68k/sys/__mmap.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: __mmap.S,v 1.3 2013/07/16 22:19:37 matt Exp $	*/
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-_SYSCALL(__mmap,mmap)
-#ifdef	__SVR4_ABI__
-	movl	%d0,%a0
-#endif
-	rts
-END(__mmap)
diff --git a/lib/libc/arch/m68k/sys/__sigaction14_sigtramp.c b/lib/libc/arch/m68k/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index 256a99084..000000000
--- a/lib/libc/arch/m68k/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.9 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.9 2008/04/28 20:22:56 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-#ifdef __LIBC12_SOURCE__
-extern const int __sigtramp_sigcontext_1[]
-    __weak_reference(__sigtramp_sigcontext_1);
-#endif
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern const int __sigtramp_siginfo_2[];
-
-	/*
-	 * If no sigaction, use the "default" trampoline since it won't
-	 * be used.
-	 */
-	if (act == NULL)
-		return  __sigaction_sigtramp(sig, act, oact, NULL, 0);
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the non-SA_SIGINFO trampoline if SA_SIGINFO is not
-	 * set in the sigaction.
-	 */
-	if ((act->sa_flags & SA_SIGINFO) == 0) {
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-		    __sigtramp_sigcontext_1, 1);
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	/*
-	 * If SA_SIGINFO was specified or the compatibility trampolines
-	 * can't be used, use the siginfo trampoline.
-	 */
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/m68k/sys/__sigtramp2.S b/lib/libc/arch/m68k/sys/__sigtramp2.S
deleted file mode 100755
index e1c78c5a1..000000000
--- a/lib/libc/arch/m68k/sys/__sigtramp2.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.4 2013/07/16 22:19:16 matt Exp $ */
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-/*
- * The m68k signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, stack looks like:
- *
- *		ucontext structure			[12+sizeof(siginfo_t)]
- *		siginfo structure			[12]
- *		pointer to ucontext structure		[8]
- *		pointer to siginfo structure		[4]
- *	sp->	signal number				[0]
- */
-ENTRY_NOPROFILE(__sigtramp_siginfo_2)
-	movl	8(%sp),%a0	/* get pointer to ucontext */
-	movl	%a0,4(%sp)	/* put it in the argument slot */
-				/* fake return address already there */
-	SYSTRAP(setcontext)
-	movl	%d0,4(%sp)	/* error code */
-	SYSTRAP(exit)		/* exit */
-END(__sigtramp_siginfo_2)
diff --git a/lib/libc/arch/m68k/sys/__syscall.S b/lib/libc/arch/m68k/sys/__syscall.S
deleted file mode 100644
index 8c4174e3e..000000000
--- a/lib/libc/arch/m68k/sys/__syscall.S
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	$NetBSD: __syscall.S,v 1.1 2000/12/13 21:46:23 scw Exp $	*/
-
-#include "SYS.h"
-RSYSCALL(__syscall)
diff --git a/lib/libc/arch/m68k/sys/__vfork14.S b/lib/libc/arch/m68k/sys/__vfork14.S
deleted file mode 100644
index 57f60f579..000000000
--- a/lib/libc/arch/m68k/sys/__vfork14.S
+++ /dev/null
@@ -1,94 +0,0 @@
-/*	$NetBSD: __vfork14.S,v 1.12 2013/09/12 15:36:15 joerg Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)Ovfork.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: __vfork14.S,v 1.12 2013/09/12 15:36:15 joerg Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * @(#)vfork.s	4.1 (Berkeley) 12/21/80
- * C library -- vfork
- */
-
-/*
- * pid = vfork();
- *
- * d1 == 0 in parent process, d1 == 1 in child process.
- * d0 == pid of child in parent, d0 == pid of parent in child.
- *
- * trickery here, due to keith sklower, uses ret to clear the stack,
- * and then returns with a jump indirect, since only one person can return
- * with a ret off this stack... we do the ret before we vfork!
- */
-
-ENTRY(__vfork14)
-	movl	(%sp)+,%a1
-	SYSTRAP(__vfork14)
-	jcs	err
-	subql	#1,%d1	/* from 1 to 0 in child, 0 to -1 in parent */
-	andl	%d1,%d0
-	jmp	(%a1)
-err:
-#ifdef	_REENTRANT
-	.globl	_C_LABEL(__errno)
-	movl	%a1,-(%sp)
-	movl	%d0,-(%sp)
-	jbsr	PIC_PLT(_C_LABEL(__errno))
-#ifdef	__SVR4_ABI__
-	movl	(%sp)+,(%a0)
-#else
-	movl	%d0,%a1
-	movl	(%sp)+,(%a1)
-#endif
-	movl	(%sp)+,%a1
-#else
-#ifdef __PIC__
-	GOT_SETUP(%a0)
-	movl	_C_LABEL(errno)@GOT:w(%a0),%a0
-	movl	%d0,(%a0)
-#else
-	.globl	_C_LABEL(errno)
-	movl	%d0,_C_LABEL(errno)
-#endif	/* __PIC__ */
-#endif	/* _REENTRANT */
-	moveq	#-1,%d0
-	jmp	(%a1)
-END(__vfork14)
diff --git a/lib/libc/arch/m68k/sys/_lwp_getprivate.S b/lib/libc/arch/m68k/sys/_lwp_getprivate.S
deleted file mode 100644
index 45b0a1319..000000000
--- a/lib/libc/arch/m68k/sys/_lwp_getprivate.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: _lwp_getprivate.S,v 1.3 2013/07/16 22:19:16 matt Exp $	*/
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-SYSCALL(_lwp_getprivate)
-#ifdef	__SVR4_ABI__
-	movl	%d0,%a0
-#endif
-	rts
-END(_lwp_getprivate)
diff --git a/lib/libc/arch/m68k/sys/brk.S b/lib/libc/arch/m68k/sys/brk.S
deleted file mode 100644
index a46445295..000000000
--- a/lib/libc/arch/m68k/sys/brk.S
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: brk.S,v 1.19 2013/09/12 15:36:15 joerg Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)brk.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: brk.S,v 1.19 2013/09/12 15:36:15 joerg Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-	.globl	_end
-	.globl	_C_LABEL(__minbrk)
-	.hidden	_C_LABEL(__minbrk)
-	.globl	_C_LABEL(__curbrk)
-	.hidden	_C_LABEL(__curbrk)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
-#endif
-
-	.data
-_C_LABEL(__minbrk):
-	.long	_end
-
-	.text
-
-ENTRY(_brk)
-#ifdef __PIC__
-	LEA_LCL(_C_LABEL(__minbrk),%a1)
-	movl	(%a1),%a1
-#else
-	movl	_C_LABEL(__minbrk),%a1
-#endif
-	cmpl	4(%sp),%a1
-	jls	ok
-	movl	%a1,4(%sp)
-ok:
-	SYSTRAP(break)
-	jcs	CERROR
-#ifdef __PIC__
-	LEA_LCL(_C_LABEL(__curbrk),%a0)
-	movl	%a1,(%a0)
-#else
-	movl	%a1,_C_LABEL(__curbrk)
-#endif
-	clrl	%d0
-	rts
-END(_brk)
diff --git a/lib/libc/arch/m68k/sys/cerror.S b/lib/libc/arch/m68k/sys/cerror.S
deleted file mode 100644
index 507a23402..000000000
--- a/lib/libc/arch/m68k/sys/cerror.S
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.18 2013/09/12 15:36:15 joerg Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)cerror.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: cerror.S,v 1.18 2013/09/12 15:36:15 joerg Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef	_REENTRANT
-	.globl	_C_LABEL(__errno)
-#else
-	.globl	_C_LABEL(errno)
-#endif
-_ENTRY(CERROR)
-#ifdef	_REENTRANT
-	movl	%d0,-(%sp)
-	jbsr	PIC_PLT(_C_LABEL(__errno))
-#ifndef	__SVR4_ABI__
-	movl	%d0,%a0
-#endif
-	movl	(%sp)+,(%a0)
-#else
-#ifdef __PIC__
-	GOT_SETUP(%a0)
-	movl	_C_LABEL(errno)@GOT:w(%a0),%a0
-	movl	%d0,(%a0)
-#else
-	movl	%d0,_C_LABEL(errno)
-#endif
-#endif	/* _REENTRANT */
-	movl	#-1,%d0
-	movl	#-1,%d1
-#ifdef	__SVR4_ABI__
-	movl	%d0,%a0
-#endif
-	rts
-END(CERROR)
diff --git a/lib/libc/arch/m68k/sys/exect.S b/lib/libc/arch/m68k/sys/exect.S
deleted file mode 100644
index 98471ceca..000000000
--- a/lib/libc/arch/m68k/sys/exect.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: exect.S,v 1.8 2013/07/16 22:20:35 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-#include <machine/psl.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)exect.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: exect.S,v 1.8 2013/07/16 22:20:35 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-ENTRY(exect)
-	SYSTRAP(execve)
-	jbra	CERROR		/* exect(file, argv, env) */
-END(exect)
diff --git a/lib/libc/arch/m68k/sys/fork.S b/lib/libc/arch/m68k/sys/fork.S
deleted file mode 100644
index 14af51564..000000000
--- a/lib/libc/arch/m68k/sys/fork.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: fork.S,v 1.8 2013/07/16 22:15:55 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)fork.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: fork.S,v 1.8 2013/07/16 22:15:55 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-_SYSCALL(__fork,fork)
-	subql	#1,%d1	/* from 1 to 0 in child, 0 to -1 in parent */
-	andl	%d1,%d0
-	rts		/* pid = fork() */
-END(__fork)
diff --git a/lib/libc/arch/m68k/sys/getcontext.S b/lib/libc/arch/m68k/sys/getcontext.S
deleted file mode 100644
index 415934b91..000000000
--- a/lib/libc/arch/m68k/sys/getcontext.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.6 2013/07/17 03:01:27 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: getcontext.S,v 1.6 2013/07/17 03:01:27 matt Exp $")
-#endif /* SYSLIBC_SCCS && !lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext, _getcontext)
-#endif
-
-_SYSCALL(_getcontext,getcontext)
-	movl	4(%sp),%a0
-	addql	#4,UC_MCONTEXT_SP(%a0)	| adjust saved stack pointer
-	movl	%sp@,UC_MCONTEXT_PC(%a0)| adjust saved program counter
-	clrl	UC_MCONTEXT_D0(%a0)	| arrange for return value of 0
-	rts
-END(_getcontext)
diff --git a/lib/libc/arch/m68k/sys/mremap.S b/lib/libc/arch/m68k/sys/mremap.S
deleted file mode 100644
index c2ec75df0..000000000
--- a/lib/libc/arch/m68k/sys/mremap.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: mremap.S,v 1.3 2013/07/16 22:15:55 matt Exp $	*/
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-SYSCALL(mremap)
-#ifdef	__SVR4_ABI__
-	movl	%d0,%a0
-#endif
-	rts
-END(mremap)
diff --git a/lib/libc/arch/m68k/sys/pipe.S b/lib/libc/arch/m68k/sys/pipe.S
deleted file mode 100644
index 37960a3c1..000000000
--- a/lib/libc/arch/m68k/sys/pipe.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.8 2013/07/16 22:16:53 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)pipe.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: pipe.S,v 1.8 2013/07/16 22:16:53 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-#endif
-
-_SYSCALL(_pipe,pipe)
-	movl	4(%sp),%a0
-	movl	%d0,(%a0)+
-	movl	%d1,(%a0)
-	clrl	%d0
-	rts
-END(_pipe)
diff --git a/lib/libc/arch/m68k/sys/ptrace.S b/lib/libc/arch/m68k/sys/ptrace.S
deleted file mode 100644
index 82038b2bd..000000000
--- a/lib/libc/arch/m68k/sys/ptrace.S
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.15 2013/09/12 15:36:15 joerg Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)ptrace.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: ptrace.S,v 1.15 2013/09/12 15:36:15 joerg Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef	_REENTRANT
-	.globl	_C_LABEL(__errno)
-#else
-	.globl	_C_LABEL(errno)
-#endif
-
-ENTRY(ptrace)
-#ifdef	_REENTRANT
-	jbsr	PIC_PLT(_C_LABEL(__errno))
-#ifndef	__SVR4_ABI__
-	movl	%d0,%a0
-#endif
-	clrl	(%a0)
-#else
-#ifdef __PIC__
-	GOT_SETUP(%a0)
-	movl	_C_LABEL(errno)@GOT:w(%a0),%a0
-	clrl	(%a0)
-#else
-	clrl	_C_LABEL(errno)
-#endif	/* __PIC__ */
-#endif	/* _REENTRANT */
-	SYSTRAP(ptrace)
-	jcs	CERROR
-	rts
-END(ptrace)
diff --git a/lib/libc/arch/m68k/sys/sbrk.S b/lib/libc/arch/m68k/sys/sbrk.S
deleted file mode 100644
index 9a1707a30..000000000
--- a/lib/libc/arch/m68k/sys/sbrk.S
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.17 2013/07/24 15:38:07 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)sbrk.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: sbrk.S,v 1.17 2013/07/24 15:38:07 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-	.globl	_end
-	.globl	_C_LABEL(__curbrk)
-	.hidden	_C_LABEL(__curbrk)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-	.data
-_C_LABEL(__curbrk):
-	.long	_end
-
-	.text
-
-ENTRY(_sbrk)
-	LEA_LCL(_C_LABEL(__curbrk),%a1)
-	movl	(%a1),%d0
-	addl	%d0,4(%sp)
-	SYSTRAP(break)
-	jcs 	CERROR
-	movl	(%a1),%d0
-	movl	4(%sp),(%a1)
-#ifdef	__SVR4_ABI__
-	movl	%d0,%a0
-#endif
-	rts
-END(_sbrk)
diff --git a/lib/libc/arch/m68k/sys/shmat.S b/lib/libc/arch/m68k/sys/shmat.S
deleted file mode 100644
index 10af3e777..000000000
--- a/lib/libc/arch/m68k/sys/shmat.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.3 2013/07/16 22:16:53 matt Exp $	*/
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-SYSCALL(shmat)
-#ifdef	__SVR4_ABI__
-	movl	%d0,%a0
-#endif
-	rts
-END(shmat)
diff --git a/lib/libc/arch/m68k/sys/syscall.S b/lib/libc/arch/m68k/sys/syscall.S
deleted file mode 100644
index 71bc6d67e..000000000
--- a/lib/libc/arch/m68k/sys/syscall.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.9 2013/07/24 15:38:07 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)syscall.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: syscall.S,v 1.9 2013/07/24 15:38:07 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-ENTRY(syscall)
-	clrl	%d0
-	trap	#0
-	jcs	CERROR
-	rts
-END(syscall)
diff --git a/lib/libc/arch/mips/Makefile.inc b/lib/libc/arch/mips/Makefile.inc
deleted file mode 100644
index 7db58be61..000000000
--- a/lib/libc/arch/mips/Makefile.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.13 2014/01/30 15:05:49 joerg Exp $
-
-.include <bsd.own.mk>
-
-SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
-
-CPPFLAGS+= -I.
-CPPFLAGS.assym.h+=-D__LIBC12_SOURCE__
-
-.if ${MKSOFTFLOAT} != "no"
-.include <softfloat/Makefile.inc>
-CPPFLAGS+= -DSOFTFLOAT
-
-SRCS+=	fixunsgen_ieee754.c
-SRCS+=	fixunsgen64_ieee754.c #fixunssfdi.c fixunsdfdi.c
-.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el") \
-    && (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
-SRCS+=	fixunstfsi_ieee754.c fixunstfdi_ieee754.c
-.endif
-.endif
-
-.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el") \
-    && (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
-SRCS+=	floatunditf_ieee754.c
-.endif
diff --git a/lib/libc/arch/mips/SYS.h b/lib/libc/arch/mips/SYS.h
deleted file mode 100644
index 2bafcc08b..000000000
--- a/lib/libc/arch/mips/SYS.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.19 2009/12/14 01:07:41 matt Exp $ */
-
-/*-
- * Copyright (c) 1996 Jonathan Stone
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Jonathan Stone 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.
- */
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.
- *
- *	from: @(#)SYS.h	8.1 (Berkeley) 6/4/93
- */
-
-#include <sys/syscall.h>
-#include <mips/asm.h>
-
-
-/*
- * If compiling for shared libs, Emit sysV ABI PIC segment pseudo-ops.
- *
- * i)  Emit .abicalls before .LEAF entrypoint, and .cpload/.cprestore after.
- * ii) Do interprocedure jumps indirectly via t9, with the side-effect of
- *     preserving the callee's entry address in t9.
- */
-#ifdef __ABICALLS__
-	.abicalls
-# if defined(__mips_o32) || defined(__mips_o64)
-#  define PIC_PROLOGUE(x)	SETUP_GP
-#  define PIC_TAILCALL(l)	PTR_LA t9, _C_LABEL(l); jr t9
-#  define PIC_RETURN()		j ra
-# else
-#  define PIC_PROLOGUE(x)	SETUP_GP64(t3, x)
-#  define PIC_TAILCALL(l)	PTR_LA t9, _C_LABEL(l); RESTORE_GP64; jr t9
-#  define PIC_RETURN()		RESTORE_GP64; j ra
-# endif
-#else
-# define PIC_PROLOGUE(x)
-# define PIC_TAILCALL(l)	j  _C_LABEL(l)
-# define PIC_RETURN()
-#endif /* __ABICALLS__ */
-
-
-#ifdef __STDC__
-# define SYSTRAP(x)	li v0,SYS_ ## x; syscall;
-#else
-# define SYSTRAP(x)	li v0,SYS_/**/x; syscall;
-#endif
-
-
-/*
- * Do a syscall that cannot fail (sync, get{p,u,g,eu,eg)id)
- */
-#define RSYSCALL_NOERROR(x)						\
-	PSEUDO_NOERROR(x,x)
-
-/*
- * Do a normal syscall.
- */
-#define RSYSCALL(x)							\
-	PSEUDO(x,x)
-
-/*
- * Do a syscall that has an internal name and a weak external alias.
- */
-#define	WSYSCALL(weak,strong)						\
-	WEAK_ALIAS(weak,strong);					\
-	PSEUDO(strong,weak)
-
-/*
- * Do a renamed or pseudo syscall (e.g., _exit()), where the entrypoint
- * and syscall name are not the same.
- */
-#define PSEUDO_NOERROR(x,y)						\
-LEAF(x);								\
-	SYSTRAP(y);							\
-	j ra;								\
-	END(x)
-
-#define PSEUDO(x,y)							\
-LEAF(x);								\
-	PIC_PROLOGUE(x);						\
-	SYSTRAP(y);							\
-	bne a3,zero,err;						\
-	PIC_RETURN();							\
-err:									\
-	PIC_TAILCALL(__cerror);						\
-END(x)
diff --git a/lib/libc/arch/mips/gdtoa/Makefile.inc b/lib/libc/arch/mips/gdtoa/Makefile.inc
deleted file mode 100644
index 51535fa03..000000000
--- a/lib/libc/arch/mips/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 2011/01/20 18:41:39 matt Exp $
-
-SRCS+=	strtof.c
-.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
-.if !defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32)
-SRCS+=	strtold_pQ.c
-SRCS+=	strtopQ.c
-.endif
-.endif
diff --git a/lib/libc/arch/mips/gdtoa/arith.h b/lib/libc/arch/mips/gdtoa/arith.h
deleted file mode 100644
index 40d3ed1fa..000000000
--- a/lib/libc/arch/mips/gdtoa/arith.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#include <machine/endian.h>
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define IEEE_BIG_ENDIAN
-#else
-#define IEEE_LITTLE_ENDIAN
-#endif
diff --git a/lib/libc/arch/mips/gdtoa/gd_qnan.h b/lib/libc/arch/mips/gdtoa/gd_qnan.h
deleted file mode 100644
index 7fcafc099..000000000
--- a/lib/libc/arch/mips/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.2 2011/01/17 23:53:03 matt Exp $ */
-
-#include <machine/endian.h>
-
-#define f_QNAN 0x7fa00000
-#if BYTE_ORDER == BIG_ENDIAN
-#define d_QNAN0 0x7ff40000
-#define d_QNAN1 0x0
-#define ld_QNAN0 0x7fff8000
-#define ld_QNAN1 0x0
-#define ld_QNAN2 0x0
-#define ld_QNAN3 0x0
-#else
-#define d_QNAN0 0x0
-#define d_QNAN1 0x7ff40000
-#define ld_QNAN0 0x0
-#define ld_QNAN1 0x0
-#define ld_QNAN2 0x0
-#define ld_QNAN3 0x7fff8000
-#endif
diff --git a/lib/libc/arch/mips/gen/Makefile.inc b/lib/libc/arch/mips/gen/Makefile.inc
deleted file mode 100644
index acaccca82..000000000
--- a/lib/libc/arch/mips/gen/Makefile.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.33 2011/03/15 07:40:18 matt Exp $
-
-.if ${MKSOFTFLOAT} == "no"
-SRCS+=	fabs.S ldexp.S modf.S
-.else
-SRCS+=	fabs_ieee754.c ldexp_ieee754.c modf_ieee754.c
-.endif
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c infinityl_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c fpclassifyl_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c isinfl_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c isnanl_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c isfinitel_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c signbitl_ieee754.c
-
-SRCS+=	nanf.c
-SRCS+=	flt_rounds.c
-
-.if ${MKSOFTFLOAT} == "no"
-SRCS+=	fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
-	fpsetround.c fpsetsticky.c
-.endif
-
-SRCS+=	setjmp.S longjmp.c
-SRCS+=	_setjmp.S
-SRCS+=	sigsetjmp.S
-SRCS+=	byte_swap_2.S byte_swap_4.S byte_swap_8.S
-
-SRCS+=	makecontext.c resumecontext.c _resumecontext.S swapcontext.S _lwp.c
-
-# mips abi builtin extensions (used by GCC for lexical-closure trampoline)
-SRCS+=	cacheflush.c
-
-CPPFLAGS._lwp.c	+= -D_LIBC_SOURCE
-
-LSRCS.mips.gen=	Lint__setjmp.c Lint_bswap16.c Lint_bswap32.c Lint_swapcontext.c
-LSRCS+=		${LSRCS.mips.gen}
-DPSRCS+=	${LSRCS.mips.gen}
-CLEANFILES+=	${LSRCS.mips.gen}
diff --git a/lib/libc/arch/mips/gen/_lwp.c b/lib/libc/arch/mips/gen/_lwp.c
deleted file mode 100644
index f987f4a1a..000000000
--- a/lib/libc/arch/mips/gen/_lwp.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.8 2011/04/29 08:05:22 matt Exp $	*/
-
-/*
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Wayne Knowles
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.8 2011/04/29 08:05:22 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-#if defined(__mips_o32) || defined(__mips_o64)
-#define CALLFRAME_SIZ	(6 * sizeof(void *))
-#else
-#define CALLFRAME_SIZ	(4 * sizeof(uint64_t))
-#endif
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *),
-	void *arg, void *tcb, caddr_t stack_base, size_t stack_size)
-{
-	caddr_t sp;
-	__greg_t *gr;
-
-	getcontext(u);
-	gr = u->uc_mcontext.__gregs;
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-	sp = stack_base + stack_size - CALLFRAME_SIZ;
-
-	gr[_REG_EPC] = (uintptr_t) start;
-	gr[_REG_T9] = (uintptr_t) start; /* required for .abicalls */
-	gr[_REG_RA] = (uintptr_t) _lwp_exit;
-	gr[_REG_A0] = (uintptr_t) arg;
-	gr[_REG_SP] = (uintptr_t) sp;
-	u->uc_mcontext._mc_tlsbase =
-	    (uintptr_t)tcb + TLS_TP_OFFSET + sizeof(struct tls_tcb);
-	u->uc_flags |= _UC_TLSBASE;
-}
diff --git a/lib/libc/arch/mips/gen/_resumecontext.S b/lib/libc/arch/mips/gen/_resumecontext.S
deleted file mode 100644
index a8b3e2c40..000000000
--- a/lib/libc/arch/mips/gen/_resumecontext.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: _resumecontext.S,v 1.7 2012/09/12 02:00:52 manu Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Wayne Knowles.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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.h"
-#include "assym.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: _resumecontext.S,v 1.7 2012/09/12 02:00:52 manu Exp $")
-#endif /* SYSLIBC_SCCS && !lint */
-
-	.set	reorder
-	.hidden	_C_LABEL(__resumecontext)
-	
-LEAF_NOPROFILE(__resumecontext)
-	/*
-	 * We get here not by a call through $t9 but thru $ra after the
-	 * function passed to makecontext returns.
-	 */
-	PTR_SUBU	sp, sp, UCONTEXT_SIZE		# get space for ucontext
-	move		a0, sp				# arg0 for getcontext
-	PTR_S		zero, _OFFSETOF_UC_LINK(a0)	# make sure uc_link is 0
-	SYSTRAP(getcontext)				# get context
-	PTR_L		a0, _OFFSETOF_UC_LINK(a0)	# linked context?
-	beq		a0, zero, 1f			#   nope, exit process
-	nop
-	PIC_TAILCALL(setcontext)			#   yes, become it.
-	/* NOTREACHED (in theory) */
-	li		a0, -1				# failure, 
-1:
-	SYSTRAP(exit)					# all hope is lost.
-	/* NOTREACHED */
-END(__resumecontext)
diff --git a/lib/libc/arch/mips/gen/_setjmp.S b/lib/libc/arch/mips/gen/_setjmp.S
deleted file mode 100644
index 9e91ce26b..000000000
--- a/lib/libc/arch/mips/gen/_setjmp.S
+++ /dev/null
@@ -1,191 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.24 2012/07/08 00:59:34 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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 <machine/cdefs.h>
-#include <mips/regnum.h>
-#include <mips/asm.h>
-#include <machine/setjmp.h>
-#include <machine/signal.h>		/* XXX */
-
-#include "assym.h"
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)_setjmp.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: _setjmp.S,v 1.24 2012/07/08 00:59:34 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * 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,
- * The previous signal state is NOT restored.
- */
-
-	.set	noreorder
-
-LEAF(_setjmp)
-	REG_PROLOGUE
-	REG_LI	v0, 0xACEDBADE			# sigcontext magic number
-	REG_S	ra, _OFFSETOF_SC_PC(a0)		# sc_pc = return address
-	REG_S	v0, _OFFSETOF_SC_REGS(a0)	#   saved in sc_regs[0]
-	REG_S	s0, _OFFSETOF_SC_REGS_S0(a0)
-	REG_S	s1, _OFFSETOF_SC_REGS_S1(a0)
-	REG_S	s2, _OFFSETOF_SC_REGS_S2(a0)
-	REG_S	s3, _OFFSETOF_SC_REGS_S3(a0)
-	REG_S	s4, _OFFSETOF_SC_REGS_S4(a0)
-	REG_S	s5, _OFFSETOF_SC_REGS_S5(a0)
-	REG_S	s6, _OFFSETOF_SC_REGS_S6(a0)
-	REG_S	s7, _OFFSETOF_SC_REGS_S7(a0)
-	REG_S	sp, _OFFSETOF_SC_REGS_SP(a0)
-	REG_S	s8, _OFFSETOF_SC_REGS_S8(a0)
-#if defined(__mips_n32) || defined(__mips_n64)
-	REG_S	gp, _OFFSETOF_SC_REGS_GP(a0)	# newabi gp is callee-saved
-#endif
-	/*
-	 * In N32, FP registers F20, F22, F24, F26, F28, F30 are callee-saved.
-	 * In N64, FP registers F23 .. F31 are callee-saved.
-	 * In O32, FP registers F20 .. F23 are callee-saved.
-	 */
-#ifndef SOFTFLOAT_FOR_GCC
-	cfc1	v0, $31				# too bad cant check if FP used
-#if defined(__mips_n64) || defined(__mips_n32)
-	FP_S	$f30, _OFFSETOF_SC_FPREGS_F30(a0)
-	FP_S	$f28, _OFFSETOF_SC_FPREGS_F28(a0)
-	FP_S	$f26, _OFFSETOF_SC_FPREGS_F26(a0)
-	FP_S	$f24, _OFFSETOF_SC_FPREGS_F24(a0)
-#endif
-#if defined(__mips_n32) || defined(__mips_o32) || defined(__mips_o64)
-	FP_S	$f22, _OFFSETOF_SC_FPREGS_F22(a0)
-	FP_S	$f20, _OFFSETOF_SC_FPREGS_F20(a0)
-#endif
-#if defined(__mips_o32) || defined(__mips_o64)
-	FP_S	$f21, _OFFSETOF_SC_FPREGS_F21(a0)
-	FP_S	$f23, _OFFSETOF_SC_FPREGS_F23(a0)
-#endif
-#if defined(__mips_n64)
-	FP_S	$f25, _OFFSETOF_SC_FPREGS_F25(a0)
-	FP_S	$f27, _OFFSETOF_SC_FPREGS_F27(a0)
-	FP_S	$f29, _OFFSETOF_SC_FPREGS_F29(a0)
-	FP_S	$f31, _OFFSETOF_SC_FPREGS_F31(a0)
-#endif
-	INT_S	v0, _OFFSETOF_SC_FPREGS_FCSR(a0)
-#endif	/* SOFTFLOAT_FOR_GCC */
-	REG_EPILOGUE
-
-	j	ra
-	 move	v0, zero
-END(_setjmp)
-
-LEAF(_longjmp)
-	PIC_PROLOGUE(_longjmp)
-	PTR_SUBU	sp, sp, CALLFRAME_SIZ
-	SAVE_GP(CALLFRAME_GP)
-
-	REG_PROLOGUE
-	REG_L		v0, _OFFSETOF_SC_REGS(a0)	# get magic number
-	REG_L		ra, _OFFSETOF_SC_PC(a0)
-	REG_LI		t0, 0xACEDBADE
-	bne		v0, t0, botch		# jump if error
-	PTR_ADDU	sp, sp, CALLFRAME_SIZ	# does not matter, sanity
-	REG_S		a1, _OFFSETOF_SC_REGS_V0(a0)	# save return value
-	REG_L		s0, _OFFSETOF_SC_REGS_S0(a0)
-	REG_L		s1, _OFFSETOF_SC_REGS_S1(a0)
-	REG_L		s2, _OFFSETOF_SC_REGS_S2(a0)
-	REG_L		s3, _OFFSETOF_SC_REGS_S3(a0)
-	REG_L		s4, _OFFSETOF_SC_REGS_S4(a0)
-	REG_L		s5, _OFFSETOF_SC_REGS_S5(a0)
-	REG_L		s6, _OFFSETOF_SC_REGS_S6(a0)
-	REG_L		s7, _OFFSETOF_SC_REGS_S7(a0)
-#if defined(__mips_n32) || defined(__mips_n64)
-	REG_L		gp, _OFFSETOF_SC_REGS_GP(a0)
-#endif
-#ifndef SOFTFLOAT_FOR_GCC
-	# get fpu status
-	INT_L		v0, _OFFSETOF_SC_FPREGS_FCSR(a0)
-#endif
-	REG_L		sp, _OFFSETOF_SC_REGS_SP(a0)
-	REG_L		s8, _OFFSETOF_SC_REGS_S8(a0)
-#ifndef SOFTFLOAT_FOR_GCC
-	ctc1		v0, $31
-	/*
-	 * In N32, FP registers F20, F22, F24, F26, F28, F30 are callee-saved.
-	 * In N64, FP registers F23 .. F31 are callee-saved.
-	 * In O32, FP registers F20 .. F23 are callee-saved.
-	 */
-#if defined(__mips_n64) || defined(__mips_n32)
-	FP_L	$f30, _OFFSETOF_SC_FPREGS_F30(a0)
-	FP_L	$f28, _OFFSETOF_SC_FPREGS_F28(a0)
-	FP_L	$f26, _OFFSETOF_SC_FPREGS_F26(a0)
-	FP_L	$f24, _OFFSETOF_SC_FPREGS_F24(a0)
-#endif
-#if defined(__mips_n32) || defined(__mips_o32) || defined(__mips_o64)
-	FP_L	$f22, _OFFSETOF_SC_FPREGS_F22(a0)
-	FP_L	$f20, _OFFSETOF_SC_FPREGS_F20(a0)
-#endif
-#if defined(__mips_o32) || defined(__mips_o64)
-	FP_L	$f21, _OFFSETOF_SC_FPREGS_F21(a0)
-	FP_L	$f23, _OFFSETOF_SC_FPREGS_F23(a0)
-#endif
-#if defined(__mips_n64)
-	FP_L	$f25, _OFFSETOF_SC_FPREGS_F25(a0)
-	FP_L	$f27, _OFFSETOF_SC_FPREGS_F27(a0)
-	FP_L	$f29, _OFFSETOF_SC_FPREGS_F29(a0)
-	FP_L	$f31, _OFFSETOF_SC_FPREGS_F31(a0)
-#endif
-#endif	/* SOFTFLOAT_FOR_GCC */
-
-	REG_EPILOGUE
-	j	ra
-	 move	v0, a1			# get return value in 1st arg
-
-botch:
-	/*
-	 * We know we aren't returning so we don't care about restoring
-	 * our caller's GP.
-	 */
-	jal	_C_LABEL(longjmperror)
-	 nop
-	
-	PIC_TAILCALL(abort)
-	 nop
-END(_longjmp)
diff --git a/lib/libc/arch/mips/gen/cacheflush.c b/lib/libc/arch/mips/gen/cacheflush.c
deleted file mode 100644
index b63b4b647..000000000
--- a/lib/libc/arch/mips/gen/cacheflush.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: cacheflush.c,v 1.6 2012/03/29 21:21:04 christos Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jonathan Stone.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <mips/cachectl.h>
-#include <mips/sysarch.h>
-
-int
-_cacheflush(void *addr, size_t nbytes, int whichcache)
-{
-	struct mips_cacheflush_args cfa;
-
-	cfa.va = (vaddr_t)(intptr_t)addr;
-	cfa.nbytes = nbytes;
-	cfa.whichcache = whichcache;
-	return sysarch(MIPS_CACHEFLUSH, (void *)&cfa);
-}
diff --git a/lib/libc/arch/mips/gen/fabs.S b/lib/libc/arch/mips/gen/fabs.S
deleted file mode 100644
index 812b70e54..000000000
--- a/lib/libc/arch/mips/gen/fabs.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: fabs.S,v 1.8 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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 <mips/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)fabs.s	8.1 (Berkeley) 2/16/94")
-#else
-	RCSID("$NetBSD: fabs.S,v 1.8 2009/12/14 01:07:42 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-
-	.set	noreorder
-
-/*
- * fabs(x)
- *	double x;
- *
- * Return absolute value of x.
- */
-LEAF(fabs)
-	j	ra
-	abs.d	$f0, $f12		# compute absolute value of x
-END(fabs)
diff --git a/lib/libc/arch/mips/gen/flt_rounds.c b/lib/libc/arch/mips/gen/flt_rounds.c
deleted file mode 100644
index b37a6f99d..000000000
--- a/lib/libc/arch/mips/gen/flt_rounds.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: flt_rounds.c,v 1.9 2015/03/19 21:22:59 joerg Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.9 2015/03/19 21:22:59 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <machine/float.h>
-#include <ieeefp.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	0,	/* round to zero */
-	2,	/* round to positive infinity */
-	3	/* round to negative infinity */
-};
-
-int
-__flt_rounds(void)
-{
-#ifdef SOFTFLOAT_FOR_GCC
-	return map[fpgetround()];
-#else
-	int x;
-
-	__asm(".set push; .set noat; cfc1 %0,$31; .set pop" : "=r" (x));
-	return map[x & 0x03];
-#endif
-}
diff --git a/lib/libc/arch/mips/gen/fpgetmask.c b/lib/libc/arch/mips/gen/fpgetmask.c
deleted file mode 100644
index 9d640bfb7..000000000
--- a/lib/libc/arch/mips/gen/fpgetmask.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*	$NetBSD: fpgetmask.c,v 1.9 2014/09/17 11:02:55 joerg Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetmask.c,v 1.9 2014/09/17 11:02:55 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetmask,_fpgetmask)
-#endif
-
-fp_except
-fpgetmask(void)
-{
-	fp_except x;
-
-	__asm(".set push; .set noat; cfc1 %0,$31; .set pop" : "=r" (x));
-	return (x >> 7) & 0x1f;
-}
diff --git a/lib/libc/arch/mips/gen/fpgetround.c b/lib/libc/arch/mips/gen/fpgetround.c
deleted file mode 100644
index 21775ce88..000000000
--- a/lib/libc/arch/mips/gen/fpgetround.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*	$NetBSD: fpgetround.c,v 1.7 2014/09/17 11:02:55 joerg Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.7 2014/09/17 11:02:55 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetround,_fpgetround)
-#endif
-
-fp_rnd
-fpgetround(void)
-{
-	fp_rnd x;
-
-	__asm(".set push; .set noat; cfc1 %0,$31; .set pop" : "=r" (x));
-	return x & 0x03;
-}
diff --git a/lib/libc/arch/mips/gen/fpgetsticky.c b/lib/libc/arch/mips/gen/fpgetsticky.c
deleted file mode 100644
index 2c04eab25..000000000
--- a/lib/libc/arch/mips/gen/fpgetsticky.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*	$NetBSD: fpgetsticky.c,v 1.9 2014/09/17 11:02:55 joerg Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetsticky.c,v 1.9 2014/09/17 11:02:55 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-fp_except
-fpgetsticky(void)
-{
-	fp_except x;
-
-	__asm(".set push; .set noat; cfc1 %0,$31; .set pop" : "=r" (x));
-	return (x >> 2) & 0x1f;
-}
diff --git a/lib/libc/arch/mips/gen/fpsetmask.c b/lib/libc/arch/mips/gen/fpsetmask.c
deleted file mode 100644
index 3a9f90bd9..000000000
--- a/lib/libc/arch/mips/gen/fpsetmask.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: fpsetmask.c,v 1.9 2014/09/17 11:02:55 joerg Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetmask.c,v 1.9 2014/09/17 11:02:55 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetmask,_fpsetmask)
-#endif
-
-fp_except
-fpsetmask(fp_except mask)
-{
-	fp_except old;
-	fp_except new;
-
-	__asm(".set push; .set noat; cfc1 %0,$31; .set pop" : "=r" (old));
-
-	new = old & ~(0x1f << 7); 
-	new |= ((mask & 0x1f) << 7);
-
-	__asm(".set push; .set noat; ctc1 %0,$31; .set pop" : "=r" (new));
-
-	return (old >> 7) & 0x1f;
-}
diff --git a/lib/libc/arch/mips/gen/fpsetround.c b/lib/libc/arch/mips/gen/fpsetround.c
deleted file mode 100644
index 34770c33b..000000000
--- a/lib/libc/arch/mips/gen/fpsetround.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: fpsetround.c,v 1.7 2014/09/17 11:02:55 joerg Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.7 2014/09/17 11:02:55 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetround,_fpsetround)
-#endif
-
-fp_rnd
-fpsetround(fp_rnd rnd_dir)
-{
-	fp_rnd old;
-	fp_rnd new;
-
-	__asm(".set push; .set noat; cfc1 %0,$31; .set pop" : "=r" (old));
-
-	new = old & ~0x03;
-	new |= rnd_dir & 0x03;
-
-	__asm(".set push; .set noat; ctc1 %0,$31; .set pop" : "=r" (new));
-
-	return old & 0x03;
-}
diff --git a/lib/libc/arch/mips/gen/fpsetsticky.c b/lib/libc/arch/mips/gen/fpsetsticky.c
deleted file mode 100644
index ade9ed23c..000000000
--- a/lib/libc/arch/mips/gen/fpsetsticky.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: fpsetsticky.c,v 1.9 2014/09/17 11:02:55 joerg Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetsticky.c,v 1.9 2014/09/17 11:02:55 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetsticky,_fpsetsticky)
-#endif
-
-fp_except
-fpsetsticky(fp_except sticky)
-{
-	fp_except old;
-	fp_except new;
-
-	__asm(".set push; .set noat; cfc1 %0,$31; .set pop" : "=r" (old));
-
-	new = old & ~(0x1f << 2); 
-	new |= (sticky & 0x1f) << 2;
-
-	__asm(".set push; .set noat; ctc1 %0,$31; .set pop" : "=r" (new));
-
-	return (old >> 2) & 0x1f;
-}
diff --git a/lib/libc/arch/mips/gen/ldexp.S b/lib/libc/arch/mips/gen/ldexp.S
deleted file mode 100644
index a80605dec..000000000
--- a/lib/libc/arch/mips/gen/ldexp.S
+++ /dev/null
@@ -1,217 +0,0 @@
-/*	$NetBSD: ldexp.S,v 1.10 2014/09/17 11:01:05 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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 <mips/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)ldexp.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: ldexp.S,v 1.10 2014/09/17 11:01:05 joerg Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#define DEXP_INF	0x7ff
-#define DEXP_BIAS	1023
-#define DEXP_MIN	-1022
-#define DEXP_MAX	1023
-#define DFRAC_BITS	52
-#define DIMPL_ONE	0x00100000
-#define DLEAD_ZEROS	31 - 20
-#define STICKYBIT	1
-#define GUARDBIT	0x80000000
-#define DSIGNAL_NAN	0x00040000
-#define DQUIET_NAN0	0x0007ffff
-#define DQUIET_NAN1	0xffffffff
-
-/*
- * double ldexp(x, N)
- *	double x; int N;
- *
- * Return x * (2**N), for integer values N.
- */
-LEAF(ldexp)
-	mfc1	v1, $f13		# get MSW of x
-	mfc1	t3, $f12		# get LSW of x
-	sll	t1, v1, 1		# get x exponent
-	srl	t1, t1, 32 - 11
-	beq	t1, DEXP_INF, 9f	# is it a NAN or infinity?
-	beq	t1, zero, 1f		# zero or denormalized number?
-	addu	t1, t1, a2		# scale exponent
-	sll	v0, a2, 20		# position N for addition
-	bge	t1, DEXP_INF, 8f	# overflow?
-	addu	v0, v0, v1		# multiply by (2**N)
-	ble	t1, zero, 4f		# underflow?
-	mtc1	v0, $f1			# save MSW of result
-	mtc1	t3, $f0			# save LSW of result
-	j	ra
-1:
-	sll	t2, v1, 32 - 20		# get x fraction
-	srl	t2, t2, 32 - 20
-	srl	t0, v1, 31		# get x sign
-	bne	t2, zero, 1f
-	beq	t3, zero, 9f		# result is zero
-1:
-/*
- * Find out how many leading zero bits are in t2,t3 and put in t9.
- */
-	move	v0, t2
-	move	t9, zero
-	bne	t2, zero, 1f
-	move	v0, t3
-	addu	t9, 32
-1:
-	srl	ta0, v0, 16
-	bne	ta0, zero, 1f
-	addu	t9, 16
-	sll	v0, 16
-1:
-	srl	ta0, v0, 24
-	bne	ta0, zero, 1f
-	addu	t9, 8
-	sll	v0, 8
-1:
-	srl	ta0, v0, 28
-	bne	ta0, zero, 1f
-	addu	t9, 4
-	sll	v0, 4
-1:
-	srl	ta0, v0, 30
-	bne	ta0, zero, 1f
-	addu	t9, 2
-	sll	v0, 2
-1:
-	srl	ta0, v0, 31
-	bne	ta0, zero, 1f
-	addu	t9, 1
-/*
- * Now shift t2,t3 the correct number of bits.
- */
-1:
-	subu	t9, t9, DLEAD_ZEROS	# dont count normal leading zeros
-	li	t1, DEXP_MIN + DEXP_BIAS
-	subu	t1, t1, t9		# adjust exponent
-	addu	t1, t1, a2		# scale exponent
-	li	v0, 32
-	blt	t9, v0, 1f
-	subu	t9, t9, v0		# shift fraction left >= 32 bits
-	sll	t2, t3, t9
-	move	t3, zero
-	b	2f
-1:
-	subu	v0, v0, t9		# shift fraction left < 32 bits
-	sll	t2, t2, t9
-	srl	ta0, t3, v0
-	or	t2, t2, ta0
-	sll	t3, t3, t9
-2:
-	bge	t1, DEXP_INF, 8f	# overflow?
-	ble	t1, zero, 4f		# underflow?
-	sll	t2, t2, 32 - 20		# clear implied one bit
-	srl	t2, t2, 32 - 20
-3:
-	sll	t1, t1, 31 - 11		# reposition exponent
-	sll	t0, t0, 31		# reposition sign
-	or	t0, t0, t1		# put result back together
-	or	t0, t0, t2
-	mtc1	t0, $f1			# save MSW of result
-	mtc1	t3, $f0			# save LSW of result
-	j	ra
-4:
-	li	v0, 0x80000000
-	ble	t1, -52, 7f		# is result too small for denorm?
-	sll	t2, v1, 31 - 20		# clear exponent, extract fraction
-	or	t2, t2, v0		# set implied one bit
-	blt	t1, -30, 2f		# will all bits in t3 be shifted out?
-	srl	t2, t2, 31 - 20		# shift fraction back to normal position
-	subu	t1, t1, 1
-	sll	ta0, t2, t1		# shift right t2,t3 based on exponent
-	srl	t8, t3, t1		# save bits shifted out
-	negu	t1
-	srl	t3, t3, t1
-	or	t3, t3, ta0
-	srl	t2, t2, t1
-	bge	t8, zero, 1f		# does result need to be rounded?
-	addu	t3, t3, 1		# round result
-	sltu	ta0, t3, 1
-	sll	t8, t8, 1
-	addu	t2, t2, ta0
-	bne	t8, zero, 1f		# round result to nearest
-	and	t3, t3, ~1
-1:
-	mtc1	t3, $f0			# save denormalized result (LSW)
-	mtc1	t2, $f1			# save denormalized result (MSW)
-	bge	v1, zero, 1f		# should result be negative?
-	neg.d	$f0, $f0		# negate result
-1:
-	j	ra
-2:
-	mtc1	zero, $f1		# exponent and upper fraction
-	addu	t1, t1, 20		# compute amount to shift right by
-	sll	t8, t2, t1		# save bits shifted out
-	negu	t1
-	srl	t3, t2, t1
-	bge	t8, zero, 1f		# does result need to be rounded?
-	addu	t3, t3, 1		# round result
-	sltu	ta0, t3, 1
-	sll	t8, t8, 1
-	mtc1	ta0, $f1			# exponent and upper fraction
-	bne	t8, zero, 1f		# round result to nearest
-	and	t3, t3, ~1
-1:
-	mtc1	t3, $f0
-	bge	v1, zero, 1f		# is result negative?
-	neg.d	$f0, $f0		# negate result
-1:
-	j	ra
-7:
-	mtc1	zero, $f0		# result is zero
-	mtc1	zero, $f1
-	beq	t0, zero, 1f		# is result positive?
-	neg.d	$f0, $f0		# negate result
-1:
-	j	ra
-8:
-	li	t1, 0x7ff00000		# result is infinity (MSW)
-	mtc1	t1, $f1	
-	mtc1	zero, $f0		# result is infinity (LSW)
-	bge	v1, zero, 1f		# should result be negative infinity?
-	neg.d	$f0, $f0		# result is negative infinity
-1:
-	add.d	$f0, $f0, $f0		# cause overflow faults if enabled
-	j	ra
-9:
-	mov.d	$f0, $f12		# yes, result is just x
-	j	ra
-END(ldexp)
diff --git a/lib/libc/arch/mips/gen/longjmp.c b/lib/libc/arch/mips/gen/longjmp.c
deleted file mode 100644
index 547fd399f..000000000
--- a/lib/libc/arch/mips/gen/longjmp.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*	$NetBSD: longjmp.c,v 1.5 2012/03/29 19:27:05 christos Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christian Limpach and Matt Thomas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <machine/regnum.h>
-
-#define __LIBC12_SOURCE__
-#include <setjmp.h>
-#include <compat/include/setjmp.h>
-
-void
-__longjmp14(jmp_buf env, int val)
-{
-	struct sigcontext *sc = (void *)env;
-	ucontext_t uc;
-
-	/* Ensure non-zero SP and sigcontext magic number is present */
-	if (sc->sc_regs[_R_SP] == 0 || sc->sc_regs[_R_ZERO] != (mips_reg_t)0xACEDBADEU)
-		goto err;
-
-	/* Ensure non-zero return value */
-	if (val == 0)
-		val = 1;
-
-	/*
-	 * Set _UC_{SET,CLR}STACK according to SS_ONSTACK.
-	 *
-	 * Restore the signal mask with sigprocmask() instead of _UC_SIGMASK,
-	 * since libpthread may want to interpose on signal handling.
-	 */
-	uc.uc_flags = _UC_CPU | (sc->sc_onstack ? _UC_SETSTACK : _UC_CLRSTACK);
-
-	sigprocmask(SIG_SETMASK, &sc->sc_mask, NULL);
-
-	/* Clear uc_link */
-	uc.uc_link = 0;
-
-	/* Save return value in context */
-	uc.uc_mcontext.__gregs[_REG_V0] = val;
-
-	/* Copy saved registers */
-	uc.uc_mcontext.__gregs[_REG_S0] = sc->sc_regs[_R_S0];
-	uc.uc_mcontext.__gregs[_REG_S1] = sc->sc_regs[_R_S1];
-	uc.uc_mcontext.__gregs[_REG_S2] = sc->sc_regs[_R_S2];
-	uc.uc_mcontext.__gregs[_REG_S3] = sc->sc_regs[_R_S3];
-	uc.uc_mcontext.__gregs[_REG_S4] = sc->sc_regs[_R_S4];
-	uc.uc_mcontext.__gregs[_REG_S5] = sc->sc_regs[_R_S5];
-	uc.uc_mcontext.__gregs[_REG_S6] = sc->sc_regs[_R_S6];
-	uc.uc_mcontext.__gregs[_REG_S7] = sc->sc_regs[_R_S7];
-	uc.uc_mcontext.__gregs[_REG_S8] = sc->sc_regs[_R_S8];
-#if defined(__mips_n32) || defined(__mips_n64)
-	uc.uc_mcontext.__gregs[_REG_GP] = sc->sc_regs[_R_GP];
-#endif
-	uc.uc_mcontext.__gregs[_REG_SP] = sc->sc_regs[_R_SP];
-	uc.uc_mcontext.__gregs[_REG_RA] = sc->sc_regs[_R_RA];
-	uc.uc_mcontext.__gregs[_REG_EPC] = sc->sc_pc;
-
-	/* Copy FP state */
-	if (sc->sc_fpused) {
-		/* FP saved regs are $f20 .. $f31 */
-		memcpy(&uc.uc_mcontext.__fpregs.__fp_r.__fp_regs[20],
-		    &sc->sc_fpregs[20], 32 - 20);
-		uc.uc_mcontext.__fpregs.__fp_csr =
-		    sc->sc_fpregs[_R_FSR - _FPBASE];
-		/* XXX sc_fp_control */
-		uc.uc_flags |= _UC_FPU;
-	}
-
-	setcontext(&uc);
- err:
-	longjmperror();
-	abort();
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/mips/gen/makecontext.c b/lib/libc/arch/mips/gen/makecontext.c
deleted file mode 100644
index 932f071d5..000000000
--- a/lib/libc/arch/mips/gen/makecontext.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.7 2011/09/20 08:42:29 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.7 2011/09/20 08:42:29 joerg Exp $");
-#endif
-
-#include <inttypes.h>
-#include <stddef.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#include <stdarg.h>
-
-void __resumecontext(void) __dead;
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	__greg_t *sp;
-	int i;
-	va_list ap;
-
-	/* LINTED uintptr_t is safe */
-	sp  = (__greg_t *)
-	    ((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
-	/* LINTED uintptr_t is safe */
-#if defined(__mips_o32) || defined(__mips_o64)
-	sp -= (argc >= 4 ? argc : 4);	/* Make room for >=4 arguments. */
-	sp  = (__greg_t *)
-	      ((uintptr_t)sp & ~0x7);	/* Align on double-word boundary. */
-#elif defined(__mips_n32) || defined(__mips_n64)
-	sp -= (argc > 8 ? argc - 8 : 0); /* Make room for > 8 arguments. */
-	sp  = (__greg_t *)
-	      ((uintptr_t)sp & ~0xf);	/* Align on quad-word boundary. */
-#endif
-
-	gr[_REG_SP]  = (intptr_t)sp;
-	gr[_REG_RA]  = (intptr_t)__resumecontext;
-	gr[_REG_T9]  = (intptr_t)func;		/* required for .abicalls */
-	gr[_REG_EPC] = (intptr_t)func;
-
-	/* Construct argument list. */
-	va_start(ap, argc);
-#if defined(__mips_o32) || defined(__mips_o64)
-	/* Up to the first four arguments are passed in $a0-3. */
-	for (i = 0; i < argc && i < 4; i++)
-		/* LINTED __greg_t is safe */
-		gr[_REG_A0 + i] = va_arg(ap, __greg_t);
-	/* Pass remaining arguments on the stack above the $a0-3 gap. */
-	sp += i;
-#endif
-#if defined(__mips_n32) || defined(__mips_n64)
-	/* Up to the first 8 arguments are passed in $a0-7. */
-	for (i = 0; i < argc && i < 8; i++)
-		/* LINTED __greg_t is safe */
-		gr[_REG_A0 + i] = va_arg(ap, __greg_t);
-	/* Pass remaining arguments on the stack above the $a0-3 gap. */
-#endif
-	/* Pass remaining arguments on the stack above the $a0-3 gap. */
-	for (; i < argc; i++)
-		/* LINTED uintptr_t is safe */
-		*sp++ = va_arg(ap, __greg_t);
-	va_end(ap);
-}
diff --git a/lib/libc/arch/mips/gen/modf.S b/lib/libc/arch/mips/gen/modf.S
deleted file mode 100644
index 7e523af27..000000000
--- a/lib/libc/arch/mips/gen/modf.S
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: modf.S,v 1.11 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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 <mips/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)modf.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: modf.S,v 1.11 2009/12/14 01:07:42 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * double modf(val, iptr)
- *	double val, *iptr;
- * returns: xxx and n (in *iptr) where val == n.xxx
- */
-LEAF(modf)
-	cfc1	t0, $31			# get the control register
-	li.d	$f2, 4503599627370496e0 # f2 <- 2^52
-
-	or	t1, t0, 0x3		# set rounding mode to round to zero
-	xor	t1, t1, 0x2		#  (i.e., 01)
-	ctc1	t1, $31
-
-	mov.d	$f0, $f12		# f0 <- f12
-	abs.d	$f4, $f12		# f4 <- |f12|
-	c.olt.d $f4, $f2		# f4 ? < f2 
-	bc1f	1f			# leave f0 alone if Nan, infinity 
-					# or >=2^52
-	c.eq.d	$f12,$f4		# was f12 positive ?
-	add.d	$f4,$f2,$f4		# round off to integer
-	bc1f	2f			# No -> will have to negate result
-	sub.d	$f0,$f4,$f2		# Remove fudge factor
-	j	1f			# integer fraction got
-2:	
-	sub.d	$f0,$f2,$f4		# Remove fudge factor and negate
-1:	
-	ctc1	t0, $31			# restore old rounding mode
-	s.d	$f0, 0(a2)		# save the integer part
-	sub.d	$f0, $f12, $f0		# subtract val - integer part
-	j	ra
-END(modf)
diff --git a/lib/libc/arch/mips/gen/nanf.c b/lib/libc/arch/mips/gen/nanf.c
deleted file mode 100644
index 6fbda2885..000000000
--- a/lib/libc/arch/mips/gen/nanf.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*	$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:02 martin Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:02 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-#if BYTE_ORDER == BIG_ENDIAN
-		{ { 0x7f, 0xa0,    0,    0 } };
-#else
-		{ {    0,    0, 0xa0, 0x7f } };
-#endif
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/mips/gen/resumecontext.c b/lib/libc/arch/mips/gen/resumecontext.c
deleted file mode 100644
index 66781b68f..000000000
--- a/lib/libc/arch/mips/gen/resumecontext.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:57 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:57 joerg Exp $");
-#endif
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <ucontext.h>
-#include <unistd.h>
-#include "extern.h"
-
-void
-_resumecontext(void)
-{
-	ucontext_t uct;
-
-	(void)getcontext(&uct);
-	if (uct.uc_link == NULL) 
-		exit(0);
-	(void)setcontext(uct.uc_link);
-	_exit(-1);
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/mips/gen/setjmp.S b/lib/libc/arch/mips/gen/setjmp.S
deleted file mode 100644
index c75325bc6..000000000
--- a/lib/libc/arch/mips/gen/setjmp.S
+++ /dev/null
@@ -1,148 +0,0 @@
-/*	$NetBSD: setjmp.S,v 1.19 2010/09/03 17:22:51 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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/syscall.h>
-#include <mips/asm.h>
-
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)setjmp.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: setjmp.S,v 1.19 2010/09/03 17:22:51 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * 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 a struct sigcontext, see <signal.h>
- */
-
-#define SETJMP_FRAME_SIZE	(CALLFRAME_SIZ + STACK_T_SIZE)
-
-NON_LEAF(__setjmp14, SETJMP_FRAME_SIZE, ra)
-	.mask	0x80010000, (CALLFRAME_RA - CALLFRAME_SIZ)
-	SETUP_GP
-	PTR_SUBU	sp, sp, SETJMP_FRAME_SIZE	# allocate stack frame
-	SAVE_GP(CALLFRAME_GP)
-	SETUP_GP64(CALLFRAME_GP, __setjmp14)
-
-	REG_S		ra, CALLFRAME_RA(sp)		# save RA
-	REG_S		s0, CALLFRAME_S0(sp)		# save S0
-	move		s0, a0				# save sigcontext
-
-	/* Get the signal mask. */
-	PTR_ADDU	a2, a0, _OFFSETOF_SC_MASK	# &sc.sc_mask
-	move		a1, zero
-	jal		_C_LABEL(__sigprocmask14)	# get current signal mask
-
-	/* Get the signal stack. */
-	move		a0, zero
-	PTR_ADDU	a1, sp, CALLFRAME_SIZ		# pointer to stack_t
-	jal		_C_LABEL(__sigaltstack14)
-
-	move		a0, s0				# restore jmpbuf
-	INT_L		v1, CALLFRAME_SIZ+_OFFSETOF_STACK_T_FLAGS(sp)
-							# get old ss_onstack
-	and		v1, v1, SS_ONSTACK		# extract onstack flag
-	INT_S		v1, _OFFSETOF_SC_ONSTACK(a0)	# save it in sc_onstack
-
-	REG_L		s0, CALLFRAME_S0(sp)		# restore S0
-	REG_L		ra, CALLFRAME_RA(sp)		# restore RA
-	blt		v0, zero, botch		# check for sigaltstack() error
-	nop
-	/*
-	 * We know we won't need this routine's GP anymore.
-	 */
-	RESTORE_GP64
-	PTR_ADDU	sp, sp, SETJMP_FRAME_SIZE	# pop stack frame
-
-
-	REG_PROLOGUE
-	REG_S	ra, _OFFSETOF_SC_PC(a0)		# sc_pc = return address
-	REG_LI	v0, 0xACEDBADE			# sigcontext magic number
-	REG_S	v0, _OFFSETOF_SC_REGS(a0)	#   saved in sc_regs[0]
-	REG_S	s0, _OFFSETOF_SC_REGS_S0(a0)
-	REG_S	s1, _OFFSETOF_SC_REGS_S1(a0)
-	REG_S	s2, _OFFSETOF_SC_REGS_S2(a0)
-	REG_S	s3, _OFFSETOF_SC_REGS_S3(a0)
-	REG_S	s4, _OFFSETOF_SC_REGS_S4(a0)
-	REG_S	s5, _OFFSETOF_SC_REGS_S5(a0)
-	REG_S	s6, _OFFSETOF_SC_REGS_S6(a0)
-	REG_S	s7, _OFFSETOF_SC_REGS_S7(a0)
-	REG_S	gp, _OFFSETOF_SC_REGS_GP(a0)
-	REG_S	sp, _OFFSETOF_SC_REGS_SP(a0)
-	REG_S	s8, _OFFSETOF_SC_REGS_S8(a0)
-#ifdef SOFTFLOAT_FOR_GCC
-	INT_S	zero, _OFFSETOF_SC_FPUSED(a0)	# sc_fpused = 0
-#else
-	li	v0, 1				# be nice if we could tell
-	INT_S	v0, _OFFSETOF_SC_FPUSED(a0)	# sc_fpused = 1
-	cfc1	v0, $31
-	INT_S	v0, _OFFSETOF_SC_FPREGS_FCSR(a0)
-#if defined(__mips_o32) || defined(__mips_o64) || defined(__mips_n32)
-	FP_S	$f20, _OFFSETOF_SC_FPREGS_F20(a0)
-	FP_S	$f22, _OFFSETOF_SC_FPREGS_F22(a0)
-#endif
-#if defined(__mips_o32) || defined(__mips_o64)
-	FP_S	$f21, _OFFSETOF_SC_FPREGS_F21(a0)
-	FP_S	$f23, _OFFSETOF_SC_FPREGS_F23(a0)
-#endif
-#if defined(__mips_n32) || defined(__mips_n64)
-	FP_S	$f24, _OFFSETOF_SC_FPREGS_F24(a0)
-	FP_S	$f26, _OFFSETOF_SC_FPREGS_F26(a0)
-	FP_S	$f28, _OFFSETOF_SC_FPREGS_F28(a0)
-	FP_S	$f30, _OFFSETOF_SC_FPREGS_F30(a0)
-#endif
-#if defined(__mips_n64)
-	FP_S	$f25, _OFFSETOF_SC_FPREGS_F25(a0)
-	FP_S	$f27, _OFFSETOF_SC_FPREGS_F27(a0)
-	FP_S	$f29, _OFFSETOF_SC_FPREGS_F29(a0)
-	FP_S	$f31, _OFFSETOF_SC_FPREGS_F31(a0)
-#endif
-#endif	/* SOFTFLOAT_FOR_GCC */
-	REG_EPILOGUE
-	move	v0, zero
-	j	ra
-
-botch:
-	jal	_C_LABEL(abort)
-END(__setjmp14)
diff --git a/lib/libc/arch/mips/gen/sigsetjmp.S b/lib/libc/arch/mips/gen/sigsetjmp.S
deleted file mode 100644
index 5cbe82d80..000000000
--- a/lib/libc/arch/mips/gen/sigsetjmp.S
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: sigsetjmp.S,v 1.9 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993, 1995,
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Havard Eidnes.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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/syscall.h>
-#include <mips/regnum.h>
-#include <mips/asm.h>
-#include <machine/setjmp.h>
-
-#include "assym.h"
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)setjmp.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: sigsetjmp.S,v 1.9 2009/12/14 01:07:42 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * C library -- sigsetjmp, siglongjmp
- *
- *	siglongjmp(a,v)
- * will generate a "return(v)" from
- * the last call to
- *	sigsetjmp(a, savemask)
- * by restoring registers from the stack,
- * and dependent on savemask restores the
- * signal mask.
- */
-
-LEAF(__sigsetjmp14)
-	PIC_PROLOGUE(__sigsetjmp14)
-	REG_S	a1, _JBLEN*SZREG(a0)		# save "savemask"
-	bne	a1, 0x0, 1f			# do saving of signal mask?
-	PIC_TAILCALL(_setjmp)
-
-1:	PIC_TAILCALL(__setjmp14)
-END(__sigsetjmp14)
-
-LEAF(__siglongjmp14)
-	PIC_PROLOGUE(__siglongjmp14)
-	REG_L	t0, _JBLEN*SZREG(a0)		# get "savemask"
-	bne	t0, 0x0, 1f			# restore signal mask?
-	PIC_TAILCALL(_longjmp)
-
-1:	PIC_TAILCALL(__longjmp14)
-END(__siglongjmp14)
diff --git a/lib/libc/arch/mips/gen/swapcontext.S b/lib/libc/arch/mips/gen/swapcontext.S
deleted file mode 100644
index e2aff9d39..000000000
--- a/lib/libc/arch/mips/gen/swapcontext.S
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.5 2012/09/12 02:00:52 manu Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: swapcontext.S,v 1.5 2012/09/12 02:00:52 manu Exp $")
-#endif /* SYSLIBC_SCCS && !lint */
-
-	.set	reorder
-	
-NESTED(swapcontext, CALLFRAME_SIZ, ra)
-	.mask	0x80000030, (CALLFRAME_RA - CALLFRAME_SIZ)
-	PTR_SUBU	sp, sp, CALLFRAME_SIZ
-	PTR_S		ra, CALLFRAME_RA(sp)	# save ra
-	PTR_S		a0, 0(sp)		# stash away oucp
-	PTR_S		a1, SZREG(sp)		# stash away ucp
-	SYSTRAP(getcontext)
-	PTR_L		ra, CALLFRAME_RA(sp)
-	bne		a3, zero, 1f
-
-	PTR_L		v1, 0(sp)		# load oucp again for adjustment
-	PTR_L		a0, SZREG(sp)		# load ucp
-	PTR_ADDIU	v0, sp, CALLFRAME_SIZ
-	REG_PROLOGUE
-	REG_S		zero, _OFFSETOF_UC_GREGS_V0(v1)
-	REG_S		ra, _OFFSETOF_UC_GREGS_EPC(v1)
-	REG_S		v0, _OFFSETOF_UC_GREGS_SP(v1)
-	REG_EPILOGUE
-
-	PIC_TAILCALL(setcontext)
-	/* NOTREACHED */
-1:
-	PTR_ADDU	sp, sp, CALLFRAME_SIZ
-	SETUP_GPX(t0);
-	SETUP_GP64(t3,swapcontext);
-	PIC_TAILCALL(__cerror)
-END(swapcontext)
diff --git a/lib/libc/arch/mips/genassym.cf b/lib/libc/arch/mips/genassym.cf
deleted file mode 100644
index 512d3f953..000000000
--- a/lib/libc/arch/mips/genassym.cf
+++ /dev/null
@@ -1,86 +0,0 @@
-#	$NetBSD: genassym.cf,v 1.2 2009/12/14 01:07:41 matt Exp $
-
-#
-# Copyright (c) 2001 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Matt Thomas <matt@3am-sfotware.com>.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-include <sys/types.h>
-include <machine/reg.h>
-include <machine/regnum.h>
-include <ucontext.h>
-include <signal.h>
-include <sys/siginfo.h>
-
-define _OFFSETOF_UC_GREGS	offsetof(ucontext_t, uc_mcontext.__gregs[0])
-define _OFFSETOF_UC_GREGS_V0	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_V0])
-define _OFFSETOF_UC_GREGS_SP	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_SP])
-define _OFFSETOF_UC_GREGS_EPC	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_EPC])
-define _OFFSETOF_UC_LINK	offsetof(ucontext_t, uc_link)
-define UCONTEXT_SIZE		sizeof(ucontext_t)
-
-define _OFFSETOF_SC_REGS	offsetof(struct sigcontext, sc_regs[0])
-define _OFFSETOF_SC_REGS_V0	offsetof(struct sigcontext, sc_regs[_R_V0])
-define _OFFSETOF_SC_REGS_S0	offsetof(struct sigcontext, sc_regs[_R_S0])
-define _OFFSETOF_SC_REGS_S1	offsetof(struct sigcontext, sc_regs[_R_S1])
-define _OFFSETOF_SC_REGS_S2	offsetof(struct sigcontext, sc_regs[_R_S2])
-define _OFFSETOF_SC_REGS_S3	offsetof(struct sigcontext, sc_regs[_R_S3])
-define _OFFSETOF_SC_REGS_S4	offsetof(struct sigcontext, sc_regs[_R_S4])
-define _OFFSETOF_SC_REGS_S5	offsetof(struct sigcontext, sc_regs[_R_S5])
-define _OFFSETOF_SC_REGS_S6	offsetof(struct sigcontext, sc_regs[_R_S6])
-define _OFFSETOF_SC_REGS_S7	offsetof(struct sigcontext, sc_regs[_R_S7])
-define _OFFSETOF_SC_REGS_S8	offsetof(struct sigcontext, sc_regs[_R_S8])
-define _OFFSETOF_SC_REGS_SP	offsetof(struct sigcontext, sc_regs[_R_SP])
-define _OFFSETOF_SC_REGS_GP	offsetof(struct sigcontext, sc_regs[_R_GP])
-define _OFFSETOF_SC_FPREGS	offsetof(struct sigcontext, sc_fpregs[0])
-define _OFFSETOF_SC_FPREGS_F20	offsetof(struct sigcontext, sc_fpregs[20])
-define _OFFSETOF_SC_FPREGS_F21	offsetof(struct sigcontext, sc_fpregs[21])
-define _OFFSETOF_SC_FPREGS_F22	offsetof(struct sigcontext, sc_fpregs[22])
-define _OFFSETOF_SC_FPREGS_F23	offsetof(struct sigcontext, sc_fpregs[23])
-define _OFFSETOF_SC_FPREGS_F24	offsetof(struct sigcontext, sc_fpregs[24])
-define _OFFSETOF_SC_FPREGS_F25	offsetof(struct sigcontext, sc_fpregs[25])
-define _OFFSETOF_SC_FPREGS_F26	offsetof(struct sigcontext, sc_fpregs[26])
-define _OFFSETOF_SC_FPREGS_F27	offsetof(struct sigcontext, sc_fpregs[27])
-define _OFFSETOF_SC_FPREGS_F28	offsetof(struct sigcontext, sc_fpregs[28])
-define _OFFSETOF_SC_FPREGS_F29	offsetof(struct sigcontext, sc_fpregs[29])
-define _OFFSETOF_SC_FPREGS_F30	offsetof(struct sigcontext, sc_fpregs[30])
-define _OFFSETOF_SC_FPREGS_F31	offsetof(struct sigcontext, sc_fpregs[31])
-define _OFFSETOF_SC_FPREGS_FCSR	offsetof(struct sigcontext, sc_fpregs[32])
-define _OFFSETOF_SC_PC		offsetof(struct sigcontext, sc_pc)
-define _OFFSETOF_SC_MASK	offsetof(struct sigcontext, sc_mask)
-define _OFFSETOF_SC_MASK13	offsetof(struct sigcontext, __sc_mask13)
-define _OFFSETOF_SC_ONSTACK	offsetof(struct sigcontext, sc_onstack)
-define _OFFSETOF_SC_FPUSED	offsetof(struct sigcontext, sc_fpused)
-
-define SIGINFO_SIZE		sizeof(siginfo_t)
-
-define STACK_T_SIZE		((sizeof(stack_t) + 2 * sizeof(register_t) - 1) & -(2 * sizeof(register_t)))
-define _OFFSETOF_STACK_T_SP	offsetof(stack_t, ss_sp)
-define _OFFSETOF_STACK_T_SIZE	offsetof(stack_t, ss_size)
-define _OFFSETOF_STACK_T_FLAGS	offsetof(stack_t, ss_flags)
-
-define SS_ONSTACK		SS_ONSTACK
diff --git a/lib/libc/arch/mips/net/Makefile.inc b/lib/libc/arch/mips/net/Makefile.inc
deleted file mode 100644
index a76082951..000000000
--- a/lib/libc/arch/mips/net/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 2009/12/06 07:12:17 uebayasi Exp $
-
-# objects built from assembler sources (need lint stubs)
-# hton* and nto* functions provided by ../gen/byte_swap_*.S
-SRCS+=  
-
-LSRCS.mips.net=	Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c
-LSRCS+=		${LSRCS.mips.net}
-DPSRCS+=	${LSRCS.mips.net}
-CLEANFILES+=	${LSRCS.mips.net}
diff --git a/lib/libc/arch/mips/softfloat/milieu.h b/lib/libc/arch/mips/softfloat/milieu.h
deleted file mode 100644
index e66eb2efc..000000000
--- a/lib/libc/arch/mips/softfloat/milieu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $NetBSD: milieu.h,v 1.2 2009/12/14 01:07:42 matt Exp $ */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "mips-gcc.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
diff --git a/lib/libc/arch/mips/softfloat/mips-gcc.h b/lib/libc/arch/mips/softfloat/mips-gcc.h
deleted file mode 100644
index 364924614..000000000
--- a/lib/libc/arch/mips/softfloat/mips-gcc.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $NetBSD: mips-gcc.h,v 1.5 2011/06/27 06:40:26 matt Exp $ */
-
-/*
--------------------------------------------------------------------------------
-One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
--------------------------------------------------------------------------------
-*/
-#ifdef __MIPSEB__
-#define BIGENDIAN
-#else
-#define LITTLEENDIAN
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `BITS64' can be defined to indicate that 64-bit integer types are
-supported by the compiler.
--------------------------------------------------------------------------------
-*/
-#define BITS64
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines the most convenient type that holds
-integers of at least as many bits as specified.  For example, `uint8' should
-be the most convenient type that can hold unsigned integers of as many as
-8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
-implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
-to the same as `int'.
--------------------------------------------------------------------------------
-*/
-typedef int flag;
-typedef int uint8;
-typedef int int8;
-typedef int uint16;
-typedef int int16;
-typedef unsigned int uint32;
-typedef signed int int32;
-#ifdef BITS64
-typedef unsigned long long int uint64;
-typedef signed long long int int64;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines a type that holds integers
-of _exactly_ the number of bits specified.  For instance, for most
-implementation of C, `bits16' and `sbits16' should be `typedef'ed to
-`unsigned short int' and `signed short int' (or `short int'), respectively.
--------------------------------------------------------------------------------
-*/
-typedef unsigned char bits8;
-typedef signed char sbits8;
-typedef unsigned short int bits16;
-typedef signed short int sbits16;
-typedef unsigned int bits32;
-typedef signed int sbits32;
-#ifdef BITS64
-typedef unsigned long long int bits64;
-typedef signed long long int sbits64;
-#endif
-
-#ifdef BITS64
-/*
--------------------------------------------------------------------------------
-The `LIT64' macro takes as its argument a textual integer literal and
-if necessary ``marks'' the literal as having a 64-bit integer type.
-For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
-appended with the letters `LL' standing for `long long', which is `gcc's
-name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
-defined as the identity macro:  `#define LIT64( a ) a'.
--------------------------------------------------------------------------------
-*/
-#define LIT64( a ) a##LL
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `INLINE' can be used before functions that should be inlined.  If
-a compiler does not support explicit inlining, this macro should be defined
-to be `static'.
--------------------------------------------------------------------------------
-*/
-#define INLINE static inline
-
-/*
--------------------------------------------------------------------------------
-The MIPS FPA is odd in that it stores doubles high-order word first, no matter
-what the endianness of the CPU.  VFP is sane.
--------------------------------------------------------------------------------
-*/
-#if defined(SOFTFLOAT_FOR_GCC)
-#define FLOAT64_DEMANGLE(a)	(a)
-#define FLOAT64_MANGLE(a)	(a)
-#endif
diff --git a/lib/libc/arch/mips/softfloat/softfloat.h b/lib/libc/arch/mips/softfloat/softfloat.h
deleted file mode 100644
index c731604e7..000000000
--- a/lib/libc/arch/mips/softfloat/softfloat.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/*	$NetBSD: softfloat.h,v 1.5 2011/07/07 07:14:57 matt Exp $	*/
-
-/* This is a derivative work. */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.  The same applies to
-the `FLOAT128' macro and the quadruple-precision format `float128'.
--------------------------------------------------------------------------------
-*/
-/* #define FLOATX80 */
-#if defined(__mips_n32) || defined(__mips_n64)
-#define FLOAT128
-#endif
-
-#include <machine/ieeefp.h>
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef unsigned int float32;
-typedef unsigned long long float64;
-#ifdef FLOATX80
-typedef struct {
-    unsigned short high;
-    unsigned long long low;
-} floatx80;
-#endif
-#ifdef FLOAT128
-typedef struct {
-    unsigned long long high, low;
-} float128;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-#ifndef SOFTFLOAT_FOR_GCC
-extern int float_detect_tininess;
-#endif
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern fp_rnd float_rounding_mode;
-#define float_round_nearest_even	FP_RN
-#define float_round_to_zero		FP_RZ
-#define float_round_down		FP_RM
-#define float_round_up			FP_RP
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-*/
-extern fp_except float_exception_flags;
-extern fp_except float_exception_mask;
-enum {
-    float_flag_inexact   = FP_X_IMP,
-    float_flag_underflow = FP_X_UFL,
-    float_flag_overflow  = FP_X_OFL,
-    float_flag_divbyzero = FP_X_DZ,
-    float_flag_invalid   = FP_X_INV
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( fp_except );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int32 );
-float32 uint32_to_float32( uint32 );
-float64 int32_to_float64( int32 );
-float64 uint32_to_float64( uint32 );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( int32 );
-floatx80 uint32_to_floatx80( uint32 );
-#endif
-#ifdef FLOAT128
-float128 int32_to_float128( int32 );
-float128 uint32_to_float128( uint32 );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __floatdi?f is in libgcc2.c */
-float32 int64_to_float32( long long );
-float64 int64_to_float64( long long );
-#ifdef FLOATX80
-floatx80 int64_to_floatx80( long long );
-#endif
-#endif
-#ifdef FLOAT128
-float128 int64_to_float128( long long );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float32_to_int32( float32 );
-int float32_to_int32_round_to_zero( float32 );
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
-unsigned int float32_to_uint32_round_to_zero( float32 );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __fix?fdi provided by libgcc2.c */
-long long float32_to_int64( float32 );
-long long float32_to_int64_round_to_zero( float32 );
-#endif
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-#ifdef FLOAT128
-float128 float32_to_float128( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-int float32_eq( float32, float32 );
-int float32_le( float32, float32 );
-int float32_lt( float32, float32 );
-int float32_eq_signaling( float32, float32 );
-int float32_le_quiet( float32, float32 );
-int float32_lt_quiet( float32, float32 );
-#ifndef SOFTFLOAT_FOR_GCC
-int float32_is_signaling_nan( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float64_to_int32( float64 );
-int float64_to_int32_round_to_zero( float64 );
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
-unsigned int float64_to_uint32_round_to_zero( float64 );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __fix?fdi provided by libgcc2.c */
-long long float64_to_int64( float64 );
-long long float64_to_int64_round_to_zero( float64 );
-#endif
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-#ifdef FLOAT128
-float128 float64_to_float128( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-int float64_eq( float64, float64 );
-int float64_le( float64, float64 );
-int float64_lt( float64, float64 );
-int float64_eq_signaling( float64, float64 );
-int float64_le_quiet( float64, float64 );
-int float64_lt_quiet( float64, float64 );
-#ifndef SOFTFLOAT_FOR_GCC
-int float64_is_signaling_nan( float64 );
-#endif
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int floatx80_to_int32( floatx80 );
-int floatx80_to_int32_round_to_zero( floatx80 );
-long long floatx80_to_int64( floatx80 );
-long long floatx80_to_int64_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-#ifdef FLOAT128
-float128 floatx80_to_float128( floatx80 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern int floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-int floatx80_eq( floatx80, floatx80 );
-int floatx80_le( floatx80, floatx80 );
-int floatx80_lt( floatx80, floatx80 );
-int floatx80_eq_signaling( floatx80, floatx80 );
-int floatx80_le_quiet( floatx80, floatx80 );
-int floatx80_lt_quiet( floatx80, floatx80 );
-int floatx80_is_signaling_nan( floatx80 );
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float128_to_int32( float128 );
-int float128_to_int32_round_to_zero( float128 );
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
-unsigned int float128_to_uint32_round_to_zero( float64 );
-#endif
-long long float128_to_int64( float128 );
-long long float128_to_int64_round_to_zero( float128 );
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
-unsigned long long float128_to_uint64_round_to_zero( float128 );
-#endif
-float32 float128_to_float32( float128 );
-float64 float128_to_float64( float128 );
-#ifdef FLOATX80
-floatx80 float128_to_floatx80( float128 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision operations.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 );
-float128 float128_add( float128, float128 );
-float128 float128_sub( float128, float128 );
-float128 float128_mul( float128, float128 );
-float128 float128_div( float128, float128 );
-float128 float128_rem( float128, float128 );
-float128 float128_sqrt( float128 );
-int float128_eq( float128, float128 );
-int float128_le( float128, float128 );
-int float128_lt( float128, float128 );
-int float128_eq_signaling( float128, float128 );
-int float128_le_quiet( float128, float128 );
-int float128_lt_quiet( float128, float128 );
-int float128_is_signaling_nan( float128 );
-flag float128_is_nan( float128 );
-
-#endif
-
diff --git a/lib/libc/arch/mips/stdlib/Makefile.inc b/lib/libc/arch/mips/stdlib/Makefile.inc
deleted file mode 100644
index 2f91b992a..000000000
--- a/lib/libc/arch/mips/stdlib/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2009/07/31 20:40:00 dsl Exp $
diff --git a/lib/libc/arch/mips/string/Makefile.inc b/lib/libc/arch/mips/string/Makefile.inc
deleted file mode 100644
index 0213864d4..000000000
--- a/lib/libc/arch/mips/string/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2009/12/14 01:07:42 matt Exp $
-
-SRCS+=	bcmp.S bcopy.S bzero.S \
-	ffs.S \
-	memcpy.S memmove.S \
-	strchr.S strrchr.S \
-	strcmp.S strlen.S
diff --git a/lib/libc/arch/mips/string/bcmp.S b/lib/libc/arch/mips/string/bcmp.S
deleted file mode 100644
index c90fa2c36..000000000
--- a/lib/libc/arch/mips/string/bcmp.S
+++ /dev/null
@@ -1,124 +0,0 @@
-/*	$NetBSD: bcmp.S,v 1.9 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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 <mips/asm.h>
-#define _LOCORE		/* XXX not really, just assembly-code source */
-#include <machine/endian.h>	/* LWLO/LWHI, SWLO/SWHI */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)bcmp.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: bcmp.S,v 1.9 2009/12/14 01:07:42 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* bcmp(s1, s2, n) */
-
-
-LEAF(bcmp)
-	.set	noreorder
-	blt		a2, 16, small	# is it worth any trouble?
-	xor		v0, a0, a1	# compare low two bits of addresses
-	and		v0, v0, 3
-	PTR_SUBU	a3, zero, a1	# compute # bytes to word align address
-	bne		v0, zero, unaligned # not possible to align addresses
-	and		a3, a3, 3
-
-	beq		a3, zero, 1f
-	PTR_SUBU	a2, a2, a3	# subtract from remaining count
-	move		v0, v1		# init v0,v1 so unmodified bytes match
-	LWHI		v0, 0(a0)	# read 1, 2, or 3 bytes
-	LWHI		v1, 0(a1)
-	PTR_ADDU	a1, a1, a3
-	bne		v0, v1, nomatch
-	PTR_ADDU	a0, a0, a3
-1:
-	and		a3, a2, ~3	# compute number of whole words left
-	PTR_SUBU	a2, a2, a3	#   which has to be >= (16-3) & ~3
-	PTR_ADDU	a3, a3, a0	# compute ending address
-2:
-	lw		v0, 0(a0)	# compare words
-	lw		v1, 0(a1)
-	PTR_ADDU	a0, a0, 4
-	bne		v0, v1, nomatch
-	PTR_ADDU	a1, a1, 4
-	bne		a0, a3, 2b
-	nop
-	b		small		# finish remainder
-	nop
-unaligned:
-	beq		a3, zero, 2f
-	PTR_SUBU	a2, a2, a3	# subtract from remaining count
-	PTR_ADDU	a3, a3, a0	# compute ending address
-1:
-	lbu		v0, 0(a0)	# compare bytes until a1 word aligned
-	lbu		v1, 0(a1)
-	PTR_ADDU	a0, a0, 1
-	bne		v0, v1, nomatch
-	PTR_ADDU	a1, a1, 1
-	bne		a0, a3, 1b
-	nop
-2:
-	and		a3, a2, ~3	# compute number of whole words left
-	PTR_SUBU	a2, a2, a3	#   which has to be >= (16-3) & ~3
-	PTR_ADDU	a3, a3, a0	# compute ending address
-3:
-	LWHI		v0, 0(a0)	# compare words a0 unaligned, a1 aligned
-	LWLO		v0, 3(a0)
-	lw		v1, 0(a1)
-	PTR_ADDU	a0, a0, 4
-	bne		v0, v1, nomatch
-	PTR_ADDU	a1, a1, 4
-	bne		a0, a3, 3b
-	nop
-small:
-	ble		a2, zero, match
-	PTR_ADDU	a3, a2, a0		# compute ending address
-1:
-	lbu		v0, 0(a0)
-	lbu		v1, 0(a1)
-	PTR_ADDU	a0, a0, 1
-	bne		v0, v1, nomatch
-	PTR_ADDU	a1, a1, 1
-	bne		a0, a3, 1b
-	nop
-match:
-	j		ra
-	move		v0, zero
-nomatch:
-	j		ra
-	li		v0, 1
-	.set	reorder
-END(bcmp)
diff --git a/lib/libc/arch/mips/string/bzero.S b/lib/libc/arch/mips/string/bzero.S
deleted file mode 100644
index f25c02055..000000000
--- a/lib/libc/arch/mips/string/bzero.S
+++ /dev/null
@@ -1,97 +0,0 @@
-/*	$NetBSD: bzero.S,v 1.10 2009/12/14 02:53:52 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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 <mips/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)bzero.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: bzero.S,v 1.10 2009/12/14 02:53:52 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-
-#define _LOCORE		/* XXX not really, just assembly-code source */
-#include <machine/endian.h>
-
-/* bzero(s1, n) */
-
-LEAF(bzero)
-	.set	noreorder
-	blt		a1, 3*SZREG, smallclr # small amount to clear?
-	PTR_SUBU	a3, zero, a0	# compute # bytes to word align address
-	and		a3, a3, SZREG-1
-	beq		a3, zero, 1f	# skip if word aligned
-#if SZREG == 4
-	PTR_SUBU	a1, a1, a3	# subtract from remaining count
-	SWHI		zero, 0(a0)	# clear 1, 2, or 3 bytes to align
-	PTR_ADDU	a0, a0, a3
-#endif
-#if SZREG == 8
-	PTR_SUBU	a1, a1, a3	# subtract from remaining count
-	PTR_ADDU	a0, a0, a3	# align dst to next word
-	sll		a3, a3, 3	# bits to bytes
-	li		a2, -1		# make a mask
-#if _BYTE_ORDER == _BIG_ENDIAN
-	REG_SRLV	a2, a2, a3	# we want to keep the MSB bytes
-#endif
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-	REG_SLLV	a2, a2, a3	# we want to keep the LSB bytes
-#endif
-	nor		a2, zero, a2	# complement the mask
-	REG_L		v0, -SZREG(a0)	# load the word to partially clear
-	and		v0, v0, a2	# clear the bytes
-	REG_S		v0, -SZREG(a0)	# store it back
-#endif
-1:
-	and		v0, a1, SZREG-1	# compute number of words left
-	PTR_SUBU	a3, a1, v0
-	move		a1, v0
-	PTR_ADDU	a3, a3, a0	# compute ending address
-2:
-	PTR_ADDU	a0, a0, SZREG	# clear words
-	bne		a0, a3, 2b	#  unrolling loop doesnt help
-	REG_S		zero, -SZREG(a0) # since we are limited by memory speed
-smallclr:
-	ble		a1, zero, 2f
-	PTR_ADDU	a3, a1, a0	# compute ending address
-1:
-	PTR_ADDU	a0, a0, 1	# clear bytes
-	bne		a0, a3, 1b
-	sb		zero, -1(a0)
-2:
-	j		ra
-	nop
-END(bzero)
diff --git a/lib/libc/arch/mips/sys/__clone.S b/lib/libc/arch/mips/sys/__clone.S
deleted file mode 100644
index de7ef4792..000000000
--- a/lib/libc/arch/mips/sys/__clone.S
+++ /dev/null
@@ -1,103 +0,0 @@
-/*	$NetBSD: __clone.S,v 1.8 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __clone.S,v 1.8 2009/12/14 01:07:42 matt Exp $");
-#endif /* SYSLIBC_SCCS and not lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(clone, __clone)
-#endif
-
-/*
- * int __clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-LEAF(__clone)
-	PIC_PROLOGUE(__clone)
-
-	/*
-	 * Sanity checks: func and stack may not be NULL.
-	 */
-	li		v0, EINVAL
-	beq		a0, zero, 8f
-	beq		a1, zero, 8f
-
-	/*
-	 * We need to be able to get at the func and arg arguments
-	 * in the child.  Luckily, we have a convenient place to
-	 * do this: the child's stack.
-	 */
-	PTR_SUBU	a1, a1, CALLFRAME_SIZ
-	REG_S		a0, 0(a1)
-	REG_S		a3, SZREG(a1)
-
-	/*
-	 * The system call expects (flags, stack).
-	 */
-	move		a0, a2
-	SYSTRAP(__clone)
-	bne		a3, zero, 8f
-
-	bne		v1, zero, 9f	# v1 (rv[1]) == 0, parent, child pid in v0
-
-	PIC_RETURN()			# parent return
-
-8:	PIC_TAILCALL(__cerror)
-	/* NOTREACHED */
-
-9:	/*
-	 * Child: Fetch the function and argument from the new stack and create
-	 a frame so that the child can be safely called.
-	 *
-	 * There are already register slots on the stack from above.
-	 * They already include the o32 argument save area.  The
-	 * highest is unused.  a1 should equal sp now.
-	 */
-
-	REG_L		t9, 0(sp)
-	REG_L		a0, SZREG(sp)
-
-	REG_S		zero, CALLFRAME_RA(sp)	/* make sure stack frame ends */
-
-	/* Call the clone's entry point. */
-	SAVE_GP(CALLFRAME_GP)
-	jal		t9
-
-	/* Pass the return value to _exit. */
-	move		a0, v0
-	PIC_TAILCALL(_exit)
-
-	/* NOTREACHED */
-END(__clone)
diff --git a/lib/libc/arch/mips/sys/__sigaction14_sigtramp.c b/lib/libc/arch/mips/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index 929edac97..000000000
--- a/lib/libc/arch/mips/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.7 2008/04/28 20:22:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.7 2008/04/28 20:22:56 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern const int __sigtramp_siginfo_2[];
-
-	/*
-	 * If no sigaction, use the "default" trampoline since it won't
-	 * be used.
-	 */
-	if (act == NULL)
-		return  __sigaction_sigtramp(sig, act, oact, NULL, 0);
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the non-SA_SIGINFO trampoline if SA_SIGINFO is not
-	 * set in the sigaction.
-	 */
-	if ((act->sa_flags & SA_SIGINFO) == 0) {
-		extern const int __sigtramp_sigcontext_1[];
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-		    __sigtramp_sigcontext_1, 1);
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	/*
-	 * If SA_SIGINFO was specified or the compatibility trampolines
-	 * can't be used, use the siginfo trampoline.
-	 */
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/mips/sys/__sigtramp2.S b/lib/libc/arch/mips/sys/__sigtramp2.S
deleted file mode 100644
index 63b0661de..000000000
--- a/lib/libc/arch/mips/sys/__sigtramp2.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.3 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __sigtramp2.S,v 1.3 2009/12/14 01:07:42 matt Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-
-/*
- * The MIPS signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, stack looks like:
- *
- *	sp			->	siginfo_t structure
- *	sp + SIGINFO_SIZE	->	ucontext_t structure
- */
-LEAF_NOPROFILE(__sigtramp_siginfo_2)
-	PTR_ADDU	a0, sp, SIGINFO_SIZE	/* address of ucontext */
-	SYSTRAP(setcontext)			/* and do setcontext */
-	move		a0, v0			/* exit with errno */
-	SYSTRAP(exit)				/* if sigreturn fails */
-END(__sigtramp_siginfo_2)
diff --git a/lib/libc/arch/mips/sys/__syscall.S b/lib/libc/arch/mips/sys/__syscall.S
deleted file mode 100644
index 0841e4795..000000000
--- a/lib/libc/arch/mips/sys/__syscall.S
+++ /dev/null
@@ -1,27 +0,0 @@
-/*	$NetBSD: __syscall.S,v 1.2 2014/01/31 18:06:26 matt Exp $	*/
-
-#include "SYS.h"
-
-#ifdef __mips_o32
-RSYSCALL(__syscall)
-#else
-
-LEAF(__syscall)
-        PIC_PROLOGUE(__syscall)
-	move	v0, a0
-	move	a0, a1
-	move	a1, a2
-	move	a2, a3
-	move	a3, a4
-	move	a4, a5
-	move	a5, a6
-	move	a6, a7
-	REG_L	a7, (sp)
-        SYSTRAP(__syscall)
-        bne a3,zero,1f
-        PIC_RETURN()
-1:
-        PIC_TAILCALL(__cerror)
-END(__syscall)
-STRONG_ALIAS(syscall, __syscall)
-#endif
diff --git a/lib/libc/arch/mips/sys/__vfork14.S b/lib/libc/arch/mips/sys/__vfork14.S
deleted file mode 100644
index dcb309fd9..000000000
--- a/lib/libc/arch/mips/sys/__vfork14.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: __vfork14.S,v 1.6 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)Ovfork.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: __vfork14.S,v 1.6 2009/12/14 01:07:42 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * pid = vfork();
- *
- * v1 == 0 in parent process, v1 == 1 in child process.
- * v0 == pid of child in parent, v0 == pid of parent in child.
- */
-
-LEAF(__vfork14)
-	PIC_PROLOGUE(__vfork14)
-	li	v0, SYS___vfork14	# system call number for vfork
-	syscall
-	beq	a3, zero, 1f		# jump if no errors
-	PIC_TAILCALL(__cerror)
-1:
-	beq	v1, zero, 2f		# parent process ?
-	move	v0, zero		# return zero in child
-2:
-	PIC_RETURN()
-END(__vfork14)
diff --git a/lib/libc/arch/mips/sys/brk.S b/lib/libc/arch/mips/sys/brk.S
deleted file mode 100644
index f0571d075..000000000
--- a/lib/libc/arch/mips/sys/brk.S
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: brk.S,v 1.18 2010/12/12 09:00:37 tsutsui Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)brk.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: brk.S,v 1.18 2010/12/12 09:00:37 tsutsui Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-	.globl	_C_LABEL(__minbrk)
-	.globl	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(_end)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
-#endif
-
-	.data
-_C_LABEL(__minbrk):
-	PTR_WORD	_C_LABEL(_end)
-	.text
-
-LEAF(_brk)
-	PIC_PROLOGUE(_brk)
-	PTR_LA		t0, _C_LABEL(__minbrk)
-	PTR_L		v0, 0(t0)
-	bgeu		a0, v0, 1f
-	move		a0, v0		# dont allow break < minbrk
-1:
-	li		v0, SYS_break
-	syscall
-	bne		a3, zero, 2f
-	PTR_LA		t0, _C_LABEL(__curbrk)
-	PTR_S		a0, 0(t0)
-	move		v0, zero
-	PIC_RETURN()
-2:
-	PIC_TAILCALL(__cerror)
-END(_brk)
diff --git a/lib/libc/arch/mips/sys/cerror.S b/lib/libc/arch/mips/sys/cerror.S
deleted file mode 100644
index 5c2a45f7c..000000000
--- a/lib/libc/arch/mips/sys/cerror.S
+++ /dev/null
@@ -1,81 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.19 2013/09/12 15:36:15 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)cerror.s	8.1 (Berkeley) 6/16/93")
-#else
-	RCSID("$NetBSD: cerror.S,v 1.19 2013/09/12 15:36:15 joerg Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __PIC__
-	.protected	__cerror
-#endif
-
-#ifdef _REENTRANT
-	.globl	_C_LABEL(__errno)
-NESTED_NOPROFILE(__cerror, CALLFRAME_SIZ, ra)
-	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
-	PIC_PROLOGUE(__cerror)
-	PTR_SUBU	sp, CALLFRAME_SIZ
-	PTR_S		ra, CALLFRAME_RA(sp)
-	INT_S		v0, CALLFRAME_S0(sp)	# save errno value
-
-	SAVE_GP(CALLFRAME_GP)
-
-	PTR_LA		t9, _C_LABEL(__errno)	# locate address of errno
-	RESTORE_GP64				# restore GP (from t3)
-	jalr		t9			# __errno()
-
-	INT_L		t0, CALLFRAME_S0(sp)
-	PTR_L		ra, CALLFRAME_RA(sp)
-	INT_S		t0, 0(v0)		# update errno value
-	PTR_ADDU	sp, CALLFRAME_SIZ
-	li		v0, -1
-	li		v1, -1
-	j		ra			# GP has been restored.
-END(__cerror)
-#else		
-	.globl	_C_LABEL(errno)
-LEAF_NOPROFILE(__cerror)
-	PIC_PROLOGUE(__cerror)
-	INT_S		v0, _C_LABEL(errno)
-	li		v0, -1
-	li		v1, -1
-	PIC_RETURN()
-END(__cerror)
-#endif /* _REENTRANT */
diff --git a/lib/libc/arch/mips/sys/exect.S b/lib/libc/arch/mips/sys/exect.S
deleted file mode 100644
index 4f69e12ec..000000000
--- a/lib/libc/arch/mips/sys/exect.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: exect.S,v 1.10 2009/12/14 01:07:42 matt Exp $	*/
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)exect.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: exect.S,v 1.10 2009/12/14 01:07:42 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-LEAF(exect)
-	PIC_PROLOGUE(exect)
-	li	v0, SYS_execve
-	syscall
-	bne	a3, zero, 1f
-	PIC_RETURN()
-1:
-	PIC_TAILCALL(__cerror)
-END(exect)
diff --git a/lib/libc/arch/mips/sys/fork.S b/lib/libc/arch/mips/sys/fork.S
deleted file mode 100644
index 1a532fc70..000000000
--- a/lib/libc/arch/mips/sys/fork.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: fork.S,v 1.12 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)fork.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: fork.S,v 1.12 2009/12/14 01:07:42 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-LEAF(__fork)
-	PIC_PROLOGUE(__fork)
-
-	SYSTRAP(fork)		# pid = fork()
-	bne	a3, zero, 2f
-	beq	v1, zero, 1f	# v1 == 0 in parent, 1 in child
-	move	v0, zero
-1:
-	PIC_RETURN()
-2:
-	PIC_TAILCALL(__cerror)
-END(__fork)
diff --git a/lib/libc/arch/mips/sys/getcontext.S b/lib/libc/arch/mips/sys/getcontext.S
deleted file mode 100644
index 34743c69a..000000000
--- a/lib/libc/arch/mips/sys/getcontext.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.4 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-#include "assym.h"
-#include <machine/mcontext.h>
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: getcontext.S,v 1.4 2009/12/14 01:07:42 matt Exp $")
-#endif /* SYSLIBC_SCCS && !lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext, _getcontext)
-#endif
-	.set reorder
-
-LEAF(_getcontext)
-	PIC_PROLOGUE(_getcontext)
-	SYSTRAP(getcontext)
-	bne		a3, zero, 1f
-	REG_PROLOGUE
-	REG_S		zero, (_OFFSETOF_UC_GREGS + _REG_V0 * SZREG)(a0)
-	REG_S		ra, (_OFFSETOF_UC_GREGS + _REG_EPC * SZREG)(a0)
-	REG_EPILOGUE
-	PIC_RETURN()
-1:
-	PIC_TAILCALL(__cerror)
-END(_getcontext)
diff --git a/lib/libc/arch/mips/sys/pipe.S b/lib/libc/arch/mips/sys/pipe.S
deleted file mode 100644
index d4047e241..000000000
--- a/lib/libc/arch/mips/sys/pipe.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.12 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)pipe.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: pipe.S,v 1.12 2009/12/14 01:07:42 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-#endif
-
-LEAF(_pipe)
-	PIC_PROLOGUE(_pipe);
-	
-	SYSTRAP(pipe)	# pipe(fildes) int fildes[2];
-
-	bne	a3, zero, 1f
-	INT_S	v0, 0(a0)	# store the two file descriptors
-	INT_S	v1, 4(a0)
-	move	v0, zero
-	PIC_RETURN()
-1:
-	PIC_TAILCALL(__cerror)
-END(_pipe)
diff --git a/lib/libc/arch/mips/sys/ptrace.S b/lib/libc/arch/mips/sys/ptrace.S
deleted file mode 100644
index a1817e3d6..000000000
--- a/lib/libc/arch/mips/sys/ptrace.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.10 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)ptrace.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: ptrace.S,v 1.10 2009/12/14 01:07:42 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-LEAF(ptrace)
-	PIC_PROLOGUE(ptrace)
-	INT_S	zero, _C_LABEL(errno)	/* BOGUS */
-
-	SYSTRAP(ptrace)
-	bne	a3, zero, 1f
-	PIC_RETURN()
-1:
-	PIC_TAILCALL(__cerror)
-END(ptrace)
diff --git a/lib/libc/arch/mips/sys/sbrk.S b/lib/libc/arch/mips/sys/sbrk.S
deleted file mode 100644
index 5098b0c7c..000000000
--- a/lib/libc/arch/mips/sys/sbrk.S
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.19 2013/06/26 08:38:34 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)sbrk.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: sbrk.S,v 1.19 2013/06/26 08:38:34 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-	.globl	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(_end)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-	.data
-_C_LABEL(__curbrk):
-	PTR_WORD	_C_LABEL(_end)
-	.text
-
-LEAF(_sbrk)
-	PIC_PROLOGUE(_sbrk)
-	PTR_LA		t0, _C_LABEL(__curbrk)
-	PTR_L		t1, 0(t0)
-	PTR_ADDU	a0, a0, t1	# compute current break
-	SYSTRAP(break)
-	bne		a3, zero, 1f
-	move		v0, t1		# return old val of curbrk from above
-	PTR_LA		t0, _C_LABEL(__curbrk)
-	PTR_S		a0, 0(t0)	# save current val of curbrk from above
-	PIC_RETURN()
-1:
-	PIC_TAILCALL(__cerror)
-END(_sbrk)
diff --git a/lib/libc/arch/mips/sys/shmat.S b/lib/libc/arch/mips/sys/shmat.S
deleted file mode 100644
index 0e7842254..000000000
--- a/lib/libc/arch/mips/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2000/07/07 08:20:52 itohy Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/mips/sys/syscall.S b/lib/libc/arch/mips/sys/syscall.S
deleted file mode 100644
index 1ff15719e..000000000
--- a/lib/libc/arch/mips/sys/syscall.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.7 2014/01/31 18:06:26 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)syscall.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: syscall.S,v 1.7 2014/01/31 18:06:26 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __mips_o32
-RSYSCALL(syscall)
-#endif
diff --git a/lib/libc/arch/or1k/Makefile.inc b/lib/libc/arch/or1k/Makefile.inc
deleted file mode 100644
index be1925404..000000000
--- a/lib/libc/arch/or1k/Makefile.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2014/09/05 18:09:37 matt Exp $
-
-SRCS+=		__sigaction14_sigtramp.c __sigtramp2.S
-SRCS+=		mulsi3.S
-
-CPPFLAGS+=	-I.
-
-DPSRCS+=	sysassym.h
-CLEANFILES+=	sysassym.h sysassym.h.tmp
-
-sysassym.h: ${DESTDIR}/usr/include/sys/syscall.h \
-	${DESTDIR}/usr/include/sys/syscallargs.h ${ARCHDIR}/syscallargs.awk
-	${_MKTARGET_CREATE}
-	${TOOL_CAT} \
-		${DESTDIR}/usr/include/sys/syscall.h \
-		${DESTDIR}/usr/include/sys/syscallargs.h | \
-	${TOOL_AWK} -f ${ARCHDIR}/syscallargs.awk | \
-	${TOOL_GENASSYM} -- ${CC} -ffreestanding ${CFLAGS:N-Wa,*} \
-		${CPPFLAGS:N-D*} -D_KMEMUSER \
-		${GENASSYM_CPPFLAGS} > $@.tmp && \
-	mv -f $@.tmp $@
-
-.if ${MKSOFTFLOAT} != "no"
-.include <softfloat/Makefile.inc>
-.endif
diff --git a/lib/libc/arch/or1k/SYS.h b/lib/libc/arch/or1k/SYS.h
deleted file mode 100644
index 7bd09a660..000000000
--- a/lib/libc/arch/or1k/SYS.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.2 2014/09/05 18:09:37 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-#include "sysassym.h"
-
-#define	_DOSYSCALL(x)		l.addi	r13,r0,(SYS_ ## x)	;\
-				l.sys	0			;\
-				l.nop
-
-#define	_SYSCALL_NOERROR(x,y)	ENTRY(x)			;\
-				.if NSYSARGS_##y > 6		;\
-				l.lwz	r11, 0(r1)		;\
-				.endif				;\
-				.if NSYSARGS_##y > 7		;\
-				l.lwz	r12, 4(r1)		;\
-				.endif				;\
-				_DOSYSCALL(y)
-
-#define _SYSCALL(x,y)		_SYSCALL_NOERROR(x,y)		;\
-				l.bf	_C_LABEL(__cerror)	;\
-				l.nop
-
-#define SYSCALL_NOERROR(x)	_SYSCALL_NOERROR(x,x)
-
-#define SYSCALL(x)		_SYSCALL(x,x)
-
-#define PSEUDO_NOERROR(x,y)	_SYSCALL_NOERROR(x,y)		;\
-				l.jr	lr			;\
-				l.nop				;\
-				END(x)
-
-#define PSEUDO(x,y)		_SYSCALL_NOERROR(x,y)		;\
-				l.bf	_C_LABEL(__cerror)	;\
-				l.nop				;\
-				l.jr	lr			;\
-				l.nop				;\
-				END(x)
-
-#define RSYSCALL_NOERROR(x)	PSEUDO_NOERROR(x,x)
-
-#define RSYSCALL(x)		PSEUDO(x,x)
-
-#define	WSYSCALL(weak,strong)	WEAK_ALIAS(weak,strong)		;\
-				PSEUDO(strong,weak)
diff --git a/lib/libc/arch/or1k/gdtoa/Makefile.inc b/lib/libc/arch/or1k/gdtoa/Makefile.inc
deleted file mode 100644
index ba631cb9b..000000000
--- a/lib/libc/arch/or1k/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2014/09/03 19:34:25 matt Exp $
-
-SRCS+=	strtof.c
diff --git a/lib/libc/arch/or1k/gdtoa/arith.h b/lib/libc/arch/or1k/gdtoa/arith.h
deleted file mode 100644
index 66326b852..000000000
--- a/lib/libc/arch/or1k/gdtoa/arith.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2014/09/03 19:34:25 matt Exp $ */
-
-#define IEEE_BIG_ENDIAN
diff --git a/lib/libc/arch/or1k/gdtoa/gd_qnan.h b/lib/libc/arch/or1k/gdtoa/gd_qnan.h
deleted file mode 100644
index f3f58b191..000000000
--- a/lib/libc/arch/or1k/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2014/09/03 19:34:25 matt Exp $ */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x7ff80000
-#define d_QNAN1 0x0
diff --git a/lib/libc/arch/or1k/gen/Makefile.inc b/lib/libc/arch/or1k/gen/Makefile.inc
deleted file mode 100644
index ab8fbb088..000000000
--- a/lib/libc/arch/or1k/gen/Makefile.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2014/09/03 19:34:25 matt Exp $
-
-SRCS+=	__setjmp14.S __sigsetjmp14.S _setjmp.S
-SRCS+=	bswap16.c bswap32.c bswap64.c
-SRCS+=	flt_rounds.c
-SRCS+=  _lwp.c makecontext.c resumecontext.c swapcontext.S
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c infinityl_dbl_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
-SRCS+=	fabs_ieee754.c
-
-SRCS+=	nanf.c
-
-.if (${MKSOFTFLOAT} == "no")
-SRCS+=	fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c
-SRCS+=	fpgetsticky.c fpsetsticky.c
-.endif
-
-CPPFLAGS._lwp.c	+= -D_LIBC_SOURCE
-
-LSRCS.powerpc.gen=Lint_swapcontext.c
-LSRCS+=		${LSRCS.powerpc.gen}
-DPSRCS+=	${LSRCS.powerpc.gen}
-CLEANFILES+=	${LSRCS.powerpc.gen}
diff --git a/lib/libc/arch/or1k/gen/__setjmp14.S b/lib/libc/arch/or1k/gen/__setjmp14.S
deleted file mode 100644
index 5f4e97bc1..000000000
--- a/lib/libc/arch/or1k/gen/__setjmp14.S
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: __setjmp14.S,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __setjmp14.S,v 1.1 2014/09/03 19:34:25 matt Exp $")
-#endif
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *	setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is restored.
- */
-
-ENTRY(__setjmp14)
-	l.sw	JB_PC(r3), lr		/* save return address */
-	l.sw	JB_LR(r3), lr		/* save return address */
-	l.sw	JB_SP(r3), r1		/* save stack pointer */
-	l.sw	JB_FP(r3), r2		/* save frame pointer */
-	l.sw	JB_R10(r3), r10		/* save callee saved register */
-	l.sw	JB_R14(r3), r14		/* save callee saved register */
-	l.sw	JB_R16(r3), r16		/* save callee saved register */
-	l.sw	JB_R18(r3), r18		/* save callee saved register */
-	l.sw	JB_R20(r3), r20		/* save callee saved register */
-	l.sw	JB_R22(r3), r22		/* save callee saved register */
-	l.sw	JB_R24(r3), r24		/* save callee saved register */
-	l.sw	JB_R26(r3), r26		/* save callee saved register */
-	l.sw	JB_R28(r3), r28		/* save callee saved register */
-	l.sw	JB_R30(r3), r30		/* save callee saved register */
-	l.addi	r4, r0, 1
-	l.sw	JB_MAGIC(r3), r4	/* note we saved sigmask */
-	l.addi	r5, r3, JB_SIGMASK	# &sigmask
-	l.xor	r4, r4, r4
-	l.addi	r3, r0, SIG_BLOCK
-	_DOSYSCALL(__sigprocmask14)	# assume no error	XXX
-	l.xor	r11, r11, r11
-	l.jr	lr
-	l.nop
-END(__setjmp14)
-
-ENTRY(__longjmp14)
-	l.lwz	lr, JB_LR(r3)		/* get return address */
-	l.lwz	r1, JB_SP(r3)		/* get stack pointer */
-	l.lwz	r2, JB_FP(r3)		/* get frame pointer */
-	l.lwz	r10, JB_R10(r3)		/* get callee saved register */
-	l.lwz	r14, JB_R14(r3)		/* get callee saved register */
-	l.lwz	r16, JB_R16(r3)		/* get callee saved register */
-	l.lwz	r18, JB_R18(r3)		/* get callee saved register */
-	l.lwz	r20, JB_R20(r3)		/* get callee saved register */
-	l.lwz	r22, JB_R22(r3)		/* get callee saved register */
-	l.lwz	r24, JB_R24(r3)		/* get callee saved register */
-	l.lwz	r26, JB_R26(r3)		/* get callee saved register */
-	l.lwz	r28, JB_R28(r3)		/* get callee saved register */
-	l.lwz	r30, JB_R30(r3)		/* get callee saved register */
-	l.ori	r11, r4, 0
-	l.xor	r5, r5, r5
-	l.addi	r4, r3, JB_SIGMASK	# &sigmask
-	l.addi	r3, r0, SIG_SETMASK
-	_DOSYSCALL(__sigprocmask14)	# assume no error	XXX
-	l.addi	r6, r0, 1
-	l.sfeqi	r11, 0
-	l.cmov	r11, r6, r11
-	l.jr	lr
-	l.nop
-END(__longjmp14)
diff --git a/lib/libc/arch/or1k/gen/__sigsetjmp14.S b/lib/libc/arch/or1k/gen/__sigsetjmp14.S
deleted file mode 100644
index c0ebabc2e..000000000
--- a/lib/libc/arch/or1k/gen/__sigsetjmp14.S
+++ /dev/null
@@ -1,25 +0,0 @@
-/*	$NetBSD: __sigsetjmp14.S,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __sigsetjmp14.S,v 1.1 2014/09/03 19:34:25 matt Exp $")
-#endif
-
-ENTRY(__sigsetjmp14)
-	l.sfeqi	r4, 0
-	l.bf	PLT(_C_LABEL(_setjmp))
-	l.nop
-	l.j	PLT(_C_LABEL(__setjmp14))
-	l.nop
-END(__sigsetjmp14)
-
-ENTRY(__siglongjmp14)
-	l.lwz	r5, JB_MAGIC(r3)
-	l.sfeqi	r5, 0
-	l.bf	PLT(_C_LABEL(_longjmp))
-	l.nop
-	l.j	PLT(_C_LABEL(__longjmp14))
-	l.nop
-END(__siglongjmp14)
diff --git a/lib/libc/arch/or1k/gen/_lwp.c b/lib/libc/arch/or1k/gen/_lwp.c
deleted file mode 100644
index d5d92fa5c..000000000
--- a/lib/libc/arch/or1k/gen/_lwp.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-/*
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Allen Briggs for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.1 2014/09/03 19:34:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *), void *arg,
-	void *tcb, caddr_t stack_base, size_t stack_size)
-{
-	uintptr_t sp;
-
-	getcontext(u);
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-	sp = (uintptr_t)stack_base + stack_size;
-	sp -= STACK_ALIGNBYTES + 1;
-	sp &= ~STACK_ALIGNBYTES;
-
-	u->uc_mcontext.__gregs[_REG_RV] = (uintptr_t)arg;	/* arg1 */
-	u->uc_mcontext.__gregs[_REG_SP] = (uintptr_t)sp;	/* stack */
-	u->uc_mcontext.__gregs[_REG_LR] = (uintptr_t)_lwp_exit;	/* LR */
-	u->uc_mcontext.__gregs[_REG_PC] = (uintptr_t)start;	/* PC */
-	u->uc_mcontext.__gregs[_REG_TP] =
-	    (uintptr_t)tcb + TLS_TP_OFFSET + sizeof(struct tls_tcb);
-}
diff --git a/lib/libc/arch/or1k/gen/_setjmp.S b/lib/libc/arch/or1k/gen/_setjmp.S
deleted file mode 100644
index 9694862a0..000000000
--- a/lib/libc/arch/or1k/gen/_setjmp.S
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-#include "assym.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: _setjmp.S,v 1.1 2014/09/03 19:34:25 matt Exp $")
-#endif
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	_longjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *	_setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	l.sw	JB_MAGIC(r3), r0	/* indicate no sigmask */
-	l.sw	JB_PC(r3), lr		/* save return address */
-	l.sw	JB_LR(r3), lr		/* save return address */
-	l.sw	JB_SP(r3), r1		/* save stack pointer */
-	l.sw	JB_FP(r3), r2		/* save frame pointer */
-	l.sw	JB_R10(r3), r10		/* save callee saved register */
-	l.sw	JB_R14(r3), r14		/* save callee saved register */
-	l.sw	JB_R16(r3), r16		/* save callee saved register */
-	l.sw	JB_R18(r3), r18		/* save callee saved register */
-	l.sw	JB_R20(r3), r20		/* save callee saved register */
-	l.sw	JB_R22(r3), r22		/* save callee saved register */
-	l.sw	JB_R24(r3), r24		/* save callee saved register */
-	l.sw	JB_R26(r3), r26		/* save callee saved register */
-	l.sw	JB_R28(r3), r28		/* save callee saved register */
-	l.sw	JB_R30(r3), r30		/* save callee saved register */
-	l.xor	r11, r11, r11		/* indicate success */
-	l.jr	lr			/* return */
-	l.nop
-END(_setjmp)
-
-ENTRY(_longjmp)
-	l.lwz	lr, JB_LR(r3)		/* get return address */
-	l.lwz	r1, JB_SP(r3)		/* get stack pointer */
-	l.lwz	r2, JB_FP(r3)		/* get frame pointer */
-	l.lwz	r10, JB_R10(r3)		/* get callee saved register */
-	l.lwz	r14, JB_R14(r3)		/* get callee saved register */
-	l.lwz	r16, JB_R16(r3)		/* get callee saved register */
-	l.lwz	r18, JB_R18(r3)		/* get callee saved register */
-	l.lwz	r20, JB_R20(r3)		/* get callee saved register */
-	l.lwz	r22, JB_R22(r3)		/* get callee saved register */
-	l.lwz	r24, JB_R24(r3)		/* get callee saved register */
-	l.lwz	r26, JB_R26(r3)		/* get callee saved register */
-	l.lwz	r28, JB_R28(r3)		/* get callee saved register */
-	l.lwz	r30, JB_R30(r3)		/* get callee saved register */
-	l.ori	r11, r0, 1		/* default return value */
-	l.sfeqi	r4, 0			/* test return value */
-	l.cmov	r11, r11, r4		/* use it if not 0 */
-	l.jr	lr			/* return */
-	l.nop
-END(_longjmp)
diff --git a/lib/libc/arch/or1k/gen/flt_rounds.c b/lib/libc/arch/or1k/gen/flt_rounds.c
deleted file mode 100644
index 259581ec2..000000000
--- a/lib/libc/arch/or1k/gen/flt_rounds.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: flt_rounds.c,v 1.2 2015/03/19 21:22:59 joerg Exp $	*/
-
-/*
- * Copyright (c) 1996 Mark Brinicombe
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Mark Brinicombe
- *	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 <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.2 2015/03/19 21:22:59 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <ieeefp.h>
-#include <float.h>
-#include <stdint.h>
-#include <machine/ieeefp.h>
-
-static const int rounding_map =
-	  (1 << (FP_RN * 2))	/* round to nearest */
-	| (0 << (FP_RZ * 2))	/* round to zero */
-	| (2 << (FP_RP * 2))	/* round to positive infinity */
-	| (3 << (FP_RM * 2));	/* round to negative infinity */
-
-int
-__flt_rounds(void)
-{
-	return (rounding_map >> (fpgetround() * 2)) & 3;
-}
diff --git a/lib/libc/arch/or1k/gen/fpgetmask.c b/lib/libc/arch/or1k/gen/fpgetmask.c
deleted file mode 100644
index 45a66a39a..000000000
--- a/lib/libc/arch/or1k/gen/fpgetmask.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: fpgetmask.c,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetmask.c,v 1.1 2014/09/03 19:34:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetmask,_fpgetmask)
-#endif
-
-#define	MASKBITS	(FPSCR_VE|FPSCR_OE|FPSCR_UE|FPSCR_ZE|FPSCR_XE)
-#define	MASKSHFT	3
-
-fp_except
-fpgetmask(void)
-{
-	union {
-		double	u_d;
-		uint64_t u_fpscr;
-	} ud;
-
-	__asm volatile("mffs %0" : "=f"(ud.u_d));
-	return (((uint32_t)ud.u_fpscr & MASKBITS) >> MASKSHFT);
-}
diff --git a/lib/libc/arch/or1k/gen/fpgetround.c b/lib/libc/arch/or1k/gen/fpgetround.c
deleted file mode 100644
index 3b2d26049..000000000
--- a/lib/libc/arch/or1k/gen/fpgetround.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: fpgetround.c,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.1 2014/09/03 19:34:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetround,_fpgetround)
-#endif
-
-#define	SPR_FPCSR	20
-#define FPCSR_RND	__BITS(2,1)
-
-fp_rnd
-fpgetround(void)
-{
-	uint32_t fpcsr;
-
-	__asm volatile("l.mfspr %0,r0,%1" : "=r"(fpscr) : "n" (SPR_FPCSR));
-	return __SHIFTOUT(fpcsr, FPCSR_RND);
-}
diff --git a/lib/libc/arch/or1k/gen/fpgetsticky.c b/lib/libc/arch/or1k/gen/fpgetsticky.c
deleted file mode 100644
index df17a3c57..000000000
--- a/lib/libc/arch/or1k/gen/fpgetsticky.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: fpgetsticky.c,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetsticky.c,v 1.1 2014/09/03 19:34:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-#define	STICKYBITS	(FPSCR_XX|FPSCR_ZX|FPSCR_UX|FPSCR_OX|FPSCR_VX)
-#define	STICKYSHFT	25
-
-fp_except
-fpgetsticky(void)
-{
-	union {
-		double u_d;
-		uint64_t u_fpscr;
-	} ud;
-
-	__asm volatile("mffs %0" : "=f"(ud.u_d));
-	return (((uint32_t)ud.u_fpscr & STICKYBITS) >> STICKYSHFT);
-}
diff --git a/lib/libc/arch/or1k/gen/fpsetmask.c b/lib/libc/arch/or1k/gen/fpsetmask.c
deleted file mode 100644
index b5ac19177..000000000
--- a/lib/libc/arch/or1k/gen/fpsetmask.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: fpsetmask.c,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetmask.c,v 1.1 2014/09/03 19:34:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetmask,_fpsetmask)
-#endif
-
-#define	MASKBITS	(FPSCR_XE|FPSCR_ZE|FPSCR_UE|FPSCR_OE|FPSCR_VE)
-#define	MASKSHFT	3
-
-fp_except
-fpsetmask(fp_except mask)
-{
-	union {
-		double u_d;
-		uint64_t u_fpscr;
-	} ud;
-	fp_except old;
-
-	__asm volatile("mffs %0" : "=f"(ud.u_d));
-	old = ((uint32_t)ud.u_fpscr & MASKBITS) >> MASKSHFT;
-	ud.u_fpscr &= ~MASKBITS;
-	ud.u_fpscr |= ((uint32_t)mask << MASKSHFT) & MASKBITS;
-	__asm volatile("mtfsf 0xff,%0" :: "f"(ud.u_d));
-	return (old);
-}
diff --git a/lib/libc/arch/or1k/gen/fpsetround.c b/lib/libc/arch/or1k/gen/fpsetround.c
deleted file mode 100644
index 4105e1e1e..000000000
--- a/lib/libc/arch/or1k/gen/fpsetround.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: fpsetround.c,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.1 2014/09/03 19:34:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetround,_fpsetround)
-#endif
-
-#define	ROUNDBITS	FPSCR_RN
-
-fp_rnd
-fpsetround(fp_rnd rnd_dir)
-{
-	union {
-		double u_d;
-		uint64_t u_fpscr;
-	} ud;
-	fp_rnd old;
-
-	__asm volatile("mffs %0" : "=f"(ud.u_d));
-	old = (uint32_t)ud.u_fpscr & ROUNDBITS;
-	ud.u_fpscr &= ~ROUNDBITS;
-	ud.u_fpscr |= rnd_dir & ROUNDBITS;
-	__asm volatile("mtfsf 0xff,%0" :: "f"(ud.u_d));
-	return (old);
-}
diff --git a/lib/libc/arch/or1k/gen/fpsetsticky.c b/lib/libc/arch/or1k/gen/fpsetsticky.c
deleted file mode 100644
index 49119f4f0..000000000
--- a/lib/libc/arch/or1k/gen/fpsetsticky.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*	$NetBSD: fpsetsticky.c,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetsticky.c,v 1.1 2014/09/03 19:34:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#define	STICKYBITS	(FPSCR_XX|FPSCR_ZX|FPSCR_UX|FPSCR_OX|FPSCR_VX)
-#define	INVBITS		(FPSCR_VXCVI|FPSCR_VXSQRT|FPSCR_VXSOFT|FPSCR_VXVC|\
-			 FPSCR_VXIMZ|FPSCR_VXZDZ|FPSCR_VXIDI|FPSCR_VXISI|\
-			 FPSCR_VXSNAN)
-#define	STICKYSHFT	25
-
-#ifdef __weak_alias
-__weak_alias(fpsetsticky,_fpsetsticky)
-#endif
-
-fp_except
-fpsetsticky(fp_except mask)
-{
-	union {
-		double u_d;
-		uint64_t u_fpscr;
-	} ud;
-	fp_except old;
-
-	__asm volatile("mffs %0" : "=f"(ud.u_d));
-	old = ((uint32_t)ud.u_fpscr & STICKYBITS) >> STICKYSHFT;
-	/*
-	 * FPSCR_VX (aka FP_X_INV) is not a sticky bit but a summary of the
-	 * all the FPSCR_VX* sticky bits.  So when FP_X_INV is cleared then
-	 * clear all of those bits, likewise when it's set, set them all.
-	 */
-	if ((mask & FP_X_INV) == 0)
-		ud.u_fpscr &= ~INVBITS;
-	else 
-		ud.u_fpscr |= INVBITS;
-	ud.u_fpscr &= ~STICKYBITS;
-	ud.u_fpscr |= ((uint32_t)mask << STICKYSHFT) & STICKYBITS;
-	/*
-	 * Make FPSCR_FX reflect the presence of a set sticky bit (or not).
-	 */
-	if (ud.u_fpscr & (STICKYBITS|INVBITS))
-		ud.u_fpscr |= FPSCR_FX;
-	else
-		ud.u_fpscr &= ~FPSCR_FX;
-	/*
-	 * Write back the fpscr.
-	 */
-	__asm volatile("mtfsf 0xff,%0" :: "f"(ud.u_d));
-	return (old);
-}
diff --git a/lib/libc/arch/or1k/gen/makecontext.c b/lib/libc/arch/or1k/gen/makecontext.c
deleted file mode 100644
index 561da3f91..000000000
--- a/lib/libc/arch/or1k/gen/makecontext.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.1 2014/09/03 19:34:25 matt Exp $");
-#endif
-
-#include <inttypes.h>
-#include <stddef.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	int *sp;
-	int i;
-	va_list ap;
-
-	/* LINTED uintptr_t is safe */
-	sp  = (int *)
-	    ((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
-	/* LINTED uintptr_t is safe */
-	sp -= 1 + (argc > 6 ? argc - 6: 0); /* Make room for call frame. */
-	sp  = (int *) ((uintptr_t)sp & ~0x3); /* Align on word boundary. */
-
-	/*
-	 * Start executing at <func> -- when <func> completes, return to
-	 * <_resumecontext>.
-	 */
-	gr[_REG_SP] = (uintptr_t)sp;
-	gr[_REG_LR] = (uintptr_t)_resumecontext;
-	gr[_REG_PC] = (uintptr_t)func;
-
-	/* Wipe out stack frame backchain pointer. */
-	*sp = 0;
-
-	/* Construct argument list. */
-	va_start(ap, argc);
-	/* Up to the first six arguments are passed in r3-r8. */
-	for (i = 0; i < argc && i < 6; i++)
-		gr[_REG_R3 + i] = va_arg(ap, int);
-	/* Pass remaining arguments on the stack above the backchain/lr gap. */
-	for (sp += 2; i < argc; i++)
-		*sp++ = va_arg(ap, int);
-	va_end(ap);
-}
diff --git a/lib/libc/arch/or1k/gen/nanf.c b/lib/libc/arch/or1k/gen/nanf.c
deleted file mode 100644
index 485ded44c..000000000
--- a/lib/libc/arch/or1k/gen/nanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: nanf.c,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.1 2014/09/03 19:34:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-		{ { 0x7f, 0xc0,    0,    0 } };
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/or1k/gen/resumecontext.c b/lib/libc/arch/or1k/gen/resumecontext.c
deleted file mode 100644
index 3c4ea5df3..000000000
--- a/lib/libc/arch/or1k/gen/resumecontext.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: resumecontext.c,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: resumecontext.c,v 1.1 2014/09/03 19:34:25 matt Exp $");
-#endif
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <ucontext.h>
-#include <unistd.h>
-#include "extern.h"
-
-void
-_resumecontext(void)
-{
-	ucontext_t uct;
-
-	(void)getcontext(&uct);
-	if (uct.uc_link == NULL) 
-		exit(0);
-	(void)setcontext(uct.uc_link);
-	_exit(-1);
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/or1k/gen/swapcontext.S b/lib/libc/arch/or1k/gen/swapcontext.S
deleted file mode 100644
index adbdd486b..000000000
--- a/lib/libc/arch/or1k/gen/swapcontext.S
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.1 2014/09/03 19:34:25 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-__RCSID("$NetBSD: swapcontext.S,v 1.1 2014/09/03 19:34:25 matt Exp $")
-
-#define	CALLFRAME_LR	(-1*4)
-#define	CALLFRAME_UCP	(-2*4)
-#define	CALLFRAME_OUCP	(-3*4)
-#define	CALLFRAME_GP	(-4*4)
-#define	CALLFRAME_SP	(-5*4)
-#define	CALLFRAME_LEN	(-CALLFRAME_SP)
-
-ENTRY(swapcontext)
-	l.sw	CALLFRAME_LR(r1),lr		# save link register
-	l.sw	CALLFRAME_OUCP(r1),r3		# save oucp
-	l.sw	CALLFRAME_UCP(r1),r4		# save ucp
-	l.sw	CALLFRAME_SP(r1),r1		# set up stack chain
-#ifdef __PIC__
-	l.sw	CALLFRAME_GP(r1),r16		# save r16
-	PIC_GOTSETUP(r16)			# setup got pointer
-#endif
-	l.addi	r1,r1,-CALLFRAME_LEN		# adjust stack
-	l.jal	PLT(_C_LABEL(_getcontext))	# getcontext(oucp)
-	l.nop					# -- delay slot --
-	l.sfeqi	r11,0				# error?
-	l.bnf	1f				#   yes, cleanup
-	l.nop					#   -- delay slot --
-	l.addi	r5,r1,CALLFRAME_LEN		# adjust stack
-	l.lwz	r4,CALLFRAME_OUCP(r5)		# load oucp for adjustment
-	l.sw	UC_GREGS_PC(r4),lr		# pc <- lr
-	l.sw	UC_GREGS_SP(r4),r1		# adjust sp
-	l.lwz	r3,CALLFRAME_UCP(r5)		# load ucp
-	# can't do a tail call due to needing r16 for PLT
-	l.jal	PLT(_C_LABEL(setcontext))	# setcontext(ucp)
-	l.nop					# -- delay slot --
-1:
-	l.addi	r1,r1,CALLFRAME_LEN		# restore stack
-#ifdef __PIC__
-	l.lwz	r16,CALLFRAME_GP(r1)		# restore r16
-#endif
-	l.lwz	lr,CALLFRAME_LR(r1)		# refetch lr
-	l.jr	lr				# simply return
-	l.nop					# -- delay slot --
-END(swapcontext)
diff --git a/lib/libc/arch/or1k/genassym.cf b/lib/libc/arch/or1k/genassym.cf
deleted file mode 100644
index 4f3aa02bc..000000000
--- a/lib/libc/arch/or1k/genassym.cf
+++ /dev/null
@@ -1,64 +0,0 @@
-#	$NetBSD: genassym.cf,v 1.1 2014/09/03 19:34:25 matt Exp $
-
-#
-# Copyright (c) 2001 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Matt Thomas <matt@3am-sfotware.com>.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-include <sys/types.h>
-include <sys/queue.h>
-include <sys/cpu.h>
-include <sys/signal.h>
-include <sys/ucontext.h>
-
-include <machine/frame.h>
-include <machine/setjmp.h>
-
-define UC_GREGS_SP	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_SP])
-define UC_GREGS_RV	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_RV])
-define UC_GREGS_PC	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_PC])
-
-define SIG_BLOCK	SIG_BLOCK
-define SIG_SETMASK	SIG_SETMASK
-
-define JBLEN          32 * sizeof(_BSD_JBSLOT_T_)
-define JB_MAGIC       0 * sizeof(_BSD_JBSLOT_T_)
-define JB_SP          1 * sizeof(_BSD_JBSLOT_T_)
-define JB_FP          2 * sizeof(_BSD_JBSLOT_T_)
-define JB_LR          3 * sizeof(_BSD_JBSLOT_T_)
-define JB_R10         4 * sizeof(_BSD_JBSLOT_T_)
-define JB_R14         5 * sizeof(_BSD_JBSLOT_T_)
-define JB_R16         6 * sizeof(_BSD_JBSLOT_T_)
-define JB_R18         7 * sizeof(_BSD_JBSLOT_T_)
-define JB_R20         8 * sizeof(_BSD_JBSLOT_T_)
-define JB_R22         9 * sizeof(_BSD_JBSLOT_T_)
-define JB_R24         10 * sizeof(_BSD_JBSLOT_T_)
-define JB_R26         11 * sizeof(_BSD_JBSLOT_T_)
-define JB_R28         12 * sizeof(_BSD_JBSLOT_T_)
-define JB_R30         13 * sizeof(_BSD_JBSLOT_T_)
-define JB_PC          14 * sizeof(_BSD_JBSLOT_T_)
-define JB_SIGMASK     15 * sizeof(_BSD_JBSLOT_T_)
diff --git a/lib/libc/arch/or1k/net/Makefile.inc b/lib/libc/arch/or1k/net/Makefile.inc
deleted file mode 100644
index 686b2e444..000000000
--- a/lib/libc/arch/or1k/net/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2014/09/03 19:34:26 matt Exp $
-
-SRCS+=	htonl.c htons.c ntohl.c ntohs.c
diff --git a/lib/libc/arch/or1k/softfloat/milieu.h b/lib/libc/arch/or1k/softfloat/milieu.h
deleted file mode 100644
index 48cc368d5..000000000
--- a/lib/libc/arch/or1k/softfloat/milieu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: milieu.h,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "or1k-gcc.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
diff --git a/lib/libc/arch/or1k/softfloat/or1k-gcc.h b/lib/libc/arch/or1k/softfloat/or1k-gcc.h
deleted file mode 100644
index 7e034edcb..000000000
--- a/lib/libc/arch/or1k/softfloat/or1k-gcc.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$NetBSD: or1k-gcc.h,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-/*
--------------------------------------------------------------------------------
-One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
--------------------------------------------------------------------------------
-*/
-#include <machine/endian.h>
-#if _BYTE_ORDER == _BIG_ENDIAN
-#define BIGENDIAN
-#endif
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#define LITTLEENDIAN
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `BITS64' can be defined to indicate that 64-bit integer types are
-supported by the compiler.
--------------------------------------------------------------------------------
-*/
-#define BITS64
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines the most convenient type that holds
-integers of at least as many bits as specified.  For example, `uint8' should
-be the most convenient type that can hold unsigned integers of as many as
-8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
-implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
-to the same as `int'.
--------------------------------------------------------------------------------
-*/
-typedef int flag;
-typedef int uint8;
-typedef int int8;
-typedef int uint16;
-typedef int int16;
-typedef unsigned int uint32;
-typedef signed int int32;
-#ifdef BITS64
-typedef unsigned long long int uint64;
-typedef signed long long int int64;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines a type that holds integers
-of _exactly_ the number of bits specified.  For instance, for most
-implementation of C, `bits16' and `sbits16' should be `typedef'ed to
-`unsigned short int' and `signed short int' (or `short int'), respectively.
--------------------------------------------------------------------------------
-*/
-typedef unsigned char bits8;
-typedef signed char sbits8;
-typedef unsigned short int bits16;
-typedef signed short int sbits16;
-typedef unsigned int bits32;
-typedef signed int sbits32;
-#ifdef BITS64
-typedef unsigned long long int bits64;
-typedef signed long long int sbits64;
-#endif
-
-#ifdef BITS64
-/*
--------------------------------------------------------------------------------
-The `LIT64' macro takes as its argument a textual integer literal and
-if necessary ``marks'' the literal as having a 64-bit integer type.
-For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
-appended with the letters `LL' standing for `long long', which is `gcc's
-name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
-defined as the identity macro:  `#define LIT64( a ) a'.
--------------------------------------------------------------------------------
-*/
-#define LIT64( a ) a##LL
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `INLINE' can be used before functions that should be inlined.  If
-a compiler does not support explicit inlining, this macro should be defined
-to be `static'.
--------------------------------------------------------------------------------
-*/
-#define INLINE static inline
-
-#define FLOAT64_DEMANGLE(a)	(a)
-#define FLOAT64_MANGLE(a)	(a)
diff --git a/lib/libc/arch/or1k/softfloat/softfloat.h b/lib/libc/arch/or1k/softfloat/softfloat.h
deleted file mode 100644
index 7258eabfc..000000000
--- a/lib/libc/arch/or1k/softfloat/softfloat.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*	$NetBSD: softfloat.h,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-/* This is a derivative work. */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.  The same applies to
-the `FLOAT128' macro and the quadruple-precision format `float128'.
--------------------------------------------------------------------------------
-*/
-/* #define FLOATX80 */
-/* #define FLOAT128 */
-
-#include <machine/ieeefp.h>
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef unsigned int float32;
-typedef unsigned long long float64;
-#ifdef FLOATX80
-typedef struct {
-    unsigned short high;
-    unsigned long long low;
-} floatx80;
-#endif
-#ifdef FLOAT128
-typedef struct {
-    unsigned long long high, low;
-} float128;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-#ifndef SOFTFLOAT_FOR_GCC
-extern int8 float_detect_tininess;
-#endif
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern fp_rnd float_rounding_mode;
-#define float_round_nearest_even	FP_RN
-#define float_round_to_zero		FP_RZ
-#define float_round_down		FP_RM
-#define float_round_up			FP_RP
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-*/
-extern fp_except float_exception_flags;
-extern fp_except float_exception_mask;
-enum {
-    float_flag_inexact   = FP_X_IMP,
-    float_flag_underflow = FP_X_UFL,
-    float_flag_overflow  = FP_X_OFL,
-    float_flag_divbyzero = FP_X_DZ,
-    float_flag_invalid   = FP_X_INV
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( fp_except );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int32 );
-float32 uint32_to_float32( uint32 );
-float64 int32_to_float64( int32 );
-float64 uint32_to_float64( uint32 );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( int32 );
-floatx80 uint32_to_floatx80( uint32 );
-#endif
-#ifdef FLOAT128
-float128 int32_to_float128( int32 );
-float128 uint32_to_float128( uint32 );
-#endif
-float32 int64_to_float32( long long );
-float64 int64_to_float64( long long );
-#ifdef FLOATX80
-floatx80 int64_to_floatx80( long long );
-#endif
-#ifdef FLOAT128
-float128 int64_to_float128( long long );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float32_to_int32( float32 );
-int float32_to_int32_round_to_zero( float32 );
-unsigned int float32_to_uint32_round_to_zero( float32 );
-long long float32_to_int64( float32 );
-long long float32_to_int64_round_to_zero( float32 );
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-#ifdef FLOAT128
-float128 float32_to_float128( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-flag float32_eq( float32, float32 );
-flag float32_le( float32, float32 );
-flag float32_lt( float32, float32 );
-flag float32_eq_signaling( float32, float32 );
-flag float32_le_quiet( float32, float32 );
-flag float32_lt_quiet( float32, float32 );
-#ifndef SOFTFLOAT_FOR_GCC
-flag float32_is_signaling_nan( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float64_to_int32( float64 );
-int float64_to_int32_round_to_zero( float64 );
-unsigned int float64_to_uint32_round_to_zero( float64 );
-long long float64_to_int64( float64 );
-long long float64_to_int64_round_to_zero( float64 );
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-#ifdef FLOAT128
-float128 float64_to_float128( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-flag float64_eq( float64, float64 );
-flag float64_le( float64, float64 );
-flag float64_lt( float64, float64 );
-flag float64_eq_signaling( float64, float64 );
-flag float64_le_quiet( float64, float64 );
-flag float64_lt_quiet( float64, float64 );
-#ifndef SOFTFLOAT_FOR_GCC
-flag float64_is_signaling_nan( float64 );
-#endif
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int floatx80_to_int32( floatx80 );
-int floatx80_to_int32_round_to_zero( floatx80 );
-long long floatx80_to_int64( floatx80 );
-long long floatx80_to_int64_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-#ifdef FLOAT128
-float128 floatx80_to_float128( floatx80 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern int floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-flag floatx80_eq( floatx80, floatx80 );
-flag floatx80_le( floatx80, floatx80 );
-flag floatx80_lt( floatx80, floatx80 );
-flag floatx80_eq_signaling( floatx80, floatx80 );
-flag floatx80_le_quiet( floatx80, floatx80 );
-flag floatx80_lt_quiet( floatx80, floatx80 );
-flag floatx80_is_signaling_nan( floatx80 );
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float128_to_int32( float128 );
-int float128_to_int32_round_to_zero( float128 );
-long long float128_to_int64( float128 );
-long long float128_to_int64_round_to_zero( float128 );
-float32 float128_to_float32( float128 );
-float64 float128_to_float64( float128 );
-#ifdef FLOATX80
-floatx80 float128_to_floatx80( float128 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision operations.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 );
-float128 float128_add( float128, float128 );
-float128 float128_sub( float128, float128 );
-float128 float128_mul( float128, float128 );
-float128 float128_div( float128, float128 );
-float128 float128_rem( float128, float128 );
-float128 float128_sqrt( float128 );
-flag float128_eq( float128, float128 );
-flag float128_le( float128, float128 );
-flag float128_lt( float128, float128 );
-flag float128_eq_signaling( float128, float128 );
-flag float128_le_quiet( float128, float128 );
-flag float128_lt_quiet( float128, float128 );
-flag float128_is_signaling_nan( float128 );
-
-#endif
diff --git a/lib/libc/arch/or1k/stdlib/Makefile.inc b/lib/libc/arch/or1k/stdlib/Makefile.inc
deleted file mode 100644
index 809ac4d83..000000000
--- a/lib/libc/arch/or1k/stdlib/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2014/09/03 19:34:26 matt Exp $
diff --git a/lib/libc/arch/or1k/string/Makefile.inc b/lib/libc/arch/or1k/string/Makefile.inc
deleted file mode 100644
index 37edc5888..000000000
--- a/lib/libc/arch/or1k/string/Makefile.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2014/09/03 19:34:26 matt Exp $
-
-SRCS+=  bzero.S clz.S ctz.S ffs.S strlen.S memset.S
-
-memcpy.o: memcpy.c
-memcpy.po: memcpy.c
-memcpy.pico: memcpy.c
-
-# disable the asm versions of these because they break the explora.
-# the special rules here are to override the suffix rules which seem
-# to prefer .S files over .c
-.if ${MACHINE} == "evbppc"
-bcopy.o: bcopy.c
-bcopy.po: bcopy.c
-bcopy.pico: bcopy.c
-memcmp.o: memcmp.c
-memcmp.po: memcmp.c
-memcmp.pico: memcmp.c
-memmove.o: memmove.c
-memmove.po: memmove.c
-memmove.pico: memmove.c
-.else
-SRCS+=	memcmp.S bcopy.S memmove.S
-.endif
diff --git a/lib/libc/arch/or1k/sys/__clone.S b/lib/libc/arch/or1k/sys/__clone.S
deleted file mode 100644
index 4b910fd7e..000000000
--- a/lib/libc/arch/or1k/sys/__clone.S
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: __clone.S,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-/*-
- * Copyright (c) 2001 Tsubai Masanari.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __clone.S,v 1.1 2014/09/03 19:34:26 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(clone, __clone)
-#endif
-
-/*
- * int __clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-ENTRY(__clone)
-	/*
-	 * Sanity checks: func and stack may not be NULL.
-	 */
-	l.sfeqi	r3,0
-	l.bf	2f
-	l.sfeqi	r4,0
-	l.bf	2f
-
-	l.or	r7,r3,r0	/* Save fn in r7. */
-	l.or	r3,r5,r0
-	_DOSYSCALL(__clone)	/* (flags, stack) */
-	l.bf	_C_LABEL(__cerror)	/* error... */
-	l.nop
-
-	l.sfeqi	r11,0
-	l.bf	1f		/* We're the parent, just return. */
-	l.nop
-	l.jr	lr
-	l.nop
-
-1:	l.or	r3,r6,r0	/* arg */
-	l.jalr	r7		/* Call the clone's entry point. */
-	l.nop
-
-#ifdef __PIC__
-	// We don't need to save r9 or r16 since we aren't ever coming back
-	PIC_GOTSETUP(r16)
-#endif
-	l.jal	plt(_C_LABEL(_exit))
-	l.nop
-
-2:
-	l.addi	r11,r0,EINVAL
-	l.j	_C_LABEL(__cerror)
-	l.nop
-END(__clone)
diff --git a/lib/libc/arch/or1k/sys/__sigaction14_sigtramp.c b/lib/libc/arch/or1k/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index 33217d6d3..000000000
--- a/lib/libc/arch/or1k/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.1 2014/09/03 19:34:26 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-#ifdef __LIBC12_SOURCE__
-extern const int __sigtramp_sigcontext_1[]
-    __weak_reference(__sigtramp_sigcontext_1);
-#endif
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern const int __sigtramp_siginfo_2[];
-
-	/*
-	 * If no sigaction, use the "default" trampoline since it won't
-	 * be used.
-	 */
-	if (act == NULL)
-		return  __sigaction_sigtramp(sig, act, oact, NULL, 0);
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the non-SA_SIGINFO trampoline if SA_SIGINFO is not
-	 * set in the sigaction.
-	 */
-	if ((act->sa_flags & SA_SIGINFO) == 0) {
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-		    __sigtramp_sigcontext_1, 1);
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	/*
-	 * If SA_SIGINFO was specificed or the compatibility trampolines
-	 * can't be used, use the siginfo trampoline.
-	 */
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/or1k/sys/__sigtramp2.S b/lib/libc/arch/or1k/sys/__sigtramp2.S
deleted file mode 100644
index 5534b87b3..000000000
--- a/lib/libc/arch/or1k/sys/__sigtramp2.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigtramp2.S,v 1.1 2014/09/03 19:34:26 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-/*
- * On entry to user space, stack and registers look like:
- *
- *	r3	signal number
- *	r4	pointer to siginfo structure
- *	r5	pointer to ucontext structure
- *	r14	pointer to ucontext structure
- *	lr	address of this trampoline
- *
- */
-ENTRY(__sigtramp_siginfo_2)
-	l.ori	r3,r14,0		/* restore ucontext pointer */
-	_DOSYSCALL(setcontext)		/* restore machine state */
-	_DOSYSCALL(exit)		/* or exit with errno if failed */
-END(__sigtramp_siginfo_2)
diff --git a/lib/libc/arch/or1k/sys/__syscall.S b/lib/libc/arch/or1k/sys/__syscall.S
deleted file mode 100644
index ebefb6b98..000000000
--- a/lib/libc/arch/or1k/sys/__syscall.S
+++ /dev/null
@@ -1,24 +0,0 @@
-/*	$NetBSD: __syscall.S,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-#include <machine/asm.h>
-
-ENTRY(__syscall)
-	l.or	r13,r3,r0		/* syscall number */
-	l.or	r3,r4,r0
-	l.or	r4,r5,r0
-	l.or	r5,r6,r0
-	l.or	r6,r7,r0
-	l.or	r7,r8,r0
-	// at most 5 arguments can be passed via registers so the others
-	// must be on the stack.
-	l.lwz	r8,0(r1)
-	l.lwz	r11,4(r1)		/* use return value regs for last 2 */
-	l.lwz	r12,8(r1)		/* use return value regs for last 2 */
-	l.sys	0
-	l.bf	_C_LABEL(__cerror)
-	l.nop
-	l.jr	lr
-	l.nop
-END(__syscall)
-
-STRONG_ALIAS(syscall, __syscall)
diff --git a/lib/libc/arch/or1k/sys/__vfork14.S b/lib/libc/arch/or1k/sys/__vfork14.S
deleted file mode 100644
index 7f24dc1cb..000000000
--- a/lib/libc/arch/or1k/sys/__vfork14.S
+++ /dev/null
@@ -1,17 +0,0 @@
-/*	$NetBSD: __vfork14.S,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-/*
- * pid = vfork();
- *
- * r12 == 0 in parent process, 1 in child process.
- * r11 == pid of child in parent, pid of parent in child.
- */
-
-#include "SYS.h"
-
-SYSCALL(__vfork14)
-	l.addi	r12,r12,-1	# from 1 to 0 in child, 0 to -1 in parent
-	l.and	r11,r11,r12	# return 0 in child, pid in parent
-	l.jr	lr
-	l.nop
-END(__vfork14)
diff --git a/lib/libc/arch/or1k/sys/brk.S b/lib/libc/arch/or1k/sys/brk.S
deleted file mode 100644
index a7007b57f..000000000
--- a/lib/libc/arch/or1k/sys/brk.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: brk.S,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: brk.S,v 1.1 2014/09/03 19:34:26 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-	.hidden	_C_LABEL(__curbrk)
-	.hidden	_C_LABEL(__minbrk)
-	.globl	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(__minbrk)
-	.globl	_C_LABEL(_end)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
-#endif
-	.data
-	.p2align 2
-_C_LABEL(__minbrk):
-	.long	_C_LABEL(_end)
-_C_LABEL(__curbrk):
-	.long	_C_LABEL(_end)
-
-	.text
-ENTRY(_brk)
-#ifdef __PIC__
-	l.or	r8,r9,r0
-	PIC_GOTSETUP(r7)
-	l.or	r9,r8,r0
-	l.movhi	r6,gotoffhi(_C_LABEL(__minbrk))
-	l.ori	r6,r6,gotofflo(_C_LABEL(__minbrk))
-	l.add	r6,r6,r7
-#else
-	l.movhi	r6,hi(_C_LABEL(__minbrk))
-	l.ori	r6,r6,lo(_C_LABEL(__minbrk))
-#endif
-	l.lwz	r5,0(r6)		# r5 = __minbrk
-	l.sfgts	r5,r3			# if (__minbrk <= r3)
-	l.cmov	r5,r5,r3		# choose larger
-	l.or	r3,r5,r0		# new break value
-	_DOSYSCALL(break)		# assume, that r5 is kept
-	l.bf	_C_LABEL(__cerror)
-	l.nop
-	l.sw	__SIZEOF_POINTER__(r6),r5
-	l.xor	r11, r11, r11		# return 0
-	l.jr	lr			# return 0
-	l.nop
-END(_brk)
diff --git a/lib/libc/arch/or1k/sys/cerror.S b/lib/libc/arch/or1k/sys/cerror.S
deleted file mode 100644
index 7f91a2023..000000000
--- a/lib/libc/arch/or1k/sys/cerror.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: cerror.S,v 1.1 2014/09/03 19:34:26 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-#ifndef _REENTRANT
-	.globl	_C_LABEL(errno)
-#endif
-#ifdef __PIC__
-	.protected _C_LABEL(__cerror)
-#endif
-
-ENTRY(__cerror)
-#ifdef _REENTRANT
-	l.sw	-4(r1),r3
-	l.sw	-8(r1),lr
-	l.sw	-16(r1),r1
-	l.addi	r1,r1,-16
-#ifdef __PIC__
-	l.sw	-12(r1),r16
-	PIC_GOTSETUP(r16)
-#endif
-	l.jal	PLT(_C_LABEL(__errno))	# needs got in r16
-	l.nop
-	l.addi	r1,r1,16
-#ifdef __PIC__
-	l.lwz	r16,-12(r1)
-#endif
-	l.lwz	lr,-8(r1)
-	l.lwz	r3,-4(r1)
-#else
-#ifdef __PIC__
-	l.or	r8,r9,r0
-	PIC_GOTSETUP(r4)
-	l.lwz	r11,got(_C_LABEL(errno))(r4)
-	l.or	r9,r8,r0
-#else
-	l.movi	r11,hi(_C_LABEL(errno))
-	l.ori	r11,lo(_C_LABEL(errno))
-#endif /* __PIC__ */
-#endif /* _REENTRANT */
-	l.sw	0(r11),r3
-	l.addi	r11,r0,-1
-	l.addi	r12,r0,-1
-	l.jr	lr
-	l.nop
-END(__cerror)
diff --git a/lib/libc/arch/or1k/sys/exect.S b/lib/libc/arch/or1k/sys/exect.S
deleted file mode 100644
index 218bbec8f..000000000
--- a/lib/libc/arch/or1k/sys/exect.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: exect.S,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-#include "SYS.h"
-
-PSEUDO(exect,execve)
diff --git a/lib/libc/arch/or1k/sys/fork.S b/lib/libc/arch/or1k/sys/fork.S
deleted file mode 100644
index 3ba300e40..000000000
--- a/lib/libc/arch/or1k/sys/fork.S
+++ /dev/null
@@ -1,17 +0,0 @@
-/*	$NetBSD: fork.S,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-/*
- * pid = fork();
- *
- * r12 == 0 in parent process, 1 in child process.
- * r11 == pid of child in parent, pid of parent in child.
- */
-
-#include "SYS.h"
-
-_SYSCALL(__fork,fork)
-	l.addi	r12,r12,-1	# from 1 to 0 in child, 0 to -1 in parent
-	l.and	r11,r11,r12	# return 0 in child, pid in parent
-	l.jr	lr
-	l.nop
-END(__fork)
diff --git a/lib/libc/arch/or1k/sys/getcontext.S b/lib/libc/arch/or1k/sys/getcontext.S
deleted file mode 100644
index 821431adc..000000000
--- a/lib/libc/arch/or1k/sys/getcontext.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getcontext.S,v 1.1 2014/09/03 19:34:26 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext, _getcontext)
-#endif
-
-ENTRY(_getcontext)
-	_DOSYSCALL(getcontext)
-	l.bf	_C_LABEL(__cerror)
-	l.nop
-	l.sw	UC_GREGS_PC(r3),r9		# saved pc <- lr
-	l.sw	UC_GREGS_RV(r3),r11		# arrange for return value 0
-	l.jr	lr
-	l.nop
-END(_getcontext)
diff --git a/lib/libc/arch/or1k/sys/pipe.S b/lib/libc/arch/or1k/sys/pipe.S
deleted file mode 100644
index b6eb7988e..000000000
--- a/lib/libc/arch/or1k/sys/pipe.S
+++ /dev/null
@@ -1,23 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pipe.S,v 1.1 2014/09/03 19:34:26 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-#endif
-
-ENTRY(_pipe)
-	l.or	r5,r3,r0	# save pointer
-	_DOSYSCALL(pipe)	# assume, that r5 is kept
-	l.bf	_C_LABEL(__cerror)
-	l.nop
-	l.sw	0(r5),r11	# success, store fds
-	l.sw	4(r5),r12
-	l.xor	r11,r11,r11
-	l.jr	lr		# and return 0
-	l.nop
-END(_pipe)
diff --git a/lib/libc/arch/or1k/sys/ptrace.S b/lib/libc/arch/or1k/sys/ptrace.S
deleted file mode 100644
index 56da80edc..000000000
--- a/lib/libc/arch/or1k/sys/ptrace.S
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ptrace.S,v 1.1 2014/09/03 19:34:26 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-#define	XCALLFRAME_LR		(-1*4)
-#define	XCALLFRAME_DATA		(-2*4)
-#define	XCALLFRAME_ADDR		(-3*4)
-#define	XCALLFRAME_PID		(-4*4)
-#define	XCALLFRAME_REQUEST	(-5*4)
-#define	XCALLFRAME_GP		(-6*4)
-#define	XCALLFRAME_SP		(-7*4)
-#define	XCALLFRAMELEN		(-XCALLFRAME_SP)
-
-ENTRY(ptrace)
-#ifdef _REENTRANT
-	l.sw	XCALLFRAME_LR(r1),lr
-	l.sw	XCALLFRAME_REQUEST(r1),r3
-	l.sw	XCALLFRAME_PID(r1),r4
-	l.sw	XCALLFRAME_ADDR(r1),r5
-	l.sw	XCALLFRAME_DATA(r1),r6
-
-#ifdef __PIC__
-	l.sw	XCALLFRAME_GP(r1),r16
-	PIC_GOTSETUP(r16)
-#endif
-
-	l.addi	r1,r1,-XCALLFRAMELEN
-	l.jal	PLT(_C_LABEL(__errno))
-	l.nop
-	l.sw	0(r11),r0
-	l.addi	r1,r1,XCALLFRAMELEN
-
-#ifdef __PIC__
-	l.lwz	r16,XCALLFRAME_GP(r1)
-#endif
-
-	l.lwz	r6,XCALLFRAME_DATA(r1)
-	l.lwz	r4,XCALLFRAME_PID(r1)
-	l.lwz	r5,XCALLFRAME_ADDR(r1)
-	l.lwz	r3,XCALLFRAME_REQUEST(r1)
-	l.lwz	lr,XCALLFRAME_LR(r1)
-#else
-#ifdef __PIC__
-	l.or	r8,r9,r0
-	PIC_GOTSETUP(r7)
-	lwz	r7,_C_LABEL(errno)@got(r7)
-	l.or	r9,r8,r0
-#else
-	l.movhi	r7,hi(_C_LABEL(errno))
-	l.ori	r7,r7,lo(_C_LABEL(errno))
-#endif /* __PIC__ */
-#endif /* _REENTRANT */
-	l.sw	0(r7),r0
-	_DOSYSCALL(ptrace)
-	l.bf	_C_LABEL(__cerror)
-	l.nop
-	l.jr	lr
-	l.nop
-END(ptrace)
diff --git a/lib/libc/arch/or1k/sys/sbrk.S b/lib/libc/arch/or1k/sys/sbrk.S
deleted file mode 100644
index 547d530de..000000000
--- a/lib/libc/arch/or1k/sys/sbrk.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sbrk.S,v 1.1 2014/09/03 19:34:26 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-	.hidden	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(__curbrk)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-ENTRY(_sbrk)
-#ifdef __PIC__
-	l.or	r8,r9,r0
-	PIC_GOTSETUP(r6)
-	l.or	r9,r8,r0
-	l.movhi	r5,gotoffhi(_C_LABEL(__curbrk))
-	l.ori	r5,r5,gotofflo(_C_LABEL(__curbrk))
-	l.add	r5,r5,r6
-#else
-	l.movhi	r5,hi(_C_LABEL(__curbrk))
-	l.ori	r5,r5,lo(_C_LABEL(__curbrk))	# r5 = old break;
-#endif
-	l.lwz	r6,0(r5)			# r6 = old break, r5 = &curbrk
-	l.add	r3,r3,r6
-	_DOSYSCALL(break)			# break(new_break)
-	l.bf	_C_LABEL(__cerror)
-	l.nop
-	l.sw	0(r5),r3			# record new break
-	l.or	r11,r6,r0			# set return value
-	l.jr	lr
-	l.nop
-END(_sbrk)
diff --git a/lib/libc/arch/or1k/sys/shmat.S b/lib/libc/arch/or1k/sys/shmat.S
deleted file mode 100644
index 1c381168e..000000000
--- a/lib/libc/arch/or1k/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/or1k/sys/syscall.S b/lib/libc/arch/or1k/sys/syscall.S
deleted file mode 100644
index a847f1c2b..000000000
--- a/lib/libc/arch/or1k/sys/syscall.S
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-/* aliased to __syscall */
diff --git a/lib/libc/arch/or1k/syscallargs.awk b/lib/libc/arch/or1k/syscallargs.awk
deleted file mode 100644
index 5c7c64f14..000000000
--- a/lib/libc/arch/or1k/syscallargs.awk
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: syscallargs.awk,v 1.1 2014/09/05 18:09:37 matt Exp $
-#
-# Copyright (c) 2014 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Matt Thomas of 3am Software Foundry.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-BEGIN {
-}
-
-/#define.SYS_MAXSYS.*/ { next; }
-
-/#define.SYS_.*/ {
-	x = substr($2, 5);
-	syscall[x] = "0";
-}
-
-/^check_syscall_args/ {
-	l = length() - 20;
-	x = substr($0, 20, l);
-	y = gensub("sys_", "", 1, x);
-	syscall[y] = sprintf("sizeof(struct %s_args) / sizeof(register_t)", x);
-}
-
-END {
-	print "include <sys/types.h>"
-	print "include <sys/lwp.h>"
-	print "include <sys/ucontext.h>"
-	print "include <sys/syscallargs.h>"
-	print;
-	for (i in syscall) {
-		printf "define NSYSARGS_%s %s\n", i, syscall[i];
-	}
-}
diff --git a/lib/libc/arch/powerpc/Makefile.inc b/lib/libc/arch/powerpc/Makefile.inc
deleted file mode 100644
index bbe362e00..000000000
--- a/lib/libc/arch/powerpc/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.14 2013/08/30 21:28:59 matt Exp $
-
-SRCS+=		__sigaction14_sigtramp.c __sigtramp2.S
-SRCS+=		powerpc_initfini.c
-
-CPPFLAGS+=	-I.
-
-.if defined(MKSOFTFLOAT) && (${MKSOFTFLOAT} != "no")
-.include <softfloat/Makefile.inc>
-.endif
diff --git a/lib/libc/arch/powerpc/SYS.h b/lib/libc/arch/powerpc/SYS.h
deleted file mode 100644
index d35a74daf..000000000
--- a/lib/libc/arch/powerpc/SYS.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.13 2014/08/23 02:24:22 matt Exp $	*/
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-
-#define	BRANCH_TO_CERROR()	b	_C_LABEL(__cerror)
-
-#define	_DOSYSCALL(x)		li	%r0,(SYS_ ## x)		;\
-				sc
-
-#define	_SYSCALL_NOERROR(x,y)	.text				;\
-				.p2align 2			;\
-			ENTRY(x)				;\
-				_DOSYSCALL(y)
-
-#define _SYSCALL(x,y)		.text				;\
-				.p2align 2			;\
-			2:	BRANCH_TO_CERROR()		;\
-				_SYSCALL_NOERROR(x,y)		;\
-				bso	2b
-
-#define SYSCALL_NOERROR(x)	_SYSCALL_NOERROR(x,x)
-
-#define SYSCALL(x)		_SYSCALL(x,x)
-
-#define PSEUDO_NOERROR(x,y)	_SYSCALL_NOERROR(x,y)		;\
-				blr				;\
-				END(x)
-
-#define PSEUDO(x,y)		_SYSCALL_NOERROR(x,y)		;\
-				bnslr				;\
-				BRANCH_TO_CERROR()		;\
-				END(x)
-
-#define RSYSCALL_NOERROR(x)	PSEUDO_NOERROR(x,x)
-
-#define RSYSCALL(x)		PSEUDO(x,x)
-
-#define	WSYSCALL(weak,strong)	WEAK_ALIAS(weak,strong)		;\
-				PSEUDO(strong,weak)
diff --git a/lib/libc/arch/powerpc/gdtoa/Makefile.inc b/lib/libc/arch/powerpc/gdtoa/Makefile.inc
deleted file mode 100644
index 1d786e010..000000000
--- a/lib/libc/arch/powerpc/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/03/15 17:35:18 kleink Exp $
-
-SRCS+=	strtof.c
diff --git a/lib/libc/arch/powerpc/gdtoa/arith.h b/lib/libc/arch/powerpc/gdtoa/arith.h
deleted file mode 100644
index 4674f629c..000000000
--- a/lib/libc/arch/powerpc/gdtoa/arith.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define IEEE_BIG_ENDIAN
diff --git a/lib/libc/arch/powerpc/gdtoa/gd_qnan.h b/lib/libc/arch/powerpc/gdtoa/gd_qnan.h
deleted file mode 100644
index 75f636b54..000000000
--- a/lib/libc/arch/powerpc/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x7ff80000
-#define d_QNAN1 0x0
diff --git a/lib/libc/arch/powerpc/gen/Makefile.inc b/lib/libc/arch/powerpc/gen/Makefile.inc
deleted file mode 100644
index befa59533..000000000
--- a/lib/libc/arch/powerpc/gen/Makefile.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.26 2014/01/28 13:47:04 macallan Exp $
-
-SRCS+=	__setjmp14.S __sigsetjmp14.S _setjmp.S
-SRCS+=	bswap16.c bswap32.c bswap64.c
-SRCS+=	flt_rounds.c
-SRCS+=	syncicache.c
-SRCS+=  _lwp.c makecontext.c resumecontext.c swapcontext.S
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c infinityl_dbl_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
-
-SRCS+=	nanf.c
-
-.if (${MKSOFTFLOAT} == "no")
-SRCS+=	fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c
-SRCS+=	fpgetsticky.c fpsetsticky.c
-SRCS+=	fabs_ieee754.S
-.else
-SRCS+=	fabs_ieee754.c
-.endif
-
-CPPFLAGS._lwp.c	+= -D_LIBC_SOURCE
-
-LSRCS.powerpc.gen=Lint_swapcontext.c
-LSRCS+=		${LSRCS.powerpc.gen}
-DPSRCS+=	${LSRCS.powerpc.gen}
-CLEANFILES+=	${LSRCS.powerpc.gen}
diff --git a/lib/libc/arch/powerpc/gen/__setjmp14.S b/lib/libc/arch/powerpc/gen/__setjmp14.S
deleted file mode 100644
index f8cf9556d..000000000
--- a/lib/libc/arch/powerpc/gen/__setjmp14.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: __setjmp14.S,v 1.5 2011/01/15 07:31:12 matt Exp $	*/
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __setjmp14.S,v 1.5 2011/01/15 07:31:12 matt Exp $")
-#endif
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *	setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is restored.
- */
-
-ENTRY(__setjmp14)
-	mr	%r6,%r3
-	li	%r3,SIG_BLOCK
-	li	%r4,0
-	addi	%r5,%r6,4*(1+24)	# &sigmask
-	_DOSYSCALL(__sigprocmask14)	# assume no error	XXX
-	mflr	%r11
-	mfcr	%r12
-	mr	%r10,%r1
-	mr	%r9,%r2
-	stmw	%r8,4(%r6)		# save r8-r31
-	li	%r3,0
-	blr
-END(__setjmp14)
-
-ENTRY(__longjmp14)
-	lmw	%r8,4(%r3)		# load r8-r31
-	mr	%r6,%r4
-	mtlr	%r11
-	mtcr	%r12
-	mr	%r2,%r9
-	mr	%r1,%r10
-	addi	%r4,%r3,4*(1+24)	# &sigmask
-	li	%r3,SIG_SETMASK
-	li	%r5,0
-	_DOSYSCALL(__sigprocmask14)	# assume no error	XXX
-	or.	%r3,%r6,%r6
-	bnelr
-	li	%r3,1
-	blr
-END(__longjmp14)
diff --git a/lib/libc/arch/powerpc/gen/__sigsetjmp14.S b/lib/libc/arch/powerpc/gen/__sigsetjmp14.S
deleted file mode 100644
index e026982c1..000000000
--- a/lib/libc/arch/powerpc/gen/__sigsetjmp14.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: __sigsetjmp14.S,v 1.5 2011/01/15 07:31:12 matt Exp $	*/
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __sigsetjmp14.S,v 1.5 2011/01/15 07:31:12 matt Exp $")
-#endif
-
-ENTRY(__sigsetjmp14)
-	mr	%r6,%r3
-	or.	%r7,%r4,%r4
-	beq	1f
-	li	%r3,SIG_BLOCK
-	li	%r4,0
-	addi	%r5,%r6,4*(1+24)	# &sigmask
-	_DOSYSCALL(__sigprocmask14)	# assume no error	XXX
-1:
-	mflr	%r11
-	mfcr	%r12
-	mr	%r10,%r1
-	mr	%r9,%r2
-	stmw	%r7,0(%r6)		# save r7-r31
-	li	%r3,0
-	blr
-END(__sigsetjmp14)
-
-ENTRY(__siglongjmp14)
-	lmw	%r7,0(%r3)		# load r7-r31
-	mr	%r6,%r4
-	mtlr	%r11
-	mtcr	%r12
-	mr	%r2,%r9
-	mr	%r1,%r10
-	or.	%r7,%r7,%r7
-	beq	1f
-	addi	%r4,%r3,4*(1+24)	# &sigmask
-	li	%r3,SIG_SETMASK
-	li	%r5,0
-	_DOSYSCALL(__sigprocmask14) 	# assume no error	XXX
-1:
-	or.	%r3,%r6,%r6
-	bnelr
-	li	%r3,1
-	blr
-END(__siglongjmp14)
diff --git a/lib/libc/arch/powerpc/gen/_lwp.c b/lib/libc/arch/powerpc/gen/_lwp.c
deleted file mode 100644
index f2e914e4e..000000000
--- a/lib/libc/arch/powerpc/gen/_lwp.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.7 2012/03/22 05:36:50 matt Exp $	*/
-
-/*
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Allen Briggs for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.7 2012/03/22 05:36:50 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *), void *arg,
-	void *tcb, caddr_t stack_base, size_t stack_size)
-{
-	uintptr_t sp;
-
-	getcontext(u);
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-	sp = (uintptr_t)stack_base + stack_size;
-	sp -= STACK_ALIGNBYTES + 1;
-	sp &= ~STACK_ALIGNBYTES;
-
-	u->uc_mcontext.__gregs[3] = (uintptr_t) arg;		/* arg1 */
-	u->uc_mcontext.__gregs[1] = sp;				/* stack */
-	u->uc_mcontext.__gregs[33] = (uintptr_t) _lwp_exit;	/* LR */
-	u->uc_mcontext.__gregs[34] = (uintptr_t) start;		/* PC */
-	u->uc_mcontext.__gregs[_REG_R2] =
-	    (uintptr_t)tcb + TLS_TP_OFFSET + sizeof(struct tls_tcb);
-}
diff --git a/lib/libc/arch/powerpc/gen/_setjmp.S b/lib/libc/arch/powerpc/gen/_setjmp.S
deleted file mode 100644
index 44f2a5733..000000000
--- a/lib/libc/arch/powerpc/gen/_setjmp.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.3 2011/01/15 07:31:12 matt Exp $	*/
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: _setjmp.S,v 1.3 2011/01/15 07:31:12 matt Exp $")
-#endif
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	_longjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *	_setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	mflr	%r11			/* save return address */
-	mfcr	%r12			/* save condition register */
-	mr	%r10,%r1		/* save stack pointer */
-	mr	%r9,%r2			/* save GPR2 (not needed) */
-	stmw	%r9,8(%r3)		/* save r9..r31 */
-	li	%r3,0			/* indicate success */
-	blr				/* return */
-END(_setjmp)
-
-ENTRY(_longjmp)
-	lmw	%r9,8(%r3)		/* save r9..r31 */
-	mtlr	%r11			/* restore LR */
-	mtcr	%r12			/* restore CR */
-	mr	%r2,%r9			/* restore GPR2 (not needed) */
-	mr	%r1,%r10		/* restore stack */
-	or.	%r3,%r4,%r4		/* get return value */
-	bnelr				/* return if not 0 */
-	li	%r3,1			/* what's the point? */
-	blr				/* return */
-END(_longjmp)
diff --git a/lib/libc/arch/powerpc/gen/fabs_ieee754.S b/lib/libc/arch/powerpc/gen/fabs_ieee754.S
deleted file mode 100644
index d079c150d..000000000
--- a/lib/libc/arch/powerpc/gen/fabs_ieee754.S
+++ /dev/null
@@ -1,12 +0,0 @@
-/*	$NetBSD: fabs_ieee754.S,v 1.1 2014/01/28 13:47:04 macallan Exp $	*/
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: fabs_ieee754.S,v 1.1 2014/01/28 13:47:04 macallan Exp $")
-#endif
-
-ENTRY(fabs)
-	fabs %f1,%f1
-	blr
-END(fabs)
diff --git a/lib/libc/arch/powerpc/gen/flt_rounds.c b/lib/libc/arch/powerpc/gen/flt_rounds.c
deleted file mode 100644
index 430649509..000000000
--- a/lib/libc/arch/powerpc/gen/flt_rounds.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: flt_rounds.c,v 1.12 2015/03/19 21:22:59 joerg Exp $	*/
-
-/*
- * Copyright (c) 1996 Mark Brinicombe
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Mark Brinicombe
- *	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 <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.12 2015/03/19 21:22:59 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <ieeefp.h>
-#include <float.h>
-#include <stdint.h>
-#include <powerpc/fpu.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	0,	/* round to zero */
-	2,	/* round to positive infinity */
-	3	/* round to negative infinity */
-};
-
-int
-__flt_rounds(void)
-{
-#ifdef _SOFT_FLOAT
-	return map[fpgetround()];
-#else
-	union {
-		double u_d;
-		uint64_t u_fpscr;
-	} ud;
-
-	__asm volatile("mffs %0" : "=f"(ud.u_d));
-	return map[((uint32_t)ud.u_fpscr & FPSCR_RN)];
-#endif
-}
diff --git a/lib/libc/arch/powerpc/gen/fpgetmask.c b/lib/libc/arch/powerpc/gen/fpgetmask.c
deleted file mode 100644
index 6bc3f91cf..000000000
--- a/lib/libc/arch/powerpc/gen/fpgetmask.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: fpgetmask.c,v 1.10 2011/07/10 21:18:47 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetmask.c,v 1.10 2011/07/10 21:18:47 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetmask,_fpgetmask)
-#endif
-
-#define	MASKBITS	(FPSCR_VE|FPSCR_OE|FPSCR_UE|FPSCR_ZE|FPSCR_XE)
-#define	MASKSHFT	3
-
-fp_except
-fpgetmask(void)
-{
-	union {
-		double	u_d;
-		uint64_t u_fpscr;
-	} ud;
-
-	__asm volatile("mffs %0" : "=f"(ud.u_d));
-	return (((uint32_t)ud.u_fpscr & MASKBITS) >> MASKSHFT);
-}
diff --git a/lib/libc/arch/powerpc/gen/fpgetround.c b/lib/libc/arch/powerpc/gen/fpgetround.c
deleted file mode 100644
index 58cfe030f..000000000
--- a/lib/libc/arch/powerpc/gen/fpgetround.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: fpgetround.c,v 1.10 2011/07/10 21:18:47 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.10 2011/07/10 21:18:47 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetround,_fpgetround)
-#endif
-
-#define	ROUNDBITS	FPSCR_RN
-#define	ROUNDSHFT	0
-
-fp_rnd
-fpgetround(void)
-{
-	union {
-		double u_d;
-		uint64_t u_fpscr;
-	} ud;
-
-	__asm volatile("mffs %0" : "=f"(ud.u_d));
-	return (((uint32_t)ud.u_fpscr & ROUNDBITS) >> ROUNDSHFT);
-}
diff --git a/lib/libc/arch/powerpc/gen/fpgetsticky.c b/lib/libc/arch/powerpc/gen/fpgetsticky.c
deleted file mode 100644
index 079acc0c0..000000000
--- a/lib/libc/arch/powerpc/gen/fpgetsticky.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: fpgetsticky.c,v 1.10 2011/07/10 21:18:47 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetsticky.c,v 1.10 2011/07/10 21:18:47 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-#define	STICKYBITS	(FPSCR_XX|FPSCR_ZX|FPSCR_UX|FPSCR_OX|FPSCR_VX)
-#define	STICKYSHFT	25
-
-fp_except
-fpgetsticky(void)
-{
-	union {
-		double u_d;
-		uint64_t u_fpscr;
-	} ud;
-
-	__asm volatile("mffs %0" : "=f"(ud.u_d));
-	return (((uint32_t)ud.u_fpscr & STICKYBITS) >> STICKYSHFT);
-}
diff --git a/lib/libc/arch/powerpc/gen/fpsetmask.c b/lib/libc/arch/powerpc/gen/fpsetmask.c
deleted file mode 100644
index ef298c591..000000000
--- a/lib/libc/arch/powerpc/gen/fpsetmask.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: fpsetmask.c,v 1.10 2011/07/10 21:18:47 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetmask.c,v 1.10 2011/07/10 21:18:47 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetmask,_fpsetmask)
-#endif
-
-#define	MASKBITS	(FPSCR_XE|FPSCR_ZE|FPSCR_UE|FPSCR_OE|FPSCR_VE)
-#define	MASKSHFT	3
-
-fp_except
-fpsetmask(fp_except mask)
-{
-	union {
-		double u_d;
-		uint64_t u_fpscr;
-	} ud;
-	fp_except old;
-
-	__asm volatile("mffs %0" : "=f"(ud.u_d));
-	old = ((uint32_t)ud.u_fpscr & MASKBITS) >> MASKSHFT;
-	ud.u_fpscr &= ~MASKBITS;
-	ud.u_fpscr |= ((uint32_t)mask << MASKSHFT) & MASKBITS;
-	__asm volatile("mtfsf 0xff,%0" :: "f"(ud.u_d));
-	return (old);
-}
diff --git a/lib/libc/arch/powerpc/gen/fpsetround.c b/lib/libc/arch/powerpc/gen/fpsetround.c
deleted file mode 100644
index c2ed35eaa..000000000
--- a/lib/libc/arch/powerpc/gen/fpsetround.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: fpsetround.c,v 1.10 2011/07/10 21:18:47 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.10 2011/07/10 21:18:47 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetround,_fpsetround)
-#endif
-
-#define	ROUNDBITS	FPSCR_RN
-
-fp_rnd
-fpsetround(fp_rnd rnd_dir)
-{
-	union {
-		double u_d;
-		uint64_t u_fpscr;
-	} ud;
-	fp_rnd old;
-
-	__asm volatile("mffs %0" : "=f"(ud.u_d));
-	old = (uint32_t)ud.u_fpscr & ROUNDBITS;
-	ud.u_fpscr &= ~ROUNDBITS;
-	ud.u_fpscr |= rnd_dir & ROUNDBITS;
-	__asm volatile("mtfsf 0xff,%0" :: "f"(ud.u_d));
-	return (old);
-}
diff --git a/lib/libc/arch/powerpc/gen/fpsetsticky.c b/lib/libc/arch/powerpc/gen/fpsetsticky.c
deleted file mode 100644
index 71df9c058..000000000
--- a/lib/libc/arch/powerpc/gen/fpsetsticky.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*	$NetBSD: fpsetsticky.c,v 1.11 2011/07/10 21:18:47 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetsticky.c,v 1.11 2011/07/10 21:18:47 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#define	STICKYBITS	(FPSCR_XX|FPSCR_ZX|FPSCR_UX|FPSCR_OX|FPSCR_VX)
-#define	INVBITS		(FPSCR_VXCVI|FPSCR_VXSQRT|FPSCR_VXSOFT|FPSCR_VXVC|\
-			 FPSCR_VXIMZ|FPSCR_VXZDZ|FPSCR_VXIDI|FPSCR_VXISI|\
-			 FPSCR_VXSNAN)
-#define	STICKYSHFT	25
-
-#ifdef __weak_alias
-__weak_alias(fpsetsticky,_fpsetsticky)
-#endif
-
-fp_except
-fpsetsticky(fp_except mask)
-{
-	union {
-		double u_d;
-		uint64_t u_fpscr;
-	} ud;
-	fp_except old;
-
-	__asm volatile("mffs %0" : "=f"(ud.u_d));
-	old = ((uint32_t)ud.u_fpscr & STICKYBITS) >> STICKYSHFT;
-	/*
-	 * FPSCR_VX (aka FP_X_INV) is not a sticky bit but a summary of the
-	 * all the FPSCR_VX* sticky bits.  So when FP_X_INV is cleared then
-	 * clear all of those bits, likewise when it's set, set them all.
-	 */
-	if ((mask & FP_X_INV) == 0)
-		ud.u_fpscr &= ~INVBITS;
-	else 
-		ud.u_fpscr |= INVBITS;
-	ud.u_fpscr &= ~STICKYBITS;
-	ud.u_fpscr |= ((uint32_t)mask << STICKYSHFT) & STICKYBITS;
-	/*
-	 * Make FPSCR_FX reflect the presence of a set sticky bit (or not).
-	 */
-	if (ud.u_fpscr & (STICKYBITS|INVBITS))
-		ud.u_fpscr |= FPSCR_FX;
-	else
-		ud.u_fpscr &= ~FPSCR_FX;
-	/*
-	 * Write back the fpscr.
-	 */
-	__asm volatile("mtfsf 0xff,%0" :: "f"(ud.u_d));
-	return (old);
-}
diff --git a/lib/libc/arch/powerpc/gen/makecontext.c b/lib/libc/arch/powerpc/gen/makecontext.c
deleted file mode 100644
index 3d8f763a0..000000000
--- a/lib/libc/arch/powerpc/gen/makecontext.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.4 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.4 2008/04/28 20:22:57 martin Exp $");
-#endif
-
-#include <inttypes.h>
-#include <stddef.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	int *sp;
-	int i;
-	va_list ap;
-
-	/* LINTED uintptr_t is safe */
-	sp  = (int *)
-	    ((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
-	/* LINTED uintptr_t is safe */
-	sp -= 2 + (argc > 8 ? argc - 8: 0); /* Make room for call frame. */
-	sp  = (int *)
-	    ((uintptr_t)sp & ~0xf);	/* Align on quad-word boundary. */
-
-	/*
-	 * Start executing at <func> -- when <func> completes, return to
-	 * <_resumecontext>.
-	 */
-	gr[_REG_R1]  = (__greg_t)sp;
-	gr[_REG_LR] = (__greg_t)_resumecontext;
-	gr[_REG_PC] = (__greg_t)func;
-
-	/* Wipe out stack frame backchain pointer. */
-	*sp = 0;
-
-	/* Construct argument list. */
-	va_start(ap, argc);
-	/* Up to the first eight arguments are passed in r3-10. */
-	for (i = 0; i < argc && i < 8; i++)
-		gr[_REG_R3 + i] = va_arg(ap, int);
-	/* Pass remaining arguments on the stack above the backchain/lr gap. */
-	for (sp += 2; i < argc; i++)
-		*sp++ = va_arg(ap, int);
-	va_end(ap);
-}
diff --git a/lib/libc/arch/powerpc/gen/nanf.c b/lib/libc/arch/powerpc/gen/nanf.c
deleted file mode 100644
index 1688d0eae..000000000
--- a/lib/libc/arch/powerpc/gen/nanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:02 martin Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:02 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-		{ { 0x7f, 0xc0,    0,    0 } };
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/powerpc/gen/resumecontext.c b/lib/libc/arch/powerpc/gen/resumecontext.c
deleted file mode 100644
index 57d68fdf8..000000000
--- a/lib/libc/arch/powerpc/gen/resumecontext.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:58 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:58 joerg Exp $");
-#endif
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <ucontext.h>
-#include <unistd.h>
-#include "extern.h"
-
-void
-_resumecontext(void)
-{
-	ucontext_t uct;
-
-	(void)getcontext(&uct);
-	if (uct.uc_link == NULL) 
-		exit(0);
-	(void)setcontext(uct.uc_link);
-	_exit(-1);
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/powerpc/gen/swapcontext.S b/lib/libc/arch/powerpc/gen/swapcontext.S
deleted file mode 100644
index 7d5389e84..000000000
--- a/lib/libc/arch/powerpc/gen/swapcontext.S
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.7 2013/09/12 15:36:15 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-__RCSID("$NetBSD: swapcontext.S,v 1.7 2013/09/12 15:36:15 joerg Exp $")
-
-#define	XCALLFRAMELEN	(((2+3)*SZREG + CALLFRAMELEN - 1) & -CALLFRAMELEN)
-#define	XCALLFRAME_R30	(XCALLFRAMELEN-1*SZREG)
-#define	XCALLFRAME_UCP	(XCALLFRAMELEN-2*SZREG)
-#define	XCALLFRAME_OUCP	(XCALLFRAMELEN-3*SZREG)
-
-ENTRY(swapcontext)
-	stwu	%r1,-XCALLFRAMELEN(%r1)		# set up new stack frame
-	mflr	%r0
-	stw	%r0,XCALLFRAMELEN+CALLFRAME_LR(%r1)	# save link register
-	stw	%r3,XCALLFRAME_OUCP(%r1)	# must save oucp
-	stw	%r4,XCALLFRAME_UCP(%r1)		# must save ucp
-#ifdef __PIC__
-	stw	%r30,XCALLFRAME_R30(%r1)	# must save r30
-	PIC_TOCSETUP(swapcontext,%r30)		# setup toc pointer
-#endif
-	bl	PIC_PLT(_C_LABEL(_getcontext))	# getcontext(oucp)
-	cmpwi	%r3,0
-	bne	1f
-	lwz	%r11,XCALLFRAME_OUCP(%r1)	# load oucp for adjustment
-	lwz	%r0,XCALLFRAMELEN+CALLFRAME_LR(%r1)
-	stw	%r0,UC_GREGS_PC(%r11)		# pc <- lr
-	addi	%r0,%r1,XCALLFRAMELEN
-	stw	%r0,UC_GREGS_R1(%r11)		# adjust sp
-	lwz	%r3,XCALLFRAME_UCP(%r1)		# load ucp
-	bl	PIC_PLT(_C_LABEL(setcontext))	# setcontext(ucp)
-1:
-	lwz	%r0,XCALLFRAMELEN+CALLFRAME_LR(%r1)
-#ifdef __PIC__
-	lwz	%r30,XCALLFRAME_R30(%r1)
-#endif
-	mtlr	%r0
-	addi	%r1,%r1,XCALLFRAMELEN
-	blr
-END(swapcontext)
diff --git a/lib/libc/arch/powerpc/gen/syncicache.c b/lib/libc/arch/powerpc/gen/syncicache.c
deleted file mode 100644
index 2c16406a1..000000000
--- a/lib/libc/arch/powerpc/gen/syncicache.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*	$NetBSD: syncicache.c,v 1.15 2008/03/18 20:11:43 he Exp $	*/
-
-/*
- * Copyright (C) 1995-1997, 1999 Wolfgang Solfrank.
- * Copyright (C) 1995-1997, 1999 TooLs GmbH.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/param.h>
-#if	defined(_KERNEL)
-#include <sys/time.h>
-#include <sys/proc.h>
-#include <uvm/uvm_extern.h>
-#endif
-#if	!defined(_STANDALONE)
-#include <sys/sysctl.h>
-#endif
-
-#include <machine/cpu.h>
-
-
-#if defined(_STANDALONE)
-#ifndef	CACHELINESIZE
-#error "Must know the size of a cache line"
-#endif
-static struct cache_info _cache_info = {
-	CACHELINESIZE,
-	CACHELINESIZE,
-	CACHELINESIZE,
-	CACHELINESIZE
-};
-#define CACHEINFO	_cache_info
-#elif defined(_KERNEL)
-#define	CACHEINFO	(curcpu()->ci_ci)
-#else
-#include <stdlib.h>
-
-size_t __getcachelinesize (void);
-
-static int _cachelinesize = 0;
-
-static struct cache_info _cache_info;
-#define CACHEINFO	_cache_info
-
-size_t
-__getcachelinesize(void)
-{
-	static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE };
-	static int cacheinfomib[] = { CTL_MACHDEP, CPU_CACHEINFO };
-	size_t clen = sizeof(_cache_info);
-
-	if (_cachelinesize)
-		return _cachelinesize;
-
-	if (sysctl(cacheinfomib, sizeof(cacheinfomib) / sizeof(cacheinfomib[0]),
-		&_cache_info, &clen, NULL, 0) == 0) {
-		_cachelinesize = _cache_info.dcache_line_size;
-		return _cachelinesize;
-	}
-
-	/* Try older deprecated sysctl */
-	clen = sizeof(_cachelinesize);
-	if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]),
-		   &_cachelinesize, &clen, NULL, 0) < 0
-	    || !_cachelinesize)
-		abort();
-
-	_cache_info.dcache_size = _cachelinesize;
-	_cache_info.dcache_line_size = _cachelinesize;
-	_cache_info.icache_size = _cachelinesize;
-	_cache_info.icache_line_size = _cachelinesize;
-
-	/* If there is no cache, indicate we have issued the sysctl. */
-	if (!_cachelinesize)
-		_cachelinesize = 1;
-
-	return _cachelinesize;
-}
-#endif
-
-void
-__syncicache(void *from, size_t len)
-{
-	size_t l, off;
-	size_t linesz;
-	char *p;
-
-#if	!defined(_KERNEL) && !defined(_STANDALONE)
-	if (!_cachelinesize)
-		__getcachelinesize();
-#endif	
-
-	if (CACHEINFO.dcache_size > 0) {
-		linesz = CACHEINFO.dcache_line_size;
-		off = (uintptr_t)from & (linesz - 1);
-		l = (len + off + linesz - 1) & ~(linesz - 1);
-		p = (char *)from - off;
-		do {
-			__asm volatile ("dcbst 0,%0" :: "r"(p));
-			p += linesz;
-		} while ((l -= linesz) != 0);
-	}
-	__asm volatile ("sync");
-
-	if (CACHEINFO.icache_size > 0 ) {
-		linesz = CACHEINFO.icache_line_size;
-		off = (uintptr_t)from & (linesz - 1);
-		l = (len + off + linesz - 1) & ~(linesz - 1);
-		p = (char *)from - off;
-		do {
-			__asm volatile ("icbi 0,%0" :: "r"(p));
-			p += linesz;
-		} while ((l -= linesz) != 0);
-	}
-	__asm volatile ("sync; isync");
-}
diff --git a/lib/libc/arch/powerpc/genassym.cf b/lib/libc/arch/powerpc/genassym.cf
deleted file mode 100644
index e48bb6f2a..000000000
--- a/lib/libc/arch/powerpc/genassym.cf
+++ /dev/null
@@ -1,52 +0,0 @@
-#	$NetBSD: genassym.cf,v 1.4 2013/08/30 21:28:59 matt Exp $
-
-#
-# Copyright (c) 2001 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Matt Thomas <matt@3am-sfotware.com>.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-include <sys/types.h>
-include <sys/queue.h>
-include <sys/cpu.h>
-include <sys/signal.h>
-include <sys/ucontext.h>
-
-include <machine/frame.h>
-
-define CALLFRAMELEN	sizeof(struct callframe)
-define CALLFRAME_LR	offsetof(struct callframe, cf_lr)
-define CALLFRAME_R30	offsetof(struct callframe, cf_r30)
-define CALLFRAME_R31	offsetof(struct callframe, cf_r31)
-
-define UC_GREGS_R1	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_R1])
-define UC_GREGS_R3	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_R3])
-define UC_GREGS_PC	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_PC])
-
-define SIG_BLOCK	SIG_BLOCK
-define SIG_SETMASK	SIG_SETMASK
-
-define CACHE_INFO_DCACHE_LINE_SIZE offsetof(struct cache_info, dcache_line_size)
diff --git a/lib/libc/arch/powerpc/misc/powerpc_initfini.c b/lib/libc/arch/powerpc/misc/powerpc_initfini.c
deleted file mode 100644
index 01b84a04d..000000000
--- a/lib/libc/arch/powerpc/misc/powerpc_initfini.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-__RCSID("$NetBSD: powerpc_initfini.c,v 1.1 2013/08/30 21:28:59 matt Exp $");
-
-#include "namespace.h"
-
-/*
- * Grab the cache_info at load time.
- */
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/queue.h>
-#include <sys/cpu.h>
-
-#include <stdbool.h>
-#include <stddef.h>
-
-__dso_hidden struct cache_info _libc_powerpc_cache_info;
-
-static void _libc_cache_info_init(void)
-    __attribute__((__constructor__, __used__));
-
-void __section(".text.startup")
-_libc_cache_info_init(void)
-{
-	static bool initialized;
-	if (!initialized) {
-		const int name[2] = { CTL_MACHDEP, CPU_CACHEINFO };
-		size_t len = sizeof(_libc_powerpc_cache_info);
-		(void)sysctl(name, __arraycount(name),
-		    &_libc_powerpc_cache_info, &len, NULL, 0);
-		initialized = 1;
-	}
-}
diff --git a/lib/libc/arch/powerpc/net/Makefile.inc b/lib/libc/arch/powerpc/net/Makefile.inc
deleted file mode 100644
index 80be36301..000000000
--- a/lib/libc/arch/powerpc/net/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2003/05/12 09:32:10 kleink Exp $
-
-SRCS+=	htonl.c htons.c ntohl.c ntohs.c
diff --git a/lib/libc/arch/powerpc/softfloat/milieu.h b/lib/libc/arch/powerpc/softfloat/milieu.h
deleted file mode 100644
index 52c2bc3cf..000000000
--- a/lib/libc/arch/powerpc/softfloat/milieu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: milieu.h,v 1.1 2001/05/25 11:38:57 simonb Exp $	*/
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "powerpc-gcc.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
diff --git a/lib/libc/arch/powerpc/softfloat/powerpc-gcc.h b/lib/libc/arch/powerpc/softfloat/powerpc-gcc.h
deleted file mode 100644
index 9a1784211..000000000
--- a/lib/libc/arch/powerpc/softfloat/powerpc-gcc.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$NetBSD: powerpc-gcc.h,v 1.2 2005/12/24 21:11:16 perry Exp $	*/
-
-/*
--------------------------------------------------------------------------------
-One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
--------------------------------------------------------------------------------
-*/
-#include <machine/endian.h>
-#if _BYTE_ORDER == _BIG_ENDIAN
-#define BIGENDIAN
-#endif
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#define LITTLEENDIAN
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `BITS64' can be defined to indicate that 64-bit integer types are
-supported by the compiler.
--------------------------------------------------------------------------------
-*/
-#define BITS64
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines the most convenient type that holds
-integers of at least as many bits as specified.  For example, `uint8' should
-be the most convenient type that can hold unsigned integers of as many as
-8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
-implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
-to the same as `int'.
--------------------------------------------------------------------------------
-*/
-typedef int flag;
-typedef int uint8;
-typedef int int8;
-typedef int uint16;
-typedef int int16;
-typedef unsigned int uint32;
-typedef signed int int32;
-#ifdef BITS64
-typedef unsigned long long int uint64;
-typedef signed long long int int64;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines a type that holds integers
-of _exactly_ the number of bits specified.  For instance, for most
-implementation of C, `bits16' and `sbits16' should be `typedef'ed to
-`unsigned short int' and `signed short int' (or `short int'), respectively.
--------------------------------------------------------------------------------
-*/
-typedef unsigned char bits8;
-typedef signed char sbits8;
-typedef unsigned short int bits16;
-typedef signed short int sbits16;
-typedef unsigned int bits32;
-typedef signed int sbits32;
-#ifdef BITS64
-typedef unsigned long long int bits64;
-typedef signed long long int sbits64;
-#endif
-
-#ifdef BITS64
-/*
--------------------------------------------------------------------------------
-The `LIT64' macro takes as its argument a textual integer literal and
-if necessary ``marks'' the literal as having a 64-bit integer type.
-For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
-appended with the letters `LL' standing for `long long', which is `gcc's
-name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
-defined as the identity macro:  `#define LIT64( a ) a'.
--------------------------------------------------------------------------------
-*/
-#define LIT64( a ) a##LL
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `INLINE' can be used before functions that should be inlined.  If
-a compiler does not support explicit inlining, this macro should be defined
-to be `static'.
--------------------------------------------------------------------------------
-*/
-#define INLINE static inline
-
-#define FLOAT64_DEMANGLE(a)	(a)
-#define FLOAT64_MANGLE(a)	(a)
diff --git a/lib/libc/arch/powerpc/softfloat/softfloat.h b/lib/libc/arch/powerpc/softfloat/softfloat.h
deleted file mode 100644
index dfb038ab8..000000000
--- a/lib/libc/arch/powerpc/softfloat/softfloat.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*	$NetBSD: softfloat.h,v 1.7 2011/07/07 07:14:57 matt Exp $	*/
-
-/* This is a derivative work. */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.  The same applies to
-the `FLOAT128' macro and the quadruple-precision format `float128'.
--------------------------------------------------------------------------------
-*/
-/* #define FLOATX80 */
-/* #define FLOAT128 */
-
-#include <machine/ieeefp.h>
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef unsigned int float32;
-typedef unsigned long long float64;
-#ifdef FLOATX80
-typedef struct {
-    unsigned short high;
-    unsigned long long low;
-} floatx80;
-#endif
-#ifdef FLOAT128
-typedef struct {
-    unsigned long long high, low;
-} float128;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-#ifndef SOFTFLOAT_FOR_GCC
-extern int8 float_detect_tininess;
-#endif
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern fp_rnd float_rounding_mode;
-#define float_round_nearest_even	FP_RN
-#define float_round_to_zero		FP_RZ
-#define float_round_down		FP_RM
-#define float_round_up			FP_RP
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-*/
-extern fp_except float_exception_flags;
-extern fp_except float_exception_mask;
-enum {
-    float_flag_inexact   = FP_X_IMP,
-    float_flag_underflow = FP_X_UFL,
-    float_flag_overflow  = FP_X_OFL,
-    float_flag_divbyzero = FP_X_DZ,
-    float_flag_invalid   = FP_X_INV
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( fp_except );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int32 );
-float32 uint32_to_float32( uint32 );
-float64 int32_to_float64( int32 );
-float64 uint32_to_float64( uint32 );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( int32 );
-floatx80 uint32_to_floatx80( uint32 );
-#endif
-#ifdef FLOAT128
-float128 int32_to_float128( int32 );
-float128 uint32_to_float128( uint32 );
-#endif
-float32 int64_to_float32( long long );
-float64 int64_to_float64( long long );
-#ifdef FLOATX80
-floatx80 int64_to_floatx80( long long );
-#endif
-#ifdef FLOAT128
-float128 int64_to_float128( long long );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float32_to_int32( float32 );
-int float32_to_int32_round_to_zero( float32 );
-unsigned int float32_to_uint32_round_to_zero( float32 );
-long long float32_to_int64( float32 );
-long long float32_to_int64_round_to_zero( float32 );
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-#ifdef FLOAT128
-float128 float32_to_float128( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-flag float32_eq( float32, float32 );
-flag float32_le( float32, float32 );
-flag float32_lt( float32, float32 );
-flag float32_eq_signaling( float32, float32 );
-flag float32_le_quiet( float32, float32 );
-flag float32_lt_quiet( float32, float32 );
-#ifndef SOFTFLOAT_FOR_GCC
-flag float32_is_signaling_nan( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float64_to_int32( float64 );
-int float64_to_int32_round_to_zero( float64 );
-unsigned int float64_to_uint32_round_to_zero( float64 );
-long long float64_to_int64( float64 );
-long long float64_to_int64_round_to_zero( float64 );
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-#ifdef FLOAT128
-float128 float64_to_float128( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-flag float64_eq( float64, float64 );
-flag float64_le( float64, float64 );
-flag float64_lt( float64, float64 );
-flag float64_eq_signaling( float64, float64 );
-flag float64_le_quiet( float64, float64 );
-flag float64_lt_quiet( float64, float64 );
-#ifndef SOFTFLOAT_FOR_GCC
-flag float64_is_signaling_nan( float64 );
-#endif
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int floatx80_to_int32( floatx80 );
-int floatx80_to_int32_round_to_zero( floatx80 );
-long long floatx80_to_int64( floatx80 );
-long long floatx80_to_int64_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-#ifdef FLOAT128
-float128 floatx80_to_float128( floatx80 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern int floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-flag floatx80_eq( floatx80, floatx80 );
-flag floatx80_le( floatx80, floatx80 );
-flag floatx80_lt( floatx80, floatx80 );
-flag floatx80_eq_signaling( floatx80, floatx80 );
-flag floatx80_le_quiet( floatx80, floatx80 );
-flag floatx80_lt_quiet( floatx80, floatx80 );
-flag floatx80_is_signaling_nan( floatx80 );
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float128_to_int32( float128 );
-int float128_to_int32_round_to_zero( float128 );
-long long float128_to_int64( float128 );
-long long float128_to_int64_round_to_zero( float128 );
-float32 float128_to_float32( float128 );
-float64 float128_to_float64( float128 );
-#ifdef FLOATX80
-floatx80 float128_to_floatx80( float128 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision operations.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 );
-float128 float128_add( float128, float128 );
-float128 float128_sub( float128, float128 );
-float128 float128_mul( float128, float128 );
-float128 float128_div( float128, float128 );
-float128 float128_rem( float128, float128 );
-float128 float128_sqrt( float128 );
-flag float128_eq( float128, float128 );
-flag float128_le( float128, float128 );
-flag float128_lt( float128, float128 );
-flag float128_eq_signaling( float128, float128 );
-flag float128_le_quiet( float128, float128 );
-flag float128_lt_quiet( float128, float128 );
-flag float128_is_signaling_nan( float128 );
-
-#endif
diff --git a/lib/libc/arch/powerpc/stdlib/Makefile.inc b/lib/libc/arch/powerpc/stdlib/Makefile.inc
deleted file mode 100644
index 2f91b992a..000000000
--- a/lib/libc/arch/powerpc/stdlib/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2009/07/31 20:40:00 dsl Exp $
diff --git a/lib/libc/arch/powerpc/string/Makefile.inc b/lib/libc/arch/powerpc/string/Makefile.inc
deleted file mode 100644
index 5814c9a6b..000000000
--- a/lib/libc/arch/powerpc/string/Makefile.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.13 2010/03/14 00:26:10 mrg Exp $
-
-SRCS+=  bzero.S ffs.S strlen.S
-NO_SRCS+= memset.S
-
-# disable the asm versions of these because they break the explora.
-# the special rules here are to override the suffix rules which seem
-# to prefer .S files over .c
-.if ${MACHINE} == "evbppc"
-bcopy.o: bcopy.c
-bcopy.po: bcopy.c
-bcopy.pico: bcopy.c
-memcpy.o: memcpy.c
-memcpy.po: memcpy.c
-memcpy.pico: memcpy.c
-memcmp.o: memcmp.c
-memcmp.po: memcmp.c
-memcmp.pico: memcmp.c
-memmove.o: memmove.c
-memmove.po: memmove.c
-memmove.pico: memmove.c
-.else
-SRCS+=	memcmp.S bcopy.S memcpy.S memmove.S
-.endif
diff --git a/lib/libc/arch/powerpc/string/bzero.S b/lib/libc/arch/powerpc/string/bzero.S
deleted file mode 100644
index 9c632b668..000000000
--- a/lib/libc/arch/powerpc/string/bzero.S
+++ /dev/null
@@ -1,265 +0,0 @@
-/*	$NetBSD: bzero.S,v 1.14 2013/09/12 15:36:15 joerg Exp $ */
-
-/*-
- * Copyright (C) 2001	Martin J. Laubach <mjl@NetBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 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>
-
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: bzero.S,v 1.14 2013/09/12 15:36:15 joerg Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-#include "assym.h"
-
-#define USE_STSWX 0	/* don't. slower than trivial copy loop */
-
-/*----------------------------------------------------------------------*/
-/*
-     void bzero(void *b %r3, size_t len %r4);
-     void * memset(void *b %r3, int c %r4, size_t len %r5);
-*/
-/*----------------------------------------------------------------------*/
-
-#define r_dst	%r3
-#define r_len	%r4
-#define r_val	%r0
-
-		.text
-		.align 4
-ENTRY(bzero)
-		li	r_val, 0		/* Value to stuff in */
-		b	cb_memset
-END(bzero)
-
-ENTRY(memset)
-		cmplwi	%cr1, %r5, 0
-		mr.	%r0, %r4
-		mr	%r8, %r3
-		beqlr-	%cr1			/* Nothing to do */
-
-		rlwimi	%r0, %r4, 8, 16, 23	/* word extend fill value */
-		rlwimi	%r0, %r0, 16, 0, 15
-		mr	%r4, %r5
-		bne-	simple_fill		/* =! 0, use trivial fill */
-cb_memset:
-
-/*----------------------------------------------------------------------*/
-#ifndef _KERNEL
-#ifdef __PIC__
-		/* First get cache line size */
-		mflr	%r9
-		bcl	20,31,1f
-1:		mflr	%r10
-		mtlr	%r9
-		addis	%r10,%r10,_libc_powerpc_cache_info+CACHE_INFO_DCACHE_LINE_SIZE-1b@ha
-		lwz	%r9,_libc_powerpc_cache_info+CACHE_INFO_DCACHE_LINE_SIZE-1b@l(%r10)
-#else
-		lis	%r10,_libc_powerpc_cache_info+CACHE_INFO_DCACHE_LINE_SIZE@ha
-		lwz	%r9,_libc_powerpc_cache_info+CACHE_INFO_DCACHE_LINE_SIZE@l(%r10)
-#endif
-		cmplwi	%cr1, %r9, 0		/* Unknown? */
-		beq-	simple_fill		/* a trivial fill routine */
-#else /* _KERNEL */
-#ifdef	MULTIPROCESSOR
-		mfsprg	%r10, 0			/* Get cpu_info pointer */
-#else
-		lis	%r10, cpu_info_store@ha
-		addi	%r10, %r10, cpu_info_store@l
-#endif
-		lwz	%r9, CPU_CI+CACHE_INFO_DCACHE_LINE_SIZE(%r10)	/* Load D$ line size */
-#endif /* _KERNEL */
-		cntlzw	%r10, %r9			/* Calculate shift.. */
-		li	%r6, 31
-		subf	%r10, %r10, %r6
-		/* Back in memory filling business */
-		
-		cmplwi	%cr1, r_len, 0		/* Nothing to do? */
-		add	%r5, %r9, %r9
-		cmplw	r_len, %r5		/* <= 2*CL bytes to move? */
-		beqlr-	%cr1			/* then do nothing */
-
-		blt+	simple_fill		/* a trivial fill routine */
-
-		/* Word align the block, fill bytewise until dst even*/
-		
-		andi.	%r5, r_dst, 0x03	
-		li	%r6, 4
-		beq+	cb_aligned_w		/* already aligned to word? */
-
-		subf	%r5, %r5, %r6		/* bytes to fill to align4 */
-#if USE_STSWX
-		mtxer	%r5
-		stswx	%r0, 0, r_dst
-		add	r_dst, %r5, r_dst
-#else
-		mtctr	%r5
-
-		subi	r_dst, r_dst, 1
-1:		stbu	r_val, 1(r_dst)		/* Fill bytewise */
-		bdnz	1b
-
-		addi	r_dst, r_dst, 1
-#endif
-		subf	r_len, %r5, r_len
-
-cb_aligned_w:	/* Cache block align, fill wordwise until dst aligned */
-
-		/* I know I have something to do since we had > 2*CL initially */
-		/* so no need to check for r_len = 0 */
-
-		subi	%r6, %r9, 1		/* CL mask */
-		and.	%r5, r_dst, %r6
-		srwi	%r5, %r5, 2
-		srwi	%r6, %r9, 2
-		beq	cb_aligned_cb		/* already on CL boundary? */
-
-		subf	%r5, %r5, %r6		/* words to fill to alignment */
-		mtctr	%r5
-		slwi	%r5, %r5, 2
-		subf	r_len, %r5, r_len
-
-		subi	r_dst, r_dst, 4
-1:		stwu	r_val, 4(r_dst)		/* Fill wordwise */
-		bdnz	1b
-		addi	r_dst, r_dst, 4
-
-cb_aligned_cb:	/* no need to check r_len, see above */
-		
-		srw.	%r5, r_len, %r10		/* Number of cache blocks */
-		mtctr	%r5
-		beq	cblocks_done
-
-		slw	%r5, %r5, %r10
-		subf	r_len, %r5, r_len
-
-1:		dcbz	0, r_dst		/* Clear blockwise */
-		add	r_dst, r_dst, %r9
-		bdnz	1b
-
-cblocks_done:	/* still CL aligned, but less than CL bytes left */
-		cmplwi	%cr1, r_len, 0
-		cmplwi	r_len, 8
-		beq-	%cr1, sf_return
-
-		blt-	sf_bytewise		/* <8 remaining? */
-		b	sf_aligned_w
-
-/*----------------------------------------------------------------------*/
-wbzero:		li	r_val, 0
-
-		cmplwi	r_len, 0
-		beqlr-				/* Nothing to do */
-
-simple_fill:
-#if USE_STSWX
-		cmplwi	%cr1, r_len, 12		/* < 12 bytes to move? */
-#else
-		cmplwi	%cr1, r_len, 8		/* < 8 bytes to move? */
-#endif
-		andi.	%r5, r_dst, 0x03		/* bytes to fill to align4 */
-		blt	%cr1, sf_bytewise	/* trivial byte mover */
-
-		li	%r6, 4
-		subf	%r5, %r5, %r6
-		beq+	sf_aligned_w		/* dest is word aligned */
-
-#if USE_STSWX
-		mtxer	%r5
-		stswx	%r0, 0, r_dst
-		add	r_dst, %r5, r_dst
-#else
-		mtctr	%r5			/* nope, then fill bytewise */
-		subi	r_dst, r_dst, 1		/* until it is */
-1:		stbu	r_val, 1(r_dst)		
-		bdnz	1b
-
-		addi	r_dst, r_dst, 1
-#endif
-		subf	r_len, %r5, r_len
-
-sf_aligned_w:	/* no need to check r_len since it were >= 8 bytes initially */
-#if USE_STSWX
-		mr	%r6, %r0
-		mr	%r7, %r0
-
-		srwi	%r5, r_len, 3
-		mtctr	%r5
-		
-		slwi	%r5, %r5, 3		/* adjust len */
-		subf.	r_len, %r5, r_len
-		
-1:		stswi	%r6, r_dst, 8
-		addi	r_dst, r_dst, 8
-		bdnz	1b
-#else
-		srwi	%r5, r_len, 2		/* words to fill */
-		mtctr	%r5
-
-		slwi	%r5, %r5, 2
-		subf.	r_len, %r5, r_len	/* adjust len for fill */
-
-		subi	r_dst, r_dst, 4
-1:		stwu	r_val, 4(r_dst)
-		bdnz	1b
-		addi	r_dst, r_dst, 4
-#endif
-
-sf_word_done:	bne-	sf_bytewise
-
-sf_return:	mr	%r3, %r8			/* restore orig ptr */
-		blr				/* for memset functionality */
-
-sf_bytewise:
-#if USE_STSWX
-		mr	%r5, %r0
-		mr	%r6, %r0
-		mr	%r7, %r0
-		
-		mtxer	r_len
-		stswx	%r5, 0, r_dst
-#else
-		mtctr	r_len
-
-		subi	r_dst, r_dst, 1
-1:		stbu	r_val, 1(r_dst)
-		bdnz	1b
-#endif
-		mr	%r3, %r8			/* restore orig ptr */
-		blr				/* for memset functionality */
-END(memset)
-
-/*----------------------------------------------------------------------*/
-#ifndef _KERNEL
-		.data
-		.p2align 2
-cache_info:	.long	-1, -1, -1, -1
-cache_sh:	.long	0
-
-#endif
-/*----------------------------------------------------------------------*/
diff --git a/lib/libc/arch/powerpc/sys/__clone.S b/lib/libc/arch/powerpc/sys/__clone.S
deleted file mode 100644
index e6ad7c880..000000000
--- a/lib/libc/arch/powerpc/sys/__clone.S
+++ /dev/null
@@ -1,73 +0,0 @@
-/*	$NetBSD: __clone.S,v 1.6 2014/08/23 02:24:22 matt Exp $	*/
-
-/*-
- * Copyright (c) 2001 Tsubai Masanari.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __clone.S,v 1.6 2014/08/23 02:24:22 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(clone, __clone)
-#endif
-
-/*
- * int __clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-ENTRY(__clone)
-	/*
-	 * Sanity checks: func and stack may not be NULL.
-	 */
-	cmpptri	%r3,0
-	beq	1f
-	cmpptri	%r4,0
-	beq	1f
-
-	mr	%r7,%r3		/* Save fn in r7. */
-	mr	%r3,%r5
-	_DOSYSCALL(__clone)	/* (flags, stack) */
-	bso	2f		/* error... */
-
-	cmpptri	%r3,0
-	bnelr			/* We're the parent, just return. */
-
-	mtlr	%r7		/* fn */
-	mr	%r3,%r6		/* arg */
-	blrl			/* Call the clone's entry point. */
-
-#ifdef __PIC__
-	PIC_TOCSETUP(__clone, %r30)	/* exit won't return so blow away r30 */
-#endif
-	bl	PIC_PLT(_C_LABEL(_exit))
-
-1:
-	li	%r3,EINVAL
-2:
-	BRANCH_TO_CERROR()
-END(__clone)
diff --git a/lib/libc/arch/powerpc/sys/__sigaction14_sigtramp.c b/lib/libc/arch/powerpc/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index 71f97406a..000000000
--- a/lib/libc/arch/powerpc/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.9 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.9 2008/04/28 20:22:57 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-#ifdef __LIBC12_SOURCE__
-extern const int __sigtramp_sigcontext_1[]
-    __weak_reference(__sigtramp_sigcontext_1);
-#endif
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern const int __sigtramp_siginfo_2[];
-
-	/*
-	 * If no sigaction, use the "default" trampoline since it won't
-	 * be used.
-	 */
-	if (act == NULL)
-		return  __sigaction_sigtramp(sig, act, oact, NULL, 0);
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the non-SA_SIGINFO trampoline if SA_SIGINFO is not
-	 * set in the sigaction.
-	 */
-	if ((act->sa_flags & SA_SIGINFO) == 0) {
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-		    __sigtramp_sigcontext_1, 1);
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	/*
-	 * If SA_SIGINFO was specificed or the compatibility trampolines
-	 * can't be used, use the siginfo trampoline.
-	 */
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/powerpc/sys/__sigtramp2.S b/lib/libc/arch/powerpc/sys/__sigtramp2.S
deleted file mode 100644
index 132b347c5..000000000
--- a/lib/libc/arch/powerpc/sys/__sigtramp2.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.3 2011/01/15 07:31:12 matt Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigtramp2.S,v 1.3 2011/01/15 07:31:12 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-/*
- * On entry to user space, stack and registers look like:
- *
- *	r3	signal number
- *	r4	pointer to siginfo structure
- *	r5	pointer to ucontext structure
- *	r30	pointer to ucontext structure
- *	srr0	address of handler
- *	lr	address of this trampoline
- *
- */
-ENTRY_NOPROFILE(__sigtramp_siginfo_2)
-	mr	%r3,%r30		/* restore ucontext pointer */
-	_DOSYSCALL(setcontext)		/* restore machine state */
-	_DOSYSCALL(exit)		/* or exit with errno if failed */
-END(__sigtramp_siginfo_2)
diff --git a/lib/libc/arch/powerpc/sys/__syscall.S b/lib/libc/arch/powerpc/sys/__syscall.S
deleted file mode 100644
index 295a1d32b..000000000
--- a/lib/libc/arch/powerpc/sys/__syscall.S
+++ /dev/null
@@ -1,22 +0,0 @@
-/*	$NetBSD: __syscall.S,v 1.3 2014/08/23 02:24:22 matt Exp $	*/
-
-#include "SYS.h"
-
-	.text
-	.p2align 2
-ENTRY(__syscall)
-	mr	%r0,%r3		/* syscall number */
-	mr	%r3,%r4
-	mr	%r4,%r5
-	mr	%r5,%r6
-	mr	%r6,%r7
-	mr	%r7,%r8
-	mr	%r8,%r9
-	mr	%r9,%r10
-	ldreg	%r10,(2*__SIZEOF_POINTER__)(%r1) /* final argument is on the stack */
-	sc
-	bnslr
-	BRANCH_TO_CERROR()
-END(__syscall)
-
-STRONG_ALIAS(syscall, __syscall)
diff --git a/lib/libc/arch/powerpc/sys/__vfork14.S b/lib/libc/arch/powerpc/sys/__vfork14.S
deleted file mode 100644
index c2894d053..000000000
--- a/lib/libc/arch/powerpc/sys/__vfork14.S
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	$NetBSD: __vfork14.S,v 1.4 2011/01/15 07:31:12 matt Exp $	*/
-
-/*
- * pid = vfork();
- *
- * r4 == 0 in parent process, 1 in child process.
- * r3 == pid of child in parent, pid of parent in child.
- */
-
-#include "SYS.h"
-
-SYSCALL(__vfork14)
-	addi	%r4,%r4,-1	# from 1 to 0 in child, 0 to -1 in parent
-	and	%r3,%r3,%r4	# return 0 in child, pid in parent
-	blr
-END(__vfork14)
diff --git a/lib/libc/arch/powerpc/sys/brk.S b/lib/libc/arch/powerpc/sys/brk.S
deleted file mode 100644
index 8c83ed280..000000000
--- a/lib/libc/arch/powerpc/sys/brk.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: brk.S,v 1.14 2014/08/23 02:24:22 matt Exp $	*/
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: brk.S,v 1.14 2014/08/23 02:24:22 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-	.hidden	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(__curbrk)
-	.hidden	_C_LABEL(__minbrk)
-	.globl	_C_LABEL(__minbrk)
-	.globl	_C_LABEL(_end)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
-#endif
-
-	.data
-	.p2align 2
-_C_LABEL(__minbrk):
-	.long	_C_LABEL(_end)
-_C_LABEL(__curbrk):
-	.long	_C_LABEL(_end)
-
-ENTRY(_brk)
-#ifdef __PIC__
-	mflr	%r0
-	bcl	20,31,.LPIC0
-.LPIC0:	mflr    %r9
-	mtlr	%r0
-	addis	%r9,%r9,(_C_LABEL(__minbrk)-.LPIC0)@ha 
-	ldptru	%r5,(_C_LABEL(__minbrk)-.LPIC0)@l(%r9)	# r5 = &_end
-#else
-	lis	%r9,_C_LABEL(__minbrk)@ha
-	ldptru	%r5,_C_LABEL(__minbrk)@l(%r9)	# r5 = &_end
-#endif
-	cmpptrl	%r5,%r3			# if (__minbrk <= r3)
-#ifdef __PPC_ISEL__
-	iselgt	%r3,%r5,%r3
-#else
-	bgt	0f
-	mr	%r5,%r3			# r5 = r3
-0:
-	mr	%r3,%r5			# new break value
-#endif
-	_DOSYSCALL(break)		# assume that r5 is preserved
-	bso	1f
-	stptr	%r5,__SIZEOF_POINTER__(%r9)
-	blr				# return 0
-
-1:
-	BRANCH_TO_CERROR()
-END(_brk)
diff --git a/lib/libc/arch/powerpc/sys/cerror.S b/lib/libc/arch/powerpc/sys/cerror.S
deleted file mode 100644
index 954bf0bd1..000000000
--- a/lib/libc/arch/powerpc/sys/cerror.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.11 2013/09/12 15:36:15 joerg Exp $	*/
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: cerror.S,v 1.11 2013/09/12 15:36:15 joerg Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-#ifndef _REENTRANT
-	.globl	_C_LABEL(errno)
-#endif
-#ifdef __PIC__
-	.protected _C_LABEL(__cerror)
-#endif
-
-ENTRY(__cerror)
-#ifdef _REENTRANT
-	mflr	%r0
-	stwu	%r1,-CALLFRAMELEN(%r1)		# allocate new stack frame
-	stw	%r0,CALLFRAMELEN+CALLFRAME_LR(%r1)
-#ifdef __PIC__
-	stw	%r30,CALLFRAME_R30(%r1)
-	PIC_TOCSETUP(__cerror, %r30)
-#endif
-	stw	%r31,CALLFRAME_R31(%r1)
-	mr	%r31,%r3		# stash away in callee-saved register
-	bl	PIC_PLT(_C_LABEL(__errno))
-	stw	%r31,0(%r3)
-	lwz	%r0,CALLFRAMELEN+CALLFRAME_LR(%r1)
-	lwz	%r31,CALLFRAME_R31(%r1)
-#ifdef __PIC__
-	lwz	%r30,CALLFRAME_R30(%r1)
-#endif
-	mtlr	%r0
-	addi	%r1,%r1,CALLFRAMELEN
-#else
-#ifdef __PIC__
-	mflr	%r10
-	PIC_GOTSETUP(%r4)
-	lwz	%r4,_C_LABEL(errno)@got(%r4)
-	stw	%r3,0(%r4)
-	mtlr	%r10
-#else
-	lis	%r4,_C_LABEL(errno)@ha
-	stw	%r3,_C_LABEL(errno)@l(%r4)
-#endif /* __PIC__ */
-#endif /* _REENTRANT */
-	li	%r3,-1
-	li	%r4,-1
-	blr
-END(__cerror)
diff --git a/lib/libc/arch/powerpc/sys/exect.S b/lib/libc/arch/powerpc/sys/exect.S
deleted file mode 100644
index 362cbf6ea..000000000
--- a/lib/libc/arch/powerpc/sys/exect.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: exect.S,v 1.3 1998/05/25 15:28:03 ws Exp $	*/
-
-#include "SYS.h"
-
-PSEUDO(exect,execve)
diff --git a/lib/libc/arch/powerpc/sys/fork.S b/lib/libc/arch/powerpc/sys/fork.S
deleted file mode 100644
index c442b8241..000000000
--- a/lib/libc/arch/powerpc/sys/fork.S
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	$NetBSD: fork.S,v 1.6 2011/01/15 07:31:13 matt Exp $	*/
-
-/*
- * pid = fork();
- *
- * r4 == 0 in parent process, 1 in child process.
- * r3 == pid of child in parent, pid of parent in child.
- */
-
-#include "SYS.h"
-
-_SYSCALL(__fork,fork)
-	addi	%r4,%r4,-1	# from 1 to 0 in child, 0 to -1 in parent
-	and	%r3,%r3,%r4	# return 0 in child, pid in parent
-	blr
-END(__fork)
diff --git a/lib/libc/arch/powerpc/sys/getcontext.S b/lib/libc/arch/powerpc/sys/getcontext.S
deleted file mode 100644
index abd92c82d..000000000
--- a/lib/libc/arch/powerpc/sys/getcontext.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.6 2014/08/23 02:24:22 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getcontext.S,v 1.6 2014/08/23 02:24:22 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext, _getcontext)
-#endif
-
-ENTRY(_getcontext)
-	mr	%r5,%r3				# must save pointer
-	_DOSYSCALL(getcontext)
-	bso	1f
-	mflr	%r4
-	stptr	%r4,UC_GREGS_PC(%r5)		# saved pc <- lr
-	stint	%r3,UC_GREGS_R3(%r5)		# arrange for return value 0
-	blr
-1:
-	BRANCH_TO_CERROR()
-END(_getcontext)
diff --git a/lib/libc/arch/powerpc/sys/pipe.S b/lib/libc/arch/powerpc/sys/pipe.S
deleted file mode 100644
index 8d6f041e5..000000000
--- a/lib/libc/arch/powerpc/sys/pipe.S
+++ /dev/null
@@ -1,23 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.9 2014/08/23 02:24:22 matt Exp $	*/
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pipe.S,v 1.9 2014/08/23 02:24:22 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-#endif
-
-ENTRY(_pipe)
-	mr	%r5,%r3		# save pointer
-	_DOSYSCALL(pipe)	# assume, that r5 is kept
-	bso	1f
-	stint	%r3,0(%r5)	# success, store fds
-	stint	%r4,4(%r5)
-	li	%r3,0
-	blr			# and return 0
-1:
-	BRANCH_TO_CERROR()
-END(_pipe)
diff --git a/lib/libc/arch/powerpc/sys/ptrace.S b/lib/libc/arch/powerpc/sys/ptrace.S
deleted file mode 100644
index 2fc542d9c..000000000
--- a/lib/libc/arch/powerpc/sys/ptrace.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.7 2013/09/12 15:36:15 joerg Exp $	*/
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ptrace.S,v 1.7 2013/09/12 15:36:15 joerg Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-#define	XCALLFRAMELEN		((((2+5)*SZREG) + CALLFRAMELEN - 1) & -CALLFRAMELEN)
-#define	XCALLFRAME_DATA		(XCALLFRAMELEN - 1*SZREG)
-#define	XCALLFRAME_ADDR		(XCALLFRAMELEN - 2*SZREG)
-#define	XCALLFRAME_PID		(XCALLFRAMELEN - 3*SZREG)
-#define	XCALLFRAME_REQUEST	(XCALLFRAMELEN - 4*SZREG)
-#define	XCALLFRAME_R30		(XCALLFRAMELEN - 5*SZREG)
-
-ENTRY(ptrace)
-#ifdef _REENTRANT
-	mflr	%r0
-	stw	%r0,CALLFRAME_LR(%r1)
-	stwu	%r1,-XCALLFRAMELEN(%r1)
-	stw	%r3,XCALLFRAME_REQUEST(%r1)
-	stw	%r4,XCALLFRAME_PID(%r1)
-	stw	%r5,XCALLFRAME_ADDR(%r1)
-	stw	%r6,XCALLFRAME_DATA(%r1)
-#ifdef __PIC__
-	stw	%r30,XCALLFRAME_R30(%r1)
-	PIC_TOCSETUP(ptrace, %r30)
-#endif
-
-	bl	PIC_PLT(_C_LABEL(__errno))
-	li	%r7,0
-	stw	%r7,0(%r3)
-
-#ifdef __PIC__
-	lwz	%r30,XCALLFRAME_R30(%r1)
-#endif
-	lwz	%r6,XCALLFRAME_DATA(%r1)
-	lwz	%r4,XCALLFRAME_PID(%r1)
-	lwz	%r5,XCALLFRAME_ADDR(%r1)
-	lwz	%r3,XCALLFRAME_REQUEST(%r1)
-	addi	%r1,%r1,XCALLFRAMELEN
-	lwz	%r0,CALLFRAME_LR(%r1)
-	mtlr	%r0
-#else
-#ifdef __PIC__
-	mflr	%r0
-	PIC_GOTSETUP(%r7)
-	lwz	%r7,_C_LABEL(errno)@got(%r7)
-	li	%r8,0
-	stw	%r8,0(%r7)
-	mtlr	0
-#else
-	lis	%r7,_C_LABEL(errno)@ha
-	li	%r8,0
-	stw	%r8,_C_LABEL(errno)@l(%r7)
-#endif /* __PIC__ */
-#endif /* _REENTRANT */
-	_DOSYSCALL(ptrace)
-	bnslr
-	b	_C_LABEL(__cerror)
diff --git a/lib/libc/arch/powerpc/sys/sbrk.S b/lib/libc/arch/powerpc/sys/sbrk.S
deleted file mode 100644
index 308f4c93f..000000000
--- a/lib/libc/arch/powerpc/sys/sbrk.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.13 2014/08/23 02:24:22 matt Exp $	*/
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sbrk.S,v 1.13 2014/08/23 02:24:22 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-	.hidden	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(__curbrk)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-ENTRY(_sbrk)
-#ifdef __PIC__
-	mflr	%r0
-	bcl	20,31,.LPIC0
-.LPIC0:	mflr	%r5
-	mtlr	%r0
-	addis	%r8,%r5,(_C_LABEL(__curbrk)-.LPIC0)@ha
-	ldptru	%r6,(_C_LABEL(__curbrk)-.LPIC0)@l(%r8)
-#else
-	lis	%r8,_C_LABEL(__curbrk)@ha
-	ldptru	%r6,_C_LABEL(__curbrk)@l(%r8)	# r6 = old break, r5 = &curbrk
-#endif
-	add	%r3,%r3,%r6
-	mr	%r7,%r3				# r7 = new break
-	_DOSYSCALL(break)			# break(new_break)
-	bso	1f
-	mr	%r3,%r6				# set return value
-	stptr	%r7,0(%r8)			# record new break
-	blr
-1:
-	BRANCH_TO_CERROR()
-END(_sbrk)
diff --git a/lib/libc/arch/powerpc/sys/shmat.S b/lib/libc/arch/powerpc/sys/shmat.S
deleted file mode 100644
index b72046bf8..000000000
--- a/lib/libc/arch/powerpc/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2000/07/07 08:20:53 itohy Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/powerpc/sys/syscall.S b/lib/libc/arch/powerpc/sys/syscall.S
deleted file mode 100644
index e8200bc78..000000000
--- a/lib/libc/arch/powerpc/sys/syscall.S
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.3 2014/02/01 20:26:21 matt Exp $	*/
-
-/* aliased to __syscall */
diff --git a/lib/libc/arch/powerpc64/Makefile.inc b/lib/libc/arch/powerpc64/Makefile.inc
deleted file mode 100644
index c7220ea40..000000000
--- a/lib/libc/arch/powerpc64/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2014/08/23 02:24:22 matt Exp $
-
-KMINCLUDES=
-KMSRCS=	
-
-CPPFLAGS+=	-I.
-
-SRCS+=		__sigaction14_sigtramp.c __sigtramp2.S
diff --git a/lib/libc/arch/powerpc64/SYS.h b/lib/libc/arch/powerpc64/SYS.h
deleted file mode 100644
index 39c1ee399..000000000
--- a/lib/libc/arch/powerpc64/SYS.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.4 2015/01/12 02:48:20 dennis Exp $	*/
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-
-/*
- * Inline what __cerror() is generally used to do since branching
- * to __cerror() can't be done reliably with the powerpc64 ABI.
- */
-#ifdef _REENTRANT
-#define	_DO_CERROR_SF_SZ	(SF_SZ + SF_ALIGN(8))
-#define	_DO_CERROR()		mflr	%r0				;\
-				streg	%r31,-8(%r1)			;\
-				streg	%r0,SF_LR(%r1)			;\
-				stptru	%r1,-_DO_CERROR_SF_SZ(%r1)	;\
-				mr	%r31,%r3			;\
-				bl	PIC_PLT(_C_LABEL(__errno))	;\
-				nop					;\
-				stint	%r31,0(%r3)			;\
-				addi	%r1,%r1,_DO_CERROR_SF_SZ	;\
-				ldreg	%r0,SF_LR(%r1)			;\
-				ldreg	%r31,-8(%r1)			;\
-				mtlr	%r0				;\
-				li	%r3,-1				;\
-				li	%r4,-1				;\
-				blr
-#else	/* !_REENTRANT */
-#define	_DO_CERROR()		lwz	%r4,_C_LABEL(errno)@got(%r2)	;\
-				stw	%r3,0(%r4)			;\
-				li	%r3,-1				;\
-				li	%r4,-1				;\
-				blr
-#endif	/* _REENTRANT */
-
-/* Clearly BRANCH_TO_CERROR() no longer does that... */
-#define	BRANCH_TO_CERROR()	_DO_CERROR()
-
-#define	_DOSYSCALL(x)		li	%r0,(SYS_ ## x)		;\
-				sc
-
-#define	_SYSCALL_NOERROR(x,y)	.text				;\
-				.p2align 2			;\
-			ENTRY(x)				;\
-				_DOSYSCALL(y)
-
-#define _SYSCALL(x,y)		.text				;\
-				.p2align 2			;\
-			2:	_DO_CERROR()			;\
-				_SYSCALL_NOERROR(x,y)		;\
-				bso	2b
-
-#define SYSCALL_NOERROR(x)	_SYSCALL_NOERROR(x,x)
-
-#define SYSCALL(x)		_SYSCALL(x,x)
-
-#define PSEUDO_NOERROR(x,y)	_SYSCALL_NOERROR(x,y)		;\
-				blr				;\
-				END(x)
-
-#define PSEUDO(x,y)		_SYSCALL_NOERROR(x,y)		;\
-				bnslr				;\
-				_DO_CERROR()			;\
-				END(x)
-
-#define RSYSCALL_NOERROR(x)	PSEUDO_NOERROR(x,x)
-
-#define RSYSCALL(x)		PSEUDO(x,x)
-
-#define	WSYSCALL(weak,strong)	WEAK_ALIAS(weak,strong)		;\
-				PSEUDO(strong,weak)
diff --git a/lib/libc/arch/powerpc64/gdtoa/Makefile.inc b/lib/libc/arch/powerpc64/gdtoa/Makefile.inc
deleted file mode 100644
index 98cc03a7d..000000000
--- a/lib/libc/arch/powerpc64/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/07/01 16:37:20 ross Exp $
-
-SRCS+=	strtof.c
diff --git a/lib/libc/arch/powerpc64/gdtoa/arith.h b/lib/libc/arch/powerpc64/gdtoa/arith.h
deleted file mode 100644
index 6ea59e97f..000000000
--- a/lib/libc/arch/powerpc64/gdtoa/arith.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/07/01 16:37:20 ross Exp $ */
-
-#define IEEE_BIG_ENDIAN
diff --git a/lib/libc/arch/powerpc64/gdtoa/gd_qnan.h b/lib/libc/arch/powerpc64/gdtoa/gd_qnan.h
deleted file mode 100644
index a37738ff2..000000000
--- a/lib/libc/arch/powerpc64/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2006/07/01 16:37:20 ross Exp $ */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x7ff80000
-#define d_QNAN1 0x0
diff --git a/lib/libc/arch/powerpc64/gen/Makefile.inc b/lib/libc/arch/powerpc64/gen/Makefile.inc
deleted file mode 100644
index 36713d375..000000000
--- a/lib/libc/arch/powerpc64/gen/Makefile.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 2009/12/06 07:12:17 uebayasi Exp $
-
-SRCS+=	__setjmp14.S __sigsetjmp14.S _setjmp.S
-SRCS+=	bswap16.c bswap32.c bswap64.c
-SRCS+=	fabs.c flt_rounds.c
-SRCS+=	syncicache.c
-SRCS+=  _lwp.c makecontext.c resumecontext.c swapcontext.S
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c infinityl_dbl_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
-
-SRCS+=	nanf.c
-
-.if (${MKSOFTFLOAT} == "no")
-SRCS+=	fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c
-SRCS+=	fpgetsticky.c fpsetsticky.c
-.endif
-
-LSRCS.powerpc.gen=Lint_swapcontext.c
-LSRCS+=		${LSRCS.powerpc.gen}
-DPSRCS+=	${LSRCS.powerpc.gen}
-CLEANFILES+=	${LSRCS.powerpc.gen}
diff --git a/lib/libc/arch/powerpc64/gen/__setjmp14.S b/lib/libc/arch/powerpc64/gen/__setjmp14.S
deleted file mode 100644
index 80fe15eb9..000000000
--- a/lib/libc/arch/powerpc64/gen/__setjmp14.S
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$NetBSD: __setjmp14.S,v 1.3 2014/08/23 02:24:22 matt Exp $	*/
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __setjmp14.S,v 1.3 2014/08/23 02:24:22 matt Exp $")
-#endif
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *	setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is restored.
- */
-
-ENTRY(__setjmp14)
-	mr	%r6,%r3
-	li	%r3,1			# SIG_BLOCK
-	li	%r4,0
-	addi	%r5,%r6,100		# &sigmask
-	_DOSYSCALL(__sigprocmask14)	# assume no error	XXX
-	mflr	%r11
-	mfcr	%r12
-	mr	%r10,%r1
-	mr	%r9,%r2
-
-	std	%r8,8(%r6)		# save r8-r31
-	std	%r9,16(%r6)
-	std	%r10,24(%r6)
-	std	%r11,32(%r6)
-	std	%r12,40(%r6)
-	std	%r13,48(%r6)
-	std	%r14,56(%r6)
-	std	%r15,64(%r6)
-	std	%r16,72(%r6)
-	std	%r17,80(%r6)
-	std	%r18,88(%r6)
-	std	%r19,96(%r6)
-	std	%r20,104(%r6)
-	std	%r21,112(%r6)
-	std	%r22,120(%r6)
-	std	%r23,128(%r6)
-	std	%r24,136(%r6)
-	std	%r25,144(%r6)
-	std	%r26,152(%r6)
-	std	%r27,160(%r6)
-	std	%r28,168(%r6)
-	std	%r29,176(%r6)
-	std	%r30,184(%r6)
-	std	%r31,192(%r6)
-
-	li	%r3,0
-	blr
-END(__setjmp14)
-
-ENTRY(__longjmp14)
-	ld	%r8,8(%r6)		# load r8-r31
-	ld	%r9,16(%r6)
-	ld	%r10,24(%r6)
-	ld	%r11,32(%r6)
-	ld	%r12,40(%r6)
-	ld	%r13,48(%r6)
-	ld	%r14,56(%r6)
-	ld	%r15,64(%r6)
-	ld	%r16,72(%r6)
-	ld	%r17,80(%r6)
-	ld	%r18,88(%r6)
-	ld	%r19,96(%r6)				   
-	ld	%r20,104(%r6)
-	ld	%r21,112(%r6)
-	ld	%r22,120(%r6)
-	ld	%r23,128(%r6)
-	ld	%r24,136(%r6)
-	ld	%r25,144(%r6)
-	ld	%r26,152(%r6)
-	ld	%r27,160(%r6)
-	ld	%r28,168(%r6)
-	ld	%r29,176(%r6)
-	ld	%r30,184(%r6)
-	ld	%r31,192(%r6)
-
-	mr	%r6,%r4
-	mtlr	%r11
-	mtcr	%r12
-	mr	%r2,%r9
-	mr	%r1,%r10
-	addi	%r4,%r3,100		# &sigmask
-	li	%r3,3			# SIG_SETMASK
-	li	%r5,0
-	_DOSYSCALL(__sigprocmask14)	# assume no error	XXX
-	or.	%r3,%r6,%r6
-	bnelr
-	li	%r3,1
-	blr
-END(__longjmp14)
diff --git a/lib/libc/arch/powerpc64/gen/__sigsetjmp14.S b/lib/libc/arch/powerpc64/gen/__sigsetjmp14.S
deleted file mode 100644
index 1ed304d80..000000000
--- a/lib/libc/arch/powerpc64/gen/__sigsetjmp14.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: __sigsetjmp14.S,v 1.3 2014/08/23 02:24:22 matt Exp $	*/
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$NetBSD: __sigsetjmp14.S,v 1.3 2014/08/23 02:24:22 matt Exp $"
-#endif
-
-ENTRY(__sigsetjmp14)
-	mr	%r6,%r3
-	or.	%r7,%r4,%r4
-	beq	1f
-	li	%r3,1			# SIG_BLOCK
-	li	%r4,0
-	addi	%r5,%r6,100		# &sigmask
-	_DOSYSCALL(__sigprocmask14)	# assume no error	XXX
-1:
-	mflr	%r11
-	mfcr	%r12
-	mr	%r10,%r1
-	mr	%r9,%r2
-	i = 0
-	.rept	32-7
-	std	7+i,i*8(%r6)		# save r7-r31
-	i = i + 1
-	.endr
-	li	%r3,0
-	blr
-END(__sigsetjmp14)
-
-ENTRY(__siglongjmp14)
-	i = 0
-	.rept	32-7
-	ld	7+i,i*8(%r3)		# load r7-r31
-	i = i + 1
-	.endr
-	mr	%r6,%r4
-	mtlr	%r11
-	mtcr	%r12
-	mr	%r2,%r9
-	mr	%r1,%r10
-	or.	%r7,%r7,%r7
-	beq	1f
-	addi	%r4,%r3,100		# &sigmask
-	li	%r3,3			# SIG_SETMASK
-	li	%r5,0
-	_DOSYSCALL(__sigprocmask14)	# assume no error	XXX
-1:
-	or.	%r3,%r6,%r6
-	bnelr
-	li	%r3,1
-	blr
-END(__siglongjmp14)
diff --git a/lib/libc/arch/powerpc64/gen/_lwp.c b/lib/libc/arch/powerpc64/gen/_lwp.c
deleted file mode 100644
index c299d00f8..000000000
--- a/lib/libc/arch/powerpc64/gen/_lwp.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.3 2012/11/24 15:20:58 christos Exp $	*/
-
-/*
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Allen Briggs for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.3 2012/11/24 15:20:58 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-/*ARGSUSED*/
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *), void *arg,
-	void *private, caddr_t stack_base, size_t stack_size)
-{
-	void	**sp;
-
-	getcontext(u);
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-	sp = (void *)(stack_base + stack_size);
-
-	u->uc_mcontext.__gregs[3] = (__greg_t) arg;		/* arg1 */
-	u->uc_mcontext.__gregs[1] = ((__greg_t) sp) - 112;	/* stack */
-	u->uc_mcontext.__gregs[33] = (__greg_t) _lwp_exit;	/* LR */
-	u->uc_mcontext.__gregs[34] = (__greg_t) start;	/* PC */
-}
diff --git a/lib/libc/arch/powerpc64/gen/_setjmp.S b/lib/libc/arch/powerpc64/gen/_setjmp.S
deleted file mode 100644
index 3d8da049a..000000000
--- a/lib/libc/arch/powerpc64/gen/_setjmp.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.2 2006/07/05 18:06:47 ross Exp $	*/
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$NetBSD: _setjmp.S,v 1.2 2006/07/05 18:06:47 ross Exp $"
-#endif
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	_longjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *	_setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	mflr	%r11			/* save return address */
-	mfcr	%r12			/* save condition register */
-	mr	%r10,%r1		/* save stack pointer */
-	mr	%r9,%r2			/* save GPR2 (not needed) */
-	i = 0
-	.rept	32-9
-	std	9+i,i*8+16(%r3)
-	i = i + 1
-	.endr
-	li	%r3,0			/* indicate success */
-	blr				/* return */
-
-ENTRY(_longjmp)
-	i = 0
-	.rept	32-9
-	ld	9+i,i*8+16(%r3)
-	i = i + 1
-	.endr
-	mtlr	%r11			/* restore LR */
-	mtcr	%r12			/* restore CR */
-	mr	%r2,%r9			/* restore GPR2 (not needed) */
-	mr	%r1,%r10		/* restore stack */
-	or.	%r3,%r4,%r4		/* get return value */
-	bnelr				/* return if not 0 */
-	li	%r3,1			/* what's the point? */
-	blr				/* return */
diff --git a/lib/libc/arch/powerpc64/gen/fabs.c b/lib/libc/arch/powerpc64/gen/fabs.c
deleted file mode 100644
index 4cc21a901..000000000
--- a/lib/libc/arch/powerpc64/gen/fabs.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: fabs.c,v 1.2 2006/07/05 18:07:22 ross Exp $	*/
-
-#include <math.h>
-
-double
-fabs(double x)
-{
-#ifdef _SOFT_FLOAT
-	if (x < 0)
-		x = -x;
-#else
-	__asm volatile("fabs %0,%1" : "=f"(x) : "f"(x));
-#endif
-	return (x);
-}
diff --git a/lib/libc/arch/powerpc64/gen/flt_rounds.c b/lib/libc/arch/powerpc64/gen/flt_rounds.c
deleted file mode 100644
index 1e2799a29..000000000
--- a/lib/libc/arch/powerpc64/gen/flt_rounds.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: flt_rounds.c,v 1.2 2015/03/19 21:22:59 joerg Exp $	*/
-
-/*
- * Copyright (c) 1996 Mark Brinicombe
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Mark Brinicombe
- *	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 <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.2 2015/03/19 21:22:59 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <ieeefp.h>
-#include <float.h>
-#include <stdint.h>
-#include <powerpc/fpu.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	0,	/* round to zero */
-	2,	/* round to positive infinity */
-	3	/* round to negative infinity */
-};
-
-int
-__flt_rounds(void)
-{
-#ifdef _SOFT_FLOAT
-	return map[fpgetround()];
-#else
-	uint64_t fpscr;
-
-	__asm volatile("mffs %0" : "=f"(fpscr));
-	return map[((uint32_t)fpscr & FPSCR_RN)];
-#endif
-}
diff --git a/lib/libc/arch/powerpc64/gen/fpgetmask.c b/lib/libc/arch/powerpc64/gen/fpgetmask.c
deleted file mode 100644
index 5e44e336c..000000000
--- a/lib/libc/arch/powerpc64/gen/fpgetmask.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: fpgetmask.c,v 1.2 2008/04/28 20:22:57 martin Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetmask.c,v 1.2 2008/04/28 20:22:57 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetmask,_fpgetmask)
-#endif
-
-#define	MASKBITS	(FPSCR_VE|FPSCR_OE|FPSCR_UE|FPSCR_ZE|FPSCR_XE)
-#define	MASKSHFT	3
-
-fp_except
-fpgetmask(void)
-{
-	uint64_t fpscr;
-
-	__asm volatile("mffs %0" : "=f"(fpscr));
-	return (((uint32_t)fpscr & MASKBITS) >> MASKSHFT);
-}
diff --git a/lib/libc/arch/powerpc64/gen/fpgetround.c b/lib/libc/arch/powerpc64/gen/fpgetround.c
deleted file mode 100644
index 8cc346ee7..000000000
--- a/lib/libc/arch/powerpc64/gen/fpgetround.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: fpgetround.c,v 1.2 2008/04/28 20:22:57 martin Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.2 2008/04/28 20:22:57 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetround,_fpgetround)
-#endif
-
-#define	ROUNDBITS	FPSCR_RN
-#define	ROUNDSHFT	0
-
-fp_rnd
-fpgetround(void)
-{
-	uint64_t fpscr;
-
-	__asm volatile("mffs %0" : "=f"(fpscr));
-	return (((uint32_t)fpscr & ROUNDBITS) >> ROUNDSHFT);
-}
diff --git a/lib/libc/arch/powerpc64/gen/fpgetsticky.c b/lib/libc/arch/powerpc64/gen/fpgetsticky.c
deleted file mode 100644
index f46aa8387..000000000
--- a/lib/libc/arch/powerpc64/gen/fpgetsticky.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: fpgetsticky.c,v 1.2 2008/04/28 20:22:57 martin Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetsticky.c,v 1.2 2008/04/28 20:22:57 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-#define	STICKYBITS	(FPSCR_XX|FPSCR_ZX|FPSCR_UX|FPSCR_OX|FPSCR_VX)
-#define	STICKYSHFT	25
-
-fp_except
-fpgetsticky(void)
-{
-	uint64_t fpscr;
-
-	__asm volatile("mffs %0" : "=f"(fpscr));
-	return (((uint32_t)fpscr & STICKYBITS) >> STICKYSHFT);
-}
diff --git a/lib/libc/arch/powerpc64/gen/fpsetmask.c b/lib/libc/arch/powerpc64/gen/fpsetmask.c
deleted file mode 100644
index 0ede2542b..000000000
--- a/lib/libc/arch/powerpc64/gen/fpsetmask.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: fpsetmask.c,v 1.2 2008/04/28 20:22:57 martin Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetmask.c,v 1.2 2008/04/28 20:22:57 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetmask,_fpsetmask)
-#endif
-
-#define	MASKBITS	(FPSCR_XE|FPSCR_ZE|FPSCR_UE|FPSCR_OE|FPSCR_VE)
-#define	MASKSHFT	3
-
-fp_except
-fpsetmask(fp_except mask)
-{
-	uint64_t fpscr;
-	fp_except old;
-
-	__asm volatile("mffs %0" : "=f"(fpscr));
-	old = ((uint32_t)fpscr & MASKBITS) >> MASKSHFT;
-	fpscr &= ~MASKBITS;
-	fpscr |= ((uint32_t)mask << MASKSHFT) & MASKBITS;
-	__asm volatile("mtfsf 0xff,%0" :: "f"(fpscr));
-	return (old);
-}
diff --git a/lib/libc/arch/powerpc64/gen/fpsetround.c b/lib/libc/arch/powerpc64/gen/fpsetround.c
deleted file mode 100644
index 90fe8297a..000000000
--- a/lib/libc/arch/powerpc64/gen/fpsetround.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: fpsetround.c,v 1.2 2008/04/28 20:22:57 martin Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.2 2008/04/28 20:22:57 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetround,_fpsetround)
-#endif
-
-#define	ROUNDBITS	FPSCR_RN
-
-fp_rnd
-fpsetround(fp_rnd rnd_dir)
-{
-	uint64_t fpscr;
-	fp_rnd old;
-
-	__asm volatile("mffs %0" : "=f"(fpscr));
-	old = (uint32_t)fpscr & ROUNDBITS;
-	fpscr &= ~ROUNDBITS;
-	fpscr |= rnd_dir & ROUNDBITS;
-	__asm volatile("mtfsf 0xff,%0" :: "f"(fpscr));
-	return (old);
-}
diff --git a/lib/libc/arch/powerpc64/gen/fpsetsticky.c b/lib/libc/arch/powerpc64/gen/fpsetsticky.c
deleted file mode 100644
index 30e1bd855..000000000
--- a/lib/libc/arch/powerpc64/gen/fpsetsticky.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*	$NetBSD: fpsetsticky.c,v 1.2 2008/04/28 20:22:57 martin Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetsticky.c,v 1.2 2008/04/28 20:22:57 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <powerpc/fpu.h>
-
-#define	STICKYBITS	(FPSCR_XX|FPSCR_ZX|FPSCR_UX|FPSCR_OX|FPSCR_VX)
-#define	INVBITS		(FPSCR_VXCVI|FPSCR_VXSQRT|FPSCR_VXSOFT|FPSCR_VXVC|\
-			 FPSCR_VXIMZ|FPSCR_VXZDZ|FPSCR_VXIDI|FPSCR_VXISI|\
-			 FPSCR_VXSNAN)
-#define	STICKYSHFT	25
-
-#ifdef __weak_alias
-__weak_alias(fpsetsticky,_fpsetsticky)
-#endif
-
-fp_except
-fpsetsticky(fp_except mask)
-{
-	uint64_t fpscr;
-	fp_except old;
-
-	__asm volatile("mffs %0" : "=f"(fpscr));
-	old = ((uint32_t)fpscr & STICKYBITS) >> STICKYSHFT;
-	/*
-	 * FPSCR_VX (aka FP_X_INV) is not a sticky bit but a summary of the
-	 * all the FPSCR_VX* sticky bits.  So when FP_X_INV is cleared then
-	 * clear all of those bits, likewise when it's set, set them all.
-	 */
-	if ((mask & FP_X_INV) == 0)
-		fpscr &= ~INVBITS;
-	else 
-		fpscr |= INVBITS;
-	fpscr &= ~STICKYBITS;
-	fpscr |= ((uint32_t)mask << STICKYSHFT) & STICKYBITS;
-	/*
-	 * Make FPSCR_FX reflect the presence of a set sticky bit (or not).
-	 */
-	if (fpscr & (STICKYBITS|INVBITS))
-		fpscr |= FPSCR_FX;
-	else
-		fpscr &= ~FPSCR_FX;
-	/*
-	 * Write back the fpscr.
-	 */
-	__asm volatile("mtfsf 0xff,%0" :: "f"(fpscr));
-	return (old);
-}
diff --git a/lib/libc/arch/powerpc64/gen/makecontext.c b/lib/libc/arch/powerpc64/gen/makecontext.c
deleted file mode 100644
index fbfe1ecdd..000000000
--- a/lib/libc/arch/powerpc64/gen/makecontext.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.3 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.3 2008/04/28 20:22:57 martin Exp $");
-#endif
-
-#include <inttypes.h>
-#include <stddef.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	__greg_t sp, *spp;
-	int i;
-	va_list ap;
-
-	sp  = (__greg_t) ((uintptr_t)ucp->uc_stack.ss_sp
-	    + ucp->uc_stack.ss_size);
-	sp -= 2 + (argc > 8 ? argc - 8: 0); /* Make room for call frame. */
-	sp  = (__greg_t) ((uintptr_t)sp & ~0xf);
-
-	/*
-	 * Start executing at <func> -- when <func> completes, return to
-	 * <_resumecontext>.
-	 */
-	gr[_REG_R1]  = sp;
-	gr[_REG_LR] = (__greg_t)_resumecontext;
-	gr[_REG_PC] = (__greg_t)func; // XXX -- this is the descriptor address!
-
-	/* Wipe out stack frame backchain pointer. */
-	spp = (__greg_t *)sp;
-	*spp = 0;
-
-	/* Construct argument list. */
-	va_start(ap, argc);
-	/* Up to the first eight arguments are passed in r3-10. */
-	for (i = 0; i < argc && i < 8; i++)
-		gr[_REG_R3 + i] = va_arg(ap, long);
-	/* Pass remaining arguments on the stack above the backchain/lr gap. */
-	for (spp += 2; i < argc; i++)
-		*spp++ = va_arg(ap, long);
-	va_end(ap);
-}
diff --git a/lib/libc/arch/powerpc64/gen/nanf.c b/lib/libc/arch/powerpc64/gen/nanf.c
deleted file mode 100644
index 5007de780..000000000
--- a/lib/libc/arch/powerpc64/gen/nanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: nanf.c,v 1.2 2009/02/22 01:34:02 martin Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.2 2009/02/22 01:34:02 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-		{ { 0x7f, 0xc0,    0,    0 } };
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/powerpc64/gen/resumecontext.c b/lib/libc/arch/powerpc64/gen/resumecontext.c
deleted file mode 100644
index f604739da..000000000
--- a/lib/libc/arch/powerpc64/gen/resumecontext.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: resumecontext.c,v 1.4 2011/09/19 21:24:58 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: resumecontext.c,v 1.4 2011/09/19 21:24:58 joerg Exp $");
-#endif
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <ucontext.h>
-#include <unistd.h>
-#include "extern.h"
-
-void
-_resumecontext(void)
-{
-	ucontext_t uct;
-
-	(void)getcontext(&uct);
-	if (uct.uc_link == NULL) 
-		exit(0);
-	(void)setcontext(uct.uc_link);
-	_exit(-1);
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/powerpc64/gen/swapcontext.S b/lib/libc/arch/powerpc64/gen/swapcontext.S
deleted file mode 100644
index 1bf7c797e..000000000
--- a/lib/libc/arch/powerpc64/gen/swapcontext.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.5 2014/08/13 15:41:21 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	.asciz "$NetBSD: swapcontext.S,v 1.5 2014/08/13 15:41:21 joerg Exp $"
-#endif /* LIBC_SCCS && !lint */
-
-ENTRY(swapcontext)
-	mc_off	= 56				# offset of uc_mcontext
-	stdu	%r1,-SF_SZ(%r1)			# set up new stack frame
-	mflr	%r0
-	std	%r0,(SF_SZ+SF_LR)(%r1)		# save link register
-	std	%r3,SF_PARAM(%r1)		# must save oucp (was 8)
-	std	%r4,SF_PARAM+8(%r1)		# must save ucp (was 12)
-	bl	._getcontext			# getcontext(oucp)
-	nop
-	cmpdi	%r3,0
-	bne	1f
-	ld	%r11,SF_PARAM(%r1)		# load oucp for adjustment
-	ld	%r0,SF_SZ+SF_LR(%r1)		# get LR back
-	std	%r0,mc_off+34*8(%r11)	# 	pc <- lr
-	la	%r0,16(%r1)
-	std	%r0,mc_off+1*8(%r11)		# adjust sp
-	ld	%r3,SF_PARAM+8(%r1)		# load ucp
-	bl	PIC_PLT(_C_LABEL(setcontext))	# setcontext(ucp)
-	nop
-1:
-	ld	%r0,SF_SZ+SF_LR(%r1)
-	mtlr	%r0
-	la	%r1,SF_SZ(%r1)
-	blr
diff --git a/lib/libc/arch/powerpc64/gen/syncicache.c b/lib/libc/arch/powerpc64/gen/syncicache.c
deleted file mode 100644
index 3a3b220ee..000000000
--- a/lib/libc/arch/powerpc64/gen/syncicache.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*	$NetBSD: syncicache.c,v 1.2 2012/11/24 07:16:04 christos Exp $	*/
-
-/*
- * Copyright (C) 1995-1997, 1999 Wolfgang Solfrank.
- * Copyright (C) 1995-1997, 1999 TooLs GmbH.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/param.h>
-#if	defined(_KERNEL) || defined(_STANDALONE)
-#include <sys/time.h>
-#include <sys/proc.h>
-#include <uvm/uvm_extern.h>
-#endif
-#include <sys/sysctl.h>
-
-#include <machine/cpu.h>
-
-
-#if defined(_STANDALONE)
-#ifndef	CACHELINESIZE
-#error "Must know the size of a cache line"
-#endif
-static struct cache_info _cache_info = {
-	CACHELINESIZE,
-	CACHELINESIZE,
-	CACHELINESIZE,
-	CACHELINESIZE
-};
-#define CACHEINFO	_cache_info
-#elif defined(_KERNEL)
-#define	CACHEINFO	(curcpu()->ci_ci)
-#else
-#include <stdlib.h>
-
-size_t __getcachelinesize (void);
-
-static int _cachelinesize = 0;
-
-static struct cache_info _cache_info;
-#define CACHEINFO	_cache_info
-
-size_t
-__getcachelinesize(void)
-{
-	static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE };
-	static int cacheinfomib[] = { CTL_MACHDEP, CPU_CACHEINFO };
-	size_t clen = sizeof(_cache_info);
-
-	if (_cachelinesize)
-		return _cachelinesize;
-
-	if (sysctl(cacheinfomib, (u_int)__arraycount(cacheinfomib),
-	    &_cache_info, &clen, NULL, 0) == 0) {
-		_cachelinesize = _cache_info.dcache_line_size;
-		return _cachelinesize;
-	}
-
-	/* Try older deprecated sysctl */
-	clen = sizeof(_cachelinesize);
-	if (sysctl(cachemib, (u_int)__arraycount(cachemib),
-	    &_cachelinesize, &clen, NULL, 0) < 0 || !_cachelinesize)
-		abort();
-
-	_cache_info.dcache_size = _cachelinesize;
-	_cache_info.dcache_line_size = _cachelinesize;
-	_cache_info.icache_size = _cachelinesize;
-	_cache_info.icache_line_size = _cachelinesize;
-
-	/* If there is no cache, indicate we have issued the sysctl. */
-	if (!_cachelinesize)
-		_cachelinesize = 1;
-
-	return _cachelinesize;
-}
-#endif
-
-void
-__syncicache(void *from, size_t len)
-{
-	size_t l, off;
-	size_t linesz;
-	char *p;
-
-#if	!defined(_KERNEL) && !defined(_STANDALONE)
-	if (!_cachelinesize)
-		__getcachelinesize();
-#endif	
-
-	if (CACHEINFO.dcache_size > 0) {
-		linesz = CACHEINFO.dcache_line_size;
-		off = (uintptr_t)from & (linesz - 1);
-		l = (len + off + linesz - 1) & ~(linesz - 1);
-		p = (char *)from - off;
-		do {
-			__asm volatile ("dcbst 0,%0" :: "r"(p));
-			p += linesz;
-		} while ((l -= linesz) != 0);
-	}
-	__asm volatile ("sync");
-
-	if (CACHEINFO.icache_size > 0 ) {
-		linesz = CACHEINFO.icache_line_size;
-		off = (uintptr_t)from & (linesz - 1);
-		l = (len + off + linesz - 1) & ~(linesz - 1);
-		p = (char *)from - off;
-		do {
-			__asm volatile ("icbi 0,%0" :: "r"(p));
-			p += linesz;
-		} while ((l -= linesz) != 0);
-	}
-	__asm volatile ("sync; isync");
-}
diff --git a/lib/libc/arch/powerpc64/genassym.cf b/lib/libc/arch/powerpc64/genassym.cf
deleted file mode 100644
index 86ba53855..000000000
--- a/lib/libc/arch/powerpc64/genassym.cf
+++ /dev/null
@@ -1,45 +0,0 @@
-#	$NetBSD: genassym.cf,v 1.1 2014/08/23 02:24:22 matt Exp $
-
-#
-# Copyright (c) 2001 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Matt Thomas <matt@3am-sfotware.com>.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-include <sys/types.h>
-include <sys/queue.h>
-include <sys/cpu.h>
-include <sys/signal.h>
-include <sys/ucontext.h>
-
-include <machine/frame.h>
-
-define UC_GREGS_R1	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_R1])
-define UC_GREGS_R3	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_R3])
-define UC_GREGS_PC	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_PC])
-
-define SIG_BLOCK	SIG_BLOCK
-define SIG_SETMASK	SIG_SETMASK
diff --git a/lib/libc/arch/powerpc64/net/Makefile.inc b/lib/libc/arch/powerpc64/net/Makefile.inc
deleted file mode 100644
index 74baf8322..000000000
--- a/lib/libc/arch/powerpc64/net/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/07/01 16:37:20 ross Exp $
-
-SRCS+=	htonl.c htons.c ntohl.c ntohs.c
diff --git a/lib/libc/arch/powerpc64/stdlib/Makefile.inc b/lib/libc/arch/powerpc64/stdlib/Makefile.inc
deleted file mode 100644
index f12f78d35..000000000
--- a/lib/libc/arch/powerpc64/stdlib/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2009/07/31 20:40:00 dsl Exp $
diff --git a/lib/libc/arch/powerpc64/string/Makefile.inc b/lib/libc/arch/powerpc64/string/Makefile.inc
deleted file mode 100644
index b724ef5f9..000000000
--- a/lib/libc/arch/powerpc64/string/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.6 2009/08/11 17:30:43 dsl Exp $
-
-SRCS+=	bzero.S ffs.S strlen.S
-NO_SRCS+= memset.S
diff --git a/lib/libc/arch/powerpc64/string/bzero.S b/lib/libc/arch/powerpc64/string/bzero.S
deleted file mode 100644
index 096725fdf..000000000
--- a/lib/libc/arch/powerpc64/string/bzero.S
+++ /dev/null
@@ -1,100 +0,0 @@
-/*	$NetBSD: bzero.S,v 1.4 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Ross Harvey.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT,  INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,  OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY,  OR TORT (INCLUDING 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>
-
-	.file	"bzero.c"
-ENTRY(bzero)
-	mr	5, 4		# translate to memcpy signature
-	li	4, 0		# add missing memcpy param
-ENTRY(memset)
-	cmpldi	7, 5, 7		# only optimize if len >= 8
-	mr	9, 3
-	ble	7, 2f
-	rldicl.	0, 3, 0, 61	# only optimize if aligned
-	beq	0, 4f
-2:
-	cmpdi	7, 5, 0	
-	beqlr	7
-3:
-	mtctr	5
-	rldicl	0, 4, 0, 56
-	.p2align 4,, 15
-2:
-	stb	0, 0(9)		# byte-at-a-time loop
-	addi	9, 9, 1
-	bdnz	2b
-	blr			# done
-4:
-	rldicl	4, 4, 0, 56	# construct parallel store
-	cmpldi	7, 5, 31
-	mr	10, 3
-	sldi	0, 4, 8
-	or	0, 0, 4
-	sldi	9, 0, 16
-	or	0, 0, 9
-	sldi	11, 0, 32
-	or	0, 0, 11
-	ble	7, 5f
-	addi	9, 5, -32
-	srdi	9, 9, 5
-	addi	9, 9, 1
-	mtctr	9
-	.p2align 4,, 15
-2:
-	std	0, 0(10)	# 8-way + unrolled store loop
-	std	0, 8(10)
-	addi	5, 5, -32	# schedule count decrement
-	std	0, 16(10)
-	std	0, 24(10)
-	addi	10, 10, 32
-	bdnz	2b
-	cmpldi	7, 5, 7
-	ble	7, 8f
-5:
-	addi	9, 5, -8
-	srdi	9, 9, 3
-	addi	9, 9, 1
-	mtctr	9
-	.p2align 4,, 15
-14:
-	std	0, 0(10)	# 8-way not-unrolled loop
-	addi	5, 5, -8
-	addi	10, 10, 8
-	bdnz	14b
-8:
-	cmpdi	7, 5, 0
-	mr	9, 10
-	bne	7, 3b
-	blr
-	.long	0
-	.byte	0, 0, 0, 0, 0, 0, 0, 0
-	.size	.memset, .-.memset
diff --git a/lib/libc/arch/powerpc64/sys/Makefile.inc b/lib/libc/arch/powerpc64/sys/Makefile.inc
deleted file mode 100644
index 7d5f09434..000000000
--- a/lib/libc/arch/powerpc64/sys/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/07/07 06:40:45 ross Exp $
-
-SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
diff --git a/lib/libc/arch/powerpc64/sys/__clone.S b/lib/libc/arch/powerpc64/sys/__clone.S
deleted file mode 100644
index 552aaae64..000000000
--- a/lib/libc/arch/powerpc64/sys/__clone.S
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: __clone.S,v 1.2 2014/08/23 02:24:22 matt Exp $	*/
-
-/*-
- * Copyright (c) 2001 Tsubai Masanari.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(clone, __clone)
-#endif
-
-/*
- * int __clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-ENTRY(__clone)
-	/*
-	 * Sanity checks: func and stack may not be NULL.
-	 */
-	cmpptri	%r3,0
-	beq	1f
-	cmpptri	%r4,0
-	beq	1f
-
-	mr	%r7,%r3		/* Save fn in r7. */
-	mr	%r3,%r5
-	_DOSYSCALL(__clone)	/* (flags, stack) */
-	bso	2f		/* error... */
-
-	cmpptri	%r3,0
-	bnelr			/* We're the parent, just return. */
-
-	mtlr	%r7		/* fn */
-	mr	%r3,%r6		/* arg */
-	blrl			/* Call the clone's entry point. */
-
-	bl	PIC_PLT(_C_LABEL(_exit))
-	nop
-
-1:
-	li	%r3,EINVAL
-2:
-	BRANCH_TO_CERROR()
-END(__clone)
diff --git a/lib/libc/arch/powerpc64/sys/__sigaction14_sigtramp.c b/lib/libc/arch/powerpc64/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index 092c2bc27..000000000
--- a/lib/libc/arch/powerpc64/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.2 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.2 2008/04/28 20:22:57 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-#ifdef __LIBC12_SOURCE__
-extern const int __sigtramp_sigcontext_1[]
-    __weak_reference(__sigtramp_sigcontext_1);
-#endif
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern const int __sigtramp_siginfo_2[];
-
-	/*
-	 * If no sigaction, use the "default" trampoline since it won't
-	 * be used.
-	 */
-	if (act == NULL)
-		return  __sigaction_sigtramp(sig, act, oact, NULL, 0);
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the non-SA_SIGINFO trampoline if SA_SIGINFO is not
-	 * set in the sigaction.
-	 */
-	if ((act->sa_flags & SA_SIGINFO) == 0) {
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-		    __sigtramp_sigcontext_1, 1);
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	/*
-	 * If SA_SIGINFO was specificed or the compatibility trampolines
-	 * can't be used, use the siginfo trampoline.
-	 */
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/powerpc64/sys/__sigtramp2.S b/lib/libc/arch/powerpc64/sys/__sigtramp2.S
deleted file mode 100644
index cf57c1bd3..000000000
--- a/lib/libc/arch/powerpc64/sys/__sigtramp2.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.4 2014/08/23 02:24:22 matt Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-/*
- * On entry to user space, stack and registers look like:
- *
- *	r3	signal number
- *	r4	pointer to siginfo structure
- *	r5	pointer to ucontext structure
- *	r30	pointer to ucontext structure
- *	srr0	address of handler
- *	lr	address of this trampoline
- *
- */
-ENTRY_NOPROFILE(__sigtramp_siginfo_2)
-	mr	%r3,%r30		/* restore ucontext pointer */
-	_DOSYSCALL(setcontext)		/* restore machine state */
-	_DOSYSCALL(exit)		/* or exit with errno if failed */
-END(__sigtramp_siginfo_2)
diff --git a/lib/libc/arch/powerpc64/sys/__syscall.S b/lib/libc/arch/powerpc64/sys/__syscall.S
deleted file mode 100644
index b2a58da86..000000000
--- a/lib/libc/arch/powerpc64/sys/__syscall.S
+++ /dev/null
@@ -1,22 +0,0 @@
-/*	$NetBSD: __syscall.S,v 1.2 2014/08/23 02:24:22 matt Exp $	*/
-
-#include "SYS.h"
-
-	.text
-	.p2align 2
-ENTRY(__syscall)
-	mr	%r0,%r3		/* syscall number */
-	mr	%r3,%r4
-	mr	%r4,%r5
-	mr	%r5,%r6
-	mr	%r6,%r7
-	mr	%r7,%r8
-	mr	%r8,%r9
-	mr	%r9,%r10
-	ldreg	%r10,(2*__SIZEOF_POINTER__)(%r1) /* final argument is on the stack */
-	sc
-	bnslr
-	BRANCH_TO_CERROR()
-END(__syscall)
-
-STRONG_ALIAS(syscall, __syscall)
diff --git a/lib/libc/arch/powerpc64/sys/__vfork14.S b/lib/libc/arch/powerpc64/sys/__vfork14.S
deleted file mode 100644
index 605cafe10..000000000
--- a/lib/libc/arch/powerpc64/sys/__vfork14.S
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	$NetBSD: __vfork14.S,v 1.2 2014/08/23 02:24:22 matt Exp $	*/
-
-/*
- * pid = vfork();
- *
- * r4 == 0 in parent process, 1 in child process.
- * r3 == pid of child in parent, pid of parent in child.
- */
-
-#include "SYS.h"
-
-SYSCALL(__vfork14)
-	addi	%r4,%r4,-1	# from 1 to 0 in child, 0 to -1 in parent
-	and	%r3,%r3,%r4	# return 0 in child, pid in parent
-	blr
-END(__vfork14)
diff --git a/lib/libc/arch/powerpc64/sys/brk.S b/lib/libc/arch/powerpc64/sys/brk.S
deleted file mode 100644
index eff339d4b..000000000
--- a/lib/libc/arch/powerpc64/sys/brk.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: brk.S,v 1.5 2014/08/23 02:24:22 matt Exp $	*/
-
-#include "SYS.h"
-
-
-	.hidden	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(__curbrk)
-	.hidden	_C_LABEL(__minbrk)
-	.globl	_C_LABEL(__minbrk)
-	.globl	_C_LABEL(_end)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
-#endif
-
-	.data
-	.p2align 3
-_C_LABEL(__minbrk):
-	.quad	_C_LABEL(_end)
-_C_LABEL(__curbrk):
-	.quad	_C_LABEL(_end)
-
-ENTRY(_brk)
-	addis	%r9,%r2,_C_LABEL(__minbrk)@toc@ha
-	ldptru	%r5,_C_LABEL(__minbrk)@toc@l(%r9)
-	cmpptrl	%r5,%r3			# if (__minbrk <= r3)
-#ifdef __PPC_ISEL__
-	iselgt	%r3,%r5,%r3
-#else
-	bgt	0f
-	mr	%r5,%r3			# r5 = r3
-0:
-	mr	%r3,%r5			# new break value
-#endif
-	_DOSYSCALL(break)		# assume that r5 is preserved
-	bso	1f
-	stptr	%r5,__SIZEOF_POINTER__(%r9)
-	blr				# return 0
-
-1:
-	BRANCH_TO_CERROR()
-END(_brk)
diff --git a/lib/libc/arch/powerpc64/sys/cerror.S b/lib/libc/arch/powerpc64/sys/cerror.S
deleted file mode 100644
index 25940a154..000000000
--- a/lib/libc/arch/powerpc64/sys/cerror.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.7 2015/01/12 02:48:20 dennis Exp $	*/
-
-/* Now inlined in the syscall stubs.  Keep code for a while for mind changes. */
-
-#if 0
-#include <machine/asm.h>
-#include "SYS.h"
-
-#ifndef _REENTRANT
-	.globl	_C_LABEL(errno)
-#endif
-#ifdef __PIC__
-	.protected _C_LABEL(__cerror)
-#endif
-
-ENTRY(__cerror)
-#ifdef _REENTRANT
-	mflr	%r0
-	streg	%r0,SF_LR(%r1)
-	streg	%r31,-8(%r1)
-	stptru	%r1,-(SF_SZ+16)(%r1)	# allocate new stack frame
-	mr	%r31,%r3		# stash away in callee-saved register
-	bl	PIC_PLT(_C_LABEL(__errno))
-	nop
-	stint	%r31,0(%r3)
-
-	addi	%r1,%r1,(SF_SZ+16)
-	ldreg	%r31,-8(%r1)
-	ldreg	%r0,SF_LR(%r1)
-	mtlr	%r0
-#else
-	lwz	%r4,_C_LABEL(errno)@got(%r2)
-	stw	%r3,0(%r4)
-#endif /* _REENTRANT */
-	li	%r3,-1
-	li	%r4,-1
-	blr
-END(__cerror)
-#endif	/* 0 */
diff --git a/lib/libc/arch/powerpc64/sys/exect.S b/lib/libc/arch/powerpc64/sys/exect.S
deleted file mode 100644
index 197230950..000000000
--- a/lib/libc/arch/powerpc64/sys/exect.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: exect.S,v 1.1 2006/07/01 16:37:20 ross Exp $	*/
-
-#include "SYS.h"
-
-PSEUDO(exect,execve)
diff --git a/lib/libc/arch/powerpc64/sys/fork.S b/lib/libc/arch/powerpc64/sys/fork.S
deleted file mode 100644
index 7aec22035..000000000
--- a/lib/libc/arch/powerpc64/sys/fork.S
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	$NetBSD: fork.S,v 1.2 2014/08/23 02:24:22 matt Exp $	*/
-
-/*
- * pid = fork();
- *
- * r4 == 0 in parent process, 1 in child process.
- * r3 == pid of child in parent, pid of parent in child.
- */
-
-#include "SYS.h"
-
-_SYSCALL(__fork,fork)
-	addi	%r4,%r4,-1	# from 1 to 0 in child, 0 to -1 in parent
-	and	%r3,%r3,%r4	# return 0 in child, pid in parent
-	blr
-END(__fork)
diff --git a/lib/libc/arch/powerpc64/sys/getcontext.S b/lib/libc/arch/powerpc64/sys/getcontext.S
deleted file mode 100644
index 3cb1e323d..000000000
--- a/lib/libc/arch/powerpc64/sys/getcontext.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.5 2014/08/23 02:24:22 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getcontext.S,v 1.5 2014/08/23 02:24:22 matt Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext, _getcontext)
-#endif
-
-ENTRY(_getcontext)
-	mr	%r5,%r3				# must save pointer
-	_DOSYSCALL(getcontext)
-	bso	1f
-	mflr	%r4
-	stptr	%r4,UC_GREGS_PC(%r5)		# saved pc <- lr
-	stint	%r3,UC_GREGS_R3(%r5)		# arrange for return value 0
-	blr
-1:
-	BRANCH_TO_CERROR()
-END(_getcontext)
diff --git a/lib/libc/arch/powerpc64/sys/pipe.S b/lib/libc/arch/powerpc64/sys/pipe.S
deleted file mode 100644
index 2f66db9c6..000000000
--- a/lib/libc/arch/powerpc64/sys/pipe.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.2 2014/08/23 02:24:22 matt Exp $	*/
-
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-#endif
-
-ENTRY(_pipe)
-	mr	%r5,%r3		# save pointer
-	_DOSYSCALL(pipe)	# assume, that r5 is kept
-	bso	1f
-	stint	%r3,0(%r5)	# success, store fds
-	stint	%r4,4(%r5)
-	li	%r3,0
-	blr			# and return 0
-1:
-	BRANCH_TO_CERROR()
-END(_pipe)
diff --git a/lib/libc/arch/powerpc64/sys/ptrace.S b/lib/libc/arch/powerpc64/sys/ptrace.S
deleted file mode 100644
index 582f153a9..000000000
--- a/lib/libc/arch/powerpc64/sys/ptrace.S
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.3 2014/08/23 02:24:22 matt Exp $	*/
-
-#include "SYS.h"
-
-ENTRY(ptrace)
-#ifdef _REENTRANT
-	mflr	%r0
-	streg	%r0,SZREG(%r1)
-	stregu	%r1,-(SZREG*6)(%r1)
-	streg	%r3,(SZREG*2)(%r1)
-	streg	%r4,(SZREG*3)(%r1)
-	streg	%r5,(SZREG*4)(%r1)
-	streg	%r6,(SZREG*5)(%r1)
-
-	bl	PIC_PLT(_C_LABEL(__errno))
-	nop
-	li	%r7,0
-	stint	%r7,0(%r3)
-
-	ldreg	%r3,(SZREG*2)(%r1)
-	ldreg	%r4,(SZREG*3)(%r1)
-	ldreg	%r5,(SZREG*4)(%r1)
-	ldreg	%r6,(SZREG*5)(%r1)
-	addi	%r1,%r1,SZREG*6
-	ldreg	%r0,SZREG(%r1)
-	mtlr	%r0
-#else
-	.pushsection ".toc","aw"
-.Lerrno:
-	.tc	errno[TC], errno
-	.popsection
-	addis	%r7,%r2,_C_LABEL(errno)@toc@ha
-	ldptr	%r7,_C_LABEL(errno)@toc@l(%r7)
-	li	%r8,0
-	stint	%r8,0(%r7)
-	mtlr	0
-#endif /* _REENTRANT */
-	_DOSYSCALL(ptrace)
-	bso	1f
-	blr
-1:
-	BRANCH_TO_CERROR()
-END(ptrace)
diff --git a/lib/libc/arch/powerpc64/sys/sbrk.S b/lib/libc/arch/powerpc64/sys/sbrk.S
deleted file mode 100644
index 541eb7ce3..000000000
--- a/lib/libc/arch/powerpc64/sys/sbrk.S
+++ /dev/null
@@ -1,24 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.5 2014/08/23 02:24:22 matt Exp $	*/
-
-#include "SYS.h"
-
-	.hidden	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(__curbrk)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-ENTRY(_sbrk)
-	addis	%r8,%r2,_C_LABEL(__curbrk)@toc@ha
-	ldptru	%r6,_C_LABEL(__curbrk)@toc@l(%r8)
-	add	%r3,%r3,%r6
-	mr	%r7,%r3				# r7 = new break
-	_DOSYSCALL(break)			# break(new_break)
-	bso	1f
-	mr	%r3,%r6				# set return value
-	stptr	%r7,0(%r8)			# record new break
-	blr
-1:
-	BRANCH_TO_CERROR()
-END(_sbrk)
diff --git a/lib/libc/arch/powerpc64/sys/shmat.S b/lib/libc/arch/powerpc64/sys/shmat.S
deleted file mode 100644
index 92f9beccc..000000000
--- a/lib/libc/arch/powerpc64/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2006/07/01 16:37:20 ross Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/powerpc64/sys/syscall.S b/lib/libc/arch/powerpc64/sys/syscall.S
deleted file mode 100644
index 6624d8b39..000000000
--- a/lib/libc/arch/powerpc64/sys/syscall.S
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.2 2014/08/23 02:24:22 matt Exp $	*/
-
-/* aliased to __syscall */
diff --git a/lib/libc/arch/riscv/Makefile.inc b/lib/libc/arch/riscv/Makefile.inc
deleted file mode 100644
index 43edc8aa1..000000000
--- a/lib/libc/arch/riscv/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2014/09/19 17:36:25 matt Exp $
-
-SRCS+=		__sigaction14_sigtramp.c __sigtramp2.S
-
-CPPFLAGS+=	-I.
-
-.if ${MKSOFTFLOAT} != "no"
-.include <softfloat/Makefile.inc>
-.endif
diff --git a/lib/libc/arch/riscv/SYS.h b/lib/libc/arch/riscv/SYS.h
deleted file mode 100644
index dacded557..000000000
--- a/lib/libc/arch/riscv/SYS.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.2 2015/03/27 06:44:28 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/syscall.h>
-#include <machine/asm.h>
-
-#define SYSTRAP(x)		li	t6,SYS_ ## x; scall
-#define	JUMP_TO_CERROR()	j	_C_LABEL(__cerror)
-
-/*
- * Do a syscall that cannot fail (sync, get{p,u,g,eu,eg)id)
- */
-#define RSYSCALL_NOERROR(x)						\
-	PSEUDO_NOERROR(x,x)
-
-/*
- * Do a normal syscall.
- */
-#define RSYSCALL(x)							\
-	PSEUDO(x,x)
-
-/*
- * Do a syscall that has an internal name and a weak external alias.
- */
-#define	WSYSCALL(weak,strong)						\
-	WEAK_ALIAS(weak,strong)						;\
-	PSEUDO(strong,weak)
-
-/*
- * Do a renamed or pseudo syscall (e.g., _exit()), where the entrypoint
- * and syscall name are not the same.
- */
-#define PSEUDO_NOERROR(x,y)						\
-ENTRY(x);								;\
-	SYSTRAP(y)							;\
-	ret	/* error */						;\
-	ret	/* success */						;\
-	END(x)
-
-#define PSEUDO(x,y)							\
-ENTRY(x);								;\
-	SYSTRAP(y)							;\
-	JUMP_TO_CERROR()	/* error */				;\
-	ret			/* success */				;\
-	END(x)
diff --git a/lib/libc/arch/riscv/gdtoa/Makefile.inc b/lib/libc/arch/riscv/gdtoa/Makefile.inc
deleted file mode 100644
index d88c421e9..000000000
--- a/lib/libc/arch/riscv/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2014/09/19 17:36:25 matt Exp $
-
-SRCS+=	strtof.c
diff --git a/lib/libc/arch/riscv/gdtoa/arith.h b/lib/libc/arch/riscv/gdtoa/arith.h
deleted file mode 100644
index 0b455d6c6..000000000
--- a/lib/libc/arch/riscv/gdtoa/arith.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2014/09/19 17:36:25 matt Exp $ */
-
-#define IEEE_LITTLE_ENDIAN
diff --git a/lib/libc/arch/riscv/gdtoa/gd_qnan.h b/lib/libc/arch/riscv/gdtoa/gd_qnan.h
deleted file mode 100644
index 8ced8a42d..000000000
--- a/lib/libc/arch/riscv/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2014/09/19 17:36:25 matt Exp $ */
-
-#define f_QNAN 0x7fe00000
-#define d_QNAN0 0x0
-#define d_QNAN1 0x7ffc0000
diff --git a/lib/libc/arch/riscv/gen/Makefile.inc b/lib/libc/arch/riscv/gen/Makefile.inc
deleted file mode 100644
index fd329858c..000000000
--- a/lib/libc/arch/riscv/gen/Makefile.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2014/09/19 17:36:25 matt Exp $
-
-SRCS+=	__setjmp14.S __sigsetjmp14.S _setjmp.S
-SRCS+=	bswap16.c bswap32.c bswap64.c
-SRCS+=	flt_rounds.c
-SRCS+=  _lwp.c makecontext.c resumecontext.c swapcontext.S
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c infinityl_dbl_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
-SRCS+=	fabs_ieee754.c
-
-SRCS+=	nanf.c
-
-.if (${MKSOFTFLOAT} == "no")
-SRCS+=	fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c
-SRCS+=	fpgetsticky.c fpsetsticky.c
-.endif
-
-CPPFLAGS._lwp.c	+= -D_LIBC_SOURCE
-
-LSRCS.powerpc.gen=Lint_swapcontext.c
-LSRCS+=		${LSRCS.powerpc.gen}
-DPSRCS+=	${LSRCS.powerpc.gen}
-CLEANFILES+=	${LSRCS.powerpc.gen}
diff --git a/lib/libc/arch/riscv/gen/__setjmp14.S b/lib/libc/arch/riscv/gen/__setjmp14.S
deleted file mode 100644
index 802a953ae..000000000
--- a/lib/libc/arch/riscv/gen/__setjmp14.S
+++ /dev/null
@@ -1,107 +0,0 @@
-/*	$NetBSD: __setjmp14.S,v 1.2 2015/03/27 06:44:28 matt Exp $	*/
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __setjmp14.S,v 1.2 2015/03/27 06:44:28 matt Exp $")
-#endif
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *	setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is restored.
- */
-
-ENTRY(__setjmp14)
-	li	a1, 1
-	REG_S	a1, JB_MAGIC(a0)	/* indicate sigmask */
-	REG_S	ra, JB_RA(a0)		/* save return address */
-	REG_S	sp, JB_SP(a0)		/* save stack pointer */
-	REG_S	gp, JB_GP(a0)		/* save global pointer */
-	REG_S	tp, JB_TP(a0)		/* save thread pointer */
-	REG_S	s0, JB_S0(a0)		/* save callee saved register */
-	REG_S	s1, JB_S1(a0)		/* save callee saved register */
-	REG_S	s2, JB_S2(a0)		/* save callee saved register */
-	REG_S	s3, JB_S3(a0)		/* save callee saved register */
-	REG_S	s4, JB_S4(a0)		/* save callee saved register */
-	REG_S	s5, JB_S5(a0)		/* save callee saved register */
-	REG_S	s6, JB_S6(a0)		/* save callee saved register */
-	REG_S	s7, JB_S7(a0)		/* save callee saved register */
-	REG_S	s8, JB_S8(a0)		/* save callee saved register */
-	REG_S	s9, JB_S9(a0)		/* save callee saved register */
-	REG_S	s10, JB_S10(a0)		/* save callee saved register */
-	REG_S	s11, JB_S11(a0)		/* save callee saved register */
-#ifndef _SOFT_FLOAT
-	frcsr	t2			/* get FSCR */
-	REG_S	t2, JB_FCSR(a0)		/* save it */
-	fsd	fs0, JB_FS0(a0)		/* save callee saved register */
-	fsd	fs1, JB_FS1(a0)		/* save callee saved register */
-	fsd	fs2, JB_FS2(a0)		/* save callee saved register */
-	fsd	fs3, JB_FS3(a0)		/* save callee saved register */
-	fsd	fs4, JB_FS4(a0)		/* save callee saved register */
-	fsd	fs5, JB_FS5(a0)		/* save callee saved register */
-	fsd	fs6, JB_FS6(a0)		/* save callee saved register */
-	fsd	fs7, JB_FS7(a0)		/* save callee saved register */
-	fsd	fs8, JB_FS8(a0)		/* save callee saved register */
-	fsd	fs9, JB_FS9(a0)		/* save callee saved register */
-	fsd	fs10, JB_FS10(a0)	/* save callee saved register */
-	fsd	fs11, JB_FS11(a0)	/* save callee saved register */
-#endif
-
-	addi	a2, a0, JB_SIGMASK	/* &sigmask */
-	li	a1, 0
-	li	a0, SIG_BLOCK
-	SYSTRAP(__sigprocmask14)	/* assume no error */
-	li	a0, 0	/* success */	/* indicate success */
-	ret		/* error */	/* return */
-END(__setjmp14)
-
-ENTRY(__longjmp14)
-	REG_L	ra, JB_RA(a0)		/* restore return address */
-	REG_L	sp, JB_SP(a0)		/* restore stack pointer */
-	REG_L	gp, JB_GP(a0)		/* restore global pointer */
-	#REG_L	tp, JB_TP(a0)		/* restore thread pointer */
-	REG_L	s0, JB_S0(a0)		/* restore callee saved register */
-	REG_L	s1, JB_S1(a0)		/* restore callee saved register */
-	REG_L	s2, JB_S2(a0)		/* restore callee saved register */
-	REG_L	s3, JB_S3(a0)		/* restore callee saved register */
-	REG_L	s4, JB_S4(a0)		/* restore callee saved register */
-	REG_L	s5, JB_S5(a0)		/* restore callee saved register */
-	REG_L	s6, JB_S6(a0)		/* restore callee saved register */
-	REG_L	s7, JB_S7(a0)		/* restore callee saved register */
-	REG_L	s8, JB_S8(a0)		/* restore callee saved register */
-	REG_L	s9, JB_S9(a0)		/* restore callee saved register */
-	REG_L	s10, JB_S10(a0)		/* restore callee saved register */
-	REG_L	s11, JB_S11(a0)		/* restore callee saved register */
-#ifndef _SOFT_FLOAT
-	REG_L	t2, JB_FCSR(a0)		/* get it */
-	fscsr	t2			/* restore FSCR */
-	fld	fs0, JB_FS0(a0)		/* restore callee saved register */
-	fld	fs1, JB_FS1(a0)		/* restore callee saved register */
-	fld	fs2, JB_FS2(a0)		/* restore callee saved register */
-	fld	fs3, JB_FS3(a0)		/* restore callee saved register */
-	fld	fs4, JB_FS4(a0)		/* restore callee saved register */
-	fld	fs5, JB_FS5(a0)		/* restore callee saved register */
-	fld	fs6, JB_FS6(a0)		/* restore callee saved register */
-	fld	fs7, JB_FS7(a0)		/* restore callee saved register */
-	fld	fs8, JB_FS8(a0)		/* restore callee saved register */
-	fld	fs9, JB_FS9(a0)		/* restore callee saved register */
-	fld	fs10, JB_FS10(a0)	/* restore callee saved register */
-	fld	fs11, JB_FS11(a0)	/* restore callee saved register */
-#endif
-	move	t1, a1			/* save return value */
-	li	a2, 0
-	addi	a1, a0, JB_SIGMASK	/* &sigmask */
-	li	a0, SIG_SETMASK
-	SYSTRAP(__sigprocmask14)	/* assume no error */
-	nop		/* error */
-	li	a0, 1	/* success */	/* default return value */
-	beqz	t1, 1f			/* test return value */
-	move	a0, t1			/* use it if not 0 */
-1:	ret
-END(__longjmp14)
diff --git a/lib/libc/arch/riscv/gen/__sigsetjmp14.S b/lib/libc/arch/riscv/gen/__sigsetjmp14.S
deleted file mode 100644
index 4365ac696..000000000
--- a/lib/libc/arch/riscv/gen/__sigsetjmp14.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/*	$NetBSD: __sigsetjmp14.S,v 1.2 2015/03/27 23:23:14 matt Exp $	*/
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __sigsetjmp14.S,v 1.2 2015/03/27 23:23:14 matt Exp $")
-#endif
-
-ENTRY(__sigsetjmp14)
-	bnez	a1, 1f
-	tail	PLT(_C_LABEL(_setjmp))
-1:	tail	PLT(_C_LABEL(__setjmp14))
-END(__sigsetjmp14)
-
-ENTRY(__siglongjmp14)
-	REG_L	a2, JB_MAGIC(a0)
-	bnez	a2, 1f
-	tail	PLT(_C_LABEL(_longjmp))
-1:	tail	PLT(_C_LABEL(__longjmp14))
-END(__siglongjmp14)
diff --git a/lib/libc/arch/riscv/gen/_lwp.c b/lib/libc/arch/riscv/gen/_lwp.c
deleted file mode 100644
index 63c8ab6e7..000000000
--- a/lib/libc/arch/riscv/gen/_lwp.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/*
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Allen Briggs for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.1 2014/09/19 17:36:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *), void *arg,
-	void *tcb, caddr_t stack_base, size_t stack_size)
-{
-	uintptr_t sp;
-
-	getcontext(u);
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-	sp = (uintptr_t)stack_base + stack_size;
-	sp -= STACK_ALIGNBYTES + 1;
-	sp &= ~STACK_ALIGNBYTES;
-
-	u->uc_mcontext.__gregs[_REG_RV] = (uintptr_t)arg;	/* arg1 */
-	u->uc_mcontext.__gregs[_REG_SP] = (uintptr_t)sp;	/* stack */
-	u->uc_mcontext.__gregs[_REG_RA] = (uintptr_t)_lwp_exit;	/* RA */
-	u->uc_mcontext.__gregs[_REG_PC] = (uintptr_t)start;	/* PC */
-	u->uc_mcontext.__gregs[_REG_TP] =
-	    (uintptr_t)tcb + TLS_TP_OFFSET + sizeof(struct tls_tcb);
-}
diff --git a/lib/libc/arch/riscv/gen/_setjmp.S b/lib/libc/arch/riscv/gen/_setjmp.S
deleted file mode 100644
index 6d430c52f..000000000
--- a/lib/libc/arch/riscv/gen/_setjmp.S
+++ /dev/null
@@ -1,124 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.2 2015/03/27 06:44:28 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-#include "assym.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: _setjmp.S,v 1.2 2015/03/27 06:44:28 matt Exp $")
-#endif
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	_longjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *	_setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	REG_S	zero, JB_MAGIC(a0)	/* indicate no sigmask */
-	REG_S	ra, JB_RA(a0)		/* save return address */
-	REG_S	sp, JB_SP(a0)		/* save stack pointer */
-	REG_S	gp, JB_GP(a0)		/* save global pointer */
-	REG_S	tp, JB_TP(a0)		/* save thread pointer */
-	REG_S	s0, JB_S0(a0)		/* save callee saved register */
-	REG_S	s1, JB_S1(a0)		/* save callee saved register */
-	REG_S	s2, JB_S2(a0)		/* save callee saved register */
-	REG_S	s3, JB_S3(a0)		/* save callee saved register */
-	REG_S	s4, JB_S4(a0)		/* save callee saved register */
-	REG_S	s5, JB_S5(a0)		/* save callee saved register */
-	REG_S	s6, JB_S6(a0)		/* save callee saved register */
-	REG_S	s7, JB_S7(a0)		/* save callee saved register */
-	REG_S	s8, JB_S8(a0)		/* save callee saved register */
-	REG_S	s9, JB_S9(a0)		/* save callee saved register */
-	REG_S	s10, JB_S10(a0)		/* save callee saved register */
-	REG_S	s11, JB_S11(a0)		/* save callee saved register */
-#ifndef _SOFT_FLOAT
-	frcsr	t2			/* get FSCR */
-	REG_S	t2, JB_FCSR(a0)		/* save it */
-	fsd	fs0, JB_FS0(a0)		/* save callee saved register */
-	fsd	fs1, JB_FS1(a0)		/* save callee saved register */
-	fsd	fs2, JB_FS2(a0)		/* save callee saved register */
-	fsd	fs3, JB_FS3(a0)		/* save callee saved register */
-	fsd	fs4, JB_FS4(a0)		/* save callee saved register */
-	fsd	fs5, JB_FS5(a0)		/* save callee saved register */
-	fsd	fs6, JB_FS6(a0)		/* save callee saved register */
-	fsd	fs7, JB_FS7(a0)		/* save callee saved register */
-	fsd	fs8, JB_FS8(a0)		/* save callee saved register */
-	fsd	fs9, JB_FS9(a0)		/* save callee saved register */
-	fsd	fs10, JB_FS10(a0)	/* save callee saved register */
-	fsd	fs11, JB_FS11(a0)	/* save callee saved register */
-#endif
-	li	a0, 0			/* indicate success */
-	ret				/* return */
-END(_setjmp)
-
-ENTRY(_longjmp)
-	REG_L	ra, JB_RA(a0)		/* save return address */
-	REG_L	sp, JB_SP(a0)		/* save stack pointer */
-	REG_L	gp, JB_GP(a0)		/* save global pointer */
-	#REG_L	tp, JB_TP(a0)		/* save thread pointer */
-	REG_L	s0, JB_S0(a0)		/* save callee saved register */
-	REG_L	s1, JB_S1(a0)		/* save callee saved register */
-	REG_L	s2, JB_S2(a0)		/* save callee saved register */
-	REG_L	s3, JB_S3(a0)		/* save callee saved register */
-	REG_L	s4, JB_S4(a0)		/* save callee saved register */
-	REG_L	s5, JB_S5(a0)		/* save callee saved register */
-	REG_L	s6, JB_S6(a0)		/* save callee saved register */
-	REG_L	s7, JB_S7(a0)		/* save callee saved register */
-	REG_L	s8, JB_S8(a0)		/* save callee saved register */
-	REG_L	s9, JB_S9(a0)		/* save callee saved register */
-	REG_L	s10, JB_S10(a0)		/* save callee saved register */
-	REG_L	s11, JB_S11(a0)		/* save callee saved register */
-#ifndef _SOFT_FLOAT
-	REG_L	t2, JB_FCSR(a0)		/* get it */
-	fscsr	t2			/* restore FSCR */
-	fld	fs0, JB_FS0(a0)		/* restore callee saved register */
-	fld	fs1, JB_FS1(a0)		/* restore callee saved register */
-	fld	fs2, JB_FS2(a0)		/* restore callee saved register */
-	fld	fs3, JB_FS3(a0)		/* restore callee saved register */
-	fld	fs4, JB_FS4(a0)		/* restore callee saved register */
-	fld	fs5, JB_FS5(a0)		/* restore callee saved register */
-	fld	fs6, JB_FS6(a0)		/* restore callee saved register */
-	fld	fs7, JB_FS7(a0)		/* restore callee saved register */
-	fld	fs8, JB_FS8(a0)		/* restore callee saved register */
-	fld	fs9, JB_FS9(a0)		/* restore callee saved register */
-	fld	fs10, JB_FS10(a0)	/* restore callee saved register */
-	fld	fs11, JB_FS11(a0)	/* restore callee saved register */
-#endif
-	li	a0, 1			/* default return value */
-	beqz	a1, 1f			/* test return value */
-	move	a0, a1			/* use it if not 0 */
-1:	ret
-END(_longjmp)
diff --git a/lib/libc/arch/riscv/gen/flt_rounds.c b/lib/libc/arch/riscv/gen/flt_rounds.c
deleted file mode 100644
index a337f4192..000000000
--- a/lib/libc/arch/riscv/gen/flt_rounds.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: flt_rounds.c,v 1.2 2015/03/19 21:22:59 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.2 2015/03/19 21:22:59 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <ieeefp.h>
-#include <float.h>
-#include <stdint.h>
-#include <machine/ieeefp.h>
-
-static const int rounding_map =
-	  (1 << (FP_RN * 2))	/* round to nearest */
-	| (0 << (FP_RZ * 2))	/* round to zero */
-	| (2 << (FP_RP * 2))	/* round to positive infinity */
-	| (3 << (FP_RM * 2));	/* round to negative infinity */
-
-int
-__flt_rounds(void)
-{
-	return (rounding_map >> (fpgetround() * 2)) & 3;
-}
diff --git a/lib/libc/arch/riscv/gen/fpgetmask.c b/lib/libc/arch/riscv/gen/fpgetmask.c
deleted file mode 100644
index 790d6f22c..000000000
--- a/lib/libc/arch/riscv/gen/fpgetmask.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: fpgetmask.c,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetmask.c,v 1.1 2014/09/19 17:36:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <riscv/sysreg.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetmask,_fpgetmask)
-#endif
-
-fp_except
-fpgetmask(void)
-{
-#if FCSR_FMASK == 0
-	return 0;
-#else
-	return __SHIFTOUT(riscvreg_fcsr_read(), FCSR_FMASK);
-#endif
-}
diff --git a/lib/libc/arch/riscv/gen/fpgetround.c b/lib/libc/arch/riscv/gen/fpgetround.c
deleted file mode 100644
index 2a98db5d8..000000000
--- a/lib/libc/arch/riscv/gen/fpgetround.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: fpgetround.c,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.1 2014/09/19 17:36:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <riscv/sysreg.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetround,_fpgetround)
-#endif
-
-fp_rnd
-fpgetround(void)
-{
-	return __SHIFTOUT(riscvreg_fcsr_read(), FCSR_FRM);
-}
diff --git a/lib/libc/arch/riscv/gen/fpgetsticky.c b/lib/libc/arch/riscv/gen/fpgetsticky.c
deleted file mode 100644
index 017a669d5..000000000
--- a/lib/libc/arch/riscv/gen/fpgetsticky.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: fpgetsticky.c,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetsticky.c,v 1.1 2014/09/19 17:36:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <riscv/sysreg.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-fp_except
-fpgetsticky(void)
-{
-	return __SHIFTOUT(riscvreg_fcsr_read(), FCSR_FFLAGS);
-}
diff --git a/lib/libc/arch/riscv/gen/fpsetmask.c b/lib/libc/arch/riscv/gen/fpsetmask.c
deleted file mode 100644
index f348665e1..000000000
--- a/lib/libc/arch/riscv/gen/fpsetmask.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: fpsetmask.c,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetmask.c,v 1.1 2014/09/19 17:36:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <riscv/sysreg.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetmask,_fpsetmask)
-#endif
-
-fp_except
-fpsetmask(fp_except mask)
-{
-#if 0
-	return __SHIFTOUT(riscvreg_fcsr_write_fmask(__SHIFTIN(mask, FCSR_MASK)), FCSR_FMASK);
-#else
-	return 0;
-#endif
-}
diff --git a/lib/libc/arch/riscv/gen/fpsetround.c b/lib/libc/arch/riscv/gen/fpsetround.c
deleted file mode 100644
index 4d4bf8b59..000000000
--- a/lib/libc/arch/riscv/gen/fpsetround.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: fpsetround.c,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.1 2014/09/19 17:36:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <riscv/sysreg.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetround,_fpsetround)
-#endif
-
-fp_rnd
-fpsetround(fp_rnd rnd_dir)
-{
-	return __SHIFTOUT(riscvreg_fcsr_write_frm(__SHIFTIN(rnd_dir, FCSR_FRM)), FCSR_FRM);
-}
diff --git a/lib/libc/arch/riscv/gen/fpsetsticky.c b/lib/libc/arch/riscv/gen/fpsetsticky.c
deleted file mode 100644
index bef211416..000000000
--- a/lib/libc/arch/riscv/gen/fpsetsticky.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: fpsetsticky.c,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetsticky.c,v 1.1 2014/09/19 17:36:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-#include <riscv/sysreg.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetsticky,_fpsetsticky)
-#endif
-
-fp_except
-fpsetsticky(fp_except mask)
-{
-	return __SHIFTOUT(riscvreg_fcsr_write_fflags(__SHIFTIN(mask, FCSR_FFLAGS)), FCSR_FFLAGS);
-}
diff --git a/lib/libc/arch/riscv/gen/makecontext.c b/lib/libc/arch/riscv/gen/makecontext.c
deleted file mode 100644
index ac1529abb..000000000
--- a/lib/libc/arch/riscv/gen/makecontext.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.1 2014/09/19 17:36:25 matt Exp $");
-#endif
-
-#include <inttypes.h>
-#include <stddef.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	long *sp;
-	int i;
-	va_list ap;
-
-	/* LINTED uintptr_t is safe */
-	sp  = (long *)
-	    ((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
-	/* LINTED uintptr_t is safe */
-	sp -= 1 + (argc > 8 ? argc - 8: 0); /* Make room for call frame. */
-	sp  = (long *) ((uintptr_t)sp & -16L); /* Align on 16byte boundary. */
-
-	/*
-	 * Start executing at <func> -- when <func> completes, return to
-	 * <_resumecontext>.
-	 */
-	gr[_REG_SP] = (uintptr_t)sp;
-	gr[_REG_RA] = (uintptr_t)_resumecontext;
-	gr[_REG_PC] = (uintptr_t)func;
-
-	/* Wipe out stack frame backchain pointer. */
-	*sp = 0;
-
-	/* Construct argument list. */
-	va_start(ap, argc);
-	/* Up to the first six arguments are passed in x18-x25 */
-	for (i = 0; i < argc && i < 8; i++)
-		gr[_REG_A0 + i] = va_arg(ap, int);
-	/* Pass remaining arguments on the stack above the backchain/lr gap. */
-	for (sp += 0; i < argc; i++)
-		*sp++ = va_arg(ap, long);
-	va_end(ap);
-}
diff --git a/lib/libc/arch/riscv/gen/nanf.c b/lib/libc/arch/riscv/gen/nanf.c
deleted file mode 100644
index 39b64f3cb..000000000
--- a/lib/libc/arch/riscv/gen/nanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: nanf.c,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.1 2014/09/19 17:36:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-		{ { 0x7f, 0xc0,    0,    0 } };
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/riscv/gen/resumecontext.c b/lib/libc/arch/riscv/gen/resumecontext.c
deleted file mode 100644
index 3b9fdd777..000000000
--- a/lib/libc/arch/riscv/gen/resumecontext.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: resumecontext.c,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: resumecontext.c,v 1.1 2014/09/19 17:36:25 matt Exp $");
-#endif
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <ucontext.h>
-#include <unistd.h>
-#include "extern.h"
-
-void
-_resumecontext(void)
-{
-	ucontext_t uct;
-
-	(void)getcontext(&uct);
-	if (uct.uc_link == NULL) 
-		exit(0);
-	(void)setcontext(uct.uc_link);
-	_exit(-1);
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/riscv/gen/swapcontext.S b/lib/libc/arch/riscv/gen/swapcontext.S
deleted file mode 100644
index 865116ff5..000000000
--- a/lib/libc/arch/riscv/gen/swapcontext.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.3 2015/03/27 23:23:14 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-__RCSID("$NetBSD: swapcontext.S,v 1.3 2015/03/27 23:23:14 matt Exp $")
-
-#define	CALLFRAME_UCP	CALLFRAME_S1
-#define	CALLFRAME_OUCP	CALLFRAME_S0
-
-ENTRY(swapcontext)
-	addi	sp, sp, -CALLFRAME_SIZ		# adjust stack
-	REG_S	ra, CALLFRAME_RA(sp)		# save return address
-	REG_S	a0, CALLFRAME_OUCP(sp)		# save oucp
-	REG_S	a1, CALLFRAME_UCP(sp)		# save ucp
-
-	call	PLT(_C_LABEL(_getcontext))	# getcontext(oucp)
-	mv	t0, a0				# save return value
-
-	REG_L	ra, CALLFRAME_RA(sp)		# restore return address
-	REG_L	a0, CALLFRAME_UCP(sp)		# load ucp
-	REG_L	a1, CALLFRAME_OUCP(sp)		# load oucp for adjustment
-	addi	sp, sp, CALLFRAME_SIZ		# restore stack
-
-	bnez	t0, 1f				# error? yes, cleanup
-
-	REG_S	ra, UC_GREGS_PC(a1)		# pc <- ra
-	REG_S	sp, UC_GREGS_SP(a1)		# adjust sp
-
-	tail	PLT(_C_LABEL(setcontext))	# setcontext(ucp)
-
-1:	ret					# simply return
-END(swapcontext)
diff --git a/lib/libc/arch/riscv/genassym.cf b/lib/libc/arch/riscv/genassym.cf
deleted file mode 100644
index 3e7df0925..000000000
--- a/lib/libc/arch/riscv/genassym.cf
+++ /dev/null
@@ -1,81 +0,0 @@
-#	$NetBSD: genassym.cf,v 1.2 2015/03/27 23:22:20 matt Exp $
-
-#
-# Copyright (c) 2001 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Matt Thomas <matt@3am-sfotware.com>.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-include <sys/types.h>
-include <sys/queue.h>
-include <sys/cpu.h>
-include <sys/signal.h>
-include <sys/ucontext.h>
-
-include <machine/setjmp.h>
-
-define UC_GREGS_SP	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_SP])
-define UC_GREGS_RV	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_RV])
-define UC_GREGS_PC	offsetof(ucontext_t, uc_mcontext.__gregs[_REG_PC])
-
-define SIG_BLOCK	SIG_BLOCK
-define SIG_SETMASK	SIG_SETMASK
-define SIGINFO_SIZE	(sizeof(siginfo_t) + __ALIGNBYTES) & ~__ALIGNBYTES
-
-define JBLEN		_JBLEN * sizeof(_BSD_JBSLOT_T_)
-define JB_MAGIC		_JB_MAGIC * sizeof(_BSD_JBSLOT_T_)
-define JB_RA		_JB_RA * sizeof(_BSD_JBSLOT_T_)
-define JB_S0		_JB_S0 * sizeof(_BSD_JBSLOT_T_)
-define JB_S1		_JB_S1 * sizeof(_BSD_JBSLOT_T_)
-define JB_S2		_JB_S2 * sizeof(_BSD_JBSLOT_T_)
-define JB_S3		_JB_S3 * sizeof(_BSD_JBSLOT_T_)
-define JB_S4		_JB_S4 * sizeof(_BSD_JBSLOT_T_)
-define JB_S5		_JB_S5 * sizeof(_BSD_JBSLOT_T_)
-define JB_S6		_JB_S6 * sizeof(_BSD_JBSLOT_T_)
-define JB_S7		_JB_S7 * sizeof(_BSD_JBSLOT_T_)
-define JB_S8		_JB_S8 * sizeof(_BSD_JBSLOT_T_)
-define JB_S9		_JB_S9 * sizeof(_BSD_JBSLOT_T_)
-define JB_S10		_JB_S10 * sizeof(_BSD_JBSLOT_T_)
-define JB_S11		_JB_S11 * sizeof(_BSD_JBSLOT_T_)
-define JB_SP		_JB_SP * sizeof(_BSD_JBSLOT_T_)
-define JB_TP		_JB_TP * sizeof(_BSD_JBSLOT_T_)
-define JB_GP		_JB_GP * sizeof(_BSD_JBSLOT_T_)
-define JB_FCSR		_JB_FCSR * sizeof(_BSD_JBSLOT_T_)
-
-define JB_FS0		_JB_FS0 * sizeof(_BSD_JBSLOT_T_)
-define JB_FS1		_JB_FS1 * sizeof(_BSD_JBSLOT_T_)
-define JB_FS2		_JB_FS2 * sizeof(_BSD_JBSLOT_T_)
-define JB_FS3		_JB_FS3 * sizeof(_BSD_JBSLOT_T_)
-define JB_FS4		_JB_FS4 * sizeof(_BSD_JBSLOT_T_)
-define JB_FS5		_JB_FS5 * sizeof(_BSD_JBSLOT_T_)
-define JB_FS6		_JB_FS6 * sizeof(_BSD_JBSLOT_T_)
-define JB_FS7		_JB_FS7 * sizeof(_BSD_JBSLOT_T_)
-define JB_FS8		_JB_FS8 * sizeof(_BSD_JBSLOT_T_)
-define JB_FS9		_JB_FS9 * sizeof(_BSD_JBSLOT_T_)
-define JB_FS10		_JB_FS10 * sizeof(_BSD_JBSLOT_T_)
-define JB_FS11		_JB_FS11 * sizeof(_BSD_JBSLOT_T_)
-
-define JB_SIGMASK	_JB_SIGMASK * sizeof(_BSD_JBSLOT_T_)
diff --git a/lib/libc/arch/riscv/net/Makefile.inc b/lib/libc/arch/riscv/net/Makefile.inc
deleted file mode 100644
index 3cb7a1a1c..000000000
--- a/lib/libc/arch/riscv/net/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/09/19 17:36:25 matt Exp $
diff --git a/lib/libc/arch/riscv/stdlib/Makefile.inc b/lib/libc/arch/riscv/stdlib/Makefile.inc
deleted file mode 100644
index 3cb7a1a1c..000000000
--- a/lib/libc/arch/riscv/stdlib/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/09/19 17:36:25 matt Exp $
diff --git a/lib/libc/arch/riscv/string/Makefile.inc b/lib/libc/arch/riscv/string/Makefile.inc
deleted file mode 100644
index 3cb7a1a1c..000000000
--- a/lib/libc/arch/riscv/string/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/09/19 17:36:25 matt Exp $
diff --git a/lib/libc/arch/riscv/strlib b/lib/libc/arch/riscv/strlib
deleted file mode 100644
index 65b84742a..000000000
--- a/lib/libc/arch/riscv/strlib
+++ /dev/null
@@ -1 +0,0 @@
-# $NetBSD: strlib,v 1.1 2014/09/19 17:36:25 matt Exp $
diff --git a/lib/libc/arch/riscv/sys/__clone.S b/lib/libc/arch/riscv/sys/__clone.S
deleted file mode 100644
index e987be19d..000000000
--- a/lib/libc/arch/riscv/sys/__clone.S
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$NetBSD: __clone.S,v 1.3 2015/03/27 23:23:14 matt Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __clone.S,v 1.3 2015/03/27 23:23:14 matt Exp $");
-#endif /* SYSLIBC_SCCS and not lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(clone, __clone)
-#endif
-
-/*
- * int __clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-ENTRY(__clone)
-	/*
-	 * Sanity checks: func and stack may not be NULL.
-	 */
-	mv	t0, a0			/* we need a0 for return value */
-	li	a0, EINVAL
-	beqz	t0, 8f
-	beqz	a1, 8f
-
-	/*
-	 * We need to be able to get at the func and arg arguments
-	 * in the child.  Luckily, we have a convenient place to
-	 * do this: the child's stack.
-	 */
-	addi	a1, a1, -CALLFRAME_SIZ
-	REG_S	t0, 0(a1)
-	REG_S	a3, SZREG(a1)
-
-	/*
-	 * The system call expects (flags, stack).
-	 */
-	mv	a0, a2
-	SYSTRAP(__clone)
-	# a1 (rv[1]) == 0, parent, child pid in a0
-8:	JUMP_TO_CERROR()	/* error */
-	bnez	a1, 9f		/* success */
-	ret			# parent return
-
-	/* NOTREACHED */
-
-9:	/*
-	 * Child: Fetch the function and argument from the new stack and create
-	 a frame so that the child can be safely called.
-	 *
-	 * There are already register slots on the stack from above.
-	 * They already include the o32 argument save area.  The
-	 * highest is unused.  a1 should equal sp now.
-	 */
-
-	REG_L		t0, 0(sp)
-	REG_L		a0, SZREG(sp)
-
-	REG_S		zero, CALLFRAME_RA(sp)	/* make sure stack frame ends */
-
-	/* Call the clone's entry point. */
-	jalr		t0
-
-	/* Pass the return value to _exit. */
-	tail		_C_LABEL(_exit)
-
-	/* NOTREACHED */
-END(__clone)
diff --git a/lib/libc/arch/riscv/sys/__sigaction14_sigtramp.c b/lib/libc/arch/riscv/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index 1929180a0..000000000
--- a/lib/libc/arch/riscv/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.1 2014/09/19 17:36:25 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern const int __sigtramp_siginfo_2[];
-
-	/*
-	 * If no sigaction, use the "default" trampoline since it won't
-	 * be used.
-	 */
-	if (act == NULL)
-		return  __sigaction_sigtramp(sig, act, oact, NULL, 0);
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the non-SA_SIGINFO trampoline if SA_SIGINFO is not
-	 * set in the sigaction.
-	 */
-	if ((act->sa_flags & SA_SIGINFO) == 0) {
-		extern const int __sigtramp_sigcontext_1[];
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-		    __sigtramp_sigcontext_1, 1);
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	/*
-	 * If SA_SIGINFO was specified or the compatibility trampolines
-	 * can't be used, use the siginfo trampoline.
-	 */
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/riscv/sys/__sigtramp2.S b/lib/libc/arch/riscv/sys/__sigtramp2.S
deleted file mode 100644
index b82df24de..000000000
--- a/lib/libc/arch/riscv/sys/__sigtramp2.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.2 2015/03/27 06:44:28 matt Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __sigtramp2.S,v 1.2 2015/03/27 06:44:28 matt Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-
-/*
- * The MIPS signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, stack looks like:
- *
- *	sp			->	siginfo_t structure
- *	sp + SIGINFO_SIZE	->	ucontext_t structure
- */
-ENTRY_NP(__sigtramp_siginfo_2)
-	addi		a0, sp, SIGINFO_SIZE	/* address of ucontext */
-	SYSTRAP(setcontext)			/* and do setcontext */
-	nop
-	SYSTRAP(exit)				/* if sigreturn fails */
-END(__sigtramp_siginfo_2)
diff --git a/lib/libc/arch/riscv/sys/__syscall.S b/lib/libc/arch/riscv/sys/__syscall.S
deleted file mode 100644
index bfb1aa108..000000000
--- a/lib/libc/arch/riscv/sys/__syscall.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*	$NetBSD: __syscall.S,v 1.2 2015/03/27 06:44:28 matt Exp $	*/
-
-#include "SYS.h"
-
-ENTRY(__syscall)
-	mv	t6, a0
-	mv	a0, a1
-	mv	a1, a2
-	mv	a2, a3
-	mv	a3, a4
-	mv	a4, a5
-	mv	a5, a6
-	mv	a6, a7
-	REG_L	a7, (sp)
-        SYSTRAP(__syscall)
-        JUMP_TO_CERROR()	/* error */
-        ret			/* success */
-END(__syscall)
-STRONG_ALIAS(syscall, __syscall)
diff --git a/lib/libc/arch/riscv/sys/__vfork14.S b/lib/libc/arch/riscv/sys/__vfork14.S
deleted file mode 100644
index b88122ac6..000000000
--- a/lib/libc/arch/riscv/sys/__vfork14.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: __vfork14.S,v 1.2 2015/03/27 06:44:28 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)Ovfork.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: __vfork14.S,v 1.2 2015/03/27 06:44:28 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * pid = vfork();
- *
- * a1 == 0 in parent process, a1 == 1 in child process.
- * a0 == pid of child in parent, a0 == pid of parent in child.
- */
-
-ENTRY(__vfork14)
-	SYSTRAP(__vfork14)
-	JUMP_TO_CERROR()		/* error */
-	addi	a1, a1, -1		/* success */
-	and	a0, a0, a1
-	ret
-END(__vfork14)
diff --git a/lib/libc/arch/riscv/sys/brk.S b/lib/libc/arch/riscv/sys/brk.S
deleted file mode 100644
index d57dd0327..000000000
--- a/lib/libc/arch/riscv/sys/brk.S
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: brk.S,v 1.4 2015/03/31 11:59:41 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: brk.S,v 1.4 2015/03/31 11:59:41 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-	.hidden	_C_LABEL(__minbrk)
-	.hidden	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(__minbrk)
-	.globl	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(_end)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
-#endif
-
-	.data
-	.p2align	PTR_SCALESHIFT
-_C_LABEL(__minbrk):
-	PTR_WORD	_C_LABEL(_end)
-_C_LABEL(__curbrk):
-	PTR_WORD	_C_LABEL(_end)
-
-	.text
-
-ENTRY(_brk)
-	lla	t1, _C_LABEL(__minbrk)
-	PTR_L	t5, 0(t1)
-	bgeu	a0, t5, 1f
-	move	a0, t5		# dont allow break < minbrk
-1:
-	SYSTRAP(break)
-	JUMP_TO_CERROR()				/* error */
-	PTR_S	a0, __SIZEOF_POINTER__(t1)		/* success */
-	move	a0, zero
-	ret
-END(_brk)
diff --git a/lib/libc/arch/riscv/sys/cerror.S b/lib/libc/arch/riscv/sys/cerror.S
deleted file mode 100644
index 498588de6..000000000
--- a/lib/libc/arch/riscv/sys/cerror.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.3 2015/03/27 23:23:14 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: cerror.S,v 1.3 2015/03/27 23:23:14 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-	.protected	_C_LABEL(__cerror)
-
-	.globl	_C_LABEL(__errno)
-ENTRY_NP(__cerror)
-#ifdef _REENTRANT
-	addi		sp, sp, -CALLFRAME_SIZ
-	REG_S		ra, CALLFRAME_RA(sp)	# save return address
-	INT_S		a0, CALLFRAME_S0(sp)	# save errno value
-
-	call		PLT(_C_LABEL(__errno))	# locate address of errno
-
-	INT_L		t0, CALLFRAME_S0(sp)	# retrieve errno value
-	REG_L		ra, CALLFRAME_RA(sp)	# retrieve return address
-	INT_S		t0, 0(a0)		# update errno value
-	addi		sp, sp, CALLFRAME_SIZ
-#else
-	aiupc		a1, %hi(_C_LABEL(errno))
-	INT_S		a0, %lo(_C_LABEL(errno))(a1)
-#endif /* _REENTRANT */
-	li		a0, -1
-	li		a1, -1
-	ret
-END(__cerror)
diff --git a/lib/libc/arch/riscv/sys/exect.S b/lib/libc/arch/riscv/sys/exect.S
deleted file mode 100644
index 89efc6d49..000000000
--- a/lib/libc/arch/riscv/sys/exect.S
+++ /dev/null
@@ -1,9 +0,0 @@
-/*	$NetBSD: exect.S,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: exect.S,v 1.1 2014/09/19 17:36:25 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-PSEUDO(exect, execve)
diff --git a/lib/libc/arch/riscv/sys/fork.S b/lib/libc/arch/riscv/sys/fork.S
deleted file mode 100644
index 0ad2e6bd0..000000000
--- a/lib/libc/arch/riscv/sys/fork.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*	$NetBSD: fork.S,v 1.2 2015/03/27 06:44:28 matt Exp $	*/
-
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: fork.S,v 1.2 2015/03/27 06:44:28 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-ENTRY(__fork)
-	SYSTRAP(fork)		// pid = fork()
-	JUMP_TO_CERROR()	/* error */
-	/* success */
-	addi	a1, a1, -1	// a1 0->0xffffffff in parent, 1->0 in child
-	and	a0, a0, a1	// a0 = child pid in parent, 0 in child
-	ret
-END(__fork)
diff --git a/lib/libc/arch/riscv/sys/getcontext.S b/lib/libc/arch/riscv/sys/getcontext.S
deleted file mode 100644
index 9dde23247..000000000
--- a/lib/libc/arch/riscv/sys/getcontext.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: getcontext.S,v 1.1 2014/09/19 17:36:25 matt Exp $")
-#endif /* SYSLIBC_SCCS && !lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext, _getcontext)
-#endif
-ENTRY(_getcontext)
-	SYSTRAP(getcontext)
-	JUMP_TO_CERROR()		/* error */
-	REG_S		zero, UC_GREGS_RV(a0) /* success */
-	REG_S		ra, UC_GREGS_PC(a0)
-	ret
-END(_getcontext)
diff --git a/lib/libc/arch/riscv/sys/pipe.S b/lib/libc/arch/riscv/sys/pipe.S
deleted file mode 100644
index 34daef12f..000000000
--- a/lib/libc/arch/riscv/sys/pipe.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.2 2015/03/27 06:44:28 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: pipe.S,v 1.2 2015/03/27 06:44:28 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-#endif
-
-ENTRY(_pipe)
-	mv		a2, a0		# a0 will be overwritten
-	SYSTRAP(pipe)	# pipe(fildes) int fildes[2];
-	JUMP_TO_CERROR()	/* error */
-	/* success */
-	sw		a0, 0(a2)	# store the two file descriptors
-	sw		a1, __SIZEOF_INT__(a2)
-	li		a0, 0
-	ret
-END(_pipe)
diff --git a/lib/libc/arch/riscv/sys/ptrace.S b/lib/libc/arch/riscv/sys/ptrace.S
deleted file mode 100644
index 48cfc19ff..000000000
--- a/lib/libc/arch/riscv/sys/ptrace.S
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.2 2015/03/27 06:44:28 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: ptrace.S,v 1.2 2015/03/27 06:44:28 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-#define	XCALLFRAME_SIZ	(8*SZREG)
-#define	XCALLFRAME_RA	(0*SZREG)
-#define	XCALLFRAME_A0	(1*SZREG)
-#define	XCALLFRAME_A1	(2*SZREG)
-#define	XCALLFRAME_A2	(3*SZREG)
-#define	XCALLFRAME_A3	(4*SZREG)
-
-ENTRY(ptrace)
-#ifdef _REENTRANT
-	addi	sp, sp, -XCALLFRAME_SIZ
-	REG_S	ra, XCALLFRAME_RA(sp)
-	REG_S	a0, XCALLFRAME_A0(sp)
-	REG_S	a1, XCALLFRAME_A1(sp)
-	REG_S	a2, XCALLFRAME_A2(sp)
-	REG_S	a3, XCALLFRAME_A3(sp)
-
-	call	PLT(_C_LABEL(__errno))
-
-	INT_S	zero, 0(a0)
-
-	REG_L	a3, XCALLFRAME_A3(sp)
-	REG_L	a2, XCALLFRAME_A2(sp)
-	REG_L	a1, XCALLFRAME_A1(sp)
-	REG_L	a0, XCALLFRAME_A0(sp)
-	REG_L	ra, XCALLFRAME_RA(sp)
-	addi	sp, sp, XCALLFRAME_SIZ
-
-#else
-	auipc	t0, %hi(_C_LABEL(errno))
-	INT_S	zero, %lo(_C_LABEL(errno))(t0)
-#endif
-
-	SYSTRAP(ptrace)
-	JUMP_TO_CERROR()	/* error */
-	ret			/* success */
-END(ptrace)
diff --git a/lib/libc/arch/riscv/sys/sbrk.S b/lib/libc/arch/riscv/sys/sbrk.S
deleted file mode 100644
index f8b19705c..000000000
--- a/lib/libc/arch/riscv/sys/sbrk.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.4 2015/03/31 11:59:41 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-	.hidden	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(__curbrk)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-ENTRY(_sbrk)
-	lla		t1, _C_LABEL(__curbrk)
-	PTR_L		t2, 0(t1)
-	add		a0, a0, t2	// compute current break
-	SYSTRAP(break)
-	JUMP_TO_CERROR()		/* error */
-	PTR_S		a0, 0(t1)	// save current val of curbrk from above
-	move		a0, t2		// return old val of curbrk from above
-	ret
-1:
-END(_sbrk)
diff --git a/lib/libc/arch/riscv/sys/shmat.S b/lib/libc/arch/riscv/sys/shmat.S
deleted file mode 100644
index c90475d0e..000000000
--- a/lib/libc/arch/riscv/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/riscv/sys/syscall.S b/lib/libc/arch/riscv/sys/syscall.S
deleted file mode 100644
index 4a40c7d66..000000000
--- a/lib/libc/arch/riscv/sys/syscall.S
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/* __syscall does it all */
diff --git a/lib/libc/arch/sh3/Makefile.inc b/lib/libc/arch/sh3/Makefile.inc
deleted file mode 100644
index e97ee9792..000000000
--- a/lib/libc/arch/sh3/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.6 2006/06/17 18:04:23 uwe Exp $
-
-SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
-
-CPPFLAGS+=      -DSOFTFLOAT # -DSOFTFLOAT_NEED_FIXUNS
-.include <softfloat/Makefile.inc>
diff --git a/lib/libc/arch/sh3/SYS.h b/lib/libc/arch/sh3/SYS.h
deleted file mode 100644
index 8bbb29843..000000000
--- a/lib/libc/arch/sh3/SYS.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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. 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: @(#)SYS.h	5.5 (Berkeley) 5/7/91
- *	$NetBSD: SYS.h,v 1.11 2013/09/12 15:36:15 joerg Exp $
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-
-#ifdef __STDC__
-#define	IMMEDIATE	#
-#define SYSTRAP(x)					\
-		mov.l	903f, r0;			\
-		trapa	IMMEDIATE 0x80;			\
-		bra	904f;				\
-		 nop;					\
-		.align	2;				\
-	903:	.long	(SYS_ ## x);			\
-	904:
-#else
-#define SYSTRAP(x)					\
-		mov.l	903f, r0;			\
-		trapa	#0x80;				\
-		bra	904f;				\
-		 nop;					\
-		.align	2;				\
-	903:	.long	(SYS_/**/x);			\
-	904:
-#endif
-
-#define _SYSCALL_NOERROR(x,y)				\
-		ENTRY(x);				\
-		SYSTRAP(y)
-
-#ifdef __PIC__
-
-#define JUMP_CERROR					\
-		mov	r0, r4;				\
-		mov.l	912f, r1;			\
-		mova	912f, r0;			\
-		mov.l	913f, r2;			\
-		add	r1, r0;				\
-		mov.l	@(r0, r2), r3;			\
-		jmp	@r3;				\
-		 nop;					\
-		.align	2;				\
-	912:	.long	_GLOBAL_OFFSET_TABLE_;		\
-	913:	.long	PIC_GOT(cerror)
-
-#else  /* !__PIC__ */
-
-#define JUMP_CERROR					\
-		mov.l	912f, r3;			\
-		jmp	@r3;				\
-		 mov	r0, r4;				\
-		.align	2;				\
-	912:	.long	cerror
-
-#endif /* !__PIC__ */
-
-#define _SYSCALL(x,y)					\
-		.text;					\
-	911:	JUMP_CERROR;				\
-		_SYSCALL_NOERROR(x,y);			\
-		bf	911b
-
-#define SYSCALL_NOERROR(x)				\
-		_SYSCALL_NOERROR(x,x)
-
-#define SYSCALL(x)					\
-		_SYSCALL(x,x)
-
-#define PSEUDO_NOERROR(x,y)				\
-		_SYSCALL_NOERROR(x,y);			\
-		rts;					\
-		 nop
-
-#define PSEUDO(x,y)					\
-		_SYSCALL(x,y);				\
-		rts;					\
-		 nop
-
-#define RSYSCALL_NOERROR(x)				\
-		PSEUDO_NOERROR(x,x)
-
-#define RSYSCALL(x)					\
-		PSEUDO(x,x)
-
-#ifdef WEAK_ALIAS
-#define	WSYSCALL(weak,strong)				\
-		WEAK_ALIAS(weak,strong);		\
-		PSEUDO(strong,weak)
-#else
-#define	WSYSCALL(weak,strong)				\
-		PSEUDO(weak,weak)
-#endif
-
-	.globl	cerror
diff --git a/lib/libc/arch/sh3/gdtoa/Makefile.inc b/lib/libc/arch/sh3/gdtoa/Makefile.inc
deleted file mode 100644
index 1d786e010..000000000
--- a/lib/libc/arch/sh3/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/03/15 17:35:18 kleink Exp $
-
-SRCS+=	strtof.c
diff --git a/lib/libc/arch/sh3/gdtoa/arith.h b/lib/libc/arch/sh3/gdtoa/arith.h
deleted file mode 100644
index 40d3ed1fa..000000000
--- a/lib/libc/arch/sh3/gdtoa/arith.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#include <machine/endian.h>
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define IEEE_BIG_ENDIAN
-#else
-#define IEEE_LITTLE_ENDIAN
-#endif
diff --git a/lib/libc/arch/sh3/gdtoa/gd_qnan.h b/lib/libc/arch/sh3/gdtoa/gd_qnan.h
deleted file mode 100644
index a7b54a203..000000000
--- a/lib/libc/arch/sh3/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#include <machine/endian.h>
-
-#define f_QNAN 0x7fa00000
-#if BYTE_ORDER == BIG_ENDIAN
-#define d_QNAN0 0x7ff40000
-#define d_QNAN1 0x0
-#else
-#define d_QNAN0 0x0
-#define d_QNAN1 0x7ff40000
-#endif
diff --git a/lib/libc/arch/sh3/gen/Makefile.inc b/lib/libc/arch/sh3/gen/Makefile.inc
deleted file mode 100644
index 0afd1d4d9..000000000
--- a/lib/libc/arch/sh3/gen/Makefile.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.26 2014/01/20 17:14:38 joerg Exp $
-
-SRCS+=	setjmp.S _setjmp.S sigsetjmp.S
-
-SRCS+=	makecontext.c resumecontext.c swapcontext.S
-
-SRCS+=	_lwp.c
-
-SRCS+=	fabs_ieee754.c flt_rounds.c bswap16.c bswap32.c bswap64.c
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c infinityl_dbl_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
-
-SRCS+=	nanf.c
-
-LSRCS.sh3.gen=	Lint__setjmp.c Lint___setjmp14.c Lint___sigsetjmp14.c \
-		Lint_swapcontext.c
-
-LSRCS+=		${LSRCS.sh3.gen}
-DPSRCS+=	${LSRCS.sh3.gen}
-CLEANFILES+=	${LSRCS.sh3.gen}
diff --git a/lib/libc/arch/sh3/gen/_lwp.c b/lib/libc/arch/sh3/gen/_lwp.c
deleted file mode 100644
index 3f40e331d..000000000
--- a/lib/libc/arch/sh3/gen/_lwp.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.6 2012/03/22 09:32:04 he Exp $	*/
-
-/*
- * Copyright (c) 2002 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project by
- *	Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.6 2012/03/22 09:32:04 he Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *),
-    void *arg, void *private, caddr_t stack_base, size_t stack_size)
-{
-	uintptr_t sp;
-
-	getcontext(u);
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-	sp = (uintptr_t)stack_base + stack_size;
-
-	u->uc_mcontext.__gregs[_REG_R4] = (__greg_t) arg;
-	u->uc_mcontext.__gregs[_REG_SP] = ((__greg_t) sp) & ~3;
-	u->uc_mcontext.__gregs[_REG_PR] = (__greg_t) _lwp_exit;
-	u->uc_mcontext.__gregs[_REG_PC] = (__greg_t) start;
-	u->uc_mcontext.__gregs[_REG_GBR] = (__greg_t) private;
-}
diff --git a/lib/libc/arch/sh3/gen/_setjmp.S b/lib/libc/arch/sh3/gen/_setjmp.S
deleted file mode 100644
index 81a022dc1..000000000
--- a/lib/libc/arch/sh3/gen/_setjmp.S
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.7 2006/01/05 02:04:41 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)_setjmp.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#include <machine/setjmp.h>
-
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: _setjmp.S,v 1.7 2006/01/05 02:04:41 uwe Exp $")
-#endif
-
-/*
- * 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.
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	add	#((_JB_HAS_MASK + 1) * 4), r4
-	mov	#0, r0
-	mov.l	r0, @-r4		/* no saved signal mask */
-	mov.l	r15, @-r4
-	mov.l	r14, @-r4
-	mov.l	r13, @-r4
-	mov.l	r12, @-r4
-	mov.l	r11, @-r4
-	mov.l	r10, @-r4
-	mov.l	r9, @-r4
-	mov.l	r8, @-r4
-	sts.l	pr, @-r4
-	rts
-	 xor	r0, r0
-	SET_ENTRY_SIZE(_setjmp)
-
-ENTRY(_longjmp)
-	lds.l	@r4+, pr
-	mov.l	@r4+, r8
-	mov.l	@r4+, r9
-	mov.l	@r4+, r10
-	mov.l	@r4+, r11
-	mov.l	@r4+, r12
-	mov.l	@r4+, r13
-	mov.l	@r4+, r14
-	mov.l	@r4+, r15
-
-	mov	r5, r0
-	tst	r0, r0
-	bf	.L0
-	add	#1, r0
-.L0:
-	rts
-	 nop
-	SET_ENTRY_SIZE(_longjmp)
diff --git a/lib/libc/arch/sh3/gen/flt_rounds.c b/lib/libc/arch/sh3/gen/flt_rounds.c
deleted file mode 100644
index 2fc27294c..000000000
--- a/lib/libc/arch/sh3/gen/flt_rounds.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: flt_rounds.c,v 1.6 2015/03/19 21:22:59 joerg Exp $	*/
-
-/*
- * Copyright (c) 1996 Mark Brinicombe
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Mark Brinicombe
- *	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 <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.6 2015/03/19 21:22:59 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ieeefp.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	2,	/* round to positive infinity */
-	3,	/* round to negative infinity */
-	0	/* round to zero */
-};
-
-/*
- * Return the current FP rounding mode
- *
- * Returns:
- *	0 - round to zero
- *	1 - round to nearest
- *	2 - round to postive infinity
- *	3 - round to negative infinity
- *
- * ok all we need to do is get the current FP rounding mode
- * index our map table and return the appropriate value.
- *
- * HOWEVER:
- * The ARM FPA codes the rounding mode into the actual FP instructions
- * so there is no such thing as a global rounding mode.
- * The default is round to nearest if rounding is not explicitly specified.
- * FP instructions generated by GCC will not explicitly specify a rounding
- * mode.
- *
- * So the best we can do it to return the rounding mode FP instructions
- * use if rounding is not specified which is round to nearest.
- *
- * This could change in the future with new floating point emulators or
- * soft float FP libraries.
- */
-
-extern int __flt_rounds __P((void));
-
-int
-__flt_rounds(void)
-{
-	return(map[fpgetround()]);
-}
diff --git a/lib/libc/arch/sh3/gen/makecontext.c b/lib/libc/arch/sh3/gen/makecontext.c
deleted file mode 100644
index 1c55e4500..000000000
--- a/lib/libc/arch/sh3/gen/makecontext.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.4 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.4 2008/04/28 20:22:57 martin Exp $");
-#endif
-
-#include <stddef.h>
-#include <inttypes.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#include <stdarg.h>
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	int i;
-	unsigned int *sp;
-	va_list ap;
-
-	/* Compute and align stack pointer. */
-	sp = (unsigned int *)
-	    (((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size) & ~3);
-	/* Allocate necessary stack space for arguments exceeding r4-7. */
-	if (argc > 4) 
-		sp -= argc - 4;
-	gr[_REG_SP] = (__greg_t)sp;
-	/* Arrange for return via the trampoline code. */
-	gr[_REG_PR] = (__greg_t)_resumecontext;
-	gr[_REG_PC] = (__greg_t)func; 
-
-	va_start(ap, argc);
-	/* Pass up to four arguments in r4-7. */
-	for (i = 0; i < argc && i < 4; i++)
-		gr[_REG_R4 - i] = va_arg(ap, int); /* sic!  see mcontext.h */
-	/* Pass any additional arguments on the stack. */
-	for (argc -= i; argc > 0; argc--)
-		*sp++ = va_arg(ap, int);
-	va_end(ap); 
-}
diff --git a/lib/libc/arch/sh3/gen/nanf.c b/lib/libc/arch/sh3/gen/nanf.c
deleted file mode 100644
index 6fbda2885..000000000
--- a/lib/libc/arch/sh3/gen/nanf.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*	$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:02 martin Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:02 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-#if BYTE_ORDER == BIG_ENDIAN
-		{ { 0x7f, 0xa0,    0,    0 } };
-#else
-		{ {    0,    0, 0xa0, 0x7f } };
-#endif
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/sh3/gen/resumecontext.c b/lib/libc/arch/sh3/gen/resumecontext.c
deleted file mode 100644
index 57d68fdf8..000000000
--- a/lib/libc/arch/sh3/gen/resumecontext.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:58 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:58 joerg Exp $");
-#endif
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <ucontext.h>
-#include <unistd.h>
-#include "extern.h"
-
-void
-_resumecontext(void)
-{
-	ucontext_t uct;
-
-	(void)getcontext(&uct);
-	if (uct.uc_link == NULL) 
-		exit(0);
-	(void)setcontext(uct.uc_link);
-	_exit(-1);
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/sh3/gen/setjmp.S b/lib/libc/arch/sh3/gen/setjmp.S
deleted file mode 100644
index 5ad5da2d5..000000000
--- a/lib/libc/arch/sh3/gen/setjmp.S
+++ /dev/null
@@ -1,130 +0,0 @@
-/*	$NetBSD: setjmp.S,v 1.10 2006/01/05 19:21:37 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)setjmp.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#include <machine/setjmp.h>
-
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: setjmp.S,v 1.10 2006/01/05 19:21:37 uwe Exp $")
-#endif
-
-/*
- * 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.
- * The previous signal state is restored.
- */
-
-ENTRY(__setjmp14)
-	PIC_PROLOGUE(.L_got_1)
-	sts.l	pr, @-sp
-	mov.l	r4, @-sp
-
-	mov.l	.L___sigprocmask14_1, r0
-	mov	r4, r6
-	mov	#1, r4			/* how = SIG_BLOCK */
-	mov	#0, r5			/* new = NULL */
-1:	CALL	r0
-	 add	#(_JB_SIGMASK * 4), r6	/* old = &sigmask */
-
-	mov.l	@sp+, r4
-	lds.l	@sp+, pr
-	PIC_EPILOGUE
-
-	/* identical to _setjmp except that _JB_HAS_MASK is non-zero */
-	add	#((_JB_HAS_MASK + 1) * 4), r4
-	mov	#1, r0
-	mov.l	r0, @-r4		/* has signal mask */
-	mov.l	r15, @-r4
-	mov.l	r14, @-r4
-	mov.l	r13, @-r4
-	mov.l	r12, @-r4
-	mov.l	r11, @-r4
-	mov.l	r10, @-r4
-	mov.l	r9, @-r4
-	mov.l	r8, @-r4
-	sts.l	pr, @-r4
-	rts
-	 xor	r0, r0
-
-	.align	2
-.L_got_1:		PIC_GOT_DATUM
-.L___sigprocmask14_1:	CALL_DATUM(_C_LABEL(__sigprocmask14), 1b)
-	SET_ENTRY_SIZE(__setjmp14)
-
-
-ENTRY(__longjmp14)
-	/* we won't return here, so we don't need to save pr and r12 */
-	PIC_PROLOGUE_NOSAVE(.L_got_2)
-	mov.l	r5, @-sp
-	mov.l	r4, @-sp
-
-	mov.l	.L___sigprocmask14_2, r0
-	mov	r4, r5
-	mov	#3, r4			/* how = SIG_SETMASK */
-	add	#(_JB_SIGMASK * 4), r5	/* new = &sigmask */
-1:	CALL	r0
-	 mov	#0, r6			/* old = NULL */
-
-	mov.l	@sp+, r4
-	mov.l	@sp+, r5
-
-	/* identical to _longjmp */
-	lds.l	@r4+, pr
-	mov.l	@r4+, r8
-	mov.l	@r4+, r9
-	mov.l	@r4+, r10
-	mov.l	@r4+, r11
-	mov.l	@r4+, r12
-	mov.l	@r4+, r13
-	mov.l	@r4+, r14
-	mov.l	@r4+, r15
-
-	mov	r5, r0
-	tst	r0, r0	/* make sure return value is non-zero */
-	bf	.L0
-	add	#1, r0
-.L0:
-	rts
-	 nop
-
-	.align	2
-.L_got_2:		PIC_GOT_DATUM
-.L___sigprocmask14_2:	CALL_DATUM(_C_LABEL(__sigprocmask14), 1b)
-	SET_ENTRY_SIZE(__longjmp14)
diff --git a/lib/libc/arch/sh3/gen/sigsetjmp.S b/lib/libc/arch/sh3/gen/sigsetjmp.S
deleted file mode 100644
index 2c7d7b15f..000000000
--- a/lib/libc/arch/sh3/gen/sigsetjmp.S
+++ /dev/null
@@ -1,130 +0,0 @@
-/*	$NetBSD: sigsetjmp.S,v 1.9 2006/01/05 19:21:37 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)setjmp.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#include <machine/setjmp.h>
-
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: sigsetjmp.S,v 1.9 2006/01/05 19:21:37 uwe Exp $")
-#endif
-
-ENTRY(__sigsetjmp14)
-	tst	r5, r5
-	bt	2f			/* if (savemask == 0) */
-
-	/* identical to longjmp except that _JB_HAS_MASK is in the argument */
-	PIC_PROLOGUE(.L_got_1)
-	sts.l	pr, @-sp
-	mov.l	r4, @-sp
-	mov.l	r5, @-sp
-
-	mov.l	.L___sigprocmask14_1, r0
-	mov	r4, r6
-	mov	#1, r4			/* how = SIG_BLOCK */
-	mov	#0, r5			/* new = NULL */
-1:	CALL	r0
-	 add	#(_JB_SIGMASK * 4), r6	/* old = &sigmask */
-
-	mov.l	@sp+, r5
-	mov.l	@sp+, r4
-	lds.l	@sp+, pr
-	PIC_EPILOGUE
-
-2:	/* identical to _setjmp except that _JB_HAS_MASK is in the argument */
-	add	#((_JB_HAS_MASK + 1) * 4), r4
-	mov.l	r5, @-r4		/* has signal mask? */
-	mov.l	r15, @-r4
-	mov.l	r14, @-r4
-	mov.l	r13, @-r4
-	mov.l	r12, @-r4
-	mov.l	r11, @-r4
-	mov.l	r10, @-r4
-	mov.l	r9, @-r4
-	mov.l	r8, @-r4
-	sts.l	pr, @-r4
-	rts
-	 xor	r0, r0
-
-	.align	2
-.L_got_1:		PIC_GOT_DATUM
-.L___sigprocmask14_1:	CALL_DATUM(_C_LABEL(__sigprocmask14), 1b)
-	SET_ENTRY_SIZE(__sigsetjmp14)
-
-
-ENTRY(__siglongjmp14)
-	mov.l	@(_JB_HAS_MASK * 4, r4), r0
-	tst	r0, r0
-	bt	2f			/* if no mask */
-
-	/* identical to longjmp */
-	/* we won't return here, so we don't need to save pr and r12 */
-	PIC_PROLOGUE_NOSAVE(.L_got_2)
-	mov.l	r5, @-sp
-	mov.l	r4, @-sp
-
-	mov.l	.L___sigprocmask14_2, r0
-	mov	r4, r5
-	mov	#3, r4			/* how = SIG_SETMASK */
-	add	#(_JB_SIGMASK * 4), r5	/* new = &sigmask */
-1:	CALL	r0
-	 mov	#0, r6			/* old = NULL */
-
-	mov.l	@sp+, r4
-	mov.l	@sp+, r5
-
-2:	/* identical to _longjmp */
-	lds.l	@r4+, pr
-	mov.l	@r4+, r8
-	mov.l	@r4+, r9
-	mov.l	@r4+, r10
-	mov.l	@r4+, r11
-	mov.l	@r4+, r12
-	mov.l	@r4+, r13
-	mov.l	@r4+, r14
-	mov.l	@r4+, r15
-
-	mov	r5, r0
-	tst	r0, r0	/* make sure return value is non-zero */
-	bf	.L0
-	add	#1, r0
-.L0:
-	rts
-	 nop
-
-	.align	2
-.L_got_2:		PIC_GOT_DATUM
-.L___sigprocmask14_2:	CALL_DATUM(_C_LABEL(__sigprocmask14), 1b)
-	SET_ENTRY_SIZE(__siglongjmp14)
diff --git a/lib/libc/arch/sh3/gen/swapcontext.S b/lib/libc/arch/sh3/gen/swapcontext.S
deleted file mode 100644
index 69eb82815..000000000
--- a/lib/libc/arch/sh3/gen/swapcontext.S
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.12 2015/04/06 01:50:46 uwe Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: swapcontext.S,v 1.12 2015/04/06 01:50:46 uwe Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-/*
- * int
- * swapcontext(ucontext_t * restrict oucp, ucontext_t * restrict ucp);
- */
-ENTRY(swapcontext)
-	PIC_PROLOGUE(.L_got)
-	sts.l	pr, @-sp
-
-	mov.l	.L__getcontext, r0
-	mov.l	r5, @-sp
-1:	CALL	r0			! _getcontext(oucp)
-	 mov.l	r4, @-sp
-	!! getcontext captures oucp resuming here with r12 (when PIC),
-	!! pr, r5 and r4 pushed onto the stack
-
-	tst	r0, r0
-	bf.s	3f			! return error from getcontext
-	 mov.l	@sp, r1			! saved oucp
-
-	!! adjust oucp to resume after setcontext below
-	mova	3f, r0
-	mov.l	r0, @(36 + 1 * 4, r1)	! _UC_MACHINE_SET_PC(oucp, pr)
-
-	mov.l	.L_setcontext, r2
-2:	CALL	r2			! setcontext(ucp)
-	 mov.l	@(4, sp), r4		! saved ucp
-
-	.align	2
-3:	!! we get here on errors and when resuming oucp
-	add	#8, sp			! skip r4 and r5
-	lds.l	@sp+, pr
-	rts
-	 PIC_EPILOGUE_SLOT
-
-	.align	2
-.L_got:			PIC_GOT_DATUM
-.L__getcontext:		CALL_DATUM(_C_LABEL(_getcontext), 1b)
-.L_setcontext:		CALL_DATUM(_C_LABEL(setcontext), 2b)
-	SET_ENTRY_SIZE(swapcontext)
diff --git a/lib/libc/arch/sh3/net/Makefile.inc b/lib/libc/arch/sh3/net/Makefile.inc
deleted file mode 100644
index 02c67cff1..000000000
--- a/lib/libc/arch/sh3/net/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2000/01/05 14:07:36 msaitoh Exp $
-
-SRCS+=	htonl.c htons.c ntohl.c ntohs.c
diff --git a/lib/libc/arch/sh3/net/htonl.c b/lib/libc/arch/sh3/net/htonl.c
deleted file mode 100644
index 67356285f..000000000
--- a/lib/libc/arch/sh3/net/htonl.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: htonl.c,v 1.3 2005/12/24 23:10:08 perry Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)htonl.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <sys/types.h>
-#include <machine/endian.h>
-#if defined(LIBC_SCCS)
-	__RCSID("$NetBSD: htonl.c,v 1.3 2005/12/24 23:10:08 perry Exp $");
-#endif
-
-/* hostorder = htonl(netorder) */
-#if BYTE_ORDER == LITTLE_ENDIAN
-u_int32_t
-htonl(x)
-	u_int32_t x;
-{
-	u_int32_t y = 0;
-
-	__asm("swap.b %1, %0" : "=r" (y) : "r" (x));
-	__asm("swap.w %1, %0" : "=r" (y) : "r" (y));
-	__asm("swap.b %1, %0" : "=r" (y) : "r" (y));
-	return y;
-}
-#endif
diff --git a/lib/libc/arch/sh3/net/htons.c b/lib/libc/arch/sh3/net/htons.c
deleted file mode 100644
index 544f9fcff..000000000
--- a/lib/libc/arch/sh3/net/htons.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: htons.c,v 1.3 2005/12/24 23:10:08 perry Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)htonl.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <sys/types.h>
-#include <machine/endian.h>
-#if defined(LIBC_SCCS)
-	__RCSID("$NetBSD: htons.c,v 1.3 2005/12/24 23:10:08 perry Exp $");
-#endif
-
-/* netorder = htons(hostorder) */
-#if BYTE_ORDER == LITTLE_ENDIAN
-u_int16_t
-htons(x)
-	u_int16_t x;
-{
-	__asm("swap.b %1, %0" : "=r" (x) :  "r" (x));
-	return x;
-}
-#endif
diff --git a/lib/libc/arch/sh3/net/ntohl.c b/lib/libc/arch/sh3/net/ntohl.c
deleted file mode 100644
index 364656b59..000000000
--- a/lib/libc/arch/sh3/net/ntohl.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: ntohl.c,v 1.3 2005/12/24 23:10:08 perry Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)ntohl.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <sys/types.h>
-#include <machine/endian.h>
-#if defined(LIBC_SCCS)
-	__RCSID("$NetBSD: ntohl.c,v 1.3 2005/12/24 23:10:08 perry Exp $");
-#endif
-
-/* netorder = ntohl(hostorder) */
-#if BYTE_ORDER == LITTLE_ENDIAN
-u_int32_t
-ntohl(x)
-	u_int32_t x;
-{
-	u_int32_t y = 0;
-
-	__asm("swap.b %1, %0" : "=r" (y) : "r" (x));
-	__asm("swap.w %1, %0" : "=r" (y) : "r" (y));
-	__asm("swap.b %1, %0" : "=r" (y) : "r" (y));
-	return y;
-}
-#endif
diff --git a/lib/libc/arch/sh3/net/ntohs.c b/lib/libc/arch/sh3/net/ntohs.c
deleted file mode 100644
index 174a64d8c..000000000
--- a/lib/libc/arch/sh3/net/ntohs.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: ntohs.c,v 1.3 2005/12/24 23:10:08 perry Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)ntohl.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <sys/types.h>
-#include <machine/endian.h>
-#if defined(LIBC_SCCS)
-	__RCSID("$NetBSD: ntohs.c,v 1.3 2005/12/24 23:10:08 perry Exp $");
-#endif
-
-/* hostorder = ntohs(netorder) */
-#if BYTE_ORDER == LITTLE_ENDIAN
-u_int16_t
-ntohs(x)
-	u_int16_t x;
-{
-	__asm("swap.b %1, %0" : "=r" (x) :  "r" (x));
-	return x;
-}
-#endif
diff --git a/lib/libc/arch/sh3/softfloat/milieu.h b/lib/libc/arch/sh3/softfloat/milieu.h
deleted file mode 100644
index 64429ca18..000000000
--- a/lib/libc/arch/sh3/softfloat/milieu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: milieu.h,v 1.1 2000/06/06 17:28:42 tsubai Exp $	*/
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "sh3-gcc.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
diff --git a/lib/libc/arch/sh3/softfloat/sh3-gcc.h b/lib/libc/arch/sh3/softfloat/sh3-gcc.h
deleted file mode 100644
index 15c168aa9..000000000
--- a/lib/libc/arch/sh3/softfloat/sh3-gcc.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$NetBSD: sh3-gcc.h,v 1.2 2005/12/24 21:11:16 perry Exp $	*/
-
-/*
--------------------------------------------------------------------------------
-One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
--------------------------------------------------------------------------------
-*/
-#include <machine/endian.h>
-#if _BYTE_ORDER == _BIG_ENDIAN
-#define BIGENDIAN
-#endif
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#define LITTLEENDIAN
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `BITS64' can be defined to indicate that 64-bit integer types are
-supported by the compiler.
--------------------------------------------------------------------------------
-*/
-#define BITS64
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines the most convenient type that holds
-integers of at least as many bits as specified.  For example, `uint8' should
-be the most convenient type that can hold unsigned integers of as many as
-8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
-implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
-to the same as `int'.
--------------------------------------------------------------------------------
-*/
-typedef int flag;
-typedef unsigned char uint8;
-typedef signed char int8;
-typedef int uint16;
-typedef int int16;
-typedef unsigned int uint32;
-typedef signed int int32;
-#ifdef BITS64
-typedef unsigned long long int uint64;
-typedef signed long long int int64;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines a type that holds integers
-of _exactly_ the number of bits specified.  For instance, for most
-implementation of C, `bits16' and `sbits16' should be `typedef'ed to
-`unsigned short int' and `signed short int' (or `short int'), respectively.
--------------------------------------------------------------------------------
-*/
-typedef unsigned char bits8;
-typedef signed char sbits8;
-typedef unsigned short int bits16;
-typedef signed short int sbits16;
-typedef unsigned int bits32;
-typedef signed int sbits32;
-#ifdef BITS64
-typedef unsigned long long int bits64;
-typedef signed long long int sbits64;
-#endif
-
-#ifdef BITS64
-/*
--------------------------------------------------------------------------------
-The `LIT64' macro takes as its argument a textual integer literal and
-if necessary ``marks'' the literal as having a 64-bit integer type.
-For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
-appended with the letters `LL' standing for `long long', which is `gcc's
-name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
-defined as the identity macro:  `#define LIT64( a ) a'.
--------------------------------------------------------------------------------
-*/
-#define LIT64(a) a##LL
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `INLINE' can be used before functions that should be inlined.  If
-a compiler does not support explicit inlining, this macro should be defined
-to be `static'.
--------------------------------------------------------------------------------
-*/
-#define INLINE static inline
-
-#define FLOAT64_DEMANGLE(a)	(a)
-#define FLOAT64_MANGLE(a)	(a)
diff --git a/lib/libc/arch/sh3/softfloat/softfloat.h b/lib/libc/arch/sh3/softfloat/softfloat.h
deleted file mode 100644
index b6d3936e4..000000000
--- a/lib/libc/arch/sh3/softfloat/softfloat.h
+++ /dev/null
@@ -1,316 +0,0 @@
-/*	$NetBSD: softfloat.h,v 1.11 2011/07/07 07:14:57 matt Exp $	*/
-
-/* This is a derivative work. */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.  The same applies to
-the `FLOAT128' macro and the quadruple-precision format `float128'.
--------------------------------------------------------------------------------
-*/
-/* #define FLOATX80 */
-/* #define FLOAT128 */
-
-#include <machine/ieeefp.h>
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef unsigned int float32;
-typedef unsigned long long float64;
-#ifdef FLOATX80
-typedef struct {
-    unsigned short high;
-    unsigned long long low;
-} floatx80;
-#endif
-#ifdef FLOAT128
-typedef struct {
-    unsigned long long high, low;
-} float128;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-#ifndef SOFTFLOAT_FOR_GCC
-extern int8 float_detect_tininess;
-#endif
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern fp_rnd float_rounding_mode;
-#define float_round_nearest_even FP_RN
-#define float_round_to_zero      FP_RZ
-#define float_round_down         FP_RM
-#define float_round_up           FP_RP
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-*/
-extern fp_except float_exception_flags;
-extern fp_except float_exception_mask;
-enum {
-    float_flag_inexact   = FP_X_IMP,
-    float_flag_underflow = FP_X_UFL,
-    float_flag_overflow  = FP_X_OFL,
-    float_flag_divbyzero = FP_X_DZ,
-    float_flag_invalid   = FP_X_INV
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( fp_except );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int32 );
-float32 uint32_to_float32( uint32 );
-float64 int32_to_float64( int32 );
-float64 uint32_to_float64( uint32 );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( int32 );
-floatx80 uint32_to_floatx80( uint32 );
-#endif
-#ifdef FLOAT128
-float128 int32_to_float128( int32 );
-float128 uint32_to_float128( uint32 );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __floatdi?f is in libgcc2.c */
-float32 int64_to_float32( long long );
-float64 int64_to_float64( long long );
-#ifdef FLOATX80
-floatx80 int64_to_floatx80( long long );
-#endif
-#ifdef FLOAT128
-float128 int64_to_float128( long long );
-#endif
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float32_to_int32( float32 );
-int float32_to_int32_round_to_zero( float32 );
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
-unsigned int float32_to_uint32_round_to_zero( float32 );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __fix?fdi provided by libgcc2.c */
-long long float32_to_int64( float32 );
-long long float32_to_int64_round_to_zero( float32 );
-#endif
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-#ifdef FLOAT128
-float128 float32_to_float128( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-flag float32_eq( float32, float32 );
-flag float32_le( float32, float32 );
-flag float32_lt( float32, float32 );
-flag float32_eq_signaling( float32, float32 );
-flag float32_le_quiet( float32, float32 );
-flag float32_lt_quiet( float32, float32 );
-#ifndef SOFTFLOAT_FOR_GCC
-flag float32_is_signaling_nan( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float64_to_int32( float64 );
-int float64_to_int32_round_to_zero( float64 );
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
-unsigned int float64_to_uint32_round_to_zero( float64 );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __fix?fdi provided by libgcc2.c */
-long long float64_to_int64( float64 );
-long long float64_to_int64_round_to_zero( float64 );
-#endif
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-#ifdef FLOAT128
-float128 float64_to_float128( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-flag float64_eq( float64, float64 );
-flag float64_le( float64, float64 );
-flag float64_lt( float64, float64 );
-flag float64_eq_signaling( float64, float64 );
-flag float64_le_quiet( float64, float64 );
-flag float64_lt_quiet( float64, float64 );
-#ifndef SOFTFLOAT_FOR_GCC
-flag float64_is_signaling_nan( float64 );
-#endif
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int floatx80_to_int32( floatx80 );
-int floatx80_to_int32_round_to_zero( floatx80 );
-long long floatx80_to_int64( floatx80 );
-long long floatx80_to_int64_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-#ifdef FLOAT128
-float128 floatx80_to_float128( floatx80 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern int floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-flag floatx80_eq( floatx80, floatx80 );
-flag floatx80_le( floatx80, floatx80 );
-flag floatx80_lt( floatx80, floatx80 );
-flag floatx80_eq_signaling( floatx80, floatx80 );
-flag floatx80_le_quiet( floatx80, floatx80 );
-flag floatx80_lt_quiet( floatx80, floatx80 );
-flag floatx80_is_signaling_nan( floatx80 );
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float128_to_int32( float128 );
-int float128_to_int32_round_to_zero( float128 );
-long long float128_to_int64( float128 );
-long long float128_to_int64_round_to_zero( float128 );
-float32 float128_to_float32( float128 );
-float64 float128_to_float64( float128 );
-#ifdef FLOATX80
-floatx80 float128_to_floatx80( float128 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision operations.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 );
-float128 float128_add( float128, float128 );
-float128 float128_sub( float128, float128 );
-float128 float128_mul( float128, float128 );
-float128 float128_div( float128, float128 );
-float128 float128_rem( float128, float128 );
-float128 float128_sqrt( float128 );
-flag float128_eq( float128, float128 );
-flag float128_le( float128, float128 );
-flag float128_lt( float128, float128 );
-flag float128_eq_signaling( float128, float128 );
-flag float128_le_quiet( float128, float128 );
-flag float128_lt_quiet( float128, float128 );
-flag float128_is_signaling_nan( float128 );
-
-#endif
-
diff --git a/lib/libc/arch/sh3/stdlib/Makefile.inc b/lib/libc/arch/sh3/stdlib/Makefile.inc
deleted file mode 100644
index 2f91b992a..000000000
--- a/lib/libc/arch/sh3/stdlib/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2009/07/31 20:40:00 dsl Exp $
diff --git a/lib/libc/arch/sh3/string/Makefile.inc b/lib/libc/arch/sh3/string/Makefile.inc
deleted file mode 100644
index 2aced0da6..000000000
--- a/lib/libc/arch/sh3/string/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2009/07/30 20:57:16 dsl Exp $
-
-SRCS+=	bcopy.S bzero.S ffs.S memset.S
-SRCS+=	memcpy.S memmove.S
diff --git a/lib/libc/arch/sh3/string/bcopy.S b/lib/libc/arch/sh3/string/bcopy.S
deleted file mode 100644
index b32725ad4..000000000
--- a/lib/libc/arch/sh3/string/bcopy.S
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	$NetBSD: bcopy.S,v 1.3 2006/04/23 00:08:18 uwe Exp $	*/
-
-#define BCOPY
-#include "memcpy.S"
diff --git a/lib/libc/arch/sh3/string/bzero.S b/lib/libc/arch/sh3/string/bzero.S
deleted file mode 100644
index 2d5ceca08..000000000
--- a/lib/libc/arch/sh3/string/bzero.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: bzero.S,v 1.1 2002/11/20 14:23:54 itohy Exp $	*/
-
-#define BZERO
-#include "memset.S"
-
diff --git a/lib/libc/arch/sh3/sys/__clone.S b/lib/libc/arch/sh3/sys/__clone.S
deleted file mode 100644
index fed5a1c4a..000000000
--- a/lib/libc/arch/sh3/sys/__clone.S
+++ /dev/null
@@ -1,88 +0,0 @@
-/*	$NetBSD: __clone.S,v 1.7 2013/09/12 15:36:16 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2001 Tsubai Masanari.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(clone,__clone)
-#endif
-
-/*
- * int __clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-ENTRY(__clone)
-	/*
-	 * Sanity checks: func and stack may not be NULL.
-	 */
-	tst	r4, r4
-	bt	inval
-	tst	r5, r5
-	bt	inval
-
-	mov	r4, r2		/* save entry point for later */
-
-	mov	r6, r4		/* r4 = flags, r5 = stack (already) */
-	mov.l	.L_SYS___clone, r0
-	trapa	#0x80
-	bf	err
-
-	tst	r0, r0
-	bf	3f		/* we're the parent, just return */
-
-	jsr	@r2		/* clone does _exit((*fn)(arg)); */
-	 mov	r7, r4
-
-	mov.l	.L__exit, r1
-#ifdef __PIC__
-	mov	r0, r4
-	mov.l	.L_got, r12	/* PIC_PROLOGUE_NOSAVE(.L_got) */
-	mova	.L_got, r0	/*  expanded to fill the delay slot */
-1:	JUMP	r1
-	 add	r0, r12
-#else
-	JUMP	r1
-	 mov	r0, r4
-#endif
-	/* NOTREACHED */
-
-inval:
-	mov	#EINVAL, r0
-err:
-	JUMP_CERROR
-	/* NOTREACHED */
-
-3:	rts
-	 nop
-
-	.align	2
-.L_SYS___clone:	.long	SYS___clone
-
-.L_got:		PIC_GOT_DATUM
-.L__exit:	CALL_DATUM(_C_LABEL(_exit), 1b)
-	SET_ENTRY_SIZE(__clone)
diff --git a/lib/libc/arch/sh3/sys/__sigaction14_sigtramp.c b/lib/libc/arch/sh3/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index 73b8fd837..000000000
--- a/lib/libc/arch/sh3/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.8 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.8 2008/04/28 20:22:57 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-#ifdef __LIBC12_SOURCE__
-extern const int __sigtramp_sigcontext_1[]
-    __weak_reference(__sigtramp_sigcontext_1);
-#endif
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern int __sigtramp_siginfo_2[];
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the compatibility SIGCONTEXT trampoline if SA_SIGINFO
-	 * is not set in the sigaction.
-	 */
-	if (act && (act->sa_flags & SA_SIGINFO) == 0) {
-		extern int __sigtramp_sigcontext_1[];
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-					   __sigtramp_sigcontext_1, 1);
-		/*
-		 * EINVAL might indicate that trampoline version 1 is
-		 * not supported by the kernel; fall back on native
-		 * SIGINFO trampoline.
-		 */
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/sh3/sys/__sigtramp2.S b/lib/libc/arch/sh3/sys/__sigtramp2.S
deleted file mode 100644
index 930a9996d..000000000
--- a/lib/libc/arch/sh3/sys/__sigtramp2.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.3 2008/04/28 20:22:57 martin Exp $ */
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-/*
- * The SH signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, stack looks like:
- *
- *		siginfo structure
- *	sp->	ucontext structure
- *
- * NB: This order is different from what other ports use (siginfo at
- * the top of the stack), because we want to avoid wasting two
- * instructions to skip to the ucontext.  Not that this order really
- * matters, but I think this inconsistency deserves an explanation.	
- */
-NENTRY(__sigtramp_siginfo_2)
-	mov	r15, r4			/* get pointer to ucontext */
-	SYSTRAP(setcontext)		/* and call setcontext() */
-	mov	r0, r4			/* exit with errno */
-	SYSTRAP(exit)			/* if sigreturn fails */
-
-	SET_ENTRY_SIZE(__sigtramp_siginfo_2)
diff --git a/lib/libc/arch/sh3/sys/__syscall.S b/lib/libc/arch/sh3/sys/__syscall.S
deleted file mode 100644
index 0da939426..000000000
--- a/lib/libc/arch/sh3/sys/__syscall.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: __syscall.S,v 1.6 2006/01/06 01:57:38 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)syscall.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __syscall.S,v 1.6 2006/01/06 01:57:38 uwe Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-RSYSCALL(__syscall)
diff --git a/lib/libc/arch/sh3/sys/__vfork14.S b/lib/libc/arch/sh3/sys/__vfork14.S
deleted file mode 100644
index 0d2a29610..000000000
--- a/lib/libc/arch/sh3/sys/__vfork14.S
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: __vfork14.S,v 1.6 2006/01/06 07:07:34 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)Ovfork.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __vfork14.S,v 1.6 2006/01/06 07:07:34 uwe Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-/*
- * pid = vfork();
- *
- * r1 == 0 in parent process, r1 == 1 in child process.
- * r0 == pid of child in parent, r0 == pid of parent in child.
- *
- */
-ENTRY(__vfork14)
-	mov.l	.L_SYS___vfork14, r0
-	trapa	#0x80
-	bf	err
-
-	add	#0xff, r1	/* from 1 to 0 in child, 0 to -1 in parent */
-	rts
-	 and	r1, r0		/* 0 in child, child pid in parent */
-
-err:
-	JUMP_CERROR
-
-	.align	2
-.L_SYS___vfork14:
-	.long	SYS___vfork14
-
-	SET_ENTRY_SIZE(__vfork14)
diff --git a/lib/libc/arch/sh3/sys/brk.S b/lib/libc/arch/sh3/sys/brk.S
deleted file mode 100644
index 611747d90..000000000
--- a/lib/libc/arch/sh3/sys/brk.S
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$NetBSD: brk.S,v 1.11 2013/09/12 15:36:16 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)brk.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: brk.S,v 1.11 2013/09/12 15:36:16 joerg Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk,_brk)
-#endif
-
-	.data
-	.globl	_C_LABEL(__minbrk)
-	.align	2
-_C_LABEL(__minbrk):
-	.long	_end
-
-	.text
-
-ENTRY(_brk)
-#ifdef __PIC__
-	mova	L_GOT, r0
-	mov.l	L_GOT, r2
-	add	r0, r2
-	mov.l	Lminbrk, r0
-	mov.l	@(r0, r2), r0
-	mov.l	@r0, r0
-#else
-	mov.l	Lminbrk, r0
-	mov.l	@r0, r0
-#endif
-	cmp/hs	r4, r0
-	bf	1f
-	mov	r0, r4
-1:
-	mov.l	LSYS_break, r0
-	trapa	#0x80
-	bf	err
-#ifdef __PIC__
-	mov.l	Lcurbrk, r0
-	mov.l	@(r0, r2), r1
-	xor	r0, r0
-#else
-	xor	r0, r0
-	mov.l	Lcurbrk, r1
-#endif
-	rts
-	mov.l	r4, @r1
-err:
-	JUMP_CERROR
-
-	.align	2
-LSYS_break:	.long	SYS_break
-#ifdef __PIC__
-L_GOT:		.long	_GLOBAL_OFFSET_TABLE_
-Lminbrk:	.long	_C_LABEL(__minbrk)@GOT
-Lcurbrk:	.long	curbrk@GOT
-#else
-Lminbrk:	.long	_C_LABEL(__minbrk)
-Lcurbrk:	.long	curbrk
-#endif
-	SET_ENTRY_SIZE(_brk)
diff --git a/lib/libc/arch/sh3/sys/cerror.S b/lib/libc/arch/sh3/sys/cerror.S
deleted file mode 100644
index 0bc5e556a..000000000
--- a/lib/libc/arch/sh3/sys/cerror.S
+++ /dev/null
@@ -1,99 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.11 2013/09/12 15:36:16 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)cerror.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: cerror.S,v 1.11 2013/09/12 15:36:16 joerg Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-#ifdef _REENTRANT
-
-
-	.globl	_C_LABEL(__errno)
-
-	.align	2
-cerror:
-	mov.l	.L___errno, r1
-	PIC_PROLOGUE(.L_got)
-	sts.l   pr, @-sp
-1:	CALL	r1
-	 mov.l	r4, @-sp	! save error code
-	mov.l	@sp+, r4
-	lds.l   @sp+, pr
-	PIC_EPILOGUE
-	mov.l	r4, @r0
-	mov	#-1, r1
-	rts
-	 mov	#-1, r0
-
-	.align	2
-.L_got:		PIC_GOT_DATUM
-.L___errno:	CALL_DATUM(_C_LABEL(__errno), 1b)
-	SET_ASENTRY_SIZE(cerror)
-
-#else /* !_REENTRANT */
-
-
-	.globl	_C_LABEL(errno)
-
-	.align	2
-cerror:
-#ifdef __PIC__
-	mova	L_GOT, r0
-	mov.l	L_GOT, r1
-	add	r0, r1
-	mov.l	L_errno, r0
-	mov.l	@(r0, r1), r1
-	mov.l	r4, @r1
-#else
-	mov.l	L_errno, r1
-	mov.l	r4, @r1
-#endif
-	mov	#-1, r0
-	rts
-	 mov	#-1, r1
-
-	.align	2
-#ifdef __PIC__
-L_GOT:		.long	_GLOBAL_OFFSET_TABLE_
-L_errno:	.long	_C_LABEL(errno)@GOT
-#else
-L_errno:	.long	_C_LABEL(errno)
-#endif
-
-#endif /* !_REENTRANT */
diff --git a/lib/libc/arch/sh3/sys/exect.S b/lib/libc/arch/sh3/sys/exect.S
deleted file mode 100644
index a4f2a9e96..000000000
--- a/lib/libc/arch/sh3/sys/exect.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: exect.S,v 1.5 2006/01/06 01:53:30 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)exect.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: exect.S,v 1.5 2006/01/06 01:53:30 uwe Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-PSEUDO(exect,execve)
diff --git a/lib/libc/arch/sh3/sys/fork.S b/lib/libc/arch/sh3/sys/fork.S
deleted file mode 100644
index 5448955a5..000000000
--- a/lib/libc/arch/sh3/sys/fork.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: fork.S,v 1.10 2006/01/06 05:11:29 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)fork.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: fork.S,v 1.10 2006/01/06 05:11:29 uwe Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-/*
- * pid = fork();
- *
- * r1 == 0 in parent process, r1 == 1 in child process.
- * r0 == pid of child in parent, r0 == pid of parent in child.
- *
- */
-ENTRY(__fork)
-	mov	#SYS_fork, r0
-	trapa	#0x80
-	bf	err
-
-	add	#0xff, r1	/* from 1 to 0 in child, 0 to -1 in parent */
-	rts
-	 and	r1, r0		/* 0 in child, child pid in parent */
-
-err:
-	JUMP_CERROR
-
-	SET_ENTRY_SIZE(__fork)
diff --git a/lib/libc/arch/sh3/sys/getcontext.S b/lib/libc/arch/sh3/sys/getcontext.S
deleted file mode 100644
index 91ca4a9bc..000000000
--- a/lib/libc/arch/sh3/sys/getcontext.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.3 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: getcontext.S,v 1.3 2008/04/28 20:22:57 martin Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h" 
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext,_getcontext)
-#endif
-
-_SYSCALL(_getcontext,getcontext) 
-	sts	pr, r2
-	mov.l	r2, @(36 + 1 * 4, r4)	/* saved pc <- pr */
-	add	#36 + 20 * 4, r4
-	rts
-	 mov.l	r0, @r4			/* arrange for return value 0 */
diff --git a/lib/libc/arch/sh3/sys/pipe.S b/lib/libc/arch/sh3/sys/pipe.S
deleted file mode 100644
index 11c6b953b..000000000
--- a/lib/libc/arch/sh3/sys/pipe.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.7 2006/01/06 05:23:46 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)pipe.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: pipe.S,v 1.7 2006/01/06 05:23:46 uwe Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe,_pipe)
-#endif
-
-_SYSCALL(_pipe,pipe)
-	mov.l	r0, @r4
-	mov.l	r1, @(4, r4)
-	rts
-	 mov	#0, r0
diff --git a/lib/libc/arch/sh3/sys/ptrace.S b/lib/libc/arch/sh3/sys/ptrace.S
deleted file mode 100644
index c8a7e652c..000000000
--- a/lib/libc/arch/sh3/sys/ptrace.S
+++ /dev/null
@@ -1,111 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.9 2013/09/12 15:36:16 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)ptrace.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: ptrace.S,v 1.9 2013/09/12 15:36:16 joerg Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-/*
- * int
- * ptrace(int request, pid_t pid, caddr_t addr, int data);
- */
-ENTRY(ptrace)
-#ifdef _REENTRANT
-
-	mov.l	.L___errno, r1
-	PIC_PROLOGUE(.L_GOT)
-	sts.l   pr, @-sp
-	mov.l	r7, @-sp
-	mov.l	r6, @-sp
-	mov.l	r5, @-sp
-1:	CALL	r1
-	 mov.l	r4, @-sp
-	mov.l	@sp+, r4
-	mov.l	@sp+, r5
-	mov.l	@sp+, r6
-	mov.l	@sp+, r7
-	lds.l   @sp+, pr
-	PIC_EPILOGUE
-
-#else  /* ! _REENTRANT */
-
-#ifdef __PIC__
-	mova	.L_GOT, r0
-	mov.l	.L_GOT, r1
-	add	r0, r1
-	mov.l	.L_errno, r0
-	mov.l	@(r0, r1), r0
-#else
-	mov.l	.L_errno, r0
-#endif
-
-#endif /* ! _REENTRANT */
-
-	mov	#0, r1
-	mov.l	r1, @r0			/* errno = 0; */
-
-	mov	#SYS_ptrace, r0
-	trapa	#0x80
-	bf	err
-	rts
-	 nop
-err:
-	JUMP_CERROR
-
-	.align	2
-.L_GOT:
-	PIC_GOT_DATUM
-
-#ifdef _REENTRANT
-	.global	_C_LABEL(__errno)
-.L___errno:
-	CALL_DATUM(_C_LABEL(__errno), 1b)
-
-#else  /* ! _REENTRANT */
-	.global	_C_LABEL(errno)
-.L_errno:
-#ifdef __PIC__
-	.long	PIC_GOT(_C_LABEL(errno))
-#else
-	.long	_C_LABEL(errno)
-#endif
-
-#endif /* ! _REENTRANT */
-
-	SET_ENTRY_SIZE(ptrace)
diff --git a/lib/libc/arch/sh3/sys/sbrk.S b/lib/libc/arch/sh3/sys/sbrk.S
deleted file mode 100644
index 6ad26271b..000000000
--- a/lib/libc/arch/sh3/sys/sbrk.S
+++ /dev/null
@@ -1,92 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.10 2013/09/12 15:36:16 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sbrk.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: sbrk.S,v 1.10 2013/09/12 15:36:16 joerg Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-	.globl	_end
-	.globl	curbrk
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk,_sbrk)
-#endif
-
-	.data
-curbrk:	.long	_end
-	.text
-
-ENTRY(_sbrk)
-	mov	r4, r2
-#ifdef __PIC__
-	mova	L_GOT, r0
-	mov.l	L_GOT, r3
-	add	r0, r3
-	mov.l	Lcurbrk, r0
-	mov.l	@(r0, r3), r0
-#else
-	mov.l	Lcurbrk, r0
-#endif
-	mov.l	@r0, r0
-	add	r0, r4
-	mov.l	LSYS_break, r0
-	trapa	#0x80
-	bf	err
-#ifdef __PIC__
-	mov.l	Lcurbrk, r0
-	mov.l	@(r0, r3), r1
-#else
-	mov.l	Lcurbrk, r1
-#endif
-	mov.l	@r1, r0
-	add	r0, r2
-	rts
-	mov.l	r2, @r1
-err:
-	JUMP_CERROR
-
-	.align	2
-LSYS_break:	.long	SYS_break
-#ifdef __PIC__
-L_GOT:		.long	_GLOBAL_OFFSET_TABLE_
-Lcurbrk:	.long	curbrk@GOT
-#else
-Lcurbrk:	.long	curbrk
-#endif
-	SET_ENTRY_SIZE(_sbrk)
diff --git a/lib/libc/arch/sh3/sys/shmat.S b/lib/libc/arch/sh3/sys/shmat.S
deleted file mode 100644
index 7f57fad5f..000000000
--- a/lib/libc/arch/sh3/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2000/07/07 08:20:54 itohy Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/sh3/sys/syscall.S b/lib/libc/arch/sh3/sys/syscall.S
deleted file mode 100644
index 979ef83a8..000000000
--- a/lib/libc/arch/sh3/sys/syscall.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.6 2006/01/06 01:27:23 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)syscall.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: syscall.S,v 1.6 2006/01/06 01:27:23 uwe Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-RSYSCALL(syscall)
diff --git a/lib/libc/arch/sparc/Makefile.inc b/lib/libc/arch/sparc/Makefile.inc
deleted file mode 100644
index de348c7e6..000000000
--- a/lib/libc/arch/sparc/Makefile.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.15 2014/07/12 19:21:48 nakayama Exp $
-
-SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
-
-.if ${MACHINE} != "sparc64"
-# `source' files built from m4 source
-# the name `div.o' is taken for the ANSI C `div' function, hence sdiv here
-SRCS+=	rem.S sdiv.S udiv.S urem.S
-CLEANFILES+=rem.S sdiv.S udiv.S urem.S
-
-sdiv.S: ${LIBCDIR}/arch/sparc/gen/divrem.m4
-	@echo 'building ${.TARGET} from ${.ALLSRC}'
-	@rm -f ${.TARGET}
-	@(echo "define(NAME,\`.div')define(OP,\`div')define(S,\`true')"; \
-	 cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
-	@chmod 444 ${.TARGET}
-
-udiv.S: ${LIBCDIR}/arch/sparc/gen/divrem.m4
-	@echo 'building ${.TARGET} from ${.ALLSRC}'
-	@rm -f ${.TARGET}
-	@(echo "define(NAME,\`.udiv')define(OP,\`div')define(S,\`false')"; \
-	 cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
-	@chmod 444 ${.TARGET}
-
-rem.S: ${LIBCDIR}/arch/sparc/gen/divrem.m4
-	@echo 'building ${.TARGET} from ${.ALLSRC}'
-	@rm -f ${.TARGET}
-	@(echo "define(NAME,\`.rem')define(OP,\`rem')define(S,\`true')"; \
-	 cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
-	@chmod 444 ${.TARGET}
-
-urem.S: ${LIBCDIR}/arch/sparc/gen/divrem.m4
-	@echo 'building ${.TARGET} from ${.ALLSRC}'
-	@rm -f ${.TARGET}
-	@(echo "define(NAME,\`.urem')define(OP,\`rem')define(S,\`false')"; \
-	 cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
-	@chmod 444 ${.TARGET}
-.endif
diff --git a/lib/libc/arch/sparc/SYS.h b/lib/libc/arch/sparc/SYS.h
deleted file mode 100644
index 8a2fba185..000000000
--- a/lib/libc/arch/sparc/SYS.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)SYS.h	8.1 (Berkeley) 6/4/93
- *
- *	from: Header: SYS.h,v 1.2 92/07/03 18:57:00 torek Exp
- *	$NetBSD: SYS.h,v 1.19 2013/09/12 15:36:16 joerg Exp $
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-#include <machine/trap.h>
-
-#ifdef __STDC__
-#define _CAT(x,y) x##y
-#else
-#define _CAT(x,y) x/**/y
-#endif
-
-#ifdef __ELF__
-#define CERROR		_C_LABEL(__cerror)
-#define CURBRK		_C_LABEL(__curbrk)
-#else
-#define CERROR		_ASM_LABEL(cerror)
-#define CURBRK		_ASM_LABEL(curbrk)
-#endif
-
-/*
- * ERROR branches to cerror.
- */
-#ifdef __PIC__
-#define CALL(name)				\
-	PIC_PROLOGUE(%g1, %g5);			\
-	set	name, %g5;			\
-	ld	[%g1 + %g5], %g5;		\
-	jmp	%g5;				\
-	 nop
-#else
-#define	CALL(name)				\
-	set	name, %g1;			\
-	jmp	%g1;				\
-	 nop
-#endif
-#define	ERROR() CALL(CERROR)
-
-/*
- * SYSCALL is used when further action must be taken before returning.
- * Note that it adds a `nop' over what we could do, if we only knew
- * what came at label 1....
- */
-#define	_SYSCALL(x,y)				\
-ENTRY(x);					\
-	mov	_CAT(SYS_,y), %g1;		\
-	t	ST_SYSCALL;			\
-	bcc	1f;				\
-	 nop;					\
-	ERROR();				\
-1:	/* next insn */
-
-#define	SYSCALL(x)				\
-	_SYSCALL(x,x)
-
-/*
- * RSYSCALL is used when the system call should just return.  Here we
- * use the SYSCALL_G5RFLAG to put the `success' return address in %g5
- * and avoid a branch.
- *
- * PSEUDO(x,y) is like RSYSCALL(y), except that the name is x.
- */
-#define	_RSYSCALL(x,y)					\
-ENTRY(x);						\
-	mov	(_CAT(SYS_,y)) | SYSCALL_G5RFLAG, %g1;	\
-	add	%o7, 8, %g5;				\
-	t	ST_SYSCALL;				\
-	ERROR()
-
-#define	RSYSCALL(x)	_RSYSCALL(x,x)
-#define	PSEUDO(x,y)	_RSYSCALL(x,y)
-
-/*
- * WSYSCALL(weak,strong) is like RSYSCALL(weak),
- * except that weak is a weak internal alias for the strong symbol.
- */
-#ifdef WEAK_ALIAS
-#define	WSYSCALL(weak,strong)			\
-	WEAK_ALIAS(weak,strong);		\
-	PSEUDO(strong,weak)
-#else
-#define	WSYSCALL(weak,strong)			\
-	RSYSCALL(weak)
-#endif
-
-/*
- * SYSCALL_NOERROR is like SYSCALL, except it's used for syscalls that
- * never fail.
- *
- * XXX - This should be optimized.
- */
-#define SYSCALL_NOERROR(x)			\
-ENTRY(x);					\
-	mov	_CAT(SYS_,x), %g1;		\
-	t	ST_SYSCALL
-
-/*
- * RSYSCALL_NOERROR is like RSYSCALL, except it's used for syscalls
- * that never fail.
- *
- * PSEUDO_NOERROR(x,y) is like RSYSCALL_NOERROR(y), except that the
- * name is x.
- *
- * XXX - This should be optimized.
- */
-#define _RSYSCALL_NOERROR(x,y)				\
-ENTRY(x);						\
-	mov	(_CAT(SYS_,y)) | SYSCALL_G5RFLAG, %g1;	\
-	add	%o7, 8, %g5;				\
-	t	ST_SYSCALL
-
-#define RSYSCALL_NOERROR(x)	_RSYSCALL_NOERROR(x,x)
-#define PSEUDO_NOERROR(x,y)	_RSYSCALL_NOERROR(x,y)
-
-	.globl	CERROR
diff --git a/lib/libc/arch/sparc/gdtoa/Makefile.inc b/lib/libc/arch/sparc/gdtoa/Makefile.inc
deleted file mode 100644
index 1d786e010..000000000
--- a/lib/libc/arch/sparc/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/03/15 17:35:18 kleink Exp $
-
-SRCS+=	strtof.c
diff --git a/lib/libc/arch/sparc/gdtoa/arith.h b/lib/libc/arch/sparc/gdtoa/arith.h
deleted file mode 100644
index 4674f629c..000000000
--- a/lib/libc/arch/sparc/gdtoa/arith.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define IEEE_BIG_ENDIAN
diff --git a/lib/libc/arch/sparc/gdtoa/gd_qnan.h b/lib/libc/arch/sparc/gdtoa/gd_qnan.h
deleted file mode 100644
index 75f636b54..000000000
--- a/lib/libc/arch/sparc/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x7ff80000
-#define d_QNAN1 0x0
diff --git a/lib/libc/arch/sparc/gen/Makefile.inc b/lib/libc/arch/sparc/gen/Makefile.inc
deleted file mode 100644
index 9fdda48bc..000000000
--- a/lib/libc/arch/sparc/gen/Makefile.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.23 2014/07/12 19:21:48 nakayama Exp $
-
-SRCS+=	fabs.S modf.S
-SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
-	fpsetround.c fpsetsticky.c
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c infinityl_dbl_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
-
-SRCS+=	nanf.c
-
-SRCS+=	setjmp.S longjmp.c
-SRCS+=	_setjmp.S
-SRCS+=	sigsetjmp.S
-
-SRCS+=	makecontext.c resumecontext.c _lwp.c swapcontext.S
-
-.if ${MACHINE} == "sparc64"
-.PATH: ${NETBSDSRCDIR}/lib/libarch/sparc/v8
-SRCS+=	sparc_v8.S
-.else
-SRCS+=	mul.S umul.S
-.endif
-SRCS+=	fixunsdfsi.S saveregs.S
-SRCS+=	bswap16.c bswap32.c bswap64.c
-
-LSRCS.sparc.gen=	Lint_swapcontext.c
-LSRCS+=		${LSRCS.sparc.gen}
-DPSRCS+=	${LSRCS.sparc.gen}
-CLEANFILES+=	${LSRCS.sparc.gen}
diff --git a/lib/libc/arch/sparc/gen/_lwp.c b/lib/libc/arch/sparc/gen/_lwp.c
deleted file mode 100644
index 90450bd0d..000000000
--- a/lib/libc/arch/sparc/gen/_lwp.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.7 2012/03/21 00:34:04 christos Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.7 2012/03/21 00:34:04 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *), void *arg,
-		 void *private, caddr_t stack_base, size_t stack_size)
-{
-	__greg_t *gr;
-	unsigned long *sp;
-
-	getcontext(u);
-	gr = u->uc_mcontext.__gregs;
-
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-
-	sp = (void *)(stack_base + stack_size);
-	sp = (ulong *)((ulong)sp & ~0x07);
-
-	/* Make room for the fake caller stack frame (CCFSZ, only in words) */
-	sp -= 8 + 8 + 1 + 6 + 1;
-
-	/* Entering (*start)(arg), return is to _lwp_exit */
-	gr[_REG_PC] = (ulong) start;
-	gr[_REG_nPC] = (ulong) start + 4;
-	gr[_REG_O0] = (ulong)arg;
-	gr[_REG_O6] = (ulong)sp;
-	gr[_REG_O7] = (ulong)_lwp_exit - 8;
-	gr[_REG_G7] = (ulong)private;
-
-	/* XXX: uwe: why do we need this? */
-	/* create loopback in the window save area on the stack? */
-	sp[8+6] = (ulong)sp;		/* %i6 */
-	sp[8+7] = (ulong)_lwp_exit - 8;	/* %i7 */
-}
diff --git a/lib/libc/arch/sparc/gen/_setjmp.S b/lib/libc/arch/sparc/gen/_setjmp.S
deleted file mode 100644
index db8fb5bd2..000000000
--- a/lib/libc/arch/sparc/gen/_setjmp.S
+++ /dev/null
@@ -1,104 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.10 2014/07/12 19:11:57 nakayama Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Paul Kranenburg.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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 <machine/trap.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: _setjmp.S,v 1.10 2014/07/12 19:11:57 nakayama Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	_longjmp(a,v)
- * will generate a "return(v?v:1)" from
- * the last call to
- *	_setjmp(a)
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	/* store important globals, sigsetjmp compatible */
-	st	%g3, [%o0 + 16]
-	st	%g2, [%o0 + 24]
-	st	%g4, [%o0 + 48]
-	st	%g7, [%o0 + 52]
-
-	st	%sp, [%o0+0]	/* store caller's stack pointer */
-	st	%o7, [%o0+4]	/* and the return pc */
-	retl
-	 clr	%o0		! return 0
-
-ENTRY(_longjmp)
-#ifdef __sparc_v9__
-	save	%sp, -CCFSZ, %sp
-	flushw
-	/*
-	 * We restore the saved stack pointer to %fp, then issue
-	 * a `restore' instruction which will reload the register
-	 * window from the stack.
-	 */
-	ld	[%i0 + 16], %g3
-	ld	[%i0 + 24], %g2
-	ld	[%i0 + 48], %g4
-	ld	[%i0 + 52], %g7
-	ld	[%i0 + 4], %i7	/* restore return pc */
-	ld	[%i0 + 0], %fp	/* and stack pointer */
-	mov	1, %i0
-	movrnz	%i1, %i1, %i0	! compute v ? v : 1
-	ret
-	 restore
-#else
-	save	%sp, -64, %sp	! set up a local stack frame
-	tst	%i1		! compute v ? v : 1
-	be,a	0f
-	 mov	1, %i1
-0:
-	t	ST_FLUSHWIN	! flush register windows out to the stack
-
-	/* restore globals */
-	ld	[%i0 + 16], %g3
-	ld	[%i0 + 24], %g2
-	ld	[%i0 + 48], %g4
-	ld	[%i0 + 52], %g7
-
-	/*
-	 * We restore the saved stack pointer to %fp, then issue
-	 * a `restore' instruction which will reload the register
-	 * window from the stack.
-	 */
-	ld	[%i0+4], %i7	/* restore return pc */
-	ld	[%i0+0], %fp	/* and stack pointer */
-
-	ret			! success, return %i1
-	 restore	%i1, 0, %o0
-#endif
diff --git a/lib/libc/arch/sparc/gen/divrem.m4 b/lib/libc/arch/sparc/gen/divrem.m4
deleted file mode 100644
index 151ca0623..000000000
--- a/lib/libc/arch/sparc/gen/divrem.m4
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * 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.
- * 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.
- *
- * from: Header: divrem.m4,v 1.4 92/06/25 13:23:57 torek Exp
- * $NetBSD: divrem.m4,v 1.6 2011/03/23 20:54:35 martin Exp $
- */
-
-/*
- * Division and remainder, from Appendix E of the Sparc Version 8
- * Architecture Manual, with fixes from Gordon Irlam.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)divrem.m4	8.1 (Berkeley) 6/4/93"
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Input: dividend and divisor in %o0 and %o1 respectively.
- *
- * m4 parameters:
- *  NAME	name of function to generate
- *  OP		OP=div => %o0 / %o1; OP=rem => %o0 % %o1
- *  S		S=true => signed; S=false => unsigned
- *
- * Algorithm parameters:
- *  N		how many bits per iteration we try to get (4)
- *  WORDSIZE	total number of bits (32)
- *
- * Derived constants:
- *  TWOSUPN	2^N, for label generation (m4 exponentiation currently broken)
- *  TOPBITS	number of bits in the top `decade' of a number
- *
- * Important variables:
- *  Q		the partial quotient under development (initially 0)
- *  R		the remainder so far, initially the dividend
- *  ITER	number of main division loop iterations required;
- *		equal to ceil(log2(quotient) / N).  Note that this
- *		is the log base (2^N) of the quotient.
- *  V		the current comparand, initially divisor*2^(ITER*N-1)
- *
- * Cost:
- *  Current estimate for non-large dividend is
- *	ceil(log2(quotient) / N) * (10 + 7N/2) + C
- *  A large dividend is one greater than 2^(31-TOPBITS) and takes a
- *  different path, as the upper bits of the quotient must be developed
- *  one bit at a time.
- */
-
-define(N, `4')
-define(TWOSUPN, `16')
-define(WORDSIZE, `32')
-define(TOPBITS, eval(WORDSIZE - N*((WORDSIZE-1)/N)))
-
-define(dividend, `%o0')
-define(divisor, `%o1')
-define(Q, `%o2')
-define(R, `%o3')
-define(ITER, `%o4')
-define(V, `%o5')
-
-/* m4 reminder: ifelse(a,b,c,d) => if a is b, then c, else d */
-define(T, `%g1')
-define(SC, `%g5')
-ifelse(S, `true', `define(SIGN, `%g6')')
-
-/*
- * This is the recursive definition for developing quotient digits.
- *
- * Parameters:
- *  $1	the current depth, 1 <= $1 <= N
- *  $2	the current accumulation of quotient bits
- *  N	max depth
- *
- * We add a new bit to $2 and either recurse or insert the bits in
- * the quotient.  R, Q, and V are inputs and outputs as defined above;
- * the condition codes are expected to reflect the input R, and are
- * modified to reflect the output R.
- */
-define(DEVELOP_QUOTIENT_BITS,
-`	! depth $1, accumulated bits $2
-	bl	L.$1.eval(TWOSUPN+$2)
-	srl	V,1,V
-	! remainder is positive
-	subcc	R,V,R
-	ifelse($1, N,
-	`	b	9f
-		add	Q, ($2*2+1), Q
-	', `	DEVELOP_QUOTIENT_BITS(incr($1), `eval(2*$2+1)')')
-L.$1.eval(TWOSUPN+$2):
-	! remainder is negative
-	addcc	R,V,R
-	ifelse($1, N,
-	`	b	9f
-		add	Q, ($2*2-1), Q
-	', `	DEVELOP_QUOTIENT_BITS(incr($1), `eval(2*$2-1)')')
-	ifelse($1, 1, `9:')')
-
-#include <machine/asm.h>
-#include <machine/trap.h>
-
-FUNC(NAME)
-ifelse(S, `true',
-`	! compute sign of result; if neither is negative, no problem
-	orcc	divisor, dividend, %g0	! either negative?
-	bge	2f			! no, go do the divide
-	ifelse(OP, `div',
-		`xor	divisor, dividend, SIGN',
-		`mov	dividend, SIGN')	! compute sign in any case
-	tst	divisor
-	bge	1f
-	tst	dividend
-	! divisor is definitely negative; dividend might also be negative
-	bge	2f			! if dividend not negative...
-	neg	divisor			! in any case, make divisor nonneg
-1:	! dividend is negative, divisor is nonnegative
-	neg	dividend		! make dividend nonnegative
-2:
-')
-	! Ready to divide.  Compute size of quotient; scale comparand.
-	orcc	divisor, %g0, V
-	bnz	1f
-	mov	dividend, R
-
-		! Divide by zero trap.  If it returns, return 0 (about as
-		! wrong as possible, but that is what SunOS does...).
-		t	ST_DIV0
-		retl
-		clr	%o0
-
-1:
-	cmp	R, V			! if divisor exceeds dividend, done
-	blu	Lgot_result		! (and algorithm fails otherwise)
-	clr	Q
-	sethi	%hi(1 << (WORDSIZE - TOPBITS - 1)), T
-	cmp	R, T
-	blu	Lnot_really_big
-	clr	ITER
-
-	! `Here the dividend is >= 2^(31-N) or so.  We must be careful here,
-	! as our usual N-at-a-shot divide step will cause overflow and havoc.
-	! The number of bits in the result here is N*ITER+SC, where SC <= N.
-	! Compute ITER in an unorthodox manner: know we need to shift V into
-	! the top decade: so do not even bother to compare to R.'
-	1:
-		cmp	V, T
-		bgeu	3f
-		mov	1, SC
-		sll	V, N, V
-		b	1b
-		inc	ITER
-
-	! Now compute SC.
-	2:	addcc	V, V, V
-		bcc	Lnot_too_big
-		inc	SC
-
-		! We get here if the divisor overflowed while shifting.
-		! This means that R has the high-order bit set.
-		! Restore V and subtract from R.
-		sll	T, TOPBITS, T	! high order bit
-		srl	V, 1, V		! rest of V
-		add	V, T, V
-		b	Ldo_single_div
-		dec	SC
-
-	Lnot_too_big:
-	3:	cmp	V, R
-		blu	2b
-		nop
-		be	Ldo_single_div
-		nop
-	/* NB: these are commented out in the V8-Sparc manual as well */
-	/* (I do not understand this) */
-	! V > R: went too far: back up 1 step
-	!	srl	V, 1, V
-	!	dec	SC
-	! do single-bit divide steps
-	!
-	! We have to be careful here.  We know that R >= V, so we can do the
-	! first divide step without thinking.  BUT, the others are conditional,
-	! and are only done if R >= 0.  Because both R and V may have the high-
-	! order bit set in the first step, just falling into the regular
-	! division loop will mess up the first time around.
-	! So we unroll slightly...
-	Ldo_single_div:
-		deccc	SC
-		bl	Lend_regular_divide
-		nop
-		sub	R, V, R
-		mov	1, Q
-		b	Lend_single_divloop
-		nop
-	Lsingle_divloop:
-		sll	Q, 1, Q
-		bl	1f
-		srl	V, 1, V
-		! R >= 0
-		sub	R, V, R
-		b	2f
-		inc	Q
-	1:	! R < 0
-		add	R, V, R
-		dec	Q
-	2:
-	Lend_single_divloop:
-		deccc	SC
-		bge	Lsingle_divloop
-		tst	R
-		b,a	Lend_regular_divide
-
-Lnot_really_big:
-1:
-	sll	V, N, V
-	cmp	V, R
-	bleu	1b
-	inccc	ITER
-	be	Lgot_result
-	dec	ITER
-
-	tst	R	! set up for initial iteration
-Ldivloop:
-	sll	Q, N, Q
-	DEVELOP_QUOTIENT_BITS(1, 0)
-Lend_regular_divide:
-	deccc	ITER
-	bge	Ldivloop
-	tst	R
-	bl,a	Lgot_result
-	! non-restoring fixup here (one instruction only!)
-ifelse(OP, `div',
-`	dec	Q
-', `	add	R, divisor, R
-')
-
-Lgot_result:
-ifelse(S, `true',
-`	! check to see if answer should be < 0
-	tst	SIGN
-	bl,a	1f
-	ifelse(OP, `div', `neg Q', `neg R')
-1:')
-	retl
-	ifelse(OP, `div', `mov Q, %o0', `mov R, %o0')
diff --git a/lib/libc/arch/sparc/gen/fabs.S b/lib/libc/arch/sparc/gen/fabs.S
deleted file mode 100644
index ef7dafa4b..000000000
--- a/lib/libc/arch/sparc/gen/fabs.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: fabs.S,v 1.4 2003/08/07 16:42:23 agc 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.
- * 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.
- *
- * from: Header: fabs.s,v 1.4 91/10/07 23:59:05 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)fabs.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: fabs.S,v 1.4 2003/08/07 16:42:23 agc Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* fabs - floating absolute value */
-
-
-ENTRY(fabs)
-	std	%o0, [%sp + 32]		! return value => %f0:f1
-	ldd	[%sp + 32], %f0		! (via kernel %o0/%o1 slot)
-	retl
-	 fabss	%f0, %f0		! return absolute value
diff --git a/lib/libc/arch/sparc/gen/fixunsdfsi.S b/lib/libc/arch/sparc/gen/fixunsdfsi.S
deleted file mode 100644
index 1d258ba4b..000000000
--- a/lib/libc/arch/sparc/gen/fixunsdfsi.S
+++ /dev/null
@@ -1,93 +0,0 @@
-/*	$NetBSD: fixunsdfsi.S,v 1.6 2013/09/12 15:36:16 joerg 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.
- * 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.
- *
- * from: Header: fixunsdfsi.s,v 1.3 91/10/08 00:03:15 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)fixunsdfsi.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: fixunsdfsi.S,v 1.6 2013/09/12 15:36:16 joerg Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Convert double to unsigned integer (for gcc).
- *
- * I have made the output for NaN agree with the Sun compiler, not
- * that it really matters, by using `fbul,a'.
- */
-
-
-	.align	8
-Lbig:
-	.word	0x41e00000		! .double 0r2147483648.0e+00
-	.word	0			! (who me, not trust the assembler?)
-
-ENTRY(__fixunsdfsi)
-	sub	%sp, 8, %sp
-	std	%o0, [%sp + 64]		! get argument into fpu reg
-	ldd	[%sp + 64], %f0
-#ifdef __PIC__
-	PICCY_SET(Lbig, %g1, %o0)
-	ldd	[%g1], %f2
-#else
-	sethi	%hi(Lbig), %g1
-	ldd	[%g1 + %lo(Lbig)], %f2
-#endif
-	fcmped	%f0, %f2		! d < 2^31, or NaN, or -Inf?
-	nop				! (fpop2 delay)
-	fbul,a	1f			! if so, use fdtoi to convert to int
-	fdtoi	%f0, %f0		!        (this includes negatives!)
-
-	! d does not fit in an int, so subtract 2^31, convert,
-	! and add 2^31 again (sigh).  Just hope the intermediate
-	! fits (if not, the result is undefined anyway).
-
-	fsubd	%f0, %f2, %f0		! d -= 2^31
-	fdtoi	%f0, %f0		! convert to int
-	st	%f0, [%sp + 64]		! move into return reg
-	ld	[%sp + 64], %o0
-	sethi	%hi(0x80000000), %o1
-	add	%o0, %o1, %o0		! add 2^31
-	retl
-	add	%sp, 8, %sp
-
-1:
-	st	%f0, [%sp + 64]		! return result
-	ld	[%sp + 64], %o0
-	retl
-	add	%sp, 8, %sp
diff --git a/lib/libc/arch/sparc/gen/flt_rounds.c b/lib/libc/arch/sparc/gen/flt_rounds.c
deleted file mode 100644
index c64b1ff86..000000000
--- a/lib/libc/arch/sparc/gen/flt_rounds.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*	$NetBSD: flt_rounds.c,v 1.7 2012/03/21 00:38:34 christos Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.7 2012/03/21 00:38:34 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <machine/float.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	0,	/* round to zero */
-	2,	/* round to positive infinity */
-	3	/* round to negative infinity */
-};
-
-int
-__flt_rounds(void)
-{
-	unsigned int x;
-
-	__asm("st %%fsr,%0" : "=m" (*&x));
-	return map[(x >> 30) & 0x03];
-}
diff --git a/lib/libc/arch/sparc/gen/fpgetmask.c b/lib/libc/arch/sparc/gen/fpgetmask.c
deleted file mode 100644
index 281e2474b..000000000
--- a/lib/libc/arch/sparc/gen/fpgetmask.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*	$NetBSD: fpgetmask.c,v 1.6 2012/03/21 00:38:34 christos Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetmask.c,v 1.6 2012/03/21 00:38:34 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetmask,_fpgetmask)
-#endif
-
-fp_except
-fpgetmask(void)
-{
-	unsigned int x;
-
-	__asm("st %%fsr,%0" : "=m" (*&x));
-	return (x >> 23) & 0x1f;
-}
diff --git a/lib/libc/arch/sparc/gen/fpgetround.c b/lib/libc/arch/sparc/gen/fpgetround.c
deleted file mode 100644
index eafd21a24..000000000
--- a/lib/libc/arch/sparc/gen/fpgetround.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*	$NetBSD: fpgetround.c,v 1.6 2012/03/21 00:38:34 christos Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.6 2012/03/21 00:38:34 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetround,_fpgetround)
-#endif
-
-fp_rnd
-fpgetround(void)
-{
-	unsigned int x;
-
-	__asm("st %%fsr,%0" : "=m" (*&x));
-	return (x >> 30) & 0x03;
-}
diff --git a/lib/libc/arch/sparc/gen/fpgetsticky.c b/lib/libc/arch/sparc/gen/fpgetsticky.c
deleted file mode 100644
index 3184ee1bc..000000000
--- a/lib/libc/arch/sparc/gen/fpgetsticky.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*	$NetBSD: fpgetsticky.c,v 1.6 2012/03/21 00:38:34 christos Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetsticky.c,v 1.6 2012/03/21 00:38:34 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-fp_except
-fpgetsticky(void)
-{
-	unsigned int x;
-
-	__asm("st %%fsr,%0" : "=m" (*&x));
-	return (x >> 5) & 0x1f;
-}
diff --git a/lib/libc/arch/sparc/gen/fpsetmask.c b/lib/libc/arch/sparc/gen/fpsetmask.c
deleted file mode 100644
index 250761e48..000000000
--- a/lib/libc/arch/sparc/gen/fpsetmask.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: fpsetmask.c,v 1.6 2012/03/21 00:38:34 christos Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetmask.c,v 1.6 2012/03/21 00:38:34 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetmask,_fpsetmask)
-#endif
-
-fp_except
-fpsetmask(fp_except mask)
-{
-	fp_except old;
-	fp_except new;
-
-	__asm("st %%fsr,%0" : "=m" (*&old));
-
-	new = old;
-	new &= ~(0x1f << 23); 
-	new |= ((mask & 0x1f) << 23);
-
-	__asm("ld %0,%%fsr" : : "m" (*&new));
-
-	return (old >> 23) & 0x1f;
-}
diff --git a/lib/libc/arch/sparc/gen/fpsetround.c b/lib/libc/arch/sparc/gen/fpsetround.c
deleted file mode 100644
index 4a0700ffa..000000000
--- a/lib/libc/arch/sparc/gen/fpsetround.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: fpsetround.c,v 1.6 2012/03/21 00:38:35 christos Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.6 2012/03/21 00:38:35 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetround,_fpsetround)
-#endif
-
-fp_rnd
-fpsetround(fp_rnd rnd_dir)
-{
-	fp_rnd old;
-	fp_rnd new;
-
-	__asm("st %%fsr,%0" : "=m" (*&old));
-
-	new = old;
-	new &= ~(0x03 << 30); 
-	new |= ((rnd_dir & 0x03) << 30);
-
-	__asm("ld %0,%%fsr" : : "m" (*&new));
-
-	return ((unsigned int)old >> 30) & 0x03;
-}
diff --git a/lib/libc/arch/sparc/gen/fpsetsticky.c b/lib/libc/arch/sparc/gen/fpsetsticky.c
deleted file mode 100644
index 63d3a9ba0..000000000
--- a/lib/libc/arch/sparc/gen/fpsetsticky.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: fpsetsticky.c,v 1.6 2013/10/18 02:19:12 mrg Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetsticky.c,v 1.6 2013/10/18 02:19:12 mrg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetsticky,_fpsetsticky)
-#endif
-
-fp_except
-fpsetsticky(fp_except sticky)
-{
-	fp_except old;
-	fp_except new;
-
-	__asm("st %%fsr,%0" : "=m" (*&old));
-
-	new = old;
-	new &= ~(0x1f << 5); 
-	new |= ((sticky & 0x1f) << 5);
-
-	__asm("ld %0,%%fsr" : : "m" (*&new));
-
-	return (old >> 5) & 0x1f;
-}
diff --git a/lib/libc/arch/sparc/gen/longjmp.c b/lib/libc/arch/sparc/gen/longjmp.c
deleted file mode 100644
index fe46e50a8..000000000
--- a/lib/libc/arch/sparc/gen/longjmp.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*	$NetBSD: longjmp.c,v 1.3 2011/04/30 23:41:12 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christian Limpach.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stddef.h>
-
-#define __LIBC12_SOURCE__
-#include <setjmp.h>
-#include <compat/include/setjmp.h>
-
-struct __jmp_buf_regs_t {
-	__greg_t	g4;
-	__greg_t	g7;
-	__greg_t	save_mask;
-};
-
-/*
- * setjmp.S uses hard coded offsets into the jump_buf,
- * make sure any changes cause a compile failure here
- */
-__CTASSERT(56 == offsetof(struct __jmp_buf_regs_t,save_mask) +
-	sizeof(struct sigcontext));
-__CTASSERT(sizeof(sigjmp_buf) >= sizeof(struct __jmp_buf_regs_t) +
-	sizeof(struct sigcontext));
-
-/*
- * Use setcontext to reload the stack pointer, program counter <pc,npc>, and
- * set the return value in %o0.  The %i and %l registers will be reloaded
- * from the place to which %sp points.
- */
-void
-__longjmp14(jmp_buf env, int val)
-{
-	struct sigcontext *sc = (void *)env;
-	struct __jmp_buf_regs_t *r = (void*)&sc[1];
-	ucontext_t uc;
-
-	/* Ensure non-zero SP */
-	if (sc->sc_sp == 0)
-		goto err;
-
-	/* Initialise the context */
-	memset(&uc, 0, sizeof(uc));
-
-	/*
-	 * Set _UC_{SET,CLR}STACK according to SS_ONSTACK.
-	 *
-	 * Restore the signal mask with sigprocmask() instead of _UC_SIGMASK,
-	 * since libpthread may want to interpose on signal handling.
-	 */
-	uc.uc_flags = _UC_CPU | (sc->sc_onstack ? _UC_SETSTACK : _UC_CLRSTACK);
-
-	sigprocmask(SIG_SETMASK, &sc->sc_mask, NULL);
-
-	/* Extract PSR, PC, NPC and SP from jmp_buf */
-	uc.uc_mcontext.__gregs[_REG_PSR] = sc->sc_psr;
-	uc.uc_mcontext.__gregs[_REG_PC] = sc->sc_pc;
-	uc.uc_mcontext.__gregs[_REG_nPC] = sc->sc_pc+4;
-	uc.uc_mcontext.__gregs[_REG_O6] = sc->sc_sp;
-	uc.uc_mcontext.__gregs[_REG_G2] = sc->sc_g1;
-	uc.uc_mcontext.__gregs[_REG_G3] = sc->sc_npc;
-	uc.uc_mcontext.__gregs[_REG_G4] = r->g4;
-	uc.uc_mcontext.__gregs[_REG_G7] = r->g7;
-
-	/* Set the return value; make sure it's non-zero */
-	uc.uc_mcontext.__gregs[_REG_O0] = (val != 0 ? val : 1);
-
-	setcontext(&uc);
-
-err:
-	longjmperror();
-	abort();
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/sparc/gen/makecontext.c b/lib/libc/arch/sparc/gen/makecontext.c
deleted file mode 100644
index 1742bfb27..000000000
--- a/lib/libc/arch/sparc/gen/makecontext.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.3 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.3 2008/04/28 20:22:57 martin Exp $");
-#endif
-
-#include <inttypes.h>
-#include <stddef.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#include <stdarg.h>
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	int i;
-	unsigned long *sp;
-	va_list ap;
-
-	sp = (unsigned long *)
-	    ((unsigned long)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
-	/* Make room for: rwindow, struct return pointer, argd, argx */
-	sp -= 8 + 8 + 1 + 6 + 1; /* CCFSZ, only in words */
-	/* CCFSZ provides space for up to 7 arguments, add more if necessary */
-	if (argc > 7)
-		sp -= argc - 7;
-	/* Align on double-word boundary. */
-	sp = (unsigned long *)((unsigned long)sp & ~0x7);
-
-	gr[_REG_O6] = (__greg_t)sp;
-	gr[_REG_PC] = (__greg_t)func;
-	gr[_REG_nPC] = (__greg_t)func + 4;
-	gr[_REG_O7] = (__greg_t)_resumecontext - 8;
-
-	va_start(ap, argc);
-	/* Pass up to 6 arguments in %o0..%o5. */
-	for (i = 0; i < argc && i < 6; i++)
-		gr[_REG_O0 + i] = va_arg(ap, unsigned long);
-	/* Pass any additional arguments on the stack. */
-	for (/* i = 6 */; i < argc; i++)
-		sp[8 + 8 + 1 + 6 + (i - 6)] = va_arg(ap, unsigned long);
-	va_end(ap);
-}
diff --git a/lib/libc/arch/sparc/gen/modf.S b/lib/libc/arch/sparc/gen/modf.S
deleted file mode 100644
index 72fd57467..000000000
--- a/lib/libc/arch/sparc/gen/modf.S
+++ /dev/null
@@ -1,197 +0,0 @@
-/*	$NetBSD: modf.S,v 1.7 2013/09/12 15:36:16 joerg 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.
- * 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.
- *
- * from: Header: modf.s,v 1.3 92/06/20 00:00:54 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)modf.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: modf.S,v 1.7 2013/09/12 15:36:16 joerg Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/fsr.h>
-
-/*
- * double modf(double val, double *iptr)
- *
- * Returns the fractional part of `val', storing the integer part of
- * `val' in *iptr.  Both *iptr and the return value have the same sign
- * as `val'.
- *
- * Method:
- *
- * We use the fpu's normalization hardware to compute the integer portion
- * of the double precision argument.  Sun IEEE double precision numbers
- * have 52 bits of mantissa, 11 bits of exponent, and one bit of sign,
- * with the sign occupying bit 31 of word 0, and the exponent bits 30:20
- * of word 0.  Thus, values >= 2^52 are by definition integers.
- *
- * If we take a value that is in the range [+0..2^52) and add 2^52, all
- * of the fractional bits fall out and all of the integer bits are summed
- * with 2^52.  If we then subtract 2^52, we get those integer bits back.
- * This must be done with rounding set to `towards 0' or `towards -inf'.
- * `Toward -inf' fails when the value is 0 (we get -0 back)....
- *
- * Note that this method will work anywhere, but is machine dependent in
- * various aspects.
- *
- * Stack usage:
- *	4@[%fp - 4]	saved %fsr
- *	4@[%fp - 8]	new %fsr with rounding set to `towards 0'
- *	8@[%fp - 16]	space for moving between %i and %f registers
- * Register usage:
- *	%i0%i1		double val;
- *	%l0		scratch
- *	%l1		sign bit (0x80000000)
- *	%i2		double *iptr;
- *	%f2:f3		`magic number' 2^52, in fpu registers
- *	%f4:f5		double v, in fpu registers
- */
-
-	.align	8
-Lmagic:
-	.word	0x43300000	! sign = 0, exponent = 52 + 1023, mantissa = 0
-	.word	0		! (i.e., .double 0r4503599627370496e+00)
-
-L0:
-	.word	0		! 0.0
-	.word	0
-
-ENTRY(modf)
-	save	%sp, -64-16, %sp
-
-	/*
-	 * First, compute v = abs(val) by clearing sign bit,
-	 * and then set up the fpu registers.  This would be
-	 * much easier if we could do alu operations on fpu registers!
-	 */
-	sethi	%hi(0x80000000), %l1	! sign bit
-	andn	%i0, %l1, %l0
-	st	%l0, [%fp - 16]
-#ifdef __PIC__
-	PICCY_SET(Lmagic, %l0, %o7)
-	ldd	[%l0], %f2
-#else
-	sethi	%hi(Lmagic), %l0
-	ldd	[%l0 + %lo(Lmagic)], %f2
-#endif
-	st	%i1, [%fp - 12]
-	ldd	[%fp - 16], %f4		! %f4:f5 = v
-
-	/*
-	 * Is %f4:f5 >= %f2:f3 ?  If so, it is all integer bits.
-	 * It is probably less, though.
-	 */
-	fcmped	%f4, %f2
-	nop				! fpop2 delay
-	fbuge	Lbig			! if >= (or unordered), go out
-	nop
-
-	/*
-	 * v < 2^52, so add 2^52, then subtract 2^52, but do it all
-	 * with rounding set towards zero.  We leave any enabled
-	 * traps enabled, but change the rounding mode.  This might
-	 * not be so good.  Oh well....
-	 */
-	st	%fsr, [%fp - 4]		! %l5 = current FSR mode
-	set	FSR_RD, %l3		! %l3 = rounding direction mask
-	ld	[%fp - 4], %l5
-	set	FSR_RD_RZ << FSR_RD_SHIFT, %l4
-	andn	%l5, %l3, %l6
-	or	%l6, %l4, %l6		! round towards zero, please
-	and	%l5, %l3, %l5		! save original rounding mode
-	st	%l6, [%fp - 8]
-	ld	[%fp - 8], %fsr
-
-	faddd	%f4, %f2, %f4		! %f4:f5 += 2^52
-	fsubd	%f4, %f2, %f4		! %f4:f5 -= 2^52
-
-	/*
-	 * Restore %fsr, but leave exceptions accrued.
-	 */
-	st	%fsr, [%fp - 4]
-	ld	[%fp - 4], %l6
-	andn	%l6, %l3, %l6		! %l6 = %fsr & ~FSR_RD;
-	or	%l5, %l6, %l5		! %l5 |= %l6;
-	st	%l5, [%fp - 4]
-	ld	[%fp - 4], %fsr		! restore %fsr, leaving accrued stuff
-
-	/*
-	 * Now insert the original sign in %f4:f5.
-	 * This is a lot of work, so it is conditional here.
-	 */
-	btst	%l1, %i0
-	be	1f
-	nop
-	st	%f4, [%fp - 16]
-	ld	[%fp - 16], %g1
-	or	%l1, %g1, %g1
-	st	%g1, [%fp - 16]
-	ld	[%fp - 16], %f4
-1:
-
-	/*
-	 * The value in %f4:f5 is now the integer portion of the original
-	 * argument.  We need to store this in *ival (%i2), subtract it
-	 * from the original value argument (%i0:i1), and return the result.
-	 */
-	std	%f4, [%i2]		! *ival = %f4:f5;
-	std	%i0, [%fp - 16]
-	ldd	[%fp - 16], %f0		! %f0:f1 = val;
-	fsubd	%f0, %f4, %f0		! %f0:f1 -= %f4:f5;
-	ret
-	restore
-
-Lbig:
-	/*
-	 * We get here if the original comparison of %f4:f5 (v) to
-	 * %f2:f3 (2^52) came out `greater or unordered'.  In this
-	 * case the integer part is the original value, and the
-	 * fractional part is 0.
-	 */
-#ifdef __PIC__
-	PICCY_SET(L0, %l0, %o7)
-	std	%f0, [%i2]		! *ival = val;
-	ldd	[%l0], %f0		! return 0.0;
-#else
-	sethi	%hi(L0), %l0
-	std	%f0, [%i2]		! *ival = val;
-	ldd	[%l0 + %lo(L0)], %f0	! return 0.0;
-#endif
-	ret
-	restore
diff --git a/lib/libc/arch/sparc/gen/nanf.c b/lib/libc/arch/sparc/gen/nanf.c
deleted file mode 100644
index 1688d0eae..000000000
--- a/lib/libc/arch/sparc/gen/nanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:02 martin Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:02 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-		{ { 0x7f, 0xc0,    0,    0 } };
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/sparc/gen/resumecontext.c b/lib/libc/arch/sparc/gen/resumecontext.c
deleted file mode 100644
index 57d68fdf8..000000000
--- a/lib/libc/arch/sparc/gen/resumecontext.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:58 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:58 joerg Exp $");
-#endif
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <ucontext.h>
-#include <unistd.h>
-#include "extern.h"
-
-void
-_resumecontext(void)
-{
-	ucontext_t uct;
-
-	(void)getcontext(&uct);
-	if (uct.uc_link == NULL) 
-		exit(0);
-	(void)setcontext(uct.uc_link);
-	_exit(-1);
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/sparc/gen/setjmp.S b/lib/libc/arch/sparc/gen/setjmp.S
deleted file mode 100644
index 451f3c70f..000000000
--- a/lib/libc/arch/sparc/gen/setjmp.S
+++ /dev/null
@@ -1,88 +0,0 @@
-/*	$NetBSD: setjmp.S,v 1.12 2011/04/30 23:41:13 martin 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.
- * 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.
- *
- * from: Header: setjmp.s,v 1.2 92/06/25 03:18:43 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)setjmp.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: setjmp.S,v 1.12 2011/04/30 23:41:13 martin Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * 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 a struct sigcontext, see <signal.h>
- */
-
-#include "SYS.h"
-
-ENTRY(__setjmp14)
-	save	%sp, -CCFSZ, %sp
-	/*
-	 * local vars on stack: struct sigstack foo @ offset 0x48
-	 * Note: sc_g1 is not used; sc_o0 is set in longjmp()
-	 */
-	mov	1, %o0		/* SIG_BLOCK */
-	add	%i0, 32, %o2	/* build sigcontext sc.sc_mask */
-	call	_C_LABEL(__sigprocmask14)
-	 clr	%o1		/* sigprocmask(SIG_BLOCK, NULL, &sc.sc_mask) */
-
-	add	%sp, 0x48, %o1	/* (foo being in arg dump area) */
-	call	_C_LABEL(__sigaltstack14)
-	 clr	%o0		/* sigstack(NULL, &foo) */
-
-	ld	[%sp + 0x48 + 8], %o0	/* foo.ss_flags */
-	and	%o0, 1, %o1	/* onstack = foo.ss_flags & 1; */
-	st	%o1, [%i0 + 0]	/* sc.sc_onstack = current onstack; */
-	st	%fp, [%i0 + 8]	/* sc.sc_sp = (caller's) sp */
-	add	%i7, 8, %o0
-	st	%o0, [%i0 + 12]	/* sc.sc_pc = return_pc */
-	st	%g3, [%i0 + 16]	/* sc.sc_npc */
-	st	%g0, [%i0 + 20]	/* sc.sc_psr = (clean psr) */
-	st	%g2, [%i0 + 24]
-	st	%g4, [%i0 + 48]
-	st	%g7, [%i0 + 52]
-	ret			/* return 0 */
-	 restore	%g0, %g0, %o0
-
diff --git a/lib/libc/arch/sparc/gen/sigsetjmp.S b/lib/libc/arch/sparc/gen/sigsetjmp.S
deleted file mode 100644
index 27281ca3c..000000000
--- a/lib/libc/arch/sparc/gen/sigsetjmp.S
+++ /dev/null
@@ -1,93 +0,0 @@
-/*	$NetBSD: sigsetjmp.S,v 1.7 2013/09/12 15:36:16 joerg Exp $	*/
-/*
- * Copyright (c) 1995 Paul Kranenburg
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Paul Kranenburg.
- * 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 "SYS.h"
-
-#ifdef __PIC__
-
-ENTRY(__sigsetjmp14)
-	PIC_PROLOGUE(%g1, %g2)		! %g1 = _GLOBAL_OFFSET_TABLE
-	tst	%o1
-	bnz	1f
-	 st	%o1, [%o0 + 56]		! jmpbuf[JBLEN] = savemask
-
-	!! if (savemask == 0) goto _setjmp
-	set	_C_LABEL(_setjmp), %g2
-	ld	[%g1 + %g2], %g1
-	jmp %g1
-	 nop
-
-	!! if (savemask != 0) goto setjmp
-1:	set	_C_LABEL(__setjmp14), %g2
-	ld	[%g1 + %g2], %g1
-	jmp %g1
-	 nop
-
-
-ENTRY(__siglongjmp14)
-	PIC_PROLOGUE(%g1, %g2)		! %g1 = _GLOBAL_OFFSET_TABLE
-	ld	[%o0 + 56], %g2		! restoremask = jmpbuf[JBLEN]
-	tst	%g2
-	bnz	1f
-	 nop
-
-	!! if (restoremask == 0) goto _longjmp
-	set	_C_LABEL(_longjmp), %g2
-	ld	[%g1 + %g2], %g1
-	jmp %g1
-	 nop
-
-	!! if (restoremask != 0) goto longjmp
-1:	set	_C_LABEL(__longjmp14), %g2
-	ld	[%g1 + %g2], %g1
-	jmp %g1
-	 nop
-
-#else /* !__PIC__ */
-
-ENTRY(__sigsetjmp14)
-	cmp %o1,0
-	be _C_LABEL(_setjmp)
-	st %o1,[%o0+56]		! jmpbuf[JBLEN]
-	nop
-	ba,a _C_LABEL(__setjmp14)
-	unimp 0
-
-ENTRY(__siglongjmp14)
-	ld [%o0+56],%g1
-	cmp %g1,0
-	be _C_LABEL(_longjmp)
-	nop
-	ba,a _C_LABEL(__longjmp14)
-	unimp 0
-
-#endif /* !__PIC__ */
diff --git a/lib/libc/arch/sparc/gen/swapcontext.S b/lib/libc/arch/sparc/gen/swapcontext.S
deleted file mode 100644
index 21830b44a..000000000
--- a/lib/libc/arch/sparc/gen/swapcontext.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.5 2013/09/12 15:36:16 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: swapcontext.S,v 1.5 2013/09/12 15:36:16 joerg Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-ENTRY(swapcontext)
-	mov	%o0, %o2			! must save pointer
-	mov	%o1, %o3			! must save pointer
-	mov	SYS_getcontext, %g1
-	t	ST_SYSCALL
-	bcc,a	1f
-	 st	%g0, [%o2 + 40 + 11 * 4]	! gr[_REG_O0] = 0
-	ERROR()
-1:
-	add	%o7, 12, %o1
-	st	%o1, [%o2 + 40 + 2 * 4]		! gr[_REG_nPC] = retaddr + 4
-	add	%o7, 8, %o1
-	st	%o1, [%o2 + 40 + 1 * 4]		! gr[_REG_PC] = retaddr
-
-#ifdef __PIC__
-	PIC_PROLOGUE(%g1, %g2)			! %g1 = _GLOBAL_OFFSET_TABLE
-	set	_C_LABEL(setcontext), %g2
-	ld	[%g1 + %g2], %g1
-	jmp	%g1
-	 mov	%o3, %o0
-#else
-	jmp	_C_LABEL(setcontext)
-	 mov	%o3, %o0
-#endif
diff --git a/lib/libc/arch/sparc/net/Makefile.inc b/lib/libc/arch/sparc/net/Makefile.inc
deleted file mode 100644
index 0279aaa3b..000000000
--- a/lib/libc/arch/sparc/net/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 1995/02/25 14:59:11 cgd Exp $
-
-SRCS+=  htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/arch/sparc/stdlib/Makefile.inc b/lib/libc/arch/sparc/stdlib/Makefile.inc
deleted file mode 100644
index 102817f9c..000000000
--- a/lib/libc/arch/sparc/stdlib/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2009/08/11 17:30:43 dsl Exp $
-
-SRCS+=	llabs.S
-NO_SRCS+= imaxabs.S
diff --git a/lib/libc/arch/sparc/stdlib/llabs.S b/lib/libc/arch/sparc/stdlib/llabs.S
deleted file mode 100644
index ab81609cc..000000000
--- a/lib/libc/arch/sparc/stdlib/llabs.S
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: llabs.S,v 1.4 2008/08/04 21:29:28 matt 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.
- * 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.
- *
- * from: Header: abs.s,v 1.1 91/07/06 18:01:57 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "from: @(#)abs.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: llabs.S,v 1.4 2008/08/04 21:29:28 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(llabs, _llabs)
-WEAK_ALIAS(imaxabs, _llabs)
-#endif
-
-/* llabs - long long int absolute value */
-/* imaxabs - intmax_t absolute value */
-
-
-#ifdef WEAK_ALIAS
-ENTRY(_llabs)
-#else
-ENTRY(llabs)
-#endif
-	tst	%o0
-	bge	1f
-	 nop
-	subcc	%g0, %o1, %o1
-	subx	%g0, %o0, %o0
-1:	retl
-	 nop
diff --git a/lib/libc/arch/sparc/string/Makefile.inc b/lib/libc/arch/sparc/string/Makefile.inc
deleted file mode 100644
index ed9c5d329..000000000
--- a/lib/libc/arch/sparc/string/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 2009/07/30 20:57:17 dsl Exp $
-
-SRCS+=	bzero.S ffs.S memset.S strlen.S
diff --git a/lib/libc/arch/sparc/sys/__clone.S b/lib/libc/arch/sparc/sys/__clone.S
deleted file mode 100644
index c420ded64..000000000
--- a/lib/libc/arch/sparc/sys/__clone.S
+++ /dev/null
@@ -1,93 +0,0 @@
-/*	$NetBSD: __clone.S,v 1.6 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-     
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *      
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:     
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *      
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(clone, __clone)
-#endif
-
-/*
- * int __clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-ENTRY(__clone)
-	save	%sp, -CCFSZ, %sp
-
-	/*
-	 * Sanity checks: func and stack may not be NULL.
-	 */
-	tst	%i0
-	be	8f		! func == NULL, bail
-	 orcc	%i1, %g0, %o1	! setup stack arg for syscall, test
-	be	8f		! stack == NULL, bail
-	 mov	%i2, %o0	! setup flags arg for syscall
-
-	/*
-	 * Allocate "caller's" frame in the child stack as ABI
-	 * requires.
-	 *
-	 * We pass the function and the argument to the child by
-	 * stashing them at the bottom of the frame.  There they are
-	 * safe from window spill would we need to take one as it's
-	 * below the window save area.
-	 */
-	sub	%o1, CCFSZ, %o1	! make space on the child's stack
-	st	%i0, [%o1+CCFSZ-8]	! save func
-	st	%i3, [%o1+CCFSZ-4]	! save arg
-
-	/*
-	 * Args are now set up for system call as (flags, stack).
-	 */
-	mov	SYS___clone, %g1
-	t	ST_SYSCALL
-	bcs	9f
-	 tst	%o1		! %o1 (rv[1]) == 0 in parent
-
-1:	bz	2f		! yes, parent
-	 ld	[%sp+CCFSZ-8], %l0	! grab the function...
-	call	%l0 		! Call the clone's entry point.
-	 ld	[%sp+CCFSZ-4], %o0	! ...and the argument from the stack
-
-	CALL(_C_LABEL(_exit))
-	/* NOTREACHED */
-
-2:	ret
-	 restore %g0, %o0, %o0
-
-8:	restore	%g0, EINVAL, %o0
-	ERROR()
-	/* NOTREACHED */
-
-9:	restore %g0, %o0, %o0
-	ERROR()
-	/* NOTREACHED */
diff --git a/lib/libc/arch/sparc/sys/__sigaction14_sigtramp.c b/lib/libc/arch/sparc/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index 263296403..000000000
--- a/lib/libc/arch/sparc/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.7 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.7 2008/04/28 20:22:57 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern void __sigtramp_siginfo_2(void);
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the compatibility SIGCONTEXT trampoline if SA_SIGINFO
-	 * is not set in the sigaction.
-	 */
-	if (act && (act->sa_flags & SA_SIGINFO) == 0) {
-		extern void __sigtramp_sigcontext_1(void);
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-					   __sigtramp_sigcontext_1, 1);
-		/*
-		 * EINVAL might indicate that trampoline version 1 is
-		 * not supported by the kernel; fall back on native
-		 * SIGINFO trampoline.
-		 */
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/sparc/sys/__sigtramp2.S b/lib/libc/arch/sparc/sys/__sigtramp2.S
deleted file mode 100644
index 3cb90dad3..000000000
--- a/lib/libc/arch/sparc/sys/__sigtramp2.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.2 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Paul Kranenburg.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __sigtramp2.S,v 1.2 2008/04/28 20:22:57 martin Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-/*
- * When this code is run, the stack looks like:
- *	[%sp]			struct frame
- *	[%sp + 96]		siginfo_t
- *	[%sp + 96 + 128]	ucontext_t
- *	    .
- *	    .
- */
-ENTRY_NOPROFILE(__sigtramp_siginfo_2)
-	add	%sp, 96 + 128, %o0	/* get pointer to ucontext */
-	mov	SYS_setcontext, %g1
-	t	ST_SYSCALL		/* call setcontext */
-	mov	SYS_exit, %g1		/* exit with errno */
-	t	ST_SYSCALL		/* if sigreturn fails */
diff --git a/lib/libc/arch/sparc/sys/__syscall.S b/lib/libc/arch/sparc/sys/__syscall.S
deleted file mode 100644
index 1e00e4205..000000000
--- a/lib/libc/arch/sparc/sys/__syscall.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*	$NetBSD: __syscall.S,v 1.2 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Paul Kranenburg.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __syscall.S,v 1.2 2008/04/28 20:22:57 martin Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-RSYSCALL(__syscall)
diff --git a/lib/libc/arch/sparc/sys/__vfork14.S b/lib/libc/arch/sparc/sys/__vfork14.S
deleted file mode 100644
index 74cc932ce..000000000
--- a/lib/libc/arch/sparc/sys/__vfork14.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: __vfork14.S,v 1.2 2003/08/07 16:42:25 agc 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.
- * 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.
- *
- * from: Header: Ovfork.s,v 1.1 91/07/06 13:05:56 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)Ovfork.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: __vfork14.S,v 1.2 2003/08/07 16:42:25 agc Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-/*
- * pid = vfork();
- *
- * %o1 == 0 in parent process, 1 in child process.
- * %o0 == pid of child in parent, pid of parent in child.
- */
-
-#include "SYS.h"
-
-SYSCALL(__vfork14)
-	dec	%o1		! from 1 to 0 in child, 0 to -1 in parent
-	retl
-	and	%o0, %o1, %o0	! return 0 in child, pid in parent
diff --git a/lib/libc/arch/sparc/sys/brk.S b/lib/libc/arch/sparc/sys/brk.S
deleted file mode 100644
index 8825956a1..000000000
--- a/lib/libc/arch/sparc/sys/brk.S
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$NetBSD: brk.S,v 1.16 2013/09/12 15:36:16 joerg 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.
- * 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.
- *
- * from: Header: brk.s,v 1.3 92/06/25 12:56:05 mccanne Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)brk.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: brk.S,v 1.16 2013/09/12 15:36:16 joerg Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-	.globl	CURBRK
-	.globl	_C_LABEL(__minbrk)
-	.globl	_end
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
-#endif
-
-	.data
-_C_LABEL(__minbrk):
-	.long	_end			! lower brk limit; also for gmon code
-	.text
-
-ENTRY(_brk)
-#ifdef __PIC__
-	PIC_PROLOGUE(%o5,%o4)
-	set	_C_LABEL(__minbrk), %o4
-	ld	[%o5 + %o4], %o4
-	ld	[%o4], %o1		! %o1 = minbrk
-	cmp	%o1, %o0		! if (minbrk > %o0)
-	bgu,a	0f
-	 mov	%o1, %o0		!	%o0 = minbrk
-0:
-	mov	%o0, %o2		! save argument to syscall
-	mov	SYS_break, %g1
-	t	ST_SYSCALL
-	set	CURBRK, %o3
-	bcc,a	1f
-	 ld	[%o5 + %o3], %o4
-	ERROR()
-1:
-	retl				! success, return 0 & record new break
-	 st	%o2, [%o4]
-#else
-	sethi	%hi(_C_LABEL(__minbrk)), %o1	! %o1 = minbrk
-	ld	[%o1 + %lo(_C_LABEL(__minbrk))], %o1
-	cmp	%o1, %o0		! if (minbrk > %o0)
-	bgu,a	0f
-	 mov	%o1, %o0		!	%o0 = minbrk
-0:
-	mov	%o0, %o2		! save argument to syscall
-	mov	SYS_break, %g1
-	t	ST_SYSCALL
-	bcc,a	1f
-	 sethi	%hi(CURBRK), %g1
-	ERROR()
-1:
-	retl				! success, return 0 & record new break
-	 st	%o2, [%g1 + %lo(CURBRK)]
-#endif
diff --git a/lib/libc/arch/sparc/sys/cerror.S b/lib/libc/arch/sparc/sys/cerror.S
deleted file mode 100644
index 10a71e0fb..000000000
--- a/lib/libc/arch/sparc/sys/cerror.S
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.11 2013/09/12 15:36:16 joerg 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.
- * 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.
- *
- * from: Header: cerror.s,v 1.3 92/07/02 04:17:59 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)cerror.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: cerror.S,v 1.11 2013/09/12 15:36:16 joerg Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-#ifdef _REENTRANT
-FUNC(CERROR)
-	save	%sp, -CCFSZ, %sp
-	call	_C_LABEL(__errno)
-	 nop
-	st	%i0, [%o0]
-	mov	-1, %i0
-	ret
-	 restore %g0, -1, %o1
-#else
-	.globl	_C_LABEL(errno)
-#ifdef __PIC__
-FUNC(CERROR)
-	set	_C_LABEL(errno), %g2
-	ld	[%g1 + %g2], %g1
-	st	%o0, [%g1]
-	mov	-1, %o0
-	retl
-	 mov	-1, %o1
-#else
-FUNC(CERROR)
-	sethi	%hi(_C_LABEL(errno)), %g1
-	st	%o0, [%g1 + %lo(_C_LABEL(errno))]
-	mov	-1, %o0
-	retl
-	 mov	-1, %o1
-#endif
-#endif /* _REENTRANT */
diff --git a/lib/libc/arch/sparc/sys/exect.S b/lib/libc/arch/sparc/sys/exect.S
deleted file mode 100644
index 208cef90b..000000000
--- a/lib/libc/arch/sparc/sys/exect.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: exect.S,v 1.3 2003/08/07 16:42:25 agc 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.
- * 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.
- *
- * from: Header: exect.s,v 1.1 91/07/06 13:05:57 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)exect.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: exect.S,v 1.3 2003/08/07 16:42:25 agc Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-ENTRY(exect)
-	mov	SYS_execve, %g1	/* execve(file, argv, env) */
-	t	ST_SYSCALL
-	ERROR()
diff --git a/lib/libc/arch/sparc/sys/fork.S b/lib/libc/arch/sparc/sys/fork.S
deleted file mode 100644
index 1ffb1901b..000000000
--- a/lib/libc/arch/sparc/sys/fork.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: fork.S,v 1.5 2003/08/07 16:42:25 agc 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.
- * 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.
- *
- * from: Header: fork.s,v 1.1 91/07/06 13:05:58 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)fork.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: fork.S,v 1.5 2003/08/07 16:42:25 agc Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-_SYSCALL(__fork,fork)
-	dec	%o1		! from 1 to 0 in child, 0 to -1 in parent
-	retl
-	 and	%o0, %o1, %o0	! return 0 in child, pid in parent
diff --git a/lib/libc/arch/sparc/sys/getcontext.S b/lib/libc/arch/sparc/sys/getcontext.S
deleted file mode 100644
index d5788bb01..000000000
--- a/lib/libc/arch/sparc/sys/getcontext.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.2 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: getcontext.S,v 1.2 2008/04/28 20:22:57 martin Exp $")
-#endif /* SYSLIBC_SCCS && !lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext, _getcontext)
-#endif
-
-ENTRY(_getcontext)
-	mov	%o0, %o2			! must save pointer
-	mov	SYS_getcontext, %g1
-	t	ST_SYSCALL
-	bcc,a	1f
-	 clr	[%o2 + 40 + 11 * 4]		! gr[_REG_O0] = 0
-	ERROR()
-1:
-	add	%o7, 8, %o1
-	st	%o1, [%o2 + 40 + 1 * 4]		! gr[_REG_PC] = retaddr
-	add	%o7, 12, %o1
-	retl
-	 st	%o1, [%o2 + 40 + 2 * 4]		! gr[_REG_nPC] = retaddr + 4
diff --git a/lib/libc/arch/sparc/sys/pipe.S b/lib/libc/arch/sparc/sys/pipe.S
deleted file mode 100644
index 457c713f3..000000000
--- a/lib/libc/arch/sparc/sys/pipe.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.4 2003/08/07 16:42:25 agc 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.
- * 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.
- *
- * from: Header: pipe.s,v 1.1 91/07/06 13:05:58 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)pipe.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: pipe.S,v 1.4 2003/08/07 16:42:25 agc Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-#endif
-
-ENTRY(_pipe)
-	mov	%o0, %o2	! save pointer
-	mov	SYS_pipe, %g1
-	t	ST_SYSCALL	! pipe()
-	bcc,a	1f
-	 st	%o0, [%o2]	! success, store fds
-	ERROR()
-1:
-	st	%o1, [%o2 + 4]
-	retl			! and return 0
-	 clr	%o0
diff --git a/lib/libc/arch/sparc/sys/ptrace.S b/lib/libc/arch/sparc/sys/ptrace.S
deleted file mode 100644
index b0f3e66b9..000000000
--- a/lib/libc/arch/sparc/sys/ptrace.S
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.9 2013/09/12 15:36:16 joerg 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.
- * 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.
- *
- * from: Header: ptrace.s,v 1.2 91/12/20 01:59:00 leres Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)ptrace.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: ptrace.S,v 1.9 2013/09/12 15:36:16 joerg Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-ENTRY(ptrace)
-#ifdef _REENTRANT
-	save	%sp, -CCFSZ, %sp
-	call	_C_LABEL(__errno)
-	 nop
-	st	%g0, [%o0]
-	restore
-#else
-#ifdef __PIC__
-	PIC_PROLOGUE(%g1,%g2)
-	set	_C_LABEL(errno), %g2
-	ld	[%g1 + %g2], %g1
-	st	%g0, [%g1]
-#else
-	sethi	%hi(_C_LABEL(errno)), %g1
-	st	%g0, [%g1 + %lo(_C_LABEL(errno))]
-#endif
-#endif /* !_REENTRANT */
-	mov	SYS_ptrace, %g1
-	t	ST_SYSCALL
-	bcc	1f
-	 nop
-	ERROR()
-1:
-	retl
-	 nop
diff --git a/lib/libc/arch/sparc/sys/sbrk.S b/lib/libc/arch/sparc/sys/sbrk.S
deleted file mode 100644
index 1a8347bc5..000000000
--- a/lib/libc/arch/sparc/sys/sbrk.S
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.11 2013/09/12 15:36:16 joerg 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.
- * 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.
- *
- * from: Header: sbrk.s,v 1.3 92/07/02 00:56:49 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)sbrk.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: sbrk.S,v 1.11 2013/09/12 15:36:16 joerg Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-	.globl	_end
-	.globl	CURBRK
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-	.data
-CURBRK:	.long	_end
-	.text
-
-ENTRY(_sbrk)
-#ifdef __PIC__
-	PIC_PROLOGUE(%o5,%o4)
-	set	CURBRK, %o2
-	ld	[%o5 + %o2], %o2
-	ld	[%o2], %o3			! %o3 = old break
-	add	%o3, %o0, %o4			! %o4 = new break
-	mov	%o4, %o0			! copy for syscall
-	mov	SYS_break, %g1
-	t	ST_SYSCALL			! break(new_break)
-	bcc,a	1f				! if success,
-	 mov	%o3, %o0			!    set return value
-	ERROR()
-1:
-	retl					! and update curbrk
-	 st	%o4, [%o2]
-#else
-	sethi	%hi(CURBRK), %o2
-	ld	[%o2 + %lo(CURBRK)], %o3	! %o3 = old break
-	add	%o3, %o0, %o4			! %o4 = new break
-	mov	%o4, %o0			! copy for syscall
-	mov	SYS_break, %g1
-	t	ST_SYSCALL			! break(new_break)
-	bcc,a	1f				! if success,
-	 mov	%o3, %o0			!    set return value
-	ERROR()
-1:
-	retl					! and update curbrk
-	 st	%o4, [%o2 + %lo(CURBRK)]
-#endif
diff --git a/lib/libc/arch/sparc/sys/shmat.S b/lib/libc/arch/sparc/sys/shmat.S
deleted file mode 100644
index 7f57fad5f..000000000
--- a/lib/libc/arch/sparc/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2000/07/07 08:20:54 itohy Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/sparc/sys/syscall.S b/lib/libc/arch/sparc/sys/syscall.S
deleted file mode 100644
index b824c4312..000000000
--- a/lib/libc/arch/sparc/sys/syscall.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.4 2003/08/07 16:42:26 agc 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.
- * 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.
- *
- * from: Header: syscall.s,v 1.1 91/07/06 13:06:02 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)syscall.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: syscall.S,v 1.4 2003/08/07 16:42:26 agc Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-RSYSCALL(syscall)
diff --git a/lib/libc/arch/sparc64/Makefile.inc b/lib/libc/arch/sparc64/Makefile.inc
deleted file mode 100644
index 7d1503303..000000000
--- a/lib/libc/arch/sparc64/Makefile.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.20 2015/04/15 19:13:46 mrg Exp $
-
-SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
-
-# Some assembler files use v9a extensions.
-AFLAGS+= -Wa,-Av9a
-
-.PATH: ${ARCHDIR}/softfloat
-SRCS+= qp.c
-CPPFLAGS+=	-DSOFTFLOATSPARC64_FOR_GCC -DEXCEPTIONS_WITH_SOFTFLOAT
-CPPFLAGS+=	-DSOFTFLOAT_NEED_FIXUNS
-.if ${MKSOFTFLOAT} != "no"
-.include <softfloat/Makefile.inc>
-.else
-#
-# Can't directly use softfloat.c due to .PATH issues with the other source
-# in softfloat. Just provide a wrapper which pulls it in via a #include
-SRCS.softfloat= softfloat-wrapper.c
-SRCS+= ${SRCS.softfloat}
-CPPFLAGS+=      -I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat \
-		-I${.CURDIR}/softfloat/bits64
-
-.endif
diff --git a/lib/libc/arch/sparc64/SYS.h b/lib/libc/arch/sparc64/SYS.h
deleted file mode 100644
index be929b38c..000000000
--- a/lib/libc/arch/sparc64/SYS.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.15 2013/09/12 15:36:16 joerg 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.
- * 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.
- *
- *	@(#)SYS.h	8.1 (Berkeley) 6/4/93
- *
- *	from: Header: SYS.h,v 1.2 92/07/03 18:57:00 torek Exp
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-#include <machine/trap.h>
-
-#ifdef __STDC__
-#define _CAT(x,y) x##y
-#else
-#define _CAT(x,y) x/**/y
-#endif
-
-/*
- * ERROR branches to cerror.  This is done with a macro so that I can
- * change it to be position independent later, if need be.
- */
-#if __PIC__ - 0 >= 2
-#define	JUMP(name) \
-	PIC_PROLOGUE(%g1,%g5); \
-	sethi %hi(_C_LABEL(name)),%g5; \
-	or %g5,%lo(_C_LABEL(name)),%g5; \
-	ldx [%g1+%g5],%g5; \
-	jmp %g5; \
-	nop
-#elif __PIC__ - 0 >= 1
-#define	JUMP(name) \
-	PIC_PROLOGUE(%g1,%g5); \
-	ldx [%g1+_C_LABEL(name)],%g5; jmp %g5; nop
-#else
-#define	JUMP(name)	set _C_LABEL(name),%g1; jmp %g1; nop
-#endif
-#define	ERROR()		JUMP(__cerror)
-/*
- * SYSCALL is used when further action must be taken before returning.
- * Note that it adds a `nop' over what we could do, if we only knew what
- * came at label 1....
- */
-#define	_SYSCALL(x,y) \
-	ENTRY(x); mov _CAT(SYS_,y),%g1; t ST_SYSCALL; bcc 1f; nop; ERROR(); 1:
-
-#define	SYSCALL(x) \
-	_SYSCALL(x,x)
-
-/*
- * RSYSCALL is used when the system call should just return.  Here
- * we use the SYSCALL_G5RFLAG to put the `success' return address in %g5
- * and avoid a branch.
- */
-#define	RSYSCALL(x) \
-	ENTRY(x); mov (_CAT(SYS_,x))|SYSCALL_G5RFLAG,%g1; add %o7,8,%g5; \
-	t ST_SYSCALL; ERROR()
-
-/*
- * PSEUDO(x,y) is like RSYSCALL(y) except that the name is x.
- */
-#define	PSEUDO(x,y) \
-	ENTRY(x); mov (_CAT(SYS_,y))|SYSCALL_G5RFLAG,%g1; add %o7,8,%g5; \
-	t ST_SYSCALL; ERROR()
-
-/*
- * WSYSCALL(weak,strong) is like RSYSCALL(weak), except that weak is
- * a weak internal alias for the strong symbol.
- */
-#define	WSYSCALL(weak,strong) \
-	WEAK_ALIAS(weak,strong); \
-	PSEUDO(strong,weak)
-
-/*
- * SYSCALL_NOERROR is like SYSCALL, except it's used for syscalls 
- * that never fail.
- *
- * XXX - This should be optimized.
- */
-#define SYSCALL_NOERROR(x) \
-	ENTRY(x); mov _CAT(SYS_,x),%g1; t ST_SYSCALL
-
-/*
- * RSYSCALL_NOERROR is like RSYSCALL, except it's used for syscalls 
- * that never fail.
- *
- * XXX - This should be optimized.
- */
-#define RSYSCALL_NOERROR(x) \
-	ENTRY(x); mov (_CAT(SYS_,x))|SYSCALL_G5RFLAG,%g1; add %o7,8,%g5; \
-	t ST_SYSCALL
-
-/*
- * PSEUDO_NOERROR(x,y) is like RSYSCALL_NOERROR(y) except that the name is x.
- */
-#define PSEUDO_NOERROR(x,y) \
-	ENTRY(x); mov (_CAT(SYS_,y))|SYSCALL_G5RFLAG,%g1; add %o7,8,%g5; \
-	t ST_SYSCALL
-
-	.globl	_C_LABEL(__cerror)
diff --git a/lib/libc/arch/sparc64/gdtoa/Makefile.inc b/lib/libc/arch/sparc64/gdtoa/Makefile.inc
deleted file mode 100644
index c13f9a737..000000000
--- a/lib/libc/arch/sparc64/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/03/15 17:35:18 kleink Exp $
-
-SRCS+=	strtof.c strtold_pQ.c
-SRCS+=	strtopQ.c
diff --git a/lib/libc/arch/sparc64/gdtoa/arith.h b/lib/libc/arch/sparc64/gdtoa/arith.h
deleted file mode 100644
index 4674f629c..000000000
--- a/lib/libc/arch/sparc64/gdtoa/arith.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define IEEE_BIG_ENDIAN
diff --git a/lib/libc/arch/sparc64/gdtoa/gd_qnan.h b/lib/libc/arch/sparc64/gdtoa/gd_qnan.h
deleted file mode 100644
index 860e1b064..000000000
--- a/lib/libc/arch/sparc64/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x7ff80000
-#define d_QNAN1 0x0
-#define ld_QNAN0 0x7fff8000
-#define ld_QNAN1 0x0
-#define ld_QNAN2 0x0
-#define ld_QNAN3 0x0
diff --git a/lib/libc/arch/sparc64/gen/Makefile.inc b/lib/libc/arch/sparc64/gen/Makefile.inc
deleted file mode 100644
index 3753cba45..000000000
--- a/lib/libc/arch/sparc64/gen/Makefile.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.19 2009/12/06 07:12:17 uebayasi Exp $
-
-SRCS+=	fabs.S modf.S
-SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
-	fpsetround.c fpsetsticky.c
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
-
-SRCS+=	nanf.c infinityl.c
-SRCS+=	fpclassifyl.c isfinitel.c isinfl.c isnanl.c signbitl.c
-
-SRCS+=	bswap16.c bswap32.c bswap64.c
-SRCS+=	setjmp.S
-SRCS+=	_setjmp.S
-SRCS+=	sigsetjmp.S longjmp.c
-
-SRCS+=	makecontext.c resumecontext.c _lwp.c swapcontext.S
-
-SRCS+=	fixunsdfsi.S mul.S umul.S saveregs.S
-
-LSRCS.sparc64.gen=Lint_swapcontext.c
-LSRCS+=		${LSRCS.sparc64.gen}
-DPSRCS+=	${LSRCS.sparc64.gen}
-CLEANFILES+=	${LSRCS.sparc64.gen}
diff --git a/lib/libc/arch/sparc64/gen/_lwp.c b/lib/libc/arch/sparc64/gen/_lwp.c
deleted file mode 100644
index 622d713db..000000000
--- a/lib/libc/arch/sparc64/gen/_lwp.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.7 2012/03/17 20:48:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.7 2012/03/17 20:48:58 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *),
-		      void *arg, void *private,
-		      caddr_t stack_base, size_t stack_size)
-{
-	__greg_t *gr;
-	unsigned long *sp;
-
-	getcontext(u);
-	gr = u->uc_mcontext.__gregs;
-
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-	/*LINTED*/
-	sp = (ulong *)(stack_base + stack_size);
-	sp = (ulong *)((ulong)sp & ~0x0f);
-
-	sp -= 8 + 8 + 6;
-
-	sp[8]  = (ulong)arg;
-	sp[14] = (ulong)sp - 2047;
-	sp[15] = (ulong)_lwp_exit - 8;
-
-	/*LINTED*/
-	sp = (ulong *)((caddr_t)sp - 2047);
-
-	gr[_REG_PC] = (ulong) start;
-	gr[_REG_nPC] = (ulong) start + 4;
-
-	gr[_REG_O0] = (ulong) arg;
-	gr[_REG_O6] = (ulong) sp;
-	gr[_REG_O7] = (ulong)_lwp_exit - 8;
-	gr[_REG_G7] = (ulong)private;
-}
diff --git a/lib/libc/arch/sparc64/gen/_setjmp.S b/lib/libc/arch/sparc64/gen/_setjmp.S
deleted file mode 100644
index 66d1ec40e..000000000
--- a/lib/libc/arch/sparc64/gen/_setjmp.S
+++ /dev/null
@@ -1,93 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.7 2011/04/30 19:43:17 martin 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.
- * 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.
- *
- * from: Header: _setjmp.s,v 1.1 91/07/06 16:45:53 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)_setjmp.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: _setjmp.S,v 1.7 2011/04/30 19:43:17 martin Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-	.register %g2,#ignore
-	.register %g3,#ignore
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	_longjmp(a,v)
- * will generate a "return(v?v:1)" from
- * the last call to
- *	_setjmp(a)
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	stx	%sp, [%o0+0]	/* store caller's stack pointer */
-	stx	%o7, [%o0+8]	/* and return pc */
-	stx	%g0, [%o0+0x18]	/* mark as non-sigmask jmpbuf */
-
-	/* store globals, offsets compatible with siglongjmp */
-	stx	%g1, [%o0+0x28]
-	stx	%g2, [%o0+0x30]		/* adjust asserts in longjmp.c */
-	stx	%g3, [%o0+0x48]		/* if you change any of these */
-	stx	%g6, [%o0+0x50]		/* offsets! */
-	stx	%g7, [%o0+0x58]
-
-	retl
-	 clr	%o0		! return 0
-
-ENTRY(_longjmp)
-	save	%sp, -CC64FSZ, %sp
-	flushw
-	/*
-	 * We restore the saved stack pointer to %fp, then issue
-	 * a `restore' instruction which will reload the register
-	 * window from the stack.
-	 */
-	ldx	[%i0+0x28],%g1
-	ldx	[%i0+0x30],%g2
-	ldx	[%i0+0x48],%g3
-	ldx	[%i0+0x50],%g6
-	ldx	[%i0+0x58],%g7
-	ldx	[%i0+8], %i7
-	ldx	[%i0+0], %fp
-	mov	1, %i0
-	movrnz	%i1, %i1, %i0	! compute v ? v : 1
-	ret
-	 restore
diff --git a/lib/libc/arch/sparc64/gen/fabs.S b/lib/libc/arch/sparc64/gen/fabs.S
deleted file mode 100644
index bb7ac9fce..000000000
--- a/lib/libc/arch/sparc64/gen/fabs.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: fabs.S,v 1.5 2003/08/07 16:42:27 agc 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.
- * 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.
- *
- * from: Header: fabs.s,v 1.4 91/10/07 23:59:05 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)fabs.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: fabs.S,v 1.5 2003/08/07 16:42:27 agc Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* fabs - floating absolute value */
-
-ENTRY(fabs)
-	retl
-	 fabss	%f0, %f0		! return absolute value
-
diff --git a/lib/libc/arch/sparc64/gen/fixunsdfsi.S b/lib/libc/arch/sparc64/gen/fixunsdfsi.S
deleted file mode 100644
index be95905cc..000000000
--- a/lib/libc/arch/sparc64/gen/fixunsdfsi.S
+++ /dev/null
@@ -1,100 +0,0 @@
-/*	$NetBSD: fixunsdfsi.S,v 1.5 2013/09/12 15:36:16 joerg 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.
- * 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.
- *
- * from: Header: fixunsdfsi.s,v 1.3 91/10/08 00:03:15 torek Exp
- */
-
-#include <machine/asm.h>
-#define _LOCORE
-#include <machine/frame.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)fixunsdfsi.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: fixunsdfsi.S,v 1.5 2013/09/12 15:36:16 joerg Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Convert double to unsigned integer (for gcc).
- *
- * I have made the output for NaN agree with the Sun compiler, not
- * that it really matters, by using `fbul,a'.
- */
-
-
-	.align	8
-Lbig:
-	.word	0x43e00000		! .double 2^63
-	.word	0			! (who me, not trust the assembler?)
-
-/*
- * Same as above but to unsigned long
- */
-ENTRY(__dtoul)
-	sub	%sp, 16, %sp
-	std	%f2, [%sp + 64 + BIAS + 8]
-#ifdef __PIC__
-	PICCY_SET(Lbig, %g1, %o0)
-	ldd	[%g1], %f2
-#else
-	sethi	%hi(Lbig), %g1
-	ldd	[%g1 + %lo(Lbig)], %f2
-#endif
-	fcmped	%f0, %f2		! d < 2^63, or NaN, or -Inf?
-	nop				! (fpop2 delay)
-	fbul,a	1f			! if so, use fdtoi to convert to int
-	 fdtox	%f0, %f0		!        (this includes negatives!)
-
-	! d does not fit in an int, so subtract 2^63, convert,
-	! and add 2^63 again (sigh).  Just hope the intermediate
-	! fits (if not, the result is undefined anyway).
-
-	fsubd	%f0, %f2, %f0		! d -= 2^63
-	fdtox	%f0, %f0		! convert to int
-	std	%f0, [%sp + 64 + BIAS]	! move into return reg
-	ldx	[%sp + 64 + BIAS], %o0
-	sethi	%hi(0x80000000), %o1
-	sllx	%o1, 32, %o1
-	add	%o0, %o1, %o0		! add 2^63
-	ldd	[%sp + 64 + BIAS + 8], %f2
-	retl
-	 add	%sp, 16, %sp
-
-1:
-	std	%f0, [%sp + 64 + BIAS]	! return result
-	ldx	[%sp + 64 + BIAS], %o0
-	ldd	[%sp + 64 + BIAS + 8], %f2
-	retl
-	 add	%sp, 16, %sp
diff --git a/lib/libc/arch/sparc64/gen/flt_rounds.c b/lib/libc/arch/sparc64/gen/flt_rounds.c
deleted file mode 100644
index 93e3b2cf6..000000000
--- a/lib/libc/arch/sparc64/gen/flt_rounds.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*	$NetBSD: flt_rounds.c,v 1.6 2012/06/24 15:26:02 christos Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.6 2012/06/24 15:26:02 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <machine/float.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	0,	/* round to zero */
-	2,	/* round to positive infinity */
-	3	/* round to negative infinity */
-};
-
-int
-__flt_rounds(void)
-{
-	uint32_t x;
-
-	__asm("st %%fsr,%0" : "=m" (*&x));
-	return map[(x >> 30) & 0x03];
-}
diff --git a/lib/libc/arch/sparc64/gen/fpclassifyl.c b/lib/libc/arch/sparc64/gen/fpclassifyl.c
deleted file mode 100644
index 1a745bb5f..000000000
--- a/lib/libc/arch/sparc64/gen/fpclassifyl.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: fpclassifyl.c,v 1.3 2013/11/20 22:22:20 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpclassifyl.c,v 1.3 2013/11/20 22:22:20 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.1 fpclassify - classify real floating type
- *          IEEE 754 compatible 128-bit extended-precision version
- */
-int
-__fpclassifyl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	if (u.extu_ext.ext_exp == 0) {
-		if (u.extu_ext.ext_frach  == 0 && u.extu_ext.ext_fracl  == 0)
-			return FP_ZERO;
-		else
-			return FP_SUBNORMAL;
-	} else if (u.extu_ext.ext_exp == EXT_EXP_INFNAN) {
-		if (u.extu_ext.ext_frach  == 0 && u.extu_ext.ext_fracl  == 0)
-			return FP_INFINITE;
-		else
-			return FP_NAN;
-	}
-
-	return FP_NORMAL;
-}
diff --git a/lib/libc/arch/sparc64/gen/fpgetmask.c b/lib/libc/arch/sparc64/gen/fpgetmask.c
deleted file mode 100644
index 095ff73f4..000000000
--- a/lib/libc/arch/sparc64/gen/fpgetmask.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*	$NetBSD: fpgetmask.c,v 1.6 2012/06/24 15:26:02 christos Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetmask.c,v 1.6 2012/06/24 15:26:02 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetmask,_fpgetmask)
-#endif
-
-fp_except
-fpgetmask(void)
-{
-	uint32_t x;
-
-	__asm("st %%fsr,%0" : "=m" (*&x));
-	return (x >> 23) & 0x1f;
-}
diff --git a/lib/libc/arch/sparc64/gen/fpgetround.c b/lib/libc/arch/sparc64/gen/fpgetround.c
deleted file mode 100644
index ef65c131b..000000000
--- a/lib/libc/arch/sparc64/gen/fpgetround.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*	$NetBSD: fpgetround.c,v 1.6 2012/06/24 15:26:02 christos Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.6 2012/06/24 15:26:02 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetround,_fpgetround)
-#endif
-
-fp_rnd
-fpgetround(void)
-{
-	uint32_t x;
-
-	__asm("st %%fsr,%0" : "=m" (*&x));
-	return (x >> 30) & 0x03;
-}
diff --git a/lib/libc/arch/sparc64/gen/fpgetsticky.c b/lib/libc/arch/sparc64/gen/fpgetsticky.c
deleted file mode 100644
index 67b3ea652..000000000
--- a/lib/libc/arch/sparc64/gen/fpgetsticky.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*	$NetBSD: fpgetsticky.c,v 1.7 2012/06/24 15:26:02 christos Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetsticky.c,v 1.7 2012/06/24 15:26:02 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-#ifdef EXCEPTIONS_WITH_SOFTFLOAT
-extern fp_except _softfloat_float_exception_flags;
-#endif
-
-fp_except
-fpgetsticky(void)
-{
-	uint32_t x;
-	fp_except res;
-
-	__asm("st %%fsr,%0" : "=m" (*&x));
-	res = (x >> 5) & 0x1f;
-
-#ifdef EXCEPTIONS_WITH_SOFTFLOAT
-	res |= _softfloat_float_exception_flags;
-#endif
-
-	return res;
-}
diff --git a/lib/libc/arch/sparc64/gen/fpsetmask.c b/lib/libc/arch/sparc64/gen/fpsetmask.c
deleted file mode 100644
index 4ac4a4d46..000000000
--- a/lib/libc/arch/sparc64/gen/fpsetmask.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: fpsetmask.c,v 1.7 2013/10/28 01:06:36 mrg Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetmask.c,v 1.7 2013/10/28 01:06:36 mrg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetmask,_fpsetmask)
-#endif
-
-#ifdef EXCEPTIONS_WITH_SOFTFLOAT
-extern fp_except _softfloat_float_exception_mask;
-#endif
-
-fp_except
-fpsetmask(fp_except mask)
-{
-	fp_except old;
-	fp_except new;
-
-	__asm("st %%fsr,%0" : "=m" (*&old));
-
-	new = old;
-	new &= ~(0x1f << 23); 
-	new |= ((mask & 0x1f) << 23);
-
-	__asm("ld %0,%%fsr" : : "m" (*&new));
-
-	old = ((uint32_t)old >> 23) & 0x1f;
-
-#ifdef EXCEPTIONS_WITH_SOFTFLOAT
-	/* update softfloat mask as well */
-	old |= _softfloat_float_exception_mask;
-	_softfloat_float_exception_mask = mask;
-#endif
-
-	return old;
-}
diff --git a/lib/libc/arch/sparc64/gen/fpsetround.c b/lib/libc/arch/sparc64/gen/fpsetround.c
deleted file mode 100644
index 5821b5b43..000000000
--- a/lib/libc/arch/sparc64/gen/fpsetround.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: fpsetround.c,v 1.7 2013/10/28 01:06:36 mrg Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.7 2013/10/28 01:06:36 mrg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetround,_fpsetround)
-#endif
-
-fp_rnd
-fpsetround(fp_rnd rnd_dir)
-{
-	fp_rnd old;
-	fp_rnd new;
-#ifdef SOFTFLOATSPARC64_FOR_GCC
-	extern fp_rnd _softfloat_float_rounding_mode;
-#endif
-
-	__asm("st %%fsr,%0" : "=m" (*&old));
-
-#ifdef SOFTFLOATSPARC64_FOR_GCC
-	_softfloat_float_rounding_mode = rnd_dir;
-#endif
-
-	new = old;
-	new &= ~(0x03 << 30); 
-	new |= ((rnd_dir & 0x03) << 30);
-
-	__asm("ld %0,%%fsr" : : "m" (*&new));
-
-	return ((uint32_t)old >> 30) & 0x03;
-}
diff --git a/lib/libc/arch/sparc64/gen/fpsetsticky.c b/lib/libc/arch/sparc64/gen/fpsetsticky.c
deleted file mode 100644
index 47b3ac4d1..000000000
--- a/lib/libc/arch/sparc64/gen/fpsetsticky.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: fpsetsticky.c,v 1.7 2013/10/28 01:06:36 mrg Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetsticky.c,v 1.7 2013/10/28 01:06:36 mrg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetsticky,_fpsetsticky)
-#endif
-
-#ifdef EXCEPTIONS_WITH_SOFTFLOAT
-extern fp_except _softfloat_float_exception_flags;
-#endif
-
-fp_except
-fpsetsticky(fp_except sticky)
-{
-	fp_except old;
-	fp_except new;
-
-	__asm("st %%fsr,%0" : "=m" (*&old));
-
-	new = old;
-	new &= ~(0x1f << 5); 
-	new |= ((sticky & 0x1f) << 5);
-
-	__asm("ld %0,%%fsr" : : "m" (*&new));
-
-	old = ((uint32_t)old >> 5) & 0x1f;
-
-#ifdef EXCEPTIONS_WITH_SOFTFLOAT
-	old |= _softfloat_float_exception_flags;
-	_softfloat_float_exception_flags = sticky;
-#endif
-	return old;
-}
diff --git a/lib/libc/arch/sparc64/gen/infinityl.c b/lib/libc/arch/sparc64/gen/infinityl.c
deleted file mode 100644
index ebd8f2daf..000000000
--- a/lib/libc/arch/sparc64/gen/infinityl.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: infinityl.c,v 1.2 2005/06/12 05:21:27 lukem Exp $	*/
-
-/*
- * IEEE-compatible infinityl.c for big-endian 128-bit format -- public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: infinityl.c,v 1.2 2005/06/12 05:21:27 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-
-const union __long_double_u __infinityl =
-	{ { 0x7f, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };
diff --git a/lib/libc/arch/sparc64/gen/isfinitel.c b/lib/libc/arch/sparc64/gen/isfinitel.c
deleted file mode 100644
index b56951235..000000000
--- a/lib/libc/arch/sparc64/gen/isfinitel.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: isfinitel.c,v 1.2 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: isfinitel.c,v 1.2 2008/04/28 20:22:57 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.2 isfinite - determine whether an argument has finite value
- *          IEEE 754 compatible 128-bit extended-precision version
- */
-int
-__isfinitel(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	if (u.extu_ext.ext_exp == EXT_EXP_INFNAN)
-		return 0;
-
-	return 1;
-}
diff --git a/lib/libc/arch/sparc64/gen/isinfl.c b/lib/libc/arch/sparc64/gen/isinfl.c
deleted file mode 100644
index 5ce673179..000000000
--- a/lib/libc/arch/sparc64/gen/isinfl.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: isinfl.c,v 1.5 2013/11/20 22:22:20 martin 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.
- * 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.
- *
- * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isinfl.c,v 1.5 2013/11/20 22:22:20 martin Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.3 isinf - test for infinity
- *          IEEE 754 compatible 128-bit extended-precision version
- */
-int
-__isinfl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	return (u.extu_ext.ext_exp == EXT_EXP_INFNAN &&
-	    (u.extu_ext.ext_frach  == 0 && u.extu_ext.ext_fracl  == 0));
-}
diff --git a/lib/libc/arch/sparc64/gen/isnanl.c b/lib/libc/arch/sparc64/gen/isnanl.c
deleted file mode 100644
index efa59d531..000000000
--- a/lib/libc/arch/sparc64/gen/isnanl.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: isnanl.c,v 1.5 2013/11/20 22:22:20 martin 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.
- * 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.
- *
- * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isnanl.c,v 1.5 2013/11/20 22:22:20 martin Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.4 isnan - test for a NaN
- *          IEEE 754 compatible 128-bit extended-precision version
- */
-int
-__isnanl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	return (u.extu_ext.ext_exp == EXT_EXP_INFNAN &&
-	    (u.extu_ext.ext_frach  != 0 || u.extu_ext.ext_fracl  != 0));
-}
diff --git a/lib/libc/arch/sparc64/gen/longjmp.c b/lib/libc/arch/sparc64/gen/longjmp.c
deleted file mode 100644
index c62d01d60..000000000
--- a/lib/libc/arch/sparc64/gen/longjmp.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*	$NetBSD: longjmp.c,v 1.7 2012/03/17 21:35:06 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christian Limpach.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stddef.h>
-
-#define __LIBC12_SOURCE__
-#include <setjmp.h>
-#include <compat/include/setjmp.h>
-
-typedef struct {
-	__greg_t	g3;
-	__greg_t	g6;
-	__greg_t	g7;
-	__greg_t	dummy;
-	__greg_t	save_mask;
-} __jmp_buf_regs_t;
-
-/*
- * setjmp.S uses hard coded offsets into the jump_buf,
- * make sure any changes cause a compile failure here
- */
-#ifndef lint	/* XXX this is too much for lint */
-__CTASSERT(0x68 == offsetof(__jmp_buf_regs_t,save_mask) +
-	sizeof(struct sigcontext));
-__CTASSERT(sizeof(sigjmp_buf) >= sizeof(__jmp_buf_regs_t) +
-	sizeof(struct sigcontext));
-#endif
-
-void
-__longjmp14(jmp_buf env, int val)
-{
-	struct sigcontext *sc = (void *)env;
-	__jmp_buf_regs_t *r = (void *)&sc[1];
-	ucontext_t uc;
-
-	/* Ensure non-zero SP */
-	if (sc->sc_sp == 0)
-		goto err;
-
-	/*
-	 * Set _UC_CPU. No FPU data saved, so we can't restore
-	 * that. Set _UC_{SET,CLR}STACK according to SS_ONSTACK
-	 */
-	memset(&uc, 0, sizeof(uc));
-	uc.uc_flags = _UC_CPU | (sc->sc_onstack ? _UC_SETSTACK : _UC_CLRSTACK);
-
-	/*
-	 * Set the signal mask - this is a weak symbol, so don't use
-	 * _UC_SIGMASK in the mcontext, libpthread might override sigprocmask.
-	 */
-	sigprocmask(SIG_SETMASK, &sc->sc_mask, NULL);
-
-	/* Fill other registers */
-	uc.uc_mcontext.__gregs[_REG_CCR] = sc->sc_tstate;
-	uc.uc_mcontext.__gregs[_REG_PC] = sc->sc_pc;
-	uc.uc_mcontext.__gregs[_REG_nPC] = sc->sc_pc+4;
-	uc.uc_mcontext.__gregs[_REG_G1] = sc->sc_g1;
-	uc.uc_mcontext.__gregs[_REG_G2] = sc->sc_o0;
-	uc.uc_mcontext.__gregs[_REG_G3] = r->g3;
-	uc.uc_mcontext.__gregs[_REG_G4] = 0;
-	uc.uc_mcontext.__gregs[_REG_G5] = 0;
-	uc.uc_mcontext.__gregs[_REG_G6] = r->g6;
-	uc.uc_mcontext.__gregs[_REG_G7] = r->g7;
-	uc.uc_mcontext.__gregs[_REG_O6] = sc->sc_sp;
-
-
-	/* Make return value non-zero */
-	if (val == 0)
-		val = 1;
-
-	/* Save return value in context */
-	uc.uc_mcontext.__gregs[_REG_O0] = val;
-
-	setcontext(&uc);
-
- err:
-	longjmperror();
-	abort();
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/sparc64/gen/makecontext.c b/lib/libc/arch/sparc64/gen/makecontext.c
deleted file mode 100644
index 8bdcee63a..000000000
--- a/lib/libc/arch/sparc64/gen/makecontext.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.5 2012/03/17 21:35:06 martin Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.5 2012/03/17 21:35:06 martin Exp $");
-#endif
-
-#include <inttypes.h>
-#include <stddef.h>
-#include <sys/types.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#include <stdarg.h>
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	int i;
-	ulong *sp;
-	va_list ap;
-
-	/*LINTED*/
-	sp = (ulong *)((caddr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
-	/* Align on quad-word boundary. */
-	sp = (ulong *)((ulong)sp & ~0xf);
-
-	/* Make room for: argx, argd, struct return pointer(?), rwindow. */
-	sp -= (argc > 6 ? argc - 6 : 0) + 6 + 8 + 8;
-
-	va_start(ap, argc);
-
-	/* Pass up to 6 arguments in %o0-5. */
-	for (i = 0; i < argc && i < 6; i++)
-		gr[_REG_O0 + i] = sp[i + 16] = va_arg(ap, unsigned long);
-
-	/* Pass any additional arguments on the stack. */
-	for (; i < argc; i++)
-		sp[i + 16] = va_arg(ap, unsigned long);
-	va_end(ap);
-
-	sp[14] = (ulong)sp - 2047;
-	sp[15] = (ulong)_resumecontext - 8;
-
-	/*LINTED*/
-	sp = (ulong *)((caddr_t)sp - 2047);
-
-	gr[_REG_O6] = (__greg_t)sp;
-	gr[_REG_PC] = (__greg_t)func;
-	gr[_REG_nPC] = (__greg_t)func + 4;
-	gr[_REG_O7] = (__greg_t)_resumecontext - 8;
-
-}
diff --git a/lib/libc/arch/sparc64/gen/modf.S b/lib/libc/arch/sparc64/gen/modf.S
deleted file mode 100644
index 97e36e9a1..000000000
--- a/lib/libc/arch/sparc64/gen/modf.S
+++ /dev/null
@@ -1,189 +0,0 @@
-/*	$NetBSD: modf.S,v 1.5 2013/09/12 15:36:16 joerg 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.
- * 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.
- *
- * from: Header: modf.s,v 1.3 92/06/20 00:00:54 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)modf.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: modf.S,v 1.5 2013/09/12 15:36:16 joerg Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/fsr.h>
-
-/*
- * double modf(double val, double *iptr)
- *
- * Returns the fractional part of `val', storing the integer part of
- * `val' in *iptr.  Both *iptr and the return value have the same sign
- * as `val'.
- *
- * Method:
- *
- * We use the fpu's normalization hardware to compute the integer portion
- * of the double precision argument.  Sun IEEE double precision numbers
- * have 52 bits of mantissa, 11 bits of exponent, and one bit of sign,
- * with the sign occupying bit 31 of word 0, and the exponent bits 30:20
- * of word 0.  Thus, values >= 2^52 are by definition integers.
- *
- * If we take a value that is in the range [+0..2^52) and add 2^52, all
- * of the fractional bits fall out and all of the integer bits are summed
- * with 2^52.  If we then subtract 2^52, we get those integer bits back.
- * This must be done with rounding set to `towards 0' or `towards -inf'.
- * `Toward -inf' fails when the value is 0 (we get -0 back)....
- *
- * Note that this method will work anywhere, but is machine dependent in
- * various aspects.
- *
- * Stack usage:
- *	4@[%fp + BIAS - 4]	saved %fsr
- *	4@[%fp + BIAS - 8]	new %fsr with rounding set to `towards 0'
- *	8@[%fp + BIAS - 16]	space for moving between %i and %f registers
- * Register usage:
- *	%f0:f1		double val;
- *	%l0		scratch
- *	%l1		sign bit (0x80000000)
- *	%i1		double *iptr;
- *	%f2:f3		`magic number' 2^52, in fpu registers
- *	%f4:f5		double v, in fpu registers
- *	%f6:f7		double temp.
- */
-
-	.align	8
-Lmagic:
-	.word	0x43300000	! sign = 0, exponent = 52 + 1023, mantissa = 0
-	.word	0		! (i.e., .double 0r4503599627370496e+00)
-
-L0:
-	.word	0		! 0.0
-	.word	0
-
-ENTRY(modf)
-	save	%sp, -CC64FSZ-16, %sp
-
-	/*
-	 * First, compute v = abs(val)
-	 */
-	fabsd	%f0, %f4		! %f4:f5 = v
-	fcmped	%fcc1, %f0, %f4		! %fcc1 = (val == abs(val))
-#ifdef __PIC__
-	PICCY_SET(Lmagic, %l0, %o7)
-	ldd	[%l0], %f2
-#else
-	sethi	%hi(Lmagic), %l0
-	ldd	[%l0 + %lo(Lmagic)], %f2
-#endif
-
-	/*
-	 * Is %f4:f5 >= %f2:f3 ?  If so, it is all integer bits.
-	 * It is probably less, though.
-	 */
-	fcmped	%f4, %f2
-	fbuge	Lbig			! if >= (or unordered), go out
-	nop
-
-	/*
-	 * v < 2^52, so add 2^52, then subtract 2^52, but do it all
-	 * with rounding set towards zero.  We leave any enabled
-	 * traps enabled, but change the rounding mode.  This might
-	 * not be so good.  Oh well....
-	 */
-	st	%fsr, [%fp + BIAS - 4]	! %l5 = current FSR mode
-	set	FSR_RD, %l3		! %l3 = rounding direction mask
-	ld	[%fp + BIAS - 4], %l5
-	set	FSR_RD_RZ << FSR_RD_SHIFT, %l4
-	andn	%l5, %l3, %l6
-	or	%l6, %l4, %l6		! round towards zero, please
-	and	%l5, %l3, %l5		! save original rounding mode
-	st	%l6, [%fp + BIAS - 8]
-	ld	[%fp + BIAS - 8], %fsr
-
-	faddd	%f4, %f2, %f4		! %f4:f5 += 2^52
-	fsubd	%f4, %f2, %f4		! %f4:f5 -= 2^52
-
-	/*
-	 * Restore %fsr, but leave exceptions accrued.
-	 */
-	st	%fsr, [%fp + BIAS - 4]
-	ld	[%fp + BIAS - 4], %l6
-	andn	%l6, %l3, %l6		! %l6 = %fsr & ~FSR_RD;
-	or	%l5, %l6, %l5		! %l5 |= %l6;
-	st	%l5, [%fp + BIAS - 4]
-	ld	[%fp + BIAS - 4], %fsr	! restore %fsr, leaving accrued stuff
-
-	/*
-	 * Now insert the original sign in %f4:f5.
-	 * %fcc1 should still have the reults of (val == abs(val))
-	 * from above, so we use a conditional move on %fcc1 to: 
-	 *
-	 *	%f4 = (val == abs(val)) ? %f4 : -%f4
-	 *
-	 */
-	fnegd	%f4, %f6
-	fmovdnz	%fcc1, %f6, %f4
-1:
-
-	/*
-	 * The value in %f4:f5 is now the integer portion of the original
-	 * argument.  We need to store this in *ival (%i1), subtract it
-	 * from the original value argument (%d0), and return the result.
-	 */
-	std	%f4, [%i1]		! *ival = %f4:f5;
-	fsubd	%f0, %f4, %f0		! %f0:f1 -= %f4:f5;
-	ret
-	restore
-
-Lbig:
-	/*
-	 * We get here if the original comparison of %f4:f5 (v) to
-	 * %f2:f3 (2^52) came out `greater or unordered'.  In this
-	 * case the integer part is the original value, and the
-	 * fractional part is 0.
-	 */
-#ifdef __PIC__
-	PICCY_SET(L0, %l0, %o7)
-	std	%f0, [%i1]		! *ival = val;
-	ldd	[%l0], %f0		! return 0.0;
-#else
-	sethi	%hi(L0), %l0
-	std	%f0, [%i1]		! *ival = val;
-	ldd	[%l0 + %lo(L0)], %f0	! return 0.0;
-#endif
-	ret
-	restore
-
diff --git a/lib/libc/arch/sparc64/gen/nanf.c b/lib/libc/arch/sparc64/gen/nanf.c
deleted file mode 100644
index 1688d0eae..000000000
--- a/lib/libc/arch/sparc64/gen/nanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:02 martin Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:02 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-		{ { 0x7f, 0xc0,    0,    0 } };
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/sparc64/gen/resumecontext.c b/lib/libc/arch/sparc64/gen/resumecontext.c
deleted file mode 100644
index 57d68fdf8..000000000
--- a/lib/libc/arch/sparc64/gen/resumecontext.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:58 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:58 joerg Exp $");
-#endif
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <ucontext.h>
-#include <unistd.h>
-#include "extern.h"
-
-void
-_resumecontext(void)
-{
-	ucontext_t uct;
-
-	(void)getcontext(&uct);
-	if (uct.uc_link == NULL) 
-		exit(0);
-	(void)setcontext(uct.uc_link);
-	_exit(-1);
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/sparc64/gen/setjmp.S b/lib/libc/arch/sparc64/gen/setjmp.S
deleted file mode 100644
index aa21e41be..000000000
--- a/lib/libc/arch/sparc64/gen/setjmp.S
+++ /dev/null
@@ -1,130 +0,0 @@
-/*	$NetBSD: setjmp.S,v 1.10 2013/09/12 15:36:16 joerg 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.
- * 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.
- *
- * from: Header: setjmp.s,v 1.2 92/06/25 03:18:43 torek Exp
- */
-
-#define _LOCORE
-#include <machine/asm.h>
-#include <machine/frame.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)setjmp.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: setjmp.S,v 1.10 2013/09/12 15:36:16 joerg Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * C library -- setjmp
- *
- *	__longjmp14(a,v)
- * will generate a "return(v)" from
- * the last call to
- *	setjmp(a)
- * by restoring registers from the stack,
- * and a struct sigcontext, see <signal.h>
- */
-
-#include "SYS.h"
-
-	.register %g2,#ignore
-	.register %g3,#ignore
-	.register %g6,#ignore
-
-ENTRY(__setjmp14)
-	save	%sp, -CC64FSZ, %sp
-
-	/* save globals into locals */
-	mov	%g1, %l1
-	mov	%g2, %l2
-	mov	%g3, %l3
-	mov	%g4, %l4
-	mov	%g5, %l5
-	mov	%g6, %l6
-	mov	%g7, %l7
-
-#ifdef __PIC__
-	PIC_PROLOGUE(%i1, %o4)
-#endif
-
-	/* now get sigmask and onstack flag */
-	add	%i0, 0x38, %o2		/* build sigcontext in [%o2]->sc.sc_mask */
-	mov	1, %o0			/* SIG_BLOCK */
-					/* sigprocmask(SIG_BLOCK, (sigset_t *)NULL, (sigset_t *)a) */
-#if __PIC__ - 0 >= 2
-	set	_C_LABEL(__sigprocmask14), %o4
-	ldx	[%i1 + %o4], %g2
-	call	%g2
-#elif __PIC__ - 0 >= 1
-	ldx	[%i1 + _C_LABEL(__sigprocmask14)], %g2
-	call	%g2
-#else
-	call	_C_LABEL(__sigprocmask14)
-#endif
-	 clr	%o1
-
-	clr	%o0			/* sigstack(NULL, &foo) */
-#if __PIC__ - 0 >= 2
-	set	_C_LABEL(__sigaltstack14), %o4
-	ldx	[%i1 + %o4], %g2
-	call	%g2
-#elif __PIC__ - 0 >= 1
-	ldx	[%i1 + _C_LABEL(__sigaltstack14)], %g2
-	call	%g2
-#else
-	call	_C_LABEL(__sigaltstack14)
-#endif
-	 add	%i0, 8, %o1		/* (foo being part of the sigcontext we're overwriting) */
-	
-	lduw	[%i0 + 8 + 0x10], %o0	/* foo.ss_flags */
-	and	%o0, 1, %o1		/* onstack = foo.ss_flags & SS_ONSTACK; */
-	st	%o1, [%i0 + 0x00]	/* sc.sc_onstack = current onstack; */
-
-	/* store essential state */
-	stx	%fp, [%i0 + 0x08]	/* sc.sc_sp = sp */
-	add	%i7, 8, %o0
-	stx	%o0, [%i0 + 0x10]	/* sc.sc_pc = return_pc */
-	stx	%g0, [%i0 + 0x20]	/* sc.sc_tstate = (clean ccr) */
-	stx	%l1, [%i0 + 0x28]	/* sc.sc_g1 */
-	stx	%l2, [%i0 + 0x30]	/* sc.sc_o0, set in longjmp, use as %g2 */
-	/* 0x38: 4x32bit */		/* sc.sc_mask was already saved above */
-
-	/* save additional registers needed to fill a complete mcontext */
-	stx	%l3, [%i0 + 0x48]	/* adjust asserts in longjmp.c */
-	stx	%l6, [%i0 + 0x50]	/* if you change any of these */
-	stx	%l7, [%i0 + 0x58]	/* offsets! */
-
-	ret				/* return 0 */
-	 restore %g0, 0, %o0
diff --git a/lib/libc/arch/sparc64/gen/signbitl.c b/lib/libc/arch/sparc64/gen/signbitl.c
deleted file mode 100644
index 0328c9fde..000000000
--- a/lib/libc/arch/sparc64/gen/signbitl.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: signbitl.c,v 1.2 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.6 signbit - determine whether the sign of an argument is negative
- *          IEEE 754 compatible 128-bit extended-precision version
- */
-int
-__signbitl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	return (u.extu_ext.ext_sign == 1);
-}
diff --git a/lib/libc/arch/sparc64/gen/sigsetjmp.S b/lib/libc/arch/sparc64/gen/sigsetjmp.S
deleted file mode 100644
index b111209ca..000000000
--- a/lib/libc/arch/sparc64/gen/sigsetjmp.S
+++ /dev/null
@@ -1,113 +0,0 @@
-/*	$NetBSD: sigsetjmp.S,v 1.12 2013/09/14 05:38:00 nakayama Exp $	*/
-/*
- * Copyright (c) 1995 Paul Kranenburg
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Paul Kranenburg.
- * 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 "SYS.h"
-
-/*
- * We use the sc_npc field inside the sigcontext to store the save mask
- */
-#define	MASK_OFFSET	0x68
-
-#if __PIC__ - 0 >= 2
-	
-ENTRY(__sigsetjmp14)
-	PIC_PROLOGUE(%g1,%o2)		! %g1 = _GLOBAL_OFFSET_TABLE
-	st	%o1,[%o0+MASK_OFFSET]	! end of jmpbuf
-	sethi	%hi(_C_LABEL(__setjmp14)), %o2
-	sethi	%hi(_C_LABEL(_setjmp)), %o3
-	or	%o2, %lo(_C_LABEL(__setjmp14)), %o2
-	or	%o3, %lo(_C_LABEL(_setjmp)), %o3
-	brz	%o1, 1f	
-	 ldx	[%g1+%o3], %o3		! if (%o1 == 0) goto _setjmp;
-	ldx	[%g1+%o2], %o3		! else goto __setjmp;
-1:
-	jmp	%o3
-	 nop
-	
-ENTRY(__siglongjmp14)
-	PIC_PROLOGUE(%g1,%o2)		! %g1 = _GLOBAL_OFFSET_TABLE
-	ld	[%o0+MASK_OFFSET], %o2	! end of jmpbuf
-	sethi	%hi(_C_LABEL(__longjmp14)), %o3 
-	sethi	%hi(_C_LABEL(_longjmp)), %o4
-	or	%o3, %lo(_C_LABEL(__longjmp14)), %o3
-	or	%o4, %lo(_C_LABEL(_longjmp)), %o4
-	brz,a	%o2, 1f	
-	 ldx	[%g1+%o4], %o4		! if (%o2 == 0) goto _longjmp;
-	ldx	[%g1+%o3], %o4		! else goto __longjmp;
-1:
-	jmp	%o4	
-	 nop
-	unimp 0
-
-#elif __PIC__ - 0 >= 1
-
-ENTRY(__sigsetjmp14)
-	PIC_PROLOGUE(%g1,%o2)			! %g1 = _GLOBAL_OFFSET_TABLE
-	cmp	%o1,0
-	st	%o1,[%o0+MASK_OFFSET]		! end of jmpbuf
-	bne,a	1f
-	 ldx	[%g1+_C_LABEL(__setjmp14)], %g1	! if (%o1 != 0) goto __setjmp;
-	ldx	[%g1+_C_LABEL(_setjmp)], %g1	! else goto _setjmp;
-1:
-	jmp %g1
-	 nop
-
-ENTRY(__siglongjmp14)
-	PIC_PROLOGUE(%g1,%o2)			! %g1 = _GLOBAL_OFFSET_TABLE
-	ld	[%o0+MASK_OFFSET],%o2		! end of jmpbuf
-	cmp	%o2,0
-	bne,a	1f
-	 ldx	[%g1+_C_LABEL(__longjmp14)], %g1 ! if (%o2 != 0) goto __longjmp;
-	ldx	[%g1+_C_LABEL(_longjmp)], %g1	! else goto _longjmp;
-1:
-	jmp %g1
-	 nop
-	unimp 0
-
-#else /* !__PIC__ */
-
-ENTRY(__sigsetjmp14)
-	cmp	%o1,0
-	be	_C_LABEL(_setjmp)
-	 st	%o1,[%o0+MASK_OFFSET]	! end of jmpbuf
-	ba,a	_C_LABEL(__setjmp14)
-	unimp 0
-
-ENTRY(__siglongjmp14)
-	ld	[%o0+MASK_OFFSET],%g1
-	cmp	%g1,0
-	be	_C_LABEL(_longjmp)
-	 nop
-	ba,a	_C_LABEL(__longjmp14)
-	unimp 0
-
-#endif /* !__PIC__ */
diff --git a/lib/libc/arch/sparc64/gen/swapcontext.S b/lib/libc/arch/sparc64/gen/swapcontext.S
deleted file mode 100644
index 4cd081551..000000000
--- a/lib/libc/arch/sparc64/gen/swapcontext.S
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.8 2013/09/12 15:36:16 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: swapcontext.S,v 1.8 2013/09/12 15:36:16 joerg Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-
-ENTRY(swapcontext)
-	mov	%o0, %o2			/* must save pointer */
-	mov	%o1, %o3			/* must save pointer */
-	mov	SYS_getcontext, %g1
-	t	ST_SYSCALL
-	bcc,a	1f
-	 stx	%g0, [%o2 + 64 + 11 * 8]	/* gr[_REG_O0] = 0 */
-	ERROR()
-1:
-	add	%o7, 12, %o1
-	stx	%o1, [%o2 + 64 + 2 * 8]		/* gr[_REG_nPC] = retaddr + 4 */
-	add	%o7, 8, %o1
-	stx	%o1, [%o2 + 64 + 1 * 8]		/* gr[_REG_PC] = retaddr */
-
-#if __PIC__ - 0 >= 2
-	PIC_PROLOGUE(%g5,%o4)			/* %g5 = _GLOBAL_OFFSET_TABLE */
-	set	_C_LABEL(setcontext), %o5
-	ldx	[%g5+%o5], %o4
-	jmp	%o4
-	 mov	%o3, %o0
-#elif __PIC__ - 0 >= 1
-	PIC_PROLOGUE(%g5,%o4)			/* %g5 = _GLOBAL_OFFSET_TABLE */
-	ldx	[%g5+_C_LABEL(setcontext)], %o4
-	jmp	%o4
-	 mov	%o3, %o0
-#else
-	ba,a	_C_LABEL(setcontext)
-	 mov	%o3, %o0
-#endif
diff --git a/lib/libc/arch/sparc64/net/Makefile.inc b/lib/libc/arch/sparc64/net/Makefile.inc
deleted file mode 100644
index f51553517..000000000
--- a/lib/libc/arch/sparc64/net/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 1998/09/11 04:56:30 eeh Exp $
-
-SRCS+=  htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/arch/sparc64/softfloat/milieu.h b/lib/libc/arch/sparc64/softfloat/milieu.h
deleted file mode 100644
index ef43336cd..000000000
--- a/lib/libc/arch/sparc64/softfloat/milieu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: milieu.h,v 1.1 2002/02/05 07:53:05 jmc Exp $	*/
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "sparc64-gcc.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
diff --git a/lib/libc/arch/sparc64/softfloat/qp.c b/lib/libc/arch/sparc64/softfloat/qp.c
deleted file mode 100644
index 365f7a263..000000000
--- a/lib/libc/arch/sparc64/softfloat/qp.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/* $NetBSD: qp.c,v 1.11 2014/02/02 08:14:39 martin Exp $ */
-
-/*-
- * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#include <memory.h>
-
-#include "milieu.h"
-#include "softfloat.h"
-
-int printf(const char *, ...);
-
-void _Qp_add(float128 *c, float128 *a, float128 *b);
-int  _Qp_cmp(float128 *a, float128 *b);
-int  _Qp_cmpe(float128 *a, float128 *b);
-void _Qp_div(float128 *c, float128 *a, float128 *b);
-void _Qp_dtoq(float128 *c, double a);
-int  _Qp_feq(float128 *a, float128 *b);
-int  _Qp_fge(float128 *a, float128 *b);
-int  _Qp_fgt(float128 *a, float128 *b);
-int  _Qp_fle(float128 *a, float128 *b);
-int  _Qp_flt(float128 *a, float128 *b);
-int  _Qp_fne(float128 *a, float128 *b);
-void _Qp_itoq(float128 *c, int a);
-void _Qp_mul(float128 *c, float128 *a, float128 *b);
-void _Qp_neg(float128 *c, float128 *a);
-double _Qp_qtod(float128 *a);
-int _Qp_qtoi(float128 *a);
-float _Qp_qtos(float128 *a);
-unsigned int _Qp_qtoui(float128 *a);
-unsigned long _Qp_qtoux(float128 *a);
-long _Qp_qtox(float128 *a);
-void _Qp_sqrt(float128 *c, float128 *a);
-void _Qp_stoq(float128 *c, float a);
-void _Qp_sub(float128 *c, float128 *a, float128 *b);
-void _Qp_uitoq(float128 *c, unsigned int a);
-void _Qp_uxtoq(float128 *c, unsigned long a);
-void _Qp_xtoq(float128 *c, long a);
-
-
-void
-_Qp_add(float128 *c, float128 *a, float128 *b)
-{
-	 *c =  float128_add(*a, *b);
-}
-
-
-int
-_Qp_cmp(float128 *a, float128 *b)
-{
-
-	if (float128_eq(*a, *b))
-		return 0;
-
-	if (float128_le(*a, *b))
-		return 1;
-
-	return 2;
-}
-
-
-/*
- * XXX 
- */
-int
-_Qp_cmpe(float128 *a, float128 *b)
-{
-	return _Qp_cmp(a, b);
-}
-
-
-void
-_Qp_div(float128 *c, float128 *a, float128 *b)
-{
-	*c = float128_div(*a, *b);
-}
-
-
-void
-_Qp_dtoq(float128 *c, double a)
-{
-	float64 _b;
-
-	memcpy (&_b, &a, sizeof(float64));
-	*c = float64_to_float128(_b);
-}
-
-
-int
-_Qp_feq(float128 *a, float128 *b)
-{
-	return float128_eq(*a, *b);
-}
-
-
-int
-_Qp_fge(float128 *a, float128 *b)
-{
-	return float128_le(*b, *a);
-}
-
-
-int
-_Qp_fgt(float128 *a, float128 *b)
-{
-	return float128_lt(*b, *a);
-}
-
-
-int
-_Qp_fle(float128 *a, float128 *b)
-{
-	return float128_le(*a, *b);
-}
-
-
-int
-_Qp_flt(float128 *a, float128 *b)
-{
-	return float128_lt(*a, *b);
-}
-
-
-int
-_Qp_fne(float128 *a, float128 *b)
-{
-	return !float128_eq(*a, *b);
-}
-
-
-void
-_Qp_itoq(float128 *c, int a)
-{
-	*c = int32_to_float128(a);
-}
-
-
-void
-_Qp_mul(float128 *c, float128 *a, float128 *b)
-{
-	*c = float128_mul(*a, *b);
-}
-
-
-/*
- * XXX need corresponding softfloat functions
- */
-static float128 __sf128_zero = {0x4034000000000000, 0x00000000};
-static float128 __sf128_one = {0x3fff000000000000, 0};
-
-void
-_Qp_neg(float128 *c, float128 *a)
-{
-	*c = float128_sub(__sf128_zero, *a);
-}
-
-
-double
-_Qp_qtod(float128 *a)
-{
-	float64 _c;
-	double c;
-
-	_c = float128_to_float64(*a);
-
-	memcpy(&c, &_c, sizeof(double));
-
-	return c;
-}
-
-
-int
-_Qp_qtoi(float128 *a)
-{
-	return float128_to_int32_round_to_zero(*a);
-}
-
-
-float
- _Qp_qtos(float128 *a)
-{
-	float c;
-	float32 _c;
-
-	_c = float128_to_float32(*a);
-
-	memcpy(&c, &_c, sizeof(_c));
-
-	return c; 
-}
-
-
-unsigned int
-_Qp_qtoui(float128 *a)
-{
-	return (unsigned int)float128_to_int64_round_to_zero(*a);
-}
-
-
-unsigned long
-_Qp_qtoux(float128 *a)
-{
-	return (unsigned long)float128_to_uint64_round_to_zero(*a);
-}
-
-
-long
-_Qp_qtox(float128 *a)
-{
-	return (long)float128_to_int64_round_to_zero(*a);
-}
-
-
-void
-_Qp_sqrt(float128 *c, float128 *a)
-{
-	*c = float128_sqrt(*a);
-}
-
-
-void
-_Qp_stoq(float128 *c, float a)
-{
-	float32 _a;
-
-	memcpy(&_a, &a, sizeof(a));
-
-	*c = float32_to_float128(_a);
-}
-
-
-void
-_Qp_sub(float128 *c, float128 *a, float128 *b)
-{
-	*c = float128_sub(*a, *b);
-}
-
-
-void
-_Qp_uitoq(float128 *c, unsigned int a)
-{
-	*c = int64_to_float128(a);
-}
-
-
-void
-_Qp_uxtoq(float128 *c, unsigned long a)
-{
-	if (a & 0x8000000000000000ULL) {
-		/* a would not fit in a signed conversion */
-		*c = int64_to_float128((long long)(a>>1));
-		*c = float128_add(*c, *c);
-		if (a & 1)
-			*c = float128_add(*c, __sf128_one);
-	} else {
-		*c = int64_to_float128((long long)a);
-	}
-}
-
-
-void
-_Qp_xtoq(float128 *c, long a)
-{
-	*c = int64_to_float128((long long)a);
-}
diff --git a/lib/libc/arch/sparc64/softfloat/softfloat-qp.h b/lib/libc/arch/sparc64/softfloat/softfloat-qp.h
deleted file mode 100644
index 1fda8802c..000000000
--- a/lib/libc/arch/sparc64/softfloat/softfloat-qp.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Get everything SOFTFLOAT_FOR_GCC normally would rename out of the users
- * namespace. Much of this isn't used but to avoid dissecting softloat.c
- * all of it is pulled in even for just the _Qp* case
- */
-
-#if defined(SOFTFLOATSPARC64_FOR_GCC) && !defined(SOFTFLOAT_FOR_GCC)
-#define float_exception_flags   _softfloat_float_exception_flags
-#define float_rounding_mode     _softfloat_float_rounding_mode
-#define float_raise             _softfloat_float_raise
-
-#define float32_eq              _softfloat_float32_eq
-#define float32_le              _softfloat_float32_le
-#define float32_lt              _softfloat_float32_lt
-#define float64_eq              _softfloat_float64_eq
-#define float64_le              _softfloat_float64_le
-#define float64_lt              _softfloat_float64_lt
-
-#define float32_add			_softfloat_float32_add
-#define float64_add			_softfloat_float64_add
-#define float32_sub			_softfloat_float32_sub
-#define float64_sub			_softfloat_float64_sub
-#define float32_mul			_softfloat_float32_mul
-#define float64_mul			_softfloat_float64_mul
-#define float32_div			_softfloat_float32_div
-#define float64_div			_softfloat_float64_div
-#define int32_to_float32		_softfloat_int32_to_float32
-#define int32_to_float64		_softfloat_int32_to_float64
-#define int64_to_float32		_softfloat_int64_to_float32
-#define int64_to_float64		_softfloat_int64_to_float64
-#define float32_to_int32_round_to_zero	_softfloat_float32_to_int32_round_to_zero
-#define float64_to_int32_round_to_zero	_softfloat_float64_to_int32_round_to_zero
-#define float32_to_int64_round_to_zero	_softfloat_float32_to_int64_round_to_zero
-#define float64_to_int64_round_to_zero	_softfloat_float64_to_int64_round_to_zero
-#define float32_to_uint32_round_to_zero	_softfloat_float32_to_uint32_round_to_zero
-#define float64_to_uint32_round_to_zero	_softfloat_float64_to_uint32_round_to_zero
-#define float32_to_float64		_softfloat_float32_to_float64
-#define float64_to_float32		_softfloat_float64_to_float32
-#define float32_is_signaling_nan	_softfloat_float32_is_signaling_nan
-#define float64_is_signaling_nan	_softfloat_float64_is_signaling_nan
-
-#endif /* SOFTFLOATSPARC64_FOR_GCC and !SOFTFLOAT_FOR_GCC */
-
-/*
- * The following will always end up in the namespace if FLOAT128 is
- * defined and SOFTFLOAT_FOR_GCC isn't. So rename them out of the user's
- * namespace.
- */
-
-#ifdef SOFTFLOATSPARC64_FOR_GCC
-#define	float128_add			_softfloat_float128_add
-#define	float128_div			_softfloat_float128_div
-#define	float128_eq			_softfloat_float128_eq
-#define	float128_eq_signaling		_softfloat_float128_eq_signaling
-#define	float128_is_nan			_softfloat_float128_is_nan
-#define	float128_is_signaling_nan	_softfloat_float128_is_signaling_nan
-#define	float128_le			_softfloat_float128_le
-#define	float128_le_quiet		_softfloat_float128_le_quiet
-#define	float128_lt			_softfloat_float128_lt
-#define	float128_lt_quiet		_softfloat_float128_lt_quiet
-#define	float128_mul			_softfloat_float128_mul
-#define	float128_rem			_softfloat_float128_rem
-#define	float128_round_to_int		_softfloat_float128_round_to_int
-#define	float128_sqrt			_softfloat_float128_sqrt
-#define	float128_sub			_softfloat_float128_sub
-#define	float128_to_float32		_softfloat_float128_to_float32
-#define	float128_to_float64		_softfloat_float128_to_float64
-#define	float128_to_int32		_softfloat_float128_to_int32
-#define	float128_to_int32_round_to_zero	_softfloat_float128_to_int32_round_to_zero
-#define	float128_to_int64		_softfloat_float128_to_int64
-#define	float128_to_int64_round_to_zero	_softfloat_float128_to_int64_round_to_zero
-#define	float128_to_uint64_round_to_zero	_softfloat_float128_to_uint64_round_to_zero
-#define	float32_to_float128		_softfloat_float32_to_float128
-#define	float64_to_float128		_softfloat_float64_to_float128
-#define	int32_to_float128		_softfloat_int32_to_float128
-#define	int64_to_float128		_softfloat_int64_to_float128
-
-/*
- * If this isn't defined go ahead and set it now since this is now past
- * anywhere define's are happening and this will conditionally compile out
- * a lot of extraneous code in softfloat.c
- */
-
-#ifndef SOFTFLOAT_FOR_GCC
-#define SOFTFLOAT_FOR_GCC
-#endif
-
-#endif /* SOFTFLOATSPARC64_FOR_GCC */
diff --git a/lib/libc/arch/sparc64/softfloat/softfloat-wrapper.c b/lib/libc/arch/sparc64/softfloat/softfloat-wrapper.c
deleted file mode 100644
index ac5582aff..000000000
--- a/lib/libc/arch/sparc64/softfloat/softfloat-wrapper.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <softfloat.c>
diff --git a/lib/libc/arch/sparc64/softfloat/softfloat.h b/lib/libc/arch/sparc64/softfloat/softfloat.h
deleted file mode 100644
index 881669265..000000000
--- a/lib/libc/arch/sparc64/softfloat/softfloat.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*	$NetBSD: softfloat.h,v 1.8 2011/07/07 07:14:57 matt Exp $	*/
-
-/* This is a derivative work. */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.  The same applies to
-the `FLOAT128' macro and the quadruple-precision format `float128'.
--------------------------------------------------------------------------------
-*/
-/* #define FLOATX80 */
-#define FLOAT128
-
-#include "softfloat-qp.h"
-
-#include <machine/ieeefp.h>
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef unsigned int float32;
-typedef unsigned long long float64;
-#ifdef FLOATX80
-typedef struct {
-    unsigned short high;
-    unsigned long long low;
-} floatx80;
-#endif
-#ifdef FLOAT128
-typedef struct {
-    unsigned long long high, low;
-} float128;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-#ifndef SOFTFLOAT_FOR_GCC
-extern int8 float_detect_tininess;
-#endif
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern fp_rnd float_rounding_mode;
-#define float_round_nearest_even FP_RN
-#define float_round_to_zero      FP_RZ
-#define float_round_down         FP_RM
-#define float_round_up           FP_RP
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-*/
-extern fp_except float_exception_flags;
-extern fp_except float_exception_mask;
-enum {
-    float_flag_inexact   = FP_X_IMP,
-    float_flag_underflow = FP_X_UFL,
-    float_flag_overflow  = FP_X_OFL,
-    float_flag_divbyzero = FP_X_DZ,
-    float_flag_invalid   = FP_X_INV
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( fp_except );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int32 );
-float32 uint32_to_float32( uint32 );
-float64 int32_to_float64( int32 );
-float64 uint32_to_float64( uint32 );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( int32 );
-floatx80 uint32_to_floatx80( uint32 );
-#endif
-#ifdef FLOAT128
-float128 int32_to_float128( int32 );
-float128 uint32_to_float128( uint32 );
-#endif
-float32 int64_to_float32( long long );
-float64 int64_to_float64( long long );
-#ifdef FLOATX80
-floatx80 int64_to_floatx80( long long );
-#endif
-#ifdef FLOAT128
-float128 int64_to_float128( long long );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float32_to_int32( float32 );
-int float32_to_int32_round_to_zero( float32 );
-unsigned int float32_to_uint32_round_to_zero( float32 );
-long long float32_to_int64( float32 );
-long long float32_to_int64_round_to_zero( float32 );
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-#ifdef FLOAT128
-float128 float32_to_float128( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-flag float32_eq( float32, float32 );
-flag float32_le( float32, float32 );
-flag float32_lt( float32, float32 );
-flag float32_eq_signaling( float32, float32 );
-flag float32_le_quiet( float32, float32 );
-flag float32_lt_quiet( float32, float32 );
-flag float32_is_signaling_nan( float32 );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float64_to_int32( float64 );
-int float64_to_int32_round_to_zero( float64 );
-unsigned int float64_to_uint32_round_to_zero( float64 );
-long long float64_to_int64( float64 );
-long long float64_to_int64_round_to_zero( float64 );
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-#ifdef FLOAT128
-float128 float64_to_float128( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-flag float64_eq( float64, float64 );
-flag float64_le( float64, float64 );
-flag float64_lt( float64, float64 );
-flag float64_eq_signaling( float64, float64 );
-flag float64_le_quiet( float64, float64 );
-flag float64_lt_quiet( float64, float64 );
-flag float64_is_signaling_nan( float64 );
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int floatx80_to_int32( floatx80 );
-int floatx80_to_int32_round_to_zero( floatx80 );
-long long floatx80_to_int64( floatx80 );
-long long floatx80_to_int64_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-#ifdef FLOAT128
-float128 floatx80_to_float128( floatx80 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern int floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-flag floatx80_eq( floatx80, floatx80 );
-flag floatx80_le( floatx80, floatx80 );
-flag floatx80_lt( floatx80, floatx80 );
-flag floatx80_eq_signaling( floatx80, floatx80 );
-flag floatx80_le_quiet( floatx80, floatx80 );
-flag floatx80_lt_quiet( floatx80, floatx80 );
-flag floatx80_is_signaling_nan( floatx80 );
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float128_to_int32( float128 );
-int float128_to_int32_round_to_zero( float128 );
-long long float128_to_int64( float128 );
-long long float128_to_int64_round_to_zero( float128 );
-unsigned long long float128_to_uint64_round_to_zero( float128 );
-float32 float128_to_float32( float128 );
-float64 float128_to_float64( float128 );
-#ifdef FLOATX80
-floatx80 float128_to_floatx80( float128 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision operations.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 );
-float128 float128_add( float128, float128 );
-float128 float128_sub( float128, float128 );
-float128 float128_mul( float128, float128 );
-float128 float128_div( float128, float128 );
-float128 float128_rem( float128, float128 );
-float128 float128_sqrt( float128 );
-flag float128_eq( float128, float128 );
-flag float128_le( float128, float128 );
-flag float128_lt( float128, float128 );
-flag float128_eq_signaling( float128, float128 );
-flag float128_le_quiet( float128, float128 );
-flag float128_lt_quiet( float128, float128 );
-flag float128_is_signaling_nan( float128 );
-flag float128_is_nan( float128 );
-
-#endif
diff --git a/lib/libc/arch/sparc64/softfloat/sparc64-gcc.h b/lib/libc/arch/sparc64/softfloat/sparc64-gcc.h
deleted file mode 100644
index 778e9d0e3..000000000
--- a/lib/libc/arch/sparc64/softfloat/sparc64-gcc.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$NetBSD: sparc64-gcc.h,v 1.2 2005/12/24 21:11:16 perry Exp $	*/
-
-/*
--------------------------------------------------------------------------------
-One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
--------------------------------------------------------------------------------
-*/
-#include <machine/endian.h>
-#if _BYTE_ORDER == _BIG_ENDIAN
-#define BIGENDIAN
-#endif
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#define LITTLEENDIAN
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `BITS64' can be defined to indicate that 64-bit integer types are
-supported by the compiler.
--------------------------------------------------------------------------------
-*/
-#define BITS64
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines the most convenient type that holds
-integers of at least as many bits as specified.  For example, `uint8' should
-be the most convenient type that can hold unsigned integers of as many as
-8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
-implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
-to the same as `int'.
--------------------------------------------------------------------------------
-*/
-typedef int flag;
-typedef int uint8;
-typedef int int8;
-typedef int uint16;
-typedef int int16;
-typedef unsigned int uint32;
-typedef signed int int32;
-#ifdef BITS64
-typedef unsigned long long int uint64;
-typedef signed long long int int64;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines a type that holds integers
-of _exactly_ the number of bits specified.  For instance, for most
-implementation of C, `bits16' and `sbits16' should be `typedef'ed to
-`unsigned short int' and `signed short int' (or `short int'), respectively.
--------------------------------------------------------------------------------
-*/
-typedef unsigned char bits8;
-typedef signed char sbits8;
-typedef unsigned short int bits16;
-typedef signed short int sbits16;
-typedef unsigned int bits32;
-typedef signed int sbits32;
-#ifdef BITS64
-typedef unsigned long long int bits64;
-typedef signed long long int sbits64;
-#endif
-
-#ifdef BITS64
-/*
--------------------------------------------------------------------------------
-The `LIT64' macro takes as its argument a textual integer literal and
-if necessary ``marks'' the literal as having a 64-bit integer type.
-For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
-appended with the letters `LL' standing for `long long', which is `gcc's
-name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
-defined as the identity macro:  `#define LIT64( a ) a'.
--------------------------------------------------------------------------------
-*/
-#define LIT64( a ) a##LL
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `INLINE' can be used before functions that should be inlined.  If
-a compiler does not support explicit inlining, this macro should be defined
-to be `static'.
--------------------------------------------------------------------------------
-*/
-#define INLINE static inline
-
-#define FLOAT64_DEMANGLE(a)	(a)
-#define FLOAT64_MANGLE(a)	(a)
diff --git a/lib/libc/arch/sparc64/stdlib/Makefile.inc b/lib/libc/arch/sparc64/stdlib/Makefile.inc
deleted file mode 100644
index 2f91b992a..000000000
--- a/lib/libc/arch/sparc64/stdlib/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2009/07/31 20:40:00 dsl Exp $
diff --git a/lib/libc/arch/sparc64/stdlib/abs.S b/lib/libc/arch/sparc64/stdlib/abs.S
deleted file mode 100644
index 379b26e95..000000000
--- a/lib/libc/arch/sparc64/stdlib/abs.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: abs.S,v 1.2 2003/08/07 16:42:28 agc 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.
- * 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.
- *
- * from: Header: abs.s,v 1.1 91/07/06 18:01:57 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)abs.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: abs.S,v 1.2 2003/08/07 16:42:28 agc Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/* abs - int absolute value */
-
-
-ENTRY(abs)
-	neg	%o0, %o1
-	retl
-	 movrlz	%o0, %o1, %o0
diff --git a/lib/libc/arch/sparc64/string/Makefile.inc b/lib/libc/arch/sparc64/string/Makefile.inc
deleted file mode 100644
index 3d197b8bb..000000000
--- a/lib/libc/arch/sparc64/string/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.8 2009/08/11 17:30:43 dsl Exp $
-
-SRCS+=	ffs.S memcpy.S memset.S strlen.S
-NO_SRCS+= bcopy.S bzero.S
diff --git a/lib/libc/arch/sparc64/sys/__clone.S b/lib/libc/arch/sparc64/sys/__clone.S
deleted file mode 100644
index 3d36d7ded..000000000
--- a/lib/libc/arch/sparc64/sys/__clone.S
+++ /dev/null
@@ -1,91 +0,0 @@
-/*	$NetBSD: __clone.S,v 1.7 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-     
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *      
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:     
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *      
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(clone, __clone)
-#endif
-
-/*
- * int __clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-ENTRY(__clone)
-	save	%sp, -CC64FSZ, %sp
-
-	/*
-	 * Sanity checks: func and stack may not be NULL.
-	 */
-	brz,pn	%i0,8f		! func == NULL, bail
-	 orcc	%i1, %g0, %o1	! setup stack arg for syscall, test
-	bz,pn	%xcc, 8f	! stack == NULL, bail
-	 mov	%i2, %o0	! setup flags arg for syscall
-
-	/*
-	 * Allocate "caller's" frame in the child stack as ABI
-	 * requires.  Subtract BIAS - it will be 64-bit code.
-	 *
-	 * We pass the function and the argument to the child by
-	 * stashing them at the bottom of the frame.  There they are
-	 * safe from window spill would we need to take one as it's
-	 * below the window save area.
-	 */
-	sub	%o1, CC64FSZ+BIAS, %o1		! make space
-	stx	%i0, [%o1+CC64FSZ-16+BIAS]	! save func
-	stx	%i3, [%o1+CC64FSZ-8+BIAS]	! save arg
-
-	/*
-	 * Args are now set up for system call as (flags, stack).
-	 */
-	mov	SYS___clone, %g1
-	t	ST_SYSCALL
-	bcs,pn	%xcc, 9f
-	 tst	%o1		! %o1 (rv[1]) == 0 in parent
-	bz	%xcc, 2f	! yes, parent
-	 ldx	[%sp+CC64FSZ-16+BIAS], %l0	! grab the function...
-	call	%l0 		! Call the clone's entry point.
-	 ldx	[%sp+CC64FSZ-8+BIAS], %o0	! ...and the argument
-
-	JUMP(_exit)
-	/* NOTREACHED */
-
-2:	ret
-	 restore %g0, %o0, %o0
-
-8:	restore %g0, EINVAL, %o0
-	ERROR()
-	/* NOTREACHED */
-
-9:	restore %o0, %g0, %o0
-	ERROR()
-	/* NOTREACHED */
diff --git a/lib/libc/arch/sparc64/sys/__sigaction14_sigtramp.c b/lib/libc/arch/sparc64/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index 62833a674..000000000
--- a/lib/libc/arch/sparc64/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.9 2009/01/11 02:46:24 christos Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.9 2009/01/11 02:46:24 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern void __sigtramp_siginfo_2(void);
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the compatibility SIGCONTEXT trampoline if SA_SIGINFO
-	 * is not set in the sigaction.
-	 */
-	if (act && (act->sa_flags & SA_SIGINFO) == 0) {
-		extern void __sigtramp_sigcontext_1(void);
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-					   __sigtramp_sigcontext_1, 1);
-		/*
-		 * EINVAL might indicate that trampoline version 1 is
-		 * not supported by the kernel; fall back on native
-		 * SIGINFO trampoline.
-		 */
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/sparc64/sys/__sigtramp2.S b/lib/libc/arch/sparc64/sys/__sigtramp2.S
deleted file mode 100644
index 9f9357194..000000000
--- a/lib/libc/arch/sparc64/sys/__sigtramp2.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.3 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Paul Kranenburg.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __sigtramp2.S,v 1.3 2008/04/28 20:22:57 martin Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-#define _LOCORE
-#include <sparc/frame.h>	/* BIAS, CC64FSZ */
-
-/*
- * When this code is run, the stack looks like:
- *	[%sp + BIAS]			struct frame
- *	[%sp + BIAS + CC64FSZ]		siginfo_t
- *	[%sp + BIAS + CC64FSZ + 128]	ucontext_t
- *	    .
- *	    .
- */
-ENTRY_NOPROFILE(__sigtramp_siginfo_2)
-	add	%sp, BIAS + CC64FSZ + 128, %o0	/* get pointer to ucontext */
-	mov	SYS_setcontext, %g1
-	t	ST_SYSCALL		/* call setcontext */
-	mov	SYS_exit, %g1		/* exit with errno */
-	t	ST_SYSCALL		/* if sigreturn fails */
diff --git a/lib/libc/arch/sparc64/sys/__syscall.S b/lib/libc/arch/sparc64/sys/__syscall.S
deleted file mode 100644
index 5d55ec75e..000000000
--- a/lib/libc/arch/sparc64/sys/__syscall.S
+++ /dev/null
@@ -1,6 +0,0 @@
-/*	$NetBSD: __syscall.S,v 1.1 2000/12/13 20:25:04 martin Exp $	*/
-
-#include <machine/asm.h>
-#include "SYS.h"
-
-RSYSCALL(__syscall)
diff --git a/lib/libc/arch/sparc64/sys/__vfork14.S b/lib/libc/arch/sparc64/sys/__vfork14.S
deleted file mode 100644
index 1ffd4d619..000000000
--- a/lib/libc/arch/sparc64/sys/__vfork14.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: __vfork14.S,v 1.3 2003/08/07 16:42:29 agc 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.
- * 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.
- *
- * from: Header: Ovfork.s,v 1.1 91/07/06 13:05:56 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)Ovfork.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: __vfork14.S,v 1.3 2003/08/07 16:42:29 agc Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-/*
- * pid = vfork();
- *
- * %o1 == 0 in parent process, 1 in child process.
- * %o0 == pid of child in parent, pid of parent in child.
- */
-
-#include "SYS.h"
-
-SYSCALL(__vfork14)
-	dec	%o1		/* from 1 to 0 in child, 0 to -1 in parent */
-	retl
-	 and	%o0, %o1, %o0	/* return 0 in child, pid in parent */
diff --git a/lib/libc/arch/sparc64/sys/brk.S b/lib/libc/arch/sparc64/sys/brk.S
deleted file mode 100644
index 981f313f3..000000000
--- a/lib/libc/arch/sparc64/sys/brk.S
+++ /dev/null
@@ -1,118 +0,0 @@
-/*	$NetBSD: brk.S,v 1.13 2013/09/12 15:36:16 joerg 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.
- * 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.
- *
- * from: Header: brk.s,v 1.3 92/06/25 12:56:05 mccanne Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)brk.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: brk.S,v 1.13 2013/09/12 15:36:16 joerg Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-	.globl	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(__minbrk)
-	.globl	_C_LABEL(_end)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
-#endif
-
-	.data
-	.align	8
-_C_LABEL(__minbrk):
-	.xword	_C_LABEL(_end)		/* lower brk limit; also for gmon code */
-	.text
-
-#if __PIC__ - 0 >= 2
-
-ENTRY(_brk)
-	PIC_PROLOGUE(%o5,%o4)
-	set	_C_LABEL(__minbrk), %o4
-	ldx	[%o5 + %o4], %o4
-	ldx	[%o4], %o1		/* %o1 = minbrk */
-	cmp	%o1, %o0		/* if (minbrk > %o0) */
-	movgu	%xcc, %o1, %o0		/*	%o0 = minbrk */
-	mov	%o0, %o2		/* save argument to syscall */
-	mov	SYS_break, %g1
-	t	ST_SYSCALL
-	set	_C_LABEL(__curbrk), %o3
-	bcc,a,pt	%icc, 1f
-	 ldx	[%o5 + %o3], %o4
-	ERROR()
-1:
-	retl				/* success, return 0 & record new break */
-	 stx	%o2, [%o4]
-
-#elif __PIC__ - 0 >= 1
-
-ENTRY(_brk)
-	PIC_PROLOGUE(%o5,%o4)
-	ldx	[%o5 + _C_LABEL(__minbrk)], %o4
-	ldx	[%o4], %o1		/* %o1 = minbrk */
-	cmp	%o1, %o0		/* if (minbrk > %o0) */
-	movgu	%xcc, %o1, %o0		/*	%o0 = minbrk */
-	mov	%o0, %o2		/* save argument to syscall */
-	mov	SYS_break, %g1
-	t	ST_SYSCALL
-	bcc,a,pt	%icc, 1f
-	 ldx	[%o5 + _C_LABEL(__curbrk)], %o4
-	ERROR()
-1:
-	retl				/* success, return 0 & record new break */
-	 stx	%o2, [%o4]
-
-#else
-
-ENTRY(_brk)
-	sethi	%hi(_C_LABEL(__minbrk)), %o1	/* %o1 = minbrk */
-	ldx	[%o1 + %lo(_C_LABEL(__minbrk))], %o1
-	cmp	%o1, %o0		/* if (minbrk > %o0) */
-	movgu	%xcc, %o1, %o0		/*	%o0 = minbrk */
-	mov	%o0, %o2		/* save argument to syscall */
-	mov	SYS_break, %g1
-	t	ST_SYSCALL
-	bcc,a,pt	%icc,1f
-	 sethi	%hi(_C_LABEL(__curbrk)), %g1
-	ERROR()
-1:
-	retl				/* success, return 0 & record new break */
-	 stx	%o2, [%g1 + %lo(_C_LABEL(__curbrk))]
-
-#endif
diff --git a/lib/libc/arch/sparc64/sys/cerror.S b/lib/libc/arch/sparc64/sys/cerror.S
deleted file mode 100644
index af4d39efb..000000000
--- a/lib/libc/arch/sparc64/sys/cerror.S
+++ /dev/null
@@ -1,93 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.8 2013/09/14 05:38:00 nakayama 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.
- * 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.
- *
- * from: Header: cerror.s,v 1.3 92/07/02 04:17:59 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)cerror.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: cerror.S,v 1.8 2013/09/14 05:38:00 nakayama Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-#ifdef _REENTRANT
-FUNC(__cerror)
-	save	%sp, -CC64FSZ, %sp
-	call	_C_LABEL(__errno)
-	 nop
-	st	%i0, [%o0]
-	mov	-1, %i0
-	ret
-	 restore %g0, -1, %o1
-#else
-	.globl	_C_LABEL(errno)
-
-#if __PIC__ - 0 >= 2
-
-FUNC(__cerror)
-	PIC_PROLOGUE(%g1, %o3)
-	set	_C_LABEL(errno),%o1
-	ldx	[%g1 + %o1], %g1
-	st	%o0, [%g1]
-	mov	-1, %o0
-	retl
-	 mov	-1, %o1
-
-#elif __PIC__ - 0 >= 1
-
-FUNC(__cerror)
-	PIC_PROLOGUE(%g1, %o3)
-	ldx	[%g1 + _C_LABEL(errno)], %g1
-	st	%o0, [%g1]
-	mov	-1, %o0
-	retl
-	 mov	-1, %o1
-
-#else
-
-FUNC(__cerror)
-	sethi	%hi(_C_LABEL(errno)), %g1
-	st	%o0, [%g1 + %lo(_C_LABEL(errno))]
-	mov	-1, %o0
-	retl
-	 mov	-1, %o1
-
-#endif /* __PIC__ */
-
-#endif /* _REENTRANT */
diff --git a/lib/libc/arch/sparc64/sys/exect.S b/lib/libc/arch/sparc64/sys/exect.S
deleted file mode 100644
index 5c886989c..000000000
--- a/lib/libc/arch/sparc64/sys/exect.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: exect.S,v 1.2 2003/08/07 16:42:29 agc 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.
- * 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.
- *
- * from: Header: exect.s,v 1.1 91/07/06 13:05:57 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)exect.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: exect.S,v 1.2 2003/08/07 16:42:29 agc Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-ENTRY(exect)
-	mov	SYS_execve, %g1	/* execve(file, argv, env) */
-	t	ST_SYSCALL
-	ERROR()
diff --git a/lib/libc/arch/sparc64/sys/fork.S b/lib/libc/arch/sparc64/sys/fork.S
deleted file mode 100644
index e83affa83..000000000
--- a/lib/libc/arch/sparc64/sys/fork.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: fork.S,v 1.5 2003/08/07 16:42:30 agc 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.
- * 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.
- *
- * from: Header: fork.s,v 1.1 91/07/06 13:05:58 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)fork.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: fork.S,v 1.5 2003/08/07 16:42:30 agc Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-_SYSCALL(__fork,fork)
-	dec	%o1		/* from 1 to 0 in child, 0 to -1 in parent */
-	retl
-	 and	%o0, %o1, %o0	/* return 0 in child, pid in parent */
diff --git a/lib/libc/arch/sparc64/sys/getcontext.S b/lib/libc/arch/sparc64/sys/getcontext.S
deleted file mode 100644
index 29f0c840a..000000000
--- a/lib/libc/arch/sparc64/sys/getcontext.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.3 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: getcontext.S,v 1.3 2008/04/28 20:22:57 martin Exp $")
-#endif /* SYSLIBC_SCCS && !lint */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext, _getcontext)
-#endif
-
-ENTRY(_getcontext)
-	mov	%o0, %o2			/* must save pointer */
-	mov	SYS_getcontext, %g1
-	t	ST_SYSCALL
-	bcc,a	1f
-	 stx	%g0, [%o2 + 64 + 11 * 8]	/* gr[_REG_O0] = 0 */
-	ERROR()
-1:
-	add	%o7, 8, %o1
-	stx	%o1, [%o2 + 64 + 1 * 8]		/* gr[_REG_PC] = retaddr */
-	add	%o7, 12, %o1
-	retl
-	 stx	%o1, [%o2 + 64 + 2 * 8]		/* gr[_REG_nPC] = retaddr + 4 */
diff --git a/lib/libc/arch/sparc64/sys/pipe.S b/lib/libc/arch/sparc64/sys/pipe.S
deleted file mode 100644
index c0c6ecfc9..000000000
--- a/lib/libc/arch/sparc64/sys/pipe.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.4 2003/08/07 16:42:30 agc 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.
- * 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.
- *
- * from: Header: pipe.s,v 1.1 91/07/06 13:05:58 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)pipe.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: pipe.S,v 1.4 2003/08/07 16:42:30 agc Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-#endif
-
-ENTRY(_pipe)
-	mov	%o0, %o2	/* save pointer */
-	mov	SYS_pipe, %g1
-	t	ST_SYSCALL	/* pipe() */
-	bcc,a	1f
-	 st	%o0, [%o2]	/* success, store fds */
-	ERROR()
-1:
-	st	%o1, [%o2 + 4]
-	retl			/* and return 0 */
-	 clr	%o0
diff --git a/lib/libc/arch/sparc64/sys/ptrace.S b/lib/libc/arch/sparc64/sys/ptrace.S
deleted file mode 100644
index ecf2c9cb3..000000000
--- a/lib/libc/arch/sparc64/sys/ptrace.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.5 2003/08/07 16:42:30 agc 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.
- * 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.
- *
- * from: Header: ptrace.s,v 1.2 91/12/20 01:59:00 leres Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)ptrace.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: ptrace.S,v 1.5 2003/08/07 16:42:30 agc Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-ENTRY(ptrace)
-	save	%sp, -CC64FSZ, %sp
-	call	_C_LABEL(__errno)
-	 nop
-	st	%g0, [%o0]
-	restore
-	mov	SYS_ptrace, %g1
-	t	ST_SYSCALL
-	bcc	1f
-	nop
-	ERROR()
-1:
-	retl
-	nop
diff --git a/lib/libc/arch/sparc64/sys/sbrk.S b/lib/libc/arch/sparc64/sys/sbrk.S
deleted file mode 100644
index 29fd9fe6f..000000000
--- a/lib/libc/arch/sparc64/sys/sbrk.S
+++ /dev/null
@@ -1,113 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.11 2013/09/14 05:38:00 nakayama 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.
- * 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.
- *
- * from: Header: sbrk.s,v 1.3 92/07/02 00:56:49 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)sbrk.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: sbrk.S,v 1.11 2013/09/14 05:38:00 nakayama Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-	.globl	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(_end)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-	.data
-	.align	8
-_C_LABEL(__curbrk):
-	.xword	_C_LABEL(_end)
-	.text
-
-#if __PIC__ - 0 >= 2
-
-ENTRY(_sbrk)
-	PIC_PROLOGUE(%o5,%o4)
-	set	_C_LABEL(__curbrk), %o3
-	ldx	[%o5 + %o3], %o2
-	ldx	[%o2], %o3			/* %o3 = old break */
-	add	%o3, %o0, %o4			/* %o4 = new break */
-	mov	%o4, %o0			/* copy for syscall */
-	mov	SYS_break, %g1
-	t	ST_SYSCALL			/* break(new_break) */
-	bcc,a	1f				/* if success, */
-	 mov	%o3, %o0			/*    set return value */
-	ERROR()
-1:
-	retl					/* and update curbrk */
-	 stx	%o4, [%o2]
-
-#elif __PIC__ - 0 >= 1
-
-ENTRY(_sbrk)
-	PIC_PROLOGUE(%o5,%o4)
-	ldx	[%o5 + _C_LABEL(__curbrk)], %o2
-	ldx	[%o2], %o3			/* %o3 = old break */
-	add	%o3, %o0, %o4			/* %o4 = new break */
-	mov	%o4, %o0			/* copy for syscall */
-	mov	SYS_break, %g1
-	t	ST_SYSCALL			/* break(new_break) */
-	bcc,a	1f				/* if success, */
-	 mov	%o3, %o0			/*    set return value */
-	ERROR()
-1:
-	retl					/* and update curbrk */
-	 stx	%o4, [%o2]
-
-#else
-
-ENTRY(_sbrk)
-	sethi	%hi(_C_LABEL(__curbrk)), %o2
-	ldx	[%o2 + %lo(_C_LABEL(__curbrk))], %o3	/* %o3 = old break */
-	add	%o3, %o0, %o4			/* %o4 = new break */
-	mov	%o4, %o0			/* copy for syscall */
-	mov	SYS_break, %g1
-	t	ST_SYSCALL			/* break(new_break) */
-	bcc,a	1f				/* if success, */
-	 mov	%o3, %o0			/*    set return value */
-	ERROR()
-1:
-	retl					/* and update curbrk */
-	 stx	%o4, [%o2 + %lo(_C_LABEL(__curbrk))]
-
-#endif /* __PIC__ */
diff --git a/lib/libc/arch/sparc64/sys/shmat.S b/lib/libc/arch/sparc64/sys/shmat.S
deleted file mode 100644
index 216dbd807..000000000
--- a/lib/libc/arch/sparc64/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2000/07/07 08:20:55 itohy Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/sparc64/sys/syscall.S b/lib/libc/arch/sparc64/sys/syscall.S
deleted file mode 100644
index f49bf2dbf..000000000
--- a/lib/libc/arch/sparc64/sys/syscall.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.2 2003/08/07 16:42:30 agc 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.
- * 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.
- *
- * from: Header: syscall.s,v 1.1 91/07/06 13:06:02 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)syscall.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: syscall.S,v 1.2 2003/08/07 16:42:30 agc Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-RSYSCALL(syscall)
diff --git a/lib/libc/arch/vax/DEFS.h b/lib/libc/arch/vax/DEFS.h
deleted file mode 100644
index 9e2619748..000000000
--- a/lib/libc/arch/vax/DEFS.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	$NetBSD: DEFS.h,v 1.3 1996/01/06 18:34:59 ragge Exp $ */
-
-#include <machine/asm.h>
-
diff --git a/lib/libc/arch/vax/Makefile.inc b/lib/libc/arch/vax/Makefile.inc
deleted file mode 100644
index 592be933b..000000000
--- a/lib/libc/arch/vax/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.9 2010/07/06 05:59:52 mrg Exp $
-
-SRCS+=	__longjmp14.c
-SRCS+=	__sigaction14_sigtramp.c __sigtramp3.S
-
-CPPFLAGS+= -I.
-CPPFLAGS.assym.h+=-D__LIBC12_SOURCE__
diff --git a/lib/libc/arch/vax/SYS.h b/lib/libc/arch/vax/SYS.h
deleted file mode 100644
index 315f31944..000000000
--- a/lib/libc/arch/vax/SYS.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.12 2012/02/27 12:26:21 joerg Exp $ */
-/*
- * Copyright (c) 1983, 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.
- *
- *	@(#)SYS.h	8.1 (Berkeley) 6/4/93
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-
-#define	CERROR	_C_LABEL(__cerror)
-#define	CURBRK	_C_LABEL(__curbrk)
-
-#ifdef __STDC__
-#define SYSTRAP(x)	chmk $ SYS_ ## x
-#else
-#define SYSTRAP(x)	chmk $ SYS_/**/x
-#endif
-
-#define _SYSCALL_NOERROR(x,y)						\
-	ENTRY(x,0);							\
-	SYSTRAP(y)
-
-#define _SYSCALL(x,y)							\
-	.p2align 2;							\
-	err: nop; nop; jmp CERROR+2;					\
-	_SYSCALL_NOERROR(x,y);						\
-	jcs err+2
-
-#define SYSCALL_NOERROR(x)						\
-	_SYSCALL_NOERROR(x,x)
-
-#define SYSCALL(x)							\
-	_SYSCALL(x,x)
-
-#define PSEUDO_NOERROR(x,y)						\
-	_SYSCALL_NOERROR(x,y);						\
-	ret;								\
-	END(x)
-
-#define PSEUDO(x,y)							\
-	_SYSCALL(x,y);							\
-	ret;								\
-	END(x)
-
-#define RSYSCALL_NOERROR(x)						\
-	PSEUDO_NOERROR(x,x)
-
-#define RSYSCALL(x)							\
-	PSEUDO(x,x)
-
-#ifdef WEAK_ALIAS
-#define	WSYSCALL(weak,strong)						\
-	WEAK_ALIAS(weak,strong);					\
-	PSEUDO(strong,weak)
-#else
-#define	WSYSCALL(weak,strong)						\
-	PSEUDO(weak,weak)
-#endif
-
-#define	ASMSTR		.asciz
-
-	.protected	CERROR
-	.globl	CERROR
diff --git a/lib/libc/arch/vax/gdtoa/Makefile.inc b/lib/libc/arch/vax/gdtoa/Makefile.inc
deleted file mode 100644
index bae804d5d..000000000
--- a/lib/libc/arch/vax/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/03/15 17:35:18 kleink Exp $
-
-SRCS+=	strtof_vaxf.c
diff --git a/lib/libc/arch/vax/gdtoa/arith.h b/lib/libc/arch/vax/gdtoa/arith.h
deleted file mode 100644
index 66e57a0b8..000000000
--- a/lib/libc/arch/vax/gdtoa/arith.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define VAX
-#define NO_HEX_FP	/* XXX */
diff --git a/lib/libc/arch/vax/gdtoa/gd_qnan.h b/lib/libc/arch/vax/gdtoa/gd_qnan.h
deleted file mode 100644
index 86a5f8de9..000000000
--- a/lib/libc/arch/vax/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-/* No NaN in VAX FP. */
diff --git a/lib/libc/arch/vax/gen/Makefile.inc b/lib/libc/arch/vax/gen/Makefile.inc
deleted file mode 100644
index 224cb0ff2..000000000
--- a/lib/libc/arch/vax/gen/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.17 2010/07/06 05:59:52 mrg Exp $
-
-SRCS+=	byte_swap_2.S byte_swap_4.S bswap64.S \
-	fabs.S frexp.c \
-	fpclassifyf.c fpclassifyd.c \
-	infinityf.c infinity.c infinityl.c \
-	isfinitef.c isfinited.c \
-	ldexp.S \
-	makecontext.c modf.S \
-	resumecontext.c \
-	signbitf.c signbitd.c \
-	swapcontext.S \
-	udiv.S urem.S \
-	__setjmp14.S __sigsetjmp14.S _lwp.c _setjmp.S 
-
-# ABI compatibility for libc.so.12
-SRCS+=	isinf.c isnan.c
-
-LSRCS.vax.gen=	Lint_bswap16.c Lint_bswap32.c Lint_bswap64.c
-LSRCS+=		${LSRCS.vax.gen}
-DPSRCS+=	${LSRCS.vax.gen}
-CLEANFILES+=	${LSRCS.vax.gen}
diff --git a/lib/libc/arch/vax/gen/__longjmp14.c b/lib/libc/arch/vax/gen/__longjmp14.c
deleted file mode 100644
index c5d1aafbe..000000000
--- a/lib/libc/arch/vax/gen/__longjmp14.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*	$NetBSD: __longjmp14.c,v 1.4 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christian Limpach and Matt Thomas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <machine/reg.h>
-
-#define __LIBC12_SOURCE__
-#include <setjmp.h>
-#include <compat/include/setjmp.h>
-
-struct _jmp_buf {
-	struct sigcontext jb_sc;
-	register_t jb_regs[6];
-};
-
-void
-__longjmp14(jmp_buf env, int val)
-{
-	struct _jmp_buf *jb = (void *)env;
-	ucontext_t uc;
-
-	/* Ensure non-zero SP */
-	if (jb->jb_sc.sc_sp == 0)
-		goto err;
-
-	/* Ensure non-zero return value */
-	if (val == 0)
-		val = -1;
-
-	/* Set _UC_SIGMASK and _UC_CPU */
-	uc.uc_flags = _UC_SIGMASK | _UC_CPU;
-
-	/* Clear uc_link */
-	uc.uc_link = 0;
-
-	/* Save return value in context */
-	uc.uc_mcontext.__gregs[_REG_R0] = val;
-
-	/* Copy saved registers */
-	uc.uc_mcontext.__gregs[_REG_AP] = jb->jb_sc.sc_ap;
-	uc.uc_mcontext.__gregs[_REG_SP] = jb->jb_sc.sc_sp;
-	uc.uc_mcontext.__gregs[_REG_FP] = jb->jb_sc.sc_fp;
-	uc.uc_mcontext.__gregs[_REG_PC] = jb->jb_sc.sc_pc;
-	uc.uc_mcontext.__gregs[_REG_PSL] = jb->jb_sc.sc_ps;
-
-	uc.uc_mcontext.__gregs[_REG_R6] = jb->jb_regs[0];
-	uc.uc_mcontext.__gregs[_REG_R7] = jb->jb_regs[1];
-	uc.uc_mcontext.__gregs[_REG_R8] = jb->jb_regs[2];
-	uc.uc_mcontext.__gregs[_REG_R9] = jb->jb_regs[3];
-	uc.uc_mcontext.__gregs[_REG_R10] = jb->jb_regs[4];
-	uc.uc_mcontext.__gregs[_REG_R11] = jb->jb_regs[5];
-
-	/* Copy signal mask */
-	uc.uc_sigmask = jb->jb_sc.sc_mask;
-
-	setcontext(&uc);
- err:
-	longjmperror();
-	abort();
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/vax/gen/__setjmp14.S b/lib/libc/arch/vax/gen/__setjmp14.S
deleted file mode 100644
index 6114aad24..000000000
--- a/lib/libc/arch/vax/gen/__setjmp14.S
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-/*
- * 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 a struct sigcontext, see <signal.h>
- */
-
-#include "DEFS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)setjmp.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: __setjmp14.S,v 1.11 2011/01/25 02:38:15 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-ENTRY(__setjmp14, R6)
-	movl	4(%ap),%r2		# construct sigcontext
-	subl2	$12,%sp			# space for current struct sigstack
-	pushl	%sp			# get current values
-	pushl	$0			# no new values
-	calls	$4,_C_LABEL(__sigaltstack14) # pop args plus signal stack value
-	movl	4(%ap),%r2		# construct sigcontext
-	movl	(%sp)+,(%r2)		# save onsigstack status of caller
-	pushal	28(%r2)
-	pushl	$0
-	pushl	$0
-	calls	$3,_C_LABEL(__sigprocmask14) # get signal mask
-	addl3	$8,4(%ap),%r2		# point to sp in signal context
-	clrl	%r0			# assume no stack arguments
-	bbc	$13,6(%fp),1f		# handle callg
-	addl3	$1,(%ap),%r0		# get argument count +1 if calls
-1:	moval	24(%fp)[%r0],(%r2)+	# save sp of caller
-	movl	12(%fp),(%r2)+		# save frame pointer of caller
-	movl	8(%fp),(%r2)+		# save argument pointer of caller
-	movl	16(%fp),(%r2)+		# save pc of caller
-	movpsl	(%r2)			# save current psl
-	movw	4(%fp),(%r2)		# save psw of caller
-	addl3	$SC_LEN,4(%ap),%r2	# point to past signal context
-	movq	%r6,(%r2)+		# save r6/r7
-	movq	%r8,(%r2)+		# save r8/r9
-	movq	%r10,(%r2)+		# save r10/r11
-	clrl	%r0
-	ret
-END(__setjmp14)
diff --git a/lib/libc/arch/vax/gen/__sigsetjmp14.S b/lib/libc/arch/vax/gen/__sigsetjmp14.S
deleted file mode 100644
index ed661bfa4..000000000
--- a/lib/libc/arch/vax/gen/__sigsetjmp14.S
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 1983, 1993, 1995
- *	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 "DEFS.h"
-#include <machine/setjmp.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: __sigsetjmp14.S,v 1.5 2011/01/25 02:38:15 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * C library -- sigsetjmp, siglongjmp
- *
- *      siglongjmp(a,v)
- * will generate a "return(v)" from
- * the last call to
- *      sigsetjmp(a, savemask)
- * by restoring registers from the stack,
- * and dependent on savemask restores the
- * signal mask.
- */
-
-ENTRY(__sigsetjmp14, R6)
-	movl	4(%ap),%r0		# get env pointer
-	movl	8(%ap),(_JBLEN*4)(%r0)	# save "savemask"
-	tstl	8(%ap)			# do saving of signal mask?
-	beql	L1
-	jmp	_C_LABEL(__setjmp14)+2	# yep, do full setjmp
-L1:	jmp	_C_LABEL(_setjmp)+2	# nope, skip to _setjmp
-END(__sigsetjmp14)
-
-ENTRY(__siglongjmp14, 0)
-	movl	4(%ap),%r0		# get env pointer
-	tstl	(_JBLEN*4)(%r0)		# test if "savemask" was set
-	beql	L2
-	jmp	_C_LABEL(__longjmp14)+2	# yep, do full longjmp
-L2:	jmp	_C_LABEL(_longjmp)+2	# nope, skip to _longjmp
-END(__siglongjmp14)
-
diff --git a/lib/libc/arch/vax/gen/_lwp.c b/lib/libc/arch/vax/gen/_lwp.c
deleted file mode 100644
index 94d710bc6..000000000
--- a/lib/libc/arch/vax/gen/_lwp.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.3 2012/03/22 17:32:22 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.3 2012/03/22 17:32:22 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <inttypes.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *),
-    void *arg, void *private, caddr_t stack_base, size_t stack_size)
-{
-	__greg_t *gr = u->uc_mcontext.__gregs;
-	int *sp;
-
-	getcontext(u);
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-	/* Align to a word */
-	/* LINTED uintptr_t is safe */
-	sp = (int *)((uintptr_t)(stack_base + stack_size) & ~0x3);
-	
-	/*
-	 * Allocate necessary stack space for arguments including arg count
-	 * and call frame
-	 */
-	sp -= 1 + 1 + 5;
-
-	sp[0] = 0;			/* condition handler is null */
-	sp[1] = 0x20000000;		/* make this a CALLS frame */
-	sp[2] = 0;			/* saved argument pointer */
-	sp[3] = 0;			/* saved frame pointer */
-	sp[4] = (int)(uintptr_t)_lwp_exit + 2;/* return via _lwp_exit */
-	sp[5] = 1;			/* argc */
-	sp[6] = (int)(uintptr_t)arg;		/* argv */
-	
-	gr[_REG_AP] = (__greg_t)(uintptr_t)(sp + 5);
-	gr[_REG_SP] = (__greg_t)(uintptr_t)sp;
-	gr[_REG_FP] = (__greg_t)(uintptr_t)sp;
-	gr[_REG_PC] = (__greg_t)(uintptr_t)start + 2;
-
-	/*
-	 * Push the TLS pointer onto the new stack also.
-	 * The _UC_TLSBASE flag tells the kernel to pop it and use it.
-	 */
-	*--sp = (int)(intptr_t)private;
-	gr[_REG_SP] = (__greg_t)(uintptr_t)sp;
-	u->uc_flags |= _UC_TLSBASE;
-}
diff --git a/lib/libc/arch/vax/gen/_setjmp.S b/lib/libc/arch/vax/gen/_setjmp.S
deleted file mode 100644
index 932ee1371..000000000
--- a/lib/libc/arch/vax/gen/_setjmp.S
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 1980, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "DEFS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)_setjmp.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: _setjmp.S,v 1.10 2011/01/25 02:38:15 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * 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,
- * The previous signal state is NOT restored.
- *
- * Even though we don't use sigreturn14, we still store things in a sigcontext
- * in order to be consistent.
- */
-
-ENTRY(_setjmp, R6)
-	movl	4(%ap),%r0
-	movl	12(%fp),12(%r0)		# save frame pointer of caller
-	movl	16(%fp),20(%r0)		# save pc of caller
-	movl	8(%fp),16(%r0)		# save ap of caller
-	clrl	%r1			# clear arg count
-	bbc	$13,6(%fp),1f		# was this a callg?
-	addl3	$1,(%ap),%r1		# get real arg count+1 for calls
-1:	moval	24(%fp)[%r1],8(%r0)	# save sp of caller
-	movpsl	24(%r0)			# save current psl
-	movw	4(%fp),24(%r0)		# save psw of caller
-	movq	%r6,44(%r0)		# save r6/r7
-	movq	%r8,52(%r0)		# save r8/r9
-	movq	%r10,60(%r0)		# save r10/r11
-	clrl	%r0
-	ret
-END(_setjmp)
-
-ENTRY(_longjmp, 0)
-	movl	8(%ap),%r0		# return(v)
-	movl	4(%ap),%r1		# fetch buffer
-	tstl	12(%r1)			# is fp null
-	beql	botch
-	movq	44(%r1),%r6		# restore r6/r7
-	movq	52(%r1),%r8		# restore r8/r9
-	movq	60(%r1),%r10		# restore r10/r11
-	movl	16(%r1),%ap		# restore ap
-	movl	8(%r1),%sp		# restore sp
-	movl	12(%r1),%fp		# restore fp
-	movq	20(%r1),-(%sp)		# save pc/psl to new stack
-	rei				# and go back to saved pc/psl
-
-botch:
-	calls	$0,_C_LABEL(longjmperror)
-	halt
-END(_longjmp)
diff --git a/lib/libc/arch/vax/gen/alloca.S b/lib/libc/arch/vax/gen/alloca.S
deleted file mode 100644
index d6153040e..000000000
--- a/lib/libc/arch/vax/gen/alloca.S
+++ /dev/null
@@ -1,47 +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.
- * 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 "DEFS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)alloca.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: alloca.S,v 1.5 2011/11/21 16:17:48 chs Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-ENTRY(alloca, 0)
-	movl	4(%ap),%r0	# get allocation size
-	movl	16(%fp),%r1	# save return address before we smash it
-	movab	here,16(%fp)
-	ret
-here:
-	subl2	%r0,%sp		# create stack space
-	bicl2	$3,%sp		# align to longword boundary
-	movl	%sp,%r0
-	jmp	(%r1)
-END(alloca)
diff --git a/lib/libc/arch/vax/gen/byte_swap_2.S b/lib/libc/arch/vax/gen/byte_swap_2.S
deleted file mode 100644
index d3e64a109..000000000
--- a/lib/libc/arch/vax/gen/byte_swap_2.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "DEFS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)htons.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: byte_swap_2.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-ALTENTRY(ntohs)
-ALTENTRY(htons)
-ENTRY(__bswap16, 0)
-	rotl	$8,4(%ap),%r0
-	movb	5(%ap),%r0
-	movzwl	%r0,%r0
-	ret
-END(__bswap16)
diff --git a/lib/libc/arch/vax/gen/byte_swap_4.S b/lib/libc/arch/vax/gen/byte_swap_4.S
deleted file mode 100644
index d5272a3ae..000000000
--- a/lib/libc/arch/vax/gen/byte_swap_4.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "DEFS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)htonl.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: byte_swap_4.S,v 1.5 2011/01/25 02:38:15 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-ALTENTRY(ntohl)
-ALTENTRY(htonl)
-ENTRY(__bswap32, 0)
-	rotl	$-8,4(%ap),%r0
-	insv	%r0,$16,$8,%r0
-	movb	7(%ap),%r0
-	ret
-END(__bswap32)
diff --git a/lib/libc/arch/vax/gen/fabs.S b/lib/libc/arch/vax/gen/fabs.S
deleted file mode 100644
index 1b5c5f501..000000000
--- a/lib/libc/arch/vax/gen/fabs.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "DEFS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)fabs.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: fabs.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/* fabs - floating absolute value */
-
-ENTRY(fabs, 0)
-	movd	4(%ap),%r0
-	bgeq	1f
-	mnegd	%r0,%r0
-1:
-	ret
-END(fabs)
diff --git a/lib/libc/arch/vax/gen/fpclassifyd.c b/lib/libc/arch/vax/gen/fpclassifyd.c
deleted file mode 100644
index d7814de6f..000000000
--- a/lib/libc/arch/vax/gen/fpclassifyd.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: fpclassifyd.c,v 1.3 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpclassifyd.c,v 1.3 2008/04/28 20:22:57 martin Exp $");
-#endif
-
-#include <machine/vaxfp.h>
-#include <math.h>
-
-/*
- * 7.12.3.1 fpclassify - classify real floating type
- *          VAX D_floating version
- *
- *          Implementation notes:
- *          Reserved operand -> FP_ROP
- *          True zero        -> FP_ZERO
- *          Dirty zero       -> FP_DIRTY_ZERO
- *          Finite           -> FP_NORMAL
- */
-int
-__fpclassifyd(double x)
-{
-	union vax_dfloating_u u;
-
-	u.dfltu_d = x;
-
-	if (u.dfltu_dflt.dflt_exp == 0) {
-		if (u.dfltu_dflt.dflt_sign != 0)
-			return FP_ROP;
-		else if (u.dfltu_dflt.dflt_frach != 0 ||
-			 u.dfltu_dflt.dflt_fracm != 0 ||
-			 u.dfltu_dflt.dflt_fracl != 0) 
-			return FP_DIRTYZERO;
-		else
-			return FP_ZERO;
-	} else {
-		return FP_NORMAL;
-	}
-}
diff --git a/lib/libc/arch/vax/gen/fpclassifyf.c b/lib/libc/arch/vax/gen/fpclassifyf.c
deleted file mode 100644
index 20145ade3..000000000
--- a/lib/libc/arch/vax/gen/fpclassifyf.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: fpclassifyf.c,v 1.3 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpclassifyf.c,v 1.3 2008/04/28 20:22:57 martin Exp $");
-#endif
-
-#include <machine/vaxfp.h>
-#include <math.h>
-
-/*
- * 7.12.3.1 fpclassify - classify real floating type
- *          VAX F_floating version
- *
- *          Implementation notes:
- *          Reserved operand -> FP_ROP
- *          True zero        -> FP_ZERO
- *          Dirty zero       -> FP_DIRTY_ZERO
- *          Finite           -> FP_NORMAL
- */
-int
-__fpclassifyf(float x)
-{
-	union vax_ffloating_u u;
-
-	u.ffltu_f = x;
-
-	if (u.ffltu_fflt.fflt_exp == 0) {
-		if (u.ffltu_fflt.fflt_sign != 0)
-			return FP_ROP;
-		else if (u.ffltu_fflt.fflt_frach != 0 ||
-			 u.ffltu_fflt.fflt_fracl != 0) 
-			return FP_DIRTYZERO;
-		else
-			return FP_ZERO;
-	} else {
-		return FP_NORMAL;
-	}
-}
diff --git a/lib/libc/arch/vax/gen/frexp.c b/lib/libc/arch/vax/gen/frexp.c
deleted file mode 100644
index a2edb2bda..000000000
--- a/lib/libc/arch/vax/gen/frexp.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: frexp.c,v 1.5 2012/06/25 22:32:43 abs Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)frexp.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: frexp.c,v 1.5 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <math.h>
-
-double
-frexp(double value, int *eptr)
-{
-	union {
-                double v;
-                struct {
-			u_int u_mant1 :  7;
-			u_int   u_exp :  8;
-			u_int  u_sign :  1;
-			u_int u_mant2 : 16;
-			u_int u_mant3 : 32;
-                } s;
-        } u;
-
-	if (value) {
-		u.v = value;
-		*eptr = u.s.u_exp - 128;
-		u.s.u_exp = 128;
-		return (u.v);
-	} else {
-		*eptr = 0;
-		return (0.0);
-	}
-}
diff --git a/lib/libc/arch/vax/gen/infinity.c b/lib/libc/arch/vax/gen/infinity.c
deleted file mode 100644
index fb0d41fab..000000000
--- a/lib/libc/arch/vax/gen/infinity.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*	$NetBSD: infinity.c,v 1.8 2002/02/19 21:50:01 thorpej Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: infinity.c,v 1.8 2002/02/19 21:50:01 thorpej Exp $");
-#endif /* LIBC_SCCS and not lint */
-/*
- * XXX - This is not correct, but what can we do about it???
- */
-
-/* infinity.c */
-
-#include <math.h>
-
-/* The highest D float on a vax. */
-const union __double_u __infinity =
-	{ { 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } };
diff --git a/lib/libc/arch/vax/gen/infinityf.c b/lib/libc/arch/vax/gen/infinityf.c
deleted file mode 100644
index 49a2704e4..000000000
--- a/lib/libc/arch/vax/gen/infinityf.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/*	$NetBSD: infinityf.c,v 1.1 2003/10/25 22:31:20 kleink Exp $	*/
-
-/*
- * infinityf.c - max. value representable in VAX F_floating  -- public domain.
- * This is _not_ infinity.
- */
-
-#include <math.h>
-
-const union __float_u __infinityf =
-	{ { 0xff, 0x7f, 0xff, 0xff } };
diff --git a/lib/libc/arch/vax/gen/infinityl.c b/lib/libc/arch/vax/gen/infinityl.c
deleted file mode 100644
index 8c613b94a..000000000
--- a/lib/libc/arch/vax/gen/infinityl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	$NetBSD: infinityl.c,v 1.2 2005/06/12 05:21:27 lukem Exp $	*/
-
-/*
- * infinityl.c - max. value representable in VAX D_floating  -- public domain.
- * This is _not_ infinity.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: infinityl.c,v 1.2 2005/06/12 05:21:27 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-
-const union __long_double_u __infinityl =
-	{ { 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } };
diff --git a/lib/libc/arch/vax/gen/isfinited.c b/lib/libc/arch/vax/gen/isfinited.c
deleted file mode 100644
index 778cf81ca..000000000
--- a/lib/libc/arch/vax/gen/isfinited.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: isfinited.c,v 1.5 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: isfinited.c,v 1.5 2008/04/28 20:22:57 martin Exp $");
-#endif
-
-#include <machine/vaxfp.h>
-#include <math.h>
-
-/*
- * 7.12.3.2 isfinite - determine whether an argument has finite value
- *          VAX D_floating version
- */
-int
-__isfinited(double x)
-{
-	union vax_dfloating_u u;
-
-	u.dfltu_d = x;
-
-	if (u.dfltu_dflt.dflt_exp == 0 &&
-	    ((u.dfltu_dflt.dflt_frach != 0 ||
-	      u.dfltu_dflt.dflt_fracm != 0 ||
-	      u.dfltu_dflt.dflt_fracl != 0) ||
-	     (u.dfltu_dflt.dflt_sign != 0)))
-		return 0;
-
-	return 1;
-}
diff --git a/lib/libc/arch/vax/gen/isfinitef.c b/lib/libc/arch/vax/gen/isfinitef.c
deleted file mode 100644
index 3bdfc2227..000000000
--- a/lib/libc/arch/vax/gen/isfinitef.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: isfinitef.c,v 1.4 2008/04/28 20:22:57 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: isfinitef.c,v 1.4 2008/04/28 20:22:57 martin Exp $");
-#endif
-
-#include <machine/vaxfp.h>
-#include <math.h>
-
-/*
- * 7.12.3.2 isfinite - determine whether an argument has finite value
- *          VAX F_floating version
- */
-int
-__isfinitef(float x)
-{
-	union vax_ffloating_u u;
-
-	u.ffltu_f = x;
-
-	if (u.ffltu_fflt.fflt_exp == 0 &&
-	    ((u.ffltu_fflt.fflt_frach != 0 ||
-	      u.ffltu_fflt.fflt_fracl != 0) ||
-	     (u.ffltu_fflt.fflt_sign != 0)))
-		return 0;
-
-	return 1;
-}
diff --git a/lib/libc/arch/vax/gen/isinf.c b/lib/libc/arch/vax/gen/isinf.c
deleted file mode 100644
index 8478a4cb0..000000000
--- a/lib/libc/arch/vax/gen/isinf.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: isinf.c,v 1.8 2004/03/04 23:42:39 kleink Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isinf.c,v 1.8 2004/03/04 23:42:39 kleink Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-
-#undef isinf
-int isinf __P((double));
-
-/* ARGSUSED */
-int
-isinf(double d)
-{
-	return (0);
-}
diff --git a/lib/libc/arch/vax/gen/isnan.c b/lib/libc/arch/vax/gen/isnan.c
deleted file mode 100644
index d46615ef3..000000000
--- a/lib/libc/arch/vax/gen/isnan.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: isnan.c,v 1.3 2004/03/04 23:42:39 kleink Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isnan.c,v 1.3 2004/03/04 23:42:39 kleink Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <math.h>
-
-#undef isnan
-int isnan __P((double));
-
-/* ARGSUSED */
-int
-isnan(double d)
-{
-	return (0);
-}
diff --git a/lib/libc/arch/vax/gen/ldexp.S b/lib/libc/arch/vax/gen/ldexp.S
deleted file mode 100644
index 477705e18..000000000
--- a/lib/libc/arch/vax/gen/ldexp.S
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-/*
- * double ldexp (value, exp)
- * double value;
- * int exp;
- *
- * Ldexp returns value*2**exp, if that result is in range.
- * If underflow occurs, it returns zero.  If overflow occurs,
- * it returns a value of appropriate sign and largest
- * possible magnitude.  In case of either overflow or underflow,
- * errno is set to ERANGE.  Note that errno is not modified if
- * no error occurs.
- */
-
-#include "DEFS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	/*.asciz "@(#)ldexp.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: ldexp.S,v 1.7 2011/01/25 02:38:15 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-#ifndef _REENTRANT
-	.globl	_C_LABEL(errno)
-#endif
-
-ENTRY(ldexp, 0)
-	movd	4(%ap),%r0	/* fetch "value" */
-	extzv	$7,$8,%r0,%r2	/* %r2 := biased exponent */
-	jeql	1f		/* if zero, done */
-
-	addl2	12(%ap),%r2	/* %r2 := new biased exponent */
-	jleq	2f		/* if <= 0, underflow */
-	cmpl	%r2,$256		/* otherwise check if too big */
-	jgeq	3f		/* jump if overflow */
-	insv	%r2,$7,$8,%r0	/* put exponent back in result */
-1:
-	ret
-2:
-	clrd	%r0
-	jbr	1f
-3:
-	/*
-	 * The largest number that can be represented in a long floating
-	 * number.  This is given in hex in order to avoid floating
-	 * conversions
-	 */
-	movq	$0x7fffffffffffffff,%r0	 /* largest possible floating magnitude */
-	jbc	$15,4(%ap),1f	/* jump if argument was positive */
-	mnegd	%r0,%r0		/* if arg < 0, make result negative */
-1:
-#ifdef _REENTRANT
-	pushl	%r0
-	calls	$0,_C_LABEL(__errno)
-	movl	$ ERANGE,(%r0)
-	movl	(%sp)+,%r0
-#else
-	movl	$ ERANGE,_C_LABEL(errno)
-#endif
-	ret
-END(ldexp)
diff --git a/lib/libc/arch/vax/gen/makecontext.c b/lib/libc/arch/vax/gen/makecontext.c
deleted file mode 100644
index 7199f12c1..000000000
--- a/lib/libc/arch/vax/gen/makecontext.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.4 2012/03/22 17:32:22 christos Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.4 2012/03/22 17:32:22 christos Exp $");
-#endif
-
-#include <stddef.h>
-#include <inttypes.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#include <stdarg.h>
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	va_list ap;
-	int *sp;
-	int i;
-
-	/* Compute and align stack pointer. */
-	sp = (int *)
-	    (((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size) & ~0x3);
-
-	/*
-	 * Allocate necessary stack space for arguments including arg count
-	 * and call frame
-	 */
-	sp -= argc + 1 + 5;
-
-	va_start(ap, argc);
-	sp[5] = argc;
-	for (i = 1; argc > 0; argc--, i++)
-		sp[5 + i] = va_arg(ap, int);
-	va_end(ap);
-
-	sp[0] = 0;			/* condition handler is null */
-	sp[1] = 0x20000000;		/* make this a CALLS frame */
-	sp[2] = 0;			/* saved argument pointer */
-	sp[3] = 0;			/* saved frame pointer */
-	sp[4] = (int)(uintptr_t)_resumecontext+2;/* return via trampoline code */
-
-	gr[_REG_AP] = (__greg_t)(uintptr_t)(sp + 5);
-	gr[_REG_SP] = (__greg_t)(uintptr_t)sp;
-	gr[_REG_FP] = (__greg_t)(uintptr_t)sp;
-	gr[_REG_PC] = (__greg_t)(uintptr_t)func+2;
-
-}
diff --git a/lib/libc/arch/vax/gen/modf.S b/lib/libc/arch/vax/gen/modf.S
deleted file mode 100644
index 684875641..000000000
--- a/lib/libc/arch/vax/gen/modf.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "DEFS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)modf.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: modf.S,v 1.5 2011/01/25 02:38:15 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * double modf (value, iptr)
- * double value, *iptr;
- *
- * Modf returns the fractional part of "value",
- * and stores the integer part indirectly through "iptr".
- */
-
-ENTRY(modf, 0)
-	emodd	4(%ap),$0,$0f1.0,%r2,%r0
-	jvs	1f			# integer overflow
-	cvtld	%r2,*12(%ap)
-	ret
-1:
-	subd3	%r0,4(%ap),*12(%ap)
-	ret
-END(modf)
-
-ENTRY(modff, 0)
-	emodf	4(%ap),$0,$0f1.0,%r2,%r0
-	jvs	1f			# integer overflow
-	cvtlf	%r2,*8(%ap)
-	ret
-1:
-	subf3	%r0,4(%ap),*8(%ap)
-	ret
-END(modff)
diff --git a/lib/libc/arch/vax/gen/resumecontext.c b/lib/libc/arch/vax/gen/resumecontext.c
deleted file mode 100644
index f604739da..000000000
--- a/lib/libc/arch/vax/gen/resumecontext.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: resumecontext.c,v 1.4 2011/09/19 21:24:58 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: resumecontext.c,v 1.4 2011/09/19 21:24:58 joerg Exp $");
-#endif
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <ucontext.h>
-#include <unistd.h>
-#include "extern.h"
-
-void
-_resumecontext(void)
-{
-	ucontext_t uct;
-
-	(void)getcontext(&uct);
-	if (uct.uc_link == NULL) 
-		exit(0);
-	(void)setcontext(uct.uc_link);
-	_exit(-1);
-	/* NOTREACHED */
-}
diff --git a/lib/libc/arch/vax/gen/signbitd.c b/lib/libc/arch/vax/gen/signbitd.c
deleted file mode 100644
index 7f313e1e3..000000000
--- a/lib/libc/arch/vax/gen/signbitd.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: signbitd.c,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: signbitd.c,v 1.2 2008/04/28 20:22:58 martin Exp $");
-#endif
-
-#include <machine/vaxfp.h>
-#include <math.h>
-
-/*
- * 7.12.3.6 signbit - determine whether the sign of an argument is negative
- *          VAX D_floating version
- */
-int
-__signbitd(double x)
-{
-	union vax_dfloating_u u;
-
-	u.dfltu_d = x;
-
-	return (u.dfltu_dflt.dflt_sign == 1);
-}
diff --git a/lib/libc/arch/vax/gen/signbitf.c b/lib/libc/arch/vax/gen/signbitf.c
deleted file mode 100644
index 02cedaab5..000000000
--- a/lib/libc/arch/vax/gen/signbitf.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: signbitf.c,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: signbitf.c,v 1.2 2008/04/28 20:22:58 martin Exp $");
-#endif
-
-#include <machine/vaxfp.h>
-#include <math.h>
-
-/*
- * 7.12.3.6 signbit - determine whether the sign of an argument is negative
- *          VAX F_floating version
- */
-int
-__signbitf(float x)
-{
-	union vax_ffloating_u u;
-
-	u.ffltu_f = x;
-
-	return (u.ffltu_fflt.fflt_sign == 1);
-}
diff --git a/lib/libc/arch/vax/gen/swapcontext.S b/lib/libc/arch/vax/gen/swapcontext.S
deleted file mode 100644
index f80a29bc9..000000000
--- a/lib/libc/arch/vax/gen/swapcontext.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.4 2011/01/25 02:38:15 matt Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#ifdef LIBC_SCCS
-RCSID("$NetBSD: swapcontext.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
-#endif
-
-ENTRY(swapcontext, 0)
-	clrl	%r0			/* assume getcontext succeeds */
-	chmk	$SYS_getcontext		/* getcontext(oucp) */
-	jcc	1f
-	jmp	CERROR+2		/* something bad happened */
-
-1:	movl	4(%ap),%r0		/* get oucp */
-	addl3	(%ap),$(5+1),%r1	/* size of callframe + arglist (LW) */
-	bbs	$13,6(%fp),2f		/* was this a CALLG? */
-	movl	$5,%r1			/* size of callframe (in LW) */
-2:	movl	8(%fp),(36+12*4)(%r0)		/* restore AP */
-	moval	(%sp)[%r1],(36+13*4)(%r0)	/* restore SP */
-	movq	12(%fp),(36+14*4)(%r0)		/* restore FP + PC */
-
-	pushl	8(%ap)
-	calls	$1,_C_LABEL(setcontext) /* setcontext(ucp) */
-	ret
-END(swapcontext)
diff --git a/lib/libc/arch/vax/genassym.cf b/lib/libc/arch/vax/genassym.cf
deleted file mode 100644
index cad3361db..000000000
--- a/lib/libc/arch/vax/genassym.cf
+++ /dev/null
@@ -1,86 +0,0 @@
-#	$NetBSD: genassym.cf,v 1.5 2011/01/25 02:38:15 matt Exp $
-
-#
-# Copyright (c) 2001 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Matt Thomas <matt@3am-sfotware.com>.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-include <ucontext.h>
-include <signal.h>
-include <errno.h>
-
-define UC_LEN		sizeof(ucontext_t)
-define UC_FLAGS		offsetof(ucontext_t, uc_flags)
-define UC_LINK		offsetof(ucontext_t, uc_link)
-define UC_STACK		offsetof(ucontext_t, uc_stack)
-define UC_SIGMASK	offsetof(ucontext_t, uc_sigmask)
-define UC_GREGS		offsetof(ucontext_t, uc_mcontext.__gregs)
-define _UC_SIGMASK	_UC_SIGMASK
-define _UC_STACK	_UC_STACK
-define _UC_CPU		_UC_CPU
-
-define _REG_R0		4*_REG_R0
-define _REG_R1		4*_REG_R1
-define _REG_R2		4*_REG_R2
-define _REG_R4		4*_REG_R4
-define _REG_R6		4*_REG_R6
-define _REG_R8		4*_REG_R8
-define _REG_R10		4*_REG_R10
-define _REG_AP		4*_REG_AP
-define _REG_SP		4*_REG_SP
-define _REG_FP		4*_REG_FP
-define _REG_PC		4*_REG_PC
-define _REG_PSL		4*_REG_PSL
-
-define	SS_SP		offsetof(stack_t, ss_sp)
-define	SS_SIZE		offsetof(stack_t, ss_size)
-define	SS_FLAGS	offsetof(stack_t, ss_flags)
-define	SS_ONSTACK	SS_ONSTACK
-
-define	SC13_LEN	sizeof(struct sigcontext13)
-define	SC13_ONSTACK	offsetof(struct sigcontext13, sc_onstack)
-define	SC13_MASK	offsetof(struct sigcontext13, sc_mask)
-define	SC13_SP		offsetof(struct sigcontext13, sc_sp)
-define	SC13_FP		offsetof(struct sigcontext13, sc_fp)
-define	SC13_AP		offsetof(struct sigcontext13, sc_ap)
-define	SC13_PC		offsetof(struct sigcontext13, sc_pc)
-define	SC13_PS		offsetof(struct sigcontext13, sc_ps)
-
-define	SC_LEN		sizeof(struct sigcontext)
-define	SC_ONSTACK	offsetof(struct sigcontext, sc_onstack)
-define	SC_MASK13	offsetof(struct sigcontext, __sc_mask13)
-define	SC_SP		offsetof(struct sigcontext, sc_sp)
-define	SC_FP		offsetof(struct sigcontext, sc_fp)
-define	SC_AP		offsetof(struct sigcontext, sc_ap)
-define	SC_PC		offsetof(struct sigcontext, sc_pc)
-define	SC_PS		offsetof(struct sigcontext, sc_ps)
-define	SC_MASK		offsetof(struct sigcontext, sc_mask)
-
-define	SIG_BLOCK	SIG_BLOCK
-define	SS_LEN		sizeof(sigset_t)
-
-define	ERANGE		ERANGE
diff --git a/lib/libc/arch/vax/net/Makefile.inc b/lib/libc/arch/vax/net/Makefile.inc
deleted file mode 100644
index db4492c3d..000000000
--- a/lib/libc/arch/vax/net/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 2004/06/06 17:09:48 he Exp $
-
-# ntoh* and htn* are in ../gen/byte_swap_*
-SRCS+=	
diff --git a/lib/libc/arch/vax/stdlib/Makefile.inc b/lib/libc/arch/vax/stdlib/Makefile.inc
deleted file mode 100644
index 60574235e..000000000
--- a/lib/libc/arch/vax/stdlib/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2009/07/31 20:40:00 dsl Exp $
-
-SRCS+=	erand48.c
-NO_SRCS+= erand48_ieee754.c
diff --git a/lib/libc/arch/vax/string/Makefile.inc b/lib/libc/arch/vax/string/Makefile.inc
deleted file mode 100644
index 57d25c571..000000000
--- a/lib/libc/arch/vax/string/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#       $NetBSD: Makefile.inc,v 1.5 2010/03/12 09:12:35 uwe Exp $
-
-SRCS+=  bcmp.S bcopy.S bzero.S ffs.S memcmp.S
-SRCS+=	memcpy.S memmove.S memset.S
diff --git a/lib/libc/arch/vax/string/bcmp.S b/lib/libc/arch/vax/string/bcmp.S
deleted file mode 100644
index 1ea154014..000000000
--- a/lib/libc/arch/vax/string/bcmp.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: bcmp.S,v 1.4 2011/01/25 02:38:15 matt Exp $	*/
-/*
- * Copyright (c) 1983, 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.
- */
-
-/* bcmp(s1, s2, n) */
-
-#include "DEFS.h"
-
-#ifdef LIBC_SCCS
-RCSID("$NetBSD: bcmp.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
-#endif
-
-/* Since "cmpc3" is not portable across VAXen, do it the hard way */
-/*  still, this is four times faster than the generic C version on a uvax2 */
-
-ENTRY(bcmp, 0)
-	movl	12(%ap),%r0	# %r0 = n
-	jeql	9f
-	movq	4(%ap),%r1	# %r1 = s1, %r2 = s2
-	ashl	$-2,%r0,%r3	# convert len to # of long words
-	jeql	2f
-1:
-	cmpl	(%r1)+,(%r2)+	# no "cmpq" alas, so four bytes at a time
-	jneq	9f
-	sobgtr	%r3,1b
-2:
-	bicl3	$-4,%r0,%r3	# handle at most 3 extra bytes
-	jeql	8f
-3:
-	cmpb	(%r1)+,(%r2)+
-	jneq	9f
-	sobgtr	%r3,3b
-8:
-	clrl	%r0		# we have a match!
-9:
-	ret
-END(bcmp)
diff --git a/lib/libc/arch/vax/string/bcopy.S b/lib/libc/arch/vax/string/bcopy.S
deleted file mode 100644
index b2f96a49f..000000000
--- a/lib/libc/arch/vax/string/bcopy.S
+++ /dev/null
@@ -1,78 +0,0 @@
-/*	$NetBSD: bcopy.S,v 1.4 2011/01/25 02:38:15 matt Exp $	*/
-/*
- * Copyright (c) 1983, 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.
- */
-
-/* bcopy(from, to, size) */
-
-#include "DEFS.h"
-
-#if defined(LIBC_SCCS)
-	/* .asciz "@(#)bcopy.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: bcopy.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
-#endif
-
-
-ENTRY(bcopy, R6)
-	movl	4(%ap),%r1
-	movl	8(%ap),%r3
-	movl	12(%ap),%r6
-	cmpl	%r1,%r3
-	bgtr	2f		# normal forward case
-	blss	3f		# overlapping, must do backwards
-	ret			# equal, nothing to do
-1:
-	subl2	%r0,%r6
-	movc3	%r0,(%r1),(%r3)
-2:
-	movzwl	$65535,%r0
-	cmpl	%r6,%r0
-	jgtr	1b
-	movc3	%r6,(%r1),(%r3)
-	ret
-3:
-	addl2	%r6,%r1
-	addl2	%r6,%r3
-	movzwl	$65535,%r0
-	jbr	5f
-4:
-	subl2	%r0,%r6
-	subl2	%r0,%r1
-	subl2	%r0,%r3
-	movc3	%r0,(%r1),(%r3)
-	movzwl	$65535,%r0
-	subl2	%r0,%r1
-	subl2	%r0,%r3
-5:
-	cmpl	%r6,%r0
-	jgtr	4b
-	subl2	%r6,%r1
-	subl2	%r6,%r3
-	movc3	%r6,(%r1),(%r3)
-	ret
-END(bcopy)
diff --git a/lib/libc/arch/vax/string/bzero.S b/lib/libc/arch/vax/string/bzero.S
deleted file mode 100644
index 54b3046f4..000000000
--- a/lib/libc/arch/vax/string/bzero.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: bzero.S,v 1.4 2011/01/25 02:38:15 matt Exp $	*/
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "DEFS.h"
-
-#if defined(LIBC_SCCS)
-	/* .asciz "@(#)bzero.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: bzero.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
-#endif
-
-/* bzero(base, length) */
-
-ENTRY(bzero, 0)
-	movl	4(%ap),%r3
-	jbr	2f
-1:
-	subl2	%r0,8(%ap)
-	movc5	$0,(%r3),$0,%r0,(%r3)
-2:
-	movzwl	$65535,%r0
-	cmpl	8(%ap),%r0
-	jgtr	1b
-	movc5	$0,(%r3),$0,8(%ap),(%r3)
-	ret
-END(bzero)
diff --git a/lib/libc/arch/vax/string/ffs.S b/lib/libc/arch/vax/string/ffs.S
deleted file mode 100644
index a87be2adf..000000000
--- a/lib/libc/arch/vax/string/ffs.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: ffs.S,v 1.4 2011/01/25 02:38:15 matt Exp $	*/
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "DEFS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)ffs.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: ffs.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/* bit = ffs(value) */
-
-ENTRY(ffs, 0)
-	ffs	$0,$32,4(%ap),%r0
-	bneq	1f
-	mnegl	$1,%r0
-1:
-	incl	%r0
-	ret
-END(ffs)
diff --git a/lib/libc/arch/vax/string/index.S b/lib/libc/arch/vax/string/index.S
deleted file mode 100644
index 5d0516bd9..000000000
--- a/lib/libc/arch/vax/string/index.S
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: index.S,v 1.4 2011/01/25 02:38:15 matt Exp $	*/
-/*
- * Copyright (c) 1980, 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.
- */
-
-/*
- * Find the first occurence of c in the string cp.
- * Return pointer to match or null pointer.
- *
- * char *
- * index(cp, c)
- *	char *cp, c;
- */
-#include "DEFS.h"
-
-#ifdef LIBC_SCCS
-RCSID("$NetSBD$")
-#endif
-
-/* Alas not quite twice as fast as the generic C version on a uvax2 */
-
-ENTRY(index, 0)
-	movq	4(%ap),%r0	# %r0 = cp; %r1 = c
-	tstb	%r1		# special case, looking for '\0'
-	jeql	3f
-1:
-	cmpb	(%r0),%r1
-	jeql	2f
-	tstb	(%r0)+
-	jneq	1b
-	clrl	%r0		# return NULL if no match
-2:
-	ret
-3:
-	tstb	(%r0)+
-	jneq	3b
-	decl	%r0
-	jbr	2b
-END(index)
diff --git a/lib/libc/arch/vax/string/memcmp.S b/lib/libc/arch/vax/string/memcmp.S
deleted file mode 100644
index 89e9ac5e3..000000000
--- a/lib/libc/arch/vax/string/memcmp.S
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: memcmp.S,v 1.4 2011/01/25 02:38:15 matt Exp $	*/
-/*-
- * 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. 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.
- */
-
-/* int memcmp(s1, s2, n) */
-
-#include "DEFS.h"
-
-#ifdef LIBC_SCCS
-RCSID("$NetBSD: memcmp.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
-#endif
-
-ENTRY(memcmp, 0)
-	movl	12(%ap),%r0
-	jeql	9f
-	movq	4(%ap),%r1
-	ashl	$-2,%r0,%r3	# convert len to long words
-	jeql	2f
-1:
-	cmpl	(%r1)+,(%r2)+	# no "cmpq" alas
-	jneq	7f
-	sobgtr	%r3,1b
-2:
-	bicl3	$-4,%r0,%r3	# handle at most 3 extra bytes
-	jeql	4f
-3:
-	cmpb	(%r1)+,(%r2)+
-	jneq	8f
-	sobgtr	%r3,3b
-4:
-	clrl	%r0		# we had a match
-	ret
-7:				# backup, and do a byte compare
-	tstl	-(%r1)
-	tstl	-(%r2)
-	movl	$4,%r3
-	jbr	3b
-8:
-	movzbl	-(%r1),%r3
-	movzbl	-(%r2),%r4
-	subl3	%r4,%r3,%r0
-9:
-	ret
-END(memcmp)
diff --git a/lib/libc/arch/vax/sys/__clone.S b/lib/libc/arch/vax/sys/__clone.S
deleted file mode 100644
index 2d7246acd..000000000
--- a/lib/libc/arch/vax/sys/__clone.S
+++ /dev/null
@@ -1,81 +0,0 @@
-/*	$NetBSD: __clone.S,v 1.4 2011/01/25 02:38:15 matt Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-
-#include "SYS.h"
-
-#ifdef SYSLIBC_SCCS
-RCSID("$NetBSD: __clone.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
-#endif
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(clone, __clone)
-#endif
-
-/*
- * int __clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-ENTRY(__clone, 0)
-	
-	/*
-	 * Sanity checks: func and stack may not be NULL.
-	 */
-	movl	4(%ap),%r2	/* check and save function */
-	beql	9f
-	tstl	8(%ap)		/* check stack */
-	beql	9f
-
-	/*
-	 * The system call expects (flags, stack).
-	 */
-	movl	12(%ap),4(%ap)	/* XXX this doesn't work for
-				   callg with a RO arglist */
-	movl	$2,(%ap)
-	SYSTRAP(__clone)	/* only %r0/%r1 munged */
-
-	blbc	%r1,8f		/* %r1<0>:   0=parent  1=child */
-
-	/* Call the clone's entry point. */
-	pushl	16(%ap)
-	calls	$1,(%r2)
-
-	/* Pass return value to _exit(). */
-	pushl	%r0
-	calls	$1,_C_LABEL(_exit)
-
-	/* NOTREACHED */
-
-8:	ret
-
-9:	movl	$EINVAL,%r0
-	jmp	CERROR+2
-END(__clone)
diff --git a/lib/libc/arch/vax/sys/__sigaction14_sigtramp.c b/lib/libc/arch/vax/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index 8c0695566..000000000
--- a/lib/libc/arch/vax/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.10 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.10 2008/04/28 20:22:58 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/signal.h>
-#include <stddef.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-
-extern const int __sigtramp_siginfo_3[];
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-
-	/*
-	 * If no sigaction, use the "default" trampoline since it won't
-	 * be used.
-	 */
-	if (act == NULL)
-		return  __sigaction_sigtramp(sig, act, oact, NULL, 0);
-
-#ifdef __LIBC12_SOURCE__
-	/*
-	 * We select the non-SA_SIGINFO trampoline if SA_SIGINFO is not
-	 * set in the sigaction.
-	 */
-	if ((act->sa_flags & SA_SIGINFO) == 0) {
-		extern const int __sigtramp_sigcontext_2[];
-		int sav = errno;
-		int rv =  __sigaction_sigtramp(sig, act, oact,
-		    __sigtramp_sigcontext_2, 2);
-		if (rv >= 0 || errno != EINVAL)
-			return rv;
-		errno = sav;
-	}
-#endif
-
-	/*
-	 * If SA_SIGINFO was specificed or the compatibility trampolines
-	 * can't be used, use the siginfo trampoline.
-	 */
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_3, 3);
-}
diff --git a/lib/libc/arch/vax/sys/__sigtramp3.S b/lib/libc/arch/vax/sys/__sigtramp3.S
deleted file mode 100644
index 0631cceac..000000000
--- a/lib/libc/arch/vax/sys/__sigtramp3.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: __sigtramp3.S,v 1.2 2011/01/25 02:38:15 matt Exp $	*/
-
-/*
- * Copyright (c) 2003 Matt Thomas <matt@3am-software.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Signal trampoline; registers when called:
- *	pc, psl - obvious
- *	sp, ap - points to argument list
- *	    4(ap) -- signo
- *	    8(ap) -- pointer to siginfo
- *	   12(ap) -- pointer to ucontext
- *	fp - address of signal handler
- */
-
-#include "SYS.h"
-
-#ifdef SYSLIBC_SCCS
-RCSID("$NetBSD: __sigtramp3.S,v 1.2 2011/01/25 02:38:15 matt Exp $")
-#endif
-
-	.text
-	_ALIGN_TEXT
-
-	.globl	_C_LABEL(__sigtramp_siginfo_3)
-_C_LABEL(__sigtramp_siginfo_3):
-	nop; nop
-	callg (%ap),(%fp)		# use global arg list
-	addl2 $8,%ap			# arg is pointer to ucontext
-	SYSTRAP(setcontext)		# exit from here
-	halt				# illegal insn
diff --git a/lib/libc/arch/vax/sys/__syscall.S b/lib/libc/arch/vax/sys/__syscall.S
deleted file mode 100644
index 1efa4a64e..000000000
--- a/lib/libc/arch/vax/sys/__syscall.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)syscall.s	8.2 (Berkeley) 1/21/94" */
-RCSID("$NetBSD: __syscall.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-ENTRY(__syscall, 0)
-	movl	4(%ap),%r0	# syscall number
-	addl2	$8,%ap		# skip the first argument
-	subl3	$2,-8(%ap),(%ap)	# two fewer arguments
-	chmk	%r0
-	jcs	1f
-	ret
-1:
-	jmp	CERROR+2
-END(__syscall)
diff --git a/lib/libc/arch/vax/sys/__vfork14.S b/lib/libc/arch/vax/sys/__vfork14.S
deleted file mode 100644
index 440ac3f45..000000000
--- a/lib/libc/arch/vax/sys/__vfork14.S
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)Ovfork.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: __vfork14.S,v 1.7 2011/11/21 16:17:48 chs Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-/*
- * @(#)vfork.s	4.1 (Berkeley) 12/21/80
- * C library -- vfork
- */
-
-/*
- * pid = vfork();
- *
- * %r1 == 0 in parent process, %r1 == 1 in child process.
- * %r0 == pid of child in parent, %r0 == pid of parent in child.
- *
- * trickery here, due to keith sklower, uses ret to clear the stack,
- * and then returns with a jump indirect, since only one person can return
- * with a ret off this stack... we do the ret before we vfork!
- */
-
-ENTRY(__vfork14, 0)
-	movl	16(%fp),%r0	# save return address before we smash it
-	movab	here,16(%fp)
-	ret
-here:
-	movl	%r0,%r2
-	chmk	$ SYS___vfork14
-	bcs	err		# if failed, set errno and return -1
-	/* this next trick is Chris Torek's fault */
-	mnegl	%r1,%r1		# %r1 = 0xffffffff if child, 0 if parent
-	bicl2	%r1,%r0		# %r0 &= ~%r1, i.e., 0 if child, else unchanged
-	jmp	(%r2)
-
-err:
-#ifdef _REENTRANT
-	pushr	$0x5
-	calls	$0,_C_LABEL(__errno)
-	movl	(%sp)+,(%r0)
-	mnegl	$1,%r0
-	rsb
-#else
-	movl	%r0,_C_LABEL(errno)
-	mnegl	$1,%r0
-	jmp	(%r2)
-#endif
-END(__vfork14)
diff --git a/lib/libc/arch/vax/sys/brk.S b/lib/libc/arch/vax/sys/brk.S
deleted file mode 100644
index 468b523df..000000000
--- a/lib/libc/arch/vax/sys/brk.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)brk.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: brk.S,v 1.15 2014/03/18 18:20:37 riastradh Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-	.globl	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(__minbrk)
-	.hidden _C_LABEL(__curbrk)
-	.hidden	_C_LABEL(__minbrk)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
-#endif
-
-ENTRY(_brk, 0)
-	moval	_C_LABEL(__minbrk),%r5		# gtr > _end 
-	cmpl	(%r5),4(%ap)			# gtr > _end 
-	blequ	1f				#   is fine
-	movl	(%r5),4(%ap)			# shrink back to _end
-1:	chmk	$ SYS_break			# do it
-	jcs	err
-	movl	4(%ap),_C_LABEL(__curbrk)
-	clrl	%r0
-	ret
-err:
-	jmp	CERROR+2
-END(_brk)
diff --git a/lib/libc/arch/vax/sys/cerror.S b/lib/libc/arch/vax/sys/cerror.S
deleted file mode 100644
index 94f929ac4..000000000
--- a/lib/libc/arch/vax/sys/cerror.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)cerror.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: cerror.S,v 1.9 2011/01/25 02:38:15 matt Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-	.globl	_C_LABEL(errno)
-NENTRY(__cerror, 0)
-#ifdef _REENTRANT
-	pushl	%r0
-	calls	$0,_C_LABEL(__errno)
-	movl	(%sp)+,(%r0)
-#else
-	movl	%r0,_C_LABEL(errno)
-#endif
-	mnegl	$1,%r0
-	movl	%r0,%r1
-	ret
-END(__cerror)
diff --git a/lib/libc/arch/vax/sys/execl.S b/lib/libc/arch/vax/sys/execl.S
deleted file mode 100644
index c084b8a8c..000000000
--- a/lib/libc/arch/vax/sys/execl.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: execl.S,v 1.4 2011/01/25 02:38:15 matt Exp $	*/
-/*
- * Copyright (c) 2001 Ludd, University of Lule}, Sweden. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 at Ludd, University of
- *      Lule}, Sweden and its contributors.
- * 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 "SYS.h"
-
-#ifdef SYSLIBC_SCCS
-RCSID("$NetBSD: execl.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
-#endif
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(execl, _execl)
-#endif
-
-ENTRY(_execl, 0)
-	pushal	8(%ap)	# Push pointer to argv vector
-	pushl	4(%ap)	# Push path
-	calls	$2,_C_LABEL(execv)
-	ret
-END(_execl)
diff --git a/lib/libc/arch/vax/sys/execle.S b/lib/libc/arch/vax/sys/execle.S
deleted file mode 100644
index 3a3a5288c..000000000
--- a/lib/libc/arch/vax/sys/execle.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: execle.S,v 1.5 2011/01/25 02:38:15 matt Exp $	*/
-/*
- * Copyright (c) 2001 Ludd, University of Lule}, Sweden. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 at Ludd, University of
- *      Lule}, Sweden and its contributors.
- * 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 "SYS.h"
-
-#ifdef SYSLIBC_SCCS
-RCSID("$NetBSD: execle.S,v 1.5 2011/01/25 02:38:15 matt Exp $")
-#endif
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(execle, _execle)
-#endif
-
-ENTRY(_execle, 0)
-	movl	(%ap),%r0		# Get number of args
-	pushl	(%ap)[%r0]	# Push last arg (envp)
-	pushal	8(%ap)		# Push pointer to argv vector
-	pushl	4(%ap)		# Push path
-	calls	$3,_C_LABEL(execve)
-	ret
-END(_execle)
diff --git a/lib/libc/arch/vax/sys/execlp.S b/lib/libc/arch/vax/sys/execlp.S
deleted file mode 100644
index 3c866ea39..000000000
--- a/lib/libc/arch/vax/sys/execlp.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: execlp.S,v 1.4 2011/01/25 02:38:15 matt Exp $	*/
-/*
- * Copyright (c) 2001 Ludd, University of Lule}, Sweden. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 at Ludd, University of
- *      Lule}, Sweden and its contributors.
- * 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 "SYS.h"
-
-#ifdef SYSLIBC_SCCS
-RCSID("$NetBSD: execlp.S,v 1.4 2011/01/25 02:38:15 matt Exp $")
-#endif
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(execlp, _execlp)
-#endif
-
-ENTRY(_execlp, 0)
-	pushal	8(%ap)	# Push pointer to argv vector
-	pushl	4(%ap)	# Push path
-	calls	$2,_C_LABEL(execvp)
-	ret
-END(_execlp)
diff --git a/lib/libc/arch/vax/sys/exect.S b/lib/libc/arch/vax/sys/exect.S
deleted file mode 100644
index 191fb6e99..000000000
--- a/lib/libc/arch/vax/sys/exect.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "SYS.h"
-#include <machine/psl.h>
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)exect.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: exect.S,v 1.6 2011/01/25 02:38:15 matt Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-ENTRY(exect, 0)
-	bispsw	$PSL_T
-	chmk	$ SYS_execve
-	jmp	CERROR+2		# exect(file, argv, env)
-END(exect)
diff --git a/lib/libc/arch/vax/sys/fork.S b/lib/libc/arch/vax/sys/fork.S
deleted file mode 100644
index 54d5b7d37..000000000
--- a/lib/libc/arch/vax/sys/fork.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)fork.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: fork.S,v 1.6 2011/01/25 02:38:15 matt Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-_SYSCALL(__fork,fork)
-	jlbc	%r1,1f	# parent, since %r1 == 0 in parent, 1 in child
-	clrl	%r0
-1:
-	ret		# pid = fork()
-END(__fork)
diff --git a/lib/libc/arch/vax/sys/getcontext.S b/lib/libc/arch/vax/sys/getcontext.S
deleted file mode 100644
index d33419312..000000000
--- a/lib/libc/arch/vax/sys/getcontext.S
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.6 2011/11/21 16:17:48 chs Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#ifdef SYSLIBC_SCCS
-RCSID("$NetBSD: getcontext.S,v 1.6 2011/11/21 16:17:48 chs Exp $")
-#endif
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext, _getcontext)
-#endif
-
-/*
- * Can't use R4 or R5 since those needed by the phread_switch code.
- */
-ENTRY(_getcontext, 0)
-	clrl	%r0			/* assume success */
-	chmk	$SYS_getcontext		/* getcontext(oucp) */
-	jcc	1f
-	jmp	CERROR+2		/* badness happened */
-
-1:	movl	4(%ap),%r0		/* ptr to ucontext */
-	movl	16(%fp),%r1		/* PC to return to */
-	movab	2f,16(%fp)		/* let's return early */
-	ret
-	/*
-	 * Now we have the blown away the callframe and argument
-	 * list so it's as if we've return from the function except
-	 * we aren't executing the caller's code (yet).  So it's
-	 * the callers state but we still have control.
-	 */
-	_ALIGN_TEXT
-2:	movq	%ap,(36+12*4)(%r0)	/* adjust AP + SP */
-	movl	%fp,(36+14*4)(%r0)	/* adjust FP */
-	movl	%r3,(36+15*4)(%r0)	/* adjust PC */
-	clrl	%r0
-	jmp	(%r1)			/* and return */
-END(_getcontext)
diff --git a/lib/libc/arch/vax/sys/pipe.S b/lib/libc/arch/vax/sys/pipe.S
deleted file mode 100644
index 60ded6aed..000000000
--- a/lib/libc/arch/vax/sys/pipe.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	/* .asciz "@(#)pipe.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: pipe.S,v 1.5 2011/01/25 02:38:15 matt Exp $")
-#endif
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-#endif
-
-_SYSCALL(_pipe,pipe)
-	movl	4(%ap),%r2
-	movl	%r0,(%r2)+
-	movl	%r1,(%r2)
-	clrl	%r0
-	ret
-END(_pipe)
diff --git a/lib/libc/arch/vax/sys/ptrace.S b/lib/libc/arch/vax/sys/ptrace.S
deleted file mode 100644
index 6e8519c02..000000000
--- a/lib/libc/arch/vax/sys/ptrace.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)ptrace.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: ptrace.S,v 1.8 2011/01/25 02:38:15 matt Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-ENTRY(ptrace, 0)
-#ifdef _REENTRANT
-	calls	$0,_C_LABEL(__errno)
-	clrl	(%r0)
-#else
-	clrl	_C_LABEL(errno)
-#endif
-	chmk	$ SYS_ptrace
-	jcs	err
-	ret
-err:
-	jmp	CERROR+2
-END(ptrace)
diff --git a/lib/libc/arch/vax/sys/sbrk.S b/lib/libc/arch/vax/sys/sbrk.S
deleted file mode 100644
index 922b70d10..000000000
--- a/lib/libc/arch/vax/sys/sbrk.S
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)sbrk.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: sbrk.S,v 1.13 2014/03/18 18:20:37 riastradh Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-	.globl	_end
-	.globl	_C_LABEL(__minbrk)
-	.globl	_C_LABEL(__curbrk)
-	.hidden	_C_LABEL(__minbrk)
-	.hidden	_C_LABEL(__curbrk)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-	.data
-_C_LABEL(__minbrk):
-	.long	_end
-_C_LABEL(__curbrk):
-	.long	_end
-	.text
-
-ENTRY(_sbrk, 0)
-	moval	_C_LABEL(__curbrk),%r5
-	addl3	(%r5),4(%ap),-(%sp)
-	pushl	$1
-	movl	%ap,%r3
-	movl	%sp,%ap
-	chmk	$ SYS_break
-	jcs 	err
-	movl	(%r5),%r0
-	addl2	4(%r3),(%r5)
-	ret
-err:
-	jmp	CERROR+2
-END(_sbrk)
diff --git a/lib/libc/arch/vax/sys/shmat.S b/lib/libc/arch/vax/sys/shmat.S
deleted file mode 100644
index 216dbd807..000000000
--- a/lib/libc/arch/vax/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2000/07/07 08:20:55 itohy Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/vax/sys/syscall.S b/lib/libc/arch/vax/sys/syscall.S
deleted file mode 100644
index 9cd8bce53..000000000
--- a/lib/libc/arch/vax/sys/syscall.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)syscall.s	8.2 (Berkeley) 1/21/94" */
-RCSID("$NetBSD: syscall.S,v 1.7 2011/01/25 02:38:15 matt Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-ENTRY(syscall, 0)
-	movl	4(%ap),%r0	# syscall number
-	subl3	$1,(%ap)+,(%ap)	# one fewer arguments
-	chmk	%r0
-	jcs	1f
-	ret
-1:
-	jmp	CERROR+2
-END(syscall)
diff --git a/lib/libc/arch/x86_64/Makefile.inc b/lib/libc/arch/x86_64/Makefile.inc
deleted file mode 100644
index 7ac3dc0e0..000000000
--- a/lib/libc/arch/x86_64/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.6 2015/07/15 14:27:49 pooka Exp $
-
-.if ${RUMPRUN} != "yes"
-SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
-.endif
diff --git a/lib/libc/arch/x86_64/SYS.h b/lib/libc/arch/x86_64/SYS.h
deleted file mode 100644
index d342a166e..000000000
--- a/lib/libc/arch/x86_64/SYS.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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. 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: @(#)SYS.h	5.5 (Berkeley) 5/7/91
- *	$NetBSD: SYS.h,v 1.12 2014/05/22 14:38:38 uebayasi Exp $
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-
-#ifdef __STDC__
-#define SYSTRAP(x)	movl $(SYS_ ## x),%eax; movq %rcx, %r10; syscall
-#else
-#define SYSTRAP(x)	movl $(SYS_/**/x),%eax; movq %rcx, %r10; syscall
-#endif
-
-#define CERROR		_C_LABEL(__cerror)
-#define CURBRK		_C_LABEL(__curbrk)
-
-#define _SYSCALL_NOERROR(x,y)						\
-	ENTRY(x);							\
-	SYSTRAP(y)
-
-#define _SYSCALL_ERR	 						\
-	jmp CERROR
-
-#define _SYSCALL(x,y)							\
-	.text; _ALIGN_TEXT;						\
-	2: _SYSCALL_ERR;						\
-	_SYSCALL_NOERROR(x,y);						\
-	jc 2b
-
-#define SYSCALL_NOERROR(x)						\
-	_SYSCALL_NOERROR(x,x)
-
-#define SYSCALL(x)							\
-	_SYSCALL(x,x)
-
-#define PSEUDO_NOERROR(x,y)						\
-	_SYSCALL_NOERROR(x,y);						\
-	ret;								\
-	END(x)
-
-#define PSEUDO(x,y)							\
-	_SYSCALL_NOERROR(x,y);						\
-	jc 2f;								\
-	ret;								\
-	2: _SYSCALL_ERR;						\
-	END(x)
-
-#define RSYSCALL_NOERROR(x)						\
-	PSEUDO_NOERROR(x,x)
-
-#define RSYSCALL(x)							\
-	PSEUDO(x,x)
-
-#define	WSYSCALL(weak,strong)						\
-	WEAK_ALIAS(weak,strong);					\
-	PSEUDO(strong,weak)
-
-	.globl	CERROR
diff --git a/lib/libc/arch/x86_64/gdtoa/Makefile.inc b/lib/libc/arch/x86_64/gdtoa/Makefile.inc
deleted file mode 100644
index ce2f4854d..000000000
--- a/lib/libc/arch/x86_64/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/03/15 17:35:18 kleink Exp $
-
-SRCS+=	strtof.c strtold_px.c
-SRCS+=	strtopx.c
diff --git a/lib/libc/arch/x86_64/gdtoa/arith.h b/lib/libc/arch/x86_64/gdtoa/arith.h
deleted file mode 100644
index 1513f1fd2..000000000
--- a/lib/libc/arch/x86_64/gdtoa/arith.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-
-#define IEEE_LITTLE_ENDIAN
diff --git a/lib/libc/arch/x86_64/gdtoa/gd_qnan.h b/lib/libc/arch/x86_64/gdtoa/gd_qnan.h
deleted file mode 100644
index d702c6792..000000000
--- a/lib/libc/arch/x86_64/gdtoa/gd_qnan.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* $NetBSD: gd_qnan.h,v 1.3 2011/06/05 14:43:13 christos Exp $ */
-
-#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
-/* 6 bytes of tail padding follow, per AMD64 ABI */
diff --git a/lib/libc/arch/x86_64/gen/Makefile.inc b/lib/libc/arch/x86_64/gen/Makefile.inc
deleted file mode 100644
index 1a1249a49..000000000
--- a/lib/libc/arch/x86_64/gen/Makefile.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.18 2015/07/15 14:27:49 pooka Exp $
-
-# objects built from assembler sources (need lint stubs)
-SRCS+=	alloca.S byte_swap_2.S byte_swap_4.S byte_swap_8.S fabs.S \
-	flt_rounds.S fpgetmask.S fpgetround.S fpgetsticky.S \
-	fpsetmask.S fpsetround.S fpsetsticky.S fpgetprec.S \
-	fpsetprec.S
-
-SRCS+=	__setjmp14.S
-SRCS+=	_setjmp.S
-SRCS+=	__sigsetjmp14.S
-
-.if ${RUMPRUN} != "yes"
-SRCS+=	resumecontext.S swapcontext.S
-SRCS+=	_lwp.c makecontext.c
-.endif
-
-# Common ieee754 constants and functions
-SRCS+=	infinityf_ieee754.c infinity_ieee754.c
-SRCS+=	fpclassifyf_ieee754.c fpclassifyd_ieee754.c
-SRCS+=	isfinitef_ieee754.c isfinited_ieee754.c
-SRCS+=	isinff_ieee754.c isinfd_ieee754.c
-SRCS+=	isnanf_ieee754.c isnand_ieee754.c
-SRCS+=	signbitf_ieee754.c signbitd_ieee754.c
-
-SRCS+=	nanf.c infinityl.c
-SRCS+=	fpclassifyl.c isfinitel.c isinfl.c isnanl.c signbitl.c
-
-LSRCS.x86_64.gen=\
-	Lint__setjmp.c Lint_alloca.c Lint_bswap16.c Lint_bswap32.c \
-	Lint_bswap64.c Lint_fabs.c \
-	Lint___setjmp14.c Lint___sigsetjmp14.c Lint_flt_rounds.c \
-	Lint_fpgetmask.c Lint_fpgetround.c Lint_fpgetsticky.c \
-	Lint_fpsetmask.c Lint_fpsetround.c Lint_fpsetsticky.c
-LSRCS+=		${LSRCS.x86_64.gen}
-DPSRCS+=	${LSRCS.x86_64.gen}
-CLEANFILES+=	${LSRCS.x86_64.gen}
diff --git a/lib/libc/arch/x86_64/gen/__setjmp14.S b/lib/libc/arch/x86_64/gen/__setjmp14.S
deleted file mode 100644
index 5a1f3220a..000000000
--- a/lib/libc/arch/x86_64/gen/__setjmp14.S
+++ /dev/null
@@ -1,110 +0,0 @@
-/*	$NetBSD: __setjmp14.S,v 1.3 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Frank van der Linden for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include <machine/asm.h>
-#include <machine/setjmp.h>
-
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: __setjmp14.S,v 1.3 2014/05/22 15:01:56 uebayasi Exp $")
-#endif
-
-/*
- * 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.
- * The previous signal state is restored.
- */
-
-ENTRY(__setjmp14)
-	movq	(%rsp),%r11
-	movq	%rbx,(_JB_RBX * 8)(%rdi)
-	movq	%rbp,(_JB_RBP * 8)(%rdi)
-	movq	%r12,(_JB_R12 * 8)(%rdi)
-	movq	%r13,(_JB_R13 * 8)(%rdi)
-	movq	%r14,(_JB_R14 * 8)(%rdi)
-	movq	%r15,(_JB_R15 * 8)(%rdi)
-	movq	%rsp,(_JB_RSP * 8)(%rdi)
-	movq	%r11,(_JB_PC  * 8)(%rdi)
-
-	leaq	(_JB_SIGMASK * 8)(%rdi),%rdx
-	xorl	%edi,%edi
-	xorq	%rsi,%rsi
-
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(__sigprocmask14))
-#else
-	call	_C_LABEL(__sigprocmask14)
-#endif
-2:	xorl	%eax,%eax
-	ret
-END(__setjmp14)
-
-ENTRY(__longjmp14)
-	movq	%rdi,%r12
-	movl	%esi,%r8d
-
-	leaq	(_JB_SIGMASK * 8)(%rdi),%rsi
-	movl	$3,%edi		/* SIG_SETMASK */
-	xorq	%rdx,%rdx
-
-	pushq	%r8
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(__sigprocmask14))
-#else
-	call	_C_LABEL(__sigprocmask14)
-#endif
-	popq	%r8
-	movq	(_JB_RBX * 8)(%r12),%rbx
-	movq	(_JB_RBP * 8)(%r12),%rbp
-	movq	(_JB_R13 * 8)(%r12),%r13
-	movq	(_JB_R14 * 8)(%r12),%r14
-	movq	(_JB_R15 * 8)(%r12),%r15
-	movq	(_JB_RSP * 8)(%r12),%rsp
-	movq	(_JB_PC  * 8)(%r12),%r11
-	movq	(_JB_R12 * 8)(%r12),%r12
-
-	movl	%r8d,%eax
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movq	%r11,0(%rsp)
-	ret
-END(__longjmp14)
diff --git a/lib/libc/arch/x86_64/gen/__sigsetjmp14.S b/lib/libc/arch/x86_64/gen/__sigsetjmp14.S
deleted file mode 100644
index 688bf3f39..000000000
--- a/lib/libc/arch/x86_64/gen/__sigsetjmp14.S
+++ /dev/null
@@ -1,114 +0,0 @@
-/*	$NetBSD: __sigsetjmp14.S,v 1.3 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Frank van der Linden for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include <machine/asm.h>
-#include <machine/setjmp.h>
-
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: __sigsetjmp14.S,v 1.3 2014/05/22 15:01:56 uebayasi Exp $")
-#endif
-
-/*
- * 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.
- * The previous signal state is restored.
- */
-
-ENTRY(__sigsetjmp14)
-	movq	(%rsp),%r11
-	movq	%rbx,(_JB_RBX * 8)(%rdi)
-	movq	%rbp,(_JB_RBP * 8)(%rdi)
-	movq	%r12,(_JB_R12 * 8)(%rdi)
-	movq	%r13,(_JB_R13 * 8)(%rdi)
-	movq	%r14,(_JB_R14 * 8)(%rdi)
-	movq	%r15,(_JB_R15 * 8)(%rdi)
-	movq	%rsp,(_JB_RSP * 8)(%rdi)
-	movq	%r11,(_JB_PC  * 8)(%rdi)
-
-	movq	%rsi,(_JB_SIGFLAG  * 8)(%rdi)
-	testl	%esi,%esi
-	jz	2f
-
-	leaq	(_JB_SIGMASK * 8)(%rdi),%rdx
-	xorl	%edi,%edi
-	xorq	%rsi,%rsi
-
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(__sigprocmask14))
-#else
-	call	_C_LABEL(__sigprocmask14)
-#endif
-2:	xorl	%eax,%eax
-	ret
-END(__sigsetjmp14)
-
-ENTRY(__siglongjmp14)
-	movq	%rdi,%r12
-	pushq	%rsi
-	cmpl	$0, (_JB_SIGFLAG * 8)(%rdi)
-
-	jz	2f
-	leaq	(_JB_SIGMASK * 8)(%rdi),%rsi
-	movl	$3,%edi		/* SIG_SETMASK */
-	xorq	%rdx,%rdx
-
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(__sigprocmask14))
-#else
-	call	_C_LABEL(__sigprocmask14)
-#endif
-2:	popq	%rax
-	movq	(_JB_RBX * 8)(%r12),%rbx
-	movq	(_JB_RBP * 8)(%r12),%rbp
-	movq	(_JB_R13 * 8)(%r12),%r13
-	movq	(_JB_R14 * 8)(%r12),%r14
-	movq	(_JB_R15 * 8)(%r12),%r15
-	movq	(_JB_RSP * 8)(%r12),%rsp
-	movq	(_JB_PC  * 8)(%r12),%r11
-	movq	(_JB_R12 * 8)(%r12),%r12
-
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movq	%r11,0(%rsp)
-	ret
-END(__siglongjmp14)
diff --git a/lib/libc/arch/x86_64/gen/_lwp.c b/lib/libc/arch/x86_64/gen/_lwp.c
deleted file mode 100644
index b8c9f9b97..000000000
--- a/lib/libc/arch/x86_64/gen/_lwp.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: _lwp.c,v 1.7 2011/02/24 04:28:43 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nathan J. Williams.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.7 2011/02/24 04:28:43 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <inttypes.h>
-#include <ucontext.h>
-#include <lwp.h>
-#include <stdlib.h>
-
-void
-_lwp_makecontext(ucontext_t *u, void (*start)(void *),
-    void *arg, void *private, caddr_t stack_base, size_t stack_size)
-{
-	__greg_t *gr = u->uc_mcontext.__gregs;
-	void **sp;
-
-	getcontext(u);
-	u->uc_link = NULL;
-
-	u->uc_stack.ss_sp = stack_base;
-	u->uc_stack.ss_size = stack_size;
-
-	/* LINTED uintptr_t is safe */
-	gr[_REG_RIP] = (uintptr_t)start;
-	
-	sp = (void **) (((uintptr_t)(stack_base + stack_size) & ~15));
-
-	/* LINTED __greg_t is safe */
-	gr[_REG_RDI] = (__greg_t)arg;
-	*--sp = (void *) _lwp_exit;
-	
-	/* LINTED uintptr_t is safe */
-	gr[_REG_URSP] = (uintptr_t) sp;
-
-	u->uc_mcontext._mc_tlsbase = (uintptr_t)private;
-	u->uc_flags |= _UC_TLSBASE;
-}
diff --git a/lib/libc/arch/x86_64/gen/_setjmp.S b/lib/libc/arch/x86_64/gen/_setjmp.S
deleted file mode 100644
index ecf84ee6c..000000000
--- a/lib/libc/arch/x86_64/gen/_setjmp.S
+++ /dev/null
@@ -1,86 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.2 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Frank van der Linden for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include <machine/asm.h>
-#include <machine/setjmp.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: _setjmp.S,v 1.2 2014/05/22 15:01:56 uebayasi Exp $")
-#endif
-
-/*
- * 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.
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	movq    (%rsp),%r11
-	movq    %rbx,(_JB_RBX * 8)(%rdi)
-	movq    %rbp,(_JB_RBP * 8)(%rdi)
-	movq    %r12,(_JB_R12 * 8)(%rdi)
-	movq    %r13,(_JB_R13 * 8)(%rdi)
-	movq    %r14,(_JB_R14 * 8)(%rdi)
-	movq    %r15,(_JB_R15 * 8)(%rdi)
-	movq    %rsp,(_JB_RSP * 8)(%rdi)
-	movq    %r11,(_JB_PC  * 8)(%rdi)
-
-	xorl	%eax,%eax
-	ret
-END(_setjmp)
-
-ENTRY(_longjmp)
-	movq    (_JB_RBX * 8)(%rdi),%rbx
-	movq    (_JB_RBP * 8)(%rdi),%rbp
-	movq    (_JB_R12 * 8)(%rdi),%r12
-	movq    (_JB_R13 * 8)(%rdi),%r13
-	movq    (_JB_R14 * 8)(%rdi),%r14
-	movq    (_JB_R15 * 8)(%rdi),%r15
-	movq    (_JB_RSP * 8)(%rdi),%rsp
-	movq    (_JB_PC  * 8)(%rdi),%r11
-
-	movl	%esi,%eax
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movq	%r11,0(%rsp)
-	ret
-END(_longjmp)
diff --git a/lib/libc/arch/x86_64/gen/alloca.S b/lib/libc/arch/x86_64/gen/alloca.S
deleted file mode 100644
index 9c8498d07..000000000
--- a/lib/libc/arch/x86_64/gen/alloca.S
+++ /dev/null
@@ -1,17 +0,0 @@
-/*	$NetBSD: alloca.S,v 1.2 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: alloca.S,v 1.2 2014/05/22 15:01:56 uebayasi Exp $")
-#endif
-
-ENTRY(alloca)
-	popq	%rdx
-	movq	%rsp,%rcx
-	addq	$15,%rdi	/*  round up to 16 bytes */
-	andq	$~15,%rdi
-	subq	%rdi,%rsp
-	movq	%rsp,%rax
-	jmp	*%rdx
-END(alloca)
diff --git a/lib/libc/arch/x86_64/gen/fabs.S b/lib/libc/arch/x86_64/gen/fabs.S
deleted file mode 100644
index e0d6568ff..000000000
--- a/lib/libc/arch/x86_64/gen/fabs.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*	$NetBSD: fabs.S,v 1.4 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: fabs.S,v 1.4 2014/05/22 15:01:56 uebayasi Exp $")
-#endif
-
-	.section .rodata
-	.align 8
-__signmask:
-	.long 0xffffffff
-	.long 0x7fffffff
-
-ENTRY(fabs)
-	movsd	__signmask(%rip),%xmm1
-	andpd	%xmm1,%xmm0
-	ret
-END(fabs)
diff --git a/lib/libc/arch/x86_64/gen/flt_rounds.S b/lib/libc/arch/x86_64/gen/flt_rounds.S
deleted file mode 100644
index 3a09dd4ce..000000000
--- a/lib/libc/arch/x86_64/gen/flt_rounds.S
+++ /dev/null
@@ -1,22 +0,0 @@
-/*	$NetBSD: flt_rounds.S,v 1.7 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-#include <machine/asm.h>
-
-/*
- * 00 0 round to zero 
- * 01 1 round to nearest
- * 10 2 round to positive infinity
- * 11 3 round to negative infinity
- */
-	.text
-	_ALIGN_TEXT
-ENTRY(__flt_rounds)
-	fnstcw	-4(%rsp)
-	movl	-4(%rsp), %ecx
-	shrl	$9, %ecx
-	andl	$6, %ecx
-	movl	$0x2d, %eax	/* 0x2d = 00.10.11.01 */
-	sarl	%cl, %eax	/* 0,1,2,3 -> 1,3,2,0 */
-	andl	$3, %eax
-	ret
-END(__flt_rounds)
diff --git a/lib/libc/arch/x86_64/gen/fpclassifyl.c b/lib/libc/arch/x86_64/gen/fpclassifyl.c
deleted file mode 100644
index edaf28350..000000000
--- a/lib/libc/arch/x86_64/gen/fpclassifyl.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: fpclassifyl.c,v 1.4 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpclassifyl.c,v 1.4 2008/04/28 20:22:58 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <assert.h>
-#include <math.h>
-
-/*
- * 7.12.3.1 fpclassify - classify real floating type
- *          IEEE 754 compatible 80-bit extended-precision Intel 386 version
- */
-int
-__fpclassifyl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	_DIAGASSERT(u.extu_ext.ext_exp == 0 ||
-	    (u.extu_ext.ext_frach & 0x80000000));
-
-	if (u.extu_ext.ext_exp == 0) {
-		if ((u.extu_ext.ext_frach & 0x7fffffff) == 0 &&
-		    u.extu_ext.ext_fracl == 0)
-			return FP_ZERO;
-		else
-			return FP_SUBNORMAL;
-	} else if (u.extu_ext.ext_exp == EXT_EXP_INFNAN) {
-		if ((u.extu_ext.ext_frach & 0x7fffffff) == 0 &&
-		    u.extu_ext.ext_fracl == 0)
-			return FP_INFINITE;
-		else
-			return FP_NAN;
-	}
-
-	return FP_NORMAL;
-}
diff --git a/lib/libc/arch/x86_64/gen/fpgetmask.S b/lib/libc/arch/x86_64/gen/fpgetmask.S
deleted file mode 100644
index 9d09e684d..000000000
--- a/lib/libc/arch/x86_64/gen/fpgetmask.S
+++ /dev/null
@@ -1,31 +0,0 @@
-/*	$NetBSD: fpgetmask.S,v 1.4 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 4, 1995
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-/*
- * XXX only read x87 control word here. If an application only
- * uses the fp* interface to manipulate FP bits, it should
- * always remain in sync with the SSE mxcsr register.
- */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpgetmask, _fpgetmask)
-ENTRY(_fpgetmask)
-#else
-ENTRY(fpgetmask)
-#endif
-	fnstcw -4(%rsp)
-	movl -4(%rsp),%eax
-	notl %eax
-	andl $63,%eax
-	ret
-#ifdef WEAK_ALIAS
-END(_fpgetmask)
-#else
-END(fpgetmask)
-#endif
diff --git a/lib/libc/arch/x86_64/gen/fpgetprec.S b/lib/libc/arch/x86_64/gen/fpgetprec.S
deleted file mode 100644
index e91702029..000000000
--- a/lib/libc/arch/x86_64/gen/fpgetprec.S
+++ /dev/null
@@ -1,30 +0,0 @@
-/*	$NetBSD: fpgetprec.S,v 1.2 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 4, 1995
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-/*
- * XXX store only x87 state. If an application only uses the fp*
- * interface, this should be in sync with the SSE mxcsr register.
- */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpgetprec, _fpgetprec)
-ENTRY(_fpgetprec)
-#else
-ENTRY(fpgetprec)
-#endif
-	fnstcw -4(%rsp)
-	movl -4(%rsp),%eax
-	rorl $8,%eax
-	andl $3,%eax
-	ret
-#ifdef WEAK_ALIAS
-END(_fpgetprec)
-#else
-END(fpgetprec)
-#endif
diff --git a/lib/libc/arch/x86_64/gen/fpgetround.S b/lib/libc/arch/x86_64/gen/fpgetround.S
deleted file mode 100644
index d01d3390c..000000000
--- a/lib/libc/arch/x86_64/gen/fpgetround.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*	$NetBSD: fpgetround.S,v 1.5 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 4, 1995
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-/*
- * XXX load only x87 state. If an application only uses the fp*
- * interface, this should be in sync with the SSE mxcsr register.
- */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpgetround, _fpgetround)
-ENTRY(_fpgetround)
-#else
-ENTRY(fpgetround)
-#endif
-	fnstcw -4(%rsp)
-	movl -4(%rsp), %eax
-	andl $0x00000c00, %eax
-	ret
-#ifdef WEAK_ALIAS
-END(_fpgetround)
-#else
-END(fpgetround)
-#endif
diff --git a/lib/libc/arch/x86_64/gen/fpgetsticky.S b/lib/libc/arch/x86_64/gen/fpgetsticky.S
deleted file mode 100644
index e3beadd57..000000000
--- a/lib/libc/arch/x86_64/gen/fpgetsticky.S
+++ /dev/null
@@ -1,32 +0,0 @@
-/*	$NetBSD: fpgetsticky.S,v 1.4 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*
- * Written by Frank van der Linden at Wasabi Systems for NetBSD.
- * Public domain.
- *
- */
-
-#include <machine/asm.h>
-
-/*
- * XXX read both the x87 and SSE status words here, and OR
- * them to get a complete picture of exceptions.
- */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpgetsticky, _fpgetsticky)
-ENTRY(_fpgetsticky)
-#else
-ENTRY(fpgetsticky)
-#endif
-	fnstsw	-4(%rsp)
-	stmxcsr	-8(%rsp)
-	movl	-4(%rsp),%eax
-	orl	-8(%rsp),%eax
-	andl	$63,%eax
-	ret
-#ifdef WEAK_ALIAS
-END(_fpgetsticky)
-#else
-END(fpgetsticky)
-#endif
diff --git a/lib/libc/arch/x86_64/gen/fpsetmask.S b/lib/libc/arch/x86_64/gen/fpsetmask.S
deleted file mode 100644
index 051fd5a40..000000000
--- a/lib/libc/arch/x86_64/gen/fpsetmask.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: fpsetmask.S,v 1.6 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*
- * Written by Frank van der Linden at Wasabi Systems for NetBSD.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-/*
- * XXX set both the x87 control word and the SSE mxcsr register.
- * Applications should only set exception and round flags
- * via the fp*() interface, otherwise the status words
- * will get our of sync.
- */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpsetmask, _fpsetmask)
-ENTRY(_fpsetmask)
-#else
-ENTRY(fpsetmask)
-#endif
-	notl	%edi
-	andl	$0x0000003f,%edi
-
-	fnstcw	-4(%rsp)
-	movl	-4(%rsp), %edx
-	movl	%edx, %eax
-	andl	$0xffffffc0, %edx
-	orl	%edi, %edx
-	movl	%edx,-4(%rsp)
-	fldcw	-4(%rsp)
-
-	stmxcsr	-4(%rsp)
-	movl	-4(%rsp), %edx
-	andl	$0xffffe07f, %edx
-	sall	$7, %edi
-	orl	%edi, %edx
-	movl	%edx,-4(%rsp)
-	ldmxcsr	-4(%rsp)
-
-	notl	%eax
-	andl	$0x0000003f, %eax
-	ret
-#ifdef WEAK_ALIAS
-END(_fpsetmask)
-#else
-END(fpsetmask)
-#endif
diff --git a/lib/libc/arch/x86_64/gen/fpsetprec.S b/lib/libc/arch/x86_64/gen/fpsetprec.S
deleted file mode 100644
index 3beb0f99f..000000000
--- a/lib/libc/arch/x86_64/gen/fpsetprec.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: fpsetprec.S,v 1.2 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*
- * Written by Frank van der Linden at Wasabi Systems for NetBSD.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-/*
- * XXX set both the x87 control word and the SSE mxcsr register.
- * Applications should only set exception and round flags
- * via the fp*() interface, otherwise the status words
- * will get our of sync.
- */ 
-
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpsetprec, _fpsetprec)
-ENTRY(_fpsetprec)
-#else
-ENTRY(fpsetprec)
-#endif
-	fnstcw	-4(%rsp)
-
-	andl	$3,%edi
-
-	movl	-4(%rsp),%edx
-	rorl	$8,%edx
-	movl	%edx,%eax
-	andl	$3,%eax
-
-	andl	$~3,%edx
-	orl	%edi,%edx
-	roll	$8,%edx
-	movl	%edx,-4(%rsp)
-
-	fldcw	-4(%rsp)
-	ret
-#ifdef WEAK_ALIAS
-END(_fpsetprec)
-#else
-END(fpsetprec)
-#endif
diff --git a/lib/libc/arch/x86_64/gen/fpsetround.S b/lib/libc/arch/x86_64/gen/fpsetround.S
deleted file mode 100644
index 16c148598..000000000
--- a/lib/libc/arch/x86_64/gen/fpsetround.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: fpsetround.S,v 1.5 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*
- * Written by Frank van der Linden at Wasabi Systems for NetBSD.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-/*
- * XXX set both the x87 control word and the SSE mxcsr register.
- * Applications should only set exception and round flags
- * via the fp*() interface, otherwise the status words
- * will get our of sync.
- */ 
-
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpsetround, _fpsetround)
-ENTRY(_fpsetround)
-#else
-ENTRY(fpsetround)
-#endif
-
-	fnstcw	-4(%rsp)
-	movl	-4(%rsp), %edx
-	movl	%edx, %eax
-	andl	$0x00000c00, %eax	
-	andl	$0xfffff3ff, %edx
-	orl	%edi, %edx
-	movl	%edx, -4(%rsp)
-	fldcw	-4(%rsp)
-
-	stmxcsr	-4(%rsp)
-	movl	-4(%rsp), %edx
-	andl	$0xffff9fff, %edx
-	sall	$3, %edi
-	orl	%edi,%edx
-	movl	%edx,-4(%rsp)
-	ldmxcsr	-4(%rsp)
-
-	ret
-#ifdef WEAK_ALIAS
-END(_fpsetround)
-#else
-END(fpsetround)
-#endif
diff --git a/lib/libc/arch/x86_64/gen/fpsetsticky.S b/lib/libc/arch/x86_64/gen/fpsetsticky.S
deleted file mode 100644
index 25a73a0e8..000000000
--- a/lib/libc/arch/x86_64/gen/fpsetsticky.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: fpsetsticky.S,v 1.6 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*
- * Written by Frank van der Linden at Wasabi Systems for NetBSD
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-/*
- * XXX set both the x87 status word and the SSE mxcsr register.
- * Applications should only set exception and round flags
- * via the fp*() interface, otherwise the status words
- * will get our of sync.
- */ 
-
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(fpsetsticky, _fpsetsticky)
-ENTRY(_fpsetsticky)
-#else
-ENTRY(fpsetsticky)
-#endif
-	fnstenv	-28(%rsp)
-	stmxcsr	-32(%rsp)
-
-	andl	$63,%edi
-
-	movl	-24(%rsp),%eax
-	movl	%eax,%edx
-	andb	$0xc0,%dl
-
-	orl	%edi,%edx
-	movl	%edx,-24(%rsp)
-
-	movl	-32(%rsp),%edx
-	orl	%edx,%eax
-	andl	$63,%eax
-	andb	$0xc0,%dl
-	orl	%edi,%edx
-	movl	%edx,-32(%rsp)
-
-	ldmxcsr	-32(%rsp)
-	fldenv	-28(%rsp)
-	ret
-#ifdef WEAK_ALIAS
-END(_fpsetsticky)
-#else
-END(fpsetsticky)
-#endif
diff --git a/lib/libc/arch/x86_64/gen/infinityl.c b/lib/libc/arch/x86_64/gen/infinityl.c
deleted file mode 100644
index 521f10186..000000000
--- a/lib/libc/arch/x86_64/gen/infinityl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	$NetBSD: infinityl.c,v 1.4 2011/06/06 17:02:29 drochner Exp $	*/
-
-/*
- * IEEE-compatible infinityl.c for little-endian 80-bit format -- public domain.
- * Note that the representation includes 48 bits of tail padding per amd64 ABI.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: infinityl.c,v 1.4 2011/06/06 17:02:29 drochner Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-
-const union __long_double_u __infinityl =
-	{ { 0, 0, 0, 0, 0, 0, 0, 0x80, 0xff, 0x7f, 0, 0, 0, 0, 0, 0 } };
diff --git a/lib/libc/arch/x86_64/gen/isfinitel.c b/lib/libc/arch/x86_64/gen/isfinitel.c
deleted file mode 100644
index d0f960a0f..000000000
--- a/lib/libc/arch/x86_64/gen/isfinitel.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: isfinitel.c,v 1.3 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: isfinitel.c,v 1.3 2008/04/28 20:22:58 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <assert.h>
-#include <math.h>
-
-/*
- * 7.12.3.2 isfinite - determine whether an argument has finite value
- *          IEEE 754 compatible 80-bit extended-precision Intel 386 version
- */
-int
-__isfinitel(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	_DIAGASSERT(u.extu_ext.ext_exp == 0 ||
-	    (u.extu_ext.ext_frach & 0x80000000));
-
-	if (u.extu_ext.ext_exp == EXT_EXP_INFNAN)
-		return 0;
-
-	return 1;
-}
diff --git a/lib/libc/arch/x86_64/gen/isinfl.c b/lib/libc/arch/x86_64/gen/isinfl.c
deleted file mode 100644
index 330451122..000000000
--- a/lib/libc/arch/x86_64/gen/isinfl.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: isinfl.c,v 1.6 2007/02/02 23:19:25 christos 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.
- * 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.
- *
- * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isinfl.c,v 1.6 2007/02/02 23:19:25 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.3 isinf - test for infinity
- *          IEEE 754 compatible 80-bit extended-precision Intel 386 version
- */
-int
-__isinfl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	return (u.extu_ext.ext_exp == EXT_EXP_INFNAN &&
-	     u.extu_ext.ext_frach == 0x80000000 && u.extu_ext.ext_fracl == 0);
-}
diff --git a/lib/libc/arch/x86_64/gen/isnanl.c b/lib/libc/arch/x86_64/gen/isnanl.c
deleted file mode 100644
index 045798c8d..000000000
--- a/lib/libc/arch/x86_64/gen/isnanl.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: isnanl.c,v 1.8 2011/06/05 14:43:13 christos 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.
- * 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.
- *
- * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isnanl.c,v 1.8 2011/06/05 14:43:13 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.4 isnan - test for a NaN
- *          IEEE 754 compatible 80-bit extended-precision Intel 386 version
- */
-int
-__isnanl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	return (u.extu_ext.ext_exp == EXT_EXP_INFNAN &&
-	    (u.extu_ext.ext_frach & 0x80000000) != 0 &&
-	    (u.extu_ext.ext_frach != 0x80000000 || u.extu_ext.ext_fracl != 0));
-}
diff --git a/lib/libc/arch/x86_64/gen/makecontext.c b/lib/libc/arch/x86_64/gen/makecontext.c
deleted file mode 100644
index e68976105..000000000
--- a/lib/libc/arch/x86_64/gen/makecontext.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.4 2009/07/30 20:57:17 dsl Exp $	*/
-
-/*-
- * Copyright (c) 1999 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.
- *
- * Modified from the i386 version for x86_64 by fvdl@wasabisystems.com.
- *
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.4 2009/07/30 20:57:17 dsl Exp $");
-#endif
-
-#include <inttypes.h>
-#include <stddef.h>
-#include <ucontext.h>
-#include "extern.h"
-
-#include <stdarg.h>
-
-void
-makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	uintptr_t *sp;
-	va_list ap;
-	int stackargs, i;
-
-	stackargs = argc - 6;
-
-	/* LINTED __greg_t is safe */
-	gr[_REG_RIP] = (__greg_t)func;
-
-	/* LINTED uintptr_t is safe */
-	sp  = (uintptr_t *)
-	    ((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
-
-	/* LINTED uintptr_t is safe */
-	sp  = (uintptr_t *)(((uintptr_t)sp & ~15));
-	sp--;
-	if (stackargs > 0)
-		sp -= stackargs;
-	/* LINTED __greg_t is safe */
-	gr[_REG_RSP] = (__greg_t)sp;
-	gr[_REG_RBP] = (__greg_t)0;	/* Wipe out frame pointer. */
-
-	/* Put return address on top of stack. */
-	/* LINTED uintptr_t is safe */
-	*sp++ = (uintptr_t)_resumecontext;
-
-	/*
-	 * Construct argument list.
-	 * The registers used to pass the first 6 arguments
-	 * (rdi, rsi, rdx, rcx, r8, r9) are the first 6 in gregs,
-	 * in that order, so those arguments can just be copied to
-	 * the gregs array.
-	 */
-	va_start(ap, argc);
-	for (i = 0; i < 6 && argc > 0; i++) {
-		argc--;
-		/* LINTED __greg_t is safe */
-		gr[i] = va_arg(ap, __greg_t);
-	}
-
-	while (stackargs-- > 0) {
-		/* LINTED uintptr_t is safe */
-		*sp++ = va_arg(ap, uintptr_t);
-	}
-
-	va_end(ap);
-}
diff --git a/lib/libc/arch/x86_64/gen/nanf.c b/lib/libc/arch/x86_64/gen/nanf.c
deleted file mode 100644
index ffc388eba..000000000
--- a/lib/libc/arch/x86_64/gen/nanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:02 martin Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.4 2009/02/22 01:34:02 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-/* bytes for quiet NaN (IEEE single precision) */
-const union __float_u __nanf =
-		{ {    0,    0, 0xc0, 0x7f } };
-
-__warn_references(__nanf, "warning: <math.h> defines NAN incorrectly for your compiler.")
diff --git a/lib/libc/arch/x86_64/gen/resumecontext.S b/lib/libc/arch/x86_64/gen/resumecontext.S
deleted file mode 100644
index fe87fcaa5..000000000
--- a/lib/libc/arch/x86_64/gen/resumecontext.S
+++ /dev/null
@@ -1,80 +0,0 @@
-/*	$NetBSD: resumecontext.S,v 1.6 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1999 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.
- *
- * Modified for x86-64 by fvdl@wasabisystems.com
- */
-
-#include <machine/asm.h>
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: resumecontext.S,v 1.6 2014/05/22 15:01:56 uebayasi Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-/*
- * This assembly-language implementation differs from the (obvious)
- * C-language implementation only in not clobbering the previous
- * function's return address (us), which is the point of the exercise.
- */
-
-NENTRY(_resumecontext)	/* profiling prologue would clobber TOS */
-	leaq	-(8 + 784)(%rsp),%rdi	/* retaddr + sizeof (ucontext_t) */
-	andq	$~15,%rdi		/* align on _UC_UCONTEXT_ALIGN */
-	movq	%rdi,%rsp
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(_getcontext))
-#else
-	call	_C_LABEL(_getcontext)
-#endif
-	movq	8(%rsp),%rdi	/* uc_link */
-	testq	%rdi,%rdi	/* link end? */
-	jnz	9f
-
-	/* normal exit */
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(exit))
-#else
-	call	_C_LABEL(exit)
-#endif
-
-9:
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(setcontext))
-#else
-	call	_C_LABEL(setcontext)
-#endif
-	/* NOTREACHED */
-
-	/* something is wrong, pull the brake */
-	movq	$-1,%rdi
-	movq	$SYS_exit,%rax
-	syscall
-	/* NOTREACHED */
-END(_resumecontext)
diff --git a/lib/libc/arch/x86_64/gen/signbitl.c b/lib/libc/arch/x86_64/gen/signbitl.c
deleted file mode 100644
index 7f9f2edc1..000000000
--- a/lib/libc/arch/x86_64/gen/signbitl.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: signbitl.c,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: signbitl.c,v 1.2 2008/04/28 20:22:58 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.6 signbit - determine whether the sign of an argument is negative
- *          IEEE 754 compatible 80-bit extended-precision Intel 386 version
- */
-int
-__signbitl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	return (u.extu_ext.ext_sign == 1);
-}
diff --git a/lib/libc/arch/x86_64/gen/swapcontext.S b/lib/libc/arch/x86_64/gen/swapcontext.S
deleted file mode 100644
index b2b87f7ca..000000000
--- a/lib/libc/arch/x86_64/gen/swapcontext.S
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: swapcontext.S,v 1.6 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*
- * Copyright (c) 2003 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Frank van der Linden for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: swapcontext.S,v 1.6 2014/05/22 15:01:56 uebayasi Exp $")
-#endif /* LIBC_SCCS && !lint */
-
-/*
- * 56 == offsetof(ucontext_t, uc_mcontext)
- * 21 == _REG_RIP
- * 24 == _REG_URSP
- */
-
-ENTRY(swapcontext)
-	pushq	%rdi				/* preserve oucp */
-	pushq	%rsi				/* preserve ucp */
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(_getcontext))
-#else
-	call	_C_LABEL(_getcontext)
-#endif
-	popq	%rsi
-	popq	%rdi
-	testl	%eax,%eax
-	jnz	2f
-	movq	0(%rsp),%r11
-	movq	%r11,(56 + 21 * 8)(%rdi)
-	leaq	8(%rsp),%r11
-	movq	%r11,(56 + 24 * 8)(%rdi)
-	movq	%rsi,%rdi
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(setcontext))
-#else
-	call	_C_LABEL(setcontext)
-#endif
-2:
-	ret
-END(swapcontext)
diff --git a/lib/libc/arch/x86_64/net/Makefile.inc b/lib/libc/arch/x86_64/net/Makefile.inc
deleted file mode 100644
index 6c0eeab3b..000000000
--- a/lib/libc/arch/x86_64/net/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2009/12/06 07:12:18 uebayasi Exp $
-
-# objects built from assembler sources (need lint stubs)
-# hton* and nto* functions provided by ../gen/byte_swap_*.S
-SRCS+=  
-
-LSRCS.x86_64.net=Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c
-LSRCS+=		${LSRCS.x86_64.net}
-DPSRCS+=	${LSRCS.x86_64.net}
-CLEANFILES+=	${LSRCS.x86_64.net}
diff --git a/lib/libc/arch/x86_64/stdlib/Makefile.inc b/lib/libc/arch/x86_64/stdlib/Makefile.inc
deleted file mode 100644
index 8737f1b11..000000000
--- a/lib/libc/arch/x86_64/stdlib/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.6 2009/08/11 17:30:43 dsl Exp $
-
-# objects built from assembler sources
-SRCS+=	abs.S div.S labs.S ldiv.S
-NO_SRCS+= llabs.S imaxabs.S imaxdiv.S
diff --git a/lib/libc/arch/x86_64/stdlib/abs.S b/lib/libc/arch/x86_64/stdlib/abs.S
deleted file mode 100644
index 959a0c741..000000000
--- a/lib/libc/arch/x86_64/stdlib/abs.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: abs.S,v 1.3 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)abs.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: abs.S,v 1.3 2014/05/22 15:01:56 uebayasi Exp $")
-#endif
-
-ENTRY(abs)
-	movl	%edi,%eax
-	testl	%eax,%eax
-	jns	1f
-	negl	%eax
-1:	ret
-END(abs)
diff --git a/lib/libc/arch/x86_64/stdlib/div.S b/lib/libc/arch/x86_64/stdlib/div.S
deleted file mode 100644
index 3933df53b..000000000
--- a/lib/libc/arch/x86_64/stdlib/div.S
+++ /dev/null
@@ -1,20 +0,0 @@
-/*	$NetBSD: div.S,v 1.2 2014/05/22 15:01:56 uebayasi Exp $	*/
-/*
- * Written by Frank van der Linden (fvdl@wasabisystems.com)
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-RCSID("$NetBSD: div.S,v 1.2 2014/05/22 15:01:56 uebayasi Exp $")
-#endif
-
-ENTRY(div)
-	movl	%edi, %eax
-	cltd
-	idivl	%esi
-	salq	$32, %rdx
-	orq	%rdx,%rax
-	ret
-END(div)
diff --git a/lib/libc/arch/x86_64/stdlib/labs.S b/lib/libc/arch/x86_64/stdlib/labs.S
deleted file mode 100644
index 42b23f571..000000000
--- a/lib/libc/arch/x86_64/stdlib/labs.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: labs.S,v 1.3 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*
- * Written by Frank van der Linden (fvdl@wasabisystems.com)
- * Public Domain.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: labs.S,v 1.3 2014/05/22 15:01:56 uebayasi Exp $")
-#endif
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(imaxabs, _llabs)
-WEAK_ALIAS(llabs, _llabs)
-WEAK_ALIAS(labs, _labs)
-#endif
-
-#ifdef WEAK_ALIAS
-ENTRY(_llabs)
-ENTRY(_labs)
-#else
-ENTRY(llabs)
-ENTRY(labs)
-#endif
-        movq    %rdi,%rax
-        testq   %rax,%rax
-        jns     1f
-        negq    %rax
-1:      ret
-#ifdef WEAK_ALIAS
-END(_llabs)
-END(_labs)
-#else
-END(llabs)
-END(labs)
-#endif
diff --git a/lib/libc/arch/x86_64/stdlib/ldiv.S b/lib/libc/arch/x86_64/stdlib/ldiv.S
deleted file mode 100644
index 4ae6e0f77..000000000
--- a/lib/libc/arch/x86_64/stdlib/ldiv.S
+++ /dev/null
@@ -1,31 +0,0 @@
-/*	$NetBSD: ldiv.S,v 1.3 2014/05/22 15:01:56 uebayasi Exp $	*/
-
-/*
- * Written by gcc 3.0.
- * Copy/pasted by Frank van der Linden (fvdl@wasabisystems.com)
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: ldiv.S,v 1.3 2014/05/22 15:01:56 uebayasi Exp $")
-#endif
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(ldiv, _ldiv)
-#endif
-
-#ifdef WEAK_ALIAS
-ENTRY(_ldiv)
-#else
-ENTRY(ldiv)
-#endif
-	movq    %rdi, %rax
-	cqto
-	idivq   %rsi
-	ret
-#ifdef WEAK_ALIAS
-END(_ldiv)
-#else
-END(ldiv)
-#endif
diff --git a/lib/libc/arch/x86_64/string/Makefile.inc b/lib/libc/arch/x86_64/string/Makefile.inc
deleted file mode 100644
index 22831f487..000000000
--- a/lib/libc/arch/x86_64/string/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.6 2013/11/24 03:50:17 christos Exp $
-
-# objects built from assembler sources
-SRCS+=	bcmp.S bcopy.S ffs.S memchr.S memcmp.S \
-	memcpy.S memmove.S memset.S strcat.S strchr.S \
-	strcmp.S strcpy.S strlen.S strncmp.S strrchr.S swab.S
-NO_SRCS+= bzero.c
diff --git a/lib/libc/arch/x86_64/string/strncmp.S b/lib/libc/arch/x86_64/string/strncmp.S
deleted file mode 100644
index 9156af9a2..000000000
--- a/lib/libc/arch/x86_64/string/strncmp.S
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-        RCSID("$NetBSD: strncmp.S,v 1.4 2014/05/22 15:01:57 uebayasi Exp $")
-#endif
-
-/*
- * NOTE: I've unrolled the loop eight times: large enough to make a
- * significant difference, and small enough not to totally trash the
- * cache.
- */
-
-ENTRY(strncmp)
-	testq	%rdx,%rdx
-	jmp	L2			/* Jump into the loop! */
-
-L1:	incq	%rdi
-	incq	%rsi
-	decq	%rdx
-L2:	jz	L4			/* strings are equal */
-	movb	(%rdi),%al
-	testb	%al,%al
-	jz	L3
-	cmpb	%al,(%rsi)
-	jne	L3
-
-	incq	%rdi
-	incq	%rsi
-	decq	%rdx
-	jz	L4
-	movb	(%rdi),%al
-	testb	%al,%al
-	jz	L3
-	cmpb	%al,(%rsi)
-	jne	L3
-
-	incq	%rdi
-	incq	%rsi
-	decq	%rdx
-	jz	L4
-	movb	(%rdi),%al
-	testb	%al,%al
-	jz	L3
-	cmpb	%al,(%rsi)
-	jne	L3
-
-	incq	%rdi
-	incq	%rsi
-	decq	%rdx
-	jz	L4
-	movb	(%rdi),%al
-	testb	%al,%al
-	jz	L3
-	cmpb	%al,(%rsi)
-	jne	L3
-
-	incq	%rdi
-	incq	%rsi
-	decq	%rdx
-	jz	L4
-	movb	(%rdi),%al
-	testb	%al,%al
-	jz	L3
-	cmpb	%al,(%rsi)
-	jne	L3
-
-	incq	%rdi
-	incq	%rsi
-	decq	%rdx
-	jz	L4
-	movb	(%rdi),%al
-	testb	%al,%al
-	jz	L3
-	cmpb	%al,(%rsi)
-	jne	L3
-
-	incq	%rdi
-	incq	%rsi
-	decq	%rdx
-	jz	L4
-	movb	(%rdi),%al
-	testb	%al,%al
-	jz	L3
-	cmpb	%al,(%rsi)
-	jne	L3
-
-	incq	%rdi
-	incq	%rsi
-	decq	%rdx
-	jz	L4
-	movb	(%rdi),%al
-	testb	%al,%al
-	jz	L3
-	cmpb	%al,(%rsi)
-	je	L1
-
-L3:	movzbl	(%rdi),%eax		/* unsigned comparison */
-	movzbl	(%rsi),%ecx
-	subl	%ecx,%eax
-	ret
-L4:	xorl	%eax,%eax
-	ret
-END(strncmp)
diff --git a/lib/libc/arch/x86_64/string/swab.S b/lib/libc/arch/x86_64/string/swab.S
deleted file mode 100644
index 636cb4328..000000000
--- a/lib/libc/arch/x86_64/string/swab.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: swab.S,v 1.4 2014/05/22 15:01:57 uebayasi Exp $")
-#endif
-
-#define LOAD_SWAP_STORE_WORD \
-	lodsw	; \
-	xchgb	%al,%ah ; \
-	stosw
-
-ENTRY(swab)
-	xchgq	%rdi,%rsi
-	cld				# set direction forward
-
-	shrq	$1,%rdx
-	testq	$7,%rdx			# copy first group of 1 to 7 words
-	jz	L2			# while swapping alternate bytes.
-L1:	lodsw
-	rorw	$8,%ax
-	stosw
-	decq	%rdx
-	testq	$7,%rdx
-	jnz	L1
-
-L2:	shrq	$3,%rdx			# copy remainder 8 words at a time
-	jz	L4			# while swapping alternate bytes.
-L3:
-	LOAD_SWAP_STORE_WORD
-	LOAD_SWAP_STORE_WORD
-	LOAD_SWAP_STORE_WORD
-	LOAD_SWAP_STORE_WORD
-	LOAD_SWAP_STORE_WORD
-	LOAD_SWAP_STORE_WORD
-	LOAD_SWAP_STORE_WORD
-	LOAD_SWAP_STORE_WORD
-
-	decq	%rdx
-	jnz	L3
-L4:
-	ret
-END(swab)
diff --git a/lib/libc/arch/x86_64/sys/__clone.S b/lib/libc/arch/x86_64/sys/__clone.S
deleted file mode 100644
index 459bab5aa..000000000
--- a/lib/libc/arch/x86_64/sys/__clone.S
+++ /dev/null
@@ -1,97 +0,0 @@
-/*	$NetBSD: __clone.S,v 1.5 2014/05/22 15:01:57 uebayasi Exp $	*/
-
-/*
- * Copyright (c) 2002 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Frank van der Linden for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-#include <sys/errno.h>
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(clone, __clone)
-#endif
-	.text
-
-/*
- * int clone(int (*fn)(void *), void *stack, int flags, void *arg);
- */
-ENTRY(__clone)
-	pushq	%r12
-	pushq	%r13
-	/*
-	 * Sanity checks: func and stack may not be NULL.
-	 */
-	testq	%rdi,%rdi
-	je	3f
-	testq	%rsi,%rsi
-	je	3f
-
-
-	movq	%rdi,%r12
-	movq	%rcx,%r13
-
-	movq	%rdx,%rdi
-
-	pushq	$0		/* dummy return address */
-
-	SYSTRAP(__clone)
-	jc	4f
-	cmpl	$0,%eax
-	jne	2f		/* we're the parent */
-	movq	%r13,%rdi	/* restore argument */
-	call	*%r12		/* this is the clone, call the function */
-
-	movq	%rax,%rdi
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(_exit))
-#else
-	call	_C_LABEL(_exit)
-#endif
-
-2:
-	addq	$8,%rsp
-	popq	%r13
-	popq	%r12
-	ret
-3:
-	movl	$EINVAL,%eax
-	jmp	5f
-4:
-	addq	$8,%rsp
-5:
-	popq	%r13
-	popq	%r12
-	jmp	CERROR
-END(__clone)
diff --git a/lib/libc/arch/x86_64/sys/__sigaction14_sigtramp.c b/lib/libc/arch/x86_64/sys/__sigaction14_sigtramp.c
deleted file mode 100644
index e65820c33..000000000
--- a/lib/libc/arch/x86_64/sys/__sigaction14_sigtramp.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.11 2014/05/14 06:38:09 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.11 2014/05/14 06:38:09 uebayasi Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "extern.h"
-
-__weak_alias(__sigaction14, __libc_sigaction14)
-
-int
-__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-	extern const int __sigtramp_siginfo_2[];
-
-#if 0
-	/*
-	 * If no sigaction, use the "default" trampoline since it won't
-	 * be used.
-	 */
-	if (act == NULL)
-		return  __sigaction_sigtramp(sig, act, oact, NULL, 0);
-#endif
-
-	/*
-	 * Don't provide sigcontext compatibility,
-	 * always use the siginfo trampoline.
-	 */
-	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
-}
diff --git a/lib/libc/arch/x86_64/sys/__sigtramp2.S b/lib/libc/arch/x86_64/sys/__sigtramp2.S
deleted file mode 100644
index a7205dbe2..000000000
--- a/lib/libc/arch/x86_64/sys/__sigtramp2.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: __sigtramp2.S,v 1.6 2014/05/22 15:01:57 uebayasi Exp $	*/
-
-/*
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Frank van der Linden for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-/*
- * The x86-64 signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- */
-NENTRY(__sigtramp_siginfo_2)
-	movq	%r15,%rdi
-	movq	$SYS_setcontext, %rax
-	syscall
-	movq	$-1,%rdi /* if we return here, something is wrong */
-	movq	$SYS_exit, %rax
-	syscall
-END(__sigtramp_siginfo_2)
diff --git a/lib/libc/arch/x86_64/sys/__syscall.S b/lib/libc/arch/x86_64/sys/__syscall.S
deleted file mode 100644
index 9550377ef..000000000
--- a/lib/libc/arch/x86_64/sys/__syscall.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: __syscall.S,v 1.2 2003/08/07 16:42:37 agc Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)syscall.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __syscall.S,v 1.2 2003/08/07 16:42:37 agc Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-RSYSCALL(__syscall)
diff --git a/lib/libc/arch/x86_64/sys/__vfork14.S b/lib/libc/arch/x86_64/sys/__vfork14.S
deleted file mode 100644
index f900bb32e..000000000
--- a/lib/libc/arch/x86_64/sys/__vfork14.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: __vfork14.S,v 1.5 2014/05/22 15:01:57 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)Ovfork.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __vfork14.S,v 1.5 2014/05/22 15:01:57 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-/*
- * pid = vfork();
- *
- * %edx == 0 in parent process, %edx == 1 in child process.
- * %eax == pid of child in parent, %eax == pid of parent in child.
- *
- */
-ENTRY(__vfork14)
-	popq	%r9		/* my rta into r9 */
-	SYSTRAP(__vfork14)
-	jc	err
-	decl	%edx
-	andl	%edx,%eax
-	jmp	*%r9
-err:
-	pushq	%r9
-	jmp	CERROR
-END(__vfork14)
diff --git a/lib/libc/arch/x86_64/sys/brk.S b/lib/libc/arch/x86_64/sys/brk.S
deleted file mode 100644
index 5f3d19c7f..000000000
--- a/lib/libc/arch/x86_64/sys/brk.S
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: brk.S,v 1.6 2014/05/22 15:01:57 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)brk.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: brk.S,v 1.6 2014/05/22 15:01:57 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-	.globl	_end
-	.globl	_C_LABEL(__minbrk)
-	.globl	CURBRK
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
-#endif
-
-	.data
-_C_LABEL(__minbrk):
-	.quad	_end
-	.text
-
-ENTRY(_brk)
-#ifdef __PIC__
-	movq	PIC_GOT(_C_LABEL(__minbrk)),%rdx
-	cmpq	%rdi,(%rdx)
-	jb	1f
-	movq	(%rdx),%rdi
-1:
-	SYSTRAP(break)
-	jc	err
-	movq	PIC_GOT(CURBRK),%rdx	# set up GOT addressing
-	movq	%rdi,(%rdx)
-	xorl	%eax,%eax
-	ret
-err:
-	jmp	CERROR
-#else
-	cmpq	%rdi,_C_LABEL(__minbrk)(%rip)
-	jb	1f
-	movq	_C_LABEL(__minbrk)(%rip),%rdi
-1:
-	SYSTRAP(break)
-	jc	err
-	movq	%rdi,CURBRK(%rip)
-	xorl	%eax,%eax
-	ret
-err:
-	jmp	CERROR
-#endif
-END(_brk)
diff --git a/lib/libc/arch/x86_64/sys/cerror.S b/lib/libc/arch/x86_64/sys/cerror.S
deleted file mode 100644
index d338ce700..000000000
--- a/lib/libc/arch/x86_64/sys/cerror.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.7 2014/05/22 15:01:57 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)cerror.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: cerror.S,v 1.7 2014/05/22 15:01:57 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-	.globl	_C_LABEL(__errno)
-	.protected	CERROR
-
-_ENTRY(CERROR)
-	pushq	%r12
-	movl	%eax,%edi
-	movl	%eax,%r12d
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(__errno))
-#else
-	call	_C_LABEL(__errno)
-#endif /* __PIC__ */
-	movl	%r12d,(%rax)
-	movq	$-1,%rax
-	popq	%r12
-	ret
-END(CERROR)
diff --git a/lib/libc/arch/x86_64/sys/exect.S b/lib/libc/arch/x86_64/sys/exect.S
deleted file mode 100644
index 813c50485..000000000
--- a/lib/libc/arch/x86_64/sys/exect.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: exect.S,v 1.4 2014/05/22 15:01:57 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)exect.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: exect.S,v 1.4 2014/05/22 15:01:57 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-#include <machine/psl.h>
-
-ENTRY(exect)
-	pushfq
-	orb	$(PSL_T>>8),1(%rsp)
-	popfq
-	SYSTRAP(execve)
-	jmp	CERROR
-END(exect)
diff --git a/lib/libc/arch/x86_64/sys/fork.S b/lib/libc/arch/x86_64/sys/fork.S
deleted file mode 100644
index 1c00d4e3f..000000000
--- a/lib/libc/arch/x86_64/sys/fork.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: fork.S,v 1.4 2014/05/22 15:01:57 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)fork.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: fork.S,v 1.4 2014/05/22 15:01:57 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-_SYSCALL(__fork,fork)
-	decl	%edx	/* from 1 to 0 in child, 0 to -1 in parent */
-	andl	%edx,%eax
-	ret		/* pid = fork(); */
-END(__fork)
diff --git a/lib/libc/arch/x86_64/sys/getcontext.S b/lib/libc/arch/x86_64/sys/getcontext.S
deleted file mode 100644
index 372e1dfb6..000000000
--- a/lib/libc/arch/x86_64/sys/getcontext.S
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: getcontext.S,v 1.4 2014/05/22 15:01:57 uebayasi Exp $	*/
-
-/*
- * Copyright (c) 2003 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Frank van der Linden for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: getcontext.S,v 1.4 2014/05/22 15:01:57 uebayasi Exp $")
-#endif
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(getcontext, _getcontext)
-#endif
-
-/*
- * 56 == offsetof(ucontext_t, uc_mcontext)
- * 14 == _REG_RAX
- * 21 == _REG_RIP
- * 24 == _REG_URSP
- */
-
-_SYSCALL(_getcontext,getcontext)
-	movq	(%rsp),%r11
-	movq	%r11,(56 + 21 * 8)(%rdi)
-	leaq	8(%rsp),%r11
-	movq	%r11,(56 + 24 * 8)(%rdi)
-	movq	$0,(56 + 14 * 8)(%rdi)
-	xorl	%eax,%eax
-	ret
-END(_getcontext)
diff --git a/lib/libc/arch/x86_64/sys/pipe.S b/lib/libc/arch/x86_64/sys/pipe.S
deleted file mode 100644
index 023c7800e..000000000
--- a/lib/libc/arch/x86_64/sys/pipe.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.3 2014/05/22 15:01:57 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)pipe.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: pipe.S,v 1.3 2014/05/22 15:01:57 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-#endif
-
-_SYSCALL(_pipe,pipe)
-	movl	%eax,(%rdi)
-	movl	%edx,4(%rdi)
-	xorl	%eax,%eax
-	ret
-END(_pipe)
diff --git a/lib/libc/arch/x86_64/sys/ptrace.S b/lib/libc/arch/x86_64/sys/ptrace.S
deleted file mode 100644
index 715aa0d6c..000000000
--- a/lib/libc/arch/x86_64/sys/ptrace.S
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.6 2014/11/24 15:33:18 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)ptrace.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: ptrace.S,v 1.6 2014/11/24 15:33:18 christos Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-	.globl	_C_LABEL(__errno)
-
-ENTRY(ptrace)
-	/*
-	 * The following code calls __errno() to set it to 0 before
-	 * calling ptrace(2). The libc version of __errno() does not use
-	 * any registers, but the libpthread version clobbers %rcx
-	 * before we get a chance to store it in %r10. So we save it
-	 * in %r10 and restore it.
-	 */
-	movq	%rcx, %r10
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(__errno))
-#else
-	call	_C_LABEL(__errno)
-#endif /* __PIC__ */
-	movl	$0,(%rax)
-	movq	%r10, %rcx
-	SYSTRAP(ptrace)
-	jc	err
-	ret
-err:
-	jmp	CERROR
-END(ptrace)
diff --git a/lib/libc/arch/x86_64/sys/sbrk.S b/lib/libc/arch/x86_64/sys/sbrk.S
deleted file mode 100644
index 54b0ee4e0..000000000
--- a/lib/libc/arch/x86_64/sys/sbrk.S
+++ /dev/null
@@ -1,86 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.6 2014/05/22 15:01:57 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sbrk.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: sbrk.S,v 1.6 2014/05/22 15:01:57 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-	.globl	_end
-	.globl	CURBRK
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-	.data
-CURBRK:	.quad	_end
-	.text
-
-ENTRY(_sbrk)
-#ifdef __PIC__
-	movq	PIC_GOT(CURBRK),%rdx
-	movq	(%rdx),%rax
-	test	%rdi,%rdi
-	jz	out
-	addq	%rax,%rdi
-	SYSTRAP(break)
-	jc	err
-	movq	PIC_GOT(CURBRK),%rdx
-	movq	(%rdx),%rax
-	movq	%rdi,(%rdx)
-out:
-	ret
-err:
-	jmp	CERROR
-#else
-	movq	CURBRK(%rip),%rax
-	test	%rdi,%rdi
-	jz	out
-	movq	%rdi,%rsi
-	addq	%rax,%rdi
-	SYSTRAP(break)
-	jc	err
-	movq	CURBRK(%rip),%rax
-	addq	%rsi,CURBRK(%rip)
-out:
-	ret
-err:
-	jmp	CERROR
-#endif
-END(_sbrk)
diff --git a/lib/libc/arch/x86_64/sys/shmat.S b/lib/libc/arch/x86_64/sys/shmat.S
deleted file mode 100644
index 2c81105e3..000000000
--- a/lib/libc/arch/x86_64/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2001/06/19 00:25:06 fvdl Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc/arch/x86_64/sys/syscall.S b/lib/libc/arch/x86_64/sys/syscall.S
deleted file mode 100644
index e802b61fb..000000000
--- a/lib/libc/arch/x86_64/sys/syscall.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.4 2007/11/05 20:30:07 dsl Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)syscall.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: syscall.S,v 1.4 2007/11/05 20:30:07 dsl Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-RSYSCALL(syscall)
diff --git a/lib/libc/atomic/Makefile.inc b/lib/libc/atomic/Makefile.inc
deleted file mode 100644
index 80951a7c6..000000000
--- a/lib/libc/atomic/Makefile.inc
+++ /dev/null
@@ -1,76 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2010/02/12 22:34:38 dyoung Exp $
-#	from: @(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-
-# gen sources
-.PATH:	${.CURDIR}/atomic
-
-MAN+=	atomic_add.3 atomic_and.3 atomic_cas.3 atomic_dec.3 \
-	atomic_inc.3 atomic_ops.3 atomic_or.3 atomic_swap.3 \
-	membar_ops.3
-
-MLINKS+=atomic_add.3 atomic_add_32.3 \
-	atomic_add.3 atomic_add_int.3 \
-	atomic_add.3 atomic_add_long.3 \
-	atomic_add.3 atomic_add_ptr.3 \
-	atomic_add.3 atomic_add_64.3 \
-	atomic_add.3 atomic_add_32_nv.3 \
-	atomic_add.3 atomic_add_int_nv.3 \
-	atomic_add.3 atomic_add_long_nv.3 \
-	atomic_add.3 atomic_add_ptr_nv.3 \
-	atomic_add.3 atomic_add_64_nv.3 \
-	atomic_and.3 atomic_and_32.3 \
-	atomic_and.3 atomic_and_uint.3 \
-	atomic_and.3 atomic_and_ulong.3 \
-	atomic_and.3 atomic_and_64.3 \
-	atomic_and.3 atomic_and_32_nv.3 \
-	atomic_and.3 atomic_and_uint_nv.3 \
-	atomic_and.3 atomic_and_ulong_nv.3 \
-	atomic_and.3 atomic_and_64_nv.3 \
-	atomic_cas.3 atomic_cas_32.3 \
-	atomic_cas.3 atomic_cas_uint.3 \
-	atomic_cas.3 atomic_cas_ulong.3 \
-	atomic_cas.3 atomic_cas_ptr.3 \
-	atomic_cas.3 atomic_cas_64.3 \
-	atomic_cas.3 atomic_cas_32_ni.3 \
-	atomic_cas.3 atomic_cas_uint_ni.3 \
-	atomic_cas.3 atomic_cas_ulong_ni.3 \
-	atomic_cas.3 atomic_cas_ptr_ni.3 \
-	atomic_cas.3 atomic_cas_64_ni.3 \
-	atomic_dec.3 atomic_dec_32.3 \
-	atomic_dec.3 atomic_dec_uint.3 \
-	atomic_dec.3 atomic_dec_ulong.3 \
-	atomic_dec.3 atomic_dec_ptr.3 \
-	atomic_dec.3 atomic_dec_64.3 \
-	atomic_dec.3 atomic_dec_32_nv.3 \
-	atomic_dec.3 atomic_dec_uint_nv.3 \
-	atomic_dec.3 atomic_dec_ulong_nv.3 \
-	atomic_dec.3 atomic_dec_ptr_nv.3 \
-	atomic_dec.3 atomic_dec_64_nv.3 \
-	atomic_inc.3 atomic_inc_32.3 \
-	atomic_inc.3 atomic_inc_uint.3 \
-	atomic_inc.3 atomic_inc_ulong.3 \
-	atomic_inc.3 atomic_inc_ptr.3 \
-	atomic_inc.3 atomic_inc_64.3 \
-	atomic_inc.3 atomic_inc_32_nv.3 \
-	atomic_inc.3 atomic_inc_uint_nv.3 \
-	atomic_inc.3 atomic_inc_ulong_nv.3 \
-	atomic_inc.3 atomic_inc_ptr_nv.3 \
-	atomic_inc.3 atomic_inc_64_nv.3 \
-	atomic_or.3 atomic_or_32.3 \
-	atomic_or.3 atomic_or_uint.3 \
-	atomic_or.3 atomic_or_ulong.3 \
-	atomic_or.3 atomic_or_64.3 \
-	atomic_or.3 atomic_or_32_nv.3 \
-	atomic_or.3 atomic_or_uint_nv.3 \
-	atomic_or.3 atomic_or_ulong_nv.3 \
-	atomic_or.3 atomic_or_64_nv.3 \
-	atomic_swap.3 atomic_swap_32.3 \
-	atomic_swap.3 atomic_swap_uint.3 \
-	atomic_swap.3 atomic_swap_ulong.3 \
-	atomic_swap.3 atomic_swap_ptr.3 \
-	atomic_swap.3 atomic_swap_64.3 \
-	membar_ops.3 membar_enter.3 \
-	membar_ops.3 membar_exit.3 \
-	membar_ops.3 membar_producer.3 \
-	membar_ops.3 membar_consumer.3 \
-	membar_ops.3 membar_sync.3
diff --git a/lib/libc/atomic/atomic_add.3 b/lib/libc/atomic/atomic_add.3
deleted file mode 100644
index b6f8adbb4..000000000
--- a/lib/libc/atomic/atomic_add.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\"	$NetBSD: atomic_add.3,v 1.1 2008/06/23 10:22:40 ad Exp $
-.\"
-.\" Copyright (c) 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd April 11, 2007
-.Dt ATOMIC_ADD 3
-.Os
-.Sh NAME
-.Nm atomic_add ,
-.Nm atomic_add_32 ,
-.Nm atomic_add_int ,
-.Nm atomic_add_long ,
-.Nm atomic_add_ptr ,
-.Nm atomic_add_64 ,
-.Nm atomic_add_32_nv ,
-.Nm atomic_add_int_nv ,
-.Nm atomic_add_long_nv ,
-.Nm atomic_add_ptr_nv ,
-.Nm atomic_add_64_nv
-.Nd atomic add operations
-.\" .Sh LIBRARY
-.\" .Lb libc
-.Sh SYNOPSIS
-.In sys/atomic.h
-.Ft void
-.Fn atomic_add_32 "volatile uint32_t *ptr" "int32_t delta"
-.Ft void
-.Fn atomic_add_int "volatile unsigned int *ptr" "int delta"
-.Ft void
-.Fn atomic_add_long "volatile unsigned long *ptr" "long delta"
-.Ft void
-.Fn atomic_add_ptr "volatile void *ptr" "ssize_t delta"
-.Ft void
-.Fn atomic_add_64 "volatile uint64_t *ptr" "int64_t delta"
-.Ft uint32_t
-.Fn atomic_add_32_nv "volatile uint32_t *ptr" "int32_t delta"
-.Ft unsigned int
-.Fn atomic_add_int_nv "volatile unsigned int *ptr" "int delta"
-.Ft unsigned long
-.Fn atomic_add_long_nv "volatile unsigned long *ptr" "long delta"
-.Ft void *
-.Fn atomic_add_ptr_nv "volatile void *ptr" "ssize_t delta"
-.Ft uint64_t
-.Fn atomic_add_64_nv "volatile uint64_t *ptr" "int64_t delta"
-.Sh DESCRIPTION
-The
-.Nm atomic_add
-family of functions add a signed value
-.Fa delta
-to the variable referenced by
-.Fa ptr
-in an atomic fashion.
-.Pp
-The
-.Fn *_nv
-variants of these functions return the new value.
-.Pp
-The 64-bit variants of these functions are available only on platforms
-that can support atomic 64-bit memory access.
-Applications can check for the availability of 64-bit atomic memory
-operations by testing if the pre-processor macro
-.Dv __HAVE_ATOMIC64_OPS
-is defined.
-.Sh SEE ALSO
-.Xr atomic_ops 3
-.Sh HISTORY
-The
-.Nm atomic_add
-functions first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/atomic/atomic_and.3 b/lib/libc/atomic/atomic_and.3
deleted file mode 100644
index 7f5ed50d4..000000000
--- a/lib/libc/atomic/atomic_and.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\"	$NetBSD: atomic_and.3,v 1.1 2008/06/23 10:22:40 ad Exp $
-.\"
-.\" Copyright (c) 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd April 11, 2007
-.Dt ATOMIC_AND 3
-.Os
-.Sh NAME
-.Nm atomic_and ,
-.Nm atomic_and_32 ,
-.Nm atomic_and_uint ,
-.Nm atomic_and_ulong ,
-.Nm atomic_and_64 ,
-.Nm atomic_and_32_nv ,
-.Nm atomic_and_uint_nv ,
-.Nm atomic_and_ulong_nv ,
-.Nm atomic_and_64_nv
-.Nd atomic logical
-.Sq and
-operations
-.\" .Sh LIBRARY
-.\" .Lb libc
-.Sh SYNOPSIS
-.In sys/atomic.h
-.Ft void
-.Fn atomic_and_32 "volatile uint32_t *ptr" "uint32_t bits"
-.Ft void
-.Fn atomic_and_uint "volatile unsigned int *ptr" "unsigned int bits"
-.Ft void
-.Fn atomic_and_ulong "volatile unsigned long *ptr" "unsigned long bits"
-.Ft void
-.Fn atomic_and_64 "volatile uint64_t *ptr" "uint64_t bits"
-.Ft uint32_t
-.Fn atomic_and_32_nv "volatile uint32_t *ptr" "uint32_t bits"
-.Ft unsigned int
-.Fn atomic_and_uint_nv "volatile unsigned int *ptr" "unsigned int bits"
-.Ft unsigned long
-.Fn atomic_and_ulong_nv "volatile unsigned long *ptr" "unsigned long bits"
-.Ft uint64_t
-.Fn atomic_and_64_nv "volatile uint64_t *ptr" "uint64_t bits"
-.Sh DESCRIPTION
-The
-.Nm atomic_and
-family of functions load the value of the variable referenced by
-.Fa ptr ,
-perform a logical
-.Sq and
-with the value
-.Fa bits ,
-and store the result back to the variable referenced by
-.Fa ptr
-in an atomic fashion.
-.Pp
-The
-.Fn *_nv
-variants of these functions return the new value.
-.Pp
-The 64-bit variants of these functions are available only on platforms
-that can support atomic 64-bit memory access.
-Applications can check for the availability of 64-bit atomic memory
-operations by testing if the pre-processor macro
-.Dv __HAVE_ATOMIC64_OPS
-is defined.
-.Sh SEE ALSO
-.Xr atomic_ops 3
-.Sh HISTORY
-The
-.Nm atomic_and
-functions first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/atomic/atomic_cas.3 b/lib/libc/atomic/atomic_cas.3
deleted file mode 100644
index 04e4416e7..000000000
--- a/lib/libc/atomic/atomic_cas.3
+++ /dev/null
@@ -1,129 +0,0 @@
-.\"	$NetBSD: atomic_cas.3,v 1.5 2014/02/02 18:06:33 dholland Exp $
-.\"
-.\" Copyright (c) 2007, 2010 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd February 2, 2014
-.Dt ATOMIC_CAS 3
-.Os
-.Sh NAME
-.Nm atomic_cas ,
-.Nm atomic_cas_32 ,
-.Nm atomic_cas_uint ,
-.Nm atomic_cas_ulong ,
-.Nm atomic_cas_ptr ,
-.Nm atomic_cas_64 ,
-.Nm atomic_cas_32_ni ,
-.Nm atomic_cas_uint_ni ,
-.Nm atomic_cas_ulong_ni ,
-.Nm atomic_cas_ptr_ni ,
-.Nm atomic_cas_64_ni
-.Nd atomic compare-and-swap operations
-.\" .Sh LIBRARY
-.\" .Lb libc
-.Sh SYNOPSIS
-.In sys/atomic.h
-.Ft uint32_t
-.Fn atomic_cas_32 "volatile uint32_t *ptr" "uint32_t expected" "uint32_t new"
-.Ft unsigned int
-.Fn atomic_cas_uint "volatile unsigned int *ptr" "unsigned int expected" \
-    "unsigned int new"
-.Ft unsigned long
-.Fn atomic_cas_ulong "volatile unsigned long *ptr" "unsigned long expected" \
-    "unsigned long new"
-.Ft void *
-.Fn atomic_cas_ptr "volatile void *ptr" "void *expected" "void *new"
-.Ft uint64_t
-.Fn atomic_cas_64 "volatile uint64_t *ptr" "uint64_t expected" "uint64_t new"
-.Ft uint32_t
-.Fn atomic_cas_32_ni "volatile uint32_t *ptr" "uint32_t expected" \
-    "uint32_t new"
-.Ft unsigned int
-.Fn atomic_cas_uint_ni "volatile unsigned int *ptr" "unsigned int expected" \
-    "unsigned int new"
-.Ft unsigned long
-.Fn atomic_cas_ulong_ni "volatile unsigned long *ptr" \
-    "unsigned long expected" "unsigned long new"
-.Ft void *
-.Fn atomic_cas_ptr_ni "volatile void *ptr" "void *expected" "void *new"
-.Ft uint64_t
-.Fn atomic_cas_64_ni "volatile uint64_t *ptr" "uint64_t expected" \
-    "uint64_t new"
-.Sh DESCRIPTION
-The
-.Nm atomic_cas
-family of functions perform an atomic conditional assignment.
-The value
-.Fa new
-is assigned to the variable referenced by
-.Fa ptr .
-The assignment succeeds
-if and only if its current value matches the value
-.Fa expected .
-If the value is different, the assignment fails and no change is
-made.
-This operation is sometimes known as
-.Dq compare-and-swap .
-These functions always return the value found via
-.Fa ptr .
-Callers test for success by comparing the return value to the value
-passed as
-.Fa expected ;
-if they are equal then the new value was stored; if they are not, the
-value was not changed.
-.Pp
-The non-interlocked variants,
-.Fn *_ni ,
-guarantee atomicity within the same CPU with respect to
-interrupts and preemption.
-They are not atomic with respect to different CPUs.
-These can be used to avoid interprocessor synchronization overhead
-in some cases; for example, they are suitable for synchronized
-operations on a variable shared by a thread and an interrupt that are
-bound to the same CPU.
-.Pp
-The 64-bit variants of these functions are available only on platforms
-that can support atomic 64-bit memory access.
-Applications can check for the availability of 64-bit atomic memory
-operations by testing if the pre-processor macro
-.Dv __HAVE_ATOMIC64_OPS
-is defined.
-.Sh SEE ALSO
-.Xr atomic_ops 3
-.Sh HISTORY
-The
-.Nm atomic_cas
-functions first appeared in
-.Nx 5.0 .
-.Sh NOTES
-On some architectures, a
-.Fn *_ni
-variant is merely an alias for the corresponding standard
-compare-and-swap operation.
-While the non-interlocked variant behaves correctly on those
-architectures, it does not avoid the interprocessor synchronization
-overhead.
diff --git a/lib/libc/atomic/atomic_dec.3 b/lib/libc/atomic/atomic_dec.3
deleted file mode 100644
index 654ed24a2..000000000
--- a/lib/libc/atomic/atomic_dec.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\"	$NetBSD: atomic_dec.3,v 1.1 2008/06/23 10:22:40 ad Exp $
-.\"
-.\" Copyright (c) 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd April 11, 2007
-.Dt ATOMIC_DEC 3
-.Os
-.Sh NAME
-.Nm atomic_dec ,
-.Nm atomic_dec_32 ,
-.Nm atomic_dec_uint ,
-.Nm atomic_dec_ulong ,
-.Nm atomic_dec_ptr ,
-.Nm atomic_dec_64 ,
-.Nm atomic_dec_32_nv ,
-.Nm atomic_dec_uint_nv ,
-.Nm atomic_dec_ulong_nv ,
-.Nm atomic_dec_ptr_nv ,
-.Nm atomic_dec_64_nv
-.Nd atomic decrement operations
-.\" .Sh LIBRARY
-.\" .Lb libc
-.Sh SYNOPSIS
-.In sys/atomic.h
-.Ft void
-.Fn atomic_dec_32 "volatile uint32_t *ptr"
-.Ft void
-.Fn atomic_dec_uint "volatile unsigned int *ptr"
-.Ft void
-.Fn atomic_dec_ulong "volatile unsigned long *ptr"
-.Ft void
-.Fn atomic_dec_ptr "volatile void *ptr"
-.Ft void
-.Fn atomic_dec_64 "volatile uint64_t *ptr"
-.Ft uint32_t
-.Fn atomic_dec_32_nv "volatile uint32_t *ptr"
-.Ft unsigned int
-.Fn atomic_dec_uint_nv "volatile unsigned int *ptr"
-.Ft unsigned long
-.Fn atomic_dec_ulong_nv "volatile unsigned long *ptr"
-.Ft void *
-.Fn atomic_dec_ptr_nv "volatile void *ptr"
-.Ft uint64_t
-.Fn atomic_dec_64_nv "volatile uint64_t *ptr"
-.Sh DESCRIPTION
-The
-.Nm atomic_dec
-family of functions decrement
-.Pq by one
-the variable referenced by
-.Fa ptr
-in an atomic fashion.
-.Pp
-The
-.Fn *_nv
-variants of these functions return the new value.
-.Pp
-The 64-bit variants of these functions are available only on platforms
-that can support atomic 64-bit memory access.
-Applications can check for the availability of 64-bit atomic memory
-operations by testing if the pre-processor macro
-.Dv __HAVE_ATOMIC64_OPS
-is defined.
-.Sh SEE ALSO
-.Xr atomic_ops 3
-.Sh HISTORY
-The
-.Nm atomic_dec
-functions first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/atomic/atomic_inc.3 b/lib/libc/atomic/atomic_inc.3
deleted file mode 100644
index a03429e99..000000000
--- a/lib/libc/atomic/atomic_inc.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\"	$NetBSD: atomic_inc.3,v 1.1 2008/06/23 10:22:40 ad Exp $
-.\"
-.\" Copyright (c) 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd April 11, 2007
-.Dt ATOMIC_INC 3
-.Os
-.Sh NAME
-.Nm atomic_inc ,
-.Nm atomic_inc_32 ,
-.Nm atomic_inc_uint ,
-.Nm atomic_inc_ulong ,
-.Nm atomic_inc_ptr ,
-.Nm atomic_inc_64 ,
-.Nm atomic_inc_32_nv ,
-.Nm atomic_inc_uint_nv ,
-.Nm atomic_inc_ulong_nv ,
-.Nm atomic_inc_ptr_nv ,
-.Nm atomic_inc_64_nv
-.Nd atomic increment operations
-.\" .Sh LIBRARY
-.\" .Lb libc
-.Sh SYNOPSIS
-.In sys/atomic.h
-.Ft void
-.Fn atomic_inc_32 "volatile uint32_t *ptr"
-.Ft void
-.Fn atomic_inc_uint "volatile unsigned int *ptr"
-.Ft void
-.Fn atomic_inc_ulong "volatile unsigned long *ptr"
-.Ft void
-.Fn atomic_inc_ptr "volatile void *ptr"
-.Ft void
-.Fn atomic_inc_64 "volatile uint64_t *ptr"
-.Ft uint32_t
-.Fn atomic_inc_32_nv "volatile uint32_t *ptr"
-.Ft unsigned int
-.Fn atomic_inc_uint_nv "volatile unsigned int *ptr"
-.Ft unsigned long
-.Fn atomic_inc_ulong_nv "volatile unsigned long *ptr"
-.Ft void *
-.Fn atomic_inc_ptr_nv "volatile void *ptr"
-.Ft uint64_t
-.Fn atomic_inc_64_nv "volatile uint64_t *ptr"
-.Sh DESCRIPTION
-The
-.Nm atomic_inc
-family of functions increment
-.Pq by one
-the variable referenced by
-.Fa ptr
-in an atomic fashion.
-.Pp
-The
-.Fn *_nv
-variants of these functions return the new value.
-.Pp
-The 64-bit variants of these functions are available only on platforms
-that can support atomic 64-bit memory access.
-Applications can check for the availability of 64-bit atomic memory
-operations by testing if the pre-processor macro
-.Dv __HAVE_ATOMIC64_OPS
-is defined.
-.Sh SEE ALSO
-.Xr atomic_ops 3
-.Sh HISTORY
-The
-.Nm atomic_inc
-functions first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/atomic/atomic_ops.3 b/lib/libc/atomic/atomic_ops.3
deleted file mode 100644
index 77f6c72ef..000000000
--- a/lib/libc/atomic/atomic_ops.3
+++ /dev/null
@@ -1,129 +0,0 @@
-.\"	$NetBSD: atomic_ops.3,v 1.5 2010/04/14 08:49:49 jruoho Exp $
-.\"
-.\" Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd April 14, 2010
-.Dt ATOMIC_OPS 3
-.Os
-.Sh NAME
-.Nm atomic_ops
-.Nd atomic memory operations
-.\" .Sh LIBRARY
-.\" .Lb libc
-.Sh SYNOPSIS
-.In sys/atomic.h
-.Sh DESCRIPTION
-The
-.Nm atomic_ops
-family of functions provide atomic memory operations.
-There are 7 classes of atomic memory operations available:
-.Pp
-.Bl -tag -width "atomic_swap(3)" -offset indent
-.It Xr atomic_add 3
-These functions perform atomic addition.
-.It Xr atomic_and 3
-These functions perform atomic logical
-.Dq and .
-.It Xr atomic_cas 3
-These functions perform atomic compare-and-swap.
-.It Xr atomic_dec 3
-These functions perform atomic decrement.
-.It Xr atomic_inc 3
-These functions perform atomic increment.
-.It Xr atomic_or 3
-These functions perform atomic logical
-.Dq or .
-.It Xr atomic_swap 3
-These functions perform atomic swap.
-.El
-.Ss Synchronization Mechanisms
-Where the architecture does not provide hardware support for atomic compare
-and swap (CAS), atomicity is provided by a restartable sequence or by a
-spinlock.
-The chosen method is not ordinarily distinguishable by or visible to users
-of the interface.
-The following architectures can be assumed to provide CAS in hardware:
-alpha, amd64, i386, powerpc, powerpc64, sparc64.
-.Ss Scope and Restrictions
-If hardware CAS is available, the atomic operations are globally atomic:
-operations within a memory region shared between processes are
-guaranteed to be performed atomically.
-If hardware CAS is not available, it may only be assumed that the operations
-are atomic with respect to threads in the same process.
-Additionally, if hardware CAS is not available, the atomic operations must
-not be used within a signal handler.
-.Pp
-Users of atomic memory operations should not make assumptions about how
-the memory access is performed
-.Pq specifically, the width of the memory access .
-For this reason, applications making use of atomic memory operations should
-limit their use to regular memory.
-The results of using atomic memory operations on anything other than
-regular memory are undefined.
-.Pp
-Users of atomic memory operations should take care to modify any given
-memory location either entirely with atomic operations or entirely with
-some other synchronization mechanism.
-Intermixing of atomic operations with other synchronization mechanisms
-for the same memory location results in undefined behavior.
-.Ss Visibility and Ordering of Memory Accesses
-If hardware CAS is available, stores to the target memory location by an
-atomic operation will reach global visibility before the operation
-completes.
-If hardware CAS is not available, the store may not reach global visibility
-until some time after the atomic operation has completed.
-However, in all cases a subsequent atomic operation on the same memory cell
-will be delayed until the result of any preceeding operation has reached
-global visibility.
-.Pp
-Atomic operations are strongly ordered with respect to each other.
-The global visibility of other loads and stores before and after an atomic
-operation is undefined.
-Applications that require synchronization of loads and stores with respect
-to an atomic operation must use memory barriers.
-See
-.Xr membar_ops 3 .
-.Ss Performance
-Because atomic memory operations require expensive synchronization at the
-hardware level, applications should take care to minimize their use.
-In certain cases, it may be more appropriate to use a mutex, especially
-if more than one memory location will be modified.
-.Sh SEE ALSO
-.Xr atomic_add 3 ,
-.Xr atomic_and 3 ,
-.Xr atomic_cas 3 ,
-.Xr atomic_dec 3 ,
-.Xr atomic_inc 3 ,
-.Xr atomic_or 3 ,
-.Xr atomic_swap 3 ,
-.Xr membar_ops 3
-.Sh HISTORY
-The
-.Nm atomic_ops
-functions first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/atomic/atomic_or.3 b/lib/libc/atomic/atomic_or.3
deleted file mode 100644
index 903f5b02c..000000000
--- a/lib/libc/atomic/atomic_or.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\"	$NetBSD: atomic_or.3,v 1.1 2008/06/23 10:22:40 ad Exp $
-.\"
-.\" Copyright (c) 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd April 11, 2007
-.Dt ATOMIC_OR 3
-.Os
-.Sh NAME
-.Nm atomic_or ,
-.Nm atomic_or_32 ,
-.Nm atomic_or_uint ,
-.Nm atomic_or_ulong ,
-.Nm atomic_or_64 ,
-.Nm atomic_or_32_nv ,
-.Nm atomic_or_uint_nv ,
-.Nm atomic_or_ulong_nv ,
-.Nm atomic_or_64_nv
-.Nd atomic logical
-.Sq or
-operations
-.\" .Sh LIBRARY
-.\" .Lb libc
-.Sh SYNOPSIS
-.In sys/atomic.h
-.Ft void
-.Fn atomic_or_32 "volatile uint32_t *ptr" "uint32_t bits"
-.Ft void
-.Fn atomic_or_uint "volatile unsigned int *ptr" "unsigned int bits"
-.Ft void
-.Fn atomic_or_ulong "volatile unsigned long *ptr" "unsigned long bits"
-.Ft void
-.Fn atomic_or_64 "volatile uint64_t *ptr" "uint64_t bits"
-.Ft uint32_t
-.Fn atomic_or_32_nv "volatile uint32_t *ptr" "uint32_t bits"
-.Ft unsigned int
-.Fn atomic_or_uint_nv "volatile unsigned int *ptr" "unsigned int bits"
-.Ft unsigned long
-.Fn atomic_or_ulong_nv "volatile unsigned long *ptr" "unsigned long bits"
-.Ft uint64_t
-.Fn atomic_or_64_nv "volatile uint64_t *ptr" "uint64_t bits"
-.Sh DESCRIPTION
-The
-.Nm atomic_or
-family of functions load the value of the variable referenced by
-.Fa ptr ,
-perform a logical
-.Sq or
-with the value
-.Fa bits ,
-and store the result back to the variable referenced by
-.Fa ptr
-in an atomic fashion.
-.Pp
-The
-.Fn *_nv
-variants of these functions return the new value.
-.Pp
-The 64-bit variants of these functions are available only on platforms
-that can support atomic 64-bit memory access.
-Applications can check for the availability of 64-bit atomic memory
-operations by testing if the pre-processor macro
-.Dv __HAVE_ATOMIC64_OPS
-is defined.
-.Sh SEE ALSO
-.Xr atomic_ops 3
-.Sh HISTORY
-The
-.Nm atomic_or
-functions first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/atomic/atomic_swap.3 b/lib/libc/atomic/atomic_swap.3
deleted file mode 100644
index 274365250..000000000
--- a/lib/libc/atomic/atomic_swap.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\"	$NetBSD: atomic_swap.3,v 1.1 2008/06/23 10:22:40 ad Exp $
-.\"
-.\" Copyright (c) 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd April 11, 2007
-.Dt ATOMIC_SWAP 3
-.Os
-.Sh NAME
-.Nm atomic_swap ,
-.Nm atomic_swap_32 ,
-.Nm atomic_swap_uint ,
-.Nm atomic_swap_ulong ,
-.Nm atomic_swap_ptr ,
-.Nm atomic_swap_64
-.Nd atomic swap operations
-.\" .Sh LIBRARY
-.\" .Lb libc
-.Sh SYNOPSIS
-.In sys/atomic.h
-.Ft uint32_t
-.Fn atomic_swap_32 "volatile uint32_t *ptr" "uint32_t new"
-.Ft unsigned int
-.Fn atomic_swap_uint "volatile unsigned int *ptr" "unsigned int new"
-.Ft unsigned long
-.Fn atomic_swap_ulong "volatile unsigned long *ptr" "unsigned long new"
-.Ft void *
-.Fn atomic_swap_ptr "volatile void *ptr" "void *new"
-.Ft uint64_t
-.Fn atomic_swap_64 "volatile uint64_t *ptr" "uint64_t new"
-.Sh DESCRIPTION
-The
-.Nm atomic_swap
-family of functions perform a swap operation in an atomic fashion.
-The value of the variable referenced by
-.Fa ptr
-is replaced by
-.Fa new
-and the old value returned.
-.Pp
-The 64-bit variants of these functions are available only on platforms
-that can support atomic 64-bit memory access.
-Applications can check for the availability of 64-bit atomic memory
-operations by testing if the pre-processor macro
-.Dv __HAVE_ATOMIC64_OPS
-is defined.
-.Sh SEE ALSO
-.Xr atomic_ops 3
-.Sh HISTORY
-The
-.Nm atomic_swap
-functions first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/atomic/membar_ops.3 b/lib/libc/atomic/membar_ops.3
deleted file mode 100644
index 1efecd44a..000000000
--- a/lib/libc/atomic/membar_ops.3
+++ /dev/null
@@ -1,137 +0,0 @@
-.\"	$NetBSD: membar_ops.3,v 1.4 2015/01/08 22:27:17 riastradh Exp $
-.\"
-.\" Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd November 20, 2014
-.Dt MEMBAR_OPS 3
-.Os
-.Sh NAME
-.Nm membar_ops ,
-.Nm membar_enter ,
-.Nm membar_exit ,
-.Nm membar_producer ,
-.Nm membar_consumer ,
-.Nm membar_sync
-.Nd memory access barrier operations
-.\" .Sh LIBRARY
-.\" .Lb libc
-.Sh SYNOPSIS
-.In sys/atomic.h
-.\"
-.Ft void
-.Fn membar_enter "void"
-.Ft void
-.Fn membar_exit "void"
-.Ft void
-.Fn membar_producer "void"
-.Ft void
-.Fn membar_consumer "void"
-.Ft void
-.Fn membar_datadep_consumer "void"
-.Ft void
-.Fn membar_sync "void"
-.Sh DESCRIPTION
-The
-.Nm membar_ops
-family of functions provide memory access barrier operations necessary
-for synchronization in multiprocessor execution environments that have
-relaxed load and store order.
-.Pp
-.Bl -tag -width "mem"
-.It Fn membar_enter
-Any store preceding
-.Fn membar_enter
-will reach global visibility before all loads and stores following it.
-.Pp
-.Fn membar_enter
-is typically used in code that implements locking primitives to ensure
-that a lock protects its data.
-.It Fn membar_exit
-All loads and stores preceding
-.Fn membar_exit
-will reach global visibility before any store that follows it.
-.Pp
-.Fn membar_exit
-is typically used in code that implements locking primitives to ensure
-that a lock protects its data.
-.It Fn membar_producer
-All stores preceding the memory barrier will reach global visibility
-before any stores after the memory barrier reach global visibility.
-.It Fn membar_consumer
-All loads preceding the memory barrier will complete before any loads
-after the memory barrier complete.
-.It Fn membar_datadep_consumer
-Same as
-.Fn membar_consumer ,
-but limited to loads of addresses dependent on prior loads, or
-.Sq data-dependent
-loads:
-.Bd -literal -offset indent
-int **pp, *p, v;
-
-p = *pp;
-membar_datadep_consumer();
-v = *p;
-consume(v);
-.Ed
-.Pp
-Does not guarantee ordering of loads in branches, or
-.Sq control-dependent
-loads -- you must use
-.Fn membar_consumer
-instead:
-.Bd -literal -offset indent
-int *ok, *p, v;
-
-if (*ok) {
-	membar_consumer();
-	v = *p;
-	consume(v);
-}
-.Ed
-.Pp
-Most CPUs do not reorder data-dependent loads (i.e., most CPUs
-guarantee that cached values are not stale in that case), so
-.Fn membar_datadep_consumer
-is a no-op on those CPUs.
-.It Fn membar_sync
-All loads and stores preceding the memory barrier will complete and
-reach global visibility before any loads and stores after the memory
-barrier complete and reach global visibility.
-.El
-.Sh SEE ALSO
-.Xr atomic_ops 3
-.Sh HISTORY
-The
-.Nm membar_ops
-functions first appeared in
-.Nx 5.0 .
-The data-dependent load barrier,
-.Fn membar_datadep_consumer ,
-first appeared in
-.Nx 7.0 .
diff --git a/lib/libc/cdb/Makefile.inc b/lib/libc/cdb/Makefile.inc
deleted file mode 100644
index c08c22e00..000000000
--- a/lib/libc/cdb/Makefile.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2013/12/11 01:24:08 joerg Exp $
-
-# Constant database reader/writer
-
-.PATH:	${.CURDIR}/cdb
-.PATH:	${NETBSDSRCDIR}/common/lib/libc/cdb
-
-SRCS+=		cdbr.c cdbw.c
-
-MAN+=		cdbr.3 cdbw.3 cdb.5
-
-MLINKS+=	cdbr.3 cdbr_open.3
-MLINKS+=	cdbr.3 cdbr_entries.3
-MLINKS+=	cdbr.3 cdbr_get.3
-MLINKS+=	cdbr.3 cdbr_find.3
-MLINKS+=	cdbr.3 cdbr_close.3
-MLINKS+=	cdbw.3 cdbw_open.3
-MLINKS+=	cdbw.3 cdbw_put.3
-MLINKS+=	cdbw.3 cdbw_put_data.3
-MLINKS+=	cdbw.3 cdbw_put_key.3
-MLINKS+=	cdbw.3 cdbw_output.3
-MLINKS+=	cdbw.3 cdbw_close.3
-
-# XXX: Fix the code instead
-LINTFLAGS.cdbw.c += -X 132,259,298
diff --git a/lib/libc/cdb/cdb.5 b/lib/libc/cdb/cdb.5
deleted file mode 100644
index 9a0f2f2e2..000000000
--- a/lib/libc/cdb/cdb.5
+++ /dev/null
@@ -1,104 +0,0 @@
-.\"	$NetBSD: cdb.5,v 1.6 2015/02/08 19:09:56 wiz Exp $
-.\"
-.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Joerg Sonnenberger.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-.\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-.\" FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
-.\" COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
-.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.Dd April 27, 2010
-.Dt CDB 5
-.Os
-.Sh NAME
-.Nm cdb
-.Nd format of the constant database
-.Sh DESCRIPTION
-The
-.Nm
-database format provides a space-efficient (key,value) database.
-The format doesn't allow updates in any convenient form.
-The file overhead is around 5 bytes per key and 5 bytes per entry.
-Keys are not stored and it is the responsibility of the caller
-to validate matches.
-The index structure is based on a minimal perfect hash table, so exactly
-one entry has to be checked for a match.
-.Ss General Format
-The header record of a
-.Nm
-database consists of the following:
-.Bd -literal -offset indent
-struct header_cdb {
-	uint8_t magic[7];
-	uint8_t version;
-	uint8_t description[16];
-	uint32_t data_size;
-	uint32_t entries;
-	uint32_t entries_index;
-	uint32_t seed;
-};
-.Ed
-.Pp
-All fields are in Little Endian byte order.
-.Pp
-This is followed by a description of the hash function of
-.Va entries_index
-records.
-The size of each index entry is the logarithm of
-.Va entries
-to base 256, rounded up.
-.Pp
-The index records are followed by the start offsets of the entries,
-followed by
-.Va data_size .
-The offsets are relative to the end of the offset record table and are
-monotonically increasing.
-The size of each offset record is the logarithm of
-.Va data_size
-to base 256, rounded up.
-.Pp
-The offset table is followed by the entries in order.
-No separation or padding is added.
-.Ss Limitations
-The
-.Nm
-file format is by design intended for a database that can be
-mapped into memory.
-The hard limit for the number of entries and keys is 3435973836.
-The total size of all values must be smaller than 4GiB.
-.Sh SEE ALSO
-.Xr cdbr 3 ,
-.Xr cdbw 3
-.Sh HISTORY
-Support for the
-.Nm cdb
-format first appeared in
-.Nx 6.0 .
-.Sh AUTHORS
-The
-.Nm cdbr
-and
-.Nm cdbw
-functions have been written by
-.An Joerg Sonnenberger Aq Mt joerg@NetBSD.org .
diff --git a/lib/libc/cdb/cdbr.3 b/lib/libc/cdb/cdbr.3
deleted file mode 100644
index c28e001e0..000000000
--- a/lib/libc/cdb/cdbr.3
+++ /dev/null
@@ -1,146 +0,0 @@
-.\"	$NetBSD: cdbr.3,v 1.4 2013/12/05 21:17:23 joerg Exp $
-.\"
-.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Joerg Sonnenberger.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-.\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-.\" FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
-.\" COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
-.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.Dd December 5, 2013
-.Dt CDBR 3
-.Os
-.Sh NAME
-.Nm cdbr
-.Nm cdbr_open ,
-.Nm cdbr_open_mem ,
-.Nm cdbr_entries ,
-.Nm cdbr_get ,
-.Nm cdbr_find ,
-.Nm cdbr_close ,
-.Nm cdbr_write
-.Nd constant database access methods
-.Sh SYNOPSIS
-.Ft "struct cdbr *"
-.Fn cdbr_open "const char *path" "int flags"
-.Ft "struct cdbr *"
-.Fo cdbr_open_mem
-.Fa "void *base"
-.Fa "size_t size"
-.Fa "void (*unmap)(void *, void *, size_t)"
-.Fa "void *cookie"
-.Fc
-.Ft uint32_t
-.Fn cdbr_entries "struct cdbr *cdbr"
-.Ft int
-.Fn cdbr_get "struct cdbr *cdbr" "uint32_t index" "const void **data" "size_t *datalen"
-.Ft int
-.Fo cdbr_find
-.Fa "struct cdbr *cdbr"
-.Fa "const void *key"
-.Fa "size_t keylen"
-.Fa "const void **data"
-.Fa "size_t *datalen"
-.Fc
-.Ft void
-.Fn cdbr_close "struct cdbr *cdbr"
-.Sh DESCRIPTION
-The
-.Nm
-library provides a space efficient (key,value) database based
-on perfect hashing.
-.Pp
-A cdb database is opened for reading by calling
-.Fn cdbr_open .
-The only supported value for
-.Va flags
-is
-.Dv CDBR_DEFAULT .
-The function returns a handle to pass to the other functions.
-The database is closed by invoking
-.Fn cdbr_close .
-All resources associated with the handle are freed and the memory
-returned by
-.Fn cdbr_get
-and
-.Fn cdbr_find
-is invalidated.
-.Fn cdbr_open_mem
-works like
-.Fn cdbr_open ,
-but takes a memory reference to the content of the database file.
-If
-.Va unmap
-is not
-.Dv NULL ,
-it is called by
-.Fn cdbr_close
-with
-.Va cookie ,
-.Va base
-and
-.Va size
-as arguments.
-It is not called by
-.Fn cdbr_open_mem
-on error.
-.Pp
-The number of records in the database can be obtained by calling
-.Fn cdbr_entries .
-Records can be obtained by record number using
-.Fn cdbr_get
-or by key using
-.Fn cdbr_find .
-Both functions return 0 on success and update
-.Va data
-and
-.Va datalen
-accordingly.
-The location
-.Va *data
-remains valid until
-.Fn cdbr_close
-is called.
-It is the responsibility of the caller of
-.Fn cdbr_find
-to ensure that the key matches the returned data.
-The function returns the only possible match, but the database doesn't store
-the keys to minimize overhead.
-.Sh SEE ALSO
-.Xr nbperf 1 ,
-.Xr cdbw 3 ,
-.Xr db 3 ,
-.Xr cdb 5
-.Sh HISTORY
-Support for the
-.Nm cdb
-format first appeared in
-.Nx 6.0 .
-.Sh AUTHORS
-The
-.Nm cdbr
-and
-.Nm cdbw
-functions have been written by
-.An Joerg Sonnenberger Aq Mt joerg@NetBSD.org .
diff --git a/lib/libc/cdb/cdbw.3 b/lib/libc/cdb/cdbw.3
deleted file mode 100644
index 3d3a09d3f..000000000
--- a/lib/libc/cdb/cdbw.3
+++ /dev/null
@@ -1,140 +0,0 @@
-.\"	$NetBSD: cdbw.3,v 1.8 2014/02/06 15:50:40 rmind Exp $
-.\"
-.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Joerg Sonnenberger.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-.\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-.\" FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
-.\" COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
-.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.Dd February 6, 2014
-.Dt CDBW 3
-.Os
-.Sh NAME
-.Nm cdbw_open ,
-.Nm cdbw_put ,
-.Nm cdbw_put_data ,
-.Nm cdbw_put_key ,
-.Nm cdbw_stable_seeder ,
-.Nm cdbw_output ,
-.Nm cdbw_close
-.Nd create constant databases
-.Sh SYNOPSIS
-.In cdbw.h
-.Ft "struct cdbw *"
-.Fn cdbw_open "void"
-.Ft int
-.Fo cdbw_put
-.Fa "struct cdbw *cdbw"
-.Fa "const void *key"
-.Fa "size_t keylen"
-.Fa "const void *data"
-.Fa "size_t datalen"
-.Fc
-.Ft int
-.Fo cdbw_put_data
-.Fa "struct cdbw *cdbw"
-.Fa "const void *data"
-.Fa "size_t datalen"
-.Fa "uint32_t *index"
-.Fc
-.Ft int
-.Fo cdbw_put_key
-.Fa "struct cdbw *cdbw"
-.Fa "const void *key"
-.Fa "size_t keylen"
-.Fa "uint32_t index"
-.Fc
-.Ft uint32_t
-.Fo cdbw_stable_seeder
-.Fa "void"
-.Fc
-.Ft int
-.Fo cdbw_output
-.Fa "struct cdbw *cdbw"
-.Fa "int output"
-.Fa "const char descr[16]"
-.Fa "uint32_t (*seedgen)(void)"
-.Fc
-.Ft void
-.Fn cdbw_close "struct cdbw *cdbw"
-.Sh DESCRIPTION
-The
-.Nm cdbw
-functions are used to create a constant databases for use with
-.Xr cdbr 3 .
-Details about the file format, including overhead and limitations,
-can be found in
-.Xr cdb 5 .
-.Pp
-.Fn cdbw_open
-prepares a new
-.Nm cdb
-writer.
-The function returns a handle to pass to the other functions.
-.Pp
-.Fn cdbw_close
-frees all resources associated with the handle.
-.Pp
-.Fn cdbw_put
-adds the given (key,value) pair after checking for a duplicate key.
-.Fn cdbw_put_data
-adds the given value to the writer without adding a key reference.
-The returned index can be used in subsequent calls to
-.Fn cdbw_put_key
-to add one or more keys pointing to this value.
-.Fn cdbw_put_key
-checks for duplicate keys and valid index arguments.
-On success it adds the given key.
-.Pp
-.Fn cdbw_output
-computes the database file and writes it to the given descriptor.
-The function returns an error if the file cannot be written correctly.
-The
-.Fa descr
-parameter provides a human readable description of the database content.
-The
-.Fa seedgen
-parameter can be used to override the default PRNG.
-The bitwise layout of the output depends on the chosen seed.
-The function should return a different value for each invocation.
-The
-.Fn cdbw_stable_seeder
-can be used to create reproducible output.
-It may be slower than the default.
-.Sh SEE ALSO
-.Xr cdbr 3 ,
-.Xr cdb 5
-.Sh HISTORY
-Support for the
-.Nm cdb
-format first appeared in
-.Nx 6.0 .
-.Sh AUTHORS
-The
-.Nm cdbr
-and
-.Nm cdbw
-functions have been written by
-.An Joerg Sonnenberger Aq Mt joerg@NetBSD.org .
diff --git a/lib/libc/cdb/cdbw.c b/lib/libc/cdb/cdbw.c
deleted file mode 100644
index 379a6d50b..000000000
--- a/lib/libc/cdb/cdbw.c
+++ /dev/null
@@ -1,623 +0,0 @@
-/*	$NetBSD: cdbw.c,v 1.5 2012/07/21 22:49:37 joerg Exp $	*/
-/*-
- * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Joerg Sonnenberger.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: cdbw.c,v 1.5 2012/07/21 22:49:37 joerg Exp $");
-
-#include "namespace.h"
-
-#if !HAVE_NBTOOL_CONFIG_H || HAVE_SYS_ENDIAN_H
-#include <sys/endian.h>
-#endif
-#include <sys/queue.h>
-#include <cdbw.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(cdbw_close,_cdbw_close)
-__weak_alias(cdbw_open,_cdbw_open)
-__weak_alias(cdbw_output,_cdbw_output)
-__weak_alias(cdbw_put,_cdbw_put)
-__weak_alias(cdbw_put_data,_cdbw_put_data)
-__weak_alias(cdbw_put_key,_cdbw_put_key)
-#endif
-
-struct key_hash {
-	SLIST_ENTRY(key_hash) link;
-	uint32_t hashes[3];
-	uint32_t idx;
-	void *key;
-	size_t keylen;
-};
-
-SLIST_HEAD(key_hash_head, key_hash);
-
-struct cdbw {
-	size_t data_counter;
-	size_t data_allocated;
-	size_t data_size;
-	size_t *data_len;
-	void **data_ptr;
-
-	size_t hash_size;
-	struct key_hash_head *hash;
-	size_t key_counter;
-};
-
- /* Max. data counter that allows the index size to be 32bit. */
-static const uint32_t max_data_counter = 0xccccccccU;
-
-struct cdbw *
-cdbw_open(void)
-{
-	struct cdbw *cdbw;
-	size_t i;
-
-	cdbw = calloc(sizeof(*cdbw), 1);
-	if (cdbw == NULL)
-		return NULL;
-
-	cdbw->hash_size = 1024;
-	cdbw->hash = calloc(cdbw->hash_size, sizeof(*cdbw->hash));
-	if (cdbw->hash == NULL) {
-		free(cdbw);
-		return NULL;
-	}
-
-	for (i = 0; i < cdbw->hash_size; ++i)
-		SLIST_INIT(cdbw->hash + i);
-
-	return cdbw;
-}
-
-int
-cdbw_put(struct cdbw *cdbw, const void *key, size_t keylen,
-    const void *data, size_t datalen)
-{
-	uint32_t idx;
-	int rv;
-
-	rv = cdbw_put_data(cdbw, data, datalen, &idx);
-	if (rv)
-		return rv;
-	rv = cdbw_put_key(cdbw, key, keylen, idx);
-	if (rv) {
-		--cdbw->data_counter;
-		free(cdbw->data_ptr[cdbw->data_counter]);
-		cdbw->data_size -= datalen;
-		return rv;
-	}
-	return 0;
-}
-
-int
-cdbw_put_data(struct cdbw *cdbw, const void *data, size_t datalen,
-    uint32_t *idx)
-{
-
-	if (cdbw->data_counter == max_data_counter)
-		return -1;
-
-	if (cdbw->data_size + datalen < cdbw->data_size ||
-	    cdbw->data_size + datalen > 0xffffffffU)
-		return -1; /* Overflow */
-
-	if (cdbw->data_allocated == cdbw->data_counter) {
-		void **new_data_ptr;
-		size_t *new_data_len;
-		size_t new_allocated;
-
-		if (cdbw->data_allocated == 0)
-			new_allocated = 256;
-		else
-			new_allocated = cdbw->data_allocated * 2;
-
-		new_data_ptr = realloc(cdbw->data_ptr,
-		    sizeof(*cdbw->data_ptr) * new_allocated);
-		if (new_data_ptr == NULL)
-			return -1;
-		cdbw->data_ptr = new_data_ptr;
-
-		new_data_len = realloc(cdbw->data_len,
-		    sizeof(*cdbw->data_len) * new_allocated);
-		if (new_data_len == NULL)
-			return -1;
-		cdbw->data_len = new_data_len;
-
-		cdbw->data_allocated = new_allocated;
-	}
-
-	cdbw->data_ptr[cdbw->data_counter] = malloc(datalen);
-	if (cdbw->data_ptr[cdbw->data_counter] == NULL)
-		return -1;
-	memcpy(cdbw->data_ptr[cdbw->data_counter], data, datalen);
-	cdbw->data_len[cdbw->data_counter] = datalen;
-	cdbw->data_size += datalen;
-	*idx = cdbw->data_counter++;
-	return 0;
-}
-
-int
-cdbw_put_key(struct cdbw *cdbw, const void *key, size_t keylen, uint32_t idx)
-{
-	uint32_t hashes[3];
-	struct key_hash_head *head, *head2, *new_head;
-	struct key_hash *key_hash;
-	size_t new_hash_size, i;
-
-	if (idx >= cdbw->data_counter ||
-	    cdbw->key_counter == max_data_counter)
-		return -1;
-
-	mi_vector_hash(key, keylen, 0, hashes);
-
-	head = cdbw->hash + (hashes[0] & (cdbw->hash_size - 1));
-	SLIST_FOREACH(key_hash, head, link) {
-		if (key_hash->keylen != keylen)
-			continue;
-		if (key_hash->hashes[0] != hashes[0])
-			continue;
-		if (key_hash->hashes[1] != hashes[1])
-			continue;
-		if (key_hash->hashes[2] != hashes[2])
-			continue;
-		if (memcmp(key, key_hash->key, keylen))
-			continue;
-		return -1;
-	}
-	key_hash = malloc(sizeof(*key_hash));
-	if (key_hash == NULL)
-		return -1;
-	key_hash->key = malloc(keylen);
-	if (key_hash->key == NULL) {
-		free(key_hash);
-		return -1;
-	}
-	memcpy(key_hash->key, key, keylen);
-	key_hash->hashes[0] = hashes[0];
-	key_hash->hashes[1] = hashes[1];
-	key_hash->hashes[2] = hashes[2];
-	key_hash->keylen = keylen;
-	key_hash->idx = idx;
-	SLIST_INSERT_HEAD(head, key_hash, link);
-	++cdbw->key_counter;
-
-	if (cdbw->key_counter <= cdbw->hash_size)
-		return 0;
-
-	/* Try to resize the hash table, but ignore errors. */
-	new_hash_size = cdbw->hash_size * 2;
-	new_head = calloc(sizeof(*new_head), new_hash_size);
-	if (new_head == NULL)
-		return 0;
-
-	head = &cdbw->hash[hashes[0] & (cdbw->hash_size - 1)];
-	for (i = 0; i < new_hash_size; ++i)
-		SLIST_INIT(new_head + i);
-
-	for (i = 0; i < cdbw->hash_size; ++i) {
-		head = cdbw->hash + i;
-
-		while ((key_hash = SLIST_FIRST(head)) != NULL) {
-			SLIST_REMOVE_HEAD(head, link);
-			head2 = new_head +
-			    (key_hash->hashes[0] & (new_hash_size - 1));
-			SLIST_INSERT_HEAD(head2, key_hash, link);
-		}
-	}
-	free(cdbw->hash);
-	cdbw->hash_size = new_hash_size;
-	cdbw->hash = new_head;
-
-	return 0;
-}
-
-void
-cdbw_close(struct cdbw *cdbw)
-{
-	struct key_hash_head *head;
-	struct key_hash *key_hash;
-	size_t i;
-
-	for (i = 0; i < cdbw->hash_size; ++i) {
-		head = cdbw->hash + i;
-		while ((key_hash = SLIST_FIRST(head)) != NULL) {
-			SLIST_REMOVE_HEAD(head, link);
-			free(key_hash->key);
-			free(key_hash);
-		}
-	}
-
-	for (i = 0; i < cdbw->data_counter; ++i)
-		free(cdbw->data_ptr[i]);
-	free(cdbw->data_ptr);
-	free(cdbw->data_len);
-	free(cdbw->hash);
-	free(cdbw);
-}
-
-uint32_t
-cdbw_stable_seeder(void)
-{
-	return 0;
-}
-
-#define unused 0xffffffffU
-
-struct vertex {
-	uint32_t l_edge, m_edge, r_edge;
-};
-
-struct edge {
-	uint32_t idx;
-
-	uint32_t left, middle, right;
-	uint32_t l_prev, m_prev, l_next;
-	uint32_t r_prev, m_next, r_next;
-};
-
-struct state {
-	uint32_t data_entries;
-	uint32_t entries;
-	uint32_t keys;
-	uint32_t seed;
-
-	uint32_t *g;
-	char *visited;
-
-	struct vertex *verts;
-	struct edge *edges;
-	uint32_t output_index;
-	uint32_t *output_order;
-};
-
-static void
-remove_vertex(struct state *state, struct vertex *v)
-{
-	struct edge *e;
-	struct vertex *vl, *vm, *vr;
-
-	if (v->l_edge != unused && v->m_edge != unused)
-		return;
-	if (v->l_edge != unused && v->r_edge != unused)
-		return;
-	if (v->m_edge != unused && v->r_edge != unused)
-		return;
-	if (v->l_edge == unused && v->m_edge == unused && v->r_edge == unused)
-		return;
-
-	if (v->l_edge != unused) {
-		e = &state->edges[v->l_edge];
-		if (e->l_next != unused)
-			return;
-	} else if (v->m_edge != unused) {
-		e = &state->edges[v->m_edge];
-		if (e->m_next != unused)
-			return;
-	} else {
-		if (v->r_edge == unused)
-			abort();
-		e = &state->edges[v->r_edge];
-		if (e->r_next != unused)
-			return;
-	}
-
-	state->output_order[--state->output_index] = e - state->edges;
-
-	vl = &state->verts[e->left];
-	vm = &state->verts[e->middle];
-	vr = &state->verts[e->right];
-
-	if (e->l_prev == unused)
-		vl->l_edge = e->l_next;
-	else
-		state->edges[e->l_prev].l_next = e->l_next;
-	if (e->l_next != unused)
-		state->edges[e->l_next].l_prev = e->l_prev;
-
-	if (e->m_prev == unused)
-		vm->m_edge = e->m_next;
-	else
-		state->edges[e->m_prev].m_next = e->m_next;
-	if (e->m_next != unused)
-		state->edges[e->m_next].m_prev = e->m_prev;
-
-	if (e->r_prev == unused)
-		vr->r_edge = e->r_next;
-	else
-		state->edges[e->r_prev].r_next = e->r_next;
-	if (e->r_next != unused)
-		state->edges[e->r_next].r_prev = e->r_prev;
-}
-
-static int
-build_graph(struct cdbw *cdbw, struct state *state)
-{
-	struct key_hash_head *head;
-	struct key_hash *key_hash;
-	struct vertex *v;
-	struct edge *e;
-	uint32_t hashes[3];
-	size_t i;
-
-	e = state->edges;
-	for (i = 0; i < cdbw->hash_size; ++i) {
-		head = &cdbw->hash[i];
-		SLIST_FOREACH(key_hash, head, link) {
-			e->idx = key_hash->idx;
-			mi_vector_hash(key_hash->key, key_hash->keylen,
-			    state->seed, hashes);
-			e->left = hashes[0] % state->entries;
-			e->middle = hashes[1] % state->entries;
-			e->right = hashes[2] % state->entries;
-
-			if (e->left == e->middle)
-				return -1;
-			if (e->left == e->right)
-				return -1;
-			if (e->middle == e->right)
-				return -1;
-
-			++e;
-		}
-	}
-
-	for (i = 0; i < state->entries; ++i) {
-		v = state->verts + i;
-		v->l_edge = unused;
-		v->m_edge = unused;
-		v->r_edge = unused;
-	}
-
-	for (i = 0; i < state->keys; ++i) {
-		e = state->edges + i;
-		v = state->verts + e->left;
-		if (v->l_edge != unused)
-			state->edges[v->l_edge].l_prev = i;
-		e->l_next = v->l_edge;
-		e->l_prev = unused;
-		v->l_edge = i;
-
-		v = &state->verts[e->middle];
-		if (v->m_edge != unused)
-			state->edges[v->m_edge].m_prev = i;
-		e->m_next = v->m_edge;
-		e->m_prev = unused;
-		v->m_edge = i;
-
-		v = &state->verts[e->right];
-		if (v->r_edge != unused)
-			state->edges[v->r_edge].r_prev = i;
-		e->r_next = v->r_edge;
-		e->r_prev = unused;
-		v->r_edge = i;
-	}
-
-	state->output_index = state->keys;
-	for (i = 0; i < state->entries; ++i)
-		remove_vertex(state, state->verts + i);
-
-	i = state->keys;
-	while (i > 0 && i > state->output_index) {
-		--i;
-		e = state->edges + state->output_order[i];
-		remove_vertex(state, state->verts + e->left);
-		remove_vertex(state, state->verts + e->middle);
-		remove_vertex(state, state->verts + e->right);
-	}
-
-	return state->output_index == 0 ? 0 : -1;
-}
-
-static void
-assign_nodes(struct state *state)
-{
-	struct edge *e;
-	size_t i;
-
-	for (i = 0; i < state->keys; ++i) {
-		e = state->edges + state->output_order[i];
-
-		if (!state->visited[e->left]) {
-			state->g[e->left] =
-			    (2 * state->data_entries + e->idx
-			    - state->g[e->middle] - state->g[e->right])
-			    % state->data_entries;
-		} else if (!state->visited[e->middle]) {
-			state->g[e->middle] =
-			    (2 * state->data_entries + e->idx
-			    - state->g[e->left] - state->g[e->right])
-			    % state->data_entries;
-		} else {
-			state->g[e->right] =
-			    (2 * state->data_entries + e->idx
-			    - state->g[e->left] - state->g[e->middle])
-			    % state->data_entries;
-		}
-		state->visited[e->left] = 1;
-		state->visited[e->middle] = 1;
-		state->visited[e->right] = 1;
-	}
-}
-
-static size_t
-compute_size(uint32_t size)
-{
-	if (size < 0x100)
-		return 1;
-	else if (size < 0x10000)
-		return 2;
-	else
-		return 4;
-}
-
-#define COND_FLUSH_BUFFER(n) do { 				\
-	if (__predict_false(cur_pos + (n) >= sizeof(buf))) {	\
-		ret = write(fd, buf, cur_pos);			\
-		if (ret == -1 || (size_t)ret != cur_pos)	\
-			return -1;				\
-		cur_pos = 0;					\
-	}							\
-} while (/* CONSTCOND */ 0)
-
-static int
-print_hash(struct cdbw *cdbw, struct state *state, int fd, const char *descr)
-{
-	uint32_t data_size;
-	uint8_t buf[90000];
-	size_t i, size, size2, cur_pos;
-	ssize_t ret;
-
-	memcpy(buf, "NBCDB\n\0", 7);
-	buf[7] = 1;
-	strncpy((char *)buf + 8, descr, 16);
-	le32enc(buf + 24, cdbw->data_size);
-	le32enc(buf + 28, cdbw->data_counter);
-	le32enc(buf + 32, state->entries);
-	le32enc(buf + 36, state->seed);
-	cur_pos = 40;
-
-	size = compute_size(state->entries);
-	for (i = 0; i < state->entries; ++i) {
-		COND_FLUSH_BUFFER(4);
-		le32enc(buf + cur_pos, state->g[i]);
-		cur_pos += size;
-	}
-	size2 = compute_size(cdbw->data_size);
-	size = size * state->entries % size2;
-	if (size != 0) {
-		size = size2 - size;
-		COND_FLUSH_BUFFER(4);
-		le32enc(buf + cur_pos, 0);
-		cur_pos += size;
-	}
-	for (data_size = 0, i = 0; i < cdbw->data_counter; ++i) {
-		COND_FLUSH_BUFFER(4);
-		le32enc(buf + cur_pos, data_size);
-		cur_pos += size2;
-		data_size += cdbw->data_len[i];
-	}
-	COND_FLUSH_BUFFER(4);
-	le32enc(buf + cur_pos, data_size);
-	cur_pos += size2;
-
-	for (i = 0; i < cdbw->data_counter; ++i) {
-		COND_FLUSH_BUFFER(cdbw->data_len[i]);
-		if (cdbw->data_len[i] < sizeof(buf)) {
-			memcpy(buf + cur_pos, cdbw->data_ptr[i],
-			    cdbw->data_len[i]);
-			cur_pos += cdbw->data_len[i];
-		} else {
-			ret = write(fd, cdbw->data_ptr[i], cdbw->data_len[i]);
-			if (ret == -1 || (size_t)ret != cdbw->data_len[i])
-				return -1;
-		}
-	}
-	if (cur_pos != 0) {
-		ret = write(fd, buf, cur_pos);
-		if (ret == -1 || (size_t)ret != cur_pos)
-			return -1;
-	}
-	return 0;
-}
-
-int
-cdbw_output(struct cdbw *cdbw, int fd, const char descr[16],
-    uint32_t (*seedgen)(void))
-{
-	struct state state;
-	int rv;
-
-	if (cdbw->data_counter == 0 || cdbw->key_counter == 0) {
-		state.entries = 0;
-		state.seed = 0;
-		print_hash(cdbw, &state, fd, descr);
-		return 0;
-	}
-
-#if HAVE_NBTOOL_CONFIG_H
-	if (seedgen == NULL)
-		seedgen = cdbw_stable_seeder;
-#else
-	if (seedgen == NULL)
-		seedgen = arc4random;
-#endif
-
-	rv = 0;
-
-	state.keys = cdbw->key_counter;
-	state.data_entries = cdbw->data_counter;
-	state.entries = state.keys + (state.keys + 3) / 4;
-	if (state.entries < 10)
-		state.entries = 10;
-
-#define	NALLOC(var, n)	var = calloc(sizeof(*var), n)
-	NALLOC(state.g, state.entries);
-	NALLOC(state.visited, state.entries);
-	NALLOC(state.verts, state.entries);
-	NALLOC(state.edges, state.entries);
-	NALLOC(state.output_order, state.keys);
-#undef NALLOC
-
-	if (state.g == NULL || state.visited == NULL || state.verts == NULL ||
-	    state.edges == NULL || state.output_order == NULL) {
-		rv = -1;
-		goto release;
-	}
-
-	state.seed = 0;
-	do {
-		if (seedgen == cdbw_stable_seeder)
-			++state.seed;
-		else
-			state.seed = (*seedgen)();
-	} while (build_graph(cdbw, &state));
-
-	assign_nodes(&state);
-	rv = print_hash(cdbw, &state, fd, descr);
-
-release:
-	free(state.g);
-	free(state.visited);
-	free(state.verts);
-	free(state.edges);
-	free(state.output_order);
-
-	return rv;
-}
diff --git a/lib/libc/citrus/Makefile.inc b/lib/libc/citrus/Makefile.inc
deleted file mode 100644
index 39b513a22..000000000
--- a/lib/libc/citrus/Makefile.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.8 2010/05/30 08:28:53 tnozaki Exp $
-
-# sources
-.PATH: ${ARCHDIR}/citrus ${.CURDIR}/citrus
-
-.if !defined(__MINIX)
-MODULE_SHLIB_MAJOR!= . ${NETBSDSRCDIR}/lib/i18n_module/shlib_version ; echo $$major
-.else
-MODULE_SHLIB_MAJOR=1
-.endif # !defined(__MINIX)
-CPPFLAGS.citrus_module.c+=-DI18NMODULE_MAJOR=${MODULE_SHLIB_MAJOR}
-SRCS+=	citrus_bcs.c citrus_bcs_strtol.c citrus_bcs_strtoul.c \
-	citrus_csmapper.c citrus_ctype.c citrus_ctype_fallback.c \
-	citrus_db.c citrus_db_hash.c citrus_esdb.c citrus_hash.c \
-	citrus_iconv.c citrus_lookup.c \
-	citrus_mapper.c citrus_memstream.c citrus_mmap.c citrus_module.c \
-	citrus_none.c citrus_stdenc.c
-SRCS+=	citrus_lc_ctype.c \
-	citrus_lc_monetary.c \
-	citrus_lc_numeric.c \
-	citrus_lc_time.c \
-	citrus_lc_messages.c
-CPPFLAGS.citrus_bcs_strtol.c+=	-I${LIBCDIR}/../../common/lib/libc/stdlib
-CPPFLAGS.citrus_bcs_strtoul.c+=	-I${LIBCDIR}/../../common/lib/libc/stdlib
-CPPFLAGS.citrus_lc_ctype.c+=	-I${LIBCDIR}/locale
-CPPFLAGS.citrus_lc_monetary.c+=	-I${LIBCDIR}/locale
-CPPFLAGS.citrus_lc_numeric.c+=	-I${LIBCDIR}/locale
-CPPFLAGS.citrus_lc_time.c+=	-I${LIBCDIR}/locale
-CPPFLAGS.citrus_lc_messages.c+=	-I${LIBCDIR}/locale
diff --git a/lib/libc/citrus/citrus_aliasname_local.h b/lib/libc/citrus/citrus_aliasname_local.h
deleted file mode 100644
index d76cb418b..000000000
--- a/lib/libc/citrus/citrus_aliasname_local.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $NetBSD: citrus_aliasname_local.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_ALIASNAME_LOCAL_H_
-#define _CITRUS_ALIASNAME_LOCAL_H_
-
-static __inline const char *
-__unaliasname(const char *dbname, const char *alias,
-    void *buf, size_t bufsize)
-{
-	return _lookup_simple(dbname, alias,
-	    buf, bufsize, _LOOKUP_CASE_SENSITIVE);
-}
-
-static __inline int
-__isforcemapping(const char *name)
-{
-	_DIAGASSERT(name != NULL);
-
-	return _bcs_strcasecmp("/force", name);
-}
-
-#endif /*_CITRUS_ALIASNAME_LOCAL_H_*/
diff --git a/lib/libc/citrus/citrus_bcs.c b/lib/libc/citrus/citrus_bcs.c
deleted file mode 100644
index b14186de6..000000000
--- a/lib/libc/citrus/citrus_bcs.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*	$NetBSD: citrus_bcs.c,v 1.5 2005/05/14 17:55:42 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_bcs.c,v 1.5 2005/05/14 17:55:42 tshiozak Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifndef HOSTPROG
-#include "namespace.h"
-#endif
-#include <assert.h>
-#include <stdlib.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-
-/*
- * case insensitive comparison between two C strings.
- */
-int
-_citrus_bcs_strcasecmp(const char * __restrict str1,
-		       const char * __restrict str2)
-{
-	int c1 = 1, c2 = 1;
-
-	while (c1 && c2 && c1 == c2) {
-		c1 = _bcs_toupper(*str1++);
-		c2 = _bcs_toupper(*str2++);
-	}
-
-	return ((c1 == c2) ? 0 : ((c1 > c2) ? 1 : -1));
-}
-
-/*
- * case insensitive comparison between two C strings with limitation of length.
- */
-int
-_citrus_bcs_strncasecmp(const char * __restrict str1,
-			const char * __restrict str2, size_t sz)
-{
-	int c1 = 1, c2 = 1;
-
-	while (c1 && c2 && c1 == c2 && sz != 0) {
-		c1 = _bcs_toupper(*str1++);
-		c2 = _bcs_toupper(*str2++);
-		sz--;
-	}
-
-	return ((c1 == c2) ? 0 : ((c1 > c2) ? 1 : -1));
-}
-
-/*
- * skip white space characters.
- */
-const char *
-_citrus_bcs_skip_ws(const char *p)
-{
-
-	while (*p && _bcs_isspace(*p))
-		p++;
-
-	return (p);
-}
-
-/*
- * skip non white space characters.
- */
-const char *
-_citrus_bcs_skip_nonws(const char *p)
-{
-
-	while (*p && !_bcs_isspace(*p))
-		p++;
-
-	return (p);
-}
-
-/*
- * skip white space characters with limitation of length.
- */
-const char *
-_citrus_bcs_skip_ws_len(const char * __restrict p, size_t * __restrict len)
-{
-
-	while (*p && *len > 0 && _bcs_isspace(*p)) {
-		p++;
-		(*len)--;
-	}
-
-	return (p);
-}
-
-/*
- * skip non white space characters with limitation of length.
- */
-const char *
-_citrus_bcs_skip_nonws_len(const char * __restrict p, size_t * __restrict len)
-{
-
-	while (*p && *len > 0 && !_bcs_isspace(*p)) {
-		p++;
-		(*len)--;
-	}
-
-	return (p);
-}
-
-/*
- * truncate trailing white space characters.
- */
-void
-_citrus_bcs_trunc_rws_len(const char * __restrict p, size_t * __restrict len)
-{
-
-	while (*len > 0 && _bcs_isspace(p[*len - 1]))
-		(*len)--;
-}
-
-/*
- * destructive transliterate to lowercase.
- */
-void
-_citrus_bcs_convert_to_lower(char *s)
-{
-	while (*s) {
-		*s = _bcs_tolower(*s);
-		s++;
-	}
-}
-
-/*
- * destructive transliterate to uppercase.
- */
-void
-_citrus_bcs_convert_to_upper(char *s)
-{
-	while (*s) {
-		*s = _bcs_toupper(*s);
-		s++;
-	}
-}
diff --git a/lib/libc/citrus/citrus_bcs.h b/lib/libc/citrus/citrus_bcs.h
deleted file mode 100644
index 784da76da..000000000
--- a/lib/libc/citrus/citrus_bcs.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$NetBSD: citrus_bcs.h,v 1.6 2009/01/11 02:46:24 christos Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_BCS_H_
-#define _CITRUS_BCS_H_
-
-/*
- * predicate/conversion for basic character set.
- *
- * `Basic character set' is a term defined in the ISO C standard.
- * Citrus bcs is, if anything, close to `portable character set'
- * defined in the POSIX.
- */
-
-#define _CITRUS_BCS_PRED(_name_, _cond_) \
-static __inline int _citrus_bcs_##_name_(uint8_t c) { return (_cond_); }
-
-/*
- * predicates.
- * Unlike predicates defined in ctype.h, these do not accept EOF.
- */
-_CITRUS_BCS_PRED(isblank, c == ' ' || c == '\t')
-_CITRUS_BCS_PRED(iseol, c == '\n' || c == '\r')
-_CITRUS_BCS_PRED(isspace,
-		 _citrus_bcs_isblank(c) || _citrus_bcs_iseol(c) ||
-		 c == '\f' || c == '\v')
-_CITRUS_BCS_PRED(isdigit, c >= '0' && c <= '9')
-_CITRUS_BCS_PRED(isupper, c >= 'A' && c <= 'Z')
-_CITRUS_BCS_PRED(islower, c >= 'a' && c <= 'z')
-_CITRUS_BCS_PRED(isalpha, _citrus_bcs_isupper(c) || _citrus_bcs_islower(c))
-_CITRUS_BCS_PRED(isalnum, _citrus_bcs_isdigit(c) || _citrus_bcs_isalpha(c))
-_CITRUS_BCS_PRED(isxdigit,
-		 _citrus_bcs_isdigit(c) ||
-		 (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
-
-/*
- * transliterate between uppercase and lowercase.
- * Unlike transliterator defined in ctype.h, these do not accept EOF.
- */
-static __inline uint8_t
-_citrus_bcs_toupper(uint8_t c)
-{
-	return (_citrus_bcs_islower(c) ? (c - 'a' + 'A') : c);
-}
-
-static __inline uint8_t
-_citrus_bcs_tolower(uint8_t c)
-{
-	return (_citrus_bcs_isupper(c) ? (c - 'A' + 'a') : c);
-}
-
-__BEGIN_DECLS
-int _citrus_bcs_strcasecmp(const char * __restrict, const char * __restrict);
-int _citrus_bcs_strncasecmp(const char * __restrict, const char * __restrict,
-			    size_t);
-const char *_citrus_bcs_skip_ws(const char * __restrict);
-const char *_citrus_bcs_skip_nonws(const char * __restrict);
-const char *_citrus_bcs_skip_ws_len(const char * __restrict,
-				       size_t * __restrict);
-const char *_citrus_bcs_skip_nonws_len(const char * __restrict,
-				       size_t * __restrict);
-void _citrus_bcs_trunc_rws_len(const char * __restrict, size_t * __restrict);
-void _citrus_bcs_convert_to_lower(char *);
-void _citrus_bcs_convert_to_upper(char *);
-
-long int _citrus_bcs_strtol(
-    const char * __restrict, char ** __restrict, int);
-unsigned long int _citrus_bcs_strtoul(
-    const char * __restrict, char ** __restrict, int);
-
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/citrus_bcs_strtol.c b/lib/libc/citrus/citrus_bcs_strtol.c
deleted file mode 100644
index 618bc19f3..000000000
--- a/lib/libc/citrus/citrus_bcs_strtol.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* $NetBSD: citrus_bcs_strtol.c,v 1.4 2013/04/26 21:20:47 joerg Exp $ */
-
-/*-
- * Copyright (c) 2005 The DragonFly Project.  All rights reserved.
- * Copyright (c) 2003, 2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: citrus_bcs_strtol.c,v 1.4 2013/04/26 21:20:47 joerg Exp $");
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-
-#define	BCS_ONLY
-
-#define	_FUNCNAME	_bcs_strtol
-#define	__INT		long int
-#define	__INT_MIN	LONG_MIN
-#define	__INT_MAX	LONG_MAX
-
-#undef isspace
-#define isspace(c)	_bcs_isspace(c)
-
-#undef isdigit
-#define isdigit(c)	_bcs_isdigit(c)
-
-#undef isalpha
-#define isalpha(c)	_bcs_isalpha(c)
-
-#undef isupper
-#define isupper(c)	_bcs_isupper(c)
-
-#include "_strtol.h"
diff --git a/lib/libc/citrus/citrus_bcs_strtoul.c b/lib/libc/citrus/citrus_bcs_strtoul.c
deleted file mode 100644
index c9ffe19eb..000000000
--- a/lib/libc/citrus/citrus_bcs_strtoul.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* $NetBSD: citrus_bcs_strtoul.c,v 1.5 2013/04/26 21:20:48 joerg Exp $ */
-
-/*-
- * Copyright (c) 2005 The DragonFly Project.  All rights reserved.
- * Copyright (c) 2003, 2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if !defined(lint)
-__RCSID("$NetBSD: citrus_bcs_strtoul.c,v 1.5 2013/04/26 21:20:48 joerg Exp $");
-#endif /* not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-
-#define	BCS_ONLY
-
-#define	_FUNCNAME	_bcs_strtoul
-#define	__UINT		unsigned long int
-#define	__UINT_MAX	ULONG_MAX
-
-#undef isspace
-#define isspace(c)	_bcs_isspace(c)
-
-#undef isdigit
-#define isdigit(c)	_bcs_isdigit(c)
-
-#undef isalpha
-#define isalpha(c)	_bcs_isalpha(c)
-
-#undef isupper
-#define isupper(c)	_bcs_isupper(c)
-
-#include "_strtoul.h"
diff --git a/lib/libc/citrus/citrus_csmapper.c b/lib/libc/citrus/citrus_csmapper.c
deleted file mode 100644
index 4e8f445c5..000000000
--- a/lib/libc/citrus/citrus_csmapper.c
+++ /dev/null
@@ -1,388 +0,0 @@
-/*	$NetBSD: citrus_csmapper.c,v 1.11 2011/11/20 07:43:52 tnozaki Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_csmapper.c,v 1.11 2011/11/20 07:43:52 tnozaki Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <paths.h>
-#include <sys/types.h>
-#include <sys/queue.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_mmap.h"
-#include "citrus_module.h"
-#include "citrus_hash.h"
-#include "citrus_mapper.h"
-#include "citrus_csmapper.h"
-#include "citrus_pivot_file.h"
-#include "citrus_db.h"
-#include "citrus_db_hash.h"
-#include "citrus_lookup.h"
-
-#ifdef _REENTRANT
-static rwlock_t lock = RWLOCK_INITIALIZER;
-#endif
-static struct _citrus_mapper_area *maparea = NULL;
-
-#define CS_ALIAS	_PATH_CSMAPPER "/charset.alias"
-#define CS_PIVOT	_PATH_CSMAPPER "/charset.pivot"
-
-
-/* ---------------------------------------------------------------------- */
-
-static int
-get32(struct _region *r, uint32_t *rval)
-{
-	if (_region_size(r) != 4)
-		return EFTYPE;
-
-	memcpy(rval, _region_head(r), (size_t)4);
-	*rval = be32toh(*rval);
-
-	return 0;
-}
-
-static int
-open_subdb(struct _citrus_db **subdb, struct _citrus_db *db, const char *src)
-{
-	int ret;
-	struct _region r;
-
-	ret = _db_lookup_by_s(db, src, &r, NULL);
-	if (ret)
-		return ret;
-	ret = _db_open(subdb, &r, _CITRUS_PIVOT_SUB_MAGIC, _db_hash_std, NULL);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
-
-#define NO_SUCH_FILE	EOPNOTSUPP
-static int
-find_best_pivot_pvdb(const char *src, const char *dst, char *pivot,
-		     size_t pvlen, unsigned long *rnorm)
-{
-	int ret, num, i;
-	struct _region fr, r1, r2;
-	struct _citrus_db *db1, *db2, *db3;
-	char buf[LINE_MAX];
-	unsigned long norm;
-	uint32_t val32;
-
-	ret = _map_file(&fr, CS_PIVOT ".pvdb");
-	if (ret) {
-		if (ret == ENOENT)
-			ret = NO_SUCH_FILE;
-		return ret;
-	}
-	ret = _db_open(&db1, &fr, _CITRUS_PIVOT_MAGIC, _db_hash_std, NULL);
-	if (ret)
-		goto quit1;
-	ret = open_subdb(&db2, db1, src);
-	if (ret)
-		goto quit2;
-
-	num = _db_get_num_entries(db2);
-	*rnorm = ULONG_MAX;
-	for (i = 0; i < num; i++) {
-		/* iterate each pivot */
-		ret = _db_get_entry(db2, i, &r1, &r2);
-		if (ret)
-			goto quit3;
-		/* r1:pivot name, r2:norm among src and pivot */
-		ret = get32(&r2, &val32);
-		if (ret)
-			goto quit3;
-		norm = val32;
-		snprintf(buf, sizeof(buf), "%.*s",
-			 (int)_region_size(&r1), (char *)_region_head(&r1));
-		/* buf: pivot name */
-		ret = open_subdb(&db3, db1, buf);
-		if (ret)
-			goto quit3;
-		if (_db_lookup_by_s(db3, dst, &r2, NULL) != 0)
-			/* don't break the loop, test all src/dst pairs. */
-			goto quit4;
-		/* r2: norm among pivot and dst */
-		ret = get32(&r2, &val32);
-		if (ret)
-			goto quit4;
-		norm += val32;
-		/* judge minimum norm */
-		if (norm < *rnorm) {
-			*rnorm = norm;
-			strlcpy(pivot, buf, pvlen);
-		}
-quit4:
-		_db_close(db3);
-		if (ret)
-			goto quit3;
-	}
-quit3:
-	_db_close(db2);
-quit2:
-	_db_close(db1);
-quit1:
-	_unmap_file(&fr);
-	if (ret)
-		return ret;
-
-	if (*rnorm == ULONG_MAX)
-		return ENOENT;
-
-	return 0;
-}
-
-/* ---------------------------------------------------------------------- */
-
-struct zone {
-	const char *begin, *end;
-};
-
-struct parse_arg {
-	char dst[PATH_MAX];
-	unsigned long norm;
-};
-
-static int
-parse_line(struct parse_arg *pa, struct _region *r)
-{
-	char buf[20];
-	struct zone z1, z2;
-	size_t len;
-
-	len = _region_size(r);
-	z1.begin = _bcs_skip_ws_len(_region_head(r), &len);
-	if (len == 0)
-		return EFTYPE;
-	z1.end = _bcs_skip_nonws_len(z1.begin, &len);
-	if (len == 0)
-		return EFTYPE;
-	z2.begin = _bcs_skip_ws_len(z1.end, &len);
-	if (len == 0)
-		return EFTYPE;
-	z2.end = _bcs_skip_nonws_len(z2.begin, &len);
-
-	/* z1 : dst name, z2 : norm */
-	snprintf(pa->dst, sizeof(pa->dst),
-		 "%.*s", (int)(z1.end-z1.begin), z1.begin);
-	snprintf(buf, sizeof(buf),
-		 "%.*s", (int)(z2.end-z2.begin), z2.begin);
-	pa->norm = _bcs_strtoul(buf, NULL, 0);
-
-	return 0;
-}
-
-static int
-find_dst(struct parse_arg *pasrc, const char *dst)
-{
-	int ret;
-	struct parse_arg padst;
-	struct _lookup *cl;
-	struct _region data;
-
-	ret = _lookup_seq_open(&cl, CS_PIVOT, _LOOKUP_CASE_IGNORE);
-	if (ret)
-		return ret;
-
-	ret = _lookup_seq_lookup(cl, pasrc->dst, &data);
-	while (ret == 0) {
-		ret = parse_line(&padst, &data);
-		if (ret)
-			break;
-		if (strcmp(dst, padst.dst) == 0) {
-			pasrc->norm += padst.norm;
-			break;
-		}
-		ret = _lookup_seq_next(cl, NULL, &data);
-	}
-	_lookup_seq_close(cl);
-
-	return ret;
-}
-
-static int
-find_best_pivot_lookup(const char *src, const char *dst, char *pivot,
-		       size_t pvlen, unsigned long *rnorm)
-{
-	int ret;
-	struct _lookup *cl;
-	struct _region data;
-	struct parse_arg pa;
-	unsigned long norm_min;
-	char pivot_min[PATH_MAX];
-
-	ret = _lookup_seq_open(&cl, CS_PIVOT, _LOOKUP_CASE_IGNORE);
-	if (ret)
-		return ret;
-
-	norm_min = ULONG_MAX;
-
-	/* find pivot code */
-	ret = _lookup_seq_lookup(cl, src, &data);
-	while (ret == 0) {
-		ret = parse_line(&pa, &data);
-		if (ret)
-			break;
-		ret = find_dst(&pa, dst);
-		if (ret)
-			break;
-		if (pa.norm < norm_min) {
-			norm_min = pa.norm;
-			strlcpy(pivot_min, pa.dst, sizeof(pivot_min));
-		}
-		ret = _lookup_seq_next(cl, NULL, &data);
-	}
-	_lookup_seq_close(cl);
-
-	if (ret != ENOENT)
-		return ret;
-	if (norm_min == ULONG_MAX)
-		return ENOENT;
-	strlcpy(pivot, pivot_min, pvlen);
-	if (rnorm)
-		*rnorm = norm_min;
-
-	return 0;
-}
-
-static int
-find_best_pivot(const char *src, const char *dst, char *pivot, size_t pvlen,
-		unsigned long *rnorm)
-{
-	int ret;
-
-	ret = find_best_pivot_pvdb(src, dst, pivot, pvlen, rnorm);
-	if (ret == NO_SUCH_FILE)
-		ret = find_best_pivot_lookup(src, dst, pivot, pvlen, rnorm);
-
-	return ret;
-}
-
-static __inline int
-open_serial_mapper(struct _citrus_mapper_area *__restrict ma,
-		   struct _citrus_mapper * __restrict * __restrict rcm,
-		   const char *src, const char *pivot, const char *dst)
-{
-	char buf[PATH_MAX];
-
-	snprintf(buf, sizeof(buf), "%s/%s,%s/%s", src, pivot, pivot, dst);
-
-	return _mapper_open_direct(ma, rcm, "mapper_serial", buf);
-}
-
-static struct _citrus_csmapper *csm_none = NULL;
-static int
-get_none(struct _citrus_mapper_area *__restrict ma,
-	 struct _citrus_csmapper *__restrict *__restrict rcsm)
-{
-	int ret;
-
-	rwlock_wrlock(&lock);
-	if (csm_none) {
-		*rcsm = csm_none;
-		ret = 0;
-		goto quit;
-	}
-
-	ret = _mapper_open_direct(ma, &csm_none, "mapper_none", "");
-	if (ret)
-		goto quit;
-	_mapper_set_persistent(csm_none);
-
-	*rcsm = csm_none;
-	ret = 0;
-quit:
-	rwlock_unlock(&lock);
-	return ret;
-}
-
-int
-_citrus_csmapper_open(struct _citrus_csmapper * __restrict * __restrict rcsm,
-		      const char * __restrict src, const char * __restrict dst,
-		      uint32_t flags, unsigned long *rnorm)
-{
-	int ret;
-	char buf1[PATH_MAX], buf2[PATH_MAX], key[PATH_MAX], pivot[PATH_MAX];
-	const char *realsrc, *realdst;
-	unsigned long norm;
-
-	norm = 0;	/* XXX gcc */
-
-	ret = _citrus_mapper_create_area(&maparea, _PATH_CSMAPPER);
-	if (ret)
-		return ret;
-
-	realsrc = _lookup_alias(CS_ALIAS, src, buf1, sizeof(buf1),
-				_LOOKUP_CASE_IGNORE);
-	realdst = _lookup_alias(CS_ALIAS, dst, buf2, sizeof(buf2),
-				_LOOKUP_CASE_IGNORE);
-	if (!strcmp(realsrc, realdst)) {
-		ret = get_none(maparea, rcsm);
-		if (ret == 0 && rnorm != NULL)
-			*rnorm = 0;
-		return ret;
-	}
-
-	snprintf(key, sizeof(key), "%s/%s", realsrc, realdst);
-
-	ret = _mapper_open(maparea, rcsm, key);
-	if (ret == 0) {
-		if (rnorm != NULL)
-			*rnorm = 0;
-		return 0;
-	}
-	if (ret != ENOENT || (flags & _CSMAPPER_F_PREVENT_PIVOT)!=0)
-		return ret;
-
-	ret = find_best_pivot(realsrc, realdst, pivot, sizeof(pivot), &norm);
-	if (ret)
-		return ret;
-
-	ret = open_serial_mapper(maparea, rcsm, realsrc, pivot, realdst);
-	if (ret == 0 && rnorm != NULL)
-		*rnorm = norm;
-
-	return ret;
-}
diff --git a/lib/libc/citrus/citrus_csmapper.h b/lib/libc/citrus/citrus_csmapper.h
deleted file mode 100644
index 04f8d9b69..000000000
--- a/lib/libc/citrus/citrus_csmapper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: citrus_csmapper.h,v 1.3 2013/06/24 17:28:35 joerg Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_CSMAPPER_H_
-#define _CITRUS_CSMAPPER_H_
-
-#define _citrus_csmapper		_citrus_mapper
-#define _citrus_csmapper_close		_citrus_mapper_close
-#define _citrus_csmapper_convert	_citrus_mapper_convert
-#define _citrus_csmapper_init_state	_citrus_mapper_init_state
-#define _citrus_csmapper_get_state_size	_citrus_mapper_get_state_size
-#define _citrus_csmapper_get_src_max	_citrus_mapper_get_src_max
-#define _citrus_csmapper_get_dst_max	_citrus_mapper_get_dst_max
-
-#define _CITRUS_CSMAPPER_F_PREVENT_PIVOT	0x00000001
-__BEGIN_DECLS
-int	_citrus_csmapper_open(struct _citrus_csmapper *__restrict *__restrict,
-			      const char *__restrict,
-			      const char *__restrict, uint32_t,
-			      unsigned long *);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/citrus_ctype.c b/lib/libc/citrus/citrus_ctype.c
deleted file mode 100644
index 0cac14117..000000000
--- a/lib/libc/citrus/citrus_ctype.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*	$NetBSD: citrus_ctype.c,v 1.7 2013/05/28 16:57:56 joerg Exp $	*/
-
-/*-
- * Copyright (c)1999, 2000, 2001, 2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_ctype.c,v 1.7 2013/05/28 16:57:56 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stddef.h>
-#include <wchar.h>
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_ctype_fallback.h"
-#include "citrus_none.h"
-#include _CITRUS_DEFAULT_CTYPE_HEADER
-
-_citrus_ctype_rec_t _citrus_ctype_default = {
-	&_CITRUS_DEFAULT_CTYPE_OPS,	/* cc_ops */
-	NULL,				/* cc_closure */
-	NULL				/* cc_module */
-};
-
-#ifdef _I18N_DYNAMIC
-
-static int _initctypemodule(_citrus_ctype_t, char const *, _citrus_module_t,
-			    void *, size_t, size_t);
-
-static int
-_initctypemodule(_citrus_ctype_t cc, char const *modname,
-		 _citrus_module_t handle, void *variable, size_t lenvar,
-		 size_t szpriv)
-{
-	int ret;
-	_citrus_ctype_getops_t getops;
-
-	_DIAGASSERT(cc != NULL);
-
-	cc->cc_module = handle;
-
-	getops = (_citrus_ctype_getops_t)_citrus_find_getops(cc->cc_module,
-							     modname,
-							     "ctype");
-	if (getops == NULL)
-		return (EINVAL);
-
-	cc->cc_ops = (_citrus_ctype_ops_rec_t *)malloc(sizeof(*cc->cc_ops));
-	if (cc->cc_ops == NULL)
-		return (ENOMEM);
-
-	ret = (*getops)(cc->cc_ops, sizeof(*cc->cc_ops),
-			_CITRUS_CTYPE_ABI_VERSION);
-	if (ret)
-		goto bad;
-
-	/* If return ABI version is not expected, fixup it here*/
-	switch (cc->cc_ops->co_abi_version) {
-	case 0x00000001:
-		cc->cc_ops->co_btowc = &_citrus_ctype_btowc_fallback;
-		cc->cc_ops->co_wctob = &_citrus_ctype_wctob_fallback;
-		/* FALLTHROUGH */
-	case 0x00000002:
-		cc->cc_ops->co_mbsnrtowcs = &_citrus_ctype_mbsnrtowcs_fallback;
-		cc->cc_ops->co_wcsnrtombs = &_citrus_ctype_wcsnrtombs_fallback;
-		/* FALLTHROUGH */
-	default:
-		break;
-	}
-
-	/* validation check */
-	if (cc->cc_ops->co_init == NULL ||
-	    cc->cc_ops->co_uninit == NULL ||
-	    cc->cc_ops->co_get_mb_cur_max == NULL ||
-	    cc->cc_ops->co_mblen == NULL ||
-	    cc->cc_ops->co_mbrlen == NULL ||
-	    cc->cc_ops->co_mbrtowc == NULL ||
-	    cc->cc_ops->co_mbsinit == NULL ||
-	    cc->cc_ops->co_mbsrtowcs == NULL ||
-	    cc->cc_ops->co_mbsnrtowcs == NULL ||
-	    cc->cc_ops->co_mbstowcs == NULL ||
-	    cc->cc_ops->co_mbtowc == NULL ||
-	    cc->cc_ops->co_wcrtomb == NULL ||
-	    cc->cc_ops->co_wcsrtombs == NULL ||
-	    cc->cc_ops->co_wcsnrtombs == NULL ||
-	    cc->cc_ops->co_wcstombs == NULL ||
-	    cc->cc_ops->co_wctomb == NULL ||
-	    cc->cc_ops->co_btowc == NULL ||
-	    cc->cc_ops->co_wctob == NULL) {
-		ret = EINVAL;
-		goto bad;
-	}
-
-	/* init and get closure */
-	ret = (*cc->cc_ops->co_init)(
-		&cc->cc_closure, variable, lenvar, szpriv);
-	if (ret)
-		goto bad;
-
-	return (0);
-
-bad:
-	if (cc->cc_ops)
-		free(cc->cc_ops);
-	cc->cc_ops = NULL;
-
-	return (ret);
-}
-
-int
-_citrus_ctype_open(_citrus_ctype_t *rcc,
-		   char const *encname, void *variable, size_t lenvar,
-		   size_t szpriv)
-{
-	int ret;
-	_citrus_module_t handle;
-	_citrus_ctype_t cc;
-
-	_DIAGASSERT(encname != NULL);
-	_DIAGASSERT(!lenvar || variable!=NULL);
-	_DIAGASSERT(rcc != NULL);
-
-	if (!strcmp(encname, _CITRUS_DEFAULT_CTYPE_NAME)) {
-		*rcc = &_citrus_ctype_default;
-		return (0);
-	}
-	ret = _citrus_load_module(&handle, encname);
-	if (ret)
-		return (ret);
-
-	cc = calloc(1, sizeof(*cc));
-	if (!cc) {
-		_citrus_unload_module(handle);
-		return (errno);
-	}
-
-	ret = _initctypemodule(cc, encname, handle, variable, lenvar, szpriv);
-	if (ret) {
-		_citrus_unload_module(cc->cc_module);
-		free(cc);
-		return (ret);
-	}
-
-	*rcc = cc;
-
-	return (0);
-}
-
-void
-_citrus_ctype_close(_citrus_ctype_t cc)
-{
-
-	_DIAGASSERT(cc != NULL);
-
-	if (cc == &_citrus_ctype_default)
-		return;
-	(*cc->cc_ops->co_uninit)(cc->cc_closure);
-	free(cc->cc_ops);
-	_citrus_unload_module(cc->cc_module);
-	free(cc);
-}
-
-#else
-/* !_I18N_DYNAMIC */
-
-int
-/*ARGSUSED*/
-_citrus_ctype_open(_citrus_ctype_t *rcc,
-		   char const *encname, void *variable, size_t lenvar,
-		   size_t szpriv)
-{
-	if (!strcmp(encname, _CITRUS_DEFAULT_CTYPE_NAME)) {
-		*rcc = &_citrus_ctype_default;
-		return (0);
-	}
-	return (EINVAL);
-}
-
-void
-/*ARGSUSED*/
-_citrus_ctype_close(_citrus_ctype_t cc)
-{
-}
-
-#endif
diff --git a/lib/libc/citrus/citrus_ctype.h b/lib/libc/citrus/citrus_ctype.h
deleted file mode 100644
index 3ece36487..000000000
--- a/lib/libc/citrus/citrus_ctype.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*	$NetBSD: citrus_ctype.h,v 1.3 2013/05/28 16:57:56 joerg Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef _CITRUS_CTYPE_H_
-#define _CITRUS_CTYPE_H_
-
-#include "citrus_ctype_local.h"
-
-typedef struct _citrus_ctype_rec *_citrus_ctype_t;
-
-__BEGIN_DECLS
-int _citrus_ctype_open(_citrus_ctype_t * __restrict,
-		       char const * __restrict, void * __restrict,
-		       size_t, size_t);
-void _citrus_ctype_close(_citrus_ctype_t);
-__END_DECLS
-
-static __inline unsigned
-_citrus_ctype_get_mb_cur_max(_citrus_ctype_t cc)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops);
-	return (*cc->cc_ops->co_get_mb_cur_max)(cc->cc_closure);
-}
-
-static __inline int
-_citrus_ctype_mblen(_citrus_ctype_t cc, const char *s, size_t n, int *nresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_mblen && nresult);
-	return (*cc->cc_ops->co_mblen)(cc->cc_closure, s, n, nresult);
-}
-
-static __inline int
-_citrus_ctype_mbrlen(_citrus_ctype_t cc, const char *s, size_t n,
-		     void *pspriv, size_t *nresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_mbrlen && nresult);
-	return (*cc->cc_ops->co_mbrlen)(cc->cc_closure, s, n, pspriv, nresult);
-}
-
-static __inline int
-_citrus_ctype_mbrtowc(_citrus_ctype_t cc, wchar_t *pwc, const char *s,
-		      size_t n, void *pspriv, size_t *nresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_mbrtowc);
-	return (*cc->cc_ops->co_mbrtowc)(cc->cc_closure, pwc, s, n, pspriv,
-					 nresult);
-}
-
-static __inline int
-_citrus_ctype_mbsinit(_citrus_ctype_t cc, void const *pspriv, int *nresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_mbsinit && nresult);
-	return (*cc->cc_ops->co_mbsinit)(cc->cc_closure, pspriv, nresult);
-}
-
-static __inline int
-_citrus_ctype_mbsrtowcs(_citrus_ctype_t cc, wchar_t *pwcs, const char **s,
-			size_t n, void *pspriv, size_t *nresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_mbsrtowcs && nresult);
-	return (*cc->cc_ops->co_mbsrtowcs)(cc->cc_closure, pwcs, s, n, pspriv,
-					   nresult);
-}
-
-static __inline int
-_citrus_ctype_mbsnrtowcs(_citrus_ctype_t cc, wchar_t *pwcs, const char **s,
-			size_t in, size_t n, void *pspriv, size_t *nresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_mbsnrtowcs && nresult);
-	return (*cc->cc_ops->co_mbsnrtowcs)(cc, pwcs, s, in, n,
-					   pspriv, nresult);
-}
-
-static __inline int
-_citrus_ctype_mbstowcs(_citrus_ctype_t cc, wchar_t *pwcs, const char *s,
-		       size_t n, size_t *nresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_mbstowcs && nresult);
-	return (*cc->cc_ops->co_mbstowcs)(cc->cc_closure, pwcs, s, n, nresult);
-}
-
-static __inline int
-_citrus_ctype_mbtowc(_citrus_ctype_t cc, wchar_t *pw, const char *s, size_t n,
-		     int *nresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_mbtowc && nresult);
-	return (*cc->cc_ops->co_mbtowc)(cc->cc_closure, pw, s, n, nresult);
-}
-
-static __inline int
-_citrus_ctype_wcrtomb(_citrus_ctype_t cc, char *s, wchar_t wc,
-		      void *pspriv, size_t *nresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_wcrtomb && nresult);
-	return (*cc->cc_ops->co_wcrtomb)(cc->cc_closure, s, wc, pspriv,
-					 nresult);
-}
-
-static __inline int
-_citrus_ctype_wcsrtombs(_citrus_ctype_t cc, char *s, const wchar_t **ppwcs,
-			size_t n, void *pspriv, size_t *nresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_wcsrtombs && nresult);
-	return (*cc->cc_ops->co_wcsrtombs)(cc->cc_closure, s, ppwcs, n,
-					   pspriv, nresult);
-}
-
-static __inline int
-_citrus_ctype_wcsnrtombs(_citrus_ctype_t cc, char *s, const wchar_t **ppwcs,
-			size_t in, size_t n, void *pspriv, size_t *nresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_wcsnrtombs && nresult);
-	return (*cc->cc_ops->co_wcsnrtombs)(cc, s, ppwcs, in, n,
-					   pspriv, nresult);
-}
-
-static __inline int
-_citrus_ctype_wcstombs(_citrus_ctype_t cc, char *s, const wchar_t *wcs,
-		       size_t n, size_t *nresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_wcstombs && nresult);
-	return (*cc->cc_ops->co_wcstombs)(cc->cc_closure, s, wcs, n, nresult);
-}
-
-static __inline int
-_citrus_ctype_wctomb(_citrus_ctype_t cc, char *s, wchar_t wc, int *nresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_wctomb && nresult);
-	return (*cc->cc_ops->co_wctomb)(cc->cc_closure, s, wc, nresult);
-}
-
-static __inline int
-_citrus_ctype_btowc(_citrus_ctype_t cc, int c, wint_t *wcresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_btowc && wcresult);
-	return (*cc->cc_ops->co_btowc)(cc, c, wcresult);
-}
-
-static __inline int
-_citrus_ctype_wctob(_citrus_ctype_t cc, wint_t c, int *cresult)
-{
-
-	_DIAGASSERT(cc && cc->cc_ops && cc->cc_ops->co_wctob && cresult);
-	return (*cc->cc_ops->co_wctob)(cc, c, cresult);
-}
-
-extern _citrus_ctype_rec_t _citrus_ctype_default;
-
-#endif
diff --git a/lib/libc/citrus/citrus_ctype_fallback.c b/lib/libc/citrus/citrus_ctype_fallback.c
deleted file mode 100644
index 860fa55d2..000000000
--- a/lib/libc/citrus/citrus_ctype_fallback.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*	$NetBSD: citrus_ctype_fallback.c,v 1.3 2013/05/28 16:57:56 joerg Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_ctype_fallback.c,v 1.3 2013/05/28 16:57:56 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#include <wchar.h>
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
-
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_ctype_fallback.h"
-
-/*
- * for ABI version >= 0x00000002
- */ 
-
-int
-_citrus_ctype_btowc_fallback(_citrus_ctype_rec_t * __restrict cc,
-			     int c, wint_t * __restrict wcresult)
-{
-	char mb;
-	/*
-	 * what we need is _PRIVSIZE
-	 * and we know that it's smaller than sizeof(mbstate_t).
-	 */
-	char pspriv[sizeof(mbstate_t)];
-	wchar_t wc;
-	size_t nr;
-	int err;
-
-	_DIAGASSERT(cc != NULL && cc->cc_closure != NULL);
-
-	if (c == EOF) {
-		*wcresult = WEOF;
-		return 0;
-	}
-
-	memset(&pspriv, 0, sizeof(pspriv));
-	mb = (char)(unsigned)c;
-	err = _citrus_ctype_mbrtowc(cc, &wc, &mb, 1, (void *)&pspriv, &nr);
-	if (!err && (nr == 0 || nr == 1))
-		*wcresult = wc;
-	else
-		*wcresult = WEOF;
-
-	return 0;
-}
-
-int
-_citrus_ctype_wctob_fallback(_citrus_ctype_rec_t * __restrict cc,
-			     wint_t wc, int * __restrict cresult)
-{
-	/*
-	 * what we need is _PRIVSIZE
-	 * and we know that it's smaller than sizeof(mbstate_t).
-	 */
-	char pspriv[sizeof(mbstate_t)];
-	char buf[MB_LEN_MAX];
-	size_t nr;
-	int err;
-
-	_DIAGASSERT(cc != NULL && cc->cc_closure != NULL);
-
-	if (wc == WEOF) {
-		*cresult = EOF;
-		return 0;
-	}
-	memset(&pspriv, 0, sizeof(pspriv));
-	err = _citrus_ctype_wcrtomb(cc, buf, (wchar_t)wc, (void *)&pspriv, &nr);
-	if (!err && nr == 1)
-		*cresult = buf[0];
-	else
-		*cresult = EOF;
-
-	return 0;
-}
-
-/*
- * for ABI version >= 0x00000003
- */ 
-
-int
-_citrus_ctype_mbsnrtowcs_fallback(_citrus_ctype_rec_t * __restrict cc,
-    wchar_t * __restrict pwcs, const char ** __restrict s, size_t in,
-    size_t n, void * __restrict psenc, size_t * __restrict nresult)
-{
-	int err;
-	size_t cnt, siz;
-	const char *s0, *se;
-
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(*s != NULL);
-
-	/* if pwcs is NULL, ignore n */
-	if (pwcs == NULL)
-		n = 1; /* arbitrary >0 value */
-
-	err = 0;
-	cnt = 0;
-	se = *s + in;
-	s0 = *s; /* to keep *s unchanged for now, use copy instead. */
-	while (s0 < se && n > 0) {
-		err = _citrus_ctype_mbrtowc(cc, pwcs, s0, (size_t)(se - s0),
-		    psenc, &siz);
-		if (err) {
-			cnt = (size_t)-1;
-			goto bye;
-		}
-		if (siz == (size_t)-2) {
-			s0 = se;
-			goto bye;
-		}
-		switch (siz) {
-		case 0:
-			if (pwcs) {
-				size_t dum;
-				_citrus_ctype_mbrtowc(cc, NULL, NULL, 0, psenc,
-				    &dum);
-			}
-			s0 = 0;
-			goto bye;
-		default:
-			if (pwcs) {
-				pwcs++;
-				n--;
-			}
-			s0 += siz;
-			cnt++;
-			break;
-		}
-	}
-bye:
-	if (pwcs)
-		*s = s0;
-
-	*nresult = cnt;
-
-	return err;
-}
-
-int
-_citrus_ctype_wcsnrtombs_fallback(_citrus_ctype_rec_t * __restrict cc,
-    char * __restrict s, const wchar_t ** __restrict pwcs, size_t in,
-    size_t n, void * __restrict psenc, size_t * __restrict nresult)
-{
-	size_t cnt = 0;
-	int err;
-	char buf[MB_LEN_MAX];
-	size_t siz;
-	const wchar_t* pwcs0;
-	mbstate_t state;
-
-	pwcs0 = *pwcs;
-
-	if (!s)
-		n = 1;
-
-	while (in > 0 && n > 0) {
-		memcpy(&state, psenc, sizeof(state));
-		err = _citrus_ctype_wcrtomb(cc, buf, *pwcs0, psenc, &siz);
-		if (siz == (size_t)-1) {
-			*nresult = siz;
-			return (err);
-		}
-
-		if (s) {
-			if (n < siz) {
-				memcpy(psenc, &state, sizeof(state));
-				break;
-			}
-			memcpy(s, buf, siz);
-			s += siz;
-			n -= siz;
-		}
-		cnt += siz;
-		if (!*pwcs0) {
-			if (s) {
-				memset(psenc, 0, sizeof(state));
-			}
-			pwcs0 = 0;
-			cnt--; /* don't include terminating null */
-			break;
-		}
-		pwcs0++;
-		--in;
-	}
-	if (s)
-		*pwcs = pwcs0;
-
-	*nresult = cnt;
-	return (0);
-}
diff --git a/lib/libc/citrus/citrus_ctype_fallback.h b/lib/libc/citrus/citrus_ctype_fallback.h
deleted file mode 100644
index e760cef3c..000000000
--- a/lib/libc/citrus/citrus_ctype_fallback.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: citrus_ctype_fallback.h,v 1.2 2013/05/28 16:57:56 joerg Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_CTYPE_FALLBACK_H_
-#define _CITRUS_CTYPE_FALLBACK_H_
-
-/* fallback functions for 0x00000002 */
-int _citrus_ctype_btowc_fallback(_citrus_ctype_rec_t * __restrict,
-				 int, wint_t * __restrict);
-int _citrus_ctype_wctob_fallback(_citrus_ctype_rec_t * __restrict,
-				 wint_t, int * __restrict);
-
-/* fallback functions for 0x00000003 */
-int _citrus_ctype_mbsnrtowcs_fallback(_citrus_ctype_rec_t * __restrict,
-				      wchar_t * __restrict,
-				      const char ** __restrict, size_t,
-				      size_t, void * __restrict,
-				      size_t * __restrict);
-int _citrus_ctype_wcsnrtombs_fallback(_citrus_ctype_rec_t * __restrict,
-				     char * __restrict,
-				     const wchar_t ** __restrict, size_t,
-				     size_t, void * __restrict,
-				     size_t * __restrict);
-
-#endif
diff --git a/lib/libc/citrus/citrus_ctype_local.h b/lib/libc/citrus/citrus_ctype_local.h
deleted file mode 100644
index cd3e76afb..000000000
--- a/lib/libc/citrus/citrus_ctype_local.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*	$NetBSD: citrus_ctype_local.h,v 1.4 2013/05/28 16:57:56 joerg Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef _CITRUS_CTYPE_LOCAL_H_
-#define _CITRUS_CTYPE_LOCAL_H_
-
-#define _CITRUS_CTYPE_GETOPS_FUNC_BASE(_n_)				\
-int _n_(_citrus_ctype_ops_rec_t *, size_t, uint32_t)
-#define _CITRUS_CTYPE_GETOPS_FUNC(_n_)					\
-_CITRUS_CTYPE_GETOPS_FUNC_BASE(_citrus_##_n_##_ctype_getops)
-
-#define _CITRUS_CTYPE_DECLS(_e_)					      \
-static int	_citrus_##_e_##_ctype_init				      \
-	(void ** __restrict, void * __restrict, size_t, size_t);	      \
-static void	_citrus_##_e_##_ctype_uninit(void *);			      \
-static unsigned	_citrus_##_e_##_ctype_get_mb_cur_max(void *);		      \
-static int	_citrus_##_e_##_ctype_mblen(void * __restrict,		      \
-				     const char * __restrict,		      \
-				     size_t, int * __restrict);		      \
-static int	_citrus_##_e_##_ctype_mbrlen(void * __restrict,		      \
-				      const char * __restrict,		      \
-				      size_t, void * __restrict,	      \
-				      size_t * __restrict);		      \
-static int	_citrus_##_e_##_ctype_mbrtowc(void * __restrict,	      \
-				       wchar_t * __restrict,		      \
-				       const char * __restrict, size_t,	      \
-				       void * __restrict,		      \
-				       size_t * __restrict);		      \
-static int	_citrus_##_e_##_ctype_mbsinit(void * __restrict,	      \
-				       void const * __restrict,		      \
-				       int * __restrict);		      \
-static int	_citrus_##_e_##_ctype_mbsrtowcs(void * __restrict,	      \
-					 wchar_t * __restrict,		      \
-					 const char ** __restrict,	      \
-					 size_t, void * __restrict,	      \
-					 size_t * __restrict);		      \
-static int	_citrus_##_e_##_ctype_mbsnrtowcs(_citrus_ctype_rec_t * __restrict, \
-					 wchar_t * __restrict,		      \
-					 const char ** __restrict,	      \
-					 size_t, size_t, void * __restrict,   \
-					 size_t * __restrict);		      \
-static int	_citrus_##_e_##_ctype_mbstowcs(void * __restrict,	      \
-					wchar_t * __restrict,		      \
-					const char * __restrict,	      \
-					size_t, size_t * __restrict);	      \
-static int	_citrus_##_e_##_ctype_mbtowc(void * __restrict,		      \
-				      wchar_t * __restrict,		      \
-				      const char * __restrict,		      \
-				      size_t, int * __restrict);	      \
-static int	_citrus_##_e_##_ctype_wcrtomb(void * __restrict,	      \
-				       char * __restrict, wchar_t,	      \
-				       void * __restrict,		      \
-				       size_t * __restrict);		      \
-static int	_citrus_##_e_##_ctype_wcsrtombs(void * __restrict,	      \
-					 char * __restrict,		      \
-					 const wchar_t ** __restrict,	      \
-					 size_t, void * __restrict,	      \
-					 size_t * __restrict);		      \
-static int	_citrus_##_e_##_ctype_wcsnrtombs(_citrus_ctype_rec_t * __restrict, \
-					 char * __restrict,		      \
-					 const wchar_t ** __restrict,	      \
-					 size_t, size_t, void * __restrict,   \
-					 size_t * __restrict);		      \
-static int	_citrus_##_e_##_ctype_wcstombs(void * __restrict,	      \
-					char * __restrict,		      \
-					const wchar_t * __restrict,	      \
-					size_t, size_t * __restrict);	      \
-static int	_citrus_##_e_##_ctype_wctomb(void * __restrict,		      \
-				      char * __restrict,		      \
-				      wchar_t, int * __restrict);	      \
-static int	_citrus_##_e_##_ctype_btowc(_citrus_ctype_rec_t * __restrict, \
-				      int, wint_t * __restrict);	      \
-static int	_citrus_##_e_##_ctype_wctob(_citrus_ctype_rec_t * __restrict, \
-				      wint_t, int * __restrict)
-
-#define _CITRUS_CTYPE_DEF_OPS(_e_)					\
-_citrus_ctype_ops_rec_t _citrus_##_e_##_ctype_ops = {			\
-	/* co_abi_version */	_CITRUS_CTYPE_ABI_VERSION,		\
-	/* co_init */		&_citrus_##_e_##_ctype_init,		\
-	/* co_uninit */		&_citrus_##_e_##_ctype_uninit,		\
-	/* co_get_mb_cur_max */	&_citrus_##_e_##_ctype_get_mb_cur_max,	\
-	/* co_mblen */		&_citrus_##_e_##_ctype_mblen,		\
-	/* co_mbrlen */		&_citrus_##_e_##_ctype_mbrlen,		\
-	/* co_mbrtowc */	&_citrus_##_e_##_ctype_mbrtowc,		\
-	/* co_mbsinit */	&_citrus_##_e_##_ctype_mbsinit,		\
-	/* co_mbsrtowcs */	&_citrus_##_e_##_ctype_mbsrtowcs,	\
-	/* co_mbstowcs */	&_citrus_##_e_##_ctype_mbstowcs,	\
-	/* co_mbtowc */		&_citrus_##_e_##_ctype_mbtowc,		\
-	/* co_wcrtomb */	&_citrus_##_e_##_ctype_wcrtomb,		\
-	/* co_wcsrtombs */	&_citrus_##_e_##_ctype_wcsrtombs,	\
-	/* co_wcstombs */	&_citrus_##_e_##_ctype_wcstombs,	\
-	/* co_wctomb */		&_citrus_##_e_##_ctype_wctomb,		\
-	/* co_btowc */		&_citrus_##_e_##_ctype_btowc,		\
-	/* co_wctob */		&_citrus_##_e_##_ctype_wctob,		\
-	/* co_mbsnrtowcs */	&_citrus_##_e_##_ctype_mbsnrtowcs,	\
-	/* co_wcsnrtombs */	&_citrus_##_e_##_ctype_wcsnrtombs,	\
-}
-
-typedef struct _citrus_ctype_ops_rec	_citrus_ctype_ops_rec_t;
-typedef struct _citrus_ctype_rec	_citrus_ctype_rec_t;
-
-typedef int	(*_citrus_ctype_init_t)
-	(void ** __restrict, void * __restrict, size_t, size_t);
-typedef void	(*_citrus_ctype_uninit_t)(void *);
-typedef unsigned (*_citrus_ctype_get_mb_cur_max_t)(void *);
-typedef int	(*_citrus_ctype_mblen_t)
-	(void * __restrict, const char * __restrict, size_t, int * __restrict);
-typedef int	(*_citrus_ctype_mbrlen_t)
-	(void * __restrict, const char * __restrict, size_t,
-	 void * __restrict, size_t * __restrict);
-typedef int	(*_citrus_ctype_mbrtowc_t)
-	(void * __restrict, wchar_t * __restrict, const char * __restrict,
-	 size_t, void * __restrict, size_t * __restrict);
-typedef int	(*_citrus_ctype_mbsinit_t)
-	(void * __restrict, const void * __restrict, int * __restrict);
-typedef int	(*_citrus_ctype_mbsrtowcs_t)
-	(void * __restrict, wchar_t * __restrict, const char ** __restrict,
-	 size_t, void * __restrict, size_t * __restrict);
-typedef int	(*_citrus_ctype_mbsnrtowcs_t)
-	(_citrus_ctype_rec_t * __restrict, wchar_t * __restrict,
-	 const char ** __restrict, size_t, size_t, void * __restrict,
-	 size_t * __restrict);
-typedef int	(*_citrus_ctype_mbstowcs_t)
-	(void * __restrict, wchar_t * __restrict, const char * __restrict,
-	 size_t, size_t * __restrict);
-typedef int	(*_citrus_ctype_mbtowc_t)
-	(void * __restrict, wchar_t * __restrict, const char * __restrict,
-	 size_t, int * __restrict);
-typedef int	(*_citrus_ctype_wcrtomb_t)
-	(void * __restrict, char * __restrict, wchar_t, void * __restrict,
-	 size_t * __restrict);
-typedef int	(*_citrus_ctype_wcsrtombs_t)
-	(void * __restrict, char * __restrict, const wchar_t ** __restrict,
-	 size_t, void * __restrict, size_t * __restrict);
-typedef int	(*_citrus_ctype_wcsnrtombs_t)
-	(_citrus_ctype_rec_t * __restrict, char * __restrict,
-	 const wchar_t ** __restrict, size_t, size_t, void * __restrict,
-	 size_t * __restrict);
-typedef int	(*_citrus_ctype_wcstombs_t)
-	(void * __restrict, char * __restrict, const wchar_t * __restrict,
-	 size_t, size_t * __restrict);
-typedef int	(*_citrus_ctype_wctomb_t)
-	(void * __restrict, char * __restrict, wchar_t, int * __restrict);
-typedef int	(*_citrus_ctype_btowc_t)
-	(_citrus_ctype_rec_t * __restrict, int, wint_t * __restrict);
-typedef int	(*_citrus_ctype_wctob_t)
-	(_citrus_ctype_rec_t * __restrict, wint_t, int * __restrict);
-#include "citrus_ctype_fallback.h"
-
-/*
- * ABI Version change log:
- *   0x00000001
- *     initial version
- *   0x00000002
- *     ops record:	btowc and wctob added.
- *     ctype record:	unchanged.
- *   0x00000003
- *     ops record:	mbsnrtowcs and wcsnrtombs added.
- *     ctype record:	unchanged.
- */
-#define _CITRUS_CTYPE_ABI_VERSION	0x00000003
-struct _citrus_ctype_ops_rec {
-	uint32_t			co_abi_version;
-	/* version 0x00000001 */
-	_citrus_ctype_init_t		co_init;
-	_citrus_ctype_uninit_t		co_uninit;
-	_citrus_ctype_get_mb_cur_max_t	co_get_mb_cur_max;
-	_citrus_ctype_mblen_t		co_mblen;
-	_citrus_ctype_mbrlen_t		co_mbrlen;
-	_citrus_ctype_mbrtowc_t		co_mbrtowc;
-	_citrus_ctype_mbsinit_t		co_mbsinit;
-	_citrus_ctype_mbsrtowcs_t	co_mbsrtowcs;
-	_citrus_ctype_mbstowcs_t	co_mbstowcs;
-	_citrus_ctype_mbtowc_t		co_mbtowc;
-	_citrus_ctype_wcrtomb_t		co_wcrtomb;
-	_citrus_ctype_wcsrtombs_t	co_wcsrtombs;
-	_citrus_ctype_wcstombs_t	co_wcstombs;
-	_citrus_ctype_wctomb_t		co_wctomb;
-	/* version 0x00000002 */
-	_citrus_ctype_btowc_t		co_btowc;
-	_citrus_ctype_wctob_t		co_wctob;
-	/* version 0x00000003 */
-	_citrus_ctype_mbsnrtowcs_t	co_mbsnrtowcs;
-	_citrus_ctype_wcsnrtombs_t	co_wcsnrtombs;
-};
-
-#define _CITRUS_DEFAULT_CTYPE_NAME	"NONE"
-#define _CITRUS_DEFAULT_CTYPE_OPS	_citrus_NONE_ctype_ops
-#define _CITRUS_DEFAULT_CTYPE_HEADER	"citrus_none.h"
-
-typedef _CITRUS_CTYPE_GETOPS_FUNC_BASE((*_citrus_ctype_getops_t));
-struct _citrus_ctype_rec {
-	_citrus_ctype_ops_rec_t	*cc_ops;
-	void			*cc_closure;
-	_citrus_module_t	cc_module;
-};
-
-#endif
diff --git a/lib/libc/citrus/citrus_ctype_template.h b/lib/libc/citrus/citrus_ctype_template.h
deleted file mode 100644
index 1f0c6ecd9..000000000
--- a/lib/libc/citrus/citrus_ctype_template.h
+++ /dev/null
@@ -1,934 +0,0 @@
-/*	$NetBSD: citrus_ctype_template.h,v 1.36 2013/05/28 16:57:56 joerg Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-
-/*
- * CAUTION: THIS IS NOT STANDALONE FILE
- *
- * function templates of ctype encoding handler for each encodings.
- *
- * you need to define the macros below:
- *
- *   _FUNCNAME(method) :
- *     It should convine the real function name for the method.
- *      e.g. _FUNCNAME(mbrtowc) should be expanded to
- *             _EUC_ctype_mbrtowc
- *           for EUC locale.
- *
- *   _CEI_TO_STATE(cei, method) :
- *     It should be expanded to the pointer of the method-internal state
- *     structures.
- *     e.g. _CEI_TO_STATE(cei, mbrtowc) might be expanded to
- *             (cei)->states.s_mbrtowc
- *     This structure may use if the function is called as
- *           mbrtowc(&wc, s, n, NULL);
- *     Such individual structures are needed by:
- *           mblen
- *           mbrlen
- *           mbrtowc
- *           mbtowc
- *           mbsrtowcs
- *           mbsnrtowcs
- *           wcrtomb
- *           wcsrtombs
- *           wcsnrtombs
- *           wctomb
- *     These need to be keeped in the ctype encoding information structure,
- *     pointed by "cei".
- *
- *   _ENCODING_INFO :
- *     It should be expanded to the name of the encoding information structure.
- *     e.g. For EUC encoding, this macro is expanded to _EUCInfo.
- *     Encoding information structure need to contain the common informations
- *     for the codeset.
- *
- *   _ENCODING_STATE :
- *     It should be expanded to the name of the encoding state structure.
- *     e.g. For EUC encoding, this macro is expanded to _EUCState.
- *     Encoding state structure need to contain the context-dependent states,
- *     which are "unpacked-form" of mbstate_t type and keeped during sequent
- *     calls of mb/wc functions,
- *
- *   _ENCODING_IS_STATE_DEPENDENT :
- *     If the encoding is state dependent, this should be expanded to
- *     non-zero integral value.  Otherwise, 0.
- *
- *   _STATE_NEEDS_EXPLICIT_INIT(ps) :
- *     some encodings, states needs some explicit initialization.
- *     (ie. initialization with memset isn't enough.)
- *     If the encoding state pointed by "ps" needs to be initialized
- *     explicitly, return non-zero. Otherwize, 0.
- *
- */
-
-
-/* prototypes */
-
-__BEGIN_DECLS
-static void _FUNCNAME(init_state)(_ENCODING_INFO * __restrict,
-				  _ENCODING_STATE * __restrict);
-static void _FUNCNAME(pack_state)(_ENCODING_INFO * __restrict,
-				  void * __restrict,
-				  const _ENCODING_STATE * __restrict);
-static void _FUNCNAME(unpack_state)(_ENCODING_INFO * __restrict,
-				    _ENCODING_STATE * __restrict,
-				    const void * __restrict);
-#if _ENCODING_IS_STATE_DEPENDENT
-static int _FUNCNAME(put_state_reset)(_ENCODING_INFO * __restrict,
-				      char * __restrict, size_t,
-				      _ENCODING_STATE * __restrict,
-				      size_t * __restrict);
-#endif
-
-/*
- * standard form of mbrtowc_priv.
- *
- * note (differences from real mbrtowc):
- *   - 3rd parameter is not "const char *s" but "const char **s".
- *     after the call of the function, *s will point the first byte of
- *     the next character.
- *   - additional 4th parameter is the size of src buffer.
- *   - 5th parameter is unpacked encoding-dependent state structure.
- *   - additional 6th parameter is the storage to be stored
- *     the return value in the real mbrtowc context.
- *   - return value means "errno" in the real mbrtowc context.
- */
-
-static int _FUNCNAME(mbrtowc_priv)(_ENCODING_INFO * __restrict,
-				   wchar_t * __restrict,
-				   const char ** __restrict,
-				   size_t, _ENCODING_STATE * __restrict,
-				   size_t * __restrict);
-
-/*
- * standard form of wcrtomb_priv.
- *
- * note (differences from real wcrtomb):
- *   - additional 3th parameter is the size of src buffer.
- *   - 5th parameter is unpacked encoding-dependent state structure.
- *   - additional 6th parameter is the storage to be stored
- *     the return value in the real mbrtowc context.
- *   - return value means "errno" in the real wcrtomb context.
- *   - caller should ensure that 2nd parameter isn't NULL.
- *     (XXX inconsist with mbrtowc_priv)
- */
-
-static int _FUNCNAME(wcrtomb_priv)(_ENCODING_INFO * __restrict,
-				   char * __restrict, size_t, wchar_t,
-				   _ENCODING_STATE * __restrict,
-				   size_t * __restrict);
-__END_DECLS
-
-
-/*
- * macros
- */
-
-#define _TO_CEI(_cl_)	((_CTYPE_INFO*)(_cl_))
-
-
-/*
- * templates
- */
-
-/* internal routines */
-
-static __inline int
-_FUNCNAME(mbtowc_priv)(_ENCODING_INFO * __restrict ei,
-		       wchar_t * __restrict pwc,  const char * __restrict s,
-		       size_t n, _ENCODING_STATE * __restrict psenc,
-		       int * __restrict nresult)
-{
-	_ENCODING_STATE state;
-	size_t nr;
-	int err = 0;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	if (s == NULL) {
-		_FUNCNAME(init_state)(ei, psenc);
-		*nresult = _ENCODING_IS_STATE_DEPENDENT;
-		return (0);
-	}
-
-	state = *psenc;
-	err = _FUNCNAME(mbrtowc_priv)(ei, pwc, (const char **)&s, n, psenc, &nr);
-	if (nr == (size_t)-2)
-		err = EILSEQ;
-	if (err) {
-		/* In error case, we should restore the state. */
-		*psenc = state;
-		*nresult = -1;
-		return (err);
-	}
-
-	*nresult = (int)nr;
-
-	return (0);
-}
-
-static int
-_FUNCNAME(mbsrtowcs_priv)(_ENCODING_INFO * __restrict ei,
-			  wchar_t * __restrict pwcs,
-			  const char ** __restrict s,
-			  size_t n, _ENCODING_STATE * __restrict psenc,
-			  size_t * __restrict nresult)
-{
-	int err, cnt;
-	size_t siz;
-	const char *s0;
-	size_t mbcurmax;
-
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(*s != NULL);
-
-	/* if pwcs is NULL, ignore n */
-	if (pwcs == NULL)
-		n = 1; /* arbitrary >0 value */
-
-	err = cnt = 0;
-	s0 = *s; /* to keep *s unchanged for now, use copy instead. */
-	mbcurmax = _ENCODING_MB_CUR_MAX(ei);
-	while (n > 0) {
-		err = _FUNCNAME(mbrtowc_priv)(ei, pwcs, &s0, mbcurmax,
-					      psenc, &siz);
-		if (siz == (size_t)-2)
-			err = EILSEQ;
-		if (err) {
-			cnt = -1;
-			goto bye;
-		}
-		switch (siz) {
-		case 0:
-			if (pwcs) {
-				_FUNCNAME(init_state)(ei, psenc);
-			}
-			s0 = 0;
-			goto bye;
-		default:
-			if (pwcs) {
-				pwcs++;
-				n--;
-			}
-			cnt++;
-			break;
-		}
-	}
-bye:
-	if (pwcs)
-		*s = s0;
-
-	*nresult = (size_t)cnt;
-
-	return err;
-}
-
-static int
-_FUNCNAME(mbsnrtowcs_priv)(_ENCODING_INFO * __restrict ei,
-			  wchar_t * __restrict pwcs,
-			  const char ** __restrict s, size_t in,
-			  size_t n, _ENCODING_STATE * __restrict psenc,
-			  size_t * __restrict nresult)
-{
-	int err;
-	size_t cnt, siz;
-	const char *s0, *se;
-
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(*s != NULL);
-
-	/* if pwcs is NULL, ignore n */
-	if (pwcs == NULL)
-		n = 1; /* arbitrary >0 value */
-
-	err = 0;
-	cnt = 0;
-	se = *s + in;
-	s0 = *s; /* to keep *s unchanged for now, use copy instead. */
-	while (s0 < se && n > 0) {
-		err = _FUNCNAME(mbrtowc_priv)(ei, pwcs, &s0, se - s0,
-					      psenc, &siz);
-		if (err) {
-			cnt = (size_t)-1;
-			goto bye;
-		}
-		if (siz == (size_t)-2) {
-			s0 = se;
-			goto bye;
-		}
-		switch (siz) {
-		case 0:
-			if (pwcs) {
-				_FUNCNAME(init_state)(ei, psenc);
-			}
-			s0 = 0;
-			goto bye;
-		default:
-			if (pwcs) {
-				pwcs++;
-				n--;
-			}
-			cnt++;
-			break;
-		}
-	}
-bye:
-	if (pwcs)
-		*s = s0;
-
-	*nresult = cnt;
-
-	return err;
-}
-
-static int
-_FUNCNAME(wcsrtombs_priv)(_ENCODING_INFO * __restrict ei, char * __restrict s,
-			  const wchar_t ** __restrict pwcs,
-			  size_t n, _ENCODING_STATE * __restrict psenc,
-			  size_t * __restrict nresult)
-{
-	int err;
-	char buf[MB_LEN_MAX];
-	size_t cnt, siz;
-	const wchar_t* pwcs0;
-#if _ENCODING_IS_STATE_DEPENDENT
-	_ENCODING_STATE state;
-#endif
-
-	pwcs0 = *pwcs;
-
-	cnt = 0;
-	if (!s)
-		n = 1;
-
-	while (n > 0) {
-#if _ENCODING_IS_STATE_DEPENDENT
-		state = *psenc;
-#endif
-		err = _FUNCNAME(wcrtomb_priv)(ei, buf, sizeof(buf),
-					      *pwcs0, psenc, &siz);
-		if (siz == (size_t)-1) {
-			*nresult = siz;
-			return (err);
-		}
-
-		if (s) {
-			if (n < siz) {
-#if _ENCODING_IS_STATE_DEPENDENT
-				*psenc = state;
-#endif
-				break;
-			}
-			memcpy(s, buf, siz);
-			s += siz;
-			n -= siz;
-		}
-		cnt += siz;
-		if (!*pwcs0) {
-			if (s) {
-				_FUNCNAME(init_state)(ei, psenc);
-			}
-			pwcs0 = 0;
-			cnt--; /* don't include terminating null */
-			break;
-		}
-		pwcs0++;
-	}
-	if (s)
-		*pwcs = pwcs0;
-
-	*nresult = cnt;
-	return (0);
-}
-
-static int
-_FUNCNAME(wcsnrtombs_priv)(_ENCODING_INFO * __restrict ei, char * __restrict s,
-			  const wchar_t ** __restrict pwcs, size_t in,
-			  size_t n, _ENCODING_STATE * __restrict psenc,
-			  size_t * __restrict nresult)
-{
-	int cnt = 0, err;
-	char buf[MB_LEN_MAX];
-	size_t siz;
-	const wchar_t* pwcs0;
-#if _ENCODING_IS_STATE_DEPENDENT
-	_ENCODING_STATE state;
-#endif
-
-	pwcs0 = *pwcs;
-
-	if (!s)
-		n = 1;
-
-	while (in > 0 && n > 0) {
-#if _ENCODING_IS_STATE_DEPENDENT
-		state = *psenc;
-#endif
-		err = _FUNCNAME(wcrtomb_priv)(ei, buf, sizeof(buf),
-					      *pwcs0, psenc, &siz);
-		if (siz == (size_t)-1) {
-			*nresult = siz;
-			return (err);
-		}
-
-		if (s) {
-			if (n < siz) {
-#if _ENCODING_IS_STATE_DEPENDENT
-				*psenc = state;
-#endif
-				break;
-			}
-			memcpy(s, buf, siz);
-			s += siz;
-			n -= siz;
-		}
-		cnt += siz;
-		if (!*pwcs0) {
-			if (s) {
-				_FUNCNAME(init_state)(ei, psenc);
-			}
-			pwcs0 = 0;
-			cnt--; /* don't include terminating null */
-			break;
-		}
-		pwcs0++;
-		--in;
-	}
-	if (s)
-		*pwcs = pwcs0;
-
-	*nresult = (size_t)cnt;
-	return (0);
-}
-
-
-/* ----------------------------------------------------------------------
- * templates for public functions
- */
-
-#define _RESTART_BEGIN(_func_, _cei_, _pspriv_, _pse_)			\
-do {									\
-	_ENCODING_STATE _state;						\
-	do {								\
-		if (_pspriv_ == NULL) {					\
-			_pse_ = &_CEI_TO_STATE(_cei_, _func_);		\
-			if (_STATE_NEEDS_EXPLICIT_INIT(_pse_))		\
-			    _FUNCNAME(init_state)(_CEI_TO_EI(_cei_),	\
-							(_pse_));	\
-		} else {						\
-			_pse_ = &_state;				\
-			_FUNCNAME(unpack_state)(_CEI_TO_EI(_cei_),	\
-						_pse_, _pspriv_);	\
-		}							\
-	} while (/*CONSTCOND*/0)
-
-#define _RESTART_END(_func_, _cei_, _pspriv_, _pse_)			\
-	if (_pspriv_ != NULL) {						\
-		_FUNCNAME(pack_state)(_CEI_TO_EI(_cei_), _pspriv_,	\
-				      _pse_);				\
-	}								\
-} while (/*CONSTCOND*/0)
-
-int
-_FUNCNAME(ctype_getops)(_citrus_ctype_ops_rec_t *ops, size_t lenops,
-			uint32_t expected_version)
-{
-	if (expected_version<_CITRUS_CTYPE_ABI_VERSION || lenops<sizeof(*ops))
-		return (EINVAL);
-
-	memcpy(ops, &_FUNCNAME(ctype_ops), sizeof(_FUNCNAME(ctype_ops)));
-
-	return (0);
-}
-
-static int
-_FUNCNAME(ctype_init)(void ** __restrict cl,
-		      void * __restrict var, size_t lenvar, size_t lenps)
-{
-	_CTYPE_INFO *cei;
-
-	_DIAGASSERT(cl != NULL);
-
-	/* sanity check to avoid overruns */
-	if (sizeof(_ENCODING_STATE) > lenps)
-		return (EINVAL);
-
-	cei = calloc(1, sizeof(_CTYPE_INFO));
-	if (cei == NULL)
-		return (ENOMEM);
-
-	*cl = (void *)cei;
-
-	return _FUNCNAME(encoding_module_init)(_CEI_TO_EI(cei), var, lenvar);
-}
-
-static void
-_FUNCNAME(ctype_uninit)(void *cl)
-{
-	if (cl) {
-		_FUNCNAME(encoding_module_uninit)(_CEI_TO_EI(_TO_CEI(cl)));
-		free(cl);
-	}
-}
-
-static unsigned
-/*ARGSUSED*/
-_FUNCNAME(ctype_get_mb_cur_max)(void *cl)
-{
-	return _ENCODING_MB_CUR_MAX(_CEI_TO_EI(_TO_CEI(cl)));
-}
-
-static int
-_FUNCNAME(ctype_mblen)(void * __restrict cl,
-		       const char * __restrict s, size_t n,
-		       int * __restrict nresult)
-{
-	_ENCODING_STATE *psenc;
-	_ENCODING_INFO *ei;
-
-	_DIAGASSERT(cl != NULL);
-
-	psenc = &_CEI_TO_STATE(_TO_CEI(cl), mblen);
-	ei = _CEI_TO_EI(_TO_CEI(cl));
-	if (_STATE_NEEDS_EXPLICIT_INIT(psenc))
-		_FUNCNAME(init_state)(ei, psenc);
-	return _FUNCNAME(mbtowc_priv)(ei, NULL, s, n, psenc, nresult);
-}
-
-static int
-_FUNCNAME(ctype_mbrlen)(void * __restrict cl, const char * __restrict s,
-			size_t n, void * __restrict pspriv,
-			size_t * __restrict nresult)
-{
-	_ENCODING_STATE *psenc;
-	_ENCODING_INFO *ei;
-	int err = 0;
-
-	_DIAGASSERT(cl != NULL);
-
-	ei = _CEI_TO_EI(_TO_CEI(cl));
-	_RESTART_BEGIN(mbrlen, _TO_CEI(cl), pspriv, psenc);
-	if (s == NULL) {
-		_FUNCNAME(init_state)(ei, psenc);
-		*nresult = 0;
-	} else {
-		err = _FUNCNAME(mbrtowc_priv)(ei, NULL, (const char **)&s, n,
-		    (void *)psenc, nresult);
-	}
-	_RESTART_END(mbrlen, _TO_CEI(cl), pspriv, psenc);
-
-	return (err);
-}
-
-static int
-_FUNCNAME(ctype_mbrtowc)(void * __restrict cl, wchar_t * __restrict pwc,
-			 const char * __restrict s, size_t n,
-			 void * __restrict pspriv, size_t * __restrict nresult)
-{
-	_ENCODING_STATE *psenc;
-	_ENCODING_INFO *ei;
-	int err = 0;
-
-	_DIAGASSERT(cl != NULL);
-
-	ei = _CEI_TO_EI(_TO_CEI(cl));
-	_RESTART_BEGIN(mbrtowc, _TO_CEI(cl), pspriv, psenc);
-	if (s == NULL) {
-		_FUNCNAME(init_state)(ei, psenc);
-		*nresult = 0;
-	} else {
-		err = _FUNCNAME(mbrtowc_priv)(ei, pwc, (const char **)&s, n,
-		    (void *)psenc, nresult);
-	}
-	_RESTART_END(mbrtowc, _TO_CEI(cl), pspriv, psenc);
-
-	return (err);
-}
-
-static int
-/*ARGSUSED*/
-_FUNCNAME(ctype_mbsinit)(void * __restrict cl, const void * __restrict pspriv,
-			 int * __restrict nresult)
-{
-	_ENCODING_STATE state;
-
-	if (pspriv == NULL) {
-		*nresult = 1;
-		return (0);
-	}
-
-	_FUNCNAME(unpack_state)(_CEI_TO_EI(_TO_CEI(cl)), &state, pspriv);
-
-	*nresult = (state.chlen == 0); /* XXX: FIXME */
-
-	return (0);
-}
-
-static int
-_FUNCNAME(ctype_mbsrtowcs)(void * __restrict cl, wchar_t * __restrict pwcs,
-			   const char ** __restrict s, size_t n,
-			   void * __restrict pspriv,
-			   size_t * __restrict nresult)
-{
-	_ENCODING_STATE *psenc;
-	_ENCODING_INFO *ei;
-	int err = 0;
-
-	_DIAGASSERT(cl != NULL);
-
-	ei = _CEI_TO_EI(_TO_CEI(cl));
-	_RESTART_BEGIN(mbsrtowcs, _TO_CEI(cl), pspriv, psenc);
-	err = _FUNCNAME(mbsrtowcs_priv)(ei, pwcs, s, n, psenc, nresult);
-	_RESTART_END(mbsrtowcs, _TO_CEI(cl), pspriv, psenc);
-
-	return (err);
-}
-
-static int __used
-_FUNCNAME(ctype_mbsnrtowcs)(_citrus_ctype_rec_t * __restrict cc, wchar_t * __restrict pwcs,
-			   const char ** __restrict s, size_t in, size_t n,
-			   void * __restrict pspriv,
-			   size_t * __restrict nresult)
-{
-	void *cl = cc->cc_closure;
-	_ENCODING_STATE *psenc;
-	_ENCODING_INFO *ei;
-	int err = 0;
-
-	_DIAGASSERT(cl != NULL);
-
-	ei = _CEI_TO_EI(_TO_CEI(cl));
-	_RESTART_BEGIN(mbsnrtowcs, _TO_CEI(cl), pspriv, psenc);
-	err = _FUNCNAME(mbsnrtowcs_priv)(ei, pwcs, s, in, n, psenc, nresult);
-	_RESTART_END(mbsnrtowcs, _TO_CEI(cl), pspriv, psenc);
-
-	return (err);
-}
-
-static int
-_FUNCNAME(ctype_mbstowcs)(void * __restrict cl, wchar_t * __restrict pwcs,
-			  const char * __restrict s, size_t n,
-			  size_t * __restrict nresult)
-{
-	int err;
-	_ENCODING_STATE state;
-	_ENCODING_INFO *ei;
-
-	_DIAGASSERT(cl != NULL);
-
-	ei = _CEI_TO_EI(_TO_CEI(cl));
-	_FUNCNAME(init_state)(ei, &state);
-	err = _FUNCNAME(mbsrtowcs_priv)(ei, pwcs, (const char **)&s, n,
-					&state, nresult);
-	if (*nresult == (size_t)-2) {
-		err = EILSEQ;
-		*nresult = (size_t)-1;
-	}
-
-	return (err);
-}
-
-static int
-_FUNCNAME(ctype_mbtowc)(void * __restrict cl, wchar_t * __restrict pwc,
-			const char * __restrict s, size_t n,
-			int * __restrict nresult)
-{
-	_ENCODING_STATE *psenc;
-	_ENCODING_INFO *ei;
-
-	_DIAGASSERT(cl != NULL);
-
-	psenc = &_CEI_TO_STATE(_TO_CEI(cl), mbtowc);
-	ei = _CEI_TO_EI(_TO_CEI(cl));
-	if (_STATE_NEEDS_EXPLICIT_INIT(psenc))
-		_FUNCNAME(init_state)(ei, psenc);
-	return _FUNCNAME(mbtowc_priv)(ei, pwc, s, n, psenc, nresult);
-}
-
-static int
-_FUNCNAME(ctype_wcrtomb)(void * __restrict cl, char * __restrict s, wchar_t wc,
-			 void * __restrict pspriv, size_t * __restrict nresult)
-{
-	_ENCODING_STATE *psenc;
-	char buf[MB_LEN_MAX];
-	int err = 0;
-	size_t sz;
-#if _ENCODING_IS_STATE_DEPENDENT
-	size_t rsz = 0;
-#endif
-
-	_DIAGASSERT(cl != NULL);
-
-	if (s == NULL) {
-		/*
-		 * use internal buffer.
-		 */
-		s = buf;
-		wc = L'\0'; /* SUSv3 */
-	}
-
-	_RESTART_BEGIN(wcrtomb, _TO_CEI(cl), pspriv, psenc);
-	sz = _ENCODING_MB_CUR_MAX(_CEI_TO_EI(_TO_CEI(cl)));
-#if _ENCODING_IS_STATE_DEPENDENT
-	if (wc == L'\0') {
-		/* reset state */
-		err = _FUNCNAME(put_state_reset)(_CEI_TO_EI(_TO_CEI(cl)), s,
-						 sz, psenc, &rsz);
-		if (err) {
-			*nresult = -1;
-			goto quit;
-		}
-		s += rsz;
-		sz -= rsz;
-	}
-#endif
-	err = _FUNCNAME(wcrtomb_priv)(_CEI_TO_EI(_TO_CEI(cl)), s, sz,
-				      wc, psenc, nresult);
-#if _ENCODING_IS_STATE_DEPENDENT
-	if (err == 0)
-		*nresult += rsz;
-quit:
-#endif
-	if (err == E2BIG)
-		err = EINVAL;
-	_RESTART_END(wcrtomb, _TO_CEI(cl), pspriv, psenc);
-
-	return err;
-}
-
-static int
-/*ARGSUSED*/
-_FUNCNAME(ctype_wcsrtombs)(void * __restrict cl, char * __restrict s,
-			   const wchar_t ** __restrict pwcs, size_t n,
-			   void * __restrict pspriv,
-			   size_t * __restrict nresult)
-{
-	_ENCODING_STATE *psenc;
-	_ENCODING_INFO *ei;
-	int err = 0;
-
-	_DIAGASSERT(cl != NULL);
-
-	ei = _CEI_TO_EI(_TO_CEI(cl));
-	_RESTART_BEGIN(wcsrtombs, _TO_CEI(cl), pspriv, psenc);
-	err = _FUNCNAME(wcsrtombs_priv)(ei, s, pwcs, n, psenc, nresult);
-	_RESTART_END(wcsrtombs, _TO_CEI(cl), pspriv, psenc);
-
-	return err;
-}
-
-static int __used
-/*ARGSUSED*/
-_FUNCNAME(ctype_wcsnrtombs)(_citrus_ctype_rec_t * __restrict cc,
-			   char * __restrict s,
-			   const wchar_t ** __restrict pwcs, size_t in,
-			   size_t n, void * __restrict pspriv,
-			   size_t * __restrict nresult)
-{
-	void *cl = cc->cc_closure;
-	_ENCODING_STATE *psenc;
-	_ENCODING_INFO *ei;
-	int err = 0;
-
-	_DIAGASSERT(cl != NULL);
-
-	ei = _CEI_TO_EI(_TO_CEI(cl));
-	_RESTART_BEGIN(wcsnrtombs, _TO_CEI(cl), pspriv, psenc);
-	err = _FUNCNAME(wcsnrtombs_priv)(ei, s, pwcs, in, n, psenc, nresult);
-	_RESTART_END(wcsnrtombs, _TO_CEI(cl), pspriv, psenc);
-
-	return err;
-}
-
-static int
-/*ARGSUSED*/
-_FUNCNAME(ctype_wcstombs)(void * __restrict cl, char * __restrict s,
-			  const wchar_t * __restrict pwcs, size_t n,
-			  size_t * __restrict nresult)
-{
-	_ENCODING_STATE state;
-	_ENCODING_INFO *ei;
-	int err;
-
-	_DIAGASSERT(cl != NULL);
-
-	ei = _CEI_TO_EI(_TO_CEI(cl));
-	_FUNCNAME(init_state)(ei, &state);
-	err = _FUNCNAME(wcsrtombs_priv)(ei, s, (const wchar_t **)&pwcs, n,
-					&state, nresult);
-
-	return err;
-}
-
-static int
-_FUNCNAME(ctype_wctomb)(void * __restrict cl, char * __restrict s, wchar_t wc,
-			int * __restrict nresult)
-{
-	_ENCODING_STATE *psenc;
-	_ENCODING_INFO *ei;
-	size_t nr, sz;
-#if _ENCODING_IS_STATE_DEPENDENT
-	size_t rsz = 0;
-#endif
-	int err = 0;
-
-	_DIAGASSERT(cl != NULL);
-
-	ei = _CEI_TO_EI(_TO_CEI(cl));
-	psenc = &_CEI_TO_STATE(_TO_CEI(cl), wctomb);
-	if (_STATE_NEEDS_EXPLICIT_INIT(psenc))
-		_FUNCNAME(init_state)(ei, psenc);
-	if (s == NULL) {
-		_FUNCNAME(init_state)(ei, psenc);
-		*nresult = _ENCODING_IS_STATE_DEPENDENT;
-		return 0;
-	}
-	sz = _ENCODING_MB_CUR_MAX(_CEI_TO_EI(_TO_CEI(cl)));
-#if _ENCODING_IS_STATE_DEPENDENT
-	if (wc == L'\0') {
-		/* reset state */
-		err = _FUNCNAME(put_state_reset)(_CEI_TO_EI(_TO_CEI(cl)), s,
-						 sz, psenc, &rsz);
-		if (err) {
-			*nresult = -1; /* XXX */
-			return 0;
-		}
-		s += rsz;
-		sz -= rsz;
-	}
-#endif
-	err = _FUNCNAME(wcrtomb_priv)(ei, s, sz, wc, psenc, &nr);
-#if _ENCODING_IS_STATE_DEPENDENT
-	if (err == 0)
-		*nresult = (int)(nr + rsz);
-	else
-#endif
-	*nresult = (int)nr;
-
-	return 0;
-}
-
-static int
-/*ARGSUSED*/
-_FUNCNAME(ctype_btowc)(_citrus_ctype_rec_t * __restrict cc,
-		       int c, wint_t * __restrict wcresult)
-{
-	_ENCODING_STATE state;
-	_ENCODING_INFO *ei;
-	char mb;
-	char const *s;
-	wchar_t wc;
-	size_t nr;
-	int err;
-
-	_DIAGASSERT(cc != NULL && cc->cc_closure != NULL);
-
-	if (c == EOF) {
-		*wcresult = WEOF;
-		return 0;
-	}
-	ei = _CEI_TO_EI(_TO_CEI(cc->cc_closure));
-	_FUNCNAME(init_state)(ei, &state);
-	mb = (char)(unsigned)c;
-	s = &mb;
-	err = _FUNCNAME(mbrtowc_priv)(ei, &wc, &s, 1, &state, &nr);
-	if (!err && (nr == 0 || nr == 1))
-		*wcresult = (wint_t)wc;
-	else
-		*wcresult = WEOF;
-
-	return 0;
-}
-
-static int
-/*ARGSUSED*/
-_FUNCNAME(ctype_wctob)(_citrus_ctype_rec_t * __restrict cc,
-		       wint_t wc, int * __restrict cresult)
-{
-	_ENCODING_STATE state;
-	_ENCODING_INFO *ei;
-	char buf[MB_LEN_MAX];
-	size_t nr;
-	int err;
-
-	_DIAGASSERT(cc != NULL && cc->cc_closure != NULL);
-
-	if (wc == WEOF) {
-		*cresult = EOF;
-		return 0;
-	}
-	ei = _CEI_TO_EI(_TO_CEI(cc->cc_closure));
-	_FUNCNAME(init_state)(ei, &state);
-	err = _FUNCNAME(wcrtomb_priv)(ei, buf, _ENCODING_MB_CUR_MAX(ei),
-				      (wchar_t)wc, &state, &nr);
-	if (!err && nr == 1)
-		*cresult = buf[0];
-	else
-		*cresult = EOF;
-
-	return 0;
-}
diff --git a/lib/libc/citrus/citrus_db.c b/lib/libc/citrus/citrus_db.c
deleted file mode 100644
index fc7e0140f..000000000
--- a/lib/libc/citrus/citrus_db.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/*	$NetBSD: citrus_db.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_db.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/types.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_mmap.h"
-#include "citrus_db.h"
-#include "citrus_db_file.h"
-
-struct _citrus_db {
-	/* private */
-	struct _region db_region;
-	uint32_t (*db_hashfunc)(void *, struct _citrus_region *);
-	void *db_hashfunc_closure;
-};
-
-int
-_citrus_db_open(struct _citrus_db **rdb, struct _region *r, const char *magic,
-		uint32_t (*hashfunc)(void *, struct _citrus_region *),
-		void *hashfunc_closure)
-{
-	struct _memstream ms;
-	struct _citrus_db *db;
-	struct _citrus_db_header_x *dhx;
-
-	_memstream_bind(&ms, r);
-
-	/* sanity check */
-	dhx = _memstream_getregion(&ms, NULL, sizeof(*dhx));
-	if (dhx == NULL)
-		return EFTYPE;
-	if (strncmp(dhx->dhx_magic, magic, _CITRUS_DB_MAGIC_SIZE) != 0)
-		return EFTYPE;
-	if (_memstream_seek(&ms, be32toh(dhx->dhx_entry_offset), SEEK_SET))
-		return EFTYPE;
-
-	if (be32toh(dhx->dhx_num_entries)*_CITRUS_DB_ENTRY_SIZE >
-	    _memstream_remainder(&ms))
-		return EFTYPE;
-
-	db = malloc(sizeof(*db));
-	if (db==NULL)
-		return errno;
-	db->db_region = *r;
-	db->db_hashfunc = hashfunc;
-	db->db_hashfunc_closure = hashfunc_closure;
-	*rdb = db;
-
-	return 0;
-}
-
-void
-_citrus_db_close(struct _citrus_db *db)
-{
-	free(db);
-}
-
-int
-_citrus_db_lookup(struct _citrus_db *db, struct _citrus_region *key,
-		  struct _citrus_region *data, struct _citrus_db_locator *dl)
-{
-	uint32_t hashval, num_entries;
-	size_t offset;
-	struct _memstream ms;
-	struct _citrus_db_header_x *dhx;
-	struct _citrus_db_entry_x *dex;
-	struct _citrus_region r;
-
-	_memstream_bind(&ms, &db->db_region);
-
-	dhx = _memstream_getregion(&ms, NULL, sizeof(*dhx));
-	_DIAGASSERT(dhx);
-	num_entries = be32toh(dhx->dhx_num_entries);
-	if (num_entries == 0)
-		return ENOENT;
-
-	if (dl != NULL && dl->dl_offset>0) {
-		hashval = dl->dl_hashval;
-		offset = dl->dl_offset;
-		if (offset >= _region_size(&db->db_region))
-			return ENOENT;
-	} else {
-		hashval =
-		    db->db_hashfunc(db->db_hashfunc_closure, key)%num_entries;
-		offset =
-		    be32toh(dhx->dhx_entry_offset) +
-		    hashval * _CITRUS_DB_ENTRY_SIZE;
-		if (dl)
-			dl->dl_hashval = hashval;
-	}
-	do {
-		/* seek to the next entry */
-		if (_citrus_memory_stream_seek(&ms, offset, SEEK_SET))
-			return EFTYPE;
-		/* get the entry record */
-		dex = _memstream_getregion(&ms, NULL, _CITRUS_DB_ENTRY_SIZE);
-		if (dex == NULL)
-			return EFTYPE;
-
-		/* jump to next entry having the same hash value. */
-		offset = be32toh(dex->dex_next_offset);
-
-		/* save the current position */
-		if (dl) {
-			dl->dl_offset = offset;
-			if (offset==0)
-				dl->dl_offset = _region_size(&db->db_region);
-		}
-
-		/* compare hash value. */
-		if (be32toh(dex->dex_hash_value) != hashval)
-			/* not found */
-			break;
-		/* compare key length */
-		if (be32toh(dex->dex_key_size) == _region_size(key)) {
-			/* seek to the head of the key. */
-			if (_memstream_seek(&ms, be32toh(dex->dex_key_offset),
-					    SEEK_SET))
-				return EFTYPE;
-			/* get the region of the key */
-			if (_memstream_getregion(&ms, &r,
-						 _region_size(key)) == NULL)
-				return EFTYPE;
-			/* compare key byte stream */
-			if (memcmp(_region_head(&r), _region_head(key),
-				   _region_size(key)) == 0) {
-				/* match */
-				if (_memstream_seek(
-					&ms, be32toh(dex->dex_data_offset),
-					SEEK_SET))
-					return EFTYPE;
-				if (_memstream_getregion(
-					&ms, data,
-					be32toh(dex->dex_data_size)) == NULL)
-					return EFTYPE;
-				return 0;
-			}
-		}
-	} while (offset != 0);
-
-	return ENOENT;
-}
-
-int
-_citrus_db_lookup_by_string(struct _citrus_db *db, const char *key,
-			    struct _citrus_region *data,
-			    struct _citrus_db_locator *dl)
-{
-	struct _region r;
-
-	_region_init(&r, __UNCONST(key), strlen(key));
-
-	return _citrus_db_lookup(db, &r, data, dl);
-}
-
-int
-_citrus_db_lookup8_by_string(struct _citrus_db *db, const char *key,
-			     uint8_t *rval, struct _citrus_db_locator *dl)
-{
-	int ret;
-	struct _region r;
-
-	ret = _citrus_db_lookup_by_string(db, key, &r, dl);
-	if (ret)
-		return ret;
-
-	if (_region_size(&r) != 1)
-		return EFTYPE;
-
-	if (rval)
-		memcpy(rval, _region_head(&r), 1);
-
-	return 0;
-}
-
-int
-_citrus_db_lookup16_by_string(struct _citrus_db *db, const char *key,
-			      uint16_t *rval, struct _citrus_db_locator *dl)
-{
-	int ret;
-	struct _region r;
-	uint16_t val;
-
-	ret = _citrus_db_lookup_by_string(db, key, &r, dl);
-	if (ret)
-		return ret;
-
-	if (_region_size(&r) != 2)
-		return EFTYPE;
-
-	if (rval) {
-		memcpy(&val, _region_head(&r), 2);
-		*rval = be16toh(val);
-	}
-
-	return 0;
-}
-
-int
-_citrus_db_lookup32_by_string(struct _citrus_db *db, const char *key,
-			      uint32_t *rval, struct _citrus_db_locator *dl)
-{
-	int ret;
-	struct _region r;
-	uint32_t val;
-
-	ret = _citrus_db_lookup_by_string(db, key, &r, dl);
-	if (ret)
-		return ret;
-
-	if (_region_size(&r) != 4)
-		return EFTYPE;
-
-	if (rval) {
-		memcpy(&val, _region_head(&r), 4);
-		*rval = be32toh(val);
-	}
-
-	return 0;
-}
-
-int
-_citrus_db_lookup_string_by_string(struct _citrus_db *db, const char *key,
-				   const char **rdata,
-				   struct _citrus_db_locator *dl)
-{
-	int ret;
-	struct _region r;
-
-	ret = _citrus_db_lookup_by_string(db, key, &r, dl);
-	if (ret)
-		return ret;
-
-	/* check whether the string is null terminated */
-	if (_region_size(&r) == 0)
-		return EFTYPE;
-	if (*((const char*)_region_head(&r)+_region_size(&r)-1) != '\0')
-		return EFTYPE;
-
-	if (rdata)
-		*rdata = _region_head(&r);
-
-	return 0;
-}
-
-int
-_citrus_db_get_number_of_entries(struct _citrus_db *db)
-{
-	struct _memstream ms;
-	struct _citrus_db_header_x *dhx;
-
-	_memstream_bind(&ms, &db->db_region);
-
-	dhx = _memstream_getregion(&ms, NULL, sizeof(*dhx));
-	_DIAGASSERT(dhx);
-	return (int)be32toh(dhx->dhx_num_entries);
-}
-
-int
-_citrus_db_get_entry(struct _citrus_db *db, int idx,
-		     struct _region *key, struct _region *data)
-{
-	uint32_t num_entries;
-	size_t offset;
-	struct _memstream ms;
-	struct _citrus_db_header_x *dhx;
-	struct _citrus_db_entry_x *dex;
-
-	_memstream_bind(&ms, &db->db_region);
-
-	dhx = _memstream_getregion(&ms, NULL, sizeof(*dhx));
-	_DIAGASSERT(dhx);
-	num_entries = be32toh(dhx->dhx_num_entries);
-	if (idx < 0 || (uint32_t)idx >= num_entries)
-		return EINVAL;
-
-	/* seek to the next entry */
-	offset = be32toh(dhx->dhx_entry_offset) + idx * _CITRUS_DB_ENTRY_SIZE;
-	if (_citrus_memory_stream_seek(&ms, offset, SEEK_SET))
-		return EFTYPE;
-	/* get the entry record */
-	dex = _memstream_getregion(&ms, NULL, _CITRUS_DB_ENTRY_SIZE);
-	if (dex == NULL)
-		return EFTYPE;
-	/* seek to the head of the key. */
-	if (_memstream_seek(&ms, be32toh(dex->dex_key_offset), SEEK_SET))
-		return EFTYPE;
-	/* get the region of the key. */
-	if (_memstream_getregion(&ms, key, be32toh(dex->dex_key_size))==NULL)
-		return EFTYPE;
-	/* seek to the head of the data. */
-	if (_memstream_seek(&ms, be32toh(dex->dex_data_offset), SEEK_SET))
-		return EFTYPE;
-	/* get the region of the data. */
-	if (_memstream_getregion(&ms, data, be32toh(dex->dex_data_size))==NULL)
-		return EFTYPE;
-
-	return 0;
-}
diff --git a/lib/libc/citrus/citrus_db.h b/lib/libc/citrus/citrus_db.h
deleted file mode 100644
index 239e1cd98..000000000
--- a/lib/libc/citrus/citrus_db.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: citrus_db.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_DB_H_
-#define _CITRUS_DB_H_
-
-struct _citrus_db;
-struct _citrus_db_locator {
-	uint32_t	dl_hashval;
-	size_t		dl_offset;
-};
-
-__BEGIN_DECLS
-int	_citrus_db_open(struct _citrus_db **, struct _citrus_region *,
-			const char *,
-			uint32_t (*)(void *, struct _citrus_region *),
-			void *);
-void	_citrus_db_close(struct _citrus_db *);
-int	_citrus_db_lookup(struct _citrus_db *, struct _citrus_region *,
-			  struct _citrus_region *,
-			  struct _citrus_db_locator *);
-int	_citrus_db_lookup_by_string(struct _citrus_db *, const char *,
-				    struct _citrus_region *,
-				    struct _citrus_db_locator *);
-int	_citrus_db_lookup8_by_string(struct _citrus_db *, const char *,
-				     uint8_t *,
-				     struct _citrus_db_locator *);
-int	_citrus_db_lookup16_by_string(struct _citrus_db *, const char *,
-				      uint16_t *,
-				      struct _citrus_db_locator *);
-int	_citrus_db_lookup32_by_string(struct _citrus_db *, const char *,
-				      uint32_t *,
-				      struct _citrus_db_locator *);
-int	_citrus_db_lookup_string_by_string(struct _citrus_db *, const char *,
-					   const char **,
-					   struct _citrus_db_locator *);
-int	_citrus_db_get_number_of_entries(struct _citrus_db *);
-int	_citrus_db_get_entry(struct _citrus_db *, int,
-			     struct _citrus_region *, struct _citrus_region *);
-__END_DECLS
-
-static __inline void
-_citrus_db_locator_init(struct _citrus_db_locator *dl)
-{
-	dl->dl_hashval = 0;
-	dl->dl_offset = 0;
-}
-
-#endif
diff --git a/lib/libc/citrus/citrus_db_factory.c b/lib/libc/citrus/citrus_db_factory.c
deleted file mode 100644
index a17e5b7f3..000000000
--- a/lib/libc/citrus/citrus_db_factory.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/*	$NetBSD: citrus_db_factory.c,v 1.10 2013/09/14 13:05:51 joerg Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_db_factory.c,v 1.10 2013/09/14 13:05:51 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/queue.h>
-
-#include "citrus_namespace.h"
-#include "citrus_region.h"
-#include "citrus_db_file.h"
-#include "citrus_db_factory.h"
-
-struct _citrus_db_factory_entry {
-	SIMPLEQ_ENTRY(_citrus_db_factory_entry)	de_entry;
-	struct _citrus_db_factory_entry *de_next;
-	uint32_t de_hashvalue;
-	struct _region de_key;
-	int de_key_free;
-	struct _region de_data;
-	int de_data_free;
-	int de_idx;
-};
-
-struct _citrus_db_factory {
-	size_t df_num_entries;
-	SIMPLEQ_HEAD(, _citrus_db_factory_entry) df_entries;
-	size_t df_total_key_size;
-	size_t df_total_data_size;
-	uint32_t (*df_hashfunc)(void *, struct _citrus_region *);
-	void *df_hashfunc_closure;
-};
-
-#define DB_ALIGN 16
-
-int
-_citrus_db_factory_create(struct _citrus_db_factory **rdf,
-			  _citrus_db_hash_func_t hashfunc,
-			  void *hashfunc_closure)
-{
-	struct _citrus_db_factory *df;
-
-	df = malloc(sizeof(*df));
-	if (df == NULL)
-		return errno;
-	df->df_num_entries = 0;
-	df->df_total_key_size = df->df_total_data_size = 0;
-	SIMPLEQ_INIT(&df->df_entries);
-	df->df_hashfunc = hashfunc;
-	df->df_hashfunc_closure = hashfunc_closure;
-
-	*rdf = df;
-
-	return 0;
-}
-
-void
-_citrus_db_factory_free(struct _citrus_db_factory *df)
-{
-	struct _citrus_db_factory_entry *de;
-
-	while ((de = SIMPLEQ_FIRST(&df->df_entries)) != NULL) {
-		SIMPLEQ_REMOVE_HEAD(&df->df_entries, de_entry);
-		if (de->de_key_free)
-			free(_region_head(&de->de_key));
-		if (de->de_data_free)
-			free(_region_head(&de->de_data));
-		free(de);
-	}
-	free(df);
-}
-
-static __inline size_t
-ceilto(size_t sz)
-{
-	return (sz+DB_ALIGN-1) & ~(DB_ALIGN-1);
-}
-
-int
-_citrus_db_factory_add(struct _citrus_db_factory *df,
-		       struct _region *key, int keyfree,
-		       struct _region *data, int datafree)
-{
-	struct _citrus_db_factory_entry *de;
-
-	de = malloc(sizeof(*de));
-	if (de == NULL)
-		return -1;
-
-	de->de_hashvalue = df->df_hashfunc(df->df_hashfunc_closure, key);
-	de->de_key = *key;
-	de->de_key_free = keyfree;
-	de->de_data = *data;
-	de->de_data_free = datafree;
-	de->de_idx = -1;
-
-	SIMPLEQ_INSERT_TAIL(&df->df_entries, de, de_entry);
-	df->df_total_key_size += _region_size(key);
-	df->df_total_data_size += ceilto(_region_size(data));
-	df->df_num_entries++;
-
-	return 0;
-
-}
-
-int
-_citrus_db_factory_add_by_string(struct _citrus_db_factory *df,
-				 const char *key,
-				 struct _citrus_region *data, int datafree)
-{
-	struct _region r;
-	char *tmp;
-	tmp = strdup(key);
-	if (tmp == NULL)
-		return errno;
-	_region_init(&r, tmp, strlen(key));
-	return _citrus_db_factory_add(df, &r, 1, data, datafree);
-}
-
-int
-_citrus_db_factory_add8_by_string(struct _citrus_db_factory *df,
-				  const char *key, uint8_t val)
-{
-	struct _region r;
-	uint8_t *p;
-
-	p = malloc(sizeof(*p));
-	if (p == NULL)
-		return errno;
-	*p = val;
-	_region_init(&r, p, 1);
-	return _citrus_db_factory_add_by_string(df, key, &r, 1);
-}
-
-int
-_citrus_db_factory_add16_by_string(struct _citrus_db_factory *df,
-				   const char *key, uint16_t val)
-{
-	struct _region r;
-	uint16_t *p;
-
-	p = malloc(sizeof(*p));
-	if (p == NULL)
-		return errno;
-	*p = htons(val);
-	_region_init(&r, p, 2);
-	return _citrus_db_factory_add_by_string(df, key, &r, 1);
-}
-
-int
-_citrus_db_factory_add32_by_string(struct _citrus_db_factory *df,
-				   const char *key, uint32_t val)
-{
-	struct _region r;
-	uint32_t *p;
-
-	p = malloc(sizeof(*p));
-	if (p == NULL)
-		return errno;
-	*p = htonl(val);
-	_region_init(&r, p, 4);
-	return _citrus_db_factory_add_by_string(df, key, &r, 1);
-}
-
-int
-_citrus_db_factory_add_string_by_string(struct _citrus_db_factory *df,
-					const char *key, const char *data)
-{
-	char *p;
-	struct _region r;
-
-	p = strdup(data);
-	if (p == NULL)
-		return errno;
-	_region_init(&r, p, strlen(p)+1);
-	return _citrus_db_factory_add_by_string(df, key, &r, 1);
-}
-
-size_t
-_citrus_db_factory_calc_size(struct _citrus_db_factory *df)
-{
-	size_t sz;
-
-	sz = ceilto(_CITRUS_DB_HEADER_SIZE);
-	sz += ceilto(_CITRUS_DB_ENTRY_SIZE * df->df_num_entries);
-	sz += ceilto(df->df_total_key_size);
-	sz += df->df_total_data_size;
-
-	return sz;
-}
-
-static __inline void
-put8(struct _region *r, size_t *rofs, uint8_t val)
-{
-	*(uint8_t *)_region_offset(r, *rofs) = val;
-	*rofs += 1;
-}
-
-static __inline void
-put32(struct _region *r, size_t *rofs, uint32_t val)
-{
-	val = htonl(val);
-	memcpy(_region_offset(r, *rofs), &val, 4);
-	*rofs += 4;
-}
-
-static __inline void
-putpad(struct _region *r, size_t *rofs)
-{
-	size_t i;
-	for (i = ceilto(*rofs) - *rofs; i > 0; i--)
-		put8(r, rofs, 0);
-}
-
-static __inline void
-dump_header(struct _region *r, const char *magic, size_t *rofs,
-	    size_t num_entries)
-{
-	while (*rofs<_CITRUS_DB_MAGIC_SIZE)
-		put8(r, rofs, *magic++);
-	put32(r, rofs, num_entries);
-	put32(r, rofs, _CITRUS_DB_HEADER_SIZE);
-}
-
-int
-_citrus_db_factory_serialize(struct _citrus_db_factory *df, const char *magic,
-			     struct _region *r)
-{
-	size_t i, ofs, keyofs, dataofs, nextofs;
-	struct _citrus_db_factory_entry *de, **depp, *det;
-
-	ofs = 0;
-	/* check whether more than 0 entries exist */
-	if (df->df_num_entries == 0) {
-		dump_header(r, magic, &ofs, 0);
-		return 0;
-	}
-	/* allocate hash table */
-	depp = malloc(sizeof(*depp) * df->df_num_entries);
-	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 */
-	SIMPLEQ_FOREACH(de, &df->df_entries, de_entry) {
-		de->de_hashvalue %= df->df_num_entries;
-		de->de_idx = -1;
-		de->de_next = NULL;
-		if (depp[de->de_hashvalue] == NULL) {
-			depp[de->de_hashvalue] = de;
-			de->de_idx = (int)de->de_hashvalue;
-		}
-	}
-
-	/* step2: resolve conflicts */
-	i = 0;
-	SIMPLEQ_FOREACH(de, &df->df_entries, de_entry) {
-		if (de->de_idx == -1) {
-			det = depp[de->de_hashvalue];
-			while (det->de_next != NULL)
-				det = det->de_next;
-			det->de_next = de;
-			while (depp[i] != NULL)
-				i++;
-			depp[i] = de;
-			de->de_idx = (int)i;
-		}
-	}
-
-	keyofs =
-	    _CITRUS_DB_HEADER_SIZE +
-	    ceilto(df->df_num_entries*_CITRUS_DB_ENTRY_SIZE);
-	dataofs = keyofs + ceilto(df->df_total_key_size);
-
-	/* dump header */
-	dump_header(r, magic, &ofs, df->df_num_entries);
-
-	/* dump entries */
-	for (i = 0; i < df->df_num_entries; i++) {
-		de = depp[i];
-		nextofs = 0;
-		if (de->de_next) {
-			nextofs =
-			    _CITRUS_DB_HEADER_SIZE +
-			    de->de_next->de_idx * _CITRUS_DB_ENTRY_SIZE;
-		}
-		put32(r, &ofs, de->de_hashvalue);
-		put32(r, &ofs, nextofs);
-		put32(r, &ofs, keyofs);
-		put32(r, &ofs, _region_size(&de->de_key));
-		put32(r, &ofs, dataofs);
-		put32(r, &ofs, _region_size(&de->de_data));
-		memcpy(_region_offset(r, keyofs),
-		       _region_head(&de->de_key), _region_size(&de->de_key));
-		keyofs += _region_size(&de->de_key);
-		memcpy(_region_offset(r, dataofs),
-		       _region_head(&de->de_data), _region_size(&de->de_data));
-		dataofs += _region_size(&de->de_data);
-		putpad(r, &dataofs);
-	}
-	putpad(r, &ofs);
-	putpad(r, &keyofs);
-	free(depp);
-
-	return 0;
-}
diff --git a/lib/libc/citrus/citrus_db_factory.h b/lib/libc/citrus/citrus_db_factory.h
deleted file mode 100644
index 8b2f994a0..000000000
--- a/lib/libc/citrus/citrus_db_factory.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: citrus_db_factory.h,v 1.3 2008/02/09 14:56:20 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_DB_FACTORY_H_
-#define _CITRUS_DB_FACTORY_H_
-
-struct _citrus_db_factory;
-typedef uint32_t (*_citrus_db_hash_func_t)(void *, struct _citrus_region *);
-
-__BEGIN_DECLS
-int	_citrus_db_factory_create(struct _citrus_db_factory **,
-				  _citrus_db_hash_func_t, void *);
-void	_citrus_db_factory_free(struct _citrus_db_factory *);
-int	_citrus_db_factory_add(struct _citrus_db_factory *,
-			       struct _citrus_region *, int,
-			       struct _citrus_region *, int);
-int	_citrus_db_factory_add_by_string(struct _citrus_db_factory *,
-					 const char *,
-					 struct _citrus_region *, int);
-int	_citrus_db_factory_add8_by_string(struct _citrus_db_factory *,
-					  const char *, uint8_t);
-int	_citrus_db_factory_add16_by_string(struct _citrus_db_factory *,
-					   const char *, uint16_t);
-int	_citrus_db_factory_add32_by_string(struct _citrus_db_factory *,
-					  const char *, uint32_t);
-int	_citrus_db_factory_add_string_by_string(struct _citrus_db_factory *,
-						const char *, const char *);
-size_t	_citrus_db_factory_calc_size(struct _citrus_db_factory *);
-int	_citrus_db_factory_serialize(struct _citrus_db_factory *,
-				     const char *, struct _citrus_region *);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/citrus_db_file.h b/lib/libc/citrus/citrus_db_file.h
deleted file mode 100644
index 4e5295736..000000000
--- a/lib/libc/citrus/citrus_db_file.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*	$NetBSD: citrus_db_file.h,v 1.4 2008/02/10 05:58:22 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_DB_FILE_H_
-#define _CITRUS_DB_FILE_H_
-
-/*
- * db format:
- *  +---
- *  | header
- *  |  - magic
- *  |  - num entries
- *  +---
- *  | entry directory
- *  |  +------------
- *  |  | entry0
- *  |  |  - hash value
- *  |  |  - next entry
- *  |  |  - key offset
- *  |  |  - key len
- *  |  |  - data offset
- *  |  |  - data size
- *  |  |---
- *  |  | entry1
- *  |  | ..
- *  |  | entryN
- *  |  +---
- *  +---
- *  | key table
- *  |  - key0
- *  |   ...
- *  |  - keyN
- *  +---
- *  | data table
- *  |  - data0
- *  |   ...
- *  |  - dataN
- *  +---
- */
-
-#define _CITRUS_DB_MAGIC_SIZE	8
-#define _CITRUS_DB_HEADER_SIZE	16
-struct _citrus_db_header_x {
-	char		dhx_magic[_CITRUS_DB_MAGIC_SIZE];
-	uint32_t	dhx_num_entries;
-	uint32_t	dhx_entry_offset;
-} __packed;
-
-struct _citrus_db_entry_x {
-	uint32_t	dex_hash_value;
-	uint32_t	dex_next_offset;
-	uint32_t	dex_key_offset;
-	uint32_t	dex_key_size;
-	uint32_t	dex_data_offset;
-	uint32_t	dex_data_size;
-} __packed;
-#define _CITRUS_DB_ENTRY_SIZE	24
-
-#endif
diff --git a/lib/libc/citrus/citrus_db_hash.c b/lib/libc/citrus/citrus_db_hash.c
deleted file mode 100644
index 9702391a0..000000000
--- a/lib/libc/citrus/citrus_db_hash.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: citrus_db_hash.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_db_hash.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifndef HOSTPROG
-#include "namespace.h"
-#endif
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_db_hash.h"
-
-uint32_t
-/*ARGSUSED*/
-_citrus_db_hash_std(void *closure, struct _region *r)
-{
-	const uint8_t *p = _region_head(r);
-	uint32_t hash = 0, tmp;
-	size_t i;
-
-	for (i = _region_size(r); i > 0; i--) {
-		hash <<= 4;
-		hash += _bcs_tolower(*p);
-		tmp = hash & 0xF0000000;
-		if (tmp != 0) {
-			hash ^= tmp;
-			hash ^= tmp >> 24;
-		}
-		p++;
-	}
-	return hash;
-}
diff --git a/lib/libc/citrus/citrus_db_hash.h b/lib/libc/citrus/citrus_db_hash.h
deleted file mode 100644
index 55ee45e88..000000000
--- a/lib/libc/citrus/citrus_db_hash.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: citrus_db_hash.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_DB_HASH_H_
-#define _CITRUS_DB_HASH_H_
-
-__BEGIN_DECLS
-uint32_t	_citrus_db_hash_std(void *, struct _citrus_region *);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/citrus_esdb.c b/lib/libc/citrus/citrus_esdb.c
deleted file mode 100644
index 493400794..000000000
--- a/lib/libc/citrus/citrus_esdb.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/*	$NetBSD: citrus_esdb.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_esdb.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <paths.h>
-#include <sys/types.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_mmap.h"
-#include "citrus_lookup.h"
-#include "citrus_db.h"
-#include "citrus_db_hash.h"
-#include "citrus_esdb.h"
-#include "citrus_esdb_file.h"
-
-#define ESDB_DIR	"esdb.dir"
-#define ESDB_ALIAS	"esdb.alias"
-
-/*
- * _citrus_esdb_alias:
- *	resolve encoding scheme name aliases.
- */
-const char *
-_citrus_esdb_alias(const char *esname, char *buf, size_t bufsize)
-{
-	return _lookup_alias(_PATH_ESDB "/" ESDB_ALIAS, esname, buf, bufsize,
-			     _LOOKUP_CASE_IGNORE);
-}
-
-
-/*
- * conv_esdb:
- *	external representation -> local structure.
- */
-static int
-conv_esdb(struct _citrus_esdb *esdb, struct _region *fr)
-{
-	int ret;
-	struct _citrus_db *db;
-	uint32_t version, num_charsets, csid, i, tmp;
-	char buf[100];
-	const char *str;
-
-	/* open db */
-	ret = _db_open(&db, fr, _CITRUS_ESDB_MAGIC, &_db_hash_std, NULL);
-	if (ret)
-		goto err0;
-
-	/* check version */
-	ret = _db_lookup32_by_s(db, _CITRUS_ESDB_SYM_VERSION, &version, NULL);
-	if (ret)
-		goto err1;
-	switch (version) {
-	case 0x00000001:
-		/* current version */
-		/* initial version */
-		break;
-	default:
-		ret = EFTYPE;
-		goto err1;
-	}
-
-	/* get encoding/variable */
-	ret = _db_lookupstr_by_s(db, _CITRUS_ESDB_SYM_ENCODING, &str, NULL);
-	if (ret)
-		goto err1;
-	esdb->db_encname = strdup(str);
-	if (esdb->db_encname == NULL) {
-		ret = errno;
-		goto err1;
-	}
-
-	esdb->db_len_variable = 0;
-	esdb->db_variable = NULL;
-	ret = _db_lookupstr_by_s(db, _CITRUS_ESDB_SYM_VARIABLE, &str, NULL);
-	if (ret == 0) {
-		esdb->db_len_variable = strlen(str)+1;
-		esdb->db_variable = strdup(str);
-		if (esdb->db_variable == NULL) {
-			ret = errno;
-			goto err2;
-		}
-	} else if (ret != ENOENT)
-		goto err2;
-
-	/* get number of charsets */
-	ret = _db_lookup32_by_s(db, _CITRUS_ESDB_SYM_NUM_CHARSETS,
-				&num_charsets, NULL);
-	if (ret)
-		goto err3;
-	esdb->db_num_charsets = num_charsets;
-
-	/* get invalid character */
-	ret = _db_lookup32_by_s(db, _CITRUS_ESDB_SYM_INVALID, &tmp, NULL);
-	if (ret == 0) {
-		esdb->db_use_invalid = 1;
-		esdb->db_invalid = tmp;
-	} else if (ret == ENOENT)
-		esdb->db_use_invalid = 0;
-	else
-		goto err3;
-
-	/* get charsets */
-	esdb->db_charsets = malloc(num_charsets * sizeof(*esdb->db_charsets));
-	if (esdb->db_charsets == NULL) {
-		ret = errno;
-		goto err3;
-	}
-	for (i = 0; i < num_charsets; i++) {
-		snprintf(buf, sizeof(buf),
-		    _CITRUS_ESDB_SYM_CSID_PREFIX "%d", i);
-		ret = _db_lookup32_by_s(db, buf, &csid, NULL);
-		if (ret)
-			goto err4;
-		esdb->db_charsets[i].ec_csid = csid;
-
-		snprintf(buf, sizeof(buf),
-		    _CITRUS_ESDB_SYM_CSNAME_PREFIX "%d", i);
-		ret = _db_lookupstr_by_s(db, buf, &str, NULL);
-		if (ret)
-			goto err4;
-		esdb->db_charsets[i].ec_csname = strdup(str);
-		if (esdb->db_charsets[i].ec_csname == NULL) {
-			ret = errno;
-			goto err4;
-		}
-	}
-
-	_db_close(db);
-	return 0;
-
-err4:
-	for (; i > 0; i--)
-		free(esdb->db_charsets[i - 1].ec_csname);
-	free(esdb->db_charsets);
-err3:
-	free(esdb->db_variable);
-err2:
-	free(esdb->db_encname);
-err1:
-	_db_close(db);
-	if (ret == ENOENT)
-		ret = EFTYPE;
-err0:
-	return ret;
-}
-
-/*
- * _citrus_esdb_open:
- *	open an ESDB file.
- */
-int
-_citrus_esdb_open(struct _citrus_esdb *db, const char *esname)
-{
-	int ret;
-	const char *realname, *encfile;
-	char buf1[PATH_MAX], buf2[PATH_MAX], path[PATH_MAX];
-	struct _region fr;
-
-	_DIAGASSERT(esname != NULL);
-
-	snprintf(path, sizeof(path), "%s/%s", _PATH_ESDB, ESDB_ALIAS);
-	realname = _lookup_alias(path, esname, buf1, sizeof(buf1),
-				 _LOOKUP_CASE_IGNORE);
-
-	snprintf(path, sizeof(path), "%s/%s", _PATH_ESDB, ESDB_DIR);
-	encfile = _lookup_simple(path, realname, buf2, sizeof(buf2),
-				 _LOOKUP_CASE_IGNORE);
-	if (encfile==NULL)
-		return ENOENT;
-
-	/* open file */
-	snprintf(path, sizeof(path), "%s/%s", _PATH_ESDB, encfile);
-	ret = _map_file(&fr, path);
-	if (ret)
-		return ret;
-
-	ret = conv_esdb(db, &fr);
-
-	_unmap_file(&fr);
-
-	return ret;
-}
-
-/*
- * _citrus_esdb_close:
- *	free an ESDB.
- */
-void
-_citrus_esdb_close(struct _citrus_esdb *db)
-{
-	int i;
-
-	_DIAGASSERT(db != NULL);
-	_DIAGASSERT(db->db_num_charsets == 0 || db->db_charsets != NULL);
-
-	for (i = 0; i < db->db_num_charsets; i++)
-		free(db->db_charsets[i].ec_csname);
-	db->db_num_charsets = 0;
-	free(db->db_charsets); db->db_charsets = NULL;
-	free(db->db_encname); db->db_encname = NULL;
-	db->db_len_variable = 0;
-	free(db->db_variable); db->db_variable = NULL;
-}
-
-/*
- * _citrus_esdb_free_list:
- *	free the list.
- */
-void
-_citrus_esdb_free_list(char **list, size_t num)
-{
-	size_t i;
-
-	for (i = 0; i < num; i++)
-		free(list[i]);
-	free(list);
-}
-
-/*
- * _citrus_esdb_get_list:
- *	get esdb entries.
- */
-int
-_citrus_esdb_get_list(char ***rlist, size_t *rnum)
-{
-	int ret;
-	struct _region key;
-	size_t num;
-	struct _citrus_lookup *cla, *cld;
-	char **list, **q;
-	char buf[PATH_MAX];
-
-	num = 0;
-
-	ret = _lookup_seq_open(&cla, _PATH_ESDB "/" ESDB_ALIAS,
-			       _LOOKUP_CASE_IGNORE);
-	if (ret)
-		goto quit0;
-
-	ret = _lookup_seq_open(&cld, _PATH_ESDB "/" ESDB_DIR,
-			       _LOOKUP_CASE_IGNORE);
-	if (ret)
-		goto quit1;
-
-	/* count number of entries */
-	num = _lookup_get_num_entries(cla) + _lookup_get_num_entries(cld);
-
-	_lookup_seq_rewind(cla);
-	_lookup_seq_rewind(cld);
-
-	/* allocate list pointer space */
-	list = malloc(num * sizeof(char *));
-	num = 0;
-	if (list == NULL) {
-		ret = errno;
-		goto quit3;
-	}
-
-	/* get alias entries */
-	while ((ret = _lookup_seq_next(cla, &key, NULL)) == 0) {
-		snprintf(buf, sizeof(buf), "%.*s",
-			 (int)_region_size(&key),
-			 (const char *)_region_head(&key));
-		_bcs_convert_to_lower(buf);
-		list[num] = strdup(buf);
-		if (list[num] == NULL) {
-			ret = errno;
-			goto quit3;
-		}
-		num++;
-	}
-	if (ret != ENOENT)
-		goto quit3;
-	/* get dir entries */
-	while ((ret = _lookup_seq_next(cld, &key, NULL)) == 0) {
-		/* check duplicated entry */
-		snprintf(buf, sizeof(buf), "%.*s",
-			 (int)_region_size(&key),
-			 (const char *)_region_head(&key));
-		_bcs_convert_to_lower(buf);
-		ret = _lookup_seq_lookup(cla, buf, NULL);
-		if (ret) {
-			if (ret != ENOENT)
-				goto quit3;
-			/* not duplicated */
-			list[num] = strdup(buf);
-			if (list[num] == NULL) {
-				ret = errno;
-				goto quit3;
-			}
-			num++;
-		}
-	}
-	if (ret != ENOENT)
-		goto quit3;
-
-	ret = 0;
-	q = realloc(list, num * sizeof(char *));
-	if (!q) {
-		ret = ENOMEM;
-		goto quit3;
-	}
-	list = q;
-	*rlist = list;
-	*rnum = num;
-quit3:
-	if (ret)
-		_citrus_esdb_free_list(list, num);
-	_lookup_seq_close(cld);
-quit1:
-	_lookup_seq_close(cla);
-quit0:
-	return ret;
-}
diff --git a/lib/libc/citrus/citrus_esdb.h b/lib/libc/citrus/citrus_esdb.h
deleted file mode 100644
index dce973dad..000000000
--- a/lib/libc/citrus/citrus_esdb.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: citrus_esdb.h,v 1.1 2003/06/25 09:51:32 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_ESDB_H_
-#define _CITRUS_ESDB_H_
-
-struct _citrus_esdb_charset {
-	_citrus_csid_t			ec_csid;
-	char				*ec_csname;
-};
-
-struct _citrus_esdb {
-	char				*db_encname;
-	void				*db_variable;
-	size_t				db_len_variable;
-	int				db_num_charsets;
-	struct	_citrus_esdb_charset	*db_charsets;
-	int				db_use_invalid;
-	_citrus_wc_t			db_invalid;
-};
-
-__BEGIN_DECLS
-const char	*_citrus_esdb_alias(const char *, char *, size_t);
-int		_citrus_esdb_open(struct _citrus_esdb *, const char *);
-void		_citrus_esdb_close(struct _citrus_esdb *);
-void		_citrus_esdb_free_list(char **, size_t);
-int		_citrus_esdb_get_list(char ***, size_t *);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/citrus_esdb_file.h b/lib/libc/citrus/citrus_esdb_file.h
deleted file mode 100644
index 5bb05a27e..000000000
--- a/lib/libc/citrus/citrus_esdb_file.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: citrus_esdb_file.h,v 1.1 2003/06/25 09:51:32 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_ESDB_FILE_H_
-#define _CITRUS_ESDB_FILE_H_
-
-#define _CITRUS_ESDB_MAGIC	"ESDB\0\0\0\0"
-
-#define _CITRUS_ESDB_SYM_VERSION	"version"
-#define _CITRUS_ESDB_SYM_ENCODING	"encoding"
-#define _CITRUS_ESDB_SYM_VARIABLE	"variable"
-#define _CITRUS_ESDB_SYM_NUM_CHARSETS	"num_charsets"
-#define _CITRUS_ESDB_SYM_INVALID	"invalid"
-#define _CITRUS_ESDB_SYM_CSNAME_PREFIX	"csname_"
-#define _CITRUS_ESDB_SYM_CSID_PREFIX	"csid_"
-
-#define _CITRUS_ESDB_VERSION 0x00000001
-
-#endif
diff --git a/lib/libc/citrus/citrus_fix_grouping.h b/lib/libc/citrus/citrus_fix_grouping.h
deleted file mode 100644
index f4e85e539..000000000
--- a/lib/libc/citrus/citrus_fix_grouping.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* $NetBSD: citrus_fix_grouping.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_FIX_GROUPING_H_
-#define _CITRUS_FIX_GROUPING_H_
-
-#define _CITRUS_LC_GROUPING_VALUE_MIN		0
-#define _CITRUS_LC_GROUPING_VALUE_MAX		126
-#define _CITRUS_LC_GROUPING_VALUE_NO_FUTHER	127
-
-#if CHAR_MAX != _CITRUS_LC_GROUPING_VALUE_NO_FUTHER
-static __inline void
-_citrus_fixup_char_max_md(char *grouping)
-{
-	char *p;
-
-	_DIAGASSERT(grouping != NULL);
-
-	for (p = grouping; *p != '\0'; ++p) {
-		if (*p == _CITRUS_LC_GROUPING_VALUE_NO_FUTHER)
-			*p = (char)CHAR_MAX;
-	}
-}
-#define _CITRUS_FIXUP_CHAR_MAX_MD(grouping) \
-    _citrus_fixup_char_max_md(__UNCONST(grouping))
-#else
-#define _CITRUS_FIXUP_CHAR_MAX_MD(grouping)	/* nothing to do */
-#endif
-
-#endif /*_CITRUS_FIX_GROUPING_H_*/
diff --git a/lib/libc/citrus/citrus_hash.c b/lib/libc/citrus/citrus_hash.c
deleted file mode 100644
index 954ce21e8..000000000
--- a/lib/libc/citrus/citrus_hash.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: citrus_hash.c,v 1.3 2008/02/09 14:56:20 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_hash.c,v 1.3 2008/02/09 14:56:20 junyoung Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_region.h"
-#include "citrus_hash.h"
-#include "citrus_db_hash.h"
-
-int
-_citrus_string_hash_func(const char *key, int hashsize)
-{
-	struct _region r;
-
-	_region_init(&r, __UNCONST(key), strlen(key));
-
-	return (int)(_db_hash_std(NULL, &r) % (uint32_t)hashsize);
-}
diff --git a/lib/libc/citrus/citrus_hash.h b/lib/libc/citrus/citrus_hash.h
deleted file mode 100644
index 2e677a17f..000000000
--- a/lib/libc/citrus/citrus_hash.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: citrus_hash.h,v 1.3 2004/01/02 21:49:35 itojun Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_HASH_H_
-#define _CITRUS_HASH_H_
-
-#define _CITRUS_HASH_ENTRY(type) LIST_ENTRY(type)
-#define _CITRUS_HASH_HEAD(headname, type, hashsize)	\
-struct headname {					\
-	LIST_HEAD(, type)	chh_table[hashsize];	\
-}
-#define _CITRUS_HASH_INIT(head, hashsize)			\
-do {								\
-	int _ch_loop;						\
-	for (_ch_loop = 0; _ch_loop < hashsize; _ch_loop++)	\
-		LIST_INIT(&(head)->chh_table[_ch_loop]);	\
-} while (/*CONSTCOND*/0)
-#define _CITRUS_HASH_REMOVE(elm, field) LIST_REMOVE(elm, field)
-#define _CITRUS_HASH_INSERT(head, elm, field, hashval)		\
-LIST_INSERT_HEAD(&(head)->chh_table[hashval], elm, field)
-#define _CITRUS_HASH_SEARCH(head, elm, field, matchfunc, key, hashval)	\
-do {									\
-	LIST_FOREACH((elm), &(head)->chh_table[hashval], field) {	\
-		if (matchfunc((elm), key)==0)				\
-			break;						\
-	}								\
-} while (/*CONSTCOND*/0)
-
-__BEGIN_DECLS
-int	_citrus_string_hash_func(const char *, int);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/citrus_iconv.c b/lib/libc/citrus/citrus_iconv.c
deleted file mode 100644
index 3b8f61e53..000000000
--- a/lib/libc/citrus/citrus_iconv.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/*	$NetBSD: citrus_iconv.c,v 1.10 2011/11/19 18:34:21 tnozaki Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_iconv.c,v 1.10 2011/11/19 18:34:21 tnozaki Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <sys/types.h>
-#include <sys/queue.h>
-
-#include <assert.h>
-#include <dirent.h>
-#include <errno.h>
-#include <limits.h>
-#include <paths.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_mmap.h"
-#include "citrus_module.h"
-#include "citrus_lookup.h"
-#include "citrus_hash.h"
-#include "citrus_iconv.h"
-
-#define _CITRUS_ICONV_DIR	"iconv.dir"
-#define _CITRUS_ICONV_ALIAS	"iconv.alias"
-
-#define CI_HASH_SIZE 101
-#define CI_INITIAL_MAX_REUSE	5
-#define CI_ENV_MAX_REUSE	"ICONV_MAX_REUSE"
-
-#ifdef _REENTRANT
-static rwlock_t lock = RWLOCK_INITIALIZER;
-#endif
-
-static bool isinit = false;
-static _CITRUS_HASH_HEAD(, _citrus_iconv_shared, CI_HASH_SIZE) shared_pool;
-static TAILQ_HEAD(, _citrus_iconv_shared) shared_unused;
-static int shared_num_unused, shared_max_reuse;
-
-static __inline void
-init_cache(void)
-{
-	rwlock_wrlock(&lock);
-	if (!isinit) {
-		_CITRUS_HASH_INIT(&shared_pool, CI_HASH_SIZE);
-		TAILQ_INIT(&shared_unused);
-		shared_max_reuse = -1;
-		if (!issetugid() && getenv(CI_ENV_MAX_REUSE))
-			shared_max_reuse = atoi(getenv(CI_ENV_MAX_REUSE));
-		if (shared_max_reuse < 0)
-			shared_max_reuse = CI_INITIAL_MAX_REUSE;
-		isinit = true;
-	}
-	rwlock_unlock(&lock);
-}
-
-/*
- * lookup_iconv_entry:
- *	lookup iconv.dir entry in the specified directory.
- *
- * line format of iconv.dir file:
- *	key  module  arg
- * key    : lookup key.
- * module : iconv module name.
- * arg    : argument for the module (generally, description file name)
- *
- */
-static __inline int
-lookup_iconv_entry(const char *curdir, const char *key,
-		   char *linebuf, size_t linebufsize,
-		   const char **module, const char **variable)
-{
-	const char *cp, *cq;
-	char *p, path[PATH_MAX];
-
-	/* iconv.dir path */
-	snprintf(path, (size_t)PATH_MAX, ("%s/" _CITRUS_ICONV_DIR), curdir);
-
-	/* lookup db */
-	cp = p = _lookup_simple(path, key, linebuf, linebufsize,
-				_LOOKUP_CASE_IGNORE);
-	if (p == NULL)
-		return ENOENT;
-
-	/* get module name */
-	*module = p;
-	cq = _bcs_skip_nonws(cp);
-	p[cq-cp] = '\0';
-	p += cq-cp+1;
-	cq++;
-
-	/* get variable */
-	cp = _bcs_skip_ws(cq);
-	*variable = p += cp - cq;
-	cq = _bcs_skip_nonws(cp);
-	p[cq-cp] = '\0';
-
-	return 0;
-}
-
-static __inline void
-close_shared(struct _citrus_iconv_shared *ci)
-{
-	if (ci) {
-		if (ci->ci_module) {
-			if (ci->ci_ops) {
-				if (ci->ci_closure)
-					(*ci->ci_ops->io_uninit_shared)(ci);
-				free(ci->ci_ops);
-			}
-			_citrus_unload_module(ci->ci_module);
-		}
-		free(ci);
-	}
-}
-
-static __inline int
-open_shared(struct _citrus_iconv_shared * __restrict * __restrict rci,
-	    const char * __restrict basedir, const char * __restrict convname,
-	    const char * __restrict src, const char * __restrict dst)
-{
-	int ret;
-	struct _citrus_iconv_shared *ci;
-	_citrus_iconv_getops_t getops;
-	char linebuf[LINE_MAX];
-	const char *module, *variable;
-	size_t len_convname;
-
-	/* search converter entry */
-	ret = lookup_iconv_entry(basedir, convname, linebuf, sizeof(linebuf),
-				 &module, &variable);
-	if (ret) {
-		if (ret == ENOENT)
-			/* fallback */
-			ret = lookup_iconv_entry(basedir, "*",
-						 linebuf, sizeof(linebuf),
-						 &module, &variable);
-		if (ret)
-			return ret;
-	}
-
-	/* initialize iconv handle */
-	len_convname = strlen(convname);
-	ci = malloc(sizeof(*ci)+len_convname+1);
-	if (!ci) {
-		ret = errno;
-		goto err;
-	}
-	ci->ci_module = NULL;
-	ci->ci_ops = NULL;
-	ci->ci_closure = NULL;
-	ci->ci_convname = (void *)&ci[1];
-	memcpy(ci->ci_convname, convname, len_convname+1);
-
-	/* load module */
-	ret = _citrus_load_module(&ci->ci_module, module);
-	if (ret)
-		goto err;
-
-	/* get operators */
-	getops = (_citrus_iconv_getops_t)
-	    _citrus_find_getops(ci->ci_module, module, "iconv");
-	if (!getops) {
-		ret = EOPNOTSUPP;
-		goto err;
-	}
-	ci->ci_ops = malloc(sizeof(*ci->ci_ops));
-	if (!ci->ci_ops) {
-		ret = errno;
-		goto err;
-	}
-	ret = (*getops)(ci->ci_ops, sizeof(*ci->ci_ops),
-			_CITRUS_ICONV_ABI_VERSION);
-	if (ret)
-		goto err;
-
-	/* version check */
-	if (ci->ci_ops->io_abi_version == 1) {
-		/* binary compatibility broken at ver.2 */
-		ret = EINVAL;
-		goto err;
-	}
-
-	if (ci->ci_ops->io_init_shared == NULL ||
-	    ci->ci_ops->io_uninit_shared == NULL ||
-	    ci->ci_ops->io_init_context == NULL ||
-	    ci->ci_ops->io_uninit_context == NULL ||
-	    ci->ci_ops->io_convert == NULL) {
-		ret = EINVAL;
-		goto err;
-	}
-
-	/* initialize the converter */
-	ret = (*ci->ci_ops->io_init_shared)(ci, basedir, src, dst,
-					    (const void *)variable,
-					    strlen(variable)+1);
-	if (ret)
-		goto err;
-
-	*rci = ci;
-
-	return 0;
-err:
-	close_shared(ci);
-	return ret;
-}
-
-static __inline int
-hash_func(const char *key)
-{
-	return _string_hash_func(key, CI_HASH_SIZE);
-}
-
-static __inline int
-match_func(struct _citrus_iconv_shared * __restrict ci,
-	   const char * __restrict key)
-{
-	return strcmp(ci->ci_convname, key);
-}
-
-static int
-get_shared(struct _citrus_iconv_shared * __restrict * __restrict rci,
-	   const char *basedir, const char *src, const char *dst)
-{
-	int ret = 0;
-	int hashval;
-	struct _citrus_iconv_shared * ci;
-	char convname[PATH_MAX];
-
-	snprintf(convname, sizeof(convname), "%s/%s", src, dst);
-
-	rwlock_wrlock(&lock);
-
-	/* lookup alread existing entry */
-	hashval = hash_func(convname);
-	_CITRUS_HASH_SEARCH(&shared_pool, ci, ci_hash_entry, match_func,
-			    convname, hashval);
-	if (ci != NULL) {
-		/* found */
-		if (ci->ci_used_count == 0) {
-			TAILQ_REMOVE(&shared_unused, ci, ci_tailq_entry);
-			shared_num_unused--;
-		}
-		ci->ci_used_count++;
-		*rci = ci;
-		goto quit;
-	}
-
-	/* create new entry */
-	ret = open_shared(&ci, basedir, convname, src, dst);
-	if (ret)
-		goto quit;
-
-	_CITRUS_HASH_INSERT(&shared_pool, ci, ci_hash_entry, hashval);
-	ci->ci_used_count = 1;
-	*rci = ci;
-
-quit:
-	rwlock_unlock(&lock);
-
-	return ret;
-}
-
-static void
-release_shared(struct _citrus_iconv_shared * __restrict ci)
-{
-	rwlock_wrlock(&lock);
-
-	ci->ci_used_count--;
-	if (ci->ci_used_count == 0) {
-		/* put it into unused list */
-		shared_num_unused++;
-		TAILQ_INSERT_TAIL(&shared_unused, ci, ci_tailq_entry);
-		/* flood out */
-		while (shared_num_unused > shared_max_reuse) {
-			ci = TAILQ_FIRST(&shared_unused);
-			_DIAGASSERT(ci != NULL);
-			TAILQ_REMOVE(&shared_unused, ci, ci_tailq_entry);
-			_CITRUS_HASH_REMOVE(ci, ci_hash_entry);
-			shared_num_unused--;
-			close_shared(ci);
-		}
-	}
-
-	rwlock_unlock(&lock);
-}
-
-/*
- * _citrus_iconv_open:
- *	open a converter for the specified in/out codes.
- */
-int
-_citrus_iconv_open(struct _citrus_iconv * __restrict * __restrict rcv,
-		   const char * __restrict basedir,
-		   const char * __restrict src, const char * __restrict dst)
-{
-	int ret;
-	struct _citrus_iconv_shared *ci = NULL;
-	struct _citrus_iconv *cv;
-	char realsrc[PATH_MAX], realdst[PATH_MAX];
-	char buf[PATH_MAX], path[PATH_MAX];
-
-	init_cache();
-
-	/* resolve codeset name aliases */
-	snprintf(path, sizeof(path), "%s/%s", basedir, _CITRUS_ICONV_ALIAS);
-	strlcpy(realsrc,
-		_lookup_alias(path, src, buf, (size_t)PATH_MAX,
-		_LOOKUP_CASE_IGNORE),
-		(size_t)PATH_MAX);
-	strlcpy(realdst,
-		_lookup_alias(path, dst, buf, (size_t)PATH_MAX,
-		_LOOKUP_CASE_IGNORE),
-		(size_t)PATH_MAX);
-
-	/* sanity check */
-	if (strchr(realsrc, '/') != NULL || strchr(realdst, '/'))
-		return EINVAL;
-
-	/* get shared record */
-	ret = get_shared(&ci, basedir, realsrc, realdst);
-	if (ret)
-		return ret;
-
-	/* create/init context */
-	cv = malloc(sizeof(*cv));
-	if (cv == NULL) {
-		ret = errno;
-		release_shared(ci);
-		return ret;
-	}
-	cv->cv_shared = ci;
-	ret = (*ci->ci_ops->io_init_context)(cv);
-	if (ret) {
-		release_shared(ci);
-		free(cv);
-		return ret;
-	}
-	*rcv = cv;
-
-	return 0;
-}
-
-/*
- * _citrus_iconv_close:
- *	close the specified converter.
- */
-void
-_citrus_iconv_close(struct _citrus_iconv *cv)
-{
-	if (cv) {
-		(*cv->cv_shared->ci_ops->io_uninit_context)(cv);
-		release_shared(cv->cv_shared);
-		free(cv);
-	}
-}
diff --git a/lib/libc/citrus/citrus_iconv.h b/lib/libc/citrus/citrus_iconv.h
deleted file mode 100644
index 37192600d..000000000
--- a/lib/libc/citrus/citrus_iconv.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: citrus_iconv.h,v 1.5 2008/02/09 14:56:20 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_ICONV_H_
-#define _CITRUS_ICONV_H_
-
-struct _citrus_iconv_shared;
-struct _citrus_iconv_ops;
-struct _citrus_iconv;
-
-__BEGIN_DECLS
-int	_citrus_iconv_open(struct _citrus_iconv * __restrict * __restrict,
-			   const char * __restrict,
-			   const char * __restrict, const char * __restrict);
-void	_citrus_iconv_close(struct _citrus_iconv *);
-__END_DECLS
-
-
-#include "citrus_iconv_local.h"
-
-#define _CITRUS_ICONV_F_HIDE_INVALID	0x0001
-
-/*
- * _citrus_iconv_convert:
- *	convert a string.
- */
-static __inline int
-_citrus_iconv_convert(struct _citrus_iconv * __restrict cv,
-		      const char * __restrict * __restrict in,
-		      size_t * __restrict inbytes,
-		      char * __restrict * __restrict out,
-		      size_t * __restrict outbytes, uint32_t flags,
-		      size_t * __restrict nresults)
-{
-
-	_DIAGASSERT(cv && cv->cv_shared && cv->cv_shared->ci_ops &&
-	    cv->cv_shared->ci_ops->io_convert);
-	_DIAGASSERT(out || outbytes == 0);
-
-	return (*cv->cv_shared->ci_ops->io_convert)(cv, in, inbytes, out,
-						    outbytes, flags, nresults);
-}
-
-#endif
diff --git a/lib/libc/citrus/citrus_iconv_local.h b/lib/libc/citrus/citrus_iconv_local.h
deleted file mode 100644
index fd42e84d2..000000000
--- a/lib/libc/citrus/citrus_iconv_local.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*	$NetBSD: citrus_iconv_local.h,v 1.3 2008/02/09 14:56:20 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_ICONV_LOCAL_H_
-#define _CITRUS_ICONV_LOCAL_H_
-
-#define _CITRUS_ICONV_GETOPS_FUNC_BASE(_n_)				\
-int _n_(struct _citrus_iconv_ops *, size_t, uint32_t)
-#define _CITRUS_ICONV_GETOPS_FUNC(_n_)					\
-_CITRUS_ICONV_GETOPS_FUNC_BASE(_citrus_##_n_##_iconv_getops)
-
-#define _CITRUS_ICONV_DECLS(_m_)					\
-static int	_citrus_##_m_##_iconv_init_shared			\
-	(struct _citrus_iconv_shared * __restrict,			\
-	 const char * __restrict,					\
-	 const char * __restrict, const char * __restrict,		\
-	 const void * __restrict, size_t);				\
-static void	_citrus_##_m_##_iconv_uninit_shared			\
-	(struct _citrus_iconv_shared *);				\
-static int	_citrus_##_m_##_iconv_convert				\
-	(struct _citrus_iconv * __restrict,				\
-	 const char * __restrict * __restrict, size_t * __restrict,	\
-	 char * __restrict * __restrict, size_t * __restrict outbytes,	\
-	 uint32_t, size_t * __restrict);				\
-static int	_citrus_##_m_##_iconv_init_context			\
-	(struct _citrus_iconv *);					\
-static void	_citrus_##_m_##_iconv_uninit_context			\
-	(struct _citrus_iconv *)
-
-
-#define _CITRUS_ICONV_DEF_OPS(_m_)					\
-struct _citrus_iconv_ops _citrus_##_m_##_iconv_ops = {			\
-	/* io_abi_version */	_CITRUS_ICONV_ABI_VERSION,		\
-	/* io_init_shared */	&_citrus_##_m_##_iconv_init_shared,	\
-	/* io_uninit_shared */	&_citrus_##_m_##_iconv_uninit_shared,	\
-	/* io_init_context */	&_citrus_##_m_##_iconv_init_context,	\
-	/* io_uninit_context */	&_citrus_##_m_##_iconv_uninit_context,	\
-	/* io_convert */	&_citrus_##_m_##_iconv_convert		\
-}
-
-typedef _CITRUS_ICONV_GETOPS_FUNC_BASE((*_citrus_iconv_getops_t));
-typedef	int	(*_citrus_iconv_init_shared_t)
-	(struct _citrus_iconv_shared * __restrict,
-	 const char * __restrict, const char * __restrict,
-	 const char * __restrict, const void * __restrict, size_t);
-typedef void	(*_citrus_iconv_uninit_shared_t)
-	(struct _citrus_iconv_shared *);
-typedef int	(*_citrus_iconv_convert_t)
-	(struct _citrus_iconv * __restrict,
-	 const char *__restrict* __restrict, size_t * __restrict,
-	 char * __restrict * __restrict, size_t * __restrict, uint32_t,
-	 size_t * __restrict);
-typedef int	(*_citrus_iconv_init_context_t)(struct _citrus_iconv *);
-typedef void	(*_citrus_iconv_uninit_context_t)(struct _citrus_iconv *);
-
-struct _citrus_iconv_ops {
-	uint32_t			io_abi_version;
-	_citrus_iconv_init_shared_t	io_init_shared;
-	_citrus_iconv_uninit_shared_t	io_uninit_shared;
-	_citrus_iconv_init_context_t	io_init_context;
-	_citrus_iconv_uninit_context_t	io_uninit_context;
-	_citrus_iconv_convert_t		io_convert;
-};
-#define _CITRUS_ICONV_ABI_VERSION	2
-
-struct _citrus_iconv_shared {
-	struct _citrus_iconv_ops			*ci_ops;
-	void						*ci_closure;
-	/* private */
-	_CITRUS_HASH_ENTRY(_citrus_iconv_shared)	ci_hash_entry;
-	TAILQ_ENTRY(_citrus_iconv_shared)		ci_tailq_entry;
-	_citrus_module_t				ci_module;
-	unsigned int					ci_used_count;
-	char						*ci_convname;
-};
-
-struct _citrus_iconv {
-	struct _citrus_iconv_shared	*cv_shared;
-	void				*cv_closure;
-};
-
-#endif
diff --git a/lib/libc/citrus/citrus_lc_ctype.c b/lib/libc/citrus/citrus_lc_ctype.c
deleted file mode 100644
index 3205b09ad..000000000
--- a/lib/libc/citrus/citrus_lc_ctype.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* $NetBSD: citrus_lc_ctype.c,v 1.15 2013/09/13 13:13:32 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_lc_ctype.c,v 1.15 2013/09/13 13:13:32 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/ctype_bits.h>
-#include <sys/queue.h>
-#include <assert.h>
-#include <errno.h>
-#include <langinfo.h>
-#include <limits.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-
-#include "setlocale_local.h"
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_lookup.h"
-#include "citrus_aliasname_local.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_mmap.h"
-
-#include "runetype_local.h"
-#include "multibyte.h"
-
-/*
- * macro required by all template headers
- */
-#define _PREFIX(name)		__CONCAT(_citrus_LC_CTYPE_, name)
-
-/*
- * macro required by nb_lc_template(_decl).h
- */
-#define _CATEGORY_TYPE          _RuneLocale
-
-#include "nb_lc_template_decl.h"
-
-static int
-_citrus_LC_CTYPE_create_impl(const char * __restrict root,
-    const char * __restrict name, _RuneLocale ** __restrict pdata)
-{
-	char path[PATH_MAX + 1];
-	int ret;
-	struct _region r;
-
-	_DIAGASSERT(root != NULL);
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(pdata != NULL);
-
-	snprintf(path, sizeof(path),
-	    "%s/%s/LC_CTYPE", root, name);
-	ret = _citrus_map_file(&r, path);
-	if (!ret) {
-		ret = _rune_load((const char *)r.r_head, r.r_size, pdata);
-		_citrus_unmap_file(&r);
-	}
-	return ret;
-}
-
-static __inline void
-_PREFIX(update_global)(_RuneLocale *data)
-{
-	_DIAGASSERT(data != NULL);
-
-	__mb_cur_max = _citrus_ctype_get_mb_cur_max(data->rl_citrus_ctype);
-	_ctype_tab_ = data->rl_ctype_tab;
-	_tolower_tab_ = data->rl_tolower_tab;
-	_toupper_tab_ = data->rl_toupper_tab;
-
-#ifdef __BUILD_LEGACY
-	_ctype_ = data->rl_compat_bsdctype;
-#endif
-}
-
-/*
- * macro required by nb_lc_template.h
- */
-#define _CATEGORY_ID		LC_CTYPE
-#define _CATEGORY_NAME		"LC_CTYPE"
-
-#include "nb_lc_template.h"
diff --git a/lib/libc/citrus/citrus_lc_messages.c b/lib/libc/citrus/citrus_lc_messages.c
deleted file mode 100644
index 8f0936042..000000000
--- a/lib/libc/citrus/citrus_lc_messages.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/* $NetBSD: citrus_lc_messages.c,v 1.5 2012/03/04 21:14:55 tnozaki Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_lc_messages.c,v 1.5 2012/03/04 21:14:55 tnozaki Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/localedef.h>
-#include <sys/queue.h>
-#include <assert.h>
-#include <errno.h>
-#include <langinfo.h>
-#include <limits.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "setlocale_local.h"
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_lookup.h"
-#include "citrus_aliasname_local.h"
-#include "citrus_module.h"
-#include "citrus_mmap.h"
-#include "citrus_hash.h"
-#include "citrus_db.h"
-#include "citrus_db_hash.h"
-#include "citrus_memstream.h"
-#include "runetype_local.h"
-
-/*
- * macro required by all template headers
- */
-#define _PREFIX(name)		__CONCAT(_citrus_LC_MESSAGES_, name)
-
-#include "nb_lc_messages_misc.h"
-#include "citrus_lc_template_decl.h"
-
-static __inline void
-_citrus_LC_MESSAGES_uninit(_MessagesLocale *data)
-{
-	free(__UNCONST(data->yesexpr));
-	free(__UNCONST(data->noexpr));
-	free(__UNCONST(data->yesstr));
-	free(__UNCONST(data->nostr));
-}
-
-#include "citrus_lc_messages.h"
-
-struct _citrus_LC_MESSAGES_key {
-	const char *name;
-	size_t offset;
-};
-
-#define OFFSET(field) (offsetof(_MessagesLocale, field))
-static const struct _citrus_LC_MESSAGES_key keys[] = {
-  { _CITRUS_LC_MESSAGES_SYM_YESEXPR, OFFSET(yesexpr) },
-  { _CITRUS_LC_MESSAGES_SYM_NOEXPR,  OFFSET(noexpr ) },
-  { _CITRUS_LC_MESSAGES_SYM_YESSTR,  OFFSET(yesstr ) },
-  { _CITRUS_LC_MESSAGES_SYM_NOSTR,   OFFSET(nostr  ) },
-  { NULL, 0 }
-};
-
-static __inline int
-_citrus_LC_MESSAGES_init_normal(_MessagesLocale * __restrict data,
-    struct _citrus_db * __restrict db)
-{
-	const struct _citrus_LC_MESSAGES_key *key;
-	char **p;
-	const char *s;
-
-	_DIAGASSERT(data != NULL);
-	_DIAGASSERT(db != NULL);
-
-	memset(data, 0, sizeof(*data));
-	for (key = &keys[0]; key->name != NULL; ++key) {
-		if (_db_lookupstr_by_s(db, key->name, &s, NULL))
-			goto fatal;
-		p = (char **)(void *)
-		    (((char *)(void *)data) + key->offset);
-		*p = strdup(s);
-		if (*p == NULL)
-			goto fatal;
-	}
-	return 0;
-
-fatal:
-	_citrus_LC_MESSAGES_uninit(data);
-	return EFTYPE;
-}
-
-static __inline int
-_citrus_LC_MESSAGES_init_fallback(_MessagesLocale * __restrict data,
-    struct _memstream * __restrict ms)
-{
-	const struct _citrus_LC_MESSAGES_key *key;
-	char **p;
-	const char *s;
-	size_t n;
-
-	_DIAGASSERT(data != NULL);
-	_DIAGASSERT(ms != NULL);
-
-	memset(data, 0, sizeof(*data));
-	for (key = &keys[0]; key->name != NULL; ++key) {
-		if ((s = _memstream_getln(ms, &n)) == NULL)
-			goto fatal;
-		p = (char **)(void *)
-		    (((char *)(void *)data) + key->offset);
-		*p = strndup(s, n - 1);
-		if (*p == NULL)
-			goto fatal;
-	}
-	return 0;
-
-fatal:
-	_citrus_LC_MESSAGES_uninit(data);
-	return EFTYPE;
-}
-
-/*
- * macro required by citrus_lc_template.h
- */
-#define _CATEGORY_DB		"LC_MESSAGES/SYS_LC_MESSAGES"
-#define _CATEGORY_MAGIC		_CITRUS_LC_MESSAGES_MAGIC_1
-
-#include "citrus_lc_template.h"
diff --git a/lib/libc/citrus/citrus_lc_messages.h b/lib/libc/citrus/citrus_lc_messages.h
deleted file mode 100644
index cdf7d395c..000000000
--- a/lib/libc/citrus/citrus_lc_messages.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $NetBSD: citrus_lc_messages.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_LC_MESSAGES_H_
-#define _CITRUS_LC_MESSAGES_H_
-
-/*
- *
- */
-#define _CITRUS_LC_MESSAGES_MAGIC_1		"CtrsME10"
-#define _CITRUS_LC_MESSAGES_SYM_VERSION		"version"
-#define _CITRUS_LC_MESSAGES_VERSION		0x00000001
-
-/*
- *
- */
-#define _CITRUS_LC_MESSAGES_SYM_YESEXPR			"yesexpr"
-#define _CITRUS_LC_MESSAGES_SYM_NOEXPR			"noexpr"
-#define _CITRUS_LC_MESSAGES_SYM_YESSTR			"yesstr"
-#define _CITRUS_LC_MESSAGES_SYM_NOSTR			"nostr"
-
-#endif /*_CITRUS_LC_MESSAGES_H_*/
diff --git a/lib/libc/citrus/citrus_lc_monetary.c b/lib/libc/citrus/citrus_lc_monetary.c
deleted file mode 100644
index 563dc3e99..000000000
--- a/lib/libc/citrus/citrus_lc_monetary.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* $NetBSD: citrus_lc_monetary.c,v 1.5 2012/03/04 21:14:55 tnozaki Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_lc_monetary.c,v 1.5 2012/03/04 21:14:55 tnozaki Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/localedef.h>
-#include <sys/queue.h>
-#include <assert.h>
-#include <errno.h>
-#include <langinfo.h>
-#include <limits.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "setlocale_local.h"
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_lookup.h"
-#include "citrus_aliasname_local.h"
-#include "citrus_module.h"
-#include "citrus_mmap.h"
-#include "citrus_hash.h"
-#include "citrus_db.h"
-#include "citrus_db_hash.h"
-#include "citrus_memstream.h"
-#include "runetype_local.h"
-
-#include "fix_grouping.h"
-#include "citrus_fix_grouping.h"
-
-/*
- * macro required by all template headers
- */
-#define _PREFIX(name)		__CONCAT(_citrus_LC_MONETARY_, name)
-
-#include "nb_lc_monetary_misc.h"
-#include "citrus_lc_template_decl.h"
-
-static __inline void
-_citrus_LC_MONETARY_uninit(_MonetaryLocale *data)
-{
-	_DIAGASSERT(data != NULL);
-
-	free(__UNCONST(data->int_curr_symbol));
-	free(__UNCONST(data->currency_symbol));
-	free(__UNCONST(data->mon_decimal_point));
-	free(__UNCONST(data->mon_thousands_sep));
-	free(__UNCONST(data->mon_grouping));
-	free(__UNCONST(data->positive_sign));
-	free(__UNCONST(data->negative_sign));
-}
-
-#include "citrus_lc_monetary.h"
-
-struct _citrus_LC_MONETARY_key {
-	const char *name;
-	size_t offset;
-};
-
-#define OFFSET(field) (offsetof(_MonetaryLocale, field))
-static const struct _citrus_LC_MONETARY_key keys_string[] = {
-  { _CITRUS_LC_MONETARY_SYM_INT_CURR_SYMBOL,    OFFSET(int_curr_symbol   ) },
-  { _CITRUS_LC_MONETARY_SYM_CURRENCY_SYMBOL,    OFFSET(currency_symbol   ) },
-  { _CITRUS_LC_MONETARY_SYM_MON_DECIMAL_POINT,  OFFSET(mon_decimal_point ) },
-  { _CITRUS_LC_MONETARY_SYM_MON_THOUSANDS_SEP,  OFFSET(mon_thousands_sep ) },
-  { _CITRUS_LC_MONETARY_SYM_MON_GROUPING,       OFFSET(mon_grouping      ) },
-  { _CITRUS_LC_MONETARY_SYM_POSITIVE_SIGN,      OFFSET(positive_sign     ) },
-  { _CITRUS_LC_MONETARY_SYM_NEGATIVE_SIGN,      OFFSET(negative_sign     ) },
-  { NULL, (size_t)0 }
-};
-static const struct _citrus_LC_MONETARY_key keys_char[] = {
-  { _CITRUS_LC_MONETARY_SYM_INT_FRAC_DIGITS,    OFFSET(int_frac_digits   ) },
-  { _CITRUS_LC_MONETARY_SYM_FRAC_DIGITS,        OFFSET(frac_digits       ) },
-  { _CITRUS_LC_MONETARY_SYM_P_CS_PRECEDES,      OFFSET(p_cs_precedes     ) },
-  { _CITRUS_LC_MONETARY_SYM_P_SEP_BY_SPACE,     OFFSET(p_sep_by_space    ) },
-  { _CITRUS_LC_MONETARY_SYM_N_CS_PRECEDES,      OFFSET(n_cs_precedes     ) },
-  { _CITRUS_LC_MONETARY_SYM_N_SEP_BY_SPACE,     OFFSET(n_sep_by_space    ) },
-  { _CITRUS_LC_MONETARY_SYM_P_SIGN_POSN,        OFFSET(p_sign_posn       ) },
-  { _CITRUS_LC_MONETARY_SYM_N_SIGN_POSN,        OFFSET(n_sign_posn       ) },
-  { _CITRUS_LC_MONETARY_SYM_INT_P_CS_PRECEDES,  OFFSET(int_p_cs_precedes ) },
-  { _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES,  OFFSET(int_n_cs_precedes ) },
-  { _CITRUS_LC_MONETARY_SYM_INT_P_SEP_BY_SPACE, OFFSET(int_p_sep_by_space) },
-  { _CITRUS_LC_MONETARY_SYM_INT_N_SEP_BY_SPACE, OFFSET(int_n_sep_by_space) },
-  { _CITRUS_LC_MONETARY_SYM_INT_P_SIGN_POSN,    OFFSET(int_p_sign_posn   ) },
-  { _CITRUS_LC_MONETARY_SYM_INT_N_SIGN_POSN,    OFFSET(int_n_sign_posn   ) },
-  { NULL, (size_t)0 }
-};
-
-static __inline int
-_citrus_LC_MONETARY_init_normal(_MonetaryLocale * __restrict data,
-    struct _citrus_db * __restrict db)
-{
-	const struct _citrus_LC_MONETARY_key *key;
-	char **p_string, *p_char;
-	const char *s;
-	uint8_t u8;
-
-	_DIAGASSERT(data != NULL);
-	_DIAGASSERT(db != NULL);
-
-	memset(data, 0, sizeof(*data));
-	for (key = &keys_string[0]; key->name != NULL; ++key) {
-		if (_db_lookupstr_by_s(db, key->name, &s, NULL))
-			goto fatal;
-		p_string = (char **)(void *)
-		    (((char *)(void *)data) + key->offset);
-		*p_string = strdup(s);
-		if (*p_string == NULL)
-			goto fatal;
-	}
-	for (key = &keys_char[0]; key->name != NULL; ++key) {
-		if (_db_lookup8_by_s(db, key->name, &u8, NULL))
-			goto fatal;
-		p_char = ((char *)(void *)data) + key->offset;
-		*p_char = (char)(unsigned char)u8;
-	}
-	_CITRUS_FIXUP_CHAR_MAX_MD(data->mon_grouping);
-
-	return 0;
-
-fatal:
-	_citrus_LC_MONETARY_uninit(data);
-	return EFTYPE;
-}
-
-static __inline int
-_citrus_LC_MONETARY_init_fallback(_MonetaryLocale * __restrict data,
-    struct _memstream * __restrict ms)
-{
-	const struct _citrus_LC_MONETARY_key *key;
-	char **p_string, *p_char;
-	const char *s;
-	size_t n;
-	char *t;
-	long int l;
-
-	_DIAGASSERT(data != NULL);
-	_DIAGASSERT(ms != NULL);
-
-	memset(data, 0, sizeof(*data));
-	for (key = &keys_string[0]; key->name != NULL; ++key) {
-		if ((s = _memstream_getln(ms, &n)) == NULL)
-			goto fatal;
-		p_string = (char **)(void *)
-		    (((char *)(void *)data) + key->offset);
-		*p_string = strndup(s, n - 1);
-		if (*p_string == NULL)
-			goto fatal;
-	}
-	for (key = &keys_char[0]; key->name != NULL; ++key) {
-		if ((s = _memstream_getln(ms, &n)) == NULL)
-			goto fatal;
-		t = strndup(s, n - 1);
-		if (t == NULL)
-			goto fatal;
-		s = (const char *)t;
-		l = _bcs_strtol(s, &t, 0);
-		if (s == t || l < 0 || l > 0x7fL) {
-			free(t);
-			goto fatal;
-		}
-		free(t);
-		p_char = ((char *)(void *)data) + key->offset;
-		*p_char = (char)(l & 0x7fL);
-	}
-        data->mon_grouping =
-	    __fix_locale_grouping_str(data->mon_grouping);
-	return 0;
-
-fatal:
-	_citrus_LC_MONETARY_uninit(data);
-	return EFTYPE;
-}
-
-/*
- * macro required by citrus_lc_template.h
- */
-#define _CATEGORY_DB		"LC_MONETARY"
-#define _CATEGORY_MAGIC		_CITRUS_LC_MONETARY_MAGIC_1
-
-#include "citrus_lc_template.h"
diff --git a/lib/libc/citrus/citrus_lc_monetary.h b/lib/libc/citrus/citrus_lc_monetary.h
deleted file mode 100644
index 0ef146c88..000000000
--- a/lib/libc/citrus/citrus_lc_monetary.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $NetBSD: citrus_lc_monetary.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_LC_MONETARY_H_
-#define _CITRUS_LC_MONETARY_H_
-
-/*
- *
- */
-#define _CITRUS_LC_MONETARY_MAGIC_1		"CtrsMO10"
-#define _CITRUS_LC_MONETARY_SYM_VERSION		"version"
-#define _CITRUS_LC_MONETARY_VERSION		0x00000001
-
-/*
- *
- */
-#define _CITRUS_LC_MONETARY_SYM_INT_CURR_SYMBOL		"int_curr_symbol"
-#define _CITRUS_LC_MONETARY_SYM_CURRENCY_SYMBOL		"currency_symbol"
-#define _CITRUS_LC_MONETARY_SYM_MON_DECIMAL_POINT	"mon_decimal_point"
-#define _CITRUS_LC_MONETARY_SYM_MON_THOUSANDS_SEP	"mon_thousands_sep"
-#define _CITRUS_LC_MONETARY_SYM_MON_GROUPING		"mon_grouping"
-#define _CITRUS_LC_MONETARY_SYM_POSITIVE_SIGN		"positive_sign"
-#define _CITRUS_LC_MONETARY_SYM_NEGATIVE_SIGN		"negative_sign"
-#define _CITRUS_LC_MONETARY_SYM_INT_FRAC_DIGITS		"int_frac_digits"
-#define _CITRUS_LC_MONETARY_SYM_FRAC_DIGITS		"frac_digits"
-#define _CITRUS_LC_MONETARY_SYM_P_CS_PRECEDES		"p_cs_precedes"
-#define _CITRUS_LC_MONETARY_SYM_P_SEP_BY_SPACE		"p_sep_by_space"
-#define _CITRUS_LC_MONETARY_SYM_N_CS_PRECEDES		"n_cs_precedes"
-#define _CITRUS_LC_MONETARY_SYM_N_SEP_BY_SPACE		"n_sep_by_space"
-#define _CITRUS_LC_MONETARY_SYM_P_SIGN_POSN		"p_sign_posn"
-#define _CITRUS_LC_MONETARY_SYM_N_SIGN_POSN		"n_sign_posn"
-#define _CITRUS_LC_MONETARY_SYM_INT_P_CS_PRECEDES	"int_p_cs_precedes"
-#define _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES	"int_n_cs_precedes"
-#define _CITRUS_LC_MONETARY_SYM_INT_P_SEP_BY_SPACE	"int_p_sep_by_space"
-#define _CITRUS_LC_MONETARY_SYM_INT_N_SEP_BY_SPACE	"int_n_sep_by_space"
-#define _CITRUS_LC_MONETARY_SYM_INT_P_SIGN_POSN		"int_p_sign_posn"
-#define _CITRUS_LC_MONETARY_SYM_INT_N_SIGN_POSN		"int_n_sign_posn"
-
-#endif /*_CITRUS_LC_MONETARY_H_*/
diff --git a/lib/libc/citrus/citrus_lc_numeric.c b/lib/libc/citrus/citrus_lc_numeric.c
deleted file mode 100644
index 7115bf1fe..000000000
--- a/lib/libc/citrus/citrus_lc_numeric.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* $NetBSD: citrus_lc_numeric.c,v 1.5 2012/03/04 21:14:55 tnozaki Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_lc_numeric.c,v 1.5 2012/03/04 21:14:55 tnozaki Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/localedef.h>
-#include <sys/queue.h>
-#include <assert.h>
-#include <errno.h>
-#include <langinfo.h>
-#include <limits.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "setlocale_local.h"
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_lookup.h"
-#include "citrus_aliasname_local.h"
-#include "citrus_module.h"
-#include "citrus_mmap.h"
-#include "citrus_hash.h"
-#include "citrus_db.h"
-#include "citrus_db_hash.h"
-#include "citrus_memstream.h"
-#include "runetype_local.h"
-
-#include "fix_grouping.h"
-#include "citrus_fix_grouping.h"
-
-/*
- * macro required by all template headers
- */
-#define _PREFIX(name)		__CONCAT(_citrus_LC_NUMERIC_, name)
-
-#include "nb_lc_numeric_misc.h"
-#include "citrus_lc_template_decl.h"
-
-static __inline void
-_citrus_LC_NUMERIC_uninit(_NumericLocale *data)
-{
-	free(__UNCONST(data->decimal_point));
-	free(__UNCONST(data->thousands_sep));
-	free(__UNCONST(data->grouping));
-}
-
-#include "citrus_lc_numeric.h"
-
-struct _citrus_LC_NUMERIC_key {
-	const char *name;
-	size_t offset;
-};
-
-#define OFFSET(field) (offsetof(_NumericLocale, field))
-static const struct _citrus_LC_NUMERIC_key keys[] = {
-  { _CITRUS_LC_NUMERIC_SYM_DECIMAL_POINT, OFFSET(decimal_point) },
-  { _CITRUS_LC_NUMERIC_SYM_THOUSANDS_SEP, OFFSET(thousands_sep) },
-  { _CITRUS_LC_NUMERIC_SYM_GROUPING,      OFFSET(grouping     ) },
-  { NULL, 0 }
-};
-
-static __inline int
-_citrus_LC_NUMERIC_init_normal(_NumericLocale * __restrict data,
-    struct _citrus_db * __restrict db)
-{
-	const struct _citrus_LC_NUMERIC_key *key;
-	char **p;
-	const char *s;
-
-	_DIAGASSERT(data != NULL);
-	_DIAGASSERT(db != NULL);
-
-	memset(data, 0, sizeof(*data));
-	for (key = &keys[0]; key->name != NULL; ++key) {
-		if (_db_lookupstr_by_s(db, key->name, &s, NULL))
-			goto fatal;
-		p = (char **)(void *)
-		    (((char *)(void *)data) + key->offset);
-		*p = strdup(s);
-		if (*p == NULL)
-			goto fatal;
-	}
-	_CITRUS_FIXUP_CHAR_MAX_MD(data->grouping);
-
-	return 0;
-
-fatal:
-	_citrus_LC_NUMERIC_uninit(data);
-	return EFTYPE;
-}
-
-static __inline int
-_citrus_LC_NUMERIC_init_fallback(_NumericLocale * __restrict data,
-    struct _memstream * __restrict ms)
-{
-	const struct _citrus_LC_NUMERIC_key *key;
-	char **p;
-	const char *s;
-	size_t n;
-
-	_DIAGASSERT(data != NULL);
-	_DIAGASSERT(ms != NULL);
-
-	memset(data, 0, sizeof(*data));
-	for (key = &keys[0]; key->name != NULL; ++key) {
-		if ((s = _memstream_getln(ms, &n)) == NULL)
-			goto fatal;
-		p = (char **)(void *)
-		    (((char *)(void *)data) + key->offset);
-		*p = strndup(s, n - 1);
-		if (*p == NULL)
-			goto fatal;
-	}
-	data->grouping =
-	    __fix_locale_grouping_str(data->grouping);
-
-	return 0;
-
-fatal:
-	_citrus_LC_NUMERIC_uninit(data);
-	return EFTYPE;
-}
-
-/*
- * macro required by citrus_lc_template.h
- */
-#define _CATEGORY_DB		"LC_NUMERIC"
-#define _CATEGORY_MAGIC		_CITRUS_LC_NUMERIC_MAGIC_1
-
-#include "citrus_lc_template.h"
diff --git a/lib/libc/citrus/citrus_lc_numeric.h b/lib/libc/citrus/citrus_lc_numeric.h
deleted file mode 100644
index cf9bdd837..000000000
--- a/lib/libc/citrus/citrus_lc_numeric.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: citrus_lc_numeric.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_LC_NUMERIC_H_
-#define _CITRUS_LC_NUMERIC_H_
-
-/*
- *
- */
-#define _CITRUS_LC_NUMERIC_MAGIC_1	"CtrsNU10"
-#define _CITRUS_LC_NUMERIC_SYM_VERSION	"version"
-#define _CITRUS_LC_NUMERIC_VERSION	0x00000001
-
-/*
- *
- */
-#define _CITRUS_LC_NUMERIC_SYM_DECIMAL_POINT		"decimal_point"
-#define _CITRUS_LC_NUMERIC_SYM_THOUSANDS_SEP		"thousands_sep"
-#define _CITRUS_LC_NUMERIC_SYM_GROUPING			"grouping"
-
-#endif /*_CITRUS_LC_NUMERIC_H_*/
diff --git a/lib/libc/citrus/citrus_lc_template.h b/lib/libc/citrus/citrus_lc_template.h
deleted file mode 100644
index 42b2c2299..000000000
--- a/lib/libc/citrus/citrus_lc_template.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* $NetBSD: citrus_lc_template.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_LC_TEMPLATE_H_
-#define _CITRUS_LC_TEMPLATE_H_
-
-static __inline int
-_PREFIX(create_impl)(const char * __restrict root,
-    const char * __restrict name, _CATEGORY_TYPE ** __restrict pdata)
-{
-	char path[PATH_MAX + 1];
-	int ret;
-	struct _region file;
-	struct _citrus_db *db;
-	struct _memstream ms;
-	_CATEGORY_TYPE *data;
-
-	snprintf(path, sizeof(path),
-	    "%s/%s/" _CATEGORY_DB, root, name);
-	ret = _map_file(&file, path);
-	if (ret) {
-		ret = ENOENT;
-	} else {
-		data = malloc(sizeof(*data));
-		if (!data) {
-			ret = ENOMEM;
-		} else {
-			ret = _db_open(&db, &file, _CATEGORY_MAGIC,
-			    &_db_hash_std, NULL);
-			if (!ret) {
-				ret = _PREFIX(init_normal)(data, db);
-				_db_close(db);
-			} else {
-				_memstream_bind(&ms, &file);
-				ret = _PREFIX(init_fallback)(data, &ms);
-			}
-			if (!ret)
-				*pdata = data;
-			else
-				free(data);
-		}
-		_unmap_file(&file);
-	}
-	return ret;
-}
-
-#include "nb_lc_template.h"
-
-#endif /* _CITRUS_LC_TEMPLATE_H_ */
diff --git a/lib/libc/citrus/citrus_lc_template_decl.h b/lib/libc/citrus/citrus_lc_template_decl.h
deleted file mode 100644
index e83c691ad..000000000
--- a/lib/libc/citrus/citrus_lc_template_decl.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $NetBSD: citrus_lc_template_decl.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_LC_TEMPLATE_DECL_H_
-#define _CITRUS_LC_TEMPLATE_DECL_H_
-
-#include "nb_lc_template_decl.h"
-
-static __inline int
-_PREFIX(init_normal)(_CATEGORY_TYPE * __restrict,
-    struct _citrus_db * __restrict db);
-
-static __inline int
-_PREFIX(init_fallback)(_CATEGORY_TYPE * __restrict,
-    struct _memstream * __restrict);
-
-#endif /*_CITRUS_LC_TEMPLATE_DECL_H_*/
diff --git a/lib/libc/citrus/citrus_lc_time.c b/lib/libc/citrus/citrus_lc_time.c
deleted file mode 100644
index 159a3cedd..000000000
--- a/lib/libc/citrus/citrus_lc_time.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* $NetBSD: citrus_lc_time.c,v 1.6 2012/03/04 21:14:55 tnozaki Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_lc_time.c,v 1.6 2012/03/04 21:14:55 tnozaki Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/localedef.h>
-#include <sys/queue.h>
-#include <assert.h>
-#include <errno.h>
-#include <langinfo.h>
-#include <limits.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "setlocale_local.h"
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_lookup.h"
-#include "citrus_aliasname_local.h"
-#include "citrus_module.h"
-#include "citrus_mmap.h"
-#include "citrus_hash.h"
-#include "citrus_db.h"
-#include "citrus_db_hash.h"
-#include "citrus_memstream.h"
-#include "runetype_local.h"
-
-/*
- * macro required by all template headers
- */
-#define _PREFIX(name)		__CONCAT(_citrus_LC_TIME_, name)
-
-#include "nb_lc_time_misc.h"
-#include "citrus_lc_template_decl.h"
-
-static __inline void
-_citrus_LC_TIME_uninit(_TimeLocale *data)
-{
-	size_t i, j;
-
-	_DIAGASSERT(data != NULL);
-
-	for (i = ABDAY_IDX(ABDAY_1), j = ABDAY_IDX(ABDAY_7);  i <= j; ++i)
-		free(__UNCONST(data->abday[i]));
-	for (i = DAY_IDX(DAY_1),     j = DAY_IDX(DAY_7);      i <= j; ++i)
-		free(__UNCONST(data->day[i]));
-	for (i = ABMON_IDX(ABMON_1), j = ABMON_IDX(ABMON_12); i <= j; ++i)
-		free(__UNCONST(data->abmon[i]));
-	for (i = MON_IDX(MON_1),     j = MON_IDX(MON_12);     i <= j; ++i)
-		free(__UNCONST(data->mon[i]));
-	for (i = AM_PM_IDX(AM_STR),  j = AM_PM_IDX(PM_STR);   i <= j; ++i)
-		free(__UNCONST(data->am_pm[i]));
-	free(__UNCONST(data->d_t_fmt));
-	free(__UNCONST(data->d_fmt));
-	free(__UNCONST(data->t_fmt));
-	free(__UNCONST(data->t_fmt_ampm));
-}
-
-#include "citrus_lc_time.h"
-
-struct _citrus_LC_TIME_key {
-	const char *name;
-	size_t offset;
-};
-
-#define OFFSET(field) offsetof(_TimeLocale, field)
-static const struct _citrus_LC_TIME_key keys[] = {
-  { _CITRUS_LC_TIME_SYM_ABDAY_1,  OFFSET(abday[ABDAY_IDX(ABDAY_1)] ) },
-  { _CITRUS_LC_TIME_SYM_ABDAY_2,  OFFSET(abday[ABDAY_IDX(ABDAY_2)] ) },
-  { _CITRUS_LC_TIME_SYM_ABDAY_3,  OFFSET(abday[ABDAY_IDX(ABDAY_3)] ) },
-  { _CITRUS_LC_TIME_SYM_ABDAY_4,  OFFSET(abday[ABDAY_IDX(ABDAY_4)] ) },
-  { _CITRUS_LC_TIME_SYM_ABDAY_5,  OFFSET(abday[ABDAY_IDX(ABDAY_5)] ) },
-  { _CITRUS_LC_TIME_SYM_ABDAY_6,  OFFSET(abday[ABDAY_IDX(ABDAY_6)] ) },
-  { _CITRUS_LC_TIME_SYM_ABDAY_7,  OFFSET(abday[ABDAY_IDX(ABDAY_7)] ) },
-  { _CITRUS_LC_TIME_SYM_DAY_1,    OFFSET(day[DAY_IDX(DAY_1)]       ) },
-  { _CITRUS_LC_TIME_SYM_DAY_2,    OFFSET(day[DAY_IDX(DAY_2)]       ) },
-  { _CITRUS_LC_TIME_SYM_DAY_3,    OFFSET(day[DAY_IDX(DAY_3)]       ) },
-  { _CITRUS_LC_TIME_SYM_DAY_4,    OFFSET(day[DAY_IDX(DAY_4)]       ) },
-  { _CITRUS_LC_TIME_SYM_DAY_5,    OFFSET(day[DAY_IDX(DAY_5)]       ) },
-  { _CITRUS_LC_TIME_SYM_DAY_6,    OFFSET(day[DAY_IDX(DAY_6)]       ) },
-  { _CITRUS_LC_TIME_SYM_DAY_7,    OFFSET(day[DAY_IDX(DAY_7)]       ) },
-  { _CITRUS_LC_TIME_SYM_ABMON_1,  OFFSET(abmon[ABMON_IDX(ABMON_1)] ) },
-  { _CITRUS_LC_TIME_SYM_ABMON_2,  OFFSET(abmon[ABMON_IDX(ABMON_2)] ) },
-  { _CITRUS_LC_TIME_SYM_ABMON_3,  OFFSET(abmon[ABMON_IDX(ABMON_3)] ) },
-  { _CITRUS_LC_TIME_SYM_ABMON_4,  OFFSET(abmon[ABMON_IDX(ABMON_4)] ) },
-  { _CITRUS_LC_TIME_SYM_ABMON_5,  OFFSET(abmon[ABMON_IDX(ABMON_5)] ) },
-  { _CITRUS_LC_TIME_SYM_ABMON_6,  OFFSET(abmon[ABMON_IDX(ABMON_6)] ) },
-  { _CITRUS_LC_TIME_SYM_ABMON_7,  OFFSET(abmon[ABMON_IDX(ABMON_7)] ) },
-  { _CITRUS_LC_TIME_SYM_ABMON_8,  OFFSET(abmon[ABMON_IDX(ABMON_8)] ) },
-  { _CITRUS_LC_TIME_SYM_ABMON_9,  OFFSET(abmon[ABMON_IDX(ABMON_9)] ) },
-  { _CITRUS_LC_TIME_SYM_ABMON_10, OFFSET(abmon[ABMON_IDX(ABMON_10)]) },
-  { _CITRUS_LC_TIME_SYM_ABMON_11, OFFSET(abmon[ABMON_IDX(ABMON_11)]) },
-  { _CITRUS_LC_TIME_SYM_ABMON_12, OFFSET(abmon[ABMON_IDX(ABMON_12)]) },
-  { _CITRUS_LC_TIME_SYM_MON_1,    OFFSET(mon[MON_IDX(MON_1)]       ) },
-  { _CITRUS_LC_TIME_SYM_MON_2,    OFFSET(mon[MON_IDX(MON_2)]       ) },
-  { _CITRUS_LC_TIME_SYM_MON_3,    OFFSET(mon[MON_IDX(MON_3)]       ) },
-  { _CITRUS_LC_TIME_SYM_MON_4,    OFFSET(mon[MON_IDX(MON_4)]       ) },
-  { _CITRUS_LC_TIME_SYM_MON_5,    OFFSET(mon[MON_IDX(MON_5)]       ) },
-  { _CITRUS_LC_TIME_SYM_MON_6,    OFFSET(mon[MON_IDX(MON_6)]       ) },
-  { _CITRUS_LC_TIME_SYM_MON_7,    OFFSET(mon[MON_IDX(MON_7)]       ) },
-  { _CITRUS_LC_TIME_SYM_MON_8,    OFFSET(mon[MON_IDX(MON_8)]       ) },
-  { _CITRUS_LC_TIME_SYM_MON_9,    OFFSET(mon[MON_IDX(MON_9)]       ) },
-  { _CITRUS_LC_TIME_SYM_MON_10,   OFFSET(mon[MON_IDX(MON_10)]      ) },
-  { _CITRUS_LC_TIME_SYM_MON_11,   OFFSET(mon[MON_IDX(MON_11)]      ) },
-  { _CITRUS_LC_TIME_SYM_MON_12,   OFFSET(mon[MON_IDX(MON_12)]      ) },
-  { _CITRUS_LC_TIME_SYM_AM_STR,   OFFSET(am_pm[AM_PM_IDX(AM_STR)]  ) },
-  { _CITRUS_LC_TIME_SYM_PM_STR,   OFFSET(am_pm[AM_PM_IDX(PM_STR)]  ) },
-  { _CITRUS_LC_TIME_SYM_D_T_FMT,  OFFSET(d_t_fmt                   ) },
-  { _CITRUS_LC_TIME_SYM_D_FMT,    OFFSET(d_fmt                     ) },
-  { _CITRUS_LC_TIME_SYM_T_FMT,    OFFSET(t_fmt                     ) },
-  { _CITRUS_LC_TIME_SYM_T_FMT_AMPM, OFFSET(t_fmt_ampm                ) },
-  { NULL, 0 }
-};
-
-static __inline int
-_citrus_LC_TIME_init_normal(_TimeLocale * __restrict data,
-    struct _citrus_db * __restrict db)
-{
-        const struct _citrus_LC_TIME_key *key;
-	char **p;
-	const char *s;
-
-	_DIAGASSERT(data != NULL);
-	_DIAGASSERT(db != NULL);
-
-	memset(data, 0, sizeof(*data));
-	for (key = &keys[0]; key->name != NULL; ++key) {
-		if (_db_lookupstr_by_s(db, key->name, &s, NULL))
-			goto fatal;
-		p = (char **)(void *)
-		    (((char *)(void *)data) + key->offset);
-		*p = strdup(s);
-		if (*p == NULL)
-			goto fatal;
-	}
-	return 0;
-
-fatal:
-	_citrus_LC_TIME_uninit(data);
-	return EFTYPE;
-}
-
-static __inline int
-_citrus_LC_TIME_init_fallback(_TimeLocale * __restrict data,
-    struct _memstream * __restrict ms)
-{
-        const struct _citrus_LC_TIME_key *key;
-	char **p;
-	const char *s;
-	size_t n;
-
-	memset(data, 0, sizeof(*data));
-	for (key = &keys[0]; key->name != NULL; ++key) {
-		if ((s = _memstream_getln(ms, &n)) == NULL)
-			goto fatal;
-		p = (char **)(void *)
-		    (((char *)(void *)data) + key->offset);
-		*p = strndup(s, n - 1);
-		if (*p == NULL)
-			goto fatal;
-	}
-	return 0;
-
-fatal:
-	_citrus_LC_TIME_uninit(data);
-	return EFTYPE;
-}
-
-/*
- * macro required by citrus_lc_template.h
- */
-#define _CATEGORY_DB		"LC_TIME"
-#define _CATEGORY_MAGIC		_CITRUS_LC_TIME_MAGIC_1
-
-#include "citrus_lc_template.h"
diff --git a/lib/libc/citrus/citrus_lc_time.h b/lib/libc/citrus/citrus_lc_time.h
deleted file mode 100644
index 3b9616f3a..000000000
--- a/lib/libc/citrus/citrus_lc_time.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* $NetBSD: citrus_lc_time.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_LC_TIME_H_
-#define _CITRUS_LC_TIME_H_
-
-/*
- *
- */
-#define _CITRUS_LC_TIME_MAGIC_1		"CtrsTI10"
-#define _CITRUS_LC_TIME_SYM_VERSION	"version"
-#define _CITRUS_LC_TIME_VERSION		0x00000001
-
-/*
- *
- */
-#define _CITRUS_LC_TIME_SYM_ABDAY_1			"abday1"
-#define _CITRUS_LC_TIME_SYM_ABDAY_2			"abday2"
-#define _CITRUS_LC_TIME_SYM_ABDAY_3			"abday3"
-#define _CITRUS_LC_TIME_SYM_ABDAY_4			"abday4"
-#define _CITRUS_LC_TIME_SYM_ABDAY_5			"abday5"
-#define _CITRUS_LC_TIME_SYM_ABDAY_6			"abday6"
-#define _CITRUS_LC_TIME_SYM_ABDAY_7			"abday7"
-#define _CITRUS_LC_TIME_SYM_DAY_1			"day1"
-#define _CITRUS_LC_TIME_SYM_DAY_2			"day2"
-#define _CITRUS_LC_TIME_SYM_DAY_3			"day3"
-#define _CITRUS_LC_TIME_SYM_DAY_4			"day4"
-#define _CITRUS_LC_TIME_SYM_DAY_5			"day5"
-#define _CITRUS_LC_TIME_SYM_DAY_6			"day6"
-#define _CITRUS_LC_TIME_SYM_DAY_7			"day7"
-#define _CITRUS_LC_TIME_SYM_ABMON_1			"abmon_1"
-#define _CITRUS_LC_TIME_SYM_ABMON_2			"abmon_2"
-#define _CITRUS_LC_TIME_SYM_ABMON_3			"abmon_3"
-#define _CITRUS_LC_TIME_SYM_ABMON_4			"abmon_4"
-#define _CITRUS_LC_TIME_SYM_ABMON_5			"abmon_5"
-#define _CITRUS_LC_TIME_SYM_ABMON_6			"abmon_6"
-#define _CITRUS_LC_TIME_SYM_ABMON_7			"abmon_7"
-#define _CITRUS_LC_TIME_SYM_ABMON_8			"abmon_8"
-#define _CITRUS_LC_TIME_SYM_ABMON_9			"abmon_9"
-#define _CITRUS_LC_TIME_SYM_ABMON_10			"abmon_10"
-#define _CITRUS_LC_TIME_SYM_ABMON_11			"abmon_11"
-#define _CITRUS_LC_TIME_SYM_ABMON_12			"abmon_12"
-#define _CITRUS_LC_TIME_SYM_MON_1			"mon_1"
-#define _CITRUS_LC_TIME_SYM_MON_2			"mon_2"
-#define _CITRUS_LC_TIME_SYM_MON_3			"mon_3"
-#define _CITRUS_LC_TIME_SYM_MON_4			"mon_4"
-#define _CITRUS_LC_TIME_SYM_MON_5			"mon_5"
-#define _CITRUS_LC_TIME_SYM_MON_6			"mon_6"
-#define _CITRUS_LC_TIME_SYM_MON_7			"mon_7"
-#define _CITRUS_LC_TIME_SYM_MON_8			"mon_8"
-#define _CITRUS_LC_TIME_SYM_MON_9			"mon_9"
-#define _CITRUS_LC_TIME_SYM_MON_10			"mon_10"
-#define _CITRUS_LC_TIME_SYM_MON_11			"mon_11"
-#define _CITRUS_LC_TIME_SYM_MON_12			"mon_12"
-#define _CITRUS_LC_TIME_SYM_AM_STR			"am_str"
-#define _CITRUS_LC_TIME_SYM_PM_STR			"pm_str"
-#define _CITRUS_LC_TIME_SYM_D_T_FMT			"d_t_fmt"
-#define _CITRUS_LC_TIME_SYM_D_FMT			"d_fmt"
-#define _CITRUS_LC_TIME_SYM_T_FMT			"t_fmt"
-#define _CITRUS_LC_TIME_SYM_T_FMT_AMPM			"t_fmt_ampm"
-
-#endif /*_CITRUS_LC_TIME_H_*/
diff --git a/lib/libc/citrus/citrus_lookup.c b/lib/libc/citrus/citrus_lookup.c
deleted file mode 100644
index 57af4460b..000000000
--- a/lib/libc/citrus/citrus_lookup.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/*	$NetBSD: citrus_lookup.c,v 1.7 2012/05/04 16:45:05 joerg Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_lookup.c,v 1.7 2012/05/04 16:45:05 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <dirent.h>
-#include <sys/types.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_mmap.h"
-#include "citrus_db.h"
-#include "citrus_db_hash.h"
-#include "citrus_lookup.h"
-#include "citrus_lookup_file.h"
-
-struct _citrus_lookup {
-	union {
-		struct {
-			struct _citrus_db *db;
-			struct _citrus_region file;
-			int num, idx;
-			struct _db_locator locator;
-		} db;
-		struct {
-			struct _region r;
-			struct _memstream ms;
-		} plain;
-	} u;
-#define cl_db		u.db.db
-#define cl_dbidx	u.db.idx
-#define cl_dbfile	u.db.file
-#define cl_dbnum	u.db.num
-#define cl_dblocator	u.db.locator
-#define cl_plainr	u.plain.r
-#define cl_plainms	u.plain.ms
-	int cl_ignore_case;
-	int cl_rewind;
-	char *cl_key;
-	size_t cl_keylen;
-	int (*cl_next)(struct _citrus_lookup *, struct _region *,
-		       struct _region *);
-	int (*cl_lookup)(struct _citrus_lookup *, const char *,
-			 struct _region *);
-	int (*cl_num_entries)(struct _citrus_lookup *);
-	void (*cl_close)(struct _citrus_lookup *);
-};
-
-static int
-seq_get_num_entries_db(struct _citrus_lookup *cl)
-{
-	return cl->cl_dbnum;
-}
-
-static int
-seq_next_db(struct _citrus_lookup *cl,
-	    struct _region *key, struct _region *data)
-{
-
-	if (cl->cl_key) {
-		if (key)
-			_region_init(key, cl->cl_key, cl->cl_keylen);
-		return _db_lookup_by_s(cl->cl_db, cl->cl_key, data,
-				       &cl->cl_dblocator);
-	}
-
-	if (cl->cl_rewind) {
-		cl->cl_dbidx = 0;
-	}
-	cl->cl_rewind = 0;
-	if (cl->cl_dbidx >= cl->cl_dbnum)
-		return ENOENT;
-
-	return _db_get_entry(cl->cl_db, cl->cl_dbidx++, key, data);
-}
-
-static int
-seq_lookup_db(struct _citrus_lookup *cl, const char *key,
-	      struct _region *data)
-{
-	cl->cl_rewind = 0;
-	free(cl->cl_key);
-	cl->cl_key = strdup(key);
-	if (cl->cl_ignore_case)
-		_bcs_convert_to_lower(cl->cl_key);
-	cl->cl_keylen = strlen(cl->cl_key);
-	_db_locator_init(&cl->cl_dblocator);
-	return _db_lookup_by_s(cl->cl_db, cl->cl_key, data, &cl->cl_dblocator);
-}
-
-static void
-seq_close_db(struct _citrus_lookup *cl)
-{
-	_db_close(cl->cl_db);
-	_unmap_file(&cl->cl_dbfile);
-}
-
-static int
-seq_open_db(struct _citrus_lookup *cl, const char *name)
-{
-	int ret;
-	struct _region r;
-	char path[PATH_MAX];
-
-	snprintf(path, sizeof(path), "%s.db", name);
-	ret = _map_file(&r, path);
-	if (ret)
-		return ret;
-
-	ret = _db_open(&cl->cl_db, &r, _CITRUS_LOOKUP_MAGIC,
-		       _db_hash_std, NULL);
-	if (ret) {
-		_unmap_file(&r);
-		return ret;
-	}
-
-	cl->cl_dbfile = r;
-	cl->cl_dbnum = _db_get_num_entries(cl->cl_db);
-	cl->cl_dbidx = 0;
-	cl->cl_rewind = 1;
-	cl->cl_lookup = &seq_lookup_db;
-	cl->cl_next = &seq_next_db;
-	cl->cl_num_entries = &seq_get_num_entries_db;
-	cl->cl_close = &seq_close_db;
-
-	return 0;
-}
-
-#define T_COMM '#'
-static int
-seq_next_plain(struct _citrus_lookup *cl, struct _region *key,
-	       struct _region *data)
-{
-	const char *p, *q;
-	size_t len;
-
-	if (cl->cl_rewind)
-		_memstream_bind(&cl->cl_plainms, &cl->cl_plainr);
-	cl->cl_rewind = 0;
-
-retry:
-	p = _memstream_getln(&cl->cl_plainms, &len);
-	if (p == NULL)
-		return ENOENT;
-	/* ignore comment */
-	q = memchr(p, T_COMM, len);
-	if (q) {
-		len = q-p;
-	}
-	/* ignore trailing spaces */
-	_bcs_trunc_rws_len(p, &len);
-	p = _bcs_skip_ws_len(p, &len);
-	q = _bcs_skip_nonws_len(p, &len);
-	if (p==q)
-		goto retry;
-	if (cl->cl_key && ((size_t)(q-p) != cl->cl_keylen ||
-			   memcmp(p, cl->cl_key, (size_t)(q-p)) != 0))
-		goto retry;
-
-	/* found a entry */
-	if (key)
-		_region_init(key, __UNCONST(p), (size_t)(q-p));
-	p = _bcs_skip_ws_len(q, &len);
-	if (data)
-		_region_init(data, len ? __UNCONST(p) : NULL, len);
-
-	return 0;
-}
-
-static int
-seq_get_num_entries_plain(struct _citrus_lookup *cl)
-{
-	int num;
-
-	num = 0;
-	while (seq_next_plain(cl, NULL, NULL) == 0)
-		num++;
-
-	return num;
-}
-
-static int
-seq_lookup_plain(struct _citrus_lookup *cl, const char *key,
-		 struct _region *data)
-{
-	size_t len;
-	const char *p;
-
-	cl->cl_rewind = 0;
-	free(cl->cl_key);
-	cl->cl_key = strdup(key);
-	if (cl->cl_ignore_case)
-		_bcs_convert_to_lower(cl->cl_key);
-	cl->cl_keylen = strlen(cl->cl_key);
-	_memstream_bind(&cl->cl_plainms, &cl->cl_plainr);
-	p = _memstream_matchline(&cl->cl_plainms, cl->cl_key, &len, 0);
-	if (p == NULL)
-		return ENOENT;
-	if (data)
-		_region_init(data, __UNCONST(p), len);
-
-	return 0;
-}
-
-static void
-seq_close_plain(struct _citrus_lookup *cl)
-{
-	_unmap_file(&cl->cl_plainr);
-}
-
-static int
-seq_open_plain(struct _citrus_lookup *cl, const char *name)
-{
-	int ret;
-
-	/* open read stream */
-	ret = _map_file(&cl->cl_plainr, name);
-	if (ret)
-		return ret;
-
-	cl->cl_rewind = 1;
-	cl->cl_next = &seq_next_plain;
-	cl->cl_lookup = &seq_lookup_plain;
-	cl->cl_num_entries = &seq_get_num_entries_plain;
-	cl->cl_close = &seq_close_plain;
-
-	return 0;
-}
-
-int
-_citrus_lookup_seq_open(struct _citrus_lookup **rcl, const char *name,
-			int ignore_case)
-{
-	int ret;
-	struct _citrus_lookup *cl;
-
-	cl = malloc(sizeof(*cl));
-	if (cl == NULL)
-		return ENOMEM;
-
-	cl->cl_key = NULL;
-	cl->cl_keylen = 0;
-	cl->cl_ignore_case = ignore_case;
-	ret = seq_open_db(cl, name);
-	if (ret == ENOENT)
-		ret = seq_open_plain(cl, name);
-	if (!ret)
-		*rcl = cl;
-	else
-		free(cl);
-
-	return ret;
-}
-
-void
-_citrus_lookup_seq_rewind(struct _citrus_lookup *cl)
-{
-	cl->cl_rewind = 1;
-	free(cl->cl_key);
-	cl->cl_key = NULL;
-	cl->cl_keylen = 0;
-}
-
-int
-_citrus_lookup_seq_next(struct _citrus_lookup *cl,
-			struct _region *key, struct _region *data)
-{
-	return (*cl->cl_next)(cl, key, data);
-}
-
-int
-_citrus_lookup_seq_lookup(struct _citrus_lookup *cl, const char *key,
-			  struct _region *data)
-{
-	return (*cl->cl_lookup)(cl, key, data);
-}
-
-int
-_citrus_lookup_get_number_of_entries(struct _citrus_lookup *cl)
-{
-	return (*cl->cl_num_entries)(cl);
-}
-
-void
-_citrus_lookup_seq_close(struct _citrus_lookup *cl)
-{
-	free(cl->cl_key);
-	(*cl->cl_close)(cl);
-	free(cl);
-}
-
-char *
-_citrus_lookup_simple(const char *name, const char *key,
-		      char *linebuf, size_t linebufsize, int ignore_case)
-{
-	int ret;
-	struct _citrus_lookup *cl;
-	struct _region data;
-
-	ret = _citrus_lookup_seq_open(&cl, name, ignore_case);
-	if (ret)
-		return NULL;
-
-	ret = _citrus_lookup_seq_lookup(cl, key, &data);
-	if (ret) {
-		_citrus_lookup_seq_close(cl);
-		return NULL;
-	}
-
-	snprintf(linebuf, linebufsize, "%.*s",
-		 (int)_region_size(&data), (const char *)_region_head(&data));
-
-	_citrus_lookup_seq_close(cl);
-
-	return linebuf;
-}
diff --git a/lib/libc/citrus/citrus_lookup.h b/lib/libc/citrus/citrus_lookup.h
deleted file mode 100644
index 92b721fb2..000000000
--- a/lib/libc/citrus/citrus_lookup.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: citrus_lookup.h,v 1.2 2004/07/21 14:16:34 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_LOOKUP_H_
-#define _CITRUS_LOOKUP_H_
-
-#define _CITRUS_LOOKUP_CASE_SENSITIVE	0
-#define _CITRUS_LOOKUP_CASE_IGNORE	1
-
-struct _citrus_lookup;
-__BEGIN_DECLS
-char *_citrus_lookup_simple(const char *, const char *, char *, size_t, int);
-int _citrus_lookup_seq_open(struct _citrus_lookup **, const char *, int);
-void _citrus_lookup_seq_rewind(struct _citrus_lookup *);
-int _citrus_lookup_seq_next(struct _citrus_lookup *,
-			    struct _region *, struct _region *);
-int _citrus_lookup_seq_lookup(struct _citrus_lookup *, const char *,
-			      struct _region *);
-int _citrus_lookup_get_number_of_entries(struct _citrus_lookup *);
-void _citrus_lookup_seq_close(struct _citrus_lookup *);
-__END_DECLS
-
-static __inline const char *
-_citrus_lookup_alias(const char *path, const char *key, char *buf, size_t n,
-		     int ignore_case)
-{
-	const char *ret;
-
-	ret = _citrus_lookup_simple(path, key, buf, n, ignore_case);
-	if (ret == NULL)
-		ret = key;
-
-	return ret;
-}
-
-#endif
diff --git a/lib/libc/citrus/citrus_lookup_factory.c b/lib/libc/citrus/citrus_lookup_factory.c
deleted file mode 100644
index 7d14b5151..000000000
--- a/lib/libc/citrus/citrus_lookup_factory.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*	$NetBSD: citrus_lookup_factory.c,v 1.4 2003/10/27 00:12:42 lukem Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_lookup_factory.c,v 1.4 2003/10/27 00:12:42 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <limits.h>
-
-#include "citrus_namespace.h"
-#include "citrus_region.h"
-#include "citrus_bcs.h"
-#include "citrus_db_factory.h"
-#include "citrus_db_hash.h"
-#include "citrus_lookup_factory.h"
-#include "citrus_lookup_file.h"
-
-#define T_COMM '#'
-static int
-convert_line(struct _citrus_db_factory *df, const char *line, size_t len)
-{
-	const char *p;
-	char key[LINE_MAX], data[LINE_MAX];
-
-	/* cut off trailing comment */
-	p = memchr(line, T_COMM, len);
-	if (p)
-		len = p - line;
-
-	/* key */
-	line = _bcs_skip_ws_len(line, &len);
-	if (len == 0)
-		return 0;
-	p = _bcs_skip_nonws_len(line, &len);
-	if (p==line)
-		return 0;
-	snprintf(key, sizeof(key), "%.*s", (int)(p-line), line);
-	_bcs_convert_to_lower(key);
-
-	/* data */
-	line = _bcs_skip_ws_len(p, &len);
-	_bcs_trunc_rws_len(line, &len);
-	snprintf(data, sizeof(data), "%.*s", (int)len, line);
-
-	return _db_factory_addstr_by_s(df, key, data);
-}
-
-static int
-dump_db(struct _citrus_db_factory *df, struct _region *r)
-{
-	size_t size;
-	void *ptr;
-
-	size = _db_factory_calc_size(df);
-	ptr = malloc(size);
-	if (ptr == NULL)
-		return errno;
-	_region_init(r, ptr, size);
-
-	return _db_factory_serialize(df, _CITRUS_LOOKUP_MAGIC, r);
-}
-
-int
-_citrus_lookup_factory_convert(FILE *out, FILE *in)
-{
-	struct _citrus_db_factory *df;
-	struct _region r;
-	char *line;
-	size_t size;
-	int ret;
-
-	ret = _db_factory_create(&df, &_db_hash_std, NULL);
-	if (ret)
-		return ret;
-
-	while ((line = fgetln(in, &size)) != NULL)
-		if ((ret = convert_line(df, line, size))) {
-			_db_factory_free(df);
-			return ret;
-		}
-
-	ret = dump_db(df, &r);
-	_db_factory_free(df);
-	if (ret)
-		return ret;
-
-	if (fwrite(_region_head(&r), _region_size(&r), 1, out) != 1)
-		return errno;
-
-	return 0;
-}
diff --git a/lib/libc/citrus/citrus_lookup_factory.h b/lib/libc/citrus/citrus_lookup_factory.h
deleted file mode 100644
index d50a1e892..000000000
--- a/lib/libc/citrus/citrus_lookup_factory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: citrus_lookup_factory.h,v 1.1 2003/06/25 09:51:35 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_LOOKUP_FACTORY_H_
-#define _CITRUS_LOOKUP_FACTORY_H_
-
-__BEGIN_DECLS
-int	_citrus_lookup_factory_convert(FILE *, FILE *);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/citrus_lookup_file.h b/lib/libc/citrus/citrus_lookup_file.h
deleted file mode 100644
index 0c56b6126..000000000
--- a/lib/libc/citrus/citrus_lookup_file.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*	$NetBSD: citrus_lookup_file.h,v 1.1 2003/06/25 09:51:36 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_LOOKUP_FILE_H_
-#define _CITRUS_LOOKUP_FILE_H_
-
-#define _CITRUS_LOOKUP_MAGIC	"LOOKUP\0\0"
-
-#endif
diff --git a/lib/libc/citrus/citrus_mapper.c b/lib/libc/citrus/citrus_mapper.c
deleted file mode 100644
index 384990909..000000000
--- a/lib/libc/citrus/citrus_mapper.c
+++ /dev/null
@@ -1,406 +0,0 @@
-/*	$NetBSD: citrus_mapper.c,v 1.10 2012/06/08 07:49:42 martin Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_mapper.c,v 1.10 2012/06/08 07:49:42 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/queue.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_bcs.h"
-#include "citrus_mmap.h"
-#include "citrus_module.h"
-#include "citrus_hash.h"
-#include "citrus_mapper.h"
-
-#define _CITRUS_MAPPER_DIR	"mapper.dir"
-
-#define CM_HASH_SIZE 101
-#define REFCOUNT_PERSISTENT	-1
-
-#ifdef _REENTRANT
-static rwlock_t lock = RWLOCK_INITIALIZER;
-#endif
-
-struct _citrus_mapper_area {
-	_CITRUS_HASH_HEAD(, _citrus_mapper, CM_HASH_SIZE)	ma_cache;
-	char							*ma_dir;
-};
-
-/*
- * _citrus_mapper_create_area:
- *	create mapper area
- */
-
-int
-_citrus_mapper_create_area(
-	struct _citrus_mapper_area *__restrict *__restrict rma,
-	const char *__restrict area)
-{
-	struct stat st;
-	int ret;
-	char path[PATH_MAX];
-	struct _citrus_mapper_area *ma;
-
-	rwlock_wrlock(&lock);
-
-	if (*rma != NULL) {
-		ret = 0;
-		goto quit;
-	}
-
-	snprintf(path, (size_t)PATH_MAX, "%s/%s", area, _CITRUS_MAPPER_DIR);
-
-	ret = stat(path, &st);
-	if (ret)
-		goto quit;
-
-	ma = malloc(sizeof(*ma));
-	if (ma == NULL) {
-		ret = errno;
-		goto quit;
-	}
-	ma->ma_dir = strdup(area);
-	if (ma->ma_dir == NULL) {
-		free(ma);
-		ret = errno;
-		goto quit;
-	}
-	_CITRUS_HASH_INIT(&ma->ma_cache, CM_HASH_SIZE);
-
-	*rma = ma;
-	ret = 0;
-quit:
-	rwlock_unlock(&lock);
-
-	return ret;
-}
-
-
-/*
- * lookup_mapper_entry:
- *	lookup mapper.dir entry in the specified directory.
- *
- * line format of iconv.dir file:
- *	mapper	module	arg
- * mapper : mapper name.
- * module : mapper module name.
- * arg    : argument for the module (generally, description file name)
- */
-
-static int
-lookup_mapper_entry(const char *dir, const char *mapname,
-		    void *linebuf, size_t linebufsize,
-		    const char **module, const char **variable)
-{
-	struct _region r;
-	struct _memstream ms;
-	int ret;
-	const char *cp, *cq;
-	char *p;
-	size_t len;
-	char path[PATH_MAX];
-
-	/* create mapper.dir path */
-	snprintf(path, (size_t)PATH_MAX, "%s/%s", dir, _CITRUS_MAPPER_DIR);
-
-	/* open read stream */
-	ret = _map_file(&r, path);
-	if (ret)
-		return ret;
-
-	_memstream_bind(&ms, &r);
-
-	/* search the line matching to the map name */
-	cp = _memstream_matchline(&ms, mapname, &len, 0);
-	if (!cp) {
-		ret = ENOENT;
-		goto quit;
-	}
-	if (!len || len>linebufsize-1) {
-		ret = EINVAL;
-		goto quit;
-	}
-
-	p = linebuf;
-	/* get module name */
-	*module = p;
-	cq = _bcs_skip_nonws_len(cp, &len);
-	strlcpy(p, cp, (size_t)(cq-cp+1));
-	p += cq-cp+1;
-
-	/* get variable */
-	*variable = p;
-	cp = _bcs_skip_ws_len(cq, &len);
-	strlcpy(p, cp, len+1);
-
-	ret = 0;
-
-quit:
-	_unmap_file(&r);
-	return ret;
-}
-
-/*
- * mapper_close:
- *	simply close a mapper. (without handling hash)
- */
-static void
-mapper_close(struct _citrus_mapper *cm)
-{
-	if (cm->cm_module) {
-		if (cm->cm_ops) {
-			if (cm->cm_closure)
-				(*cm->cm_ops->mo_uninit)(cm);
-			free(cm->cm_ops);
-		}
-		_citrus_unload_module(cm->cm_module);
-	}
-	free(cm->cm_traits);
-	free(cm);
-}
-
-/*
- * mapper_open:
- *	simply open a mapper. (without handling hash)
- */
-static int
-mapper_open(struct _citrus_mapper_area *__restrict ma,
-	    struct _citrus_mapper * __restrict * __restrict rcm,
-	    const char * __restrict module,
-	    const char * __restrict variable)
-{
-	int ret;
-	struct _citrus_mapper *cm;
-	_citrus_mapper_getops_t getops;
-
-	/* initialize mapper handle */
-	cm = malloc(sizeof(*cm));
-	if (!cm)
-		return errno;
-
-	cm->cm_module = NULL;
-	cm->cm_ops = NULL;
-	cm->cm_closure = NULL;
-	cm->cm_traits = NULL;
-	cm->cm_refcount = 0;
-	cm->cm_key = NULL;
-
-	/* load module */
-	ret = _citrus_load_module(&cm->cm_module, module);
-	if (ret)
-		goto err;
-
-	/* get operators */
-	getops = (_citrus_mapper_getops_t)
-	    _citrus_find_getops(cm->cm_module, module, "mapper");
-	if (!getops) {
-		ret = EOPNOTSUPP;
-		goto err;
-	}
-	cm->cm_ops = malloc(sizeof(*cm->cm_ops));
-	if (!cm->cm_ops) {
-		ret = errno;
-		goto err;
-	}
-	ret = (*getops)(cm->cm_ops, sizeof(*cm->cm_ops),
-			_CITRUS_MAPPER_ABI_VERSION);
-	if (ret)
-		goto err;
-
-	if (!cm->cm_ops->mo_init ||
-	    !cm->cm_ops->mo_uninit ||
-	    !cm->cm_ops->mo_convert ||
-	    !cm->cm_ops->mo_init_state) {
-		ret = EINVAL;
-		goto err;
-	}
-
-	/* allocate traits structure */
-	cm->cm_traits = malloc(sizeof(*cm->cm_traits));
-	if (cm->cm_traits == NULL) {
-		ret = errno;
-		goto err;
-	}
-	/* initialize the mapper */
-	ret = (*cm->cm_ops->mo_init)(ma, cm, ma->ma_dir,
-				     (const void *)variable,
-				     strlen(variable)+1,
-				     cm->cm_traits, sizeof(*cm->cm_traits));
-	if (ret)
-		goto err;
-
-	*rcm = cm;
-
-	return 0;
-
-err:
-	mapper_close(cm);
-	return ret;
-}
-
-/*
- * _citrus_mapper_open_direct:
- *	open a mapper.
- */
-int
-_citrus_mapper_open_direct(struct _citrus_mapper_area *__restrict ma,
-			   struct _citrus_mapper * __restrict * __restrict rcm,
-			   const char * __restrict module,
-			   const char * __restrict variable)
-{
-	return mapper_open(ma, rcm, module, variable);
-}
-
-/*
- * hash_func
- */
-static __inline int
-hash_func(const char *key)
-{
-	return _string_hash_func(key, CM_HASH_SIZE);
-}
-
-/*
- * match_func
- */
-static __inline int
-match_func(struct _citrus_mapper *cm, const char *key)
-{
-	return strcmp(cm->cm_key, key);
-}
-
-/*
- * _citrus_mapper_open:
- *	open a mapper with looking up "mapper.dir".
- */
-int
-_citrus_mapper_open(struct _citrus_mapper_area *__restrict ma,
-		    struct _citrus_mapper * __restrict * __restrict rcm,
-		    const char * __restrict mapname)
-{
-	int ret;
-	char linebuf[PATH_MAX];
-	const char *module, *variable = NULL;
-	struct _citrus_mapper *cm;
-	int hashval;
-
-	rwlock_wrlock(&lock);
-
-	/* search in the cache */
-	hashval = hash_func(mapname);
-	_CITRUS_HASH_SEARCH(&ma->ma_cache, cm, cm_entry, match_func, mapname,
-			    hashval);
-	if (cm) {
-		/* found */
-		cm->cm_refcount++;
-		*rcm = cm;
-		ret = 0;
-		goto quit;
-	}
-
-	/* search mapper entry */
-	ret = lookup_mapper_entry(ma->ma_dir, mapname, linebuf,
-	    (size_t)PATH_MAX, &module, &variable);
-	if (ret)
-		goto quit;
-
-	/* open mapper */
-	ret = mapper_open(ma, &cm, module, variable);
-	if (ret)
-		goto quit;
-	cm->cm_key = strdup(mapname);
-	if (cm->cm_key == NULL) {
-		ret = errno;
-		rwlock_unlock(&lock);
-		_mapper_close(cm);
-		return ret;
-	}
-
-	/* insert to the cache */
-	cm->cm_refcount = 1;
-	_CITRUS_HASH_INSERT(&ma->ma_cache, cm, cm_entry, hashval);
-
-	*rcm = cm;
-	ret = 0;
-quit:
-	rwlock_unlock(&lock);
-	return ret;
-}
-
-/*
- * _citrus_mapper_close:
- *	close the specified mapper.
- */
-void
-_citrus_mapper_close(struct _citrus_mapper *cm)
-{
-	if (cm) {
-		rwlock_wrlock(&lock);
-		if (cm->cm_refcount == REFCOUNT_PERSISTENT)
-			goto quit;
-		if (cm->cm_refcount > 0) {
-			if (--cm->cm_refcount > 0)
-				goto quit;
-			_CITRUS_HASH_REMOVE(cm, cm_entry);
-			free(cm->cm_key);
-		}
-		rwlock_unlock(&lock);
-		mapper_close(cm);
-		return;
-quit:
-		rwlock_unlock(&lock);
-	}
-}
-
-/*
- * _citrus_mapper_set_persistent:
- *	set persistent count.
- */
-void
-_citrus_mapper_set_persistent(struct _citrus_mapper * __restrict cm)
-{
-	rwlock_wrlock(&lock);
-	cm->cm_refcount = REFCOUNT_PERSISTENT;
-	rwlock_unlock(&lock);
-}
diff --git a/lib/libc/citrus/citrus_mapper.h b/lib/libc/citrus/citrus_mapper.h
deleted file mode 100644
index 2eb1d22ab..000000000
--- a/lib/libc/citrus/citrus_mapper.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*	$NetBSD: citrus_mapper.h,v 1.3 2003/07/12 15:39:19 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_MAPPER_H_
-#define _CITRUS_MAPPER_H_
-
-struct _citrus_mapper_area;
-struct _citrus_mapper;
-struct _citrus_mapper_ops;
-struct _citrus_mapper_traits;
-
-__BEGIN_DECLS
-int	_citrus_mapper_create_area(
-		struct _citrus_mapper_area *__restrict *__restrict,
-		const char *__restrict);
-int	_citrus_mapper_open(struct _citrus_mapper_area *__restrict,
-			    struct _citrus_mapper *__restrict *__restrict,
-			    const char *__restrict);
-int	_citrus_mapper_open_direct(
-		struct _citrus_mapper_area *__restrict,
-		struct _citrus_mapper *__restrict *__restrict,
-		const char *__restrict, const char *__restrict);
-void	_citrus_mapper_close(struct _citrus_mapper *);
-void	_citrus_mapper_set_persistent(struct _citrus_mapper * __restrict);
-__END_DECLS
-
-#include "citrus_mapper_local.h"
-
-/* return values of _citrus_mapper_convert */
-#define _CITRUS_MAPPER_CONVERT_SUCCESS		(0)
-#define _CITRUS_MAPPER_CONVERT_NONIDENTICAL	(1)
-#define _CITRUS_MAPPER_CONVERT_SRC_MORE		(2)
-#define _CITRUS_MAPPER_CONVERT_DST_MORE		(3)
-#define _CITRUS_MAPPER_CONVERT_ILSEQ		(4)
-#define _CITRUS_MAPPER_CONVERT_FATAL		(5)
-
-/*
- * _citrus_mapper_convert:
- *	convert an index.
- *	- if the converter supports M:1 converter, the function may return
- *	  _CITRUS_MAPPER_CONVERT_SRC_MORE and the storage pointed by dst
- *	  may be unchanged in this case, although the internal status of
- *	  the mapper is affected.
- *	- if the converter supports 1:N converter, the function may return
- *	  _CITRUS_MAPPER_CONVERT_DST_MORE. In this case, the contiguous
- *	  call of this function ignores src and changes the storage pointed
- *	  by dst.
- *	- if the converter supports M:N converter, the function may behave
- *	  the combination of the above.
- *
- */
-static __inline int
-_citrus_mapper_convert(struct _citrus_mapper * __restrict cm,
-		       _citrus_index_t * __restrict dst,
-		       _citrus_index_t src,
-		       void * __restrict ps)
-{
-
-	_DIAGASSERT(cm && cm->cm_ops && cm->cm_ops->mo_convert && dst);
-
-	return (*cm->cm_ops->mo_convert)(cm, dst, src, ps);
-}
-
-/*
- * _citrus_mapper_init_state:
- *	initialize the state.
- */
-static __inline void
-_citrus_mapper_init_state(struct _citrus_mapper * __restrict cm,
-			  void * __restrict ps)
-{
-
-	_DIAGASSERT(cm && cm->cm_ops && cm->cm_ops->mo_init_state);
-
-	(*cm->cm_ops->mo_init_state)(cm, ps);
-}
-
-/*
- * _citrus_mapper_get_state_size:
- *	get the size of state storage.
- */
-static __inline size_t
-_citrus_mapper_get_state_size(struct _citrus_mapper * __restrict cm)
-{
-
-	_DIAGASSERT(cm && cm->cm_traits);
-
-	return cm->cm_traits->mt_state_size;
-}
-
-/*
- * _citrus_mapper_get_src_max:
- *	get the maximum number of suspended sources.
- */
-static __inline size_t
-_citrus_mapper_get_src_max(struct _citrus_mapper * __restrict cm)
-{
-
-	_DIAGASSERT(cm && cm->cm_traits);
-
-	return cm->cm_traits->mt_src_max;
-}
-
-/*
- * _citrus_mapper_get_dst_max:
- *	get the maximum number of suspended destinations.
- */
-static __inline size_t
-_citrus_mapper_get_dst_max(struct _citrus_mapper * __restrict cm)
-{
-
-	_DIAGASSERT(cm && cm->cm_traits);
-
-	return cm->cm_traits->mt_dst_max;
-}
-
-#endif
diff --git a/lib/libc/citrus/citrus_mapper_local.h b/lib/libc/citrus/citrus_mapper_local.h
deleted file mode 100644
index 4861e6655..000000000
--- a/lib/libc/citrus/citrus_mapper_local.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*	$NetBSD: citrus_mapper_local.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_MAPPER_LOCAL_H_
-#define _CITRUS_MAPPER_LOCAL_H_
-
-#define _CITRUS_MAPPER_GETOPS_FUNC_BASE(_n_)				\
-int _n_(struct _citrus_mapper_ops *, size_t, uint32_t)
-#define _CITRUS_MAPPER_GETOPS_FUNC(_n_)					\
-_CITRUS_MAPPER_GETOPS_FUNC_BASE(_citrus_##_n_##_mapper_getops)
-
-#define _CITRUS_MAPPER_DECLS(_m_)					\
-static int	_citrus_##_m_##_mapper_init				\
-	(struct _citrus_mapper_area *__restrict,			\
-	 struct _citrus_mapper * __restrict, const char * __restrict,	\
-	 const void * __restrict, size_t,				\
-	 struct _citrus_mapper_traits * __restrict, size_t);		\
-static void	_citrus_##_m_##_mapper_uninit(struct _citrus_mapper *);	\
-static int	_citrus_##_m_##_mapper_convert				\
-	(struct _citrus_mapper * __restrict,				\
-	 _citrus_index_t * __restrict, _citrus_index_t,			\
-	 void * __restrict);						\
-static void	_citrus_##_m_##_mapper_init_state			\
-	(struct _citrus_mapper * __restrict, void * __restrict);
-
-#define _CITRUS_MAPPER_DEF_OPS(_m_)					\
-struct _citrus_mapper_ops _citrus_##_m_##_mapper_ops = {		\
-	/* mo_abi_version */	_CITRUS_MAPPER_ABI_VERSION,		\
-	/* mo_init */		&_citrus_##_m_##_mapper_init,		\
-	/* mo_uninit */		&_citrus_##_m_##_mapper_uninit,		\
-	/* mo_convert */	&_citrus_##_m_##_mapper_convert,	\
-	/* mo_init_state */	&_citrus_##_m_##_mapper_init_state	\
-}
-
-typedef _CITRUS_MAPPER_GETOPS_FUNC_BASE((*_citrus_mapper_getops_t));
-typedef	int	(*_citrus_mapper_init_t)(
-	struct _citrus_mapper_area *__restrict,
-	struct _citrus_mapper *__restrict, const char *__restrict,
-	const void *__restrict, size_t,
-	struct _citrus_mapper_traits * __restrict, size_t);
-typedef void	(*_citrus_mapper_uninit_t)(struct _citrus_mapper *);
-typedef int	(*_citrus_mapper_convert_t)(struct _citrus_mapper * __restrict,
-					    _citrus_index_t * __restrict,
-					    _citrus_index_t,
-					    void * __restrict);
-typedef void	(*_citrus_mapper_init_state_t)(
-	struct _citrus_mapper * __restrict, void * __restrict);
-
-/*
- * ABI version change log
- *   0x00000001
- *     initial version
- */
-#define _CITRUS_MAPPER_ABI_VERSION	0x00000001
-struct _citrus_mapper_ops {
-	uint32_t			mo_abi_version;
-	/* version 0x00000001 */
-	_citrus_mapper_init_t		mo_init;
-	_citrus_mapper_uninit_t		mo_uninit;
-	_citrus_mapper_convert_t	mo_convert;
-	_citrus_mapper_init_state_t	mo_init_state;
-};
-
-struct _citrus_mapper_traits {
-	/* version 0x00000001 */
-	size_t				mt_state_size;
-	size_t				mt_src_max;
-	size_t				mt_dst_max;
-};
-
-struct _citrus_mapper {
-	struct _citrus_mapper_ops		*cm_ops;
-	void					*cm_closure;
-	_citrus_module_t			cm_module;
-	struct _citrus_mapper_traits		*cm_traits;
-	_CITRUS_HASH_ENTRY(_citrus_mapper)	cm_entry;
-	int					cm_refcount;
-	char					*cm_key;
-};
-#endif
diff --git a/lib/libc/citrus/citrus_memstream.c b/lib/libc/citrus/citrus_memstream.c
deleted file mode 100644
index 17f9ea3ba..000000000
--- a/lib/libc/citrus/citrus_memstream.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*	$NetBSD: citrus_memstream.c,v 1.5 2012/03/13 21:13:31 christos Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_memstream.c,v 1.5 2012/03/13 21:13:31 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_bcs.h"
-
-const char *
-_citrus_memory_stream_getln(struct _citrus_memory_stream * __restrict ms,
-			    size_t * __restrict rlen)
-{
-	size_t i;
-	const uint8_t *h, *p;
-	size_t ret;
-
-	if (ms->ms_pos>=_region_size(&ms->ms_region))
-		return (NULL);
-
-	h = p = (uint8_t *)_region_offset(&ms->ms_region, ms->ms_pos);
-	ret = 0;
-	for (i = _region_size(&ms->ms_region) - ms->ms_pos; i > 0; i--) {
-		ret++;
-		if (_bcs_iseol(*p))
-			break;
-		p++;
-	}
-
-	ms->ms_pos += ret;
-	*rlen = ret;
-	return ((const char *)h);
-}
-
-#define T_COMM	'#'
-
-const char *
-_citrus_memory_stream_matchline(struct _citrus_memory_stream * __restrict ms,
-				const char * __restrict key,
-				size_t * __restrict rlen,
-				int iscasesensitive)
-{
-	const char *p, *q;
-	size_t len, keylen;
-
-	keylen = strlen(key);
-	while (/*CONSTCOND*/ 1) {
-		p = _citrus_memory_stream_getln(ms, &len);
-		if (p == NULL)
-			return (NULL);
-
-		/* ignore comment */
-		q = memchr(p, T_COMM, len);
-		if (q) {
-			len = q-p;
-		}
-		/* ignore trailing white space and newline */
-		_bcs_trunc_rws_len(p, &len);
-		if (len == 0)
-			continue; /* ignore null line */
-
-		/* skip white spaces at the head of the line */
-		p = _bcs_skip_ws_len(p, &len);
-		q = _bcs_skip_nonws_len(p, &len);
-
-		if ((size_t)(q-p) == keylen) {
-			if (iscasesensitive) {
-				if (memcmp(key, p, keylen) == 0)
-					break; /* match */
-			} else {
-				if (_bcs_strncasecmp(key, p, keylen) == 0)
-					break; /* match */
-			}
-		}
-	}
-
-	p = _bcs_skip_ws_len(q, &len);
-	*rlen = len;
-
-	return (p);
-}
-
-void *
-_citrus_memory_stream_chr(struct _citrus_memory_stream *ms,
-			  struct _citrus_region *r, char ch)
-{
-	void *head, *chr;
-	size_t sz;
-
-	if (ms->ms_pos >= _region_size(&ms->ms_region))
-		return NULL;
-
-	head = _region_offset(&ms->ms_region, ms->ms_pos);
-	chr = memchr(head, ch, _memstream_remainder(ms));
-	if (chr == NULL) {
-		_region_init(r, head, _memstream_remainder(ms));
-		ms->ms_pos = _region_size(&ms->ms_region);
-		return NULL;
-	}
-	sz = (char *)chr - (char *)head;
-
-	_region_init(r, head, sz);
-	ms->ms_pos += sz+1;
-
-	return chr;
-}
-
-void
-_citrus_memory_stream_skip_ws(struct _citrus_memory_stream *ms)
-{
-	int ch;
-
-	while ((ch = _memstream_peek(ms)) != EOF) {
-		if (!_bcs_isspace(ch))
-			break;
-		_memstream_getc(ms);
-	}
-}
diff --git a/lib/libc/citrus/citrus_memstream.h b/lib/libc/citrus/citrus_memstream.h
deleted file mode 100644
index baeb14bc4..000000000
--- a/lib/libc/citrus/citrus_memstream.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*	$NetBSD: citrus_memstream.h,v 1.3 2005/05/14 17:55:42 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef _CITRUS_MEMSTREAM_H_
-#define _CITRUS_MEMSTREAM_H_
-
-struct _citrus_memory_stream {
-	struct _citrus_region	ms_region;
-	size_t			ms_pos;
-};
-
-__BEGIN_DECLS
-const char *	_citrus_memory_stream_getln(
-	struct _citrus_memory_stream * __restrict, size_t * __restrict);
-const char *	_citrus_memory_stream_matchline(
-	struct _citrus_memory_stream * __restrict, const char * __restrict,
-	size_t * __restrict, int);
-void *		_citrus_memory_stream_chr(struct _citrus_memory_stream *,
-					  struct _citrus_region *, char);
-void		_citrus_memory_stream_skip_ws(struct _citrus_memory_stream *);
-__END_DECLS
-
-static __inline int
-_citrus_memory_stream_iseof(struct _citrus_memory_stream *ms)
-{
-	return ms->ms_pos >= _citrus_region_size(&ms->ms_region);
-}
-
-static __inline void
-_citrus_memory_stream_bind(struct _citrus_memory_stream * __restrict ms,
-			   const struct _citrus_region * __restrict r)
-{
-	ms->ms_region = *r;
-	ms->ms_pos = 0;
-}
-
-static __inline void
-_citrus_memory_stream_bind_ptr(struct _citrus_memory_stream * __restrict ms,
-			       void *ptr, size_t sz)
-{
-	struct _citrus_region r;
-
-	_citrus_region_init(&r, ptr, sz);
-	_citrus_memory_stream_bind(ms, &r);
-}
-
-static __inline void
-_citrus_memory_stream_rewind(struct _citrus_memory_stream *ms)
-{
-	ms->ms_pos = 0;
-}
-
-static __inline size_t
-_citrus_memory_stream_tell(struct _citrus_memory_stream *ms)
-{
-	return ms->ms_pos;
-}
-
-static __inline size_t
-_citrus_memory_stream_remainder(struct _citrus_memory_stream *ms)
-{
-	size_t sz;
-	sz = _citrus_region_size(&ms->ms_region);
-	if (ms->ms_pos>sz)
-		return 0;
-	return sz-ms->ms_pos;
-}
-
-static __inline int
-_citrus_memory_stream_seek(struct _citrus_memory_stream *ms, size_t pos, int w)
-{
-	size_t sz = _citrus_region_size(&ms->ms_region);
-	switch (w) {
-	case SEEK_SET:
-		if (pos>=sz)
-			return -1;
-		ms->ms_pos = pos;
-		break;
-	case SEEK_CUR:
-		pos += (ssize_t)ms->ms_pos;
-		if (pos>=sz)
-			return -1;
-		ms->ms_pos = pos;
-		break;
-	case SEEK_END:
-		if (sz<pos)
-			return -1;
-		ms->ms_pos = sz - pos;
-		break;
-	}
-	return 0;
-}
-
-static __inline int
-_citrus_memory_stream_getc(struct _citrus_memory_stream *ms)
-{
-	if (_citrus_memory_stream_iseof(ms))
-		return (EOF);
-	return _citrus_region_peek8(&ms->ms_region, ms->ms_pos++);
-}
-
-static __inline void
-_citrus_memory_stream_ungetc(struct _citrus_memory_stream *ms, int ch)
-{
-	if (ch != EOF && ms->ms_pos > 0)
-		ms->ms_pos--;
-}
-
-static __inline int
-_citrus_memory_stream_peek(struct _citrus_memory_stream *ms)
-{
-	if (_citrus_memory_stream_iseof(ms))
-		return (EOF);
-	return _citrus_region_peek8(&ms->ms_region, ms->ms_pos);
-}
-
-static __inline void *
-_citrus_memory_stream_getregion(struct _citrus_memory_stream *ms,
-				struct _citrus_region *r, size_t sz)
-{
-	void *ret;
-
-	if (ms->ms_pos + sz > _citrus_region_size(&ms->ms_region))
-		return NULL;
-
-	ret = _citrus_region_offset(&ms->ms_region, ms->ms_pos);
-	ms->ms_pos += sz;
-	if (r)
-		_citrus_region_init(r, ret, sz);
-
-	return ret;
-}
-
-static __inline int
-_citrus_memory_stream_get8(struct _citrus_memory_stream *ms, uint8_t *rval)
-{
-
-	if (ms->ms_pos + 1 > _citrus_region_size(&ms->ms_region))
-		return -1;
-
-	*rval = _citrus_region_peek8(&ms->ms_region, ms->ms_pos);
-	ms->ms_pos += 2;
-
-	return 0;
-}
-
-static __inline int
-_citrus_memory_stream_get16(struct _citrus_memory_stream *ms, uint16_t *rval)
-{
-
-	if (ms->ms_pos + 2 > _citrus_region_size(&ms->ms_region))
-		return -1;
-
-	*rval = _citrus_region_peek16(&ms->ms_region, ms->ms_pos);
-	ms->ms_pos += 2;
-
-	return 0;
-}
-
-static __inline int
-_citrus_memory_stream_get32(struct _citrus_memory_stream *ms, uint32_t *rval)
-{
-
-	if (ms->ms_pos + 4 > _citrus_region_size(&ms->ms_region))
-		return -1;
-
-	*rval = _citrus_region_peek32(&ms->ms_region, ms->ms_pos);
-	ms->ms_pos += 4;
-
-	return 0;
-}
-
-static __inline int
-_citrus_memory_stream_getln_region(struct _citrus_memory_stream *ms,
-				   struct _citrus_region *r)
-{
-	const char *ptr;
-	size_t sz;
-
-	ptr = _citrus_memory_stream_getln(ms, &sz);
-	if (ptr)
-		_citrus_region_init(r, __UNCONST(ptr), sz);
-
-	return ptr == NULL;
-}
-
-#endif
diff --git a/lib/libc/citrus/citrus_mmap.c b/lib/libc/citrus/citrus_mmap.c
deleted file mode 100644
index ffcc8629d..000000000
--- a/lib/libc/citrus/citrus_mmap.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*	$NetBSD: citrus_mmap.c,v 1.4 2011/10/15 23:00:01 christos Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_mmap.c,v 1.4 2011/10/15 23:00:01 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <sys/mman.h>
-
-#include "citrus_namespace.h"
-#include "citrus_region.h"
-#include "citrus_mmap.h"
-
-int
-_citrus_map_file(struct _citrus_region * __restrict r,
-    const char * __restrict path)
-{
-	int fd, ret = 0;
-	struct stat st;
-	void *head;
-
-	_DIAGASSERT(r != NULL);
-
-	_region_init(r, NULL, 0);
-
-	if ((fd = open(path, O_RDONLY | O_CLOEXEC)) == -1)
-		return errno;
-
-	if (fstat(fd, &st)  == -1) {
-		ret = errno;
-		goto error;
-	}
-	if (!S_ISREG(st.st_mode)) {
-		ret = EOPNOTSUPP;
-		goto error;
-	}
-
-	head = mmap(NULL, (size_t)st.st_size, PROT_READ, MAP_FILE|MAP_PRIVATE,
-	    fd, (off_t)0);
-	if (head == MAP_FAILED) {
-		ret = errno;
-		goto error;
-	}
-	_region_init(r, head, (size_t)st.st_size);
-
-error:
-	(void)close(fd);
-	return ret;
-}
-
-void
-_citrus_unmap_file(struct _citrus_region *r)
-{
-
-	_DIAGASSERT(r != NULL);
-
-	if (_region_head(r) != NULL) {
-		(void)munmap(_region_head(r), _region_size(r));
-		_region_init(r, NULL, 0);
-	}
-}
diff --git a/lib/libc/citrus/citrus_mmap.h b/lib/libc/citrus/citrus_mmap.h
deleted file mode 100644
index 1a968a4ca..000000000
--- a/lib/libc/citrus/citrus_mmap.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*	$NetBSD: citrus_mmap.h,v 1.1 2003/06/25 09:51:38 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef _CITRUS_MMAP_H_
-#define _CITRUS_MMAP_H_
-
-__BEGIN_DECLS
-int _citrus_map_file(struct _citrus_region * __restrict,
-		     const char * __restrict);
-void _citrus_unmap_file(struct _citrus_region *);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/citrus_module.c b/lib/libc/citrus/citrus_module.c
deleted file mode 100644
index 69089ca8c..000000000
--- a/lib/libc/citrus/citrus_module.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/*	$NetBSD: citrus_module.c,v 1.12 2015/08/28 11:45:02 joerg Exp $	*/
-
-/*-
- * Copyright (c)1999, 2000, 2001, 2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Paul Kranenburg.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_module.c,v 1.12 2015/08/28 11:45:02 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stddef.h>
-#include <paths.h>
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-#include "citrus_module.h"
-
-#include <sys/types.h>
-#include <dirent.h>
-#include <dlfcn.h>
-
-#ifdef _I18N_DYNAMIC
-
-static unsigned int _getdewey(int [], char *);
-static int _cmpndewey(int [], unsigned int, int [], unsigned int);
-static const char *_findshlib(char *, int *, int *);
-
-static const char *_pathI18nModule = NULL;
-
-/* from libexec/ld.aout_so/shlib.c */
-#undef major
-#undef minor
-#define MAXDEWEY	3	/*ELF*/
-
-static unsigned int
-_getdewey(int dewey[], char *cp)
-{
-	unsigned int	i, n;
-
-	_DIAGASSERT(dewey != NULL);
-	_DIAGASSERT(cp != NULL);
-
-	for (n = 0, i = 0; i < MAXDEWEY; i++) {
-		if (*cp == '\0')
-			break;
-
-		if (*cp == '.') cp++;
-		if (*cp < '0' || '9' < *cp)
-			return 0;
-
-		dewey[n++] = (int)_bcs_strtol(cp, &cp, 10);
-	}
-
-	return n;
-}
-
-/*
- * Compare two dewey arrays.
- * Return -1 if `d1' represents a smaller value than `d2'.
- * Return  1 if `d1' represents a greater value than `d2'.
- * Return  0 if equal.
- */
-static int
-_cmpndewey(int d1[], unsigned int n1, int d2[], unsigned int n2)
-{
-	register unsigned int	i;
-
-	_DIAGASSERT(d1 != NULL);
-	_DIAGASSERT(d2 != NULL);
-
-	for (i = 0; i < n1 && i < n2; i++) {
-		if (d1[i] < d2[i])
-			return -1;
-		if (d1[i] > d2[i])
-			return 1;
-	}
-
-	if (n1 == n2)
-		return 0;
-
-	if (i == n1)
-		return -1;
-
-	if (i == n2)
-		return 1;
-
-	/* XXX cannot happen */
-	return 0;
-}
-
-static const char *
-_findshlib(char *name, int *majorp, int *minorp)
-{
-	int		dewey[MAXDEWEY];
-	unsigned int	ndewey;
-	int		tmp[MAXDEWEY];
-	int		i;
-	int		len;
-	char		*lname;
-	static char	path[PATH_MAX];
-	int		major, minor;
-	const char	*search_dirs[1];
-	const int	n_search_dirs = 1;
-
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(majorp != NULL);
-	_DIAGASSERT(minorp != NULL);
-
-	major = *majorp;
-	minor = *minorp;
-	path[0] = '\0';
-	search_dirs[0] = _pathI18nModule;
-	len = strlen(name);
-	lname = name;
-
-	ndewey = 0;
-
-	for (i = 0; i < n_search_dirs; i++) {
-		DIR		*dd = opendir(search_dirs[i]);
-		struct dirent	*dp;
-		int		found_dot_a = 0;
-		int		found_dot_so = 0;
-
-		if (dd == NULL)
-			continue;
-
-		while ((dp = readdir(dd)) != NULL) {
-			unsigned int	n;
-
-			if (dp->d_namlen < len + 4)
-				continue;
-			if (strncmp(dp->d_name, lname, (size_t)len) != 0)
-				continue;
-			if (strncmp(dp->d_name+len, ".so.", 4) != 0)
-				continue;
-
-			if ((n = _getdewey(tmp, dp->d_name+len+4)) == 0)
-				continue;
-
-			if (major != -1 && found_dot_a)
-				found_dot_a = 0;
-
-			/* XXX should verify the library is a.out/ELF? */
-
-			if (major == -1 && minor == -1) {
-				goto compare_version;
-			} else if (major != -1 && minor == -1) {
-				if (tmp[0] == major)
-					goto compare_version;
-			} else if (major != -1 && minor != -1) {
-				if (tmp[0] == major) {
-					if (n == 1 || tmp[1] >= minor)
-						goto compare_version;
-				}
-			}
-
-			/* else, this file does not qualify */
-			continue;
-
-		compare_version:
-			if (_cmpndewey(tmp, n, dewey, ndewey) <= 0)
-				continue;
-
-			/* We have a better version */
-			found_dot_so = 1;
-			snprintf(path, sizeof(path), "%s/%s", search_dirs[i],
-			    dp->d_name);
-			found_dot_a = 0;
-			bcopy(tmp, dewey, sizeof(dewey));
-			ndewey = n;
-			*majorp = dewey[0];
-			*minorp = dewey[1];
-		}
-		closedir(dd);
-
-		if (found_dot_a || found_dot_so)
-			/*
-			 * There's a lib in this dir; take it.
-			 */
-			return path[0] ? path : NULL;
-	}
-
-	return path[0] ? path : NULL;
-}
-
-void *
-_citrus_find_getops(_citrus_module_t handle, const char *modname,
-		    const char *ifname)
-{
-	char name[PATH_MAX];
-	void *p;
-
-	_DIAGASSERT(handle != NULL);
-	_DIAGASSERT(modname != NULL);
-	_DIAGASSERT(ifname != NULL);
-
-	snprintf(name, sizeof(name), _C_LABEL_STRING("_citrus_%s_%s_getops"),
-	    modname, ifname);
-	p = dlsym((void *)handle, name);
-	return p;
-}
-
-int
-_citrus_load_module(_citrus_module_t *rhandle, const char *encname)
-{
-	const char *p;
-	char path[PATH_MAX];
-	int maj, min;
-	void *handle;
-
-	_DIAGASSERT(rhandle != NULL);
-
-	if (_pathI18nModule == NULL) {
-		p = getenv("PATH_I18NMODULE");
-		if (p == NULL || issetugid()) {
-			_pathI18nModule = _PATH_I18NMODULE;
-#ifdef MLIBDIR
-			p = strrchr(_pathI18nModule, '/');
-			if (p != NULL) {
-				snprintf(path, sizeof(path), "%.*s/%s/%s",
-				    (int)(p - _pathI18nModule),
-				    _pathI18nModule, MLIBDIR, p + 1);
-				p = path;
-			} else
-				p = NULL;
-#endif
-		}
-		if (p != NULL) {
-			_pathI18nModule = strdup(p);
-			if (_pathI18nModule == NULL)
-				return ENOMEM;
-		}
-	}
-
-	(void)snprintf(path, sizeof(path), "lib%s", encname);
-	maj = I18NMODULE_MAJOR;
-	min = -1;
-	p = _findshlib(path, &maj, &min);
-	if (!p)
-		return (EINVAL);
-	handle = dlopen(p, RTLD_LAZY);
-	if (!handle)
-		return (EINVAL);
-
-	*rhandle = (_citrus_module_t)handle;
-
-	return (0);
-}
-
-void
-_citrus_unload_module(_citrus_module_t handle)
-{
-	if (handle)
-		dlclose((void *)handle);
-}
-#else
-/* !_I18N_DYNAMIC */
-
-void *
-/*ARGSUSED*/
-_citrus_find_getops(_citrus_module_t handle, const char *modname,
-		    const char *ifname)
-{
-	return (NULL);
-}
-
-int
-/*ARGSUSED*/
-_citrus_load_module(_citrus_module_t *rhandle, char const *modname)
-{
-	return (EINVAL);
-}
-
-void
-/*ARGSUSED*/
-_citrus_unload_module(_citrus_module_t handle)
-{
-}
-#endif
diff --git a/lib/libc/citrus/citrus_module.h b/lib/libc/citrus/citrus_module.h
deleted file mode 100644
index d7e68b837..000000000
--- a/lib/libc/citrus/citrus_module.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$NetBSD: citrus_module.h,v 1.1 2002/03/17 22:14:20 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef _CITRUS_MODULE_H_
-#define _CITRUS_MODULE_H_
-
-typedef struct _citrus_module_rec *_citrus_module_t;
-
-__BEGIN_DECLS
-void *_citrus_find_getops(_citrus_module_t __restrict,
-			  const char * __restrict, const char * __restrict);
-int _citrus_load_module(_citrus_module_t * __restrict,
-			const char * __restrict);
-void _citrus_unload_module(_citrus_module_t);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/citrus_namespace.h b/lib/libc/citrus/citrus_namespace.h
deleted file mode 100644
index bb0937d6f..000000000
--- a/lib/libc/citrus/citrus_namespace.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*	$NetBSD: citrus_namespace.h,v 1.8 2009/01/11 02:46:24 christos Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_NAMESPACE_H_
-#define _CITRUS_NAMESPACE_H_
-
-/* citrus_alias */
-#ifndef _CITRUS_ALIAS_NO_NAMESPACE
-#define _alias_lookup		_citrus_alias_lookup
-#endif /* _CITRUS_ALIAS_NO_NAMESPACE */
-
-/* citrus_bcs */
-#ifndef _CITRUS_BCS_NO_NAMESPACE
-#define _bcs_isalnum		_citrus_bcs_isalnum
-#define _bcs_isalpha		_citrus_bcs_isalpha
-#define _bcs_isblank		_citrus_bcs_isblank
-#define _bcs_isdigit		_citrus_bcs_isdigit
-#define _bcs_islower		_citrus_bcs_islower
-#define _bcs_iseol		_citrus_bcs_iseol
-#define _bcs_isspace		_citrus_bcs_isspace
-#define _bcs_isupper		_citrus_bcs_isupper
-#define _bcs_isxdigit		_citrus_bcs_isxdigit
-#define _bcs_skip_nonws		_citrus_bcs_skip_nonws
-#define _bcs_skip_nonws_len	_citrus_bcs_skip_nonws_len
-#define _bcs_skip_ws		_citrus_bcs_skip_ws
-#define _bcs_skip_ws_len	_citrus_bcs_skip_ws_len
-#define _bcs_strcasecmp		_citrus_bcs_strcasecmp
-#define _bcs_strncasecmp	_citrus_bcs_strncasecmp
-#define _bcs_tolower		_citrus_bcs_tolower
-#define _bcs_toupper		_citrus_bcs_toupper
-#define _bcs_trunc_rws_len	_citrus_bcs_trunc_rws_len
-#define _bcs_convert_to_lower	_citrus_bcs_convert_to_lower
-#define _bcs_convert_to_upper	_citrus_bcs_convert_to_upper
-#define _bcs_strtol		_citrus_bcs_strtol
-#define _bcs_strtoul		_citrus_bcs_strtoul
-#endif /* _CITRUS_BCS_NO_NAMESPACE */
-
-/* citrus_csmapper */
-#ifndef _CITRUS_CSMAPPER_NO_NAMESPACE
-#define _csmapper		_citrus_csmapper
-#define _csmapper_open		_citrus_csmapper_open
-#define _csmapper_close		_citrus_csmapper_close
-#define _csmapper_convert	_citrus_csmapper_convert
-#define _csmapper_init_state	_citrus_csmapper_init_state
-#define _csmapper_get_state_size _citrus_csmapper_get_state_size
-#define _csmapper_get_src_max	_citrus_csmapper_get_src_max
-#define _csmapper_get_dst_max	_citrus_csmapper_get_dst_max
-#define _CSMAPPER_F_PREVENT_PIVOT _CITRUS_CSMAPPER_F_PREVENT_PIVOT
-#endif /* _CITRUS_CSMAPPER_NO_NAMESPACE */
-
-/* citrus_db */
-#ifndef _CITRUS_DB_NO_NAMESPACE
-#define _db_open		_citrus_db_open
-#define _db_close		_citrus_db_close
-#define _db_lookup		_citrus_db_lookup
-#define _db_lookup_by_s		_citrus_db_lookup_by_string
-#define _db_lookup8_by_s	_citrus_db_lookup8_by_string
-#define _db_lookup16_by_s	_citrus_db_lookup16_by_string
-#define _db_lookup32_by_s	_citrus_db_lookup32_by_string
-#define _db_lookupstr_by_s	_citrus_db_lookup_string_by_string
-#define _db_hash_std		_citrus_db_hash_std
-#define _db_get_num_entries	_citrus_db_get_number_of_entries
-#define _db_get_entry		_citrus_db_get_entry
-#define _db_locator		_citrus_db_locator
-#define _db_locator_init	_citrus_db_locator_init
-#endif /* _CITRUS_DB_NO_NAMESPACE */
-
-/* citrus_db_factory */
-#ifndef _CITRUS_DB_FACTORY_NO_NAMESPACE
-#define _db_factory		_citrus_db_factory
-#define _db_factory_create	_citrus_db_factory_create
-#define _db_factory_free	_citrus_db_factory_free
-#define _db_factory_add		_citrus_db_factory_add
-#define _db_factory_add_by_s	_citrus_db_factory_add_by_string
-#define _db_factory_add8_by_s	_citrus_db_factory_add8_by_string
-#define _db_factory_add16_by_s	_citrus_db_factory_add16_by_string
-#define _db_factory_add32_by_s	_citrus_db_factory_add32_by_string
-#define _db_factory_addstr_by_s	_citrus_db_factory_add_string_by_string
-#define _db_factory_calc_size	_citrus_db_factory_calc_size
-#define _db_factory_serialize	_citrus_db_factory_serialize
-#endif /* _CITRUS_DB_FACTORY_NO_NAMESPACE */
-
-/* citrus_lookup */
-#ifndef _CITRUS_DB_NO_NAMESPACE
-#define _LOOKUP_CASE_SENSITIVE	_CITRUS_LOOKUP_CASE_SENSITIVE
-#define _LOOKUP_CASE_IGNORE	_CITRUS_LOOKUP_CASE_IGNORE
-#define _lookup			_citrus_lookup
-#define _lookup_simple		_citrus_lookup_simple
-#define _lookup_alias		_citrus_lookup_alias
-#define _lookup_seq_open	_citrus_lookup_seq_open
-#define _lookup_seq_rewind	_citrus_lookup_seq_rewind
-#define _lookup_seq_next	_citrus_lookup_seq_next
-#define _lookup_seq_lookup	_citrus_lookup_seq_lookup
-#define _lookup_get_num_entries	_citrus_lookup_get_number_of_entries
-#define _lookup_seq_close	_citrus_lookup_seq_close
-#define _lookup_factory_convert	_citrus_lookup_factory_convert
-#endif /* _CITRUS_DB_NO_NAMESPACE */
-
-/* citrus_esdb */
-#ifndef _CITRUS_ESDB_NO_NAMESPACE
-#define _esdb			_citrus_esdb
-#define _esdb_charset		_citrus_esdb_charset
-#define _esdb_open		_citrus_esdb_open
-#define _esdb_close		_citrus_esdb_close
-#define _esdb_get_list		_citrus_esdb_get_list
-#define _esdb_free_list		_citrus_esdb_free_list
-#endif /* _CITRUS_ESDB_NO_NAMESPACE */
-
-/* citrus_hash */
-#ifndef _CITRUS_HASH_NO_NAMESPACE
-#define _citrus_string_hash_func _string_hash_func
-#endif /* _CITRUS_HASH_NO_NAMESPACE */
-
-/* citrus_mapper */
-#ifndef _CITRUS_MAPPER_NO_NAMESPACE
-#define _mapper			_citrus_mapper
-#define _mapper_ops		_citrus_mapper_ops
-#define _mapper_traits		_citrus_mapper_traits
-#define _mapper_open		_citrus_mapper_open
-#define _mapper_open_direct	_citrus_mapper_open_direct
-#define _mapper_close		_citrus_mapper_close
-#define _MAPPER_CONVERT_SUCCESS	_CITRUS_MAPPER_CONVERT_SUCCESS
-#define _MAPPER_CONVERT_NONIDENTICAL _CITRUS_MAPPER_CONVERT_NONIDENTICAL
-#define _MAPPER_CONVERT_SRC_MORE _CITRUS_MAPPER_CONVERT_SRC_MORE
-#define _MAPPER_CONVERT_DST_MORE _CITRUS_MAPPER_CONVERT_DST_MORE
-#define _MAPPER_CONVERT_ILSEQ	_CITRUS_MAPPER_CONVERT_ILSEQ
-#define _MAPPER_CONVERT_FATAL	_CITRUS_MAPPER_CONVERT_FATAL
-#define _mapper_convert		_citrus_mapper_convert
-#define _mapper_init_state	_citrus_mapper_init_state
-#define _mapper_get_state_size	_citrus_mapper_get_state_size
-#define _mapper_get_src_max	_citrus_mapper_get_src_max
-#define _mapper_get_dst_max	_citrus_mapper_get_dst_max
-#define _mapper_set_persistent	_citrus_mapper_set_persistent
-#endif /* _CITRUS_MAPPER_NO_NAMESPACE */
-
-/* citrus_memstream */
-#ifndef _CITRUS_MEMSTREAM_NO_NAMESPACE
-#define _memstream		_citrus_memory_stream
-#define _memstream_getln	_citrus_memory_stream_getln
-#define _memstream_matchline	_citrus_memory_stream_matchline
-#define _memstream_chr		_citrus_memory_stream_chr
-#define _memstream_skip_ws	_citrus_memory_stream_skip_ws
-#define _memstream_iseof	_citrus_memory_stream_iseof
-#define _memstream_bind		_citrus_memory_stream_bind
-#define _memstream_bind_ptr	_citrus_memory_stream_bind_ptr
-#define _memstream_seek		_citrus_memory_stream_seek
-#define _memstream_rewind	_citrus_memory_stream_rewind
-#define _memstream_tell		_citrus_memory_stream_tell
-#define _memstream_remainder	_citrus_memory_stream_remainder
-#define _memstream_getc		_citrus_memory_stream_getc
-#define _memstream_ungetc	_citrus_memory_stream_ungetc
-#define _memstream_peek		_citrus_memory_stream_peek
-#define _memstream_getregion	_citrus_memory_stream_getregion
-#define _memstream_getln_region	_citrus_memory_stream_getln_region
-#endif /* _CITRUS_MEMSTREAM_NO_NAMESPACE */
-
-/* citrus_mmap */
-#ifndef _CITRUS_MMAP_NO_NAMESPACE
-#define _map_file		_citrus_map_file
-#define _unmap_file		_citrus_unmap_file
-#endif /* _CITRUS_MMAP_NO_NAMESPACE */
-
-#ifndef _CITRUS_PIVOT_NO_NAMESPACE
-#define _pivot_factory_convert	_citrus_pivot_factory_convert
-#endif /* _CITRUS_PIVOT_NO_NAMESPACE */
-
-/* citrus_region.h */
-#ifndef _CITRUS_REGION_NO_NAMESPACE
-#define _region			_citrus_region
-#define _region_init		_citrus_region_init
-#define _region_head		_citrus_region_head
-#define _region_size		_citrus_region_size
-#define _region_check		_citrus_region_check
-#define _region_offset		_citrus_region_offset
-#define _region_peek8		_citrus_region_peek8
-#define _region_peek16		_citrus_region_peek16
-#define _region_peek32		_citrus_region_peek32
-#define _region_get_subregion	_citrus_region_get_subregion
-#endif /* _CITRUS_REGION_NO_NAMESPACE */
-
-/* citrus_stdenc.h */
-#ifndef _CITRUS_STDENC_NO_NAMESPACE
-#define _stdenc			_citrus_stdenc
-#define _stdenc_ops		_citrus_stdenc_ops
-#define _stdenc_traits		_citrus_stdenc_traits
-#define _stdenc_state_desc	_citrus_stdenc_state_desc
-#define _stdenc_open		_citrus_stdenc_open
-#define _stdenc_close		_citrus_stdenc_close
-#define _stdenc_init_state	_citrus_stdenc_init_state
-#define _stdenc_mbtocs		_citrus_stdenc_mbtocs
-#define _stdenc_cstomb		_citrus_stdenc_cstomb
-#define _stdenc_mbtowc		_citrus_stdenc_mbtowc
-#define _stdenc_wctomb		_citrus_stdenc_wctomb
-#define _stdenc_put_state_reset	_citrus_stdenc_put_state_reset
-#define _stdenc_get_state_size	_citrus_stdenc_get_state_size
-#define _stdenc_get_mb_cur_max	_citrus_stdenc_get_mb_cur_max
-#define _stdenc_get_state_desc	_citrus_stdenc_get_state_desc
-#define _STDENC_SDID_GENERIC	_CITRUS_STDENC_SDID_GENERIC
-#define _STDENC_SDGEN_UNKNOWN	_CITRUS_STDENC_SDGEN_UNKNOWN
-#define _STDENC_SDGEN_INITIAL	_CITRUS_STDENC_SDGEN_INITIAL
-#define _STDENC_SDGEN_STABLE	_CITRUS_STDENC_SDGEN_STABLE
-#define _STDENC_SDGEN_INCOMPLETE_CHAR _CITRUS_STDENC_SDGEN_INCOMPLETE_CHAR
-#define _STDENC_SDGEN_INCOMPLETE_SHIFT _CITRUS_STDENC_SDGEN_INCOMPLETE_SHIFT
-#endif /* _CITRUS_STDENC_NO_NAMESPACE */
-
-/* citrus_types.h */
-#ifndef _CITRUS_TYPES_NO_NAMESPACE
-#define _index_t		_citrus_index_t
-#define _csid_t			_citrus_csid_t
-#define _wc_t			_citrus_wc_t
-#endif /* _CITRUS_TYPES_NO_NAMESPACE */
-
-#endif
diff --git a/lib/libc/citrus/citrus_none.c b/lib/libc/citrus/citrus_none.c
deleted file mode 100644
index 381e74340..000000000
--- a/lib/libc/citrus/citrus_none.c
+++ /dev/null
@@ -1,586 +0,0 @@
-/*	$NetBSD: citrus_none.c,v 1.19 2013/05/28 16:57:56 joerg Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_none.c,v 1.19 2013/05/28 16:57:56 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <wchar.h>
-#include <sys/types.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_none.h"
-#include "citrus_stdenc.h"
-
-/* ---------------------------------------------------------------------- */
-
-_CITRUS_CTYPE_DECLS(NONE);
-_CITRUS_CTYPE_DEF_OPS(NONE);
-
-
-/* ---------------------------------------------------------------------- */
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_ctype_init(void ** __restrict cl, void * __restrict var,
-			size_t lenvar, size_t lenps)
-{
-	*cl = NULL;
-	return (0);
-}
-
-static void
-/*ARGSUSED*/
-_citrus_NONE_ctype_uninit(void *cl)
-{
-}
-
-static unsigned
-/*ARGSUSED*/
-_citrus_NONE_ctype_get_mb_cur_max(void *cl)
-{
-	return (1);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_ctype_mblen(void * __restrict cl, const char * __restrict s,
-			 size_t n, int * __restrict nresult)
-{
-	if (!s) {
-		*nresult = 0; /* state independent */
-		return (0);
-	}
-	if (n==0) {
-		*nresult = -1;
-		return (EILSEQ);
-	}
-	*nresult = (*s == 0) ? 0 : 1;
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_ctype_mbrlen(void * __restrict cl, const char * __restrict s,
-			  size_t n, void * __restrict pspriv,
-			  size_t * __restrict nresult)
-{
-	if (!s) {
-		*nresult = 0;
-		return (0);
-	}
-	if (n==0) {
-		*nresult = (size_t)-2;
-		return (0);
-	}
-	*nresult = (*s == 0) ? 0 : 1;
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_ctype_mbrtowc(void * __restrict cl, wchar_t * __restrict pwc,
-			   const char * __restrict s, size_t n,
-			   void * __restrict pspriv,
-			   size_t * __restrict nresult)
-{
-	if (s == NULL) {
-		*nresult = 0;
-		return (0);
-	}
-	if (n == 0) {
-		*nresult = (size_t)-2;
-		return (0);
-	}
-
-	if (pwc != NULL)
-		*pwc = (wchar_t)(unsigned char) *s;
-
-	*nresult = *s == '\0' ? 0 : 1;
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_ctype_mbsinit(void * __restrict cl,
-			   const void * __restrict pspriv,
-			   int * __restrict nresult)
-{
-	*nresult = 1;  /* always initial state */
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_ctype_mbsrtowcs(void * __restrict cl, wchar_t * __restrict pwcs,
-			     const char ** __restrict s, size_t n,
-			     void * __restrict pspriv,
-			     size_t * __restrict nresult)
-{
-	int cnt;
-	const char *s0;
-
-	/* if pwcs is NULL, ignore n */
-	if (pwcs == NULL)
-		n = 1; /* arbitrary >0 value */
-
-	cnt = 0;
-	s0 = *s; /* to keep *s unchanged for now, use copy instead. */
-	while (n > 0) {
-		if (pwcs != NULL) {
-			*pwcs = (wchar_t)(unsigned char)*s0;
-		}
-		if (*s0 == '\0') {
-			s0 = NULL;
-			break;
-		}
-		s0++;
-		if (pwcs != NULL) {
-			pwcs++;
-			n--;
-		}
-		cnt++;
-	}
-	if (pwcs)
-		*s = s0;
-
-	*nresult = (size_t)cnt;
-
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_ctype_mbsnrtowcs(_citrus_ctype_rec_t * __restrict cc,
-			     wchar_t * __restrict pwcs,
-			     const char ** __restrict s, size_t in, size_t n,
-			     void * __restrict pspriv,
-			     size_t * __restrict nresult)
-{
-	int cnt;
-	const char *s0;
-
-	/* if pwcs is NULL, ignore n */
-	if (pwcs == NULL)
-		n = 1; /* arbitrary >0 value */
-
-	cnt = 0;
-	s0 = *s; /* to keep *s unchanged for now, use copy instead. */
-	while (in > 0 && n > 0) {
-		if (pwcs != NULL) {
-			*pwcs = (wchar_t)(unsigned char)*s0;
-		}
-		if (*s0 == '\0') {
-			s0 = NULL;
-			break;
-		}
-		s0++;
-		--in;
-		if (pwcs != NULL) {
-			pwcs++;
-			n--;
-		}
-		cnt++;
-	}
-	if (pwcs)
-		*s = s0;
-
-	*nresult = (size_t)cnt;
-
-	return (0);
-}
-
-static int
-_citrus_NONE_ctype_mbstowcs(void * __restrict cl, wchar_t * __restrict wcs,
-			    const char * __restrict s, size_t n,
-			    size_t * __restrict nresult)
-{
-	const char *rs = s;
-
-	return (_citrus_NONE_ctype_mbsrtowcs(cl, wcs, &rs, n, NULL, nresult));
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_ctype_mbtowc(void * __restrict cl, wchar_t * __restrict pwc,
-			  const char * __restrict s, size_t n,
-			  int * __restrict nresult)
-{
-
-	if (s == NULL) {
-		*nresult = 0; /* state independent */
-		return (0);
-	}
-	if (n == 0) {
-		return (EILSEQ);
-	}
-	if (pwc == NULL) {
-		if (*s == '\0') {
-			*nresult = 0;
-		} else {
-			*nresult = 1;
-		}
-		return (0);
-	}
-
-	*pwc = (wchar_t)(unsigned char)*s;
-	*nresult = *s == '\0' ? 0 : 1;
-
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_ctype_wcrtomb(void * __restrict cl, char * __restrict s,
-			   wchar_t wc, void * __restrict pspriv,
-			   size_t * __restrict nresult)
-{
-	if ((wc&~0xFFU) != 0) {
-		*nresult = (size_t)-1;
-		return (EILSEQ);
-	}
-
-	*nresult = 1;
-	if (s!=NULL)
-		*s = (char)wc;
-
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_ctype_wcsrtombs(void * __restrict cl, char * __restrict s,
-			     const wchar_t ** __restrict pwcs, size_t n,
-			     void * __restrict pspriv,
-			     size_t * __restrict nresult)
-{
-	size_t count;
-	const wchar_t *pwcs0;
-
-	pwcs0 = *pwcs;
-	count = 0;
-
-	if (s == NULL)
-		n = 1;
-
-	while (n > 0) {
-		if ((*pwcs0 & ~0xFFU) != 0) {
-			*nresult = (size_t)-1;
-			return (EILSEQ);
-		}
-		if (s != NULL) {
-			*s++ = (char)*pwcs0;
-			n--;
-		}
-		if (*pwcs0 == L'\0') {
-			pwcs0 = NULL;
-			break;
-		}
-		count++;
-		pwcs0++;
-	}
-	if (s != NULL)
-		*pwcs = pwcs0;
-
-	*nresult = count;
-
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_ctype_wcsnrtombs(_citrus_ctype_rec_t * __restrict cc,
-			     char * __restrict s,
-			     const wchar_t ** __restrict pwcs, size_t in,
-			     size_t n, void * __restrict pspriv,
-			     size_t * __restrict nresult)
-{
-	size_t count;
-	const wchar_t *pwcs0;
-
-	pwcs0 = *pwcs;
-	count = 0;
-
-	if (s == NULL)
-		n = 1;
-
-	while (in > 0 && n > 0) {
-		if ((*pwcs0 & ~0xFFU) != 0) {
-			*nresult = (size_t)-1;
-			return (EILSEQ);
-		}
-		if (s != NULL) {
-			*s++ = (char)*pwcs0;
-			n--;
-		}
-		if (*pwcs0 == L'\0') {
-			pwcs0 = NULL;
-			break;
-		}
-		count++;
-		pwcs0++;
-		--in;
-	}
-	if (s != NULL)
-		*pwcs = pwcs0;
-
-	*nresult = count;
-
-	return (0);
-}
-
-static int
-_citrus_NONE_ctype_wcstombs(void * __restrict cl, char * __restrict s,
-			    const wchar_t * __restrict pwcs, size_t n,
-			    size_t * __restrict nresult)
-{
-	const wchar_t *rpwcs = pwcs;
-
-	return (_citrus_NONE_ctype_wcsrtombs(cl, s, &rpwcs, n, NULL, nresult));
-}
-
-static int
-_citrus_NONE_ctype_wctomb(void * __restrict cl, char * __restrict s,
-			  wchar_t wc, int * __restrict nresult)
-{
-	int ret;
-	size_t nr;
-
-	if (s == 0) {
-		/*
-		 * initialize state here.
-		 * (nothing to do for us.)
-		 */
-		*nresult = 0; /* we're state independent */
-		return (0);
-	}
-
-	ret = _citrus_NONE_ctype_wcrtomb(cl, s, wc, NULL, &nr);
-	*nresult = (int)nr;
-
-	return (ret);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_ctype_btowc(_citrus_ctype_rec_t * __restrict cc,
-			 int c, wint_t * __restrict wcresult)
-{
-	if (c == EOF || c & ~0xFF)
-		*wcresult = WEOF;
-	else
-		*wcresult = (wint_t)c;
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_ctype_wctob(_citrus_ctype_rec_t * __restrict cc,
-			 wint_t wc, int * __restrict cresult)
-{
-	if (wc == WEOF || wc & ~0xFF)
-		*cresult = EOF;
-	else
-		*cresult = (int)wc;
-	return (0);
-}
-
-/* ---------------------------------------------------------------------- */
-
-_CITRUS_STDENC_DECLS(NONE);
-_CITRUS_STDENC_DEF_OPS(NONE);
-struct _citrus_stdenc_traits _citrus_NONE_stdenc_traits = {
-	0,	/* et_state_size */
-	1,	/* mb_cur_max */
-};
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_stdenc_init(struct _citrus_stdenc * __restrict ce,
-			 const void *var, size_t lenvar,
-			 struct _citrus_stdenc_traits * __restrict et)
-{
-
-	et->et_state_size = 0;
-	et->et_mb_cur_max = 1;
-
-	ce->ce_closure = NULL;
-
-	return (0);
-}
-
-static void
-/*ARGSUSED*/
-_citrus_NONE_stdenc_uninit(struct _citrus_stdenc *ce)
-{
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_stdenc_init_state(struct _citrus_stdenc * __restrict ce,
-			       void * __restrict ps)
-{
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce,
-			   _csid_t *csid, _index_t *idx,
-			   const char **s, size_t n,
-			   void *ps, size_t *nresult)
-{
-
-	_DIAGASSERT(csid != NULL && idx != NULL);
-
-	if (n<1) {
-		*nresult = (size_t)-2;
-		return (0);
-	}
-
-	*csid = 0;
-	*idx = (_index_t)(unsigned char)*(*s)++;
-	*nresult = *idx == 0 ? 0 : 1;
-
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_stdenc_cstomb(struct _citrus_stdenc * __restrict ce,
-			   char *s, size_t n,
-			   _csid_t csid, _index_t idx,
-			   void *ps, size_t *nresult)
-{
-
-	if (csid == _CITRUS_CSID_INVALID) {
-		*nresult = 0;
-		return (0);
-	}
-	if (n<1) {
-		*nresult = (size_t)-1;
-		return (E2BIG);
-	}
-	if (csid != 0 || (idx&0xFF) != idx)
-		return (EILSEQ);
-
-	*s = (char)idx;
-	*nresult = 1;
-
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __restrict ce,
-			   _wc_t * __restrict pwc,
-			   const char ** __restrict s, size_t n,
-			   void * __restrict pspriv,
-			   size_t * __restrict nresult)
-{
-	if (s == NULL) {
-		*nresult = 0;
-		return (0);
-	}
-	if (n == 0) {
-		*nresult = (size_t)-2;
-		return (0);
-	}
-
-	if (pwc != NULL)
-		*pwc = (_wc_t)(unsigned char) **s;
-
-	*nresult = *s == '\0' ? 0 : 1;
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_stdenc_wctomb(struct _citrus_stdenc * __restrict ce,
-			   char * __restrict s, size_t n,
-			   _wc_t wc, void * __restrict pspriv,
-			   size_t * __restrict nresult)
-{
-	if ((wc&~0xFFU) != 0) {
-		*nresult = (size_t)-1;
-		return (EILSEQ);
-	}
-	if (n==0) {
-		*nresult = (size_t)-1;
-		return (E2BIG);
-	}
-
-	*nresult = 1;
-	if (s!=NULL && n>0)
-		*s = (char)wc;
-
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_stdenc_put_state_reset(struct _citrus_stdenc * __restrict ce,
-				    char * __restrict s, size_t n,
-				    void * __restrict pspriv,
-				    size_t * __restrict nresult)
-{
-
-	*nresult = 0;
-
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_NONE_stdenc_get_state_desc(struct _stdenc * __restrict ce,
-				   void * __restrict ps,
-				   int id,
-				   struct _stdenc_state_desc * __restrict d)
-{
-	int ret = 0;
-
-	switch (id) {
-	case _STDENC_SDID_GENERIC:
-		d->u.generic.state = _STDENC_SDGEN_INITIAL;
-		break;
-	default:
-		ret = EOPNOTSUPP;
-	}
-
-	return ret;
-}
diff --git a/lib/libc/citrus/citrus_none.h b/lib/libc/citrus/citrus_none.h
deleted file mode 100644
index 1a75f2c0f..000000000
--- a/lib/libc/citrus/citrus_none.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: citrus_none.h,v 1.3 2003/06/25 09:51:38 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_NONE_H_
-#define _CITRUS_NONE_H_
-
-extern struct _citrus_ctype_ops_rec	_citrus_NONE_ctype_ops;
-extern struct _citrus_stdenc_ops	_citrus_NONE_stdenc_ops;
-extern struct _citrus_stdenc_traits	_citrus_NONE_stdenc_traits;
-
-#endif
diff --git a/lib/libc/citrus/citrus_pivot_factory.c b/lib/libc/citrus/citrus_pivot_factory.c
deleted file mode 100644
index 54369caf6..000000000
--- a/lib/libc/citrus/citrus_pivot_factory.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*	$NetBSD: citrus_pivot_factory.c,v 1.7 2009/04/12 14:20:19 lukem Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_pivot_factory.c,v 1.7 2009/04/12 14:20:19 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <limits.h>
-#include <sys/queue.h>
-
-#include "citrus_namespace.h"
-#include "citrus_region.h"
-#include "citrus_bcs.h"
-#include "citrus_db_factory.h"
-#include "citrus_db_hash.h"
-#include "citrus_pivot_file.h"
-#include "citrus_pivot_factory.h"
-
-struct src_entry {
-	char *se_name;
-	struct _citrus_db_factory *se_df;
-	SIMPLEQ_ENTRY(src_entry) se_entry;
-};
-SIMPLEQ_HEAD(src_head, src_entry);
-
-static int
-find_src(struct src_head *sh, struct src_entry **rse, const char *name)
-{
-	int ret;
-	struct src_entry *se;
-
-	SIMPLEQ_FOREACH(se, sh, se_entry) {
-		if (_bcs_strcasecmp(se->se_name, name) == 0) {
-			*rse = se;
-			return 0;
-		}
-	}
-	se = malloc(sizeof(*se));
-	if (se == NULL)
-		return errno;
-	se->se_name = strdup(name);
-	if (se->se_name == NULL) {
-		ret = errno;
-		free(se);
-		return ret;
-	}
-	ret = _db_factory_create(&se->se_df, &_db_hash_std, NULL);
-	if (ret) {
-		free(se->se_name);
-		free(se);
-		return ret;
-	}
-	SIMPLEQ_INSERT_TAIL(sh, se, se_entry);
-	*rse = se;
-
-	return 0;
-}
-
-static void
-free_src(struct src_head *sh)
-{
-	struct src_entry *se;
-
-	while ((se = SIMPLEQ_FIRST(sh)) != NULL) {
-		SIMPLEQ_REMOVE_HEAD(sh, se_entry);
-		_db_factory_free(se->se_df);
-		free(se->se_name);
-		free(se);
-	}
-}
-
-
-#define T_COMM '#'
-static int
-convert_line(struct src_head *sh, const char *line, size_t len)
-{
-	int ret;
-	struct src_entry *se;
-	const char *p;
-	char key1[LINE_MAX], key2[LINE_MAX], data[LINE_MAX];
-	char *ep;
-	uint32_t val;
-
-	se = NULL; /* XXX gcc */
-
-	/* cut off trailing comment */
-	p = memchr(line, T_COMM, len);
-	if (p)
-		len = p - line;
-
-	/* key1 */
-	line = _bcs_skip_ws_len(line, &len);
-	if (len == 0)
-		return 0;
-	p = _bcs_skip_nonws_len(line, &len);
-	if (p==line)
-		return 0;
-	snprintf(key1, sizeof(key1), "%.*s", (int)(p-line), line);
-
-	/* key2 */
-	line = _bcs_skip_ws_len(p, &len);
-	if (len == 0)
-		return 0;
-	p = _bcs_skip_nonws_len(line, &len);
-	if (p==line)
-		return 0;
-	snprintf(key2, sizeof(key2), "%.*s", (int)(p-line), line);
-
-	/* data */
-	line = _bcs_skip_ws_len(p, &len);
-	_bcs_trunc_rws_len(line, &len);
-	snprintf(data, sizeof(data), "%.*s", (int)len, line);
-	val = strtoul(data, &ep, 0);
-	if (*ep != '\0')
-		return EFTYPE;
-
-	/* insert to DB */
-	ret = find_src(sh, &se, key1);
-	if (ret)
-		return ret;
-
-	return _db_factory_add32_by_s(se->se_df, key2, val);
-}
-
-static int
-dump_db(struct src_head *sh, struct _region *r)
-{
-	int ret;
-	struct _db_factory *df;
-	struct src_entry *se;
-	size_t size;
-	void *ptr;
-	struct _region subr;
-
-	ret = _db_factory_create(&df, &_db_hash_std, NULL);
-	if (ret)
-		return ret;
-
-	SIMPLEQ_FOREACH(se, sh, se_entry) {
-		size = _db_factory_calc_size(se->se_df);
-		ptr = malloc(size);
-		if (ptr == NULL)
-			goto quit;
-		_region_init(&subr, ptr, size);
-		ret = _db_factory_serialize(se->se_df, _CITRUS_PIVOT_SUB_MAGIC,
-					    &subr);
-		if (ret)
-			goto quit;
-		ret = _db_factory_add_by_s(df, se->se_name, &subr, 1);
-		if (ret)
-			goto quit;
-	}
-
-	size = _db_factory_calc_size(df);
-	ptr = malloc(size);
-	if (ptr == NULL)
-		goto quit;
-	_region_init(r, ptr, size);
-
-	ret = _db_factory_serialize(df, _CITRUS_PIVOT_MAGIC, r);
-	ptr = NULL;
-
-quit:
-	free(ptr);
-	_db_factory_free(df);
-	return ret;
-}
-
-int
-_citrus_pivot_factory_convert(FILE *out, FILE *in)
-{
-	struct src_head sh;
-	struct _region r;
-	char *line;
-	size_t size;
-	int ret;
-
-	SIMPLEQ_INIT(&sh);
-
-	while ((line = fgetln(in, &size)) != NULL)
-		if ((ret = convert_line(&sh, line, size))) {
-			free_src(&sh);
-			return ret;
-		}
-
-	ret = dump_db(&sh, &r);
-	free_src(&sh);
-	if (ret)
-		return ret;
-
-	if (fwrite(_region_head(&r), _region_size(&r), 1, out) != 1)
-		return errno;
-
-	return 0;
-}
diff --git a/lib/libc/citrus/citrus_pivot_factory.h b/lib/libc/citrus/citrus_pivot_factory.h
deleted file mode 100644
index dd5d80488..000000000
--- a/lib/libc/citrus/citrus_pivot_factory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: citrus_pivot_factory.h,v 1.1 2003/06/25 09:51:39 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_PIVOT_FACTORY_H_
-#define _CITRUS_PIVOT_FACTORY_H_
-
-__BEGIN_DECLS
-int	_citrus_pivot_factory_convert(FILE *, FILE *);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/citrus_pivot_file.h b/lib/libc/citrus/citrus_pivot_file.h
deleted file mode 100644
index eb50645a1..000000000
--- a/lib/libc/citrus/citrus_pivot_file.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: citrus_pivot_file.h,v 1.1 2003/06/25 09:51:39 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_PIVOT_FILE_H_
-#define _CITRUS_PIVOT_FILE_H_
-
-#define _CITRUS_PIVOT_MAGIC	"CSPIVOT\0"
-#define _CITRUS_PIVOT_SUB_MAGIC	"CSPIVSUB"
-
-#endif
diff --git a/lib/libc/citrus/citrus_prop.c b/lib/libc/citrus/citrus_prop.c
deleted file mode 100644
index 198a9e7c8..000000000
--- a/lib/libc/citrus/citrus_prop.c
+++ /dev/null
@@ -1,467 +0,0 @@
-/* $NetBSD: citrus_prop.c,v 1.5 2014/06/24 22:24:18 spz Exp $ */
-
-/*-
- * Copyright (c)2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_prop.c,v 1.5 2014/06/24 22:24:18 spz Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_prop.h"
-
-typedef struct {
-	_citrus_prop_type_t type;
-	union {
-		const char *str;
-		int chr;
-		bool boolean;
-		uint64_t num;
-	} u;
-} _citrus_prop_object_t;
-
-static __inline void
-_citrus_prop_object_init(_citrus_prop_object_t *obj, _citrus_prop_type_t type)
-{
-	_DIAGASSERT(obj != NULL);
-
-	obj->type = type;
-	memset(&obj->u, 0, sizeof(obj->u));
-}
-
-static __inline void
-_citrus_prop_object_uninit(_citrus_prop_object_t *obj)
-{
-	_DIAGASSERT(obj != NULL);
-
-	if (obj->type == _CITRUS_PROP_STR)
-		free(__UNCONST(obj->u.str));
-}
-
-static const char *xdigit = "0123456789ABCDEF";
-
-#define _CITRUS_PROP_READ_UINT_COMMON(_func_, _type_, _max_)		\
-static int								\
-_citrus_prop_read_##_func_##_common(struct _memstream * __restrict ms,	\
-	_type_ * __restrict result, int base)				\
-{									\
-	_type_ acc, cutoff;						\
-	int n, ch, cutlim;						\
-	char *p;							\
-									\
-	_DIAGASSERT(ms != NULL);					\
-	_DIAGASSERT(result != NULL);					\
-									\
-	acc = (_type_)0;						\
-	cutoff = _max_ / base;						\
-	cutlim = _max_ % base;						\
-	for (;;) {							\
-		ch = _memstream_getc(ms);				\
-		p = strchr(xdigit, _bcs_toupper(ch));			\
-		if (p == NULL || (n = (p - xdigit)) >= base)		\
-			break;						\
-		if (acc > cutoff || (acc == cutoff && n > cutlim))	\
-			break;						\
-		acc *= base;						\
-		acc += n;						\
-	}								\
-	_memstream_ungetc(ms, ch);					\
-	*result = acc;							\
-	return 0;							\
-}
-_CITRUS_PROP_READ_UINT_COMMON(chr, int, UCHAR_MAX)
-_CITRUS_PROP_READ_UINT_COMMON(num, uint64_t, UINT64_MAX)
-#undef _CITRUS_PROP_READ_UINT_COMMON
-
-#define _CITRUS_PROP_READ_INT(_func_, _type_)			\
-static int							\
-_citrus_prop_read_##_func_(struct _memstream * __restrict ms,	\
-	_citrus_prop_object_t * __restrict obj)			\
-{								\
-	int ch, neg, base;					\
-								\
-	_DIAGASSERT(ms != NULL);				\
-	_DIAGASSERT(obj != NULL);				\
-								\
-	_memstream_skip_ws(ms);					\
-	ch = _memstream_getc(ms);				\
-	neg = 0;						\
-	switch (ch) {						\
-	case '-':						\
-		neg = 1;					\
-	case '+':						\
-		ch = _memstream_getc(ms);			\
-	}							\
-	base = 10;						\
-	if (ch == '0') {					\
-		base -= 2;					\
-		ch = _memstream_getc(ms);			\
-		if (ch == 'x' || ch == 'X') {			\
-			ch = _memstream_getc(ms);		\
-			if (_bcs_isxdigit(ch) == 0) {		\
-				_memstream_ungetc(ms, ch);	\
-				obj->u._func_ = 0;		\
-				return 0;			\
-			}					\
-			base += 8;				\
-		}						\
-	} else if (_bcs_isdigit(ch) == 0)			\
-		return EINVAL;					\
-	_memstream_ungetc(ms, ch);				\
-	return _citrus_prop_read_##_func_##_common		\
-	    (ms, &obj->u._func_, base);				\
-}
-_CITRUS_PROP_READ_INT(chr, int)
-_CITRUS_PROP_READ_INT(num, uint64_t)
-#undef _CITRUS_PROP_READ_INT
-
-static int
-_citrus_prop_read_character_common(struct _memstream * __restrict ms,
-	int * __restrict result)
-{
-	int ch, base;
-
-	_DIAGASSERT(ms != NULL);
-	_DIAGASSERT(result != NULL);
-
-	ch = _memstream_getc(ms);
-	if (ch != '\\') {
-		*result = ch;
-	} else {
-		ch = _memstream_getc(ms);
-		base = 16;
-		switch (ch) {
-		case 'a': *result = '\a'; break;
-		case 'b': *result = '\b'; break;
-		case 'f': *result = '\f'; break;
-		case 'n': *result = '\n'; break;
-		case 'r': *result = '\r'; break;
-		case 't': *result = '\t'; break;
-		case 'v': *result = '\v'; break;
-		/*FALLTHROUGH*/
-		case '0': case '1': case '2': case '3':
-		case '4': case '5': case '6': case '7':
-			_memstream_ungetc(ms, ch);
-			base -= 8;
-		case 'x':
-			return _citrus_prop_read_chr_common(ms, result, base);
-			
-		default:
-			/* unknown escape */
-			*result = ch;
-		}
-	}
-	return 0;
-}
-
-static int
-_citrus_prop_read_character(struct _memstream * __restrict ms,
-	_citrus_prop_object_t * __restrict obj)
-{
-	int ch, errnum;
-
-	_DIAGASSERT(ms != NULL);
-	_DIAGASSERT(obj != NULL);
-
-	_memstream_skip_ws(ms);
-	ch = _memstream_getc(ms);
-	if (ch != '\'') {
-		_memstream_ungetc(ms, ch);
-		return _citrus_prop_read_chr(ms, obj);
-	}
-	errnum = _citrus_prop_read_character_common(ms, &ch);
-	if (errnum != 0)
-		return errnum;
-	obj->u.chr = ch;
-	ch = _memstream_getc(ms);
-	if (ch != '\'')
-		return EINVAL;
-	return 0;
-}
-
-static int
-_citrus_prop_read_bool(struct _memstream * __restrict ms,
-	_citrus_prop_object_t * __restrict obj)
-{
-	_DIAGASSERT(ms != NULL);
-	_DIAGASSERT(obj != NULL);
-
-	_memstream_skip_ws(ms);
-	switch (_bcs_tolower(_memstream_getc(ms))) {
-	case 't':
-		if (_bcs_tolower(_memstream_getc(ms)) == 'r' &&
-		    _bcs_tolower(_memstream_getc(ms)) == 'u' &&
-		    _bcs_tolower(_memstream_getc(ms)) == 'e') {
-			obj->u.boolean = true;
-			return 0;
-		}
-		break;
-	case 'f':
-		if (_bcs_tolower(_memstream_getc(ms)) == 'a' &&
-		    _bcs_tolower(_memstream_getc(ms)) == 'l' &&
-		    _bcs_tolower(_memstream_getc(ms)) == 's' &&
-		    _bcs_tolower(_memstream_getc(ms)) == 'e') {
-			obj->u.boolean = false;
-			return 0;
-		}
-	}
-	return EINVAL;
-}
-
-static int
-_citrus_prop_read_str(struct _memstream * __restrict ms,
-	_citrus_prop_object_t * __restrict obj)
-{
-	int errnum, quot, ch;
-	char *s, *t;
-#define _CITRUS_PROP_STR_BUFSIZ	512
-	size_t n, m;
-
-	_DIAGASSERT(ms != NULL);
-	_DIAGASSERT(obj != NULL);
-
-	m = _CITRUS_PROP_STR_BUFSIZ;
-	s = malloc(m);
-	if (s == NULL)
-		return ENOMEM;
-	n = 0;
-	_memstream_skip_ws(ms);
-	quot = _memstream_getc(ms);
-	switch (quot) {
-	case EOF:
-		goto done;
-	case '\\':
-		_memstream_ungetc(ms, quot);
-		quot = EOF;
-	/*FALLTHROUGH*/
-	case '\"': case '\'':
-		break;
-	default:
-		s[n] = quot;
-		++n, --m;
-		quot = EOF;
-	}
-	for (;;) {
-		if (m < 1) {
-			m = _CITRUS_PROP_STR_BUFSIZ;
-			t = realloc(s, n + m);
-			if (t == NULL) {
-				free(s);
-				return ENOMEM;
-			}
-			s = t;
-		}
-		ch = _memstream_getc(ms);
-		if (quot == ch || (quot == EOF &&
-		    (ch == ';' || _bcs_isspace(ch)))) {
-done:
-			s[n] = '\0';
-			obj->u.str = (const char *)s;
-			return 0;
-		}
-		_memstream_ungetc(ms, ch);
-		errnum = _citrus_prop_read_character_common(ms, &ch);
-		if (errnum != 0)
-			return errnum;
-		s[n] = ch;
-		++n, --m;
-	}
-	free(s);
-	return EINVAL;
-#undef _CITRUS_PROP_STR_BUFSIZ
-}
-
-typedef int (*_citrus_prop_read_type_t)(struct _memstream * __restrict,
-	_citrus_prop_object_t * __restrict);
-
-static const _citrus_prop_read_type_t readers[] = {
-	_citrus_prop_read_bool,
-	_citrus_prop_read_str,
-	_citrus_prop_read_character,
-	_citrus_prop_read_num,
-};
-
-static __inline int
-_citrus_prop_read_symbol(struct _memstream * __restrict ms,
-	char * __restrict s, size_t n)
-{
-	int ch;
-	size_t m;
-
-	_DIAGASSERT(ms != NULL);
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(n > 0);
-
-	for (m = 0; m < n; ++m) {
-		ch = _memstream_getc(ms);
-		if (ch != '_' && _bcs_isalnum(ch) == 0)
-			goto name_found;
-		s[m] = ch;
-	}
-	ch = _memstream_getc(ms);
-	if (ch == '_' || _bcs_isalnum(ch) != 0)
-		return EINVAL;
-
-name_found:
-	_memstream_ungetc(ms, ch);
-	s[m] = '\0';
-
-	return 0;
-}
-
-static int
-_citrus_prop_parse_element(struct _memstream * __restrict ms,
-	const _citrus_prop_hint_t * __restrict hints,
-	void * __restrict context)
-{
-	int ch, errnum;
-#define _CITRUS_PROP_HINT_NAME_LEN_MAX	255
-	char name[_CITRUS_PROP_HINT_NAME_LEN_MAX + 1];
-	const _citrus_prop_hint_t *hint;
-	_citrus_prop_object_t ostart, oend;
-
-	_DIAGASSERT(ms != NULL);
-	_DIAGASSERT(hints != NULL);
-
-	errnum = _citrus_prop_read_symbol(ms, name, sizeof(name));
-	if (errnum != 0)
-		return errnum;
-	for (hint = hints; hint->name != NULL; ++hint) {
-		if (_citrus_bcs_strcasecmp(name, hint->name) == 0)
-			goto hint_found;
-	}
-	return EINVAL;
-
-hint_found:
-	_memstream_skip_ws(ms);
-	ch = _memstream_getc(ms);
-	if (ch != '=' && ch != ':')
-		_memstream_ungetc(ms, ch);
-	do {
-		_citrus_prop_object_init(&ostart, hint->type);
-		_citrus_prop_object_init(&oend, hint->type);
-		errnum = (*readers[hint->type])(ms, &ostart);
-		if (errnum != 0)
-			return errnum;
-		_memstream_skip_ws(ms);
-		ch = _memstream_getc(ms);
-		switch (hint->type) {
-		case _CITRUS_PROP_BOOL:
-		case _CITRUS_PROP_STR:
-			break;
-		default:
-			if (ch != '-')
-				break;
-			errnum = (*readers[hint->type])(ms, &oend);
-			if (errnum != 0)
-				return errnum;
-			_memstream_skip_ws(ms);
-			ch = _memstream_getc(ms);
-		}
-#define CALL0(_func_)					\
-do {							\
-	_DIAGASSERT(hint->cb._func_.func != NULL);	\
-	errnum = (*hint->cb._func_.func)(context,	\
-	    hint->name,	ostart.u._func_);		\
-} while (/*CONSTCOND*/0)
-#define CALL1(_func_)					\
-do {							\
-	_DIAGASSERT(hint->cb._func_.func != NULL);	\
-	errnum = (*hint->cb._func_.func)(context,	\
-	    hint->name,	ostart.u._func_, oend.u._func_);\
-} while (/*CONSTCOND*/0)
-
-		switch (hint->type) {
-
-		case _CITRUS_PROP_BOOL:
-			CALL0(boolean);
-			break;
-
-		case _CITRUS_PROP_STR:
-			CALL0(str);
-			break;
-
-		case _CITRUS_PROP_CHR:
-			CALL1(chr);
-			break;
-
-		case _CITRUS_PROP_NUM:
-			CALL1(num);
-			break;
-
-		default:
-			abort();
-			/*NOTREACHED*/
-		}
-#undef CALL0
-#undef CALL1
-		_citrus_prop_object_uninit(&ostart);
-		_citrus_prop_object_uninit(&oend);
-		if (errnum != 0)
-			return errnum;
-	} while (ch == ',');
-	if (ch != ';')
-		_memstream_ungetc(ms, ch);
-	return 0;
-}
-
-int
-_citrus_prop_parse_variable(const _citrus_prop_hint_t * __restrict hints,
-	void * __restrict context, const void *var, size_t lenvar)
-{
-	struct _memstream ms;
-	int errnum, ch;
-
-	_DIAGASSERT(hints != NULL);
-
-	_memstream_bind_ptr(&ms, __UNCONST(var), lenvar);
-	for (;;) {
-		_memstream_skip_ws(&ms);
-		ch = _memstream_getc(&ms);
-		if (ch == EOF || ch == '\0')
-			break;
-		_memstream_ungetc(&ms, ch);
-		errnum = _citrus_prop_parse_element(&ms, hints, context);
-		if (errnum != 0)
-			return errnum;
-	}
-	return 0;
-}
diff --git a/lib/libc/citrus/citrus_prop.h b/lib/libc/citrus/citrus_prop.h
deleted file mode 100644
index 73a1ea88f..000000000
--- a/lib/libc/citrus/citrus_prop.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* $NetBSD: citrus_prop.h,v 1.6 2014/06/24 22:24:18 spz Exp $ */
-
-/*-
- * Copyright (c)2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef _CITRUS_PROP_H_
-#define _CITRUS_PROP_H_
-
-typedef enum {
-	_CITRUS_PROP_BOOL = 0,
-	_CITRUS_PROP_STR  = 1,
-	_CITRUS_PROP_CHR  = 2,
-	_CITRUS_PROP_NUM  = 3,
-} _citrus_prop_type_t;
-
-typedef struct _citrus_prop_hint_t _citrus_prop_hint_t;
-
-#define _CITRUS_PROP_CB0_T(_func_, _type_) \
-typedef int (*_citrus_prop_##_func_##_cb_func_t) \
-	(void * __restrict, const char *, _type_); \
-typedef struct { \
-	_citrus_prop_##_func_##_cb_func_t func; \
-} _citrus_prop_##_func_##_cb_t;
-_CITRUS_PROP_CB0_T(boolean, int)
-_CITRUS_PROP_CB0_T(str, const char *)
-#undef _CITRUS_PROP_CB0_T
-
-#define _CITRUS_PROP_CB1_T(_func_, _type_) \
-typedef int (*_citrus_prop_##_func_##_cb_func_t) \
-	(void * __restrict, const char *, _type_, _type_); \
-typedef struct { \
-	_citrus_prop_##_func_##_cb_func_t func; \
-} _citrus_prop_##_func_##_cb_t;
-_CITRUS_PROP_CB1_T(chr, int)
-_CITRUS_PROP_CB1_T(num, uint64_t)
-#undef _CITRUS_PROP_CB1_T
-
-struct _citrus_prop_hint_t {
-	const char *name;
-	_citrus_prop_type_t type;
-#define _CITRUS_PROP_CB_T_OPS(_name_) \
-	_citrus_prop_##_name_##_cb_t _name_
-	union {
-		_CITRUS_PROP_CB_T_OPS(boolean);
-		_CITRUS_PROP_CB_T_OPS(str);
-		_CITRUS_PROP_CB_T_OPS(chr);
-		_CITRUS_PROP_CB_T_OPS(num);
-	} cb;
-};
-
-#define _CITRUS_PROP_HINT_BOOL(name, cb) \
-	{ name, _CITRUS_PROP_BOOL, { .boolean = { cb } } }
-#define _CITRUS_PROP_HINT_STR(name, cb) \
-	{ name, _CITRUS_PROP_STR, { .str = { cb } } }
-#define _CITRUS_PROP_HINT_CHR(name, cb) \
-	{ name, _CITRUS_PROP_CHR, { .chr = { cb } } }
-#define _CITRUS_PROP_HINT_NUM(name, cb) \
-	{ name, _CITRUS_PROP_NUM, { .num = { cb } } }
-#define _CITRUS_PROP_HINT_END \
-	{ .name = NULL }
-
-__BEGIN_DECLS
-int _citrus_prop_parse_variable(const _citrus_prop_hint_t * __restrict,
-	void * __restrict, const void *, size_t);
-__END_DECLS
-
-#endif /* !_CITRUS_PROP_H_ */
diff --git a/lib/libc/citrus/citrus_region.h b/lib/libc/citrus/citrus_region.h
deleted file mode 100644
index 18c9db72b..000000000
--- a/lib/libc/citrus/citrus_region.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*	$NetBSD: citrus_region.h,v 1.7 2008/02/09 14:56:20 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef _CITRUS_REGION_H_
-#define _CITRUS_REGION_H_
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-struct _citrus_region {
-/* private: */
-	void	*r_head;
-	size_t	r_size;
-};
-
-static __inline void
-_citrus_region_init(struct _citrus_region *r, void *h, size_t sz)
-{
-	_DIAGASSERT(r);
-	r->r_head = h;
-	r->r_size = sz;
-}
-
-static __inline void *
-_citrus_region_head(const struct _citrus_region *r)
-{
-	return r->r_head;
-}
-
-static __inline size_t
-_citrus_region_size(const struct _citrus_region *r)
-{
-	return r->r_size;
-}
-
-static __inline int
-_citrus_region_check(const struct _citrus_region *r, size_t ofs, size_t sz)
-{
-	return r->r_size >= ofs + sz ? 0 : -1;
-}
-
-static __inline void *
-_citrus_region_offset(const struct _citrus_region *r, size_t pos)
-{
-	return (void *)((uint8_t *)r->r_head + pos);
-}
-
-static __inline uint8_t
-_citrus_region_peek8(const struct _citrus_region *r, size_t pos)
-{
-	return *(uint8_t *)_citrus_region_offset(r, pos);
-}
-
-static __inline uint16_t
-_citrus_region_peek16(const struct _citrus_region *r, size_t pos)
-{
-	uint16_t val;
-	memcpy(&val, _citrus_region_offset(r, pos), (size_t)2);
-	return val;
-}
-
-static __inline uint32_t
-_citrus_region_peek32(const struct _citrus_region *r, size_t pos)
-{
-	uint32_t val;
-	memcpy(&val, _citrus_region_offset(r, pos), (size_t)4);
-	return val;
-}
-
-static __inline int
-_citrus_region_get_subregion(struct _citrus_region *subr,
-			     const struct _citrus_region *r,
-			     size_t ofs, size_t sz)
-{
-	if (_citrus_region_check(r, ofs, sz))
-		return -1;
-	_citrus_region_init(subr, _citrus_region_offset(r, ofs), sz);
-	return 0;
-}
-
-#endif
diff --git a/lib/libc/citrus/citrus_stdenc.c b/lib/libc/citrus/citrus_stdenc.c
deleted file mode 100644
index 3dadbfbac..000000000
--- a/lib/libc/citrus/citrus_stdenc.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*	$NetBSD: citrus_stdenc.c,v 1.4 2011/11/19 18:39:58 tnozaki Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_stdenc.c,v 1.4 2011/11/19 18:39:58 tnozaki Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_stdenc.h"
-#include "citrus_none.h"
-
-struct _citrus_stdenc _citrus_stdenc_default = {
-	&_citrus_NONE_stdenc_ops,	/* ce_ops */
-	NULL,				/* ce_closure */
-	NULL,				/* ce_module */
-	&_citrus_NONE_stdenc_traits,	/* ce_traits */
-};
-
-#ifdef _I18N_DYNAMIC
-
-static int
-/*ARGSUSED*/
-get_state_desc_default(struct _citrus_stdenc * __restrict ce,
-		       void * __restrict ps,
-		       int id,
-		       struct _citrus_stdenc_state_desc * __restrict d)
-{
-	return EOPNOTSUPP;
-}
-
-int
-_citrus_stdenc_open(struct _citrus_stdenc * __restrict * __restrict rce,
-		    char const * __restrict encname,
-		    const void * __restrict variable, size_t lenvar)
-{
-	int ret;
-	_citrus_module_t handle;
-	struct _citrus_stdenc *ce;
-	_citrus_stdenc_getops_t getops;
-
-	_DIAGASSERT(encname != NULL);
-	_DIAGASSERT(!lenvar || variable!=NULL);
-	_DIAGASSERT(rce != NULL);
-
-	if (!strcmp(encname, _CITRUS_DEFAULT_STDENC_NAME)) {
-		*rce = &_citrus_stdenc_default;
-		return (0);
-	}
-	ce = malloc(sizeof(*ce));
-	if (ce==NULL) {
-		ret = errno;
-		goto bad;
-	}
-	ce->ce_ops = NULL;
-	ce->ce_closure = NULL;
-	ce->ce_module = NULL;
-	ce->ce_traits = NULL;
-
-	ret = _citrus_load_module(&handle, encname);
-	if (ret)
-		goto bad;
-
-	ce->ce_module = handle;
-
-	getops =
-	    (_citrus_stdenc_getops_t)_citrus_find_getops(ce->ce_module,
-							 encname, "stdenc");
-	if (getops == NULL) {
-		ret = EINVAL;
-		goto bad;
-	}
-
-	ce->ce_ops = (struct _citrus_stdenc_ops *)malloc(sizeof(*ce->ce_ops));
-	if (ce->ce_ops == NULL) {
-		ret = errno;
-		goto bad;
-	}
-
-	ret = (*getops)(ce->ce_ops, sizeof(*ce->ce_ops),
-			_CITRUS_STDENC_ABI_VERSION);
-	if (ret)
-		goto bad;
-
-	/* If return ABI version is not expected, should fixup it */
-	if (ce->ce_ops->eo_abi_version < 0x00000002) {
-		ce->ce_ops->eo_get_state_desc = &get_state_desc_default;
-	}
-
-	/* validation check */
-	if (ce->ce_ops->eo_init == NULL ||
-	    ce->ce_ops->eo_uninit == NULL ||
-	    ce->ce_ops->eo_init_state == NULL ||
-	    ce->ce_ops->eo_mbtocs == NULL ||
-	    ce->ce_ops->eo_cstomb == NULL ||
-	    ce->ce_ops->eo_mbtowc == NULL ||
-	    ce->ce_ops->eo_wctomb == NULL ||
-	    ce->ce_ops->eo_get_state_desc == NULL) {
-		ret = EINVAL;
-		goto bad;
-	}
-
-	/* allocate traits */
-	ce->ce_traits = malloc(sizeof(*ce->ce_traits));
-	if (ce->ce_traits == NULL) {
-		ret = errno;
-		goto bad;
-	}
-	/* init and get closure */
-	ret = (*ce->ce_ops->eo_init)(ce, variable, lenvar, ce->ce_traits);
-	if (ret)
-		goto bad;
-
-	*rce = ce;
-
-	return (0);
-
-bad:
-	_citrus_stdenc_close(ce);
-	return (ret);
-}
-
-void
-_citrus_stdenc_close(struct _citrus_stdenc *ce)
-{
-
-	_DIAGASSERT(ce != NULL);
-
-	if (ce == &_citrus_stdenc_default)
-		return;
-
-	if (ce->ce_module) {
-		if (ce->ce_ops) {
-			if (ce->ce_closure && ce->ce_ops->eo_uninit)
-				(*ce->ce_ops->eo_uninit)(ce);
-			free(ce->ce_ops);
-		}
-		free(ce->ce_traits);
-		_citrus_unload_module(ce->ce_module);
-	}
-	free(ce);
-}
-
-#else
-/* !_I18N_DYNAMIC */
-
-int
-/*ARGSUSED*/
-_citrus_stdenc_open(struct _citrus_stdenc * __restrict * __restrict rce,
-		    char const * __restrict encname,
-		    const void * __restrict variable, size_t lenvar)
-{
-	if (!strcmp(encname, _CITRUS_DEFAULT_STDENC_NAME)) {
-		*rce = &_citrus_stdenc_default;
-		return (0);
-	}
-	return (EINVAL);
-}
-
-void
-/*ARGSUSED*/
-_citrus_stdenc_close(struct _citrus_stdenc *ce)
-{
-}
-
-#endif
diff --git a/lib/libc/citrus/citrus_stdenc.h b/lib/libc/citrus/citrus_stdenc.h
deleted file mode 100644
index ce198db68..000000000
--- a/lib/libc/citrus/citrus_stdenc.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*	$NetBSD: citrus_stdenc.h,v 1.4 2005/10/29 18:02:04 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef _CITRUS_STDENC_H_
-#define _CITRUS_STDENC_H_
-
-struct _citrus_stdenc;
-struct _citrus_stdenc_ops;
-struct _citrus_stdenc_traits;
-
-#define _CITRUS_STDENC_SDID_GENERIC		0
-struct _citrus_stdenc_state_desc
-{
-	union {
-		struct {
-			int	state;
-#define _CITRUS_STDENC_SDGEN_UNKNOWN		0
-#define _CITRUS_STDENC_SDGEN_INITIAL		1
-#define _CITRUS_STDENC_SDGEN_STABLE		2
-#define _CITRUS_STDENC_SDGEN_INCOMPLETE_CHAR	3
-#define _CITRUS_STDENC_SDGEN_INCOMPLETE_SHIFT	4
-		} generic;
-	} u;
-};
-
-#include "citrus_stdenc_local.h"
-
-__BEGIN_DECLS
-int _citrus_stdenc_open(struct _citrus_stdenc * __restrict * __restrict,
-			char const * __restrict,
-			const void * __restrict, size_t);
-void _citrus_stdenc_close(struct _citrus_stdenc *);
-__END_DECLS
-
-static __inline int
-_citrus_stdenc_init_state(struct _citrus_stdenc * __restrict ce,
-			  void * __restrict ps)
-{
-	_DIAGASSERT(ce && ce->ce_ops && ce->ce_ops->eo_init_state);
-	return (*ce->ce_ops->eo_init_state)(ce, ps);
-}
-
-static __inline int
-_citrus_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce,
-		      _citrus_csid_t * __restrict csid,
-		      _citrus_index_t * __restrict idx,
-		      const char ** __restrict s, size_t n,
-		      void * __restrict ps, size_t * __restrict nresult)
-{
-	_DIAGASSERT(ce && ce->ce_ops && ce->ce_ops->eo_mbtocs);
-	return (*ce->ce_ops->eo_mbtocs)(ce, csid, idx, s, n, ps, nresult);
-}
-
-static __inline int
-_citrus_stdenc_cstomb(struct _citrus_stdenc * __restrict ce,
-		      char * __restrict s, size_t n,
-		      _citrus_csid_t csid, _citrus_index_t idx,
-		      void * __restrict ps, size_t * __restrict nresult)
-{
-	_DIAGASSERT(ce && ce->ce_ops && ce->ce_ops->eo_cstomb);
-	return (*ce->ce_ops->eo_cstomb)(ce, s, n, csid, idx, ps, nresult);
-}
-
-static __inline int
-_citrus_stdenc_mbtowc(struct _citrus_stdenc * __restrict ce,
-		      _citrus_wc_t * __restrict wc,
-		      const char ** __restrict s, size_t n,
-		      void * __restrict ps, size_t * __restrict nresult)
-{
-	_DIAGASSERT(ce && ce->ce_ops && ce->ce_ops->eo_mbtocs);
-	return (*ce->ce_ops->eo_mbtowc)(ce, wc, s, n, ps, nresult);
-}
-
-static __inline int
-_citrus_stdenc_wctomb(struct _citrus_stdenc * __restrict ce,
-		      char * __restrict s, size_t n, _citrus_wc_t wc,
-		      void * __restrict ps, size_t * __restrict nresult)
-{
-	_DIAGASSERT(ce && ce->ce_ops && ce->ce_ops->eo_cstomb);
-	return (*ce->ce_ops->eo_wctomb)(ce, s, n, wc, ps, nresult);
-}
-
-static __inline int
-_citrus_stdenc_put_state_reset(struct _citrus_stdenc * __restrict ce,
-			       char * __restrict s, size_t n,
-			       void * __restrict ps,
-			       size_t * __restrict nresult)
-{
-	_DIAGASSERT(ce && ce->ce_ops && ce->ce_ops->eo_put_state_reset);
-	return (*ce->ce_ops->eo_put_state_reset)(ce, s, n, ps, nresult);
-}
-
-static __inline size_t
-_citrus_stdenc_get_state_size(struct _citrus_stdenc *ce)
-{
-	_DIAGASSERT(ce && ce->ce_traits);
-	return ce->ce_traits->et_state_size;
-}
-
-static __inline size_t
-_citrus_stdenc_get_mb_cur_max(struct _citrus_stdenc *ce)
-{
-	_DIAGASSERT(ce && ce->ce_traits);
-	return ce->ce_traits->et_mb_cur_max;
-}
-
-static __inline int
-_citrus_stdenc_get_state_desc(struct _citrus_stdenc * __restrict ce,
-			      void * __restrict ps,
-			      int id,
-			      struct _citrus_stdenc_state_desc * __restrict d)
-{
-
-	_DIAGASSERT(ce && ce->ce_ops && ce->ce_ops->eo_get_state_desc);
-
-	return (*ce->ce_ops->eo_get_state_desc)(ce, ps, id, d);
-}
-
-#endif
diff --git a/lib/libc/citrus/citrus_stdenc_local.h b/lib/libc/citrus/citrus_stdenc_local.h
deleted file mode 100644
index bac89c624..000000000
--- a/lib/libc/citrus/citrus_stdenc_local.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*	$NetBSD: citrus_stdenc_local.h,v 1.4 2008/02/09 14:56:20 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef _CITRUS_STDENC_LOCAL_H_
-#define _CITRUS_STDENC_LOCAL_H_
-
-#define _CITRUS_STDENC_GETOPS_FUNC_BASE(n)			\
-int n(struct _citrus_stdenc_ops *, size_t, uint32_t)
-#define _CITRUS_STDENC_GETOPS_FUNC(_e_)					\
-_CITRUS_STDENC_GETOPS_FUNC_BASE(_citrus_##_e_##_stdenc_getops)
-typedef _CITRUS_STDENC_GETOPS_FUNC_BASE((*_citrus_stdenc_getops_t));
-
-
-#define _CITRUS_STDENC_DECLS(_e_)					\
-static int	_citrus_##_e_##_stdenc_init				\
-	(struct _citrus_stdenc * __restrict, const void * __restrict,	\
-	 size_t, struct _citrus_stdenc_traits * __restrict);		\
-static void	_citrus_##_e_##_stdenc_uninit(struct _citrus_stdenc *);	\
-static int	_citrus_##_e_##_stdenc_init_state			\
-	(struct _citrus_stdenc * __restrict, void * __restrict);	\
-static int	_citrus_##_e_##_stdenc_mbtocs				\
-	(struct _citrus_stdenc * __restrict,				\
-	 _citrus_csid_t * __restrict, _citrus_index_t * __restrict,	\
-	 const char ** __restrict, size_t,				\
-	 void * __restrict, size_t * __restrict);			\
-static int	_citrus_##_e_##_stdenc_cstomb				\
-	(struct _citrus_stdenc * __restrict, char * __restrict,		\
-	 size_t, _citrus_csid_t, _citrus_index_t,			\
-	 void * __restrict, size_t * __restrict);			\
-static int	_citrus_##_e_##_stdenc_mbtowc				\
-	(struct _citrus_stdenc * __restrict,				\
-	 _citrus_wc_t * __restrict,					\
-	 const char ** __restrict, size_t,				\
-	 void * __restrict, size_t * __restrict);			\
-static int	_citrus_##_e_##_stdenc_wctomb				\
-	(struct _citrus_stdenc * __restrict, char * __restrict, size_t,	\
-	 _citrus_wc_t, void * __restrict, size_t * __restrict);		\
-static int	_citrus_##_e_##_stdenc_put_state_reset			\
-	(struct _citrus_stdenc * __restrict, char * __restrict, size_t,	\
-	 void * __restrict, size_t * __restrict);			\
-static int	_citrus_##_e_##_stdenc_get_state_desc			\
-	(struct _citrus_stdenc * __restrict, void * __restrict, int,	\
-	 struct _citrus_stdenc_state_desc * __restrict)
-
-#define _CITRUS_STDENC_DEF_OPS(_e_)					\
-struct _citrus_stdenc_ops _citrus_##_e_##_stdenc_ops = {		\
-	/* eo_abi_version */	_CITRUS_STDENC_ABI_VERSION,		\
-	/* eo_init */		&_citrus_##_e_##_stdenc_init,		\
-	/* eo_uninit */		&_citrus_##_e_##_stdenc_uninit,		\
-	/* eo_init_state */	&_citrus_##_e_##_stdenc_init_state,	\
-	/* eo_mbtocs */		&_citrus_##_e_##_stdenc_mbtocs,		\
-	/* eo_cstomb */		&_citrus_##_e_##_stdenc_cstomb,		\
-	/* eo_mbtowc */		&_citrus_##_e_##_stdenc_mbtowc,		\
-	/* eo_wctomb */		&_citrus_##_e_##_stdenc_wctomb,		\
-	/* eo_put_state_reset */&_citrus_##_e_##_stdenc_put_state_reset,\
-	/* eo_get_state_desc */	&_citrus_##_e_##_stdenc_get_state_desc	\
-}
-
-typedef int	(*_citrus_stdenc_init_t)
-	(struct _citrus_stdenc * __reatrict, const void * __restrict , size_t,
-	 struct _citrus_stdenc_traits * __restrict);
-typedef void	(*_citrus_stdenc_uninit_t)(struct _citrus_stdenc * __restrict);
-typedef int	(*_citrus_stdenc_init_state_t)
-	(struct _citrus_stdenc * __restrict, void * __restrict);
-typedef int	(*_citrus_stdenc_mbtocs_t)
-	(struct _citrus_stdenc * __restrict,
-	 _citrus_csid_t * __restrict, _citrus_index_t * __restrict,
-	 const char ** __restrict, size_t,
-	 void * __restrict, size_t * __restrict);
-typedef int	(*_citrus_stdenc_cstomb_t)
-	(struct _citrus_stdenc *__restrict, char * __restrict, size_t,
-	 _citrus_csid_t, _citrus_index_t, void * __restrict,
-	 size_t * __restrict);
-typedef int	(*_citrus_stdenc_mbtowc_t)
-	(struct _citrus_stdenc * __restrict,
-	 _citrus_wc_t * __restrict,
-	 const char ** __restrict, size_t,
-	 void * __restrict, size_t * __restrict);
-typedef int	(*_citrus_stdenc_wctomb_t)
-	(struct _citrus_stdenc *__restrict, char * __restrict, size_t,
-	 _citrus_wc_t, void * __restrict, size_t * __restrict);
-typedef int	(*_citrus_stdenc_put_state_reset_t)
-	(struct _citrus_stdenc *__restrict, char * __restrict, size_t,
-	 void * __restrict, size_t * __restrict);
-typedef int	(*_citrus_stdenc_get_state_desc_t)
-	(struct _citrus_stdenc * __restrict, void * __restrict, int,
-	 struct _citrus_stdenc_state_desc * __restrict);
-/*
- * ABI version change log
- *   0x00000001
- *     initial version
- */
-#define _CITRUS_STDENC_ABI_VERSION	0x00000002
-struct _citrus_stdenc_ops {
-	uint32_t			eo_abi_version;
-	/* version 0x00000001 */
-	_citrus_stdenc_init_t		eo_init;
-	_citrus_stdenc_uninit_t		eo_uninit;
-	_citrus_stdenc_init_state_t	eo_init_state;
-	_citrus_stdenc_mbtocs_t		eo_mbtocs;
-	_citrus_stdenc_cstomb_t		eo_cstomb;
-	_citrus_stdenc_mbtowc_t		eo_mbtowc;
-	_citrus_stdenc_wctomb_t		eo_wctomb;
-	_citrus_stdenc_put_state_reset_t eo_put_state_reset;
-	/* version 0x00000002 */
-	_citrus_stdenc_get_state_desc_t	eo_get_state_desc;
-};
-
-struct _citrus_stdenc_traits {
-	/* version 0x00000001 */
-	size_t				et_state_size;
-	size_t				et_mb_cur_max;
-};
-
-struct _citrus_stdenc {
-	/* public */
-	/* version 0x00000001 */
-	struct _citrus_stdenc_ops	*ce_ops;
-	void				*ce_closure;
-	/* private */
-	_citrus_module_t		ce_module;
-	struct _citrus_stdenc_traits	*ce_traits;
-};
-
-#define _CITRUS_DEFAULT_STDENC_NAME		"NONE"
-
-#endif
diff --git a/lib/libc/citrus/citrus_stdenc_template.h b/lib/libc/citrus/citrus_stdenc_template.h
deleted file mode 100644
index 54088cd54..000000000
--- a/lib/libc/citrus/citrus_stdenc_template.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*	$NetBSD: citrus_stdenc_template.h,v 1.4 2008/02/09 14:56:20 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * CAUTION: THIS IS NOT STANDALONE FILE
- *
- * function templates of iconv standard encoding handler for each encodings.
- *
- */
-
-/*
- * macros
- */
-
-#undef _TO_EI
-#undef _CE_TO_EI
-#undef _TO_STATE
-#define _TO_EI(_cl_)	((_ENCODING_INFO*)(_cl_))
-#define _CE_TO_EI(_ce_)	(_TO_EI((_ce_)->ce_closure))
-#define _TO_STATE(_ps_)	((_ENCODING_STATE*)(_ps_))
-
-/* ----------------------------------------------------------------------
- * templates for public functions
- */
-
-int
-_FUNCNAME(stdenc_getops)(struct _citrus_stdenc_ops *ops, size_t lenops,
-			 uint32_t expected_version)
-{
-	if (expected_version<_CITRUS_STDENC_ABI_VERSION || lenops<sizeof(*ops))
-		return (EINVAL);
-
-	memcpy(ops, &_FUNCNAME(stdenc_ops), sizeof(_FUNCNAME(stdenc_ops)));
-
-	return (0);
-}
-
-static int
-_FUNCNAME(stdenc_init)(struct _citrus_stdenc * __restrict ce,
-		       const void * __restrict var, size_t lenvar,
-		       struct _citrus_stdenc_traits * __restrict et)
-{
-	int ret;
-	_ENCODING_INFO *ei;
-
-	ei = NULL;
-	if (sizeof(_ENCODING_INFO) > 0) {
-		ei = calloc(1, sizeof(_ENCODING_INFO));
-		if (ei == NULL) {
-			return errno;
-		}
-	}
-
-	ret = _FUNCNAME(encoding_module_init)(ei, var, lenvar);
-	if (ret) {
-		free((void *)ei);
-		return ret;
-	}
-
-	ce->ce_closure = ei;
-	et->et_state_size = sizeof(_ENCODING_STATE);
-	et->et_mb_cur_max = _ENCODING_MB_CUR_MAX(_CE_TO_EI(ce));
-
-	return 0;
-}
-
-static void
-_FUNCNAME(stdenc_uninit)(struct _citrus_stdenc * __restrict ce)
-{
-	if (ce) {
-		_FUNCNAME(encoding_module_uninit)(_CE_TO_EI(ce));
-		free(ce->ce_closure);
-	}
-}
-
-static int
-_FUNCNAME(stdenc_init_state)(struct _citrus_stdenc * __restrict ce,
-			     void * __restrict ps)
-{
-	_FUNCNAME(init_state)(_CE_TO_EI(ce), _TO_STATE(ps));
-
-	return 0;
-}
-
-static int
-_FUNCNAME(stdenc_mbtocs)(struct _citrus_stdenc * __restrict ce,
-			 _citrus_csid_t * __restrict csid,
-			 _citrus_index_t * __restrict idx,
-			 const char ** __restrict s, size_t n,
-			 void * __restrict ps, size_t * __restrict nresult)
-{
-	int ret;
-	wchar_t wc;
-
-	_DIAGASSERT(nresult != NULL);
-
-	ret = _FUNCNAME(mbrtowc_priv)(_CE_TO_EI(ce), &wc, s, n,
-				      _TO_STATE(ps), nresult);
-
-	if (!ret && *nresult != (size_t)-2)
-		_FUNCNAME(stdenc_wctocs)(_CE_TO_EI(ce), csid, idx, wc);
-
-	return ret;
-}
-
-static int
-_FUNCNAME(stdenc_cstomb)(struct _citrus_stdenc * __restrict ce,
-			 char * __restrict s, size_t n,
-			 _citrus_csid_t csid, _citrus_index_t idx,
-			 void * __restrict ps, size_t * __restrict nresult)
-{
-	int ret;
-	wchar_t wc;
-
-	_DIAGASSERT(nresult != NULL);
-
-	wc = 0;
-
-	if (csid != _CITRUS_CSID_INVALID) {
-		ret = _FUNCNAME(stdenc_cstowc)(_CE_TO_EI(ce), &wc, csid, idx);
-		if (ret)
-			return ret;
-	}
-
-	return _FUNCNAME(wcrtomb_priv)(_CE_TO_EI(ce), s, n, wc, _TO_STATE(ps),
-				       nresult);
-}
-
-static int
-_FUNCNAME(stdenc_mbtowc)(struct _citrus_stdenc * __restrict ce,
-			 _citrus_wc_t * __restrict wc,
-			 const char ** __restrict s, size_t n,
-			 void * __restrict ps, size_t * __restrict nresult)
-{
-	return _FUNCNAME(mbrtowc_priv)(_CE_TO_EI(ce), wc, s, n,
-				       _TO_STATE(ps), nresult);
-}
-
-static int
-_FUNCNAME(stdenc_wctomb)(struct _citrus_stdenc * __restrict ce,
-			  char * __restrict s, size_t n, _citrus_wc_t wc,
-			  void * __restrict ps, size_t * __restrict nresult)
-{
-	return _FUNCNAME(wcrtomb_priv)(_CE_TO_EI(ce), s, n, wc, _TO_STATE(ps),
-				       nresult);
-}
-
-static int
-_FUNCNAME(stdenc_put_state_reset)(struct _citrus_stdenc * __restrict ce,
-				  char * __restrict s, size_t n,
-				  void * __restrict ps,
-				  size_t * __restrict nresult)
-{
-#if _ENCODING_IS_STATE_DEPENDENT
-	return _FUNCNAME(put_state_reset)(_CE_TO_EI(ce), s, n, _TO_STATE(ps),
-					  nresult);
-#else
-	*nresult = 0;
-	return 0;
-#endif
-}
-
-static int
-_FUNCNAME(stdenc_get_state_desc)(struct _citrus_stdenc * __restrict ce,
-				 void * __restrict ps,
-				 int id,
-				 struct _citrus_stdenc_state_desc * __restrict d)
-{
-	int ret;
-
-	switch (id) {
-	case _STDENC_SDID_GENERIC:
-		ret = _FUNCNAME(stdenc_get_state_desc_generic)(
-			_CE_TO_EI(ce), _TO_STATE(ps), &d->u.generic.state);
-		break;
-	default:
-		ret = EOPNOTSUPP;
-	}
-
-	return ret;
-}
diff --git a/lib/libc/citrus/citrus_types.h b/lib/libc/citrus/citrus_types.h
deleted file mode 100644
index 6692fd3dd..000000000
--- a/lib/libc/citrus/citrus_types.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*	$NetBSD: citrus_types.h,v 1.3 2003/10/27 00:12:42 lukem Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_TYPES_H_
-#define _CITRUS_TYPES_H_
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-typedef uint32_t	_citrus_wc_t;
-typedef uint32_t	_citrus_index_t;
-typedef uint32_t	_citrus_csid_t;
-#define _CITRUS_CSID_INVALID	((_citrus_csid_t)-1)
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_big5.c b/lib/libc/citrus/modules/citrus_big5.c
deleted file mode 100644
index 1f76584ff..000000000
--- a/lib/libc/citrus/modules/citrus_big5.c
+++ /dev/null
@@ -1,514 +0,0 @@
-/*	$NetBSD: citrus_big5.c,v 1.15 2014/06/24 22:24:18 spz Exp $	*/
-
-/*-
- * Copyright (c)2002, 2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_big5.c,v 1.15 2014/06/24 22:24:18 spz Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/queue.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <wchar.h>
-#include <limits.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_stdenc.h"
-#include "citrus_big5.h"
-
-#include "citrus_prop.h"
-
-/* ----------------------------------------------------------------------
- * private stuffs used by templates
- */
-
-typedef struct {
-	char ch[2];
-	int chlen;
-} _BIG5State;
-
-typedef struct _BIG5Exclude {
-	TAILQ_ENTRY(_BIG5Exclude) entry;
-	wint_t start, end;
-} _BIG5Exclude;
-
-typedef TAILQ_HEAD(_BIG5ExcludeList, _BIG5Exclude) _BIG5ExcludeList;
-
-typedef struct {
-	int cell[0x100];
-	_BIG5ExcludeList excludes;
-} _BIG5EncodingInfo;
-
-typedef struct {
-	_BIG5EncodingInfo	ei;
-	struct {
-		/* for future multi-locale facility */
-		_BIG5State	s_mblen;
-		_BIG5State	s_mbrlen;
-		_BIG5State	s_mbrtowc;
-		_BIG5State	s_mbtowc;
-		_BIG5State	s_mbsrtowcs;
-		_BIG5State	s_mbsnrtowcs;
-		_BIG5State	s_wcrtomb;
-		_BIG5State	s_wcsrtombs;
-		_BIG5State	s_wcsnrtombs;
-		_BIG5State	s_wctomb;
-	} states;
-} _BIG5CTypeInfo;
-
-#define _CEI_TO_EI(_cei_)		(&(_cei_)->ei)
-#define _CEI_TO_STATE(_cei_, _func_)	(_cei_)->states.s_##_func_
-
-#define _FUNCNAME(m)			_citrus_BIG5_##m
-#define _ENCODING_INFO			_BIG5EncodingInfo
-#define _CTYPE_INFO			_BIG5CTypeInfo
-#define _ENCODING_STATE			_BIG5State
-#define _ENCODING_MB_CUR_MAX(_ei_)	2
-#define _ENCODING_IS_STATE_DEPENDENT	0
-#define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	0
-
-
-static __inline void
-/*ARGSUSED*/
-_citrus_BIG5_init_state(_BIG5EncodingInfo * __restrict ei,
-			_BIG5State * __restrict s)
-{
-	memset(s, 0, sizeof(*s));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_BIG5_pack_state(_BIG5EncodingInfo * __restrict ei,
-			void * __restrict pspriv,
-			const _BIG5State * __restrict s)
-{
-	memcpy(pspriv, (const void *)s, sizeof(*s));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_BIG5_unpack_state(_BIG5EncodingInfo * __restrict ei,
-			  _BIG5State * __restrict s,
-			  const void * __restrict pspriv)
-{
-	memcpy((void *)s, pspriv, sizeof(*s));
-}
-
-static __inline int
-_citrus_BIG5_check(_BIG5EncodingInfo *ei, u_int c)
-{
-	_DIAGASSERT(ei != NULL);
-
-	return (ei->cell[c & 0xFF] & 0x1) ? 2 : 1;
-}
-
-static __inline int
-_citrus_BIG5_check2(_BIG5EncodingInfo *ei, u_int c)
-{
-	_DIAGASSERT(ei != NULL);
-
-	return (ei->cell[c & 0xFF] & 0x2) ? 1 : 0;
-}
-
-static __inline int
-_citrus_BIG5_check_excludes(_BIG5EncodingInfo *ei, wint_t c)
-{
-	_BIG5Exclude *exclude;
-
-	_DIAGASSERT(ei != NULL);
-
-	TAILQ_FOREACH(exclude, &ei->excludes, entry) {
-		if (c >= exclude->start && c <= exclude->end)
-			return EILSEQ;
-	}
-	return 0;
-}
-
-static int
-_citrus_BIG5_fill_rowcol(void * __restrict ctx, const char * __restrict s,
-	uint64_t start, uint64_t end)
-{
-	_BIG5EncodingInfo *ei;
-	int i;
-	uint64_t n;
-
-	_DIAGASSERT(ctx != NULL);
-
-	if (start > 0xFF || end > 0xFF)
-		return EINVAL;
-	ei = (_BIG5EncodingInfo *)ctx;
-	i = strcmp("row", s) ? 1 : 0;
-	i = 1 << i;
-	for (n = start; n <= end; ++n)
-		ei->cell[n & 0xFF] |= i;
-	return 0;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_BIG5_fill_excludes(void * __restrict ctx, const char * __restrict s,
-	uint64_t start, uint64_t end)
-{
-	_BIG5EncodingInfo *ei;
-	_BIG5Exclude *exclude;
-
-	_DIAGASSERT(ctx != NULL);
-
-	if (start > 0xFFFF || end > 0xFFFF)
-		return EINVAL;
-	ei = (_BIG5EncodingInfo *)ctx;
-	exclude = TAILQ_LAST(&ei->excludes, _BIG5ExcludeList);
-	if (exclude != NULL && (wint_t)start <= exclude->end)
-		return EINVAL;
-	exclude = (void *)malloc(sizeof(*exclude));
-	if (exclude == NULL)
-		return ENOMEM;
-	exclude->start = (wint_t)start;
-	exclude->end = (wint_t)end;
-	TAILQ_INSERT_TAIL(&ei->excludes, exclude, entry);
-
-	return 0;
-}
-
-static const _citrus_prop_hint_t root_hints[] = {
-    _CITRUS_PROP_HINT_NUM("row", &_citrus_BIG5_fill_rowcol),
-    _CITRUS_PROP_HINT_NUM("col", &_citrus_BIG5_fill_rowcol),
-    _CITRUS_PROP_HINT_NUM("excludes", &_citrus_BIG5_fill_excludes),
-    _CITRUS_PROP_HINT_END
-};
-
-static void
-/*ARGSUSED*/
-_citrus_BIG5_encoding_module_uninit(_BIG5EncodingInfo *ei)
-{
-	_BIG5Exclude *exclude;
-
-	_DIAGASSERT(ei != NULL);
-
-	while ((exclude = TAILQ_FIRST(&ei->excludes)) != NULL) {
-		TAILQ_REMOVE(&ei->excludes, exclude, entry);
-		free(exclude);
-	}
-}
-
-static int
-/*ARGSUSED*/
-_citrus_BIG5_encoding_module_init(_BIG5EncodingInfo * __restrict ei,
-				  const void * __restrict var, size_t lenvar)
-{
-	int err;
-	const char *s;
-
-	_DIAGASSERT(ei != NULL);
-
-	memset((void *)ei, 0, sizeof(*ei));
-	TAILQ_INIT(&ei->excludes);
-
-	if (lenvar > 0 && var != NULL) {
-		s = _bcs_skip_ws_len((const char *)var, &lenvar);
-		if (lenvar > 0 && *s != '\0') {
-			err = _citrus_prop_parse_variable(
-			    root_hints, (void *)ei, s, lenvar);
-			if (err == 0)
-				return 0;
-
-			_citrus_BIG5_encoding_module_uninit(ei);
-			memset((void *)ei, 0, sizeof(*ei));
-			TAILQ_INIT(&ei->excludes);
-		}
-	}
-
-	/* fallback Big5-1984, for backward compatibility. */
-	_citrus_BIG5_fill_rowcol(ei, "row", 0xA1, 0xFE);
-	_citrus_BIG5_fill_rowcol(ei, "col", 0x40, 0x7E);
-	_citrus_BIG5_fill_rowcol(ei, "col", 0xA1, 0xFE);
-
-	return 0;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_BIG5_mbrtowc_priv(_BIG5EncodingInfo * __restrict ei,
-			  wchar_t * __restrict pwc,
-			  const char ** __restrict s, size_t n,
-			  _BIG5State * __restrict psenc,
-			  size_t * __restrict nresult)
-{
-	wchar_t wchar;
-	int c;
-	int chlenbak;
-	const char *s0;
-
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(s != NULL && *s != NULL);
-
-	s0 = *s;
-
-	if (s0 == NULL) {
-		_citrus_BIG5_init_state(ei, psenc);
-		*nresult = 0;
-		return (0);
-	}
-
-	chlenbak = psenc->chlen;
-
-	/* make sure we have the first byte in the buffer */
-	switch (psenc->chlen) {
-	case 0:
-		if (n < 1)
-			goto restart;
-		psenc->ch[0] = *s0++;
-		psenc->chlen = 1;
-		n--;
-		break;
-	case 1:
-		break;
-	default:
-		/* illegal state */
-		goto ilseq;
-	}
-
-	c = _citrus_BIG5_check(ei, psenc->ch[0] & 0xff);
-	if (c == 0)
-		goto ilseq;
-	while (psenc->chlen < c) {
-		if (n < 1) {
-			goto restart;
-		}
-		psenc->ch[psenc->chlen] = *s0++;
-		psenc->chlen++;
-		n--;
-	}
-
-	switch (c) {
-	case 1:
-		wchar = psenc->ch[0] & 0xff;
-		break;
-	case 2:
-		if (!_citrus_BIG5_check2(ei, psenc->ch[1] & 0xff))
-			goto ilseq;
-		wchar = ((psenc->ch[0] & 0xff) << 8) | (psenc->ch[1] & 0xff);
-		break;
-	default:
-		/* illegal state */
-		goto ilseq;
-	}
-
-	if (_citrus_BIG5_check_excludes(ei, (wint_t)wchar) != 0)
-		goto ilseq;
-
-	*s = s0;
-	psenc->chlen = 0;
-	if (pwc)
-		*pwc = wchar;
-	if (!wchar)
-		*nresult = 0;
-	else
-		*nresult = c - chlenbak;
-
-	return (0);
-
-ilseq:
-	psenc->chlen = 0;
-	*nresult = (size_t)-1;
-	return (EILSEQ);
-
-restart:
-	*s = s0;
-	*nresult = (size_t)-2;
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_BIG5_wcrtomb_priv(_BIG5EncodingInfo * __restrict ei,
-			  char * __restrict s,
-			  size_t n, wchar_t wc, _BIG5State * __restrict psenc,
-			  size_t * __restrict nresult)
-{
-	size_t l, ret;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(s != NULL);
-
-	/* check invalid sequence */
-	if (wc & ~0xffff ||
-	    _citrus_BIG5_check_excludes(ei, (wint_t)wc) != 0) {
-		ret = EILSEQ;
-		goto err;
-	}
-
-	if (wc & 0x8000) {
-		if (_citrus_BIG5_check(ei, (wc >> 8) & 0xff) != 2 ||
-		    !_citrus_BIG5_check2(ei, wc & 0xff)) {
-			ret = EILSEQ;
-			goto err;
-		}
-		l = 2;
-	} else {
-		if (wc & ~0xff || !_citrus_BIG5_check(ei, wc & 0xff)) {
-			ret = EILSEQ;
-			goto err;
-		}
-		l = 1;
-	}
-
-	if (n < l) {
-		/* bound check failure */
-		ret = E2BIG;
-		goto err;
-	}
-
-	if (l == 2) {
-		s[0] = (wc >> 8) & 0xff;
-		s[1] = wc & 0xff;
-	} else
-		s[0] = wc & 0xff;
-
-	*nresult = l;
-
-	return 0;
-
-err:
-	*nresult = (size_t)-1;
-	return ret;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_BIG5_stdenc_wctocs(_BIG5EncodingInfo * __restrict ei,
-			   _csid_t * __restrict csid,
-			   _index_t * __restrict idx, wchar_t wc)
-{
-
-	_DIAGASSERT(csid != NULL && idx != NULL);
-
-	*csid = (wc < 0x100) ? 0 : 1;
-	*idx = (_index_t)wc;
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_BIG5_stdenc_cstowc(_BIG5EncodingInfo * __restrict ei,
-			   wchar_t * __restrict wc,
-			   _csid_t csid, _index_t idx)
-{
-	_DIAGASSERT(wc != NULL);
-
-	switch (csid) {
-	case 0:
-	case 1:
-		*wc = (wchar_t)idx;
-		break;
-	default:
-		return EILSEQ;
-	}
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_BIG5_stdenc_get_state_desc_generic(_BIG5EncodingInfo * __restrict ei,
-					   _BIG5State * __restrict psenc,
-					   int * __restrict rstate)
-{
-
-	if (psenc->chlen == 0)
-		*rstate = _STDENC_SDGEN_INITIAL;
-	else
-		*rstate = _STDENC_SDGEN_INCOMPLETE_CHAR;
-
-	return 0;
-}
-
-/* ----------------------------------------------------------------------
- * public interface for ctype
- */
-
-_CITRUS_CTYPE_DECLS(BIG5);
-_CITRUS_CTYPE_DEF_OPS(BIG5);
-
-#include "citrus_ctype_template.h"
-
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(BIG5);
-_CITRUS_STDENC_DEF_OPS(BIG5);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_big5.h b/lib/libc/citrus/modules/citrus_big5.h
deleted file mode 100644
index 60a0f5990..000000000
--- a/lib/libc/citrus/modules/citrus_big5.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: citrus_big5.h,v 1.2 2003/06/25 09:51:41 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_BIG5_H_
-#define _CITRUS_BIG5_H_
-
-__BEGIN_DECLS
-_CITRUS_CTYPE_GETOPS_FUNC(BIG5);
-_CITRUS_STDENC_GETOPS_FUNC(BIG5);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_dechanyu.c b/lib/libc/citrus/modules/citrus_dechanyu.c
deleted file mode 100644
index 0db33eb45..000000000
--- a/lib/libc/citrus/modules/citrus_dechanyu.c
+++ /dev/null
@@ -1,443 +0,0 @@
-/* $NetBSD: citrus_dechanyu.c,v 1.5 2013/05/28 16:57:56 joerg Exp $ */
-
-/*-
- * Copyright (c)2007 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_dechanyu.c,v 1.5 2013/05/28 16:57:56 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <wchar.h>
-#include <limits.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_stdenc.h"
-#include "citrus_dechanyu.h"
-
-/* ----------------------------------------------------------------------
- * private stuffs used by templates
- */
-
-typedef struct {
-	int chlen;
-	char ch[4];
-} _DECHanyuState;
-
-typedef struct {
-	int dummy;
-} _DECHanyuEncodingInfo;
-
-typedef struct {
-	_DECHanyuEncodingInfo	ei;
-	struct {
-		/* for future multi-locale facility */
-		_DECHanyuState	s_mblen;
-		_DECHanyuState	s_mbrlen;
-		_DECHanyuState	s_mbrtowc;
-		_DECHanyuState	s_mbtowc;
-		_DECHanyuState	s_mbsrtowcs;
-		_DECHanyuState	s_mbsnrtowcs;
-		_DECHanyuState	s_wcrtomb;
-		_DECHanyuState	s_wcsrtombs;
-		_DECHanyuState	s_wcsnrtombs;
-		_DECHanyuState	s_wctomb;
-	} states;
-} _DECHanyuCTypeInfo;
-
-#define _CEI_TO_EI(_cei_)		(&(_cei_)->ei)
-#define _CEI_TO_STATE(_cei_, _func_)	(_cei_)->states.__CONCAT(s_,_func_)
-
-#define _FUNCNAME(m)			__CONCAT(_citrus_DECHanyu_,m)
-#define _ENCODING_INFO			_DECHanyuEncodingInfo
-#define _CTYPE_INFO			_DECHanyuCTypeInfo
-#define _ENCODING_STATE			_DECHanyuState
-#define _ENCODING_MB_CUR_MAX(_ei_)		4
-#define _ENCODING_IS_STATE_DEPENDENT		0
-#define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	0
-
-static __inline void
-/*ARGSUSED*/
-_citrus_DECHanyu_init_state(_DECHanyuEncodingInfo * __restrict ei,
-	_DECHanyuState * __restrict psenc)
-{
-	/* ei may be null */
-	_DIAGASSERT(psenc != NULL);
-
-	psenc->chlen = 0;
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_DECHanyu_pack_state(_DECHanyuEncodingInfo * __restrict ei,
-	void * __restrict pspriv,
-	const _DECHanyuState * __restrict psenc)
-{
-	/* ei may be null */
-	_DIAGASSERT(pspriv != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	memcpy(pspriv, (const void *)psenc, sizeof(*psenc));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_DECHanyu_unpack_state(_DECHanyuEncodingInfo * __restrict ei,
-	_DECHanyuState * __restrict psenc,
-	const void * __restrict pspriv)
-{
-	/* ei may be null */
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(pspriv != NULL);
-
-	memcpy((void *)psenc, pspriv, sizeof(*psenc));
-}
-
-static void
-/*ARGSUSED*/
-_citrus_DECHanyu_encoding_module_uninit(_DECHanyuEncodingInfo *ei)
-{
-	/* ei may be null */
-}
-
-static int
-/*ARGSUSED*/
-_citrus_DECHanyu_encoding_module_init(_DECHanyuEncodingInfo * __restrict ei,
-	const void * __restrict var, size_t lenvar)
-{
-	/* ei may be null */
-	return 0;
-}
-
-static __inline int
-is_singlebyte(int c)
-{
-	return c <= 0x7F;
-}
-
-static __inline int
-is_leadbyte(int c)
-{
-	return c >= 0xA1 && c <= 0xFE;
-}
-
-static __inline int
-is_trailbyte(int c)
-{
-	c &= ~0x80;
-	return c >= 0x21 && c <= 0x7E;
-}
-
-static __inline int
-is_hanyu1(int c)
-{
-	return c == 0xC2;
-}
-
-static __inline int
-is_hanyu2(int c)
-{
-	return c == 0xCB;
-}
-
-#define HANYUBIT	0xC2CB0000
-
-static __inline int
-is_94charset(int c)
-{
-	return c >= 0x21 && c <= 0x7E;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_DECHanyu_mbrtowc_priv(_DECHanyuEncodingInfo * __restrict ei,
-	wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
-	_DECHanyuState * __restrict psenc, size_t * __restrict nresult)
-{
-	const char *s0;
-	int ch;
-	wchar_t wc;
-
-	/* ei may be unused */
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	if (*s == NULL) {
-		_citrus_DECHanyu_init_state(ei, psenc);
-		*nresult = _ENCODING_IS_STATE_DEPENDENT;
-		return 0;
-	} 
-	s0 = *s;
-
-	wc = (wchar_t)0;
-	switch (psenc->chlen) {
-	case 0:
-		if (n-- < 1)
-			goto restart;
-		ch = *s0++ & 0xFF;
-		if (is_singlebyte(ch) != 0) {
-			if (pwc != NULL)
-				*pwc = (wchar_t)ch;
-			*nresult = (size_t)((ch == 0) ? 0 : 1);
-			*s = s0;
-			return 0;
-		}
-		if (is_leadbyte(ch) == 0)
-			goto ilseq;
-		psenc->ch[psenc->chlen++] = ch;
-		break;
-	case 1:
-		ch = psenc->ch[0] & 0xFF;
-		if (is_leadbyte(ch) == 0)
-			return EINVAL;
-		break;
-	case 2: case 3:
-		ch = psenc->ch[0] & 0xFF;
-		if (is_hanyu1(ch) != 0) {
-			ch = psenc->ch[1] & 0xFF;
-			if (is_hanyu2(ch) != 0) {
-				wc |= (wchar_t)HANYUBIT;
-				break;
-			}
-		}
-	/*FALLTHROUGH*/
-	default:
-		return EINVAL;
-	}
-
-	switch (psenc->chlen) {
-	case 1:
-		if (is_hanyu1(ch) != 0) {
-			if (n-- < 1)
-				goto restart;
-			ch = *s0++ & 0xFF;
-			if (is_hanyu2(ch) == 0)
-				goto ilseq;
-			psenc->ch[psenc->chlen++] = ch;
-			wc |= (wchar_t)HANYUBIT;
-			if (n-- < 1)
-				goto restart;
-			ch = *s0++ & 0xFF;
-			if (is_leadbyte(ch) == 0)
-				goto ilseq;
-			psenc->ch[psenc->chlen++] = ch;
-		}
-		break;
-	case 2:
-		if (n-- < 1)
-			goto restart;
-		ch = *s0++ & 0xFF;
-		if (is_leadbyte(ch) == 0)
-			goto ilseq;
-		psenc->ch[psenc->chlen++] = ch;
-		break;
-	case 3:
-		ch = psenc->ch[2] & 0xFF;
-		if (is_leadbyte(ch) == 0)
-			return EINVAL;
-	}
-	if (n-- < 1)
-		goto restart;
-	wc |= (wchar_t)(ch << 8);
-	ch = *s0++ & 0xFF;
-	if (is_trailbyte(ch) == 0)
-		goto ilseq;
-	wc |= (wchar_t)ch;
-	if (pwc != NULL)
-		*pwc = wc;
-	*nresult = (size_t)(s0 - *s);
-	*s = s0;
-	psenc->chlen = 0;
-
-	return 0;
-
-restart:
-	*nresult = (size_t)-2;
-	*s = s0;
-	return 0;
-
-ilseq:
-	*nresult = (size_t)-1;
-	return EILSEQ;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_DECHanyu_wcrtomb_priv(_DECHanyuEncodingInfo * __restrict ei,
-	char * __restrict s, size_t n, wchar_t wc,
-	_DECHanyuState * __restrict psenc, size_t * __restrict nresult)
-{
-	int ch;
-
-	/* ei may be unused */
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	if (psenc->chlen != 0)
-		return EINVAL;
-
-	/* XXX: assume wchar_t as int */
-	if ((uint32_t)wc <= 0x7F) {
-		ch = wc & 0xFF;
-	} else {
-		if ((uint32_t)wc > 0xFFFF) {
-			if ((wc & ~0xFFFF) != HANYUBIT)
-				goto ilseq;
-			psenc->ch[psenc->chlen++] = (wc >> 24) & 0xFF;
-			psenc->ch[psenc->chlen++] = (wc >> 16) & 0xFF;
-			wc &= 0xFFFF;
-		}
-		ch = (wc >> 8) & 0xFF;
-		if (!is_leadbyte(ch))
-			goto ilseq;
-		psenc->ch[psenc->chlen++] = ch;
-		ch = wc & 0xFF;
-		if (is_trailbyte(ch) == 0)
-			goto ilseq;
-	}
-	psenc->ch[psenc->chlen++] = ch;
-	if (n < psenc->chlen) {
-		*nresult = (size_t)-1;
-		return E2BIG;
-	}
-	memcpy(s, psenc->ch, psenc->chlen);
-	*nresult = psenc->chlen;
-	psenc->chlen = 0;
-
-	return 0;
-
-ilseq:
-	*nresult = (size_t)-1;
-	return EILSEQ;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_DECHanyu_stdenc_wctocs(_DECHanyuEncodingInfo * __restrict ei,
-	_csid_t * __restrict csid, _index_t * __restrict idx, wchar_t wc)
-{
-	int plane;
-	wchar_t mask;
-
-	/* ei may be unused */
-	_DIAGASSERT(csid != NULL);
-	_DIAGASSERT(idx != NULL);
-
-	plane = 0;
-	mask = 0x7F;
-	/* XXX: assume wchar_t as int */
-	if ((uint32_t)wc > 0x7F) {
-		if ((uint32_t)wc > 0xFFFF) {
-			if ((wc & ~0xFFFF) != HANYUBIT)
-				return EILSEQ;
-			plane += 2;
-		}
-		if (is_leadbyte((wc >> 8) & 0xFF) == 0 ||
-		    is_trailbyte(wc & 0xFF) == 0)
-			return EILSEQ;
-		plane += (wc & 0x80) ? 1 : 2;
-		mask |= 0x7F00;
-	}
-	*csid = plane;
-	*idx = (_index_t)(wc & mask);
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_DECHanyu_stdenc_cstowc(_DECHanyuEncodingInfo * __restrict ei,
-	wchar_t * __restrict wc, _csid_t csid, _index_t idx)
-{
-	/* ei may be unused */
-	_DIAGASSERT(wc != NULL);
-
-	if (csid == 0) {
-		if (idx > 0x7F)
-			return EILSEQ;
-	} else if (csid <= 4) {
-		if (is_94charset(idx >> 8) == 0)
-			return EILSEQ;
-		if (is_94charset(idx & 0xFF) == 0)
-			return EILSEQ;
-		if (csid % 2)
-			idx |= 0x80;
-		idx |= 0x8000;
-		if (csid > 2)
-			idx |= HANYUBIT;
-	} else
-		return EILSEQ;
-	*wc = (wchar_t)idx;
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_DECHanyu_stdenc_get_state_desc_generic(
-	_DECHanyuEncodingInfo * __restrict ei,
-	_DECHanyuState * __restrict psenc, int * __restrict rstate)
-{
-	/* ei may be unused */
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(rstate != NULL);
-
-	*rstate = (psenc->chlen == 0)
-	    ? _STDENC_SDGEN_INITIAL
-	    : _STDENC_SDGEN_INCOMPLETE_CHAR;
-	return 0;
-}
-
-/* ----------------------------------------------------------------------
- * public interface for ctype
- */
-
-_CITRUS_CTYPE_DECLS(DECHanyu);
-_CITRUS_CTYPE_DEF_OPS(DECHanyu);
-
-#include "citrus_ctype_template.h"
-
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(DECHanyu);
-_CITRUS_STDENC_DEF_OPS(DECHanyu);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_dechanyu.h b/lib/libc/citrus/modules/citrus_dechanyu.h
deleted file mode 100644
index ed774bcab..000000000
--- a/lib/libc/citrus/modules/citrus_dechanyu.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $NetBSD: citrus_dechanyu.h,v 1.1 2007/04/01 18:52:32 tnozaki Exp $ */
-
-/*-
- * Copyright (c)2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_DECHANYU_H_
-#define _CITRUS_DECHANYU_H_
-
-__BEGIN_DECLS
-_CITRUS_CTYPE_GETOPS_FUNC(DECHanyu);
-_CITRUS_STDENC_GETOPS_FUNC(DECHanyu);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_euc.c b/lib/libc/citrus/modules/citrus_euc.c
deleted file mode 100644
index acb2bfa68..000000000
--- a/lib/libc/citrus/modules/citrus_euc.c
+++ /dev/null
@@ -1,437 +0,0 @@
-/*	$NetBSD: citrus_euc.c,v 1.17 2014/01/18 15:21:41 christos Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_euc.c,v 1.17 2014/01/18 15:21:41 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <wchar.h>
-#include <sys/types.h>
-#include <limits.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_stdenc.h"
-#include "citrus_euc.h"
-
-
-/* ----------------------------------------------------------------------
- * private stuffs used by templates
- */
-
-typedef struct {
-	char ch[3];
-	int chlen;
-} _EUCState;
-
-typedef struct {
-	unsigned	count[4];
-	wchar_t		bits[4];
-	wchar_t		mask;
-	unsigned	mb_cur_max;
-} _EUCEncodingInfo;
-
-typedef struct {
-	_EUCEncodingInfo	ei;
-	struct {
-		/* for future multi-locale facility */
-		_EUCState	s_mblen;
-		_EUCState	s_mbrlen;
-		_EUCState	s_mbrtowc;
-		_EUCState	s_mbtowc;
-		_EUCState	s_mbsrtowcs;
-		_EUCState	s_mbsnrtowcs;
-		_EUCState	s_wcrtomb;
-		_EUCState	s_wcsrtombs;
-		_EUCState	s_wcsnrtombs;
-		_EUCState	s_wctomb;
-	} states;
-} _EUCCTypeInfo;
-
-#define	_SS2	0x008e
-#define	_SS3	0x008f
-
-#define _CEI_TO_EI(_cei_)		(&(_cei_)->ei)
-#define _CEI_TO_STATE(_cei_, _func_)	(_cei_)->states.s_##_func_
-
-#define _FUNCNAME(m)			_citrus_EUC_##m
-#define _ENCODING_INFO			_EUCEncodingInfo
-#define _CTYPE_INFO			_EUCCTypeInfo
-#define _ENCODING_STATE			_EUCState
-#define _ENCODING_MB_CUR_MAX(_ei_)	(_ei_)->mb_cur_max
-#define _ENCODING_IS_STATE_DEPENDENT	0
-#define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	0
-
-
-static __inline int
-_citrus_EUC_cs(unsigned int c)
-{
-	c &= 0xff;
-
-	return ((c & 0x80) ? c == _SS3 ? 3 : c == _SS2 ? 2 : 1 : 0);
-}
-
-static __inline int
-_citrus_EUC_parse_variable(_EUCEncodingInfo *ei,
-			   const void *var, size_t lenvar)
-{
-	const char *v, *e;
-	int x;
-
-	/* parse variable string */
-	if (!var)
-		return (EFTYPE);
-
-	v = (const char *) var;
-
-	while (*v == ' ' || *v == '\t')
-		++v;
-
-	ei->mb_cur_max = 1;
-	for (x = 0; x < 4; ++x) {
-		ei->count[x] = (int)_bcs_strtol(v, (char **)&e, 0);
-		if (v == e || !(v = e) || ei->count[x]<1 || ei->count[x]>4) {
-			return (EFTYPE);
-		}
-		if (ei->mb_cur_max < ei->count[x])
-			ei->mb_cur_max = ei->count[x];
-		while (*v == ' ' || *v == '\t')
-			++v;
-		ei->bits[x] = (int)_bcs_strtol(v, (char **)&e, 0);
-		if (v == e || !(v = e)) {
-			return (EFTYPE);
-		}
-		while (*v == ' ' || *v == '\t')
-			++v;
-	}
-	ei->mask = (int)_bcs_strtol(v, (char **)&e, 0);
-	if (v == e || !(v = e)) {
-		return (EFTYPE);
-	}
-
-	return 0;
-}
-
-
-static __inline void
-/*ARGSUSED*/
-_citrus_EUC_init_state(_EUCEncodingInfo *ei, _EUCState *s)
-{
-	memset(s, 0, sizeof(*s));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_EUC_pack_state(_EUCEncodingInfo *ei, void *pspriv, const _EUCState *s)
-{
-	memcpy(pspriv, (const void *)s, sizeof(*s));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_EUC_unpack_state(_EUCEncodingInfo *ei, _EUCState *s,
-			 const void *pspriv)
-{
-	memcpy((void *)s, pspriv, sizeof(*s));
-}
-
-static int
-_citrus_EUC_mbrtowc_priv(_EUCEncodingInfo *ei, wchar_t *pwc, const char **s,
-			 size_t n, _EUCState *psenc, size_t *nresult)
-{
-	wchar_t wchar;
-	int c, cs, len;
-	int chlenbak;
-	const char *s0, *s1 = NULL;
-
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(s != NULL);
-
-	s0 = *s;
-
-	if (s0 == NULL) {
-		_citrus_EUC_init_state(ei, psenc);
-		*nresult = 0; /* state independent */
-		return (0);
-	}
-
-	chlenbak = psenc->chlen;
-
-	/* make sure we have the first byte in the buffer */
-	switch (psenc->chlen) {
-	case 0:
-		if (n < 1)
-			goto restart;
-		psenc->ch[0] = *s0++;
-		psenc->chlen = 1;
-		n--;
-		break;
-	case 1:
-	case 2:
-		break;
-	default:
-		/* illgeal state */
-		goto encoding_error;
-	}
-
-	c = ei->count[cs = _citrus_EUC_cs(psenc->ch[0] & 0xff)];
-	if (c == 0)
-		goto encoding_error;
-	while (psenc->chlen < c) {
-		if (n < 1)
-			goto restart;
-		psenc->ch[psenc->chlen] = *s0++;
-		psenc->chlen++;
-		n--;
-	}
-	*s = s0;
-
-	switch (cs) {
-	case 3:
-	case 2:
-		/* skip SS2/SS3 */
-		len = c - 1;
-		s1 = &psenc->ch[1];
-		break;
-	case 1:
-	case 0:
-		len = c;
-		s1 = &psenc->ch[0];
-		break;
-	default:
-		goto encoding_error;
-	}
-	wchar = 0;
-	while (len-- > 0)
-		wchar = (wchar << 8) | (*s1++ & 0xff);
-	wchar = (wchar & ~ei->mask) | ei->bits[cs];
-
-	psenc->chlen = 0;
-	if (pwc)
-		*pwc = wchar;
-
-	if (!wchar) {
-		*nresult = 0;
-	} else {
-		*nresult = (size_t)(c - chlenbak);
-	}
-
-	return 0;
-
-encoding_error:
-	psenc->chlen = 0;
-	*nresult = (size_t)-1;
-	return (EILSEQ);
-
-restart:
-	*nresult = (size_t)-2;
-	*s = s0;
-	return (0);
-}
-
-static int
-_citrus_EUC_wcrtomb_priv(_EUCEncodingInfo *ei, char *s, size_t n, wchar_t wc,
-			 _EUCState *psenc, size_t *nresult)
-{
-	wchar_t m, nm;
-	int cs, i, ret;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(s != NULL);
-
-	m = wc & ei->mask;
-	nm = wc & ~m;
-
-	for (cs = 0;
-	     cs < sizeof(ei->count)/sizeof(ei->count[0]);
-	     cs++) {
-		if (m == ei->bits[cs])
-			break;
-	}
-	/* fallback case - not sure if it is necessary */
-	if (cs == sizeof(ei->count)/sizeof(ei->count[0]))
-		cs = 1;
-
-	i = ei->count[cs];
-	if (n < i) {
-		ret = E2BIG;
-		goto err;
-	}
-	m = (cs) ? 0x80 : 0x00;
-	switch (cs) {
-	case 2:
-		*s++ = _SS2;
-		i--;
-		break;
-	case 3:
-		*s++ = _SS3;
-		i--;
-		break;
-	}
-
-	while (i-- > 0)
-		*s++ = ((nm >> (i << 3)) & 0xff) | m;
-
-	*nresult = (size_t)ei->count[cs];
-	return 0;
-
-err:
-	*nresult = (size_t)-1;
-	return ret;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_EUC_stdenc_wctocs(_EUCEncodingInfo * __restrict ei,
-			  _csid_t * __restrict csid,
-			  _index_t * __restrict idx, wchar_t wc)
-{
-	wchar_t m, nm;
-
-	_DIAGASSERT(ei != NULL && csid != NULL && idx != NULL);
-
-	m = wc & ei->mask;
-	nm = wc & ~m;
-
-	*csid = (_citrus_csid_t)m;
-	*idx  = (_citrus_index_t)nm;
-
-	return (0);
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_EUC_stdenc_cstowc(_EUCEncodingInfo * __restrict ei,
-			  wchar_t * __restrict wc,
-			  _csid_t csid, _index_t idx)
-{
-
-	_DIAGASSERT(ei != NULL && wc != NULL);
-
-	if ((csid & ~ei->mask) != 0 || (idx & ei->mask) != 0)
-		return (EINVAL);
-
-	*wc = (wchar_t)csid | (wchar_t)idx;
-
-	return (0);
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_EUC_stdenc_get_state_desc_generic(_EUCEncodingInfo * __restrict ei,
-					  _EUCState * __restrict psenc,
-					  int * __restrict rstate)
-{
-
-	if (psenc->chlen == 0)
-		*rstate = _STDENC_SDGEN_INITIAL;
-	else
-		*rstate = _STDENC_SDGEN_INCOMPLETE_CHAR;
-
-	return 0;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_EUC_encoding_module_init(_EUCEncodingInfo * __restrict ei,
-				 const void * __restrict var, size_t lenvar)
-{
-
-	_DIAGASSERT(ei != NULL);
-
-	return (_citrus_EUC_parse_variable(ei, var, lenvar));
-}
-
-static void
-/*ARGSUSED*/
-_citrus_EUC_encoding_module_uninit(_EUCEncodingInfo * __restrict ei)
-{
-}
-
-/* ----------------------------------------------------------------------
- * public interface for ctype
- */
-
-_CITRUS_CTYPE_DECLS(EUC);
-_CITRUS_CTYPE_DEF_OPS(EUC);
-
-#include "citrus_ctype_template.h"
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(EUC);
-_CITRUS_STDENC_DEF_OPS(EUC);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_euc.h b/lib/libc/citrus/modules/citrus_euc.h
deleted file mode 100644
index 9f67756ca..000000000
--- a/lib/libc/citrus/modules/citrus_euc.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: citrus_euc.h,v 1.2 2003/06/25 09:51:42 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_EUC_H_
-#define _CITRUS_EUC_H_
-
-__BEGIN_DECLS
-_CITRUS_CTYPE_GETOPS_FUNC(EUC);
-_CITRUS_STDENC_GETOPS_FUNC(EUC);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_euctw.c b/lib/libc/citrus/modules/citrus_euctw.c
deleted file mode 100644
index 9d6738f55..000000000
--- a/lib/libc/citrus/modules/citrus_euctw.c
+++ /dev/null
@@ -1,430 +0,0 @@
-/*	$NetBSD: citrus_euctw.c,v 1.12 2013/05/28 16:57:56 joerg Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Citrus: xpg4dl/FreeBSD/lib/libc/locale/euctw.c,v 1.13 2001/06/21 01:51:44 yamt Exp $
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_euctw.c,v 1.12 2013/05/28 16:57:56 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <wchar.h>
-#include <sys/types.h>
-#include <limits.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_stdenc.h"
-#include "citrus_euctw.h"
-
-
-/* ----------------------------------------------------------------------
- * private stuffs used by templates
- */
-
-typedef struct {
-	char ch[4];
-	int chlen;
-} _EUCTWState;
-
-typedef struct {
-	int dummy;
-} _EUCTWEncodingInfo;
-typedef struct {
-	_EUCTWEncodingInfo	ei;
-	struct {
-		/* for future multi-locale facility */
-		_EUCTWState	s_mblen;
-		_EUCTWState	s_mbrlen;
-		_EUCTWState	s_mbrtowc;
-		_EUCTWState	s_mbtowc;
-		_EUCTWState	s_mbsrtowcs;
-		_EUCTWState	s_mbsnrtowcs;
-		_EUCTWState	s_wcrtomb;
-		_EUCTWState	s_wcsrtombs;
-		_EUCTWState	s_wcsnrtombs;
-		_EUCTWState	s_wctomb;
-	} states;
-} _EUCTWCTypeInfo;
-
-#define	_SS2	0x008e
-#define	_SS3	0x008f
-
-#define _CEI_TO_EI(_cei_)		(&(_cei_)->ei)
-#define _CEI_TO_STATE(_cei_, _func_)	(_cei_)->states.s_##_func_
-
-#define _FUNCNAME(m)			_citrus_EUCTW_##m
-#define _ENCODING_INFO			_EUCTWEncodingInfo
-#define _CTYPE_INFO			_EUCTWCTypeInfo
-#define _ENCODING_STATE			_EUCTWState
-#define _ENCODING_MB_CUR_MAX(_ei_)	4
-#define _ENCODING_IS_STATE_DEPENDENT	0
-#define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	0
-
-static __inline int
-_citrus_EUCTW_cs(u_int c)
-{
-	c &= 0xff;
-
-	return ((c & 0x80) ? (c == _SS2 ? 2 : 1) : 0);
-}
-
-static __inline int
-_citrus_EUCTW_count(int cs)
-{
-	switch (cs) {
-	case 0:
-		return 1;
-	case 1:
-		return 2;
-	case 2:
-		return 4;
-	case 3:
-		abort();
-		/*NOTREACHED*/
-	}
-	return 0;
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_EUCTW_init_state(_EUCTWEncodingInfo * __restrict ei,
-			 _EUCTWState * __restrict s)
-{
-	memset(s, 0, sizeof(*s));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_EUCTW_pack_state(_EUCTWEncodingInfo * __restrict ei,
-			 void * __restrict pspriv,
-			 const _EUCTWState * __restrict s)
-{
-	memcpy(pspriv, (const void *)s, sizeof(*s));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_EUCTW_unpack_state(_EUCTWEncodingInfo * __restrict ei,
-			   _EUCTWState * __restrict s,
-			   const void * __restrict pspriv)
-{
-	memcpy((void *)s, pspriv, sizeof(*s));
-}
-
-static int
-/*ARGSUSED*/
-_citrus_EUCTW_encoding_module_init(_EUCTWEncodingInfo * __restrict ei,
-				   const void * __restrict var, size_t lenvar)
-{
-
-	_DIAGASSERT(ei != NULL);
-
-	memset((void *)ei, 0, sizeof(*ei));
-
-	return 0;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_EUCTW_encoding_module_uninit(_EUCTWEncodingInfo *ei)
-{
-}
-
-static int
-_citrus_EUCTW_mbrtowc_priv(_EUCTWEncodingInfo * __restrict ei,
-			   wchar_t * __restrict pwc,
-			   const char ** __restrict s,
-			   size_t n, _EUCTWState * __restrict psenc,
-			   size_t * __restrict nresult)
-{
-	wchar_t wchar;
-	int c, cs;
-	int chlenbak;
-	const char *s0;
-
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(s != NULL);
-
-	s0 = *s;
-
-	if (s0 == NULL) {
-		_citrus_EUCTW_init_state(ei, psenc);
-		*nresult = 0; /* state independent */
-		return (0);
-	}
-
-	chlenbak = psenc->chlen;
-
-	/* make sure we have the first byte in the buffer */
-	switch (psenc->chlen) {
-	case 0:
-		if (n < 1)
-			goto restart;
-		psenc->ch[0] = *s0++;
-		psenc->chlen = 1;
-		n--;
-		break;
-	case 1:
-	case 2:
-		break;
-	default:
-		/* illgeal state */
-		goto ilseq;
-	}
-
-	c = _citrus_EUCTW_count(cs = _citrus_EUCTW_cs(psenc->ch[0] & 0xff));
-	if (c == 0)
-		goto ilseq;
-	while (psenc->chlen < c) {
-		if (n < 1)
-			goto ilseq;
-		psenc->ch[psenc->chlen] = *s0++;
-		psenc->chlen++;
-		n--;
-	}
-
-	wchar = 0;
-	switch (cs) {
-	case 0:
-		if (psenc->ch[0] & 0x80)
-			goto ilseq;
-		wchar = psenc->ch[0] & 0xff;
-		break;
-	case 1:
-		if (!(psenc->ch[0] & 0x80) || !(psenc->ch[1] & 0x80))
-			goto ilseq;
-		wchar = ((psenc->ch[0] & 0xff) << 8) | (psenc->ch[1] & 0xff);
-		wchar |= 'G' << 24;
-		break;
-	case 2:
-		if ((u_char)psenc->ch[1] < 0xa1 || 0xa7 < (u_char)psenc->ch[1])
-			goto ilseq;
-		if (!(psenc->ch[2] & 0x80) || !(psenc->ch[3] & 0x80))
-			goto ilseq;
-		wchar = ((psenc->ch[2] & 0xff) << 8) | (psenc->ch[3] & 0xff);
-		wchar |= ('G' + psenc->ch[1] - 0xa1) << 24;
-		break;
-	default:
-		goto ilseq;
-	}
-
-	*s = s0;
-	psenc->chlen = 0;
-
-	if (pwc)
-		*pwc = wchar;
-
-	if (!wchar)
-		*nresult = 0;
-	else
-		*nresult = c - chlenbak;
-
-	return (0);
-
-ilseq:
-	psenc->chlen = 0;
-	*nresult = (size_t)-1;
-	return (EILSEQ);
-
-restart:
-	*s = s0;
-	*nresult = (size_t)-1;
-	return (0);
-}
-
-static int
-_citrus_EUCTW_wcrtomb_priv(_EUCTWEncodingInfo * __restrict ei,
-			   char * __restrict s, size_t n, wchar_t wc,
-			   _EUCTWState * __restrict psenc,
-			   size_t * __restrict nresult)
-{
-	wchar_t cs = wc & 0x7f000080;
-	wchar_t v;
-	int i, len, clen, ret;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(s != NULL);
-
-	clen = 1;
-	if (wc & 0x00007f00)
-		clen = 2;
-	if ((wc & 0x007f0000) && !(wc & 0x00800000))
-		clen = 3;
-
-	if (clen == 1 && cs == 0x00000000) {
-		/* ASCII */
-		len = 1;
-		if (n < len) {
-			ret = E2BIG;
-			goto err;
-		}
-		v = wc & 0x0000007f;
-	} else if (clen == 2 && cs == ('G' << 24)) {
-		/* CNS-11643-1 */
-		len = 2;
-		if (n < len) {
-			ret = E2BIG;
-			goto err;
-		}
-		v = wc & 0x00007f7f;
-		v |= 0x00008080;
-	} else if (clen == 2 && 'H' <= (cs >> 24) && (cs >> 24) <= 'M') {
-		/* CNS-11643-[2-7] */
-		len = 4;
-		if (n < len) {
-			ret = E2BIG;
-			goto err;
-		}
-		*s++ = _SS2;
-		*s++ = (cs >> 24) - 'H' + 0xa2;
-		v = wc & 0x00007f7f;
-		v |= 0x00008080;
-	} else {
-		ret = EILSEQ;
-		goto err;
-	}
-
-	i = clen;
-	while (i-- > 0)
-		*s++ = (v >> (i << 3)) & 0xff;
-
-	*nresult = len;
-	return 0;
-
-err:
-	*nresult = (size_t)-1;
-	return ret;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_EUCTW_stdenc_wctocs(_EUCTWEncodingInfo * __restrict ei,
-			    _csid_t * __restrict csid,
-			    _index_t * __restrict idx, wchar_t wc)
-{
-
-	_DIAGASSERT(ei != NULL && csid != NULL && idx != NULL);
-
-	*csid = (_csid_t)(wc >> 24) & 0xFF;
-	*idx  = (_index_t)(wc & 0x7F7F);
-
-	return (0);
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_EUCTW_stdenc_cstowc(_EUCTWEncodingInfo * __restrict ei,
-			    wchar_t * __restrict wc,
-			    _csid_t csid, _index_t idx)
-{
-
-	_DIAGASSERT(ei != NULL && wc != NULL);
-
-	if (csid==0) {
-		if ((idx & ~0x7F) != 0)
-			return (EINVAL);
-		*wc = (wchar_t)idx;
-	} else {
-		if (csid < 'G' || csid > 'M' || (idx & ~0x7F7F) != 0)
-			return (EINVAL);
-		*wc = (wchar_t)idx | ((wchar_t)csid<<24);
-	}
-
-	return (0);
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_EUCTW_stdenc_get_state_desc_generic(_EUCTWEncodingInfo * __restrict ei,
-					    _EUCTWState * __restrict psenc,
-					    int * __restrict rstate)
-{
-
-	if (psenc->chlen == 0)
-		*rstate = _STDENC_SDGEN_INITIAL;
-	else
-		*rstate = _STDENC_SDGEN_INCOMPLETE_CHAR;
-
-	return 0;
-}
-
-/* ----------------------------------------------------------------------
- * public interface for ctype
- */
-
-_CITRUS_CTYPE_DECLS(EUCTW);
-_CITRUS_CTYPE_DEF_OPS(EUCTW);
-
-#include "citrus_ctype_template.h"
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(EUCTW);
-_CITRUS_STDENC_DEF_OPS(EUCTW);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_euctw.h b/lib/libc/citrus/modules/citrus_euctw.h
deleted file mode 100644
index dc01412ee..000000000
--- a/lib/libc/citrus/modules/citrus_euctw.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: citrus_euctw.h,v 1.2 2003/06/25 09:51:42 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_EUCTW_H_
-#define _CITRUS_EUCTW_H_
-
-__BEGIN_DECLS
-_CITRUS_CTYPE_GETOPS_FUNC(EUCTW);
-_CITRUS_STDENC_GETOPS_FUNC(EUCTW);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_gbk2k.c b/lib/libc/citrus/modules/citrus_gbk2k.c
deleted file mode 100644
index 9223e0354..000000000
--- a/lib/libc/citrus/modules/citrus_gbk2k.c
+++ /dev/null
@@ -1,476 +0,0 @@
-/* $NetBSD: citrus_gbk2k.c,v 1.8 2013/05/28 16:57:56 joerg Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_gbk2k.c,v 1.8 2013/05/28 16:57:56 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <wchar.h>
-#include <sys/types.h>
-#include <limits.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_stdenc.h"
-#include "citrus_gbk2k.h"
-
-
-/* ----------------------------------------------------------------------
- * private stuffs used by templates
- */
-
-typedef struct _GBK2KState {
-	char ch[4];
-	int chlen;
-} _GBK2KState;
-
-typedef struct {
-	int mb_cur_max;
-} _GBK2KEncodingInfo;
-
-typedef struct {
-	_GBK2KEncodingInfo	ei;
-	struct {
-		/* for future multi-locale facility */
-		_GBK2KState	s_mblen;
-		_GBK2KState	s_mbrlen;
-		_GBK2KState	s_mbrtowc;
-		_GBK2KState	s_mbtowc;
-		_GBK2KState	s_mbsrtowcs;
-		_GBK2KState	s_mbsnrtowcs;
-		_GBK2KState	s_wcrtomb;
-		_GBK2KState	s_wcsrtombs;
-		_GBK2KState	s_wcsnrtombs;
-		_GBK2KState	s_wctomb;
-	} states;
-} _GBK2KCTypeInfo;
-
-#define _CEI_TO_EI(_cei_)		(&(_cei_)->ei)
-#define _CEI_TO_STATE(_cei_, _func_)	(_cei_)->states.s_##_func_
-
-#define _FUNCNAME(m)			_citrus_GBK2K_##m
-#define _ENCODING_INFO			_GBK2KEncodingInfo
-#define _CTYPE_INFO			_GBK2KCTypeInfo
-#define _ENCODING_STATE			_GBK2KState
-#define _ENCODING_MB_CUR_MAX(_ei_)	(_ei_)->mb_cur_max
-#define _ENCODING_IS_STATE_DEPENDENT	0
-#define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	0
-
-static __inline void
-/*ARGSUSED*/
-_citrus_GBK2K_init_state(_GBK2KEncodingInfo * __restrict ei,
-			 _GBK2KState * __restrict s)
-{
-	memset(s, 0, sizeof(*s));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_GBK2K_pack_state(_GBK2KEncodingInfo * __restrict ei,
-			 void * __restrict pspriv,
-			 const _GBK2KState * __restrict s)
-{
-	memcpy(pspriv, (const void *)s, sizeof(*s));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_GBK2K_unpack_state(_GBK2KEncodingInfo * __restrict ei,
-			   _GBK2KState * __restrict s,
-			   const void * __restrict pspriv)
-{
-	memcpy((void *)s, pspriv, sizeof(*s));
-}
-
-static  __inline int
-_mb_singlebyte(int c)
-{
-	c &= 0xff;
-	return (c <= 0x7f);
-}
-
-static __inline int
-_mb_leadbyte(int c)
-{
-	c &= 0xff;
-	return (0x81 <= c && c <= 0xfe);
-}
-
-static __inline int
-_mb_trailbyte(int c)
-{
-	c &= 0xff;
-	return ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfe));
-}
-
-static __inline int
-_mb_surrogate(int c)
-{
-	c &= 0xff;
-	return (0x30 <= c && c <= 0x39);
-}
-
-static __inline int
-_mb_count(wchar_t v)
-{
-	u_int32_t c;
-
-	c = (u_int32_t)v; /* XXX */
-	if (!(c & 0xffffff00))
-		return (1);
-	if (!(c & 0xffff0000))
-		return (2);
-	return (4);
-}
-
-#define	_PSENC		(psenc->ch[psenc->chlen - 1])
-#define	_PUSH_PSENC(c)	(psenc->ch[psenc->chlen++] = (c))
-
-static int
-_citrus_GBK2K_mbrtowc_priv(_GBK2KEncodingInfo * __restrict ei,
-			   wchar_t * __restrict pwc,
-			   const char ** __restrict s, size_t n,
-			   _GBK2KState * __restrict psenc,
-			   size_t * __restrict nresult)
-{
-	int chlenbak, len;
-	const char *s0, *s1;
-	wchar_t wc;
-
-	_DIAGASSERT(ei != NULL);
-	/* pwc may be NULL */
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	s0 = *s;
-
-	if (s0 == NULL) {
-		/* _citrus_GBK2K_init_state(ei, psenc); */
-		psenc->chlen = 0;
-		*nresult = 0;
-		return (0);
-	}
-
-	chlenbak = psenc->chlen;
-
-	switch (psenc->chlen) {
-	case 3:
-		if (!_mb_leadbyte (_PSENC))
-			goto invalid;
-	/* FALLTHROUGH */
-	case 2:
-		if (!_mb_surrogate(_PSENC) || _mb_trailbyte(_PSENC))
-			goto invalid;
-	/* FALLTHROUGH */
-	case 1:
-		if (!_mb_leadbyte (_PSENC))
-			goto invalid;
-	/* FALLTHOROUGH */
-	case 0:
-		break;
-	default:
-		goto invalid;
-	}
-
-	for (;;) {
-		if (n-- < 1)
-			goto restart;
-
-		_PUSH_PSENC(*s0++);
-
-		switch (psenc->chlen) {
-		case 1:
-			if (_mb_singlebyte(_PSENC))
-				goto convert;
-			if (_mb_leadbyte  (_PSENC))
-				continue;
-			goto ilseq;
-		case 2:
-			if (_mb_trailbyte (_PSENC))
-				goto convert;
-			if (ei->mb_cur_max == 4 &&
-			    _mb_surrogate (_PSENC))
-				continue;
-			goto ilseq;
-		case 3:
-			if (_mb_leadbyte  (_PSENC))
-				continue;
-			goto ilseq;
-		case 4:
-			if (_mb_surrogate (_PSENC))
-				goto convert;
-			goto ilseq;
-		}
-	}
-
-convert:
-	len = psenc->chlen;
-	s1  = &psenc->ch[0];
-	wc  = 0;
-	while (len-- > 0)
-		wc = (wc << 8) | (*s1++ & 0xff);
-
-	if (pwc != NULL)
-		*pwc = wc;
-	*s = s0;
-	*nresult = (wc == 0) ? 0 : psenc->chlen - chlenbak; 
-	/* _citrus_GBK2K_init_state(ei, psenc); */
-	psenc->chlen = 0;
-
-	return (0);
-
-restart:
-	*s = s0;
-	*nresult = (size_t)-2;
-
-	return (0);
-
-invalid:
-	return (EINVAL);
-
-ilseq:
-	*nresult = (size_t)-1;
-	return (EILSEQ);
-}
-
-static int
-_citrus_GBK2K_wcrtomb_priv(_GBK2KEncodingInfo * __restrict ei,
-			   char * __restrict s, size_t n, wchar_t wc,
-			   _GBK2KState * __restrict psenc,
-			   size_t * __restrict nresult)
-{
-	int len, ret;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	if (psenc->chlen != 0) {
-		ret = EINVAL;
-		goto err;
-	}
-
-	len = _mb_count(wc);
-	if (n < len) {
-		ret = E2BIG;
-		goto err;
-	}
-
-	switch (len) {
-	case 1:
-		if (!_mb_singlebyte(_PUSH_PSENC(wc     ))) {
-			ret = EILSEQ;
-			goto err;
-		}
-		break;
-	case 2:
-		if (!_mb_leadbyte  (_PUSH_PSENC(wc >> 8)) ||
-		    !_mb_trailbyte (_PUSH_PSENC(wc     ))) {
-			ret = EILSEQ;
-			goto err;
-		}
-		break;
-	case 4:
-		if (ei->mb_cur_max != 4 ||
-		    !_mb_leadbyte  (_PUSH_PSENC(wc >> 24)) ||
-		    !_mb_surrogate (_PUSH_PSENC(wc >> 16)) ||
-		    !_mb_leadbyte  (_PUSH_PSENC(wc >>  8)) ||
-		    !_mb_surrogate (_PUSH_PSENC(wc      ))) {
-			ret = EILSEQ;
-			goto err;
-		}
-		break;
-	}
-
-	_DIAGASSERT(len == psenc->chlen);
-
-	memcpy(s, psenc->ch, psenc->chlen);
-	*nresult = psenc->chlen;
-	/* _citrus_GBK2K_init_state(ei, psenc); */
-	psenc->chlen = 0;
-
-	return (0);
-
-err:
-	*nresult = (size_t)-1;
-	return ret;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_GBK2K_stdenc_wctocs(_GBK2KEncodingInfo * __restrict ei,
-			    _csid_t * __restrict csid,
-			    _index_t * __restrict idx, wchar_t wc)
-{
-	u_int8_t ch, cl;
-
-	_DIAGASSERT(csid != NULL && idx != NULL);
-
-	if ((u_int32_t)wc<0x80) {
-		/* ISO646 */
-		*csid = 0;
-		*idx = (_index_t)wc;
-	} else if ((u_int32_t)wc>=0x10000) {
-		/* GBKUCS : XXX */
-		*csid = 3;
-		*idx = (_index_t)wc;
-	} else {
-		ch = (u_int8_t)(wc >> 8);
-		cl = (u_int8_t)wc;
-		if (ch>=0xA1 && cl>=0xA1) {
-			/* EUC G1 */
-			*csid = 1;
-			*idx = (_index_t)wc & 0x7F7FU;
-		} else {
-			/* extended area (0x8140-) */
-			*csid = 2;
-			*idx = (_index_t)wc;
-		}
-	}
-		
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_GBK2K_stdenc_cstowc(_GBK2KEncodingInfo * __restrict ei,
-			    wchar_t * __restrict wc,
-			    _csid_t csid, _index_t idx)
-{
-
-	_DIAGASSERT(wc != NULL);
-
-	switch (csid) {
-	case 0:
-		/* ISO646 */
-		*wc = (wchar_t)idx;
-		break;
-	case 1:
-		/* EUC G1 */
-		*wc = (wchar_t)idx | 0x8080U;
-		break;
-	case 2:
-		/* extended area */
-		*wc = (wchar_t)idx;
-		break;
-	case 3:
-		/* GBKUCS : XXX */
-		if (ei->mb_cur_max != 4)
-			return EINVAL;
-		*wc = (wchar_t)idx;
-		break;
-	default:
-		return EILSEQ;
-	}
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_GBK2K_stdenc_get_state_desc_generic(_GBK2KEncodingInfo * __restrict ei,
-					    _GBK2KState * __restrict psenc,
-					    int * __restrict rstate)
-{
-
-	if (psenc->chlen == 0)
-		*rstate = _STDENC_SDGEN_INITIAL;
-	else
-		*rstate = _STDENC_SDGEN_INCOMPLETE_CHAR;
-
-	return 0;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_GBK2K_encoding_module_init(_GBK2KEncodingInfo * __restrict ei,
-				   const void * __restrict var, size_t lenvar)
-{
-	const char *p;
-
-	_DIAGASSERT(ei != NULL);
-
-	p = var;
-#define MATCH(x, act)                                           \
-do {                                                            \
-        if (lenvar >= (sizeof(#x)-1) &&                         \
-            _bcs_strncasecmp(p, #x, sizeof(#x)-1) == 0) {       \
-                act;                                            \
-                lenvar -= sizeof(#x)-1;                         \
-                p += sizeof(#x)-1;                              \
-        }                                                       \
-} while (/*CONSTCOND*/0)
-	memset((void *)ei, 0, sizeof(*ei));
-	ei->mb_cur_max = 4;
-	while (lenvar>0) {
-		switch (_bcs_tolower(*p)) {
-		case '2':
-			MATCH("2byte", ei->mb_cur_max = 2);
-			break;
-		}
-		p++;
-		lenvar--;
-	}
-
-	return (0);
-}
-
-static void
-/*ARGSUSED*/
-_citrus_GBK2K_encoding_module_uninit(_GBK2KEncodingInfo *ei)
-{
-}
-
-
-/* ----------------------------------------------------------------------
- * public interface for ctype
- */
-
-_CITRUS_CTYPE_DECLS(GBK2K);
-_CITRUS_CTYPE_DEF_OPS(GBK2K);
-
-#include "citrus_ctype_template.h"
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(GBK2K);
-_CITRUS_STDENC_DEF_OPS(GBK2K);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_gbk2k.h b/lib/libc/citrus/modules/citrus_gbk2k.h
deleted file mode 100644
index d0ea49115..000000000
--- a/lib/libc/citrus/modules/citrus_gbk2k.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $NetBSD: citrus_gbk2k.h,v 1.2 2003/06/25 09:51:43 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_GBK2K_H_
-#define _CITRUS_GBK2K_H_
-
-__BEGIN_DECLS
-_CITRUS_CTYPE_GETOPS_FUNC(GBK2K);
-_CITRUS_STDENC_GETOPS_FUNC(GBK2K);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_hz.c b/lib/libc/citrus/modules/citrus_hz.c
deleted file mode 100644
index 54dca5128..000000000
--- a/lib/libc/citrus/modules/citrus_hz.c
+++ /dev/null
@@ -1,728 +0,0 @@
-/* $NetBSD: citrus_hz.c,v 1.4 2014/06/24 22:24:18 spz Exp $ */
-
-/*-
- * Copyright (c)2004, 2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_hz.c,v 1.4 2014/06/24 22:24:18 spz Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/queue.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <limits.h>
-#include <wchar.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_stdenc.h"
-
-#include "citrus_hz.h"
-#include "citrus_prop.h"
-
-/*
- * wchar_t mapping:
- *
- * CTRL/ASCII	00000000 00000000 00000000 gxxxxxxx
- * GB2312	00000000 00000000 0xxxxxxx gxxxxxxx
- * 94/96*n (~M)	0mmmmmmm 0xxxxxxx 0xxxxxxx gxxxxxxx
- */
-
-#define ESCAPE_CHAR	'~'
-
-typedef enum {
-	CTRL = 0, ASCII = 1, GB2312 = 2, CS94 = 3, CS96 = 4
-} charset_t;
-
-typedef struct {
-	int start, end, width;
-} range_t;
-
-static const range_t ranges[] = {
-#define RANGE(start, end) { start, end, (end - start) + 1 }
-/* CTRL   */ RANGE(0x00, 0x1F),
-/* ASCII  */ RANGE(0x20, 0x7F),
-/* GB2312 */ RANGE(0x21, 0x7E),
-/* CS94   */ RANGE(0x21, 0x7E),
-/* CS96   */ RANGE(0x20, 0x7F),
-#undef RANGE
-};
-
-typedef struct escape_t escape_t;
-typedef struct {
-	charset_t charset;
-	size_t length;
-#define ROWCOL_MAX	3
-	escape_t *escape;
-} graphic_t;
-
-typedef TAILQ_HEAD(escape_list, escape_t) escape_list;
-struct escape_t {
-	TAILQ_ENTRY(escape_t) entry;
-	int ch;
-	graphic_t *left, *right;
-	escape_list *set;
-};
-
-#define GL(escape)	((escape)->left)
-#define GR(escape)	((escape)->right)
-#define SET(escape)	((escape)->set)
-#define ESC(escape)	((escape)->ch)
-#define INIT(escape)	(TAILQ_FIRST(SET(escape)))
-
-static __inline escape_t *
-find_escape(escape_list *set, int ch)
-{
-	escape_t *escape;
-
-	_DIAGASSERT(set != NULL);
-
-	TAILQ_FOREACH(escape, set, entry) {
-		if (ESC(escape) == ch)
-			break;
-	}
-
-	return escape;
-}
-
-typedef struct {
-	escape_list e0, e1;
-	graphic_t *ascii, *gb2312;
-} _HZEncodingInfo;
-
-#define E0SET(ei)	(&(ei)->e0)
-#define E1SET(ei)	(&(ei)->e1)
-#define INIT0(ei)	(TAILQ_FIRST(E0SET(ei)))
-#define INIT1(ei)	(TAILQ_FIRST(E1SET(ei)))
-
-typedef struct {
-	int chlen;
-	char ch[ROWCOL_MAX];
-	escape_t *inuse;
-} _HZState;
-
-typedef struct {
-	_HZEncodingInfo		ei;
-	struct {
-		/* for future multi-locale facility */
-		_HZState	s_mblen;
-		_HZState	s_mbrlen;
-		_HZState	s_mbrtowc;
-		_HZState	s_mbtowc;
-		_HZState	s_mbsrtowcs;
-		_HZState	s_mbsnrtowcs;
-		_HZState	s_wcrtomb;
-		_HZState	s_wcsrtombs;
-		_HZState	s_wcsnrtombs;
-		_HZState	s_wctomb;
-	} states;
-} _HZCTypeInfo;
-
-#define _CEI_TO_EI(_cei_)		(&(_cei_)->ei)
-#define _CEI_TO_STATE(_cei_, _func_)	(_cei_)->states.s_##_func_
-
-#define _FUNCNAME(m)			_citrus_HZ_##m
-#define _ENCODING_INFO			_HZEncodingInfo
-#define _CTYPE_INFO			_HZCTypeInfo
-#define _ENCODING_STATE			_HZState
-#define _ENCODING_MB_CUR_MAX(_ei_)	MB_LEN_MAX
-#define _ENCODING_IS_STATE_DEPENDENT		1
-#define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	((_ps_)->inuse == NULL)
-
-static __inline void
-_citrus_HZ_init_state(_HZEncodingInfo * __restrict ei,
-	_HZState * __restrict psenc)
-{
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	psenc->chlen = 0;
-	psenc->inuse = INIT0(ei);
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_HZ_pack_state(_HZEncodingInfo * __restrict ei,
-	void *__restrict pspriv, const _HZState * __restrict psenc)
-{
-	/* ei may be unused */
-	_DIAGASSERT(pspriv != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	memcpy(pspriv, (const void *)psenc, sizeof(*psenc));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_HZ_unpack_state(_HZEncodingInfo * __restrict ei,
-	_HZState * __restrict psenc, const void * __restrict pspriv)
-{
-	/* ei may be unused */
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(pspriv != NULL);
-
-	memcpy((void *)psenc, pspriv, sizeof(*psenc));
-}
-
-static int
-_citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei,
-	wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
-	_HZState * __restrict psenc, size_t * __restrict nresult)
-{
-	const char *s0;
-	wchar_t wc;
-	int bit, head, tail, len, ch;
-	graphic_t *graphic;
-	escape_t *candidate, *init;
-	const range_t *range;
-
-	_DIAGASSERT(ei != NULL);
-	/* pwc may be null */
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	if (*s == NULL) {
-		_citrus_HZ_init_state(ei, psenc);
-		*nresult = 1;
-		return 0;
-	}
-	s0 = *s;
-	if (psenc->chlen < 0 || psenc->inuse == NULL)
-		return EINVAL;
-
-	wc = (wchar_t)0;
-	bit = head = tail = 0;
-	graphic = NULL;
-	for (len = 0; len <= MB_LEN_MAX; /**/) {
-		if (psenc->chlen == tail) {
-			if (n-- < 1) {
-				*s = s0;
-				*nresult = (size_t)-2;
-				return 0;
-			}
-			psenc->ch[psenc->chlen++] = *s0++;
-			++len;
-		}
-		ch = (unsigned char)psenc->ch[tail++];
-		if (tail == 1) {
-			if ((ch & ~0x80) <= 0x1F) {
-				if (psenc->inuse != INIT0(ei))
-					break;
-				wc = (wchar_t)ch;
-				goto done;
-			}
-			if (ch & 0x80) {
-				graphic = GR(psenc->inuse);
-				bit = 0x80;
-				ch &= ~0x80;
-			} else {
-				graphic = GL(psenc->inuse);
-				if (ch == ESCAPE_CHAR)
-					continue;
-				bit = 0x0;
-			}
-			if (graphic == NULL)
-				break;
-		} else if (tail == 2 && psenc->ch[0] == ESCAPE_CHAR) {
-			if (tail < psenc->chlen)
-				return EINVAL;
-			if (ch == ESCAPE_CHAR) {
-				++head;
-			} else if (ch == '\n') {
-				if (psenc->inuse != INIT0(ei))
-					break;
-				tail = psenc->chlen = 0;
-				continue;
-			} else {
-				candidate = NULL;
-				init = INIT0(ei);
-				_DIAGASSERT(init != NULL);
-				if (psenc->inuse == init) {
-					init = INIT1(ei);
-				} else if (INIT(psenc->inuse) == init) {
-					if (ESC(init) != ch)
-						break;
-					candidate = init;
-				}
-				if (candidate == NULL) {
-					candidate = find_escape(
-					    SET(psenc->inuse), ch);
-					if (candidate == NULL) {
-						if (init == NULL ||
-						    ESC(init) != ch)
-							break;
-						candidate = init;
-					}
-				}
-				psenc->inuse = candidate;
-				tail = psenc->chlen = 0;
-				continue;
-			}
-		} else if (ch & 0x80) {
-			if (graphic != GR(psenc->inuse))
-				break;
-			ch &= ~0x80;
-		} else {
-			if (graphic != GL(psenc->inuse))
-				break;
-		}
-		_DIAGASSERT(graphic != NULL);
-		range = &ranges[(size_t)graphic->charset];
-		if (range->start > ch || range->end < ch)
-			break;
-		wc <<= 8;
-		wc |= ch;
-		if (graphic->length == (tail - head)) {
-			if (graphic->charset > GB2312)
-				bit |= ESC(psenc->inuse) << 24;
-			wc |= bit;
-			goto done;
-		}
-	}
-	*nresult = (size_t)-1;
-	return EILSEQ;
-done:
-	if (tail < psenc->chlen)
-		return EINVAL;
-	*s = s0;
-	if (pwc != NULL)
-		*pwc = wc;
-	psenc->chlen = 0;
-	*nresult = (wc == 0) ? 0 : len;
-
-	return 0;
-}
-
-static int
-_citrus_HZ_wcrtomb_priv(_HZEncodingInfo * __restrict ei,
-	char * __restrict s, size_t n, wchar_t wc,
-	_HZState * __restrict psenc, size_t * __restrict nresult)
-{
-	int bit, ch;
-	escape_t *candidate, *init;
-	graphic_t *graphic;
-	size_t len;
-	const range_t *range;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	if (psenc->chlen != 0 || psenc->inuse == NULL)
-		return EINVAL;
-	if (wc & 0x80) {
-		bit = 0x80;
-		wc &= ~0x80;
-	} else {
-		bit = 0x0;
-	}
-	if ((uint32_t)wc <= 0x1F) {
-		candidate = INIT0(ei);
-		graphic = (bit == 0)
-		    ? candidate->left : candidate->right;
-		if (graphic == NULL)
-			goto ilseq;
-		range = &ranges[(size_t)CTRL];
-		len = 1;
-	} else if ((uint32_t)wc <= 0x7F) {
-		graphic = ei->ascii;
-		if (graphic == NULL)
-			goto ilseq;
-		candidate = graphic->escape;
-		range = &ranges[(size_t)graphic->charset];
-		len = graphic->length;
-	} else if ((uint32_t)wc <= 0x7F7F) {
-		graphic = ei->gb2312;
-		if (graphic == NULL)
-			goto ilseq;
-		candidate = graphic->escape;
-		range = &ranges[(size_t)graphic->charset];
-		len = graphic->length;
-	} else {
-		ch = (wc >> 24) & 0xFF;
-		candidate = find_escape(E0SET(ei), ch);
-		if (candidate == NULL) {
-			candidate = find_escape(E1SET(ei), ch);
-			if (candidate == NULL)
-				goto ilseq;
-		}
-		wc &= ~0xFF000000;
-		graphic = (bit == 0)
-		    ? candidate->left : candidate->right;
-		if (graphic == NULL)
-			goto ilseq;
-		range = &ranges[(size_t)graphic->charset];
-		len = graphic->length;
-	}
-	if (psenc->inuse != candidate) {
-		init = INIT0(ei);
-		if (SET(psenc->inuse) == SET(candidate)) {
-			if (INIT(psenc->inuse) != init ||
-			    psenc->inuse == init || candidate == init)
-				init = NULL;
-		} else if (candidate == (init = INIT(candidate))) {
-			init = NULL;
-		}
-		if (init != NULL) {
-			if (n < 2)
-				return E2BIG;
-			n -= 2;
-			psenc->ch[psenc->chlen++] = ESCAPE_CHAR;
-			psenc->ch[psenc->chlen++] = ESC(init);
-		}
-		if (n < 2)
-			return E2BIG;
-		n -= 2;
-		psenc->ch[psenc->chlen++] = ESCAPE_CHAR;
-		psenc->ch[psenc->chlen++] = ESC(candidate);
-		psenc->inuse = candidate;
-	}
-	if (n < len)
-		return E2BIG;
-	while (len-- > 0) {
-		ch = (wc >> (len * 8)) & 0xFF;
-		if (range->start > ch || range->end < ch)
-			goto ilseq;
-		psenc->ch[psenc->chlen++] = ch | bit;
-	}
-	memcpy(s, psenc->ch, psenc->chlen);
-	*nresult = psenc->chlen;
-	psenc->chlen = 0;
-
-	return 0;
-
-ilseq:
-	*nresult = (size_t)-1;
-	return EILSEQ;
-}
-
-static __inline int
-_citrus_HZ_put_state_reset(_HZEncodingInfo * __restrict ei,
-	char * __restrict s, size_t n, _HZState * __restrict psenc,
-	size_t * __restrict nresult)
-{
-	escape_t *candidate;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	if (psenc->chlen != 0 || psenc->inuse == NULL)
-		return EINVAL;
-	candidate = INIT0(ei);
-	if (psenc->inuse != candidate) {
-		if (n < 2)
-			return E2BIG;
-		n -= 2;
-		psenc->ch[psenc->chlen++] = ESCAPE_CHAR;
-		psenc->ch[psenc->chlen++] = ESC(candidate);
-	}
-	if (n < 1)
-		return E2BIG;
-	if (psenc->chlen > 0)
-		memcpy(s, psenc->ch, psenc->chlen);
-	*nresult = psenc->chlen;
-	_citrus_HZ_init_state(ei, psenc);
-
-	return 0;
-}
-
-static __inline int
-_citrus_HZ_stdenc_get_state_desc_generic(_HZEncodingInfo * __restrict ei,
-	_HZState * __restrict psenc, int * __restrict rstate)
-{
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(rstate != NULL);
-
-	if (psenc->chlen < 0 || psenc->inuse == NULL)
-		return EINVAL;
-	*rstate = (psenc->chlen == 0)
-	    ? ((psenc->inuse == INIT0(ei))
-	        ? _STDENC_SDGEN_INITIAL
-	        : _STDENC_SDGEN_STABLE)
-	    : ((psenc->ch[0] == ESCAPE_CHAR)
-	        ? _STDENC_SDGEN_INCOMPLETE_SHIFT
-	        : _STDENC_SDGEN_INCOMPLETE_CHAR);
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_HZ_stdenc_wctocs(_HZEncodingInfo * __restrict ei,
-	_csid_t * __restrict csid, _index_t * __restrict idx, wchar_t wc)
-{
-	int bit;
-
-	_DIAGASSERT(csid != NULL);
-	_DIAGASSERT(idx != NULL);
-
-	if (wc & 0x80) {
-		bit = 0x80;
-		wc &= ~0x80;
-	} else {
-		bit = 0x0;
-	}
-	if ((uint32_t)wc <= 0x7F) {
-		*csid = (_csid_t)bit;
-		*idx = (_index_t)wc;
-	} else if ((uint32_t)wc <= 0x7F7F) {
-		*csid = (_csid_t)(bit | 0x8000);
-		*idx = (_index_t)wc;
-	} else {
-		*csid = (_index_t)(wc & ~0x00FFFF7F);
-		*idx = (_csid_t)(wc & 0x00FFFF7F);
-	}
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_HZ_stdenc_cstowc(_HZEncodingInfo * __restrict ei,
-	wchar_t * __restrict wc, _csid_t csid, _index_t idx)
-{
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(wc != NULL);
-
-	*wc = (wchar_t)idx;
-	switch (csid) {
-	case 0x80:
-	case 0x8080:
-		*wc |= (wchar_t)0x80;
-	/*FALLTHROUGH*/
-	case 0x0:
-	case 0x8000:
-		break;
-	default:
-		*wc |= (wchar_t)csid;
-	}
-
-	return 0;
-}
-
-static void
-_citrus_HZ_encoding_module_uninit(_HZEncodingInfo *ei)
-{
-	escape_t *escape;
-
-	_DIAGASSERT(ei != NULL);
-	while ((escape = TAILQ_FIRST(E0SET(ei))) != NULL) {
-		TAILQ_REMOVE(E0SET(ei), escape, entry);
-		free(GL(escape));
-		free(GR(escape));
-		free(escape);
-	}
-	while ((escape = TAILQ_FIRST(E1SET(ei))) != NULL) {
-		TAILQ_REMOVE(E1SET(ei), escape, entry);
-		free(GL(escape));
-		free(GR(escape));
-		free(escape);
-	}
-}
-
-static int
-_citrus_HZ_parse_char(void *context, const char *name, const char *s)
-{
-	void **p;
-	escape_t *escape;
-
-	_DIAGASSERT(context != NULL && *context != NULL);
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(s != NULL);
-
-	p = (void **)context;
-	escape = (escape_t *)p[0];
-	if (escape->ch != '\0')
-		return EINVAL;
-	escape->ch = *s++;
-	if (escape->ch == ESCAPE_CHAR || *s != '\0')
-		return EINVAL;
-
-	return 0;
-}
-
-static int
-_citrus_HZ_parse_graphic(void *context, const char *name, const char *s)
-{
-	void **p;
-	_HZEncodingInfo *ei;
-	escape_t *escape;
-	graphic_t *graphic;
-
-	_DIAGASSERT(context != NULL && *context != NULL);
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(s != NULL);
-
-	p = (void **)context;
-	escape = (escape_t *)p[0];
-	ei = (_HZEncodingInfo *)p[1];
-	graphic = malloc(sizeof(*graphic));
-	if (graphic == NULL)
-		return ENOMEM;
-	memset(graphic, 0, sizeof(*graphic));
-	if (strcmp("GL", name) == 0) {
-		if (GL(escape) != NULL)
-			goto release;
-		GL(escape) = graphic;
-	} else if (strcmp("GR", name) == 0) {
-		if (GR(escape) != NULL)
-			goto release;
-		GR(escape) = graphic;
-	} else {
-release:
-		free(graphic);
-		return EINVAL;
-	}
-	graphic->escape = escape;
-	if (_bcs_strncasecmp("ASCII", s, 5) == 0) {
-		if (s[5] != '\0')
-			return EINVAL;
-		graphic->charset = ASCII;
-		graphic->length = 1;
-		ei->ascii = graphic;
-		return 0;
-	} else if (_bcs_strncasecmp("GB2312", s, 6) == 0) {
-		if (s[6] != '\0')
-			return EINVAL;
-		graphic->charset = GB2312;
-		graphic->length = 2;
-		ei->gb2312 = graphic;
-		return 0;
-	} else if (strncmp("94*", s, 3) == 0) {
-		graphic->charset = CS94;
-	} else if (strncmp("96*", s, 3) == 0) {
-		graphic->charset = CS96;
-	} else {
-		return EINVAL;
-	}
-	s += 3;
-	switch(*s) {
-	case '1': case '2': case '3':
-		graphic->length = (size_t)(*s - '0');
-		if (*++s == '\0')
-			break;
-	/*FALLTHROUGH*/
-	default:
-		return EINVAL;
-	}
-	return 0;
-}
-
-static const _citrus_prop_hint_t escape_hints[] = {
-_CITRUS_PROP_HINT_STR("CH", &_citrus_HZ_parse_char),
-_CITRUS_PROP_HINT_STR("GL", &_citrus_HZ_parse_graphic),
-_CITRUS_PROP_HINT_STR("GR", &_citrus_HZ_parse_graphic),
-_CITRUS_PROP_HINT_END
-};
-
-static int
-_citrus_HZ_parse_escape(void *context, const char *name, const char *s)
-{
-	_HZEncodingInfo *ei;
-	escape_t *escape;
-	void *p[2];
-
-	_DIAGASSERT(context != NULL);
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(s != NULL);
-
-	ei = (_HZEncodingInfo *)context;
-	escape = malloc(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);
-	} else if (strcmp("1", name) == 0) {
-		escape->set = E1SET(ei);
-		TAILQ_INSERT_TAIL(E1SET(ei), escape, entry);
-	} else {
-		free(escape);
-		return EINVAL;
-	}
-	p[0] = (void *)escape;
-	p[1] = (void *)ei;
-	return _citrus_prop_parse_variable(
-	    escape_hints, (void *)&p[0], s, strlen(s));
-}
-
-static const _citrus_prop_hint_t root_hints[] = {
-_CITRUS_PROP_HINT_STR("0", &_citrus_HZ_parse_escape),
-_CITRUS_PROP_HINT_STR("1", &_citrus_HZ_parse_escape),
-_CITRUS_PROP_HINT_END
-};
-
-static int
-_citrus_HZ_encoding_module_init(_HZEncodingInfo * __restrict ei,
-	const void * __restrict var, size_t lenvar)
-{
-	int errnum;
-
-	_DIAGASSERT(ei != NULL);
-
-	memset(ei, 0, sizeof(*ei));
-	TAILQ_INIT(E0SET(ei));
-	TAILQ_INIT(E1SET(ei));
-	errnum = _citrus_prop_parse_variable(
-	    root_hints, (void *)ei, var, lenvar);
-	if (errnum != 0)
-		_citrus_HZ_encoding_module_uninit(ei);
-	return errnum;
-}
-
-/* ----------------------------------------------------------------------
- * public interface for ctype
- */
-
-_CITRUS_CTYPE_DECLS(HZ);
-_CITRUS_CTYPE_DEF_OPS(HZ);
-
-#include "citrus_ctype_template.h"
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(HZ);
-_CITRUS_STDENC_DEF_OPS(HZ);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_hz.h b/lib/libc/citrus/modules/citrus_hz.h
deleted file mode 100644
index 55435210c..000000000
--- a/lib/libc/citrus/modules/citrus_hz.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $NetBSD: citrus_hz.h,v 1.1 2006/11/22 23:38:27 tnozaki Exp $ */
-
-/*-
- * Copyright (c)2004, 2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_HZ_H_
-#define _CITRUS_HZ_H_
-
-__BEGIN_DECLS
-_CITRUS_CTYPE_GETOPS_FUNC(HZ);
-_CITRUS_STDENC_GETOPS_FUNC(HZ);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_iconv_none.c b/lib/libc/citrus/modules/citrus_iconv_none.c
deleted file mode 100644
index 83a0ec41a..000000000
--- a/lib/libc/citrus/modules/citrus_iconv_none.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*	$NetBSD: citrus_iconv_none.c,v 1.3 2011/05/23 14:45:44 joerg Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_iconv_none.c,v 1.3 2011/05/23 14:45:44 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/queue.h>
-
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_hash.h"
-#include "citrus_iconv.h"
-#include "citrus_iconv_none.h"
-
-/* ---------------------------------------------------------------------- */
-
-_CITRUS_ICONV_DECLS(iconv_none);
-_CITRUS_ICONV_DEF_OPS(iconv_none);
-
-
-/* ---------------------------------------------------------------------- */
-
-int
-_citrus_iconv_none_iconv_getops(struct _citrus_iconv_ops *ops, size_t lenops,
-				uint32_t expected_version)
-{
-	if (expected_version<_CITRUS_ICONV_ABI_VERSION || lenops<sizeof(*ops))
-		return (EINVAL);
-
-	memcpy(ops, &_citrus_iconv_none_iconv_ops,
-	       sizeof(_citrus_iconv_none_iconv_ops));
-
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_iconv_none_iconv_init_shared(
-	struct _citrus_iconv_shared * __restrict ci,
-	const char * __restrict curdir,
-	const char * __restrict in, const char * __restrict out,
-	const void * __restrict var, size_t lenvar)
-{
-	ci->ci_closure = NULL;
-	return 0;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_iconv_none_iconv_uninit_shared(struct _citrus_iconv_shared *ci)
-{
-}
-
-static int
-/*ARGSUSED*/
-_citrus_iconv_none_iconv_init_context(struct _citrus_iconv *cv)
-{
-	cv->cv_closure = NULL;
-	return 0;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_iconv_none_iconv_uninit_context(struct _citrus_iconv *cv)
-{
-}
-
-static int
-/*ARGSUSED*/
-_citrus_iconv_none_iconv_convert(struct _citrus_iconv * __restrict ci,
-				 const char * __restrict * __restrict in,
-				 size_t * __restrict inbytes,
-				 char * __restrict * __restrict out,
-				 size_t * __restrict outbytes,
-				 u_int32_t flags, size_t * __restrict invalids)
-{
-	int e2big;
-	size_t len;
-
-	len = *inbytes;
-	e2big = 0;
-	if (*outbytes<len) {
-		e2big = 1;
-		len = *outbytes;
-	}
-	memcpy(*out, *in, len);
-	in += len;
-	*inbytes -= len;
-	out+=len;
-	*outbytes -= len;
-	*invalids = 0;
-	if (e2big) {
-		return (E2BIG);
-	}
-
-	return (0);
-}
diff --git a/lib/libc/citrus/modules/citrus_iconv_none.h b/lib/libc/citrus/modules/citrus_iconv_none.h
deleted file mode 100644
index f162d4e6d..000000000
--- a/lib/libc/citrus/modules/citrus_iconv_none.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: citrus_iconv_none.h,v 1.1 2003/06/25 09:51:43 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_ICONV_NONE_H_
-#define _CITRUS_ICONV_NONE_H_
-
-__BEGIN_DECLS
-_CITRUS_ICONV_GETOPS_FUNC(iconv_none);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_iconv_std.c b/lib/libc/citrus/modules/citrus_iconv_std.c
deleted file mode 100644
index f344d75eb..000000000
--- a/lib/libc/citrus/modules/citrus_iconv_std.c
+++ /dev/null
@@ -1,585 +0,0 @@
-/*	$NetBSD: citrus_iconv_std.c,v 1.16 2012/02/12 13:51:29 wiz Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_iconv_std.c,v 1.16 2012/02/12 13:51:29 wiz Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <machine/endian.h>
-#include <sys/queue.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_region.h"
-#include "citrus_mmap.h"
-#include "citrus_hash.h"
-#include "citrus_iconv.h"
-#include "citrus_stdenc.h"
-#include "citrus_mapper.h"
-#include "citrus_csmapper.h"
-#include "citrus_memstream.h"
-#include "citrus_iconv_std.h"
-#include "citrus_esdb.h"
-
-/* ---------------------------------------------------------------------- */
-
-_CITRUS_ICONV_DECLS(iconv_std);
-_CITRUS_ICONV_DEF_OPS(iconv_std);
-
-
-/* ---------------------------------------------------------------------- */
-
-int
-_citrus_iconv_std_iconv_getops(struct _citrus_iconv_ops *ops, size_t lenops,
-			       u_int32_t expected_version)
-{
-	if (expected_version<_CITRUS_ICONV_ABI_VERSION || lenops<sizeof(*ops))
-		return (EINVAL);
-
-	memcpy(ops, &_citrus_iconv_std_iconv_ops,
-	       sizeof(_citrus_iconv_std_iconv_ops));
-
-	return (0);
-}
-
-/* ---------------------------------------------------------------------- */
-
-/*
- * convenience routines for stdenc.
- */
-static __inline void
-save_encoding_state(struct _citrus_iconv_std_encoding *se)
-{
-	if (se->se_ps)
-		memcpy(se->se_pssaved, se->se_ps,
-		       _stdenc_get_state_size(se->se_handle));
-}
-
-static __inline void
-restore_encoding_state(struct _citrus_iconv_std_encoding *se)
-{
-	if (se->se_ps)
-		memcpy(se->se_ps, se->se_pssaved,
-		       _stdenc_get_state_size(se->se_handle));
-}
-
-static __inline void
-init_encoding_state(struct _citrus_iconv_std_encoding *se)
-{
-	if (se->se_ps)
-		_stdenc_init_state(se->se_handle, se->se_ps);
-}
-
-static __inline int
-mbtocsx(struct _citrus_iconv_std_encoding *se,
-	_csid_t *csid, _index_t *idx, const char **s, size_t n,
-	size_t *nresult)
-{
-	return _stdenc_mbtocs(se->se_handle, csid, idx, s, n, se->se_ps,
-			      nresult);
-}
-
-static __inline int
-cstombx(struct _citrus_iconv_std_encoding *se,
-	char *s, size_t n, _csid_t csid, _index_t idx, size_t *nresult)
-{
-	return _stdenc_cstomb(se->se_handle, s, n, csid, idx, se->se_ps,
-			      nresult);
-}
-
-static __inline int
-wctombx(struct _citrus_iconv_std_encoding *se,
-	char *s, size_t n, _wc_t wc, size_t *nresult)
-{
-	return _stdenc_wctomb(se->se_handle, s, n, wc, se->se_ps, nresult);
-}
-
-static __inline int
-put_state_resetx(struct _citrus_iconv_std_encoding *se,
-		 char *s, size_t n, size_t *nresult)
-{
-	return _stdenc_put_state_reset(se->se_handle, s, n, se->se_ps, nresult);
-}
-
-static __inline int
-get_state_desc_gen(struct _citrus_iconv_std_encoding *se, int *rstate)
-{
-	int ret;
-	struct _stdenc_state_desc ssd;
-
-	ret = _stdenc_get_state_desc(se->se_handle, se->se_ps,
-				     _STDENC_SDID_GENERIC, &ssd);
-	if (!ret)
-		*rstate = ssd.u.generic.state;
-
-	return ret;
-}
-
-/*
- * init encoding context
- */
-static int
-init_encoding(struct _citrus_iconv_std_encoding *se, struct _stdenc *cs,
-	      void *ps1, void *ps2)
-{
-	int ret = -1;
-
-	se->se_handle = cs;
-	se->se_ps = ps1;
-	se->se_pssaved = ps2;
-
-	if (se->se_ps)
-		ret = _stdenc_init_state(cs, se->se_ps);
-	if (!ret && se->se_pssaved)
-		ret = _stdenc_init_state(cs, se->se_pssaved);
-
-	return ret;
-}
-
-static int
-open_csmapper(struct _csmapper **rcm, const char *src, const char *dst,
-	      unsigned long *rnorm)
-{
-	int ret;
-	struct _csmapper *cm;
-
-	ret = _csmapper_open(&cm, src, dst, 0, rnorm);
-	if (ret)
-		return ret;
-	if (_csmapper_get_src_max(cm) != 1 || _csmapper_get_dst_max(cm) != 1 ||
-	    _csmapper_get_state_size(cm) != 0) {
-		_csmapper_close(cm);
-		return EINVAL;
-	}
-
-	*rcm = cm;
-
-	return 0;
-}
-
-static void
-close_dsts(struct _citrus_iconv_std_dst_list *dl)
-{
-	struct _citrus_iconv_std_dst *sd;
-
-	while ((sd=TAILQ_FIRST(dl)) != NULL) {
-		TAILQ_REMOVE(dl, sd, sd_entry);
-		_csmapper_close(sd->sd_mapper);
-		free(sd);
-	}
-}
-
-static int
-open_dsts(struct _citrus_iconv_std_dst_list *dl,
-	  const struct _esdb_charset *ec, const struct _esdb *dbdst)
-{
-	int i, ret;
-	struct _citrus_iconv_std_dst *sd, *sdtmp;
-	unsigned long norm;
-
-	sd = malloc(sizeof(*sd));
-	if (sd == NULL)
-		return errno;
-
-	for (i=0; i<dbdst->db_num_charsets; i++) {
-		ret = open_csmapper(&sd->sd_mapper, ec->ec_csname,
-				    dbdst->db_charsets[i].ec_csname, &norm);
-		if (ret == 0) {
-			sd->sd_csid = dbdst->db_charsets[i].ec_csid;
-			sd->sd_norm = norm;
-			/* insert this mapper by sorted order. */
-			TAILQ_FOREACH(sdtmp, dl, sd_entry) {
-				if (sdtmp->sd_norm > norm) {
-					TAILQ_INSERT_BEFORE(sdtmp, sd,
-							    sd_entry);
-					sd = NULL;
-					break;
-				}
-			}
-			if (sd)
-				TAILQ_INSERT_TAIL(dl, sd, sd_entry);
-			sd = malloc(sizeof(*sd));
-			if (sd == NULL) {
-				ret = errno;
-				close_dsts(dl);
-				return ret;
-			}
-		} else if (ret != ENOENT) {
-			close_dsts(dl);
-			free(sd);
-			return ret;
-		}
-	}
-	free(sd);
-	return 0;
-}
-
-static void
-close_srcs(struct _citrus_iconv_std_src_list *sl)
-{
-	struct _citrus_iconv_std_src *ss;
-
-	while ((ss=TAILQ_FIRST(sl)) != NULL) {
-		TAILQ_REMOVE(sl, ss, ss_entry);
-		close_dsts(&ss->ss_dsts);
-		free(ss);
-	}
-}
-
-static int
-open_srcs(struct _citrus_iconv_std_src_list *sl,
-	  const struct _esdb *dbsrc, const struct _esdb *dbdst)
-{
-	int i, ret, count = 0;
-	struct _citrus_iconv_std_src *ss;
-
-	ss = malloc(sizeof(*ss));
-	if (ss == NULL)
-		return errno;
-
-	TAILQ_INIT(&ss->ss_dsts);
-
-	for (i=0; i<dbsrc->db_num_charsets; i++) {
-		ret = open_dsts(&ss->ss_dsts, &dbsrc->db_charsets[i], dbdst);
-		if (ret)
-			goto err;
-		if (!TAILQ_EMPTY(&ss->ss_dsts)) {
-			ss->ss_csid = dbsrc->db_charsets[i].ec_csid;
-			TAILQ_INSERT_TAIL(sl, ss, ss_entry);
-			ss = malloc(sizeof(*ss));
-			if (ss == NULL) {
-				ret = errno;
-				goto err;
-			}
-			count++;
-			TAILQ_INIT(&ss->ss_dsts);
-		}
-	}
-	free(ss);
-
-	return count ? 0 : ENOENT;
-
-err:
-	free(ss);
-	close_srcs(sl);
-	return ret;
-}
-
-/* do convert a character */
-#define E_NO_CORRESPONDING_CHAR ENOENT /* XXX */
-static int
-/*ARGSUSED*/
-do_conv(const struct _citrus_iconv_std_shared *is,
-	struct _citrus_iconv_std_context *sc, _csid_t *csid, _index_t *idx)
-{
-	_index_t tmpidx;
-	int ret;
-	struct _citrus_iconv_std_src *ss;
-	struct _citrus_iconv_std_dst *sd;
-
-	TAILQ_FOREACH(ss, &is->is_srcs, ss_entry) {
-		if (ss->ss_csid == *csid) {
-			TAILQ_FOREACH(sd, &ss->ss_dsts, sd_entry) {
-				ret = _csmapper_convert(sd->sd_mapper,
-							&tmpidx, *idx, NULL);
-				switch (ret) {
-				case _MAPPER_CONVERT_SUCCESS:
-					*csid = sd->sd_csid;
-					*idx = tmpidx;
-					return 0;
-				case _MAPPER_CONVERT_NONIDENTICAL:
-					break;
-				case _MAPPER_CONVERT_SRC_MORE:
-					/*FALLTHROUGH*/
-				case _MAPPER_CONVERT_DST_MORE:
-					/*FALLTHROUGH*/
-				case _MAPPER_CONVERT_FATAL:
-					return EINVAL;
-				case _MAPPER_CONVERT_ILSEQ:
-					return EILSEQ;
-				}
-			}
-			break;
-		}
-	}
-
-	return E_NO_CORRESPONDING_CHAR;
-}
-/* ---------------------------------------------------------------------- */
-
-static int
-/*ARGSUSED*/
-_citrus_iconv_std_iconv_init_shared(struct _citrus_iconv_shared *ci,
-				    const char * __restrict curdir,
-				    const char * __restrict src,
-				    const char * __restrict dst,
-				    const void * __restrict var, size_t lenvar)
-{
-	int ret;
-	struct _citrus_iconv_std_shared *is;
-	struct _citrus_esdb esdbsrc, esdbdst;
-
-	is = malloc(sizeof(*is));
-	if (is==NULL) {
-		ret = errno;
-		goto err0;
-	}
-	ret = _citrus_esdb_open(&esdbsrc, src);
-	if (ret)
-		goto err1;
-	ret = _citrus_esdb_open(&esdbdst, dst);
-	if (ret)
-		goto err2;
-	ret = _stdenc_open(&is->is_src_encoding, esdbsrc.db_encname,
-			   esdbsrc.db_variable, esdbsrc.db_len_variable);
-	if (ret)
-		goto err3;
-	ret = _stdenc_open(&is->is_dst_encoding, esdbdst.db_encname,
-			   esdbdst.db_variable, esdbdst.db_len_variable);
-	if (ret)
-		goto err4;
-	is->is_use_invalid = esdbdst.db_use_invalid;
-	is->is_invalid = esdbdst.db_invalid;
-
-	TAILQ_INIT(&is->is_srcs);
-	ret = open_srcs(&is->is_srcs, &esdbsrc, &esdbdst);
-	if (ret)
-		goto err5;
-
-	_esdb_close(&esdbsrc);
-	_esdb_close(&esdbdst);
-	ci->ci_closure = is;
-
-	return 0;
-
-err5:
-	_stdenc_close(is->is_dst_encoding);
-err4:
-	_stdenc_close(is->is_src_encoding);
-err3:
-	_esdb_close(&esdbdst);
-err2:
-	_esdb_close(&esdbsrc);
-err1:
-	free(is);
-err0:
-	return ret;
-}
-
-static void
-_citrus_iconv_std_iconv_uninit_shared(struct _citrus_iconv_shared *ci)
-{
-	struct _citrus_iconv_std_shared *is = ci->ci_closure;
-
-	if (is == NULL)
-		return;
-
-	_stdenc_close(is->is_src_encoding);
-	_stdenc_close(is->is_dst_encoding);
-	close_srcs(&is->is_srcs);
-	free(is);
-}
-
-static int
-_citrus_iconv_std_iconv_init_context(struct _citrus_iconv *cv)
-{
-	const struct _citrus_iconv_std_shared *is = cv->cv_shared->ci_closure;
-	struct _citrus_iconv_std_context *sc;
-	size_t szpssrc, szpsdst, sz;
-	char *ptr;
-
-	szpssrc = _stdenc_get_state_size(is->is_src_encoding);
-	szpsdst = _stdenc_get_state_size(is->is_dst_encoding);
-
-	sz = (szpssrc + szpsdst)*2 + sizeof(struct _citrus_iconv_std_context);
-	sc = malloc(sz);
-	if (sc == NULL)
-		return errno;
-
-	ptr = (char *)&sc[1];
-	if (szpssrc)
-		init_encoding(&sc->sc_src_encoding, is->is_src_encoding,
-			      ptr, ptr+szpssrc);
-	else
-		init_encoding(&sc->sc_src_encoding, is->is_src_encoding,
-			      NULL, NULL);
-	ptr += szpssrc*2;
-	if (szpsdst)
-		init_encoding(&sc->sc_dst_encoding, is->is_dst_encoding,
-			      ptr, ptr+szpsdst);
-	else
-		init_encoding(&sc->sc_dst_encoding, is->is_dst_encoding,
-			      NULL, NULL);
-
-	cv->cv_closure = (void *)sc;
-
-	return 0;
-}
-
-static void
-_citrus_iconv_std_iconv_uninit_context(struct _citrus_iconv *cv)
-{
-	free(cv->cv_closure);
-}
-
-static int
-_citrus_iconv_std_iconv_convert(struct _citrus_iconv * __restrict cv,
-				const char * __restrict * __restrict in,
-				size_t * __restrict inbytes,
-				char * __restrict * __restrict out,
-				size_t * __restrict outbytes, u_int32_t flags,
-				size_t * __restrict invalids)
-{
-	const struct _citrus_iconv_std_shared *is = cv->cv_shared->ci_closure;
-	struct _citrus_iconv_std_context *sc = cv->cv_closure;
-	_index_t idx;
-	_csid_t csid;
-	int ret, state;
-	size_t szrin, szrout;
-	size_t inval;
-	const char *tmpin;
-
-	inval = 0;
-	if (in==NULL || *in==NULL) {
-		/* special cases */
-		if (out!=NULL && *out!=NULL) {
-			/* init output state and store the shift sequence */
-			save_encoding_state(&sc->sc_src_encoding);
-			save_encoding_state(&sc->sc_dst_encoding);
-			szrout = 0;
-
-			ret = put_state_resetx(&sc->sc_dst_encoding,
-					       *out, *outbytes,
-					       &szrout);
-			if (ret)
-				goto err;
-
-			if (szrout == (size_t)-2) {
-				/* too small to store the character */
-				ret = EINVAL;
-				goto err;
-			}
-			*out += szrout;
-			*outbytes -= szrout;
-		} else
-			/* otherwise, discard the shift sequence */
-			init_encoding_state(&sc->sc_dst_encoding);
-		init_encoding_state(&sc->sc_src_encoding);
-		*invalids = 0;
-		return 0;
-	}
-
-	/* normal case */
-	for (;;) {
-		if (*inbytes==0) {
-			ret = get_state_desc_gen(&sc->sc_src_encoding, &state);
-			if (state == _STDENC_SDGEN_INITIAL ||
-			    state == _STDENC_SDGEN_STABLE)
-				break;
-		}
-
-		/* save the encoding states for the error recovery */
-		save_encoding_state(&sc->sc_src_encoding);
-		save_encoding_state(&sc->sc_dst_encoding);
-
-		/* mb -> csid/index */
-		tmpin = *in;
-		szrin = szrout = 0;
-		ret = mbtocsx(&sc->sc_src_encoding, &csid, &idx,
-			      &tmpin, *inbytes, &szrin);
-		if (ret)
-			goto err;
-
-		if (szrin == (size_t)-2) {
-			/* incompleted character */
-			ret = get_state_desc_gen(&sc->sc_src_encoding, &state);
-			if (ret) {
-				ret = EINVAL;
-				goto err;
-			}
-			switch (state) {
-			case _STDENC_SDGEN_INITIAL:
-			case _STDENC_SDGEN_STABLE:
-				/* fetch shift sequences only. */
-				goto next;
-			}
-			ret = EINVAL;
-			goto err;
-		}
-		/* convert the character */
-		ret = do_conv(is, sc, &csid, &idx);
-		if (ret) {
-			if (ret == E_NO_CORRESPONDING_CHAR) {
-				inval++;
-				szrout = 0;
-				if ((flags&_CITRUS_ICONV_F_HIDE_INVALID)==0 &&
-				    is->is_use_invalid) {
-					ret = wctombx(&sc->sc_dst_encoding,
-						      *out, *outbytes,
-						      is->is_invalid,
-						      &szrout);
-					if (ret)
-						goto err;
-				}
-				goto next;
-			} else {
-				goto err;
-			}
-		}
-		/* csid/index -> mb */
-		ret = cstombx(&sc->sc_dst_encoding,
-			      *out, *outbytes, csid, idx, &szrout);
-		if (ret)
-			goto err;
-next:
-		_DIAGASSERT(*inbytes>=szrin && *outbytes>=szrout);
-		*inbytes -= tmpin-*in; /* szrin is insufficient on \0. */
-		*in = tmpin;
-		*outbytes -= szrout;
-		*out += szrout;
-	}
-	*invalids = inval;
-
-	return 0;
-
-err:
-	restore_encoding_state(&sc->sc_src_encoding);
-	restore_encoding_state(&sc->sc_dst_encoding);
-err_norestore:
-	*invalids = inval;
-
-	return ret;
-}
diff --git a/lib/libc/citrus/modules/citrus_iconv_std.h b/lib/libc/citrus/modules/citrus_iconv_std.h
deleted file mode 100644
index c1d43018a..000000000
--- a/lib/libc/citrus/modules/citrus_iconv_std.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: citrus_iconv_std.h,v 1.1 2003/06/25 09:51:44 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_ICONV_STD_H_
-#define _CITRUS_ICONV_STD_H_
-
-#include "citrus_iconv_std_local.h"
-
-_CITRUS_ICONV_GETOPS_FUNC(iconv_std);
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_iconv_std_local.h b/lib/libc/citrus/modules/citrus_iconv_std_local.h
deleted file mode 100644
index 4b0f583dd..000000000
--- a/lib/libc/citrus/modules/citrus_iconv_std_local.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*	$NetBSD: citrus_iconv_std_local.h,v 1.2 2003/07/01 09:42:16 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_ICONV_STD_LOCAL_H_
-#define _CITRUS_ICONV_STD_LOCAL_H_
-
-/*
- * encoding
- */
-struct _citrus_iconv_std_encoding {
-	struct _citrus_stdenc	*se_handle;
-	void			*se_ps;
-	void			*se_pssaved;
-};
-
-/*
- * dst
- */
-struct _citrus_iconv_std_dst {
-	TAILQ_ENTRY(_citrus_iconv_std_dst)	sd_entry;
-	_citrus_csid_t				sd_csid;
-	unsigned long				sd_norm;
-	struct _citrus_csmapper			*sd_mapper;
-};
-TAILQ_HEAD(_citrus_iconv_std_dst_list, _citrus_iconv_std_dst);
-
-/*
- * src
- */
-struct _citrus_iconv_std_src {
-	TAILQ_ENTRY(_citrus_iconv_std_src)	ss_entry;
-	_citrus_csid_t				ss_csid;
-	struct _citrus_iconv_std_dst_list	ss_dsts;
-};
-TAILQ_HEAD(_citrus_iconv_std_src_list, _citrus_iconv_std_src);
-
-/*
- * iconv_std handle
- */
-struct _citrus_iconv_std_shared {
-	struct _citrus_stdenc			*is_src_encoding;
-	struct _citrus_stdenc			*is_dst_encoding;
-	struct _citrus_iconv_std_src_list	is_srcs;
-	int					is_use_invalid;
-	_citrus_wc_t				is_invalid;
-};
-
-/*
- * iconv_std context
- */
-struct _citrus_iconv_std_context {
-	struct _citrus_iconv_std_encoding	sc_src_encoding;
-	struct _citrus_iconv_std_encoding	sc_dst_encoding;
-};
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_iso2022.c b/lib/libc/citrus/modules/citrus_iso2022.c
deleted file mode 100644
index 0b3a0a801..000000000
--- a/lib/libc/citrus/modules/citrus_iso2022.c
+++ /dev/null
@@ -1,1349 +0,0 @@
-/*	$NetBSD: citrus_iso2022.c,v 1.23 2013/05/28 16:57:56 joerg Exp $	*/
-
-/*-
- * Copyright (c)1999, 2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Citrus: xpg4dl/FreeBSD/lib/libc/locale/iso2022.c,v 1.23 2001/06/21 01:51:44 yamt Exp $
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_iso2022.c,v 1.23 2013/05/28 16:57:56 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <wchar.h>
-#include <sys/types.h>
-#include <limits.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_stdenc.h"
-#include "citrus_iso2022.h"
-
-
-/* ----------------------------------------------------------------------
- * private stuffs used by templates
- */
-
-
-/*
- * wchar_t mappings:
- * ASCII (ESC ( B)		00000000 00000000 00000000 0xxxxxxx
- * iso-8859-1 (ESC , A)		00000000 00000000 00000000 1xxxxxxx
- * 94 charset (ESC ( F)		0fffffff 00000000 00000000 0xxxxxxx
- * 94 charset (ESC ( M F)	0fffffff 1mmmmmmm 00000000 0xxxxxxx
- * 96 charset (ESC , F)		0fffffff 00000000 00000000 1xxxxxxx
- * 96 charset (ESC , M F)	0fffffff 1mmmmmmm 00000000 1xxxxxxx
- * 94x94 charset (ESC $ ( F)	0fffffff 00000000 0xxxxxxx 0xxxxxxx
- * 96x96 charset (ESC $ , F)	0fffffff 00000000 0xxxxxxx 1xxxxxxx
- * 94x94 charset (ESC & V ESC $ ( F)
- *				0fffffff 1vvvvvvv 0xxxxxxx 0xxxxxxx
- * 94x94x94 charset (ESC $ ( F)	0fffffff 0xxxxxxx 0xxxxxxx 0xxxxxxx
- * 96x96x96 charset (ESC $ , F)	0fffffff 0xxxxxxx 0xxxxxxx 1xxxxxxx
- * reserved for UCS4 co-existence (UCS4 is 31bit encoding thanks to mohta bit)
- *				1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx
- */
-
-typedef struct {
-	u_char	type;
-#define	CS94		(0U)
-#define	CS96		(1U)
-#define	CS94MULTI	(2U)
-#define	CS96MULTI	(3U)
-
-	u_char	final;
-	u_char	interm;
-	u_char	vers;
-} _ISO2022Charset;
-
-static const _ISO2022Charset ascii    = { CS94, 'B', '\0', '\0' };
-static const _ISO2022Charset iso88591 = { CS96, 'A', '\0', '\0' };
-
-typedef struct {
-	_ISO2022Charset	g[4];
-	/* need 3 bits to hold -1, 0, ..., 3 */
-	int	gl:3,
-		gr:3,
-		singlegl:3,
-		singlegr:3;
-	char ch[7];	/* longest escape sequence (ESC & V ESC $ ( F) */
-	int chlen;
-	int flags;
-#define _ISO2022STATE_FLAG_INITIALIZED	1
-} _ISO2022State;
-
-typedef struct {
-	_ISO2022Charset	*recommend[4];
-	size_t	recommendsize[4];
-	_ISO2022Charset	initg[4];
-	int	maxcharset;
-	int	flags;
-#define	F_8BIT	0x0001
-#define	F_NOOLD	0x0002
-#define	F_SI	0x0010	/*0F*/
-#define	F_SO	0x0020	/*0E*/
-#define	F_LS0	0x0010	/*0F*/
-#define	F_LS1	0x0020	/*0E*/
-#define	F_LS2	0x0040	/*ESC n*/
-#define	F_LS3	0x0080	/*ESC o*/
-#define	F_LS1R	0x0100	/*ESC ~*/
-#define	F_LS2R	0x0200	/*ESC }*/
-#define	F_LS3R	0x0400	/*ESC |*/
-#define	F_SS2	0x0800	/*ESC N*/
-#define	F_SS3	0x1000	/*ESC O*/
-#define	F_SS2R	0x2000	/*8E*/
-#define	F_SS3R	0x4000	/*8F*/
-} _ISO2022EncodingInfo;
-typedef struct {
-	_ISO2022EncodingInfo ei;
-	struct {
-		/* for future multi-locale facility */
-		_ISO2022State	s_mblen;
-		_ISO2022State	s_mbrlen;
-		_ISO2022State	s_mbrtowc;
-		_ISO2022State	s_mbtowc;
-		_ISO2022State	s_mbsrtowcs;
-		_ISO2022State	s_mbsnrtowcs;
-		_ISO2022State	s_wcrtomb;
-		_ISO2022State	s_wcsrtombs;
-		_ISO2022State	s_wcsnrtombs;
-		_ISO2022State	s_wctomb;
-	} states;
-} _ISO2022CTypeInfo;
-
-#define _CEI_TO_EI(_cei_)		(&(_cei_)->ei)
-#define _CEI_TO_STATE(_cei_, _func_)	(_cei_)->states.s_##_func_
-
-#define _FUNCNAME(m)			_citrus_ISO2022_##m
-#define _ENCODING_INFO			_ISO2022EncodingInfo
-#define _CTYPE_INFO			_ISO2022CTypeInfo
-#define _ENCODING_STATE			_ISO2022State
-#define _ENCODING_MB_CUR_MAX(_ei_)	MB_LEN_MAX
-#define _ENCODING_IS_STATE_DEPENDENT	1
-#define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	\
-    (!((_ps_)->flags & _ISO2022STATE_FLAG_INITIALIZED))
-
-
-#define _ISO2022INVALID (wchar_t)-1
-
-static __inline int isc0(__uint8_t x) { return ((x & 0x1f) == x); }
-static __inline int isc1(__uint8_t x) { return (0x80 <= x && x <= 0x9f); }
-static __inline int iscntl(__uint8_t x) { return (isc0(x) || isc1(x) || x == 0x7f); }
-static __inline int is94(__uint8_t x) { return (0x21 <= x && x <= 0x7e); }
-static __inline int is96(__uint8_t x) { return (0x20 <= x && x <= 0x7f); }
-static __inline int isecma(__uint8_t x) { return (0x30 <= x && x <= 0x7f); }
-static __inline int isinterm(__uint8_t x) { return (0x20 <= x && x <= 0x2f); }
-static __inline int isthree(__uint8_t x) { return (0x60 <= x && x <= 0x6f); }
-
-static __inline int
-getcs(const char * __restrict p, _ISO2022Charset * __restrict cs)
-{
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(cs != NULL);
-
-	if (!strncmp(p, "94$", 3) && p[3] && !p[4]) {
-		cs->final = (u_char)(p[3] & 0xff);
-		cs->interm = '\0';
-		cs->vers = '\0';
-		cs->type = CS94MULTI;
-	} else if (!strncmp(p, "96$", 3) && p[3] && !p[4]) {
-		cs->final = (u_char)(p[3] & 0xff);
-		cs->interm = '\0';
-		cs->vers = '\0';
-		cs->type = CS96MULTI;
-	} else if (!strncmp(p, "94", 2) && p[2] && !p[3]) {
-		cs->final = (u_char)(p[2] & 0xff);
-		cs->interm = '\0';
-		cs->vers = '\0';
-		cs->type = CS94;
-	} else if (!strncmp(p, "96", 2) && p[2] && !p[3]) {
-		cs->final = (u_char )(p[2] & 0xff);
-		cs->interm = '\0';
-		cs->vers = '\0';
-		cs->type = CS96;
-	} else {
-		return 1;
-	}
-
-	return 0;
-}
-
-
-#define _NOTMATCH	0
-#define _MATCH		1
-#define _PARSEFAIL	2
-
-static __inline int
-get_recommend(_ISO2022EncodingInfo * __restrict ei,
-	      const char * __restrict token)
-{
-	int i;
-	_ISO2022Charset cs, *p;
-
-	if (!strchr("0123", token[0]) || token[1] != '=')
-		return (_NOTMATCH);
-
-	if (getcs(&token[2], &cs) == 0)
-		;
-	else if (!strcmp(&token[2], "94")) {
-		cs.final = (u_char)(token[4]);
-		cs.interm = '\0';
-		cs.vers = '\0';
-		cs.type = CS94;
-	} else if (!strcmp(&token[2], "96")) {
-		cs.final = (u_char)(token[4]);
-		cs.interm = '\0';
-		cs.vers = '\0';
-		cs.type = CS96;
-	} else if (!strcmp(&token[2], "94$")) {
-		cs.final = (u_char)(token[5]);
-		cs.interm = '\0';
-		cs.vers = '\0';
-		cs.type = CS94MULTI;
-	} else if (!strcmp(&token[2], "96$")) {
-		cs.final = (u_char)(token[5]);
-		cs.interm = '\0';
-		cs.vers = '\0';
-		cs.type = CS96MULTI;
-	} else {
-		return (_PARSEFAIL);
-	}
-
-	i = token[0] - '0';
-	if (!ei->recommend[i]) {
-		ei->recommend[i] = malloc(sizeof(_ISO2022Charset));
-	} else {
-		p = realloc(ei->recommend[i],
-		    sizeof(_ISO2022Charset) * (ei->recommendsize[i] + 1));
-		if (!p)
-			return (_PARSEFAIL);
-		ei->recommend[i] = p;
-	}
-	if (!ei->recommend[i])
-		return (_PARSEFAIL);
-	ei->recommendsize[i]++;
-
-	(ei->recommend[i] + (ei->recommendsize[i] - 1))->final = cs.final;
-	(ei->recommend[i] + (ei->recommendsize[i] - 1))->interm = cs.interm;
-	(ei->recommend[i] + (ei->recommendsize[i] - 1))->vers = cs.vers;
-	(ei->recommend[i] + (ei->recommendsize[i] - 1))->type = cs.type;
-
-	return (_MATCH);
-}
-
-static __inline int
-get_initg(_ISO2022EncodingInfo * __restrict ei,
-	  const char * __restrict token)
-{
-	_ISO2022Charset cs;
-
-	if (strncmp("INIT", &token[0], 4) ||
-	    !strchr("0123", token[4]) ||
-	    token[5] != '=')
-		return (_NOTMATCH);
-
-	if (getcs(&token[6], &cs) != 0)
-		return (_PARSEFAIL);
-
-	ei->initg[token[4] - '0'].type = cs.type;
-	ei->initg[token[4] - '0'].final = cs.final;
-	ei->initg[token[4] - '0'].interm = cs.interm;
-	ei->initg[token[4] - '0'].vers = cs.vers;
-
-	return (_MATCH);
-}
-
-static __inline int
-get_max(_ISO2022EncodingInfo * __restrict ei,
-	const char * __restrict token)
-{
-	if (!strcmp(token, "MAX1")) {
-		ei->maxcharset = 1;
-	} else if (!strcmp(token, "MAX2")) {
-		ei->maxcharset = 2;
-	} else if (!strcmp(token, "MAX3")) {
-		ei->maxcharset = 3;
-	} else
-		return (_NOTMATCH);
-
-	return (_MATCH);
-}
-
-
-static __inline int
-get_flags(_ISO2022EncodingInfo * __restrict ei,
-	  const char * __restrict token)
-{
-	int i;
-	static struct {
-		const char	*tag;
-		int		flag;
-	} const tags[] = {
-		{ "DUMMY",	0	},
-		{ "8BIT",	F_8BIT	},
-		{ "NOOLD",	F_NOOLD	},
-		{ "SI",		F_SI	},
-		{ "SO",		F_SO	},
-		{ "LS0",	F_LS0	},
-		{ "LS1",	F_LS1	},
-		{ "LS2",	F_LS2	},
-		{ "LS3",	F_LS3	},
-		{ "LS1R",	F_LS1R	},
-		{ "LS2R",	F_LS2R	},
-		{ "LS3R",	F_LS3R	},
-		{ "SS2",	F_SS2	},
-		{ "SS3",	F_SS3	},
-		{ "SS2R",	F_SS2R	},
-		{ "SS3R",	F_SS3R	},
-		{ NULL,		0 }
-	};
-
-	for (i = 0; tags[i].tag; i++) {
-		if (!strcmp(token, tags[i].tag)) {
-			ei->flags |= tags[i].flag;
-			return (_MATCH);
-		}
-	}
-
-	return (_NOTMATCH);
-}
-
-
-static __inline int
-_citrus_ISO2022_parse_variable(_ISO2022EncodingInfo * __restrict ei,
-			       const void * __restrict var, size_t lenvar)
-{
-	char const *v, *e;
-	char buf[20];
-	int i, len, ret;
-
-	_DIAGASSERT(ei != NULL);
-
-
-	/*
-	 * parse VARIABLE section.
-	 */
-
-	if (!var)
-		return (EFTYPE);
-
-	v = (const char *) var;
-
-	/* initialize structure */
-	ei->maxcharset = 0;
-	for (i = 0; i < 4; i++) {
-		ei->recommend[i] = NULL;
-		ei->recommendsize[i] = 0;
-	}
-	ei->flags = 0;
-
-	while (*v) {
-		while (*v == ' ' || *v == '\t')
-			++v;
-
-		/* find the token */
-		e = v;
-		while (*e && *e != ' ' && *e != '\t')
-			++e;
-
-		len = e-v;
-		if (len == 0)
-			break;
-		if (len>=sizeof(buf))
-			goto parsefail;
-		snprintf(buf, sizeof(buf), "%.*s", len, v);
-
-		if ((ret = get_recommend(ei, buf)) != _NOTMATCH)
-			;
-		else if ((ret = get_initg(ei, buf)) != _NOTMATCH)
-			;
-		else if ((ret = get_max(ei, buf)) != _NOTMATCH)
-			;
-		else if ((ret = get_flags(ei, buf)) != _NOTMATCH)
-			;
-		else
-			ret = _PARSEFAIL;
-		if (ret==_PARSEFAIL)
-			goto parsefail;
-		v = e;
-
-	}
-
-	return (0);
-
-parsefail:
-	free(ei->recommend[0]);
-	free(ei->recommend[1]);
-	free(ei->recommend[2]);
-	free(ei->recommend[3]);
-
-	return (EFTYPE);
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_ISO2022_init_state(_ISO2022EncodingInfo * __restrict ei,
-			   _ISO2022State * __restrict s)
-{
-	int i;
-
-	memset(s, 0, sizeof(*s));
-	s->gl = 0;
-	s->gr = (ei->flags & F_8BIT) ? 1 : -1;
-
-	for (i = 0; i < 4; i++) {
-		if (ei->initg[i].final) {
-			s->g[i].type = ei->initg[i].type;
-			s->g[i].final = ei->initg[i].final;
-			s->g[i].interm = ei->initg[i].interm;
-		}
-	}
-	s->singlegl = s->singlegr = -1;
-	s->flags |= _ISO2022STATE_FLAG_INITIALIZED;
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_ISO2022_pack_state(_ISO2022EncodingInfo * __restrict ei,
-			   void * __restrict pspriv,
-			   const _ISO2022State * __restrict s)
-{
-	memcpy(pspriv, (const void *)s, sizeof(*s));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_ISO2022_unpack_state(_ISO2022EncodingInfo * __restrict ei,
-			     _ISO2022State * __restrict s,
-			     const void * __restrict pspriv)
-{
-	memcpy((void *)s, pspriv, sizeof(*s));
-}
-
-static int
-/*ARGSUSED*/
-_citrus_ISO2022_encoding_module_init(_ISO2022EncodingInfo * __restrict ei,
-				     const void * __restrict var,
-				     size_t lenvar)
-{
-
-	_DIAGASSERT(ei != NULL);
-
-	return _citrus_ISO2022_parse_variable(ei, var, lenvar);
-}
-
-static void
-/*ARGSUSED*/
-_citrus_ISO2022_encoding_module_uninit(_ISO2022EncodingInfo *ei)
-{
-}
-
-#define	ESC	'\033'
-#define	ECMA	-1
-#define	INTERM	-2
-#define	OECMA	-3
-static const struct seqtable {
-	int type;
-	int csoff;
-	int finaloff;
-	int intermoff;
-	int versoff;
-	int len;
-	int chars[10];
-} seqtable[] = {
-	/* G0 94MULTI special */
-	{ CS94MULTI, -1, 2, -1, -1,	3, { ESC, '$', OECMA }, },
-	/* G0 94MULTI special with version identification */
-	{ CS94MULTI, -1, 5, -1, 2,	6, { ESC, '&', ECMA, ESC, '$', OECMA }, },
-	/* G? 94 */
-	{ CS94, 1, 2, -1, -1,		3, { ESC, CS94, ECMA, }, },
-	/* G? 94 with 2nd intermediate char */
-	{ CS94, 1, 3, 2, -1,		4, { ESC, CS94, INTERM, ECMA, }, },
-	/* G? 96 */
-	{ CS96, 1, 2, -1, -1,		3, { ESC, CS96, ECMA, }, },
-	/* G? 96 with 2nd intermediate char */
-	{ CS96, 1, 3, 2, -1,		4, { ESC, CS96, INTERM, ECMA, }, },
-	/* G? 94MULTI */
-	{ CS94MULTI, 2, 3, -1, -1,	4, { ESC, '$', CS94, ECMA, }, },
-	/* G? 96MULTI */
-	{ CS96MULTI, 2, 3, -1, -1,	4, { ESC, '$', CS96, ECMA, }, },
-	/* G? 94MULTI with version specification */
-	{ CS94MULTI, 5, 6, -1, 2,	7, { ESC, '&', ECMA, ESC, '$', CS94, ECMA, }, },
-	/* LS2/3 */
-	{ -1, -1, -1, -1, -1,		2, { ESC, 'n', }, },
-	{ -1, -1, -1, -1, -1,		2, { ESC, 'o', }, },
-	/* LS1/2/3R */
-	{ -1, -1, -1, -1, -1,		2, { ESC, '~', }, },
-	{ -1, -1, -1, -1, -1,		2, { ESC, /*{*/ '}', }, },
-	{ -1, -1, -1, -1, -1,		2, { ESC, '|', }, },
-	/* SS2/3 */
-	{ -1, -1, -1, -1, -1,		2, { ESC, 'N', }, },
-	{ -1, -1, -1, -1, -1,		2, { ESC, 'O', }, },
-	/* end of records */
-	{ 0, }
-};
-
-static int
-seqmatch(const char * __restrict s, size_t n,
-	 const struct seqtable * __restrict sp)
-{
-	const int *p;
-
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(sp != NULL);
-
-	p = sp->chars;
-	while (p - sp->chars < n && p - sp->chars < sp->len) {
-		switch (*p) {
-		case ECMA:
-			if (!isecma(*s))
-				goto terminate;
-			break;
-		case OECMA:
-			if (*s && strchr("@AB", *s))
-				break;
-			else
-				goto terminate;
-		case INTERM:
-			if (!isinterm(*s))
-				goto terminate;
-			break;
-		case CS94:
-			if (*s && strchr("()*+", *s))
-				break;
-			else
-				goto terminate;
-		case CS96:
-			if (*s && strchr(",-./", *s))
-				break;
-			else
-				goto terminate;
-		default:
-			if (*s != *p)
-				goto terminate;
-			break;
-		}
-
-		p++;
-		s++;
-	}
-
-terminate:
-	return p - sp->chars;
-}
-
-static wchar_t
-_ISO2022_sgetwchar(_ISO2022EncodingInfo * __restrict ei,
-		const char * __restrict string, size_t n,
-		const char ** __restrict result,
-		_ISO2022State * __restrict psenc)
-{
-	wchar_t wchar = 0;
-	int cur;
-	const struct seqtable *sp;
-	int nmatch;
-	int i;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(string != NULL);
-	/* result may be NULL */
-
-	while (1) {
-		/* SI/SO */
-		if (1 <= n && string[0] == '\017') {
-			psenc->gl = 0;
-			string++;
-			n--;
-			continue;
-		}
-		if (1 <= n && string[0] == '\016') {
-			psenc->gl = 1;
-			string++;
-			n--;
-			continue;
-		}
-
-		/* SS2/3R */
-		if (1 <= n && string[0] && strchr("\217\216", string[0])) {
-			psenc->singlegl = psenc->singlegr =
-			    (string[0] - '\216') + 2;
-			string++;
-			n--;
-			continue;
-		}
-
-		/* eat the letter if this is not ESC */
-		if (1 <= n && string[0] != '\033')
-			break;
-
-		/* look for a perfect match from escape sequences */
-		for (sp = &seqtable[0]; sp->len; sp++) {
-			nmatch = seqmatch(string, n, sp);
-			if (sp->len == nmatch && n >= sp->len)
-				break;
-		}
-
-		if (!sp->len)
-			goto notseq;
-
-		if (sp->type != -1) {
-			if (sp->csoff == -1)
-				i = 0;
-			else {
-				switch (sp->type) {
-				case CS94:
-				case CS94MULTI:
-					i = string[sp->csoff] - '(';
-					break;
-				case CS96:
-				case CS96MULTI:
-					i = string[sp->csoff] - ',';
-					break;
-				default:
-					return (_ISO2022INVALID);
-				}
-			}
-			psenc->g[i].type = sp->type;
-			psenc->g[i].final = '\0';
-			psenc->g[i].interm = '\0';
-			psenc->g[i].vers = '\0';
-			/* sp->finaloff must not be -1 */
-			if (sp->finaloff != -1)
-				psenc->g[i].final = string[sp->finaloff];
-			if (sp->intermoff != -1)
-				psenc->g[i].interm = string[sp->intermoff];
-			if (sp->versoff != -1)
-				psenc->g[i].vers = string[sp->versoff];
-
-			string += sp->len;
-			n -= sp->len;
-			continue;
-		}
-
-		/* LS2/3 */
-		if (2 <= n && string[0] == '\033'
-		 && string[1] && strchr("no", string[1])) {
-			psenc->gl = string[1] - 'n' + 2;
-			string += 2;
-			n -= 2;
-			continue;
-		}
-
-		/* LS1/2/3R */
-			/* XXX: { for vi showmatch */
-		if (2 <= n && string[0] == '\033'
-		 && string[1] && strchr("~}|", string[1])) {
-			psenc->gr = 3 - (string[1] - '|');
-			string += 2;
-			n -= 2;
-			continue;
-		}
-
-		/* SS2/3 */
-		if (2 <= n && string[0] == '\033'
-		 && string[1] && strchr("NO", string[1])) {
-			psenc->singlegl = (string[1] - 'N') + 2;
-			string += 2;
-			n -= 2;
-			continue;
-		}
-
-	notseq:
-		/*
-		 * if we've got an unknown escape sequence, eat the ESC at the
-		 * head.  otherwise, wait till full escape sequence comes.
-		 */
-		for (sp = &seqtable[0]; sp->len; sp++) {
-			nmatch = seqmatch(string, n, sp);
-			if (!nmatch)
-				continue;
-
-			/*
-			 * if we are in the middle of escape sequence,
-			 * we still need to wait for more characters to come
-			 */
-			if (n < sp->len) {
-				if (nmatch == n) {
-					if (result)
-						*result = string;
-					return (_ISO2022INVALID);
-				}
-			} else {
-				if (nmatch == sp->len) {
-					/* this case should not happen */
-					goto eat;
-				}
-			}
-		}
-
-		break;
-	}
-
-eat:
-	/* no letter to eat */
-	if (n < 1) {
-		if (result)
-			*result = string;
-		return (_ISO2022INVALID);
-	}
-
-	/* normal chars.  always eat C0/C1 as is. */
-	if (iscntl(*string & 0xff))
-		cur = -1;
-	else if (*string & 0x80) {
-		cur = (psenc->singlegr == -1)
-			? psenc->gr : psenc->singlegr;
-	} else {
-		cur = (psenc->singlegl == -1)
-			? psenc->gl : psenc->singlegl;
-	}
-
-	if (cur == -1) {
-asis:
-		wchar = *string++ & 0xff;
-		if (result)
-			*result = string;
-		/* reset single shift state */
-		psenc->singlegr = psenc->singlegl = -1;
-		return wchar;
-	}
-
-	/* length error check */
-	switch (psenc->g[cur].type) {
-	case CS94MULTI:
-	case CS96MULTI:
-		if (!isthree(psenc->g[cur].final)) {
-			if (2 <= n
-			 && (string[0] & 0x80) == (string[1] & 0x80))
-				break;
-		} else {
-			if (3 <= n
-			 && (string[0] & 0x80) == (string[1] & 0x80)
-			 && (string[0] & 0x80) == (string[2] & 0x80))
-				break;
-		}
-
-		/* we still need to wait for more characters to come */
-		if (result)
-			*result = string;
-		return (_ISO2022INVALID);
-
-	case CS94:
-	case CS96:
-		if (1 <= n)
-			break;
-
-		/* we still need to wait for more characters to come */
-		if (result)
-			*result = string;
-		return (_ISO2022INVALID);
-	}
-
-	/* range check */
-	switch (psenc->g[cur].type) {
-	case CS94:
-		if (!(is94(string[0] & 0x7f)))
-			goto asis;
-	case CS96:
-		if (!(is96(string[0] & 0x7f)))
-			goto asis;
-		break;
-	case CS94MULTI:
-		if (!(is94(string[0] & 0x7f) && is94(string[1] & 0x7f)))
-			goto asis;
-		break;
-	case CS96MULTI:
-		if (!(is96(string[0] & 0x7f) && is96(string[1] & 0x7f)))
-			goto asis;
-		break;
-	}
-
-	/* extract the character. */
-	switch (psenc->g[cur].type) {
-	case CS94:
-		/* special case for ASCII. */
-		if (psenc->g[cur].final == 'B' && !psenc->g[cur].interm) {
-			wchar = *string++;
-			wchar &= 0x7f;
-			break;
-		}
-		wchar = psenc->g[cur].final;
-		wchar = (wchar << 8);
-		wchar |= (psenc->g[cur].interm ? (0x80 | psenc->g[cur].interm) : 0);
-		wchar = (wchar << 8);
-		wchar = (wchar << 8) | (*string++ & 0x7f);
-		break;
-	case CS96:
-		/* special case for ISO-8859-1. */
-		if (psenc->g[cur].final == 'A' && !psenc->g[cur].interm) {
-			wchar = *string++;
-			wchar &= 0x7f;
-			wchar |= 0x80;
-			break;
-		}
-		wchar = psenc->g[cur].final;
-		wchar = (wchar << 8);
-		wchar |= (psenc->g[cur].interm ? (0x80 | psenc->g[cur].interm) : 0);
-		wchar = (wchar << 8);
-		wchar = (wchar << 8) | (*string++ & 0x7f);
-		wchar |= 0x80;
-		break;
-	case CS94MULTI:
-	case CS96MULTI:
-		wchar = psenc->g[cur].final;
-		wchar = (wchar << 8);
-		if (isthree(psenc->g[cur].final))
-			wchar |= (*string++ & 0x7f);
-		wchar = (wchar << 8) | (*string++ & 0x7f);
-		wchar = (wchar << 8) | (*string++ & 0x7f);
-		if (psenc->g[cur].type == CS96MULTI)
-			wchar |= 0x80;
-		break;
-	}
-
-	if (result)
-		*result = string;
-	/* reset single shift state */
-	psenc->singlegr = psenc->singlegl = -1;
-	return wchar;
-}
-
-
-
-static int
-_citrus_ISO2022_mbrtowc_priv(_ISO2022EncodingInfo * __restrict ei,
-			     wchar_t * __restrict pwc,
-			     const char ** __restrict s,
-			     size_t n, _ISO2022State * __restrict psenc,
-			     size_t * __restrict nresult)
-{
-	wchar_t wchar;
-	const char *s0, *p, *result;
-	int c;
-	int chlenbak;
-
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(s != NULL);
-
-	if (*s == NULL) {
-		_citrus_ISO2022_init_state(ei, psenc);
-		*nresult = _ENCODING_IS_STATE_DEPENDENT;
-		return 0;
-	}
-	s0 = *s;
-	c = 0;
-	chlenbak = psenc->chlen;
-
-	/*
-	 * if we have something in buffer, use that.
-	 * otherwise, skip here
-	 */
-	if (psenc->chlen < 0 || psenc->chlen > sizeof(psenc->ch)) {
-		/* illgeal state */
-		_citrus_ISO2022_init_state(ei, psenc);
-		goto encoding_error;
-	}
-	if (psenc->chlen == 0)
-		goto emptybuf;
-
-	/* buffer is not empty */
-	p = psenc->ch;
-	while (psenc->chlen < sizeof(psenc->ch)) {
-		if (n > 0) {
-			psenc->ch[psenc->chlen++] = *s0++;
-			n--;
-		}
-
-		wchar = _ISO2022_sgetwchar(ei, p, psenc->chlen - (p-psenc->ch),
-					   &result, psenc);
-		c += result - p;
-		if (wchar != _ISO2022INVALID) {
-			if (psenc->chlen > c)
-				memmove(psenc->ch, result, psenc->chlen - c);
-			if (psenc->chlen < c)
-				psenc->chlen = 0;
-			else
-				psenc->chlen -= c;
-			goto output;
-		}
-
-		if (n == 0) {
-			if ((result - p) == psenc->chlen)
-				/* complete shift sequence. */
-				psenc->chlen = 0;
-			goto restart;
-		}
-
-		p = result;
-	}
-
-	/* escape sequence too long? */
-	goto encoding_error;
-
-emptybuf:
-	wchar = _ISO2022_sgetwchar(ei, s0, n, &result, psenc);
-	if (wchar != _ISO2022INVALID) {
-		c += result - s0;
-		psenc->chlen = 0;
-		s0 = result;
-		goto output;
-	}
-	if (result > s0) {
-		c += (result - s0);
-		n -= (result - s0);
-		s0 = result;
-		if (n>0)
-			goto emptybuf;
-		/* complete shift sequence. */
-		goto restart;
-	}
-	n += c;
-	if (n < sizeof(psenc->ch)) {
-		memcpy(psenc->ch, s0 - c, n);
-		psenc->chlen = n;
-		s0 = result;
-		goto restart;
-	}
-
-	/* escape sequence too long? */
-
-encoding_error:
-	psenc->chlen = 0;
-	*nresult = (size_t)-1;
-	return (EILSEQ);
-
-output:
-	*s = s0;
-	if (pwc)
-		*pwc = wchar;
-
-	if (!wchar)
-		*nresult = 0;
-	else
-		*nresult = c - chlenbak;
-
-	return (0);
-
-restart:
-	*s = s0;
-	*nresult = (size_t)-2;
-
-	return (0);
-}
-
-static int
-recommendation(_ISO2022EncodingInfo * __restrict ei,
-	       _ISO2022Charset * __restrict cs)
-{
-	int i, j;
-	_ISO2022Charset *recommend;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(cs != NULL);
-
-	/* first, try a exact match. */
-	for (i = 0; i < 4; i++) {
-		recommend = ei->recommend[i];
-		for (j = 0; j < ei->recommendsize[i]; j++) {
-			if (cs->type != recommend[j].type)
-				continue;
-			if (cs->final != recommend[j].final)
-				continue;
-			if (cs->interm != recommend[j].interm)
-				continue;
-
-			return i;
-		}
-	}
-
-	/* then, try a wildcard match over final char. */
-	for (i = 0; i < 4; i++) {
-		recommend = ei->recommend[i];
-		for (j = 0; j < ei->recommendsize[i]; j++) {
-			if (cs->type != recommend[j].type)
-				continue;
-			if (cs->final && (cs->final != recommend[j].final))
-				continue;
-			if (cs->interm && (cs->interm != recommend[j].interm))
-				continue;
-
-			return i;
-		}
-	}
-
-	/* there's no recommendation. make a guess. */
-	if (ei->maxcharset == 0) {
-		return 0;
-	} else {
-		switch (cs->type) {
-		case CS94:
-		case CS94MULTI:
-			return 0;
-		case CS96:
-		case CS96MULTI:
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static int
-_ISO2022_sputwchar(_ISO2022EncodingInfo * __restrict ei, wchar_t wc,
-		   char * __restrict string, size_t n,
-		   char ** __restrict result,
-		   _ISO2022State * __restrict psenc,
-		   size_t * __restrict nresult)
-{
-	int i = 0;
-	size_t len;
-	_ISO2022Charset cs;
-	char *p;
-	char tmp[MB_LEN_MAX];
-	int target;
-	u_char mask;
-	int bit8;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(string != NULL);
-	/* result may be NULL */
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	if (isc0(wc & 0xff)) {
-		/* go back to INIT0 or ASCII on control chars */
-		cs = ei->initg[0].final ? ei->initg[0] : ascii;
-	} else if (isc1(wc & 0xff)) {
-		/* go back to INIT1 or ISO-8859-1 on control chars */
-		cs = ei->initg[1].final ? ei->initg[1] : iso88591;
-	} else if (!(wc & ~0xff)) {
-		if (wc & 0x80) {
-			/* special treatment for ISO-8859-1 */
-			cs = iso88591;
-		} else {
-			/* special treatment for ASCII */
-			cs = ascii;
-		}
-	} else {
-		cs.final = (wc >> 24) & 0x7f;
-		if ((wc >> 16) & 0x80)
-			cs.interm = (wc >> 16) & 0x7f;
-		else
-			cs.interm = '\0';
-		if (wc & 0x80)
-			cs.type = (wc & 0x00007f00) ? CS96MULTI : CS96;
-		else
-			cs.type = (wc & 0x00007f00) ? CS94MULTI : CS94;
-	}
-	target = recommendation(ei, &cs);
-	p = tmp;
-	bit8 = ei->flags & F_8BIT;
-
-	/* designate the charset onto the target plane(G0/1/2/3). */
-	if (psenc->g[target].type == cs.type
-	 && psenc->g[target].final == cs.final
-	 && psenc->g[target].interm == cs.interm)
-		goto planeok;
-
-	*p++ = '\033';
-	if (cs.type == CS94MULTI || cs.type == CS96MULTI)
-		*p++ = '$';
-	if (target == 0 && cs.type == CS94MULTI && strchr("@AB", cs.final)
-	 && !cs.interm && !(ei->flags & F_NOOLD))
-		;
-	else if (cs.type == CS94 || cs.type == CS94MULTI)
-		*p++ = "()*+"[target];
-	else
-		*p++ = ",-./"[target];
-	if (cs.interm)
-		*p++ = cs.interm;
-	*p++ = cs.final;
-
-	psenc->g[target].type = cs.type;
-	psenc->g[target].final = cs.final;
-	psenc->g[target].interm = cs.interm;
-
-planeok:
-	/* invoke the plane onto GL or GR. */
-	if (psenc->gl == target)
-		goto sideok;
-	if (bit8 && psenc->gr == target)
-		goto sideok;
-
-	if (target == 0 && (ei->flags & F_LS0)) {
-		*p++ = '\017';
-		psenc->gl = 0;
-	} else if (target == 1 && (ei->flags & F_LS1)) {
-		*p++ = '\016';
-		psenc->gl = 1;
-	} else if (target == 2 && (ei->flags & F_LS2)) {
-		*p++ = '\033';
-		*p++ = 'n';
-		psenc->gl = 2;
-	} else if (target == 3 && (ei->flags & F_LS3)) {
-		*p++ = '\033';
-		*p++ = 'o';
-		psenc->gl = 3;
-	} else if (bit8 && target == 1 && (ei->flags & F_LS1R)) {
-		*p++ = '\033';
-		*p++ = '~';
-		psenc->gr = 1;
-	} else if (bit8 && target == 2 && (ei->flags & F_LS2R)) {
-		*p++ = '\033';
-		/*{*/
-		*p++ = '}';
-		psenc->gr = 2;
-	} else if (bit8 && target == 3 && (ei->flags & F_LS3R)) {
-		*p++ = '\033';
-		*p++ = '|';
-		psenc->gr = 3;
-	} else if (target == 2 && (ei->flags & F_SS2)) {
-		*p++ = '\033';
-		*p++ = 'N';
-		psenc->singlegl = 2;
-	} else if (target == 3 && (ei->flags & F_SS3)) {
-		*p++ = '\033';
-		*p++ = 'O';
-		psenc->singlegl = 3;
-	} else if (bit8 && target == 2 && (ei->flags & F_SS2R)) {
-		*p++ = '\216';
-		*p++ = 'N';
-		psenc->singlegl = psenc->singlegr = 2;
-	} else if (bit8 && target == 3 && (ei->flags & F_SS3R)) {
-		*p++ = '\217';
-		*p++ = 'O';
-		psenc->singlegl = psenc->singlegr = 3;
-	} else
-		goto ilseq;
-
-sideok:
-	if (psenc->singlegl == target)
-		mask = 0x00;
-	else if (psenc->singlegr == target)
-		mask = 0x80;
-	else if (psenc->gl == target)
-		mask = 0x00;
-	else if ((ei->flags & F_8BIT) && psenc->gr == target)
-		mask = 0x80;
-	else
-		goto ilseq;
-
-	switch (cs.type) {
-	case CS94:
-	case CS96:
-		i = 1;
-		break;
-	case CS94MULTI:
-	case CS96MULTI:
-		i = !iscntl(wc & 0xff) ?
-		    (isthree(cs.final) ? 3 : 2) : 1;
-		break;
-	}
-	while (i-- > 0)
-		*p++ = ((wc >> (i << 3)) & 0x7f) | mask;
-
-	/* reset single shift state */
-	psenc->singlegl = psenc->singlegr = -1;
-
-	len = (size_t)(p - tmp);
-	if (n < len) {
-		if (result)
-			*result = (char *)0;
-		*nresult = (size_t)-1;
-		return E2BIG;
-	}
-	if (result)
-		*result = string + len;
-	memcpy(string, tmp, len);
-	*nresult = len;
-
-	return 0;
-
-ilseq:
-	*nresult = (size_t)-1;
-	return EILSEQ;
-}
-
-static int
-_citrus_ISO2022_put_state_reset(_ISO2022EncodingInfo * __restrict ei,
-				char * __restrict s, size_t n,
-				_ISO2022State * __restrict psenc,
-				size_t * __restrict nresult)
-{
-	char buf[MB_LEN_MAX];
-	char *result;
-	int ret;
-	size_t len;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(s != NULL);
-
-	/* XXX state will be modified after this operation... */
-	ret = _ISO2022_sputwchar(ei, L'\0', buf, sizeof(buf), &result, psenc,
-	    &len);
-	if (ret) {
-		*nresult = len;
-		return ret;
-	}
-
-	if (sizeof(buf) < len || n < len-1) {
-		/* XXX should recover state? */
-		*nresult = (size_t)-1;
-		return E2BIG;
-	}
-
-	memcpy(s, buf, len-1);
-	*nresult = len-1;
-	return (0);
-}
-
-static int
-_citrus_ISO2022_wcrtomb_priv(_ISO2022EncodingInfo * __restrict ei,
-			     char * __restrict s, size_t n, wchar_t wc,
-			     _ISO2022State * __restrict psenc,
-			     size_t * __restrict nresult)
-{
-	char buf[MB_LEN_MAX];
-	char *result;
-	int ret;
-	size_t len;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != 0);
-
-	/* XXX state will be modified after this operation... */
-	ret = _ISO2022_sputwchar(ei, wc, buf, sizeof(buf), &result, psenc,
-	    &len);
-	if (ret) {
-		*nresult = len;
-		return ret;
-	}
-
-	if (sizeof(buf) < len || n < len) {
-		/* XXX should recover state? */
-		*nresult = (size_t)-1;
-		return E2BIG;
-	}
-
-	memcpy(s, buf, len);
-	*nresult = len;
-	return (0);
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_ISO2022_stdenc_wctocs(_ISO2022EncodingInfo * __restrict ei,
-			      _csid_t * __restrict csid,
-			      _index_t * __restrict idx, wchar_t wc)
-{
-	wchar_t m, nm;
-
-	_DIAGASSERT(csid != NULL && idx != NULL);
-
-	m = wc & 0x7FFF8080;
-	nm = wc & 0x007F7F7F;
-	if (m & 0x00800000) {
-		nm &= 0x00007F7F;
-	} else {
-		m &= 0x7F008080;
-	}
-	if (nm & 0x007F0000) {
-		/* ^3 mark */
-		m |= 0x007F0000;
-	} else if (nm & 0x00007F00) {
-		/* ^2 mark */
-		m |= 0x00007F00;
-	}
-	*csid = (_csid_t)m;
-	*idx  = (_index_t)nm;
-
-	return (0);
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_ISO2022_stdenc_cstowc(_ISO2022EncodingInfo * __restrict ei,
-			      wchar_t * __restrict wc,
-			      _csid_t csid, _index_t idx)
-{
-
-	_DIAGASSERT(ei != NULL && wc != NULL);
-
-	*wc = (wchar_t)(csid & 0x7F808080) | (wchar_t)idx;
-
-	return (0);
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_ISO2022_stdenc_get_state_desc_generic(_ISO2022EncodingInfo * __restrict ei,
-					      _ISO2022State * __restrict psenc,
-					      int * __restrict rstate)
-{
-
-	if (psenc->chlen == 0) {
-		/* XXX: it should distinguish initial and stable. */
-		*rstate = _STDENC_SDGEN_STABLE;
-	} else {
-		if (psenc->ch[0] == '\033')
-			*rstate = _STDENC_SDGEN_INCOMPLETE_SHIFT;
-		else
-			*rstate = _STDENC_SDGEN_INCOMPLETE_CHAR;
-	}
-
-	return 0;
-}
-
-/* ----------------------------------------------------------------------
- * public interface for ctype
- */
-
-_CITRUS_CTYPE_DECLS(ISO2022);
-_CITRUS_CTYPE_DEF_OPS(ISO2022);
-
-#include "citrus_ctype_template.h"
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(ISO2022);
-_CITRUS_STDENC_DEF_OPS(ISO2022);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_iso2022.h b/lib/libc/citrus/modules/citrus_iso2022.h
deleted file mode 100644
index e82e0b3ac..000000000
--- a/lib/libc/citrus/modules/citrus_iso2022.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: citrus_iso2022.h,v 1.2 2003/06/25 09:51:44 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_ISO2022_H_
-#define _CITRUS_ISO2022_H_
-
-__BEGIN_DECLS
-_CITRUS_CTYPE_GETOPS_FUNC(ISO2022);
-_CITRUS_STDENC_GETOPS_FUNC(ISO2022);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_johab.c b/lib/libc/citrus/modules/citrus_johab.c
deleted file mode 100644
index 57761e4fe..000000000
--- a/lib/libc/citrus/modules/citrus_johab.c
+++ /dev/null
@@ -1,394 +0,0 @@
-/* $NetBSD: citrus_johab.c,v 1.5 2013/05/28 16:57:56 joerg Exp $ */
-
-/*-
- * Copyright (c)2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_johab.c,v 1.5 2013/05/28 16:57:56 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <wchar.h>
-#include <limits.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_stdenc.h"
-#include "citrus_johab.h"
-
-/* ----------------------------------------------------------------------
- * private stuffs used by templates
- */
-
-typedef struct {
-	int chlen;
-	char ch[2];
-} _JOHABState;
-
-typedef struct {
-	int dummy;
-} _JOHABEncodingInfo;
-
-typedef struct {
-	_JOHABEncodingInfo	ei;
-	struct {
-		/* for future multi-locale facility */
-		_JOHABState	s_mblen;
-		_JOHABState	s_mbrlen;
-		_JOHABState	s_mbrtowc;
-		_JOHABState	s_mbtowc;
-		_JOHABState	s_mbsrtowcs;
-		_JOHABState	s_mbsnrtowcs;
-		_JOHABState	s_wcrtomb;
-		_JOHABState	s_wcsrtombs;
-		_JOHABState	s_wcsnrtombs;
-		_JOHABState	s_wctomb;
-	} states;
-} _JOHABCTypeInfo;
-
-#define _CEI_TO_EI(_cei_)		(&(_cei_)->ei)
-#define _CEI_TO_STATE(_cei_, _func_)	(_cei_)->states.s_##_func_
-
-#define _FUNCNAME(m)			_citrus_JOHAB_##m
-#define _ENCODING_INFO			_JOHABEncodingInfo
-#define _CTYPE_INFO			_JOHABCTypeInfo
-#define _ENCODING_STATE			_JOHABState
-#define _ENCODING_MB_CUR_MAX(_ei_)		2
-#define _ENCODING_IS_STATE_DEPENDENT		0
-#define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	0
-
-
-static __inline void
-/*ARGSUSED*/
-_citrus_JOHAB_init_state(_JOHABEncodingInfo * __restrict ei,
-	_JOHABState * __restrict psenc)
-{
-	/* ei may be null */
-	_DIAGASSERT(psenc != NULL);
-
-	psenc->chlen = 0;
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_JOHAB_pack_state(_JOHABEncodingInfo * __restrict ei,
-	void * __restrict pspriv,
-	const _JOHABState * __restrict psenc)
-{
-	/* ei may be null */
-	_DIAGASSERT(pspriv != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	memcpy(pspriv, (const void *)psenc, sizeof(*psenc));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_JOHAB_unpack_state(_JOHABEncodingInfo * __restrict ei,
-	_JOHABState * __restrict psenc,
-	const void * __restrict pspriv)
-{
-	/* ei may be null */
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(pspriv != NULL);
-
-	memcpy((void *)psenc, pspriv, sizeof(*psenc));
-}
-
-static void
-/*ARGSUSED*/
-_citrus_JOHAB_encoding_module_uninit(_JOHABEncodingInfo *ei)
-{
-	/* ei may be null */
-}
-
-static int
-/*ARGSUSED*/
-_citrus_JOHAB_encoding_module_init(_JOHABEncodingInfo * __restrict ei,
-	const void * __restrict var, size_t lenvar)
-{
-	/* ei may be null */
-	return 0;
-}
-
-static __inline int
-ishangul(int l, int t)
-{
-
-	return (l >= 0x84 && l <= 0xD3) &&
-	      ((t >= 0x41 && t <= 0x7E) || (t >= 0x81 && t <= 0xFE));
-}
-
-static __inline int
-isuda(int l, int t)
-{
-	return (l == 0xD8) &&
-	       ((t >= 0x31 && t <= 0x7E) || (t >= 0x91 && t <= 0xFE));
-}
-
-static __inline int
-ishanja(int l, int t)
-{
-	return ((l >= 0xD9 && l <= 0xDE) || (l >= 0xE0 && l <= 0xF9)) &&
-	       ((t >= 0x31 && t <= 0x7E) || (t >= 0x91 && t <= 0xFE));
-}
-
-static int
-/*ARGSUSED*/
-_citrus_JOHAB_mbrtowc_priv(_JOHABEncodingInfo * __restrict ei,
-	wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
-	_JOHABState * __restrict psenc, size_t * __restrict nresult)
-{
-	const char *s0;
-	int l, t;
-
-	/* ei may be unused */
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != 0);
-
-	if (*s == NULL) {
-		_citrus_JOHAB_init_state(ei, psenc);
-		*nresult = _ENCODING_IS_STATE_DEPENDENT;
-		return 0;
-	} 
-	s0 = *s;
-
-	switch (psenc->chlen) {
-	case 0:
-		if (n-- < 1)
-			goto restart;
-		l = *s0++ & 0xFF;
-		if (l <= 0x7F) {
-			if (pwc != NULL)
-				*pwc = (wchar_t)l;
-			*nresult = (l == 0) ? 0 : 1;
-			*s = s0;
-			return 0;
-		}
-		psenc->ch[psenc->chlen++] = l;
-		break;
-	case 1:
-		l = psenc->ch[0] & 0xFF;
-		break;
-	default:
-		return EINVAL;
-	}
-	if (n-- < 1) {
-restart:
-		*nresult = (size_t)-2;
-		*s = s0;
-		return 0;
-	}
-	t = *s0++ & 0xFF;
-	if (!ishangul(l, t) && !isuda(l, t) && !ishanja(l, t)) {
-		*nresult = (size_t)-1;
-		return EILSEQ;
-	}
-	if (pwc != NULL)
-		*pwc = (wchar_t)(l << 8 | t);
-	*nresult = s0 - *s;
-	*s = s0;
-	psenc->chlen = 0;
-
-	return 0;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_JOHAB_wcrtomb_priv(_JOHABEncodingInfo * __restrict ei,
-	char * __restrict s, size_t n, wchar_t wc,
-	_JOHABState * __restrict psenc, size_t * __restrict nresult)
-{
-	int l, t;
-
-	/* ei may be unused */
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	if (psenc->chlen != 0)
-		return EINVAL;
-
-	/* XXX assume wchar_t as int */
-	if ((uint32_t)wc <= 0x7F) {
-		if (n < 1)
-			goto e2big;
-		*s = wc & 0xFF;
-		*nresult = 1;
-	} else if ((uint32_t)wc <= 0xFFFF) {
-		if (n < 2) {
-e2big:
-			*nresult = (size_t)-1;
-			return E2BIG;
-		}
-		l = (wc >> 8) & 0xFF;
-		t = wc & 0xFF;
-		if (!ishangul(l, t) && !isuda(l, t) && !ishanja(l, t))
-			goto ilseq;
-		*s++ = l;
-		*s = t;
-		*nresult = 2;
-	} else {
-ilseq:
-		*nresult = (size_t)-1;
-		return EILSEQ;
-	}
-	return 0;
-
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_JOHAB_stdenc_wctocs(_JOHABEncodingInfo * __restrict ei,
-	_csid_t * __restrict csid, _index_t * __restrict idx, wchar_t wc)
-{
-	int m, l, t, linear;
-
-	/* ei may be unused */
-	_DIAGASSERT(csid != NULL);
-	_DIAGASSERT(idx != NULL);
-
-	/* XXX assume wchar_t as int */
-	if ((uint32_t)wc <= 0x7F) {
-		*idx = (_index_t)wc;
-		*csid = 0;
-	} else if ((uint32_t)wc <= 0xFFFF) {
-		l = (wc >> 8) & 0xFF;
-		t = wc & 0xFF;
-		if (ishangul(l, t) || isuda(l, t)) {
-			*idx = (_index_t)wc;
-			*csid = 1;
-		} else {
-			if (l >= 0xD9 && l <= 0xDE) {
-				linear = l - 0xD9;
-				m = 0x21;
-			} else if (l >= 0xE0 && l <= 0xF9) {
-				linear = l - 0xE0;
-				m = 0x4A;
-			} else {
-				return EILSEQ;
-			}
-			linear *= 188;
-			if (t >= 0x31 && t <= 0x7E) {
-				linear += t - 0x31;
-			} else if (t >= 0x91 && t <= 0xFE) {
-				linear += t - 0x43;
-			} else {
-				return EILSEQ;
-			}
-			l = (linear / 94) + m;
-			t = (linear % 94) + 0x21;
-			*idx = (_index_t)((l << 8) | t);
-			*csid = 2;
-		}
-	} else {
-		return EILSEQ;
-	}
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_JOHAB_stdenc_cstowc(_JOHABEncodingInfo * __restrict ei,
-	wchar_t * __restrict wc, _csid_t csid, _index_t idx)
-{
-	int m, n, l, t, linear;
-
-	/* ei may be unused */
-	_DIAGASSERT(wc != NULL);
-
-	switch (csid) {
-	case 0:
-	case 1:
-		*wc = (wchar_t)idx;
-		break;
-	case 2:
-		if (idx >= 0x2121 && idx <= 0x2C71) {
-			m = 0xD9;
-			n = 0x21;
-		} else if (idx >= 0x4A21 && idx <= 0x7D7E) {
-			m = 0xE0;
-			n = 0x4A;
-		} else {
-			return EILSEQ;
-		}
-		l = ((idx >> 8) & 0xFF) - n;
-		t = (idx & 0xFF) - 0x21;
-		linear = (l * 94) + t;
-		l = (linear / 188) + m;
-		t = linear % 188;
-		t += (t <= 0x4D) ? 0x31 : 0x43;
-		break;
-	default:
-		return EILSEQ;
-	}
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_JOHAB_stdenc_get_state_desc_generic(_JOHABEncodingInfo * __restrict ei,
-	_JOHABState * __restrict psenc, int * __restrict rstate)
-{
-	/* ei may be unused */
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(rstate != NULL);
-
-	*rstate = (psenc->chlen == 0)
-	    ? _STDENC_SDGEN_INITIAL
-	    : _STDENC_SDGEN_INCOMPLETE_CHAR;
-	return 0;
-}
-
-/* ----------------------------------------------------------------------
- * public interface for ctype
- */
-
-_CITRUS_CTYPE_DECLS(JOHAB);
-_CITRUS_CTYPE_DEF_OPS(JOHAB);
-
-#include "citrus_ctype_template.h"
-
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(JOHAB);
-_CITRUS_STDENC_DEF_OPS(JOHAB);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_johab.h b/lib/libc/citrus/modules/citrus_johab.h
deleted file mode 100644
index f3878ad6c..000000000
--- a/lib/libc/citrus/modules/citrus_johab.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $NetBSD: citrus_johab.h,v 1.1 2006/10/18 17:54:55 tnozaki Exp $ */
-
-/*-
- * Copyright (c)2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_JOHAB_H_
-#define _CITRUS_JOHAB_H_
-
-__BEGIN_DECLS
-_CITRUS_CTYPE_GETOPS_FUNC(JOHAB);
-_CITRUS_STDENC_GETOPS_FUNC(JOHAB);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_mapper_646.c b/lib/libc/citrus/modules/citrus_mapper_646.c
deleted file mode 100644
index 14e6fd2c0..000000000
--- a/lib/libc/citrus/modules/citrus_mapper_646.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*	$NetBSD: citrus_mapper_646.c,v 1.4 2003/07/14 11:37:49 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_mapper_646.c,v 1.4 2003/07/14 11:37:49 tshiozak Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <sys/queue.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_module.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_mmap.h"
-#include "citrus_hash.h"
-#include "citrus_mapper.h"
-#include "citrus_mapper_646.h"
-
-/* ---------------------------------------------------------------------- */
-
-_CITRUS_MAPPER_DECLS(mapper_646);
-_CITRUS_MAPPER_DEF_OPS(mapper_646);
-
-/* ---------------------------------------------------------------------- */
-
-#define ILSEQ	0xFFFFFFFE
-#define INVALID	0xFFFFFFFF
-#define SPECIALS(x)				\
-	x(0x23)					\
-	x(0x24)					\
-	x(0x40)					\
-	x(0x5B)					\
-	x(0x5C)					\
-	x(0x5D)					\
-	x(0x5E)					\
-	x(0x60)					\
-	x(0x7B)					\
-	x(0x7C)					\
-	x(0x7D)					\
-	x(0x7E)
-
-#define INDEX(x) INDEX_##x,
-
-enum {
-	SPECIALS(INDEX)
-	NUM_OF_SPECIALS
-};
-struct _citrus_mapper_646 {
-	int		m6_forward;
-	_index_t	m6_map[NUM_OF_SPECIALS];
-};
-
-int
-_citrus_mapper_646_mapper_getops(struct _citrus_mapper_ops *ops,
-				 size_t lenops, uint32_t expected_version)
-{
-	if (expected_version<_CITRUS_MAPPER_ABI_VERSION || lenops<sizeof(*ops))
-		return EINVAL;
-
-	memcpy(ops, &_citrus_mapper_646_mapper_ops,
-	       sizeof(_citrus_mapper_646_mapper_ops));
-
-	return 0;
-}
-
-#define T_COMM '#'
-static int
-parse_file(struct _citrus_mapper_646 *m6, const char *path)
-{
-	int ret, i;
-	struct _region r;
-	struct _memstream ms;
-	const char *p;
-	size_t len;
-	char buf[PATH_MAX];
-
-	ret = _map_file(&r, path);
-	if (ret)
-		return ret;
-	_memstream_bind(&ms, &r);
-	for (i=0; i<NUM_OF_SPECIALS; i++) {
-retry:
-		p = _memstream_getln(&ms, &len);
-		if (p==NULL) {
-			ret = EINVAL;
-			break;
-		}
-		p = _bcs_skip_ws_len(p, &len);
-		if (*p == T_COMM || len==0)
-			goto retry;
-		if (!_bcs_isdigit(*p)) {
-			ret = EINVAL;
-			break;
-		}
-		snprintf(buf, sizeof(buf), "%.*s", (int)len, p);
-		m6->m6_map[i] = strtoul(buf, (char **)&p, 0);
-		p = _bcs_skip_ws(buf);
-		if (*p != T_COMM && !*p) {
-			ret = EINVAL;
-			break;
-		}
-	}
-	_unmap_file(&r);
-
-	return ret;
-};
-
-static int
-parse_var(struct _citrus_mapper_646 *m6, struct _memstream *ms,
-	  const char *dir)
-{
-	struct _region r;
-	char path[PATH_MAX];
-
-	m6->m6_forward = 1;
-	_memstream_skip_ws(ms);
-	/* whether backward */
-	if (_memstream_peek(ms) == '!') {
-		_memstream_getc(ms);
-		m6->m6_forward = 0;
-	}
-	/* get description file path */
-	_memstream_getregion(ms, &r, _memstream_remainder(ms));
-	snprintf(path, sizeof(path), "%s/%.*s",
-		 dir, (int)_region_size(&r), (char *)_region_head(&r));
-	/* remove trailing white spaces */
-	path[_bcs_skip_nonws(path)-path] = '\0';
-	return parse_file(m6, path);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_mapper_646_mapper_init(struct _citrus_mapper_area *__restrict ma,
-			       struct _citrus_mapper * __restrict cm,
-			       const char * __restrict dir,
-			       const void * __restrict var, size_t lenvar,
-			       struct _citrus_mapper_traits * __restrict mt,
-			       size_t lenmt)
-{
-	struct _citrus_mapper_646 *m6;
-	struct _memstream ms;
-	struct _region r;
-	int ret;
-
-	_DIAGASSERT(cm && dir && mt);
-
-	if (lenmt<sizeof(*mt))
-		return EINVAL;
-
-	m6 = malloc(sizeof(*m6));
-	if (m6 == NULL)
-		return errno;
-
-	_region_init(&r, (void *)var, lenvar);
-	_memstream_bind(&ms, &r);
-	ret = parse_var(m6, &ms, dir);
-	if (ret) {
-		free(m6);
-		return ret;
-	}
-
-	cm->cm_closure = m6;
-	mt->mt_src_max = mt->mt_dst_max = 1;	/* 1:1 converter */
-	mt->mt_state_size = 0;			/* stateless */
-
-	return 0;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_mapper_646_mapper_uninit(struct _citrus_mapper *cm)
-{
-	if (cm && cm->cm_closure) {
-		free(cm->cm_closure);
-	}
-}
-
-static int
-/*ARGSUSED*/
-_citrus_mapper_646_mapper_convert(struct _citrus_mapper * __restrict cm,
-				  _index_t * __restrict dst, _index_t src,
-				  void * __restrict ps)
-{
-	struct _citrus_mapper_646 *m6;
-
-	_DIAGASSERT(cm && cm->cm_closure);
-
-	m6 = cm->cm_closure;
-	if (m6->m6_forward) {
-		/* forward */
-		if (src>=0x80)
-			return _MAPPER_CONVERT_ILSEQ;
-#define FORWARD(x)					\
-if (src==(x)) {						\
-	if (m6->m6_map[INDEX_##x]==INVALID)		\
-		return _MAPPER_CONVERT_NONIDENTICAL;	\
-	*dst = m6->m6_map[INDEX_##x];			\
-	return 0;					\
-} else
-		SPECIALS(FORWARD);
-		*dst = src;
-	} else {
-		/* backward */
-#define BACKWARD(x)							\
-if (m6->m6_map[INDEX_##x]!=INVALID && src==m6->m6_map[INDEX_##x]) {	\
-	*dst = (x);							\
-	return 0;							\
-} else if (src==(x))							\
-	return _MAPPER_CONVERT_ILSEQ;					\
-else
-		SPECIALS(BACKWARD);
-		if (src>=0x80)
-			return _MAPPER_CONVERT_NONIDENTICAL;
-		*dst = src;
-	}
-
-	return _MAPPER_CONVERT_SUCCESS;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_mapper_646_mapper_init_state(struct _citrus_mapper * __restrict cm,
-				     void * __restrict ps)
-{
-}
diff --git a/lib/libc/citrus/modules/citrus_mapper_646.h b/lib/libc/citrus/modules/citrus_mapper_646.h
deleted file mode 100644
index cdacae0f3..000000000
--- a/lib/libc/citrus/modules/citrus_mapper_646.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: citrus_mapper_646.h,v 1.1 2003/06/25 09:51:45 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_MAPPER_646_H_
-#define _CITRUS_MAPPER_646_H_
-
-__BEGIN_DECLS
-_CITRUS_MAPPER_GETOPS_FUNC(mapper_646);
-_CITRUS_MAPPER_GETOPS_FUNC(mapper_646);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_mapper_none.c b/lib/libc/citrus/modules/citrus_mapper_none.c
deleted file mode 100644
index 12b31410e..000000000
--- a/lib/libc/citrus/modules/citrus_mapper_none.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*	$NetBSD: citrus_mapper_none.c,v 1.2 2003/06/27 17:53:31 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_mapper_none.c,v 1.2 2003/06/27 17:53:31 tshiozak Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/queue.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_hash.h"
-#include "citrus_mapper.h"
-#include "citrus_mapper_none.h"
-
-/* ---------------------------------------------------------------------- */
-
-_CITRUS_MAPPER_DECLS(mapper_none);
-_CITRUS_MAPPER_DEF_OPS(mapper_none);
-
-
-/* ---------------------------------------------------------------------- */
-
-int
-_citrus_mapper_none_mapper_getops(struct _citrus_mapper_ops *ops,
-				  size_t lenops, uint32_t expected_version)
-{
-	if (expected_version<_CITRUS_MAPPER_ABI_VERSION || lenops<sizeof(*ops))
-		return (EINVAL);
-
-	memcpy(ops, &_citrus_mapper_none_mapper_ops,
-	       sizeof(_citrus_mapper_none_mapper_ops));
-
-	return 0;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_mapper_none_mapper_init(struct _citrus_mapper_area *__restrict ma,
-				struct _citrus_mapper * __restrict cm,
-				const char * __restrict dir,
-				const void * __restrict var, size_t lenvar,
-				struct _citrus_mapper_traits * __restrict mt,
-				size_t lenmt)
-{
-
-	_DIAGASSERT(cm && dir && mt);
-
-	if (lenmt<sizeof(*mt))
-		return (EINVAL);
-
-	cm->cm_closure = NULL;
-	mt->mt_src_max = mt->mt_dst_max = 1;	/* 1:1 converter */
-	mt->mt_state_size = 0;			/* stateless */
-
-	return 0;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_mapper_none_mapper_uninit(struct _citrus_mapper *cm)
-{
-}
-
-static int
-/*ARGSUSED*/
-_citrus_mapper_none_mapper_convert(struct _citrus_mapper * __restrict cm,
-				   _citrus_index_t * __restrict dst,
-				   _citrus_index_t src, void * __restrict ps)
-{
-	*dst = src;
-	return _CITRUS_MAPPER_CONVERT_SUCCESS;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_mapper_none_mapper_init_state(struct _citrus_mapper * __restrict cm,
-				      void * __restrict ps)
-{
-}
diff --git a/lib/libc/citrus/modules/citrus_mapper_none.h b/lib/libc/citrus/modules/citrus_mapper_none.h
deleted file mode 100644
index c0d6a7193..000000000
--- a/lib/libc/citrus/modules/citrus_mapper_none.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: citrus_mapper_none.h,v 1.1 2003/06/25 09:51:45 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_MAPPER_NONE_H_
-#define _CITRUS_MAPPER_NONE_H_
-
-__BEGIN_DECLS
-_CITRUS_MAPPER_GETOPS_FUNC(mapper_none);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_mapper_serial.c b/lib/libc/citrus/modules/citrus_mapper_serial.c
deleted file mode 100644
index be006b595..000000000
--- a/lib/libc/citrus/modules/citrus_mapper_serial.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/*	$NetBSD: citrus_mapper_serial.c,v 1.2 2003/07/12 15:39:20 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_mapper_serial.c,v 1.2 2003/07/12 15:39:20 tshiozak Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <sys/queue.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_module.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_mmap.h"
-#include "citrus_hash.h"
-#include "citrus_mapper.h"
-#include "citrus_mapper_serial.h"
-
-/* ---------------------------------------------------------------------- */
-
-_CITRUS_MAPPER_DECLS(mapper_serial);
-_CITRUS_MAPPER_DEF_OPS(mapper_serial);
-
-#define _citrus_mapper_parallel_mapper_init		\
-	_citrus_mapper_serial_mapper_init
-#define _citrus_mapper_parallel_mapper_uninit		\
-	_citrus_mapper_serial_mapper_uninit
-#define _citrus_mapper_parallel_mapper_init_state	\
-	_citrus_mapper_serial_mapper_init_state
-static int	_citrus_mapper_parallel_mapper_convert(
-	struct _citrus_mapper * __restrict, _index_t * __restrict, _index_t,
-	void * __restrict);
-_CITRUS_MAPPER_DEF_OPS(mapper_parallel);
-#undef _citrus_mapper_parallel_mapper_init
-#undef _citrus_mapper_parallel_mapper_uninit
-#undef _citrus_mapper_parallel_mapper_init_state
-
-
-/* ---------------------------------------------------------------------- */
-
-struct maplink {
-	SIMPLEQ_ENTRY(maplink)	ml_entry;
-	struct _mapper		*ml_mapper;
-};
-SIMPLEQ_HEAD(maplist, maplink);
-
-struct _citrus_mapper_serial {
-	struct maplist	sr_mappers;
-};
-
-int
-_citrus_mapper_serial_mapper_getops(struct _citrus_mapper_ops *ops,
-				    size_t lenops, uint32_t expected_version)
-{
-	if (expected_version<_CITRUS_MAPPER_ABI_VERSION || lenops<sizeof(*ops))
-		return EINVAL;
-
-	memcpy(ops, &_citrus_mapper_serial_mapper_ops,
-	       sizeof(_citrus_mapper_serial_mapper_ops));
-
-	return 0;
-}
-
-int
-_citrus_mapper_parallel_mapper_getops(struct _citrus_mapper_ops *ops,
-				      size_t lenops, uint32_t expected_version)
-{
-	if (expected_version<_CITRUS_MAPPER_ABI_VERSION || lenops<sizeof(*ops))
-		return EINVAL;
-
-	memcpy(ops, &_citrus_mapper_parallel_mapper_ops,
-	       sizeof(_citrus_mapper_parallel_mapper_ops));
-
-	return 0;
-}
-
-static void
-uninit(struct _citrus_mapper_serial *sr)
-{
-	struct maplink *ml;
-
-	while ((ml = SIMPLEQ_FIRST(&sr->sr_mappers)) != NULL) {
-		SIMPLEQ_REMOVE_HEAD(&sr->sr_mappers, ml_entry);
-		_mapper_close(ml->ml_mapper);
-		free(ml);
-	}
-}
-
-static int
-parse_var(struct _citrus_mapper_area *__restrict ma,
-	  struct _citrus_mapper_serial *sr, struct _memstream *ms)
-{
-	int ret;
-	struct _region r;
-	char mapname[PATH_MAX];
-	struct maplink *ml;
-
-	SIMPLEQ_INIT(&sr->sr_mappers);
-	while (1) {
-		/* remove beginning white spaces */
-		_memstream_skip_ws(ms);
-		if (_memstream_iseof(ms))
-			break;
-		/* cut down a mapper name */
-		_memstream_chr(ms, &r, ',');
-		snprintf(mapname, sizeof(mapname), "%.*s",
-			 (int)_region_size(&r), (char *)_region_head(&r));
-		/* remove trailing white spaces */
-		mapname[_bcs_skip_nonws(mapname)-mapname] = '\0';
-		/* create a new mapper record */
-		ml = malloc(sizeof(*ml));
-		if (ml == NULL)
-			return errno;
-		ret = _mapper_open(ma, &ml->ml_mapper, mapname);
-		if (ret) {
-			free(ml);
-			return ret;
-		}
-		/* support only 1:1 and stateless converter */
-		if (_mapper_get_src_max(ml->ml_mapper) != 1 ||
-		    _mapper_get_dst_max(ml->ml_mapper) != 1 ||
-		    _mapper_get_state_size(ml->ml_mapper) != 0) {
-			free(ml);
-			return EINVAL;
-		}
-		SIMPLEQ_INSERT_TAIL(&sr->sr_mappers, ml, ml_entry);
-	}
-	return 0;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_mapper_serial_mapper_init(struct _citrus_mapper_area *__restrict ma,
-				  struct _citrus_mapper * __restrict cm,
-				  const char * __restrict dir,
-				  const void * __restrict var, size_t lenvar,
-				  struct _citrus_mapper_traits * __restrict mt,
-				  size_t lenmt)
-{
-	struct _citrus_mapper_serial *sr;
-	struct _memstream ms;
-	struct _region r;
-
-	_DIAGASSERT(cm && dir && mt);
-
-	if (lenmt<sizeof(*mt))
-		return EINVAL;
-
-	sr = malloc(sizeof(*sr));
-	if (sr == NULL)
-		return errno;
-
-	_region_init(&r, (void *)var, lenvar);
-	_memstream_bind(&ms, &r);
-	if (parse_var(ma, sr, &ms)) {
-		uninit(sr);
-		free(sr);
-		return EINVAL;
-	}
-	cm->cm_closure = sr;
-	mt->mt_src_max = mt->mt_dst_max = 1;	/* 1:1 converter */
-	mt->mt_state_size = 0;			/* stateless */
-
-	return 0;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_mapper_serial_mapper_uninit(struct _citrus_mapper *cm)
-{
-	if (cm && cm->cm_closure) {
-		uninit(cm->cm_closure);
-		free(cm->cm_closure);
-	}
-}
-
-static int
-/*ARGSUSED*/
-_citrus_mapper_serial_mapper_convert(struct _citrus_mapper * __restrict cm,
-				     _index_t * __restrict dst, _index_t src,
-				     void * __restrict ps)
-{
-	int ret;
-	struct _citrus_mapper_serial *sr;
-	struct maplink *ml;
-
-	_DIAGASSERT(cm && cm->cm_closure);
-
-	sr = cm->cm_closure;
-	SIMPLEQ_FOREACH(ml, &sr->sr_mappers, ml_entry) {
-		ret = _mapper_convert(ml->ml_mapper, &src, src, NULL);
-		if (ret != _MAPPER_CONVERT_SUCCESS)
-			return ret;
-	}
-	*dst = src;
-	return _MAPPER_CONVERT_SUCCESS;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_mapper_parallel_mapper_convert(struct _citrus_mapper * __restrict cm,
-				       _index_t * __restrict dst, _index_t src,
-				       void * __restrict ps)
-{
-	int ret;
-	struct _citrus_mapper_serial *sr;
-	struct maplink *ml;
-	_index_t tmp;
-
-	_DIAGASSERT(cm && cm->cm_closure);
-
-	sr = cm->cm_closure;
-	SIMPLEQ_FOREACH(ml, &sr->sr_mappers, ml_entry) {
-		ret = _mapper_convert(ml->ml_mapper, &tmp, src, NULL);
-		if (ret == _MAPPER_CONVERT_SUCCESS) {
-			*dst = tmp;
-			return _MAPPER_CONVERT_SUCCESS;
-		} else if (ret == _MAPPER_CONVERT_ILSEQ)
-			return _MAPPER_CONVERT_ILSEQ;
-	}
-	return _MAPPER_CONVERT_NONIDENTICAL;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_mapper_serial_mapper_init_state(struct _citrus_mapper * __restrict cm,
-					void * __restrict ps)
-{
-}
diff --git a/lib/libc/citrus/modules/citrus_mapper_serial.h b/lib/libc/citrus/modules/citrus_mapper_serial.h
deleted file mode 100644
index 107f0ed6c..000000000
--- a/lib/libc/citrus/modules/citrus_mapper_serial.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: citrus_mapper_serial.h,v 1.1 2003/06/25 09:51:46 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_MAPPER_SERIAL_H_
-#define _CITRUS_MAPPER_SERIAL_H_
-
-__BEGIN_DECLS
-_CITRUS_MAPPER_GETOPS_FUNC(mapper_serial);
-_CITRUS_MAPPER_GETOPS_FUNC(mapper_parallel);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_mapper_std.c b/lib/libc/citrus/modules/citrus_mapper_std.c
deleted file mode 100644
index 9e7d10cbf..000000000
--- a/lib/libc/citrus/modules/citrus_mapper_std.c
+++ /dev/null
@@ -1,464 +0,0 @@
-/*	$NetBSD: citrus_mapper_std.c,v 1.10 2011/11/19 18:48:39 tnozaki Exp $	*/
-
-/*-
- * Copyright (c)2003, 2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_mapper_std.c,v 1.10 2011/11/19 18:48:39 tnozaki Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <machine/endian.h>
-#include <sys/queue.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_mmap.h"
-#include "citrus_module.h"
-#include "citrus_hash.h"
-#include "citrus_mapper.h"
-#include "citrus_db.h"
-#include "citrus_db_hash.h"
-
-#include "citrus_mapper_std.h"
-#include "citrus_mapper_std_file.h"
-
-/* ---------------------------------------------------------------------- */
-
-_CITRUS_MAPPER_DECLS(mapper_std);
-_CITRUS_MAPPER_DEF_OPS(mapper_std);
-
-
-/* ---------------------------------------------------------------------- */
-
-int
-_citrus_mapper_std_mapper_getops(struct _citrus_mapper_ops *ops, size_t lenops,
-				 u_int32_t expected_version)
-{
-	if (expected_version<_CITRUS_MAPPER_ABI_VERSION || lenops<sizeof(*ops))
-		return (EINVAL);
-
-	memcpy(ops, &_citrus_mapper_std_mapper_ops,
-	       sizeof(_citrus_mapper_std_mapper_ops));
-
-	return (0);
-}
-
-/* ---------------------------------------------------------------------- */
-
-static int
-/*ARGSUSED*/
-rowcol_convert(struct _citrus_mapper_std * __restrict ms,
-	       _index_t * __restrict dst, _index_t src,
-	       void * __restrict ps)
-{
-	struct _citrus_mapper_std_rowcol *rc;
-	size_t i;
-	struct _citrus_mapper_std_linear_zone *lz;
-	_index_t n, idx = 0;
-	u_int32_t conv;
-
-	_DIAGASSERT(ms != NULL);
-	_DIAGASSERT(dst != NULL);
-	/* ps may be unused */
-	rc = &ms->ms_rowcol;
-
-	for (i = rc->rc_src_rowcol_len * rc->rc_src_rowcol_bits,
-	     lz = &rc->rc_src_rowcol[0]; i > 0; ++lz) {
-		i -= rc->rc_src_rowcol_bits;
-		n = (src >> i) & rc->rc_src_rowcol_mask;
-		if (n < lz->begin || n > lz->end) {
-			switch (rc->rc_oob_mode) {
-			case _CITRUS_MAPPER_STD_OOB_NONIDENTICAL:
-				*dst = rc->rc_dst_invalid;
-				return _MAPPER_CONVERT_NONIDENTICAL;
-			case _CITRUS_MAPPER_STD_OOB_ILSEQ:
-				return _MAPPER_CONVERT_ILSEQ;
-			default:
-				return _MAPPER_CONVERT_FATAL;
-			}
-		}
-		idx = idx * lz->width + n - lz->begin;
-	}
-	switch (rc->rc_dst_unit_bits) {
-	case 8:
-		conv = _region_peek8(&rc->rc_table, idx);
-		break;
-	case 16:
-		conv = be16toh(_region_peek16(&rc->rc_table, idx*2));
-		break;
-	case 32:
-		conv = be32toh(_region_peek32(&rc->rc_table, idx*4));
-		break;
-	default:
-		return _MAPPER_CONVERT_FATAL;
-	}
-
-	if (conv == rc->rc_dst_invalid) {
-		*dst = rc->rc_dst_invalid;
-		return _MAPPER_CONVERT_NONIDENTICAL;
-	}
-	if (conv == rc->rc_dst_ilseq)
-		return _MAPPER_CONVERT_ILSEQ;
-
-	*dst = conv;
-
-	return _MAPPER_CONVERT_SUCCESS;
-}
-
-static __inline int
-set_linear_zone(struct _citrus_mapper_std_linear_zone *lz,
-	u_int32_t begin, u_int32_t end)
-{
-	_DIAGASSERT(lz != NULL);
-
-	if (begin > end)
-		return EFTYPE;
-
-	lz->begin = begin;
-	lz->end = end;
-	lz->width= end - begin + 1;
-
-	return 0;
-}
-
-static __inline int
-rowcol_parse_variable_compat(struct _citrus_mapper_std_rowcol *rc,
-	struct _region *r)
-{
-	const struct _citrus_mapper_std_rowcol_info_compat_x *rcx;
-	struct _citrus_mapper_std_linear_zone *lz;
-	u_int32_t m, n;
-	int ret;
-
-	_DIAGASSERT(rc != NULL);
-	_DIAGASSERT(r != NULL && _region_size(r) == sizeof(*rcx));
-	rcx = _region_head(r);
-
-	rc->rc_dst_invalid = be32toh(rcx->rcx_dst_invalid);
-	rc->rc_dst_unit_bits = be32toh(rcx->rcx_dst_unit_bits);
-	m = be32toh(rcx->rcx_src_col_bits);
-	n = 1 << (m - 1);
-	n |= n - 1;
-	rc->rc_src_rowcol_bits = m;
-	rc->rc_src_rowcol_mask = n;
-
-	rc->rc_src_rowcol = malloc(2 *
-	    sizeof(*rc->rc_src_rowcol));
-	if (rc->rc_src_rowcol == NULL)
-		return ENOMEM;
-	lz = rc->rc_src_rowcol;
-	rc->rc_src_rowcol_len = 1;
-	m = be32toh(rcx->rcx_src_row_begin);
-	n = be32toh(rcx->rcx_src_row_end);
-	if (m + n > 0) {
-		ret = set_linear_zone(lz, m, n);
-		if (ret != 0) {
-			free(rc->rc_src_rowcol);
-			rc->rc_src_rowcol = NULL;
-			return ret;
-		}
-		++rc->rc_src_rowcol_len, ++lz;
-	}
-	m = be32toh(rcx->rcx_src_col_begin);
-	n = be32toh(rcx->rcx_src_col_end);
-
-	return set_linear_zone(lz, m, n);
-}
-
-static __inline int
-rowcol_parse_variable(struct _citrus_mapper_std_rowcol *rc,
-	struct _region *r)
-{
-	const struct _citrus_mapper_std_rowcol_info_x *rcx;
-	struct _citrus_mapper_std_linear_zone *lz;
-	u_int32_t m, n;
-	size_t i;
-	int ret;
-
-	_DIAGASSERT(rc != NULL);
-	_DIAGASSERT(r != NULL && _region_size(r) == sizeof(*rcx));
-	rcx = _region_head(r);
-
-	rc->rc_dst_invalid = be32toh(rcx->rcx_dst_invalid);
-	rc->rc_dst_unit_bits = be32toh(rcx->rcx_dst_unit_bits);
-
-	m = be32toh(rcx->rcx_src_rowcol_bits);
-	n = 1 << (m - 1);
-	n |= n - 1;
-	rc->rc_src_rowcol_bits = m;
-	rc->rc_src_rowcol_mask = n;
-
-	rc->rc_src_rowcol_len = be32toh(rcx->rcx_src_rowcol_len);
-	if (rc->rc_src_rowcol_len > _CITRUS_MAPPER_STD_ROWCOL_MAX)
-		return EFTYPE;
-	rc->rc_src_rowcol = malloc(rc->rc_src_rowcol_len *
-	    sizeof(*rc->rc_src_rowcol));
-	if (rc->rc_src_rowcol == NULL)
-		return ENOMEM;
-	for (i = 0, lz = rc->rc_src_rowcol;
-	     i < rc->rc_src_rowcol_len; ++i, ++lz) {
-		m = be32toh(rcx->rcx_src_rowcol[i].begin),
-		n = be32toh(rcx->rcx_src_rowcol[i].end);
-		ret = set_linear_zone(lz, m, n);
-		if (ret != 0) {
-			free(rc->rc_src_rowcol);
-			rc->rc_src_rowcol = NULL;
-			return ret;
-		}
-	}
-	return 0;
-}
-
-static void
-rowcol_uninit(struct _citrus_mapper_std *ms)
-{
-	struct _citrus_mapper_std_rowcol *rc;
-	_DIAGASSERT(ms != NULL);
-
-	rc = &ms->ms_rowcol;
-	free(rc->rc_src_rowcol);
-}
-
-static int
-rowcol_init(struct _citrus_mapper_std *ms)
-{
-	int ret;
-	struct _citrus_mapper_std_rowcol *rc;
-	const struct _citrus_mapper_std_rowcol_ext_ilseq_info_x *eix;
-	struct _region r;
-	u_int64_t table_size;
-	size_t i;
-	struct _citrus_mapper_std_linear_zone *lz;
-
-	_DIAGASSERT(ms != NULL);
-	ms->ms_convert = &rowcol_convert;
-	ms->ms_uninit = &rowcol_uninit;
-	rc = &ms->ms_rowcol;
-
-	/* get table region */
-	ret = _db_lookup_by_s(ms->ms_db, _CITRUS_MAPPER_STD_SYM_TABLE,
-			      &rc->rc_table, NULL);
-	if (ret) {
-		if (ret==ENOENT)
-			ret = EFTYPE;
-		return ret;
-	}
-
-	/* get table information */
-	ret = _db_lookup_by_s(ms->ms_db, _CITRUS_MAPPER_STD_SYM_INFO, &r, NULL);
-	if (ret) {
-		if (ret==ENOENT)
-			ret = EFTYPE;
-		return ret;
-	}
-	switch (_region_size(&r)) {
-	case _CITRUS_MAPPER_STD_ROWCOL_INFO_COMPAT_SIZE:
-		ret = rowcol_parse_variable_compat(rc, &r);
-		break;
-	case _CITRUS_MAPPER_STD_ROWCOL_INFO_SIZE:
-		ret = rowcol_parse_variable(rc, &r);
-		break;
-	default:
-		return EFTYPE;
-	}
-	if (ret != 0)
-		return ret;
-	/* sanity check */
-	switch (rc->rc_src_rowcol_bits) {
-	case 8: case 16: case 32:
-		if (rc->rc_src_rowcol_len <= 32 / rc->rc_src_rowcol_bits)
-			break;
-	/*FALLTHROUGH*/
-	default:
-		return EFTYPE;
-	}
-
-	/* ilseq extension */
-	rc->rc_oob_mode = _CITRUS_MAPPER_STD_OOB_NONIDENTICAL;
-	rc->rc_dst_ilseq = rc->rc_dst_invalid;
-	ret = _db_lookup_by_s(ms->ms_db,
-			      _CITRUS_MAPPER_STD_SYM_ROWCOL_EXT_ILSEQ,
-			      &r, NULL);
-	if (ret && ret != ENOENT)
-		return ret;
-	if (_region_size(&r) < sizeof(*eix))
-		return EFTYPE;
-	if (ret == 0) {
-		eix = _region_head(&r);
-		rc->rc_oob_mode = be32toh(eix->eix_oob_mode);
-		rc->rc_dst_ilseq = be32toh(eix->eix_dst_ilseq);
-	}
-
-	/* calcurate expected table size */
-	i = rc->rc_src_rowcol_len;
-	lz = &rc->rc_src_rowcol[--i];
-	table_size = lz->width;
-	while (i > 0) {
-		lz = &rc->rc_src_rowcol[--i];
-		table_size *= lz->width;
-	}
-	table_size *= rc->rc_dst_unit_bits/8;
-
-	if (table_size > UINT32_MAX ||
-	    _region_size(&rc->rc_table) < table_size)
-		return EFTYPE;
-
-	return 0;
-}
-
-typedef int (*initfunc_t)(struct _citrus_mapper_std *);
-static const struct {
-	const char			*t_name;
-	initfunc_t			t_init;
-} types[] = {
-	{ _CITRUS_MAPPER_STD_TYPE_ROWCOL, &rowcol_init },
-};
-#define NUM_OF_TYPES ((int)(sizeof(types)/sizeof(types[0])))
-
-static int
-/*ARGSUSED*/
-_citrus_mapper_std_mapper_init(struct _citrus_mapper_area *__restrict ma,
-			       struct _citrus_mapper * __restrict cm,
-			       const char * __restrict curdir,
-			       const void * __restrict var, size_t lenvar,
-			       struct _citrus_mapper_traits * __restrict mt,
-			       size_t lenmt)
-{
-	char path[PATH_MAX];
-	const char *type;
-	int ret, id;
-	struct _citrus_mapper_std *ms;
-
-	/* set traits */
-	if (lenmt<sizeof(*mt)) {
-		ret = EINVAL;
-		goto err0;
-	}
-	mt->mt_src_max = mt->mt_dst_max = 1;	/* 1:1 converter */
-	mt->mt_state_size = 0;			/* stateless */
-
-	/* alloc mapper std structure */
-	ms = malloc(sizeof(*ms));
-	if (ms==NULL) {
-		ret = errno;
-		goto err0;
-	}
-
-	/* open mapper file */
-	snprintf(path, sizeof(path),
-		 "%s/%.*s", curdir, (int)lenvar, (const char *)var);
-	ret = _map_file(&ms->ms_file, path);
-	if (ret)
-		goto err1;
-
-	ret = _db_open(&ms->ms_db, &ms->ms_file, _CITRUS_MAPPER_STD_MAGIC,
-		       &_db_hash_std, NULL);
-	if (ret)
-		goto err2;
-
-	/* get mapper type */
-	ret = _db_lookupstr_by_s(ms->ms_db, _CITRUS_MAPPER_STD_SYM_TYPE,
-				 &type, NULL);
-	if (ret) {
-		if (ret==ENOENT)
-			ret = EFTYPE;
-		goto err3;
-	}
-	for (id=0; id<NUM_OF_TYPES; id++)
-		if (_bcs_strcasecmp(type, types[id].t_name) == 0)
-			break;
-
-	if (id == NUM_OF_TYPES)
-		goto err3;
-
-	/* init the per-type structure */
-	ret = (*types[id].t_init)(ms);
-	if (ret)
-		goto err3;
-
-	cm->cm_closure = ms;
-
-	return 0;
-
-err3:
-	_db_close(ms->ms_db);
-err2:
-	_unmap_file(&ms->ms_file);
-err1:
-	free(ms);
-err0:
-	return ret;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_mapper_std_mapper_uninit(struct _citrus_mapper *cm)
-{
-	struct _citrus_mapper_std *ms;
-
-	_DIAGASSERT(cm!=NULL && cm->cm_closure!=NULL);
-
-	ms = cm->cm_closure;
-	if (ms->ms_uninit)
-		(*ms->ms_uninit)(ms);
-	_db_close(ms->ms_db);
-	_unmap_file(&ms->ms_file);
-	free(ms);
-}
-
-static void
-/*ARGSUSED*/
-_citrus_mapper_std_mapper_init_state(struct _citrus_mapper * __restrict cm,
-				     void * __restrict ps)
-{
-}
-
-static int
-/*ARGSUSED*/
-_citrus_mapper_std_mapper_convert(struct _citrus_mapper * __restrict cm,
-				  _index_t * __restrict dst, _index_t src,
-				  void * __restrict ps)
-{
-	struct _citrus_mapper_std *ms;
-
-	_DIAGASSERT(cm!=NULL && cm->cm_closure!=NULL);
-
-	ms = cm->cm_closure;
-
-	_DIAGASSERT(ms->ms_convert != NULL);
-
-	return (*ms->ms_convert)(ms, dst, src, ps);
-}
diff --git a/lib/libc/citrus/modules/citrus_mapper_std.h b/lib/libc/citrus/modules/citrus_mapper_std.h
deleted file mode 100644
index 83eae8237..000000000
--- a/lib/libc/citrus/modules/citrus_mapper_std.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: citrus_mapper_std.h,v 1.1 2003/06/25 09:51:47 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_MAPPER_STD_H_
-#define _CITRUS_MAPPER_STD_H_
-
-#include "citrus_mapper_std_local.h"
-
-__BEGIN_DECLS
-_CITRUS_MAPPER_GETOPS_FUNC(mapper_std);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_mapper_std_file.h b/lib/libc/citrus/modules/citrus_mapper_std_file.h
deleted file mode 100644
index c9d17cab2..000000000
--- a/lib/libc/citrus/modules/citrus_mapper_std_file.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: citrus_mapper_std_file.h,v 1.3 2006/09/09 14:35:17 tnozaki Exp $	*/
-
-/*-
- * Copyright (c)2003, 2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_MAPPER_STD_FILE_H_
-#define _CITRUS_MAPPER_STD_FILE_H_
-
-#define _CITRUS_MAPPER_STD_MAGIC		"MAPPER\0\0"
-
-#define _CITRUS_MAPPER_STD_SYM_TYPE		"type"
-#define _CITRUS_MAPPER_STD_SYM_INFO		"info"
-#define _CITRUS_MAPPER_STD_SYM_TABLE		"table"
-
-#define _CITRUS_MAPPER_STD_TYPE_ROWCOL		"rowcol"
-struct _citrus_mapper_std_rowcol_info_x {
-	u_int32_t		rcx_src_rowcol_bits;
-	u_int32_t		rcx_dst_invalid;
-#define _CITRUS_MAPPER_STD_ROWCOL_MAX			4
-	struct {
-		u_int32_t		begin;
-		u_int32_t		end;
-	} __packed		rcx_src_rowcol[_CITRUS_MAPPER_STD_ROWCOL_MAX];
-	u_int32_t		rcx_dst_unit_bits;
-	u_int32_t		rcx_src_rowcol_len;
-} __packed;
-#define _CITRUS_MAPPER_STD_ROWCOL_INFO_SIZE		48
-
-/* old file layout */
-struct _citrus_mapper_std_rowcol_info_compat_x {
-	u_int32_t		rcx_src_col_bits;
-	u_int32_t		rcx_dst_invalid;
-	u_int32_t		rcx_src_row_begin;
-	u_int32_t		rcx_src_row_end;
-	u_int32_t		rcx_src_col_begin;
-	u_int32_t		rcx_src_col_end;
-	u_int32_t		rcx_dst_unit_bits;
-	u_int32_t		rcx_pad;
-} __packed;
-#define _CITRUS_MAPPER_STD_ROWCOL_INFO_COMPAT_SIZE	32
-
-/* rowcol oob extension info */
-#define _CITRUS_MAPPER_STD_SYM_ROWCOL_EXT_ILSEQ		"rowcol_ext_ilseq"
-struct _citrus_mapper_std_rowcol_ext_ilseq_info_x {
-#define _CITRUS_MAPPER_STD_OOB_NONIDENTICAL	0
-#define _CITRUS_MAPPER_STD_OOB_ILSEQ		1
-	u_int32_t		eix_oob_mode;
-	u_int32_t		eix_dst_ilseq;
-} __packed;
-#define _CITRUS_MAPPER_STD_ROWCOL_EXT_ILSEQ_SIZE	8
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_mapper_std_local.h b/lib/libc/citrus/modules/citrus_mapper_std_local.h
deleted file mode 100644
index 631a296a3..000000000
--- a/lib/libc/citrus/modules/citrus_mapper_std_local.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: citrus_mapper_std_local.h,v 1.3 2006/09/09 14:35:17 tnozaki Exp $	*/
-
-/*-
- * Copyright (c)2003, 2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_MAPPER_STD_LOCAL_H_
-#define _CITRUS_MAPPER_STD_LOCAL_H_
-
-typedef u_int32_t (*_citrus_mapper_std_getvalfunc_t)(const void *, u_int32_t);
-
-struct _citrus_mapper_std_linear_zone {
-	_citrus_index_t		begin;
-	_citrus_index_t		end;
-	_citrus_index_t		width;
-};
-struct _citrus_mapper_std_rowcol {
-	struct _citrus_region	rc_table;
-	size_t			rc_src_rowcol_len;
-	struct _citrus_mapper_std_linear_zone
-				*rc_src_rowcol;
-	_citrus_index_t		rc_src_rowcol_bits;
-	_citrus_index_t		rc_src_rowcol_mask;
-	_citrus_index_t		rc_dst_invalid;
-	_citrus_index_t		rc_dst_unit_bits;
-	int			rc_oob_mode;
-	_citrus_index_t		rc_dst_ilseq;
-};
-
-struct _citrus_mapper_std;
-
-typedef int (*_citrus_mapper_std_convert_t)(
-	struct _citrus_mapper_std *__restrict,
-	_index_t *__restrict, _index_t, void *__restrict);
-typedef void (*_citrus_mapper_std_uninit_t)(struct _citrus_mapper_std *);
-
-struct _citrus_mapper_std {
-	struct _citrus_region		ms_file;
-	struct _citrus_db		*ms_db;
-	_citrus_mapper_std_convert_t	ms_convert;
-	_citrus_mapper_std_uninit_t	ms_uninit;
-	union {
-		struct _citrus_mapper_std_rowcol	rowcol;
-	} u;
-#define ms_rowcol	u.rowcol
-};
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_mapper_zone.c b/lib/libc/citrus/modules/citrus_mapper_zone.c
deleted file mode 100644
index 8eddefaf8..000000000
--- a/lib/libc/citrus/modules/citrus_mapper_zone.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/*	$NetBSD: citrus_mapper_zone.c,v 1.4 2003/07/12 15:39:21 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_mapper_zone.c,v 1.4 2003/07/12 15:39:21 tshiozak Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/queue.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_module.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_mmap.h"
-#include "citrus_hash.h"
-#include "citrus_mapper.h"
-#include "citrus_mapper_zone.h"
-
-/* ---------------------------------------------------------------------- */
-
-_CITRUS_MAPPER_DECLS(mapper_zone);
-_CITRUS_MAPPER_DEF_OPS(mapper_zone);
-
-
-/* ---------------------------------------------------------------------- */
-
-struct _zone {
-	u_int32_t z_begin;
-	u_int32_t z_end;
-};
-
-struct _citrus_mapper_zone {
-	struct _zone	mz_row;
-	struct _zone	mz_col;
-	int		mz_col_bits;
-	int32_t		mz_row_offset;
-	int32_t		mz_col_offset;
-};
-
-struct _parse_state {
-	enum { S_BEGIN, S_OFFSET }	ps_state;
-	union {
-		u_int32_t	u_imm;
-		int32_t		s_imm;
-		struct _zone	zone;
-	} u;
-#define ps_u_imm	u.u_imm
-#define ps_s_imm	u.s_imm
-#define ps_zone		u.zone
-	int ps_top;
-};
-
-int
-_citrus_mapper_zone_mapper_getops(struct _citrus_mapper_ops *ops,
-				  size_t lenops, uint32_t expected_version)
-{
-	if (expected_version<_CITRUS_MAPPER_ABI_VERSION || lenops<sizeof(*ops))
-		return EINVAL;
-
-	memcpy(ops, &_citrus_mapper_zone_mapper_ops,
-	       sizeof(_citrus_mapper_zone_mapper_ops));
-
-	return 0;
-}
-
-#define BUFSIZE 20
-#define T_ERR	0x100
-#define T_IMM	0x101
-
-static int
-get_imm(struct _memstream *ms, struct _parse_state *ps)
-{
-	int sign = 0;
-	int c, i;
-	char buf[BUFSIZE+1], *p;
-
-	for (i=0; i<BUFSIZE; i++) {
-retry:
-		c = _memstream_peek(ms);
-		if (i==0) {
-			if (sign == 0 && (c == '+' || c == '-')) {
-				sign = c;
-				_memstream_getc(ms);
-				goto retry;
-			} else if (!_bcs_isdigit(c))
-				break;
-		} else if (!_bcs_isxdigit(c))
-			if (!(i==1 && c == 'x'))
-				break;
-		buf[i] = _memstream_getc(ms);
-	}
-	buf[i] = '\0';
-	ps->ps_u_imm = strtoul(buf, &p, 0);
-	if ((p-buf) != i)
-		return T_ERR;
-	if (sign == '-')
-		ps->ps_u_imm = (unsigned long)-(long)ps->ps_u_imm;
-	return T_IMM;
-}
-
-static int
-get_tok(struct _memstream *ms, struct _parse_state *ps)
-{
-	int c;
-
-loop:
-	c = _memstream_peek(ms);
-	if (c==0x00)
-		return EOF;
-	if (_bcs_isspace(c)) {
-		_memstream_getc(ms);
-		goto loop;
-	}
-
-	switch (ps->ps_state) {
-	case S_BEGIN:
-		switch (c) {
-		case ':':
-		case '-':
-		case '/':
-			_memstream_getc(ms);
-			return c;
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9':
-			return get_imm(ms, ps);
-		}
-		break;
-	case S_OFFSET:
-		switch (c) {
-		case '/':
-			_memstream_getc(ms);
-			return c;
-		case '+': 
-		case '-': 
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9':
-			return get_imm(ms, ps);
-		}
-		break;
-	}
-	return T_ERR;
-}
-
-static int
-parse_zone(struct _memstream *ms, struct _parse_state *ps, struct _zone *z)
-{
-	if (get_tok(ms, ps) != T_IMM)
-		return -1;
-	z->z_begin = ps->ps_u_imm;
-	if (get_tok(ms, ps) != '-')
-		return -1;
-	if (get_tok(ms, ps) != T_IMM)
-		return -1;
-	z->z_end = ps->ps_u_imm;
-
-	if (z->z_begin > z->z_end)
-		return -1;
-
-	return 0;
-}
-
-static int
-check_rowcol(struct _zone *z, int32_t ofs, uint32_t maxval)
-{
-	u_int32_t remain;
-
-	if (maxval != 0 && z->z_end >= maxval)
-		return -1;
-
-	if (ofs > 0) {
-		if (maxval == 0) {
-			/* this should 0x100000000 - z->z_end */
-			if (z->z_end == 0) {
-				remain = 0xFFFFFFFF;
-			} else {
-				remain = 0xFFFFFFFF - z->z_end + 1;
-			}
-		} else
-			remain = maxval - z->z_end;
-		if ((u_int32_t)ofs > remain)
-			return -1;
-	} else if (ofs < 0) {
-		if (z->z_begin < (u_int32_t)-ofs)
-			return -1;
-	}
-
-	return 0;
-}
-
-static int
-parse_var(struct _citrus_mapper_zone *mz, struct _memstream *ms)
-{
-	struct _parse_state ps;
-	int ret, isrc;
-	uint32_t rowmax, colmax;
-
-	ps.ps_state = S_BEGIN;
-
-	if (parse_zone(ms, &ps, &mz->mz_col))
-		return -1;
-
-	ret = get_tok(ms, &ps);
-	if (ret == '/') {
-		/* rowzone / colzone / bits */
-		isrc = 1;
-		mz->mz_row = mz->mz_col;
-
-		if (parse_zone(ms, &ps, &mz->mz_col))
-			return -1;
-		if (get_tok(ms, &ps) != '/')
-			return -1;
-		if (get_tok(ms, &ps) != T_IMM)
-			return -1;
-		mz->mz_col_bits = ps.ps_u_imm;
-		if (mz->mz_col_bits<0 || mz->mz_col_bits>32)
-			return -1;
-		ret = get_tok(ms, &ps);
-	} else {
-		/* colzone */
-		isrc = 0;
-		mz->mz_col_bits = 32;
-		mz->mz_row.z_begin = mz->mz_row.z_end = 0;
-	}
-	if (ret == ':') {
-		/* offset */
-		ps.ps_state = S_OFFSET;
-		if (get_tok(ms, &ps) != T_IMM)
-			return -1;
-		mz->mz_col_offset = ps.ps_s_imm;
-		if (isrc) {
-			/* row/col */
-			mz->mz_row_offset = mz->mz_col_offset;
-			if (get_tok(ms, &ps) != '/')
-				return -1;
-			if (get_tok(ms, &ps) != T_IMM)
-				return -1;
-			mz->mz_col_offset = ps.ps_s_imm;
-		} else
-			mz->mz_row_offset = 0;
-		ret = get_tok(ms, &ps);
-	}
-	if (ret != EOF)
-		return -1;
-
-	/* sanity check */
-	if (mz->mz_col_bits==32)
-		colmax = 0;
-	else
-		colmax = 1 << mz->mz_col_bits;
-	if (mz->mz_col_bits==0)
-		rowmax = 0;
-	else
-		rowmax = 1 << (32-mz->mz_col_bits);
-	if (check_rowcol(&mz->mz_col, mz->mz_col_offset, colmax))
-		return -1;
-	if (check_rowcol(&mz->mz_row, mz->mz_row_offset, rowmax))
-		return -1;
-
-	return 0;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_mapper_zone_mapper_init(struct _citrus_mapper_area *__restrict ma,
-				struct _citrus_mapper * __restrict cm,
-				const char * __restrict dir,
-				const void * __restrict var, size_t lenvar,
-				struct _citrus_mapper_traits * __restrict mt,
-				size_t lenmt)
-{
-	struct _citrus_mapper_zone *mz;
-	struct _memstream ms;
-	struct _region r;
-
-	_DIAGASSERT(cm && dir && mt);
-
-	if (lenmt<sizeof(*mt))
-		return EINVAL;
-
-	mz = malloc(sizeof(*mz));
-	if (mz == NULL)
-		return errno;
-
-	mz->mz_col.z_begin = mz->mz_col.z_end = 0;
-	mz->mz_row.z_begin = mz->mz_row.z_end = 0;
-	mz->mz_col_bits = 0;
-	mz->mz_row_offset = 0;
-	mz->mz_col_offset = 0;
-
-	_region_init(&r, (void *)var, lenvar);
-	_memstream_bind(&ms, &r);
-	if (parse_var(mz, &ms)) {
-		free(mz);
-		return EINVAL;
-	}
-	cm->cm_closure = mz;
-	mt->mt_src_max = mt->mt_dst_max = 1;	/* 1:1 converter */
-	mt->mt_state_size = 0;			/* stateless */
-
-	return 0;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_mapper_zone_mapper_uninit(struct _citrus_mapper *cm)
-{
-}
-
-static int
-/*ARGSUSED*/
-_citrus_mapper_zone_mapper_convert(struct _citrus_mapper * __restrict cm,
-				   _citrus_index_t * __restrict dst,
-				   _citrus_index_t src, void * __restrict ps)
-{
-	u_int32_t row, col;
-	struct _citrus_mapper_zone *mz = cm->cm_closure;
-
-	if (mz->mz_col_bits == 32) {
-		col = src;
-		row = 0;
-		if (col < mz->mz_col.z_begin || col > mz->mz_col.z_end)
-			return _CITRUS_MAPPER_CONVERT_NONIDENTICAL;
-		if (mz->mz_col_offset>0)
-			col += (u_int32_t)mz->mz_col_offset;
-		else
-			col -= (u_int32_t)-mz->mz_col_offset;
-		*dst = col;
-	} else {
-		col = src & (((u_int32_t)1<<mz->mz_col_bits)-1);
-		row = src >> mz->mz_col_bits;
-		if (row < mz->mz_row.z_begin || row > mz->mz_row.z_end ||
-		    col < mz->mz_col.z_begin || col > mz->mz_col.z_end)
-			return _CITRUS_MAPPER_CONVERT_NONIDENTICAL;
-		if (mz->mz_col_offset>0)
-			col += (u_int32_t)mz->mz_col_offset;
-		else
-			col -= (u_int32_t)-mz->mz_col_offset;
-		if (mz->mz_row_offset>0)
-			row += (u_int32_t)mz->mz_row_offset;
-		else
-			row -= (u_int32_t)-mz->mz_row_offset;
-		*dst = col | (row << mz->mz_col_bits);
-	}
-	return _CITRUS_MAPPER_CONVERT_SUCCESS;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_mapper_zone_mapper_init_state(struct _citrus_mapper * __restrict cm,
-				      void * __restrict ps)
-{
-}
diff --git a/lib/libc/citrus/modules/citrus_mapper_zone.h b/lib/libc/citrus/modules/citrus_mapper_zone.h
deleted file mode 100644
index d975dd127..000000000
--- a/lib/libc/citrus/modules/citrus_mapper_zone.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: citrus_mapper_zone.h,v 1.1 2003/06/25 09:51:48 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_MAPPER_ZONE_H_
-#define _CITRUS_MAPPER_ZONE_H_
-
-__BEGIN_DECLS
-_CITRUS_MAPPER_GETOPS_FUNC(mapper_zone);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_mskanji.c b/lib/libc/citrus/modules/citrus_mskanji.c
deleted file mode 100644
index 808ca35e8..000000000
--- a/lib/libc/citrus/modules/citrus_mskanji.c
+++ /dev/null
@@ -1,546 +0,0 @@
-/*	$NetBSD: citrus_mskanji.c,v 1.14 2013/05/28 16:57:56 joerg Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- *    ja_JP.SJIS locale table for BSD4.4/rune
- *    version 1.0
- *    (C) Sin'ichiro MIYATANI / Phase One, Inc
- *    May 12, 1995
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Phase One, Inc.
- * 4. The name of Phase One, Inc. may be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE  
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL  
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS  
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT  
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY  
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF  
- * SUCH DAMAGE.  
- */  
-
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_mskanji.c,v 1.14 2013/05/28 16:57:56 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <wchar.h>
-#include <sys/types.h>
-#include <limits.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_stdenc.h"
-#include "citrus_mskanji.h"
-
-
-/* ----------------------------------------------------------------------
- * private stuffs used by templates
- */
-
-typedef struct _MSKanjiState {
-	char ch[2];
-	int chlen;
-} _MSKanjiState;
-
-typedef struct {
-	int mode;
-#define MODE_JIS2004	1
-} _MSKanjiEncodingInfo;
-
-typedef struct {
-	_MSKanjiEncodingInfo	ei;
-	struct {
-		/* for future multi-locale facility */
-		_MSKanjiState	s_mblen;
-		_MSKanjiState	s_mbrlen;
-		_MSKanjiState	s_mbrtowc;
-		_MSKanjiState	s_mbtowc;
-		_MSKanjiState	s_mbsrtowcs;
-		_MSKanjiState	s_mbsnrtowcs;
-		_MSKanjiState	s_wcrtomb;
-		_MSKanjiState	s_wcsrtombs;
-		_MSKanjiState	s_wcsnrtombs;
-		_MSKanjiState	s_wctomb;
-	} states;
-} _MSKanjiCTypeInfo;
-
-#define _CEI_TO_EI(_cei_)		(&(_cei_)->ei)
-#define _CEI_TO_STATE(_cei_, _func_)	(_cei_)->states.s_##_func_
-
-#define _FUNCNAME(m)			_citrus_MSKanji_##m
-#define _ENCODING_INFO			_MSKanjiEncodingInfo
-#define _CTYPE_INFO			_MSKanjiCTypeInfo
-#define _ENCODING_STATE			_MSKanjiState
-#define _ENCODING_MB_CUR_MAX(_ei_)	2
-#define _ENCODING_IS_STATE_DEPENDENT	0
-#define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	0
-
-
-static int
-_mskanji1(int c)
-{
-
-	if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xfc))
-		return 1;
-	else
-		return 0;
-}
-
-static int
-_mskanji2(int c)
-{
-
-	if ((c >= 0x40 && c <= 0x7e) || (c >= 0x80 && c <= 0xfc))
-		return 1;
-	else
-		return 0;
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_MSKanji_init_state(_MSKanjiEncodingInfo * __restrict ei,
-			   _MSKanjiState * __restrict s)
-{
-	s->chlen = 0;
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_MSKanji_pack_state(_MSKanjiEncodingInfo * __restrict ei,
-			   void * __restrict pspriv,
-			   const _MSKanjiState * __restrict s)
-{
-	memcpy(pspriv, (const void *)s, sizeof(*s));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_MSKanji_unpack_state(_MSKanjiEncodingInfo * __restrict ei,
-			     _MSKanjiState * __restrict s,
-			     const void * __restrict pspriv)
-{
-	memcpy((void *)s, pspriv, sizeof(*s));
-}
-
-static int
-/*ARGSUSED*/
-_citrus_MSKanji_mbrtowc_priv(_MSKanjiEncodingInfo * __restrict ei,
-			     wchar_t * __restrict pwc,
-			     const char ** __restrict s, size_t n,
-			     _MSKanjiState * __restrict psenc,
-			     size_t * __restrict nresult)
-{
-	wchar_t wchar;
-	int len;
-	int chlenbak;
-	const char *s0;
-
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	s0 = *s;
-
-	if (s0 == NULL) {
-		_citrus_MSKanji_init_state(ei, psenc);
-		*nresult = 0; /* state independent */
-		return (0);
-	}
-
-	chlenbak = psenc->chlen;
-
-	/* make sure we have the first byte in the buffer */
-	switch (psenc->chlen) {
-	case 0:
-		if (n < 1)
-			goto restart;
-		psenc->ch[0] = *s0++;
-		psenc->chlen = 1;
-		n--;
-		break;
-	case 1:
-		break;
-	default:
-		/* illegal state */
-		goto encoding_error;
-	}
-
-	len = _mskanji1(psenc->ch[0] & 0xff) ? 2 : 1;
-	while (psenc->chlen < len) {
-		if (n < 1)
-			goto restart;
-		psenc->ch[psenc->chlen] = *s0++;
-		psenc->chlen++;
-		n--;
-	}
-
-	*s = s0;
-
-	switch (len) {
-	case 1:
-		wchar = psenc->ch[0] & 0xff;
-		break;
-	case 2:
-		if (!_mskanji2(psenc->ch[1] & 0xff))
-			goto encoding_error;
-		wchar = ((psenc->ch[0] & 0xff) << 8) | (psenc->ch[1] & 0xff);
-		break;
-	default:
-		/* illegal state */
-		goto encoding_error;
-	}
-
-	psenc->chlen = 0;
-
-	if (pwc)
-		*pwc = wchar;
-
-	if (!wchar)
-		*nresult = 0;
-	else
-		*nresult = len - chlenbak;
-
-	return (0);
-
-encoding_error:
-	psenc->chlen = 0;
-	*nresult = (size_t)-1;
-	return (EILSEQ);
-
-restart:
-	*nresult = (size_t)-2;
-	*s = s0;
-	return (0);
-}
-
-
-static int
-_citrus_MSKanji_wcrtomb_priv(_MSKanjiEncodingInfo * __restrict ei,
-			     char * __restrict s, size_t n, wchar_t wc,
-			     _MSKanjiState * __restrict psenc,
-			     size_t * __restrict nresult)
-{
-	int ret;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(s != NULL);
-
-	/* check invalid sequence */
-	if (wc & ~0xffff) {
-		ret = EILSEQ;
-		goto err;
-	}
-
-	if (wc & 0xff00) {
-		if (n < 2) {
-			ret = E2BIG;
-			goto err;
-		}
-
-		s[0] = (wc >> 8) & 0xff;
-		s[1] = wc & 0xff;
-		if (!_mskanji1(s[0] & 0xff) || !_mskanji2(s[1] & 0xff)) {
-			ret = EILSEQ;
-			goto err;
-		}
-
-		*nresult = 2;
-		return 0;
-	} else {
-		if (n < 1) {
-			ret = E2BIG;
-			goto err;
-		}
-
-		s[0] = wc & 0xff;
-		if (_mskanji1(s[0] & 0xff)) {
-			ret = EILSEQ;
-			goto err;
-		}
-
-		*nresult = 1;
-		return 0;
-	}
-
-err:
-	*nresult = (size_t)-1;
-	return ret;
-}
-
-
-static __inline int
-/*ARGSUSED*/
-_citrus_MSKanji_stdenc_wctocs(_MSKanjiEncodingInfo * __restrict ei,
-			      _csid_t * __restrict csid,
-			      _index_t * __restrict idx, wchar_t wc)
-{
-	_index_t row, col;
-	int offset;
-
-	_DIAGASSERT(csid != NULL && idx != NULL);
-
-	if ((_wc_t)wc < 0x80) {
-		/* ISO-646 */
-		*csid = 0;
-		*idx = (_index_t)wc;
-	} else if ((_wc_t)wc < 0x100) {
-		/* KANA */
-		*csid = 1;
-		*idx = (_index_t)wc & 0x7F;
-	} else {
-		/* Kanji (containing Gaiji zone) */
-		/*
-		 * 94^2 zone (contains a part of Gaiji (0xED40 - 0xEEFC)):
-		 * 0x8140 - 0x817E -> 0x2121 - 0x215F
-		 * 0x8180 - 0x819E -> 0x2160 - 0x217E
-		 * 0x819F - 0x81FC -> 0x2221 - 0x227E
-		 *
-		 * 0x8240 - 0x827E -> 0x2321 - 0x235F
-		 *  ...
-		 * 0x9F9F - 0x9FFc -> 0x5E21 - 0x5E7E
-		 *
-		 * 0xE040 - 0xE07E -> 0x5F21 - 0x5F5F
-		 *  ...
-		 * 0xEF9F - 0xEFFC -> 0x7E21 - 0x7E7E
-		 *
-		 * extended Gaiji zone:
-		 * 0xF040 - 0xFCFC
-		 *
-		 * JIS X0213-plane2:
-		 * 0xF040 - 0xF09E -> 0x2121 - 0x217E
-		 * 0xF140 - 0xF19E -> 0x2321 - 0x237E
-		 * ...
-		 * 0xF240 - 0xF29E -> 0x2521 - 0x257E
-		 *
-		 * 0xF09F - 0xF0FC -> 0x2821 - 0x287E
-		 * 0xF29F - 0xF2FC -> 0x2C21 - 0x2C7E
-		 * ...
-		 * 0xF44F - 0xF49E -> 0x2F21 - 0x2F7E
-		 *
-		 * 0xF49F - 0xF4FC -> 0x6E21 - 0x6E7E
-		 * ...
-		 * 0xFC9F - 0xFCFC -> 0x7E21 - 0x7E7E
-		 */
-		row = ((_wc_t)wc >> 8) & 0xFF;
-		col = (_wc_t)wc & 0xFF;
-		if (!_mskanji1(row) || !_mskanji2(col))
-			return EILSEQ;
-		if ((ei->mode & MODE_JIS2004) == 0 || row < 0xF0) {
-			*csid = 2;
-			offset = 0x81;
-		} else {
-			*csid = 3;
-			if ((_wc_t)wc <= 0xF49E) {
-				offset = (_wc_t)wc >= 0xF29F ||
-				  ((_wc_t)wc >= 0xF09F && (_wc_t)wc <= 0xF0FC)
-				    ? 0xED : 0xF0;
-			} else
-				offset = 0xCE;
-		}
-		row -= offset;
-		if (row >= 0x5F)
-			row -= 0x40;
-		row = row * 2 + 0x21;
-		col -= 0x1F;
-		if (col >= 0x61)
-			col -= 1;
-		if (col > 0x7E) {
-			row += 1;
-			col -= 0x5E;
-		}
-		*idx = ((_index_t)row << 8) | col;
-	}
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_MSKanji_stdenc_cstowc(_MSKanjiEncodingInfo * __restrict ei,
-			      wchar_t * __restrict wc,
-			      _csid_t csid, _index_t idx)
-{
-	u_int32_t row, col;
-	int offset;
-
-	_DIAGASSERT(wc != NULL);
-
-	switch (csid) {
-	case 0:
-		/* ISO-646 */
-		if (idx >= 0x80)
-			return EILSEQ;
-		*wc = (wchar_t)idx;
-		break;
-	case 1:
-		/* kana */
-		if (idx >= 0x80)
-			return EILSEQ;
-		*wc = (wchar_t)idx + 0x80;
-		break;
-	case 3:
-		if ((ei->mode & MODE_JIS2004) == 0)
-			return EILSEQ;
-	/*FALLTHROUGH*/
-	case 2:
-		/* kanji */
-		row = (idx >> 8);
-		if (row < 0x21)
-			return EILSEQ;
-		if (csid == 3) {
-			if (row <= 0x2F)
-				offset = (row == 0x22 || row >= 0x26)
-				    ? 0xED : 0xF0;
-			else if (row >= 0x4D && row <= 0x7E)
-				offset = 0xCE;
-			else
-				return EILSEQ;
-		} else {
-			if (row > 0x97)
-				return EILSEQ;
-			offset = (row < 0x5F) ? 0x81 : 0xC1;
-		}
-		col = idx & 0xFF;
-		if (col < 0x21 || col > 0x7E)
-			return EILSEQ;
-		row -= 0x21; col -= 0x21;
-		if ((row & 1) == 0) {
-			col += 0x40;
-			if (col >= 0x7F)
-				col += 1;
-		} else
-			col += 0x9F;
-		row = row / 2 + offset;
-		*wc = ((wchar_t)row << 8) | col;
-		break;
-	default:
-		return EILSEQ;
-	}
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_MSKanji_stdenc_get_state_desc_generic(_MSKanjiEncodingInfo * __restrict ei,
-					      _MSKanjiState * __restrict psenc,
-					      int * __restrict rstate)
-{
-
-	if (psenc->chlen == 0)
-		*rstate = _STDENC_SDGEN_INITIAL;
-	else
-		*rstate = _STDENC_SDGEN_INCOMPLETE_CHAR;
-
-	return 0;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_MSKanji_encoding_module_init(_MSKanjiEncodingInfo *  __restrict ei,
-				     const void * __restrict var,
-				     size_t lenvar)
-{
-	const char *p;
-
-	_DIAGASSERT(ei != NULL);
-
-	p = var;
-#define MATCH(x, act)						\
-do {								\
-	if (lenvar >= (sizeof(#x)-1) &&				\
-	    _bcs_strncasecmp(p, #x, sizeof(#x)-1) == 0) {	\
-		act;						\
-		lenvar -= sizeof(#x)-1;				\
-		p += sizeof(#x)-1;				\
-	}							\
-} while (/*CONSTCOND*/0)
-	memset((void *)ei, 0, sizeof(*ei));
-	while (lenvar > 0) {
-		switch (_bcs_toupper(*p)) {
-		case 'J':
-			MATCH(JIS2004, ei->mode |= MODE_JIS2004);
-			break;
-		}
-		++p;
-		--lenvar;
-	}
-
-	return 0;
-}
-
-static void
-_citrus_MSKanji_encoding_module_uninit(_MSKanjiEncodingInfo *ei)
-{
-}
-
-/* ----------------------------------------------------------------------
- * public interface for ctype
- */
-
-_CITRUS_CTYPE_DECLS(MSKanji);
-_CITRUS_CTYPE_DEF_OPS(MSKanji);
-
-#include "citrus_ctype_template.h"
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(MSKanji);
-_CITRUS_STDENC_DEF_OPS(MSKanji);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_mskanji.h b/lib/libc/citrus/modules/citrus_mskanji.h
deleted file mode 100644
index 90aebe1b1..000000000
--- a/lib/libc/citrus/modules/citrus_mskanji.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: citrus_mskanji.h,v 1.2 2003/06/25 09:51:48 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_MSKANJI_H_
-#define _CITRUS_MSKANJI_H_
-
-__BEGIN_DECLS
-_CITRUS_CTYPE_GETOPS_FUNC(MSKanji);
-_CITRUS_STDENC_GETOPS_FUNC(MSKanji);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_ues.c b/lib/libc/citrus/modules/citrus_ues.c
deleted file mode 100644
index fa818e1f5..000000000
--- a/lib/libc/citrus/modules/citrus_ues.c
+++ /dev/null
@@ -1,474 +0,0 @@
-/* $NetBSD: citrus_ues.c,v 1.4 2013/05/28 16:57:56 joerg Exp $ */
-
-/*-
- * Copyright (c)2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_ues.c,v 1.4 2013/05/28 16:57:56 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <wchar.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_stdenc.h"
-#include "citrus_ues.h"
-
-typedef struct {
-	int mode;
-#define MODE_C99	1
-	size_t mb_cur_max;
-} _UESEncodingInfo;
-
-typedef struct {
-	int chlen;
-	char ch[12];
-} _UESState;
-
-typedef struct {
-	_UESEncodingInfo	ei;
-	struct {
-		/* for future multi-locale facility */
-		_UESState	s_mblen;
-		_UESState	s_mbrlen;
-		_UESState	s_mbrtowc;
-		_UESState	s_mbtowc;
-		_UESState	s_mbsrtowcs;
-		_UESState	s_mbsnrtowcs;
-		_UESState	s_wcrtomb;
-		_UESState	s_wcsrtombs;
-		_UESState	s_wcsnrtombs;
-		_UESState	s_wctomb;
-	} states;
-} _UESCTypeInfo;
-
-#define _CEI_TO_EI(_cei_)               (&(_cei_)->ei)
-#define _CEI_TO_STATE(_cei_, _func_)    (_cei_)->states.s_##_func_
-
-#define _FUNCNAME(m)			_citrus_UES_##m
-#define _ENCODING_INFO			_UESEncodingInfo
-#define _CTYPE_INFO			_UESCTypeInfo
-#define _ENCODING_STATE			_UESState
-#define _ENCODING_MB_CUR_MAX(_ei_)	(_ei_)->mb_cur_max
-#define _ENCODING_IS_STATE_DEPENDENT		0
-#define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	0
-
-static __inline void
-/*ARGSUSED*/
-_citrus_UES_init_state(_UESEncodingInfo * __restrict ei,
-	_UESState * __restrict psenc)
-{
-	psenc->chlen = 0;
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_UES_pack_state(_UESEncodingInfo * __restrict ei,
-	void *__restrict pspriv, const _UESState * __restrict psenc)
-{
-	/* ei seem to be unused */
-	_DIAGASSERT(pspriv != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	memcpy(pspriv, (const void *)psenc, sizeof(*psenc));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_UES_unpack_state(_UESEncodingInfo * __restrict ei,
-	_UESState * __restrict psenc, const void * __restrict pspriv)
-{
-	/* ei seem to be unused */
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(pspriv != NULL);
-
-	memcpy((void *)psenc, pspriv, sizeof(*psenc));
-}
-
-static __inline int
-to_int(int ch)
-{
-	if (ch >= '0' && ch <= '9')
-		return ch - '0';
-	else if (ch >= 'A' && ch <= 'F')
-		return (ch - 'A') + 10;
-	else if (ch >= 'a' && ch <= 'f')
-		return (ch - 'a') + 10;
-	return -1;
-}
-
-#define ESCAPE		'\\'
-#define UCS2_ESC	'u'
-#define UCS4_ESC	'U'
-
-#define UCS2_BIT	16
-#define UCS4_BIT	32
-#define BMP_MAX		UINT32_C(0xFFFF)
-#define UCS2_MAX	UINT32_C(0x10FFFF)
-#define UCS4_MAX	UINT32_C(0x7FFFFFFF)
-
-static const char *xdig = "0123456789abcdef";
-
-static __inline int
-to_str(char *s, wchar_t wc, int bit)
-{
-	char *p;
-
-	p = s;
-	*p++ = ESCAPE;
-	switch (bit) {
-	case UCS2_BIT:
-		*p++ = UCS2_ESC;
-		break;
-	case UCS4_BIT:
-		*p++ = UCS4_ESC;
-		break;
-	default:
-		abort();
-	}
-	do {
-		*p++ = xdig[(wc >> (bit -= 4)) & 0xF];
-	} while (bit > 0);
-	return p - s;
-}
-
-static __inline int
-is_hi_surrogate(wchar_t wc)
-{
-	return wc >= 0xD800 && wc <= 0xDBFF;
-}
-
-static __inline int
-is_lo_surrogate(wchar_t wc)
-{
-	return wc >= 0xDC00 && wc <= 0xDFFF;
-}
-
-static __inline wchar_t
-surrogate_to_ucs(wchar_t hi, wchar_t lo)
-{
-	_DIAGASSERT(is_hi_surrogate(hi));
-	_DIAGASSERT(is_lo_surrogate(lo));
-
-	hi -= 0xD800;
-	lo -= 0xDC00;
-	return (hi << 10 | lo) + 0x10000;
-}
-
-static __inline void
-ucs_to_surrogate(wchar_t wc, wchar_t * __restrict hi, wchar_t * __restrict lo)
-{
-	_DIAGASSERT(hi != NULL);
-	_DIAGASSERT(lo != NULL);
-	_DIAGASSERT(wc >= 0x10000);
-
-	wc -= 0x10000;
-	*hi = (wc >> 10) + 0xD800;
-	*lo = (wc & 0x3FF) + 0xDC00;
-}
-
-static __inline int
-is_basic(wchar_t wc)
-{
-	return (uint32_t)wc <= 0x9F &&
-	    wc != 0x24 && wc != 0x40 && wc != 0x60;
-}
-
-static int
-_citrus_UES_mbrtowc_priv(_UESEncodingInfo * __restrict ei,
-	wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
-	_UESState * __restrict psenc, size_t * __restrict nresult)
-{
-	const char *s0;
-	int ch, head, tail, num;
-	wchar_t hi, wc;
-
-	_DIAGASSERT(ei != NULL);
-	/* pwc may be null */
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	if (*s == NULL) {
-		_citrus_UES_init_state(ei, psenc);
-		*nresult = 0;
-		return 0;
-	}
-	s0 = *s;
-
-	hi = (wchar_t)0;
-	tail = 0;
-
-surrogate:
-	wc = (wchar_t)0;
-	head = tail;
-	if (psenc->chlen == head) {
-		if (n-- < 1)
-			goto restart;
-		psenc->ch[psenc->chlen++] = *s0++;
-	}
-	ch = (unsigned char)psenc->ch[head++];
-	if (ch == ESCAPE) {
-		if (psenc->chlen == head) {
-			if (n-- < 1)
-				goto restart;
-			psenc->ch[psenc->chlen++] = *s0++;
-		}
-		switch (psenc->ch[head]) {
-		case UCS2_ESC:
-			tail += 6;
-			break;
-		case UCS4_ESC:
-			if (ei->mode & MODE_C99) {
-				tail = 10;
-				break;
-			}
-		/*FALLTHROUGH*/
-		default:
-			tail = 0;
-		}
-		++head;
-	}
-	for (; head < tail; ++head) {
-		if (psenc->chlen == head) {
-			if (n-- < 1) {
-restart:
-				*s = s0;
-				*nresult = (size_t)-2;
-				return 0;
-			}
-			psenc->ch[psenc->chlen++] = *s0++;
-		}
-		num = to_int((int)(unsigned char)psenc->ch[head]);
-		if (num < 0) {
-			tail = 0;
-			break;
-		}
-		wc = (wc << 4) | num;
-	}
-	head = 0;
-	switch (tail) {
-	case 0:
-		break;
-	case 6:
-		if (hi != (wchar_t)0)
-			break;
-		if ((ei->mode & MODE_C99) == 0) {
-			if (is_hi_surrogate(wc) != 0) {
-				hi = wc;
-				goto surrogate;
-			}
-			if ((uint32_t)wc <= 0x7F /* XXX */ ||
-			    is_lo_surrogate(wc) != 0)
-				break;
-			goto done;
-		}
-	/*FALLTHROUGH*/
-	case 10:
-		if (is_basic(wc) == 0 && (uint32_t)wc <= UCS4_MAX &&
-		    is_hi_surrogate(wc) == 0 && is_lo_surrogate(wc) == 0)
-			goto done;
-		*nresult = (size_t)-1;
-		return EILSEQ;
-	case 12:
-		if (is_lo_surrogate(wc) == 0)
-			break;
-		wc = surrogate_to_ucs(hi, wc);
-		goto done;
-	}
-	ch = (unsigned char)psenc->ch[0];
-	head = psenc->chlen;
-	if (--head > 0)
-		memmove(&psenc->ch[0], &psenc->ch[1], head);
-	wc = (wchar_t)ch;
-done:
-	psenc->chlen = head;
-	if (pwc != NULL)
-		*pwc = wc;
-	*nresult = (size_t)((wc == 0) ? 0 : (s0 - *s));
-	*s = s0;
-
-	return 0;
-}
-
-static int
-_citrus_UES_wcrtomb_priv(_UESEncodingInfo * __restrict ei,
-	char * __restrict s, size_t n, wchar_t wc,
-	_UESState * __restrict psenc, size_t * __restrict nresult)
-{
-	wchar_t hi, lo;
-
-	if (psenc->chlen != 0)
-		return EINVAL;
-
-	if ((ei->mode & MODE_C99) ? is_basic(wc) : (uint32_t)wc <= 0x7F) {
-		if (n-- < 1)
-			goto e2big;
-		psenc->ch[psenc->chlen++] = (char)wc;
-	} else if ((uint32_t)wc <= BMP_MAX) {
-		if (n < 6)
-			goto e2big;
-		psenc->chlen = to_str(&psenc->ch[0], wc, UCS2_BIT);
-	} else if ((ei->mode & MODE_C99) == 0 && (uint32_t)wc <= UCS2_MAX) {
-		if (n < 12)
-			goto e2big;
-		ucs_to_surrogate(wc, &hi, &lo);
-		psenc->chlen += to_str(&psenc->ch[0], hi, UCS2_BIT);
-		psenc->chlen += to_str(&psenc->ch[6], lo, UCS2_BIT);
-	} else if ((ei->mode & MODE_C99) && (uint32_t)wc <= UCS4_MAX) {
-		if (n < 10)
-			goto e2big;
-		psenc->chlen = to_str(&psenc->ch[0], wc, UCS4_BIT);
-	} else {
-		*nresult = (size_t)-1;
-		return EILSEQ;
-	}
-	memcpy(s, psenc->ch, psenc->chlen);
-	*nresult = psenc->chlen;
-	psenc->chlen = 0;
-
-	return 0;
-
-e2big:
-	*nresult = (size_t)-1;
-	return E2BIG;
-}
-
-/*ARGSUSED*/
-static int
-_citrus_UES_stdenc_wctocs(_UESEncodingInfo * __restrict ei,
-	_csid_t * __restrict csid, _index_t * __restrict idx, wchar_t wc)
-{
-	/* ei seem to be unused */
-	_DIAGASSERT(csid != NULL);
-	_DIAGASSERT(idx != NULL);
-
-	*csid = 0;
-	*idx = (_index_t)wc;
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_UES_stdenc_cstowc(_UESEncodingInfo * __restrict ei,
-	wchar_t * __restrict wc, _csid_t csid, _index_t idx)
-{
-	/* ei seem to be unused */
-	_DIAGASSERT(wc != NULL);
-
-	if (csid != 0)
-		return EILSEQ;
-	*wc = (wchar_t)idx;
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_UES_stdenc_get_state_desc_generic(_UESEncodingInfo * __restrict ei,
-	_UESState * __restrict psenc, int * __restrict rstate)
-{
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(rstate != NULL);
-
-	if (psenc->chlen == 0)
-		*rstate = _STDENC_SDGEN_INITIAL;
-	else
-		*rstate = _STDENC_SDGEN_INCOMPLETE_CHAR; /* XXX */
- 
-	return 0;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_UES_encoding_module_uninit(_UESEncodingInfo *ei)
-{
-	/* ei seems to be unused */
-}
-
-static int
-/*ARGSUSED*/
-_citrus_UES_encoding_module_init(_UESEncodingInfo * __restrict ei,
-	const void * __restrict var, size_t lenvar)
-{
-	const char *p;
-
-	_DIAGASSERT(ei != NULL);
-
-	p = var;
-#define MATCH(x, act)						\
-do {								\
-        if (lenvar >= (sizeof(#x)-1) &&				\
-            _bcs_strncasecmp(p, #x, sizeof(#x)-1) == 0) {	\
-                act;						\
-                lenvar -= sizeof(#x)-1;				\
-                p += sizeof(#x)-1;				\
-        }							\
-} while (/*CONSTCOND*/0)
-	memset((void *)ei, 0, sizeof(*ei));
-	while (lenvar > 0) {
-		switch (_bcs_toupper(*p)) {
-		case 'C':
-			MATCH(C99, ei->mode |= MODE_C99);
-			break;
-		}
-		++p;
-		--lenvar;
-	}
-	ei->mb_cur_max = (ei->mode & MODE_C99) ? 10 : 12;
-
-	return 0;
-}
-
-/* ----------------------------------------------------------------------
- * public interface for ctype
- */
-
-_CITRUS_CTYPE_DECLS(UES);
-_CITRUS_CTYPE_DEF_OPS(UES);
-
-#include "citrus_ctype_template.h"
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(UES);
-_CITRUS_STDENC_DEF_OPS(UES);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_ues.h b/lib/libc/citrus/modules/citrus_ues.h
deleted file mode 100644
index 0df7f27a0..000000000
--- a/lib/libc/citrus/modules/citrus_ues.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $NetBSD: citrus_ues.h,v 1.1 2006/11/13 15:16:31 tnozaki Exp $ */
-
-/*-
- * Copyright (c)2004, 2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_UES_H_
-#define _CITRUS_UES_H_
-
-__BEGIN_DECLS
-_CITRUS_CTYPE_GETOPS_FUNC(UES);
-_CITRUS_STDENC_GETOPS_FUNC(UES);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_utf1632.c b/lib/libc/citrus/modules/citrus_utf1632.c
deleted file mode 100644
index ce05d2117..000000000
--- a/lib/libc/citrus/modules/citrus_utf1632.c
+++ /dev/null
@@ -1,485 +0,0 @@
-/*	$NetBSD: citrus_utf1632.c,v 1.12 2012/02/12 13:51:29 wiz Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_utf1632.c,v 1.12 2012/02/12 13:51:29 wiz Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <limits.h>
-#include <wchar.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_stdenc.h"
-#include "citrus_bcs.h"
-
-#include "citrus_utf1632.h"
-
-
-/* ----------------------------------------------------------------------
- * private stuffs used by templates
- */
-
-typedef struct {
-	u_int8_t		ch[4];
-	int			chlen;
-	int			current_endian;
-} _UTF1632State;
-
-typedef struct {
-	int		preffered_endian;
-	unsigned int	cur_max;
-#define _ENDIAN_UNKNOWN	0
-#define _ENDIAN_BIG	1
-#define _ENDIAN_LITTLE	2
-	u_int32_t	mode;
-#define _MODE_UTF32		0x00000001U
-#define _MODE_FORCE_ENDIAN	0x00000002U
-} _UTF1632EncodingInfo;
-
-#define _FUNCNAME(m)			_citrus_UTF1632_##m
-#define _ENCODING_INFO			_UTF1632EncodingInfo
-#define _ENCODING_STATE			_UTF1632State
-#define _ENCODING_MB_CUR_MAX(_ei_)	((_ei_)->cur_max)
-#define _ENCODING_IS_STATE_DEPENDENT	0
-#define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	0
-
-
-static __inline void
-/*ARGSUSED*/
-_citrus_UTF1632_init_state(_UTF1632EncodingInfo *ei, _UTF1632State *s)
-{
-	memset(s, 0, sizeof(*s));
-}
-
-static int
-_citrus_UTF1632_mbrtowc_priv(_UTF1632EncodingInfo *ei, wchar_t *pwc,
-			     const char **s, size_t n, _UTF1632State *psenc,
-			     size_t *nresult)
-{
-	int chlenbak, endian, needlen;
-	wchar_t wc;
-	size_t result;
-	const char *s0;
-
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	s0 = *s;
-
-	if (s0 == NULL) {
-		_citrus_UTF1632_init_state(ei, psenc);
-		*nresult = 0; /* state independent */
-		return (0);
-	}
-
-	result = 0;
-	chlenbak = psenc->chlen;
-
-refetch:
-	if ((ei->mode & _MODE_UTF32) != 0 || chlenbak>=2)
-		needlen = 4;
-	else
-		needlen = 2;
-
-	while (chlenbak < needlen) {
-		if (n==0)
-			goto restart;
-		psenc->ch[chlenbak++] = *s0++;
-		n--;
-		result++;
-	}
-
-	if (psenc->current_endian == _ENDIAN_UNKNOWN) {
-		if ((ei->mode & _MODE_FORCE_ENDIAN) == 0) {
-			/* judge endian marker */
-			if ((ei->mode & _MODE_UTF32) == 0) {
-				/* UTF16 */
-				if (psenc->ch[0]==0xFE && psenc->ch[1]==0xFF) {
-					psenc->current_endian = _ENDIAN_BIG;
-					chlenbak = 0;
-					goto refetch;
-				} else if (psenc->ch[0]==0xFF && psenc->ch[1]==0xFE) {
-					psenc->current_endian = _ENDIAN_LITTLE;
-					chlenbak = 0;
-					goto refetch;
-				}
-			} else {
-				/* UTF32 */
-				if (psenc->ch[0]==0x00 && psenc->ch[1]==0x00 &&
-				    psenc->ch[2]==0xFE && psenc->ch[3]==0xFF) {
-					psenc->current_endian = _ENDIAN_BIG;
-					chlenbak = 0;
-					goto refetch;
-				} else if (psenc->ch[0]==0xFF && psenc->ch[1]==0xFE &&
-					   psenc->ch[2]==0x00 && psenc->ch[3]==0x00) {
-					psenc->current_endian = _ENDIAN_LITTLE;
-					chlenbak = 0;
-					goto refetch;
-				}
-			}
-		}
-		psenc->current_endian = ei->preffered_endian;
-	}
-	endian = psenc->current_endian;
-
-	/* get wc */
-	if ((ei->mode & _MODE_UTF32) == 0) {
-		/* UTF16 */
-		if (needlen==2) {
-			switch (endian) {
-			case _ENDIAN_LITTLE:
-				wc = (psenc->ch[0] |
-				      ((wchar_t)psenc->ch[1] << 8));
-				break;
-			case _ENDIAN_BIG:
-				wc = (psenc->ch[1] |
-				      ((wchar_t)psenc->ch[0] << 8));
-				break;
-			default:
-				goto ilseq;
-			}
-			if (wc >= 0xD800 && wc <= 0xDBFF) {
-				/* surrogate high */
-				needlen=4;
-				goto refetch;
-			}
-		} else {
-			/* surrogate low */
-			wc -= 0xD800; /* wc : surrogate high (see above) */
-			wc <<= 10;
-			switch (endian) {
-			case _ENDIAN_LITTLE:
-				if (psenc->ch[3]<0xDC || psenc->ch[3]>0xDF)
-					goto ilseq;
-				wc |= psenc->ch[2];
-				wc |= (wchar_t)(psenc->ch[3] & 3) << 8;
-				break;
-			case _ENDIAN_BIG:
-				if (psenc->ch[2]<0xDC || psenc->ch[2]>0xDF)
-					goto ilseq;
-				wc |= psenc->ch[3];
-				wc |= (wchar_t)(psenc->ch[2] & 3) << 8;
-				break;
-			default:
-				goto ilseq;
-			}
-			wc += 0x10000;
-		}
-	} else {
-		/* UTF32 */
-		switch (endian) {
-		case _ENDIAN_LITTLE:
-			wc = (psenc->ch[0] |
-			      ((wchar_t)psenc->ch[1] << 8) |
-			      ((wchar_t)psenc->ch[2] << 16) |
-			      ((wchar_t)psenc->ch[3] << 24));
-			break;
-		case _ENDIAN_BIG:
-			wc = (psenc->ch[3] |
-			      ((wchar_t)psenc->ch[2] << 8) |
-			      ((wchar_t)psenc->ch[1] << 16) |
-			      ((wchar_t)psenc->ch[0] << 24));
-			break;
-		default:
-			goto ilseq;
-		}
-		if (wc >= 0xD800 && wc <= 0xDFFF)
-			goto ilseq;
-	}
-
-
-	*pwc = wc;
-	psenc->chlen = 0;
-	*nresult = result;
-	*s = s0;
-
-	return (0);
-
-ilseq:
-	*nresult = (size_t)-1;
-	psenc->chlen = 0;
-	return (EILSEQ);
-
-restart:
-	*nresult = (size_t)-2;
-	psenc->chlen = chlenbak;
-	*s = s0;
-	return (0);
-}
-
-static int
-_citrus_UTF1632_wcrtomb_priv(_UTF1632EncodingInfo *ei, char *s, size_t n,
-			     wchar_t wc, _UTF1632State *psenc,
-			     size_t *nresult)
-{
-	wchar_t wc2;
-	static const char _bom[4] = {
-#if BYTE_ORDER == BIG_ENDIAN
-	    0x00, 0x00, 0xFE, 0xFF,
-#else
-	    0xFF, 0xFE, 0x00, 0x00,
-#endif
-	};
-	const char *bom = &_bom[0];
-	size_t cnt;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(s != NULL);
-
-	cnt = (size_t)0;
-	if (psenc->current_endian == _ENDIAN_UNKNOWN) {
-		if ((ei->mode & _MODE_FORCE_ENDIAN) == 0) {
-			if (ei->mode & _MODE_UTF32) {
-				cnt = 4;
-			} else {
-				cnt = 2;
-#if BYTE_ORDER == BIG_ENDIAN
-				bom += 2;
-#endif
-			}
-			if (n < cnt)
-				goto e2big;
-			memcpy(s, bom, cnt);
-			s += cnt, n -= cnt;
-		}
-		psenc->current_endian = ei->preffered_endian;
-	}
-
-	wc2 = 0;
-	if ((ei->mode & _MODE_UTF32)==0) {
-		/* UTF16 */
-		if (wc>0xFFFF) {
-			/* surrogate */
-			if (wc>0x10FFFF)
-				goto ilseq;
-			if (n < 4)
-				goto e2big;
-			cnt += 4;
-			wc -= 0x10000;
-			wc2 = (wc & 0x3FF) | 0xDC00;
-			wc = (wc>>10) | 0xD800;
-		} else {
-			if (n < 2)
-				goto e2big;
-			cnt += 2;
-		}
-
-surrogate:
-		switch (psenc->current_endian) {
-		case _ENDIAN_BIG:
-			s[1] = wc;
-			s[0] = (wc >>= 8);
-			break;
-		case _ENDIAN_LITTLE:
-			s[0] = wc;
-			s[1] = (wc >>= 8);
-			break;
-		}
-		if (wc2!=0) {
-			wc = wc2;
-			wc2 = 0;
-			s += 2;
-			goto surrogate;
-		}
-	} else {
-		/* UTF32 */
-		if (wc >= 0xD800 && wc <= 0xDFFF)
-			goto ilseq;
-		if (n < 4)
-			goto e2big;
-		cnt += 4;
-		switch (psenc->current_endian) {
-		case _ENDIAN_BIG:
-			s[3] = wc;
-			s[2] = (wc >>= 8);
-			s[1] = (wc >>= 8);
-			s[0] = (wc >>= 8);
-			break;
-		case _ENDIAN_LITTLE:
-			s[0] = wc;
-			s[1] = (wc >>= 8);
-			s[2] = (wc >>= 8);
-			s[3] = (wc >>= 8);
-			break;
-		}
-	}
-	*nresult = cnt;
-
-	return 0;
-
-ilseq:
-	*nresult = (size_t)-1;
-	return EILSEQ;
-e2big:
-	*nresult = (size_t)-1;
-	return E2BIG;
-}
-
-static void
-parse_variable(_UTF1632EncodingInfo * __restrict ei,
-	       const void * __restrict var, size_t lenvar)
-{
-#define MATCH(x, act)						\
-do {								\
-	if (lenvar >= (sizeof(#x)-1) &&				\
-	    _bcs_strncasecmp(p, #x, sizeof(#x)-1) == 0) {	\
-		act;						\
-		lenvar -= sizeof(#x)-1;				\
-		p += sizeof(#x)-1;				\
-	}							\
-} while (/*CONSTCOND*/0)
-	const char *p;
-	p = var;
-	while (lenvar>0) {
-		switch (*p) {
-		case 'B':
-		case 'b':
-			MATCH(big, ei->preffered_endian = _ENDIAN_BIG);
-			break;
-		case 'L':
-		case 'l':
-			MATCH(little, ei->preffered_endian = _ENDIAN_LITTLE);
-			break;
-		case 'F':
-		case 'f':
-			MATCH(force, ei->mode |= _MODE_FORCE_ENDIAN);
-			break;
-		case 'U':
-		case 'u':
-			MATCH(utf32, ei->mode |= _MODE_UTF32);
-			break;
-		}
-		p++;
-		lenvar--;
-	}
-}
-
-static int
-/*ARGSUSED*/
-_citrus_UTF1632_encoding_module_init(_UTF1632EncodingInfo * __restrict ei,
-				     const void * __restrict var,
-				     size_t lenvar)
-{
-	_DIAGASSERT(ei != NULL);
-
-	memset((void *)ei, 0, sizeof(*ei));
-
-	parse_variable(ei, var, lenvar);
-
-	if ((ei->mode&_MODE_UTF32)==0)
-		ei->cur_max = 6; /* endian + surrogate */
-	else
-		ei->cur_max = 8; /* endian + normal */
-
-	if (ei->preffered_endian == _ENDIAN_UNKNOWN) {
-#if BYTE_ORDER == BIG_ENDIAN
-		ei->preffered_endian = _ENDIAN_BIG;
-#else
-		ei->preffered_endian = _ENDIAN_LITTLE;
-#endif
-	}
-
-	return (0);
-}
-
-static void
-/*ARGSUSED*/
-_citrus_UTF1632_encoding_module_uninit(_UTF1632EncodingInfo *ei)
-{
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_UTF1632_stdenc_wctocs(_UTF1632EncodingInfo * __restrict ei,
-			      _csid_t * __restrict csid,
-			      _index_t * __restrict idx,
-			      _wc_t wc)
-{
-
-	_DIAGASSERT(csid != NULL && idx != NULL);
-
-	*csid = 0;
-	*idx = (_index_t)wc;
-
-	return (0);
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_UTF1632_stdenc_cstowc(_UTF1632EncodingInfo * __restrict ei,
-			      _wc_t * __restrict wc,
-			      _csid_t csid, _index_t idx)
-{
-
-	_DIAGASSERT(wc != NULL);
-
-	if (csid != 0)
-		return (EILSEQ);
-
-	*wc = (_wc_t)idx;
-
-	return (0);
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_UTF1632_stdenc_get_state_desc_generic(_UTF1632EncodingInfo * __restrict ei,
-					      _UTF1632State * __restrict psenc,
-					      int * __restrict rstate)
-{
-
-	if (psenc->chlen == 0)
-		*rstate = _STDENC_SDGEN_INITIAL;
-	else
-		*rstate = _STDENC_SDGEN_INCOMPLETE_CHAR;
-
-	return 0;
-}
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(UTF1632);
-_CITRUS_STDENC_DEF_OPS(UTF1632);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_utf1632.h b/lib/libc/citrus/modules/citrus_utf1632.h
deleted file mode 100644
index 0fac6f312..000000000
--- a/lib/libc/citrus/modules/citrus_utf1632.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: citrus_utf1632.h,v 1.1 2003/06/25 09:51:49 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_UTF1632_H_
-#define _CITRUS_UTF1632_H_
-
-__BEGIN_DECLS
-_CITRUS_STDENC_GETOPS_FUNC(UTF1632);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_utf7.c b/lib/libc/citrus/modules/citrus_utf7.c
deleted file mode 100644
index eae0ee3eb..000000000
--- a/lib/libc/citrus/modules/citrus_utf7.c
+++ /dev/null
@@ -1,573 +0,0 @@
-/*	$NetBSD: citrus_utf7.c,v 1.6 2013/05/28 16:57:56 joerg Exp $	*/
-
-/*-
- * Copyright (c)2004, 2005 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
- 
-#include <sys/cdefs.h>
-#if defined(LIB_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_utf7.c,v 1.6 2013/05/28 16:57:56 joerg Exp $");
-#endif /* LIB_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <wchar.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_stdenc.h"
-#include "citrus_utf7.h"
-
-/* ----------------------------------------------------------------------
- * private stuffs used by templates
- */
-
-typedef struct {
-	uint16_t	cell[0x80];
-#define	EI_MASK		UINT16_C(0xff)
-#define EI_DIRECT	UINT16_C(0x100)
-#define EI_OPTION	UINT16_C(0x200)
-#define EI_SPACE	UINT16_C(0x400)
-} _UTF7EncodingInfo;
-
-typedef struct {
-	unsigned int
-		mode: 1,	/* whether base64 mode */
-		bits: 4,	/* need to hold 0 - 15 */
-		cache: 22,	/* 22 = BASE64_BIT + UTF16_BIT */
-		surrogate: 1;	/* whether surrogate pair or not */
-	int chlen;
-	char ch[4]; /* BASE64_IN, 3 * 6 = 18, most closed to UTF16_BIT */
-} _UTF7State;
-
-typedef struct {
-	_UTF7EncodingInfo	ei;
-	struct {
-		/* for future multi-locale facility */
-		_UTF7State	s_mblen;
-		_UTF7State	s_mbrlen;
-		_UTF7State	s_mbrtowc;
-		_UTF7State	s_mbtowc;
-		_UTF7State	s_mbsrtowcs;
-		_UTF7State	s_mbsnrtowcs;
-		_UTF7State	s_wcrtomb;
-		_UTF7State	s_wcsrtombs;
-		_UTF7State	s_wcsnrtombs;
-		_UTF7State	s_wctomb;
-	} states;
-} _UTF7CTypeInfo;
-
-#define	_CEI_TO_EI(_cei_)		(&(_cei_)->ei)
-#define	_CEI_TO_STATE(_cei_, _func_)	(_cei_)->states.s_##_func_
-
-#define	_FUNCNAME(m)			_citrus_UTF7_##m
-#define	_ENCODING_INFO			_UTF7EncodingInfo
-#define	_CTYPE_INFO			_UTF7CTypeInfo
-#define	_ENCODING_STATE			_UTF7State
-#define	_ENCODING_MB_CUR_MAX(_ei_)		4
-#define	_ENCODING_IS_STATE_DEPENDENT		1
-#define	_STATE_NEEDS_EXPLICIT_INIT(_ps_)	0
-
-static __inline void
-/*ARGSUSED*/
-_citrus_UTF7_init_state(_UTF7EncodingInfo * __restrict ei,
-	_UTF7State * __restrict s)
-{
-	/* ei appears to be unused */
-	_DIAGASSERT(s != NULL);
-
-	memset((void *)s, 0, sizeof(*s));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_UTF7_pack_state(_UTF7EncodingInfo * __restrict ei,
-	void *__restrict pspriv, const _UTF7State * __restrict s)
-{
-	/* ei seem to be unused */
-	_DIAGASSERT(pspriv != NULL);
-	_DIAGASSERT(s != NULL);
-
-	memcpy(pspriv, (const void *)s, sizeof(*s));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_UTF7_unpack_state(_UTF7EncodingInfo * __restrict ei,
-	_UTF7State * __restrict s, const void * __restrict pspriv)
-{
-	/* ei seem to be unused */
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(pspriv != NULL);
-
-	memcpy((void *)s, pspriv, sizeof(*s));
-}
-
-static const char base64[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	"abcdefghijklmnopqrstuvwxyz"
-	"0123456789+/";
-
-static const char direct[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	"abcdefghijklmnopqrstuvwxyz"
-	"0123456789(),-./:?";
-
-static const char option[] = "!\"#$%&';<=>@[]^_`{|}";
-static const char spaces[] = " \t\r\n";
-
-#define	BASE64_BIT	6
-#define	UTF16_BIT	16
-
-#define	BASE64_MAX	0x3f
-#define	UTF16_MAX	UINT16_C(0xffff)
-#define	UTF32_MAX	UINT32_C(0x10ffff)
-
-#define	BASE64_IN	'+'
-#define	BASE64_OUT	'-'
-
-#define	SHIFT7BIT(c)	((c) >> 7)
-#define	ISSPECIAL(c)	((c) == '\0' || (c) == BASE64_IN)
-
-#define	FINDLEN(ei, c) \
-	(SHIFT7BIT((c)) ? -1 : (((ei)->cell[(c)] & EI_MASK) - 1))
-
-#define	ISDIRECT(ei, c)	(!SHIFT7BIT((c)) && (ISSPECIAL((c)) || \
-	ei->cell[(c)] & (EI_DIRECT | EI_OPTION | EI_SPACE)))
-
-#define	ISSAFE(ei, c)	(!SHIFT7BIT((c)) && (ISSPECIAL((c)) || \
-	(c < 0x80 && ei->cell[(c)] & (EI_DIRECT | EI_SPACE))))
-
-/* surrogate pair */
-#define	SRG_BASE	UINT32_C(0x10000)
-#define	HISRG_MIN	UINT16_C(0xd800)
-#define	HISRG_MAX	UINT16_C(0xdbff)
-#define	LOSRG_MIN	UINT16_C(0xdc00)
-#define	LOSRG_MAX	UINT16_C(0xdfff)
-
-static int
-_citrus_UTF7_mbtoutf16(_UTF7EncodingInfo * __restrict ei,
-	uint16_t * __restrict u16, const char ** __restrict s, size_t n,
-	_UTF7State * __restrict psenc, size_t * __restrict nresult)
-{
-	_UTF7State sv;
-	const char *s0;
-	int i, done, len;
- 
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(s != NULL && *s != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	s0 = *s;
-	sv = *psenc;
-
-	for (i = 0, done = 0; done == 0; i++) {
-		_DIAGASSERT(i <= psenc->chlen);
-		if (i == psenc->chlen) {
-			if (n-- < 1) {
-				*nresult = (size_t)-2;
-				*s = s0;
-				sv.chlen = psenc->chlen;
-				*psenc = sv;
-				return 0;
-			}
-			psenc->ch[psenc->chlen++] = *s0++;
-		}
-		if (SHIFT7BIT((int)psenc->ch[i]))
-			goto ilseq;
-		if (!psenc->mode) {
-			if (psenc->bits > 0 || psenc->cache > 0)
-				return EINVAL;
-			if (psenc->ch[i] == BASE64_IN) {
-				psenc->mode = 1;
-			} else {
-				if (!ISDIRECT(ei, (int)psenc->ch[i]))
-					goto ilseq;
-				*u16 = (uint16_t)psenc->ch[i];
-				done = 1;
-				continue;
-			}
-		} else {
-			if (psenc->ch[i] == BASE64_OUT && psenc->cache == 0) {
-				psenc->mode = 0;
-				*u16 = (uint16_t)BASE64_IN;
-				done = 1;
-				continue;
-			}
-			len = FINDLEN(ei, (int)psenc->ch[i]);
-			if (len < 0) {
-				if (psenc->bits >= BASE64_BIT)
-					return EINVAL;
-				psenc->mode = 0;
-				psenc->bits = psenc->cache = 0;
-				if (psenc->ch[i] != BASE64_OUT) {
-					if (!ISDIRECT(ei, (int)psenc->ch[i]))
-						goto ilseq;
-					*u16 = (uint16_t)psenc->ch[i];
-					done = 1;
-				}
-			} else {
-				psenc->cache =
-				    (psenc->cache << BASE64_BIT) | len;
-				switch (psenc->bits) {
-				case 0: case 2: case 4: case 6: case 8:
-					psenc->bits += BASE64_BIT;
-					break;
-				case 10: case 12: case 14:
-					psenc->bits -= (UTF16_BIT - BASE64_BIT);
-					*u16 = (psenc->cache >> psenc->bits)
-					    & UTF16_MAX;
-					done = 1;
-					break;
-				default:
-					return EINVAL;
-				}
-			}
-		}
-	}
-
-	if (psenc->chlen > i)
-		return EINVAL;
-	psenc->chlen = 0;
-	*nresult = (size_t)((*u16 == 0) ? 0 : s0 - *s);
-	*s = s0;
-
-	return 0;
-
-ilseq:
-	*nresult = (size_t)-1;
-	return EILSEQ;
-}
-
-static int
-_citrus_UTF7_mbrtowc_priv(_UTF7EncodingInfo * __restrict ei,
-	wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
-	_UTF7State * __restrict psenc, size_t * __restrict nresult)
-{
-	const char *s0;
-	uint32_t u32;
-	uint16_t hi, lo;
-	size_t siz, nr;
-	int err;
-
-	_DIAGASSERT(ei != NULL);
-	/* pwc may be null */
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	if (*s == NULL) {
-		_citrus_UTF7_init_state(ei, psenc);
-		*nresult = (size_t)_ENCODING_IS_STATE_DEPENDENT;
-		return 0;
-	}
-	s0 = *s;
-	if (psenc->surrogate) {
-		hi = (psenc->cache >> 2) & UTF16_MAX;
-		if (hi < HISRG_MIN || hi > HISRG_MAX)
-			return EINVAL;
-		siz = 0;
-	} else {
-		err = _citrus_UTF7_mbtoutf16(ei, &hi, &s0, n, psenc, &nr);
-		if (nr == (size_t)-1 || nr == (size_t)-2) {
-			*nresult = nr;
-			return err;
-		}
-		if (err != 0)
-			return err;
-		n -= nr;
-		siz = nr;
-		if (hi < HISRG_MIN || hi > HISRG_MAX) {
-			u32 = (uint32_t)hi;
-			goto done;
-		}
-		psenc->surrogate = 1;
-	}
-	err = _citrus_UTF7_mbtoutf16(ei, &lo, &s0, n, psenc, &nr);
-	if (nr == (size_t)-1 || nr == (size_t)-2) {
-		*nresult = nr;
-		return err;
-	}
-	if (err != 0)
-		return err;
-	hi -= HISRG_MIN;
-	lo -= LOSRG_MIN;
-	u32 = (hi << 10 | lo) + SRG_BASE;
-	siz += nr;
-done:
-	*s = s0;
-	if (pwc != NULL)
-		*pwc = (wchar_t)u32;
-	if (u32 == (uint32_t)0) {
-		*nresult = (size_t)0;
-		_citrus_UTF7_init_state(ei, psenc);
-	} else {
-		*nresult = siz;
-		psenc->surrogate = 0;
-	}
-	return err;
-}
-
-static int
-_citrus_UTF7_utf16tomb(_UTF7EncodingInfo * __restrict ei,
-	char * __restrict s, size_t n, uint16_t u16,
-	_UTF7State * __restrict psenc, size_t * __restrict nresult)
-{
-	int bits, i;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	if (psenc->chlen != 0 || psenc->bits > BASE64_BIT)
-		return EINVAL;
-
-	if (ISSAFE(ei, u16)) {
-		if (psenc->mode) {
-			if (psenc->bits > 0) {
-				bits = BASE64_BIT - psenc->bits;
-				i = (psenc->cache << bits) & BASE64_MAX;
-				psenc->ch[psenc->chlen++] = base64[i];
-				psenc->bits = psenc->cache = 0;
-			}
-			if (u16 == BASE64_OUT || FINDLEN(ei, u16) >= 0)
-				psenc->ch[psenc->chlen++] = BASE64_OUT;
-			psenc->mode = 0;
-		}
-		if (psenc->bits != 0)
-			return EINVAL;
-		psenc->ch[psenc->chlen++] = (char)u16;
-		if (u16 == BASE64_IN)
-			psenc->ch[psenc->chlen++] = BASE64_OUT;
-	} else {
-		if (!psenc->mode) {
-			if (psenc->bits > 0)
-				return EINVAL;
-			psenc->ch[psenc->chlen++] = BASE64_IN;
-			psenc->mode = 1;
-		}
-		psenc->cache = (psenc->cache << UTF16_BIT) | u16;
-		bits = UTF16_BIT + psenc->bits;
-		psenc->bits = bits % BASE64_BIT;
-		while ((bits -= BASE64_BIT) >= 0) {
-			i = (psenc->cache >> bits) & BASE64_MAX;
-			psenc->ch[psenc->chlen++] = base64[i];
-		}
-	}
-	memcpy(s, psenc->ch, psenc->chlen);
-	*nresult = psenc->chlen;
-	psenc->chlen = 0;
-
-	return 0;
-}
-
-static int
-_citrus_UTF7_wcrtomb_priv(_UTF7EncodingInfo * __restrict ei,
-	char * __restrict s, size_t n, wchar_t wchar,
-	_UTF7State * __restrict psenc, size_t * __restrict nresult)
-{
-	uint32_t u32;
-	uint16_t u16[2];
-	int err, len, i;
-	size_t siz, nr;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	u32 = (uint32_t)wchar;
-	if (u32 <= UTF16_MAX) {
-		u16[0] = (uint16_t)u32;
-		len = 1;
-	} else if (u32 <= UTF32_MAX) {
-		u32 -= SRG_BASE;
-		u16[0] = (u32 >> 10) + HISRG_MIN;
-		u16[1] = ((uint16_t)(u32 & UINT32_C(0x3ff))) + LOSRG_MIN;
-		len = 2;
-	} else {
-		*nresult = (size_t)-1;
-		return EILSEQ;
-	}
-	siz = 0;
-	for (i = 0; i < len; ++i) {
-		err = _citrus_UTF7_utf16tomb(ei, s, n, u16[i], psenc, &nr);
-		if (err != 0)
-			return err; /* XXX: state has been modified */
-		s += nr;
-		n -= nr;
-		siz += nr;
-	}
-	*nresult = siz;
-
-	return 0;
-}
-
-static int
-/* ARGSUSED */
-_citrus_UTF7_put_state_reset(_UTF7EncodingInfo * __restrict ei,
-	char * __restrict s, size_t n, _UTF7State * __restrict psenc,
-	size_t * __restrict nresult)
-{
-	int bits, pos;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	if (psenc->chlen != 0 || psenc->bits > BASE64_BIT || psenc->surrogate)
-		return EINVAL;
-
-	if (psenc->mode) {
-		if (psenc->bits > 0) {
-			if (n-- < 1)
-				return E2BIG;
-			bits = BASE64_BIT - psenc->bits;
-			pos = (psenc->cache << bits) & BASE64_MAX;
-			psenc->ch[psenc->chlen++] = base64[pos];
-			psenc->ch[psenc->chlen++] = BASE64_OUT;
-			psenc->bits = psenc->cache = 0;
-		}
-		psenc->mode = 0;
-	}
-	if (psenc->bits != 0)
-		return EINVAL;
-	if (n-- < 1)
-		return E2BIG;
-
-	_DIAGASSERT(n >= psenc->chlen);
-	*nresult = (size_t)psenc->chlen;
-	if (psenc->chlen > 0) {
-		memcpy(s, psenc->ch, psenc->chlen);
-		psenc->chlen = 0;
-	}
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_UTF7_stdenc_wctocs(_UTF7EncodingInfo * __restrict ei,
-			   _csid_t * __restrict csid,
-			   _index_t * __restrict idx, wchar_t wc)
-{
-	/* ei seem to be unused */
-	_DIAGASSERT(csid != NULL);
-	_DIAGASSERT(idx != NULL);
-
-	*csid = 0;
-	*idx = (_index_t)wc;
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_UTF7_stdenc_cstowc(_UTF7EncodingInfo * __restrict ei,
-			   wchar_t * __restrict wc,
-			   _csid_t csid, _index_t idx)
-{
-	/* ei seem to be unused */
-	_DIAGASSERT(wc != NULL);
-
-	if (csid != 0)
-		return EILSEQ;
-	*wc = (wchar_t)idx;
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_UTF7_stdenc_get_state_desc_generic(_UTF7EncodingInfo * __restrict ei,
-					   _UTF7State * __restrict psenc,
-					   int * __restrict rstate)
-{
-
-	if (psenc->chlen == 0)
-		*rstate = _STDENC_SDGEN_INITIAL;
-	else
-		*rstate = _STDENC_SDGEN_INCOMPLETE_CHAR;
-
-	return 0;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_UTF7_encoding_module_uninit(_UTF7EncodingInfo *ei)
-{
-	/* ei seems to be unused */
-}
-
-static int
-/*ARGSUSED*/
-_citrus_UTF7_encoding_module_init(_UTF7EncodingInfo * __restrict ei,
-				  const void * __restrict var, size_t lenvar)
-{
-	const char *s;
-
-	_DIAGASSERT(ei != NULL);
-	/* var may be null */
-
-	memset(ei, 0, sizeof(*ei));
-
-#define FILL(str, flag)				\
-do {						\
-	for (s = str; *s != '\0'; s++)		\
-		ei->cell[*s & 0x7f] |= flag;	\
-} while (/*CONSTCOND*/0)
-
-	FILL(base64, (s - base64) + 1);
-	FILL(direct, EI_DIRECT);
-	FILL(option, EI_OPTION);
-	FILL(spaces, EI_SPACE);
-
-	return 0;
-}
-
-/* ----------------------------------------------------------------------
- * public interface for ctype
- */
-
-_CITRUS_CTYPE_DECLS(UTF7);
-_CITRUS_CTYPE_DEF_OPS(UTF7);
-
-#include "citrus_ctype_template.h"
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(UTF7);
-_CITRUS_STDENC_DEF_OPS(UTF7);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_utf7.h b/lib/libc/citrus/modules/citrus_utf7.h
deleted file mode 100644
index 8502acefd..000000000
--- a/lib/libc/citrus/modules/citrus_utf7.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: citrus_utf7.h,v 1.1 2005/03/05 18:05:15 tnozaki Exp $	*/
-
-/*-
- * Copyright (c)2004,2005 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_UTF7_H_
-#define _CITRUS_UTF7_H_
-
-__BEGIN_DECLS
-_CITRUS_CTYPE_GETOPS_FUNC(UTF7);
-_CITRUS_STDENC_GETOPS_FUNC(UTF7);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_utf8.c b/lib/libc/citrus/modules/citrus_utf8.c
deleted file mode 100644
index 0b7df8865..000000000
--- a/lib/libc/citrus/modules/citrus_utf8.c
+++ /dev/null
@@ -1,397 +0,0 @@
-/*	$NetBSD: citrus_utf8.c,v 1.18 2013/05/28 16:57:56 joerg Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_utf8.c,v 1.18 2013/05/28 16:57:56 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <wchar.h>
-#include <sys/types.h>
-#include <limits.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_stdenc.h"
-#include "citrus_utf8.h"
-
-
-/* ----------------------------------------------------------------------
- * private stuffs used by templates
- */
-
-static int _UTF8_count_array[256];
-static int const *_UTF8_count = NULL;
-
-static const u_int32_t _UTF8_range[] = {
-	0,	/*dummy*/
-	0x00000000, 0x00000080, 0x00000800, 0x00010000, 
-	0x00200000, 0x04000000, 0x80000000,
-};
-
-typedef struct {
-	char ch[6];
-	int chlen;
-} _UTF8State;
-
-typedef struct {
-} _UTF8EncodingInfo;
-
-typedef struct {
-	_UTF8EncodingInfo	ei;
-	struct {
-		/* for future multi-locale facility */
-		_UTF8State	s_mblen;
-		_UTF8State	s_mbrlen;
-		_UTF8State	s_mbrtowc;
-		_UTF8State	s_mbtowc;
-		_UTF8State	s_mbsrtowcs;
-		_UTF8State	s_mbsnrtowcs;
-		_UTF8State	s_wcrtomb;
-		_UTF8State	s_wcsrtombs;
-		_UTF8State	s_wcsnrtombs;
-		_UTF8State	s_wctomb;
-	} states;
-} _UTF8CTypeInfo;
-
-#define _CEI_TO_EI(_cei_)		(&(_cei_)->ei)
-#define _CEI_TO_STATE(_ei_, _func_)	(_ei_)->states.s_##_func_
-
-#define _FUNCNAME(m)			_citrus_UTF8_##m
-#define _ENCODING_INFO			_UTF8EncodingInfo
-#define _CTYPE_INFO			_UTF8CTypeInfo
-#define _ENCODING_STATE			_UTF8State
-#define _ENCODING_MB_CUR_MAX(_ei_)	6
-#define _ENCODING_IS_STATE_DEPENDENT	0
-#define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	0
-
-
-static __inline void
-_UTF8_init_count(void)
-{
-	int i;
-	if (!_UTF8_count) {
-		memset(_UTF8_count_array, 0, sizeof(_UTF8_count_array));
-		for (i = 0; i <= 0x7f; i++)
-			_UTF8_count_array[i] = 1;
-		for (i = 0xc0; i <= 0xdf; i++)
-			_UTF8_count_array[i] = 2;
-		for (i = 0xe0; i <= 0xef; i++)
-			_UTF8_count_array[i] = 3;
-		for (i = 0xf0; i <= 0xf7; i++)
-			_UTF8_count_array[i] = 4;
-		for (i = 0xf8; i <= 0xfb; i++)
-			_UTF8_count_array[i] = 5;
-		for (i = 0xfc; i <= 0xfd; i++)
-			_UTF8_count_array[i] = 6;
-		_UTF8_count = _UTF8_count_array;
-	}
-}
-
-static int
-_UTF8_findlen(wchar_t v)
-{
-	int i;
-	u_int32_t c;
-
-	c = (u_int32_t)v;	/*XXX*/
-	for (i = 1; i < sizeof(_UTF8_range) / sizeof(_UTF8_range[0]) - 1; i++)
-		if (c >= _UTF8_range[i] && c < _UTF8_range[i + 1])
-			return i;
-
-	return -1;	/*out of range*/
-}
-
-static __inline int
-_UTF8_surrogate(wchar_t wc)
-{
-	return wc >= 0xd800 && wc <= 0xdfff;
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_UTF8_init_state(_UTF8EncodingInfo *ei, _UTF8State *s)
-{
-	s->chlen = 0;
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_UTF8_pack_state(_UTF8EncodingInfo *ei, void *pspriv,
-			const _UTF8State *s)
-{
-	memcpy(pspriv, (const void *)s, sizeof(*s));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_UTF8_unpack_state(_UTF8EncodingInfo *ei, _UTF8State *s,
-			  const void *pspriv)
-{
-	memcpy((void *)s, pspriv, sizeof(*s));
-}
-
-static int
-_citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo *ei, wchar_t *pwc, const char **s,
-			  size_t n, _UTF8State *psenc, size_t *nresult)
-{
-	wchar_t wchar;
-	const char *s0;
-	int c;
-	int i;
-
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	s0 = *s;
-
-	if (s0 == NULL) {
-		_citrus_UTF8_init_state(ei, psenc);
-		*nresult = 0; /* state independent */
-		return 0;
-	}
-
-	/* make sure we have the first byte in the buffer */
-	if (psenc->chlen == 0) {
-		if (n-- < 1)
-			goto restart;
-		psenc->ch[psenc->chlen++] = *s0++;
-	}
-
-	c = _UTF8_count[psenc->ch[0] & 0xff];
-	if (c < 1 || c < psenc->chlen)
-		goto ilseq;
-
-	if (c == 1)
-		wchar = psenc->ch[0] & 0xff;
-	else {
-		while (psenc->chlen < c) {
-			if (n-- < 1)
-				goto restart;
-			psenc->ch[psenc->chlen++] = *s0++;
-		}
-		wchar = psenc->ch[0] & (0x7f >> c);
-		for (i = 1; i < c; i++) {
-			if ((psenc->ch[i] & 0xc0) != 0x80)
-				goto ilseq;
-			wchar <<= 6;
-			wchar |= (psenc->ch[i] & 0x3f);
-		}
-		if (_UTF8_surrogate(wchar) || _UTF8_findlen(wchar) != c)
-			goto ilseq;
-	}
-	if (pwc != NULL)
-		*pwc = wchar;
-	*nresult = (wchar == 0) ? 0 : s0 - *s;
-	*s = s0;
-	psenc->chlen = 0;
-
-	return 0;
-
-ilseq:
-	*nresult = (size_t)-1;
-	return EILSEQ;
-
-restart:
-	*s = s0;
-	*nresult = (size_t)-2;
-	return 0;
-}
-
-static int
-_citrus_UTF8_wcrtomb_priv(_UTF8EncodingInfo *ei, char *s, size_t n, wchar_t wc,
-			  _UTF8State *psenc, size_t *nresult)
-{
-	int cnt, i, ret;
-	wchar_t c;
-
-	_DIAGASSERT(nresult != 0);
-	_DIAGASSERT(s != NULL);
-
-	if (_UTF8_surrogate(wc)) {
-		ret = EILSEQ;
-		goto err;
-	}
-	cnt = _UTF8_findlen(wc);
-	if (cnt <= 0 || cnt > 6) {
-		/* invalid UCS4 value */
-		ret = EILSEQ;
-		goto err;
-	}
-	if (n < cnt) {
-		/* bound check failure */
-		ret = E2BIG;
-		goto err;
-	}
-
-	c = wc;
-	if (s) {
-		for (i = cnt - 1; i > 0; i--) {
-			s[i] = 0x80 | (c & 0x3f);
-			c >>= 6;
-		}
-		s[0] = c;
-		if (cnt == 1)
-			s[0] &= 0x7f;
-		else {
-			s[0] &= (0x7f >> cnt);
-			s[0] |= ((0xff00 >> cnt) & 0xff);
-		}
-	}
-
-	*nresult = (size_t)cnt;
-	return 0;
-
-err:
-	*nresult = (size_t)-1;
-	return ret;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_UTF8_stdenc_wctocs(_UTF8EncodingInfo * __restrict ei,
-			   _csid_t * __restrict csid,
-			   _index_t * __restrict idx,
-			   wchar_t wc)
-{
-
-	_DIAGASSERT(csid != NULL && idx != NULL);
-
-	*csid = 0;
-	*idx = (_citrus_index_t)wc;
-
-	return (0);
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_UTF8_stdenc_cstowc(_UTF8EncodingInfo * __restrict ei,
-			   wchar_t * __restrict wc,
-			   _csid_t csid, _index_t idx)
-{
-
-	_DIAGASSERT(wc != NULL);
-
-	if (csid != 0)
-		return (EILSEQ);
-
-	*wc = (wchar_t)idx;
-
-	return (0);
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_UTF8_stdenc_get_state_desc_generic(_UTF8EncodingInfo * __restrict ei,
-					   _UTF8State * __restrict psenc,
-					   int * __restrict rstate)
-{
-
-	if (psenc->chlen == 0)
-		*rstate = _STDENC_SDGEN_INITIAL;
-	else
-		*rstate = _STDENC_SDGEN_INCOMPLETE_CHAR;
-
-	return 0;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_UTF8_encoding_module_init(_UTF8EncodingInfo * __restrict ei,
-				  const void * __restrict var, size_t lenvar)
-{
-	_UTF8_init_count();
-
-	return 0;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_UTF8_encoding_module_uninit(_UTF8EncodingInfo *ei)
-{
-}
-
-
-/* ----------------------------------------------------------------------
- * public interface for ctype
- */
-
-_CITRUS_CTYPE_DECLS(UTF8);
-_CITRUS_CTYPE_DEF_OPS(UTF8);
-
-#include "citrus_ctype_template.h"
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(UTF8);
-_CITRUS_STDENC_DEF_OPS(UTF8);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_utf8.h b/lib/libc/citrus/modules/citrus_utf8.h
deleted file mode 100644
index 9e57b6b69..000000000
--- a/lib/libc/citrus/modules/citrus_utf8.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: citrus_utf8.h,v 1.2 2003/06/25 09:51:49 tshiozak Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_UTF8_H_
-#define _CITRUS_UTF8_H_
-
-__BEGIN_DECLS
-_CITRUS_CTYPE_GETOPS_FUNC(UTF8);
-_CITRUS_STDENC_GETOPS_FUNC(UTF8);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_viqr.c b/lib/libc/citrus/modules/citrus_viqr.c
deleted file mode 100644
index 06e744f06..000000000
--- a/lib/libc/citrus/modules/citrus_viqr.c
+++ /dev/null
@@ -1,574 +0,0 @@
-/* $NetBSD: citrus_viqr.c,v 1.6 2013/05/28 16:57:56 joerg Exp $ */
-
-/*-
- * Copyright (c)2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_viqr.c,v 1.6 2013/05/28 16:57:56 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/queue.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <wchar.h>
-#include <limits.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_stdenc.h"
-#include "citrus_viqr.h"
-
-#define ESCAPE	'\\'
-
-/*
- * this table generated from RFC 1456.
- */
-static const char *mnemonic_rfc1456[0x100] = {
-  NULL , NULL , "A(?", NULL , NULL , "A(~", "A^~", NULL ,
-  NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ,
-  NULL , NULL , NULL , NULL , "Y?" , NULL , NULL , NULL ,
-  NULL , "Y~" , NULL , NULL , NULL , NULL , "Y." , NULL ,
-  NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ,
-  NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ,
-  NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ,
-  NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ,
-  NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ,
-  NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ,
-  NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ,
-  NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ,
-  NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ,
-  NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ,
-  NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ,
-  NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ,
-  "A." , "A('", "A(`", "A(.", "A^'", "A^`", "A^?", "A^.",
-  "E~" , "E." , "E^'", "E^`", "E^?", "E^~", "E^.", "O^'",
-  "O^`", "O^?", "O^~", "O^.", "O+.", "O+'", "O+`", "O+?",
-  "I." , "O?" , "O." , "I?" , "U?" , "U~" , "U." , "Y`" ,
-  "O~" , "a('", "a(`", "a(.", "a^'", "a^`", "a^?", "a^.",
-  "e~" , "e." , "e^'", "e^`", "e^?", "e^~", "e^.", "o^'",
-  "o^`", "o^?", "o^~", "O+~", "O+" , "o^.", "o+`", "o+?",
-  "i." , "U+.", "U+'", "U+`", "U+?", "o+" , "o+'", "U+" ,
-  "A`" , "A'" , "A^" , "A~" , "A?" , "A(" , "a(?", "a(~",
-  "E`" , "E'" , "E^" , "E?" , "I`" , "I'" , "I~" , "y`" ,
-  "DD" , "u+'", "O`" , "O'" , "O^" , "a." , "y?" , "u+`",
-  "u+?", "U`" , "U'" , "y~" , "y." , "Y'" , "o+~", "u+" ,
-  "a`" , "a'" , "a^" , "a~" , "a?" , "a(" , "u+~", "a^~",
-  "e`" , "e'" , "e^" , "e?" , "i`" , "i'" , "i~" , "i?" ,
-  "dd" , "u+.", "o`" , "o'" , "o^" , "o~" , "o?" , "o." ,
-  "u." , "u`" , "u'" , "u~" , "u?" , "y'" , "o+.", "U+~",
-};
-
-typedef struct {
-	const char *name;
-	wchar_t value;
-} mnemonic_def_t;
-
-static const mnemonic_def_t mnemonic_ext[] = {
-/* add extra mnemonic here (should be sorted by wchar_t order). */
-};
-static const size_t mnemonic_ext_size =
-	sizeof(mnemonic_ext) / sizeof(mnemonic_def_t);
-
-static const char *
-mnemonic_ext_find(wchar_t wc, const mnemonic_def_t *head, size_t n)
-{
-	const mnemonic_def_t *mid;
-
-	_DIAGASSERT(head != NULL);
-
-	for (; n > 0; n >>= 1) {
-		mid = head + (n >> 1);
-		if (mid->value == wc) {
-			return mid->name;
-		} else if (mid->value < wc) {
-			head = mid + 1;
-			--n;
-		}
-	}
-	return NULL;
-}
-
-struct mnemonic_t;
-typedef TAILQ_HEAD(mnemonic_list_t, mnemonic_t) mnemonic_list_t;
-typedef struct mnemonic_t {
-	TAILQ_ENTRY(mnemonic_t) entry;
-	int ascii;
-	struct mnemonic_t *parent;
-	mnemonic_list_t child;
-	wchar_t value;
-} mnemonic_t;
-
-static mnemonic_t *
-mnemonic_list_find(mnemonic_list_t *ml, int ch)
-{
-	mnemonic_t *m;
-
-	_DIAGASSERT(ml != NULL);
-
-	TAILQ_FOREACH(m, ml, entry) {
-		if (m->ascii == ch)
-			return m;
-	}
-
-	return NULL;
-}
-
-static mnemonic_t *
-mnemonic_create(mnemonic_t *parent, int ascii, wchar_t value)
-{
-	mnemonic_t *m;
-
-	_DIAGASSERT(parent != NULL);
-
-	m = malloc(sizeof(*m));
-	if (m != NULL) {
-		m->parent = parent;
-		m->ascii = ascii;
-		m->value = value;
-		TAILQ_INIT(&m->child);
-	}
-
-	return m;
-}
-
-static int
-mnemonic_append_child(mnemonic_t *m, const char *s,
-	wchar_t value, wchar_t invalid)
-{
-	int ch;
-	mnemonic_t *m0;
-
-	_DIAGASSERT(m != NULL);
-	_DIAGASSERT(s != NULL);
-
-	ch = (unsigned char)*s++;
-	if (ch == '\0')
-		return EINVAL;
-	m0 = mnemonic_list_find(&m->child, ch);
-	if (m0 == NULL) {
-		m0 = mnemonic_create(m, ch, (wchar_t)ch);
-		if (m0 == NULL)
-			return ENOMEM;
-		TAILQ_INSERT_TAIL(&m->child, m0, entry);
-	}
-	m = m0;
-	for (m0 = NULL; (ch = (unsigned char)*s) != '\0'; ++s) {
-		m0 = mnemonic_list_find(&m->child, ch);
-		if (m0 == NULL) {
-			m0 = mnemonic_create(m, ch, invalid);
-			if (m0 == NULL)
-				return ENOMEM;
-			TAILQ_INSERT_TAIL(&m->child, m0, entry);
-		}
-		m = m0;
-	}
-	if (m0 == NULL)
-		return EINVAL;
-	m0->value = value;
-
-	return 0;
-}
-
-static void
-mnemonic_destroy(mnemonic_t *m)
-{
-	mnemonic_t *m0;
-
-	_DIAGASSERT(m != NULL);
-
-	TAILQ_FOREACH(m0, &m->child, entry)
-		mnemonic_destroy(m0);
-	free(m);
-}
-
-typedef struct {
-	size_t mb_cur_max;
-	wchar_t invalid;
-	mnemonic_t *mroot;
-} _VIQREncodingInfo;
-
-typedef struct {
-	int chlen;
-	char ch[MB_LEN_MAX];
-} _VIQRState;
-
-typedef struct {
-	_VIQREncodingInfo	ei;
-	struct {
-		/* for future multi-locale facility */
-		_VIQRState	s_mblen;
-		_VIQRState	s_mbrlen;
-		_VIQRState	s_mbrtowc;
-		_VIQRState	s_mbtowc;
-		_VIQRState	s_mbsrtowcs;
-		_VIQRState	s_mbsnrtowcs;
-		_VIQRState	s_wcrtomb;
-		_VIQRState	s_wcsrtombs;
-		_VIQRState	s_wcsnrtombs;
-		_VIQRState	s_wctomb;
-	} states;
-} _VIQRCTypeInfo;
-
-#define _CEI_TO_EI(_cei_)		(&(_cei_)->ei)
-#define _CEI_TO_STATE(_cei_, _func_)	(_cei_)->states.s_##_func_
-
-#define _FUNCNAME(m)			_citrus_VIQR_##m
-#define _ENCODING_INFO			_VIQREncodingInfo
-#define _CTYPE_INFO			_VIQRCTypeInfo
-#define _ENCODING_STATE			_VIQRState
-#define _ENCODING_MB_CUR_MAX(_ei_)	(_ei_)->mb_cur_max
-#define _ENCODING_IS_STATE_DEPENDENT		1
-#define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	0
-
-static __inline void
-/*ARGSUSED*/
-_citrus_VIQR_init_state(_VIQREncodingInfo * __restrict ei,
-	_VIQRState * __restrict psenc)
-{
-	/* ei may be unused */
-	_DIAGASSERT(psenc != NULL);
-
-	psenc->chlen = 0;
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_VIQR_pack_state(_VIQREncodingInfo * __restrict ei,
-	void *__restrict pspriv, const _VIQRState * __restrict psenc)
-{
-	/* ei may be unused */
-	_DIAGASSERT(pspriv != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	memcpy(pspriv, (const void *)psenc, sizeof(*psenc));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_VIQR_unpack_state(_VIQREncodingInfo * __restrict ei,
-	_VIQRState * __restrict psenc, const void * __restrict pspriv)
-{
-	/* ei may be unused */
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(pspriv != NULL);
-
-	memcpy((void *)psenc, pspriv, sizeof(*psenc));
-}
-
-static int
-_citrus_VIQR_mbrtowc_priv(_VIQREncodingInfo * __restrict ei,
-	wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
-	_VIQRState * __restrict psenc, size_t * __restrict nresult)
-{
-	const char *s0;
-	wchar_t wc;
-	mnemonic_t *m, *m0;
-	size_t i;
-	int ch, escape;
-
-	_DIAGASSERT(ei != NULL);
-	/* pwc may be null */
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	if (*s == NULL) {
-		_citrus_VIQR_init_state(ei, psenc);
-		*nresult = (size_t)_ENCODING_IS_STATE_DEPENDENT;
-		return 0;
-	}
-	s0 = *s;
-
-	i = 0;
-	m = ei->mroot;
-	for (escape = 0;;) {
-		if (psenc->chlen == i) {
-			if (n-- < 1) {
-				*s = s0;
-				*nresult = (size_t)-2;
-				return 0;
-			}
-			psenc->ch[psenc->chlen++] = *s0++;
-		}
-		ch = (unsigned char)psenc->ch[i++];
-		if (ch == ESCAPE) {
-			if (m != ei->mroot)
-				break;
-			escape = 1;
-			continue;
-		}
-		if (escape != 0)
-			break;
-		m0 = mnemonic_list_find(&m->child, ch);
-		if (m0 == NULL)
-			break;
-		m = m0;
-	}
-	while (m != ei->mroot) {
-		--i;
-		if (m->value != ei->invalid)
-			break;
-		m = m->parent;
-	}
-	if (ch == ESCAPE && m != ei->mroot)
-		++i;
-	psenc->chlen -= i;
-	memmove(&psenc->ch[0], &psenc->ch[i], psenc->chlen);
-	wc = (m == ei->mroot) ? (wchar_t)ch : m->value;
-	if (pwc != NULL)
-		*pwc = wc;
-	*nresult = (size_t)(wc == 0 ? 0 : s0 - *s);
-	*s = s0;
-
-	return 0;
-}
-
-static int
-_citrus_VIQR_wcrtomb_priv(_VIQREncodingInfo * __restrict ei,
-	char * __restrict s, size_t n, wchar_t wc,
-	_VIQRState * __restrict psenc, size_t * __restrict nresult)
-{
-	mnemonic_t *m;
-	int ch;
-	const char *p;
-
-	_DIAGASSERT(ei != NULL);
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	switch (psenc->chlen) {
-	case 0: case 1:
-		break;
-	default:
-		return EINVAL;
-	}
-	m = NULL;
-	if ((uint32_t)wc <= 0xFF) {
-		p = mnemonic_rfc1456[wc & 0xFF];
-		if (p != NULL)
-			goto mnemonic_found;
-		if (n-- < 1)
-			goto e2big;
-		ch = (unsigned int)wc;
-		m = ei->mroot;
-		if (psenc->chlen > 0) {
-			m = mnemonic_list_find(&m->child, psenc->ch[0]);
-			if (m == NULL)
-				return EINVAL;
-			psenc->ch[0] = ESCAPE;
-		}
-		if (mnemonic_list_find(&m->child, ch) == NULL) {
-			psenc->chlen = 0;
-			m = NULL;
-		}
-		psenc->ch[psenc->chlen++] = ch;
-	} else {
-		p = mnemonic_ext_find(wc, &mnemonic_ext[0], mnemonic_ext_size);
-		if (p == NULL) {
-			*nresult = (size_t)-1;
-			return EILSEQ;
-		} else {
-mnemonic_found:
-			psenc->chlen = 0;
-			while (*p != '\0') {
-				if (n-- < 1)
-					goto e2big;
-				psenc->ch[psenc->chlen++] = *p++;
-			}
-		}
-	}
-	memcpy(s, psenc->ch, psenc->chlen);
-	*nresult = psenc->chlen;
-	if (m == ei->mroot) {
-		psenc->ch[0] = ch;
-		psenc->chlen = 1;
-	} else {
-		psenc->chlen = 0;
-	}
-
-	return 0;
-
-e2big:
-	*nresult = (size_t)-1;
-	return E2BIG;
-}
-
-static int
-/* ARGSUSED */
-_citrus_VIQR_put_state_reset(_VIQREncodingInfo * __restrict ei,
-	char * __restrict s, size_t n, _VIQRState * __restrict psenc,
-	size_t * __restrict nresult)
-{
-	/* ei may be unused */
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	switch (psenc->chlen) {
-	case 0: case 1:
-		break;
-	default:
-		return EINVAL;
-	}
-	*nresult = 0;
-	psenc->chlen = 0;
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_VIQR_stdenc_wctocs(_VIQREncodingInfo * __restrict ei,
-	_csid_t * __restrict csid, _index_t * __restrict idx, wchar_t wc)
-{
-	/* ei may be unused */
-	_DIAGASSERT(csid != NULL);
-	_DIAGASSERT(idx != NULL);
-
-	*csid = 0;
-	*idx = (_index_t)wc;
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_VIQR_stdenc_cstowc(_VIQREncodingInfo * __restrict ei,
-	wchar_t * __restrict pwc, _csid_t csid, _index_t idx)
-{
-	/* ei may be unused */
-	_DIAGASSERT(pwc != NULL);
-
-	if (csid != 0)
-		return EILSEQ;
-	*pwc = (wchar_t)idx;
-
-	return 0;
-}
-
-static void
-_citrus_VIQR_encoding_module_uninit(_VIQREncodingInfo *ei)
-{
-	_DIAGASSERT(ei != NULL);
-
-	mnemonic_destroy(ei->mroot);
-}
-
-static int
-/*ARGSUSED*/
-_citrus_VIQR_encoding_module_init(_VIQREncodingInfo * __restrict ei,
-	const void * __restrict var, size_t lenvar)
-{
-	int errnum;
-	const char *s;
-	size_t i, n;
-	const mnemonic_def_t *p;
-
-	_DIAGASSERT(ei != NULL);
-	/* var may be unused */
-
-	ei->mb_cur_max = 1;
-	ei->invalid = (wchar_t)-1;
-	ei->mroot = mnemonic_create(NULL, '\0', ei->invalid);
-	if (ei->mroot == NULL)
-		return ENOMEM;
-	for (i = 0; i < sizeof(mnemonic_rfc1456) / sizeof(const char *); ++i) {
-		s = mnemonic_rfc1456[i];
-		if (s == NULL)
-			continue;
-		n = strlen(s);
-		_DIAGASSERT(n <= MB_LEN_MAX);
-		if (ei->mb_cur_max < n)
-			ei->mb_cur_max = n;
-		errnum = mnemonic_append_child(ei->mroot,
-		    s, (wchar_t)i, ei->invalid);
-		if (errnum != 0) {
-			_citrus_VIQR_encoding_module_uninit(ei);
-			return errnum;
-		}
-	}
-	for (i = 0; i < mnemonic_ext_size; ++i) {
-		p = &mnemonic_ext[i];
-		_DIAGASSERT(p != NULL && p->name != NULL);
-		n = strlen(p->name);
-		_DIAGASSERT(n <= MB_LEN_MAX);
-		if (ei->mb_cur_max < n)
-			ei->mb_cur_max = n;
-		errnum = mnemonic_append_child(ei->mroot,
-		    p->name, p->value, ei->invalid);
-		if (errnum != 0) {
-			_citrus_VIQR_encoding_module_uninit(ei);
-			return errnum;
-		}
-	}
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_VIQR_stdenc_get_state_desc_generic(_VIQREncodingInfo * __restrict ei,
-	_VIQRState * __restrict psenc, int * __restrict rstate)
-{
-	/* ei may be unused */
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(rstate != NULL);
-
-	*rstate = (psenc->chlen == 0)
-	    ? _STDENC_SDGEN_INITIAL
-	    : _STDENC_SDGEN_INCOMPLETE_CHAR;
-
-	return 0;
-}
-
-/* ----------------------------------------------------------------------
- * public interface for ctype
- */
-
-_CITRUS_CTYPE_DECLS(VIQR);
-_CITRUS_CTYPE_DEF_OPS(VIQR);
-
-#include "citrus_ctype_template.h"
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(VIQR);
-_CITRUS_STDENC_DEF_OPS(VIQR);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_viqr.h b/lib/libc/citrus/modules/citrus_viqr.h
deleted file mode 100644
index 93154294a..000000000
--- a/lib/libc/citrus/modules/citrus_viqr.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $NetBSD: citrus_viqr.h,v 1.1 2006/11/13 15:16:31 tnozaki Exp $ */
-
-/*-
- * Copyright (c)2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_VIQR_H_
-#define _CITRUS_VIQR_H_
-
-__BEGIN_DECLS
-_CITRUS_CTYPE_GETOPS_FUNC(VIQR);
-_CITRUS_STDENC_GETOPS_FUNC(VIQR);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/citrus/modules/citrus_zw.c b/lib/libc/citrus/modules/citrus_zw.c
deleted file mode 100644
index e60f24439..000000000
--- a/lib/libc/citrus/modules/citrus_zw.c
+++ /dev/null
@@ -1,514 +0,0 @@
-/* $NetBSD: citrus_zw.c,v 1.5 2013/05/28 16:57:56 joerg Exp $ */
-
-/*-
- * Copyright (c)2004, 2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
- 
-#include <sys/cdefs.h>
-#if defined(LIB_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_zw.c,v 1.5 2013/05/28 16:57:56 joerg Exp $");
-#endif /* LIB_SCCS and not lint */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <wchar.h>
-#include <limits.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "citrus_stdenc.h"
-#include "citrus_zw.h"
-
-/* ----------------------------------------------------------------------
- * private stuffs used by templates
- */
-
-typedef struct {
-	int dummy;
-} _ZWEncodingInfo;
-
-typedef enum {
-	NONE, AMBIGIOUS, ASCII, GB2312
-} _ZWCharset;
-
-typedef struct {
-	int		chlen;
-	char		ch[4];
-	_ZWCharset	charset;
-} _ZWState;
-
-typedef struct {
-	_ZWEncodingInfo	ei;
-	struct {
-		/* for future multi-locale facility */
-		_ZWState	s_mblen;
-		_ZWState	s_mbrlen;
-		_ZWState	s_mbrtowc;
-		_ZWState	s_mbtowc;
-		_ZWState	s_mbsrtowcs;
-		_ZWState	s_mbsnrtowcs;
-		_ZWState	s_wcrtomb;
-		_ZWState	s_wcsrtombs;
-		_ZWState	s_wcsnrtombs;
-		_ZWState	s_wctomb;
-	} states;
-} _ZWCTypeInfo;
-
-#define _CEI_TO_EI(_cei_)		(&(_cei_)->ei)
-#define _CEI_TO_STATE(_cei_, _func_)	(_cei_)->states.s_##_func_
-
-#define _FUNCNAME(m)			_citrus_ZW_##m
-#define _ENCODING_INFO			_ZWEncodingInfo
-#define _CTYPE_INFO			_ZWCTypeInfo
-#define _ENCODING_STATE			_ZWState
-#define _ENCODING_MB_CUR_MAX(_ei_)	MB_LEN_MAX
-#define _ENCODING_IS_STATE_DEPENDENT		1
-#define _STATE_NEEDS_EXPLICIT_INIT(_ps_)	((_ps_)->charset != NONE)
-
-static __inline void
-/*ARGSUSED*/
-_citrus_ZW_init_state(_ZWEncodingInfo * __restrict ei,
-	_ZWState * __restrict psenc)
-{
-	/* ei my be unused */
-	_DIAGASSERT(psenc != NULL);
-
-	psenc->chlen = 0;
-	psenc->charset = NONE;
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_ZW_pack_state(_ZWEncodingInfo * __restrict ei,
-	void *__restrict pspriv, const _ZWState * __restrict psenc)
-{
-	/* ei may be unused */
-	_DIAGASSERT(pspriv != NULL);
-	_DIAGASSERT(psenc != NULL);
-
-	memcpy(pspriv, (const void *)psenc, sizeof(*psenc));
-}
-
-static __inline void
-/*ARGSUSED*/
-_citrus_ZW_unpack_state(_ZWEncodingInfo * __restrict ei,
-	_ZWState * __restrict psenc, const void * __restrict pspriv)
-{
-	/* ei may be unused */
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(pspriv != NULL);
-
-	memcpy((void *)psenc, pspriv, sizeof(*psenc));
-}
-
-static int
-_citrus_ZW_mbrtowc_priv(_ZWEncodingInfo * __restrict ei,
-	wchar_t * __restrict pwc, const char **__restrict s, size_t n,
-	_ZWState * __restrict psenc, size_t * __restrict nresult)
-{
-	const char *s0;
-	int ch, len;
-	wchar_t	 wc;
-
-	/* ei may be unused */
-	/* pwc may be null */
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	if (*s == NULL) {
-		_citrus_ZW_init_state(ei, psenc);
-		*nresult = (size_t)_ENCODING_IS_STATE_DEPENDENT;
-		return 0;
-	}
-	s0 = *s;
-	len = 0;
-
-#define	STORE				\
-do {					\
-	if (n-- < 1) {			\
-		*nresult = (size_t)-2;	\
-		*s = s0;		\
-		return 0;		\
-	}				\
-	ch = (unsigned char)*s0++;	\
-	if (len++ > MB_LEN_MAX || ch > 0x7F)\
-		goto ilseq;		\
-	psenc->ch[psenc->chlen++] = ch;	\
-} while (/*CONSTCOND*/0)
-
-loop:
-	switch (psenc->charset) {
-	case ASCII:
-		switch (psenc->chlen) {
-		case 0:
-			STORE;
-			switch (psenc->ch[0]) {
-			case '\0': case '\n':
-				psenc->charset = NONE;
-			}
-		/*FALLTHROUGH*/
-		case 1:
-			break;
-		default:
-			return EINVAL;
-		}
-		ch = (unsigned char)psenc->ch[0];
-		if (ch > 0x7F)
-			goto ilseq;
-		wc = (wchar_t)ch;
-		psenc->chlen = 0;
-		break;
-	case NONE:
-		if (psenc->chlen != 0)
-			return EINVAL;
-		STORE;
-		ch = (unsigned char)psenc->ch[0];
-		if (ch != 'z') {
-			if (ch != '\n' && ch != '\0')
-				psenc->charset = ASCII;
-			wc = (wchar_t)ch;
-			psenc->chlen = 0;
-			break;
-		}
-		psenc->charset = AMBIGIOUS;
-		psenc->chlen = 0;
-	/* FALLTHROUGH */
-	case AMBIGIOUS:
-		if (psenc->chlen != 0)
-			return EINVAL;
-		STORE;
-		if (psenc->ch[0] != 'W') {
-			psenc->charset = ASCII;
-			wc = L'z';
-			break;
-		}
-		psenc->charset = GB2312;
-		psenc->chlen = 0;
-	/* FALLTHROUGH */
-	case GB2312:
-		switch (psenc->chlen) {
-		case 0:
-			STORE;
-			ch = (unsigned char)psenc->ch[0];
-			if (ch == '\0') {
-				psenc->charset = NONE;
-				wc = (wchar_t)ch;
-				psenc->chlen = 0;
-				break;
-			} else if (ch == '\n') {
-				psenc->charset = NONE;
-				psenc->chlen = 0;
-				goto loop;
-			}
-		/*FALLTHROUGH*/
-		case 1:
-			STORE;
-			if (psenc->ch[0] == ' ') {
-				ch = (unsigned char)psenc->ch[1];
-				wc = (wchar_t)ch;
-				psenc->chlen = 0;
-				break;
-			} else if (psenc->ch[0] == '#') {
-				ch = (unsigned char)psenc->ch[1];
-				if (ch == '\n') {
-					psenc->charset = NONE;
-					wc = (wchar_t)ch;
-					psenc->chlen = 0;
-					break;
-				} else if (ch == ' ') {
-					wc = (wchar_t)ch;
-					psenc->chlen = 0;
-					break;
-				}
-			}
-			ch = (unsigned char)psenc->ch[0];
-			if (ch < 0x21 || ch > 0x7E)
-				goto ilseq;
-			wc = (wchar_t)(ch << 8);
-			ch = (unsigned char)psenc->ch[1];
-			if (ch < 0x21 || ch > 0x7E) {
-ilseq:
-				*nresult = (size_t)-1;
-				return EILSEQ;
-			}
-			wc |= (wchar_t)ch;
-			psenc->chlen = 0;
-			break;
-		default:
-			return EINVAL;
-		}
-		break;
-	default:
-		return EINVAL;
-	}
-	if (pwc != NULL)
-		*pwc = wc;
-
-	*nresult = (size_t)(wc == 0 ? 0 : len);
-	*s = s0;
-
-	return 0;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_ZW_wcrtomb_priv(_ZWEncodingInfo * __restrict ei,
-	char *__restrict s, size_t n, wchar_t wc,
-	_ZWState * __restrict psenc, size_t * __restrict nresult)
-{
-	int ch;
-
-	/* ei may be null */
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	if (psenc->chlen != 0)
-		return EINVAL;
-	if ((uint32_t)wc <= 0x7F) {
-		ch = (unsigned char)wc;
-		switch (psenc->charset) {
-		case NONE:
-			if (ch == '\0' || ch == '\n') {
-				psenc->ch[psenc->chlen++] = ch;
-			} else {
-				if (n < 4)
-					return E2BIG;
-				n -= 4;
-				psenc->ch[psenc->chlen++] = 'z';
-				psenc->ch[psenc->chlen++] = 'W';
-				psenc->ch[psenc->chlen++] = ' ';
-				psenc->ch[psenc->chlen++] = ch;
-				psenc->charset = GB2312;
-			}
-			break;
-		case GB2312:
-			if (n < 2)
-				return E2BIG;
-			n -= 2;
-			if (ch == '\0') {
-				psenc->ch[psenc->chlen++] = '\n';
-				psenc->ch[psenc->chlen++] = '\0';
-				psenc->charset = NONE;
-			} else if (ch == '\n') {
-				psenc->ch[psenc->chlen++] = '#';
-				psenc->ch[psenc->chlen++] = '\n';
-				psenc->charset = NONE;
-			} else {
-				psenc->ch[psenc->chlen++] = ' ';
-				psenc->ch[psenc->chlen++] = ch;
-			}
-			break;
-		default:
-			return EINVAL;
-		}
-	} else if ((uint32_t)wc <= 0x7E7E) {
-		switch (psenc->charset) {
-		case NONE:
-			if (n < 2)
-				return E2BIG;
-			n -= 2;
-			psenc->ch[psenc->chlen++] = 'z';
-			psenc->ch[psenc->chlen++] = 'W';
-			psenc->charset = GB2312;
-		/* FALLTHROUGH*/
-		case GB2312:
-			if (n < 2)
-				return E2BIG;
-			n -= 2;
-			ch = (wc >> 8) & 0xFF;
-			if (ch < 0x21 || ch > 0x7E)
-				goto ilseq;
-			psenc->ch[psenc->chlen++] = ch;
-			ch = wc & 0xFF;
-			if (ch < 0x21 || ch > 0x7E)
-				goto ilseq;
-			psenc->ch[psenc->chlen++] = ch;
-			break;
-		default:
-			return EINVAL;
-		}
-	} else {
-ilseq:
-		*nresult = (size_t)-1;
-		return EILSEQ;
-	}
-	memcpy(s, psenc->ch, psenc->chlen);
-	*nresult = psenc->chlen;
-	psenc->chlen = 0;
-
-	return 0;
-}
-
-static int
-/*ARGSUSED*/
-_citrus_ZW_put_state_reset(_ZWEncodingInfo * __restrict ei,
-	char * __restrict s, size_t n,
-	_ZWState * __restrict psenc, size_t * __restrict nresult)
-{
-	/* ei may be unused */
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(nresult != NULL);
-
-	if (psenc->chlen != 0)
-		return EINVAL;
-	switch (psenc->charset) {
-	case GB2312:
-		if (n-- < 1)
-			return E2BIG;
-		psenc->ch[psenc->chlen++] = '\n';
-		psenc->charset = NONE;
-	/*FALLTHROUGH*/
-	case NONE:
-		*nresult = psenc->chlen;
-		if (psenc->chlen > 0) {
-			memcpy(s, psenc->ch, psenc->chlen);
-			psenc->chlen = 0;
-		}
-		break;
-	default:
-		return EINVAL;
-	}
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_ZW_stdenc_get_state_desc_generic(_ZWEncodingInfo * __restrict ei,
-	_ZWState * __restrict psenc, int * __restrict rstate)
-{
-	/* ei may be unused */
-	_DIAGASSERT(psenc != NULL);
-	_DIAGASSERT(rstate != NULL);
-
-	switch (psenc->charset) {
-	case NONE:
-		if (psenc->chlen != 0)
-			return EINVAL;
-		*rstate = _STDENC_SDGEN_INITIAL;
-		break;
-	case AMBIGIOUS:
-		if (psenc->chlen != 0)
-			return EINVAL;
-		*rstate = _STDENC_SDGEN_INCOMPLETE_SHIFT;
-		break;
-	case ASCII:
-	case GB2312:
-		switch (psenc->chlen) {
-		case 0:
-			*rstate = _STDENC_SDGEN_STABLE;
-			break;
-		case 1:
-			*rstate = (psenc->ch[0] == '#')
-			    ? _STDENC_SDGEN_INCOMPLETE_SHIFT
-			    : _STDENC_SDGEN_INCOMPLETE_CHAR;
-			break;
-		default:
-			return EINVAL;
-		}
-		break;
-	default:
-		return EINVAL;
-	}
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_ZW_stdenc_wctocs(_ZWEncodingInfo * __restrict ei,
-	_csid_t * __restrict csid, _index_t * __restrict idx, wchar_t wc)
-{
-	/* ei seems to be unused */
-	_DIAGASSERT(csid != NULL);
-	_DIAGASSERT(idx != NULL);
-
-	*csid = (_csid_t)(wc <= 0x7FU) ? 0 : 1;
-	*idx = (_index_t)wc;
-
-	return 0;
-}
-
-static __inline int
-/*ARGSUSED*/
-_citrus_ZW_stdenc_cstowc(_ZWEncodingInfo * __restrict ei,
-	 wchar_t * __restrict wc, _csid_t csid, _index_t idx)
-{
-	/* ei seems to be unused */
-	_DIAGASSERT(wc != NULL);
-
-	switch (csid) {
-	case 0: case 1:
-		break;
-	default:
-		return EINVAL;
-	}
-	*wc = (wchar_t)idx;
-
-	return 0;
-}
-
-static void
-/*ARGSUSED*/
-_citrus_ZW_encoding_module_uninit(_ZWEncodingInfo *ei)
-{
-}
-
-static int
-/*ARGSUSED*/
-_citrus_ZW_encoding_module_init(_ZWEncodingInfo * __restrict ei,
-	const void *__restrict var, size_t lenvar)
-{
-	return 0;
-}
-
-/* ----------------------------------------------------------------------
- * public interface for ctype
- */
-
-_CITRUS_CTYPE_DECLS(ZW);
-_CITRUS_CTYPE_DEF_OPS(ZW);
-
-#include "citrus_ctype_template.h"
-
-/* ----------------------------------------------------------------------
- * public interface for stdenc
- */
-
-_CITRUS_STDENC_DECLS(ZW);
-_CITRUS_STDENC_DEF_OPS(ZW);
-
-#include "citrus_stdenc_template.h"
diff --git a/lib/libc/citrus/modules/citrus_zw.h b/lib/libc/citrus/modules/citrus_zw.h
deleted file mode 100644
index 9f7a20db9..000000000
--- a/lib/libc/citrus/modules/citrus_zw.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $NetBSD: citrus_zw.h,v 1.1 2006/11/22 23:38:27 tnozaki Exp $ */
-
-/*-
- * Copyright (c)2004,2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _CITRUS_ZW_H_
-#define _CITRUS_ZW_H_
-
-__BEGIN_DECLS
-_CITRUS_CTYPE_GETOPS_FUNC(ZW);
-_CITRUS_STDENC_GETOPS_FUNC(ZW);
-__END_DECLS
-
-#endif
diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc
deleted file mode 100644
index a15cf214b..000000000
--- a/lib/libc/compat-43/Makefile.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.16 2006/04/24 17:15:06 drochner Exp $
-#	from: @(#)Makefile.inc	8.1 (Berkeley) 6/2/93
-
-# Unsupported by Minix
-#	setrgid.c setruid.c
-
-# compat-43 sources
-.PATH: ${ARCHDIR}/compat-43 ${.CURDIR}/compat-43
-
-SRCS+=	creat.c getdtablesize.c gethostid.c \
-	killpg.c sethostid.c setpgrp.c \
-	sigcompat.c
-
-.if !defined(AUDIT)
-SRCS+=	getwd.c
-.endif
-
-# XXX this is to get <compat/sys/signal.h>
-CPPFLAGS.sigcompat.c+=	-I${NETBSDSRCDIR}/sys
-
-MAN+=	creat.3 getdtablesize.3 gethostid.3 killpg.3 \
-	setruid.3 sigblock.3 sigpause.3 sigsetmask.3 sigvec.3
-
-MLINKS+=setruid.3 setrgid.3
-MLINKS+=gethostid.3 sethostid.3
diff --git a/lib/libc/compat-43/creat.3 b/lib/libc/compat-43/creat.3
deleted file mode 100644
index a5905b466..000000000
--- a/lib/libc/compat-43/creat.3
+++ /dev/null
@@ -1,65 +0,0 @@
-.\" Copyright (c) 1989, 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. 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: @(#)creat.2	8.1 (Berkeley) 6/2/93
-.\"	$NetBSD: creat.3,v 1.16 2003/08/07 16:42:39 agc Exp $
-.\"
-.Dd June 2, 1993
-.Dt CREAT 3
-.Os
-.Sh NAME
-.Nm creat
-.Nd create a new file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fcntl.h
-.Ft int
-.Fn creat "const char *path" "mode_t mode"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by:
-.Ef
-.Xr open 2 .
-.Pp
-.Fn creat
-is the same as:
-.Bd -literal -offset indent
-open(path, O_CREAT | O_TRUNC | O_WRONLY, mode);
-.Ed
-.Sh SEE ALSO
-.Xr open 2
-.Sh STANDARDS
-The
-.Fn creat
-function call conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn creat
-function call appeared in
-.At v6 .
diff --git a/lib/libc/compat-43/creat.c b/lib/libc/compat-43/creat.c
deleted file mode 100644
index 9560beafb..000000000
--- a/lib/libc/compat-43/creat.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: creat.c,v 1.10 2003/08/07 16:42:39 agc Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)creat.c	8.1 (Berkeley) 6/2/93";
-#else
-__RCSID("$NetBSD: creat.c,v 1.10 2003/08/07 16:42:39 agc Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-
-int
-creat(const char *path, mode_t mode)
-{
-
-	_DIAGASSERT(path != NULL);
-
-	return(open(path, O_WRONLY|O_CREAT|O_TRUNC, mode));
-}
diff --git a/lib/libc/compat-43/getdtablesize.3 b/lib/libc/compat-43/getdtablesize.3
deleted file mode 100644
index e6ec1fba4..000000000
--- a/lib/libc/compat-43/getdtablesize.3
+++ /dev/null
@@ -1,70 +0,0 @@
-.\" Copyright (c) 1983, 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. 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: @(#)getdtablesize.2	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: getdtablesize.3,v 1.14 2012/01/05 07:05:59 yamt Exp $
-.\"
-.Dd January 5, 2012
-.Dt GETDTABLESIZE 3
-.Os
-.Sh NAME
-.Nm getdtablesize
-.Nd get descriptor table size
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn getdtablesize void
-.Sh DESCRIPTION
-The
-.Nm
-function is an equivalent of
-.Fn sysconf
-with
-.Dv _SC_OPEN_MAX .
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr dup 2 ,
-.Xr getrlimit 2 ,
-.Xr open 2 ,
-.Xr select 2 ,
-.Xr sysconf 3
-.Sh HISTORY
-The
-.Fn getdtablesize
-function call appeared in
-.Bx 4.2 .
-.Pp
-Historically, each process had a fixed size descriptor table,
-which is guaranteed to have at least 20 slots.
-The entries in
-the descriptor table are numbered with small integers starting at 0.
-The call
-.Fn getdtablesize
-used to return the size of this table.
-It doesn't make much sense these days because the size of the table is dynamic.
diff --git a/lib/libc/compat-43/getdtablesize.c b/lib/libc/compat-43/getdtablesize.c
deleted file mode 100644
index 058fc8f8a..000000000
--- a/lib/libc/compat-43/getdtablesize.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*	$NetBSD: getdtablesize.c,v 1.10 2012/06/24 15:26:03 christos Exp $	*/
-
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getdtablesize.c,v 1.10 2012/06/24 15:26:03 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <unistd.h>
-
-int
-getdtablesize(void)
-{
-	return ((int)sysconf(_SC_OPEN_MAX));
-}
diff --git a/lib/libc/compat-43/gethostid.3 b/lib/libc/compat-43/gethostid.3
deleted file mode 100644
index a9f4ab21c..000000000
--- a/lib/libc/compat-43/gethostid.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\"	$NetBSD: gethostid.3,v 1.12 2003/08/07 16:42:39 agc Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)gethostid.3	8.1 (Berkeley) 6/2/93
-.\"
-.Dd June 2, 1993
-.Dt GETHOSTID 3
-.Os
-.Sh NAME
-.Nm gethostid ,
-.Nm sethostid
-.Nd get/set unique identifier of current host
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft long
-.Fn gethostid void
-.Ft int
-.Fn sethostid "long hostid"
-.Sh DESCRIPTION
-.Fn sethostid
-establishes a 32-bit identifier for the current processor that is
-intended to be unique among all
-.Ux
-systems in existence.
-This is normally a DARPA Internet address for the local machine.
-This call is allowed only to the super-user and is normally performed
-at boot time.
-.Pp
-.Fn gethostid
-returns the 32-bit identifier for the current processor.
-.Pp
-This function has been deprecated.
-The hostid should be set or retrieved by use of
-.Xr sysctl 3 .
-.Sh SEE ALSO
-.Xr gethostname 3 ,
-.Xr sysctl 3 ,
-.Xr sysctl 8
-.Sh HISTORY
-The
-.Fn gethostid
-and
-.Fn sethostid
-syscalls appeared in
-.Bx 4.2
-and were dropped in
-.Bx 4.4 .
-.Sh BUGS
-32 bits for the identifier is too small.
diff --git a/lib/libc/compat-43/gethostid.c b/lib/libc/compat-43/gethostid.c
deleted file mode 100644
index b95f5982d..000000000
--- a/lib/libc/compat-43/gethostid.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: gethostid.c,v 1.6 2004/04/19 13:16:42 atatat Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)gethostid.c	8.1 (Berkeley) 6/2/93";
-#else
-__RCSID("$NetBSD: gethostid.c,v 1.6 2004/04/19 13:16:42 atatat Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <unistd.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-long
-gethostid(void)
-{
-	int mib[2], value;
-	size_t size;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTID;
-	size = sizeof(value);
-	if (sysctl(mib, 2, &value, &size, NULL, (size_t)0) == -1)
-		return (-1);
-	return (value);
-}
diff --git a/lib/libc/compat-43/getwd.c b/lib/libc/compat-43/getwd.c
deleted file mode 100644
index 4e5aa8ec0..000000000
--- a/lib/libc/compat-43/getwd.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: getwd.c,v 1.15 2012/06/25 22:32:43 abs Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getwd.c	8.1 (Berkeley) 6/2/93";
-#else
-__RCSID("$NetBSD: getwd.c,v 1.15 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-__warn_references(getwd,
-    "warning: getwd() possibly used unsafely, consider using getcwd()")
-
-char *
-getwd(char *buf)
-{
-	char *p;
-
-	_DIAGASSERT(buf != NULL);
-
-	if ((p = getcwd(buf, MAXPATHLEN)) != NULL)
-		return(p);
-	(void)strlcpy(buf, strerror(errno), MAXPATHLEN);
-	return((char *)NULL);
-}
diff --git a/lib/libc/compat-43/killpg.3 b/lib/libc/compat-43/killpg.3
deleted file mode 100644
index d3afef034..000000000
--- a/lib/libc/compat-43/killpg.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\" Copyright (c) 1980, 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. 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: @(#)killpg.2	8.1 (Berkeley) 6/2/93
-.\"	$NetBSD: killpg.3,v 1.16 2003/08/07 16:42:39 agc Exp $
-.\"
-.Dd June 2, 1993
-.Dt KILLPG 3
-.Os
-.Sh NAME
-.Nm killpg
-.Nd send signal to a process group
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn killpg "pid_t pgrp" "int sig"
-.Sh DESCRIPTION
-.Fn killpg
-sends the signal
-.Fa sig
-to the process group
-.Fa pgrp .
-See
-.Xr sigaction 2
-for a list of signals.
-If
-.Fa pgrp
-is 0,
-.Fn killpg
-sends the signal to the sending process's process group.
-.Pp
-The sending process and members of the process group must
-have the same effective user ID, or
-the sender must be the super-user.
-As a single special case the continue signal SIGCONT may be sent
-to any process that is a descendant of the current process.
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, a value of \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn killpg
-will fail and no signal will be sent if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-.Fa sig
-is not a valid signal number.
-.It Bq Er ESRCH
-No process can be found in the process group specified by
-.Fa pgrp .
-.It Bq Er ESRCH
-The process group was given as 0
-but the sending process does not have a process group.
-.It Bq Er EPERM
-The sending process is not the super-user and one or more
-of the target processes has an effective user ID different from that
-of the sending process.
-.El
-.Sh SEE ALSO
-.Xr getpgrp 2 ,
-.Xr kill 2 ,
-.Xr sigaction 2
-.Sh HISTORY
-The
-.Fn killpg
-function call appeared in
-.Bx 4.0 .
diff --git a/lib/libc/compat-43/killpg.c b/lib/libc/compat-43/killpg.c
deleted file mode 100644
index ceac3f486..000000000
--- a/lib/libc/compat-43/killpg.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: killpg.c,v 1.8 2003/08/07 16:42:39 agc Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)killpg.c	8.1 (Berkeley) 6/2/93";
-#else
-__RCSID("$NetBSD: killpg.c,v 1.8 2003/08/07 16:42:39 agc Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-
-/*
- * Backwards-compatible killpg().
- */
-int
-killpg(pid_t pgid, int sig)
-{
-	if (pgid == 1) {
-		errno = ESRCH;
-		return (-1);
-	}
-	return (kill(-pgid, sig));
-}
diff --git a/lib/libc/compat-43/sethostid.c b/lib/libc/compat-43/sethostid.c
deleted file mode 100644
index b38bf8a8c..000000000
--- a/lib/libc/compat-43/sethostid.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: sethostid.c,v 1.7 2004/04/19 13:16:42 atatat Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)sethostid.c	8.1 (Berkeley) 6/2/93";
-#else
-__RCSID("$NetBSD: sethostid.c,v 1.7 2004/04/19 13:16:42 atatat Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <unistd.h>
-
-int
-sethostid(long hostid)
-{
-	int mib[2], value;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTID;
-	value = (int)hostid;
-	if (sysctl(mib, 2, NULL, NULL, &value, sizeof(value)) == -1)
-		return (-1);
-	return (0);
-}
diff --git a/lib/libc/compat-43/setpgrp.c b/lib/libc/compat-43/setpgrp.c
deleted file mode 100644
index 3c031cce7..000000000
--- a/lib/libc/compat-43/setpgrp.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: setpgrp.c,v 1.8 2003/08/07 16:42:40 agc Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)setpgrp.c	8.1 (Berkeley) 6/2/93";
-#else
-__RCSID("$NetBSD: setpgrp.c,v 1.8 2003/08/07 16:42:40 agc Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <unistd.h>
-
-int
-setpgrp(pid_t pid, pid_t pgid)
-{
-	return(setpgid(pid, pgid));
-}
diff --git a/lib/libc/compat-43/setrgid.c b/lib/libc/compat-43/setrgid.c
deleted file mode 100644
index a0f933486..000000000
--- a/lib/libc/compat-43/setrgid.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: setrgid.c,v 1.12 2003/08/07 16:42:40 agc Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)setrgid.c	8.1 (Berkeley) 6/2/93";
-#else
-__RCSID("$NetBSD: setrgid.c,v 1.12 2003/08/07 16:42:40 agc Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <unistd.h>
-
-__warn_references(setrgid, "warning: this program uses setrgid(), which is deprecated.")
-
-int
-setrgid(gid_t rgid)
-{
-	return (setregid(rgid, (gid_t)-1));
-}
diff --git a/lib/libc/compat-43/setruid.3 b/lib/libc/compat-43/setruid.3
deleted file mode 100644
index 8a557b1da..000000000
--- a/lib/libc/compat-43/setruid.3
+++ /dev/null
@@ -1,78 +0,0 @@
-.\" Copyright (c) 1983, 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. 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: @(#)setruid.3	8.1 (Berkeley) 6/2/93
-.\"	$NetBSD: setruid.3,v 1.10 2003/08/07 16:42:40 agc Exp $
-.\"
-.Dd June 2, 1993
-.Dt SETRUID 3
-.Os
-.Sh NAME
-.Nm setruid ,
-.Nm setrgid
-.Nd set user and group ID
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.Ft int
-.Fn setruid "uid_t ruid"
-.Ft int
-.Fn setrgid "gid_t rgid"
-.Sh DESCRIPTION
-The
-.Fn setruid
-function
-.Pq Fn setrgid
-sets the real user ID (group ID) of the
-current process.
-.Sh RETURN VALUES
-Upon success, these functions return 0;
-otherwise \-1 is returned.
-.Pp
-If the user is not the super user, or the uid
-specified is not the real or effective ID, these
-functions return \-1.
-.Pp
-The use of these calls is not portable.
-Their use is discouraged; they will be removed in the future.
-.Sh SEE ALSO
-.Xr getgid 2 ,
-.Xr getuid 2 ,
-.Xr setegid 2 ,
-.Xr seteuid 2 ,
-.Xr setgid 2 ,
-.Xr setuid 2
-.Sh HISTORY
-The
-.Fn setruid
-and
-.Fn setrgid
-syscalls appeared in
-.Bx 4.2
-and were dropped in
-.Bx 4.4 .
diff --git a/lib/libc/compat-43/setruid.c b/lib/libc/compat-43/setruid.c
deleted file mode 100644
index 64b843302..000000000
--- a/lib/libc/compat-43/setruid.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: setruid.c,v 1.13 2003/08/07 16:42:40 agc Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)setruid.c	8.1 (Berkeley) 6/2/93";
-#else
-__RCSID("$NetBSD: setruid.c,v 1.13 2003/08/07 16:42:40 agc Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <unistd.h>
-
-__warn_references(setruid, "warning: this program uses setruid(), which is deprecated.")
-
-int
-setruid(uid_t ruid)
-{
-	return (setreuid(ruid, (uid_t)-1));
-}
diff --git a/lib/libc/compat-43/sigblock.3 b/lib/libc/compat-43/sigblock.3
deleted file mode 100644
index 86c8dff0e..000000000
--- a/lib/libc/compat-43/sigblock.3
+++ /dev/null
@@ -1,119 +0,0 @@
-.\" Copyright (c) 1983, 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. 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: @(#)sigblock.2	8.1 (Berkeley) 6/2/93
-.\"	$NetBSD: sigblock.3,v 1.17 2003/08/07 16:42:40 agc Exp $
-.\"
-.Dd August 10, 2002
-.Dt SIGBLOCK 3
-.Os
-.Sh NAME
-.Nm sigblock
-.Nd block signals
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigblock "int mask"
-.Ft int
-.Fn sigmask signum
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by:
-.Xr sigprocmask 2 .
-.Ef
-.Pp
-.Fn sigblock
-adds the signals specified in
-.Fa mask
-to the set of signals currently
-being blocked from delivery.
-Signals are blocked if the
-corresponding bit in
-.Fa mask
-is a 1; the macro
-.Fn sigmask
-is provided to construct the mask for a given
-.Fa signum .
-.Pp
-It is not possible to block
-.Dv SIGKILL
-or
-.Dv SIGSTOP ;
-this restriction is silently
-imposed by the system.
-.Sh RETURN VALUES
-The previous set of masked signals is returned.
-.Sh EXAMPLES
-The following example using
-.Fn sigblock :
-.Bd -literal -offset indent
-int omask;
-
-omask = sigblock(sigmask(SIGINT) | sigmask(SIGHUP));
-.Ed
-.Pp
-Becomes:
-.Bd -literal -offset indent
-sigset_t set, oset;
-
-sigemptyset(&set);
-sigaddset(&set, SIGINT);
-sigaddset(&set, SIGHUP);
-sigprocmask(SIG_BLOCK, &set, &oset);
-.Ed
-.Pp
-Another use of
-.Fn sigblock
-is to get the current set of masked signals without changing what
-is actually blocked.
-Instead of:
-.Bd -literal -offset indent
-int set;
-
-set = sigblock(0);
-.Ed
-.Pp
-Use the following:
-.Bd -literal -offset indent
-sigset_t set;
-
-sigprocmask(SIG_BLOCK, NULL, &set);
-.Ed
-.Sh SEE ALSO
-.Xr kill 2 ,
-.Xr sigaction 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsetmask 3 ,
-.Xr sigsetops 3
-.Sh HISTORY
-The
-.Fn sigblock
-function call appeared in
-.Bx 4.2
-and has been deprecated.
diff --git a/lib/libc/compat-43/sigcompat.c b/lib/libc/compat-43/sigcompat.c
deleted file mode 100644
index a8ae696ff..000000000
--- a/lib/libc/compat-43/sigcompat.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*	$NetBSD: sigcompat.c,v 1.13 2005/12/24 21:11:16 perry Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)sigcompat.c	8.1 (Berkeley) 6/2/93";
-#else
-__RCSID("$NetBSD: sigcompat.c,v 1.13 2005/12/24 21:11:16 perry Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <signal.h>
-#include <compat/sys/signal.h>
-
-static inline void sv2sa(struct sigaction *, const struct sigvec *);
-static inline void sa2sv(struct sigvec *, const struct sigaction *);
-
-static inline void
-sv2sa(struct sigaction *sa, const struct sigvec *sv)
-{
-	sigemptyset(&sa->sa_mask);
-	sa->sa_mask.__bits[0] = sv->sv_mask;
-	sa->sa_handler = sv->sv_handler;
-	sa->sa_flags = sv->sv_flags ^ SV_INTERRUPT; /* !SA_INTERRUPT */
-}
-
-static inline void
-sa2sv(struct sigvec *sv, const struct sigaction *sa)
-{
-	sv->sv_mask = sa->sa_mask.__bits[0];
-	sv->sv_handler = sa->sa_handler;
-	sv->sv_flags = sa->sa_flags ^ SV_INTERRUPT; /* !SA_INTERRUPT */
-}
-	
-int
-sigvec(int signo, struct sigvec *nsv, struct sigvec *osv)
-{
-	int ret;
-	struct sigaction osa, nsa;
-
-	if (nsv)
-		sv2sa(&nsa, nsv);
-
-	ret = sigaction(signo, nsv ? &nsa : NULL, osv ? &osa : NULL);
-
-	if (ret == 0 && osv)
-		sa2sv(osv, &osa);
-
-	return (ret);
-}
-
-int
-sigsetmask(int mask)
-{
-	sigset_t nmask, omask;
-	int n;
-
-	sigemptyset(&nmask);
-	nmask.__bits[0] = mask;
-
-	n = sigprocmask(SIG_SETMASK, &nmask, &omask);
-	if (n)
-		return (n);
-	return (omask.__bits[0]);
-}
-
-int
-sigblock(int mask)
-{
-	sigset_t nmask, omask;
-	int n;
-
-	sigemptyset(&nmask);
-	nmask.__bits[0] = mask;
-
-	n = sigprocmask(SIG_BLOCK, &nmask, &omask);
-	if (n)
-		return (n);
-	return (omask.__bits[0]);
-}
-
-int
-sigpause(int mask)
-{
-	sigset_t nmask;
-
-	sigemptyset(&nmask);
-	nmask.__bits[0] = mask;
-	return (sigsuspend(&nmask));
-}
diff --git a/lib/libc/compat-43/sigpause.3 b/lib/libc/compat-43/sigpause.3
deleted file mode 100644
index 431ad501c..000000000
--- a/lib/libc/compat-43/sigpause.3
+++ /dev/null
@@ -1,75 +0,0 @@
-.\" Copyright (c) 1983, 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. 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: @(#)sigpause.2	8.1 (Berkeley) 6/2/93
-.\"	$NetBSD: sigpause.3,v 1.15 2003/08/07 16:42:40 agc Exp $
-.\"
-.Dd June 2, 1993
-.Dt SIGPAUSE 3
-.Os
-.Sh NAME
-.Nm sigpause
-.Nd atomically release blocked signals and wait for interrupt
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigpause "int sigmask"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by
-.Xr sigsuspend 2 .
-.Ef
-.Pp
-.Fn sigpause
-assigns
-.Fa sigmask
-to the set of masked signals
-and then waits for a signal to arrive;
-on return the set of masked signals is restored.
-.Fa sigmask
-is usually 0 to indicate that no
-signals are to be blocked.
-.Fn sigpause
-always terminates by being interrupted, returning -1 with
-.Va errno
-set to
-.Dv EINTR .
-.Sh SEE ALSO
-.Xr kill 2 ,
-.Xr sigaction 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsuspend 2 ,
-.Xr sigblock 3 ,
-.Xr sigvec 3
-.Sh HISTORY
-The
-.Fn sigpause
-function call appeared in
-.Bx 4.2
-and has been deprecated.
diff --git a/lib/libc/compat-43/sigsetmask.3 b/lib/libc/compat-43/sigsetmask.3
deleted file mode 100644
index 779592816..000000000
--- a/lib/libc/compat-43/sigsetmask.3
+++ /dev/null
@@ -1,140 +0,0 @@
-.\" Copyright (c) 1983, 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. 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: @(#)sigsetmask.2	8.1 (Berkeley) 6/2/93
-.\"	$NetBSD: sigsetmask.3,v 1.19 2013/05/06 13:29:12 wiz Exp $
-.\"
-.Dd August 10, 2002
-.Dt SIGSETMASK 3
-.Os
-.Sh NAME
-.Nm sigsetmask
-.Nd set current signal mask
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigsetmask "int mask"
-.Fn sigmask signum
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by:
-.Ef
-.Xr sigprocmask 2 .
-.Pp
-.Fn sigsetmask
-sets the current signal mask.
-Signals are blocked from delivery if the
-corresponding bit in
-.Fa mask
-is a 1; the macro
-.Fn sigmask
-is provided to construct the mask for a given
-.Fa signum .
-.Pp
-The system
-quietly disallows
-.Dv SIGKILL
-or
-.Dv SIGSTOP
-to be blocked.
-.Sh RETURN VALUES
-The previous set of masked signals is returned.
-.Sh EXAMPLES
-The following example using
-.Fn sigsetmask :
-.Bd -literal -offset indent
-int omask;
-
-omask = sigblock(sigmask(SIGINT) | sigmask(SIGHUP));
-
-\&...
-
-sigsetmask(omask & ~(sigmask(SIGINT) | sigmask(SIGHUP)));
-.Ed
-.Pp
-Could be converted literally to:
-.Bd -literal -offset indent
-sigset_t set, oset;
-
-sigemptyset(&set);
-sigaddset(&set, SIGINT);
-sigaddset(&set, SIGHUP);
-sigprocmask(SIG_BLOCK, &set, &oset);
-
-\&...
-
-sigdelset(&oset, SIGINT);
-sigdelset(&oset, SIGHUP);
-sigprocmask(SIG_SETMASK, &oset, NULL);
-.Ed
-.Pp
-Another, clearer, alternative is:
-.Bd -literal -offset indent
-sigset_t set;
-
-sigemptyset(&set);
-sigaddset(&set, SIGINT);
-sigaddset(&set, SIGHUP);
-sigprocmask(SIG_BLOCK, &set, NULL);
-
-\&...
-
-sigprocmask(SIG_UNBLOCK, &set, NULL);
-.Ed
-.Pp
-To completely clear the signal mask using
-.Fn sigsetmask
-one can do:
-.Bd -literal -offset indent
-(void) sigsetmask(0);
-.Ed
-.Pp
-Which can be expressed via
-.Xr sigprocmask 2
-as:
-.Bd -literal -offset indent
-sigset_t eset;
-
-sigemptyset(&eset);
-(void) sigprocmask(SIG_SETMASK, &eset, NULL);
-.Ed
-.Sh SEE ALSO
-.Xr kill 2 ,
-.Xr sigaction 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsuspend 2 ,
-.Xr sigblock 3 ,
-.Xr sigsetops 3 ,
-.Xr sigvec 3
-.Sh HISTORY
-The
-.Fn sigsetmask
-function call appeared in
-.Bx 4.2
-and has been deprecated.
diff --git a/lib/libc/compat-43/sigvec.3 b/lib/libc/compat-43/sigvec.3
deleted file mode 100644
index 18c2a4c2c..000000000
--- a/lib/libc/compat-43/sigvec.3
+++ /dev/null
@@ -1,313 +0,0 @@
-.\"	$NetBSD: sigvec.3,v 1.26 2010/03/22 19:30:53 joerg Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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: @(#)sigvec.2	8.2 (Berkeley) 4/19/94
-.\"
-.Dd December 3, 2005
-.Dt SIGVEC 3
-.Os
-.Sh NAME
-.Nm sigvec
-.Nd software signal facilities
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Bd -literal
-struct sigvec {
-	void	(*sv_handler)();
-	int	sv_mask;
-	int	sv_flags;
-};
-.Ed
-.Ft int
-.Fn sigvec "int sig" "struct sigvec *vec" "struct sigvec *ovec"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by
-.Xr sigaction 2 .
-The structure, flags, and function declaration have been removed from
-the header files but the function is kept in the c library for binary
-compatibility.
-.Ef
-.Pp
-The system defines a set of signals that may be delivered to a process.
-Signal delivery resembles the occurrence of a hardware interrupt:
-the signal is blocked from further occurrence, the current process
-context is saved, and a new one is built.
-A process may specify a
-.Em handler
-to which a signal is delivered, or specify that a signal is to be
-.Em ignored .
-A process may also specify that a default action is to be taken
-by the system when a signal occurs.
-A signal may also be
-.Em blocked ,
-in which case its delivery is postponed until it is
-.Em unblocked .
-The action to be taken on delivery is determined at the time
-of delivery.
-Normally, signal handlers execute on the current stack
-of the process.
-This may be changed, on a per-handler basis, so that signals are
-taken on a special
-.Em "signal stack" .
-.Pp
-Signal routines execute with the signal that caused their
-invocation
-.Em blocked ,
-but other signals may yet occur.
-A global
-.Em "signal mask"
-defines the set of signals currently blocked from delivery
-to a process.
-The signal mask for a process is initialized from that of its parent
-(normally 0).
-It may be changed with a
-.Xr sigblock 3
-or
-.Xr sigsetmask 3
-call, or when a signal is delivered to the process.
-.Pp
-When a signal
-condition arises for a process, the signal is added to a set of
-signals pending for the process.
-If the signal is not currently
-.Em blocked
-by the process then it is delivered to the process.
-When a caught signal
-is delivered, the current state of the process is saved,
-a new signal mask is calculated (as described below),
-and the signal handler is invoked.
-The call to the handler is arranged so that if the signal handling
-routine returns normally the process will resume execution in the
-context from before the signal's delivery.
-If the process wishes to resume in a different context, then it
-must arrange to restore the previous context itself.
-.Pp
-When a signal is delivered to a process a new signal mask is
-installed for the duration of the process' signal handler
-(or until a
-.Xr sigblock 3
-or
-.Xr sigsetmask 3
-call is made).
-This mask is formed by taking the union of the current signal mask,
-the signal to be delivered, and
-the signal mask associated with the handler to be invoked.
-.Pp
-.Fn sigvec
-assigns a handler for a specific signal.
-If
-.Fa vec
-is non-zero, it
-specifies an action
-.Pf ( Dv SIG_DFL ,
-.Dv SIG_IGN ,
-or a handler routine) and mask
-to be used when delivering the specified signal.
-Further, if the
-.Dv SV_ONSTACK
-bit is set in
-.Fa sv_flags ,
-the system will deliver the signal to the process on a
-.Em "signal stack" ,
-specified with
-.Xr sigaltstack 2 .
-If
-.Fa ovec
-is non-zero, the previous handling information for the signal
-is returned to the user.
-.Pp
-Once a signal handler is installed, it remains installed
-until another
-.Fn sigvec
-call is made, or an
-.Xr execve 2
-is performed.
-A signal-specific default action may be reset by
-setting
-.Fa sv_handler
-to
-.Dv SIG_DFL .
-The defaults are process termination, possibly with core dump;
-no action; stopping the process; or continuing the process.
-See the signal list below for each signal's default action.
-If
-.Fa sv_handler
-is set to
-.Dv SIG_DFL ,
-the default action for the signal is to discard the signal,
-and if a signal is pending,
-the pending signal is discarded even if the signal is masked.
-If
-.Fa sv_handler
-is set to
-.Dv SIG_IGN ,
-current and pending instances
-of the signal are ignored and discarded.
-.Pp
-Options may be specified by setting
-.Em sv_flags .
-If the
-.Dv SV_ONSTACK
-bit is set in
-.Fa sv_flags ,
-the system will deliver the signal to the process on a
-.Em "signal stack" ,
-specified with
-.Xr sigstack 2 .
-.Pp
-If a signal is caught during the system calls listed below,
-the call may be restarted,
-the call may return with a data transfer shorter than requested,
-or the call may be forced to terminate
-with the error
-.Dv EINTR .
-Interrupting of pending calls is requested
-by setting the
-.Dv SV_INTERRUPT
-bit in
-.Ar sv_flags .
-The affected system calls include
-.Xr open 2 ,
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr sendto 2 ,
-.Xr recvfrom 2 ,
-.Xr sendmsg 2
-and
-.Xr recvmsg 2
-on a communications channel or a slow device (such as a terminal,
-but not a regular file)
-and during a
-.Xr wait 2
-or
-.Xr ioctl 2 .
-However, calls that have already committed are not restarted,
-but instead return a partial success (for example, a short read count).
-.Pp
-After a
-.Xr fork 2
-or
-.Xr vfork 2
-all signals, the signal mask, the signal stack,
-and the interrupt/restart flags are inherited by the child.
-.Pp
-The
-.Xr execve 2
-system call reinstates the default action for all signals which
-were caught and resets all signals to be caught on the user stack.
-Ignored signals remain ignored;
-the signal mask remains the same;
-signals that interrupt pending system calls continue to do so.
-.Pp
-See
-.Xr signal 7
-for comprehensive list of supported signals.
-.Sh NOTES
-The mask specified in
-.Fa vec
-is not allowed to block
-.Dv SIGKILL
-or
-.Dv SIGSTOP .
-This is enforced silently by the system.
-.Pp
-The
-.Dv SV_INTERRUPT
-flag is not available in
-.Bx 4.2 ,
-hence it should not be used if backward compatibility is needed.
-.Sh RETURN VALUES
-A 0 value indicated that the call succeeded.
-A \-1 return value indicates an error occurred and
-.Va errno
-is set to indicated the reason.
-.Sh EXAMPLES
-The handler routine can be declared:
-.Bd -literal -offset indent
-void
-handler(sig, code, scp)
-	int sig, code;
-	struct sigcontext *scp;
-.Ed
-.Pp
-Here
-.Fa sig
-is the signal number, into which the hardware faults and traps are
-mapped as defined below.
-.Fa code
-is a parameter that is either a constant
-or the code provided by the hardware.
-.Fa scp
-is a pointer to the
-.Fa sigcontext
-structure (defined in
-.In signal.h ) ,
-used to restore the context from before the signal.
-.Sh ERRORS
-.Fn sigvec
-will fail and no new signal handler will be installed if one
-of the following occurs:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-Either
-.Fa vec
-or
-.Fa ovec
-points to memory that is not a valid part of the process
-address space.
-.It Bq Er EINVAL
-.Fa sig
-is not a valid signal number.
-.It Bq Er EINVAL
-An attempt is made to ignore or supply a handler for
-.Dv SIGKILL
-or
-.Dv SIGSTOP .
-.El
-.Sh SEE ALSO
-.Xr kill 1 ,
-.Xr kill 2 ,
-.Xr ptrace 2 ,
-.Xr sigaction 2 ,
-.Xr sigaltstack 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigstack 2 ,
-.Xr sigsuspend 2 ,
-.Xr setjmp 3 ,
-.Xr sigblock 3 ,
-.Xr siginterrupt 3 ,
-.Xr signal 3 ,
-.Xr sigpause 3 ,
-.Xr sigsetmask 3 ,
-.Xr sigsetops 3 ,
-.Xr tty 4 ,
-.Xr signal 7
diff --git a/lib/libc/compat/Makefile b/lib/libc/compat/Makefile
deleted file mode 100644
index 8cb0e46a7..000000000
--- a/lib/libc/compat/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#	$NetBSD: Makefile,v 1.6 2012/01/22 18:36:16 christos Exp $
-#	@(#)Makefile	8.2 (Berkeley) 2/3/94
-#
-
-.include "${.CURDIR}/../Makefile.inc"
-
-LIB=		cold
-CPPFLAGS+=	-I${.CURDIR}/../include -I${.CURDIR}/..
-CPPFLAGS+=	-I${.CURDIR}/../arch/${ARCHSUBDIR}
-
-COMPATDIR=${.CURDIR}
-
-.include "${.CURDIR}/Makefile.inc"
-
-.include "${.CURDIR}/db/Makefile.inc"
-.include "${.CURDIR}/gen/Makefile.inc"
-.include "${.CURDIR}/locale/Makefile.inc"
-.include "${.CURDIR}/net/Makefile.inc"
-.if !defined(__MINIX)
-.include "${.CURDIR}/rpc/Makefile.inc"
-.endif # !defined(__MINIX)
-.include "${.CURDIR}/stdio/Makefile.inc"
-.include "${.CURDIR}/stdlib/Makefile.inc"
-.include "${.CURDIR}/sys/Makefile.inc"
-
-COMPATARCHDIR=${.CURDIR}/arch/${ARCHSUBDIR}
-.PATH: ${COMPATARCHDIR}/gen ${COMPATARCHDIR}/sys
-
-.include <bsd.lib.mk>
diff --git a/lib/libc/compat/Makefile.inc b/lib/libc/compat/Makefile.inc
deleted file mode 100644
index b74a68819..000000000
--- a/lib/libc/compat/Makefile.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.7 2012/01/22 18:36:16 christos Exp $
-
-CPPFLAGS+=	-I${NETBSDSRCDIR}/sys
-
-COMPATARCHDIR=${COMPATDIR}/arch/${ARCHSUBDIR}
-.PATH: ${COMPATARCHDIR}/gen ${COMPATARCHDIR}/sys
-
-.include "${COMPATDIR}/db/Makefile.inc"
-.include "${COMPATDIR}/locale/Makefile.inc"
-.include "${COMPATDIR}/gen/Makefile.inc"
-.include "${COMPATDIR}/net/Makefile.inc"
-.if !defined(__MINIX)
-.include "${COMPATDIR}/rpc/Makefile.inc"
-.endif # !defined(__MINIX)
-.include "${COMPATDIR}/stdio/Makefile.inc"
-.include "${COMPATDIR}/stdlib/Makefile.inc"
-.include "${COMPATDIR}/sys/Makefile.inc"
-.include "${COMPATDIR}/time/Makefile.inc"
-.if !defined(__MINIX)
-.include "${COMPATARCHDIR}/Makefile.inc"
-.endif # !defined(__MINIX)
diff --git a/lib/libc/compat/arch/aarch64/Makefile.inc b/lib/libc/compat/arch/aarch64/Makefile.inc
deleted file mode 100644
index 4bcaf502f..000000000
--- a/lib/libc/compat/arch/aarch64/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/08/10 05:47:37 matt Exp $
diff --git a/lib/libc/compat/arch/alpha/Makefile.inc b/lib/libc/compat/arch/alpha/Makefile.inc
deleted file mode 100644
index aa2ae6647..000000000
--- a/lib/libc/compat/arch/alpha/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.2 2006/03/11 23:04:03 christos Exp $
-
-.include "${COMPATARCHDIR}/gen/Makefile.inc"
-.include "${COMPATARCHDIR}/sys/Makefile.inc"
diff --git a/lib/libc/compat/arch/alpha/gen/Makefile.inc b/lib/libc/compat/arch/alpha/gen/Makefile.inc
deleted file mode 100644
index 4fc8c9ab5..000000000
--- a/lib/libc/compat/arch/alpha/gen/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.2 2006/06/28 14:22:15 drochner Exp $
-
-# objects built from assembler sources
-SRCS+=  compat_setjmp.S compat__setjmp.S compat_sigsetjmp.S
-
-# objects built from C sources in compat/gen
-SRCS+=  compat_frexp_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
diff --git a/lib/libc/compat/arch/alpha/gen/compat__setjmp.S b/lib/libc/compat/arch/alpha/gen/compat__setjmp.S
deleted file mode 100644
index 3a9550a54..000000000
--- a/lib/libc/compat/arch/alpha/gen/compat__setjmp.S
+++ /dev/null
@@ -1,125 +0,0 @@
-/* $NetBSD: compat__setjmp.S,v 1.4 2014/01/24 10:19:18 skrll 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>
-
-/*
- * 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,
- * The previous signal state is NOT restored.
- */
-
-	.set	noreorder
-
-LEAF(_setjmp, 1)
-	LDGP(pv)
-	stq	ra, (2 * 8)(a0)			/* sc_pc = return address */
-	stq	s0, (( 9 + 4) * 8)(a0)		/* saved bits of sc_regs */
-	stq	s1, ((10 + 4) * 8)(a0)
-	stq	s2, ((11 + 4) * 8)(a0)
-	stq	s3, ((12 + 4) * 8)(a0)
-	stq	s4, ((13 + 4) * 8)(a0)
-	stq	s5, ((14 + 4) * 8)(a0)
-	stq	s6, ((15 + 4) * 8)(a0)
-	stq	ra, ((26 + 4) * 8)(a0)
-	stq	sp, ((30 + 4) * 8)(a0)
-	ldq	t0, magic			/* sigcontext magic number */
-	stq	t0, ((31 + 4) * 8)(a0)		/* magic in sc_regs[31] */
-	/* Too bad we can't check if we actually used FP */
-	ldiq	t0, 1
-	stq	t0, (36 * 8)(a0)		/* say we've used FP.  */
-	stt	fs0, ((2 + 37) * 8)(a0)		/* saved bits of sc_fpregs */
-	stt	fs1, ((3 + 37) * 8)(a0)
-	stt	fs2, ((4 + 37) * 8)(a0)
-	stt	fs3, ((5 + 37) * 8)(a0)
-	stt	fs4, ((6 + 37) * 8)(a0)
-	stt	fs5, ((7 + 37) * 8)(a0)
-	stt	fs6, ((8 + 37) * 8)(a0)
-	stt	fs7, ((9 + 37) * 8)(a0)
-	mf_fpcr ft0				/* get FP control reg */
-	stt	ft0, (69 * 8)(a0)		/* and store it in sc_fpcr */
-	stq	zero, (70 * 8)(a0)		/* FP software control XXX */
-	stq	zero, (71 * 8)(a0)		/* sc_reserved[0] */
-	stq	zero, (72 * 8)(a0)		/* sc_reserved[1] */
-	stq	zero, (73 * 8)(a0)		/* sc_xxx[0] */
-	stq	zero, (74 * 8)(a0)		/* sc_xxx[1] */
-	stq	zero, (75 * 8)(a0)		/* sc_xxx[2] */
-	stq	zero, (76 * 8)(a0)		/* sc_xxx[3] */
-	stq	zero, (77 * 8)(a0)		/* sc_xxx[4] */
-	stq	zero, (78 * 8)(a0)		/* sc_xxx[5] */
-	stq	zero, (79 * 8)(a0)		/* sc_xxx[6] */
-	stq	zero, (80 * 8)(a0)		/* sc_xxx[7] */
-
-	mov	zero, v0			/* return zero */
-	RET
-magic:
-	.quad 0xacedbadd
-END(_setjmp)
-
-LEAF(_longjmp, 2)
-	LDGP(pv)
-	ldq	t0, ((31 + 4) * 8)(a0)		/* magic in sc_regs[31] */
-	ldq	t1, magic			/* sigcontext magic number */
-	cmpeq	t0, t1, t0
-	beq	t0, botch			/* If the magic was bad, punt */
-
-	ldq	ra, (2 * 8)(a0)			/* sc_pc = return address */
-	ldq	s0, (( 9 + 4) * 8)(a0)		/* saved bits of sc_regs */
-	ldq	s1, ((10 + 4) * 8)(a0)
-	ldq	s2, ((11 + 4) * 8)(a0)
-	ldq	s3, ((12 + 4) * 8)(a0)
-	ldq	s4, ((13 + 4) * 8)(a0)
-	ldq	s5, ((14 + 4) * 8)(a0)
-	ldq	s6, ((15 + 4) * 8)(a0)
-	/* ldq	ra, ((26 + 4) * 8)(a0)		set above */
-	ldq	sp, ((30 + 4) * 8)(a0)
-	ldt	fs0, ((2 + 37) * 8)(a0)		/* saved bits of sc_fpregs */
-	ldt	fs1, ((3 + 37) * 8)(a0)
-	ldt	fs2, ((4 + 37) * 8)(a0)
-	ldt	fs3, ((5 + 37) * 8)(a0)
-	ldt	fs4, ((6 + 37) * 8)(a0)
-	ldt	fs5, ((7 + 37) * 8)(a0)
-	ldt	fs6, ((8 + 37) * 8)(a0)
-	ldt	fs7, ((9 + 37) * 8)(a0)
-	ldt	ft0, (69 * 8)(a0)		/* get sc_fpcr */
-	mt_fpcr	ft0				/* and restore it. */
-
-	mov	a1, v0				/* return second arg */
-	RET
-
-botch:
-	CALL(longjmperror)
-	CALL(abort)
-	RET					/* "can't" get here... */
-END(_longjmp)
diff --git a/lib/libc/compat/arch/alpha/gen/compat_setjmp.S b/lib/libc/compat/arch/alpha/gen/compat_setjmp.S
deleted file mode 100644
index 8daa5e60d..000000000
--- a/lib/libc/compat/arch/alpha/gen/compat_setjmp.S
+++ /dev/null
@@ -1,126 +0,0 @@
-/* $NetBSD: compat_setjmp.S,v 1.2 2014/01/23 03:08:50 christos 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>
-
-/*
- * 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.
- */
-
-	.set	noreorder
-
-LEAF(setjmp, 1)
-	LDGP(pv)
-	stq	ra, (2 * 8)(a0)			/* sc_pc = return address */
-	stq	s0, (( 9 + 4) * 8)(a0)		/* saved bits of sc_regs */
-	stq	s1, ((10 + 4) * 8)(a0)
-	stq	s2, ((11 + 4) * 8)(a0)
-	stq	s3, ((12 + 4) * 8)(a0)
-	stq	s4, ((13 + 4) * 8)(a0)
-	stq	s5, ((14 + 4) * 8)(a0)
-	stq	s6, ((15 + 4) * 8)(a0)
-	stq	ra, ((26 + 4) * 8)(a0)
-	stq	sp, ((30 + 4) * 8)(a0)
-
-	/*
-	 * get signal information
-	 */
-	mov	a0, s0				/* squirrel away ptr to sc */
-
-	/* see what's blocked */
-	mov	zero, a0
-	CALL(sigblock)				/* see what's blocked */
-	stq	v0, (1 * 8)(s0)			/* and remember it in sc_mask */
-
-	lda	sp, -24(sp)			/* sizeof struct sigaltstack */
-	mov	zero, a0
-	mov	sp, a1
-	CALL(__sigaltstack14)
-	ldl	t0, 16(sp)			/* offset of ss_flags */
-	lda	sp, 24(sp)			/* sizeof struct sigaltstack */
-	ldq	ra, ((26 + 4) * 8)(s0)		/* restore return address */
-	blt	v0, botch			/* check for error */
-	and	t0, 0x1, t0			/* get SA_ONSTACK flag */
-	stq	t0, (0 * 8)(s0)			/* and save it in sc_onstack */
-	/*
-	 * Restore old s0 and a0, and continue saving registers
-	 */
-	mov	s0, a0
-	ldq	s0, (( 9 + 4) * 8)(a0)
-
-	ldq	t0, magic 			/* sigcontext magic number */
-	stq	t0, ((31 + 4) * 8)(a0)		/* magic in sc_regs[31] */
-	/* Too bad we can't check if we actually used FP */
-	ldiq	t0, 1
-	stq	t0, (36 * 8)(a0)		/* say we've used FP.  */
-	stt	fs0, ((2 + 37) * 8)(a0)		/* saved bits of sc_fpregs */
-	stt	fs1, ((3 + 37) * 8)(a0)
-	stt	fs2, ((4 + 37) * 8)(a0)
-	stt	fs3, ((5 + 37) * 8)(a0)
-	stt	fs4, ((6 + 37) * 8)(a0)
-	stt	fs5, ((7 + 37) * 8)(a0)
-	stt	fs6, ((8 + 37) * 8)(a0)
-	stt	fs7, ((9 + 37) * 8)(a0)
-	mf_fpcr	ft0				/* get FP control reg */
-	stt	ft0, (69 * 8)(a0)		/* and store it in sc_fpcr */
-	stq	zero, (70 * 8)(a0)		/* FP software control XXX */
-	stq	zero, (71 * 8)(a0)		/* sc_reserved[0] */
-	stq	zero, (72 * 8)(a0)		/* sc_reserved[1] */
-	stq	zero, (73 * 8)(a0)		/* sc_xxx[0] */
-	stq	zero, (74 * 8)(a0)		/* sc_xxx[1] */
-	stq	zero, (75 * 8)(a0)		/* sc_xxx[2] */
-	stq	zero, (76 * 8)(a0)		/* sc_xxx[3] */
-	stq	zero, (77 * 8)(a0)		/* sc_xxx[4] */
-	stq	zero, (78 * 8)(a0)		/* sc_xxx[5] */
-	stq	zero, (79 * 8)(a0)		/* sc_xxx[6] */
-	stq	zero, (80 * 8)(a0)		/* sc_xxx[7] */
-
-	mov	zero, v0			/* return zero */
-	RET
-END(setjmp)
-
-LEAF(longjmp, 2)
-	LDGP(pv)
-	stq	a1, (( 0 + 4) * 8)(a0)		/* save return value */
-	CALL(sigreturn)				/* use sigreturn to return */
-
-botch:
-	CALL(longjmperror)
-	CALL(abort)
-	RET					/* "can't" get here... */
-magic:
-	.quad	0xacedbade			/* sigcontext magic number */
-END(longjmp)
diff --git a/lib/libc/compat/arch/alpha/gen/compat_sigsetjmp.S b/lib/libc/compat/arch/alpha/gen/compat_sigsetjmp.S
deleted file mode 100644
index dba6f6487..000000000
--- a/lib/libc/compat/arch/alpha/gen/compat_sigsetjmp.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/* $NetBSD: compat_sigsetjmp.S,v 1.1 2005/09/16 18:21:19 drochner 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>
-
-/*
- * 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.
- */
-
-	.set	noreorder
-
-LEAF(sigsetjmp, 2)
-	LDGP(pv)
-	stq	a1, (81 * 8)(a0)		/* save the mask */
-	bne	a1, Lsavesig			/* if !zero, save signals */
-	jmp	zero, _setjmp				/* else don't. */
-Lsavesig:
-	jmp	zero, setjmp
-END(sigsetjmp)
-
-LEAF(siglongjmp, 2)
-	LDGP(pv)
-	ldq	t0, (81 * 8)(a0)		/* get the mask */
-	bne	t0, Lrestoresig			/* if !zero, restore signals */
-	jmp	zero, _longjmp
-Lrestoresig:
-	jmp	zero, longjmp
-END(siglongjmp)
diff --git a/lib/libc/compat/arch/alpha/sys/Makefile.inc b/lib/libc/compat/arch/alpha/sys/Makefile.inc
deleted file mode 100644
index 821e4101e..000000000
--- a/lib/libc/compat/arch/alpha/sys/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/03/06 17:08:12 bouyer Exp $
-
-SRCS+=compat_Ovfork.S compat___semctl.S compat___sigreturn14.S \
-    compat___sigtramp1.S compat_msgctl.S compat_shmctl.S compat_sigaction.S \
-    compat_sigpending.S compat_sigprocmask.S compat_sigreturn.S \
-    compat_sigsuspend.S compat_quotactl.S
diff --git a/lib/libc/compat/arch/alpha/sys/compat_Ovfork.S b/lib/libc/compat/arch/alpha/sys/compat_Ovfork.S
deleted file mode 100644
index b061d6dc2..000000000
--- a/lib/libc/compat/arch/alpha/sys/compat_Ovfork.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $NetBSD: compat_Ovfork.S,v 1.1 2005/09/16 18:21:19 drochner 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.h"
-
-WARN_REFERENCES(vfork, \
-    "warning: reference to compatibility vfork(); include <unistd.h> for correct reference")
-
-SYSCALL(vfork)
-	cmovne	a4, zero, v0		/* a4 (rv[1]) != 0, child */
-	RET
-END(vfork)
diff --git a/lib/libc/compat/arch/alpha/sys/compat___semctl.S b/lib/libc/compat/arch/alpha/sys/compat___semctl.S
deleted file mode 100644
index 80503100d..000000000
--- a/lib/libc/compat/arch/alpha/sys/compat___semctl.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-PSEUDO(__semctl,compat_14___semctl)
diff --git a/lib/libc/compat/arch/alpha/sys/compat___sigreturn14.S b/lib/libc/compat/arch/alpha/sys/compat___sigreturn14.S
deleted file mode 100644
index 708ef2f6b..000000000
--- a/lib/libc/compat/arch/alpha/sys/compat___sigreturn14.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $NetBSD: compat___sigreturn14.S,v 1.1 2005/09/16 18:21:19 drochner 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.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 Alpha.
- * (XXX PROFILING)
- */
-
-PSEUDO(__sigreturn14,compat_16___sigreturn14)
diff --git a/lib/libc/compat/arch/alpha/sys/compat___sigtramp1.S b/lib/libc/compat/arch/alpha/sys/compat___sigtramp1.S
deleted file mode 100644
index df48f30f8..000000000
--- a/lib/libc/compat/arch/alpha/sys/compat___sigtramp1.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*	$NetBSD: compat___sigtramp1.S,v 1.1 2005/09/16 18:21:19 drochner Exp $	*/
-
-/*
- * 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.h"
-
-/*
- * The Alpha signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, the stack looks like:
- *
- *	sp->	sigcontext structure
- */
-NESTED_NOPROFILE(__sigtramp_sigcontext_1,0,0,ra,0,0)
-	mov	sp, a0			/* get pointer to sigcontext */
-	CALLSYS_NOERROR(compat_16___sigreturn14)	/* and call sigreturn() with it */
-	mov	v0, a0			/* if that failed, get error code */
-	CALLSYS_NOERROR(exit)		/* and call exit() with it */
-END(__sigtramp_sigcontext_1)
diff --git a/lib/libc/compat/arch/alpha/sys/compat_msgctl.S b/lib/libc/compat/arch/alpha/sys/compat_msgctl.S
deleted file mode 100644
index cc08d76ef..000000000
--- a/lib/libc/compat/arch/alpha/sys/compat_msgctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_msgctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(msgctl, \
-    "warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
-
-PSEUDO(msgctl,compat_14_msgctl)
diff --git a/lib/libc/compat/arch/alpha/sys/compat_quotactl.S b/lib/libc/compat/arch/alpha/sys/compat_quotactl.S
deleted file mode 100644
index aa367e039..000000000
--- a/lib/libc/compat/arch/alpha/sys/compat_quotactl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_quotactl.S,v 1.2 2011/03/06 17:08:12 bouyer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(quotactl, \
-    "warning: reference to compatibility quotactl(); include <sys/quota.h> for correct reference")
-
-PSEUDO(quotactl,compat_50_quotactl)
diff --git a/lib/libc/compat/arch/alpha/sys/compat_shmctl.S b/lib/libc/compat/arch/alpha/sys/compat_shmctl.S
deleted file mode 100644
index 10d43f71d..000000000
--- a/lib/libc/compat/arch/alpha/sys/compat_shmctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_shmctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(shmctl, \
-    "warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
-
-PSEUDO(shmctl,compat_14_shmctl)
diff --git a/lib/libc/compat/arch/alpha/sys/compat_sigaction.S b/lib/libc/compat/arch/alpha/sys/compat_sigaction.S
deleted file mode 100644
index a5f8ad810..000000000
--- a/lib/libc/compat/arch/alpha/sys/compat_sigaction.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_sigaction.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigaction, \
-    "warning: reference to compatibility sigaction(); include <signal.h> for correct reference")
-
-PSEUDO(sigaction,compat_13_sigaction13)
diff --git a/lib/libc/compat/arch/alpha/sys/compat_sigpending.S b/lib/libc/compat/arch/alpha/sys/compat_sigpending.S
deleted file mode 100644
index 7ecf6a348..000000000
--- a/lib/libc/compat/arch/alpha/sys/compat_sigpending.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $NetBSD: compat_sigpending.S,v 1.1 2005/09/16 18:21:20 drochner 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.h"
-
-WARN_REFERENCES(sigpending, \
-    "warning: reference to compatibility sigpending(); include <signal.h> for correct reference")
-
-LEAF(sigpending,0)			/* XXX # of args? */
-	CALLSYS_ERROR(compat_13_sigpending13)
-	stl	v0, 0(a0)
-	mov	zero, v0
-	RET
-END(sigpending)
diff --git a/lib/libc/compat/arch/alpha/sys/compat_sigprocmask.S b/lib/libc/compat/arch/alpha/sys/compat_sigprocmask.S
deleted file mode 100644
index 316a80ad9..000000000
--- a/lib/libc/compat/arch/alpha/sys/compat_sigprocmask.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $NetBSD: compat_sigprocmask.S,v 1.1 2005/09/16 18:21:20 drochner 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.h"
-
-WARN_REFERENCES(sigprocmask, \
-    "warning: reference to compatibility sigprocmask(); include <signal.h> for correct reference")
-
-LEAF(sigprocmask, 3)
-	mov	a2, a5			/* safe */
-	cmoveq	a1, 1, a0		/* if set == NULL, how = SIG_BLOCK */
-	beq	a1, Ldoit		/* and set = 0, and do it. */
-	ldl	a1, 0(a1)		/* load the set from *set */
-Ldoit:	CALLSYS_ERROR(compat_13_sigprocmask13)
-	beq	a5, Lret		/* if they don't want old mask, done */	
-	stl	v0, 0(a5)		/* otherwise, give it to them. */
-Lret:	mov	zero, v0
-	RET
-
-	END(sigprocmask)
-
diff --git a/lib/libc/compat/arch/alpha/sys/compat_sigreturn.S b/lib/libc/compat/arch/alpha/sys/compat_sigreturn.S
deleted file mode 100644
index 76983d0bf..000000000
--- a/lib/libc/compat/arch/alpha/sys/compat_sigreturn.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: compat_sigreturn.S,v 1.1 2005/09/16 18:21:20 drochner 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.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 Alpha.
- * (XXX PROFILING)
- */
-
-WARN_REFERENCES(sigreturn, \
-    "warning: reference to compatibility sigreturn()")
-
-PSEUDO(sigreturn,compat_13_sigreturn13)
diff --git a/lib/libc/compat/arch/alpha/sys/compat_sigsuspend.S b/lib/libc/compat/arch/alpha/sys/compat_sigsuspend.S
deleted file mode 100644
index b8f3b5743..000000000
--- a/lib/libc/compat/arch/alpha/sys/compat_sigsuspend.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $NetBSD: compat_sigsuspend.S,v 1.1 2005/09/16 18:21:20 drochner 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.h"
-
-WARN_REFERENCES(sigsuspend, \
-    "warning: reference to compatibility sigsuspend(); include <signal.h> for correct reference")
-
-LEAF(sigsuspend, 1)
-	ldl	a0, 0(a0)		/* pass *mask instead of mask */
-	CALLSYS_ERROR(compat_13_sigsuspend13)
-	mov	zero, v0		/* shouldn't need; just in case... */
-	RET
-END(sigsuspend)
diff --git a/lib/libc/compat/arch/arm/Makefile.inc b/lib/libc/compat/arch/arm/Makefile.inc
deleted file mode 100644
index 78ab575bb..000000000
--- a/lib/libc/compat/arch/arm/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2006/03/11 23:04:03 christos Exp $
-
-.include "${COMPATARCHDIR}/gen/Makefile.inc"
-.include "${COMPATARCHDIR}/sys/Makefile.inc"
diff --git a/lib/libc/compat/arch/arm/gen/Makefile.inc b/lib/libc/compat/arch/arm/gen/Makefile.inc
deleted file mode 100644
index 81b2b912d..000000000
--- a/lib/libc/compat/arch/arm/gen/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2006/06/28 14:46:33 drochner Exp $
-
-SRCS+=	compat_setjmp.S compat_sigsetjmp.S
-
-# objects built from C sources in compat/gen
-SRCS+=	compat_frexp_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
diff --git a/lib/libc/compat/arch/arm/gen/compat_setjmp.S b/lib/libc/compat/arch/arm/gen/compat_setjmp.S
deleted file mode 100644
index a98d9fbf1..000000000
--- a/lib/libc/compat/arch/arm/gen/compat_setjmp.S
+++ /dev/null
@@ -1,155 +0,0 @@
-/*	$NetBSD: compat_setjmp.S,v 1.4 2013/11/30 20:54:14 joerg Exp $	*/
-
-/*
- * Copyright (c) 1997 Mark Brinicombe
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Mark Brinicombe
- * 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 AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING 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 <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.
- * The previous signal state is restored.
- */
-
-ENTRY(setjmp)
-	/* Block all signals and retrieve the old signal mask */
-	push	{r0, lr}
-	movs	r0, #0x00000000
-
-	bl	PLT_SYM(_C_LABEL(sigblock))
-	mov	r1, r0
-
-	/* Store signal mask */
-	str	r1, [r0, #(_JB_SIGMASK * 4)]
-
-	ldr	r1, .Lsetjmp_magic
-	str	r1, [r0]
-
-	/* Store integer registers */
-	adds	r0, r0, #(_JB_REG_R4 * 4)
-#ifdef __thumb__
-#ifdef _ARM_ARCH_7
-        stmia	r0!, {r4-r12}
-	str	sp, [r0, #0]
-	str	lr, [r0, #4]
-#else
-        stmia	r0!, {r4-r7}
-	mov	r2, r8
-	mov	r3, r9
-	stmia	r0!, {r2-r3}
-	mov	r1, r10
-	mov	r2, r11
-	mov	r3, r12
-	stmia	r0!, {r1-r3}
-	mov	r2, sp
-	mov	r3, lr
-	stmia	r0!, {r2-r3}
-#endif
-#else
-        stmia	r0, {r4-lr}
-#endif
-        movs	r0, #0
-	pop	{r3, pc}
-END(setjmp)
-
-ENTRY(longjmp)
-	ldr	r2, .Lsetjmp_magic
-	ldr	r3, [r0]
-	cmp	r2, r3
-	bne	botch
-
-	/* Fetch signal mask */
-	ldr	r2, [r0, #(_JB_SIGMASK * 4)]
-
-	/* Set signal mask */
-	push	{r0, r1}	/* don't care about lr */
-
-	mov	r0, r2
-	bl	PLT_SYM(_C_LABEL(sigsetmask))
-
-	pop	{r0, r1} 
-
-	/* Restore integer registers */
-	adds	r0, r0, #(_JB_REG_R4 * 4)
-#if !defined(__thumb__) || defined(_ARM_ARCH_7)
-        ldmia	r0!, {r4-r12}
-#else
-        ldmia	r0!, {r4-r7}
-        ldmia	r0!, {r2-r3}
-	mov	r8, r2
-	mov	r9, r3
-        ldmia	r0!, {r1-r3}
-	mov	r10, r2
-	mov	r11, r3
-        ldmia	r0!, {r2}
-	mov	r12, r2
-#endif
-
-	ldmia	r0!, {r2-r3}	/* r2 = sp, r3 = lr */
-
-	/* Validate sp */
-	cmp	r2, #0
-	beq	botch
-	mov	sp, r2
-
-	/* Validate lr */
-	cmp	r3, #0
-	beq	botch
-	mov	lr, r3
-
-	/* Set return value */
-	mov	r0, r1
-	cmp	r0, #0
-#ifdef __thumb__
-	bne	1f
-	movs	r0, #1
-1:
-#else
-	moveq	r0, #1
-#endif
-	RET
-
-	/* validation failed, die die die. */
-botch:
-	bl	PLT_SYM(_C_LABEL(longjmperror))
-	bl	PLT_SYM(_C_LABEL(abort))
-2:	b	2b		/* Cannot get here */
-
-	.align	0
-.Lsetjmp_magic:
-	.word	_JB_MAGIC_SETJMP
-END(longjmp)
diff --git a/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S b/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S
deleted file mode 100644
index 31ae15276..000000000
--- a/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S
+++ /dev/null
@@ -1,91 +0,0 @@
-/*	$NetBSD: compat_sigsetjmp.S,v 1.3 2013/11/30 20:54:14 joerg Exp $	*/
-
-/*
- * Copyright (c) 1997 Mark Brinicombe
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Mark Brinicombe
- * 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 AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING 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 <machine/setjmp.h>
-
-/*
- * C library -- sigsetjmp, siglongjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v)" from the last call to
- *	setjmp(a, m)
- * by restoring registers from the stack.
- * The previous signal state is restored.
- */
-
-ENTRY(sigsetjmp)
-#if defined(__thumb__) && defined(_ARM_ARCH_T2)
-	cbnz	r1, 1f
-	b	PLT_SYM(_C_LABEL(_setjmp))
-1:	b	PLT_SYM(_C_LABEL(setjmp))
-#elif !defined(__thumb__)
-	cmp	r1, #0
-	beq	PLT_SYM(_C_LABEL(_setjmp))
-	b	PLT_SYM(_C_LABEL(setjmp))
-#else
-	push	{r3, lr}
-	beq	1f
-	bl	PLT_SYM(_C_LABEL(setjmp))
-	pop	{r3, pc}
-1:	bl	PLT_SYM(_C_LABEL(_setjmp))
-	pop	{r3, pc}
-#endif
-END(sigsetjmp)
-
-ENTRY(siglongjmp)
-	ldr	r2, .L_setjmp_magic
-	ldr	r3, [r0]
-	cmp	r2, r3
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-#if defined(__thumb__)
-	it	eq
-#endif
-	beq	PLT_SYM(_C_LABEL(_longjmp))
-	b	PLT_SYM(_C_LABEL(longjmp))
-#else
-	push	{lr}
-	sub	sp, sp, #4
-	beq	1f
-	bl	PIC_SYM(_C_LABEL(longjmp), PLT)
-	b	2f
-1:	bl	PIC_SYM(_C_LABEL(_longjmp), PLT)
-2:	add	sp, sp, #4
-	pop	{pc}
-#endif
-
-	.align	0
-.L_setjmp_magic:
-	.word	_JB_MAGIC__SETJMP
-END(siglongjmp)
diff --git a/lib/libc/compat/arch/arm/sys/Makefile.inc b/lib/libc/compat/arch/arm/sys/Makefile.inc
deleted file mode 100644
index 47154b1b6..000000000
--- a/lib/libc/compat/arch/arm/sys/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2011/03/06 17:08:13 bouyer Exp $
-
-SRCS+=compat_Ovfork.S compat___semctl.S compat___sigreturn14.S \
-    compat___sigtramp1.S compat_msgctl.S compat_shmctl.S compat_sigaction.S \
-    compat_sigpending.S compat_sigprocmask.S compat_sigreturn.S \
-    compat_sigsuspend.S compat_quotactl.S
diff --git a/lib/libc/compat/arch/arm/sys/compat_Ovfork.S b/lib/libc/compat/arch/arm/sys/compat_Ovfork.S
deleted file mode 100644
index 98e6989a4..000000000
--- a/lib/libc/compat/arch/arm/sys/compat_Ovfork.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: compat_Ovfork.S,v 1.3 2013/08/19 22:11:50 matt Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)Ovfork.s	5.1 (Berkeley) 4/23/90
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(vfork, \
-    "warning: reference to compatibility vfork(); include <unistd.h> for correct reference")
-
-/*
- * pid = vfork();
- *
- * On return from the SWI:
- * r1 == 0 in parent process, r1 == 1 in child process.
- * r0 == pid of child in parent, r0 == pid of parent in child.
- */
-ENTRY(vfork)
-	mov	r2, lr
-	SYSTRAP(vfork)
-	_INVOKE_CERROR()
-	mov	lr, r2
-	subs	r1, r1, #1	/* r1 == 0xffffffff if parent, 0 if child */
-	ands	r0, r0, r1	/* r0 == 0 if child, else unchanged */
-	RET
-END(vfork)
diff --git a/lib/libc/compat/arch/arm/sys/compat___semctl.S b/lib/libc/compat/arch/arm/sys/compat___semctl.S
deleted file mode 100644
index 80503100d..000000000
--- a/lib/libc/compat/arch/arm/sys/compat___semctl.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-PSEUDO(__semctl,compat_14___semctl)
diff --git a/lib/libc/compat/arch/arm/sys/compat___sigreturn14.S b/lib/libc/compat/arch/arm/sys/compat___sigreturn14.S
deleted file mode 100644
index 72f0c1d5c..000000000
--- a/lib/libc/compat/arch/arm/sys/compat___sigreturn14.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*	$NetBSD: compat___sigreturn14.S,v 1.1 2005/10/16 17:27:50 christos Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
- */
-
-#include "SYS.h"
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-
-PSEUDO(__sigreturn14,compat_16___sigreturn14)
diff --git a/lib/libc/compat/arch/arm/sys/compat___sigtramp1.S b/lib/libc/compat/arch/arm/sys/compat___sigtramp1.S
deleted file mode 100644
index 93b21bb85..000000000
--- a/lib/libc/compat/arch/arm/sys/compat___sigtramp1.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: compat___sigtramp1.S,v 1.3 2013/08/19 22:11:50 matt Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-/*
- * The ARM signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, the stack looks like:
- *
- *	sp->	sigcontext structure
- */
-ENTRY(__sigtramp_sigcontext_1)
-	mov	r0, sp			/* get pointer to sigcontext */
-	SYSTRAP(compat_16___sigreturn14) /* and call sigreturn */
-
-	/* If that failed, exit with the error code. */
-	SYSTRAP(exit)
-END(__sigtramp_sigcontext_1)
diff --git a/lib/libc/compat/arch/arm/sys/compat_msgctl.S b/lib/libc/compat/arch/arm/sys/compat_msgctl.S
deleted file mode 100644
index cc08d76ef..000000000
--- a/lib/libc/compat/arch/arm/sys/compat_msgctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_msgctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(msgctl, \
-    "warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
-
-PSEUDO(msgctl,compat_14_msgctl)
diff --git a/lib/libc/compat/arch/arm/sys/compat_quotactl.S b/lib/libc/compat/arch/arm/sys/compat_quotactl.S
deleted file mode 100644
index 8df4a3de5..000000000
--- a/lib/libc/compat/arch/arm/sys/compat_quotactl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_quotactl.S,v 1.2 2011/03/06 17:08:13 bouyer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(quotactl, \
-    "warning: reference to compatibility quotactl(); include <sys/quota.h> for correct reference")
-
-PSEUDO(quotactl,compat_50_quotactl)
diff --git a/lib/libc/compat/arch/arm/sys/compat_shmctl.S b/lib/libc/compat/arch/arm/sys/compat_shmctl.S
deleted file mode 100644
index 10d43f71d..000000000
--- a/lib/libc/compat/arch/arm/sys/compat_shmctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_shmctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(shmctl, \
-    "warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
-
-PSEUDO(shmctl,compat_14_shmctl)
diff --git a/lib/libc/compat/arch/arm/sys/compat_sigaction.S b/lib/libc/compat/arch/arm/sys/compat_sigaction.S
deleted file mode 100644
index a5f8ad810..000000000
--- a/lib/libc/compat/arch/arm/sys/compat_sigaction.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_sigaction.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigaction, \
-    "warning: reference to compatibility sigaction(); include <signal.h> for correct reference")
-
-PSEUDO(sigaction,compat_13_sigaction13)
diff --git a/lib/libc/compat/arch/arm/sys/compat_sigpending.S b/lib/libc/compat/arch/arm/sys/compat_sigpending.S
deleted file mode 100644
index 83f72dd26..000000000
--- a/lib/libc/compat/arch/arm/sys/compat_sigpending.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: compat_sigpending.S,v 1.3 2013/08/19 22:11:50 matt Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)sigpending.s	5.1 (Berkeley) 7/1/90
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigpending, \
-    "warning: reference to compatibility sigpending(); include <signal.h> for correct reference")
-
-ENTRY(sigpending)
-	mov	r2, r0
-	SYSTRAP(compat_13_sigpending13)
-	_INVOKE_CERROR()
-	str	r0, [r2]
-	movs	r0, #0
-	RET
-END(sigpending)
diff --git a/lib/libc/compat/arch/arm/sys/compat_sigprocmask.S b/lib/libc/compat/arch/arm/sys/compat_sigprocmask.S
deleted file mode 100644
index df89f64d7..000000000
--- a/lib/libc/compat/arch/arm/sys/compat_sigprocmask.S
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: compat_sigprocmask.S,v 1.3 2013/08/19 22:11:50 matt Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)sigprocmask.s	5.2 (Berkeley) 12/17/90
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigprocmask, \
-    "warning: reference to compatibility sigprocmask(); include <signal.h> for correct reference")
-
-ENTRY(sigprocmask)
-	cmp	r1, #0
-#if defined(_ARM_ARCH_7) || !defined(__thumb__)
-#ifdef __thumb__
-	itte	eq
-#endif
-	moveq	r0, #1
-	moveq	r1, #0
-	ldrne	r1, [r1]
-#else
-	bne	1f
-	movs	r0, #1
-	movs	r1, #0
-	b	2f
-1:	ldr	r1, [r1]
-2:
-#endif
-	SYSTRAP(compat_13_sigprocmask13)
-	_INVOKE_CERROR()
-	cmp	r2, #0
-#if defined(_ARM_ARCH_7) || !defined(__thumb__)
-#ifdef __thumb__
-	it	ne
-#endif
-	strne	r0, [r2]
-#else
-	beq	3f
-	str	r0, [r2]
-3:
-#endif
-	movs	r0, #0
-	RET
-END(sigprocmask)
diff --git a/lib/libc/compat/arch/arm/sys/compat_sigreturn.S b/lib/libc/compat/arch/arm/sys/compat_sigreturn.S
deleted file mode 100644
index 6428869d2..000000000
--- a/lib/libc/compat/arch/arm/sys/compat_sigreturn.S
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$NetBSD: compat_sigreturn.S,v 1.2 2005/10/16 22:16:05 christos Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
- */
-
-#include "SYS.h"
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-
-WARN_REFERENCES(sigreturn, \
-    "warning: reference to compatibility sigreturn()")
-
-PSEUDO(sigreturn,compat_13_sigreturn13)
diff --git a/lib/libc/compat/arch/arm/sys/compat_sigsuspend.S b/lib/libc/compat/arch/arm/sys/compat_sigsuspend.S
deleted file mode 100644
index 5a6de9c8f..000000000
--- a/lib/libc/compat/arch/arm/sys/compat_sigsuspend.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*	$NetBSD: compat_sigsuspend.S,v 1.3 2013/08/19 22:11:50 matt Exp $	*/
-
-/*-
- * 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.
- *
- *	from: @(#)sigsuspend.s	5.2 (Berkeley) 12/17/90
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigsuspend, \
-    "warning: reference to compatibility sigsuspend(); include <signal.h> for correct reference")
-
-ENTRY(sigsuspend)
-	ldr	r0, [r0]
-	SYSTRAP(compat_13_sigsuspend13)
-	_INVOKE_CERROR()
-	movs	r0, #0
-	RET
-END(sigsuspend)
diff --git a/lib/libc/compat/arch/hppa/Makefile.inc b/lib/libc/compat/arch/hppa/Makefile.inc
deleted file mode 100644
index e9f6ca5ca..000000000
--- a/lib/libc/compat/arch/hppa/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2006/06/28 14:46:33 drochner Exp $
-
-.include "${COMPATARCHDIR}/gen/Makefile.inc"
-.include "${COMPATARCHDIR}/sys/Makefile.inc"
diff --git a/lib/libc/compat/arch/hppa/gen/Makefile.inc b/lib/libc/compat/arch/hppa/gen/Makefile.inc
deleted file mode 100644
index a9e9667c1..000000000
--- a/lib/libc/compat/arch/hppa/gen/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2006/06/28 14:46:33 drochner Exp $
-
-# objects built from C sources in compat/gen
-SRCS+=	compat_frexp_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
diff --git a/lib/libc/compat/arch/hppa/locale/compat_setlocale32.c b/lib/libc/compat/arch/hppa/locale/compat_setlocale32.c
deleted file mode 100644
index dc035cd31..000000000
--- a/lib/libc/compat/arch/hppa/locale/compat_setlocale32.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $NetBSD: compat_setlocale32.c,v 1.1 2010/06/07 13:52:29 tnozaki Exp $ */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * NetBSD: setlocale32.c,v 1.6 2010/05/22 13:50:02 tnozaki Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_setlocale32.c,v 1.1 2010/06/07 13:52:29 tnozaki Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <compat/include/locale.h>
-
-#include "setlocale_local.h"
-
-__warn_references(__setlocale_mb_len_max_32,
-    "warning: reference to compatibility __setlocale_mb_len_max_32();"
-    "include <locale.h> for correct reference")
-
-char *
-__setlocale_mb_len_max_32(int category, const char *locale)
-{
-
-	/* locale may be NULL */
-
-	__mb_len_max_runtime = 6;
-	return __setlocale(category, locale);
-}
diff --git a/lib/libc/compat/arch/hppa/sys/Makefile.inc b/lib/libc/compat/arch/hppa/sys/Makefile.inc
deleted file mode 100644
index 7910a4612..000000000
--- a/lib/libc/compat/arch/hppa/sys/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2011/03/06 17:08:13 bouyer Exp $
-
-SRCS+=compat_Ovfork.S compat___semctl.S compat___sigreturn14.S \
-    compat_msgctl.S compat_shmctl.S compat_sigaction.S \
-    compat_sigpending.S compat_sigprocmask.S compat_sigreturn.S \
-    compat_sigsuspend.S compat_quotactl.S
diff --git a/lib/libc/compat/arch/hppa/sys/compat_Ovfork.S b/lib/libc/compat/arch/hppa/sys/compat_Ovfork.S
deleted file mode 100644
index bf0f9a254..000000000
--- a/lib/libc/compat/arch/hppa/sys/compat_Ovfork.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: compat_Ovfork.S,v 1.2 2009/11/03 05:07:25 snj Exp $	*/
-
-/*	$OpenBSD: Ovfork.S,v 1.7 2001/06/04 23:14:04 mickey Exp $	*/
-
-/*
- * Copyright (c) 1999,2002 Michael Shalayeff
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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 HIS RELATIVES BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_Ovfork.S,v 1.2 2009/11/03 05:07:25 snj Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-ENTRY(vfork,0)
-	SYSCALL(vfork)
-	addi	-1, %ret1, %ret1
-	bv	%r0(%rp)
-	and	%ret1, %ret0, %ret0
-EXIT(vfork)
-
-	.end
diff --git a/lib/libc/compat/arch/hppa/sys/compat___semctl.S b/lib/libc/compat/arch/hppa/sys/compat___semctl.S
deleted file mode 100644
index 80503100d..000000000
--- a/lib/libc/compat/arch/hppa/sys/compat___semctl.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-PSEUDO(__semctl,compat_14___semctl)
diff --git a/lib/libc/compat/arch/hppa/sys/compat___sigreturn14.S b/lib/libc/compat/arch/hppa/sys/compat___sigreturn14.S
deleted file mode 100644
index 515a88801..000000000
--- a/lib/libc/compat/arch/hppa/sys/compat___sigreturn14.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: compat___sigreturn14.S,v 1.1 2006/03/11 19:54:56 christos Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat___sigreturn14.S,v 1.1 2006/03/11 19:54:56 christos Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-PSEUDO(__sigreturn14,compat_16___sigreturn14)
diff --git a/lib/libc/compat/arch/hppa/sys/compat_msgctl.S b/lib/libc/compat/arch/hppa/sys/compat_msgctl.S
deleted file mode 100644
index cc08d76ef..000000000
--- a/lib/libc/compat/arch/hppa/sys/compat_msgctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_msgctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(msgctl, \
-    "warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
-
-PSEUDO(msgctl,compat_14_msgctl)
diff --git a/lib/libc/compat/arch/hppa/sys/compat_quotactl.S b/lib/libc/compat/arch/hppa/sys/compat_quotactl.S
deleted file mode 100644
index 8df4a3de5..000000000
--- a/lib/libc/compat/arch/hppa/sys/compat_quotactl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_quotactl.S,v 1.2 2011/03/06 17:08:13 bouyer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(quotactl, \
-    "warning: reference to compatibility quotactl(); include <sys/quota.h> for correct reference")
-
-PSEUDO(quotactl,compat_50_quotactl)
diff --git a/lib/libc/compat/arch/hppa/sys/compat_shmctl.S b/lib/libc/compat/arch/hppa/sys/compat_shmctl.S
deleted file mode 100644
index 10d43f71d..000000000
--- a/lib/libc/compat/arch/hppa/sys/compat_shmctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_shmctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(shmctl, \
-    "warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
-
-PSEUDO(shmctl,compat_14_shmctl)
diff --git a/lib/libc/compat/arch/hppa/sys/compat_sigaction.S b/lib/libc/compat/arch/hppa/sys/compat_sigaction.S
deleted file mode 100644
index a5f8ad810..000000000
--- a/lib/libc/compat/arch/hppa/sys/compat_sigaction.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_sigaction.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigaction, \
-    "warning: reference to compatibility sigaction(); include <signal.h> for correct reference")
-
-PSEUDO(sigaction,compat_13_sigaction13)
diff --git a/lib/libc/compat/arch/hppa/sys/compat_sigpending.S b/lib/libc/compat/arch/hppa/sys/compat_sigpending.S
deleted file mode 100644
index 0ed8d51f4..000000000
--- a/lib/libc/compat/arch/hppa/sys/compat_sigpending.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: compat_sigpending.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Fredette.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-#include "SYS.h"
-
-	.import __cerror, code
-
-WARN_REFERENCES(sigpending, \
-    "warning: reference to compatibility sigpending(); include <signal.h> for correct reference")
-
-ENTRY(sigpending, 0)
-	/*
-	 * AFAICT, since the hppa port came after __sigpending14, 
-	 * we shouldn't have to supply the compatability sigpending.
-	 */
-	ldi	EINVAL, %t1
-	b,n	__cerror
-EXIT(sigpending)
diff --git a/lib/libc/compat/arch/hppa/sys/compat_sigprocmask.S b/lib/libc/compat/arch/hppa/sys/compat_sigprocmask.S
deleted file mode 100644
index 99c00931f..000000000
--- a/lib/libc/compat/arch/hppa/sys/compat_sigprocmask.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: compat_sigprocmask.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Fredette.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-#include "SYS.h"
-
-	.import __cerror, code
-
-WARN_REFERENCES(sigprocmask, \
-    "warning: reference to compatibility sigprocmask(); include <signal.h> for correct reference")
-
-ENTRY(sigprocmask, 0)
-	/*
-	 * AFAICT, since the hppa port came after __sigprocmask14, 
-	 * we shouldn't have to supply the compatability sigprocmask.
-	 */
-	ldi	EINVAL, %t1
-	b,n	__cerror
-EXIT(sigprocmask)
diff --git a/lib/libc/compat/arch/hppa/sys/compat_sigreturn.S b/lib/libc/compat/arch/hppa/sys/compat_sigreturn.S
deleted file mode 100644
index d02624bdb..000000000
--- a/lib/libc/compat/arch/hppa/sys/compat_sigreturn.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: compat_sigreturn.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Fredette.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-#include "SYS.h"
-
-	.import __cerror, code
-
-WARN_REFERENCES(sigreturn, \
-    "warning: reference to compatibility sigreturn(); include <signal.h> for correct reference")
-
-ENTRY(sigreturn, 0)
-	/*
-	 * AFAICT, since the hppa port came after __sigreturn14, 
-	 * we shouldn't have to supply the compatability sigreturn.
-	 */
-	ldi	EINVAL, %t1
-	b,n	__cerror
-EXIT(sigreturn)
diff --git a/lib/libc/compat/arch/hppa/sys/compat_sigsuspend.S b/lib/libc/compat/arch/hppa/sys/compat_sigsuspend.S
deleted file mode 100644
index 2cdbb3eff..000000000
--- a/lib/libc/compat/arch/hppa/sys/compat_sigsuspend.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: compat_sigsuspend.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Fredette.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/errno.h>
-#include "SYS.h"
-
-	.import __cerror, code
-
-WARN_REFERENCES(sigsuspend, \
-    "warning: reference to compatibility sigsuspend(); include <signal.h> for correct reference")
-
-ENTRY(sigsuspend, 0)
-	/*
-	 * AFAICT, since the hppa port came after __sigsuspend14, 
-	 * we shouldn't have to supply the compatability sigsuspend.
-	 */
-	ldi	EINVAL, %t1
-	b,n	__cerror
-EXIT(sigsuspend)
diff --git a/lib/libc/compat/arch/i386/Makefile.inc b/lib/libc/compat/arch/i386/Makefile.inc
deleted file mode 100644
index 940d4f194..000000000
--- a/lib/libc/compat/arch/i386/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2015/02/09 22:44:34 pooka Exp $
-
-.include "${COMPATARCHDIR}/gen/Makefile.inc"
-.if ${RUMPRUN} != "yes"
-.include "${COMPATARCHDIR}/sys/Makefile.inc"
-.endif
diff --git a/lib/libc/compat/arch/i386/gen/Makefile.inc b/lib/libc/compat/arch/i386/gen/Makefile.inc
deleted file mode 100644
index 81d6059a5..000000000
--- a/lib/libc/compat/arch/i386/gen/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2006/06/27 18:19:57 drochner Exp $
-
-# objects built from assembler sources (need lint stubs)
-SRCS+=	compat_setjmp.S compat_sigsetjmp.S
-
-# objects built from C sources in compat/gen
-SRCS+=  compat_frexp_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
diff --git a/lib/libc/compat/arch/i386/gen/compat_setjmp.S b/lib/libc/compat/arch/i386/gen/compat_setjmp.S
deleted file mode 100644
index 01c2d6f23..000000000
--- a/lib/libc/compat/arch/i386/gen/compat_setjmp.S
+++ /dev/null
@@ -1,103 +0,0 @@
-/*	$NetBSD: compat_setjmp.S,v 1.3 2014/05/23 02:34:33 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)setjmp.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: compat_setjmp.S,v 1.3 2014/05/23 02:34:33 uebayasi Exp $")
-#endif
-
-/*
- * 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.
- * The previous signal state is restored.
- */
-
-ENTRY(setjmp)
-
-	PIC_PROLOGUE
-	pushl	$0
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(sigblock))
-#else
-	call	_C_LABEL(sigblock)
-#endif
-	addl	$4,%esp
-	PIC_EPILOGUE
-
-	movl	4(%esp),%ecx
-	movl	0(%esp),%edx
-	movl	%edx, 0(%ecx)
-	movl	%ebx, 4(%ecx)
-	movl	%esp, 8(%ecx)
-	movl	%ebp,12(%ecx)
-	movl	%esi,16(%ecx)
-	movl	%edi,20(%ecx)
-	movl	%eax,24(%ecx)
-	xorl	%eax,%eax
-	ret
-END(setjmp)
-
-ENTRY(longjmp)
-	movl	4(%esp),%edx
-
-	PIC_PROLOGUE
-	pushl	24(%edx)
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(sigsetmask))
-#else
-	call	_C_LABEL(sigsetmask)
-#endif
-	addl	$4,%esp
-	PIC_EPILOGUE
-
-	movl	4(%esp),%edx
-	movl	8(%esp),%eax
-	movl	0(%edx),%ecx
-	movl	4(%edx),%ebx
-	movl	8(%edx),%esp
-	movl	12(%edx),%ebp
-	movl	16(%edx),%esi
-	movl	20(%edx),%edi
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movl	%ecx,0(%esp)
-	ret
-END(longjmp)
diff --git a/lib/libc/compat/arch/i386/gen/compat_sigsetjmp.S b/lib/libc/compat/arch/i386/gen/compat_sigsetjmp.S
deleted file mode 100644
index db1b22b71..000000000
--- a/lib/libc/compat/arch/i386/gen/compat_sigsetjmp.S
+++ /dev/null
@@ -1,100 +0,0 @@
-/*	$NetBSD: compat_sigsetjmp.S,v 1.3 2014/05/23 02:34:33 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)setjmp.s	5.1 (Berkeley) 4/23/90"
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: compat_sigsetjmp.S,v 1.3 2014/05/23 02:34:33 uebayasi Exp $")
-#endif
-
-ENTRY(sigsetjmp)
-	movl	4(%esp),%ecx
-	movl	8(%esp),%eax
-	movl	%eax,28(%ecx)
-	testl	%eax,%eax
-	jz	2f
-
-	PIC_PROLOGUE
-	pushl	$0
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(sigblock))
-#else
-	call	_C_LABEL(sigblock)
-#endif
-	addl	$4,%esp
-	PIC_EPILOGUE
-
-	movl	4(%esp),%ecx
-	movl	%eax,24(%ecx)
-2:	movl	0(%esp),%edx
-	movl	%edx, 0(%ecx)
-	movl	%ebx, 4(%ecx)
-	movl	%esp, 8(%ecx)
-	movl	%ebp,12(%ecx)
-	movl	%esi,16(%ecx)
-	movl	%edi,20(%ecx)
-	xorl	%eax,%eax
-	ret
-END(sigsetjmp)
-
-ENTRY(siglongjmp)
-	movl	4(%esp),%edx
-	cmpl	$0,28(%edx)
-	jz	2f
-
-	PIC_PROLOGUE
-	pushl	24(%edx)
-#ifdef __PIC__
-	call	PIC_PLT(_C_LABEL(sigsetmask))
-#else
-	call	_C_LABEL(sigsetmask)
-#endif
-	addl	$4,%esp
-	PIC_EPILOGUE
-
-2:	movl	4(%esp),%edx
-	movl	8(%esp),%eax
-	movl	0(%edx),%ecx
-	movl	4(%edx),%ebx
-	movl	8(%edx),%esp
-	movl	12(%edx),%ebp
-	movl	16(%edx),%esi
-	movl	20(%edx),%edi
-	testl	%eax,%eax
-	jnz	3f
-	incl	%eax
-3:	movl	%ecx,0(%esp)
-	ret
-END(siglongjmp)
diff --git a/lib/libc/compat/arch/i386/sys/Makefile.inc b/lib/libc/compat/arch/i386/sys/Makefile.inc
deleted file mode 100644
index 47154b1b6..000000000
--- a/lib/libc/compat/arch/i386/sys/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2011/03/06 17:08:13 bouyer Exp $
-
-SRCS+=compat_Ovfork.S compat___semctl.S compat___sigreturn14.S \
-    compat___sigtramp1.S compat_msgctl.S compat_shmctl.S compat_sigaction.S \
-    compat_sigpending.S compat_sigprocmask.S compat_sigreturn.S \
-    compat_sigsuspend.S compat_quotactl.S
diff --git a/lib/libc/compat/arch/i386/sys/compat_Ovfork.S b/lib/libc/compat/arch/i386/sys/compat_Ovfork.S
deleted file mode 100644
index 5098c57d3..000000000
--- a/lib/libc/compat/arch/i386/sys/compat_Ovfork.S
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: compat_Ovfork.S,v 1.3 2014/05/23 02:34:33 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)Ovfork.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_Ovfork.S,v 1.3 2014/05/23 02:34:33 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(vfork, \
-    "warning: reference to compatibility vfork(); include <unistd.h> for correct reference")
-
-/*
- * pid = vfork();
- *
- * %edx == 0 in parent process, %edx == 1 in child process.
- * %eax == pid of child in parent, %eax == pid of parent in child.
- *
- */
-ENTRY(vfork)
-	popl	%ecx		/* my rta into ecx */
-	SYSTRAP(vfork)
-	jc	err
-	decl	%edx
-	andl	%edx,%eax
-	jmp	*%ecx
-err:
-	pushl	%ecx
-#ifdef __PIC__
-	PIC_PROLOGUE
-	mov	PIC_GOT(CERROR), %ecx
-	PIC_EPILOGUE
-	jmp	*%ecx
-#else
-	jmp	CERROR
-#endif
-END(vfork)
diff --git a/lib/libc/compat/arch/i386/sys/compat___semctl.S b/lib/libc/compat/arch/i386/sys/compat___semctl.S
deleted file mode 100644
index 80503100d..000000000
--- a/lib/libc/compat/arch/i386/sys/compat___semctl.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-PSEUDO(__semctl,compat_14___semctl)
diff --git a/lib/libc/compat/arch/i386/sys/compat___sigreturn14.S b/lib/libc/compat/arch/i386/sys/compat___sigreturn14.S
deleted file mode 100644
index c0a66a8bc..000000000
--- a/lib/libc/compat/arch/i386/sys/compat___sigreturn14.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: compat___sigreturn14.S,v 1.3 2014/05/23 02:03:41 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat___sigreturn14.S,v 1.3 2014/05/23 02:03:41 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-#ifdef GPROF
-#undef ENTRY
-#undef END
-#ifdef __ELF__
-#define MCOUNT_SYMBOL	__mcount
-#else
-#define MCOUNT_SYMBOL	mcount
-#endif
-#define	ENTRY(x) \
-	.globl _ ## x; _ALIGN_TEXT; _ ## x:  pusha ; \
-	.data; 1:; .long 0; .text; movl $1b,%eax; call MCOUNT_SYMBOL; popa ; nop
-#define	END(x) \
-	.size _ ## x, . - _ ## x
-#endif /* GPROF */
-
-PSEUDO(__sigreturn14,compat_16___sigreturn14)
diff --git a/lib/libc/compat/arch/i386/sys/compat___sigtramp1.S b/lib/libc/compat/arch/i386/sys/compat___sigtramp1.S
deleted file mode 100644
index 8cdbe5940..000000000
--- a/lib/libc/compat/arch/i386/sys/compat___sigtramp1.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: compat___sigtramp1.S,v 1.3 2014/05/23 02:34:33 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-/*
- * The i386 signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, stack looks like:
- *
- *		sigcontext structure			[12]
- *		pointer to sigcontext structure		[8]
- *		signal specific code			[4]
- *	sp->	signal number				[0]
- */
-NENTRY(__sigtramp_sigcontext_1)
-	leal	12(%esp),%eax	/* get pointer to sigcontext */
-	movl	%eax,4(%esp)	/* put it in the argument slot */
-				/* fake return address already there */
-	SYSTRAP(compat_16___sigreturn14) /* do sigreturn */
-	movl	%eax,4(%esp)	/* error code */
-	SYSTRAP(exit)		/* exit */
-END(__sigtramp_sigcontext_1)
diff --git a/lib/libc/compat/arch/i386/sys/compat_msgctl.S b/lib/libc/compat/arch/i386/sys/compat_msgctl.S
deleted file mode 100644
index cc08d76ef..000000000
--- a/lib/libc/compat/arch/i386/sys/compat_msgctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_msgctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(msgctl, \
-    "warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
-
-PSEUDO(msgctl,compat_14_msgctl)
diff --git a/lib/libc/compat/arch/i386/sys/compat_quotactl.S b/lib/libc/compat/arch/i386/sys/compat_quotactl.S
deleted file mode 100644
index 8df4a3de5..000000000
--- a/lib/libc/compat/arch/i386/sys/compat_quotactl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_quotactl.S,v 1.2 2011/03/06 17:08:13 bouyer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(quotactl, \
-    "warning: reference to compatibility quotactl(); include <sys/quota.h> for correct reference")
-
-PSEUDO(quotactl,compat_50_quotactl)
diff --git a/lib/libc/compat/arch/i386/sys/compat_shmctl.S b/lib/libc/compat/arch/i386/sys/compat_shmctl.S
deleted file mode 100644
index 10d43f71d..000000000
--- a/lib/libc/compat/arch/i386/sys/compat_shmctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_shmctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(shmctl, \
-    "warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
-
-PSEUDO(shmctl,compat_14_shmctl)
diff --git a/lib/libc/compat/arch/i386/sys/compat_sigaction.S b/lib/libc/compat/arch/i386/sys/compat_sigaction.S
deleted file mode 100644
index a5f8ad810..000000000
--- a/lib/libc/compat/arch/i386/sys/compat_sigaction.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_sigaction.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigaction, \
-    "warning: reference to compatibility sigaction(); include <signal.h> for correct reference")
-
-PSEUDO(sigaction,compat_13_sigaction13)
diff --git a/lib/libc/compat/arch/i386/sys/compat_sigpending.S b/lib/libc/compat/arch/i386/sys/compat_sigpending.S
deleted file mode 100644
index 0759c52f0..000000000
--- a/lib/libc/compat/arch/i386/sys/compat_sigpending.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: compat_sigpending.S,v 1.2 2014/05/23 02:34:33 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigpending.s	5.1 (Berkeley) 7/1/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_sigpending.S,v 1.2 2014/05/23 02:34:33 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigpending, \
-    "warning: reference to compatibility sigpending(); include <signal.h> for correct reference")
-
-_SYSCALL(sigpending,compat_13_sigpending13)
-	movl	4(%esp),%ecx		# fetch pointer to...
-	movl	%eax,(%ecx)		# store old mask
-	xorl	%eax,%eax
-	ret
-END(sigpending)
diff --git a/lib/libc/compat/arch/i386/sys/compat_sigprocmask.S b/lib/libc/compat/arch/i386/sys/compat_sigprocmask.S
deleted file mode 100644
index d06aa46c0..000000000
--- a/lib/libc/compat/arch/i386/sys/compat_sigprocmask.S
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: compat_sigprocmask.S,v 1.3 2014/05/23 02:34:33 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigprocmask.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_sigprocmask.S,v 1.3 2014/05/23 02:34:33 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigprocmask, \
-    "warning: reference to compatibility sigprocmask(); include <signal.h> for correct reference")
-
-ENTRY(sigprocmask)
-	movl	8(%esp),%ecx		# fetch new sigset pointer
-	testl	%ecx,%ecx		# check new sigset pointer
-	jnz	1f			# if not null, indirect
-/*	movl	$0,8(%esp)		# null mask pointer: block empty set */
-	movl	$1,4(%esp)		# SIG_BLOCK
-	jmp	2f
-1:	movl	(%ecx),%ecx		# fetch indirect  ...
-	movl	%ecx,8(%esp)		# to new mask arg
-2:	SYSTRAP(compat_13_sigprocmask13)
-	jc	err
-	movl	12(%esp),%ecx		# fetch old mask requested
-	testl	%ecx,%ecx		# test if old mask requested
-	jz	out
-	movl	%eax,(%ecx)		# store old mask
-out:
-	xorl	%eax,%eax
-	ret
-err:
-#ifdef __PIC__
-	PIC_PROLOGUE
-	mov	PIC_GOT(CERROR), %ecx
-	PIC_EPILOGUE
-	jmp	*%ecx
-#else
-	jmp	CERROR
-#endif
-END(sigprocmask)
diff --git a/lib/libc/compat/arch/i386/sys/compat_sigreturn.S b/lib/libc/compat/arch/i386/sys/compat_sigreturn.S
deleted file mode 100644
index 3dc2bb9f6..000000000
--- a/lib/libc/compat/arch/i386/sys/compat_sigreturn.S
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: compat_sigreturn.S,v 1.3 2014/05/23 02:03:41 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_sigreturn.S,v 1.3 2014/05/23 02:03:41 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-#ifdef GPROF
-#undef ENTRY
-#undef END
-#ifdef __ELF__
-#define MCOUNT_SYMBOL	__mcount
-#else
-#define MCOUNT_SYMBOL	mcount
-#endif
-#define	ENTRY(x) \
-	.globl _ ## x; _ALIGN_TEXT; _ ## x:  pusha ; \
-	.data; 1:; .long 0; .text; movl $1b,%eax; call MCOUNT_SYMBOL; popa ; nop
-#define	END(x) \
-	.size _ ## x, . - _ ## x
-#endif /* GPROF */
-
-WARN_REFERENCES(sigreturn, \
-    "warning: reference to compatibility sigreturn()")
-
-PSEUDO(sigreturn,compat_13_sigreturn13)
diff --git a/lib/libc/compat/arch/i386/sys/compat_sigsuspend.S b/lib/libc/compat/arch/i386/sys/compat_sigsuspend.S
deleted file mode 100644
index 2bcccd4dd..000000000
--- a/lib/libc/compat/arch/i386/sys/compat_sigsuspend.S
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: compat_sigsuspend.S,v 1.3 2014/05/23 02:34:33 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigsuspend.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_sigsuspend.S,v 1.3 2014/05/23 02:34:33 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigsuspend, \
-    "warning: reference to compatibility sigsuspend(); include <signal.h> for correct reference")
-
-ENTRY(sigsuspend)
-	movl	4(%esp),%eax		# fetch mask arg
-	movl	(%eax),%eax		# indirect to mask arg
-	movl	%eax,4(%esp)
-	SYSTRAP(compat_13_sigsuspend13)
-	jc	err
-	xorl	%eax,%eax		# shouldn t happen
-	ret
-err:
-#ifdef __PIC__
-	PIC_PROLOGUE
-	mov	PIC_GOT(CERROR), %ecx
-	PIC_EPILOGUE
-	jmp	*%ecx
-#else
-	jmp	CERROR
-#endif
-END(sigsuspend)
diff --git a/lib/libc/compat/arch/ia64/Makefile.inc b/lib/libc/compat/arch/ia64/Makefile.inc
deleted file mode 100644
index 81c5297f9..000000000
--- a/lib/libc/compat/arch/ia64/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/09/23 17:38:03 cherry Exp $
-
-.include "${COMPATARCHDIR}/sys/Makefile.inc"
-
diff --git a/lib/libc/compat/arch/ia64/sys/Makefile.inc b/lib/libc/compat/arch/ia64/sys/Makefile.inc
deleted file mode 100644
index 83d9c16d5..000000000
--- a/lib/libc/compat/arch/ia64/sys/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/03/06 17:08:13 bouyer Exp $
-
-SRCS+=	compat___semctl.S compat_quotactl.S
diff --git a/lib/libc/compat/arch/ia64/sys/compat___semctl.S b/lib/libc/compat/arch/ia64/sys/compat___semctl.S
deleted file mode 100644
index 80503100d..000000000
--- a/lib/libc/compat/arch/ia64/sys/compat___semctl.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-PSEUDO(__semctl,compat_14___semctl)
diff --git a/lib/libc/compat/arch/ia64/sys/compat_quotactl.S b/lib/libc/compat/arch/ia64/sys/compat_quotactl.S
deleted file mode 100644
index 8df4a3de5..000000000
--- a/lib/libc/compat/arch/ia64/sys/compat_quotactl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_quotactl.S,v 1.2 2011/03/06 17:08:13 bouyer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(quotactl, \
-    "warning: reference to compatibility quotactl(); include <sys/quota.h> for correct reference")
-
-PSEUDO(quotactl,compat_50_quotactl)
diff --git a/lib/libc/compat/arch/m68k/Makefile.inc b/lib/libc/compat/arch/m68k/Makefile.inc
deleted file mode 100644
index 78ab575bb..000000000
--- a/lib/libc/compat/arch/m68k/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2006/03/11 23:04:03 christos Exp $
-
-.include "${COMPATARCHDIR}/gen/Makefile.inc"
-.include "${COMPATARCHDIR}/sys/Makefile.inc"
diff --git a/lib/libc/compat/arch/m68k/gen/Makefile.inc b/lib/libc/compat/arch/m68k/gen/Makefile.inc
deleted file mode 100644
index 260fd9ce4..000000000
--- a/lib/libc/compat/arch/m68k/gen/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2006/07/03 12:54:34 drochner Exp $
-
-# objects built from assembler sources (need lint stubs)
-SRCS+=	compat_setjmp.S compat_sigsetjmp.S
-
-# objects built from C sources in compat/gen
-SRCS+=	compat_frexp_ieee754.c
-#SRCS+=	compat_ldexp_ieee754.c compat_modf_ieee754.c
diff --git a/lib/libc/compat/arch/m68k/gen/compat_setjmp.S b/lib/libc/compat/arch/m68k/gen/compat_setjmp.S
deleted file mode 100644
index 662228ad5..000000000
--- a/lib/libc/compat/arch/m68k/gen/compat_setjmp.S
+++ /dev/null
@@ -1,97 +0,0 @@
-/*	$NetBSD: compat_setjmp.S,v 1.3 2014/03/04 06:27:00 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)setjmp.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: compat_setjmp.S,v 1.3 2014/03/04 06:27:00 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * 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 a struct sigcontext, see <signal.h>
- */
-
-ENTRY(setjmp)
-	lea	-12(%sp),%sp	/* space for sigstack args/rvals */
-	clrl	(%sp)		/* don't change it... */
-	movl	%sp,4(%sp)	/* ...but return the current val */
-	jbsr	PIC_PLT(_C_LABEL(__sigaltstack14))
-				/* note: flags returned in sp@(8) */
-	clrl	(%sp)		/* don't change mask, just return */
-	jbsr	PIC_PLT(_C_LABEL(sigblock)) /*  old value */
-	movl	8(%sp),%d1	/* old flags value */
-	andl	#1,%d1		/* extract onstack flag */
-	lea	12(%sp),%sp
-	movl	4(%sp),%a0	/* save area pointer */
-	movl	%d1,(%a0)+	/* save old onstack value */
-	movl	%d0,(%a0)+	/* save old signal mask */
-	lea	4(%sp),%a1	/* adjust saved SP since we won't rts */
-	movl	%a1,(%a0)+	/* save old SP */
-	movl	%a6,(%a0)+	/* save old FP */
-	clrl	(%a0)+		/* no AP */
-	movl	(%sp),(%a0)+	/* save old PC */
-	clrl	(%a0)+		/* clean PS */
-	moveml	#0x3CFC,(%a0)	/* save remaining non-scratch regs */
-	clrl	%d0		/* return 0 */
-	rts
-END(setjmp)
-
-ENTRY(longjmp)
-	movl	4(%sp),%a0	/* save area pointer */
-	tstl	8(%a0)		/* ensure non-zero SP */
-	jeq	botch		/* oops! */
-	movl	8(%sp),%d0	/* grab return value */
-	jne	ok		/* non-zero ok */
-	moveq	#1,%d0		/* else make non-zero */
-ok:
-	moveml	28(%a0),#0x3CFC /* restore non-scratch regs */
-	movl	%a0,-(%sp)	/* let sigreturn */
-	trap	#1		/* finish via compat_13_sigreturn13() */
-
-botch:
-	jbsr	PIC_PLT(_C_LABEL(longjmperror))
-	stop	#0
-END(longjmp)
diff --git a/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.S b/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.S
deleted file mode 100644
index d44d3985e..000000000
--- a/lib/libc/compat/arch/m68k/gen/compat_sigsetjmp.S
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: compat_sigsetjmp.S,v 1.3 2014/03/18 18:20:37 riastradh Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)_setjmp.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: compat_sigsetjmp.S,v 1.3 2014/03/18 18:20:37 riastradh Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * C library -- sigsetjmp, siglongjmp
- *
- *	siglongjmp(a,v)
- * will generate a "return(v)" from
- * the last call to
- *	sigsetjmp(a,m)
- * by restoring registers from the stack,
- * The previous signal state is restored if 'm' was non-zero.
- */
-
-/* grab _JBLEN */
-#include <m68k/setjmp.h>
-
-ENTRY(sigsetjmp)
-	movl	8(%sp),%d1	/* grab the mask */
-	movl	4(%sp),%a0	/* grab the area pointer */
-	movl	%d1,(_JBLEN * 4)(%a0)	/* save at end of area */
-	tstl	%d1
-	bne	dosig
-	jra	PIC_PLT(_C_LABEL(_setjmp))
-dosig:
-	jra	PIC_PLT(_C_LABEL(setjmp))
-END(sigsetjmp)
-
-
-ENTRY(siglongjmp)
-	movl	4(%sp),%a0	/* save area pointer */
-	tstl	(_JBLEN * 4)(%a0) /* check mask... */
-	bne	didsig
-	jra	PIC_PLT(_C_LABEL(_longjmp))
-didsig:
-	jra	PIC_PLT(_C_LABEL(longjmp))
-END(siglongjmp)
diff --git a/lib/libc/compat/arch/m68k/sys/Makefile.inc b/lib/libc/compat/arch/m68k/sys/Makefile.inc
deleted file mode 100644
index 47154b1b6..000000000
--- a/lib/libc/compat/arch/m68k/sys/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2011/03/06 17:08:13 bouyer Exp $
-
-SRCS+=compat_Ovfork.S compat___semctl.S compat___sigreturn14.S \
-    compat___sigtramp1.S compat_msgctl.S compat_shmctl.S compat_sigaction.S \
-    compat_sigpending.S compat_sigprocmask.S compat_sigreturn.S \
-    compat_sigsuspend.S compat_quotactl.S
diff --git a/lib/libc/compat/arch/m68k/sys/compat_Ovfork.S b/lib/libc/compat/arch/m68k/sys/compat_Ovfork.S
deleted file mode 100644
index 39c209e73..000000000
--- a/lib/libc/compat/arch/m68k/sys/compat_Ovfork.S
+++ /dev/null
@@ -1,97 +0,0 @@
-/*	$NetBSD: compat_Ovfork.S,v 1.3 2013/09/12 15:36:16 joerg Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)Ovfork.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: compat_Ovfork.S,v 1.3 2013/09/12 15:36:16 joerg Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * @(#)vfork.s	4.1 (Berkeley) 12/21/80
- * C library -- vfork
- */
-
-WARN_REFERENCES(vfork, \
-    "warning: reference to compatibility vfork(); include <unistd.h> for correct reference")
-
-/*
- * pid = vfork();
- *
- * d1 == 0 in parent process, d1 == 1 in child process.
- * d0 == pid of child in parent, d0 == pid of parent in child.
- *
- * trickery here, due to keith sklower, uses ret to clear the stack,
- * and then returns with a jump indirect, since only one person can return
- * with a ret off this stack... we do the ret before we vfork!
- */
-
-ENTRY(vfork)
-	movl	(%sp)+,%a1
-	SYSTRAP(vfork)
-	jcs	err
-	subql	#1,%d1	/* from 1 to 0 in child, 0 to -1 in parent */
-	andl	%d1,%d0
-	jmp	(%a1)
-err:
-#ifdef	_REENTRANT
-	.globl	_C_LABEL(__errno)
-	movl	%a1,-(%sp)
-	movl	%d0,-(%sp)
-	jbsr	PIC_PLT(_C_LABEL(__errno))
-#ifdef	__SVR4_ABI__
-	movl	(%sp)+,(%a0)
-#else
-	movl	%d0,%a1
-	movl	(%sp)+,(%a1)
-#endif	/* __SVR4_ABI__ */
-	movl	(%sp)+,%a1
-#else
-	.globl	_C_LABEL(errno)
-#ifdef __PIC__
-	GOT_SETUP(%a0)
-	movl	_C_LABEL(errno)@GOT:w(%a0),%a0
-	movl	%d0,(%a0)
-#else
-	movl	%d0,_C_LABEL(errno)
-#endif	/* __PIC__ */
-#endif	/* _REENTRANT */
-	moveq	#-1,%d0
-	jmp	(%a1)
-END(vfork)
diff --git a/lib/libc/compat/arch/m68k/sys/compat___semctl.S b/lib/libc/compat/arch/m68k/sys/compat___semctl.S
deleted file mode 100644
index 80503100d..000000000
--- a/lib/libc/compat/arch/m68k/sys/compat___semctl.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-PSEUDO(__semctl,compat_14___semctl)
diff --git a/lib/libc/compat/arch/m68k/sys/compat___sigreturn14.S b/lib/libc/compat/arch/m68k/sys/compat___sigreturn14.S
deleted file mode 100644
index 39c41b9c0..000000000
--- a/lib/libc/compat/arch/m68k/sys/compat___sigreturn14.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: compat___sigreturn14.S,v 1.2 2013/07/16 23:00:15 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)sigreturn.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: compat___sigreturn14.S,v 1.2 2013/07/16 23:00:15 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-#ifdef GPROF
-#undef _PROF_PROLOG
-#define _PROF_PROLOG \
-	.data; 1: .long 0; \
-	.text; INTERRUPT_SAVEREG; LEA_LCL(1b,%a0); jbsr MCOUNT_ENTRY; \
-	INTERRUPT_RESTOREREG
-#endif
-
-ENTRY(__sigreturn14)
-	trap	#3		/* special sigreturn syscall entry point */
-	jbra	CERROR
-END(__sigreturn14)
diff --git a/lib/libc/compat/arch/m68k/sys/compat___sigtramp1.S b/lib/libc/compat/arch/m68k/sys/compat___sigtramp1.S
deleted file mode 100644
index 09116a0b0..000000000
--- a/lib/libc/compat/arch/m68k/sys/compat___sigtramp1.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: compat___sigtramp1.S,v 1.3 2013/07/16 23:00:15 matt Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-/*
- * The m68k signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, stack looks like:
- *
- *		sigcontext structure			[12]
- *		pointer to sigcontext structure		[8]
- *		signal specific code			[4]
- *	sp->	signal number				[0]
- */
-ENTRY_NOPROFILE(__sigtramp_sigcontext_1)
-	leal	12(%sp),%a0	/* get pointer to sigcontext */
-	movl	%a0,4(%sp)	/* put it in the argument slot */
-				/* fake return address already there */
-	trap	#3		/* special sigreturn trap */
-	movl	%d0,4(%sp)	/* failed, exit with errno */
-	SYSTRAP(exit)
-END(__sigtramp_sigcontext_1)
diff --git a/lib/libc/compat/arch/m68k/sys/compat_msgctl.S b/lib/libc/compat/arch/m68k/sys/compat_msgctl.S
deleted file mode 100644
index cc08d76ef..000000000
--- a/lib/libc/compat/arch/m68k/sys/compat_msgctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_msgctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(msgctl, \
-    "warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
-
-PSEUDO(msgctl,compat_14_msgctl)
diff --git a/lib/libc/compat/arch/m68k/sys/compat_quotactl.S b/lib/libc/compat/arch/m68k/sys/compat_quotactl.S
deleted file mode 100644
index 8df4a3de5..000000000
--- a/lib/libc/compat/arch/m68k/sys/compat_quotactl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_quotactl.S,v 1.2 2011/03/06 17:08:13 bouyer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(quotactl, \
-    "warning: reference to compatibility quotactl(); include <sys/quota.h> for correct reference")
-
-PSEUDO(quotactl,compat_50_quotactl)
diff --git a/lib/libc/compat/arch/m68k/sys/compat_shmctl.S b/lib/libc/compat/arch/m68k/sys/compat_shmctl.S
deleted file mode 100644
index 10d43f71d..000000000
--- a/lib/libc/compat/arch/m68k/sys/compat_shmctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_shmctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(shmctl, \
-    "warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
-
-PSEUDO(shmctl,compat_14_shmctl)
diff --git a/lib/libc/compat/arch/m68k/sys/compat_sigaction.S b/lib/libc/compat/arch/m68k/sys/compat_sigaction.S
deleted file mode 100644
index a5f8ad810..000000000
--- a/lib/libc/compat/arch/m68k/sys/compat_sigaction.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_sigaction.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigaction, \
-    "warning: reference to compatibility sigaction(); include <signal.h> for correct reference")
-
-PSEUDO(sigaction,compat_13_sigaction13)
diff --git a/lib/libc/compat/arch/m68k/sys/compat_sigpending.S b/lib/libc/compat/arch/m68k/sys/compat_sigpending.S
deleted file mode 100644
index 4118a2d76..000000000
--- a/lib/libc/compat/arch/m68k/sys/compat_sigpending.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: compat_sigpending.S,v 1.2 2013/07/16 23:00:15 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)sigpending.s	5.2 (Berkeley) 8/6/90")
-#else
-	RCSID("$NetBSD: compat_sigpending.S,v 1.2 2013/07/16 23:00:15 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-WARN_REFERENCES(sigpending, \
-    "warning: reference to compatibility sigpending(); include <signal.h> for correct reference")
-
-_SYSCALL(sigpending,compat_13_sigpending13)
-	movl	4(%sp),%a0
-	movl	%d0,(%a0)
-	clrl	%d0
-	rts
-END(sigpending)
diff --git a/lib/libc/compat/arch/m68k/sys/compat_sigprocmask.S b/lib/libc/compat/arch/m68k/sys/compat_sigprocmask.S
deleted file mode 100644
index d24f02083..000000000
--- a/lib/libc/compat/arch/m68k/sys/compat_sigprocmask.S
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: compat_sigprocmask.S,v 1.4 2013/07/25 22:08:15 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)sigprocmask.s	5.2 (Berkeley) 6/6/90")
-#else
-	RCSID("$NetBSD: compat_sigprocmask.S,v 1.4 2013/07/25 22:08:15 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-WARN_REFERENCES(sigprocmask, \
-    "warning: reference to compatibility sigprocmask(); include <signal.h> for correct reference")
-
-ENTRY(sigprocmask)
-	tstl	8(%sp)			/* check new sigset pointer */
-	jne	gotptr			/* if not null, indirect */
-/*	movl	#0,8(%sp)		/* null mask pointer: block empty set */
-	movql	#1,%d0			/* SIG_BLOCK */
-	movl	%d0,4(%sp)
-	jra	doit
-gotptr:
-	movl	8(%sp),%a0
-	movl	(%a0),8(%sp)		/* indirect to new mask arg */
-doit:
-	SYSTRAP(compat_13_sigprocmask13)
-	jcs	CERROR
-	tstl	12(%sp)		/* test if old mask requested */
-	jeq	out
-	movl	12(%sp),%a0
-	movl	%d0,(%a0)		/* store old mask */
-out:
-	clrl	%d0
-	rts
-END(sigprocmask)
diff --git a/lib/libc/compat/arch/m68k/sys/compat_sigreturn.S b/lib/libc/compat/arch/m68k/sys/compat_sigreturn.S
deleted file mode 100644
index 0af92c58b..000000000
--- a/lib/libc/compat/arch/m68k/sys/compat_sigreturn.S
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: compat_sigreturn.S,v 1.2 2013/07/16 23:00:15 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)sigreturn.s	5.1 (Berkeley) 5/12/90")
-#else
-	RCSID("$NetBSD: compat_sigreturn.S,v 1.2 2013/07/16 23:00:15 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-#ifdef GPROF
-#undef _PROF_PROLOG
-#define _PROF_PROLOG \
-	.data; 1: .long 0; \
-	.text; INTERRUPT_SAVEREG; LEA_LCL(1b,%a0); jbsr MCOUNT_ENTRY; \
-	INTERRUPT_RESTOREREG
-#endif /* GPROF */
-
-WARN_REFERENCES(sigreturn, \
-    "warning: reference to compatibility sigreturn()")
-
-/*
- * NOTE: Trap #1 is used for compat_13_sigreturn13 on the m68k!
- */
-ENTRY(sigreturn)
-	trap	#1		/* signals compat_13_sigreturn13() */
-	jbra	CERROR
-END(sigreturn)
diff --git a/lib/libc/compat/arch/m68k/sys/compat_sigsuspend.S b/lib/libc/compat/arch/m68k/sys/compat_sigsuspend.S
deleted file mode 100644
index 64497235d..000000000
--- a/lib/libc/compat/arch/m68k/sys/compat_sigsuspend.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: compat_sigsuspend.S,v 1.3 2013/07/25 22:08:15 matt Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)sigsuspend.s	5.2 (Berkeley) 6/6/90")
-#else
-	RCSID("$NetBSD: compat_sigsuspend.S,v 1.3 2013/07/25 22:08:15 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-WARN_REFERENCES(sigsuspend, \
-    "warning: reference to compatibility sigsuspend(); include <signal.h> for correct reference")
-
-ENTRY(sigsuspend)
-	movl	4(%sp),%a0
-	movl	(%a0),4(%sp)		/* indirect to mask arg */
-	SYSTRAP(compat_13_sigsuspend13)
-	jcs	CERROR
-	clrl	%d0			/* shouldn't happen */
-	rts
-END(sigsuspend)
diff --git a/lib/libc/compat/arch/mips/Makefile.inc b/lib/libc/compat/arch/mips/Makefile.inc
deleted file mode 100644
index 78ab575bb..000000000
--- a/lib/libc/compat/arch/mips/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2006/03/11 23:04:03 christos Exp $
-
-.include "${COMPATARCHDIR}/gen/Makefile.inc"
-.include "${COMPATARCHDIR}/sys/Makefile.inc"
diff --git a/lib/libc/compat/arch/mips/gen/Makefile.inc b/lib/libc/compat/arch/mips/gen/Makefile.inc
deleted file mode 100644
index 3aa7a9002..000000000
--- a/lib/libc/compat/arch/mips/gen/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2006/07/03 12:58:55 drochner Exp $
-
-# objects built from assembler sources (need lint stubs)
-SRCS+=	compat_setjmp.S compat_sigsetjmp.S
-
-# objects built from C sources in compat/gen
-SRCS+=	compat_frexp_ieee754.c
-#SRCS+=	compat_ldexp_ieee754.c compat_modf_ieee754.c
diff --git a/lib/libc/compat/arch/mips/gen/compat_setjmp.S b/lib/libc/compat/arch/mips/gen/compat_setjmp.S
deleted file mode 100644
index a3028f787..000000000
--- a/lib/libc/compat/arch/mips/gen/compat_setjmp.S
+++ /dev/null
@@ -1,162 +0,0 @@
-/*	$NetBSD: compat_setjmp.S,v 1.2 2009/12/14 03:04:33 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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/syscall.h>
-#include <mips/asm.h>
-
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)setjmp.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: compat_setjmp.S,v 1.2 2009/12/14 03:04:33 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * 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 a struct sigcontext, see <signal.h>
- */
-
-#define SETJMP_FRAME_SIZE	(CALLFRAME_SIZ + STACK_T_SIZE)
-
-NON_LEAF(setjmp, SETJMP_FRAME_SIZE, ra)
-	.mask	0x80010000, (CALLFRAME_RA - CALLFRAME_SIZ)
-	SETUP_GP
-	PTR_SUBU	sp, sp, SETJMP_FRAME_SIZE	# allocate stack frame
-	SAVE_GP(CALLFRAME_GP)
-	SETUP_GP64(CALLFRAME_GP, setjmp)
-
-	REG_S		ra, CALLFRAME_RA(sp)		# save RA
-	REG_S		s0, CALLFRAME_S0(sp)		# save S0
-	move		s0, a0				# save sigcontext
-
-	/* Get the signal mask. */
-	move		a0, zero			# get current sigmask
-	jal		_C_LABEL(sigblock)
-	nop
-	INT_S		v0, _OFFSETOF_SC_MASK13(s0)	# save sc_mask13
-
-	/* Get the signal stack. */
-	move		a0, zero
-	PTR_ADDU	a1, sp, CALLFRAME_SIZ		# pointer to stack_t
-	jal		_C_LABEL(__sigaltstack14)
-
-	move		a0, s0				# restore jmpbuf
-	INT_L		v1, CALLFRAME_SIZ+_OFFSETOF_STACK_T_FLAGS(sp)
-							# get old ss_onstack
-	and		v1, v1, SS_ONSTACK		# extract onstack flag
-	INT_S		v1, _OFFSETOF_SC_ONSTACK(a0)	# save it in sc_onstack
-
-	REG_L		s0, CALLFRAME_S0(sp)		# restore S0
-	REG_L		ra, CALLFRAME_RA(sp)		# restore RA
-	blt		v0, zero, botch		# check for sigaltstack() error
-	nop
-	/*
-	 * We know we won't need this routine's GP anymore.
-	 */
-	RESTORE_GP64
-	PTR_ADDU	sp, sp, SETJMP_FRAME_SIZE	# pop stack frame
-
-	REG_PROLOGUE
-	REG_S	ra, _OFFSETOF_SC_PC(a0)		# sc_pc = return address
-	REG_LI	v0, 0xACEDBADE			# sigcontext magic number
-	REG_S	v0, _OFFSETOF_SC_REGS(a0)	#   saved in sc_regs[0]
-	REG_S	s0, _OFFSETOF_SC_REGS_S0(a0)
-	REG_S	s1, _OFFSETOF_SC_REGS_S1(a0)
-	REG_S	s2, _OFFSETOF_SC_REGS_S2(a0)
-	REG_S	s3, _OFFSETOF_SC_REGS_S3(a0)
-	REG_S	s4, _OFFSETOF_SC_REGS_S4(a0)
-	REG_S	s5, _OFFSETOF_SC_REGS_S5(a0)
-	REG_S	s6, _OFFSETOF_SC_REGS_S6(a0)
-	REG_S	s7, _OFFSETOF_SC_REGS_S7(a0)
-	REG_S	gp, _OFFSETOF_SC_REGS_GP(a0)
-	REG_S	sp, _OFFSETOF_SC_REGS_SP(a0)
-	REG_S	s8, _OFFSETOF_SC_REGS_S8(a0)
-	li	v0, 1				# be nice if we could tell
-	INT_S	v0, _OFFSETOF_SC_FPUSED(a0)	# sc_fpused = 1
-	cfc1	v0, $31
-	INT_S	v0, _OFFSETOF_SC_FPREGS_FCSR(a0)
-#if defined(__mips_o32) || defined(__mips_o64) || defined(__mips_n32)
-	FP_S	$f20, _OFFSETOF_SC_FPREGS_F20(a0)
-	FP_S	$f22, _OFFSETOF_SC_FPREGS_F22(a0)
-#endif
-#if defined(__mips_o32) || defined(__mips_o64)
-	FP_S	$f21, _OFFSETOF_SC_FPREGS_F21(a0)
-	FP_S	$f23, _OFFSETOF_SC_FPREGS_F23(a0)
-#endif
-#if defined(__mips_n32) || defined(__mips_n64)
-	FP_S	$f24, _OFFSETOF_SC_FPREGS_F24(a0)
-	FP_S	$f26, _OFFSETOF_SC_FPREGS_F26(a0)
-	FP_S	$f28, _OFFSETOF_SC_FPREGS_F28(a0)
-	FP_S	$f30, _OFFSETOF_SC_FPREGS_F30(a0)
-#endif
-#if defined(__mips_n64)
-	FP_S	$f25, _OFFSETOF_SC_FPREGS_F25(a0)
-	FP_S	$f27, _OFFSETOF_SC_FPREGS_F27(a0)
-	FP_S	$f29, _OFFSETOF_SC_FPREGS_F29(a0)
-	FP_S	$f31, _OFFSETOF_SC_FPREGS_F31(a0)
-#endif
-	REG_EPILOGUE
-	j	ra
-	move	v0, zero
-
-botch:
-	jal	_C_LABEL(abort)
-END(setjmp)
-
-LEAF(longjmp)
-	SETUP_GP
-	PTR_SUBU	sp, sp, CALLFRAME_SIZ
-	SAVE_GP(CALLFRAME_S0)
-	SETUP_GP64(s0, longjmp)
-
-	REG_PROLOGUE
-	/* save return value in sc_regs[_R_V0] */
-	REG_S		a1, _OFFSETOF_SC_REGS_V0(a0)
-	REG_EPILOGUE
-
-	li		v0, SYS_compat_13_sigreturn13
-	syscall
-
-	jal		_C_LABEL(longjmperror)
-	jal		_C_LABEL(abort)
-END(longjmp)
diff --git a/lib/libc/compat/arch/mips/gen/compat_sigsetjmp.S b/lib/libc/compat/arch/mips/gen/compat_sigsetjmp.S
deleted file mode 100644
index e7c8b968c..000000000
--- a/lib/libc/compat/arch/mips/gen/compat_sigsetjmp.S
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: compat_sigsetjmp.S,v 1.2 2009/12/14 03:04:33 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993, 1995,
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Havard Eidnes.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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/syscall.h>
-#include <mips/asm.h>
-#include <mips/regdef.h>
-
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	ASMSTR("from: @(#)setjmp.s	8.1 (Berkeley) 6/4/93")
-#else
-	ASMSTR("$NetBSD: compat_sigsetjmp.S,v 1.2 2009/12/14 03:04:33 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * C library -- sigsetjmp, siglongjmp
- *
- *	siglongjmp(a,v)
- * will generate a "return(v)" from
- * the last call to
- *	sigsetjmp(a, savemask)
- * by restoring registers from the stack,
- * and dependent on savemask restores the
- * signal mask.
- */
-
-LEAF(sigsetjmp)
-	SETUP_GP
-	SETUP_GP64(t0, sigsetjmp)
-	INT_S	a1, _OFFSETOF_SC_MASK13(a0)	# save "savemask"
-	bne	a1, 0x0, 1f			# do saving of signal mask?
-	PTR_LA	t9, _C_LABEL(_setjmp)
-	jr	t9
-
-1:	PTR_LA	t9, _C_LABEL(setjmp)
-	jr	t9
-END(sigsetjmp)
-
-LEAF(siglongjmp)
-	SETUP_GP
-	SETUP_GP64(t0, siglongjmp)
-	INT_L	t1, _OFFSETOF_SC_MASK13(a0)	# get "savemask"
-	bne	t1, 0x0, 1f			# restore signal mask?
-	PTR_LA	t9, _C_LABEL(_longjmp)
-	jr	t9
-
-1:	PTR_LA	t9, _C_LABEL(longjmp)
-	jr	t9
-END(siglongjmp)
diff --git a/lib/libc/compat/arch/mips/sys/Makefile.inc b/lib/libc/compat/arch/mips/sys/Makefile.inc
deleted file mode 100644
index 07241b413..000000000
--- a/lib/libc/compat/arch/mips/sys/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2011/03/06 17:08:14 bouyer Exp $
-
-SRCS+=compat_Ovfork.S compat___semctl.S compat___sigreturn14.S \
-    compat___sigtramp1.S compat_msgctl.S compat_shmctl.S compat_sigaction.S \
-    compat_sigpending.S compat_sigprocmask.S compat_sigreturn.S \
-    compat_sigsuspend.S compat_quotactl.S
diff --git a/lib/libc/compat/arch/mips/sys/compat_Ovfork.S b/lib/libc/compat/arch/mips/sys/compat_Ovfork.S
deleted file mode 100644
index 758f9ace4..000000000
--- a/lib/libc/compat/arch/mips/sys/compat_Ovfork.S
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: compat_Ovfork.S,v 1.2 2009/12/14 03:04:33 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)Ovfork.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: compat_Ovfork.S,v 1.2 2009/12/14 03:04:33 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-WARN_REFERENCES(vfork, \
-    "warning: reference to compatibility vfork(); include <unistd.h> for correct reference")
-
-/*
- * pid = vfork();
- *
- * v1 == 0 in parent process, v1 == 1 in child process.
- * v0 == pid of child in parent, v0 == pid of parent in child.
- */
-
-LEAF(vfork)
-	PIC_PROLOGUE(vfork)
-
-	SYSTRAP(vfork)			# system call number for vfork
-	beq	a3, zero, 1f		# jump if no errors
-
-	PIC_TAILCALL(__cerror)
-
-1:
-	beq	v1, zero, 2f		# parent process ?
-	move	v0, zero		# return zero in child
-2:
-	PIC_RETURN()
-END(vfork)
diff --git a/lib/libc/compat/arch/mips/sys/compat___semctl.S b/lib/libc/compat/arch/mips/sys/compat___semctl.S
deleted file mode 100644
index 53f21ef57..000000000
--- a/lib/libc/compat/arch/mips/sys/compat___semctl.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*	$NetBSD: compat___semctl.S,v 1.4 2009/12/14 03:04:33 matt Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat___semctl.S,v 1.4 2009/12/14 03:04:33 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-PSEUDO(__semctl,compat_14___semctl)
diff --git a/lib/libc/compat/arch/mips/sys/compat___sigreturn14.S b/lib/libc/compat/arch/mips/sys/compat___sigreturn14.S
deleted file mode 100644
index b2536af10..000000000
--- a/lib/libc/compat/arch/mips/sys/compat___sigreturn14.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: compat___sigreturn14.S,v 1.2 2009/12/14 03:04:33 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)sigreturn.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: compat___sigreturn14.S,v 1.2 2009/12/14 03:04:33 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-
-PSEUDO(__sigreturn14,compat_16___sigreturn14)
diff --git a/lib/libc/compat/arch/mips/sys/compat___sigtramp1.S b/lib/libc/compat/arch/mips/sys/compat___sigtramp1.S
deleted file mode 100644
index 71680d006..000000000
--- a/lib/libc/compat/arch/mips/sys/compat___sigtramp1.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: compat___sigtramp1.S,v 1.4 2009/12/14 03:04:33 matt Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat___sigtramp1.S,v 1.4 2009/12/14 03:04:33 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * The MIPS signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, stack looks like:
- *
- *	sp->	sigcontext structure
- */
-LEAF_NOPROFILE(__sigtramp_sigcontext_1)
-	move	a0, sp			/* address of sigcontext */
-	SYSTRAP(compat_16___sigreturn14) /* and do sigreturn */
-	move	a0, v0			/* exit with errno */
-	SYSTRAP(exit)			/* if sigreturn fails */
-END(__sigtramp_sigcontext_1)
diff --git a/lib/libc/compat/arch/mips/sys/compat_msgctl.S b/lib/libc/compat/arch/mips/sys/compat_msgctl.S
deleted file mode 100644
index 5457c6c4c..000000000
--- a/lib/libc/compat/arch/mips/sys/compat_msgctl.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: compat_msgctl.S,v 1.3 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_msgctl.S,v 1.3 2009/12/14 01:07:42 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-WARN_REFERENCES(msgctl, \
-    "warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
-
-PSEUDO(msgctl,compat_14_msgctl)
diff --git a/lib/libc/compat/arch/mips/sys/compat_quotactl.S b/lib/libc/compat/arch/mips/sys/compat_quotactl.S
deleted file mode 100644
index 94630b816..000000000
--- a/lib/libc/compat/arch/mips/sys/compat_quotactl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_quotactl.S,v 1.2 2011/03/06 17:08:14 bouyer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(quotactl, \
-    "warning: reference to compatibility quotactl(); include <sys/quota.h> for correct reference")
-
-PSEUDO(quotactl,compat_50_quotactl)
diff --git a/lib/libc/compat/arch/mips/sys/compat_shmctl.S b/lib/libc/compat/arch/mips/sys/compat_shmctl.S
deleted file mode 100644
index 57c842155..000000000
--- a/lib/libc/compat/arch/mips/sys/compat_shmctl.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: compat_shmctl.S,v 1.3 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_shmctl.S,v 1.3 2009/12/14 01:07:42 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-WARN_REFERENCES(shmctl, \
-    "warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
-
-PSEUDO(shmctl,compat_14_shmctl)
diff --git a/lib/libc/compat/arch/mips/sys/compat_sigaction.S b/lib/libc/compat/arch/mips/sys/compat_sigaction.S
deleted file mode 100644
index b2506acd5..000000000
--- a/lib/libc/compat/arch/mips/sys/compat_sigaction.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: compat_sigaction.S,v 1.3 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_sigaction.S,v 1.3 2009/12/14 01:07:42 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-WARN_REFERENCES(sigaction, \
-    "warning: reference to compatibility sigaction(); include <signal.h> for correct reference")
-
-PSEUDO(sigaction,compat_13_sigaction13)
diff --git a/lib/libc/compat/arch/mips/sys/compat_sigpending.S b/lib/libc/compat/arch/mips/sys/compat_sigpending.S
deleted file mode 100644
index 93c99e824..000000000
--- a/lib/libc/compat/arch/mips/sys/compat_sigpending.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: compat_sigpending.S,v 1.2 2009/12/14 03:04:33 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)sigpending.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: compat_sigpending.S,v 1.2 2009/12/14 03:04:33 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-WARN_REFERENCES(sigpending, \
-    "warning: reference to compatibility sigpending(); include <signal.h> for correct reference")
-
-LEAF(sigpending)
-	PIC_PROLOGUE(sigpending)
-
-	SYSTRAP(compat_13_sigpending13)
-	bne	a3, zero, 1f
-	INT_S	v0, _OFFSETOF_SC_ONSTACK(a0)
-	move	v0, zero
-	PIC_RETURN()
-
-1:
-	PIC_TAILCALL(__cerror)
-END(sigpending)
diff --git a/lib/libc/compat/arch/mips/sys/compat_sigprocmask.S b/lib/libc/compat/arch/mips/sys/compat_sigprocmask.S
deleted file mode 100644
index 913a139d1..000000000
--- a/lib/libc/compat/arch/mips/sys/compat_sigprocmask.S
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: compat_sigprocmask.S,v 1.2 2009/12/14 03:04:33 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)sigprocmask.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: compat_sigprocmask.S,v 1.2 2009/12/14 03:04:33 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-WARN_REFERENCES(sigprocmask, \
-    "warning: reference to compatibility sigprocmask(); include <signal.h> for correct reference")
-
-LEAF(sigprocmask)	# sigprocmask(how, new, old) sigset_t *new, *old;
-	PIC_PROLOGUE(sigprocmask)
-	bne	a1, zero, gotptr	# if new sigset pointer not null
-	li	a0, 1			# how = SIG_BLOCK
-	b	doit			# mask = zero
-gotptr:
-	INT_L	a1, 0(a1)		# indirect to new mask arg
-doit:
-	SYSTRAP(compat_13_sigprocmask13)
-
-	bne	a3, zero, err
-	beq	a2, zero, out		# test if old mask requested
-	INT_S	v0, 0(a2)		# store old mask
-out:
-	move	v0, zero
-	PIC_RETURN()
-err:
-	PIC_TAILCALL(__cerror)
-END(sigprocmask)
diff --git a/lib/libc/compat/arch/mips/sys/compat_sigreturn.S b/lib/libc/compat/arch/mips/sys/compat_sigreturn.S
deleted file mode 100644
index ac5df9dfc..000000000
--- a/lib/libc/compat/arch/mips/sys/compat_sigreturn.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: compat_sigreturn.S,v 1.2 2009/12/14 03:04:33 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)sigreturn.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: compat_sigreturn.S,v 1.2 2009/12/14 03:04:33 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-
-WARN_REFERENCES(sigreturn, \
-    "warning: reference to compatibility sigreturn()")
-
-PSEUDO(sigreturn,compat_13_sigreturn13)
diff --git a/lib/libc/compat/arch/mips/sys/compat_sigsuspend.S b/lib/libc/compat/arch/mips/sys/compat_sigsuspend.S
deleted file mode 100644
index 8c7b7c519..000000000
--- a/lib/libc/compat/arch/mips/sys/compat_sigsuspend.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: compat_sigsuspend.S,v 1.2 2009/12/14 03:04:33 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)sigsuspend.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: compat_sigsuspend.S,v 1.2 2009/12/14 03:04:33 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-WARN_REFERENCES(sigsuspend, \
-    "warning: reference to compatibility sigsuspend(); include <signal.h> for correct reference")
-
-LEAF(sigsuspend)
-	PIC_PROLOGUE(sigsuspend)
-
-	INT_L	a0, 0(a0)		# indirect to mask arg
-	SYSTRAP(compat_13_sigsuspend13)
-	bne	a3, zero, 1f
-	move	v0, zero		# should not happen
-	PIC_RETURN()
-1:
-	PIC_TAILCALL(__cerror)
-END(sigsuspend)
diff --git a/lib/libc/compat/arch/or1k/Makefile.inc b/lib/libc/compat/arch/or1k/Makefile.inc
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/libc/compat/arch/powerpc/Makefile.inc b/lib/libc/compat/arch/powerpc/Makefile.inc
deleted file mode 100644
index 2f234ec4d..000000000
--- a/lib/libc/compat/arch/powerpc/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2011/01/15 07:31:13 matt Exp $
-
-.include "${COMPATARCHDIR}/gen/Makefile.inc"
-.include "${COMPATARCHDIR}/sys/Makefile.inc"
-
-CPPFLAGS+=	-I.
diff --git a/lib/libc/compat/arch/powerpc/gen/Makefile.inc b/lib/libc/compat/arch/powerpc/gen/Makefile.inc
deleted file mode 100644
index 0018c2bee..000000000
--- a/lib/libc/compat/arch/powerpc/gen/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2006/06/28 14:46:33 drochner Exp $
-
-# objects built from assembler sources (need lint stubs)
-SRCS+=	compat_setjmp.S compat_sigsetjmp.S
-
-# objects built from C sources in compat/gen
-SRCS+=	compat_frexp_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
diff --git a/lib/libc/compat/arch/powerpc/gen/compat_setjmp.S b/lib/libc/compat/arch/powerpc/gen/compat_setjmp.S
deleted file mode 100644
index 49d928326..000000000
--- a/lib/libc/compat/arch/powerpc/gen/compat_setjmp.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: compat_setjmp.S,v 1.2 2011/01/15 07:31:13 matt Exp $	*/
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: compat_setjmp.S,v 1.2 2011/01/15 07:31:13 matt Exp $")
-#endif
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *	setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is restored.
- */
-
-ENTRY(setjmp)
-	mr	%r6,%r3
-	li	%r3,SIG_BLOCK
-	li	%r4,0
-	_DOSYSCALL(compat_13_sigprocmask13) # assume no error	XXX
-	mflr	%r11
-	mfcr	%r12
-	mr	%r10,%r1
-	mr	%r9,%r2
-	mr	%r8,%r3
-	stmw	%r8,4(%r6)
-	li	%r3,0
-	blr
-END(setjmp)
-
-ENTRY(longjmp)
-	lmw	%r8,4(%r3)
-	mr	%r6,%r4
-	mtlr	%r11
-	mtcr	%r12
-	mr	%r2,%r9
-	mr	%r1,%r10
-	mr	%r4,%r8
-	li	%r3,SIG_SETMASK
-	_DOSYSCALL(compat_13_sigprocmask13) # assume no error	XXX
-	or.	%r3,%r6,%r6
-	bnelr
-	li	%r3,1
-	blr
-END(longjmp)
diff --git a/lib/libc/compat/arch/powerpc/gen/compat_sigsetjmp.S b/lib/libc/compat/arch/powerpc/gen/compat_sigsetjmp.S
deleted file mode 100644
index 9ebe269b2..000000000
--- a/lib/libc/compat/arch/powerpc/gen/compat_sigsetjmp.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*	$NetBSD: compat_sigsetjmp.S,v 1.2 2011/01/15 07:31:13 matt Exp $	*/
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: compat_sigsetjmp.S,v 1.2 2011/01/15 07:31:13 matt Exp $")
-#endif
-
-ENTRY(sigsetjmp)
-	mr	%r6,%r3
-	or.	%r7,%r4,%r4
-	beq	1f
-	li	%r3,SIG_BLOCK
-	li	%r4,0
-	_DOSYSCALL(compat_13_sigprocmask13) # assume no error	XXX
-1:
-	mflr	%r11
-	mfcr	%r12
-	mr	%r10,%r1
-	mr	%r9,%r2
-	mr	%r8,%r3
-	stmw	%r7,0(%r6)
-	li	%r3,0
-	blr
-END(sigsetjmp)
-
-ENTRY(siglongjmp)
-	lmw	%r7,0(%r3)
-	mr	%r6,%r4
-	mtlr	%r11
-	mtcr	%r12
-	mr	%r2,%r9
-	mr	%r1,%r10
-	or.	%r7,%r7,%r7
-	beq	1f
-	mr	%r4,%r8
-	li	%r3,SIG_SETMASK
-	_DOSYSCALL(compat_13_sigprocmask13) # assume no error	XXX
-1:
-	or.	%r3,%r6,%r6
-	bnelr
-	li	%r3,1
-	blr
-END(siglongjmp)
diff --git a/lib/libc/compat/arch/powerpc/sys/Makefile.inc b/lib/libc/compat/arch/powerpc/sys/Makefile.inc
deleted file mode 100644
index 13b76ee08..000000000
--- a/lib/libc/compat/arch/powerpc/sys/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2011/03/06 17:08:14 bouyer Exp $
-
-SRCS+=	compat_Ovfork.S \
-	compat___sigreturn14.S compat___sigtramp1.S \
-	compat_msgctl.S compat___semctl.S compat_shmctl.S \
-	compat_sigaction13.S compat_sigpending13.S compat_sigprocmask13.S \
-	compat_sigreturn13.S compat_sigsuspend13.S compat_quotactl.S
diff --git a/lib/libc/compat/arch/powerpc/sys/compat_Ovfork.S b/lib/libc/compat/arch/powerpc/sys/compat_Ovfork.S
deleted file mode 100644
index 4c39ceba9..000000000
--- a/lib/libc/compat/arch/powerpc/sys/compat_Ovfork.S
+++ /dev/null
@@ -1,23 +0,0 @@
-/*	$NetBSD: compat_Ovfork.S,v 1.2 2011/01/15 07:31:13 matt Exp $	*/
-
-/*
- * pid = vfork();
- *
- * r4 == 0 in parent process, 1 in child process.
- * r3 == pid of child in parent, pid of parent in child.
- */
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: compat_Ovfork.S,v 1.2 2011/01/15 07:31:13 matt Exp $")
-#endif
-
-WARN_REFERENCES(vfork, \
-    "warning: reference to compatibility vfork(); include <unistd.h> for correct reference")
-
-SYSCALL(vfork)
-	addi	%r4,%r4,-1	# from 1 to 0 in child, 0 to -1 in parent
-	and	%r3,%r3,%r4	# return 0 in child, pid in parent
-	blr
-END(vfork)
diff --git a/lib/libc/compat/arch/powerpc/sys/compat___semctl.S b/lib/libc/compat/arch/powerpc/sys/compat___semctl.S
deleted file mode 100644
index 80503100d..000000000
--- a/lib/libc/compat/arch/powerpc/sys/compat___semctl.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-PSEUDO(__semctl,compat_14___semctl)
diff --git a/lib/libc/compat/arch/powerpc/sys/compat___sigreturn14.S b/lib/libc/compat/arch/powerpc/sys/compat___sigreturn14.S
deleted file mode 100644
index b075c3135..000000000
--- a/lib/libc/compat/arch/powerpc/sys/compat___sigreturn14.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: compat___sigreturn14.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
-
-#include "SYS.h"
-
-PSEUDO(__sigreturn14,compat_16___sigreturn14)
diff --git a/lib/libc/compat/arch/powerpc/sys/compat___sigtramp1.S b/lib/libc/compat/arch/powerpc/sys/compat___sigtramp1.S
deleted file mode 100644
index ff6e30ac9..000000000
--- a/lib/libc/compat/arch/powerpc/sys/compat___sigtramp1.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: compat___sigtramp1.S,v 1.3 2011/01/15 07:31:13 matt Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: compat___sigtramp1.S,v 1.3 2011/01/15 07:31:13 matt Exp $")
-#endif
-
-/*
- * On entry, stack and registers look like:
- *
- *	r3	signal number
- *	r4	signal specific code
- *	r5	pointer to sigcontext structure
- *	lr	address of handler
- *
- *	sp->	sigcontext structure
- */
-ENTRY_NOPROFILE(__sigtramp_sigcontext_1)
-	addi	%r1,%r1,-CALLFRAMELEN	/* space for callee */
-	blrl				/* call handler */
-	addi	%r3,%r1,CALLFRAMELEN	/* compute address of sigcontext */
-	_DOSYSCALL(compat_16___sigreturn14)	/* and call sigreturn */
-	_DOSYSCALL(exit)		/* or exit with errno if failed */
-END(__sigtramp_sigcontext_1)
diff --git a/lib/libc/compat/arch/powerpc/sys/compat_msgctl.S b/lib/libc/compat/arch/powerpc/sys/compat_msgctl.S
deleted file mode 100644
index 26ccc3ced..000000000
--- a/lib/libc/compat/arch/powerpc/sys/compat_msgctl.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/*	$NetBSD: compat_msgctl.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
-
-#include "SYS.h"
-
-WARN_REFERENCES(msgctl, \
-    "warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
-
-PSEUDO(msgctl,compat_14_msgctl)
diff --git a/lib/libc/compat/arch/powerpc/sys/compat_quotactl.S b/lib/libc/compat/arch/powerpc/sys/compat_quotactl.S
deleted file mode 100644
index 94630b816..000000000
--- a/lib/libc/compat/arch/powerpc/sys/compat_quotactl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_quotactl.S,v 1.2 2011/03/06 17:08:14 bouyer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(quotactl, \
-    "warning: reference to compatibility quotactl(); include <sys/quota.h> for correct reference")
-
-PSEUDO(quotactl,compat_50_quotactl)
diff --git a/lib/libc/compat/arch/powerpc/sys/compat_shmctl.S b/lib/libc/compat/arch/powerpc/sys/compat_shmctl.S
deleted file mode 100644
index 10d43f71d..000000000
--- a/lib/libc/compat/arch/powerpc/sys/compat_shmctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_shmctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(shmctl, \
-    "warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
-
-PSEUDO(shmctl,compat_14_shmctl)
diff --git a/lib/libc/compat/arch/powerpc/sys/compat_sigaction13.S b/lib/libc/compat/arch/powerpc/sys/compat_sigaction13.S
deleted file mode 100644
index 42c5ed6b4..000000000
--- a/lib/libc/compat/arch/powerpc/sys/compat_sigaction13.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/*	$NetBSD: compat_sigaction13.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigaction, \
-    "warning: reference to compatibility sigaction(); include <signal.h> for correct reference")
-
-PSEUDO(sigaction,compat_13_sigaction13)
diff --git a/lib/libc/compat/arch/powerpc/sys/compat_sigpending13.S b/lib/libc/compat/arch/powerpc/sys/compat_sigpending13.S
deleted file mode 100644
index 27867cc30..000000000
--- a/lib/libc/compat/arch/powerpc/sys/compat_sigpending13.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/*	$NetBSD: compat_sigpending13.S,v 1.3 2011/01/16 02:45:48 matt Exp $	*/
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: compat_sigpending13.S,v 1.3 2011/01/16 02:45:48 matt Exp $")
-#endif
-
-WARN_REFERENCES(sigpending, \
-    "warning: reference to compatibility sigpending(); include <signal.h> for correct reference")
-
-ENTRY(sigpending)
-	mr	%r5,%r3				# save pointer
-	_DOSYSCALL(compat_13_sigpending13) 	# sigpending()
-	bso	1f
-	stw	%r3,0(%r5)			# store return value
-	li	%r3,0				# and return 0
-	blr
-1:
-	b	_C_LABEL(__cerror)
-END(sigpending)
diff --git a/lib/libc/compat/arch/powerpc/sys/compat_sigprocmask13.S b/lib/libc/compat/arch/powerpc/sys/compat_sigprocmask13.S
deleted file mode 100644
index 08ee8bfcc..000000000
--- a/lib/libc/compat/arch/powerpc/sys/compat_sigprocmask13.S
+++ /dev/null
@@ -1,34 +0,0 @@
-/*	$NetBSD: compat_sigprocmask13.S,v 1.2 2011/01/15 07:31:13 matt Exp $	*/
-
-#include "SYS.h"
-#include "assym.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: compat_sigprocmask13.S,v 1.2 2011/01/15 07:31:13 matt Exp $")
-#endif
-
-WARN_REFERENCES(sigprocmask, \
-    "warning: reference to compatibility sigprocmask(); include <signal.h> for correct reference")
-
-/*
- * sigprocmask(int how, sigset_t *set, sigset_t *oset)
- */
-ENTRY(sigprocmask)
-	or.	%r4,%r4,%r4	# set == NULL?
-	li	%r6,SIG_BLOCK
-	beq	1f
-	lwz	%r4,0(%r4)	# if not, replace it in r4 with *set
-	mr	%r6,%r3
-1:
-	mr	%r3,%r6		# ... using sigprocmask(SIG_BLOCK)
-	_DOSYSCALL(compat_13_sigprocmask13)
-	bso	3f
-	or.	%r5,%r5,%r5	# check to see of oset requested
-	beq	2f		# if oset != NULL,
-	stw	%r3,0(%r5)	#    *oset = oldmask
-2:
-	li	%r3,0
-	blr			# in any case, return 0
-3:
-	b	_C_LABEL(__cerror)
-END(sigprocmask)
diff --git a/lib/libc/compat/arch/powerpc/sys/compat_sigreturn13.S b/lib/libc/compat/arch/powerpc/sys/compat_sigreturn13.S
deleted file mode 100644
index 0c5020943..000000000
--- a/lib/libc/compat/arch/powerpc/sys/compat_sigreturn13.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/*	$NetBSD: compat_sigreturn13.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigreturn, \
-    "warning: reference to compatibility sigreturn()")
-
-PSEUDO(sigreturn,compat_13_sigreturn13)
diff --git a/lib/libc/compat/arch/powerpc/sys/compat_sigsuspend13.S b/lib/libc/compat/arch/powerpc/sys/compat_sigsuspend13.S
deleted file mode 100644
index fa0374a01..000000000
--- a/lib/libc/compat/arch/powerpc/sys/compat_sigsuspend13.S
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	$NetBSD: compat_sigsuspend13.S,v 1.2 2011/01/15 07:31:13 matt Exp $	*/
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: compat_sigsuspend13.S,v 1.2 2011/01/15 07:31:13 matt Exp $")
-#endif
-
-WARN_REFERENCES(sigsuspend, \
-    "warning: reference to compatibility sigsuspend(); include <signal.h> for correct reference")
-
-ENTRY(sigsuspend)
-	lwz	%r3,0(%r3)			# indirect to mask arg
-	_DOSYSCALL(compat_13_sigsuspend13)
-	b	_C_LABEL(__cerror)		# always terminates with EINTR
-END(sigsuspend)
diff --git a/lib/libc/compat/arch/powerpc64/Makefile.inc b/lib/libc/compat/arch/powerpc64/Makefile.inc
deleted file mode 100644
index edf1a86ed..000000000
--- a/lib/libc/compat/arch/powerpc64/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/07/01 19:14:49 ross Exp $
-
-.include "${COMPATARCHDIR}/gen/Makefile.inc"
-.include "${COMPATARCHDIR}/sys/Makefile.inc"
diff --git a/lib/libc/compat/arch/powerpc64/gen/Makefile.inc b/lib/libc/compat/arch/powerpc64/gen/Makefile.inc
deleted file mode 100644
index 91d77fbeb..000000000
--- a/lib/libc/compat/arch/powerpc64/gen/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/07/01 19:17:32 ross Exp $
-
-# objects built from assembler sources (need lint stubs)
-SRCS+=	
-
-# objects built from C sources in compat/gen
-SRCS+=
diff --git a/lib/libc/compat/arch/powerpc64/sys/Makefile.inc b/lib/libc/compat/arch/powerpc64/sys/Makefile.inc
deleted file mode 100644
index a814c1bda..000000000
--- a/lib/libc/compat/arch/powerpc64/sys/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2011/03/06 17:08:14 bouyer Exp $
-
-SRCS+=	compat_msgctl.S compat___semctl.S compat_shmctl.S compat_quotactl.S
diff --git a/lib/libc/compat/arch/powerpc64/sys/compat___semctl.S b/lib/libc/compat/arch/powerpc64/sys/compat___semctl.S
deleted file mode 100644
index 80503100d..000000000
--- a/lib/libc/compat/arch/powerpc64/sys/compat___semctl.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-PSEUDO(__semctl,compat_14___semctl)
diff --git a/lib/libc/compat/arch/powerpc64/sys/compat_msgctl.S b/lib/libc/compat/arch/powerpc64/sys/compat_msgctl.S
deleted file mode 100644
index 1e3309aa0..000000000
--- a/lib/libc/compat/arch/powerpc64/sys/compat_msgctl.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/*	$NetBSD: compat_msgctl.S,v 1.1 2006/07/07 06:59:04 ross Exp $	*/
-
-#include "SYS.h"
-
-WARN_REFERENCES(msgctl, \
-    "warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
-
-PSEUDO(msgctl,compat_14_msgctl)
diff --git a/lib/libc/compat/arch/powerpc64/sys/compat_quotactl.S b/lib/libc/compat/arch/powerpc64/sys/compat_quotactl.S
deleted file mode 100644
index 94630b816..000000000
--- a/lib/libc/compat/arch/powerpc64/sys/compat_quotactl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_quotactl.S,v 1.2 2011/03/06 17:08:14 bouyer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(quotactl, \
-    "warning: reference to compatibility quotactl(); include <sys/quota.h> for correct reference")
-
-PSEUDO(quotactl,compat_50_quotactl)
diff --git a/lib/libc/compat/arch/powerpc64/sys/compat_shmctl.S b/lib/libc/compat/arch/powerpc64/sys/compat_shmctl.S
deleted file mode 100644
index 10d43f71d..000000000
--- a/lib/libc/compat/arch/powerpc64/sys/compat_shmctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_shmctl.S,v 1.2 2008/04/28 20:22:58 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(shmctl, \
-    "warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
-
-PSEUDO(shmctl,compat_14_shmctl)
diff --git a/lib/libc/compat/arch/riscv/Makefile.inc b/lib/libc/compat/arch/riscv/Makefile.inc
deleted file mode 100644
index 3cb7a1a1c..000000000
--- a/lib/libc/compat/arch/riscv/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/09/19 17:36:25 matt Exp $
diff --git a/lib/libc/compat/arch/sh3/Makefile.inc b/lib/libc/compat/arch/sh3/Makefile.inc
deleted file mode 100644
index 30de512ae..000000000
--- a/lib/libc/compat/arch/sh3/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2006/03/11 23:04:04 christos Exp $
-
-.include "${COMPATARCHDIR}/gen/Makefile.inc"
-.include "${COMPATARCHDIR}/sys/Makefile.inc"
diff --git a/lib/libc/compat/arch/sh3/gen/Makefile.inc b/lib/libc/compat/arch/sh3/gen/Makefile.inc
deleted file mode 100644
index 4faa8a2b2..000000000
--- a/lib/libc/compat/arch/sh3/gen/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2006/06/28 14:46:33 drochner Exp $
-
-SRCS+=	compat_setjmp.S compat_sigsetjmp.S
-
-# objects built from C sources in compat/gen
-SRCS+=	compat_frexp_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
diff --git a/lib/libc/compat/arch/sh3/gen/compat_setjmp.S b/lib/libc/compat/arch/sh3/gen/compat_setjmp.S
deleted file mode 100644
index ce296fd7c..000000000
--- a/lib/libc/compat/arch/sh3/gen/compat_setjmp.S
+++ /dev/null
@@ -1,125 +0,0 @@
-/*	$NetBSD: compat_setjmp.S,v 1.3 2006/01/05 19:21:37 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)setjmp.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#include <machine/setjmp.h>
-
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: compat_setjmp.S,v 1.3 2006/01/05 19:21:37 uwe Exp $")
-#endif
-
-/*
- * 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.
- * The previous signal state is restored.
- */
-
-ENTRY(setjmp)
-	PIC_PROLOGUE(.L_got_1)
-	sts.l	pr, @-sp
-	mov.l	r4, @-sp
-
-	mov.l	.L_sigblock, r0
-1:	CALL	r0			/* int mask = sigblock(0); */
-	 mov	#0, r4
-
-	mov.l	@sp+, r4
-	lds.l	@sp+, pr
-	PIC_EPILOGUE
-
-	/* identical to _setjmp except that mask is present */
-	add	#((_JB_SIGMASK + 1) * 4), r4
-	mov.l	r0, @-r4		/* current mask returned by sigblock */
-	mov	#1, r0
-	mov.l	r0, @-r4		/* has signal mask */
-	mov.l	r15, @-r4
-	mov.l	r14, @-r4
-	mov.l	r13, @-r4
-	mov.l	r12, @-r4
-	mov.l	r11, @-r4
-	mov.l	r10, @-r4
-	mov.l	r9, @-r4
-	mov.l	r8, @-r4
-	sts.l	pr, @-r4
-	rts
-	 xor	r0, r0
-
-	.align	2
-.L_got_1:	PIC_GOT_DATUM
-.L_sigblock:	CALL_DATUM(_C_LABEL(sigblock), 1b)
-	SET_ENTRY_SIZE(setjmp)
-
-
-ENTRY(longjmp)
-	/* we won't return here, so we don't need to save pr and r12 */
-	PIC_PROLOGUE_NOSAVE(.L_got_2)
-	mov.l	r5, @-sp
-	mov.l	r4, @-sp
-
-	mov.l	.L_sigsetmask, r0
-1:	CALL	r0			/* sigsetmask(saved mask) */
-	 mov.l	@(_JB_SIGMASK * 4, r4), r4
-
-	mov.l	@sp+, r4
-	mov.l	@sp+, r5
-
-	/* identical to _longjmp */
-	lds.l	@r4+, pr
-	mov.l	@r4+, r8
-	mov.l	@r4+, r9
-	mov.l	@r4+, r10
-	mov.l	@r4+, r11
-	mov.l	@r4+, r12
-	mov.l	@r4+, r13
-	mov.l	@r4+, r14
-	mov.l	@r4+, r15
-
-	mov	r5, r0
-	tst	r0, r0	/* make sure return value is non-zero */
-	bf	.L0
-	add	#1, r0
-.L0:
-	rts
-	 nop
-
-	.align	2
-.L_got_2:	PIC_GOT_DATUM
-.L_sigsetmask:	CALL_DATUM(_C_LABEL(sigsetmask), 1b)
-	SET_ENTRY_SIZE(longjmp)
diff --git a/lib/libc/compat/arch/sh3/gen/compat_sigsetjmp.S b/lib/libc/compat/arch/sh3/gen/compat_sigsetjmp.S
deleted file mode 100644
index 5260f7b66..000000000
--- a/lib/libc/compat/arch/sh3/gen/compat_sigsetjmp.S
+++ /dev/null
@@ -1,122 +0,0 @@
-/*	$NetBSD: compat_sigsetjmp.S,v 1.5 2006/01/05 19:21:37 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)setjmp.s	5.1 (Berkeley) 4/23/90"
- */
-
-#include <machine/asm.h>
-#include <machine/setjmp.h>
-
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: compat_sigsetjmp.S,v 1.5 2006/01/05 19:21:37 uwe Exp $")
-#endif
-
-ENTRY(sigsetjmp)
-	tst	r5, r5
-	mov.l	r5, @(_JB_HAS_MASK * 4, r4)
-	bt	2f			/* if (savemask == 0) */
-
-	PIC_PROLOGUE(.L_got_1)
-	sts.l	pr, @-sp
-	mov.l	r4, @-sp
-
-	mov.l	.L_sigblock, r0
-1:	CALL	r0			/* int mask = sigblock(0); */
-	 mov	#0, r4
-
-	mov.l	@sp+, r4
-	lds.l	@sp+, pr
-	PIC_EPILOGUE
-
-	mov.l	r0, @(_JB_SIGMASK * 4, r4)
-
-2:	/* identical to _setjmp sans mask */
-	add	#((_JB_REG_R15 + 1) * 4), r4
-	mov.l	r15, @-r4
-	mov.l	r14, @-r4
-	mov.l	r13, @-r4
-	mov.l	r12, @-r4
-	mov.l	r11, @-r4
-	mov.l	r10, @-r4
-	mov.l	r9, @-r4
-	mov.l	r8, @-r4
-	sts.l	pr, @-r4
-	rts
-	 xor	r0, r0
-
-	.align	2
-.L_got_1:	PIC_GOT_DATUM
-.L_sigblock:	CALL_DATUM(_C_LABEL(sigblock), 1b)
-	SET_ENTRY_SIZE(sigsetjmp)
-
-
-ENTRY(siglongjmp)
-	mov.l	@(_JB_HAS_MASK * 4, r4), r0
-	tst	r0, r0
-	bt	2f			/* if no mask */
-
-	/* we won't return here, so we don't need to save pr and r12 */
-	PIC_PROLOGUE_NOSAVE(.L_got_2)
-	mov.l	r5, @-sp
-	mov.l	r4, @-sp
-
-	mov.l	.L_sigsetmask, r0
-1:	CALL	r0			/* sigsetmask(saved mask) */
-	 mov.l	@(_JB_SIGMASK * 4, r4), r4
-
-	mov.l	@sp+, r4
-	mov.l	@sp+, r5
-
-2:	/* identical to _longjmp */
-	lds.l	@r4+, pr
-	mov.l	@r4+, r8
-	mov.l	@r4+, r9
-	mov.l	@r4+, r10
-	mov.l	@r4+, r11
-	mov.l	@r4+, r12
-	mov.l	@r4+, r13
-	mov.l	@r4+, r14
-	mov.l	@r4+, r15
-
-	mov	r5, r0
-	tst	r0, r0	/* make sure return value is non-zero */
-	bf	.L0
-	add	#1, r0
-.L0:
-	rts
-	 nop
-
-	.align	2
-.L_got_2:	PIC_GOT_DATUM
-.L_sigsetmask:	CALL_DATUM(_C_LABEL(sigsetmask), 1b)
-	SET_ENTRY_SIZE(siglongjmp)
diff --git a/lib/libc/compat/arch/sh3/sys/Makefile.inc b/lib/libc/compat/arch/sh3/sys/Makefile.inc
deleted file mode 100644
index 07241b413..000000000
--- a/lib/libc/compat/arch/sh3/sys/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2011/03/06 17:08:14 bouyer Exp $
-
-SRCS+=compat_Ovfork.S compat___semctl.S compat___sigreturn14.S \
-    compat___sigtramp1.S compat_msgctl.S compat_shmctl.S compat_sigaction.S \
-    compat_sigpending.S compat_sigprocmask.S compat_sigreturn.S \
-    compat_sigsuspend.S compat_quotactl.S
diff --git a/lib/libc/compat/arch/sh3/sys/compat_Ovfork.S b/lib/libc/compat/arch/sh3/sys/compat_Ovfork.S
deleted file mode 100644
index 7ed4d04a8..000000000
--- a/lib/libc/compat/arch/sh3/sys/compat_Ovfork.S
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: compat_Ovfork.S,v 1.2 2006/01/06 04:30:33 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)Ovfork.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_Ovfork.S,v 1.2 2006/01/06 04:30:33 uwe Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(vfork, \
-    "warning: reference to compatibility vfork(); include <unistd.h> for correct reference")
-
-/*
- * pid = vfork();
- *
- * r1 == 0 in parent process, r1 == 1 in child process.
- * r0 == pid of child in parent, r0 == pid of parent in child.
- *
- */
-ENTRY(vfork)
-	mov	#SYS_vfork, r0
-	trapa	#0x80
-	bf	err
-
-	add	#0xff, r1	/* from 1 to 0 in child, 0 to -1 in parent */
-	rts
-	 and	r1, r0		/* 0 in child, child pid in parent */
-
-err:
-	JUMP_CERROR
-
-	SET_ENTRY_SIZE(vfork)
diff --git a/lib/libc/compat/arch/sh3/sys/compat___semctl.S b/lib/libc/compat/arch/sh3/sys/compat___semctl.S
deleted file mode 100644
index c64b6d3bb..000000000
--- a/lib/libc/compat/arch/sh3/sys/compat___semctl.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-PSEUDO(__semctl,compat_14___semctl)
diff --git a/lib/libc/compat/arch/sh3/sys/compat___sigreturn14.S b/lib/libc/compat/arch/sh3/sys/compat___sigreturn14.S
deleted file mode 100644
index b151804e8..000000000
--- a/lib/libc/compat/arch/sh3/sys/compat___sigreturn14.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: compat___sigreturn14.S,v 1.1 2005/09/15 21:39:16 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat___sigreturn14.S,v 1.1 2005/09/15 21:39:16 uwe Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-
-PSEUDO(__sigreturn14,compat_16___sigreturn14)
diff --git a/lib/libc/compat/arch/sh3/sys/compat___sigtramp1.S b/lib/libc/compat/arch/sh3/sys/compat___sigtramp1.S
deleted file mode 100644
index 671b5cc0d..000000000
--- a/lib/libc/compat/arch/sh3/sys/compat___sigtramp1.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: compat___sigtramp1.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-/*
- * The SH signal trampoline is invoked only to return from
- * the signal; the kernel calls the signal handler directly.
- *
- * On entry, stack looks like:
- *
- *	sp->	sigcontext structure
- */
-NENTRY(__sigtramp_sigcontext_1)
-	mov	r15, r4			/* get pointer to sigcontext */
-	SYSTRAP(compat_16___sigreturn14) /* and call sigreturn() */
-	mov	r0, r4			/* exit with errno */
-	SYSTRAP(exit)			/* if sigreturn fails */
diff --git a/lib/libc/compat/arch/sh3/sys/compat_msgctl.S b/lib/libc/compat/arch/sh3/sys/compat_msgctl.S
deleted file mode 100644
index a5598b0b1..000000000
--- a/lib/libc/compat/arch/sh3/sys/compat_msgctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_msgctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(msgctl, \
-    "warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
-
-PSEUDO(msgctl,compat_14_msgctl)
diff --git a/lib/libc/compat/arch/sh3/sys/compat_quotactl.S b/lib/libc/compat/arch/sh3/sys/compat_quotactl.S
deleted file mode 100644
index 94630b816..000000000
--- a/lib/libc/compat/arch/sh3/sys/compat_quotactl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_quotactl.S,v 1.2 2011/03/06 17:08:14 bouyer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(quotactl, \
-    "warning: reference to compatibility quotactl(); include <sys/quota.h> for correct reference")
-
-PSEUDO(quotactl,compat_50_quotactl)
diff --git a/lib/libc/compat/arch/sh3/sys/compat_shmctl.S b/lib/libc/compat/arch/sh3/sys/compat_shmctl.S
deleted file mode 100644
index a9f938c68..000000000
--- a/lib/libc/compat/arch/sh3/sys/compat_shmctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_shmctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(shmctl, \
-    "warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
-
-PSEUDO(shmctl,compat_14_shmctl)
diff --git a/lib/libc/compat/arch/sh3/sys/compat_sigaction.S b/lib/libc/compat/arch/sh3/sys/compat_sigaction.S
deleted file mode 100644
index 7d778432c..000000000
--- a/lib/libc/compat/arch/sh3/sys/compat_sigaction.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_sigaction.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigaction, \
-    "warning: reference to compatibility sigaction(); include <signal.h> for correct reference")
-
-PSEUDO(sigaction,compat_13_sigaction13)
diff --git a/lib/libc/compat/arch/sh3/sys/compat_sigpending.S b/lib/libc/compat/arch/sh3/sys/compat_sigpending.S
deleted file mode 100644
index 39f2e62b6..000000000
--- a/lib/libc/compat/arch/sh3/sys/compat_sigpending.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: compat_sigpending.S,v 1.2 2006/01/06 04:14:35 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigpending.s	5.1 (Berkeley) 7/1/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_sigpending.S,v 1.2 2006/01/06 04:14:35 uwe Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigpending, \
-    "warning: reference to compatibility sigpending(); include <signal.h> for correct reference")
-
-/*
- * int
- * sigpending(sigset_t *set);
- */
-_SYSCALL(sigpending,compat_13_sigpending13)
-	mov.l	r0, @r4 		/* store returned mask */
-	rts
-	 mov	#0, r0
diff --git a/lib/libc/compat/arch/sh3/sys/compat_sigprocmask.S b/lib/libc/compat/arch/sh3/sys/compat_sigprocmask.S
deleted file mode 100644
index f67a41446..000000000
--- a/lib/libc/compat/arch/sh3/sys/compat_sigprocmask.S
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: compat_sigprocmask.S,v 1.3 2006/01/06 04:08:47 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigprocmask.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_sigprocmask.S,v 1.3 2006/01/06 04:08:47 uwe Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigprocmask, \
-    "warning: reference to compatibility sigprocmask(); include <signal.h> for correct reference")
-
-/*
- * int
- * sigprocmask(int how, const sigset_t * restrict set,
- *     sigset_t * restrict oset);
- */
-ENTRY(sigprocmask)
-	tst	r5, r5			/* set == NULL? */
-	bf	1f
-
-	bra	2f			/* r5 (new mask) is already zero */
-	 mov	#1, r4			/* how = SIG_BLOCK */
-
-1:	mov.l	@r5, r5			/* fetch new mask */
-
-2:	mov	#SYS_compat_13_sigprocmask13, r0
-	trapa	#0x80
-	bf	err
-
-	tst	r6, r6			/* oset == NULL? */
-	bt	3f
-	mov.l	r0, @r6			/* store old mask */
-3:	rts
-	 mov	#0, r0
-
-err:
-	JUMP_CERROR
-
-	SET_ENTRY_SIZE(sigprocmask)
diff --git a/lib/libc/compat/arch/sh3/sys/compat_sigreturn.S b/lib/libc/compat/arch/sh3/sys/compat_sigreturn.S
deleted file mode 100644
index 9376a7aa1..000000000
--- a/lib/libc/compat/arch/sh3/sys/compat_sigreturn.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: compat_sigreturn.S,v 1.1 2005/09/15 21:39:16 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_sigreturn.S,v 1.1 2005/09/15 21:39:16 uwe Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-
-WARN_REFERENCES(sigreturn, \
-    "warning: reference to compatibility sigreturn()")
-
-PSEUDO(sigreturn,compat_13_sigreturn13)
diff --git a/lib/libc/compat/arch/sh3/sys/compat_sigsuspend.S b/lib/libc/compat/arch/sh3/sys/compat_sigsuspend.S
deleted file mode 100644
index 3f6fdf225..000000000
--- a/lib/libc/compat/arch/sh3/sys/compat_sigsuspend.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: compat_sigsuspend.S,v 1.3 2006/01/06 04:05:55 uwe Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigsuspend.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_sigsuspend.S,v 1.3 2006/01/06 04:05:55 uwe Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigsuspend, \
-    "warning: reference to compatibility sigsuspend(); include <signal.h> for correct reference")
-
-/*
- * int sigsuspend(const sigset_t *sigmask);
- */
-ENTRY(sigsuspend)
-	mov.l	@r4, r4		/* syscall expects mask as the argument */
-	mov	#SYS_compat_13_sigsuspend13, r0
-	trapa	#0x80
-	bf	err
-	rts			/* shouldn t happen */
-	 mov	#0, r0
-err:
-	JUMP_CERROR
-
-	SET_ENTRY_SIZE(sigsuspend)
diff --git a/lib/libc/compat/arch/sparc/Makefile.inc b/lib/libc/compat/arch/sparc/Makefile.inc
deleted file mode 100644
index fc44d319a..000000000
--- a/lib/libc/compat/arch/sparc/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2006/03/11 23:04:04 christos Exp $
-
-.include "${COMPATARCHDIR}/gen/Makefile.inc"
-.include "${COMPATARCHDIR}/sys/Makefile.inc"
diff --git a/lib/libc/compat/arch/sparc/gen/Makefile.inc b/lib/libc/compat/arch/sparc/gen/Makefile.inc
deleted file mode 100644
index ec25fc1bb..000000000
--- a/lib/libc/compat/arch/sparc/gen/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2006/07/03 13:06:12 drochner Exp $
-
-SRCS+=	compat_setjmp.S compat_sigsetjmp.S
-
-# objects built from C sources in compat/gen
-SRCS+=	compat_frexp_ieee754.c compat_ldexp_ieee754.c
-#SRCS+=	compat_modf_ieee754.c
diff --git a/lib/libc/compat/arch/sparc/gen/compat_setjmp.S b/lib/libc/compat/arch/sparc/gen/compat_setjmp.S
deleted file mode 100644
index dc56cef13..000000000
--- a/lib/libc/compat/arch/sparc/gen/compat_setjmp.S
+++ /dev/null
@@ -1,116 +0,0 @@
-/*	$NetBSD: compat_setjmp.S,v 1.1 2005/10/15 22:11:22 uwe 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.
- * 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.
- *
- * from: Header: setjmp.s,v 1.2 92/06/25 03:18:43 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)setjmp.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: compat_setjmp.S,v 1.1 2005/10/15 22:11:22 uwe Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * 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 a struct sigcontext, see <signal.h>
- */
-
-#include "SYS.h"
-
-ENTRY(setjmp)
-	/*
-	 * We use the caller's `arg dump' area (%sp+0x44; there are 6 ints
-	 * reserved there for us) to avoid having to allocate stack space
-	 * here.
-	 */
-	mov	%o0, %o2	/* build sigcontext in [%o2] */
-	mov	1, %o0		/* SIG_BLOCK */
-	mov	SYS_compat_13_sigprocmask13, %g1
-	clr	%o1		/* sigprocmask(SIG_BLOCK, (sigset_t *)NULL) */
-	t	ST_SYSCALL
-	st	%o0, [%o2 + 4]	/* sc.sc_mask = current mask; */
-	mov	SYS___sigaltstack14, %g1
-	clr	%o0		/* sigaltstack(NULL, &foo) */
-	add	%sp, 0x48, %o1	/* (foo being in arg dump area) */
-	t	ST_SYSCALL
-	ld	[%sp + 0x50], %o0	/* foo.ss_flags */
-	and	%o0, 1, %o1	/* onstack = foo.ss_flags & 1; */
-	st	%o0, [%o2 + 0]	/* sc.sc_onstack = current onstack; */
-	st	%sp, [%o2 + 8]	/* sc.sc_sp = sp (both ours and caller's) */
-	add	%o7, 8, %o0
-	st	%o0, [%o2 + 12]	/* sc.sc_pc = return_pc */
-	add	%o7, 12, %o0
-	st	%o0, [%o2 + 16]	/* sc.sc_npc = return_pc + 4 */
-	st	%g0, [%o2 + 20]	/* sc.sc_psr = (clean psr) */
-	st	%fp, [%o2 + 24]	/* sc.sc_g1 = %fp (misuse, but what the heck) */
-				/* sc.sc_o0 = random(), set in longjmp */
-	retl			/* return 0 */
-	 clr	%o0
-
-/*
- * All we need to do here is force sigreturn to load a new stack pointer,
- * new <pc,npc>, and appropriate %o0 return value from the sigcontext built
- * in setjmp.  The %i and %l registers will be reloaded from the place to
- * which %sp points, due to sigreturn() semantics (sigreturn does not modify
- * the window pointer in the psr, hence it must force all windows to reload).
- */
-ENTRY(longjmp)
-	save	%sp, -96, %sp
-	ld	[%i0 + 8], %o2	/* make sure sc->sc_sp, sc->sc_fp nonzero */
-	ld	[%i0 + 24], %o3
-	orcc	%o2, %o3, %g0
-	bz	Lbotch
-	 tst	%i1		/* if (v == 0) v = 1; */
-	bz,a	1f
-	 mov	1, %i1
-1:
-	st	%i1, [%i0 + 28]	/* sc.sc_o0 = v; */
-	mov	SYS_compat_13_sigreturn13, %g1
-	mov	%i0, %o0
-	t	ST_SYSCALL	/* sigreturn(scp); */
-
-Lbotch:
-	/* oops, caller botched it */
-	call	_C_LABEL(longjmperror)
-	 nop
-	unimp	0
diff --git a/lib/libc/compat/arch/sparc/gen/compat_sigsetjmp.S b/lib/libc/compat/arch/sparc/gen/compat_sigsetjmp.S
deleted file mode 100644
index f6b327aee..000000000
--- a/lib/libc/compat/arch/sparc/gen/compat_sigsetjmp.S
+++ /dev/null
@@ -1,93 +0,0 @@
-/*	$NetBSD: compat_sigsetjmp.S,v 1.3 2013/09/12 15:36:16 joerg Exp $	*/
-/*
- * Copyright (c) 1995 Paul Kranenburg
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Paul Kranenburg.
- * 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 "SYS.h"
-
-#ifdef __PIC__
-
-ENTRY(sigsetjmp)
-	PIC_PROLOGUE(%g1, %g2)		! %g1 = _GLOBAL_OFFSET_TABLE
-	tst	%o1
-	bnz	1f
-	 st	%o1, [%o0 + 56]		! jmpbuf[JBLEN] = savemask
-
-	!! if (savemask == 0) goto _setjmp
-	set	_C_LABEL(_setjmp), %g2
-	ld	[%g1 + %g2], %g1
-	jmp %g1
-	 nop
-
-	!! if (savemask != 0) goto setjmp
-1:	set	_C_LABEL(setjmp), %g2
-	ld	[%g1 + %g2], %g1
-	jmp %g1
-	 nop
-
-
-ENTRY(siglongjmp)
-	PIC_PROLOGUE(%g1, %g2)		! %g1 = _GLOBAL_OFFSET_TABLE
-	ld	[%o0 + 56], %g2		! restoremask = jmpbuf[JBLEN]
-	tst	%g2
-	bnz	1f
-	 nop
-
-	!! if (restoremask == 0) goto _longjmp
-	set	_C_LABEL(_longjmp), %g2
-	ld	[%g1 + %g2], %g1
-	jmp %g1
-	 nop
-
-	!! if (restoremask != 0) goto longjmp
-1:	set	_C_LABEL(longjmp), %g2
-	ld	[%g1 + %g2], %g1
-	jmp %g1
-	 nop
-
-#else /* !__PIC__ */
-
-ENTRY(sigsetjmp)
-	cmp %o1,0
-	be _C_LABEL(_setjmp)
-	st %o1,[%o0+40]		! jmpbuf[JBLEN]
-	nop
-	ba,a _C_LABEL(setjmp)
-	unimp 0
-
-ENTRY(siglongjmp)
-	ld [%o0+40],%g1
-	cmp %g1,0
-	be _C_LABEL(_longjmp)
-	nop
-	ba,a _C_LABEL(longjmp)
-	unimp 0
-
-#endif /* !__PIC__ */
diff --git a/lib/libc/compat/arch/sparc/sys/Makefile.inc b/lib/libc/compat/arch/sparc/sys/Makefile.inc
deleted file mode 100644
index 191a9903a..000000000
--- a/lib/libc/compat/arch/sparc/sys/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2011/03/06 17:08:15 bouyer Exp $
-
-SRCS+=compat_Ovfork.S compat___semctl.S compat___sigreturn14.S \
-    compat___sigtramp1.S compat_msgctl.S compat_shmctl.S compat_sigaction.S \
-    compat_sigpending.S compat_sigprocmask.S compat_sigreturn.S \
-    compat_sigsuspend.S compat_quotactl.S
diff --git a/lib/libc/compat/arch/sparc/sys/compat_Ovfork.S b/lib/libc/compat/arch/sparc/sys/compat_Ovfork.S
deleted file mode 100644
index e56f145d4..000000000
--- a/lib/libc/compat/arch/sparc/sys/compat_Ovfork.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: compat_Ovfork.S,v 1.1 2005/10/15 22:11:22 uwe 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.
- * 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.
- *
- * from: Header: Ovfork.s,v 1.1 91/07/06 13:05:56 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)Ovfork.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: compat_Ovfork.S,v 1.1 2005/10/15 22:11:22 uwe Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-/*
- * pid = vfork();
- *
- * %o1 == 0 in parent process, 1 in child process.
- * %o0 == pid of child in parent, pid of parent in child.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(vfork, \
-    "warning: reference to compatibility vfork(); include <unistd.h> for correct reference")
-
-SYSCALL(vfork)
-	dec	%o1		! from 1 to 0 in child, 0 to -1 in parent
-	retl
-	and	%o0, %o1, %o0	! return 0 in child, pid in parent
diff --git a/lib/libc/compat/arch/sparc/sys/compat___semctl.S b/lib/libc/compat/arch/sparc/sys/compat___semctl.S
deleted file mode 100644
index c64b6d3bb..000000000
--- a/lib/libc/compat/arch/sparc/sys/compat___semctl.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-PSEUDO(__semctl,compat_14___semctl)
diff --git a/lib/libc/compat/arch/sparc/sys/compat___sigreturn14.S b/lib/libc/compat/arch/sparc/sys/compat___sigreturn14.S
deleted file mode 100644
index d6620e763..000000000
--- a/lib/libc/compat/arch/sparc/sys/compat___sigreturn14.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: compat___sigreturn14.S,v 1.1 2005/10/15 22:11:22 uwe 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.
- * 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.
- *
- * from: Header: sigreturn.s,v 1.1 91/07/06 13:06:01 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)sigreturn.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: compat___sigreturn14.S,v 1.1 2005/10/15 22:11:22 uwe Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-ENTRY(__sigreturn14)
-	mov	SYS_compat_16___sigreturn14, %g1
-	t	ST_SYSCALL
-	ERROR()
diff --git a/lib/libc/compat/arch/sparc/sys/compat___sigtramp1.S b/lib/libc/compat/arch/sparc/sys/compat___sigtramp1.S
deleted file mode 100644
index 12385b159..000000000
--- a/lib/libc/compat/arch/sparc/sys/compat___sigtramp1.S
+++ /dev/null
@@ -1,170 +0,0 @@
-/*	$NetBSD: compat___sigtramp1.S,v 1.1 2005/10/15 22:11:22 uwe Exp $	*/
-
-/*
- * Copyright (c) 1996 Paul Kranenburg
- * Copyright (c) 1996
- * 	The President and Fellows of Harvard College. All rights reserved.
- * 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.
- *
- * 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, Lawrence Berkeley Laboratory.
- *	This product includes software developed by Harvard University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Harvard University.
- *	This product includes software developed by Paul Kranenburg.
- * 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.
- */
-
-#include "SYS.h"
-
-#define _LOCORE
-#include <machine/frame.h>
-#include <machine/psl.h>
-#include <machine/signal.h>
-
-/*
- * When this code is run, the stack looks like:
- *	[%sp]		64 bytes to which registers can be dumped
- *	[%sp + 64]	signal number (goes in %o0)
- *	[%sp + 64 + 4]	signal code (goes in %o1)
- *	[%sp + 64 + 8]	placeholder
- *	[%sp + 64 + 12]	argument for %o3, currently unsupported (always 0)
- *	[%sp + 64 + 16]	first word of saved state (sigcontext)
- *	    .
- *	    .
- *	    .
- *	[%sp + NNN]	last word of saved state
- * (followed by previous stack contents or top of signal stack).
- * The address of the function to call is in %g1; the old %g1 and %o0
- * have already been saved in the sigcontext.  We are running in a clean
- * window, all previous windows now being saved to the stack.
- *
- * Note that [%sp + 64 + 8] == %sp + 64 + 16.  The copy at %sp+64+8
- * will eventually be removed, with a hole left in its place, if things
- * work out.
- */
-#define SAVE_STATE \
-	/* \
-	 * XXX  the `save' and `restore' below are unnecessary: should \
-	 *	replace with simple arithmetic on %sp \
-	 * \
-	 * Make room on the stack for 32 %f registers + %fsr.  This comes \
-	 * out to 33*4 or 132 bytes, but this must be aligned to a multiple \
-	 * of 8, or 136 bytes. \
-	 */ \
-	save	%sp, -CCFSZ - 136, %sp; \
-	mov	%g2, %l2;		/* save globals in %l registers */ \
-	mov	%g3, %l3; \
-	mov	%g4, %l4; \
-	mov	%g5, %l5; \
-	mov	%g6, %l6; \
-	mov	%g7, %l7; \
-	/* \
-	 * Saving the fpu registers is expensive, so do it iff the fsr \
-	 * stored in the sigcontext shows that the fpu is enabled. \
-	 */ \
-	ld	[%fp + 64 + 16 + SC_PSR_OFFSET], %l0; \
-	sethi	%hi(PSR_EF), %l1;	/* FPU enable is too high for andcc */ \
-	andcc	%l0, %l1, %l0;		/* %l0 = fpu enable bit */ \
-	be	1f;			/* if not set, skip the saves */ \
-	 rd	%y, %l1;		/* in any case, save %y */ \
-	/* fpu is enabled, oh well */ \
-	st	%fsr, [%sp + CCFSZ + 0]; \
-	std	%f0, [%sp + CCFSZ + 8]; \
-	std	%f2, [%sp + CCFSZ + 16]; \
-	std	%f4, [%sp + CCFSZ + 24]; \
-	std	%f6, [%sp + CCFSZ + 32]; \
-	std	%f8, [%sp + CCFSZ + 40]; \
-	std	%f10, [%sp + CCFSZ + 48]; \
-	std	%f12, [%sp + CCFSZ + 56]; \
-	std	%f14, [%sp + CCFSZ + 64]; \
-	std	%f16, [%sp + CCFSZ + 72]; \
-	std	%f18, [%sp + CCFSZ + 80]; \
-	std	%f20, [%sp + CCFSZ + 88]; \
-	std	%f22, [%sp + CCFSZ + 96]; \
-	std	%f24, [%sp + CCFSZ + 104]; \
-	std	%f26, [%sp + CCFSZ + 112]; \
-	std	%f28, [%sp + CCFSZ + 120]; \
-	std	%f30, [%sp + CCFSZ + 128]; \
-1:
-
-#define RESTORE_STATE \
-	/* \
-	 * Now that the handler has returned, re-establish all the state \
-	 * we just saved above, then do a sigreturn. \
-	 */ \
-	tst	%l0;			/* reload fpu registers? */ \
-	be	1f;			/* if not, skip the loads */ \
-	 wr	%l1, %g0, %y;		/* in any case, restore %y */ \
-	ld	[%sp + CCFSZ + 0], %fsr; \
-	ldd	[%sp + CCFSZ + 8], %f0; \
-	ldd	[%sp + CCFSZ + 16], %f2; \
-	ldd	[%sp + CCFSZ + 24], %f4; \
-	ldd	[%sp + CCFSZ + 32], %f6; \
-	ldd	[%sp + CCFSZ + 40], %f8; \
-	ldd	[%sp + CCFSZ + 48], %f10; \
-	ldd	[%sp + CCFSZ + 56], %f12; \
-	ldd	[%sp + CCFSZ + 64], %f14; \
-	ldd	[%sp + CCFSZ + 72], %f16; \
-	ldd	[%sp + CCFSZ + 80], %f18; \
-	ldd	[%sp + CCFSZ + 88], %f20; \
-	ldd	[%sp + CCFSZ + 96], %f22; \
-	ldd	[%sp + CCFSZ + 104], %f24; \
-	ldd	[%sp + CCFSZ + 112], %f26; \
-	ldd	[%sp + CCFSZ + 120], %f28; \
-	ldd	[%sp + CCFSZ + 128], %f30; \
-1: \
-	mov	%l2, %g2; \
-	mov	%l3, %g3; \
-	mov	%l4, %g4; \
-	mov	%l5, %g5; \
-	mov	%l6, %g6; \
-	mov	%l7, %g7
-
-ENTRY_NOPROFILE(__sigtramp_sigcontext_1)
-	SAVE_STATE
-
-	ldd	[%fp + 64], %o0		/* sig, code */
-	ld	[%fp + 76], %o3		/* arg3 */
-	call	%g1			/* call handler */
-	 add	%fp, 64 + 16, %o2	/* pointer to sigcontext */
-
-	RESTORE_STATE
-
-	/* Get registers back and set syscall # */
-	restore	%g0, SYS_compat_16___sigreturn14, %g1
-	add	%sp, 64 + 16, %o0	/* compute scp */
-	t	ST_SYSCALL		/* call sigreturn */
-	mov	SYS_exit, %g1		/* exit with errno */
-	t	ST_SYSCALL		/* if sigreturn fails */
diff --git a/lib/libc/compat/arch/sparc/sys/compat_msgctl.S b/lib/libc/compat/arch/sparc/sys/compat_msgctl.S
deleted file mode 100644
index a5598b0b1..000000000
--- a/lib/libc/compat/arch/sparc/sys/compat_msgctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_msgctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(msgctl, \
-    "warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
-
-PSEUDO(msgctl,compat_14_msgctl)
diff --git a/lib/libc/compat/arch/sparc/sys/compat_quotactl.S b/lib/libc/compat/arch/sparc/sys/compat_quotactl.S
deleted file mode 100644
index efb80312a..000000000
--- a/lib/libc/compat/arch/sparc/sys/compat_quotactl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_quotactl.S,v 1.2 2011/03/06 17:08:15 bouyer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(quotactl, \
-    "warning: reference to compatibility quotactl(); include <sys/quota.h> for correct reference")
-
-PSEUDO(quotactl,compat_50_quotactl)
diff --git a/lib/libc/compat/arch/sparc/sys/compat_shmctl.S b/lib/libc/compat/arch/sparc/sys/compat_shmctl.S
deleted file mode 100644
index a9f938c68..000000000
--- a/lib/libc/compat/arch/sparc/sys/compat_shmctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_shmctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(shmctl, \
-    "warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
-
-PSEUDO(shmctl,compat_14_shmctl)
diff --git a/lib/libc/compat/arch/sparc/sys/compat_sigaction.S b/lib/libc/compat/arch/sparc/sys/compat_sigaction.S
deleted file mode 100644
index 7d778432c..000000000
--- a/lib/libc/compat/arch/sparc/sys/compat_sigaction.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_sigaction.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigaction, \
-    "warning: reference to compatibility sigaction(); include <signal.h> for correct reference")
-
-PSEUDO(sigaction,compat_13_sigaction13)
diff --git a/lib/libc/compat/arch/sparc/sys/compat_sigpending.S b/lib/libc/compat/arch/sparc/sys/compat_sigpending.S
deleted file mode 100644
index c5891599c..000000000
--- a/lib/libc/compat/arch/sparc/sys/compat_sigpending.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: compat_sigpending.S,v 1.1 2005/10/15 22:11:22 uwe 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.
- * 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.
- *
- * from: Header: sigpending.s,v 1.1 91/07/06 13:06:00 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)sigpending.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: compat_sigpending.S,v 1.1 2005/10/15 22:11:22 uwe Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigpending, \
-    "warning: reference to compatibility sigpending(); include <signal.h> for correct reference")
-
-ENTRY(sigpending)
-	mov	%o0, %o2		! save pointer
-	mov	SYS_compat_13_sigpending13, %g1
-	t	ST_SYSCALL		! sigpending()
-	bcc,a	1f			! if success,
-	 st	%o0, [%o2]		!    store return value
-	ERROR()
-1:
-	retl				! and return 0
-	 clr	%o0
diff --git a/lib/libc/compat/arch/sparc/sys/compat_sigprocmask.S b/lib/libc/compat/arch/sparc/sys/compat_sigprocmask.S
deleted file mode 100644
index d38d7874f..000000000
--- a/lib/libc/compat/arch/sparc/sys/compat_sigprocmask.S
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: compat_sigprocmask.S,v 1.1 2005/10/15 22:11:22 uwe 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.
- * 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.
- *
- * from: Header: sigprocmask.s,v 1.1 91/07/06 13:06:01 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)sigprocmask.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: compat_sigprocmask.S,v 1.1 2005/10/15 22:11:22 uwe Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigprocmask, \
-    "warning: reference to compatibility sigprocmask(); include <signal.h> for correct reference")
-
-/*
- * sigprocmask(int how, sigset_t *set, sigset_t *oset)
- */
-ENTRY(sigprocmask)
-	tst	%o1		! set == NULL?
-	bne,a	1f		! if not,
-	 ld	[%o1], %o1	!    replace it in %o1 with *set
-!	clr	%o1		! else block no signals ...
-	mov	1, %o0		! ... using sigprocmask(SIG_BLOCK)
-1:
-	mov	SYS_compat_13_sigprocmask13, %g1
-	t	ST_SYSCALL
-	bcc	2f		! if success,
-	 tst	%o2		!    check to see if oset requested
-	ERROR()
-2:
-	bne,a	3f		! if oset != NULL,
-	 st	%o0, [%o2]	!    *oset = oldmask
-3:
-	retl			! in any case, return 0
-	 clr	%o0
diff --git a/lib/libc/compat/arch/sparc/sys/compat_sigreturn.S b/lib/libc/compat/arch/sparc/sys/compat_sigreturn.S
deleted file mode 100644
index 041392b0b..000000000
--- a/lib/libc/compat/arch/sparc/sys/compat_sigreturn.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: compat_sigreturn.S,v 1.1 2005/10/15 22:11:22 uwe 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.
- * 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.
- *
- * from: Header: sigreturn.s,v 1.1 91/07/06 13:06:01 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)sigreturn.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: compat_sigreturn.S,v 1.1 2005/10/15 22:11:22 uwe Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigreturn, \
-    "warning: reference to compatibility sigreturn()")
-
-ENTRY(sigreturn)
-	mov	SYS_compat_13_sigreturn13, %g1
-	t	ST_SYSCALL
-	ERROR()
diff --git a/lib/libc/compat/arch/sparc/sys/compat_sigsuspend.S b/lib/libc/compat/arch/sparc/sys/compat_sigsuspend.S
deleted file mode 100644
index a50ff7126..000000000
--- a/lib/libc/compat/arch/sparc/sys/compat_sigsuspend.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: compat_sigsuspend.S,v 1.1 2005/10/15 22:11:22 uwe 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.
- * 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.
- *
- * from: Header: sigsuspend.s,v 1.1 91/07/06 13:06:01 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)sigsuspend.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: compat_sigsuspend.S,v 1.1 2005/10/15 22:11:22 uwe Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigsuspend, \
-    "warning: reference to compatibility sigsuspend(); include <signal.h> for correct reference")
-
-ENTRY(sigsuspend)
-	ld	[%o0], %o0		! indirect to mask argument
-	mov	SYS_compat_13_sigsuspend13, %g1
-	t	ST_SYSCALL
-	ERROR()				! always terminates with EINTR
diff --git a/lib/libc/compat/arch/sparc64/Makefile.inc b/lib/libc/compat/arch/sparc64/Makefile.inc
deleted file mode 100644
index fc44d319a..000000000
--- a/lib/libc/compat/arch/sparc64/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2006/03/11 23:04:04 christos Exp $
-
-.include "${COMPATARCHDIR}/gen/Makefile.inc"
-.include "${COMPATARCHDIR}/sys/Makefile.inc"
diff --git a/lib/libc/compat/arch/sparc64/gen/Makefile.inc b/lib/libc/compat/arch/sparc64/gen/Makefile.inc
deleted file mode 100644
index ec25fc1bb..000000000
--- a/lib/libc/compat/arch/sparc64/gen/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2006/07/03 13:06:12 drochner Exp $
-
-SRCS+=	compat_setjmp.S compat_sigsetjmp.S
-
-# objects built from C sources in compat/gen
-SRCS+=	compat_frexp_ieee754.c compat_ldexp_ieee754.c
-#SRCS+=	compat_modf_ieee754.c
diff --git a/lib/libc/compat/arch/sparc64/gen/compat_setjmp.S b/lib/libc/compat/arch/sparc64/gen/compat_setjmp.S
deleted file mode 100644
index 628a5e08f..000000000
--- a/lib/libc/compat/arch/sparc64/gen/compat_setjmp.S
+++ /dev/null
@@ -1,119 +0,0 @@
-/*	$NetBSD: compat_setjmp.S,v 1.1 2005/10/16 04:41:34 christos 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.
- * 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.
- *
- * from: Header: setjmp.s,v 1.2 92/06/25 03:18:43 torek Exp
- */
-
-#define _LOCORE
-#include <machine/asm.h>
-#include <machine/frame.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)setjmp.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: compat_setjmp.S,v 1.1 2005/10/16 04:41:34 christos Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * 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 a struct sigcontext, see <signal.h>
- */
-
-#include "SYS.h"
-
-#define STACK_T_SZ
-ENTRY(setjmp)
-	/*
-	 * We use the part of the sigcontext structure, the sp, pc, and npc fields,
-	 * for the sigstack call so we don't need to get our own stackframe.  It 
-	 * won't be filled out till later anyway.
-	 */
-	mov	%o0, %o3		/* Save our jmp_buf in %o3 */
-	mov	%o0, %o2		/* build sigcontext in [%o2] */
-	mov	1, %o0			/* SIG_BLOCK */
-	mov	SYS_compat_13_sigprocmask13, %g1
-	clr	%o1			/* sigprocmask(SIG_BLOCK, (sigset_t *)NULL, (sigset_t *)a) */
-	t	ST_SYSCALL
-	
-	st	%o0, [%o3 + 0x04]	/* sc.sc_mask = current mask; */
-	mov	SYS___sigaltstack14, %g1
-	clr	%o0			/* sigstack(NULL, &foo) */
-	add	%o3, 0x38, %o1		/* (foo being the sigcontext14 sc_mask) */
-	t	ST_SYSCALL
-	
-	lduw	[%o3 + 0x38+0x10], %o0	/* foo.ss_flags */
-	and	%o0, 1, %o1		/* onstack = foo.ss_flags & 1; */
-	st	%o0, [%o3 + 0x00]	/* sc.sc_onstack = current onstack; */
-	stx	%sp, [%o3 + 0x08]	/* sc.sc_sp = sp (both ours and caller's) */
-	add	%o7, 8, %o0
-	stx	%o0, [%o3 + 0x10]	/* sc.sc_pc = return_pc */
-	add	%o7, 12, %o0
-	stx	%o0, [%o3 + 0x18]	/* sc.sc_npc = return_pc + 4 */
-	stx	%g0, [%o3 + 0x20]	/* sc.sc_psr = (clean psr) */
-	stx	%fp, [%o3 + 0x28]	/* sc.sc_g1 = %fp (misuse, but what the heck) */
-					/* sc.sc_o0 = random(), set in longjmp */
-	retl				/* return 0 */
-	 clr	%o0
-
-/*
- * All we need to do here is force sigreturn to load a new stack pointer,
- * new <pc,npc>, and appropriate %o0 return value from the sigcontext built
- * in setjmp.  The %i and %l registers will be reloaded from the place to
- * which %sp points, due to sigreturn() semantics (sigreturn does not modify
- * the window pointer in the psr, hence it must force all windows to reload).
- */
-ENTRY(longjmp)
-	save	%sp, -CC64FSZ, %sp
-	ldx	[%i0 + 0x08], %o2	/* make sure sc->sc_sp, sc->sc_fp nonzero */
-	ldx	[%i0 + 0x28], %o3
-	orcc	%o2, %o3, %g0
-	bz,pn	%xcc, Lbotch
-	 movrz	%i1, 1, %i1		/* if (v == 0) v = 1; */
-	st	%i1, [%i0 + 0x30]	/* sc.sc_o0 = v; */
-	mov	SYS_compat_13_sigreturn13, %g1
-	mov	%i0, %o0
-	t	ST_SYSCALL		/* sigreturn(scp); */
-
-Lbotch:
-	/* oops, caller botched it */
-	call	_C_LABEL(longjmperror)
-	 nop
-	unimp	0
diff --git a/lib/libc/compat/arch/sparc64/gen/compat_sigsetjmp.S b/lib/libc/compat/arch/sparc64/gen/compat_sigsetjmp.S
deleted file mode 100644
index 2dde308f5..000000000
--- a/lib/libc/compat/arch/sparc64/gen/compat_sigsetjmp.S
+++ /dev/null
@@ -1,99 +0,0 @@
-/*	$NetBSD: compat_sigsetjmp.S,v 1.2 2013/09/12 15:36:16 joerg Exp $	*/
-/*
- * Copyright (c) 1995 Paul Kranenburg
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Paul Kranenburg.
- * 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 "SYS.h"
-
-#if __PIC__ - 0 >= 2
-
-ENTRY(sigsetjmp)
-	PIC_PROLOGUE(%g1,%o2)		! %g1 = _GLOBAL_OFFSET_TABLE
-	set	_C_LABEL(setjmp), %o2	! if (%o1 != 0) goto _setjmp;
-	set	_C_LABEL(_setjmp), %o3	! else goto __setjmp;
-	movrnz	%o1, %o2, %o3
-	ldx [%g1+%o3], %g1
-	jmp %g1
-	 st	%o1,[%o0+0x48]		! jmpbuf[JBLEN]
-
-
-ENTRY(siglongjmp)
-	PIC_PROLOGUE(%g1,%o2)		! %g1 = _GLOBAL_OFFSET_TABLE
-	ld	[%o0 + 0x48],%o2	! jmpbuf[JBLEN]
-	set	_C_LABEL(longjmp), %o3	! if (%o2 != 0) goto _longjmp;
-	set	_C_LABEL(_longjmp), %o4	! else goto __longjmp;
-	movrnz	%o2, %o3, %o4 
-	ldx	[%g1 + %o4], %g1
-	jmp %g1
-	 nop
-	unimp 0
-
-#elif __PIC__ - 0 >= 1
-
-ENTRY(sigsetjmp)
-	PIC_PROLOGUE(%g1,%o2)		! %g1 = _GLOBAL_OFFSET_TABLE
-	cmp	%o1, 0
-	bne,a	1f
-	 ldx	[%g1 + _C_LABEL(setjmp)], %g1	! if (%o1 != 0) goto _setjmp;
-	ldx	[%g1 + _C_LABEL(_setjmp)], %g1	! else goto __setjmp;
-1:	
-	jmp %g1
-	 st	%o1,[%o0+0x48]		! jmpbuf[JBLEN]
-
-
-ENTRY(siglongjmp)
-	PIC_PROLOGUE(%g1,%o2)		! %g1 = _GLOBAL_OFFSET_TABLE
-	cmp	%o2, 0
-	ld	[%o0 + 0x48],%o2	! jmpbuf[JBLEN]
-	bne,a	1f
-	 ldx	[%g1 + _C_LABEL(longjmp)], %g1	! if (%o2 != 0) goto _longjmp;
-	ldx	[%g1 + _C_LABEL(_longjmp)], %g1	! else goto __longjmp;
-1:	
-	jmp %g1
-	 nop
-	unimp 0
-
-#else /* !__PIC__ */
-
-ENTRY(sigsetjmp)
-	brz,pt	%o1,_C_LABEL(_setjmp)
-	 st	%o1,[%o0+0x48]		! jmpbuf[JBLEN]
-	ba,a,pt	%icc,_C_LABEL(setjmp)
-	 nop				! spitfire bug
-	unimp 0
-
-ENTRY(siglongjmp)
-	ld	[%o0 + 0x48], %g1
-	brz,pt	%g1, _C_LABEL(_longjmp)
-	 nop
-	ba,a,pt	%icc, _C_LABEL(longjmp)
-	unimp 0
-
-#endif /* !__PIC__ */
diff --git a/lib/libc/compat/arch/sparc64/sys/Makefile.inc b/lib/libc/compat/arch/sparc64/sys/Makefile.inc
deleted file mode 100644
index 191a9903a..000000000
--- a/lib/libc/compat/arch/sparc64/sys/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2011/03/06 17:08:15 bouyer Exp $
-
-SRCS+=compat_Ovfork.S compat___semctl.S compat___sigreturn14.S \
-    compat___sigtramp1.S compat_msgctl.S compat_shmctl.S compat_sigaction.S \
-    compat_sigpending.S compat_sigprocmask.S compat_sigreturn.S \
-    compat_sigsuspend.S compat_quotactl.S
diff --git a/lib/libc/compat/arch/sparc64/sys/compat_Ovfork.S b/lib/libc/compat/arch/sparc64/sys/compat_Ovfork.S
deleted file mode 100644
index e11a6aa4e..000000000
--- a/lib/libc/compat/arch/sparc64/sys/compat_Ovfork.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: compat_Ovfork.S,v 1.1 2005/10/16 04:41:34 christos 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.
- * 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.
- *
- * from: Header: Ovfork.s,v 1.1 91/07/06 13:05:56 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)Ovfork.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: compat_Ovfork.S,v 1.1 2005/10/16 04:41:34 christos Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-/*
- * pid = vfork();
- *
- * %o1 == 0 in parent process, 1 in child process.
- * %o0 == pid of child in parent, pid of parent in child.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(vfork, \
-    "warning: reference to compatibility vfork(); include <unistd.h> for correct reference")
-
-SYSCALL(vfork)
-	dec	%o1		/* from 1 to 0 in child, 0 to -1 in parent */
-	retl
-	 and	%o0, %o1, %o0	/* return 0 in child, pid in parent */
diff --git a/lib/libc/compat/arch/sparc64/sys/compat___semctl.S b/lib/libc/compat/arch/sparc64/sys/compat___semctl.S
deleted file mode 100644
index c64b6d3bb..000000000
--- a/lib/libc/compat/arch/sparc64/sys/compat___semctl.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-PSEUDO(__semctl,compat_14___semctl)
diff --git a/lib/libc/compat/arch/sparc64/sys/compat___sigreturn14.S b/lib/libc/compat/arch/sparc64/sys/compat___sigreturn14.S
deleted file mode 100644
index b65b83946..000000000
--- a/lib/libc/compat/arch/sparc64/sys/compat___sigreturn14.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: compat___sigreturn14.S,v 1.1 2005/10/16 04:41:34 christos 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.
- * 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.
- *
- * from: Header: sigreturn.s,v 1.1 91/07/06 13:06:01 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)sigreturn.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: compat___sigreturn14.S,v 1.1 2005/10/16 04:41:34 christos Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-ENTRY(__sigreturn14)
-	mov	SYS_compat_16___sigreturn14, %g1
-	t	ST_SYSCALL
-	ERROR()
diff --git a/lib/libc/compat/arch/sparc64/sys/compat___sigtramp1.S b/lib/libc/compat/arch/sparc64/sys/compat___sigtramp1.S
deleted file mode 100644
index 3fbf49aa1..000000000
--- a/lib/libc/compat/arch/sparc64/sys/compat___sigtramp1.S
+++ /dev/null
@@ -1,172 +0,0 @@
-/*	$NetBSD: compat___sigtramp1.S,v 1.2 2011/07/12 07:51:33 mrg Exp $	*/
-
-/*
- * Copyright (c) 1996-2002 Eduardo Horvath
- * Copyright (c) 1996 Paul Kranenburg
- * Copyright (c) 1996
- * 	The President and Fellows of Harvard College. All rights reserved.
- * 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.
- *
- * 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, Lawrence Berkeley Laboratory.
- *	This product includes software developed by Harvard University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Harvard University.
- *	This product includes software developed by Paul Kranenburg.
- * 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.
- */
-
-#include "SYS.h"
-
-#define _LOCORE
-#include <machine/frame.h>
-#include <machine/fsr.h>
-#include <machine/ctlreg.h>
-#include <machine/psl.h>
-
-	.register	%g2,#ignore
-	.register	%g3,#ignore
-
-#define BLOCK_SIZE SPARC64_BLOCK_SIZE
-#define BLOCK_ALIGN SPARC64_BLOCK_ALIGN
-
-/*
- * When this code is run, the stack looks like:
- *	[%sp]			128 bytes to which registers can be dumped
- *	[%sp + 128]		signal number (goes in %o0)
- *	[%sp + 128 + 4]		signal code (goes in %o1)
- *	[%sp + 128 + 8]		first word of saved state (sigcontext)
- *	    .
- *	    .
- *	    .
- *	[%sp + NNN]	last word of saved state
- * (followed by previous stack contents or top of signal stack).
- * The address of the function to call is in %g1; the old %g1 and %o0
- * have already been saved in the sigcontext.  We are running in a clean
- * window, all previous windows now being saved to the stack.
- *
- * Note that [%sp + 128 + 8] == %sp + 128 + 16.  The copy at %sp+128+8
- * will eventually be removed, with a hole left in its place, if things
- * work out.
- */
-ENTRY_NOPROFILE(__sigtramp_sigcontext_1)
-	/*
-	 * XXX  the `save' and `restore' below are unnecessary: should
-	 *	replace with simple arithmetic on %sp
-	 *
-	 * Make room on the stack for 64 %f registers + %fsr.  This comes
-	 * out to 64*4+8 or 264 bytes, but this must be aligned to a multiple
-	 * of 64, or 320 bytes.
-	 */
-	save	%sp, -CC64FSZ - 320, %sp
-	mov	%g2, %l2		/* save globals in %l registers */
-	mov	%g3, %l3
-	mov	%g4, %l4
-	mov	%g5, %l5
-	mov	%g6, %l6
-	mov	%g7, %l7
-	/*
-	 * Saving the fpu registers is expensive, so do it iff it is
-	 * enabled and dirty.
-	 */
-	rd	%fprs, %l0
-	btst	FPRS_DL|FPRS_DU, %l0	/* All clean? */
-	bz,pt	%icc, 2f
-	 btst	FPRS_DL, %l0		/* test dl */
-	bz,pt	%icc, 1f
-	 btst	FPRS_DU, %l0		/* test du */
-
-	/* fpu is enabled, oh well */
-	stx	%fsr, [%sp + CC64FSZ + BIAS + 0]
-	add	%sp, BIAS+CC64FSZ+BLOCK_SIZE, %l0 /* Generate a pointer so */
-	andn	%l0, BLOCK_ALIGN, %l0		  /* we can do a block store */
-	stda	%f0, [%l0] ASI_BLK_P
-	inc	BLOCK_SIZE, %l0
-	stda	%f16, [%l0] ASI_BLK_P
-1:
-	bz,pt	%icc, 2f
-	 add	%sp, BIAS+CC64FSZ+BLOCK_SIZE, %l0 /* Generate a pointer so */
-	andn	%l0, BLOCK_ALIGN, %l0		  /* we can do a block store */
-	add	%l0, 2*BLOCK_SIZE, %l0	/* and skip what we already stored */
-	stda	%f32, [%l0] ASI_BLK_P
-	inc	BLOCK_SIZE, %l0
-	stda	%f48, [%l0] ASI_BLK_P
-2:
-	membar	#Sync
-	rd	%y, %l1				/* in any case, save %y */
-	lduw	[%fp + BIAS + 128], %o0		/* sig */
-	lduw	[%fp + BIAS + 128 + 4], %o1	/* code */
-	call	%g1				/* call handler */
-	 add	%fp, BIAS + 128 + 8, %o2	/* scp */
-
-	/*
-	 * Now that the handler has returned, re-establish all the state
-	 * we just saved above, then do a sigreturn.
-	 */
-	btst	3, %l0			/* All clean? */
-	bz,pt	%icc, 2f
-	 btst	1, %l0			/* test dl */
-	bz,pt	%icc, 1f
-	 btst	2, %l0			/* test du */
-
-	ldx	[%sp + CC64FSZ + BIAS + 0], %fsr
-	add	%sp, BIAS+CC64FSZ+BLOCK_SIZE, %l0 /* Generate a pointer so */
-	andn	%l0, BLOCK_ALIGN, %l0		  /* we can do a block load */
-	ldda	[%l0] ASI_BLK_P, %f0
-	inc	BLOCK_SIZE, %l0
-	ldda	[%l0] ASI_BLK_P, %f16
-1:
-	bz,pt	%icc, 2f
-	 wr	%l1, %g0, %y		/* in any case, restore %y */
-	add	%sp, BIAS+CC64FSZ+BLOCK_SIZE, %l0 /* Generate a pointer so */
-	andn	%l0, BLOCK_ALIGN, %l0		  /* we can do a block load */
-	inc	2*BLOCK_SIZE, %l0	/* and skip what we already loaded */
-	ldda	[%l0] ASI_BLK_P, %f32
-	inc	BLOCK_SIZE, %l0
-	ldda	[%l0] ASI_BLK_P, %f48
-2:
-	mov	%l2, %g2
-	mov	%l3, %g3
-	mov	%l4, %g4
-	mov	%l5, %g5
-	mov	%l6, %g6
-	mov	%l7, %g7
-	membar	#Sync
-
-	/* get registers back and set syscall # */
-	restore	%g0, SYS_compat_16___sigreturn14, %g1
-	add	%sp, BIAS + 128 + 8, %o0	/* compute scp */
-	t	ST_SYSCALL			/* call sigreturn */
-	mov	SYS_exit, %g1			/* exit with errno */
-	t	ST_SYSCALL			/* if sigreturn fails */
diff --git a/lib/libc/compat/arch/sparc64/sys/compat_msgctl.S b/lib/libc/compat/arch/sparc64/sys/compat_msgctl.S
deleted file mode 100644
index a5598b0b1..000000000
--- a/lib/libc/compat/arch/sparc64/sys/compat_msgctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_msgctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(msgctl, \
-    "warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
-
-PSEUDO(msgctl,compat_14_msgctl)
diff --git a/lib/libc/compat/arch/sparc64/sys/compat_quotactl.S b/lib/libc/compat/arch/sparc64/sys/compat_quotactl.S
deleted file mode 100644
index efb80312a..000000000
--- a/lib/libc/compat/arch/sparc64/sys/compat_quotactl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_quotactl.S,v 1.2 2011/03/06 17:08:15 bouyer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(quotactl, \
-    "warning: reference to compatibility quotactl(); include <sys/quota.h> for correct reference")
-
-PSEUDO(quotactl,compat_50_quotactl)
diff --git a/lib/libc/compat/arch/sparc64/sys/compat_shmctl.S b/lib/libc/compat/arch/sparc64/sys/compat_shmctl.S
deleted file mode 100644
index a9f938c68..000000000
--- a/lib/libc/compat/arch/sparc64/sys/compat_shmctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_shmctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(shmctl, \
-    "warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
-
-PSEUDO(shmctl,compat_14_shmctl)
diff --git a/lib/libc/compat/arch/sparc64/sys/compat_sigaction.S b/lib/libc/compat/arch/sparc64/sys/compat_sigaction.S
deleted file mode 100644
index 7d778432c..000000000
--- a/lib/libc/compat/arch/sparc64/sys/compat_sigaction.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_sigaction.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigaction, \
-    "warning: reference to compatibility sigaction(); include <signal.h> for correct reference")
-
-PSEUDO(sigaction,compat_13_sigaction13)
diff --git a/lib/libc/compat/arch/sparc64/sys/compat_sigpending.S b/lib/libc/compat/arch/sparc64/sys/compat_sigpending.S
deleted file mode 100644
index 21d62906a..000000000
--- a/lib/libc/compat/arch/sparc64/sys/compat_sigpending.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: compat_sigpending.S,v 1.1 2005/10/16 04:41:34 christos 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.
- * 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.
- *
- * from: Header: sigpending.s,v 1.1 91/07/06 13:06:00 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)sigpending.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: compat_sigpending.S,v 1.1 2005/10/16 04:41:34 christos Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigpending, \
-    "warning: reference to compatibility sigpending(); include <signal.h> for correct reference")
-
-ENTRY(sigpending)
-	mov	%o0, %o2		/* save pointer */
-	mov	SYS_compat_13_sigpending13, %g1
-	t	ST_SYSCALL		/* sigpending() */
-	bcc,a	1f			/* if success, */
-	 st	%o0, [%o2]		/*    store return value */
-	ERROR()
-1:
-	retl				/* and return 0 */
-	 clr	%o0
diff --git a/lib/libc/compat/arch/sparc64/sys/compat_sigprocmask.S b/lib/libc/compat/arch/sparc64/sys/compat_sigprocmask.S
deleted file mode 100644
index bbdd339bb..000000000
--- a/lib/libc/compat/arch/sparc64/sys/compat_sigprocmask.S
+++ /dev/null
@@ -1,73 +0,0 @@
-/*	$NetBSD: compat_sigprocmask.S,v 1.1 2005/10/16 04:41:34 christos 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.
- * 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.
- *
- * from: Header: sigprocmask.s,v 1.1 91/07/06 13:06:01 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)sigprocmask.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: compat_sigprocmask.S,v 1.1 2005/10/16 04:41:34 christos Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigprocmask, \
-    "warning: reference to compatibility sigprocmask(); include <signal.h> for correct reference")
-
-/*
- * sigprocmask(int how, sigset_t *set, sigset_t *oset)
- */
-ENTRY(sigprocmask)
-	brnz,a	%o1, 1f		/* if (set != NULL) */
-	 ld	[%o1], %o1	/*    replace it in %o1 with *set */
-#if 0
-	clr	%o1		/* else block no signals ... */
-#endif
-	mov	1, %o0		/* ... using sigprocmask(SIG_BLOCK) */
-1:
-	mov	SYS_compat_13_sigprocmask13, %g1
-	t	ST_SYSCALL
-	bcc	2f		/* if success, */
-	 tst	%o2		/*    check to see if oset requested */
-	ERROR()
-2:
-	bne,a	3f		/* if oset != NULL, */
-	 st	%o0, [%o2]	/*    *oset = oldmask */
-3:
-	retl			/* in any case, return 0 */
-	 clr	%o0
diff --git a/lib/libc/compat/arch/sparc64/sys/compat_sigreturn.S b/lib/libc/compat/arch/sparc64/sys/compat_sigreturn.S
deleted file mode 100644
index 2bb980e24..000000000
--- a/lib/libc/compat/arch/sparc64/sys/compat_sigreturn.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: compat_sigreturn.S,v 1.1 2005/10/16 04:41:34 christos 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.
- * 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.
- *
- * from: Header: sigreturn.s,v 1.1 91/07/06 13:06:01 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)sigreturn.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: compat_sigreturn.S,v 1.1 2005/10/16 04:41:34 christos Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigreturn, \
-    "warning: reference to compatibility sigreturn()")
-
-ENTRY(sigreturn)
-	mov	SYS_compat_13_sigreturn13, %g1
-	t	ST_SYSCALL
-	ERROR()
diff --git a/lib/libc/compat/arch/sparc64/sys/compat_sigsuspend.S b/lib/libc/compat/arch/sparc64/sys/compat_sigsuspend.S
deleted file mode 100644
index 0fefb342d..000000000
--- a/lib/libc/compat/arch/sparc64/sys/compat_sigsuspend.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: compat_sigsuspend.S,v 1.1 2005/10/16 04:41:34 christos 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.
- * 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.
- *
- * from: Header: sigsuspend.s,v 1.1 91/07/06 13:06:01 torek Exp
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)sigsuspend.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: compat_sigsuspend.S,v 1.1 2005/10/16 04:41:34 christos Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigsuspend, \
-    "warning: reference to compatibility sigsuspend(); include <signal.h> for correct reference")
-
-ENTRY(sigsuspend)
-	ld	[%o0], %o0		/* indirect to mask argument */
-	mov	SYS_compat_13_sigsuspend13, %g1
-	t	ST_SYSCALL
-	ERROR()				/* always terminates with EINTR */
diff --git a/lib/libc/compat/arch/vax/Makefile.inc b/lib/libc/compat/arch/vax/Makefile.inc
deleted file mode 100644
index 04c44bf66..000000000
--- a/lib/libc/compat/arch/vax/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2010/07/06 05:59:52 mrg Exp $
-
-.include "${COMPATARCHDIR}/sys/Makefile.inc"
diff --git a/lib/libc/compat/arch/vax/sys/Makefile.inc b/lib/libc/compat/arch/vax/sys/Makefile.inc
deleted file mode 100644
index 0ef016907..000000000
--- a/lib/libc/compat/arch/vax/sys/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2011/03/06 17:08:15 bouyer Exp $
-
-SRCS+=	compat_Ovfork.S \
-	compat___sigreturn14.S compat___sigtramp2.S \
-	compat_msgctl.S compat___semctl.S compat_shmctl.S \
-	compat_sigaction13.S compat_sigpending13.S compat_sigprocmask13.S \
-	compat_sigreturn13.S compat_sigsuspend13.S compat_quotactl.S
diff --git a/lib/libc/compat/arch/vax/sys/compat_Ovfork.S b/lib/libc/compat/arch/vax/sys/compat_Ovfork.S
deleted file mode 100644
index b425c5f5b..000000000
--- a/lib/libc/compat/arch/vax/sys/compat_Ovfork.S
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)Ovfork.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: compat_Ovfork.S,v 1.2 2011/01/25 02:38:16 matt Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-/*
- * @(#)vfork.s	4.1 (Berkeley) 12/21/80
- * C library -- vfork
- */
-
-WARN_REFERENCES(vfork, \
-    "warning: reference to compatibility vfork(); include <unistd.h> for correct reference")
-
-/*
- * pid = vfork();
- *
- * %r1 == 0 in parent process, %r1 == 1 in child process.
- * %r0 == pid of child in parent, %r0 == pid of parent in child.
- *
- * trickery here, due to keith sklower, uses ret to clear the stack,
- * and then returns with a jump indirect, since only one person can return
- * with a ret off this stack... we do the ret before we vfork!
- */
-
-ENTRY(vfork, 0)
-	movl	16(%fp),%r2	# save return address before we smash it
-	movab	here,16(%fp)
-	ret
-here:
-	chmk	$ SYS_vfork
-	bcs	err		# if failed, set errno and return -1
-	/* this next trick is Chris Torek's fault */
-	mnegl	%r1,%r1		# %r1 = 0xffffffff if child, 0 if parent
-	bicl2	%r1,%r0		# %r0 &= ~%r1, i.e., 0 if child, else unchanged
-	jmp	(%r2)
-
-err:
-#ifdef _REENTRANT
-	pushr	$0x5
-	calls	$0,_C_LABEL(__errno)
-	movl	(%sp)+,(%r0)
-	mnegl	$1,%r0
-	rsb
-#else
-	movl	%r0,_C_LABEL(errno)
-	mnegl	$1,%r0
-	jmp	(%r2)
-#endif
-END(vfork)
diff --git a/lib/libc/compat/arch/vax/sys/compat___semctl.S b/lib/libc/compat/arch/vax/sys/compat___semctl.S
deleted file mode 100644
index c64b6d3bb..000000000
--- a/lib/libc/compat/arch/vax/sys/compat___semctl.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-PSEUDO(__semctl,compat_14___semctl)
diff --git a/lib/libc/compat/arch/vax/sys/compat___sigreturn14.S b/lib/libc/compat/arch/vax/sys/compat___sigreturn14.S
deleted file mode 100644
index 006aa6e7e..000000000
--- a/lib/libc/compat/arch/vax/sys/compat___sigreturn14.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)sigreturn.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: compat___sigreturn14.S,v 1.2 2011/01/25 02:38:16 matt Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-#ifdef GPROF
-#undef ENTRY
-#define	ENTRY(x, y)	_ENTRY(x, y); pushr $0x3f; _PROF_PROLOGUE; popr $0x3f
-#endif /* GPROF */
-
-PSEUDO(__sigreturn14,compat_16___sigreturn14)
diff --git a/lib/libc/compat/arch/vax/sys/compat___sigtramp2.S b/lib/libc/compat/arch/vax/sys/compat___sigtramp2.S
deleted file mode 100644
index 72693ac37..000000000
--- a/lib/libc/compat/arch/vax/sys/compat___sigtramp2.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: compat___sigtramp2.S,v 1.3 2011/01/29 22:58:47 matt Exp $	*/
-
-/*
- * Copyright (c) 2002 Anders Magnusson, (ragge@NetBSD.org).
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 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.
- */
-
-/*
- * Signal trampoline; registers when called:
- *	sp, pc, psl - obvious
- *	ap - points to argument list, see machdep.c:sendsig()
- *	fp - address of signal handler
- */
-
-#include "SYS.h"
-
-#ifdef SYSLIBC_SCCS
-RCSID("$NetBSD: compat___sigtramp2.S,v 1.3 2011/01/29 22:58:47 matt Exp $")
-#endif
-
-	.text
-	_ALIGN_TEXT
-
-	.globl	_C_LABEL(__sigtramp_sigcontext_2)
-_C_LABEL(__sigtramp_sigcontext_2):
-	nop; nop;
-	pushr $(R0|R1|R2|R3|R4|R5)	# save scratch registers
-	callg (%ap),(%fp)		# use global arg list
-	popr $(R0|R1|R2|R3|R4|R5)	# restore regs
-	movab 8(%ap),%ap		# arg is pointer to sigctx
-	SYSTRAP(compat_16___sigreturn14) # exit from here
-	halt				# illegal insn
-END(__sigtramp_sigcontext_2)
diff --git a/lib/libc/compat/arch/vax/sys/compat_msgctl.S b/lib/libc/compat/arch/vax/sys/compat_msgctl.S
deleted file mode 100644
index a5598b0b1..000000000
--- a/lib/libc/compat/arch/vax/sys/compat_msgctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_msgctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(msgctl, \
-    "warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
-
-PSEUDO(msgctl,compat_14_msgctl)
diff --git a/lib/libc/compat/arch/vax/sys/compat_quotactl.S b/lib/libc/compat/arch/vax/sys/compat_quotactl.S
deleted file mode 100644
index efb80312a..000000000
--- a/lib/libc/compat/arch/vax/sys/compat_quotactl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_quotactl.S,v 1.2 2011/03/06 17:08:15 bouyer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(quotactl, \
-    "warning: reference to compatibility quotactl(); include <sys/quota.h> for correct reference")
-
-PSEUDO(quotactl,compat_50_quotactl)
diff --git a/lib/libc/compat/arch/vax/sys/compat_shmctl.S b/lib/libc/compat/arch/vax/sys/compat_shmctl.S
deleted file mode 100644
index a9f938c68..000000000
--- a/lib/libc/compat/arch/vax/sys/compat_shmctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_shmctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(shmctl, \
-    "warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
-
-PSEUDO(shmctl,compat_14_shmctl)
diff --git a/lib/libc/compat/arch/vax/sys/compat_sigaction13.S b/lib/libc/compat/arch/vax/sys/compat_sigaction13.S
deleted file mode 100644
index 19d986075..000000000
--- a/lib/libc/compat/arch/vax/sys/compat_sigaction13.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_sigaction13.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigaction, \
-    "warning: reference to compatibility sigaction(); include <signal.h> for correct reference")
-
-PSEUDO(sigaction,compat_13_sigaction13)
diff --git a/lib/libc/compat/arch/vax/sys/compat_sigpending13.S b/lib/libc/compat/arch/vax/sys/compat_sigpending13.S
deleted file mode 100644
index 04fddc121..000000000
--- a/lib/libc/compat/arch/vax/sys/compat_sigpending13.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)sigpending.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: compat_sigpending13.S,v 1.2 2011/01/25 02:38:16 matt Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-WARN_REFERENCES(sigpending, \
-    "warning: reference to compatibility sigpending(); include <signal.h> for correct reference")
-
-_SYSCALL(sigpending,compat_13_sigpending13)
-	movl	%r0,*4(%ap)		# store old mask
-	clrl	%r0
-	ret
-END(sigpending)
diff --git a/lib/libc/compat/arch/vax/sys/compat_sigprocmask13.S b/lib/libc/compat/arch/vax/sys/compat_sigprocmask13.S
deleted file mode 100644
index 0c3129fa5..000000000
--- a/lib/libc/compat/arch/vax/sys/compat_sigprocmask13.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)sigprocmask.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: compat_sigprocmask13.S,v 1.2 2011/01/25 02:38:16 matt Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-WARN_REFERENCES(sigprocmask, \
-    "warning: reference to compatibility sigprocmask(); include <signal.h> for correct reference")
-
-ENTRY(sigprocmask, 0)
-	tstl	8(%ap)			# check new sigset pointer
-	bneq	1f			# if not null, indirect
-/*	movl	$0,8(%ap)		# null mask pointer: block empty set */
-	movl	$1,4(%ap)		# SIG_BLOCK
-	jbr	2f
-1:	movl	*8(%ap),8(%ap)		# indirect to new mask arg
-2:	chmk	$ SYS_compat_13_sigprocmask13
-	jcc	3f
-	jmp	CERROR+2
-
-3:	tstl	12(%ap)			# test if old mask requested
-	beql	out
-	movl	%r0,*12(%ap)		# store old mask
-out:
-	clrl	%r0
-	ret
-END(sigprocmask)
diff --git a/lib/libc/compat/arch/vax/sys/compat_sigreturn13.S b/lib/libc/compat/arch/vax/sys/compat_sigreturn13.S
deleted file mode 100644
index 31686c57d..000000000
--- a/lib/libc/compat/arch/vax/sys/compat_sigreturn13.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)sigreturn.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: compat_sigreturn13.S,v 1.2 2011/01/25 02:38:16 matt Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-#ifdef GPROF
-#undef ENTRY
-#define	ENTRY(x, y) \
-	_ENTRY(x, y); pushr $0x3f; _PROF_PROLOGUE; popr $0x3f;
-#endif /* GPROF */
-
-WARN_REFERENCES(sigreturn, \
-    "warning: reference to compatibility sigreturn()")
-
-PSEUDO(sigreturn,compat_13_sigreturn13)
diff --git a/lib/libc/compat/arch/vax/sys/compat_sigsuspend13.S b/lib/libc/compat/arch/vax/sys/compat_sigsuspend13.S
deleted file mode 100644
index cb468b069..000000000
--- a/lib/libc/compat/arch/vax/sys/compat_sigsuspend13.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	/* .asciz "@(#)sigsuspend.s	8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: compat_sigsuspend13.S,v 1.2 2011/01/25 02:38:16 matt Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-WARN_REFERENCES(sigsuspend, \
-    "warning: reference to compatibility sigsuspend(); include <signal.h> for correct reference")
-
-ENTRY(sigsuspend, 0)
-	movl	*4(%ap),4(%ap)		# indirect to mask arg
-	SYSTRAP(compat_13_sigsuspend13)
-	jcc	1f
-	jmp	CERROR+2
-1:	clrl	%r0			# shouldnt happen
-	ret
-END(sigsuspend)
diff --git a/lib/libc/compat/arch/x86_64/Makefile.inc b/lib/libc/compat/arch/x86_64/Makefile.inc
deleted file mode 100644
index 9ca65d490..000000000
--- a/lib/libc/compat/arch/x86_64/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2015/02/09 22:44:34 pooka Exp $
-
-.include "${COMPATARCHDIR}/gen/Makefile.inc"
-.if ${RUMPRUN} != "yes"
-.include "${COMPATARCHDIR}/sys/Makefile.inc"
-.endif
diff --git a/lib/libc/compat/arch/x86_64/gen/Makefile.inc b/lib/libc/compat/arch/x86_64/gen/Makefile.inc
deleted file mode 100644
index e06093eab..000000000
--- a/lib/libc/compat/arch/x86_64/gen/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2006/07/03 13:13:53 drochner Exp $
-
-# objects built from C sources in compat/gen
-SRCS+=	compat_frexp_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
diff --git a/lib/libc/compat/arch/x86_64/sys/Makefile.inc b/lib/libc/compat/arch/x86_64/sys/Makefile.inc
deleted file mode 100644
index f17a650ef..000000000
--- a/lib/libc/compat/arch/x86_64/sys/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2011/03/06 17:08:15 bouyer Exp $
-
-SRCS+=compat_Ovfork.S compat___semctl.S compat___sigreturn14.S \
-    compat_msgctl.S compat_shmctl.S compat_sigaction.S \
-    compat_sigpending.S compat_sigprocmask.S compat_sigreturn.S \
-    compat_sigsuspend.S compat_quotactl.S
diff --git a/lib/libc/compat/arch/x86_64/sys/compat_Ovfork.S b/lib/libc/compat/arch/x86_64/sys/compat_Ovfork.S
deleted file mode 100644
index e368f30c1..000000000
--- a/lib/libc/compat/arch/x86_64/sys/compat_Ovfork.S
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: compat_Ovfork.S,v 1.3 2014/05/22 15:21:13 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)Ovfork.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_Ovfork.S,v 1.3 2014/05/22 15:21:13 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(vfork, \
-    "warning: reference to compatibility vfork(); include <unistd.h> for correct reference")
-
-/*
- * pid = vfork();
- *
- * %edx == 0 in parent process, %edx == 1 in child process.
- * %eax == pid of child in parent, %eax == pid of parent in child.
- *
- */
-ENTRY(vfork)
-	popq	%r9		/* my rta into r9 */
-	SYSTRAP(vfork)
-	jc	err
-	decl	%edx
-	andl	%edx,%eax
-	jmp	*%r9
-err:
-	pushq	%r9
-#ifdef __PIC__
-	movq	PIC_GOT(CERROR), %rcx
-	jmp	*%rcx
-#else
-	jmp	CERROR
-#endif
-END(vfork)
diff --git a/lib/libc/compat/arch/x86_64/sys/compat___semctl.S b/lib/libc/compat/arch/x86_64/sys/compat___semctl.S
deleted file mode 100644
index c64b6d3bb..000000000
--- a/lib/libc/compat/arch/x86_64/sys/compat___semctl.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: compat___semctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-PSEUDO(__semctl,compat_14___semctl)
diff --git a/lib/libc/compat/arch/x86_64/sys/compat___sigreturn14.S b/lib/libc/compat/arch/x86_64/sys/compat___sigreturn14.S
deleted file mode 100644
index 4704ae88f..000000000
--- a/lib/libc/compat/arch/x86_64/sys/compat___sigreturn14.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: compat___sigreturn14.S,v 1.1 2006/03/11 18:59:21 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat___sigreturn14.S,v 1.1 2006/03/11 18:59:21 christos Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-/* Nothing here. We don't need NetBSD-1.6 binary compatibility. */
diff --git a/lib/libc/compat/arch/x86_64/sys/compat_msgctl.S b/lib/libc/compat/arch/x86_64/sys/compat_msgctl.S
deleted file mode 100644
index a5598b0b1..000000000
--- a/lib/libc/compat/arch/x86_64/sys/compat_msgctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_msgctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(msgctl, \
-    "warning: reference to compatibility msgctl(); include <sys/msg.h> for correct reference")
-
-PSEUDO(msgctl,compat_14_msgctl)
diff --git a/lib/libc/compat/arch/x86_64/sys/compat_quotactl.S b/lib/libc/compat/arch/x86_64/sys/compat_quotactl.S
deleted file mode 100644
index efb80312a..000000000
--- a/lib/libc/compat/arch/x86_64/sys/compat_quotactl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_quotactl.S,v 1.2 2011/03/06 17:08:15 bouyer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(quotactl, \
-    "warning: reference to compatibility quotactl(); include <sys/quota.h> for correct reference")
-
-PSEUDO(quotactl,compat_50_quotactl)
diff --git a/lib/libc/compat/arch/x86_64/sys/compat_shmctl.S b/lib/libc/compat/arch/x86_64/sys/compat_shmctl.S
deleted file mode 100644
index a9f938c68..000000000
--- a/lib/libc/compat/arch/x86_64/sys/compat_shmctl.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_shmctl.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(shmctl, \
-    "warning: reference to compatibility shmctl(); include <sys/shm.h> for correct reference")
-
-PSEUDO(shmctl,compat_14_shmctl)
diff --git a/lib/libc/compat/arch/x86_64/sys/compat_sigaction.S b/lib/libc/compat/arch/x86_64/sys/compat_sigaction.S
deleted file mode 100644
index 7d778432c..000000000
--- a/lib/libc/compat/arch/x86_64/sys/compat_sigaction.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: compat_sigaction.S,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigaction, \
-    "warning: reference to compatibility sigaction(); include <signal.h> for correct reference")
-
-PSEUDO(sigaction,compat_13_sigaction13)
diff --git a/lib/libc/compat/arch/x86_64/sys/compat_sigpending.S b/lib/libc/compat/arch/x86_64/sys/compat_sigpending.S
deleted file mode 100644
index 353264971..000000000
--- a/lib/libc/compat/arch/x86_64/sys/compat_sigpending.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: compat_sigpending.S,v 1.2 2014/05/22 15:21:13 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigpending.s	5.1 (Berkeley) 7/1/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_sigpending.S,v 1.2 2014/05/22 15:21:13 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigpending, \
-    "warning: reference to compatibility sigpending(); include <signal.h> for correct reference")
-
-_SYSCALL(sigpending,compat_13_sigpending13)
-	movl	%eax,(%rdi)		# store old mask
-	xorl	%eax,%eax
-	ret
-END(sigpending)
diff --git a/lib/libc/compat/arch/x86_64/sys/compat_sigprocmask.S b/lib/libc/compat/arch/x86_64/sys/compat_sigprocmask.S
deleted file mode 100644
index 9d08e6047..000000000
--- a/lib/libc/compat/arch/x86_64/sys/compat_sigprocmask.S
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: compat_sigprocmask.S,v 1.3 2014/05/22 15:21:13 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigprocmask.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_sigprocmask.S,v 1.3 2014/05/22 15:21:13 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigprocmask, \
-    "warning: reference to compatibility sigprocmask(); include <signal.h> for correct reference")
-
-ENTRY(sigprocmask)
-	testq	%rsi,%rsi		# check new sigset pointer
-	jnz	1f			# if not null, indirect
-	movl	$1,%edi			# SIG_BLOCK
-	jmp	2f
-1:	movl	(%rsi),%esi		# fetch indirect  ...
-2:	SYSTRAP(compat_13_sigprocmask13)
-	jc	err
-	testq	%rdx,%rdx		# test if old mask requested
-	jz	out
-	movq	%rax,(%rdx)		# store old mask
-out:
-	xorl	%eax,%eax
-	ret
-err:
-#ifdef __PIC__
-	movq	PIC_GOT(CERROR), %rcx
-	jmp	*%rcx
-#else
-	jmp	CERROR
-#endif
-END(sigprocmask)
diff --git a/lib/libc/compat/arch/x86_64/sys/compat_sigreturn.S b/lib/libc/compat/arch/x86_64/sys/compat_sigreturn.S
deleted file mode 100644
index bdfb76bab..000000000
--- a/lib/libc/compat/arch/x86_64/sys/compat_sigreturn.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: compat_sigreturn.S,v 1.1 2006/03/11 18:59:21 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_sigreturn.S,v 1.1 2006/03/11 18:59:21 christos Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-/* Nothing here. We don't need NetBSD-1.3 binary compatibility. */
diff --git a/lib/libc/compat/arch/x86_64/sys/compat_sigsuspend.S b/lib/libc/compat/arch/x86_64/sys/compat_sigsuspend.S
deleted file mode 100644
index 50b466913..000000000
--- a/lib/libc/compat/arch/x86_64/sys/compat_sigsuspend.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: compat_sigsuspend.S,v 1.3 2014/05/22 15:21:13 uebayasi Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)sigsuspend.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: compat_sigsuspend.S,v 1.3 2014/05/22 15:21:13 uebayasi Exp $")
-#endif /* SYSLIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-WARN_REFERENCES(sigsuspend, \
-    "warning: reference to compatibility sigsuspend(); include <signal.h> for correct reference")
-
-ENTRY(sigsuspend)
-	movl	(%rdi),%edi		# indirect to mask arg
-	SYSTRAP(compat_13_sigsuspend13)
-	jc	err
-	xorl	%eax,%eax		# shouldn t happen
-	ret
-err:
-#ifdef __PIC__
-	movq	PIC_GOT(CERROR), %rcx
-	jmp	*%rcx
-#else
-	jmp	CERROR
-#endif
-END(sigsuspend)
diff --git a/lib/libc/compat/db/Makefile.inc b/lib/libc/compat/db/Makefile.inc
deleted file mode 100644
index 91236ce43..000000000
--- a/lib/libc/compat/db/Makefile.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2006/03/11 21:07:18 christos Exp $
-.include "${COMPATDIR}/db/hash/Makefile.inc"
diff --git a/lib/libc/compat/db/hash/Makefile.inc b/lib/libc/compat/db/hash/Makefile.inc
deleted file mode 100644
index b801df5e6..000000000
--- a/lib/libc/compat/db/hash/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2006/03/11 21:07:18 christos Exp $
-
-.PATH: ${COMPATDIR}/db/hash
-SRCS+=compat_ndbmdatum.c
diff --git a/lib/libc/compat/db/hash/compat_ndbmdatum.c b/lib/libc/compat/db/hash/compat_ndbmdatum.c
deleted file mode 100644
index a238834fe..000000000
--- a/lib/libc/compat/db/hash/compat_ndbmdatum.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*	$NetBSD: compat_ndbmdatum.c,v 1.2 2012/03/13 21:13:31 christos Exp $	*/
-
-/*
- * Written by Klaus Klein <kleink@NetBSD.org>, April 28, 2004.
- * Public domain.
- */
-
-#define __LIBC12_SOURCE__
-#include "namespace.h"
-#include <sys/cdefs.h>
-#include <ndbm.h>
-#include <compat/include/ndbm.h>
-
-__warn_references(dbm_delete,
-    "warning: reference to compatibility dbm_delete();"
-    " include <ndbm.h> for correct reference")
-__warn_references(dbm_fetch,
-    "warning: reference to compatibility dbm_fetch();"
-    " include <ndbm.h> for correct reference")
-__warn_references(dbm_firstkey,
-    "warning: reference to compatibility dbm_firstkey();"
-    " include <ndbm.h> for correct reference")
-__warn_references(dbm_nextkey,
-    "warning: reference to compatibility dbm_nextkey();"
-    " include <ndbm.h> for correct reference")
-__warn_references(dbm_store,
-    "warning: reference to compatibility dbm_store();"
-    " include <ndbm.h> for correct reference")
-
-#define datum datum12
-#define datum_truncate(a)	((a) > INT_MAX ? INT_MAX : (int)(a))
-
-#include "db/hash/ndbmdatum.c"
diff --git a/lib/libc/compat/gen/Makefile.inc b/lib/libc/compat/gen/Makefile.inc
deleted file mode 100644
index aaa3cdb72..000000000
--- a/lib/libc/compat/gen/Makefile.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.17 2014/01/16 20:31:42 christos Exp $
-
-#__MINIX: Not all supported yet
-.PATH: ${COMPATDIR}/gen
-SRCS+=compat_errlist.c compat_fts.c \
-    compat_glob.c compat___glob13.c \
-    compat_opendir.c compat_readdir.c compat__readdir_unlocked30.c \
-    compat_scandir.c compat_siglist.c compat_signame.c compat_sigsetops.c \
-    compat_times.c compat_timezone.c compat_unvis.c compat_utmpx.c \
-    compat_time.c compat_utime.c compat_devname.c compat_alphasort.c \
-    compat_getpwent.c compat_utmp.c compat___fts50.c \
-    compat___unvis13.c compat_syslog.c compat_alloca.c
diff --git a/lib/libc/compat/gen/compat___fts13.c b/lib/libc/compat/gen/compat___fts13.c
deleted file mode 100644
index 44378ea29..000000000
--- a/lib/libc/compat/gen/compat___fts13.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: compat___fts13.c,v 1.11 2013/10/04 21:07:37 christos Exp $	*/
-
-#include "namespace.h"
-#include <sys/cdefs.h>
-#include <dirent.h>
-
-#define	__LIBC12_SOURCE__
-
-__warn_references(__fts_children13,
-    "warning: reference to compatibility __fts_children13();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_close13,
-    "warning: reference to compatibility __fts_close13();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_open13,
-    "warning: reference to compatibility __fts_open13();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_read13,
-    "warning: reference to compatibility __fts_read13();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_set13,
-    "warning: reference to compatibility __fts_set13();"
-    " include <fts.h> for correct reference")
-
-#include <sys/stat.h>
-#include <compat/sys/time.h>
-#include <compat/sys/stat.h>
-
-#define	__fts_stat_t	struct stat13
-#define	__fts_ino_t	u_int32_t
-#define	__fts_length_t	u_short
-#define	__fts_number_t	long
-#define	__fts_dev_t	uint32_t
-#define	__fts_level_t	short
-
-#ifndef ftsent_namelen_truncate
-#define ftsent_namelen_truncate(a)	\
-    ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
-#endif
-#ifndef ftsent_pathlen_truncate
-#define ftsent_pathlen_truncate(a)	\
-    ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
-#endif
-
-#define	stat		__compat___stat13
-#define	lstat		__compat___lstat13
-#define	fstat		__compat___fstat13
-
-#undef	fts_children
-#define	fts_children __fts_children13
-#undef	fts_close
-#define	fts_close __fts_close13
-#undef	fts_open
-#define	fts_open  __fts_open13
-#undef	fts_read
-#define	fts_read __fts_read13
-#undef	fts_set
-#define	fts_set __fts_set13
-
-#include <fts.h>
-#include <compat/include/fts.h>
-
-#define	__FTS_COMPAT_TAILINGSLASH
-#define	__FTS_COMPAT_LENGTH
-#define	__FTS_COMPAT_LEVEL
-
-#include "gen/fts.c"
diff --git a/lib/libc/compat/gen/compat___fts30.c b/lib/libc/compat/gen/compat___fts30.c
deleted file mode 100644
index 54607585b..000000000
--- a/lib/libc/compat/gen/compat___fts30.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: compat___fts30.c,v 1.8 2013/10/04 21:07:37 christos Exp $	*/
-
-#include "namespace.h"
-#include <sys/cdefs.h>
-#include <dirent.h>
-
-#define	__LIBC12_SOURCE__
-
-__warn_references(__fts_children30,
-    "warning: reference to compatibility __fts_children30();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_close30,
-    "warning: reference to compatibility __fts_close30();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_open30,
-    "warning: reference to compatibility __fts_open30();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_read30,
-    "warning: reference to compatibility __fts_read30();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_set30,
-    "warning: reference to compatibility __fts_set30();"
-    " include <fts.h> for correct reference")
-
-#include <sys/stat.h>
-#include <compat/sys/time.h>
-#include <compat/sys/stat.h>
-
-#define	__fts_stat_t	struct stat30
-#define	__fts_length_t	u_short
-#define	__fts_number_t	long
-#define	__fts_dev_t	uint32_t
-#define	__fts_level_t	short
-
-#define	stat		__compat___stat30
-#define	lstat		__compat___lstat30
-#define	fstat		__compat___fstat30
-
-#ifndef ftsent_namelen_truncate
-#define ftsent_namelen_truncate(a)	\
-    ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
-#endif
-#ifndef ftsent_pathlen_truncate
-#define ftsent_pathlen_truncate(a)	\
-    ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
-#endif
-
-#undef	fts_children
-#define	fts_children __fts_children30
-#undef	fts_close
-#define	fts_close __fts_close30
-#undef	fts_open
-#define	fts_open  __fts_open30
-#undef	fts_read
-#define	fts_read __fts_read30
-#undef	fts_set
-#define	fts_set __fts_set30
-
-#include <fts.h>
-#include <compat/include/fts.h>
-
-#define	__FTS_COMPAT_LENGTH
-#define	__FTS_COMPAT_LEVEL
-
-#include "gen/fts.c"
diff --git a/lib/libc/compat/gen/compat___fts31.c b/lib/libc/compat/gen/compat___fts31.c
deleted file mode 100644
index cfef1e312..000000000
--- a/lib/libc/compat/gen/compat___fts31.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: compat___fts31.c,v 1.6 2013/10/04 21:07:37 christos Exp $	*/
-
-#include "namespace.h"
-#include <sys/cdefs.h>
-#include <dirent.h>
-
-#define	__LIBC12_SOURCE__
-
-__warn_references(__fts_children31,
-    "warning: reference to compatibility __fts_children31();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_close31,
-    "warning: reference to compatibility __fts_close31();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_open31,
-    "warning: reference to compatibility __fts_open31();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_read31,
-    "warning: reference to compatibility __fts_read31();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_set31,
-    "warning: reference to compatibility __fts_set31();"
-    " include <fts.h> for correct reference")
-
-#include <sys/stat.h>
-#include <compat/sys/time.h>
-#include <compat/sys/stat.h>
-
-#define	__fts_stat_t	struct stat30
-#define	__fts_number_t	long
-#define	__fts_dev_t	uint32_t
-#define	__fts_level_t	short
-
-#ifndef ftsent_namelen_truncate
-#define ftsent_namelen_truncate(a)	\
-    ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
-#endif
-#ifndef ftsent_pathlen_truncate
-#define ftsent_pathlen_truncate(a)	\
-    ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
-#endif
-
-#define	stat		__compat___stat30
-#define	lstat		__compat___lstat30
-#define	fstat		__compat___fstat30
-
-#undef	fts_children
-#define	fts_children __fts_children31
-#undef	fts_close
-#define	fts_close __fts_close31
-#undef	fts_open
-#define	fts_open  __fts_open31
-#undef	fts_read
-#define	fts_read __fts_read31
-#undef	fts_set
-#define	fts_set __fts_set31
-
-#include <fts.h>
-#include <compat/include/fts.h>
-
-#define	__FTS_COMPAT_LEVEL
-
-#include "gen/fts.c"
diff --git a/lib/libc/compat/gen/compat___fts32.c b/lib/libc/compat/gen/compat___fts32.c
deleted file mode 100644
index 2c6b10942..000000000
--- a/lib/libc/compat/gen/compat___fts32.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: compat___fts32.c,v 1.5 2013/10/04 21:07:37 christos Exp $	*/
-
-#include "namespace.h"
-#include <sys/cdefs.h>
-#include <dirent.h>
-
-#define	__LIBC12_SOURCE__
-__warn_references(__fts_children32,
-    "warning: reference to compatibility __fts_children32();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_close32,
-    "warning: reference to compatibility __fts_close32();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_open32,
-    "warning: reference to compatibility __fts_open32();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_read32,
-    "warning: reference to compatibility __fts_read32();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_set32,
-    "warning: reference to compatibility __fts_set32();"
-    " include <fts.h> for correct reference")
-
-#define	__fts_stat_t	struct stat30
-#define	__fts_dev_t	uint32_t
-#define	__fts_level_t	short
-
-#undef	fts_children
-#define	fts_children __fts_children32
-#undef	fts_close
-#define	fts_close __fts_close32
-#undef	fts_open
-#define	fts_open  __fts_open32
-#undef	fts_read
-#define	fts_read __fts_read32
-#undef	fts_set
-#define	fts_set __fts_set32
-
-#include <sys/time.h>
-#include <compat/sys/time.h>
-#include <sys/stat.h>
-#include <compat/sys/stat.h>
-
-#include <fts.h>
-#include <compat/include/fts.h>
-
-#define	__FTS_COMPAT_LEVEL
-
-#define	stat		__compat___stat30
-#define	lstat		__compat___lstat30
-#define	fstat		__compat___fstat30
-
-#include "gen/fts.c"
diff --git a/lib/libc/compat/gen/compat___fts50.c b/lib/libc/compat/gen/compat___fts50.c
deleted file mode 100644
index dbf913b36..000000000
--- a/lib/libc/compat/gen/compat___fts50.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$NetBSD: compat___fts50.c,v 1.2 2009/10/19 17:52:05 christos Exp $	*/
-
-#include "namespace.h"
-#include <sys/cdefs.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-
-#define __LIBC12_SOURCE__
-__warn_references(__fts_children50,
-    "warning: reference to compatibility __fts_children50();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_close50,
-    "warning: reference to compatibility __fts_close50();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_open50,
-    "warning: reference to compatibility __fts_open50();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_read50,
-    "warning: reference to compatibility __fts_read50();"
-    " include <fts.h> for correct reference")
-__warn_references(__fts_set50,
-    "warning: reference to compatibility __fts_set50();"
-    " include <fts.h> for correct reference")
-
-#define	__fts_level_t	short
-#undef	fts_children
-#define	fts_children __fts_children50
-#undef	fts_close
-#define	fts_close __fts_close50
-#undef	fts_open
-#define	fts_open  __fts_open50
-#undef	fts_read
-#define	fts_read __fts_read50
-#undef	fts_set
-#define	fts_set __fts_set50
-
-#include <fts.h>
-#include <compat/include/fts.h>
-
-#define	__FTS_COMPAT_LEVEL
-
-#include "gen/fts.c"
diff --git a/lib/libc/compat/gen/compat___glob13.c b/lib/libc/compat/gen/compat___glob13.c
deleted file mode 100644
index f3ea45bae..000000000
--- a/lib/libc/compat/gen/compat___glob13.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*	$NetBSD: compat___glob13.c,v 1.2 2009/01/11 02:46:25 christos Exp $	*/
-
-/*
- * Written by Jason R. Thorpe <thorpej@NetBSD.org>, October 21, 1997.
- * Public domain.
- */
-#include "namespace.h"
-#include <pwd.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#define __gl_size_t int
-
-#define __LIBC12_SOURCE__
-__warn_references(__glob13,
-    "warning: reference to compatibility __glob13(); include <glob.h> for correct reference")
-__warn_references(__globfree13,
-    "warning: reference to compatibility __globfree13(); include <glob.h> for correct reference")
-
-#undef glob
-#undef globfree
-#define glob __glob13
-#define globfree __globfree13
-
-#include <glob.h>
-#include <compat/include/glob.h>
-
-#include "gen/glob.c"
diff --git a/lib/libc/compat/gen/compat___unvis13.c b/lib/libc/compat/gen/compat___unvis13.c
deleted file mode 100644
index df938ba31..000000000
--- a/lib/libc/compat/gen/compat___unvis13.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: compat___unvis13.c,v 1.1 2011/03/12 19:52:47 christos Exp $	*/
-
-/*-
- * Copyright (c) 2011
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat___unvis13.c,v 1.1 2011/03/12 19:52:47 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <vis.h>
-#include <compat/include/vis.h>
-
-#ifdef __warn_references
-__warn_references(__unvis13,
-    "warning: reference to compatibility __unvis13(); include <vis.h> for correct reference")
-#endif
-
-int
-__unvis13(char *cp, int c, int *astate, int flag)
-{
-	flag = (flag & ~1) | ((flag & 1) ? UNVIS_END : 0);
-	return __unvis50(cp, c, astate, flag);
-}
diff --git a/lib/libc/compat/gen/compat__readdir_unlocked30.c b/lib/libc/compat/gen/compat__readdir_unlocked30.c
deleted file mode 100644
index df6fe22ee..000000000
--- a/lib/libc/compat/gen/compat__readdir_unlocked30.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*	$NetBSD: compat__readdir_unlocked30.c,v 1.1 2008/05/04 18:53:26 tonnerre Exp $	*/
-
-#define __LIBC12_SOURCE__
-#include "namespace.h"
-#include <dirent.h>
-#include <compat/include/dirent.h>
-
-#ifdef __warn_references
-__warn_references(___readdir_unlocked30,
-    "warning: reference to compatibility _readdir_unlocked(); include <dirent.h> for correct reference")
-#endif
-
-/**     
- * Compat version of _readdir_unlocked which always skips directories
- */
-struct dirent *
-___readdir_unlocked30(DIR *dirp)
-{
-	return ___readdir_unlocked50(dirp, 1);
-}
diff --git a/lib/libc/compat/gen/compat_alloca.c b/lib/libc/compat/gen/compat_alloca.c
deleted file mode 100644
index fff067f47..000000000
--- a/lib/libc/compat/gen/compat_alloca.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <sys/cdefs.h>
-
-__warn_references(alloca,
-    "Warning: reference to the libc supplied alloca(3); this most likely will "
-    "not work. Please use the compiler provided version of alloca(3), by "
-    "supplying the appropriate compiler flags (e.g. not -std=c89).")
diff --git a/lib/libc/compat/gen/compat_alphasort.c b/lib/libc/compat/gen/compat_alphasort.c
deleted file mode 100644
index 25201718f..000000000
--- a/lib/libc/compat/gen/compat_alphasort.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*	$NetBSD: compat_alphasort.c,v 1.1 2009/02/24 18:42:36 christos Exp $	*/
-
-#include <sys/stat.h>
-#define __LIBC12_SOURCE__
-#include "namespace.h"
-#include <dirent.h>
-#include <compat/include/dirent.h>
-
-#ifdef __weak_alias
-__weak_alias(alphasort,_alphasort)
-#endif
-
-#ifdef __warn_references
-__warn_references(alphasort,
-    "warning: reference to compatibility alphasort(); include <dirent.h> for correct reference")
-#endif
-
-#define dirent dirent12
-
-#include "gen/alphasort.c"
diff --git a/lib/libc/compat/gen/compat_devname.c b/lib/libc/compat/gen/compat_devname.c
deleted file mode 100644
index 399c002d2..000000000
--- a/lib/libc/compat/gen/compat_devname.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: compat_devname.c,v 1.2 2009/01/11 02:46:25 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_devname.c,v 1.2 2009/01/11 02:46:25 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <stdint.h>
-#include <stdlib.h>
-#include <compat/include/stdlib.h>
-
-__warn_references(devname,
-    "warning: reference to compatibility devname(); include <stdlib.h> to generate correct reference")
-
-#ifdef __weak_alias
-__weak_alias(devname, _devname)
-#endif
-
-__aconst char *
-devname(int32_t dev, mode_t mode)
-{
-	return __devname50(dev, mode);
-}
diff --git a/lib/libc/compat/gen/compat_errlist.c b/lib/libc/compat/gen/compat_errlist.c
deleted file mode 100644
index 7c8c8cb3b..000000000
--- a/lib/libc/compat/gen/compat_errlist.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*	$NetBSD: compat_errlist.c,v 1.2 2006/10/31 00:38:07 cbiere Exp $	*/
-
-/*
- * Copyright (c) 1982, 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)errlst.c	8.2 (Berkeley) 11/16/93";
-#else
-__RCSID("$NetBSD: compat_errlist.c,v 1.2 2006/10/31 00:38:07 cbiere Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#define __LIBC12_SOURCE__
-#include <errno.h>
-#ifdef __weak_alias
-__weak_alias(sys_errlist, _sys_errlist)
-__weak_alias(__sys_errlist, _sys_errlist)
-__weak_alias(sys_nerr, _sys_nerr)
-__weak_alias(__sys_nerr, _sys_nerr)
-#endif
-
-const char *const sys_errlist[] = {
-	"Undefined error: 0",			/*  0 - ENOERROR */
-	"Operation not permitted",		/*  1 - EPERM */
-	"No such file or directory",		/*  2 - ENOENT */
-	"No such process",			/*  3 - ESRCH */
-	"Interrupted system call",		/*  4 - EINTR */
-	"Input/output error",			/*  5 - EIO */
-	"Device not configured",		/*  6 - ENXIO */
-	"Argument list too long",		/*  7 - E2BIG */
-	"Exec format error",			/*  8 - ENOEXEC */
-	"Bad file descriptor",			/*  9 - EBADF */
-	"No child processes",			/* 10 - ECHILD */
-	"Resource deadlock avoided",		/* 11 - EDEADLK */
-	"Cannot allocate memory",		/* 12 - ENOMEM */
-	"Permission denied",			/* 13 - EACCES */
-	"Bad address",				/* 14 - EFAULT */
-	"Block device required",		/* 15 - ENOTBLK */
-	"Device busy",				/* 16 - EBUSY */
-	"File exists",				/* 17 - EEXIST */
-	"Cross-device link",			/* 18 - EXDEV */
-	"Operation not supported by device",	/* 19 - ENODEV */
-	"Not a directory",			/* 20 - ENOTDIR */
-	"Is a directory",			/* 21 - EISDIR */
-	"Invalid argument",			/* 22 - EINVAL */
-	"Too many open files in system",	/* 23 - ENFILE */
-	"Too many open files",			/* 24 - EMFILE */
-	"Inappropriate ioctl for device",	/* 25 - ENOTTY */
-	"Text file busy",			/* 26 - ETXTBSY */
-	"File too large",			/* 27 - EFBIG */
-	"No space left on device",		/* 28 - ENOSPC */
-	"Illegal seek",				/* 29 - ESPIPE */
-	"Read-only file system",		/* 30 - EROFS */
-	"Too many links",			/* 31 - EMLINK */
-	"Broken pipe",				/* 32 - EPIPE */
-
-/* math software */
-	"Numerical argument out of domain",	/* 33 - EDOM */
-	"Result too large or too small",	/* 34 - ERANGE */
-
-/* non-blocking and interrupt i/o */
-	"Resource temporarily unavailable",	/* 35 - EAGAIN */
-						/* 35 - EWOULDBLOCK */
-	"Operation now in progress",		/* 36 - EINPROGRESS */
-	"Operation already in progress",	/* 37 - EALREADY */
-
-/* ipc/network software -- argument errors */
-	"Socket operation on non-socket",	/* 38 - ENOTSOCK */
-	"Destination address required",		/* 39 - EDESTADDRREQ */
-	"Message too long",			/* 40 - EMSGSIZE */
-	"Protocol wrong type for socket",	/* 41 - EPROTOTYPE */
-	"Protocol option not available",	/* 42 - ENOPROTOOPT */
-	"Protocol not supported",		/* 43 - EPROTONOSUPPORT */
-	"Socket type not supported",		/* 44 - ESOCKTNOSUPPORT */
-	"Operation not supported",		/* 45 - EOPNOTSUPP */
-	"Protocol family not supported",	/* 46 - EPFNOSUPPORT */
-						/* 47 - EAFNOSUPPORT */
-	"Address family not supported by protocol family",
-	"Address already in use",		/* 48 - EADDRINUSE */
-	"Can't assign requested address",	/* 49 - EADDRNOTAVAIL */
-
-/* ipc/network software -- operational errors */
-	"Network is down",			/* 50 - ENETDOWN */
-	"Network is unreachable",		/* 51 - ENETUNREACH */
-	"Network dropped connection on reset",	/* 52 - ENETRESET */
-	"Software caused connection abort",	/* 53 - ECONNABORTED */
-	"Connection reset by peer",		/* 54 - ECONNRESET */
-	"No buffer space available",		/* 55 - ENOBUFS */
-	"Socket is already connected",		/* 56 - EISCONN */
-	"Socket is not connected",		/* 57 - ENOTCONN */
-	"Can't send after socket shutdown",	/* 58 - ESHUTDOWN */
-	"Too many references: can't splice",	/* 59 - ETOOMANYREFS */
-	"Operation timed out",			/* 60 - ETIMEDOUT */
-	"Connection refused",			/* 61 - ECONNREFUSED */
-
-	"Too many levels of symbolic links",	/* 62 - ELOOP */
-	"File name too long",			/* 63 - ENAMETOOLONG */
-
-/* should be rearranged */
-	"Host is down",				/* 64 - EHOSTDOWN */
-	"No route to host",			/* 65 - EHOSTUNREACH */
-	"Directory not empty",			/* 66 - ENOTEMPTY */
-
-/* quotas & mush */
-	"Too many processes",			/* 67 - EPROCLIM */
-	"Too many users",			/* 68 - EUSERS */
-	"Disc quota exceeded",			/* 69 - EDQUOT */
-
-/* Network File System */
-	"Stale NFS file handle",		/* 70 - ESTALE */
-	"Too many levels of remote in path",	/* 71 - EREMOTE */
-	"RPC struct is bad",			/* 72 - EBADRPC */
-	"RPC version wrong",			/* 73 - ERPCMISMATCH */
-	"RPC prog. not avail",			/* 74 - EPROGUNAVAIL */
-	"Program version wrong",		/* 75 - EPROGMISMATCH */
-	"Bad procedure for program",		/* 76 - EPROCUNAVAIL */
-
-	"No locks available",			/* 77 - ENOLCK */
-	"Function not implemented",		/* 78 - ENOSYS */
-
-	"Inappropriate file type or format",	/* 79 - EFTYPE */
-};
-const int sys_nerr = { sizeof(sys_errlist) / sizeof(sys_errlist[0]) };
diff --git a/lib/libc/compat/gen/compat_frexp_ieee754.c b/lib/libc/compat/gen/compat_frexp_ieee754.c
deleted file mode 100644
index 947039bfc..000000000
--- a/lib/libc/compat/gen/compat_frexp_ieee754.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* $NetBSD: compat_frexp_ieee754.c,v 1.5 2010/04/23 19:04:54 drochner 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.
- * 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.
- *
- * from: Header: frexp.c,v 1.1 91/07/07 04:45:01 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)frexp.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: compat_frexp_ieee754.c,v 1.5 2010/04/23 19:04:54 drochner Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <machine/ieee.h>
-
-double frexp(double, int *);
-
-/*
- * Split the given value into a fraction in the range [0.5, 1.0) and
- * an exponent, such that frac * (2^exp) == value.  If value is 0,
- * return 0.
- */
-double
-frexp(double value, int *eptr)
-{
-	union ieee_double_u u;
-
-	if (value) {
-		/*
-		 * Fractions in [0.5..1.0) have an exponent of 2^-1.
-		 * Leave Inf and NaN alone, however.
-		 */
-		u.dblu_d = value;
-		if (u.dblu_dbl.dbl_exp != DBL_EXP_INFNAN) {
-			*eptr = 0;
-			if (u.dblu_dbl.dbl_exp == 0) {
-				/* denormal, scale out of mantissa */
-				*eptr = -DBL_FRACBITS;
-				u.dblu_d *= 4.50359962737049600000e+15;
-			}
-			*eptr += u.dblu_dbl.dbl_exp - (DBL_EXP_BIAS - 1);
-			u.dblu_dbl.dbl_exp = DBL_EXP_BIAS - 1;
-		}
-		return (u.dblu_d);
-	} else {
-		*eptr = 0;
-		return (value);
-	}
-}
diff --git a/lib/libc/compat/gen/compat_fts.c b/lib/libc/compat/gen/compat_fts.c
deleted file mode 100644
index 5cd131436..000000000
--- a/lib/libc/compat/gen/compat_fts.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: compat_fts.c,v 1.8 2013/10/04 21:07:37 christos Exp $	*/
-
-/*
- * Written by Jason R. Thorpe <thorpej@NetBSD.org>, October 21, 1997.
- * Public domain.
- */
-
-#include "namespace.h"
-#include <sys/cdefs.h>
-#include <dirent.h>
-
-#define	__LIBC12_SOURCE__
-#include <sys/stat.h>
-#include <compat/sys/time.h>
-#include <compat/sys/stat.h>
-
-#define	__fts_stat_t	struct stat12
-#define	__fts_nlink_t	u_int16_t
-#define	__fts_ino_t	u_int32_t
-#define	__fts_length_t	unsigned short
-#define	__fts_number_t	long
-#define	__fts_dev_t	uint32_t
-#define	__fts_level_t	short
-
-#ifndef ftsent_namelen
-#define ftsent_namelen_truncate(a)	\
-    ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
-#endif
-#ifndef fts_pathlen_truncate
-#define ftsent_pathlen_truncate(a)	\
-    ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
-#endif
-
-#include <fts.h>
-#include <compat/include/fts.h>
-
-#ifdef __weak_alias
-__weak_alias(fts_children,_fts_children)
-__weak_alias(fts_close,_fts_close)
-__weak_alias(fts_open,_fts_open)
-__weak_alias(fts_read,_fts_read)
-__weak_alias(fts_set,_fts_set)
-#endif /* __weak_alias */
-
-__warn_references(fts_children,
-    "warning: reference to compatibility fts_children();"
-    " include <fts.h> for correct reference")
-__warn_references(fts_close,
-    "warning: reference to compatibility fts_close();"
-    " include <fts.h> for correct reference")
-__warn_references(fts_open,
-    "warning: reference to compatibility fts_open();"
-    " include <fts.h> for correct reference")
-__warn_references(fts_read,
-    "warning: reference to compatibility fts_read();"
-    " include <fts.h> for correct reference")
-__warn_references(fts_set,
-    "warning: reference to compatibility fts_set();"
-    " include <fts.h> for correct reference")
-
-#define	__FTS_COMPAT_TAILINGSLASH
-#define	__FTS_COMPAT_LENGTH
-#define	__FTS_COMPAT_LEVEL
-
-#define stat __compat_stat
-#define lstat __compat_lstat
-#define fstat __compat_fstat
-
-#include "gen/fts.c"
diff --git a/lib/libc/compat/gen/compat_getmntinfo.c b/lib/libc/compat/gen/compat_getmntinfo.c
deleted file mode 100644
index a23566f3c..000000000
--- a/lib/libc/compat/gen/compat_getmntinfo.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: compat_getmntinfo.c,v 1.4 2013/10/04 21:07:37 christos Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getmntinfo.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: compat_getmntinfo.c,v 1.4 2013/10/04 21:07:37 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/ucred.h>
-#include <sys/mount.h>
-#include <compat/sys/mount.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-
-__strong_alias(getmntinfo, __compat_getmntinfo)
-
-/*
- * Return information about mounted filesystems.
- */
-int
-__compat_getmntinfo(struct statfs12 **mntbufp, int flags)
-{
-	static struct statfs12 *mntbuf;
-	static int mntsize;
-	static size_t bufsize;
-
-	_DIAGASSERT(mntbufp != NULL);
-
-	if (mntsize <= 0 &&
-	    (mntsize = __compat_getfsstat(NULL, 0L, MNT_NOWAIT)) == -1)
-		return (0);
-	if (bufsize > 0 &&
-	    (mntsize = __compat_getfsstat(mntbuf, (long)bufsize, flags)) == -1)
-		return (0);
-	while (bufsize <= mntsize * sizeof(struct statfs12)) {
-		if (mntbuf)
-			free(mntbuf);
-		bufsize = (mntsize + 1) * sizeof(struct statfs12);
-		if ((mntbuf = malloc(bufsize)) == NULL)
-			return (0);
-		if ((mntsize = __compat_getfsstat(mntbuf, (long)bufsize,
-		    flags)) == -1)
-			return (0);
-	}
-	*mntbufp = mntbuf;
-	return (mntsize);
-}
diff --git a/lib/libc/compat/gen/compat_getpwent.c b/lib/libc/compat/gen/compat_getpwent.c
deleted file mode 100644
index 886f49545..000000000
--- a/lib/libc/compat/gen/compat_getpwent.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*	$NetBSD: compat_getpwent.c,v 1.3 2009/06/01 06:04:37 yamt Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_getpwent.c,v 1.3 2009/06/01 06:04:37 yamt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <stdint.h>
-#include <stdlib.h>
-#include <pwd.h>
-#include <compat/include/pwd.h>
-
-__warn_references(getpwuid,
-    "warning: reference to compatibility getpwuid(); include <pwd.h> to generate correct reference")
-__warn_references(getpwnam,
-    "warning: reference to compatibility getpwnam(); include <pwd.h> to generate correct reference")
-__warn_references(getpwnam_r,
-    "warning: reference to compatibility getpwnam_r(); include <pwd.h> to generate correct reference")
-__warn_references(getpwuid_r,
-    "warning: reference to compatibility getpwuid_r(); include <pwd.h> to generate correct reference")
-__warn_references(getpwent,
-    "warning: reference to compatibility getpwent(); include <pwd.h> to generate correct reference")
-#ifdef notdef /* for libutil */
-__warn_references(pw_scan,
-    "warning: reference to compatibility pw_scan(); include <pwd.h> to generate correct reference")
-#endif
-__warn_references(getpwent_r,
-    "warning: reference to compatibility getpwent_r(); include <pwd.h> to generate correct reference")
-__warn_references(pwcache_userdb,
-    "warning: reference to compatibility pwcache_userdb(); include <pwd.h> to generate correct reference")
-
-#ifdef __weak_alias
-__weak_alias(getpwent, _getpwent)
-__weak_alias(getpwent_r, _getpwent_r)
-__weak_alias(getpwuid, _getpwuid)
-__weak_alias(getpwuid_r, _getpwuid_r)
-__weak_alias(getpwnam, _getpwnam)
-__weak_alias(getpwnam_r, _getpwnam_r)
-__weak_alias(pwcache_userdb, _pwcache_userdb)
-#endif
-
-static struct passwd50 *
-cvt(struct passwd *p)
-{
-	struct passwd50 *q = (void *)p;
-
-	if (q == NULL) {
-		return NULL;
-	}
-	q->pw_change = (int32_t)p->pw_change;
-	q->pw_class = p->pw_class;
-	q->pw_gecos = p->pw_gecos;
-	q->pw_dir = p->pw_dir;
-	q->pw_shell = p->pw_shell;
-	q->pw_expire = (int32_t)p->pw_expire;
-	return q;
-}
-
-struct passwd50	*
-getpwuid(uid_t uid)
-{
-	return cvt(__getpwuid50(uid));
-
-}
-
-struct passwd50	*
-getpwnam(const char *name)
-{
-	return cvt(__getpwnam50(name));
-}
-
-int
-getpwnam_r(const char *name , struct passwd50 *p, char *buf, size_t len,
-    struct passwd50 **q)
-{
-	struct passwd px, *qx;
-	int rv = __getpwnam_r50(name, &px, buf, len, &qx);
-	*q = p;
-	passwd_to_passwd50(&px, p);
-	return rv;
-}
-
-int
-getpwuid_r(uid_t uid, struct passwd50 *p, char *buf, size_t len,
-    struct passwd50 **q)
-{
-	struct passwd px, *qx;
-	int rv = __getpwuid_r50(uid, &px, buf, len, &qx);
-	*q = p;
-	passwd_to_passwd50(&px, p);
-	return rv;
-}
-
-struct passwd50	*
-getpwent(void)
-{
-	return cvt(__getpwent50());
-}
-
-#ifdef notdef /* for libutil */
-int
-pw_scan(char *buf, struct passwd50 *p, int *flags)
-{
-	struct passwd px;
-	int rv = __pw_scan50(buf, &px, flags);
-	passwd_to_passwd50(&px, p);
-	return rv;
-}
-#endif
-
-int
-getpwent_r(struct passwd50 *p, char *buf, size_t len, struct passwd50 **q)
-{
-	struct passwd px, *qx;
-	int rv = __getpwent_r50(&px, buf, len, &qx);
-	*q = p;
-	passwd_to_passwd50(&px, p);
-	return rv;
-}
-
-static struct passwd50 * (*__getpwnamf)(const char *);
-static struct passwd50 * (*__getpwuidf)(uid_t);
-static struct passwd pw;
-
-static struct passwd *
-internal_getpwnam(const char *name)
-{
-	struct passwd50 *p = (*__getpwnamf)(name);
-	passwd50_to_passwd(p, &pw);
-	return &pw;
-}
-
-static struct passwd *
-internal_getpwuid(uid_t uid)
-{
-	struct passwd50 *p = (*__getpwuidf)(uid);
-	passwd50_to_passwd(p, &pw);
-	return &pw;
-}
-
-int pwcache_userdb(int (*setpassentf)(int), void (*endpwentf)(void),
-    struct passwd50 * (*getpwnamf)(const char *),
-    struct passwd50 * (*getpwuidf)(uid_t))
-{
-	__getpwnamf = getpwnamf;
-	__getpwuidf = getpwuidf;
-	return __pwcache_userdb50(setpassentf, endpwentf, internal_getpwnam,
-	    internal_getpwuid);
-}
diff --git a/lib/libc/compat/gen/compat_glob.c b/lib/libc/compat/gen/compat_glob.c
deleted file mode 100644
index 629e40044..000000000
--- a/lib/libc/compat/gen/compat_glob.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: compat_glob.c,v 1.4 2013/10/04 21:07:37 christos Exp $	*/
-
-/*
- * Written by Jason R. Thorpe <thorpej@NetBSD.org>, October 21, 1997.
- * Public domain.
- */
-#include "namespace.h"
-#include <pwd.h>
-#define __LIBC12_SOURCE__
-
-#include <sys/stat.h>
-#include <compat/sys/time.h>
-#include <compat/sys/stat.h>
-#include <dirent.h>
-#include <compat/include/dirent.h>
-#define __gl_stat_t struct stat12
-
-#include <glob.h>
-#include <compat/include/glob.h>
-
-#ifdef __weak_alias
-__weak_alias(glob,_glob)
-__weak_alias(globfree,_globfree)
-#endif /* __weak_alias */
-
-__warn_references(glob,
-    "warning: reference to compatibility glob(); include <glob.h> for correct reference")
-__warn_references(globfree,
-    "warning: reference to compatibility globfree(); include <glob.h> for correct reference")
-
-#define stat __compat_stat
-#define lstat __compat_lstat
-#define fstat __compat_fstat
-
-#include "gen/glob.c"
diff --git a/lib/libc/compat/gen/compat_lastlogx.c b/lib/libc/compat/gen/compat_lastlogx.c
deleted file mode 100644
index 8d1af36c2..000000000
--- a/lib/libc/compat/gen/compat_lastlogx.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*	$NetBSD: compat_lastlogx.c,v 1.2 2009/01/11 02:46:25 christos Exp $	 */
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_lastlogx.c,v 1.2 2009/01/11 02:46:25 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-
-#include <assert.h>
-#include <db.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <utmp.h>
-/* don't define earlier, has side effects in fcntl.h */
-#define __LIBC12_SOURCE__
-#include <utmpx.h>
-#include <compat/include/utmpx.h>
-
-__warn_references(getlastlogx,
-    "warning: reference to compatibility getlastlogx(); include <utmpx.h> for correct reference")
-__warn_references(lastlogxname,
-    "warning: reference to deprecated lastlogxname()")
-
-static char llfile[MAXPATHLEN] = _PATH_LASTLOGX;
-
-int
-lastlogxname(const char *fname)
-{
-	size_t len;
-
-	_DIAGASSERT(fname != NULL);
-
-	len = strlen(fname);
-
-	if (len >= sizeof(llfile))
-		return 0;
-
-	/* must end in x! */
-	if (fname[len - 1] != 'x')
-		return 0;
-
-	(void)strlcpy(llfile, fname, sizeof(llfile));
-	return 1;
-}
-
-struct lastlogx *
-getlastlogx(uid_t uid, struct lastlogx *ll)
-{
-
-	return __getlastlogx13(llfile, uid, ll);
-}
diff --git a/lib/libc/compat/gen/compat_ldexp_ieee754.c b/lib/libc/compat/gen/compat_ldexp_ieee754.c
deleted file mode 100644
index a21d385e2..000000000
--- a/lib/libc/compat/gen/compat_ldexp_ieee754.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/* $NetBSD: compat_ldexp_ieee754.c,v 1.5 2010/04/23 19:04:54 drochner Exp $ */
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_ldexp_ieee754.c,v 1.5 2010/04/23 19:04:54 drochner Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <machine/ieee.h>
-#include <errno.h>
-
-double ldexp(double, int);
-
-/*
- * Multiply the given value by 2^expon.
- */
-double
-ldexp(double val, int expon)
-{
-	int oldexp, newexp;
-	union ieee_double_u u, mul;
-
-	u.dblu_d = val;
-	oldexp = u.dblu_dbl.dbl_exp;
-
-	/*
-	 * If input is zero, Inf or NaN, just return it.
-	 */
-	if (u.dblu_d == 0.0 || oldexp == DBL_EXP_INFNAN)
-		return (val);
-
-	if (oldexp == 0) {
-		/*
-		 * u.v is denormal.  We must adjust it so that the exponent
-		 * arithmetic below will work.
-		 */
-		if (expon <= DBL_EXP_BIAS) {
-			/*
-			 * Optimization: if the scaling can be done in a single
-			 * multiply, or underflows, just do it now.
-			 */
-			if (expon <= -DBL_FRACBITS) {
-				errno = ERANGE;
-				return (val < 0.0 ? -0.0 : 0.0);
-			}
-			mul.dblu_d = 0.0;
-			mul.dblu_dbl.dbl_exp = expon + DBL_EXP_BIAS;
-			u.dblu_d *= mul.dblu_d;
-			if (u.dblu_d == 0.0) {
-				errno = ERANGE;
-				return (val < 0.0 ? -0.0 : 0.0);
-			}
-			return (u.dblu_d);
-		} else {
-			/*
-			 * We know that expon is very large, and therefore the
-			 * result cannot be denormal (though it may be Inf).
-			 * Shift u.v by just enough to make it normal.
-			 */
-			mul.dblu_d = 0.0;
-			mul.dblu_dbl.dbl_exp = DBL_FRACBITS + DBL_EXP_BIAS;
-			u.dblu_d *= mul.dblu_d;
-			expon -= DBL_FRACBITS;
-			oldexp = u.dblu_dbl.dbl_exp;
-		}
-	}
-
-	/*
-	 * u.v is now normalized and oldexp has been adjusted if necessary.
-	 * Calculate the new exponent and check for underflow and overflow.
-	 */
-	newexp = oldexp + expon;
-
-	if (newexp <= 0) {
-		/*
-		 * The output number is either denormal or underflows (see
-		 * comments in machine/ieee.h).
-		 */
-		if (newexp <= -DBL_FRACBITS) {
-			errno = ERANGE;
-			return (val < 0.0 ? -0.0 : 0.0);
-		}
-		/*
-		 * Denormalize the result.  We do this with a multiply.  If
-		 * expon is very large, it won't fit in a double, so we have
-		 * to adjust the exponent first.  This is safe because we know
-		 * that u.v is normal at this point.
-		 */
-		if (expon <= -DBL_EXP_BIAS) {
-			u.dblu_dbl.dbl_exp = 1;
-			expon += oldexp - 1;
-		}
-		mul.dblu_d = 0.0;
-		mul.dblu_dbl.dbl_exp = expon + DBL_EXP_BIAS;
-		u.dblu_d *= mul.dblu_d;
-		return (u.dblu_d);
-	} else if (newexp >= DBL_EXP_INFNAN) {
-		/*
-		 * The result overflowed; return +/-Inf.
-		 */
-		u.dblu_dbl.dbl_exp = DBL_EXP_INFNAN;
-		u.dblu_dbl.dbl_frach = 0;
-		u.dblu_dbl.dbl_fracl = 0;
-		errno = ERANGE;
-		return (u.dblu_d);
-	} else {
-		/*
-		 * The result is normal; just replace the old exponent with the
-		 * new one.
-		 */
-		u.dblu_dbl.dbl_exp = newexp;
-		return (u.dblu_d);
-	}
-}
diff --git a/lib/libc/compat/gen/compat_modf_ieee754.c b/lib/libc/compat/gen/compat_modf_ieee754.c
deleted file mode 100644
index 660697d6f..000000000
--- a/lib/libc/compat/gen/compat_modf_ieee754.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* $NetBSD: compat_modf_ieee754.c,v 1.4 2010/04/23 19:04:54 drochner 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 <machine/ieee.h>
-#include <errno.h>
-
-double modf(double, double *);
-
-/*
- * double modf(double val, double *iptr)
- * returns: f and i such that |f| < 1.0, (f + i) = val, and
- *	sign(f) == sign(i) == sign(val).
- *
- * Beware signedness when doing subtraction, and also operand size!
- */
-double
-modf(double val, double *iptr)
-{
-	union ieee_double_u u, v;
-	u_int64_t frac;
-
-	/*
-	 * If input is +/-Inf or NaN, return +/-0 or NaN.
-	 */
-	u.dblu_d = val;
-	if (u.dblu_dbl.dbl_exp == DBL_EXP_INFNAN) {
-		*iptr = u.dblu_d;
-		return (0.0 / u.dblu_d);
-	}
-
-	/*
-	 * If input can't have a fractional part, return
-	 * (appropriately signed) zero, and make i be the input.
-	 */
-	if ((int)u.dblu_dbl.dbl_exp - DBL_EXP_BIAS > DBL_FRACBITS - 1) {
-		*iptr = u.dblu_d;
-		v.dblu_d = 0.0;
-		v.dblu_dbl.dbl_sign = u.dblu_dbl.dbl_sign;
-		return (v.dblu_d);
-	}
-
-	/*
-	 * If |input| < 1.0, return it, and set i to the appropriately
-	 * signed zero.
-	 */
-	if (u.dblu_dbl.dbl_exp < DBL_EXP_BIAS) {
-		v.dblu_d = 0.0;
-		v.dblu_dbl.dbl_sign = u.dblu_dbl.dbl_sign;
-		*iptr = v.dblu_d;
-		return (u.dblu_d);
-	}
-
-	/*
-	 * There can be a fractional part of the input.
-	 * If you look at the math involved for a few seconds, it's
-	 * plain to see that the integral part is the input, with the
-	 * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed,
-	 * the fractional part is the part with the rest of the
-	 * bits zeroed.  Just zeroing the high bits to get the
-	 * fractional part would yield a fraction in need of
-	 * normalization.  Therefore, we take the easy way out, and
-	 * just use subtraction to get the fractional part.
-	 */
-	v.dblu_d = u.dblu_d;
-	/* Zero the low bits of the fraction, the sleazy way. */
-	frac = ((u_int64_t)v.dblu_dbl.dbl_frach << 32) + v.dblu_dbl.dbl_fracl;
-	frac >>= DBL_FRACBITS - (u.dblu_dbl.dbl_exp - DBL_EXP_BIAS);
-	frac <<= DBL_FRACBITS - (u.dblu_dbl.dbl_exp - DBL_EXP_BIAS);
-	v.dblu_dbl.dbl_fracl = (unsigned int)frac & 0xffffffff;
-	v.dblu_dbl.dbl_frach = (unsigned int)(frac >> 32);
-	*iptr = v.dblu_d;
-
-	u.dblu_d -= v.dblu_d;
-	u.dblu_dbl.dbl_sign = v.dblu_dbl.dbl_sign;
-	return (u.dblu_d);
-}
diff --git a/lib/libc/compat/gen/compat_opendir.c b/lib/libc/compat/gen/compat_opendir.c
deleted file mode 100644
index 24eaef0b8..000000000
--- a/lib/libc/compat/gen/compat_opendir.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*	$NetBSD: compat_opendir.c,v 1.1 2005/09/13 01:44:09 christos Exp $	*/
-
-#include "namespace.h"
-#include <sys/stat.h>
-#include <signal.h>
-
-#define __LIBC12_SOURCE__
-#include <dirent.h>
-#include <compat/include/dirent.h>
-
-#ifdef __weak_alias
-__weak_alias(opendir,_opendir)
-#endif
-
-#ifdef __warn_references
-__warn_references(opendir,
-    "warning: reference to compatibility opendir(); include <dirent.h> for correct reference")
-__warn_references(__opendir2,
-    "warning: reference to compatibility __opendir2(); include <dirent.h> for correct reference")
-#endif
-
-#define dirent dirent12
-
-#include "gen/opendir.c"
diff --git a/lib/libc/compat/gen/compat_readdir.c b/lib/libc/compat/gen/compat_readdir.c
deleted file mode 100644
index 72d524377..000000000
--- a/lib/libc/compat/gen/compat_readdir.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: compat_readdir.c,v 1.3 2012/02/08 12:10:17 mbalmer Exp $	*/
-
-#define __LIBC12_SOURCE__
-#include "namespace.h"
-#include <sys/param.h>
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
-#include <limits.h>
-#include <compat/include/dirent.h>
-
-#ifdef __weak_alias
-__weak_alias(readdir,_readdir)
-__weak_alias(readdir_r,_readdir_r)
-#endif
-
-#ifdef __warn_references
-__warn_references(readdir,
-    "warning: reference to compatibility readdir(); include <dirent.h> for correct reference")
-__warn_references(readdir_r,
-    "warning: reference to compatibility readdir_r(); include <dirent.h> for correct reference")
-#endif
-
-static struct dirent12 *
-direnttodirent12(struct dirent12 *d12, const struct dirent *d)
-{
-	if (d == NULL)
-		return NULL;
-
-	if (d->d_fileno > UINT_MAX || d->d_namlen >= sizeof(d12->d_name)) {
-		errno = ERANGE;
-		return NULL;
-	}
-	d12->d_fileno = (uint32_t)d->d_fileno;
-	d12->d_reclen = (uint16_t)d->d_reclen;
-	d12->d_namlen = (uint8_t)MIN(d->d_namlen, sizeof(d->d_name) - 1);
-	d12->d_type = (uint8_t)d->d_type;
-	memcpy(d12->d_name, d->d_name, (size_t)d12->d_namlen);
-	d12->d_name[d12->d_namlen] = '\0';
-	return d12;
-}
-
-struct dirent12 *
-readdir(DIR *dirp)
-{
-	static struct dirent12 d12;
-	return direnttodirent12(&d12, __readdir30(dirp));
-}
-
-int
-readdir_r(DIR *dirp, struct dirent12 *entry, struct dirent12 **result)
-{
-	int error;
-	struct dirent e, *ep;
-
-	if ((error = __readdir_r30(dirp, &e, &ep)) != 0)
-		return error;
-
-	*result = entry;
-	(void)direnttodirent12(entry, &e);
-	return 0;
-}
diff --git a/lib/libc/compat/gen/compat_scandir.c b/lib/libc/compat/gen/compat_scandir.c
deleted file mode 100644
index 7aac0f257..000000000
--- a/lib/libc/compat/gen/compat_scandir.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*	$NetBSD: compat_scandir.c,v 1.1 2005/09/13 01:44:09 christos Exp $	*/
-
-#include <sys/stat.h>
-#define __LIBC12_SOURCE__
-#include "namespace.h"
-#include <dirent.h>
-#include <compat/include/dirent.h>
-
-#ifdef __weak_alias
-__weak_alias(scandir,_scandir)
-#endif
-
-#ifdef __warn_references
-__warn_references(scandir,
-    "warning: reference to compatibility scandir(); include <dirent.h> for correct reference")
-#endif
-
-#define dirent dirent12
-
-#include "gen/scandir.c"
diff --git a/lib/libc/compat/gen/compat_siglist.c b/lib/libc/compat/gen/compat_siglist.c
deleted file mode 100644
index 0627f4486..000000000
--- a/lib/libc/compat/gen/compat_siglist.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: compat_siglist.c,v 1.1 2005/09/13 01:44:09 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)siglist.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: compat_siglist.c,v 1.1 2005/09/13 01:44:09 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __weak_alias
-__weak_alias(sys_siglist, _sys_siglist)
-__weak_alias(__sys_siglist, _sys_siglist)
-#endif
-
-const char *const _sys_siglist[] = {
-	"Signal 0",
-	"Hangup",			/* SIGHUP */
-	"Interrupt",			/* SIGINT */
-	"Quit",				/* SIGQUIT */
-	"Illegal instruction",		/* SIGILL */
-	"Trace/BPT trap",		/* SIGTRAP */
-	"Abort trap",			/* SIGABRT */
-	"EMT trap",			/* SIGEMT */
-	"Floating point exception",	/* SIGFPE */
-	"Killed",			/* SIGKILL */
-	"Bus error",			/* SIGBUS */
-	"Segmentation fault",		/* SIGSEGV */
-	"Bad system call",		/* SIGSYS */
-	"Broken pipe",			/* SIGPIPE */
-	"Alarm clock",			/* SIGALRM */
-	"Terminated",			/* SIGTERM */
-	"Urgent I/O condition",		/* SIGURG */
-	"Suspended (signal)",		/* SIGSTOP */
-	"Suspended",			/* SIGTSTP */
-	"Continued",			/* SIGCONT */
-	"Child exited",			/* SIGCHLD */
-	"Stopped (tty input)",		/* SIGTTIN */
-	"Stopped (tty output)",		/* SIGTTOU */
-	"I/O possible",			/* SIGIO */
-	"Cputime limit exceeded",	/* SIGXCPU */
-	"Filesize limit exceeded",	/* SIGXFSZ */
-	"Virtual timer expired",	/* SIGVTALRM */
-	"Profiling timer expired",	/* SIGPROF */
-	"Window size changes",		/* SIGWINCH */
-	"Information request",		/* SIGINFO */
-	"User defined signal 1",	/* SIGUSR1 */
-	"User defined signal 2"		/* SIGUSR2 */
-};
diff --git a/lib/libc/compat/gen/compat_signame.c b/lib/libc/compat/gen/compat_signame.c
deleted file mode 100644
index b2dcddc67..000000000
--- a/lib/libc/compat/gen/compat_signame.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: compat_signame.c,v 1.1 2005/09/13 01:44:09 christos Exp $	*/
-
-/*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "from: @(#)siglist.c	5.6 (Berkeley) 2/23/91";*/
-#else
-__RCSID("$NetBSD: compat_signame.c,v 1.1 2005/09/13 01:44:09 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-__warn_references(sys_signame,
-    "warning: reference to compatibility sys_signame[]; include <signal.h> for correct reference")
-
-const char *const sys_signame[] = {
-	"Signal 0",	/* 0 */
-	"HUP",		/* 1 SIGHUP */
-	"INT",		/* 2 SIGINT */
-	"QUIT",		/* 3 SIGQUIT */
-	"ILL",		/* 4 SIGILL */
-	"TRAP",		/* 5 SIGTRAP */
-	"ABRT",		/* 6 SIGABRT */
-	"EMT",		/* 7 SIGEMT */
-	"FPE",		/* 8 SIGFPE */
-	"KILL",		/* 9 SIGKILL */
-	"BUS",		/* 10 SIGBUS */
-	"SEGV",		/* 11 SIGSEGV */
-	"SYS",		/* 12 SIGSYS */
-	"PIPE",		/* 13 SIGPIPE */
-	"ALRM",		/* 14 SIGALRM */
-	"TERM",		/* 15 SIGTERM */
-	"URG",		/* 16 SIGURG */
-	"STOP",		/* 17 SIGSTOP */
-	"TSTP",		/* 18 SIGTSTP */
-	"CONT",		/* 19 SIGCONT */
-	"CHLD",		/* 20 SIGCHLD */
-	"TTIN",		/* 21 SIGTTIN */
-	"TTOU",		/* 22 SIGTTOU */
-	"IO",		/* 23 SIGIO */
-	"XCPU",		/* 24 SIGXCPU */
-	"XFSZ",		/* 25 SIGXFSZ */
-	"VTALRM",	/* 26 SIGVTALRM */
-	"PROF",		/* 27 SIGPROF */
-	"WINCH",	/* 28 SIGWINCH */
-	"INFO",		/* 29 SIGINFO */
-	"USR1",		/* 30 SIGUSR1 */
-	"USR2",		/* 31 SIGUSR2 */
-};
diff --git a/lib/libc/compat/gen/compat_sigsetops.c b/lib/libc/compat/gen/compat_sigsetops.c
deleted file mode 100644
index f7911b11e..000000000
--- a/lib/libc/compat/gen/compat_sigsetops.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*	$NetBSD: compat_sigsetops.c,v 1.3 2012/03/20 17:05:59 matt Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sigsetops.c	8.1 (Berkeley) 6/4/93
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)sigsetops.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: compat_sigsetops.c,v 1.3 2012/03/20 17:05:59 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#define	__LIBC12_SOURCE__
-
-#include <errno.h>
-#include <sys/time.h>
-#include <compat/sys/time.h>
-#include <signal.h>
-#include <compat/include/signal.h>
-
-#undef sigemptyset
-#undef sigfillset
-#undef sigaddset
-#undef sigdelset
-#undef sigismember
-
-__warn_references(sigaddset,
-    "warning: reference to compatibility sigaddset(); include <signal.h> for correct reference")
-__warn_references(sigdelset,
-    "warning: reference to compatibility sigdelset(); include <signal.h> for correct reference")
-__warn_references(sigemptyset,
-    "warning: reference to compatibility sigemptyset(); include <signal.h> for correct reference")
-__warn_references(sigfillset,
-    "warning: reference to compatibility sigfillset(); include <signal.h> for correct reference")
-__warn_references(sigismember,
-    "warning: reference to compatibility sigismember(); include <signal.h> for correct reference")
-
-int
-sigemptyset(sigset13_t *set)
-{
-	*set = 0;
-	return (0);
-}
-
-int
-sigfillset(sigset13_t *set)
-{
-	*set = ~(sigset13_t)0;
-	return (0);
-}
-
-int
-sigaddset(sigset13_t *set, int signo)
-{
-	if (signo <= 0 || signo >= NSIG13) {
-		errno = EINVAL;
-		return -1;
-	}
-	*set |= __sigmask13(signo);
-	return (0);
-}
-
-int
-sigdelset(sigset13_t *set, int signo)
-{
-	if (signo <= 0 || signo >= NSIG13) {
-		errno = EINVAL;
-		return -1;
-	}
-	*set &= ~__sigmask13(signo);
-	return (0);
-}
-
-int
-sigismember(const sigset13_t *set, int signo)
-{
-	if (signo <= 0 || signo >= NSIG13) {
-		errno = EINVAL;
-		return -1;
-	}
-	return ((*set & __sigmask13(signo)) != 0);
-}
diff --git a/lib/libc/compat/gen/compat_syslog.c b/lib/libc/compat/gen/compat_syslog.c
deleted file mode 100644
index e653463d4..000000000
--- a/lib/libc/compat/gen/compat_syslog.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*	$NetBSD: compat_syslog.c,v 1.2 2012/10/11 17:09:55 christos Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "namespace.h"
-#include <sys/cdefs.h>
-
-#define	__LIBC12_SOURCE__
-#include <stdarg.h>
-
-#include <sys/types.h>
-#include <sys/syslog.h>
-#include <compat/sys/syslog.h>
-
-void	syslog_ss(int, struct syslog_data60 *, const char *, ...)
-    __printflike(3, 4);
-void    vsyslog_ss(int, struct syslog_data60 *, const char *, va_list) 
-    __printflike(3, 0); 
-void	syslogp_ss(int, struct syslog_data60 *, const char *, const char *, 
-    const char *, ...) __printflike(5, 0);
-void	vsyslogp_ss(int, struct syslog_data60 *, const char *, const char *, 
-    const char *, va_list) __printflike(5, 0);
-
-#ifdef __weak_alias
-__weak_alias(closelog_r,_closelog_r)
-__weak_alias(openlog_r,_openlog_r)
-__weak_alias(setlogmask_r,_setlogmask_r)
-__weak_alias(syslog_r,_syslog_r)
-__weak_alias(vsyslog_r,_vsyslog_r)
-__weak_alias(syslogp_r,_syslogp_r)
-__weak_alias(vsyslogp_r,_vsyslogp_r)
-
-__weak_alias(syslog_ss,_syslog_ss)
-__weak_alias(vsyslog_ss,_vsyslog_ss)
-__weak_alias(syslogp_ss,_syslogp_ss)
-__weak_alias(vsyslogp_ss,_vsyslogp_ss)
-#endif /* __weak_alias */
-
-__warn_references(closelog_r,
-    "warning: reference to compatibility closelog_r();"
-    " include <sys/syslog.h> for correct reference")
-__warn_references(openlog_r,
-    "warning: reference to compatibility openlog_r();"
-    " include <sys/syslog.h> for correct reference")
-__warn_references(setlogmask_r,
-    "warning: reference to compatibility setlogmask_r();"
-    " include <sys/syslog.h> for correct reference")
-__warn_references(syslog_r,
-    "warning: reference to compatibility syslog_r();"
-    " include <sys/syslog.h> for correct reference")
-__warn_references(vsyslog_r,
-    "warning: reference to compatibility vsyslog_r();"
-    " include <sys/syslog.h> for correct reference")
-__warn_references(syslogp_r,
-    "warning: reference to compatibility syslogp_r();"
-    " include <sys/syslog.h> for correct reference")
-__warn_references(vsyslogp_r,
-    "warning: reference to compatibility vsyslogp_r();"
-    " include <sys/syslog.h> for correct reference")
-
-static void
-syslog_data_convert(struct syslog_data *d, const struct syslog_data60 *s)
-{
-	d->log_file = s->log_file;
-	d->log_connected = s->connected;
-	d->log_opened = s->opened;
-	d->log_stat = s->log_stat;
-	d->log_tag = s->log_tag;
-	d->log_fac = s->log_fac;
-	d->log_mask = s->log_mask;
-}
-
-void
-closelog_r(struct syslog_data60 *data60)
-{
-	struct syslog_data data = SYSLOG_DATA_INIT;
-	syslog_data_convert(&data, data60);
-	__closelog_r60(&data);
-}
-
-void
-openlog_r(const char *ident, int logstat, int logfac,
-    struct syslog_data60 *data60)
-{
-	struct syslog_data data = SYSLOG_DATA_INIT;
-	syslog_data_convert(&data, data60);
-	__openlog_r60(ident, logstat, logfac, &data);
-}
-
-int
-setlogmask_r(int pmask, struct syslog_data60 *data60)
-{
-	struct syslog_data data = SYSLOG_DATA_INIT;
-	syslog_data_convert(&data, data60);
-	return __setlogmask_r60(pmask, &data);
-}
-
-void
-syslog_r(int pri, struct syslog_data60 *data60, const char *fmt, ...)
-{
-	va_list ap;
-	struct syslog_data data = SYSLOG_DATA_INIT;
-	syslog_data_convert(&data, data60);
-
-	va_start(ap, fmt);
-	__vsyslog_r60(pri, &data, fmt, ap);
-	va_end(ap);
-}
-
-void
-vsyslog_r(int pri, struct syslog_data60 *data60, const char *fmt, __va_list ap)
-{
-	struct syslog_data data = SYSLOG_DATA_INIT;
-	syslog_data_convert(&data, data60);
-	__vsyslog_r60(pri, &data, fmt, ap);
-}
-
-void
-syslogp_r(int pri, struct syslog_data60 *data60, const char *msgid,
-    const char *sdfmt, const char *msgfmt, ...)
-{
-	va_list ap;
-	struct syslog_data data = SYSLOG_DATA_INIT;
-	syslog_data_convert(&data, data60);
-
-	va_start(ap, msgfmt);
-	__vsyslogp_r60(pri, &data, msgid, sdfmt, msgfmt, ap);
-	va_end(ap);
-}
-
-void
-vsyslogp_r(int pri, struct syslog_data60 *data60, const char *msgid,
-    const char *sdfmt, const char *msgfmt, __va_list ap)
-{
-	struct syslog_data data = SYSLOG_DATA_INIT;
-	syslog_data_convert(&data, data60);
-
-	__vsyslogp_r60(pri, &data, msgid, sdfmt, msgfmt, ap);
-}
-
-/*
- * These are semi-private
- */
-#define LOG_SIGNAL_SAFE (int)0x80000000
-
-void
-syslog_ss(int pri, struct syslog_data60 *data, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vsyslog_r(pri | LOG_SIGNAL_SAFE, data, fmt, ap);
-	va_end(ap);
-}
-
-void
-syslogp_ss(int pri, struct syslog_data60 *data, const char *msgid,
-    const char *sdfmt, const char *msgfmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, msgfmt);
-	vsyslogp_r(pri | LOG_SIGNAL_SAFE, data, msgid, sdfmt, msgfmt, ap);
-	va_end(ap);
-}
-
-void
-vsyslog_ss(int pri, struct syslog_data60 *data, const char *fmt, va_list ap)
-{
-	vsyslog_r(pri | LOG_SIGNAL_SAFE, data, fmt, ap);
-}
-
-void
-vsyslogp_ss(int pri, struct syslog_data60 *data, const char *msgid,
-    const char *sdfmt, const char *msgfmt, va_list ap)
-{
-	vsyslogp_r(pri | LOG_SIGNAL_SAFE, data, msgid, sdfmt, msgfmt, ap);
-}
diff --git a/lib/libc/compat/gen/compat_time.c b/lib/libc/compat/gen/compat_time.c
deleted file mode 100644
index 7bb93e57c..000000000
--- a/lib/libc/compat/gen/compat_time.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*	$NetBSD: compat_time.c,v 1.4 2013/10/04 21:07:37 christos Exp $	*/
-
-/*
- * Written by Jason R. Thorpe <thorpej@NetBSD.org>, October 21, 1997.
- * Public domain.
- */
-
-#include "namespace.h"
-#include <sys/cdefs.h>
-
-#define __LIBC12_SOURCE__
-#include <time.h>
-#include <sys/time.h>
-#include <compat/include/time.h>
-#include <compat/sys/time.h>
-
-#ifdef __weak_alias
-__weak_alias(time,_time)
-#endif
-
-__warn_references(time,
-    "warning: reference to compatibility time();"
-    " include <time.h> for correct reference")
-
-#define timeval timeval50
-#define time_t int32_t
-
-#define gettimeofday __compat_gettimeofday
-
-#include "gen/time.c"
diff --git a/lib/libc/compat/gen/compat_times.c b/lib/libc/compat/gen/compat_times.c
deleted file mode 100644
index 6d11b55de..000000000
--- a/lib/libc/compat/gen/compat_times.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*	$NetBSD: compat_times.c,v 1.4 2013/10/04 21:07:37 christos Exp $	*/
-
-/*
- * Ben Harris, 2002.
- * This file is in the Public Domain.
- */
-
-#define __LIBC12_SOURCE__
-#include "namespace.h"
-#include <sys/cdefs.h>
-#include <time.h>
-#include <compat/include/time.h>
-#include <sys/times.h>
-#include <compat/sys/times.h>
-#include <sys/resource.h>
-#include <compat/sys/resource.h>
-
-#ifdef __weak_alias
-__weak_alias(times,_times)
-#endif
-
-__warn_references(times,
-    "warning: reference to compatibility times(); include <sys/times.h> for correct reference")
-
-#define __times_rusage struct rusage50
-#define __times_timeval struct timeval50
-
-#define getrusage __compat_getrusage
-#define gettimeofday __compat_gettimeofday
-
-#include "gen/times.c"
diff --git a/lib/libc/compat/gen/compat_timezone.c b/lib/libc/compat/gen/compat_timezone.c
deleted file mode 100644
index 5c6165211..000000000
--- a/lib/libc/compat/gen/compat_timezone.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*	$NetBSD: compat_timezone.c,v 1.4 2012/03/20 17:05:59 matt Exp $	*/
-
-/*
- * Copyright (c) 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)timezone.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: compat_timezone.c,v 1.4 2012/03/20 17:05:59 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <time.h>
-#include <compat/include/time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <tzfile.h>
-
-__warn_references(timezone,
-     "warning: reference to compatibility timezone; include <time.h> to generate correct reference")
-
-/*
- * timezone --
- *	The arguments are the number of minutes of time you are westward
- *	from Greenwich and whether DST is in effect.  It returns a string
- *	giving the name of the local timezone.  Should be replaced, in the
- *	application code, by a call to localtime.
- */
-
-char *_tztab(int, int);
-
-static char	czone[TZ_MAX_CHARS];		/* space for zone name */
-
-char *timezone(int, int);
-char *
-timezone(int zone, int dst)
-{
-	char	*beg,
-			*end;
-
-	if ((beg = getenv("TZNAME")) != NULL) {	/* set in environment */
-		if ((end = strchr(beg, ',')) != NULL) {	/* "PST,PDT" */
-			if (dst)
-				return(++end);
-			*end = '\0';
-			(void)strlcpy(czone, beg, sizeof(czone));
-			*end = ',';
-			return(czone);
-		}
-		return(beg);
-	}
-	return(_tztab(zone,dst));	/* default: table or created zone */
-}
-
-static const struct zone {
-	int		offset;
-	const char	*stdzone;
-	const char	*dlzone;
-} zonetab[] = {
-	{ -1*60,	"MET",	"MET DST" },	/* Middle European */
-	{ -2*60,	"EET",	"EET DST" },	/* Eastern European */
-	{ 4*60,		"AST",	"ADT" },	/* Atlantic */
-	{ 5*60,		"EST",	"EDT" },	/* Eastern */
-	{ 6*60,		"CST",	"CDT" },	/* Central */
-	{ 7*60,		"MST",	"MDT" },	/* Mountain */
-	{ 8*60,		"PST",	"PDT" },	/* Pacific */
-#ifdef notdef
-	/* there's no way to distinguish this from WET */
-	{ 0,		"GMT",	0 },		/* Greenwich */
-#endif
-	{ 0*60,		"WET",	"WET DST" },	/* Western European */
-	{ -10*60,	"EST",	"EST" },	/* Aust: Eastern */
-     	{ -10*60+30,	"CST",	"CST" },	/* Aust: Central */
- 	{ -8*60,	"WST",	0 },		/* Aust: Western */
-	{ -1,		NULL,	NULL }
-};
-
-/*
- * _tztab --
- *	check static tables or create a new zone name; broken out so that
- *	we can make a guess as to what the zone is if the standard tables
- *	aren't in place in /etc.  DO NOT USE THIS ROUTINE OUTSIDE OF THE
- *	STANDARD LIBRARY.
- */
-char *
-_tztab(int zone, int dst)
-{
-	const struct zone	*zp;
-	char	sign;
-
-	for (zp = zonetab; zp->offset != -1;++zp)	/* static tables */
-		if (zp->offset == zone) {
-			if (dst && zp->dlzone)
-				return __UNCONST(zp->dlzone);
-			if (!dst && zp->stdzone)
-				return __UNCONST(zp->stdzone);
-		}
-
-	if (zone < 0) {					/* create one */
-		zone = -zone;
-		sign = '+';
-	}
-	else
-		sign = '-';
-	(void)snprintf(czone, TZ_MAX_CHARS, "GMT%c%d:%02d", sign, zone / 60,
-	     zone % 60);
-	return(czone);
-}
diff --git a/lib/libc/compat/gen/compat_unvis.c b/lib/libc/compat/gen/compat_unvis.c
deleted file mode 100644
index fb529a59f..000000000
--- a/lib/libc/compat/gen/compat_unvis.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: compat_unvis.c,v 1.3 2011/03/12 19:52:47 christos Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: compat_unvis.c,v 1.3 2011/03/12 19:52:47 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <vis.h>
-#include <compat/include/vis.h>
-
-#ifdef __warn_references
-__warn_references(unvis,
-    "warning: reference to compatibility unvis(); include <vis.h> for correct reference")
-#endif
-
-int
-unvis(char *cp, int c, int *astate, int flag)
-{
-	flag = (flag & ~1) | ((flag & 1) ? UNVIS_END : 0);
-	return __unvis50(cp, c, astate, flag);
-}
diff --git a/lib/libc/compat/gen/compat_utime.c b/lib/libc/compat/gen/compat_utime.c
deleted file mode 100644
index 1c9c0e3e9..000000000
--- a/lib/libc/compat/gen/compat_utime.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: compat_utime.c,v 1.2 2009/01/11 02:46:25 christos Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)utime.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: compat_utime.c,v 1.2 2009/01/11 02:46:25 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <utime.h>
-#include <compat/include/utime.h>
-#include <sys/time.h>
-#include <compat/sys/time.h>
-
-__warn_references(utime,
-    "warning: reference to compatibility utime(); include <utime.h> to generate correct reference")
-
-#ifdef __weak_alias
-__weak_alias(utime, _utime)
-#endif
-
-int
-utime(const char *path, const struct utimbuf50 *times50)
-{
-	struct timeval tv[2], *tvp;
-
-	_DIAGASSERT(path != NULL);
-
-	if (times50 == NULL)
-		tvp = NULL;
-	else {
-		tv[0].tv_sec = times50->actime;
-		tv[1].tv_sec = times50->modtime;
-		tv[0].tv_usec = tv[1].tv_usec = 0;
-		tvp = tv;
-	}
-	return __utimes50(path, tvp);
-}
diff --git a/lib/libc/compat/gen/compat_utmp.c b/lib/libc/compat/gen/compat_utmp.c
deleted file mode 100644
index be986822e..000000000
--- a/lib/libc/compat/gen/compat_utmp.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: compat_utmp.c,v 1.2 2009/01/11 02:46:25 christos Exp $	 */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_utmp.c,v 1.2 2009/01/11 02:46:25 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-
-#define __LIBC12_SOURCE__
-#include <assert.h>
-#include <sys/time.h>
-#include <string.h>
-#include <compat/sys/time.h>
-#include <utmp.h>
-#include <compat/include/utmp.h>
-
-__warn_references(getutent,
-    "warning: reference to compatibility getutent(); include <utmp.h> for correct reference")
-
-static struct utmp50 *
-cvt(struct utmp *ut)
-{
-	struct utmp50 *ut50 = (void *)ut;
-	if (ut == NULL)
-		return NULL;
-	ut50->ut_time = (int32_t)ut->ut_time;
-	return ut50;
-}
-
-struct utmp50 *
-getutent(void)
-{
-	return cvt(__getutent50());
-}
diff --git a/lib/libc/compat/gen/compat_utmpx.c b/lib/libc/compat/gen/compat_utmpx.c
deleted file mode 100644
index ad3beb67f..000000000
--- a/lib/libc/compat/gen/compat_utmpx.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*	$NetBSD: compat_utmpx.c,v 1.4 2011/07/01 01:08:59 joerg Exp $	 */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_utmpx.c,v 1.4 2011/07/01 01:08:59 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-
-#define __LIBC12_SOURCE__
-#include <assert.h>
-#include <sys/time.h>
-#include <string.h>
-#include <compat/sys/time.h>
-#include <utmpx.h>
-#include <compat/include/utmpx.h>
-
-__warn_references(getutxent,
-    "warning: reference to compatibility getutxent(); include <utmpx.h> for correct reference")
-__warn_references(getutxid,
-    "warning: reference to compatibility getutxid(); include <utmpx.h> for correct reference")
-__warn_references(getutxline,
-    "warning: reference to compatibility getutxline(); include <utmpx.h> for correct reference")
-__warn_references(pututxline,
-    "warning: reference to compatibility pututxline(); include <utmpx.h> for correct reference")
-__warn_references(updwtmpx,
-    "warning: reference to compatibility updwtmpx(); include <utmpx.h> for correct reference")
-__warn_references(getlastlogx,
-    "warning: reference to compatibility getlastlogx(); include <utmpx.h> for correct reference")
-__warn_references(updlastlogx,
-    "warning: reference to compatibility updlastlogx(); include <utmpx.h> for correct reference")
-__warn_references(getutmp,
-    "warning: reference to compatibility getutmp(); include <utmpx.h> for correct reference")
-__warn_references(getutmpx,
-    "warning: reference to compatibility getutmpx(); include <utmpx.h> for correct reference")
-
-static struct utmpx50 *
-cvt(struct utmpx *ut)
-{
-	if (ut == NULL)
-		return NULL;
-	timeval_to_timeval50(&ut->ut_tv, (void *)&ut->ut_tv);
-	return (void *)ut;
-}
-
-static void
-lastlogx50_to_lastlogx(const struct lastlogx50 *ll50, struct lastlogx *ll)
-{
-	(void)memcpy(ll->ll_line, ll50->ll_line, sizeof(ll->ll_line));
-	(void)memcpy(ll->ll_host, ll50->ll_host, sizeof(ll->ll_host));
-	(void)memcpy(&ll->ll_ss, &ll50->ll_ss, sizeof(ll->ll_ss));
-	timeval50_to_timeval(&ll50->ll_tv, &ll->ll_tv);
-}
-
-static void
-lastlogx_to_lastlogx50(const struct lastlogx *ll, struct lastlogx50 *ll50)
-{
-	(void)memcpy(ll50->ll_line, ll->ll_line, sizeof(ll50->ll_line));
-	(void)memcpy(ll50->ll_host, ll->ll_host, sizeof(ll50->ll_host));
-	(void)memcpy(&ll50->ll_ss, &ll->ll_ss, sizeof(ll50->ll_ss));
-	timeval_to_timeval50(&ll->ll_tv, &ll50->ll_tv);
-}
-
-struct utmpx50 *
-getutxent(void)
-{
-	return cvt(__getutxent50());
-}
-
-struct utmpx50 *
-getutxid(const struct utmpx50 *ut50)
-{
-	struct utmpx ut;
-	utmpx50_to_utmpx(ut50, &ut);
-	return cvt(__getutxid50(&ut));
-}
-
-struct utmpx50 *
-getutxline(const struct utmpx50 *ut50)
-{
-	struct utmpx ut;
-	utmpx50_to_utmpx(ut50, &ut);
-	return cvt(__getutxline50(&ut));
-}
-
-struct utmpx50 *
-pututxline(const struct utmpx50 *ut50)
-{
-	struct utmpx ut;
-	utmpx50_to_utmpx(ut50, &ut);
-	return cvt(__pututxline50(&ut));
-}
-
-int
-updwtmpx(const char *fname, const struct utmpx50 *ut50)
-{
-	struct utmpx ut;
-	utmpx50_to_utmpx(ut50, &ut);
-	return __updwtmpx50(fname, &ut);
-}
-
-struct lastlogx50 *
-__getlastlogx13(const char *fname, uid_t uid, struct lastlogx50 *ll50)
-{
-	struct lastlogx ll;
-	if (__getlastlogx50(fname, uid, &ll) == NULL)
-		return NULL;
-	lastlogx_to_lastlogx50(&ll, ll50);
-	return ll50;
-}
-
-static char llfile[MAXPATHLEN] = _PATH_LASTLOGX;
-
-int
-lastlogxname(const char *fname)
-{
-	size_t len;
-
-	_DIAGASSERT(fname != NULL);
-
-	len = strlen(fname);
-
-	if (len >= sizeof(llfile))
-		return 0;
-
-	/* must end in x! */
-	if (fname[len - 1] != 'x')
-		return 0;
-
-	(void)strlcpy(llfile, fname, sizeof(llfile));
-	return 1;
-}
-
-struct lastlogx50 *
-getlastlogx(uid_t uid, struct lastlogx50 *ll)
-{
-
-	return __getlastlogx13(llfile, uid, ll);
-}
-
-int
-updlastlogx(const char *fname, uid_t uid, struct lastlogx50 *ll50)
-{
-	struct lastlogx ll;
-	lastlogx50_to_lastlogx(ll50, &ll);
-	return __updlastlogx50(fname, uid, &ll);
-}
-
-void
-getutmp(const struct utmpx50 *utx50, struct utmp *ut)
-{
-	struct utmpx utx;
-	utmpx50_to_utmpx(utx50, &utx);
-	__getutmp50(&utx, ut);
-}
-
-void
-getutmpx(const struct utmp *ut, struct utmpx50 *utx50)
-{
-	struct utmpx utx;
-	__getutmpx50(ut, &utx);
-	utmpx_to_utmpx50(&utx, utx50);
-}
diff --git a/lib/libc/compat/include/aio.h b/lib/libc/compat/include/aio.h
deleted file mode 100644
index 60d80ee20..000000000
--- a/lib/libc/compat/include/aio.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: aio.h,v 1.2 2009/01/11 02:46:25 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef	_COMPAT_AIO_H_
-#define	_COMPAT_AIO_H_
-
-__BEGIN_DECLS
-struct aiocb;
-struct timespec50;
-struct timespec;
-int	aio_suspend(const struct aiocb * const [], int,
-    const struct timespec50 *);
-int	__aio_suspend50(const struct aiocb * const [], int,
-    const struct timespec *);
-__END_DECLS
-
-#endif	/* _COMPAT_AIO_H_ */
diff --git a/lib/libc/compat/include/dirent.h b/lib/libc/compat/include/dirent.h
deleted file mode 100644
index f41fc32f9..000000000
--- a/lib/libc/compat/include/dirent.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*	$NetBSD: dirent.h,v 1.7 2009/02/24 18:42:36 christos Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)dirent.h	8.2 (Berkeley) 7/28/94
- */
-
-#ifndef _COMPAT_DIRENT_H_
-#define _COMPAT_DIRENT_H_
-
-#include <compat/sys/dirent.h>
-
-__BEGIN_DECLS
-
-DIR *opendir(const char *);
-DIR *__opendir30(const char *);
-
-int readdir_r(DIR *, struct dirent12 * __restrict,
-    struct dirent12 ** __restrict);
-int __readdir_r30(DIR * __restrict, struct dirent * __restrict,
-    struct dirent ** __restrict);
-
-struct dirent12 *readdir(DIR *);
-struct dirent *__readdir30(DIR *);
-
-#if defined(_NETBSD_SOURCE)
-
-struct dirent12 *_readdir_unlocked(DIR *, int);
-struct dirent *___readdir_unlocked50(DIR *, int);
-struct dirent *___readdir_unlocked30(DIR *);
-
-DIR *__opendir2(const char *, int);
-DIR *__opendir230(const char *, int);
-
-int scandir(const char *, struct dirent12 ***,
-    int (*)(const struct dirent12 *), int (*)(const void *, const void *));
-int __scandir30(const char *, struct dirent ***,
-    int (*)(const struct dirent *), int (*)(const void *, const void *));
-
-int getdents(int, char *, size_t);
-int __getdents30(int, char *, size_t);
-
-int alphasort(const void *, const void *);
-int __alphasort30(const void *, const void *);
-
-int getdirentries(int, char *, int, long *);
-
-#endif /* defined(_NETBSD_SOURCE) */
-
-__END_DECLS
-
-#endif /* !_COMPAT_DIRENT_H_ */
diff --git a/lib/libc/compat/include/fstypes.h b/lib/libc/compat/include/fstypes.h
deleted file mode 100644
index 06868b768..000000000
--- a/lib/libc/compat/include/fstypes.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: fstypes.h,v 1.4 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Martin Husemann <martin@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPAT_FSTYPES_H_
-#define _COMPAT_FSTYPES_H_
-
-#include <stddef.h>
-
-/* Old, fixed size filehandle structures (used upto (including) 3.x) */
-struct compat_30_fid {
-	unsigned short	fid30_len;
-	unsigned short	fid30_reserved;
-	char		fid30_data[16];
-};
-struct compat_30_fhandle {
-	fsid_t	fh_fsid;
-	struct compat_30_fid fh_fid;
-};
-
-#define	FHANDLE30_SIZE	sizeof(struct compat_30_fhandle) /* 28 */
-
-#endif /* _COMPAT_FSTYPES_H_ */
diff --git a/lib/libc/compat/include/fts.h b/lib/libc/compat/include/fts.h
deleted file mode 100644
index de95bcfd6..000000000
--- a/lib/libc/compat/include/fts.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: fts.h,v 1.1 2005/09/13 01:44:09 christos Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)fts.h	8.3 (Berkeley) 8/14/94
- */
-
-#ifndef	_COMPAT_FTS_H_
-#define	_COMPAT_FTS_H_
-
-__BEGIN_DECLS
-FTSENT	*fts_children(FTS *, int);
-int	 fts_close(FTS *);
-FTS	*fts_open(char * const *, int,
-    int (*)(const FTSENT **, const FTSENT **));
-FTSENT	*fts_read(FTS *);
-int	 fts_set(FTS *, FTSENT *, int);
-__END_DECLS
-
-#endif /* !_COMPAT_FTS_H_ */
diff --git a/lib/libc/compat/include/glob.h b/lib/libc/compat/include/glob.h
deleted file mode 100644
index cd6860724..000000000
--- a/lib/libc/compat/include/glob.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: glob.h,v 1.1 2005/09/13 01:44:09 christos Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 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.
- *
- *	@(#)glob.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _COMPAT_GLOB_H_
-#define	_COMPAT_GLOB_H_
-
-__BEGIN_DECLS
-int	glob(const char * __restrict, int,
-    int (*)(const char *, int), glob_t * __restrict);
-void	globfree(glob_t *);
-__END_DECLS
-
-#endif /* !_COMPAT_GLOB_H_ */
diff --git a/lib/libc/compat/include/locale.h b/lib/libc/compat/include/locale.h
deleted file mode 100644
index 455be3079..000000000
--- a/lib/libc/compat/include/locale.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $NetBSD: locale.h,v 1.1 2010/06/07 13:52:30 tnozaki Exp $ */
-
-/*
- * 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. 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.
- *
- *	@(#)locale.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _COMPAT_LOCALE_H_
-#define _COMPAT_LOCALE_H_
-
-#define _LC_LAST	7		/* marks end */
-
-__BEGIN_DECLS
-char *setlocale(int, const char *);
-char *__setlocale_mb_len_max_32(int, const char *);
-__END_DECLS
-
-#endif /* _COMPAT_LOCALE_H_ */
diff --git a/lib/libc/compat/include/lwp.h b/lib/libc/compat/include/lwp.h
deleted file mode 100644
index 3d67d76d5..000000000
--- a/lib/libc/compat/include/lwp.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: lwp.h,v 1.4 2014/01/31 20:45:49 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _COMPAT_LWP_H_
-#define _COMPAT_LWP_H_
-
-__BEGIN_DECLS
-struct timespec50;
-int	_lwp_park(const struct timespec50 *, lwpid_t, const void *, const void *);
-int	___lwp_park50(const struct timespec *, lwpid_t, const void *, const void *);
-int	___lwp_park60(clockid_t, int, const struct timespec *, lwpid_t,
-    const void *, const void *);
-__END_DECLS
-
-#endif /* !_COMPAT_LWP_H_ */
diff --git a/lib/libc/compat/include/mqueue.h b/lib/libc/compat/include/mqueue.h
deleted file mode 100644
index dd0cf61d8..000000000
--- a/lib/libc/compat/include/mqueue.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: mqueue.h,v 1.2 2009/01/11 02:46:25 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _COMPAT_MQUEUE_H_
-#define _COMPAT_MQUEUE_H_
-
-__BEGIN_DECLS
-ssize_t	mq_timedreceive(mqd_t, char * __restrict, size_t,
-    unsigned * __restrict, const struct timespec50 * __restrict);
-int	mq_timedsend(mqd_t, const char *, size_t, unsigned,
-    const struct timespec50 *);
-ssize_t	__mq_timedreceive50(mqd_t, char * __restrict, size_t,
-    unsigned * __restrict, const struct timespec * __restrict);
-int	__mq_timedsend50(mqd_t, const char *, size_t, unsigned,
-    const struct timespec *);
-__END_DECLS
-
-#endif	/* _COMPAT_MQUEUE_H_ */
diff --git a/lib/libc/compat/include/ndbm.h b/lib/libc/compat/include/ndbm.h
deleted file mode 100644
index 99a0a9b22..000000000
--- a/lib/libc/compat/include/ndbm.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: ndbm.h,v 1.1 2005/09/13 01:44:09 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)ndbm.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _COMPAT_NDBM_H_
-#define	_COMPAT_NDBM_H_
-
-typedef struct {
-	void	*dptr;
-	int	 dsize;
-} datum12;
-
-__BEGIN_DECLS
-int	 dbm_delete(DBM *, datum12);
-datum12	 dbm_fetch(DBM *, datum12);
-datum12	 dbm_firstkey(DBM *);
-datum12	 dbm_nextkey(DBM *);
-int	 dbm_store(DBM *, datum12, datum12, int);
-__END_DECLS
-
-#endif /* !_COMPAT_NDBM_H_ */
diff --git a/lib/libc/compat/include/ns.h b/lib/libc/compat/include/ns.h
deleted file mode 100644
index 97d9cd473..000000000
--- a/lib/libc/compat/include/ns.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: ns.h,v 1.1 2006/08/26 16:07:01 matt Exp $	*/
-
-/*
- * Copyright (c) 1984, 1985, 1986, 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.
- * 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.
- *
- *	@(#)ns.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef _NETNS_NS_H_
-#define _NETNS_NS_H_
-
-/*
- * NS addressing
- */
-union ns_host {
-	u_int8_t	c_host[6];
-	u_int16_t	s_host[3];
-};
-
-union ns_net {
-	u_int8_t	c_net[4];
-	u_int16_t	s_net[2];
-};
-
-union ns_net_u {
-	union ns_net	net_e;
-	u_int32_t	long_e;
-};
-
-struct ns_addr {
-	union ns_net	x_net;
-	union ns_host	x_host;
-	u_int16_t	x_port;
-};
-
-__BEGIN_DECLS
-extern struct ns_addr ns_addr __P((const char *));
-extern char *ns_ntoa __P((struct ns_addr));
-__END_DECLS
-
-#endif /* !_NETNS_NS_H_ */
diff --git a/lib/libc/compat/include/pwd.h b/lib/libc/compat/include/pwd.h
deleted file mode 100644
index b9a805aaa..000000000
--- a/lib/libc/compat/include/pwd.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*	$NetBSD: pwd.h,v 1.2 2009/01/11 02:46:25 christos Exp $	*/
-
-#ifndef _COMPAT_PWD_H_
-#define	_COMPAT_PWD_H_
-
-#include <sys/cdefs.h>
-#include <sys/featuretest.h>
-#include <sys/types.h>
-
-struct passwd;
-struct passwd50 {
-	__aconst char *pw_name;		/* user name */
-	__aconst char *pw_passwd;	/* encrypted password */
-	uid_t	       pw_uid;		/* user uid */
-	gid_t	       pw_gid;		/* user gid */
-	int32_t	       pw_change;	/* password change time */
-	__aconst char *pw_class;	/* user login class */
-	__aconst char *pw_gecos;	/* general information */
-	__aconst char *pw_dir;		/* home directory */
-	__aconst char *pw_shell;	/* default shell */
-	int32_t        pw_expire;	/* account expiration */
-};
-
-__BEGIN_DECLS
-static __inline void
-passwd_to_passwd50(const struct passwd *p, struct passwd50 *q)
-{
-	q->pw_name = p->pw_name;
-	q->pw_passwd = p->pw_passwd;
-	q->pw_uid = p->pw_uid;
-	q->pw_gid = p->pw_gid;
-	q->pw_change = (int32_t)p->pw_change;
-	q->pw_class = p->pw_class;
-	q->pw_gecos = p->pw_gecos;
-	q->pw_dir = p->pw_dir;
-	q->pw_shell = p->pw_shell;
-	q->pw_expire = (int32_t)p->pw_expire;
-}
-
-static __inline void
-passwd50_to_passwd(const struct passwd50 *p, struct passwd *q)
-{
-	q->pw_name = p->pw_name;
-	q->pw_passwd = p->pw_passwd;
-	q->pw_uid = p->pw_uid;
-	q->pw_gid = p->pw_gid;
-	q->pw_change = p->pw_change;
-	q->pw_class = p->pw_class;
-	q->pw_gecos = p->pw_gecos;
-	q->pw_dir = p->pw_dir;
-	q->pw_shell = p->pw_shell;
-	q->pw_expire = p->pw_expire;
-}
-
-struct passwd50	*getpwuid(uid_t);
-struct passwd50	*getpwnam(const char *);
-#if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \
-    defined(_REENTRANT) || defined(_NETBSD_SOURCE)
-int		 getpwnam_r(const char *, struct passwd50 *, char *, size_t,
-    struct passwd50 **);
-int		 getpwuid_r(uid_t, struct passwd50 *, char *, size_t,
-    struct passwd50 **);
-#endif
-#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
-struct passwd50	*getpwent(void);
-#endif
-#if defined(_NETBSD_SOURCE)
-int		 pw_scan(char *, struct passwd50 *, int *);
-int		 getpwent_r(struct passwd50 *, char *, size_t, struct passwd50 **);
-#endif
-#if defined(_NETBSD_SOURCE)
-int		 pwcache_userdb(int (*)(int), void (*)(void),
-    struct passwd50 * (*)(const char *), struct passwd50 * (*)(uid_t));
-#endif
-
-struct passwd	*__getpwuid50(uid_t);
-struct passwd	*__getpwnam50(const char *);
-#if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \
-    defined(_REENTRANT) || defined(_NETBSD_SOURCE)
-int		 __getpwnam_r50(const char *, struct passwd *, char *, size_t,
-    struct passwd **);
-int		 __getpwuid_r50(uid_t, struct passwd *, char *, size_t,
-    struct passwd **);
-#endif
-#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
-struct passwd	*__getpwent50(void);
-#endif
-#if defined(_NETBSD_SOURCE)
-int		 __pw_scan50(char *, struct passwd *, int *);
-int		 __getpwent_r50(struct passwd *, char *, size_t, struct passwd **);
-#endif
-int		 setpassent(int);
-#if defined(_NETBSD_SOURCE)
-int		 __pwcache_userdb50(int (*)(int), void (*)(void),
-    struct passwd * (*)(const char *), struct passwd * (*)(uid_t));
-#endif
-__END_DECLS
-
-#endif /* !_COMPAT_PWD_H_ */
diff --git a/lib/libc/compat/include/rpc/pmap_clnt.h b/lib/libc/compat/include/rpc/pmap_clnt.h
deleted file mode 100644
index 5e075c2c5..000000000
--- a/lib/libc/compat/include/rpc/pmap_clnt.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: pmap_clnt.h,v 1.2 2009/01/11 03:56:22 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPAT_RPC_PMAP_CLNT_H_
-#define _COMPAT_RPC_PMAP_CLNT_H_
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-extern enum clnt_stat	pmap_rmtcall(struct sockaddr_in *,
-    u_long, u_long, u_long, xdrproc_t, caddr_t, xdrproc_t, caddr_t,
-    struct timeval50, u_long *);
-extern enum clnt_stat	__pmap_rmtcall50(struct sockaddr_in *,
-    u_long, u_long, u_long, xdrproc_t, caddr_t, xdrproc_t, caddr_t,
-    struct timeval, u_long *);
-__END_DECLS
-
-#endif /* !_RPC_PMAP_CLNT_H_ */
diff --git a/lib/libc/compat/include/rpc/rpcb_clnt.h b/lib/libc/compat/include/rpc/rpcb_clnt.h
deleted file mode 100644
index e751b659b..000000000
--- a/lib/libc/compat/include/rpc/rpcb_clnt.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: rpcb_clnt.h,v 1.2 2009/01/11 03:56:22 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _COMPAT_RPC_RPCB_CLNT_H
-#define	_COMPAT_RPC_RPCB_CLNT_H
-
-__BEGIN_DECLS
-
-extern enum clnt_stat rpcb_rmtcall(const struct netconfig *,
-    const char *, const rpcprog_t, const rpcvers_t, const rpcproc_t,
-    const xdrproc_t, const char *, const xdrproc_t, caddr_t,
-    const struct timeval50, const struct netbuf *);
-extern bool_t rpcb_gettime(const char *, int32_t *);
-extern enum clnt_stat __rpcb_rmtcall50(const struct netconfig *,
-    const char *, const rpcprog_t, const rpcvers_t, const rpcproc_t,
-    const xdrproc_t, const char *, const xdrproc_t, caddr_t,
-    const struct timeval, const struct netbuf *);
-extern bool_t __rpcb_gettime50(const char *, time_t *);
-
-__END_DECLS
-
-#endif	/* !_COMPAT_RPC_RPCB_CLNT_H */
diff --git a/lib/libc/compat/include/setjmp.h b/lib/libc/compat/include/setjmp.h
deleted file mode 100644
index 9998e185a..000000000
--- a/lib/libc/compat/include/setjmp.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: setjmp.h,v 1.2 2011/11/05 09:27:06 joerg Exp $	*/
-
-/*-
- * 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. 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.
- *
- *	@(#)setjmp.h	8.2 (Berkeley) 1/21/94
- */
-
-#ifndef _COMPAT_SETJMP_H_
-#define _COMPAT_SETJMP_H_
-
-__BEGIN_DECLS
-int	__setjmp14(jmp_buf) __returns_twice;
-void	__longjmp14(jmp_buf, int) __dead;
-
-int	__sigsetjmp14(sigjmp_buf, int) __returns_twice;
-void	__siglongjmp14(sigjmp_buf, int) __dead;
-__END_DECLS
-
-#endif /* !_COMPAT_SETJMP_H_ */
diff --git a/lib/libc/compat/include/signal.h b/lib/libc/compat/include/signal.h
deleted file mode 100644
index e78a2a906..000000000
--- a/lib/libc/compat/include/signal.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: signal.h,v 1.2 2009/01/11 02:46:25 christos Exp $	*/
-
-/*-
- * 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. 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.
- *
- *	@(#)signal.h	8.3 (Berkeley) 3/30/94
- */
-
-#ifndef _COMPAT_SIGNAL_H_
-#define _COMPAT_SIGNAL_H_
-
-#include <compat/sys/signal.h>
-
-__BEGIN_DECLS
-int	sigaction(int, const struct sigaction13 * __restrict,
-    struct sigaction13 * __restrict);
-int	__sigaction14(int, const struct sigaction * __restrict,
-    struct sigaction * __restrict);
-int	sigaddset(sigset13_t *, int);
-int	__sigaddset14(sigset_t *, int);
-int	sigdelset(sigset13_t *, int);
-int	__sigdelset14(sigset_t *, int);
-int	sigemptyset(sigset13_t *);
-int	__sigemptyset14(sigset_t *);
-int	sigfillset(sigset13_t *);
-int	__sigfillset14(sigset_t *);
-int	sigismember(const sigset13_t *, int);
-int	__sigismember14(const sigset_t *, int);
-int	sigpending(sigset13_t *);
-int	__sigpending14(sigset_t *);
-int	sigprocmask(int, const sigset13_t * __restrict,
-    sigset13_t * __restrict);
-int	__sigprocmask14(int, const sigset_t * __restrict,
-    sigset_t * __restrict);
-int	sigsuspend(const sigset13_t *);
-int	__sigsuspend14(const sigset_t *);
-
-int	sigtimedwait(const sigset_t * __restrict,
-    siginfo_t * __restrict, const struct timespec50 * __restrict);
-int	__sigtimedwait(const sigset_t * __restrict,
-    siginfo_t * __restrict, struct timespec50 * __restrict);
-int	__sigtimedwait50(const sigset_t * __restrict,
-    siginfo_t * __restrict, const struct timespec * __restrict);
-int	____sigtimedwait50(const sigset_t * __restrict,
-    siginfo_t * __restrict, struct timespec * __restrict);
-/*
- * X/Open CAE Specification Issue 4 Version 2
- */      
-#if (defined(_XOPEN_SOURCE) && defined(_XOPEN_SOURCE_EXTENDED)) || \
-    (_XOPEN_SOURCE - 0) >= 500 || defined(_NETBSD_SOURCE)
-int	sigaltstack(const struct sigaltstack13 * __restrict,
-    struct sigaltstack13 * __restrict);
-int	__sigaltstack14(const stack_t * __restrict, stack_t * __restrict);
-#endif /* _XOPEN_SOURCE_EXTENDED || _XOPEN_SOURCE >= 500 || _NETBSD_SOURCE */
-
-__END_DECLS
-
-#endif	/* !_COMPAT_SIGNAL_H_ */
diff --git a/lib/libc/compat/include/stdio.h b/lib/libc/compat/include/stdio.h
deleted file mode 100644
index b58852f8f..000000000
--- a/lib/libc/compat/include/stdio.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: stdio.h,v 1.1 2012/01/22 18:36:14 christos Exp $ */
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- *
- */
-
-#ifndef _COMPAT_STDIO_H_
-#define _COMPAT_STDIO_H_
-
-__BEGIN_DECLS
-int	fgetpos(FILE * __restrict, off_t * __restrict);
-int	fsetpos(FILE *, const off_t *);
-__END_DECLS
-
-#endif /* _COMPAT_STDIO_H_ */
diff --git a/lib/libc/compat/include/stdlib.h b/lib/libc/compat/include/stdlib.h
deleted file mode 100644
index 4b9961075..000000000
--- a/lib/libc/compat/include/stdlib.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: stdlib.h,v 1.7 2014/06/12 18:50:12 christos Exp $	*/
-
-/*-
- * 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. 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.
- *
- *	@(#)stdlib.h	8.5 (Berkeley) 5/19/95
- */
-
-#ifndef _COMPAT_STDLIB_H_
-#define _COMPAT_STDLIB_H_
-
-__BEGIN_DECLS
-
-void	 unsetenv(const char *);
-int	 __unsetenv13(const char *);
-int	 putenv(char *);
-int	 __putenv50(char *);
-__aconst char *devname(int32_t, mode_t);
-__aconst char *__devname50(dev_t, mode_t);
-char	*initstate(unsigned long, char *, size_t);
-char	*__initstate60(unsigned int, char *, size_t);
-void	 srandom(unsigned long);
-void	 __srandom60(unsigned int);
-
-__END_DECLS
-
-#endif /* !_COMPAT_STDLIB_H_ */
diff --git a/lib/libc/compat/include/time.h b/lib/libc/compat/include/time.h
deleted file mode 100644
index c0842f585..000000000
--- a/lib/libc/compat/include/time.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*	$NetBSD: time.h,v 1.3 2010/12/16 18:38:06 christos Exp $	*/
-
-/*
- * Copyright (c) 1989, 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.
- *
- *	@(#)time.h	8.3 (Berkeley) 1/21/94
- */
-
-#ifndef _COMPAT_TIME_H_
-#define	_COMPAT_TIME_H_
-
-#include <compat/sys/time.h>
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
-    defined(_NETBSD_SOURCE)
-#define CLK_TCK 100
-#endif
-
-__BEGIN_DECLS
-#if (_XOPEN_SOURCE - 0) >= 4 || defined(_NETBSD_SOURCE)
-char *strptime(const char * __restrict, const char * __restrict,
-    struct tm * __restrict);
-#if 0
-#if defined(_NETBSD_SOURCE)
-char *timezone(int, int);
-#endif /* _NETBSD_SOURCE */
-#endif
-
-#endif /* !_ANSI_SOURCE */
-char *ctime(const int32_t *);
-double difftime(int32_t, int32_t);
-struct tm *gmtime(const int32_t *);
-struct tm *localtime(const int32_t *);
-int32_t time(int32_t *);
-int32_t mktime(struct tm *);
-void tzset(void);
-void tzsetwall(void);
-void __tzset50(void);
-void __tzsetwall50(void);
-
-int clock_getres(clockid_t, struct timespec50 *);
-int clock_gettime(clockid_t, struct timespec50 *);
-int clock_settime(clockid_t, const struct timespec50 *);
-int __clock_getres50(clockid_t, struct timespec *);
-int __clock_gettime50(clockid_t, struct timespec *);
-int __clock_settime50(clockid_t, const struct timespec *);
-int nanosleep(const struct timespec50 *, struct timespec50 *);
-int __nanosleep50(const struct timespec *, struct timespec *);
-int timer_gettime(timer_t, struct itimerspec50 *);
-int timer_settime(timer_t, int, const struct itimerspec50 * __restrict, 
-    struct itimerspec50 * __restrict);
-int __timer_gettime50(timer_t, struct itimerspec *);
-int __timer_settime50(timer_t, int, const struct itimerspec * __restrict, 
-    struct itimerspec * __restrict);
-int __timer_getres50(timer_t, struct itimerspec *);
-char *ctime_r(const int32_t *, char *);
-struct tm *gmtime_r(const int32_t * __restrict, struct tm * __restrict);
-struct tm *localtime_r(const int32_t * __restrict, struct tm * __restrict);
-struct tm *offtime(const int32_t *, long);
-struct tm *offtime_r(const int32_t *, long, struct tm *);
-int32_t timelocal(struct tm *);
-int32_t timegm(struct tm *);
-int32_t timeoff(struct tm *, long);
-int32_t time2posix(int32_t);
-int32_t posix2time(int32_t);
-struct tm *localtime_rz(const timezone_t, const int32_t * __restrict,
-    struct tm * __restrict);
-char *ctime_rz(const timezone_t, const int32_t *, char *);
-int32_t mktime_z(const timezone_t, struct tm *);
-int32_t timelocal_z(const timezone_t, struct tm *);
-int32_t time2posix_z(const timezone_t, int32_t);
-int32_t posix2time_z(const timezone_t, int32_t);
-timezone_t tzalloc(const char *);
-void tzfree(const timezone_t);
-const char *tzgetname(const timezone_t, int);
-
-#endif /* !_COMPAT_TIME_H_ */
diff --git a/lib/libc/compat/include/unistd.h b/lib/libc/compat/include/unistd.h
deleted file mode 100644
index d607a01b2..000000000
--- a/lib/libc/compat/include/unistd.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: unistd.h,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1998, 1999 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.
- */
-
-/*
- * Copyright (c) 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)unistd.h	8.12 (Berkeley) 4/27/95
- */
-
-#ifndef _COMPAT_UNISTD_H_
-#define	_COMPAT_UNISTD_H_
-
-__BEGIN_DECLS
-pid_t	 vfork(void);
-pid_t	 __vfork14(void);
-__END_DECLS
-
-#endif /* !_COMPAT_UNISTD_H_ */
diff --git a/lib/libc/compat/include/utime.h b/lib/libc/compat/include/utime.h
deleted file mode 100644
index 33be9e926..000000000
--- a/lib/libc/compat/include/utime.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: utime.h,v 1.2 2009/01/11 02:46:25 christos Exp $	*/
-
-/*-
- * 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. 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.
- *
- *	@(#)utime.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef	_COMPAT_UTIME_H_
-#define	_COMPAT_UTIME_H_
-
-#include <machine/ansi.h>
-
-struct utimbuf50 {
-	int32_t actime;		/* Access time */
-	int32_t modtime;	/* Modification time */
-};
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int utime(const char *, const struct utimbuf50 *);
-int __utime50(const char *, const struct utimbuf *);
-__END_DECLS
-
-#endif /* !_COMPAT_UTIME_H_ */
diff --git a/lib/libc/compat/include/utmp.h b/lib/libc/compat/include/utmp.h
deleted file mode 100644
index f6b7f13d4..000000000
--- a/lib/libc/compat/include/utmp.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: utmp.h,v 1.2 2009/01/11 02:46:25 christos Exp $	*/
-
-/*
- * Copyright (c) 1988, 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.
- *
- *	@(#)utmp.h	8.2 (Berkeley) 1/21/94
- */
-
-#ifndef	_COMPAT_UTMP_H_
-#define	_COMPAT_UTMP_H_
-
-struct utmp50 {
-	char	ut_line[UT_LINESIZE];
-	char	ut_name[UT_NAMESIZE];
-	char	ut_host[UT_HOSTSIZE];
-	int32_t	ut_time;
-};
-
-__BEGIN_DECLS
-static __inline void
-utmp_to_utmp50(const struct utmp *ut, struct utmp50 *ut50)
-{
-	(void)memcpy(ut50, ut, sizeof(*ut50));
-	ut50->ut_time = (int32_t)ut->ut_time;
-}
-
-static __inline void
-utmp50_to_utmp(const struct utmp50 *ut50, struct utmp *ut)
-{
-	(void)memcpy(ut, ut50, sizeof(*ut50));
-	ut->ut_time = ut50->ut_time;
-}
-
-struct utmp50 *getutent(void);
-struct utmp *__getutent50(void);
-__END_DECLS
-
-#endif /* !_COMPAT_UTMP_H_ */
diff --git a/lib/libc/compat/include/utmpx.h b/lib/libc/compat/include/utmpx.h
deleted file mode 100644
index ee201964c..000000000
--- a/lib/libc/compat/include/utmpx.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*	$NetBSD: utmpx.h,v 1.3 2009/01/11 02:46:25 christos Exp $	 */
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef	_COMPAT_UTMPX_H_
-#define	_COMPAT_UTMPX_H_
-
-#include <compat/sys/time.h>
-
-struct utmpx50 {
-	char ut_name[_UTX_USERSIZE];	/* login name */
-	char ut_id[_UTX_IDSIZE];	/* inittab id */
-	char ut_line[_UTX_LINESIZE];	/* tty name */
-	char ut_host[_UTX_HOSTSIZE];	/* host name */
-	uint16_t ut_session;		/* session id used for windowing */
-	uint16_t ut_type;		/* type of this entry */
-	pid_t ut_pid;			/* process id creating the entry */
-	struct {
-		uint16_t e_termination;	/* process termination signal */
-		uint16_t e_exit;	/* process exit status */
-	} ut_exit;
-	struct sockaddr_storage ut_ss;	/* address where entry was made from */
-	struct timeval50 ut_tv;		/* time entry was created */
-	uint32_t ut_pad[10];		/* reserved for future use */
-};
-
-struct lastlogx50 {
-	struct timeval50 ll_tv;		/* time entry was created */
-	char ll_line[_UTX_LINESIZE];	/* tty name */
-	char ll_host[_UTX_HOSTSIZE];	/* host name */
-	struct sockaddr_storage ll_ss;	/* address where entry was made from */
-};
-
-__BEGIN_DECLS
-
-static __inline void
-utmpx50_to_utmpx(const struct utmpx50 *ut50, struct utmpx *ut)
-{
-	(void)memcpy(ut, ut50, sizeof(*ut));
-	timeval50_to_timeval(&ut50->ut_tv, &ut->ut_tv);
-}
-
-static __inline void
-utmpx_to_utmpx50(const struct utmpx *ut, struct utmpx50 *ut50)
-{
-	(void)memcpy(ut50, ut, sizeof(*ut50));
-	timeval_to_timeval50(&ut->ut_tv, &ut50->ut_tv);
-}
-
-struct utmpx50 *getutxent(void);
-struct utmpx *__getutxent50(void);
-struct utmpx50 *getutxid(const struct utmpx50 *);
-struct utmpx *__getutxid50(const struct utmpx *);
-struct utmpx50 *getutxline(const struct utmpx50 *);
-struct utmpx *__getutxline50(const struct utmpx *);
-struct utmpx50 *pututxline(const struct utmpx50 *);
-struct utmpx *__pututxline50(const struct utmpx *);
-int updwtmpx(const char *, const struct utmpx50 *);
-int __updwtmpx50(const char *, const struct utmpx *);
-int updlastlogx(const char *, uid_t, struct lastlogx50 *);
-int __updlastlogx50(const char *, uid_t, struct lastlogx *);
-struct utmp;
-void getutmp(const struct utmpx50 *, struct utmp *);
-void __getutmp50(const struct utmpx *, struct utmp *);
-void getutmpx(const struct utmp *, struct utmpx50 *);
-void __getutmpx50(const struct utmp *, struct utmpx *);
-
-int lastlogxname(const char *);
-struct lastlogx50 *getlastlogx(uid_t, struct lastlogx50 *);
-struct lastlogx50 *__getlastlogx13(const char *, uid_t, struct lastlogx50 *);
-struct lastlogx *__getlastlogx50(const char *, uid_t, struct lastlogx *);
-
-__END_DECLS
-
-#endif /* !_COMPAT_UTMPX_H_ */
diff --git a/lib/libc/compat/include/vis.h b/lib/libc/compat/include/vis.h
deleted file mode 100644
index 084386e50..000000000
--- a/lib/libc/compat/include/vis.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$NetBSD: vis.h,v 1.2 2011/03/12 19:52:47 christos Exp $	*/
-
-/*-
- * 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. 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.
- *
- *	@(#)vis.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _COMPAT_VIS_H_
-#define	_COMPAT_VIS_H_
-
-__BEGIN_DECLS
-int	unvis(char *, int, int *, int);
-int	__unvis13(char *, int, int *, int);
-int	__unvis50(char *, int, int *, int);
-__END_DECLS
-
-#endif /* !_COMPAT_VIS_H_ */
diff --git a/lib/libc/compat/locale/Makefile.inc b/lib/libc/compat/locale/Makefile.inc
deleted file mode 100644
index b714fccf9..000000000
--- a/lib/libc/compat/locale/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2010/06/07 13:52:30 tnozaki Exp $
-
-.PATH: ${COMPATDIR}/arch/${MACHINE_ARCH}/locale ${COMPATDIR}/locale
-
-CPPFLAGS+=	-I${COMPATDIR}/../locale
-SRCS+=		compat_setlocale1.c compat_setlocale32.c
diff --git a/lib/libc/compat/locale/compat_setlocale1.c b/lib/libc/compat/locale/compat_setlocale1.c
deleted file mode 100644
index f8b98b581..000000000
--- a/lib/libc/compat/locale/compat_setlocale1.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* $NetBSD: compat_setlocale1.c,v 1.2 2013/09/13 13:13:32 joerg Exp $ */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * NetBSD: setlocale1.c,v 1.4 2010/05/22 13:50:02 tnozaki Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_setlocale1.c,v 1.2 2013/09/13 13:13:32 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <compat/include/locale.h>
-
-#include "setlocale_local.h"
-
-#undef setlocale
-
-__warn_references(setlocale,
-    "warning: reference to compatibility setlocale();"
-    "include <locale.h> for correct reference")
-
-/*
- * Preparation for the future import of multibyte locale.
- * This function will ensure binary compatibility for old executables.
- */
-char *
-compat_setlocale(int category, const char *locale) __RENAME(setlocale);
-
-char *
-compat_setlocale(int category, const char *locale)
-{
-
-	/* locale may be NULL */
-
-	__mb_len_max_runtime = 1;
-	return __setlocale(category, locale);
-}
diff --git a/lib/libc/compat/locale/compat_setlocale32.c b/lib/libc/compat/locale/compat_setlocale32.c
deleted file mode 100644
index d06b5c412..000000000
--- a/lib/libc/compat/locale/compat_setlocale32.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* $NetBSD: compat_setlocale32.c,v 1.2 2013/03/06 11:29:01 yamt Exp $ */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * NetBSD: setlocale32.c,v 1.6 2010/05/22 13:50:02 tnozaki Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_setlocale32.c,v 1.2 2013/03/06 11:29:01 yamt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <compat/include/locale.h>
-
-#include "setlocale_local.h"
-
-__warn_references(__setlocale_mb_len_max_32,
-    "warning: reference to compatibility __setlocale_mb_len_max_32();"
-    "include <locale.h> for correct reference")
-
-/*
- * MB_LEN_MAX used to be a MD macro.  it was 32 for most ports but 6 for hppa.
- * hppa uses arch/hppa/locale/compat_setlocale32.c instead of this file.
- */
-#if defined(__hppa__)
-#error using wrong variant of compat_setlocale32.c
-#endif /* defined(__hppa__) */
-
-char *
-__setlocale_mb_len_max_32(int category, const char *locale)
-{
-
-	/* locale may be NULL */
-
-	__mb_len_max_runtime = 32;
-	return __setlocale(category, locale);
-}
diff --git a/lib/libc/compat/net/Makefile.inc b/lib/libc/compat/net/Makefile.inc
deleted file mode 100644
index aa8f2513c..000000000
--- a/lib/libc/compat/net/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2012/01/20 14:08:05 joerg Exp $
-
-.PATH: ${COMPATDIR}/net
-SRCS+=	__cmsg_alignbytes.c compat_ns_addr.c compat_ns_ntoa.c
diff --git a/lib/libc/compat/net/__cmsg_alignbytes.c b/lib/libc/compat/net/__cmsg_alignbytes.c
deleted file mode 100644
index dbf21f86f..000000000
--- a/lib/libc/compat/net/__cmsg_alignbytes.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: __cmsg_alignbytes.c,v 1.1 2012/01/20 14:08:05 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jun-ichiro Hagino.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: __cmsg_alignbytes.c,v 1.1 2012/01/20 14:08:05 joerg Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/socket.h>
-
-int __cmsg_alignbytes(void);
-
-int
-__cmsg_alignbytes(void)
-{
-	static int alignbytes = -1;
-#ifdef HW_ALIGNBYTES
-	int mib[2];
-	size_t len;
-	int ret;
-#endif
-
-	if (alignbytes > 0)
-		return alignbytes;
-
-#ifdef HW_ALIGNBYTES
-	mib[0] = CTL_HW;
-	mib[1] = HW_ALIGNBYTES;
-	len = sizeof(alignbytes);
-	ret = sysctl(mib, (u_int) (sizeof(mib) / sizeof(mib[0])),
-	    (void *)&alignbytes, &len, NULL, (size_t)0);
-	if (ret >= 0 && alignbytes >= 0)
-		return alignbytes;
-#endif
-	/* last resort */
-	alignbytes = ALIGNBYTES;
-	return alignbytes;
-}
diff --git a/lib/libc/compat/net/compat_ns_addr.c b/lib/libc/compat/net/compat_ns_addr.c
deleted file mode 100644
index a3667fca3..000000000
--- a/lib/libc/compat/net/compat_ns_addr.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*	$NetBSD: compat_ns_addr.c,v 1.3 2012/10/15 22:22:01 msaitoh Exp $	*/
-
-/*
- * Copyright (c) 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * J.Q. Johnson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)ns_addr.c	8.1 (Berkeley) 6/7/93";
-#else
-__RCSID("$NetBSD: compat_ns_addr.c,v 1.3 2012/10/15 22:22:01 msaitoh Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <compat/include/ns.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
-static void Field(char *, uint8_t *, int);
-static void cvtbase(long, int, int[], int, uint8_t [], int);
-
-struct ns_addr 
-ns_addr(const char *name)
-{
-	char separator;
-	char *hostname, *socketname, *cp;
-	char buf[50];
-	static struct ns_addr addr;
-
-	_DIAGASSERT(name != NULL);
-
-	(void)strlcpy(buf, name, sizeof(buf));
-
-	/*
-	 * First, figure out what he intends as a field separtor.
-	 * Despite the way this routine is written, the prefered
-	 * form  2-272.AA001234H.01777, i.e. XDE standard.
-	 * Great efforts are made to insure backward compatibility.
-	 */
-	if ((hostname = strchr(buf, '#')) != NULL)
-		separator = '#';
-	else {
-		hostname = strchr(buf, '.');
-		if ((cp = strchr(buf, ':')) &&
-		    ((hostname && cp < hostname) || (hostname == 0))) {
-			hostname = cp;
-			separator = ':';
-		} else
-			separator = '.';
-	}
-	if (hostname)
-		*hostname++ = 0;
-
-	memset(&addr, '\0', sizeof(addr));
-	Field(buf, addr.x_net.c_net, 4);
-	if (hostname == 0)
-		return (addr);  /* No separator means net only */
-
-	socketname = strchr(hostname, separator);
-	if (socketname) {
-		*socketname++ = 0;
-		Field(socketname, (uint8_t *)(void *)&addr.x_port, 2);
-	}
-
-	Field(hostname, addr.x_host.c_host, 6);
-
-	return (addr);
-}
-
-static void
-Field(char *buf, uint8_t *out, int len)
-{
-	register char *bp = buf;
-	int i, ibase, base16 = 0, base10 = 0;
-	unsigned int clen = 0;
-	int hb[6], *hp;
-
-	_DIAGASSERT(buf != NULL);
-	_DIAGASSERT(out != NULL);
-
-	/*
-	 * first try 2-273#2-852-151-014#socket
-	 */
-	if ((*buf != '-') &&
-	    (1 < (i = sscanf(buf, "%d-%d-%d-%d-%d",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4])))) {
-		cvtbase(1000L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * try form 8E1#0.0.AA.0.5E.E6#socket
-	 */
-	if (1 < (i = sscanf(buf,"%x.%x.%x.%x.%x.%x",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
-		cvtbase(256L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * try form 8E1#0:0:AA:0:5E:E6#socket
-	 */
-	if (1 < (i = sscanf(buf,"%x:%x:%x:%x:%x:%x",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
-		cvtbase(256L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * This is REALLY stretching it but there was a
-	 * comma notation separting shorts -- definitely non standard
-	 */
-	if (1 < (i = sscanf(buf,"%x,%x,%x",
-			&hb[0], &hb[1], &hb[2]))) {
-		hb[0] = htons(hb[0]); hb[1] = htons(hb[1]);
-		hb[2] = htons(hb[2]);
-		cvtbase(65536L, 256, hb, i, out, len);
-		return;
-	}
-
-	/* Need to decide if base 10, 16 or 8 */
-	while (*bp) switch (*bp++) {
-
-	case '0': case '1': case '2': case '3': case '4': case '5':
-	case '6': case '7': case '-':
-		break;
-
-	case '8': case '9':
-		base10 = 1;
-		break;
-
-	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-	case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-		base16 = 1;
-		break;
-	
-	case 'x': case 'X':
-		*--bp = '0';
-		base16 = 1;
-		break;
-
-	case 'h': case 'H':
-		base16 = 1;
-		/* FALLTHROUGH */
-
-	default:
-		*--bp = 0; /* Ends Loop */
-	}
-	if (base16) {
-		ibase = 4096;
-	} else if (base10 == 0 && *buf == '0') {
-		ibase = 512;
-	} else {
-		base10 = 1;
-		ibase = 1000;
-	}
-
-	for (bp = buf; *bp++; ) clen++;
-	if (clen == 0) clen++;
-	if (clen > 18) clen = 18;
-	i = ((clen - 1) / 3) + 1;
-	bp = clen + buf - 3;
-	hp = hb + i - 1;
-
-	while (hp > hb) {
-		if (base16)
-			(void)sscanf(bp, "%3x", hp);
-		else if (base10)
-			(void)sscanf(bp, "%3d", hp);
-		else
-			(void)sscanf(bp, "%3o", hp);
-
-		bp[0] = 0;
-		hp--;
-		bp -= 3;
-	}
-	if (base16)
-		(void)sscanf(buf, "%3x", hp);
-	else if (base10)
-		(void)sscanf(buf, "%3d", hp);
-	else
-		(void)sscanf(buf, "%3o", hp);
-
-	cvtbase((long)ibase, 256, hb, i, out, len);
-}
-
-static void
-cvtbase(long oldbase, int newbase, int input[], int inlen,
-	uint8_t result[], int reslen)
-{
-	int d, e;
-	long sum;
-
-	_DIAGASSERT(input != NULL);
-	_DIAGASSERT(result != NULL);
-	_DIAGASSERT(inlen > 0);
-
-	e = 1;
-	while (e > 0 && reslen > 0) {
-		d = 0; e = 0; sum = 0;
-		/* long division: input=input/newbase */
-		while (d < inlen) {
-			sum = sum*oldbase + (long) input[d];
-			e += (sum > 0);
-			input[d++] = (int) (sum / newbase);
-			sum %= newbase;
-		}
-		/* accumulate remainder */
-		result[--reslen] = (unsigned char)sum;
-	}
-	for (d=0; d < reslen; d++)
-		result[d] = 0;
-}
diff --git a/lib/libc/compat/net/compat_ns_ntoa.c b/lib/libc/compat/net/compat_ns_ntoa.c
deleted file mode 100644
index 3aaa5d9f7..000000000
--- a/lib/libc/compat/net/compat_ns_ntoa.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*	$NetBSD: compat_ns_ntoa.c,v 1.2 2012/03/20 17:05:59 matt Exp $	*/
-
-/*
- * Copyright (c) 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)ns_ntoa.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: compat_ns_ntoa.c,v 1.2 2012/03/20 17:05:59 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <compat/include/ns.h>
-
-#include <assert.h>
-#include <stdio.h>
-
-static char *spectHex(char *);
-
-char *
-ns_ntoa(struct ns_addr addr)
-{
-	static char obuf[40];
-	union { union ns_net net_e; uint32_t long_e; } net;
-	uint16_t port = htons(addr.x_port);
-	char *cp;
-	char *cp2;
-	uint8_t *up = addr.x_host.c_host;
-	uint8_t *uplim = up + 6;
-
-	net.net_e = addr.x_net;
-	sprintf(obuf, "%x", ntohl(net.long_e));
-	cp = spectHex(obuf);
-	cp2 = cp + 1;
-	while (up < uplim && *up==0)
-		up++;
-	if (up == uplim) {
-		if (port) {
-			sprintf(cp, ".0");
-			cp += 2;
-		}
-	} else {
-		sprintf(cp, ".%x", *up++);
-		while (up < uplim) {
-			while (*cp) cp++;
-			sprintf(cp, "%02x", *up++);
-		}
-		cp = spectHex(cp2);
-	}
-	if (port) {
-		sprintf(cp, ".%x", port);
-		spectHex(cp + 1);
-	}
-	return (obuf);
-}
-
-static char *
-spectHex(char *p0)
-{
-	int ok = 0;
-	int nonzero = 0;
-	char *p = p0;
-
-	_DIAGASSERT(p0 != NULL);
-
-	for (; *p; p++)
-		switch (*p) {
-		case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-			*p += ('A' - 'a');
-			/* FALLTHROUGH */
-		case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-			ok = 1;
-			/* FALLTHROUGH */
-		case '1': case '2': case '3': case '4': case '5':
-		case '6': case '7': case '8': case '9':
-			nonzero = 1;
-		}
-	if (nonzero && !ok) { *p++ = 'H'; *p = 0; }
-	return (p);
-}
diff --git a/lib/libc/compat/rpc/Makefile.inc b/lib/libc/compat/rpc/Makefile.inc
deleted file mode 100644
index 32de61fe2..000000000
--- a/lib/libc/compat/rpc/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2009/01/11 03:41:28 christos Exp $
-
-.PATH: ${COMPATDIR}/rpc
-
-SRCS+=compat_pmap_rmtcall.c compat_rpcb.c
diff --git a/lib/libc/compat/rpc/compat_pmap_rmtcall.c b/lib/libc/compat/rpc/compat_pmap_rmtcall.c
deleted file mode 100644
index fb82c7a7a..000000000
--- a/lib/libc/compat/rpc/compat_pmap_rmtcall.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: compat_pmap_rmtcall.c,v 1.2 2009/01/11 03:41:28 christos Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_pmap_rmtcall.c,v 1.2 2009/01/11 03:41:28 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <compat/sys/time.h>
-#include <rpc/rpc.h>
-#include <compat/include/rpc/pmap_clnt.h>
-
-__warn_references(pmap_rmtcall,
-    "warning: reference to compatibility pmap_rmtcall(); include <rpc/pmap_clnt.h> to generate correct reference")
-
-#ifdef __weak_alias
-__weak_alias(pmap_rmtcall, _pmap_rmtcall)
-#endif
-
-enum clnt_stat
-pmap_rmtcall(struct sockaddr_in *addr, u_long prognum, u_long versnum,
-    u_long procnum, xdrproc_t inproc, char *in, xdrproc_t outproc,
-    char *out, struct timeval50 tout50, u_long *portp)
-{
-	struct timeval tout;
-	timeval50_to_timeval(&tout50, &tout);
-	return __pmap_rmtcall50(addr, prognum, versnum, procnum, inproc, in,
-	    outproc, out, tout, portp);
-}
diff --git a/lib/libc/compat/rpc/compat_rpcb.c b/lib/libc/compat/rpc/compat_rpcb.c
deleted file mode 100644
index b547d5348..000000000
--- a/lib/libc/compat/rpc/compat_rpcb.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: compat_rpcb.c,v 1.2 2009/01/11 03:41:28 christos Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_rpcb.c,v 1.2 2009/01/11 03:41:28 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <compat/sys/time.h>
-#include <rpc/rpcb_clnt.h>
-#include <compat/include/rpc/rpcb_clnt.h>
-
-__warn_references(rpcb_rmtcall,
-    "warning: reference to compatibility rpcb_rmtcall(); include <rpc/rpcb_clnt.h> to generate correct reference")
-__warn_references(rpcb_gettime,
-    "warning: reference to compatibility rpcb_gettime(); include <rpc/rpcb_clnt.h> to generate correct reference")
-
-#ifdef __weak_alias
-__weak_alias(rpcb_rmtcall, _rpcb_rmtcall)
-__weak_alias(rpcb_gettime, _rpcb_gettime)
-#endif
-
-enum clnt_stat
-rpcb_rmtcall(const struct netconfig *nc,
-    const char *name, const rpcprog_t prog, const rpcvers_t vers,
-    const rpcproc_t proc, const xdrproc_t inproc, const char *inbuf,
-    const xdrproc_t outproc, caddr_t outbuf,
-    const struct timeval50 tout50, const struct netbuf *nb)
-{
-	struct timeval tout;
-	timeval50_to_timeval(&tout50, &tout);
-	return __rpcb_rmtcall50(nc, name, prog, vers, proc, inproc, inbuf,
-	    outproc, outbuf, tout, nb);
-}
-
-bool_t
-rpcb_gettime(const char *name, int32_t *t50)
-{
-	time_t t;
-	bool_t rv = __rpcb_gettime50(name, &t);
-	*t50 = (int32_t)t;
-	return rv;
-}
diff --git a/lib/libc/compat/shlib_version b/lib/libc/compat/shlib_version
deleted file mode 100644
index 5b1659f3c..000000000
--- a/lib/libc/compat/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.1 2006/03/11 21:07:18 christos Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=0
-minor=0
diff --git a/lib/libc/compat/stdio/Makefile.inc b/lib/libc/compat/stdio/Makefile.inc
deleted file mode 100644
index 0a02e2680..000000000
--- a/lib/libc/compat/stdio/Makefile.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2012/01/22 18:36:18 christos Exp $
-
-.PATH: ${COMPATDIR}/arch/${MACHINE_ARCH}/stdio ${COMPATDIR}/stdio
-
-SRCS+=		compat_fgetpos.c compat_fsetpos.c
-CPPFLAGS.compat_fgetpos.c+=	-I${COMPATDIR}/../stdio
-CPPFLAGS.compat_fsetpos.c+=	-I${COMPATDIR}/../stdio
-#	$NetBSD: Makefile.inc,v 1.1 2012/01/22 18:36:18 christos Exp $
-
-.ifndef ABSTOP
-ABSTOP!= cd ${.PARSEDIR}; pwd
-
-.if (${.PARSEDIR} == ${.CURDIR})
-RELTOP:= .
-.else
-RELTOP:= ${.PARSEDIR:S,^${.CURDIR},,}
-.endif
-
-# you can set BSD{SRC,OBJ}DIR in Makefile.local.inc
-.if exists(${ABSTOP}/Makefile.local.inc)
-.include "${ABSTOP}/Makefile.local.inc"
-.endif
-.endif
diff --git a/lib/libc/compat/stdio/compat_fgetpos.c b/lib/libc/compat/stdio/compat_fgetpos.c
deleted file mode 100644
index c2b129826..000000000
--- a/lib/libc/compat/stdio/compat_fgetpos.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $NetBSD: compat_fgetpos.c,v 1.1 2012/01/22 18:36:18 christos Exp $ */
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- * Original version ID:
- * NetBSD: fgetpos.c,v 1.11 2003/08/07 16:43:23 agc Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_fgetpos.c,v 1.1 2012/01/22 18:36:18 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
- 
-#define __LIBC12_SOURCE__
- 
-#include "namespace.h"
-#include <sys/types.h> 
- 
-#include <assert.h>
-#include <stdio.h>
-#include <compat/include/stdio.h>
- 
-#ifdef __warn_references
-__warn_references(fgetpos,
-    "warning: reference to compatibility fgetpos(); include <stdio.h> for correct reference")
-#endif
-
-int
-fgetpos(FILE * __restrict fp, off_t * __restrict pos)
-{
-	_DIAGASSERT(fp != NULL);
-	_DIAGASSERT(pos != NULL);
-
-	return (*pos = ftello(fp)) == (off_t)-1;
-}
diff --git a/lib/libc/compat/stdio/compat_fsetpos.c b/lib/libc/compat/stdio/compat_fsetpos.c
deleted file mode 100644
index 74250f639..000000000
--- a/lib/libc/compat/stdio/compat_fsetpos.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* $NetBSD: compat_fsetpos.c,v 1.2 2012/10/17 16:09:03 drochner Exp $ */
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- * Original version ID:
- * NetBSD: fsetpos.c,v 1.10 2003/08/07 16:43:25 agc Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_fsetpos.c,v 1.2 2012/10/17 16:09:03 drochner Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
- 
-#include <assert.h>
-#include <stdio.h>
-#include <compat/include/stdio.h>
-  
-#ifdef __warn_references
-__warn_references(fsetpos,
-    "warning: reference to compatibility fsetpos(); include <stdio.h> for correct reference")
-#endif
-
-
-/*
- * fsetpos: like fseek.
- */
-int
-fsetpos(FILE * __restrict iop, const off_t * __restrict pos)
-{
-	_DIAGASSERT(iop != NULL);
-	_DIAGASSERT(pos != NULL);
-
-	return fseeko(iop, *pos, SEEK_SET) == (off_t)-1;
-}
diff --git a/lib/libc/compat/stdlib/Makefile.inc b/lib/libc/compat/stdlib/Makefile.inc
deleted file mode 100644
index 71853720c..000000000
--- a/lib/libc/compat/stdlib/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 2014/06/12 18:44:36 christos Exp $
-
-.PATH: ${COMPATDIR}/stdlib
-CPPFLAGS+=-I${COMPATDIR}/stdlib -I${COMPATDIR}/../stdlib
-SRCS+=compat_putenv.c compat_random.c compat_unsetenv.c
diff --git a/lib/libc/compat/stdlib/compat_putenv.c b/lib/libc/compat/stdlib/compat_putenv.c
deleted file mode 100644
index 8c8a128bd..000000000
--- a/lib/libc/compat/stdlib/compat_putenv.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: compat_putenv.c,v 1.3 2015/01/20 18:31:24 christos Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_putenv.c,v 1.3 2015/01/20 18:31:24 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <compat/include/stdlib.h>
-
-#include "env.h"
-#include "local.h"
-
-#ifdef __weak_alias
-__weak_alias(putenv,_putenv)
-#endif
-
-__warn_references(putenv,
-    "warning: reference to compatibility putenv();"
-    " include <stdlib.h> for correct reference")
-
-/*
- * putenv(name) --
- *	This version implicitly copies the string for compatibility.
- */
-int
-putenv(char *name)
-{
-	size_t l_name;
-	char *copy;
-	int rv;
-
-	_DIAGASSERT(name != NULL);
-
-        l_name = __envvarnamelen(name, true); 
-        if (l_name == 0) { 
-                errno = EINVAL;
-                return -1;
-        }
-
-	if ((copy = strdup(name)) == NULL)
-		return -1;
-	copy[l_name++] = '\0';
-
-	rv = setenv(copy, copy + l_name, 1);
-
-	free(copy);
-	return rv;
-}
diff --git a/lib/libc/compat/stdlib/compat_random.c b/lib/libc/compat/stdlib/compat_random.c
deleted file mode 100644
index b831d25ee..000000000
--- a/lib/libc/compat/stdlib/compat_random.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: compat_random.c,v 1.3 2015/01/20 18:31:24 christos Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_random.c,v 1.3 2015/01/20 18:31:24 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-#include "namespace.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <compat/include/stdlib.h>
-
-#include "env.h"
-#include "local.h"
-
-#ifdef __weak_alias
-__weak_alias(initstate,_initstate)
-__weak_alias(srandom,_srandom)
-#endif
-
-__warn_references(initstate,
-    "warning: reference to compatibility initstate();"
-    " include <stdlib.h> for correct reference")
-__warn_references(srandom,
-    "warning: reference to compatibility srandom();"
-    " include <stdlib.h> for correct reference")
-
-char *
-initstate(unsigned long seed, char * buf, size_t len) {
-	return __initstate60((unsigned int)seed, buf, len);
-}
-
-void
-srandom(unsigned long seed) {
-	__srandom60((unsigned int)seed);
-}
diff --git a/lib/libc/compat/stdlib/compat_unsetenv.c b/lib/libc/compat/stdlib/compat_unsetenv.c
deleted file mode 100644
index 6043d6fc1..000000000
--- a/lib/libc/compat/stdlib/compat_unsetenv.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*	$NetBSD: compat_unsetenv.c,v 1.4 2015/01/20 18:31:24 christos Exp $	*/
-
-/*
- * Copyright (c) 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "from: @(#)setenv.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: compat_unsetenv.c,v 1.4 2015/01/20 18:31:24 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <compat/include/stdlib.h>
-#include <string.h>
-#include <bitstring.h>
-#include "local.h"
-
-#ifdef __weak_alias
-__weak_alias(unsetenv,_unsetenv)
-#endif
-
-#include "env.h"
-
-__warn_references(unsetenv,
-    "warning: reference to compatibility unsetenv();"
-    " include <stdlib.h> for correct reference")
-
-/*
- * unsetenv(name) --
- *	Delete environmental variable "name".
- */
-void
-unsetenv(const char *name)
-{
-	size_t l_name;
-
-	_DIAGASSERT(name != NULL);
-
-	l_name = strlen(name);
-	if (__writelockenv()) {
-		ssize_t offset;
-
-		while ((offset = __getenvslot(name, l_name, false)) != -1) {
-			char **p;		
-			for (p = &environ[offset]; ; ++p) {
-				if ((*p = *(p + 1)) == NULL)
-					break;
-			}
-		}
-		(void)__unlockenv();
-	}
-}
diff --git a/lib/libc/compat/sys/Lint_Ovfork.c b/lib/libc/compat/sys/Lint_Ovfork.c
deleted file mode 100644
index 33cd226ac..000000000
--- a/lib/libc/compat/sys/Lint_Ovfork.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: Lint_Ovfork.c,v 1.1 2006/03/11 21:07:18 christos Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#if 0
-#include <unistd.h>
-#else
-#include <sys/cdefs.h>
-#include <sys/types.h>
-pid_t vfork __P((void));
-#endif
-
-/*ARGSUSED*/
-pid_t
-vfork()
-{
-	return (0);
-}
diff --git a/lib/libc/compat/sys/Makefile.inc b/lib/libc/compat/sys/Makefile.inc
deleted file mode 100644
index ddc208b53..000000000
--- a/lib/libc/compat/sys/Makefile.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.9 2013/03/29 02:09:58 christos Exp $
-
-#__MINIX: Not everything is imported yet.
-.PATH: ${COMPATDIR}/sys
-SRCS+= compat_getdents.c compat_getdirentries.c \
-    compat_sched.c \
-    compat_stat.c \
-    compat_socket.c \
-    \
-    compat_getrusage.c compat_gettimeofday.c compat_utimes.c \
-    compat_wait4.c compat_settimeofday.c \
-    compat_clock.c compat_itimer.c compat_nanosleep.c \
-    compat_adjtime.c compat_mknod.c \
-    \
-    compat___shmctl13.c \
-    
-MAN+=	getdirentries.3
-
-.if ${MKLINT} != "no"
-LSRCS+= Lint_Ovfork.c
-.endif
diff --git a/lib/libc/compat/sys/compat___fhstat30.c b/lib/libc/compat/sys/compat___fhstat30.c
deleted file mode 100644
index 8bb5e8813..000000000
--- a/lib/libc/compat/sys/compat___fhstat30.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: compat___fhstat30.c,v 1.6 2013/10/04 21:07:37 christos Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Martin Husemann <martin@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat___fhstat30.c,v 1.6 2013/10/04 21:07:37 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <compat/include/fstypes.h>
-#include <compat/sys/mount.h>
-
-__warn_references(fhstat,
-    "warning: reference to compatibility __fhstat30(); include <sys/mount.h> to generate correct reference")
-
-__strong_alias(__fhstat30, __compat___fhstat30)
-
-/*
- * Convert old fhstat() call to new calling convention
- */
-int
-__compat___fhstat30(const struct compat_30_fhandle *fhp, struct stat30 *sb)
-{
-	return __compat___fhstat40(fhp, FHANDLE30_SIZE, sb);
-}
diff --git a/lib/libc/compat/sys/compat___lwp_park50.c b/lib/libc/compat/sys/compat___lwp_park50.c
deleted file mode 100644
index e13a80f4c..000000000
--- a/lib/libc/compat/sys/compat___lwp_park50.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: compat___lwp_park50.c,v 1.2 2014/01/31 20:45:49 christos Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas <christos@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat___lwp_park50.c,v 1.2 2014/01/31 20:45:49 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <compat/include/fstypes.h>
-#include <compat/sys/mount.h>
-#include <compat/include/lwp.h>
-
-__warn_references(fhstat,
-    "warning: reference to compatibility ___lwp_park50(); include <lwp.h> to generate correct reference")
-
-/*
- * Convert old __lwp_park() call to new
- */
-int
-___lwp_park50(const struct timespec *ts, lwpid_t unpark, const void *hint,
-	const void *unparkhint)
-{
-	return ___lwp_park60(CLOCK_REALTIME, TIMER_ABSTIME, ts,  unpark,
-	    hint, unparkhint);
-}
diff --git a/lib/libc/compat/sys/compat___msgctl13.c b/lib/libc/compat/sys/compat___msgctl13.c
deleted file mode 100644
index a69b4adc9..000000000
--- a/lib/libc/compat/sys/compat___msgctl13.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: compat___msgctl13.c,v 1.2 2009/01/11 02:46:25 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat___msgctl13.c,v 1.2 2009/01/11 02:46:25 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#define __LIBC12_SOURCE__
-#include <sys/time.h>
-#include <compat/sys/time.h>
-#include <sys/msg.h>
-#include <compat/sys/msg.h>
-
-__warn_references(__msgctl13,
-    "warning: reference to compatibility __msgctl13(); include <sys/msg.h> to generate correct reference")
-
-int
-__msgctl13(int msqid, int cmd, struct msqid_ds13 *ds13)
-{
-	struct msqid_ds ds;
-	int error;
-
-	if (cmd == IPC_SET)
-		__msqid_ds13_to_native(ds13, &ds);
-
-	error = __msgctl50(msqid, cmd, &ds);
-	if (error)
-		return error;
-	if (cmd == IPC_STAT)
-		__native_to_msqid_ds13(&ds, ds13);
-	return 0;
-}
diff --git a/lib/libc/compat/sys/compat___ntp_gettime30.c b/lib/libc/compat/sys/compat___ntp_gettime30.c
deleted file mode 100644
index 8511ec401..000000000
--- a/lib/libc/compat/sys/compat___ntp_gettime30.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $NetBSD: compat___ntp_gettime30.c,v 1.2 2009/01/11 02:46:26 christos Exp $ */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat___ntp_gettime30.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <sys/time.h>
-#include <sys/timex.h>
-#include <compat/sys/timex.h>
-
-__warn_references(__ntp_gettime30,
-    "warning: reference to compatibility __ntp_gettime30(); include <sys/timex.h> for correct reference")
-
-int
-__ntp_gettime30(struct ntptimeval50 *ontvp)
-{
-	struct ntptimeval ntv;
-	int res;
-
-	res = __ntp_gettime50(&ntv);
-	ontvp->time.tv_sec = (int32_t)ntv.time.tv_sec;
-	ontvp->time.tv_nsec = ntv.time.tv_nsec;
-	ontvp->maxerror = ntv.maxerror;
-	ontvp->esterror = ntv.esterror;
-
-	return (res);
-}
diff --git a/lib/libc/compat/sys/compat___semctl13.c b/lib/libc/compat/sys/compat___semctl13.c
deleted file mode 100644
index 4a0b0060a..000000000
--- a/lib/libc/compat/sys/compat___semctl13.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*	$NetBSD: compat___semctl13.c,v 1.6 2015/01/29 20:44:38 joerg Exp $ */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat___semctl13.c,v 1.6 2015/01/29 20:44:38 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#define __LIBC12_SOURCE__
-#include <stdarg.h>
-#include <sys/time.h>
-#include <compat/sys/time.h>
-#include <sys/sem.h>
-#include <compat/sys/sem.h>
-#ifdef __lint__
-#include <string.h>
-#endif
-
-__warn_references(__semctl13,
-    "warning: reference to compatibility __semctl13(); include <sys/sem.h> to generate correct reference")
-
-/*
- * Copy timeout to local variable and call the syscall.
- */
-int
-__semctl13(int semid, int semnum, int cmd, ...)
-{
-	va_list ap;
-	union __semun semun;
-	struct semid_ds13 *ds13;
-	struct semid_ds ds;
-	int error;
-
-	va_start(ap, cmd);
-	switch (cmd) {
-	case IPC_SET:
-	case IPC_STAT:
-	case GETALL:
-	case SETVAL:
-	case SETALL:
-#ifdef __lint__
-		memcpy(&semun, &ap, sizeof(semun));
-#else
-		semun = va_arg(ap, union __semun);
-#endif
-		break;
-	default:
-		break;
-	}
-	va_end(ap);
-
-	switch (cmd) {
-	case IPC_SET:
-	case IPC_STAT:
-		ds13 = (void *)semun.buf;
-		semun.buf = &ds;
-		if (cmd == IPC_SET)
-			__semid_ds13_to_native(ds13, &ds);
-		break;
-	default:
-		ds13 = NULL;
-		break;
-	}
-
-
-	error = ____semctl50(semid, semnum, cmd, &semun);
-	if (error)
-		return error;
-
-	if (cmd == IPC_STAT)
-		__native_to_semid_ds13(&ds, ds13);
-	return 0;
-}
diff --git a/lib/libc/compat/sys/compat___shmctl13.c b/lib/libc/compat/sys/compat___shmctl13.c
deleted file mode 100644
index 00c399917..000000000
--- a/lib/libc/compat/sys/compat___shmctl13.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: compat___shmctl13.c,v 1.2 2009/01/11 02:46:26 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat___shmctl13.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#define __LIBC12_SOURCE__
-#include <sys/time.h>
-#include <compat/sys/time.h>
-#include <sys/shm.h>
-#include <compat/sys/shm.h>
-
-__warn_references(__shmctl13,
-    "warning: reference to compatibility __shmctl13(); include <sys/shm.h> to generate correct reference")
-
-int
-__shmctl13(int shmid, int cmd, struct shmid_ds13 *ds13)
-{
-	struct shmid_ds ds;
-	int error;
-
-	if (cmd == IPC_SET)
-		__shmid_ds13_to_native(ds13, &ds);
-
-	error = __shmctl50(shmid, cmd, &ds);
-	if (error)
-		return error;
-	if (cmd == IPC_STAT)
-		__native_to_shmid_ds13(&ds, ds13);
-	return 0;
-}
diff --git a/lib/libc/compat/sys/compat___stat13.c b/lib/libc/compat/sys/compat___stat13.c
deleted file mode 100644
index ea02d1fe1..000000000
--- a/lib/libc/compat/sys/compat___stat13.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*	$NetBSD: compat___stat13.c,v 1.6 2013/10/04 21:07:37 christos Exp $	*/
-
-/*
- * Copyright (c) 1997 Frank van der Linden
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Frank van der Linden
- * 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 <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat___stat13.c,v 1.6 2013/10/04 21:07:37 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/mount.h>
-#include <compat/sys/time.h>
-#include <compat/sys/stat.h>
-#include <compat/sys/mount.h>
-
-__warn_references(__stat13,
-    "warning: reference to compatibility __stat13(); include <sys/stat.h> to generate correct reference")
-
-__warn_references(__fstat13,
-    "warning: reference to compatibility __fstat13(); include <sys/stat.h> to generate correct reference")
-
-__warn_references(__lstat13,
-    "warning: reference to compatibility __lstat13(); include <sys/stat.h> to generate correct reference")
-
-__warn_references(fhstat,
-    "warning: reference to compatibility fhstat(); include <sys/mount.h> to generate correct reference")
-
-__strong_alias(__stat13, __compat___stat13)
-__strong_alias(__fstat13, __compat___fstat13)
-__strong_alias(__lstat13, __compat___lstat13)
-__strong_alias(fhstat, __compat_fhstat)
-
-/*
- * Convert from a new to an old stat structure.
- */
-
-static void cvtstat(struct stat13 *, const struct stat *);
-
-static void
-cvtstat(struct stat13 *ost, const struct stat *st)
-{
-
-	ost->st_dev = (uint32_t)st->st_dev;
-	ost->st_ino = (uint32_t)st->st_ino;
-	ost->st_mode = st->st_mode;
-	ost->st_nlink = st->st_nlink;
-	ost->st_uid = st->st_uid;
-	ost->st_gid = st->st_gid;
-	ost->st_rdev = (uint32_t)st->st_rdev;
-	ost->st_atimespec.tv_sec = (int32_t)st->st_atimespec.tv_sec;
-	ost->st_atimespec.tv_nsec = st->st_atimespec.tv_nsec;
-	ost->st_mtimespec.tv_sec = (int32_t)st->st_mtimespec.tv_sec;
-	ost->st_mtimespec.tv_nsec = st->st_mtimespec.tv_nsec;
-	ost->st_ctimespec.tv_sec = (int32_t)st->st_ctimespec.tv_sec;
-	ost->st_ctimespec.tv_nsec = st->st_ctimespec.tv_nsec;
-	ost->st_birthtimespec.tv_sec = (int32_t)st->st_birthtimespec.tv_sec;
-	ost->st_birthtimespec.tv_nsec = st->st_birthtimespec.tv_nsec;
-	ost->st_size = st->st_size;
-	ost->st_blocks = st->st_blocks;
-	ost->st_blksize = st->st_blksize;
-	ost->st_flags = st->st_flags;
-	ost->st_gen = st->st_gen;
-}
-
-int
-__compat___stat13(const char *file, struct stat13 *ost)
-{
-	struct stat nst;
-	int ret;
-
-	if ((ret = __stat50(file, &nst)) == -1)
-		return ret;
-	cvtstat(ost, &nst);
-	return ret;
-}
-
-int
-__compat___fstat13(int f, struct stat13 *ost)
-{
-	struct stat nst;
-	int ret;
-
-	if ((ret = __fstat50(f, &nst)) == -1)
-		return ret;
-	cvtstat(ost, &nst);
-	return ret;
-}
-
-int
-__compat___lstat13(const char *file, struct stat13 *ost)
-{
-	struct stat nst;
-	int ret;
-
-	if ((ret = __lstat50(file, &nst)) == -1)
-		return ret;
-	cvtstat(ost, &nst);
-	return ret;
-}
-
-int
-__compat_fhstat(const struct compat_30_fhandle *fh, struct stat13 *ost)
-{
-	struct stat nst;
-	int ret;
-
-	if ((ret = __fhstat50((const void *)fh, /* FHANDLE_SIZE_COMPAT */28, &nst)) == -1)
-		return ret;
-	cvtstat(ost, &nst);
-	return ret;
-}
diff --git a/lib/libc/compat/sys/compat___stat30.c b/lib/libc/compat/sys/compat___stat30.c
deleted file mode 100644
index e859453a7..000000000
--- a/lib/libc/compat/sys/compat___stat30.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*	$NetBSD: compat___stat30.c,v 1.4 2013/10/04 21:07:37 christos Exp $	*/
-
-/*
- * Copyright (c) 1997 Frank van der Linden
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Frank van der Linden
- * 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 <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat___stat30.c,v 1.4 2013/10/04 21:07:37 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/mount.h>
-#include <compat/sys/time.h>
-#include <compat/sys/stat.h>
-#include <compat/sys/mount.h>
-
-__warn_references(__stat30,
-    "warning: reference to compatibility __stat30(); include <sys/stat.h> to generate correct reference")
-
-__warn_references(__fstat30,
-    "warning: reference to compatibility __fstat30(); include <sys/stat.h> to generate correct reference")
-
-__warn_references(__lstat30,
-    "warning: reference to compatibility __lstat30(); include <sys/stat.h> to generate correct reference")
-
-__warn_references(__fhstat40,
-    "warning: reference to compatibility __fhstat40(); include <sys/mount.h> to generate correct reference")
-
-
-__strong_alias(__stat30, __compat___stat30)
-__strong_alias(__fstat30, __compat___fstat30)
-__strong_alias(__lstat30, __compat___lstat30)
-__strong_alias(__fhstat40, __compat___fhstat40)
-
-/*
- * Convert from a new to an old stat structure.
- */
-
-static void cvtstat(struct stat30 *, const struct stat *);
-
-static void
-cvtstat(struct stat30 *ost, const struct stat *st)
-{
-
-	ost->st_dev = (uint32_t)st->st_dev;
-	ost->st_ino = st->st_ino;
-	ost->st_mode = st->st_mode;
-	ost->st_nlink = st->st_nlink;
-	ost->st_uid = st->st_uid;
-	ost->st_gid = st->st_gid;
-	ost->st_rdev = (uint32_t)st->st_rdev;
-	timespec_to_timespec50(&st->st_atimespec, &ost->st_atimespec);
-	timespec_to_timespec50(&st->st_mtimespec, &ost->st_mtimespec);
-	timespec_to_timespec50(&st->st_ctimespec, &ost->st_ctimespec);
-	timespec_to_timespec50(&st->st_birthtimespec, &ost->st_birthtimespec);
-	ost->st_size = st->st_size;
-	ost->st_blocks = st->st_blocks;
-	ost->st_blksize = st->st_blksize;
-	ost->st_flags = st->st_flags;
-	ost->st_gen = st->st_gen;
-}
-
-int
-__compat___stat30(const char *file, struct stat30 *ost)
-{
-	struct stat nst;
-	int ret;
-
-	if ((ret = __stat50(file, &nst)) == -1)
-		return ret;
-	cvtstat(ost, &nst);
-	return ret;
-}
-
-int
-__compat___fstat30(int f, struct stat30 *ost)
-{
-	struct stat nst;
-	int ret;
-
-	if ((ret = __fstat50(f, &nst)) == -1)
-		return ret;
-	cvtstat(ost, &nst);
-	return ret;
-}
-
-int
-__compat___lstat30(const char *file, struct stat30 *ost)
-{
-	struct stat nst;
-	int ret;
-
-	if ((ret = __lstat50(file, &nst)) == -1)
-		return ret;
-	cvtstat(ost, &nst);
-	return ret;
-}
-
-int
-__compat___fhstat40(const void *fh, size_t fh_size, struct stat30 *ost)
-{
-	struct stat nst;
-	int ret;
-
-	if ((ret = __fhstat50(fh, fh_size, &nst)) == -1)
-		return ret;
-	cvtstat(ost, &nst);
-	return ret;
-}
diff --git a/lib/libc/compat/sys/compat__lwp_park.c b/lib/libc/compat/sys/compat__lwp_park.c
deleted file mode 100644
index f4f9b1902..000000000
--- a/lib/libc/compat/sys/compat__lwp_park.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: compat__lwp_park.c,v 1.2 2009/01/11 02:46:26 christos Exp $ */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat__lwp_park.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#define __LIBC12_SOURCE__
-#include <sys/time.h>
-#include <compat/sys/time.h>
-#include <lwp.h>
-#include <compat/include/lwp.h>
-
-__warn_references(_lwp_park,
-    "warning: reference to compatibility _lwp_park(); include <lwp.h> to generate correct reference")
-
-/*
- * Copy timeout to local variable and call the syscall.
- */
-int
-_lwp_park(const struct timespec50 *ts50, lwpid_t unpark,
-    const void *hint, const void *unparkhint)
-{
-	struct timespec ts, *tsp;
-
-	if (ts50)
-		timespec50_to_timespec(ts50, tsp = &ts);
-	else
-		tsp = NULL;
-	return ___lwp_park50(tsp, unpark, hint, unparkhint);
-}
diff --git a/lib/libc/compat/sys/compat_adjtime.c b/lib/libc/compat/sys/compat_adjtime.c
deleted file mode 100644
index b6a242f53..000000000
--- a/lib/libc/compat/sys/compat_adjtime.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: compat_adjtime.c,v 1.2 2009/01/11 02:46:26 christos Exp $ */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 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 valific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_adjtime.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#define __LIBC12_SOURCE__
-#include <sys/time.h>
-#include <compat/sys/time.h>
-
-__warn_references(adjtime,
-    "warning: reference to compatibility adjtime(); include <time.h> to generate correct reference")
-
-#ifdef __weak_alias
-__weak_alias(adjtime, _adjtime)
-__weak_alias(__adjtime, _adjtime)
-#endif
-
-/*
- * Copy timeout to local variable and call the syscall.
- */
-int
-adjtime(const struct timeval50 *ts50, struct timeval50 *rts50)
-{
-	struct timeval ts, *tsp;
-	struct timeval rts, *rtsp;
-	int error;
-
-	rtsp = rts50 ? &rts : NULL;
-	if (ts50)
-		timeval50_to_timeval(ts50, tsp = &ts);
-	else
-		tsp = NULL;
-	error = __adjtime50(tsp, rtsp);
-	if (error)
-		return error;
-	if (rts50)
-		timeval_to_timeval50(rtsp, rts50);
-	return 0;
-}
diff --git a/lib/libc/compat/sys/compat_aio_suspend.c b/lib/libc/compat/sys/compat_aio_suspend.c
deleted file mode 100644
index 3639f5ba9..000000000
--- a/lib/libc/compat/sys/compat_aio_suspend.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: compat_aio_suspend.c,v 1.2 2009/01/11 02:46:26 christos Exp $ */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_aio_suspend.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#define __LIBC12_SOURCE__
-#include <time.h>
-#include <compat/include/time.h>
-#include <compat/include/aio.h>
-
-__warn_references(aio_suspend,
-    "warning: reference to compatibility aio_suspend(); include <aio.h> to generate correct reference")
-
-#ifdef __weak_alias
-__weak_alias(aio_suspend, _aio_suspend)
-__weak_alias(_sys_aio_suspend, _aio_suspend)
-#endif
-/*
- * Copy timeout to local variable and call the syscall.
- */
-int
-aio_suspend(const struct aiocb * const list[], int nent,
-    const struct timespec50 * ts50)
-{
-	struct timespec ts, *tsp;
-
-	if (ts50)
-		timespec50_to_timespec(ts50, tsp = &ts);
-	else
-		tsp = NULL;
-	return __aio_suspend50(list, nent, tsp);
-}
diff --git a/lib/libc/compat/sys/compat_clock.c b/lib/libc/compat/sys/compat_clock.c
deleted file mode 100644
index c3f56451a..000000000
--- a/lib/libc/compat/sys/compat_clock.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$NetBSD: compat_clock.c,v 1.2 2009/01/11 02:46:26 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_clock.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <time.h>
-#include <compat/include/time.h>
-#include <sys/time.h>
-#include <compat/sys/time.h>
-
-__warn_references(clock_gettime,
-    "warning: reference to compatibility clock_gettime(); include <time.h> to generate correct reference")
-__warn_references(clock_settime,
-    "warning: reference to compatibility clock_settime(); include <time.h> to generate correct reference")
-__warn_references(clock_getres,
-    "warning: reference to compatibility clock_getres(); include <time.h> to generate correct reference")
-
-#ifdef __weak_alias
-__weak_alias(clock_settime, _clock_settime)
-__weak_alias(__clock_settime, _clock_settime)
-__weak_alias(clock_gettime, _clock_gettime)
-__weak_alias(clock_getres, _clock_getres)
-#endif
-
-int
-clock_settime(clockid_t clockid, const struct timespec50 * tim50)
-{
-	struct timespec tim, *timp;
-	int error;
-
-	if (tim50)
-		timespec50_to_timespec(tim50, timp = &tim);
-	else
-		timp = NULL;
-	error = __clock_settime50(clockid, timp);
-	if (error)
-		return error;
-	return 0;
-}
-
-int
-clock_gettime(clockid_t clockid, struct timespec50 *tim50)
-{
-	struct timespec tim, *timp = tim50 ? &tim : NULL;
-	int error = __clock_gettime50(clockid, timp);
-	if (error)
-		return error;
-	if (tim50)
-		timespec_to_timespec50(timp, tim50);
-	return 0;
-}
-
-int
-clock_getres(clockid_t clockid, struct timespec50 *tim50)
-{
-	struct timespec tim, *timp = tim50 ? &tim : NULL;
-	int error = __clock_getres50(clockid, timp);
-	if (error)
-		return error;
-	if (tim50)
-		timespec_to_timespec50(timp, tim50);
-	return 0;
-}
diff --git a/lib/libc/compat/sys/compat_fhopen.c b/lib/libc/compat/sys/compat_fhopen.c
deleted file mode 100644
index 438231655..000000000
--- a/lib/libc/compat/sys/compat_fhopen.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: compat_fhopen.c,v 1.4 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Martin Husemann <martin@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_fhopen.c,v 1.4 2008/04/28 20:22:59 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <compat/include/fstypes.h>
-
-__warn_references(fhopen,
-    "warning: reference to compatibility fhopen(); include <sys/mount.h> to generate correct reference")
-
-
-int     __fhopen40(const void *, size_t, int);
-int	fhopen(const struct compat_30_fhandle *, int);
-
-/*
- * Convert old fhopen() call to new calling convention
- */
-int
-fhopen(const struct compat_30_fhandle *fhp, int flags)
-{
-	return __fhopen40(fhp, FHANDLE30_SIZE, flags);
-}
diff --git a/lib/libc/compat/sys/compat_fhstatvfs.c b/lib/libc/compat/sys/compat_fhstatvfs.c
deleted file mode 100644
index 1e2207cfc..000000000
--- a/lib/libc/compat/sys/compat_fhstatvfs.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: compat_fhstatvfs.c,v 1.3 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Martin Husemann <martin@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_fhstatvfs.c,v 1.3 2008/04/28 20:22:59 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <sys/types.h>
-#include <sys/statvfs.h>
-#include <compat/include/fstypes.h>
-
-__warn_references(fhstatvfs,
-    "warning: reference to compatibility fhstatvfs(); include <sys/mount.h> to generate correct reference")
-
-#ifdef __weak_alias
-__weak_alias(fhstatvfs, _fhstatvfs)
-#endif
-
-int	 _fhstatvfs(const struct compat_30_fhandle *fhp, struct statvfs *buf);
-int	__fhstatvfs140(const void *fhp, size_t fh_size, struct statvfs *buf,
-	int flags);
-
-/*
- * Convert old fhstatvs() call to new calling convention
- */
-int
-_fhstatvfs(const struct compat_30_fhandle *fhp, struct statvfs *buf)
-{
-	return __fhstatvfs140(fhp, FHANDLE30_SIZE, buf, ST_WAIT);
-}
diff --git a/lib/libc/compat/sys/compat_fhstatvfs1.c b/lib/libc/compat/sys/compat_fhstatvfs1.c
deleted file mode 100644
index 6eb7db3b0..000000000
--- a/lib/libc/compat/sys/compat_fhstatvfs1.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: compat_fhstatvfs1.c,v 1.3 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Martin Husemann <martin@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_fhstatvfs1.c,v 1.3 2008/04/28 20:22:59 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <sys/types.h>
-#include <sys/statvfs.h>
-#include <compat/include/fstypes.h>
-
-__warn_references(fhstatvfs1,
-    "warning: reference to compatibility fhstatvfs1(); include <sys/mount.h> to generate correct reference")
-
-int	fhstatvfs1(const struct compat_30_fhandle *fhp, struct statvfs *buf,
-	int flags);
-int	__fhstatvfs140(const void *fhp, size_t fh_size, struct statvfs *buf,
-	int flags);
-
-/*
- * Convert old fhstatvs1() call to new calling convention
- */
-int
-fhstatvfs1(const struct compat_30_fhandle *fhp, struct statvfs *buf, int flags)
-{
-	return __fhstatvfs140(fhp, FHANDLE30_SIZE, buf, flags);
-}
diff --git a/lib/libc/compat/sys/compat_getdents.c b/lib/libc/compat/sys/compat_getdents.c
deleted file mode 100644
index c0c372338..000000000
--- a/lib/libc/compat/sys/compat_getdents.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*	$NetBSD: compat_getdents.c,v 1.6 2012/03/13 22:24:48 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2005 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_getdents.c,v 1.6 2012/03/13 22:24:48 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <assert.h>
-#include <dirent.h>
-#include <stddef.h>
-#include <compat/include/dirent.h>
-#include <string.h>
-
-/*
- * libc12 compatible getdents routine.
- */
-int
-getdents(int fd, char *buf, size_t nbytes)
-{
-	struct dirent *ndp, *nndp, *endp;
-	struct dirent12 *odp;
-	ino_t ino;
-	int rv;
-	size_t len;
-
-	if ((rv = __getdents30(fd, buf, nbytes)) == -1)
-		return rv;
-
-	odp = (struct dirent12 *)(void *)buf;
-	ndp = (struct dirent *)(void *)buf;
-	endp = (struct dirent *)(void *)&buf[rv];
-
-	/*
-	 * In-place conversion. This works because odp
-	 * is smaller than ndp, but it has to be done
-	 * in the right sequence.
-	 */
-	for (; ndp < endp; ndp = nndp) {
-		nndp = _DIRENT_NEXT(ndp);
-		/* XXX: avoid unaligned 64-bit access on sparc64 */
-		/* XXX: does this work? */
-		memcpy(&ino, &ndp->d_ino, sizeof(ino_t));
-		odp->d_ino = (uint32_t)ino;
-		if (ndp->d_namlen >= sizeof(odp->d_name))
-			odp->d_namlen = sizeof(odp->d_name) - 1;
-		else
-			odp->d_namlen = (u_int8_t)ndp->d_namlen;
-		odp->d_type = ndp->d_type;
-		(void)memcpy(odp->d_name, ndp->d_name, (size_t)odp->d_namlen);
-		odp->d_name[odp->d_namlen] = '\0';
-		len = _DIRENT_SIZE(odp);
-		_DIAGASSERT(__type_fit(uint16_t, len));
-		odp->d_reclen = (uint16_t)len;
-		odp = _DIRENT_NEXT(odp);
-	}
-	ptrdiff_t td = (((char *)(void *)odp) - buf);
-	_DIAGASSERT(__type_fit(int, td));
-	return (int)td;
-}
diff --git a/lib/libc/compat/sys/compat_getdirentries.c b/lib/libc/compat/sys/compat_getdirentries.c
deleted file mode 100644
index a77de9ea2..000000000
--- a/lib/libc/compat/sys/compat_getdirentries.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: compat_getdirentries.c,v 1.3 2012/03/20 17:06:00 matt Exp $	*/
-
-/*
- * Copyright (c) 1997 Frank van der Linden
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Frank van der Linden 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 <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_getdirentries.c,v 1.3 2012/03/20 17:06:00 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-#include "namespace.h"
-#include <sys/types.h>
-#include <dirent.h>
-#include <compat/include/dirent.h>
-#include <unistd.h>
-
-__warn_references(getdirentries,
-    "reference to compatibility-only getdirentries(); this will break; use getdents() or readdir() instead")
-
-int
-getdirentries(int fd, char *buf, int nbytes, long *basep)
-{
-	*basep = (long)lseek(fd, (off_t)0, SEEK_CUR);
-	return getdents(fd, buf, (size_t)nbytes);
-}
diff --git a/lib/libc/compat/sys/compat_getfh.c b/lib/libc/compat/sys/compat_getfh.c
deleted file mode 100644
index 5c7695004..000000000
--- a/lib/libc/compat/sys/compat_getfh.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: compat_getfh.c,v 1.6 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Martin Husemann <martin@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_getfh.c,v 1.6 2008/04/28 20:22:59 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <compat/include/fstypes.h>
-
-#include <errno.h>
-
-__warn_references(getfh,
-    "warning: reference to compatibility getfh(); include <sys/mount.h> to generate correct reference")
-
-
-int     __getfh30(const char *, void*, size_t *);
-int	getfh(const char *path, struct compat_30_fhandle *fhp);
-
-/*
- * Convert old getfh() call to new calling convention
- */
-int
-getfh(const char *path, struct compat_30_fhandle *fhp)
-{
-	size_t fh_size = sizeof(*fhp);
-	int ret;
-
-	ret = __getfh30(path, (void*)fhp, &fh_size);
-	if (ret != 0) {
-		return ret;
-	}
-	if (fh_size != FHANDLE30_SIZE) {
-		errno = EINVAL;
-		return -1;
-	}
-	return 0;
-}
diff --git a/lib/libc/compat/sys/compat_getrusage.c b/lib/libc/compat/sys/compat_getrusage.c
deleted file mode 100644
index 314ab5a3a..000000000
--- a/lib/libc/compat/sys/compat_getrusage.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: compat_getrusage.c,v 1.4 2013/10/04 21:07:37 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_getrusage.c,v 1.4 2013/10/04 21:07:37 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <string.h>
-#include <sys/types.h>
-#include <sys/resource.h>
-#include <compat/sys/resource.h>
-
-__warn_references(getrusage,
-    "warning: reference to compatibility getrusage(); include <sys/resource.h> to generate correct reference")
-
-__strong_alias(getrusage, __compat_getrusage)
-
-void __rusage_to_rusage50(const struct rusage *, struct rusage50 *);
-
-void
-__rusage_to_rusage50(const struct rusage *ru, struct rusage50 *ru50)
-{
-	(void)memcpy(&ru50->ru_first, &ru->ru_first,
-	    (size_t)((char *)(void *)&ru50->ru_last -
-	    (char *)(void *)&ru50->ru_first));
-	ru50->ru_maxrss = ru->ru_maxrss;
-	timeval_to_timeval50(&ru->ru_utime, &ru50->ru_utime);
-	timeval_to_timeval50(&ru->ru_stime, &ru50->ru_stime);
-}
-
-/*
- * libc12 compatible getrusage routine.
- */
-int
-__compat_getrusage(int who, struct rusage50 *ru50)
-{
-	struct rusage ru;
-	int rv;
-
-	if ((rv = __getrusage50(who, &ru)) == -1)
-		return rv;
-	__rusage_to_rusage50(&ru, ru50);
-	return rv;
-}
diff --git a/lib/libc/compat/sys/compat_gettimeofday.c b/lib/libc/compat/sys/compat_gettimeofday.c
deleted file mode 100644
index 838ffdf78..000000000
--- a/lib/libc/compat/sys/compat_gettimeofday.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: compat_gettimeofday.c,v 1.4 2013/10/04 21:07:37 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_gettimeofday.c,v 1.4 2013/10/04 21:07:37 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <compat/sys/time.h>
-
-__warn_references(gettimeofday,
-    "warning: reference to compatibility gettimeofday(); include <sys/time.h> to generate correct reference")
-
-__strong_alias(gettimeofday, __compat_gettimeofday)
-
-/*
- * libc12 compatible gettimeofday routine.
- */
-int
-__compat_gettimeofday(struct timeval50 *tv50, void *tzp)
-{
-	struct timeval tv;
-	int rv;
-
-	if ((rv = __gettimeofday50(&tv, tzp)) == -1)
-		return rv;
-	timeval_to_timeval50(&tv, tv50);
-	return rv;
-}
diff --git a/lib/libc/compat/sys/compat_itimer.c b/lib/libc/compat/sys/compat_itimer.c
deleted file mode 100644
index e31dec76a..000000000
--- a/lib/libc/compat/sys/compat_itimer.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: compat_itimer.c,v 1.2 2009/01/11 02:46:26 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_itimer.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <time.h>
-#include <compat/include/time.h>
-#include <sys/time.h>
-#include <compat/sys/time.h>
-
-__warn_references(getitimer,
-    "warning: reference to compatibility getitimer(); include <sys/time.h> to generate correct reference")
-__warn_references(setitimer,
-    "warning: reference to compatibility setitimer(); include <sys/time.h> to generate correct reference")
-
-int
-setitimer(int timerid, const struct itimerval50 * __restrict tim50,
-    struct itimerval50 * __restrict otim50)
-{
-	struct itimerval tim, *timp;
-	struct itimerval otim, *otimp;
-	int error;
-
-	otimp = otim50 ? &otim : NULL;
-	if (tim50)
-		itimerval50_to_itimerval(tim50, timp = &tim);
-	else
-		timp = NULL;
-	error = __setitimer50(timerid, timp, otimp);
-	if (error)
-		return error;
-	if (otim50)
-		itimerval_to_itimerval50(otimp, otim50);
-	return 0;
-}
-
-int
-getitimer(int timerid, struct itimerval50 *tim50)
-{
-	struct itimerval tim, *timp = tim50 ? &tim : NULL;
-	int error = __getitimer50(timerid, timp);
-	if (error)
-		return error;
-	if (tim50)
-		itimerval_to_itimerval50(timp, tim50);
-	return 0;
-}
diff --git a/lib/libc/compat/sys/compat_kevent.c b/lib/libc/compat/sys/compat_kevent.c
deleted file mode 100644
index c613f0735..000000000
--- a/lib/libc/compat/sys/compat_kevent.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: compat_kevent.c,v 1.2 2009/01/11 02:46:26 christos Exp $ */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_kevent.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#define __LIBC12_SOURCE__
-#include <sys/time.h>
-#include <compat/sys/time.h>
-#include <sys/event.h>
-#include <compat/sys/event.h>
-
-__warn_references(kevent,
-    "warning: reference to compatibility kevent(); include <sys/event.h> to generate correct reference")
-
-int
-kevent(int kq, const struct kevent *changelist, size_t nchanges,
-    struct kevent *eventlist, size_t nevents, const struct timespec50 *ts50)
-{
-	struct timespec ts, *tsp;
-
-	if (ts50)
-		timespec50_to_timespec(ts50, tsp = &ts);
-	else
-		tsp = NULL;
-	return __kevent50(kq, changelist, nchanges, eventlist, nevents, tsp);
-}
diff --git a/lib/libc/compat/sys/compat_lfs_segwait.c b/lib/libc/compat/sys/compat_lfs_segwait.c
deleted file mode 100644
index 5a4cead1c..000000000
--- a/lib/libc/compat/sys/compat_lfs_segwait.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: compat_lfs_segwait.c,v 1.2 2009/01/11 02:46:26 christos Exp $ */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 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 valific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_lfs_segwait.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#define __LIBC12_SOURCE__
-#include <sys/types.h>
-#include <sys/fstypes.h>
-#include <sys/time.h>
-#include <compat/sys/time.h>
-
-__warn_references(lfs_segwait,
-    "warning: reference to compatibility lfs_segwait(); include <???.h> to generate correct reference")
-
-int lfs_segwait(fsid_t *, struct timeval50 *);
-int __lfs_segwait50(fsid_t *, struct timeval *);
-int
-lfs_segwait(fsid_t *fsid, struct timeval50 *ts50)
-{
-	struct timeval ts, *tsp;
-
-	if (ts50)
-		timeval50_to_timeval(ts50, tsp = &ts);
-	else
-		tsp = NULL;
-	return __lfs_segwait50(fsid, tsp);
-}
diff --git a/lib/libc/compat/sys/compat_mknod.c b/lib/libc/compat/sys/compat_mknod.c
deleted file mode 100644
index dc354555e..000000000
--- a/lib/libc/compat/sys/compat_mknod.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: compat_mknod.c,v 1.4 2013/10/04 21:07:37 christos Exp $ */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_mknod.c,v 1.4 2013/10/04 21:07:37 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#define __LIBC12_SOURCE__
-#include <sys/time.h>
-#include <compat/sys/time.h>
-#include <sys/stat.h>
-#include <compat/sys/stat.h>
-
-__warn_references(mknod,
-    "warning: reference to compatibility mknod(); include <time.h> to generate correct reference")
-
-__strong_alias(mknod, __compat_mknod)
-
-int
-__compat_mknod(const char *path, mode_t mode, uint32_t dev)
-{
-	return __mknod50(path, mode, dev);
-}
diff --git a/lib/libc/compat/sys/compat_mount.c b/lib/libc/compat/sys/compat_mount.c
deleted file mode 100644
index 83f8f3c3f..000000000
--- a/lib/libc/compat/sys/compat_mount.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*	$NetBSD: compat_mount.c,v 1.2 2007/07/18 20:10:47 dsl Exp $	*/
-
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_mount.c,v 1.2 2007/07/18 20:10:47 dsl Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <sys/types.h>
-#include <sys/mount.h>
-
-__warn_references(mount,
-    "warning: reference to compatibility mount(); include <sys/mount.h> to generate correct reference")
-
-int	mount(const char *, const char *, int, void *);
-int	__mount50(const char *, const char *, int, void *, size_t);
-
-/*
- * Convert old mount() call to new calling convention
- * The kernel will treat length 0 as 'default for the fs'.
- * We need to throw away the +ve response for MNT_GETARGS.
- */
-int
-mount(const char *type, const char *dir, int flags, void *data)
-{
-	return __mount50(type, dir, flags, data, 0) == -1 ? -1 : 0;
-}
diff --git a/lib/libc/compat/sys/compat_mqueue.c b/lib/libc/compat/sys/compat_mqueue.c
deleted file mode 100644
index 41244f81a..000000000
--- a/lib/libc/compat/sys/compat_mqueue.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*	$NetBSD: compat_mqueue.c,v 1.2 2009/01/11 02:46:26 christos Exp $ */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_mqueue.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#define __LIBC12_SOURCE__
-#include <sys/time.h>
-#include <compat/sys/time.h>
-#include <mqueue.h>
-#include <compat/include/mqueue.h>
-
-__warn_references(mq_timedreceive,
-    "warning: reference to compatibility mq_timedreceive(); include <mqueue.h> to generate correct reference")
-__warn_references(mq_timedsend,
-    "warning: reference to compatibility mq_timedsend(); include <mqueue.h> to generate correct reference")
-
-#ifdef __weak_alias
-__weak_alias(mq_timedreceive, _mq_timedreceive)
-__weak_alias(mq_timedsend, _mq_timedsend)
-__weak_alias(_sys_mq_timedreceive, _mq_timedreceive)
-__weak_alias(_sys_mq_timedsend, _mq_timedsend)
-#endif
-
-ssize_t
-mq_timedreceive(mqd_t mq, char * __restrict name, size_t len,
-    unsigned * __restrict buf, const struct timespec50 * __restrict ts50)
-{
-	struct timespec ts, *tsp;
-
-	if (ts50)
-		timespec50_to_timespec(ts50, tsp = &ts);
-	else
-		tsp = NULL;
-	return __mq_timedreceive50(mq, name, len, buf, tsp);
-}
-
-int
-mq_timedsend(mqd_t mq, const char *name, size_t len,
-    unsigned buf, const struct timespec50 *ts50)
-{
-	struct timespec ts, *tsp;
-
-	if (ts50)
-		timespec50_to_timespec(ts50, tsp = &ts);
-	else
-		tsp = NULL;
-	return __mq_timedsend50(mq, name, len, buf, tsp);
-}
diff --git a/lib/libc/compat/sys/compat_msync.c b/lib/libc/compat/sys/compat_msync.c
deleted file mode 100644
index b0c2822fe..000000000
--- a/lib/libc/compat/sys/compat_msync.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: compat_msync.c,v 1.2 2012/03/20 17:06:00 matt Exp $	*/
-
-/*
- * Copyright (c) 1997 Frank van der Linden
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Frank van der Linden
- * 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 <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_msync.c,v 1.2 2012/03/20 17:06:00 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <compat/sys/mman.h>
-
-__warn_references(msync,
-    "warning: reference to compatibility msync(); include <sys/mman.h> for correct reference")
-
-int
-msync(void *addr, size_t size)
-{
-	return __msync13(addr, size, MS_SYNC|MS_INVALIDATE);
-}
diff --git a/lib/libc/compat/sys/compat_nanosleep.c b/lib/libc/compat/sys/compat_nanosleep.c
deleted file mode 100644
index 5d76722e0..000000000
--- a/lib/libc/compat/sys/compat_nanosleep.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: compat_nanosleep.c,v 1.2 2009/01/11 02:46:26 christos Exp $ */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_nanosleep.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#define __LIBC12_SOURCE__
-#include <time.h>
-#include <compat/include/time.h>
-
-__warn_references(nanosleep,
-    "warning: reference to compatibility nanosleep(); include <time.h> to generate correct reference")
-
-#ifdef __weak_alias
-__weak_alias(nanosleep, _nanosleep)
-__weak_alias(_sys_nanosleep, _nanosleep)
-#endif
-
-/*
- * Copy timeout to local variable and call the syscall.
- */
-int
-nanosleep(const struct timespec50 *ts50, struct timespec50 *rts50)
-{
-	struct timespec ts, *tsp;
-	struct timespec rts, *rtsp;
-	int error;
-
-	rtsp = rts50 ? &rts : NULL;
-	if (ts50)
-		timespec50_to_timespec(ts50, tsp = &ts);
-	else
-		tsp = NULL;
-	error = __nanosleep50(tsp, rtsp);
-	if (error)
-		return error;
-	if (rts50)
-		timespec_to_timespec50(rtsp, rts50);
-	return 0;
-}
diff --git a/lib/libc/compat/sys/compat_ntp_gettime.c b/lib/libc/compat/sys/compat_ntp_gettime.c
deleted file mode 100644
index 6fbbbbcbe..000000000
--- a/lib/libc/compat/sys/compat_ntp_gettime.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $NetBSD: compat_ntp_gettime.c,v 1.2 2009/01/11 02:46:26 christos Exp $ */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_ntp_gettime.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <sys/time.h>
-#include <sys/timex.h>
-#include <compat/sys/timex.h>
-
-__warn_references(ntp_gettime,
-    "warning: reference to compatibility ntp_gettime(); include <sys/timex.h> for correct reference")
-
-int
-ntp_gettime(struct ntptimeval30 *ontvp)
-{
-	struct ntptimeval ntv;
-	int res;
-
-	res = __ntp_gettime50(&ntv);
-	ontvp->time.tv_sec = (int32_t)ntv.time.tv_sec;
-	ontvp->time.tv_usec = ntv.time.tv_nsec / 1000;
-	ontvp->maxerror = ntv.maxerror;
-	ontvp->esterror = ntv.esterror;
-
-	return (res);
-}
diff --git a/lib/libc/compat/sys/compat_sched.c b/lib/libc/compat/sys/compat_sched.c
deleted file mode 100644
index ceeb099fb..000000000
--- a/lib/libc/compat/sys/compat_sched.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: compat_sched.c,v 1.2 2009/01/11 02:46:26 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_sched.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <compat/sys/time.h>
-#include <unistd.h>
-
-__warn_references(sched_rr_get_interval,
-    "warning: reference to compatibility sched_rr_get_interval(); include <sched.h> to generate correct reference")
-
-int sched_rr_get_interval(pid_t, struct timespec50 *);
-
-int
-/*ARGSUSED*/
-sched_rr_get_interval(pid_t pid, struct timespec50 *interval)
-{
-	interval->tv_sec = 0;
-	interval->tv_nsec = sysconf(_SC_SCHED_RT_TS) * 1000;
-	return 0;
-}
diff --git a/lib/libc/compat/sys/compat_select.c b/lib/libc/compat/sys/compat_select.c
deleted file mode 100644
index c81de97a9..000000000
--- a/lib/libc/compat/sys/compat_select.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*	$NetBSD: compat_select.c,v 1.2 2009/01/11 02:46:26 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_select.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <compat/sys/time.h>
-#include <sys/select.h>
-#include <compat/sys/select.h>
-#include <sys/poll.h>
-#include <compat/sys/poll.h>
-
-__warn_references(pollts,
-    "warning: reference to compatibility pollts(); include <poll.h> to generate correct reference")
-__warn_references(select,
-    "warning: reference to compatibility select(); include <sys/select.h> to generate correct reference")
-__warn_references(pselect,
-    "warning: reference to compatibility pselect(); include <sys/select.h> to generate correct reference")
-
-#ifdef __weak_alias
-__weak_alias(select, _select)
-__weak_alias(_sys_select, _select)
-__weak_alias(pselect, _pselect)
-__weak_alias(_sys_pselect, _pselect)
-__weak_alias(pollts, _pollts)
-__weak_alias(_sys_pollts, _pollts)
-#endif
-int
-pollts(struct pollfd * __restrict fds, nfds_t nfds,
-    const struct timespec50 * __restrict tim50,
-    const sigset_t * __restrict sigmask)
-{
-	struct timespec tim, *timp;
-
-	if (tim50)
-		timespec50_to_timespec(tim50, timp = &tim);
-	else
-		timp = NULL;
-	return __pollts50(fds, nfds, timp, sigmask);
-}
-
-int
-select(int nfds, fd_set * __restrict readfds, fd_set * __restrict writefds,
-    fd_set * __restrict exceptfds, struct timeval50 * __restrict tim50)
-{
-	struct timeval tim, *timp;
-
-	if (tim50)
-		timeval50_to_timeval(tim50, timp = &tim);
-	else
-		timp = NULL;
-	return __select50(nfds, readfds, writefds, exceptfds, timp);
-}
-
-int
-pselect(int nfds, fd_set * __restrict readfds, fd_set * __restrict writefds,
-    fd_set * __restrict exceptfds, const struct timespec50 *__restrict tim50,
-    const sigset_t * __restrict sigmask)
-{
-	struct timespec tim, *timp;
-
-	if (tim50)
-		timespec50_to_timespec(tim50, timp = &tim);
-	else
-		timp = NULL;
-	return __pselect50(nfds, readfds, writefds, exceptfds, timp, sigmask);
-}
diff --git a/lib/libc/compat/sys/compat_semctl.c b/lib/libc/compat/sys/compat_semctl.c
deleted file mode 100644
index 1bc0233c2..000000000
--- a/lib/libc/compat/sys/compat_semctl.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $NetBSD: compat_semctl.c,v 1.6 2015/01/29 20:44:38 joerg Exp $ */
-
-/*
- * Copyright (c) 1994, 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_semctl.c,v 1.6 2015/01/29 20:44:38 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <sys/null.h>
-#include <compat/sys/sem.h>
-#include <stdarg.h>
-#ifdef __lint__
-#include <string.h>
-#endif
-
-int
-semctl(int semid, int semnum, int cmd, ...)
-{
-	va_list ap;
-	union __semun semun;
-	struct semid_ds ds;
-	struct semid_ds14 *ds14;
-	int error;
-
-	va_start(ap, cmd);
-	switch (cmd) {
-	case IPC_SET:
-	case IPC_STAT:
-	case GETALL:
-	case SETVAL:
-	case SETALL:
-#ifdef __lint__
-		memcpy(&semun, &ap, sizeof(semun));
-#else
-		semun = va_arg(ap, union __semun);
-#endif
-		break;
-	default:
-		break;
-	}
-	va_end(ap);
-
-	switch (cmd) {
-	case IPC_SET:
-	case IPC_STAT:
-		ds14 = (void *)semun.buf;
-		if (cmd == IPC_SET)
-			__semid_ds14_to_native(ds14, &ds);
-		semun.buf = &ds;
-		break;
-	default:
-		ds14 = NULL;
-		break;
-	}
-
-	error = __semctl50(semid, semnum, cmd, &semun);
-	if (error)
-		return error;
-
-	if (cmd == IPC_STAT)
-		__native_to_semid_ds14(&ds, ds14);
-	return 0;
-}
diff --git a/lib/libc/compat/sys/compat_settimeofday.c b/lib/libc/compat/sys/compat_settimeofday.c
deleted file mode 100644
index cafbc3fe6..000000000
--- a/lib/libc/compat/sys/compat_settimeofday.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: compat_settimeofday.c,v 1.2 2009/01/11 02:46:26 christos Exp $ */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_settimeofday.c,v 1.2 2009/01/11 02:46:26 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#define __LIBC12_SOURCE__
-#include <time.h>
-#include <compat/include/time.h>
-
-__warn_references(settimeofday,
-    "warning: reference to compatibility settimeofday(); include <time.h> to generate correct reference")
-
-#ifdef __weak_alias
-__weak_alias(settimeofday, _settimeofday)
-__weak_alias(__settimeofday, _settimeofday)
-#endif
-/*
- * Copy timeout to local variable and call the syscall.
- */
-int
-settimeofday(const struct timeval50 * __restrict tv50,
-    const void * __restrict tvp)
-{
-	struct timeval tv;
-	timeval50_to_timeval(tv50, &tv);
-	return __settimeofday50(&tv, tvp);
-}
diff --git a/lib/libc/compat/sys/compat_sigaltstack.c b/lib/libc/compat/sys/compat_sigaltstack.c
deleted file mode 100644
index dfa6d46ef..000000000
--- a/lib/libc/compat/sys/compat_sigaltstack.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: compat_sigaltstack.c,v 1.5 2012/03/20 17:06:00 matt Exp $	*/
-
-/*-
- * Copyright (c) 1997 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_sigaltstack.c,v 1.5 2012/03/20 17:06:00 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <limits.h>
-#include <sys/time.h>
-#include <compat/sys/time.h>
-#include <signal.h>
-#include <compat/include/signal.h>
-#include <stddef.h>
-
-int
-sigaltstack(const struct sigaltstack13 *onss, struct sigaltstack13 *ooss)
-{
-	stack_t nss, oss;
-	int error;
-
-	nss.ss_sp = onss->ss_sp;
-	nss.ss_size = onss->ss_size;
-	nss.ss_flags = onss->ss_flags;
-
-	error = __sigaltstack14(&nss, &oss);
-
-	if (error == 0 && ooss != NULL) {
-		ooss->ss_sp = oss.ss_sp;
-		if (oss.ss_size > INT_MAX)
-			ooss->ss_size = INT_MAX;
-		else
-			ooss->ss_size = (int)oss.ss_size;
-		ooss->ss_flags = oss.ss_flags;
-	}
-
-	return (error);
-}
diff --git a/lib/libc/compat/sys/compat_sigtimedwait.c b/lib/libc/compat/sys/compat_sigtimedwait.c
deleted file mode 100644
index 1d7349536..000000000
--- a/lib/libc/compat/sys/compat_sigtimedwait.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: compat_sigtimedwait.c,v 1.2 2009/01/11 02:46:27 christos Exp $ */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_sigtimedwait.c,v 1.2 2009/01/11 02:46:27 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#define __LIBC12_SOURCE__
-#include <time.h>
-#include <compat/include/time.h>
-#include <signal.h>
-#include <compat/include/signal.h>
-
-#ifdef __weak_alias
-__weak_alias(sigtimedwait, _sigtimedwait)
-#endif
-/*
- * Copy timeout to local variable and call the syscall.
- */
-int
-sigtimedwait(const sigset_t * __restrict set, siginfo_t * __restrict info,
-    const struct timespec50 * __restrict timeout)
-{
-	struct timespec ts;
-
-	if (timeout) {
-		timespec50_to_timespec(timeout, &ts);
-		return ____sigtimedwait50(set, info, &ts);
-	} else
-		return ____sigtimedwait50(set, info, NULL);
-}
-
-int
-__sigtimedwait(const sigset_t * __restrict set, siginfo_t * __restrict info,
-    struct timespec50 * __restrict timeout)
-{
-	return sigtimedwait(set, info, timeout);
-}
diff --git a/lib/libc/compat/sys/compat_socket.c b/lib/libc/compat/sys/compat_socket.c
deleted file mode 100644
index 31a6dc7a5..000000000
--- a/lib/libc/compat/sys/compat_socket.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $NetBSD: compat_socket.c,v 1.1 2006/06/26 21:23:56 mrg Exp $ */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_socket.c,v 1.1 2006/06/26 21:23:56 mrg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <compat/sys/socket.h>
-
-__warn_references(socket,
-    "warning: reference to compatibility socket(); include <sys/socket.h> for correct reference")
-
-int
-socket(int domain, int type, int protocol)
-{
-	int res;
-
-	res = __socket30(domain, type, protocol);
-	if (errno == EAFNOSUPPORT)
-		errno = EPROTONOSUPPORT;
-	return res;
-}
diff --git a/lib/libc/compat/sys/compat_stat.c b/lib/libc/compat/sys/compat_stat.c
deleted file mode 100644
index d9cb4c50f..000000000
--- a/lib/libc/compat/sys/compat_stat.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*	$NetBSD: compat_stat.c,v 1.4 2013/10/04 21:07:37 christos Exp $	*/
-
-/*
- * Copyright (c) 1997 Frank van der Linden
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Frank van der Linden
- * 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 <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_stat.c,v 1.4 2013/10/04 21:07:37 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <compat/sys/time.h>
-#include <compat/sys/stat.h>
-
-__warn_references(stat,
-    "warning: reference to compatibility stat(); include <sys/stat.h> to generate correct reference")
-
-__warn_references(fstat,
-    "warning: reference to compatibility fstat(); include <sys/stat.h> to generate correct reference")
-
-__warn_references(lstat,
-    "warning: reference to compatibility lstat(); include <sys/stat.h> to generate correct reference")
-
-/*
- * Convert from a new to an old stat structure.
- */
-
-static void cvtstat(const struct stat *, struct stat12 *);
-
-__strong_alias(stat, __compat_stat)
-__strong_alias(lstat, __compat_lstat)
-__strong_alias(fstat, __compat_fstat)
-
-static void
-cvtstat(const struct stat *st, struct stat12 *ost)
-{
-
-	ost->st_dev = (uint32_t)st->st_dev;
-	ost->st_ino = (uint32_t)st->st_ino;
-	ost->st_mode = st->st_mode;
-	if (st->st_nlink >= (1 << 15))
-		ost->st_nlink = (1 << 15) - 1;
-	else
-		ost->st_nlink = st->st_nlink;
-	ost->st_uid = st->st_uid;
-	ost->st_gid = st->st_gid;
-	ost->st_rdev = (uint32_t)st->st_rdev;
-	ost->st_atimespec.tv_sec = (int32_t)st->st_atimespec.tv_sec;
-	ost->st_atimespec.tv_nsec = st->st_atimespec.tv_nsec;
-	ost->st_mtimespec.tv_sec = (int32_t)st->st_mtimespec.tv_sec;
-	ost->st_mtimespec.tv_nsec = st->st_mtimespec.tv_nsec;
-	ost->st_ctimespec.tv_sec = (int32_t)st->st_ctimespec.tv_sec;
-	ost->st_ctimespec.tv_nsec = st->st_ctimespec.tv_nsec;
-	ost->st_size = st->st_size;
-	ost->st_blocks = st->st_blocks;
-	ost->st_blksize = st->st_blksize;
-	ost->st_flags = st->st_flags;
-	ost->st_gen = st->st_gen;
-}
-
-int
-__compat_stat(const char *file, struct stat12 *ost)
-{
-	struct stat nst;
-	int ret;
-
-	if ((ret = __stat50(file, &nst)) < 0)
-		return ret;
-	cvtstat(&nst, ost);
-	return ret;
-}
-
-int
-__compat_fstat(int f, struct stat12 *ost)
-{
-	struct stat nst;
-	int ret;
-
-	if ((ret = __fstat50(f, &nst)) < 0)
-		return ret;
-	cvtstat(&nst, ost);
-	return ret;
-}
-
-int
-__compat_lstat(const char *file, struct stat12 *ost)
-{
-	struct stat nst;
-	int ret;
-
-	if ((ret = __lstat50(file, &nst)) < 0)
-		return ret;
-	cvtstat(&nst, ost);
-	return ret;
-}
diff --git a/lib/libc/compat/sys/compat_statfs.c b/lib/libc/compat/sys/compat_statfs.c
deleted file mode 100644
index ca18276e5..000000000
--- a/lib/libc/compat/sys/compat_statfs.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*	$NetBSD: compat_statfs.c,v 1.7 2013/10/04 21:07:37 christos Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_statfs.c,v 1.7 2013/10/04 21:07:37 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <compat/sys/mount.h>
-#include <compat/include/fstypes.h>
-#include <string.h>
-#include <stdlib.h>
-
-__warn_references(statfs,
-    "warning: reference to obsolete statfs(); use statvfs()")
-
-__warn_references(fstatfs,
-    "warning: reference to obsolete fstatfs(); use fstatvfs()")
-
-__warn_references(fhstatfs,
-    "warning: reference to obsolete fhstatfs(); use fhstatvfs()")
-
-__warn_references(getfsstat,
-    "warning: reference to obsolete getfsstat(); use getvfsstat()")
-
-__strong_alias(statfs, __compat_statfs)
-__strong_alias(fstatfs, __compat_fstatfs)
-__strong_alias(fhstatfs, __compat_fhstatfs)
-__strong_alias(getfsstat, __compat_getfsstat)
-
-/*
- * Convert from a new statvfs to an old statfs structure.
- */
-
-static void vfs2fs(struct statfs12 *, const struct statvfs *);
-
-#define MOUNTNO_NONE	0
-#define MOUNTNO_UFS	1		/* UNIX "Fast" Filesystem */
-#define MOUNTNO_NFS	2		/* Network Filesystem */
-#define MOUNTNO_MFS	3		/* Memory Filesystem */
-#define MOUNTNO_MSDOS	4		/* MSDOS Filesystem */
-#define MOUNTNO_CD9660	5		/* iso9660 cdrom */
-#define MOUNTNO_FDESC	6		/* /dev/fd filesystem */
-#define MOUNTNO_KERNFS	7		/* kernel variable filesystem */ 
-#define MOUNTNO_DEVFS	8		/* device node filesystem */
-#define MOUNTNO_AFS	9		/* AFS 3.x */
-static const struct {
-	const char *name;
-	const int value;
-} nv[] = {
-	{ MOUNT_UFS, MOUNTNO_UFS },
-	{ MOUNT_NFS, MOUNTNO_NFS },
-	{ MOUNT_MFS, MOUNTNO_MFS },
-	{ MOUNT_MSDOS, MOUNTNO_MSDOS },
-	{ MOUNT_CD9660, MOUNTNO_CD9660 },
-	{ MOUNT_FDESC, MOUNTNO_FDESC },
-	{ MOUNT_KERNFS, MOUNTNO_KERNFS },
-	{ MOUNT_AFS, MOUNTNO_AFS },
-};
-
-static void
-vfs2fs(struct statfs12 *bfs, const struct statvfs *fs) 
-{
-	size_t i = 0;
-	bfs->f_type = 0;
-	bfs->f_oflags = (short)fs->f_flag;
-
-	for (i = 0; i < sizeof(nv) / sizeof(nv[0]); i++) {
-		if (strcmp(nv[i].name, fs->f_fstypename) == 0) {
-			bfs->f_type = nv[i].value;
-			break;
-		}
-	}
-#define CLAMP(a)	(long)(((a) & ~LONG_MAX) ? LONG_MAX : (a))
-	bfs->f_bsize = CLAMP(fs->f_frsize);
-	bfs->f_iosize = CLAMP(fs->f_iosize);
-	bfs->f_blocks = CLAMP(fs->f_blocks);
-	bfs->f_bfree = CLAMP(fs->f_bfree);
-	if (fs->f_bfree > fs->f_bresvd)
-		bfs->f_bavail = CLAMP(fs->f_bfree - fs->f_bresvd);
-	else
-		bfs->f_bavail = -CLAMP(fs->f_bresvd - fs->f_bfree);
-	bfs->f_files = CLAMP(fs->f_files);
-	bfs->f_ffree = CLAMP(fs->f_ffree);
-	bfs->f_fsid = fs->f_fsidx;
-	bfs->f_owner = fs->f_owner;
-	bfs->f_flags = (long)fs->f_flag;
-	bfs->f_syncwrites = CLAMP(fs->f_syncwrites);
-	bfs->f_asyncwrites = CLAMP(fs->f_asyncwrites);
-	(void)strncpy(bfs->f_fstypename, fs->f_fstypename,
-	    sizeof(bfs->f_fstypename));
-	(void)strncpy(bfs->f_mntonname, fs->f_mntonname,
-	    sizeof(bfs->f_mntonname));
-	(void)strncpy(bfs->f_mntfromname, fs->f_mntfromname,
-	    sizeof(bfs->f_mntfromname));
-}
-
-int
-__compat_statfs(const char *file, struct statfs12 *ost)
-{
-	struct statvfs nst;
-	int ret;
-
-	if ((ret = statvfs(file, &nst)) == -1)
-		return ret;
-	vfs2fs(ost, &nst);
-	return ret;
-}
-
-int
-__compat_fstatfs(int f, struct statfs12 *ost)
-{
-	struct statvfs nst;
-	int ret;
-
-	if ((ret = fstatvfs(f, &nst)) == -1)
-		return ret;
-	vfs2fs(ost, &nst);
-	return ret;
-}
-
-int __fhstatvfs140(const void *fhp, size_t fh_size, struct statvfs *buf,
-    int flags);
-
-int
-__compat_fhstatfs(const struct compat_30_fhandle *fh, struct statfs12 *ost)
-{
-	struct statvfs nst;
-	int ret;
-
-	if ((ret = __fhstatvfs140(fh, FHANDLE30_SIZE, &nst, ST_WAIT)) == -1)
-		return ret;
-	vfs2fs(ost, &nst);
-	return ret;
-}
-
-int
-__compat_getfsstat(struct statfs12 *ost, long size, int flags)
-{
-	struct statvfs *nst;
-	int ret, i;
-	size_t bsize = (size_t)(size / sizeof(*ost)) * sizeof(*nst);
-
-	if (ost != NULL) {
-		if ((nst = malloc(bsize)) == NULL)
-			return -1;
-	} else
-		nst = NULL;
-
-	if ((ret = getvfsstat(nst, bsize, flags)) == -1)
-		goto done;
-	if (nst)
-		for (i = 0; i < ret; i++)
-			vfs2fs(&ost[i], &nst[i]);
-done:
-	if (nst)
-		free(nst);
-	return ret;
-}
diff --git a/lib/libc/compat/sys/compat_timer.c b/lib/libc/compat/sys/compat_timer.c
deleted file mode 100644
index 8c09a393a..000000000
--- a/lib/libc/compat/sys/compat_timer.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: compat_timer.c,v 1.2 2009/01/11 02:46:27 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_timer.c,v 1.2 2009/01/11 02:46:27 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <time.h>
-#include <compat/include/time.h>
-#include <sys/time.h>
-#include <compat/sys/time.h>
-
-__warn_references(timer_gettime,
-    "warning: reference to compatibility timer_gettime(); include <time.h> to generate correct reference")
-__warn_references(timer_settime,
-    "warning: reference to compatibility timer_settime(); include <time.h> to generate correct reference")
-
-int
-timer_settime(timer_t timerid, int flags,
-    const struct itimerspec50 * __restrict tim50,
-    struct itimerspec50 * __restrict otim50)
-{
-	struct itimerspec tim, *timp;
-	struct itimerspec otim, *otimp;
-	int error;
-
-	otimp = otim50 ? &otim : NULL;
-	if (tim50)
-		itimerspec50_to_itimerspec(tim50, timp = &tim);
-	else
-		timp = NULL;
-	error = __timer_settime50(timerid, flags, timp, otimp);
-	if (error)
-		return error;
-	if (otim50)
-		itimerspec_to_itimerspec50(otimp, otim50);
-	return 0;
-}
-
-int
-timer_gettime(timer_t timerid, struct itimerspec50 *tim50)
-{
-	struct itimerspec tim, *timp = tim50 ? &tim : NULL;
-	int error = __timer_gettime50(timerid, timp);
-	if (error)
-		return error;
-	if (tim50)
-		itimerspec_to_itimerspec50(timp, tim50);
-	return 0;
-}
diff --git a/lib/libc/compat/sys/compat_utimes.c b/lib/libc/compat/sys/compat_utimes.c
deleted file mode 100644
index a5664341e..000000000
--- a/lib/libc/compat/sys/compat_utimes.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*	$NetBSD: compat_utimes.c,v 1.2 2009/01/11 02:46:27 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_utimes.c,v 1.2 2009/01/11 02:46:27 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <compat/sys/time.h>
-
-__warn_references(utimes,
-    "warning: reference to compatibility utimes(); include <sys/time.h> to generate correct reference")
-__warn_references(lutimes,
-    "warning: reference to compatibility lutimes(); include <sys/time.h> to generate correct reference")
-__warn_references(futimes,
-    "warning: reference to compatibility futimes(); include <sys/time.h> to generate correct reference")
-
-/*
- * libc12 compatible f,l,utimes routine.
- */
-int
-utimes(const char *path, const struct timeval50 *tv50)
-{
-	struct timeval tv[2];
-
-	if (tv50) {
-		timeval50_to_timeval(&tv50[0], &tv[0]);
-		timeval50_to_timeval(&tv50[1], &tv[1]);
-	}
-	return __utimes50(path, tv50 ? tv : NULL);
-}
-
-int
-lutimes(const char *path, const struct timeval50 *tv50)
-{
-	struct timeval tv[2];
-
-	if (tv50) {
-		timeval50_to_timeval(&tv50[0], &tv[0]);
-		timeval50_to_timeval(&tv50[1], &tv[1]);
-	}
-	return __lutimes50(path, tv50 ? tv : NULL);
-}
-
-int
-futimes(int fd, const struct timeval50 *tv50)
-{
-	struct timeval tv[2];
-
-	if (tv50) {
-		timeval50_to_timeval(&tv50[0], &tv[0]);
-		timeval50_to_timeval(&tv50[1], &tv[1]);
-	}
-	return __futimes50(fd, tv50 ? tv : NULL);
-}
diff --git a/lib/libc/compat/sys/compat_wait4.c b/lib/libc/compat/sys/compat_wait4.c
deleted file mode 100644
index 1b3e8f17a..000000000
--- a/lib/libc/compat/sys/compat_wait4.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*	$NetBSD: compat_wait4.c,v 1.3 2015/03/26 11:17:08 justin Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_wait4.c,v 1.3 2015/03/26 11:17:08 justin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <compat/sys/wait.h>
-#include <sys/resource.h>
-#include <compat/sys/resource.h>
-
-__warn_references(wait3,
-    "warning: reference to compatibility wait3(); include <sys/wait.h> to generate correct reference")
-__warn_references(wait4,
-    "warning: reference to compatibility wait4(); include <sys/wait.h> to generate correct reference")
-
-extern void __rusage_to_rusage50(const struct rusage *, struct rusage50 *);
-
-#ifdef __weak_alias
-__weak_alias(wait4, _wait4)
-__weak_alias(_sys_wait4, _wait4)
-__weak_alias(wait3, _wait3)
-#endif
-
-/*
- * libc12 compatible wait4 routine.
- */
-pid_t
-wait3(int *status, int options, struct rusage50 *ru50)
-{
-	struct rusage ru;
-	pid_t rv;
-
-	if ((rv = __wait350(status, options, ru50 ? &ru : NULL)) == -1)
-		return rv;
-	if (ru50)
-		__rusage_to_rusage50(&ru, ru50);
-	return rv;
-}
-
-pid_t
-wait4(pid_t wpid, int *status, int options, struct rusage50 *ru50)
-{
-	struct rusage ru;
-	pid_t rv;
-
-	if ((rv = __wait450(wpid, status, options, ru50 ? &ru : NULL)) == -1)
-		return rv;
-	if (ru50)
-		__rusage_to_rusage50(&ru, ru50);
-	return rv;
-}
diff --git a/lib/libc/compat/sys/getdirentries.3 b/lib/libc/compat/sys/getdirentries.3
deleted file mode 100644
index b1f4b6e5f..000000000
--- a/lib/libc/compat/sys/getdirentries.3
+++ /dev/null
@@ -1,164 +0,0 @@
-.\"	$NetBSD: getdirentries.3,v 1.1 2005/09/13 01:44:09 christos Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"	@(#)getdirentries.2	8.1 (Berkeley) 6/9/93
-.\"
-.Dd June 9, 1993
-.Dt GETDIRENTRIES 3
-.Os
-.Sh NAME
-.Nm getdirentries
-.Nd "get directory entries in a filesystem independent format"
-.Sh SYNOPSIS
-.In dirent.h
-.Ft int
-.Fn getdirentries "int fd" "char *buf" "int nbytes" "long *basep"
-.Sh DESCRIPTION
-.Bf -symbolic
-.\" This interface is available from the compatibility library, libcompat and
-This interface is provided for compatibility only and
-has been obsoleted by
-.Xr getdents 2 .
-.Ef
-.Pp
-.Fn getdirentries
-reads directory entries from the directory
-referenced by the file descriptor
-.Fa fd
-into the buffer pointed to by
-.Fa buf ,
-in a filesystem independent format.
-Up to
-.Fa nbytes
-of data will be transferred.
-.Fa nbytes
-must be greater than or equal to the
-block size associated with the file,
-see
-.Xr stat 2 .
-Some filesystems may not support
-.Fn getdirentries
-with buffers smaller than this size.
-.Pp
-The data in the buffer is a series of
-.Em dirent
-structures each containing the following entries:
-.Bd -literal -offset indent
-unsigned long	d_fileno;
-unsigned short	d_reclen;
-unsigned short	d_namlen;
-char    	d_name[MAXNAMELEN + 1]; /* see below */
-.Ed
-.Pp
-The
-.Fa d_fileno
-entry is a number which is unique for each
-distinct file in the filesystem.
-Files that are linked by hard links (see
-.Xr link 2 )
-have the same
-.Fa d_fileno .
-If
-.Fa d_fileno
-is zero, the entry refers to a deleted file.
-.Pp
-The
-.Fa d_reclen
-entry is the length, in bytes, of the directory record.
-.Pp
-The
-.Fa d_namlen
-entry specifies the length of the file name excluding the null byte.
-Thus the actual size of
-.Fa d_name
-may vary from 1 to
-.Dv MAXNAMELEN
-\&+ 1.
-.Pp
-The
-.Fa d_name
-entry contains a null terminated file name.
-.Pp
-Entries may be separated by extra space.
-The
-.Fa d_reclen
-entry may be used as an offset from the start of a
-.Fa dirent
-structure to the next structure, if any.
-.Pp
-The actual number of bytes transferred is returned.
-The current position pointer associated with
-.Fa fd
-is set to point to the next block of entries.
-The pointer may not advance by the number of bytes returned by
-.Fn getdirentries .
-A value of zero is returned when
-the end of the directory has been reached.
-.Pp
-.Fn getdirentries
-writes the position of the block read into the location pointed to by
-.Fa basep .
-Alternatively, the current position pointer may be set and retrieved by
-.Xr lseek 2 .
-The current position pointer should only be set to a value returned by
-.Xr lseek 2 ,
-a value returned in the location pointed to by
-.Fa basep ,
-or zero.
-.Sh RETURN VALUES
-If successful, the number of bytes actually transferred is returned.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn getdirentries
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa fd
-is not a valid file descriptor open for reading.
-.It Bq Er EFAULT
-Either
-.Fa buf
-or
-.Fa basep
-point outside the allocated address space.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr lseek 2 ,
-.Xr open 2
-.Sh HISTORY
-The
-.Fn getdirentries
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/compat/time/Makefile.inc b/lib/libc/compat/time/Makefile.inc
deleted file mode 100644
index 9728ed1c3..000000000
--- a/lib/libc/compat/time/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2009/01/11 03:46:25 christos Exp $
-
-.PATH: ${COMPATDIR}/time
-SRCS+= compat_localtime.c compat_difftime.c
diff --git a/lib/libc/compat/time/compat_difftime.c b/lib/libc/compat/time/compat_difftime.c
deleted file mode 100644
index 30f08ff01..000000000
--- a/lib/libc/compat/time/compat_difftime.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: compat_difftime.c,v 1.2 2009/01/11 03:46:25 christos Exp $	*/
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include "namespace.h"
-#include <sys/cdefs.h>
-
-#define __LIBC12_SOURCE__
-#include <time.h>
-#include <sys/time.h>
-#include <compat/include/time.h>
-#include <compat/sys/time.h>
-
-#ifdef __weak_alias
-__weak_alias(difftime,_difftime)
-#endif
-
-#define timeval timeval50
-#define timespec timespec50
-#define	time_t	int32_t
-
-#include "time/difftime.c"
diff --git a/lib/libc/compat/time/compat_localtime.c b/lib/libc/compat/time/compat_localtime.c
deleted file mode 100644
index 03a63e1a0..000000000
--- a/lib/libc/compat/time/compat_localtime.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: compat_localtime.c,v 1.3 2011/02/21 22:07:44 christos Exp $	*/
-
-/*
- * Written by Jason R. Thorpe <thorpej@NetBSD.org>, October 21, 1997.
- * Public domain.
- */
-
-#include "namespace.h"
-#include <sys/cdefs.h>
-
-#define __LIBC12_SOURCE__
-#include <time.h>
-#include <sys/time.h>
-#include <compat/include/time.h>
-#include <compat/sys/time.h>
-
-#ifdef __weak_alias
-__weak_alias(ctime_r,_ctime_r)
-__weak_alias(ctime_rz,_ctime_rz)
-__weak_alias(gmtime_r,_gmtime_r)
-__weak_alias(localtime_r,_localtime_r)
-__weak_alias(localtime_rz,_localtime_rz)
-__weak_alias(mktime_z,_mktime_z)
-__weak_alias(offtime,_offtime)
-__weak_alias(posix2time,_posix2time)
-__weak_alias(posix2time_z,_posix2time_z)
-__weak_alias(time2posix,_time2posix)
-__weak_alias(timegm,_timegm)
-__weak_alias(timelocal,_timelocal)
-__weak_alias(timeoff,_timeoff)
-__weak_alias(tzset,_tzset)
-__weak_alias(tzsetwall,_tzsetwall)
-#endif
-
-__warn_references(ctime_r,
-    "warning: reference to compatibility ctime_r();"
-    " include <time.h> for correct reference")
-__warn_references(ctime_rz,
-    "warning: reference to compatibility ctime_rz();"
-    " include <time.h> for correct reference")
-__warn_references(gmtime_r,
-    "warning: reference to compatibility gmtime_r();"
-    " include <time.h> for correct reference")
-__warn_references(localtime_r,
-    "warning: reference to compatibility localtime_r();"
-    " include <time.h> for correct reference")
-__warn_references(localtime_rz,
-    "warning: reference to compatibility localtime_rz();"
-    " include <time.h> for correct reference")
-__warn_references(mktime_z,
-    "warning: reference to compatibility mktime_z();"
-    " include <time.h> for correct reference")
-__warn_references(offtime,
-    "warning: reference to compatibility offtime();"
-    " include <time.h> for correct reference")
-__warn_references(posix2time,
-    "warning: reference to compatibility posix2time();"
-    " include <time.h> for correct reference")
-__warn_references(posix2time_z,
-    "warning: reference to compatibility posix2time_z();"
-    " include <time.h> for correct reference")
-__warn_references(time2posix,
-    "warning: reference to compatibility time2posix();"
-    " include <time.h> for correct reference")
-__warn_references(timegm,
-    "warning: reference to compatibility timegm();"
-    " include <time.h> for correct reference")
-__warn_references(timelocal,
-    "warning: reference to compatibility timelocal();"
-    " include <time.h> for correct reference")
-__warn_references(timeoff,
-    "warning: reference to compatibility timeoff();"
-    " include <time.h> for correct reference")
-__warn_references(tzset,
-    "warning: reference to compatibility tzset();"
-    " include <time.h> for correct reference")
-__warn_references(tzsetwall,
-    "warning: reference to compatibility tzsetwall();"
-    " include <time.h> for correct reference")
-
-#define timeval timeval50
-#define timespec timespec50
-#define	time_t	int32_t
-
-#include "time/localtime.c"
diff --git a/lib/libc/compiler_rt/Makefile.inc b/lib/libc/compiler_rt/Makefile.inc
deleted file mode 100644
index 2185c3657..000000000
--- a/lib/libc/compiler_rt/Makefile.inc
+++ /dev/null
@@ -1,270 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.27 2014/09/03 19:29:14 matt Exp $
-
-COMPILER_RT_SRCDIR=	${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
-.if ${LIBC_MACHINE_ARCH} == "powerpc" || ${LIBC_MACHINE_ARCH} == "powerpc64"
-COMPILER_RT_CPU_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/ppc
-COMPILER_RT_ARCH_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/ppc
-.else
-COMPILER_RT_CPU_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/${LIBC_MACHINE_CPU}
-COMPILER_RT_ARCH_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/${LIBC_MACHINE_ARCH}
-.endif
-
-.if defined(__MINIX)
-LIBC_MACHINE_CPU?=      ${MACHINE_CPU}
-.endif # defined(__MINIX)
-
-.PATH: ${COMPILER_RT_CPU_DIR}
-.PATH: ${COMPILER_RT_ARCH_DIR}
-.PATH: ${COMPILER_RT_SRCDIR}/lib/builtins
-.PATH: ${COMPILER_RT_SRCDIR}/lib/profile
-
-# Complex support needs parts of libm
-#GENERIC_SRCS+=
-#	mulxc3.c \
-#	mulsc3.c \
-#	divxc3.c \
-#	divdc3.c \
-#	divsc3.c
-
-# Implemented on top of our atomic interface.
-#GENERIC_SRCS+= atomic.c
-
-.if ${HAVE_LIBGCC_EH} == "no"
-GENERIC_SRCS+= \
-	gcc_personality_v0.c
-.endif
-
-.if 0
-# Conflicts with soft-float
-GENERIC_SRCS+= \
-	comparedf2.c \
-	comparesf2.c \
-	adddf3.c \
-	addsf3.c \
-	addtf3.c \
-	divdf3.c \
-	divsf3.c \
-	divtf3.c \
-	extendsfdf2.c \
-	extendsftf2.c \
-	extenddftf2.c \
-	fixdfsi.c \
-	fixdfti.c \
-	fixsfsi.c \
-	fixsfti.c \
-	floatsidf.c \
-	floatsisf.c \
-	floatunsidf.c \
-	floatunsisf.c \
-	muldf3.c \
-	mulsf3.c \
-	multf3.c \
-	subdf3.c \
-	subsf3.c \
-	subtf3.c \
-	truncdfsf2.c \
-	trunctfdf2.c \
-	trunctfsf2.c
-.endif
-
-GENERIC_SRCS+= \
-	absvsi2.c \
-	absvti2.c \
-	addvsi3.c \
-	addvti3.c \
-	ashlti3.c \
-	ashrti3.c \
-	clzti2.c \
-	cmpti2.c \
-	ctzti2.c \
-	divti3.c \
-	ffsti2.c \
-	fixsfdi.c \
-	fixdfdi.c \
-	fixunsdfdi.c \
-	fixunsdfsi.c \
-	fixunssfdi.c \
-	fixunssfsi.c \
-	fixunsxfdi.c \
-	fixunsxfsi.c \
-	fixxfdi.c \
-	floatdidf.c \
-	floatdisf.c \
-	floatdixf.c \
-	floatundidf.c \
-	floatundisf.c \
-	floatundixf.c \
-	int_util.c \
-	lshrti3.c \
-	modti3.c \
-	muldc3.c \
-	mulosi4.c \
-	muloti4.c \
-	multi3.c \
-	mulvsi3.c \
-	mulvti3.c \
-	negdf2.c \
-	negsf2.c \
-	negti2.c \
-	negvsi2.c \
-	negvti2.c \
-	paritysi2.c \
-	parityti2.c \
-	popcountsi2.c \
-	popcountti2.c \
-	powidf2.c \
-	powisf2.c \
-	powitf2.c \
-	powixf2.c \
-	subvsi3.c \
-	subvti3.c \
-	ucmpti2.c \
-	udivmodti4.c \
-	udivti3.c \
-	umodti3.c
-
-.if ${MACHINE_ARCH} != "aarch64"
-GENERIC_SRCS+= \
-	fixunsdfti.c \
-	fixunssfti.c \
-	fixunsxfti.c \
-	fixxfti.c \
-	floattidf.c \
-	floattisf.c \
-	floattixf.c \
-	floatuntidf.c \
-	floatuntisf.c \
-	floatuntixf.c
-.endif
-
-# These have h/w instructions which are always used.
-.if ${LIBC_MACHINE_ARCH} != "alpha" && ${LIBC_MACHINE_CPU} != "aarch64" \
-    && ${LIBC_MACHINE_CPU} != "powerpc" && ${LIBC_MACHINE_CPU} != "or1k"
-GENERIC_SRCS+= \
-	clzsi2.c
-.endif
-
-# These have h/w instructions which are always used.
-.if ${LIBC_MACHINE_ARCH} != "alpha" && ${LIBC_MACHINE_ARCH} != "vax" \
-    && ${LIBC_MACHINE_CPU} != "aarch64" && ${LIBC_MACHINE_CPU} != "powerpc" \
-    && ${LIBC_MACHINE_CPU} != "or1k"
-GENERIC_SRCS+= \
-	ctzsi2.c
-.endif
-
-# These have h/w instructions which are always used.
-.if ${LIBC_MACHINE_ARCH} != "alpha" && ${LIBC_MACHINE_CPU} != "powerpc" \
-    && ${LIBC_MACHINE_CPU} != "aarch64" && ${LIBC_MACHINE_ARCH} != "vax"
-GENERIC_SRCS+= \
-	divmodsi4.c \
-	divsi3.c \
-	modsi3.c \
-	udivmodsi4.c \
-	umodsi3.c
-
-. if ${LIBC_MACHINE_CPU} != "sh3"
-# On sh3 __udivsi3 is gcc "millicode" with special calling convention
-# (less registers clobbered than usual).  Each DSO that needs it gets
-# its own hidden copy from libgcc.a.
-GENERIC_SRCS+= \
-	udivsi3.c
-. endif
-.endif
-
-
-GENERIC_SRCS+= \
-	absvdi2.c \
-	addvdi3.c \
-	mulodi4.c \
-	mulvdi3.c \
-	negvdi2.c \
-	paritydi2.c \
-	popcountdi2.c \
-	subvdi3.c
-
-# These have h/w instructions which are always used.
-.if ${LIBC_MACHINE_ARCH} != "alpha" && ${LIBC_MACHINE_CPU} != "powerpc64" \
-    && ${LIBC_MACHINE_ARCH} != "aarch64" && ${LIBC_MACHINE_CPU} != "or1k"
-GENERIC_SRCS+= \
-	clzdi2.c \
-	ctzdi2.c \
-	ffsdi2.c
-.endif
-
-# Don't need these on 64-bit machines.
-.if empty(LIBC_MACHINE_ARCH:M*64*) && ${LIBC_MACHINE_ARCH} != "alpha"
-GENERIC_SRCS+= \
-	cmpdi2.c \
-	ashldi3.c \
-	ashrdi3.c \
-	divdi3.c \
-	divmoddi4.c \
-	lshrdi3.c \
-	moddi3.c \
-	muldi3.c \
-	negdi2.c \
-	ucmpdi2.c \
-	udivdi3.c \
-	udivmoddi4.c \
-	umoddi3.c
-.endif
-
-GENERIC_SRCS+= \
-	GCDAProfiling.c \
-	InstrProfiling.c \
-	InstrProfilingBuffer.c \
-	InstrProfilingFile.c \
-	InstrProfilingPlatformOther.c
-
-.if ${LIBC_MACHINE_ARCH} == "powerpc" || ${LIBC_MACHINE_ARCH} == "powerpc64"
-GENERIC_SRCS+= \
-	fixtfdi.c \
-	fixunstfdi.c \
-	floatditf.c \
-	floatunditf.c \
-	gcc_qadd.c \
-	gcc_qdiv.c \
-	gcc_qmul.c \
-	gcc_qsub.c
-.endif
-
-.if ${LIBC_MACHINE_CPU} == "aarch64"
-GENERIC_SRCS+= \
-	clear_cache.c
-.endif
-
-.if ${LIBC_MACHINE_CPU} == "arm"
-.if !empty(LIBC_MACHINE_ARCH:Mearm*)
-GENERIC_SRCS+= \
-	aeabi_idivmod.S \
-	aeabi_ldivmod.S \
-	aeabi_uidivmod.S \
-	aeabi_uldivmod.S
-.endif
-GENERIC_SRCS+= \
-	clear_cache.c
-# Not yet, overlaps with softfloat
-#	aeabi_dcmp.S \
-#	aeabi_fcmp.S
-# Not yet, requires ARMv6
-#GENERIC_SRCS+= \
-#	bswapdi2.S \
-#	bswapsi2.S
-.endif
-
-.for src in ${GENERIC_SRCS}
-.  if exists(${COMPILER_RT_CPU_DIR}/${src:R}.S) || \
-      exists(${COMPILER_RT_ARCH_DIR}/${src:R}.S)
-SRCS+=	${src:R}.S
-.  else
-SRCS+=	${src}
-.    if ${src:E} != "cc"
-COPTS.${src}+=	-Wno-missing-prototypes \
-		-Wno-old-style-definition \
-		-Wno-strict-prototypes \
-		-Wno-uninitialized \
-		-Wno-cast-qual
-.    endif
-.  endif
-.endfor
diff --git a/lib/libc/db/Makefile.inc b/lib/libc/db/Makefile.inc
deleted file mode 100644
index 0763f5553..000000000
--- a/lib/libc/db/Makefile.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.8 2011/08/09 13:03:36 joerg Exp $
-#	@(#)Makefile.inc	8.2 (Berkeley) 2/21/94
-#
-CPPFLAGS+=-D__DBINTERFACE_PRIVATE
-
-.include "${.CURDIR}/db/btree/Makefile.inc"
-.include "${.CURDIR}/db/db/Makefile.inc"
-.include "${.CURDIR}/db/hash/Makefile.inc"
-.include "${.CURDIR}/db/man/Makefile.inc"
-.include "${.CURDIR}/db/mpool/Makefile.inc"
-.include "${.CURDIR}/db/recno/Makefile.inc"
diff --git a/lib/libc/db/btree/Makefile.inc b/lib/libc/db/btree/Makefile.inc
deleted file mode 100644
index 46fbb029e..000000000
--- a/lib/libc/db/btree/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.6 1996/05/03 21:50:36 cgd Exp $
-#	@(#)Makefile.inc	8.2 (Berkeley) 7/14/94
-
-.PATH: ${.CURDIR}/db/btree
-
-SRCS+=	bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \
-	bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \
-	bt_utils.c
diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c
deleted file mode 100644
index a085952e0..000000000
--- a/lib/libc/db/btree/bt_close.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*	$NetBSD: bt_close.c,v 1.14 2008/09/11 12:58:00 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: bt_close.c,v 1.14 2008/09/11 12:58:00 joerg Exp $");
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <db.h>
-#include "btree.h"
-
-static int bt_meta(BTREE *);
-
-/*
- * BT_CLOSE -- Close a btree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__bt_close(DB *dbp)
-{
-	BTREE *t;
-	int fd;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Sync the tree. */
-	if (__bt_sync(dbp, 0) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Close the memory pool. */
-	if (mpool_close(t->bt_mp) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Free random memory. */
-	if (t->bt_cursor.key.data != NULL) {
-		free(t->bt_cursor.key.data);
-		t->bt_cursor.key.size = 0;
-		t->bt_cursor.key.data = NULL;
-	}
-	if (t->bt_rkey.data) {
-		free(t->bt_rkey.data);
-		t->bt_rkey.size = 0;
-		t->bt_rkey.data = NULL;
-	}
-	if (t->bt_rdata.data) {
-		free(t->bt_rdata.data);
-		t->bt_rdata.size = 0;
-		t->bt_rdata.data = NULL;
-	}
-
-	fd = t->bt_fd;
-	free(t);
-	free(dbp);
-	return (close(fd) ? RET_ERROR : RET_SUCCESS);
-}
-
-/*
- * BT_SYNC -- sync the btree to disk.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__bt_sync(const DB *dbp, u_int flags)
-{
-	BTREE *t;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Sync doesn't currently take any flags. */
-	if (flags != 0) {
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	if (F_ISSET(t, B_INMEM | B_RDONLY) || !F_ISSET(t, B_MODIFIED))
-		return (RET_SUCCESS);
-
-	if (F_ISSET(t, B_METADIRTY) && bt_meta(t) == RET_ERROR)
-		return (RET_ERROR);
-
-	if ((status = mpool_sync(t->bt_mp)) == RET_SUCCESS)
-		F_CLR(t, B_MODIFIED);
-
-	return (status);
-}
-
-/*
- * BT_META -- write the tree meta data to disk.
- *
- * Parameters:
- *	t:	tree
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-static int
-bt_meta(BTREE *t)
-{
-	BTMETA m;
-	void *p;
-
-	if ((p = mpool_get(t->bt_mp, P_META, 0)) == NULL)
-		return (RET_ERROR);
-
-	/* Fill in metadata. */
-	m.magic = BTREEMAGIC;
-	m.version = BTREEVERSION;
-	m.psize = t->bt_psize;
-	m.free = t->bt_free;
-	m.nrecs = t->bt_nrecs;
-	m.flags = F_ISSET(t, SAVEMETA);
-
-	memmove(p, &m, sizeof(BTMETA));
-	mpool_put(t->bt_mp, p, MPOOL_DIRTY);
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc/db/btree/bt_conv.c b/lib/libc/db/btree/bt_conv.c
deleted file mode 100644
index 2c5217a39..000000000
--- a/lib/libc/db/btree/bt_conv.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*	$NetBSD: bt_conv.c,v 1.14 2008/09/10 17:52:35 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: bt_conv.c,v 1.14 2008/09/10 17:52:35 joerg Exp $");
-
-#include <assert.h>
-#include <stdio.h>
-
-#include <db.h>
-#include "btree.h"
-
-static void mswap(PAGE *);
-
-/*
- * __BT_BPGIN, __BT_BPGOUT --
- *	Convert host-specific number layout to/from the host-independent
- *	format stored on disk.
- *
- * Parameters:
- *	t:	tree
- *	pg:	page number
- *	h:	page to convert
- */
-void
-__bt_pgin(void *t, pgno_t pg, void *pp)
-{
-	PAGE *h;
-	indx_t i, top;
-	uint8_t flags;
-	char *p;
-
-	if (!F_ISSET(((BTREE *)t), B_NEEDSWAP))
-		return;
-	if (pg == P_META) {
-		mswap(pp);
-		return;
-	}
-
-	h = pp;
-	M_32_SWAP(h->pgno);
-	M_32_SWAP(h->prevpg);
-	M_32_SWAP(h->nextpg);
-	M_32_SWAP(h->flags);
-	M_16_SWAP(h->lower);
-	M_16_SWAP(h->upper);
-
-	top = NEXTINDEX(h);
-	if ((h->flags & P_TYPE) == P_BINTERNAL)
-		for (i = 0; i < top; i++) {
-			M_16_SWAP(h->linp[i]);
-			p = (char *)(void *)GETBINTERNAL(h, i);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			P_32_SWAP(p);
-			p += sizeof(pgno_t);
-			if (*(uint8_t *)p & P_BIGKEY) {
-				p += sizeof(uint8_t);
-				P_32_SWAP(p);
-				p += sizeof(pgno_t);
-				P_32_SWAP(p);
-			}
-		}
-	else if ((h->flags & P_TYPE) == P_BLEAF)
-		for (i = 0; i < top; i++) {
-			M_16_SWAP(h->linp[i]);
-			p = (char *)(void *)GETBLEAF(h, i);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			flags = *(uint8_t *)p;
-			if (flags & (P_BIGKEY | P_BIGDATA)) {
-				p += sizeof(uint8_t);
-				if (flags & P_BIGKEY) {
-					P_32_SWAP(p);
-					p += sizeof(pgno_t);
-					P_32_SWAP(p);
-				}
-				if (flags & P_BIGDATA) {
-					p += sizeof(uint32_t);
-					P_32_SWAP(p);
-					p += sizeof(pgno_t);
-					P_32_SWAP(p);
-				}
-			}
-		}
-}
-
-void
-__bt_pgout(void *t, pgno_t pg, void *pp)
-{
-	PAGE *h;
-	indx_t i, top;
-	uint8_t flags;
-	char *p;
-
-	if (!F_ISSET(((BTREE *)t), B_NEEDSWAP))
-		return;
-	if (pg == P_META) {
-		mswap(pp);
-		return;
-	}
-
-	h = pp;
-	top = NEXTINDEX(h);
-	if ((h->flags & P_TYPE) == P_BINTERNAL)
-		for (i = 0; i < top; i++) {
-			p = (char *)(void *)GETBINTERNAL(h, i);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			P_32_SWAP(p);
-			p += sizeof(pgno_t);
-			if (*(uint8_t *)p & P_BIGKEY) {
-				p += sizeof(uint8_t);
-				P_32_SWAP(p);
-				p += sizeof(pgno_t);
-				P_32_SWAP(p);
-			}
-			M_16_SWAP(h->linp[i]);
-		}
-	else if ((h->flags & P_TYPE) == P_BLEAF)
-		for (i = 0; i < top; i++) {
-			p = (char *)(void *)GETBLEAF(h, i);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			flags = *(uint8_t *)p;
-			if (flags & (P_BIGKEY | P_BIGDATA)) {
-				p += sizeof(uint8_t);
-				if (flags & P_BIGKEY) {
-					P_32_SWAP(p);
-					p += sizeof(pgno_t);
-					P_32_SWAP(p);
-				}
-				if (flags & P_BIGDATA) {
-					p += sizeof(uint32_t);
-					P_32_SWAP(p);
-					p += sizeof(pgno_t);
-					P_32_SWAP(p);
-				}
-			}
-			M_16_SWAP(h->linp[i]);
-		}
-
-	M_32_SWAP(h->pgno);
-	M_32_SWAP(h->prevpg);
-	M_32_SWAP(h->nextpg);
-	M_32_SWAP(h->flags);
-	M_16_SWAP(h->lower);
-	M_16_SWAP(h->upper);
-}
-
-/*
- * MSWAP -- Actually swap the bytes on the meta page.
- *
- * Parameters:
- *	p:	page to convert
- */
-static void
-mswap(PAGE *pg)
-{
-	char *p;
-
-	p = (char *)(void *)pg;
-	P_32_SWAP(p);		/* magic */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* version */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* psize */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* free */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* nrecs */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* flags */
-	p += sizeof(uint32_t);
-}
diff --git a/lib/libc/db/btree/bt_debug.c b/lib/libc/db/btree/bt_debug.c
deleted file mode 100644
index 5b5f2cd81..000000000
--- a/lib/libc/db/btree/bt_debug.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*	$NetBSD: bt_debug.c,v 1.16 2011/07/17 20:47:39 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: bt_debug.c,v 1.16 2011/07/17 20:47:39 christos Exp $");
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-#ifdef DEBUG
-/*
- * BT_DUMP -- Dump the tree
- *
- * Parameters:
- *	dbp:	pointer to the DB
- */
-void
-__bt_dump(DB *dbp)
-{
-	BTREE *t;
-	PAGE *h;
-	pgno_t i;
-	const char *sep;
-
-	t = dbp->internal;
-	(void)fprintf(stderr, "%s: pgsz %d",
-	    F_ISSET(t, B_INMEM) ? "memory" : "disk", t->bt_psize);
-	if (F_ISSET(t, R_RECNO))
-		(void)fprintf(stderr, " keys %lu", (unsigned long) t->bt_nrecs);
-#undef X
-#define	X(flag, name) \
-	if (F_ISSET(t, flag)) { \
-		(void)fprintf(stderr, "%s%s", sep, name); \
-		sep = ", "; \
-	}
-	if (t->flags != 0) {
-		sep = " flags (";
-		X(R_FIXLEN,	"FIXLEN");
-		X(B_INMEM,	"INMEM");
-		X(B_NODUPS,	"NODUPS");
-		X(B_RDONLY,	"RDONLY");
-		X(R_RECNO,	"RECNO");
-		X(B_METADIRTY,"METADIRTY");
-		(void)fprintf(stderr, ")\n");
-	}
-#undef X
-
-	for (i = P_ROOT; (h = mpool_get(t->bt_mp, i, 0)) != NULL; ++i) {
-		__bt_dpage(h);
-		(void)mpool_put(t->bt_mp, h, 0);
-	}
-}
-
-/*
- * BT_DMPAGE -- Dump the meta page
- *
- * Parameters:
- *	h:	pointer to the PAGE
- */
-void
-__bt_dmpage(PAGE *h)
-{
-	BTMETA *m;
-	const char *sep;
-
-	m = (BTMETA *)(void *)h;
-	(void)fprintf(stderr, "magic %lx\n", (unsigned long) m->magic);
-	(void)fprintf(stderr, "version %lu\n", (unsigned long) m->version);
-	(void)fprintf(stderr, "psize %lu\n", (unsigned long) m->psize);
-	(void)fprintf(stderr, "free %lu\n", (unsigned long) m->free);
-	(void)fprintf(stderr, "nrecs %lu\n", (unsigned long) m->nrecs);
-	(void)fprintf(stderr, "flags %lu", (unsigned long) m->flags);
-#undef X
-#define	X(flag, name) \
-	if (m->flags & flag) { \
-		(void)fprintf(stderr, "%s%s", sep, name); \
-		sep = ", "; \
-	}
-	if (m->flags) {
-		sep = " (";
-		X(B_NODUPS,	"NODUPS");
-		X(R_RECNO,	"RECNO");
-		(void)fprintf(stderr, ")");
-	}
-}
-
-static pgno_t
-__bt_pgno_t(const void *m)
-{
-	pgno_t r;
-	memcpy(&r, m, sizeof(r));
-	return r;
-}
-
-static uint32_t
-__bt_uint32_t(const void *m)
-{
-	uint32_t r;
-	memcpy(&r, m, sizeof(r));
-	return r;
-}
-
-/*
- * BT_DNPAGE -- Dump the page
- *
- * Parameters:
- *	n:	page number to dump.
- */
-void
-__bt_dnpage(DB *dbp, pgno_t pgno)
-{
-	BTREE *t;
-	PAGE *h;
-
-	t = dbp->internal;
-	if ((h = mpool_get(t->bt_mp, pgno, 0)) != NULL) {
-		__bt_dpage(h);
-		(void)mpool_put(t->bt_mp, h, 0);
-	}
-}
-
-/*
- * BT_DPAGE -- Dump the page
- *
- * Parameters:
- *	h:	pointer to the PAGE
- */
-void
-__bt_dpage(PAGE *h)
-{
-	BINTERNAL *bi;
-	BLEAF *bl;
-	RINTERNAL *ri;
-	RLEAF *rl;
-	indx_t cur, top;
-	const char *sep;
-
-	(void)fprintf(stderr, "    page %d: (", h->pgno);
-#undef X
-#define	X(flag, name) \
-	if (h->flags & flag) { \
-		(void)fprintf(stderr, "%s%s", sep, name); \
-		sep = ", "; \
-	}
-	sep = "";
-	X(P_BINTERNAL,	"BINTERNAL")		/* types */
-	X(P_BLEAF,	"BLEAF")
-	X(P_RINTERNAL,	"RINTERNAL")		/* types */
-	X(P_RLEAF,	"RLEAF")
-	X(P_OVERFLOW,	"OVERFLOW")
-	X(P_PRESERVE,	"PRESERVE");
-	(void)fprintf(stderr, ")\n");
-#undef X
-
-	(void)fprintf(stderr, "\tprev %2d next %2d", h->prevpg, h->nextpg);
-	if (h->flags & P_OVERFLOW)
-		return;
-
-	top = NEXTINDEX(h);
-	(void)fprintf(stderr, " lower %3d upper %3d nextind %d\n",
-	    h->lower, h->upper, top);
-	for (cur = 0; cur < top; cur++) {
-		(void)fprintf(stderr, "\t[%03d] %4d ", cur, h->linp[cur]);
-		switch (h->flags & P_TYPE) {
-		case P_BINTERNAL:
-			bi = GETBINTERNAL(h, cur);
-			(void)fprintf(stderr,
-			    "size %03d pgno %03d", bi->ksize, bi->pgno);
-			if (bi->flags & P_BIGKEY)
-				(void)fprintf(stderr, " (indirect)");
-			else if (bi->ksize)
-				(void)fprintf(stderr,
-				    " {%.*s}", (int)bi->ksize, bi->bytes);
-			break;
-		case P_RINTERNAL:
-			ri = GETRINTERNAL(h, cur);
-			(void)fprintf(stderr, "entries %03d pgno %03d",
-				ri->nrecs, ri->pgno);
-			break;
-		case P_BLEAF:
-			bl = GETBLEAF(h, cur);
-			if (bl->flags & P_BIGKEY)
-				(void)fprintf(stderr,
-				    "big key page %lu size %u/",
-				    (unsigned long) __bt_pgno_t(bl->bytes),
-				    __bt_uint32_t(bl->bytes + sizeof(pgno_t)));
-			else if (bl->ksize)
-				(void)fprintf(stderr, "%s/", bl->bytes);
-			if (bl->flags & P_BIGDATA)
-				(void)fprintf(stderr,
-				    "big data page %lu size %u",
-				    (unsigned long)
-				    __bt_pgno_t(bl->bytes + bl->ksize),
-				    __bt_uint32_t(bl->bytes + bl->ksize +
-				    sizeof(pgno_t)));
-			else if (bl->dsize)
-				(void)fprintf(stderr, "%.*s",
-				    (int)bl->dsize, bl->bytes + bl->ksize);
-			break;
-		case P_RLEAF:
-			rl = GETRLEAF(h, cur);
-			if (rl->flags & P_BIGDATA)
-				(void)fprintf(stderr,
-				    "big data page %lu size %u",
-				    (unsigned long) __bt_pgno_t(rl->bytes),
-				    __bt_uint32_t(rl->bytes + sizeof(pgno_t)));
-			else if (rl->dsize)
-				(void)fprintf(stderr,
-				    "%.*s", (int)rl->dsize, rl->bytes);
-			break;
-		}
-		(void)fprintf(stderr, "\n");
-	}
-}
-#endif
-
-#ifdef STATISTICS
-/*
- * BT_STAT -- Gather/print the tree statistics
- *
- * Parameters:
- *	dbp:	pointer to the DB
- */
-void
-__bt_stat(DB *dbp)
-{
-	extern unsigned long bt_cache_hit, bt_cache_miss, bt_pfxsaved, bt_rootsplit;
-	extern unsigned long bt_sortsplit, bt_split;
-	BTREE *t;
-	PAGE *h;
-	pgno_t i, pcont, pinternal, pleaf;
-	unsigned long ifree, lfree, nkeys;
-	int levels;
-
-	t = dbp->internal;
-	pcont = pinternal = pleaf = 0;
-	nkeys = ifree = lfree = 0;
-	for (i = P_ROOT; (h = mpool_get(t->bt_mp, i, 0)) != NULL; ++i) {
-		switch (h->flags & P_TYPE) {
-		case P_BINTERNAL:
-		case P_RINTERNAL:
-			++pinternal;
-			ifree += h->upper - h->lower;
-			break;
-		case P_BLEAF:
-		case P_RLEAF:
-			++pleaf;
-			lfree += h->upper - h->lower;
-			nkeys += NEXTINDEX(h);
-			break;
-		case P_OVERFLOW:
-			++pcont;
-			break;
-		}
-		(void)mpool_put(t->bt_mp, h, 0);
-	}
-
-	/* Count the levels of the tree. */
-	for (i = P_ROOT, levels = 0 ;; ++levels) {
-		h = mpool_get(t->bt_mp, i, 0);
-		if (h->flags & (P_BLEAF|P_RLEAF)) {
-			if (levels == 0)
-				levels = 1;
-			(void)mpool_put(t->bt_mp, h, 0);
-			break;
-		}
-		i = F_ISSET(t, R_RECNO) ?
-		    GETRINTERNAL(h, 0)->pgno :
-		    GETBINTERNAL(h, 0)->pgno;
-		(void)mpool_put(t->bt_mp, h, 0);
-	}
-
-	(void)fprintf(stderr, "%d level%s with %ld keys",
-	    levels, levels == 1 ? "" : "s", nkeys);
-	if (F_ISSET(t, R_RECNO))
-		(void)fprintf(stderr, " (%ld header count)", (long)t->bt_nrecs);
-	(void)fprintf(stderr,
-	    "\n%lu pages (leaf %ld, internal %ld, overflow %ld)\n",
-	    (long)pinternal + pleaf + pcont, (long)pleaf, (long)pinternal,
-	    (long)pcont);
-	(void)fprintf(stderr, "%ld cache hits, %ld cache misses\n",
-	    bt_cache_hit, bt_cache_miss);
-	(void)fprintf(stderr, "%ld splits (%ld root splits, %ld sort splits)\n",
-	    bt_split, bt_rootsplit, bt_sortsplit);
-	pleaf *= t->bt_psize - BTDATAOFF;
-	if (pleaf)
-		(void)fprintf(stderr,
-		    "%.0f%% leaf fill (%ld bytes used, %ld bytes free)\n",
-		    ((double)(pleaf - lfree) / pleaf) * 100,
-		    pleaf - lfree, lfree);
-	pinternal *= t->bt_psize - BTDATAOFF;
-	if (pinternal)
-		(void)fprintf(stderr,
-		    "%.0f%% internal fill (%ld bytes used, %ld bytes free\n",
-		    ((double)(pinternal - ifree) / pinternal) * 100,
-		    pinternal - ifree, ifree);
-	if (bt_pfxsaved)
-		(void)fprintf(stderr, "prefix checking removed %lu bytes.\n",
-		    bt_pfxsaved);
-}
-#endif
diff --git a/lib/libc/db/btree/bt_delete.c b/lib/libc/db/btree/bt_delete.c
deleted file mode 100644
index 701c8b201..000000000
--- a/lib/libc/db/btree/bt_delete.c
+++ /dev/null
@@ -1,642 +0,0 @@
-/*	$NetBSD: bt_delete.c,v 1.17 2009/01/29 02:02:36 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: bt_delete.c,v 1.17 2009/01/29 02:02:36 lukem Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-static int __bt_bdelete(BTREE *, const DBT *);
-static int __bt_curdel(BTREE *, const DBT *, PAGE *, u_int);
-static int __bt_pdelete(BTREE *, PAGE *);
-static int __bt_relink(BTREE *, PAGE *);
-static int __bt_stkacq(BTREE *, PAGE **, CURSOR *);
-
-/*
- * __bt_delete
- *	Delete the item(s) referenced by a key.
- *
- * Return RET_SPECIAL if the key is not found.
- */
-int
-__bt_delete(const DB *dbp, const DBT *key, u_int flags)
-{
-	BTREE *t;
-	CURSOR *c;
-	PAGE *h;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Check for change to a read-only tree. */
-	if (F_ISSET(t, B_RDONLY)) {
-		errno = EPERM;
-		return (RET_ERROR);
-	}
-
-	switch (flags) {
-	case 0:
-		status = __bt_bdelete(t, key);
-		break;
-	case R_CURSOR:
-		/*
-		 * If flags is R_CURSOR, delete the cursor.  Must already
-		 * have started a scan and not have already deleted it.
-		 */
-		c = &t->bt_cursor;
-		if (F_ISSET(c, CURS_INIT)) {
-			if (F_ISSET(c, CURS_ACQUIRE | CURS_AFTER | CURS_BEFORE))
-				return (RET_SPECIAL);
-			if ((h = mpool_get(t->bt_mp, c->pg.pgno, 0)) == NULL)
-				return (RET_ERROR);
-
-			/*
-			 * If the page is about to be emptied, we'll need to
-			 * delete it, which means we have to acquire a stack.
-			 */
-			if (NEXTINDEX(h) == 1)
-				if (__bt_stkacq(t, &h, &t->bt_cursor))
-					return (RET_ERROR);
-
-			status = __bt_dleaf(t, NULL, h, (u_int)c->pg.index);
-
-			if (NEXTINDEX(h) == 0 && status == RET_SUCCESS) {
-				if (__bt_pdelete(t, h))
-					return (RET_ERROR);
-			} else
-				mpool_put(t->bt_mp, h,
-				    (u_int)(status == RET_SUCCESS ?
-				    MPOOL_DIRTY : 0));
-			break;
-		}
-		/* FALLTHROUGH */
-	default:
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-	if (status == RET_SUCCESS)
-		F_SET(t, B_MODIFIED);
-	return (status);
-}
-
-/*
- * __bt_stkacq --
- *	Acquire a stack so we can delete a cursor entry.
- *
- * Parameters:
- *	  t:	tree
- *	 hp:	pointer to current, pinned PAGE pointer
- *	  c:	pointer to the cursor
- *
- * Returns:
- *	0 on success, 1 on failure
- */
-static int
-__bt_stkacq(BTREE *t, PAGE **hp, CURSOR *c)
-{
-	BINTERNAL *bi;
-	EPG *e;
-	EPGNO *parent;
-	PAGE *h;
-	indx_t idx = 0;	/* Pacify gcc */
-	pgno_t pgno;
-	recno_t nextpg, prevpg;
-	int exact, level;
-	
-	/*
-	 * Find the first occurrence of the key in the tree.  Toss the
-	 * currently locked page so we don't hit an already-locked page.
-	 */
-	h = *hp;
-	mpool_put(t->bt_mp, h, 0);
-	if ((e = __bt_search(t, &c->key, &exact)) == NULL)
-		return (1);
-	h = e->page;
-
-	/* See if we got it in one shot. */
-	if (h->pgno == c->pg.pgno)
-		goto ret;
-
-	/*
-	 * Move right, looking for the page.  At each move we have to move
-	 * up the stack until we don't have to move to the next page.  If
-	 * we have to change pages at an internal level, we have to fix the
-	 * stack back up.
-	 */
-	while (h->pgno != c->pg.pgno) {
-		if ((nextpg = h->nextpg) == P_INVALID)
-			break;
-		mpool_put(t->bt_mp, h, 0);
-
-		/* Move up the stack. */
-		for (level = 0; (parent = BT_POP(t)) != NULL; ++level) {
-			/* Get the parent page. */
-			if ((h = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-				return (1);
-
-			/* Move to the next index. */
-			if (parent->index != NEXTINDEX(h) - 1) {
-				idx = parent->index + 1;
-				BT_PUSH(t, h->pgno, idx);
-				break;
-			}
-			mpool_put(t->bt_mp, h, 0);
-		}
-
-		/* Restore the stack. */
-		while (level--) {
-			/* Push the next level down onto the stack. */
-			bi = GETBINTERNAL(h, idx);
-			pgno = bi->pgno;
-			BT_PUSH(t, pgno, 0);
-
-			/* Lose the currently pinned page. */
-			mpool_put(t->bt_mp, h, 0);
-
-			/* Get the next level down. */
-			if ((h = mpool_get(t->bt_mp, pgno, 0)) == NULL)
-				return (1);
-			idx = 0;
-		}
-		mpool_put(t->bt_mp, h, 0);
-		if ((h = mpool_get(t->bt_mp, nextpg, 0)) == NULL)
-			return (1);
-	}
-
-	if (h->pgno == c->pg.pgno)
-		goto ret;
-
-	/* Reacquire the original stack. */
-	mpool_put(t->bt_mp, h, 0);
-	if ((e = __bt_search(t, &c->key, &exact)) == NULL)
-		return (1);
-	h = e->page;
-
-	/*
-	 * Move left, looking for the page.  At each move we have to move
-	 * up the stack until we don't have to change pages to move to the
-	 * next page.  If we have to change pages at an internal level, we
-	 * have to fix the stack back up.
-	 */
-	while (h->pgno != c->pg.pgno) {
-		if ((prevpg = h->prevpg) == P_INVALID)
-			break;
-		mpool_put(t->bt_mp, h, 0);
-
-		/* Move up the stack. */
-		for (level = 0; (parent = BT_POP(t)) != NULL; ++level) {
-			/* Get the parent page. */
-			if ((h = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-				return (1);
-
-			/* Move to the next index. */
-			if (parent->index != 0) {
-				idx = parent->index - 1;
-				BT_PUSH(t, h->pgno, idx);
-				break;
-			}
-			mpool_put(t->bt_mp, h, 0);
-		}
-
-		/* Restore the stack. */
-		while (level--) {
-			/* Push the next level down onto the stack. */
-			bi = GETBINTERNAL(h, idx);
-			pgno = bi->pgno;
-
-			/* Lose the currently pinned page. */
-			mpool_put(t->bt_mp, h, 0);
-
-			/* Get the next level down. */
-			if ((h = mpool_get(t->bt_mp, pgno, 0)) == NULL)
-				return (1);
-
-			idx = NEXTINDEX(h) - 1;
-			BT_PUSH(t, pgno, idx);
-		}
-		mpool_put(t->bt_mp, h, 0);
-		if ((h = mpool_get(t->bt_mp, prevpg, 0)) == NULL)
-			return (1);
-	}
-	
-
-ret:	mpool_put(t->bt_mp, h, 0);
-	return ((*hp = mpool_get(t->bt_mp, c->pg.pgno, 0)) == NULL);
-}
-
-/*
- * __bt_bdelete --
- *	Delete all key/data pairs matching the specified key.
- *
- * Parameters:
- *	  t:	tree
- *	key:	key to delete
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-static int
-__bt_bdelete(BTREE *t, const DBT *key)
-{
-	EPG *e;
-	PAGE *h;
-	int deleted, exact, redo;
-
-	deleted = 0;
-
-	/* Find any matching record; __bt_search pins the page. */
-loop:	if ((e = __bt_search(t, key, &exact)) == NULL)
-		return (deleted ? RET_SUCCESS : RET_ERROR);
-	if (!exact) {
-		mpool_put(t->bt_mp, e->page, 0);
-		return (deleted ? RET_SUCCESS : RET_SPECIAL);
-	}
-
-	/*
-	 * Delete forward, then delete backward, from the found key.  If
-	 * there are duplicates and we reach either side of the page, do
-	 * the key search again, so that we get them all.
-	 */
-	redo = 0;
-	h = e->page;
-	do {
-		if (__bt_dleaf(t, key, h, (u_int)e->index)) {
-			mpool_put(t->bt_mp, h, 0);
-			return (RET_ERROR);
-		}
-		if (F_ISSET(t, B_NODUPS)) {
-			if (NEXTINDEX(h) == 0) {
-				if (__bt_pdelete(t, h))
-					return (RET_ERROR);
-			} else
-				mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			return (RET_SUCCESS);
-		}
-		deleted = 1;
-	} while (e->index < NEXTINDEX(h) && __bt_cmp(t, key, e) == 0);
-
-	/* Check for right-hand edge of the page. */
-	if (e->index == NEXTINDEX(h))
-		redo = 1;
-
-	/* Delete from the key to the beginning of the page. */
-	while (e->index-- > 0) {
-		if (__bt_cmp(t, key, e) != 0)
-			break;
-		if (__bt_dleaf(t, key, h, (u_int)e->index) == RET_ERROR) {
-			mpool_put(t->bt_mp, h, 0);
-			return (RET_ERROR);
-		}
-		if (e->index == 0)
-			redo = 1;
-	}
-
-	/* Check for an empty page. */
-	if (NEXTINDEX(h) == 0) {
-		if (__bt_pdelete(t, h))
-			return (RET_ERROR);
-		goto loop;
-	}
-
-	/* Put the page. */
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-	if (redo)
-		goto loop;
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_pdelete --
- *	Delete a single page from the tree.
- *
- * Parameters:
- *	t:	tree
- *	h:	leaf page
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- *
- * Side-effects:
- *	mpool_put's the page
- */
-static int
-__bt_pdelete(BTREE *t, PAGE *h)
-{
-	BINTERNAL *bi;
-	PAGE *pg;
-	EPGNO *parent;
-	indx_t cnt, idx, *ip, offset;
-	uint32_t nksize;
-	char *from;
-
-	/*
-	 * Walk the parent page stack -- a LIFO stack of the pages that were
-	 * traversed when we searched for the page where the delete occurred.
-	 * Each stack entry is a page number and a page index offset.  The
-	 * offset is for the page traversed on the search.  We've just deleted
-	 * a page, so we have to delete the key from the parent page.
-	 *
-	 * If the delete from the parent page makes it empty, this process may
-	 * continue all the way up the tree.  We stop if we reach the root page
-	 * (which is never deleted, it's just not worth the effort) or if the
-	 * delete does not empty the page.
-	 */
-	while ((parent = BT_POP(t)) != NULL) {
-		/* Get the parent page. */
-		if ((pg = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-			return (RET_ERROR);
-		
-		idx = parent->index;
-		bi = GETBINTERNAL(pg, idx);
-
-		/* Free any overflow pages. */
-		if (bi->flags & P_BIGKEY &&
-		    __ovfl_delete(t, bi->bytes) == RET_ERROR) {
-			mpool_put(t->bt_mp, pg, 0);
-			return (RET_ERROR);
-		}
-
-		/*
-		 * Free the parent if it has only the one key and it's not the
-		 * root page. If it's the rootpage, turn it back into an empty
-		 * leaf page.
-		 */
-		if (NEXTINDEX(pg) == 1) {
-			if (pg->pgno == P_ROOT) {
-				pg->lower = BTDATAOFF;
-				pg->upper = t->bt_psize;
-				pg->flags = P_BLEAF;
-			} else {
-				if (__bt_relink(t, pg) || __bt_free(t, pg))
-					return (RET_ERROR);
-				continue;
-			}
-		} else {
-			/* Pack remaining key items at the end of the page. */
-			nksize = NBINTERNAL(bi->ksize);
-			from = (char *)(void *)pg + pg->upper;
-			memmove(from + nksize, from,
-			(size_t)((char *)(void *)bi - from));
-			pg->upper += nksize;
-
-			/* Adjust indices' offsets, shift the indices down. */
-			offset = pg->linp[idx];
-			for (cnt = idx, ip = &pg->linp[0]; cnt--; ++ip)
-				if (ip[0] < offset)
-					ip[0] += nksize;
-			for (cnt = NEXTINDEX(pg) - idx; --cnt; ++ip)
-				ip[0] = ip[1] < offset ? ip[1] + nksize : ip[1];
-			pg->lower -= sizeof(indx_t);
-		}
-
-		mpool_put(t->bt_mp, pg, MPOOL_DIRTY);
-		break;
-	}
-
-	/* Free the leaf page, as long as it wasn't the root. */
-	if (h->pgno == P_ROOT) {
-		mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-		return (RET_SUCCESS);
-	}
-	return (__bt_relink(t, h) || __bt_free(t, h));
-}
-
-/*
- * __bt_dleaf --
- *	Delete a single record from a leaf page.
- *
- * Parameters:
- *	t:	tree
- *    key:	referenced key
- *	h:	page
- *	idx:	index on page to delete
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__bt_dleaf(BTREE *t, const DBT *key, PAGE *h, u_int idx)
-{
-	BLEAF *bl;
-	indx_t cnt, *ip, offset;
-	uint32_t nbytes;
-	void *to;
-	char *from;
-
-	/* If this record is referenced by the cursor, delete the cursor. */
-	if (F_ISSET(&t->bt_cursor, CURS_INIT) &&
-	    !F_ISSET(&t->bt_cursor, CURS_ACQUIRE) &&
-	    t->bt_cursor.pg.pgno == h->pgno && t->bt_cursor.pg.index == idx &&
-	    __bt_curdel(t, key, h, idx))
-		return (RET_ERROR);
-
-	/* If the entry uses overflow pages, make them available for reuse. */
-	to = bl = GETBLEAF(h, idx);
-	if (bl->flags & P_BIGKEY && __ovfl_delete(t, bl->bytes) == RET_ERROR)
-		return (RET_ERROR);
-	if (bl->flags & P_BIGDATA &&
-	    __ovfl_delete(t, bl->bytes + bl->ksize) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Pack the remaining key/data items at the end of the page. */
-	nbytes = NBLEAF(bl);
-	from = (char *)(void *)h + h->upper;
-	memmove(from + nbytes, from, (size_t)((char *)(void *)to - from));
-	h->upper += nbytes;
-
-	/* Adjust the indices' offsets, shift the indices down. */
-	offset = h->linp[idx];
-	for (cnt = idx, ip = &h->linp[0]; cnt--; ++ip)
-		if (ip[0] < offset)
-			ip[0] += nbytes;
-	for (cnt = NEXTINDEX(h) - idx; --cnt; ++ip)
-		ip[0] = ip[1] < offset ? ip[1] + nbytes : ip[1];
-	h->lower -= sizeof(indx_t);
-
-	/* If the cursor is on this page, adjust it as necessary. */
-	if (F_ISSET(&t->bt_cursor, CURS_INIT) &&
-	    !F_ISSET(&t->bt_cursor, CURS_ACQUIRE) &&
-	    t->bt_cursor.pg.pgno == h->pgno && t->bt_cursor.pg.index > idx)
-		--t->bt_cursor.pg.index;
-
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_curdel --
- *	Delete the cursor.
- *
- * Parameters:
- *	t:	tree
- *    key:	referenced key (or NULL)
- *	h:	page
- *  idx:	index on page to delete
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-static int
-__bt_curdel(BTREE *t, const DBT *key, PAGE *h, u_int idx)
-{
-	CURSOR *c;
-	EPG e;
-	PAGE *pg;
-	int curcopy, status;
-
-	/*
-	 * If there are duplicates, move forward or backward to one.
-	 * Otherwise, copy the key into the cursor area.
-	 */
-	c = &t->bt_cursor;
-	F_CLR(c, CURS_AFTER | CURS_BEFORE | CURS_ACQUIRE);
-
-	curcopy = 0;
-	if (!F_ISSET(t, B_NODUPS)) {
-		/*
-		 * We're going to have to do comparisons.  If we weren't
-		 * provided a copy of the key, i.e. the user is deleting
-		 * the current cursor position, get one.
-		 */
-		if (key == NULL) {
-			e.page = h;
-			e.index = idx;
-			if ((status = __bt_ret(t, &e,
-			    &c->key, &c->key, NULL, NULL, 1)) != RET_SUCCESS)
-				return (status);
-			curcopy = 1;
-			key = &c->key;
-		}
-		/* Check previous key, if not at the beginning of the page. */
-		if (idx > 0) { 
-			e.page = h;
-			e.index = idx - 1;
-			if (__bt_cmp(t, key, &e) == 0) {
-				F_SET(c, CURS_BEFORE);
-				goto dup2;
-			}
-		}
-		/* Check next key, if not at the end of the page. */
-		if (idx < (unsigned)(NEXTINDEX(h) - 1)) {
-			e.page = h;
-			e.index = idx + 1;
-			if (__bt_cmp(t, key, &e) == 0) {
-				F_SET(c, CURS_AFTER);
-				goto dup2;
-			}
-		}
-		/* Check previous key if at the beginning of the page. */
-		if (idx == 0 && h->prevpg != P_INVALID) {
-			if ((pg = mpool_get(t->bt_mp, h->prevpg, 0)) == NULL)
-				return (RET_ERROR);
-			e.page = pg;
-			e.index = NEXTINDEX(pg) - 1;
-			if (__bt_cmp(t, key, &e) == 0) {
-				F_SET(c, CURS_BEFORE);
-				goto dup1;
-			}
-			mpool_put(t->bt_mp, pg, 0);
-		}
-		/* Check next key if at the end of the page. */
-		if (idx == (unsigned)(NEXTINDEX(h) - 1) && h->nextpg != P_INVALID) {
-			if ((pg = mpool_get(t->bt_mp, h->nextpg, 0)) == NULL)
-				return (RET_ERROR);
-			e.page = pg;
-			e.index = 0;
-			if (__bt_cmp(t, key, &e) == 0) {
-				F_SET(c, CURS_AFTER);
-dup1:				mpool_put(t->bt_mp, pg, 0);
-dup2:				c->pg.pgno = e.page->pgno;
-				c->pg.index = e.index;
-				return (RET_SUCCESS);
-			}
-			mpool_put(t->bt_mp, pg, 0);
-		}
-	}
-	e.page = h;
-	e.index = idx;
-	if (curcopy || (status =
-	    __bt_ret(t, &e, &c->key, &c->key, NULL, NULL, 1)) == RET_SUCCESS) {
-		F_SET(c, CURS_ACQUIRE);
-		return (RET_SUCCESS);
-	}
-	return (status);
-}
-
-/*
- * __bt_relink --
- *	Link around a deleted page.
- *
- * Parameters:
- *	t:	tree
- *	h:	page to be deleted
- */
-static int
-__bt_relink(BTREE *t, PAGE *h)
-{
-	PAGE *pg;
-
-	if (h->nextpg != P_INVALID) {
-		if ((pg = mpool_get(t->bt_mp, h->nextpg, 0)) == NULL)
-			return (RET_ERROR);
-		pg->prevpg = h->prevpg;
-		mpool_put(t->bt_mp, pg, MPOOL_DIRTY);
-	}
-	if (h->prevpg != P_INVALID) {
-		if ((pg = mpool_get(t->bt_mp, h->prevpg, 0)) == NULL)
-			return (RET_ERROR);
-		pg->nextpg = h->nextpg;
-		mpool_put(t->bt_mp, pg, MPOOL_DIRTY);
-	}
-	return (0);
-}
diff --git a/lib/libc/db/btree/bt_get.c b/lib/libc/db/btree/bt_get.c
deleted file mode 100644
index 772210a7b..000000000
--- a/lib/libc/db/btree/bt_get.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*	$NetBSD: bt_get.c,v 1.13 2008/09/11 12:58:00 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: bt_get.c,v 1.13 2008/09/11 12:58:00 joerg Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stddef.h>
-#include <stdio.h>
-
-#include <db.h>
-#include "btree.h"
-
-/*
- * __BT_GET -- Get a record from the btree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key to find
- *	data:	data to return
- *	flag:	currently unused
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-int
-__bt_get(const DB *dbp, const DBT *key, DBT *data, u_int flags)
-{
-	BTREE *t;
-	EPG *e;
-	int exact, status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Get currently doesn't take any flags. */
-	if (flags) {
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	if ((e = __bt_search(t, key, &exact)) == NULL)
-		return (RET_ERROR);
-	if (!exact) {
-		mpool_put(t->bt_mp, e->page, 0);
-		return (RET_SPECIAL);
-	}
-
-	status = __bt_ret(t, e, NULL, NULL, data, &t->bt_rdata, 0);
-
-	/*
-	 * If the user is doing concurrent access, we copied the
-	 * key/data, toss the page.
-	 */
-	if (F_ISSET(t, B_DB_LOCK))
-		mpool_put(t->bt_mp, e->page, 0);
-	else
-		t->bt_pinned = e->page;
-	return (status);
-}
diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c
deleted file mode 100644
index 53717afc2..000000000
--- a/lib/libc/db/btree/bt_open.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/*	$NetBSD: bt_open.c,v 1.27 2013/12/01 00:22:48 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: bt_open.c,v 1.27 2013/12/01 00:22:48 christos Exp $");
-
-/*
- * Implementation of btree access method for 4.4BSD.
- *
- * The design here was originally based on that of the btree access method
- * used in the Postgres database system at UC Berkeley.  This implementation
- * is wholly independent of the Postgres code.
- */
-
-#include "namespace.h"
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <paths.h>
-
-#include <db.h>
-#include "btree.h"
-
-#ifdef DEBUG
-#undef	MINPSIZE
-#define	MINPSIZE	128
-#endif
-
-static int byteorder(void);
-static int nroot(BTREE *);
-
-/*
- * __BT_OPEN -- Open a btree.
- *
- * Creates and fills a DB struct, and calls the routine that actually
- * opens the btree.
- *
- * Parameters:
- *	fname:	filename (NULL for in-memory trees)
- *	flags:	open flag bits
- *	mode:	open permission bits
- *	b:	BTREEINFO pointer
- *
- * Returns:
- *	NULL on failure, pointer to DB on success.
- *
- */
-DB *
-__bt_open(const char *fname, int flags, mode_t mode, const BTREEINFO *openinfo,
-    int dflags)
-{
-	struct stat sb;
-	BTMETA m;
-	BTREE *t;
-	BTREEINFO b;
-	DB *dbp;
-	pgno_t ncache;
-	ssize_t nr;
-	size_t temp;
-	int machine_lorder;
-
-	t = NULL;
-
-	/*
-	 * Intention is to make sure all of the user's selections are okay
-	 * here and then use them without checking.  Can't be complete, since
-	 * we don't know the right page size, lorder or flags until the backing
-	 * file is opened.  Also, the file's page size can cause the cachesize
-	 * to change.
-	 */
-	machine_lorder = byteorder();
-	if (openinfo) {
-		b = *openinfo;
-
-		/* Flags: R_DUP. */
-		if (b.flags & ~(R_DUP))
-			goto einval;
-
-		/*
-		 * Page size must be indx_t aligned and >= MINPSIZE.  Default
-		 * page size is set farther on, based on the underlying file
-		 * transfer size.
-		 */
-		if (b.psize &&
-		    (b.psize < MINPSIZE || b.psize > MAX_PAGE_OFFSET + 1 ||
-		    b.psize & (sizeof(indx_t) - 1)))
-			goto einval;
-
-		/* Minimum number of keys per page; absolute minimum is 2. */
-		if (b.minkeypage) {
-			if (b.minkeypage < 2)
-				goto einval;
-		} else
-			b.minkeypage = DEFMINKEYPAGE;
-
-		/* If no comparison, use default comparison and prefix. */
-		if (b.compare == NULL) {
-			b.compare = __bt_defcmp;
-			if (b.prefix == NULL)
-				b.prefix = __bt_defpfx;
-		}
-
-		if (b.lorder == 0)
-			b.lorder = machine_lorder;
-	} else {
-		b.compare = __bt_defcmp;
-		b.cachesize = 0;
-		b.flags = 0;
-		b.lorder = machine_lorder;
-		b.minkeypage = DEFMINKEYPAGE;
-		b.prefix = __bt_defpfx;
-		b.psize = 0;
-	}
-
-	/* Check for the ubiquitous PDP-11. */
-	if (b.lorder != BIG_ENDIAN && b.lorder != LITTLE_ENDIAN)
-		goto einval;
-
-	/* Allocate and initialize DB and BTREE structures. */
-	if ((t = malloc(sizeof(*t))) == NULL)
-		goto err;
-	memset(t, 0, sizeof(BTREE));
-	t->bt_fd = -1;			/* Don't close unopened fd on error. */
-	t->bt_lorder = b.lorder;
-	t->bt_order = NOT;
-	t->bt_cmp = b.compare;
-	t->bt_pfx = b.prefix;
-	t->bt_rfd = -1;
-
-	if ((t->bt_dbp = dbp = malloc(sizeof(*dbp))) == NULL)
-		goto err;
-	memset(t->bt_dbp, 0, sizeof(DB));
-	if (t->bt_lorder != machine_lorder)
-		F_SET(t, B_NEEDSWAP);
-
-	dbp->type = DB_BTREE;
-	dbp->internal = t;
-	dbp->close = __bt_close;
-	dbp->del = __bt_delete;
-	dbp->fd = __bt_fd;
-	dbp->get = __bt_get;
-	dbp->put = __bt_put;
-	dbp->seq = __bt_seq;
-	dbp->sync = __bt_sync;
-
-	/*
-	 * If no file name was supplied, this is an in-memory btree and we
-	 * open a backing temporary file.  Otherwise, it's a disk-based tree.
-	 */
-	if (fname) {
-		switch (flags & O_ACCMODE) {
-		case O_RDONLY:
-			F_SET(t, B_RDONLY);
-			break;
-		case O_RDWR:
-			break;
-		case O_WRONLY:
-		default:
-			goto einval;
-		}
-		if ((t->bt_fd = __dbopen(fname, flags, mode, &sb)) == -1)
-			goto err;
-	} else {
-		if ((flags & O_ACCMODE) != O_RDWR)
-			goto einval;
-		if ((t->bt_fd = __dbtemp("bt.", &sb)) == -1)
-			goto err;
-		F_SET(t, B_INMEM);
-	}
-
-
-	if (sb.st_size) {
-		if ((nr = read(t->bt_fd, &m, sizeof(BTMETA))) < 0)
-			goto err;
-		if (nr != sizeof(BTMETA))
-			goto eftype;
-
-		/*
-		 * Read in the meta-data.  This can change the notion of what
-		 * the lorder, page size and flags are, and, when the page size
-		 * changes, the cachesize value can change too.  If the user
-		 * specified the wrong byte order for an existing database, we
-		 * don't bother to return an error, we just clear the NEEDSWAP
-		 * bit.
-		 */
-		if (m.magic == BTREEMAGIC)
-			F_CLR(t, B_NEEDSWAP);
-		else {
-			F_SET(t, B_NEEDSWAP);
-			M_32_SWAP(m.magic);
-			M_32_SWAP(m.version);
-			M_32_SWAP(m.psize);
-			M_32_SWAP(m.free);
-			M_32_SWAP(m.nrecs);
-			M_32_SWAP(m.flags);
-		}
-		if (m.magic != BTREEMAGIC || m.version != BTREEVERSION)
-			goto eftype;
-		if (m.psize < MINPSIZE || m.psize > MAX_PAGE_OFFSET + 1 ||
-		    m.psize & (sizeof(indx_t) - 1))
-			goto eftype;
-		if (m.flags & ~SAVEMETA)
-			goto eftype;
-		b.psize = m.psize;
-		F_SET(t, m.flags);
-		t->bt_free = m.free;
-		t->bt_nrecs = m.nrecs;
-	} else {
-		/*
-		 * Set the page size to the best value for I/O to this file.
-		 * Don't overflow the page offset type.
-		 */
-		if (b.psize == 0) {
-			b.psize = sb.st_blksize;
-			if (b.psize < MINPSIZE)
-				b.psize = MINPSIZE;
-			if (b.psize > MAX_PAGE_OFFSET + 1)
-				b.psize = MAX_PAGE_OFFSET + 1;
-		}
-
-		/* Set flag if duplicates permitted. */
-		if (!(b.flags & R_DUP))
-			F_SET(t, B_NODUPS);
-
-		t->bt_free = P_INVALID;
-		t->bt_nrecs = 0;
-		F_SET(t, B_METADIRTY);
-	}
-
-	t->bt_psize = b.psize;
-
-	/* Set the cache size; must be a multiple of the page size. */
-	if (b.cachesize && b.cachesize & (b.psize - 1))
-		b.cachesize += (~b.cachesize & (b.psize - 1)) + 1;
-	if (b.cachesize < b.psize * MINCACHE)
-		b.cachesize = b.psize * MINCACHE;
-
-	/* Calculate number of pages to cache. */
-	ncache = (b.cachesize + t->bt_psize - 1) / t->bt_psize;
-
-	/*
-	 * The btree data structure requires that at least two keys can fit on
-	 * a page, but other than that there's no fixed requirement.  The user
-	 * specified a minimum number per page, and we translated that into the
-	 * number of bytes a key/data pair can use before being placed on an
-	 * overflow page.  This calculation includes the page header, the size
-	 * of the index referencing the leaf item and the size of the leaf item
-	 * structure.  Also, don't let the user specify a minkeypage such that
-	 * a key/data pair won't fit even if both key and data are on overflow
-	 * pages.
-	 */
-	temp = (t->bt_psize - BTDATAOFF) / b.minkeypage -
-	    (sizeof(indx_t) + NBLEAFDBT(0, 0));
-	_DBFIT(temp, indx_t);
-	t->bt_ovflsize = (indx_t)temp;
-	if (t->bt_ovflsize < NBLEAFDBT(NOVFLSIZE, NOVFLSIZE) + sizeof(indx_t)) {
-		size_t l = NBLEAFDBT(NOVFLSIZE, NOVFLSIZE) + sizeof(indx_t);
-		_DBFIT(l, indx_t);
-		t->bt_ovflsize = (indx_t)l;
-	}
-
-	/* Initialize the buffer pool. */
-	if ((t->bt_mp =
-	    mpool_open(NULL, t->bt_fd, t->bt_psize, ncache)) == NULL)
-		goto err;
-	if (!F_ISSET(t, B_INMEM))
-		mpool_filter(t->bt_mp, __bt_pgin, __bt_pgout, t);
-
-	/* Create a root page if new tree. */
-	if (nroot(t) == RET_ERROR)
-		goto err;
-
-	/* Global flags. */
-	if (dflags & DB_LOCK)
-		F_SET(t, B_DB_LOCK);
-	if (dflags & DB_SHMEM)
-		F_SET(t, B_DB_SHMEM);
-	if (dflags & DB_TXN)
-		F_SET(t, B_DB_TXN);
-
-	return (dbp);
-
-einval:	errno = EINVAL;
-	goto err;
-
-eftype:	errno = EFTYPE;
-	goto err;
-
-err:	if (t) {
-		if (t->bt_dbp)
-			free(t->bt_dbp);
-		if (t->bt_fd != -1)
-			(void)close(t->bt_fd);
-		free(t);
-	}
-	return (NULL);
-}
-
-/*
- * NROOT -- Create the root of a new tree.
- *
- * Parameters:
- *	t:	tree
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-static int
-nroot(BTREE *t)
-{
-	PAGE *meta, *root;
-	pgno_t npg;
-
-	if ((meta = mpool_get(t->bt_mp, 0, 0)) != NULL) {
-		mpool_put(t->bt_mp, meta, 0);
-		return (RET_SUCCESS);
-	}
-	if (errno != EINVAL)		/* It's OK to not exist. */
-		return (RET_ERROR);
-	errno = 0;
-
-	if ((meta = mpool_new(t->bt_mp, &npg)) == NULL)
-		return (RET_ERROR);
-
-	if ((root = mpool_new(t->bt_mp, &npg)) == NULL)
-		return (RET_ERROR);
-
-	if (npg != P_ROOT)
-		return (RET_ERROR);
-	root->pgno = npg;
-	root->prevpg = root->nextpg = P_INVALID;
-	root->lower = BTDATAOFF;
-	root->upper = t->bt_psize;
-	root->flags = P_BLEAF;
-	memset(meta, 0, t->bt_psize);
-	mpool_put(t->bt_mp, meta, MPOOL_DIRTY);
-	mpool_put(t->bt_mp, root, MPOOL_DIRTY);
-	return (RET_SUCCESS);
-}
-
-static int
-byteorder(void)
-{
-	uint32_t x;
-	uint8_t *p;
-
-	x = 0x01020304;
-	p = (uint8_t *)(void *)&x;
-	switch (*p) {
-	case 1:
-		return (BIG_ENDIAN);
-	case 4:
-		return (LITTLE_ENDIAN);
-	default:
-		return (0);
-	}
-}
-
-int
-__bt_fd(const DB *dbp)
-{
-	BTREE *t;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* In-memory database can't have a file descriptor. */
-	if (F_ISSET(t, B_INMEM)) {
-		errno = ENOENT;
-		return (-1);
-	}
-	return (t->bt_fd);
-}
diff --git a/lib/libc/db/btree/bt_overflow.c b/lib/libc/db/btree/bt_overflow.c
deleted file mode 100644
index e083852fc..000000000
--- a/lib/libc/db/btree/bt_overflow.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*	$NetBSD: bt_overflow.c,v 1.20 2013/12/14 18:04:56 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: bt_overflow.c,v 1.20 2013/12/14 18:04:56 christos Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-/*
- * Big key/data code.
- *
- * Big key and data entries are stored on linked lists of pages.  The initial
- * reference is byte string stored with the key or data and is the page number
- * and size.  The actual record is stored in a chain of pages linked by the
- * nextpg field of the PAGE header.
- *
- * The first page of the chain has a special property.  If the record is used
- * by an internal page, it cannot be deleted and the P_PRESERVE bit will be set
- * in the header.
- *
- * XXX
- * A single DBT is written to each chain, so a lot of space on the last page
- * is wasted.  This is a fairly major bug for some data sets.
- */
-
-/*
- * __OVFL_GET -- Get an overflow key/data item.
- *
- * Parameters:
- *	t:	tree
- *	p:	pointer to { pgno_t, uint32_t }
- *	buf:	storage address
- *	bufsz:	storage size
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__ovfl_get(BTREE *t, void *p, size_t *ssz, void **buf, size_t *bufsz)
-{
-	PAGE *h;
-	pgno_t pg;
-	uint32_t sz, nb, plen;
-	size_t temp;
-
-	memmove(&pg, p, sizeof(pg));
-	memmove(&sz, (char *)p + sizeof(pgno_t), sizeof(uint32_t));
-	*ssz = sz;
-
-#ifdef DEBUG
-	if (pg == P_INVALID || sz == 0)
-		abort();
-#endif
-	/* Make the buffer bigger as necessary. */
-	if (*bufsz < sz) {
-		void *nbuf = realloc(*buf, sz);
-		if (nbuf == NULL)
-			return (RET_ERROR);
-		*buf = nbuf;
-		*bufsz = sz;
-	}
-
-	/*
-	 * Step through the linked list of pages, copying the data on each one
-	 * into the buffer.  Never copy more than the data's length.
-	 */
-	temp = t->bt_psize - BTDATAOFF;
-	_DBFIT(temp, uint32_t);
-	plen = (uint32_t)temp;
-	for (p = *buf;; p = (char *)p + nb, pg = h->nextpg) {
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			return (RET_ERROR);
-
-		nb = MIN(sz, plen);
-		memmove(p, (char *)(void *)h + BTDATAOFF, nb);
-		mpool_put(t->bt_mp, h, 0);
-
-		if ((sz -= nb) == 0)
-			break;
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __OVFL_PUT -- Store an overflow key/data item.
- *
- * Parameters:
- *	t:	tree
- *	data:	DBT to store
- *	pgno:	storage page number
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__ovfl_put(BTREE *t, const DBT *dbt, pgno_t *pg)
-{
-	PAGE *h, *last;
-	void *p;
-	pgno_t npg;
-	uint32_t sz, nb, plen;
-	size_t temp;
-
-	/*
-	 * Allocate pages and copy the key/data record into them.  Store the
-	 * number of the first page in the chain.
-	 */
-	temp = t->bt_psize - BTDATAOFF;
-	_DBFIT(temp, uint32_t);
-	plen = (uint32_t)temp;
-	last = NULL;
-	p = dbt->data;
-	temp = dbt->size;
-	_DBFIT(temp, uint32_t);
-	sz = (uint32_t)temp;
-	for (;; p = (char *)p + plen, last = h) {
-		if ((h = __bt_new(t, &npg)) == NULL)
-			return (RET_ERROR);
-
-		h->pgno = npg;
-		h->nextpg = h->prevpg = P_INVALID;
-		h->flags = P_OVERFLOW;
-		h->lower = h->upper = 0;
-
-		nb = MIN(sz, plen);
-		(void)memmove((char *)(void *)h + BTDATAOFF, p, (size_t)nb);
-
-		if (last) {
-			last->nextpg = h->pgno;
-			mpool_put(t->bt_mp, last, MPOOL_DIRTY);
-		} else
-			*pg = h->pgno;
-
-		if ((sz -= nb) == 0) {
-			mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			break;
-		}
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __OVFL_DELETE -- Delete an overflow chain.
- *
- * Parameters:
- *	t:	tree
- *	p:	pointer to { pgno_t, uint32_t }
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__ovfl_delete(BTREE *t, void *p)
-{
-	PAGE *h;
-	pgno_t pg;
-	uint32_t sz, plen;
-	size_t temp;
-
-	(void)memmove(&pg, p, sizeof(pg));
-	(void)memmove(&sz, (char *)p + sizeof(pgno_t), sizeof(uint32_t));
-
-#ifdef DEBUG
-	if (pg == P_INVALID || sz == 0)
-		abort();
-#endif
-	if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-		return (RET_ERROR);
-
-	/* Don't delete chains used by internal pages. */
-	if (h->flags & P_PRESERVE) {
-		mpool_put(t->bt_mp, h, 0);
-		return (RET_SUCCESS);
-	}
-
-	/* Step through the chain, calling the free routine for each page. */
-	temp = t->bt_psize - BTDATAOFF;
-	_DBFIT(temp, uint32_t);
-	plen = (uint32_t)temp;
-	for (;; sz -= plen) {
-		pg = h->nextpg;
-		__bt_free(t, h);
-		if (sz <= plen)
-			break;
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			return (RET_ERROR);
-	}
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc/db/btree/bt_page.c b/lib/libc/db/btree/bt_page.c
deleted file mode 100644
index 0db4aeb8b..000000000
--- a/lib/libc/db/btree/bt_page.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*	$NetBSD: bt_page.c,v 1.13 2008/09/11 12:58:00 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: bt_page.c,v 1.13 2008/09/11 12:58:00 joerg Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <stdio.h>
-
-#include <db.h>
-#include "btree.h"
-
-/*
- * __bt_free --
- *	Put a page on the freelist.
- *
- * Parameters:
- *	t:	tree
- *	h:	page to free
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- *
- * Side-effect:
- *	mpool_put's the page.
- */
-int
-__bt_free(BTREE *t, PAGE *h)
-{
-	/* Insert the page at the head of the free list. */
-	h->prevpg = P_INVALID;
-	h->nextpg = t->bt_free;
-	t->bt_free = h->pgno;
-	F_SET(t, B_METADIRTY);
-
-	/* Make sure the page gets written back. */
-	return (mpool_put(t->bt_mp, h, MPOOL_DIRTY));
-}
-
-/*
- * __bt_new --
- *	Get a new page, preferably from the freelist.
- *
- * Parameters:
- *	t:	tree
- *	npg:	storage for page number.
- *
- * Returns:
- *	Pointer to a page, NULL on error.
- */
-PAGE *
-__bt_new(BTREE *t, pgno_t *npg)
-{
-	PAGE *h;
-
-	if (t->bt_free != P_INVALID &&
-	    (h = mpool_get(t->bt_mp, t->bt_free, 0)) != NULL) {
-		*npg = t->bt_free;
-		t->bt_free = h->nextpg;
-		F_SET(t, B_METADIRTY);
-		return (h);
-	}
-	return (mpool_new(t->bt_mp, npg));
-}
diff --git a/lib/libc/db/btree/bt_put.c b/lib/libc/db/btree/bt_put.c
deleted file mode 100644
index 986d6c184..000000000
--- a/lib/libc/db/btree/bt_put.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/*	$NetBSD: bt_put.c,v 1.20 2011/06/26 22:20:31 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: bt_put.c,v 1.20 2011/06/26 22:20:31 christos Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-static EPG *bt_fast(BTREE *, const DBT *, const DBT *, int *);
-
-/*
- * __BT_PUT -- Add a btree item to the tree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key
- *	data:	data
- *	flag:	R_NOOVERWRITE
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key is already in the
- *	tree and R_NOOVERWRITE specified.
- */
-int
-__bt_put(const DB *dbp, DBT *key, const DBT *data, u_int flags)
-{
-	BTREE *t;
-	DBT tkey, tdata;
-	EPG *e = NULL; /* pacify gcc */
-	PAGE *h;
-	indx_t idx, nxtindex;
-	pgno_t pg;
-	uint32_t nbytes, temp;
-	int dflags, exact, status;
-	char *dest, db[NOVFLSIZE], kb[NOVFLSIZE];
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Check for change to a read-only tree. */
-	if (F_ISSET(t, B_RDONLY)) {
-		errno = EPERM;
-		return (RET_ERROR);
-	}
-
-	switch (flags) {
-	case 0:
-	case R_NOOVERWRITE:
-		break;
-	case R_CURSOR:
-		/*
-		 * If flags is R_CURSOR, put the cursor.  Must already
-		 * have started a scan and not have already deleted it.
-		 */
-		if (F_ISSET(&t->bt_cursor, CURS_INIT) &&
-		    !F_ISSET(&t->bt_cursor,
-		        CURS_ACQUIRE | CURS_AFTER | CURS_BEFORE))
-			break;
-		/* FALLTHROUGH */
-	default:
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	/*
-	 * If the key/data pair won't fit on a page, store it on overflow
-	 * pages.  Only put the key on the overflow page if the pair are
-	 * still too big after moving the data to an overflow page.
-	 *
-	 * XXX
-	 * If the insert fails later on, the overflow pages aren't recovered.
-	 */
-	dflags = 0;
-	if (key->size + data->size > t->bt_ovflsize) {
-		if (key->size > t->bt_ovflsize) {
-storekey:		if (__ovfl_put(t, key, &pg) == RET_ERROR)
-				return (RET_ERROR);
-			tkey.data = kb;
-			tkey.size = NOVFLSIZE;
-			memmove(kb, &pg, sizeof(pg));
-			memmove(kb + sizeof(pgno_t),
-			    &key->size, sizeof(uint32_t));
-			dflags |= P_BIGKEY;
-			key = &tkey;
-		}
-		if (key->size + data->size > t->bt_ovflsize) {
-			if (__ovfl_put(t, data, &pg) == RET_ERROR)
-				return (RET_ERROR);
-			tdata.data = db;
-			tdata.size = NOVFLSIZE;
-			memmove(db, &pg, sizeof(pg));
-			_DBFIT(data->size, uint32_t);
-			temp = (uint32_t)data->size;
-			(void)memmove(db + sizeof(pgno_t),
-			    &temp, sizeof(uint32_t));
-			dflags |= P_BIGDATA;
-			data = &tdata;
-		}
-		if (key->size + data->size > t->bt_ovflsize)
-			goto storekey;
-	}
-
-	/* Replace the cursor. */
-	if (flags == R_CURSOR) {
-		if ((h = mpool_get(t->bt_mp, t->bt_cursor.pg.pgno, 0)) == NULL)
-			return (RET_ERROR);
-		idx = t->bt_cursor.pg.index;
-		goto delete;
-	}
-
-	/*
-	 * Find the key to delete, or, the location at which to insert.
-	 * Bt_fast and __bt_search both pin the returned page.
-	 */
-	if (t->bt_order == NOT || (e = bt_fast(t, key, data, &exact)) == NULL)
-		if ((e = __bt_search(t, key, &exact)) == NULL)
-			return (RET_ERROR);
-	h = e->page;
-	idx = e->index;
-
-	/*
-	 * Add the key/data pair to the tree.  If an identical key is already
-	 * in the tree, and R_NOOVERWRITE is set, an error is returned.  If
-	 * R_NOOVERWRITE is not set, the key is either added (if duplicates are
-	 * permitted) or an error is returned.
-	 */
-	switch (flags) {
-	case R_NOOVERWRITE:
-		if (!exact)
-			break;
-		mpool_put(t->bt_mp, h, 0);
-		return (RET_SPECIAL);
-	default:
-		if (!exact || !F_ISSET(t, B_NODUPS))
-			break;
-		/*
-		 * !!!
-		 * Note, the delete may empty the page, so we need to put a
-		 * new entry into the page immediately.
-		 */
-delete:		if (__bt_dleaf(t, key, h, (u_int)idx) == RET_ERROR) {
-			mpool_put(t->bt_mp, h, 0);
-			return (RET_ERROR);
-		}
-		break;
-	}
-
-	/*
-	 * If not enough room, or the user has put a ceiling on the number of
-	 * keys permitted in the page, split the page.  The split code will
-	 * insert the key and data and unpin the current page.  If inserting
-	 * into the offset array, shift the pointers up.
-	 */
-	nbytes = NBLEAFDBT(key->size, data->size);
-	if ((uint32_t)h->upper - (uint32_t)h->lower < nbytes + sizeof(indx_t)) {
-		if ((status = __bt_split(t, h, key,
-		    data, dflags, nbytes, (u_int)idx)) != RET_SUCCESS)
-			return (status);
-		goto success;
-	}
-
-	if (idx < (nxtindex = NEXTINDEX(h)))
-		memmove(h->linp + idx + 1, h->linp + idx,
-		    (nxtindex - idx) * sizeof(indx_t));
-	h->lower += sizeof(indx_t);
-
-	h->linp[idx] = h->upper -= nbytes;
-	dest = (char *)(void *)h + h->upper;
-	WR_BLEAF(dest, key, data, dflags);
-
-	/* If the cursor is on this page, adjust it as necessary. */
-	if (F_ISSET(&t->bt_cursor, CURS_INIT) &&
-	    !F_ISSET(&t->bt_cursor, CURS_ACQUIRE) &&
-	    t->bt_cursor.pg.pgno == h->pgno && t->bt_cursor.pg.index >= idx)
-		++t->bt_cursor.pg.index;
-
-	if (t->bt_order == NOT) {
-		if (h->nextpg == P_INVALID) {
-			if (idx == NEXTINDEX(h) - 1) {
-				t->bt_order = FORWARD;
-				t->bt_last.index = idx;
-				t->bt_last.pgno = h->pgno;
-			}
-		} else if (h->prevpg == P_INVALID) {
-			if (idx == 0) {
-				t->bt_order = BACK;
-				t->bt_last.index = 0;
-				t->bt_last.pgno = h->pgno;
-			}
-		}
-	}
-
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-success:
-	if (flags == R_SETCURSOR)
-		__bt_setcur(t, e->page->pgno, (u_int)e->index);
-
-	F_SET(t, B_MODIFIED);
-	return (RET_SUCCESS);
-}
-
-#ifdef STATISTICS
-unsigned long bt_cache_hit, bt_cache_miss;
-#endif
-
-/*
- * BT_FAST -- Do a quick check for sorted data.
- *
- * Parameters:
- *	t:	tree
- *	key:	key to insert
- *
- * Returns:
- * 	EPG for new record or NULL if not found.
- */
-static EPG *
-bt_fast(BTREE *t, const DBT *key, const DBT *data, int *exactp)
-{
-	PAGE *h;
-	uint32_t nbytes;
-	int cmp;
-
-	if ((h = mpool_get(t->bt_mp, t->bt_last.pgno, 0)) == NULL) {
-		t->bt_order = NOT;
-		return (NULL);
-	}
-	t->bt_cur.page = h;
-	t->bt_cur.index = t->bt_last.index;
-
-	/*
-	 * If won't fit in this page or have too many keys in this page,
-	 * have to search to get split stack.
-	 */
-	nbytes = NBLEAFDBT(key->size, data->size);
-	if ((uint32_t)h->upper - (uint32_t)h->lower < nbytes + sizeof(indx_t))
-		goto miss;
-
-	if (t->bt_order == FORWARD) {
-		if (t->bt_cur.page->nextpg != P_INVALID)
-			goto miss;
-		if (t->bt_cur.index != NEXTINDEX(h) - 1)
-			goto miss;
-		if ((cmp = __bt_cmp(t, key, &t->bt_cur)) < 0)
-			goto miss;
-		t->bt_last.index = cmp ? ++t->bt_cur.index : t->bt_cur.index;
-	} else {
-		if (t->bt_cur.page->prevpg != P_INVALID)
-			goto miss;
-		if (t->bt_cur.index != 0)
-			goto miss;
-		if ((cmp = __bt_cmp(t, key, &t->bt_cur)) > 0)
-			goto miss;
-		t->bt_last.index = 0;
-	}
-	*exactp = cmp == 0;
-#ifdef STATISTICS
-	++bt_cache_hit;
-#endif
-	return (&t->bt_cur);
-
-miss:
-#ifdef STATISTICS
-	++bt_cache_miss;
-#endif
-	t->bt_order = NOT;
-	mpool_put(t->bt_mp, h, 0);
-	return (NULL);
-}
diff --git a/lib/libc/db/btree/bt_search.c b/lib/libc/db/btree/bt_search.c
deleted file mode 100644
index 00da7c9b6..000000000
--- a/lib/libc/db/btree/bt_search.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*	$NetBSD: bt_search.c,v 1.17 2008/09/11 12:58:00 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: bt_search.c,v 1.17 2008/09/11 12:58:00 joerg Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <stdio.h>
-
-#include <db.h>
-#include "btree.h"
-
-static int __bt_snext(BTREE *, PAGE *, const DBT *, int *);
-static int __bt_sprev(BTREE *, PAGE *, const DBT *, int *);
-
-/*
- * __bt_search --
- *	Search a btree for a key.
- *
- * Parameters:
- *	t:	tree to search
- *	key:	key to find
- *	exactp:	pointer to exact match flag
- *
- * Returns:
- *	The EPG for matching record, if any, or the EPG for the location
- *	of the key, if it were inserted into the tree, is entered into
- *	the bt_cur field of the tree.  A pointer to the field is returned.
- */
-EPG *
-__bt_search(BTREE *t, const DBT *key, int *exactp)
-{
-	PAGE *h;
-	indx_t base, idx, lim;
-	pgno_t pg;
-	int cmp;
-
-	BT_CLR(t);
-	for (pg = P_ROOT;;) {
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			return (NULL);
-
-		/* Do a binary search on the current page. */
-		t->bt_cur.page = h;
-		for (base = 0, lim = NEXTINDEX(h); lim; lim >>= 1) {
-			t->bt_cur.index = idx = base + ((uint32_t)lim >> 1);
-			if ((cmp = __bt_cmp(t, key, &t->bt_cur)) == 0) {
-				if (h->flags & P_BLEAF) {
-					*exactp = 1;
-					return (&t->bt_cur);
-				}
-				goto next;
-			}
-			if (cmp > 0) {
-				base = idx + 1;
-				--lim;
-			}
-		}
-
-		/*
-		 * If it's a leaf page, we're almost done.  If no duplicates
-		 * are allowed, or we have an exact match, we're done.  Else,
-		 * it's possible that there were matching keys on this page,
-		 * which later deleted, and we're on a page with no matches
-		 * while there are matches on other pages.  If at the start or
-		 * end of a page, check the adjacent page.
-		 */
-		if (h->flags & P_BLEAF) {
-			if (!F_ISSET(t, B_NODUPS)) {
-				if (base == 0 &&
-				    h->prevpg != P_INVALID &&
-				    __bt_sprev(t, h, key, exactp))
-					return (&t->bt_cur);
-				if (base == NEXTINDEX(h) &&
-				    h->nextpg != P_INVALID &&
-				    __bt_snext(t, h, key, exactp))
-					return (&t->bt_cur);
-			}
-			*exactp = 0;
-			t->bt_cur.index = base;
-			return (&t->bt_cur);
-		}
-
-		/*
-		 * No match found.  Base is the smallest index greater than
-		 * key and may be zero or a last + 1 index.  If it's non-zero,
-		 * decrement by one, and record the internal page which should
-		 * be a parent page for the key.  If a split later occurs, the
-		 * inserted page will be to the right of the saved page.
-		 */
-		idx = base ? base - 1 : base;
-
-next:		BT_PUSH(t, h->pgno, idx);
-		pg = GETBINTERNAL(h, idx)->pgno;
-		mpool_put(t->bt_mp, h, 0);
-	}
-}
-
-/*
- * __bt_snext --
- *	Check for an exact match after the key.
- *
- * Parameters:
- *	t:	tree
- *	h:	current page
- *	key:	key
- *	exactp:	pointer to exact match flag
- *
- * Returns:
- *	If an exact match found.
- */
-static int
-__bt_snext(BTREE *t, PAGE *h, const DBT *key, int *exactp)
-{
-	EPG e;
-
-	/*
-	 * Get the next page.  The key is either an exact
-	 * match, or not as good as the one we already have.
-	 */
-	if ((e.page = mpool_get(t->bt_mp, h->nextpg, 0)) == NULL)
-		return (0);
-	e.index = 0;
-	if (__bt_cmp(t, key, &e) == 0) {
-		mpool_put(t->bt_mp, h, 0);
-		t->bt_cur = e;
-		*exactp = 1;
-		return (1);
-	}
-	mpool_put(t->bt_mp, e.page, 0);
-	return (0);
-}
-
-/*
- * __bt_sprev --
- *	Check for an exact match before the key.
- *
- * Parameters:
- *	t:	tree
- *	h:	current page
- *	key:	key
- *	exactp:	pointer to exact match flag
- *
- * Returns:
- *	If an exact match found.
- */
-static int
-__bt_sprev(BTREE *t, PAGE *h, const DBT *key, int *exactp)
-{
-	EPG e;
-
-	/*
-	 * Get the previous page.  The key is either an exact
-	 * match, or not as good as the one we already have.
-	 */
-	if ((e.page = mpool_get(t->bt_mp, h->prevpg, 0)) == NULL)
-		return (0);
-	e.index = NEXTINDEX(e.page) - 1;
-	if (__bt_cmp(t, key, &e) == 0) {
-		mpool_put(t->bt_mp, h, 0);
-		t->bt_cur = e;
-		*exactp = 1;
-		return (1);
-	}
-	mpool_put(t->bt_mp, e.page, 0);
-	return (0);
-}
diff --git a/lib/libc/db/btree/bt_seq.c b/lib/libc/db/btree/bt_seq.c
deleted file mode 100644
index 3f5b4cfa2..000000000
--- a/lib/libc/db/btree/bt_seq.c
+++ /dev/null
@@ -1,442 +0,0 @@
-/*	$NetBSD: bt_seq.c,v 1.18 2013/09/04 13:03:22 ryoon Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: bt_seq.c,v 1.18 2013/09/04 13:03:22 ryoon Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <db.h>
-#include "btree.h"
-
-static int __bt_first(BTREE *, const DBT *, EPG *, int *);
-static int __bt_seqadv(BTREE *, EPG *, int);
-static int __bt_seqset(BTREE *, EPG *, DBT *, int);
-
-/*
- * Sequential scan support.
- *
- * The tree can be scanned sequentially, starting from either end of the
- * tree or from any specific key.  A scan request before any scanning is
- * done is initialized as starting from the least node.
- */
-
-/*
- * __bt_seq --
- *	Btree sequential scan interface.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key for positioning and return value
- *	data:	data return value
- *	flags:	R_CURSOR, R_FIRST, R_LAST, R_NEXT, R_PREV.
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
- */
-int
-__bt_seq(const DB *dbp, DBT *key, DBT *data, u_int flags)
-{
-	BTREE *t;
-	EPG e;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/*
-	 * If scan uninitialized as yet, or starting at a specific record, set
-	 * the scan to a specific key.  Both __bt_seqset and __bt_seqadv pin
-	 * the page the cursor references if they're successful.
-	 */
-	switch (flags) {
-	case R_NEXT:
-	case R_PREV:
-		if (F_ISSET(&t->bt_cursor, CURS_INIT)) {
-			status = __bt_seqadv(t, &e, (int)flags);
-			break;
-		}
-		/* FALLTHROUGH */
-	case R_FIRST:
-	case R_LAST:
-	case R_CURSOR:
-		status = __bt_seqset(t, &e, key, (int)flags);
-		break;
-	default:
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	if (status == RET_SUCCESS) {
-		__bt_setcur(t, e.page->pgno, (u_int)e.index);
-
-		status =
-		    __bt_ret(t, &e, key, &t->bt_rkey, data, &t->bt_rdata, 0);
-
-		/*
-		 * If the user is doing concurrent access, we copied the
-		 * key/data, toss the page.
-		 */
-		if (F_ISSET(t, B_DB_LOCK))
-			mpool_put(t->bt_mp, e.page, 0);
-		else
-			t->bt_pinned = e.page;
-	}
-	return (status);
-}
-
-/*
- * __bt_seqset --
- *	Set the sequential scan to a specific key.
- *
- * Parameters:
- *	t:	tree
- *	ep:	storage for returned key
- *	key:	key for initial scan position
- *	flags:	R_CURSOR, R_FIRST, R_LAST, R_NEXT, R_PREV
- *
- * Side effects:
- *	Pins the page the cursor references.
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
- */
-static int
-__bt_seqset(BTREE *t, EPG *ep, DBT *key, int flags)
-{
-	PAGE *h;
-	pgno_t pg;
-	int exact;
-
-	/*
-	 * Find the first, last or specific key in the tree and point the
-	 * cursor at it.  The cursor may not be moved until a new key has
-	 * been found.
-	 */
-	switch (flags) {
-	case R_CURSOR:				/* Keyed scan. */
-		/*
-		 * Find the first instance of the key or the smallest key
-		 * which is greater than or equal to the specified key.
-		 */
-		if (key->data == NULL || key->size == 0) {
-			errno = EINVAL;
-			return (RET_ERROR);
-		}
-		return (__bt_first(t, key, ep, &exact));
-	case R_FIRST:				/* First record. */
-	case R_NEXT:
-		/* Walk down the left-hand side of the tree. */
-		for (pg = P_ROOT;;) {
-			if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-				return (RET_ERROR);
-
-			/* Check for an empty tree. */
-			if (NEXTINDEX(h) == 0) {
-				mpool_put(t->bt_mp, h, 0);
-				return (RET_SPECIAL);
-			}
-
-			if (h->flags & (P_BLEAF | P_RLEAF))
-				break;
-			pg = GETBINTERNAL(h, 0)->pgno;
-			mpool_put(t->bt_mp, h, 0);
-		}
-		ep->page = h;
-		ep->index = 0;
-		break;
-	case R_LAST:				/* Last record. */
-	case R_PREV:
-		/* Walk down the right-hand side of the tree. */
-		for (pg = P_ROOT;;) {
-			if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-				return (RET_ERROR);
-
-			/* Check for an empty tree. */
-			if (NEXTINDEX(h) == 0) {
-				mpool_put(t->bt_mp, h, 0);
-				return (RET_SPECIAL);
-			}
-
-			if (h->flags & (P_BLEAF | P_RLEAF))
-				break;
-			pg = GETBINTERNAL(h, NEXTINDEX(h) - 1)->pgno;
-			mpool_put(t->bt_mp, h, 0);
-		}
-
-		ep->page = h;
-		ep->index = NEXTINDEX(h) - 1;
-		break;
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_seqadvance --
- *	Advance the sequential scan.
- *
- * Parameters:
- *	t:	tree
- *	flags:	R_NEXT, R_PREV
- *
- * Side effects:
- *	Pins the page the new key/data record is on.
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
- */
-static int
-__bt_seqadv(BTREE *t, EPG *ep, int flags)
-{
-	CURSOR *c;
-	PAGE *h;
-	indx_t idx = 0;	/* pacify gcc */
-	pgno_t pg;
-	int exact;
-
-	/*
-	 * There are a couple of states that we can be in.  The cursor has
-	 * been initialized by the time we get here, but that's all we know.
-	 */
-	c = &t->bt_cursor;
-
-	/*
-	 * The cursor was deleted where there weren't any duplicate records,
-	 * so the key was saved.  Find out where that key would go in the
-	 * current tree.  It doesn't matter if the returned key is an exact
-	 * match or not -- if it's an exact match, the record was added after
-	 * the delete so we can just return it.  If not, as long as there's
-	 * a record there, return it.
-	 */
-	if (F_ISSET(c, CURS_ACQUIRE))
-		return (__bt_first(t, &c->key, ep, &exact));
-
-	/* Get the page referenced by the cursor. */
-	if ((h = mpool_get(t->bt_mp, c->pg.pgno, 0)) == NULL)
-		return (RET_ERROR);
-
-	/*
- 	 * Find the next/previous record in the tree and point the cursor at
-	 * it.  The cursor may not be moved until a new key has been found.
-	 */
-	switch (flags) {
-	case R_NEXT:			/* Next record. */
-		/*
-		 * The cursor was deleted in duplicate records, and moved
-		 * forward to a record that has yet to be returned.  Clear
-		 * that flag, and return the record.
-		 */
-		if (F_ISSET(c, CURS_AFTER))
-			goto usecurrent;
-		idx = c->pg.index;
-		if (++idx == NEXTINDEX(h)) {
-			pg = h->nextpg;
-			mpool_put(t->bt_mp, h, 0);
-			if (pg == P_INVALID)
-				return (RET_SPECIAL);
-			if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-				return (RET_ERROR);
-			idx = 0;
-		}
-		break;
-	case R_PREV:			/* Previous record. */
-		/*
-		 * The cursor was deleted in duplicate records, and moved
-		 * backward to a record that has yet to be returned.  Clear
-		 * that flag, and return the record.
-		 */
-		if (F_ISSET(c, CURS_BEFORE)) {
-usecurrent:		F_CLR(c, CURS_AFTER | CURS_BEFORE);
-			ep->page = h;
-			ep->index = c->pg.index;
-			return (RET_SUCCESS);
-		}
-		idx = c->pg.index;
-		if (idx == 0) {
-			pg = h->prevpg;
-			mpool_put(t->bt_mp, h, 0);
-			if (pg == P_INVALID)
-				return (RET_SPECIAL);
-			if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-				return (RET_ERROR);
-			idx = NEXTINDEX(h) - 1;
-		} else
-			--idx;
-		break;
-	}
-
-	ep->page = h;
-	ep->index = idx;
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_first --
- *	Find the first entry.
- *
- * Parameters:
- *	t:	the tree
- *    key:	the key
- *  erval:	return EPG
- * exactp:	pointer to exact match flag
- *
- * Returns:
- *	The first entry in the tree greater than or equal to key,
- *	or RET_SPECIAL if no such key exists.
- */
-static int
-__bt_first(BTREE *t, const DBT *key, EPG *erval, int *exactp)
-{
-	PAGE *h;
-	EPG *ep, save;
-	pgno_t pg;
-
-	/*
-	 * Find any matching record; __bt_search pins the page.
-	 *
-	 * If it's an exact match and duplicates are possible, walk backwards
-	 * in the tree until we find the first one.  Otherwise, make sure it's
-	 * a valid key (__bt_search may return an index just past the end of a
-	 * page) and return it.
-	 */
-	if ((ep = __bt_search(t, key, exactp)) == NULL)
-		return (0);
-	if (*exactp) {
-		if (F_ISSET(t, B_NODUPS)) {
-			*erval = *ep;
-			return (RET_SUCCESS);
-		}
-			
-		/*
-		 * Walk backwards, as long as the entry matches and there are
-		 * keys left in the tree.  Save a copy of each match in case
-		 * we go too far.
-		 */
-		save = *ep;
-		h = ep->page;
-		do {
-			if (save.page->pgno != ep->page->pgno) {
-				mpool_put(t->bt_mp, save.page, 0);
-				save = *ep;
-			} else
-				save.index = ep->index;
-
-			/*
-			 * Don't unpin the page the last (or original) match
-			 * was on, but make sure it's unpinned if an error
-			 * occurs.
-			 */
-			if (ep->index == 0) {
-				if (h->prevpg == P_INVALID)
-					break;
-				if (h->pgno != save.page->pgno)
-					mpool_put(t->bt_mp, h, 0);
-				if ((h = mpool_get(t->bt_mp,
-				    h->prevpg, 0)) == NULL)
-					return (RET_ERROR);
-				ep->page = h;
-				ep->index = NEXTINDEX(h);
-			}
-			--ep->index;
-		} while (__bt_cmp(t, key, ep) == 0);
-
-		/*
-		 * Reach here with the last page that was looked at pinned,
-		 * which may or may not be the same as the last (or original)
-		 * match page.  If it's not useful, release it.
-		 */
-		if (h->pgno != save.page->pgno)
-			mpool_put(t->bt_mp, h, 0);
-
-		*erval = save;
-		return (RET_SUCCESS);
-	}
-
-	/* If at the end of a page, find the next entry. */
-	if (ep->index == NEXTINDEX(ep->page)) {
-		h = ep->page;
-		pg = h->nextpg;
-		mpool_put(t->bt_mp, h, 0);
-		if (pg == P_INVALID)
-			return (RET_SPECIAL);
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			return (RET_ERROR);
-		ep->index = 0;
-		ep->page = h;
-	}
-	*erval = *ep;
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_setcur --
- *	Set the cursor to an entry in the tree.
- *
- * Parameters:
- *	t:	the tree
- *   pgno:	page number
- *    idx:	page index
- */
-void
-__bt_setcur(BTREE *t, pgno_t pgno, u_int idx)
-{
-	/* Lose any already deleted key. */
-	if (t->bt_cursor.key.data != NULL) {
-		free(t->bt_cursor.key.data);
-		t->bt_cursor.key.size = 0;
-		t->bt_cursor.key.data = NULL;
-	}
-	F_CLR(&t->bt_cursor, CURS_ACQUIRE | CURS_AFTER | CURS_BEFORE);
-
-	/* Update the cursor. */
-	t->bt_cursor.pg.pgno = pgno;
-	t->bt_cursor.pg.index = idx;
-	F_SET(&t->bt_cursor, CURS_INIT);
-}
diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c
deleted file mode 100644
index f7356c7e3..000000000
--- a/lib/libc/db/btree/bt_split.c
+++ /dev/null
@@ -1,832 +0,0 @@
-/*	$NetBSD: bt_split.c,v 1.20 2011/06/20 09:11:17 mrg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: bt_split.c,v 1.20 2011/06/20 09:11:17 mrg Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-static int	 bt_broot(BTREE *, PAGE *, PAGE *, PAGE *);
-static PAGE	*bt_page(BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t);
-static int	 bt_preserve(BTREE *, pgno_t);
-static PAGE	*bt_psplit(BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t);
-static PAGE	*bt_root(BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t);
-static int	 bt_rroot(BTREE *, PAGE *, PAGE *, PAGE *);
-static recno_t	 rec_total(PAGE *);
-
-#ifdef STATISTICS
-unsigned long	bt_rootsplit, bt_split, bt_sortsplit, bt_pfxsaved;
-#endif
-
-/*
- * __BT_SPLIT -- Split the tree.
- *
- * Parameters:
- *	t:	tree
- *	sp:	page to split
- *	key:	key to insert
- *	data:	data to insert
- *	flags:	BIGKEY/BIGDATA flags
- *	ilen:	insert length
- *	skip:	index to leave open
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__bt_split(BTREE *t, PAGE *sp, const DBT *key, const DBT *data, int flags,
-    size_t ilen, uint32_t argskip)
-{
-	BINTERNAL *bi = NULL;	/* pacify gcc */
-	BLEAF *bl = NULL, *tbl;	/* pacify gcc */
-	DBT a, b;
-	EPGNO *parent;
-	PAGE *h, *l, *r, *lchild, *rchild;
-	indx_t nxtindex;
-	uint16_t skip;
-	uint32_t n, nbytes, nksize = 0; /* pacify gcc */
-	int parentsplit;
-	char *dest;
-
-	/*
-	 * Split the page into two pages, l and r.  The split routines return
-	 * a pointer to the page into which the key should be inserted and with
-	 * skip set to the offset which should be used.  Additionally, l and r
-	 * are pinned.
-	 */
-	skip = argskip;
-	h = sp->pgno == P_ROOT ?
-	    bt_root(t, sp, &l, &r, &skip, ilen) :
-	    bt_page(t, sp, &l, &r, &skip, ilen);
-	if (h == NULL)
-		return (RET_ERROR);
-
-	/*
-	 * Insert the new key/data pair into the leaf page.  (Key inserts
-	 * always cause a leaf page to split first.)
-	 */
-	_DBFIT(ilen, indx_t);
-	h->upper -= (indx_t)ilen;
-	h->linp[skip] = h->upper;
-	dest = (char *)(void *)h + h->upper;
-	if (F_ISSET(t, R_RECNO))
-		WR_RLEAF(dest, data, flags);
-	else
-		WR_BLEAF(dest, key, data, flags);
-
-	/* If the root page was split, make it look right. */
-	if (sp->pgno == P_ROOT &&
-	    (F_ISSET(t, R_RECNO) ?
-	    bt_rroot(t, sp, l, r) : bt_broot(t, sp, l, r)) == RET_ERROR)
-		goto err2;
-
-	/*
-	 * Now we walk the parent page stack -- a LIFO stack of the pages that
-	 * were traversed when we searched for the page that split.  Each stack
-	 * entry is a page number and a page index offset.  The offset is for
-	 * the page traversed on the search.  We've just split a page, so we
-	 * have to insert a new key into the parent page.
-	 *
-	 * If the insert into the parent page causes it to split, may have to
-	 * continue splitting all the way up the tree.  We stop if the root
-	 * splits or the page inserted into didn't have to split to hold the
-	 * new key.  Some algorithms replace the key for the old page as well
-	 * as the new page.  We don't, as there's no reason to believe that the
-	 * first key on the old page is any better than the key we have, and,
-	 * in the case of a key being placed at index 0 causing the split, the
-	 * key is unavailable.
-	 *
-	 * There are a maximum of 5 pages pinned at any time.  We keep the left
-	 * and right pages pinned while working on the parent.   The 5 are the
-	 * two children, left parent and right parent (when the parent splits)
-	 * and the root page or the overflow key page when calling bt_preserve.
-	 * This code must make sure that all pins are released other than the
-	 * root page or overflow page which is unlocked elsewhere.
-	 */
-	while ((parent = BT_POP(t)) != NULL) {
-		lchild = l;
-		rchild = r;
-
-		/* Get the parent page. */
-		if ((h = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-			goto err2;
-
-	 	/*
-		 * The new key goes ONE AFTER the index, because the split
-		 * was to the right.
-		 */
-		skip = parent->index + 1;
-
-		/*
-		 * Calculate the space needed on the parent page.
-		 *
-		 * Prefix trees: space hack when inserting into BINTERNAL
-		 * pages.  Retain only what's needed to distinguish between
-		 * the new entry and the LAST entry on the page to its left.
-		 * If the keys compare equal, retain the entire key.  Note,
-		 * we don't touch overflow keys, and the entire key must be
-		 * retained for the next-to-left most key on the leftmost
-		 * page of each level, or the search will fail.  Applicable
-		 * ONLY to internal pages that have leaf pages as children.
-		 * Further reduction of the key between pairs of internal
-		 * pages loses too much information.
-		 */
-		switch (rchild->flags & P_TYPE) {
-		case P_BINTERNAL:
-			bi = GETBINTERNAL(rchild, 0);
-			nbytes = NBINTERNAL(bi->ksize);
-			break;
-		case P_BLEAF:
-			bl = GETBLEAF(rchild, 0);
-			nbytes = NBINTERNAL(bl->ksize);
-			if (t->bt_pfx && !(bl->flags & P_BIGKEY) &&
-			    (h->prevpg != P_INVALID || skip > 1)) {
-				size_t temp;
-				tbl = GETBLEAF(lchild, NEXTINDEX(lchild) - 1);
-				a.size = tbl->ksize;
-				a.data = tbl->bytes;
-				b.size = bl->ksize;
-				b.data = bl->bytes;
-				temp = t->bt_pfx(&a, &b);
-				_DBFIT(temp, uint32_t);
-				nksize = (uint32_t)temp;
-				n = NBINTERNAL(nksize);
-				if (n < nbytes) {
-#ifdef STATISTICS
-					bt_pfxsaved += nbytes - n;
-#endif
-					nbytes = n;
-				} else
-					nksize = 0;
-			} else
-				nksize = 0;
-			break;
-		case P_RINTERNAL:
-		case P_RLEAF:
-			nbytes = NRINTERNAL;
-			break;
-		default:
-			abort();
-		}
-
-		/* Split the parent page if necessary or shift the indices. */
-		if ((uint32_t)h->upper - (uint32_t)h->lower < nbytes + sizeof(indx_t)) {
-			sp = h;
-			h = h->pgno == P_ROOT ?
-			    bt_root(t, h, &l, &r, &skip, nbytes) :
-			    bt_page(t, h, &l, &r, &skip, nbytes);
-			if (h == NULL)
-				goto err1;
-			parentsplit = 1;
-		} else {
-			if (skip < (nxtindex = NEXTINDEX(h)))
-				memmove(h->linp + skip + 1, h->linp + skip,
-				    (nxtindex - skip) * sizeof(indx_t));
-			h->lower += sizeof(indx_t);
-			parentsplit = 0;
-		}
-
-		/* Insert the key into the parent page. */
-		switch (rchild->flags & P_TYPE) {
-		case P_BINTERNAL:
-			h->linp[skip] = h->upper -= nbytes;
-			dest = (char *)(void *)h + h->linp[skip];
-			memmove(dest, bi, nbytes);
-			((BINTERNAL *)(void *)dest)->pgno = rchild->pgno;
-			break;
-		case P_BLEAF:
-			h->linp[skip] = h->upper -= nbytes;
-			dest = (char *)(void *)h + h->linp[skip];
-			WR_BINTERNAL(dest, nksize ? nksize : bl->ksize,
-			    rchild->pgno, bl->flags & P_BIGKEY);
-			memmove(dest, bl->bytes, nksize ? nksize : bl->ksize);
-			if (bl->flags & P_BIGKEY) {
-				pgno_t pgno;
-				memcpy(&pgno, bl->bytes, sizeof(pgno));
-				if (bt_preserve(t, pgno) == RET_ERROR)
-					goto err1;
-			}
-			break;
-		case P_RINTERNAL:
-			/*
-			 * Update the left page count.  If split
-			 * added at index 0, fix the correct page.
-			 */
-			if (skip > 0)
-				dest = (char *)(void *)h + h->linp[skip - 1];
-			else
-				dest = (char *)(void *)l + l->linp[NEXTINDEX(l) - 1];
-			((RINTERNAL *)(void *)dest)->nrecs = rec_total(lchild);
-			((RINTERNAL *)(void *)dest)->pgno = lchild->pgno;
-
-			/* Update the right page count. */
-			h->linp[skip] = h->upper -= nbytes;
-			dest = (char *)(void *)h + h->linp[skip];
-			((RINTERNAL *)(void *)dest)->nrecs = rec_total(rchild);
-			((RINTERNAL *)(void *)dest)->pgno = rchild->pgno;
-			break;
-		case P_RLEAF:
-			/*
-			 * Update the left page count.  If split
-			 * added at index 0, fix the correct page.
-			 */
-			if (skip > 0)
-				dest = (char *)(void *)h + h->linp[skip - 1];
-			else
-				dest = (char *)(void *)l + l->linp[NEXTINDEX(l) - 1];
-			((RINTERNAL *)(void *)dest)->nrecs = NEXTINDEX(lchild);
-			((RINTERNAL *)(void *)dest)->pgno = lchild->pgno;
-
-			/* Update the right page count. */
-			h->linp[skip] = h->upper -= nbytes;
-			dest = (char *)(void *)h + h->linp[skip];
-			((RINTERNAL *)(void *)dest)->nrecs = NEXTINDEX(rchild);
-			((RINTERNAL *)(void *)dest)->pgno = rchild->pgno;
-			break;
-		default:
-			abort();
-		}
-
-		/* Unpin the held pages. */
-		if (!parentsplit) {
-			mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			break;
-		}
-
-		/* If the root page was split, make it look right. */
-		if (sp->pgno == P_ROOT &&
-		    (F_ISSET(t, R_RECNO) ?
-		    bt_rroot(t, sp, l, r) : bt_broot(t, sp, l, r)) == RET_ERROR)
-			goto err1;
-
-		mpool_put(t->bt_mp, lchild, MPOOL_DIRTY);
-		mpool_put(t->bt_mp, rchild, MPOOL_DIRTY);
-	}
-
-	/* Unpin the held pages. */
-	mpool_put(t->bt_mp, l, MPOOL_DIRTY);
-	mpool_put(t->bt_mp, r, MPOOL_DIRTY);
-
-	/* Clear any pages left on the stack. */
-	return (RET_SUCCESS);
-
-	/*
-	 * If something fails in the above loop we were already walking back
-	 * up the tree and the tree is now inconsistent.  Nothing much we can
-	 * do about it but release any memory we're holding.
-	 */
-err1:	mpool_put(t->bt_mp, lchild, MPOOL_DIRTY);
-	mpool_put(t->bt_mp, rchild, MPOOL_DIRTY);
-
-err2:	mpool_put(t->bt_mp, l, 0);
-	mpool_put(t->bt_mp, r, 0);
-	__dbpanic(t->bt_dbp);
-	return (RET_ERROR);
-}
-
-/*
- * BT_PAGE -- Split a non-root page of a btree.
- *
- * Parameters:
- *	t:	tree
- *	h:	root page
- *	lp:	pointer to left page pointer
- *	rp:	pointer to right page pointer
- *	skip:	pointer to index to leave open
- *	ilen:	insert length
- *
- * Returns:
- *	Pointer to page in which to insert or NULL on error.
- */
-static PAGE *
-bt_page(BTREE *t, PAGE *h, PAGE **lp, PAGE **rp, indx_t *skip, size_t ilen)
-{
-	PAGE *l, *r, *tp;
-	pgno_t npg;
-
-#ifdef STATISTICS
-	++bt_split;
-#endif
-	/* Put the new right page for the split into place. */
-	if ((r = __bt_new(t, &npg)) == NULL)
-		return (NULL);
-	r->pgno = npg;
-	r->lower = BTDATAOFF;
-	r->upper = t->bt_psize;
-	r->nextpg = h->nextpg;
-	r->prevpg = h->pgno;
-	r->flags = h->flags & P_TYPE;
-
-	/*
-	 * If we're splitting the last page on a level because we're appending
-	 * a key to it (skip is NEXTINDEX()), it's likely that the data is
-	 * sorted.  Adding an empty page on the side of the level is less work
-	 * and can push the fill factor much higher than normal.  If we're
-	 * wrong it's no big deal, we'll just do the split the right way next
-	 * time.  It may look like it's equally easy to do a similar hack for
-	 * reverse sorted data, that is, split the tree left, but it's not.
-	 * Don't even try.
-	 */
-	if (h->nextpg == P_INVALID && *skip == NEXTINDEX(h)) {
-#ifdef STATISTICS
-		++bt_sortsplit;
-#endif
-		h->nextpg = r->pgno;
-		r->lower = BTDATAOFF + sizeof(indx_t);
-		*skip = 0;
-		*lp = h;
-		*rp = r;
-		return (r);
-	}
-
-	/* Put the new left page for the split into place. */
-	if ((l = calloc(1, t->bt_psize)) == NULL) {
-		mpool_put(t->bt_mp, r, 0);
-		return (NULL);
-	}
-#ifdef PURIFY
-	memset(l, 0xff, t->bt_psize);
-#endif
-	l->pgno = h->pgno;
-	l->nextpg = r->pgno;
-	l->prevpg = h->prevpg;
-	l->lower = BTDATAOFF;
-	l->upper = t->bt_psize;
-	l->flags = h->flags & P_TYPE;
-
-	/* Fix up the previous pointer of the page after the split page. */
-	if (h->nextpg != P_INVALID) {
-		if ((tp = mpool_get(t->bt_mp, h->nextpg, 0)) == NULL) {
-			free(l);
-			/* XXX mpool_free(t->bt_mp, r->pgno); */
-			return (NULL);
-		}
-		tp->prevpg = r->pgno;
-		mpool_put(t->bt_mp, tp, MPOOL_DIRTY);
-	}
-
-	/*
-	 * Split right.  The key/data pairs aren't sorted in the btree page so
-	 * it's simpler to copy the data from the split page onto two new pages
-	 * instead of copying half the data to the right page and compacting
-	 * the left page in place.  Since the left page can't change, we have
-	 * to swap the original and the allocated left page after the split.
-	 */
-	tp = bt_psplit(t, h, l, r, skip, ilen);
-
-	/* Move the new left page onto the old left page. */
-	memmove(h, l, t->bt_psize);
-	if (tp == l)
-		tp = h;
-	free(l);
-
-	*lp = h;
-	*rp = r;
-	return (tp);
-}
-
-/*
- * BT_ROOT -- Split the root page of a btree.
- *
- * Parameters:
- *	t:	tree
- *	h:	root page
- *	lp:	pointer to left page pointer
- *	rp:	pointer to right page pointer
- *	skip:	pointer to index to leave open
- *	ilen:	insert length
- *
- * Returns:
- *	Pointer to page in which to insert or NULL on error.
- */
-static PAGE *
-bt_root(BTREE *t, PAGE *h, PAGE **lp, PAGE **rp, indx_t *skip, size_t ilen)
-{
-	PAGE *l, *r, *tp;
-	pgno_t lnpg, rnpg;
-
-#ifdef STATISTICS
-	++bt_split;
-	++bt_rootsplit;
-#endif
-	/* Put the new left and right pages for the split into place. */
-	if ((l = __bt_new(t, &lnpg)) == NULL ||
-	    (r = __bt_new(t, &rnpg)) == NULL)
-		return (NULL);
-	l->pgno = lnpg;
-	r->pgno = rnpg;
-	l->nextpg = r->pgno;
-	r->prevpg = l->pgno;
-	l->prevpg = r->nextpg = P_INVALID;
-	l->lower = r->lower = BTDATAOFF;
-	l->upper = r->upper = t->bt_psize;
-	l->flags = r->flags = h->flags & P_TYPE;
-
-	/* Split the root page. */
-	tp = bt_psplit(t, h, l, r, skip, ilen);
-
-	*lp = l;
-	*rp = r;
-	return (tp);
-}
-
-/*
- * BT_RROOT -- Fix up the recno root page after it has been split.
- *
- * Parameters:
- *	t:	tree
- *	h:	root page
- *	l:	left page
- *	r:	right page
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-static int
-bt_rroot(BTREE *t, PAGE *h, PAGE *l, PAGE *r)
-{
-	char *dest;
-	uint32_t sz;
-	size_t temp;
-
-	temp = t->bt_psize - NRINTERNAL;
-	_DBFIT(temp, uint32_t);
-	sz = (uint32_t)temp;
-
-	/* Insert the left and right keys, set the header information. */
-	_DBFIT(sz, indx_t);
-	h->linp[0] = h->upper = (indx_t)sz;
-	dest = (char *)(void *)h + h->upper;
-	WR_RINTERNAL(dest,
-	    l->flags & P_RLEAF ? NEXTINDEX(l) : rec_total(l), l->pgno);
-
-	h->linp[1] = h->upper -= NRINTERNAL;
-	dest = (char *)(void *)h + h->upper;
-	WR_RINTERNAL(dest,
-	    r->flags & P_RLEAF ? NEXTINDEX(r) : rec_total(r), r->pgno);
-
-	h->lower = BTDATAOFF + 2 * sizeof(indx_t);
-
-	/* Unpin the root page, set to recno internal page. */
-	h->flags &= ~P_TYPE;
-	h->flags |= P_RINTERNAL;
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-	return (RET_SUCCESS);
-}
-
-/*
- * BT_BROOT -- Fix up the btree root page after it has been split.
- *
- * Parameters:
- *	t:	tree
- *	h:	root page
- *	l:	left page
- *	r:	right page
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-static int
-bt_broot(BTREE *t, PAGE *h, PAGE *l, PAGE *r)
-{
-	BINTERNAL *bi = NULL;	/* pacify gcc */
-	BLEAF *bl;
-	uint32_t nbytes;
-	char *dest;
-
-	/*
-	 * If the root page was a leaf page, change it into an internal page.
-	 * We copy the key we split on (but not the key's data, in the case of
-	 * a leaf page) to the new root page.
-	 *
-	 * The btree comparison code guarantees that the left-most key on any
-	 * level of the tree is never used, so it doesn't need to be filled in.
-	 */
-	nbytes = NBINTERNAL(0);
-	h->linp[0] = h->upper = t->bt_psize - nbytes;
-	dest = (char *)(void *)h + h->upper;
-	WR_BINTERNAL(dest, 0, l->pgno, 0);
-
-	switch (h->flags & P_TYPE) {
-	case P_BLEAF:
-		bl = GETBLEAF(r, 0);
-		nbytes = NBINTERNAL(bl->ksize);
-		h->linp[1] = h->upper -= nbytes;
-		dest = (char *)(void *)h + h->upper;
-		WR_BINTERNAL(dest, bl->ksize, r->pgno, 0);
-		memmove(dest, bl->bytes, bl->ksize);
-
-		/*
-		 * If the key is on an overflow page, mark the overflow chain
-		 * so it isn't deleted when the leaf copy of the key is deleted.
-		 */
-		if (bl->flags & P_BIGKEY) {
-			pgno_t pgno;
-			memcpy(&pgno, bl->bytes, sizeof(pgno));
-			if (bt_preserve(t, pgno) == RET_ERROR)
-				return (RET_ERROR);
-		}
-		break;
-	case P_BINTERNAL:
-		bi = GETBINTERNAL(r, 0);
-		nbytes = NBINTERNAL(bi->ksize);
-		h->linp[1] = h->upper -= nbytes;
-		dest = (char *)(void *)h + h->upper;
-		memmove(dest, bi, nbytes);
-		((BINTERNAL *)(void *)dest)->pgno = r->pgno;
-		break;
-	default:
-		abort();
-	}
-
-	/* There are two keys on the page. */
-	h->lower = BTDATAOFF + 2 * sizeof(indx_t);
-
-	/* Unpin the root page, set to btree internal page. */
-	h->flags &= ~P_TYPE;
-	h->flags |= P_BINTERNAL;
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-	return (RET_SUCCESS);
-}
-
-/*
- * BT_PSPLIT -- Do the real work of splitting the page.
- *
- * Parameters:
- *	t:	tree
- *	h:	page to be split
- *	l:	page to put lower half of data
- *	r:	page to put upper half of data
- *	pskip:	pointer to index to leave open
- *	ilen:	insert length
- *
- * Returns:
- *	Pointer to page in which to insert.
- */
-static PAGE *
-bt_psplit(BTREE *t, PAGE *h, PAGE *l, PAGE *r, indx_t *pskip, size_t ilen)
-{
-	BINTERNAL *bi;
-	BLEAF *bl;
-	CURSOR *c;
-	RLEAF *rl;
-	PAGE *rval;
-	void *src = NULL;	/* pacify gcc */
-	indx_t full, half, nxt, off, skip, top, used;
-	uint32_t nbytes;
-	size_t temp;
-	int bigkeycnt, isbigkey;
-
-	/*
-	 * Split the data to the left and right pages.  Leave the skip index
-	 * open.  Additionally, make some effort not to split on an overflow
-	 * key.  This makes internal page processing faster and can save
-	 * space as overflow keys used by internal pages are never deleted.
-	 */
-	bigkeycnt = 0;
-	skip = *pskip;
-	temp = t->bt_psize - BTDATAOFF;
-	_DBFIT(temp, indx_t);
-	full = (indx_t)temp;
-	half = full / 2;
-	used = 0;
-	for (nxt = off = 0, top = NEXTINDEX(h); nxt < top; ++off) {
-		if (skip == off) {
-			_DBFIT(ilen, uint32_t);
-			nbytes = (uint32_t)ilen;
-			isbigkey = 0;		/* XXX: not really known. */
-		} else
-			switch (h->flags & P_TYPE) {
-			case P_BINTERNAL:
-				src = bi = GETBINTERNAL(h, nxt);
-				nbytes = NBINTERNAL(bi->ksize);
-				isbigkey = bi->flags & P_BIGKEY;
-				break;
-			case P_BLEAF:
-				src = bl = GETBLEAF(h, nxt);
-				nbytes = NBLEAF(bl);
-				isbigkey = bl->flags & P_BIGKEY;
-				break;
-			case P_RINTERNAL:
-				src = GETRINTERNAL(h, nxt);
-				nbytes = NRINTERNAL;
-				isbigkey = 0;
-				break;
-			case P_RLEAF:
-				src = rl = GETRLEAF(h, nxt);
-				nbytes = NRLEAF(rl);
-				isbigkey = 0;
-				break;
-			default:
-				abort();
-			}
-
-		/*
-		 * If the key/data pairs are substantial fractions of the max
-		 * possible size for the page, it's possible to get situations
-		 * where we decide to try and copy too much onto the left page.
-		 * Make sure that doesn't happen.
-		 */
-		if ((skip <= off && used + nbytes + sizeof(indx_t) >= full) ||
-		    nxt == top - 1) {
-			--off;
-			break;
-		}
-
-		/* Copy the key/data pair, if not the skipped index. */
-		if (skip != off) {
-			++nxt;
-
-			l->linp[off] = l->upper -= nbytes;
-			memmove((char *)(void *)l + l->upper, src, nbytes);
-		}
-
-		temp = nbytes + sizeof(indx_t);
-		_DBFIT(temp, indx_t);
-		used += (indx_t)temp;
-		if (used >= half) {
-			if (!isbigkey || bigkeycnt == 3)
-				break;
-			else
-				++bigkeycnt;
-		}
-	}
-
-	/*
-	 * Off is the last offset that's valid for the left page.
-	 * Nxt is the first offset to be placed on the right page.
-	 */
-	temp = (off + 1) * sizeof(indx_t);
-	_DBFIT(temp, indx_t);
-	l->lower += (indx_t)temp;
-
-	/*
-	 * If splitting the page that the cursor was on, the cursor has to be
-	 * adjusted to point to the same record as before the split.  If the
-	 * cursor is at or past the skipped slot, the cursor is incremented by
-	 * one.  If the cursor is on the right page, it is decremented by the
-	 * number of records split to the left page.
-	 */
-	c = &t->bt_cursor;
-	if (F_ISSET(c, CURS_INIT) && c->pg.pgno == h->pgno) {
-		if (c->pg.index >= skip)
-			++c->pg.index;
-		if (c->pg.index < nxt)			/* Left page. */
-			c->pg.pgno = l->pgno;
-		else {					/* Right page. */
-			c->pg.pgno = r->pgno;
-			c->pg.index -= nxt;
-		}
-	}
-
-	/*
-	 * If the skipped index was on the left page, just return that page.
-	 * Otherwise, adjust the skip index to reflect the new position on
-	 * the right page.
-	 */
-	if (skip <= off) {
-		skip = MAX_PAGE_OFFSET;
-		rval = l;
-	} else {
-		rval = r;
-		*pskip -= nxt;
-	}
-
-	for (off = 0; nxt < top; ++off) {
-		if (skip == nxt) {
-			++off;
-			skip = MAX_PAGE_OFFSET;
-		}
-		switch (h->flags & P_TYPE) {
-		case P_BINTERNAL:
-			src = bi = GETBINTERNAL(h, nxt);
-			nbytes = NBINTERNAL(bi->ksize);
-			break;
-		case P_BLEAF:
-			src = bl = GETBLEAF(h, nxt);
-			nbytes = NBLEAF(bl);
-			break;
-		case P_RINTERNAL:
-			src = GETRINTERNAL(h, nxt);
-			nbytes = NRINTERNAL;
-			break;
-		case P_RLEAF:
-			src = rl = GETRLEAF(h, nxt);
-			nbytes = NRLEAF(rl);
-			break;
-		default:
-			abort();
-		}
-		++nxt;
-		r->linp[off] = r->upper -= nbytes;
-		memmove((char *)(void *)r + r->upper, src, nbytes);
-	}
-	temp = off * sizeof(indx_t);
-	_DBFIT(temp, indx_t);
-	r->lower += (indx_t)temp;
-
-	/* If the key is being appended to the page, adjust the index. */
-	if (skip == top)
-		r->lower += sizeof(indx_t);
-
-	return (rval);
-}
-
-/*
- * BT_PRESERVE -- Mark a chain of pages as used by an internal node.
- *
- * Chains of indirect blocks pointed to by leaf nodes get reclaimed when the
- * record that references them gets deleted.  Chains pointed to by internal
- * pages never get deleted.  This routine marks a chain as pointed to by an
- * internal page.
- *
- * Parameters:
- *	t:	tree
- *	pg:	page number of first page in the chain.
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-static int
-bt_preserve(BTREE *t, pgno_t pg)
-{
-	PAGE *h;
-
-	if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-		return (RET_ERROR);
-	h->flags |= P_PRESERVE;
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-	return (RET_SUCCESS);
-}
-
-/*
- * REC_TOTAL -- Return the number of recno entries below a page.
- *
- * Parameters:
- *	h:	page
- *
- * Returns:
- *	The number of recno entries below a page.
- *
- * XXX
- * These values could be set by the bt_psplit routine.  The problem is that the
- * entry has to be popped off of the stack etc. or the values have to be passed
- * all the way back to bt_split/bt_rroot and it's not very clean.
- */
-static recno_t
-rec_total(PAGE *h)
-{
-	recno_t recs;
-	indx_t nxt, top;
-
-	for (recs = 0, nxt = 0, top = NEXTINDEX(h); nxt < top; ++nxt)
-		recs += GETRINTERNAL(h, nxt)->nrecs;
-	return (recs);
-}
diff --git a/lib/libc/db/btree/bt_utils.c b/lib/libc/db/btree/bt_utils.c
deleted file mode 100644
index 1fef38af5..000000000
--- a/lib/libc/db/btree/bt_utils.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*	$NetBSD: bt_utils.c,v 1.16 2013/12/14 18:04:56 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: bt_utils.c,v 1.16 2013/12/14 18:04:56 christos Exp $");
-
-#include <sys/param.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-/*
- * __bt_ret --
- *	Build return key/data pair.
- *
- * Parameters:
- *	t:	tree
- *	e:	key/data pair to be returned
- *	key:	user's key structure (NULL if not to be filled in)
- *	rkey:	memory area to hold key
- *	data:	user's data structure (NULL if not to be filled in)
- *	rdata:	memory area to hold data
- *       copy:	always copy the key/data item
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__bt_ret(BTREE *t, EPG *e, DBT *key, DBT *rkey, DBT *data, DBT *rdata, int copy)
-{
-	BLEAF *bl;
-	void *p;
-
-	bl = GETBLEAF(e->page, e->index);
-
-	/*
-	 * We must copy big keys/data to make them contiguous.  Otherwise,
-	 * leave the page pinned and don't copy unless the user specified
-	 * concurrent access.
-	 */
-	if (key == NULL)
-		goto dataonly;
-
-	if (bl->flags & P_BIGKEY) {
-		if (__ovfl_get(t, bl->bytes,
-		    &key->size, &rkey->data, &rkey->size))
-			return (RET_ERROR);
-		key->data = rkey->data;
-	} else if (copy || F_ISSET(t, B_DB_LOCK)) {
-		if (bl->ksize > rkey->size) {
-			p = realloc(rkey->data, bl->ksize);
-			if (p == NULL)
-				return (RET_ERROR);
-			rkey->data = p;
-			rkey->size = bl->ksize;
-		}
-		memmove(rkey->data, bl->bytes, bl->ksize);
-		key->size = bl->ksize;
-		key->data = rkey->data;
-	} else {
-		key->size = bl->ksize;
-		key->data = bl->bytes;
-	}
-
-dataonly:
-	if (data == NULL)
-		return (RET_SUCCESS);
-
-	if (bl->flags & P_BIGDATA) {
-		if (__ovfl_get(t, bl->bytes + bl->ksize,
-		    &data->size, &rdata->data, &rdata->size))
-			return (RET_ERROR);
-		data->data = rdata->data;
-	} else if (copy || F_ISSET(t, B_DB_LOCK)) {
-		/* Use +1 in case the first record retrieved is 0 length. */
-		if (bl->dsize + 1 > rdata->size) {
-			p = realloc(rdata->data, bl->dsize + 1);
-			if (p == NULL)
-				return (RET_ERROR);
-			rdata->data = p;
-			rdata->size = bl->dsize + 1;
-		}
-		memmove(rdata->data, bl->bytes + bl->ksize, bl->dsize);
-		data->size = bl->dsize;
-		data->data = rdata->data;
-	} else {
-		data->size = bl->dsize;
-		data->data = bl->bytes + bl->ksize;
-	}
-
-	return (RET_SUCCESS);
-}
-
-/*
- * __BT_CMP -- Compare a key to a given record.
- *
- * Parameters:
- *	t:	tree
- *	k1:	DBT pointer of first arg to comparison
- *	e:	pointer to EPG for comparison
- *
- * Returns:
- *	< 0 if k1 is < record
- *	= 0 if k1 is = record
- *	> 0 if k1 is > record
- */
-int
-__bt_cmp(BTREE *t, const DBT *k1, EPG *e)
-{
-	BINTERNAL *bi;
-	BLEAF *bl;
-	DBT k2;
-	PAGE *h;
-	void *bigkey;
-
-	/*
-	 * The left-most key on internal pages, at any level of the tree, is
-	 * guaranteed by the following code to be less than any user key.
-	 * This saves us from having to update the leftmost key on an internal
-	 * page when the user inserts a new key in the tree smaller than
-	 * anything we've yet seen.
-	 */
-	h = e->page;
-	if (e->index == 0 && h->prevpg == P_INVALID && !(h->flags & P_BLEAF))
-		return (1);
-
-	bigkey = NULL;
-	if (h->flags & P_BLEAF) {
-		bl = GETBLEAF(h, e->index);
-		if (bl->flags & P_BIGKEY)
-			bigkey = bl->bytes;
-		else {
-			k2.data = bl->bytes;
-			k2.size = bl->ksize;
-		}
-	} else {
-		bi = GETBINTERNAL(h, e->index);
-		if (bi->flags & P_BIGKEY)
-			bigkey = bi->bytes;
-		else {
-			k2.data = bi->bytes;
-			k2.size = bi->ksize;
-		}
-	}
-
-	if (bigkey) {
-		if (__ovfl_get(t, bigkey,
-		    &k2.size, &t->bt_rdata.data, &t->bt_rdata.size))
-			return (RET_ERROR);
-		k2.data = t->bt_rdata.data;
-	}
-	return ((*t->bt_cmp)(k1, &k2));
-}
-
-/*
- * __BT_DEFCMP -- Default comparison routine.
- *
- * Parameters:
- *	a:	DBT #1
- *	b: 	DBT #2
- *
- * Returns:
- *	< 0 if a is < b
- *	= 0 if a is = b
- *	> 0 if a is > b
- */
-int
-__bt_defcmp(const DBT *a, const DBT *b)
-{
-	size_t len;
-	uint8_t *p1, *p2;
-
-	/*
-	 * XXX
-	 * If a size_t doesn't fit in an int, this routine can lose.
-	 * What we need is a integral type which is guaranteed to be
-	 * larger than a size_t, and there is no such thing.
-	 */
-	len = MIN(a->size, b->size);
-	for (p1 = a->data, p2 = b->data; len--; ++p1, ++p2)
-		if (*p1 != *p2)
-			return ((int)*p1 - (int)*p2);
-	return ((int)a->size - (int)b->size);
-}
-
-/*
- * __BT_DEFPFX -- Default prefix routine.
- *
- * Parameters:
- *	a:	DBT #1
- *	b: 	DBT #2
- *
- * Returns:
- *	Number of bytes needed to distinguish b from a.
- */
-size_t
-__bt_defpfx(const DBT *a, const DBT *b)
-{
-	uint8_t *p1, *p2;
-	size_t cnt, len;
-
-	cnt = 1;
-	len = MIN(a->size, b->size);
-	for (p1 = a->data, p2 = b->data; len--; ++p1, ++p2, ++cnt)
-		if (*p1 != *p2)
-			return (cnt);
-
-	/* a->size must be <= b->size, or they wouldn't be in this order. */
-	return (a->size < b->size ? a->size + 1 : a->size);
-}
diff --git a/lib/libc/db/btree/btree.h b/lib/libc/db/btree/btree.h
deleted file mode 100644
index 9bd0faa43..000000000
--- a/lib/libc/db/btree/btree.h
+++ /dev/null
@@ -1,433 +0,0 @@
-/*	$NetBSD: btree.h,v 1.17 2013/09/04 13:03:22 ryoon Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)btree.h	8.11 (Berkeley) 8/17/94
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-/* Macros to set/clear/test flags. */
-#define	F_SET(p, f)	(p)->flags |= (f)
-#define	F_CLR(p, f)	(p)->flags &= ~(f)
-#define	F_ISSET(p, f)	((p)->flags & (f))
-
-#include <mpool.h>
-
-#define	DEFMINKEYPAGE	(2)		/* Minimum keys per page */
-#define	MINCACHE	(5)		/* Minimum cached pages */
-#define	MINPSIZE	(512)		/* Minimum page size */
-
-/*
- * Page 0 of a btree file contains a copy of the meta-data.  This page is also
- * used as an out-of-band page, i.e. page pointers that point to nowhere point
- * to page 0.  Page 1 is the root of the btree.
- */
-#define	P_INVALID	 0		/* Invalid tree page number. */
-#define	P_META		 0		/* Tree metadata page number. */
-#define	P_ROOT		 1		/* Tree root page number. */
-
-/*
- * There are five page layouts in the btree: btree internal pages (BINTERNAL),
- * btree leaf pages (BLEAF), recno internal pages (RINTERNAL), recno leaf pages
- * (RLEAF) and overflow pages.  All five page types have a page header (PAGE).
- * This implementation requires that values within structures NOT be padded.
- * (ANSI C permits random padding.)  If your compiler pads randomly you'll have
- * to do some work to get this package to run.
- */
-typedef struct _page {
-	pgno_t	pgno;			/* this page's page number */
-	pgno_t	prevpg;			/* left sibling */
-	pgno_t	nextpg;			/* right sibling */
-
-#define	P_BINTERNAL	0x01		/* btree internal page */
-#define	P_BLEAF		0x02		/* leaf page */
-#define	P_OVERFLOW	0x04		/* overflow page */
-#define	P_RINTERNAL	0x08		/* recno internal page */
-#define	P_RLEAF		0x10		/* leaf page */
-#define P_TYPE		0x1f		/* type mask */
-#define	P_PRESERVE	0x20		/* never delete this chain of pages */
-	uint32_t flags;
-
-	indx_t	lower;			/* lower bound of free space on page */
-	indx_t	upper;			/* upper bound of free space on page */
-	indx_t	linp[1];		/* indx_t-aligned VAR. LENGTH DATA */
-} PAGE;
-
-/* First and next index. */
-#define	BTDATAOFF							\
-	(sizeof(pgno_t) + sizeof(pgno_t) + sizeof(pgno_t) +		\
-	    sizeof(uint32_t) + sizeof(indx_t) + sizeof(indx_t))
-
-#define	_NEXTINDEX(p) (((p)->lower - BTDATAOFF) / sizeof(indx_t))
-#ifdef _DIAGNOSTIC
-static __inline indx_t
-NEXTINDEX(const PAGE *p) {
-	size_t x = _NEXTINDEX(p);
-	_DBFIT(x, indx_t);
-	return (indx_t)x;
-}
-#else
-#define	NEXTINDEX(p) (indx_t)_NEXTINDEX(p)
-#endif
-
-/*
- * For pages other than overflow pages, there is an array of offsets into the
- * rest of the page immediately following the page header.  Each offset is to
- * an item which is unique to the type of page.  The h_lower offset is just
- * past the last filled-in index.  The h_upper offset is the first item on the
- * page.  Offsets are from the beginning of the page.
- *
- * If an item is too big to store on a single page, a flag is set and the item
- * is a { page, size } pair such that the page is the first page of an overflow
- * chain with size bytes of item.  Overflow pages are simply bytes without any
- * external structure.
- *
- * The page number and size fields in the items are pgno_t-aligned so they can
- * be manipulated without copying.  (This presumes that 32 bit items can be
- * manipulated on this system.)
- */
-#define	BTLALIGN(n)	(((n) + sizeof(pgno_t) - 1) & ~(sizeof(pgno_t) - 1))
-#define	NOVFLSIZE	(sizeof(pgno_t) + sizeof(uint32_t))
-
-/*
- * For the btree internal pages, the item is a key.  BINTERNALs are {key, pgno}
- * pairs, such that the key compares less than or equal to all of the records
- * on that page.  For a tree without duplicate keys, an internal page with two
- * consecutive keys, a and b, will have all records greater than or equal to a
- * and less than b stored on the page associated with a.  Duplicate keys are
- * somewhat special and can cause duplicate internal and leaf page records and
- * some minor modifications of the above rule.
- */
-typedef struct _binternal {
-	uint32_t ksize;			/* key size */
-	pgno_t	pgno;			/* page number stored on */
-#define	P_BIGDATA	0x01		/* overflow data */
-#define	P_BIGKEY	0x02		/* overflow key */
-	uint8_t	flags;
-	char	bytes[1];		/* data */
-} BINTERNAL;
-
-/* Get the page's BINTERNAL structure at index indx. */
-#define	GETBINTERNAL(pg, indx)						\
-	((BINTERNAL *)(void *)((char *)(void *)(pg) + (pg)->linp[indx]))
-
-/* Get the number of bytes in the entry. */
-#define _NBINTERNAL(len)						\
-    BTLALIGN(sizeof(uint32_t) + sizeof(pgno_t) + sizeof(uint8_t) + (len))
-#ifdef _DIAGNOSTIC
-static __inline uint32_t
-NBINTERNAL(uint32_t len) {
-	size_t x = _NBINTERNAL(len);
-	_DBFIT(x, uint32_t);
-	return (uint32_t)x;
-}
-#else
-#define NBINTERNAL(len)	(uint32_t)_NBINTERNAL(len)
-#endif
-
-/* Copy a BINTERNAL entry to the page. */
-#define	WR_BINTERNAL(p, size, pgno, flags) do {				\
-	_DBFIT(size, uint32_t);						\
-	*(uint32_t *)(void *)p = (uint32_t)size;			\
-	p += sizeof(uint32_t);						\
-	*(pgno_t *)(void *)p = pgno;					\
-	p += sizeof(pgno_t);						\
-	*(uint8_t *)(void *)p = flags;					\
-	p += sizeof(uint8_t);						\
-} while (/*CONSTCOND*/0)
-
-/*
- * For the recno internal pages, the item is a page number with the number of
- * keys found on that page and below.
- */
-typedef struct _rinternal {
-	recno_t	nrecs;			/* number of records */
-	pgno_t	pgno;			/* page number stored below */
-} RINTERNAL;
-
-/* Get the page's RINTERNAL structure at index indx. */
-#define	GETRINTERNAL(pg, indx)						\
-	((RINTERNAL *)(void *)((char *)(void *)(pg) + (pg)->linp[indx]))
-
-/* Get the number of bytes in the entry. */
-#define NRINTERNAL							\
-	BTLALIGN(sizeof(recno_t) + sizeof(pgno_t))
-
-/* Copy a RINTERNAL entry to the page. */
-#define	WR_RINTERNAL(p, nrecs, pgno) do {				\
-	*(recno_t *)(void *)p = nrecs;					\
-	p += sizeof(recno_t);						\
-	*(pgno_t *)(void *)p = pgno;					\
-} while (/*CONSTCOND*/0)
-
-/* For the btree leaf pages, the item is a key and data pair. */
-typedef struct _bleaf {
-	uint32_t	ksize;		/* size of key */
-	uint32_t	dsize;		/* size of data */
-	uint8_t	flags;			/* P_BIGDATA, P_BIGKEY */
-	char	bytes[1];		/* data */
-} BLEAF;
-
-/* Get the page's BLEAF structure at index indx. */
-#define	GETBLEAF(pg, indx)						\
-	((BLEAF *)(void *)((char *)(void *)(pg) + (pg)->linp[indx]))
-
-
-/* Get the number of bytes in the user's key/data pair. */
-#define _NBLEAFDBT(ksize, dsize)					\
-    BTLALIGN(sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint8_t) +	\
-	    (ksize) + (dsize))
-#ifdef _DIAGNOSTIC
-static __inline uint32_t
-NBLEAFDBT(size_t k, size_t d) {
-	size_t x = _NBLEAFDBT(k, d);
-	_DBFIT(x, uint32_t);
-	return (uint32_t)x;
-}
-#else
-#define NBLEAFDBT(p, q)	(uint32_t)_NBLEAFDBT(p, q)
-#endif
-
-/* Get the number of bytes in the entry. */
-#define NBLEAF(p)	NBLEAFDBT((p)->ksize, (p)->dsize)
-
-/* Copy a BLEAF entry to the page. */
-#define	WR_BLEAF(p, key, data, flags) do {				\
-	_DBFIT(key->size, uint32_t);					\
-	*(uint32_t *)(void *)p = (uint32_t)key->size;			\
-	p += sizeof(uint32_t);						\
-	_DBFIT(data->size, uint32_t);					\
-	*(uint32_t *)(void *)p = (uint32_t)data->size;			\
-	p += sizeof(uint32_t);						\
-	*(uint8_t *)(void *)p = flags;					\
-	p += sizeof(uint8_t);						\
-	(void)memmove(p, key->data, key->size);				\
-	p += key->size;							\
-	(void)memmove(p, data->data, data->size);			\
-} while (/*CONSTCOND*/0)
-
-/* For the recno leaf pages, the item is a data entry. */
-typedef struct _rleaf {
-	uint32_t	dsize;		/* size of data */
-	uint8_t	flags;			/* P_BIGDATA */
-	char	bytes[1];
-} RLEAF;
-
-/* Get the page's RLEAF structure at index indx. */
-#define	GETRLEAF(pg, indx)						\
-	((RLEAF *)(void *)((char *)(void *)(pg) + (pg)->linp[indx]))
-
-#define	_NRLEAFDBT(dsize)						\
-	BTLALIGN(sizeof(uint32_t) + sizeof(uint8_t) + (dsize))
-
-#ifdef _DIAGNOSTIC
-static __inline uint32_t
-NRLEAFDBT(size_t d) {
-	size_t x = _NRLEAFDBT(d);
-	_DBFIT(x, uint32_t);
-	return (uint32_t)x;
-}
-#else
-#define NRLEAFDBT(d)	(uint32_t)_NRLEAFDBT(d)
-#endif
-
-/* Get the number of bytes in the entry. */
-#define NRLEAF(p)	NRLEAFDBT((p)->dsize)
-
-/* Get the number of bytes from the user's data. */
-
-/* Copy a RLEAF entry to the page. */
-#define	WR_RLEAF(p, data, flags) do {					\
-	_DBFIT(data->size, uint32_t);					\
-	*(uint32_t *)(void *)p = (uint32_t)data->size;			\
-	p += sizeof(uint32_t);						\
-	*(uint8_t *)(void *)p = flags;					\
-	p += sizeof(uint8_t);						\
-	memmove(p, data->data, data->size);				\
-} while (/*CONSTCOND*/0)
-
-/*
- * A record in the tree is either a pointer to a page and an index in the page
- * or a page number and an index.  These structures are used as a cursor, stack
- * entry and search returns as well as to pass records to other routines.
- *
- * One comment about searches.  Internal page searches must find the largest
- * record less than key in the tree so that descents work.  Leaf page searches
- * must find the smallest record greater than key so that the returned index
- * is the record's correct position for insertion.
- */
-typedef struct _epgno {
-	pgno_t	pgno;			/* the page number */
-	indx_t	index;			/* the index on the page */
-} EPGNO;
-
-typedef struct _epg {
-	PAGE	*page;			/* the (pinned) page */
-	indx_t	 index;			/* the index on the page */
-} EPG;
-
-/*
- * About cursors.  The cursor (and the page that contained the key/data pair
- * that it referenced) can be deleted, which makes things a bit tricky.  If
- * there are no duplicates of the cursor key in the tree (i.e. B_NODUPS is set
- * or there simply aren't any duplicates of the key) we copy the key that it
- * referenced when it's deleted, and reacquire a new cursor key if the cursor
- * is used again.  If there are duplicates keys, we move to the next/previous
- * key, and set a flag so that we know what happened.  NOTE: if duplicate (to
- * the cursor) keys are added to the tree during this process, it is undefined
- * if they will be returned or not in a cursor scan.
- *
- * The flags determine the possible states of the cursor:
- *
- * CURS_INIT	The cursor references *something*.
- * CURS_ACQUIRE	The cursor was deleted, and a key has been saved so that
- *		we can reacquire the right position in the tree.
- * CURS_AFTER, CURS_BEFORE
- *		The cursor was deleted, and now references a key/data pair
- *		that has not yet been returned, either before or after the
- *		deleted key/data pair.
- * XXX
- * This structure is broken out so that we can eventually offer multiple
- * cursors as part of the DB interface.
- */
-typedef struct _cursor {
-	EPGNO	 pg;			/* B: Saved tree reference. */
-	DBT	 key;			/* B: Saved key, or key.data == NULL. */
-	recno_t	 rcursor;		/* R: recno cursor (1-based) */
-
-#define	CURS_ACQUIRE	0x01		/*  B: Cursor needs to be reacquired. */
-#define	CURS_AFTER	0x02		/*  B: Unreturned cursor after key. */
-#define	CURS_BEFORE	0x04		/*  B: Unreturned cursor before key. */
-#define	CURS_INIT	0x08		/* RB: Cursor initialized. */
-	uint8_t flags;
-} CURSOR;
-
-/*
- * The metadata of the tree.  The nrecs field is used only by the RECNO code.
- * This is because the btree doesn't really need it and it requires that every
- * put or delete call modify the metadata.
- */
-typedef struct _btmeta {
-	uint32_t	magic;		/* magic number */
-	uint32_t	version;	/* version */
-	uint32_t	psize;		/* page size */
-	uint32_t	free;		/* page number of first free page */
-	uint32_t	nrecs;		/* R: number of records */
-
-#define	SAVEMETA	(B_NODUPS | R_RECNO)
-	uint32_t	flags;		/* bt_flags & SAVEMETA */
-} BTMETA;
-
-/* The in-memory btree/recno data structure. */
-typedef struct _btree {
-	MPOOL	 *bt_mp;		/* memory pool cookie */
-
-	DB	 *bt_dbp;		/* pointer to enclosing DB */
-
-	EPG	  bt_cur;		/* current (pinned) page */
-	PAGE	 *bt_pinned;		/* page pinned across calls */
-
-	CURSOR	  bt_cursor;		/* cursor */
-
-#define	BT_PUSH(t, p, i) {						\
-	t->bt_sp->pgno = p; 						\
-	t->bt_sp->index = i; 						\
-	++t->bt_sp;							\
-}
-#define	BT_POP(t)	(t->bt_sp == t->bt_stack ? NULL : --t->bt_sp)
-#define	BT_CLR(t)	(t->bt_sp = t->bt_stack)
-	EPGNO	  bt_stack[50];		/* stack of parent pages */
-	EPGNO	 *bt_sp;		/* current stack pointer */
-
-	DBT	  bt_rkey;		/* returned key */
-	DBT	  bt_rdata;		/* returned data */
-
-	int	  bt_fd;		/* tree file descriptor */
-
-	pgno_t	  bt_free;		/* next free page */
-	uint32_t bt_psize;		/* page size */
-	indx_t	  bt_ovflsize;		/* cut-off for key/data overflow */
-	int	  bt_lorder;		/* byte order */
-					/* sorted order */
-	enum { NOT, BACK, FORWARD } bt_order;
-	EPGNO	  bt_last;		/* last insert */
-
-					/* B: key comparison function */
-	int	(*bt_cmp)(const DBT *, const DBT *);
-					/* B: prefix comparison function */
-	size_t	(*bt_pfx)(const DBT *, const DBT *);
-					/* R: recno input function */
-	int	(*bt_irec)(struct _btree *, recno_t);
-
-	FILE	 *bt_rfp;		/* R: record FILE pointer */
-	int	  bt_rfd;		/* R: record file descriptor */
-
-	caddr_t	  bt_cmap;		/* R: current point in mapped space */
-	caddr_t	  bt_smap;		/* R: start of mapped space */
-	caddr_t   bt_emap;		/* R: end of mapped space */
-	size_t	  bt_msize;		/* R: size of mapped region. */
-
-	recno_t	  bt_nrecs;		/* R: number of records */
-	size_t	  bt_reclen;		/* R: fixed record length */
-	uint8_t	  bt_bval;		/* R: delimiting byte/pad character */
-
-/*
- * NB:
- * B_NODUPS and R_RECNO are stored on disk, and may not be changed.
- */
-#define	B_INMEM		0x00001		/* in-memory tree */
-#define	B_METADIRTY	0x00002		/* need to write metadata */
-#define	B_MODIFIED	0x00004		/* tree modified */
-#define	B_NEEDSWAP	0x00008		/* if byte order requires swapping */
-#define	B_RDONLY	0x00010		/* read-only tree */
-
-#define	B_NODUPS	0x00020		/* no duplicate keys permitted */
-#define	R_RECNO		0x00080		/* record oriented tree */
-
-#define	R_CLOSEFP	0x00040		/* opened a file pointer */
-#define	R_EOF		0x00100		/* end of input file reached. */
-#define	R_FIXLEN	0x00200		/* fixed length records */
-#define	R_MEMMAPPED	0x00400		/* memory mapped file. */
-#define	R_INMEM		0x00800		/* in-memory file */
-#define	R_MODIFIED	0x01000		/* modified file */
-#define	R_RDONLY	0x02000		/* read-only file */
-
-#define	B_DB_LOCK	0x04000		/* DB_LOCK specified. */
-#define	B_DB_SHMEM	0x08000		/* DB_SHMEM specified. */
-#define	B_DB_TXN	0x10000		/* DB_TXN specified. */
-	uint32_t flags;
-} BTREE;
-
-#include "extern.h"
diff --git a/lib/libc/db/btree/extern.h b/lib/libc/db/btree/extern.h
deleted file mode 100644
index 665f852a5..000000000
--- a/lib/libc/db/btree/extern.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: extern.h,v 1.12 2008/09/26 11:41:06 tsutsui Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)extern.h	8.10 (Berkeley) 7/20/94
- */
-
-#ifndef _BTREE_EXTERN_H_
-#define _BTREE_EXTERN_H_
-int	 __bt_close(DB *);
-int	 __bt_cmp(BTREE *, const DBT *, EPG *);
-int	 __bt_crsrdel(BTREE *, EPGNO *);
-int	 __bt_defcmp(const DBT *, const DBT *);
-size_t	 __bt_defpfx(const DBT *, const DBT *);
-int	 __bt_delete(const DB *, const DBT *, unsigned int);
-int	 __bt_dleaf(BTREE *, const DBT *, PAGE *, unsigned int);
-int	 __bt_fd(const DB *);
-int	 __bt_free(BTREE *, PAGE *);
-int	 __bt_get(const DB *, const DBT *, DBT *, unsigned int);
-PAGE	*__bt_new(BTREE *, pgno_t *);
-void	 __bt_pgin(void *, pgno_t, void *);
-void	 __bt_pgout(void *, pgno_t, void *);
-int	 __bt_push(BTREE *, pgno_t, int);
-int	 __bt_put(const DB *dbp, DBT *, const DBT *, unsigned int);
-int	 __bt_ret(BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int);
-EPG	*__bt_search(BTREE *, const DBT *, int *);
-int	 __bt_seq(const DB *, DBT *, DBT *, unsigned int);
-void	 __bt_setcur(BTREE *, pgno_t, unsigned int);
-int	 __bt_split(BTREE *, PAGE *,
-	    const DBT *, const DBT *, int, size_t, uint32_t);
-int	 __bt_sync(const DB *, unsigned int);
-
-int	 __ovfl_delete(BTREE *, void *);
-int	 __ovfl_get(BTREE *, void *, size_t *, void **, size_t *);
-int	 __ovfl_put(BTREE *, const DBT *, pgno_t *);
-
-#ifdef DEBUG
-void	 __bt_dmpage(PAGE *);
-void	 __bt_dnpage(DB *, pgno_t);
-void	 __bt_dpage(PAGE *);
-void	 __bt_dump(DB *);
-#endif
-#ifdef STATISTICS
-void	 __bt_stat(DB *);
-#endif
-#endif /* _BTREE_EXTERN_H_ */
diff --git a/lib/libc/db/changelog b/lib/libc/db/changelog
deleted file mode 100644
index f820e56b5..000000000
--- a/lib/libc/db/changelog
+++ /dev/null
@@ -1,105 +0,0 @@
-#	$NetBSD: changelog,v 1.2 1996/05/03 21:20:56 cgd Exp $
-
-1.84 -> 1.85
-	recno:	#ifdef out use of mmap, it's not portable enough.
-
-1.83 -> 1.84	Thu Aug 18 15:46:07 EDT 1994
-	recno:	Rework fixed-length records so that closing and reopening
-		the file now works.  Pad short records on input.  Never do
-		signed comparison in recno input reading functions.
-
-1.82 -> 1.83	Tue Jul 26 15:33:44 EDT 1994
-	btree:	Rework cursor deletion code yet again; bugs with
-		deleting empty pages that only contained the cursor
-		record.
-
-1.81 -> 1.82	Sat Jul 16 11:01:50 EDT 1994
-	btree:	Fix bugs introduced by new cursor/deletion code.
-		Replace return kbuf/dbuf with real DBT's.
-
-1.80 -> 1.81
-	btree:	Fix bugs introduced by new cursor/deletion code.
-	all:	Add #defines for Purify.
-
-1.79 -> 1.80	Wed Jul 13 22:41:54 EDT 1994
-	btree	Change deletion to coalesce empty pages.  This is a major
-		change, cursors and duplicate pages all had to be reworked.
-		Return to a fixed stack.
-	recno:	Affected by cursor changes.  New cursor structures should
-		permit multiple cursors in the future.
-
-1.78 -> 1.79	Mon Jun 20 17:36:47 EDT 1994
-	all:	Minor cleanups of 1.78 for porting reasons; only
-		major change was inlining check of NULL pointer
-		so that __fix_realloc goes away.
-
-1.77 -> 1.78	Thu Jun 16 19:06:43 EDT 1994
-	all:	Move "standard" size typedef's into db.h.
-
-1.76 -> 1.77	Thu Jun 16 16:48:38 EDT 1994
-	hash:	Delete __init_ routine, has special meaning to OSF 2.0.
-
-1.74 -> 1.76
-	all:	Finish up the port to the Alpha.
-
-1.73 -> 1.74
-	recno:	Don't put the record if rec_search fails, in rec_rdelete.
-		Create fixed-length intermediate records past "end" of DB
-		correctly.
-		Realloc bug when reading in fixed records.
-	all:	First cut at port to Alpha (64-bit architecture) using
-		4.4BSD basic integral types typedef's.
-		Cast allocation pointers to shut up old compilers.
-		Rework PORT directory into OS/machine directories.
-
-1.72 -> 1.73
-	btree:	If enough duplicate records were inserted and then deleted
-		that internal pages had references to empty pages of the
-		duplicate keys, the search function ended up on the wrong
-		page.
-
-1.7  -> 1.72	12 Oct 1993
-	hash:	Support NET/2 hash formats.
-
-1.7  -> 1.71	16 Sep 1993
-	btree/recno:
-		Fix bug in internal search routines that caused
-		return of invalid pointers.
-
-1.6  -> 1.7	07 Sep 1993
-	hash:	Fixed big key overflow bugs.
-	test:	Portability hacks, rewrite test script, Makefile.
-	btree/recno:
-		Stop copying non-overflow key/data pairs.
-	PORT:	Break PORT directory up into per architecture/OS
-		subdirectories.
-
-1.5  -> 1.6	06 Jun 1993
-	hash:	In PAIRFITS, the first comparison should look at (P)[2].
-		The hash_realloc function was walking off the end of memory.
-		The overflow page number was wrong when bumping splitpoint.
-
-1.4  -> 1.5	23 May 1993
-	hash:	Set hash default fill factor dynamically.
-	recno:	Fixed bug in sorted page splits.
-		Add page size parameter support.
-		Allow recno to specify the name of the underlying btree;
-			used for vi recovery.
-	btree/recno:
-		Support 64K pages.
-	btree/hash/recno:
-		Provide access to an underlying file descriptor.
-		Change sync routines to take a flag argument, recno
-			uses this to sync out the underlying btree.
-
-1.3  -> 1.4	10 May 1993
-	recno:	Delete the R_CURSORLOG flag from the recno interface.
-		Zero-length record fix for non-mmap reads.
-		Try and make SIZE_T_MAX test in open portable.
-
-1.2  -> 1.3	01 May 1993
-	btree:	Ignore user byte-order setting when reading already
-		existing database.  Fixes to byte-order conversions.
-
-1.1  -> 1.2	15 Apr 1993
-		No bug fixes, only compatibility hacks.
diff --git a/lib/libc/db/db/Makefile.inc b/lib/libc/db/db/Makefile.inc
deleted file mode 100644
index ffe98558f..000000000
--- a/lib/libc/db/db/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2013/12/01 00:22:48 christos Exp $
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-.PATH: ${.CURDIR}/db/db
-
-SRCS+=	db.c dbfile.c
diff --git a/lib/libc/db/db/db.c b/lib/libc/db/db/db.c
deleted file mode 100644
index c6338cb43..000000000
--- a/lib/libc/db/db/db.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*	$NetBSD: db.c,v 1.18 2015/05/19 13:20:52 christos Exp $	*/
-
-/*-
- * 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. 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: db.c,v 1.18 2015/05/19 13:20:52 christos Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stddef.h>
-#include <stdio.h>
-
-#include <db.h>
-static int __dberr(void);
-
-#ifdef __weak_alias
-__weak_alias(dbopen,_dbopen)
-#endif
-
-#ifndef O_CLOEXEC
-#define O_CLOEXEC 0
-#endif
-
-DB *
-dbopen(const char *fname, int flags, mode_t mode, DBTYPE type,
-    const void *openinfo)
-{
-
-#define	DB_FLAGS	(DB_LOCK | DB_SHMEM | DB_TXN)
-#if defined(__minix)
-#define USE_OPEN_FLAGS 							\
-	(O_CREAT | O_EXCL | O_NONBLOCK | O_RDONLY |			\
-	 O_RDWR | O_TRUNC | O_CLOEXEC)
-#else
-#define	USE_OPEN_FLAGS							\
-	(O_CREAT | O_EXCL | O_EXLOCK | O_NONBLOCK | O_RDONLY |		\
-	 O_RDWR | O_SHLOCK | O_TRUNC | O_CLOEXEC)
-#endif  /* defined(__minix) */
-
-	if ((flags & ~(USE_OPEN_FLAGS | DB_FLAGS)) == 0)
-		switch (type) {
-		case DB_BTREE:
-			return (__bt_open(fname, flags & USE_OPEN_FLAGS,
-			    mode, openinfo, (int)(flags & DB_FLAGS)));
-		case DB_HASH:
-			return (__hash_open(fname, flags & USE_OPEN_FLAGS,
-			    mode, openinfo, (int)(flags & DB_FLAGS)));
-		case DB_RECNO:
-			return (__rec_open(fname, flags & USE_OPEN_FLAGS,
-			    mode, openinfo, (int)(flags & DB_FLAGS)));
-		}
-	errno = EINVAL;
-	return (NULL);
-}
-
-static int
-__dberr(void)
-{
-	return (RET_ERROR);
-}
-
-/*
- * __DBPANIC -- Stop.
- *
- * Parameters:
- *	dbp:	pointer to the DB structure.
- */
-void
-__dbpanic(DB *dbp)
-{
-	/* The only thing that can succeed is a close. */
-	dbp->del = (int (*)(const struct __db *, const DBT*, u_int))__dberr;
-	dbp->fd = (int (*)(const struct __db *))__dberr;
-	dbp->get = (int (*)(const struct __db *, const DBT*, DBT *, u_int))__dberr;
-	dbp->put = (int (*)(const struct __db *, DBT *, const DBT *, u_int))__dberr;
-	dbp->seq = (int (*)(const struct __db *, DBT *, DBT *, u_int))__dberr;
-	dbp->sync = (int (*)(const struct __db *, u_int))__dberr;
-}
diff --git a/lib/libc/db/db/dbfile.c b/lib/libc/db/db/dbfile.c
deleted file mode 100644
index 2179109a7..000000000
--- a/lib/libc/db/db/dbfile.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*	$NetBSD: dbfile.c,v 1.1 2013/12/01 00:22:48 christos Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: dbfile.c,v 1.1 2013/12/01 00:22:48 christos Exp $");
-
-#include <sys/stat.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <paths.h>
-#include <db.h>
-
-int
-__dbopen(const char *file, int flags, mode_t mode, struct stat *sb)
-{
-	int fd;
-	int serrno;
-
-#ifndef O_CLOEXEC
-#define O_CLOEXEC 0
-#endif
-
-	if ((fd = open(file, flags | O_CLOEXEC, mode)) == -1)
-		return -1;
-
-#if O_CLOEXEC == 0
-	if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
-		goto out;
-#endif
-
-	if (sb && fstat(fd, sb) == -1)
-		goto out;
-
-	return fd;
-out:
-	serrno = errno;
-	close(fd);
-	errno = serrno;
-	return -1;
-	
-}
-
-int
-__dbtemp(const char *prefix, struct stat *sb)
-{
-	sigset_t set, oset;
-	int len;
-	int fd, serrno;
-	char *envtmp;
-	char path[PATH_MAX];
-
-	if (issetugid())
-		envtmp = NULL;
-	else
-		envtmp = getenv("TMPDIR");
-
-	len = snprintf(path, sizeof(path), "%s/%sXXXXXX",
-	    envtmp ? envtmp : _PATH_TMP, prefix);
-	if ((size_t)len >= sizeof(path)) {
-		errno = ENAMETOOLONG;
-		return -1;
-	}
-	
-	(void)sigfillset(&set);
-	(void)sigprocmask(SIG_BLOCK, &set, &oset);
-
-	if ((fd = mkstemp(path)) != -1) {
-		if (unlink(path) == -1)
-			goto out;
-
-		if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
-			goto out;
-
-		if (sb && fstat(fd, sb) == -1)
-			goto out;
-	}
-	(void)sigprocmask(SIG_SETMASK, &oset, NULL);
-	return fd;
-out:
-	serrno = errno;
-	(void)sigprocmask(SIG_SETMASK, &oset, NULL);
-	close(fd);
-	errno = serrno;
-	return -1;
-}
diff --git a/lib/libc/db/hash/Makefile.inc b/lib/libc/db/hash/Makefile.inc
deleted file mode 100644
index d65b3106d..000000000
--- a/lib/libc/db/hash/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.9 2005/09/13 01:44:09 christos Exp $
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-.PATH: ${.CURDIR}/db/hash
-
-SRCS+=	hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \
-	hash_page.c ndbmdatum.c ndbm.c
diff --git a/lib/libc/db/hash/extern.h b/lib/libc/db/hash/extern.h
deleted file mode 100644
index 455bf51d8..000000000
--- a/lib/libc/db/hash/extern.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: extern.h,v 1.9 2008/08/26 21:18:38 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)extern.h	8.4 (Berkeley) 6/16/94
- */
-
-BUFHEAD	*__add_ovflpage(HTAB *, BUFHEAD *);
-int	 __addel(HTAB *, BUFHEAD *, const DBT *, const DBT *);
-int	 __big_delete(HTAB *, BUFHEAD *);
-int	 __big_insert(HTAB *, BUFHEAD *, const DBT *, const DBT *);
-int	 __big_keydata(HTAB *, BUFHEAD *, DBT *, DBT *, int);
-int	 __big_return(HTAB *, BUFHEAD *, int, DBT *, int);
-int	 __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
-		int, uint32_t, SPLIT_RETURN *);
-int	 __buf_free(HTAB *, int, int);
-void	 __buf_init(HTAB *, u_int);
-uint32_t	 __call_hash(HTAB *, char *, int);
-int	 __delpair(HTAB *, BUFHEAD *, int);
-int	 __expand_table(HTAB *);
-int	 __find_bigpair(HTAB *, BUFHEAD *, int, char *, int);
-uint16_t	 __find_last_page(HTAB *, BUFHEAD **);
-void	 __free_ovflpage(HTAB *, BUFHEAD *);
-BUFHEAD	*__get_buf(HTAB *, uint32_t, BUFHEAD *, int);
-int	 __get_page(HTAB *, char *, uint32_t, int, int, int);
-int	 __ibitmap(HTAB *, int, int, int);
-uint32_t	 __log2(uint32_t);
-int	 __put_page(HTAB *, char *, uint32_t, int, int);
-void	 __reclaim_buf(HTAB *, BUFHEAD *);
-int	 __split_page(HTAB *, uint32_t, uint32_t);
-
-/* Default hash routine. */
-extern uint32_t (*__default_hash)(const void *, size_t);
-
-#ifdef HASH_STATISTICS
-extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
-#endif
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c
deleted file mode 100644
index e0cb4f60d..000000000
--- a/lib/libc/db/hash/hash.c
+++ /dev/null
@@ -1,1005 +0,0 @@
-/*	$NetBSD: hash.c,v 1.35 2015/06/22 21:16:02 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: hash.c,v 1.35 2015/06/22 21:16:02 christos Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <assert.h>
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static int   alloc_segs(HTAB *, int);
-static int   flush_meta(HTAB *);
-static int   hash_access(HTAB *, ACTION, DBT *, DBT *);
-static int   hash_close(DB *);
-static int   hash_delete(const DB *, const DBT *, uint32_t);
-static int   hash_fd(const DB *);
-static int   hash_get(const DB *, const DBT *, DBT *, uint32_t);
-static int   hash_put(const DB *, DBT *, const DBT *, uint32_t);
-static void *hash_realloc(SEGMENT **, size_t, size_t);
-static int   hash_seq(const DB *, DBT *, DBT *, uint32_t);
-static int   hash_sync(const DB *, uint32_t);
-static int   hdestroy(HTAB *);
-static HTAB *init_hash(HTAB *, const char *, const HASHINFO *);
-static int   init_htab(HTAB *, size_t);
-#if BYTE_ORDER == LITTLE_ENDIAN
-static void  swap_header(HTAB *);
-static void  swap_header_copy(HASHHDR *, HASHHDR *);
-#endif
-
-/* Fast arithmetic, relying on powers of 2, */
-#define MOD(x, y)		((x) & ((y) - 1))
-
-#define RETURN_ERROR(ERR, LOC)	{ save_errno = ERR; goto LOC; }
-
-/* Return values */
-#define	SUCCESS	 (0)
-#define	ERROR	(-1)
-#define	ABNORMAL (1)
-
-#ifdef HASH_STATISTICS
-int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
-#endif
-
-/************************** INTERFACE ROUTINES ***************************/
-/* OPEN/CLOSE */
-
-/* ARGSUSED */
-DB *
-__hash_open(const char *file, int flags, mode_t mode, const HASHINFO *info,
-    int dflags)
-{
-	HTAB *hashp;
-	struct stat statbuf;
-	DB *dbp;
-	int bpages, new_table, nsegs, save_errno;
-	ssize_t hdrsize;
-
-	if ((flags & O_ACCMODE) == O_WRONLY) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	if (!(hashp = calloc(1, sizeof(HTAB))))
-		return (NULL);
-	hashp->fp = -1;
-
-	/*
-	 * Even if user wants write only, we need to be able to read
-	 * the actual file, so we need to open it read/write. But, the
-	 * field in the hashp structure needs to be accurate so that
-	 * we can check accesses.
-	 */
-	hashp->flags = flags;
-
-	new_table = 0;
-	if (!file || (flags & O_TRUNC) ||
-	    (stat(file, &statbuf) && (errno == ENOENT))) {
-		if (errno == ENOENT)
-			errno = 0; /* Just in case someone looks at errno */
-		new_table = 1;
-	}
-	if (file) {
-		if ((hashp->fp = __dbopen(file, flags, mode, &statbuf)) == -1)
-			RETURN_ERROR(errno, error0);
-		new_table |= statbuf.st_size == 0;
-	}
-	if (new_table) {
-		if (!(hashp = init_hash(hashp, file, info)))
-			RETURN_ERROR(errno, error1);
-	} else {
-		/* Table already exists */
-		if (info && info->hash)
-			hashp->hash = info->hash;
-		else
-			hashp->hash = __default_hash;
-
-		hdrsize = read(hashp->fp, &hashp->hdr, sizeof(HASHHDR));
-#if BYTE_ORDER == LITTLE_ENDIAN
-		swap_header(hashp);
-#endif
-		if (hdrsize == -1)
-			RETURN_ERROR(errno, error1);
-		if (hdrsize != sizeof(HASHHDR))
-			RETURN_ERROR(EFTYPE, error1);
-		/* Verify file type, versions and hash function */
-		if (hashp->MAGIC != HASHMAGIC)
-			RETURN_ERROR(EFTYPE, error1);
-#define	OLDHASHVERSION	1
-		if (hashp->VERSION != HASHVERSION &&
-		    hashp->VERSION != OLDHASHVERSION)
-			RETURN_ERROR(EFTYPE, error1);
-		if (hashp->hash(CHARKEY, sizeof(CHARKEY)) !=
-		    (uint32_t)hashp->H_CHARKEY)
-			RETURN_ERROR(EFTYPE, error1);
-		/*
-		 * Figure out how many segments we need.  Max_Bucket is the
-		 * maximum bucket number, so the number of buckets is
-		 * max_bucket + 1.
-		 */
-		nsegs = (hashp->MAX_BUCKET + 1 + hashp->SGSIZE - 1) /
-			 hashp->SGSIZE;
-		hashp->nsegs = 0;
-		if (alloc_segs(hashp, nsegs))
-			/*
-			 * If alloc_segs fails, table will have been destroyed
-			 * and errno will have been set.
-			 */
-			return (NULL);
-		/* Read in bitmaps */
-		bpages = (hashp->SPARES[hashp->OVFL_POINT] +
-		    (unsigned int)(hashp->BSIZE << BYTE_SHIFT) - 1) >>
-		    (hashp->BSHIFT + BYTE_SHIFT);
-
-		hashp->nmaps = bpages;
-		(void)memset(&hashp->mapp[0], 0, bpages * sizeof(uint32_t *));
-	}
-
-	/* Initialize Buffer Manager */
-	if (info && info->cachesize)
-		__buf_init(hashp, info->cachesize);
-	else
-		__buf_init(hashp, DEF_BUFSIZE);
-
-	hashp->new_file = new_table;
-	hashp->save_file = file && (hashp->flags & O_RDWR);
-	hashp->cbucket = -1;
-	if (!(dbp = malloc(sizeof(*dbp)))) {
-		save_errno = errno;
-		hdestroy(hashp);
-		errno = save_errno;
-		return (NULL);
-	}
-	dbp->internal = hashp;
-	dbp->close = hash_close;
-	dbp->del = hash_delete;
-	dbp->fd = hash_fd;
-	dbp->get = hash_get;
-	dbp->put = hash_put;
-	dbp->seq = hash_seq;
-	dbp->sync = hash_sync;
-	dbp->type = DB_HASH;
-
-#ifdef DEBUG1
-	(void)fprintf(stderr,
-"%s\n%s%p\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%x\n%s%x\n%s%d\n%s%d\n",
-	    "init_htab:",
-	    "TABLE POINTER   ", hashp,
-	    "BUCKET SIZE     ", hashp->BSIZE,
-	    "BUCKET SHIFT    ", hashp->BSHIFT,
-	    "DIRECTORY SIZE  ", hashp->DSIZE,
-	    "SEGMENT SIZE    ", hashp->SGSIZE,
-	    "SEGMENT SHIFT   ", hashp->SSHIFT,
-	    "FILL FACTOR     ", hashp->FFACTOR,
-	    "MAX BUCKET      ", hashp->MAX_BUCKET,
-	    "OVFL POINT	     ", hashp->OVFL_POINT,
-	    "LAST FREED      ", hashp->LAST_FREED,
-	    "HIGH MASK       ", hashp->HIGH_MASK,
-	    "LOW  MASK       ", hashp->LOW_MASK,
-	    "NSEGS           ", hashp->nsegs,
-	    "NKEYS           ", hashp->NKEYS);
-#endif
-#ifdef HASH_STATISTICS
-	hash_overflows = hash_accesses = hash_collisions = hash_expansions = 0;
-#endif
-	return (dbp);
-
-error1:
-	if (hashp != NULL)
-		(void)close(hashp->fp);
-
-error0:
-	free(hashp);
-	errno = save_errno;
-	return (NULL);
-}
-
-static int
-hash_close(DB *dbp)
-{
-	HTAB *hashp;
-	int retval;
-
-	if (!dbp)
-		return (ERROR);
-
-	hashp = dbp->internal;
-	retval = hdestroy(hashp);
-	free(dbp);
-	return (retval);
-}
-
-static int
-hash_fd(const DB *dbp)
-{
-	HTAB *hashp;
-
-	if (!dbp)
-		return (ERROR);
-
-	hashp = dbp->internal;
-	if (hashp->fp == -1) {
-		errno = ENOENT;
-		return (-1);
-	}
-	return (hashp->fp);
-}
-
-/************************** LOCAL CREATION ROUTINES **********************/
-static HTAB *
-init_hash(HTAB *hashp, const char *file, const HASHINFO *info)
-{
-	struct stat statbuf;
-	int nelem;
-
-	nelem = 1;
-	hashp->NKEYS = 0;
-	hashp->LORDER = BYTE_ORDER;
-	hashp->BSIZE = DEF_BUCKET_SIZE;
-	hashp->BSHIFT = DEF_BUCKET_SHIFT;
-	hashp->SGSIZE = DEF_SEGSIZE;
-	hashp->SSHIFT = DEF_SEGSIZE_SHIFT;
-	hashp->DSIZE = DEF_DIRSIZE;
-	hashp->FFACTOR = DEF_FFACTOR;
-	hashp->hash = __default_hash;
-	memset(hashp->SPARES, 0, sizeof(hashp->SPARES));
-	memset(hashp->BITMAPS, 0, sizeof (hashp->BITMAPS));
-
-	/* Fix bucket size to be optimal for file system */
-	if (file != NULL) {
-		if (stat(file, &statbuf))
-			return (NULL);
-		hashp->BSIZE = MIN(statbuf.st_blksize, MAX_BSIZE);
-		hashp->BSHIFT = __log2((uint32_t)hashp->BSIZE);
-	}
-
-	if (info) {
-		if (info->bsize) {
-			/* Round pagesize up to power of 2 */
-			hashp->BSHIFT = __log2(info->bsize);
-			hashp->BSIZE = 1 << hashp->BSHIFT;
-			if (hashp->BSIZE > MAX_BSIZE) {
-				errno = EINVAL;
-				return (NULL);
-			}
-		}
-		if (info->ffactor)
-			hashp->FFACTOR = info->ffactor;
-		if (info->hash)
-			hashp->hash = info->hash;
-		if (info->nelem)
-			nelem = info->nelem;
-		if (info->lorder) {
-			if (info->lorder != BIG_ENDIAN &&
-			    info->lorder != LITTLE_ENDIAN) {
-				errno = EINVAL;
-				return (NULL);
-			}
-			hashp->LORDER = info->lorder;
-		}
-	}
-	/* init_htab should destroy the table and set errno if it fails */
-	if (init_htab(hashp, (size_t)nelem))
-		return (NULL);
-	else
-		return (hashp);
-}
-/*
- * This calls alloc_segs which may run out of memory.  Alloc_segs will destroy
- * the table and set errno, so we just pass the error information along.
- *
- * Returns 0 on No Error
- */
-static int
-init_htab(HTAB *hashp, size_t nelem)
-{
-	int nbuckets;
-	uint32_t nsegs;
-	int l2;
-
-	/*
-	 * Divide number of elements by the fill factor and determine a
-	 * desired number of buckets.  Allocate space for the next greater
-	 * power of two number of buckets.
-	 */
-	nelem = (nelem - 1) / hashp->FFACTOR + 1;
-
-	_DBFIT(nelem, uint32_t);
-	l2 = __log2(MAX((uint32_t)nelem, 2));
-	nbuckets = 1 << l2;
-
-	hashp->SPARES[l2] = l2 + 1;
-	hashp->SPARES[l2 + 1] = l2 + 1;
-	hashp->OVFL_POINT = l2;
-	hashp->LAST_FREED = 2;
-
-	/* First bitmap page is at: splitpoint l2 page offset 1 */
-	if (__ibitmap(hashp, (int)OADDR_OF(l2, 1), l2 + 1, 0))
-		return (-1);
-
-	hashp->MAX_BUCKET = hashp->LOW_MASK = nbuckets - 1;
-	hashp->HIGH_MASK = (nbuckets << 1) - 1;
-	/* LINTED constant in conditional context */
-	hashp->HDRPAGES = ((MAX(sizeof(HASHHDR), MINHDRSIZE) - 1) >>
-	    hashp->BSHIFT) + 1;
-
-	nsegs = (nbuckets - 1) / hashp->SGSIZE + 1;
-	nsegs = 1 << __log2(nsegs);
-
-	if (nsegs > (uint32_t)hashp->DSIZE)
-		hashp->DSIZE = nsegs;
-	return (alloc_segs(hashp, (int)nsegs));
-}
-
-/********************** DESTROY/CLOSE ROUTINES ************************/
-
-/*
- * Flushes any changes to the file if necessary and destroys the hashp
- * structure, freeing all allocated space.
- */
-static int
-hdestroy(HTAB *hashp)
-{
-	int i, save_errno;
-
-	save_errno = 0;
-
-#ifdef HASH_STATISTICS
-	(void)fprintf(stderr, "hdestroy: accesses %d collisions %d\n",
-	    hash_accesses, hash_collisions);
-	(void)fprintf(stderr, "hdestroy: expansions %d\n",
-	    hash_expansions);
-	(void)fprintf(stderr, "hdestroy: overflows %d\n",
-	    hash_overflows);
-	(void)fprintf(stderr, "keys %d maxp %d segmentcount %d\n",
-	    hashp->NKEYS, hashp->MAX_BUCKET, hashp->nsegs);
-
-	for (i = 0; i < NCACHED; i++)
-		(void)fprintf(stderr,
-		    "spares[%d] = %d\n", i, hashp->SPARES[i]);
-#endif
-	/*
-	 * Call on buffer manager to free buffers, and if required,
-	 * write them to disk.
-	 */
-	if (__buf_free(hashp, 1, hashp->save_file))
-		save_errno = errno;
-	if (hashp->dir) {
-		free(*hashp->dir);	/* Free initial segments */
-		/* Free extra segments */
-		while (hashp->exsegs--)
-			free(hashp->dir[--hashp->nsegs]);
-		free(hashp->dir);
-	}
-	if (flush_meta(hashp) && !save_errno)
-		save_errno = errno;
-	/* Free Bigmaps */
-	for (i = 0; i < hashp->nmaps; i++)
-		if (hashp->mapp[i])
-			free(hashp->mapp[i]);
-
-	if (hashp->fp != -1)
-		(void)close(hashp->fp);
-
-	free(hashp);
-
-	if (save_errno) {
-		errno = save_errno;
-		return (ERROR);
-	}
-	return (SUCCESS);
-}
-/*
- * Write modified pages to disk
- *
- * Returns:
- *	 0 == OK
- *	-1 ERROR
- */
-static int
-hash_sync(const DB *dbp, uint32_t flags)
-{
-	HTAB *hashp;
-
-	if (flags != 0) {
-		errno = EINVAL;
-		return (ERROR);
-	}
-
-	if (!dbp)
-		return (ERROR);
-
-	hashp = dbp->internal;
-	if (!hashp->save_file)
-		return (0);
-	if (__buf_free(hashp, 0, 1) || flush_meta(hashp))
-		return (ERROR);
-	hashp->new_file = 0;
-	return (0);
-}
-
-/*
- * Returns:
- *	 0 == OK
- *	-1 indicates that errno should be set
- */
-static int
-flush_meta(HTAB *hashp)
-{
-	HASHHDR *whdrp;
-#if BYTE_ORDER == LITTLE_ENDIAN
-	HASHHDR whdr;
-#endif
-	int fp, i;
-	ssize_t wsize;
-
-	if (!hashp->save_file)
-		return (0);
-	hashp->MAGIC = HASHMAGIC;
-	hashp->VERSION = HASHVERSION;
-	hashp->H_CHARKEY = hashp->hash(CHARKEY, sizeof(CHARKEY));
-
-	fp = hashp->fp;
-	whdrp = &hashp->hdr;
-#if BYTE_ORDER == LITTLE_ENDIAN
-	whdrp = &whdr;
-	swap_header_copy(&hashp->hdr, whdrp);
-#endif
-	if ((wsize = pwrite(fp, whdrp, sizeof(HASHHDR), (off_t)0)) == -1)
-		return (-1);
-	else
-		if (wsize != sizeof(HASHHDR)) {
-			errno = EFTYPE;
-			hashp->err = errno;
-			return (-1);
-		}
-	for (i = 0; i < NCACHED; i++)
-		if (hashp->mapp[i])
-			if (__put_page(hashp, (char *)(void *)hashp->mapp[i],
-				(u_int)hashp->BITMAPS[i], 0, 1))
-				return (-1);
-	return (0);
-}
-
-/*******************************SEARCH ROUTINES *****************************/
-/*
- * All the access routines return
- *
- * Returns:
- *	 0 on SUCCESS
- *	 1 to indicate an external ERROR (i.e. key not found, etc)
- *	-1 to indicate an internal ERROR (i.e. out of memory, etc)
- */
-static int
-hash_get(const DB *dbp, const DBT *key, DBT *data, uint32_t flag)
-{
-	HTAB *hashp;
-
-	hashp = dbp->internal;
-	if (flag) {
-		hashp->err = errno = EINVAL;
-		return (ERROR);
-	}
-	return (hash_access(hashp, HASH_GET, __UNCONST(key), data));
-}
-
-static int
-hash_put(const DB *dbp, DBT *key, const DBT *data, uint32_t flag)
-{
-	HTAB *hashp;
-
-	hashp = dbp->internal;
-	if (flag && flag != R_NOOVERWRITE) {
-		hashp->err = errno = EINVAL;
-		return (ERROR);
-	}
-	if ((hashp->flags & O_ACCMODE) == O_RDONLY) {
-		hashp->err = errno = EPERM;
-		return (ERROR);
-	}
-	/* LINTED const castaway */
-	return (hash_access(hashp, flag == R_NOOVERWRITE ?
-	    HASH_PUTNEW : HASH_PUT, __UNCONST(key), __UNCONST(data)));
-}
-
-static int
-hash_delete(const DB *dbp, const DBT *key, uint32_t flag)
-{
-	HTAB *hashp;
-
-	hashp = dbp->internal;
-	if (flag && flag != R_CURSOR) {
-		hashp->err = errno = EINVAL;
-		return (ERROR);
-	}
-	if ((hashp->flags & O_ACCMODE) == O_RDONLY) {
-		hashp->err = errno = EPERM;
-		return (ERROR);
-	}
-	return hash_access(hashp, HASH_DELETE, __UNCONST(key), NULL);
-}
-
-/*
- * Assume that hashp has been set in wrapper routine.
- */
-static int
-hash_access(HTAB *hashp, ACTION action, DBT *key, DBT *val)
-{
-	BUFHEAD *rbufp;
-	BUFHEAD *bufp, *save_bufp;
-	uint16_t *bp;
-	int n, ndx, off;
-	size_t size;
-	char *kp;
-	uint16_t pageno;
-
-#ifdef HASH_STATISTICS
-	hash_accesses++;
-#endif
-
-	off = hashp->BSIZE;
-	size = key->size;
-	kp = (char *)key->data;
-	rbufp = __get_buf(hashp, __call_hash(hashp, kp, (int)size), NULL, 0);
-	if (!rbufp)
-		return (ERROR);
-	save_bufp = rbufp;
-
-	/* Pin the bucket chain */
-	rbufp->flags |= BUF_PIN;
-	for (bp = (uint16_t *)(void *)rbufp->page, n = *bp++, ndx = 1; ndx < n;)
-		if (bp[1] >= REAL_KEY) {
-			/* Real key/data pair */
-			if (size == (size_t)(off - *bp) &&
-			    memcmp(kp, rbufp->page + *bp, size) == 0)
-				goto found;
-			off = bp[1];
-#ifdef HASH_STATISTICS
-			hash_collisions++;
-#endif
-			bp += 2;
-			ndx += 2;
-		} else if (bp[1] == OVFLPAGE) {
-			rbufp = __get_buf(hashp, (uint32_t)*bp, rbufp, 0);
-			if (!rbufp) {
-				save_bufp->flags &= ~BUF_PIN;
-				return (ERROR);
-			}
-			/* FOR LOOP INIT */
-			bp = (uint16_t *)(void *)rbufp->page;
-			n = *bp++;
-			ndx = 1;
-			off = hashp->BSIZE;
-		} else if (bp[1] < REAL_KEY) {
-			if ((ndx =
-			    __find_bigpair(hashp, rbufp, ndx, kp, (int)size)) > 0)
-				goto found;
-			if (ndx == -2) {
-				bufp = rbufp;
-				if (!(pageno =
-				    __find_last_page(hashp, &bufp))) {
-					ndx = 0;
-					rbufp = bufp;
-					break;	/* FOR */
-				}
-				rbufp = __get_buf(hashp, (uint32_t)pageno,
-				    bufp, 0);
-				if (!rbufp) {
-					save_bufp->flags &= ~BUF_PIN;
-					return (ERROR);
-				}
-				/* FOR LOOP INIT */
-				bp = (uint16_t *)(void *)rbufp->page;
-				n = *bp++;
-				ndx = 1;
-				off = hashp->BSIZE;
-			} else {
-				save_bufp->flags &= ~BUF_PIN;
-				return (ERROR);
-			}
-		}
-
-	/* Not found */
-	switch (action) {
-	case HASH_PUT:
-	case HASH_PUTNEW:
-		if (__addel(hashp, rbufp, key, val)) {
-			save_bufp->flags &= ~BUF_PIN;
-			return (ERROR);
-		} else {
-			save_bufp->flags &= ~BUF_PIN;
-			return (SUCCESS);
-		}
-	case HASH_GET:
-	case HASH_DELETE:
-	default:
-		save_bufp->flags &= ~BUF_PIN;
-		return (ABNORMAL);
-	}
-
-found:
-	switch (action) {
-	case HASH_PUTNEW:
-		save_bufp->flags &= ~BUF_PIN;
-		return (ABNORMAL);
-	case HASH_GET:
-		bp = (uint16_t *)(void *)rbufp->page;
-		if (bp[ndx + 1] < REAL_KEY) {
-			if (__big_return(hashp, rbufp, ndx, val, 0))
-				return (ERROR);
-		} else {
-			val->data = (uint8_t *)rbufp->page + (int)bp[ndx + 1];
-			val->size = bp[ndx] - bp[ndx + 1];
-		}
-		break;
-	case HASH_PUT:
-		if ((__delpair(hashp, rbufp, ndx)) ||
-		    (__addel(hashp, rbufp, key, val))) {
-			save_bufp->flags &= ~BUF_PIN;
-			return (ERROR);
-		}
-		break;
-	case HASH_DELETE:
-		if (__delpair(hashp, rbufp, ndx))
-			return (ERROR);
-		/*
-		 * Our index lags 2 behind on the same page when we are
-		 * deleting the element pointed to by the index; otherwise
-		 * deleting randomly from an iterated hash produces undefined
-		 * results.
-		 */
-		if (ndx != hashp->cndx - 2 || rbufp != hashp->cpage)
-			break;
-
-		if (hashp->cndx > 1) {
-			/* Move back one element */
-			hashp->cndx -= 2;
-		} else {
-			/*
-			 * Move back one page, and indicate to go to the last
-			 * element of the previous page by setting cndx to -1
-			 */
-			hashp->cbucket--;
-			hashp->cpage = NULL;
-			hashp->cndx = -1;
-		}
-		break;
-	default:
-		abort();
-	}
-	save_bufp->flags &= ~BUF_PIN;
-	return (SUCCESS);
-}
-
-static int
-hash_seq(const DB *dbp, DBT *key, DBT *data, uint32_t flag)
-{
-	uint32_t bucket;
-	BUFHEAD *bufp = NULL; /* XXX: gcc */
-	HTAB *hashp;
-	uint16_t *bp, ndx;
-
-	hashp = dbp->internal;
-	if (flag && flag != R_FIRST && flag != R_NEXT) {
-		hashp->err = errno = EINVAL;
-		return (ERROR);
-	}
-#ifdef HASH_STATISTICS
-	hash_accesses++;
-#endif
-	if ((hashp->cbucket < 0) || (flag == R_FIRST)) {
-		hashp->cbucket = 0;
-		hashp->cndx = 1;
-		hashp->cpage = NULL;
-	}
-
-next_bucket:
-	for (bp = NULL; !bp || !bp[0]; ) {
-		if (!(bufp = hashp->cpage)) {
-			for (bucket = hashp->cbucket;
-			    bucket <= (uint32_t)hashp->MAX_BUCKET;
-			    bucket++) {
-				bufp = __get_buf(hashp, bucket, NULL, 0);
-				if (!bufp)
-					return (ERROR);
-				hashp->cpage = bufp;
-				bp = (uint16_t *)(void *)bufp->page;
-				if (bp[0])
-					break;
-			}
-			hashp->cbucket = bucket;
-			if (hashp->cbucket > hashp->MAX_BUCKET) {
-				hashp->cbucket = -1;
-				return (ABNORMAL);
-			}
-			if (hashp->cndx == -1) {
-				/* move to the last element of the page */
-				hashp->cndx = 1;
-				while (bp[hashp->cndx - 1] != 0)
-					hashp->cndx += 2;
-			} else {
-				/* start on the first element */
-				hashp->cndx = 1;
-			}
-		} else {
-			bp = (uint16_t *)(void *)hashp->cpage->page;
-			if (flag == R_NEXT || flag == 0) {
-				if (hashp->cndx > bp[0]) {
-					hashp->cpage = NULL;
-					hashp->cbucket++;
-					hashp->cndx = 1;
-					goto next_bucket;
-				}
-			}
-		}
-
-
-		_DIAGASSERT(bp != NULL);
-		_DIAGASSERT(bufp != NULL);
-		while (bp[hashp->cndx + 1] == OVFLPAGE) {
-			bufp = hashp->cpage =
-			    __get_buf(hashp, (uint32_t)bp[hashp->cndx], bufp,
-				0);
-			if (!bufp)
-				return (ERROR);
-			bp = (uint16_t *)(void *)(bufp->page);
-			hashp->cndx = 1;
-		}
-		if (!bp[0]) {
-			hashp->cpage = NULL;
-			++hashp->cbucket;
-		}
-	}
-	ndx = hashp->cndx;
-	if (bp[ndx + 1] < REAL_KEY) {
-		if (__big_keydata(hashp, bufp, key, data, 1))
-			return (ERROR);
-	} else {
-		if (hashp->cpage == NULL)
-			return (ERROR);
-		key->data = (uint8_t *)hashp->cpage->page + bp[ndx];
-		key->size = (ndx > 1 ? bp[ndx - 1] : hashp->BSIZE) - bp[ndx];
-		data->data = (uint8_t *)hashp->cpage->page + bp[ndx + 1];
-		data->size = bp[ndx] - bp[ndx + 1];
-	}
-	hashp->cndx += 2;
-	return (SUCCESS);
-}
-
-/********************************* UTILITIES ************************/
-
-/*
- * Returns:
- *	 0 ==> OK
- *	-1 ==> Error
- */
-int
-__expand_table(HTAB *hashp)
-{
-	uint32_t old_bucket, new_bucket;
-	int new_segnum, spare_ndx;
-	size_t dirsize;
-
-#ifdef HASH_STATISTICS
-	hash_expansions++;
-#endif
-	new_bucket = ++hashp->MAX_BUCKET;
-	old_bucket = (hashp->MAX_BUCKET & hashp->LOW_MASK);
-
-	new_segnum = new_bucket >> hashp->SSHIFT;
-
-	/* Check if we need a new segment */
-	if (new_segnum >= hashp->nsegs) {
-		/* Check if we need to expand directory */
-		if (new_segnum >= hashp->DSIZE) {
-			/* Reallocate directory */
-			dirsize = hashp->DSIZE * sizeof(SEGMENT *);
-			if (!hash_realloc(&hashp->dir, dirsize, dirsize << 1))
-				return (-1);
-			dirsize <<= 1;
-			_DBFIT(dirsize, uint32_t);
-			hashp->DSIZE = (uint32_t)dirsize;
-		}
-		if ((hashp->dir[new_segnum] =
-		    calloc((size_t)hashp->SGSIZE, sizeof(SEGMENT))) == NULL)
-			return (-1);
-		hashp->exsegs++;
-		hashp->nsegs++;
-	}
-	/*
-	 * If the split point is increasing (MAX_BUCKET's log base 2
-	 * * increases), we need to copy the current contents of the spare
-	 * split bucket to the next bucket.
-	 */
-	spare_ndx = __log2((uint32_t)(hashp->MAX_BUCKET + 1));
-	if (spare_ndx > hashp->OVFL_POINT) {
-		hashp->SPARES[spare_ndx] = hashp->SPARES[hashp->OVFL_POINT];
-		hashp->OVFL_POINT = spare_ndx;
-	}
-
-	if (new_bucket > (uint32_t)hashp->HIGH_MASK) {
-		/* Starting a new doubling */
-		hashp->LOW_MASK = hashp->HIGH_MASK;
-		hashp->HIGH_MASK = new_bucket | hashp->LOW_MASK;
-	}
-	/* Relocate records to the new bucket */
-	return (__split_page(hashp, old_bucket, new_bucket));
-}
-
-/*
- * If realloc guarantees that the pointer is not destroyed if the realloc
- * fails, then this routine can go away.
- */
-static void *
-hash_realloc(SEGMENT **p_ptr, size_t oldsize, size_t newsize)
-{
-	void *p;
-
-	if ((p = malloc(newsize)) != NULL) {
-		memmove(p, *p_ptr, oldsize);
-		memset((char *)p + oldsize, 0, newsize - oldsize);
-		free(*p_ptr);
-		*p_ptr = p;
-	}
-	return (p);
-}
-
-uint32_t
-__call_hash(HTAB *hashp, char *k, int len)
-{
-	int n, bucket;
-
-	n = hashp->hash(k, (size_t)len);
-	bucket = n & hashp->HIGH_MASK;
-	if (bucket > hashp->MAX_BUCKET)
-		bucket = bucket & hashp->LOW_MASK;
-	return (bucket);
-}
-
-/*
- * Allocate segment table.  On error, destroy the table and set errno.
- *
- * Returns 0 on success
- */
-static int
-alloc_segs(HTAB *hashp, int nsegs)
-{
-	int i;
-	SEGMENT store;
-
-	int save_errno;
-
-	hashp->dir = calloc((size_t)hashp->DSIZE, sizeof(SEGMENT *));
-	if (hashp->dir == NULL) {
-		save_errno = errno;
-		(void)hdestroy(hashp);
-		errno = save_errno;
-		return (-1);
-	}
-	hashp->nsegs = nsegs;
-	if (nsegs == 0)
-		return 0;
-	/* Allocate segments */
-	store = calloc((size_t)(nsegs << hashp->SSHIFT), sizeof(SEGMENT));
-	if (store == NULL) {
-		save_errno = errno;
-		(void)hdestroy(hashp);
-		errno = save_errno;
-		return (-1);
-	}
-	for (i = 0; i < nsegs; i++)
-		hashp->dir[i] = &store[i << hashp->SSHIFT];
-	return (0);
-}
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-/*
- * Hashp->hdr needs to be byteswapped.
- */
-static void
-swap_header_copy(HASHHDR *srcp, HASHHDR *destp)
-{
-	size_t i;
-
-	P_32_COPY(srcp->magic, destp->magic);
-	P_32_COPY(srcp->version, destp->version);
-	P_32_COPY(srcp->lorder, destp->lorder);
-	P_32_COPY(srcp->bsize, destp->bsize);
-	P_32_COPY(srcp->bshift, destp->bshift);
-	P_32_COPY(srcp->dsize, destp->dsize);
-	P_32_COPY(srcp->ssize, destp->ssize);
-	P_32_COPY(srcp->sshift, destp->sshift);
-	P_32_COPY(srcp->ovfl_point, destp->ovfl_point);
-	P_32_COPY(srcp->last_freed, destp->last_freed);
-	P_32_COPY(srcp->max_bucket, destp->max_bucket);
-	P_32_COPY(srcp->high_mask, destp->high_mask);
-	P_32_COPY(srcp->low_mask, destp->low_mask);
-	P_32_COPY(srcp->ffactor, destp->ffactor);
-	P_32_COPY(srcp->nkeys, destp->nkeys);
-	P_32_COPY(srcp->hdrpages, destp->hdrpages);
-	P_32_COPY(srcp->h_charkey, destp->h_charkey);
-	for (i = 0; i < NCACHED; i++) {
-		P_32_COPY(srcp->spares[i], destp->spares[i]);
-		P_16_COPY(srcp->bitmaps[i], destp->bitmaps[i]);
-	}
-}
-
-static void
-swap_header(HTAB *hashp)
-{
-	HASHHDR *hdrp;
-	size_t i;
-
-	hdrp = &hashp->hdr;
-
-	M_32_SWAP(hdrp->magic);
-	M_32_SWAP(hdrp->version);
-	M_32_SWAP(hdrp->lorder);
-	M_32_SWAP(hdrp->bsize);
-	M_32_SWAP(hdrp->bshift);
-	M_32_SWAP(hdrp->dsize);
-	M_32_SWAP(hdrp->ssize);
-	M_32_SWAP(hdrp->sshift);
-	M_32_SWAP(hdrp->ovfl_point);
-	M_32_SWAP(hdrp->last_freed);
-	M_32_SWAP(hdrp->max_bucket);
-	M_32_SWAP(hdrp->high_mask);
-	M_32_SWAP(hdrp->low_mask);
-	M_32_SWAP(hdrp->ffactor);
-	M_32_SWAP(hdrp->nkeys);
-	M_32_SWAP(hdrp->hdrpages);
-	M_32_SWAP(hdrp->h_charkey);
-	for (i = 0; i < NCACHED; i++) {
-		M_32_SWAP(hdrp->spares[i]);
-		M_16_SWAP(hdrp->bitmaps[i]);
-	}
-}
-#endif
diff --git a/lib/libc/db/hash/hash.h b/lib/libc/db/hash/hash.h
deleted file mode 100644
index f3c87a86e..000000000
--- a/lib/libc/db/hash/hash.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/*	$NetBSD: hash.h,v 1.15 2008/08/26 21:18:38 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)hash.h	8.3 (Berkeley) 5/31/94
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-/* Operations */
-typedef enum {
-	HASH_GET, HASH_PUT, HASH_PUTNEW, HASH_DELETE, HASH_FIRST, HASH_NEXT
-} ACTION;
-
-/* Buffer Management structures */
-typedef struct _bufhead BUFHEAD;
-
-struct _bufhead {
-	BUFHEAD		*prev;		/* LRU links */
-	BUFHEAD		*next;		/* LRU links */
-	BUFHEAD		*ovfl;		/* Overflow page buffer header */
-	uint32_t	 addr;		/* Address of this page */
-	char		*page;		/* Actual page data */
-	char	 	flags;
-#define	BUF_MOD		0x0001
-#define BUF_DISK	0x0002
-#define	BUF_BUCKET	0x0004
-#define	BUF_PIN		0x0008
-};
-
-#define IS_BUCKET(X)	((X) & BUF_BUCKET)
-
-typedef BUFHEAD **SEGMENT;
-
-/* Hash Table Information */
-typedef struct hashhdr {		/* Disk resident portion */
-	int32_t		magic;		/* Magic NO for hash tables */
-	int32_t		version;	/* Version ID */
-	uint32_t	lorder;		/* Byte Order */
-	int32_t		bsize;		/* Bucket/Page Size */
-	int32_t		bshift;		/* Bucket shift */
-	int32_t		dsize;		/* Directory Size */
-	int32_t		ssize;		/* Segment Size */
-	int32_t		sshift;		/* Segment shift */
-	int32_t		ovfl_point;	/* Where overflow pages are being 
-					 * allocated */
-	int32_t		last_freed;	/* Last overflow page freed */
-	int32_t		max_bucket;	/* ID of Maximum bucket in use */
-	int32_t		high_mask;	/* Mask to modulo into entire table */
-	int32_t		low_mask;	/* Mask to modulo into lower half of 
-					 * table */
-	int32_t		ffactor;	/* Fill factor */
-	int32_t		nkeys;		/* Number of keys in hash table */
-	int32_t		hdrpages;	/* Size of table header */
-	int32_t		h_charkey;	/* value of hash(CHARKEY) */
-#define NCACHED	32			/* number of bit maps and spare 
-					 * points */
-	int32_t		spares[NCACHED];/* spare pages for overflow */
-	uint16_t	bitmaps[NCACHED];	/* address of overflow page 
-						 * bitmaps */
-} HASHHDR;
-
-typedef struct htab	 {		/* Memory resident data structure */
-	HASHHDR 	hdr;		/* Header */
-	int		nsegs;		/* Number of allocated segments */
-	int		exsegs;		/* Number of extra allocated 
-					 * segments */
-	uint32_t	(*hash)(const void *, size_t);	/* Hash function */
-	int		flags;		/* Flag values */
-	int		fp;		/* File pointer */
-	char		*tmp_buf;	/* Temporary Buffer for BIG data */
-	char		*tmp_key;	/* Temporary Buffer for BIG keys */
-	BUFHEAD 	*cpage;		/* Current page */
-	int		cbucket;	/* Current bucket */
-	int		cndx;		/* Index of next item on cpage */
-	int		err;		/* Error Number -- for DBM 
-					 * compatibility */
-	int		new_file;	/* Indicates if fd is backing store 
-					 * or no */
-	int		save_file;	/* Indicates whether we need to flush 
-					 * file at
-					 * exit */
-	uint32_t	*mapp[NCACHED];	/* Pointers to page maps */
-	int		nmaps;		/* Initial number of bitmaps */
-	int		nbufs;		/* Number of buffers left to 
-					 * allocate */
-	BUFHEAD 	bufhead;	/* Header of buffer lru list */
-	SEGMENT 	*dir;		/* Hash Bucket directory */
-} HTAB;
-
-/*
- * Constants
- */
-#define	MAX_BSIZE		65536		/* 2^16 */
-#define MIN_BUFFERS		6
-#define MINHDRSIZE		512
-#define DEF_BUFSIZE		65536		/* 64 K */
-#define DEF_BUCKET_SIZE		4096
-#define DEF_BUCKET_SHIFT	12		/* log2(BUCKET) */
-#define DEF_SEGSIZE		256
-#define DEF_SEGSIZE_SHIFT	8		/* log2(SEGSIZE)	 */
-#define DEF_DIRSIZE		256
-#define DEF_FFACTOR		65536
-#define MIN_FFACTOR		4
-#define SPLTMAX			8
-#define CHARKEY			"%$sniglet^&"
-#define NUMKEY			1038583
-#define BYTE_SHIFT		3
-#define INT_TO_BYTE		2
-#define INT_BYTE_SHIFT		5
-#define ALL_SET			((uint32_t)0xFFFFFFFF)
-#define ALL_CLEAR		0
-
-#define PTROF(X)	((BUFHEAD *)(void *)((u_long)(X)&~0x3))
-#define ISMOD(X)	((uint32_t)(u_long)(X)&0x1)
-#define DOMOD(X)	((X) = (char *)(void *)((u_long)(X)|0x1))
-#define ISDISK(X)	((uint32_t)(u_long)(X)&0x2)
-#define DODISK(X)	((X) = (char *)(void *)((u_long)(X)|0x2))
-
-#define BITS_PER_MAP	32
-
-/* Given the address of the beginning of a big map, clear/set the nth bit */
-#define CLRBIT(A, N)	((A)[(N)/BITS_PER_MAP] &= ~(1<<((N)%BITS_PER_MAP)))
-#define SETBIT(A, N)	((A)[(N)/BITS_PER_MAP] |= (1<<((N)%BITS_PER_MAP)))
-#define ISSET(A, N)	((A)[(N)/BITS_PER_MAP] & (1<<((N)%BITS_PER_MAP)))
-
-/* Overflow management */
-/*
- * Overflow page numbers are allocated per split point.  At each doubling of
- * the table, we can allocate extra pages.  So, an overflow page number has
- * the top 5 bits indicate which split point and the lower 11 bits indicate
- * which page at that split point is indicated (pages within split points are
- * numberered starting with 1).
- */
-
-#define SPLITSHIFT	11
-#define SPLITMASK	0x7FF
-#define SPLITNUM(N)	(((uint32_t)(N)) >> SPLITSHIFT)
-#define OPAGENUM(N)	((N) & SPLITMASK)
-#define	OADDR_OF(S,O)	((uint32_t)((uint32_t)(S) << SPLITSHIFT) + (O))
-
-#define BUCKET_TO_PAGE(B) \
-	(B) + hashp->HDRPAGES + \
-	((B) ? hashp->SPARES[__log2((uint32_t)((B)+1))-1] : 0)
-#define OADDR_TO_PAGE(B) 	\
-	BUCKET_TO_PAGE ( (1 << SPLITNUM((B))) -1 ) + OPAGENUM((B));
-
-/*
- * page.h contains a detailed description of the page format.
- *
- * Normally, keys and data are accessed from offset tables in the top of
- * each page which point to the beginning of the key and data.  There are
- * four flag values which may be stored in these offset tables which indicate
- * the following:
- *
- *
- * OVFLPAGE	Rather than a key data pair, this pair contains
- *		the address of an overflow page.  The format of
- *		the pair is:
- *		    OVERFLOW_PAGE_NUMBER OVFLPAGE
- *
- * PARTIAL_KEY	This must be the first key/data pair on a page
- *		and implies that page contains only a partial key.
- *		That is, the key is too big to fit on a single page
- *		so it starts on this page and continues on the next.
- *		The format of the page is:
- *		    KEY_OFF PARTIAL_KEY OVFL_PAGENO OVFLPAGE
- *		
- *		    KEY_OFF -- offset of the beginning of the key
- *		    PARTIAL_KEY -- 1
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- * FULL_KEY	This must be the first key/data pair on the page.  It
- *		is used in two cases.
- *
- *		Case 1:
- *		    There is a complete key on the page but no data
- *		    (because it wouldn't fit).  The next page contains
- *		    the data.
- *
- *		    Page format it:
- *		    KEY_OFF FULL_KEY OVFL_PAGENO OVFL_PAGE
- *
- *		    KEY_OFF -- offset of the beginning of the key
- *		    FULL_KEY -- 2
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- *		Case 2:
- *		    This page contains no key, but part of a large
- *		    data field, which is continued on the next page.
- *
- *		    Page format it:
- *		    DATA_OFF FULL_KEY OVFL_PAGENO OVFL_PAGE
- *
- *		    KEY_OFF -- offset of the beginning of the data on
- *				this page
- *		    FULL_KEY -- 2
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- * FULL_KEY_DATA 
- *		This must be the first key/data pair on the page.
- *		There are two cases:
- *
- *		Case 1:
- *		    This page contains a key and the beginning of the
- *		    data field, but the data field is continued on the
- *		    next page.
- *
- *		    Page format is:
- *		    KEY_OFF FULL_KEY_DATA OVFL_PAGENO DATA_OFF
- *
- *		    KEY_OFF -- offset of the beginning of the key
- *		    FULL_KEY_DATA -- 3
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    DATA_OFF -- offset of the beginning of the data
- *
- *		Case 2:
- *		    This page contains the last page of a big data pair.
- *		    There is no key, only the  tail end of the data
- *		    on this page.
- *
- *		    Page format is:
- *		    DATA_OFF FULL_KEY_DATA <OVFL_PAGENO> <OVFLPAGE>
- *
- *		    DATA_OFF -- offset of the beginning of the data on
- *				this page
- *		    FULL_KEY_DATA -- 3
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- *		    OVFL_PAGENO and OVFLPAGE are optional (they are
- *		    not present if there is no next page).
- */
-
-#define OVFLPAGE	0
-#define PARTIAL_KEY	1
-#define FULL_KEY	2
-#define FULL_KEY_DATA	3
-#define	REAL_KEY	4
-
-/* Short hands for accessing structure */
-#define BSIZE		hdr.bsize
-#define BSHIFT		hdr.bshift
-#define DSIZE		hdr.dsize
-#define SGSIZE		hdr.ssize
-#define SSHIFT		hdr.sshift
-#define LORDER		hdr.lorder
-#define OVFL_POINT	hdr.ovfl_point
-#define	LAST_FREED	hdr.last_freed
-#define MAX_BUCKET	hdr.max_bucket
-#define FFACTOR		hdr.ffactor
-#define HIGH_MASK	hdr.high_mask
-#define LOW_MASK	hdr.low_mask
-#define NKEYS		hdr.nkeys
-#define HDRPAGES	hdr.hdrpages
-#define SPARES		hdr.spares
-#define BITMAPS		hdr.bitmaps
-#define VERSION		hdr.version
-#define MAGIC		hdr.magic
-#define NEXT_FREE	hdr.next_free
-#define H_CHARKEY	hdr.h_charkey
diff --git a/lib/libc/db/hash/hash_bigkey.c b/lib/libc/db/hash/hash_bigkey.c
deleted file mode 100644
index eba679d7f..000000000
--- a/lib/libc/db/hash/hash_bigkey.c
+++ /dev/null
@@ -1,680 +0,0 @@
-/*	$NetBSD: hash_bigkey.c,v 1.24 2012/03/13 21:13:32 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: hash_bigkey.c,v 1.24 2012/03/13 21:13:32 christos Exp $");
-
-/*
- * PACKAGE: hash
- * DESCRIPTION:
- *	Big key/data handling for the hashing package.
- *
- * ROUTINES:
- * External
- *	__big_keydata
- *	__big_split
- *	__big_insert
- *	__big_return
- *	__big_delete
- *	__find_last_page
- * Internal
- *	collect_key
- *	collect_data
- */
-
-#include <sys/param.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static int collect_key(HTAB *, BUFHEAD *, int, DBT *, int);
-static int collect_data(HTAB *, BUFHEAD *, int, int);
-
-/*
- * Big_insert
- *
- * You need to do an insert and the key/data pair is too big
- *
- * Returns:
- * 0 ==> OK
- *-1 ==> ERROR
- */
-int
-__big_insert(HTAB *hashp, BUFHEAD *bufp, const DBT *key, const DBT *val)
-{
-	uint16_t *p, n;
-	size_t key_size, val_size;
-	uint16_t space, move_bytes, off;
-	char *cp, *key_data, *val_data;
-	size_t temp;
-
-	cp = bufp->page;		/* Character pointer of p. */
-	p = (uint16_t *)(void *)cp;
-
-	key_data = (char *)key->data;
-	_DBFIT(key->size, int);
-	key_size = key->size;
-	val_data = (char *)val->data;
-	_DBFIT(val->size, int);
-	val_size = val->size;
-
-	/* First move the Key */
-	
-	temp = FREESPACE(p) - BIGOVERHEAD;
-	_DBFIT(temp, uint16_t);
-	space = (uint16_t)temp;
-	while (key_size) {
-		size_t kspace = MIN(space, key_size);
-		_DBFIT(kspace, uint16_t);
-		move_bytes = (uint16_t)kspace;
-		off = OFFSET(p) - move_bytes;
-		memmove(cp + off, key_data, (size_t)move_bytes);
-		key_size -= move_bytes;
-		key_data += move_bytes;
-		n = p[0];
-		p[++n] = off;
-		p[0] = ++n;
-		temp = off - PAGE_META(n);
-		_DBFIT(temp, uint16_t);
-		FREESPACE(p) = (uint16_t)temp;
-		OFFSET(p) = off;
-		p[n] = PARTIAL_KEY;
-		bufp = __add_ovflpage(hashp, bufp);
-		if (!bufp)
-			return (-1);
-		n = p[0];
-		if (!key_size) {
-			space = FREESPACE(p);
-			if (space) {
-				size_t vspace = MIN(space, val_size);
-				_DBFIT(vspace, uint16_t);
-				move_bytes = (uint16_t)vspace;
-				/*
-				 * If the data would fit exactly in the
-				 * remaining space, we must overflow it to the
-				 * next page; otherwise the invariant that the
-				 * data must end on a page with FREESPACE
-				 * non-zero would fail.
-				 */
-				if (space == val_size && val_size == val->size)
-					goto toolarge;
-				off = OFFSET(p) - move_bytes;
-				memmove(cp + off, val_data, (size_t)move_bytes);
-				val_data += move_bytes;
-				val_size -= move_bytes;
-				p[n] = off;
-				p[n - 2] = FULL_KEY_DATA;
-				FREESPACE(p) = FREESPACE(p) - move_bytes;
-				OFFSET(p) = off;
-			} else {
-			toolarge:
-				p[n - 2] = FULL_KEY;
-			}
-		}
-		p = (uint16_t *)(void *)bufp->page;
-		cp = bufp->page;
-		bufp->flags |= BUF_MOD;
-		temp = FREESPACE(p) - BIGOVERHEAD;
-		_DBFIT(temp, uint16_t);
-		space = (uint16_t)temp;
-	}
-
-	/* Now move the data */
-	temp = FREESPACE(p) - BIGOVERHEAD;
-	_DBFIT(temp, uint16_t);
-	space = (uint16_t)temp;
-	while (val_size) {
-		size_t vspace = MIN(space, val_size);
-		_DBFIT(vspace, uint16_t);
-		move_bytes = (uint16_t)vspace;
-		/*
-		 * Here's the hack to make sure that if the data ends on the
-		 * same page as the key ends, FREESPACE is at least one.
-		 */
-		if (space == val_size && val_size == val->size)
-			move_bytes--;
-		off = OFFSET(p) - move_bytes;
-		memmove(cp + off, val_data, (size_t)move_bytes);
-		val_size -= move_bytes;
-		val_data += move_bytes;
-		n = p[0];
-		p[++n] = off;
-		p[0] = ++n;
-		temp = off - PAGE_META(n);
-		_DBFIT(temp, uint16_t);
-		FREESPACE(p) = (uint16_t)temp;
-		OFFSET(p) = off;
-		if (val_size) {
-			p[n] = FULL_KEY;
-			bufp = __add_ovflpage(hashp, bufp);
-			if (!bufp)
-				return (-1);
-			cp = bufp->page;
-			p = (uint16_t *)(void *)cp;
-		} else
-			p[n] = FULL_KEY_DATA;
-		bufp->flags |= BUF_MOD;
-		temp = FREESPACE(p) - BIGOVERHEAD;
-		_DBFIT(temp, uint16_t);
-		space = (uint16_t)temp;
-	}
-	return (0);
-}
-
-/*
- * Called when bufp's page  contains a partial key (index should be 1)
- *
- * All pages in the big key/data pair except bufp are freed.  We cannot
- * free bufp because the page pointing to it is lost and we can't get rid
- * of its pointer.
- *
- * Returns:
- * 0 => OK
- *-1 => ERROR
- */
-int
-__big_delete(HTAB *hashp, BUFHEAD *bufp)
-{
-	BUFHEAD *last_bfp, *rbufp;
-	uint16_t *bp, pageno;
-	int key_done, n;
-	size_t temp;
-
-	rbufp = bufp;
-	last_bfp = NULL;
-	bp = (uint16_t *)(void *)bufp->page;
-	pageno = 0;
-	key_done = 0;
-
-	while (!key_done || (bp[2] != FULL_KEY_DATA)) {
-		if (bp[2] == FULL_KEY || bp[2] == FULL_KEY_DATA)
-			key_done = 1;
-
-		/*
-		 * If there is freespace left on a FULL_KEY_DATA page, then
-		 * the data is short and fits entirely on this page, and this
-		 * is the last page.
-		 */
-		if (bp[2] == FULL_KEY_DATA && FREESPACE(bp))
-			break;
-		pageno = bp[bp[0] - 1];
-		rbufp->flags |= BUF_MOD;
-		rbufp = __get_buf(hashp, (uint32_t)pageno, rbufp, 0);
-		if (last_bfp)
-			__free_ovflpage(hashp, last_bfp);
-		last_bfp = rbufp;
-		if (!rbufp)
-			return (-1);		/* Error. */
-		bp = (uint16_t *)(void *)rbufp->page;
-	}
-
-	/*
-	 * If we get here then rbufp points to the last page of the big
-	 * key/data pair.  Bufp points to the first one -- it should now be
-	 * empty pointing to the next page after this pair.  Can't free it
-	 * because we don't have the page pointing to it.
-	 */
-
-	/* This is information from the last page of the pair. */
-	n = bp[0];
-	pageno = bp[n - 1];
-
-	/* Now, bp is the first page of the pair. */
-	bp = (uint16_t *)(void *)bufp->page;
-	if (n > 2) {
-		/* There is an overflow page. */
-		bp[1] = pageno;
-		bp[2] = OVFLPAGE;
-		bufp->ovfl = rbufp->ovfl;
-	} else
-		/* This is the last page. */
-		bufp->ovfl = NULL;
-	n -= 2;
-	bp[0] = n;
-	temp = hashp->BSIZE - PAGE_META(n);
-	_DBFIT(temp, uint16_t);
-	FREESPACE(bp) = (uint16_t)temp;
-	OFFSET(bp) = hashp->BSIZE;
-
-	bufp->flags |= BUF_MOD;
-	if (rbufp)
-		__free_ovflpage(hashp, rbufp);
-	if (last_bfp && last_bfp != rbufp)
-		__free_ovflpage(hashp, last_bfp);
-
-	hashp->NKEYS--;
-	return (0);
-}
-/*
- * Returns:
- *  0 = key not found
- * -1 = get next overflow page
- * -2 means key not found and this is big key/data
- * -3 error
- */
-int
-__find_bigpair(HTAB *hashp, BUFHEAD *bufp, int ndx, char *key, int size)
-{
-	uint16_t *bp;
-	char *p;
-	int ksize;
-	uint16_t bytes;
-	char *kkey;
-
-	bp = (uint16_t *)(void *)bufp->page;
-	p = bufp->page;
-	ksize = size;
-	kkey = key;
-
-	for (bytes = hashp->BSIZE - bp[ndx];
-	    bytes <= size && bp[ndx + 1] == PARTIAL_KEY;
-	    bytes = hashp->BSIZE - bp[ndx]) {
-		if (memcmp(p + bp[ndx], kkey, (size_t)bytes))
-			return (-2);
-		kkey += bytes;
-		ksize -= bytes;
-		bufp = __get_buf(hashp, (uint32_t)bp[ndx + 2], bufp, 0);
-		if (!bufp)
-			return (-3);
-		p = bufp->page;
-		bp = (uint16_t *)(void *)p;
-		ndx = 1;
-	}
-
-	if (bytes != ksize || memcmp(p + bp[ndx], kkey, (size_t)bytes)) {
-#ifdef HASH_STATISTICS
-		++hash_collisions;
-#endif
-		return (-2);
-	} else
-		return (ndx);
-}
-
-/*
- * Given the buffer pointer of the first overflow page of a big pair,
- * find the end of the big pair
- *
- * This will set bpp to the buffer header of the last page of the big pair.
- * It will return the pageno of the overflow page following the last page
- * of the pair; 0 if there isn't any (i.e. big pair is the last key in the
- * bucket)
- */
-uint16_t
-__find_last_page(HTAB *hashp, BUFHEAD **bpp)
-{
-	BUFHEAD *bufp;
-	uint16_t *bp, pageno;
-	int n;
-
-	bufp = *bpp;
-	bp = (uint16_t *)(void *)bufp->page;
-	for (;;) {
-		n = bp[0];
-
-		/*
-		 * This is the last page if: the tag is FULL_KEY_DATA and
-		 * either only 2 entries OVFLPAGE marker is explicit there
-		 * is freespace on the page.
-		 */
-		if (bp[2] == FULL_KEY_DATA &&
-		    ((n == 2) || (bp[n] == OVFLPAGE) || (FREESPACE(bp))))
-			break;
-
-		pageno = bp[n - 1];
-		bufp = __get_buf(hashp, (uint32_t)pageno, bufp, 0);
-		if (!bufp)
-			return (0);	/* Need to indicate an error! */
-		bp = (uint16_t *)(void *)bufp->page;
-	}
-
-	*bpp = bufp;
-	if (bp[0] > 2)
-		return (bp[3]);
-	else
-		return (0);
-}
-
-/*
- * Return the data for the key/data pair that begins on this page at this
- * index (index should always be 1).
- */
-int
-__big_return(HTAB *hashp, BUFHEAD *bufp, int ndx, DBT *val, int set_current)
-{
-	BUFHEAD *save_p;
-	uint16_t *bp, len, off, save_addr;
-	char *tp;
-
-	bp = (uint16_t *)(void *)bufp->page;
-	while (bp[ndx + 1] == PARTIAL_KEY) {
-		bufp = __get_buf(hashp, (uint32_t)bp[bp[0] - 1], bufp, 0);
-		if (!bufp)
-			return (-1);
-		bp = (uint16_t *)(void *)bufp->page;
-		ndx = 1;
-	}
-
-	if (bp[ndx + 1] == FULL_KEY) {
-		bufp = __get_buf(hashp, (uint32_t)bp[bp[0] - 1], bufp, 0);
-		if (!bufp)
-			return (-1);
-		bp = (uint16_t *)(void *)bufp->page;
-		save_p = bufp;
-		save_addr = save_p->addr;
-		off = bp[1];
-		len = 0;
-	} else
-		if (!FREESPACE(bp)) {
-			/*
-			 * This is a hack.  We can't distinguish between
-			 * FULL_KEY_DATA that contains complete data or
-			 * incomplete data, so we require that if the data
-			 * is complete, there is at least 1 byte of free
-			 * space left.
-			 */
-			off = bp[bp[0]];
-			len = bp[1] - off;
-			save_p = bufp;
-			save_addr = bufp->addr;
-			bufp = __get_buf(hashp, (uint32_t)bp[bp[0] - 1], bufp,
-			    0);
-			if (!bufp)
-				return (-1);
-			bp = (uint16_t *)(void *)bufp->page;
-		} else {
-			/* The data is all on one page. */
-			tp = (char *)(void *)bp;
-			off = bp[bp[0]];
-			val->data = (uint8_t *)tp + off;
-			val->size = bp[1] - off;
-			if (set_current) {
-				if (bp[0] == 2) {	/* No more buckets in
-							 * chain */
-					hashp->cpage = NULL;
-					hashp->cbucket++;
-					hashp->cndx = 1;
-				} else {
-					hashp->cpage = __get_buf(hashp,
-					    (uint32_t)bp[bp[0] - 1], bufp, 0);
-					if (!hashp->cpage)
-						return (-1);
-					hashp->cndx = 1;
-					if (!((uint16_t *)(void *)
-					    hashp->cpage->page)[0]) {
-						hashp->cbucket++;
-						hashp->cpage = NULL;
-					}
-				}
-			}
-			return (0);
-		}
-
-	val->size = collect_data(hashp, bufp, (int)len, set_current);
-	if (val->size == (size_t)-1)
-		return (-1);
-	if (save_p->addr != save_addr) {
-		/* We are pretty short on buffers. */
-		errno = EINVAL;			/* OUT OF BUFFERS */
-		return (-1);
-	}
-	memmove(hashp->tmp_buf, (save_p->page) + off, (size_t)len);
-	val->data = (uint8_t *)hashp->tmp_buf;
-	return (0);
-}
-/*
- * Count how big the total datasize is by recursing through the pages.  Then
- * allocate a buffer and copy the data as you recurse up.
- */
-static int
-collect_data(HTAB *hashp, BUFHEAD *bufp, int len, int set)
-{
-	uint16_t *bp;
-	char *p;
-	BUFHEAD *xbp;
-	uint16_t save_addr;
-	int mylen, totlen;
-
-	p = bufp->page;
-	bp = (uint16_t *)(void *)p;
-	mylen = hashp->BSIZE - bp[1];
-	save_addr = bufp->addr;
-
-	if (bp[2] == FULL_KEY_DATA) {		/* End of Data */
-		totlen = len + mylen;
-		if (hashp->tmp_buf)
-			free(hashp->tmp_buf);
-		if ((hashp->tmp_buf = calloc(1, (size_t)totlen)) == NULL)
-			return (-1);
-		if (set) {
-			hashp->cndx = 1;
-			if (bp[0] == 2) {	/* No more buckets in chain */
-				hashp->cpage = NULL;
-				hashp->cbucket++;
-			} else {
-				hashp->cpage =
-				    __get_buf(hashp, (uint32_t)bp[bp[0] - 1],
-				    bufp, 0);
-				if (!hashp->cpage)
-					return (-1);
-				else if (!((uint16_t *)(void *)hashp->cpage->page)[0]) {
-					hashp->cbucket++;
-					hashp->cpage = NULL;
-				}
-			}
-		}
-	} else {
-		xbp = __get_buf(hashp, (uint32_t)bp[bp[0] - 1], bufp, 0);
-		if (!xbp || ((totlen =
-		    collect_data(hashp, xbp, len + mylen, set)) < 1))
-			return (-1);
-	}
-	if (bufp->addr != save_addr) {
-		errno = EINVAL;			/* Out of buffers. */
-		return (-1);
-	}
-	memmove(&hashp->tmp_buf[len], (bufp->page) + bp[1], (size_t)mylen);
-	return (totlen);
-}
-
-/*
- * Fill in the key and data for this big pair.
- */
-int
-__big_keydata(HTAB *hashp, BUFHEAD *bufp, DBT *key, DBT *val, int set)
-{
-	key->size = collect_key(hashp, bufp, 0, val, set);
-	if (key->size == (size_t)-1)
-		return (-1);
-	key->data = (uint8_t *)hashp->tmp_key;
-	return (0);
-}
-
-/*
- * Count how big the total key size is by recursing through the pages.  Then
- * collect the data, allocate a buffer and copy the key as you recurse up.
- */
-static int
-collect_key(HTAB *hashp, BUFHEAD *bufp, int len, DBT *val, int set)
-{
-	BUFHEAD *xbp;
-	char *p;
-	int mylen, totlen;
-	uint16_t *bp, save_addr;
-
-	p = bufp->page;
-	bp = (uint16_t *)(void *)p;
-	mylen = hashp->BSIZE - bp[1];
-
-	save_addr = bufp->addr;
-	totlen = len + mylen;
-	if (bp[2] == FULL_KEY || bp[2] == FULL_KEY_DATA) {    /* End of Key. */
-		if (hashp->tmp_key != NULL)
-			free(hashp->tmp_key);
-		if ((hashp->tmp_key = calloc(1, (size_t)totlen)) == NULL)
-			return (-1);
-		if (__big_return(hashp, bufp, 1, val, set))
-			return (-1);
-	} else {
-		xbp = __get_buf(hashp, (uint32_t)bp[bp[0] - 1], bufp, 0);
-		if (!xbp || ((totlen =
-		    collect_key(hashp, xbp, totlen, val, set)) < 1))
-			return (-1);
-	}
-	if (bufp->addr != save_addr) {
-		errno = EINVAL;		/* MIS -- OUT OF BUFFERS */
-		return (-1);
-	}
-	memmove(&hashp->tmp_key[len], (bufp->page) + bp[1], (size_t)mylen);
-	return (totlen);
-}
-
-/*
- * Returns:
- *  0 => OK
- * -1 => error
- */
-int
-__big_split(
-	HTAB *hashp,
-	BUFHEAD *op,	/* Pointer to where to put keys that go in old bucket */
-	BUFHEAD *np,	/* Pointer to new bucket page */
-			/* Pointer to first page containing the big key/data */
-	BUFHEAD *big_keyp,
-	int addr,	/* Address of big_keyp */
-	uint32_t   obucket,/* Old Bucket */
-	SPLIT_RETURN *ret
-)
-{
-	BUFHEAD *tmpp;
-	uint16_t *tp;
-	BUFHEAD *bp;
-	DBT key, val;
-	uint32_t change;
-	uint16_t free_space, n, off;
-	size_t temp;
-
-	bp = big_keyp;
-
-	/* Now figure out where the big key/data goes */
-	if (__big_keydata(hashp, big_keyp, &key, &val, 0))
-		return (-1);
-	change = (__call_hash(hashp, key.data, (int)key.size) != obucket);
-
-	if ((ret->next_addr = __find_last_page(hashp, &big_keyp)) != 0) {
-		if (!(ret->nextp =
-		    __get_buf(hashp, (uint32_t)ret->next_addr, big_keyp, 0)))
-			return (-1);
-	} else
-		ret->nextp = NULL;
-
-	/* Now make one of np/op point to the big key/data pair */
-	_DIAGASSERT(np->ovfl == NULL);
-	if (change)
-		tmpp = np;
-	else
-		tmpp = op;
-
-	tmpp->flags |= BUF_MOD;
-#ifdef DEBUG1
-	(void)fprintf(stderr,
-	    "BIG_SPLIT: %d->ovfl was %d is now %d\n", tmpp->addr,
-	    (tmpp->ovfl ? tmpp->ovfl->addr : 0), (bp ? bp->addr : 0));
-#endif
-	tmpp->ovfl = bp;	/* one of op/np point to big_keyp */
-	tp = (uint16_t *)(void *)tmpp->page;
-	_DIAGASSERT(FREESPACE(tp) >= OVFLSIZE);
-	n = tp[0];
-	off = OFFSET(tp);
-	free_space = FREESPACE(tp);
-	tp[++n] = (uint16_t)addr;
-	tp[++n] = OVFLPAGE;
-	tp[0] = n;
-	OFFSET(tp) = off;
-	temp = free_space - OVFLSIZE;
-	_DBFIT(temp, uint16_t);
-	FREESPACE(tp) = (uint16_t)temp;
-
-	/*
-	 * Finally, set the new and old return values. BIG_KEYP contains a
-	 * pointer to the last page of the big key_data pair. Make sure that
-	 * big_keyp has no following page (2 elements) or create an empty
-	 * following page.
-	 */
-
-	ret->newp = np;
-	ret->oldp = op;
-
-	tp = (uint16_t *)(void *)big_keyp->page;
-	big_keyp->flags |= BUF_MOD;
-	if (tp[0] > 2) {
-		/*
-		 * There may be either one or two offsets on this page.  If
-		 * there is one, then the overflow page is linked on normally
-		 * and tp[4] is OVFLPAGE.  If there are two, tp[4] contains
-		 * the second offset and needs to get stuffed in after the
-		 * next overflow page is added.
-		 */
-		n = tp[4];
-		free_space = FREESPACE(tp);
-		off = OFFSET(tp);
-		tp[0] -= 2;
-		temp = free_space + OVFLSIZE;
-		_DBFIT(temp, uint16_t);
-		FREESPACE(tp) = (uint16_t)temp;
-		OFFSET(tp) = off;
-		tmpp = __add_ovflpage(hashp, big_keyp);
-		if (!tmpp)
-			return (-1);
-		tp[4] = n;
-	} else
-		tmpp = big_keyp;
-
-	if (change)
-		ret->newp = tmpp;
-	else
-		ret->oldp = tmpp;
-	return (0);
-}
diff --git a/lib/libc/db/hash/hash_buf.c b/lib/libc/db/hash/hash_buf.c
deleted file mode 100644
index 6469736b7..000000000
--- a/lib/libc/db/hash/hash_buf.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/*	$NetBSD: hash_buf.c,v 1.18 2009/04/23 22:09:23 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: hash_buf.c,v 1.18 2009/04/23 22:09:23 christos Exp $");
-
-/*
- * PACKAGE: hash
- *
- * DESCRIPTION:
- *	Contains buffer management
- *
- * ROUTINES:
- * External
- *	__buf_init
- *	__get_buf
- *	__buf_free
- *	__reclaim_buf
- * Internal
- *	newbuf
- */
-
-#include <sys/param.h>
-
-#include <errno.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static BUFHEAD *newbuf(HTAB *, uint32_t, BUFHEAD *);
-
-/* Unlink B from its place in the lru */
-#define BUF_REMOVE(B) { \
-	(B)->prev->next = (B)->next; \
-	(B)->next->prev = (B)->prev; \
-}
-
-/* Insert B after P */
-#define BUF_INSERT(B, P) { \
-	(B)->next = (P)->next; \
-	(B)->prev = (P); \
-	(P)->next = (B); \
-	(B)->next->prev = (B); \
-}
-
-#define	MRU	hashp->bufhead.next
-#define	LRU	hashp->bufhead.prev
-
-#define MRU_INSERT(B)	BUF_INSERT((B), &hashp->bufhead)
-#define LRU_INSERT(B)	BUF_INSERT((B), LRU)
-
-/*
- * We are looking for a buffer with address "addr".  If prev_bp is NULL, then
- * address is a bucket index.  If prev_bp is not NULL, then it points to the
- * page previous to an overflow page that we are trying to find.
- *
- * CAVEAT:  The buffer header accessed via prev_bp's ovfl field may no longer
- * be valid.  Therefore, you must always verify that its address matches the
- * address you are seeking.
- */
-BUFHEAD *
-__get_buf(
-	HTAB *hashp,
-	uint32_t addr,
-	BUFHEAD *prev_bp,
-	int newpage	/* If prev_bp set, indicates a new overflow page. */
-)
-{
-	BUFHEAD *bp;
-	uint32_t is_disk_mask;
-	int is_disk, segment_ndx = 0;	/* pacify gcc */
-	SEGMENT segp = NULL;	/* pacify gcc */
-
-	is_disk = 0;
-	is_disk_mask = 0;
-	if (prev_bp) {
-		bp = prev_bp->ovfl;
-		if (!bp || (bp->addr != addr))
-			bp = NULL;
-		if (!newpage)
-			is_disk = BUF_DISK;
-	} else {
-		/* Grab buffer out of directory */
-		segment_ndx = addr & (hashp->SGSIZE - 1);
-
-		/* valid segment ensured by __call_hash() */
-		segp = hashp->dir[addr >> hashp->SSHIFT];
-		_DIAGASSERT(segp != NULL);
-		bp = PTROF(segp[segment_ndx]);
-		is_disk_mask = ISDISK(segp[segment_ndx]);
-		is_disk = is_disk_mask || !hashp->new_file;
-	}
-
-	if (!bp) {
-		bp = newbuf(hashp, addr, prev_bp);
-		if (!bp ||
-		    __get_page(hashp, bp->page, addr, !prev_bp, is_disk, 0))
-			return (NULL);
-		if (!prev_bp)
-			segp[segment_ndx] =
-			    (BUFHEAD *)(void *)((u_long)bp | is_disk_mask);
-	} else {
-		BUF_REMOVE(bp);
-		MRU_INSERT(bp);
-	}
-	return (bp);
-}
-
-/*
- * We need a buffer for this page. Either allocate one, or evict a resident
- * one (if we have as many buffers as we're allowed) and put this one in.
- *
- * If newbuf finds an error (returning NULL), it also sets errno.
- */
-static BUFHEAD *
-newbuf(HTAB *hashp, uint32_t addr, BUFHEAD *prev_bp)
-{
-	BUFHEAD *bp;		/* The buffer we're going to use */
-	BUFHEAD *xbp;		/* Temp pointer */
-	BUFHEAD *next_xbp;
-	SEGMENT segp;
-	int segment_ndx;
-	uint16_t oaddr, *shortp;
-
-	oaddr = 0;
-	bp = LRU;
-	/*
-	 * If LRU buffer is pinned, the buffer pool is too small. We need to
-	 * allocate more buffers.
-	 */
-	if (hashp->nbufs || (bp->flags & BUF_PIN)) {
-		/* Allocate a new one */
-		if ((bp = calloc(1, sizeof(BUFHEAD))) == NULL)
-			return (NULL);
-		if ((bp->page = calloc(1, (size_t)hashp->BSIZE)) == NULL) {
-			free(bp);
-			return (NULL);
-		}
-		if (hashp->nbufs)
-			hashp->nbufs--;
-	} else {
-		/* Kick someone out */
-		BUF_REMOVE(bp);
-		/*
-		 * If this is an overflow page with addr 0, it's already been
-		 * flushed back in an overflow chain and initialized.
-		 */
-		if ((bp->addr != 0) || (bp->flags & BUF_BUCKET)) {
-			/*
-			 * Set oaddr before __put_page so that you get it
-			 * before bytes are swapped.
-			 */
-			shortp = (uint16_t *)(void *)bp->page;
-			if (shortp[0])
-				oaddr = shortp[shortp[0] - 1];
-			if ((bp->flags & BUF_MOD) && __put_page(hashp, bp->page,
-			    bp->addr, (int)IS_BUCKET(bp->flags), 0))
-				return (NULL);
-			/*
-			 * Update the pointer to this page (i.e. invalidate it).
-			 *
-			 * If this is a new file (i.e. we created it at open
-			 * time), make sure that we mark pages which have been
-			 * written to disk so we retrieve them from disk later,
-			 * rather than allocating new pages.
-			 */
-			if (IS_BUCKET(bp->flags)) {
-				segment_ndx = bp->addr & (hashp->SGSIZE - 1);
-				segp = hashp->dir[bp->addr >> hashp->SSHIFT];
-				_DIAGASSERT(segp != NULL);
-
-				if (hashp->new_file &&
-				    ((bp->flags & BUF_MOD) ||
-				    ISDISK(segp[segment_ndx])))
-					segp[segment_ndx] = (BUFHEAD *)BUF_DISK;
-				else
-					segp[segment_ndx] = NULL;
-			}
-			/*
-			 * Since overflow pages can only be access by means of
-			 * their bucket, free overflow pages associated with
-			 * this bucket.
-			 */
-			for (xbp = bp; xbp->ovfl;) {
-				next_xbp = xbp->ovfl;
-				xbp->ovfl = 0;
-				xbp = next_xbp;
-
-				/* Check that ovfl pointer is up date. */
-				if (IS_BUCKET(xbp->flags) ||
-				    (oaddr != xbp->addr))
-					break;
-
-				shortp = (uint16_t *)(void *)xbp->page;
-				if (shortp[0])
-					/* set before __put_page */
-					oaddr = shortp[shortp[0] - 1];
-				if ((xbp->flags & BUF_MOD) && __put_page(hashp,
-				    xbp->page, xbp->addr, 0, 0))
-					return (NULL);
-				xbp->addr = 0;
-				xbp->flags = 0;
-				BUF_REMOVE(xbp);
-				LRU_INSERT(xbp);
-			}
-		}
-	}
-
-	/* Now assign this buffer */
-	bp->addr = addr;
-#ifdef DEBUG1
-	(void)fprintf(stderr, "NEWBUF1: %d->ovfl was %d is now %d\n",
-	    bp->addr, (bp->ovfl ? bp->ovfl->addr : 0), 0);
-#endif
-	bp->ovfl = NULL;
-	if (prev_bp) {
-		/*
-		 * If prev_bp is set, this is an overflow page, hook it in to
-		 * the buffer overflow links.
-		 */
-#ifdef DEBUG1
-		(void)fprintf(stderr, "NEWBUF2: %d->ovfl was %d is now %d\n",
-		    prev_bp->addr, (prev_bp->ovfl ? prev_bp->ovfl->addr : 0),
-		    (bp ? bp->addr : 0));
-#endif
-		prev_bp->ovfl = bp;
-		bp->flags = 0;
-	} else
-		bp->flags = BUF_BUCKET;
-	MRU_INSERT(bp);
-	return (bp);
-}
-
-void
-__buf_init(HTAB *hashp, u_int nbytes)
-{
-	BUFHEAD *bfp;
-	int npages;
-
-	bfp = &(hashp->bufhead);
-	npages = (unsigned int)(nbytes + hashp->BSIZE - 1) >> hashp->BSHIFT;
-	npages = MAX(npages, MIN_BUFFERS);
-
-	hashp->nbufs = npages;
-	bfp->next = bfp;
-	bfp->prev = bfp;
-	/*
-	 * This space is calloc'd so these are already null.
-	 *
-	 * bfp->ovfl = NULL;
-	 * bfp->flags = 0;
-	 * bfp->page = NULL;
-	 * bfp->addr = 0;
-	 */
-}
-
-int
-__buf_free(HTAB *hashp, int do_free, int to_disk)
-{
-	BUFHEAD *bp;
-
-	/* Need to make sure that buffer manager has been initialized */
-	if (!LRU)
-		return (0);
-	for (bp = LRU; bp != &hashp->bufhead;) {
-		/* Check that the buffer is valid */
-		if (bp->addr || IS_BUCKET(bp->flags)) {
-			if (to_disk && (bp->flags & BUF_MOD) &&
-			    __put_page(hashp, bp->page,
-			    bp->addr, IS_BUCKET(bp->flags), 0))
-				return (-1);
-		}
-		/* Check if we are freeing stuff */
-		if (do_free) {
-			if (bp->page) {
-				(void)memset(bp->page, 0, (size_t)hashp->BSIZE);
-				free(bp->page);
-			}
-			BUF_REMOVE(bp);
-			free(bp);
-			bp = LRU;
-		} else
-			bp = bp->prev;
-	}
-	return (0);
-}
-
-void
-__reclaim_buf(HTAB *hashp, BUFHEAD *bp)
-{
-	bp->ovfl = 0;
-	bp->addr = 0;
-	bp->flags = 0;
-	BUF_REMOVE(bp);
-	LRU_INSERT(bp);
-}
diff --git a/lib/libc/db/hash/hash_func.c b/lib/libc/db/hash/hash_func.c
deleted file mode 100644
index 6dd136dc2..000000000
--- a/lib/libc/db/hash/hash_func.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/*	$NetBSD: hash_func.c,v 1.13 2008/09/10 17:52:35 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: hash_func.c,v 1.13 2008/09/10 17:52:35 joerg Exp $");
-
-#include <sys/types.h>
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-#if 0
-static uint32_t hash1(const void *, size_t) __attribute__((__unused__));
-static uint32_t hash2(const void *, size_t) __attribute__((__unused__));
-static uint32_t hash3(const void *, size_t) __attribute__((__unused__));
-#endif
-static uint32_t hash4(const void *, size_t) __attribute__((__unused__));
-
-/* Global default hash function */
-uint32_t (*__default_hash)(const void *, size_t) = hash4;
-#if 0
-/*
- * HASH FUNCTIONS
- *
- * Assume that we've already split the bucket to which this key hashes,
- * calculate that bucket, and check that in fact we did already split it.
- *
- * This came from ejb's hsearch.
- */
-
-#define PRIME1		37
-#define PRIME2		1048583
-
-static uint32_t
-hash1(const void *keyarg, size_t len)
-{
-	const uint8_t *key;
-	uint32_t h;
-
-	/* Convert string to integer */
-	for (key = keyarg, h = 0; len--;)
-		h = h * PRIME1 ^ (*key++ - ' ');
-	h %= PRIME2;
-	return (h);
-}
-
-/*
- * Phong's linear congruential hash
- */
-#define dcharhash(h, c)	((h) = 0x63c63cd9*(h) + 0x9c39c33d + (c))
-
-static uint32_t
-hash2(const void *keyarg, size_t len)
-{
-	const uint8_t *e, *key;
-	uint32_t h;
-	uint8_t c;
-
-	key = keyarg;
-	e = key + len;
-	for (h = 0; key != e;) {
-		c = *key++;
-		if (!c && key > e)
-			break;
-		dcharhash(h, c);
-	}
-	return (h);
-}
-
-/*
- * This is INCREDIBLY ugly, but fast.  We break the string up into 8 byte
- * units.  On the first time through the loop we get the "leftover bytes"
- * (strlen % 8).  On every other iteration, we perform 8 HASHC's so we handle
- * all 8 bytes.  Essentially, this saves us 7 cmp & branch instructions.  If
- * this routine is heavily used enough, it's worth the ugly coding.
- *
- * OZ's original sdbm hash
- */
-static uint32_t
-hash3(const void *keyarg, size_t len)
-{
-	const uint8_t *key;
-	size_t loop;
-	uint32_t h;
-
-#define HASHC   h = *key++ + 65599 * h
-
-	h = 0;
-	key = keyarg;
-	if (len > 0) {
-		loop = (len + 8 - 1) >> 3;
-
-		switch (len & (8 - 1)) {
-		case 0:
-			do {
-				HASHC;
-				/* FALLTHROUGH */
-		case 7:
-				HASHC;
-				/* FALLTHROUGH */
-		case 6:
-				HASHC;
-				/* FALLTHROUGH */
-		case 5:
-				HASHC;
-				/* FALLTHROUGH */
-		case 4:
-				HASHC;
-				/* FALLTHROUGH */
-		case 3:
-				HASHC;
-				/* FALLTHROUGH */
-		case 2:
-				HASHC;
-				/* FALLTHROUGH */
-		case 1:
-				HASHC;
-			} while (--loop);
-		}
-	}
-	return (h);
-}
-#endif
-
-/* Hash function from Chris Torek. */
-static uint32_t
-hash4(const void *keyarg, size_t len)
-{
-	const uint8_t *key;
-	size_t loop;
-	uint32_t h;
-
-#define HASH4a   h = (h << 5) - h + *key++;
-#define HASH4b   h = (h << 5) + h + *key++;
-#define HASH4 HASH4b
-
-	h = 0;
-	key = keyarg;
-	if (len > 0) {
-		loop = (len + 8 - 1) >> 3;
-
-		switch (len & (8 - 1)) {
-		case 0:
-			do {
-				HASH4;
-				/* FALLTHROUGH */
-		case 7:
-				HASH4;
-				/* FALLTHROUGH */
-		case 6:
-				HASH4;
-				/* FALLTHROUGH */
-		case 5:
-				HASH4;
-				/* FALLTHROUGH */
-		case 4:
-				HASH4;
-				/* FALLTHROUGH */
-		case 3:
-				HASH4;
-				/* FALLTHROUGH */
-		case 2:
-				HASH4;
-				/* FALLTHROUGH */
-		case 1:
-				HASH4;
-			} while (--loop);
-		}
-	}
-	return (h);
-}
diff --git a/lib/libc/db/hash/hash_log2.c b/lib/libc/db/hash/hash_log2.c
deleted file mode 100644
index 74343da17..000000000
--- a/lib/libc/db/hash/hash_log2.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: hash_log2.c,v 1.13 2008/09/11 12:33:55 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: hash_log2.c,v 1.13 2008/09/11 12:33:55 joerg Exp $");
-
-#include <sys/types.h>
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-uint32_t
-__log2(uint32_t num)
-{
-	uint32_t i, limit;
-
-	if (num == 0)
-		return 0;
-	--num;
-
-	limit = 0;
-	for (i = 0; limit < num; limit = limit * 2 + 1, i++)
-		continue;
-	return (i);
-}
diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c
deleted file mode 100644
index 5ca355ee8..000000000
--- a/lib/libc/db/hash/hash_page.c
+++ /dev/null
@@ -1,928 +0,0 @@
-/*	$NetBSD: hash_page.c,v 1.26 2013/12/01 00:22:48 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: hash_page.c,v 1.26 2013/12/01 00:22:48 christos Exp $");
-
-/*
- * PACKAGE:  hashing
- *
- * DESCRIPTION:
- *	Page manipulation for hashing package.
- *
- * ROUTINES:
- *
- * External
- *	__get_page
- *	__add_ovflpage
- * Internal
- *	overflow_page
- */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <paths.h>
-#include <assert.h>
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static uint32_t	*fetch_bitmap(HTAB *, int);
-static uint32_t	 first_free(uint32_t);
-static uint16_t	 overflow_page(HTAB *);
-static void	 putpair(char *, const DBT *, const DBT *);
-static void	 squeeze_key(uint16_t *, const DBT *, const DBT *);
-static int	 ugly_split(HTAB *, uint32_t, BUFHEAD *, BUFHEAD *, int, int);
-
-#define	PAGE_INIT(P) { \
-	((uint16_t *)(void *)(P))[0] = 0; \
-	temp = 3 * sizeof(uint16_t); \
-	_DIAGASSERT((size_t)hashp->BSIZE >= temp); \
-	((uint16_t *)(void *)(P))[1] = (uint16_t)(hashp->BSIZE - temp); \
-	((uint16_t *)(void *)(P))[2] = hashp->BSIZE; \
-}
-
-/*
- * This is called AFTER we have verified that there is room on the page for
- * the pair (PAIRFITS has returned true) so we go right ahead and start moving
- * stuff on.
- */
-static void
-putpair(char *p, const DBT *key, const DBT *val)
-{
-	uint16_t *bp, n, off;
-	size_t temp;
-
-	bp = (uint16_t *)(void *)p;
-
-	/* Enter the key first. */
-	n = bp[0];
-
-	temp = OFFSET(bp);
-	_DIAGASSERT(temp >= key->size);
-	off = (uint16_t)(temp - key->size);
-	memmove(p + off, key->data, key->size);
-	bp[++n] = off;
-
-	/* Now the data. */
-	_DIAGASSERT(off >= val->size);
-	off -= (uint16_t)val->size;
-	memmove(p + off, val->data, val->size);
-	bp[++n] = off;
-
-	/* Adjust page info. */
-	bp[0] = n;
-	temp = (n + 3) * sizeof(uint16_t);
-	_DIAGASSERT(off >= temp);
-	bp[n + 1] = (uint16_t)(off - temp);
-	bp[n + 2] = off;
-}
-
-/*
- * Returns:
- *	 0 OK
- *	-1 error
- */
-int
-__delpair(HTAB *hashp, BUFHEAD *bufp, int ndx)
-{
-	uint16_t *bp, newoff;
-	int n;
-	uint16_t pairlen;
-	size_t temp;
-
-	bp = (uint16_t *)(void *)bufp->page;
-	n = bp[0];
-
-	if (bp[ndx + 1] < REAL_KEY)
-		return (__big_delete(hashp, bufp));
-	if (ndx != 1)
-		newoff = bp[ndx - 1];
-	else
-		newoff = hashp->BSIZE;
-	pairlen = newoff - bp[ndx + 1];
-
-	if (ndx != (n - 1)) {
-		/* Hard Case -- need to shuffle keys */
-		int i;
-		char *src = bufp->page + (int)OFFSET(bp);
-		char *dst = src + (int)pairlen;
-		memmove(dst, src, (size_t)(bp[ndx + 1] - OFFSET(bp)));
-
-		/* Now adjust the pointers */
-		for (i = ndx + 2; i <= n; i += 2) {
-			if (bp[i + 1] == OVFLPAGE) {
-				bp[i - 2] = bp[i];
-				bp[i - 1] = bp[i + 1];
-			} else {
-				bp[i - 2] = bp[i] + pairlen;
-				bp[i - 1] = bp[i + 1] + pairlen;
-			}
-		}
-	}
-	/* Finally adjust the page data */
-	bp[n] = OFFSET(bp) + pairlen;
-	temp = bp[n + 1] + pairlen + 2 * sizeof(uint16_t);
-	_DIAGASSERT(temp <= 0xffff);
-	bp[n - 1] = (uint16_t)temp;
-	bp[0] = n - 2;
-	hashp->NKEYS--;
-
-	bufp->flags |= BUF_MOD;
-	return (0);
-}
-/*
- * Returns:
- *	 0 ==> OK
- *	-1 ==> Error
- */
-int
-__split_page(HTAB *hashp, uint32_t obucket, uint32_t nbucket)
-{
-	BUFHEAD *new_bufp, *old_bufp;
-	uint16_t *ino;
-	char *np;
-	DBT key, val;
-	int n, ndx, retval;
-	uint16_t copyto, diff, off, moved;
-	char *op;
-	size_t temp;
-
-	copyto = (uint16_t)hashp->BSIZE;
-	off = (uint16_t)hashp->BSIZE;
-	old_bufp = __get_buf(hashp, obucket, NULL, 0);
-	if (old_bufp == NULL)
-		return (-1);
-	new_bufp = __get_buf(hashp, nbucket, NULL, 0);
-	if (new_bufp == NULL)
-		return (-1);
-
-	old_bufp->flags |= (BUF_MOD | BUF_PIN);
-	new_bufp->flags |= (BUF_MOD | BUF_PIN);
-
-	ino = (uint16_t *)(void *)(op = old_bufp->page);
-	np = new_bufp->page;
-
-	moved = 0;
-
-	for (n = 1, ndx = 1; n < ino[0]; n += 2) {
-		if (ino[n + 1] < REAL_KEY) {
-			retval = ugly_split(hashp, obucket, old_bufp, new_bufp,
-			    (int)copyto, (int)moved);
-			old_bufp->flags &= ~BUF_PIN;
-			new_bufp->flags &= ~BUF_PIN;
-			return (retval);
-
-		}
-		key.data = (uint8_t *)op + ino[n];
-		key.size = off - ino[n];
-
-		if (__call_hash(hashp, key.data, (int)key.size) == obucket) {
-			/* Don't switch page */
-			diff = copyto - off;
-			if (diff) {
-				copyto = ino[n + 1] + diff;
-				memmove(op + copyto, op + ino[n + 1],
-				    (size_t)(off - ino[n + 1]));
-				ino[ndx] = copyto + ino[n] - ino[n + 1];
-				ino[ndx + 1] = copyto;
-			} else
-				copyto = ino[n + 1];
-			ndx += 2;
-		} else {
-			/* Switch page */
-			val.data = (uint8_t *)op + ino[n + 1];
-			val.size = ino[n] - ino[n + 1];
-			putpair(np, &key, &val);
-			moved += 2;
-		}
-
-		off = ino[n + 1];
-	}
-
-	/* Now clean up the page */
-	ino[0] -= moved;
-	temp = sizeof(uint16_t) * (ino[0] + 3);
-	_DIAGASSERT(copyto >= temp);
-	FREESPACE(ino) = (uint16_t)(copyto - temp);
-	OFFSET(ino) = copyto;
-
-#ifdef DEBUG3
-	(void)fprintf(stderr, "split %d/%d\n",
-	    ((uint16_t *)np)[0] / 2,
-	    ((uint16_t *)op)[0] / 2);
-#endif
-	/* unpin both pages */
-	old_bufp->flags &= ~BUF_PIN;
-	new_bufp->flags &= ~BUF_PIN;
-	return (0);
-}
-
-/*
- * Called when we encounter an overflow or big key/data page during split
- * handling.  This is special cased since we have to begin checking whether
- * the key/data pairs fit on their respective pages and because we may need
- * overflow pages for both the old and new pages.
- *
- * The first page might be a page with regular key/data pairs in which case
- * we have a regular overflow condition and just need to go on to the next
- * page or it might be a big key/data pair in which case we need to fix the
- * big key/data pair.
- *
- * Returns:
- *	 0 ==> success
- *	-1 ==> failure
- */
-static int
-ugly_split(
-	HTAB *hashp,
-	uint32_t obucket,	/* Same as __split_page. */
-	BUFHEAD *old_bufp,
-	BUFHEAD *new_bufp,
-	int copyto,	/* First byte on page which contains key/data values. */
-	int moved	/* Number of pairs moved to new page. */
-)
-{
-	BUFHEAD *bufp;	/* Buffer header for ino */
-	uint16_t *ino;	/* Page keys come off of */
-	uint16_t *np;	/* New page */
-	uint16_t *op;	/* Page keys go on to if they aren't moving */
-	size_t temp;
-
-	BUFHEAD *last_bfp;	/* Last buf header OVFL needing to be freed */
-	DBT key, val;
-	SPLIT_RETURN ret;
-	uint16_t n, off, ov_addr, scopyto;
-	char *cino;		/* Character value of ino */
-
-	bufp = old_bufp;
-	ino = (uint16_t *)(void *)old_bufp->page;
-	np = (uint16_t *)(void *)new_bufp->page;
-	op = (uint16_t *)(void *)old_bufp->page;
-	last_bfp = NULL;
-	scopyto = (uint16_t)copyto;	/* ANSI */
-
-	n = ino[0] - 1;
-	while (n < ino[0]) {
-		if (ino[2] < REAL_KEY && ino[2] != OVFLPAGE) {
-			if (__big_split(hashp, old_bufp,
-			    new_bufp, bufp, (int)bufp->addr, obucket, &ret))
-				return (-1);
-			old_bufp = ret.oldp;
-			if (!old_bufp)
-				return (-1);
-			op = (uint16_t *)(void *)old_bufp->page;
-			new_bufp = ret.newp;
-			if (!new_bufp)
-				return (-1);
-			np = (uint16_t *)(void *)new_bufp->page;
-			bufp = ret.nextp;
-			if (!bufp)
-				return (0);
-			cino = (char *)bufp->page;
-			ino = (uint16_t *)(void *)cino;
-			last_bfp = ret.nextp;
-		} else if (ino[n + 1] == OVFLPAGE) {
-			ov_addr = ino[n];
-			/*
-			 * Fix up the old page -- the extra 2 are the fields
-			 * which contained the overflow information.
-			 */
-			ino[0] -= (moved + 2);
-			temp = sizeof(uint16_t) * (ino[0] + 3);
-			_DIAGASSERT(scopyto >= temp);
-			FREESPACE(ino) = (uint16_t)(scopyto - temp);
-			OFFSET(ino) = scopyto;
-
-			bufp = __get_buf(hashp, (uint32_t)ov_addr, bufp, 0);
-			if (!bufp)
-				return (-1);
-
-			ino = (uint16_t *)(void *)bufp->page;
-			n = 1;
-			scopyto = hashp->BSIZE;
-			moved = 0;
-
-			if (last_bfp)
-				__free_ovflpage(hashp, last_bfp);
-			last_bfp = bufp;
-		}
-		/* Move regular sized pairs of there are any */
-		off = hashp->BSIZE;
-		for (n = 1; (n < ino[0]) && (ino[n + 1] >= REAL_KEY); n += 2) {
-			cino = (char *)(void *)ino;
-			key.data = (uint8_t *)cino + ino[n];
-			key.size = off - ino[n];
-			val.data = (uint8_t *)cino + ino[n + 1];
-			val.size = ino[n] - ino[n + 1];
-			off = ino[n + 1];
-
-			if (__call_hash(hashp, key.data, (int)key.size) == obucket) {
-				/* Keep on old page */
-				if (PAIRFITS(op, (&key), (&val)))
-					putpair((char *)(void *)op, &key, &val);
-				else {
-					old_bufp =
-					    __add_ovflpage(hashp, old_bufp);
-					if (!old_bufp)
-						return (-1);
-					op = (uint16_t *)(void *)old_bufp->page;
-					putpair((char *)(void *)op, &key, &val);
-				}
-				old_bufp->flags |= BUF_MOD;
-			} else {
-				/* Move to new page */
-				if (PAIRFITS(np, (&key), (&val)))
-					putpair((char *)(void *)np, &key, &val);
-				else {
-					new_bufp =
-					    __add_ovflpage(hashp, new_bufp);
-					if (!new_bufp)
-						return (-1);
-					np = (uint16_t *)(void *)new_bufp->page;
-					putpair((char *)(void *)np, &key, &val);
-				}
-				new_bufp->flags |= BUF_MOD;
-			}
-		}
-	}
-	if (last_bfp)
-		__free_ovflpage(hashp, last_bfp);
-	return (0);
-}
-
-/*
- * Add the given pair to the page
- *
- * Returns:
- *	0 ==> OK
- *	1 ==> failure
- */
-int
-__addel(HTAB *hashp, BUFHEAD *bufp, const DBT *key, const DBT *val)
-{
-	uint16_t *bp, *sop;
-	int do_expand;
-
-	bp = (uint16_t *)(void *)bufp->page;
-	do_expand = 0;
-	while (bp[0] && (bp[2] < REAL_KEY || bp[bp[0]] < REAL_KEY))
-		/* Exception case */
-		if (bp[2] == FULL_KEY_DATA && bp[0] == 2)
-			/* This is the last page of a big key/data pair
-			   and we need to add another page */
-			break;
-		else if (bp[2] < REAL_KEY && bp[bp[0]] != OVFLPAGE) {
-			bufp = __get_buf(hashp, (uint32_t)bp[bp[0] - 1], bufp,
-			    0);
-			if (!bufp)
-				return (-1);
-			bp = (uint16_t *)(void *)bufp->page;
-		} else if (bp[bp[0]] != OVFLPAGE) {
-			/* Short key/data pairs, no more pages */
-			break;
-		} else {
-			/* Try to squeeze key on this page */
-			if (bp[2] >= REAL_KEY &&
-			    FREESPACE(bp) >= PAIRSIZE(key, val)) {
-				squeeze_key(bp, key, val);
-				goto stats;
-			} else {
-				bufp = __get_buf(hashp,
-				    (uint32_t)bp[bp[0] - 1], bufp, 0);
-				if (!bufp)
-					return (-1);
-				bp = (uint16_t *)(void *)bufp->page;
-			}
-		}
-
-	if (PAIRFITS(bp, key, val))
-		putpair(bufp->page, key, val);
-	else {
-		do_expand = 1;
-		bufp = __add_ovflpage(hashp, bufp);
-		if (!bufp)
-			return (-1);
-		sop = (uint16_t *)(void *)bufp->page;
-
-		if (PAIRFITS(sop, key, val))
-			putpair((char *)(void *)sop, key, val);
-		else
-			if (__big_insert(hashp, bufp, key, val))
-				return (-1);
-	}
-stats:
-	bufp->flags |= BUF_MOD;
-	/*
-	 * If the average number of keys per bucket exceeds the fill factor,
-	 * expand the table.
-	 */
-	hashp->NKEYS++;
-	if (do_expand ||
-	    (hashp->NKEYS / (hashp->MAX_BUCKET + 1) > hashp->FFACTOR))
-		return (__expand_table(hashp));
-	return (0);
-}
-
-/*
- *
- * Returns:
- *	pointer on success
- *	NULL on error
- */
-BUFHEAD *
-__add_ovflpage(HTAB *hashp, BUFHEAD *bufp)
-{
-	uint16_t *sp;
-	uint16_t ndx, ovfl_num;
-	size_t temp;
-#ifdef DEBUG1
-	int tmp1, tmp2;
-#endif
-	sp = (uint16_t *)(void *)bufp->page;
-
-	/* Check if we are dynamically determining the fill factor */
-	if (hashp->FFACTOR == DEF_FFACTOR) {
-		hashp->FFACTOR = (uint32_t)sp[0] >> 1;
-		if (hashp->FFACTOR < MIN_FFACTOR)
-			hashp->FFACTOR = MIN_FFACTOR;
-	}
-	bufp->flags |= BUF_MOD;
-	ovfl_num = overflow_page(hashp);
-#ifdef DEBUG1
-	tmp1 = bufp->addr;
-	tmp2 = bufp->ovfl ? bufp->ovfl->addr : 0;
-#endif
-	if (!ovfl_num || !(bufp->ovfl = __get_buf(hashp, (uint32_t)ovfl_num,
-	    bufp, 1)))
-		return (NULL);
-	bufp->ovfl->flags |= BUF_MOD;
-#ifdef DEBUG1
-	(void)fprintf(stderr, "ADDOVFLPAGE: %d->ovfl was %d is now %d\n",
-	    tmp1, tmp2, bufp->ovfl->addr);
-#endif
-	ndx = sp[0];
-	/*
-	 * Since a pair is allocated on a page only if there's room to add
-	 * an overflow page, we know that the OVFL information will fit on
-	 * the page.
-	 */
-	sp[ndx + 4] = OFFSET(sp);
-	temp = FREESPACE(sp);
-	_DIAGASSERT(temp >= OVFLSIZE);
-	sp[ndx + 3] = (uint16_t)(temp - OVFLSIZE);
-	sp[ndx + 1] = ovfl_num;
-	sp[ndx + 2] = OVFLPAGE;
-	sp[0] = ndx + 2;
-#ifdef HASH_STATISTICS
-	hash_overflows++;
-#endif
-	return (bufp->ovfl);
-}
-
-/*
- * Returns:
- *	 0 indicates SUCCESS
- *	-1 indicates FAILURE
- */
-int
-__get_page(HTAB *hashp, char *p, uint32_t bucket, int is_bucket, int is_disk,
-    int is_bitmap)
-{
-	int fd, page, size;
-	ssize_t rsize;
-	uint16_t *bp;
-	size_t temp;
-
-	fd = hashp->fp;
-	size = hashp->BSIZE;
-
-	if ((fd == -1) || !is_disk) {
-		PAGE_INIT(p);
-		return (0);
-	}
-	if (is_bucket)
-		page = BUCKET_TO_PAGE(bucket);
-	else
-		page = OADDR_TO_PAGE(bucket);
-	if ((rsize = pread(fd, p, (size_t)size, (off_t)page << hashp->BSHIFT)) == -1)
-		return (-1);
-	bp = (uint16_t *)(void *)p;
-	if (!rsize)
-		bp[0] = 0;	/* We hit the EOF, so initialize a new page */
-	else
-		if (rsize != size) {
-			errno = EFTYPE;
-			return (-1);
-		}
-	if (!is_bitmap && !bp[0]) {
-		PAGE_INIT(p);
-	} else
-		if (hashp->LORDER != BYTE_ORDER) {
-			int i, max;
-
-			if (is_bitmap) {
-				max = (uint32_t)hashp->BSIZE >> 2; /* divide by 4 */
-				for (i = 0; i < max; i++)
-					M_32_SWAP(((int *)(void *)p)[i]);
-			} else {
-				M_16_SWAP(bp[0]);
-				max = bp[0] + 2;
-				for (i = 1; i <= max; i++)
-					M_16_SWAP(bp[i]);
-			}
-		}
-	return (0);
-}
-
-/*
- * Write page p to disk
- *
- * Returns:
- *	 0 ==> OK
- *	-1 ==>failure
- */
-int
-__put_page(HTAB *hashp, char *p, uint32_t bucket, int is_bucket, int is_bitmap)
-{
-	int fd, page, size;
-	ssize_t wsize;
-
-	size = hashp->BSIZE;
-	if ((hashp->fp == -1) && (hashp->fp = __dbtemp("_hash", NULL)) == -1)
-		return (-1);
-	fd = hashp->fp;
-
-	if (hashp->LORDER != BYTE_ORDER) {
-		int i;
-		int max;
-
-		if (is_bitmap) {
-			max = (uint32_t)hashp->BSIZE >> 2;	/* divide by 4 */
-			for (i = 0; i < max; i++)
-				M_32_SWAP(((int *)(void *)p)[i]);
-		} else {
-			max = ((uint16_t *)(void *)p)[0] + 2;
-			for (i = 0; i <= max; i++)
-				M_16_SWAP(((uint16_t *)(void *)p)[i]);
-		}
-	}
-	if (is_bucket)
-		page = BUCKET_TO_PAGE(bucket);
-	else
-		page = OADDR_TO_PAGE(bucket);
-	if ((wsize = pwrite(fd, p, (size_t)size, (off_t)page << hashp->BSHIFT)) == -1)
-		/* Errno is set */
-		return (-1);
-	if (wsize != size) {
-		errno = EFTYPE;
-		return (-1);
-	}
-	return (0);
-}
-
-#define BYTE_MASK	((1 << INT_BYTE_SHIFT) -1)
-/*
- * Initialize a new bitmap page.  Bitmap pages are left in memory
- * once they are read in.
- */
-int
-__ibitmap(HTAB *hashp, int pnum, int nbits, int ndx)
-{
-	uint32_t *ip;
-	int clearbytes, clearints;
-
-	if ((ip = malloc((size_t)hashp->BSIZE)) == NULL)
-		return (1);
-	hashp->nmaps++;
-	clearints = ((uint32_t)(nbits - 1) >> INT_BYTE_SHIFT) + 1;
-	clearbytes = clearints << INT_TO_BYTE;
-	(void)memset(ip, 0, (size_t)clearbytes);
-	(void)memset(((char *)(void *)ip) + clearbytes, 0xFF,
-	    (size_t)(hashp->BSIZE - clearbytes));
-	ip[clearints - 1] = ALL_SET << (nbits & BYTE_MASK);
-	SETBIT(ip, 0);
-	hashp->BITMAPS[ndx] = (uint16_t)pnum;
-	hashp->mapp[ndx] = ip;
-	return (0);
-}
-
-static uint32_t
-first_free(uint32_t map)
-{
-	uint32_t i, mask;
-
-	mask = 0x1;
-	for (i = 0; i < BITS_PER_MAP; i++) {
-		if (!(mask & map))
-			return (i);
-		mask = mask << 1;
-	}
-	return (i);
-}
-
-static uint16_t
-overflow_page(HTAB *hashp)
-{
-	uint32_t *freep = NULL;
-	int max_free, offset, splitnum;
-	uint16_t addr;
-	int bit, first_page, free_bit, free_page, i, in_use_bits, j;
-#ifdef DEBUG2
-	int tmp1, tmp2;
-#endif
-	splitnum = hashp->OVFL_POINT;
-	max_free = hashp->SPARES[splitnum];
-
-	free_page = (uint32_t)(max_free - 1) >> (hashp->BSHIFT + BYTE_SHIFT);
-	free_bit = (max_free - 1) & ((hashp->BSIZE << BYTE_SHIFT) - 1);
-
-	/* Look through all the free maps to find the first free block */
-	first_page = (uint32_t)hashp->LAST_FREED >>(hashp->BSHIFT + BYTE_SHIFT);
-	for ( i = first_page; i <= free_page; i++ ) {
-		if (!(freep = (uint32_t *)hashp->mapp[i]) &&
-		    !(freep = fetch_bitmap(hashp, i)))
-			return (0);
-		if (i == free_page)
-			in_use_bits = free_bit;
-		else
-			in_use_bits = (hashp->BSIZE << BYTE_SHIFT) - 1;
-		
-		if (i == first_page) {
-			bit = hashp->LAST_FREED &
-			    ((hashp->BSIZE << BYTE_SHIFT) - 1);
-			j = bit / BITS_PER_MAP;
-			bit = bit & ~(BITS_PER_MAP - 1);
-		} else {
-			bit = 0;
-			j = 0;
-		}
-		for (; bit <= in_use_bits; j++, bit += BITS_PER_MAP)
-			if (freep[j] != ALL_SET)
-				goto found;
-	}
-
-	/* No Free Page Found */
-	hashp->LAST_FREED = hashp->SPARES[splitnum];
-	hashp->SPARES[splitnum]++;
-	offset = hashp->SPARES[splitnum] -
-	    (splitnum ? hashp->SPARES[splitnum - 1] : 0);
-
-#define	OVMSG	"HASH: Out of overflow pages.  Increase page size\n"
-	if (offset > SPLITMASK) {
-		if (++splitnum >= NCACHED) {
-			(void)write(STDERR_FILENO, OVMSG, sizeof(OVMSG) - 1);
-			errno = EFBIG;
-			return (0);
-		}
-		hashp->OVFL_POINT = splitnum;
-		hashp->SPARES[splitnum] = hashp->SPARES[splitnum-1];
-		hashp->SPARES[splitnum-1]--;
-		offset = 1;
-	}
-
-	/* Check if we need to allocate a new bitmap page */
-	if (free_bit == (hashp->BSIZE << BYTE_SHIFT) - 1) {
-		free_page++;
-		if (free_page >= NCACHED) {
-			(void)write(STDERR_FILENO, OVMSG, sizeof(OVMSG) - 1);
-			errno = EFBIG;
-			return (0);
-		}
-		/*
-		 * This is tricky.  The 1 indicates that you want the new page
-		 * allocated with 1 clear bit.  Actually, you are going to
-		 * allocate 2 pages from this map.  The first is going to be
-		 * the map page, the second is the overflow page we were
-		 * looking for.  The init_bitmap routine automatically, sets
-		 * the first bit of itself to indicate that the bitmap itself
-		 * is in use.  We would explicitly set the second bit, but
-		 * don't have to if we tell init_bitmap not to leave it clear
-		 * in the first place.
-		 */
-		if (__ibitmap(hashp,
-		    (int)OADDR_OF(splitnum, offset), 1, free_page))
-			return (0);
-		hashp->SPARES[splitnum]++;
-#ifdef DEBUG2
-		free_bit = 2;
-#endif
-		offset++;
-		if (offset > SPLITMASK) {
-			if (++splitnum >= NCACHED) {
-				(void)write(STDERR_FILENO, OVMSG,
-				    sizeof(OVMSG) - 1);
-				errno = EFBIG;
-				return (0);
-			}
-			hashp->OVFL_POINT = splitnum;
-			hashp->SPARES[splitnum] = hashp->SPARES[splitnum-1];
-			hashp->SPARES[splitnum-1]--;
-			offset = 0;
-		}
-	} else {
-		/*
-		 * Free_bit addresses the last used bit.  Bump it to address
-		 * the first available bit.
-		 */
-		free_bit++;
-		SETBIT(freep, free_bit);
-	}
-
-	/* Calculate address of the new overflow page */
-	addr = OADDR_OF(splitnum, offset);
-#ifdef DEBUG2
-	(void)fprintf(stderr, "OVERFLOW_PAGE: ADDR: %d BIT: %d PAGE %d\n",
-	    addr, free_bit, free_page);
-#endif
-	return (addr);
-
-found:
-	bit = bit + first_free(freep[j]);
-	SETBIT(freep, bit);
-#ifdef DEBUG2
-	tmp1 = bit;
-	tmp2 = i;
-#endif
-	/*
-	 * Bits are addressed starting with 0, but overflow pages are addressed
-	 * beginning at 1. Bit is a bit addressnumber, so we need to increment
-	 * it to convert it to a page number.
-	 */
-	bit = 1 + bit + (i * (hashp->BSIZE << BYTE_SHIFT));
-	if (bit >= hashp->LAST_FREED)
-		hashp->LAST_FREED = bit - 1;
-
-	/* Calculate the split number for this page */
-	for (i = 0; (i < splitnum) && (bit > hashp->SPARES[i]); i++);
-	offset = (i ? bit - hashp->SPARES[i - 1] : bit);
-	if (offset >= SPLITMASK) {
-		(void)write(STDERR_FILENO, OVMSG, sizeof(OVMSG) - 1);
-		errno = EFBIG;
-		return (0);	/* Out of overflow pages */
-	}
-	addr = OADDR_OF(i, offset);
-#ifdef DEBUG2
-	(void)fprintf(stderr, "OVERFLOW_PAGE: ADDR: %d BIT: %d PAGE %d\n",
-	    addr, tmp1, tmp2);
-#endif
-
-	/* Allocate and return the overflow page */
-	return (addr);
-}
-
-/*
- * Mark this overflow page as free.
- */
-void
-__free_ovflpage(HTAB *hashp, BUFHEAD *obufp)
-{
-	uint16_t addr;
-	uint32_t *freep;
-	int bit_address, free_page, free_bit;
-	uint16_t ndx;
-
-	addr = obufp->addr;
-#ifdef DEBUG1
-	(void)fprintf(stderr, "Freeing %d\n", addr);
-#endif
-	ndx = (((uint32_t)addr) >> SPLITSHIFT);
-	bit_address =
-	    (ndx ? hashp->SPARES[ndx - 1] : 0) + (addr & SPLITMASK) - 1;
-	 if (bit_address < hashp->LAST_FREED)
-		hashp->LAST_FREED = bit_address;
-	free_page = ((uint32_t)bit_address >> (hashp->BSHIFT + BYTE_SHIFT));
-	free_bit = bit_address & ((hashp->BSIZE << BYTE_SHIFT) - 1);
-
-	if (!(freep = hashp->mapp[free_page]))
-		freep = fetch_bitmap(hashp, free_page);
-	/*
-	 * This had better never happen.  It means we tried to read a bitmap
-	 * that has already had overflow pages allocated off it, and we
-	 * failed to read it from the file.
-	 */
-	_DIAGASSERT(freep != NULL);
-	CLRBIT(freep, free_bit);
-#ifdef DEBUG2
-	(void)fprintf(stderr, "FREE_OVFLPAGE: ADDR: %d BIT: %d PAGE %d\n",
-	    obufp->addr, free_bit, free_page);
-#endif
-	__reclaim_buf(hashp, obufp);
-}
-
-/*
- * We have to know that the key will fit, but the last entry on the page is
- * an overflow pair, so we need to shift things.
- */
-static void
-squeeze_key(uint16_t *sp, const DBT *key, const DBT *val)
-{
-	char *p;
-	uint16_t free_space, n, off, pageno;
-	size_t temp;
-
-	p = (char *)(void *)sp;
-	n = sp[0];
-	free_space = FREESPACE(sp);
-	off = OFFSET(sp);
-
-	pageno = sp[n - 1];
-	_DIAGASSERT(off >= key->size);
-	off -= (uint16_t)key->size;
-	sp[n - 1] = off;
-	memmove(p + off, key->data, key->size);
-	_DIAGASSERT(off >= val->size);
-	off -= (uint16_t)val->size;
-	sp[n] = off;
-	memmove(p + off, val->data, val->size);
-	sp[0] = n + 2;
-	sp[n + 1] = pageno;
-	sp[n + 2] = OVFLPAGE;
-	temp = PAIRSIZE(key, val);
-	_DIAGASSERT(free_space >= temp);
-	FREESPACE(sp) = (uint16_t)(free_space - temp);
-	OFFSET(sp) = off;
-}
-
-static uint32_t *
-fetch_bitmap(HTAB *hashp, int ndx)
-{
-	if (ndx >= hashp->nmaps)
-		return (NULL);
-	if ((hashp->mapp[ndx] = malloc((size_t)hashp->BSIZE)) == NULL)
-		return (NULL);
-	if (__get_page(hashp,
-	    (char *)(void *)hashp->mapp[ndx], (uint32_t)hashp->BITMAPS[ndx], 0, 1, 1)) {
-		free(hashp->mapp[ndx]);
-		return (NULL);
-	}
-	return (hashp->mapp[ndx]);
-}
-
-#ifdef DEBUG4
-void print_chain(HTAB *, uint32_t);
-void
-print_chain(HTAB *hashp, uint32_t addr)
-{
-	BUFHEAD *bufp;
-	uint16_t *bp, oaddr;
-
-	(void)fprintf(stderr, "%d ", addr);
-	bufp = __get_buf(hashp, addr, NULL, 0);
-	bp = (uint16_t *)bufp->page;
-	while (bp[0] && ((bp[bp[0]] == OVFLPAGE) ||
-		((bp[0] > 2) && bp[2] < REAL_KEY))) {
-		oaddr = bp[bp[0] - 1];
-		(void)fprintf(stderr, "%d ", (int)oaddr);
-		bufp = __get_buf(hashp, (uint32_t)oaddr, bufp, 0);
-		bp = (uint16_t *)bufp->page;
-	}
-	(void)fprintf(stderr, "\n");
-}
-#endif
diff --git a/lib/libc/db/hash/ndbm.c b/lib/libc/db/hash/ndbm.c
deleted file mode 100644
index 1aea409b7..000000000
--- a/lib/libc/db/hash/ndbm.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*	$NetBSD: ndbm.c,v 1.23 2008/09/11 12:58:00 joerg Exp $	*/
-/*	from: NetBSD: ndbm.c,v 1.18 2004/04/27 20:03:45 kleink Exp 	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: ndbm.c,v 1.23 2008/09/11 12:58:00 joerg Exp $");
-
-/*
- * This package provides a dbm compatible interface to the new hashing
- * package described in db(3).
- */
-#include "namespace.h"
-#include <sys/param.h>
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <ndbm.h>
-#include "hash.h"
-
-/*
- * Returns:
- * 	*DBM on success
- *	 NULL on failure
- */
-DBM *
-dbm_open(const char *file, int flags, mode_t mode)
-{
-	HASHINFO info;
-	char path[MAXPATHLEN];
-
-	info.bsize = 4096;
-	info.ffactor = 40;
-	info.nelem = 1;
-	info.cachesize = 0;
-	info.hash = NULL;
-	info.lorder = 0;
-	(void)strncpy(path, file, sizeof(path) - 1);
-	(void)strncat(path, DBM_SUFFIX, sizeof(path) - strlen(path) - 1);
-	if ((flags & O_ACCMODE) == O_WRONLY) {
-		flags &= ~O_WRONLY;
-		flags |= O_RDWR;
-	}
-	return ((DBM *)__hash_open(path, flags, mode, &info, 0));
-}
-
-void
-dbm_close(DBM *db)
-{
-	(void)(db->close)(db);
-}
-
-int
-dbm_error(DBM *db)
-{
-	HTAB *hp;
-
-	hp = db->internal;
-	return (hp->err);
-}
-
-int
-dbm_clearerr(DBM *db)
-{
-	HTAB *hp;
-
-	hp = db->internal;
-	hp->err = 0;
-	return (0);
-}
-
-int
-dbm_dirfno(DBM *db)
-{
-	HTAB *hp;
-
-	hp = db->internal;
-	return hp->fp;
-}
diff --git a/lib/libc/db/hash/ndbmdatum.c b/lib/libc/db/hash/ndbmdatum.c
deleted file mode 100644
index 707140977..000000000
--- a/lib/libc/db/hash/ndbmdatum.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*	$NetBSD: ndbmdatum.c,v 1.5 2012/03/13 21:13:33 christos Exp $	*/
-/*	from: NetBSD: ndbm.c,v 1.18 2004/04/27 20:03:45 kleink Exp 	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: ndbmdatum.c,v 1.5 2012/03/13 21:13:33 christos Exp $");
-
-/*
- * This package provides a dbm compatible interface to the new hashing
- * package described in db(3).
- */
-#include "namespace.h"
-#include <sys/param.h>
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <ndbm.h>
-#include "hash.h"
-
-#ifndef datum_truncate
-#define datum_truncate(a) (a)
-#endif
-/*
- * Returns:
- *	DATUM on success
- *	NULL on failure
- */
-datum
-dbm_fetch(DBM *db, datum key)
-{
-	datum retdata;
-	int status;
-	DBT dbtkey, dbtretdata;
-
-	dbtkey.data = key.dptr;
-	dbtkey.size = key.dsize;
-	status = (db->get)(db, &dbtkey, &dbtretdata, 0);
-	if (status) {
-		dbtretdata.data = NULL;
-		dbtretdata.size = 0;
-	}
-	retdata.dptr = dbtretdata.data;
-	retdata.dsize = datum_truncate(dbtretdata.size);
-	return (retdata);
-}
-
-/*
- * Returns:
- *	DATUM on success
- *	NULL on failure
- */
-datum
-dbm_firstkey(DBM *db)
-{
-	int status;
-	datum retkey;
-	DBT dbtretkey, dbtretdata;
-
-	status = (db->seq)(db, &dbtretkey, &dbtretdata, R_FIRST);
-	if (status)
-		dbtretkey.data = NULL;
-	retkey.dptr = dbtretkey.data;
-	retkey.dsize = datum_truncate(dbtretkey.size);
-	return (retkey);
-}
-
-/*
- * Returns:
- *	DATUM on success
- *	NULL on failure
- */
-datum
-dbm_nextkey(DBM *db)
-{
-	int status;
-	datum retkey;
-	DBT dbtretkey, dbtretdata;
-
-	status = (db->seq)(db, &dbtretkey, &dbtretdata, R_NEXT);
-	if (status)
-		dbtretkey.data = NULL;
-	retkey.dptr = dbtretkey.data;
-	retkey.dsize = datum_truncate(dbtretkey.size);
-	return (retkey);
-}
-
-/*
- * Returns:
- *	 0 on success
- *	<0 failure
- */
-int
-dbm_delete(DBM *db, datum key)
-{
-	int status;
-	DBT dbtkey;
-
-	dbtkey.data = key.dptr;
-	dbtkey.size = key.dsize;
-	status = (db->del)(db, &dbtkey, 0);
-	if (status)
-		return (-1);
-	else
-		return (0);
-}
-
-/*
- * Returns:
- *	 0 on success
- *	<0 failure
- *	 1 if DBM_INSERT and entry exists
- */
-int
-dbm_store(DBM *db, datum key, datum data, int flags)
-{
-	DBT dbtkey, dbtdata;
-
-	dbtkey.data = key.dptr;
-	dbtkey.size = key.dsize;
-	dbtdata.data = data.dptr;
-	dbtdata.size = data.dsize;
-	return ((db->put)(db, &dbtkey, &dbtdata,
-	    (u_int)((flags == DBM_INSERT) ? R_NOOVERWRITE : 0)));
-}
diff --git a/lib/libc/db/hash/page.h b/lib/libc/db/hash/page.h
deleted file mode 100644
index 40dc77d02..000000000
--- a/lib/libc/db/hash/page.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*	$NetBSD: page.h,v 1.8 2008/08/26 21:18:38 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)page.h	8.2 (Berkeley) 5/31/94
- */
-
-/*
- * Definitions for hashing page file format.
- */
-
-/*
- * routines dealing with a data page
- *
- * page format:
- *	+------------------------------+
- * p	| n | keyoff | datoff | keyoff |
- * 	+------------+--------+--------+
- *	| datoff | free  |  ptr  | --> |
- *	+--------+---------------------+
- *	|	 F R E E A R E A       |
- *	+--------------+---------------+
- *	|  <---- - - - | data          |
- *	+--------+-----+----+----------+
- *	|  key   | data     | key      |
- *	+--------+----------+----------+
- *
- * Pointer to the free space is always:  p[p[0] + 2]
- * Amount of free space on the page is:  p[p[0] + 1]
- */
-
-/*
- * How many bytes required for this pair?
- *	2 shorts in the table at the top of the page + room for the
- *	key and room for the data
- *
- * We prohibit entering a pair on a page unless there is also room to append
- * an overflow page. The reason for this it that you can get in a situation
- * where a single key/data pair fits on a page, but you can't append an
- * overflow page and later you'd have to split the key/data and handle like
- * a big pair.
- * You might as well do this up front.
- */
-
-#define	PAIRSIZE(K,D)	(2*sizeof(uint16_t) + (K)->size + (D)->size)
-#define BIGOVERHEAD	(4*sizeof(uint16_t))
-#define KEYSIZE(K)	(4*sizeof(uint16_t) + (K)->size);
-#define OVFLSIZE	(2*sizeof(uint16_t))
-#define FREESPACE(P)	((P)[(P)[0]+1])
-#define	OFFSET(P)	((P)[(P)[0]+2])
-#define PAIRFITS(P,K,D) \
-	(((P)[2] >= REAL_KEY) && \
-	    (PAIRSIZE((K),(D)) + OVFLSIZE) <= FREESPACE((P)))
-#define PAGE_META(N)	(((N)+3) * sizeof(uint16_t))
-
-typedef struct {
-	BUFHEAD *newp;
-	BUFHEAD *oldp;
-	BUFHEAD *nextp;
-	uint16_t next_addr;
-}       SPLIT_RETURN;
diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc
deleted file mode 100644
index f45c41630..000000000
--- a/lib/libc/db/man/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.10 2004/04/30 21:13:23 kleink Exp $
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-.PATH: ${.CURDIR}/db/man
-
-MAN+=	btree.3 dbm_clearerr.3 dbopen.3 hash.3 recno.3 mpool.3
-MLINKS+= dbm_clearerr.3 dbm_close.3 dbm_clearerr.3 dbm_delete.3
-MLINKS+= dbm_clearerr.3 dbm_dirfno.3 dbm_clearerr.3 dbm_error.3
-MLINKS+= dbm_clearerr.3 dbm_fetch.3 dbm_clearerr.3 dbm_firstkey.3
-MLINKS+= dbm_clearerr.3 dbm_nextkey.3 dbm_clearerr.3 dbm_open.3
-MLINKS+= dbm_clearerr.3 dbm_store.3 dbm_clearerr.3 ndbm.3
-MLINKS+= dbopen.3 db.3
-MLINKS+= mpool.3 mpool_open.3 mpool.3 mpool_filter.3 mpool.3 mpool_new.3
-MLINKS+= mpool.3 mpool_get.3 mpool.3 mpool_put.3 mpool.3 mpool_sync.3
-MLINKS+= mpool.3 mpool_close.3
diff --git a/lib/libc/db/man/btree.3 b/lib/libc/db/man/btree.3
deleted file mode 100644
index c226251c2..000000000
--- a/lib/libc/db/man/btree.3
+++ /dev/null
@@ -1,254 +0,0 @@
-.\"	$NetBSD: btree.3,v 1.13 2012/10/13 15:28:33 njoly Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)btree.3	8.4 (Berkeley) 8/18/94
-.\"
-.Dd April 17, 2003
-.Dt BTREE 3
-.Os
-.Sh NAME
-.Nm btree
-.Nd btree database access method
-.Sh SYNOPSIS
-.In sys/types.h
-.In db.h
-.Sh DESCRIPTION
-The routine
-.Fn dbopen
-is the library interface to database files.
-One of the supported file formats is btree files.
-The general description of the database access methods is in
-.Xr dbopen 3 ,
-this manual page describes only the btree specific information.
-.Pp
-The btree data structure is a sorted, balanced tree structure storing
-associated key/data pairs.
-.Pp
-The btree access method specific data structure provided to
-.Fn dbopen
-is defined in the
-.In db.h
-include file as follows:
-.Bd -literal
-typedef struct {
-	u_long flags;
-	u_int cachesize;
-	int maxkeypage;
-	int minkeypage;
-	u_int psize;
-	int (*compare)(const DBT *key1, const DBT *key2);
-	size_t (*prefix)(const DBT *key1, const DBT *key2);
-	int lorder;
-} BTREEINFO;
-.Ed
-.Pp
-The elements of this structure are as follows:
-.Bl -tag -width maxkeypagex
-.It Fa flags
-The flag value is specified by or'ing any of the following values:
-.Bl -tag -width R_DUP -offset indent
-.It Dv R_DUP
-Permit duplicate keys in the tree, i.e. permit insertion if the key to
-be inserted already exists in the tree.
-The default behavior, as described in
-.Xr dbopen 3 ,
-is to overwrite a matching key when inserting a new key or to fail if
-the
-.Dv R_NOOVERWRITE
-flag is specified.
-The
-.Dv R_DUP
-flag is overridden by the
-.Dv R_NOOVERWRITE
-flag, and if the
-.Dv R_NOOVERWRITE
-flag is specified, attempts to insert duplicate keys into the tree
-will fail.
-.Pp
-If the database contains duplicate keys, the order of retrieval of
-key/data pairs is undefined if the
-.Em get
-routine is used, however,
-.Em seq
-routine calls with the
-.Dv R_CURSOR
-flag set will always return the logical
-.Dq first
-of any group of duplicate keys.
-.El
-.It Fa cachesize
-A suggested maximum size (in bytes) of the memory cache.
-This value is
-.Em only
-advisory, and the access method will allocate more memory rather than
-fail.
-Since every search examines the root page of the tree, caching the
-most recently used pages substantially improves access time.
-In addition, physical writes are delayed as long as possible, so a
-moderate cache can reduce the number of I/O operations significantly.
-Obviously, using a cache increases (but only increases) the likelihood
-of corruption or lost data if the system crashes while a tree is being
-modified.
-If
-.Fa cachesize
-is 0 (no size is specified) a default cache is used.
-.It Fa maxkeypage
-The maximum number of keys which will be stored on any single page.
-Not currently implemented.
-.\" The maximum number of keys which will be stored on any single page.
-.\" Because of the way the btree data structure works,
-.\" .Fa maxkeypage
-.\" must always be greater than or equal to 2.
-.\" If
-.\" .Fa maxkeypage
-.\" is 0 (no maximum number of keys is specified) the page fill factor is
-.\" made as large as possible (which is almost invariably what is wanted).
-.It Fa minkeypage
-The minimum number of keys which will be stored on any single page.
-This value is used to determine which keys will be stored on overflow
-pages, i.e., if a key or data item is longer than the pagesize divided
-by the
-.Fa minkeypage
-value, it will be stored on overflow pages instead of in the page
-itself.
-If
-.Fa minkeypage
-is 0 (no minimum number of keys is specified) a value of 2 is used.
-.It Fa psize
-Page size is the size (in bytes) of the pages used for nodes in the
-tree.
-The minimum page size is 512 bytes and the maximum page size is 64K.
-If
-.Fa psize
-is 0 (no page size is specified) a page size is chosen based on the
-underlying file system I/O block size.
-.It Fa compare
-Compare is the key comparison function.
-It must return an integer less than, equal to, or greater than zero if
-the first key argument is considered to be respectively less than,
-equal to, or greater than the second key argument.
-The same comparison function must be used on a given tree every time
-it is opened.
-If
-.Fa compare
-is
-.Dv NULL
-(no comparison function is specified), the keys are compared
-lexically, with shorter keys considered less than longer keys.
-.It Fa prefix
-Prefix is the prefix comparison function.
-If specified, this routine must return the number of bytes of the
-second key argument which are necessary to determine that it is
-greater than the first key argument.
-If the keys are equal, the key length should be returned.
-Note, the usefulness of this routine is very data dependent, but, in
-some data sets can produce significantly reduced tree sizes and search
-times.
-If
-.Fa prefix
-is
-.Dv NULL
-(no prefix function is specified),
-.Em and
-no comparison function is specified, a default lexical comparison
-routine is used.
-If
-.Fa prefix
-is
-.Dv NULL
-and a comparison routine is specified, no prefix comparison is done.
-.It Fa lorder
-The byte order for integers in the stored database metadata.
-The number should represent the order as an integer; for example,
-big endian order would be the number 4,321.
-If
-.Fa lorder
-is 0 (no order is specified) the current host order is used.
-.El
-.Pp
-If the file already exists (and the
-.Dv O_TRUNC
-flag is not specified), the values specified for the parameters flags,
-lorder and psize are ignored in favor of the values used when the tree
-was created.
-.Pp
-Forward sequential scans of a tree are from the least key to the
-greatest.
-.Pp
-Space freed up by deleting key/data pairs from the tree is never
-reclaimed, although it is normally made available for reuse.
-This means that the btree storage structure is grow-only.
-The only solutions are to avoid excessive deletions, or to create a
-fresh tree periodically from a scan of an existing one.
-.Pp
-Searches, insertions, and deletions in a btree will all complete in
-O lg base N where base is the average fill factor.
-Often, inserting ordered data into btrees results in a low fill
-factor.
-This implementation has been modified to make ordered insertion the
-best case, resulting in a much better than normal page fill factor.
-.Sh ERRORS
-The
-.Nm
-access method routines may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr dbopen 3 .
-.Sh SEE ALSO
-.Xr dbopen 3 ,
-.Xr hash 3 ,
-.Xr mpool 3 ,
-.Xr recno 3
-.Rs
-.%T "The Ubiquitous B-tree"
-.%A "Douglas Comer"
-.%J "ACM Comput. Surv."
-.%V 2
-.%N 11
-.%D June 1979
-.%P 121-138
-.Re
-.Rs
-.%T "Prefix B-trees"
-.%A "Bayer"
-.%A "Unterauer"
-.%J "ACM Transactions on Database Systems"
-.%V Vol. 2
-.%N 1
-.%D March 1977
-.%P 11-26
-.Re
-.Rs
-.%B "The Art of Computer Programming Vol. 3: Sorting and Searching"
-.%A "D.E. Knuth"
-.%D 1968
-.%P 471-480
-.Re
-.Sh BUGS
-Only big and little endian byte order is supported.
diff --git a/lib/libc/db/man/dbm_clearerr.3 b/lib/libc/db/man/dbm_clearerr.3
deleted file mode 100644
index d9f06721c..000000000
--- a/lib/libc/db/man/dbm_clearerr.3
+++ /dev/null
@@ -1,306 +0,0 @@
-.\"	$NetBSD: dbm_clearerr.3,v 1.5 2010/05/05 06:55:57 jruoho Exp $
-.\"
-.\" Copyright (c) 2004 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.
-.\"
-.Dd May 5, 2010
-.Dt DBM_CLEARERR 3
-.Os
-.Sh NAME
-.Nm dbm_clearerr ,
-.Nm dbm_close ,
-.Nm dbm_delete ,
-.Nm dbm_dirfno ,
-.Nm dbm_error ,
-.Nm dbm_fetch ,
-.Nm dbm_firstkey ,
-.Nm dbm_nextkey ,
-.Nm dbm_open ,
-.Nm dbm_store ,
-.Nm ndbm
-.Nd database functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ndbm.h
-.Ft int
-.Fn dbm_clearerr "DBM *db"
-.Ft void
-.Fn dbm_close "DBM *db"
-.Ft int
-.Fn dbm_delete "DBM *db" "datum key"
-.Ft int
-.Fn dbm_dirfno "DBM *db"
-.Ft int
-.Fn dbm_error "DBM *db"
-.Ft datum
-.Fn dbm_fetch "DBM *db" "datum key"
-.Ft datum
-.Fn dbm_firstkey "DBM *db"
-.Ft datum
-.Fn dbm_nextkey "DBM *db"
-.Ft DBM *
-.Fn dbm_open "const char *file" "int open_flags" "mode_t file_mode"
-.Ft int
-.Fn dbm_store "DBM *db" "datum key" "datum content" "int store_mode"
-.Sh DESCRIPTION
-The
-.Nm ndbm
-facility provides access to hash database files.
-.Pp
-Two data types are fundamental to the
-.Nm ndbm
-facility.
-.Fa DBM
-serves as a handle to a database.
-It is an opaque type.
-.Pp
-The other data type is
-.Fa datum ,
-which is a structure type which includes the following members:
-.Bd -literal -offset indent
-void *  dptr
-size_t  dsize
-.Ed
-.Pp
-A
-.Fa datum
-is thus given by
-.Fa dptr
-pointing at an object of
-.Fa dsize
-bytes in length.
-.Pp
-The
-.Fn dbm_open
-function opens a database.
-The
-.Fa file
-argument is the pathname which the actual database file pathname
-is based on.
-This implementation uses a single file with the suffix
-.Pa .db
-appended to
-.Fa file .
-The
-.Fa open_flags
-argument has the same meaning as the
-.Fa flags
-argument to
-.Xr open 2
-except that when opening a database for write-only access the file
-is opened for read/write access, and the
-.Dv O_APPEND
-flag must not be specified.
-The
-.Fa file_mode
-argument has the same meaning as the
-.Fa mode
-argument to
-.Xr open 2 .
-.Pp
-For the following functions, the
-.Fa db
-argument is a handle previously returned by a call to
-.Fn dbm_open .
-.Pp
-The
-.Fn dbm_close
-function closes a database.
-.Pp
-The
-.Fn dbm_fetch
-function retrieves a record from the database.
-The
-.Fa key
-argument is a
-.Fa datum
-that identifies the record to be fetched.
-.Pp
-The
-.Fn dbm_store
-function stores a record into the database.
-The
-.Fa key
-argument is a
-.Fa datum
-that identifies the record to be stored.
-The
-.Fa content
-argument is a
-.Fa datum
-that specifies the value of the record to be stored.
-The
-.Fa store_mode
-argument specifies the behavior of
-.Fn dbm_store
-if a record matching
-.Fa key
-is already present in the database,
-.Fa db .
-.Fa store_mode
-must be one of the following:
-.Bl -tag -width DBM_REPLACEXX -offset indent
-.It Dv DBM_INSERT
-If a record matching
-.Fa key
-is already present, it is left unchanged.
-.It Dv DBM_REPLACE
-If a record matching
-.Fa key
-is already present, its value is replaced by
-.Fa content .
-.El
-.Pp
-If no record matching
-.Fa key
-is present, a new record is inserted regardless of
-.Fa store_mode .
-.Pp
-The
-.Fn dbm_delete
-function deletes a record from the database.
-The
-.Fa key
-argument is a
-.Fa datum
-that identifies the record to be deleted.
-.Pp
-The
-.Fn dbm_firstkey
-function returns the first key in the database.
-.Pp
-The
-.Fn dbm_nextkey
-function returns the next key in the database.
-In order to be meaningful, it must be preceded by a call to
-.Fn dbm_firstkey .
-.Pp
-The
-.Fn dbm_error
-function returns the error indicator of the database.
-.Pp
-The
-.Fn dbm_clearerr
-function clears the error indicator of the database.
-.Pp
-The
-.Fn dbm_dirfno
-function returns the file descriptor of the underlying database file.
-.Sh IMPLEMENTATION NOTES
-The
-.Nm ndbm
-facility is implemented on top of the
-.Xr hash 3
-access method of the
-.Xr db 3
-database facility.
-.Sh RETURN VALUES
-The
-.Fn dbm_open
-function returns a pointer to a
-.Fa DBM
-when successful; otherwise a null pointer is returned.
-.Pp
-The
-.Fn dbm_close
-function returns no value.
-.Pp
-The
-.Fn dbm_fetch
-function returns a content
-.Fa datum ;
-if no record matching
-.Fa key
-was found or if an error occured, its
-.Fa dptr
-member is a null pointer.
-.Pp
-The
-.Fn dbm_store
-function returns 0 when then record was successfully inserted;
-it returns 1 when called with
-.Fa store_mode
-being
-.Dv DBM_INSERT
-and a record matching
-.Fa key
-is already present;
-otherwise a negative value is returned.
-.Pp
-The
-.Fn dbm_delete
-function returns 0 when the record was successfully deleted;
-otherwise a negative value is returned.
-.Pp
-The
-.Fn dbm_firstkey
-and
-.Fn dbm_nextkey
-functions return a key
-.Fa datum .
-When the end of the database is reached or if an error occured, its
-.Fa dptr
-member is a null pointer.
-.Pp
-The
-.Fn dbm_error
-function returns 0 if the error indicator is clear;
-if the error indicator is set a non-zero value is returned.
-.Pp
-The
-.Fn dbm_clearerr
-function always returns 0.
-.Pp
-The
-.Fn dbm_dirfno
-function returns the file descriptor of the underlying database file.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr open 2 ,
-.Xr db 3 ,
-.Xr hash 3
-.Sh STANDARDS
-The
-.Fn dbm_clearerr ,
-.Fn dbm_close ,
-.Fn dbm_delete ,
-.Fn dbm_error ,
-.Fn dbm_fetch ,
-.Fn dbm_firstkey ,
-.Fn dbm_nextkey ,
-.Fn dbm_open ,
-and
-.Fn dbm_store
-functions conform to
-.St -xpg4.2
-and
-.St -susv2 .
-The
-.Fn dbm_dirfno
-function is an extension.
diff --git a/lib/libc/db/man/dbopen.3 b/lib/libc/db/man/dbopen.3
deleted file mode 100644
index 1db9a25f6..000000000
--- a/lib/libc/db/man/dbopen.3
+++ /dev/null
@@ -1,538 +0,0 @@
-.\"	$NetBSD: dbopen.3,v 1.19 2010/12/16 12:08:16 jruoho Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)dbopen.3	8.5 (Berkeley) 1/2/94
-.\"
-.Dd December 16, 2010
-.Dt DBOPEN 3
-.Os
-.Sh NAME
-.Nm dbopen ,
-.Nm db
-.Nd database access methods
-.Sh SYNOPSIS
-.In sys/types.h
-.In limits.h
-.In db.h
-.In fcntl.h
-.Ft DB *
-.Fn dbopen "const char *file" "int flags" "mode_t mode" \
-"DBTYPE type" "const void *openinfo"
-.Sh DESCRIPTION
-.Nm
-is the library interface to database files.
-The supported file formats are btree, hashed, and UNIX file oriented.
-The btree format is a representation of a sorted, balanced tree
-structure.
-The hashed format is an extensible, dynamic hashing scheme.
-The flat-file format is a byte stream file with fixed or variable
-length records.
-The formats and file format specific information are described in
-detail in their respective manual pages
-.Xr btree 3 ,
-.Xr hash 3 ,
-and
-.Xr recno 3 .
-.Pp
-The
-.Fn dbopen
-function opens
-.Fa file
-for reading and/or writing.
-Files never intended to be preserved on disk may be created by setting
-the file parameter to
-.Dv NULL .
-.Pp
-The
-.Fa flags
-and
-.Fa mode
-arguments are as specified to the
-.Xr open 2
-routine, however, only the
-.Dv O_CREAT ,
-.Dv O_EXCL ,
-.Dv O_EXLOCK ,
-.Dv O_NONBLOCK ,
-.Dv O_RDONLY ,
-.Dv O_RDWR ,
-.Dv O_SHLOCK ,
-and
-.Dv O_TRUNC
-flags are meaningful.
-(Note, opening a database file
-.Dv O_WRONLY
-is not possible.)
-.\"Three additional options may be specified by or'ing
-.\"them into the
-.\".Fa flags
-.\"argument.
-.\".Pp
-.\".Dv DB_LOCK
-.\"Do the necessary locking in the database to support concurrent access.
-.\"If concurrent access isn't needed or the database is read-only this
-.\"flag should not be set, as it tends to have an associated performance
-.\"penalty.
-.\".Pp
-.\".Dv DB_SHMEM
-.\"Place the underlying memory pool used by the database in shared
-.\"memory.
-.\"Necessary for concurrent access.
-.\".Pp
-.\".Dv DB_TXN
-.\"Support transactions in the database.
-.\"The
-.\".Dv DB_LOCK
-.\"and
-.\".Dv DB_SHMEM
-.\"flags must be set as well.
-.Pp
-The
-.Fa type
-argument is of type
-.Vt DBTYPE
-(as defined in the
-.In db.h
-include file) and may be set to
-.Dv DB_BTREE ,
-.Dv DB_HASH ,
-or
-.Dv DB_RECNO .
-.Pp
-The
-.Fa openinfo
-argument is a pointer to an access method specific structure described
-in the access method's manual page.
-If
-.Fa openinfo
-is
-.Dv NULL ,
-each access method will use defaults appropriate for the system and
-the access method.
-.Ss The DB Structure
-The
-.Fn dbopen
-function returns a pointer to a DB structure on success and
-.Dv NULL
-on error.
-The DB structure is defined in the
-.In db.h
-include file, and contains at least the following fields:
-.Bd -literal -offset indent
-typedef struct {
-	DBTYPE type;
-	int (*close)(const DB *db);
-	int (*del)(const DB *db, const DBT *key, u_int flags);
-	int (*fd)(const DB *db);
-	int (*get)(const DB *db, DBT *key, DBT *data, u_int flags);
-	int (*put)(const DB *db, DBT *key, const DBT *data,
-	    u_int flags);
-	int (*sync)(const DB *db, u_int flags);
-	int (*seq)(const DB *db, DBT *key, DBT *data, u_int flags);
-} DB;
-.Ed
-.Pp
-These elements describe a database type and a set of functions
-performing various actions.
-These functions take a pointer to a structure as returned by
-.Nm ,
-and sometimes one or more pointers to key/data structures and a flag
-value.
-.Bl -tag -width closex -offset indent
-.It Fa type
-The type of the underlying access method (and file format).
-.It Fa close
-A pointer to a routine to flush any cached information to disk, free
-any allocated resources, and close the underlying file(s).
-Since key/data pairs may be cached in memory, failing to sync the file
-with a
-.Fa close
-or
-.Fa sync
-function may result in inconsistent or lost information.
-.Fa close
-routines return \-1 on error (setting
-.Va errno )
-and 0 on success.
-.It Fa del
-A pointer to a routine to remove key/data pairs from the database.
-.Pp
-The parameter
-.Fa flag
-may be set to the following value:
-.Bl -tag -width R_CURSORX
-.It Dv R_CURSOR
-Delete the record referenced by the cursor.
-The cursor must have previously been initialized.
-.El
-.Pp
-.Fa delete
-routines return \-1 on error (setting
-.Va errno ) ,
-0 on success, and 1 if the specified
-.Fa key
-was not in the file.
-.It Fa fd
-A pointer to a routine which returns a file descriptor representative
-of the underlying database.
-A file descriptor referencing the same file will be returned to all
-processes which call
-.Nm
-with the same
-.Fa file
-name.
-This file descriptor may be safely used as an argument to the
-.Xr fcntl 2
-and
-.Xr flock 2
-locking functions.
-The file descriptor is not necessarily associated with any of the
-underlying files used by the access method.
-No file descriptor is available for in memory databases.
-.Fa fd
-routines return \-1 on error (setting
-.Va errno ) ,
-and the file descriptor on success.
-.It Fa get
-A pointer to a routine which is the interface for keyed retrieval from
-the database.
-The address and length of the data associated with the specified
-.Fa key
-are returned in the structure referenced by
-.Fa data .
-.Fa get
-routines return \-1 on error (setting
-.Va errno ) ,
-0 on success, and 1 if the
-.Fa key
-was not in the file.
-.It Fa put
-A pointer to a routine to store key/data pairs in the database.
-.Pp
-The parameter
-.Fa flag
-may be set to one of the following values:
-.Bl -tag -width R_NOOVERWRITEX
-.It Dv R_CURSOR
-Replace the key/data pair referenced by the cursor.
-The cursor must have previously been initialized.
-.It Dv R_IAFTER
-Append the data immediately after the data referenced by
-.Fa key ,
-creating a new key/data pair.
-The record number of the appended key/data pair is returned in the
-.Fa key
-structure.
-(Applicable only to the
-.Dv DB_RECNO
-access method.)
-.It Dv R_IBEFORE
-Insert the data immediately before the data referenced by
-.Fa key ,
-creating a new key/data pair.
-The record number of the inserted key/data pair is returned in the
-.Fa key
-structure.
-(Applicable only to the
-.Dv DB_RECNO
-access method.)
-.It Dv R_NOOVERWRITE
-Enter the new key/data pair only if the key does not previously
-exist.
-.It Dv R_SETCURSOR
-Store the key/data pair, setting or initializing the position of the
-cursor to reference it.
-(Applicable only to the
-.Dv DB_BTREE
-and
-.Dv DB_RECNO
-access methods.)
-.El
-.Pp
-.Dv R_SETCURSOR
-is available only for the
-.Dv DB_BTREE
-and
-.Dv DB_RECNO
-access methods because it implies that the keys have an inherent order
-which does not change.
-.Pp
-.Dv R_IAFTER
-and
-.Dv R_IBEFORE
-are available only for the
-.Dv DB_RECNO
-access method because they each imply that the access method is able
-to create new keys.
-This is only true if the keys are ordered and independent, record
-numbers for example.
-.Pp
-The default behavior of the
-.Fa put
-routines is to enter the new key/data pair, replacing any previously
-existing key.
-.Pp
-.Fa put
-routines return \-1 on error (setting
-.Va errno ) ,
-0 on success, and 1 if the
-.Dv R_NOOVERWRITE
-.Fa flag
-was set and the key already exists in the file.
-.It Fa seq
-A pointer to a routine which is the interface for sequential
-retrieval from the database.
-The address and length of the key are returned in the structure
-referenced by
-.Fa key ,
-and the address and length of the data are returned in the
-structure referenced by
-.Fa data .
-.Pp
-Sequential key/data pair retrieval may begin at any time, and the
-position of the
-.Dq cursor
-is not affected by calls to the
-.Fa del ,
-.Fa get ,
-.Fa put ,
-or
-.Fa sync
-routines.
-Modifications to the database during a sequential scan will be
-reflected in the scan, i.e., records inserted behind the cursor will
-not be returned while records inserted in front of the cursor will be
-returned.
-.Pp
-The flag value
-.Em must
-be set to one of the following values:
-.Bl -tag -width R_CURSORX
-.It Dv R_CURSOR
-The data associated with the specified key is returned.
-This differs from the
-.Fa get
-routines in that it sets or initializes the cursor to the location of
-the key as well.
-(Note, for the
-.Dv DB_BTREE
-access method, the returned key is not necessarily an exact match for
-the specified key.
-The returned key is the smallest key greater than or equal to the
-specified key, permitting partial key matches and range searches.)
-.It Dv R_FIRST
-The first key/data pair of the database is returned, and the cursor
-is set or initialized to reference it.
-.It Dv R_LAST
-The last key/data pair of the database is returned, and the cursor
-is set or initialized to reference it.
-(Applicable only to the
-.Dv DB_BTREE
-and
-.Dv DB_RECNO
-access methods.)
-.It Dv R_NEXT
-Retrieve the key/data pair immediately after the cursor.
-If the cursor is not yet set, this is the same as the
-.Dv R_FIRST
-flag.
-.It Dv R_PREV
-Retrieve the key/data pair immediately before the cursor.
-If the cursor is not yet set, this is the same as the
-.Dv R_LAST
-flag.
-(Applicable only to the
-.Dv DB_BTREE
-and
-.Dv DB_RECNO
-access methods.)
-.El
-.Pp
-.Dv R_LAST
-and
-.Dv R_PREV
-are available only for the
-.Dv DB_BTREE
-and
-.Dv DB_RECNO
-access methods because they each imply that the keys have an inherent
-order which does not change.
-.Pp
-.Fa seq
-routines return \-1 on error (setting
-.Va errno ) ,
-0 on success and 1 if there are no key/data pairs less than or greater
-than the specified or current key.
-If the
-.Dv DB_RECNO
-access method is being used, and if the database file is a character
-special file and no complete key/data pairs are currently available,
-the
-.Fa seq
-routines return 2.
-.It Fa sync
-A pointer to a routine to flush any cached information to disk.
-If the database is in memory only, the
-.Fa sync
-routine has no effect and will always succeed.
-.Pp
-The flag value may be set to the following value:
-.Bl -tag -width ".Dv R_RECNOSYNC"
-.It Dv R_RECNOSYNC
-If the
-.Dv DB_RECNO
-access method is being used, this flag causes the sync routine to
-apply to the btree file which underlies the recno file, not the recno
-file itself.
-(See the
-.Fa bfname
-field of the
-.Xr recno 3
-manual page for more information.)
-.El
-.Pp
-.Fa sync
-routines return \-1 on error (setting
-.Va errno )
-and 0 on success.
-.El
-.Ss Key/data Pairs
-Access to all file types is based on key/data pairs.
-Both keys and data are represented by the following data structure:
-.Bd -literal -offset indent
-typedef struct {
-	void *data;
-	size_t size;
-} DBT;
-.Ed
-.Pp
-The elements of the DBT structure are defined as follows:
-.Bl -tag -width datax -offset indent
-.It Fa data
-A pointer to a byte string.
-.It Fa size
-The length of the byte string.
-.El
-.Pp
-Key and data byte strings may reference strings of essentially
-unlimited length although any two of them must fit into available
-memory at the same time.
-It should be noted that the access methods provide no guarantees about
-byte string alignment.
-.Sh ERRORS
-The
-.Nm
-routine may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr open 2
-and
-.Xr malloc 3
-or the following:
-.Bl -tag -width Er
-.It Er EFTYPE
-A file is incorrectly formatted.
-.It Er EINVAL
-A parameter has been specified (hash function, pad byte, etc.) that is
-incompatible with the current file specification or which is not
-meaningful for the function (for example, use of the cursor without
-prior initialization) or there is a mismatch between the version
-number of file and the software.
-.It Er EFBIG
-The key could not be inserted due to limitations in the DB file format
-(e.g., a hash database was out of overflow pages).
-.El
-.Pp
-The
-.Fa close
-routines may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr close 2 ,
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr free 3 ,
-or
-.Xr fsync 2 .
-.Pp
-The
-.Fa del ,
-.Fa get ,
-.Fa put ,
-and
-.Fa seq
-routines may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr free 3 ,
-or
-.Xr malloc 3 .
-.Pp
-The
-.Fa fd
-routines will fail and set
-.Va errno
-to
-.Er ENOENT
-for in memory databases.
-.Pp
-The
-.Fa sync
-routines may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr fsync 2 .
-.Sh SEE ALSO
-.Xr btree 3 ,
-.Xr hash 3 ,
-.Xr mpool 3 ,
-.Xr recno 3
-.Pp
-.Rs
-.%T LIBTP: Portable, Modular Transactions for UNIX
-.%A Margo Seltzer
-.%A Michael Olson
-.%I USENIX Association
-.%B Proceedings of the 1992 Winter USENIX Technical Conference
-.%D 1992
-.%P 9-25
-.Re
-.Sh BUGS
-The typedef DBT is a mnemonic for
-.Dq data base thang ,
-and was used because no one could think of a reasonable name that
-wasn't already used.
-.Pp
-The file descriptor interface is a kludge and will be deleted in a
-future version of the interface.
-.Pp
-None of the access methods provide any form of concurrent access,
-locking, or transactions.
diff --git a/lib/libc/db/man/hash.3 b/lib/libc/db/man/hash.3
deleted file mode 100644
index eaac286cb..000000000
--- a/lib/libc/db/man/hash.3
+++ /dev/null
@@ -1,172 +0,0 @@
-.\"	$NetBSD: hash.3,v 1.14 2010/12/16 11:57:20 jruoho Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)hash.3	8.6 (Berkeley) 8/18/94
-.\"
-.Dd December 16, 2010
-.Dt HASH 3
-.Os
-.Sh NAME
-.Nm hash
-.Nd hash database access method
-.Sh SYNOPSIS
-.In sys/types.h
-.In db.h
-.Sh DESCRIPTION
-The routine
-.Fn dbopen
-is the library interface to database files.
-One of the supported file formats is hash files.
-The general description of the database access methods is in
-.Xr dbopen 3 ,
-this manual page describes only the hash specific information.
-.Pp
-The hash data structure is an extensible, dynamic hashing scheme.
-.Pp
-The access method specific data structure provided to
-.Fn dbopen
-is defined in the
-.In db.h
-header as follows:
-.Bd -literal -offset indent
-typedef struct {
-	u_int bsize;
-	u_int ffactor;
-	u_int nelem;
-	u_int cachesize;
-	uint32_t (*hash)(const void *, size_t);
-	int lorder;
-} HASHINFO;
-.Ed
-.Pp
-The elements of this structure are as follows:
-.Bl -tag -width cachesizex
-.It Fa bsize
-.Fa bsize
-defines the hash table bucket size, and defaults to 4096 for in-memory tables.
-If
-.Fa bsize
-is 0 (no bucket size is specified) a bucket size is chosen based on the
-underlying file system I/O block size.
-It may be preferable to increase the page size for disk-resident
-tables and tables with large data items.
-.It Fa ffactor
-.Fa ffactor
-indicates a desired density within the hash table.
-It is an approximation of the number of keys allowed to accumulate in
-any one bucket, determining when the hash table grows or shrinks.
-The default value is 8.
-.It Fa nelem
-.Fa nelem
-is an estimate of the final size of the hash table.
-If not set or set too low, hash tables will expand gracefully as keys
-are entered, although a slight performance degradation may be
-noticed.
-The default value is 1.
-.It Fa cachesize
-A suggested maximum size, in bytes, of the memory cache.
-This value is
-.Em only
-advisory, and the access method will allocate more memory rather
-than fail.
-.It Fa hash
-.Fa hash
-is a user defined hash function.
-Since no hash function performs equally well on all possible data, the
-user may find that the built-in hash function does poorly on a
-particular data set.
-User specified hash functions must take two arguments (a pointer to a
-byte string and a length) and return a 32-bit quantity to be used as
-the hash value.
-.It Fa lorder
-The byte order for integers in the stored database metadata.
-The number should represent the order as an integer; for example,
-big endian order would be the number 4,321.
-If
-.Fa lorder
-is 0 (no order is specified) the current host order is used.
-If the file already exists, the specified value is ignored and the
-value specified when the tree was created is used.
-.El
-.Pp
-If the file already exists (and the
-.Dv O_TRUNC
-flag is not specified), the values specified for the parameters
-.Fa bsize ,
-.Fa ffactor ,
-.Fa lorder ,
-and
-.Fa nelem
-are ignored and the values specified when the tree was created are
-used.
-.Pp
-If a hash function is specified,
-.Fn hash_open
-will attempt to determine if the hash function specified is the same
-as the one with which the database was created, and will fail if it is
-not.
-.\".Pp
-.\"Backward compatible interfaces to the routines described in
-.\".Xr dbm 3 ,
-.\"and
-.\".Xr ndbm 3
-.\"are provided, however these interfaces are not compatible with
-.\"previous file formats.
-.Sh ERRORS
-The
-.Nm
-access method routines may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr dbopen 3 .
-.Sh SEE ALSO
-.Xr btree 3 ,
-.Xr dbopen 3 ,
-.Xr mpool 3 ,
-.Xr recno 3
-.Pp
-.Rs
-.%T Dynamic Hash Tables
-.%A Per-Ake Larson
-.%J Communications of the ACM
-.%D April 1988
-.%N Issue 4
-.%V Volume 31
-.Re
-.Rs
-.%T A New Hash Package for UNIX
-.%A Margo Seltzer
-.%I USENIX Association
-.%B Proceedings of the 1991 Winter USENIX Technical Conference
-.%D January 1991
-.%P 173-184
-.%U http://www.usenix.org/publications/library/proceedings/seltzer2.pdf
-.Re
-.Sh BUGS
-Only big and little endian byte order is supported.
diff --git a/lib/libc/db/man/mpool.3 b/lib/libc/db/man/mpool.3
deleted file mode 100644
index 32673f90f..000000000
--- a/lib/libc/db/man/mpool.3
+++ /dev/null
@@ -1,226 +0,0 @@
-.\"	$NetBSD: mpool.3,v 1.10 2010/12/16 11:49:35 jruoho Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)mpool.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd December 16, 2010
-.Dt MPOOL 3
-.Os
-.Sh NAME
-.Nm mpool ,
-.Nm mpool_open ,
-.Nm mpool_filter ,
-.Nm mpool_new ,
-.Nm mpool_get ,
-.Nm mpool_put ,
-.Nm mpool_sync ,
-.Nm mpool_close
-.Nd shared memory buffer pool
-.Sh SYNOPSIS
-.In db.h
-.In mpool.h
-.Ft MPOOL *
-.Fn mpool_open "DBT *key" "int fd" "pgno_t pagesize" "pgno_t maxcache"
-.Ft void
-.Fn mpool_filter "MPOOL *mp" "void (*pgin)(void *, pgno_t, void *)" \
-"void (*pgout)(void *, pgno_t, void *)" "void *pgcookie"
-.Ft void *
-.Fn mpool_new "MPOOL *mp" "pgno_t *pgnoaddr"
-.Ft void *
-.Fn mpool_get "MPOOL *mp" "pgno_t pgno" "u_int flags"
-.Ft int
-.Fn mpool_put "MPOOL *mp" "void *pgaddr" "u_int flags"
-.Ft int
-.Fn mpool_sync "MPOOL *mp"
-.Ft int
-.Fn mpool_close "MPOOL *mp"
-.Sh DESCRIPTION
-.Nm
-is the library interface intended to provide page oriented buffer
-management of files.
-The buffers may be shared between processes.
-.Pp
-The function
-.Fn mpool_open
-initializes a memory pool.
-The
-.Fa key
-argument is the byte string used to negotiate between multiple
-processes wishing to share buffers.
-If the file buffers are mapped in shared memory, all processes using
-the same key will share the buffers.
-If
-.Fa key
-is
-.Dv NULL ,
-the buffers are mapped into private memory.
-The
-.Fa fd
-argument is a file descriptor for the underlying file, which must be
-seekable.
-If
-.Fa key
-is
-.No non- Ns Dv NULL
-and matches a file already being mapped, the
-.Fa fd
-argument is ignored.
-.Pp
-The
-.Fa pagesize
-argument is the size, in bytes, of the pages into which the file is
-broken up.
-The
-.Fa maxcache
-argument is the maximum number of pages from the underlying file to
-cache at any one time.
-This value is not relative to the number of processes which share a
-file's buffers, but will be the largest value specified by any of the
-processes sharing the file.
-.Pp
-The
-.Fn mpool_filter
-function is intended to make transparent input and output processing
-of the pages possible.
-If the
-.Fa pgin
-function is specified, it is called each time a buffer is read into
-the memory pool from the backing file.
-If the
-.Fa pgout
-function is specified, it is called each time a buffer is written into
-the backing file.
-Both functions are are called with the
-.Fa pgcookie
-pointer, the page number and a pointer to the page to being read or
-written.
-.Pp
-The function
-.Fn mpool_new
-takes an MPOOL pointer and an address as arguments.
-If a new page can be allocated, a pointer to the page is returned and
-the page number is stored into the
-.Fa pgnoaddr
-address.
-Otherwise,
-.Dv NULL
-is returned and errno is set.
-.Pp
-The function
-.Fn mpool_get
-takes a MPOOL pointer and a page number as arguments.
-If the page exists, a pointer to the page is returned.
-Otherwise,
-.Dv NULL
-is returned and errno is set.
-The flags parameter is not currently used.
-.Pp
-The function
-.Fn mpool_put
-unpins the page referenced by
-.Fa pgaddr .
-.Fa pgaddr
-must be an address previously returned by
-.Fn mpool_get
-or
-.Fn mpool_new .
-The flag value is specified by or'ing any of the following values:
-.Bl -tag -width MPOOL_DIRTYX -offset indent
-.It Dv MPOOL_DIRTY
-The page has been modified and needs to be written to the backing
-file.
-.El
-.Pp
-.Fn mpool_put
-returns 0 on success and \-1 if an error occurs.
-.Pp
-The function
-.Fn mpool_sync
-writes all modified pages associated with the MPOOL pointer to the
-backing file.
-.Fn mpool_sync
-returns 0 on success and \-1 if an error occurs.
-.Pp
-The
-.Fn mpool_close
-function frees up any allocated memory associated with the memory pool
-cookie.
-Modified pages are
-.Em not
-written to the backing file.
-.Fn mpool_close
-returns 0 on success and \-1 if an error occurs.
-.Sh ERRORS
-The
-.Fn mpool_open
-function may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr malloc 3 .
-.Pp
-The
-.Fn mpool_get
-function may fail and set
-.Va errno
-for the following:
-.Bl -tag -width Er -offset indent
-.It Er EINVAL
-The requested record doesn't exist.
-.El
-.Pp
-The
-.Fn mpool_new
-and
-.Fn mpool_get
-functions may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr read 2 ,
-.Xr write 2 ,
-and
-.Xr malloc 3 .
-.Pp
-The
-.Fn mpool_sync
-function may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr write 2 .
-.Pp
-The
-.Fn mpool_close
-function may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr free 3 .
-.Sh SEE ALSO
-.Xr btree 3 ,
-.Xr dbopen 3 ,
-.Xr hash 3 ,
-.Xr recno 3
diff --git a/lib/libc/db/man/recno.3 b/lib/libc/db/man/recno.3
deleted file mode 100644
index a38871fe7..000000000
--- a/lib/libc/db/man/recno.3
+++ /dev/null
@@ -1,214 +0,0 @@
-.\"	$NetBSD: recno.3,v 1.11 2010/03/22 19:30:53 joerg Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)recno.3	8.5 (Berkeley) 8/18/94
-.\"
-.Dd April 17, 2003
-.Dt RECNO 3
-.Os
-.Sh NAME
-.Nm recno
-.Nd record number database access method
-.Sh SYNOPSIS
-.In sys/types.h
-.In db.h
-.Sh DESCRIPTION
-The routine
-.Fn dbopen
-is the library interface to database files.
-One of the supported file formats is record number files.
-The general description of the database access methods is in
-.Xr dbopen 3 ,
-this manual page describes only the recno specific information.
-.Pp
-The record number data structure is either variable or fixed-length
-records stored in a flat-file format, accessed by the logical record
-number.
-The existence of record number five implies the existence of records
-one through four, and the deletion of record number one causes
-record number five to be renumbered to record number four, as well
-as the cursor, if positioned after record number one, to shift down
-one record.
-.Pp
-The recno access method specific data structure provided to
-.Fn dbopen
-is defined in the
-.In db.h
-include file as follows:
-.Bd -literal
-typedef struct {
-	u_long flags;
-	u_int cachesize;
-	u_int psize;
-	int lorder;
-	size_t reclen;
-	uint8_t bval;
-	char *bfname;
-} RECNOINFO;
-.Ed
-.Pp
-The elements of this structure are defined as follows:
-.Bl -tag -width cachesizex
-.It Fa flags
-The flag value is specified by or'ing any of the following values:
-.Bl -tag -width R_FIXEDLENX -offset indent
-.It Dv R_FIXEDLEN
-The records are fixed-length, not byte delimited.
-The structure element
-.Fa reclen
-specifies the length of the record, and the structure element
-.Fa bval
-is used as the pad character.
-Any records, inserted into the database, that are less than
-.Fa reclen
-bytes long are automatically padded.
-.It Dv R_NOKEY
-In the interface specified by
-.Fn dbopen ,
-the sequential record retrieval fills in both the caller's key and
-data structures.
-If the
-.Dv R_NOKEY
-flag is specified, the cursor routines are not required to fill in the
-key structure.
-This permits applications to retrieve records at the end of files
-without reading all of the intervening records.
-.It Dv R_SNAPSHOT
-This flag requires that a snapshot of the file be taken when
-.Fn dbopen
-is called, instead of permitting any unmodified records to be read
-from the original file.
-.El
-.It Fa cachesize
-A suggested maximum size, in bytes, of the memory cache.
-This value is
-.Em only
-advisory, and the access method will allocate more memory rather than
-fail.
-If
-.Fa cachesize
-is 0 (no size is specified) a default cache is used.
-.It Fa psize
-The recno access method stores the in-memory copies of its records
-in a btree.
-This value is the size (in bytes) of the pages used for nodes in that
-tree.
-If
-.Fa psize
-is 0 (no page size is specified) a page size is chosen based on the
-underlying file system I/O block size.
-See
-.Xr btree 3
-for more information.
-.It Fa lorder
-The byte order for integers in the stored database metadata.
-The number should represent the order as an integer; for example,
-big endian order would be the number 4,321.
-If
-.Fa lorder
-is 0 (no order is specified) the current host order is used.
-.It Fa reclen
-The length of a fixed-length record.
-.It Fa bval
-The delimiting byte to be used to mark the end of a record for
-variable-length records, and the pad character for fixed-length
-records.
-If no value is specified, newlines
-.Pq Dq \en
-are used to mark the end of variable-length records and fixed-length
-records are padded with spaces.
-.It Fa bfname
-The recno access method stores the in-memory copies of its records
-in a btree.
-If bfname is
-.No non- Ns Dv NULL ,
-it specifies the name of the btree file, as if specified as the file
-name for a
-.Fn dbopen
-of a btree file.
-.El
-.Pp
-The data part of the key/data pair used by the recno access method
-is the same as other access methods.
-The key is different.
-The
-.Fa data
-field of the key should be a pointer to a memory location of type
-recno_t, as defined in the
-.In db.h
-include file.
-This type is normally the largest unsigned integral type available to
-the implementation.
-The
-.Fa size
-field of the key should be the size of that type.
-.Pp
-Because there can be no meta-data associated with the underlying
-recno access method files, any changes made to the default values
-(e.g., fixed record length or byte separator value) must be explicitly
-specified each time the file is opened.
-.Pp
-In the interface specified by
-.Fn dbopen ,
-using the
-.Fa put
-interface to create a new record will cause the creation of multiple,
-empty records if the record number is more than one greater than the
-largest record currently in the database.
-.Sh ERRORS
-The
-.Nm
-access method routines may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr dbopen 3
-or the following:
-.Bl -tag -width Er
-.It Er EINVAL
-An attempt was made to add a record to a fixed-length database that
-was too large to fit.
-.El
-.Sh SEE ALSO
-.Xr btree 3 ,
-.Xr dbopen 3 ,
-.Xr hash 3 ,
-.Xr mpool 3
-.Pp
-.Rs
-.%T "Document Processing in a Relational Database System"
-.%A Michael Stonebraker
-.%A Heidi Stettner
-.%A Joseph Kalash
-.%A Antonin Guttman
-.%A Nadene Lynn
-.%J Memorandum No. UCB/ERL M82/32
-.%D May 1982
-.Re
-.Sh BUGS
-Only big and little endian byte order is supported.
diff --git a/lib/libc/db/mpool/Makefile.inc b/lib/libc/db/mpool/Makefile.inc
deleted file mode 100644
index c9320fb0a..000000000
--- a/lib/libc/db/mpool/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 1995/02/27 13:23:53 cgd Exp $
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-.PATH: ${.CURDIR}/db/mpool
-
-SRCS+=	mpool.c
diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c
deleted file mode 100644
index 020c53770..000000000
--- a/lib/libc/db/mpool/mpool.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/*	$NetBSD: mpool.c,v 1.21 2013/12/14 18:04:00 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: mpool.c,v 1.21 2013/12/14 18:04:00 christos Exp $");
-
-#include "namespace.h"
-#include <sys/queue.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <db.h>
-
-#define	__MPOOLINTERFACE_PRIVATE
-#include <mpool.h>
-
-#ifdef __weak_alias
-__weak_alias(mpool_close,_mpool_close)
-__weak_alias(mpool_filter,_mpool_filter)
-__weak_alias(mpool_get,_mpool_get)
-__weak_alias(mpool_new,_mpool_new)
-__weak_alias(mpool_open,_mpool_open)
-__weak_alias(mpool_put,_mpool_put)
-__weak_alias(mpool_sync,_mpool_sync)
-#endif
-
-static BKT *mpool_bkt(MPOOL *);
-static BKT *mpool_look(MPOOL *, pgno_t);
-static int  mpool_write(MPOOL *, BKT *);
-
-/*
- * mpool_open --
- *	Initialize a memory pool.
- */
-/*ARGSUSED*/
-MPOOL *
-mpool_open(void *key, int fd, pgno_t pagesize, pgno_t maxcache)
-{
-	struct stat sb;
-	MPOOL *mp;
-	int entry;
-
-	/*
-	 * Get information about the file.
-	 *
-	 * XXX
-	 * We don't currently handle pipes, although we should.
-	 */
-	if (fstat(fd, &sb))
-		return NULL;
-	if (!S_ISREG(sb.st_mode)) {
-		errno = ESPIPE;
-		return NULL;
-	}
-
-	/* Allocate and initialize the MPOOL cookie. */
-	if ((mp = calloc(1, sizeof(*mp))) == NULL)
-		return (NULL);
-	TAILQ_INIT(&mp->lqh);
-	for (entry = 0; entry < HASHSIZE; ++entry)
-		TAILQ_INIT(&mp->hqh[entry]);
-	mp->maxcache = maxcache;
-	mp->npages = (pgno_t)(sb.st_size / pagesize);
-	mp->pagesize = pagesize;
-	mp->fd = fd;
-	return mp;
-}
-
-/*
- * mpool_filter --
- *	Initialize input/output filters.
- */
-void
-mpool_filter(MPOOL *mp, void (*pgin)(void *, pgno_t, void *),
-    void (*pgout)(void *, pgno_t, void *), void *pgcookie)
-{
-	mp->pgin = pgin;
-	mp->pgout = pgout;
-	mp->pgcookie = pgcookie;
-}
-	
-/*
- * mpool_new --
- *	Get a new page of memory.
- */
-void *
-mpool_new( MPOOL *mp, pgno_t *pgnoaddr)
-{
-	struct _hqh *head;
-	BKT *bp;
-
-	if (mp->npages == MAX_PAGE_NUMBER) {
-		(void)fprintf(stderr, "mpool_new: page allocation overflow.\n");
-		abort();
-	}
-#ifdef STATISTICS
-	++mp->pagenew;
-#endif
-	/*
-	 * Get a BKT from the cache.  Assign a new page number, attach
-	 * it to the head of the hash chain, the tail of the lru chain,
-	 * and return.
-	 */
-	if ((bp = mpool_bkt(mp)) == NULL)
-		return NULL;
-	*pgnoaddr = bp->pgno = mp->npages++;
-	bp->flags = MPOOL_PINNED;
-
-	head = &mp->hqh[HASHKEY(bp->pgno)];
-	TAILQ_INSERT_HEAD(head, bp, hq);
-	TAILQ_INSERT_TAIL(&mp->lqh, bp, q);
-	return bp->page;
-}
-
-/*
- * mpool_get
- *	Get a page.
- */
-/*ARGSUSED*/
-void *
-mpool_get(MPOOL *mp, pgno_t pgno, u_int flags)
-{
-	struct _hqh *head;
-	BKT *bp;
-	off_t off;
-	ssize_t nr;
-
-	/* Check for attempt to retrieve a non-existent page. */
-	if (pgno >= mp->npages) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-#ifdef STATISTICS
-	++mp->pageget;
-#endif
-
-	/* Check for a page that is cached. */
-	if ((bp = mpool_look(mp, pgno)) != NULL) {
-#ifdef DEBUG
-		if (bp->flags & MPOOL_PINNED) {
-			(void)fprintf(stderr,
-			    "mpool_get: page %d already pinned\n", bp->pgno);
-			abort();
-		}
-#endif
-		/*
-		 * Move the page to the head of the hash chain and the tail
-		 * of the lru chain.
-		 */
-		head = &mp->hqh[HASHKEY(bp->pgno)];
-		TAILQ_REMOVE(head, bp, hq);
-		TAILQ_INSERT_HEAD(head, bp, hq);
-		TAILQ_REMOVE(&mp->lqh, bp, q);
-		TAILQ_INSERT_TAIL(&mp->lqh, bp, q);
-
-		/* Return a pinned page. */
-		bp->flags |= MPOOL_PINNED;
-		return bp->page;
-	}
-
-	/* Get a page from the cache. */
-	if ((bp = mpool_bkt(mp)) == NULL)
-		return NULL;
-
-	/* Read in the contents. */
-#ifdef STATISTICS
-	++mp->pageread;
-#endif
-	off = mp->pagesize * pgno;
-	if ((nr = pread(mp->fd, bp->page, (size_t)mp->pagesize, off)) != (int)mp->pagesize) {
-		if (nr >= 0)
-			errno = EFTYPE;
-		return NULL;
-	}
-
-	/* Set the page number, pin the page. */
-	bp->pgno = pgno;
-	bp->flags = MPOOL_PINNED;
-
-	/*
-	 * Add the page to the head of the hash chain and the tail
-	 * of the lru chain.
-	 */
-	head = &mp->hqh[HASHKEY(bp->pgno)];
-	TAILQ_INSERT_HEAD(head, bp, hq);
-	TAILQ_INSERT_TAIL(&mp->lqh, bp, q);
-
-	/* Run through the user's filter. */
-	if (mp->pgin != NULL)
-		(mp->pgin)(mp->pgcookie, bp->pgno, bp->page);
-
-	return bp->page;
-}
-
-/*
- * mpool_put
- *	Return a page.
- */
-/*ARGSUSED*/
-int
-mpool_put(MPOOL *mp, void *page, u_int flags)
-{
-	BKT *bp;
-
-#ifdef STATISTICS
-	++mp->pageput;
-#endif
-	bp = (void *)((intptr_t)page - sizeof(BKT));
-#ifdef DEBUG
-	if (!(bp->flags & MPOOL_PINNED)) {
-		(void)fprintf(stderr,
-		    "mpool_put: page %d not pinned\n", bp->pgno);
-		abort();
-	}
-#endif
-	bp->flags &= ~MPOOL_PINNED;
-	bp->flags |= flags & MPOOL_DIRTY;
-	return (RET_SUCCESS);
-}
-
-/*
- * mpool_close
- *	Close the buffer pool.
- */
-int
-mpool_close(MPOOL *mp)
-{
-	BKT *bp;
-
-	/* Free up any space allocated to the lru pages. */
-	while (!TAILQ_EMPTY(&mp->lqh)) {
-		bp = TAILQ_FIRST(&mp->lqh);
-		TAILQ_REMOVE(&mp->lqh, bp, q);
-		free(bp);
-	}
-
-	/* Free the MPOOL cookie. */
-	free(mp);
-	return RET_SUCCESS;
-}
-
-/*
- * mpool_sync
- *	Sync the pool to disk.
- */
-int
-mpool_sync(MPOOL *mp)
-{
-	BKT *bp;
-
-	/* Walk the lru chain, flushing any dirty pages to disk. */
-	TAILQ_FOREACH(bp, &mp->lqh, q)
-		if (bp->flags & MPOOL_DIRTY &&
-		    mpool_write(mp, bp) == RET_ERROR)
-			return RET_ERROR;
-
-	/* Sync the file descriptor. */
-	return fsync(mp->fd) ? RET_ERROR : RET_SUCCESS;
-}
-
-/*
- * mpool_bkt
- *	Get a page from the cache (or create one).
- */
-static BKT *
-mpool_bkt(MPOOL *mp)
-{
-	struct _hqh *head;
-	BKT *bp;
-
-	/* If under the max cached, always create a new page. */
-	if (mp->curcache < mp->maxcache)
-		goto new;
-
-	/*
-	 * If the cache is max'd out, walk the lru list for a buffer we
-	 * can flush.  If we find one, write it (if necessary) and take it
-	 * off any lists.  If we don't find anything we grow the cache anyway.
-	 * The cache never shrinks.
-	 */
-	TAILQ_FOREACH(bp, &mp->lqh, q)
-		if (!(bp->flags & MPOOL_PINNED)) {
-			/* Flush if dirty. */
-			if (bp->flags & MPOOL_DIRTY &&
-			    mpool_write(mp, bp) == RET_ERROR)
-				return NULL;
-#ifdef STATISTICS
-			++mp->pageflush;
-#endif
-			/* Remove from the hash and lru queues. */
-			head = &mp->hqh[HASHKEY(bp->pgno)];
-			TAILQ_REMOVE(head, bp, hq);
-			TAILQ_REMOVE(&mp->lqh, bp, q);
-#ifdef DEBUG
-			{
-				void *spage = bp->page;
-				(void)memset(bp, 0xff,
-				    (size_t)(sizeof(BKT) + mp->pagesize));
-				bp->page = spage;
-			}
-#endif
-			return bp;
-		}
-
-new:	if ((bp = calloc(1, (size_t)(sizeof(BKT) + mp->pagesize))) == NULL)
-		return NULL;
-#ifdef STATISTICS
-	++mp->pagealloc;
-#endif
-#if defined(DEBUG) || defined(PURIFY)
-	(void)memset(bp, 0xff, (size_t)(sizeof(BKT) + mp->pagesize));
-#endif
-	bp->page = (void *)((intptr_t)bp + sizeof(BKT));
-	++mp->curcache;
-	return bp;
-}
-
-/*
- * mpool_write
- *	Write a page to disk.
- */
-static int
-mpool_write(MPOOL *mp, BKT *bp)
-{
-	off_t off;
-
-#ifdef STATISTICS
-	++mp->pagewrite;
-#endif
-
-	/* Run through the user's filter. */
-	if (mp->pgout)
-		(mp->pgout)(mp->pgcookie, bp->pgno, bp->page);
-
-	off = mp->pagesize * bp->pgno;
-	if (pwrite(mp->fd, bp->page, (size_t)mp->pagesize, off) !=
-	    (ssize_t)mp->pagesize)
-		return RET_ERROR;
-
-	/*
-	 * Re-run through the input filter since this page may soon be
-	 * accessed via the cache, and whatever the user's output filter
-	 * did may screw things up if we don't let the input filter
-	 * restore the in-core copy.
-	 */
-	if (mp->pgin)
-		(mp->pgin)(mp->pgcookie, bp->pgno, bp->page);
-
-	bp->flags &= ~MPOOL_DIRTY;
-	return RET_SUCCESS;
-}
-
-/*
- * mpool_look
- *	Lookup a page in the cache.
- */
-static BKT *
-mpool_look(MPOOL *mp, pgno_t pgno)
-{
-	struct _hqh *head;
-	BKT *bp;
-
-	head = &mp->hqh[HASHKEY(pgno)];
-	TAILQ_FOREACH(bp, head, hq)
-		if (bp->pgno == pgno) {
-#ifdef STATISTICS
-			++mp->cachehit;
-#endif
-			return bp;
-		}
-#ifdef STATISTICS
-	++mp->cachemiss;
-#endif
-	return NULL;
-}
-
-#ifdef STATISTICS
-/*
- * mpool_stat
- *	Print out cache statistics.
- */
-void
-mpool_stat(mp)
-	MPOOL *mp;
-{
-	BKT *bp;
-	int cnt;
-	const char *sep;
-
-	(void)fprintf(stderr, "%lu pages in the file\n", (u_long)mp->npages);
-	(void)fprintf(stderr,
-	    "page size %lu, cacheing %lu pages of %lu page max cache\n",
-	    (u_long)mp->pagesize, (u_long)mp->curcache, (u_long)mp->maxcache);
-	(void)fprintf(stderr, "%lu page puts, %lu page gets, %lu page new\n",
-	    mp->pageput, mp->pageget, mp->pagenew);
-	(void)fprintf(stderr, "%lu page allocs, %lu page flushes\n",
-	    mp->pagealloc, mp->pageflush);
-	if (mp->cachehit + mp->cachemiss)
-		(void)fprintf(stderr,
-		    "%.0f%% cache hit rate (%lu hits, %lu misses)\n", 
-		    ((double)mp->cachehit / (mp->cachehit + mp->cachemiss))
-		    * 100, mp->cachehit, mp->cachemiss);
-	(void)fprintf(stderr, "%lu page reads, %lu page writes\n",
-	    mp->pageread, mp->pagewrite);
-
-	sep = "";
-	cnt = 0;
-	TAILQ_FOREACH(bp, &mp->lqh, q) {
-		(void)fprintf(stderr, "%s%d", sep, bp->pgno);
-		if (bp->flags & MPOOL_DIRTY)
-			(void)fprintf(stderr, "d");
-		if (bp->flags & MPOOL_PINNED)
-			(void)fprintf(stderr, "P");
-		if (++cnt == 10) {
-			sep = "\n";
-			cnt = 0;
-		} else
-			sep = ", ";
-			
-	}
-	(void)fprintf(stderr, "\n");
-}
-#endif
diff --git a/lib/libc/db/recno/Makefile.inc b/lib/libc/db/recno/Makefile.inc
deleted file mode 100644
index e7f78f4ce..000000000
--- a/lib/libc/db/recno/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 1996/05/03 21:38:43 cgd Exp $
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-.PATH: ${.CURDIR}/db/recno
-
-SRCS+=	rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \
-	rec_seq.c rec_utils.c
diff --git a/lib/libc/db/recno/extern.h b/lib/libc/db/recno/extern.h
deleted file mode 100644
index f73c83de3..000000000
--- a/lib/libc/db/recno/extern.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: extern.h,v 1.8 2008/08/26 21:18:38 joerg Exp $	*/
-
-/*-
- * 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. 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.
- *
- *	@(#)extern.h	8.3 (Berkeley) 6/4/94
- */
-
-#include "../btree/extern.h"
-
-int	 __rec_close(DB *);
-int	 __rec_delete(const DB *, const DBT *, u_int);
-int	 __rec_dleaf(BTREE *, PAGE *, uint32_t);
-int	 __rec_fd(const DB *);
-int	 __rec_fmap(BTREE *, recno_t);
-int	 __rec_fout(BTREE *);
-int	 __rec_fpipe(BTREE *, recno_t);
-int	 __rec_get(const DB *, const DBT *, DBT *, u_int);
-int	 __rec_iput(BTREE *, recno_t, const DBT *, u_int);
-int	 __rec_put(const DB *dbp, DBT *, const DBT *, u_int);
-int	 __rec_ret(BTREE *, EPG *, recno_t, DBT *, DBT *);
-EPG	*__rec_search(BTREE *, recno_t, enum SRCHOP);
-int	 __rec_seq(const DB *, DBT *, DBT *, u_int);
-int	 __rec_sync(const DB *, u_int);
-int	 __rec_vmap(BTREE *, recno_t);
-int	 __rec_vout(BTREE *);
-int	 __rec_vpipe(BTREE *, recno_t);
diff --git a/lib/libc/db/recno/rec_close.c b/lib/libc/db/recno/rec_close.c
deleted file mode 100644
index aa3104416..000000000
--- a/lib/libc/db/recno/rec_close.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*	$NetBSD: rec_close.c,v 1.15 2008/09/11 12:58:00 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: rec_close.c,v 1.15 2008/09/11 12:58:00 joerg Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/mman.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_CLOSE -- Close a recno tree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_close(DB *dbp)
-{
-	BTREE *t;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	if (__rec_sync(dbp, 0) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Committed to closing. */
-	status = RET_SUCCESS;
-	if (F_ISSET(t, R_MEMMAPPED) && munmap(t->bt_smap, t->bt_msize))
-		status = RET_ERROR;
-
-	if (!F_ISSET(t, R_INMEM)) {
-		if (F_ISSET(t, R_CLOSEFP)) {
-			if (fclose(t->bt_rfp))
-				status = RET_ERROR;
-		} else {
-			if (close(t->bt_rfd))
-				status = RET_ERROR;
-		}
-	}
-
-	if (__bt_close(dbp) == RET_ERROR)
-		status = RET_ERROR;
-
-	return (status);
-}
-
-/*
- * __REC_SYNC -- sync the recno tree to disk.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__rec_sync(const DB *dbp, u_int flags)
-{
-	struct iovec iov[2];
-	BTREE *t;
-	DBT data, key;
-	off_t off;
-	recno_t scursor, trec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	if (flags == R_RECNOSYNC)
-		return (__bt_sync(dbp, 0));
-
-	if (F_ISSET(t, R_RDONLY | R_INMEM) || !F_ISSET(t, R_MODIFIED))
-		return (RET_SUCCESS);
-
-	/* Read any remaining records into the tree. */
-	if (!F_ISSET(t, R_EOF) && t->bt_irec(t, MAX_REC_NUMBER) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Rewind the file descriptor. */
-	if (lseek(t->bt_rfd, (off_t)0, SEEK_SET) != 0)
-		return (RET_ERROR);
-
-	/* Save the cursor. */
-	scursor = t->bt_cursor.rcursor;
-
-	key.size = sizeof(recno_t);
-	key.data = &trec;
-
-	if (F_ISSET(t, R_FIXLEN)) {
-		/*
-		 * We assume that fixed length records are all fixed length.
-		 * Any that aren't are either EINVAL'd or corrected by the
-		 * record put code.
-		 */
-		status = (dbp->seq)(dbp, &key, &data, R_FIRST);
-		while (status == RET_SUCCESS) {
-			if (write(t->bt_rfd, data.data, data.size) !=
-			    (ssize_t) data.size)
-				return (RET_ERROR);
-			status = (dbp->seq)(dbp, &key, &data, R_NEXT);
-		}
-	} else {
-		iov[1].iov_base = &t->bt_bval;
-		iov[1].iov_len = 1;
-
-		status = (dbp->seq)(dbp, &key, &data, R_FIRST);
-		while (status == RET_SUCCESS) {
-			iov[0].iov_base = data.data;
-			iov[0].iov_len = data.size;
-			if (writev(t->bt_rfd, iov, 2) !=
-			    (ssize_t) (data.size + 1))
-				return (RET_ERROR);
-			status = (dbp->seq)(dbp, &key, &data, R_NEXT);
-		}
-	}
-
-	/* Restore the cursor. */
-	t->bt_cursor.rcursor = scursor;
-
-	if (status == RET_ERROR)
-		return (RET_ERROR);
-	if ((off = lseek(t->bt_rfd, (off_t)0, SEEK_CUR)) == -1)
-		return (RET_ERROR);
-	if (ftruncate(t->bt_rfd, off))
-		return (RET_ERROR);
-	F_CLR(t, R_MODIFIED);
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc/db/recno/rec_delete.c b/lib/libc/db/recno/rec_delete.c
deleted file mode 100644
index a9dea5767..000000000
--- a/lib/libc/db/recno/rec_delete.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*	$NetBSD: rec_delete.c,v 1.17 2008/09/11 12:58:00 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: rec_delete.c,v 1.17 2008/09/11 12:58:00 joerg Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <db.h>
-#include "recno.h"
-
-static int rec_rdelete(BTREE *, recno_t);
-
-/*
- * __REC_DELETE -- Delete the item(s) referenced by a key.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key to delete
- *	flags:	R_CURSOR if deleting what the cursor references
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-int
-__rec_delete(const DB *dbp, const DBT *key, u_int flags)
-{
-	BTREE *t;
-	recno_t nrec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	switch(flags) {
-	case 0:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		if (nrec > t->bt_nrecs)
-			return (RET_SPECIAL);
-		--nrec;
-		status = rec_rdelete(t, nrec);
-		break;
-	case R_CURSOR:
-		if (!F_ISSET(&t->bt_cursor, CURS_INIT))
-			goto einval;
-		if (t->bt_nrecs == 0)
-			return (RET_SPECIAL);
-		status = rec_rdelete(t, t->bt_cursor.rcursor - 1);
-		if (status == RET_SUCCESS)
-			--t->bt_cursor.rcursor;
-		break;
-	default:
-einval:		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	if (status == RET_SUCCESS)
-		F_SET(t, B_MODIFIED | R_MODIFIED);
-	return (status);
-}
-
-/*
- * REC_RDELETE -- Delete the data matching the specified key.
- *
- * Parameters:
- *	tree:	tree
- *	nrec:	record to delete
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-static int
-rec_rdelete(BTREE *t, recno_t nrec)
-{
-	EPG *e;
-	PAGE *h;
-	int status;
-
-	/* Find the record; __rec_search pins the page. */
-	if ((e = __rec_search(t, nrec, SDELETE)) == NULL)
-		return (RET_ERROR);
-
-	/* Delete the record. */
-	h = e->page;
-	status = __rec_dleaf(t, h, (uint32_t)e->index);
-	if (status != RET_SUCCESS) {
-		mpool_put(t->bt_mp, h, 0);
-		return (status);
-	}
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-	return (RET_SUCCESS);
-}
-
-/*
- * __REC_DLEAF -- Delete a single record from a recno leaf page.
- *
- * Parameters:
- *	t:	tree
- *	index:	index on current page to delete
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__rec_dleaf(BTREE *t, PAGE *h, uint32_t idx)
-{
-	RLEAF *rl;
-	indx_t *ip, cnt, offset;
-	uint32_t nbytes;
-	char *from;
-	void *to;
-	size_t temp;
-
-	/*
-	 * Delete a record from a recno leaf page.  Internal records are never
-	 * deleted from internal pages, regardless of the records that caused
-	 * them to be added being deleted.  Pages made empty by deletion are
-	 * not reclaimed.  They are, however, made available for reuse.
-	 *
-	 * Pack the remaining entries at the end of the page, shift the indices
-	 * down, overwriting the deleted record and its index.  If the record
-	 * uses overflow pages, make them available for reuse.
-	 */
-	to = rl = GETRLEAF(h, idx);
-	if (rl->flags & P_BIGDATA && __ovfl_delete(t, rl->bytes) == RET_ERROR)
-		return (RET_ERROR);
-	nbytes = NRLEAF(rl);
-
-	/*
-	 * Compress the key/data pairs.  Compress and adjust the [BR]LEAF
-	 * offsets.  Reset the headers.
-	 */
-	from = (char *)(void *)h + h->upper;
-	memmove(from + nbytes, from, (size_t)((char *)to - from));
-	h->upper += nbytes;
-
-	offset = h->linp[idx];
-	temp = &h->linp[idx] - (ip = &h->linp[0]);
-	_DBFIT(temp, uint16_t);
-	for (cnt = (uint16_t)temp;  cnt--; ++ip)
-		if (ip[0] < offset)
-			ip[0] += nbytes;
-	temp = &h->linp[NEXTINDEX(h)] - ip;
-	_DBFIT(temp, uint16_t);
-	for (cnt = (uint16_t)temp;  --cnt; ++ip)
-		ip[0] = ip[1] < offset ? ip[1] + nbytes : ip[1];
-	h->lower -= sizeof(indx_t);
-	--t->bt_nrecs;
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc/db/recno/rec_get.c b/lib/libc/db/recno/rec_get.c
deleted file mode 100644
index 68144e62b..000000000
--- a/lib/libc/db/recno/rec_get.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/*	$NetBSD: rec_get.c,v 1.18 2013/12/25 19:42:23 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: rec_get.c,v 1.18 2013/12/25 19:42:23 christos Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_GET -- Get a record from the btree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key to find
- *	data:	data to return
- *	flag:	currently unused
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-int
-__rec_get(const DB *dbp, const DBT *key, DBT *data, u_int flags)
-{
-	BTREE *t;
-	EPG *e;
-	recno_t nrec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Get currently doesn't take any flags, and keys of 0 are illegal. */
-	if (flags || (nrec = *(recno_t *)key->data) == 0) {
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	/*
-	 * If we haven't seen this record yet, try to find it in the
-	 * original file.
-	 */
-	if (nrec > t->bt_nrecs) {
-		if (F_ISSET(t, R_EOF | R_INMEM))
-			return (RET_SPECIAL);
-		if ((status = t->bt_irec(t, nrec)) != RET_SUCCESS)
-			return (status);
-	}
-
-	--nrec;
-	if ((e = __rec_search(t, nrec, SEARCH)) == NULL)
-		return (RET_ERROR);
-
-	status = __rec_ret(t, e, 0, NULL, data);
-	if (F_ISSET(t, B_DB_LOCK))
-		mpool_put(t->bt_mp, e->page, 0);
-	else
-		t->bt_pinned = e->page;
-	return (status);
-}
-
-/*
- * __REC_FPIPE -- Get fixed length records from a pipe.
- *
- * Parameters:
- *	t:	tree
- *	cnt:	records to read
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_fpipe(BTREE *t, recno_t top)
-{
-	DBT data;
-	recno_t nrec;
-	size_t len;
-	int ch;
-	uint8_t *p;
-
-	if (t->bt_rdata.size < t->bt_reclen) {
-		void *np = realloc(t->bt_rdata.data, t->bt_reclen);
-		if (np == NULL)
-			return (RET_ERROR);
-		t->bt_rdata.data = np;
-		t->bt_rdata.size = t->bt_reclen;
-	}
-	data.data = t->bt_rdata.data;
-	data.size = t->bt_reclen;
-
-	for (nrec = t->bt_nrecs; nrec < top;) {
-		len = t->bt_reclen;
-		for (p = t->bt_rdata.data;; *p++ = ch)
-			if ((ch = getc(t->bt_rfp)) == EOF || !--len) {
-				if (ch != EOF)
-					*p = ch;
-				if (len != 0)
-					memset(p, t->bt_bval, len);
-				if (__rec_iput(t,
-				    nrec, &data, 0) != RET_SUCCESS)
-					return (RET_ERROR);
-				++nrec;
-				break;
-			}
-		if (ch == EOF)
-			break;
-	}
-	if (nrec < top) {
-		F_SET(t, R_EOF);
-		return (RET_SPECIAL);
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __REC_VPIPE -- Get variable length records from a pipe.
- *
- * Parameters:
- *	t:	tree
- *	cnt:	records to read
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_vpipe(BTREE *t, recno_t top)
-{
-	DBT data;
-	recno_t nrec;
-	size_t sz;
-	int bval, ch;
-	uint8_t *p;
-
-	bval = t->bt_bval;
-	for (nrec = t->bt_nrecs; nrec < top; ++nrec) {
-		for (p = t->bt_rdata.data,
-		    sz = t->bt_rdata.size;; *p++ = ch, --sz) {
-			if ((ch = getc(t->bt_rfp)) == EOF || ch == bval) {
-				data.data = t->bt_rdata.data;
-				data.size = p - (uint8_t *)t->bt_rdata.data;
-				if (ch == EOF && data.size == 0)
-					break;
-				if (__rec_iput(t, nrec, &data, 0)
-				    != RET_SUCCESS)
-					return (RET_ERROR);
-				break;
-			}
-			if (sz == 0) {
-				ptrdiff_t len = p - (uint8_t *)t->bt_rdata.data;
-				size_t tot = t->bt_rdata.size + (sz = 256);
-				void *np = realloc(t->bt_rdata.data, tot);
-				if (np == NULL)
-					return (RET_ERROR);
-				t->bt_rdata.size = tot;
-				t->bt_rdata.data = np;
-				p = (uint8_t *)t->bt_rdata.data + len;
-			}
-		}
-		if (ch == EOF)
-			break;
-	}
-	if (nrec < top) {
-		F_SET(t, R_EOF);
-		return (RET_SPECIAL);
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __REC_FMAP -- Get fixed length records from a file.
- *
- * Parameters:
- *	t:	tree
- *	cnt:	records to read
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_fmap(BTREE *t, recno_t top)
-{
-	DBT data;
-	recno_t nrec;
-	uint8_t *sp, *ep, *p;
-	size_t len;
-
-	if (t->bt_rdata.size < t->bt_reclen) {
-		void *np = realloc(t->bt_rdata.data, t->bt_reclen);
-		if (np == NULL)
-			return (RET_ERROR);
-		t->bt_rdata.data = np;
-		t->bt_rdata.size = t->bt_reclen;
-	}
-	data.data = t->bt_rdata.data;
-	data.size = t->bt_reclen;
-
-	sp = (uint8_t *)t->bt_cmap;
-	ep = (uint8_t *)t->bt_emap;
-	for (nrec = t->bt_nrecs; nrec < top; ++nrec) {
-		if (sp >= ep) {
-			F_SET(t, R_EOF);
-			return (RET_SPECIAL);
-		}
-		len = t->bt_reclen;
-		for (p = t->bt_rdata.data;
-		    sp < ep && len > 0; *p++ = *sp++, --len);
-		if (len != 0)
-			memset(p, t->bt_bval, len);
-		if (__rec_iput(t, nrec, &data, 0) != RET_SUCCESS)
-			return (RET_ERROR);
-	}
-	t->bt_cmap = (caddr_t)sp;
-	return (RET_SUCCESS);
-}
-
-/*
- * __REC_VMAP -- Get variable length records from a file.
- *
- * Parameters:
- *	t:	tree
- *	cnt:	records to read
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_vmap(BTREE *t, recno_t top)
-{
-	DBT data;
-	uint8_t *sp, *ep;
-	recno_t nrec;
-	int bval;
-
-	sp = (uint8_t *)t->bt_cmap;
-	ep = (uint8_t *)t->bt_emap;
-	bval = t->bt_bval;
-
-	for (nrec = t->bt_nrecs; nrec < top; ++nrec) {
-		if (sp >= ep) {
-			F_SET(t, R_EOF);
-			return (RET_SPECIAL);
-		}
-		for (data.data = sp; sp < ep && *sp != bval; ++sp);
-		data.size = sp - (uint8_t *)data.data;
-		if (__rec_iput(t, nrec, &data, 0) != RET_SUCCESS)
-			return (RET_ERROR);
-		++sp;
-	}
-	t->bt_cmap = (caddr_t)sp;
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc/db/recno/rec_open.c b/lib/libc/db/recno/rec_open.c
deleted file mode 100644
index 5f9de858c..000000000
--- a/lib/libc/db/recno/rec_open.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*	$NetBSD: rec_open.c,v 1.20 2013/12/01 00:22:48 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: rec_open.c,v 1.20 2013/12/01 00:22:48 christos Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include <db.h>
-#include "recno.h"
-
-DB *
-__rec_open(const char *fname, int flags, mode_t mode, const RECNOINFO *openinfo,
-    int dflags)
-{
-	BTREE *t;
-	BTREEINFO btopeninfo;
-	DB *dbp;
-	PAGE *h;
-	struct stat sb;
-	int rfd = -1;	/* pacify gcc */
-	int sverrno;
-
-	dbp = NULL;
-	/* Open the user's file -- if this fails, we're done. */
-	if (fname != NULL) {
-		if ((rfd = __dbopen(fname, flags, mode, NULL)) == -1)
-			return NULL;
-	}
-
-	/* Create a btree in memory (backed by disk). */
-	if (openinfo) {
-		if (openinfo->flags & ~(R_FIXEDLEN | R_NOKEY | R_SNAPSHOT))
-			goto einval;
-		btopeninfo.flags = 0;
-		btopeninfo.cachesize = openinfo->cachesize;
-		btopeninfo.maxkeypage = 0;
-		btopeninfo.minkeypage = 0;
-		btopeninfo.psize = openinfo->psize;
-		btopeninfo.compare = NULL;
-		btopeninfo.prefix = NULL;
-		btopeninfo.lorder = openinfo->lorder;
-		dbp = __bt_open(openinfo->bfname,
-		    O_RDWR, S_IRUSR | S_IWUSR, &btopeninfo, dflags);
-	} else
-		dbp = __bt_open(NULL, O_RDWR, S_IRUSR | S_IWUSR, NULL, dflags);
-	if (dbp == NULL)
-		goto err;
-
-	/*
-	 * Some fields in the tree structure are recno specific.  Fill them
-	 * in and make the btree structure look like a recno structure.  We
-	 * don't change the bt_ovflsize value, it's close enough and slightly
-	 * bigger.
-	 */
-	t = dbp->internal;
-	if (openinfo) {
-		if (openinfo->flags & R_FIXEDLEN) {
-			F_SET(t, R_FIXLEN);
-			t->bt_reclen = openinfo->reclen;
-			if (t->bt_reclen == 0)
-				goto einval;
-		}
-		t->bt_bval = openinfo->bval;
-	} else
-		t->bt_bval = '\n';
-
-	F_SET(t, R_RECNO);
-	if (fname == NULL)
-		F_SET(t, R_EOF | R_INMEM);
-	else
-		t->bt_rfd = rfd;
-
-	if (fname != NULL) {
-		/*
-		 * In 4.4BSD, stat(2) returns true for ISSOCK on pipes.
-		 * Unfortunately, that's not portable, so we use lseek
-		 * and check the errno values.
-		 */
-		errno = 0;
-		if (lseek(rfd, (off_t)0, SEEK_CUR) == -1 && errno == ESPIPE) {
-			switch (flags & O_ACCMODE) {
-			case O_RDONLY:
-				F_SET(t, R_RDONLY);
-				break;
-			default:
-				goto einval;
-			}
-slow:			if ((t->bt_rfp = fdopen(rfd, "r")) == NULL)
-				goto err;
-			F_SET(t, R_CLOSEFP);
-			t->bt_irec =
-			    F_ISSET(t, R_FIXLEN) ? __rec_fpipe : __rec_vpipe;
-		} else {
-			switch (flags & O_ACCMODE) {
-			case O_RDONLY:
-				F_SET(t, R_RDONLY);
-				break;
-			case O_RDWR:
-				break;
-			default:
-				goto einval;
-			}
-
-			if (fstat(rfd, &sb))
-				goto err;
-			/*
-			 * Kluge -- we'd like to test to see if the file is too
-			 * big to mmap.  Since, we don't know what size or type
-			 * off_t's or size_t's are, what the largest unsigned
-			 * integral type is, or what random insanity the local
-			 * C compiler will perpetrate, doing the comparison in
-			 * a portable way is flatly impossible.  Hope that mmap
-			 * fails if the file is too large.
-			 */
-			if (sb.st_size == 0)
-				F_SET(t, R_EOF);
-			else {
-#ifdef MMAP_NOT_AVAILABLE
-				/*
-				 * XXX
-				 * Mmap doesn't work correctly on many current
-				 * systems.  In particular, it can fail subtly,
-				 * with cache coherency problems.  Don't use it
-				 * for now.
-				 */
-				t->bt_msize = sb.st_size;
-				if ((t->bt_smap = mmap(NULL, t->bt_msize,
-				    PROT_READ, MAP_FILE | MAP_PRIVATE, rfd,
-				    (off_t)0)) == (caddr_t)-1)
-					goto slow;
-				t->bt_cmap = t->bt_smap;
-				t->bt_emap = t->bt_smap + sb.st_size;
-				t->bt_irec = F_ISSET(t, R_FIXLEN) ?
-				    __rec_fmap : __rec_vmap;
-				F_SET(t, R_MEMMAPPED);
-#else
-				goto slow;
-#endif
-			}
-		}
-	}
-
-	/* Use the recno routines. */
-	dbp->close = __rec_close;
-	dbp->del = __rec_delete;
-	dbp->fd = __rec_fd;
-	dbp->get = __rec_get;
-	dbp->put = __rec_put;
-	dbp->seq = __rec_seq;
-	dbp->sync = __rec_sync;
-
-	/* If the root page was created, reset the flags. */
-	if ((h = mpool_get(t->bt_mp, P_ROOT, 0)) == NULL)
-		goto err;
-	if ((h->flags & P_TYPE) == P_BLEAF) {
-		F_CLR(h, P_TYPE);
-		F_SET(h, P_RLEAF);
-		mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-	} else
-		mpool_put(t->bt_mp, h, 0);
-
-	if (openinfo && openinfo->flags & R_SNAPSHOT &&
-	    !F_ISSET(t, R_EOF | R_INMEM) &&
-	    t->bt_irec(t, MAX_REC_NUMBER) == RET_ERROR)
-                goto err;
-	return (dbp);
-
-einval:	errno = EINVAL;
-err:	sverrno = errno;
-	if (dbp != NULL)
-		(void)__bt_close(dbp);
-	if (fname != NULL)
-		(void)close(rfd);
-	errno = sverrno;
-	return (NULL);
-}
-
-int
-__rec_fd(const DB *dbp)
-{
-	BTREE *t;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* In-memory database can't have a file descriptor. */
-	if (F_ISSET(t, R_INMEM)) {
-		errno = ENOENT;
-		return (-1);
-	}
-	return (t->bt_rfd);
-}
diff --git a/lib/libc/db/recno/rec_put.c b/lib/libc/db/recno/rec_put.c
deleted file mode 100644
index 3539bd069..000000000
--- a/lib/libc/db/recno/rec_put.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/*	$NetBSD: rec_put.c,v 1.21 2013/12/14 18:04:56 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: rec_put.c,v 1.21 2013/12/14 18:04:56 christos Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_PUT -- Add a recno item to the tree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key
- *	data:	data
- *	flag:	R_CURSOR, R_IAFTER, R_IBEFORE, R_NOOVERWRITE
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key is
- *	already in the tree and R_NOOVERWRITE specified.
- */
-int
-__rec_put(const DB *dbp, DBT *key, const DBT *data, u_int flags)
-{
-	BTREE *t;
-	DBT fdata, tdata;
-	recno_t nrec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/*
-	 * If using fixed-length records, and the record is long, return
-	 * EINVAL.  If it's short, pad it out.  Use the record data return
-	 * memory, it's only short-term.
-	 */
-	if (F_ISSET(t, R_FIXLEN) && data->size != t->bt_reclen) {
-		if (data->size > t->bt_reclen)
-			goto einval;
-
-		if (t->bt_rdata.size < t->bt_reclen) {
-			void *np = realloc(t->bt_rdata.data, t->bt_reclen);
-			if (np == NULL)
-				return (RET_ERROR);
-			t->bt_rdata.data = np;
-			t->bt_rdata.size = t->bt_reclen;
-		}
-		memmove(t->bt_rdata.data, data->data, data->size);
-		memset((char *)t->bt_rdata.data + data->size,
-		    t->bt_bval, t->bt_reclen - data->size);
-		fdata.data = t->bt_rdata.data;
-		fdata.size = t->bt_reclen;
-	} else {
-		fdata.data = data->data;
-		fdata.size = data->size;
-	}
-
-	switch (flags) {
-	case R_CURSOR:
-		if (!F_ISSET(&t->bt_cursor, CURS_INIT))
-			goto einval;
-		nrec = t->bt_cursor.rcursor;
-		break;
-	case R_SETCURSOR:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		break;
-	case R_IAFTER:
-		if ((nrec = *(recno_t *)key->data) == 0) {
-			nrec = 1;
-			flags = R_IBEFORE;
-		}
-		break;
-	case 0:
-	case R_IBEFORE:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		break;
-	case R_NOOVERWRITE:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		if (nrec <= t->bt_nrecs)
-			return (RET_SPECIAL);
-		break;
-	default:
-einval:		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	/*
-	 * Make sure that records up to and including the put record are
-	 * already in the database.  If skipping records, create empty ones.
-	 */
-	if (nrec > t->bt_nrecs) {
-		if (!F_ISSET(t, R_EOF | R_INMEM) &&
-		    t->bt_irec(t, nrec) == RET_ERROR)
-			return (RET_ERROR);
-		if (nrec > t->bt_nrecs + 1) {
-			if (F_ISSET(t, R_FIXLEN)) {
-				if ((tdata.data = malloc(t->bt_reclen)) == NULL)
-					return (RET_ERROR);
-				tdata.size = t->bt_reclen;
-				memset(tdata.data, t->bt_bval, tdata.size);
-			} else {
-				tdata.data = NULL;
-				tdata.size = 0;
-			}
-			while (nrec > t->bt_nrecs + 1)
-				if (__rec_iput(t,
-				    t->bt_nrecs, &tdata, 0) != RET_SUCCESS)
-					return (RET_ERROR);
-			if (F_ISSET(t, R_FIXLEN))
-				free(tdata.data);
-		}
-	}
-
-	if ((status = __rec_iput(t, nrec - 1, &fdata, flags)) != RET_SUCCESS)
-		return (status);
-
-	switch (flags) {
-	case R_IAFTER:
-		nrec++;
-		break;
-	case R_SETCURSOR:
-		t->bt_cursor.rcursor = nrec;
-		break;
-	}
-	
-	F_SET(t, R_MODIFIED);
-	return (__rec_ret(t, NULL, nrec, key, NULL));
-}
-
-/*
- * __REC_IPUT -- Add a recno item to the tree.
- *
- * Parameters:
- *	t:	tree
- *	nrec:	record number
- *	data:	data
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_iput(BTREE *t, recno_t nrec, const DBT *data, u_int flags)
-{
-	DBT tdata;
-	EPG *e;
-	PAGE *h;
-	indx_t idx, nxtindex;
-	pgno_t pg;
-	uint32_t nbytes;
-	int dflags, status;
-	char *dest, db[NOVFLSIZE];
-
-	/*
-	 * If the data won't fit on a page, store it on indirect pages.
-	 *
-	 * XXX
-	 * If the insert fails later on, these pages aren't recovered.
-	 */
-	if (data->size > t->bt_ovflsize) {
-		if (__ovfl_put(t, data, &pg) == RET_ERROR)
-			return (RET_ERROR);
-		tdata.data = db;
-		tdata.size = NOVFLSIZE;
-		memcpy(db, &pg, sizeof(pg));
-		_DBFIT(data->size, uint32_t);
-		*(uint32_t *)(void *)(db + sizeof(pgno_t)) =
-		    (uint32_t)data->size;
-		dflags = P_BIGDATA;
-		data = &tdata;
-	} else
-		dflags = 0;
-
-	/* __rec_search pins the returned page. */
-	if ((e = __rec_search(t, nrec,
-	    nrec > t->bt_nrecs || flags == R_IAFTER || flags == R_IBEFORE ?
-	    SINSERT : SEARCH)) == NULL)
-		return (RET_ERROR);
-
-	h = e->page;
-	idx = e->index;
-
-	/*
-	 * Add the specified key/data pair to the tree.  The R_IAFTER and
-	 * R_IBEFORE flags insert the key after/before the specified key.
-	 *
-	 * Pages are split as required.
-	 */
-	switch (flags) {
-	case R_IAFTER:
-		++idx;
-		break;
-	case R_IBEFORE:
-		break;
-	default:
-		if (nrec < t->bt_nrecs &&
-		    __rec_dleaf(t, h, (uint32_t)idx) == RET_ERROR) {
-			mpool_put(t->bt_mp, h, 0);
-			return (RET_ERROR);
-		}
-		break;
-	}
-
-	/*
-	 * If not enough room, split the page.  The split code will insert
-	 * the key and data and unpin the current page.  If inserting into
-	 * the offset array, shift the pointers up.
-	 */
-	nbytes = NRLEAFDBT(data->size);
-	if ((uint32_t) (h->upper - h->lower) < nbytes + sizeof(indx_t)) {
-		status = __bt_split(t, h, NULL, data, dflags, nbytes,
-		    (uint32_t)idx);
-		if (status == RET_SUCCESS)
-			++t->bt_nrecs;
-		return (status);
-	}
-
-	if (idx < (nxtindex = NEXTINDEX(h)))
-		memmove(h->linp + idx + 1, h->linp + idx,
-		    (nxtindex - idx) * sizeof(indx_t));
-	h->lower += sizeof(indx_t);
-
-	h->linp[idx] = h->upper -= nbytes;
-	dest = (char *)(void *)h + h->upper;
-	WR_RLEAF(dest, data, dflags);
-
-	++t->bt_nrecs;
-	F_SET(t, B_MODIFIED);
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc/db/recno/rec_search.c b/lib/libc/db/recno/rec_search.c
deleted file mode 100644
index 1238c8db3..000000000
--- a/lib/libc/db/recno/rec_search.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*	$NetBSD: rec_search.c,v 1.14 2008/09/11 12:58:00 joerg Exp $	*/
-
-/*-
- * 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. 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: rec_search.c,v 1.14 2008/09/11 12:58:00 joerg Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_SEARCH -- Search a btree for a key.
- *
- * Parameters:
- *	t:	tree to search
- *	recno:	key to find
- *	op: 	search operation
- *
- * Returns:
- *	EPG for matching record, if any, or the EPG for the location of the
- *	key, if it were inserted into the tree.
- *
- * Returns:
- *	The EPG for matching record, if any, or the EPG for the location
- *	of the key, if it were inserted into the tree, is entered into
- *	the bt_cur field of the tree.  A pointer to the field is returned.
- */
-EPG *
-__rec_search(BTREE *t, recno_t recno, enum SRCHOP op)
-{
-	indx_t idx;
-	PAGE *h;
-	EPGNO *parent;
-	RINTERNAL *r;
-	pgno_t pg;
-	indx_t top;
-	recno_t total;
-	int sverrno;
-
-	BT_CLR(t);
-	for (pg = P_ROOT, total = 0;;) {
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			goto err;
-		if (h->flags & P_RLEAF) {
-			t->bt_cur.page = h;
-			t->bt_cur.index = recno - total;
-			return (&t->bt_cur);
-		}
-		for (idx = 0, top = NEXTINDEX(h);;) {
-			r = GETRINTERNAL(h, idx);
-			if (++idx == top || total + r->nrecs > recno)
-				break;
-			total += r->nrecs;
-		}
-
-		BT_PUSH(t, pg, idx - 1);
-		
-		pg = r->pgno;
-		switch (op) {
-		case SDELETE:
-			--GETRINTERNAL(h, (idx - 1))->nrecs;
-			mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			break;
-		case SINSERT:
-			++GETRINTERNAL(h, (idx - 1))->nrecs;
-			mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			break;
-		case SEARCH:
-			mpool_put(t->bt_mp, h, 0);
-			break;
-		}
-
-	}
-	/* Try and recover the tree. */
-err:	sverrno = errno;
-	if (op != SEARCH)
-		while  ((parent = BT_POP(t)) != NULL) {
-			if ((h = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-				break;
-			if (op == SINSERT)
-				--GETRINTERNAL(h, parent->index)->nrecs;
-			else
-				++GETRINTERNAL(h, parent->index)->nrecs;
-                        mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-                }
-	errno = sverrno;
-	return (NULL);
-}
diff --git a/lib/libc/db/recno/rec_seq.c b/lib/libc/db/recno/rec_seq.c
deleted file mode 100644
index 3b1da48cc..000000000
--- a/lib/libc/db/recno/rec_seq.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*	$NetBSD: rec_seq.c,v 1.14 2008/09/11 12:58:00 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: rec_seq.c,v 1.14 2008/09/11 12:58:00 joerg Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_SEQ -- Recno sequential scan interface.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key for positioning and return value
- *	data:	data return value
- *	flags:	R_CURSOR, R_FIRST, R_LAST, R_NEXT, R_PREV.
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
- */
-int
-__rec_seq(const DB *dbp, DBT *key, DBT *data, u_int flags)
-{
-	BTREE *t;
-	EPG *e;
-	recno_t nrec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	switch(flags) {
-	case R_CURSOR:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		break;
-	case R_NEXT:
-		if (F_ISSET(&t->bt_cursor, CURS_INIT)) {
-			nrec = t->bt_cursor.rcursor + 1;
-			break;
-		}
-		/* FALLTHROUGH */
-	case R_FIRST:
-		nrec = 1;
-		break;
-	case R_PREV:
-		if (F_ISSET(&t->bt_cursor, CURS_INIT)) {
-			if ((nrec = t->bt_cursor.rcursor - 1) == 0)
-				return (RET_SPECIAL);
-			break;
-		}
-		/* FALLTHROUGH */
-	case R_LAST:
-		if (!F_ISSET(t, R_EOF | R_INMEM) &&
-		    t->bt_irec(t, MAX_REC_NUMBER) == RET_ERROR)
-			return (RET_ERROR);
-		nrec = t->bt_nrecs;
-		break;
-	default:
-einval:		errno = EINVAL;
-		return (RET_ERROR);
-	}
-	
-	if (t->bt_nrecs == 0 || nrec > t->bt_nrecs) {
-		if (!F_ISSET(t, R_EOF | R_INMEM) &&
-		    (status = t->bt_irec(t, nrec)) != RET_SUCCESS)
-			return (status);
-		if (t->bt_nrecs == 0 || nrec > t->bt_nrecs)
-			return (RET_SPECIAL);
-	}
-
-	if ((e = __rec_search(t, nrec - 1, SEARCH)) == NULL)
-		return (RET_ERROR);
-
-	F_SET(&t->bt_cursor, CURS_INIT);
-	t->bt_cursor.rcursor = nrec;
-
-	status = __rec_ret(t, e, nrec, key, data);
-	if (F_ISSET(t, B_DB_LOCK))
-		mpool_put(t->bt_mp, e->page, 0);
-	else
-		t->bt_pinned = e->page;
-	return (status);
-}
diff --git a/lib/libc/db/recno/rec_utils.c b/lib/libc/db/recno/rec_utils.c
deleted file mode 100644
index c4b59e3d8..000000000
--- a/lib/libc/db/recno/rec_utils.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*	$NetBSD: rec_utils.c,v 1.14 2013/12/14 18:04:56 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: rec_utils.c,v 1.14 2013/12/14 18:04:56 christos Exp $");
-
-#include <sys/param.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __rec_ret --
- *	Build return data.
- *
- * Parameters:
- *	t:	tree
- *	e:	key/data pair to be returned
- *   nrec:	record number
- *    key:	user's key structure
- *	data:	user's data structure
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__rec_ret(BTREE *t, EPG *e, recno_t nrec, DBT *key, DBT *data)
-{
-	RLEAF *rl;
-	void *p;
-
-	if (key == NULL)
-		goto dataonly;
-
-	/* We have to copy the key, it's not on the page. */
-	if (sizeof(nrec) > t->bt_rkey.size) {
-		p = realloc(t->bt_rkey.data, sizeof(nrec));
-		if (p == NULL)
-			return (RET_ERROR);
-		t->bt_rkey.data = p;
-		t->bt_rkey.size = sizeof(nrec);
-	}
-	memmove(t->bt_rkey.data, &nrec, sizeof(nrec));
-	key->size = sizeof(nrec);
-	key->data = t->bt_rkey.data;
-
-dataonly:
-	if (data == NULL)
-		return (RET_SUCCESS);
-
-	/*
-	 * We must copy big keys/data to make them contigous.  Otherwise,
-	 * leave the page pinned and don't copy unless the user specified
-	 * concurrent access.
-	 */
-	rl = GETRLEAF(e->page, e->index);
-	if (rl->flags & P_BIGDATA) {
-		if (__ovfl_get(t, rl->bytes,
-		    &data->size, &t->bt_rdata.data, &t->bt_rdata.size))
-			return (RET_ERROR);
-		data->data = t->bt_rdata.data;
-	} else if (F_ISSET(t, B_DB_LOCK)) {
-		/* Use +1 in case the first record retrieved is 0 length. */
-		if (rl->dsize + 1 > t->bt_rdata.size) {
-			p = realloc(t->bt_rdata.data, rl->dsize + 1);
-			if (p == NULL)
-				return (RET_ERROR);
-			t->bt_rdata.data = p;
-			t->bt_rdata.size = rl->dsize + 1;
-		}
-		memmove(t->bt_rdata.data, rl->bytes, rl->dsize);
-		data->size = rl->dsize;
-		data->data = t->bt_rdata.data;
-	} else {
-		data->size = rl->dsize;
-		data->data = rl->bytes;
-	}
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc/db/recno/recno.h b/lib/libc/db/recno/recno.h
deleted file mode 100644
index 7ac0d176a..000000000
--- a/lib/libc/db/recno/recno.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: recno.h,v 1.6 2003/08/07 16:42:44 agc Exp $	*/
-
-/*-
- * 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. 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.
- *
- *	@(#)recno.h	8.1 (Berkeley) 6/4/93
- */
-
-enum SRCHOP { SDELETE, SINSERT, SEARCH};	/* Rec_search operation. */
-
-#include "../btree/btree.h"
-#include "extern.h"
diff --git a/lib/libc/dlfcn/Makefile.inc b/lib/libc/dlfcn/Makefile.inc
deleted file mode 100644
index f9ba7f7c9..000000000
--- a/lib/libc/dlfcn/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#       $NetBSD: Makefile.inc,v 1.3 2010/07/06 05:59:52 mrg Exp $
-
-.PATH: ${.CURDIR}/dlfcn
-
-CPPFLAGS+=	-I${NETBSDSRCDIR}/libexec/ld.elf_so
-CPPFLAGS+=	-I${.CURDIR}/dlfcn
-SRCS+=		dlfcn_elf.c
diff --git a/lib/libc/dlfcn/dlfcn_elf.c b/lib/libc/dlfcn/dlfcn_elf.c
deleted file mode 100644
index 977fc9887..000000000
--- a/lib/libc/dlfcn/dlfcn_elf.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*	$NetBSD: dlfcn_elf.c,v 1.13 2012/06/24 15:26:03 christos Exp $	*/
-
-/*
- * Copyright (c) 2000 Takuya SHIOZAKI
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: dlfcn_elf.c,v 1.13 2012/06/24 15:26:03 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/atomic.h>
-#include <assert.h>
-#include <elf.h>
-#include <errno.h>
-#include <string.h>
-#include <stdbool.h>
-
-#undef dlopen
-#undef dlclose
-#undef dlsym
-#undef dlerror
-#undef dladdr
-#undef dfinfo
-
-#define	dlopen		___dlopen
-#define	dlclose		___dlclose
-#define	dlsym		___dlsym
-#define	dlvsym		___dlvsym
-#define	dlerror		___dlerror
-#define	dladdr		___dladdr
-#define	dlinfo		___dlinfo
-#define	dl_iterate_phdr		___dl_iterate_phdr
-
-#define ELFSIZE ARCH_ELFSIZE
-#include "rtld.h"
-
-#ifdef __weak_alias
-__weak_alias(dlopen,___dlopen)
-__weak_alias(dlclose,___dlclose)
-__weak_alias(dlsym,___dlsym)
-__weak_alias(dlvsym,___dlvsym)
-__weak_alias(dlerror,___dlerror)
-__weak_alias(dladdr,___dladdr)
-__weak_alias(dlinfo,___dlinfo)
-__weak_alias(dl_iterate_phdr,___dl_iterate_phdr)
-
-__weak_alias(__dlopen,___dlopen)
-__weak_alias(__dlclose,___dlclose)
-__weak_alias(__dlsym,___dlsym)
-__weak_alias(__dlvsym,___dlvsym)
-__weak_alias(__dlerror,___dlerror)
-__weak_alias(__dladdr,___dladdr)
-__weak_alias(__dlinfo,___dlinfo)
-__weak_alias(__dl_iterate_phdr,___dl_iterate_phdr)
-#endif
-
-/*
- * For ELF, the dynamic linker directly resolves references to its
- * services to functions inside the dynamic linker itself.  These
- * weak-symbol stubs are necessary so that "ld" won't complain about
- * undefined symbols.  The stubs are executed only when the program is
- * linked statically, or when a given service isn't implemented in the
- * dynamic linker.  They must return an error if called, and they must
- * be weak symbols so that the dynamic linker can override them.
- */
-
-static char dlfcn_error[] = "Service unavailable";
-
-/*ARGSUSED*/
-void *
-dlopen(const char *name, int mode)
-{
-
-	return NULL;
-}
-
-/*ARGSUSED*/
-int
-dlclose(void *fd)
-{
-
-	return -1;
-}
-
-/*ARGSUSED*/
-void *
-dlsym(void *handle, const char *name)
-{
-
-	return NULL;
-}
-
-/*ARGSUSED*/
-void *
-dlvsym(void *handle, const char *name, const char *version)
-{
-
-	return NULL;
-}
-
-/*ARGSUSED*/
-__aconst char *
-dlerror(void)
-{
-
-	return dlfcn_error;
-}
-
-/*ARGSUSED*/
-int
-dladdr(const void *addr, Dl_info *dli)
-{
-
-	return 0;
-}
-
-/*ARGSUSED*/
-int
-dlinfo(void *handle, int req, void *v)
-{
-
-	return -1;
-}
-
-static const char *dlpi_name;
-static Elf_Addr dlpi_addr;
-static const Elf_Phdr *dlpi_phdr;
-static Elf_Half dlpi_phnum;
-
-static void
-dl_iterate_phdr_setup(void)
-{
-	const AuxInfo *aux;
-
-	_DIAGASSERT(_dlauxinfo() != NULL);
-
-	for (aux = _dlauxinfo(); aux->a_type != AT_NULL; ++aux) {
-		switch (aux->a_type) {
-		case AT_BASE:
-			dlpi_addr = aux->a_v;
-			break;
-		case AT_PHDR:
-			dlpi_phdr = (void *)aux->a_v;
-			break;
-		case AT_PHNUM:
-			_DIAGASSERT(__type_fit(Elf_Half, aux->a_v));
-			dlpi_phnum = (Elf_Half)aux->a_v;
-			break;
-		case AT_SUN_EXECNAME:
-			dlpi_name = (void *)aux->a_v;
-			break;
-		}
-	}
-}
-
-/*ARGSUSED*/
-int
-dl_iterate_phdr(int (*callback)(struct dl_phdr_info *, size_t, void *),
-    void *data)
-{
-	static bool setup_done;
-	struct dl_phdr_info phdr_info;
-
-	if (!setup_done) {
-		/*
-		 * This can race on the first call to dl_iterate_phdr.
-		 * dl_iterate_phdr_setup only touches field of pointer size
-		 * and smaller and such stores are atomic.
-		 */
-		dl_iterate_phdr_setup();
-#if !defined(__minix)
-		membar_producer();
-#endif /* !defined(__minix) */
-		setup_done = true;
-	}
-
-	memset(&phdr_info, 0, sizeof(phdr_info));
-	phdr_info.dlpi_addr = dlpi_addr;
-	phdr_info.dlpi_phdr = dlpi_phdr;
-	phdr_info.dlpi_phnum = dlpi_phnum;
-	phdr_info.dlpi_name = dlpi_name;
-
-	return callback(&phdr_info, sizeof(phdr_info), data);
-}
diff --git a/lib/libc/gdtoa/Makefile.inc b/lib/libc/gdtoa/Makefile.inc
deleted file mode 100644
index 5e966f572..000000000
--- a/lib/libc/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.10 2014/01/16 20:31:42 christos Exp $
-
-# gdtoa sources
-.PATH: ${.CURDIR}/gdtoa
-CPPFLAGS+=-I${.CURDIR}/gdtoa -I${.CURDIR}/locale
-
-CPPFLAGS+=-DNO_FENV_H
-
-# machine-dependent directory must provide the following:
-# 	arith.h gd_qnan.h
-CPPFLAGS+=-I${ARCHDIR}/gdtoa
-
-# machine-dependent Makefile must define names of modules to use for
-# float conversions:
-# 	strtof(): strtof{,_vaxf}.c
-# and for long double conversions on platforms with extended-precision
-# format, if supported (strtod.c will define an alias otherwise):
-#	strtold(): strtold_p{x,xL,Q}.c
-#	helpers:   strtop{x,xL,Q}.c
-.include "${ARCHDIR}/gdtoa/Makefile.inc"
-
-# public interfaces
-SRCS+=	strtod.c
-
-# private interfaces interfacing to libc
-SRCS+=	dtoa.c ldtoa.c hdtoa.c gdtoa.c
-
-.if !defined(__MINIX)
-# local locking implementation
-SRCS+=	gdtoa_locks.c
-.endif # !defined(__MINIX)
-
-# private interfaces
-SRCS+=	dmisc.c \
-	gethex.c gmisc.c \
-	hd_init.c hexnan.c \
-	misc.c \
-	smisc.c strtodg.c sum.c \
-	ulp.c
-
-# XXX no hexadecimal floating-point string conversion for VAX FP yet
-.if ${MACHINE_ARCH} != "vax"
-SRCS+=	strtord.c
-.endif
diff --git a/lib/libc/gdtoa/README b/lib/libc/gdtoa/README
deleted file mode 100644
index 0c034f1bf..000000000
--- a/lib/libc/gdtoa/README
+++ /dev/null
@@ -1,364 +0,0 @@
-This directory contains source for a library of binary -> decimal
-and decimal -> binary conversion routines, for single-, double-,
-and extended-precision IEEE binary floating-point arithmetic, and
-other IEEE-like binary floating-point, including "double double",
-as in
-
-	T. J. Dekker, "A Floating-Point Technique for Extending the
-	Available Precision", Numer. Math. 18 (1971), pp. 224-242
-
-and
-
-	"Inside Macintosh: PowerPC Numerics", Addison-Wesley, 1994
-
-The conversion routines use double-precision floating-point arithmetic
-and, where necessary, high precision integer arithmetic.  The routines
-are generalizations of the strtod and dtoa routines described in
-
-	David M. Gay, "Correctly Rounded Binary-Decimal and
-	Decimal-Binary Conversions", Numerical Analysis Manuscript
-	No. 90-10, Bell Labs, Murray Hill, 1990;
-	http://cm.bell-labs.com/cm/cs/what/ampl/REFS/rounding.ps.gz
-
-(based in part on papers by Clinger and Steele & White: see the
-references in the above paper).
-
-The present conversion routines should be able to use any of IEEE binary,
-VAX, or IBM-mainframe double-precision arithmetic internally, but I (dmg)
-have so far only had a chance to test them with IEEE double precision
-arithmetic.
-
-The core conversion routines are strtodg for decimal -> binary conversions
-and gdtoa for binary -> decimal conversions.  These routines operate
-on arrays of unsigned 32-bit integers of type ULong, a signed 32-bit
-exponent of type Long, and arithmetic characteristics described in
-struct FPI; FPI, Long, and ULong are defined in gdtoa.h.  File arith.h
-is supposed to provide #defines that cause gdtoa.h to define its
-types correctly.  File arithchk.c is source for a program that
-generates a suitable arith.h on all systems where I've been able to
-test it.
-
-The core conversion routines are meant to be called by helper routines
-that know details of the particular binary arithmetic of interest and
-convert.  The present directory provides helper routines for 5 variants
-of IEEE binary floating-point arithmetic, each indicated by one or
-two letters:
-
-	f	IEEE single precision
-	d	IEEE double precision
-	x	IEEE extended precision, as on Intel 80x87
-		and software emulations of Motorola 68xxx chips
-		that do not pad the way the 68xxx does, but
-		only store 80 bits
-	xL	IEEE extended precision, as on Motorola 68xxx chips
-	Q	quad precision, as on Sun Sparc chips
-	dd	double double, pairs of IEEE double numbers
-		whose sum is the desired value
-
-For decimal -> binary conversions, there are three families of
-helper routines: one for round-nearest (or the current rounding
-mode on IEEE-arithmetic systems that provide the C99 fegetround()
-function, if compiled with -DHonor_FLT_ROUNDS):
-
-	strtof
-	strtod
-	strtodd
-	strtopd
-	strtopf
-	strtopx
-	strtopxL
-	strtopQ
-
-one with rounding direction specified:
-
-	strtorf
-	strtord
-	strtordd
-	strtorx
-	strtorxL
-	strtorQ
-
-and one for computing an interval (at most one bit wide) that contains
-the decimal number:
-
-	strtoIf
-	strtoId
-	strtoIdd
-	strtoIx
-	strtoIxL
-	strtoIQ
-
-The latter call strtoIg, which makes one call on strtodg and adjusts
-the result to provide the desired interval.  On systems where native
-arithmetic can easily make one-ulp adjustments on values in the
-desired floating-point format, it might be more efficient to use the
-native arithmetic.  Routine strtodI is a variant of strtoId that
-illustrates one way to do this for IEEE binary double-precision
-arithmetic -- but whether this is more efficient remains to be seen.
-
-Functions strtod and strtof have "natural" return types, float and
-double -- strtod is specified by the C standard, and strtof appears
-in the stdlib.h of some systems, such as (at least some) Linux systems.
-The other functions write their results to their final argument(s):
-to the final two argument for the strtoI... (interval) functions,
-and to the final argument for the others (strtop... and strtor...).
-Where possible, these arguments have "natural" return types (double*
-or float*), to permit at least some type checking.  In reality, they
-are viewed as arrays of ULong (or, for the "x" functions, UShort)
-values. On systems where long double is the appropriate type, one can
-pass long double* final argument(s) to these routines.  The int value
-that these routines return is the return value from the call they make
-on strtodg; see the enum of possible return values in gdtoa.h.
-
-Source files g_ddfmt.c, misc.c, smisc.c, strtod.c, strtodg.c, and ulp.c
-should use true IEEE double arithmetic (not, e.g., double extended),
-at least for storing (and viewing the bits of) the variables declared
-"double" within them.
-
-One detail indicated in struct FPI is whether the target binary
-arithmetic departs from the IEEE standard by flushing denormalized
-numbers to 0.  On systems that do this, the helper routines for
-conversion to double-double format (when compiled with
-Sudden_Underflow #defined) penalize the bottom of the exponent
-range so that they return a nonzero result only when the least
-significant bit of the less significant member of the pair of
-double values returned can be expressed as a normalized double
-value.  An alternative would be to drop to 53-bit precision near
-the bottom of the exponent range.  To get correct rounding, this
-would (in general) require two calls on strtodg (one specifying
-126-bit arithmetic, then, if necessary, one specifying 53-bit
-arithmetic).
-
-By default, the core routine strtodg and strtod set errno to ERANGE
-if the result overflows to +Infinity or underflows to 0.  Compile
-these routines with NO_ERRNO #defined to inhibit errno assignments.
-
-Routine strtod is based on netlib's "dtoa.c from fp", and
-(f = strtod(s,se)) is more efficient for some conversions than, say,
-strtord(s,se,1,&f).  Parts of strtod require true IEEE double
-arithmetic with the default rounding mode (round-to-nearest) and, on
-systems with IEEE extended-precision registers, double-precision
-(53-bit) rounding precision.  If the machine uses (the equivalent of)
-Intel 80x87 arithmetic, the call
-	_control87(PC_53, MCW_PC);
-does this with many compilers.  Whether this or another call is
-appropriate depends on the compiler; for this to work, it may be
-necessary to #include "float.h" or another system-dependent header
-file.
-
-Source file strtodnrp.c gives a strtod that does not require 53-bit
-rounding precision on systems (such as Intel IA32 systems) that may
-suffer double rounding due to use of extended-precision registers.
-For some conversions this variant of strtod is less efficient than the
-one in strtod.c when the latter is run with 53-bit rounding precision.
-
-The values that the strto* routines return for NaNs are determined by
-gd_qnan.h, which the makefile generates by running the program whose
-source is qnan.c.  Note that the rules for distinguishing signaling
-from quiet NaNs are system-dependent.  For cross-compilation, you need
-to determine arith.h and gd_qnan.h suitably, e.g., using the
-arithmetic of the target machine.
-
-C99's hexadecimal floating-point constants are recognized by the
-strto* routines (but this feature has not yet been heavily tested).
-Compiling with NO_HEX_FP #defined disables this feature.
-
-When compiled with -DINFNAN_CHECK, the strto* routines recognize C99's
-NaN and Infinity syntax.  Moreover, unless No_Hex_NaN is #defined, the
-strto* routines also recognize C99's NaN(...) syntax: they accept
-(case insensitively) strings of the form NaN(x), where x is a string
-of hexadecimal digits and spaces; if there is only one string of
-hexadecimal digits, it is taken for the fraction bits of the resulting
-NaN; if there are two or more strings of hexadecimal digits, each
-string is assigned to the next available sequence of 32-bit words of
-fractions bits (starting with the most significant), right-aligned in
-each sequence.
-
-For binary -> decimal conversions, I've provided just one family
-of helper routines:
-
-	g_ffmt
-	g_dfmt
-	g_ddfmt
-	g_xfmt
-	g_xLfmt
-	g_Qfmt
-
-which do a "%g" style conversion either to a specified number of decimal
-places (if their ndig argument is positive), or to the shortest
-decimal string that rounds to the given binary floating-point value
-(if ndig <= 0).  They write into a buffer supplied as an argument
-and return either a pointer to the end of the string (a null character)
-in the buffer, if the buffer was long enough, or 0.  Other forms of
-conversion are easily done with the help of gdtoa(), such as %e or %f
-style and conversions with direction of rounding specified (so that, if
-desired, the decimal value is either >= or <= the binary value).
-On IEEE-arithmetic systems that provide the C99 fegetround() function,
-if compiled with -DHonor_FLT_ROUNDS, these routines honor the current
-rounding mode.
-
-For an example of more general conversions based on dtoa(), see
-netlib's "printf.c from ampl/solvers".
-
-For double-double -> decimal, g_ddfmt() assumes IEEE-like arithmetic
-of precision max(126, #bits(input)) bits, where #bits(input) is the
-number of mantissa bits needed to represent the sum of the two double
-values in the input.
-
-The makefile creates a library, gdtoa.a.  To use the helper
-routines, a program only needs to include gdtoa.h.  All the
-source files for gdtoa.a include a more extensive gdtoaimp.h;
-among other things, gdtoaimp.h has #defines that make "internal"
-names end in _D2A.  To make a "system" library, one could modify
-these #defines to make the names start with __.
-
-Various comments about possible #defines appear in gdtoaimp.h,
-but for most purposes, arith.h should set suitable #defines.
-
-Systems with preemptive scheduling of multiple threads require some
-manual intervention.  On such systems, it's necessary to compile
-dmisc.c, dtoa.c gdota.c, and misc.c with MULTIPLE_THREADS #defined,
-and to provide (or suitably #define) two locks, acquired by
-ACQUIRE_DTOA_LOCK(n) and freed by FREE_DTOA_LOCK(n) for n = 0 or 1.
-(The second lock, accessed in pow5mult, ensures lazy evaluation of
-only one copy of high powers of 5; omitting this lock would introduce
-a small probability of wasting memory, but would otherwise be harmless.)
-Routines that call dtoa or gdtoa directly must also invoke freedtoa(s)
-to free the value s returned by dtoa or gdtoa.  It's OK to do so whether
-or not MULTIPLE_THREADS is #defined, and the helper g_*fmt routines
-listed above all do this indirectly (in gfmt_D2A(), which they all call).
-
-By default, there is a private pool of memory of length 2000 bytes
-for intermediate quantities, and MALLOC (see gdtoaimp.h) is called only
-if the private pool does not suffice.   2000 is large enough that MALLOC
-is called only under very unusual circumstances (decimal -> binary
-conversion of very long strings) for conversions to and from double
-precision.  For systems with preemptively scheduled multiple threads
-or for conversions to extended or quad, it may be appropriate to
-#define PRIVATE_MEM nnnn, where nnnn is a suitable value > 2000.
-For extended and quad precisions, -DPRIVATE_MEM=20000 is probably
-plenty even for many digits at the ends of the exponent range.
-Use of the private pool avoids some overhead.
-
-Directory test provides some test routines.  See its README.
-I've also tested this stuff (except double double conversions)
-with Vern Paxson's testbase program: see
-
-	V. Paxson and W. Kahan, "A Program for Testing IEEE Binary-Decimal
-	Conversion", manuscript, May 1991,
-	ftp://ftp.ee.lbl.gov/testbase-report.ps.Z .
-
-(The same ftp directory has source for testbase.)
-
-Some system-dependent additions to CFLAGS in the makefile:
-
-	HU-UX: -Aa -Ae
-	OSF (DEC Unix): -ieee_with_no_inexact
-	SunOS 4.1x: -DKR_headers -DBad_float_h
-
-If you want to put this stuff into a shared library and your
-operating system requires export lists for shared libraries,
-the following would be an appropriate export list:
-
-	dtoa
-	freedtoa
-	g_Qfmt
-	g_ddfmt
-	g_dfmt
-	g_ffmt
-	g_xLfmt
-	g_xfmt
-	gdtoa
-	strtoIQ
-	strtoId
-	strtoIdd
-	strtoIf
-	strtoIx
-	strtoIxL
-	strtod
-	strtodI
-	strtodg
-	strtof
-	strtopQ
-	strtopd
-	strtopdd
-	strtopf
-	strtopx
-	strtopxL
-	strtorQ
-	strtord
-	strtordd
-	strtorf
-	strtorx
-	strtorxL
-
-When time permits, I (dmg) hope to write in more detail about the
-present conversion routines; for now, this README file must suffice.
-Meanwhile, if you wish to write helper functions for other kinds of
-IEEE-like arithmetic, some explanation of struct FPI and the bits
-array may be helpful.  Both gdtoa and strtodg operate on a bits array
-described by FPI *fpi.  The bits array is of type ULong, a 32-bit
-unsigned integer type.  Floating-point numbers have fpi->nbits bits,
-with the least significant 32 bits in bits[0], the next 32 bits in
-bits[1], etc.  These numbers are regarded as integers multiplied by
-2^e (i.e., 2 to the power of the exponent e), where e is the second
-argument (be) to gdtoa and is stored in *exp by strtodg.  The minimum
-and maximum exponent values fpi->emin and fpi->emax for normalized
-floating-point numbers reflect this arrangement.  For example, the
-P754 standard for binary IEEE arithmetic specifies doubles as having
-53 bits, with normalized values of the form 1.xxxxx... times 2^(b-1023),
-with 52 bits (the x's) and the biased exponent b represented explicitly;
-b is an unsigned integer in the range 1 <= b <= 2046 for normalized
-finite doubles, b = 0 for denormals, and b = 2047 for Infinities and NaNs.
-To turn an IEEE double into the representation used by strtodg and gdtoa,
-we multiply 1.xxxx... by 2^52 (to make it an integer) and reduce the
-exponent e = (b-1023) by 52:
-
-	fpi->emin = 1 - 1023 - 52
-	fpi->emax = 1046 - 1023 - 52
-
-In various wrappers for IEEE double, we actually write -53 + 1 rather
-than -52, to emphasize that there are 53 bits including one implicit bit.
-Field fpi->rounding indicates the desired rounding direction, with
-possible values
-	FPI_Round_zero = toward 0,
-	FPI_Round_near = unbiased rounding -- the IEEE default,
-	FPI_Round_up = toward +Infinity, and
-	FPI_Round_down = toward -Infinity
-given in gdtoa.h.
-
-Field fpi->sudden_underflow indicates whether strtodg should return
-denormals or flush them to zero.  Normal floating-point numbers have
-bit fpi->nbits in the bits array on.  Denormals have it off, with
-exponent = fpi->emin.  Strtodg provides distinct return values for normals
-and denormals; see gdtoa.h.
-
-Compiling g__fmt.c, strtod.c, and strtodg.c with -DUSE_LOCALE causes
-the decimal-point character to be taken from the current locale; otherwise
-it is '.'.
-
-Source files dtoa.c and strtod.c in this directory are derived from
-netlib's "dtoa.c from fp" and are meant to function equivalently.
-When compiled with Honor_FLT_ROUNDS #defined (on systems that provide
-FLT_ROUNDS and fegetround() as specified in the C99 standard), they
-honor the current rounding mode.  Because FLT_ROUNDS is buggy on some
-(Linux) systems -- not reflecting calls on fesetround(), as the C99
-standard says it should -- when Honor_FLT_ROUNDS is #defined, the
-current rounding mode is obtained from fegetround() rather than from
-FLT_ROUNDS, unless Trust_FLT_ROUNDS is also #defined.
-
-Compile with -DUSE_LOCALE to use the current locale; otherwise
-decimal points are assumed to be '.'.  With -DUSE_LOCALE, unless
-you also compile with -DNO_LOCALE_CACHE, the details about the
-current "decimal point" character string are cached and assumed not
-to change during the program's execution.
-
-On machines with a 64-bit long double and perhaps a 113-bit "quad"
-type, you can invoke "make Printf" to add Printf (and variants, such
-as Fprintf) to gdtoa.a.  These are analogs, declared in stdio1.h, of
-printf and fprintf, etc. in which %La, %Le, %Lf, and %Lg are for long
-double and (if appropriate) %Lqa, %Lqe, %Lqf, and %Lqg are for quad
-precision printing.
-
-Please send comments to	David M. Gay (dmg at acm dot org, with " at "
-changed at "@" and " dot " changed to ".").
diff --git a/lib/libc/gdtoa/arithchk.c b/lib/libc/gdtoa/arithchk.c
deleted file mode 100644
index 305aec415..000000000
--- a/lib/libc/gdtoa/arithchk.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* $NetBSD: arithchk.c,v 1.4 2012/06/24 15:26:03 christos Exp $ */
-
-/****************************************************************
-Copyright (C) 1997, 1998 Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-****************************************************************/
-
-/* Try to deduce arith.h from arithmetic properties. */
-
-#include <stdio.h>
-
-static int dalign;
-typedef struct
-Akind {
-	char *name;
-	int   kind;
-	} Akind;
-
-static Akind
-IEEE_LITTLE_ENDIAN	= { "IEEE_LITTLE_ENDIAN", 1 },
-IEEE_BIG_ENDIAN		= { "IEEE_BIG_ENDIAN", 2 },
-IBM			= { "IBM", 3 },
-VAX			= { "VAX", 4 },
-CRAY			= { "CRAY", 5};
-
-static Akind *
-Lcheck(void)
-{
-	union {
-		double d;
-		long L[2];
-		} u;
-	struct {
-		double d;
-		long L;
-		} x[2];
-
-	if (sizeof(x) > 2*(sizeof(double) + sizeof(long)))
-		dalign = 1;
-	u.L[0] = u.L[1] = 0;
-	u.d = 1e13;
-	if (u.L[0] == 1117925532 && u.L[1] == -448790528)
-		return &IEEE_BIG_ENDIAN;
-	if (u.L[1] == 1117925532 && u.L[0] == -448790528)
-		return &IEEE_LITTLE_ENDIAN;
-	if (u.L[0] == -2065213935 && u.L[1] == 10752)
-		return &VAX;
-	if (u.L[0] == 1267827943 && u.L[1] == 704643072)
-		return &IBM;
-	return 0;
-	}
-
-static Akind *
-icheck(void)
-{
-	union {
-		double d;
-		int L[2];
-		} u;
-	struct {
-		double d;
-		int L;
-		} x[2];
-
-	if (sizeof(x) > 2*(sizeof(double) + sizeof(int)))
-		dalign = 1;
-	u.L[0] = u.L[1] = 0;
-	u.d = 1e13;
-	if (u.L[0] == 1117925532 && u.L[1] == -448790528)
-		return &IEEE_BIG_ENDIAN;
-	if (u.L[1] == 1117925532 && u.L[0] == -448790528)
-		return &IEEE_LITTLE_ENDIAN;
-	if (u.L[0] == -2065213935 && u.L[1] == 10752)
-		return &VAX;
-	if (u.L[0] == 1267827943 && u.L[1] == 704643072)
-		return &IBM;
-	return 0;
-	}
-
-char *emptyfmt = "";	/* avoid possible warning message with printf("") */
-
-static Akind *
-ccheck(void)
-{
-	union {
-		double d;
-		long L;
-		} u;
-	long Cray1;
-
-	/* Cray1 = 4617762693716115456 -- without overflow on non-Crays */
-	Cray1 = printf(emptyfmt) < 0 ? 0 : 4617762;
-	if (printf(emptyfmt, Cray1) >= 0)
-		Cray1 = 1000000*Cray1 + 693716;
-	if (printf(emptyfmt, Cray1) >= 0)
-		Cray1 = 1000000*Cray1 + 115456;
-	u.d = 1e13;
-	if (u.L == Cray1)
-		return &CRAY;
-	return 0;
-	}
-
-static int
-fzcheck(void)
-{
-	double a, b;
-	int i;
-
-	a = 1.;
-	b = .1;
-	for(i = 155;; b *= b, i >>= 1) {
-		if (i & 1) {
-			a *= b;
-			if (i == 1)
-				break;
-			}
-		}
-	b = a * a;
-	return b == 0.;
-	}
-
-int
-main(void)
-{
-	Akind *a = 0;
-	int Ldef = 0;
-	FILE *f;
-
-#ifdef WRITE_ARITH_H	/* for Symantec's buggy "make" */
-	f = fopen("arith.h", "w");
-	if (!f) {
-		printf("Cannot open arith.h\n");
-		return 1;
-		}
-#else
-	f = stdout;
-#endif
-
-	if (sizeof(double) == 2*sizeof(long))
-		a = Lcheck();
-	else if (sizeof(double) == 2*sizeof(int)) {
-		Ldef = 1;
-		a = icheck();
-		}
-	else if (sizeof(double) == sizeof(long))
-		a = ccheck();
-	if (a) {
-		fprintf(f, "#define %s\n#define Arith_Kind_ASL %d\n",
-			a->name, a->kind);
-		if (Ldef)
-			fprintf(f, "#define Long int\n#define Intcast (int)(long)\n");
-		if (dalign)
-			fprintf(f, "#define Double_Align\n");
-		if (sizeof(char*) == 8)
-			fprintf(f, "#define X64_bit_pointers\n");
-#ifndef NO_LONG_LONG
-		if (sizeof(long long) < 8)
-#endif
-			fprintf(f, "#define NO_LONG_LONG\n");
-		if (a->kind <= 2 && fzcheck())
-			fprintf(f, "#define Sudden_Underflow\n");
-#ifdef WRITE_ARITH_H
-		fclose(f);
-#endif
-		return 0;
-		}
-	fprintf(f, "/* Unknown arithmetic */\n");
-#ifdef WRITE_ARITH_H
-	fclose(f);
-#endif
-	return 1;
-	}
diff --git a/lib/libc/gdtoa/dmisc.c b/lib/libc/gdtoa/dmisc.c
deleted file mode 100644
index 121f8bbee..000000000
--- a/lib/libc/gdtoa/dmisc.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* $NetBSD: dmisc.c,v 1.4 2008/03/21 23:13:48 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
-#ifndef MULTIPLE_THREADS
- char *dtoa_result;
-#endif
-
- char *
-#ifdef KR_headers
-rv_alloc(i) size_t i;
-#else
-rv_alloc(size_t i)
-#endif
-{
-	size_t j;
-	int k, *r;
-
-	j = sizeof(ULong);
-	for(k = 0;
-		sizeof(Bigint) - sizeof(ULong) - sizeof(int) + j <= i;
-		j <<= 1)
-			k++;
-	r = (int*)(void*)Balloc(k);
-	if (r == NULL)
-		return NULL;
-	*r = k;
-	return
-#ifndef MULTIPLE_THREADS
-	dtoa_result =
-#endif
-		(char *)(void *)(r+1);
-	}
-
- char *
-#ifdef KR_headers
-nrv_alloc(s, rve, n) CONST char *s; char **rve; size_t n;
-#else
-nrv_alloc(CONST char *s, char **rve, size_t n)
-#endif
-{
-	char *rv, *t;
-
-	t = rv = rv_alloc(n);
-	if (t == NULL)
-		return NULL;
-	while((*t = *s++) !=0)
-		t++;
-	if (rve)
-		*rve = t;
-	return rv;
-	}
-
-/* freedtoa(s) must be used to free values s returned by dtoa
- * when MULTIPLE_THREADS is #defined.  It should be used in all cases,
- * but for consistency with earlier versions of dtoa, it is optional
- * when MULTIPLE_THREADS is not defined.
- */
-
- void
-#ifdef KR_headers
-freedtoa(s) char *s;
-#else
-freedtoa(char *s)
-#endif
-{
-	Bigint *b = (Bigint *)(void *)((int *)(void *)s - 1);
-	b->maxwds = 1 << (b->k = *(int*)(void*)b);
-	Bfree(b);
-#ifndef MULTIPLE_THREADS
-	if (s == dtoa_result)
-		dtoa_result = 0;
-#endif
-	}
-
- int
-quorem
-#ifdef KR_headers
-	(b, S) Bigint *b, *S;
-#else
-	(Bigint *b, Bigint *S)
-#endif
-{
-	int n;
-	ULong *bx, *bxe, q, *sx, *sxe;
-#ifdef ULLong
-	ULLong borrow, carry, y, ys;
-#else
-	ULong borrow, carry, y, ys;
-#ifdef Pack_32
-	ULong si, z, zs;
-#endif
-#endif
-
-	n = S->wds;
-#ifdef DEBUG
-	/*debug*/ if (b->wds > n)
-	/*debug*/	Bug("oversize b in quorem");
-#endif
-	if (b->wds < n)
-		return 0;
-	sx = S->x;
-	sxe = sx + --n;
-	bx = b->x;
-	bxe = bx + n;
-	q = *bxe / (*sxe + 1);	/* ensure q <= true quotient */
-#ifdef DEBUG
-	/*debug*/ if (q > 9)
-	/*debug*/	Bug("oversized quotient in quorem");
-#endif
-	if (q) {
-		borrow = 0;
-		carry = 0;
-		do {
-#ifdef ULLong
-			ys = *sx++ * (ULLong)q + carry;
-			carry = ys >> 32;
-			/* LINTED conversion */
-			y = *bx - (ys & 0xffffffffUL) - borrow;
-			borrow = y >> 32 & 1UL;
-			/* LINTED conversion */
-			*bx++ = y & 0xffffffffUL;
-#else
-#ifdef Pack_32
-			si = *sx++;
-			ys = (si & 0xffff) * q + carry;
-			zs = (si >> 16) * q + (ys >> 16);
-			carry = zs >> 16;
-			y = (*bx & 0xffff) - (ys & 0xffff) - borrow;
-			borrow = (y & 0x10000) >> 16;
-			z = (*bx >> 16) - (zs & 0xffff) - borrow;
-			borrow = (z & 0x10000) >> 16;
-			Storeinc(bx, z, y);
-#else
-			ys = *sx++ * q + carry;
-			carry = ys >> 16;
-			y = *bx - (ys & 0xffff) - borrow;
-			borrow = (y & 0x10000) >> 16;
-			*bx++ = y & 0xffff;
-#endif
-#endif
-			}
-			while(sx <= sxe);
-		if (!*bxe) {
-			bx = b->x;
-			while(--bxe > bx && !*bxe)
-				--n;
-			b->wds = n;
-			}
-		}
-	if (cmp(b, S) >= 0) {
-		q++;
-		borrow = 0;
-		carry = 0;
-		bx = b->x;
-		sx = S->x;
-		do {
-#ifdef ULLong
-			ys = *sx++ + carry;
-			carry = ys >> 32;
-			/* LINTED conversion */
-			y = *bx - (ys & 0xffffffffUL) - borrow;
-			borrow = y >> 32 & 1UL;
-			/* LINTED conversion */
-			*bx++ = y & 0xffffffffUL;
-#else
-#ifdef Pack_32
-			si = *sx++;
-			ys = (si & 0xffff) + carry;
-			zs = (si >> 16) + (ys >> 16);
-			carry = zs >> 16;
-			y = (*bx & 0xffff) - (ys & 0xffff) - borrow;
-			borrow = (y & 0x10000) >> 16;
-			z = (*bx >> 16) - (zs & 0xffff) - borrow;
-			borrow = (z & 0x10000) >> 16;
-			Storeinc(bx, z, y);
-#else
-			ys = *sx++ + carry;
-			carry = ys >> 16;
-			y = *bx - (ys & 0xffff) - borrow;
-			borrow = (y & 0x10000) >> 16;
-			*bx++ = y & 0xffff;
-#endif
-#endif
-			}
-			while(sx <= sxe);
-		bx = b->x;
-		bxe = bx + n;
-		if (!*bxe) {
-			while(--bxe > bx && !*bxe)
-				--n;
-			b->wds = n;
-			}
-		}
-	return q;
-	}
diff --git a/lib/libc/gdtoa/dtoa.c b/lib/libc/gdtoa/dtoa.c
deleted file mode 100644
index 66fe35cdc..000000000
--- a/lib/libc/gdtoa/dtoa.c
+++ /dev/null
@@ -1,842 +0,0 @@
-/* $NetBSD: dtoa.c,v 1.10 2012/05/16 17:48:59 alnsn Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 1999 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
-/* dtoa for IEEE arithmetic (dmg): convert double to ASCII string.
- *
- * Inspired by "How to Print Floating-Point Numbers Accurately" by
- * Guy L. Steele, Jr. and Jon L. White [Proc. ACM SIGPLAN '90, pp. 112-126].
- *
- * Modifications:
- *	1. Rather than iterating, we use a simple numeric overestimate
- *	   to determine k = floor(log10(d)).  We scale relevant
- *	   quantities using O(log2(k)) rather than O(k) multiplications.
- *	2. For some modes > 2 (corresponding to ecvt and fcvt), we don't
- *	   try to generate digits strictly left to right.  Instead, we
- *	   compute with fewer bits and propagate the carry if necessary
- *	   when rounding the final digit up.  This is often faster.
- *	3. Under the assumption that input will be rounded nearest,
- *	   mode 0 renders 1e23 as 1e23 rather than 9.999999999999999e22.
- *	   That is, we allow equality in stopping tests when the
- *	   round-nearest rule will give the same floating-point value
- *	   as would satisfaction of the stopping test with strict
- *	   inequality.
- *	4. We remove common factors of powers of 2 from relevant
- *	   quantities.
- *	5. When converting floating-point integers less than 1e16,
- *	   we use floating-point arithmetic rather than resorting
- *	   to multiple-precision integers.
- *	6. When asked to produce fewer than 15 digits, we first try
- *	   to get by with floating-point arithmetic; we resort to
- *	   multiple-precision integer arithmetic only if we cannot
- *	   guarantee that the floating-point calculation has given
- *	   the correctly rounded result.  For k requested digits and
- *	   "uniformly" distributed input, the probability is
- *	   something like 10^(k-15) that we must resort to the Long
- *	   calculation.
- */
-
-#ifdef Honor_FLT_ROUNDS
-#undef Check_FLT_ROUNDS
-#define Check_FLT_ROUNDS
-#else
-#define Rounding Flt_Rounds
-#endif
-
- char *
-dtoa
-#ifdef KR_headers
-	(d0, mode, ndigits, decpt, sign, rve)
-	double d0; int mode, ndigits, *decpt, *sign; char **rve;
-#else
-	(double d0, int mode, int ndigits, int *decpt, int *sign, char **rve)
-#endif
-{
- /*	Arguments ndigits, decpt, sign are similar to those
-	of ecvt and fcvt; trailing zeros are suppressed from
-	the returned string.  If not null, *rve is set to point
-	to the end of the return value.  If d is +-Infinity or NaN,
-	then *decpt is set to 9999.
-
-	mode:
-		0 ==> shortest string that yields d when read in
-			and rounded to nearest.
-		1 ==> like 0, but with Steele & White stopping rule;
-			e.g. with IEEE P754 arithmetic , mode 0 gives
-			1e23 whereas mode 1 gives 9.999999999999999e22.
-		2 ==> max(1,ndigits) significant digits.  This gives a
-			return value similar to that of ecvt, except
-			that trailing zeros are suppressed.
-		3 ==> through ndigits past the decimal point.  This
-			gives a return value similar to that from fcvt,
-			except that trailing zeros are suppressed, and
-			ndigits can be negative.
-		4,5 ==> similar to 2 and 3, respectively, but (in
-			round-nearest mode) with the tests of mode 0 to
-			possibly return a shorter string that rounds to d.
-			With IEEE arithmetic and compilation with
-			-DHonor_FLT_ROUNDS, modes 4 and 5 behave the same
-			as modes 2 and 3 when FLT_ROUNDS != 1.
-		6-9 ==> Debugging modes similar to mode - 4:  don't try
-			fast floating-point estimate (if applicable).
-
-		Values of mode other than 0-9 are treated as mode 0.
-
-		Sufficient space is allocated to the return value
-		to hold the suppressed trailing zeros.
-	*/
-
-	int bbits, b2, b5, be, dig, i, ieps, ilim0,
-		j, jj1, k, k0, k_check, leftright, m2, m5, s2, s5,
-		spec_case, try_quick;
-	int ilim = 0, ilim1 = 0; /* pacify gcc */
-	Long L;
-#ifndef Sudden_Underflow
-	int denorm;
-	ULong x;
-#endif
-	Bigint *b, *b1, *delta, *mhi, *S;
-	Bigint *mlo = NULL; /* pacify gcc */
-	U d, d2, eps;
-	double ds;
-	char *s, *s0;
-#ifdef SET_INEXACT
-	int inexact, oldinexact;
-#endif
-#ifdef Honor_FLT_ROUNDS /*{*/
-	int Rounding;
-#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */
-	Rounding = Flt_Rounds;
-#else /*}{*/
-	Rounding = 1;
-	switch(fegetround()) {
-	  case FE_TOWARDZERO:	Rounding = 0; break;
-	  case FE_UPWARD:	Rounding = 2; break;
-	  case FE_DOWNWARD:	Rounding = 3;
-	  }
-#endif /*}}*/
-#endif /*}*/
-
-#ifndef MULTIPLE_THREADS
-	if (dtoa_result) {
-		freedtoa(dtoa_result);
-		dtoa_result = 0;
-		}
-#endif
-	d.d = d0;
-	if (word0(&d) & Sign_bit) {
-		/* set sign for everything, including 0's and NaNs */
-		*sign = 1;
-		word0(&d) &= ~Sign_bit;	/* clear sign bit */
-		}
-	else
-		*sign = 0;
-
-#if defined(IEEE_Arith) + defined(VAX)
-#ifdef IEEE_Arith
-	if ((word0(&d) & Exp_mask) == Exp_mask)
-#else
-	if (word0(&d)  == 0x8000)
-#endif
-		{
-		/* Infinity or NaN */
-		*decpt = 9999;
-#ifdef IEEE_Arith
-		if (!word1(&d) && !(word0(&d) & 0xfffff))
-			return nrv_alloc("Infinity", rve, 8);
-#endif
-		return nrv_alloc("NaN", rve, 3);
-		}
-#endif
-#ifdef IBM
-	dval(&d) += 0; /* normalize */
-#endif
-	if (!dval(&d)) {
-		*decpt = 1;
-		return nrv_alloc("0", rve, 1);
-		}
-
-#ifdef SET_INEXACT
-	try_quick = oldinexact = get_inexact();
-	inexact = 1;
-#endif
-#ifdef Honor_FLT_ROUNDS
-	if (Rounding >= 2) {
-		if (*sign)
-			Rounding = Rounding == 2 ? 0 : 2;
-		else
-			if (Rounding != 2)
-				Rounding = 0;
-		}
-#endif
-
-	b = d2b(dval(&d), &be, &bbits);
-	if (b == NULL)
-		return NULL;
-#ifdef Sudden_Underflow
-	i = (int)(word0(&d) >> Exp_shift1 & (Exp_mask>>Exp_shift1));
-#else
-	if (( i = (int)(word0(&d) >> Exp_shift1 & (Exp_mask>>Exp_shift1)) )!=0) {
-#endif
-		dval(&d2) = dval(&d);
-		word0(&d2) &= Frac_mask1;
-		word0(&d2) |= Exp_11;
-#ifdef IBM
-		if (( j = 11 - hi0bits(word0(&d2) & Frac_mask) )!=0)
-			dval(&d2) /= 1 << j;
-#endif
-
-		/* log(x)	~=~ log(1.5) + (x-1.5)/1.5
-		 * log10(x)	 =  log(x) / log(10)
-		 *		~=~ log(1.5)/log(10) + (x-1.5)/(1.5*log(10))
-		 * log10(&d) = (i-Bias)*log(2)/log(10) + log10(&d2)
-		 *
-		 * This suggests computing an approximation k to log10(&d) by
-		 *
-		 * k = (i - Bias)*0.301029995663981
-		 *	+ ( (d2-1.5)*0.289529654602168 + 0.176091259055681 );
-		 *
-		 * We want k to be too large rather than too small.
-		 * The error in the first-order Taylor series approximation
-		 * is in our favor, so we just round up the constant enough
-		 * to compensate for any error in the multiplication of
-		 * (i - Bias) by 0.301029995663981; since |i - Bias| <= 1077,
-		 * and 1077 * 0.30103 * 2^-52 ~=~ 7.2e-14,
-		 * adding 1e-13 to the constant term more than suffices.
-		 * Hence we adjust the constant term to 0.1760912590558.
-		 * (We could get a more accurate k by invoking log10,
-		 *  but this is probably not worthwhile.)
-		 */
-
-		i -= Bias;
-#ifdef IBM
-		i <<= 2;
-		i += j;
-#endif
-#ifndef Sudden_Underflow
-		denorm = 0;
-		}
-	else {
-		/* d is denormalized */
-
-		i = bbits + be + (Bias + (P-1) - 1);
-		x = i > 32  ? word0(&d) << (64 - i) | word1(&d) >> (i - 32)
-			    : word1(&d) << (32 - i);
-		dval(&d2) = x;
-		word0(&d2) -= 31*Exp_msk1; /* adjust exponent */
-		i -= (Bias + (P-1) - 1) + 1;
-		denorm = 1;
-		}
-#endif
-	ds = (dval(&d2)-1.5)*0.289529654602168 + 0.1760912590558 + i*0.301029995663981;
-	k = (int)ds;
-	if (ds < 0. && ds != k)
-		k--;	/* want k = floor(ds) */
-	k_check = 1;
-	if (k >= 0 && k <= Ten_pmax) {
-		if (dval(&d) < tens[k])
-			k--;
-		k_check = 0;
-		}
-	j = bbits - i - 1;
-	if (j >= 0) {
-		b2 = 0;
-		s2 = j;
-		}
-	else {
-		b2 = -j;
-		s2 = 0;
-		}
-	if (k >= 0) {
-		b5 = 0;
-		s5 = k;
-		s2 += k;
-		}
-	else {
-		b2 -= k;
-		b5 = -k;
-		s5 = 0;
-		}
-	if (mode < 0 || mode > 9)
-		mode = 0;
-
-#ifndef SET_INEXACT
-#ifdef Check_FLT_ROUNDS
-	try_quick = Rounding == 1;
-#else
-	try_quick = 1;
-#endif
-#endif /*SET_INEXACT*/
-
-	if (mode > 5) {
-		mode -= 4;
-		try_quick = 0;
-		}
-	leftright = 1;
-	ilim = ilim1 = -1;	/* Values for cases 0 and 1; done here to */
-				/* silence erroneous "gcc -Wall" warning. */
-	switch(mode) {
-		case 0:
-		case 1:
-			i = 18;
-			ndigits = 0;
-			break;
-		case 2:
-			leftright = 0;
-			/* FALLTHROUGH */
-		case 4:
-			if (ndigits <= 0)
-				ndigits = 1;
-			ilim = ilim1 = i = ndigits;
-			break;
-		case 3:
-			leftright = 0;
-			/* FALLTHROUGH */
-		case 5:
-			i = ndigits + k + 1;
-			ilim = i;
-			ilim1 = i - 1;
-			if (i <= 0)
-				i = 1;
-		}
-	s = s0 = rv_alloc((size_t)i);
-	if (s == NULL)
-		return NULL;
-
-#ifdef Honor_FLT_ROUNDS
-	if (mode > 1 && Rounding != 1)
-		leftright = 0;
-#endif
-
-	if (ilim >= 0 && ilim <= Quick_max && try_quick) {
-
-		/* Try to get by with floating-point arithmetic. */
-
-		i = 0;
-		dval(&d2) = dval(&d);
-		k0 = k;
-		ilim0 = ilim;
-		ieps = 2; /* conservative */
-		if (k > 0) {
-			ds = tens[k&0xf];
-			j = (unsigned int)k >> 4;
-			if (j & Bletch) {
-				/* prevent overflows */
-				j &= Bletch - 1;
-				dval(&d) /= bigtens[n_bigtens-1];
-				ieps++;
-				}
-			for(; j; j = (unsigned int)j >> 1, i++)
-				if (j & 1) {
-					ieps++;
-					ds *= bigtens[i];
-					}
-			dval(&d) /= ds;
-			}
-		else if (( jj1 = -k )!=0) {
-			dval(&d) *= tens[jj1 & 0xf];
-			for(j = jj1 >> 4; j; j >>= 1, i++)
-				if (j & 1) {
-					ieps++;
-					dval(&d) *= bigtens[i];
-					}
-			}
-		if (k_check && dval(&d) < 1. && ilim > 0) {
-			if (ilim1 <= 0)
-				goto fast_failed;
-			ilim = ilim1;
-			k--;
-			dval(&d) *= 10.;
-			ieps++;
-			}
-		dval(&eps) = ieps*dval(&d) + 7.;
-		word0(&eps) -= (P-1)*Exp_msk1;
-		if (ilim == 0) {
-			S = mhi = 0;
-			dval(&d) -= 5.;
-			if (dval(&d) > dval(&eps))
-				goto one_digit;
-			if (dval(&d) < -dval(&eps))
-				goto no_digits;
-			goto fast_failed;
-			}
-#ifndef No_leftright
-		if (leftright) {
-			/* Use Steele & White method of only
-			 * generating digits needed.
-			 */
-			dval(&eps) = 0.5/tens[ilim-1] - dval(&eps);
-			for(i = 0;;) {
-				L = dval(&d);
-				dval(&d) -= L;
-				*s++ = '0' + (int)L;
-				if (dval(&d) < dval(&eps))
-					goto ret1;
-				if (1. - dval(&d) < dval(&eps))
-					goto bump_up;
-				if (++i >= ilim)
-					break;
-				dval(&eps) *= 10.;
-				dval(&d) *= 10.;
-				}
-			}
-		else {
-#endif
-			/* Generate ilim digits, then fix them up. */
-			dval(&eps) *= tens[ilim-1];
-			for(i = 1;; i++, dval(&d) *= 10.) {
-				L = (Long)(dval(&d));
-				if (!(dval(&d) -= L))
-					ilim = i;
-				*s++ = '0' + (int)L;
-				if (i == ilim) {
-					if (dval(&d) > 0.5 + dval(&eps))
-						goto bump_up;
-					else if (dval(&d) < 0.5 - dval(&eps)) {
-						while(*--s == '0');
-						s++;
-						goto ret1;
-						}
-					break;
-					}
-				}
-#ifndef No_leftright
-			}
-#endif
- fast_failed:
-		s = s0;
-		dval(&d) = dval(&d2);
-		k = k0;
-		ilim = ilim0;
-		}
-
-	/* Do we have a "small" integer? */
-
-	if (be >= 0 && k <= Int_max) {
-		/* Yes. */
-		ds = tens[k];
-		if (ndigits < 0 && ilim <= 0) {
-			S = mhi = 0;
-			if (ilim < 0 || dval(&d) <= 5*ds)
-				goto no_digits;
-			goto one_digit;
-			}
-		for(i = 1;; i++, dval(&d) *= 10.) {
-			L = (Long)(dval(&d) / ds);
-			dval(&d) -= L*ds;
-#ifdef Check_FLT_ROUNDS
-			/* If FLT_ROUNDS == 2, L will usually be high by 1 */
-			if (dval(&d) < 0) {
-				L--;
-				dval(&d) += ds;
-				}
-#endif
-			*s++ = '0' + (int)L;
-			if (!dval(&d)) {
-#ifdef SET_INEXACT
-				inexact = 0;
-#endif
-				break;
-				}
-			if (i == ilim) {
-#ifdef Honor_FLT_ROUNDS
-				if (mode > 1)
-				switch(Rounding) {
-				  case 0: goto ret1;
-				  case 2: goto bump_up;
-				  }
-#endif
-				dval(&d) += dval(&d);
-#ifdef ROUND_BIASED
-				if (dval(&d) >= ds)
-#else
-				if (dval(&d) > ds || (dval(&d) == ds && L & 1))
-#endif
-					{
- bump_up:
-					while(*--s == '9')
-						if (s == s0) {
-							k++;
-							*s = '0';
-							break;
-							}
-					++*s++;
-					}
-				break;
-				}
-			}
-		goto ret1;
-		}
-
-	m2 = b2;
-	m5 = b5;
-	mhi = mlo = 0;
-	if (leftright) {
-		i =
-#ifndef Sudden_Underflow
-			denorm ? be + (Bias + (P-1) - 1 + 1) :
-#endif
-#ifdef IBM
-			1 + 4*P - 3 - bbits + ((bbits + be - 1) & 3);
-#else
-			1 + P - bbits;
-#endif
-		b2 += i;
-		s2 += i;
-		mhi = i2b(1);
-		if (mhi == NULL)
-			return NULL;
-		}
-	if (m2 > 0 && s2 > 0) {
-		i = m2 < s2 ? m2 : s2;
-		b2 -= i;
-		m2 -= i;
-		s2 -= i;
-		}
-	if (b5 > 0) {
-		if (leftright) {
-			if (m5 > 0) {
-				mhi = pow5mult(mhi, m5);
-				if (mhi == NULL)
-					return NULL;
-				b1 = mult(mhi, b);
-				if (b1 == NULL)
-					return NULL;
-				Bfree(b);
-				b = b1;
-				}
-			if (( j = b5 - m5 )!=0) {
-				b = pow5mult(b, j);
-				if (b == NULL)
-					return NULL;
-				}
-			}
-		else {
-			b = pow5mult(b, b5);
-			if (b == NULL)
-				return NULL;
-			}
-		}
-	S = i2b(1);
-	if (S == NULL)
-		return NULL;
-	if (s5 > 0) {
-		S = pow5mult(S, s5);
-		if (S == NULL)
-			return NULL;
-		}
-
-	/* Check for special case that d is a normalized power of 2. */
-
-	spec_case = 0;
-	if ((mode < 2 || leftright)
-#ifdef Honor_FLT_ROUNDS
-			&& Rounding == 1
-#endif
-				) {
-		if (!word1(&d) && !(word0(&d) & Bndry_mask)
-#ifndef Sudden_Underflow
-		 && word0(&d) & (Exp_mask & ~Exp_msk1)
-#endif
-				) {
-			/* The special case */
-			b2 += Log2P;
-			s2 += Log2P;
-			spec_case = 1;
-			}
-		}
-
-	/* Arrange for convenient computation of quotients:
-	 * shift left if necessary so divisor has 4 leading 0 bits.
-	 *
-	 * Perhaps we should just compute leading 28 bits of S once
-	 * and for all and pass them and a shift to quorem, so it
-	 * can do shifts and ors to compute the numerator for q.
-	 */
-#ifdef Pack_32
-	if (( i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0x1f )!=0)
-		i = 32 - i;
-#else
-	if (( i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0xf )!=0)
-		i = 16 - i;
-#endif
-	if (i > 4) {
-		i -= 4;
-		b2 += i;
-		m2 += i;
-		s2 += i;
-		}
-	else if (i < 4) {
-		i += 28;
-		b2 += i;
-		m2 += i;
-		s2 += i;
-		}
-	if (b2 > 0) {
-		b = lshift(b, b2);
-		if (b == NULL)
-			return NULL;
-		}
-	if (s2 > 0) {
-		S = lshift(S, s2);
-		if (S == NULL)
-			return NULL;
-		}
-	if (k_check) {
-		if (cmp(b,S) < 0) {
-			k--;
-			b = multadd(b, 10, 0);	/* we botched the k estimate */
-			if (b == NULL)
-				return NULL;
-			if (leftright) {
-				mhi = multadd(mhi, 10, 0);
-				if (mhi == NULL)
-					return NULL;
-				}
-			ilim = ilim1;
-			}
-		}
-	if (ilim <= 0 && (mode == 3 || mode == 5)) {
-		if (ilim < 0 || cmp(b,S = multadd(S,5,0)) <= 0) {
-			/* no digits, fcvt style */
- no_digits:
-			k = -1 - ndigits;
-			goto ret;
-			}
- one_digit:
-		*s++ = '1';
-		k++;
-		goto ret;
-		}
-	if (leftright) {
-		if (m2 > 0) {
-			mhi = lshift(mhi, m2);
-			if (mhi == NULL)
-				return NULL;
-			}
-
-		/* Compute mlo -- check for special case
-		 * that d is a normalized power of 2.
-		 */
-
-		mlo = mhi;
-		if (spec_case) {
-			mhi = Balloc(mhi->k);
-			if (mhi == NULL)
-				return NULL;
-			Bcopy(mhi, mlo);
-			mhi = lshift(mhi, Log2P);
-			if (mhi == NULL)
-				return NULL;
-			}
-
-		for(i = 1;;i++) {
-			dig = quorem(b,S) + '0';
-			/* Do we yet have the shortest decimal string
-			 * that will round to d?
-			 */
-			j = cmp(b, mlo);
-			delta = diff(S, mhi);
-			if (delta == NULL)
-				return NULL;
-			jj1 = delta->sign ? 1 : cmp(b, delta);
-			Bfree(delta);
-#ifndef ROUND_BIASED
-			if (jj1 == 0 && mode != 1 && !(word1(&d) & 1)
-#ifdef Honor_FLT_ROUNDS
-				&& Rounding >= 1
-#endif
-								   ) {
-				if (dig == '9')
-					goto round_9_up;
-				if (j > 0)
-					dig++;
-#ifdef SET_INEXACT
-				else if (!b->x[0] && b->wds <= 1)
-					inexact = 0;
-#endif
-				*s++ = dig;
-				goto ret;
-				}
-#endif
-			if (j < 0 || (j == 0 && mode != 1
-#ifndef ROUND_BIASED
-							&& !(word1(&d) & 1)
-#endif
-					)) {
-				if (!b->x[0] && b->wds <= 1) {
-#ifdef SET_INEXACT
-					inexact = 0;
-#endif
-					goto accept_dig;
-					}
-#ifdef Honor_FLT_ROUNDS
-				if (mode > 1)
-				 switch(Rounding) {
-				  case 0: goto accept_dig;
-				  case 2: goto keep_dig;
-				  }
-#endif /*Honor_FLT_ROUNDS*/
-				if (jj1 > 0) {
-					b = lshift(b, 1);
-					if (b == NULL)
-						return NULL;
-					jj1 = cmp(b, S);
-#ifdef ROUND_BIASED
-					if (jj1 >= 0 /*)*/
-#else
-					if ((jj1 > 0 || (jj1 == 0 && dig & 1))
-#endif
-					&& dig++ == '9')
-						goto round_9_up;
-					}
- accept_dig:
-				*s++ = dig;
-				goto ret;
-				}
-			if (jj1 > 0) {
-#ifdef Honor_FLT_ROUNDS
-				if (!Rounding)
-					goto accept_dig;
-#endif
-				if (dig == '9') { /* possible if i == 1 */
- round_9_up:
-					*s++ = '9';
-					goto roundoff;
-					}
-				*s++ = dig + 1;
-				goto ret;
-				}
-#ifdef Honor_FLT_ROUNDS
- keep_dig:
-#endif
-			*s++ = dig;
-			if (i == ilim)
-				break;
-			b = multadd(b, 10, 0);
-			if (b == NULL)
-				return NULL;
-			if (mlo == mhi) {
-				mlo = mhi = multadd(mhi, 10, 0);
-				if (mlo == NULL)
-					return NULL;
-				}
-			else {
-				mlo = multadd(mlo, 10, 0);
-				if (mlo == NULL)
-					return NULL;
-				mhi = multadd(mhi, 10, 0);
-				if (mhi == NULL)
-					return NULL;
-				}
-			}
-		}
-	else
-		for(i = 1;; i++) {
-			*s++ = dig = quorem(b,S) + '0';
-			if (!b->x[0] && b->wds <= 1) {
-#ifdef SET_INEXACT
-				inexact = 0;
-#endif
-				goto ret;
-				}
-			if (i >= ilim)
-				break;
-			b = multadd(b, 10, 0);
-			if (b == NULL)
-				return NULL;
-			}
-
-	/* Round off last digit */
-
-#ifdef Honor_FLT_ROUNDS
-	switch(Rounding) {
-	  case 0: goto trimzeros;
-	  case 2: goto roundoff;
-	  }
-#endif
-	b = lshift(b, 1);
-	j = cmp(b, S);
-#ifdef ROUND_BIASED
-	if (j >= 0)
-#else
-	if (j > 0 || (j == 0 && dig & 1))
-#endif
-		{
- roundoff:
-		while(*--s == '9')
-			if (s == s0) {
-				k++;
-				*s++ = '1';
-				goto ret;
-				}
-		++*s++;
-		}
-	else {
-#ifdef Honor_FLT_ROUNDS
- trimzeros:
-#endif
-		while(*--s == '0');
-		s++;
-		}
- ret:
-	Bfree(S);
-	if (mhi) {
-		if (mlo && mlo != mhi)
-			Bfree(mlo);
-		Bfree(mhi);
-		}
- ret1:
-#ifdef SET_INEXACT
-	if (inexact) {
-		if (!oldinexact) {
-			word0(&d) = Exp_1 + (70 << Exp_shift);
-			word1(&d) = 0;
-			dval(&d) += 1.;
-			}
-		}
-	else if (!oldinexact)
-		clear_inexact();
-#endif
-	Bfree(b);
-	if (s == s0) {			/* don't return empty string */
-		*s++ = '0';
-		k = 0;
-	}
-	*s = 0;
-	*decpt = k + 1;
-	if (rve)
-		*rve = s;
-	return s0;
-	}
diff --git a/lib/libc/gdtoa/g_Qfmt.c b/lib/libc/gdtoa/g_Qfmt.c
deleted file mode 100644
index f9291affe..000000000
--- a/lib/libc/gdtoa/g_Qfmt.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* $NetBSD: g_Qfmt.c,v 1.4 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_BIG_ENDIAN or IEEE_LITTLE_ENDIAN should be #defined */
-
-#ifdef IEEE_BIG_ENDIAN
-#define _0 0
-#define _1 1
-#define _2 2
-#define _3 3
-#endif
-#ifdef IEEE_LITTLE_ENDIAN
-#define _0 3
-#define _1 2
-#define _2 1
-#define _3 0
-#endif
-
- char*
-#ifdef KR_headers
-g_Qfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize;
-#else
-g_Qfmt(char *buf, void *V, int ndig, size_t bufsize)
-#endif
-{
-	static FPI fpi0 = { 113, 1-16383-113+1, 32766 - 16383 - 113 + 1, 1, 0 };
-	char *b, *s, *se;
-	ULong bits[4], *L, sign;
-	int decpt, ex, i, mode;
-#ifdef Honor_FLT_ROUNDS
-#include "gdtoa_fltrnds.h"
-#else
-#define fpi &fpi0
-#endif
-
-	if (ndig < 0)
-		ndig = 0;
-	if (bufsize < ndig + 10)
-		return 0;
-
-	L = (ULong*)V;
-	sign = L[_0] & 0x80000000L;
-	bits[3] = L[_0] & 0xffff;
-	bits[2] = L[_1];
-	bits[1] = L[_2];
-	bits[0] = L[_3];
-	b = buf;
-	if ( (ex = (L[_0] & 0x7fff0000L) >> 16) !=0) {
-		if (ex == 0x7fff) {
-			/* Infinity or NaN */
-			if (bits[0] | bits[1] | bits[2] | bits[3])
-				b = strcp(b, "NaN");
-			else {
-				b = buf;
-				if (sign)
-					*b++ = '-';
-				b = strcp(b, "Infinity");
-				}
-			return b;
-			}
-		i = STRTOG_Normal;
-		bits[3] |= 0x10000;
-		}
-	else if (bits[0] | bits[1] | bits[2] | bits[3]) {
-		i = STRTOG_Denormal;
-		ex = 1;
-		}
-	else {
-#ifndef IGNORE_ZERO_SIGN
-		if (sign)
-			*b++ = '-';
-#endif
-		*b++ = '0';
-		*b = 0;
-		return b;
-		}
-	ex -= 0x3fff + 112;
-	mode = 2;
-	if (ndig <= 0) {
-		if (bufsize < 48)
-			return 0;
-		mode = 0;
-		}
-	s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se);
-	if (s == NULL)
-		return NULL;
-	return g__fmt(buf, s, se, decpt, sign, bufsize);
-	}
diff --git a/lib/libc/gdtoa/g__fmt.c b/lib/libc/gdtoa/g__fmt.c
deleted file mode 100644
index 052978368..000000000
--- a/lib/libc/gdtoa/g__fmt.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
-#ifdef USE_LOCALE
-#include "locale.h"
-#endif
-
- char *
-#ifdef KR_headers
-g__fmt(b, s, se, decpt, sign, blen) char *b; char *s; char *se; int decpt; ULong sign; size_t blen;
-#else
-g__fmt(char *b, char *s, char *se, int decpt, ULong sign, size_t blen)
-#endif
-{
-	int i, j, k;
-	char *be, *s0;
-	size_t len;
-#ifdef USE_LOCALE
-#ifdef NO_LOCALE_CACHE
-	char *decimalpoint = localeconv()->decimal_point;
-	size_t dlen = strlen(decimalpoint);
-#else
-	char *decimalpoint;
-	static char *decimalpoint_cache;
-	static size_t dlen;
-	if (!(s0 = decimalpoint_cache)) {
-		s0 = localeconv()->decimal_point;
-		dlen = strlen(s0);
-		if ((decimalpoint_cache = MALLOC(strlen(s0) + 1)) != NULL) {
-			strcpy(decimalpoint_cache, s0);
-			s0 = decimalpoint_cache;
-			}
-		}
-	decimalpoint = s0;
-#endif
-#else
-#define dlen 0
-#endif
-	s0 = s;
-	len = (se-s) + dlen + 6; /* 6 = sign + e+dd + trailing null */
-	if (blen < len)
-		goto ret0;
-	be = b + blen - 1;
-	if (sign)
-		*b++ = '-';
-	if (decpt <= -4 || decpt > se - s + 5) {
-		*b++ = *s++;
-		if (*s) {
-#ifdef USE_LOCALE
-			while((*b = *decimalpoint++))
-				++b;
-#else
-			*b++ = '.';
-#endif
-			while((*b = *s++) !=0)
-				b++;
-			}
-		*b++ = 'e';
-		/* sprintf(b, "%+.2d", decpt - 1); */
-		if (--decpt < 0) {
-			*b++ = '-';
-			decpt = -decpt;
-			}
-		else
-			*b++ = '+';
-		for(j = 2, k = 10; 10*k <= decpt; j++, k *= 10){}
-		for(;;) {
-			i = decpt / k;
-			if (b >= be)
-				goto ret0;
-			*b++ = i + '0';
-			if (--j <= 0)
-				break;
-			decpt -= i*k;
-			decpt *= 10;
-			}
-		*b = 0;
-		}
-	else if (decpt <= 0) {
-#ifdef USE_LOCALE
-		while((*b = *decimalpoint++))
-			++b;
-#else
-		*b++ = '.';
-#endif
-		if (be < b - decpt + (se - s))
-			goto ret0;
-		for(; decpt < 0; decpt++)
-			*b++ = '0';
-		while((*b = *s++) != 0)
-			b++;
-		}
-	else {
-		while((*b = *s++) != 0) {
-			b++;
-			if (--decpt == 0 && *s) {
-#ifdef USE_LOCALE
-				while(*b = *decimalpoint++)
-					++b;
-#else
-				*b++ = '.';
-#endif
-				}
-			}
-		if (b + decpt > be) {
- ret0:
-			b = 0;
-			goto ret;
-			}
-		for(; decpt > 0; decpt--)
-			*b++ = '0';
-		*b = 0;
-		}
- ret:
-	freedtoa(s0);
-	return b;
- 	}
diff --git a/lib/libc/gdtoa/g_ddfmt.c b/lib/libc/gdtoa/g_ddfmt.c
deleted file mode 100644
index 742eee98c..000000000
--- a/lib/libc/gdtoa/g_ddfmt.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/* $NetBSD: g_ddfmt.c,v 1.3 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg@acm.org). */
-
-#include "gdtoaimp.h"
-#include <string.h>
-
- char *
-#ifdef KR_headers
-g_ddfmt(buf, dd0, ndig, bufsize) char *buf; double *dd0; int ndig; size_t bufsize;
-#else
-g_ddfmt(char *buf, double *dd0, int ndig, size_t bufsize)
-#endif
-{
-	FPI fpi;
-	char *b, *s, *se;
-	ULong *L, bits0[4], *bits, *zx;
-	int bx, by, decpt, ex, ey, i, j, mode;
-	Bigint *x, *y, *z;
-	U *dd, ddx[2];
-#ifdef Honor_FLT_ROUNDS /*{{*/
-	int Rounding;
-#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */
-	Rounding = Flt_Rounds;
-#else /*}{*/
-	Rounding = 1;
-	switch(fegetround()) {
-	  case FE_TOWARDZERO:	Rounding = 0; break;
-	  case FE_UPWARD:	Rounding = 2; break;
-	  case FE_DOWNWARD:	Rounding = 3;
-	  }
-#endif /*}}*/
-#else /*}{*/
-#define Rounding FPI_Round_near
-#endif /*}}*/
-
-	if (bufsize < 10 || bufsize < ndig + 8)
-		return 0;
-
-	dd = (U*)dd0;
-	L = dd->L;
-	if ((L[_0] & 0x7ff00000L) == 0x7ff00000L) {
-		/* Infinity or NaN */
-		if (L[_0] & 0xfffff || L[_1]) {
- nanret:
-			return strcp(buf, "NaN");
-			}
-		if ((L[2+_0] & 0x7ff00000) == 0x7ff00000) {
-			if (L[2+_0] & 0xfffff || L[2+_1])
-				goto nanret;
-			if ((L[_0] ^ L[2+_0]) & 0x80000000L)
-				goto nanret;	/* Infinity - Infinity */
-			}
- infret:
-		b = buf;
-		if (L[_0] & 0x80000000L)
-			*b++ = '-';
-		return strcp(b, "Infinity");
-		}
-	if ((L[2+_0] & 0x7ff00000) == 0x7ff00000) {
-		L += 2;
-		if (L[_0] & 0xfffff || L[_1])
-			goto nanret;
-		goto infret;
-		}
-	if (dval(&dd[0]) + dval(&dd[1]) == 0.) {
-		b = buf;
-#ifndef IGNORE_ZERO_SIGN
-		if (L[_0] & L[2+_0] & 0x80000000L)
-			*b++ = '-';
-#endif
-		*b++ = '0';
-		*b = 0;
-		return b;
-		}
-	if ((L[_0] & 0x7ff00000L) < (L[2+_0] & 0x7ff00000L)) {
-		dval(&ddx[1]) = dval(&dd[0]);
-		dval(&ddx[0]) = dval(&dd[1]);
-		dd = ddx;
-		L = dd->L;
-		}
-	z = d2b(dval(&dd[0]), &ex, &bx);
-	if (z == NULL)
-		return NULL;
-	if (dval(&dd[1]) == 0.)
-		goto no_y;
-	x = z;
-	y = d2b(dval(&dd[1]), &ey, &by);
-	if (y == NULL)
-		return NULL;
-	if ( (i = ex - ey) !=0) {
-		if (i > 0) {
-			x = lshift(x, i);
-			if (x == NULL)
-				return NULL;
-			ex = ey;
-			}
-		else {
-			y = lshift(y, -i);
-			if (y == NULL)
-				return NULL;
-			}
-		}
-	if ((L[_0] ^ L[2+_0]) & 0x80000000L) {
-		z = diff(x, y);
-		if (z == NULL)
-			return NULL;
-		if (L[_0] & 0x80000000L)
-			z->sign = 1 - z->sign;
-		}
-	else {
-		z = sum(x, y);
-		if (z == NULL)
-			return NULL;
-		if (L[_0] & 0x80000000L)
-			z->sign = 1;
-		}
-	Bfree(x);
-	Bfree(y);
- no_y:
-	bits = zx = z->x;
-	for(i = 0; !*zx; zx++)
-		i += 32;
-	i += lo0bits(zx);
-	if (i) {
-		rshift(z, i);
-		ex += i;
-		}
-	fpi.nbits = z->wds * 32 - hi0bits(z->x[j = z->wds-1]);
-	if (fpi.nbits < 106) {
-		fpi.nbits = 106;
-		if (j < 3) {
-			for(i = 0; i <= j; i++)
-				bits0[i] = bits[i];
-			while(i < 4)
-				bits0[i++] = 0;
-			bits = bits0;
-			}
-		}
-	mode = 2;
-	if (ndig <= 0) {
-		if (bufsize < (int)(fpi.nbits * .301029995664) + 10) {
-			Bfree(z);
-			return 0;
-			}
-		mode = 0;
-		}
-	fpi.emin = 1-1023-53+1;
-	fpi.emax = 2046-1023-106+1;
-	fpi.rounding = Rounding;
-	fpi.sudden_underflow = 0;
-	i = STRTOG_Normal;
-	s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se);
-	if (s == NULL)
-		return NULL;
-	b = g__fmt(buf, s, se, decpt, z->sign, bufsize);
-	if (b == NULL)
-		return NULL;
-	Bfree(z);
-	return b;
-	}
diff --git a/lib/libc/gdtoa/g_dfmt.c b/lib/libc/gdtoa/g_dfmt.c
deleted file mode 100644
index dd18e8903..000000000
--- a/lib/libc/gdtoa/g_dfmt.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* $NetBSD: g_dfmt.c,v 1.3 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- char*
-#ifdef KR_headers
-g_dfmt(buf, d, ndig, bufsize) char *buf; double *d; int ndig; size_t bufsize;
-#else
-g_dfmt(char *buf, double *d, int ndig, size_t bufsize)
-#endif
-{
-	static FPI fpi0 = { 53, 1-1023-53+1, 2046-1023-53+1, 1, 0 };
-	char *b, *s, *se;
-	ULong bits[2], *L, sign;
-	int decpt, ex, i, mode;
-#ifdef Honor_FLT_ROUNDS
-#include "gdtoa_fltrnds.h"
-#else
-#define fpi &fpi0
-#endif
-
-	if (ndig < 0)
-		ndig = 0;
-	if (bufsize < ndig + 10)
-		return 0;
-
-	L = (ULong*)d;
-	sign = L[_0] & 0x80000000L;
-	if ((L[_0] & 0x7ff00000) == 0x7ff00000) {
-		/* Infinity or NaN */
-		if (bufsize < 10)
-			return 0;
-		if (L[_0] & 0xfffff || L[_1]) {
-			return strcp(buf, "NaN");
-			}
-		b = buf;
-		if (sign)
-			*b++ = '-';
-		return strcp(b, "Infinity");
-		}
-	if (L[_1] == 0 && (L[_0] ^ sign) == 0 /*d == 0.*/) {
-		b = buf;
-#ifndef IGNORE_ZERO_SIGN
-		if (L[_0] & 0x80000000L)
-			*b++ = '-';
-#endif
-		*b++ = '0';
-		*b = 0;
-		return b;
-		}
-	bits[0] = L[_1];
-	bits[1] = L[_0] & 0xfffff;
-	if ( (ex = (L[_0] >> 20) & 0x7ff) !=0)
-		bits[1] |= 0x100000;
-	else
-		ex = 1;
-	ex -= 0x3ff + 52;
-	mode = 2;
-	if (ndig <= 0)
-		mode = 0;
-	i = STRTOG_Normal;
-	if (sign)
-		i = STRTOG_Normal | STRTOG_Neg;
-	s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se);
-	if (s == NULL)
-		return NULL;
-	return g__fmt(buf, s, se, decpt, sign, bufsize);
-	}
diff --git a/lib/libc/gdtoa/g_ffmt.c b/lib/libc/gdtoa/g_ffmt.c
deleted file mode 100644
index a260d799a..000000000
--- a/lib/libc/gdtoa/g_ffmt.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* $NetBSD: g_ffmt.c,v 1.3 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- char*
-#ifdef KR_headers
-g_ffmt(buf, f, ndig, bufsize) char *buf; float *f; int ndig; size_t bufsize;
-#else
-g_ffmt(char *buf, float *f, int ndig, size_t bufsize)
-#endif
-{
-	static FPI fpi0 = { 24, 1-127-24+1,  254-127-24+1, 1, 0 };
-	char *b, *s, *se;
-	ULong bits[1], *L, sign;
-	int decpt, ex, i, mode;
-#ifdef Honor_FLT_ROUNDS
-#include "gdtoa_fltrnds.h"
-#else
-#define fpi &fpi0
-#endif
-
-	if (ndig < 0)
-		ndig = 0;
-	if (bufsize < ndig + 10)
-		return 0;
-
-	L = (ULong*)f;
-	sign = L[0] & 0x80000000L;
-	if ((L[0] & 0x7f800000) == 0x7f800000) {
-		/* Infinity or NaN */
-		if (L[0] & 0x7fffff) {
-			return strcp(buf, "NaN");
-			}
-		b = buf;
-		if (sign)
-			*b++ = '-';
-		return strcp(b, "Infinity");
-		}
-	if (*f == 0.) {
-		b = buf;
-#ifndef IGNORE_ZERO_SIGN
-		if (L[0] & 0x80000000L)
-			*b++ = '-';
-#endif
-		*b++ = '0';
-		*b = 0;
-		return b;
-		}
-	bits[0] = L[0] & 0x7fffff;
-	if ( (ex = (L[0] >> 23) & 0xff) !=0)
-		bits[0] |= 0x800000;
-	else
-		ex = 1;
-	ex -= 0x7f + 23;
-	mode = 2;
-	if (ndig <= 0) {
-		if (bufsize < 16)
-			return 0;
-		mode = 0;
-		}
-	i = STRTOG_Normal;
-	s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se);
-	if (s == NULL)
-		return NULL;
-	return g__fmt(buf, s, se, decpt, sign, bufsize);
-	}
diff --git a/lib/libc/gdtoa/g_xLfmt.c b/lib/libc/gdtoa/g_xLfmt.c
deleted file mode 100644
index d35cd1acb..000000000
--- a/lib/libc/gdtoa/g_xLfmt.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* $NetBSD: g_xLfmt.c,v 1.4 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_BIG_ENDIAN or IEEE_LITTLE_ENDIAN should be #defined */
-
-#ifdef IEEE_BIG_ENDIAN
-#define _0 0
-#define _1 1
-#define _2 2
-#endif
-#ifdef IEEE_LITTLE_ENDIAN
-#define _0 2
-#define _1 1
-#define _2 0
-#endif
-
- char*
-#ifdef KR_headers
-g_xLfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize;
-#else
-g_xLfmt(char *buf, void *V, int ndig, size_t bufsize)
-#endif
-{
-	static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0 };
-	char *b, *s, *se;
-	ULong bits[2], *L, sign;
-	int decpt, ex, i, mode;
-#ifdef Honor_FLT_ROUNDS
-#include "gdtoa_fltrnds.h"
-#else
-#define fpi &fpi0
-#endif
-
-	if (ndig < 0)
-		ndig = 0;
-	if (bufsize < ndig + 10)
-		return 0;
-
-	L = (ULong*)V;
-	sign = L[_0] & 0x80000000L;
-	bits[1] = L[_1];
-	bits[0] = L[_2];
-	if ( (ex = (L[_0] >> 16) & 0x7fff) !=0) {
-		if (ex == 0x7fff) {
-			/* Infinity or NaN */
-			if (bits[0] | bits[1])
-				b = strcp(buf, "NaN");
-			else {
-				b = buf;
-				if (sign)
-					*b++ = '-';
-				b = strcp(b, "Infinity");
-				}
-			return b;
-			}
-		i = STRTOG_Normal;
-		}
-	else if (bits[0] | bits[1]) {
-		i = STRTOG_Denormal;
-		}
-	else {
-		b = buf;
-#ifndef IGNORE_ZERO_SIGN
-		if (sign)
-			*b++ = '-';
-#endif
-		*b++ = '0';
-		*b = 0;
-		return b;
-		}
-	ex -= 0x3fff + 63;
-	mode = 2;
-	if (ndig <= 0) {
-		if (bufsize < 32)
-			return 0;
-		mode = 0;
-		}
-	s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se);
-	if (s == NULL)
-		return NULL;
-	return g__fmt(buf, s, se, decpt, sign, bufsize);
-	}
diff --git a/lib/libc/gdtoa/g_xfmt.c b/lib/libc/gdtoa/g_xfmt.c
deleted file mode 100644
index f7cd39142..000000000
--- a/lib/libc/gdtoa/g_xfmt.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* $NetBSD: g_xfmt.c,v 1.4 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_BIG_ENDIAN or IEEE_LITTLE_ENDIAN should be #defined */
-
-#ifdef IEEE_BIG_ENDIAN
-#define _0 0
-#define _1 1
-#define _2 2
-#define _3 3
-#define _4 4
-#endif
-#ifdef IEEE_LITTLE_ENDIAN
-#define _0 4
-#define _1 3
-#define _2 2
-#define _3 1
-#define _4 0
-#endif
-
- char*
-#ifdef KR_headers
-g_xfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize;
-#else
-g_xfmt(char *buf, void *V, int ndig, size_t bufsize)
-#endif
-{
-	static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0 };
-	char *b, *s, *se;
-	ULong bits[2], sign;
-	UShort *L;
-	int decpt, ex, i, mode;
-#ifdef Honor_FLT_ROUNDS
-#include "gdtoa_fltrnds.h"
-#else
-#define fpi &fpi0
-#endif
-
-	if (ndig < 0)
-		ndig = 0;
-	if (bufsize < ndig + 10)
-		return 0;
-
-	L = (UShort *)V;
-	sign = L[_0] & 0x8000;
-	bits[1] = (L[_1] << 16) | L[_2];
-	bits[0] = (L[_3] << 16) | L[_4];
-	if ( (ex = L[_0] & 0x7fff) !=0) {
-		if (ex == 0x7fff) {
-			/* Infinity or NaN */
-			if (bits[0] | bits[1])
-				b = strcp(buf, "NaN");
-			else {
-				b = buf;
-				if (sign)
-					*b++ = '-';
-				b = strcp(b, "Infinity");
-				}
-			return b;
-			}
-		i = STRTOG_Normal;
-		}
-	else if (bits[0] | bits[1]) {
-		i = STRTOG_Denormal;
-		ex = 1;
-		}
-	else {
-		b = buf;
-#ifndef IGNORE_ZERO_SIGN
-		if (sign)
-			*b++ = '-';
-#endif
-		*b++ = '0';
-		*b = 0;
-		return b;
-		}
-	ex -= 0x3fff + 63;
-	mode = 2;
-	if (ndig <= 0) {
-		if (bufsize < 32)
-			return 0;
-		mode = 0;
-		}
-	s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se);
-	if (s == NULL)
-		return NULL;
-	return g__fmt(buf, s, se, decpt, sign, bufsize);
-	}
diff --git a/lib/libc/gdtoa/gdtoa.c b/lib/libc/gdtoa/gdtoa.c
deleted file mode 100644
index c4a595abe..000000000
--- a/lib/libc/gdtoa/gdtoa.c
+++ /dev/null
@@ -1,824 +0,0 @@
-/* $NetBSD: gdtoa.c,v 1.6 2012/03/13 21:13:33 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 1999 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- static Bigint *
-#ifdef KR_headers
-bitstob(bits, nbits, bbits) ULong *bits; int nbits; int *bbits;
-#else
-bitstob(ULong *bits, int nbits, int *bbits)
-#endif
-{
-	int i, k;
-	Bigint *b;
-	ULong *be, *x, *x0;
-
-	i = ULbits;
-	k = 0;
-	while(i < nbits) {
-		i <<= 1;
-		k++;
-		}
-#ifndef Pack_32
-	if (!k)
-		k = 1;
-#endif
-	b = Balloc(k);
-	if (b == NULL)
-		return NULL;
-	be = bits + (((unsigned int)nbits - 1) >> kshift);
-	x = x0 = b->x;
-	do {
-		*x++ = *bits & ALL_ON;
-#ifdef Pack_16
-		*x++ = (*bits >> 16) & ALL_ON;
-#endif
-		} while(++bits <= be);
-	ptrdiff_t td = x - x0;
-	_DIAGASSERT(__type_fit(int, td));
-	i = (int)td;
-	while(!x0[--i])
-		if (!i) {
-			b->wds = 0;
-			*bbits = 0;
-			goto ret;
-			}
-	b->wds = i + 1;
-	*bbits = i*ULbits + 32 - hi0bits(b->x[i]);
- ret:
-	return b;
-	}
-
-/* dtoa for IEEE arithmetic (dmg): convert double to ASCII string.
- *
- * Inspired by "How to Print Floating-Point Numbers Accurately" by
- * Guy L. Steele, Jr. and Jon L. White [Proc. ACM SIGPLAN '90, pp. 112-126].
- *
- * Modifications:
- *	1. Rather than iterating, we use a simple numeric overestimate
- *	   to determine k = floor(log10(d)).  We scale relevant
- *	   quantities using O(log2(k)) rather than O(k) multiplications.
- *	2. For some modes > 2 (corresponding to ecvt and fcvt), we don't
- *	   try to generate digits strictly left to right.  Instead, we
- *	   compute with fewer bits and propagate the carry if necessary
- *	   when rounding the final digit up.  This is often faster.
- *	3. Under the assumption that input will be rounded nearest,
- *	   mode 0 renders 1e23 as 1e23 rather than 9.999999999999999e22.
- *	   That is, we allow equality in stopping tests when the
- *	   round-nearest rule will give the same floating-point value
- *	   as would satisfaction of the stopping test with strict
- *	   inequality.
- *	4. We remove common factors of powers of 2 from relevant
- *	   quantities.
- *	5. When converting floating-point integers less than 1e16,
- *	   we use floating-point arithmetic rather than resorting
- *	   to multiple-precision integers.
- *	6. When asked to produce fewer than 15 digits, we first try
- *	   to get by with floating-point arithmetic; we resort to
- *	   multiple-precision integer arithmetic only if we cannot
- *	   guarantee that the floating-point calculation has given
- *	   the correctly rounded result.  For k requested digits and
- *	   "uniformly" distributed input, the probability is
- *	   something like 10^(k-15) that we must resort to the Long
- *	   calculation.
- */
-
- char *
-gdtoa
-#ifdef KR_headers
-	(fpi, be, bits, kindp, mode, ndigits, decpt, rve)
-	FPI *fpi; int be; ULong *bits;
-	int *kindp, mode, ndigits, *decpt; char **rve;
-#else
-	(FPI *fpi, int be, ULong *bits, int *kindp, int mode, int ndigits, int *decpt, char **rve)
-#endif
-{
- /*	Arguments ndigits and decpt are similar to the second and third
-	arguments of ecvt and fcvt; trailing zeros are suppressed from
-	the returned string.  If not null, *rve is set to point
-	to the end of the return value.  If d is +-Infinity or NaN,
-	then *decpt is set to 9999.
-	be = exponent: value = (integer represented by bits) * (2 to the power of be).
-
-	mode:
-		0 ==> shortest string that yields d when read in
-			and rounded to nearest.
-		1 ==> like 0, but with Steele & White stopping rule;
-			e.g. with IEEE P754 arithmetic , mode 0 gives
-			1e23 whereas mode 1 gives 9.999999999999999e22.
-		2 ==> max(1,ndigits) significant digits.  This gives a
-			return value similar to that of ecvt, except
-			that trailing zeros are suppressed.
-		3 ==> through ndigits past the decimal point.  This
-			gives a return value similar to that from fcvt,
-			except that trailing zeros are suppressed, and
-			ndigits can be negative.
-		4-9 should give the same return values as 2-3, i.e.,
-			4 <= mode <= 9 ==> same return as mode
-			2 + (mode & 1).  These modes are mainly for
-			debugging; often they run slower but sometimes
-			faster than modes 2-3.
-		4,5,8,9 ==> left-to-right digit generation.
-		6-9 ==> don't try fast floating-point estimate
-			(if applicable).
-
-		Values of mode other than 0-9 are treated as mode 0.
-
-		Sufficient space is allocated to the return value
-		to hold the suppressed trailing zeros.
-	*/
-
-	int bbits, b2, b5, be0, dig, i, ieps, ilim = 0, ilim0, ilim1 = 0, inex;
-	int j, jj1, k, k0, k_check, kind, leftright, m2, m5, nbits;
-	int rdir, s2, s5, spec_case, try_quick;
-	Long L;
-	Bigint *b, *b1, *delta, *mlo, *mhi, *mhi1, *S;
-	double d2, ds;
-	char *s, *s0;
-	U d, eps;
-
-#ifndef MULTIPLE_THREADS
-	if (dtoa_result) {
-		freedtoa(dtoa_result);
-		dtoa_result = 0;
-		}
-#endif
-	inex = 0;
-	if (*kindp & STRTOG_NoMemory)
-		return NULL;
-	kind = *kindp &= ~STRTOG_Inexact;
-	switch(kind & STRTOG_Retmask) {
-	  case STRTOG_Zero:
-		goto ret_zero;
-	  case STRTOG_Normal:
-	  case STRTOG_Denormal:
-		break;
-	  case STRTOG_Infinite:
-		*decpt = -32768;
-		return nrv_alloc("Infinity", rve, 8);
-	  case STRTOG_NaN:
-		*decpt = -32768;
-		return nrv_alloc("NaN", rve, 3);
-	  default:
-		return 0;
-	  }
-	b = bitstob(bits, nbits = fpi->nbits, &bbits);
-	if (b == NULL)
-		return NULL;
-	be0 = be;
-	if ( (i = trailz(b)) !=0) {
-		rshift(b, i);
-		be += i;
-		bbits -= i;
-		}
-	if (!b->wds) {
-		Bfree(b);
- ret_zero:
-		*decpt = 1;
-		return nrv_alloc("0", rve, 1);
-		}
-
-	dval(&d) = b2d(b, &i);
-	i = be + bbits - 1;
-	word0(&d) &= Frac_mask1;
-	word0(&d) |= Exp_11;
-#ifdef IBM
-	if ( (j = 11 - hi0bits(word0(&d) & Frac_mask)) !=0)
-		dval(&d) /= 1 << j;
-#endif
-
-	/* log(x)	~=~ log(1.5) + (x-1.5)/1.5
-	 * log10(x)	 =  log(x) / log(10)
-	 *		~=~ log(1.5)/log(10) + (x-1.5)/(1.5*log(10))
-	 * log10(&d) = (i-Bias)*log(2)/log(10) + log10(d2)
-	 *
-	 * This suggests computing an approximation k to log10(&d) by
-	 *
-	 * k = (i - Bias)*0.301029995663981
-	 *	+ ( (d2-1.5)*0.289529654602168 + 0.176091259055681 );
-	 *
-	 * We want k to be too large rather than too small.
-	 * The error in the first-order Taylor series approximation
-	 * is in our favor, so we just round up the constant enough
-	 * to compensate for any error in the multiplication of
-	 * (i - Bias) by 0.301029995663981; since |i - Bias| <= 1077,
-	 * and 1077 * 0.30103 * 2^-52 ~=~ 7.2e-14,
-	 * adding 1e-13 to the constant term more than suffices.
-	 * Hence we adjust the constant term to 0.1760912590558.
-	 * (We could get a more accurate k by invoking log10,
-	 *  but this is probably not worthwhile.)
-	 */
-#ifdef IBM
-	i <<= 2;
-	i += j;
-#endif
-	ds = (dval(&d)-1.5)*0.289529654602168 + 0.1760912590558 + i*0.301029995663981;
-
-	/* correct assumption about exponent range */
-	if ((j = i) < 0)
-		j = -j;
-	if ((j -= 1077) > 0)
-		ds += j * 7e-17;
-
-	k = (int)ds;
-	if (ds < 0. && ds != k)
-		k--;	/* want k = floor(ds) */
-	k_check = 1;
-#ifdef IBM
-	j = be + bbits - 1;
-	if ( (jj1 = j & 3) !=0)
-		dval(&d) *= 1 << jj1;
-	word0(&d) += j << Exp_shift - 2 & Exp_mask;
-#else
-	word0(&d) += (be + bbits - 1) << Exp_shift;
-#endif
-	if (k >= 0 && k <= Ten_pmax) {
-		if (dval(&d) < tens[k])
-			k--;
-		k_check = 0;
-		}
-	j = bbits - i - 1;
-	if (j >= 0) {
-		b2 = 0;
-		s2 = j;
-		}
-	else {
-		b2 = -j;
-		s2 = 0;
-		}
-	if (k >= 0) {
-		b5 = 0;
-		s5 = k;
-		s2 += k;
-		}
-	else {
-		b2 -= k;
-		b5 = -k;
-		s5 = 0;
-		}
-	if (mode < 0 || mode > 9)
-		mode = 0;
-	try_quick = 1;
-	if (mode > 5) {
-		mode -= 4;
-		try_quick = 0;
-		}
-	else if (i >= -4 - Emin || i < Emin)
-		try_quick = 0;
-	leftright = 1;
-	ilim = ilim1 = -1;	/* Values for cases 0 and 1; done here to */
-				/* silence erroneous "gcc -Wall" warning. */
-	switch(mode) {
-		case 0:
-		case 1:
-			i = (int)(nbits * .30103) + 3;
-			ndigits = 0;
-			break;
-		case 2:
-			leftright = 0;
-			/*FALLTHROUGH*/
-		case 4:
-			if (ndigits <= 0)
-				ndigits = 1;
-			ilim = ilim1 = i = ndigits;
-			break;
-		case 3:
-			leftright = 0;
-			/*FALLTHROUGH*/
-		case 5:
-			i = ndigits + k + 1;
-			ilim = i;
-			ilim1 = i - 1;
-			if (i <= 0)
-				i = 1;
-		}
-	s = s0 = rv_alloc((size_t)i);
-	if (s == NULL)
-		return NULL;
-
-	if ( (rdir = fpi->rounding - 1) !=0) {
-		if (rdir < 0)
-			rdir = 2;
-		if (kind & STRTOG_Neg)
-			rdir = 3 - rdir;
-		}
-
-	/* Now rdir = 0 ==> round near, 1 ==> round up, 2 ==> round down. */
-
-	if (ilim >= 0 && ilim <= Quick_max && try_quick && !rdir
-#ifndef IMPRECISE_INEXACT
-		&& k == 0
-#endif
-								) {
-
-		/* Try to get by with floating-point arithmetic. */
-
-		i = 0;
-		d2 = dval(&d);
-#ifdef IBM
-		if ( (j = 11 - hi0bits(word0(&d) & Frac_mask)) !=0)
-			dval(&d) /= 1 << j;
-#endif
-		k0 = k;
-		ilim0 = ilim;
-		ieps = 2; /* conservative */
-		if (k > 0) {
-			ds = tens[k&0xf];
-			j = (unsigned int)k >> 4;
-			if (j & Bletch) {
-				/* prevent overflows */
-				j &= Bletch - 1;
-				dval(&d) /= bigtens[n_bigtens-1];
-				ieps++;
-				}
-			for(; j; j /= 2, i++)
-				if (j & 1) {
-					ieps++;
-					ds *= bigtens[i];
-					}
-			}
-		else  {
-			ds = 1.;
-			if ( (jj1 = -k) !=0) {
-				dval(&d) *= tens[jj1 & 0xf];
-				for(j = jj1 >> 4; j; j >>= 1, i++)
-					if (j & 1) {
-						ieps++;
-						dval(&d) *= bigtens[i];
-						}
-				}
-			}
-		if (k_check && dval(&d) < 1. && ilim > 0) {
-			if (ilim1 <= 0)
-				goto fast_failed;
-			ilim = ilim1;
-			k--;
-			dval(&d) *= 10.;
-			ieps++;
-			}
-		dval(&eps) = ieps*dval(&d) + 7.;
-		word0(&eps) -= (P-1)*Exp_msk1;
-		if (ilim == 0) {
-			S = mhi = 0;
-			dval(&d) -= 5.;
-			if (dval(&d) > dval(&eps))
-				goto one_digit;
-			if (dval(&d) < -dval(&eps))
-				goto no_digits;
-			goto fast_failed;
-			}
-#ifndef No_leftright
-		if (leftright) {
-			/* Use Steele & White method of only
-			 * generating digits needed.
-			 */
-			dval(&eps) = ds*0.5/tens[ilim-1] - dval(&eps);
-			for(i = 0;;) {
-				L = (Long)(dval(&d)/ds);
-				dval(&d) -= L*ds;
-				*s++ = '0' + (int)L;
-				if (dval(&d) < dval(&eps)) {
-					if (dval(&d))
-						inex = STRTOG_Inexlo;
-					goto ret1;
-					}
-				if (ds - dval(&d) < dval(&eps))
-					goto bump_up;
-				if (++i >= ilim)
-					break;
-				dval(&eps) *= 10.;
-				dval(&d) *= 10.;
-				}
-			}
-		else {
-#endif
-			/* Generate ilim digits, then fix them up. */
-			dval(&eps) *= tens[ilim-1];
-			for(i = 1;; i++, dval(&d) *= 10.) {
-				if ( (L = (Long)(dval(&d)/ds)) !=0)
-					dval(&d) -= L*ds;
-				*s++ = '0' + (int)L;
-				if (i == ilim) {
-					ds *= 0.5;
-					if (dval(&d) > ds + dval(&eps))
-						goto bump_up;
-					else if (dval(&d) < ds - dval(&eps)) {
-						if (dval(&d))
-							inex = STRTOG_Inexlo;
-						goto clear_trailing0;
-						}
-					break;
-					}
-				}
-#ifndef No_leftright
-			}
-#endif
- fast_failed:
-		s = s0;
-		dval(&d) = d2;
-		k = k0;
-		ilim = ilim0;
-		}
-
-	/* Do we have a "small" integer? */
-
-	if (be >= 0 && k <= Int_max) {
-		/* Yes. */
-		ds = tens[k];
-		if (ndigits < 0 && ilim <= 0) {
-			S = mhi = 0;
-			if (ilim < 0 || dval(&d) <= 5*ds)
-				goto no_digits;
-			goto one_digit;
-			}
-		for(i = 1;; i++, dval(&d) *= 10.) {
-			L = dval(&d) / ds;
-			dval(&d) -= L*ds;
-#ifdef Check_FLT_ROUNDS
-			/* If FLT_ROUNDS == 2, L will usually be high by 1 */
-			if (dval(&d) < 0) {
-				L--;
-				dval(&d) += ds;
-				}
-#endif
-			*s++ = '0' + (int)L;
-			if (dval(&d) == 0.)
-				break;
-			if (i == ilim) {
-				if (rdir) {
-					if (rdir == 1)
-						goto bump_up;
-					inex = STRTOG_Inexlo;
-					goto ret1;
-					}
-				dval(&d) += dval(&d);
-#ifdef ROUND_BIASED
-				if (dval(&d) >= ds)
-#else
-				if (dval(&d) > ds || (dval(&d) == ds && L & 1))
-#endif
-					{
- bump_up:
-					inex = STRTOG_Inexhi;
-					while(*--s == '9')
-						if (s == s0) {
-							k++;
-							*s = '0';
-							break;
-							}
-					++*s++;
-					}
-				else {
-					inex = STRTOG_Inexlo;
- clear_trailing0:
-					while(*--s == '0'){}
-					++s;
-					}
-				break;
-				}
-			}
-		goto ret1;
-		}
-
-	m2 = b2;
-	m5 = b5;
-	mhi = mlo = 0;
-	if (leftright) {
-		i = nbits - bbits;
-		if (be - i++ < fpi->emin && mode != 3 && mode != 5) {
-			/* denormal */
-			i = be - fpi->emin + 1;
-			if (mode >= 2 && ilim > 0 && ilim < i)
-				goto small_ilim;
-			}
-		else if (mode >= 2) {
- small_ilim:
-			j = ilim - 1;
-			if (m5 >= j)
-				m5 -= j;
-			else {
-				s5 += j -= m5;
-				b5 += j;
-				m5 = 0;
-				}
-			if ((i = ilim) < 0) {
-				m2 -= i;
-				i = 0;
-				}
-			}
-		b2 += i;
-		s2 += i;
-		mhi = i2b(1);
-		}
-	if (m2 > 0 && s2 > 0) {
-		i = m2 < s2 ? m2 : s2;
-		b2 -= i;
-		m2 -= i;
-		s2 -= i;
-		}
-	if (b5 > 0) {
-		if (leftright) {
-			if (m5 > 0) {
-				mhi = pow5mult(mhi, m5);
-				if (mhi == NULL)
-					return NULL;
-				b1 = mult(mhi, b);
-				if (b1 == NULL)
-					return NULL;
-				Bfree(b);
-				b = b1;
-				}
-			if ( (j = b5 - m5) !=0) {
-				b = pow5mult(b, j);
-				if (b == NULL)
-					return NULL;
-				}
-			}
-		else {
-			b = pow5mult(b, b5);
-			if (b == NULL)
-				return NULL;
-			}
-		}
-	S = i2b(1);
-	if (S == NULL)
-		return NULL;
-	if (s5 > 0) {
-		S = pow5mult(S, s5);
-		if (S == NULL)
-			return NULL;
-		}
-
-	/* Check for special case that d is a normalized power of 2. */
-
-	spec_case = 0;
-	if (mode < 2) {
-		if (bbits == 1 && be0 > fpi->emin + 1) {
-			/* The special case */
-			b2++;
-			s2++;
-			spec_case = 1;
-			}
-		}
-
-	/* Arrange for convenient computation of quotients:
-	 * shift left if necessary so divisor has 4 leading 0 bits.
-	 *
-	 * Perhaps we should just compute leading 28 bits of S once
-	 * and for all and pass them and a shift to quorem, so it
-	 * can do shifts and ors to compute the numerator for q.
-	 */
-	i = ((s5 ? hi0bits(S->x[S->wds-1]) : ULbits - 1) - s2 - 4) & kmask;
-	m2 += i;
-	if ((b2 += i) > 0)
-		b = lshift(b, b2);
-	if ((s2 += i) > 0)
-		S = lshift(S, s2);
-	if (k_check) {
-		if (cmp(b,S) < 0) {
-			k--;
-			b = multadd(b, 10, 0);	/* we botched the k estimate */
-			if (b == NULL)
-				return NULL;
-			if (leftright) {
-				mhi = multadd(mhi, 10, 0);
-				if (mhi == NULL)
-					return NULL;
-				}
-			ilim = ilim1;
-			}
-		}
-	if (ilim <= 0 && mode > 2) {
-		if (ilim < 0 || cmp(b,S = multadd(S,5,0)) <= 0) {
-			/* no digits, fcvt style */
- no_digits:
-			k = -1 - ndigits;
-			inex = STRTOG_Inexlo;
-			goto ret;
-			}
- one_digit:
-		inex = STRTOG_Inexhi;
-		*s++ = '1';
-		k++;
-		goto ret;
-		}
-	if (leftright) {
-		if (m2 > 0) {
-			mhi = lshift(mhi, m2);
-			if (mhi == NULL)
-				return NULL;
-			}
-
-		/* Compute mlo -- check for special case
-		 * that d is a normalized power of 2.
-		 */
-
-		mlo = mhi;
-		if (spec_case) {
-			mhi = Balloc(mhi->k);
-			if (mhi == NULL)
-				return NULL;
-			Bcopy(mhi, mlo);
-			mhi = lshift(mhi, 1);
-			if (mhi == NULL)
-				return NULL;
-			}
-
-		for(i = 1;;i++) {
-			dig = quorem(b,S) + '0';
-			/* Do we yet have the shortest decimal string
-			 * that will round to d?
-			 */
-			j = cmp(b, mlo);
-			delta = diff(S, mhi);
-			if (delta == NULL)
-				return NULL;
-			jj1 = delta->sign ? 1 : cmp(b, delta);
-			Bfree(delta);
-#ifndef ROUND_BIASED
-			if (jj1 == 0 && !mode && !(bits[0] & 1) && !rdir) {
-				if (dig == '9')
-					goto round_9_up;
-				if (j <= 0) {
-					if (b->wds > 1 || b->x[0])
-						inex = STRTOG_Inexlo;
-					}
-				else {
-					dig++;
-					inex = STRTOG_Inexhi;
-					}
-				*s++ = dig;
-				goto ret;
-				}
-#endif
-			if (j < 0 || (j == 0 && !mode
-#ifndef ROUND_BIASED
-							&& !(bits[0] & 1)
-#endif
-					)) {
-				if (rdir && (b->wds > 1 || b->x[0])) {
-					if (rdir == 2) {
-						inex = STRTOG_Inexlo;
-						goto accept;
-						}
-					while (cmp(S,mhi) > 0) {
-						*s++ = dig;
-						mhi1 = multadd(mhi, 10, 0);
-						if (mhi1 == NULL)
-							return NULL;
-						if (mlo == mhi)
-							mlo = mhi1;
-						mhi = mhi1;
-						b = multadd(b, 10, 0);
-						if (b == NULL)
-							return NULL;
-						dig = quorem(b,S) + '0';
-						}
-					if (dig++ == '9')
-						goto round_9_up;
-					inex = STRTOG_Inexhi;
-					goto accept;
-					}
-				if (jj1 > 0) {
-					b = lshift(b, 1);
-					if (b == NULL)
-						return NULL;
-					jj1 = cmp(b, S);
-#ifdef ROUND_BIASED
-					if (jj1 >= 0 /*)*/
-#else
-					if ((jj1 > 0 || (jj1 == 0 && dig & 1))
-#endif
-					&& dig++ == '9')
-						goto round_9_up;
-					inex = STRTOG_Inexhi;
-					}
-				if (b->wds > 1 || b->x[0])
-					inex = STRTOG_Inexlo;
- accept:
-				*s++ = dig;
-				goto ret;
-				}
-			if (jj1 > 0 && rdir != 2) {
-				if (dig == '9') { /* possible if i == 1 */
- round_9_up:
-					*s++ = '9';
-					inex = STRTOG_Inexhi;
-					goto roundoff;
-					}
-				inex = STRTOG_Inexhi;
-				*s++ = dig + 1;
-				goto ret;
-				}
-			*s++ = dig;
-			if (i == ilim)
-				break;
-			b = multadd(b, 10, 0);
-			if (b == NULL)
-				return NULL;
-			if (mlo == mhi) {
-				mlo = mhi = multadd(mhi, 10, 0);
-				if (mlo == NULL)
-					return NULL;
-				}
-			else {
-				mlo = multadd(mlo, 10, 0);
-				if (mlo == NULL)
-					return NULL;
-				mhi = multadd(mhi, 10, 0);
-				if (mhi == NULL)
-					return NULL;
-				}
-			}
-		}
-	else
-		for(i = 1;; i++) {
-			*s++ = dig = quorem(b,S) + '0';
-			if (i >= ilim)
-				break;
-			b = multadd(b, 10, 0);
-			if (b == NULL)
-				return NULL;
-			}
-
-	/* Round off last digit */
-
-	if (rdir) {
-		if (rdir == 2 || (b->wds <= 1 && !b->x[0]))
-			goto chopzeros;
-		goto roundoff;
-		}
-	b = lshift(b, 1);
-	if (b == NULL)
-		return NULL;
-	j = cmp(b, S);
-#ifdef ROUND_BIASED
-	if (j >= 0)
-#else
-	if (j > 0 || (j == 0 && dig & 1))
-#endif
-		{
- roundoff:
-		inex = STRTOG_Inexhi;
-		while(*--s == '9')
-			if (s == s0) {
-				k++;
-				*s++ = '1';
-				goto ret;
-				}
-		++*s++;
-		}
-	else {
- chopzeros:
-		if (b->wds > 1 || b->x[0])
-			inex = STRTOG_Inexlo;
-		while(*--s == '0'){}
-		++s;
-		}
- ret:
-	Bfree(S);
-	if (mhi) {
-		if (mlo && mlo != mhi)
-			Bfree(mlo);
-		Bfree(mhi);
-		}
- ret1:
-	Bfree(b);
-	*s = 0;
-	*decpt = k + 1;
-	if (rve)
-		*rve = s;
-	*kindp |= inex;
-	return s0;
-	}
diff --git a/lib/libc/gdtoa/gdtoa.h b/lib/libc/gdtoa/gdtoa.h
deleted file mode 100644
index 6386a7802..000000000
--- a/lib/libc/gdtoa/gdtoa.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* $NetBSD: gdtoa.h,v 1.10 2013/04/18 21:54:10 joerg Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#ifndef GDTOA_H_INCLUDED
-#define GDTOA_H_INCLUDED
-
-#include "arith.h"
-#include <stddef.h> /* for size_t */
-#include <stdint.h>
-
-#ifndef __LOCALE_T_DECLARED
-typedef struct _locale		*locale_t;
-#define __LOCALE_T_DECLARED
-#endif
-
-#ifndef Long
-#define Long int32_t
-#endif
-#ifndef ULong
-#define ULong uint32_t
-#endif
-#ifndef UShort
-#define UShort uint16_t
-#endif
-
-#ifndef ANSI
-#ifdef KR_headers
-#define ANSI(x) ()
-#define Void /*nothing*/
-#else
-#define ANSI(x) x
-#define Void void
-#endif
-#endif /* ANSI */
-
-#ifndef CONST
-#ifdef KR_headers
-#define CONST /* blank */
-#else
-#define CONST const
-#endif
-#endif /* CONST */
-
- enum {	/* return values from strtodg */
-	STRTOG_Zero	= 0,
-	STRTOG_Normal	= 1,
-	STRTOG_Denormal	= 2,
-	STRTOG_Infinite	= 3,
-	STRTOG_NaN	= 4,
-	STRTOG_NaNbits	= 5,
-	STRTOG_NoNumber	= 6,
-	STRTOG_Retmask	= 7,
-
-	/* The following may be or-ed into one of the above values. */
-
-	STRTOG_Neg	= 0x08, /* does not affect STRTOG_Inexlo or STRTOG_Inexhi */
-	STRTOG_Inexlo	= 0x10,	/* returned result rounded toward zero */
-	STRTOG_Inexhi	= 0x20, /* returned result rounded away from zero */
-	STRTOG_Inexact	= 0x30,
-	STRTOG_Underflow= 0x40,
-	STRTOG_Overflow	= 0x80,
-	STRTOG_NoMemory = 0x100
-	};
-
- typedef struct
-FPI {
-	int nbits;
-	int emin;
-	int emax;
-	int rounding;
-	int sudden_underflow;
-	} FPI;
-
-enum {	/* FPI.rounding values: same as FLT_ROUNDS */
-	FPI_Round_zero = 0,
-	FPI_Round_near = 1,
-	FPI_Round_up = 2,
-	FPI_Round_down = 3
-	};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	dtoa		__dtoa
-#define	gdtoa		__gdtoa
-#define	ldtoa		__ldtoa
-#define	hldtoa		__hldtoa
-#define	hdtoa		__hdtoa
-#define	freedtoa	__freedtoa
-#define	strtodg		__strtodg_D2A
-#define	strtopQ		__strtopQ_D2A
-#define	strtopx		__strtopx_D2A
-#define	strtopxL	__strtopxL_D2A
-#define	strtord		__strtord_D2A
-
-extern char* dtoa  ANSI((double d, int mode, int ndigits, int *decpt,
-			int *sign, char **rve));
-extern char* hdtoa ANSI((double d, const char *xdigs, int ndigits, int *decpt,
-			int *sign, char **rve));
-extern char* ldtoa ANSI((long double *ld, int mode, int ndigits, int *decpt,
-			int *sign, char **rve));
-extern char* hldtoa ANSI((long double e, const char *xdigs, int ndigits,
-			int *decpt, int *sign, char **rve));
-
-extern char* gdtoa ANSI((FPI *fpi, int be, ULong *bits, int *kindp,
-			int mode, int ndigits, int *decpt, char **rve));
-extern void freedtoa ANSI((char*));
-extern float  strtof ANSI((CONST char *, char **));
-extern double strtod ANSI((CONST char *, char **));
-extern int strtodg ANSI((CONST char*, char**, CONST FPI*, Long*, ULong*,
-                         locale_t));
-
-extern char*	g_ddfmt  ANSI((char*, double*, int, size_t));
-extern char*	g_dfmt   ANSI((char*, double*, int, size_t));
-extern char*	g_ffmt   ANSI((char*, float*,  int, size_t));
-extern char*	g_Qfmt   ANSI((char*, void*,   int, size_t));
-extern char*	g_xfmt   ANSI((char*, void*,   int, size_t));
-extern char*	g_xLfmt  ANSI((char*, void*,   int, size_t));
-
-extern int	strtoId  ANSI((CONST char*, char**, double*, double*));
-extern int	strtoIdd ANSI((CONST char*, char**, double*, double*));
-extern int	strtoIf  ANSI((CONST char*, char**, float*, float*));
-extern int	strtoIQ  ANSI((CONST char*, char**, void*, void*));
-extern int	strtoIx  ANSI((CONST char*, char**, void*, void*));
-extern int	strtoIxL ANSI((CONST char*, char**, void*, void*));
-extern int	strtord  ANSI((CONST char*, char**, int, double*, locale_t));
-extern int	strtordd ANSI((CONST char*, char**, int, double*));
-extern int	strtorf  ANSI((CONST char*, char**, int, float*));
-extern int	strtorQ  ANSI((CONST char*, char**, int, void*));
-extern int	strtorx  ANSI((CONST char*, char**, int, void*));
-extern int	strtorxL ANSI((CONST char*, char**, int, void*));
-#if 1
-extern int	strtodI  ANSI((CONST char*, char**, double*));
-extern int	strtopd  ANSI((CONST char*, char**, double*));
-extern int	strtopdd ANSI((CONST char*, char**, double*));
-extern int	strtopf  ANSI((CONST char*, char**, float*));
-extern int	strtopQ  ANSI((CONST char*, char**, void*, locale_t));
-extern int	strtopx  ANSI((CONST char*, char**, void*, locale_t));
-extern int	strtopxL ANSI((CONST char*, char**, void*, locale_t));
-#else
-#define strtopd(s,se,x) strtord(s,se,1,x)
-#define strtopdd(s,se,x) strtordd(s,se,1,x)
-#define strtopf(s,se,x) strtorf(s,se,1,x)
-#define strtopQ(s,se,x) strtorQ(s,se,1,x)
-#define strtopx(s,se,x) strtorx(s,se,1,x)
-#define strtopxL(s,se,x) strtorxL(s,se,1,x)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* GDTOA_H_INCLUDED */
diff --git a/lib/libc/gdtoa/gdtoa_fltrnds.h b/lib/libc/gdtoa/gdtoa_fltrnds.h
deleted file mode 100644
index 33e5f9e53..000000000
--- a/lib/libc/gdtoa/gdtoa_fltrnds.h
+++ /dev/null
@@ -1,18 +0,0 @@
-	FPI *fpi, fpi1;
-	int Rounding;
-#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */
-	Rounding = Flt_Rounds;
-#else /*}{*/
-	Rounding = 1;
-	switch(fegetround()) {
-	  case FE_TOWARDZERO:	Rounding = 0; break;
-	  case FE_UPWARD:	Rounding = 2; break;
-	  case FE_DOWNWARD:	Rounding = 3;
-	  }
-#endif /*}}*/
-	fpi = &fpi0;
-	if (Rounding != 1) {
-		fpi1 = fpi0;
-		fpi = &fpi1;
-		fpi1.rounding = Rounding;
-		}
diff --git a/lib/libc/gdtoa/gdtoa_locks.c b/lib/libc/gdtoa/gdtoa_locks.c
deleted file mode 100644
index af02c0897..000000000
--- a/lib/libc/gdtoa/gdtoa_locks.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $NetBSD: gdtoa_locks.c,v 1.2 2015/01/20 18:31:25 christos Exp $ */
-
-/*
- * Written by Klaus Klein <kleink@NetBSD.org>, November 16, 2005.
- * Public domain.
- */
-
-#include "gdtoaimp.h"
-
-#ifdef _REENTRANT
-mutex_t __gdtoa_locks[2] = { MUTEX_INITIALIZER, MUTEX_INITIALIZER };
-#endif
diff --git a/lib/libc/gdtoa/gdtoaimp.h b/lib/libc/gdtoa/gdtoaimp.h
deleted file mode 100644
index 32a1bad59..000000000
--- a/lib/libc/gdtoa/gdtoaimp.h
+++ /dev/null
@@ -1,677 +0,0 @@
-/* $NetBSD: gdtoaimp.h,v 1.14 2013/04/19 10:41:53 joerg Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998-2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* This is a variation on dtoa.c that converts arbitary binary
-   floating-point formats to and from decimal notation.  It uses
-   double-precision arithmetic internally, so there are still
-   various #ifdefs that adapt the calculations to the native
-   double-precision arithmetic (any of IEEE, VAX D_floating,
-   or IBM mainframe arithmetic).
-
-   Please send bug reports to David M. Gay (dmg at acm dot org,
-   with " at " changed at "@" and " dot " changed to ".").
- */
-
-/* On a machine with IEEE extended-precision registers, it is
- * necessary to specify double-precision (53-bit) rounding precision
- * before invoking strtod or dtoa.  If the machine uses (the equivalent
- * of) Intel 80x87 arithmetic, the call
- *	_control87(PC_53, MCW_PC);
- * does this with many compilers.  Whether this or another call is
- * appropriate depends on the compiler; for this to work, it may be
- * necessary to #include "float.h" or another system-dependent header
- * file.
- */
-
-/* strtod for IEEE-, VAX-, and IBM-arithmetic machines.
- *
- * This strtod returns a nearest machine number to the input decimal
- * string (or sets errno to ERANGE).  With IEEE arithmetic, ties are
- * broken by the IEEE round-even rule.  Otherwise ties are broken by
- * biased rounding (add half and chop).
- *
- * Inspired loosely by William D. Clinger's paper "How to Read Floating
- * Point Numbers Accurately" [Proc. ACM SIGPLAN '90, pp. 112-126].
- *
- * Modifications:
- *
- *	1. We only require IEEE, IBM, or VAX double-precision
- *		arithmetic (not IEEE double-extended).
- *	2. We get by with floating-point arithmetic in a case that
- *		Clinger missed -- when we're computing d * 10^n
- *		for a small integer d and the integer n is not too
- *		much larger than 22 (the maximum integer k for which
- *		we can represent 10^k exactly), we may be able to
- *		compute (d*10^k) * 10^(e-k) with just one roundoff.
- *	3. Rather than a bit-at-a-time adjustment of the binary
- *		result in the hard case, we use floating-point
- *		arithmetic to determine the adjustment to within
- *		one bit; only in really hard cases do we need to
- *		compute a second residual.
- *	4. Because of 3., we don't need a large table of powers of 10
- *		for ten-to-e (just some small tables, e.g. of 10^k
- *		for 0 <= k <= 22).
- */
-
-/*
- * #define IEEE_LITTLE_ENDIAN for IEEE-arithmetic machines where the least
- *	significant byte has the lowest address.
- * #define IEEE_BIG_ENDIAN for IEEE-arithmetic machines where the most
- *	significant byte has the lowest address.
- * #define Long int on machines with 32-bit ints and 64-bit longs.
- * #define Sudden_Underflow for IEEE-format machines without gradual
- *	underflow (i.e., that flush to zero on underflow).
- * #define IBM for IBM mainframe-style floating-point arithmetic.
- * #define VAX for VAX-style floating-point arithmetic (D_floating).
- * #define No_leftright to omit left-right logic in fast floating-point
- *	computation of dtoa.
- * #define Check_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3.
- * #define RND_PRODQUOT to use rnd_prod and rnd_quot (assembly routines
- *	that use extended-precision instructions to compute rounded
- *	products and quotients) with IBM.
- * #define ROUND_BIASED for IEEE-format with biased rounding and arithmetic
- *	that rounds toward +Infinity.
- * #define ROUND_BIASED_without_Round_Up for IEEE-format with biased
- *	rounding when the underlying floating-point arithmetic uses
- *	unbiased rounding.  This prevent using ordinary floating-point
- *	arithmetic when the result could be computed with one rounding error.
- * #define Inaccurate_Divide for IEEE-format with correctly rounded
- *	products but inaccurate quotients, e.g., for Intel i860.
- * #define NO_LONG_LONG on machines that do not have a "long long"
- *	integer type (of >= 64 bits).  On such machines, you can
- *	#define Just_16 to store 16 bits per 32-bit Long when doing
- *	high-precision integer arithmetic.  Whether this speeds things
- *	up or slows things down depends on the machine and the number
- *	being converted.  If long long is available and the name is
- *	something other than "long long", #define Llong to be the name,
- *	and if "unsigned Llong" does not work as an unsigned version of
- *	Llong, #define #ULLong to be the corresponding unsigned type.
- * #define KR_headers for old-style C function headers.
- * #define Bad_float_h if your system lacks a float.h or if it does not
- *	define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP,
- *	FLT_RADIX, FLT_ROUNDS, and DBL_MAX.
- * #define MALLOC your_malloc, where your_malloc(n) acts like malloc(n)
- *	if memory is available and otherwise does something you deem
- *	appropriate.  If MALLOC is undefined, malloc will be invoked
- *	directly -- and assumed always to succeed.  Similarly, if you
- *	want something other than the system's free() to be called to
- *	recycle memory acquired from MALLOC, #define FREE to be the
- *	name of the alternate routine.  (FREE or free is only called in
- *	pathological cases, e.g., in a gdtoa call after a gdtoa return in
- *	mode 3 with thousands of digits requested.)
- * #define Omit_Private_Memory to omit logic (added Jan. 1998) for making
- *	memory allocations from a private pool of memory when possible.
- *	When used, the private pool is PRIVATE_MEM bytes long:  2304 bytes,
- *	unless #defined to be a different length.  This default length
- *	suffices to get rid of MALLOC calls except for unusual cases,
- *	such as decimal-to-binary conversion of a very long string of
- *	digits.  When converting IEEE double precision values, the
- *	longest string gdtoa can return is about 751 bytes long.  For
- *	conversions by strtod of strings of 800 digits and all gdtoa
- *	conversions of IEEE doubles in single-threaded executions with
- *	8-byte pointers, PRIVATE_MEM >= 7400 appears to suffice; with
- *	4-byte pointers, PRIVATE_MEM >= 7112 appears adequate.
- * #define NO_INFNAN_CHECK if you do not wish to have INFNAN_CHECK
- *	#defined automatically on IEEE systems.  On such systems,
- *	when INFNAN_CHECK is #defined, strtod checks
- *	for Infinity and NaN (case insensitively).
- *	When INFNAN_CHECK is #defined and No_Hex_NaN is not #defined,
- *	strtodg also accepts (case insensitively) strings of the form
- *	NaN(x), where x is a string of hexadecimal digits (optionally
- *	preceded by 0x or 0X) and spaces; if there is only one string
- *	of hexadecimal digits, it is taken for the fraction bits of the
- *	resulting NaN; if there are two or more strings of hexadecimal
- *	digits, each string is assigned to the next available sequence
- *	of 32-bit words of fractions bits (starting with the most
- *	significant), right-aligned in each sequence.
- *	Unless GDTOA_NON_PEDANTIC_NANCHECK is #defined, input "NaN(...)"
- *	is consumed even when ... has the wrong form (in which case the
- *	"(...)" is consumed but ignored).
- * #define MULTIPLE_THREADS if the system offers preemptively scheduled
- *	multiple threads.  In this case, you must provide (or suitably
- *	#define) two locks, acquired by ACQUIRE_DTOA_LOCK(n) and freed
- *	by FREE_DTOA_LOCK(n) for n = 0 or 1.  (The second lock, accessed
- *	in pow5mult, ensures lazy evaluation of only one copy of high
- *	powers of 5; omitting this lock would introduce a small
- *	probability of wasting memory, but would otherwise be harmless.)
- *	You must also invoke freedtoa(s) to free the value s returned by
- *	dtoa.  You may do so whether or not MULTIPLE_THREADS is #defined.
- * #define IMPRECISE_INEXACT if you do not care about the setting of
- *	the STRTOG_Inexact bits in the special case of doing IEEE double
- *	precision conversions (which could also be done by the strtod in
- *	dtoa.c).
- * #define NO_HEX_FP to disable recognition of C9x's hexadecimal
- *	floating-point constants.
- * #define -DNO_ERRNO to suppress setting errno (in strtod.c and
- *	strtodg.c).
- * #define NO_STRING_H to use private versions of memcpy.
- *	On some K&R systems, it may also be necessary to
- *	#define DECLARE_SIZE_T in this case.
- * #define USE_LOCALE to use the current locale's decimal_point value.
- */
-
-/* #define IEEE_{BIG,LITTLE}_ENDIAN in ${ARCHDIR}/gdtoa/arith.h */
-
-#include <assert.h>
-#include <stdint.h>
-#define Short   int16_t
-#define UShort uint16_t
-#define Long    int32_t
-#define ULong  uint32_t
-#define LLong   int64_t
-#define ULLong uint64_t
-
-#define INFNAN_CHECK
-#ifdef _REENTRANT
-#define MULTIPLE_THREADS
-#endif
-#define USE_LOCALE
-
-#ifndef GDTOAIMP_H_INCLUDED
-#define GDTOAIMP_H_INCLUDED
-#include "gdtoa.h"
-#include "gd_qnan.h"
-#ifdef Honor_FLT_ROUNDS
-#include <fenv.h>
-#endif
-
-#ifdef DEBUG
-#include "stdio.h"
-#define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}
-#endif
-
-#include "stdlib.h"
-#include "string.h"
-
-#ifdef KR_headers
-#define Char char
-#else
-#define Char void
-#endif
-
-#ifdef MALLOC
-extern Char *MALLOC ANSI((size_t));
-#else
-#define MALLOC malloc
-#endif
-
-#undef IEEE_Arith
-#undef Avoid_Underflow
-#ifdef IEEE_BIG_ENDIAN
-#define IEEE_Arith
-#endif
-#ifdef IEEE_LITTLE_ENDIAN
-#define IEEE_Arith
-#endif
-
-#include "errno.h"
-#ifdef Bad_float_h
-
-#ifdef IEEE_Arith
-#define DBL_DIG 15
-#define DBL_MAX_10_EXP 308
-#define DBL_MAX_EXP 1024
-#define FLT_RADIX 2
-#define DBL_MAX 1.7976931348623157e+308
-#endif
-
-#ifdef IBM
-#define DBL_DIG 16
-#define DBL_MAX_10_EXP 75
-#define DBL_MAX_EXP 63
-#define FLT_RADIX 16
-#define DBL_MAX 7.2370055773322621e+75
-#endif
-
-#ifdef VAX
-#define DBL_DIG 16
-#define DBL_MAX_10_EXP 38
-#define DBL_MAX_EXP 127
-#define FLT_RADIX 2
-#define DBL_MAX 1.7014118346046923e+38
-#define n_bigtens 2
-#endif
-
-#ifndef LONG_MAX
-#define LONG_MAX 2147483647
-#endif
-
-#else /* ifndef Bad_float_h */
-#include "float.h"
-#endif /* Bad_float_h */
-
-#ifdef IEEE_Arith
-#define Scale_Bit 0x10
-#define n_bigtens 5
-#endif
-
-#ifdef IBM
-#define n_bigtens 3
-#endif
-
-#ifdef VAX
-#define n_bigtens 2
-#endif
-
-#include "math.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) + defined(VAX) + defined(IBM) != 1
-Exactly one of IEEE_LITTLE_ENDIAN, IEEE_BIG_ENDIAN, VAX, or IBM should be defined.
-#endif
-
-typedef union { double d; ULong L[2]; } __attribute__((__may_alias__)) U;
-
-#ifdef YES_ALIAS
-#define dval(x) x
-#ifdef IEEE_LITTLE_ENDIAN
-#define word0(x) ((ULong *)x)[1]
-#define word1(x) ((ULong *)x)[0]
-#else
-#define word0(x) ((ULong *)x)[0]
-#define word1(x) ((ULong *)x)[1]
-#endif
-#else /* !YES_ALIAS */
-#ifdef IEEE_LITTLE_ENDIAN
-#define word0(x) ( /* LINTED */ (U*)x)->L[1]
-#define word1(x) ( /* LINTED */ (U*)x)->L[0]
-#else
-#define word0(x) ( /* LINTED */ (U*)x)->L[0]
-#define word1(x) ( /* LINTED */ (U*)x)->L[1]
-#endif
-#define dval(x) ( /* LINTED */ (U*)x)->d
-#endif /* YES_ALIAS */
-
-/* The following definition of Storeinc is appropriate for MIPS processors.
- * An alternative that might be better on some machines is
- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
- */
-#if defined(IEEE_LITTLE_ENDIAN) + defined(VAX)
-#define Storeinc(a,b,c) \
- (((unsigned short *)(void *)a)[1] = (unsigned short)b, \
-  ((unsigned short *)(void *)a)[0] = (unsigned short)c, \
-  a++)
-#else
-#define Storeinc(a,b,c) \
- (((unsigned short *)(void *)a)[0] = (unsigned short)b, \
-  ((unsigned short *)(void *)a)[1] = (unsigned short)c, \
-  a++)
-#endif
-
-/* #define P DBL_MANT_DIG */
-/* Ten_pmax = floor(P*log(2)/log(5)) */
-/* Bletch = (highest power of 2 < DBL_MAX_10_EXP) / 16 */
-/* Quick_max = floor((P-1)*log(FLT_RADIX)/log(10) - 1) */
-/* Int_max = floor(P*log(FLT_RADIX)/log(10) - 1) */
-
-#ifdef IEEE_Arith
-#define Exp_shift  20
-#define Exp_shift1 20
-#define Exp_msk1    0x100000
-#define Exp_msk11   0x100000
-#define Exp_mask  0x7ff00000
-#define P 53
-#define Bias 1023
-#define Emin (-1022)
-#define Exp_1  0x3ff00000
-#define Exp_11 0x3ff00000
-#define Ebits 11
-#define Frac_mask  0xfffff
-#define Frac_mask1 0xfffff
-#define Ten_pmax 22
-#define Bletch 0x10
-#define Bndry_mask  0xfffff
-#define Bndry_mask1 0xfffff
-#define LSB 1
-#define Sign_bit 0x80000000
-#define Log2P 1
-#define Tiny0 0
-#define Tiny1 1
-#define Quick_max 14
-#define Int_max 14
-
-#ifndef Flt_Rounds
-#ifdef FLT_ROUNDS
-#define Flt_Rounds FLT_ROUNDS
-#else
-#define Flt_Rounds 1
-#endif
-#endif /*Flt_Rounds*/
-
-#else /* ifndef IEEE_Arith */
-#undef  Sudden_Underflow
-#define Sudden_Underflow
-#ifdef IBM
-#undef Flt_Rounds
-#define Flt_Rounds 0
-#define Exp_shift  24
-#define Exp_shift1 24
-#define Exp_msk1   0x1000000
-#define Exp_msk11  0x1000000
-#define Exp_mask  0x7f000000
-#define P 14
-#define Bias 65
-#define Exp_1  0x41000000
-#define Exp_11 0x41000000
-#define Ebits 8	/* exponent has 7 bits, but 8 is the right value in b2d */
-#define Frac_mask  0xffffff
-#define Frac_mask1 0xffffff
-#define Bletch 4
-#define Ten_pmax 22
-#define Bndry_mask  0xefffff
-#define Bndry_mask1 0xffffff
-#define LSB 1
-#define Sign_bit 0x80000000
-#define Log2P 4
-#define Tiny0 0x100000
-#define Tiny1 0
-#define Quick_max 14
-#define Int_max 15
-#else /* VAX */
-#undef Flt_Rounds
-#define Flt_Rounds 1
-#define Exp_shift  23
-#define Exp_shift1 7
-#define Exp_msk1    0x80
-#define Exp_msk11   0x800000
-#define Exp_mask  0x7f80
-#define P 56
-#define Bias 129
-#define Emin (-127)	/* XXX: Check this */
-#define Exp_1  0x40800000
-#define Exp_11 0x4080
-#define Ebits 8
-#define Frac_mask  0x7fffff
-#define Frac_mask1 0xffff007f
-#define Ten_pmax 24
-#define Bletch 2
-#define Bndry_mask  0xffff007f
-#define Bndry_mask1 0xffff007f
-#define LSB 0x10000
-#define Sign_bit 0x8000
-#define Log2P 1
-#define Tiny0 0x80
-#define Tiny1 0
-#define Quick_max 15
-#define Int_max 15
-#endif /* IBM, VAX */
-#endif /* IEEE_Arith */
-
-#ifndef IEEE_Arith
-#define ROUND_BIASED
-#else
-#ifdef ROUND_BIASED_without_Round_Up
-#undef  ROUND_BIASED
-#define ROUND_BIASED
-#endif
-#endif
-
-#ifdef RND_PRODQUOT
-#define rounded_product(a,b) a = rnd_prod(a, b)
-#define rounded_quotient(a,b) a = rnd_quot(a, b)
-#ifdef KR_headers
-extern double rnd_prod(), rnd_quot();
-#else
-extern double rnd_prod(double, double), rnd_quot(double, double);
-#endif
-#else
-#define rounded_product(a,b) a *= b
-#define rounded_quotient(a,b) a /= b
-#endif
-
-#define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1))
-#define Big1 0xffffffff
-
-#undef  Pack_16
-#ifndef Pack_32
-#define Pack_32
-#endif
-
-#ifdef NO_LONG_LONG
-#undef ULLong
-#ifdef Just_16
-#undef Pack_32
-#define Pack_16
-/* When Pack_32 is not defined, we store 16 bits per 32-bit Long.
- * This makes some inner loops simpler and sometimes saves work
- * during multiplications, but it often seems to make things slightly
- * slower.  Hence the default is now to store 32 bits per Long.
- */
-#endif
-#else	/* long long available */
-#ifndef Llong
-#define Llong long long
-#endif
-#ifndef ULLong
-#define ULLong unsigned Llong
-#endif
-#endif /* NO_LONG_LONG */
-
-#ifdef Pack_32
-#define ULbits 32
-#define kshift 5
-#define kmask 31
-#define ALL_ON 0xffffffff
-#else
-#define ULbits 16
-#define kshift 4
-#define kmask 15
-#define ALL_ON 0xffff
-#endif
-
-#ifndef MULTIPLE_THREADS
-#define ACQUIRE_DTOA_LOCK(n)	/*nothing*/
-#define FREE_DTOA_LOCK(n)	/*nothing*/
-#else
-#include "reentrant.h"
-
-extern mutex_t __gdtoa_locks[2];
-
-#define ACQUIRE_DTOA_LOCK(n)	\
-	do {							\
-		if (__isthreaded)				\
-			mutex_lock(&__gdtoa_locks[n]);		\
-	} while (/* CONSTCOND */ 0)
-#define FREE_DTOA_LOCK(n)	\
-	do {							\
-		if (__isthreaded)				\
-			mutex_unlock(&__gdtoa_locks[n]);	\
-	} while (/* CONSTCOND */ 0)
-#endif
-
-#define Kmax (sizeof(size_t) << 3)
-
- struct
-Bigint {
-	struct Bigint *next;
-	int k, maxwds, sign, wds;
-	ULong x[1];
-	};
-
- typedef struct Bigint Bigint;
-
-#ifdef NO_STRING_H
-#ifdef DECLARE_SIZE_T
-typedef unsigned int size_t;
-#endif
-extern void memcpy_D2A ANSI((void*, const void*, size_t));
-#define Bcopy(x,y) memcpy_D2A(&x->sign,&y->sign,y->wds*sizeof(ULong) + 2*sizeof(int))
-#else /* !NO_STRING_H */
-#define Bcopy(x,y) memcpy(&x->sign,&y->sign,y->wds*sizeof(ULong) + 2*sizeof(int))
-#endif /* NO_STRING_H */
-
-#define Balloc		__Balloc_D2A
-#define Bfree		__Bfree_D2A
-#define ULtoQ		__ULtoQ_D2A
-#define ULtof		__ULtof_D2A
-#define ULtod		__ULtod_D2A
-#define ULtodd		__ULtodd_D2A
-#define ULtox		__ULtox_D2A
-#define ULtoxL		__ULtoxL_D2A
-#define any_on 		__any_on_D2A
-#define b2d 		__b2d_D2A
-#define bigtens 	__bigtens_D2A
-#define cmp 		__cmp_D2A
-#define copybits 	__copybits_D2A
-#define d2b 		__d2b_D2A
-#define decrement 	__decrement_D2A
-#define diff 		__diff_D2A
-#define dtoa_result 	__dtoa_result_D2A
-#define g__fmt 		__g__fmt_D2A
-#define gethex 		__gethex_D2A
-#define hexdig 		__hexdig_D2A
-#define hexdig_init_D2A	__hexdig_init_D2A
-#define hexnan		__hexnan_D2A
-#define hi0bits		__hi0bits_D2A
-#define hi0bits_D2A	__hi0bits_D2A
-#define i2b		__i2b_D2A
-#define increment	__increment_D2A
-#define lo0bits		__lo0bits_D2A
-#define lshift		__lshift_D2A
-#define match		__match_D2A
-#define mult		__mult_D2A
-#define multadd		__multadd_D2A
-#define nrv_alloc	__nrv_alloc_D2A
-#define pow5mult	__pow5mult_D2A
-#define quorem		__quorem_D2A
-#define ratio		__ratio_D2A
-#define rshift		__rshift_D2A
-#define rv_alloc	__rv_alloc_D2A
-#define s2b		__s2b_D2A
-#define set_ones	__set_ones_D2A
-#define strcp		__strcp_D2A
-#define strcp_D2A	__strcp_D2A
-#define strtoIg		__strtoIg_D2A
-#define sum		__sum_D2A
-#define tens		__tens_D2A
-#define tinytens	__tinytens_D2A
-#define tinytens	__tinytens_D2A
-#define trailz		__trailz_D2A
-#define ulp		__ulp_D2A
-
- extern char *dtoa_result;
- extern CONST double bigtens[], tens[], tinytens[];
- extern unsigned char hexdig[];
-
- extern Bigint *Balloc ANSI((int));
- extern void Bfree ANSI((Bigint*));
- extern void ULtof ANSI((ULong*, ULong*, Long, int));
- extern void ULtod ANSI((ULong*, ULong*, Long, int));
- extern void ULtodd ANSI((ULong*, ULong*, Long, int));
- extern void ULtoQ ANSI((ULong*, ULong*, Long, int));
- extern void ULtox ANSI((UShort*, ULong*, Long, int));
- extern void ULtoxL ANSI((ULong*, ULong*, Long, int));
- extern ULong any_on ANSI((Bigint*, int));
- extern double b2d ANSI((Bigint*, int*));
- extern int cmp ANSI((Bigint*, Bigint*));
- extern void copybits ANSI((ULong*, int, Bigint*));
- extern Bigint *d2b ANSI((double, int*, int*));
- extern void decrement ANSI((Bigint*));
- extern Bigint *diff ANSI((Bigint*, Bigint*));
- extern char *dtoa ANSI((double d, int mode, int ndigits,
-			int *decpt, int *sign, char **rve));
- extern char *g__fmt ANSI((char*, char*, char*, int, ULong, size_t));
- extern int gethex ANSI((CONST char**, CONST FPI*, Long*, Bigint**, int, locale_t));
- extern void hexdig_init_D2A(Void);
- extern int hexnan ANSI((CONST char**, CONST FPI*, ULong*));
- extern int hi0bits_D2A ANSI((ULong));
- extern Bigint *i2b ANSI((int));
- extern Bigint *increment ANSI((Bigint*));
- extern int lo0bits ANSI((ULong*));
- extern Bigint *lshift ANSI((Bigint*, int));
- extern int match ANSI((CONST char**, CONST char*));
- extern Bigint *mult ANSI((Bigint*, Bigint*));
- extern Bigint *multadd ANSI((Bigint*, int, int));
- extern char *nrv_alloc ANSI((CONST char*, char **, size_t));
- extern Bigint *pow5mult ANSI((Bigint*, int));
- extern int quorem ANSI((Bigint*, Bigint*));
- extern double ratio ANSI((Bigint*, Bigint*));
- extern void rshift ANSI((Bigint*, int));
- extern char *rv_alloc ANSI((size_t));
- extern Bigint *s2b ANSI((CONST char*, int, int, ULong, size_t));
- extern Bigint *set_ones ANSI((Bigint*, int));
- extern char *strcp ANSI((char*, const char*));
- extern int strtoIg ANSI((CONST char*, char**, FPI*, Long*, Bigint**, int*));
- extern double strtod ANSI((const char *s00, char **se));
- extern Bigint *sum ANSI((Bigint*, Bigint*));
- extern int trailz ANSI((CONST Bigint*));
- extern double ulp ANSI((U*));
-
-#ifdef __cplusplus
-}
-#endif
-/*
- * NAN_WORD0 and NAN_WORD1 are only referenced in strtod.c.  Prior to
- * 20050115, they used to be hard-wired here (to 0x7ff80000 and 0,
- * respectively), but now are determined by compiling and running
- * qnan.c to generate gd_qnan.h, which specifies d_QNAN0 and d_QNAN1.
- * Formerly gdtoaimp.h recommended supplying suitable -DNAN_WORD0=...
- * and -DNAN_WORD1=...  values if necessary.  This should still work.
- * (On HP Series 700/800 machines, -DNAN_WORD0=0x7ff40000 works.)
- */
-#ifdef IEEE_Arith
-#ifndef NO_INFNAN_CHECK
-#undef INFNAN_CHECK
-#define INFNAN_CHECK
-#endif
-#ifdef IEEE_BIG_ENDIAN
-#define _0 0
-#define _1 1
-#ifndef NAN_WORD0
-#define NAN_WORD0 d_QNAN0
-#endif
-#ifndef NAN_WORD1
-#define NAN_WORD1 d_QNAN1
-#endif
-#else
-#define _0 1
-#define _1 0
-#ifndef NAN_WORD0
-#define NAN_WORD0 d_QNAN1
-#endif
-#ifndef NAN_WORD1
-#define NAN_WORD1 d_QNAN0
-#endif
-#endif
-#else
-#undef INFNAN_CHECK
-#endif
-
-#undef SI
-#ifdef Sudden_Underflow
-#define SI 1
-#else
-#define SI 0
-#endif
-
-#endif /* GDTOAIMP_H_INCLUDED */
diff --git a/lib/libc/gdtoa/gethex.c b/lib/libc/gdtoa/gethex.c
deleted file mode 100644
index 9818a284d..000000000
--- a/lib/libc/gdtoa/gethex.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/* $NetBSD: gethex.c,v 1.6 2013/04/19 10:41:53 joerg Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
-#ifdef USE_LOCALE
-#include "locale.h"
-#endif
-
- int
-gethex( CONST char **sp, CONST FPI *fpi, Long *expt, Bigint **bp, int sign, locale_t loc)
-{
-	Bigint *b;
-	CONST char *decpt, *s, *s0, *s1;
-	int big, esign, havedig, irv, j, k, n, n0, nbits, up, zret;
-	ULong L, lostbits, *x;
-	Long e, e1;
-#ifdef USE_LOCALE
-	int i;
-	const char *decimalpoint = localeconv_l(loc)->decimal_point;
-#endif
-
-	if (!hexdig[(unsigned char)'0'])
-		hexdig_init_D2A();
-	*bp = 0;
-	havedig = 0;
-	s0 = *(CONST char **)sp + 2;
-	while(s0[havedig] == '0')
-		havedig++;
-	s0 += havedig;
-	s = s0;
-	decpt = 0;
-	zret = 0;
-	e = 0;
-	if (hexdig[(unsigned char)*s])
-		havedig++;
-	else {
-		zret = 1;
-#ifdef USE_LOCALE
-		for(i = 0; decimalpoint[i]; ++i) {
-			if (s[i] != decimalpoint[i])
-				goto pcheck;
-			}
-		decpt = s += i;
-#else
-		if (*s != '.')
-			goto pcheck;
-		decpt = ++s;
-#endif
-		if (!hexdig[(unsigned char)*s])
-			goto pcheck;
-		while(*s == '0')
-			s++;
-		if (hexdig[(unsigned char)*s])
-			zret = 0;
-		havedig = 1;
-		s0 = s;
-		}
-	while(hexdig[(unsigned char)*s])
-		s++;
-#ifdef USE_LOCALE
-	if (*s == *decimalpoint && !decpt) {
-		for(i = 1; decimalpoint[i]; ++i) {
-			if (s[i] != decimalpoint[i])
-				goto pcheck;
-			}
-		decpt = s += i;
-#else
-	if (*s == '.' && !decpt) {
-		decpt = ++s;
-#endif
-		while(hexdig[(unsigned char)*s])
-			s++;
-		}/*}*/
-	if (decpt)
-		e = -(((Long)(s-decpt)) << 2);
- pcheck:
-	s1 = s;
-	big = esign = 0;
-	switch(*s) {
-	  case 'p':
-	  case 'P':
-		switch(*++s) {
-		  case '-':
-			esign = 1;
-			/* FALLTHROUGH */
-		  case '+':
-			s++;
-		  }
-		if ((n = hexdig[(unsigned char)*s]) == 0 || n > 0x19) {
-			s = s1;
-			break;
-			}
-		e1 = n - 0x10;
-		while((n = hexdig[(unsigned char)*++s]) !=0 && n <= 0x19) {
-			if (e1 & 0xf8000000)
-				big = 1;
-			e1 = 10*e1 + n - 0x10;
-			}
-		if (esign)
-			e1 = -e1;
-		e += e1;
-	  }
-	*sp = __UNCONST(s);
-	if (!havedig)
-		*sp = (char*)__UNCONST(s0) - 1;
-	if (zret)
-		return STRTOG_Zero;
-	if (big) {
-		if (esign) {
-			switch(fpi->rounding) {
-			  case FPI_Round_up:
-				if (sign)
-					break;
-				goto ret_tiny;
-			  case FPI_Round_down:
-				if (!sign)
-					break;
-				goto ret_tiny;
-			  }
-			goto retz;
- ret_tiny:
-			b = Balloc(0);
-			b->wds = 1;
-			b->x[0] = 1;
-			goto dret;
-			}
-		switch(fpi->rounding) {
-		  case FPI_Round_near:
-			goto ovfl1;
-		  case FPI_Round_up:
-			if (!sign)
-				goto ovfl1;
-			goto ret_big;
-		  case FPI_Round_down:
-			if (sign)
-				goto ovfl1;
-			goto ret_big;
-		  }
- ret_big:
-		nbits = fpi->nbits;
-		n0 = n = (unsigned int)nbits >> kshift;
-		if (nbits & kmask)
-			++n;
-		for(j = n, k = 0; (j = (unsigned int)j >> 1) != 0; ++k);
-		*bp = b = Balloc(k);
-		b->wds = n;
-		for(j = 0; j < n0; ++j)
-			b->x[j] = ALL_ON;
-		if (n > n0)
-			b->x[j] = ULbits >> (ULbits - (nbits & kmask));
-		*expt = fpi->emin;
-		return STRTOG_Normal | STRTOG_Inexlo;
-		}
-	n = (int)(s1 - s0) - 1;
-	for(k = 0; n > (1 << (kshift-2)) - 1; n = (unsigned int)n >> 1)
-		k++;
-	b = Balloc(k);
-	if (b == NULL)
-		return STRTOG_NoMemory;
-	x = b->x;
-	n = 0;
-	L = 0;
-#ifdef USE_LOCALE
-	for(i = 0; decimalpoint[i+1]; ++i);
-#endif
-	while(s1 > s0) {
-#ifdef USE_LOCALE
-		if (*--s1 == decimalpoint[i]) {
-			s1 -= i;
-			continue;
-			}
-#else
-		if (*--s1 == '.')
-			continue;
-#endif
-		if (n == ULbits) {
-			*x++ = L;
-			L = 0;
-			n = 0;
-			}
-		L |= (hexdig[(unsigned char)*s1] & 0x0f) << n;
-		n += 4;
-		}
-	*x++ = L;
-	b->wds = n = (int)(x - b->x);
-	n = ULbits*n - hi0bits(L);
-	nbits = fpi->nbits;
-	lostbits = 0;
-	x = b->x;
-	if (n > nbits) {
-		n -= nbits;
-		if (any_on(b,n)) {
-			lostbits = 1;
-			k = n - 1;
-			if (x[(unsigned int)k>>kshift] & 1 << (k & kmask)) {
-				lostbits = 2;
-				if (k > 0 && any_on(b,k))
-					lostbits = 3;
-				}
-			}
-		rshift(b, n);
-		e += n;
-		}
-	else if (n < nbits) {
-		n = nbits - n;
-		b = lshift(b, n);
-		if (b == NULL)
-			return STRTOG_NoMemory;
-		e -= n;
-		x = b->x;
-		}
-	if (e > fpi->emax) {
- ovfl:
-		Bfree(b);
- ovfl1:
-#ifndef NO_ERRNO
-		errno = ERANGE;
-#endif
-		return STRTOG_Infinite | STRTOG_Overflow | STRTOG_Inexhi;
-		}
-	irv = STRTOG_Normal;
-	if (e < fpi->emin) {
-		irv = STRTOG_Denormal;
-		n = fpi->emin - e;
-		if (n >= nbits) {
-			switch (fpi->rounding) {
-			  case FPI_Round_near:
-				if (n == nbits && (n < 2 || any_on(b,n-1)))
-					goto one_bit;
-				break;
-			  case FPI_Round_up:
-				if (!sign)
-					goto one_bit;
-				break;
-			  case FPI_Round_down:
-				if (sign) {
- one_bit:
-					x[0] = b->wds = 1;
- dret:
-					*bp = b;
-					*expt = fpi->emin;
-#ifndef NO_ERRNO
-					errno = ERANGE;
-#endif
-					return STRTOG_Denormal | STRTOG_Inexhi
-						| STRTOG_Underflow;
-					}
-			  }
-			Bfree(b);
- retz:
-#ifndef NO_ERRNO
-			errno = ERANGE;
-#endif
-			return STRTOG_Zero | STRTOG_Inexlo | STRTOG_Underflow;
-			}
-		k = n - 1;
-		if (lostbits)
-			lostbits = 1;
-		else if (k > 0)
-			lostbits = any_on(b,k);
-		if (x[(unsigned int)k>>kshift] & 1 << (k & kmask))
-			lostbits |= 2;
-		nbits -= n;
-		rshift(b,n);
-		e = fpi->emin;
-		}
-	if (lostbits) {
-		up = 0;
-		switch(fpi->rounding) {
-		  case FPI_Round_zero:
-			break;
-		  case FPI_Round_near:
-			if (lostbits & 2
-			 && (lostbits | x[0]) & 1)
-				up = 1;
-			break;
-		  case FPI_Round_up:
-			up = 1 - sign;
-			break;
-		  case FPI_Round_down:
-			up = sign;
-		  }
-		if (up) {
-			k = b->wds;
-			b = increment(b);
-			x = b->x;
-			if (irv == STRTOG_Denormal) {
-				if (nbits == fpi->nbits - 1
-				 && x[(unsigned int)nbits >> kshift] & 1 << (nbits & kmask))
-					irv =  STRTOG_Normal;
-				}
-			else if (b->wds > k
-			 || ((n = nbits & kmask) !=0
-			      && hi0bits(x[k-1]) < 32-n)) {
-				rshift(b,1);
-				if (++e > fpi->emax)
-					goto ovfl;
-				}
-			irv |= STRTOG_Inexhi;
-			}
-		else
-			irv |= STRTOG_Inexlo;
-		}
-	*bp = b;
-	*expt = e;
-	return irv;
-	}
diff --git a/lib/libc/gdtoa/gmisc.c b/lib/libc/gdtoa/gmisc.c
deleted file mode 100644
index 9c54580f9..000000000
--- a/lib/libc/gdtoa/gmisc.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* $NetBSD: gmisc.c,v 1.4 2012/03/13 21:13:34 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- void
-#ifdef KR_headers
-rshift(b, k) Bigint *b; int k;
-#else
-rshift(Bigint *b, int k)
-#endif
-{
-	ULong *x, *x1, *xe, y;
-	int n;
-
-	x = x1 = b->x;
-	n = (unsigned int)k >> kshift;
-	if (n < b->wds) {
-		xe = x + b->wds;
-		x += n;
-		if (k &= kmask) {
-			n = ULbits - k;
-			y = *x++ >> k;
-			while(x < xe) {
-				*x1++ = (y | (*x << n)) & ALL_ON;
-				y = *x++ >> k;
-				}
-			if ((*x1 = y) !=0)
-				x1++;
-			}
-		else
-			while(x < xe)
-				*x1++ = *x++;
-		}
-
-	ptrdiff_t td = x1 - b->x;
-	_DIAGASSERT(__type_fit(int, td));
-	if ((b->wds = (int)td) == 0)
-		b->x[0] = 0;
-	}
-
- int
-#ifdef KR_headers
-trailz(b) CONST Bigint *b;
-#else
-trailz(CONST Bigint *b)
-#endif
-{
-	ULong L;
-	CONST ULong *x, *xe;
-	int n = 0;
-
-	x = b->x;
-	xe = x + b->wds;
-	for(n = 0; x < xe && !*x; x++)
-		n += ULbits;
-	if (x < xe) {
-		L = *x;
-		n += lo0bits(&L);
-		}
-	return n;
-	}
diff --git a/lib/libc/gdtoa/hd_init.c b/lib/libc/gdtoa/hd_init.c
deleted file mode 100644
index 55d5d426c..000000000
--- a/lib/libc/gdtoa/hd_init.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $NetBSD: hd_init.c,v 1.2 2006/01/25 15:27:42 kleink Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- unsigned char hexdig[256];
-
- static void
-#ifdef KR_headers
-htinit(h, s, inc) unsigned char *h; CONST unsigned char *s; int inc;
-#else
-htinit(unsigned char *h, CONST unsigned char *s, int inc)
-#endif
-{
-	int i, j;
-	for(i = 0; (j = s[i]) !=0; i++)
-		h[j] = i + inc;
-	}
-
- void
-hexdig_init_D2A(Void)
-{
-#define USC (CONST unsigned char *)
-	htinit(hexdig, USC "0123456789", 0x10);
-	htinit(hexdig, USC "abcdef", 0x10 + 10);
-	htinit(hexdig, USC "ABCDEF", 0x10 + 10);
-	}
diff --git a/lib/libc/gdtoa/hdtoa.c b/lib/libc/gdtoa/hdtoa.c
deleted file mode 100644
index 243bd05ff..000000000
--- a/lib/libc/gdtoa/hdtoa.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/*	$NetBSD: hdtoa.c,v 1.9 2011/07/04 11:46:41 mrg Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.4 2007/01/03 04:57:58 das Exp $");
-#else
-__RCSID("$NetBSD: hdtoa.c,v 1.9 2011/07/04 11:46:41 mrg Exp $");
-#endif
-
-#include <float.h>
-#include <limits.h>
-#include <math.h>
-#ifndef __vax__
-#include <machine/ieee.h>
-#else
-#include <machine/vaxfp.h>
-#define ieee_double_u vax_dfloating_u
-#define dblu_d dfltu_d
-#define dblu_dbl dfltu_dflt
-#define dbl_sign dflt_sign
-#define dbl_exp dflt_exp
-#define dbl_frach dflt_frach
-#define dbl_fracm dflt_fracm
-#define dbl_fracl dflt_fracl
-#define DBL_FRACHBITS	DFLT_FRACHBITS
-#define DBL_FRACMBITS	DFLT_FRACMBITS
-#define DBL_FRACLBITS	DFLT_FRACLBITS
-#define DBL_EXPBITS	DFLT_EXPBITS
-#endif
-#include "gdtoaimp.h"
-
-/* Strings values used by dtoa() */
-#define	INFSTR	"Infinity"
-#define	NANSTR	"NaN"
-
-#define	DBL_ADJ		(DBL_MAX_EXP - 2 + ((DBL_MANT_DIG - 1) % 4))
-#define	LDBL_ADJ	(LDBL_MAX_EXP - 2 + ((LDBL_MANT_DIG - 1) % 4))
-
-/*
- * Round up the given digit string.  If the digit string is fff...f,
- * this procedure sets it to 100...0 and returns 1 to indicate that
- * the exponent needs to be bumped.  Otherwise, 0 is returned.
- */
-static int
-roundup(char *s0, int ndigits)
-{
-	char *s;
-
-	for (s = s0 + ndigits - 1; *s == 0xf; s--) {
-		if (s == s0) {
-			*s = 1;
-			return (1);
-		}
-		*s = 0;
-	}
-	++*s;
-	return (0);
-}
-
-/*
- * Round the given digit string to ndigits digits according to the
- * current rounding mode.  Note that this could produce a string whose
- * value is not representable in the corresponding floating-point
- * type.  The exponent pointed to by decpt is adjusted if necessary.
- */
-static void
-dorounding(char *s0, int ndigits, int sign, int *decpt)
-{
-	int adjust = 0;	/* do we need to adjust the exponent? */
-
-	switch (FLT_ROUNDS) {
-	case 0:		/* toward zero */
-	default:	/* implementation-defined */
-		break;
-	case 1:		/* to nearest, halfway rounds to even */
-		if ((s0[ndigits] > 8) ||
-		    (s0[ndigits] == 8 && s0[ndigits - 1] & 1))
-			adjust = roundup(s0, ndigits);
-		break;
-	case 2:		/* toward +inf */
-		if (sign == 0)
-			adjust = roundup(s0, ndigits);
-		break;
-	case 3:		/* toward -inf */
-		if (sign != 0)
-			adjust = roundup(s0, ndigits);
-		break;
-	}
-
-	if (adjust)
-		*decpt += 4;
-}
-
-/*
- * This procedure converts a double-precision number in IEEE format
- * into a string of hexadecimal digits and an exponent of 2.  Its
- * behavior is bug-for-bug compatible with dtoa() in mode 2, with the
- * following exceptions:
- *
- * - An ndigits < 0 causes it to use as many digits as necessary to
- *   represent the number exactly.
- * - The additional xdigs argument should point to either the string
- *   "0123456789ABCDEF" or the string "0123456789abcdef", depending on
- *   which case is desired.
- * - This routine does not repeat dtoa's mistake of setting decpt
- *   to 9999 in the case of an infinity or NaN.  INT_MAX is used
- *   for this purpose instead.
- *
- * Note that the C99 standard does not specify what the leading digit
- * should be for non-zero numbers.  For instance, 0x1.3p3 is the same
- * as 0x2.6p2 is the same as 0x4.cp3.  This implementation chooses the
- * first digit so that subsequent digits are aligned on nibble
- * boundaries (before rounding).
- *
- * Inputs:	d, xdigs, ndigits
- * Outputs:	decpt, sign, rve
- */
-char *
-hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign,
-    char **rve)
-{
-	static const int sigfigs = (DBL_MANT_DIG + 3) / 4;
-	union ieee_double_u u;
-	char *s, *s0;
-	size_t bufsize;
-
-	u.dblu_d = d;
-	*sign = u.dblu_dbl.dbl_sign;
-
-	switch (fpclassify(d)) {
-	case FP_NORMAL:
-		*decpt = u.dblu_dbl.dbl_exp - DBL_ADJ;
-		break;
-	case FP_ZERO:
-		*decpt = 1;
-		return (nrv_alloc("0", rve, 1));
-	case FP_SUBNORMAL:
-#ifdef __vax__
-		/* (DBL_MAX_EXP=127 / 2) + 2 = 65? */
-		u.dblu_d *= 0x1p65;
-		*decpt = u.dblu_dbl.dbl_exp - (65 + DBL_ADJ);
-#else
-		/* (DBL_MAX_EXP=1024 / 2) + 2 = 514? */
-		u.dblu_d *= 0x1p514;
-		*decpt = u.dblu_dbl.dbl_exp - (514 + DBL_ADJ);
-#endif
-		break;
-	case FP_INFINITE:
-		*decpt = INT_MAX;
-		return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1));
-	case FP_NAN:
-		*decpt = INT_MAX;
-		return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1));
-	default:
-		abort();
-	}
-
-	/* FP_NORMAL or FP_SUBNORMAL */
-
-	if (ndigits == 0)		/* dtoa() compatibility */
-		ndigits = 1;
-
-	/*
-	 * For simplicity, we generate all the digits even if the
-	 * caller has requested fewer.
-	 */
-	bufsize = (sigfigs > ndigits) ? sigfigs : ndigits;
-	s0 = rv_alloc(bufsize);
-	if (s0 == NULL)
-		return NULL;
-
-	/*
-	 * We work from right to left, first adding any requested zero
-	 * padding, then the least significant portion of the
-	 * mantissa, followed by the most significant.  The buffer is
-	 * filled with the byte values 0x0 through 0xf, which are
-	 * converted to xdigs[0x0] through xdigs[0xf] after the
-	 * rounding phase.
-	 */
-	for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--)
-		*s = 0;
-	for (; s > s0 + sigfigs - (DBL_FRACLBITS / 4) - 1 && s > s0; s--) {
-		*s = u.dblu_dbl.dbl_fracl & 0xf;
-		u.dblu_dbl.dbl_fracl >>= 4;
-	}
-#ifdef DBL_FRACMBITS
-	for (; s > s0; s--) {
-		*s = u.dblu_dbl.dbl_fracm & 0xf;
-		u.dblu_dbl.dbl_fracm >>= 4;
-	}
-#endif
-	for (; s > s0; s--) {
-		*s = u.dblu_dbl.dbl_frach & 0xf;
-		u.dblu_dbl.dbl_frach >>= 4;
-	}
-
-	/*
-	 * At this point, we have snarfed all the bits in the
-	 * mantissa, with the possible exception of the highest-order
-	 * (partial) nibble, which is dealt with by the next
-	 * statement.  We also tack on the implicit normalization bit.
-	 */
-	*s = u.dblu_dbl.dbl_frach | (1U << ((DBL_MANT_DIG - 1) % 4));
-
-	/* If ndigits < 0, we are expected to auto-size the precision. */
-	if (ndigits < 0) {
-		for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--)
-			continue;
-	}
-
-	if (sigfigs > ndigits && s0[ndigits] != 0)
-		dorounding(s0, ndigits, u.dblu_dbl.dbl_sign, decpt);
-
-	s = s0 + ndigits;
-	if (rve != NULL)
-		*rve = s;
-	*s-- = '\0';
-	for (; s >= s0; s--)
-		*s = xdigs[(unsigned int)*s];
-
-	return (s0);
-}
-
-#if (LDBL_MANT_DIG > DBL_MANT_DIG)
-
-/*
- * This is the long double version of hdtoa().
- */
-char *
-hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign,
-    char **rve)
-{
-	static const int sigfigs = (LDBL_MANT_DIG + 3) / 4;
-	union ieee_ext_u u;
-	char *s, *s0;
-	size_t bufsize;
-
-	memset(&u, 0, sizeof u);
-	u.extu_ld = e;
-	*sign = u.extu_ext.ext_sign;
-
-	switch (fpclassify(e)) {
-	case FP_NORMAL:
-		*decpt = u.extu_ext.ext_exp - LDBL_ADJ;
-		break;
-	case FP_ZERO:
-		*decpt = 1;
-		return (nrv_alloc("0", rve, 1));
-	case FP_SUBNORMAL:
-		u.extu_ld *= 0x1p514L;
-		*decpt = u.extu_ext.ext_exp - (514 + LDBL_ADJ);
-		break;
-	case FP_INFINITE:
-		*decpt = INT_MAX;
-		return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1));
-	case FP_NAN:
-		*decpt = INT_MAX;
-		return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1));
-	default:
-		abort();
-	}
-
-	/* FP_NORMAL or FP_SUBNORMAL */
-
-	if (ndigits == 0)		/* dtoa() compatibility */
-		ndigits = 1;
-
-	/*
-	 * For simplicity, we generate all the digits even if the
-	 * caller has requested fewer.
-	 */
-	bufsize = (sigfigs > ndigits) ? sigfigs : ndigits;
-	s0 = rv_alloc(bufsize);
-	if (s0 == NULL)
-		return NULL;
-
-	/*
-	 * We work from right to left, first adding any requested zero
-	 * padding, then the least significant portion of the
-	 * mantissa, followed by the most significant.  The buffer is
-	 * filled with the byte values 0x0 through 0xf, which are
-	 * converted to xdigs[0x0] through xdigs[0xf] after the
-	 * rounding phase.
-	 */
-	for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--)
-		*s = 0;
-	for (; s > s0 + sigfigs - (EXT_FRACLBITS / 4) - 1 && s > s0; s--) {
-		*s = u.extu_ext.ext_fracl & 0xf;
-		u.extu_ext.ext_fracl >>= 4;
-	}
-#ifdef EXT_FRACHMBITS
-	for (; s > s0; s--) {
-		*s = u.extu_ext.ext_frachm & 0xf;
-		u.extu_ext.ext_frachm >>= 4;
-	}
-#endif
-#ifdef EXT_FRACLMBITS
-	for (; s > s0; s--) {
-		*s = u.extu_ext.ext_fraclm & 0xf;
-		u.extu_ext.ext_fraclm >>= 4;
-	}
-#endif
-	for (; s > s0; s--) {
-		*s = u.extu_ext.ext_frach & 0xf;
-		u.extu_ext.ext_frach >>= 4;
-	}
-
-	/*
-	 * At this point, we have snarfed all the bits in the
-	 * mantissa, with the possible exception of the highest-order
-	 * (partial) nibble, which is dealt with by the next
-	 * statement.  We also tack on the implicit normalization bit.
-	 */
-	*s = u.extu_ext.ext_frach | (1U << ((LDBL_MANT_DIG - 1) % 4));
-
-	/* If ndigits < 0, we are expected to auto-size the precision. */
-	if (ndigits < 0) {
-		for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--)
-			continue;
-	}
-
-	if (sigfigs > ndigits && s0[ndigits] != 0)
-		dorounding(s0, ndigits, u.extu_ext.ext_sign, decpt);
-
-	s = s0 + ndigits;
-	if (rve != NULL)
-		*rve = s;
-	*s-- = '\0';
-	for (; s >= s0; s--)
-		*s = xdigs[(unsigned int)*s];
-
-	return (s0);
-}
-
-#else	/* (LDBL_MANT_DIG == DBL_MANT_DIG) */
-
-char *
-hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign,
-    char **rve)
-{
-
-	return (hdtoa((double)e, xdigs, ndigits, decpt, sign, rve));
-}
-
-#endif	/* (LDBL_MANT_DIG == DBL_MANT_DIG) */
diff --git a/lib/libc/gdtoa/hexnan.c b/lib/libc/gdtoa/hexnan.c
deleted file mode 100644
index 267703e78..000000000
--- a/lib/libc/gdtoa/hexnan.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* $NetBSD: hexnan.c,v 1.5 2011/03/21 04:52:09 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- static void
-#ifdef KR_headers
-L_shift(x, x1, i) ULong *x; ULong *x1; int i;
-#else
-L_shift(ULong *x, ULong *x1, int i)
-#endif
-{
-	int j;
-
-	i = 8 - i;
-	i <<= 2;
-	j = ULbits - i;
-	do {
-		*x |= x[1] << j;
-		x[1] >>= i;
-		} while(++x < x1);
-	}
-
- int
-#ifdef KR_headers
-hexnan(sp, fpi, x0)
-	CONST char **sp; CONST FPI *fpi; ULong *x0;
-#else
-hexnan( CONST char **sp, CONST FPI *fpi, ULong *x0)
-#endif
-{
-	ULong c, h, *x, *x1, *xe;
-	CONST char *s;
-	int havedig, hd0, i, nbits;
-
-	if (!hexdig['0'])
-		hexdig_init_D2A();
-	nbits = fpi->nbits;
-	x = x0 + ((unsigned int)nbits >> kshift);
-	if (nbits & kmask)
-		x++;
-	*--x = 0;
-	x1 = xe = x;
-	havedig = hd0 = i = 0;
-	s = *sp;
-	/* allow optional initial 0x or 0X */
-	while((c = *(CONST unsigned char*)(s+1)) && c <= ' ')
-		++s;
-	if (s[1] == '0' && (s[2] == 'x' || s[2] == 'X')
-	 && *(CONST unsigned char*)(s+3) > ' ')
-		s += 2;
-	while((c = *(CONST unsigned char*)++s) != '\0') {
-		if (!(h = hexdig[c])) {
-			if (c <= ' ') {
-				if (hd0 < havedig) {
-					if (x < x1 && i < 8)
-						L_shift(x, x1, i);
-					if (x <= x0) {
-						i = 8;
-						continue;
-						}
-					hd0 = havedig;
-					*--x = 0;
-					x1 = x;
-					i = 0;
-					}
-				while(*(CONST unsigned char*)(s+1) <= ' ')
-					++s;
-				if (s[1] == '0' && (s[2] == 'x' || s[2] == 'X')
-				 && *(CONST unsigned char*)(s+3) > ' ')
-					s += 2;
-				continue;
-				}
-			if (/*(*/ c == ')' && havedig) {
-				*sp = s + 1;
-				break;
-				}
-#ifndef GDTOA_NON_PEDANTIC_NANCHECK
-			do {
-				if (/*(*/ c == ')') {
-					*sp = s + 1;
-					break;
-					}
-				} while((c = *++s) != '\0');
-#endif
-			return STRTOG_NaN;
-			}
-		havedig++;
-		if (++i > 8) {
-			if (x <= x0)
-				continue;
-			i = 1;
-			*--x = 0;
-			}
-		*x = (*x << 4) | (h & 0xf);
-		}
-	if (!havedig)
-		return STRTOG_NaN;
-	if (x < x1 && i < 8)
-		L_shift(x, x1, i);
-	if (x > x0) {
-		x1 = x0;
-		do *x1++ = *x++;
-			while(x <= xe);
-		do *x1++ = 0;
-			while(x1 <= xe);
-		}
-	else {
-		/* truncate high-order word if necessary */
-		if ( (i = nbits & (ULbits-1)) !=0)
-			*xe &= ((ULong)0xffffffff) >> (ULbits - i);
-		}
-	for(x1 = xe;; --x1) {
-		if (*x1 != 0)
-			break;
-		if (x1 == x0) {
-			*x1 = 1;
-			break;
-			}
-		}
-	return STRTOG_NaNbits;
-	}
diff --git a/lib/libc/gdtoa/ldtoa.c b/lib/libc/gdtoa/ldtoa.c
deleted file mode 100644
index de026025a..000000000
--- a/lib/libc/gdtoa/ldtoa.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*	$NetBSD: ldtoa.c,v 1.4 2007/02/23 17:45:59 christos Exp $	*/
-
-/*-
- * Copyright (c) 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.2 2004/01/18 07:53:49 das Exp $");
-#else
-__RCSID("$NetBSD: ldtoa.c,v 1.4 2007/02/23 17:45:59 christos Exp $");
-#endif
-
-#include <float.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-#include <stdlib.h>
-#ifndef __vax__
-#include <machine/ieee.h>
-#endif
-#include "gdtoaimp.h"
-
-/*
- * ldtoa() is a wrapper for gdtoa() that makes it smell like dtoa(),
- * except that the floating point argument is passed by reference.
- * When dtoa() is passed a NaN or infinity, it sets expt to 9999.
- * However, a long double could have a valid exponent of 9999, so we
- * use INT_MAX in ldtoa() instead.
- */
-char *
-ldtoa(long double *ld, int mode, int ndigits, int *decpt, int *sign, char **rve)
-{
-#ifdef EXT_EXPBITS
-	static FPI fpi = {
-		LDBL_MANT_DIG,			/* nbits */
-		LDBL_MIN_EXP - LDBL_MANT_DIG,	/* emin */
-		LDBL_MAX_EXP - LDBL_MANT_DIG,	/* emax */
-		FPI_Round_near,	       		/* rounding */
-#ifdef Sudden_Underflow	/* unused, but correct anyway */
-		1
-#else
-		0
-#endif
-	};
-	int be, kind;
-	char *ret;
-	union ieee_ext_u u;
-	uint32_t bits[(LDBL_MANT_DIG + 31) / 32];
-
-	u.extu_ld = *ld;
-	*sign = u.extu_ext.ext_sign;
-	be = u.extu_ext.ext_exp - (LDBL_MAX_EXP - 1) - (LDBL_MANT_DIG - 1);
-	EXT_TO_ARRAY32(u, bits);
-
-	switch (fpclassify(u.extu_ld)) {
-	case FP_NORMAL:
-		kind = STRTOG_Normal;
-#ifdef	LDBL_IMPLICIT_NBIT
-		bits[LDBL_MANT_DIG / 32] |= 1 << ((LDBL_MANT_DIG - 1) % 32);
-#endif /* LDBL_IMPLICIT_NBIT */
-		break;
-	case FP_ZERO:
-		kind = STRTOG_Zero;
-		break;
-	case FP_SUBNORMAL:
-		kind = STRTOG_Denormal;
-#ifdef	LDBL_IMPLICIT_NBIT
-		be++;
-#endif
-		break;
-	case FP_INFINITE:
-		kind = STRTOG_Infinite;
-		break;
-	case FP_NAN:
-		kind = STRTOG_NaN;
-		break;
-	default:
-		abort();
-	}
-
-	ret = gdtoa(&fpi, be, (ULong *)bits, &kind, mode, ndigits, decpt, rve);
-	if (*decpt == -32768)
-		*decpt = INT_MAX;
-	return ret;
-#else
-	return dtoa((double)*ld, mode, ndigits, decpt, sign, rve);
-#endif
-}
diff --git a/lib/libc/gdtoa/makefile b/lib/libc/gdtoa/makefile
deleted file mode 100644
index 62f14df2e..000000000
--- a/lib/libc/gdtoa/makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-# $NetBSD: makefile,v 1.4 2011/03/20 23:15:35 christos Exp $
-
-# /****************************************************************
-# Copyright (C) 1998 by Lucent Technologies
-# All Rights Reserved
-#
-# Permission to use, copy, modify, and distribute this software and
-# its documentation for any purpose and without fee is hereby
-# granted, provided that the above copyright notice appear in all
-# copies and that both that the copyright notice and this
-# permission notice and warranty disclaimer appear in supporting
-# documentation, and that the name of Lucent or any of its entities
-# not be used in advertising or publicity pertaining to
-# distribution of the software without specific, written prior
-# permission.
-#
-# LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-# IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-# SPECIAL, 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.
-#
-# ****************************************************************/
-
-.SUFFIXES: .c .o
-CC = cc
-CFLAGS = -g
-
-.c.o:
-	$(CC) -c $(CFLAGS) $*.c
-
-# invoke "make Printf" to add printf.o to gdtoa.a (if desired)
-
-all: arith.h gd_qnan.h gdtoa.a
-
-arith.h: arithchk.c
-	$(CC) $(CFLAGS) arithchk.c || $(CC) -DNO_LONG_LONG $(CFLAGS) arithchk.c
-	./a.out >arith.h
-	rm -f a.out arithchk.o
-
-gd_qnan.h: arith.h qnan.c
-	$(CC) $(CFLAGS) qnan.c
-	./a.out >gd_qnan.h
-	rm -f a.out qnan.o
-
-gdtoa.a:  dmisc.c dtoa.c g_Qfmt.c g__fmt.c g_ddfmt.c g_dfmt.c\
-	 g_ffmt.c g_xLfmt.c g_xfmt.c gdtoa.c gethex.c gmisc.c hd_init.c\
-	 hexnan.c misc.c smisc.c strtoIQ.c strtoId.c strtoIdd.c\
-	 strtoIf.c strtoIg.c strtoIx.c strtoIxL.c strtod.c strtodI.c\
-	 strtodg.c strtof.c strtopQ.c strtopd.c strtopdd.c strtopf.c\
-	 strtopx.c strtopxL.c strtorQ.c strtord.c strtordd.c strtorf.c\
-	 strtorx.c strtorxL.c sum.c ulp.c
-	$(CC) -c $(CFLAGS) $?
-	x=`echo $? | sed 's/\.c/.o/g'` && ar ruv gdtoa.a $$x && rm $$x
-	ranlib gdtoa.a || true
-
-Printf: all printf.c
-	$(CC) -c $(CFLAGS) printf.c
-	ar ruv gdtoa.a printf.o
-	rm printf.o
-	touch Printf
-
-# If your system lacks ranlib, you do not need it.
-
-xs0 = README arithchk.c dmisc.c dtoa.c g_Qfmt.c g__fmt.c g_ddfmt.c\
-	 g_dfmt.c g_ffmt.c g_xLfmt.c g_xfmt.c gdtoa.c gdtoa.h\
-	 gdtoa_fltrnds.h gdtoaimp.h gethex.c gmisc.c hd_init.c hexnan.c\
-	 makefile misc.c printf.c printf.c0 qnan.c smisc.c stdio1.h\
-	 strtoIQ.c strtoId.c strtoIdd.c strtoIf.c strtoIg.c strtoIx.c\
-	 strtoIxL.c strtod.c strtodI.c strtodg.c strtodnrp.c strtof.c\
-	 strtopQ.c strtopd.c strtopdd.c strtopf.c strtopx.c strtopxL.c\
-	 strtorQ.c strtord.c strtordd.c strtorf.c strtorx.c strtorxL.c\
-	 sum.c ulp.c
-
-# "make -r xsum.out" to check for transmission errors; source for xsum is
-# netlib's "xsum.c from f2c", e.g.,
-# ftp://netlib.bell-labs.com/netlib/f2c/xsum.c.gz
-
-xsum.out: xsum0.out $(xs0)
-	xsum $(xs0) >xsum1.out
-	cmp xsum0.out xsum1.out && mv xsum1.out xsum.out || diff xsum[01].out
-
-clean:
-	rm -f arith.h gd_qnan.h *.[ao] Printf xsum.out xsum1.out
diff --git a/lib/libc/gdtoa/misc.c b/lib/libc/gdtoa/misc.c
deleted file mode 100644
index 9f3d4c008..000000000
--- a/lib/libc/gdtoa/misc.c
+++ /dev/null
@@ -1,920 +0,0 @@
-/* $NetBSD: misc.c,v 1.11 2011/11/21 09:46:19 mlelstv Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 1999 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- static Bigint *freelist[Kmax+1];
-#ifndef Omit_Private_Memory
-#ifndef PRIVATE_MEM
-#define PRIVATE_MEM 2304
-#endif
-#define PRIVATE_mem ((PRIVATE_MEM+sizeof(double)-1)/sizeof(double))
-static double private_mem[PRIVATE_mem], *pmem_next = private_mem;
-#endif
-
- Bigint *
-Balloc
-#ifdef KR_headers
-	(k) int k;
-#else
-	(int k)
-#endif
-{
-	int x;
-	Bigint *rv;
-#ifndef Omit_Private_Memory
-	size_t len;
-#endif
-
-	ACQUIRE_DTOA_LOCK(0);
-	/* The k > Kmax case does not need ACQUIRE_DTOA_LOCK(0), */
-	/* but this case seems very unlikely. */
-	if ((size_t)k <= Kmax && (rv = freelist[k]) !=0) {
-		freelist[k] = rv->next;
-		}
-	else {
-		x = 1 << k;
-#ifdef Omit_Private_Memory
-		rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong));
-#else
-		len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
-			/sizeof(double);
-		if ((size_t)k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem) {
-			rv = (Bigint*)(void *)pmem_next;
-			pmem_next += len;
-			}
-		else
-			rv = (Bigint*)MALLOC(len*sizeof(double));
-#endif
-		if (rv == NULL) {
-			FREE_DTOA_LOCK(0);
-			return NULL;
-		}
-		rv->k = k;
-		rv->maxwds = x;
-		}
-	FREE_DTOA_LOCK(0);
-	rv->sign = rv->wds = 0;
-	return rv;
-	}
-
- void
-Bfree
-#ifdef KR_headers
-	(v) Bigint *v;
-#else
-	(Bigint *v)
-#endif
-{
-	if (v) {
-		if ((size_t)v->k > Kmax)
-#ifdef FREE
-			FREE((void*)v);
-#else
-			free((void*)v);
-#endif
-		else {
-			ACQUIRE_DTOA_LOCK(0);
-			v->next = freelist[v->k];
-			freelist[v->k] = v;
-			FREE_DTOA_LOCK(0);
-			}
-		}
-	}
-
- int
-lo0bits
-#ifdef KR_headers
-	(y) ULong *y;
-#else
-	(ULong *y)
-#endif
-{
-	int k;
-	ULong x = *y;
-
-	if (x & 7) {
-		if (x & 1)
-			return 0;
-		if (x & 2) {
-			*y = x >> 1;
-			return 1;
-			}
-		*y = x >> 2;
-		return 2;
-		}
-	k = 0;
-	if (!(x & 0xffff)) {
-		k = 16;
-		x >>= 16;
-		}
-	if (!(x & 0xff)) {
-		k += 8;
-		x >>= 8;
-		}
-	if (!(x & 0xf)) {
-		k += 4;
-		x >>= 4;
-		}
-	if (!(x & 0x3)) {
-		k += 2;
-		x >>= 2;
-		}
-	if (!(x & 1)) {
-		k++;
-		x >>= 1;
-		if (!x)
-			return 32;
-		}
-	*y = x;
-	return k;
-	}
-
- Bigint *
-multadd
-#ifdef KR_headers
-	(b, m, a) Bigint *b; int m, a;
-#else
-	(Bigint *b, int m, int a)	/* multiply by m and add a */
-#endif
-{
-	int i, wds;
-#ifdef ULLong
-	ULong *x;
-	ULLong carry, y;
-#else
-	ULong carry, *x, y;
-#ifdef Pack_32
-	ULong xi, z;
-#endif
-#endif
-	Bigint *b1;
-
-	wds = b->wds;
-	x = b->x;
-	i = 0;
-	carry = a;
-	do {
-#ifdef ULLong
-		y = *x * (ULLong)m + carry;
-		carry = y >> 32;
-		/* LINTED conversion */
-		*x++ = y & 0xffffffffUL;
-#else
-#ifdef Pack_32
-		xi = *x;
-		y = (xi & 0xffff) * m + carry;
-		z = (xi >> 16) * m + (y >> 16);
-		carry = z >> 16;
-		*x++ = (z << 16) + (y & 0xffff);
-#else
-		y = *x * m + carry;
-		carry = y >> 16;
-		*x++ = y & 0xffff;
-#endif
-#endif
-		}
-		while(++i < wds);
-	if (carry) {
-		if (wds >= b->maxwds) {
-			b1 = Balloc(b->k+1);
-			if (b1 == NULL) {
-				Bfree(b);
-				return NULL;
-				}
-			Bcopy(b1, b);
-			Bfree(b);
-			b = b1;
-			}
-		/* LINTED conversion */
-		b->x[wds++] = carry;
-		b->wds = wds;
-		}
-	return b;
-	}
-
- int
-hi0bits_D2A
-#ifdef KR_headers
-	(x) ULong x;
-#else
-	(ULong x)
-#endif
-{
-	int k = 0;
-
-	if (!(x & 0xffff0000)) {
-		k = 16;
-		x <<= 16;
-		}
-	if (!(x & 0xff000000)) {
-		k += 8;
-		x <<= 8;
-		}
-	if (!(x & 0xf0000000)) {
-		k += 4;
-		x <<= 4;
-		}
-	if (!(x & 0xc0000000)) {
-		k += 2;
-		x <<= 2;
-		}
-	if (!(x & 0x80000000)) {
-		k++;
-		if (!(x & 0x40000000))
-			return 32;
-		}
-	return k;
-	}
-
- Bigint *
-i2b
-#ifdef KR_headers
-	(i) int i;
-#else
-	(int i)
-#endif
-{
-	Bigint *b;
-
-	b = Balloc(1);
-	if (b == NULL)
-		return NULL;
-	b->x[0] = i;
-	b->wds = 1;
-	return b;
-	}
-
- Bigint *
-mult
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
-{
-	Bigint *c;
-	int k, wa, wb, wc;
-	ULong *x, *xa, *xae, *xb, *xbe, *xc, *xc0;
-	ULong y;
-#ifdef ULLong
-	ULLong carry, z;
-#else
-	ULong carry, z;
-#ifdef Pack_32
-	ULong z2;
-#endif
-#endif
-
-	if (a->wds < b->wds) {
-		c = a;
-		a = b;
-		b = c;
-		}
-	k = a->k;
-	wa = a->wds;
-	wb = b->wds;
-	wc = wa + wb;
-	if (wc > a->maxwds)
-		k++;
-	c = Balloc(k);
-	if (c == NULL)
-		return NULL;
-	for(x = c->x, xa = x + wc; x < xa; x++)
-		*x = 0;
-	xa = a->x;
-	xae = xa + wa;
-	xb = b->x;
-	xbe = xb + wb;
-	xc0 = c->x;
-#ifdef ULLong
-	for(; xb < xbe; xc0++) {
-		if ( (y = *xb++) !=0) {
-			x = xa;
-			xc = xc0;
-			carry = 0;
-			do {
-				z = *x++ * (ULLong)y + *xc + carry;
-				carry = z >> 32;
-				/* LINTED conversion */
-				*xc++ = z & 0xffffffffUL;
-				}
-				while(x < xae);
-			/* LINTED conversion */
-			*xc = carry;
-			}
-		}
-#else
-#ifdef Pack_32
-	for(; xb < xbe; xb++, xc0++) {
-		if ( (y = *xb & 0xffff) !=0) {
-			x = xa;
-			xc = xc0;
-			carry = 0;
-			do {
-				z = (*x & 0xffff) * y + (*xc & 0xffff) + carry;
-				carry = z >> 16;
-				z2 = (*x++ >> 16) * y + (*xc >> 16) + carry;
-				carry = z2 >> 16;
-				Storeinc(xc, z2, z);
-				}
-				while(x < xae);
-			*xc = carry;
-			}
-		if ( (y = *xb >> 16) !=0) {
-			x = xa;
-			xc = xc0;
-			carry = 0;
-			z2 = *xc;
-			do {
-				z = (*x & 0xffff) * y + (*xc >> 16) + carry;
-				carry = z >> 16;
-				Storeinc(xc, z, z2);
-				z2 = (*x++ >> 16) * y + (*xc & 0xffff) + carry;
-				carry = z2 >> 16;
-				}
-				while(x < xae);
-			*xc = z2;
-			}
-		}
-#else
-	for(; xb < xbe; xc0++) {
-		if ( (y = *xb++) !=0) {
-			x = xa;
-			xc = xc0;
-			carry = 0;
-			do {
-				z = *x++ * y + *xc + carry;
-				carry = z >> 16;
-				*xc++ = z & 0xffff;
-				}
-				while(x < xae);
-			*xc = carry;
-			}
-		}
-#endif
-#endif
-	for(xc0 = c->x, xc = xc0 + wc; wc > 0 && !*--xc; --wc) ;
-	c->wds = wc;
-	return c;
-	}
-
- static Bigint *p5s;
-
- Bigint *
-pow5mult
-#ifdef KR_headers
-	(b, k) Bigint *b; int k;
-#else
-	(Bigint *b, int k)
-#endif
-{
-	Bigint *b1, *p5, *p51;
-	int i;
-	static CONST int p05[3] = { 5, 25, 125 };
-
-	if ( (i = k & 3) !=0) {
-		b = multadd(b, p05[i-1], 0);
-		if (b == NULL)
-			return NULL;
-		}
-
-	if (!(k = (unsigned int)k >> 2))
-		return b;
-	if ((p5 = p5s) == 0) {
-		/* first time */
-#ifdef MULTIPLE_THREADS
-		ACQUIRE_DTOA_LOCK(1);
-		if (!(p5 = p5s)) {
-			p5 = p5s = i2b(625);
-			if (p5 == NULL) {
-				FREE_DTOA_LOCK(1);
-				return NULL;
-			}
-			p5->next = 0;
-			}
-		FREE_DTOA_LOCK(1);
-#else
-		p5 = p5s = i2b(625);
-		if (p5 == NULL)
-			return NULL;
-		p5->next = 0;
-#endif
-		}
-	for(;;) {
-		if (k & 1) {
-			b1 = mult(b, p5);
-			if (b1 == NULL)
-				return NULL;
-			Bfree(b);
-			b = b1;
-			}
-		if (!(k = (unsigned int)k >> 1))
-			break;
-		if ((p51 = p5->next) == 0) {
-#ifdef MULTIPLE_THREADS
-			ACQUIRE_DTOA_LOCK(1);
-			if (!(p51 = p5->next)) {
-				p51 = p5->next = mult(p5,p5);
-				if (p51 == NULL) {
-					FREE_DTOA_LOCK(1);
-					return NULL;
-				}
-				p51->next = 0;
-				}
-			FREE_DTOA_LOCK(1);
-#else
-			p51 = p5->next = mult(p5,p5);
-			if (p51 == NULL)
-				return NULL;
-			p51->next = 0;
-#endif
-			}
-		p5 = p51;
-		}
-	return b;
-	}
-
- Bigint *
-lshift
-#ifdef KR_headers
-	(b, k) Bigint *b; int k;
-#else
-	(Bigint *b, int k)
-#endif
-{
-	int i, k1, n, n1;
-	Bigint *b1;
-	ULong *x, *x1, *xe, z;
-
-	n = (unsigned int)k >> kshift;
-	k1 = b->k;
-	n1 = n + b->wds + 1;
-	for(i = b->maxwds; n1 > i; i <<= 1)
-		k1++;
-	b1 = Balloc(k1);
-	if (b1 == NULL)
-		return NULL;
-	x1 = b1->x;
-	for(i = 0; i < n; i++)
-		*x1++ = 0;
-	x = b->x;
-	xe = x + b->wds;
-	if (k &= kmask) {
-#ifdef Pack_32
-		k1 = 32 - k;
-		z = 0;
-		do {
-			*x1++ = *x << k | z;
-			z = *x++ >> k1;
-			}
-			while(x < xe);
-		if ((*x1 = z) !=0)
-			++n1;
-#else
-		k1 = 16 - k;
-		z = 0;
-		do {
-			*x1++ = *x << k  & 0xffff | z;
-			z = *x++ >> k1;
-			}
-			while(x < xe);
-		if (*x1 = z)
-			++n1;
-#endif
-		}
-	else do
-		*x1++ = *x++;
-		while(x < xe);
-	b1->wds = n1 - 1;
-	Bfree(b);
-	return b1;
-	}
-
- int
-cmp
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
-{
-	ULong *xa, *xa0, *xb, *xb0;
-	int i, j;
-
-	i = a->wds;
-	j = b->wds;
-#ifdef DEBUG
-	if (i > 1 && !a->x[i-1])
-		Bug("cmp called with a->x[a->wds-1] == 0");
-	if (j > 1 && !b->x[j-1])
-		Bug("cmp called with b->x[b->wds-1] == 0");
-#endif
-	if (i -= j)
-		return i;
-	xa0 = a->x;
-	xa = xa0 + j;
-	xb0 = b->x;
-	xb = xb0 + j;
-	for(;;) {
-		if (*--xa != *--xb)
-			return *xa < *xb ? -1 : 1;
-		if (xa <= xa0)
-			break;
-		}
-	return 0;
-	}
-
- Bigint *
-diff
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
-{
-	Bigint *c;
-	int i, wa, wb;
-	ULong *xa, *xae, *xb, *xbe, *xc;
-#ifdef ULLong
-	ULLong borrow, y;
-#else
-	ULong borrow, y;
-#ifdef Pack_32
-	ULong z;
-#endif
-#endif
-
-	i = cmp(a,b);
-	if (!i) {
-		c = Balloc(0);
-		if (c == NULL)
-			return NULL;
-		c->wds = 1;
-		c->x[0] = 0;
-		return c;
-		}
-	if (i < 0) {
-		c = a;
-		a = b;
-		b = c;
-		i = 1;
-		}
-	else
-		i = 0;
-	c = Balloc(a->k);
-	if (c == NULL)
-		return NULL;
-	c->sign = i;
-	wa = a->wds;
-	xa = a->x;
-	xae = xa + wa;
-	wb = b->wds;
-	xb = b->x;
-	xbe = xb + wb;
-	xc = c->x;
-	borrow = 0;
-#ifdef ULLong
-	do {
-		y = (ULLong)*xa++ - *xb++ - borrow;
-		borrow = y >> 32 & 1UL;
-		/* LINTED conversion */
-		*xc++ = y & 0xffffffffUL;
-		}
-		while(xb < xbe);
-	while(xa < xae) {
-		y = *xa++ - borrow;
-		borrow = y >> 32 & 1UL;
-		/* LINTED conversion */
-		*xc++ = y & 0xffffffffUL;
-		}
-#else
-#ifdef Pack_32
-	do {
-		y = (*xa & 0xffff) - (*xb & 0xffff) - borrow;
-		borrow = (y & 0x10000) >> 16;
-		z = (*xa++ >> 16) - (*xb++ >> 16) - borrow;
-		borrow = (z & 0x10000) >> 16;
-		Storeinc(xc, z, y);
-		}
-		while(xb < xbe);
-	while(xa < xae) {
-		y = (*xa & 0xffff) - borrow;
-		borrow = (y & 0x10000) >> 16;
-		z = (*xa++ >> 16) - borrow;
-		borrow = (z & 0x10000) >> 16;
-		Storeinc(xc, z, y);
-		}
-#else
-	do {
-		y = *xa++ - *xb++ - borrow;
-		borrow = (y & 0x10000) >> 16;
-		*xc++ = y & 0xffff;
-		}
-		while(xb < xbe);
-	while(xa < xae) {
-		y = *xa++ - borrow;
-		borrow = (y & 0x10000) >> 16;
-		*xc++ = y & 0xffff;
-		}
-#endif
-#endif
-	while(!*--xc)
-		wa--;
-	c->wds = wa;
-	return c;
-	}
-
- double
-b2d
-#ifdef KR_headers
-	(a, e) Bigint *a; int *e;
-#else
-	(Bigint *a, int *e)
-#endif
-{
-	ULong *xa, *xa0, w, y, z;
-	int k;
-	U d;
-#ifdef VAX
-	ULong d0, d1;
-#else
-#define d0 word0(&d)
-#define d1 word1(&d)
-#endif
-
-	xa0 = a->x;
-	xa = xa0 + a->wds;
-	y = *--xa;
-#ifdef DEBUG
-	if (!y) Bug("zero y in b2d");
-#endif
-	k = hi0bits(y);
-	*e = 32 - k;
-#ifdef Pack_32
-	if (k < Ebits) {
-		d0 = Exp_1 | y >> (Ebits - k);
-		w = xa > xa0 ? *--xa : 0;
-		d1 = y << ((32-Ebits) + k) | w >> (Ebits - k);
-		goto ret_d;
-		}
-	z = xa > xa0 ? *--xa : 0;
-	if (k -= Ebits) {
-		d0 = Exp_1 | y << k | z >> (32 - k);
-		y = xa > xa0 ? *--xa : 0;
-		d1 = z << k | y >> (32 - k);
-		}
-	else {
-		d0 = Exp_1 | y;
-		d1 = z;
-		}
-#else
-	if (k < Ebits + 16) {
-		z = xa > xa0 ? *--xa : 0;
-		d0 = Exp_1 | y << k - Ebits | z >> Ebits + 16 - k;
-		w = xa > xa0 ? *--xa : 0;
-		y = xa > xa0 ? *--xa : 0;
-		d1 = z << k + 16 - Ebits | w << k - Ebits | y >> 16 + Ebits - k;
-		goto ret_d;
-		}
-	z = xa > xa0 ? *--xa : 0;
-	w = xa > xa0 ? *--xa : 0;
-	k -= Ebits + 16;
-	d0 = Exp_1 | y << k + 16 | z << k | w >> 16 - k;
-	y = xa > xa0 ? *--xa : 0;
-	d1 = w << k + 16 | y << k;
-#endif
- ret_d:
-#ifdef VAX
-	word0(&d) = d0 >> 16 | d0 << 16;
-	word1(&d) = d1 >> 16 | d1 << 16;
-#endif
-	return dval(&d);
-	}
-#undef d0
-#undef d1
-
- Bigint *
-d2b
-#ifdef KR_headers
-	(dd, e, bits) double dd; int *e, *bits;
-#else
-	(double dd, int *e, int *bits)
-#endif
-{
-	Bigint *b;
-	U d;
-#ifndef Sudden_Underflow
-	int i;
-#endif
-	int de, k;
-	ULong *x, y, z;
-#ifdef VAX
-	ULong d0, d1;
-#else
-#define d0 word0(&d)
-#define d1 word1(&d)
-#endif
-	d.d = dd;
-#ifdef VAX
-	d0 = word0(&d) >> 16 | word0(&d) << 16;
-	d1 = word1(&d) >> 16 | word1(&d) << 16;
-#endif
-
-#ifdef Pack_32
-	b = Balloc(1);
-#else
-	b = Balloc(2);
-#endif
-	if (b == NULL)
-		return NULL;
-	x = b->x;
-
-	z = d0 & Frac_mask;
-	d0 &= 0x7fffffff;	/* clear sign bit, which we ignore */
-#ifdef Sudden_Underflow
-	de = (int)(d0 >> Exp_shift);
-#ifndef IBM
-	z |= Exp_msk11;
-#endif
-#else
-	if ( (de = (int)(d0 >> Exp_shift)) !=0)
-		z |= Exp_msk1;
-#endif
-#ifdef Pack_32
-	if ( (y = d1) !=0) {
-		if ( (k = lo0bits(&y)) !=0) {
-			x[0] = y | z << (32 - k);
-			z >>= k;
-			}
-		else
-			x[0] = y;
-#ifndef Sudden_Underflow
-		i =
-#endif
-		     b->wds = (x[1] = z) !=0 ? 2 : 1;
-		}
-	else {
-		k = lo0bits(&z);
-		x[0] = z;
-#ifndef Sudden_Underflow
-		i =
-#endif
-		    b->wds = 1;
-		k += 32;
-		}
-#else
-	if ( (y = d1) !=0) {
-		if ( (k = lo0bits(&y)) !=0)
-			if (k >= 16) {
-				x[0] = y | z << 32 - k & 0xffff;
-				x[1] = z >> k - 16 & 0xffff;
-				x[2] = z >> k;
-				i = 2;
-				}
-			else {
-				x[0] = y & 0xffff;
-				x[1] = y >> 16 | z << 16 - k & 0xffff;
-				x[2] = z >> k & 0xffff;
-				x[3] = z >> k+16;
-				i = 3;
-				}
-		else {
-			x[0] = y & 0xffff;
-			x[1] = y >> 16;
-			x[2] = z & 0xffff;
-			x[3] = z >> 16;
-			i = 3;
-			}
-		}
-	else {
-#ifdef DEBUG
-		if (!z)
-			Bug("Zero passed to d2b");
-#endif
-		k = lo0bits(&z);
-		if (k >= 16) {
-			x[0] = z;
-			i = 0;
-			}
-		else {
-			x[0] = z & 0xffff;
-			x[1] = z >> 16;
-			i = 1;
-			}
-		k += 32;
-		}
-	while(!x[i])
-		--i;
-	b->wds = i + 1;
-#endif
-#ifndef Sudden_Underflow
-	if (de) {
-#endif
-#ifdef IBM
-		*e = (de - Bias - (P-1) << 2) + k;
-		*bits = 4*P + 8 - k - hi0bits(word0(&d) & Frac_mask);
-#else
-		*e = de - Bias - (P-1) + k;
-		*bits = P - k;
-#endif
-#ifndef Sudden_Underflow
-		}
-	else {
-		*e = de - Bias - (P-1) + 1 + k;
-#ifdef Pack_32
-		*bits = 32*i - hi0bits(x[i-1]);
-#else
-		*bits = (i+2)*16 - hi0bits(x[i]);
-#endif
-		}
-#endif
-	return b;
-	}
-#undef d0
-#undef d1
-
- CONST double
-#ifdef IEEE_Arith
-bigtens[] = { 1e16, 1e32, 1e64, 1e128, 1e256 };
-CONST double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128, 1e-256
-		};
-#else
-#ifdef IBM
-bigtens[] = { 1e16, 1e32, 1e64 };
-CONST double tinytens[] = { 1e-16, 1e-32, 1e-64 };
-#else
-bigtens[] = { 1e16, 1e32 };
-CONST double tinytens[] = { 1e-16, 1e-32 };
-#endif
-#endif
-
- CONST double
-tens[] = {
-		1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,
-		1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19,
-		1e20, 1e21, 1e22
-#ifdef VAX
-		, 1e23, 1e24
-#endif
-		};
-
- char *
-#ifdef KR_headers
-strcp_D2A(a, b) char *a; char *b;
-#else
-strcp_D2A(char *a, CONST char *b)
-#endif
-{
-	while((*a = *b++))
-		a++;
-	return a;
-	}
-
-#ifdef NO_STRING_H
-
- Char *
-#ifdef KR_headers
-memcpy_D2A(a, b, len) Char *a; Char *b; size_t len;
-#else
-memcpy_D2A(void *a1, void *b1, size_t len)
-#endif
-{
-	char *a = (char*)a1, *ae = a + len;
-	char *b = (char*)b1, *a0 = a;
-	while(a < ae)
-		*a++ = *b++;
-	return a0;
-	}
-
-#endif /* NO_STRING_H */
diff --git a/lib/libc/gdtoa/qnan.c b/lib/libc/gdtoa/qnan.c
deleted file mode 100644
index 2e5ce8924..000000000
--- a/lib/libc/gdtoa/qnan.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* $NetBSD: qnan.c,v 1.2 2006/01/25 15:27:42 kleink Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 2005 by David M. Gay
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that the copyright notice and this permission notice and warranty
-disclaimer appear in supporting documentation, and that the name of
-the author or any of his current or former employers not be used in
-advertising or publicity pertaining to distribution of the software
-without specific, written prior permission.
-
-THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN
-NO EVENT SHALL THE AUTHOR OR ANY OF HIS CURRENT OR FORMER EMPLOYERS BE
-LIABLE FOR ANY SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-/* Program to compute quiet NaNs of various precisions (float,	*/
-/* double, and perhaps long double) on the current system,	*/
-/* provided the system uses binary IEEE (P754) arithmetic.	*/
-/* Note that one system's quiet NaN may be a signaling NaN on	*/
-/* another system.  The IEEE arithmetic standards (P754, P854)	*/
-/* do not specify how to distinguish signaling NaNs from quiet	*/
-/* ones, and this detail varies across systems.	 The computed	*/
-/* NaN values are encoded in #defines for values for an		*/
-/* unsigned 32-bit integer type, called Ulong below, and	*/
-/* (for long double) perhaps as unsigned short values.  Once	*/
-/* upon a time, there were PC compilers for Intel CPUs that	*/
-/* had sizeof(long double) = 10.  Are such compilers still	*/
-/* distributed?							*/
-
-#include <stdio.h>
-#include "arith.h"
-
-#ifndef Long
-#define Long long
-#endif
-
-typedef unsigned Long Ulong;
-
-#undef HAVE_IEEE
-#ifdef IEEE_LITTLE_ENDIAN
-#define _0 1
-#define _1 0
-#define HAVE_IEEE
-#endif
-#ifdef IEEE_BIG_ENDIAN
-#define _0 0
-#define _1 1
-#define HAVE_IEEE
-#endif
-
-#define UL (unsigned long)
-
- int
-main(void)
-{
-#ifdef HAVE_IEEE
-	typedef union {
-		float f;
-		double d;
-		Ulong L[4];
-#ifndef NO_LONG_LONG
-		unsigned short u[5];
-		long double D;
-#endif
-		} U;
-	U a, b, c;
-	int i;
-
-	a.L[0] = b.L[0] = 0x7f800000;
-	c.f = a.f - b.f;
-	printf("#define f_QNAN 0x%lx\n", UL c.L[0]);
-	a.L[_0] = b.L[_0] = 0x7ff00000;
-	a.L[_1] = b.L[_1] = 0;
-	c.d = a.d - b.d;	/* quiet NaN */
-	printf("#define d_QNAN0 0x%lx\n", UL c.L[0]);
-	printf("#define d_QNAN1 0x%lx\n", UL c.L[1]);
-#ifdef NO_LONG_LONG
-	for(i = 0; i < 4; i++)
-		printf("#define ld_QNAN%d 0xffffffff\n", i);
-	for(i = 0; i < 5; i++)
-		printf("#define ldus_QNAN%d 0xffff\n", i);
-#else
-	b.D = c.D = a.d;
-	if (printf("") < 0)
-		c.D = 37;	/* never executed; just defeat optimization */
-	a.L[2] = a.L[3] = 0;
-	a.D = b.D - c.D;
-	for(i = 0; i < 4; i++)
-		printf("#define ld_QNAN%d 0x%lx\n", i, UL a.L[i]);
-	for(i = 0; i < 5; i++)
-		printf("#define ldus_QNAN%d 0x%x\n", i, a.u[i]);
-#endif
-#endif /* HAVE_IEEE */
-	return 0;
-	}
diff --git a/lib/libc/gdtoa/smisc.c b/lib/libc/gdtoa/smisc.c
deleted file mode 100644
index 27b9d6a8c..000000000
--- a/lib/libc/gdtoa/smisc.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* $NetBSD: smisc.c,v 1.5 2012/03/13 21:13:34 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 1999 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- Bigint *
-s2b
-#ifdef KR_headers
-	(s, nd0, nd, y9, dplen) CONST char *s; int dplen, nd0, nd; ULong y9;
-#else
-	(CONST char *s, int nd0, int nd, ULong y9, size_t dplen)
-#endif
-{
-	Bigint *b;
-	int i, k;
-	Long x, y;
-
-	x = (nd + 8) / 9;
-	for(k = 0, y = 1; x > y; y <<= 1, k++) ;
-#ifdef Pack_32
-	b = Balloc(k);
-	if (b == NULL)
-		return NULL;
-	b->x[0] = y9;
-	b->wds = 1;
-#else
-	b = Balloc(k+1);
-	if (b == NULL)
-		return NULL;
-	b->x[0] = y9 & 0xffff;
-	b->wds = (b->x[1] = y9 >> 16) ? 2 : 1;
-#endif
-
-	i = 9;
-	if (9 < nd0) {
-		s += 9;
-		do {
-			b = multadd(b, 10, *s++ - '0');
-			if (b == NULL)
-				return NULL;
-			} while(++i < nd0);
-		s += dplen;
-		}
-	else
-		s += dplen + 9;
-	for(; i < nd; i++) {
-		b = multadd(b, 10, *s++ - '0');
-		if (b == NULL)
-			return NULL;
-		}
-	return b;
-	}
- double
-ratio
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
-{
-	U da, db;
-	int k, ka, kb;
-
-	dval(&da) = b2d(a, &ka);
-	dval(&db) = b2d(b, &kb);
-	k = ka - kb + ULbits*(a->wds - b->wds);
-#ifdef IBM
-	if (k > 0) {
-		word0(&da) += (k >> 2)*Exp_msk1;
-		if (k &= 3)
-			dval(&da) *= 1 << k;
-		}
-	else {
-		k = -k;
-		word0(&db) += (k >> 2)*Exp_msk1;
-		if (k &= 3)
-			dval(&db) *= 1 << k;
-		}
-#else
-	if (k > 0)
-		word0(&da) += k*Exp_msk1;
-	else {
-		k = -k;
-		word0(&db) += k*Exp_msk1;
-		}
-#endif
-	return dval(&da) / dval(&db);
-	}
-
-#ifdef INFNAN_CHECK
-
- int
-match
-#ifdef KR_headers
-	(sp, t) CONST char **sp, *t;
-#else
-	(CONST char **sp, CONST char *t)
-#endif
-{
-	int c, d;
-	CONST char *s = *sp;
-
-	while( (d = *t++) !=0) {
-		if ((c = *++s) >= 'A' && c <= 'Z')
-			c += 'a' - 'A';
-		if (c != d)
-			return 0;
-		}
-	*sp = s + 1;
-	return 1;
-	}
-#endif /* INFNAN_CHECK */
-
- void
-#ifdef KR_headers
-copybits(c, n, b) ULong *c; int n; Bigint *b;
-#else
-copybits(ULong *c, int n, Bigint *b)
-#endif
-{
-	ULong *ce, *x, *xe;
-#ifdef Pack_16
-	int nw, nw1;
-#endif
-
-	ce = c + ((unsigned int)(n-1) >> kshift) + 1;
-	x = b->x;
-#ifdef Pack_32
-	xe = x + b->wds;
-	while(x < xe)
-		*c++ = *x++;
-#else
-	nw = b->wds;
-	nw1 = nw & 1;
-	for(xe = x + (nw - nw1); x < xe; x += 2)
-		Storeinc(c, x[1], x[0]);
-	if (nw1)
-		*c++ = *x;
-#endif
-	while(c < ce)
-		*c++ = 0;
-	}
-
- ULong
-#ifdef KR_headers
-any_on(b, k) Bigint *b; int k;
-#else
-any_on(Bigint *b, int k)
-#endif
-{
-	int n, nwds;
-	ULong *x, *x0, x1, x2;
-
-	x = b->x;
-	nwds = b->wds;
-	n = (unsigned int)k >> kshift;
-	if (n > nwds)
-		n = nwds;
-	else if (n < nwds && (k &= kmask)) {
-		x1 = x2 = x[n];
-		x1 >>= k;
-		x1 <<= k;
-		if (x1 != x2)
-			return 1;
-		}
-	x0 = x;
-	x += n;
-	while(x > x0)
-		if (*--x)
-			return 1;
-	return 0;
-	}
diff --git a/lib/libc/gdtoa/strtoIQ.c b/lib/libc/gdtoa/strtoIQ.c
deleted file mode 100644
index dfb5aaf23..000000000
--- a/lib/libc/gdtoa/strtoIQ.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* $NetBSD: strtoIQ.c,v 1.2 2008/03/21 23:13:48 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtoIQ(s, sp, a, b) CONST char *s; char **sp; void *a; void *b;
-#else
-strtoIQ(CONST char *s, char **sp, void *a, void *b)
-#endif
-{
-	static FPI fpi = { 113, 1-16383-113+1, 32766-16383-113+1, 1, SI };
-	Long exp[2];
-	Bigint *B[2];
-	int k, rv[2];
-	ULong *L = (ULong *)a, *M = (ULong *)b;
-
-	B[0] = Balloc(2);
-	if (B[0] == NULL)
-		return STRTOG_NoMemory;
-	B[0]->wds = 4;
-	k = strtoIg(s, sp, &fpi, exp, B, rv);
-	if (k == STRTOG_NoMemory)
-		return k;
-	ULtoQ(L, B[0]->x, exp[0], rv[0]);
-	Bfree(B[0]);
-	if (B[1]) {
-		ULtoQ(M, B[1]->x, exp[1], rv[1]);
-		Bfree(B[1]);
-		}
-	else {
-		M[0] = L[0];
-		M[1] = L[1];
-		M[2] = L[2];
-		M[3] = L[3];
-		}
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtoId.c b/lib/libc/gdtoa/strtoId.c
deleted file mode 100644
index 7cbfca213..000000000
--- a/lib/libc/gdtoa/strtoId.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* $NetBSD: strtoId.c,v 1.2 2008/03/21 23:13:48 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtoId(s, sp, f0, f1) CONST char *s; char **sp; double *f0, *f1;
-#else
-strtoId(CONST char *s, char **sp, double *f0, double *f1)
-#endif
-{
-	static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
-	Long exp[2];
-	Bigint *B[2];
-	int k, rv[2];
-
-	B[0] = Balloc(1);
-	if (B[0] == NULL)
-		return STRTOG_NoMemory;
-	B[0]->wds = 2;
-	k = strtoIg(s, sp, &fpi, exp, B, rv);
-	if (k == STRTOG_NoMemory)
-		return k;
-	ULtod((ULong*)f0, B[0]->x, exp[0], rv[0]);
-	Bfree(B[0]);
-	if (B[1]) {
-		ULtod((ULong*)f1, B[1]->x, exp[1], rv[1]);
-		Bfree(B[1]);
-		}
-	else {
-		((ULong*)f1)[0] = ((ULong*)f0)[0];
-		((ULong*)f1)[1] = ((ULong*)f0)[1];
-		}
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtoIdd.c b/lib/libc/gdtoa/strtoIdd.c
deleted file mode 100644
index cf938ea45..000000000
--- a/lib/libc/gdtoa/strtoIdd.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* $NetBSD: strtoIdd.c,v 1.2 2008/03/21 23:13:48 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtoIdd(s, sp, f0, f1) CONST char *s; char **sp; double *f0, *f1;
-#else
-strtoIdd(CONST char *s, char **sp, double *f0, double *f1)
-#endif
-{
-#ifdef Sudden_Underflow
-	static FPI fpi = { 106, 1-1023, 2046-1023-106+1, 1, 1 };
-#else
-	static FPI fpi = { 106, 1-1023-53+1, 2046-1023-106+1, 1, 0 };
-#endif
-	Long exp[2];
-	Bigint *B[2];
-	int k, rv[2];
-
-	B[0] = Balloc(2);
-	if (B[0] == NULL)
-		return STRTOG_NoMemory;
-	B[0]->wds = 4;
-	k = strtoIg(s, sp, &fpi, exp, B, rv);
-	if (k == STRTOG_NoMemory)
-		return k;
-	ULtodd((ULong*)f0, B[0]->x, exp[0], rv[0]);
-	Bfree(B[0]);
-	if (B[1]) {
-		ULtodd((ULong*)f1, B[1]->x, exp[1], rv[1]);
-		Bfree(B[1]);
-		}
-	else {
-		((ULong*)f1)[0] = ((ULong*)f0)[0];
-		((ULong*)f1)[1] = ((ULong*)f0)[1];
-		((ULong*)f1)[2] = ((ULong*)f0)[2];
-		((ULong*)f1)[3] = ((ULong*)f0)[3];
-		}
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtoIf.c b/lib/libc/gdtoa/strtoIf.c
deleted file mode 100644
index 087acdc71..000000000
--- a/lib/libc/gdtoa/strtoIf.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $NetBSD: strtoIf.c,v 1.2 2008/03/21 23:13:48 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtoIf(s, sp, f0, f1) CONST char *s; char **sp; float *f0, *f1;
-#else
-strtoIf(CONST char *s, char **sp, float *f0, float *f1)
-#endif
-{
-	static FPI fpi = { 24, 1-127-24+1,  254-127-24+1, 1, SI };
-	Long exp[2];
-	Bigint *B[2];
-	int k, rv[2];
-
-	B[0] = Balloc(0);
-	if (B[0] == NULL)
-		return STRTOG_NoMemory;
-	B[0]->wds = 1;
-	k = strtoIg(s, sp, &fpi, exp, B, rv);
-	if (k == STRTOG_NoMemory)
-		return k;
-	ULtof((ULong*)f0, B[0]->x, exp[0], rv[0]);
-	Bfree(B[0]);
-	if (B[1]) {
-		ULtof((ULong*)f1, B[1]->x, exp[1], rv[1]);
-		Bfree(B[1]);
-		}
-	else
-		*(ULong*)f1 = *(ULong*)f0;
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtoIg.c b/lib/libc/gdtoa/strtoIg.c
deleted file mode 100644
index 0dc3e36c7..000000000
--- a/lib/libc/gdtoa/strtoIg.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/* $NetBSD: strtoIg.c,v 1.3 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtoIg(s00, se, fpi, exp, B, rvp) CONST char *s00; char **se; FPI *fpi; Long *exp; Bigint **B; int *rvp;
-#else
-strtoIg(CONST char *s00, char **se, FPI *fpi, Long *exp, Bigint **B, int *rvp)
-#endif
-{
-	Bigint *b, *b1;
-	int i, nb, nw, nw1, rv, rv1, swap;
-	unsigned int nb1, nb11;
-	Long e1;
-
-	b = *B;
-	rv = strtodg(s00, se, fpi, exp, b->x);
-	if (rv == STRTOG_NoMemory)
-		return rv;
-	if (!(rv & STRTOG_Inexact)) {
-		B[1] = 0;
-		return *rvp = rv;
-		}
-	e1 = exp[0];
-	rv1 = rv ^ STRTOG_Inexact;
-	b1 = Balloc(b->k);
-	if (b1 == NULL)
-		return STRTOG_NoMemory;
-	Bcopy(b1, b);
-	nb = fpi->nbits;
-	nb1 = nb & 31;
-	nb11 = (nb1 - 1) & 31;
-	nw = b->wds;
-	nw1 = nw - 1;
-	if (rv & STRTOG_Inexlo) {
-		swap = 0;
-		b1 = increment(b1);
-		if ((rv & STRTOG_Retmask) == STRTOG_Zero) {
-			if (fpi->sudden_underflow) {
-				b1->x[0] = 0;
-				b1->x[nw1] = 1L << nb11;
-				rv1 += STRTOG_Normal - STRTOG_Zero;
-				rv1 &= ~STRTOG_Underflow;
-				goto swapcheck;
-				}
-			rv1 &= STRTOG_Inexlo | STRTOG_Underflow | STRTOG_Zero;
-			rv1 |= STRTOG_Inexhi | STRTOG_Denormal;
-			goto swapcheck;
-			}
-		if (b1->wds > nw
-		 || (nb1 && b1->x[nw1] & 1L << nb1)) {
-			if (++e1 > fpi->emax)
-				rv1 = STRTOG_Infinite | STRTOG_Inexhi;
-			rshift(b1, 1);
-			}
-		else if ((rv & STRTOG_Retmask) == STRTOG_Denormal) {
-			if (b1->x[nw1] & 1L << nb11) {
-				rv1 += STRTOG_Normal - STRTOG_Denormal;
-				rv1 &= ~STRTOG_Underflow;
-				}
-			}
-		}
-	else {
-		swap = STRTOG_Neg;
-		if ((rv & STRTOG_Retmask) == STRTOG_Infinite) {
-			b1 = set_ones(b1, nb);
-			e1 = fpi->emax;
-			rv1 = STRTOG_Normal | STRTOG_Inexlo;
-			goto swapcheck;
-			}
-		decrement(b1);
-		if ((rv & STRTOG_Retmask) == STRTOG_Denormal) {
-			for(i = nw1; !b1->x[i]; --i)
-				if (!i) {
-					rv1 = STRTOG_Zero | STRTOG_Inexlo;
-					break;
-					}
-			goto swapcheck;
-			}
-		if (!(b1->x[nw1] & 1L << nb11)) {
-			if (e1 == fpi->emin) {
-				if (fpi->sudden_underflow)
-					rv1 += STRTOG_Zero - STRTOG_Normal;
-				else
-					rv1 += STRTOG_Denormal - STRTOG_Normal;
-				rv1 |= STRTOG_Underflow;
-				}
-			else {
-				b1 = lshift(b1, 1);
-				b1->x[0] |= 1;
-				--e1;
-				}
-			}
-		}
- swapcheck:
-	if (swap ^ (rv & STRTOG_Neg)) {
-		rvp[0] = rv1;
-		rvp[1] = rv;
-		B[0] = b1;
-		B[1] = b;
-		exp[1] = exp[0];
-		exp[0] = e1;
-		}
-	else {
-		rvp[0] = rv;
-		rvp[1] = rv1;
-		B[1] = b1;
-		exp[1] = e1;
-		}
-	return rv;
-	}
diff --git a/lib/libc/gdtoa/strtoIx.c b/lib/libc/gdtoa/strtoIx.c
deleted file mode 100644
index 966e4e364..000000000
--- a/lib/libc/gdtoa/strtoIx.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $NetBSD: strtoIx.c,v 1.2 2008/03/21 23:13:48 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtoIx(s, sp, a, b) CONST char *s; char **sp; void *a; void *b;
-#else
-strtoIx(CONST char *s, char **sp, void *a, void *b)
-#endif
-{
-	static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI };
-	Long exp[2];
-	Bigint *B[2];
-	int k, rv[2];
-	UShort *L = (UShort *)a, *M = (UShort *)b;
-
-	B[0] = Balloc(1);
-	if (B[0] == NULL)
-		return STRTOG_NoMemory;
-	B[0]->wds = 2;
-	k = strtoIg(s, sp, &fpi, exp, B, rv);
-	if (k == STRTOG_NoMemory)
-		return k;
-	ULtox(L, B[0]->x, exp[0], rv[0]);
-	Bfree(B[0]);
-	if (B[1]) {
-		ULtox(M, B[1]->x, exp[1], rv[1]);
-		Bfree(B[1]);
-		}
-	else {
-		M[0] = L[0];
-		M[1] = L[1];
-		M[2] = L[2];
-		M[3] = L[3];
-		M[4] = L[4];
-		}
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtoIxL.c b/lib/libc/gdtoa/strtoIxL.c
deleted file mode 100644
index e61069674..000000000
--- a/lib/libc/gdtoa/strtoIxL.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* $NetBSD: strtoIxL.c,v 1.2 2008/03/21 23:13:48 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtoIxL(s, sp, a, b) CONST char *s; char **sp; void *a; void *b;
-#else
-strtoIxL(CONST char *s, char **sp, void *a, void *b)
-#endif
-{
-	static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI };
-	Long exp[2];
-	Bigint *B[2];
-	int k, rv[2];
-	ULong *L = (ULong *)a, *M = (ULong *)b;
-
-	B[0] = Balloc(1);
-	if (B[0] == NULL)
-		return STRTOG_NoMemory;
-	B[0]->wds = 2;
-	k = strtoIg(s, sp, &fpi, exp, B, rv);
-	if (k == STRTOG_NoMemory)
-		return k;
-	ULtoxL(L, B[0]->x, exp[0], rv[0]);
-	Bfree(B[0]);
-	if (B[1]) {
-		ULtoxL(M, B[1]->x, exp[1], rv[1]);
-		Bfree(B[1]);
-		}
-	else {
-		M[0] = L[0];
-		M[1] = L[1];
-		M[2] = L[2];
-		}
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtod.c b/lib/libc/gdtoa/strtod.c
deleted file mode 100644
index 1f9323423..000000000
--- a/lib/libc/gdtoa/strtod.c
+++ /dev/null
@@ -1,1117 +0,0 @@
-/* $NetBSD: strtod.c,v 1.14 2013/05/17 12:55:57 joerg Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998-2001 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "namespace.h"
-#include "gdtoaimp.h"
-#ifndef NO_FENV_H
-#include <fenv.h>
-#endif
-
-#ifdef USE_LOCALE
-#include <locale.h>
-#include "setlocale_local.h"
-#endif
-
-#ifdef IEEE_Arith
-#ifndef NO_IEEE_Scale
-#define Avoid_Underflow
-#undef tinytens
-/* The factor of 2^106 in tinytens[4] helps us avoid setting the underflow */
-/* flag unnecessarily.  It leads to a song and dance at the end of strtod. */
-static CONST double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128,
-		9007199254740992.*9007199254740992.e-256
-		};
-#endif
-#endif
-
-#ifdef Honor_FLT_ROUNDS
-#undef Check_FLT_ROUNDS
-#define Check_FLT_ROUNDS
-#else
-#define Rounding Flt_Rounds
-#endif
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(_strtold, strtod)
-__weak_alias(strtold, _strtold)
-__strong_alias(_strtold_l, strtod_l)
-__weak_alias(strtold_l, _strtold_l)
-#endif
-
-#ifdef Avoid_Underflow /*{*/
- static double
-sulp
-#ifdef KR_headers
-	(x, scale) U *x; int scale;
-#else
-	(U *x, int scale)
-#endif
-{
-	U u;
-	double rv;
-	int i;
-
-	rv = ulp(x);
-	if (!scale || (i = 2*P + 1 - ((word0(x) & Exp_mask) >> Exp_shift)) <= 0)
-		return rv; /* Is there an example where i <= 0 ? */
-	word0(&u) = Exp_1 + (i << Exp_shift);
-	word1(&u) = 0;
-	return rv * u.d;
-	}
-#endif /*}*/
-
-static double
-_int_strtod_l(CONST char *s00, char **se, locale_t loc)
-{
-#ifdef Avoid_Underflow
-	int scale;
-#endif
-#ifdef INFNAN_CHECK
-	int decpt;
-#endif
-	int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
-		 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
-	CONST char *s, *s0, *s1;
-	double aadj;
-	Long L;
-	U adj, aadj1, rv, rv0;
-	ULong y, z;
-	Bigint *bb = NULL, *bb1, *bd0;
-	Bigint *bd = NULL, *bs = NULL, *delta = NULL; /* pacify gcc */
-#ifdef Avoid_Underflow
-	ULong Lsb, Lsb1;
-#endif
-#ifdef SET_INEXACT
-	int inexact, oldinexact;
-#endif
-#ifdef USE_LOCALE /*{{*/
-	char *decimalpoint = localeconv_l(loc)->decimal_point;
-	size_t dplen = strlen(decimalpoint);
-#endif /*USE_LOCALE}}*/
-
-#ifdef Honor_FLT_ROUNDS /*{*/
-	int Rounding;
-#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */
-	Rounding = Flt_Rounds;
-#else /*}{*/
-	Rounding = 1;
-	switch(fegetround()) {
-	  case FE_TOWARDZERO:	Rounding = 0; break;
-	  case FE_UPWARD:	Rounding = 2; break;
-	  case FE_DOWNWARD:	Rounding = 3;
-	  }
-#endif /*}}*/
-#endif /*}*/
-
-#ifdef INFNAN_CHECK
-	decpt = 0;
-#endif
-	sign = nz0 = nz = 0;
-	dval(&rv) = 0.;
-	for(s = s00;;s++) switch(*s) {
-		case '-':
-			sign = 1;
-			/* FALLTHROUGH */
-		case '+':
-			if (*++s)
-				goto break2;
-			/* FALLTHROUGH */
-		case 0:
-			goto ret0;
-		case '\t':
-		case '\n':
-		case '\v':
-		case '\f':
-		case '\r':
-		case ' ':
-			continue;
-		default:
-			goto break2;
-		}
- break2:
-	if (*s == '0') {
-#ifndef NO_HEX_FP /*{*/
-		{
-		static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
-		Long expt;
-		ULong bits[2];
-		switch(s[1]) {
-		  case 'x':
-		  case 'X':
-			{
-#ifdef Honor_FLT_ROUNDS
-			FPI fpi1 = fpi;
-			fpi1.rounding = Rounding;
-#else
-#define fpi1 fpi
-#endif
-			switch((i = gethex(&s, &fpi1, &expt, &bb, sign, loc)) & STRTOG_Retmask) {
-			  case STRTOG_NoNumber:
-				s = s00;
-				sign = 0;
-				/* FALLTHROUGH */
-			  case STRTOG_Zero:
-				break;
-			  default:
-				if (bb) {
-					copybits(bits, fpi.nbits, bb);
-					Bfree(bb);
-					}
-				ULtod((/* LINTED */(U*)&rv)->L, bits, expt, i);
-			  }}
-			goto ret;
-		  }
-		}
-#endif /*}*/
-		nz0 = 1;
-		while(*++s == '0') ;
-		if (!*s)
-			goto ret;
-		}
-	s0 = s;
-	y = z = 0;
-	for(nd = nf = 0; (c = *s) >= '0' && c <= '9'; nd++, s++)
-		if (nd < 9)
-			y = 10*y + c - '0';
-		else if (nd < 16)
-			z = 10*z + c - '0';
-	nd0 = nd;
-#ifdef USE_LOCALE
-	if (c == *decimalpoint) {
-		for(i = 1; decimalpoint[i]; ++i)
-			if (s[i] != decimalpoint[i])
-				goto dig_done;
-		s += i;
-		c = *s;
-#else
-	if (c == '.') {
-		c = *++s;
-#endif
-#ifdef INFNAN_CHECK
-		decpt = 1;
-#endif
-		if (!nd) {
-			for(; c == '0'; c = *++s)
-				nz++;
-			if (c > '0' && c <= '9') {
-				s0 = s;
-				nf += nz;
-				nz = 0;
-				goto have_dig;
-				}
-			goto dig_done;
-			}
-		for(; c >= '0' && c <= '9'; c = *++s) {
- have_dig:
-			nz++;
-			if (c -= '0') {
-				nf += nz;
-				for(i = 1; i < nz; i++)
-					if (nd++ < 9)
-						y *= 10;
-					else if (nd <= DBL_DIG + 1)
-						z *= 10;
-				if (nd++ < 9)
-					y = 10*y + c;
-				else if (nd <= DBL_DIG + 1)
-					z = 10*z + c;
-				nz = 0;
-				}
-			}
-		}/*}*/
- dig_done:
-	e = 0;
-	if (c == 'e' || c == 'E') {
-		if (!nd && !nz && !nz0) {
-			goto ret0;
-			}
-		s00 = s;
-		esign = 0;
-		switch(c = *++s) {
-			case '-':
-				esign = 1;
-				/* FALLTHROUGH */
-			case '+':
-				c = *++s;
-			}
-		if (c >= '0' && c <= '9') {
-			while(c == '0')
-				c = *++s;
-			if (c > '0' && c <= '9') {
-				L = c - '0';
-				s1 = s;
-				while((c = *++s) >= '0' && c <= '9')
-					L = 10*L + c - '0';
-				if (s - s1 > 8 || L > 19999)
-					/* Avoid confusion from exponents
-					 * so large that e might overflow.
-					 */
-					e = 19999; /* safe for 16 bit ints */
-				else
-					e = (int)L;
-				if (esign)
-					e = -e;
-				}
-			else
-				e = 0;
-			}
-		else
-			s = s00;
-		}
-	if (!nd) {
-		if (!nz && !nz0) {
-#ifdef INFNAN_CHECK
-			/* Check for Nan and Infinity */
-			ULong bits[2];
-			static FPI fpinan =	/* only 52 explicit bits */
-				{ 52, 1-1023-53+1, 2046-1023-53+1, 1, SI };
-			if (!decpt)
-			 switch(c) {
-			  case 'i':
-			  case 'I':
-				if (match(&s,"nf")) {
-					--s;
-					if (!match(&s,"inity"))
-						++s;
-					word0(&rv) = 0x7ff00000;
-					word1(&rv) = 0;
-					goto ret;
-					}
-				break;
-			  case 'n':
-			  case 'N':
-				if (match(&s, "an")) {
-#ifndef No_Hex_NaN
-					if (*s == '(' /*)*/
-					 && hexnan(&s, &fpinan, bits)
-							== STRTOG_NaNbits) {
-						word0(&rv) = 0x7ff00000 | bits[1];
-						word1(&rv) = bits[0];
-						}
-					else {
-#endif
-						word0(&rv) = NAN_WORD0;
-						word1(&rv) = NAN_WORD1;
-#ifndef No_Hex_NaN
-						}
-#endif
-					goto ret;
-					}
-			  }
-#endif /* INFNAN_CHECK */
- ret0:
-			s = s00;
-			sign = 0;
-			}
-		goto ret;
-		}
-	e1 = e -= nf;
-
-	/* Now we have nd0 digits, starting at s0, followed by a
-	 * decimal point, followed by nd-nd0 digits.  The number we're
-	 * after is the integer represented by those digits times
-	 * 10**e */
-
-	if (!nd0)
-		nd0 = nd;
-	k = nd < DBL_DIG + 1 ? nd : DBL_DIG + 1;
-	dval(&rv) = y;
-	if (k > 9) {
-#ifdef SET_INEXACT
-		if (k > DBL_DIG)
-			oldinexact = get_inexact();
-#endif
-		dval(&rv) = tens[k - 9] * dval(&rv) + z;
-		}
-	bd0 = 0;
-	if (nd <= DBL_DIG
-#ifndef RND_PRODQUOT
-#ifndef Honor_FLT_ROUNDS
-		&& Flt_Rounds == 1
-#endif
-#endif
-			) {
-		if (!e)
-			goto ret;
-#ifndef ROUND_BIASED_without_Round_Up
-		if (e > 0) {
-			if (e <= Ten_pmax) {
-#ifdef VAX
-				goto vax_ovfl_check;
-#else
-#ifdef Honor_FLT_ROUNDS
-				/* round correctly FLT_ROUNDS = 2 or 3 */
-				if (sign) {
-					rv.d = -rv.d;
-					sign = 0;
-					}
-#endif
-				/* rv = */ rounded_product(dval(&rv), tens[e]);
-				goto ret;
-#endif
-				}
-			i = DBL_DIG - nd;
-			if (e <= Ten_pmax + i) {
-				/* A fancier test would sometimes let us do
-				 * this for larger i values.
-				 */
-#ifdef Honor_FLT_ROUNDS
-				/* round correctly FLT_ROUNDS = 2 or 3 */
-				if (sign) {
-					rv.d = -rv.d;
-					sign = 0;
-					}
-#endif
-				e -= i;
-				dval(&rv) *= tens[i];
-#ifdef VAX
-				/* VAX exponent range is so narrow we must
-				 * worry about overflow here...
-				 */
- vax_ovfl_check:
-				word0(&rv) -= P*Exp_msk1;
-				/* rv = */ rounded_product(dval(&rv), tens[e]);
-				if ((word0(&rv) & Exp_mask)
-				 > Exp_msk1*(DBL_MAX_EXP+Bias-1-P))
-					goto ovfl;
-				word0(&rv) += P*Exp_msk1;
-#else
-				/* rv = */ rounded_product(dval(&rv), tens[e]);
-#endif
-				goto ret;
-				}
-			}
-#ifndef Inaccurate_Divide
-		else if (e >= -Ten_pmax) {
-#ifdef Honor_FLT_ROUNDS
-			/* round correctly FLT_ROUNDS = 2 or 3 */
-			if (sign) {
-				rv.d = -rv.d;
-				sign = 0;
-				}
-#endif
-			/* rv = */ rounded_quotient(dval(&rv), tens[-e]);
-			goto ret;
-			}
-#endif
-#endif /* ROUND_BIASED_without_Round_Up */
-		}
-	e1 += nd - k;
-
-#ifdef IEEE_Arith
-#ifdef SET_INEXACT
-	inexact = 1;
-	if (k <= DBL_DIG)
-		oldinexact = get_inexact();
-#endif
-#ifdef Avoid_Underflow
-	scale = 0;
-#endif
-#ifdef Honor_FLT_ROUNDS
-	if (Rounding >= 2) {
-		if (sign)
-			Rounding = Rounding == 2 ? 0 : 2;
-		else
-			if (Rounding != 2)
-				Rounding = 0;
-		}
-#endif
-#endif /*IEEE_Arith*/
-
-	/* Get starting approximation = rv * 10**e1 */
-
-	if (e1 > 0) {
-		if ( (i = e1 & 15) !=0)
-			dval(&rv) *= tens[i];
-		if (e1 &= ~15) {
-			if (e1 > DBL_MAX_10_EXP) {
- ovfl:
-				/* Can't trust HUGE_VAL */
-#ifdef IEEE_Arith
-#ifdef Honor_FLT_ROUNDS
-				switch(Rounding) {
-				  case 0: /* toward 0 */
-				  case 3: /* toward -infinity */
-					word0(&rv) = Big0;
-					word1(&rv) = Big1;
-					break;
-				  default:
-					word0(&rv) = Exp_mask;
-					word1(&rv) = 0;
-				  }
-#else /*Honor_FLT_ROUNDS*/
-				word0(&rv) = Exp_mask;
-				word1(&rv) = 0;
-#endif /*Honor_FLT_ROUNDS*/
-#ifdef SET_INEXACT
-				/* set overflow bit */
-				dval(&rv0) = 1e300;
-				dval(&rv0) *= dval(&rv0);
-#endif
-#else /*IEEE_Arith*/
-				word0(&rv) = Big0;
-				word1(&rv) = Big1;
-#endif /*IEEE_Arith*/
- range_err:
-				if (bd0) {
-					Bfree(bb);
-					Bfree(bd);
-					Bfree(bs);
-					Bfree(bd0);
-					Bfree(delta);
-					}
-#ifndef NO_ERRNO
-				errno = ERANGE;
-#endif
-				goto ret;
-				}
-			e1 = (unsigned int)e1 >> 4;
-			for(j = 0; e1 > 1; j++, e1 = (unsigned int)e1 >> 1)
-				if (e1 & 1)
-					dval(&rv) *= bigtens[j];
-		/* The last multiplication could overflow. */
-			word0(&rv) -= P*Exp_msk1;
-			dval(&rv) *= bigtens[j];
-			if ((z = word0(&rv) & Exp_mask)
-			 > Exp_msk1*(DBL_MAX_EXP+Bias-P))
-				goto ovfl;
-			if (z > Exp_msk1*(DBL_MAX_EXP+Bias-1-P)) {
-				/* set to largest number */
-				/* (Can't trust DBL_MAX) */
-				word0(&rv) = Big0;
-				word1(&rv) = Big1;
-				}
-			else
-				word0(&rv) += P*Exp_msk1;
-			}
-		}
-	else if (e1 < 0) {
-		e1 = -e1;
-		if ( (i = e1 & 15) !=0)
-			dval(&rv) /= tens[i];
-		if (e1 >>= 4) {
-			if (e1 >= 1 << n_bigtens)
-				goto undfl;
-#ifdef Avoid_Underflow
-			if (e1 & Scale_Bit)
-				scale = 2*P;
-			for(j = 0; e1 > 0; j++, e1 = (unsigned int)e1 >> 1)
-				if (e1 & 1)
-					dval(&rv) *= tinytens[j];
-			if (scale && (j = 2*P + 1 - ((word0(&rv) & Exp_mask)
-						>> Exp_shift)) > 0) {
-				/* scaled rv is denormal; zap j low bits */
-				if (j >= 32) {
-					word1(&rv) = 0;
-					if (j >= 53)
-					 word0(&rv) = (P+2)*Exp_msk1;
-					else
-					 word0(&rv) &= 0xffffffffU << (j-32);
-					}
-				else
-					word1(&rv) &= 0xffffffffU << j;
-				}
-#else
-			for(j = 0; e1 > 1; j++, e1 = (unsigned int)e1 >> 1)
-				if (e1 & 1)
-					dval(&rv) *= tinytens[j];
-			/* The last multiplication could underflow. */
-			dval(&rv0) = dval(&rv);
-			dval(&rv) *= tinytens[j];
-			if (!dval(&rv)) {
-				dval(&rv) = 2.*dval(&rv0);
-				dval(&rv) *= tinytens[j];
-#endif
-				if (!dval(&rv)) {
- undfl:
-					dval(&rv) = 0.;
-					goto range_err;
-					}
-#ifndef Avoid_Underflow
-				word0(&rv) = Tiny0;
-				word1(&rv) = Tiny1;
-				/* The refinement below will clean
-				 * this approximation up.
-				 */
-				}
-#endif
-			}
-		}
-
-	/* Now the hard part -- adjusting rv to the correct value.*/
-
-	/* Put digits into bd: true value = bd * 10^e */
-
-	bd0 = s2b(s0, nd0, nd, y, dplen);
-	if (bd0 == NULL)
-		goto ovfl;
-
-	for(;;) {
-		bd = Balloc(bd0->k);
-		if (bd == NULL)
-			goto ovfl;
-		Bcopy(bd, bd0);
-		bb = d2b(dval(&rv), &bbe, &bbbits);	/* rv = bb * 2^bbe */
-		if (bb == NULL)
-			goto ovfl;
-		bs = i2b(1);
-		if (bs == NULL)
-			goto ovfl;
-
-		if (e >= 0) {
-			bb2 = bb5 = 0;
-			bd2 = bd5 = e;
-			}
-		else {
-			bb2 = bb5 = -e;
-			bd2 = bd5 = 0;
-			}
-		if (bbe >= 0)
-			bb2 += bbe;
-		else
-			bd2 -= bbe;
-		bs2 = bb2;
-#ifdef Honor_FLT_ROUNDS
-		if (Rounding != 1)
-			bs2++;
-#endif
-#ifdef Avoid_Underflow
-		Lsb = LSB;
-		Lsb1 = 0;
-		j = bbe - scale;
-		i = j + bbbits - 1;	/* logb(rv) */
-		j = P + 1 - bbbits;
-		if (i < Emin) {	/* denormal */
-			i = Emin - i;
-			j -= i;
-			if (i < 32)
-				Lsb <<= i;
-			else
-				Lsb1 = Lsb << (i-32);
-			}
-#else /*Avoid_Underflow*/
-#ifdef Sudden_Underflow
-#ifdef IBM
-		j = 1 + 4*P - 3 - bbbits + ((bbe + bbbits - 1) & 3);
-#else
-		j = P + 1 - bbbits;
-#endif
-#else /*Sudden_Underflow*/
-		j = bbe;
-		i = j + bbbits - 1;	/* logb(&rv) */
-		if (i < Emin)	/* denormal */
-			j += P - Emin;
-		else
-			j = P + 1 - bbbits;
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-		bb2 += j;
-		bd2 += j;
-#ifdef Avoid_Underflow
-		bd2 += scale;
-#endif
-		i = bb2 < bd2 ? bb2 : bd2;
-		if (i > bs2)
-			i = bs2;
-		if (i > 0) {
-			bb2 -= i;
-			bd2 -= i;
-			bs2 -= i;
-			}
-		if (bb5 > 0) {
-			bs = pow5mult(bs, bb5);
-			if (bs == NULL)
-				goto ovfl;
-			bb1 = mult(bs, bb);
-			if (bb1 == NULL)
-				goto ovfl;
-			Bfree(bb);
-			bb = bb1;
-			}
-		if (bb2 > 0) {
-			bb = lshift(bb, bb2);
-			if (bb == NULL)
-				goto ovfl;
-			}
-		if (bd5 > 0) {
-			bd = pow5mult(bd, bd5);
-			if (bd == NULL)
-				goto ovfl;
-			}
-		if (bd2 > 0) {
-			bd = lshift(bd, bd2);
-			if (bd == NULL)
-				goto ovfl;
-			}
-		if (bs2 > 0) {
-			bs = lshift(bs, bs2);
-			if (bs == NULL)
-				goto ovfl;
-			}
-		delta = diff(bb, bd);
-		if (delta == NULL)
-			goto ovfl;
-		dsign = delta->sign;
-		delta->sign = 0;
-		i = cmp(delta, bs);
-#ifdef Honor_FLT_ROUNDS
-		if (Rounding != 1) {
-			if (i < 0) {
-				/* Error is less than an ulp */
-				if (!delta->x[0] && delta->wds <= 1) {
-					/* exact */
-#ifdef SET_INEXACT
-					inexact = 0;
-#endif
-					break;
-					}
-				if (Rounding) {
-					if (dsign) {
-						dval(&adj) = 1.;
-						goto apply_adj;
-						}
-					}
-				else if (!dsign) {
-					dval(&adj) = -1.;
-					if (!word1(&rv)
-					 && !(word0(&rv) & Frac_mask)) {
-						y = word0(&rv) & Exp_mask;
-#ifdef Avoid_Underflow
-						if (!scale || y > 2*P*Exp_msk1)
-#else
-						if (y)
-#endif
-						  {
-						  delta = lshift(delta,Log2P);
-						  if (cmp(delta, bs) <= 0)
-							dval(&adj) = -0.5;
-						  }
-						}
- apply_adj:
-#ifdef Avoid_Underflow
-					if (scale && (y = word0(&rv) & Exp_mask)
-						<= 2*P*Exp_msk1)
-					  word0(&adj) += (2*P+1)*Exp_msk1 - y;
-#else
-#ifdef Sudden_Underflow
-					if ((word0(&rv) & Exp_mask) <=
-							P*Exp_msk1) {
-						word0(&rv) += P*Exp_msk1;
-						dval(&rv) += adj*ulp(&rv);
-						word0(&rv) -= P*Exp_msk1;
-						}
-					else
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-					dval(&rv) += adj.d*ulp(&rv);
-					}
-				break;
-				}
-			dval(&adj) = ratio(delta, bs);
-			if (adj.d < 1.)
-				dval(&adj) = 1.;
-			if (adj.d <= 0x7ffffffe) {
-				/* dval(&adj) = Rounding ? ceil(&adj) : floor(&adj); */
-				y = adj.d;
-				if (y != adj.d) {
-					if (!((Rounding>>1) ^ dsign))
-						y++;
-					dval(&adj) = y;
-					}
-				}
-#ifdef Avoid_Underflow
-			if (scale && (y = word0(&rv) & Exp_mask) <= 2*P*Exp_msk1)
-				word0(&adj) += (2*P+1)*Exp_msk1 - y;
-#else
-#ifdef Sudden_Underflow
-			if ((word0(&rv) & Exp_mask) <= P*Exp_msk1) {
-				word0(&rv) += P*Exp_msk1;
-				dval(&adj) *= ulp(&rv);
-				if (dsign)
-					dval(&rv) += adj;
-				else
-					dval(&rv) -= adj;
-				word0(&rv) -= P*Exp_msk1;
-				goto cont;
-				}
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-			dval(&adj) *= ulp(&rv);
-			if (dsign) {
-				if (word0(&rv) == Big0 && word1(&rv) == Big1)
-					goto ovfl;
-				dval(&rv) += adj.d;
-				}
-			else
-				dval(&rv) -= adj.d;
-			goto cont;
-			}
-#endif /*Honor_FLT_ROUNDS*/
-
-		if (i < 0) {
-			/* Error is less than half an ulp -- check for
-			 * special case of mantissa a power of two.
-			 */
-			if (dsign || word1(&rv) || word0(&rv) & Bndry_mask
-#ifdef IEEE_Arith
-#ifdef Avoid_Underflow
-			 || (word0(&rv) & Exp_mask) <= (2*P+1)*Exp_msk1
-#else
-			 || (word0(&rv) & Exp_mask) <= Exp_msk1
-#endif
-#endif
-				) {
-#ifdef SET_INEXACT
-				if (!delta->x[0] && delta->wds <= 1)
-					inexact = 0;
-#endif
-				break;
-				}
-			if (!delta->x[0] && delta->wds <= 1) {
-				/* exact result */
-#ifdef SET_INEXACT
-				inexact = 0;
-#endif
-				break;
-				}
-			delta = lshift(delta,Log2P);
-			if (cmp(delta, bs) > 0)
-				goto drop_down;
-			break;
-			}
-		if (i == 0) {
-			/* exactly half-way between */
-			if (dsign) {
-				if ((word0(&rv) & Bndry_mask1) == Bndry_mask1
-				 &&  word1(&rv) == (
-#ifdef Avoid_Underflow
-			(scale && (y = word0(&rv) & Exp_mask) <= 2*P*Exp_msk1)
-		? (0xffffffff & (0xffffffff << (2*P+1-(y>>Exp_shift)))) :
-#endif
-						   0xffffffff)) {
-					/*boundary case -- increment exponent*/
-					if (word0(&rv) == Big0 && word1(&rv) == Big1)
-						goto ovfl;
-					word0(&rv) = (word0(&rv) & Exp_mask)
-						+ Exp_msk1
-#ifdef IBM
-						| Exp_msk1 >> 4
-#endif
-						;
-					word1(&rv) = 0;
-#ifdef Avoid_Underflow
-					dsign = 0;
-#endif
-					break;
-					}
-				}
-			else if (!(word0(&rv) & Bndry_mask) && !word1(&rv)) {
- drop_down:
-				/* boundary case -- decrement exponent */
-#ifdef Sudden_Underflow /*{{*/
-				L = word0(&rv) & Exp_mask;
-#ifdef IBM
-				if (L <  Exp_msk1)
-#else
-#ifdef Avoid_Underflow
-				if (L <= (scale ? (2*P+1)*Exp_msk1 : Exp_msk1))
-#else
-				if (L <= Exp_msk1)
-#endif /*Avoid_Underflow*/
-#endif /*IBM*/
-					goto undfl;
-				L -= Exp_msk1;
-#else /*Sudden_Underflow}{*/
-#ifdef Avoid_Underflow
-				if (scale) {
-					L = word0(&rv) & Exp_mask;
-					if (L <= (2*P+1)*Exp_msk1) {
-						if (L > (P+2)*Exp_msk1)
-							/* round even ==> */
-							/* accept rv */
-							break;
-						/* rv = smallest denormal */
-						goto undfl;
-						}
-					}
-#endif /*Avoid_Underflow*/
-				L = (word0(&rv) & Exp_mask) - Exp_msk1;
-#endif /*Sudden_Underflow}}*/
-				word0(&rv) = L | Bndry_mask1;
-				word1(&rv) = 0xffffffff;
-#ifdef IBM
-				goto cont;
-#else
-				break;
-#endif
-				}
-#ifndef ROUND_BIASED
-#ifdef Avoid_Underflow
-			if (Lsb1) {
-				if (!(word0(&rv) & Lsb1))
-					break;
-				}
-			else if (!(word1(&rv) & Lsb))
-				break;
-#else
-			if (!(word1(&rv) & LSB))
-				break;
-#endif
-#endif
-			if (dsign)
-#ifdef Avoid_Underflow
-				dval(&rv) += sulp(&rv, scale);
-#else
-				dval(&rv) += ulp(&rv);
-#endif
-#ifndef ROUND_BIASED
-			else {
-#ifdef Avoid_Underflow
-				dval(&rv) -= sulp(&rv, scale);
-#else
-				dval(&rv) -= ulp(&rv);
-#endif
-#ifndef Sudden_Underflow
-				if (!dval(&rv))
-					goto undfl;
-#endif
-				}
-#ifdef Avoid_Underflow
-			dsign = 1 - dsign;
-#endif
-#endif
-			break;
-			}
-		if ((aadj = ratio(delta, bs)) <= 2.) {
-			if (dsign)
-				aadj = dval(&aadj1) = 1.;
-			else if (word1(&rv) || word0(&rv) & Bndry_mask) {
-#ifndef Sudden_Underflow
-				if (word1(&rv) == Tiny1 && !word0(&rv))
-					goto undfl;
-#endif
-				aadj = 1.;
-				dval(&aadj1) = -1.;
-				}
-			else {
-				/* special case -- power of FLT_RADIX to be */
-				/* rounded down... */
-
-				if (aadj < 2./FLT_RADIX)
-					aadj = 1./FLT_RADIX;
-				else
-					aadj *= 0.5;
-				dval(&aadj1) = -aadj;
-				}
-			}
-		else {
-			aadj *= 0.5;
-			dval(&aadj1) = dsign ? aadj : -aadj;
-#ifdef Check_FLT_ROUNDS
-			/* CONSTCOND */
-			switch(Rounding) {
-				case 2: /* towards +infinity */
-					dval(&aadj1) -= 0.5;
-					break;
-				case 0: /* towards 0 */
-				case 3: /* towards -infinity */
-					dval(&aadj1) += 0.5;
-				}
-#else
-			/* CONSTCOND */
-			if (Flt_Rounds == 0)
-				dval(&aadj1) += 0.5;
-#endif /*Check_FLT_ROUNDS*/
-			}
-		y = word0(&rv) & Exp_mask;
-
-		/* Check for overflow */
-
-		if (y == Exp_msk1*(DBL_MAX_EXP+Bias-1)) {
-			dval(&rv0) = dval(&rv);
-			word0(&rv) -= P*Exp_msk1;
-			dval(&adj) = dval(&aadj1) * ulp(&rv);
-			dval(&rv) += dval(&adj);
-			if ((word0(&rv) & Exp_mask) >=
-					Exp_msk1*(DBL_MAX_EXP+Bias-P)) {
-				if (word0(&rv0) == Big0 && word1(&rv0) == Big1)
-					goto ovfl;
-				word0(&rv) = Big0;
-				word1(&rv) = Big1;
-				goto cont;
-				}
-			else
-				word0(&rv) += P*Exp_msk1;
-			}
-		else {
-#ifdef Avoid_Underflow
-			if (scale && y <= 2*P*Exp_msk1) {
-				if (aadj <= 0x7fffffff) {
-					if ((z = aadj) == 0)
-						z = 1;
-					aadj = z;
-					dval(&aadj1) = dsign ? aadj : -aadj;
-					}
-				word0(&aadj1) += (2*P+1)*Exp_msk1 - y;
-				}
-			dval(&adj) = dval(&aadj1) * ulp(&rv);
-			dval(&rv) += dval(&adj);
-#else
-#ifdef Sudden_Underflow
-			if ((word0(&rv) & Exp_mask) <= P*Exp_msk1) {
-				dval(&rv0) = dval(&rv);
-				word0(&rv) += P*Exp_msk1;
-				dval(&adj) = dval(&aadj1) * ulp(&rv);
-				dval(&rv) += dval(&adj);
-#ifdef IBM
-				if ((word0(&rv) & Exp_mask) <  P*Exp_msk1)
-#else
-				if ((word0(&rv) & Exp_mask) <= P*Exp_msk1)
-#endif
-					{
-					if (word0(&rv0) == Tiny0
-					 && word1(&rv0) == Tiny1)
-						goto undfl;
-					word0(&rv) = Tiny0;
-					word1(&rv) = Tiny1;
-					goto cont;
-					}
-				else
-					word0(&rv) -= P*Exp_msk1;
-				}
-			else {
-				dval(&adj) = dval(&aadj1) * ulp(&rv);
-				dval(&rv) += dval(&adj);
-				}
-#else /*Sudden_Underflow*/
-			/* Compute dval(&adj) so that the IEEE rounding rules will
-			 * correctly round rv + dval(&adj) in some half-way cases.
-			 * If rv * ulp(&rv) is denormalized (i.e.,
-			 * y <= (P-1)*Exp_msk1), we must adjust aadj to avoid
-			 * trouble from bits lost to denormalization;
-			 * example: 1.2e-307 .
-			 */
-			if (y <= (P-1)*Exp_msk1 && aadj > 1.) {
-				dval(&aadj1) = (double)(int)(aadj + 0.5);
-				if (!dsign)
-					dval(&aadj1) = -dval(&aadj1);
-				}
-			dval(&adj) = dval(&aadj1) * ulp(&rv);
-			dval(&rv) += adj;
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-			}
-		z = word0(&rv) & Exp_mask;
-#ifndef SET_INEXACT
-#ifdef Avoid_Underflow
-		if (!scale)
-#endif
-		if (y == z) {
-			/* Can we stop now? */
-			L = (Long)aadj;
-			aadj -= L;
-			/* The tolerances below are conservative. */
-			if (dsign || word1(&rv) || word0(&rv) & Bndry_mask) {
-				if (aadj < .4999999 || aadj > .5000001)
-					break;
-				}
-			else if (aadj < .4999999/FLT_RADIX)
-				break;
-			}
-#endif
- cont:
-		Bfree(bb);
-		Bfree(bd);
-		Bfree(bs);
-		Bfree(delta);
-		}
-	Bfree(bb);
-	Bfree(bd);
-	Bfree(bs);
-	Bfree(bd0);
-	Bfree(delta);
-#ifdef SET_INEXACT
-	if (inexact) {
-		if (!oldinexact) {
-			word0(&rv0) = Exp_1 + (70 << Exp_shift);
-			word1(&rv0) = 0;
-			dval(&rv0) += 1.;
-			}
-		}
-	else if (!oldinexact)
-		clear_inexact();
-#endif
-#ifdef Avoid_Underflow
-	if (scale) {
-		word0(&rv0) = Exp_1 - 2*P*Exp_msk1;
-		word1(&rv0) = 0;
-		dval(&rv) *= dval(&rv0);
-#ifndef NO_ERRNO
-		/* try to avoid the bug of testing an 8087 register value */
-#ifdef IEEE_Arith
-		if (!(word0(&rv) & Exp_mask))
-#else
-		if (word0(&rv) == 0 && word1(&rv) == 0)
-#endif
-			errno = ERANGE;
-#endif
-		}
-#endif /* Avoid_Underflow */
-#ifdef SET_INEXACT
-	if (inexact && !(word0(&rv) & Exp_mask)) {
-		/* set underflow bit */
-		dval(&rv0) = 1e-300;
-		dval(&rv0) *= dval(&rv0);
-		}
-#endif
- ret:
-	if (se)
-		*se = __UNCONST(s);
-	return sign ? -dval(&rv) : dval(&rv);
-	}
-
-double
-strtod(CONST char *s, char **sp)
-{
-	return _int_strtod_l(s, sp, _current_locale());
-}
-
-#ifdef __weak_alias
-__weak_alias(strtod_l, _strtod_l)
-#endif
-
-double
-strtod_l(CONST char *s, char **sp, locale_t loc)
-{
-	return _int_strtod_l(s, sp, loc);
-}
diff --git a/lib/libc/gdtoa/strtodI.c b/lib/libc/gdtoa/strtodI.c
deleted file mode 100644
index 54b96a839..000000000
--- a/lib/libc/gdtoa/strtodI.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* $NetBSD: strtodI.c,v 1.3 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- static double
-#ifdef KR_headers
-ulpdown(d) U *d;
-#else
-ulpdown(U *d)
-#endif
-{
-	double u;
-	ULong *L = d->L;
-
-	u = ulp(d);
-	if (!(L[_1] | (L[_0] & 0xfffff))
-	 && (L[_0] & 0x7ff00000) > 0x00100000)
-		u *= 0.5;
-	return u;
-	}
-
- int
-#ifdef KR_headers
-strtodI(s, sp, dd) CONST char *s; char **sp; double *dd;
-#else
-strtodI(CONST char *s, char **sp, double *dd)
-#endif
-{
-	static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
-	ULong bits[2], sign;
-	Long exp;
-	int j, k;
-	U *u;
-
-	k = strtodg(s, sp, &fpi, &exp, bits);
-	if (k == STRTOG_NoMemory)
-		return k;
-	u = (U*)dd;
-	sign = k & STRTOG_Neg ? 0x80000000L : 0;
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-		dval(&u[0]) = dval(&u[1]) = 0.;
-		break;
-
-	  case STRTOG_Zero:
-		dval(&u[0]) = dval(&u[1]) = 0.;
-#ifdef Sudden_Underflow
-		if (k & STRTOG_Inexact) {
-			if (sign)
-				word0(&u[0]) = 0x80100000L;
-			else
-				word0(&u[1]) = 0x100000L;
-			}
-		break;
-#else
-		goto contain;
-#endif
-
-	  case STRTOG_Denormal:
-		word1(&u[0]) = bits[0];
-		word0(&u[0]) = bits[1];
-		goto contain;
-
-	  case STRTOG_Normal:
-		word1(&u[0]) = bits[0];
-		word0(&u[0]) = (bits[1] & ~0x100000) | ((exp + 0x3ff + 52) << 20);
-	  contain:
-		j = k & STRTOG_Inexact;
-		if (sign) {
-			word0(&u[0]) |= sign;
-			j = STRTOG_Inexact - j;
-			}
-		switch(j) {
-		  case STRTOG_Inexlo:
-#ifdef Sudden_Underflow
-			if ((u->L[_0] & 0x7ff00000) < 0x3500000) {
-				word0(&u[1]) = word0(&u[0]) + 0x3500000;
-				word1(&u[1]) = word1(&u[0]);
-				dval(&u[1]) += ulp(&u[1]);
-				word0(&u[1]) -= 0x3500000;
-				if (!(word0(&u[1]) & 0x7ff00000)) {
-					word0(&u[1]) = sign;
-					word1(&u[1]) = 0;
-					}
-				}
-			else
-#endif
-			dval(&u[1]) = dval(&u[0]) + ulp(&u[0]);
-			break;
-		  case STRTOG_Inexhi:
-			dval(&u[1]) = dval(&u[0]);
-#ifdef Sudden_Underflow
-			if ((word0(&u[0]) & 0x7ff00000) < 0x3500000) {
-				word0(&u[0]) += 0x3500000;
-				dval(&u[0]) -= ulpdown(u);
-				word0(&u[0]) -= 0x3500000;
-				if (!(word0(&u[0]) & 0x7ff00000)) {
-					word0(&u[0]) = sign;
-					word1(&u[0]) = 0;
-					}
-				}
-			else
-#endif
-			dval(&u[0]) -= ulpdown(u);
-			break;
-		  default:
-			dval(&u[1]) = dval(&u[0]);
-		  }
-		break;
-
-	  case STRTOG_Infinite:
-		word0(&u[0]) = word0(&u[1]) = sign | 0x7ff00000;
-		word1(&u[0]) = word1(&u[1]) = 0;
-		if (k & STRTOG_Inexact) {
-			if (sign) {
-				word0(&u[1]) = 0xffefffffL;
-				word1(&u[1]) = 0xffffffffL;
-				}
-			else {
-				word0(&u[0]) = 0x7fefffffL;
-				word1(&u[0]) = 0xffffffffL;
-				}
-			}
-		break;
-
-	  case STRTOG_NaN:
-		u->L[0] = (u+1)->L[0] = d_QNAN0;
-		u->L[1] = (u+1)->L[1] = d_QNAN1;
-		break;
-
-	  case STRTOG_NaNbits:
-		word0(&u[0]) = word0(&u[1]) = 0x7ff00000 | sign | bits[1];
-		word1(&u[0]) = word1(&u[1]) = bits[0];
-	  }
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtodg.c b/lib/libc/gdtoa/strtodg.c
deleted file mode 100644
index d0a910594..000000000
--- a/lib/libc/gdtoa/strtodg.c
+++ /dev/null
@@ -1,1106 +0,0 @@
-/* $NetBSD: strtodg.c,v 1.12 2013/04/19 10:41:53 joerg Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998-2001 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
-#ifdef USE_LOCALE
-#include "locale.h"
-#endif
-
-#ifndef VAX
- static CONST int
-fivesbits[] = {	 0,  3,  5,  7, 10, 12, 14, 17, 19, 21,
-		24, 26, 28, 31, 33, 35, 38, 40, 42, 45,
-		47, 49, 52
-		};
-#endif
-
- Bigint *
-#ifdef KR_headers
-increment(b) Bigint *b;
-#else
-increment(Bigint *b)
-#endif
-{
-	ULong *x, *xe;
-	Bigint *b1;
-#ifdef Pack_16
-	ULong carry = 1, y;
-#endif
-
-	x = b->x;
-	xe = x + b->wds;
-#ifdef Pack_32
-	do {
-		if (*x < (ULong)0xffffffffL) {
-			++*x;
-			return b;
-			}
-		*x++ = 0;
-		} while(x < xe);
-#else
-	do {
-		y = *x + carry;
-		carry = y >> 16;
-		*x++ = y & 0xffff;
-		if (!carry)
-			return b;
-		} while(x < xe);
-	if (carry)
-#endif
-	{
-		if (b->wds >= b->maxwds) {
-			b1 = Balloc(b->k+1);
-			if (b1 == NULL)
-				return NULL;
-			Bcopy(b1,b);
-			Bfree(b);
-			b = b1;
-			}
-		b->x[b->wds++] = 1;
-		}
-	return b;
-	}
-
- void
-#ifdef KR_headers
-decrement(b) Bigint *b;
-#else
-decrement(Bigint *b)
-#endif
-{
-	ULong *x, *xe;
-#ifdef Pack_16
-	ULong borrow = 1, y;
-#endif
-
-	x = b->x;
-	xe = x + b->wds;
-#ifdef Pack_32
-	do {
-		if (*x) {
-			--*x;
-			break;
-			}
-		*x++ = 0xffffffffUL;
-		}
-		while(x < xe);
-#else
-	do {
-		y = *x - borrow;
-		borrow = (y & 0x10000) >> 16;
-		*x++ = y & 0xffff;
-		} while(borrow && x < xe);
-#endif
-	}
-
- static int
-#ifdef KR_headers
-all_on(b, n) CONST Bigint *b; int n;
-#else
-all_on(CONST Bigint *b, int n)
-#endif
-{
-	CONST ULong *x, *xe;
-
-	x = b->x;
-	xe = x + ((unsigned int)n >> kshift);
-	while(x < xe)
-		if ((*x++ & ALL_ON) != ALL_ON)
-			return 0;
-	if (n &= kmask)
-		return ((*x | (ALL_ON << n)) & ALL_ON) == ALL_ON;
-	return 1;
-	}
-
- Bigint *
-#ifdef KR_headers
-set_ones(b, n) Bigint *b; int n;
-#else
-set_ones(Bigint *b, int n)
-#endif
-{
-	int k;
-	ULong *x, *xe;
-
-	k = (unsigned int)(n + ((1 << kshift) - 1)) >> kshift;
-	if (b->k < k) {
-		Bfree(b);
-		b = Balloc(k);
-		if (b == NULL)
-			return NULL;
-		}
-	k = (unsigned int)n >> kshift;
-	if (n &= kmask)
-		k++;
-	b->wds = k;
-	x = b->x;
-	xe = x + k;
-	while(x < xe)
-		*x++ = ALL_ON;
-	if (n)
-		x[-1] >>= ULbits - n;
-	return b;
-	}
-
- static int
-rvOK
-#ifdef KR_headers
- (d, fpi, expt, bits, exact, rd, irv)
- U *d; CONST FPI *fpi; Long *expt; ULong *bits; int exact, rd, *irv;
-#else
- (U *d, CONST FPI *fpi, Long *expt, ULong *bits, int exact, int rd, int *irv)
-#endif
-{
-	Bigint *b;
-	ULong carry, inex, lostbits;
-	int bdif, e, j, k, k1, nb, rv;
-
-	carry = rv = 0;
-	b = d2b(dval(d), &e, &bdif);
-	bdif -= nb = fpi->nbits;
-	e += bdif;
-	if (bdif <= 0) {
-		if (exact)
-			goto trunc;
-		goto ret;
-		}
-	if (P == nb) {
-		if (
-#ifndef IMPRECISE_INEXACT
-			exact &&
-#endif
-			fpi->rounding ==
-#ifdef RND_PRODQUOT
-					FPI_Round_near
-#else
-					Flt_Rounds
-#endif
-			) goto trunc;
-		goto ret;
-		}
-	switch(rd) {
-	  case 1: /* round down (toward -Infinity) */
-		goto trunc;
-	  case 2: /* round up (toward +Infinity) */
-		break;
-	  default: /* round near */
-		k = bdif - 1;
-		if (!k) {
-			if (!exact)
-				goto ret;
-			if (b->x[0] & 2)
-				break;
-			goto trunc;
-			}
-		if (b->x[(unsigned int)k>>kshift] & ((ULong)1 << (k & kmask)))
-			break;
-		goto trunc;
-	  }
-	/* "break" cases: round up 1 bit, then truncate; bdif > 0 */
-	carry = 1;
- trunc:
-	inex = lostbits = 0;
-	if (bdif > 0) {
-		if ( (lostbits = any_on(b, bdif)) !=0)
-			inex = STRTOG_Inexlo;
-		rshift(b, bdif);
-		if (carry) {
-			inex = STRTOG_Inexhi;
-			b = increment(b);
-			if ( (j = nb & kmask) !=0)
-				j = ULbits - j;
-			if (hi0bits(b->x[b->wds - 1]) != j) {
-				if (!lostbits)
-					lostbits = b->x[0] & 1;
-				rshift(b, 1);
-				e++;
-				}
-			}
-		}
-	else if (bdif < 0)
-		b = lshift(b, -bdif);
-	if (e < fpi->emin) {
-		k = fpi->emin - e;
-		e = fpi->emin;
-		if (k > nb || fpi->sudden_underflow) {
-			b->wds = inex = 0;
-			*irv = STRTOG_Underflow | STRTOG_Inexlo;
-			}
-		else {
-			k1 = k - 1;
-			if (k1 > 0 && !lostbits)
-				lostbits = any_on(b, k1);
-			if (!lostbits && !exact)
-				goto ret;
-			lostbits |=
-			  carry = b->x[(unsigned int)k1>>kshift] &
-			               (1 << (k1 & kmask));
-			rshift(b, k);
-			*irv = STRTOG_Denormal;
-			if (carry) {
-				b = increment(b);
-				inex = STRTOG_Inexhi | STRTOG_Underflow;
-				}
-			else if (lostbits)
-				inex = STRTOG_Inexlo | STRTOG_Underflow;
-			}
-		}
-	else if (e > fpi->emax) {
-		e = fpi->emax + 1;
-		*irv = STRTOG_Infinite | STRTOG_Overflow | STRTOG_Inexhi;
-#ifndef NO_ERRNO
-		errno = ERANGE;
-#endif
-		b->wds = inex = 0;
-		}
-	*expt = e;
-	copybits(bits, nb, b);
-	*irv |= inex;
-	rv = 1;
- ret:
-	Bfree(b);
-	return rv;
-	}
-
-#ifndef VAX
- static int
-#ifdef KR_headers
-mantbits(d) U *d;
-#else
-mantbits(U *d)
-#endif
-{
-	ULong L;
-#ifdef VAX
-	L = word1(d) << 16 | word1(d) >> 16;
-	if (L)
-#else
-	if ( (L = word1(d)) !=0)
-#endif
-		return P - lo0bits(&L);
-#ifdef VAX
-	L = word0(d) << 16 | word0(d) >> 16 | Exp_msk11;
-#else
-	L = word0(d) | Exp_msk1;
-#endif
-	return P - 32 - lo0bits(&L);
-	}
-#endif /* !VAX */
-
- int
-strtodg(CONST char *s00, char **se, CONST FPI *fpi, Long *expt, ULong *bits,
-	locale_t loc)
-{
-	int abe, abits, asub;
-#ifdef INFNAN_CHECK
-	int decpt;
-#endif
-	int bb0, bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, denorm;
-	int dsign, e, e1, e2, emin, esign, finished, i, inex, irv;
-	int j, k, nbits, nd, nd0, nf, nz, nz0, rd, rvbits, rve, rve1, sign;
-	int sudden_underflow = 0; /* pacify gcc */
-	CONST char *s, *s0, *s1;
-	double adj0, tol;
-	Long L;
-	U adj, rv;
-	ULong *b, *be, y, z;
-	Bigint *ab, *bb, *bb1, *bd, *bd0, *bs, *delta, *rvb, *rvb0;
-#ifdef USE_LOCALE /*{{*/
-	char *decimalpoint = localeconv_l(loc)->decimal_point;
-	size_t dplen = strlen(decimalpoint);
-#endif /*USE_LOCALE}}*/
-
-	e2 = 0;	/* XXX gcc */
-
-	irv = STRTOG_Zero;
-	denorm = sign = nz0 = nz = 0;
-	dval(&rv) = 0.;
-	rvb = 0;
-	nbits = fpi->nbits;
-	for(s = s00;;s++) switch(*s) {
-		case '-':
-			sign = 1;
-			/* FALLTHROUGH */
-		case '+':
-			if (*++s)
-				goto break2;
-			/* FALLTHROUGH */
-		case 0:
-			sign = 0;
-			irv = STRTOG_NoNumber;
-			s = s00;
-			goto ret;
-		case '\t':
-		case '\n':
-		case '\v':
-		case '\f':
-		case '\r':
-		case ' ':
-			continue;
-		default:
-			goto break2;
-		}
- break2:
-	if (*s == '0') {
-#ifndef NO_HEX_FP
-		switch(s[1]) {
-		  case 'x':
-		  case 'X':
-			irv = gethex(&s, fpi, expt, &rvb, sign, loc);
-			if (irv == STRTOG_NoNumber) {
-				s = s00;
-				sign = 0;
-				}
-			goto ret;
-		  }
-#endif
-		nz0 = 1;
-		while(*++s == '0') ;
-		if (!*s)
-			goto ret;
-		}
-	sudden_underflow = fpi->sudden_underflow;
-	s0 = s;
-	y = z = 0;
-#ifdef INFNAN_CHECK
-	decpt = 0;
-#endif
-	for(nd = nf = 0; (c = *s) >= '0' && c <= '9'; nd++, s++)
-		if (nd < 9)
-			y = 10*y + c - '0';
-		else if (nd < 16)
-			z = 10*z + c - '0';
-	nd0 = nd;
-#ifdef USE_LOCALE
-	if (c == *decimalpoint) {
-		for(i = 1; decimalpoint[i]; ++i)
-			if (s[i] != decimalpoint[i])
-				goto dig_done;
-		s += i;
-		c = *s;
-#else
-	if (c == '.') {
-		c = *++s;
-#endif
-#ifdef INFNAN_CHECK
-		decpt = 1;
-#endif
-		if (!nd) {
-			for(; c == '0'; c = *++s)
-				nz++;
-			if (c > '0' && c <= '9') {
-				s0 = s;
-				nf += nz;
-				nz = 0;
-				goto have_dig;
-				}
-			goto dig_done;
-			}
-		for(; c >= '0' && c <= '9'; c = *++s) {
- have_dig:
-			nz++;
-			if (c -= '0') {
-				nf += nz;
-				for(i = 1; i < nz; i++)
-					if (nd++ < 9)
-						y *= 10;
-					else if (nd <= DBL_DIG + 1)
-						z *= 10;
-				if (nd++ < 9)
-					y = 10*y + c;
-				else if (nd <= DBL_DIG + 1)
-					z = 10*z + c;
-				nz = 0;
-				}
-			}
-		}/*}*/
- dig_done:
-	e = 0;
-	if (c == 'e' || c == 'E') {
-		if (!nd && !nz && !nz0) {
-			irv = STRTOG_NoNumber;
-			s = s00;
-			goto ret;
-			}
-		s00 = s;
-		esign = 0;
-		switch(c = *++s) {
-			case '-':
-				esign = 1;
-				/* FALLTHROUGH */
-			case '+':
-				c = *++s;
-			}
-		if (c >= '0' && c <= '9') {
-			while(c == '0')
-				c = *++s;
-			if (c > '0' && c <= '9') {
-				L = c - '0';
-				s1 = s;
-				while((c = *++s) >= '0' && c <= '9')
-					L = 10*L + c - '0';
-				if (s - s1 > 8 || L > 19999)
-					/* Avoid confusion from exponents
-					 * so large that e might overflow.
-					 */
-					e = 19999; /* safe for 16 bit ints */
-				else
-					e = (int)L;
-				if (esign)
-					e = -e;
-				}
-			else
-				e = 0;
-			}
-		else
-			s = s00;
-		}
-	if (!nd) {
-		if (!nz && !nz0) {
-#ifdef INFNAN_CHECK
-			/* Check for Nan and Infinity */
-			if (!decpt)
-			 switch(c) {
-			  case 'i':
-			  case 'I':
-				if (match(&s,"nf")) {
-					--s;
-					if (!match(&s,"inity"))
-						++s;
-					irv = STRTOG_Infinite;
-					goto infnanexp;
-					}
-				break;
-			  case 'n':
-			  case 'N':
-				if (match(&s, "an")) {
-					irv = STRTOG_NaN;
-					*expt = fpi->emax + 1;
-#ifndef No_Hex_NaN
-					if (*s == '(') /*)*/
-						irv = hexnan(&s, fpi, bits);
-#endif
-					goto infnanexp;
-					}
-			  }
-#endif /* INFNAN_CHECK */
-			irv = STRTOG_NoNumber;
-			s = s00;
-			}
-		goto ret;
-		}
-
-	irv = STRTOG_Normal;
-	e1 = e -= nf;
-	rd = 0;
-	switch(fpi->rounding & 3) {
-	  case FPI_Round_up:
-		rd = 2 - sign;
-		break;
-	  case FPI_Round_zero:
-		rd = 1;
-		break;
-	  case FPI_Round_down:
-		rd = 1 + sign;
-	  }
-
-	/* Now we have nd0 digits, starting at s0, followed by a
-	 * decimal point, followed by nd-nd0 digits.  The number we're
-	 * after is the integer represented by those digits times
-	 * 10**e */
-
-	if (!nd0)
-		nd0 = nd;
-	k = nd < DBL_DIG + 1 ? nd : DBL_DIG + 1;
-	dval(&rv) = y;
-	if (k > 9)
-		dval(&rv) = tens[k - 9] * dval(&rv) + z;
-	bd0 = 0;
-	if (nbits <= P && nd <= DBL_DIG) {
-		if (!e) {
-			if (rvOK(&rv, fpi, expt, bits, 1, rd, &irv))
-				goto ret;
-			}
-		else if (e > 0) {
-			if (e <= Ten_pmax) {
-#ifdef VAX
-				goto vax_ovfl_check;
-#else
-				i = fivesbits[e] + mantbits(&rv) <= P;
-				/* rv = */ rounded_product(dval(&rv), tens[e]);
-				if (rvOK(&rv, fpi, expt, bits, i, rd, &irv))
-					goto ret;
-				e1 -= e;
-				goto rv_notOK;
-#endif
-				}
-			i = DBL_DIG - nd;
-			if (e <= Ten_pmax + i) {
-				/* A fancier test would sometimes let us do
-				 * this for larger i values.
-				 */
-				e2 = e - i;
-				e1 -= i;
-				dval(&rv) *= tens[i];
-#ifdef VAX
-				/* VAX exponent range is so narrow we must
-				 * worry about overflow here...
-				 */
- vax_ovfl_check:
-				dval(&adj) = dval(&rv);
-				word0(&adj) -= P*Exp_msk1;
-				/* adj = */ rounded_product(dval(&adj), tens[e2]);
-				if ((word0(&adj) & Exp_mask)
-				 > Exp_msk1*(DBL_MAX_EXP+Bias-1-P))
-					goto rv_notOK;
-				word0(&adj) += P*Exp_msk1;
-				dval(&rv) = dval(&adj);
-#else
-				/* rv = */ rounded_product(dval(&rv), tens[e2]);
-#endif
-				if (rvOK(&rv, fpi, expt, bits, 0, rd, &irv))
-					goto ret;
-				e1 -= e2;
-				}
-			}
-#ifndef Inaccurate_Divide
-		else if (e >= -Ten_pmax) {
-			/* rv = */ rounded_quotient(dval(&rv), tens[-e]);
-			if (rvOK(&rv, fpi, expt, bits, 0, rd, &irv))
-				goto ret;
-			e1 -= e;
-			}
-#endif
-		}
- rv_notOK:
-	e1 += nd - k;
-
-	/* Get starting approximation = rv * 10**e1 */
-
-	e2 = 0;
-	if (e1 > 0) {
-		if ( (i = e1 & 15) !=0)
-			dval(&rv) *= tens[i];
-		if (e1 &= ~15) {
-			e1 = (unsigned int)e1 >> 4;
-			while(e1 >= (1 << (n_bigtens-1))) {
-				e2 += ((word0(&rv) & Exp_mask)
-					>> Exp_shift1) - Bias;
-				word0(&rv) &= ~Exp_mask;
-				word0(&rv) |= Bias << Exp_shift1;
-				dval(&rv) *= bigtens[n_bigtens-1];
-				e1 -= 1 << (n_bigtens-1);
-				}
-			e2 += ((word0(&rv) & Exp_mask) >> Exp_shift1) - Bias;
-			word0(&rv) &= ~Exp_mask;
-			word0(&rv) |= Bias << Exp_shift1;
-			for(j = 0; e1 > 0; j++, e1 = (unsigned int)e1 >> 1)
-				if (e1 & 1)
-					dval(&rv) *= bigtens[j];
-			}
-		}
-	else if (e1 < 0) {
-		e1 = -e1;
-		if ( (i = e1 & 15) !=0)
-			dval(&rv) /= tens[i];
-		if (e1 &= ~15) {
-			e1 = (unsigned int)e1 >> 4;
-			while(e1 >= (1 << (n_bigtens-1))) {
-				e2 += ((word0(&rv) & Exp_mask)
-					>> Exp_shift1) - Bias;
-				word0(&rv) &= ~Exp_mask;
-				word0(&rv) |= Bias << Exp_shift1;
-				dval(&rv) *= tinytens[n_bigtens-1];
-				e1 -= 1 << (n_bigtens-1);
-				}
-			e2 += ((word0(&rv) & Exp_mask) >> Exp_shift1) - Bias;
-			word0(&rv) &= ~Exp_mask;
-			word0(&rv) |= Bias << Exp_shift1;
-			for(j = 0; e1 > 0; j++, e1 = (unsigned int)e1 >> 1)
-				if (e1 & 1)
-					dval(&rv) *= tinytens[j];
-			}
-		}
-#ifdef IBM
-	/* e2 is a correction to the (base 2) exponent of the return
-	 * value, reflecting adjustments above to avoid overflow in the
-	 * native arithmetic.  For native IBM (base 16) arithmetic, we
-	 * must multiply e2 by 4 to change from base 16 to 2.
-	 */
-	e2 <<= 2;
-#endif
-	rvb = d2b(dval(&rv), &rve, &rvbits);	/* rv = rvb * 2^rve */
-	if (rvb == NULL)
-		return STRTOG_NoMemory;
-	rve += e2;
-	if ((j = rvbits - nbits) > 0) {
-		rshift(rvb, j);
-		rvbits = nbits;
-		rve += j;
-		}
-	bb0 = 0;	/* trailing zero bits in rvb */
-	e2 = rve + rvbits - nbits;
-	if (e2 > fpi->emax + 1)
-		goto huge;
-	rve1 = rve + rvbits - nbits;
-	if (e2 < (emin = fpi->emin)) {
-		denorm = 1;
-		j = rve - emin;
-		if (j > 0) {
-			rvb = lshift(rvb, j);
-			rvbits += j;
-			}
-		else if (j < 0) {
-			rvbits += j;
-			if (rvbits <= 0) {
-				if (rvbits < -1) {
- ufl:
-					rvb->wds = 0;
-					rvb->x[0] = 0;
-					*expt = emin;
-					irv = STRTOG_Underflow | STRTOG_Inexlo;
-					goto ret;
-					}
-				rvb->x[0] = rvb->wds = rvbits = 1;
-				}
-			else
-				rshift(rvb, -j);
-			}
-		rve = rve1 = emin;
-		if (sudden_underflow && e2 + 1 < emin)
-			goto ufl;
-		}
-
-	/* Now the hard part -- adjusting rv to the correct value.*/
-
-	/* Put digits into bd: true value = bd * 10^e */
-
-	bd0 = s2b(s0, nd0, nd, y, dplen);
-
-	for(;;) {
-		bd = Balloc(bd0->k);
-		if (bd == NULL)
-			return STRTOG_NoMemory;
-		Bcopy(bd, bd0);
-		bb = Balloc(rvb->k);
-		if (bb == NULL)
-			return STRTOG_NoMemory;
-		Bcopy(bb, rvb);
-		bbbits = rvbits - bb0;
-		bbe = rve + bb0;
-		bs = i2b(1);
-		if (bs == NULL)
-			return STRTOG_NoMemory;
-
-		if (e >= 0) {
-			bb2 = bb5 = 0;
-			bd2 = bd5 = e;
-			}
-		else {
-			bb2 = bb5 = -e;
-			bd2 = bd5 = 0;
-			}
-		if (bbe >= 0)
-			bb2 += bbe;
-		else
-			bd2 -= bbe;
-		bs2 = bb2;
-		j = nbits + 1 - bbbits;
-		i = bbe + bbbits - nbits;
-		if (i < emin)	/* denormal */
-			j += i - emin;
-		bb2 += j;
-		bd2 += j;
-		i = bb2 < bd2 ? bb2 : bd2;
-		if (i > bs2)
-			i = bs2;
-		if (i > 0) {
-			bb2 -= i;
-			bd2 -= i;
-			bs2 -= i;
-			}
-		if (bb5 > 0) {
-			bs = pow5mult(bs, bb5);
-			if (bs == NULL)
-				return STRTOG_NoMemory;
-			bb1 = mult(bs, bb);
-			if (bb1 == NULL)
-				return STRTOG_NoMemory;
-			Bfree(bb);
-			bb = bb1;
-			}
-		bb2 -= bb0;
-		if (bb2 > 0) {
-			bb = lshift(bb, bb2);
-			if (bb == NULL)
-				return STRTOG_NoMemory;
-			}
-		else if (bb2 < 0)
-			rshift(bb, -bb2);
-		if (bd5 > 0) {
-			bd = pow5mult(bd, bd5);
-			if (bd == NULL)
-				return STRTOG_NoMemory;
-			}
-		if (bd2 > 0) {
-			bd = lshift(bd, bd2);
-			if (bd == NULL)
-				return STRTOG_NoMemory;
-			}
-		if (bs2 > 0) {
-			bs = lshift(bs, bs2);
-			if (bs == NULL)
-				return STRTOG_NoMemory;
-			}
-		asub = 1;
-		inex = STRTOG_Inexhi;
-		delta = diff(bb, bd);
-		if (delta == NULL)
-			return STRTOG_NoMemory;
-		if (delta->wds <= 1 && !delta->x[0])
-			break;
-		dsign = delta->sign;
-		delta->sign = finished = 0;
-		L = 0;
-		i = cmp(delta, bs);
-		if (rd && i <= 0) {
-			irv = STRTOG_Normal;
-			if ( (finished = dsign ^ (rd&1)) !=0) {
-				if (dsign != 0) {
-					irv |= STRTOG_Inexhi;
-					goto adj1;
-					}
-				irv |= STRTOG_Inexlo;
-				if (rve1 == emin)
-					goto adj1;
-				for(i = 0, j = nbits; j >= ULbits;
-						i++, j -= ULbits) {
-					if (rvb->x[i] & ALL_ON)
-						goto adj1;
-					}
-				if (j > 1 && lo0bits(rvb->x + i) < j - 1)
-					goto adj1;
-				rve = rve1 - 1;
-				rvb = set_ones(rvb, rvbits = nbits);
-				if (rvb == NULL)
-					return STRTOG_NoMemory;
-				break;
-				}
-			irv |= dsign ? STRTOG_Inexlo : STRTOG_Inexhi;
-			break;
-			}
-		if (i < 0) {
-			/* Error is less than half an ulp -- check for
-			 * special case of mantissa a power of two.
-			 */
-			irv = dsign
-				? STRTOG_Normal | STRTOG_Inexlo
-				: STRTOG_Normal | STRTOG_Inexhi;
-			if (dsign || bbbits > 1 || denorm || rve1 == emin)
-				break;
-			delta = lshift(delta,1);
-			if (delta == NULL)
-				return STRTOG_NoMemory;
-			if (cmp(delta, bs) > 0) {
-				irv = STRTOG_Normal | STRTOG_Inexlo;
-				goto drop_down;
-				}
-			break;
-			}
-		if (i == 0) {
-			/* exactly half-way between */
-			if (dsign) {
-				if (denorm && all_on(rvb, rvbits)) {
-					/*boundary case -- increment exponent*/
-					rvb->wds = 1;
-					rvb->x[0] = 1;
-					rve = emin + nbits - (rvbits = 1);
-					irv = STRTOG_Normal | STRTOG_Inexhi;
-					denorm = 0;
-					break;
-					}
-				irv = STRTOG_Normal | STRTOG_Inexlo;
-				}
-			else if (bbbits == 1) {
-				irv = STRTOG_Normal;
- drop_down:
-				/* boundary case -- decrement exponent */
-				if (rve1 == emin) {
-					irv = STRTOG_Normal | STRTOG_Inexhi;
-					if (rvb->wds == 1 && rvb->x[0] == 1)
-						sudden_underflow = 1;
-					break;
-					}
-				rve -= nbits;
-				rvb = set_ones(rvb, rvbits = nbits);
-				if (rvb == NULL)
-					return STRTOG_NoMemory;
-				break;
-				}
-			else
-				irv = STRTOG_Normal | STRTOG_Inexhi;
-			if ((bbbits < nbits && !denorm) || !(rvb->x[0] & 1))
-				break;
-			if (dsign) {
-				rvb = increment(rvb);
-				if (rvb == NULL)
-					return STRTOG_NoMemory;
-				j = kmask & (ULbits - (rvbits & kmask));
-				if (hi0bits(rvb->x[rvb->wds - 1]) != j)
-					rvbits++;
-				irv = STRTOG_Normal | STRTOG_Inexhi;
-				}
-			else {
-				if (bbbits == 1)
-					goto undfl;
-				decrement(rvb);
-				irv = STRTOG_Normal | STRTOG_Inexlo;
-				}
-			break;
-			}
-		if ((dval(&adj) = ratio(delta, bs)) <= 2.) {
- adj1:
-			inex = STRTOG_Inexlo;
-			if (dsign) {
-				asub = 0;
-				inex = STRTOG_Inexhi;
-				}
-			else if (denorm && bbbits <= 1) {
- undfl:
-				rvb->wds = 0;
-				rve = emin;
-				irv = STRTOG_Underflow | STRTOG_Inexlo;
-				break;
-				}
-			adj0 = dval(&adj) = 1.;
-			}
-		else {
-			adj0 = dval(&adj) *= 0.5;
-			if (dsign) {
-				asub = 0;
-				inex = STRTOG_Inexlo;
-				}
-			if (dval(&adj) < 2147483647.) {
-				L = adj0;
-				adj0 -= L;
-				switch(rd) {
-				  case 0:
-					if (adj0 >= .5)
-						goto inc_L;
-					break;
-				  case 1:
-					if (asub && adj0 > 0.)
-						goto inc_L;
-					break;
-				  case 2:
-					if (!asub && adj0 > 0.) {
- inc_L:
-						L++;
-						inex = STRTOG_Inexact - inex;
-						}
-				  }
-				dval(&adj) = L;
-				}
-			}
-		y = rve + rvbits;
-
-		/* adj *= ulp(dval(&rv)); */
-		/* if (asub) rv -= adj; else rv += adj; */
-
-		if (!denorm && rvbits < nbits) {
-			rvb = lshift(rvb, j = nbits - rvbits);
-			if (rvb == NULL)
-				return STRTOG_NoMemory;
-			rve -= j;
-			rvbits = nbits;
-			}
-		ab = d2b(dval(&adj), &abe, &abits);
-		if (ab == NULL)
-			return STRTOG_NoMemory;
-		if (abe < 0)
-			rshift(ab, -abe);
-		else if (abe > 0)
-			ab = lshift(ab, abe);
-		rvb0 = rvb;
-		if (asub) {
-			/* rv -= adj; */
-			j = hi0bits(rvb->x[rvb->wds-1]);
-			rvb = diff(rvb, ab);
-			if (rvb == NULL)
-				return STRTOG_NoMemory;
-			k = rvb0->wds - 1;
-			if (denorm)
-				/* do nothing */;
-			else if (rvb->wds <= k
-				|| hi0bits( rvb->x[k]) >
-				   hi0bits(rvb0->x[k])) {
-				/* unlikely; can only have lost 1 high bit */
-				if (rve1 == emin) {
-					--rvbits;
-					denorm = 1;
-					}
-				else {
-					rvb = lshift(rvb, 1);
-					if (rvb == NULL)
-						return STRTOG_NoMemory;
-					--rve;
-					--rve1;
-					L = finished = 0;
-					}
-				}
-			}
-		else {
-			rvb = sum(rvb, ab);
-			if (rvb == NULL)
-				return STRTOG_NoMemory;
-			k = rvb->wds - 1;
-			if (k >= rvb0->wds
-			 || hi0bits(rvb->x[k]) < hi0bits(rvb0->x[k])) {
-				if (denorm) {
-					if (++rvbits == nbits)
-						denorm = 0;
-					}
-				else {
-					rshift(rvb, 1);
-					rve++;
-					rve1++;
-					L = 0;
-					}
-				}
-			}
-		Bfree(ab);
-		Bfree(rvb0);
-		if (finished)
-			break;
-
-		z = rve + rvbits;
-		if (y == z && L) {
-			/* Can we stop now? */
-			tol = dval(&adj) * 5e-16; /* > max rel error */
-			dval(&adj) = adj0 - .5;
-			if (dval(&adj) < -tol) {
-				if (adj0 > tol) {
-					irv |= inex;
-					break;
-					}
-				}
-			else if (dval(&adj) > tol && adj0 < 1. - tol) {
-				irv |= inex;
-				break;
-				}
-			}
-		bb0 = denorm ? 0 : trailz(rvb);
-		Bfree(bb);
-		Bfree(bd);
-		Bfree(bs);
-		Bfree(delta);
-		}
-	if (!denorm && (j = nbits - rvbits)) {
-		if (j > 0)
-			rvb = lshift(rvb, j);
-		else
-			rshift(rvb, -j);
-		rve -= j;
-		}
-	*expt = rve;
-	Bfree(bb);
-	Bfree(bd);
-	Bfree(bs);
-	Bfree(bd0);
-	Bfree(delta);
-	if (rve > fpi->emax) {
-		switch(fpi->rounding & 3) {
-		  case FPI_Round_near:
-			goto huge;
-		  case FPI_Round_up:
-			if (!sign)
-				goto huge;
-			break;
-		  case FPI_Round_down:
-			if (sign)
-				goto huge;
-		  }
-		/* Round to largest representable magnitude */
-		Bfree(rvb);
-		rvb = 0;
-		irv = STRTOG_Normal | STRTOG_Inexlo;
-		*expt = fpi->emax;
-		b = bits;
-		be = b + ((unsigned int)(fpi->nbits + 31) >> 5);
-		while(b < be)
-			*b++ = (unsigned int)-1;
-		if ((j = fpi->nbits & 0x1f) != 0)
-			*--be >>= (32 - j);
-		goto ret;
- huge:
-		rvb->wds = 0;
-		irv = STRTOG_Infinite | STRTOG_Overflow | STRTOG_Inexhi;
-#ifndef NO_ERRNO
-		errno = ERANGE;
-#endif
-#ifdef INFNAN_CHECK
- infnanexp:
-#endif
-		*expt = fpi->emax + 1;
-		}
- ret:
-	if (denorm) {
-		if (sudden_underflow) {
-			rvb->wds = 0;
-			irv = STRTOG_Underflow | STRTOG_Inexlo;
-#ifndef NO_ERRNO
-			errno = ERANGE;
-#endif
-			}
-		else  {
-			irv = (irv & ~STRTOG_Retmask) |
-				(rvb->wds > 0 ? STRTOG_Denormal : STRTOG_Zero);
-			if (irv & STRTOG_Inexact) {
-				irv |= STRTOG_Underflow;
-#ifndef NO_ERRNO
-				errno = ERANGE;
-#endif
-				}
-			}
-		}
-	if (se)
-		*se = __UNCONST(s);
-	if (sign)
-		irv |= STRTOG_Neg;
-	if (rvb) {
-		copybits(bits, nbits, rvb);
-		Bfree(rvb);
-		}
-	return irv;
-	}
diff --git a/lib/libc/gdtoa/strtodnrp.c b/lib/libc/gdtoa/strtodnrp.c
deleted file mode 100644
index 1c5dc7242..000000000
--- a/lib/libc/gdtoa/strtodnrp.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $NetBSD: strtodnrp.c,v 1.3 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 2004 by David M. Gay.
-All Rights Reserved
-Based on material in the rest of /netlib/fp/gdota.tar.gz,
-which is copyright (C) 1998, 2000 by Lucent Technologies.
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* This is a variant of strtod that works on Intel ia32 systems */
-/* with the default extended-precision arithmetic -- it does not */
-/* require setting the precision control to 53 bits.  */
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- double
-#ifdef KR_headers
-strtod(s, sp) CONST char *s; char **sp;
-#else
-strtod(CONST char *s, char **sp)
-#endif
-{
-	static const FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
-	ULong bits[2];
-	Long expt;
-	int k;
-	union { ULong L[2]; double d; } u;
-
-	k = strtodg(s, sp, &fpi, &expt, bits);
-	if (k == STRTOG_NoMemory) {
-		errno = ERANGE;
-		u.L[0] = Big0;
-		u.L[1] = Big1;
-		return u.d;
-	}
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		u.L[0] = u.L[1] = 0;
-		break;
-
-	  case STRTOG_Normal:
-		u.L[_1] = bits[0];
-		u.L[_0] = (bits[1] & ~0x100000) | ((expt + 0x3ff + 52) << 20);
-		break;
-
-	  case STRTOG_Denormal:
-		u.L[_1] = bits[0];
-		u.L[_0] = bits[1];
-		break;
-
-	  case STRTOG_Infinite:
-		u.L[_0] = 0x7ff00000;
-		u.L[_1] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		u.L[0] = d_QNAN0;
-		u.L[1] = d_QNAN1;
-		break;
-
-	  case STRTOG_NaNbits:
-		u.L[_0] = 0x7ff00000 | bits[1];
-		u.L[_1] = bits[0];
-	  }
-	if (k & STRTOG_Neg)
-		u.L[_0] |= 0x80000000L;
-	return u.d;
-	}
diff --git a/lib/libc/gdtoa/strtof.c b/lib/libc/gdtoa/strtof.c
deleted file mode 100644
index ca2d268bf..000000000
--- a/lib/libc/gdtoa/strtof.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* $NetBSD: strtof.c,v 1.7 2013/05/17 12:55:57 joerg Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "namespace.h"
-#include "gdtoaimp.h"
-
-#include <locale.h>
-#include "setlocale_local.h"
-
-#ifdef __weak_alias
-__weak_alias(strtof, _strtof)
-__weak_alias(strtof_l, _strtof_l)
-#endif
-
-static float
-_int_strtof_l(CONST char *s, char **sp, locale_t loc)
-{
-	static CONST FPI fpi0 = { 24, 1-127-24+1,  254-127-24+1, 1, SI };
-	ULong bits[1];
-	Long expt;
-	int k;
-	union { ULong L[1]; float f; } u;
-#ifdef Honor_FLT_ROUNDS
-#include "gdtoa_fltrnds.h"
-#else
-#define fpi &fpi0
-#endif
-
-	k = strtodg(s, sp, fpi, &expt, bits, loc);
-	if (k == STRTOG_NoMemory) {
-		errno = ERANGE;
-		return HUGE_VALF;
-	}
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		u.L[0] = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_NaNbits:
-		u.L[0] = (bits[0] & 0x7fffff) | ((expt + 0x7f + 23) << 23);
-		break;
-
-	  case STRTOG_Denormal:
-		u.L[0] = bits[0];
-		break;
-
-	  case STRTOG_Infinite:
-		u.L[0] = 0x7f800000;
-		break;
-
-	  case STRTOG_NaN:
-		u.L[0] = f_QNAN;
-		break;
-
-	  default:
-		u.L[0] = 0; /* for gcc warning */
-		break;
-	  }
-	if (k & STRTOG_Neg)
-		u.L[0] |= 0x80000000L;
-	return u.f;
-	}
-
-float
-strtof(CONST char *s, char **sp)
-{
-	return _int_strtof_l(s, sp, _current_locale());
-}
-
-float
-strtof_l(CONST char *s, char **sp, locale_t loc)
-{
-	return _int_strtof_l(s, sp, loc);
-}
diff --git a/lib/libc/gdtoa/strtof_vaxf.c b/lib/libc/gdtoa/strtof_vaxf.c
deleted file mode 100644
index 8eaeec89a..000000000
--- a/lib/libc/gdtoa/strtof_vaxf.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* $NetBSD: strtof_vaxf.c,v 1.8 2013/05/17 12:55:57 joerg Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-/* Adapted to VAX F_floating by Klaus Klein <kleink@netbsd.org>. */
-
-#include "namespace.h"
-#include "gdtoaimp.h"
-#include <locale.h>
-#include "setlocale_local.h"
-
-#ifdef __weak_alias
-__weak_alias(strtof, _strtof)
-__weak_alias(strtof_l, _strtof_l)
-#endif
-
-static float
-_int_strtof_l(CONST char *s, char **sp, locale_t loc)
-{
-	static CONST FPI fpi = { 24, 1-128-1-24+1,  255-128-1-24+1, 1, SI };
-	ULong bits[1];
-	Long expt;
-	int k;
-	union { ULong L[1]; float f; } u;
-
-	k = strtodg(s, sp, &fpi, &expt, bits, loc);
-	if (k == STRTOG_NoMemory) {
-		errno = ERANGE;
-		return HUGE_VALF;
-	}
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-	  default:
-		u.f = 0.0;
-		break;
-
-	  case STRTOG_Normal:
-		u.L[0] = ((bits[0] & 0x0000ffff) << 16)	| /* FracLo */
-			 ((bits[0] & 0x007f0000) >> 16)	| /* FracHi */
-			 ((expt + 128 + 1 + 23)  <<  7);  /* Exp */
-		break;
-
-	  case STRTOG_Infinite:
-		u.f = HUGE_VALF;
-		break;
-
-	  }
-	if (k & STRTOG_Neg)
-		u.L[0] |= 0x00008000L;
-	return u.f;
-}
-
-float
-strtof(CONST char *s, char **sp)
-{
-	return _int_strtof_l(s, sp, _current_locale());
-}
-
-float
-strtof_l(CONST char *s, char **sp, locale_t loc)
-{
-	return _int_strtof_l(s, sp, loc);
-}
diff --git a/lib/libc/gdtoa/strtold_pQ.c b/lib/libc/gdtoa/strtold_pQ.c
deleted file mode 100644
index 630d9dfe6..000000000
--- a/lib/libc/gdtoa/strtold_pQ.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: strtold_pQ.c,v 1.1 2006/03/15 17:35:18 kleink Exp $ */
-
-#define	GDTOA_LD_FMT	Q
-#include "strtold_subr.c"
diff --git a/lib/libc/gdtoa/strtold_px.c b/lib/libc/gdtoa/strtold_px.c
deleted file mode 100644
index 779da854a..000000000
--- a/lib/libc/gdtoa/strtold_px.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: strtold_px.c,v 1.1 2006/03/15 17:35:18 kleink Exp $ */
-
-#define	GDTOA_LD_FMT	x
-#include "strtold_subr.c"
diff --git a/lib/libc/gdtoa/strtold_pxL.c b/lib/libc/gdtoa/strtold_pxL.c
deleted file mode 100644
index 04c019320..000000000
--- a/lib/libc/gdtoa/strtold_pxL.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: strtold_pxL.c,v 1.1 2006/03/15 17:35:18 kleink Exp $ */
-
-#define	GDTOA_LD_FMT	xL
-#include "strtold_subr.c"
diff --git a/lib/libc/gdtoa/strtold_subr.c b/lib/libc/gdtoa/strtold_subr.c
deleted file mode 100644
index 1f5e1aa59..000000000
--- a/lib/libc/gdtoa/strtold_subr.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* $NetBSD: strtold_subr.c,v 1.3 2013/05/17 12:55:57 joerg Exp $ */
-
-/*
- * Written by Klaus Klein <kleink@NetBSD.org>, November 16, 2005.
- * Public domain.
- */
-
-/*
- * NOTICE: This is not a standalone file.  To use it, #include it in
- * the format-specific strtold_*.c, like so:
- *
- *	#define GDTOA_LD_FMT	<gdtoa extended-precision format code>
- *	#include "strtold_subr.c"
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strtold_subr.c,v 1.3 2013/05/17 12:55:57 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <math.h>
-#include <stdlib.h>
-#include "gdtoa.h"
-
-#include <locale.h>
-#include "setlocale_local.h"
-
-#ifdef __weak_alias
-__weak_alias(strtold, _strtold)
-__weak_alias(strtold_l, _strtold_l)
-#endif
-
-#ifndef __HAVE_LONG_DOUBLE
-#error no extended-precision long double type
-#endif
-
-#ifndef GDTOA_LD_FMT
-#error GDTOA_LD_FMT must be defined by format-specific source file
-#endif
-
-#define	STRTOP(x)	__CONCAT(strtop, x)
-
-static long double
-_int_strtold_l(const char *nptr, char **endptr, locale_t loc)
-{
-	long double ld;
-
-	(void)STRTOP(GDTOA_LD_FMT)(nptr, endptr, &ld, loc);
-	return ld;
-}
-
-long double
-strtold(CONST char *s, char **sp)
-{
-	return _int_strtold_l(s, sp, _current_locale());
-}
-
-long double
-strtold_l(CONST char *s, char **sp, locale_t loc)
-{
-	return _int_strtold_l(s, sp, loc);
-}
diff --git a/lib/libc/gdtoa/strtopQ.c b/lib/libc/gdtoa/strtopQ.c
deleted file mode 100644
index 9833cc384..000000000
--- a/lib/libc/gdtoa/strtopQ.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* $NetBSD: strtopQ.c,v 1.6 2013/04/18 21:54:11 joerg Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_BIG_ENDIAN or IEEE_LITTLE_ENDIAN should be #defined */
-
-#ifdef IEEE_BIG_ENDIAN
-#define _0 0
-#define _1 1
-#define _2 2
-#define _3 3
-#endif
-#ifdef IEEE_LITTLE_ENDIAN
-#define _0 3
-#define _1 2
-#define _2 1
-#define _3 0
-#endif
-
- int
-strtopQ(CONST char *s, char **sp, void *V, locale_t loc)
-{
-	static CONST FPI fpi0 = { 113, 1-16383-113+1, 32766 - 16383 - 113 + 1, 1, SI };
-	ULong bits[4];
-	Long expt;
-	int k;
-	ULong *L = (ULong*)V;
-#ifdef Honor_FLT_ROUNDS
-#include "gdtoa_fltrnds.h"
-#else
-#define fpi &fpi0
-#endif
-
-	k = strtodg(s, sp, fpi, &expt, bits, loc);
-	if (k == STRTOG_NoMemory)
-		return k;
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = L[2] = L[3] = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_NaNbits:
-		L[_3] = bits[0];
-		L[_2] = bits[1];
-		L[_1] = bits[2];
-		L[_0] = (bits[3] & ~0x10000) | ((expt + 0x3fff + 112) << 16);
-		break;
-
-	  case STRTOG_Denormal:
-		L[_3] = bits[0];
-		L[_2] = bits[1];
-		L[_1] = bits[2];
-		L[_0] = bits[3];
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = 0x7fff0000;
-		L[_1] = L[_2] = L[_3] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[0] = ld_QNAN0;
-		L[1] = ld_QNAN1;
-		L[2] = ld_QNAN2;
-		L[3] = ld_QNAN3;
-	  }
-	if (k & STRTOG_Neg)
-		L[_0] |= 0x80000000L;
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtopd.c b/lib/libc/gdtoa/strtopd.c
deleted file mode 100644
index 832027150..000000000
--- a/lib/libc/gdtoa/strtopd.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $NetBSD: strtopd.c,v 1.3 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtopd(s, sp, d) char *s; char **sp; double *d;
-#else
-strtopd(CONST char *s, char **sp, double *d)
-#endif
-{
-	static FPI fpi0 = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
-	ULong bits[2];
-	Long expt;
-	int k;
-#ifdef Honor_FLT_ROUNDS
-#include "gdtoa_fltrnds.h"
-#else
-#define fpi &fpi0
-#endif
-
-	k = strtodg(s, sp, fpi, &expt, bits);
-	if (k == STRTOG_NoMemory)
-		return k;
-	ULtod((ULong*)d, bits, expt, k);
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtopdd.c b/lib/libc/gdtoa/strtopdd.c
deleted file mode 100644
index 74ff16521..000000000
--- a/lib/libc/gdtoa/strtopdd.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/* $NetBSD: strtopdd.c,v 1.3 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtopdd(s, sp, dd) CONST char *s; char **sp; double *dd;
-#else
-strtopdd(CONST char *s, char **sp, double *dd)
-#endif
-{
-#ifdef Sudden_Underflow
-	static FPI fpi0 = { 106, 1-1023, 2046-1023-106+1, 1, 1 };
-#else
-	static FPI fpi0 = { 106, 1-1023-53+1, 2046-1023-106+1, 1, 0 };
-#endif
-	ULong bits[4];
-	Long expt;
-	int i, j, rv;
-	typedef union {
-		double d[2];
-		ULong L[4];
-		} U;
-	U *u;
-#ifdef Honor_FLT_ROUNDS
-#include "gdtoa_fltrnds.h"
-#else
-#define fpi &fpi0
-#endif
-
-	rv = strtodg(s, sp, fpi, &expt, bits);
-	if (rv == STRTOG_NoMemory)
-		return rv;
-	u = (U*)dd;
-	switch(rv & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		u->d[0] = u->d[1] = 0.;
-		break;
-
-	  case STRTOG_Normal:
-		u->L[_1] = (bits[1] >> 21 | bits[2] << 11) & 0xffffffffL;
-		u->L[_0] = (bits[2] >> 21) | ((bits[3] << 11) & 0xfffff)
-			  | ((expt + 0x3ff + 105) << 20);
-		expt += 0x3ff + 52;
-		if (bits[1] &= 0x1fffff) {
-			i = hi0bits(bits[1]) - 11;
-			if (i >= expt) {
-				i = expt - 1;
-				expt = 0;
-				}
-			else
-				expt -= i;
-			if (i > 0) {
-				bits[1] = bits[1] << i | bits[0] >> (32-i);
-				bits[0] = bits[0] << i & 0xffffffffL;
-				}
-			}
-		else if (bits[0]) {
-			i = hi0bits(bits[0]) + 21;
-			if (i >= expt) {
-				i = expt - 1;
-				expt = 0;
-				}
-			else
-				expt -= i;
-			if (i < 32) {
-				bits[1] = bits[0] >> (32 - i);
-				bits[0] = bits[0] << i & 0xffffffffL;
-				}
-			else {
-				bits[1] = bits[0] << (i - 32);
-				bits[0] = 0;
-				}
-			}
-		else {
-			u->L[2] = u->L[3] = 0;
-			break;
-			}
-		u->L[2+_1] = bits[0];
-		u->L[2+_0] = (bits[1] & 0xfffff) | (expt << 20);
-		break;
-
-	  case STRTOG_Denormal:
-		if (bits[3])
-			goto nearly_normal;
-		if (bits[2])
-			goto partly_normal;
-		if (bits[1] & 0xffe00000)
-			goto hardly_normal;
-		/* completely denormal */
-		u->L[2] = u->L[3] = 0;
-		u->L[_1] = bits[0];
-		u->L[_0] = bits[1];
-		break;
-
-	  nearly_normal:
-		i = hi0bits(bits[3]) - 11;	/* i >= 12 */
-		j = 32 - i;
-		u->L[_0] = ((bits[3] << i | bits[2] >> j) & 0xfffff)
-			| ((65 - i) << 20);
-		u->L[_1] = (bits[2] << i | bits[1] >> j) & 0xffffffffL;
-		u->L[2+_0] = bits[1] & ((1L << j) - 1);
-		u->L[2+_1] = bits[0];
-		break;
-
-	  partly_normal:
-		i = hi0bits(bits[2]) - 11;
-		if (i < 0) {
-			j = -i;
-			i += 32;
-			u->L[_0] = (bits[2] >> j & 0xfffff) | (33 + j) << 20;
-			u->L[_1] = ((bits[2] << i) | (bits[1] >> j)) & 0xffffffffL;
-			u->L[2+_0] = bits[1] & ((1L << j) - 1);
-			u->L[2+_1] = bits[0];
-			break;
-			}
-		if (i == 0) {
-			u->L[_0] = (bits[2] & 0xfffff) | (33 << 20);
-			u->L[_1] = bits[1];
-			u->L[2+_0] = 0;
-			u->L[2+_1] = bits[0];
-			break;
-			}
-		j = 32 - i;
-		u->L[_0] = (((bits[2] << i) | (bits[1] >> j)) & 0xfffff)
-				| ((j + 1) << 20);
-		u->L[_1] = (bits[1] << i | bits[0] >> j) & 0xffffffffL;
-		u->L[2+_0] = 0;
-		u->L[2+_1] = bits[0] & ((1L << j) - 1);
-		break;
-
-	  hardly_normal:
-		j = 11 - hi0bits(bits[1]);
-		i = 32 - j;
-		u->L[_0] = (bits[1] >> j & 0xfffff) | ((j + 1) << 20);
-		u->L[_1] = (bits[1] << i | bits[0] >> j) & 0xffffffffL;
-		u->L[2+_0] = 0;
-		u->L[2+_1] = bits[0] & ((1L << j) - 1);
-		break;
-
-	  case STRTOG_Infinite:
-		u->L[_0] = u->L[2+_0] = 0x7ff00000;
-		u->L[_1] = u->L[2+_1] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		u->L[0] = u->L[2] = d_QNAN0;
-		u->L[1] = u->L[3] = d_QNAN1;
-	  }
-	if (rv & STRTOG_Neg) {
-		u->L[  _0] |= 0x80000000L;
-		u->L[2+_0] |= 0x80000000L;
-		}
-	return rv;
-	}
diff --git a/lib/libc/gdtoa/strtopf.c b/lib/libc/gdtoa/strtopf.c
deleted file mode 100644
index 880aa82cc..000000000
--- a/lib/libc/gdtoa/strtopf.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* $NetBSD: strtopf.c,v 1.3 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtopf(s, sp, f) CONST char *s; char **sp; float *f;
-#else
-strtopf(CONST char *s, char **sp, float *f)
-#endif
-{
-	static FPI fpi0 = { 24, 1-127-24+1,  254-127-24+1, 1, SI };
-	ULong bits[1], *L;
-	Long expt;
-	int k;
-#ifdef Honor_FLT_ROUNDS
-#include "gdtoa_fltrnds.h"
-#else
-#define fpi &fpi0
-#endif
-
-	k = strtodg(s, sp, fpi, &expt, bits);
-	if (k == STRTOG_NoMemory)
-		return k;
-	L = (ULong*)f;
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_NaNbits:
-		L[0] = (bits[0] & 0x7fffff) | ((expt + 0x7f + 23) << 23);
-		break;
-
-	  case STRTOG_Denormal:
-		L[0] = bits[0];
-		break;
-
-	  case STRTOG_Infinite:
-		L[0] = 0x7f800000;
-		break;
-
-	  case STRTOG_NaN:
-		L[0] = f_QNAN;
-	  }
-	if (k & STRTOG_Neg)
-		L[0] |= 0x80000000L;
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtopx.c b/lib/libc/gdtoa/strtopx.c
deleted file mode 100644
index 79b5e4f68..000000000
--- a/lib/libc/gdtoa/strtopx.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* $NetBSD: strtopx.c,v 1.6 2013/04/18 21:54:11 joerg Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_BIG_ENDIAN or IEEE_LITTLE_ENDIAN should be #defined */
-
-#ifdef IEEE_BIG_ENDIAN
-#define _0 0
-#define _1 1
-#define _2 2
-#define _3 3
-#define _4 4
-#endif
-#ifdef IEEE_LITTLE_ENDIAN
-#define _0 4
-#define _1 3
-#define _2 2
-#define _3 1
-#define _4 0
-#endif
-
- int
-strtopx(CONST char *s, char **sp, void *V, locale_t loc)
-{
-	static const FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI };
-	ULong bits[2];
-	Long expt;
-	int k;
-	UShort *L = (UShort*)V;
-#ifdef Honor_FLT_ROUNDS
-#include "gdtoa_fltrnds.h"
-#else
-#define fpi &fpi0
-#endif
-
-	k = strtodg(s, sp, fpi, &expt, bits, loc);
-	if (k == STRTOG_NoMemory)
-		return k;
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = L[2] = L[3] = L[4] = 0;
-		break;
-
-	  case STRTOG_Denormal:
-		L[_0] = 0;
-		goto normal_bits;
-
-	  case STRTOG_Normal:
-	  case STRTOG_NaNbits:
-		L[_0] = expt + 0x3fff + 63;
- normal_bits:
-		L[_4] = (UShort)bits[0];
-		L[_3] = (UShort)(bits[0] >> 16);
-		L[_2] = (UShort)bits[1];
-		L[_1] = (UShort)(bits[1] >> 16);
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = 0x7fff;
-		L[_1] = 0x8000;
-		L[_2] = L[_3] = L[_4] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[0] = ldus_QNAN0;
-		L[1] = ldus_QNAN1;
-		L[2] = ldus_QNAN2;
-		L[3] = ldus_QNAN3;
-		L[4] = ldus_QNAN4;
-	  }
-	if (k & STRTOG_Neg)
-		L[_0] |= 0x8000;
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtopxL.c b/lib/libc/gdtoa/strtopxL.c
deleted file mode 100644
index 4624be407..000000000
--- a/lib/libc/gdtoa/strtopxL.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* $NetBSD: strtopxL.c,v 1.6 2013/04/18 21:54:11 joerg Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_BIG_ENDIAN or IEEE_LITTLE_ENDIAN should be #defined */
-
-#ifdef IEEE_BIG_ENDIAN
-#define _0 0
-#define _1 1
-#define _2 2
-#endif
-#ifdef IEEE_LITTLE_ENDIAN
-#define _0 2
-#define _1 1
-#define _2 0
-#endif
-
- int
-strtopxL(CONST char *s, char **sp, void *V, locale_t loc)
-{
-	static CONST FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI };
-	ULong bits[2];
-	Long expt;
-	int k;
-	ULong *L = (ULong*)V;
-#ifdef Honor_FLT_ROUNDS
-#include "gdtoa_fltrnds.h"
-#else
-#define fpi &fpi0
-#endif
-
-	k = strtodg(s, sp, fpi, &expt, bits, loc);
-	if (k == STRTOG_NoMemory)
-		return k;
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = L[2] = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_Denormal:
-	  case STRTOG_NaNbits:
-		L[_2] = bits[0];
-		L[_1] = bits[1];
-		L[_0] = (expt + 0x3fff + 63) << 16;
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = 0x7fff << 16;
-		L[_1] = 0x80000000;
-		L[_2] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[0] = ld_QNAN0;
-		L[1] = ld_QNAN1;
-		L[2] = ld_QNAN2;
-	  }
-	if (k & STRTOG_Neg)
-		L[_0] |= 0x80000000L;
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtorQ.c b/lib/libc/gdtoa/strtorQ.c
deleted file mode 100644
index a001271a8..000000000
--- a/lib/libc/gdtoa/strtorQ.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* $NetBSD: strtorQ.c,v 1.4 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_BIG_ENDIAN or IEEE_LITTLE_ENDIAN should be #defined */
-
-#ifdef IEEE_BIG_ENDIAN
-#define _0 0
-#define _1 1
-#define _2 2
-#define _3 3
-#endif
-#ifdef IEEE_LITTLE_ENDIAN
-#define _0 3
-#define _1 2
-#define _2 1
-#define _3 0
-#endif
-
- void
-#ifdef KR_headers
-ULtoQ(L, bits, expt, k) ULong *L; ULong *bits; Long expt; int k;
-#else
-ULtoQ(ULong *L, ULong *bits, Long expt, int k)
-#endif
-{
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = L[2] = L[3] = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_NaNbits:
-		L[_3] = bits[0];
-		L[_2] = bits[1];
-		L[_1] = bits[2];
-		L[_0] = (bits[3] & ~0x10000) | ((expt + 0x3fff + 112) << 16);
-		break;
-
-	  case STRTOG_Denormal:
-		L[_3] = bits[0];
-		L[_2] = bits[1];
-		L[_1] = bits[2];
-		L[_0] = bits[3];
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = 0x7fff0000;
-		L[_1] = L[_2] = L[_3] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[0] = ld_QNAN0;
-		L[1] = ld_QNAN1;
-		L[2] = ld_QNAN2;
-		L[3] = ld_QNAN3;
-	  }
-	if (k & STRTOG_Neg)
-		L[_0] |= 0x80000000L;
-	}
-
- int
-#ifdef KR_headers
-strtorQ(s, sp, rounding, L) CONST char *s; char **sp; int rounding; void *L;
-#else
-strtorQ(CONST char *s, char **sp, int rounding, void *L)
-#endif
-{
-	static FPI fpi0 = { 113, 1-16383-113+1, 32766-16383-113+1, 1, SI };
-	FPI *fpi, fpi1;
-	ULong bits[4];
-	Long expt;
-	int k;
-
-	fpi = &fpi0;
-	if (rounding != FPI_Round_near) {
-		fpi1 = fpi0;
-		fpi1.rounding = rounding;
-		fpi = &fpi1;
-		}
-	k = strtodg(s, sp, fpi, &expt, bits);
-	if (k == STRTOG_NoMemory)
-		return k;
-	ULtoQ((ULong*)L, bits, expt, k);
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtord.c b/lib/libc/gdtoa/strtord.c
deleted file mode 100644
index 9b8c215c1..000000000
--- a/lib/libc/gdtoa/strtord.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* $NetBSD: strtord.c,v 1.5 2013/04/18 21:54:11 joerg Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- void
-#ifdef KR_headers
-ULtod(L, bits, expt, k) ULong *L; ULong *bits; Long expt; int k;
-#else
-ULtod(ULong *L, ULong *bits, Long expt, int k)
-#endif
-{
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = 0;
-		break;
-
-	  case STRTOG_Denormal:
-		L[_1] = bits[0];
-		L[_0] = bits[1];
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_NaNbits:
-		L[_1] = bits[0];
-		L[_0] = (bits[1] & ~0x100000) | ((expt + 0x3ff + 52) << 20);
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = 0x7ff00000;
-		L[_1] = 0;
-		break;
-
-#ifdef d_QNAN0
-	  case STRTOG_NaN:
-		L[0] = d_QNAN0;
-		L[1] = d_QNAN1;
-#endif
-	  }
-	if (k & STRTOG_Neg)
-		L[_0] |= 0x80000000L;
-	}
-
- int
-strtord(CONST char *s, char **sp, int rounding, double *d, locale_t loc)
-{
-	static CONST FPI fpi0 = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
-	CONST FPI *fpi;
-	FPI fpi1;
-	ULong bits[2];
-	Long expt;
-	int k;
-
-	fpi = &fpi0;
-	if (rounding != FPI_Round_near) {
-		fpi1 = fpi0;
-		fpi1.rounding = rounding;
-		fpi = &fpi1;
-		}
-	k = strtodg(s, sp, fpi, &expt, bits, loc);
-	if (k == STRTOG_NoMemory)
-		return k; 
-	ULtod((/* LINTED */(U*)d)->L, bits, expt, k);
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtordd.c b/lib/libc/gdtoa/strtordd.c
deleted file mode 100644
index d60f52941..000000000
--- a/lib/libc/gdtoa/strtordd.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/* $NetBSD: strtordd.c,v 1.3 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- void
-#ifdef KR_headers
-ULtodd(L, bits, expt, k) ULong *L; ULong *bits; Long expt; int k;
-#else
-ULtodd(ULong *L, ULong *bits, Long expt, int k)
-#endif
-{
-	int i, j;
-
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = L[2] = L[3] = 0;
-		break;
-
-	  case STRTOG_Normal:
-		L[_1] = (bits[1] >> 21 | bits[2] << 11) & (ULong)0xffffffffL;
-		L[_0] = (bits[2] >> 21) | (bits[3] << 11 & 0xfffff)
-			  | ((expt + 0x3ff + 105) << 20);
-		expt += 0x3ff + 52;
-		if (bits[1] &= 0x1fffff) {
-			i = hi0bits(bits[1]) - 11;
-			if (i >= expt) {
-				i = expt - 1;
-				expt = 0;
-				}
-			else
-				expt -= i;
-			if (i > 0) {
-				bits[1] = bits[1] << i | bits[0] >> (32-i);
-				bits[0] = bits[0] << i & (ULong)0xffffffffL;
-				}
-			}
-		else if (bits[0]) {
-			i = hi0bits(bits[0]) + 21;
-			if (i >= expt) {
-				i = expt - 1;
-				expt = 0;
-				}
-			else
-				expt -= i;
-			if (i < 32) {
-				bits[1] = bits[0] >> (32 - i);
-				bits[0] = bits[0] << i & (ULong)0xffffffffL;
-				}
-			else {
-				bits[1] = bits[0] << (i - 32);
-				bits[0] = 0;
-				}
-			}
-		else {
-			L[2] = L[3] = 0;
-			break;
-			}
-		L[2+_1] = bits[0];
-		L[2+_0] = (bits[1] & 0xfffff) | (expt << 20);
-		break;
-
-	  case STRTOG_Denormal:
-		if (bits[3])
-			goto nearly_normal;
-		if (bits[2])
-			goto partly_normal;
-		if (bits[1] & 0xffe00000)
-			goto hardly_normal;
-		/* completely denormal */
-		L[2] = L[3] = 0;
-		L[_1] = bits[0];
-		L[_0] = bits[1];
-		break;
-
-	  nearly_normal:
-		i = hi0bits(bits[3]) - 11;	/* i >= 12 */
-		j = 32 - i;
-		L[_0] = ((bits[3] << i | bits[2] >> j) & 0xfffff)
-			| ((65 - i) << 20);
-		L[_1] = (bits[2] << i | bits[1] >> j) & 0xffffffffL;
-		L[2+_0] = bits[1] & (((ULong)1L << j) - 1);
-		L[2+_1] = bits[0];
-		break;
-
-	  partly_normal:
-		i = hi0bits(bits[2]) - 11;
-		if (i < 0) {
-			j = -i;
-			i += 32;
-			L[_0] = (bits[2] >> j & 0xfffff) | ((33 + j) << 20);
-			L[_1] = (bits[2] << i | bits[1] >> j) & 0xffffffffL;
-			L[2+_0] = bits[1] & (((ULong)1L << j) - 1);
-			L[2+_1] = bits[0];
-			break;
-			}
-		if (i == 0) {
-			L[_0] = (bits[2] & 0xfffff) | (33 << 20);
-			L[_1] = bits[1];
-			L[2+_0] = 0;
-			L[2+_1] = bits[0];
-			break;
-			}
-		j = 32 - i;
-		L[_0] = (((bits[2] << i) | (bits[1] >> j)) & 0xfffff)
-				| ((j + 1) << 20);
-		L[_1] = (bits[1] << i | bits[0] >> j) & 0xffffffffL;
-		L[2+_0] = 0;
-		L[2+_1] = bits[0] & ((1L << j) - 1);
-		break;
-
-	  hardly_normal:
-		j = 11 - hi0bits(bits[1]);
-		i = 32 - j;
-		L[_0] = (bits[1] >> j & 0xfffff) | ((j + 1) << 20);
-		L[_1] = (bits[1] << i | bits[0] >> j) & 0xffffffffL;
-		L[2+_0] = 0;
-		L[2+_1] = bits[0] & (((ULong)1L << j) - 1);
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = L[2+_0] = 0x7ff00000;
-		L[_1] = L[2+_1] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[0] = L[2] = d_QNAN0;
-		L[1] = L[3] = d_QNAN1;
-		break;
-
-	  case STRTOG_NaNbits:
-		L[_1] = (bits[1] >> 21 | bits[2] << 11) & (ULong)0xffffffffL;
-		L[_0] = bits[2] >> 21 | bits[3] << 11
-			  | (ULong)0x7ff00000L;
-		L[2+_1] = bits[0];
-		L[2+_0] = bits[1] | (ULong)0x7ff00000L;
-	  }
-	if (k & STRTOG_Neg) {
-		L[_0] |= 0x80000000L;
-		L[2+_0] |= 0x80000000L;
-		}
-	}
-
- int
-#ifdef KR_headers
-strtordd(s, sp, rounding, dd) CONST char *s; char **sp; int rounding; double *dd;
-#else
-strtordd(CONST char *s, char **sp, int rounding, double *dd)
-#endif
-{
-#ifdef Sudden_Underflow
-	static CONST FPI fpi0 = { 106, 1-1023, 2046-1023-106+1, 1, 1 };
-#else
-	static CONST FPI fpi0 = { 106, 1-1023-53+1, 2046-1023-106+1, 1, 0 };
-#endif
-	CONST FPI *fpi;
-	FPI fpi1;
-	ULong bits[4];
-	Long expt;
-	int k;
-
-	fpi = &fpi0;
-	if (rounding != FPI_Round_near) {
-		fpi1 = fpi0;
-		fpi1.rounding = rounding;
-		fpi = &fpi1;
-		}
-	k = strtodg(s, sp, fpi, &expt, bits);
-	if (k == STRTOG_NoMemory)
-		return k;
-	ULtodd((ULong*)dd, bits, expt, k);
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtorf.c b/lib/libc/gdtoa/strtorf.c
deleted file mode 100644
index 5cf3c2dc4..000000000
--- a/lib/libc/gdtoa/strtorf.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* $NetBSD: strtorf.c,v 1.3 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- void
-#ifdef KR_headers
-ULtof(L, bits, expt, k) ULong *L; ULong *bits; Long expt; int k;
-#else
-ULtof(ULong *L, ULong *bits, Long expt, int k)
-#endif
-{
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		*L = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_NaNbits:
-		L[0] = (bits[0] & 0x7fffff) | ((expt + 0x7f + 23) << 23);
-		break;
-
-	  case STRTOG_Denormal:
-		L[0] = bits[0];
-		break;
-
-	  case STRTOG_Infinite:
-		L[0] = 0x7f800000;
-		break;
-
-	  case STRTOG_NaN:
-		L[0] = f_QNAN;
-	  }
-	if (k & STRTOG_Neg)
-		L[0] |= 0x80000000L;
-	}
-
- int
-#ifdef KR_headers
-strtorf(s, sp, rounding, f) CONST char *s; char **sp; int rounding; float *f;
-#else
-strtorf(CONST char *s, char **sp, int rounding, float *f)
-#endif
-{
-	static CONST FPI fpi0 = { 24, 1-127-24+1,  254-127-24+1, 1, SI };
-	CONST FPI *fpi;
-	FPI fpi1;
-	ULong bits[1];
-	Long expt;
-	int k;
-
-	fpi = &fpi0;
-	if (rounding != FPI_Round_near) {
-		fpi1 = fpi0;
-		fpi1.rounding = rounding;
-		fpi = &fpi1;
-		}
-	k = strtodg(s, sp, fpi, &expt, bits);
-	if (k == STRTOG_NoMemory)
-		return k;
-	ULtof((ULong*)f, bits, expt, k);
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtorx.c b/lib/libc/gdtoa/strtorx.c
deleted file mode 100644
index d0305a2ac..000000000
--- a/lib/libc/gdtoa/strtorx.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* $NetBSD: strtorx.c,v 1.4 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_BIG_ENDIAN or IEEE_LITTLE_ENDIAN should be #defined */
-
-#ifdef IEEE_BIG_ENDIAN
-#define _0 0
-#define _1 1
-#define _2 2
-#define _3 3
-#define _4 4
-#endif
-#ifdef IEEE_LITTLE_ENDIAN
-#define _0 4
-#define _1 3
-#define _2 2
-#define _3 1
-#define _4 0
-#endif
-
- void
-#ifdef KR_headers
-ULtox(L, bits, expt, k) UShort *L; ULong *bits; Long expt; int k;
-#else
-ULtox(UShort *L, ULong *bits, Long expt, int k)
-#endif
-{
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = L[2] = L[3] = L[4] = 0;
-		break;
-
-	  case STRTOG_Denormal:
-		L[_0] = 0;
-		goto normal_bits;
-
-	  case STRTOG_Normal:
-	  case STRTOG_NaNbits:
-		L[_0] = expt + 0x3fff + 63;
- normal_bits:
-		L[_4] = (UShort)bits[0];
-		L[_3] = (UShort)(bits[0] >> 16);
-		L[_2] = (UShort)bits[1];
-		L[_1] = (UShort)(bits[1] >> 16);
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = 0x7fff;
-		L[_1] = 0x8000;
-		L[_2] = L[_3] = L[_4] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[0] = ldus_QNAN0;
-		L[1] = ldus_QNAN1;
-		L[2] = ldus_QNAN2;
-		L[3] = ldus_QNAN3;
-		L[4] = ldus_QNAN4;
-	  }
-	if (k & STRTOG_Neg)
-		L[_0] |= 0x8000;
-	}
-
- int
-#ifdef KR_headers
-strtorx(s, sp, rounding, L) CONST char *s; char **sp; int rounding; void *L;
-#else
-strtorx(CONST char *s, char **sp, int rounding, void *L)
-#endif
-{
-	static CONST FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI };
-	CONST FPI *fpi;
-	FPI fpi1;
-	ULong bits[2];
-	Long expt;
-	int k;
-
-	fpi = &fpi0;
-	if (rounding != FPI_Round_near) {
-		fpi1 = fpi0;
-		fpi1.rounding = rounding;
-		fpi = &fpi1;
-		}
-	k = strtodg(s, sp, fpi, &expt, bits);
-	if (k == STRTOG_NoMemory)
-		return k;
-	    ULtox((UShort*)L, bits, expt, k);
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtorxL.c b/lib/libc/gdtoa/strtorxL.c
deleted file mode 100644
index a8f7b403f..000000000
--- a/lib/libc/gdtoa/strtorxL.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* $NetBSD: strtorxL.c,v 1.4 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_BIG_ENDIAN or IEEE_LITTLE_ENDIAN should be #defined */
-
-#ifdef IEEE_BIG_ENDIAN
-#define _0 0
-#define _1 1
-#define _2 2
-#endif
-#ifdef IEEE_LITTLE_ENDIAN
-#define _0 2
-#define _1 1
-#define _2 0
-#endif
-
- void
-#ifdef KR_headers
-ULtoxL(L, bits, expt, k) ULong *L; ULong *bits; Long expt; int k;
-#else
-ULtoxL(ULong *L, ULong *bits, Long expt, int k)
-#endif
-{
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = L[2] = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_Denormal:
-	  case STRTOG_NaNbits:
-		L[_0] = (expt + 0x3fff + 63) << 16;
-		L[_1] = bits[1];
-		L[_2] = bits[0];
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = 0x7fff << 16;
-		L[_1] = 0x80000000;
-		L[_2] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[0] = ld_QNAN0;
-		L[1] = ld_QNAN1;
-		L[2] = ld_QNAN2;
-	  }
-	if (k & STRTOG_Neg)
-		L[_0] |= 0x80000000L;
-	}
-
- int
-#ifdef KR_headers
-strtorxL(s, sp, rounding, L) CONST char *s; char **sp; int rounding; void *L;
-#else
-strtorxL(CONST char *s, char **sp, int rounding, void *L)
-#endif
-{
-	static CONST FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI };
-	CONST FPI *fpi;
-	FPI fpi1;
-	ULong bits[2];
-	Long expt;
-	int k;
-
-	fpi = &fpi0;
-	if (rounding != FPI_Round_near) {
-		fpi1 = fpi0;
-		fpi1.rounding = rounding;
-		fpi = &fpi1;
-		}
-	k = strtodg(s, sp, fpi, &expt, bits);
-	if (k == STRTOG_NoMemory)
-		return k;
-	ULtoxL((ULong*)L, bits, expt, k);
-	return k;
-	}
diff --git a/lib/libc/gdtoa/sum.c b/lib/libc/gdtoa/sum.c
deleted file mode 100644
index 6a987a1a4..000000000
--- a/lib/libc/gdtoa/sum.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* $NetBSD: sum.c,v 1.2 2008/03/21 23:13:48 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- Bigint *
-#ifdef KR_headers
-sum(a, b) Bigint *a; Bigint *b;
-#else
-sum(Bigint *a, Bigint *b)
-#endif
-{
-	Bigint *c;
-	ULong carry, *xc, *xa, *xb, *xe, y;
-#ifdef Pack_32
-	ULong z;
-#endif
-
-	if (a->wds < b->wds) {
-		c = b; b = a; a = c;
-		}
-	c = Balloc(a->k);
-	if (c == NULL)
-		return NULL;
-	c->wds = a->wds;
-	carry = 0;
-	xa = a->x;
-	xb = b->x;
-	xc = c->x;
-	xe = xc + b->wds;
-#ifdef Pack_32
-	do {
-		y = (*xa & 0xffff) + (*xb & 0xffff) + carry;
-		carry = (y & 0x10000) >> 16;
-		z = (*xa++ >> 16) + (*xb++ >> 16) + carry;
-		carry = (z & 0x10000) >> 16;
-		Storeinc(xc, z, y);
-		}
-		while(xc < xe);
-	xe += a->wds - b->wds;
-	while(xc < xe) {
-		y = (*xa & 0xffff) + carry;
-		carry = (y & 0x10000) >> 16;
-		z = (*xa++ >> 16) + carry;
-		carry = (z & 0x10000) >> 16;
-		Storeinc(xc, z, y);
-		}
-#else
-	do {
-		y = *xa++ + *xb++ + carry;
-		carry = (y & 0x10000) >> 16;
-		*xc++ = y & 0xffff;
-		}
-		while(xc < xe);
-	xe += a->wds - b->wds;
-	while(xc < xe) {
-		y = *xa++ + carry;
-		carry = (y & 0x10000) >> 16;
-		*xc++ = y & 0xffff;
-		}
-#endif
-	if (carry) {
-		if (c->wds == c->maxwds) {
-			b = Balloc(c->k + 1);
-			if (b == NULL)
-				return NULL;
-			Bcopy(b, c);
-			Bfree(c);
-			c = b;
-			}
-		c->x[c->wds++] = 1;
-		}
-	return c;
-	}
diff --git a/lib/libc/gdtoa/test/Q.ou0 b/lib/libc/gdtoa/test/Q.ou0
deleted file mode 100644
index 66c7e9b0b..000000000
--- a/lib/libc/gdtoa/test/Q.ou0
+++ /dev/null
@@ -1,1180 +0,0 @@
-
-Input: 1.23
-
-strtoQ consumes 4 bytes and returns 17
-with bits = #3fff3ae1 47ae147a e147ae14 7ae147ae
-g_Qfmt(0) gives 4 bytes: "1.23"
-
-strtoIQ returns 17, consuming 4 bytes.
-fI[0] = #3fff3ae1 47ae147a e147ae14 7ae147ae
-fI[1] = #3fff3ae1 47ae147a e147ae14 7ae147af
-fI[0] == strtod
-
-
-Input: 1.23e+20
-
-strtoQ consumes 8 bytes and returns 1
-with bits = #4041aabd f2145b43 0 0
-g_Qfmt(0) gives 8 bytes: "1.23e+20"
-
-strtoIQ returns 1, consuming 8 bytes.
-fI[0] == fI[1] = #4041aabd f2145b43 0 0
-
-
-Input: 1.23e-20
-
-strtoQ consumes 8 bytes and returns 17
-with bits = #3fbcd0ae 4cf76753 9e4cbca ad934841
-g_Qfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIQ returns 17, consuming 8 bytes.
-fI[0] = #3fbcd0ae 4cf76753 9e4cbca ad934841
-fI[1] = #3fbcd0ae 4cf76753 9e4cbca ad934842
-fI[0] == strtod
-
-
-Input: 1.23456789
-
-strtoQ consumes 10 bytes and returns 17
-with bits = #3fff3c0c a4283de1 b7eb6945 1304948f
-g_Qfmt(0) gives 10 bytes: "1.23456789"
-
-strtoIQ returns 17, consuming 10 bytes.
-fI[0] = #3fff3c0c a4283de1 b7eb6945 1304948f
-fI[1] = #3fff3c0c a4283de1 b7eb6945 13049490
-fI[0] == strtod
-
-
-Input: 1.23456589e+20
-
-strtoQ consumes 14 bytes and returns 1
-with bits = #4041ac53 7a660b99 74000000 0
-g_Qfmt(0) gives 14 bytes: "1.23456589e+20"
-
-strtoIQ returns 1, consuming 14 bytes.
-fI[0] == fI[1] = #4041ac53 7a660b99 74000000 0
-
-
-Input: 1.23e+30
-
-strtoQ consumes 8 bytes and returns 1
-with bits = #4062f0cb 4e8fb79 4945600 0
-g_Qfmt(0) gives 8 bytes: "1.23e+30"
-
-strtoIQ returns 1, consuming 8 bytes.
-fI[0] == fI[1] = #4062f0cb 4e8fb79 4945600 0
-
-
-Input: 1.23e-30
-
-strtoQ consumes 8 bytes and returns 17
-with bits = #3f9b8f28 66f5010a a9d63f9e d7e8ba14
-g_Qfmt(0) gives 8 bytes: "1.23e-30"
-
-strtoIQ returns 17, consuming 8 bytes.
-fI[0] = #3f9b8f28 66f5010a a9d63f9e d7e8ba14
-fI[1] = #3f9b8f28 66f5010a a9d63f9e d7e8ba15
-fI[0] == strtod
-
-
-Input: 1.23456789e-20
-
-strtoQ consumes 14 bytes and returns 33
-with bits = #3fbcd268 1471e7ad a6a4a029 d86c1fa2
-g_Qfmt(0) gives 14 bytes: "1.23456789e-20"
-
-strtoIQ returns 33, consuming 14 bytes.
-fI[0] = #3fbcd268 1471e7ad a6a4a029 d86c1fa1
-fI[1] = #3fbcd268 1471e7ad a6a4a029 d86c1fa2
-fI[1] == strtod
-
-
-Input: 1.23456789e-30
-
-strtoQ consumes 14 bytes and returns 17
-with bits = #3f9b90a3 e33bbd99 51f85855 5a6b19d4
-g_Qfmt(0) gives 14 bytes: "1.23456789e-30"
-
-strtoIQ returns 17, consuming 14 bytes.
-fI[0] = #3f9b90a3 e33bbd99 51f85855 5a6b19d4
-fI[1] = #3f9b90a3 e33bbd99 51f85855 5a6b19d5
-fI[0] == strtod
-
-
-Input: 1.234567890123456789
-
-strtoQ consumes 20 bytes and returns 17
-with bits = #3fff3c0c a428c59f b71a4194 68dd175b
-g_Qfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIQ returns 17, consuming 20 bytes.
-fI[0] = #3fff3c0c a428c59f b71a4194 68dd175b
-fI[1] = #3fff3c0c a428c59f b71a4194 68dd175c
-fI[0] == strtod
-
-
-Input: 1.23456789012345678901234567890123456789
-
-strtoQ consumes 40 bytes and returns 17
-with bits = #3fff3c0c a428c59f b71a7be1 6b6b6d5b
-g_Qfmt(0) gives 36 bytes: "1.2345678901234567890123456789012346"
-
-strtoIQ returns 17, consuming 40 bytes.
-fI[0] = #3fff3c0c a428c59f b71a7be1 6b6b6d5b
-fI[1] = #3fff3c0c a428c59f b71a7be1 6b6b6d5c
-fI[0] == strtod
-
-
-Input: 1.23e306
-
-strtoQ consumes 8 bytes and returns 33
-with bits = #43f7c067 6cd1c61f 4daac5f1 e9fa3b55
-g_Qfmt(0) gives 9 bytes: "1.23e+306"
-
-strtoIQ returns 33, consuming 8 bytes.
-fI[0] = #43f7c067 6cd1c61f 4daac5f1 e9fa3b54
-fI[1] = #43f7c067 6cd1c61f 4daac5f1 e9fa3b55
-fI[1] == strtod
-
-
-Input: 1.23e-306
-
-strtoQ consumes 9 bytes and returns 17
-with bits = #3c06ba3b 85da396e 7e496ab7 d233c3dd
-g_Qfmt(0) gives 9 bytes: "1.23e-306"
-
-strtoIQ returns 17, consuming 9 bytes.
-fI[0] = #3c06ba3b 85da396e 7e496ab7 d233c3dd
-fI[1] = #3c06ba3b 85da396e 7e496ab7 d233c3de
-fI[0] == strtod
-
-
-Input: 1.23e-320
-
-strtoQ consumes 9 bytes and returns 33
-with bits = #3bd83731 86e30898 7e33b2e8 355f847b
-g_Qfmt(0) gives 9 bytes: "1.23e-320"
-
-strtoIQ returns 33, consuming 9 bytes.
-fI[0] = #3bd83731 86e30898 7e33b2e8 355f847a
-fI[1] = #3bd83731 86e30898 7e33b2e8 355f847b
-fI[1] == strtod
-
-
-Input: 1.23e-20
-
-strtoQ consumes 8 bytes and returns 17
-with bits = #3fbcd0ae 4cf76753 9e4cbca ad934841
-g_Qfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIQ returns 17, consuming 8 bytes.
-fI[0] = #3fbcd0ae 4cf76753 9e4cbca ad934841
-fI[1] = #3fbcd0ae 4cf76753 9e4cbca ad934842
-fI[0] == strtod
-
-
-Input: 1.23456789e307
-
-strtoQ consumes 14 bytes and returns 17
-with bits = #43fb194b 14bdaecd bcea468c 902464cf
-g_Qfmt(0) gives 15 bytes: "1.23456789e+307"
-
-strtoIQ returns 17, consuming 14 bytes.
-fI[0] = #43fb194b 14bdaecd bcea468c 902464cf
-fI[1] = #43fb194b 14bdaecd bcea468c 902464d0
-fI[0] == strtod
-
-
-Input: 1.23456589e-307
-
-strtoQ consumes 15 bytes and returns 17
-with bits = #3c036319 6bb9845f a6d234e3 39163574
-g_Qfmt(0) gives 15 bytes: "1.23456589e-307"
-
-strtoIQ returns 17, consuming 15 bytes.
-fI[0] = #3c036319 6bb9845f a6d234e3 39163574
-fI[1] = #3c036319 6bb9845f a6d234e3 39163575
-fI[0] == strtod
-
-
-Input: 1.234567890123456789
-
-strtoQ consumes 20 bytes and returns 17
-with bits = #3fff3c0c a428c59f b71a4194 68dd175b
-g_Qfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIQ returns 17, consuming 20 bytes.
-fI[0] = #3fff3c0c a428c59f b71a4194 68dd175b
-fI[1] = #3fff3c0c a428c59f b71a4194 68dd175c
-fI[0] == strtod
-
-
-Input: 1.234567890123456789e301
-
-strtoQ consumes 24 bytes and returns 33
-with bits = #43e726f5 175f5641 3017ea80 763990ef
-g_Qfmt(0) gives 25 bytes: "1.234567890123456789e+301"
-
-strtoIQ returns 33, consuming 24 bytes.
-fI[0] = #43e726f5 175f5641 3017ea80 763990ee
-fI[1] = #43e726f5 175f5641 3017ea80 763990ef
-fI[1] == strtod
-
-
-Input: 1.234567890123456789e-301
-
-strtoQ consumes 25 bytes and returns 17
-with bits = #3c1752a6 4e34ba0d 35b19b04 3222fce5
-g_Qfmt(0) gives 25 bytes: "1.234567890123456789e-301"
-
-strtoIQ returns 17, consuming 25 bytes.
-fI[0] = #3c1752a6 4e34ba0d 35b19b04 3222fce5
-fI[1] = #3c1752a6 4e34ba0d 35b19b04 3222fce6
-fI[0] == strtod
-
-
-Input: 1.234567890123456789e-321
-
-strtoQ consumes 25 bytes and returns 17
-with bits = #3bd4f3c2 3699d4db 99d1ea94 2fecd7de
-g_Qfmt(0) gives 25 bytes: "1.234567890123456789e-321"
-
-strtoIQ returns 17, consuming 25 bytes.
-fI[0] = #3bd4f3c2 3699d4db 99d1ea94 2fecd7de
-fI[1] = #3bd4f3c2 3699d4db 99d1ea94 2fecd7df
-fI[0] == strtod
-
-
-Input: 1e23
-
-strtoQ consumes 4 bytes and returns 1
-with bits = #404b52d0 2c7e14af 68000000 0
-g_Qfmt(0) gives 5 bytes: "1e+23"
-
-strtoIQ returns 1, consuming 4 bytes.
-fI[0] == fI[1] = #404b52d0 2c7e14af 68000000 0
-
-
-Input: 1e310
-
-strtoQ consumes 5 bytes and returns 33
-with bits = #4404bd03 c8140697 9e9ff00e fefd4cbd
-g_Qfmt(0) gives 6 bytes: "1e+310"
-
-strtoIQ returns 33, consuming 5 bytes.
-fI[0] = #4404bd03 c8140697 9e9ff00e fefd4cbc
-fI[1] = #4404bd03 c8140697 9e9ff00e fefd4cbd
-fI[1] == strtod
-
-
-Input: 9.0259718793241475e-277
-
-strtoQ consumes 23 bytes and returns 17
-with bits = #3c69ffff ffffffff f9ed5779 ac118fe1
-g_Qfmt(0) gives 23 bytes: "9.0259718793241475e-277"
-
-strtoIQ returns 17, consuming 23 bytes.
-fI[0] = #3c69ffff ffffffff f9ed5779 ac118fe1
-fI[1] = #3c69ffff ffffffff f9ed5779 ac118fe2
-fI[0] == strtod
-
-
-Input: 9.025971879324147880346310405869e-277
-
-strtoQ consumes 37 bytes and returns 33
-with bits = #3c6a0000 0 0 9a
-g_Qfmt(0) gives 37 bytes: "9.025971879324147880346310405869e-277"
-
-strtoIQ returns 33, consuming 37 bytes.
-fI[0] = #3c6a0000 0 0 99
-fI[1] = #3c6a0000 0 0 9a
-fI[1] == strtod
-
-
-Input: 9.025971879324147880346310405868e-277
-
-strtoQ consumes 37 bytes and returns 17
-with bits = #3c69ffff ffffffff ffffffff fffffcb5
-g_Qfmt(0) gives 37 bytes: "9.025971879324147880346310405868e-277"
-
-strtoIQ returns 17, consuming 37 bytes.
-fI[0] = #3c69ffff ffffffff ffffffff fffffcb5
-fI[1] = #3c69ffff ffffffff ffffffff fffffcb6
-fI[0] == strtod
-
-
-Input: 2.2250738585072014e-308
-
-strtoQ consumes 23 bytes and returns 33
-with bits = #3c010000 0 8c304c cf867de0
-g_Qfmt(0) gives 23 bytes: "2.2250738585072014e-308"
-
-strtoIQ returns 33, consuming 23 bytes.
-fI[0] = #3c010000 0 8c304c cf867ddf
-fI[1] = #3c010000 0 8c304c cf867de0
-fI[1] == strtod
-
-
-Input: 2.2250738585072013e-308
-
-strtoQ consumes 23 bytes and returns 33
-with bits = #3c00ffff ffffffff fa9e4c4f 4c1e8a10
-g_Qfmt(0) gives 23 bytes: "2.2250738585072013e-308"
-
-strtoIQ returns 33, consuming 23 bytes.
-fI[0] = #3c00ffff ffffffff fa9e4c4f 4c1e8a0f
-fI[1] = #3c00ffff ffffffff fa9e4c4f 4c1e8a10
-fI[1] == strtod
-
-Rounding mode for strtor... changed from 1 (nearest) to 0 (toward zero)
-
-Input: 1.1
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff1999 99999999 99999999 99999999
-g_Qfmt(0) gives 36 bytes: "1.0999999999999999999999999999999999"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff1999 99999999 99999999 99999999
-fI[1] = #3fff1999 99999999 99999999 9999999a
-fI[0] == strtod
-
-
-Input: -1.1
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff1999 99999999 99999999 99999999
-g_Qfmt(0) gives 37 bytes: "-1.0999999999999999999999999999999999"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff1999 99999999 99999999 9999999a
-fI[1] = #bfff1999 99999999 99999999 99999999
-fI[1] == strtod
-
-
-Input: 1.2
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff3333 33333333 33333333 33333333
-g_Qfmt(0) gives 3 bytes: "1.2"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff3333 33333333 33333333 33333333
-fI[1] = #3fff3333 33333333 33333333 33333334
-fI[0] == strtod
-
-
-Input: -1.2
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff3333 33333333 33333333 33333333
-g_Qfmt(0) gives 4 bytes: "-1.2"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff3333 33333333 33333333 33333334
-fI[1] = #bfff3333 33333333 33333333 33333333
-fI[1] == strtod
-
-
-Input: 1.3
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff4ccc cccccccc cccccccc cccccccc
-g_Qfmt(0) gives 36 bytes: "1.2999999999999999999999999999999998"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff4ccc cccccccc cccccccc cccccccc
-fI[1] = #3fff4ccc cccccccc cccccccc cccccccd
-fI[0] == strtod
-
-
-Input: -1.3
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff4ccc cccccccc cccccccc cccccccc
-g_Qfmt(0) gives 37 bytes: "-1.2999999999999999999999999999999998"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff4ccc cccccccc cccccccc cccccccd
-fI[1] = #bfff4ccc cccccccc cccccccc cccccccc
-fI[1] == strtod
-
-
-Input: 1.4
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff6666 66666666 66666666 66666666
-g_Qfmt(0) gives 3 bytes: "1.4"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff6666 66666666 66666666 66666666
-fI[1] = #3fff6666 66666666 66666666 66666667
-fI[0] == strtod
-
-
-Input: -1.4
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff6666 66666666 66666666 66666666
-g_Qfmt(0) gives 4 bytes: "-1.4"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff6666 66666666 66666666 66666667
-fI[1] = #bfff6666 66666666 66666666 66666666
-fI[1] == strtod
-
-
-Input: 1.5
-
-strtoQ consumes 3 bytes and returns 1
-with bits = #3fff8000 0 0 0
-g_Qfmt(0) gives 3 bytes: "1.5"
-
-strtoIQ returns 1, consuming 3 bytes.
-fI[0] == fI[1] = #3fff8000 0 0 0
-
-
-Input: -1.5
-
-strtoQ consumes 4 bytes and returns 9
-with bits = #bfff8000 0 0 0
-g_Qfmt(0) gives 4 bytes: "-1.5"
-
-strtoIQ returns 9, consuming 4 bytes.
-fI[0] == fI[1] = #bfff8000 0 0 0
-
-
-Input: 1.6
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff9999 99999999 99999999 99999999
-g_Qfmt(0) gives 36 bytes: "1.5999999999999999999999999999999999"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff9999 99999999 99999999 99999999
-fI[1] = #3fff9999 99999999 99999999 9999999a
-fI[0] == strtod
-
-
-Input: -1.6
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff9999 99999999 99999999 99999999
-g_Qfmt(0) gives 37 bytes: "-1.5999999999999999999999999999999999"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff9999 99999999 99999999 9999999a
-fI[1] = #bfff9999 99999999 99999999 99999999
-fI[1] == strtod
-
-
-Input: 1.7
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffb333 33333333 33333333 33333333
-g_Qfmt(0) gives 3 bytes: "1.7"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffb333 33333333 33333333 33333333
-fI[1] = #3fffb333 33333333 33333333 33333334
-fI[0] == strtod
-
-
-Input: -1.7
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffb333 33333333 33333333 33333333
-g_Qfmt(0) gives 4 bytes: "-1.7"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffb333 33333333 33333333 33333334
-fI[1] = #bfffb333 33333333 33333333 33333333
-fI[1] == strtod
-
-
-Input: 1.8
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffcccc cccccccc cccccccc cccccccc
-g_Qfmt(0) gives 36 bytes: "1.7999999999999999999999999999999998"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fffcccc cccccccc cccccccc cccccccc
-fI[1] = #3fffcccc cccccccc cccccccc cccccccd
-fI[0] == strtod
-
-
-Input: -1.8
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffcccc cccccccc cccccccc cccccccc
-g_Qfmt(0) gives 37 bytes: "-1.7999999999999999999999999999999998"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfffcccc cccccccc cccccccc cccccccd
-fI[1] = #bfffcccc cccccccc cccccccc cccccccc
-fI[1] == strtod
-
-
-Input: 1.9
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffe666 66666666 66666666 66666666
-g_Qfmt(0) gives 3 bytes: "1.9"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffe666 66666666 66666666 66666666
-fI[1] = #3fffe666 66666666 66666666 66666667
-fI[0] == strtod
-
-
-Input: -1.9
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffe666 66666666 66666666 66666666
-g_Qfmt(0) gives 4 bytes: "-1.9"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffe666 66666666 66666666 66666667
-fI[1] = #bfffe666 66666666 66666666 66666666
-fI[1] == strtod
-
-Rounding mode for strtor... changed from 0 (toward zero) to 1 (nearest)
-
-Input: 1.1
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff1999 99999999 99999999 9999999a
-g_Qfmt(0) gives 3 bytes: "1.1"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff1999 99999999 99999999 99999999
-fI[1] = #3fff1999 99999999 99999999 9999999a
-fI[1] == strtod
-
-
-Input: -1.1
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff1999 99999999 99999999 9999999a
-g_Qfmt(0) gives 4 bytes: "-1.1"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff1999 99999999 99999999 9999999a
-fI[1] = #bfff1999 99999999 99999999 99999999
-fI[0] == strtod
-
-
-Input: 1.2
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff3333 33333333 33333333 33333333
-g_Qfmt(0) gives 3 bytes: "1.2"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff3333 33333333 33333333 33333333
-fI[1] = #3fff3333 33333333 33333333 33333334
-fI[0] == strtod
-
-
-Input: -1.2
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff3333 33333333 33333333 33333333
-g_Qfmt(0) gives 4 bytes: "-1.2"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff3333 33333333 33333333 33333334
-fI[1] = #bfff3333 33333333 33333333 33333333
-fI[1] == strtod
-
-
-Input: 1.3
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff4ccc cccccccc cccccccc cccccccd
-g_Qfmt(0) gives 3 bytes: "1.3"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff4ccc cccccccc cccccccc cccccccc
-fI[1] = #3fff4ccc cccccccc cccccccc cccccccd
-fI[1] == strtod
-
-
-Input: -1.3
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff4ccc cccccccc cccccccc cccccccd
-g_Qfmt(0) gives 4 bytes: "-1.3"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff4ccc cccccccc cccccccc cccccccd
-fI[1] = #bfff4ccc cccccccc cccccccc cccccccc
-fI[0] == strtod
-
-
-Input: 1.4
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff6666 66666666 66666666 66666666
-g_Qfmt(0) gives 3 bytes: "1.4"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff6666 66666666 66666666 66666666
-fI[1] = #3fff6666 66666666 66666666 66666667
-fI[0] == strtod
-
-
-Input: -1.4
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff6666 66666666 66666666 66666666
-g_Qfmt(0) gives 4 bytes: "-1.4"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff6666 66666666 66666666 66666667
-fI[1] = #bfff6666 66666666 66666666 66666666
-fI[1] == strtod
-
-
-Input: 1.5
-
-strtoQ consumes 3 bytes and returns 1
-with bits = #3fff8000 0 0 0
-g_Qfmt(0) gives 3 bytes: "1.5"
-
-strtoIQ returns 1, consuming 3 bytes.
-fI[0] == fI[1] = #3fff8000 0 0 0
-
-
-Input: -1.5
-
-strtoQ consumes 4 bytes and returns 9
-with bits = #bfff8000 0 0 0
-g_Qfmt(0) gives 4 bytes: "-1.5"
-
-strtoIQ returns 9, consuming 4 bytes.
-fI[0] == fI[1] = #bfff8000 0 0 0
-
-
-Input: 1.6
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff9999 99999999 99999999 9999999a
-g_Qfmt(0) gives 3 bytes: "1.6"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff9999 99999999 99999999 99999999
-fI[1] = #3fff9999 99999999 99999999 9999999a
-fI[1] == strtod
-
-
-Input: -1.6
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff9999 99999999 99999999 9999999a
-g_Qfmt(0) gives 4 bytes: "-1.6"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff9999 99999999 99999999 9999999a
-fI[1] = #bfff9999 99999999 99999999 99999999
-fI[0] == strtod
-
-
-Input: 1.7
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffb333 33333333 33333333 33333333
-g_Qfmt(0) gives 3 bytes: "1.7"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffb333 33333333 33333333 33333333
-fI[1] = #3fffb333 33333333 33333333 33333334
-fI[0] == strtod
-
-
-Input: -1.7
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffb333 33333333 33333333 33333333
-g_Qfmt(0) gives 4 bytes: "-1.7"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffb333 33333333 33333333 33333334
-fI[1] = #bfffb333 33333333 33333333 33333333
-fI[1] == strtod
-
-
-Input: 1.8
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fffcccc cccccccc cccccccc cccccccd
-g_Qfmt(0) gives 3 bytes: "1.8"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fffcccc cccccccc cccccccc cccccccc
-fI[1] = #3fffcccc cccccccc cccccccc cccccccd
-fI[1] == strtod
-
-
-Input: -1.8
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfffcccc cccccccc cccccccc cccccccd
-g_Qfmt(0) gives 4 bytes: "-1.8"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfffcccc cccccccc cccccccc cccccccd
-fI[1] = #bfffcccc cccccccc cccccccc cccccccc
-fI[0] == strtod
-
-
-Input: 1.9
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffe666 66666666 66666666 66666666
-g_Qfmt(0) gives 3 bytes: "1.9"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffe666 66666666 66666666 66666666
-fI[1] = #3fffe666 66666666 66666666 66666667
-fI[0] == strtod
-
-
-Input: -1.9
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffe666 66666666 66666666 66666666
-g_Qfmt(0) gives 4 bytes: "-1.9"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffe666 66666666 66666666 66666667
-fI[1] = #bfffe666 66666666 66666666 66666666
-fI[1] == strtod
-
-Rounding mode for strtor... changed from 1 (nearest) to 2 (toward +Infinity)
-
-Input: 1.1
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff1999 99999999 99999999 9999999a
-g_Qfmt(0) gives 3 bytes: "1.1"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff1999 99999999 99999999 99999999
-fI[1] = #3fff1999 99999999 99999999 9999999a
-fI[1] == strtod
-
-
-Input: -1.1
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff1999 99999999 99999999 99999999
-g_Qfmt(0) gives 37 bytes: "-1.0999999999999999999999999999999999"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff1999 99999999 99999999 9999999a
-fI[1] = #bfff1999 99999999 99999999 99999999
-fI[1] == strtod
-
-
-Input: 1.2
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff3333 33333333 33333333 33333334
-g_Qfmt(0) gives 36 bytes: "1.2000000000000000000000000000000002"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff3333 33333333 33333333 33333333
-fI[1] = #3fff3333 33333333 33333333 33333334
-fI[1] == strtod
-
-
-Input: -1.2
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff3333 33333333 33333333 33333333
-g_Qfmt(0) gives 4 bytes: "-1.2"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff3333 33333333 33333333 33333334
-fI[1] = #bfff3333 33333333 33333333 33333333
-fI[1] == strtod
-
-
-Input: 1.3
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff4ccc cccccccc cccccccc cccccccd
-g_Qfmt(0) gives 3 bytes: "1.3"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff4ccc cccccccc cccccccc cccccccc
-fI[1] = #3fff4ccc cccccccc cccccccc cccccccd
-fI[1] == strtod
-
-
-Input: -1.3
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff4ccc cccccccc cccccccc cccccccc
-g_Qfmt(0) gives 37 bytes: "-1.2999999999999999999999999999999998"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff4ccc cccccccc cccccccc cccccccd
-fI[1] = #bfff4ccc cccccccc cccccccc cccccccc
-fI[1] == strtod
-
-
-Input: 1.4
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff6666 66666666 66666666 66666667
-g_Qfmt(0) gives 36 bytes: "1.4000000000000000000000000000000001"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff6666 66666666 66666666 66666666
-fI[1] = #3fff6666 66666666 66666666 66666667
-fI[1] == strtod
-
-
-Input: -1.4
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff6666 66666666 66666666 66666666
-g_Qfmt(0) gives 4 bytes: "-1.4"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff6666 66666666 66666666 66666667
-fI[1] = #bfff6666 66666666 66666666 66666666
-fI[1] == strtod
-
-
-Input: 1.5
-
-strtoQ consumes 3 bytes and returns 1
-with bits = #3fff8000 0 0 0
-g_Qfmt(0) gives 3 bytes: "1.5"
-
-strtoIQ returns 1, consuming 3 bytes.
-fI[0] == fI[1] = #3fff8000 0 0 0
-
-
-Input: -1.5
-
-strtoQ consumes 4 bytes and returns 9
-with bits = #bfff8000 0 0 0
-g_Qfmt(0) gives 4 bytes: "-1.5"
-
-strtoIQ returns 9, consuming 4 bytes.
-fI[0] == fI[1] = #bfff8000 0 0 0
-
-
-Input: 1.6
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff9999 99999999 99999999 9999999a
-g_Qfmt(0) gives 3 bytes: "1.6"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff9999 99999999 99999999 99999999
-fI[1] = #3fff9999 99999999 99999999 9999999a
-fI[1] == strtod
-
-
-Input: -1.6
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff9999 99999999 99999999 99999999
-g_Qfmt(0) gives 37 bytes: "-1.5999999999999999999999999999999999"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff9999 99999999 99999999 9999999a
-fI[1] = #bfff9999 99999999 99999999 99999999
-fI[1] == strtod
-
-
-Input: 1.7
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fffb333 33333333 33333333 33333334
-g_Qfmt(0) gives 36 bytes: "1.7000000000000000000000000000000002"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffb333 33333333 33333333 33333333
-fI[1] = #3fffb333 33333333 33333333 33333334
-fI[1] == strtod
-
-
-Input: -1.7
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffb333 33333333 33333333 33333333
-g_Qfmt(0) gives 4 bytes: "-1.7"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffb333 33333333 33333333 33333334
-fI[1] = #bfffb333 33333333 33333333 33333333
-fI[1] == strtod
-
-
-Input: 1.8
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fffcccc cccccccc cccccccc cccccccd
-g_Qfmt(0) gives 3 bytes: "1.8"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fffcccc cccccccc cccccccc cccccccc
-fI[1] = #3fffcccc cccccccc cccccccc cccccccd
-fI[1] == strtod
-
-
-Input: -1.8
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffcccc cccccccc cccccccc cccccccc
-g_Qfmt(0) gives 37 bytes: "-1.7999999999999999999999999999999998"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfffcccc cccccccc cccccccc cccccccd
-fI[1] = #bfffcccc cccccccc cccccccc cccccccc
-fI[1] == strtod
-
-
-Input: 1.9
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fffe666 66666666 66666666 66666667
-g_Qfmt(0) gives 36 bytes: "1.9000000000000000000000000000000001"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffe666 66666666 66666666 66666666
-fI[1] = #3fffe666 66666666 66666666 66666667
-fI[1] == strtod
-
-
-Input: -1.9
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffe666 66666666 66666666 66666666
-g_Qfmt(0) gives 4 bytes: "-1.9"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffe666 66666666 66666666 66666667
-fI[1] = #bfffe666 66666666 66666666 66666666
-fI[1] == strtod
-
-Rounding mode for strtor... changed from 2 (toward +Infinity) to 3 (toward -Infinity)
-
-Input: 1.1
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff1999 99999999 99999999 99999999
-g_Qfmt(0) gives 36 bytes: "1.0999999999999999999999999999999999"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff1999 99999999 99999999 99999999
-fI[1] = #3fff1999 99999999 99999999 9999999a
-fI[0] == strtod
-
-
-Input: -1.1
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff1999 99999999 99999999 9999999a
-g_Qfmt(0) gives 4 bytes: "-1.1"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff1999 99999999 99999999 9999999a
-fI[1] = #bfff1999 99999999 99999999 99999999
-fI[0] == strtod
-
-
-Input: 1.2
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff3333 33333333 33333333 33333333
-g_Qfmt(0) gives 3 bytes: "1.2"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff3333 33333333 33333333 33333333
-fI[1] = #3fff3333 33333333 33333333 33333334
-fI[0] == strtod
-
-
-Input: -1.2
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff3333 33333333 33333333 33333334
-g_Qfmt(0) gives 37 bytes: "-1.2000000000000000000000000000000002"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff3333 33333333 33333333 33333334
-fI[1] = #bfff3333 33333333 33333333 33333333
-fI[0] == strtod
-
-
-Input: 1.3
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff4ccc cccccccc cccccccc cccccccc
-g_Qfmt(0) gives 36 bytes: "1.2999999999999999999999999999999998"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff4ccc cccccccc cccccccc cccccccc
-fI[1] = #3fff4ccc cccccccc cccccccc cccccccd
-fI[0] == strtod
-
-
-Input: -1.3
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff4ccc cccccccc cccccccc cccccccd
-g_Qfmt(0) gives 4 bytes: "-1.3"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff4ccc cccccccc cccccccc cccccccd
-fI[1] = #bfff4ccc cccccccc cccccccc cccccccc
-fI[0] == strtod
-
-
-Input: 1.4
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff6666 66666666 66666666 66666666
-g_Qfmt(0) gives 3 bytes: "1.4"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff6666 66666666 66666666 66666666
-fI[1] = #3fff6666 66666666 66666666 66666667
-fI[0] == strtod
-
-
-Input: -1.4
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff6666 66666666 66666666 66666667
-g_Qfmt(0) gives 37 bytes: "-1.4000000000000000000000000000000001"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff6666 66666666 66666666 66666667
-fI[1] = #bfff6666 66666666 66666666 66666666
-fI[0] == strtod
-
-
-Input: 1.5
-
-strtoQ consumes 3 bytes and returns 1
-with bits = #3fff8000 0 0 0
-g_Qfmt(0) gives 3 bytes: "1.5"
-
-strtoIQ returns 1, consuming 3 bytes.
-fI[0] == fI[1] = #3fff8000 0 0 0
-
-
-Input: -1.5
-
-strtoQ consumes 4 bytes and returns 9
-with bits = #bfff8000 0 0 0
-g_Qfmt(0) gives 4 bytes: "-1.5"
-
-strtoIQ returns 9, consuming 4 bytes.
-fI[0] == fI[1] = #bfff8000 0 0 0
-
-
-Input: 1.6
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff9999 99999999 99999999 99999999
-g_Qfmt(0) gives 36 bytes: "1.5999999999999999999999999999999999"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff9999 99999999 99999999 99999999
-fI[1] = #3fff9999 99999999 99999999 9999999a
-fI[0] == strtod
-
-
-Input: -1.6
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff9999 99999999 99999999 9999999a
-g_Qfmt(0) gives 4 bytes: "-1.6"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff9999 99999999 99999999 9999999a
-fI[1] = #bfff9999 99999999 99999999 99999999
-fI[0] == strtod
-
-
-Input: 1.7
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffb333 33333333 33333333 33333333
-g_Qfmt(0) gives 3 bytes: "1.7"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffb333 33333333 33333333 33333333
-fI[1] = #3fffb333 33333333 33333333 33333334
-fI[0] == strtod
-
-
-Input: -1.7
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfffb333 33333333 33333333 33333334
-g_Qfmt(0) gives 37 bytes: "-1.7000000000000000000000000000000002"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffb333 33333333 33333333 33333334
-fI[1] = #bfffb333 33333333 33333333 33333333
-fI[0] == strtod
-
-
-Input: 1.8
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffcccc cccccccc cccccccc cccccccc
-g_Qfmt(0) gives 36 bytes: "1.7999999999999999999999999999999998"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fffcccc cccccccc cccccccc cccccccc
-fI[1] = #3fffcccc cccccccc cccccccc cccccccd
-fI[0] == strtod
-
-
-Input: -1.8
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfffcccc cccccccc cccccccc cccccccd
-g_Qfmt(0) gives 4 bytes: "-1.8"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfffcccc cccccccc cccccccc cccccccd
-fI[1] = #bfffcccc cccccccc cccccccc cccccccc
-fI[0] == strtod
-
-
-Input: 1.9
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffe666 66666666 66666666 66666666
-g_Qfmt(0) gives 3 bytes: "1.9"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffe666 66666666 66666666 66666666
-fI[1] = #3fffe666 66666666 66666666 66666667
-fI[0] == strtod
-
-
-Input: -1.9
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfffe666 66666666 66666666 66666667
-g_Qfmt(0) gives 37 bytes: "-1.9000000000000000000000000000000001"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffe666 66666666 66666666 66666667
-fI[1] = #bfffe666 66666666 66666666 66666666
-fI[0] == strtod
-
diff --git a/lib/libc/gdtoa/test/Q.ou1 b/lib/libc/gdtoa/test/Q.ou1
deleted file mode 100644
index cb2a23f61..000000000
--- a/lib/libc/gdtoa/test/Q.ou1
+++ /dev/null
@@ -1,1468 +0,0 @@
-
-Input: 1.23
-
-strtoQ consumes 4 bytes and returns 17
-with bits = #3fff3ae1 47ae147a e147ae14 7ae147ae
-printf("%.35Lg") gives 1.23
-g_Qfmt(0) gives 4 bytes: "1.23"
-
-strtoIQ returns 17, consuming 4 bytes.
-fI[0] = #3fff3ae1 47ae147a e147ae14 7ae147ae
-= 1.23
-fI[1] = #3fff3ae1 47ae147a e147ae14 7ae147af
-= 1.2300000000000000000000000000000002
-fI[0] == strtod
-
-
-Input: 1.23e+20
-
-strtoQ consumes 8 bytes and returns 1
-with bits = #4041aabd f2145b43 0 0
-printf("%.35Lg") gives 123000000000000000000
-g_Qfmt(0) gives 8 bytes: "1.23e+20"
-
-strtoIQ returns 1, consuming 8 bytes.
-fI[0] == fI[1] = #4041aabd f2145b43 0 0
-= 123000000000000000000
-
-
-Input: 1.23e-20
-
-strtoQ consumes 8 bytes and returns 17
-with bits = #3fbcd0ae 4cf76753 9e4cbca ad934841
-printf("%.35Lg") gives 1.2299999999999999999999999999999999e-20
-g_Qfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIQ returns 17, consuming 8 bytes.
-fI[0] = #3fbcd0ae 4cf76753 9e4cbca ad934841
-= 1.2299999999999999999999999999999999e-20
-fI[1] = #3fbcd0ae 4cf76753 9e4cbca ad934842
-= 1.2300000000000000000000000000000001e-20
-fI[0] == strtod
-
-
-Input: 1.23456789
-
-strtoQ consumes 10 bytes and returns 17
-with bits = #3fff3c0c a4283de1 b7eb6945 1304948f
-printf("%.35Lg") gives 1.2345678899999999999999999999999999
-g_Qfmt(0) gives 10 bytes: "1.23456789"
-
-strtoIQ returns 17, consuming 10 bytes.
-fI[0] = #3fff3c0c a4283de1 b7eb6945 1304948f
-= 1.2345678899999999999999999999999999
-fI[1] = #3fff3c0c a4283de1 b7eb6945 13049490
-= 1.2345678900000000000000000000000001
-fI[0] == strtod
-
-
-Input: 1.23456589e+20
-
-strtoQ consumes 14 bytes and returns 1
-with bits = #4041ac53 7a660b99 74000000 0
-printf("%.35Lg") gives 123456589000000000000
-g_Qfmt(0) gives 14 bytes: "1.23456589e+20"
-
-strtoIQ returns 1, consuming 14 bytes.
-fI[0] == fI[1] = #4041ac53 7a660b99 74000000 0
-= 123456589000000000000
-
-
-Input: 1.23e+30
-
-strtoQ consumes 8 bytes and returns 1
-with bits = #4062f0cb 4e8fb79 4945600 0
-printf("%.35Lg") gives 1230000000000000000000000000000
-g_Qfmt(0) gives 8 bytes: "1.23e+30"
-
-strtoIQ returns 1, consuming 8 bytes.
-fI[0] == fI[1] = #4062f0cb 4e8fb79 4945600 0
-= 1230000000000000000000000000000
-
-
-Input: 1.23e-30
-
-strtoQ consumes 8 bytes and returns 17
-with bits = #3f9b8f28 66f5010a a9d63f9e d7e8ba14
-printf("%.35Lg") gives 1.2299999999999999999999999999999999e-30
-g_Qfmt(0) gives 8 bytes: "1.23e-30"
-
-strtoIQ returns 17, consuming 8 bytes.
-fI[0] = #3f9b8f28 66f5010a a9d63f9e d7e8ba14
-= 1.2299999999999999999999999999999999e-30
-fI[1] = #3f9b8f28 66f5010a a9d63f9e d7e8ba15
-= 1.2300000000000000000000000000000001e-30
-fI[0] == strtod
-
-
-Input: 1.23456789e-20
-
-strtoQ consumes 14 bytes and returns 33
-with bits = #3fbcd268 1471e7ad a6a4a029 d86c1fa2
-printf("%.35Lg") gives 1.2345678900000000000000000000000001e-20
-g_Qfmt(0) gives 14 bytes: "1.23456789e-20"
-
-strtoIQ returns 33, consuming 14 bytes.
-fI[0] = #3fbcd268 1471e7ad a6a4a029 d86c1fa1
-= 1.2345678899999999999999999999999999e-20
-fI[1] = #3fbcd268 1471e7ad a6a4a029 d86c1fa2
-= 1.2345678900000000000000000000000001e-20
-fI[1] == strtod
-
-
-Input: 1.23456789e-30
-
-strtoQ consumes 14 bytes and returns 17
-with bits = #3f9b90a3 e33bbd99 51f85855 5a6b19d4
-printf("%.35Lg") gives 1.23456789e-30
-g_Qfmt(0) gives 14 bytes: "1.23456789e-30"
-
-strtoIQ returns 17, consuming 14 bytes.
-fI[0] = #3f9b90a3 e33bbd99 51f85855 5a6b19d4
-= 1.23456789e-30
-fI[1] = #3f9b90a3 e33bbd99 51f85855 5a6b19d5
-= 1.2345678900000000000000000000000001e-30
-fI[0] == strtod
-
-
-Input: 1.234567890123456789
-
-strtoQ consumes 20 bytes and returns 17
-with bits = #3fff3c0c a428c59f b71a4194 68dd175b
-printf("%.35Lg") gives 1.234567890123456789
-g_Qfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIQ returns 17, consuming 20 bytes.
-fI[0] = #3fff3c0c a428c59f b71a4194 68dd175b
-= 1.234567890123456789
-fI[1] = #3fff3c0c a428c59f b71a4194 68dd175c
-= 1.2345678901234567890000000000000002
-fI[0] == strtod
-
-
-Input: 1.23456789012345678901234567890123456789
-
-strtoQ consumes 40 bytes and returns 17
-with bits = #3fff3c0c a428c59f b71a7be1 6b6b6d5b
-printf("%.35Lg") gives 1.2345678901234567890123456789012346
-g_Qfmt(0) gives 36 bytes: "1.2345678901234567890123456789012346"
-
-strtoIQ returns 17, consuming 40 bytes.
-fI[0] = #3fff3c0c a428c59f b71a7be1 6b6b6d5b
-= 1.2345678901234567890123456789012346
-fI[1] = #3fff3c0c a428c59f b71a7be1 6b6b6d5c
-= 1.2345678901234567890123456789012347
-fI[0] == strtod
-
-
-Input: 1.23e306
-
-strtoQ consumes 8 bytes and returns 33
-with bits = #43f7c067 6cd1c61f 4daac5f1 e9fa3b55
-printf("%.35Lg") gives 1.23e+306
-g_Qfmt(0) gives 9 bytes: "1.23e+306"
-
-strtoIQ returns 33, consuming 8 bytes.
-fI[0] = #43f7c067 6cd1c61f 4daac5f1 e9fa3b54
-= 1.2299999999999999999999999999999999e+306
-fI[1] = #43f7c067 6cd1c61f 4daac5f1 e9fa3b55
-= 1.23e+306
-fI[1] == strtod
-
-
-Input: 1.23e-306
-
-strtoQ consumes 9 bytes and returns 17
-with bits = #3c06ba3b 85da396e 7e496ab7 d233c3dd
-printf("%.35Lg") gives 1.23e-306
-g_Qfmt(0) gives 9 bytes: "1.23e-306"
-
-strtoIQ returns 17, consuming 9 bytes.
-fI[0] = #3c06ba3b 85da396e 7e496ab7 d233c3dd
-= 1.23e-306
-fI[1] = #3c06ba3b 85da396e 7e496ab7 d233c3de
-= 1.2300000000000000000000000000000001e-306
-fI[0] == strtod
-
-
-Input: 1.23e-320
-
-strtoQ consumes 9 bytes and returns 33
-with bits = #3bd83731 86e30898 7e33b2e8 355f847b
-printf("%.35Lg") gives 1.2300000000000000000000000000000001e-320
-g_Qfmt(0) gives 9 bytes: "1.23e-320"
-
-strtoIQ returns 33, consuming 9 bytes.
-fI[0] = #3bd83731 86e30898 7e33b2e8 355f847a
-= 1.2299999999999999999999999999999999e-320
-fI[1] = #3bd83731 86e30898 7e33b2e8 355f847b
-= 1.2300000000000000000000000000000001e-320
-fI[1] == strtod
-
-
-Input: 1.23e-20
-
-strtoQ consumes 8 bytes and returns 17
-with bits = #3fbcd0ae 4cf76753 9e4cbca ad934841
-printf("%.35Lg") gives 1.2299999999999999999999999999999999e-20
-g_Qfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIQ returns 17, consuming 8 bytes.
-fI[0] = #3fbcd0ae 4cf76753 9e4cbca ad934841
-= 1.2299999999999999999999999999999999e-20
-fI[1] = #3fbcd0ae 4cf76753 9e4cbca ad934842
-= 1.2300000000000000000000000000000001e-20
-fI[0] == strtod
-
-
-Input: 1.23456789e307
-
-strtoQ consumes 14 bytes and returns 17
-with bits = #43fb194b 14bdaecd bcea468c 902464cf
-printf("%.35Lg") gives 1.2345678899999999999999999999999999e+307
-g_Qfmt(0) gives 15 bytes: "1.23456789e+307"
-
-strtoIQ returns 17, consuming 14 bytes.
-fI[0] = #43fb194b 14bdaecd bcea468c 902464cf
-= 1.2345678899999999999999999999999999e+307
-fI[1] = #43fb194b 14bdaecd bcea468c 902464d0
-= 1.2345678900000000000000000000000001e+307
-fI[0] == strtod
-
-
-Input: 1.23456589e-307
-
-strtoQ consumes 15 bytes and returns 17
-with bits = #3c036319 6bb9845f a6d234e3 39163574
-printf("%.35Lg") gives 1.23456589e-307
-g_Qfmt(0) gives 15 bytes: "1.23456589e-307"
-
-strtoIQ returns 17, consuming 15 bytes.
-fI[0] = #3c036319 6bb9845f a6d234e3 39163574
-= 1.23456589e-307
-fI[1] = #3c036319 6bb9845f a6d234e3 39163575
-= 1.2345658900000000000000000000000002e-307
-fI[0] == strtod
-
-
-Input: 1.234567890123456789
-
-strtoQ consumes 20 bytes and returns 17
-with bits = #3fff3c0c a428c59f b71a4194 68dd175b
-printf("%.35Lg") gives 1.234567890123456789
-g_Qfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIQ returns 17, consuming 20 bytes.
-fI[0] = #3fff3c0c a428c59f b71a4194 68dd175b
-= 1.234567890123456789
-fI[1] = #3fff3c0c a428c59f b71a4194 68dd175c
-= 1.2345678901234567890000000000000002
-fI[0] == strtod
-
-
-Input: 1.234567890123456789e301
-
-strtoQ consumes 24 bytes and returns 33
-with bits = #43e726f5 175f5641 3017ea80 763990ef
-printf("%.35Lg") gives 1.2345678901234567890000000000000001e+301
-g_Qfmt(0) gives 25 bytes: "1.234567890123456789e+301"
-
-strtoIQ returns 33, consuming 24 bytes.
-fI[0] = #43e726f5 175f5641 3017ea80 763990ee
-= 1.2345678901234567889999999999999999e+301
-fI[1] = #43e726f5 175f5641 3017ea80 763990ef
-= 1.2345678901234567890000000000000001e+301
-fI[1] == strtod
-
-
-Input: 1.234567890123456789e-301
-
-strtoQ consumes 25 bytes and returns 17
-with bits = #3c1752a6 4e34ba0d 35b19b04 3222fce5
-printf("%.35Lg") gives 1.234567890123456789e-301
-g_Qfmt(0) gives 25 bytes: "1.234567890123456789e-301"
-
-strtoIQ returns 17, consuming 25 bytes.
-fI[0] = #3c1752a6 4e34ba0d 35b19b04 3222fce5
-= 1.234567890123456789e-301
-fI[1] = #3c1752a6 4e34ba0d 35b19b04 3222fce6
-= 1.2345678901234567890000000000000002e-301
-fI[0] == strtod
-
-
-Input: 1.234567890123456789e-321
-
-strtoQ consumes 25 bytes and returns 17
-with bits = #3bd4f3c2 3699d4db 99d1ea94 2fecd7de
-printf("%.35Lg") gives 1.234567890123456789e-321
-g_Qfmt(0) gives 25 bytes: "1.234567890123456789e-321"
-
-strtoIQ returns 17, consuming 25 bytes.
-fI[0] = #3bd4f3c2 3699d4db 99d1ea94 2fecd7de
-= 1.234567890123456789e-321
-fI[1] = #3bd4f3c2 3699d4db 99d1ea94 2fecd7df
-= 1.2345678901234567890000000000000001e-321
-fI[0] == strtod
-
-
-Input: 1e23
-
-strtoQ consumes 4 bytes and returns 1
-with bits = #404b52d0 2c7e14af 68000000 0
-printf("%.35Lg") gives 100000000000000000000000
-g_Qfmt(0) gives 5 bytes: "1e+23"
-
-strtoIQ returns 1, consuming 4 bytes.
-fI[0] == fI[1] = #404b52d0 2c7e14af 68000000 0
-= 100000000000000000000000
-
-
-Input: 1e310
-
-strtoQ consumes 5 bytes and returns 33
-with bits = #4404bd03 c8140697 9e9ff00e fefd4cbd
-printf("%.35Lg") gives 1e+310
-g_Qfmt(0) gives 6 bytes: "1e+310"
-
-strtoIQ returns 33, consuming 5 bytes.
-fI[0] = #4404bd03 c8140697 9e9ff00e fefd4cbc
-= 9.9999999999999999999999999999999992e+309
-fI[1] = #4404bd03 c8140697 9e9ff00e fefd4cbd
-= 1e+310
-fI[1] == strtod
-
-
-Input: 9.0259718793241475e-277
-
-strtoQ consumes 23 bytes and returns 17
-with bits = #3c69ffff ffffffff f9ed5779 ac118fe1
-printf("%.35Lg") gives 9.0259718793241474999999999999999997e-277
-g_Qfmt(0) gives 23 bytes: "9.0259718793241475e-277"
-
-strtoIQ returns 17, consuming 23 bytes.
-fI[0] = #3c69ffff ffffffff f9ed5779 ac118fe1
-= 9.0259718793241474999999999999999997e-277
-fI[1] = #3c69ffff ffffffff f9ed5779 ac118fe2
-= 9.0259718793241475000000000000000006e-277
-fI[0] == strtod
-
-
-Input: 9.025971879324147880346310405869e-277
-
-strtoQ consumes 37 bytes and returns 33
-with bits = #3c6a0000 0 0 9a
-printf("%.35Lg") gives 9.0259718793241478803463104058690004e-277
-g_Qfmt(0) gives 37 bytes: "9.025971879324147880346310405869e-277"
-
-strtoIQ returns 33, consuming 37 bytes.
-fI[0] = #3c6a0000 0 0 99
-= 9.0259718793241478803463104058689987e-277
-fI[1] = #3c6a0000 0 0 9a
-= 9.0259718793241478803463104058690004e-277
-fI[1] == strtod
-
-
-Input: 9.025971879324147880346310405868e-277
-
-strtoQ consumes 37 bytes and returns 17
-with bits = #3c69ffff ffffffff ffffffff fffffcb5
-printf("%.35Lg") gives 9.025971879324147880346310405868e-277
-g_Qfmt(0) gives 37 bytes: "9.025971879324147880346310405868e-277"
-
-strtoIQ returns 17, consuming 37 bytes.
-fI[0] = #3c69ffff ffffffff ffffffff fffffcb5
-= 9.025971879324147880346310405868e-277
-fI[1] = #3c69ffff ffffffff ffffffff fffffcb6
-= 9.0259718793241478803463104058680009e-277
-fI[0] == strtod
-
-
-Input: 2.2250738585072014e-308
-
-strtoQ consumes 23 bytes and returns 33
-with bits = #3c010000 0 8c304c cf867de0
-printf("%.35Lg") gives 2.2250738585072014000000000000000001e-308
-g_Qfmt(0) gives 23 bytes: "2.2250738585072014e-308"
-
-strtoIQ returns 33, consuming 23 bytes.
-fI[0] = #3c010000 0 8c304c cf867ddf
-= 2.2250738585072013999999999999999997e-308
-fI[1] = #3c010000 0 8c304c cf867de0
-= 2.2250738585072014000000000000000001e-308
-fI[1] == strtod
-
-
-Input: 2.2250738585072013e-308
-
-strtoQ consumes 23 bytes and returns 33
-with bits = #3c00ffff ffffffff fa9e4c4f 4c1e8a10
-printf("%.35Lg") gives 2.2250738585072013e-308
-g_Qfmt(0) gives 23 bytes: "2.2250738585072013e-308"
-
-strtoIQ returns 33, consuming 23 bytes.
-fI[0] = #3c00ffff ffffffff fa9e4c4f 4c1e8a0f
-= 2.2250738585072012999999999999999998e-308
-fI[1] = #3c00ffff ffffffff fa9e4c4f 4c1e8a10
-= 2.2250738585072013e-308
-fI[1] == strtod
-
-Rounding mode for strtor... changed from 1 (nearest) to 0 (toward zero)
-
-Input: 1.1
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff1999 99999999 99999999 99999999
-printf("%.35Lg") gives 1.0999999999999999999999999999999999
-g_Qfmt(0) gives 36 bytes: "1.0999999999999999999999999999999999"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff1999 99999999 99999999 99999999
-= 1.0999999999999999999999999999999999
-fI[1] = #3fff1999 99999999 99999999 9999999a
-= 1.1000000000000000000000000000000001
-fI[0] == strtod
-
-
-Input: -1.1
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff1999 99999999 99999999 99999999
-printf("%.35Lg") gives -1.0999999999999999999999999999999999
-g_Qfmt(0) gives 37 bytes: "-1.0999999999999999999999999999999999"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff1999 99999999 99999999 9999999a
-= -1.1000000000000000000000000000000001
-fI[1] = #bfff1999 99999999 99999999 99999999
-= -1.0999999999999999999999999999999999
-fI[1] == strtod
-
-
-Input: 1.2
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff3333 33333333 33333333 33333333
-printf("%.35Lg") gives 1.2
-g_Qfmt(0) gives 3 bytes: "1.2"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff3333 33333333 33333333 33333333
-= 1.2
-fI[1] = #3fff3333 33333333 33333333 33333334
-= 1.2000000000000000000000000000000002
-fI[0] == strtod
-
-
-Input: -1.2
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff3333 33333333 33333333 33333333
-printf("%.35Lg") gives -1.2
-g_Qfmt(0) gives 4 bytes: "-1.2"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff3333 33333333 33333333 33333334
-= -1.2000000000000000000000000000000002
-fI[1] = #bfff3333 33333333 33333333 33333333
-= -1.2
-fI[1] == strtod
-
-
-Input: 1.3
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff4ccc cccccccc cccccccc cccccccc
-printf("%.35Lg") gives 1.2999999999999999999999999999999998
-g_Qfmt(0) gives 36 bytes: "1.2999999999999999999999999999999998"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff4ccc cccccccc cccccccc cccccccc
-= 1.2999999999999999999999999999999998
-fI[1] = #3fff4ccc cccccccc cccccccc cccccccd
-= 1.3
-fI[0] == strtod
-
-
-Input: -1.3
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff4ccc cccccccc cccccccc cccccccc
-printf("%.35Lg") gives -1.2999999999999999999999999999999998
-g_Qfmt(0) gives 37 bytes: "-1.2999999999999999999999999999999998"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff4ccc cccccccc cccccccc cccccccd
-= -1.3
-fI[1] = #bfff4ccc cccccccc cccccccc cccccccc
-= -1.2999999999999999999999999999999998
-fI[1] == strtod
-
-
-Input: 1.4
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff6666 66666666 66666666 66666666
-printf("%.35Lg") gives 1.3999999999999999999999999999999999
-g_Qfmt(0) gives 3 bytes: "1.4"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff6666 66666666 66666666 66666666
-= 1.3999999999999999999999999999999999
-fI[1] = #3fff6666 66666666 66666666 66666667
-= 1.4000000000000000000000000000000001
-fI[0] == strtod
-
-
-Input: -1.4
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff6666 66666666 66666666 66666666
-printf("%.35Lg") gives -1.3999999999999999999999999999999999
-g_Qfmt(0) gives 4 bytes: "-1.4"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff6666 66666666 66666666 66666667
-= -1.4000000000000000000000000000000001
-fI[1] = #bfff6666 66666666 66666666 66666666
-= -1.3999999999999999999999999999999999
-fI[1] == strtod
-
-
-Input: 1.5
-
-strtoQ consumes 3 bytes and returns 1
-with bits = #3fff8000 0 0 0
-printf("%.35Lg") gives 1.5
-g_Qfmt(0) gives 3 bytes: "1.5"
-
-strtoIQ returns 1, consuming 3 bytes.
-fI[0] == fI[1] = #3fff8000 0 0 0
-= 1.5
-
-
-Input: -1.5
-
-strtoQ consumes 4 bytes and returns 9
-with bits = #bfff8000 0 0 0
-printf("%.35Lg") gives -1.5
-g_Qfmt(0) gives 4 bytes: "-1.5"
-
-strtoIQ returns 9, consuming 4 bytes.
-fI[0] == fI[1] = #bfff8000 0 0 0
-= -1.5
-
-
-Input: 1.6
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff9999 99999999 99999999 99999999
-printf("%.35Lg") gives 1.5999999999999999999999999999999999
-g_Qfmt(0) gives 36 bytes: "1.5999999999999999999999999999999999"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff9999 99999999 99999999 99999999
-= 1.5999999999999999999999999999999999
-fI[1] = #3fff9999 99999999 99999999 9999999a
-= 1.6000000000000000000000000000000001
-fI[0] == strtod
-
-
-Input: -1.6
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff9999 99999999 99999999 99999999
-printf("%.35Lg") gives -1.5999999999999999999999999999999999
-g_Qfmt(0) gives 37 bytes: "-1.5999999999999999999999999999999999"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff9999 99999999 99999999 9999999a
-= -1.6000000000000000000000000000000001
-fI[1] = #bfff9999 99999999 99999999 99999999
-= -1.5999999999999999999999999999999999
-fI[1] == strtod
-
-
-Input: 1.7
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffb333 33333333 33333333 33333333
-printf("%.35Lg") gives 1.7
-g_Qfmt(0) gives 3 bytes: "1.7"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffb333 33333333 33333333 33333333
-= 1.7
-fI[1] = #3fffb333 33333333 33333333 33333334
-= 1.7000000000000000000000000000000002
-fI[0] == strtod
-
-
-Input: -1.7
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffb333 33333333 33333333 33333333
-printf("%.35Lg") gives -1.7
-g_Qfmt(0) gives 4 bytes: "-1.7"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffb333 33333333 33333333 33333334
-= -1.7000000000000000000000000000000002
-fI[1] = #bfffb333 33333333 33333333 33333333
-= -1.7
-fI[1] == strtod
-
-
-Input: 1.8
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffcccc cccccccc cccccccc cccccccc
-printf("%.35Lg") gives 1.7999999999999999999999999999999998
-g_Qfmt(0) gives 36 bytes: "1.7999999999999999999999999999999998"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fffcccc cccccccc cccccccc cccccccc
-= 1.7999999999999999999999999999999998
-fI[1] = #3fffcccc cccccccc cccccccc cccccccd
-= 1.8
-fI[0] == strtod
-
-
-Input: -1.8
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffcccc cccccccc cccccccc cccccccc
-printf("%.35Lg") gives -1.7999999999999999999999999999999998
-g_Qfmt(0) gives 37 bytes: "-1.7999999999999999999999999999999998"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfffcccc cccccccc cccccccc cccccccd
-= -1.8
-fI[1] = #bfffcccc cccccccc cccccccc cccccccc
-= -1.7999999999999999999999999999999998
-fI[1] == strtod
-
-
-Input: 1.9
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffe666 66666666 66666666 66666666
-printf("%.35Lg") gives 1.8999999999999999999999999999999999
-g_Qfmt(0) gives 3 bytes: "1.9"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffe666 66666666 66666666 66666666
-= 1.8999999999999999999999999999999999
-fI[1] = #3fffe666 66666666 66666666 66666667
-= 1.9000000000000000000000000000000001
-fI[0] == strtod
-
-
-Input: -1.9
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffe666 66666666 66666666 66666666
-printf("%.35Lg") gives -1.8999999999999999999999999999999999
-g_Qfmt(0) gives 4 bytes: "-1.9"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffe666 66666666 66666666 66666667
-= -1.9000000000000000000000000000000001
-fI[1] = #bfffe666 66666666 66666666 66666666
-= -1.8999999999999999999999999999999999
-fI[1] == strtod
-
-Rounding mode for strtor... changed from 0 (toward zero) to 1 (nearest)
-
-Input: 1.1
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff1999 99999999 99999999 9999999a
-printf("%.35Lg") gives 1.1000000000000000000000000000000001
-g_Qfmt(0) gives 3 bytes: "1.1"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff1999 99999999 99999999 99999999
-= 1.0999999999999999999999999999999999
-fI[1] = #3fff1999 99999999 99999999 9999999a
-= 1.1000000000000000000000000000000001
-fI[1] == strtod
-
-
-Input: -1.1
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff1999 99999999 99999999 9999999a
-printf("%.35Lg") gives -1.1000000000000000000000000000000001
-g_Qfmt(0) gives 4 bytes: "-1.1"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff1999 99999999 99999999 9999999a
-= -1.1000000000000000000000000000000001
-fI[1] = #bfff1999 99999999 99999999 99999999
-= -1.0999999999999999999999999999999999
-fI[0] == strtod
-
-
-Input: 1.2
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff3333 33333333 33333333 33333333
-printf("%.35Lg") gives 1.2
-g_Qfmt(0) gives 3 bytes: "1.2"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff3333 33333333 33333333 33333333
-= 1.2
-fI[1] = #3fff3333 33333333 33333333 33333334
-= 1.2000000000000000000000000000000002
-fI[0] == strtod
-
-
-Input: -1.2
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff3333 33333333 33333333 33333333
-printf("%.35Lg") gives -1.2
-g_Qfmt(0) gives 4 bytes: "-1.2"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff3333 33333333 33333333 33333334
-= -1.2000000000000000000000000000000002
-fI[1] = #bfff3333 33333333 33333333 33333333
-= -1.2
-fI[1] == strtod
-
-
-Input: 1.3
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff4ccc cccccccc cccccccc cccccccd
-printf("%.35Lg") gives 1.3
-g_Qfmt(0) gives 3 bytes: "1.3"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff4ccc cccccccc cccccccc cccccccc
-= 1.2999999999999999999999999999999998
-fI[1] = #3fff4ccc cccccccc cccccccc cccccccd
-= 1.3
-fI[1] == strtod
-
-
-Input: -1.3
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff4ccc cccccccc cccccccc cccccccd
-printf("%.35Lg") gives -1.3
-g_Qfmt(0) gives 4 bytes: "-1.3"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff4ccc cccccccc cccccccc cccccccd
-= -1.3
-fI[1] = #bfff4ccc cccccccc cccccccc cccccccc
-= -1.2999999999999999999999999999999998
-fI[0] == strtod
-
-
-Input: 1.4
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff6666 66666666 66666666 66666666
-printf("%.35Lg") gives 1.3999999999999999999999999999999999
-g_Qfmt(0) gives 3 bytes: "1.4"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff6666 66666666 66666666 66666666
-= 1.3999999999999999999999999999999999
-fI[1] = #3fff6666 66666666 66666666 66666667
-= 1.4000000000000000000000000000000001
-fI[0] == strtod
-
-
-Input: -1.4
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff6666 66666666 66666666 66666666
-printf("%.35Lg") gives -1.3999999999999999999999999999999999
-g_Qfmt(0) gives 4 bytes: "-1.4"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff6666 66666666 66666666 66666667
-= -1.4000000000000000000000000000000001
-fI[1] = #bfff6666 66666666 66666666 66666666
-= -1.3999999999999999999999999999999999
-fI[1] == strtod
-
-
-Input: 1.5
-
-strtoQ consumes 3 bytes and returns 1
-with bits = #3fff8000 0 0 0
-printf("%.35Lg") gives 1.5
-g_Qfmt(0) gives 3 bytes: "1.5"
-
-strtoIQ returns 1, consuming 3 bytes.
-fI[0] == fI[1] = #3fff8000 0 0 0
-= 1.5
-
-
-Input: -1.5
-
-strtoQ consumes 4 bytes and returns 9
-with bits = #bfff8000 0 0 0
-printf("%.35Lg") gives -1.5
-g_Qfmt(0) gives 4 bytes: "-1.5"
-
-strtoIQ returns 9, consuming 4 bytes.
-fI[0] == fI[1] = #bfff8000 0 0 0
-= -1.5
-
-
-Input: 1.6
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff9999 99999999 99999999 9999999a
-printf("%.35Lg") gives 1.6000000000000000000000000000000001
-g_Qfmt(0) gives 3 bytes: "1.6"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff9999 99999999 99999999 99999999
-= 1.5999999999999999999999999999999999
-fI[1] = #3fff9999 99999999 99999999 9999999a
-= 1.6000000000000000000000000000000001
-fI[1] == strtod
-
-
-Input: -1.6
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff9999 99999999 99999999 9999999a
-printf("%.35Lg") gives -1.6000000000000000000000000000000001
-g_Qfmt(0) gives 4 bytes: "-1.6"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff9999 99999999 99999999 9999999a
-= -1.6000000000000000000000000000000001
-fI[1] = #bfff9999 99999999 99999999 99999999
-= -1.5999999999999999999999999999999999
-fI[0] == strtod
-
-
-Input: 1.7
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffb333 33333333 33333333 33333333
-printf("%.35Lg") gives 1.7
-g_Qfmt(0) gives 3 bytes: "1.7"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffb333 33333333 33333333 33333333
-= 1.7
-fI[1] = #3fffb333 33333333 33333333 33333334
-= 1.7000000000000000000000000000000002
-fI[0] == strtod
-
-
-Input: -1.7
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffb333 33333333 33333333 33333333
-printf("%.35Lg") gives -1.7
-g_Qfmt(0) gives 4 bytes: "-1.7"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffb333 33333333 33333333 33333334
-= -1.7000000000000000000000000000000002
-fI[1] = #bfffb333 33333333 33333333 33333333
-= -1.7
-fI[1] == strtod
-
-
-Input: 1.8
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fffcccc cccccccc cccccccc cccccccd
-printf("%.35Lg") gives 1.8
-g_Qfmt(0) gives 3 bytes: "1.8"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fffcccc cccccccc cccccccc cccccccc
-= 1.7999999999999999999999999999999998
-fI[1] = #3fffcccc cccccccc cccccccc cccccccd
-= 1.8
-fI[1] == strtod
-
-
-Input: -1.8
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfffcccc cccccccc cccccccc cccccccd
-printf("%.35Lg") gives -1.8
-g_Qfmt(0) gives 4 bytes: "-1.8"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfffcccc cccccccc cccccccc cccccccd
-= -1.8
-fI[1] = #bfffcccc cccccccc cccccccc cccccccc
-= -1.7999999999999999999999999999999998
-fI[0] == strtod
-
-
-Input: 1.9
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffe666 66666666 66666666 66666666
-printf("%.35Lg") gives 1.8999999999999999999999999999999999
-g_Qfmt(0) gives 3 bytes: "1.9"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffe666 66666666 66666666 66666666
-= 1.8999999999999999999999999999999999
-fI[1] = #3fffe666 66666666 66666666 66666667
-= 1.9000000000000000000000000000000001
-fI[0] == strtod
-
-
-Input: -1.9
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffe666 66666666 66666666 66666666
-printf("%.35Lg") gives -1.8999999999999999999999999999999999
-g_Qfmt(0) gives 4 bytes: "-1.9"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffe666 66666666 66666666 66666667
-= -1.9000000000000000000000000000000001
-fI[1] = #bfffe666 66666666 66666666 66666666
-= -1.8999999999999999999999999999999999
-fI[1] == strtod
-
-Rounding mode for strtor... changed from 1 (nearest) to 2 (toward +Infinity)
-
-Input: 1.1
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff1999 99999999 99999999 9999999a
-printf("%.35Lg") gives 1.1000000000000000000000000000000001
-g_Qfmt(0) gives 3 bytes: "1.1"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff1999 99999999 99999999 99999999
-= 1.0999999999999999999999999999999999
-fI[1] = #3fff1999 99999999 99999999 9999999a
-= 1.1000000000000000000000000000000001
-fI[1] == strtod
-
-
-Input: -1.1
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff1999 99999999 99999999 99999999
-printf("%.35Lg") gives -1.0999999999999999999999999999999999
-g_Qfmt(0) gives 37 bytes: "-1.0999999999999999999999999999999999"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff1999 99999999 99999999 9999999a
-= -1.1000000000000000000000000000000001
-fI[1] = #bfff1999 99999999 99999999 99999999
-= -1.0999999999999999999999999999999999
-fI[1] == strtod
-
-
-Input: 1.2
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff3333 33333333 33333333 33333334
-printf("%.35Lg") gives 1.2000000000000000000000000000000002
-g_Qfmt(0) gives 36 bytes: "1.2000000000000000000000000000000002"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff3333 33333333 33333333 33333333
-= 1.2
-fI[1] = #3fff3333 33333333 33333333 33333334
-= 1.2000000000000000000000000000000002
-fI[1] == strtod
-
-
-Input: -1.2
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff3333 33333333 33333333 33333333
-printf("%.35Lg") gives -1.2
-g_Qfmt(0) gives 4 bytes: "-1.2"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff3333 33333333 33333333 33333334
-= -1.2000000000000000000000000000000002
-fI[1] = #bfff3333 33333333 33333333 33333333
-= -1.2
-fI[1] == strtod
-
-
-Input: 1.3
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff4ccc cccccccc cccccccc cccccccd
-printf("%.35Lg") gives 1.3
-g_Qfmt(0) gives 3 bytes: "1.3"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff4ccc cccccccc cccccccc cccccccc
-= 1.2999999999999999999999999999999998
-fI[1] = #3fff4ccc cccccccc cccccccc cccccccd
-= 1.3
-fI[1] == strtod
-
-
-Input: -1.3
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff4ccc cccccccc cccccccc cccccccc
-printf("%.35Lg") gives -1.2999999999999999999999999999999998
-g_Qfmt(0) gives 37 bytes: "-1.2999999999999999999999999999999998"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff4ccc cccccccc cccccccc cccccccd
-= -1.3
-fI[1] = #bfff4ccc cccccccc cccccccc cccccccc
-= -1.2999999999999999999999999999999998
-fI[1] == strtod
-
-
-Input: 1.4
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff6666 66666666 66666666 66666667
-printf("%.35Lg") gives 1.4000000000000000000000000000000001
-g_Qfmt(0) gives 36 bytes: "1.4000000000000000000000000000000001"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff6666 66666666 66666666 66666666
-= 1.3999999999999999999999999999999999
-fI[1] = #3fff6666 66666666 66666666 66666667
-= 1.4000000000000000000000000000000001
-fI[1] == strtod
-
-
-Input: -1.4
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff6666 66666666 66666666 66666666
-printf("%.35Lg") gives -1.3999999999999999999999999999999999
-g_Qfmt(0) gives 4 bytes: "-1.4"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff6666 66666666 66666666 66666667
-= -1.4000000000000000000000000000000001
-fI[1] = #bfff6666 66666666 66666666 66666666
-= -1.3999999999999999999999999999999999
-fI[1] == strtod
-
-
-Input: 1.5
-
-strtoQ consumes 3 bytes and returns 1
-with bits = #3fff8000 0 0 0
-printf("%.35Lg") gives 1.5
-g_Qfmt(0) gives 3 bytes: "1.5"
-
-strtoIQ returns 1, consuming 3 bytes.
-fI[0] == fI[1] = #3fff8000 0 0 0
-= 1.5
-
-
-Input: -1.5
-
-strtoQ consumes 4 bytes and returns 9
-with bits = #bfff8000 0 0 0
-printf("%.35Lg") gives -1.5
-g_Qfmt(0) gives 4 bytes: "-1.5"
-
-strtoIQ returns 9, consuming 4 bytes.
-fI[0] == fI[1] = #bfff8000 0 0 0
-= -1.5
-
-
-Input: 1.6
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fff9999 99999999 99999999 9999999a
-printf("%.35Lg") gives 1.6000000000000000000000000000000001
-g_Qfmt(0) gives 3 bytes: "1.6"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff9999 99999999 99999999 99999999
-= 1.5999999999999999999999999999999999
-fI[1] = #3fff9999 99999999 99999999 9999999a
-= 1.6000000000000000000000000000000001
-fI[1] == strtod
-
-
-Input: -1.6
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfff9999 99999999 99999999 99999999
-printf("%.35Lg") gives -1.5999999999999999999999999999999999
-g_Qfmt(0) gives 37 bytes: "-1.5999999999999999999999999999999999"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff9999 99999999 99999999 9999999a
-= -1.6000000000000000000000000000000001
-fI[1] = #bfff9999 99999999 99999999 99999999
-= -1.5999999999999999999999999999999999
-fI[1] == strtod
-
-
-Input: 1.7
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fffb333 33333333 33333333 33333334
-printf("%.35Lg") gives 1.7000000000000000000000000000000002
-g_Qfmt(0) gives 36 bytes: "1.7000000000000000000000000000000002"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffb333 33333333 33333333 33333333
-= 1.7
-fI[1] = #3fffb333 33333333 33333333 33333334
-= 1.7000000000000000000000000000000002
-fI[1] == strtod
-
-
-Input: -1.7
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffb333 33333333 33333333 33333333
-printf("%.35Lg") gives -1.7
-g_Qfmt(0) gives 4 bytes: "-1.7"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffb333 33333333 33333333 33333334
-= -1.7000000000000000000000000000000002
-fI[1] = #bfffb333 33333333 33333333 33333333
-= -1.7
-fI[1] == strtod
-
-
-Input: 1.8
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fffcccc cccccccc cccccccc cccccccd
-printf("%.35Lg") gives 1.8
-g_Qfmt(0) gives 3 bytes: "1.8"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fffcccc cccccccc cccccccc cccccccc
-= 1.7999999999999999999999999999999998
-fI[1] = #3fffcccc cccccccc cccccccc cccccccd
-= 1.8
-fI[1] == strtod
-
-
-Input: -1.8
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffcccc cccccccc cccccccc cccccccc
-printf("%.35Lg") gives -1.7999999999999999999999999999999998
-g_Qfmt(0) gives 37 bytes: "-1.7999999999999999999999999999999998"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfffcccc cccccccc cccccccc cccccccd
-= -1.8
-fI[1] = #bfffcccc cccccccc cccccccc cccccccc
-= -1.7999999999999999999999999999999998
-fI[1] == strtod
-
-
-Input: 1.9
-
-strtoQ consumes 3 bytes and returns 33
-with bits = #3fffe666 66666666 66666666 66666667
-printf("%.35Lg") gives 1.9000000000000000000000000000000001
-g_Qfmt(0) gives 36 bytes: "1.9000000000000000000000000000000001"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffe666 66666666 66666666 66666666
-= 1.8999999999999999999999999999999999
-fI[1] = #3fffe666 66666666 66666666 66666667
-= 1.9000000000000000000000000000000001
-fI[1] == strtod
-
-
-Input: -1.9
-
-strtoQ consumes 4 bytes and returns 25
-with bits = #bfffe666 66666666 66666666 66666666
-printf("%.35Lg") gives -1.8999999999999999999999999999999999
-g_Qfmt(0) gives 4 bytes: "-1.9"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffe666 66666666 66666666 66666667
-= -1.9000000000000000000000000000000001
-fI[1] = #bfffe666 66666666 66666666 66666666
-= -1.8999999999999999999999999999999999
-fI[1] == strtod
-
-Rounding mode for strtor... changed from 2 (toward +Infinity) to 3 (toward -Infinity)
-
-Input: 1.1
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff1999 99999999 99999999 99999999
-printf("%.35Lg") gives 1.0999999999999999999999999999999999
-g_Qfmt(0) gives 36 bytes: "1.0999999999999999999999999999999999"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff1999 99999999 99999999 99999999
-= 1.0999999999999999999999999999999999
-fI[1] = #3fff1999 99999999 99999999 9999999a
-= 1.1000000000000000000000000000000001
-fI[0] == strtod
-
-
-Input: -1.1
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff1999 99999999 99999999 9999999a
-printf("%.35Lg") gives -1.1000000000000000000000000000000001
-g_Qfmt(0) gives 4 bytes: "-1.1"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff1999 99999999 99999999 9999999a
-= -1.1000000000000000000000000000000001
-fI[1] = #bfff1999 99999999 99999999 99999999
-= -1.0999999999999999999999999999999999
-fI[0] == strtod
-
-
-Input: 1.2
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff3333 33333333 33333333 33333333
-printf("%.35Lg") gives 1.2
-g_Qfmt(0) gives 3 bytes: "1.2"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff3333 33333333 33333333 33333333
-= 1.2
-fI[1] = #3fff3333 33333333 33333333 33333334
-= 1.2000000000000000000000000000000002
-fI[0] == strtod
-
-
-Input: -1.2
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff3333 33333333 33333333 33333334
-printf("%.35Lg") gives -1.2000000000000000000000000000000002
-g_Qfmt(0) gives 37 bytes: "-1.2000000000000000000000000000000002"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff3333 33333333 33333333 33333334
-= -1.2000000000000000000000000000000002
-fI[1] = #bfff3333 33333333 33333333 33333333
-= -1.2
-fI[0] == strtod
-
-
-Input: 1.3
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff4ccc cccccccc cccccccc cccccccc
-printf("%.35Lg") gives 1.2999999999999999999999999999999998
-g_Qfmt(0) gives 36 bytes: "1.2999999999999999999999999999999998"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff4ccc cccccccc cccccccc cccccccc
-= 1.2999999999999999999999999999999998
-fI[1] = #3fff4ccc cccccccc cccccccc cccccccd
-= 1.3
-fI[0] == strtod
-
-
-Input: -1.3
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff4ccc cccccccc cccccccc cccccccd
-printf("%.35Lg") gives -1.3
-g_Qfmt(0) gives 4 bytes: "-1.3"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff4ccc cccccccc cccccccc cccccccd
-= -1.3
-fI[1] = #bfff4ccc cccccccc cccccccc cccccccc
-= -1.2999999999999999999999999999999998
-fI[0] == strtod
-
-
-Input: 1.4
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff6666 66666666 66666666 66666666
-printf("%.35Lg") gives 1.3999999999999999999999999999999999
-g_Qfmt(0) gives 3 bytes: "1.4"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fff6666 66666666 66666666 66666666
-= 1.3999999999999999999999999999999999
-fI[1] = #3fff6666 66666666 66666666 66666667
-= 1.4000000000000000000000000000000001
-fI[0] == strtod
-
-
-Input: -1.4
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff6666 66666666 66666666 66666667
-printf("%.35Lg") gives -1.4000000000000000000000000000000001
-g_Qfmt(0) gives 37 bytes: "-1.4000000000000000000000000000000001"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfff6666 66666666 66666666 66666667
-= -1.4000000000000000000000000000000001
-fI[1] = #bfff6666 66666666 66666666 66666666
-= -1.3999999999999999999999999999999999
-fI[0] == strtod
-
-
-Input: 1.5
-
-strtoQ consumes 3 bytes and returns 1
-with bits = #3fff8000 0 0 0
-printf("%.35Lg") gives 1.5
-g_Qfmt(0) gives 3 bytes: "1.5"
-
-strtoIQ returns 1, consuming 3 bytes.
-fI[0] == fI[1] = #3fff8000 0 0 0
-= 1.5
-
-
-Input: -1.5
-
-strtoQ consumes 4 bytes and returns 9
-with bits = #bfff8000 0 0 0
-printf("%.35Lg") gives -1.5
-g_Qfmt(0) gives 4 bytes: "-1.5"
-
-strtoIQ returns 9, consuming 4 bytes.
-fI[0] == fI[1] = #bfff8000 0 0 0
-= -1.5
-
-
-Input: 1.6
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fff9999 99999999 99999999 99999999
-printf("%.35Lg") gives 1.5999999999999999999999999999999999
-g_Qfmt(0) gives 36 bytes: "1.5999999999999999999999999999999999"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fff9999 99999999 99999999 99999999
-= 1.5999999999999999999999999999999999
-fI[1] = #3fff9999 99999999 99999999 9999999a
-= 1.6000000000000000000000000000000001
-fI[0] == strtod
-
-
-Input: -1.6
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfff9999 99999999 99999999 9999999a
-printf("%.35Lg") gives -1.6000000000000000000000000000000001
-g_Qfmt(0) gives 4 bytes: "-1.6"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfff9999 99999999 99999999 9999999a
-= -1.6000000000000000000000000000000001
-fI[1] = #bfff9999 99999999 99999999 99999999
-= -1.5999999999999999999999999999999999
-fI[0] == strtod
-
-
-Input: 1.7
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffb333 33333333 33333333 33333333
-printf("%.35Lg") gives 1.7
-g_Qfmt(0) gives 3 bytes: "1.7"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffb333 33333333 33333333 33333333
-= 1.7
-fI[1] = #3fffb333 33333333 33333333 33333334
-= 1.7000000000000000000000000000000002
-fI[0] == strtod
-
-
-Input: -1.7
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfffb333 33333333 33333333 33333334
-printf("%.35Lg") gives -1.7000000000000000000000000000000002
-g_Qfmt(0) gives 37 bytes: "-1.7000000000000000000000000000000002"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffb333 33333333 33333333 33333334
-= -1.7000000000000000000000000000000002
-fI[1] = #bfffb333 33333333 33333333 33333333
-= -1.7
-fI[0] == strtod
-
-
-Input: 1.8
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffcccc cccccccc cccccccc cccccccc
-printf("%.35Lg") gives 1.7999999999999999999999999999999998
-g_Qfmt(0) gives 36 bytes: "1.7999999999999999999999999999999998"
-
-strtoIQ returns 33, consuming 3 bytes.
-fI[0] = #3fffcccc cccccccc cccccccc cccccccc
-= 1.7999999999999999999999999999999998
-fI[1] = #3fffcccc cccccccc cccccccc cccccccd
-= 1.8
-fI[0] == strtod
-
-
-Input: -1.8
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfffcccc cccccccc cccccccc cccccccd
-printf("%.35Lg") gives -1.8
-g_Qfmt(0) gives 4 bytes: "-1.8"
-
-strtoIQ returns 41, consuming 4 bytes.
-fI[0] = #bfffcccc cccccccc cccccccc cccccccd
-= -1.8
-fI[1] = #bfffcccc cccccccc cccccccc cccccccc
-= -1.7999999999999999999999999999999998
-fI[0] == strtod
-
-
-Input: 1.9
-
-strtoQ consumes 3 bytes and returns 17
-with bits = #3fffe666 66666666 66666666 66666666
-printf("%.35Lg") gives 1.8999999999999999999999999999999999
-g_Qfmt(0) gives 3 bytes: "1.9"
-
-strtoIQ returns 17, consuming 3 bytes.
-fI[0] = #3fffe666 66666666 66666666 66666666
-= 1.8999999999999999999999999999999999
-fI[1] = #3fffe666 66666666 66666666 66666667
-= 1.9000000000000000000000000000000001
-fI[0] == strtod
-
-
-Input: -1.9
-
-strtoQ consumes 4 bytes and returns 41
-with bits = #bfffe666 66666666 66666666 66666667
-printf("%.35Lg") gives -1.9000000000000000000000000000000001
-g_Qfmt(0) gives 37 bytes: "-1.9000000000000000000000000000000001"
-
-strtoIQ returns 25, consuming 4 bytes.
-fI[0] = #bfffe666 66666666 66666666 66666667
-= -1.9000000000000000000000000000000001
-fI[1] = #bfffe666 66666666 66666666 66666666
-= -1.8999999999999999999999999999999999
-fI[0] == strtod
-
diff --git a/lib/libc/gdtoa/test/Qtest.c b/lib/libc/gdtoa/test/Qtest.c
deleted file mode 100644
index 057c2ed80..000000000
--- a/lib/libc/gdtoa/test/Qtest.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998-2001 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-/* Test program for g_Qfmt, strtoIQ, strtopQ, and strtorQ.
- *
- * Inputs (on stdin):
- *		r rounding_mode
- *		n ndig
- *		number
- *		#hex0 hex1 hex2 hex3
- *
- *	rounding_mode values:
- *		0 = toward zero
- *		1 = nearest
- *		2 = toward +Infinity
- *		3 = toward -Infinity
- *
- * where number is a decimal floating-point number,
- * hex0 is a string of <= 8 Hex digits for the most significant
- * word of the number, hex1 is a similar string for the next
- * word, etc., and ndig is a parameters to g_Qfmt.
- */
-
-#include "gdtoa.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
- extern int getround ANSI((int,char*));
-
- static char ibuf[2048], obuf[2048];
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_BIG_ENDIAN or IEEE_LITTLE_ENDIAN should be #defined */
-
-#ifdef IEEE_BIG_ENDIAN
-#define _0 0
-#define _1 1
-#define _2 2
-#define _3 3
-#endif
-#ifdef IEEE_LITTLE_ENDIAN
-#define _0 3
-#define _1 2
-#define _2 1
-#define _3 0
-#endif
-
-#define U (unsigned long)
-
- int
-main(Void)
-{
-	char *s, *s1, *se, *se1;
-	int Ltest, i, dItry, ndig = 0, r = 1;
-	union { long double d; ULong bits[4]; } u, v[2], w;
-
-	w.bits[0] = w.bits[3] = 0;
-	w.d = 1.;
-	u.d = 3.;
-	w.d = w.d / u.d;
-	Ltest = sizeof(long double) == 16 && w.bits[0] && w.bits[3];
-	while( (s = fgets(ibuf, sizeof(ibuf), stdin)) !=0) {
-		while(*s <= ' ')
-			if (!*s++)
-				continue;
-		dItry = 0;
-		switch(*s) {
-		  case 'r':
-			r = getround(r, s);
-			continue;
-		  case 'n':
-			i = s[1];
-			if (i <= ' ' || (i >= '0' && i <= '9')) {
-				ndig = atoi(s+1);
-				continue;
-				}
-			break; /* nan? */
-		  case '#':
-			/* sscanf(s+1, "%lx %lx %lx %lx", &u.bits[_0],	*/
-			/*	&u.bits[_1], &u.bits[_2], &u.bits[_3]);	*/
-			u.bits[_0] = (ULong)strtoul(s1 = s+1, &se, 16);
-			if (se > s1) {
-			  u.bits[_1] = (ULong)strtoul(s1 = se, &se, 16);
-			  if (se > s1) {
-			    u.bits[_2] = (ULong)strtoul(s1 = se, &se, 16);
-			    if (se > s1)
-				u.bits[_3] = (ULong)strtoul(s1 = se, &se, 16);
-			    }
-			  }
-			printf("\nInput: %s", ibuf);
-			printf(" --> f = #%lx %lx %lx %lx\n", U u.bits[_0],
-				U u.bits[_1], U u.bits[_2], U u.bits[_3]);
-			goto fmt_test;
-			}
-		dItry = 1;
-		printf("\nInput: %s", ibuf);
-		i = strtorQ(ibuf, &se, r, u.bits);
-		if (r == 1 && (strtopQ(ibuf,&se1,v[0].bits) != i
-		 || se != se1 || memcmp(u.bits, v[0].bits, 16)))
-			printf("***strtoQ and strtorQ disagree!!\n:");
-		printf("\nstrtoQ consumes %d bytes and returns %d\n",
-				(int)(se-ibuf), i);
-		printf("with bits = #%lx %lx %lx %lx\n",
-			U u.bits[_0], U u.bits[_1], U u.bits[_2], U u.bits[_3]);
- fmt_test:
-		if (Ltest)
-			printf("printf(\"%%.35Lg\") gives %.35Lg\n", u.d);
-		se = g_Qfmt(obuf, u.bits, ndig, sizeof(obuf));
-		printf("g_Qfmt(%d) gives %d bytes: \"%s\"\n\n", ndig,
-			(int)(se-obuf), se ? obuf : "<null>");
-		if (!dItry)
-			continue;
-		printf("strtoIQ returns %d,",
-			strtoIQ(ibuf, &se, v[0].bits, v[1].bits));
-		printf(" consuming %d bytes.\n", (int)(se-ibuf));
-		if (!memcmp(v[0].bits, v[1].bits, 16)) {
-			if (!memcpy(u.bits, v[0].bits, 16))
-				printf("fI[0] == fI[1] == strtoQ\n");
-			else {
-				printf("fI[0] == fI[1] = #%lx %lx %lx %lx\n",
-					U v[0].bits[_0], U v[0].bits[_1],
-					U v[0].bits[_2], U v[0].bits[_3]);
-				if (Ltest)
-				    printf("= %.35Lg\n", v[0].d);
-				}
-			}
-		else {
-			printf("fI[0] = #%lx %lx %lx %lx\n",
-					U v[0].bits[_0], U v[0].bits[_1],
-					U v[0].bits[_2], U v[0].bits[_3]);
-			if (Ltest)
-				printf("= %.35Lg\n", v[0].d);
-			printf("fI[1] = #%lx %lx %lx %lx\n",
-					U v[1].bits[_0], U v[1].bits[_1],
-					U v[1].bits[_2], U v[1].bits[_3]);
-			if (Ltest)
-				printf("= %.35Lg\n", v[1].d);
-			if (!memcmp(v[0].bits, u.bits, 16))
-				printf("fI[0] == strtod\n");
-			else if (!memcmp(v[1].bits, u.bits, 16))
-				printf("fI[1] == strtod\n");
-			else
-				printf("**** Both differ from strtod ****\n");
-			}
-		printf("\n");
-		}
-	return 0;
-	}
diff --git a/lib/libc/gdtoa/test/README b/lib/libc/gdtoa/test/README
deleted file mode 100644
index 042ecfea0..000000000
--- a/lib/libc/gdtoa/test/README
+++ /dev/null
@@ -1,81 +0,0 @@
-This directory contains source for several test programs:
-
-dt is for conversion to/from double; it permits input of pairs of
-32-bit hex integers as #hhhhhhhh hhhhhhhh (i.e., the initial '#'
-indicates hex input).  No initial # ==> decimal input.
-After the input number is an optional : mode ndigits
-(colon, and decimal integers for parameters "mode" and "ndigits"
-to gdtoa).
-
-Qtest, ddtest, dtest, ftest, xLtest and xtest are for conversion to/from
-
-	f	IEEE single precision
-	d	IEEE double precision
-	xL	IEEE extended precision, as on Motorola 680x0 chips
-	x	IEEE extended precision, as on Intel 80x87 chips or
-			software emulation of Motorola 680x0 chips
-	Q	quad precision, as on Sun Sparc chips
-	dd	double double, pairs of IEEE double numbers
-		whose sum is the desired value
-
-They're all similar, except for the precision.  They test both
-directed roundings and interval input (the strtoI* routines).
-Lines that begin with "r" specify or interrogate the desired rounding
-direction:
-
-	0 = toward 0
-	1 = nearest (default)
-	2 = toward +Infinity
-	3 = toward -Infinity
-
-These are the FPI_Round_* values in gdota.h.  The "r" value is sticky:
-it stays in effect til changed.  To change the value, give a line that
-starts with r followed by 0, 1, 2, or 3.  To check the value, give "r"
-by itself.
-
-Lines that begin with n followed by a number specify the ndig
-argument for subsequent calls to the relevant g_*fmt routine.
-
-Lines that start with # followed by the appropriate number of
-hexadecimal strings (see the comments) give the big-endian
-internal representation of the desired number.
-
-When routines Qtest, xLtest, and xtest are used on machines whose
-long double is of type "quad" (for Qtest) or "extended" (for x*test),
-they try to print with %Lg as another way to show binary values.
-
-Program ddtest also accepts (white-space separated) pairs of decimal
-input numbers; it converts both with strtod and feeds the result
-to g_ddfmt.
-
-Program dItest exercises strtodI and strtoId.
-
-Programs dItestsi and ddtestsi are for testing the sudden-underflow
-logic (on double and double-double conversions).
-
-Program strtodt tests strtod on some hard cases (in file testnos3)
-posted by Fred Tydeman to comp.arch.arithmetic on 26 Feb. 1996.
-To get correct results on Intel (x86) systems, the rounding precision
-must be set to 53 bits.  This can be done, e.g., by invoking
-fpinit_ASL(), whose source appears in
-http://www.netlib.org/ampl/solvers/fpinit.c .
-
-The obad directory shows results expected on (at least some) Intel x86
-Linux systems and may not be relevant to other systems.
-
-You can optionally compile getround.c with -DHonor_FLT_ROUNDS
-to manually test strtof, strtod, etc., using fegetround().
-You can also or alternatively compile getround.c with
--DUSE_MY_LOCALE (when ../gdtoa.a is compiled with -DUSE_LOCALE)
-to test multi-byte decimal points.
-
-If in the parent directory, you have sucessfully invoked "make Printf"
-to add a "printf" (called Printf and accessed via ../stdio1.h), then
-here you can use "make pf_test" and (if you have both a 64-bit long
-double and a 113-bit "quad" double type) "make pf_testLq" for a brief
-test of %g and %a variants in Printf.
-
-These are simple test programs, not meant for exhaustive testing,
-but for manually testing "interesting" cases.  Paxson's testbase
-is good for more exhaustive testing, in part with random inputs.
-See ftp://ftp.ee.lbl.gov/testbase-report.ps.Z .
diff --git a/lib/libc/gdtoa/test/d.out b/lib/libc/gdtoa/test/d.out
deleted file mode 100644
index a0ac991c4..000000000
--- a/lib/libc/gdtoa/test/d.out
+++ /dev/null
@@ -1,986 +0,0 @@
-
-Input: 1.23
-strtod consumes 4 bytes and returns 17 with f = 1.23 = #3ff3ae14 7ae147ae
-g_dfmt(0) gives 4 bytes: "1.23"
-
-strtoId returns 17, consuming 4 bytes.
-fI[0] = #3ff3ae14 7ae147ae = 1.23
-fI[1] = #3ff3ae14 7ae147af = 1.2300000000000002
-fI[0] == strtod
-
-
-Input: 1.23e+20
-strtod consumes 8 bytes and returns 1 with f = 1.23e+20 = #441aabdf 2145b430
-g_dfmt(0) gives 8 bytes: "1.23e+20"
-
-strtoId returns 1, consuming 8 bytes.
-fI[0] == fI[1] == strtod
-
-
-Input: 1.23e-20
-strtod consumes 8 bytes and returns 33 with f = 1.2300000000000001e-20 = #3bcd0ae4 cf767531
-g_dfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoId returns 33, consuming 8 bytes.
-fI[0] = #3bcd0ae4 cf767530 = 1.2299999999999999e-20
-fI[1] = #3bcd0ae4 cf767531 = 1.2300000000000001e-20
-fI[1] == strtod
-
-
-Input: 1.23456789
-strtod consumes 10 bytes and returns 17 with f = 1.2345678899999999 = #3ff3c0ca 4283de1b
-g_dfmt(0) gives 10 bytes: "1.23456789"
-
-strtoId returns 17, consuming 10 bytes.
-fI[0] = #3ff3c0ca 4283de1b = 1.2345678899999999
-fI[1] = #3ff3c0ca 4283de1c = 1.2345678900000001
-fI[0] == strtod
-
-
-Input: 1.23456589e+20
-strtod consumes 14 bytes and returns 17 with f = 1.23456589e+20 = #441ac537 a660b997
-g_dfmt(0) gives 14 bytes: "1.23456589e+20"
-
-strtoId returns 17, consuming 14 bytes.
-fI[0] = #441ac537 a660b997 = 1.23456589e+20
-fI[1] = #441ac537 a660b998 = 1.2345658900000001e+20
-fI[0] == strtod
-
-
-Input: 1.23e+30
-strtod consumes 8 bytes and returns 17 with f = 1.23e+30 = #462f0cb0 4e8fb790
-g_dfmt(0) gives 8 bytes: "1.23e+30"
-
-strtoId returns 17, consuming 8 bytes.
-fI[0] = #462f0cb0 4e8fb790 = 1.23e+30
-fI[1] = #462f0cb0 4e8fb791 = 1.2300000000000001e+30
-fI[0] == strtod
-
-
-Input: 1.23e-30
-strtod consumes 8 bytes and returns 33 with f = 1.2300000000000001e-30 = #39b8f286 6f5010ab
-g_dfmt(0) gives 8 bytes: "1.23e-30"
-
-strtoId returns 33, consuming 8 bytes.
-fI[0] = #39b8f286 6f5010aa = 1.2299999999999999e-30
-fI[1] = #39b8f286 6f5010ab = 1.2300000000000001e-30
-fI[1] == strtod
-
-
-Input: 1.23456789e-20
-strtod consumes 14 bytes and returns 17 with f = 1.2345678899999999e-20 = #3bcd2681 471e7ada
-g_dfmt(0) gives 14 bytes: "1.23456789e-20"
-
-strtoId returns 17, consuming 14 bytes.
-fI[0] = #3bcd2681 471e7ada = 1.2345678899999999e-20
-fI[1] = #3bcd2681 471e7adb = 1.2345678900000001e-20
-fI[0] == strtod
-
-
-Input: 1.23456789e-30
-strtod consumes 14 bytes and returns 17 with f = 1.23456789e-30 = #39b90a3e 33bbd995
-g_dfmt(0) gives 14 bytes: "1.23456789e-30"
-
-strtoId returns 17, consuming 14 bytes.
-fI[0] = #39b90a3e 33bbd995 = 1.23456789e-30
-fI[1] = #39b90a3e 33bbd996 = 1.2345678900000002e-30
-fI[0] == strtod
-
-
-Input: 1.234567890123456789
-strtod consumes 20 bytes and returns 17 with f = 1.2345678901234567 = #3ff3c0ca 428c59fb
-g_dfmt(0) gives 18 bytes: "1.2345678901234567"
-
-strtoId returns 17, consuming 20 bytes.
-fI[0] = #3ff3c0ca 428c59fb = 1.2345678901234567
-fI[1] = #3ff3c0ca 428c59fc = 1.2345678901234569
-fI[0] == strtod
-
-
-Input: 1.23456789012345678901234567890123456789
-strtod consumes 40 bytes and returns 17 with f = 1.2345678901234567 = #3ff3c0ca 428c59fb
-g_dfmt(0) gives 18 bytes: "1.2345678901234567"
-
-strtoId returns 17, consuming 40 bytes.
-fI[0] = #3ff3c0ca 428c59fb = 1.2345678901234567
-fI[1] = #3ff3c0ca 428c59fc = 1.2345678901234569
-fI[0] == strtod
-
-
-Input: 1.23e306
-strtod consumes 8 bytes and returns 33 with f = 1.23e+306 = #7f7c0676 cd1c61f5
-g_dfmt(0) gives 9 bytes: "1.23e+306"
-
-strtoId returns 33, consuming 8 bytes.
-fI[0] = #7f7c0676 cd1c61f4 = 1.2299999999999999e+306
-fI[1] = #7f7c0676 cd1c61f5 = 1.23e+306
-fI[1] == strtod
-
-
-Input: 1.23e-306
-strtod consumes 9 bytes and returns 33 with f = 1.23e-306 = #6ba3b8 5da396e8
-g_dfmt(0) gives 9 bytes: "1.23e-306"
-
-strtoId returns 33, consuming 9 bytes.
-fI[0] = #6ba3b8 5da396e7 = 1.2299999999999999e-306
-fI[1] = #6ba3b8 5da396e8 = 1.23e-306
-fI[1] == strtod
-
-
-Input: 1.23e-320
-strtod consumes 9 bytes and returns 98 with f = 1.2302234581447039e-320 = #0 9ba
-g_dfmt(0) gives 9 bytes: "1.23e-320"
-
-strtoId returns 98, consuming 9 bytes.
-fI[0] = #0 9b9 = 1.2297293924988626e-320
-fI[1] = #0 9ba = 1.2302234581447039e-320
-fI[1] == strtod
-
-
-Input: 1.23e-20
-strtod consumes 8 bytes and returns 33 with f = 1.2300000000000001e-20 = #3bcd0ae4 cf767531
-g_dfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoId returns 33, consuming 8 bytes.
-fI[0] = #3bcd0ae4 cf767530 = 1.2299999999999999e-20
-fI[1] = #3bcd0ae4 cf767531 = 1.2300000000000001e-20
-fI[1] == strtod
-
-
-Input: 1.23456789e307
-strtod consumes 14 bytes and returns 33 with f = 1.23456789e+307 = #7fb194b1 4bdaecdc
-g_dfmt(0) gives 15 bytes: "1.23456789e+307"
-
-strtoId returns 33, consuming 14 bytes.
-fI[0] = #7fb194b1 4bdaecdb = 1.2345678899999998e+307
-fI[1] = #7fb194b1 4bdaecdc = 1.23456789e+307
-fI[1] == strtod
-
-
-Input: 1.23456589e-307
-strtod consumes 15 bytes and returns 17 with f = 1.2345658899999999e-307 = #363196 bb9845fa
-g_dfmt(0) gives 15 bytes: "1.23456589e-307"
-
-strtoId returns 17, consuming 15 bytes.
-fI[0] = #363196 bb9845fa = 1.2345658899999999e-307
-fI[1] = #363196 bb9845fb = 1.2345658900000001e-307
-fI[0] == strtod
-
-
-Input: 1.234567890123456789
-strtod consumes 20 bytes and returns 17 with f = 1.2345678901234567 = #3ff3c0ca 428c59fb
-g_dfmt(0) gives 18 bytes: "1.2345678901234567"
-
-strtoId returns 17, consuming 20 bytes.
-fI[0] = #3ff3c0ca 428c59fb = 1.2345678901234567
-fI[1] = #3ff3c0ca 428c59fc = 1.2345678901234569
-fI[0] == strtod
-
-
-Input: 1.234567890123456789e301
-strtod consumes 24 bytes and returns 17 with f = 1.2345678901234568e+301 = #7e726f51 75f56413
-g_dfmt(0) gives 23 bytes: "1.2345678901234568e+301"
-
-strtoId returns 17, consuming 24 bytes.
-fI[0] = #7e726f51 75f56413 = 1.2345678901234568e+301
-fI[1] = #7e726f51 75f56414 = 1.234567890123457e+301
-fI[0] == strtod
-
-
-Input: 1.234567890123456789e-301
-strtod consumes 25 bytes and returns 17 with f = 1.2345678901234567e-301 = #1752a64 e34ba0d3
-g_dfmt(0) gives 23 bytes: "1.2345678901234567e-301"
-
-strtoId returns 17, consuming 25 bytes.
-fI[0] = #1752a64 e34ba0d3 = 1.2345678901234567e-301
-fI[1] = #1752a64 e34ba0d4 = 1.2345678901234569e-301
-fI[0] == strtod
-
-
-Input: 1.234567890123456789e-321
-strtod consumes 25 bytes and returns 98 with f = 1.2351641146031164e-321 = #0 fa
-g_dfmt(0) gives 10 bytes: "1.235e-321"
-
-strtoId returns 98, consuming 25 bytes.
-fI[0] = #0 f9 = 1.2302234581447039e-321
-fI[1] = #0 fa = 1.2351641146031164e-321
-fI[1] == strtod
-
-
-Input: 1e23
-strtod consumes 4 bytes and returns 17 with f = 9.9999999999999992e+22 = #44b52d02 c7e14af6
-g_dfmt(0) gives 5 bytes: "1e+23"
-
-strtoId returns 17, consuming 4 bytes.
-fI[0] = #44b52d02 c7e14af6 = 9.9999999999999992e+22
-fI[1] = #44b52d02 c7e14af7 = 1.0000000000000001e+23
-fI[0] == strtod
-
-
-Input: 1e310
-strtod consumes 5 bytes and returns 163 with f = Infinity = #7ff00000 0
-g_dfmt(0) gives 8 bytes: "Infinity"
-
-strtoId returns 163, consuming 5 bytes.
-fI[0] = #7fefffff ffffffff = 1.7976931348623157e+308
-fI[1] = #7ff00000 0 = Infinity
-fI[1] == strtod
-
-
-Input: 9.0259718793241475e-277
-strtod consumes 23 bytes and returns 33 with f = 9.0259718793241479e-277 = #6a00000 0
-g_dfmt(0) gives 22 bytes: "9.025971879324148e-277"
-
-strtoId returns 33, consuming 23 bytes.
-fI[0] = #69fffff ffffffff = 9.0259718793241469e-277
-fI[1] = #6a00000 0 = 9.0259718793241479e-277
-fI[1] == strtod
-
-
-Input: 9.025971879324147880346310405869e-277
-strtod consumes 37 bytes and returns 17 with f = 9.0259718793241479e-277 = #6a00000 0
-g_dfmt(0) gives 22 bytes: "9.025971879324148e-277"
-
-strtoId returns 17, consuming 37 bytes.
-fI[0] = #6a00000 0 = 9.0259718793241479e-277
-fI[1] = #6a00000 1 = 9.0259718793241499e-277
-fI[0] == strtod
-
-
-Input: 9.025971879324147880346310405868e-277
-strtod consumes 37 bytes and returns 33 with f = 9.0259718793241479e-277 = #6a00000 0
-g_dfmt(0) gives 22 bytes: "9.025971879324148e-277"
-
-strtoId returns 33, consuming 37 bytes.
-fI[0] = #69fffff ffffffff = 9.0259718793241469e-277
-fI[1] = #6a00000 0 = 9.0259718793241479e-277
-fI[1] == strtod
-
-
-Input: 2.2250738585072014e-308
-strtod consumes 23 bytes and returns 17 with f = 2.2250738585072014e-308 = #100000 0
-g_dfmt(0) gives 23 bytes: "2.2250738585072014e-308"
-
-strtoId returns 17, consuming 23 bytes.
-fI[0] = #100000 0 = 2.2250738585072014e-308
-fI[1] = #100000 1 = 2.2250738585072019e-308
-fI[0] == strtod
-
-
-Input: 2.2250738585072013e-308
-strtod consumes 23 bytes and returns 33 with f = 2.2250738585072014e-308 = #100000 0
-g_dfmt(0) gives 23 bytes: "2.2250738585072014e-308"
-
-strtoId returns 33, consuming 23 bytes.
-fI[0] = #fffff ffffffff = 2.2250738585072009e-308
-fI[1] = #100000 0 = 2.2250738585072014e-308
-fI[1] == strtod
-
-Rounding mode for strtor... changed from 1 (nearest) to 0 (toward zero)
-
-Input: 1.1
-strtod consumes 3 bytes and returns 17 with f = 1.0999999999999999 = #3ff19999 99999999
-g_dfmt(0) gives 18 bytes: "1.0999999999999999"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ff19999 99999999 = 1.0999999999999999
-fI[1] = #3ff19999 9999999a = 1.1000000000000001
-fI[0] == strtod
-
-
-Input: -1.1
-strtod consumes 4 bytes and returns 25 with f = -1.0999999999999999 = #bff19999 99999999
-g_dfmt(0) gives 19 bytes: "-1.0999999999999999"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bff19999 9999999a = -1.1000000000000001
-fI[1] = #bff19999 99999999 = -1.0999999999999999
-fI[1] == strtod
-
-
-Input: 1.2
-strtod consumes 3 bytes and returns 17 with f = 1.2 = #3ff33333 33333333
-g_dfmt(0) gives 3 bytes: "1.2"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ff33333 33333333 = 1.2
-fI[1] = #3ff33333 33333334 = 1.2000000000000002
-fI[0] == strtod
-
-
-Input: -1.2
-strtod consumes 4 bytes and returns 25 with f = -1.2 = #bff33333 33333333
-g_dfmt(0) gives 4 bytes: "-1.2"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bff33333 33333334 = -1.2000000000000002
-fI[1] = #bff33333 33333333 = -1.2
-fI[1] == strtod
-
-
-Input: 1.3
-strtod consumes 3 bytes and returns 17 with f = 1.2999999999999998 = #3ff4cccc cccccccc
-g_dfmt(0) gives 18 bytes: "1.2999999999999998"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ff4cccc cccccccc = 1.2999999999999998
-fI[1] = #3ff4cccc cccccccd = 1.3
-fI[0] == strtod
-
-
-Input: -1.3
-strtod consumes 4 bytes and returns 25 with f = -1.2999999999999998 = #bff4cccc cccccccc
-g_dfmt(0) gives 19 bytes: "-1.2999999999999998"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bff4cccc cccccccd = -1.3
-fI[1] = #bff4cccc cccccccc = -1.2999999999999998
-fI[1] == strtod
-
-
-Input: 1.4
-strtod consumes 3 bytes and returns 17 with f = 1.3999999999999999 = #3ff66666 66666666
-g_dfmt(0) gives 3 bytes: "1.4"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ff66666 66666666 = 1.3999999999999999
-fI[1] = #3ff66666 66666667 = 1.4000000000000001
-fI[0] == strtod
-
-
-Input: -1.4
-strtod consumes 4 bytes and returns 25 with f = -1.3999999999999999 = #bff66666 66666666
-g_dfmt(0) gives 4 bytes: "-1.4"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bff66666 66666667 = -1.4000000000000001
-fI[1] = #bff66666 66666666 = -1.3999999999999999
-fI[1] == strtod
-
-
-Input: 1.5
-strtod consumes 3 bytes and returns 1 with f = 1.5 = #3ff80000 0
-g_dfmt(0) gives 3 bytes: "1.5"
-
-strtoId returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtod
-
-
-Input: -1.5
-strtod consumes 4 bytes and returns 9 with f = -1.5 = #bff80000 0
-g_dfmt(0) gives 4 bytes: "-1.5"
-
-strtoId returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtod
-
-
-Input: 1.6
-strtod consumes 3 bytes and returns 17 with f = 1.5999999999999999 = #3ff99999 99999999
-g_dfmt(0) gives 18 bytes: "1.5999999999999999"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ff99999 99999999 = 1.5999999999999999
-fI[1] = #3ff99999 9999999a = 1.6000000000000001
-fI[0] == strtod
-
-
-Input: -1.6
-strtod consumes 4 bytes and returns 25 with f = -1.5999999999999999 = #bff99999 99999999
-g_dfmt(0) gives 19 bytes: "-1.5999999999999999"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bff99999 9999999a = -1.6000000000000001
-fI[1] = #bff99999 99999999 = -1.5999999999999999
-fI[1] == strtod
-
-
-Input: 1.7
-strtod consumes 3 bytes and returns 17 with f = 1.7 = #3ffb3333 33333333
-g_dfmt(0) gives 3 bytes: "1.7"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ffb3333 33333333 = 1.7
-fI[1] = #3ffb3333 33333334 = 1.7000000000000002
-fI[0] == strtod
-
-
-Input: -1.7
-strtod consumes 4 bytes and returns 25 with f = -1.7 = #bffb3333 33333333
-g_dfmt(0) gives 4 bytes: "-1.7"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bffb3333 33333334 = -1.7000000000000002
-fI[1] = #bffb3333 33333333 = -1.7
-fI[1] == strtod
-
-
-Input: 1.8
-strtod consumes 3 bytes and returns 17 with f = 1.7999999999999998 = #3ffccccc cccccccc
-g_dfmt(0) gives 18 bytes: "1.7999999999999998"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ffccccc cccccccc = 1.7999999999999998
-fI[1] = #3ffccccc cccccccd = 1.8
-fI[0] == strtod
-
-
-Input: -1.8
-strtod consumes 4 bytes and returns 25 with f = -1.7999999999999998 = #bffccccc cccccccc
-g_dfmt(0) gives 19 bytes: "-1.7999999999999998"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bffccccc cccccccd = -1.8
-fI[1] = #bffccccc cccccccc = -1.7999999999999998
-fI[1] == strtod
-
-
-Input: 1.9
-strtod consumes 3 bytes and returns 17 with f = 1.8999999999999999 = #3ffe6666 66666666
-g_dfmt(0) gives 3 bytes: "1.9"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ffe6666 66666666 = 1.8999999999999999
-fI[1] = #3ffe6666 66666667 = 1.9000000000000001
-fI[0] == strtod
-
-
-Input: -1.9
-strtod consumes 4 bytes and returns 25 with f = -1.8999999999999999 = #bffe6666 66666666
-g_dfmt(0) gives 4 bytes: "-1.9"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bffe6666 66666667 = -1.9000000000000001
-fI[1] = #bffe6666 66666666 = -1.8999999999999999
-fI[1] == strtod
-
-Rounding mode for strtor... changed from 0 (toward zero) to 1 (nearest)
-
-Input: 1.1
-strtod consumes 3 bytes and returns 33 with f = 1.1000000000000001 = #3ff19999 9999999a
-g_dfmt(0) gives 3 bytes: "1.1"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ff19999 99999999 = 1.0999999999999999
-fI[1] = #3ff19999 9999999a = 1.1000000000000001
-fI[1] == strtod
-
-
-Input: -1.1
-strtod consumes 4 bytes and returns 41 with f = -1.1000000000000001 = #bff19999 9999999a
-g_dfmt(0) gives 4 bytes: "-1.1"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bff19999 9999999a = -1.1000000000000001
-fI[1] = #bff19999 99999999 = -1.0999999999999999
-fI[0] == strtod
-
-
-Input: 1.2
-strtod consumes 3 bytes and returns 17 with f = 1.2 = #3ff33333 33333333
-g_dfmt(0) gives 3 bytes: "1.2"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ff33333 33333333 = 1.2
-fI[1] = #3ff33333 33333334 = 1.2000000000000002
-fI[0] == strtod
-
-
-Input: -1.2
-strtod consumes 4 bytes and returns 25 with f = -1.2 = #bff33333 33333333
-g_dfmt(0) gives 4 bytes: "-1.2"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bff33333 33333334 = -1.2000000000000002
-fI[1] = #bff33333 33333333 = -1.2
-fI[1] == strtod
-
-
-Input: 1.3
-strtod consumes 3 bytes and returns 33 with f = 1.3 = #3ff4cccc cccccccd
-g_dfmt(0) gives 3 bytes: "1.3"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ff4cccc cccccccc = 1.2999999999999998
-fI[1] = #3ff4cccc cccccccd = 1.3
-fI[1] == strtod
-
-
-Input: -1.3
-strtod consumes 4 bytes and returns 41 with f = -1.3 = #bff4cccc cccccccd
-g_dfmt(0) gives 4 bytes: "-1.3"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bff4cccc cccccccd = -1.3
-fI[1] = #bff4cccc cccccccc = -1.2999999999999998
-fI[0] == strtod
-
-
-Input: 1.4
-strtod consumes 3 bytes and returns 17 with f = 1.3999999999999999 = #3ff66666 66666666
-g_dfmt(0) gives 3 bytes: "1.4"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ff66666 66666666 = 1.3999999999999999
-fI[1] = #3ff66666 66666667 = 1.4000000000000001
-fI[0] == strtod
-
-
-Input: -1.4
-strtod consumes 4 bytes and returns 25 with f = -1.3999999999999999 = #bff66666 66666666
-g_dfmt(0) gives 4 bytes: "-1.4"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bff66666 66666667 = -1.4000000000000001
-fI[1] = #bff66666 66666666 = -1.3999999999999999
-fI[1] == strtod
-
-
-Input: 1.5
-strtod consumes 3 bytes and returns 1 with f = 1.5 = #3ff80000 0
-g_dfmt(0) gives 3 bytes: "1.5"
-
-strtoId returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtod
-
-
-Input: -1.5
-strtod consumes 4 bytes and returns 9 with f = -1.5 = #bff80000 0
-g_dfmt(0) gives 4 bytes: "-1.5"
-
-strtoId returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtod
-
-
-Input: 1.6
-strtod consumes 3 bytes and returns 33 with f = 1.6000000000000001 = #3ff99999 9999999a
-g_dfmt(0) gives 3 bytes: "1.6"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ff99999 99999999 = 1.5999999999999999
-fI[1] = #3ff99999 9999999a = 1.6000000000000001
-fI[1] == strtod
-
-
-Input: -1.6
-strtod consumes 4 bytes and returns 41 with f = -1.6000000000000001 = #bff99999 9999999a
-g_dfmt(0) gives 4 bytes: "-1.6"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bff99999 9999999a = -1.6000000000000001
-fI[1] = #bff99999 99999999 = -1.5999999999999999
-fI[0] == strtod
-
-
-Input: 1.7
-strtod consumes 3 bytes and returns 17 with f = 1.7 = #3ffb3333 33333333
-g_dfmt(0) gives 3 bytes: "1.7"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ffb3333 33333333 = 1.7
-fI[1] = #3ffb3333 33333334 = 1.7000000000000002
-fI[0] == strtod
-
-
-Input: -1.7
-strtod consumes 4 bytes and returns 25 with f = -1.7 = #bffb3333 33333333
-g_dfmt(0) gives 4 bytes: "-1.7"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bffb3333 33333334 = -1.7000000000000002
-fI[1] = #bffb3333 33333333 = -1.7
-fI[1] == strtod
-
-
-Input: 1.8
-strtod consumes 3 bytes and returns 33 with f = 1.8 = #3ffccccc cccccccd
-g_dfmt(0) gives 3 bytes: "1.8"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ffccccc cccccccc = 1.7999999999999998
-fI[1] = #3ffccccc cccccccd = 1.8
-fI[1] == strtod
-
-
-Input: -1.8
-strtod consumes 4 bytes and returns 41 with f = -1.8 = #bffccccc cccccccd
-g_dfmt(0) gives 4 bytes: "-1.8"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bffccccc cccccccd = -1.8
-fI[1] = #bffccccc cccccccc = -1.7999999999999998
-fI[0] == strtod
-
-
-Input: 1.9
-strtod consumes 3 bytes and returns 17 with f = 1.8999999999999999 = #3ffe6666 66666666
-g_dfmt(0) gives 3 bytes: "1.9"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ffe6666 66666666 = 1.8999999999999999
-fI[1] = #3ffe6666 66666667 = 1.9000000000000001
-fI[0] == strtod
-
-
-Input: -1.9
-strtod consumes 4 bytes and returns 25 with f = -1.8999999999999999 = #bffe6666 66666666
-g_dfmt(0) gives 4 bytes: "-1.9"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bffe6666 66666667 = -1.9000000000000001
-fI[1] = #bffe6666 66666666 = -1.8999999999999999
-fI[1] == strtod
-
-Rounding mode for strtor... changed from 1 (nearest) to 2 (toward +Infinity)
-
-Input: 1.1
-strtod consumes 3 bytes and returns 33 with f = 1.1000000000000001 = #3ff19999 9999999a
-g_dfmt(0) gives 3 bytes: "1.1"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ff19999 99999999 = 1.0999999999999999
-fI[1] = #3ff19999 9999999a = 1.1000000000000001
-fI[1] == strtod
-
-
-Input: -1.1
-strtod consumes 4 bytes and returns 25 with f = -1.0999999999999999 = #bff19999 99999999
-g_dfmt(0) gives 19 bytes: "-1.0999999999999999"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bff19999 9999999a = -1.1000000000000001
-fI[1] = #bff19999 99999999 = -1.0999999999999999
-fI[1] == strtod
-
-
-Input: 1.2
-strtod consumes 3 bytes and returns 33 with f = 1.2000000000000002 = #3ff33333 33333334
-g_dfmt(0) gives 18 bytes: "1.2000000000000002"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ff33333 33333333 = 1.2
-fI[1] = #3ff33333 33333334 = 1.2000000000000002
-fI[1] == strtod
-
-
-Input: -1.2
-strtod consumes 4 bytes and returns 25 with f = -1.2 = #bff33333 33333333
-g_dfmt(0) gives 4 bytes: "-1.2"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bff33333 33333334 = -1.2000000000000002
-fI[1] = #bff33333 33333333 = -1.2
-fI[1] == strtod
-
-
-Input: 1.3
-strtod consumes 3 bytes and returns 33 with f = 1.3 = #3ff4cccc cccccccd
-g_dfmt(0) gives 3 bytes: "1.3"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ff4cccc cccccccc = 1.2999999999999998
-fI[1] = #3ff4cccc cccccccd = 1.3
-fI[1] == strtod
-
-
-Input: -1.3
-strtod consumes 4 bytes and returns 25 with f = -1.2999999999999998 = #bff4cccc cccccccc
-g_dfmt(0) gives 19 bytes: "-1.2999999999999998"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bff4cccc cccccccd = -1.3
-fI[1] = #bff4cccc cccccccc = -1.2999999999999998
-fI[1] == strtod
-
-
-Input: 1.4
-strtod consumes 3 bytes and returns 33 with f = 1.4000000000000001 = #3ff66666 66666667
-g_dfmt(0) gives 18 bytes: "1.4000000000000001"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ff66666 66666666 = 1.3999999999999999
-fI[1] = #3ff66666 66666667 = 1.4000000000000001
-fI[1] == strtod
-
-
-Input: -1.4
-strtod consumes 4 bytes and returns 25 with f = -1.3999999999999999 = #bff66666 66666666
-g_dfmt(0) gives 4 bytes: "-1.4"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bff66666 66666667 = -1.4000000000000001
-fI[1] = #bff66666 66666666 = -1.3999999999999999
-fI[1] == strtod
-
-
-Input: 1.5
-strtod consumes 3 bytes and returns 1 with f = 1.5 = #3ff80000 0
-g_dfmt(0) gives 3 bytes: "1.5"
-
-strtoId returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtod
-
-
-Input: -1.5
-strtod consumes 4 bytes and returns 9 with f = -1.5 = #bff80000 0
-g_dfmt(0) gives 4 bytes: "-1.5"
-
-strtoId returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtod
-
-
-Input: 1.6
-strtod consumes 3 bytes and returns 33 with f = 1.6000000000000001 = #3ff99999 9999999a
-g_dfmt(0) gives 3 bytes: "1.6"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ff99999 99999999 = 1.5999999999999999
-fI[1] = #3ff99999 9999999a = 1.6000000000000001
-fI[1] == strtod
-
-
-Input: -1.6
-strtod consumes 4 bytes and returns 25 with f = -1.5999999999999999 = #bff99999 99999999
-g_dfmt(0) gives 19 bytes: "-1.5999999999999999"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bff99999 9999999a = -1.6000000000000001
-fI[1] = #bff99999 99999999 = -1.5999999999999999
-fI[1] == strtod
-
-
-Input: 1.7
-strtod consumes 3 bytes and returns 33 with f = 1.7000000000000002 = #3ffb3333 33333334
-g_dfmt(0) gives 18 bytes: "1.7000000000000002"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ffb3333 33333333 = 1.7
-fI[1] = #3ffb3333 33333334 = 1.7000000000000002
-fI[1] == strtod
-
-
-Input: -1.7
-strtod consumes 4 bytes and returns 25 with f = -1.7 = #bffb3333 33333333
-g_dfmt(0) gives 4 bytes: "-1.7"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bffb3333 33333334 = -1.7000000000000002
-fI[1] = #bffb3333 33333333 = -1.7
-fI[1] == strtod
-
-
-Input: 1.8
-strtod consumes 3 bytes and returns 33 with f = 1.8 = #3ffccccc cccccccd
-g_dfmt(0) gives 3 bytes: "1.8"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ffccccc cccccccc = 1.7999999999999998
-fI[1] = #3ffccccc cccccccd = 1.8
-fI[1] == strtod
-
-
-Input: -1.8
-strtod consumes 4 bytes and returns 25 with f = -1.7999999999999998 = #bffccccc cccccccc
-g_dfmt(0) gives 19 bytes: "-1.7999999999999998"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bffccccc cccccccd = -1.8
-fI[1] = #bffccccc cccccccc = -1.7999999999999998
-fI[1] == strtod
-
-
-Input: 1.9
-strtod consumes 3 bytes and returns 33 with f = 1.9000000000000001 = #3ffe6666 66666667
-g_dfmt(0) gives 18 bytes: "1.9000000000000001"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ffe6666 66666666 = 1.8999999999999999
-fI[1] = #3ffe6666 66666667 = 1.9000000000000001
-fI[1] == strtod
-
-
-Input: -1.9
-strtod consumes 4 bytes and returns 25 with f = -1.8999999999999999 = #bffe6666 66666666
-g_dfmt(0) gives 4 bytes: "-1.9"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bffe6666 66666667 = -1.9000000000000001
-fI[1] = #bffe6666 66666666 = -1.8999999999999999
-fI[1] == strtod
-
-Rounding mode for strtor... changed from 2 (toward +Infinity) to 3 (toward -Infinity)
-
-Input: 1.1
-strtod consumes 3 bytes and returns 17 with f = 1.0999999999999999 = #3ff19999 99999999
-g_dfmt(0) gives 18 bytes: "1.0999999999999999"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ff19999 99999999 = 1.0999999999999999
-fI[1] = #3ff19999 9999999a = 1.1000000000000001
-fI[0] == strtod
-
-
-Input: -1.1
-strtod consumes 4 bytes and returns 41 with f = -1.1000000000000001 = #bff19999 9999999a
-g_dfmt(0) gives 4 bytes: "-1.1"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bff19999 9999999a = -1.1000000000000001
-fI[1] = #bff19999 99999999 = -1.0999999999999999
-fI[0] == strtod
-
-
-Input: 1.2
-strtod consumes 3 bytes and returns 17 with f = 1.2 = #3ff33333 33333333
-g_dfmt(0) gives 3 bytes: "1.2"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ff33333 33333333 = 1.2
-fI[1] = #3ff33333 33333334 = 1.2000000000000002
-fI[0] == strtod
-
-
-Input: -1.2
-strtod consumes 4 bytes and returns 41 with f = -1.2000000000000002 = #bff33333 33333334
-g_dfmt(0) gives 19 bytes: "-1.2000000000000002"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bff33333 33333334 = -1.2000000000000002
-fI[1] = #bff33333 33333333 = -1.2
-fI[0] == strtod
-
-
-Input: 1.3
-strtod consumes 3 bytes and returns 17 with f = 1.2999999999999998 = #3ff4cccc cccccccc
-g_dfmt(0) gives 18 bytes: "1.2999999999999998"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ff4cccc cccccccc = 1.2999999999999998
-fI[1] = #3ff4cccc cccccccd = 1.3
-fI[0] == strtod
-
-
-Input: -1.3
-strtod consumes 4 bytes and returns 41 with f = -1.3 = #bff4cccc cccccccd
-g_dfmt(0) gives 4 bytes: "-1.3"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bff4cccc cccccccd = -1.3
-fI[1] = #bff4cccc cccccccc = -1.2999999999999998
-fI[0] == strtod
-
-
-Input: 1.4
-strtod consumes 3 bytes and returns 17 with f = 1.3999999999999999 = #3ff66666 66666666
-g_dfmt(0) gives 3 bytes: "1.4"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ff66666 66666666 = 1.3999999999999999
-fI[1] = #3ff66666 66666667 = 1.4000000000000001
-fI[0] == strtod
-
-
-Input: -1.4
-strtod consumes 4 bytes and returns 41 with f = -1.4000000000000001 = #bff66666 66666667
-g_dfmt(0) gives 19 bytes: "-1.4000000000000001"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bff66666 66666667 = -1.4000000000000001
-fI[1] = #bff66666 66666666 = -1.3999999999999999
-fI[0] == strtod
-
-
-Input: 1.5
-strtod consumes 3 bytes and returns 1 with f = 1.5 = #3ff80000 0
-g_dfmt(0) gives 3 bytes: "1.5"
-
-strtoId returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtod
-
-
-Input: -1.5
-strtod consumes 4 bytes and returns 9 with f = -1.5 = #bff80000 0
-g_dfmt(0) gives 4 bytes: "-1.5"
-
-strtoId returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtod
-
-
-Input: 1.6
-strtod consumes 3 bytes and returns 17 with f = 1.5999999999999999 = #3ff99999 99999999
-g_dfmt(0) gives 18 bytes: "1.5999999999999999"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ff99999 99999999 = 1.5999999999999999
-fI[1] = #3ff99999 9999999a = 1.6000000000000001
-fI[0] == strtod
-
-
-Input: -1.6
-strtod consumes 4 bytes and returns 41 with f = -1.6000000000000001 = #bff99999 9999999a
-g_dfmt(0) gives 4 bytes: "-1.6"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bff99999 9999999a = -1.6000000000000001
-fI[1] = #bff99999 99999999 = -1.5999999999999999
-fI[0] == strtod
-
-
-Input: 1.7
-strtod consumes 3 bytes and returns 17 with f = 1.7 = #3ffb3333 33333333
-g_dfmt(0) gives 3 bytes: "1.7"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ffb3333 33333333 = 1.7
-fI[1] = #3ffb3333 33333334 = 1.7000000000000002
-fI[0] == strtod
-
-
-Input: -1.7
-strtod consumes 4 bytes and returns 41 with f = -1.7000000000000002 = #bffb3333 33333334
-g_dfmt(0) gives 19 bytes: "-1.7000000000000002"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bffb3333 33333334 = -1.7000000000000002
-fI[1] = #bffb3333 33333333 = -1.7
-fI[0] == strtod
-
-
-Input: 1.8
-strtod consumes 3 bytes and returns 17 with f = 1.7999999999999998 = #3ffccccc cccccccc
-g_dfmt(0) gives 18 bytes: "1.7999999999999998"
-
-strtoId returns 33, consuming 3 bytes.
-fI[0] = #3ffccccc cccccccc = 1.7999999999999998
-fI[1] = #3ffccccc cccccccd = 1.8
-fI[0] == strtod
-
-
-Input: -1.8
-strtod consumes 4 bytes and returns 41 with f = -1.8 = #bffccccc cccccccd
-g_dfmt(0) gives 4 bytes: "-1.8"
-
-strtoId returns 41, consuming 4 bytes.
-fI[0] = #bffccccc cccccccd = -1.8
-fI[1] = #bffccccc cccccccc = -1.7999999999999998
-fI[0] == strtod
-
-
-Input: 1.9
-strtod consumes 3 bytes and returns 17 with f = 1.8999999999999999 = #3ffe6666 66666666
-g_dfmt(0) gives 3 bytes: "1.9"
-
-strtoId returns 17, consuming 3 bytes.
-fI[0] = #3ffe6666 66666666 = 1.8999999999999999
-fI[1] = #3ffe6666 66666667 = 1.9000000000000001
-fI[0] == strtod
-
-
-Input: -1.9
-strtod consumes 4 bytes and returns 41 with f = -1.9000000000000001 = #bffe6666 66666667
-g_dfmt(0) gives 19 bytes: "-1.9000000000000001"
-
-strtoId returns 25, consuming 4 bytes.
-fI[0] = #bffe6666 66666667 = -1.9000000000000001
-fI[1] = #bffe6666 66666666 = -1.8999999999999999
-fI[0] == strtod
-
diff --git a/lib/libc/gdtoa/test/dI.out b/lib/libc/gdtoa/test/dI.out
deleted file mode 100644
index b4070de80..000000000
--- a/lib/libc/gdtoa/test/dI.out
+++ /dev/null
@@ -1,168 +0,0 @@
-
-Input: 1.23
-strtodI consumes 4 bytes and returns 17
-dd[0] = #3ff3ae14 7ae147ae = 1.23
-dd[1] = #3ff3ae14 7ae147af = 1.2300000000000002
-
-
-Input: 1.23e+20
-strtodI consumes 8 bytes and returns 1
-dd[0] = #441aabdf 2145b430 = 1.23e+20
-dd[1] = #441aabdf 2145b430 = 1.23e+20
-
-
-Input: 1.23e-20
-strtodI consumes 8 bytes and returns 33
-dd[0] = #3bcd0ae4 cf767530 = 1.2299999999999999e-20
-dd[1] = #3bcd0ae4 cf767531 = 1.23e-20
-
-
-Input: 1.23456789
-strtodI consumes 10 bytes and returns 17
-dd[0] = #3ff3c0ca 4283de1b = 1.23456789
-dd[1] = #3ff3c0ca 4283de1c = 1.2345678900000001
-
-
-Input: 1.23456589e+20
-strtodI consumes 14 bytes and returns 17
-dd[0] = #441ac537 a660b997 = 1.23456589e+20
-dd[1] = #441ac537 a660b998 = 123456589000000010000
-
-
-Input: 1.23e+30
-strtodI consumes 8 bytes and returns 17
-dd[0] = #462f0cb0 4e8fb790 = 1.23e+30
-dd[1] = #462f0cb0 4e8fb791 = 1.2300000000000001e+30
-
-
-Input: 1.23e-30
-strtodI consumes 8 bytes and returns 33
-dd[0] = #39b8f286 6f5010aa = 1.2299999999999999e-30
-dd[1] = #39b8f286 6f5010ab = 1.23e-30
-
-
-Input: 1.23456789e-20
-strtodI consumes 14 bytes and returns 17
-dd[0] = #3bcd2681 471e7ada = 1.23456789e-20
-dd[1] = #3bcd2681 471e7adb = 1.2345678900000001e-20
-
-
-Input: 1.23456789e-30
-strtodI consumes 14 bytes and returns 17
-dd[0] = #39b90a3e 33bbd995 = 1.23456789e-30
-dd[1] = #39b90a3e 33bbd996 = 1.2345678900000002e-30
-
-
-Input: 1.234567890123456789
-strtodI consumes 20 bytes and returns 17
-dd[0] = #3ff3c0ca 428c59fb = 1.2345678901234567
-dd[1] = #3ff3c0ca 428c59fc = 1.234567890123457
-
-
-Input: 1.23456789012345678901234567890123456789
-strtodI consumes 40 bytes and returns 17
-dd[0] = #3ff3c0ca 428c59fb = 1.2345678901234567
-dd[1] = #3ff3c0ca 428c59fc = 1.234567890123457
-
-
-Input: 1.23e306
-strtodI consumes 8 bytes and returns 33
-dd[0] = #7f7c0676 cd1c61f4 = 1.2299999999999999e+306
-dd[1] = #7f7c0676 cd1c61f5 = 1.23e+306
-
-
-Input: 1.23e-306
-strtodI consumes 9 bytes and returns 33
-dd[0] = #6ba3b8 5da396e7 = 1.2299999999999999e-306
-dd[1] = #6ba3b8 5da396e8 = 1.23e-306
-
-
-Input: 1.23e-320
-strtodI consumes 9 bytes and returns 98
-dd[0] = #0 9b9 = 1.2297e-320
-dd[1] = #0 9ba = 1.23e-320
-
-
-Input: 1.23e-20
-strtodI consumes 8 bytes and returns 33
-dd[0] = #3bcd0ae4 cf767530 = 1.2299999999999999e-20
-dd[1] = #3bcd0ae4 cf767531 = 1.23e-20
-
-
-Input: 1.23456789e307
-strtodI consumes 14 bytes and returns 33
-dd[0] = #7fb194b1 4bdaecdb = 1.2345678899999998e+307
-dd[1] = #7fb194b1 4bdaecdc = 1.23456789e+307
-
-
-Input: 1.23456589e-307
-strtodI consumes 15 bytes and returns 17
-dd[0] = #363196 bb9845fa = 1.23456589e-307
-dd[1] = #363196 bb9845fb = 1.2345658900000001e-307
-
-
-Input: 1.234567890123456789
-strtodI consumes 20 bytes and returns 17
-dd[0] = #3ff3c0ca 428c59fb = 1.2345678901234567
-dd[1] = #3ff3c0ca 428c59fc = 1.234567890123457
-
-
-Input: 1.234567890123456789e301
-strtodI consumes 24 bytes and returns 17
-dd[0] = #7e726f51 75f56413 = 1.2345678901234568e+301
-dd[1] = #7e726f51 75f56414 = 1.234567890123457e+301
-
-
-Input: 1.234567890123456789e-301
-strtodI consumes 25 bytes and returns 17
-dd[0] = #1752a64 e34ba0d3 = 1.2345678901234567e-301
-dd[1] = #1752a64 e34ba0d4 = 1.234567890123457e-301
-
-
-Input: 1.234567890123456789e-321
-strtodI consumes 25 bytes and returns 98
-dd[0] = #0 f9 = 1.23e-321
-dd[1] = #0 fa = 1.235e-321
-
-
-Input: 1e23
-strtodI consumes 4 bytes and returns 17
-dd[0] = #44b52d02 c7e14af6 = 1e+23
-dd[1] = #44b52d02 c7e14af7 = 1.0000000000000001e+23
-
-
-Input: 1e310
-strtodI consumes 5 bytes and returns 163
-dd[0] = #7fefffff ffffffff = 1.7976931348623157e+308
-dd[1] = #7ff00000 0 = Infinity
-
-
-Input: 9.0259718793241475e-277
-strtodI consumes 23 bytes and returns 33
-dd[0] = #69fffff ffffffff = 9.025971879324147e-277
-dd[1] = #6a00000 0 = 9.025971879324148e-277
-
-
-Input: 9.025971879324147880346310405869e-277
-strtodI consumes 37 bytes and returns 17
-dd[0] = #6a00000 0 = 9.025971879324148e-277
-dd[1] = #6a00000 1 = 9.02597187932415e-277
-
-
-Input: 9.025971879324147880346310405868e-277
-strtodI consumes 37 bytes and returns 33
-dd[0] = #69fffff ffffffff = 9.025971879324147e-277
-dd[1] = #6a00000 0 = 9.025971879324148e-277
-
-
-Input: 2.2250738585072014e-308
-strtodI consumes 23 bytes and returns 17
-dd[0] = #100000 0 = 2.2250738585072014e-308
-dd[1] = #100000 1 = 2.225073858507202e-308
-
-
-Input: 2.2250738585072013e-308
-strtodI consumes 23 bytes and returns 33
-dd[0] = #fffff ffffffff = 2.225073858507201e-308
-dd[1] = #100000 0 = 2.2250738585072014e-308
-
diff --git a/lib/libc/gdtoa/test/dIsi.out b/lib/libc/gdtoa/test/dIsi.out
deleted file mode 100644
index 3388a1a4b..000000000
--- a/lib/libc/gdtoa/test/dIsi.out
+++ /dev/null
@@ -1,168 +0,0 @@
-
-Input: 1.23
-strtodI consumes 4 bytes and returns 17
-dd[0] = #3ff3ae14 7ae147ae = 1.23
-dd[1] = #3ff3ae14 7ae147af = 1.2300000000000002
-
-
-Input: 1.23e+20
-strtodI consumes 8 bytes and returns 1
-dd[0] = #441aabdf 2145b430 = 1.23e+20
-dd[1] = #441aabdf 2145b430 = 1.23e+20
-
-
-Input: 1.23e-20
-strtodI consumes 8 bytes and returns 33
-dd[0] = #3bcd0ae4 cf767530 = 1.2299999999999999e-20
-dd[1] = #3bcd0ae4 cf767531 = 1.23e-20
-
-
-Input: 1.23456789
-strtodI consumes 10 bytes and returns 17
-dd[0] = #3ff3c0ca 4283de1b = 1.23456789
-dd[1] = #3ff3c0ca 4283de1c = 1.2345678900000001
-
-
-Input: 1.23456589e+20
-strtodI consumes 14 bytes and returns 17
-dd[0] = #441ac537 a660b997 = 1.23456589e+20
-dd[1] = #441ac537 a660b998 = 123456589000000010000
-
-
-Input: 1.23e+30
-strtodI consumes 8 bytes and returns 17
-dd[0] = #462f0cb0 4e8fb790 = 1.23e+30
-dd[1] = #462f0cb0 4e8fb791 = 1.2300000000000001e+30
-
-
-Input: 1.23e-30
-strtodI consumes 8 bytes and returns 33
-dd[0] = #39b8f286 6f5010aa = 1.2299999999999999e-30
-dd[1] = #39b8f286 6f5010ab = 1.23e-30
-
-
-Input: 1.23456789e-20
-strtodI consumes 14 bytes and returns 17
-dd[0] = #3bcd2681 471e7ada = 1.23456789e-20
-dd[1] = #3bcd2681 471e7adb = 1.2345678900000001e-20
-
-
-Input: 1.23456789e-30
-strtodI consumes 14 bytes and returns 17
-dd[0] = #39b90a3e 33bbd995 = 1.23456789e-30
-dd[1] = #39b90a3e 33bbd996 = 1.2345678900000002e-30
-
-
-Input: 1.234567890123456789
-strtodI consumes 20 bytes and returns 17
-dd[0] = #3ff3c0ca 428c59fb = 1.2345678901234567
-dd[1] = #3ff3c0ca 428c59fc = 1.234567890123457
-
-
-Input: 1.23456789012345678901234567890123456789
-strtodI consumes 40 bytes and returns 17
-dd[0] = #3ff3c0ca 428c59fb = 1.2345678901234567
-dd[1] = #3ff3c0ca 428c59fc = 1.234567890123457
-
-
-Input: 1.23e306
-strtodI consumes 8 bytes and returns 33
-dd[0] = #7f7c0676 cd1c61f4 = 1.2299999999999999e+306
-dd[1] = #7f7c0676 cd1c61f5 = 1.23e+306
-
-
-Input: 1.23e-306
-strtodI consumes 9 bytes and returns 33
-dd[0] = #6ba3b8 5da396e7 = 1.2299999999999999e-306
-dd[1] = #6ba3b8 5da396e8 = 1.23e-306
-
-
-Input: 1.23e-320
-strtodI consumes 9 bytes and returns 80
-dd[0] = #0 0 = 0
-dd[1] = #100000 0 = 2.2250738585072014e-308
-
-
-Input: 1.23e-20
-strtodI consumes 8 bytes and returns 33
-dd[0] = #3bcd0ae4 cf767530 = 1.2299999999999999e-20
-dd[1] = #3bcd0ae4 cf767531 = 1.23e-20
-
-
-Input: 1.23456789e307
-strtodI consumes 14 bytes and returns 33
-dd[0] = #7fb194b1 4bdaecdb = 1.2345678899999998e+307
-dd[1] = #7fb194b1 4bdaecdc = 1.23456789e+307
-
-
-Input: 1.23456589e-307
-strtodI consumes 15 bytes and returns 17
-dd[0] = #363196 bb9845fa = 1.23456589e-307
-dd[1] = #363196 bb9845fb = 1.2345658900000001e-307
-
-
-Input: 1.234567890123456789
-strtodI consumes 20 bytes and returns 17
-dd[0] = #3ff3c0ca 428c59fb = 1.2345678901234567
-dd[1] = #3ff3c0ca 428c59fc = 1.234567890123457
-
-
-Input: 1.234567890123456789e301
-strtodI consumes 24 bytes and returns 17
-dd[0] = #7e726f51 75f56413 = 1.2345678901234568e+301
-dd[1] = #7e726f51 75f56414 = 1.234567890123457e+301
-
-
-Input: 1.234567890123456789e-301
-strtodI consumes 25 bytes and returns 17
-dd[0] = #1752a64 e34ba0d3 = 1.2345678901234567e-301
-dd[1] = #1752a64 e34ba0d4 = 1.234567890123457e-301
-
-
-Input: 1.234567890123456789e-321
-strtodI consumes 25 bytes and returns 80
-dd[0] = #0 0 = 0
-dd[1] = #100000 0 = 2.2250738585072014e-308
-
-
-Input: 1e23
-strtodI consumes 4 bytes and returns 17
-dd[0] = #44b52d02 c7e14af6 = 1e+23
-dd[1] = #44b52d02 c7e14af7 = 1.0000000000000001e+23
-
-
-Input: 1e310
-strtodI consumes 5 bytes and returns 163
-dd[0] = #7fefffff ffffffff = 1.7976931348623157e+308
-dd[1] = #7ff00000 0 = Infinity
-
-
-Input: 9.0259718793241475e-277
-strtodI consumes 23 bytes and returns 33
-dd[0] = #69fffff ffffffff = 9.025971879324147e-277
-dd[1] = #6a00000 0 = 9.025971879324148e-277
-
-
-Input: 9.025971879324147880346310405869e-277
-strtodI consumes 37 bytes and returns 17
-dd[0] = #6a00000 0 = 9.025971879324148e-277
-dd[1] = #6a00000 1 = 9.02597187932415e-277
-
-
-Input: 9.025971879324147880346310405868e-277
-strtodI consumes 37 bytes and returns 33
-dd[0] = #69fffff ffffffff = 9.025971879324147e-277
-dd[1] = #6a00000 0 = 9.025971879324148e-277
-
-
-Input: 2.2250738585072014e-308
-strtodI consumes 23 bytes and returns 17
-dd[0] = #100000 0 = 2.2250738585072014e-308
-dd[1] = #100000 1 = 2.225073858507202e-308
-
-
-Input: 2.2250738585072013e-308
-strtodI consumes 23 bytes and returns 33
-dd[0] = #0 0 = 0
-dd[1] = #100000 0 = 2.2250738585072014e-308
-
diff --git a/lib/libc/gdtoa/test/dItest.c b/lib/libc/gdtoa/test/dItest.c
deleted file mode 100644
index 1724c7153..000000000
--- a/lib/libc/gdtoa/test/dItest.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2001 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-#include <stdio.h>
-#include <stdlib.h>
-
- static char ibuf[2048];
-
-#define U (unsigned long)
-
- static void
-#ifdef KR_headers
-dshow(what, d) char *what; double d;
-#else
-dshow(char *what, double d)
-#endif
-{
-	char buf[32];
-	g_dfmt(buf, &d, 0, sizeof(buf));
-	printf("%s = #%lx %lx = %s\n", what,
-		U ((ULong*)&d)[_0], U ((ULong*)&d)[_1], buf);
-	}
-
- int
-main(Void)
-{
-	/* Input: one number per line */
-
-	char *s, *se, *se1;
-	int i, j;
-	double dd[2], dd1, dd2;
-	static char cfmt[] = "%s consumes %d bytes and returns %d\n";
-
-	while( (s = fgets(ibuf, sizeof(ibuf), stdin)) !=0) {
-		while(*s <= ' ')
-			if (!*s++)
-				continue;
-		printf("\nInput: %s", ibuf);
-		i = strtodI(ibuf, &se, dd);
-		printf(cfmt, "strtodI", (int)(se-ibuf), i);
-		dshow("dd[0]", dd[0]);
-		dshow("dd[1]", dd[1]);
-		printf("\n");
-		j = strtoId(ibuf, &se1, &dd1, &dd2);
-		if (j != i || se != se1
-		 || dd[0] != dd1 || dd[1] != dd2) {
-			printf(cfmt, "**** strtoId", (int)(se-ibuf), j);
-			dshow("dd1", dd1);
-			dshow("dd2", dd2);
-			}
-		}
-	return 0;
-	}
diff --git a/lib/libc/gdtoa/test/dd.out b/lib/libc/gdtoa/test/dd.out
deleted file mode 100644
index b1d274447..000000000
--- a/lib/libc/gdtoa/test/dd.out
+++ /dev/null
@@ -1,1356 +0,0 @@
-
-Input: 1.23
-strtopdd consumes 4 bytes and returns 17
-dd[0] = 1.23 = #3ff3ae14 7ae147ae
-dd[1] = 1.7763568394002496e-17 = #3c747ae1 47ae1478
-g_ddfmt(0) gives 4 bytes: "1.23"
-
-strtoIdd returns 17, consuming 4 bytes.
-ddI[0] = #3ff3ae14 7ae147ae + 3c747ae1 47ae1478
-= 1.23 + 1.7763568394002496e-17
-ddI[1] = #3ff3ae14 7ae147ae + 3c747ae1 47ae1480
-= 1.23 + 1.776356839400252e-17
-ddI[0] == strtod
-
-
-Input: 1.23e+20
-strtopdd consumes 8 bytes and returns 1
-dd[0] = 1.23e+20 = #441aabdf 2145b430
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 8 bytes: "1.23e+20"
-
-strtoIdd returns 1, consuming 8 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: 1.23e-20
-strtopdd consumes 8 bytes and returns 33
-dd[0] = 1.2299999999999999e-20 = #3bcd0ae4 cf767530
-dd[1] = 9.304023318521521e-37 = #3873c997 955b2691
-g_ddfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIdd returns 33, consuming 8 bytes.
-ddI[0] = #3bcd0ae4 cf767530 + 3873c997 955b2690
-= 1.2299999999999999e-20 + 9.3040233185215194e-37
-ddI[1] = #3bcd0ae4 cf767530 + 3873c997 955b2691
-= 1.2299999999999999e-20 + 9.3040233185215211e-37
-ddI[1] == strtod
-
-
-Input: 1.23456789
-strtopdd consumes 10 bytes and returns 17
-dd[0] = 1.23456789 = #3ff3c0ca 4283de1b
-dd[1] = 1.0990618193318369e-16 = #3c9fada5 144c1252
-g_ddfmt(0) gives 10 bytes: "1.23456789"
-
-strtoIdd returns 17, consuming 10 bytes.
-ddI[0] = #3ff3c0ca 4283de1b + 3c9fada5 144c1252
-= 1.2345678899999999 + 1.0990618193318369e-16
-ddI[1] = #3ff3c0ca 4283de1b + 3c9fada5 144c1254
-= 1.2345678899999999 + 1.0990618193318371e-16
-ddI[0] == strtod
-
-
-Input: 1.23456589e+20
-strtopdd consumes 14 bytes and returns 1
-dd[0] = 1.23456589e+20 = #441ac537 a660b997
-dd[1] = 4096 = #40b00000 0
-g_ddfmt(0) gives 14 bytes: "1.23456589e+20"
-
-strtoIdd returns 1, consuming 14 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: 1.23e+30
-strtopdd consumes 8 bytes and returns 1
-dd[0] = 1.23e+30 = #462f0cb0 4e8fb790
-dd[1] = 40281156091904 = #42c25158 0
-g_ddfmt(0) gives 8 bytes: "1.23e+30"
-
-strtoIdd returns 1, consuming 8 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: 1.23e-30
-strtopdd consumes 8 bytes and returns 17
-dd[0] = 1.2299999999999999e-30 = #39b8f286 6f5010aa
-dd[1] = 1.076909723013918e-46 = #3663ac7f 3dafd174
-g_ddfmt(0) gives 8 bytes: "1.23e-30"
-
-strtoIdd returns 17, consuming 8 bytes.
-ddI[0] = #39b8f286 6f5010aa + 3663ac7f 3dafd174
-= 1.2299999999999999e-30 + 1.076909723013918e-46
-ddI[1] = #39b8f286 6f5010aa + 3663ac7f 3dafd175
-= 1.2299999999999999e-30 + 1.0769097230139181e-46
-ddI[0] == strtod
-
-
-Input: 1.23456789e-20
-strtopdd consumes 14 bytes and returns 17
-dd[0] = 1.23456789e-20 = #3bcd2681 471e7ada
-dd[1] = 6.247111971663133e-37 = #386a9280 a761b07e
-g_ddfmt(0) gives 14 bytes: "1.23456789e-20"
-
-strtoIdd returns 17, consuming 14 bytes.
-ddI[0] = #3bcd2681 471e7ada + 386a9280 a761b07e
-= 1.2345678899999999e-20 + 6.2471119716631328e-37
-ddI[1] = #3bcd2681 471e7ada + 386a9280 a761b080
-= 1.2345678899999999e-20 + 6.2471119716631345e-37
-ddI[0] == strtod
-
-
-Input: 1.23456789e-30
-strtopdd consumes 14 bytes and returns 33
-dd[0] = 1.23456789e-30 = #39b90a3e 33bbd995
-dd[1] = 2.1567930523648577e-47 = #363f8585 55a6b1a0
-g_ddfmt(0) gives 14 bytes: "1.23456789e-30"
-
-strtoIdd returns 33, consuming 14 bytes.
-ddI[0] = #39b90a3e 33bbd995 + 363f8585 55a6b198
-= 1.23456789e-30 + 2.1567930523648558e-47
-ddI[1] = #39b90a3e 33bbd995 + 363f8585 55a6b1a0
-= 1.23456789e-30 + 2.1567930523648577e-47
-ddI[1] == strtod
-
-
-Input: 1.234567890123456789
-strtopdd consumes 20 bytes and returns 33
-dd[0] = 1.2345678901234567 = #3ff3c0ca 428c59fb
-dd[1] = 9.856786452588859e-17 = #3c9c6906 51a3745e
-g_ddfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIdd returns 33, consuming 20 bytes.
-ddI[0] = #3ff3c0ca 428c59fb + 3c9c6906 51a3745c
-= 1.2345678901234567 + 9.8567864525888563e-17
-ddI[1] = #3ff3c0ca 428c59fb + 3c9c6906 51a3745e
-= 1.2345678901234567 + 9.8567864525888588e-17
-ddI[1] == strtod
-
-
-Input: 1.23456789012345678901234567890123456789
-strtopdd consumes 40 bytes and returns 33
-dd[0] = 1.2345678901234567 = #3ff3c0ca 428c59fb
-dd[1] = 9.858021020478982e-17 = #3c9c69ef 85adadb6
-g_ddfmt(0) gives 34 bytes: "1.23456789012345678901234567890124"
-
-strtoIdd returns 33, consuming 40 bytes.
-ddI[0] = #3ff3c0ca 428c59fb + 3c9c69ef 85adadb4
-= 1.2345678901234567 + 9.8580210204789798e-17
-ddI[1] = #3ff3c0ca 428c59fb + 3c9c69ef 85adadb6
-= 1.2345678901234567 + 9.8580210204789823e-17
-ddI[1] == strtod
-
-
-Input: 1.23e306
-strtopdd consumes 8 bytes and returns 33
-dd[0] = 1.2299999999999999e+306 = #7f7c0676 cd1c61f4
-dd[1] = 1.3319001448659015e+290 = #7c2b558b e3d3f477
-g_ddfmt(0) gives 9 bytes: "1.23e+306"
-
-strtoIdd returns 33, consuming 8 bytes.
-ddI[0] = #7f7c0676 cd1c61f4 + 7c2b558b e3d3f476
-= 1.2299999999999999e+306 + 1.3319001448659013e+290
-ddI[1] = #7f7c0676 cd1c61f4 + 7c2b558b e3d3f477
-= 1.2299999999999999e+306 + 1.3319001448659015e+290
-ddI[1] == strtod
-
-
-Input: 1.23e-306
-strtopdd consumes 9 bytes and returns 98
-dd[0] = 1.2299999999999999e-306 = #6ba3b8 5da396e7
-dd[1] = 1.43e-322 = #0 1d
-g_ddfmt(0) gives 9 bytes: "1.23e-306"
-
-strtoIdd returns 98, consuming 9 bytes.
-ddI[0] = #6ba3b8 5da396e7 + 0 1c
-= 1.2299999999999999e-306 + 1.3833838083554903e-322
-ddI[1] = #6ba3b8 5da396e7 + 0 1d
-= 1.2299999999999999e-306 + 1.432790372939615e-322
-ddI[1] == strtod
-
-
-Input: 1.23e-320
-strtopdd consumes 9 bytes and returns 98
-dd[0] = 1.23e-320 = #0 9ba
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 9 bytes: "1.23e-320"
-
-strtoIdd returns 98, consuming 9 bytes.
-ddI[0] = #0 9b9 + 0 0
-= 1.2297293924988626e-320 + 0
-ddI[1] = #0 9ba + 0 0
-= 1.2302234581447039e-320 + 0
-ddI[1] == strtod
-
-
-Input: 1.23e-20
-strtopdd consumes 8 bytes and returns 33
-dd[0] = 1.2299999999999999e-20 = #3bcd0ae4 cf767530
-dd[1] = 9.304023318521521e-37 = #3873c997 955b2691
-g_ddfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIdd returns 33, consuming 8 bytes.
-ddI[0] = #3bcd0ae4 cf767530 + 3873c997 955b2690
-= 1.2299999999999999e-20 + 9.3040233185215194e-37
-ddI[1] = #3bcd0ae4 cf767530 + 3873c997 955b2691
-= 1.2299999999999999e-20 + 9.3040233185215211e-37
-ddI[1] == strtod
-
-
-Input: 1.23456789e307
-strtopdd consumes 14 bytes and returns 33
-dd[0] = 1.2345678899999998e+307 = #7fb194b1 4bdaecdb
-dd[1] = 2.0137933598720243e+291 = #7c69d48d 192048ca
-g_ddfmt(0) gives 15 bytes: "1.23456789e+307"
-
-strtoIdd returns 33, consuming 14 bytes.
-ddI[0] = #7fb194b1 4bdaecdb + 7c69d48d 192048c9
-= 1.2345678899999998e+307 + 2.013793359872024e+291
-ddI[1] = #7fb194b1 4bdaecdb + 7c69d48d 192048ca
-= 1.2345678899999998e+307 + 2.0137933598720243e+291
-ddI[1] == strtod
-
-
-Input: 1.23456589e-307
-strtopdd consumes 15 bytes and returns 98
-dd[0] = 1.23456589e-307 = #363196 bb9845fa
-dd[1] = 1e-323 = #0 2
-g_ddfmt(0) gives 15 bytes: "1.23456589e-307"
-
-strtoIdd returns 98, consuming 15 bytes.
-ddI[0] = #363196 bb9845fa + 0 1
-= 1.2345658899999999e-307 + 4.9406564584124654e-324
-ddI[1] = #363196 bb9845fa + 0 2
-= 1.2345658899999999e-307 + 9.8813129168249309e-324
-ddI[1] == strtod
-
-
-Input: 1.234567890123456789
-strtopdd consumes 20 bytes and returns 33
-dd[0] = 1.2345678901234567 = #3ff3c0ca 428c59fb
-dd[1] = 9.856786452588859e-17 = #3c9c6906 51a3745e
-g_ddfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIdd returns 33, consuming 20 bytes.
-ddI[0] = #3ff3c0ca 428c59fb + 3c9c6906 51a3745c
-= 1.2345678901234567 + 9.8567864525888563e-17
-ddI[1] = #3ff3c0ca 428c59fb + 3c9c6906 51a3745e
-= 1.2345678901234567 + 9.8567864525888588e-17
-ddI[1] == strtod
-
-
-Input: 1.234567890123456789e301
-strtopdd consumes 24 bytes and returns 33
-dd[0] = 1.2345678901234568e+301 = #7e726f51 75f56413
-dd[1] = 1.3892003943918827e+283 = #7ab7ea80 76399100
-g_ddfmt(0) gives 25 bytes: "1.234567890123456789e+301"
-
-strtoIdd returns 33, consuming 24 bytes.
-ddI[0] = #7e726f51 75f56413 + 7ab7ea80 76399080
-= 1.2345678901234568e+301 + 1.3892003943918563e+283
-ddI[1] = #7e726f51 75f56413 + 7ab7ea80 76399100
-= 1.2345678901234568e+301 + 1.3892003943918827e+283
-ddI[1] == strtod
-
-
-Input: 1.234567890123456789e-301
-strtopdd consumes 25 bytes and returns 82
-dd[0] = 1.2345678901234567e-301 = #1752a64 e34ba0d3
-dd[1] = 7.374365e-318 = #0 16c66c
-g_ddfmt(0) gives 25 bytes: "1.234567890123456789e-301"
-
-strtoIdd returns 82, consuming 25 bytes.
-ddI[0] = #1752a64 e34ba0d3 + 0 16c66c
-= 1.2345678901234567e-301 + 7.374364541948945e-318
-ddI[1] = #1752a64 e34ba0d3 + 0 16c66d
-= 1.2345678901234567e-301 + 7.3743694826054034e-318
-ddI[0] == strtod
-
-
-Input: 1.234567890123456789e-321
-strtopdd consumes 25 bytes and returns 98
-dd[0] = 1.235e-321 = #0 fa
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 10 bytes: "1.235e-321"
-
-strtoIdd returns 98, consuming 25 bytes.
-ddI[0] = #0 f9 + 0 0
-= 1.2302234581447039e-321 + 0
-ddI[1] = #0 fa + 0 0
-= 1.2351641146031164e-321 + 0
-ddI[1] == strtod
-
-
-Input: 1e23
-strtopdd consumes 4 bytes and returns 1
-dd[0] = 1e+23 = #44b52d02 c7e14af6
-dd[1] = 8388608 = #41600000 0
-g_ddfmt(0) gives 5 bytes: "1e+23"
-
-strtoIdd returns 1, consuming 4 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: 1e310
-strtopdd consumes 5 bytes and returns 163
-dd[0] = Infinity = #7ff00000 0
-dd[1] = Infinity = #7ff00000 0
-g_ddfmt(0) gives 8 bytes: "Infinity"
-
-strtoIdd returns 163, consuming 5 bytes.
-ddI[0] = #7fefffff ffffffff + 7c9fffff ffffffff
-= 1.7976931348623157e+308 + 1.9958403095347196e+292
-ddI[1] = #7ff00000 0 + 7ff00000 0
-= Infinity + Infinity
-ddI[1] == strtod
-
-
-Input: 9.0259718793241475e-277
-strtopdd consumes 23 bytes and returns 33
-dd[0] = 9.025971879324147e-277 = #69fffff ffffffff
-dd[1] = 6.217378695986177e-293 = #343daae f3582320
-g_ddfmt(0) gives 23 bytes: "9.0259718793241475e-277"
-
-strtoIdd returns 33, consuming 23 bytes.
-ddI[0] = #69fffff ffffffff + 343daae f358231f
-= 9.0259718793241469e-277 + 6.2173786959861757e-293
-ddI[1] = #69fffff ffffffff + 343daae f3582320
-= 9.0259718793241469e-277 + 6.2173786959861768e-293
-ddI[1] == strtod
-
-
-Input: 9.025971879324147880346310405869e-277
-strtopdd consumes 37 bytes and returns 17
-dd[0] = 9.025971879324148e-277 = #6a00000 0
-dd[1] = 2.2250738585072014e-308 = #100000 0
-g_ddfmt(0) gives 37 bytes: "9.025971879324147880346310405869e-277"
-
-strtoIdd returns 17, consuming 37 bytes.
-ddI[0] = #6a00000 0 + 100000 0
-= 9.0259718793241479e-277 + 2.2250738585072014e-308
-ddI[1] = #6a00000 0 + 200000 0
-= 9.0259718793241479e-277 + 4.4501477170144028e-308
-ddI[0] == strtod
-
-
-Input: 9.025971879324147880346310405868e-277
-strtopdd consumes 37 bytes and returns 17
-dd[0] = 9.025971879324147e-277 = #69fffff ffffffff
-dd[1] = 1.0020841800044856e-292 = #34fffff fffffff9
-g_ddfmt(0) gives 37 bytes: "9.025971879324147880346310405868e-277"
-
-strtoIdd returns 17, consuming 37 bytes.
-ddI[0] = #69fffff ffffffff + 34fffff fffffff9
-= 9.0259718793241469e-277 + 1.0020841800044856e-292
-ddI[1] = #69fffff ffffffff + 34fffff fffffffa
-= 9.0259718793241469e-277 + 1.0020841800044857e-292
-ddI[0] == strtod
-
-
-Input: 2.2250738585072014e-308
-strtopdd consumes 23 bytes and returns 82
-dd[0] = 2.2250738585072014e-308 = #100000 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 23 bytes: "2.2250738585072014e-308"
-
-strtoIdd returns 82, consuming 23 bytes.
-ddI[0] = #100000 0 + 0 0
-= 2.2250738585072014e-308 + 0
-ddI[1] = #100000 1 + 0 0
-= 2.2250738585072019e-308 + 0
-ddI[0] == strtod
-
-
-Input: 2.2250738585072013e-308
-strtopdd consumes 23 bytes and returns 98
-dd[0] = 2.2250738585072014e-308 = #100000 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 23 bytes: "2.2250738585072014e-308"
-
-strtoIdd returns 98, consuming 23 bytes.
-ddI[0] = #fffff ffffffff + 0 0
-= 2.2250738585072009e-308 + 0
-ddI[1] = #100000 0 + 0 0
-= 2.2250738585072014e-308 + 0
-ddI[1] == strtod
-
-Rounding mode for strtor... changed from 1 (nearest) to 0 (toward zero)
-
-Input: 1.1
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.0999999999999999 = #3ff19999 99999999
-dd[1] = 1.3322676295501878e-16 = #3ca33333 33333333
-g_ddfmt(0) gives 3 bytes: "1.1"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ff19999 99999999 + 3ca33333 33333333
-= 1.0999999999999999 + 1.3322676295501878e-16
-ddI[1] = #3ff19999 99999999 + 3ca33333 33333334
-= 1.0999999999999999 + 1.332267629550188e-16
-ddI[0] == strtod
-
-
-Input: -1.1
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.0999999999999999 = #bff19999 99999999
-dd[1] = -1.3322676295501878e-16 = #bca33333 33333333
-g_ddfmt(0) gives 4 bytes: "-1.1"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bff19999 99999999 + bca33333 33333334
-= -1.0999999999999999 + -1.332267629550188e-16
-ddI[1] = #bff19999 99999999 + bca33333 33333333
-= -1.0999999999999999 + -1.3322676295501878e-16
-ddI[1] == strtod
-
-
-Input: 1.2
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.2 = #3ff33333 33333333
-dd[1] = 4.440892098500625e-17 = #3c899999 99999998
-g_ddfmt(0) gives 3 bytes: "1.2"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ff33333 33333333 + 3c899999 99999998
-= 1.2 + 4.4408920985006252e-17
-ddI[1] = #3ff33333 33333333 + 3c899999 9999999c
-= 1.2 + 4.4408920985006276e-17
-ddI[0] == strtod
-
-
-Input: -1.2
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.2 = #bff33333 33333333
-dd[1] = -4.440892098500625e-17 = #bc899999 99999998
-g_ddfmt(0) gives 4 bytes: "-1.2"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bff33333 33333333 + bc899999 9999999c
-= -1.2 + -4.4408920985006276e-17
-ddI[1] = #bff33333 33333333 + bc899999 99999998
-= -1.2 + -4.4408920985006252e-17
-ddI[1] == strtod
-
-
-Input: 1.3
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.2999999999999998 = #3ff4cccc cccccccc
-dd[1] = 1.7763568394002503e-16 = #3ca99999 99999999
-g_ddfmt(0) gives 34 bytes: "1.29999999999999999999999999999999"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ff4cccc cccccccc + 3ca99999 99999999
-= 1.2999999999999998 + 1.7763568394002503e-16
-ddI[1] = #3ff4cccc cccccccc + 3ca99999 9999999a
-= 1.2999999999999998 + 1.7763568394002506e-16
-ddI[0] == strtod
-
-
-Input: -1.3
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.2999999999999998 = #bff4cccc cccccccc
-dd[1] = -1.7763568394002503e-16 = #bca99999 99999999
-g_ddfmt(0) gives 35 bytes: "-1.29999999999999999999999999999999"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bff4cccc cccccccc + bca99999 9999999a
-= -1.2999999999999998 + -1.7763568394002506e-16
-ddI[1] = #bff4cccc cccccccc + bca99999 99999999
-= -1.2999999999999998 + -1.7763568394002503e-16
-ddI[1] == strtod
-
-
-Input: 1.4
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.4 = #3ff66666 66666666
-dd[1] = 8.88178419700125e-17 = #3c999999 99999998
-g_ddfmt(0) gives 34 bytes: "1.39999999999999999999999999999998"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ff66666 66666666 + 3c999999 99999998
-= 1.3999999999999999 + 8.8817841970012504e-17
-ddI[1] = #3ff66666 66666666 + 3c999999 9999999a
-= 1.3999999999999999 + 8.8817841970012528e-17
-ddI[0] == strtod
-
-
-Input: -1.4
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.4 = #bff66666 66666666
-dd[1] = -8.88178419700125e-17 = #bc999999 99999998
-g_ddfmt(0) gives 35 bytes: "-1.39999999999999999999999999999998"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bff66666 66666666 + bc999999 9999999a
-= -1.3999999999999999 + -8.8817841970012528e-17
-ddI[1] = #bff66666 66666666 + bc999999 99999998
-= -1.3999999999999999 + -8.8817841970012504e-17
-ddI[1] == strtod
-
-
-Input: 1.5
-strtopdd consumes 3 bytes and returns 1
-dd[0] = 1.5 = #3ff80000 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 3 bytes: "1.5"
-
-strtoIdd returns 1, consuming 3 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: -1.5
-strtopdd consumes 4 bytes and returns 9
-dd[0] = -1.5 = #bff80000 0
-dd[1] = -0 = #80000000 0
-g_ddfmt(0) gives 3 bytes: "1.5"
-
-strtoIdd returns 9, consuming 4 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: 1.6
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.5999999999999999 = #3ff99999 99999999
-dd[1] = 1.3322676295501878e-16 = #3ca33333 33333333
-g_ddfmt(0) gives 3 bytes: "1.6"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ff99999 99999999 + 3ca33333 33333333
-= 1.5999999999999999 + 1.3322676295501878e-16
-ddI[1] = #3ff99999 99999999 + 3ca33333 33333334
-= 1.5999999999999999 + 1.332267629550188e-16
-ddI[0] == strtod
-
-
-Input: -1.6
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.5999999999999999 = #bff99999 99999999
-dd[1] = -1.3322676295501878e-16 = #bca33333 33333333
-g_ddfmt(0) gives 4 bytes: "-1.6"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bff99999 99999999 + bca33333 33333334
-= -1.5999999999999999 + -1.332267629550188e-16
-ddI[1] = #bff99999 99999999 + bca33333 33333333
-= -1.5999999999999999 + -1.3322676295501878e-16
-ddI[1] == strtod
-
-
-Input: 1.7
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.7 = #3ffb3333 33333333
-dd[1] = 4.440892098500625e-17 = #3c899999 99999998
-g_ddfmt(0) gives 3 bytes: "1.7"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ffb3333 33333333 + 3c899999 99999998
-= 1.7 + 4.4408920985006252e-17
-ddI[1] = #3ffb3333 33333333 + 3c899999 9999999c
-= 1.7 + 4.4408920985006276e-17
-ddI[0] == strtod
-
-
-Input: -1.7
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.7 = #bffb3333 33333333
-dd[1] = -4.440892098500625e-17 = #bc899999 99999998
-g_ddfmt(0) gives 4 bytes: "-1.7"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bffb3333 33333333 + bc899999 9999999c
-= -1.7 + -4.4408920985006276e-17
-ddI[1] = #bffb3333 33333333 + bc899999 99999998
-= -1.7 + -4.4408920985006252e-17
-ddI[1] == strtod
-
-
-Input: 1.8
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.7999999999999998 = #3ffccccc cccccccc
-dd[1] = 1.7763568394002503e-16 = #3ca99999 99999999
-g_ddfmt(0) gives 34 bytes: "1.79999999999999999999999999999999"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ffccccc cccccccc + 3ca99999 99999999
-= 1.7999999999999998 + 1.7763568394002503e-16
-ddI[1] = #3ffccccc cccccccc + 3ca99999 9999999a
-= 1.7999999999999998 + 1.7763568394002506e-16
-ddI[0] == strtod
-
-
-Input: -1.8
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.7999999999999998 = #bffccccc cccccccc
-dd[1] = -1.7763568394002503e-16 = #bca99999 99999999
-g_ddfmt(0) gives 35 bytes: "-1.79999999999999999999999999999999"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bffccccc cccccccc + bca99999 9999999a
-= -1.7999999999999998 + -1.7763568394002506e-16
-ddI[1] = #bffccccc cccccccc + bca99999 99999999
-= -1.7999999999999998 + -1.7763568394002503e-16
-ddI[1] == strtod
-
-
-Input: 1.9
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.9 = #3ffe6666 66666666
-dd[1] = 8.88178419700125e-17 = #3c999999 99999998
-g_ddfmt(0) gives 34 bytes: "1.89999999999999999999999999999998"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ffe6666 66666666 + 3c999999 99999998
-= 1.8999999999999999 + 8.8817841970012504e-17
-ddI[1] = #3ffe6666 66666666 + 3c999999 9999999a
-= 1.8999999999999999 + 8.8817841970012528e-17
-ddI[0] == strtod
-
-
-Input: -1.9
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.9 = #bffe6666 66666666
-dd[1] = -8.88178419700125e-17 = #bc999999 99999998
-g_ddfmt(0) gives 35 bytes: "-1.89999999999999999999999999999998"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bffe6666 66666666 + bc999999 9999999a
-= -1.8999999999999999 + -8.8817841970012528e-17
-ddI[1] = #bffe6666 66666666 + bc999999 99999998
-= -1.8999999999999999 + -8.8817841970012504e-17
-ddI[1] == strtod
-
-Rounding mode for strtor... changed from 0 (toward zero) to 1 (nearest)
-
-Input: 1.1
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.0999999999999999 = #3ff19999 99999999
-dd[1] = 1.3322676295501878e-16 = #3ca33333 33333333
-g_ddfmt(0) gives 3 bytes: "1.1"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ff19999 99999999 + 3ca33333 33333333
-= 1.0999999999999999 + 1.3322676295501878e-16
-ddI[1] = #3ff19999 99999999 + 3ca33333 33333334
-= 1.0999999999999999 + 1.332267629550188e-16
-ddI[0] == strtod
-
-
-Input: -1.1
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.0999999999999999 = #bff19999 99999999
-dd[1] = -1.3322676295501878e-16 = #bca33333 33333333
-g_ddfmt(0) gives 4 bytes: "-1.1"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bff19999 99999999 + bca33333 33333334
-= -1.0999999999999999 + -1.332267629550188e-16
-ddI[1] = #bff19999 99999999 + bca33333 33333333
-= -1.0999999999999999 + -1.3322676295501878e-16
-ddI[1] == strtod
-
-
-Input: 1.2
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.2 = #3ff33333 33333333
-dd[1] = 4.440892098500625e-17 = #3c899999 99999998
-g_ddfmt(0) gives 3 bytes: "1.2"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ff33333 33333333 + 3c899999 99999998
-= 1.2 + 4.4408920985006252e-17
-ddI[1] = #3ff33333 33333333 + 3c899999 9999999c
-= 1.2 + 4.4408920985006276e-17
-ddI[0] == strtod
-
-
-Input: -1.2
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.2 = #bff33333 33333333
-dd[1] = -4.440892098500625e-17 = #bc899999 99999998
-g_ddfmt(0) gives 4 bytes: "-1.2"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bff33333 33333333 + bc899999 9999999c
-= -1.2 + -4.4408920985006276e-17
-ddI[1] = #bff33333 33333333 + bc899999 99999998
-= -1.2 + -4.4408920985006252e-17
-ddI[1] == strtod
-
-
-Input: 1.3
-strtopdd consumes 3 bytes and returns 33
-dd[0] = 1.2999999999999998 = #3ff4cccc cccccccc
-dd[1] = 1.7763568394002506e-16 = #3ca99999 9999999a
-g_ddfmt(0) gives 3 bytes: "1.3"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ff4cccc cccccccc + 3ca99999 99999999
-= 1.2999999999999998 + 1.7763568394002503e-16
-ddI[1] = #3ff4cccc cccccccc + 3ca99999 9999999a
-= 1.2999999999999998 + 1.7763568394002506e-16
-ddI[1] == strtod
-
-
-Input: -1.3
-strtopdd consumes 4 bytes and returns 41
-dd[0] = -1.2999999999999998 = #bff4cccc cccccccc
-dd[1] = -1.7763568394002506e-16 = #bca99999 9999999a
-g_ddfmt(0) gives 4 bytes: "-1.3"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bff4cccc cccccccc + bca99999 9999999a
-= -1.2999999999999998 + -1.7763568394002506e-16
-ddI[1] = #bff4cccc cccccccc + bca99999 99999999
-= -1.2999999999999998 + -1.7763568394002503e-16
-ddI[0] == strtod
-
-
-Input: 1.4
-strtopdd consumes 3 bytes and returns 33
-dd[0] = 1.4 = #3ff66666 66666666
-dd[1] = 8.881784197001253e-17 = #3c999999 9999999a
-g_ddfmt(0) gives 3 bytes: "1.4"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ff66666 66666666 + 3c999999 99999998
-= 1.3999999999999999 + 8.8817841970012504e-17
-ddI[1] = #3ff66666 66666666 + 3c999999 9999999a
-= 1.3999999999999999 + 8.8817841970012528e-17
-ddI[1] == strtod
-
-
-Input: -1.4
-strtopdd consumes 4 bytes and returns 41
-dd[0] = -1.4 = #bff66666 66666666
-dd[1] = -8.881784197001253e-17 = #bc999999 9999999a
-g_ddfmt(0) gives 4 bytes: "-1.4"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bff66666 66666666 + bc999999 9999999a
-= -1.3999999999999999 + -8.8817841970012528e-17
-ddI[1] = #bff66666 66666666 + bc999999 99999998
-= -1.3999999999999999 + -8.8817841970012504e-17
-ddI[0] == strtod
-
-
-Input: 1.5
-strtopdd consumes 3 bytes and returns 1
-dd[0] = 1.5 = #3ff80000 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 3 bytes: "1.5"
-
-strtoIdd returns 1, consuming 3 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: -1.5
-strtopdd consumes 4 bytes and returns 9
-dd[0] = -1.5 = #bff80000 0
-dd[1] = -0 = #80000000 0
-g_ddfmt(0) gives 3 bytes: "1.5"
-
-strtoIdd returns 9, consuming 4 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: 1.6
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.5999999999999999 = #3ff99999 99999999
-dd[1] = 1.3322676295501878e-16 = #3ca33333 33333333
-g_ddfmt(0) gives 3 bytes: "1.6"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ff99999 99999999 + 3ca33333 33333333
-= 1.5999999999999999 + 1.3322676295501878e-16
-ddI[1] = #3ff99999 99999999 + 3ca33333 33333334
-= 1.5999999999999999 + 1.332267629550188e-16
-ddI[0] == strtod
-
-
-Input: -1.6
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.5999999999999999 = #bff99999 99999999
-dd[1] = -1.3322676295501878e-16 = #bca33333 33333333
-g_ddfmt(0) gives 4 bytes: "-1.6"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bff99999 99999999 + bca33333 33333334
-= -1.5999999999999999 + -1.332267629550188e-16
-ddI[1] = #bff99999 99999999 + bca33333 33333333
-= -1.5999999999999999 + -1.3322676295501878e-16
-ddI[1] == strtod
-
-
-Input: 1.7
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.7 = #3ffb3333 33333333
-dd[1] = 4.440892098500625e-17 = #3c899999 99999998
-g_ddfmt(0) gives 3 bytes: "1.7"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ffb3333 33333333 + 3c899999 99999998
-= 1.7 + 4.4408920985006252e-17
-ddI[1] = #3ffb3333 33333333 + 3c899999 9999999c
-= 1.7 + 4.4408920985006276e-17
-ddI[0] == strtod
-
-
-Input: -1.7
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.7 = #bffb3333 33333333
-dd[1] = -4.440892098500625e-17 = #bc899999 99999998
-g_ddfmt(0) gives 4 bytes: "-1.7"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bffb3333 33333333 + bc899999 9999999c
-= -1.7 + -4.4408920985006276e-17
-ddI[1] = #bffb3333 33333333 + bc899999 99999998
-= -1.7 + -4.4408920985006252e-17
-ddI[1] == strtod
-
-
-Input: 1.8
-strtopdd consumes 3 bytes and returns 33
-dd[0] = 1.7999999999999998 = #3ffccccc cccccccc
-dd[1] = 1.7763568394002506e-16 = #3ca99999 9999999a
-g_ddfmt(0) gives 3 bytes: "1.8"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ffccccc cccccccc + 3ca99999 99999999
-= 1.7999999999999998 + 1.7763568394002503e-16
-ddI[1] = #3ffccccc cccccccc + 3ca99999 9999999a
-= 1.7999999999999998 + 1.7763568394002506e-16
-ddI[1] == strtod
-
-
-Input: -1.8
-strtopdd consumes 4 bytes and returns 41
-dd[0] = -1.7999999999999998 = #bffccccc cccccccc
-dd[1] = -1.7763568394002506e-16 = #bca99999 9999999a
-g_ddfmt(0) gives 4 bytes: "-1.8"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bffccccc cccccccc + bca99999 9999999a
-= -1.7999999999999998 + -1.7763568394002506e-16
-ddI[1] = #bffccccc cccccccc + bca99999 99999999
-= -1.7999999999999998 + -1.7763568394002503e-16
-ddI[0] == strtod
-
-
-Input: 1.9
-strtopdd consumes 3 bytes and returns 33
-dd[0] = 1.9 = #3ffe6666 66666666
-dd[1] = 8.881784197001253e-17 = #3c999999 9999999a
-g_ddfmt(0) gives 3 bytes: "1.9"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ffe6666 66666666 + 3c999999 99999998
-= 1.8999999999999999 + 8.8817841970012504e-17
-ddI[1] = #3ffe6666 66666666 + 3c999999 9999999a
-= 1.8999999999999999 + 8.8817841970012528e-17
-ddI[1] == strtod
-
-
-Input: -1.9
-strtopdd consumes 4 bytes and returns 41
-dd[0] = -1.9 = #bffe6666 66666666
-dd[1] = -8.881784197001253e-17 = #bc999999 9999999a
-g_ddfmt(0) gives 4 bytes: "-1.9"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bffe6666 66666666 + bc999999 9999999a
-= -1.8999999999999999 + -8.8817841970012528e-17
-ddI[1] = #bffe6666 66666666 + bc999999 99999998
-= -1.8999999999999999 + -8.8817841970012504e-17
-ddI[0] == strtod
-
-Rounding mode for strtor... changed from 1 (nearest) to 2 (toward +Infinity)
-
-Input: 1.1
-strtopdd consumes 3 bytes and returns 33
-dd[0] = 1.0999999999999999 = #3ff19999 99999999
-dd[1] = 1.332267629550188e-16 = #3ca33333 33333334
-g_ddfmt(0) gives 34 bytes: "1.10000000000000000000000000000002"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ff19999 99999999 + 3ca33333 33333333
-= 1.0999999999999999 + 1.3322676295501878e-16
-ddI[1] = #3ff19999 99999999 + 3ca33333 33333334
-= 1.0999999999999999 + 1.332267629550188e-16
-ddI[1] == strtod
-
-
-Input: -1.1
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.0999999999999999 = #bff19999 99999999
-dd[1] = -1.3322676295501878e-16 = #bca33333 33333333
-g_ddfmt(0) gives 4 bytes: "-1.1"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bff19999 99999999 + bca33333 33333334
-= -1.0999999999999999 + -1.332267629550188e-16
-ddI[1] = #bff19999 99999999 + bca33333 33333333
-= -1.0999999999999999 + -1.3322676295501878e-16
-ddI[1] == strtod
-
-
-Input: 1.2
-strtopdd consumes 3 bytes and returns 33
-dd[0] = 1.2 = #3ff33333 33333333
-dd[1] = 4.4408920985006276e-17 = #3c899999 9999999c
-g_ddfmt(0) gives 34 bytes: "1.20000000000000000000000000000001"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ff33333 33333333 + 3c899999 99999998
-= 1.2 + 4.4408920985006252e-17
-ddI[1] = #3ff33333 33333333 + 3c899999 9999999c
-= 1.2 + 4.4408920985006276e-17
-ddI[1] == strtod
-
-
-Input: -1.2
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.2 = #bff33333 33333333
-dd[1] = -4.440892098500625e-17 = #bc899999 99999998
-g_ddfmt(0) gives 4 bytes: "-1.2"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bff33333 33333333 + bc899999 9999999c
-= -1.2 + -4.4408920985006276e-17
-ddI[1] = #bff33333 33333333 + bc899999 99999998
-= -1.2 + -4.4408920985006252e-17
-ddI[1] == strtod
-
-
-Input: 1.3
-strtopdd consumes 3 bytes and returns 33
-dd[0] = 1.2999999999999998 = #3ff4cccc cccccccc
-dd[1] = 1.7763568394002506e-16 = #3ca99999 9999999a
-g_ddfmt(0) gives 3 bytes: "1.3"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ff4cccc cccccccc + 3ca99999 99999999
-= 1.2999999999999998 + 1.7763568394002503e-16
-ddI[1] = #3ff4cccc cccccccc + 3ca99999 9999999a
-= 1.2999999999999998 + 1.7763568394002506e-16
-ddI[1] == strtod
-
-
-Input: -1.3
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.2999999999999998 = #bff4cccc cccccccc
-dd[1] = -1.7763568394002503e-16 = #bca99999 99999999
-g_ddfmt(0) gives 35 bytes: "-1.29999999999999999999999999999999"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bff4cccc cccccccc + bca99999 9999999a
-= -1.2999999999999998 + -1.7763568394002506e-16
-ddI[1] = #bff4cccc cccccccc + bca99999 99999999
-= -1.2999999999999998 + -1.7763568394002503e-16
-ddI[1] == strtod
-
-
-Input: 1.4
-strtopdd consumes 3 bytes and returns 33
-dd[0] = 1.4 = #3ff66666 66666666
-dd[1] = 8.881784197001253e-17 = #3c999999 9999999a
-g_ddfmt(0) gives 3 bytes: "1.4"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ff66666 66666666 + 3c999999 99999998
-= 1.3999999999999999 + 8.8817841970012504e-17
-ddI[1] = #3ff66666 66666666 + 3c999999 9999999a
-= 1.3999999999999999 + 8.8817841970012528e-17
-ddI[1] == strtod
-
-
-Input: -1.4
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.4 = #bff66666 66666666
-dd[1] = -8.88178419700125e-17 = #bc999999 99999998
-g_ddfmt(0) gives 35 bytes: "-1.39999999999999999999999999999998"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bff66666 66666666 + bc999999 9999999a
-= -1.3999999999999999 + -8.8817841970012528e-17
-ddI[1] = #bff66666 66666666 + bc999999 99999998
-= -1.3999999999999999 + -8.8817841970012504e-17
-ddI[1] == strtod
-
-
-Input: 1.5
-strtopdd consumes 3 bytes and returns 1
-dd[0] = 1.5 = #3ff80000 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 3 bytes: "1.5"
-
-strtoIdd returns 1, consuming 3 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: -1.5
-strtopdd consumes 4 bytes and returns 9
-dd[0] = -1.5 = #bff80000 0
-dd[1] = -0 = #80000000 0
-g_ddfmt(0) gives 3 bytes: "1.5"
-
-strtoIdd returns 9, consuming 4 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: 1.6
-strtopdd consumes 3 bytes and returns 33
-dd[0] = 1.5999999999999999 = #3ff99999 99999999
-dd[1] = 1.332267629550188e-16 = #3ca33333 33333334
-g_ddfmt(0) gives 34 bytes: "1.60000000000000000000000000000002"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ff99999 99999999 + 3ca33333 33333333
-= 1.5999999999999999 + 1.3322676295501878e-16
-ddI[1] = #3ff99999 99999999 + 3ca33333 33333334
-= 1.5999999999999999 + 1.332267629550188e-16
-ddI[1] == strtod
-
-
-Input: -1.6
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.5999999999999999 = #bff99999 99999999
-dd[1] = -1.3322676295501878e-16 = #bca33333 33333333
-g_ddfmt(0) gives 4 bytes: "-1.6"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bff99999 99999999 + bca33333 33333334
-= -1.5999999999999999 + -1.332267629550188e-16
-ddI[1] = #bff99999 99999999 + bca33333 33333333
-= -1.5999999999999999 + -1.3322676295501878e-16
-ddI[1] == strtod
-
-
-Input: 1.7
-strtopdd consumes 3 bytes and returns 33
-dd[0] = 1.7 = #3ffb3333 33333333
-dd[1] = 4.4408920985006276e-17 = #3c899999 9999999c
-g_ddfmt(0) gives 34 bytes: "1.70000000000000000000000000000001"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ffb3333 33333333 + 3c899999 99999998
-= 1.7 + 4.4408920985006252e-17
-ddI[1] = #3ffb3333 33333333 + 3c899999 9999999c
-= 1.7 + 4.4408920985006276e-17
-ddI[1] == strtod
-
-
-Input: -1.7
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.7 = #bffb3333 33333333
-dd[1] = -4.440892098500625e-17 = #bc899999 99999998
-g_ddfmt(0) gives 4 bytes: "-1.7"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bffb3333 33333333 + bc899999 9999999c
-= -1.7 + -4.4408920985006276e-17
-ddI[1] = #bffb3333 33333333 + bc899999 99999998
-= -1.7 + -4.4408920985006252e-17
-ddI[1] == strtod
-
-
-Input: 1.8
-strtopdd consumes 3 bytes and returns 33
-dd[0] = 1.7999999999999998 = #3ffccccc cccccccc
-dd[1] = 1.7763568394002506e-16 = #3ca99999 9999999a
-g_ddfmt(0) gives 3 bytes: "1.8"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ffccccc cccccccc + 3ca99999 99999999
-= 1.7999999999999998 + 1.7763568394002503e-16
-ddI[1] = #3ffccccc cccccccc + 3ca99999 9999999a
-= 1.7999999999999998 + 1.7763568394002506e-16
-ddI[1] == strtod
-
-
-Input: -1.8
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.7999999999999998 = #bffccccc cccccccc
-dd[1] = -1.7763568394002503e-16 = #bca99999 99999999
-g_ddfmt(0) gives 35 bytes: "-1.79999999999999999999999999999999"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bffccccc cccccccc + bca99999 9999999a
-= -1.7999999999999998 + -1.7763568394002506e-16
-ddI[1] = #bffccccc cccccccc + bca99999 99999999
-= -1.7999999999999998 + -1.7763568394002503e-16
-ddI[1] == strtod
-
-
-Input: 1.9
-strtopdd consumes 3 bytes and returns 33
-dd[0] = 1.9 = #3ffe6666 66666666
-dd[1] = 8.881784197001253e-17 = #3c999999 9999999a
-g_ddfmt(0) gives 3 bytes: "1.9"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ffe6666 66666666 + 3c999999 99999998
-= 1.8999999999999999 + 8.8817841970012504e-17
-ddI[1] = #3ffe6666 66666666 + 3c999999 9999999a
-= 1.8999999999999999 + 8.8817841970012528e-17
-ddI[1] == strtod
-
-
-Input: -1.9
-strtopdd consumes 4 bytes and returns 25
-dd[0] = -1.9 = #bffe6666 66666666
-dd[1] = -8.88178419700125e-17 = #bc999999 99999998
-g_ddfmt(0) gives 35 bytes: "-1.89999999999999999999999999999998"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bffe6666 66666666 + bc999999 9999999a
-= -1.8999999999999999 + -8.8817841970012528e-17
-ddI[1] = #bffe6666 66666666 + bc999999 99999998
-= -1.8999999999999999 + -8.8817841970012504e-17
-ddI[1] == strtod
-
-Rounding mode for strtor... changed from 2 (toward +Infinity) to 3 (toward -Infinity)
-
-Input: 1.1
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.0999999999999999 = #3ff19999 99999999
-dd[1] = 1.3322676295501878e-16 = #3ca33333 33333333
-g_ddfmt(0) gives 3 bytes: "1.1"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ff19999 99999999 + 3ca33333 33333333
-= 1.0999999999999999 + 1.3322676295501878e-16
-ddI[1] = #3ff19999 99999999 + 3ca33333 33333334
-= 1.0999999999999999 + 1.332267629550188e-16
-ddI[0] == strtod
-
-
-Input: -1.1
-strtopdd consumes 4 bytes and returns 41
-dd[0] = -1.0999999999999999 = #bff19999 99999999
-dd[1] = -1.332267629550188e-16 = #bca33333 33333334
-g_ddfmt(0) gives 35 bytes: "-1.10000000000000000000000000000002"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bff19999 99999999 + bca33333 33333334
-= -1.0999999999999999 + -1.332267629550188e-16
-ddI[1] = #bff19999 99999999 + bca33333 33333333
-= -1.0999999999999999 + -1.3322676295501878e-16
-ddI[0] == strtod
-
-
-Input: 1.2
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.2 = #3ff33333 33333333
-dd[1] = 4.440892098500625e-17 = #3c899999 99999998
-g_ddfmt(0) gives 3 bytes: "1.2"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ff33333 33333333 + 3c899999 99999998
-= 1.2 + 4.4408920985006252e-17
-ddI[1] = #3ff33333 33333333 + 3c899999 9999999c
-= 1.2 + 4.4408920985006276e-17
-ddI[0] == strtod
-
-
-Input: -1.2
-strtopdd consumes 4 bytes and returns 41
-dd[0] = -1.2 = #bff33333 33333333
-dd[1] = -4.4408920985006276e-17 = #bc899999 9999999c
-g_ddfmt(0) gives 35 bytes: "-1.20000000000000000000000000000001"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bff33333 33333333 + bc899999 9999999c
-= -1.2 + -4.4408920985006276e-17
-ddI[1] = #bff33333 33333333 + bc899999 99999998
-= -1.2 + -4.4408920985006252e-17
-ddI[0] == strtod
-
-
-Input: 1.3
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.2999999999999998 = #3ff4cccc cccccccc
-dd[1] = 1.7763568394002503e-16 = #3ca99999 99999999
-g_ddfmt(0) gives 34 bytes: "1.29999999999999999999999999999999"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ff4cccc cccccccc + 3ca99999 99999999
-= 1.2999999999999998 + 1.7763568394002503e-16
-ddI[1] = #3ff4cccc cccccccc + 3ca99999 9999999a
-= 1.2999999999999998 + 1.7763568394002506e-16
-ddI[0] == strtod
-
-
-Input: -1.3
-strtopdd consumes 4 bytes and returns 41
-dd[0] = -1.2999999999999998 = #bff4cccc cccccccc
-dd[1] = -1.7763568394002506e-16 = #bca99999 9999999a
-g_ddfmt(0) gives 4 bytes: "-1.3"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bff4cccc cccccccc + bca99999 9999999a
-= -1.2999999999999998 + -1.7763568394002506e-16
-ddI[1] = #bff4cccc cccccccc + bca99999 99999999
-= -1.2999999999999998 + -1.7763568394002503e-16
-ddI[0] == strtod
-
-
-Input: 1.4
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.4 = #3ff66666 66666666
-dd[1] = 8.88178419700125e-17 = #3c999999 99999998
-g_ddfmt(0) gives 34 bytes: "1.39999999999999999999999999999998"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ff66666 66666666 + 3c999999 99999998
-= 1.3999999999999999 + 8.8817841970012504e-17
-ddI[1] = #3ff66666 66666666 + 3c999999 9999999a
-= 1.3999999999999999 + 8.8817841970012528e-17
-ddI[0] == strtod
-
-
-Input: -1.4
-strtopdd consumes 4 bytes and returns 41
-dd[0] = -1.4 = #bff66666 66666666
-dd[1] = -8.881784197001253e-17 = #bc999999 9999999a
-g_ddfmt(0) gives 4 bytes: "-1.4"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bff66666 66666666 + bc999999 9999999a
-= -1.3999999999999999 + -8.8817841970012528e-17
-ddI[1] = #bff66666 66666666 + bc999999 99999998
-= -1.3999999999999999 + -8.8817841970012504e-17
-ddI[0] == strtod
-
-
-Input: 1.5
-strtopdd consumes 3 bytes and returns 1
-dd[0] = 1.5 = #3ff80000 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 3 bytes: "1.5"
-
-strtoIdd returns 1, consuming 3 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: -1.5
-strtopdd consumes 4 bytes and returns 9
-dd[0] = -1.5 = #bff80000 0
-dd[1] = -0 = #80000000 0
-g_ddfmt(0) gives 3 bytes: "1.5"
-
-strtoIdd returns 9, consuming 4 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: 1.6
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.5999999999999999 = #3ff99999 99999999
-dd[1] = 1.3322676295501878e-16 = #3ca33333 33333333
-g_ddfmt(0) gives 3 bytes: "1.6"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ff99999 99999999 + 3ca33333 33333333
-= 1.5999999999999999 + 1.3322676295501878e-16
-ddI[1] = #3ff99999 99999999 + 3ca33333 33333334
-= 1.5999999999999999 + 1.332267629550188e-16
-ddI[0] == strtod
-
-
-Input: -1.6
-strtopdd consumes 4 bytes and returns 41
-dd[0] = -1.5999999999999999 = #bff99999 99999999
-dd[1] = -1.332267629550188e-16 = #bca33333 33333334
-g_ddfmt(0) gives 35 bytes: "-1.60000000000000000000000000000002"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bff99999 99999999 + bca33333 33333334
-= -1.5999999999999999 + -1.332267629550188e-16
-ddI[1] = #bff99999 99999999 + bca33333 33333333
-= -1.5999999999999999 + -1.3322676295501878e-16
-ddI[0] == strtod
-
-
-Input: 1.7
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.7 = #3ffb3333 33333333
-dd[1] = 4.440892098500625e-17 = #3c899999 99999998
-g_ddfmt(0) gives 3 bytes: "1.7"
-
-strtoIdd returns 17, consuming 3 bytes.
-ddI[0] = #3ffb3333 33333333 + 3c899999 99999998
-= 1.7 + 4.4408920985006252e-17
-ddI[1] = #3ffb3333 33333333 + 3c899999 9999999c
-= 1.7 + 4.4408920985006276e-17
-ddI[0] == strtod
-
-
-Input: -1.7
-strtopdd consumes 4 bytes and returns 41
-dd[0] = -1.7 = #bffb3333 33333333
-dd[1] = -4.4408920985006276e-17 = #bc899999 9999999c
-g_ddfmt(0) gives 35 bytes: "-1.70000000000000000000000000000001"
-
-strtoIdd returns 25, consuming 4 bytes.
-ddI[0] = #bffb3333 33333333 + bc899999 9999999c
-= -1.7 + -4.4408920985006276e-17
-ddI[1] = #bffb3333 33333333 + bc899999 99999998
-= -1.7 + -4.4408920985006252e-17
-ddI[0] == strtod
-
-
-Input: 1.8
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.7999999999999998 = #3ffccccc cccccccc
-dd[1] = 1.7763568394002503e-16 = #3ca99999 99999999
-g_ddfmt(0) gives 34 bytes: "1.79999999999999999999999999999999"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ffccccc cccccccc + 3ca99999 99999999
-= 1.7999999999999998 + 1.7763568394002503e-16
-ddI[1] = #3ffccccc cccccccc + 3ca99999 9999999a
-= 1.7999999999999998 + 1.7763568394002506e-16
-ddI[0] == strtod
-
-
-Input: -1.8
-strtopdd consumes 4 bytes and returns 41
-dd[0] = -1.7999999999999998 = #bffccccc cccccccc
-dd[1] = -1.7763568394002506e-16 = #bca99999 9999999a
-g_ddfmt(0) gives 4 bytes: "-1.8"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bffccccc cccccccc + bca99999 9999999a
-= -1.7999999999999998 + -1.7763568394002506e-16
-ddI[1] = #bffccccc cccccccc + bca99999 99999999
-= -1.7999999999999998 + -1.7763568394002503e-16
-ddI[0] == strtod
-
-
-Input: 1.9
-strtopdd consumes 3 bytes and returns 17
-dd[0] = 1.9 = #3ffe6666 66666666
-dd[1] = 8.88178419700125e-17 = #3c999999 99999998
-g_ddfmt(0) gives 34 bytes: "1.89999999999999999999999999999998"
-
-strtoIdd returns 33, consuming 3 bytes.
-ddI[0] = #3ffe6666 66666666 + 3c999999 99999998
-= 1.8999999999999999 + 8.8817841970012504e-17
-ddI[1] = #3ffe6666 66666666 + 3c999999 9999999a
-= 1.8999999999999999 + 8.8817841970012528e-17
-ddI[0] == strtod
-
-
-Input: -1.9
-strtopdd consumes 4 bytes and returns 41
-dd[0] = -1.9 = #bffe6666 66666666
-dd[1] = -8.881784197001253e-17 = #bc999999 9999999a
-g_ddfmt(0) gives 4 bytes: "-1.9"
-
-strtoIdd returns 41, consuming 4 bytes.
-ddI[0] = #bffe6666 66666666 + bc999999 9999999a
-= -1.8999999999999999 + -8.8817841970012528e-17
-ddI[1] = #bffe6666 66666666 + bc999999 99999998
-= -1.8999999999999999 + -8.8817841970012504e-17
-ddI[0] == strtod
-
diff --git a/lib/libc/gdtoa/test/ddsi.out b/lib/libc/gdtoa/test/ddsi.out
deleted file mode 100644
index 1677707f2..000000000
--- a/lib/libc/gdtoa/test/ddsi.out
+++ /dev/null
@@ -1,376 +0,0 @@
-
-Input: 1.23
-strtopdd consumes 4 bytes and returns 17
-dd[0] = 1.23 = #3ff3ae14 7ae147ae
-dd[1] = 1.7763568394002496e-17 = #3c747ae1 47ae1478
-g_ddfmt(0) gives 4 bytes: "1.23"
-
-strtoIdd returns 17, consuming 4 bytes.
-ddI[0] = #3ff3ae14 7ae147ae + 3c747ae1 47ae1478
-= 1.23 + 1.7763568394002496e-17
-ddI[1] = #3ff3ae14 7ae147ae + 3c747ae1 47ae1480
-= 1.23 + 1.776356839400252e-17
-ddI[0] == strtod
-
-
-Input: 1.23e+20
-strtopdd consumes 8 bytes and returns 1
-dd[0] = 1.23e+20 = #441aabdf 2145b430
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 8 bytes: "1.23e+20"
-
-strtoIdd returns 1, consuming 8 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: 1.23e-20
-strtopdd consumes 8 bytes and returns 33
-dd[0] = 1.2299999999999999e-20 = #3bcd0ae4 cf767530
-dd[1] = 9.304023318521521e-37 = #3873c997 955b2691
-g_ddfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIdd returns 33, consuming 8 bytes.
-ddI[0] = #3bcd0ae4 cf767530 + 3873c997 955b2690
-= 1.2299999999999999e-20 + 9.3040233185215194e-37
-ddI[1] = #3bcd0ae4 cf767530 + 3873c997 955b2691
-= 1.2299999999999999e-20 + 9.3040233185215211e-37
-ddI[1] == strtod
-
-
-Input: 1.23456789
-strtopdd consumes 10 bytes and returns 17
-dd[0] = 1.23456789 = #3ff3c0ca 4283de1b
-dd[1] = 1.0990618193318369e-16 = #3c9fada5 144c1252
-g_ddfmt(0) gives 10 bytes: "1.23456789"
-
-strtoIdd returns 17, consuming 10 bytes.
-ddI[0] = #3ff3c0ca 4283de1b + 3c9fada5 144c1252
-= 1.2345678899999999 + 1.0990618193318369e-16
-ddI[1] = #3ff3c0ca 4283de1b + 3c9fada5 144c1254
-= 1.2345678899999999 + 1.0990618193318371e-16
-ddI[0] == strtod
-
-
-Input: 1.23456589e+20
-strtopdd consumes 14 bytes and returns 1
-dd[0] = 1.23456589e+20 = #441ac537 a660b997
-dd[1] = 4096 = #40b00000 0
-g_ddfmt(0) gives 14 bytes: "1.23456589e+20"
-
-strtoIdd returns 1, consuming 14 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: 1.23e+30
-strtopdd consumes 8 bytes and returns 1
-dd[0] = 1.23e+30 = #462f0cb0 4e8fb790
-dd[1] = 40281156091904 = #42c25158 0
-g_ddfmt(0) gives 8 bytes: "1.23e+30"
-
-strtoIdd returns 1, consuming 8 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: 1.23e-30
-strtopdd consumes 8 bytes and returns 17
-dd[0] = 1.2299999999999999e-30 = #39b8f286 6f5010aa
-dd[1] = 1.076909723013918e-46 = #3663ac7f 3dafd174
-g_ddfmt(0) gives 8 bytes: "1.23e-30"
-
-strtoIdd returns 17, consuming 8 bytes.
-ddI[0] = #39b8f286 6f5010aa + 3663ac7f 3dafd174
-= 1.2299999999999999e-30 + 1.076909723013918e-46
-ddI[1] = #39b8f286 6f5010aa + 3663ac7f 3dafd175
-= 1.2299999999999999e-30 + 1.0769097230139181e-46
-ddI[0] == strtod
-
-
-Input: 1.23456789e-20
-strtopdd consumes 14 bytes and returns 17
-dd[0] = 1.23456789e-20 = #3bcd2681 471e7ada
-dd[1] = 6.247111971663133e-37 = #386a9280 a761b07e
-g_ddfmt(0) gives 14 bytes: "1.23456789e-20"
-
-strtoIdd returns 17, consuming 14 bytes.
-ddI[0] = #3bcd2681 471e7ada + 386a9280 a761b07e
-= 1.2345678899999999e-20 + 6.2471119716631328e-37
-ddI[1] = #3bcd2681 471e7ada + 386a9280 a761b080
-= 1.2345678899999999e-20 + 6.2471119716631345e-37
-ddI[0] == strtod
-
-
-Input: 1.23456789e-30
-strtopdd consumes 14 bytes and returns 33
-dd[0] = 1.23456789e-30 = #39b90a3e 33bbd995
-dd[1] = 2.1567930523648577e-47 = #363f8585 55a6b1a0
-g_ddfmt(0) gives 14 bytes: "1.23456789e-30"
-
-strtoIdd returns 33, consuming 14 bytes.
-ddI[0] = #39b90a3e 33bbd995 + 363f8585 55a6b198
-= 1.23456789e-30 + 2.1567930523648558e-47
-ddI[1] = #39b90a3e 33bbd995 + 363f8585 55a6b1a0
-= 1.23456789e-30 + 2.1567930523648577e-47
-ddI[1] == strtod
-
-
-Input: 1.234567890123456789
-strtopdd consumes 20 bytes and returns 33
-dd[0] = 1.2345678901234567 = #3ff3c0ca 428c59fb
-dd[1] = 9.856786452588859e-17 = #3c9c6906 51a3745e
-g_ddfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIdd returns 33, consuming 20 bytes.
-ddI[0] = #3ff3c0ca 428c59fb + 3c9c6906 51a3745c
-= 1.2345678901234567 + 9.8567864525888563e-17
-ddI[1] = #3ff3c0ca 428c59fb + 3c9c6906 51a3745e
-= 1.2345678901234567 + 9.8567864525888588e-17
-ddI[1] == strtod
-
-
-Input: 1.23456789012345678901234567890123456789
-strtopdd consumes 40 bytes and returns 33
-dd[0] = 1.2345678901234567 = #3ff3c0ca 428c59fb
-dd[1] = 9.858021020478982e-17 = #3c9c69ef 85adadb6
-g_ddfmt(0) gives 34 bytes: "1.23456789012345678901234567890124"
-
-strtoIdd returns 33, consuming 40 bytes.
-ddI[0] = #3ff3c0ca 428c59fb + 3c9c69ef 85adadb4
-= 1.2345678901234567 + 9.8580210204789798e-17
-ddI[1] = #3ff3c0ca 428c59fb + 3c9c69ef 85adadb6
-= 1.2345678901234567 + 9.8580210204789823e-17
-ddI[1] == strtod
-
-
-Input: 1.23e306
-strtopdd consumes 8 bytes and returns 33
-dd[0] = 1.2299999999999999e+306 = #7f7c0676 cd1c61f4
-dd[1] = 1.3319001448659015e+290 = #7c2b558b e3d3f477
-g_ddfmt(0) gives 9 bytes: "1.23e+306"
-
-strtoIdd returns 33, consuming 8 bytes.
-ddI[0] = #7f7c0676 cd1c61f4 + 7c2b558b e3d3f476
-= 1.2299999999999999e+306 + 1.3319001448659013e+290
-ddI[1] = #7f7c0676 cd1c61f4 + 7c2b558b e3d3f477
-= 1.2299999999999999e+306 + 1.3319001448659015e+290
-ddI[1] == strtod
-
-
-Input: 1.23e-306
-strtopdd consumes 9 bytes and returns 80
-dd[0] = 0 = #0 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 1 bytes: "0"
-
-strtoIdd returns 80, consuming 9 bytes.
-ddI[0] = #0 0 + 0 0
-= 0 + 0
-ddI[1] = #6a00000 0 + 0 0
-= 9.0259718793241479e-277 + 0
-ddI[0] == strtod
-
-
-Input: 1.23e-320
-strtopdd consumes 9 bytes and returns 80
-dd[0] = 0 = #0 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 1 bytes: "0"
-
-strtoIdd returns 80, consuming 9 bytes.
-ddI[0] = #0 0 + 0 0
-= 0 + 0
-ddI[1] = #6a00000 0 + 0 0
-= 9.0259718793241479e-277 + 0
-ddI[0] == strtod
-
-
-Input: 1.23e-20
-strtopdd consumes 8 bytes and returns 33
-dd[0] = 1.2299999999999999e-20 = #3bcd0ae4 cf767530
-dd[1] = 9.304023318521521e-37 = #3873c997 955b2691
-g_ddfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIdd returns 33, consuming 8 bytes.
-ddI[0] = #3bcd0ae4 cf767530 + 3873c997 955b2690
-= 1.2299999999999999e-20 + 9.3040233185215194e-37
-ddI[1] = #3bcd0ae4 cf767530 + 3873c997 955b2691
-= 1.2299999999999999e-20 + 9.3040233185215211e-37
-ddI[1] == strtod
-
-
-Input: 1.23456789e307
-strtopdd consumes 14 bytes and returns 33
-dd[0] = 1.2345678899999998e+307 = #7fb194b1 4bdaecdb
-dd[1] = 2.0137933598720243e+291 = #7c69d48d 192048ca
-g_ddfmt(0) gives 15 bytes: "1.23456789e+307"
-
-strtoIdd returns 33, consuming 14 bytes.
-ddI[0] = #7fb194b1 4bdaecdb + 7c69d48d 192048c9
-= 1.2345678899999998e+307 + 2.013793359872024e+291
-ddI[1] = #7fb194b1 4bdaecdb + 7c69d48d 192048ca
-= 1.2345678899999998e+307 + 2.0137933598720243e+291
-ddI[1] == strtod
-
-
-Input: 1.23456589e-307
-strtopdd consumes 15 bytes and returns 80
-dd[0] = 0 = #0 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 1 bytes: "0"
-
-strtoIdd returns 80, consuming 15 bytes.
-ddI[0] = #0 0 + 0 0
-= 0 + 0
-ddI[1] = #6a00000 0 + 0 0
-= 9.0259718793241479e-277 + 0
-ddI[0] == strtod
-
-
-Input: 1.234567890123456789
-strtopdd consumes 20 bytes and returns 33
-dd[0] = 1.2345678901234567 = #3ff3c0ca 428c59fb
-dd[1] = 9.856786452588859e-17 = #3c9c6906 51a3745e
-g_ddfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIdd returns 33, consuming 20 bytes.
-ddI[0] = #3ff3c0ca 428c59fb + 3c9c6906 51a3745c
-= 1.2345678901234567 + 9.8567864525888563e-17
-ddI[1] = #3ff3c0ca 428c59fb + 3c9c6906 51a3745e
-= 1.2345678901234567 + 9.8567864525888588e-17
-ddI[1] == strtod
-
-
-Input: 1.234567890123456789e301
-strtopdd consumes 24 bytes and returns 33
-dd[0] = 1.2345678901234568e+301 = #7e726f51 75f56413
-dd[1] = 1.3892003943918827e+283 = #7ab7ea80 76399100
-g_ddfmt(0) gives 25 bytes: "1.234567890123456789e+301"
-
-strtoIdd returns 33, consuming 24 bytes.
-ddI[0] = #7e726f51 75f56413 + 7ab7ea80 76399080
-= 1.2345678901234568e+301 + 1.3892003943918563e+283
-ddI[1] = #7e726f51 75f56413 + 7ab7ea80 76399100
-= 1.2345678901234568e+301 + 1.3892003943918827e+283
-ddI[1] == strtod
-
-
-Input: 1.234567890123456789e-301
-strtopdd consumes 25 bytes and returns 80
-dd[0] = 0 = #0 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 1 bytes: "0"
-
-strtoIdd returns 80, consuming 25 bytes.
-ddI[0] = #0 0 + 0 0
-= 0 + 0
-ddI[1] = #6a00000 0 + 0 0
-= 9.0259718793241479e-277 + 0
-ddI[0] == strtod
-
-
-Input: 1.234567890123456789e-321
-strtopdd consumes 25 bytes and returns 80
-dd[0] = 0 = #0 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 1 bytes: "0"
-
-strtoIdd returns 80, consuming 25 bytes.
-ddI[0] = #0 0 + 0 0
-= 0 + 0
-ddI[1] = #6a00000 0 + 0 0
-= 9.0259718793241479e-277 + 0
-ddI[0] == strtod
-
-
-Input: 1e23
-strtopdd consumes 4 bytes and returns 1
-dd[0] = 1e+23 = #44b52d02 c7e14af6
-dd[1] = 8388608 = #41600000 0
-g_ddfmt(0) gives 5 bytes: "1e+23"
-
-strtoIdd returns 1, consuming 4 bytes.
-ddI[0] == ddI[1] == strtopdd
-
-
-Input: 1e310
-strtopdd consumes 5 bytes and returns 163
-dd[0] = Infinity = #7ff00000 0
-dd[1] = Infinity = #7ff00000 0
-g_ddfmt(0) gives 8 bytes: "Infinity"
-
-strtoIdd returns 163, consuming 5 bytes.
-ddI[0] = #7fefffff ffffffff + 7c9fffff ffffffff
-= 1.7976931348623157e+308 + 1.9958403095347196e+292
-ddI[1] = #7ff00000 0 + 7ff00000 0
-= Infinity + Infinity
-ddI[1] == strtod
-
-
-Input: 9.0259718793241475e-277
-strtopdd consumes 23 bytes and returns 80
-dd[0] = 0 = #0 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 1 bytes: "0"
-
-strtoIdd returns 80, consuming 23 bytes.
-ddI[0] = #0 0 + 0 0
-= 0 + 0
-ddI[1] = #6a00000 0 + 0 0
-= 9.0259718793241479e-277 + 0
-ddI[0] == strtod
-
-
-Input: 9.025971879324147880346310405869e-277
-strtopdd consumes 37 bytes and returns 17
-dd[0] = 9.025971879324148e-277 = #6a00000 0
-dd[1] = 2.2250738585072014e-308 = #100000 0
-g_ddfmt(0) gives 37 bytes: "9.025971879324147880346310405869e-277"
-
-strtoIdd returns 17, consuming 37 bytes.
-ddI[0] = #6a00000 0 + 100000 0
-= 9.0259718793241479e-277 + 2.2250738585072014e-308
-ddI[1] = #6a00000 0 + 200000 0
-= 9.0259718793241479e-277 + 4.4501477170144028e-308
-ddI[0] == strtod
-
-
-Input: 9.025971879324147880346310405868e-277
-strtopdd consumes 37 bytes and returns 80
-dd[0] = 0 = #0 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 1 bytes: "0"
-
-strtoIdd returns 80, consuming 37 bytes.
-ddI[0] = #0 0 + 0 0
-= 0 + 0
-ddI[1] = #6a00000 0 + 0 0
-= 9.0259718793241479e-277 + 0
-ddI[0] == strtod
-
-
-Input: 2.2250738585072014e-308
-strtopdd consumes 23 bytes and returns 80
-dd[0] = 0 = #0 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 1 bytes: "0"
-
-strtoIdd returns 80, consuming 23 bytes.
-ddI[0] = #0 0 + 0 0
-= 0 + 0
-ddI[1] = #6a00000 0 + 0 0
-= 9.0259718793241479e-277 + 0
-ddI[0] == strtod
-
-
-Input: 2.2250738585072013e-308
-strtopdd consumes 23 bytes and returns 80
-dd[0] = 0 = #0 0
-dd[1] = 0 = #0 0
-g_ddfmt(0) gives 1 bytes: "0"
-
-strtoIdd returns 80, consuming 23 bytes.
-ddI[0] = #0 0 + 0 0
-= 0 + 0
-ddI[1] = #6a00000 0 + 0 0
-= 9.0259718793241479e-277 + 0
-ddI[0] == strtod
-
diff --git a/lib/libc/gdtoa/test/ddtest.c b/lib/libc/gdtoa/test/ddtest.c
deleted file mode 100644
index 2cf31524a..000000000
--- a/lib/libc/gdtoa/test/ddtest.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998-2001 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-/* Test program for g_ddfmt, strtoIdd, strtopdd, and strtordd.
- *
- * Inputs (on stdin):
- *		r rounding_mode
- *		n ndig
- *		number
- *		#hex0 hex1 hex2 hex3
- *
- *	rounding_mode values:
- *		0 = toward zero
- *		1 = nearest
- *		2 = toward +Infinity
- *		3 = toward -Infinity
- *
- * where number is a decimal floating-point number,
- * hex0 is a string of <= 8 Hex digits for the most significant
- * word of the number, hex1 is a similar string for the next
- * word, etc., and ndig is a parameters to g_ddfmt.
- */
-
-#include "gdtoaimp.h"
-#include <stdio.h>
-#include <stdlib.h>
-
- extern int getround ANSI((int,char*));
-
- static char ibuf[2048], obuf[1024];
-
-#define U (unsigned long)
-
- static void
-#ifdef KR_headers
-dprint(what, d) char *what; double d;
-#else
-dprint(char *what, double d)
-#endif
-{
-	char buf[32];
-	union { double d; ULong L[2]; } u;
-
-	u.d = d;
-	g_dfmt(buf,&d,0,sizeof(buf));
-	printf("%s = %s = #%lx %lx\n", what, buf, U u.L[_0], U u.L[_1]);
-	}
-
- int
-main(Void)
-{
-	char *s, *s1, *se, *se1;
-	int dItry, i, j, r = 1, ndig = 0;
-	double ddI[4];
-	long LL[4];
-	union { double dd[2]; ULong L[4]; } u;
-
-	while( (s = fgets(ibuf, sizeof(ibuf), stdin)) !=0) {
-		while(*s <= ' ')
-			if (!*s++)
-				continue;
-		dItry = 0;
-		switch(*s) {
-		  case 'r':
-			r = getround(r, s);
-			continue;
-		  case 'n':
-			i = s[1];
-			if (i <= ' ' || (i >= '0' && i <= '9')) {
-				ndig = atoi(s+1);
-				continue;
-				}
-			break; /* nan? */
-		  case '#':
-			LL[0] = u.L[_0];
-			LL[1] = u.L[_1];
-			LL[2] = u.L[2+_0];
-			LL[3] = u.L[2+_1];
-			sscanf(s+1, "%lx %lx %lx %lx", &LL[0], &LL[1],
-				&LL[2], &LL[3]);
-			u.L[_0] = LL[0];
-			u.L[_1] = LL[1];
-			u.L[2+_0] = LL[2];
-			u.L[2+_1] = LL[3];
-			printf("\nInput: %s", ibuf);
-			printf(" --> f = #%lx %lx %lx %lx\n",
-				LL[0],LL[1],LL[2],LL[3]);
-			goto fmt_test;
-			}
-		printf("\nInput: %s", ibuf);
-		for(s1 = s; *s1 > ' '; s1++){};
-		while(*s1 <= ' ' && *s1) s1++;
-		if (!*s1) {
-			dItry = 1;
-			i = strtordd(ibuf, &se, r, u.dd);
-			if (r == 1) {
-				j = strtopdd(ibuf, &se1, ddI);
-				if (i != j || u.dd[0] != ddI[0]
-				 || u.dd[1] != ddI[1] || se != se1)
-					printf("***strtopdd and strtordd disagree!!\n:");
-				}
-			printf("strtopdd consumes %d bytes and returns %d\n",
-				(int)(se-ibuf), i);
-			}
-		else {
-			u.dd[0] = strtod(s, &se);
-			u.dd[1] = strtod(se, &se);
-			}
- fmt_test:
-		dprint("dd[0]", u.dd[0]);
-		dprint("dd[1]", u.dd[1]);
-		se = g_ddfmt(obuf, u.dd, ndig, sizeof(obuf));
-		printf("g_ddfmt(%d) gives %d bytes: \"%s\"\n\n",
-			ndig, (int)(se-obuf), se ? obuf : "<null>");
-		if (!dItry)
-			continue;
-		printf("strtoIdd returns %d,", strtoIdd(ibuf, &se, ddI,&ddI[2]));
-		printf(" consuming %d bytes.\n", (int)(se-ibuf));
-		if (ddI[0] == ddI[2] && ddI[1] == ddI[3]) {
-			if (ddI[0] == u.dd[0] && ddI[1] == u.dd[1])
-				printf("ddI[0] == ddI[1] == strtopdd\n");
-			else
-				printf("ddI[0] == ddI[1] = #%lx %lx + %lx %lx\n= %.17g + %17.g\n",
-					U ((ULong*)ddI)[_0],
-					U ((ULong*)ddI)[_1],
-					U ((ULong*)ddI)[2+_0],
-					U ((ULong*)ddI)[2+_1],
-					ddI[0], ddI[1]);
-			}
-		else {
-			printf("ddI[0] = #%lx %lx + %lx %lx\n= %.17g + %.17g\n",
-				U ((ULong*)ddI)[_0], U ((ULong*)ddI)[_1],
-				U ((ULong*)ddI)[2+_0], U ((ULong*)ddI)[2+_1],
-				ddI[0], ddI[1]);
-			printf("ddI[1] = #%lx %lx + %lx %lx\n= %.17g + %.17g\n",
-				U ((ULong*)ddI)[4+_0], U ((ULong*)ddI)[4+_1],
-				U ((ULong*)ddI)[6+_0], U ((ULong*)ddI)[6+_1],
-				ddI[2], ddI[3]);
-			if (ddI[0] == u.dd[0] && ddI[1] == u.dd[1])
-				printf("ddI[0] == strtod\n");
-			else if (ddI[2] == u.dd[0] && ddI[3] == u.dd[1])
-				printf("ddI[1] == strtod\n");
-			else
-				printf("**** Both differ from strtopdd ****\n");
-			}
-		printf("\n");
-		}
-	return 0;
-	}
diff --git a/lib/libc/gdtoa/test/dt.c b/lib/libc/gdtoa/test/dt.c
deleted file mode 100644
index 355476ff2..000000000
--- a/lib/libc/gdtoa/test/dt.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-/* Test program for strtod and dtoa.
- *
- * Inputs (on stdin):
- *		number[: mode [ndigits]]
- * or
- *		#hex0 hex1[: mode [ndigits]]
- * where number is a decimal floating-point number,
- * hex0 is a string of Hex digits for the most significant
- * word of the number, hex1 is a similar string for the other
- * (least significant) word, and mode and ndigits are
- * parameters to dtoa.
- */
-
-#include <stdio.h>
-#include "gdtoa.h"
-int STRTOD_DIGLIM = 24;
-#ifdef KR_headers
-#define Void /*void*/
-#else
-#define Void void
-#endif
-
-#ifdef __STDC__
-#include <stdlib.h>
-#else
-#ifdef __cplusplus
-extern "C" double atof(const char*);
-#else
-extern double atof ANSI((char*));
-#endif
-#endif
-
-typedef union { double d; ULong L[2]; } U;
-
-#ifdef IEEE_8087
-#define word0(x) (x)->L[1]
-#define word1(x) (x)->L[0]
-#else
-#define word0(x) (x)->L[0]
-#define word1(x) (x)->L[1]
-#endif
-#define dval(x) (x)->d
-
-#include "errno.h"
-
-#ifdef __cplusplus
-extern "C" char *dtoa(double, int, int, int*, int*, char **);
-#else
-extern char *dtoa ANSI((double, int, int, int*, int*, char **));
-#endif
-
- static void
-#ifdef KR_headers
-g_fmt(b, x) char *b; double x;
-#else
-g_fmt(char *b, double x)
-#endif
-{
-	char *s, *se;
-	int decpt, i, j, k, sign;
-
-	if (!x) {
-		*b++ = '0';
-		*b = 0;
-		return;
-		}
-	s = dtoa(x, 0, 0, &decpt, &sign, &se);
-	if (sign)
-		*b++ = '-';
-	if (decpt == 9999) /* Infinity or Nan */ {
-		while((*b++ = *s++));
-		return;
-		}
-	if (decpt <= -4 || decpt > se - s + 5) {
-		*b++ = *s++;
-		if (*s) {
-			*b++ = '.';
-			while((*b = *s++))
-				b++;
-			}
-		*b++ = 'e';
-		/* sprintf(b, "%+.2d", decpt - 1); */
-		if (--decpt < 0) {
-			*b++ = '-';
-			decpt = -decpt;
-			}
-		else
-			*b++ = '+';
-		for(j = 2, k = 10; 10*k <= decpt; j++, k *= 10){};
-		for(;;) {
-			i = decpt / k;
-			*b++ = i + '0';
-			if (--j <= 0)
-				break;
-			decpt -= i*k;
-			decpt *= 10;
-			}
-		*b = 0;
-		}
-	else if (decpt <= 0) {
-		*b++ = '.';
-		for(; decpt < 0; decpt++)
-			*b++ = '0';
-		while((*b++ = *s++));
-		}
-	else {
-		while((*b = *s++)) {
-			b++;
-			if (--decpt == 0 && *s)
-				*b++ = '.';
-			}
-		for(; decpt > 0; decpt--)
-			*b++ = '0';
-		*b = 0;
-		}
-	}
-
- static void
-baderrno(Void)
-{
-	fflush(stdout);
-	perror("\nerrno strtod");
-	fflush(stderr);
-	}
-
-#define UL (unsigned long)
-
- static void
-#ifdef KR_headers
-check(d) U *d;
-#else
-check(U *d)
-#endif
-{
-	char buf[64];
-	int decpt, sign;
-	char *s, *se;
-	U d1;
-
-	s = dtoa(dval(d), 0, 0, &decpt, &sign, &se);
-	sprintf(buf, "%s%s%se%d", sign ? "-" : "",
-		decpt == 9999 ? "" : ".", s, decpt);
-	errno = 0;
-	dval(&d1) = strtod(buf, (char **)0);
-	if (errno)
-		baderrno();
-	if (dval(d) != dval(&d1)) {
-		printf("sent d = %.17g = 0x%lx %lx, buf = %s\n",
-			dval(d), UL word0(d), UL word1(d), buf);
-		printf("got d1 = %.17g = 0x%lx %lx\n",
-			dval(&d1), UL word0(&d1), UL word1(&d1));
-		}
-	}
-
- int
-main(Void)
-{
-	U d, d1;
-	char buf[2048], buf1[32];
-	char *fmt, *s, *s1, *se;
-	int decpt, sign;
-	int mode = 0, ndigits = 17;
-	ULong x, y;
-#ifdef VAX
-	ULong z;
-#endif
-
-	while(fgets(buf, sizeof(buf), stdin)) {
-		if (*buf == '*') {
-			printf("%s", buf);
-			continue;
-			}
-		printf("Input: %s", buf);
-		if (*buf == '#') {
-			x = word0(&d);
-			y = word1(&d);
-			/* sscanf(buf+1, "%lx %lx:%d %d", &x, &y, &mode, &ndigits); */
-			x = (ULong)strtoul(s1 = buf+1, &se, 16);
-			if (se > s1) {
-				y = (ULong)strtoul(s1 = se, &se, 16);
-				if (se > s1)
-					sscanf(se, ":%d %d", &mode, &ndigits);
-				}
-			word0(&d) = x;
-			word1(&d) = y;
-			fmt = "Output: d =\n%.17g = 0x%lx %lx\n";
-			}
-		else if (*buf == '*') {
-			x = strtoul(buf,&s,10);
-			if (!*s && x > 18)
-				STRTOD_DIGLIM = (int)x;
-			printf("STRTOD_DIGLIM = %lu\n", UL x);
-			continue;
-			}
-		else {
-			errno = 0;
-			dval(&d) = strtod(buf,&se);
-			if (*se == ':')
-				sscanf(se+1,"%d %d", &mode, &ndigits);
-			dval(&d1) = atof(buf);
-			fmt = "Output: d =\n%.17g = 0x%lx %lx, se = %s";
-			if (errno)
-				baderrno();
-			}
-		printf(fmt, dval(&d), UL word0(&d), UL word1(&d), se);
-		g_fmt(buf1, dval(&d));
-		printf("\tg_fmt gives \"%s\"\n", buf1);
-		if (*buf != '#' && dval(&d) != dval(&d1))
-			printf("atof gives\n\
-	d1 = %.17g = 0x%lx %lx\nversus\n\
-	d  = %.17g = 0x%lx %lx\n", dval(&d1), UL word0(&d1), UL word1(&d1),
-				dval(&d), UL word0(&d), UL word1(&d));
-		check(&d);
-		s = dtoa(dval(&d), mode, ndigits, &decpt, &sign, &se);
-		printf("\tdtoa(mode = %d, ndigits = %d):\n", mode, ndigits);
-		printf("\tdtoa returns sign = %d, decpt = %d, %d digits:\n%s\n",
-			sign, decpt, (int)(se-s), s);
-		x = word1(&d);
-		if (x != 0xffffffff
-		 && (word0(&d) & 0x7ff00000) != 0x7ff00000) {
-#ifdef VAX
-			z = x << 16 | x >> 16;
-			z++;
-			z = z << 16 | z >> 16;
-			word1(&d) = z;
-#else
-			word1(&d) = x + 1;
-#endif
-			printf("\tnextafter(d,+Inf) = %.17g = 0x%lx %lx:\n",
-				dval(&d), UL word0(&d), UL word1(&d));
-			g_fmt(buf1, dval(&d));
-			printf("\tg_fmt gives \"%s\"\n", buf1);
-			s = dtoa(dval(&d), mode, ndigits, &decpt, &sign, &se);
-			printf(
-		"\tdtoa returns sign = %d, decpt = %d, %d digits:\n%s\n",
-				sign, decpt, (int)(se-s), s);
-			check(&d);
-			}
-		if (x) {
-#ifdef VAX
-			z = x << 16 | x >> 16;
-			z--;
-			z = z << 16 | z >> 16;
-			word1(&d) = z;
-#else
-			word1(&d) = x - 1;
-#endif
-			printf("\tnextafter(d,-Inf) = %.17g = 0x%lx %lx:\n",
-				dval(&d), UL word0(&d), UL word1(&d));
-			g_fmt(buf1, dval(&d));
-			printf("\tg_fmt gives \"%s\"\n", buf1);
-			s = dtoa(dval(&d), mode, ndigits, &decpt, &sign, &se);
-			printf(
-		"\tdtoa returns sign = %d, decpt = %d, %d digits:\n%s\n",
-				sign, decpt, (int)(se-s), s);
-			check(&d);
-			}
-		}
-	return 0;
-	}
diff --git a/lib/libc/gdtoa/test/dtest.c b/lib/libc/gdtoa/test/dtest.c
deleted file mode 100644
index 0140f2ed3..000000000
--- a/lib/libc/gdtoa/test/dtest.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998-2001 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-/* Test program for g_dfmt, strtoId, strtod, strtopd, and strtord.
- *
- * Inputs (on stdin):
- *		r rounding_mode
- *		n ndig
- *		number
- *		#hex0 hex1
- *
- *	rounding_mode values:
- *		0 = toward zero
- *		1 = nearest
- *		2 = toward +Infinity
- *		3 = toward -Infinity
- *
- * where number is a decimal floating-point number,
- * hex0 is a string of Hex <= 8 digits for the most significant
- * word of the number, hex1 is a similar string for the other
- * (least significant) word, and ndig is a parameters to g_dfmt.
- */
-
-#include "gdtoaimp.h"
-#include <stdio.h>
-#include <stdlib.h>
-
- extern int getround ANSI((int,char*));
-
- static char ibuf[2048], obuf[1024];
-
-#define U (unsigned long)
-
- int
-main(Void)
-{
-	char *s, *se, *se1;
-	double f1, fI[2];
-	int i, i1, ndig = 0, r = 1;
-	long LL[2];
-	union { double f; ULong L[2]; } u;
-
-	while( (s = fgets(ibuf, sizeof(ibuf), stdin)) !=0) {
-		while(*s <= ' ')
-			if (!*s++)
-				continue;
-		switch(*s) {
-		  case 'r':
-			r = getround(r, s);
-			continue;
-		  case 'n':
-			i = s[1];
-			if (i <= ' ' || (i >= '0' && i <= '9')) {
-				ndig = atoi(s+1);
-				continue;
-				}
-			break; /* nan? */
-		  case '#':
-			LL[0] = u.L[_0];
-			LL[1] = u.L[_1];
-			sscanf(s+1, "%lx %lx", &LL[0], &LL[1]);
-			u.L[_0] = LL[0];
-			u.L[_1] = LL[1];
-			printf("\nInput: %s", ibuf);
-			printf("--> f = #%lx %lx\n", (long)u.L[_0], (long)u.L[_1]);
-			goto fmt_test;
-			}
-		printf("\nInput: %s", ibuf);
-		i = strtord(ibuf, &se, r, &u.f);
-		if (r == 1) {
-			if ((u.f != strtod(ibuf, &se1) || se1 != se))
-				printf("***strtod and strtord disagree!!\n");
-			i1 = strtopd(ibuf, &se, &f1);
-			if (i != i1 || u.f != f1 || se != se1)
-				printf("***strtord and strtopd disagree!!\n");
-			}
-		printf("strtod consumes %d bytes and returns %d with f = %.17g = #%lx %lx\n",
-				(int)(se-ibuf), i, u.f, U u.L[_0], U u.L[_1]);
- fmt_test:
-		se = g_dfmt(obuf, &u.f, ndig, sizeof(obuf));
-		printf("g_dfmt(%d) gives %d bytes: \"%s\"\n\n",
-			ndig, (int)(se-obuf), se ? obuf : "<null>");
-		if (*s == '#')
-			continue;
-		printf("strtoId returns %d,", strtoId(ibuf, &se, fI, &fI[1]));
-		printf(" consuming %d bytes.\n", (int)(se-ibuf));
-		if (fI[0] == fI[1]) {
-			if (fI[0] == u.f)
-				printf("fI[0] == fI[1] == strtod\n");
-			else
-				printf("fI[0] == fI[1] = #%lx %lx = %.17g\n",
-					U ((ULong*)fI)[_0], U ((ULong*)fI)[_1],
-					fI[0]);
-			}
-		else {
-			printf("fI[0] = #%lx %lx = %.17g\n",
-				U ((ULong*)fI)[_0], U ((ULong*)fI)[_1], fI[0]);
-			printf("fI[1] = #%lx %lx = %.17g\n",
-				U ((ULong*)&fI[1])[_0], U ((ULong*)&fI[1])[_1],
-				fI[1]);
-			if (fI[0] == u.f)
-				printf("fI[0] == strtod\n");
-			else if (fI[1] == u.f)
-				printf("fI[1] == strtod\n");
-			else
-				printf("**** Both differ from strtod ****\n");
-			}
-		printf("\n");
-		}
-	return 0;
-	}
diff --git a/lib/libc/gdtoa/test/dtst.out b/lib/libc/gdtoa/test/dtst.out
deleted file mode 100644
index 7b7a09a60..000000000
--- a/lib/libc/gdtoa/test/dtst.out
+++ /dev/null
@@ -1,684 +0,0 @@
-Input: 1.23
-Output: d =
-1.23 = 0x3ff3ae14 7ae147ae, se = 
-	g_fmt gives "1.23"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = 1, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2300000000000002 = 0x3ff3ae14 7ae147af:
-	g_fmt gives "1.2300000000000002"
-	dtoa returns sign = 0, decpt = 1, 17 digits:
-12300000000000002
-	nextafter(d,-Infinity) = 1.2299999999999998 = 0x3ff3ae14 7ae147ad:
-	g_fmt gives "1.2299999999999998"
-	dtoa returns sign = 0, decpt = 1, 17 digits:
-12299999999999998
-Input: 1.23e+20
-Output: d =
-1.23e+20 = 0x441aabdf 2145b430, se = 
-	g_fmt gives "1.23e+20"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = 21, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2300000000000002e+20 = 0x441aabdf 2145b431:
-	g_fmt gives "123000000000000020000"
-	dtoa returns sign = 0, decpt = 21, 17 digits:
-12300000000000002
-	nextafter(d,-Infinity) = 1.2299999999999998e+20 = 0x441aabdf 2145b42f:
-	g_fmt gives "122999999999999980000"
-	dtoa returns sign = 0, decpt = 21, 17 digits:
-12299999999999998
-Input: 1.23e-20
-Output: d =
-1.2300000000000001e-20 = 0x3bcd0ae4 cf767531, se = 
-	g_fmt gives "1.23e-20"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -19, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2300000000000002e-20 = 0x3bcd0ae4 cf767532:
-	g_fmt gives "1.2300000000000002e-20"
-	dtoa returns sign = 0, decpt = -19, 17 digits:
-12300000000000002
-	nextafter(d,-Infinity) = 1.2299999999999999e-20 = 0x3bcd0ae4 cf767530:
-	g_fmt gives "1.2299999999999999e-20"
-	dtoa returns sign = 0, decpt = -19, 17 digits:
-12299999999999999
-Input: 1.23456789
-Output: d =
-1.2345678899999999 = 0x3ff3c0ca 4283de1b, se = 
-	g_fmt gives "1.23456789"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = 1, 9 digits:
-123456789
-	nextafter(d,+Infinity) = 1.2345678900000001 = 0x3ff3c0ca 4283de1c:
-	g_fmt gives "1.2345678900000001"
-	dtoa returns sign = 0, decpt = 1, 17 digits:
-12345678900000001
-	nextafter(d,-Infinity) = 1.2345678899999997 = 0x3ff3c0ca 4283de1a:
-	g_fmt gives "1.2345678899999997"
-	dtoa returns sign = 0, decpt = 1, 17 digits:
-12345678899999997
-Input: 1.23456589e+20
-Output: d =
-1.23456589e+20 = 0x441ac537 a660b997, se = 
-	g_fmt gives "1.23456589e+20"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = 21, 9 digits:
-123456589
-	nextafter(d,+Infinity) = 1.2345658900000001e+20 = 0x441ac537 a660b998:
-	g_fmt gives "123456589000000010000"
-	dtoa returns sign = 0, decpt = 21, 17 digits:
-12345658900000001
-	nextafter(d,-Infinity) = 1.2345658899999998e+20 = 0x441ac537 a660b996:
-	g_fmt gives "123456588999999980000"
-	dtoa returns sign = 0, decpt = 21, 17 digits:
-12345658899999998
-Input: 1.23e+30
-Output: d =
-1.23e+30 = 0x462f0cb0 4e8fb790, se = 
-	g_fmt gives "1.23e+30"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = 31, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2300000000000001e+30 = 0x462f0cb0 4e8fb791:
-	g_fmt gives "1.2300000000000001e+30"
-	dtoa returns sign = 0, decpt = 31, 17 digits:
-12300000000000001
-	nextafter(d,-Infinity) = 1.2299999999999998e+30 = 0x462f0cb0 4e8fb78f:
-	g_fmt gives "1.2299999999999998e+30"
-	dtoa returns sign = 0, decpt = 31, 17 digits:
-12299999999999998
-Input: 1.23e-30
-Output: d =
-1.2300000000000001e-30 = 0x39b8f286 6f5010ab, se = 
-	g_fmt gives "1.23e-30"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -29, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2300000000000002e-30 = 0x39b8f286 6f5010ac:
-	g_fmt gives "1.2300000000000002e-30"
-	dtoa returns sign = 0, decpt = -29, 17 digits:
-12300000000000002
-	nextafter(d,-Infinity) = 1.2299999999999999e-30 = 0x39b8f286 6f5010aa:
-	g_fmt gives "1.2299999999999999e-30"
-	dtoa returns sign = 0, decpt = -29, 17 digits:
-12299999999999999
-Input: 1.23456789e-20
-Output: d =
-1.2345678899999999e-20 = 0x3bcd2681 471e7ada, se = 
-	g_fmt gives "1.23456789e-20"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -19, 9 digits:
-123456789
-	nextafter(d,+Infinity) = 1.2345678900000001e-20 = 0x3bcd2681 471e7adb:
-	g_fmt gives "1.2345678900000001e-20"
-	dtoa returns sign = 0, decpt = -19, 17 digits:
-12345678900000001
-	nextafter(d,-Infinity) = 1.2345678899999998e-20 = 0x3bcd2681 471e7ad9:
-	g_fmt gives "1.2345678899999998e-20"
-	dtoa returns sign = 0, decpt = -19, 17 digits:
-12345678899999998
-Input: 1.23456789e-30
-Output: d =
-1.23456789e-30 = 0x39b90a3e 33bbd995, se = 
-	g_fmt gives "1.23456789e-30"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -29, 9 digits:
-123456789
-	nextafter(d,+Infinity) = 1.2345678900000002e-30 = 0x39b90a3e 33bbd996:
-	g_fmt gives "1.2345678900000002e-30"
-	dtoa returns sign = 0, decpt = -29, 17 digits:
-12345678900000002
-	nextafter(d,-Infinity) = 1.2345678899999998e-30 = 0x39b90a3e 33bbd994:
-	g_fmt gives "1.2345678899999998e-30"
-	dtoa returns sign = 0, decpt = -29, 17 digits:
-12345678899999998
-Input: 1.234567890123456789
-Output: d =
-1.2345678901234567 = 0x3ff3c0ca 428c59fb, se = 
-	g_fmt gives "1.2345678901234567"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = 1, 17 digits:
-12345678901234567
-	nextafter(d,+Infinity) = 1.2345678901234569 = 0x3ff3c0ca 428c59fc:
-	g_fmt gives "1.234567890123457"
-	dtoa returns sign = 0, decpt = 1, 16 digits:
-1234567890123457
-	nextafter(d,-Infinity) = 1.2345678901234565 = 0x3ff3c0ca 428c59fa:
-	g_fmt gives "1.2345678901234565"
-	dtoa returns sign = 0, decpt = 1, 17 digits:
-12345678901234565
-Input: 1.23456789012345678901234567890123456789
-Output: d =
-1.2345678901234567 = 0x3ff3c0ca 428c59fb, se = 
-	g_fmt gives "1.2345678901234567"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = 1, 17 digits:
-12345678901234567
-	nextafter(d,+Infinity) = 1.2345678901234569 = 0x3ff3c0ca 428c59fc:
-	g_fmt gives "1.234567890123457"
-	dtoa returns sign = 0, decpt = 1, 16 digits:
-1234567890123457
-	nextafter(d,-Infinity) = 1.2345678901234565 = 0x3ff3c0ca 428c59fa:
-	g_fmt gives "1.2345678901234565"
-	dtoa returns sign = 0, decpt = 1, 17 digits:
-12345678901234565
-Input: 1.23e306
-Output: d =
-1.23e+306 = 0x7f7c0676 cd1c61f5, se = 
-	g_fmt gives "1.23e+306"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = 307, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2300000000000002e+306 = 0x7f7c0676 cd1c61f6:
-	g_fmt gives "1.2300000000000002e+306"
-	dtoa returns sign = 0, decpt = 307, 17 digits:
-12300000000000002
-	nextafter(d,-Infinity) = 1.2299999999999999e+306 = 0x7f7c0676 cd1c61f4:
-	g_fmt gives "1.2299999999999999e+306"
-	dtoa returns sign = 0, decpt = 307, 17 digits:
-12299999999999999
-Input: 1.23e-306
-Output: d =
-1.23e-306 = 0x6ba3b8 5da396e8, se = 
-	g_fmt gives "1.23e-306"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -305, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2300000000000002e-306 = 0x6ba3b8 5da396e9:
-	g_fmt gives "1.2300000000000002e-306"
-	dtoa returns sign = 0, decpt = -305, 17 digits:
-12300000000000002
-	nextafter(d,-Infinity) = 1.2299999999999999e-306 = 0x6ba3b8 5da396e7:
-	g_fmt gives "1.2299999999999999e-306"
-	dtoa returns sign = 0, decpt = -305, 17 digits:
-12299999999999999
-Input: 1.23e-320
-Output: d =
-1.2302234581447039e-320 = 0x0 9ba, se = 
-	g_fmt gives "1.23e-320"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -319, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2307175237905451e-320 = 0x0 9bb:
-	g_fmt gives "1.2307e-320"
-	dtoa returns sign = 0, decpt = -319, 5 digits:
-12307
-	nextafter(d,-Infinity) = 1.2297293924988626e-320 = 0x0 9b9:
-	g_fmt gives "1.2297e-320"
-	dtoa returns sign = 0, decpt = -319, 5 digits:
-12297
-Input: 1.23e-20
-Output: d =
-1.2300000000000001e-20 = 0x3bcd0ae4 cf767531, se = 
-	g_fmt gives "1.23e-20"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -19, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2300000000000002e-20 = 0x3bcd0ae4 cf767532:
-	g_fmt gives "1.2300000000000002e-20"
-	dtoa returns sign = 0, decpt = -19, 17 digits:
-12300000000000002
-	nextafter(d,-Infinity) = 1.2299999999999999e-20 = 0x3bcd0ae4 cf767530:
-	g_fmt gives "1.2299999999999999e-20"
-	dtoa returns sign = 0, decpt = -19, 17 digits:
-12299999999999999
-Input: 1.23456789e307
-Output: d =
-1.23456789e+307 = 0x7fb194b1 4bdaecdc, se = 
-	g_fmt gives "1.23456789e+307"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = 308, 9 digits:
-123456789
-	nextafter(d,+Infinity) = 1.2345678900000003e+307 = 0x7fb194b1 4bdaecdd:
-	g_fmt gives "1.2345678900000003e+307"
-	dtoa returns sign = 0, decpt = 308, 17 digits:
-12345678900000003
-	nextafter(d,-Infinity) = 1.2345678899999998e+307 = 0x7fb194b1 4bdaecdb:
-	g_fmt gives "1.2345678899999998e+307"
-	dtoa returns sign = 0, decpt = 308, 17 digits:
-12345678899999998
-Input: 1.23456589e-307
-Output: d =
-1.2345658899999999e-307 = 0x363196 bb9845fa, se = 
-	g_fmt gives "1.23456589e-307"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -306, 9 digits:
-123456589
-	nextafter(d,+Infinity) = 1.2345658900000001e-307 = 0x363196 bb9845fb:
-	g_fmt gives "1.2345658900000001e-307"
-	dtoa returns sign = 0, decpt = -306, 17 digits:
-12345658900000001
-	nextafter(d,-Infinity) = 1.2345658899999997e-307 = 0x363196 bb9845f9:
-	g_fmt gives "1.2345658899999997e-307"
-	dtoa returns sign = 0, decpt = -306, 17 digits:
-12345658899999997
-Input: 1.234567890123456789
-Output: d =
-1.2345678901234567 = 0x3ff3c0ca 428c59fb, se = 
-	g_fmt gives "1.2345678901234567"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = 1, 17 digits:
-12345678901234567
-	nextafter(d,+Infinity) = 1.2345678901234569 = 0x3ff3c0ca 428c59fc:
-	g_fmt gives "1.234567890123457"
-	dtoa returns sign = 0, decpt = 1, 16 digits:
-1234567890123457
-	nextafter(d,-Infinity) = 1.2345678901234565 = 0x3ff3c0ca 428c59fa:
-	g_fmt gives "1.2345678901234565"
-	dtoa returns sign = 0, decpt = 1, 17 digits:
-12345678901234565
-Input: 1.234567890123456789e301
-Output: d =
-1.2345678901234568e+301 = 0x7e726f51 75f56413, se = 
-	g_fmt gives "1.2345678901234568e+301"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = 302, 17 digits:
-12345678901234568
-	nextafter(d,+Infinity) = 1.234567890123457e+301 = 0x7e726f51 75f56414:
-	g_fmt gives "1.234567890123457e+301"
-	dtoa returns sign = 0, decpt = 302, 16 digits:
-1234567890123457
-	nextafter(d,-Infinity) = 1.2345678901234565e+301 = 0x7e726f51 75f56412:
-	g_fmt gives "1.2345678901234565e+301"
-	dtoa returns sign = 0, decpt = 302, 17 digits:
-12345678901234565
-Input: 1.234567890123456789e-301
-Output: d =
-1.2345678901234567e-301 = 0x1752a64 e34ba0d3, se = 
-	g_fmt gives "1.2345678901234567e-301"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -300, 17 digits:
-12345678901234567
-	nextafter(d,+Infinity) = 1.2345678901234569e-301 = 0x1752a64 e34ba0d4:
-	g_fmt gives "1.234567890123457e-301"
-	dtoa returns sign = 0, decpt = -300, 16 digits:
-1234567890123457
-	nextafter(d,-Infinity) = 1.2345678901234565e-301 = 0x1752a64 e34ba0d2:
-	g_fmt gives "1.2345678901234565e-301"
-	dtoa returns sign = 0, decpt = -300, 17 digits:
-12345678901234565
-Input: 1.234567890123456789e-321
-Output: d =
-1.2351641146031164e-321 = 0x0 fa, se = 
-	g_fmt gives "1.235e-321"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -320, 4 digits:
-1235
-	nextafter(d,+Infinity) = 1.2401047710615288e-321 = 0x0 fb:
-	g_fmt gives "1.24e-321"
-	dtoa returns sign = 0, decpt = -320, 3 digits:
-124
-	nextafter(d,-Infinity) = 1.2302234581447039e-321 = 0x0 f9:
-	g_fmt gives "1.23e-321"
-	dtoa returns sign = 0, decpt = -320, 3 digits:
-123
-Input: 1e23
-Output: d =
-9.9999999999999992e+22 = 0x44b52d02 c7e14af6, se = 
-	g_fmt gives "1e+23"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = 24, 1 digits:
-1
-	nextafter(d,+Infinity) = 1.0000000000000001e+23 = 0x44b52d02 c7e14af7:
-	g_fmt gives "1.0000000000000001e+23"
-	dtoa returns sign = 0, decpt = 24, 17 digits:
-10000000000000001
-	nextafter(d,-Infinity) = 9.9999999999999975e+22 = 0x44b52d02 c7e14af5:
-	g_fmt gives "9.999999999999997e+22"
-	dtoa returns sign = 0, decpt = 23, 16 digits:
-9999999999999997
-Input: 1e310
-Output: d =
-Infinity = 0x7ff00000 0, se = 
-	g_fmt gives "Infinity"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = 9999, 8 digits:
-Infinity
-Input: 9.0259718793241475e-277
-Output: d =
-9.0259718793241479e-277 = 0x6a00000 0, se = 
-	g_fmt gives "9.025971879324148e-277"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -276, 16 digits:
-9025971879324148
-	nextafter(d,+Infinity) = 9.0259718793241499e-277 = 0x6a00000 1:
-	g_fmt gives "9.02597187932415e-277"
-	dtoa returns sign = 0, decpt = -276, 15 digits:
-902597187932415
-Input: 9.025971879324147880346310405869e-277
-Output: d =
-9.0259718793241479e-277 = 0x6a00000 0, se = 
-	g_fmt gives "9.025971879324148e-277"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -276, 16 digits:
-9025971879324148
-	nextafter(d,+Infinity) = 9.0259718793241499e-277 = 0x6a00000 1:
-	g_fmt gives "9.02597187932415e-277"
-	dtoa returns sign = 0, decpt = -276, 15 digits:
-902597187932415
-Input: 9.025971879324147880346310405868e-277
-Output: d =
-9.0259718793241479e-277 = 0x6a00000 0, se = 
-	g_fmt gives "9.025971879324148e-277"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -276, 16 digits:
-9025971879324148
-	nextafter(d,+Infinity) = 9.0259718793241499e-277 = 0x6a00000 1:
-	g_fmt gives "9.02597187932415e-277"
-	dtoa returns sign = 0, decpt = -276, 15 digits:
-902597187932415
-Input: 2.2250738585072014e-308
-Output: d =
-2.2250738585072014e-308 = 0x100000 0, se = 
-	g_fmt gives "2.2250738585072014e-308"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -307, 17 digits:
-22250738585072014
-	nextafter(d,+Infinity) = 2.2250738585072019e-308 = 0x100000 1:
-	g_fmt gives "2.225073858507202e-308"
-	dtoa returns sign = 0, decpt = -307, 16 digits:
-2225073858507202
-Input: 2.2250738585072013e-308
-Output: d =
-2.2250738585072014e-308 = 0x100000 0, se = 
-	g_fmt gives "2.2250738585072014e-308"
-	dtoa(mode = 0, ndigits = 17):
-	dtoa returns sign = 0, decpt = -307, 17 digits:
-22250738585072014
-	nextafter(d,+Infinity) = 2.2250738585072019e-308 = 0x100000 1:
-	g_fmt gives "2.225073858507202e-308"
-	dtoa returns sign = 0, decpt = -307, 16 digits:
-2225073858507202
-Input: 1.23:2 6
-Output: d =
-1.23 = 0x3ff3ae14 7ae147ae, se = :2 6
-	g_fmt gives "1.23"
-	dtoa(mode = 2, ndigits = 6):
-	dtoa returns sign = 0, decpt = 1, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2300000000000002 = 0x3ff3ae14 7ae147af:
-	g_fmt gives "1.2300000000000002"
-	dtoa returns sign = 0, decpt = 1, 3 digits:
-123
-	nextafter(d,-Infinity) = 1.2299999999999998 = 0x3ff3ae14 7ae147ad:
-	g_fmt gives "1.2299999999999998"
-	dtoa returns sign = 0, decpt = 1, 3 digits:
-123
-Input: 1.23:4 6
-Output: d =
-1.23 = 0x3ff3ae14 7ae147ae, se = :4 6
-	g_fmt gives "1.23"
-	dtoa(mode = 4, ndigits = 6):
-	dtoa returns sign = 0, decpt = 1, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2300000000000002 = 0x3ff3ae14 7ae147af:
-	g_fmt gives "1.2300000000000002"
-	dtoa returns sign = 0, decpt = 1, 3 digits:
-123
-	nextafter(d,-Infinity) = 1.2299999999999998 = 0x3ff3ae14 7ae147ad:
-	g_fmt gives "1.2299999999999998"
-	dtoa returns sign = 0, decpt = 1, 3 digits:
-123
-Input: 1.23e+20:2 6
-Output: d =
-1.23e+20 = 0x441aabdf 2145b430, se = :2 6
-	g_fmt gives "1.23e+20"
-	dtoa(mode = 2, ndigits = 6):
-	dtoa returns sign = 0, decpt = 21, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2300000000000002e+20 = 0x441aabdf 2145b431:
-	g_fmt gives "123000000000000020000"
-	dtoa returns sign = 0, decpt = 21, 3 digits:
-123
-	nextafter(d,-Infinity) = 1.2299999999999998e+20 = 0x441aabdf 2145b42f:
-	g_fmt gives "122999999999999980000"
-	dtoa returns sign = 0, decpt = 21, 3 digits:
-123
-Input: 1.23e+20:4 6
-Output: d =
-1.23e+20 = 0x441aabdf 2145b430, se = :4 6
-	g_fmt gives "1.23e+20"
-	dtoa(mode = 4, ndigits = 6):
-	dtoa returns sign = 0, decpt = 21, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2300000000000002e+20 = 0x441aabdf 2145b431:
-	g_fmt gives "123000000000000020000"
-	dtoa returns sign = 0, decpt = 21, 3 digits:
-123
-	nextafter(d,-Infinity) = 1.2299999999999998e+20 = 0x441aabdf 2145b42f:
-	g_fmt gives "122999999999999980000"
-	dtoa returns sign = 0, decpt = 21, 3 digits:
-123
-Input: 1.23e-20:2 6
-Output: d =
-1.2300000000000001e-20 = 0x3bcd0ae4 cf767531, se = :2 6
-	g_fmt gives "1.23e-20"
-	dtoa(mode = 2, ndigits = 6):
-	dtoa returns sign = 0, decpt = -19, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2300000000000002e-20 = 0x3bcd0ae4 cf767532:
-	g_fmt gives "1.2300000000000002e-20"
-	dtoa returns sign = 0, decpt = -19, 3 digits:
-123
-	nextafter(d,-Infinity) = 1.2299999999999999e-20 = 0x3bcd0ae4 cf767530:
-	g_fmt gives "1.2299999999999999e-20"
-	dtoa returns sign = 0, decpt = -19, 3 digits:
-123
-Input: 1.23e-20:4 6
-Output: d =
-1.2300000000000001e-20 = 0x3bcd0ae4 cf767531, se = :4 6
-	g_fmt gives "1.23e-20"
-	dtoa(mode = 4, ndigits = 6):
-	dtoa returns sign = 0, decpt = -19, 3 digits:
-123
-	nextafter(d,+Infinity) = 1.2300000000000002e-20 = 0x3bcd0ae4 cf767532:
-	g_fmt gives "1.2300000000000002e-20"
-	dtoa returns sign = 0, decpt = -19, 3 digits:
-123
-	nextafter(d,-Infinity) = 1.2299999999999999e-20 = 0x3bcd0ae4 cf767530:
-	g_fmt gives "1.2299999999999999e-20"
-	dtoa returns sign = 0, decpt = -19, 3 digits:
-123
-Input: 1.23456789:2 6
-Output: d =
-1.2345678899999999 = 0x3ff3c0ca 4283de1b, se = :2 6
-	g_fmt gives "1.23456789"
-	dtoa(mode = 2, ndigits = 6):
-	dtoa returns sign = 0, decpt = 1, 6 digits:
-123457
-	nextafter(d,+Infinity) = 1.2345678900000001 = 0x3ff3c0ca 4283de1c:
-	g_fmt gives "1.2345678900000001"
-	dtoa returns sign = 0, decpt = 1, 6 digits:
-123457
-	nextafter(d,-Infinity) = 1.2345678899999997 = 0x3ff3c0ca 4283de1a:
-	g_fmt gives "1.2345678899999997"
-	dtoa returns sign = 0, decpt = 1, 6 digits:
-123457
-Input: 1.23456789:4 6
-Output: d =
-1.2345678899999999 = 0x3ff3c0ca 4283de1b, se = :4 6
-	g_fmt gives "1.23456789"
-	dtoa(mode = 4, ndigits = 6):
-	dtoa returns sign = 0, decpt = 1, 6 digits:
-123457
-	nextafter(d,+Infinity) = 1.2345678900000001 = 0x3ff3c0ca 4283de1c:
-	g_fmt gives "1.2345678900000001"
-	dtoa returns sign = 0, decpt = 1, 6 digits:
-123457
-	nextafter(d,-Infinity) = 1.2345678899999997 = 0x3ff3c0ca 4283de1a:
-	g_fmt gives "1.2345678899999997"
-	dtoa returns sign = 0, decpt = 1, 6 digits:
-123457
-Input: 1.23456589e+20:2 6
-Output: d =
-1.23456589e+20 = 0x441ac537 a660b997, se = :2 6
-	g_fmt gives "1.23456589e+20"
-	dtoa(mode = 2, ndigits = 6):
-	dtoa returns sign = 0, decpt = 21, 6 digits:
-123457
-	nextafter(d,+Infinity) = 1.2345658900000001e+20 = 0x441ac537 a660b998:
-	g_fmt gives "123456589000000010000"
-	dtoa returns sign = 0, decpt = 21, 6 digits:
-123457
-	nextafter(d,-Infinity) = 1.2345658899999998e+20 = 0x441ac537 a660b996:
-	g_fmt gives "123456588999999980000"
-	dtoa returns sign = 0, decpt = 21, 6 digits:
-123457
-Input: 1.23456589e+20:4 6
-Output: d =
-1.23456589e+20 = 0x441ac537 a660b997, se = :4 6
-	g_fmt gives "1.23456589e+20"
-	dtoa(mode = 4, ndigits = 6):
-	dtoa returns sign = 0, decpt = 21, 6 digits:
-123457
-	nextafter(d,+Infinity) = 1.2345658900000001e+20 = 0x441ac537 a660b998:
-	g_fmt gives "123456589000000010000"
-	dtoa returns sign = 0, decpt = 21, 6 digits:
-123457
-	nextafter(d,-Infinity) = 1.2345658899999998e+20 = 0x441ac537 a660b996:
-	g_fmt gives "123456588999999980000"
-	dtoa returns sign = 0, decpt = 21, 6 digits:
-123457
-Input: 1.23456789e-20:2 6
-Output: d =
-1.2345678899999999e-20 = 0x3bcd2681 471e7ada, se = :2 6
-	g_fmt gives "1.23456789e-20"
-	dtoa(mode = 2, ndigits = 6):
-	dtoa returns sign = 0, decpt = -19, 6 digits:
-123457
-	nextafter(d,+Infinity) = 1.2345678900000001e-20 = 0x3bcd2681 471e7adb:
-	g_fmt gives "1.2345678900000001e-20"
-	dtoa returns sign = 0, decpt = -19, 6 digits:
-123457
-	nextafter(d,-Infinity) = 1.2345678899999998e-20 = 0x3bcd2681 471e7ad9:
-	g_fmt gives "1.2345678899999998e-20"
-	dtoa returns sign = 0, decpt = -19, 6 digits:
-123457
-Input: 1.23456789e-20:4 6
-Output: d =
-1.2345678899999999e-20 = 0x3bcd2681 471e7ada, se = :4 6
-	g_fmt gives "1.23456789e-20"
-	dtoa(mode = 4, ndigits = 6):
-	dtoa returns sign = 0, decpt = -19, 6 digits:
-123457
-	nextafter(d,+Infinity) = 1.2345678900000001e-20 = 0x3bcd2681 471e7adb:
-	g_fmt gives "1.2345678900000001e-20"
-	dtoa returns sign = 0, decpt = -19, 6 digits:
-123457
-	nextafter(d,-Infinity) = 1.2345678899999998e-20 = 0x3bcd2681 471e7ad9:
-	g_fmt gives "1.2345678899999998e-20"
-	dtoa returns sign = 0, decpt = -19, 6 digits:
-123457
-Input: 1234565:2 6
-Output: d =
-1234565 = 0x4132d685 0, se = :2 6
-	g_fmt gives "1234565"
-	dtoa(mode = 2, ndigits = 6):
-	dtoa returns sign = 0, decpt = 7, 6 digits:
-123456
-	nextafter(d,+Infinity) = 1234565.0000000002 = 0x4132d685 1:
-	g_fmt gives "1234565.0000000002"
-	dtoa returns sign = 0, decpt = 7, 6 digits:
-123457
-Input: 1234565:4 6
-Output: d =
-1234565 = 0x4132d685 0, se = :4 6
-	g_fmt gives "1234565"
-	dtoa(mode = 4, ndigits = 6):
-	dtoa returns sign = 0, decpt = 7, 6 digits:
-123456
-	nextafter(d,+Infinity) = 1234565.0000000002 = 0x4132d685 1:
-	g_fmt gives "1234565.0000000002"
-	dtoa returns sign = 0, decpt = 7, 6 digits:
-123457
-Input: 1.234565:2 6
-Output: d =
-1.2345649999999999 = 0x3ff3c0c7 3abc9470, se = :2 6
-	g_fmt gives "1.234565"
-	dtoa(mode = 2, ndigits = 6):
-	dtoa returns sign = 0, decpt = 1, 6 digits:
-123456
-	nextafter(d,+Infinity) = 1.2345650000000001 = 0x3ff3c0c7 3abc9471:
-	g_fmt gives "1.2345650000000001"
-	dtoa returns sign = 0, decpt = 1, 6 digits:
-123457
-	nextafter(d,-Infinity) = 1.2345649999999997 = 0x3ff3c0c7 3abc946f:
-	g_fmt gives "1.2345649999999997"
-	dtoa returns sign = 0, decpt = 1, 6 digits:
-123456
-Input: 1.234565:4 6
-Output: d =
-1.2345649999999999 = 0x3ff3c0c7 3abc9470, se = :4 6
-	g_fmt gives "1.234565"
-	dtoa(mode = 4, ndigits = 6):
-	dtoa returns sign = 0, decpt = 1, 6 digits:
-123456
-	nextafter(d,+Infinity) = 1.2345650000000001 = 0x3ff3c0c7 3abc9471:
-	g_fmt gives "1.2345650000000001"
-	dtoa returns sign = 0, decpt = 1, 6 digits:
-123457
-	nextafter(d,-Infinity) = 1.2345649999999997 = 0x3ff3c0c7 3abc946f:
-	g_fmt gives "1.2345649999999997"
-	dtoa returns sign = 0, decpt = 1, 6 digits:
-123456
-Input: 1.234565e+20:2 6
-Output: d =
-1.234565e+20 = 0x441ac536 6299040d, se = :2 6
-	g_fmt gives "1.234565e+20"
-	dtoa(mode = 2, ndigits = 6):
-	dtoa returns sign = 0, decpt = 21, 6 digits:
-123456
-	nextafter(d,+Infinity) = 1.2345650000000002e+20 = 0x441ac536 6299040e:
-	g_fmt gives "123456500000000020000"
-	dtoa returns sign = 0, decpt = 21, 6 digits:
-123457
-	nextafter(d,-Infinity) = 1.2345649999999998e+20 = 0x441ac536 6299040c:
-	g_fmt gives "123456499999999980000"
-	dtoa returns sign = 0, decpt = 21, 6 digits:
-123456
-Input: 1.234565e+20:4 6
-Output: d =
-1.234565e+20 = 0x441ac536 6299040d, se = :4 6
-	g_fmt gives "1.234565e+20"
-	dtoa(mode = 4, ndigits = 6):
-	dtoa returns sign = 0, decpt = 21, 6 digits:
-123456
-	nextafter(d,+Infinity) = 1.2345650000000002e+20 = 0x441ac536 6299040e:
-	g_fmt gives "123456500000000020000"
-	dtoa returns sign = 0, decpt = 21, 6 digits:
-123457
-	nextafter(d,-Infinity) = 1.2345649999999998e+20 = 0x441ac536 6299040c:
-	g_fmt gives "123456499999999980000"
-	dtoa returns sign = 0, decpt = 21, 6 digits:
-123456
-Input: 1.234565e-20:2 6
-Output: d =
-1.234565e-20 = 0x3bcd267c ce45a93f, se = :2 6
-	g_fmt gives "1.234565e-20"
-	dtoa(mode = 2, ndigits = 6):
-	dtoa returns sign = 0, decpt = -19, 6 digits:
-123456
-	nextafter(d,+Infinity) = 1.2345650000000001e-20 = 0x3bcd267c ce45a940:
-	g_fmt gives "1.2345650000000001e-20"
-	dtoa returns sign = 0, decpt = -19, 6 digits:
-123457
-	nextafter(d,-Infinity) = 1.2345649999999998e-20 = 0x3bcd267c ce45a93e:
-	g_fmt gives "1.2345649999999998e-20"
-	dtoa returns sign = 0, decpt = -19, 6 digits:
-123456
-Input: 1.234565e-20:4 6
-Output: d =
-1.234565e-20 = 0x3bcd267c ce45a93f, se = :4 6
-	g_fmt gives "1.234565e-20"
-	dtoa(mode = 4, ndigits = 6):
-	dtoa returns sign = 0, decpt = -19, 6 digits:
-123456
-	nextafter(d,+Infinity) = 1.2345650000000001e-20 = 0x3bcd267c ce45a940:
-	g_fmt gives "1.2345650000000001e-20"
-	dtoa returns sign = 0, decpt = -19, 6 digits:
-123457
-	nextafter(d,-Infinity) = 1.2345649999999998e-20 = 0x3bcd267c ce45a93e:
-	g_fmt gives "1.2345649999999998e-20"
-	dtoa returns sign = 0, decpt = -19, 6 digits:
-123456
diff --git a/lib/libc/gdtoa/test/f.out b/lib/libc/gdtoa/test/f.out
deleted file mode 100644
index d82e4e6f9..000000000
--- a/lib/libc/gdtoa/test/f.out
+++ /dev/null
@@ -1,988 +0,0 @@
-
-Input: 1.23
-strtof consumes 4 bytes and returns 1.23 = #3f9d70a4
-g_ffmt(0) gives 4 bytes: "1.23"
-
-strtoIf returns 33, consuming 4 bytes.
-fI[0] = #3f9d70a3 = 1.2299999
-fI[1] = #3f9d70a4 = 1.23
-fI[1] == strtof
-
-
-Input: 1.23e+20
-strtof consumes 8 bytes and returns 1.23e+20 = #60d55ef9
-g_ffmt(0) gives 8 bytes: "1.23e+20"
-
-strtoIf returns 17, consuming 8 bytes.
-fI[0] = #60d55ef9 = 1.23e+20
-fI[1] = #60d55efa = 1.2300001e+20
-fI[0] == strtof
-
-
-Input: 1.23e-20
-strtof consumes 8 bytes and returns 1.23e-20 = #1e685726
-g_ffmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIf returns 17, consuming 8 bytes.
-fI[0] = #1e685726 = 1.23e-20
-fI[1] = #1e685727 = 1.23e-20
-fI[0] == strtof
-
-
-Input: 1.23456789
-strtof consumes 10 bytes and returns 1.2345679 = #3f9e0652
-g_ffmt(0) gives 9 bytes: "1.2345679"
-
-strtoIf returns 17, consuming 10 bytes.
-fI[0] = #3f9e0652 = 1.2345679
-fI[1] = #3f9e0653 = 1.234568
-fI[0] == strtof
-
-
-Input: 1.23456589e+20
-strtof consumes 14 bytes and returns 1.2345659e+20 = #60d629bd
-g_ffmt(0) gives 13 bytes: "1.2345659e+20"
-
-strtoIf returns 17, consuming 14 bytes.
-fI[0] = #60d629bd = 1.2345659e+20
-fI[1] = #60d629be = 1.234566e+20
-fI[0] == strtof
-
-
-Input: 1.23e+30
-strtof consumes 8 bytes and returns 1.23e+30 = #71786582
-g_ffmt(0) gives 8 bytes: "1.23e+30"
-
-strtoIf returns 17, consuming 8 bytes.
-fI[0] = #71786582 = 1.23e+30
-fI[1] = #71786583 = 1.23e+30
-fI[0] == strtof
-
-
-Input: 1.23e-30
-strtof consumes 8 bytes and returns 1.23e-30 = #dc79433
-g_ffmt(0) gives 8 bytes: "1.23e-30"
-
-strtoIf returns 17, consuming 8 bytes.
-fI[0] = #dc79433 = 1.23e-30
-fI[1] = #dc79434 = 1.23e-30
-fI[0] == strtof
-
-
-Input: 1.23456789e-20
-strtof consumes 14 bytes and returns 1.2345679e-20 = #1e69340a
-g_ffmt(0) gives 13 bytes: "1.2345679e-20"
-
-strtoIf returns 17, consuming 14 bytes.
-fI[0] = #1e69340a = 1.2345679e-20
-fI[1] = #1e69340b = 1.234568e-20
-fI[0] == strtof
-
-
-Input: 1.23456789e-30
-strtof consumes 14 bytes and returns 1.2345679e-30 = #dc851f2
-g_ffmt(0) gives 13 bytes: "1.2345679e-30"
-
-strtoIf returns 33, consuming 14 bytes.
-fI[0] = #dc851f1 = 1.2345678e-30
-fI[1] = #dc851f2 = 1.2345679e-30
-fI[1] == strtof
-
-
-Input: 1.234567890123456789
-strtof consumes 20 bytes and returns 1.2345679 = #3f9e0652
-g_ffmt(0) gives 9 bytes: "1.2345679"
-
-strtoIf returns 17, consuming 20 bytes.
-fI[0] = #3f9e0652 = 1.2345679
-fI[1] = #3f9e0653 = 1.234568
-fI[0] == strtof
-
-
-Input: 1.23456789012345678901234567890123456789
-strtof consumes 40 bytes and returns 1.2345679 = #3f9e0652
-g_ffmt(0) gives 9 bytes: "1.2345679"
-
-strtoIf returns 17, consuming 40 bytes.
-fI[0] = #3f9e0652 = 1.2345679
-fI[1] = #3f9e0653 = 1.234568
-fI[0] == strtof
-
-
-Input: 1.23e306
-strtof consumes 8 bytes and returns Infinity = #7f800000
-g_ffmt(0) gives 8 bytes: "Infinity"
-
-strtoIf returns 163, consuming 8 bytes.
-fI[0] = #7f7fffff = 3.4028235e+38
-fI[1] = #7f800000 = Infinity
-fI[1] == strtof
-
-
-Input: 1.23e-306
-strtof consumes 9 bytes and returns 0 = #0
-g_ffmt(0) gives 1 bytes: "0"
-
-strtoIf returns 80, consuming 9 bytes.
-fI[0] = #0 = 0
-fI[1] = #1 = 1.4012985e-45
-fI[0] == strtof
-
-
-Input: 1.23e-320
-strtof consumes 9 bytes and returns 0 = #0
-g_ffmt(0) gives 1 bytes: "0"
-
-strtoIf returns 80, consuming 9 bytes.
-fI[0] = #0 = 0
-fI[1] = #1 = 1.4012985e-45
-fI[0] == strtof
-
-
-Input: 1.23e-20
-strtof consumes 8 bytes and returns 1.23e-20 = #1e685726
-g_ffmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIf returns 17, consuming 8 bytes.
-fI[0] = #1e685726 = 1.23e-20
-fI[1] = #1e685727 = 1.23e-20
-fI[0] == strtof
-
-
-Input: 1.23456789e307
-strtof consumes 14 bytes and returns Infinity = #7f800000
-g_ffmt(0) gives 8 bytes: "Infinity"
-
-strtoIf returns 163, consuming 14 bytes.
-fI[0] = #7f7fffff = 3.4028235e+38
-fI[1] = #7f800000 = Infinity
-fI[1] == strtof
-
-
-Input: 1.23456589e-307
-strtof consumes 15 bytes and returns 0 = #0
-g_ffmt(0) gives 1 bytes: "0"
-
-strtoIf returns 80, consuming 15 bytes.
-fI[0] = #0 = 0
-fI[1] = #1 = 1.4012985e-45
-fI[0] == strtof
-
-
-Input: 1.234567890123456789
-strtof consumes 20 bytes and returns 1.2345679 = #3f9e0652
-g_ffmt(0) gives 9 bytes: "1.2345679"
-
-strtoIf returns 17, consuming 20 bytes.
-fI[0] = #3f9e0652 = 1.2345679
-fI[1] = #3f9e0653 = 1.234568
-fI[0] == strtof
-
-
-Input: 1.234567890123456789e301
-strtof consumes 24 bytes and returns Infinity = #7f800000
-g_ffmt(0) gives 8 bytes: "Infinity"
-
-strtoIf returns 163, consuming 24 bytes.
-fI[0] = #7f7fffff = 3.4028235e+38
-fI[1] = #7f800000 = Infinity
-fI[1] == strtof
-
-
-Input: 1.234567890123456789e-301
-strtof consumes 25 bytes and returns 0 = #0
-g_ffmt(0) gives 1 bytes: "0"
-
-strtoIf returns 80, consuming 25 bytes.
-fI[0] = #0 = 0
-fI[1] = #1 = 1.4012985e-45
-fI[0] == strtof
-
-
-Input: 1.234567890123456789e-321
-strtof consumes 25 bytes and returns 0 = #0
-g_ffmt(0) gives 1 bytes: "0"
-
-strtoIf returns 80, consuming 25 bytes.
-fI[0] = #0 = 0
-fI[1] = #1 = 1.4012985e-45
-fI[0] == strtof
-
-
-Input: 1e23
-strtof consumes 4 bytes and returns 9.9999998e+22 = #65a96816
-g_ffmt(0) gives 5 bytes: "1e+23"
-
-strtoIf returns 17, consuming 4 bytes.
-fI[0] = #65a96816 = 9.9999998e+22
-fI[1] = #65a96817 = 1.0000001e+23
-fI[0] == strtof
-
-
-Input: 1e310
-strtof consumes 5 bytes and returns Infinity = #7f800000
-g_ffmt(0) gives 8 bytes: "Infinity"
-
-strtoIf returns 163, consuming 5 bytes.
-fI[0] = #7f7fffff = 3.4028235e+38
-fI[1] = #7f800000 = Infinity
-fI[1] == strtof
-
-
-Input: 9.0259718793241475e-277
-strtof consumes 23 bytes and returns 0 = #0
-g_ffmt(0) gives 1 bytes: "0"
-
-strtoIf returns 80, consuming 23 bytes.
-fI[0] = #0 = 0
-fI[1] = #1 = 1.4012985e-45
-fI[0] == strtof
-
-
-Input: 9.025971879324147880346310405869e-277
-strtof consumes 37 bytes and returns 0 = #0
-g_ffmt(0) gives 1 bytes: "0"
-
-strtoIf returns 80, consuming 37 bytes.
-fI[0] = #0 = 0
-fI[1] = #1 = 1.4012985e-45
-fI[0] == strtof
-
-
-Input: 9.025971879324147880346310405868e-277
-strtof consumes 37 bytes and returns 0 = #0
-g_ffmt(0) gives 1 bytes: "0"
-
-strtoIf returns 80, consuming 37 bytes.
-fI[0] = #0 = 0
-fI[1] = #1 = 1.4012985e-45
-fI[0] == strtof
-
-
-Input: 2.2250738585072014e-308
-strtof consumes 23 bytes and returns 0 = #0
-g_ffmt(0) gives 1 bytes: "0"
-
-strtoIf returns 80, consuming 23 bytes.
-fI[0] = #0 = 0
-fI[1] = #1 = 1.4012985e-45
-fI[0] == strtof
-
-
-Input: 2.2250738585072013e-308
-strtof consumes 23 bytes and returns 0 = #0
-g_ffmt(0) gives 1 bytes: "0"
-
-strtoIf returns 80, consuming 23 bytes.
-fI[0] = #0 = 0
-fI[1] = #1 = 1.4012985e-45
-fI[0] == strtof
-
-Rounding mode for strtor... changed from 1 (nearest) to 0 (toward zero)
-
-Input: 1.1
-strtof consumes 3 bytes and returns 1.0999999 = #3f8ccccc
-g_ffmt(0) gives 9 bytes: "1.0999999"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3f8ccccc = 1.0999999
-fI[1] = #3f8ccccd = 1.1
-fI[0] == strtof
-
-
-Input: -1.1
-strtof consumes 4 bytes and returns -1.0999999 = #bf8ccccc
-g_ffmt(0) gives 10 bytes: "-1.0999999"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bf8ccccd = -1.1
-fI[1] = #bf8ccccc = -1.0999999
-fI[1] == strtof
-
-
-Input: 1.2
-strtof consumes 3 bytes and returns 1.1999999 = #3f999999
-g_ffmt(0) gives 9 bytes: "1.1999999"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3f999999 = 1.1999999
-fI[1] = #3f99999a = 1.2
-fI[0] == strtof
-
-
-Input: -1.2
-strtof consumes 4 bytes and returns -1.1999999 = #bf999999
-g_ffmt(0) gives 10 bytes: "-1.1999999"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bf99999a = -1.2
-fI[1] = #bf999999 = -1.1999999
-fI[1] == strtof
-
-
-Input: 1.3
-strtof consumes 3 bytes and returns 1.3 = #3fa66666
-g_ffmt(0) gives 3 bytes: "1.3"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3fa66666 = 1.3
-fI[1] = #3fa66667 = 1.3000001
-fI[0] == strtof
-
-
-Input: -1.3
-strtof consumes 4 bytes and returns -1.3 = #bfa66666
-g_ffmt(0) gives 4 bytes: "-1.3"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bfa66667 = -1.3000001
-fI[1] = #bfa66666 = -1.3
-fI[1] == strtof
-
-
-Input: 1.4
-strtof consumes 3 bytes and returns 1.4 = #3fb33333
-g_ffmt(0) gives 3 bytes: "1.4"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3fb33333 = 1.4
-fI[1] = #3fb33334 = 1.4000001
-fI[0] == strtof
-
-
-Input: -1.4
-strtof consumes 4 bytes and returns -1.4 = #bfb33333
-g_ffmt(0) gives 4 bytes: "-1.4"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bfb33334 = -1.4000001
-fI[1] = #bfb33333 = -1.4
-fI[1] == strtof
-
-
-Input: 1.5
-strtof consumes 3 bytes and returns 1.5 = #3fc00000
-g_ffmt(0) gives 3 bytes: "1.5"
-
-strtoIf returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtof
-
-
-Input: -1.5
-strtof consumes 4 bytes and returns -1.5 = #bfc00000
-g_ffmt(0) gives 4 bytes: "-1.5"
-
-strtoIf returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtof
-
-
-Input: 1.6
-strtof consumes 3 bytes and returns 1.5999999 = #3fcccccc
-g_ffmt(0) gives 9 bytes: "1.5999999"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3fcccccc = 1.5999999
-fI[1] = #3fcccccd = 1.6
-fI[0] == strtof
-
-
-Input: -1.6
-strtof consumes 4 bytes and returns -1.5999999 = #bfcccccc
-g_ffmt(0) gives 10 bytes: "-1.5999999"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bfcccccd = -1.6
-fI[1] = #bfcccccc = -1.5999999
-fI[1] == strtof
-
-
-Input: 1.7
-strtof consumes 3 bytes and returns 1.6999999 = #3fd99999
-g_ffmt(0) gives 9 bytes: "1.6999999"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3fd99999 = 1.6999999
-fI[1] = #3fd9999a = 1.7
-fI[0] == strtof
-
-
-Input: -1.7
-strtof consumes 4 bytes and returns -1.6999999 = #bfd99999
-g_ffmt(0) gives 10 bytes: "-1.6999999"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bfd9999a = -1.7
-fI[1] = #bfd99999 = -1.6999999
-fI[1] == strtof
-
-
-Input: 1.8
-strtof consumes 3 bytes and returns 1.8 = #3fe66666
-g_ffmt(0) gives 3 bytes: "1.8"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3fe66666 = 1.8
-fI[1] = #3fe66667 = 1.8000001
-fI[0] == strtof
-
-
-Input: -1.8
-strtof consumes 4 bytes and returns -1.8 = #bfe66666
-g_ffmt(0) gives 4 bytes: "-1.8"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bfe66667 = -1.8000001
-fI[1] = #bfe66666 = -1.8
-fI[1] == strtof
-
-
-Input: 1.9
-strtof consumes 3 bytes and returns 1.9 = #3ff33333
-g_ffmt(0) gives 3 bytes: "1.9"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3ff33333 = 1.9
-fI[1] = #3ff33334 = 1.9000001
-fI[0] == strtof
-
-
-Input: -1.9
-strtof consumes 4 bytes and returns -1.9 = #bff33333
-g_ffmt(0) gives 4 bytes: "-1.9"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bff33334 = -1.9000001
-fI[1] = #bff33333 = -1.9
-fI[1] == strtof
-
-Rounding mode for strtor... changed from 0 (toward zero) to 1 (nearest)
-
-Input: 1.1
-strtof consumes 3 bytes and returns 1.1 = #3f8ccccd
-g_ffmt(0) gives 3 bytes: "1.1"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3f8ccccc = 1.0999999
-fI[1] = #3f8ccccd = 1.1
-fI[1] == strtof
-
-
-Input: -1.1
-strtof consumes 4 bytes and returns -1.1 = #bf8ccccd
-g_ffmt(0) gives 4 bytes: "-1.1"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bf8ccccd = -1.1
-fI[1] = #bf8ccccc = -1.0999999
-fI[0] == strtof
-
-
-Input: 1.2
-strtof consumes 3 bytes and returns 1.2 = #3f99999a
-g_ffmt(0) gives 3 bytes: "1.2"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3f999999 = 1.1999999
-fI[1] = #3f99999a = 1.2
-fI[1] == strtof
-
-
-Input: -1.2
-strtof consumes 4 bytes and returns -1.2 = #bf99999a
-g_ffmt(0) gives 4 bytes: "-1.2"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bf99999a = -1.2
-fI[1] = #bf999999 = -1.1999999
-fI[0] == strtof
-
-
-Input: 1.3
-strtof consumes 3 bytes and returns 1.3 = #3fa66666
-g_ffmt(0) gives 3 bytes: "1.3"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3fa66666 = 1.3
-fI[1] = #3fa66667 = 1.3000001
-fI[0] == strtof
-
-
-Input: -1.3
-strtof consumes 4 bytes and returns -1.3 = #bfa66666
-g_ffmt(0) gives 4 bytes: "-1.3"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bfa66667 = -1.3000001
-fI[1] = #bfa66666 = -1.3
-fI[1] == strtof
-
-
-Input: 1.4
-strtof consumes 3 bytes and returns 1.4 = #3fb33333
-g_ffmt(0) gives 3 bytes: "1.4"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3fb33333 = 1.4
-fI[1] = #3fb33334 = 1.4000001
-fI[0] == strtof
-
-
-Input: -1.4
-strtof consumes 4 bytes and returns -1.4 = #bfb33333
-g_ffmt(0) gives 4 bytes: "-1.4"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bfb33334 = -1.4000001
-fI[1] = #bfb33333 = -1.4
-fI[1] == strtof
-
-
-Input: 1.5
-strtof consumes 3 bytes and returns 1.5 = #3fc00000
-g_ffmt(0) gives 3 bytes: "1.5"
-
-strtoIf returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtof
-
-
-Input: -1.5
-strtof consumes 4 bytes and returns -1.5 = #bfc00000
-g_ffmt(0) gives 4 bytes: "-1.5"
-
-strtoIf returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtof
-
-
-Input: 1.6
-strtof consumes 3 bytes and returns 1.6 = #3fcccccd
-g_ffmt(0) gives 3 bytes: "1.6"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3fcccccc = 1.5999999
-fI[1] = #3fcccccd = 1.6
-fI[1] == strtof
-
-
-Input: -1.6
-strtof consumes 4 bytes and returns -1.6 = #bfcccccd
-g_ffmt(0) gives 4 bytes: "-1.6"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bfcccccd = -1.6
-fI[1] = #bfcccccc = -1.5999999
-fI[0] == strtof
-
-
-Input: 1.7
-strtof consumes 3 bytes and returns 1.7 = #3fd9999a
-g_ffmt(0) gives 3 bytes: "1.7"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3fd99999 = 1.6999999
-fI[1] = #3fd9999a = 1.7
-fI[1] == strtof
-
-
-Input: -1.7
-strtof consumes 4 bytes and returns -1.7 = #bfd9999a
-g_ffmt(0) gives 4 bytes: "-1.7"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bfd9999a = -1.7
-fI[1] = #bfd99999 = -1.6999999
-fI[0] == strtof
-
-
-Input: 1.8
-strtof consumes 3 bytes and returns 1.8 = #3fe66666
-g_ffmt(0) gives 3 bytes: "1.8"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3fe66666 = 1.8
-fI[1] = #3fe66667 = 1.8000001
-fI[0] == strtof
-
-
-Input: -1.8
-strtof consumes 4 bytes and returns -1.8 = #bfe66666
-g_ffmt(0) gives 4 bytes: "-1.8"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bfe66667 = -1.8000001
-fI[1] = #bfe66666 = -1.8
-fI[1] == strtof
-
-
-Input: 1.9
-strtof consumes 3 bytes and returns 1.9 = #3ff33333
-g_ffmt(0) gives 3 bytes: "1.9"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3ff33333 = 1.9
-fI[1] = #3ff33334 = 1.9000001
-fI[0] == strtof
-
-
-Input: -1.9
-strtof consumes 4 bytes and returns -1.9 = #bff33333
-g_ffmt(0) gives 4 bytes: "-1.9"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bff33334 = -1.9000001
-fI[1] = #bff33333 = -1.9
-fI[1] == strtof
-
-Rounding mode for strtor... changed from 1 (nearest) to 2 (toward +Infinity)
-
-Input: 1.1
-strtof consumes 3 bytes and returns 1.1 = #3f8ccccd
-g_ffmt(0) gives 3 bytes: "1.1"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3f8ccccc = 1.0999999
-fI[1] = #3f8ccccd = 1.1
-fI[1] == strtof
-
-
-Input: -1.1
-strtof consumes 4 bytes and returns -1.0999999 = #bf8ccccc
-g_ffmt(0) gives 10 bytes: "-1.0999999"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bf8ccccd = -1.1
-fI[1] = #bf8ccccc = -1.0999999
-fI[1] == strtof
-
-
-Input: 1.2
-strtof consumes 3 bytes and returns 1.2 = #3f99999a
-g_ffmt(0) gives 3 bytes: "1.2"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3f999999 = 1.1999999
-fI[1] = #3f99999a = 1.2
-fI[1] == strtof
-
-
-Input: -1.2
-strtof consumes 4 bytes and returns -1.1999999 = #bf999999
-g_ffmt(0) gives 10 bytes: "-1.1999999"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bf99999a = -1.2
-fI[1] = #bf999999 = -1.1999999
-fI[1] == strtof
-
-
-Input: 1.3
-strtof consumes 3 bytes and returns 1.3000001 = #3fa66667
-g_ffmt(0) gives 9 bytes: "1.3000001"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3fa66666 = 1.3
-fI[1] = #3fa66667 = 1.3000001
-fI[1] == strtof
-
-
-Input: -1.3
-strtof consumes 4 bytes and returns -1.3 = #bfa66666
-g_ffmt(0) gives 4 bytes: "-1.3"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bfa66667 = -1.3000001
-fI[1] = #bfa66666 = -1.3
-fI[1] == strtof
-
-
-Input: 1.4
-strtof consumes 3 bytes and returns 1.4000001 = #3fb33334
-g_ffmt(0) gives 9 bytes: "1.4000001"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3fb33333 = 1.4
-fI[1] = #3fb33334 = 1.4000001
-fI[1] == strtof
-
-
-Input: -1.4
-strtof consumes 4 bytes and returns -1.4 = #bfb33333
-g_ffmt(0) gives 4 bytes: "-1.4"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bfb33334 = -1.4000001
-fI[1] = #bfb33333 = -1.4
-fI[1] == strtof
-
-
-Input: 1.5
-strtof consumes 3 bytes and returns 1.5 = #3fc00000
-g_ffmt(0) gives 3 bytes: "1.5"
-
-strtoIf returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtof
-
-
-Input: -1.5
-strtof consumes 4 bytes and returns -1.5 = #bfc00000
-g_ffmt(0) gives 4 bytes: "-1.5"
-
-strtoIf returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtof
-
-
-Input: 1.6
-strtof consumes 3 bytes and returns 1.6 = #3fcccccd
-g_ffmt(0) gives 3 bytes: "1.6"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3fcccccc = 1.5999999
-fI[1] = #3fcccccd = 1.6
-fI[1] == strtof
-
-
-Input: -1.6
-strtof consumes 4 bytes and returns -1.5999999 = #bfcccccc
-g_ffmt(0) gives 10 bytes: "-1.5999999"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bfcccccd = -1.6
-fI[1] = #bfcccccc = -1.5999999
-fI[1] == strtof
-
-
-Input: 1.7
-strtof consumes 3 bytes and returns 1.7 = #3fd9999a
-g_ffmt(0) gives 3 bytes: "1.7"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3fd99999 = 1.6999999
-fI[1] = #3fd9999a = 1.7
-fI[1] == strtof
-
-
-Input: -1.7
-strtof consumes 4 bytes and returns -1.6999999 = #bfd99999
-g_ffmt(0) gives 10 bytes: "-1.6999999"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bfd9999a = -1.7
-fI[1] = #bfd99999 = -1.6999999
-fI[1] == strtof
-
-
-Input: 1.8
-strtof consumes 3 bytes and returns 1.8000001 = #3fe66667
-g_ffmt(0) gives 9 bytes: "1.8000001"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3fe66666 = 1.8
-fI[1] = #3fe66667 = 1.8000001
-fI[1] == strtof
-
-
-Input: -1.8
-strtof consumes 4 bytes and returns -1.8 = #bfe66666
-g_ffmt(0) gives 4 bytes: "-1.8"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bfe66667 = -1.8000001
-fI[1] = #bfe66666 = -1.8
-fI[1] == strtof
-
-
-Input: 1.9
-strtof consumes 3 bytes and returns 1.9000001 = #3ff33334
-g_ffmt(0) gives 9 bytes: "1.9000001"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3ff33333 = 1.9
-fI[1] = #3ff33334 = 1.9000001
-fI[1] == strtof
-
-
-Input: -1.9
-strtof consumes 4 bytes and returns -1.9 = #bff33333
-g_ffmt(0) gives 4 bytes: "-1.9"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bff33334 = -1.9000001
-fI[1] = #bff33333 = -1.9
-fI[1] == strtof
-
-Rounding mode for strtor... changed from 2 (toward +Infinity) to 3 (toward -Infinity)
-
-Input: 1.1
-strtof consumes 3 bytes and returns 1.0999999 = #3f8ccccc
-g_ffmt(0) gives 9 bytes: "1.0999999"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3f8ccccc = 1.0999999
-fI[1] = #3f8ccccd = 1.1
-fI[0] == strtof
-
-
-Input: -1.1
-strtof consumes 4 bytes and returns -1.1 = #bf8ccccd
-g_ffmt(0) gives 4 bytes: "-1.1"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bf8ccccd = -1.1
-fI[1] = #bf8ccccc = -1.0999999
-fI[0] == strtof
-
-
-Input: 1.2
-strtof consumes 3 bytes and returns 1.1999999 = #3f999999
-g_ffmt(0) gives 9 bytes: "1.1999999"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3f999999 = 1.1999999
-fI[1] = #3f99999a = 1.2
-fI[0] == strtof
-
-
-Input: -1.2
-strtof consumes 4 bytes and returns -1.2 = #bf99999a
-g_ffmt(0) gives 4 bytes: "-1.2"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bf99999a = -1.2
-fI[1] = #bf999999 = -1.1999999
-fI[0] == strtof
-
-
-Input: 1.3
-strtof consumes 3 bytes and returns 1.3 = #3fa66666
-g_ffmt(0) gives 3 bytes: "1.3"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3fa66666 = 1.3
-fI[1] = #3fa66667 = 1.3000001
-fI[0] == strtof
-
-
-Input: -1.3
-strtof consumes 4 bytes and returns -1.3000001 = #bfa66667
-g_ffmt(0) gives 10 bytes: "-1.3000001"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bfa66667 = -1.3000001
-fI[1] = #bfa66666 = -1.3
-fI[0] == strtof
-
-
-Input: 1.4
-strtof consumes 3 bytes and returns 1.4 = #3fb33333
-g_ffmt(0) gives 3 bytes: "1.4"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3fb33333 = 1.4
-fI[1] = #3fb33334 = 1.4000001
-fI[0] == strtof
-
-
-Input: -1.4
-strtof consumes 4 bytes and returns -1.4000001 = #bfb33334
-g_ffmt(0) gives 10 bytes: "-1.4000001"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bfb33334 = -1.4000001
-fI[1] = #bfb33333 = -1.4
-fI[0] == strtof
-
-
-Input: 1.5
-strtof consumes 3 bytes and returns 1.5 = #3fc00000
-g_ffmt(0) gives 3 bytes: "1.5"
-
-strtoIf returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtof
-
-
-Input: -1.5
-strtof consumes 4 bytes and returns -1.5 = #bfc00000
-g_ffmt(0) gives 4 bytes: "-1.5"
-
-strtoIf returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtof
-
-
-Input: 1.6
-strtof consumes 3 bytes and returns 1.5999999 = #3fcccccc
-g_ffmt(0) gives 9 bytes: "1.5999999"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3fcccccc = 1.5999999
-fI[1] = #3fcccccd = 1.6
-fI[0] == strtof
-
-
-Input: -1.6
-strtof consumes 4 bytes and returns -1.6 = #bfcccccd
-g_ffmt(0) gives 4 bytes: "-1.6"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bfcccccd = -1.6
-fI[1] = #bfcccccc = -1.5999999
-fI[0] == strtof
-
-
-Input: 1.7
-strtof consumes 3 bytes and returns 1.6999999 = #3fd99999
-g_ffmt(0) gives 9 bytes: "1.6999999"
-
-strtoIf returns 33, consuming 3 bytes.
-fI[0] = #3fd99999 = 1.6999999
-fI[1] = #3fd9999a = 1.7
-fI[0] == strtof
-
-
-Input: -1.7
-strtof consumes 4 bytes and returns -1.7 = #bfd9999a
-g_ffmt(0) gives 4 bytes: "-1.7"
-
-strtoIf returns 41, consuming 4 bytes.
-fI[0] = #bfd9999a = -1.7
-fI[1] = #bfd99999 = -1.6999999
-fI[0] == strtof
-
-
-Input: 1.8
-strtof consumes 3 bytes and returns 1.8 = #3fe66666
-g_ffmt(0) gives 3 bytes: "1.8"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3fe66666 = 1.8
-fI[1] = #3fe66667 = 1.8000001
-fI[0] == strtof
-
-
-Input: -1.8
-strtof consumes 4 bytes and returns -1.8000001 = #bfe66667
-g_ffmt(0) gives 10 bytes: "-1.8000001"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bfe66667 = -1.8000001
-fI[1] = #bfe66666 = -1.8
-fI[0] == strtof
-
-
-Input: 1.9
-strtof consumes 3 bytes and returns 1.9 = #3ff33333
-g_ffmt(0) gives 3 bytes: "1.9"
-
-strtoIf returns 17, consuming 3 bytes.
-fI[0] = #3ff33333 = 1.9
-fI[1] = #3ff33334 = 1.9000001
-fI[0] == strtof
-
-
-Input: -1.9
-strtof consumes 4 bytes and returns -1.9000001 = #bff33334
-g_ffmt(0) gives 10 bytes: "-1.9000001"
-
-strtoIf returns 25, consuming 4 bytes.
-fI[0] = #bff33334 = -1.9000001
-fI[1] = #bff33333 = -1.9
-fI[0] == strtof
-
diff --git a/lib/libc/gdtoa/test/ftest.c b/lib/libc/gdtoa/test/ftest.c
deleted file mode 100644
index 2006fdcdd..000000000
--- a/lib/libc/gdtoa/test/ftest.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998-2001 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-/* Test program for g_ffmt, strtof, strtoIf, strtopf, and strtorf.
- *
- * Inputs (on stdin):
- *		r rounding_mode
- *		n ndig
- *		number
- *		#hex
- *
- *	rounding_mode values:
- *		0 = toward zero
- *		1 = nearest
- *		2 = toward +Infinity
- *		3 = toward -Infinity
- *
- * where number is a decimal floating-point number,
- * hex is a string of <= 8 Hex digits for the internal representation
- * of the number, and ndig is a parameters to g_ffmt.
- */
-
-#include "gdtoa.h"
-#include <stdio.h>
-#include <stdlib.h>
-
- extern int getround ANSI((int,char*));
-
- static char ibuf[2048], obuf[1024];
-
-#define U (unsigned long)
-
- int
-main(Void)
-{
-	char *s, *se, *se1;
-	int dItry, i, i1, ndig = 0, r = 1;
-	float f1, fI[2];
-	union { float f; ULong L[1]; } u;
-
-	while( (s = fgets(ibuf, sizeof(ibuf), stdin)) !=0) {
-		while(*s <= ' ')
-			if (!*s++)
-				continue;
-		dItry = 0;
-		switch(*s) {
-		  case 'r':
-			r = getround(r, s);
-			continue;
-		  case 'n':
-			i = s[1];
-			if (i <= ' ' || (i >= '0' && i <= '9')) {
-				ndig = atoi(s+1);
-				continue;
-				}
-			break; /* nan? */
-		  case '#':
-			/* sscanf(s+1, "%lx", &u.L[0]); */
-			u.L[0] = (ULong)strtoul(s+1, &se, 16);
-			printf("\nInput: %s", ibuf);
-			printf(" --> f = #%lx\n", U u.L[0]);
-			goto fmt_test;
-			}
-		dItry = 1;
-		printf("\nInput: %s", ibuf);
-		i = strtorf(ibuf, &se, r, &u.f);
-		if (r == 1) {
-		    if (u.f != (i1 = strtopf(ibuf, &se1, &f1), f1)
-				 || se != se1 || i != i1) {
-			printf("***strtopf and strtorf disagree!!\n");
-			if (u.f != f1)
-				printf("\tf1 = %g\n", (double)f1);
-			if (i != i1)
-				printf("\ti = %d but i1 = %d\n", i, i1);
-			if (se != se1)
-				printf("se - se1 = %d\n", (int)(se-se1));
-			}
-		    if (u.f != strtof(ibuf, &se1) || se != se1)
-			printf("***strtof and strtorf disagree!\n");
-		    }
-		printf("strtof consumes %d bytes and returns %.8g = #%lx\n",
-				(int)(se-ibuf), u.f, U u.L[0]);
- fmt_test:
-		se = g_ffmt(obuf, &u.f, ndig, sizeof(obuf));
-		printf("g_ffmt(%d) gives %d bytes: \"%s\"\n\n",
-			ndig, (int)(se-obuf), se ? obuf : "<null>");
-		if (!dItry)
-			continue;
-		printf("strtoIf returns %d,", strtoIf(ibuf, &se, fI, &fI[1]));
-		printf(" consuming %d bytes.\n", (int)(se-ibuf));
-		if (fI[0] == fI[1]) {
-			if (fI[0] == u.f)
-				printf("fI[0] == fI[1] == strtof\n");
-			else
-				printf("fI[0] == fI[1] = #%lx = %.8g\n",
-					U *(ULong*)fI, fI[0]);
-			}
-		else {
-			printf("fI[0] = #%lx = %.8g\nfI[1] = #%lx = %.8g\n",
-				U *(ULong*)fI, fI[0],
-				U *(ULong*)&fI[1], fI[1]);
-			if (fI[0] == u.f)
-				printf("fI[0] == strtof\n");
-			else if (fI[1] == u.f)
-				printf("fI[1] == strtof\n");
-			else
-				printf("**** Both differ from strtof ****\n");
-			}
-		printf("\n");
-		}
-	return 0;
-	}
diff --git a/lib/libc/gdtoa/test/getround.c b/lib/libc/gdtoa/test/getround.c
deleted file mode 100644
index 05eb199e7..000000000
--- a/lib/libc/gdtoa/test/getround.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-static char *dir[4] = { "toward zero", "nearest", "toward +Infinity",
-			"toward -Infinity" };
-
-#ifdef Honor_FLT_ROUNDS
-#include <fenv.h>
-static int fe_conv[4] = {FE_TOWARDZERO, FE_TONEAREST, FE_UPWARD, FE_DOWNWARD };
-#endif
-
- int
-#ifdef KR_headers
-getround(r, s) int r; char *s;
-#else
-getround(int r, char *s)
-#endif
-{
-	int i;
-
-	while(*++s <= ' ') {
-		if (!*s) {
-			printf("Current round mode for strtor... is %d (%s).\n",
-				r, dir[r]);
-			return r;
-			}
-		}
-	i = atoi(s);
-	if (i >= 0 && i < 4) {
-		printf("Rounding mode for strtor... ");
-		if (i == r)
-			printf("was and is %d (%s)\n", i, dir[i]);
-		else
-			printf("changed from %d (%s) to %d (%s)\n",
-				r, dir[r], i, dir[i]);
-#ifdef Honor_FLT_ROUNDS
-		fesetround(fe_conv[i]);
-#endif
-		return i;
-		}
-	printf("Bad rounding direction %d: choose among\n", i);
-	for(i = 0; i < 4; i++)
-		printf("\t%d (%s)\n", i, dir[i]);
-	printf("Leaving rounding mode for strtor... at %d (%s)\n", r, dir[r]);
-	return r;
-	}
-
-#ifdef USE_MY_LOCALE
-#include <locale.h>
-
- struct lconv *
-localeconv(void)
-{
-	static struct lconv mylocale;
-	mylocale.decimal_point = "<Pt>";
-	return &mylocale;
-	}
-#endif
-
diff --git a/lib/libc/gdtoa/test/makefile b/lib/libc/gdtoa/test/makefile
deleted file mode 100644
index 79c9874ea..000000000
--- a/lib/libc/gdtoa/test/makefile
+++ /dev/null
@@ -1,169 +0,0 @@
-# /****************************************************************
-# Copyright (C) 1998, 2000 by Lucent Technologies
-# All Rights Reserved
-#
-# Permission to use, copy, modify, and distribute this software and
-# its documentation for any purpose and without fee is hereby
-# granted, provided that the above copyright notice appear in all
-# copies and that both that the copyright notice and this
-# permission notice and warranty disclaimer appear in supporting
-# documentation, and that the name of Lucent or any of its entities
-# not be used in advertising or publicity pertaining to
-# distribution of the software without specific, written prior
-# permission.
-#
-# LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-# IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-# SPECIAL, 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.
-#
-# ****************************************************************/
-
-CC = cc
-CFLAGS = -g -I..
-CFLAGS+=-I${.CURDIR}/../../arch/${MACHINE_ARCH}/gdtoa
-L = -lm
-L1 = -lm
-#use "L1=-lm" when compiled with -DHonor_FLTP_ROUNDS or -DUSE_LOCALE
-INFFIX = | sed 's/[Ii][Nn][Ff][intyINTY]*/Infinity/g'
-
-.PATH: /usr/src/lib/libc/gdtoa
-
-all: dt dItest ddtest dtest ftest Qtest xLtest xtest ddtestsi dItestsi tests
-
-dt = dt.o $A
-dt: $(dt)
-	$(CC) -o dt $(dt) $L
-
-dItest = dItest.o getround.o g_dfmt.o strtoId.o strtodI.o \
-	g__fmt.o strtoIg.o
-dItest: $(dItest)
-	$(CC) -o dItest $(dItest) $(L1)
-
-ddtest = ddtest.o getround.o g_dfmt.o strtordd.o strtopdd.o g_ddfmt.o \
-	strtoIdd.o g__fmt.o strtoIg.o
-ddtest: $(ddtest)
-	$(CC) -o ddtest $(ddtest) $L
-
-dtest = dtest.o getround.o g_dfmt.o strtopd.o strtoId.o \
-	g__fmt.o strtoIg.o
-dtest: $(dtest)
-	$(CC) -o dtest $(dtest) $L
-
-ftest = ftest.o getround.o strtorf.o strtopf.o g_ffmt.o strtoIf.o \
-	g__fmt.o strtoIg.o
-ftest: $(ftest)
-	$(CC) -o ftest $(ftest) $(L1)
-
-Qtest = Qtest.o getround.o strtorQ.o g_Qfmt.o strtoIQ.o strtopQ.o \
-	g__fmt.o strtoIg.o
-Qtest: $(Qtest)
-	$(CC) -o Qtest $(Qtest) $(L1)
-
-xtest = xtest.o getround.o strtorx.o g_xfmt.o strtoIx.o \
-	g__fmt.o strtoIg.o
-xtest: $(xtest)
-	$(CC) -o xtest $(xtest) $(L1)
-
-xLtest = xLtest.o getround.o strtorxL.o strtopxL.o g_xLfmt.o strtoIxL.o \
-	g__fmt.o strtoIg.o
-xLtest: $(xLtest)
-	$(CC) -o xLtest $(xLtest) $(L1)
-
-ddtestsi = ddtest.o strtopddSI.o strtorddSI.o strtoIddSI.o getround.o \
-	g_dfmt.o g_ddfmt.o g__fmt.o strtoIg.o
-ddtestsi: $(ddtestsi)
-	$(CC) -o ddtestsi $(ddtestsi) $L
-
-dItestsi = dItest.o strtodISI.o strtoIdSI.o getround.o \
-	g_dfmt.o g__fmt.o strtoIg.o
-dItestsi: $(dItestsi)
-	$(CC) -o dItestsi $(dItestsi) $(L1)
-
-strtodt = strtodt.o $A
-strtodt: $(strtodt)
-	$(CC) -o strtodt $(strtodt) $L
-
-pftest = pftest.o $A
-pftest: $(pftest)
-	$(CC) -o pftest $(pftest) $L
-
-## On Intel (and Intel-like) systems using extended-precision registers
-## for double-precision (C type double) computations that sometimes suffer
-## double rounding errors, the test below involving strtodt generally shows
-## five lines of unexpected results.  Variant strtodtnrp uses ../strtodrnp.c
-## (which does all computations in integer arithmetic) and should show no
-## unexpected results.
-
-strtodtnrp = strtodt.o strtodnrp.o
-strtodtnrp: $(strtodtnrp)
-	$(CC) -o strtodtnrp $(strtodtnrp)
-
-# xQtest generates cp commands that depend on sizeof(long double).
-# See the source for details.  If you know better, create Q.out,
-# x.out and xL.out by copying the relevant *.ou0 or *.ou1 files
-# to the corresponding .out files.  In short, the *.ou0 files are
-# for long double == double; x.ou1 and xL.ou1 are for
-# long double == extended (a la 80x87 and MC680x0), and Q.ou1 is
-# for long double == quad.
-
-Q.out x.out xL.out:
-	$(CC) -o xQtest xQtest.c
-	./xQtest | sh
-	rm -f xQtest xQtest.o
-
-## The rmdir below will fail if any test results differ.
-
-tests: Q.out x.out xL.out dt dItest ddtest dtest ftest Qtest xLtest xtest ddtestsi dItestsi strtodt strtodtnrp
-	mkdir bad
-	cat testnos testnos1 | ./dt $(INFFIX) >zap 2>&1
-	cmp dtst.out zap || mv zap bad/dtst.out
-	./dItest <testnos $(INFFIX) >zap 2>&1
-	cmp dI.out zap || mv zap bad/dI.out
-	./dItestsi <testnos $(INFFIX) >zap 2>&1
-	cmp dIsi.out zap || mv zap bad/dIsi.out
-	./ddtestsi <testnos $(INFFIX) >zap 2>&1
-	cmp ddsi.out zap || mv zap bad/ddsi.out
-	for i in dd d f x xL Q; do cat testnos rtestnos | \
-	 ./"$$i"test $(INFFIX) >zap 2>&1;\
-	cmp $$i.out zap || mv zap bad/$$i.out; done
-	./strtodt testnos3 >bad/strtodt.out && rm bad/strtodt.out || \
-		cat bad/strtodt.out
-	./strtodtnrp testnos3 >bad/strtodtnrp.out && rm bad/strtodtnrp.out || \
-		cat bad/strtodtnrp.out
-	rmdir bad 2>/dev/null || \
-	(cd bad; for i in *; do cmp -s $$i ../obad/$$i && rm $$i;done; cd ..; rmdir bad)
-	touch tests
-
-# To test Printf in ../gdtoa.a, "make pf_test" and perhaps "make pf_testLq"
-# (if both long double and quad are desired and available).
-
-pf_test: pftest
-	./pftest <pftestnos >zap
-	cmp pftest.out zap && rm zap
-
-pf_testLq: pftest
-	./pftest <pfLqtestnos >zap
-	cmp pftestLq.out zap && rm zap
-
-xs0 = README Q.ou0 Q.ou1 Qtest.c d.out dI.out dIsi.out dItest.c dd.out\
-	 ddsi.out ddtest.c dt.c dtest.c dtst.out f.out ftest.c\
-	 getround.c makefile pfLqtestnos pftest.c pftestQ.out\
-	 pftestx.out pftestLq.out pftestnos rtestnos strtoIdSI.c\
-	 strtoIddSI.c strtodISI.c strtodt.c strtopddSI.c strtorddSI.c\
-	 testnos testnos1 testnos3 x.ou0 x.ou1 xL.ou0 xL.ou1 xLtest.c\
-	 xQtest.c xtest.c
-
-# invoke "make -r xsum.out"
-xsum.out: xsum0.out $(xs0)
-	xsum $(xs0) >xsum1.out
-	cmp xsum0.out xsum1.out && mv xsum1.out xsum.out || diff xsum[01].out
-
-clean:
-	rm -f *.[ao] dt *test *testsi pftest.out strtodt strtodtnrp xsum.out\
-	 xsum1.out tests zap x.out xL.out Q.out
-	rm -rf bad
diff --git a/lib/libc/gdtoa/test/obad/strtodt.out b/lib/libc/gdtoa/test/obad/strtodt.out
deleted file mode 100644
index 79516bfaa..000000000
--- a/lib/libc/gdtoa/test/obad/strtodt.out
+++ /dev/null
@@ -1,6 +0,0 @@
-Line 31 of testnos3: got 4585747a b143e354; expected 4585747a b143e353
-Line 46 of testnos3: got 64fdcf7d f8f573b8; expected 64fdcf7d f8f573b7
-Line 47 of testnos3: got 650dcf7d f8f573b8; expected 650dcf7d f8f573b7
-Line 72 of testnos3: got 3cc70385 6844bdbe; expected 3cc70385 6844bdbf
-Line 73 of testnos3: got 3cb70385 6844bdbe; expected 3cb70385 6844bdbf
-5 bad conversions
diff --git a/lib/libc/gdtoa/test/obad/xL.out b/lib/libc/gdtoa/test/obad/xL.out
deleted file mode 100644
index 19a7fd1c1..000000000
--- a/lib/libc/gdtoa/test/obad/xL.out
+++ /dev/null
@@ -1,1460 +0,0 @@
-
-Input: 1.23
-
-strtoxL consumes 4 bytes and returns 33
-with bits = #3fff0000 9d70a3d7 a3d70a4
-printf("%.21Lg") gives 7.73283722915781506499e-4933
-g_xLfmt(0) gives 4 bytes: "1.23"
-
-strtoIxL returns 33, consuming 4 bytes.
-fI[0] = #3fff0000 9d70a3d7 a3d70a3
-= 7.73283722915781506134e-4933
-fI[1] = #3fff0000 9d70a3d7 a3d70a4
-= 7.73283722915781506499e-4933
-fI[1] == strtoxL
-
-
-Input: 1.23e+20
-
-strtoxL consumes 8 bytes and returns 1
-with bits = #40410000 d55ef90a 2da18000
-printf("%.21Lg") gives 2.24239113715721119512e-4932
-g_xLfmt(0) gives 8 bytes: "1.23e+20"
-
-strtoIxL returns 1, consuming 8 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.23e-20
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #3fbc0000 e857267b b3a984f2
-printf("%.21Lg") gives 2.74065070995958800375e-4932
-g_xLfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #3fbc0000 e857267b b3a984f2
-= 2.74065070995958800375e-4932
-fI[1] = #3fbc0000 e857267b b3a984f3
-= 2.74065070995958800411e-4932
-fI[0] == strtoxL
-
-
-Input: 1.23456789
-
-strtoxL consumes 10 bytes and returns 33
-with bits = #3fff0000 9e065214 1ef0dbf6
-printf("%.21Lg") gives 7.88641440242171807354e-4933
-g_xLfmt(0) gives 10 bytes: "1.23456789"
-
-strtoIxL returns 33, consuming 10 bytes.
-fI[0] = #3fff0000 9e065214 1ef0dbf5
-= 7.8864144024217180699e-4933
-fI[1] = #3fff0000 9e065214 1ef0dbf6
-= 7.88641440242171807354e-4933
-fI[1] == strtoxL
-
-
-Input: 1.23456589e+20
-
-strtoxL consumes 14 bytes and returns 1
-with bits = #40410000 d629bd33 5ccba00
-printf("%.21Lg") gives 2.26319561227049478508e-4932
-g_xLfmt(0) gives 14 bytes: "1.23456589e+20"
-
-strtoIxL returns 1, consuming 14 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.23e+30
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #40620000 f8658274 7dbc824a
-printf("%.21Lg") gives 3.16238691003557160385e-4932
-g_xLfmt(0) gives 8 bytes: "1.23e+30"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #40620000 f8658274 7dbc824a
-= 3.16238691003557160385e-4932
-fI[1] = #40620000 f8658274 7dbc824b
-= 3.16238691003557160421e-4932
-fI[0] == strtoxL
-
-
-Input: 1.23e-30
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #3f9b0000 c794337a 808554eb
-printf("%.21Lg") gives 1.88012249978407873966e-4932
-g_xLfmt(0) gives 8 bytes: "1.23e-30"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #3f9b0000 c794337a 808554eb
-= 1.88012249978407873966e-4932
-fI[1] = #3f9b0000 c794337a 808554ec
-= 1.88012249978407874003e-4932
-fI[0] == strtoxL
-
-
-Input: 1.23456789e-20
-
-strtoxL consumes 14 bytes and returns 17
-with bits = #3fbc0000 e9340a38 f3d6d352
-printf("%.21Lg") gives 2.76331470044569174626e-4932
-g_xLfmt(0) gives 14 bytes: "1.23456789e-20"
-
-strtoIxL returns 17, consuming 14 bytes.
-fI[0] = #3fbc0000 e9340a38 f3d6d352
-= 2.76331470044569174626e-4932
-fI[1] = #3fbc0000 e9340a38 f3d6d353
-= 2.76331470044569174663e-4932
-fI[0] == strtoxL
-
-
-Input: 1.23456789e-30
-
-strtoxL consumes 14 bytes and returns 17
-with bits = #3f9b0000 c851f19d decca8fc
-printf("%.21Lg") gives 1.89959071937101288293e-4932
-g_xLfmt(0) gives 14 bytes: "1.23456789e-30"
-
-strtoIxL returns 17, consuming 14 bytes.
-fI[0] = #3f9b0000 c851f19d decca8fc
-= 1.89959071937101288293e-4932
-fI[1] = #3f9b0000 c851f19d decca8fd
-= 1.89959071937101288329e-4932
-fI[0] == strtoxL
-
-
-Input: 1.234567890123456789
-
-strtoxL consumes 20 bytes and returns 17
-with bits = #3fff0000 9e065214 62cfdb8d
-printf("%.21Lg") gives 7.88641440657246265535e-4933
-g_xLfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIxL returns 17, consuming 20 bytes.
-fI[0] = #3fff0000 9e065214 62cfdb8d
-= 7.88641440657246265535e-4933
-fI[1] = #3fff0000 9e065214 62cfdb8e
-= 7.886414406572462659e-4933
-fI[0] == strtoxL
-
-
-Input: 1.23456789012345678901234567890123456789
-
-strtoxL consumes 40 bytes and returns 17
-with bits = #3fff0000 9e065214 62cfdb8d
-printf("%.21Lg") gives 7.88641440657246265535e-4933
-g_xLfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIxL returns 17, consuming 40 bytes.
-fI[0] = #3fff0000 9e065214 62cfdb8d
-= 7.88641440657246265535e-4933
-fI[1] = #3fff0000 9e065214 62cfdb8e
-= 7.886414406572462659e-4933
-fI[0] == strtoxL
-
-
-Input: 1.23e306
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #43f70000 e033b668 e30fa6d5
-printf("%.21Lg") gives 2.52688323155200052759e-4932
-g_xLfmt(0) gives 9 bytes: "1.23e+306"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #43f70000 e033b668 e30fa6d5
-= 2.52688323155200052759e-4932
-fI[1] = #43f70000 e033b668 e30fa6d6
-= 2.52688323155200052796e-4932
-fI[0] == strtoxL
-
-
-Input: 1.23e-306
-
-strtoxL consumes 9 bytes and returns 33
-with bits = #3c060000 dd1dc2ed 1cb73f25
-printf("%.21Lg") gives 2.44583168427704605801e-4932
-g_xLfmt(0) gives 9 bytes: "1.23e-306"
-
-strtoIxL returns 33, consuming 9 bytes.
-fI[0] = #3c060000 dd1dc2ed 1cb73f24
-= 2.44583168427704605765e-4932
-fI[1] = #3c060000 dd1dc2ed 1cb73f25
-= 2.44583168427704605801e-4932
-fI[1] == strtoxL
-
-
-Input: 1.23e-320
-
-strtoxL consumes 9 bytes and returns 33
-with bits = #3bd80000 9b98c371 844c3f1a
-printf("%.21Lg") gives 7.24867657578821329238e-4933
-g_xLfmt(0) gives 9 bytes: "1.23e-320"
-
-strtoIxL returns 33, consuming 9 bytes.
-fI[0] = #3bd80000 9b98c371 844c3f19
-= 7.24867657578821328874e-4933
-fI[1] = #3bd80000 9b98c371 844c3f1a
-= 7.24867657578821329238e-4933
-fI[1] == strtoxL
-
-
-Input: 1.23e-20
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #3fbc0000 e857267b b3a984f2
-printf("%.21Lg") gives 2.74065070995958800375e-4932
-g_xLfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #3fbc0000 e857267b b3a984f2
-= 2.74065070995958800375e-4932
-fI[1] = #3fbc0000 e857267b b3a984f3
-= 2.74065070995958800411e-4932
-fI[0] == strtoxL
-
-
-Input: 1.23456789e307
-
-strtoxL consumes 14 bytes and returns 17
-with bits = #43fb0000 8ca58a5e d766de75
-printf("%.21Lg") gives 3.32182163192682931854e-4933
-g_xLfmt(0) gives 15 bytes: "1.23456789e+307"
-
-strtoIxL returns 17, consuming 14 bytes.
-fI[0] = #43fb0000 8ca58a5e d766de75
-= 3.32182163192682931854e-4933
-fI[1] = #43fb0000 8ca58a5e d766de76
-= 3.32182163192682932219e-4933
-fI[0] == strtoxL
-
-
-Input: 1.23456589e-307
-
-strtoxL consumes 15 bytes and returns 17
-with bits = #3c030000 b18cb5dc c22fd369
-printf("%.21Lg") gives 1.30149245314004923345e-4932
-g_xLfmt(0) gives 15 bytes: "1.23456589e-307"
-
-strtoIxL returns 17, consuming 15 bytes.
-fI[0] = #3c030000 b18cb5dc c22fd369
-= 1.30149245314004923345e-4932
-fI[1] = #3c030000 b18cb5dc c22fd36a
-= 1.30149245314004923382e-4932
-fI[0] == strtoxL
-
-
-Input: 1.234567890123456789
-
-strtoxL consumes 20 bytes and returns 17
-with bits = #3fff0000 9e065214 62cfdb8d
-printf("%.21Lg") gives 7.88641440657246265535e-4933
-g_xLfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIxL returns 17, consuming 20 bytes.
-fI[0] = #3fff0000 9e065214 62cfdb8d
-= 7.88641440657246265535e-4933
-fI[1] = #3fff0000 9e065214 62cfdb8e
-= 7.886414406572462659e-4933
-fI[0] == strtoxL
-
-
-Input: 1.234567890123456789e301
-
-strtoxL consumes 24 bytes and returns 33
-with bits = #43e70000 937a8baf ab20980c
-printf("%.21Lg") gives 5.11635766619117643114e-4933
-g_xLfmt(0) gives 25 bytes: "1.234567890123456789e+301"
-
-strtoIxL returns 33, consuming 24 bytes.
-fI[0] = #43e70000 937a8baf ab20980b
-= 5.1163576661911764275e-4933
-fI[1] = #43e70000 937a8baf ab20980c
-= 5.11635766619117643114e-4933
-fI[1] == strtoxL
-
-
-Input: 1.234567890123456789e-301
-
-strtoxL consumes 25 bytes and returns 33
-with bits = #3c170000 a953271a 5d069ad9
-printf("%.21Lg") gives 1.08545540462853463561e-4932
-g_xLfmt(0) gives 25 bytes: "1.234567890123456789e-301"
-
-strtoIxL returns 33, consuming 25 bytes.
-fI[0] = #3c170000 a953271a 5d069ad8
-= 1.08545540462853463524e-4932
-fI[1] = #3c170000 a953271a 5d069ad9
-= 1.08545540462853463561e-4932
-fI[1] == strtoxL
-
-
-Input: 1.234567890123456789e-321
-
-strtoxL consumes 25 bytes and returns 33
-with bits = #3bd40000 f9e11b4c ea6dcce9
-printf("%.21Lg") gives 3.20133479952876185942e-4932
-g_xLfmt(0) gives 25 bytes: "1.234567890123456789e-321"
-
-strtoIxL returns 33, consuming 25 bytes.
-fI[0] = #3bd40000 f9e11b4c ea6dcce8
-= 3.20133479952876185905e-4932
-fI[1] = #3bd40000 f9e11b4c ea6dcce9
-= 3.20133479952876185942e-4932
-fI[1] == strtoxL
-
-
-Input: 1e23
-
-strtoxL consumes 4 bytes and returns 1
-with bits = #404b0000 a968163f a57b400
-printf("%.21Lg") gives 1.08760331670538037378e-4932
-g_xLfmt(0) gives 5 bytes: "1e+23"
-
-strtoIxL returns 1, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1e310
-
-strtoxL consumes 5 bytes and returns 33
-with bits = #44040000 de81e40a 34bcf50
-printf("%.21Lg") gives 2.48237171106260601618e-4932
-g_xLfmt(0) gives 6 bytes: "1e+310"
-
-strtoIxL returns 33, consuming 5 bytes.
-fI[0] = #44040000 de81e40a 34bcf4f
-= 2.48237171106260601582e-4932
-fI[1] = #44040000 de81e40a 34bcf50
-= 2.48237171106260601618e-4932
-fI[1] == strtoxL
-
-
-Input: 9.0259718793241475e-277
-
-strtoxL consumes 23 bytes and returns 33
-with bits = #3c690000 ffffffff fffffcf7
-printf("%.21Lg") gives 3.36210314311209322303e-4932
-g_xLfmt(0) gives 23 bytes: "9.0259718793241475e-277"
-
-strtoIxL returns 33, consuming 23 bytes.
-fI[0] = #3c690000 ffffffff fffffcf6
-= 3.36210314311209322267e-4932
-fI[1] = #3c690000 ffffffff fffffcf7
-= 3.36210314311209322303e-4932
-fI[1] == strtoxL
-
-
-Input: 9.025971879324147880346310405869e-277
-
-strtoxL consumes 37 bytes and returns 17
-with bits = #3c6a0000 80000000 0
-printf("%.21Lg") gives 3.36210314311209350626e-4932
-g_xLfmt(0) gives 26 bytes: "9.0259718793241478803e-277"
-
-strtoIxL returns 17, consuming 37 bytes.
-fI[0] = #3c6a0000 80000000 0
-= 3.36210314311209350626e-4932
-fI[1] = #3c6a0000 80000000 1
-= 3.64519953188247460253e-4951
-fI[0] == strtoxL
-
-
-Input: 9.025971879324147880346310405868e-277
-
-strtoxL consumes 37 bytes and returns 33
-with bits = #3c6a0000 80000000 0
-printf("%.21Lg") gives 3.36210314311209350626e-4932
-g_xLfmt(0) gives 26 bytes: "9.0259718793241478803e-277"
-
-strtoIxL returns 33, consuming 37 bytes.
-fI[0] = #3c690000 ffffffff ffffffff
-= 3.3621031431120935059e-4932
-fI[1] = #3c6a0000 80000000 0
-= 3.36210314311209350626e-4932
-fI[1] == strtoxL
-
-
-Input: 2.2250738585072014e-308
-
-strtoxL consumes 23 bytes and returns 17
-with bits = #3c010000 80000000 46
-printf("%.21Lg") gives 2.55163967231773222177e-4949
-g_xLfmt(0) gives 23 bytes: "2.2250738585072014e-308"
-
-strtoIxL returns 17, consuming 23 bytes.
-fI[0] = #3c010000 80000000 46
-= 2.55163967231773222177e-4949
-fI[1] = #3c010000 80000000 47
-= 2.5880916676365569678e-4949
-fI[0] == strtoxL
-
-
-Input: 2.2250738585072013e-308
-
-strtoxL consumes 23 bytes and returns 17
-with bits = #3c000000 ffffffff fffffd4f
-printf("%.21Lg") gives 3.36210314311209325511e-4932
-g_xLfmt(0) gives 23 bytes: "2.2250738585072013e-308"
-
-strtoIxL returns 17, consuming 23 bytes.
-fI[0] = #3c000000 ffffffff fffffd4f
-= 3.36210314311209325511e-4932
-fI[1] = #3c000000 ffffffff fffffd50
-= 3.36210314311209325547e-4932
-fI[0] == strtoxL
-
-Rounding mode for strtor... changed from 1 (nearest) to 0 (toward zero)
-
-Input: 1.1
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 8ccccccc cccccccc
-printf("%.21Lg") gives 3.36210314311209350335e-4933
-g_xLfmt(0) gives 21 bytes: "1.0999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[1] = #3fff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[0] == strtoxL
-
-
-Input: -1.1
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 8ccccccc cccccccc
-printf("%.21Lg") gives 3.36210314311209350335e-4933
-g_xLfmt(0) gives 22 bytes: "-1.0999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[1] = #bfff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[1] == strtoxL
-
-
-Input: 1.2
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 99999999 99999999
-printf("%.21Lg") gives 6.72420628622418701034e-4933
-g_xLfmt(0) gives 21 bytes: "1.1999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[1] = #3fff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[0] == strtoxL
-
-
-Input: -1.2
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 99999999 99999999
-printf("%.21Lg") gives 6.72420628622418701034e-4933
-g_xLfmt(0) gives 22 bytes: "-1.1999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[1] = #bfff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[1] == strtoxL
-
-
-Input: 1.3
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 a6666666 66666666
-printf("%.21Lg") gives 1.00863094293362805173e-4932
-g_xLfmt(0) gives 3 bytes: "1.3"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[1] = #3fff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[0] == strtoxL
-
-
-Input: -1.3
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 a6666666 66666666
-printf("%.21Lg") gives 1.00863094293362805173e-4932
-g_xLfmt(0) gives 4 bytes: "-1.3"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[1] = #bfff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[1] == strtoxL
-
-
-Input: 1.4
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 b3333333 33333333
-printf("%.21Lg") gives 1.34484125724483740243e-4932
-g_xLfmt(0) gives 3 bytes: "1.4"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[1] = #3fff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[0] == strtoxL
-
-
-Input: -1.4
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 b3333333 33333333
-printf("%.21Lg") gives 1.34484125724483740243e-4932
-g_xLfmt(0) gives 4 bytes: "-1.4"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[1] = #bfff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[1] == strtoxL
-
-
-Input: 1.5
-
-strtoxL consumes 3 bytes and returns 1
-with bits = #3fff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 3 bytes: "1.5"
-
-strtoIxL returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: -1.5
-
-strtoxL consumes 4 bytes and returns 9
-with bits = #bfff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 4 bytes: "-1.5"
-
-strtoIxL returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.6
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 cccccccc cccccccc
-printf("%.21Lg") gives 2.01726188586725610347e-4932
-g_xLfmt(0) gives 21 bytes: "1.5999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[1] = #3fff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[0] == strtoxL
-
-
-Input: -1.6
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 cccccccc cccccccc
-printf("%.21Lg") gives 2.01726188586725610347e-4932
-g_xLfmt(0) gives 22 bytes: "-1.5999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[1] = #bfff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[1] == strtoxL
-
-
-Input: 1.7
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 d9999999 99999999
-printf("%.21Lg") gives 2.35347220017846545417e-4932
-g_xLfmt(0) gives 21 bytes: "1.6999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[1] = #3fff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[0] == strtoxL
-
-
-Input: -1.7
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 d9999999 99999999
-printf("%.21Lg") gives 2.35347220017846545417e-4932
-g_xLfmt(0) gives 22 bytes: "-1.6999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[1] = #bfff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[1] == strtoxL
-
-
-Input: 1.8
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 e6666666 66666666
-printf("%.21Lg") gives 2.68968251448967480486e-4932
-g_xLfmt(0) gives 3 bytes: "1.8"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[1] = #3fff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[0] == strtoxL
-
-
-Input: -1.8
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 e6666666 66666666
-printf("%.21Lg") gives 2.68968251448967480486e-4932
-g_xLfmt(0) gives 4 bytes: "-1.8"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[1] = #bfff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[1] == strtoxL
-
-
-Input: 1.9
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 f3333333 33333333
-printf("%.21Lg") gives 3.02589282880088415556e-4932
-g_xLfmt(0) gives 3 bytes: "1.9"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[1] = #3fff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[0] == strtoxL
-
-
-Input: -1.9
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 f3333333 33333333
-printf("%.21Lg") gives 3.02589282880088415556e-4932
-g_xLfmt(0) gives 4 bytes: "-1.9"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[1] = #bfff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[1] == strtoxL
-
-Rounding mode for strtor... changed from 0 (toward zero) to 1 (nearest)
-
-Input: 1.1
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 8ccccccc cccccccd
-printf("%.21Lg") gives 3.36210314311209350699e-4933
-g_xLfmt(0) gives 3 bytes: "1.1"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[1] = #3fff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[1] == strtoxL
-
-
-Input: -1.1
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 8ccccccc cccccccd
-printf("%.21Lg") gives 3.36210314311209350699e-4933
-g_xLfmt(0) gives 4 bytes: "-1.1"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[1] = #bfff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[0] == strtoxL
-
-
-Input: 1.2
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 99999999 9999999a
-printf("%.21Lg") gives 6.72420628622418701398e-4933
-g_xLfmt(0) gives 3 bytes: "1.2"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[1] = #3fff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[1] == strtoxL
-
-
-Input: -1.2
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 99999999 9999999a
-printf("%.21Lg") gives 6.72420628622418701398e-4933
-g_xLfmt(0) gives 4 bytes: "-1.2"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[1] = #bfff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[0] == strtoxL
-
-
-Input: 1.3
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 a6666666 66666666
-printf("%.21Lg") gives 1.00863094293362805173e-4932
-g_xLfmt(0) gives 3 bytes: "1.3"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[1] = #3fff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[0] == strtoxL
-
-
-Input: -1.3
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 a6666666 66666666
-printf("%.21Lg") gives 1.00863094293362805173e-4932
-g_xLfmt(0) gives 4 bytes: "-1.3"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[1] = #bfff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[1] == strtoxL
-
-
-Input: 1.4
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 b3333333 33333333
-printf("%.21Lg") gives 1.34484125724483740243e-4932
-g_xLfmt(0) gives 3 bytes: "1.4"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[1] = #3fff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[0] == strtoxL
-
-
-Input: -1.4
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 b3333333 33333333
-printf("%.21Lg") gives 1.34484125724483740243e-4932
-g_xLfmt(0) gives 4 bytes: "-1.4"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[1] = #bfff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[1] == strtoxL
-
-
-Input: 1.5
-
-strtoxL consumes 3 bytes and returns 1
-with bits = #3fff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 3 bytes: "1.5"
-
-strtoIxL returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: -1.5
-
-strtoxL consumes 4 bytes and returns 9
-with bits = #bfff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 4 bytes: "-1.5"
-
-strtoIxL returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.6
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 cccccccc cccccccd
-printf("%.21Lg") gives 2.01726188586725610383e-4932
-g_xLfmt(0) gives 3 bytes: "1.6"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[1] = #3fff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[1] == strtoxL
-
-
-Input: -1.6
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 cccccccc cccccccd
-printf("%.21Lg") gives 2.01726188586725610383e-4932
-g_xLfmt(0) gives 4 bytes: "-1.6"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[1] = #bfff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[0] == strtoxL
-
-
-Input: 1.7
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 d9999999 9999999a
-printf("%.21Lg") gives 2.35347220017846545453e-4932
-g_xLfmt(0) gives 3 bytes: "1.7"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[1] = #3fff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[1] == strtoxL
-
-
-Input: -1.7
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 d9999999 9999999a
-printf("%.21Lg") gives 2.35347220017846545453e-4932
-g_xLfmt(0) gives 4 bytes: "-1.7"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[1] = #bfff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[0] == strtoxL
-
-
-Input: 1.8
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 e6666666 66666666
-printf("%.21Lg") gives 2.68968251448967480486e-4932
-g_xLfmt(0) gives 3 bytes: "1.8"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[1] = #3fff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[0] == strtoxL
-
-
-Input: -1.8
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 e6666666 66666666
-printf("%.21Lg") gives 2.68968251448967480486e-4932
-g_xLfmt(0) gives 4 bytes: "-1.8"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[1] = #bfff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[1] == strtoxL
-
-
-Input: 1.9
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 f3333333 33333333
-printf("%.21Lg") gives 3.02589282880088415556e-4932
-g_xLfmt(0) gives 3 bytes: "1.9"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[1] = #3fff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[0] == strtoxL
-
-
-Input: -1.9
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 f3333333 33333333
-printf("%.21Lg") gives 3.02589282880088415556e-4932
-g_xLfmt(0) gives 4 bytes: "-1.9"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[1] = #bfff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[1] == strtoxL
-
-Rounding mode for strtor... changed from 1 (nearest) to 2 (toward +Infinity)
-
-Input: 1.1
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 8ccccccc cccccccd
-printf("%.21Lg") gives 3.36210314311209350699e-4933
-g_xLfmt(0) gives 3 bytes: "1.1"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[1] = #3fff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[1] == strtoxL
-
-
-Input: -1.1
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 8ccccccc cccccccc
-printf("%.21Lg") gives 3.36210314311209350335e-4933
-g_xLfmt(0) gives 22 bytes: "-1.0999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[1] = #bfff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[1] == strtoxL
-
-
-Input: 1.2
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 99999999 9999999a
-printf("%.21Lg") gives 6.72420628622418701398e-4933
-g_xLfmt(0) gives 3 bytes: "1.2"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[1] = #3fff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[1] == strtoxL
-
-
-Input: -1.2
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 99999999 99999999
-printf("%.21Lg") gives 6.72420628622418701034e-4933
-g_xLfmt(0) gives 22 bytes: "-1.1999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[1] = #bfff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[1] == strtoxL
-
-
-Input: 1.3
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 a6666666 66666667
-printf("%.21Lg") gives 1.0086309429336280521e-4932
-g_xLfmt(0) gives 21 bytes: "1.3000000000000000001"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[1] = #3fff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[1] == strtoxL
-
-
-Input: -1.3
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 a6666666 66666666
-printf("%.21Lg") gives 1.00863094293362805173e-4932
-g_xLfmt(0) gives 4 bytes: "-1.3"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[1] = #bfff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[1] == strtoxL
-
-
-Input: 1.4
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 b3333333 33333334
-printf("%.21Lg") gives 1.3448412572448374028e-4932
-g_xLfmt(0) gives 21 bytes: "1.4000000000000000001"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[1] = #3fff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[1] == strtoxL
-
-
-Input: -1.4
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 b3333333 33333333
-printf("%.21Lg") gives 1.34484125724483740243e-4932
-g_xLfmt(0) gives 4 bytes: "-1.4"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[1] = #bfff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[1] == strtoxL
-
-
-Input: 1.5
-
-strtoxL consumes 3 bytes and returns 1
-with bits = #3fff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 3 bytes: "1.5"
-
-strtoIxL returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: -1.5
-
-strtoxL consumes 4 bytes and returns 9
-with bits = #bfff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 4 bytes: "-1.5"
-
-strtoIxL returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.6
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 cccccccc cccccccd
-printf("%.21Lg") gives 2.01726188586725610383e-4932
-g_xLfmt(0) gives 3 bytes: "1.6"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[1] = #3fff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[1] == strtoxL
-
-
-Input: -1.6
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 cccccccc cccccccc
-printf("%.21Lg") gives 2.01726188586725610347e-4932
-g_xLfmt(0) gives 22 bytes: "-1.5999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[1] = #bfff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[1] == strtoxL
-
-
-Input: 1.7
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 d9999999 9999999a
-printf("%.21Lg") gives 2.35347220017846545453e-4932
-g_xLfmt(0) gives 3 bytes: "1.7"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[1] = #3fff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[1] == strtoxL
-
-
-Input: -1.7
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 d9999999 99999999
-printf("%.21Lg") gives 2.35347220017846545417e-4932
-g_xLfmt(0) gives 22 bytes: "-1.6999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[1] = #bfff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[1] == strtoxL
-
-
-Input: 1.8
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 e6666666 66666667
-printf("%.21Lg") gives 2.68968251448967480523e-4932
-g_xLfmt(0) gives 21 bytes: "1.8000000000000000001"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[1] = #3fff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[1] == strtoxL
-
-
-Input: -1.8
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 e6666666 66666666
-printf("%.21Lg") gives 2.68968251448967480486e-4932
-g_xLfmt(0) gives 4 bytes: "-1.8"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[1] = #bfff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[1] == strtoxL
-
-
-Input: 1.9
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 f3333333 33333334
-printf("%.21Lg") gives 3.02589282880088415593e-4932
-g_xLfmt(0) gives 21 bytes: "1.9000000000000000001"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[1] = #3fff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[1] == strtoxL
-
-
-Input: -1.9
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 f3333333 33333333
-printf("%.21Lg") gives 3.02589282880088415556e-4932
-g_xLfmt(0) gives 4 bytes: "-1.9"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[1] = #bfff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[1] == strtoxL
-
-Rounding mode for strtor... changed from 2 (toward +Infinity) to 3 (toward -Infinity)
-
-Input: 1.1
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 8ccccccc cccccccc
-printf("%.21Lg") gives 3.36210314311209350335e-4933
-g_xLfmt(0) gives 21 bytes: "1.0999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[1] = #3fff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[0] == strtoxL
-
-
-Input: -1.1
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 8ccccccc cccccccd
-printf("%.21Lg") gives 3.36210314311209350699e-4933
-g_xLfmt(0) gives 4 bytes: "-1.1"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[1] = #bfff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[0] == strtoxL
-
-
-Input: 1.2
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 99999999 99999999
-printf("%.21Lg") gives 6.72420628622418701034e-4933
-g_xLfmt(0) gives 21 bytes: "1.1999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[1] = #3fff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[0] == strtoxL
-
-
-Input: -1.2
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 99999999 9999999a
-printf("%.21Lg") gives 6.72420628622418701398e-4933
-g_xLfmt(0) gives 4 bytes: "-1.2"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[1] = #bfff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[0] == strtoxL
-
-
-Input: 1.3
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 a6666666 66666666
-printf("%.21Lg") gives 1.00863094293362805173e-4932
-g_xLfmt(0) gives 3 bytes: "1.3"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[1] = #3fff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[0] == strtoxL
-
-
-Input: -1.3
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 a6666666 66666667
-printf("%.21Lg") gives 1.0086309429336280521e-4932
-g_xLfmt(0) gives 22 bytes: "-1.3000000000000000001"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[1] = #bfff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[0] == strtoxL
-
-
-Input: 1.4
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 b3333333 33333333
-printf("%.21Lg") gives 1.34484125724483740243e-4932
-g_xLfmt(0) gives 3 bytes: "1.4"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[1] = #3fff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[0] == strtoxL
-
-
-Input: -1.4
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 b3333333 33333334
-printf("%.21Lg") gives 1.3448412572448374028e-4932
-g_xLfmt(0) gives 22 bytes: "-1.4000000000000000001"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[1] = #bfff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[0] == strtoxL
-
-
-Input: 1.5
-
-strtoxL consumes 3 bytes and returns 1
-with bits = #3fff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 3 bytes: "1.5"
-
-strtoIxL returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: -1.5
-
-strtoxL consumes 4 bytes and returns 9
-with bits = #bfff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 4 bytes: "-1.5"
-
-strtoIxL returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.6
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 cccccccc cccccccc
-printf("%.21Lg") gives 2.01726188586725610347e-4932
-g_xLfmt(0) gives 21 bytes: "1.5999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[1] = #3fff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[0] == strtoxL
-
-
-Input: -1.6
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 cccccccc cccccccd
-printf("%.21Lg") gives 2.01726188586725610383e-4932
-g_xLfmt(0) gives 4 bytes: "-1.6"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[1] = #bfff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[0] == strtoxL
-
-
-Input: 1.7
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 d9999999 99999999
-printf("%.21Lg") gives 2.35347220017846545417e-4932
-g_xLfmt(0) gives 21 bytes: "1.6999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[1] = #3fff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[0] == strtoxL
-
-
-Input: -1.7
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 d9999999 9999999a
-printf("%.21Lg") gives 2.35347220017846545453e-4932
-g_xLfmt(0) gives 4 bytes: "-1.7"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[1] = #bfff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[0] == strtoxL
-
-
-Input: 1.8
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 e6666666 66666666
-printf("%.21Lg") gives 2.68968251448967480486e-4932
-g_xLfmt(0) gives 3 bytes: "1.8"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[1] = #3fff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[0] == strtoxL
-
-
-Input: -1.8
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 e6666666 66666667
-printf("%.21Lg") gives 2.68968251448967480523e-4932
-g_xLfmt(0) gives 22 bytes: "-1.8000000000000000001"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[1] = #bfff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[0] == strtoxL
-
-
-Input: 1.9
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 f3333333 33333333
-printf("%.21Lg") gives 3.02589282880088415556e-4932
-g_xLfmt(0) gives 3 bytes: "1.9"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[1] = #3fff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[0] == strtoxL
-
-
-Input: -1.9
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 f3333333 33333334
-printf("%.21Lg") gives 3.02589282880088415593e-4932
-g_xLfmt(0) gives 22 bytes: "-1.9000000000000000001"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[1] = #bfff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[0] == strtoxL
-
diff --git a/lib/libc/gdtoa/test/pfLqtestnos b/lib/libc/gdtoa/test/pfLqtestnos
deleted file mode 100644
index 068092337..000000000
--- a/lib/libc/gdtoa/test/pfLqtestnos
+++ /dev/null
@@ -1,13 +0,0 @@
-%.8a 1.23
-%.7a
-%.2a
-%.La 1.23
-%.20Lqa 1.23
-%La 3e27
-%La 1.7e27
-%Lqa 3e48
-%Lqa 1e49
-1.5
-2.5
-4.5
-8.5
diff --git a/lib/libc/gdtoa/test/pftest.c b/lib/libc/gdtoa/test/pftest.c
deleted file mode 100644
index 99d78ee45..000000000
--- a/lib/libc/gdtoa/test/pftest.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 2009 by David M. Gay
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-source-code copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation.
-
-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, 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 "stdio1.h"
-#include "gdtoa.h"
-#include <string.h>
-
-#undef allow_Quad
-#undef want_Quad
-#undef want_Ux
-#define want_LD
-typedef union Ud {double x; unsigned int u[2]; } Ud;
-#ifdef __x86_64 /*{{*/
-#define want_Ux
-#ifndef NO_GDTOA_i386_Quad /*{*/
-typedef union UQ {__float128 x; unsigned int u[4]; } UQ;
-#define allow_Quad(x) x
-#define want_Quad
-#endif /*}*/
-#else /*}{*/
-#ifdef __i386 /*{{*/
-#define want_Ux
-#else /*}{*/
-#ifdef __sparc /*{{*/
-typedef union UQ {long double x; unsigned int u[4]; } Ux;
-#else /*}{*/
-#ifdef __INTEL_COMPILER /*{*/
-#undef want_Quad
-#undef want_Ux
-#undef want_LD
-#endif /*}*/
-#endif /*}}*/
-#endif /*}}*/
-#endif /*}}*/
-
-#ifndef allow_Quad
-#define allow_Quad(x) /*nothing*/
-#endif
-
-#ifdef want_Ux /*{{*/
-typedef union Ux {long double x; unsigned short u[5]; } Ux;
-#else /*}{*/
-#ifdef __sparc
-#define want_Ux
-#endif
-#endif /*}}*/
-
- int
-main(void)
-{
-	Ud d;
-	allow_Quad(UQ q;)
-	char *b, buf[256], fmt[32], *s;
-#ifdef want_Ux
-	Ux x;
-	x.x = 0.;
-#endif
-	int k;
-
-	k = 0;
-	strcpy(fmt, "%.g");
-	d.x = 0.;
-	allow_Quad(q.x = 0.;)
-	while(fgets(buf, sizeof(buf), stdin)) {
-		for(b = buf; *b && *b != '\n'; ++b);
-		*b = 0;
-		if (b == buf)
-			continue;
-		b = buf;
-		if (*b == '%') {
-			for(k = 0; *b > ' '; ++b)
-#ifdef want_LD /*{{*/
-				switch(*b) {
-				  case 'L':
-					k = 1;
-#ifdef want_Quad
-					break;
-				  case 'q':
-					if (k >= 1)
-						k = 2;
-#endif
-				  }
-#else /*}{*/
-				;
-#endif /*}}*/
-			if (*b)
-				*b++ = 0;
-			if (b - buf < sizeof(fmt)) {
-				strcpy(fmt, buf);
-				}
-			}
-		if (*b) {
-			switch(k) {
-			  case 0:
-				d.x = strtod(b,&s);
-				break;
-			  case 1:
-#ifdef want_Ux
-#ifdef __sparc
-				strtopQ(b,&s,&x.x);
-#else
-				strtopx(b,&s,&x.x);
-#endif
-#else
-				strtopQ(b,&s,&q.x);
-#endif
-				break;
-			  allow_Quad(case 2: strtopQ(b,&s,&q.x);)
-			  }
-			if (*s)
-				printf("Ignoring \"%s\"\n", s);
-			}
-		switch(k) {
-			case 0:
-				printf("d.x = %.g = #%x %x; %s ==> ", d.x, d.u[1], d.u[0], fmt);
-				printf(fmt, d.x);
-				break;
-			case 1:
-#ifdef __sparc
-				printf("x.x = %.Lg = #%x %x %x %x; %s ==> ", x.x,
-					x.u[0], x.u[1], x.u[2], x.u[3], fmt);
-#else
-				printf("x.x = %.Lg = #%x %x %x %x %x; %s ==> ", x.x,
-					x.u[4], x.u[3], x.u[2], x.u[1], x.u[0], fmt);
-#endif
-				printf(fmt, x.x);
-#ifdef want_Quad
-				break;
-			case 2:
-				printf("q.x = %.Lqg = #%x %x %x %x; %s ==> ", q.x,
-					q.u[3], q.u[2], q.u[1], q.u[0], fmt);
-				printf(fmt, q.x);
-#endif
-			}
-		putchar('\n');
-		}
-	return 0;
-	}
diff --git a/lib/libc/gdtoa/test/pftestLq.out b/lib/libc/gdtoa/test/pftestLq.out
deleted file mode 100644
index 0bcec7461..000000000
--- a/lib/libc/gdtoa/test/pftestLq.out
+++ /dev/null
@@ -1,13 +0,0 @@
-d.x = 1.23 = #3ff3ae14 7ae147ae; %.8a ==> 0x1.3ae147aep+0
-d.x = 1.23 = #3ff3ae14 7ae147ae; %.7a ==> 0x1.3ae147bp+0
-d.x = 1.23 = #3ff3ae14 7ae147ae; %.2a ==> 0x1.3bp+0
-x.x = 1.23 = #3fff 9d70 a3d7 a3d 70a4; %.La ==> 0xap-3
-q.x = 1.23 = #3fff3ae1 47ae147a e147ae14 7ae147ae; %.20Lqa ==> 0x1.3ae147ae147ae147ae14p+0
-x.x = 3e+27 = #405a 9b18 ab5d f718 b6c; %La ==> 0x9.b18ab5df7180b6cp+88
-x.x = 1.7e+27 = #4059 afc6 a015 291b 4024; %La ==> 0xa.fc6a015291b4024p+87
-q.x = 3e+48 = #40a006be 53879565 60c1e1a9 9c13ee2; %Lqa ==> 0x1.06be5387956560c1e1a909c13ee2p+161
-q.x = 1e+49 = #40a1b5e7 e08ca3a8 f6987819 baecbe22; %Lqa ==> 0x1.b5e7e08ca3a8f6987819baecbe22p+162
-q.x = 1.5 = #3fff8000 0 0 0; %Lqa ==> 0x1.8p+0
-q.x = 2.5 = #40004000 0 0 0; %Lqa ==> 0x1.4p+1
-q.x = 4.5 = #40012000 0 0 0; %Lqa ==> 0x1.2p+2
-q.x = 8.5 = #40021000 0 0 0; %Lqa ==> 0x1.1p+3
diff --git a/lib/libc/gdtoa/test/pftestQ.out b/lib/libc/gdtoa/test/pftestQ.out
deleted file mode 100644
index 8c42afe69..000000000
--- a/lib/libc/gdtoa/test/pftestQ.out
+++ /dev/null
@@ -1,15 +0,0 @@
-d.x = 1.23 = #7ae147ae 3ff3ae14; %.8a ==> 0x1.3ae147aep+0
-d.x = 1.23 = #7ae147ae 3ff3ae14; %.7a ==> 0x1.3ae147bp+0
-d.x = 1.23 = #7ae147ae 3ff3ae14; %.2a ==> 0x1.3bp+0
-x.x = 1.23 = #3fff3ae1 47ae147a e147ae14 7ae147ae; %.La ==> 0x1p+0
-x.x = 1.23 = #3fff3ae1 47ae147a e147ae14 7ae147ae; %.20La ==> 0x1.3ae147ae147ae147ae14p+0
-x.x = 3e+27 = #405a3631 56bbee30 16d70000 0; %La ==> 0x1.363156bbee3016d7p+91
-x.x = 1.7e+27 = #40595f8d 402a5236 80490000 0; %La ==> 0x1.5f8d402a52368049p+90
-d.x = 1.5 = #0 3ff80000; %a ==> 0x1.8p+0
-d.x = 2.5 = #0 40040000; %a ==> 0x1.4p+1
-d.x = 4.5 = #0 40120000; %a ==> 0x1.2p+2
-d.x = 8.5 = #0 40210000; %a ==> 0x1.1p+3
-x.x = 1.5 = #3fff8000 0 0 0; %La ==> 0x1.8p+0
-x.x = 2.5 = #40004000 0 0 0; %La ==> 0x1.4p+1
-x.x = 4.5 = #40012000 0 0 0; %La ==> 0x1.2p+2
-x.x = 8.5 = #40021000 0 0 0; %La ==> 0x1.1p+3
diff --git a/lib/libc/gdtoa/test/pftestnos b/lib/libc/gdtoa/test/pftestnos
deleted file mode 100644
index 7b3010a8b..000000000
--- a/lib/libc/gdtoa/test/pftestnos
+++ /dev/null
@@ -1,15 +0,0 @@
-%.8a 1.23
-%.7a
-%.2a
-%.La 1.23
-%.20La 1.23
-%La 3e27
-%La 1.7e27
-%a 1.5
-2.5
-4.5
-8.5
-%La 1.5
-2.5
-4.5
-8.5
diff --git a/lib/libc/gdtoa/test/pftestx.out b/lib/libc/gdtoa/test/pftestx.out
deleted file mode 100644
index 15a08d362..000000000
--- a/lib/libc/gdtoa/test/pftestx.out
+++ /dev/null
@@ -1,15 +0,0 @@
-d.x = 1.23 = #3ff3ae14 7ae147ae; %.8a ==> 0x1.3ae147aep+0
-d.x = 1.23 = #3ff3ae14 7ae147ae; %.7a ==> 0x1.3ae147bp+0
-d.x = 1.23 = #3ff3ae14 7ae147ae; %.2a ==> 0x1.3bp+0
-x.x = 1.23 = #3fff 9d70 a3d7 a3d 70a4; %.La ==> 0xap-3
-x.x = 1.23 = #3fff 9d70 a3d7 a3d 70a4; %.20La ==> 0x9.d70a3d70a3d70a4p-3
-x.x = 3e+27 = #405a 9b18 ab5d f718 b6c; %La ==> 0x9.b18ab5df7180b6cp+88
-x.x = 1.7e+27 = #4059 afc6 a015 291b 4024; %La ==> 0xa.fc6a015291b4024p+87
-d.x = 1.5 = #3ff80000 0; %a ==> 0x1.8p+0
-d.x = 2.5 = #40040000 0; %a ==> 0x1.4p+1
-d.x = 4.5 = #40120000 0; %a ==> 0x1.2p+2
-d.x = 8.5 = #40210000 0; %a ==> 0x1.1p+3
-x.x = 1.5 = #3fff c000 0 0 0; %La ==> 0xcp-3
-x.x = 2.5 = #4000 a000 0 0 0; %La ==> 0xap-2
-x.x = 4.5 = #4001 9000 0 0 0; %La ==> 0x9p-1
-x.x = 8.5 = #4002 8800 0 0 0; %La ==> 0x8.8p+0
diff --git a/lib/libc/gdtoa/test/rtestnos b/lib/libc/gdtoa/test/rtestnos
deleted file mode 100644
index cde95b78a..000000000
--- a/lib/libc/gdtoa/test/rtestnos
+++ /dev/null
@@ -1,76 +0,0 @@
-r0
-1.1
--1.1
-1.2
--1.2
-1.3
--1.3
-1.4
--1.4
-1.5
--1.5
-1.6
--1.6
-1.7
--1.7
-1.8
--1.8
-1.9
--1.9
-r1
-1.1
--1.1
-1.2
--1.2
-1.3
--1.3
-1.4
--1.4
-1.5
--1.5
-1.6
--1.6
-1.7
--1.7
-1.8
--1.8
-1.9
--1.9
-r2
-1.1
--1.1
-1.2
--1.2
-1.3
--1.3
-1.4
--1.4
-1.5
--1.5
-1.6
--1.6
-1.7
--1.7
-1.8
--1.8
-1.9
--1.9
-r3
-1.1
--1.1
-1.2
--1.2
-1.3
--1.3
-1.4
--1.4
-1.5
--1.5
-1.6
--1.6
-1.7
--1.7
-1.8
--1.8
-1.9
--1.9
diff --git a/lib/libc/gdtoa/test/strtoIdSI.c b/lib/libc/gdtoa/test/strtoIdSI.c
deleted file mode 100644
index c5342edfa..000000000
--- a/lib/libc/gdtoa/test/strtoIdSI.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define Sudden_Underflow
-#include "../strtoId.c"
diff --git a/lib/libc/gdtoa/test/strtoIddSI.c b/lib/libc/gdtoa/test/strtoIddSI.c
deleted file mode 100644
index 2966259a8..000000000
--- a/lib/libc/gdtoa/test/strtoIddSI.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define Sudden_Underflow
-#include "../strtoIdd.c"
diff --git a/lib/libc/gdtoa/test/strtodISI.c b/lib/libc/gdtoa/test/strtodISI.c
deleted file mode 100644
index 66d2addfe..000000000
--- a/lib/libc/gdtoa/test/strtodISI.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define Sudden_Underflow
-#include "../strtodI.c"
diff --git a/lib/libc/gdtoa/test/strtodt.c b/lib/libc/gdtoa/test/strtodt.c
deleted file mode 100644
index 2983615c0..000000000
--- a/lib/libc/gdtoa/test/strtodt.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 2001 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-/* Test strtod.  */
-
-/* On stdin, read triples: d x y:
- *	d = decimal string
- *	x = high-order Hex value expected from strtod
- *	y = low-order Hex value
- * Complain about errors.
- */
-
-#include "gdtoa.h"	/* for ULong */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
- static int W0, W1;
- typedef union {
-		double d;
-		ULong L[2];
-		} U;
-
-#define UL (unsigned long)
-
- static int
-process(char *fname, FILE *f)
-{
-	U a, b;
-	char buf[2048];
-	char *s, *s1, *se;
-	int line, n;
-
-	line = n = 0;
-
- top:
-	while(fgets(s = buf, sizeof(buf), f)) {
-		line++;
-		while(*s <= ' ')
-			if (!*s++)
-				goto top; /* break 2 */
-		if (*s == '#')
-			continue;
-		while(*s > ' ')
-			s++;
-		/* if (sscanf(s,"\t%lx\t%lx", &a.L[0], &a.L[1]) != 2) */
-		if ((a.L[0] = (ULong)strtoul(s, &s1,16), s1 <= s)
-		 || (a.L[1] = (ULong)strtoul(s1,&se,16), se <= s1)) {
-			printf("Badly formatted line %d of %s\n",
-				line, fname);
-			n++;
-			continue;
-			}
-		b.d = strtod(buf,0);
-		if (b.L[W0] != a.L[0] || b.L[W1] != a.L[1]) {
-			n++;
-			printf("Line %d of %s: got %lx %lx; expected %lx %lx\n",
-				line, fname, UL b.L[W0], UL b.L[W1], UL a.L[0], UL a.L[1]);
-			}
-		}
-	return n;
-	}
-
- int
-main(int argc, char **argv)
-{
-	FILE *f;
-	char *prog, *s;
-	int n, rc;
-	U u;
-
-	prog = argv[0];
-	if (argc == 2 && !strcmp(argv[1],"-?")) {
-		fprintf(stderr, "Usage: %s [file [file...]]\n"
-			"\tto read data file(s) of tab-separated triples d x y with\n"
-			"\t\td decimal string\n"
-			"\t\tx = high-order Hex value expected from strtod\n"
-			"\t\ty = low-order Hex value\n"
-			"\tComplain about errors by strtod.\n"
-			"\tIf no files, read triples from stdin.\n",
-			prog);
-		return 0;
-		}
-
-	/* determine endian-ness */
-
-	u.d = 1.;
-	W0 = u.L[0] == 0;
-	W1 = 1 - W0;
-
-	/* test */
-
-	n = rc = 0;
-	if (argc <= 1)
-		n = process("<stdin>", stdin);
-	else
-		while((s = *++argv))
-			if ((f = fopen(s,"r"))) {
-				n += process(s, f);
-				fclose(f);
-				}
-			else {
-				rc = 2;
-				fprintf(stderr, "Cannot open %s\n", s);
-				}
-	printf("%d bad conversions\n", n);
-	if (n)
-		rc |= 1;
-	return rc;
-	}
diff --git a/lib/libc/gdtoa/test/strtopddSI.c b/lib/libc/gdtoa/test/strtopddSI.c
deleted file mode 100644
index d2004e5b7..000000000
--- a/lib/libc/gdtoa/test/strtopddSI.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define Sudden_Underflow
-#include "../strtopdd.c"
diff --git a/lib/libc/gdtoa/test/strtorddSI.c b/lib/libc/gdtoa/test/strtorddSI.c
deleted file mode 100644
index dd6a3812e..000000000
--- a/lib/libc/gdtoa/test/strtorddSI.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define Sudden_Underflow
-#include "../strtordd.c"
diff --git a/lib/libc/gdtoa/test/testnos b/lib/libc/gdtoa/test/testnos
deleted file mode 100644
index a36a98676..000000000
--- a/lib/libc/gdtoa/test/testnos
+++ /dev/null
@@ -1,28 +0,0 @@
-1.23
-1.23e+20
-1.23e-20
-1.23456789
-1.23456589e+20
-1.23e+30
-1.23e-30
-1.23456789e-20
-1.23456789e-30
-1.234567890123456789
-1.23456789012345678901234567890123456789
-1.23e306
-1.23e-306
-1.23e-320
-1.23e-20
-1.23456789e307
-1.23456589e-307
-1.234567890123456789
-1.234567890123456789e301
-1.234567890123456789e-301
-1.234567890123456789e-321
-1e23
-1e310
-9.0259718793241475e-277
-9.025971879324147880346310405869e-277
-9.025971879324147880346310405868e-277
-2.2250738585072014e-308
-2.2250738585072013e-308
diff --git a/lib/libc/gdtoa/test/testnos1 b/lib/libc/gdtoa/test/testnos1
deleted file mode 100644
index d734b35db..000000000
--- a/lib/libc/gdtoa/test/testnos1
+++ /dev/null
@@ -1,20 +0,0 @@
-1.23:2 6
-1.23:4 6
-1.23e+20:2 6
-1.23e+20:4 6
-1.23e-20:2 6
-1.23e-20:4 6
-1.23456789:2 6
-1.23456789:4 6
-1.23456589e+20:2 6
-1.23456589e+20:4 6
-1.23456789e-20:2 6
-1.23456789e-20:4 6
-1234565:2 6
-1234565:4 6
-1.234565:2 6
-1.234565:4 6
-1.234565e+20:2 6
-1.234565e+20:4 6
-1.234565e-20:2 6
-1.234565e-20:4 6
diff --git a/lib/libc/gdtoa/test/testnos3 b/lib/libc/gdtoa/test/testnos3
deleted file mode 100644
index 2a7cf7944..000000000
--- a/lib/libc/gdtoa/test/testnos3
+++ /dev/null
@@ -1,352 +0,0 @@
-# Test triples for strtodt, derived from Fred Tydeman's posting
-# of 26 February 1996 to comp.arch.arithmetic.
-
-9e0306	7fa9a202	8368022e
-4e-079	2fa7b6d7	1d20b96c
-7e-261	9eb8d7e	32be6396
-6e-025	3ae7361c	b863de62
-7e-161	1eaf7e0d	b3799aa3
-7e0289	7c1cbb54	7777a285
-5e0079	507afcef	51f0fb5f
-1e0080	508afcef	51f0fb5f
-7e-303	1333391	31c46f8b
-5e0152	5fa317e5	ef3ab327
-5e0125	5a07a2ec	c414a03f
-2e0126	5a27a2ec	c414a03f
-7e-141	22d5570f	59bd178c
-4e-192	18323ff0	6eea847a
-9e0043	49102498	ea6df0c4
-1e0303	7ed754e3	1cd072da
-95e-089	2dde3cbc	9907fdc8
-85e0194	689d1c26	db7d0dae
-69e0267	77c0b7cb	60c994da
-97e-019	3c665dde	8e688ba6
-37e0046	49d033d7	eca0adef
-74e0046	49e033d7	eca0adef
-61e-099	2bc0ad83	6f269a17
-53e-208	151b39ae	1909c31b
-93e-234	fc27b2e	4f210075
-79e-095	2c9a5db8	12948281
-87e-274	772d36c	f48e7abd
-83e0025	4585747a	b143e353
-17e-036	38b698cc	dc60015a
-53e0033	47246a34	18629ef6
-51e-074	30ecd5be	e57763e6
-63e-022	3bbdc03b	8fd7016a
-839e0143	5e3ae03f	245703e2
-749e-182	1abf1472	7744c63e
-999e-026	3b282782	afe1869e
-345e0266	77b0b7cb	60c994da
-914e-102	2b5ffc81	bc29f02b
-829e0102	55b7221a	79cdd1d9
-307e0090	5322d6b1	83fe4b55
-859e0182	6654374d	8b87ac63
-283e0085	5216c309	24bab4b
-589e0187	675526be	9c22eb17
-302e0176	64fdcf7d	f8f573b7
-604e0176	650dcf7d	f8f573b7
-761e-244	de03cea	3586452e
-647e0230	7044d64d	4079150c
-755e0174	64a7d931	93f78fc6
-255e-075	30dcd5be	e57763e6
-3391e0055	4c159bd3	ad46e346
-4147e-015	3d923d1b	5eb1d778
-3996e-026	3b482782	afe1869e
-1998e-026	3b382782	afe1869e
-3338e-296	335519a	c5142aab
-1669e-296	325519a	c5142aab
-8699e-276	772d2df	246ecd2d
-5311e0243	73284e91	f4aa0fdb
-7903e-096	2cd07c2d	27a5b989
-7611e-226	11d19b87	44033457
-3257e0058	4cb444b3	4a6fb3eb
-6514e0058	4cc444b3	4a6fb3eb
-3571e0263	77462644	c61d41aa
-7142e0263	77562644	c61d41aa
-5311e0242	72f3720e	5d54d97c
-1617e-063	3384c98f	ce16152e
-51881e0037	4897d295	dc76da4
-31441e-118	285ef890	f5de4c86
-30179e0079	5143e272	a77478e8
-60358e0079	5153e272	a77478e8
-63876e-020	3cc70385	6844bdbf
-31938e-020	3cb70385	6844bdbf
-46073e-032	3a42405b	773fbdf3
-32941e0051	4b757eb8	ad52a5c9
-82081e0041	49770105	df3d47cb
-38701e-215	1440492a	4a8a37fd
-62745e0047	4ab0c52f	e6dc6a1b
-12549e0048	4ac0c52f	e6dc6a1b
-64009e-183	1af099b3	93b84832
-89275e0261	77262644	c61d41aa
-75859e0025	46232645	e1ba93f0
-57533e0287	7c8272ed	2307f56a
-584169e0229	70ad6570	59dc79aa
-940189e-112	29eb99d6	240c1a28
-416121e0197	6a00fd07	ed297f80
-832242e0197	6a10fd07	ed297f80
-584738e0076	50e8a85e	b277e645
-933587e-140	241b2487	28b9c117
-252601e0121	5a2dda59	2e398dd7
-358423e0274	79f9463b	59b8f2bd
-892771e-213	14f25818	c7294f27
-410405e0040	49670105	df3d47cb
-928609e-261	afbe2dd	66200bef
-302276e-254	c55a462	d91c6ab3
-920657e-023	3c653a99	85dbde6c
-609019e-025	3bf1f99e	11ea0a24
-252601e0120	59f7e1e0	f1c7a4ac
-654839e-060	34b00e7d	b3b3f242
-8823691e0130	5c5e597c	b94b7ae
-2920845e0228	709d6570	59dc79aa
-9210917e0080	51fda232	347e6032
-5800419e-303	26e58ff	a48f4fce
-6119898e-243	ee3ecf2	2ea07863
-3059949e-243	ed3ecf2	2ea07863
-2572231e0223	6f90f73b	e1dff9ad
-5444097e-021	3cf8849d	d33c95af
-5783893e-127	26f7e590	2ce0e151
-3865421e-225	1295d4fe	53afec65
-4590831e0156	61b4689b	4a5fa201
-9181662e0156	61c4689b	4a5fa201
-5906361e-027	3bbbe45a	312d08a0
-7315057e0235	7225f0d4	8362a72
-9088115e0106	5762e51a	84a3c6a0
-1817623e0107	5772e51a	84a3c6a0
-44118455e0129	5c4e597c	b94b7ae
-35282041e0293	7e5512d5	273e62e8
-31279898e-291	5129b01	b6885d36
-15639949e-291	5029b01	b6885d36
-27966061e0145	5f955bcf	72fd10f9
-55932122e0145	5fa55bcf	72fd10f9
-70176353e-053	36900683	a21de855
-40277543e-032	3adf29ca	ff893b1
-50609263e0157	622193af	f1f1c8e3
-66094077e0077	518b37c4	b7928317
-84863171e0114	59406e98	f5ec8f37
-89396333e0264	786526f0	61ca9053
-87575437e-309	16e0732	602056c
-78693511e-044	3870bc7b	7603a2ca
-90285923e-206	16d14700	83f89d48
-30155207e-030	3b423a4a	d20748a2
-245540327e0121	5acc569e	968e0944
-263125459e0287	7d44997a	298b2f2e
-566446538e-257	c64472b	a9550e86
-283223269e-257	c54472b	a9550e86
-245540327e0122	5b01b623	1e18c5cb
-491080654e0122	5b11b623	1e18c5cb
-971212611e-126	27a397d3	c9745d2f
-229058583e0052	4c76ce94	febdc7a5
-325270231e0039	49cc7ccf	90c9f8ab
-989648089e-035	3a8880a3	d515e849
-653777767e0273	7a720223	f2b3a881
-923091487e0209	6d30bc60	e6896717
-526250918e0288	7d89bfd8	b3edfafa
-350301748e-309	18e0732	602056c
-741111169e-203	17a14fe7	daf8f3ae
-667284113e-240	ff09355	f8050c02
-1227701635e0120	5abc569e	968e0944
-9981396317e-182	1c38afe1	a2a66aa
-5232604057e-298	41465b8	96c24520
-5572170023e-088	2fb08478	22f765b2
-1964322616e0122	5b31b623	1e18c5cb
-3928645232e0122	5b41b623	1e18c5cb
-8715380633e-058	35f4614c	3219891f
-4856063055e-127	279397d3	c9745d2f
-8336960483e-153	223a06a1	24b95e1
-1007046393e-155	21a01891	fc4717fd
-5378822089e-176	1d695fd4	c88d4b1b
-5981342308e-190	1a83db11	ac608107
-7214782613e-086	3020b552	d2edcdea
-5458466829e0142	5f70acde	6a98eb4c
-9078555839e-109	2b5fc575	867314ee
-6418488827e0079	526021f1	4ed7b3fa
-65325840981e0069	5081a151	ddbd3c4a
-49573485983e0089	54a221bd	871d2cf4
-46275205733e0074	51830e6c	7d4e3480
-92550411466e0074	51930e6c	7d4e3480
-41129842097e-202	1832c3e7	2d179607
-93227267727e-049	380960fe	8d5847f
-41297294357e0185	688c4943	7fccfadb
-41534892987e-067	343a1266	6477886d
-42333842451e0201	6be0189a	26df575f
-78564021519e-227	13115551	5fd37265
-53587107423e-061	35800a19	a3ffd981
-53827010643e-200	18a32fa6	9a69bd6d
-83356057653e0193	6a4544e6	daee2a18
-45256834646e-118	29a541ec	dfd48694
-45392779195e-110	2b4fc575	867314ee
-23934638219e0291	7e81deaf	40ead9a0
-995779191233e0113	59e2d44e	dcc51304
-997422852243e-265	b676688	faee99bc
-653532977297e-123	28d925a0	aabcdc68
-938885684947e0147	60f11894	b202e9f4
-619534293513e0124	5c210c20	303fe0f1
-539879452414e-042	39a5e66d	c3d6bdb5
-742522891517e0259	782c1c35	2fc3c309
-254901016865e-022	3dbc06d3	66394441
-685763015669e0280	7c85fd7a	a44d9477
-384865004907e-285	72aa65b	58639e69
-286556458711e0081	5321958b	36c5102b
-573112917422e0081	5331958b	36c5102b
-769525178383e-150	234253ec	e161420
-416780288265e0192	6a3544e6	daee2a18
-226963895975e-111	2b3fc575	867314ee
-665592809339e0063	4f778b65	16c2b478
-3891901811465e0217	6f99ab82	61990292
-4764593340755e0069	50e4177a	9915fbf8
-6336156586177e0269	7a7173f7	6c63b792
-8233559360849e0095	56566fee	5649a7a
-3662265515198e-107	2c538e6e	dd48f2a3
-1831132757599e-107	2c438e6e	dd48f2a3
-7812878489261e-179	1d726dae	7bbeda75
-6363857920591e0145	60b28a61	cf9483b7
-8811915538555e0082	53a51f50	8b287ae7
-9997878507563e-195	1a253db2	fea1ea31
-9224786422069e-291	634ee5d	56b32957
-6284426329974e-294	58d3409	dfbca26f
-9199302046091e-062	35c13597	2630774c
-6070482281213e-122	29423fa9	e6fcf47e
-2780161250963e-301	405acc2	53064c2
-8233559360849e0094	5621f324	d11d4862
-72027097041701e0206	6d946778	12d3a606
-97297545286625e0215	6f79ab82	61990292
-99021992302453e-025	3da5c671	4def374c
-54104687080198e-022	3e373cdf	8db7a7bc
-33519685743233e0089	5537f203	339c9629
-67039371486466e0089	5547f203	339c9629
-39064392446305e-180	1d626dae	7bbeda75
-17796979903653e0261	78e072f3	819c1321
-28921916763211e0038	4a9eebab	e0957af3
-87605699161665e0155	6302920f	96e7f9ef
-41921560615349e-067	34d9b2a5	c4041e4b
-80527976643809e0061	4f7c7c5a	ea080a49
-72335858886654e-159	21cce77c	2b3328fc
-52656615219377e0102	57f561de	f4a9ee32
-15400733123779e-072	33b8bf7e	7fa6f02a
-77003665618895e-073	33a8bf7e	7fa6f02a
-475603213226859e-042	3a42d730	88f4050a
-972708181182949e0116	5b218a7f	36172332
-246411729980464e-071	342eef5e	1f90ac34
-123205864990232e-071	341eef5e	1f90ac34
-609610927149051e-255	e104273	b18918b1
-475603213226859e-041	3a778cfc	ab31064d
-672574798934795e0065	508226c6	84c87261
-134514959786959e0066	509226c6	84c87261
-294897574603217e-151	2395f2df	5e675a0f
-723047919080275e0036	4a7eebab	e0957af3
-660191429952702e-088	30bddc7e	975c5045
-330095714976351e-088	30addc7e	975c5045
-578686871093232e-159	21fce77c	2b3328fc
-144671717773308e-159	21dce77c	2b3328fc
-385018328094475e-074	3398bf7e	7fa6f02a
-330095714976351e-089	3077e398	7916a69e
-2215901545757777e-212	171a80a6	e566428c
-1702061899637397e-276	9cacc46	749dccfe
-1864950924021923e0213	6f53ae60	753af6ca
-3729901848043846e0213	6f63ae60	753af6ca
-7487252720986826e-165	20f8823a	57adbef9
-3743626360493413e-165	20e8823a	57adbef9
-4988915232824583e0119	5be5f6de	9d5d6b5b
-3771476185376383e0277	7cae3c14	d6916ce9
-6182410494241627e-119	2a81b964	58445d07
-2572981889477453e0142	609dfc11	fbf46087
-7793560217139653e0051	4dd28046	1b856ec5
-9163942927285259e-202	194fe601	457dce4d
-6353227084707473e0155	63650aff	653ffe8a
-4431803091515554e-211	17609068	4f5fe998
-9324754620109615e0211	6f0f7d67	21f7f144
-8870461176410409e0263	79d90529	a37b7e22
-90372559027740405e0143	612491da	ad0ba280
-18074511805548081e0146	61a011f2	d73116f4
-54897030182071313e0029	496ec556	66d8f9ec
-76232626624829156e-032	3ccb7738	11e75fe
-59898021767894608e-165	2128823a	57adbef9
-29949010883947304e-165	2118823a	57adbef9
-26153245263757307e0049	4d83de00	5bd620df
-27176258005319167e-261	d27c074	7bd76fa1
-18074511805548081e0147	61d4166f	8cfd5cb1
-24691002732654881e-115	2b759a27	83ce70ab
-58483921078398283e0057	4f408ce4	99519ce3
-64409240769861689e-159	22692238	f7987779
-94080055902682397e-242	11364981	e39e66ca
-31766135423537365e0154	63550aff	653ffe8a
-68985865317742005e0164	657a999d	dec72aca
-13797173063548401e0165	658a999d	dec72aca
-902042358290366539e-281	9522dc0	1ca1cb8c
-238296178309629163e0272	7c038fd9	3f1f5342
-783308178698887621e0226	72925ae6	2cb346d8
-439176241456570504e0029	499ec556	66d8f9ec
-899810892172646163e0283	7e6adf51	fa055e03
-926145344610700019e-225	14f307a6	7f1f69ff
-653831131593932675e0047	4d63de00	5bd620df
-130766226318786535e0048	4d73de00	5bd620df
-557035730189854663e-294	693bfac	6bc4767b
-902042358290366539e-280	986b930	23ca3e6f
-272104041512242479e0200	6d13bbb4	bf05f087
-544208083024484958e0200	6d23bbb4	bf05f087
-680429695511221511e0192	6b808ebc	116f8a20
-308975121073410857e0236	7490db75	cc001072
-792644927852378159e0078	53d7bff3	36d8ff06
-783308178698887621e0223	71f2cbac	35f71140
-8396094300569779681e-252	f8ab223	efcee35a
-3507665085003296281e-074	346b85c0	26a264e4
-7322325862592278999e0074	5336775b	6caa5ae0
-6014546754280072926e0209	6f396397	b06732a4
-7120190517612959703e0120	5cc3220d	cd5899fd
-3507665085003296281e-073	34a13398	18257f0f
-4345544743100783551e-218	168a9c42	e5b6d89f
-9778613303868468131e-090	313146fe	1075e1ef
-7539204280836061195e-082	32d3d969	e3dbe723
-7862637540082247119e-202	19eaba32	62ee707b
-2176832332097939832e0200	6d43bbb4	bf05f087
-8643988913946659879e0115	5bbe71ec	1ed0a4f9
-5529436763613147623e0138	6079c677	be6f236e
-6764958008109694533e-173	1fed0669	2e6f5ef6
-6802601037806061975e0197	6cbf92ba	cb3cb40c
-1360520207561212395e0198	6ccf92ba	cb3cb40c
-62259110684423957791e0047	4dcd8f2c	fc20d6e8
-88800290202542652011e-226	1526cec5	1a43f41a
-41010852717673354694e-221	16201295	4b6aabba
-20505426358836677347e-221	16101295	4b6aabba
-66102447903809911604e0055	4f776206	8a24fd55
-35600952588064798515e0119	5cb3220d	cd5899fd
-14371240869903838702e0205	6e78d92d	2bcc7a81
-57500690832492901689e0043	4cf65d3e	2acd616b
-23432630639573022093e-107	2dbdd54c	40a2f25f
-62259110684423957791e0048	4e02797c	1d948651
-35620497849450218807e-306	475b220	82529425
-69658634627134074624e0200	6d93bbb4	bf05f087
-99440755792436956989e-062	37362d10	462a26f4
-55277197169490210673e0081	54d945bf	a911e32a
-36992084760177624177e-318	1f8c5f9	551c2f9a
-30888265282878466443e-111	2cf01b8e	f28251fc
-
-# examples of bugs introduced 20001113, fixed 20010207
-# first is 2^-1075 (half the smallest denormal)
-2.4703282292062327208828439643411068618252990130716238221279284125033775363510437593264991818081799618989828234772285886546332835517796989819938739800539093906315035659515570226392290858392449105184435931802849936536152500319370457678249219365623669863658480757001585769269903706311928279558551332927834338409351978015531246597263579574622766465272827220056374006485499977096599470454020828166226237857393450736339007967761930577506740176324673600968951340535537458516661134223766678604162159680461914467291840300530057530849048765391711386591646239524912623653881879636239373280423891018672348497668235089863388587925628302755995657524455507255189313690836254779186948667994968324049705821028513185451396213837722826145437693412532098591327667236328125e-324	0	0
-2.47032822920623272e-324	0	0
-
-# examples reported by Mark Dickinson of bugs in the bigcomp() logic introduced
-# 20090316 in dtoa.c to speed handling of absurdly long input:
-12579816049008305546974391768996369464963024663104e-357	90bbd	7412d19f
-17489628565202117263145367596028389348922981857013e-357	c938e	9000492f
-18487398785991994634182916638542680759613590482273e-357	d4b3a	ee198863
-32002864200581033134358724675198044527469366773928e-358	24d1e	ed8448e3
-99999999999999994487665465554760717039532578546e-47	3ff00000	0
-1.0000000000000000100000000000000000000001e44	4911efc6	59cf7d4c
-1000000000000000000000000000000000000000e-16	44b52d02	c7e14af6
-10000000000000000000000000000000000000000e-17	44b52d02	c7e14af6
-10.900000000000000012345678912345678912345	4025cccc	cccccccd
-104308485241983990666713401708072175773165034278685682646111762292409330928739751702404658197872319129036519947435319418387839758990478549477777586673075945844895981012024387992135617064532141489278815239849108105951619997829153633535314849999674266169258928940692239684771590065027025835804863585454872499320500023126142553932654370362024104462255244034053203998964360882487378334860197725139151265590832887433736189468858614521708567646743455601905935595381852723723645799866672558576993978025033590728687206296379801363024094048327273913079612469982585674824156000783167963081616214710691759864332339239688734656548790656486646106983450809073750535624894296242072010195710276073042036425579852459556183541199012652571123898996574563824424330960027873516082763671875e-1075	78026	65fd9600
-99037485700245683102805043437346965248029601286431e-373	0	2
-99617639833743863161109961162881027406769510558457e-373	0	2
-98852915025769345295749278351563179840130565591462e-372	0	14
-99059944827693569659153042769690930905148015876788e-373	0	2
-98914979205069368270421829889078356254059760327101e-372	0	14
-0.999999999999999999999999999999999999999999999e23	44b52d02	c7e14af6
-991633793189150720000000000000000000000000000000000000000e-33	44ea3f92	6bad90c6
-37652435753827922121470370984740152789920e234	78f1667a	c9e75d61
-999999999999999996790597280027956716285163e-42	3ff00000	0
-9483973038658180570348795755328802873667739881500874740826641664593613312413122937394311083577538394191754403820631172036846773125424639263833553383990195662207006139342261292777056851379062046720e0	68a03d69	82f2f936
-20209005503919489280000000000000000000000000000000000000000e-40	43bc0bae	57e880e6
diff --git a/lib/libc/gdtoa/test/x.ou0 b/lib/libc/gdtoa/test/x.ou0
deleted file mode 100644
index 6421bc7a1..000000000
--- a/lib/libc/gdtoa/test/x.ou0
+++ /dev/null
@@ -1,1182 +0,0 @@
-
-Input: 1.23
-
-strtox consumes 4 bytes and returns 33
-with bits = #3fff 9d70 a3d7 a3d 70a4
-g_xfmt(0) gives 4 bytes: "1.23"
-
-strtoIx returns 33, consuming 4 bytes.
-fI[0] = #3fff 9d70 a3d7 a3d 70a3
-fI[1] = #3fff 9d70 a3d7 a3d 70a4
-fI[1] == strtox
-
-
-Input: 1.23e+20
-
-strtox consumes 8 bytes and returns 1
-with bits = #4041 d55e f90a 2da1 8000
-g_xfmt(0) gives 8 bytes: "1.23e+20"
-
-strtoIx returns 1, consuming 8 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: 1.23e-20
-
-strtox consumes 8 bytes and returns 17
-with bits = #3fbc e857 267b b3a9 84f2
-g_xfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIx returns 17, consuming 8 bytes.
-fI[0] = #3fbc e857 267b b3a9 84f2
-fI[1] = #3fbc e857 267b b3a9 84f3
-fI[0] == strtox
-
-
-Input: 1.23456789
-
-strtox consumes 10 bytes and returns 33
-with bits = #3fff 9e06 5214 1ef0 dbf6
-g_xfmt(0) gives 10 bytes: "1.23456789"
-
-strtoIx returns 33, consuming 10 bytes.
-fI[0] = #3fff 9e06 5214 1ef0 dbf5
-fI[1] = #3fff 9e06 5214 1ef0 dbf6
-fI[1] == strtox
-
-
-Input: 1.23456589e+20
-
-strtox consumes 14 bytes and returns 1
-with bits = #4041 d629 bd33 5cc ba00
-g_xfmt(0) gives 14 bytes: "1.23456589e+20"
-
-strtoIx returns 1, consuming 14 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: 1.23e+30
-
-strtox consumes 8 bytes and returns 17
-with bits = #4062 f865 8274 7dbc 824a
-g_xfmt(0) gives 8 bytes: "1.23e+30"
-
-strtoIx returns 17, consuming 8 bytes.
-fI[0] = #4062 f865 8274 7dbc 824a
-fI[1] = #4062 f865 8274 7dbc 824b
-fI[0] == strtox
-
-
-Input: 1.23e-30
-
-strtox consumes 8 bytes and returns 17
-with bits = #3f9b c794 337a 8085 54eb
-g_xfmt(0) gives 8 bytes: "1.23e-30"
-
-strtoIx returns 17, consuming 8 bytes.
-fI[0] = #3f9b c794 337a 8085 54eb
-fI[1] = #3f9b c794 337a 8085 54ec
-fI[0] == strtox
-
-
-Input: 1.23456789e-20
-
-strtox consumes 14 bytes and returns 17
-with bits = #3fbc e934 a38 f3d6 d352
-g_xfmt(0) gives 14 bytes: "1.23456789e-20"
-
-strtoIx returns 17, consuming 14 bytes.
-fI[0] = #3fbc e934 a38 f3d6 d352
-fI[1] = #3fbc e934 a38 f3d6 d353
-fI[0] == strtox
-
-
-Input: 1.23456789e-30
-
-strtox consumes 14 bytes and returns 17
-with bits = #3f9b c851 f19d decc a8fc
-g_xfmt(0) gives 14 bytes: "1.23456789e-30"
-
-strtoIx returns 17, consuming 14 bytes.
-fI[0] = #3f9b c851 f19d decc a8fc
-fI[1] = #3f9b c851 f19d decc a8fd
-fI[0] == strtox
-
-
-Input: 1.234567890123456789
-
-strtox consumes 20 bytes and returns 17
-with bits = #3fff 9e06 5214 62cf db8d
-g_xfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIx returns 17, consuming 20 bytes.
-fI[0] = #3fff 9e06 5214 62cf db8d
-fI[1] = #3fff 9e06 5214 62cf db8e
-fI[0] == strtox
-
-
-Input: 1.23456789012345678901234567890123456789
-
-strtox consumes 40 bytes and returns 17
-with bits = #3fff 9e06 5214 62cf db8d
-g_xfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIx returns 17, consuming 40 bytes.
-fI[0] = #3fff 9e06 5214 62cf db8d
-fI[1] = #3fff 9e06 5214 62cf db8e
-fI[0] == strtox
-
-
-Input: 1.23e306
-
-strtox consumes 8 bytes and returns 17
-with bits = #43f7 e033 b668 e30f a6d5
-g_xfmt(0) gives 9 bytes: "1.23e+306"
-
-strtoIx returns 17, consuming 8 bytes.
-fI[0] = #43f7 e033 b668 e30f a6d5
-fI[1] = #43f7 e033 b668 e30f a6d6
-fI[0] == strtox
-
-
-Input: 1.23e-306
-
-strtox consumes 9 bytes and returns 33
-with bits = #3c06 dd1d c2ed 1cb7 3f25
-g_xfmt(0) gives 9 bytes: "1.23e-306"
-
-strtoIx returns 33, consuming 9 bytes.
-fI[0] = #3c06 dd1d c2ed 1cb7 3f24
-fI[1] = #3c06 dd1d c2ed 1cb7 3f25
-fI[1] == strtox
-
-
-Input: 1.23e-320
-
-strtox consumes 9 bytes and returns 33
-with bits = #3bd8 9b98 c371 844c 3f1a
-g_xfmt(0) gives 9 bytes: "1.23e-320"
-
-strtoIx returns 33, consuming 9 bytes.
-fI[0] = #3bd8 9b98 c371 844c 3f19
-fI[1] = #3bd8 9b98 c371 844c 3f1a
-fI[1] == strtox
-
-
-Input: 1.23e-20
-
-strtox consumes 8 bytes and returns 17
-with bits = #3fbc e857 267b b3a9 84f2
-g_xfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIx returns 17, consuming 8 bytes.
-fI[0] = #3fbc e857 267b b3a9 84f2
-fI[1] = #3fbc e857 267b b3a9 84f3
-fI[0] == strtox
-
-
-Input: 1.23456789e307
-
-strtox consumes 14 bytes and returns 17
-with bits = #43fb 8ca5 8a5e d766 de75
-g_xfmt(0) gives 15 bytes: "1.23456789e+307"
-
-strtoIx returns 17, consuming 14 bytes.
-fI[0] = #43fb 8ca5 8a5e d766 de75
-fI[1] = #43fb 8ca5 8a5e d766 de76
-fI[0] == strtox
-
-
-Input: 1.23456589e-307
-
-strtox consumes 15 bytes and returns 17
-with bits = #3c03 b18c b5dc c22f d369
-g_xfmt(0) gives 15 bytes: "1.23456589e-307"
-
-strtoIx returns 17, consuming 15 bytes.
-fI[0] = #3c03 b18c b5dc c22f d369
-fI[1] = #3c03 b18c b5dc c22f d36a
-fI[0] == strtox
-
-
-Input: 1.234567890123456789
-
-strtox consumes 20 bytes and returns 17
-with bits = #3fff 9e06 5214 62cf db8d
-g_xfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIx returns 17, consuming 20 bytes.
-fI[0] = #3fff 9e06 5214 62cf db8d
-fI[1] = #3fff 9e06 5214 62cf db8e
-fI[0] == strtox
-
-
-Input: 1.234567890123456789e301
-
-strtox consumes 24 bytes and returns 33
-with bits = #43e7 937a 8baf ab20 980c
-g_xfmt(0) gives 25 bytes: "1.234567890123456789e+301"
-
-strtoIx returns 33, consuming 24 bytes.
-fI[0] = #43e7 937a 8baf ab20 980b
-fI[1] = #43e7 937a 8baf ab20 980c
-fI[1] == strtox
-
-
-Input: 1.234567890123456789e-301
-
-strtox consumes 25 bytes and returns 33
-with bits = #3c17 a953 271a 5d06 9ad9
-g_xfmt(0) gives 25 bytes: "1.234567890123456789e-301"
-
-strtoIx returns 33, consuming 25 bytes.
-fI[0] = #3c17 a953 271a 5d06 9ad8
-fI[1] = #3c17 a953 271a 5d06 9ad9
-fI[1] == strtox
-
-
-Input: 1.234567890123456789e-321
-
-strtox consumes 25 bytes and returns 33
-with bits = #3bd4 f9e1 1b4c ea6d cce9
-g_xfmt(0) gives 25 bytes: "1.234567890123456789e-321"
-
-strtoIx returns 33, consuming 25 bytes.
-fI[0] = #3bd4 f9e1 1b4c ea6d cce8
-fI[1] = #3bd4 f9e1 1b4c ea6d cce9
-fI[1] == strtox
-
-
-Input: 1e23
-
-strtox consumes 4 bytes and returns 1
-with bits = #404b a968 163f a57 b400
-g_xfmt(0) gives 5 bytes: "1e+23"
-
-strtoIx returns 1, consuming 4 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: 1e310
-
-strtox consumes 5 bytes and returns 33
-with bits = #4404 de81 e40a 34b cf50
-g_xfmt(0) gives 6 bytes: "1e+310"
-
-strtoIx returns 33, consuming 5 bytes.
-fI[0] = #4404 de81 e40a 34b cf4f
-fI[1] = #4404 de81 e40a 34b cf50
-fI[1] == strtox
-
-
-Input: 9.0259718793241475e-277
-
-strtox consumes 23 bytes and returns 33
-with bits = #3c69 ffff ffff ffff fcf7
-g_xfmt(0) gives 23 bytes: "9.0259718793241475e-277"
-
-strtoIx returns 33, consuming 23 bytes.
-fI[0] = #3c69 ffff ffff ffff fcf6
-fI[1] = #3c69 ffff ffff ffff fcf7
-fI[1] == strtox
-
-
-Input: 9.025971879324147880346310405869e-277
-
-strtox consumes 37 bytes and returns 17
-with bits = #3c6a 8000 0 0 0
-g_xfmt(0) gives 26 bytes: "9.0259718793241478803e-277"
-
-strtoIx returns 17, consuming 37 bytes.
-fI[0] = #3c6a 8000 0 0 0
-fI[1] = #3c6a 8000 0 0 1
-fI[0] == strtox
-
-
-Input: 9.025971879324147880346310405868e-277
-
-strtox consumes 37 bytes and returns 33
-with bits = #3c6a 8000 0 0 0
-g_xfmt(0) gives 26 bytes: "9.0259718793241478803e-277"
-
-strtoIx returns 33, consuming 37 bytes.
-fI[0] = #3c69 ffff ffff ffff ffff
-fI[1] = #3c6a 8000 0 0 0
-fI[1] == strtox
-
-
-Input: 2.2250738585072014e-308
-
-strtox consumes 23 bytes and returns 17
-with bits = #3c01 8000 0 0 46
-g_xfmt(0) gives 23 bytes: "2.2250738585072014e-308"
-
-strtoIx returns 17, consuming 23 bytes.
-fI[0] = #3c01 8000 0 0 46
-fI[1] = #3c01 8000 0 0 47
-fI[0] == strtox
-
-
-Input: 2.2250738585072013e-308
-
-strtox consumes 23 bytes and returns 17
-with bits = #3c00 ffff ffff ffff fd4f
-g_xfmt(0) gives 23 bytes: "2.2250738585072013e-308"
-
-strtoIx returns 17, consuming 23 bytes.
-fI[0] = #3c00 ffff ffff ffff fd4f
-fI[1] = #3c00 ffff ffff ffff fd50
-fI[0] == strtox
-
-Rounding mode for strtor... changed from 1 (nearest) to 0 (toward zero)
-
-Input: 1.1
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff 8ccc cccc cccc cccc
-g_xfmt(0) gives 21 bytes: "1.0999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 8ccc cccc cccc cccc
-fI[1] = #3fff 8ccc cccc cccc cccd
-fI[0] == strtox
-
-
-Input: -1.1
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff 8ccc cccc cccc cccc
-g_xfmt(0) gives 22 bytes: "-1.0999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 8ccc cccc cccc cccd
-fI[1] = #bfff 8ccc cccc cccc cccc
-fI[1] == strtox
-
-
-Input: 1.2
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff 9999 9999 9999 9999
-g_xfmt(0) gives 21 bytes: "1.1999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 9999 9999 9999 9999
-fI[1] = #3fff 9999 9999 9999 999a
-fI[0] == strtox
-
-
-Input: -1.2
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff 9999 9999 9999 9999
-g_xfmt(0) gives 22 bytes: "-1.1999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 9999 9999 9999 999a
-fI[1] = #bfff 9999 9999 9999 9999
-fI[1] == strtox
-
-
-Input: 1.3
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff a666 6666 6666 6666
-g_xfmt(0) gives 3 bytes: "1.3"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff a666 6666 6666 6666
-fI[1] = #3fff a666 6666 6666 6667
-fI[0] == strtox
-
-
-Input: -1.3
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff a666 6666 6666 6666
-g_xfmt(0) gives 4 bytes: "-1.3"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff a666 6666 6666 6667
-fI[1] = #bfff a666 6666 6666 6666
-fI[1] == strtox
-
-
-Input: 1.4
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff b333 3333 3333 3333
-g_xfmt(0) gives 3 bytes: "1.4"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff b333 3333 3333 3333
-fI[1] = #3fff b333 3333 3333 3334
-fI[0] == strtox
-
-
-Input: -1.4
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff b333 3333 3333 3333
-g_xfmt(0) gives 4 bytes: "-1.4"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff b333 3333 3333 3334
-fI[1] = #bfff b333 3333 3333 3333
-fI[1] == strtox
-
-
-Input: 1.5
-
-strtox consumes 3 bytes and returns 1
-with bits = #3fff c000 0 0 0
-g_xfmt(0) gives 3 bytes: "1.5"
-
-strtoIx returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: -1.5
-
-strtox consumes 4 bytes and returns 9
-with bits = #bfff c000 0 0 0
-g_xfmt(0) gives 4 bytes: "-1.5"
-
-strtoIx returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: 1.6
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff cccc cccc cccc cccc
-g_xfmt(0) gives 21 bytes: "1.5999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff cccc cccc cccc cccc
-fI[1] = #3fff cccc cccc cccc cccd
-fI[0] == strtox
-
-
-Input: -1.6
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff cccc cccc cccc cccc
-g_xfmt(0) gives 22 bytes: "-1.5999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff cccc cccc cccc cccd
-fI[1] = #bfff cccc cccc cccc cccc
-fI[1] == strtox
-
-
-Input: 1.7
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff d999 9999 9999 9999
-g_xfmt(0) gives 21 bytes: "1.6999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff d999 9999 9999 9999
-fI[1] = #3fff d999 9999 9999 999a
-fI[0] == strtox
-
-
-Input: -1.7
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff d999 9999 9999 9999
-g_xfmt(0) gives 22 bytes: "-1.6999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff d999 9999 9999 999a
-fI[1] = #bfff d999 9999 9999 9999
-fI[1] == strtox
-
-
-Input: 1.8
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff e666 6666 6666 6666
-g_xfmt(0) gives 3 bytes: "1.8"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff e666 6666 6666 6666
-fI[1] = #3fff e666 6666 6666 6667
-fI[0] == strtox
-
-
-Input: -1.8
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff e666 6666 6666 6666
-g_xfmt(0) gives 4 bytes: "-1.8"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff e666 6666 6666 6667
-fI[1] = #bfff e666 6666 6666 6666
-fI[1] == strtox
-
-
-Input: 1.9
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff f333 3333 3333 3333
-g_xfmt(0) gives 3 bytes: "1.9"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff f333 3333 3333 3333
-fI[1] = #3fff f333 3333 3333 3334
-fI[0] == strtox
-
-
-Input: -1.9
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff f333 3333 3333 3333
-g_xfmt(0) gives 4 bytes: "-1.9"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff f333 3333 3333 3334
-fI[1] = #bfff f333 3333 3333 3333
-fI[1] == strtox
-
-Rounding mode for strtor... changed from 0 (toward zero) to 1 (nearest)
-
-Input: 1.1
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff 8ccc cccc cccc cccd
-g_xfmt(0) gives 3 bytes: "1.1"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 8ccc cccc cccc cccc
-fI[1] = #3fff 8ccc cccc cccc cccd
-fI[1] == strtox
-
-
-Input: -1.1
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff 8ccc cccc cccc cccd
-g_xfmt(0) gives 4 bytes: "-1.1"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 8ccc cccc cccc cccd
-fI[1] = #bfff 8ccc cccc cccc cccc
-fI[0] == strtox
-
-
-Input: 1.2
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff 9999 9999 9999 999a
-g_xfmt(0) gives 3 bytes: "1.2"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 9999 9999 9999 9999
-fI[1] = #3fff 9999 9999 9999 999a
-fI[1] == strtox
-
-
-Input: -1.2
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff 9999 9999 9999 999a
-g_xfmt(0) gives 4 bytes: "-1.2"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 9999 9999 9999 999a
-fI[1] = #bfff 9999 9999 9999 9999
-fI[0] == strtox
-
-
-Input: 1.3
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff a666 6666 6666 6666
-g_xfmt(0) gives 3 bytes: "1.3"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff a666 6666 6666 6666
-fI[1] = #3fff a666 6666 6666 6667
-fI[0] == strtox
-
-
-Input: -1.3
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff a666 6666 6666 6666
-g_xfmt(0) gives 4 bytes: "-1.3"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff a666 6666 6666 6667
-fI[1] = #bfff a666 6666 6666 6666
-fI[1] == strtox
-
-
-Input: 1.4
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff b333 3333 3333 3333
-g_xfmt(0) gives 3 bytes: "1.4"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff b333 3333 3333 3333
-fI[1] = #3fff b333 3333 3333 3334
-fI[0] == strtox
-
-
-Input: -1.4
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff b333 3333 3333 3333
-g_xfmt(0) gives 4 bytes: "-1.4"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff b333 3333 3333 3334
-fI[1] = #bfff b333 3333 3333 3333
-fI[1] == strtox
-
-
-Input: 1.5
-
-strtox consumes 3 bytes and returns 1
-with bits = #3fff c000 0 0 0
-g_xfmt(0) gives 3 bytes: "1.5"
-
-strtoIx returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: -1.5
-
-strtox consumes 4 bytes and returns 9
-with bits = #bfff c000 0 0 0
-g_xfmt(0) gives 4 bytes: "-1.5"
-
-strtoIx returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: 1.6
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff cccc cccc cccc cccd
-g_xfmt(0) gives 3 bytes: "1.6"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff cccc cccc cccc cccc
-fI[1] = #3fff cccc cccc cccc cccd
-fI[1] == strtox
-
-
-Input: -1.6
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff cccc cccc cccc cccd
-g_xfmt(0) gives 4 bytes: "-1.6"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff cccc cccc cccc cccd
-fI[1] = #bfff cccc cccc cccc cccc
-fI[0] == strtox
-
-
-Input: 1.7
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff d999 9999 9999 999a
-g_xfmt(0) gives 3 bytes: "1.7"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff d999 9999 9999 9999
-fI[1] = #3fff d999 9999 9999 999a
-fI[1] == strtox
-
-
-Input: -1.7
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff d999 9999 9999 999a
-g_xfmt(0) gives 4 bytes: "-1.7"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff d999 9999 9999 999a
-fI[1] = #bfff d999 9999 9999 9999
-fI[0] == strtox
-
-
-Input: 1.8
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff e666 6666 6666 6666
-g_xfmt(0) gives 3 bytes: "1.8"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff e666 6666 6666 6666
-fI[1] = #3fff e666 6666 6666 6667
-fI[0] == strtox
-
-
-Input: -1.8
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff e666 6666 6666 6666
-g_xfmt(0) gives 4 bytes: "-1.8"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff e666 6666 6666 6667
-fI[1] = #bfff e666 6666 6666 6666
-fI[1] == strtox
-
-
-Input: 1.9
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff f333 3333 3333 3333
-g_xfmt(0) gives 3 bytes: "1.9"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff f333 3333 3333 3333
-fI[1] = #3fff f333 3333 3333 3334
-fI[0] == strtox
-
-
-Input: -1.9
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff f333 3333 3333 3333
-g_xfmt(0) gives 4 bytes: "-1.9"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff f333 3333 3333 3334
-fI[1] = #bfff f333 3333 3333 3333
-fI[1] == strtox
-
-Rounding mode for strtor... changed from 1 (nearest) to 2 (toward +Infinity)
-
-Input: 1.1
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff 8ccc cccc cccc cccd
-g_xfmt(0) gives 3 bytes: "1.1"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 8ccc cccc cccc cccc
-fI[1] = #3fff 8ccc cccc cccc cccd
-fI[1] == strtox
-
-
-Input: -1.1
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff 8ccc cccc cccc cccc
-g_xfmt(0) gives 22 bytes: "-1.0999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 8ccc cccc cccc cccd
-fI[1] = #bfff 8ccc cccc cccc cccc
-fI[1] == strtox
-
-
-Input: 1.2
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff 9999 9999 9999 999a
-g_xfmt(0) gives 3 bytes: "1.2"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 9999 9999 9999 9999
-fI[1] = #3fff 9999 9999 9999 999a
-fI[1] == strtox
-
-
-Input: -1.2
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff 9999 9999 9999 9999
-g_xfmt(0) gives 22 bytes: "-1.1999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 9999 9999 9999 999a
-fI[1] = #bfff 9999 9999 9999 9999
-fI[1] == strtox
-
-
-Input: 1.3
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff a666 6666 6666 6667
-g_xfmt(0) gives 21 bytes: "1.3000000000000000001"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff a666 6666 6666 6666
-fI[1] = #3fff a666 6666 6666 6667
-fI[1] == strtox
-
-
-Input: -1.3
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff a666 6666 6666 6666
-g_xfmt(0) gives 4 bytes: "-1.3"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff a666 6666 6666 6667
-fI[1] = #bfff a666 6666 6666 6666
-fI[1] == strtox
-
-
-Input: 1.4
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff b333 3333 3333 3334
-g_xfmt(0) gives 21 bytes: "1.4000000000000000001"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff b333 3333 3333 3333
-fI[1] = #3fff b333 3333 3333 3334
-fI[1] == strtox
-
-
-Input: -1.4
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff b333 3333 3333 3333
-g_xfmt(0) gives 4 bytes: "-1.4"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff b333 3333 3333 3334
-fI[1] = #bfff b333 3333 3333 3333
-fI[1] == strtox
-
-
-Input: 1.5
-
-strtox consumes 3 bytes and returns 1
-with bits = #3fff c000 0 0 0
-g_xfmt(0) gives 3 bytes: "1.5"
-
-strtoIx returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: -1.5
-
-strtox consumes 4 bytes and returns 9
-with bits = #bfff c000 0 0 0
-g_xfmt(0) gives 4 bytes: "-1.5"
-
-strtoIx returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: 1.6
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff cccc cccc cccc cccd
-g_xfmt(0) gives 3 bytes: "1.6"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff cccc cccc cccc cccc
-fI[1] = #3fff cccc cccc cccc cccd
-fI[1] == strtox
-
-
-Input: -1.6
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff cccc cccc cccc cccc
-g_xfmt(0) gives 22 bytes: "-1.5999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff cccc cccc cccc cccd
-fI[1] = #bfff cccc cccc cccc cccc
-fI[1] == strtox
-
-
-Input: 1.7
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff d999 9999 9999 999a
-g_xfmt(0) gives 3 bytes: "1.7"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff d999 9999 9999 9999
-fI[1] = #3fff d999 9999 9999 999a
-fI[1] == strtox
-
-
-Input: -1.7
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff d999 9999 9999 9999
-g_xfmt(0) gives 22 bytes: "-1.6999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff d999 9999 9999 999a
-fI[1] = #bfff d999 9999 9999 9999
-fI[1] == strtox
-
-
-Input: 1.8
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff e666 6666 6666 6667
-g_xfmt(0) gives 21 bytes: "1.8000000000000000001"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff e666 6666 6666 6666
-fI[1] = #3fff e666 6666 6666 6667
-fI[1] == strtox
-
-
-Input: -1.8
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff e666 6666 6666 6666
-g_xfmt(0) gives 4 bytes: "-1.8"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff e666 6666 6666 6667
-fI[1] = #bfff e666 6666 6666 6666
-fI[1] == strtox
-
-
-Input: 1.9
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff f333 3333 3333 3334
-g_xfmt(0) gives 21 bytes: "1.9000000000000000001"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff f333 3333 3333 3333
-fI[1] = #3fff f333 3333 3333 3334
-fI[1] == strtox
-
-
-Input: -1.9
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff f333 3333 3333 3333
-g_xfmt(0) gives 4 bytes: "-1.9"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff f333 3333 3333 3334
-fI[1] = #bfff f333 3333 3333 3333
-fI[1] == strtox
-
-Rounding mode for strtor... changed from 2 (toward +Infinity) to 3 (toward -Infinity)
-
-Input: 1.1
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff 8ccc cccc cccc cccc
-g_xfmt(0) gives 21 bytes: "1.0999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 8ccc cccc cccc cccc
-fI[1] = #3fff 8ccc cccc cccc cccd
-fI[0] == strtox
-
-
-Input: -1.1
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff 8ccc cccc cccc cccd
-g_xfmt(0) gives 4 bytes: "-1.1"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 8ccc cccc cccc cccd
-fI[1] = #bfff 8ccc cccc cccc cccc
-fI[0] == strtox
-
-
-Input: 1.2
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff 9999 9999 9999 9999
-g_xfmt(0) gives 21 bytes: "1.1999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 9999 9999 9999 9999
-fI[1] = #3fff 9999 9999 9999 999a
-fI[0] == strtox
-
-
-Input: -1.2
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff 9999 9999 9999 999a
-g_xfmt(0) gives 4 bytes: "-1.2"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 9999 9999 9999 999a
-fI[1] = #bfff 9999 9999 9999 9999
-fI[0] == strtox
-
-
-Input: 1.3
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff a666 6666 6666 6666
-g_xfmt(0) gives 3 bytes: "1.3"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff a666 6666 6666 6666
-fI[1] = #3fff a666 6666 6666 6667
-fI[0] == strtox
-
-
-Input: -1.3
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff a666 6666 6666 6667
-g_xfmt(0) gives 22 bytes: "-1.3000000000000000001"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff a666 6666 6666 6667
-fI[1] = #bfff a666 6666 6666 6666
-fI[0] == strtox
-
-
-Input: 1.4
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff b333 3333 3333 3333
-g_xfmt(0) gives 3 bytes: "1.4"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff b333 3333 3333 3333
-fI[1] = #3fff b333 3333 3333 3334
-fI[0] == strtox
-
-
-Input: -1.4
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff b333 3333 3333 3334
-g_xfmt(0) gives 22 bytes: "-1.4000000000000000001"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff b333 3333 3333 3334
-fI[1] = #bfff b333 3333 3333 3333
-fI[0] == strtox
-
-
-Input: 1.5
-
-strtox consumes 3 bytes and returns 1
-with bits = #3fff c000 0 0 0
-g_xfmt(0) gives 3 bytes: "1.5"
-
-strtoIx returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: -1.5
-
-strtox consumes 4 bytes and returns 9
-with bits = #bfff c000 0 0 0
-g_xfmt(0) gives 4 bytes: "-1.5"
-
-strtoIx returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: 1.6
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff cccc cccc cccc cccc
-g_xfmt(0) gives 21 bytes: "1.5999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff cccc cccc cccc cccc
-fI[1] = #3fff cccc cccc cccc cccd
-fI[0] == strtox
-
-
-Input: -1.6
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff cccc cccc cccc cccd
-g_xfmt(0) gives 4 bytes: "-1.6"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff cccc cccc cccc cccd
-fI[1] = #bfff cccc cccc cccc cccc
-fI[0] == strtox
-
-
-Input: 1.7
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff d999 9999 9999 9999
-g_xfmt(0) gives 21 bytes: "1.6999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff d999 9999 9999 9999
-fI[1] = #3fff d999 9999 9999 999a
-fI[0] == strtox
-
-
-Input: -1.7
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff d999 9999 9999 999a
-g_xfmt(0) gives 4 bytes: "-1.7"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff d999 9999 9999 999a
-fI[1] = #bfff d999 9999 9999 9999
-fI[0] == strtox
-
-
-Input: 1.8
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff e666 6666 6666 6666
-g_xfmt(0) gives 3 bytes: "1.8"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff e666 6666 6666 6666
-fI[1] = #3fff e666 6666 6666 6667
-fI[0] == strtox
-
-
-Input: -1.8
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff e666 6666 6666 6667
-g_xfmt(0) gives 22 bytes: "-1.8000000000000000001"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff e666 6666 6666 6667
-fI[1] = #bfff e666 6666 6666 6666
-fI[0] == strtox
-
-
-Input: 1.9
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff f333 3333 3333 3333
-g_xfmt(0) gives 3 bytes: "1.9"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff f333 3333 3333 3333
-fI[1] = #3fff f333 3333 3333 3334
-fI[0] == strtox
-
-
-Input: -1.9
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff f333 3333 3333 3334
-g_xfmt(0) gives 22 bytes: "-1.9000000000000000001"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff f333 3333 3333 3334
-fI[1] = #bfff f333 3333 3333 3333
-fI[0] == strtox
-
diff --git a/lib/libc/gdtoa/test/x.ou1 b/lib/libc/gdtoa/test/x.ou1
deleted file mode 100644
index 437783f71..000000000
--- a/lib/libc/gdtoa/test/x.ou1
+++ /dev/null
@@ -1,1460 +0,0 @@
-
-Input: 1.23
-
-strtox consumes 4 bytes and returns 33
-with bits = #3fff 9d70 a3d7 a3d 70a4
-printf("%.21Lg") gives 1.23000000000000000002
-g_xfmt(0) gives 4 bytes: "1.23"
-
-strtoIx returns 33, consuming 4 bytes.
-fI[0] = #3fff 9d70 a3d7 a3d 70a3
-= 1.22999999999999999991
-fI[1] = #3fff 9d70 a3d7 a3d 70a4
-= 1.23000000000000000002
-fI[1] == strtox
-
-
-Input: 1.23e+20
-
-strtox consumes 8 bytes and returns 1
-with bits = #4041 d55e f90a 2da1 8000
-printf("%.21Lg") gives 123000000000000000000
-g_xfmt(0) gives 8 bytes: "1.23e+20"
-
-strtoIx returns 1, consuming 8 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: 1.23e-20
-
-strtox consumes 8 bytes and returns 17
-with bits = #3fbc e857 267b b3a9 84f2
-printf("%.21Lg") gives 1.22999999999999999997e-20
-g_xfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIx returns 17, consuming 8 bytes.
-fI[0] = #3fbc e857 267b b3a9 84f2
-= 1.22999999999999999997e-20
-fI[1] = #3fbc e857 267b b3a9 84f3
-= 1.23000000000000000004e-20
-fI[0] == strtox
-
-
-Input: 1.23456789
-
-strtox consumes 10 bytes and returns 33
-with bits = #3fff 9e06 5214 1ef0 dbf6
-printf("%.21Lg") gives 1.23456789000000000003
-g_xfmt(0) gives 10 bytes: "1.23456789"
-
-strtoIx returns 33, consuming 10 bytes.
-fI[0] = #3fff 9e06 5214 1ef0 dbf5
-= 1.23456788999999999992
-fI[1] = #3fff 9e06 5214 1ef0 dbf6
-= 1.23456789000000000003
-fI[1] == strtox
-
-
-Input: 1.23456589e+20
-
-strtox consumes 14 bytes and returns 1
-with bits = #4041 d629 bd33 5cc ba00
-printf("%.21Lg") gives 123456589000000000000
-g_xfmt(0) gives 14 bytes: "1.23456589e+20"
-
-strtoIx returns 1, consuming 14 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: 1.23e+30
-
-strtox consumes 8 bytes and returns 17
-with bits = #4062 f865 8274 7dbc 824a
-printf("%.21Lg") gives 1.22999999999999999999e+30
-g_xfmt(0) gives 8 bytes: "1.23e+30"
-
-strtoIx returns 17, consuming 8 bytes.
-fI[0] = #4062 f865 8274 7dbc 824a
-= 1.22999999999999999999e+30
-fI[1] = #4062 f865 8274 7dbc 824b
-= 1.23000000000000000006e+30
-fI[0] == strtox
-
-
-Input: 1.23e-30
-
-strtox consumes 8 bytes and returns 17
-with bits = #3f9b c794 337a 8085 54eb
-printf("%.21Lg") gives 1.22999999999999999999e-30
-g_xfmt(0) gives 8 bytes: "1.23e-30"
-
-strtoIx returns 17, consuming 8 bytes.
-fI[0] = #3f9b c794 337a 8085 54eb
-= 1.22999999999999999999e-30
-fI[1] = #3f9b c794 337a 8085 54ec
-= 1.23000000000000000007e-30
-fI[0] == strtox
-
-
-Input: 1.23456789e-20
-
-strtox consumes 14 bytes and returns 17
-with bits = #3fbc e934 a38 f3d6 d352
-printf("%.21Lg") gives 1.23456788999999999998e-20
-g_xfmt(0) gives 14 bytes: "1.23456789e-20"
-
-strtoIx returns 17, consuming 14 bytes.
-fI[0] = #3fbc e934 a38 f3d6 d352
-= 1.23456788999999999998e-20
-fI[1] = #3fbc e934 a38 f3d6 d353
-= 1.23456789000000000005e-20
-fI[0] == strtox
-
-
-Input: 1.23456789e-30
-
-strtox consumes 14 bytes and returns 17
-with bits = #3f9b c851 f19d decc a8fc
-printf("%.21Lg") gives 1.23456788999999999999e-30
-g_xfmt(0) gives 14 bytes: "1.23456789e-30"
-
-strtoIx returns 17, consuming 14 bytes.
-fI[0] = #3f9b c851 f19d decc a8fc
-= 1.23456788999999999999e-30
-fI[1] = #3f9b c851 f19d decc a8fd
-= 1.23456789000000000007e-30
-fI[0] == strtox
-
-
-Input: 1.234567890123456789
-
-strtox consumes 20 bytes and returns 17
-with bits = #3fff 9e06 5214 62cf db8d
-printf("%.21Lg") gives 1.23456789012345678899
-g_xfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIx returns 17, consuming 20 bytes.
-fI[0] = #3fff 9e06 5214 62cf db8d
-= 1.23456789012345678899
-fI[1] = #3fff 9e06 5214 62cf db8e
-= 1.23456789012345678909
-fI[0] == strtox
-
-
-Input: 1.23456789012345678901234567890123456789
-
-strtox consumes 40 bytes and returns 17
-with bits = #3fff 9e06 5214 62cf db8d
-printf("%.21Lg") gives 1.23456789012345678899
-g_xfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIx returns 17, consuming 40 bytes.
-fI[0] = #3fff 9e06 5214 62cf db8d
-= 1.23456789012345678899
-fI[1] = #3fff 9e06 5214 62cf db8e
-= 1.23456789012345678909
-fI[0] == strtox
-
-
-Input: 1.23e306
-
-strtox consumes 8 bytes and returns 17
-with bits = #43f7 e033 b668 e30f a6d5
-printf("%.21Lg") gives 1.22999999999999999997e+306
-g_xfmt(0) gives 9 bytes: "1.23e+306"
-
-strtoIx returns 17, consuming 8 bytes.
-fI[0] = #43f7 e033 b668 e30f a6d5
-= 1.22999999999999999997e+306
-fI[1] = #43f7 e033 b668 e30f a6d6
-= 1.23000000000000000005e+306
-fI[0] == strtox
-
-
-Input: 1.23e-306
-
-strtox consumes 9 bytes and returns 33
-with bits = #3c06 dd1d c2ed 1cb7 3f25
-printf("%.21Lg") gives 1.23000000000000000002e-306
-g_xfmt(0) gives 9 bytes: "1.23e-306"
-
-strtoIx returns 33, consuming 9 bytes.
-fI[0] = #3c06 dd1d c2ed 1cb7 3f24
-= 1.22999999999999999995e-306
-fI[1] = #3c06 dd1d c2ed 1cb7 3f25
-= 1.23000000000000000002e-306
-fI[1] == strtox
-
-
-Input: 1.23e-320
-
-strtox consumes 9 bytes and returns 33
-with bits = #3bd8 9b98 c371 844c 3f1a
-printf("%.21Lg") gives 1.23000000000000000002e-320
-g_xfmt(0) gives 9 bytes: "1.23e-320"
-
-strtoIx returns 33, consuming 9 bytes.
-fI[0] = #3bd8 9b98 c371 844c 3f19
-= 1.22999999999999999991e-320
-fI[1] = #3bd8 9b98 c371 844c 3f1a
-= 1.23000000000000000002e-320
-fI[1] == strtox
-
-
-Input: 1.23e-20
-
-strtox consumes 8 bytes and returns 17
-with bits = #3fbc e857 267b b3a9 84f2
-printf("%.21Lg") gives 1.22999999999999999997e-20
-g_xfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIx returns 17, consuming 8 bytes.
-fI[0] = #3fbc e857 267b b3a9 84f2
-= 1.22999999999999999997e-20
-fI[1] = #3fbc e857 267b b3a9 84f3
-= 1.23000000000000000004e-20
-fI[0] == strtox
-
-
-Input: 1.23456789e307
-
-strtox consumes 14 bytes and returns 17
-with bits = #43fb 8ca5 8a5e d766 de75
-printf("%.21Lg") gives 1.23456788999999999998e+307
-g_xfmt(0) gives 15 bytes: "1.23456789e+307"
-
-strtoIx returns 17, consuming 14 bytes.
-fI[0] = #43fb 8ca5 8a5e d766 de75
-= 1.23456788999999999998e+307
-fI[1] = #43fb 8ca5 8a5e d766 de76
-= 1.23456789000000000011e+307
-fI[0] == strtox
-
-
-Input: 1.23456589e-307
-
-strtox consumes 15 bytes and returns 17
-with bits = #3c03 b18c b5dc c22f d369
-printf("%.21Lg") gives 1.23456588999999999999e-307
-g_xfmt(0) gives 15 bytes: "1.23456589e-307"
-
-strtoIx returns 17, consuming 15 bytes.
-fI[0] = #3c03 b18c b5dc c22f d369
-= 1.23456588999999999999e-307
-fI[1] = #3c03 b18c b5dc c22f d36a
-= 1.23456589000000000009e-307
-fI[0] == strtox
-
-
-Input: 1.234567890123456789
-
-strtox consumes 20 bytes and returns 17
-with bits = #3fff 9e06 5214 62cf db8d
-printf("%.21Lg") gives 1.23456789012345678899
-g_xfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIx returns 17, consuming 20 bytes.
-fI[0] = #3fff 9e06 5214 62cf db8d
-= 1.23456789012345678899
-fI[1] = #3fff 9e06 5214 62cf db8e
-= 1.23456789012345678909
-fI[0] == strtox
-
-
-Input: 1.234567890123456789e301
-
-strtox consumes 24 bytes and returns 33
-with bits = #43e7 937a 8baf ab20 980c
-printf("%.21Lg") gives 1.234567890123456789e+301
-g_xfmt(0) gives 25 bytes: "1.234567890123456789e+301"
-
-strtoIx returns 33, consuming 24 bytes.
-fI[0] = #43e7 937a 8baf ab20 980b
-= 1.23456789012345678889e+301
-fI[1] = #43e7 937a 8baf ab20 980c
-= 1.234567890123456789e+301
-fI[1] == strtox
-
-
-Input: 1.234567890123456789e-301
-
-strtox consumes 25 bytes and returns 33
-with bits = #3c17 a953 271a 5d06 9ad9
-printf("%.21Lg") gives 1.23456789012345678902e-301
-g_xfmt(0) gives 25 bytes: "1.234567890123456789e-301"
-
-strtoIx returns 33, consuming 25 bytes.
-fI[0] = #3c17 a953 271a 5d06 9ad8
-= 1.23456789012345678892e-301
-fI[1] = #3c17 a953 271a 5d06 9ad9
-= 1.23456789012345678902e-301
-fI[1] == strtox
-
-
-Input: 1.234567890123456789e-321
-
-strtox consumes 25 bytes and returns 33
-with bits = #3bd4 f9e1 1b4c ea6d cce9
-printf("%.21Lg") gives 1.234567890123456789e-321
-g_xfmt(0) gives 25 bytes: "1.234567890123456789e-321"
-
-strtoIx returns 33, consuming 25 bytes.
-fI[0] = #3bd4 f9e1 1b4c ea6d cce8
-= 1.23456789012345678893e-321
-fI[1] = #3bd4 f9e1 1b4c ea6d cce9
-= 1.234567890123456789e-321
-fI[1] == strtox
-
-
-Input: 1e23
-
-strtox consumes 4 bytes and returns 1
-with bits = #404b a968 163f a57 b400
-printf("%.21Lg") gives 1e+23
-g_xfmt(0) gives 5 bytes: "1e+23"
-
-strtoIx returns 1, consuming 4 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: 1e310
-
-strtox consumes 5 bytes and returns 33
-with bits = #4404 de81 e40a 34b cf50
-printf("%.21Lg") gives 1e+310
-g_xfmt(0) gives 6 bytes: "1e+310"
-
-strtoIx returns 33, consuming 5 bytes.
-fI[0] = #4404 de81 e40a 34b cf4f
-= 9.9999999999999999994e+309
-fI[1] = #4404 de81 e40a 34b cf50
-= 1e+310
-fI[1] == strtox
-
-
-Input: 9.0259718793241475e-277
-
-strtox consumes 23 bytes and returns 33
-with bits = #3c69 ffff ffff ffff fcf7
-printf("%.21Lg") gives 9.02597187932414750016e-277
-g_xfmt(0) gives 23 bytes: "9.0259718793241475e-277"
-
-strtoIx returns 33, consuming 23 bytes.
-fI[0] = #3c69 ffff ffff ffff fcf6
-= 9.02597187932414749967e-277
-fI[1] = #3c69 ffff ffff ffff fcf7
-= 9.02597187932414750016e-277
-fI[1] == strtox
-
-
-Input: 9.025971879324147880346310405869e-277
-
-strtox consumes 37 bytes and returns 17
-with bits = #3c6a 8000 0 0 0
-printf("%.21Lg") gives 9.02597187932414788035e-277
-g_xfmt(0) gives 26 bytes: "9.0259718793241478803e-277"
-
-strtoIx returns 17, consuming 37 bytes.
-fI[0] = #3c6a 8000 0 0 0
-= 9.02597187932414788035e-277
-fI[1] = #3c6a 8000 0 0 1
-= 9.02597187932414788132e-277
-fI[0] == strtox
-
-
-Input: 9.025971879324147880346310405868e-277
-
-strtox consumes 37 bytes and returns 33
-with bits = #3c6a 8000 0 0 0
-printf("%.21Lg") gives 9.02597187932414788035e-277
-g_xfmt(0) gives 26 bytes: "9.0259718793241478803e-277"
-
-strtoIx returns 33, consuming 37 bytes.
-fI[0] = #3c69 ffff ffff ffff ffff
-= 9.02597187932414787986e-277
-fI[1] = #3c6a 8000 0 0 0
-= 9.02597187932414788035e-277
-fI[1] == strtox
-
-
-Input: 2.2250738585072014e-308
-
-strtox consumes 23 bytes and returns 17
-with bits = #3c01 8000 0 0 46
-printf("%.21Lg") gives 2.22507385850720139998e-308
-g_xfmt(0) gives 23 bytes: "2.2250738585072014e-308"
-
-strtoIx returns 17, consuming 23 bytes.
-fI[0] = #3c01 8000 0 0 46
-= 2.22507385850720139998e-308
-fI[1] = #3c01 8000 0 0 47
-= 2.22507385850720140022e-308
-fI[0] == strtox
-
-
-Input: 2.2250738585072013e-308
-
-strtox consumes 23 bytes and returns 17
-with bits = #3c00 ffff ffff ffff fd4f
-printf("%.21Lg") gives 2.22507385850720129998e-308
-g_xfmt(0) gives 23 bytes: "2.2250738585072013e-308"
-
-strtoIx returns 17, consuming 23 bytes.
-fI[0] = #3c00 ffff ffff ffff fd4f
-= 2.22507385850720129998e-308
-fI[1] = #3c00 ffff ffff ffff fd50
-= 2.2250738585072013001e-308
-fI[0] == strtox
-
-Rounding mode for strtor... changed from 1 (nearest) to 0 (toward zero)
-
-Input: 1.1
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff 8ccc cccc cccc cccc
-printf("%.21Lg") gives 1.09999999999999999991
-g_xfmt(0) gives 21 bytes: "1.0999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 8ccc cccc cccc cccc
-= 1.09999999999999999991
-fI[1] = #3fff 8ccc cccc cccc cccd
-= 1.10000000000000000002
-fI[0] == strtox
-
-
-Input: -1.1
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff 8ccc cccc cccc cccc
-printf("%.21Lg") gives -1.09999999999999999991
-g_xfmt(0) gives 22 bytes: "-1.0999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 8ccc cccc cccc cccd
-= -1.10000000000000000002
-fI[1] = #bfff 8ccc cccc cccc cccc
-= -1.09999999999999999991
-fI[1] == strtox
-
-
-Input: 1.2
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff 9999 9999 9999 9999
-printf("%.21Lg") gives 1.19999999999999999993
-g_xfmt(0) gives 21 bytes: "1.1999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 9999 9999 9999 9999
-= 1.19999999999999999993
-fI[1] = #3fff 9999 9999 9999 999a
-= 1.20000000000000000004
-fI[0] == strtox
-
-
-Input: -1.2
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff 9999 9999 9999 9999
-printf("%.21Lg") gives -1.19999999999999999993
-g_xfmt(0) gives 22 bytes: "-1.1999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 9999 9999 9999 999a
-= -1.20000000000000000004
-fI[1] = #bfff 9999 9999 9999 9999
-= -1.19999999999999999993
-fI[1] == strtox
-
-
-Input: 1.3
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff a666 6666 6666 6666
-printf("%.21Lg") gives 1.29999999999999999996
-g_xfmt(0) gives 3 bytes: "1.3"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff a666 6666 6666 6666
-= 1.29999999999999999996
-fI[1] = #3fff a666 6666 6666 6667
-= 1.30000000000000000007
-fI[0] == strtox
-
-
-Input: -1.3
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff a666 6666 6666 6666
-printf("%.21Lg") gives -1.29999999999999999996
-g_xfmt(0) gives 4 bytes: "-1.3"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff a666 6666 6666 6667
-= -1.30000000000000000007
-fI[1] = #bfff a666 6666 6666 6666
-= -1.29999999999999999996
-fI[1] == strtox
-
-
-Input: 1.4
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff b333 3333 3333 3333
-printf("%.21Lg") gives 1.39999999999999999998
-g_xfmt(0) gives 3 bytes: "1.4"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff b333 3333 3333 3333
-= 1.39999999999999999998
-fI[1] = #3fff b333 3333 3333 3334
-= 1.40000000000000000009
-fI[0] == strtox
-
-
-Input: -1.4
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff b333 3333 3333 3333
-printf("%.21Lg") gives -1.39999999999999999998
-g_xfmt(0) gives 4 bytes: "-1.4"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff b333 3333 3333 3334
-= -1.40000000000000000009
-fI[1] = #bfff b333 3333 3333 3333
-= -1.39999999999999999998
-fI[1] == strtox
-
-
-Input: 1.5
-
-strtox consumes 3 bytes and returns 1
-with bits = #3fff c000 0 0 0
-printf("%.21Lg") gives 1.5
-g_xfmt(0) gives 3 bytes: "1.5"
-
-strtoIx returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: -1.5
-
-strtox consumes 4 bytes and returns 9
-with bits = #bfff c000 0 0 0
-printf("%.21Lg") gives -1.5
-g_xfmt(0) gives 4 bytes: "-1.5"
-
-strtoIx returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: 1.6
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff cccc cccc cccc cccc
-printf("%.21Lg") gives 1.59999999999999999991
-g_xfmt(0) gives 21 bytes: "1.5999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff cccc cccc cccc cccc
-= 1.59999999999999999991
-fI[1] = #3fff cccc cccc cccc cccd
-= 1.60000000000000000002
-fI[0] == strtox
-
-
-Input: -1.6
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff cccc cccc cccc cccc
-printf("%.21Lg") gives -1.59999999999999999991
-g_xfmt(0) gives 22 bytes: "-1.5999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff cccc cccc cccc cccd
-= -1.60000000000000000002
-fI[1] = #bfff cccc cccc cccc cccc
-= -1.59999999999999999991
-fI[1] == strtox
-
-
-Input: 1.7
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff d999 9999 9999 9999
-printf("%.21Lg") gives 1.69999999999999999993
-g_xfmt(0) gives 21 bytes: "1.6999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff d999 9999 9999 9999
-= 1.69999999999999999993
-fI[1] = #3fff d999 9999 9999 999a
-= 1.70000000000000000004
-fI[0] == strtox
-
-
-Input: -1.7
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff d999 9999 9999 9999
-printf("%.21Lg") gives -1.69999999999999999993
-g_xfmt(0) gives 22 bytes: "-1.6999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff d999 9999 9999 999a
-= -1.70000000000000000004
-fI[1] = #bfff d999 9999 9999 9999
-= -1.69999999999999999993
-fI[1] == strtox
-
-
-Input: 1.8
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff e666 6666 6666 6666
-printf("%.21Lg") gives 1.79999999999999999996
-g_xfmt(0) gives 3 bytes: "1.8"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff e666 6666 6666 6666
-= 1.79999999999999999996
-fI[1] = #3fff e666 6666 6666 6667
-= 1.80000000000000000007
-fI[0] == strtox
-
-
-Input: -1.8
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff e666 6666 6666 6666
-printf("%.21Lg") gives -1.79999999999999999996
-g_xfmt(0) gives 4 bytes: "-1.8"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff e666 6666 6666 6667
-= -1.80000000000000000007
-fI[1] = #bfff e666 6666 6666 6666
-= -1.79999999999999999996
-fI[1] == strtox
-
-
-Input: 1.9
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff f333 3333 3333 3333
-printf("%.21Lg") gives 1.89999999999999999998
-g_xfmt(0) gives 3 bytes: "1.9"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff f333 3333 3333 3333
-= 1.89999999999999999998
-fI[1] = #3fff f333 3333 3333 3334
-= 1.90000000000000000009
-fI[0] == strtox
-
-
-Input: -1.9
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff f333 3333 3333 3333
-printf("%.21Lg") gives -1.89999999999999999998
-g_xfmt(0) gives 4 bytes: "-1.9"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff f333 3333 3333 3334
-= -1.90000000000000000009
-fI[1] = #bfff f333 3333 3333 3333
-= -1.89999999999999999998
-fI[1] == strtox
-
-Rounding mode for strtor... changed from 0 (toward zero) to 1 (nearest)
-
-Input: 1.1
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff 8ccc cccc cccc cccd
-printf("%.21Lg") gives 1.10000000000000000002
-g_xfmt(0) gives 3 bytes: "1.1"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 8ccc cccc cccc cccc
-= 1.09999999999999999991
-fI[1] = #3fff 8ccc cccc cccc cccd
-= 1.10000000000000000002
-fI[1] == strtox
-
-
-Input: -1.1
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff 8ccc cccc cccc cccd
-printf("%.21Lg") gives -1.10000000000000000002
-g_xfmt(0) gives 4 bytes: "-1.1"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 8ccc cccc cccc cccd
-= -1.10000000000000000002
-fI[1] = #bfff 8ccc cccc cccc cccc
-= -1.09999999999999999991
-fI[0] == strtox
-
-
-Input: 1.2
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff 9999 9999 9999 999a
-printf("%.21Lg") gives 1.20000000000000000004
-g_xfmt(0) gives 3 bytes: "1.2"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 9999 9999 9999 9999
-= 1.19999999999999999993
-fI[1] = #3fff 9999 9999 9999 999a
-= 1.20000000000000000004
-fI[1] == strtox
-
-
-Input: -1.2
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff 9999 9999 9999 999a
-printf("%.21Lg") gives -1.20000000000000000004
-g_xfmt(0) gives 4 bytes: "-1.2"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 9999 9999 9999 999a
-= -1.20000000000000000004
-fI[1] = #bfff 9999 9999 9999 9999
-= -1.19999999999999999993
-fI[0] == strtox
-
-
-Input: 1.3
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff a666 6666 6666 6666
-printf("%.21Lg") gives 1.29999999999999999996
-g_xfmt(0) gives 3 bytes: "1.3"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff a666 6666 6666 6666
-= 1.29999999999999999996
-fI[1] = #3fff a666 6666 6666 6667
-= 1.30000000000000000007
-fI[0] == strtox
-
-
-Input: -1.3
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff a666 6666 6666 6666
-printf("%.21Lg") gives -1.29999999999999999996
-g_xfmt(0) gives 4 bytes: "-1.3"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff a666 6666 6666 6667
-= -1.30000000000000000007
-fI[1] = #bfff a666 6666 6666 6666
-= -1.29999999999999999996
-fI[1] == strtox
-
-
-Input: 1.4
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff b333 3333 3333 3333
-printf("%.21Lg") gives 1.39999999999999999998
-g_xfmt(0) gives 3 bytes: "1.4"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff b333 3333 3333 3333
-= 1.39999999999999999998
-fI[1] = #3fff b333 3333 3333 3334
-= 1.40000000000000000009
-fI[0] == strtox
-
-
-Input: -1.4
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff b333 3333 3333 3333
-printf("%.21Lg") gives -1.39999999999999999998
-g_xfmt(0) gives 4 bytes: "-1.4"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff b333 3333 3333 3334
-= -1.40000000000000000009
-fI[1] = #bfff b333 3333 3333 3333
-= -1.39999999999999999998
-fI[1] == strtox
-
-
-Input: 1.5
-
-strtox consumes 3 bytes and returns 1
-with bits = #3fff c000 0 0 0
-printf("%.21Lg") gives 1.5
-g_xfmt(0) gives 3 bytes: "1.5"
-
-strtoIx returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: -1.5
-
-strtox consumes 4 bytes and returns 9
-with bits = #bfff c000 0 0 0
-printf("%.21Lg") gives -1.5
-g_xfmt(0) gives 4 bytes: "-1.5"
-
-strtoIx returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: 1.6
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff cccc cccc cccc cccd
-printf("%.21Lg") gives 1.60000000000000000002
-g_xfmt(0) gives 3 bytes: "1.6"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff cccc cccc cccc cccc
-= 1.59999999999999999991
-fI[1] = #3fff cccc cccc cccc cccd
-= 1.60000000000000000002
-fI[1] == strtox
-
-
-Input: -1.6
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff cccc cccc cccc cccd
-printf("%.21Lg") gives -1.60000000000000000002
-g_xfmt(0) gives 4 bytes: "-1.6"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff cccc cccc cccc cccd
-= -1.60000000000000000002
-fI[1] = #bfff cccc cccc cccc cccc
-= -1.59999999999999999991
-fI[0] == strtox
-
-
-Input: 1.7
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff d999 9999 9999 999a
-printf("%.21Lg") gives 1.70000000000000000004
-g_xfmt(0) gives 3 bytes: "1.7"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff d999 9999 9999 9999
-= 1.69999999999999999993
-fI[1] = #3fff d999 9999 9999 999a
-= 1.70000000000000000004
-fI[1] == strtox
-
-
-Input: -1.7
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff d999 9999 9999 999a
-printf("%.21Lg") gives -1.70000000000000000004
-g_xfmt(0) gives 4 bytes: "-1.7"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff d999 9999 9999 999a
-= -1.70000000000000000004
-fI[1] = #bfff d999 9999 9999 9999
-= -1.69999999999999999993
-fI[0] == strtox
-
-
-Input: 1.8
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff e666 6666 6666 6666
-printf("%.21Lg") gives 1.79999999999999999996
-g_xfmt(0) gives 3 bytes: "1.8"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff e666 6666 6666 6666
-= 1.79999999999999999996
-fI[1] = #3fff e666 6666 6666 6667
-= 1.80000000000000000007
-fI[0] == strtox
-
-
-Input: -1.8
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff e666 6666 6666 6666
-printf("%.21Lg") gives -1.79999999999999999996
-g_xfmt(0) gives 4 bytes: "-1.8"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff e666 6666 6666 6667
-= -1.80000000000000000007
-fI[1] = #bfff e666 6666 6666 6666
-= -1.79999999999999999996
-fI[1] == strtox
-
-
-Input: 1.9
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff f333 3333 3333 3333
-printf("%.21Lg") gives 1.89999999999999999998
-g_xfmt(0) gives 3 bytes: "1.9"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff f333 3333 3333 3333
-= 1.89999999999999999998
-fI[1] = #3fff f333 3333 3333 3334
-= 1.90000000000000000009
-fI[0] == strtox
-
-
-Input: -1.9
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff f333 3333 3333 3333
-printf("%.21Lg") gives -1.89999999999999999998
-g_xfmt(0) gives 4 bytes: "-1.9"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff f333 3333 3333 3334
-= -1.90000000000000000009
-fI[1] = #bfff f333 3333 3333 3333
-= -1.89999999999999999998
-fI[1] == strtox
-
-Rounding mode for strtor... changed from 1 (nearest) to 2 (toward +Infinity)
-
-Input: 1.1
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff 8ccc cccc cccc cccd
-printf("%.21Lg") gives 1.10000000000000000002
-g_xfmt(0) gives 3 bytes: "1.1"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 8ccc cccc cccc cccc
-= 1.09999999999999999991
-fI[1] = #3fff 8ccc cccc cccc cccd
-= 1.10000000000000000002
-fI[1] == strtox
-
-
-Input: -1.1
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff 8ccc cccc cccc cccc
-printf("%.21Lg") gives -1.09999999999999999991
-g_xfmt(0) gives 22 bytes: "-1.0999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 8ccc cccc cccc cccd
-= -1.10000000000000000002
-fI[1] = #bfff 8ccc cccc cccc cccc
-= -1.09999999999999999991
-fI[1] == strtox
-
-
-Input: 1.2
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff 9999 9999 9999 999a
-printf("%.21Lg") gives 1.20000000000000000004
-g_xfmt(0) gives 3 bytes: "1.2"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 9999 9999 9999 9999
-= 1.19999999999999999993
-fI[1] = #3fff 9999 9999 9999 999a
-= 1.20000000000000000004
-fI[1] == strtox
-
-
-Input: -1.2
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff 9999 9999 9999 9999
-printf("%.21Lg") gives -1.19999999999999999993
-g_xfmt(0) gives 22 bytes: "-1.1999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 9999 9999 9999 999a
-= -1.20000000000000000004
-fI[1] = #bfff 9999 9999 9999 9999
-= -1.19999999999999999993
-fI[1] == strtox
-
-
-Input: 1.3
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff a666 6666 6666 6667
-printf("%.21Lg") gives 1.30000000000000000007
-g_xfmt(0) gives 21 bytes: "1.3000000000000000001"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff a666 6666 6666 6666
-= 1.29999999999999999996
-fI[1] = #3fff a666 6666 6666 6667
-= 1.30000000000000000007
-fI[1] == strtox
-
-
-Input: -1.3
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff a666 6666 6666 6666
-printf("%.21Lg") gives -1.29999999999999999996
-g_xfmt(0) gives 4 bytes: "-1.3"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff a666 6666 6666 6667
-= -1.30000000000000000007
-fI[1] = #bfff a666 6666 6666 6666
-= -1.29999999999999999996
-fI[1] == strtox
-
-
-Input: 1.4
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff b333 3333 3333 3334
-printf("%.21Lg") gives 1.40000000000000000009
-g_xfmt(0) gives 21 bytes: "1.4000000000000000001"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff b333 3333 3333 3333
-= 1.39999999999999999998
-fI[1] = #3fff b333 3333 3333 3334
-= 1.40000000000000000009
-fI[1] == strtox
-
-
-Input: -1.4
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff b333 3333 3333 3333
-printf("%.21Lg") gives -1.39999999999999999998
-g_xfmt(0) gives 4 bytes: "-1.4"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff b333 3333 3333 3334
-= -1.40000000000000000009
-fI[1] = #bfff b333 3333 3333 3333
-= -1.39999999999999999998
-fI[1] == strtox
-
-
-Input: 1.5
-
-strtox consumes 3 bytes and returns 1
-with bits = #3fff c000 0 0 0
-printf("%.21Lg") gives 1.5
-g_xfmt(0) gives 3 bytes: "1.5"
-
-strtoIx returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: -1.5
-
-strtox consumes 4 bytes and returns 9
-with bits = #bfff c000 0 0 0
-printf("%.21Lg") gives -1.5
-g_xfmt(0) gives 4 bytes: "-1.5"
-
-strtoIx returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: 1.6
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff cccc cccc cccc cccd
-printf("%.21Lg") gives 1.60000000000000000002
-g_xfmt(0) gives 3 bytes: "1.6"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff cccc cccc cccc cccc
-= 1.59999999999999999991
-fI[1] = #3fff cccc cccc cccc cccd
-= 1.60000000000000000002
-fI[1] == strtox
-
-
-Input: -1.6
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff cccc cccc cccc cccc
-printf("%.21Lg") gives -1.59999999999999999991
-g_xfmt(0) gives 22 bytes: "-1.5999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff cccc cccc cccc cccd
-= -1.60000000000000000002
-fI[1] = #bfff cccc cccc cccc cccc
-= -1.59999999999999999991
-fI[1] == strtox
-
-
-Input: 1.7
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff d999 9999 9999 999a
-printf("%.21Lg") gives 1.70000000000000000004
-g_xfmt(0) gives 3 bytes: "1.7"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff d999 9999 9999 9999
-= 1.69999999999999999993
-fI[1] = #3fff d999 9999 9999 999a
-= 1.70000000000000000004
-fI[1] == strtox
-
-
-Input: -1.7
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff d999 9999 9999 9999
-printf("%.21Lg") gives -1.69999999999999999993
-g_xfmt(0) gives 22 bytes: "-1.6999999999999999999"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff d999 9999 9999 999a
-= -1.70000000000000000004
-fI[1] = #bfff d999 9999 9999 9999
-= -1.69999999999999999993
-fI[1] == strtox
-
-
-Input: 1.8
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff e666 6666 6666 6667
-printf("%.21Lg") gives 1.80000000000000000007
-g_xfmt(0) gives 21 bytes: "1.8000000000000000001"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff e666 6666 6666 6666
-= 1.79999999999999999996
-fI[1] = #3fff e666 6666 6666 6667
-= 1.80000000000000000007
-fI[1] == strtox
-
-
-Input: -1.8
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff e666 6666 6666 6666
-printf("%.21Lg") gives -1.79999999999999999996
-g_xfmt(0) gives 4 bytes: "-1.8"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff e666 6666 6666 6667
-= -1.80000000000000000007
-fI[1] = #bfff e666 6666 6666 6666
-= -1.79999999999999999996
-fI[1] == strtox
-
-
-Input: 1.9
-
-strtox consumes 3 bytes and returns 33
-with bits = #3fff f333 3333 3333 3334
-printf("%.21Lg") gives 1.90000000000000000009
-g_xfmt(0) gives 21 bytes: "1.9000000000000000001"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff f333 3333 3333 3333
-= 1.89999999999999999998
-fI[1] = #3fff f333 3333 3333 3334
-= 1.90000000000000000009
-fI[1] == strtox
-
-
-Input: -1.9
-
-strtox consumes 4 bytes and returns 25
-with bits = #bfff f333 3333 3333 3333
-printf("%.21Lg") gives -1.89999999999999999998
-g_xfmt(0) gives 4 bytes: "-1.9"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff f333 3333 3333 3334
-= -1.90000000000000000009
-fI[1] = #bfff f333 3333 3333 3333
-= -1.89999999999999999998
-fI[1] == strtox
-
-Rounding mode for strtor... changed from 2 (toward +Infinity) to 3 (toward -Infinity)
-
-Input: 1.1
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff 8ccc cccc cccc cccc
-printf("%.21Lg") gives 1.09999999999999999991
-g_xfmt(0) gives 21 bytes: "1.0999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 8ccc cccc cccc cccc
-= 1.09999999999999999991
-fI[1] = #3fff 8ccc cccc cccc cccd
-= 1.10000000000000000002
-fI[0] == strtox
-
-
-Input: -1.1
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff 8ccc cccc cccc cccd
-printf("%.21Lg") gives -1.10000000000000000002
-g_xfmt(0) gives 4 bytes: "-1.1"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 8ccc cccc cccc cccd
-= -1.10000000000000000002
-fI[1] = #bfff 8ccc cccc cccc cccc
-= -1.09999999999999999991
-fI[0] == strtox
-
-
-Input: 1.2
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff 9999 9999 9999 9999
-printf("%.21Lg") gives 1.19999999999999999993
-g_xfmt(0) gives 21 bytes: "1.1999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff 9999 9999 9999 9999
-= 1.19999999999999999993
-fI[1] = #3fff 9999 9999 9999 999a
-= 1.20000000000000000004
-fI[0] == strtox
-
-
-Input: -1.2
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff 9999 9999 9999 999a
-printf("%.21Lg") gives -1.20000000000000000004
-g_xfmt(0) gives 4 bytes: "-1.2"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff 9999 9999 9999 999a
-= -1.20000000000000000004
-fI[1] = #bfff 9999 9999 9999 9999
-= -1.19999999999999999993
-fI[0] == strtox
-
-
-Input: 1.3
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff a666 6666 6666 6666
-printf("%.21Lg") gives 1.29999999999999999996
-g_xfmt(0) gives 3 bytes: "1.3"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff a666 6666 6666 6666
-= 1.29999999999999999996
-fI[1] = #3fff a666 6666 6666 6667
-= 1.30000000000000000007
-fI[0] == strtox
-
-
-Input: -1.3
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff a666 6666 6666 6667
-printf("%.21Lg") gives -1.30000000000000000007
-g_xfmt(0) gives 22 bytes: "-1.3000000000000000001"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff a666 6666 6666 6667
-= -1.30000000000000000007
-fI[1] = #bfff a666 6666 6666 6666
-= -1.29999999999999999996
-fI[0] == strtox
-
-
-Input: 1.4
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff b333 3333 3333 3333
-printf("%.21Lg") gives 1.39999999999999999998
-g_xfmt(0) gives 3 bytes: "1.4"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff b333 3333 3333 3333
-= 1.39999999999999999998
-fI[1] = #3fff b333 3333 3333 3334
-= 1.40000000000000000009
-fI[0] == strtox
-
-
-Input: -1.4
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff b333 3333 3333 3334
-printf("%.21Lg") gives -1.40000000000000000009
-g_xfmt(0) gives 22 bytes: "-1.4000000000000000001"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff b333 3333 3333 3334
-= -1.40000000000000000009
-fI[1] = #bfff b333 3333 3333 3333
-= -1.39999999999999999998
-fI[0] == strtox
-
-
-Input: 1.5
-
-strtox consumes 3 bytes and returns 1
-with bits = #3fff c000 0 0 0
-printf("%.21Lg") gives 1.5
-g_xfmt(0) gives 3 bytes: "1.5"
-
-strtoIx returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: -1.5
-
-strtox consumes 4 bytes and returns 9
-with bits = #bfff c000 0 0 0
-printf("%.21Lg") gives -1.5
-g_xfmt(0) gives 4 bytes: "-1.5"
-
-strtoIx returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtox
-
-
-Input: 1.6
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff cccc cccc cccc cccc
-printf("%.21Lg") gives 1.59999999999999999991
-g_xfmt(0) gives 21 bytes: "1.5999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff cccc cccc cccc cccc
-= 1.59999999999999999991
-fI[1] = #3fff cccc cccc cccc cccd
-= 1.60000000000000000002
-fI[0] == strtox
-
-
-Input: -1.6
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff cccc cccc cccc cccd
-printf("%.21Lg") gives -1.60000000000000000002
-g_xfmt(0) gives 4 bytes: "-1.6"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff cccc cccc cccc cccd
-= -1.60000000000000000002
-fI[1] = #bfff cccc cccc cccc cccc
-= -1.59999999999999999991
-fI[0] == strtox
-
-
-Input: 1.7
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff d999 9999 9999 9999
-printf("%.21Lg") gives 1.69999999999999999993
-g_xfmt(0) gives 21 bytes: "1.6999999999999999999"
-
-strtoIx returns 33, consuming 3 bytes.
-fI[0] = #3fff d999 9999 9999 9999
-= 1.69999999999999999993
-fI[1] = #3fff d999 9999 9999 999a
-= 1.70000000000000000004
-fI[0] == strtox
-
-
-Input: -1.7
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff d999 9999 9999 999a
-printf("%.21Lg") gives -1.70000000000000000004
-g_xfmt(0) gives 4 bytes: "-1.7"
-
-strtoIx returns 41, consuming 4 bytes.
-fI[0] = #bfff d999 9999 9999 999a
-= -1.70000000000000000004
-fI[1] = #bfff d999 9999 9999 9999
-= -1.69999999999999999993
-fI[0] == strtox
-
-
-Input: 1.8
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff e666 6666 6666 6666
-printf("%.21Lg") gives 1.79999999999999999996
-g_xfmt(0) gives 3 bytes: "1.8"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff e666 6666 6666 6666
-= 1.79999999999999999996
-fI[1] = #3fff e666 6666 6666 6667
-= 1.80000000000000000007
-fI[0] == strtox
-
-
-Input: -1.8
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff e666 6666 6666 6667
-printf("%.21Lg") gives -1.80000000000000000007
-g_xfmt(0) gives 22 bytes: "-1.8000000000000000001"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff e666 6666 6666 6667
-= -1.80000000000000000007
-fI[1] = #bfff e666 6666 6666 6666
-= -1.79999999999999999996
-fI[0] == strtox
-
-
-Input: 1.9
-
-strtox consumes 3 bytes and returns 17
-with bits = #3fff f333 3333 3333 3333
-printf("%.21Lg") gives 1.89999999999999999998
-g_xfmt(0) gives 3 bytes: "1.9"
-
-strtoIx returns 17, consuming 3 bytes.
-fI[0] = #3fff f333 3333 3333 3333
-= 1.89999999999999999998
-fI[1] = #3fff f333 3333 3333 3334
-= 1.90000000000000000009
-fI[0] == strtox
-
-
-Input: -1.9
-
-strtox consumes 4 bytes and returns 41
-with bits = #bfff f333 3333 3333 3334
-printf("%.21Lg") gives -1.90000000000000000009
-g_xfmt(0) gives 22 bytes: "-1.9000000000000000001"
-
-strtoIx returns 25, consuming 4 bytes.
-fI[0] = #bfff f333 3333 3333 3334
-= -1.90000000000000000009
-fI[1] = #bfff f333 3333 3333 3333
-= -1.89999999999999999998
-fI[0] == strtox
-
diff --git a/lib/libc/gdtoa/test/xL.ou0 b/lib/libc/gdtoa/test/xL.ou0
deleted file mode 100644
index dc75f9113..000000000
--- a/lib/libc/gdtoa/test/xL.ou0
+++ /dev/null
@@ -1,1182 +0,0 @@
-
-Input: 1.23
-
-strtoxL consumes 4 bytes and returns 33
-with bits = #3fff0000 9d70a3d7 a3d70a4
-g_xLfmt(0) gives 4 bytes: "1.23"
-
-strtoIxL returns 33, consuming 4 bytes.
-fI[0] = #3fff0000 9d70a3d7 a3d70a3
-fI[1] = #3fff0000 9d70a3d7 a3d70a4
-fI[1] == strtoxL
-
-
-Input: 1.23e+20
-
-strtoxL consumes 8 bytes and returns 1
-with bits = #40410000 d55ef90a 2da18000
-g_xLfmt(0) gives 8 bytes: "1.23e+20"
-
-strtoIxL returns 1, consuming 8 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.23e-20
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #3fbc0000 e857267b b3a984f2
-g_xLfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #3fbc0000 e857267b b3a984f2
-fI[1] = #3fbc0000 e857267b b3a984f3
-fI[0] == strtoxL
-
-
-Input: 1.23456789
-
-strtoxL consumes 10 bytes and returns 33
-with bits = #3fff0000 9e065214 1ef0dbf6
-g_xLfmt(0) gives 10 bytes: "1.23456789"
-
-strtoIxL returns 33, consuming 10 bytes.
-fI[0] = #3fff0000 9e065214 1ef0dbf5
-fI[1] = #3fff0000 9e065214 1ef0dbf6
-fI[1] == strtoxL
-
-
-Input: 1.23456589e+20
-
-strtoxL consumes 14 bytes and returns 1
-with bits = #40410000 d629bd33 5ccba00
-g_xLfmt(0) gives 14 bytes: "1.23456589e+20"
-
-strtoIxL returns 1, consuming 14 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.23e+30
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #40620000 f8658274 7dbc824a
-g_xLfmt(0) gives 8 bytes: "1.23e+30"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #40620000 f8658274 7dbc824a
-fI[1] = #40620000 f8658274 7dbc824b
-fI[0] == strtoxL
-
-
-Input: 1.23e-30
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #3f9b0000 c794337a 808554eb
-g_xLfmt(0) gives 8 bytes: "1.23e-30"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #3f9b0000 c794337a 808554eb
-fI[1] = #3f9b0000 c794337a 808554ec
-fI[0] == strtoxL
-
-
-Input: 1.23456789e-20
-
-strtoxL consumes 14 bytes and returns 17
-with bits = #3fbc0000 e9340a38 f3d6d352
-g_xLfmt(0) gives 14 bytes: "1.23456789e-20"
-
-strtoIxL returns 17, consuming 14 bytes.
-fI[0] = #3fbc0000 e9340a38 f3d6d352
-fI[1] = #3fbc0000 e9340a38 f3d6d353
-fI[0] == strtoxL
-
-
-Input: 1.23456789e-30
-
-strtoxL consumes 14 bytes and returns 17
-with bits = #3f9b0000 c851f19d decca8fc
-g_xLfmt(0) gives 14 bytes: "1.23456789e-30"
-
-strtoIxL returns 17, consuming 14 bytes.
-fI[0] = #3f9b0000 c851f19d decca8fc
-fI[1] = #3f9b0000 c851f19d decca8fd
-fI[0] == strtoxL
-
-
-Input: 1.234567890123456789
-
-strtoxL consumes 20 bytes and returns 17
-with bits = #3fff0000 9e065214 62cfdb8d
-g_xLfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIxL returns 17, consuming 20 bytes.
-fI[0] = #3fff0000 9e065214 62cfdb8d
-fI[1] = #3fff0000 9e065214 62cfdb8e
-fI[0] == strtoxL
-
-
-Input: 1.23456789012345678901234567890123456789
-
-strtoxL consumes 40 bytes and returns 17
-with bits = #3fff0000 9e065214 62cfdb8d
-g_xLfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIxL returns 17, consuming 40 bytes.
-fI[0] = #3fff0000 9e065214 62cfdb8d
-fI[1] = #3fff0000 9e065214 62cfdb8e
-fI[0] == strtoxL
-
-
-Input: 1.23e306
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #43f70000 e033b668 e30fa6d5
-g_xLfmt(0) gives 9 bytes: "1.23e+306"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #43f70000 e033b668 e30fa6d5
-fI[1] = #43f70000 e033b668 e30fa6d6
-fI[0] == strtoxL
-
-
-Input: 1.23e-306
-
-strtoxL consumes 9 bytes and returns 33
-with bits = #3c060000 dd1dc2ed 1cb73f25
-g_xLfmt(0) gives 9 bytes: "1.23e-306"
-
-strtoIxL returns 33, consuming 9 bytes.
-fI[0] = #3c060000 dd1dc2ed 1cb73f24
-fI[1] = #3c060000 dd1dc2ed 1cb73f25
-fI[1] == strtoxL
-
-
-Input: 1.23e-320
-
-strtoxL consumes 9 bytes and returns 33
-with bits = #3bd80000 9b98c371 844c3f1a
-g_xLfmt(0) gives 9 bytes: "1.23e-320"
-
-strtoIxL returns 33, consuming 9 bytes.
-fI[0] = #3bd80000 9b98c371 844c3f19
-fI[1] = #3bd80000 9b98c371 844c3f1a
-fI[1] == strtoxL
-
-
-Input: 1.23e-20
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #3fbc0000 e857267b b3a984f2
-g_xLfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #3fbc0000 e857267b b3a984f2
-fI[1] = #3fbc0000 e857267b b3a984f3
-fI[0] == strtoxL
-
-
-Input: 1.23456789e307
-
-strtoxL consumes 14 bytes and returns 17
-with bits = #43fb0000 8ca58a5e d766de75
-g_xLfmt(0) gives 15 bytes: "1.23456789e+307"
-
-strtoIxL returns 17, consuming 14 bytes.
-fI[0] = #43fb0000 8ca58a5e d766de75
-fI[1] = #43fb0000 8ca58a5e d766de76
-fI[0] == strtoxL
-
-
-Input: 1.23456589e-307
-
-strtoxL consumes 15 bytes and returns 17
-with bits = #3c030000 b18cb5dc c22fd369
-g_xLfmt(0) gives 15 bytes: "1.23456589e-307"
-
-strtoIxL returns 17, consuming 15 bytes.
-fI[0] = #3c030000 b18cb5dc c22fd369
-fI[1] = #3c030000 b18cb5dc c22fd36a
-fI[0] == strtoxL
-
-
-Input: 1.234567890123456789
-
-strtoxL consumes 20 bytes and returns 17
-with bits = #3fff0000 9e065214 62cfdb8d
-g_xLfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIxL returns 17, consuming 20 bytes.
-fI[0] = #3fff0000 9e065214 62cfdb8d
-fI[1] = #3fff0000 9e065214 62cfdb8e
-fI[0] == strtoxL
-
-
-Input: 1.234567890123456789e301
-
-strtoxL consumes 24 bytes and returns 33
-with bits = #43e70000 937a8baf ab20980c
-g_xLfmt(0) gives 25 bytes: "1.234567890123456789e+301"
-
-strtoIxL returns 33, consuming 24 bytes.
-fI[0] = #43e70000 937a8baf ab20980b
-fI[1] = #43e70000 937a8baf ab20980c
-fI[1] == strtoxL
-
-
-Input: 1.234567890123456789e-301
-
-strtoxL consumes 25 bytes and returns 33
-with bits = #3c170000 a953271a 5d069ad9
-g_xLfmt(0) gives 25 bytes: "1.234567890123456789e-301"
-
-strtoIxL returns 33, consuming 25 bytes.
-fI[0] = #3c170000 a953271a 5d069ad8
-fI[1] = #3c170000 a953271a 5d069ad9
-fI[1] == strtoxL
-
-
-Input: 1.234567890123456789e-321
-
-strtoxL consumes 25 bytes and returns 33
-with bits = #3bd40000 f9e11b4c ea6dcce9
-g_xLfmt(0) gives 25 bytes: "1.234567890123456789e-321"
-
-strtoIxL returns 33, consuming 25 bytes.
-fI[0] = #3bd40000 f9e11b4c ea6dcce8
-fI[1] = #3bd40000 f9e11b4c ea6dcce9
-fI[1] == strtoxL
-
-
-Input: 1e23
-
-strtoxL consumes 4 bytes and returns 1
-with bits = #404b0000 a968163f a57b400
-g_xLfmt(0) gives 5 bytes: "1e+23"
-
-strtoIxL returns 1, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1e310
-
-strtoxL consumes 5 bytes and returns 33
-with bits = #44040000 de81e40a 34bcf50
-g_xLfmt(0) gives 6 bytes: "1e+310"
-
-strtoIxL returns 33, consuming 5 bytes.
-fI[0] = #44040000 de81e40a 34bcf4f
-fI[1] = #44040000 de81e40a 34bcf50
-fI[1] == strtoxL
-
-
-Input: 9.0259718793241475e-277
-
-strtoxL consumes 23 bytes and returns 33
-with bits = #3c690000 ffffffff fffffcf7
-g_xLfmt(0) gives 23 bytes: "9.0259718793241475e-277"
-
-strtoIxL returns 33, consuming 23 bytes.
-fI[0] = #3c690000 ffffffff fffffcf6
-fI[1] = #3c690000 ffffffff fffffcf7
-fI[1] == strtoxL
-
-
-Input: 9.025971879324147880346310405869e-277
-
-strtoxL consumes 37 bytes and returns 17
-with bits = #3c6a0000 80000000 0
-g_xLfmt(0) gives 26 bytes: "9.0259718793241478803e-277"
-
-strtoIxL returns 17, consuming 37 bytes.
-fI[0] = #3c6a0000 80000000 0
-fI[1] = #3c6a0000 80000000 1
-fI[0] == strtoxL
-
-
-Input: 9.025971879324147880346310405868e-277
-
-strtoxL consumes 37 bytes and returns 33
-with bits = #3c6a0000 80000000 0
-g_xLfmt(0) gives 26 bytes: "9.0259718793241478803e-277"
-
-strtoIxL returns 33, consuming 37 bytes.
-fI[0] = #3c690000 ffffffff ffffffff
-fI[1] = #3c6a0000 80000000 0
-fI[1] == strtoxL
-
-
-Input: 2.2250738585072014e-308
-
-strtoxL consumes 23 bytes and returns 17
-with bits = #3c010000 80000000 46
-g_xLfmt(0) gives 23 bytes: "2.2250738585072014e-308"
-
-strtoIxL returns 17, consuming 23 bytes.
-fI[0] = #3c010000 80000000 46
-fI[1] = #3c010000 80000000 47
-fI[0] == strtoxL
-
-
-Input: 2.2250738585072013e-308
-
-strtoxL consumes 23 bytes and returns 17
-with bits = #3c000000 ffffffff fffffd4f
-g_xLfmt(0) gives 23 bytes: "2.2250738585072013e-308"
-
-strtoIxL returns 17, consuming 23 bytes.
-fI[0] = #3c000000 ffffffff fffffd4f
-fI[1] = #3c000000 ffffffff fffffd50
-fI[0] == strtoxL
-
-Rounding mode for strtor... changed from 1 (nearest) to 0 (toward zero)
-
-Input: 1.1
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 8ccccccc cccccccc
-g_xLfmt(0) gives 21 bytes: "1.0999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 8ccccccc cccccccc
-fI[1] = #3fff0000 8ccccccc cccccccd
-fI[0] == strtoxL
-
-
-Input: -1.1
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 8ccccccc cccccccc
-g_xLfmt(0) gives 22 bytes: "-1.0999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 8ccccccc cccccccd
-fI[1] = #bfff0000 8ccccccc cccccccc
-fI[1] == strtoxL
-
-
-Input: 1.2
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 99999999 99999999
-g_xLfmt(0) gives 21 bytes: "1.1999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 99999999 99999999
-fI[1] = #3fff0000 99999999 9999999a
-fI[0] == strtoxL
-
-
-Input: -1.2
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 99999999 99999999
-g_xLfmt(0) gives 22 bytes: "-1.1999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 99999999 9999999a
-fI[1] = #bfff0000 99999999 99999999
-fI[1] == strtoxL
-
-
-Input: 1.3
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 a6666666 66666666
-g_xLfmt(0) gives 3 bytes: "1.3"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 a6666666 66666666
-fI[1] = #3fff0000 a6666666 66666667
-fI[0] == strtoxL
-
-
-Input: -1.3
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 a6666666 66666666
-g_xLfmt(0) gives 4 bytes: "-1.3"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 a6666666 66666667
-fI[1] = #bfff0000 a6666666 66666666
-fI[1] == strtoxL
-
-
-Input: 1.4
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 b3333333 33333333
-g_xLfmt(0) gives 3 bytes: "1.4"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 b3333333 33333333
-fI[1] = #3fff0000 b3333333 33333334
-fI[0] == strtoxL
-
-
-Input: -1.4
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 b3333333 33333333
-g_xLfmt(0) gives 4 bytes: "-1.4"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 b3333333 33333334
-fI[1] = #bfff0000 b3333333 33333333
-fI[1] == strtoxL
-
-
-Input: 1.5
-
-strtoxL consumes 3 bytes and returns 1
-with bits = #3fff0000 c0000000 0
-g_xLfmt(0) gives 3 bytes: "1.5"
-
-strtoIxL returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: -1.5
-
-strtoxL consumes 4 bytes and returns 9
-with bits = #bfff0000 c0000000 0
-g_xLfmt(0) gives 4 bytes: "-1.5"
-
-strtoIxL returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.6
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 cccccccc cccccccc
-g_xLfmt(0) gives 21 bytes: "1.5999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 cccccccc cccccccc
-fI[1] = #3fff0000 cccccccc cccccccd
-fI[0] == strtoxL
-
-
-Input: -1.6
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 cccccccc cccccccc
-g_xLfmt(0) gives 22 bytes: "-1.5999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 cccccccc cccccccd
-fI[1] = #bfff0000 cccccccc cccccccc
-fI[1] == strtoxL
-
-
-Input: 1.7
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 d9999999 99999999
-g_xLfmt(0) gives 21 bytes: "1.6999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 d9999999 99999999
-fI[1] = #3fff0000 d9999999 9999999a
-fI[0] == strtoxL
-
-
-Input: -1.7
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 d9999999 99999999
-g_xLfmt(0) gives 22 bytes: "-1.6999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 d9999999 9999999a
-fI[1] = #bfff0000 d9999999 99999999
-fI[1] == strtoxL
-
-
-Input: 1.8
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 e6666666 66666666
-g_xLfmt(0) gives 3 bytes: "1.8"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 e6666666 66666666
-fI[1] = #3fff0000 e6666666 66666667
-fI[0] == strtoxL
-
-
-Input: -1.8
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 e6666666 66666666
-g_xLfmt(0) gives 4 bytes: "-1.8"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 e6666666 66666667
-fI[1] = #bfff0000 e6666666 66666666
-fI[1] == strtoxL
-
-
-Input: 1.9
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 f3333333 33333333
-g_xLfmt(0) gives 3 bytes: "1.9"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 f3333333 33333333
-fI[1] = #3fff0000 f3333333 33333334
-fI[0] == strtoxL
-
-
-Input: -1.9
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 f3333333 33333333
-g_xLfmt(0) gives 4 bytes: "-1.9"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 f3333333 33333334
-fI[1] = #bfff0000 f3333333 33333333
-fI[1] == strtoxL
-
-Rounding mode for strtor... changed from 0 (toward zero) to 1 (nearest)
-
-Input: 1.1
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 8ccccccc cccccccd
-g_xLfmt(0) gives 3 bytes: "1.1"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 8ccccccc cccccccc
-fI[1] = #3fff0000 8ccccccc cccccccd
-fI[1] == strtoxL
-
-
-Input: -1.1
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 8ccccccc cccccccd
-g_xLfmt(0) gives 4 bytes: "-1.1"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 8ccccccc cccccccd
-fI[1] = #bfff0000 8ccccccc cccccccc
-fI[0] == strtoxL
-
-
-Input: 1.2
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 99999999 9999999a
-g_xLfmt(0) gives 3 bytes: "1.2"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 99999999 99999999
-fI[1] = #3fff0000 99999999 9999999a
-fI[1] == strtoxL
-
-
-Input: -1.2
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 99999999 9999999a
-g_xLfmt(0) gives 4 bytes: "-1.2"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 99999999 9999999a
-fI[1] = #bfff0000 99999999 99999999
-fI[0] == strtoxL
-
-
-Input: 1.3
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 a6666666 66666666
-g_xLfmt(0) gives 3 bytes: "1.3"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 a6666666 66666666
-fI[1] = #3fff0000 a6666666 66666667
-fI[0] == strtoxL
-
-
-Input: -1.3
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 a6666666 66666666
-g_xLfmt(0) gives 4 bytes: "-1.3"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 a6666666 66666667
-fI[1] = #bfff0000 a6666666 66666666
-fI[1] == strtoxL
-
-
-Input: 1.4
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 b3333333 33333333
-g_xLfmt(0) gives 3 bytes: "1.4"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 b3333333 33333333
-fI[1] = #3fff0000 b3333333 33333334
-fI[0] == strtoxL
-
-
-Input: -1.4
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 b3333333 33333333
-g_xLfmt(0) gives 4 bytes: "-1.4"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 b3333333 33333334
-fI[1] = #bfff0000 b3333333 33333333
-fI[1] == strtoxL
-
-
-Input: 1.5
-
-strtoxL consumes 3 bytes and returns 1
-with bits = #3fff0000 c0000000 0
-g_xLfmt(0) gives 3 bytes: "1.5"
-
-strtoIxL returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: -1.5
-
-strtoxL consumes 4 bytes and returns 9
-with bits = #bfff0000 c0000000 0
-g_xLfmt(0) gives 4 bytes: "-1.5"
-
-strtoIxL returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.6
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 cccccccc cccccccd
-g_xLfmt(0) gives 3 bytes: "1.6"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 cccccccc cccccccc
-fI[1] = #3fff0000 cccccccc cccccccd
-fI[1] == strtoxL
-
-
-Input: -1.6
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 cccccccc cccccccd
-g_xLfmt(0) gives 4 bytes: "-1.6"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 cccccccc cccccccd
-fI[1] = #bfff0000 cccccccc cccccccc
-fI[0] == strtoxL
-
-
-Input: 1.7
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 d9999999 9999999a
-g_xLfmt(0) gives 3 bytes: "1.7"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 d9999999 99999999
-fI[1] = #3fff0000 d9999999 9999999a
-fI[1] == strtoxL
-
-
-Input: -1.7
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 d9999999 9999999a
-g_xLfmt(0) gives 4 bytes: "-1.7"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 d9999999 9999999a
-fI[1] = #bfff0000 d9999999 99999999
-fI[0] == strtoxL
-
-
-Input: 1.8
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 e6666666 66666666
-g_xLfmt(0) gives 3 bytes: "1.8"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 e6666666 66666666
-fI[1] = #3fff0000 e6666666 66666667
-fI[0] == strtoxL
-
-
-Input: -1.8
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 e6666666 66666666
-g_xLfmt(0) gives 4 bytes: "-1.8"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 e6666666 66666667
-fI[1] = #bfff0000 e6666666 66666666
-fI[1] == strtoxL
-
-
-Input: 1.9
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 f3333333 33333333
-g_xLfmt(0) gives 3 bytes: "1.9"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 f3333333 33333333
-fI[1] = #3fff0000 f3333333 33333334
-fI[0] == strtoxL
-
-
-Input: -1.9
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 f3333333 33333333
-g_xLfmt(0) gives 4 bytes: "-1.9"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 f3333333 33333334
-fI[1] = #bfff0000 f3333333 33333333
-fI[1] == strtoxL
-
-Rounding mode for strtor... changed from 1 (nearest) to 2 (toward +Infinity)
-
-Input: 1.1
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 8ccccccc cccccccd
-g_xLfmt(0) gives 3 bytes: "1.1"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 8ccccccc cccccccc
-fI[1] = #3fff0000 8ccccccc cccccccd
-fI[1] == strtoxL
-
-
-Input: -1.1
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 8ccccccc cccccccc
-g_xLfmt(0) gives 22 bytes: "-1.0999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 8ccccccc cccccccd
-fI[1] = #bfff0000 8ccccccc cccccccc
-fI[1] == strtoxL
-
-
-Input: 1.2
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 99999999 9999999a
-g_xLfmt(0) gives 3 bytes: "1.2"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 99999999 99999999
-fI[1] = #3fff0000 99999999 9999999a
-fI[1] == strtoxL
-
-
-Input: -1.2
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 99999999 99999999
-g_xLfmt(0) gives 22 bytes: "-1.1999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 99999999 9999999a
-fI[1] = #bfff0000 99999999 99999999
-fI[1] == strtoxL
-
-
-Input: 1.3
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 a6666666 66666667
-g_xLfmt(0) gives 21 bytes: "1.3000000000000000001"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 a6666666 66666666
-fI[1] = #3fff0000 a6666666 66666667
-fI[1] == strtoxL
-
-
-Input: -1.3
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 a6666666 66666666
-g_xLfmt(0) gives 4 bytes: "-1.3"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 a6666666 66666667
-fI[1] = #bfff0000 a6666666 66666666
-fI[1] == strtoxL
-
-
-Input: 1.4
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 b3333333 33333334
-g_xLfmt(0) gives 21 bytes: "1.4000000000000000001"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 b3333333 33333333
-fI[1] = #3fff0000 b3333333 33333334
-fI[1] == strtoxL
-
-
-Input: -1.4
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 b3333333 33333333
-g_xLfmt(0) gives 4 bytes: "-1.4"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 b3333333 33333334
-fI[1] = #bfff0000 b3333333 33333333
-fI[1] == strtoxL
-
-
-Input: 1.5
-
-strtoxL consumes 3 bytes and returns 1
-with bits = #3fff0000 c0000000 0
-g_xLfmt(0) gives 3 bytes: "1.5"
-
-strtoIxL returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: -1.5
-
-strtoxL consumes 4 bytes and returns 9
-with bits = #bfff0000 c0000000 0
-g_xLfmt(0) gives 4 bytes: "-1.5"
-
-strtoIxL returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.6
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 cccccccc cccccccd
-g_xLfmt(0) gives 3 bytes: "1.6"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 cccccccc cccccccc
-fI[1] = #3fff0000 cccccccc cccccccd
-fI[1] == strtoxL
-
-
-Input: -1.6
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 cccccccc cccccccc
-g_xLfmt(0) gives 22 bytes: "-1.5999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 cccccccc cccccccd
-fI[1] = #bfff0000 cccccccc cccccccc
-fI[1] == strtoxL
-
-
-Input: 1.7
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 d9999999 9999999a
-g_xLfmt(0) gives 3 bytes: "1.7"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 d9999999 99999999
-fI[1] = #3fff0000 d9999999 9999999a
-fI[1] == strtoxL
-
-
-Input: -1.7
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 d9999999 99999999
-g_xLfmt(0) gives 22 bytes: "-1.6999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 d9999999 9999999a
-fI[1] = #bfff0000 d9999999 99999999
-fI[1] == strtoxL
-
-
-Input: 1.8
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 e6666666 66666667
-g_xLfmt(0) gives 21 bytes: "1.8000000000000000001"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 e6666666 66666666
-fI[1] = #3fff0000 e6666666 66666667
-fI[1] == strtoxL
-
-
-Input: -1.8
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 e6666666 66666666
-g_xLfmt(0) gives 4 bytes: "-1.8"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 e6666666 66666667
-fI[1] = #bfff0000 e6666666 66666666
-fI[1] == strtoxL
-
-
-Input: 1.9
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 f3333333 33333334
-g_xLfmt(0) gives 21 bytes: "1.9000000000000000001"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 f3333333 33333333
-fI[1] = #3fff0000 f3333333 33333334
-fI[1] == strtoxL
-
-
-Input: -1.9
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 f3333333 33333333
-g_xLfmt(0) gives 4 bytes: "-1.9"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 f3333333 33333334
-fI[1] = #bfff0000 f3333333 33333333
-fI[1] == strtoxL
-
-Rounding mode for strtor... changed from 2 (toward +Infinity) to 3 (toward -Infinity)
-
-Input: 1.1
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 8ccccccc cccccccc
-g_xLfmt(0) gives 21 bytes: "1.0999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 8ccccccc cccccccc
-fI[1] = #3fff0000 8ccccccc cccccccd
-fI[0] == strtoxL
-
-
-Input: -1.1
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 8ccccccc cccccccd
-g_xLfmt(0) gives 4 bytes: "-1.1"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 8ccccccc cccccccd
-fI[1] = #bfff0000 8ccccccc cccccccc
-fI[0] == strtoxL
-
-
-Input: 1.2
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 99999999 99999999
-g_xLfmt(0) gives 21 bytes: "1.1999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 99999999 99999999
-fI[1] = #3fff0000 99999999 9999999a
-fI[0] == strtoxL
-
-
-Input: -1.2
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 99999999 9999999a
-g_xLfmt(0) gives 4 bytes: "-1.2"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 99999999 9999999a
-fI[1] = #bfff0000 99999999 99999999
-fI[0] == strtoxL
-
-
-Input: 1.3
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 a6666666 66666666
-g_xLfmt(0) gives 3 bytes: "1.3"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 a6666666 66666666
-fI[1] = #3fff0000 a6666666 66666667
-fI[0] == strtoxL
-
-
-Input: -1.3
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 a6666666 66666667
-g_xLfmt(0) gives 22 bytes: "-1.3000000000000000001"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 a6666666 66666667
-fI[1] = #bfff0000 a6666666 66666666
-fI[0] == strtoxL
-
-
-Input: 1.4
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 b3333333 33333333
-g_xLfmt(0) gives 3 bytes: "1.4"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 b3333333 33333333
-fI[1] = #3fff0000 b3333333 33333334
-fI[0] == strtoxL
-
-
-Input: -1.4
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 b3333333 33333334
-g_xLfmt(0) gives 22 bytes: "-1.4000000000000000001"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 b3333333 33333334
-fI[1] = #bfff0000 b3333333 33333333
-fI[0] == strtoxL
-
-
-Input: 1.5
-
-strtoxL consumes 3 bytes and returns 1
-with bits = #3fff0000 c0000000 0
-g_xLfmt(0) gives 3 bytes: "1.5"
-
-strtoIxL returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: -1.5
-
-strtoxL consumes 4 bytes and returns 9
-with bits = #bfff0000 c0000000 0
-g_xLfmt(0) gives 4 bytes: "-1.5"
-
-strtoIxL returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.6
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 cccccccc cccccccc
-g_xLfmt(0) gives 21 bytes: "1.5999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 cccccccc cccccccc
-fI[1] = #3fff0000 cccccccc cccccccd
-fI[0] == strtoxL
-
-
-Input: -1.6
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 cccccccc cccccccd
-g_xLfmt(0) gives 4 bytes: "-1.6"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 cccccccc cccccccd
-fI[1] = #bfff0000 cccccccc cccccccc
-fI[0] == strtoxL
-
-
-Input: 1.7
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 d9999999 99999999
-g_xLfmt(0) gives 21 bytes: "1.6999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 d9999999 99999999
-fI[1] = #3fff0000 d9999999 9999999a
-fI[0] == strtoxL
-
-
-Input: -1.7
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 d9999999 9999999a
-g_xLfmt(0) gives 4 bytes: "-1.7"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 d9999999 9999999a
-fI[1] = #bfff0000 d9999999 99999999
-fI[0] == strtoxL
-
-
-Input: 1.8
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 e6666666 66666666
-g_xLfmt(0) gives 3 bytes: "1.8"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 e6666666 66666666
-fI[1] = #3fff0000 e6666666 66666667
-fI[0] == strtoxL
-
-
-Input: -1.8
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 e6666666 66666667
-g_xLfmt(0) gives 22 bytes: "-1.8000000000000000001"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 e6666666 66666667
-fI[1] = #bfff0000 e6666666 66666666
-fI[0] == strtoxL
-
-
-Input: 1.9
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 f3333333 33333333
-g_xLfmt(0) gives 3 bytes: "1.9"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 f3333333 33333333
-fI[1] = #3fff0000 f3333333 33333334
-fI[0] == strtoxL
-
-
-Input: -1.9
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 f3333333 33333334
-g_xLfmt(0) gives 22 bytes: "-1.9000000000000000001"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 f3333333 33333334
-fI[1] = #bfff0000 f3333333 33333333
-fI[0] == strtoxL
-
diff --git a/lib/libc/gdtoa/test/xL.ou1 b/lib/libc/gdtoa/test/xL.ou1
deleted file mode 100644
index c22d0f418..000000000
--- a/lib/libc/gdtoa/test/xL.ou1
+++ /dev/null
@@ -1,1462 +0,0 @@
-***** This file is not right.  It needs to be generated on a
-***** system with a Motorla 68881 or the equivalent.
-
-Input: 1.23
-
-strtoxL consumes 4 bytes and returns 33
-with bits = #3fff0000 9d70a3d7 a3d70a4
-printf("%.21Lg") gives 7.73283722915781506499e-4933
-g_xLfmt(0) gives 4 bytes: "1.23"
-
-strtoIxL returns 33, consuming 4 bytes.
-fI[0] = #3fff0000 9d70a3d7 a3d70a3
-= 7.73283722915781506134e-4933
-fI[1] = #3fff0000 9d70a3d7 a3d70a4
-= 7.73283722915781506499e-4933
-fI[1] == strtoxL
-
-
-Input: 1.23e+20
-
-strtoxL consumes 8 bytes and returns 1
-with bits = #40410000 d55ef90a 2da18000
-printf("%.21Lg") gives 2.24239113715721119512e-4932
-g_xLfmt(0) gives 8 bytes: "1.23e+20"
-
-strtoIxL returns 1, consuming 8 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.23e-20
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #3fbc0000 e857267b b3a984f2
-printf("%.21Lg") gives 2.74065070995958800375e-4932
-g_xLfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #3fbc0000 e857267b b3a984f2
-= 2.74065070995958800375e-4932
-fI[1] = #3fbc0000 e857267b b3a984f3
-= 2.74065070995958800411e-4932
-fI[0] == strtoxL
-
-
-Input: 1.23456789
-
-strtoxL consumes 10 bytes and returns 33
-with bits = #3fff0000 9e065214 1ef0dbf6
-printf("%.21Lg") gives 7.88641440242171807354e-4933
-g_xLfmt(0) gives 10 bytes: "1.23456789"
-
-strtoIxL returns 33, consuming 10 bytes.
-fI[0] = #3fff0000 9e065214 1ef0dbf5
-= 7.8864144024217180699e-4933
-fI[1] = #3fff0000 9e065214 1ef0dbf6
-= 7.88641440242171807354e-4933
-fI[1] == strtoxL
-
-
-Input: 1.23456589e+20
-
-strtoxL consumes 14 bytes and returns 1
-with bits = #40410000 d629bd33 5ccba00
-printf("%.21Lg") gives 2.26319561227049478508e-4932
-g_xLfmt(0) gives 14 bytes: "1.23456589e+20"
-
-strtoIxL returns 1, consuming 14 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.23e+30
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #40620000 f8658274 7dbc824a
-printf("%.21Lg") gives 3.16238691003557160385e-4932
-g_xLfmt(0) gives 8 bytes: "1.23e+30"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #40620000 f8658274 7dbc824a
-= 3.16238691003557160385e-4932
-fI[1] = #40620000 f8658274 7dbc824b
-= 3.16238691003557160421e-4932
-fI[0] == strtoxL
-
-
-Input: 1.23e-30
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #3f9b0000 c794337a 808554eb
-printf("%.21Lg") gives 1.88012249978407873966e-4932
-g_xLfmt(0) gives 8 bytes: "1.23e-30"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #3f9b0000 c794337a 808554eb
-= 1.88012249978407873966e-4932
-fI[1] = #3f9b0000 c794337a 808554ec
-= 1.88012249978407874003e-4932
-fI[0] == strtoxL
-
-
-Input: 1.23456789e-20
-
-strtoxL consumes 14 bytes and returns 17
-with bits = #3fbc0000 e9340a38 f3d6d352
-printf("%.21Lg") gives 2.76331470044569174626e-4932
-g_xLfmt(0) gives 14 bytes: "1.23456789e-20"
-
-strtoIxL returns 17, consuming 14 bytes.
-fI[0] = #3fbc0000 e9340a38 f3d6d352
-= 2.76331470044569174626e-4932
-fI[1] = #3fbc0000 e9340a38 f3d6d353
-= 2.76331470044569174663e-4932
-fI[0] == strtoxL
-
-
-Input: 1.23456789e-30
-
-strtoxL consumes 14 bytes and returns 17
-with bits = #3f9b0000 c851f19d decca8fc
-printf("%.21Lg") gives 1.89959071937101288293e-4932
-g_xLfmt(0) gives 14 bytes: "1.23456789e-30"
-
-strtoIxL returns 17, consuming 14 bytes.
-fI[0] = #3f9b0000 c851f19d decca8fc
-= 1.89959071937101288293e-4932
-fI[1] = #3f9b0000 c851f19d decca8fd
-= 1.89959071937101288329e-4932
-fI[0] == strtoxL
-
-
-Input: 1.234567890123456789
-
-strtoxL consumes 20 bytes and returns 17
-with bits = #3fff0000 9e065214 62cfdb8d
-printf("%.21Lg") gives 7.88641440657246265535e-4933
-g_xLfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIxL returns 17, consuming 20 bytes.
-fI[0] = #3fff0000 9e065214 62cfdb8d
-= 7.88641440657246265535e-4933
-fI[1] = #3fff0000 9e065214 62cfdb8e
-= 7.886414406572462659e-4933
-fI[0] == strtoxL
-
-
-Input: 1.23456789012345678901234567890123456789
-
-strtoxL consumes 40 bytes and returns 17
-with bits = #3fff0000 9e065214 62cfdb8d
-printf("%.21Lg") gives 7.88641440657246265535e-4933
-g_xLfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIxL returns 17, consuming 40 bytes.
-fI[0] = #3fff0000 9e065214 62cfdb8d
-= 7.88641440657246265535e-4933
-fI[1] = #3fff0000 9e065214 62cfdb8e
-= 7.886414406572462659e-4933
-fI[0] == strtoxL
-
-
-Input: 1.23e306
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #43f70000 e033b668 e30fa6d5
-printf("%.21Lg") gives 2.52688323155200052759e-4932
-g_xLfmt(0) gives 9 bytes: "1.23e+306"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #43f70000 e033b668 e30fa6d5
-= 2.52688323155200052759e-4932
-fI[1] = #43f70000 e033b668 e30fa6d6
-= 2.52688323155200052796e-4932
-fI[0] == strtoxL
-
-
-Input: 1.23e-306
-
-strtoxL consumes 9 bytes and returns 33
-with bits = #3c060000 dd1dc2ed 1cb73f25
-printf("%.21Lg") gives 2.44583168427704605801e-4932
-g_xLfmt(0) gives 9 bytes: "1.23e-306"
-
-strtoIxL returns 33, consuming 9 bytes.
-fI[0] = #3c060000 dd1dc2ed 1cb73f24
-= 2.44583168427704605765e-4932
-fI[1] = #3c060000 dd1dc2ed 1cb73f25
-= 2.44583168427704605801e-4932
-fI[1] == strtoxL
-
-
-Input: 1.23e-320
-
-strtoxL consumes 9 bytes and returns 33
-with bits = #3bd80000 9b98c371 844c3f1a
-printf("%.21Lg") gives 7.24867657578821329238e-4933
-g_xLfmt(0) gives 9 bytes: "1.23e-320"
-
-strtoIxL returns 33, consuming 9 bytes.
-fI[0] = #3bd80000 9b98c371 844c3f19
-= 7.24867657578821328874e-4933
-fI[1] = #3bd80000 9b98c371 844c3f1a
-= 7.24867657578821329238e-4933
-fI[1] == strtoxL
-
-
-Input: 1.23e-20
-
-strtoxL consumes 8 bytes and returns 17
-with bits = #3fbc0000 e857267b b3a984f2
-printf("%.21Lg") gives 2.74065070995958800375e-4932
-g_xLfmt(0) gives 8 bytes: "1.23e-20"
-
-strtoIxL returns 17, consuming 8 bytes.
-fI[0] = #3fbc0000 e857267b b3a984f2
-= 2.74065070995958800375e-4932
-fI[1] = #3fbc0000 e857267b b3a984f3
-= 2.74065070995958800411e-4932
-fI[0] == strtoxL
-
-
-Input: 1.23456789e307
-
-strtoxL consumes 14 bytes and returns 17
-with bits = #43fb0000 8ca58a5e d766de75
-printf("%.21Lg") gives 3.32182163192682931854e-4933
-g_xLfmt(0) gives 15 bytes: "1.23456789e+307"
-
-strtoIxL returns 17, consuming 14 bytes.
-fI[0] = #43fb0000 8ca58a5e d766de75
-= 3.32182163192682931854e-4933
-fI[1] = #43fb0000 8ca58a5e d766de76
-= 3.32182163192682932219e-4933
-fI[0] == strtoxL
-
-
-Input: 1.23456589e-307
-
-strtoxL consumes 15 bytes and returns 17
-with bits = #3c030000 b18cb5dc c22fd369
-printf("%.21Lg") gives 1.30149245314004923345e-4932
-g_xLfmt(0) gives 15 bytes: "1.23456589e-307"
-
-strtoIxL returns 17, consuming 15 bytes.
-fI[0] = #3c030000 b18cb5dc c22fd369
-= 1.30149245314004923345e-4932
-fI[1] = #3c030000 b18cb5dc c22fd36a
-= 1.30149245314004923382e-4932
-fI[0] == strtoxL
-
-
-Input: 1.234567890123456789
-
-strtoxL consumes 20 bytes and returns 17
-with bits = #3fff0000 9e065214 62cfdb8d
-printf("%.21Lg") gives 7.88641440657246265535e-4933
-g_xLfmt(0) gives 20 bytes: "1.234567890123456789"
-
-strtoIxL returns 17, consuming 20 bytes.
-fI[0] = #3fff0000 9e065214 62cfdb8d
-= 7.88641440657246265535e-4933
-fI[1] = #3fff0000 9e065214 62cfdb8e
-= 7.886414406572462659e-4933
-fI[0] == strtoxL
-
-
-Input: 1.234567890123456789e301
-
-strtoxL consumes 24 bytes and returns 33
-with bits = #43e70000 937a8baf ab20980c
-printf("%.21Lg") gives 5.11635766619117643114e-4933
-g_xLfmt(0) gives 25 bytes: "1.234567890123456789e+301"
-
-strtoIxL returns 33, consuming 24 bytes.
-fI[0] = #43e70000 937a8baf ab20980b
-= 5.1163576661911764275e-4933
-fI[1] = #43e70000 937a8baf ab20980c
-= 5.11635766619117643114e-4933
-fI[1] == strtoxL
-
-
-Input: 1.234567890123456789e-301
-
-strtoxL consumes 25 bytes and returns 33
-with bits = #3c170000 a953271a 5d069ad9
-printf("%.21Lg") gives 1.08545540462853463561e-4932
-g_xLfmt(0) gives 25 bytes: "1.234567890123456789e-301"
-
-strtoIxL returns 33, consuming 25 bytes.
-fI[0] = #3c170000 a953271a 5d069ad8
-= 1.08545540462853463524e-4932
-fI[1] = #3c170000 a953271a 5d069ad9
-= 1.08545540462853463561e-4932
-fI[1] == strtoxL
-
-
-Input: 1.234567890123456789e-321
-
-strtoxL consumes 25 bytes and returns 33
-with bits = #3bd40000 f9e11b4c ea6dcce9
-printf("%.21Lg") gives 3.20133479952876185942e-4932
-g_xLfmt(0) gives 25 bytes: "1.234567890123456789e-321"
-
-strtoIxL returns 33, consuming 25 bytes.
-fI[0] = #3bd40000 f9e11b4c ea6dcce8
-= 3.20133479952876185905e-4932
-fI[1] = #3bd40000 f9e11b4c ea6dcce9
-= 3.20133479952876185942e-4932
-fI[1] == strtoxL
-
-
-Input: 1e23
-
-strtoxL consumes 4 bytes and returns 1
-with bits = #404b0000 a968163f a57b400
-printf("%.21Lg") gives 1.08760331670538037378e-4932
-g_xLfmt(0) gives 5 bytes: "1e+23"
-
-strtoIxL returns 1, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1e310
-
-strtoxL consumes 5 bytes and returns 33
-with bits = #44040000 de81e40a 34bcf50
-printf("%.21Lg") gives 2.48237171106260601618e-4932
-g_xLfmt(0) gives 6 bytes: "1e+310"
-
-strtoIxL returns 33, consuming 5 bytes.
-fI[0] = #44040000 de81e40a 34bcf4f
-= 2.48237171106260601582e-4932
-fI[1] = #44040000 de81e40a 34bcf50
-= 2.48237171106260601618e-4932
-fI[1] == strtoxL
-
-
-Input: 9.0259718793241475e-277
-
-strtoxL consumes 23 bytes and returns 33
-with bits = #3c690000 ffffffff fffffcf7
-printf("%.21Lg") gives 3.36210314311209322303e-4932
-g_xLfmt(0) gives 23 bytes: "9.0259718793241475e-277"
-
-strtoIxL returns 33, consuming 23 bytes.
-fI[0] = #3c690000 ffffffff fffffcf6
-= 3.36210314311209322267e-4932
-fI[1] = #3c690000 ffffffff fffffcf7
-= 3.36210314311209322303e-4932
-fI[1] == strtoxL
-
-
-Input: 9.025971879324147880346310405869e-277
-
-strtoxL consumes 37 bytes and returns 17
-with bits = #3c6a0000 80000000 0
-printf("%.21Lg") gives 3.36210314311209350626e-4932
-g_xLfmt(0) gives 26 bytes: "9.0259718793241478803e-277"
-
-strtoIxL returns 17, consuming 37 bytes.
-fI[0] = #3c6a0000 80000000 0
-= 3.36210314311209350626e-4932
-fI[1] = #3c6a0000 80000000 1
-= 3.64519953188247460253e-4951
-fI[0] == strtoxL
-
-
-Input: 9.025971879324147880346310405868e-277
-
-strtoxL consumes 37 bytes and returns 33
-with bits = #3c6a0000 80000000 0
-printf("%.21Lg") gives 3.36210314311209350626e-4932
-g_xLfmt(0) gives 26 bytes: "9.0259718793241478803e-277"
-
-strtoIxL returns 33, consuming 37 bytes.
-fI[0] = #3c690000 ffffffff ffffffff
-= 3.3621031431120935059e-4932
-fI[1] = #3c6a0000 80000000 0
-= 3.36210314311209350626e-4932
-fI[1] == strtoxL
-
-
-Input: 2.2250738585072014e-308
-
-strtoxL consumes 23 bytes and returns 17
-with bits = #3c010000 80000000 46
-printf("%.21Lg") gives 2.55163967231773222177e-4949
-g_xLfmt(0) gives 23 bytes: "2.2250738585072014e-308"
-
-strtoIxL returns 17, consuming 23 bytes.
-fI[0] = #3c010000 80000000 46
-= 2.55163967231773222177e-4949
-fI[1] = #3c010000 80000000 47
-= 2.5880916676365569678e-4949
-fI[0] == strtoxL
-
-
-Input: 2.2250738585072013e-308
-
-strtoxL consumes 23 bytes and returns 17
-with bits = #3c000000 ffffffff fffffd4f
-printf("%.21Lg") gives 3.36210314311209325511e-4932
-g_xLfmt(0) gives 23 bytes: "2.2250738585072013e-308"
-
-strtoIxL returns 17, consuming 23 bytes.
-fI[0] = #3c000000 ffffffff fffffd4f
-= 3.36210314311209325511e-4932
-fI[1] = #3c000000 ffffffff fffffd50
-= 3.36210314311209325547e-4932
-fI[0] == strtoxL
-
-Rounding mode for strtor... changed from 1 (nearest) to 0 (toward zero)
-
-Input: 1.1
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 8ccccccc cccccccc
-printf("%.21Lg") gives 3.36210314311209350335e-4933
-g_xLfmt(0) gives 21 bytes: "1.0999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[1] = #3fff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[0] == strtoxL
-
-
-Input: -1.1
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 8ccccccc cccccccc
-printf("%.21Lg") gives 3.36210314311209350335e-4933
-g_xLfmt(0) gives 22 bytes: "-1.0999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[1] = #bfff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[1] == strtoxL
-
-
-Input: 1.2
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 99999999 99999999
-printf("%.21Lg") gives 6.72420628622418701034e-4933
-g_xLfmt(0) gives 21 bytes: "1.1999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[1] = #3fff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[0] == strtoxL
-
-
-Input: -1.2
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 99999999 99999999
-printf("%.21Lg") gives 6.72420628622418701034e-4933
-g_xLfmt(0) gives 22 bytes: "-1.1999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[1] = #bfff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[1] == strtoxL
-
-
-Input: 1.3
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 a6666666 66666666
-printf("%.21Lg") gives 1.00863094293362805173e-4932
-g_xLfmt(0) gives 3 bytes: "1.3"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[1] = #3fff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[0] == strtoxL
-
-
-Input: -1.3
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 a6666666 66666666
-printf("%.21Lg") gives 1.00863094293362805173e-4932
-g_xLfmt(0) gives 4 bytes: "-1.3"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[1] = #bfff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[1] == strtoxL
-
-
-Input: 1.4
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 b3333333 33333333
-printf("%.21Lg") gives 1.34484125724483740243e-4932
-g_xLfmt(0) gives 3 bytes: "1.4"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[1] = #3fff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[0] == strtoxL
-
-
-Input: -1.4
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 b3333333 33333333
-printf("%.21Lg") gives 1.34484125724483740243e-4932
-g_xLfmt(0) gives 4 bytes: "-1.4"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[1] = #bfff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[1] == strtoxL
-
-
-Input: 1.5
-
-strtoxL consumes 3 bytes and returns 1
-with bits = #3fff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 3 bytes: "1.5"
-
-strtoIxL returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: -1.5
-
-strtoxL consumes 4 bytes and returns 9
-with bits = #bfff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 4 bytes: "-1.5"
-
-strtoIxL returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.6
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 cccccccc cccccccc
-printf("%.21Lg") gives 2.01726188586725610347e-4932
-g_xLfmt(0) gives 21 bytes: "1.5999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[1] = #3fff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[0] == strtoxL
-
-
-Input: -1.6
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 cccccccc cccccccc
-printf("%.21Lg") gives 2.01726188586725610347e-4932
-g_xLfmt(0) gives 22 bytes: "-1.5999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[1] = #bfff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[1] == strtoxL
-
-
-Input: 1.7
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 d9999999 99999999
-printf("%.21Lg") gives 2.35347220017846545417e-4932
-g_xLfmt(0) gives 21 bytes: "1.6999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[1] = #3fff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[0] == strtoxL
-
-
-Input: -1.7
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 d9999999 99999999
-printf("%.21Lg") gives 2.35347220017846545417e-4932
-g_xLfmt(0) gives 22 bytes: "-1.6999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[1] = #bfff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[1] == strtoxL
-
-
-Input: 1.8
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 e6666666 66666666
-printf("%.21Lg") gives 2.68968251448967480486e-4932
-g_xLfmt(0) gives 3 bytes: "1.8"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[1] = #3fff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[0] == strtoxL
-
-
-Input: -1.8
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 e6666666 66666666
-printf("%.21Lg") gives 2.68968251448967480486e-4932
-g_xLfmt(0) gives 4 bytes: "-1.8"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[1] = #bfff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[1] == strtoxL
-
-
-Input: 1.9
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 f3333333 33333333
-printf("%.21Lg") gives 3.02589282880088415556e-4932
-g_xLfmt(0) gives 3 bytes: "1.9"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[1] = #3fff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[0] == strtoxL
-
-
-Input: -1.9
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 f3333333 33333333
-printf("%.21Lg") gives 3.02589282880088415556e-4932
-g_xLfmt(0) gives 4 bytes: "-1.9"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[1] = #bfff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[1] == strtoxL
-
-Rounding mode for strtor... changed from 0 (toward zero) to 1 (nearest)
-
-Input: 1.1
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 8ccccccc cccccccd
-printf("%.21Lg") gives 3.36210314311209350699e-4933
-g_xLfmt(0) gives 3 bytes: "1.1"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[1] = #3fff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[1] == strtoxL
-
-
-Input: -1.1
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 8ccccccc cccccccd
-printf("%.21Lg") gives 3.36210314311209350699e-4933
-g_xLfmt(0) gives 4 bytes: "-1.1"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[1] = #bfff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[0] == strtoxL
-
-
-Input: 1.2
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 99999999 9999999a
-printf("%.21Lg") gives 6.72420628622418701398e-4933
-g_xLfmt(0) gives 3 bytes: "1.2"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[1] = #3fff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[1] == strtoxL
-
-
-Input: -1.2
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 99999999 9999999a
-printf("%.21Lg") gives 6.72420628622418701398e-4933
-g_xLfmt(0) gives 4 bytes: "-1.2"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[1] = #bfff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[0] == strtoxL
-
-
-Input: 1.3
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 a6666666 66666666
-printf("%.21Lg") gives 1.00863094293362805173e-4932
-g_xLfmt(0) gives 3 bytes: "1.3"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[1] = #3fff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[0] == strtoxL
-
-
-Input: -1.3
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 a6666666 66666666
-printf("%.21Lg") gives 1.00863094293362805173e-4932
-g_xLfmt(0) gives 4 bytes: "-1.3"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[1] = #bfff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[1] == strtoxL
-
-
-Input: 1.4
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 b3333333 33333333
-printf("%.21Lg") gives 1.34484125724483740243e-4932
-g_xLfmt(0) gives 3 bytes: "1.4"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[1] = #3fff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[0] == strtoxL
-
-
-Input: -1.4
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 b3333333 33333333
-printf("%.21Lg") gives 1.34484125724483740243e-4932
-g_xLfmt(0) gives 4 bytes: "-1.4"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[1] = #bfff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[1] == strtoxL
-
-
-Input: 1.5
-
-strtoxL consumes 3 bytes and returns 1
-with bits = #3fff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 3 bytes: "1.5"
-
-strtoIxL returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: -1.5
-
-strtoxL consumes 4 bytes and returns 9
-with bits = #bfff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 4 bytes: "-1.5"
-
-strtoIxL returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.6
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 cccccccc cccccccd
-printf("%.21Lg") gives 2.01726188586725610383e-4932
-g_xLfmt(0) gives 3 bytes: "1.6"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[1] = #3fff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[1] == strtoxL
-
-
-Input: -1.6
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 cccccccc cccccccd
-printf("%.21Lg") gives 2.01726188586725610383e-4932
-g_xLfmt(0) gives 4 bytes: "-1.6"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[1] = #bfff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[0] == strtoxL
-
-
-Input: 1.7
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 d9999999 9999999a
-printf("%.21Lg") gives 2.35347220017846545453e-4932
-g_xLfmt(0) gives 3 bytes: "1.7"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[1] = #3fff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[1] == strtoxL
-
-
-Input: -1.7
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 d9999999 9999999a
-printf("%.21Lg") gives 2.35347220017846545453e-4932
-g_xLfmt(0) gives 4 bytes: "-1.7"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[1] = #bfff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[0] == strtoxL
-
-
-Input: 1.8
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 e6666666 66666666
-printf("%.21Lg") gives 2.68968251448967480486e-4932
-g_xLfmt(0) gives 3 bytes: "1.8"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[1] = #3fff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[0] == strtoxL
-
-
-Input: -1.8
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 e6666666 66666666
-printf("%.21Lg") gives 2.68968251448967480486e-4932
-g_xLfmt(0) gives 4 bytes: "-1.8"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[1] = #bfff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[1] == strtoxL
-
-
-Input: 1.9
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 f3333333 33333333
-printf("%.21Lg") gives 3.02589282880088415556e-4932
-g_xLfmt(0) gives 3 bytes: "1.9"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[1] = #3fff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[0] == strtoxL
-
-
-Input: -1.9
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 f3333333 33333333
-printf("%.21Lg") gives 3.02589282880088415556e-4932
-g_xLfmt(0) gives 4 bytes: "-1.9"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[1] = #bfff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[1] == strtoxL
-
-Rounding mode for strtor... changed from 1 (nearest) to 2 (toward +Infinity)
-
-Input: 1.1
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 8ccccccc cccccccd
-printf("%.21Lg") gives 3.36210314311209350699e-4933
-g_xLfmt(0) gives 3 bytes: "1.1"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[1] = #3fff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[1] == strtoxL
-
-
-Input: -1.1
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 8ccccccc cccccccc
-printf("%.21Lg") gives 3.36210314311209350335e-4933
-g_xLfmt(0) gives 22 bytes: "-1.0999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[1] = #bfff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[1] == strtoxL
-
-
-Input: 1.2
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 99999999 9999999a
-printf("%.21Lg") gives 6.72420628622418701398e-4933
-g_xLfmt(0) gives 3 bytes: "1.2"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[1] = #3fff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[1] == strtoxL
-
-
-Input: -1.2
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 99999999 99999999
-printf("%.21Lg") gives 6.72420628622418701034e-4933
-g_xLfmt(0) gives 22 bytes: "-1.1999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[1] = #bfff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[1] == strtoxL
-
-
-Input: 1.3
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 a6666666 66666667
-printf("%.21Lg") gives 1.0086309429336280521e-4932
-g_xLfmt(0) gives 21 bytes: "1.3000000000000000001"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[1] = #3fff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[1] == strtoxL
-
-
-Input: -1.3
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 a6666666 66666666
-printf("%.21Lg") gives 1.00863094293362805173e-4932
-g_xLfmt(0) gives 4 bytes: "-1.3"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[1] = #bfff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[1] == strtoxL
-
-
-Input: 1.4
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 b3333333 33333334
-printf("%.21Lg") gives 1.3448412572448374028e-4932
-g_xLfmt(0) gives 21 bytes: "1.4000000000000000001"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[1] = #3fff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[1] == strtoxL
-
-
-Input: -1.4
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 b3333333 33333333
-printf("%.21Lg") gives 1.34484125724483740243e-4932
-g_xLfmt(0) gives 4 bytes: "-1.4"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[1] = #bfff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[1] == strtoxL
-
-
-Input: 1.5
-
-strtoxL consumes 3 bytes and returns 1
-with bits = #3fff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 3 bytes: "1.5"
-
-strtoIxL returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: -1.5
-
-strtoxL consumes 4 bytes and returns 9
-with bits = #bfff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 4 bytes: "-1.5"
-
-strtoIxL returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.6
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 cccccccc cccccccd
-printf("%.21Lg") gives 2.01726188586725610383e-4932
-g_xLfmt(0) gives 3 bytes: "1.6"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[1] = #3fff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[1] == strtoxL
-
-
-Input: -1.6
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 cccccccc cccccccc
-printf("%.21Lg") gives 2.01726188586725610347e-4932
-g_xLfmt(0) gives 22 bytes: "-1.5999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[1] = #bfff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[1] == strtoxL
-
-
-Input: 1.7
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 d9999999 9999999a
-printf("%.21Lg") gives 2.35347220017846545453e-4932
-g_xLfmt(0) gives 3 bytes: "1.7"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[1] = #3fff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[1] == strtoxL
-
-
-Input: -1.7
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 d9999999 99999999
-printf("%.21Lg") gives 2.35347220017846545417e-4932
-g_xLfmt(0) gives 22 bytes: "-1.6999999999999999999"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[1] = #bfff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[1] == strtoxL
-
-
-Input: 1.8
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 e6666666 66666667
-printf("%.21Lg") gives 2.68968251448967480523e-4932
-g_xLfmt(0) gives 21 bytes: "1.8000000000000000001"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[1] = #3fff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[1] == strtoxL
-
-
-Input: -1.8
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 e6666666 66666666
-printf("%.21Lg") gives 2.68968251448967480486e-4932
-g_xLfmt(0) gives 4 bytes: "-1.8"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[1] = #bfff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[1] == strtoxL
-
-
-Input: 1.9
-
-strtoxL consumes 3 bytes and returns 33
-with bits = #3fff0000 f3333333 33333334
-printf("%.21Lg") gives 3.02589282880088415593e-4932
-g_xLfmt(0) gives 21 bytes: "1.9000000000000000001"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[1] = #3fff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[1] == strtoxL
-
-
-Input: -1.9
-
-strtoxL consumes 4 bytes and returns 25
-with bits = #bfff0000 f3333333 33333333
-printf("%.21Lg") gives 3.02589282880088415556e-4932
-g_xLfmt(0) gives 4 bytes: "-1.9"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[1] = #bfff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[1] == strtoxL
-
-Rounding mode for strtor... changed from 2 (toward +Infinity) to 3 (toward -Infinity)
-
-Input: 1.1
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 8ccccccc cccccccc
-printf("%.21Lg") gives 3.36210314311209350335e-4933
-g_xLfmt(0) gives 21 bytes: "1.0999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[1] = #3fff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[0] == strtoxL
-
-
-Input: -1.1
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 8ccccccc cccccccd
-printf("%.21Lg") gives 3.36210314311209350699e-4933
-g_xLfmt(0) gives 4 bytes: "-1.1"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 8ccccccc cccccccd
-= 3.36210314311209350699e-4933
-fI[1] = #bfff0000 8ccccccc cccccccc
-= 3.36210314311209350335e-4933
-fI[0] == strtoxL
-
-
-Input: 1.2
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 99999999 99999999
-printf("%.21Lg") gives 6.72420628622418701034e-4933
-g_xLfmt(0) gives 21 bytes: "1.1999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[1] = #3fff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[0] == strtoxL
-
-
-Input: -1.2
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 99999999 9999999a
-printf("%.21Lg") gives 6.72420628622418701398e-4933
-g_xLfmt(0) gives 4 bytes: "-1.2"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 99999999 9999999a
-= 6.72420628622418701398e-4933
-fI[1] = #bfff0000 99999999 99999999
-= 6.72420628622418701034e-4933
-fI[0] == strtoxL
-
-
-Input: 1.3
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 a6666666 66666666
-printf("%.21Lg") gives 1.00863094293362805173e-4932
-g_xLfmt(0) gives 3 bytes: "1.3"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[1] = #3fff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[0] == strtoxL
-
-
-Input: -1.3
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 a6666666 66666667
-printf("%.21Lg") gives 1.0086309429336280521e-4932
-g_xLfmt(0) gives 22 bytes: "-1.3000000000000000001"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 a6666666 66666667
-= 1.0086309429336280521e-4932
-fI[1] = #bfff0000 a6666666 66666666
-= 1.00863094293362805173e-4932
-fI[0] == strtoxL
-
-
-Input: 1.4
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 b3333333 33333333
-printf("%.21Lg") gives 1.34484125724483740243e-4932
-g_xLfmt(0) gives 3 bytes: "1.4"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[1] = #3fff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[0] == strtoxL
-
-
-Input: -1.4
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 b3333333 33333334
-printf("%.21Lg") gives 1.3448412572448374028e-4932
-g_xLfmt(0) gives 22 bytes: "-1.4000000000000000001"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 b3333333 33333334
-= 1.3448412572448374028e-4932
-fI[1] = #bfff0000 b3333333 33333333
-= 1.34484125724483740243e-4932
-fI[0] == strtoxL
-
-
-Input: 1.5
-
-strtoxL consumes 3 bytes and returns 1
-with bits = #3fff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 3 bytes: "1.5"
-
-strtoIxL returns 1, consuming 3 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: -1.5
-
-strtoxL consumes 4 bytes and returns 9
-with bits = #bfff0000 c0000000 0
-printf("%.21Lg") gives 1.68105157155604675313e-4932
-g_xLfmt(0) gives 4 bytes: "-1.5"
-
-strtoIxL returns 9, consuming 4 bytes.
-fI[0] == fI[1] == strtoxL
-
-
-Input: 1.6
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 cccccccc cccccccc
-printf("%.21Lg") gives 2.01726188586725610347e-4932
-g_xLfmt(0) gives 21 bytes: "1.5999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[1] = #3fff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[0] == strtoxL
-
-
-Input: -1.6
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 cccccccc cccccccd
-printf("%.21Lg") gives 2.01726188586725610383e-4932
-g_xLfmt(0) gives 4 bytes: "-1.6"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 cccccccc cccccccd
-= 2.01726188586725610383e-4932
-fI[1] = #bfff0000 cccccccc cccccccc
-= 2.01726188586725610347e-4932
-fI[0] == strtoxL
-
-
-Input: 1.7
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 d9999999 99999999
-printf("%.21Lg") gives 2.35347220017846545417e-4932
-g_xLfmt(0) gives 21 bytes: "1.6999999999999999999"
-
-strtoIxL returns 33, consuming 3 bytes.
-fI[0] = #3fff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[1] = #3fff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[0] == strtoxL
-
-
-Input: -1.7
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 d9999999 9999999a
-printf("%.21Lg") gives 2.35347220017846545453e-4932
-g_xLfmt(0) gives 4 bytes: "-1.7"
-
-strtoIxL returns 41, consuming 4 bytes.
-fI[0] = #bfff0000 d9999999 9999999a
-= 2.35347220017846545453e-4932
-fI[1] = #bfff0000 d9999999 99999999
-= 2.35347220017846545417e-4932
-fI[0] == strtoxL
-
-
-Input: 1.8
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 e6666666 66666666
-printf("%.21Lg") gives 2.68968251448967480486e-4932
-g_xLfmt(0) gives 3 bytes: "1.8"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[1] = #3fff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[0] == strtoxL
-
-
-Input: -1.8
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 e6666666 66666667
-printf("%.21Lg") gives 2.68968251448967480523e-4932
-g_xLfmt(0) gives 22 bytes: "-1.8000000000000000001"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 e6666666 66666667
-= 2.68968251448967480523e-4932
-fI[1] = #bfff0000 e6666666 66666666
-= 2.68968251448967480486e-4932
-fI[0] == strtoxL
-
-
-Input: 1.9
-
-strtoxL consumes 3 bytes and returns 17
-with bits = #3fff0000 f3333333 33333333
-printf("%.21Lg") gives 3.02589282880088415556e-4932
-g_xLfmt(0) gives 3 bytes: "1.9"
-
-strtoIxL returns 17, consuming 3 bytes.
-fI[0] = #3fff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[1] = #3fff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[0] == strtoxL
-
-
-Input: -1.9
-
-strtoxL consumes 4 bytes and returns 41
-with bits = #bfff0000 f3333333 33333334
-printf("%.21Lg") gives 3.02589282880088415593e-4932
-g_xLfmt(0) gives 22 bytes: "-1.9000000000000000001"
-
-strtoIxL returns 25, consuming 4 bytes.
-fI[0] = #bfff0000 f3333333 33333334
-= 3.02589282880088415593e-4932
-fI[1] = #bfff0000 f3333333 33333333
-= 3.02589282880088415556e-4932
-fI[0] == strtoxL
-
diff --git a/lib/libc/gdtoa/test/xLtest.c b/lib/libc/gdtoa/test/xLtest.c
deleted file mode 100644
index cf348e2ed..000000000
--- a/lib/libc/gdtoa/test/xLtest.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998-2001 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-/* Test program for g_xLfmt, strtoIxL, strtopxL, and strtorxL.
- *
- * Inputs (on stdin):
- *		r rounding_mode
- *		n ndig
- *		number
- *		#hex0 hex1 hex2
- *
- *	rounding_mode values:
- *		0 = toward zero
- *		1 = nearest
- *		2 = toward +Infinity
- *		3 = toward -Infinity
- *
- * where number is a decimal floating-point number,
- * hex0 is a string of <= 8 Hex digits for the most significant
- * word of the number, hex1 is a similar string for the next
- * word, etc., and ndig is a parameters to g_xLfmt.
- */
-
-#include "gdtoa.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
- extern int getround ANSI((int,char*));
-
- static char ibuf[2048], obuf[2048];
-
-#define U (unsigned long)
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_BIG_ENDIAN or IEEE_LITTLE_ENDIAN should be #defined */
-
-#ifdef IEEE_BIG_ENDIAN
-#define _0 0
-#define _1 1
-#define _2 2
-#endif
-#ifdef IEEE_LITTLE_ENDIAN
-#define _0 2
-#define _1 1
-#define _2 0
-#endif
-
- int
-main(Void)
-{
-	char *s, *s1, *se, *se1;
-	int dItry, i, ndig = 0, r = 1;
-	union { long double d; ULong bits[3]; } u, v[2];
-
-	while((s = fgets(ibuf, sizeof(ibuf), stdin))) {
-		while(*s <= ' ')
-			if (!*s++)
-				continue;
-		dItry = 0;
-		switch(*s) {
-		  case 'r':
-			r = getround(r, s);
-			continue;
-		  case 'n':
-			i = s[1];
-			if (i <= ' ' || (i >= '0' && i <= '9')) {
-				ndig = atoi(s+1);
-				continue;
-				}
-			break; /* nan? */
-		  case '#':
-			/* sscanf(s+1, "%lx %lx %lx", &u.bits[_0],	*/
-			/* 	&u.bits[_1], &u.bits[_2]);		*/
-			u.bits[_0] = (ULong)strtoul(s1 = s+1, &se, 16);
-			if (se > s1) {
-			    u.bits[_1] = (ULong)strtoul(s1=se, &se, 16);
-			    if (se > s1)
-				u.bits[_2] = (ULong)strtoul(s1=se, &se, 16);
-			    }
-			printf("\nInput: %s", ibuf);
-			printf(" --> f = #%lx %lx %lx\n", U u.bits[_0],
-				U u.bits[_1], U u.bits[_2]);
-			goto fmt_test;
-			}
-		dItry = 1;
-		printf("\nInput: %s", ibuf);
-		i = strtorxL(ibuf, &se, r, u.bits);
-		if (r == 1 && (i != strtopxL(ibuf, &se1, v[0].bits) || se1 != se
-		 || memcmp(u.bits, v[0].bits, 12)))
-			printf("***strtoxL and strtorxL disagree!!\n:");
-		printf("\nstrtoxL consumes %d bytes and returns %d\n",
-				(int)(se-ibuf), i);
-		printf("with bits = #%lx %lx %lx\n",
-			U u.bits[_0], U u.bits[_1], U u.bits[_2]);
-		if (sizeof(long double) == 12)
-			printf("printf(\"%%.21Lg\") gives %.21Lg\n", u.d);
- fmt_test:
-		se = g_xLfmt(obuf, u.bits, ndig, sizeof(obuf));
-		printf("g_xLfmt(%d) gives %d bytes: \"%s\"\n\n",
-			ndig, (int)(se-obuf), se ? obuf : "<null>");
-		if (!dItry)
-			continue;
-		printf("strtoIxL returns %d,",
-			strtoIxL(ibuf, &se, v[0].bits, v[1].bits));
-		printf(" consuming %d bytes.\n", (int)(se-ibuf));
-		if (!memcmp(v[0].bits, v[1].bits, 12)) {
-			if (!memcmp(u.bits, v[0].bits, 12))
-				printf("fI[0] == fI[1] == strtoxL\n");
-			else {
-				printf("fI[0] == fI[1] = #%lx %lx %lx\n",
-					U v[0].bits[_0], U v[0].bits[_1],
-					U v[0].bits[_2]);
-				if (sizeof(long double) == 12)
-				    printf("= %.21Lg\n", v[0].d);
-				}
-			}
-		else {
-			printf("fI[0] = #%lx %lx %lx\n",
-					U v[0].bits[_0], U v[0].bits[_1],
-					U v[0].bits[_2]);
-			if (sizeof(long double) == 12)
-				printf("= %.21Lg\n", v[0].d);
-			printf("fI[1] = #%lx %lx %lx\n",
-					U v[1].bits[_0], U v[1].bits[_1],
-					U v[1].bits[_2]);
-			if (sizeof(long double) == 12)
-				printf("= %.21Lg\n", v[1].d);
-			if (!memcmp(v[0].bits, u.bits, 12))
-				printf("fI[0] == strtoxL\n");
-			else if (!memcmp(v[1].bits, u.bits, 12))
-				printf("fI[1] == strtoxL\n");
-			else
-				printf("**** Both differ from strtod ****\n");
-			}
-		printf("\n");
-		}
-	return 0;
-	}
diff --git a/lib/libc/gdtoa/test/xQtest.c b/lib/libc/gdtoa/test/xQtest.c
deleted file mode 100644
index 93bc4142f..000000000
--- a/lib/libc/gdtoa/test/xQtest.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 2002 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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 <stdio.h>
-
- int
-main(void)
-{
-	union { long double d; unsigned int bits[4]; } u, w;
-	switch(sizeof(long double)) {
-	  case 16:
-		w.bits[0] = w.bits[3] = 0;
-		w.d = 1.;
-		u.d = 3.;
-		w.d = w.d / u.d;
-		if (w.bits[0] && w.bits[3])
-			printf("cp x.ou0 x.out; cp xL.ou0 xL.out;"
-				" cp Q.ou1 Q.out; cp pftestQ.out pftest.out\n");
-		else
-			printf("cp x.ou0 x.out; cp xL.ou0 xL.out;"
-				" cp Q.ou0 Q.out; cp pftestx.out pftest.out\n");
-		break;
-	  case 10:
-	  case 12:
-		printf("cp x.ou1 x.out; cp xL.ou1 xL.out; cp Q.ou0 Q.out;"
-			" cp pftestx.out pftest.out\n");
-		break;
-	  default:
-		printf("cp x.ou0 x.out; cp xL.ou0 xL.out; cp Q.ou0 Q.out;"
-			" cp pftestx.out pftest.out\n");
-	  }
-	return 0;
-	}
diff --git a/lib/libc/gdtoa/test/xsum0.out b/lib/libc/gdtoa/test/xsum0.out
deleted file mode 100644
index 52b8a3e60..000000000
--- a/lib/libc/gdtoa/test/xsum0.out
+++ /dev/null
@@ -1,41 +0,0 @@
-README	efba0d5d	3412
-Q.ou0	e4592b85	28742
-Q.ou1	ea0b344d	39572
-Qtest.c	efe2b3f4	5116
-d.out	f271efc9	28131
-dI.out	d522eef	4369
-dIsi.out	1dd6d02f	4350
-dItest.c	e33800ce	2371
-dd.out	e262456e	40923
-ddsi.out	1f94bbe2	10251
-ddtest.c	ef71cbf3	4986
-dt.c	e562c302	6808
-dtest.c	9a5d01	4080
-dtst.out	e284ac98	23711
-f.out	9013e91	21537
-ftest.c	1c824a88	4001
-getround.c	ee95ed1	2502
-makefile	f714a641	5634
-pfLqtestnos	ffb9723	99
-pftest.c	ea314d7f	3452
-pftestQ.out	198434fd	830
-pftestx.out	1ccea5dd	788
-pftestLq.out	1691dbfc	845
-pftestnos	ecbc9be6	101
-rtestnos	f94bcdf6	336
-strtoIdSI.c	7bfb88b	49
-strtoIddSI.c	72e8852	50
-strtodISI.c	ed08b740	49
-strtodt.c	f1aa53af	3374
-strtopddSI.c	13e7138d	50
-strtorddSI.c	f7e4b1d5	50
-testnos	e89999d6	485
-testnos1	7e16229	294
-testnos3	f5ae7ef3	14403
-x.ou0	1402f834	25372
-x.ou1	f1af5a00	34581
-xL.ou0	faa3a741	26363
-xL.ou1	e349e5c	37165
-xLtest.c	ee11f673	4843
-xQtest.c	efbe29be	1912
-xtest.c	ec9f5deb	4834
diff --git a/lib/libc/gdtoa/test/xtest.c b/lib/libc/gdtoa/test/xtest.c
deleted file mode 100644
index 6e7fa4696..000000000
--- a/lib/libc/gdtoa/test/xtest.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998-2001 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-/* Test program for g_xfmt, strtoIx, strtopx, and strtorx.
- *
- * Inputs (on stdin):
- *		r rounding_mode
- *		n ndig
- *		number
- *		#hex0 hex1 hex2 hex3 hex4
- *
- *	rounding_mode values:
- *		0 = toward zero
- *		1 = nearest
- *		2 = toward +Infinity
- *		3 = toward -Infinity
- *
- * where number is a decimal floating-point number,
- * hex0 is a string of <= 4 Hex digits for the most significant
- * half-word of the number, hex1 is a similar string for the next
- * half-word, etc., and ndig is a parameters to g_xfmt.
- */
-
-#include "gdtoa.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
- extern int getround ANSI((int,char*));
-
- static char ibuf[2048], obuf[2048];
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_BIG_ENDIAN or IEEE_LITTLE_ENDIAN should be #defined */
-
-#ifdef IEEE_BIG_ENDIAN
-#define _0 0
-#define _1 1
-#define _2 2
-#define _3 3
-#define _4 4
-#endif
-#ifdef IEEE_LITTLE_ENDIAN
-#define _0 4
-#define _1 3
-#define _2 2
-#define _3 1
-#define _4 0
-#endif
-
- int
-main(Void)
-{
-	char *s, *se, *se1;
-	int i, dItry, ndig = 0, r = 1;
-	union { long double d; UShort bits[5]; } u, v[2];
-
-	while((s = fgets(ibuf, sizeof(ibuf), stdin))) {
-		while(*s <= ' ')
-			if (!*s++)
-				continue;
-		dItry = 0;
-		switch(*s) {
-		  case 'r':
-			r = getround(r, s);
-			continue;
-		  case 'n':
-			i = s[1];
-			if (i <= ' ' || (i >= '0' && i <= '9')) {
-				ndig = atoi(s+1);
-				continue;
-				}
-			break; /* nan? */
-		  case '#':
-			sscanf(s+1, "%hx %hx %hx %hx %hx", &u.bits[_0],
-				&u.bits[_1], &u.bits[_2], &u.bits[_3],
-				&u.bits[_4]);
-			printf("\nInput: %s", ibuf);
-			printf(" --> f = #%x %x %x %x %x\n", u.bits[_0],
-				u.bits[_1], u.bits[_2], u.bits[_3], u.bits[_4]);
-			goto fmt_test;
-			}
-		dItry = 1;
-		printf("\nInput: %s", ibuf);
-		i = strtorx(ibuf, &se, r, u.bits);
-		if (r == 1 && (i != strtopx(ibuf, &se1, v[0].bits) || se1 != se
-		 || memcmp(u.bits, v[0].bits, 10)))
-			printf("***strtox and strtorx disagree!!\n:");
-		printf("\nstrtox consumes %d bytes and returns %d\n",
-				(int)(se-ibuf), i);
-		printf("with bits = #%x %x %x %x %x\n",
-			u.bits[_0], u.bits[_1], u.bits[_2],
-			u.bits[_3], u.bits[_4]);
-		if (sizeof(long double) == 12)
-			printf("printf(\"%%.21Lg\") gives %.21Lg\n", u.d);
- fmt_test:
-		se = g_xfmt(obuf, u.bits, ndig, sizeof(obuf));
-		printf("g_xfmt(%d) gives %d bytes: \"%s\"\n\n",
-			ndig, (int)(se-obuf), se ? obuf : "<null>");
-		if (!dItry)
-			continue;
-		printf("strtoIx returns %d,",
-			strtoIx(ibuf, &se, v[0].bits, v[1].bits));
-		printf(" consuming %d bytes.\n", (int)(se-ibuf));
-		if (!memcmp(v[0].bits, v[1].bits, 10)) {
-			if (!memcmp(u.bits, v[0].bits, 10))
-				printf("fI[0] == fI[1] == strtox\n");
-			else {
-				printf("fI[0] == fI[1] = #%x %x %x %x %x\n",
-					v[0].bits[_0], v[0].bits[_1],
-					v[0].bits[_2], v[0].bits[_3],
-					v[0].bits[_4]);
-				if (sizeof(long double) == 12)
-				    printf("= %.21Lg\n", v[0].d);
-				}
-			}
-		else {
-			printf("fI[0] = #%x %x %x %x %x\n",
-					v[0].bits[_0], v[0].bits[_1],
-					v[0].bits[_2], v[0].bits[_3],
-					v[0].bits[_4]);
-			if (sizeof(long double) == 12)
-				printf("= %.21Lg\n", v[0].d);
-			printf("fI[1] = #%x %x %x %x %x\n",
-					v[1].bits[_0], v[1].bits[_1],
-					v[1].bits[_2], v[1].bits[_3],
-					v[1].bits[_4]);
-			if (sizeof(long double) == 12)
-				printf("= %.21Lg\n", v[1].d);
-			if (!memcmp(v[0].bits, u.bits, 10))
-				printf("fI[0] == strtox\n");
-			else if (!memcmp(v[1].bits, u.bits, 10))
-				printf("fI[1] == strtox\n");
-			else
-				printf("**** Both differ from strtod ****\n");
-			}
-		printf("\n");
-		}
-	return 0;
-	}
diff --git a/lib/libc/gdtoa/ulp.c b/lib/libc/gdtoa/ulp.c
deleted file mode 100644
index 2da0c0336..000000000
--- a/lib/libc/gdtoa/ulp.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* $NetBSD: ulp.c,v 1.3 2011/03/20 23:15:35 christos Exp $ */
-
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 1999 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, 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.
-
-****************************************************************/
-
-/* Please send bug reports to David M. Gay (dmg at acm dot org,
- * with " at " changed at "@" and " dot " changed to ".").	*/
-
-#include "gdtoaimp.h"
-
- double
-ulp
-#ifdef KR_headers
-	(x) U *x;
-#else
-	(U *x)
-#endif
-{
-	Long L;
-	U a;
-
-	L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
-#ifndef Sudden_Underflow
-	if (L > 0) {
-#endif
-#ifdef IBM
-		L |= Exp_msk1 >> 4;
-#endif
-		word0(&a) = L;
-		word1(&a) = 0;
-#ifndef Sudden_Underflow
-		}
-	else {
-		L = (unsigned int)-L >> Exp_shift;
-		if (L < Exp_shift) {
-			word0(&a) = 0x80000 >> L;
-			word1(&a) = 0;
-			}
-		else {
-			word0(&a) = 0;
-			L -= Exp_shift;
-			word1(&a) = L >= 31 ? 1 : 1 << (31 - L);
-			}
-		}
-#endif
-	return dval(&a);
-	}
diff --git a/lib/libc/gdtoa/xsum0.out b/lib/libc/gdtoa/xsum0.out
deleted file mode 100644
index e9c29bc23..000000000
--- a/lib/libc/gdtoa/xsum0.out
+++ /dev/null
@@ -1,52 +0,0 @@
-README	664d441	15750
-arithchk.c	ebbe5bc7	4075
-dmisc.c	c8daa18	4682
-dtoa.c	f6ed7306	17542
-g_Qfmt.c	f6aad16c	2926
-g__fmt.c	e961947e	3401
-g_ddfmt.c	1f75ef12	4161
-g_dfmt.c	24be3a8	2629
-g_ffmt.c	197652f1	2516
-g_xLfmt.c	3fd29c5	2773
-g_xfmt.c	f6a580a	2862
-gdtoa.c	e4651ba8	17355
-gdtoa.h	f966845d	4944
-gdtoa_fltrnds.h	1aaf5112	421
-gdtoaimp.h	395c83e	20044
-gethex.c	144ecbb4	7107
-gmisc.c	1859d016	2084
-hd_init.c	efdbe921	1797
-hexnan.c	891b04e	3468
-makefile	ffae86d0	3148
-misc.c	1d84f517	14416
-printf.c	15c97ab	158
-printf.c0	efece124	29696
-qnan.c	efd33d64	3417
-smisc.c	feb7290	3699
-stdio1.h	e6e5dc11	2909
-strtoIQ.c	1809dfcf	1939
-strtoId.c	f41ddac2	1931
-strtoIdd.c	f13e3bc3	2105
-strtoIf.c	f12c6af4	1875
-strtoIg.c	fe47bc72	3591
-strtoIx.c	e50f716d	1960
-strtoIxL.c	ea0b821b	1931
-strtod.c	1dabf6	22744
-strtodI.c	f1dbb0af	4004
-strtodg.c	eacc7424	21188
-strtodnrp.c	af895e9	2538
-strtof.c	e1cb24dd	2161
-strtopQ.c	f244b012	2645
-strtopd.c	1c3c9ce	1751
-strtopdd.c	177251c9	4640
-strtopf.c	f305c6ea	2155
-strtopx.c	1529e1f5	2710
-strtopxL.c	69418e3	2469
-strtorQ.c	9360a0b	2885
-strtord.c	af5c50e	2491
-strtordd.c	e3d20ab	4992
-strtorf.c	fbe2ea18	2402
-strtorx.c	168faee5	2957
-strtorxL.c	42c6cec	2718
-sum.c	f525bad9	2494
-ulp.c	edb56c0b	1866
diff --git a/lib/libc/gen/Lint___setjmp14.c b/lib/libc/gen/Lint___setjmp14.c
deleted file mode 100644
index 1d4f47fa5..000000000
--- a/lib/libc/gen/Lint___setjmp14.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: Lint___setjmp14.c,v 1.3 2005/04/09 12:48:58 dsl Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <setjmp.h>
-
-/*ARGSUSED*/
-int
-__setjmp14(jmp_buf env)
-{
-	return 0;
-}
-
-/*ARGSUSED*/
-void
-__longjmp14(jmp_buf env, int val)
-{
-}
diff --git a/lib/libc/gen/Lint___sigsetjmp14.c b/lib/libc/gen/Lint___sigsetjmp14.c
deleted file mode 100644
index 7bd3da5b5..000000000
--- a/lib/libc/gen/Lint___sigsetjmp14.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* $NetBSD: Lint___sigsetjmp14.c,v 1.2 2000/06/14 06:49:05 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <setjmp.h>
-
-/*ARGSUSED*/
-int
-__sigsetjmp14(env, savemask)
-	sigjmp_buf env;
-	int savemask;
-{
-	return (0);
-}
-
-/*ARGSUSED*/
-void
-__siglongjmp14(env, val)
-	sigjmp_buf env;
-	int val;
-{
-}
diff --git a/lib/libc/gen/Lint__setjmp.c b/lib/libc/gen/Lint__setjmp.c
deleted file mode 100644
index f12a441bf..000000000
--- a/lib/libc/gen/Lint__setjmp.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $NetBSD: Lint__setjmp.c,v 1.2 2000/06/14 06:49:05 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <setjmp.h>
-
-/*ARGSUSED*/
-int
-_setjmp(env)
-	jmp_buf env;
-{
-	return (0);
-}
-
-/*ARGSUSED*/
-void
-_longjmp(env, val)
-	jmp_buf env;
-	int val;
-{
-}
diff --git a/lib/libc/gen/Lint_alloca.c b/lib/libc/gen/Lint_alloca.c
deleted file mode 100644
index 66624414f..000000000
--- a/lib/libc/gen/Lint_alloca.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: Lint_alloca.c,v 1.2 2000/06/14 06:49:05 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <stdlib.h>
-
-/*ARGSUSED*/
-void *
-alloca(size)
-	size_t size;
-{
-	return (0);
-}
diff --git a/lib/libc/gen/Lint_bswap16.c b/lib/libc/gen/Lint_bswap16.c
deleted file mode 100644
index 2842e6f70..000000000
--- a/lib/libc/gen/Lint_bswap16.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $NetBSD: Lint_bswap16.c,v 1.3 2001/02/27 19:04:40 cgd Exp $ */
-/* Written by Manuel Bouyer. Public Domain */
-
-#include <sys/types.h>
-
-/*ARGSUSED*/
-/*LINTED prototype mismatch */
-u_int16_t
-bswap16(b16)
-	u_int16_t b16;
-{
-	return 0;
-}
diff --git a/lib/libc/gen/Lint_bswap32.c b/lib/libc/gen/Lint_bswap32.c
deleted file mode 100644
index 3c7c4217d..000000000
--- a/lib/libc/gen/Lint_bswap32.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $NetBSD: Lint_bswap32.c,v 1.2 2001/02/27 19:04:40 cgd Exp $ */
-/* Written by Manuel Bouyer. Public Domain */
-
-#include <sys/types.h>
-
-/*ARGSUSED*/
-u_int32_t
-bswap32(b32)
-	u_int32_t b32;
-{
-	return 0;
-}
diff --git a/lib/libc/gen/Lint_bswap64.c b/lib/libc/gen/Lint_bswap64.c
deleted file mode 100644
index 77286d77d..000000000
--- a/lib/libc/gen/Lint_bswap64.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $NetBSD: Lint_bswap64.c,v 1.2 2001/02/27 19:04:40 cgd Exp $ */
-/* Written by Manuel Bouyer. Public Domain */
-
-#include <sys/types.h>
-
-/*ARGSUSED*/
-u_int64_t
-bswap64(b64)
-	u_int64_t b64;
-{
-	return 0;
-}
diff --git a/lib/libc/gen/Lint_fabs.c b/lib/libc/gen/Lint_fabs.c
deleted file mode 100644
index fe28e2e92..000000000
--- a/lib/libc/gen/Lint_fabs.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: Lint_fabs.c,v 1.2 2000/06/14 06:49:05 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <math.h>
-
-/*ARGSUSED*/
-double
-fabs(x)
-	double x;
-{
-	return (0.0);
-}
diff --git a/lib/libc/gen/Lint_flt_rounds.c b/lib/libc/gen/Lint_flt_rounds.c
deleted file mode 100644
index 0cff68679..000000000
--- a/lib/libc/gen/Lint_flt_rounds.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $NetBSD: Lint_flt_rounds.c,v 1.3 2012/06/24 15:26:03 christos Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-/*ARGSUSED*/
-int
-__flt_rounds(void)
-{
-	return (0);
-}
diff --git a/lib/libc/gen/Lint_fpgetmask.c b/lib/libc/gen/Lint_fpgetmask.c
deleted file mode 100644
index 2d0f57b71..000000000
--- a/lib/libc/gen/Lint_fpgetmask.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_fpgetmask.c,v 1.3 2012/06/24 15:26:03 christos Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <ieeefp.h>
-
-/*ARGSUSED*/
-fp_except
-fpgetmask(void)
-{
-	fp_except rv = { 0 };
-
-	return (rv);
-}
diff --git a/lib/libc/gen/Lint_fpgetround.c b/lib/libc/gen/Lint_fpgetround.c
deleted file mode 100644
index 44cfc63e3..000000000
--- a/lib/libc/gen/Lint_fpgetround.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_fpgetround.c,v 1.3 2012/06/24 15:26:03 christos Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <ieeefp.h>
-
-/*ARGSUSED*/
-fp_rnd
-fpgetround(void)
-{
-	fp_rnd rv = { 0 };
-
-	return (rv);
-}
diff --git a/lib/libc/gen/Lint_fpgetsticky.c b/lib/libc/gen/Lint_fpgetsticky.c
deleted file mode 100644
index 64e8793b6..000000000
--- a/lib/libc/gen/Lint_fpgetsticky.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_fpgetsticky.c,v 1.3 2012/06/24 15:26:03 christos Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <ieeefp.h>
-
-/*ARGSUSED*/
-fp_except
-fpgetsticky(void)
-{
-	fp_except rv = { 0 };
-
-	return (rv);
-}
diff --git a/lib/libc/gen/Lint_fpsetmask.c b/lib/libc/gen/Lint_fpsetmask.c
deleted file mode 100644
index f50fbba6c..000000000
--- a/lib/libc/gen/Lint_fpsetmask.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: Lint_fpsetmask.c,v 1.2 2000/06/14 06:49:05 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <ieeefp.h>
-
-/*ARGSUSED*/
-fp_except
-fpsetmask(m)
-	fp_except m;
-{
-	fp_except rv = { 0 };
-
-	return (rv);
-}
diff --git a/lib/libc/gen/Lint_fpsetround.c b/lib/libc/gen/Lint_fpsetround.c
deleted file mode 100644
index 9d7d216bf..000000000
--- a/lib/libc/gen/Lint_fpsetround.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: Lint_fpsetround.c,v 1.2 2000/06/14 06:49:05 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <ieeefp.h>
-
-/*ARGSUSED*/
-fp_rnd
-fpsetround(r)
-	fp_rnd r;
-{
-	fp_rnd rv = { 0 };
-
-	return (rv);
-}
diff --git a/lib/libc/gen/Lint_fpsetsticky.c b/lib/libc/gen/Lint_fpsetsticky.c
deleted file mode 100644
index 22fe09600..000000000
--- a/lib/libc/gen/Lint_fpsetsticky.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: Lint_fpsetsticky.c,v 1.2 2000/06/14 06:49:05 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <ieeefp.h>
-
-/*ARGSUSED*/
-fp_except
-fpsetsticky(s)
-	fp_except s;
-{
-	fp_except rv = { 0 };
-
-	return (rv);
-}
diff --git a/lib/libc/gen/Lint_frexp.c b/lib/libc/gen/Lint_frexp.c
deleted file mode 100644
index 3fb1c1472..000000000
--- a/lib/libc/gen/Lint_frexp.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*	$NetBSD: Lint_frexp.c,v 1.2 1998/12/02 09:47:20 christos Exp $	*/
-
-/*
- * This file placed in the public domain.
- * Matthias Pfaller, December 6, 1997.
- */
-
-#include <math.h>
-
-/*ARGSUSED*/
-double
-frexp(value, eptr)
-	double value;
-	int *eptr;
-{
-	return(0);
-}
diff --git a/lib/libc/gen/Lint_ldexp.c b/lib/libc/gen/Lint_ldexp.c
deleted file mode 100644
index 3cb80c04a..000000000
--- a/lib/libc/gen/Lint_ldexp.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*	$NetBSD: Lint_ldexp.c,v 1.2 1998/12/02 09:47:20 christos Exp $	*/
-
-/*
- * This file placed in the public domain.
- * Matthias Pfaller, December 6, 1997.
- */
-
-#include <math.h>
-
-/*ARGSUSED*/
-double
-ldexp(val, exp)
-	double val;
-	int exp;
-{
-	return(0);
-}
diff --git a/lib/libc/gen/Lint_modf.c b/lib/libc/gen/Lint_modf.c
deleted file mode 100644
index 1acf0ff7f..000000000
--- a/lib/libc/gen/Lint_modf.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: Lint_modf.c,v 1.2 2000/06/14 06:49:05 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <math.h>
-
-/*ARGSUSED*/
-double
-modf(value, iptr)
-	double value, *iptr;
-{
-	return (0.0);
-}
diff --git a/lib/libc/gen/Lint_resumecontext.c b/lib/libc/gen/Lint_resumecontext.c
deleted file mode 100644
index 4933908d9..000000000
--- a/lib/libc/gen/Lint_resumecontext.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*	$NetBSD: Lint_resumecontext.c,v 1.3 2011/09/19 21:24:58 joerg Exp $	*/
-
-/*
- * This file placed in the public domain.
- * Klaus Klein, January 26, 1999.
- */
-
-#include <ucontext.h>
-
-/*ARGSUSED*/
-void
-_resumecontext(void)
-{
-}
diff --git a/lib/libc/gen/Lint_swapcontext.c b/lib/libc/gen/Lint_swapcontext.c
deleted file mode 100644
index 0e0b45e80..000000000
--- a/lib/libc/gen/Lint_swapcontext.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*	$NetBSD: Lint_swapcontext.c,v 1.2 2003/01/18 11:38:47 thorpej Exp $	*/
-
-/*
- * This file placed in the public domain.
- * Klaus Klein, November 29, 1998.
- */
-
-#include <ucontext.h>
-
-/*ARGSUSED*/
-int
-swapcontext(oucp, ucp)
-	ucontext_t *oucp;
-	const ucontext_t *ucp;
-{
-
-	return (0);
-}
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
deleted file mode 100644
index 68b161049..000000000
--- a/lib/libc/gen/Makefile.inc
+++ /dev/null
@@ -1,223 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.191 2015/01/20 17:28:00 christos Exp $
-#	from: @(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-
-# gen sources
-.if defined(__MINIX)
-.PATH: ${NETBSDSRCDIR}/minix/lib/libc/gen
-
-CPPFLAGS.fslib.c+= -I${NETBSDSRCDIR}/minix/fs
-CPPFLAGS.fsversion.c+= -I${NETBSDSRCDIR}/minix/fs
-
-SRCS+= fsversion.c gcov.c itoa.c read_tsc_64.c fslib.c
-
-.endif # defined(__MINIX)
-.PATH: ${ARCHDIR}/gen ${.CURDIR}/gen
-
-.if ${RUMPRUN} != "yes"
-SRCS+=	_errno.c
-.endif
-
-.if defined(__MINIX)
-# Unsupported by Minix.
-# 	closefrom.c confstr.c extattr.c \
-#	pthread_atfork.c
-#
-# Not useful but portable
-#	disklabel.c
-
-SRCS+=	alarm.c alphasort.c arc4random.c assert.c asysctl.c \
-	basename.c clock.c closedir.c \
-	ctermid.c ctype_.c daemon.c \
-	dehumanize_number.c devname.c dirname.c err.c errx.c \
-	errc.c errlist.c errno.c execl.c execle.c execlp.c execv.c execvp.c \
-	fmtcheck.c fmtmsg.c fnmatch.c fstab.c ftok.c \
-	fts.c ftw.c getbsize.c getcap.c getcwd.c \
-	getdevmajor.c getdomainname.c getgrent.c \
-	getgrouplist.c getgroupmembership.c gethostname.c \
-	getloadavg.c getlogin.c getmntinfo.c \
-	getnetgrent.c getpagesize.c \
-	getpass.c getprogname.c getpwent.c getttyent.c \
-	getusershell.c glob.c humanize_number.c initdir.c initgroups.c \
-	isascii.c isatty.c isctype.c lockf.c nftw.c \
-	nice.c nlist.c nlist_aout.c nlist_coff.c nlist_ecoff.c nlist_elf32.c \
-	nlist_elf64.c opendir.c pause.c popen.c posix_spawn_sched.c \
-	posix_spawn_fileactions.c posix_spawnp.c psignal.c \
-	ptree.c pwcache.c pw_scan.c raise.c randomid.c rb.c readdir.c \
-	rewinddir.c scandir.c seekdir.c setdomainname.c \
-	sethostname.c setjmperr.c setmode.c setproctitle.c setprogname.c \
-	shquote.c shquotev.c sighold.c sigignore.c siginterrupt.c \
-	siglist.c signal.c signame.c sigrelse.c \
-	sigset.c sigsetops.c sleep.c \
-	stringlist.c sysconf.c sysctl.c sysctlbyname.c sysctlgetmibinfo.c \
-	sysctlnametomib.c syslog.c telldir.c time.c \
-	times.c toascii.c tolower_.c ttyname.c ttyslot.c toupper_.c ualarm.c \
-	ulimit.c uname.c unvis.c usleep.c utime.c utimens.c utmp.c \
-	utmpx.c valloc.c vis.c wait.c wait3.c waitpid.c warn.c warnx.c \
-	warnc.c vwarn.c vwarnx.c vwarnc.c verr.c verrx.c verrc.c wordexp.c
-.endif # defined(__MINIX)
-
-# uses alloca
-COPTS.execvp.c = -Wno-stack-protector
-COPTS.execl.c = -Wno-stack-protector
-COPTS.execle.c = -Wno-stack-protector
-COPTS.execlp.c = -Wno-stack-protector
-COPTS.syslog.c = -Wno-format-nonliteral
-
-# machine-dependent gen sources
-# m-d Makefile.inc must include sources for:
-#	_setjmp() bswap16() bswap32() bswap64() fabs() infinity
-#	isinf() setjmp() sigsetjmp()
-
-.include "${ARCHDIR}/gen/Makefile.inc"
-
-MAN+=	alarm.3 arc4random.3 basename.3 bswap.3 clock.3 closefrom.3 \
-	confstr.3 \
-	cpuset.3 ctermid.3 ctype.3 daemon.3 devname.3 directory.3 dirname.3 \
-	endutxent.3 err.3 exec.3 extattr_copy_file.3 extattr_namespace_to_string.3 \
-	fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 fpgetmask.3 \
-	ftok.3 fts.3 ftw.3 \
-	getbsize.3 cgetcap.3 getcwd.3 getdevmajor.3 \
-	getdomainname.3 getdiskbyname.3 getfsent.3 \
-	getgrent.3 getgrouplist.3 gethostname.3 getlastlogx.3 getloadavg.3 \
-	getmntinfo.3 getnetgrent.3 getpagesize.3 getpass.3 \
-	getprogname.3 getpwent.3 getttyent.3 getusershell.3 glob.3 \
-	humanize_number.3 \
-	initgroups.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \
-	isdigit.3 isfinite.3 isgraph.3 isgreater.3 isinf.3 islower.3 isnan.3 \
-	isnormal.3 isprint.3 ispunct.3 isspace.3 isupper.3 isxdigit.3 \
-	lockf.3 _lwp_makecontext.3 makecontext.3 \
-	nice.3 nlist.3 \
-	pause.3 popen.3 \
-	posix_spawn.3 posix_spawn_file_actions_addopen.3 \
-	posix_spawn_file_actions_init.3 posix_spawnattr_getflags.3 \
-	posix_spawnattr_getpgroup.3 posix_spawnattr_getschedparam.3 \
-	posix_spawnattr_getschedpolicy.3 posix_spawnattr_init.3 \
-	posix_spawnattr_getsigdefault.3 posix_spawnattr_getsigmask.3 \
-	psignal.3 pwcache.3 pthread_atfork.3 \
-	raise.3 randomid.3 realpath.3 scandir.3 setjmp.3 setmode.3 \
-	setproctitle.3 shquote.3 sighold.3 sigignore.3 siginterrupt.3 \
-	signal.3 signbit.3 sigrelse.3 sigset.3 sigsetops.3 sleep.3 \
-	stringlist.3 sysconf.3 sysctl.3 syslog.3 time.3 times.3 \
-	timezone.3 toascii.3 tolower.3 toupper.3 ttyname.3 \
-	ualarm.3 ulimit.3 uname.3 unvis.3 usleep.3 utime.3 valloc.3 vis.3 \
-	wordexp.3
-
-MLINKS+=bswap.3 bswap16.3 bswap.3 bswap32.3 bswap.3 bswap64.3
-MLINKS+=cpuset.3 cpuset_create.3 cpuset.3 cpuset_destroy.3 \
-	cpuset.3 cpuset_zero.3 cpuset.3 cpuset_set.3 cpuset.3 cpuset_clr.3 \
-	cpuset.3 cpuset_isset.3 cpuset.3 cpuset_size.3
-MLINKS+=directory.3 closedir.3 directory.3 dirfd.3 directory.3 opendir.3 \
-	directory.3 readdir.3 directory.3 readdir_r.3 directory.3 \
-	rewinddir.3 directory.3 seekdir.3 directory.3 telldir.3 \
-	directory.3 fdopendir.3	
-MLINKS+=endutxent.3 getutxent.3 endutxent.3 getutxid.3 \
-	endutxent.3 getutxline.3 endutxent.3 pututxline.3 \
-	endutxent.3 setutxent.3
-MLINKS+=err.3 verr.3 err.3 errx.3 err.3 verrx.3 err.3 warn.3 err.3 vwarn.3 \
-        err.3 warnx.3 err.3 vwarnx.3 err.3 errc.3 err.3 verrc.3 err.3 warnc.3 \
-	err.3 vwarnc.3
-MLINKS+=exec.3 execl.3 exec.3 execle.3 exec.3 execlp.3 exec.3 execlpe.3 \
-	exec.3 execv.3 exec.3 execvp.3 exec.3 execvpe.3 exec.3 exect.3 
-MLINKS+=extattr_namespace_to_string.3 extattr_string_to_namespace.3 \
-	extattr_copy_file.3 extattr_copy_fd.3 \
-	extattr_copy_file.3 extattr_copy_link.3 \
-	extattr_copy_file.3 cpxattr.3 \
-	extattr_copy_file.3 fcpxattr.3 \
-	extattr_copy_file.3 lcpxattr.3
-MLINKS+=fpgetmask.3 fpgetround.3 fpgetmask.3 fpgetsticky.3 \
-	fpgetmask.3 fpsetmask.3  fpgetmask.3 fpsetround.3 \
-	fpgetmask.3 fpsetsticky.3 fpgetmask.3 fpgetprec.3 \
-	fpgetmask.3 fpsetprec.3
-MLINKS+=fts.3 fts_open.3 fts.3 fts_read.3 fts.3 fts_children.3 \
-	fts.3 fts_set.3 fts.3 fts_close.3
-MLINKS+=ftw.3 nftw.3
-MLINKS+=cgetcap.3 cgetclose.3 cgetcap.3 cgetent.3 \
-	cgetcap.3 cgetfirst.3 cgetcap.3 cgetmatch.3 cgetcap.3 cgetnext.3 \
-	cgetcap.3 cgetnum.3 cgetcap.3 cgetset.3 cgetcap.3 cgetstr.3 \
-	cgetcap.3 cgetustr.3
-MLINKS+=getcwd.3 getwd.3
-MLINKS+=getpass.3 getpass_r.3
-MLINKS+=getpass.3 getpassfd.3
-MLINKS+=getdiskbyname.3 setdisktab.3
-MLINKS+=getdomainname.3 setdomainname.3
-MLINKS+=getfsent.3 endfsent.3 getfsent.3 getfsfile.3 getfsent.3 getfsspec.3 \
-	getfsent.3 setfsent.3
-MLINKS+=getgrent.3 endgrent.3 getgrent.3 setgroupent.3 getgrent.3 getgrgid.3 \
-	getgrent.3 getgrnam.3 getgrent.3 setgrent.3
-MLINKS+=getgrent.3 getgrgid_r.3 getgrent.3 getgrnam_r.3 getgrent.3 getgrent_r.3
-MLINKS+=getgrouplist.3 getgroupmembership.3
-MLINKS+=gethostname.3 sethostname.3
-MLINKS+=getlastlogx.3 getutmp.3 getlastlogx.3 getutmpx.3
-MLINKS+=getlastlogx.3 updlastlogx.3 getlastlogx.3 updwtmpx.3
-MLINKS+=getlastlogx.3 utmpxname.3
-MLINKS+=getnetgrent.3 endnetgrent.3 getnetgrent.3 innetgr.3 \
-	getnetgrent.3 setnetgrent.3
-MLINKS+=getprogname.3 setprogname.3
-MLINKS+=getpwent.3 endpwent.3 getpwent.3 setpassent.3 getpwent.3 getpwnam.3 \
-	getpwent.3 getpwuid.3 getpwent.3 setpwent.3
-MLINKS+=getpwent.3 getpwnam_r.3 getpwent.3 getpwuid_r.3 getpwent.3 getpwent_r.3
-# getpwent.3 setpwfile.3 - deprecated
-MLINKS+=getttyent.3 endttyent.3 getttyent.3 getttynam.3 \
-	getttyent.3 setttyent.3 getttyent.3 setttyentpath.3
-MLINKS+=getusershell.3 endusershell.3 getusershell.3 setusershell.3
-MLINKS+=glob.3 globfree.3
-MLINKS+=glob.3 glob_pattern_p.3
-MLINKS+=humanize_number.3 dehumanize_number.3
-MLINKS+=makecontext.3 swapcontext.3
-MLINKS+=popen.3 pclose.3
-MLINKS+=popen.3 popenve.3
-MLINKS+=posix_spawn.3 posix_spawnp.3 \
-	posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addclose.3 \
-	posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_adddup2.3 \
-	posix_spawn_file_actions_init.3 posix_spawn_file_actions_destroy.3 \
-	posix_spawnattr_getflags.3 posix_spawnattr_setflags.3 \
-	posix_spawnattr_getpgroup.3 posix_spawnattr_setpgroup.3 \
-	posix_spawnattr_getschedparam.3 posix_spawnattr_setschedparam.3 \
-	posix_spawnattr_getschedpolicy.3 posix_spawnattr_setschedpolicy.3 \
-	posix_spawnattr_getsigdefault.3 posix_spawnattr_setsigdefault.3 \
-	posix_spawnattr_getsigmask.3 posix_spawnattr_setsigmask.3 \
-	posix_spawnattr_init.3 posix_spawnattr_destroy.3
-MLINKS+=psignal.3 sys_siglist.3 psignal.3 sys_signame.3 psignal.3 psiginfo.3
-MLINKS+=pwcache.3 user_from_uid.3 pwcache.3 group_from_gid.3
-MLINKS+=pwcache.3 uid_from_user.3 pwcache.3 gid_from_group.3
-MLINKS+=pwcache.3 pwcache_userdb.3 pwcache.3 pwcache_groupdb.3
-MLINKS+=randomid.3 randomid_new.3 randomid.3 randomid_delete.3
-MLINKS+=scandir.3 alphasort.3
-MLINKS+=setjmp.3 _longjmp.3 setjmp.3 _setjmp.3 setjmp.3 longjmp.3 \
-	setjmp.3 longjmperror.3 setjmp.3 sigsetjmp.3 setjmp.3 siglongjmp.3
-MLINKS+=setmode.3 getmode.3
-MLINKS+=shquote.3 shquotev.3
-MLINKS+=sigsetops.3 sigemptyset.3 sigsetops.3 sigfillset.3 \
-	sigsetops.3 sigaddset.3 sigsetops.3 sigdelset.3 \
-	sigsetops.3 sigismember.3
-MLINKS+=stringlist.3 sl_init.3 stringlist.3 sl_free.3 stringlist.3 sl_add.3 \
-	stringlist.3 sl_find.3
-MLINKS+=sysctl.3 sysctlbyname.3 sysctl.3 sysctlgetmibinfo.3 \
-	sysctl.3 sysctlnametomib.3
-MLINKS+=syslog.3 closelog.3 syslog.3 openlog.3 syslog.3 setlogmask.3 \
-	syslog.3 vsyslog.3
-MLINKS+=syslog.3 closelog_r.3 syslog.3 openlog_r.3 syslog.3 setlogmask_r.3 \
-	syslog.3 syslog_r.3 syslog.3 vsyslog_r.3
-MLINKS+=syslog.3 syslogp.3 syslog.3 syslogp_r.3 \
-	syslog.3 vsyslogp.3 syslog.3 vsyslogp_r.3
-MLINKS+=ttyname.3 isatty.3 ttyname.3 ttyslot.3 ttyname.3 ttyname_r.3
-MLINKS+=unvis.3 strunvis.3 unvis.3 strunvisx.3
-MLINKS+=unvis.3 strnunvis.3 unvis.3 strnunvisx.3
-MLINKS+=vis.3 svis.3 vis.3 strvis.3 vis.3 strvisx.3 vis.3 strsvis.3 \
-	vis.3 strsvisx.3 vis.3 nvis.3
-MLINKS+=vis.3 snvis.3 vis.3 strnvis.3 vis.3 strnvisx.3 vis.3 strsnvis.3 \
-	vis.3 strsnvisx.3
-
-CPPFLAGS.ctype_.c+=	-I${LIBCDIR}/locale
-CPPFLAGS.isctype.c+=	-I${LIBCDIR}/locale
-CPPFLAGS.tolower_.c+=	-I${LIBCDIR}/locale
-CPPFLAGS.toupper_.c+=	-I${LIBCDIR}/locale
-
-errlist.c: errlist.awk ${NETBSDSRCDIR}/sys/sys/errno.h
-.if defined(__MINIX)
-	${TOOL_CAT} ${NETBSDSRCDIR}/sys/sys/errno.h | ${TOOL_SED} 's/(_SIGN//' | ${TOOL_AWK} -f ${NETBSDSRCDIR}/lib/libc/gen/errlist.awk > ${.TARGET}
-.else
-	${TOOL_AWK} -f ${.ALLSRC} > ${.TARGET}
-.endif
-
-CLEANFILES+= errlist.c
diff --git a/lib/libc/gen/_errno.c b/lib/libc/gen/_errno.c
deleted file mode 100644
index 257900d1e..000000000
--- a/lib/libc/gen/_errno.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: _errno.c,v 1.13 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _errno.c,v 1.13 2008/04/28 20:22:59 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "reentrant.h"
-#include <errno.h>
-#include <stdlib.h>
-
-#undef errno
-extern int errno;
-
-int *
-__errno(void)
-{
-#ifdef _REENTRANT
-	if (__isthreaded == 0)
-		return &errno;
-
-	return thr_errno();
-#else
-	return &errno;
-#endif
-}
diff --git a/lib/libc/gen/_lwp_makecontext.3 b/lib/libc/gen/_lwp_makecontext.3
deleted file mode 100644
index 9994c98d1..000000000
--- a/lib/libc/gen/_lwp_makecontext.3
+++ /dev/null
@@ -1,74 +0,0 @@
-.\"	$NetBSD: _lwp_makecontext.3,v 1.4 2008/04/30 13:10:50 martin Exp $
-.\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of Wasabi Systems, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 16, 2003
-.Dt _LWP_MAKECONTEXT 3
-.Os
-.Sh NAME
-.Nm _lwp_makecontext
-.Nd create a new initial light-weight process execution context
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In lwp.h
-.Ft void
-.Fn _lwp_makecontext "ucontext_t *context" "void (*start_routine)(void *)" \
-    "void *arg" "void *private" "caddr_t stack_base" "size_t stack_size"
-.Sh DESCRIPTION
-.Fn _lwp_makecontext
-initializes the context structure pointed to by
-.Fa context
-in a manner suitable for using with
-.Xr _lwp_create 2 .
-The LWP will begin execution at the function specified by
-.Fa start_routine
-which will be passed a single argument
-.Fa arg .
-The LWP private data pointer will be set to
-.Fa private .
-The stack region for the new LWP is specified by the
-.Fa stack_base
-and
-.Fa stack_size
-arguments.
-.Pp
-The signal mask in the context structure is not initialized by
-.Fn _lwp_makecontext .
-.Sh SEE ALSO
-.Xr _lwp_create 2 ,
-.Xr _lwp_getprivate 2
-.Sh HISTORY
-The
-.Fn _lwp_create
-system call first appeared in
-.Nx 2.0 .
-.Sh BUGS
-The LWP private data pointer is not initialized by the current
-implementation of
-.Fn _lwp_makecontext .
diff --git a/lib/libc/gen/alarm.3 b/lib/libc/gen/alarm.3
deleted file mode 100644
index 4eba88342..000000000
--- a/lib/libc/gen/alarm.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\"	$NetBSD: alarm.3,v 1.22 2003/08/07 16:42:45 agc Exp $
-.\"
-.\" Copyright (c) 1980, 1991, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)alarm.3	8.2 (Berkeley) 4/19/94
-.\"
-.Dd April 19, 1994
-.Dt ALARM 3
-.Os
-.Sh NAME
-.Nm alarm
-.Nd set signal timer alarm
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft unsigned int
-.Fn alarm "unsigned int seconds"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by
-.Xr setitimer 2 .
-.Ef
-.Pp
-The
-.Fn alarm
-function sets a timer to deliver the signal
-.Dv SIGALRM
-to the calling process
-.Ar seconds
-after the call to
-.Fn alarm .
-If an alarm has already been set with
-.Fn alarm
-but has not been delivered, another call to
-.Fn alarm
-will supersede the prior call.
-The request
-.Fn alarm "0"
-voids the current
-alarm and the signal SIGALRM will not be delivered.
-The maximum number of
-.Ar seconds
-allowed
-is 2147483647.
-.Pp
-The return value of
-.Fn alarm
-is the amount of time left on the timer from a previous call to
-.Fn alarm .
-If no alarm is currently set, the return value is 0.
-If there is an error setting the timer,
-.Fn alarm
-returns ((unsigned int) -1).
-.Sh SEE ALSO
-.Xr setitimer 2 ,
-.Xr sigaction 2 ,
-.Xr sigsuspend 2 ,
-.Xr signal 3 ,
-.Xr sigvec 3 ,
-.Xr sleep 3 ,
-.Xr ualarm 3 ,
-.Xr usleep 3
-.Sh STANDARDS
-The
-.Fn alarm
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-An
-.Fn alarm
-function appeared in
-.At v7 .
diff --git a/lib/libc/gen/alarm.c b/lib/libc/gen/alarm.c
deleted file mode 100644
index 6d8f2d8f3..000000000
--- a/lib/libc/gen/alarm.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: alarm.c,v 1.11 2012/06/25 22:32:43 abs Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)alarm.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: alarm.c,v 1.11 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Backwards compatible alarm.
- */
-#include "namespace.h"
-#include <sys/time.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(alarm,_alarm)
-#endif
-
-unsigned int
-alarm(unsigned int secs)
-{
-	struct itimerval it, oitv;
-	struct itimerval *itp = &it;
-
-	timerclear(&itp->it_interval);
-	itp->it_value.tv_sec = secs;
-	itp->it_value.tv_usec = 0;
-	if (setitimer(ITIMER_REAL, itp, &oitv) == -1)
-		return (unsigned int) -1;
-	if (oitv.it_value.tv_usec)
-		oitv.it_value.tv_sec++;
-	return (unsigned int)oitv.it_value.tv_sec;
-}
diff --git a/lib/libc/gen/alphasort.c b/lib/libc/gen/alphasort.c
deleted file mode 100644
index c8310d425..000000000
--- a/lib/libc/gen/alphasort.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: alphasort.c,v 1.2 2009/03/01 19:59:55 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)scandir.c	8.3 (Berkeley) 1/2/94";
-#else
-__RCSID("$NetBSD: alphasort.c,v 1.2 2009/03/01 19:59:55 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <dirent.h>
-#include <string.h>
-
-/*
- * Alphabetic order comparison routine for those who want it.
- */
-int
-alphasort(const void *d1, const void *d2)
-{
-
-	_DIAGASSERT(d1 != NULL);
-	_DIAGASSERT(d2 != NULL);
-
-	return (strcmp((*(const struct dirent *const *)d1)->d_name,
-	    (*(const struct dirent *const *)d2)->d_name));
-}
diff --git a/lib/libc/gen/arc4random.3 b/lib/libc/gen/arc4random.3
deleted file mode 100644
index 29dbe9afc..000000000
--- a/lib/libc/gen/arc4random.3
+++ /dev/null
@@ -1,317 +0,0 @@
-.\"	$NetBSD: arc4random.3,v 1.19 2014/11/17 18:41:29 riastradh Exp $
-.\"
-.\" Copyright (c) 2014 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Taylor R. 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd November 16, 2014
-.Dt ARC4RANDOM 3
-.Os
-.Sh NAME
-.Nm arc4random ,
-.Nm arc4random_uniform ,
-.Nm arc4random_buf ,
-.Nm arc4random_stir ,
-.Nm arc4random_addrandom
-.Nd random number generator
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft uint32_t
-.Fn arc4random "void"
-.Ft uint32_t
-.Fn arc4random_uniform "uint32_t bound"
-.Ft void
-.Fn arc4random_buf "void *buf" "size_t len"
-.Ft void
-.Fn arc4random_stir "void"
-.Ft void
-.Fn arc4random_addrandom "unsigned char *buf" "int len"
-.Sh DESCRIPTION
-The
-.Nm
-family of functions provides a cryptographic pseudorandom number
-generator automatically seeded from the system entropy pool and safe to
-use from multiple threads.
-.Nm
-is designed to prevent an adversary from guessing outputs,
-unlike
-.Xr rand 3
-and
-.Xr random 3 ,
-and is faster and more convenient than reading from
-.Pa /dev/urandom
-directly.
-.Pp
-.Fn arc4random
-returns an integer in [0, 2^32) chosen independently with uniform
-distribution.
-.Pp
-.Fn arc4random_uniform
-returns an integer in [0,
-.Fa bound )
-chosen independently with uniform distribution.
-.Pp
-.Fn arc4random_buf
-stores
-.Fa len
-bytes into the memory pointed to by
-.Fa buf ,
-each byte chosen independently from [0, 256) with uniform
-distribution.
-.Pp
-.Fn arc4random_stir
-draws entropy from the operating system and incorporates it into the
-library's PRNG state to influence future outputs.
-.Pp
-.Fn arc4random_addrandom
-incorporates
-.Fa len
-bytes, which must be nonnegative, from the buffer
-.Fa buf ,
-into the library's PRNG state to influence future outputs.
-.Pp
-It is not necessary for an application to call
-.Fn arc4random_stir
-or
-.Fn arc4random_addrandom
-before calling other
-.Nm
-functions.
-The first call to any
-.Nm
-function will initialize the PRNG state unpredictably from the system
-entropy pool.
-.Sh SECURITY MODEL
-The
-.Nm
-functions provide the following security properties against three
-different classes of attackers, assuming enough entropy is provided by
-the operating system:
-.Bl -bullet -offset abcd
-.It
-An attacker who has seen some outputs of any of the
-.Nm
-functions cannot predict past or future unseen outputs.
-.It
-An attacker who has seen the library's PRNG state in memory cannot
-predict past outputs.
-.It
-An attacker who has seen one process's PRNG state cannot predict past
-or future outputs in other processes, particularly its parent or
-siblings.
-.El
-.Pp
-One
-.Sq output
-means the result of any single request to an
-.Nm
-function, no matter how short it is.
-.Sh IMPLEMENTATION NOTES
-The
-.Nm
-functions are currently implemented using the ChaCha20 pseudorandom
-function family.
-For any 32-byte string
-.Fa s ,
-.Pf ChaCha20_ Fa s
-is a function from 16-byte strings to 64-byte strings.
-It is conjectured that if
-.Fa s
-is chosen with uniform distribution, then the distribution on
-.Pf ChaCha20_ Fa s
-is indistinguishable to a computationally bounded adversary from a
-uniform distribution on all functions from 16-byte strings to 64-byte
-strings.
-.Pp
-The PRNG state is a 32-byte ChaCha20 key
-.Fa s .
-Each request to
-an
-.Nm
-function
-.Bl -bullet -offset abcd -compact
-.It
-computes the 64-byte quantity
-.Fa x
-=
-.Pf ChaCha20_ Fa s Ns (0),
-.It
-splits
-.Fa x
-into two 32-byte quantities
-.Fa s'
-and
-.Fa k ,
-.It
-replaces
-.Fa s
-by
-.Fa s' ,
-and
-.It
-uses
-.Fa k
-as output.
-.El
-.Pp
-.Fn arc4random
-yields the first four bytes of
-.Fa k
-as output directly.
-.Fn arc4random_buf
-either yields up to 32 bytes of
-.Fa k
-as output directly, or, for longer
-requests, uses
-.Fa k
-as a ChaCha20 key and yields the concatenation
-.Pf ChaCha20_ Fa k Ns (0)
-||
-.Pf ChaCha20_ Fa k Ns (1)
-|| ... as output.
-.Fn arc4random_uniform
-repeats
-.Fn arc4random
-until it obtains an integer in [2^32 %
-.Fa bound ,
-2^32), and reduces that modulo
-.Fa bound .
-.Pp
-The PRNG state is per-thread, unless memory allocation fails inside the
-library, in which case some threads may share global PRNG state with a
-mutex.
-The global PRNG state is zeroed on fork in the parent via
-.Xr pthread_atfork 3 ,
-and the per-thread PRNG state is zeroed on fork in the child via
-.Xr minherit 2
-with
-.Dv MAP_INHERIT_ZERO ,
-so that the child cannot reuse or see the parent's PRNG state.
-The PRNG state is reseeded automatically from the system entropy pool
-on the first use of an
-.Nm
-function after zeroing.
-.Pp
-The first use of an
-.Nm
-function may abort the process in the highly unlikely event that
-library initialization necessary to implement the security model fails.
-Additionally,
-.Fn arc4random_stir
-and
-.Fn arc4random_addrandom
-may abort the process in the highly unlikely event that the operating
-system fails to provide entropy.
-.Sh SEE ALSO
-.Xr rand 3 ,
-.Xr random 3 ,
-.Xr rnd 4 ,
-.Xr cprng 9
-.Rs
-.%A Daniel J. Bernstein
-.%T ChaCha, a variant of Salsa20
-.%D 2008-01-28
-.%O Document ID: 4027b5256e17b9796842e6d0f68b0b5e
-.%U http://cr.yp.to/papers.html#chacha
-.Re
-.Sh BUGS
-There is no way to get deterministic, reproducible results out of
-.Nm
-for testing purposes.
-.Pp
-The name
-.Sq arc4random
-was chosen for hysterical raisins -- it was originally implemented
-using the RC4 stream cipher, which has been known since shortly after
-it was published in 1994 to have observable biases in the output, and
-is now known to be broken badly enough to admit practical attacks in
-the real world.
-.\" Bob Jenkins, sci.crypt post dated 1994-09-16, message-id
-.\" <359qjg$55v$1@mhadg.production.compuserve.com>,
-.\" https://groups.google.com/d/msg/sci.crypt/JsO3xEATGFA/-wO4ttv7BCYJ
-.\"
-.\" Andrew Roos, `A Class of Weak Keys in the RC4 Stream Cipher',
-.\" sci.crypt posts dated 1995-09-22, message-ids
-.\" <43u1eh$1j3@hermes.is.co.za> and <44ebge$llf@hermes.is.co.za>.
-.\"
-.\" Paul Crowley, `Small bias in RC4 experimentally verified', March
-.\" 1998, http://www.ciphergoth.org/crypto/rc4/
-Unfortunately, the library found widespread adoption and the name stuck
-before anyone recognized that it was silly.
-.Pp
-The signature of
-.Fn arc4random_addrandom
-is silly.
-There is no reason to require casts or accept negative lengths:
-it should take a
-.Vt void *
-buffer and a
-.Vt size_t
-length.
-But it's too late to change that now.
-.Pp
-.Fn arc4random_uniform
-does not help to choose integers in [0,
-.Fa n )
-uniformly at random when
-.Fa n
-> 2^32.
-.Pp
-The security model of
-.Nm
-is stronger than many applications need, and stronger than other
-operating systems provide.
-For example, applications encrypting messages with random, but not
-secret, initialization vectors need only prevent an adversary from
-guessing future outputs, since past outputs will have been published
-already.
-.Pp
-On the one hand,
-.Nm
-could be marginally faster if it were not necessary to prevent an
-adversary who sees the state from predicting past outputs.
-On the other hand, there are applications in the wild that use
-.Nm
-to generate key material, such as OpenSSH, so for the sake of
-.Nx
-users it would be imprudent to weaken the security model.
-On the third hand, relying on the security model of
-.Nm
-in
-.Nx
-may lead you to an unpleasant surprise on another operating system
-whose implementation of
-.Nm
-has a weaker security model.
-.Pp
-One may be tempted to create new APIs to accommodate different
-security models and performance constraints without unpleasant
-surprises on different operating systems.
-This should not be done lightly, though, because there are already too
-many different choices, and too many opportunities for programmers to
-reach for one and pick the wrong one.
diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c
deleted file mode 100644
index adead46f7..000000000
--- a/lib/libc/gen/arc4random.c
+++ /dev/null
@@ -1,802 +0,0 @@
-/*	$NetBSD: arc4random.c,v 1.30 2015/05/13 23:15:57 justin Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Taylor R. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Legacy arc4random(3) API from OpenBSD reimplemented using the
- * ChaCha20 PRF, with per-thread state.
- *
- * Security model:
- * - An attacker who sees some outputs cannot predict past or future
- *   outputs.
- * - An attacker who sees the PRNG state cannot predict past outputs.
- * - An attacker who sees a child's PRNG state cannot predict past or
- *   future outputs in the parent, or in other children.
- *
- * The arc4random(3) API may abort the process if:
- *
- * (a) the crypto self-test fails,
- * (b) pthread_atfork or thr_keycreate fail, or
- * (c) sysctl(KERN_ARND) fails when reseeding the PRNG.
- *
- * The crypto self-test, pthread_atfork, and thr_keycreate occur only
- * once, on the first use of any of the arc4random(3) API.  KERN_ARND
- * is unlikely to fail later unless the kernel is seriously broken.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: arc4random.c,v 1.30 2015/05/13 23:15:57 justin Exp $");
-
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <sys/bitops.h>
-#include <sys/endian.h>
-#include <sys/errno.h>
-#if defined(__minix)
-#include <sys/fcntl.h>
-#endif
-#include <sys/mman.h>
-#include <sys/sysctl.h>
-
-#include <assert.h>
-#include <sha2.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(arc4random,_arc4random)
-__weak_alias(arc4random_addrandom,_arc4random_addrandom)
-__weak_alias(arc4random_buf,_arc4random_buf)
-__weak_alias(arc4random_stir,_arc4random_stir)
-__weak_alias(arc4random_uniform,_arc4random_uniform)
-#endif
-
-/*
- * For standard ChaCha, use le32dec/le32enc.  We don't need that for
- * the purposes of a nondeterministic random number generator -- we
- * don't need to be bit-for-bit compatible over any wire.
- */
-
-static inline uint32_t
-crypto_le32dec(const void *p)
-{
-	uint32_t v;
-
-	(void)memcpy(&v, p, sizeof v);
-
-	return v;
-}
-
-static inline void
-crypto_le32enc(void *p, uint32_t v)
-{
-
-	(void)memcpy(p, &v, sizeof v);
-}
-
-/* ChaCha core */
-
-#define	crypto_core_OUTPUTBYTES	64
-#define	crypto_core_INPUTBYTES	16
-#define	crypto_core_KEYBYTES	32
-#define	crypto_core_CONSTBYTES	16
-
-#define	crypto_core_ROUNDS	20
-
-static uint32_t
-rotate(uint32_t u, unsigned c)
-{
-
-	return (u << c) | (u >> (32 - c));
-}
-
-#define	QUARTERROUND(a, b, c, d) do {					      \
-	(a) += (b); (d) ^= (a); (d) = rotate((d), 16);			      \
-	(c) += (d); (b) ^= (c); (b) = rotate((b), 12);			      \
-	(a) += (b); (d) ^= (a); (d) = rotate((d),  8);			      \
-	(c) += (d); (b) ^= (c); (b) = rotate((b),  7);			      \
-} while (/*CONSTCOND*/0)
-
-const uint8_t crypto_core_constant32[16] = "expand 32-byte k";
-
-static void
-crypto_core(uint8_t *out, const uint8_t *in, const uint8_t *k,
-    const uint8_t *c)
-{
-	uint32_t x0,x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15;
-	uint32_t j0,j1,j2,j3,j4,j5,j6,j7,j8,j9,j10,j11,j12,j13,j14,j15;
-	int i;
-
-	j0 = x0 = crypto_le32dec(c + 0);
-	j1 = x1 = crypto_le32dec(c + 4);
-	j2 = x2 = crypto_le32dec(c + 8);
-	j3 = x3 = crypto_le32dec(c + 12);
-	j4 = x4 = crypto_le32dec(k + 0);
-	j5 = x5 = crypto_le32dec(k + 4);
-	j6 = x6 = crypto_le32dec(k + 8);
-	j7 = x7 = crypto_le32dec(k + 12);
-	j8 = x8 = crypto_le32dec(k + 16);
-	j9 = x9 = crypto_le32dec(k + 20);
-	j10 = x10 = crypto_le32dec(k + 24);
-	j11 = x11 = crypto_le32dec(k + 28);
-	j12 = x12 = crypto_le32dec(in + 0);
-	j13 = x13 = crypto_le32dec(in + 4);
-	j14 = x14 = crypto_le32dec(in + 8);
-	j15 = x15 = crypto_le32dec(in + 12);
-
-	for (i = crypto_core_ROUNDS; i > 0; i -= 2) {
-		QUARTERROUND( x0, x4, x8,x12);
-		QUARTERROUND( x1, x5, x9,x13);
-		QUARTERROUND( x2, x6,x10,x14);
-		QUARTERROUND( x3, x7,x11,x15);
-		QUARTERROUND( x0, x5,x10,x15);
-		QUARTERROUND( x1, x6,x11,x12);
-		QUARTERROUND( x2, x7, x8,x13);
-		QUARTERROUND( x3, x4, x9,x14);
-	}
-
-	crypto_le32enc(out + 0, x0 + j0);
-	crypto_le32enc(out + 4, x1 + j1);
-	crypto_le32enc(out + 8, x2 + j2);
-	crypto_le32enc(out + 12, x3 + j3);
-	crypto_le32enc(out + 16, x4 + j4);
-	crypto_le32enc(out + 20, x5 + j5);
-	crypto_le32enc(out + 24, x6 + j6);
-	crypto_le32enc(out + 28, x7 + j7);
-	crypto_le32enc(out + 32, x8 + j8);
-	crypto_le32enc(out + 36, x9 + j9);
-	crypto_le32enc(out + 40, x10 + j10);
-	crypto_le32enc(out + 44, x11 + j11);
-	crypto_le32enc(out + 48, x12 + j12);
-	crypto_le32enc(out + 52, x13 + j13);
-	crypto_le32enc(out + 56, x14 + j14);
-	crypto_le32enc(out + 60, x15 + j15);
-}
-
-/* ChaCha self-test */
-
-#ifdef _DIAGNOSTIC
-
-/*
- * Test vector for ChaCha20 from
- * <http://tools.ietf.org/html/draft-strombergson-chacha-test-vectors-00>,
- * test vectors for ChaCha12 and ChaCha8 and for big-endian machines
- * generated by the same crypto_core code with crypto_core_ROUNDS and
- * crypto_le32enc/dec varied.
- */
-
-static const uint8_t crypto_core_selftest_vector[64] = {
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#  if crypto_core_ROUNDS == 8
-	0x3e,0x00,0xef,0x2f,0x89,0x5f,0x40,0xd6,
-	0x7f,0x5b,0xb8,0xe8,0x1f,0x09,0xa5,0xa1,
-	0x2c,0x84,0x0e,0xc3,0xce,0x9a,0x7f,0x3b,
-	0x18,0x1b,0xe1,0x88,0xef,0x71,0x1a,0x1e,
-	0x98,0x4c,0xe1,0x72,0xb9,0x21,0x6f,0x41,
-	0x9f,0x44,0x53,0x67,0x45,0x6d,0x56,0x19,
-	0x31,0x4a,0x42,0xa3,0xda,0x86,0xb0,0x01,
-	0x38,0x7b,0xfd,0xb8,0x0e,0x0c,0xfe,0x42,
-#  elif crypto_core_ROUNDS == 12
-	0x9b,0xf4,0x9a,0x6a,0x07,0x55,0xf9,0x53,
-	0x81,0x1f,0xce,0x12,0x5f,0x26,0x83,0xd5,
-	0x04,0x29,0xc3,0xbb,0x49,0xe0,0x74,0x14,
-	0x7e,0x00,0x89,0xa5,0x2e,0xae,0x15,0x5f,
-	0x05,0x64,0xf8,0x79,0xd2,0x7a,0xe3,0xc0,
-	0x2c,0xe8,0x28,0x34,0xac,0xfa,0x8c,0x79,
-	0x3a,0x62,0x9f,0x2c,0xa0,0xde,0x69,0x19,
-	0x61,0x0b,0xe8,0x2f,0x41,0x13,0x26,0xbe,
-#  elif crypto_core_ROUNDS == 20
-	0x76,0xb8,0xe0,0xad,0xa0,0xf1,0x3d,0x90,
-	0x40,0x5d,0x6a,0xe5,0x53,0x86,0xbd,0x28,
-	0xbd,0xd2,0x19,0xb8,0xa0,0x8d,0xed,0x1a,
-	0xa8,0x36,0xef,0xcc,0x8b,0x77,0x0d,0xc7,
-	0xda,0x41,0x59,0x7c,0x51,0x57,0x48,0x8d,
-	0x77,0x24,0xe0,0x3f,0xb8,0xd8,0x4a,0x37,
-	0x6a,0x43,0xb8,0xf4,0x15,0x18,0xa1,0x1c,
-	0xc3,0x87,0xb6,0x69,0xb2,0xee,0x65,0x86,
-#  else
-#    error crypto_core_ROUNDS must be 8, 12, or 20.
-#  endif
-#elif _BYTE_ORDER == _BIG_ENDIAN
-#  if crypto_core_ROUNDS == 8
-	0x9a,0x13,0x07,0xe3,0x38,0x18,0x9e,0x99,
-	0x15,0x37,0x16,0x4d,0x04,0xe6,0x48,0x9a,
-	0x07,0xd6,0xe8,0x7a,0x02,0xf9,0xf5,0xc7,
-	0x3f,0xa9,0xc2,0x0a,0xe1,0xc6,0x62,0xea,
-	0x80,0xaf,0xb6,0x51,0xca,0x52,0x43,0x87,
-	0xe3,0xa6,0xa6,0x61,0x11,0xf5,0xe6,0xcf,
-	0x09,0x0f,0xdc,0x9d,0xc3,0xc3,0xbb,0x43,
-	0xd7,0xfa,0x70,0x42,0xbf,0xa5,0xee,0xa2,
-#  elif crypto_core_ROUNDS == 12
-	0xcf,0x6c,0x16,0x48,0xbf,0xf4,0xba,0x85,
-	0x32,0x69,0xd3,0x98,0xc8,0x7d,0xcd,0x3f,
-	0xdc,0x76,0x6b,0xa2,0x7b,0xcb,0x17,0x4d,
-	0x05,0xda,0xdd,0xd8,0x62,0x54,0xbf,0xe0,
-	0x65,0xed,0x0e,0xf4,0x01,0x7e,0x3c,0x05,
-	0x35,0xb2,0x7a,0x60,0xf3,0x8f,0x12,0x33,
-	0x24,0x60,0xcd,0x85,0xfe,0x4c,0xf3,0x39,
-	0xb1,0x0e,0x3e,0xe0,0xba,0xa6,0x2f,0xa9,
-#  elif crypto_core_ROUNDS == 20
-	0x83,0x8b,0xf8,0x75,0xf7,0xde,0x9d,0x8c,
-	0x33,0x14,0x72,0x28,0xd1,0xbe,0x88,0xe5,
-	0x94,0xb5,0xed,0xb8,0x56,0xb5,0x9e,0x0c,
-	0x64,0x6a,0xaf,0xd9,0xa7,0x49,0x10,0x59,
-	0xba,0x3a,0x82,0xf8,0x4a,0x70,0x9c,0x00,
-	0x82,0x2c,0xae,0xc6,0xd7,0x1c,0x2e,0xda,
-	0x2a,0xfb,0x61,0x70,0x2b,0xd1,0xbf,0x8b,
-	0x95,0xbc,0x23,0xb6,0x4b,0x60,0x02,0xec,
-#  else
-#    error crypto_core_ROUNDS must be 8, 12, or 20.
-#  endif
-#else
-#  error Byte order must be little-endian or big-endian.
-#endif
-};
-
-static int
-crypto_core_selftest(void)
-{
-	const uint8_t nonce[crypto_core_INPUTBYTES] = {0};
-	const uint8_t key[crypto_core_KEYBYTES] = {0};
-	uint8_t block[64];
-	unsigned i;
-
-	crypto_core(block, nonce, key, crypto_core_constant32);
-	for (i = 0; i < 64; i++) {
-		if (block[i] != crypto_core_selftest_vector[i])
-			return EIO;
-	}
-
-	return 0;
-}
-
-#else  /* !_DIAGNOSTIC */
-
-static int
-crypto_core_selftest(void)
-{
-
-	return 0;
-}
-
-#endif
-
-/* PRNG */
-
-/*
- * For a state s, rather than use ChaCha20 as a stream cipher to
- * generate the concatenation ChaCha20_s(0) || ChaCha20_s(1) || ..., we
- * split ChaCha20_s(0) into s' || x and yield x for the first request,
- * split ChaCha20_s'(0) into s'' || y and yield y for the second
- * request, &c.  This provides backtracking resistance: an attacker who
- * finds s'' can't recover s' or x.
- */
-
-#define	crypto_prng_SEEDBYTES		crypto_core_KEYBYTES
-#define	crypto_prng_MAXOUTPUTBYTES	\
-	(crypto_core_OUTPUTBYTES - crypto_prng_SEEDBYTES)
-
-struct crypto_prng {
-	uint8_t		state[crypto_prng_SEEDBYTES];
-};
-
-static void
-crypto_prng_seed(struct crypto_prng *prng, const void *seed)
-{
-
-	(void)memcpy(prng->state, seed, crypto_prng_SEEDBYTES);
-}
-
-static void
-crypto_prng_buf(struct crypto_prng *prng, void *buf, size_t n)
-{
-	const uint8_t nonce[crypto_core_INPUTBYTES] = {0};
-	uint8_t output[crypto_core_OUTPUTBYTES];
-
-	_DIAGASSERT(n <= crypto_prng_MAXOUTPUTBYTES);
-	__CTASSERT(sizeof prng->state + crypto_prng_MAXOUTPUTBYTES
-	    <= sizeof output);
-
-	crypto_core(output, nonce, prng->state, crypto_core_constant32);
-	(void)memcpy(prng->state, output, sizeof prng->state);
-	(void)memcpy(buf, output + sizeof prng->state, n);
-	(void)explicit_memset(output, 0, sizeof output);
-}
-
-/* One-time stream: expand short single-use secret into long secret */
-
-#define	crypto_onetimestream_SEEDBYTES	crypto_core_KEYBYTES
-
-static void
-crypto_onetimestream(const void *seed, void *buf, size_t n)
-{
-	uint32_t nonce[crypto_core_INPUTBYTES / sizeof(uint32_t)] = {0};
-	uint8_t block[crypto_core_OUTPUTBYTES];
-	uint8_t *p8, *p32;
-	const uint8_t *nonce8 = (const uint8_t *)(void *)nonce;
-	size_t ni, nb, nf;
-
-	/*
-	 * Guarantee we can generate up to n bytes.  We have
-	 * 2^(8*INPUTBYTES) possible inputs yielding output of
-	 * OUTPUTBYTES*2^(8*INPUTBYTES) bytes.  It suffices to require
-	 * that sizeof n > (1/CHAR_BIT) log_2 n be less than
-	 * (1/CHAR_BIT) log_2 of the total output stream length.  We
-	 * have
-	 *
-	 *	log_2 (o 2^(8 i)) = log_2 o + log_2 2^(8 i)
-	 *	  = log_2 o + 8 i.
-	 */
-	__CTASSERT(CHAR_BIT * sizeof n <=
-	    (/*LINTED*/ilog2(crypto_core_OUTPUTBYTES) + 8 * crypto_core_INPUTBYTES));
-
-	p8 = buf;
-	p32 = (uint8_t *)roundup2((uintptr_t)p8, 4);
-	ni = p32 - p8;
-	if (n < ni)
-		ni = n;
-	nb = (n - ni) / sizeof block;
-	nf = (n - ni) % sizeof block;
-
-	_DIAGASSERT(((uintptr_t)p32 & 3) == 0);
-	_DIAGASSERT(ni <= n);
-	_DIAGASSERT(nb <= (n / sizeof block));
-	_DIAGASSERT(nf <= n);
-	_DIAGASSERT(n == (ni + (nb * sizeof block) + nf));
-	_DIAGASSERT(ni < 4);
-	_DIAGASSERT(nf < sizeof block);
-
-	if (ni) {
-		crypto_core(block, nonce8, seed, crypto_core_constant32);
-		nonce[0]++;
-		(void)memcpy(p8, block, ni);
-	}
-	while (nb--) {
-		crypto_core(p32, nonce8, seed, crypto_core_constant32);
-		if (++nonce[0] == 0)
-			nonce[1]++;
-		p32 += crypto_core_OUTPUTBYTES;
-	}
-	if (nf) {
-		crypto_core(block, nonce8, seed, crypto_core_constant32);
-		if (++nonce[0] == 0)
-			nonce[1]++;
-		(void)memcpy(p32, block, nf);
-	}
-
-	if (ni | nf)
-		(void)explicit_memset(block, 0, sizeof block);
-}
-
-/* arc4random state: per-thread, per-process (zeroed in child on fork) */
-
-struct arc4random_prng {
-	struct crypto_prng	arc4_prng;
-	bool			arc4_seeded;
-};
-
-static void
-arc4random_prng_addrandom(struct arc4random_prng *prng, const void *data,
-    size_t datalen)
-{
-#if !defined(__minix)
-	const int mib[] = { CTL_KERN, KERN_ARND };
-#endif /* !defined(__minix) */
-	SHA256_CTX ctx;
-	uint8_t buf[crypto_prng_SEEDBYTES];
-	size_t buflen = sizeof buf;
-
-	__CTASSERT(sizeof buf == SHA256_DIGEST_LENGTH);
-
-	SHA256_Init(&ctx);
-
-	crypto_prng_buf(&prng->arc4_prng, buf, sizeof buf);
-	SHA256_Update(&ctx, buf, sizeof buf);
-
-#if defined(__minix)
-	/* LSC: We do not have a compatibility layer for the 
-	 * KERN_ARND call, so do it the old way... */
-	int fd;
-
-	fd = open("/dev/urandom", O_RDONLY);
-	if (fd != -1) {
-		(void)read(fd, buf, buflen);
-		close(fd);
-	}
-
-        /* fd < 0 or failed sysctl ?  Ah, what the heck. We'll just take
-         * whatever was on the stack... */
-#else
-	if (sysctl(mib, (u_int)__arraycount(mib), buf, &buflen, NULL, 0) == -1)
-		abort();
-#endif /* !defined(__minix) */
-	if (buflen != sizeof buf)
-		abort();
-	SHA256_Update(&ctx, buf, sizeof buf);
-
-	if (data != NULL)
-		SHA256_Update(&ctx, data, datalen);
-
-	SHA256_Final(buf, &ctx);
-	(void)explicit_memset(&ctx, 0, sizeof ctx);
-
-	/* reseed(SHA256(prng() || sysctl(KERN_ARND) || data)) */
-	crypto_prng_seed(&prng->arc4_prng, buf);
-	(void)explicit_memset(buf, 0, sizeof buf);
-	prng->arc4_seeded = true;
-}
-
-#ifdef _REENTRANT
-static struct arc4random_prng *
-arc4random_prng_create(void)
-{
-	struct arc4random_prng *prng;
-	const size_t size = roundup(sizeof(*prng), sysconf(_SC_PAGESIZE));
-
-	prng = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
-	if (prng == MAP_FAILED)
-		goto fail0;
-	if (minherit(prng, size, MAP_INHERIT_ZERO) == -1)
-		goto fail1;
-
-	return prng;
-
-fail1:	(void)munmap(prng, size);
-fail0:	return NULL;
-}
-#endif
-
-#ifdef _REENTRANT
-static void
-arc4random_prng_destroy(struct arc4random_prng *prng)
-{
-	const size_t size = roundup(sizeof(*prng), sysconf(_SC_PAGESIZE));
-
-	(void)explicit_memset(prng, 0, sizeof(*prng));
-	(void)munmap(prng, size);
-}
-#endif
-
-/* Library state */
-
-static struct arc4random_global {
-#ifdef _REENTRANT
-	mutex_t			lock;
-	thread_key_t		thread_key;
-#endif
-	struct arc4random_prng	prng;
-	bool			initialized;
-} arc4random_global = {
-#ifdef _REENTRANT
-	.lock		= MUTEX_INITIALIZER,
-#endif
-	.initialized	= false,
-};
-
-static void
-arc4random_atfork_prepare(void)
-{
-
-	mutex_lock(&arc4random_global.lock);
-	(void)explicit_memset(&arc4random_global.prng, 0,
-	    sizeof arc4random_global.prng);
-}
-
-static void
-arc4random_atfork_parent(void)
-{
-
-	mutex_unlock(&arc4random_global.lock);
-}
-
-static void
-arc4random_atfork_child(void)
-{
-
-	mutex_unlock(&arc4random_global.lock);
-}
-
-#ifdef _REENTRANT
-static void
-arc4random_tsd_destructor(void *p)
-{
-	struct arc4random_prng *const prng = p;
-
-	arc4random_prng_destroy(prng);
-}
-#endif
-
-static void
-arc4random_initialize(void)
-{
-
-	mutex_lock(&arc4random_global.lock);
-	if (!arc4random_global.initialized) {
-		if (crypto_core_selftest() != 0)
-			abort();
-#if !defined(__minix)
-		if (pthread_atfork(&arc4random_atfork_prepare,
-			&arc4random_atfork_parent, &arc4random_atfork_child)
-		    != 0)
-			abort();
-#endif /* !defined(__minix) */
-#ifdef _REENTRANT
-		if (thr_keycreate(&arc4random_global.thread_key,
-			&arc4random_tsd_destructor) != 0)
-			abort();
-#endif
-		arc4random_global.initialized = true;
-	}
-	mutex_unlock(&arc4random_global.lock);
-}
-
-static struct arc4random_prng *
-arc4random_prng_get(void)
-{
-	struct arc4random_prng *prng = NULL;
-
-	/* Make sure the library is initialized.  */
-	if (__predict_false(!arc4random_global.initialized))
-		arc4random_initialize();
-
-#ifdef _REENTRANT
-	/* Get or create the per-thread PRNG state.  */
-	prng = thr_getspecific(arc4random_global.thread_key);
-	if (__predict_false(prng == NULL)) {
-		prng = arc4random_prng_create();
-		thr_setspecific(arc4random_global.thread_key, prng);
-	}
-#endif
-
-	/* If we can't create it, fall back to the global PRNG.  */
-	if (__predict_false(prng == NULL)) {
-		mutex_lock(&arc4random_global.lock);
-		prng = &arc4random_global.prng;
-	}
-
-	/* Guarantee the PRNG is seeded.  */
-	if (__predict_false(!prng->arc4_seeded))
-		arc4random_prng_addrandom(prng, NULL, 0);
-
-	return prng;
-}
-
-static void
-arc4random_prng_put(struct arc4random_prng *prng)
-{
-
-	/* If we had fallen back to the global PRNG, unlock it.  */
-	if (__predict_false(prng == &arc4random_global.prng))
-		mutex_unlock(&arc4random_global.lock);
-}
-
-/* Public API */
-
-uint32_t
-arc4random(void)
-{
-	struct arc4random_prng *prng;
-	uint32_t v;
-
-	prng = arc4random_prng_get();
-	crypto_prng_buf(&prng->arc4_prng, &v, sizeof v);
-	arc4random_prng_put(prng);
-
-	return v;
-}
-
-void
-arc4random_buf(void *buf, size_t len)
-{
-	struct arc4random_prng *prng;
-
-	if (len <= crypto_prng_MAXOUTPUTBYTES) {
-		prng = arc4random_prng_get();
-		crypto_prng_buf(&prng->arc4_prng, buf, len);
-		arc4random_prng_put(prng);
-	} else {
-		uint8_t seed[crypto_onetimestream_SEEDBYTES];
-
-		prng = arc4random_prng_get();
-		crypto_prng_buf(&prng->arc4_prng, seed, sizeof seed);
-		arc4random_prng_put(prng);
-
-		crypto_onetimestream(seed, buf, len);
-		(void)explicit_memset(seed, 0, sizeof seed);
-	}
-}
-
-uint32_t
-arc4random_uniform(uint32_t bound)
-{
-	struct arc4random_prng *prng;
-	uint32_t minimum, r;
-
-	/*
-	 * We want a uniform random choice in [0, n), and arc4random()
-	 * makes a uniform random choice in [0, 2^32).  If we reduce
-	 * that modulo n, values in [0, 2^32 mod n) will be represented
-	 * slightly more than values in [2^32 mod n, n).  Instead we
-	 * choose only from [2^32 mod n, 2^32) by rejecting samples in
-	 * [0, 2^32 mod n), to avoid counting the extra representative
-	 * of [0, 2^32 mod n).  To compute 2^32 mod n, note that
-	 *
-	 *	2^32 mod n = 2^32 mod n - 0
-	 *	  = 2^32 mod n - n mod n
-	 *	  = (2^32 - n) mod n,
-	 *
-	 * the last of which is what we compute in 32-bit arithmetic.
-	 */
-	minimum = (-bound % bound);
-
-	prng = arc4random_prng_get();
-	do crypto_prng_buf(&prng->arc4_prng, &r, sizeof r);
-	while (__predict_false(r < minimum));
-	arc4random_prng_put(prng);
-
-	return (r % bound);
-}
-
-void
-arc4random_stir(void)
-{
-	struct arc4random_prng *prng;
-
-	prng = arc4random_prng_get();
-	arc4random_prng_addrandom(prng, NULL, 0);
-	arc4random_prng_put(prng);
-}
-
-/*
- * Silly signature here is for hysterical raisins.  Should instead be
- * const void *data and size_t datalen.
- */
-void
-arc4random_addrandom(u_char *data, int datalen)
-{
-	struct arc4random_prng *prng;
-
-	_DIAGASSERT(0 <= datalen);
-
-	prng = arc4random_prng_get();
-	arc4random_prng_addrandom(prng, data, datalen);
-	arc4random_prng_put(prng);
-}
-
-#ifdef _ARC4RANDOM_TEST
-
-#include <sys/wait.h>
-
-#include <err.h>
-#include <stdio.h>
-
-int
-main(int argc __unused, char **argv __unused)
-{
-	unsigned char gubbish[] = "random gubbish";
-	const uint8_t zero64[64] = {0};
-	uint8_t buf[2048];
-	unsigned i, a, n;
-
-	/* Test arc4random: should not be deterministic.  */
-	if (printf("arc4random: %08"PRIx32"\n", arc4random()) < 0)
-		err(1, "printf");
-
-	/* Test stirring: should definitely not be deterministic.  */
-	arc4random_stir();
-
-	/* Test small buffer.  */
-	arc4random_buf(buf, 8);
-	if (printf("arc4randombuf small:") < 0)
-		err(1, "printf");
-	for (i = 0; i < 8; i++)
-		if (printf(" %02x", buf[i]) < 0)
-			err(1, "printf");
-	if (printf("\n") < 0)
-		err(1, "printf");
-
-	/* Test addrandom: should not make the rest deterministic.  */
-	arc4random_addrandom(gubbish, sizeof gubbish);
-
-	/* Test large buffer.  */
-	arc4random_buf(buf, sizeof buf);
-	if (printf("arc4randombuf_large:") < 0)
-		err(1, "printf");
-	for (i = 0; i < sizeof buf; i++)
-		if (printf(" %02x", buf[i]) < 0)
-			err(1, "printf");
-	if (printf("\n") < 0)
-		err(1, "printf");
-
-	/* Test misaligned small and large.  */
-	for (a = 0; a < 64; a++) {
-		for (n = a; n < sizeof buf; n++) {
-			(void)memset(buf, 0, sizeof buf);
-			arc4random_buf(buf, n - a);
-			if (memcmp(buf + n - a, zero64, a) != 0)
-				errx(1, "arc4random buffer overflow 0");
-
-			(void)memset(buf, 0, sizeof buf);
-			arc4random_buf(buf + a, n - a);
-			if (memcmp(buf, zero64, a) != 0)
-				errx(1, "arc4random buffer overflow 1");
-
-			if ((2*a) <= n) {
-				(void)memset(buf, 0, sizeof buf);
-				arc4random_buf(buf + a, n - a - a);
-				if (memcmp(buf + n - a, zero64, a) != 0)
-					errx(1,
-					    "arc4random buffer overflow 2");
-			}
-		}
-	}
-
-	/* Test fork-safety.  */
-    {
-	pid_t pid, rpid;
-	int status;
-
-	pid = fork();
-	switch (pid) {
-	case -1:
-		err(1, "fork");
-	case 0:
-		_exit(arc4random_prng_get()->arc4_seeded);
-	default:
-		rpid = waitpid(pid, &status, 0);
-		if (rpid == -1)
-			err(1, "waitpid");
-		if (rpid != pid)
-			errx(1, "waitpid returned wrong pid"
-			    ": %"PRIdMAX" != %"PRIdMAX,
-			    (intmax_t)rpid,
-			    (intmax_t)pid);
-		if (WIFEXITED(status)) {
-			if (WEXITSTATUS(status) != 0)
-				errx(1, "child exited with %d",
-				    WEXITSTATUS(status));
-		} else if (WIFSIGNALED(status)) {
-			errx(1, "child terminated on signal %d",
-			    WTERMSIG(status));
-		} else {
-			errx(1, "child died mysteriously: %d", status);
-		}
-	}
-    }
-
-	/* XXX Test multithreaded fork safety...?  */
-
-	return 0;
-}
-#endif
diff --git a/lib/libc/gen/assert.c b/lib/libc/gen/assert.c
deleted file mode 100644
index 3197671b8..000000000
--- a/lib/libc/gen/assert.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*	$NetBSD: assert.c,v 1.17 2012/06/25 22:32:43 abs Exp $	*/
-
-/*-
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)assert.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: assert.c,v 1.17 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <syslog.h>
-
-void
-__assert13(const char *file, int line, const char *function,
-    const char *failedexpr)
-{
-
-	(void)fprintf(stderr,
-	    "assertion \"%s\" failed: file \"%s\", line %d%s%s%s\n",
-	    failedexpr, file, line,
-	    function ? ", function \"" : "",
-	    function ? function : "",
-	    function ? "\"" : "");
-	abort();
-	/* NOTREACHED */
-}
-
-void
-__assert(const char *file, int line, const char *failedexpr)
-{
-
-	__assert13(file, line, NULL, failedexpr);
-	/* NOTREACHED */
-}
-
-
-enum {
-	DIAGASSERT_ABORT =	1<<0,
-	DIAGASSERT_STDERR =	1<<1,
-	DIAGASSERT_SYSLOG =	1<<2
-};
-
-static int	diagassert_flags = -1;
-
-void
-__diagassert13(const char *file, int line, const char *function,
-    const char *failedexpr)
-{
-	char buf[1024];
-
-	if (diagassert_flags == -1) {
-		char *p;
-
-		diagassert_flags = DIAGASSERT_SYSLOG;
-
-		for (p = getenv("LIBC_DIAGASSERT"); p && *p; p++) {
-			switch (*p) {
-			case 'a':
-				diagassert_flags |= DIAGASSERT_ABORT;
-				break;
-			case 'A':
-				diagassert_flags &= ~DIAGASSERT_ABORT;
-				break;
-			case 'e':
-				diagassert_flags |= DIAGASSERT_STDERR;
-				break;
-			case 'E':
-				diagassert_flags &= ~DIAGASSERT_STDERR;
-				break;
-			case 'l':
-				diagassert_flags |= DIAGASSERT_SYSLOG;
-				break;
-			case 'L':
-				diagassert_flags &= ~DIAGASSERT_SYSLOG;
-				break;
-			}
-		}
-	}
-
-	snprintf(buf, sizeof(buf),
-	    "assertion \"%s\" failed: file \"%s\", line %d%s%s%s",
-	    failedexpr, file, line,
-	    function ? ", function \"" : "",
-	    function ? function : "",
-	    function ? "\"" : "");
-	if (diagassert_flags & DIAGASSERT_STDERR)
-		(void)fprintf(stderr, "%s: %s\n", getprogname(), buf);
-	if (diagassert_flags & DIAGASSERT_SYSLOG)
-		syslog(LOG_DEBUG | LOG_USER, "%s", buf);
-	if (diagassert_flags & DIAGASSERT_ABORT)
-		abort();
-}
-
-void
-__diagassert(const char *file, int line, const char *failedexpr)
-{
-
-	__diagassert13(file, line, NULL, failedexpr);
-}
diff --git a/lib/libc/gen/asysctl.c b/lib/libc/gen/asysctl.c
deleted file mode 100644
index c5201c699..000000000
--- a/lib/libc/gen/asysctl.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*	$NetBSD: asysctl.c,v 1.1 2014/06/13 15:45:05 joerg Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- *	All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Joerg Sonnenberger.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: asysctl.c,v 1.1 2014/06/13 15:45:05 joerg Exp $");
-
-#include "namespace.h"
-#include <sys/sysctl.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-
-__weak_alias(asysctl,_asysctl)
-__weak_alias(asysctlbyname,_asysctlbyname)
-
-void *
-asysctl(const int *oids, size_t oidlen, size_t *len)
-{
-	void *data;
-
-	*len = 0;
-	data = NULL;
-
-	for (;;) {
-		if (sysctl(oids, oidlen, data, len, NULL, 0) == 0) {
-			if (*len == 0) {
-				free(data);
-				return NULL;
-			}
-			if (data != NULL)
-				return data;
-			errno = ENOMEM;
-		}
-		free(data);
-		if (errno == ENOMEM && *len != SIZE_MAX) {
-			if (*len > SIZE_MAX / 2)
-				*len = SIZE_MAX;
-			else
-				*len *= 2;
-			data = malloc(*len);
-			if (data == NULL) {
-				*len = SIZE_MAX;
-				return NULL;
-			}
-			continue;
-		}
-		*len = SIZE_MAX;
-		return NULL;
-	}
-}
-
-void *
-asysctlbyname(const char *gname, size_t *len)
-{
-	int name[CTL_MAXNAME];
-	u_int namelen;
-
-	if (sysctlgetmibinfo(gname, &name[0], &namelen, NULL, NULL, NULL,
-			     SYSCTL_VERSION)) {
-		*len = SIZE_MAX;
-		return NULL;
-	}
-	return asysctl(&name[0], namelen, len);
-}
diff --git a/lib/libc/gen/basename.3 b/lib/libc/gen/basename.3
deleted file mode 100644
index 7fe1e96d1..000000000
--- a/lib/libc/gen/basename.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\"	$NetBSD: basename.3,v 1.14 2008/05/10 22:39:40 christos Exp $
-.\"
-.\" Copyright (c) 1997, 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Klaus Klein and Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 10, 2008
-.Dt BASENAME 3
-.Os
-.Sh NAME
-.Nm basename
-.Nd return the last component of a pathname
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In libgen.h
-.Ft char *
-.Fn basename "char *path"
-.Sh DESCRIPTION
-The
-.Fn basename
-function takes the pathname pointed to by
-.Ar path
-and returns a pointer to the final component of the pathname,
-deleting any trailing
-.Sq /
-characters.
-.Pp
-If
-.Ar path
-consists entirely of
-.Sq /
-characters,
-.Fn basename
-returns a pointer to the string
-.Dq / .
-.Pp
-If
-.Ar path
-is a null pointer or points to an empty string,
-.Fn basename
-returns a pointer to the string
-.Dq \&. .
-.Sh RETURN VALUES
-The
-.Fn basename
-function returns a pointer to the final component of
-.Ar path .
-.Sh SEE ALSO
-.Xr basename 1 ,
-.Xr dirname 3
-.Sh STANDARDS
-.Bl -bullet -compact
-.It
-.St -xpg4.2
-.It
-.St -p1003.1-2001
-.El
-.Sh BUGS
-If the length of the result is longer than
-.Dv PATH_MAX
-bytes
-.Pq including the terminating nul ,
-the result will be truncated.
-.Pp
-The
-.Fn basename
-function returns a pointer to static storage that may be overwritten
-by subsequent calls to
-.Fn basename .
-This is not strictly a bug; it is explicitly allowed by
-.St -p1003.1-2001 .
diff --git a/lib/libc/gen/basename.c b/lib/libc/gen/basename.c
deleted file mode 100644
index 03eeba4aa..000000000
--- a/lib/libc/gen/basename.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*	$NetBSD: basename.c,v 1.11 2014/07/16 10:52:26 christos Exp $	*/
-
-/*-
- * Copyright (c) 1997, 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein and Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: basename.c,v 1.11 2014/07/16 10:52:26 christos Exp $");
-#endif /* !LIBC_SCCS && !lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <libgen.h>
-#include <string.h>
-#include <limits.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(basename,_basename)
-#endif
-
-static size_t
-xbasename_r(const char *path, char *buf, size_t buflen)
-{
-	const char *startp, *endp;
-	size_t len;
-
-	/*
-	 * If `path' is a null pointer or points to an empty string,
-	 * return a pointer to the string ".".
-	 */
-	if (path == NULL || *path == '\0') {
-		startp = ".";
-		len = 1;
-		goto out;
-	}
-
-	/* Strip trailing slashes, if any. */
-	endp = path + strlen(path) - 1;
-	while (endp != path && *endp == '/')
-		endp--;
-
-	/* Only slashes -> "/" */
-	if (endp == path && *endp == '/') {
-		startp = "/";
-		len = 1;
-		goto out;
-	}
-
-	/* Now find the beginning of this (final) component. */
-	for (startp = endp; startp > path && *(startp - 1) != '/'; startp--)
-		continue;
-
-	/* ...and copy the result into the result buffer. */
-	len = (endp - startp) + 1 /* last char */;
-out:
-	if (buf != NULL && buflen != 0) {
-		buflen = MIN(len, buflen - 1);
-		memcpy(buf, startp, buflen);
-		buf[buflen] = '\0';
-	}
-	return len;
-}
-
-#if !HAVE_BASENAME
-
-char *
-basename(char *path) {
-	static char result[PATH_MAX];
-
-	(void)xbasename_r(path, result, sizeof(result));
-	return result;
-}
-
-#endif
diff --git a/lib/libc/gen/bswap.3 b/lib/libc/gen/bswap.3
deleted file mode 100644
index cb8d03f0e..000000000
--- a/lib/libc/gen/bswap.3
+++ /dev/null
@@ -1,54 +0,0 @@
-.\" $NetBSD: bswap.3,v 1.11 2009/10/22 21:50:01 bouyer Exp $
-.\"
-.\" Copyright (c) 1998 Manuel Bouyer.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list 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.
-.\"
-.Dd March 17, 1998
-.Dt BSWAP 3
-.Os
-.Sh NAME
-.Nm bswap16 ,
-.Nm bswap32 ,
-.Nm bswap64
-.Nd byte-order swapping functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In machine/bswap.h
-.Ft uint16_t
-.Fn bswap16 "uint16_t"
-.Ft uint32_t
-.Fn bswap32 "uint32_t"
-.Ft uint64_t
-.Fn bswap64 "uint64_t"
-.Sh DESCRIPTION
-The
-.Fn bswap16 ,
-.Fn bswap32 ,
-and
-.Fn bswap64
-functions return the value of their argument with the bytes inverted.
-They can be used to convert 16, 32 or 64 bits integers from little to big
-endian, or vice-versa.
-.Sh SEE ALSO
-.Xr byteorder 3
diff --git a/lib/libc/gen/cgetcap.3 b/lib/libc/gen/cgetcap.3
deleted file mode 100644
index 5854c1d26..000000000
--- a/lib/libc/gen/cgetcap.3
+++ /dev/null
@@ -1,373 +0,0 @@
-.\"	$NetBSD: cgetcap.3,v 1.8 2012/04/22 10:13:52 wiz Exp $
-.\"
-.\" Copyright (c) 1992, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Casey Leedom of Lawrence Livermore National Laboratory.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"	@(#)getcap.3	8.4 (Berkeley) 5/13/94
-.\"
-.Dd April 5, 2012
-.Dt CGETCAP 3
-.Os
-.Sh NAME
-.Nm cgetent ,
-.Nm cgetset ,
-.Nm cgetmatch ,
-.Nm cgetcap ,
-.Nm cgetnum ,
-.Nm cgetstr ,
-.Nm cgetustr ,
-.Nm cgetfirst ,
-.Nm cgetnext ,
-.Nm cgetclose ,
-.Nm cexpandtc
-.Nd capability database access routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn cgetent "char **buf" "const char * const *db_array" "const char *name"
-.Ft int
-.Fn cgetset "const char *ent"
-.Ft int
-.Fn cgetmatch "const char *buf" "const char *name"
-.Ft char *
-.Fn cgetcap "char *buf" "const char *cap" "int type"
-.Ft int
-.Fn cgetnum "char *buf" "const char *cap" "long *num"
-.Ft int
-.Fn cgetstr "char *buf" "const char *cap" "char **str"
-.Ft int
-.Fn cgetustr "char *buf" "const char *cap" "char **str"
-.Ft int
-.Fn cgetfirst "char **buf" "const char * const *db_array"
-.Ft int
-.Fn cgetnext "char **buf" "const char * const *db_array"
-.Ft int
-.Fn cgetclose "void"
-.Ft void
-.Fn csetexpandtc "int expandtc"
-.Sh DESCRIPTION
-.Fn cgetent
-extracts the capability
-.Fa name
-from the database specified by the
-.Dv NULL
-terminated file array
-.Fa db_array
-and returns a pointer to a
-.Xr malloc 3 Ap d
-copy of it in
-.Fa buf .
-.Fn cgetent
-will first look for files ending in
-.Pa .db
-(see
-.Xr cap_mkdb 1 )
-before accessing the
-.Tn ASCII
-file.
-.Pp
-.Fa buf
-must be retained through all subsequent calls to
-.Fn cgetmatch ,
-.Fn cgetcap ,
-.Fn cgetnum ,
-.Fn cgetstr ,
-and
-.Fn cgetustr ,
-but may then be
-.Xr free 3 Ap d .
-.Pp
-On success 0 is returned, 1 if the returned record contains an unresolved
-.Qq tc
-expansion, \-1 if the requested record couldn't be found, \-2 if
-a system error was encountered (couldn't open/read a file, etc.)
-also setting
-.Va errno ,
-and \-3 if a potential reference loop is detected (see
-.Qq tc=name
-comments below).
-.Pp
-.Fn cgetset
-enables the addition of a character buffer containing a single capability
-record entry to the capability database.
-Conceptually, the entry is added as the first
-.Dq file
-in the database, and
-is therefore searched first on the call to
-.Fn cgetent .
-The entry is passed in
-.Fa ent .
-If
-.Fa ent
-is
-.Dv NULL ,
-the current entry is removed from the database.
-.Pp
-.Fn cgetset
-must precede the database traversal.
-It must be called before the
-.Fn cgetent
-call.
-If a sequential access is being performed (see below), it must be called
-before the first sequential access call
-.Po
-.Fn cgetfirst
-or
-.Fn cgetnext
-.Pc ,
-or be directly preceded by a
-.Fn cgetclose
-call.
-On success 0 is returned and \-1 on failure.
-.Pp
-.Fn cgetmatch
-will return 0 if
-.Fa name
-is one of the names of the capability record
-.Fa buf ,
-\-1 if not.
-.Pp
-.Fn cgetcap
-searches the capability record
-.Fa buf
-for the capability
-.Fa cap
-with type
-.Fa type .
-A
-.Fa type
-is specified using any single character.
-If a colon
-.Pq Sq \&:
-is used, an untyped capability will be searched
-for (see below for explanation of types).
-A pointer to the value of
-.Fa cap
-in
-.Fa buf
-is returned on success,
-.Dv NULL
-if the requested capability couldn't be found.
-The end of the capability value is signaled by a
-.Sq \&: .
-See
-.Xr capfile 5
-for a description of the capability syntax.
-.Pp
-.Fn cgetnum
-retrieves the value of the numeric capability
-.Fa cap
-from the capability record pointed to by
-.Fa buf .
-The numeric value is returned in the
-.Ft long
-pointed to by
-.Fa num .
-0 is returned on success,
-\-1 if the requested numeric capability couldn't be found.
-.Pp
-.Fn cgetstr
-retrieves the value of the string capability
-.Fa cap
-from the capability record pointed to by
-.Fa buf .
-A pointer to a decoded,
-.Dv NUL
-terminated,
-.Xr malloc 3 Ap d
-copy of the string is returned in the
-.Ft char *
-pointed to by
-.Fa str .
-The number of characters in the decoded string not including the trailing
-.Dv NUL
-is returned on success, \-1 if the requested string capability couldn't
-be found, \-2 if a system error was encountered (storage allocation
-failure).
-.Pp
-.Fn cgetustr
-is identical to
-.Fn cgetstr
-except that it does not expand special characters, but rather returns each
-character of the capability string literally.
-.Pp
-.Fn cgetfirst ,
-.Fn cgetnext ,
-comprise a function group that provides for sequential access of the
-.Dv NULL
-pointer terminated array of file names,
-.Fa db_array .
-.Fn cgetfirst
-returns the first record in the database and resets the access
-to the first record.
-.Fn cgetnext
-returns the next record in the database with respect to the
-record returned by the previous
-.Fn cgetfirst
-or
-.Fn cgetnext
-call.
-If there is no such previous call,
-the first record in the database is returned.
-Each record is returned in a
-.Xr malloc 3 Ap d
-copy pointed to by
-.Fa buf .
-.Qq tc
-expansion is done (see
-.Qq tc=name
-comments below).
-.Pp
-Upon completion of the database 0 is returned,  1 is returned upon successful
-return of record with possibly more remaining (we haven't reached the end of
-the database yet), 2 is returned if the record contains an unresolved
-.Qq tc
-expansion, \-1 is returned if an system error occurred, and \-2
-is returned if a potential reference loop is detected (see
-.Qq tc=name
-comments below).
-Upon completion of database (0 return) the database is closed.
-.Pp
-.Fn cgetclose
-closes the sequential access and frees any memory and file descriptors
-being used.
-Note that it does not erase the buffer pushed by a call to
-.Fn cgetset .
-.Sh CAPABILITY DATABASE SEMANTICS
-Capability records describe a set of (name, value) bindings.
-Names may have multiple values bound to them.
-Different values for a name are distinguished by their
-.Fa types .
-.Fn cgetcap
-will return a pointer to a value of a name given the capability name and
-the type of the value.
-.Pp
-The types
-.Sq #
-and
-.Sq =
-are conventionally used to denote numeric and
-string typed values, but no restriction on those types is enforced.
-The functions
-.Fn cgetnum
-and
-.Fn cgetstr
-can be used to implement the traditional syntax and semantics of
-.Sq #
-and
-.Sq = .
-Typeless capabilities are typically used to denote boolean objects with
-presence or absence indicating truth and false values respectively.
-This interpretation is conveniently represented by:
-.Pp
-.Dl "(getcap(buf, name, ':') != NULL)"
-.Pp
-A special capability,
-.Qq tc=name ,
-is used to indicate that the record specified by
-.Fa name
-should be substituted for the
-.Qq tc
-capability.
-.Qq tc
-capabilities may interpolate records which also contain
-.Qq tc
-capabilities and more than one
-.Qq tc
-capability may be used in a record.
-A
-.Qq tc
-expansion scope (i.e. where the argument is searched for) contains the
-file in which the
-.Qq tc
-is declared and all subsequent files in the file array.
-.Pp
-.Fn csetexpandtc
-can be used to control if
-.Qq tc
-expansion is performed or not.
-.Sh DIAGNOSTICS
-.Fn cgetent ,
-.Fn cgetset ,
-.Fn cgetmatch ,
-.Fn cgetnum ,
-.Fn cgetstr ,
-.Fn cgetustr ,
-.Fn cgetfirst ,
-and
-.Fn cgetnext
-return a value greater than or equal to 0 on success and a value less
-than 0 on failure.
-.Fn cgetcap
-returns a character pointer on success and a
-.Dv NULL
-on failure.
-.Pp
-.Fn cgetclose ,
-.Fn cgetent ,
-.Fn cgetfirst ,
-and
-.Fn cgetnext
-may fail and set
-.Va errno
-for any of the errors specified for the library functions:
-.Xr fopen 3 ,
-.Xr fclose 3 ,
-.Xr open 2 ,
-and
-.Xr close 2 .
-.Pp
-.Fn cgetent ,
-.Fn cgetset ,
-.Fn cgetstr ,
-and
-.Fn cgetustr
-may fail and set
-.Va errno
-as follows:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-No memory to allocate.
-.El
-.Sh SEE ALSO
-.Xr cap_mkdb 1 ,
-.Xr malloc 3 ,
-.Xr capfile 5
-.Sh BUGS
-There are no checks for
-.Qq tc=name
-loops in
-.Fn cgetent .
-.Pp
-The buffer added to the database by a call to
-.Fn cgetset
-is not unique to the database but is rather prepended to any database used.
diff --git a/lib/libc/gen/clock.3 b/lib/libc/gen/clock.3
deleted file mode 100644
index 678e7ac9d..000000000
--- a/lib/libc/gen/clock.3
+++ /dev/null
@@ -1,66 +0,0 @@
-.\"	$NetBSD: clock.3,v 1.10 2003/08/07 16:42:46 agc Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)clock.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt CLOCK 3
-.Os
-.Sh NAME
-.Nm clock
-.Nd determine processor time used
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft clock_t
-.Fn clock void
-.Sh DESCRIPTION
-The
-.Fn clock
-function
-determines the amount of processor time used since the invocation of the
-calling process, measured in
-.Dv CLOCKS_PER_SEC Ns s .
-.Sh RETURN VALUES
-The
-.Fn clock
-function returns the amount of time used unless an error occurs, in which
-case the return value is \-1.
-.Sh SEE ALSO
-.Xr getrusage 2
-.Sh STANDARDS
-The
-.Fn clock
-function conforms to
-.St -ansiC .
diff --git a/lib/libc/gen/clock.c b/lib/libc/gen/clock.c
deleted file mode 100644
index a50e9d430..000000000
--- a/lib/libc/gen/clock.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: clock.c,v 1.10 2009/01/11 02:46:27 christos Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)clock.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: clock.c,v 1.10 2009/01/11 02:46:27 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include <time.h>
-
-/*
- * This code is all rather silly because the kernel counts actual
- * execution time (to usec accuracy) then splits it into user, system and
- * interrupt based on when clock ticks happen.  getrusage apportions the
- * time based on the number of ticks, and here we are trying to generate
- * a number which was, traditionally, the number of ticks!
- *
- * Due to the way the time is apportioned, this code (and indeed getrusage
- * itself) are not guaranteed monotonic.
- */
-
-clock_t
-clock(void)
-{
-	struct rusage ru;
-	clock_t hz = CLOCKS_PER_SEC;
-
-	if (getrusage(RUSAGE_SELF, &ru))
-		return ((clock_t) -1);
-	return (clock_t)((ru.ru_utime.tv_sec + ru.ru_stime.tv_sec) * hz +
-	    (ru.ru_utime.tv_usec + ru.ru_stime.tv_usec + 50)
-	    / 100 * hz / 10000);
-}
diff --git a/lib/libc/gen/closedir.c b/lib/libc/gen/closedir.c
deleted file mode 100644
index 432019792..000000000
--- a/lib/libc/gen/closedir.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: closedir.c,v 1.16 2010/09/26 02:26:59 yamt Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)closedir.c	8.1 (Berkeley) 6/10/93";
-#else
-__RCSID("$NetBSD: closedir.c,v 1.16 2010/09/26 02:26:59 yamt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include "extern.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <dirent.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "dirent_private.h"
-
-#ifdef __weak_alias
-__weak_alias(closedir,_closedir)
-#endif
-
-/*
- * close a directory.
- */
-int
-closedir(DIR *dirp)
-{
-	int fd;
-
-	_DIAGASSERT(dirp != NULL);
-
-#ifdef _REENTRANT
-	if (__isthreaded)
-		mutex_lock((mutex_t *)dirp->dd_lock);
-#endif
-	fd = dirp->dd_fd;
-	dirp->dd_fd = -1;
-	_finidir(dirp);
-
-#ifdef _REENTRANT
-	if (__isthreaded) {
-		mutex_unlock((mutex_t *)dirp->dd_lock);
-		mutex_destroy((mutex_t *)dirp->dd_lock);
-		free(dirp->dd_lock);
-	}
-#endif
-	free((void *)dirp);
-	return(close(fd));
-}
diff --git a/lib/libc/gen/closefrom.3 b/lib/libc/gen/closefrom.3
deleted file mode 100644
index 82368a094..000000000
--- a/lib/libc/gen/closefrom.3
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"	$NetBSD: closefrom.3,v 1.5 2004/06/01 16:12:51 kleink Exp $
-.\"	$OpenBSD: closefrom.2,v 1.2 2004/01/12 20:52:09 jmc Exp $
-.\"
-.\" Copyright (c) 2004 Ted Unangst.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.Dd June 1, 2004
-.Dt CLOSEFROM 3
-.Os
-.Sh NAME
-.Nm closefrom
-.Nd delete many descriptors
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn closefrom "int fd"
-.Sh DESCRIPTION
-The
-.Fn closefrom
-call deletes all descriptors numbered
-.Fa fd
-and higher from the per-process file descriptor table.
-It is effectively the same as calling
-.Xr close 2
-on each descriptor.
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn closefrom
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa fd
-is invalid.
-.It Bq Er EINTR
-An interrupt was received.
-.El
-.Sh SEE ALSO
-.Xr close 2
diff --git a/lib/libc/gen/closefrom.c b/lib/libc/gen/closefrom.c
deleted file mode 100644
index 4d84c0997..000000000
--- a/lib/libc/gen/closefrom.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*	$NetBSD: closefrom.c,v 1.2 2004/06/22 13:49:43 atatat Exp $	*/
-
-/*
- * Copyright (C) 2004 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: closefrom.c,v 1.2 2004/06/22 13:49:43 atatat Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <fcntl.h>
-#include <unistd.h>
-
-int
-closefrom(int fd)
-{
-
-	return (fcntl(fd, F_CLOSEM));
-}
diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3
deleted file mode 100644
index 17c5a5e57..000000000
--- a/lib/libc/gen/confstr.3
+++ /dev/null
@@ -1,134 +0,0 @@
-.\"	$NetBSD: confstr.3,v 1.20 2010/04/22 08:00:34 jruoho Exp $
-.\"
-.\" 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.
-.\"
-.\"	@(#)confstr.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 22, 2010
-.Dt CONFSTR 3
-.Os
-.Sh NAME
-.Nm confstr
-.Nd get string-valued configurable variables
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft size_t
-.Fn confstr "int name" "char *buf" "size_t len"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is obsoleted by
-.Xr sysctl 3 .
-.Ef
-.Pp
-The
-.Fn confstr
-function provides a method for applications to get configuration
-defined string values.
-.Pp
-The
-.Fa name
-argument specifies the system variable to be queried.
-Symbolic constants for each name value are found in the
-.In unistd.h
-header.
-The
-.Fa len
-argument specifies the size of the buffer referenced by the
-argument
-.Fa buf .
-If
-.Fa len
-is non-zero,
-.Fa buf
-is a non-null pointer, and
-.Fa name
-has a value, up to
-.Fa len
-\- 1 bytes of the value are copied into the buffer
-.Fa buf .
-The copied value is always null terminated.
-.Pp
-The available values are as follows:
-.Pp
-.Bl -tag -width "123456"
-.It Li _CS_PATH
-Return a value for the
-.Ev PATH
-environment variable that finds all the standard utilities.
-.El
-.Sh RETURN VALUES
-If the call to
-.Nm confstr
-is not successful, 0 is returned and
-.Va errno
-is set appropriately.
-Otherwise, if the variable does not have a configuration defined value,
-0 is returned and
-.Va errno
-is not modified.
-Otherwise, the buffer size needed to hold the entire configuration-defined
-value is returned.
-If this size is greater than the argument
-.Fa len ,
-the string in
-.Fa buf
-was truncated.
-.Sh ERRORS
-The
-.Nm confstr
-function may fail and set
-.Va error
-for any of the errors specified for the library functions
-.Xr malloc 3
-and
-.Xr sysctl 3 .
-.Pp
-In addition, the following errors may be reported:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of the
-.Fa name
-argument is invalid.
-.El
-.Sh SEE ALSO
-.Xr sysctl 3
-.Sh STANDARDS
-The
-.Nm confstr
-function conforms to
-.St -p1003.2-92 .
-.Sh HISTORY
-The
-.Nm confstr
-function first appeared in
-.Bx 4.4 .
-.Sh BUGS
-The standards require us to return 0 both on errors, and when the value
-is not set.
diff --git a/lib/libc/gen/confstr.c b/lib/libc/gen/confstr.c
deleted file mode 100644
index 1160908c6..000000000
--- a/lib/libc/gen/confstr.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*	$NetBSD: confstr.c,v 1.13 2012/06/25 22:32:43 abs Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)confstr.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: confstr.c,v 1.13 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <errno.h>
-#include <paths.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(confstr,_confstr)
-#endif
-
-size_t
-confstr(int name, char *buf, size_t len)
-{
-	size_t tlen;
-	int mib[2], sverrno;
-	char *p;
-
-	/*
-	 * POSIX 1003.2 requires errors to return 0 --
-	 * that is *really* useful.
-	 */
-	switch (name) {
-	case _CS_PATH:
-		mib[0] = CTL_USER;
-		mib[1] = USER_CS_PATH;
-		if (sysctl(mib, 2, NULL, &tlen, NULL, 0) == -1)
-			return 0;
-		if (len != 0 && buf != NULL) {
-			if ((p = malloc(tlen)) == NULL)
-				return 0;
-			if (sysctl(mib, 2, p, &tlen, NULL, 0) == -1) {
-				sverrno = errno;
-				free(p);
-				errno = sverrno;
-				return 0;
-			}
-			/*
-			 * POSIX 1003.2 requires partial return of
-			 * the string -- that is even more useful.
-			 */
-			(void)strncpy(buf, p, len - 1);
-			buf[len - 1] = '\0';
-			free(p);
-		}
-		return tlen + 1;
-	default:
-		errno = EINVAL;
-		return 0;
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc/gen/cpuset.3 b/lib/libc/gen/cpuset.3
deleted file mode 100644
index 8a3298377..000000000
--- a/lib/libc/gen/cpuset.3
+++ /dev/null
@@ -1,119 +0,0 @@
-.\"	$NetBSD: cpuset.3,v 1.6 2011/11/02 20:25:20 wiz Exp $
-.\"
-.\" Copyright (c) 2008 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Mindaugas Rasiukevicius <rmind at NetBSD org>.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd November 2, 2011
-.Dt CPUSET 3
-.Os
-.Sh NAME
-.Nm cpuset_create ,
-.Nm cpuset_destroy ,
-.Nm cpuset_zero ,
-.Nm cpuset_set ,
-.Nm cpuset_clr ,
-.Nm cpuset_isset ,
-.Nm cpuset_size
-.Nd dynamic CPU sets
-.Sh SYNOPSIS
-.In sched.h
-.Ft cpuset_t *
-.Fn cpuset_create "void"
-.Ft void
-.Fn cpuset_destroy "cpuset_t *set"
-.Ft void
-.Fn cpuset_zero "cpuset_t *set"
-.Ft int
-.Fn cpuset_set "cpuid_t cpu" "cpuset_t *set"
-.Ft int
-.Fn cpuset_clr "cpuid_t cpu" "cpuset_t *set"
-.Ft int
-.Fn cpuset_isset "cpuid_t cpu" "const cpuset_t *set"
-.Ft size_t
-.Fn cpuset_size "const cpuset_t *set"
-.Sh DESCRIPTION
-This section describes the functions used to create, set, use and destroy
-the dynamic CPU sets.
-.Pp
-This API can be used with the POSIX threads, see
-.Xr pthread 3
-and
-.Xr affinity 3 .
-.Pp
-The ID of the primary CPU in the system is 0.
-.Sh FUNCTIONS
-.Bl -tag -width compact
-.It Fn cpuset_create
-Allocates and initializes a clean CPU-set.
-Returns the pointer to the CPU-set, or
-.Dv NULL
-on failure.
-.It Fn cpuset_destroy set
-Destroy the CPU-set specified by
-.Fa set .
-.It Fn cpuset_zero set
-Makes the CPU-set specified by
-.Fa set
-clean, that is, memory is initialized to zero bytes, and none of
-the CPUs set.
-.It Fn cpuset_set cpu set
-Sets the CPU specified by
-.Fa cpu
-in
-.Fa set .
-Returns zero on success, and \-1 if
-.Fa cpu
-is invalid.
-.It Fn cpuset_clr cpu set
-Clears the CPU specified by
-.Fa cpu
-in the CPU-set
-.Fa set .
-Returns zero on success, and \-1 if
-.Fa cpu
-is invalid.
-.It Fn cpuset_isset cpu set
-Checks if CPU specified by
-.Fa cpu
-is set in the CPU-set
-.Fa set .
-Returns the positive number if set, zero if not set, and \-1 if
-.Fa cpu
-is invalid.
-.It Fn cpuset_size set
-Returns the size in bytes of CPU-set specified by
-.Fa set .
-.El
-.Sh SEE ALSO
-.Xr affinity 3 ,
-.Xr pset 3 ,
-.Xr sched 3 ,
-.Xr schedctl 8 ,
-.Xr kcpuset 9
-.Sh HISTORY
-The dynamic CPU sets appeared in
-.Nx 5.0 .
diff --git a/lib/libc/gen/ctermid.3 b/lib/libc/gen/ctermid.3
deleted file mode 100644
index b167392b2..000000000
--- a/lib/libc/gen/ctermid.3
+++ /dev/null
@@ -1,90 +0,0 @@
-.\"	$NetBSD: ctermid.3,v 1.11 2010/03/22 19:30:53 joerg Exp $
-.\"
-.\" Copyright (c) 1990, 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. 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.
-.\"
-.\"     @(#)ctermid.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt CTERMID 3
-.Os
-.Sh NAME
-.Nm ctermid
-.Nd generate terminal pathname
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft char *
-.Fn ctermid "char *buf"
-.Sh DESCRIPTION
-The
-.Fn ctermid
-function generates a string, that, when used as a pathname, refers to
-the current controlling terminal of the calling process.
-.Pp
-If
-.Ar buf
-is the
-.Dv NULL
-pointer, a pointer to a static area is returned.
-Otherwise, the pathname is copied into the memory referenced by
-.Ar buf .
-The argument
-.Ar buf
-is assumed to point to an array at least
-.Dv L_ctermid
-bytes long (as defined in the include file
-.In stdio.h ) .
-.Pp
-The current implementation simply returns
-.Ql /dev/tty .
-.Sh RETURN VALUES
-Upon successful completion, a
-.Pf non- Dv NULL
-pointer is returned.
-Otherwise, a
-.Dv NULL
-pointer is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The current implementation detects no error conditions.
-.Sh SEE ALSO
-.Xr ttyname 3
-.Sh STANDARDS
-The
-.Fn ctermid
-function conforms to
-.St -p1003.1-90 .
-.Sh BUGS
-By default the
-.Fn ctermid
-function writes all information to an internal static object.
-Subsequent calls to
-.Fn ctermid
-will modify the same object.
diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c
deleted file mode 100644
index 21ace8a6b..000000000
--- a/lib/libc/gen/ctermid.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: ctermid.c,v 1.11 2012/06/25 22:32:43 abs Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)ctermid.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: ctermid.c,v 1.11 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <stdio.h>
-#include <string.h>
-#include <paths.h>
-
-#ifdef __weak_alias
-__weak_alias(ctermid,_ctermid)
-#endif
-
-char *
-ctermid(char *s)
-{
-	static char def[] = _PATH_TTY;
-
-	if (s) {
-		(void)strncpy(s, def, L_ctermid);
-		return (s);
-	}
-	return (def);
-}
diff --git a/lib/libc/gen/ctype.3 b/lib/libc/gen/ctype.3
deleted file mode 100644
index 5bbf90540..000000000
--- a/lib/libc/gen/ctype.3
+++ /dev/null
@@ -1,151 +0,0 @@
-.\"	$NetBSD: ctype.3,v 1.22 2015/02/25 16:23:40 wiz Exp $
-.\"
-.\" Copyright (c) 1991 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.
-.\"
-.\"     @(#)ctype.3	6.5 (Berkeley) 4/19/91
-.\"
-.Dd February 25, 2015
-.Dt CTYPE 3
-.Os
-.Sh NAME
-.Nm isalpha ,
-.Nm isupper ,
-.Nm islower ,
-.Nm isdigit ,
-.Nm isxdigit ,
-.Nm isalnum ,
-.Nm isspace ,
-.Nm ispunct ,
-.Nm isprint ,
-.Nm isgraph ,
-.Nm iscntrl ,
-.Nm isblank ,
-.Nm toupper ,
-.Nm tolower ,
-.Nd character classification and mapping functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Fn isalpha "int c"
-.Fn isupper "int c"
-.Fn islower "int c"
-.Fn isdigit "int c"
-.Fn isxdigit "int c"
-.Fn isalnum "int c"
-.Fn isspace "int c"
-.Fn ispunct "int c"
-.Fn isprint "int c"
-.Fn isgraph "int c"
-.Fn iscntrl "int c"
-.Fn isblank "int c"
-.Fn toupper "int c"
-.Fn tolower "int c"
-.Sh DESCRIPTION
-The above functions perform character tests and conversions on the integer
-.Ar c .
-.Pp
-See the specific manual pages for information about the
-test or conversion performed by each function.
-.Sh EXAMPLES
-To print an upper-case version of a string to stdout,
-the following code can be used:
-.Bd -literal -offset indent
-const char *s = "xyz";
-
-while (*s != '\e0') {
-    putchar(toupper((unsigned char)*s));
-    s++;
-}
-.Ed
-.Sh SEE ALSO
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-These functions, with the exception of
-.Fn isblank ,
-conform to
-.St -ansiC .
-All described functions, including
-.Fn isblank ,
-also conform to
-.St -p1003.1-2001 .
-.Sh CAVEATS
-The first argument of these functions is of type
-.Vt int ,
-but only a very restricted subset of values are actually valid.
-The argument must either be the value of the macro
-.Dv EOF
-(which has a negative value),
-or must be a non-negative value within the range representable as
-.Vt unsigned char .
-Passing invalid values leads to undefined behavior.
-.Pp
-Values of type
-.Vt int
-that were returned by
-.Xr getc 3 ,
-.Xr fgetc 3 ,
-and similar functions or macros
-are already in the correct range, and may be safely passed to these
-.Nm ctype
-functions without any casts.
-.Pp
-Values of type
-.Vt char
-or
-.Vt signed char
-must first be cast to
-.Vt unsigned char ,
-to ensure that the values are within the correct range.
-Casting a negative-valued
-.Vt char
-or
-.Vt signed char
-directly to
-.Vt int
-will produce a negative-valued
-.Vt int ,
-which will be outside the range of allowed values
-(unless it happens to be equal to
-.Dv EOF ,
-but even that would not give the desired result).
diff --git a/lib/libc/gen/ctype_.c b/lib/libc/gen/ctype_.c
deleted file mode 100644
index b12c41a17..000000000
--- a/lib/libc/gen/ctype_.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*	$NetBSD: ctype_.c,v 1.20 2013/04/13 10:21:20 joerg Exp $	*/
-
-/*
- * Copyright (c) 1989 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-/*static char *sccsid = "from: @(#)ctype_.c	5.6 (Berkeley) 6/1/90";*/
-#else
-__RCSID("$NetBSD: ctype_.c,v 1.20 2013/04/13 10:21:20 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/ctype_bits.h>
-#include <stdio.h>
-#include "ctype_local.h"
-
-#if EOF != -1
-#error "EOF != -1"
-#endif
-
-#ifdef __BUILD_LEGACY
-#define	_C	_COMPAT_C
-#define	_S	_COMPAT_S
-#define	_U	_COMPAT_U
-#define	_X	_COMPAT_X
-#define	_L	_COMPAT_L
-#define	_P	_COMPAT_P
-#define	_B	_COMPAT_B
-#define	_N	_COMPAT_N
-
-const unsigned char _C_compat_bsdctype[1 + _CTYPE_NUM_CHARS] = {
-	0,
-	_C,	_C,	_C,	_C,	_C,	_C,	_C,	_C,
-	_C,	_C|_S,	_C|_S,	_C|_S,	_C|_S,	_C|_S,	_C,	_C,
-	_C,	_C,	_C,	_C,	_C,	_C,	_C,	_C,
-	_C,	_C,	_C,	_C,	_C,	_C,	_C,	_C,
-	_S|_B,	_P,	_P,	_P,	_P,	_P,	_P,	_P,
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P,
-	_N,	_N,	_N,	_N,	_N,	_N,	_N,	_N,
-	_N,	_N,	_P,	_P,	_P,	_P,	_P,	_P,
-	_P,	_U|_X,	_U|_X,	_U|_X,	_U|_X,	_U|_X,	_U|_X,	_U,
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U,
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U,
-	_U,	_U,	_U,	_P,	_P,	_P,	_P,	_P,
-	_P,	_L|_X,	_L|_X,	_L|_X,	_L|_X,	_L|_X,	_L|_X,	_L,
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L,
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L,
-	_L,	_L,	_L,	_P,	_P,	_P,	_P,	_C
-};
-
-#undef _C
-#undef _S
-#undef _U
-#undef _X
-#undef _L
-#undef _P
-#undef _B
-#undef _N
-
-#ifdef __weak_alias
-__weak_alias(_C_ctype_, _C_compat_bsdctype)
-#endif
-
-const unsigned char *_ctype_ = &_C_compat_bsdctype[0];
-#endif /* __BUILD_LEGACY */
-
-#define	_A	_CTYPE_A
-#define	_BL	_CTYPE_BL
-#define	_C	_CTYPE_C
-#define	_D	_CTYPE_D
-#define	_G	_CTYPE_G
-#define	_L	_CTYPE_L
-#define	_P	_CTYPE_P
-#define	_R	_CTYPE_R
-#define	_S	_CTYPE_S
-#define	_U	_CTYPE_U
-#define	_X	_CTYPE_X
-
-const unsigned short _C_ctype_tab_[1 + _CTYPE_NUM_CHARS] = {
-	0,
-	_C,		_C,		_C,		_C,
-	_C,		_C,		_C,		_C,
-	_C,		_BL|_C|_S,	_C|_S,		_C|_S,
-	_C|_S,		_C|_S,		_C,		_C,
-	_C,		_C,		_C,		_C,
-	_C,		_C,		_C,		_C,
-	_C,		_C,		_C,		_C,
-	_C,		_C,		_C,		_C,
-	_BL|_R|_S,	_G|_R|_P,	_G|_R|_P,	_G|_R|_P,
-	_G|_R|_P,	_G|_R|_P,	_G|_R|_P,	_G|_R|_P,
-	_G|_R|_P,	_G|_R|_P,	_G|_R|_P,	_G|_R|_P,
-	_G|_R|_P,	_G|_R|_P,	_G|_R|_P,	_G|_R|_P,
-	_D|_G|_R|_X,	_D|_G|_R|_X,	_D|_G|_R|_X,	_D|_G|_R|_X,
-	_D|_G|_R|_X,	_D|_G|_R|_X,	_D|_G|_R|_X,	_D|_G|_R|_X,
-	_D|_G|_R|_X,	_D|_G|_R|_X,	_G|_R|_P,	_G|_R|_P,
-	_G|_R|_P,	_G|_R|_P,	_G|_R|_P,	_G|_R|_P,
-	_G|_R|_P,	_A|_G|_R|_U|_X,	_A|_G|_R|_U|_X,	_A|_G|_R|_U|_X,
-	_A|_G|_R|_U|_X,	_A|_G|_R|_U|_X,	_A|_G|_R|_U|_X,	_A|_G|_R|_U,
-	_A|_G|_R|_U,	_A|_G|_R|_U,	_A|_G|_R|_U,	_A|_G|_R|_U,
-	_A|_G|_R|_U,	_A|_G|_R|_U,	_A|_G|_R|_U,	_A|_G|_R|_U,
-	_A|_G|_R|_U,	_A|_G|_R|_U,	_A|_G|_R|_U,	_A|_G|_R|_U,
-	_A|_G|_R|_U,	_A|_G|_R|_U,	_A|_G|_R|_U,	_A|_G|_R|_U,
-	_A|_G|_R|_U,	_A|_G|_R|_U,	_A|_G|_R|_U,	_G|_R|_P,
-	_G|_R|_P,	_G|_R|_P,	_G|_R|_P,	_G|_R|_P,
-	_G|_R|_P,	_A|_G|_L|_R|_X,	_A|_G|_L|_R|_X,	_A|_G|_L|_R|_X,
-	_A|_G|_L|_R|_X,	_A|_G|_L|_R|_X,	_A|_G|_L|_R|_X,	_A|_G|_L|_R,
-	_A|_G|_L|_R,	_A|_G|_L|_R,	_A|_G|_L|_R,	_A|_G|_L|_R,
-	_A|_G|_L|_R,	_A|_G|_L|_R,	_A|_G|_L|_R,	_A|_G|_L|_R,
-	_A|_G|_L|_R,	_A|_G|_L|_R,	_A|_G|_L|_R,	_A|_G|_L|_R,
-	_A|_G|_L|_R,	_A|_G|_L|_R,	_A|_G|_L|_R,	_A|_G|_L|_R,
-	_A|_G|_L|_R,	_A|_G|_L|_R,	_A|_G|_L|_R,	_G|_R|_P,
-	_G|_R|_P,	_G|_R|_P,	_G|_R|_P,	_C,
-};
-
-#undef _A
-#undef _BL
-#undef _C
-#undef _D
-#undef _G
-#undef _L
-#undef _P
-#undef _R
-#undef _S
-#undef _U
-#undef _X
-
-const unsigned short *_ctype_tab_ = &_C_ctype_tab_[0];
diff --git a/lib/libc/gen/daemon.3 b/lib/libc/gen/daemon.3
deleted file mode 100644
index 47f3f5790..000000000
--- a/lib/libc/gen/daemon.3
+++ /dev/null
@@ -1,114 +0,0 @@
-.\"	$NetBSD: daemon.3,v 1.15 2003/08/07 16:42:46 agc Exp $
-.\"
-.\" 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.
-.\"
-.\"	@(#)daemon.3	8.1 (Berkeley) 6/9/93
-.\"
-.Dd September 3, 1999
-.Dt DAEMON 3
-.Os
-.Sh NAME
-.Nm daemon
-.Nd run in the background
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn daemon "int nochdir" "int noclose"
-.Sh DESCRIPTION
-The
-.Fn daemon
-function is for programs wishing to detach themselves from the
-controlling terminal and run in the background as system daemons.
-.Pp
-Unless the argument
-.Fa nochdir
-is non-zero,
-.Fn daemon
-changes the current working directory to the root
-.Pq Pa / .
-.Pp
-Unless the argument
-.Fa noclose
-is non-zero,
-.Fn daemon
-will redirect standard input, standard output and standard error
-to
-.Pa /dev/null .
-.Sh RETURN VALUES
-On return 0 indicates success with \-1 indicating error.
-.Sh ERRORS
-The function
-.Fn daemon
-may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr fork 2
-and
-.Xr setsid 2 .
-.Sh SEE ALSO
-.Xr fork 2 ,
-.Xr setsid 2
-.Sh HISTORY
-The
-.Fn daemon
-function first appeared in
-.Bx 4.4 .
-.Sh CAVEATS
-Unless the
-.Ar noclose
-argument is non-zero,
-.Fn daemon
-will close the first three file descriptors and redirect them to
-.Pa /dev/null .
-Normally, these correspond to standard input, standard output and
-standard error.
-However, if any of those file descriptors refer to something else they
-will still be closed, resulting in incorrect behavior of the calling program.
-This can happen if any of standard input, standard output or standard error
-have been closed before the program was run.
-Programs using
-.Fn daemon
-should therefore make sure to either call
-.Fn daemon
-before opening any files or sockets or, alternately, verifying that
-any file descriptors obtained have a value greater than 2.
-.Sh BUGS
-.Fn daemon
-uses
-.Fn fork
-as part of its tty detachment mechanism.
-Consequently the process id changes when
-.Fn daemon
-is invoked.
-Processes employing
-.Fn daemon
-can not be reliably waited upon until
-.Fn daemon
-has been invoked.
diff --git a/lib/libc/gen/daemon.c b/lib/libc/gen/daemon.c
deleted file mode 100644
index 1cec204fc..000000000
--- a/lib/libc/gen/daemon.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: daemon.c,v 1.10 2012/06/25 22:32:43 abs Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)daemon.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: daemon.c,v 1.10 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <fcntl.h>
-#include <paths.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(daemon,_daemon)
-#endif
-
-int
-daemon(int nochdir, int noclose)
-{
-	int fd;
-
-	switch (fork()) {
-	case -1:
-		return (-1);
-	case 0:
-		break;
-	default:
-		_exit(0);
-	}
-
-	if (setsid() == -1)
-		return (-1);
-
-	if (!nochdir)
-		(void)chdir("/");
-
-	if (!noclose && (fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) {
-		(void)dup2(fd, STDIN_FILENO);
-		(void)dup2(fd, STDOUT_FILENO);
-		(void)dup2(fd, STDERR_FILENO);
-		if (fd > STDERR_FILENO)
-			(void)close(fd);
-	}
-	return (0);
-}
diff --git a/lib/libc/gen/dehumanize_number.c b/lib/libc/gen/dehumanize_number.c
deleted file mode 100644
index c416f0515..000000000
--- a/lib/libc/gen/dehumanize_number.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*	$NetBSD: dehumanize_number.c,v 1.7 2014/10/01 13:53:04 apb Exp $	*/
-
-/*
- * Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julio M. Merino Vidal, developed as part of Google's Summer of Code
- * 2005 program.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (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_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif /* HAVE_NBTOOL_CONFIG_H */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: dehumanize_number.c,v 1.7 2014/10/01 13:53:04 apb Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <inttypes.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-
-/*
- * Converts the number given in 'str', which may be given in a humanized
- * form (as described in humanize_number(3), but with some limitations),
- * to an int64_t without units.
- * In case of success, 0 is returned and *size holds the value.
- * Otherwise, -1 is returned and *size is untouched.
- *
- * TODO: Internationalization, SI units.
- */
-int
-dehumanize_number(const char *str, int64_t *size)
-{
-	char *ep, unit;
-	const char *delimit;
-	long multiplier;
-	long long tmp, tmp2;
-	size_t len;
-
-	len = strlen(str);
-	if (len == 0) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	multiplier = 1;
-
-	unit = str[len - 1];
-	if (isalpha((unsigned char)unit)) {
-		switch (tolower((unsigned char)unit)) {
-		case 'b':
-			multiplier = 1;
-			break;
-
-		case 'k':
-			multiplier = 1024;
-			break;
-
-		case 'm':
-			multiplier = 1024 * 1024;
-			break;
-
-		case 'g':
-			multiplier = 1024 * 1024 * 1024;
-			break;
-
-		default:
-			errno = EINVAL;
-			return -1; /* Invalid suffix. */
-		}
-
-		delimit = &str[len - 1];
-	} else
-		delimit = NULL;
-
-	errno = 0;
-	tmp = strtoll(str, &ep, 10);
-	if (str[0] == '\0' || (ep != delimit && *ep != '\0'))
-		return -1; /* Not a number. */
-	else if (errno == ERANGE && (tmp == LLONG_MAX || tmp == LLONG_MIN))
-		return -1; /* Out of range. */
-
-	tmp2 = tmp * multiplier;
-	tmp2 = tmp2 / multiplier;
-	if (tmp != tmp2) {
-		errno = ERANGE;
-		return -1; /* Out of range. */
-	}
-	tmp *= multiplier;
-#ifdef _DIAGASSERT
-	_DIAGASSERT(__type_fit(int64_t, tmp));
-#endif
-	*size = (int64_t)tmp;
-
-	return 0;
-}
diff --git a/lib/libc/gen/devname.3 b/lib/libc/gen/devname.3
deleted file mode 100644
index 6ab0318d1..000000000
--- a/lib/libc/gen/devname.3
+++ /dev/null
@@ -1,76 +0,0 @@
-.\"	$NetBSD: devname.3,v 1.12 2012/06/03 21:42:46 joerg Exp $
-.\"
-.\" 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.
-.\"
-.\"     @(#)devname.3	8.2 (Berkeley) 4/29/95
-.\"
-.Dd June 3, 2012
-.Dt DEVNAME 3
-.Os
-.Sh NAME
-.Nm devname
-.Nd get device name
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.In sys/stat.h
-.Ft char *
-.Fn devname "dev_t dev" "mode_t type"
-.Sh DESCRIPTION
-The
-.Fn devname
-function returns a pointer to the name of the block or character
-device in
-.Dq Pa /dev
-with a device number of
-.Fa dev ,
-and a file type matching the one encoded in
-.Fa type
-which must be one of S_IFBLK or S_IFCHR.
-If no device matches the specified values, or no information is
-available,
-.Dv NULL
-is returned.
-.Pp
-The traditional display for applications when no device is
-found is the string
-.Dq ?? .
-.Sh FILES
-.Bl -tag -width /var/run/dev.cdb -compact
-.It Pa /var/run/dev.cdb
-Device database file.
-.El
-.Sh SEE ALSO
-.Xr stat 2 ,
-.Xr dev_mkdb 8
-.Sh HISTORY
-The
-.Nm devname
-function call appeared in
-.Bx 4.4 .
diff --git a/lib/libc/gen/devname.c b/lib/libc/gen/devname.c
deleted file mode 100644
index 988d3cfd1..000000000
--- a/lib/libc/gen/devname.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*	$NetBSD: devname.c,v 1.22 2012/06/03 21:42:46 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Simon Burge.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: devname.c,v 1.22 2012/06/03 21:42:46 joerg Exp $");
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/stat.h>
-
-#include <cdbr.h>
-#include <errno.h>
-#include <fts.h>
-#include <limits.h>
-#include <paths.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef __minix
-#include <minix/dmap.h>		/* for UNIX98_MINOR */
-#endif /* __minix */
-
-#ifdef __weak_alias
-__weak_alias(devname_r,_devname_r)
-#endif
-
-static once_t db_opened = ONCE_INITIALIZER;
-static struct cdbr *db;
-static devmajor_t pts;
-
-static void
-devname_dbopen(void)
-{
-	db = cdbr_open(_PATH_DEVCDB, CDBR_DEFAULT);
-	pts = getdevmajor("pts", S_IFCHR);
-}
-
-__CTASSERT(sizeof(dev_t) == 8);
-
-static int
-devname_dblookup(dev_t dev, mode_t type, char *path, size_t len)
-{
-	const void *data;
-	size_t datalen;
-	uint8_t key[10];
-
-	le64enc(key, dev);
-	le16enc(key + 8, type);
-	if (cdbr_find(db, key, sizeof(key), &data, &datalen) != 0)
-		return ENOENT;
-	if (datalen <= sizeof(key))
-		return ENOENT;
-	if (memcmp(key, data, sizeof(key)) != 0)
-		return ENOENT;
-	data = (const char *)data + sizeof(key);
-	datalen -= sizeof(key);
-	if (memchr(data, '\0', datalen) != (const char *)data + datalen - 1)
-		return ENOENT;
-	if (datalen > len)
-		return ERANGE;
-	memcpy(path, data, datalen);
-	return 0;
-}
-
-static int
-devname_ptslookup(dev_t dev, mode_t type, char *path, size_t len)
-{
-	int rv;
-
-	if (type != S_IFCHR || pts == NODEVMAJOR || major(dev) != pts)
-		return ENOENT;
-#ifdef __minix
-	/*
-	 * MINIX3 does not use an identity mapping for /dev/pts, because the
-	 * same major number is also used for PTY masters and legacy PTYs.
-	 */
-	if (minor(dev) < UNIX98_MINOR || !(minor(dev) & 1))
-		return ENOENT;
-#endif /* __minix */
-
-	rv = snprintf(path, len, "%s%d", _PATH_DEV_PTS + sizeof(_PATH_DEV) - 1,
-#ifndef __minix
-	    minor(dev));
-#else /* __minix */
-	    (minor(dev) - UNIX98_MINOR) >> 1);
-#endif /* __minix */
-	if (rv < 0 || (size_t)rv >= len)
-		return ERANGE;
-	return 0;
-}
-
-static int
-devname_fts(dev_t dev, mode_t type, char *path, size_t len)
-{
-	FTS *ftsp;
-	FTSENT *fe;
-	static const char path_dev[] = _PATH_DEV;
-	static char * const dirs[2] = { __UNCONST(path_dev), NULL };
-	const size_t len_dev = strlen(path_dev);
-	int rv;
-
-	if ((ftsp = fts_open(dirs, FTS_NOCHDIR | FTS_PHYSICAL, NULL)) == NULL)
-		return ENOENT;
-
-	rv = ENOENT;
-	while ((fe = fts_read(ftsp)) != NULL) {
-		if (fe->fts_info != FTS_DEFAULT)
-			continue;
-		if (fe->fts_statp->st_rdev != dev)
-			continue;
-		if ((type & S_IFMT) != (fe->fts_statp->st_mode & S_IFMT))
-			continue;
-		if (strncmp(fe->fts_path, path_dev, len_dev))
-			continue;
-		if (strlcpy(path, fe->fts_path + len_dev, len) < len) {
-			rv = 0;
-			break;
-		}
-	}
-
-	fts_close(ftsp);
-	return rv;
-}
-
-int
-devname_r(dev_t dev, mode_t type, char *path, size_t len)
-{
-	int rv;
-
-	thr_once(&db_opened, devname_dbopen);
-
-	if (db != NULL) {
-		rv = devname_dblookup(dev, type, path, len);
-		if (rv == 0 || rv == ERANGE)
-			return rv;
-	}
-
-	rv = devname_ptslookup(dev, type, path, len);
-	if (rv == 0 || rv == ERANGE)
-		return rv;
-
-	if (db != NULL)
-		return ENOENT;
-	rv = devname_fts(dev, type, path, len);
-	return rv;
-}
-
-char *
-devname(dev_t dev, mode_t type)
-{
-	static char path[PATH_MAX];
-
-	return devname_r(dev, type, path, sizeof(path)) == 0 ? path : NULL;
-}
diff --git a/lib/libc/gen/directory.3 b/lib/libc/gen/directory.3
deleted file mode 100644
index 7b7392587..000000000
--- a/lib/libc/gen/directory.3
+++ /dev/null
@@ -1,399 +0,0 @@
-.\"	$NetBSD: directory.3,v 1.38 2012/10/08 18:15:09 njoly Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)directory.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd October 15, 2011
-.Dt DIRECTORY 3
-.Os
-.Sh NAME
-.Nm fdopendir ,
-.Nm opendir ,
-.Nm readdir ,
-.Nm readdir_r ,
-.Nm telldir ,
-.Nm seekdir ,
-.Nm rewinddir ,
-.Nm closedir ,
-.Nm dirfd
-.Nd directory operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In dirent.h
-.Ft DIR *
-.Fn opendir "const char *filename"
-.Ft DIR *
-.Fn fdopendir "int fd"
-.Ft struct dirent *
-.Fn readdir "DIR *dirp"
-.Ft int
-.Fn readdir_r "DIR * restrict dirp" "struct dirent * restrict entry" "struct dirent ** restrict result"
-.Ft long
-.Fn telldir "DIR *dirp"
-.Ft void
-.Fn seekdir "DIR *dirp" "long loc"
-.Ft void
-.Fn rewinddir "DIR *dirp"
-.Ft int
-.Fn closedir "DIR *dirp"
-.Ft int
-.Fn dirfd "DIR *dirp"
-.Sh DESCRIPTION
-The type
-.Vt DIR
-represents a directory stream;
-an ordered sequence of all directory entries in a particular directory.
-The purpose of the
-.Vt DIR
-structure is similar to that of the
-.Vt FILE
-structure maintained by the
-.Xr stdio 3
-library functions.
-.Sh FUNCTIONS
-The following standard directory operations are defined.
-.Bl -tag -width XXX
-.It Fn opendir "filename"
-The
-.Fn opendir
-function opens the directory named by
-.Fa filename
-and associates a directory stream with it.
-The directory stream is positioned at the first entry.
-Upon successful completion, a pointer to
-.Vt DIR
-type is returned.
-Otherwise,
-.Fn opendir
-returns
-.Dv NULL .
-.It Fn fdopendir "fd"
-The
-.Fn fdopendir
-function associates a directory stream with the directory file descriptor
-.Fa fd .
-The file offset associated with
-.Fa fd
-at the time of the call determines which entries are returned.
-.Pp
-Upon failure,
-.Fn fdopendir
-returns
-.Dv NULL .
-Otherwise the file descriptor is under the control of the system,
-and if any attempt is made to close the file descriptor,
-or to modify the state of the associated description,
-other than by means of
-.Fn closedir ,
-.Fn readdir ,
-.Fn readdir_r ,
-.Fn rewinddir ,
-the behavior is undefined.
-The file descriptor can be closed by calling
-.Fn closedir .
-.It Fn readdir "dirp"
-The
-.Fn readdir
-function returns a pointer to the directory entry at the current position
-in the directory stream specified by
-.Fa dirp ,
-and positions the directory stream at the next entry.
-It returns
-.Dv NULL
-upon reaching the end of the directory or detecting an invalid
-.Fn seekdir
-operation.
-The returned structure is described in
-.Xr dirent 3 .
-.Pp
-The returned pointer to the
-.Em dirent
-structure points to data which may be overwritten by another call to
-.Fn readdir
-on the same directory stream.
-This data is not however overwritten by another call to
-.Fn readdir
-on a different directory stream.
-.It Fn readdir_r "dirp" "entry" "result"
-The
-.Fn readdir_r
-function
-provides the same functionality as
-.Fn readdir ,
-but the caller must provide a directory
-.Fa entry
-buffer to store the results in.
-If the read succeeds,
-.Fa result
-is pointed at the
-.Fa entry ;
-upon reaching the end of the directory
-.Fa result
-is set to
-.Dv NULL .
-The
-.Fn readdir_r
-function
-returns 0 on success or an error number to indicate failure.
-.Pp
-Like
-.Fn readdir ,
-the
-.Fn readdir_r
-function may buffer several directory entries per actual read operation.
-Both functions mark for update the
-.Em st_atime
-field (see
-.Xr stat 2 )
-of the directory each time the directory is actually read.
-.It Fn telldir "dirp"
-The
-.Fn telldir
-function returns the current location associated
-with the directory stream specified by
-.Fa dirp .
-.Pp
-If the most recent operation on the particular directory stream was a
-.Fn seekdir ,
-the directory position returned from
-.Fn telldir
-is the same as
-.Fa loc
-supplied as an argument to the
-.Fn seekdir
-call.
-.It Fn seekdir "dirp" "loc"
-The
-.Fn seekdir
-function sets the position of the next
-.Fn readdir
-operation on the directory stream specified by
-.Fa dirp .
-The value of
-.Fa loc
-should come from a previous call to
-.Fn telldir
-using the same directory stream.
-.Pp
-The new position reverts to the one associated
-with the directory stream when the
-.Fn telldir
-operation was performed.
-Values returned by
-.Fn telldir
-are good only for the lifetime of the
-.Vt DIR
-pointer,
-.Fa dirp ,
-from which they are derived.
-If the directory is closed and then reopened, the
-.Fn telldir
-value cannot be re-used.
-.It Fn rewinddir "dirp"
-The
-.Fn rewinddir
-function resets the position of the named directory
-stream to the beginning of the directory.
-It also causes the directory stream to refer to the
-current state of the corresponding directory, as if a call to
-.Fn opendir
-would have been made.
-.Pp
-If
-.Fa dirp
-does not refer to a valid directory stream, the behavior is undefined.
-.It Fn closedir "dirp"
-The
-.Fn closedir
-function closes the directory stream
-and frees the structure associated with the
-.Fa dirp
-pointer,
-returning 0 on success and \-1 on failure.
-.It Fn dirfd "dirp"
-The
-.Fn dirfd
-function returns the integer file descriptor
-associated with the directory stream specified by
-.Fa dirp .
-Upon failure,
-.Fn dirfd
-returns \-1.
-The returned file descriptor should be closed by
-.Fn closedir
-instead of
-.Xr close 2 .
-.Pp
-The rationale of
-.Fn dirfd
-is to provide a mechanism by which a file descriptor
-can be obtained for the use of the
-.Xr fchdir 2
-function.
-.El
-.Sh EXAMPLES
-Sample code which searches a directory for entry
-.Dq name
-is:
-.Bd -literal -offset indent
-len = strlen(name);
-dirp = opendir(".");
-if (dirp != NULL) {
-	while ((dp = readdir(dirp)) != NULL)
-		if (dp-\*[Gt]d_namlen == len \*[Am]\*[Am]
-		    !strcmp(dp-\*[Gt]d_name, name)) {
-			(void)closedir(dirp);
-			return (FOUND);
-		}
-	(void)closedir(dirp);
-}
-return (NOT_FOUND);
-.Ed
-.Sh COMPATIBILITY
-The described directory operations have traditionally been problematic
-in terms of portability.
-A good example is the semantics around
-.Sq \&.
-(dot) and
-.Sq \&..
-(dot-dot).
-Based on historical implementations,
-the rules about file descriptors apply to directory streams as well.
-The
-.St -p1003.1-2008
-standard does not however any more mandate that directory streams
-are necessarily implemented by using file descriptors.
-.Pp
-The following additional remarks can be noted from the
-.St -p1003.1-2008
-standard.
-.Bl -bullet -offset 2n
-.It
-If the type
-.Vt DIR
-is implemented using a file descriptor,
-like in
-.Nx ,
-applications should be able to open only
-.Dv OPEN_MAX
-files and directories.
-Otherwise the limit is left as unspecified.
-.It
-When a file descriptor is used to implement the directory stream, the
-.Fn closedir
-function behaves as if the
-.Dv FD_CLOEXEC
-had been set for the file descriptor.
-In another words, it is mandatory that
-.Fn closedir
-deallocates the file descriptor.
-.It
-If directory streams are not implemented by using file descriptors,
-functions such as
-.Fn dirfd
-may fail with
-.Er ENOTSUP .
-.It
-If a file is removed from or added to the directory
-after the most recent call to
-.Fn opendir
-or
-.Fn rewinddir ,
-it is unspecified whether a subsequent call to
-.Fn readdir
-returns an entry for that file.
-.It
-When using the function
-.Fn seekdir ,
-note that if the value of
-.Fa loc
-was not obtained from an earlier call to
-.Fn telldir ,
-or if a call to
-.Fn rewinddir
-occurred between the calls to
-.Fn telldir
-and
-.Fn seekdir ,
-any subsequent call to
-.Fn readdir
-is unspecified, possibly resulting undefined behavior.
-.It
-After a call to
-.Xr fork 2 ,
-either the parent or child (but not both) can continue processing the
-directory stream using
-.Fn readdir ,
-.Fn rewinddir ,
-or
-.Fn seekdir .
-However, if both the parent and child processes use these functions,
-the result is undefined.
-.El
-.Sh ERRORS
-.\"
-.\" XXX: The errors should be enumerated.
-.\"
-All described functions may set
-.Vt errno
-to indicate the error.
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr lseek 2 ,
-.Xr open 2 ,
-.Xr read 2 ,
-.Xr dirent 3
-.Sh STANDARDS
-The
-.Fn opendir ,
-.Fn readdir ,
-.Fn rewinddir
-and
-.Fn closedir
-functions conform to
-.St -p1003.1-90 .
-The other functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn opendir ,
-.Fn readdir ,
-.Fn telldir ,
-.Fn seekdir ,
-.Fn rewinddir ,
-.Fn closedir ,
-and
-.Fn dirfd
-functions appeared in
-.Bx 4.2 .
-The
-.Fn fdopendir
-function appeared in
-.Nx 6.0 .
diff --git a/lib/libc/gen/dirent_private.h b/lib/libc/gen/dirent_private.h
deleted file mode 100644
index 77d2d56fc..000000000
--- a/lib/libc/gen/dirent_private.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*	$NetBSD: dirent_private.h,v 1.4 2010/09/26 02:26:59 yamt Exp $	*/
-
-/*
- * One struct _dirpos is malloced to describe the current directory
- * position each time telldir is called. It records the current magic 
- * cookie returned by getdents and the offset within the buffer associated
- * with that return value.
- */
-struct dirpos {
-	struct dirpos *dp_next;	/* next structure in list */
-	off_t	dp_seek;	/* magic cookie returned by getdents */
-	long	dp_loc;		/* offset of entry in buffer */
-};
-
-struct _dirdesc;
-void _seekdir_unlocked(struct _dirdesc *, long);
-long _telldir_unlocked(struct _dirdesc *);
-int _initdir(DIR *, int, const char *);
-void _finidir(DIR *);
-#ifndef __LIBC12_SOURCE__
-struct dirent;
-struct dirent *_readdir_unlocked(struct _dirdesc *, int)
-    __RENAME(___readdir_unlocked50);
-#endif
diff --git a/lib/libc/gen/dirname.3 b/lib/libc/gen/dirname.3
deleted file mode 100644
index 216631833..000000000
--- a/lib/libc/gen/dirname.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\"	$NetBSD: dirname.3,v 1.14 2008/05/10 22:39:40 christos Exp $
-.\"
-.\" Copyright (c) 1997, 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Klaus Klein and Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 10, 2008
-.Dt DIRNAME 3
-.Os
-.Sh NAME
-.Nm dirname
-.Nd report the parent directory name of a file pathname
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In libgen.h
-.Ft char *
-.Fn dirname "char *path"
-.Sh DESCRIPTION
-The
-.Fn dirname
-function takes a pointer to a character string that contains a pathname,
-.Ar path ,
-and returns a pointer to a string that is a pathname of the parent directory of
-.Ar path .
-Trailing
-.Sq /
-characters in
-.Ar path
-are not counted as part of the path.
-.Pp
-If
-.Ar path
-does not contain a
-.Sq / ,
-then
-.Fn dirname
-returns a pointer to the string
-.Dq \&. .
-.Pp
-If
-.Ar path
-is a null pointer or points to an empty string,
-.Fn dirname
-returns a pointer to the string
-.Dq \&. .
-.Sh RETURN VALUES
-The
-.Fn dirname
-function returns a pointer to a string that is the parent directory of
-.Ar path .
-.Sh SEE ALSO
-.Xr dirname 1 ,
-.Xr basename 3
-.Sh STANDARDS
-.Bl -bullet -compact
-.It
-.St -xpg4.2
-.It
-.St -p1003.1-2001
-.El
-.Sh BUGS
-If the length of the result is longer than
-.Dv PATH_MAX
-bytes
-.Pq including the terminating nul ,
-the result will be truncated.
-.Pp
-The
-.Fn dirname
-function returns a pointer to static storage that may be overwritten
-by subsequent calls to
-.Fn dirname .
-This is not strictly a bug; it is explicitly allowed by
-.St -p1003.1-2001 .
diff --git a/lib/libc/gen/dirname.c b/lib/libc/gen/dirname.c
deleted file mode 100644
index 5fae7c1f2..000000000
--- a/lib/libc/gen/dirname.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*	$NetBSD: dirname.c,v 1.13 2014/07/16 10:52:26 christos Exp $	*/
-
-/*-
- * Copyright (c) 1997, 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein and Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: dirname.c,v 1.13 2014/07/16 10:52:26 christos Exp $");
-#endif /* !LIBC_SCCS && !lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <libgen.h>
-#include <limits.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(dirname,_dirname)
-#endif
-
-static size_t
-xdirname_r(const char *path, char *buf, size_t buflen)
-{
-	const char *endp;
-	size_t len;
-
-	/*
-	 * If `path' is a null pointer or points to an empty string,
-	 * return a pointer to the string ".".
-	 */
-	if (path == NULL || *path == '\0') {
-		path = ".";
-		len = 1;
-		goto out;
-	}
-
-	/* Strip trailing slashes, if any. */
-	endp = path + strlen(path) - 1;
-	while (endp != path && *endp == '/')
-		endp--;
-
-	/* Find the start of the dir */
-	while (endp > path && *endp != '/')
-		endp--;
-
-	if (endp == path) {
-		path = *endp == '/' ? "/" : ".";
-		len = 1;
-		goto out;
-	}
-
-	do
-		endp--;
-	while (endp > path && *endp == '/');
-
-	len = endp - path + 1;
-out:
-	if (buf != NULL && buflen != 0) {
-		buflen = MIN(len, buflen - 1);
-		memcpy(buf, path, buflen);
-		buf[buflen] = '\0';
-	}
-	return len;
-}
-
-#if !HAVE_DIRNAME
-char *
-dirname(char *path)
-{
-	static char result[PATH_MAX];
-	(void)xdirname_r(path, result, sizeof(result));
-	return result;
-}
-#endif
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
deleted file mode 100644
index 591de811c..000000000
--- a/lib/libc/gen/disklabel.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*	$NetBSD: disklabel.c,v 1.37 2012/06/25 22:32:43 abs Exp $	*/
-
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 5/3/95";
-#else
-__RCSID("$NetBSD: disklabel.c,v 1.37 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#define DKTYPENAMES
-#define FSTYPENAMES
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
-
-#if HAVE_NBTOOL_CONFIG_H
-#include <nbinclude/sys/disklabel.h>
-#include <nbinclude/disktab.h>
-#else
-#include <sys/disklabel.h>
-#include <disktab.h>
-#endif /* HAVE_NBTOOL_CONFIG_H */
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(getdiskbyname,_getdiskbyname)
-#endif
-
-#if 0
-static void	error(int);
-#endif
-static int	gettype(char *, const char *const *);
-
-static const char *db_array[2] = { _PATH_DISKTAB, 0 };
-
-int
-setdisktab(const char *name)
-{
-	if (!name || !*name)
-		return -1;
-
-	db_array[0] = name;
-	return 0;
-}
-
-
-struct disklabel *
-getdiskbyname(const char *name)
-{
-	static struct	disklabel disk;
-	struct	disklabel *dp = &disk;
-	struct partition *pp;
-	char	*buf;
-	char	*cp, *cq;	/* can't be */
-	char	p, max, psize[3], pbsize[3],
-		pfsize[3], poffset[3], ptype[3];
-	u_int32_t *dx;
-	long f;
-
-	_DIAGASSERT(name != NULL);
-
-	if (cgetent(&buf, db_array, name) < 0)
-		return NULL;
-
-	memset(&disk, 0, sizeof(disk));
-	/*
-	 * typename
-	 */
-	cq = dp->d_typename;
-	cp = buf;
-	while (cq < dp->d_typename + sizeof(dp->d_typename) - 1 &&
-	    (*cq = *cp) && *cq != '|' && *cq != ':')
-		cq++, cp++;
-	*cq = '\0';
-	/*
-	 * boot name (optional)  xxboot, bootxx
-	 */
-	cgetstr(buf, "b0", &dp->d_boot0);
-	cgetstr(buf, "b1", &dp->d_boot1);
-
-	if (cgetstr(buf, "ty", &cq) >= 0) {
-		if (strcmp(cq, "removable") == 0)
-			dp->d_flags |= D_REMOVABLE;
-		else if (strcmp(cq, "simulated") == 0)
-			dp->d_flags |= D_RAMDISK;
-		free(cq);
-	}
-	if (cgetcap(buf, "sf", ':') != NULL)
-		dp->d_flags |= D_BADSECT;
-
-#define getnumdflt(field, dname, dflt) \
-    (field) = ((cgetnum(buf, dname, &f) == -1) ? (dflt) : (u_int32_t) f)
-#define	getnum(field, dname) \
-	if (cgetnum(buf, dname, &f) != -1) field = (u_int32_t)f
-
-	getnumdflt(dp->d_secsize, "se", DEV_BSIZE);
-	getnum(dp->d_ntracks, "nt");
-	getnum(dp->d_nsectors, "ns");
-	getnum(dp->d_ncylinders, "nc");
-
-	if (cgetstr(buf, "dt", &cq) >= 0) {
-		dp->d_type = gettype(cq, dktypenames);
-		free(cq);
-	} else
-		getnumdflt(dp->d_type, "dt", 0);
-	getnumdflt(dp->d_secpercyl, "sc", dp->d_nsectors * dp->d_ntracks);
-	getnumdflt(dp->d_secperunit, "su", dp->d_secpercyl * dp->d_ncylinders);
-	getnumdflt(dp->d_rpm, "rm", 3600);
-	getnumdflt(dp->d_interleave, "il", 1);
-	getnumdflt(dp->d_trackskew, "sk", 0);
-	getnumdflt(dp->d_cylskew, "cs", 0);
-	getnumdflt(dp->d_headswitch, "hs", 0);
-	getnumdflt(dp->d_trkseek, "ts", 0);
-	getnumdflt(dp->d_bbsize, "bs", BBSIZE);
-	getnumdflt(dp->d_sbsize, "sb", SBLOCKSIZE);
-	strcpy(psize, "px");	/* XXX: strcpy is safe */
-	strcpy(pbsize, "bx");	/* XXX: strcpy is safe */
-	strcpy(pfsize, "fx");	/* XXX: strcpy is safe */
-	strcpy(poffset, "ox");	/* XXX: strcpy is safe */
-	strcpy(ptype, "tx");	/* XXX: strcpy is safe */
-	max = 'a' - 1;
-	pp = &dp->d_partitions[0];
-	for (p = 'a'; p < 'a' + MAXPARTITIONS; p++, pp++) {
-		long ff;
-
-		psize[1] = pbsize[1] = pfsize[1] = poffset[1] = ptype[1] = p;
-		if (cgetnum(buf, psize, &ff) == -1)
-			pp->p_size = 0;
-		else {
-			pp->p_size = (u_int32_t)ff;
-			getnum(pp->p_offset, poffset);
-			getnumdflt(pp->p_fsize, pfsize, 0);
-			if (pp->p_fsize) {
-				long bsize;
-
-				if (cgetnum(buf, pbsize, &bsize) == -1)
-					pp->p_frag = 8;
-				else
-					pp->p_frag =
-					    (u_int8_t)(bsize / pp->p_fsize);
-			}
-			getnumdflt(pp->p_fstype, ptype, 0);
-			if (pp->p_fstype == 0)
-				if (cgetstr(buf, ptype, &cq) >= 0) {
-					pp->p_fstype = gettype(cq, fstypenames);
-					free(cq);
-				}
-			max = p;
-		}
-	}
-	dp->d_npartitions = max + 1 - 'a';
-	strcpy(psize, "dx");	/* XXX: strcpy is safe */
-	dx = dp->d_drivedata;
-	for (p = '0'; p < '0' + NDDATA; p++, dx++) {
-		psize[1] = p;
-		getnumdflt(*dx, psize, 0);
-	}
-	dp->d_magic = DISKMAGIC;
-	dp->d_magic2 = DISKMAGIC;
-	free(buf);
-	return (dp);
-}
-
-static int
-gettype(char *t, const char *const *names)
-{
-	const char *const *nm;
-
-	_DIAGASSERT(t != NULL);
-	_DIAGASSERT(names != NULL);
-
-	for (nm = names; *nm; nm++)
-		if (strcasecmp(t, *nm) == 0)
-			return (int)(nm - names);
-	if (isdigit((unsigned char) *t))
-		return (atoi(t));
-	return (0);
-}
-
-#if 0
-static void
-error(err)
-	int err;
-{
-	char *p;
-
-	(void)write(STDERR_FILENO, "disktab: ", 9);
-	(void)write(STDERR_FILENO, _PATH_DISKTAB, sizeof(_PATH_DISKTAB) - 1);
-	(void)write(STDERR_FILENO, ": ", 2);
-	p = strerror(err);
-	(void)write(STDERR_FILENO, p, strlen(p));
-	(void)write(STDERR_FILENO, "\n", 1);
-}
-#endif
diff --git a/lib/libc/gen/endutxent.3 b/lib/libc/gen/endutxent.3
deleted file mode 100644
index 06a443345..000000000
--- a/lib/libc/gen/endutxent.3
+++ /dev/null
@@ -1,202 +0,0 @@
-.\"	$NetBSD: endutxent.3,v 1.5 2008/04/30 13:10:50 martin Exp $
-.\"
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Thomas Klausner.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 26, 2002
-.Dt ENDUTXENT 3
-.Os
-.Sh NAME
-.Nm endutxent ,
-.Nm getutxent ,
-.Nm getutxid ,
-.Nm getutxline ,
-.Nm pututxline ,
-.Nm setutxent
-.Nd user accounting database functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In utmpx.h
-.Ft void
-.Fn endutxent void
-.Ft struct utmpx *
-.Fn getutxent void
-.Ft struct utmpx *
-.Fn getutxid "const struct utmpx *"
-.Ft struct utmpx *
-.Fn getutxline "const struct utmpx *"
-.Ft struct utmpx *
-.Fn pututxline "const struct utmpx *"
-.Ft void
-.Fn setutxent void
-.Sh DESCRIPTION
-These functions provide access to the
-.Xr utmpx 5
-user accounting database.
-.Pp
-.Fn getutxent
-reads the next entry from the database;
-if the database was not yet open, it also opens it.
-.Fn setutxent
-resets the database, so that the next
-.Fn getutxent
-call will get the first entry.
-.Fn endutxent
-closes the database.
-.Pp
-.Fn getutxid
-returns the next entry of the type specified in its argument's
-.Va ut_type
-field, or
-.Dv NULL
-if none is found.
-.Fn getutxline
-returns the next
-.Dv LOGIN_PROCESS
-or
-.Dv USER_PROCESS
-entry which has the same name as specified in the
-.Va ut_line
-field, or
-.Dv NULL
-if no match is found.
-.Pp
-.Fn pututxline
-adds the argument
-.Xr utmpx 5
-entry line to the accounting database, replacing a previous entry for
-the same user if it exists.
-.Ss The utmpx structure
-The
-.Nm utmpx
-structure has the following definition:
-.Pp
-.Bd -literal
-struct utmpx {
-        char ut_name[_UTX_USERSIZE];    /* login name */
-        char ut_id[_UTX_IDSIZE];        /* inittab id */
-        char ut_line[_UTX_LINESIZE];    /* tty name */
-        char ut_host[_UTX_HOSTSIZE];    /* host name */
-        uint16_t ut_session;            /* session id used for windowing */
-        uint16_t ut_type;               /* type of this entry */
-        pid_t ut_pid;                   /* process id creating the entry */
-        struct {
-                uint16_t e_termination; /* process termination signal */
-                uint16_t e_exit;        /* process exit status */
-        } ut_exit;
-        struct sockaddr_storage ut_ss;  /* address where entry was made from */
-        struct timeval ut_tv;           /* time entry was created */
-        uint32_t ut_pad[10];            /* reserved for future use */
-};
-.Ed
-.Pp
-Valid entries for
-.Fa ut_type
-are:
-.Bl -tag -width LOGIN_PROCESSXX -compact -offset indent
-.It Dv BOOT_TIME
-Time of a system boot.
-.It Dv DEAD_PROCESS
-A session leader exited.
-.It Dv EMPTY
-No valid user accounting information.
-.It Dv INIT_PROCESS
-A process spawned by
-.Xr init 8 .
-.It Dv LOGIN_PROCESS
-The session leader of a logged-in user.
-.It Dv NEW_TIME
-Time after system clock change.
-.It Dv OLD_TIME
-Time before system clock change.
-.It Dv RUN_LVL
-Run level.
-Provided for compatibility, not used on
-.Nx .
-.It Dv USER_PROCESS
-A user process.
-.El
-.Sh RETURN VALUES
-.Fn getutxent
-returns the next entry, or
-.Dv NULL
-on failure (end of database or problems reading from the database).
-.Fn getutxid
-and
-.Fn getutxline
-return the matching structure on success, or
-.Dv NULL
-if no match was found.
-.Fn pututxline
-returns the structure that was successfully written, or
-.Dv NULL .
-.Sh SEE ALSO
-.Xr logwtmpx 3 ,
-.Xr utmpx 5
-.Sh STANDARDS
-The
-.Fn endutxent ,
-.Fn getutxent ,
-.Fn getutxid ,
-.Fn getutxline ,
-.Fn pututxline ,
-.Fn setutxent
-all conform to
-.St -p1003.1-2001
-(XSI extension), and previously to
-.St -xpg4.2 .
-The fields
-.Fa ut_user ,
-.Fa ut_id ,
-.Fa ut_line ,
-.Fa ut_pid ,
-.Fa ut_type ,
-and
-.Fa ut_tv
-conform to
-.St -p1003.1-2001
-(XSI extension), and previously to
-.St -xpg4.2 .
-.\" .Fa ut_host ,
-.\" .Fa ut_session ,
-.\" .Fa ut_exit ,
-.\" and
-.\" .Fa ut_ss
-.\" are from
-.\" SVR3/4?
-.\" .Dv RUN_LVL
-.\" is for compatibility with
-.\" what exactly?
-.\" .Sh HISTORY
-.\" The
-.\" .Nm utmpx ,
-.\" .Nm wtmpx ,
-.\" and
-.\" .Nm lastlogx
-.\" files first appeared in
-.\" SVR3? 4?
diff --git a/lib/libc/gen/err.3 b/lib/libc/gen/err.3
deleted file mode 100644
index b52ba962a..000000000
--- a/lib/libc/gen/err.3
+++ /dev/null
@@ -1,205 +0,0 @@
-.\" $NetBSD: err.3,v 1.21 2014/01/16 17:21:38 christos Exp $
-.\"
-.\" 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.
-.\"
-.\"	@(#)err.3	8.1 (Berkeley) 6/9/93
-.\"
-.Dd January 16, 2014
-.Dt ERR 3
-.Os
-.Sh NAME
-.Nm err ,
-.Nm verr ,
-.Nm errx ,
-.Nm verrx ,
-.Nm errc ,
-.Nm verrc ,
-.Nm warn ,
-.Nm vwarn ,
-.Nm warnx ,
-.Nm vwarnx ,
-.Nm warnc ,
-.Nm vwarnc
-.Nd formatted error messages
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In err.h
-.Ft void
-.Fn err "int status" "const char *fmt" "..."
-.Ft void
-.Fn verr "int status" "const char *fmt" "va_list args"
-.Ft void
-.Fn errx "int status" "const char *fmt" "..."
-.Ft void
-.Fn verrx "int status" "const char *fmt" "va_list args"
-.Ft void
-.Fn errc "int status" "int code" "const char *fmt" "..."
-.Ft void
-.Fn verrc "int status" "int code" "const char *fmt" "va_list args"
-.Ft void
-.Fn warn "const char *fmt" "..."
-.Ft void
-.Fn vwarn "const char *fmt" "va_list args"
-.Ft void
-.Fn warnx "const char *fmt" "..."
-.Ft void
-.Fn vwarnx "const char *fmt" "va_list args"
-.Ft void
-.Fn warnc "int code" "const char *fmt" "..."
-.Ft void
-.Fn vwarnc "int code" "const char *fmt" "va_list args"
-.Sh DESCRIPTION
-The
-.Fn err
-and
-.Fn warn
-family of functions display a formatted error message on the standard
-error output.
-In all cases, the last component of the program name, a colon character,
-and a space are output.
-If the
-.Fa fmt
-argument is not
-.Dv NULL ,
-the formatted error message is output.
-In the case of the
-.Fn err ,
-.Fn verr ,
-.Fn warn ,
-and
-.Fn vwarn
-functions, the error message string affiliated with the current value of
-the global variable
-.Va errno
-is output next, preceded by a colon character and a space if
-.Fa fmt
-is not
-.Dv NULL .
-In all cases, the output is followed by a newline character.
-The
-.Fn errc ,
-.Fn verrc ,
-.Fn warnc ,
-and
-.Fn vwarnc
-functions take an additional
-.Ar code
-argument to be used as the error number instead of using the global
-.Va errno
-variable.
-The
-.Fn errx ,
-.Fn verrx ,
-.Fn warnx ,
-and
-.Fn vwarnx
-functions will not output this error message string.
-.Pp
-The
-.Fn err ,
-.Fn verr ,
-.Fn errx ,
-and
-.Fn verrx
-functions do not return, but instead cause the program to terminate
-with the status value given by the argument
-.Fa status .
-It is often appropriate to use the value
-.Dv EXIT_FAILURE ,
-defined in
-.In stdlib.h ,
-as the
-.Fa status
-argument given to these functions.
-.Sh EXAMPLES
-Display the current
-.Va errno
-information string and terminate with status indicating failure:
-.Bd -literal -offset indent
-if ((p = malloc(size)) == NULL)
-	err(EXIT_FAILURE, NULL);
-if ((fd = open(file_name, O_RDONLY, 0)) == -1)
-	err(EXIT_FAILURE, "%s", file_name);
-.Ed
-.Pp
-Display an error message and terminate with status indicating failure:
-.Bd -literal -offset indent
-if (tm.tm_hour \*[Lt] START_TIME)
-	errx(EXIT_FAILURE, "too early, wait until %s",
-	    start_time_string);
-.Ed
-.Pp
-Warn of an error:
-.Bd -literal -offset indent
-if ((fd = open(raw_device, O_RDONLY, 0)) == -1)
-	warnx("%s: %s: trying the block device",
-	    raw_device, strerror(errno));
-if ((fd = open(block_device, O_RDONLY, 0)) == -1)
-	warn("%s", block_device);
-.Ed
-.Sh SEE ALSO
-.Xr exit 3 ,
-.Xr getprogname 3 ,
-.Xr strerror 3
-.Sh HISTORY
-The
-.Fn err
-and
-.Fn warn
-functions first appeared in
-.Bx 4.4 .
-The
-.Fn errc
-and
-.Fn warnc
-functions first appeared in
-.Fx 3.0
-and
-.Nx 7.0 .
-.Sh CAVEATS
-It is important never to pass a string with user-supplied data as a
-format without using
-.Ql %s .
-An attacker can put format specifiers in the string to mangle your stack,
-leading to a possible security hole.
-This holds true even if you have built the string
-.Dq by hand
-using a function like
-.Fn snprintf ,
-as the resulting string may still contain user-supplied conversion specifiers
-for later interpolation by the
-.Fn err
-and
-.Fn warn
-functions.
-.Pp
-Always be sure to use the proper secure idiom:
-.Bd -literal -offset indent
-err(1, "%s", string);
-.Ed
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
deleted file mode 100644
index 9bd01b070..000000000
--- a/lib/libc/gen/err.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: err.c,v 1.26 2007/06/18 14:13:54 ginsbach Exp $	*/
-
-/*-
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: err.c,v 1.26 2007/06/18 14:13:54 ginsbach Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <err.h>
-#include <stdarg.h>
-
-#ifdef __weak_alias
-__weak_alias(err, _err)
-#endif
-
-#if !HAVE_ERR_H
-__dead void
-err(int eval, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	verr(eval, fmt, ap);
-	va_end(ap);
-}
-#endif
diff --git a/lib/libc/gen/errc.c b/lib/libc/gen/errc.c
deleted file mode 100644
index 54665166f..000000000
--- a/lib/libc/gen/errc.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: errc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: errc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <err.h>
-#include <stdarg.h>
-
-#ifdef __weak_alias
-__weak_alias(errc, _errc)
-#endif
-
-#if !HAVE_ERR_H || !HAVE_DECL_ERRC
-__dead void
-errc(int eval, int code, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	verrc(eval, code, fmt, ap);
-	va_end(ap);
-}
-#endif
diff --git a/lib/libc/gen/errlist.awk b/lib/libc/gen/errlist.awk
deleted file mode 100644
index ead74a148..000000000
--- a/lib/libc/gen/errlist.awk
+++ /dev/null
@@ -1,120 +0,0 @@
-#! /usr/bin/awk -f
-#	$NetBSD: errlist.awk,v 1.4 2010/12/16 22:52:32 joerg Exp $
-#
-# Copyright (c) 2010 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Christos Zoulas.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#        This product includes software developed by the NetBSD
-#        Foundation, Inc. and its contributors.
-# 4. Neither the name of The NetBSD Foundation nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-function tabs(desc) {
-	l = length(desc) + 3;
-	if (concat)
-		l++
-	if (l < 16)
-		return "\t\t\t\t";
-	else if (l < 24)
-		return "\t\t\t";
-	else if (l < 32)
-		return "\t\t";
-	else if (l < 40)
-		return "\t";
-	else
-		return "";
-}
-function perror(name, number, desc)
-{
-	if (!concat) {
-		printf("\t\"%s\",%s/* %d - %s */\n", desc, tabs(desc), number, name);
-	} else {
-		offsets[number] = offset;
-		offset += length(desc) + 1;
-		printf("\t\"%s\\0\"%s/* %d - %s */\n", desc, tabs(desc), number, name);
-	}
-}
-BEGIN {
-	printf("/* Automatically generated file; do not edit */\n");
-	printf("#include <sys/cdefs.h>\n");
-	printf("__RCSID(\"$NetBSD: errlist.awk,v 1.4 2010/12/16 22:52:32 joerg Exp $\");\n");
-	printf("#include <errno.h>\n");
-	if (!concat) {
-		printf("static const char *const errlist[] = {\n");
-	} else {
-		printf("static const char concat_errlist[] = {\n");
-		offset = 0;
-	}
-	perror("ENOERROR", 0, "Undefined error: 0");
-	errno = 1;
-}
-/^#define/ {
-	name = $2;
-	if (name == "ELAST")
-		next;
-	number = $3;
-	if (number < 0 || number == "EAGAIN")
-		next;
-	desc = $0;
-	i1 = index(desc, "/*") + 3;
-	l = length(desc);
-	desc = substr(desc, i1, l - i1 - 2);
-	#__MINIX: We have more error numbers...
-	if (number < errno) {
-		printf("error number mismatch %d != %d\n", number, errno) > "/dev/stderr";
-		exit(1);
-	}
-	#__MINIX:start
-	while(errno < number) {
-		perror("UNDEFINED", errno, "Undefined error: " errno);
-		errno++;
-	}
-	#__MINIX:end
-	perror(name, number, desc);
-	errno++;
-}
-END {
-	printf("};\n\n");
-	if (!concat) {
-		printf("const int sys_nerr = sizeof(errlist) / sizeof(errlist[0]);\n");
-		printf("const char * const *sys_errlist = errlist;\n");
-	} else {
-		printf("static const int concat_nerr = %d;\n", errno);
-		printf("static const unsigned short concat_offset[] = {\n");
-		offsets[errno++] = offset;
-		for (j = 0; j < errno; j++) {
-			printf("\t%d,\n", offsets[j]);
-		}
-		printf("};\n");
-		if (offset > 65535) {
-			printf("Total errlist size doesn't fit into 16bit\n") > "/dev/stderr";
-			exit(1);
-		}
-	}
-}
diff --git a/lib/libc/gen/errno.c b/lib/libc/gen/errno.c
deleted file mode 100644
index ca8b2acf8..000000000
--- a/lib/libc/gen/errno.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/*	$NetBSD: errno.c,v 1.5 2005/06/12 05:21:27 lukem Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: errno.c,v 1.5 2005/06/12 05:21:27 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-int errno;
diff --git a/lib/libc/gen/errx.c b/lib/libc/gen/errx.c
deleted file mode 100644
index 004fdd6b1..000000000
--- a/lib/libc/gen/errx.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: errx.c,v 1.14 2007/06/18 14:13:54 ginsbach Exp $	*/
-
-/*-
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: errx.c,v 1.14 2007/06/18 14:13:54 ginsbach Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <err.h>
-#include <stdarg.h>
-
-#ifdef __weak_alias
-__weak_alias(errx, _errx)
-#endif
-
-#if !HAVE_ERR_H
-__dead void
-errx(int eval, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	verrx(eval, fmt, ap);
-	va_end(ap);
-}
-#endif
diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/exec.3
deleted file mode 100644
index 75a8c4cf4..000000000
--- a/lib/libc/gen/exec.3
+++ /dev/null
@@ -1,288 +0,0 @@
-.\"	$NetBSD: exec.3,v 1.26 2014/09/27 16:42:07 wiz Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)exec.3	8.3 (Berkeley) 1/24/94
-.\"
-.Dd September 26, 2014
-.Dt EXEC 3
-.Os
-.Sh NAME
-.Nm execl ,
-.Nm execlp ,
-.Nm execle ,
-.Nm exect ,
-.Nm execv ,
-.Nm execvp
-.Nd execute a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Vt extern char **environ;
-.Ft int
-.Fn execl "const char *path" "const char *arg" ...
-.Ft int
-.Fn execlp "const char *file" "const char *arg" ...
-.Ft int
-.Fn execlpe "const char *path" "const char *arg" ... "char *const envp[]"
-.Ft int
-.Fn execle "const char *path" "const char *arg" ... "char *const envp[]"
-.Ft int
-.Fn exect "const char *path" "char *const argv[]"  "char *const envp[]"
-.Ft int
-.Fn execv "const char *path" "char *const argv[]"
-.Ft int
-.Fn execvp "const char *file" "char *const argv[]"
-.Ft int
-.Fn execvpe "const char *file" "char *const argv[]" "char *const envp[]"
-.Sh DESCRIPTION
-The
-.Fn exec
-family of functions replaces the current process image with a
-new process image.
-The functions described in this manual page are front-ends for the function
-.Xr execve 2 .
-(See the manual page for
-.Xr execve 2
-for detailed information about the replacement of the current process.
-The
-.Xr script 7
-manual page provides detailed information about the execution of
-interpreter scripts.)
-.Pp
-The initial argument for these functions is the pathname of a file which
-is to be executed.
-.Pp
-The
-.Fa "const char *arg"
-and subsequent ellipses in the
-.Fn execl ,
-.Fn execlp ,
-.Fn execlpe ,
-and
-.Fn execle
-functions can be thought of as
-.Em arg0 ,
-.Em arg1 ,
-\&...,
-.Em argn .
-Together they describe a list of one or more pointers to NUL-terminated
-strings that represent the argument list available to the executed program.
-The first argument, by convention, should point to the file name associated
-with the file being executed.
-The list of arguments
-.Em must
-be terminated by a
-.Dv NULL
-pointer.
-.Pp
-The
-.Fn exect ,
-.Fn execv ,
-.Fn execvp ,
-and
-.Fn execvpe
-functions provide an array of pointers to NUL-terminated strings that
-represent the argument list available to the new program.
-The first argument, by convention, should point to the file name associated
-with the file being executed.
-The array of pointers
-.Sy must
-be terminated by a
-.Dv NULL
-pointer.
-.Pp
-The
-.Fn execle ,
-.Fn execlpe ,
-.Fn exect ,
-and
-.Fn execvpe
-functions also specify the environment of the executed process by following
-the
-.Dv NULL
-pointer that terminates the list of arguments in the parameter list
-or the pointer to the argv array with an additional parameter.
-This additional parameter is an array of pointers to NUL-terminated strings
-and
-.Em must
-be terminated by a
-.Dv NULL
-pointer.
-The other functions take the environment for the new process image from the
-external variable
-.Va environ
-in the current process.
-.Pp
-Some of these functions have special semantics.
-.Pp
-The functions
-.Fn execlp ,
-.Fn execlpe ,
-.Fn execvp ,
-and
-.Fn execvpe
-will duplicate the actions of the shell in searching for an executable file
-if the specified file name does not contain a slash
-.Dq Li \&/
-character.
-The search path is the path specified in the environment by the
-.Ev PATH
-variable.
-If this variable isn't specified,
-.Va _PATH_DEFPATH
-from
-.In paths.h
-is used instead, its value being:
-.Pa /usr/bin:/bin:/usr/pkg/bin:/usr/local/bin .
-In addition, certain errors are treated specially.
-.Pp
-If permission is denied for a file (the attempted
-.Xr execve 2
-returned
-.Er EACCES ) ,
-these functions will continue searching the rest of
-the search path.
-If no other file is found, however, they will return with the global variable
-.Va errno
-set to
-.Er EACCES .
-.Pp
-If the header of a file isn't recognized (the attempted
-.Xr execve 2
-returned
-.Er ENOEXEC ) ,
-these functions will execute the shell with the path of
-the file as its first argument.
-(If this attempt fails, no further searching is done.)
-.Pp
-If the file is currently busy (the attempted
-.Xr execve 2
-returned
-.Er ETXTBUSY ) ,
-these functions will sleep for several seconds,
-periodically re-attempting to execute the file.
-.Pp
-The function
-.Fn exect
-executes a file with the program tracing facilities enabled (see
-.Xr ptrace 2 ) .
-.Sh RETURN VALUES
-If any of the
-.Fn exec
-functions returns, an error will have occurred.
-The return value is \-1, and the global variable
-.Va errno
-will be set to indicate the error.
-.Sh FILES
-.Bl -tag -width /bin/sh -compact
-.It Pa /bin/sh
-The shell.
-.El
-.Sh COMPATIBILITY
-Historically, the default path for the
-.Fn execlp
-.Fn execlpe ,
-.Fn execvp ,
-and
-.Fn execvpe
-functions was
-.Dq Pa :/bin:/usr/bin .
-This was changed to improve security and behaviour.
-.Pp
-The behavior of
-.Fn execlp ,
-.Fn execlpe ,
-.Fn execvp ,
-and
-.Fn execvpe
-when errors occur while attempting to execute the file is historic
-practice, but has not traditionally been documented and is not specified
-by the
-.Tn POSIX
-standard.
-.Pp
-Traditionally, the functions
-.Fn execlp ,
-.Fn execlpe ,
-.Fn execvp ,
-and
-.Fn execvpe
-ignored all errors except for the ones described above and
-.Er ENOMEM
-and
-.Er E2BIG ,
-upon which they returned.
-They now return if any error other than the ones described above occurs.
-.Sh ERRORS
-.Fn execl ,
-.Fn execle ,
-.Fn execlp ,
-.Fn execlpe ,
-.Fn execvp ,
-and
-.Fn execvpe
-may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr execve 2
-and
-.Xr malloc 3 .
-.Pp
-.Fn exect
-and
-.Fn execv
-may fail and set
-.Va errno
-for any of the errors specified for the library function
-.Xr execve 2 .
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr execve 2 ,
-.Xr fork 2 ,
-.Xr ptrace 2 ,
-.Xr environ 7 ,
-.Xr script 7
-.Sh STANDARDS
-.Fn execl ,
-.Fn execv ,
-.Fn execle ,
-.Fn execlp ,
-and
-.Fn execvp
-conform to
-.St -p1003.1-90 .
-.Pp
-The
-.Fn execlpe
-function appeared first in QNX and the
-.Fn execvpe
-function exists on both
-.Lx
-and QNX.
diff --git a/lib/libc/gen/execl.c b/lib/libc/gen/execl.c
deleted file mode 100644
index cdc45ffac..000000000
--- a/lib/libc/gen/execl.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*	$NetBSD: execl.c,v 1.17 2011/06/30 19:46:07 joerg Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: execl.c,v 1.17 2011/06/30 19:46:07 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "reentrant.h"
-
-#ifdef __weak_alias
-__weak_alias(execl,_execl)
-#endif
-
-
-extern char **environ;
-
-int
-execl(const char *name, const char *arg, ...)
-{
-	int r;
-	va_list ap;
-	char **argv;
-	int i;
-
-	va_start(ap, arg);
-	for (i = 2; va_arg(ap, char *) != NULL; i++)
-		continue;
-	va_end(ap);
-
-	if ((argv = alloca(i * sizeof (char *))) == NULL) {
-		errno = ENOMEM;
-		return -1;
-	}
-	
-	va_start(ap, arg);
-	argv[0] = __UNCONST(arg);
-	for (i = 1; (argv[i] = va_arg(ap, char *)) != NULL; i++) 
-		continue;
-	va_end(ap);
-	
-	r = execve(name, argv, environ);
-	return r;
-}
diff --git a/lib/libc/gen/execle.c b/lib/libc/gen/execle.c
deleted file mode 100644
index 9c91b88fe..000000000
--- a/lib/libc/gen/execle.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: execle.c,v 1.12 2011/06/30 19:46:07 joerg Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: execle.c,v 1.12 2011/06/30 19:46:07 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(execle,_execle)
-#endif
-
-int
-execle(const char *name, const char *arg, ...)
-{
-	va_list ap;
-	char **argv, **envp;
-	int i;
-
-	va_start(ap, arg);
-	for (i = 2; va_arg(ap, char *) != NULL; i++)
-		continue;
-	va_end(ap);
-
-	argv = alloca(i * sizeof (char *));
-	
-	va_start(ap, arg);
-	argv[0] = __UNCONST(arg);
-	for (i = 1; (argv[i] = va_arg(ap, char *)) != NULL; i++) 
-		continue;
-	envp = va_arg(ap, char **);
-	va_end(ap);
-
-	return execve(name, argv, envp);
-}
diff --git a/lib/libc/gen/execlp.c b/lib/libc/gen/execlp.c
deleted file mode 100644
index 61ca3c777..000000000
--- a/lib/libc/gen/execlp.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*	$NetBSD: execlp.c,v 1.13 2014/09/26 19:28:03 christos Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: execlp.c,v 1.13 2014/09/26 19:28:03 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-
-#ifdef __weak_alias
-__weak_alias(execlp,_execlp)
-__weak_alias(execlpe,_execlpe)
-#endif
-
-int
-execlp(const char *name, const char *arg, ...)
-{
-	va_list ap;
-	char **argv;
-	size_t i;
-
-	va_start(ap, arg);
-	for (i = 2; va_arg(ap, char *) != NULL; i++)
-		continue;
-	va_end(ap);
-
-	argv = alloca(i * sizeof (char *));
-	
-	va_start(ap, arg);
-	argv[0] = __UNCONST(arg);
-	for (i = 1; (argv[i] = va_arg(ap, char *)) != NULL; i++) 
-		continue;
-	va_end(ap);
-	
-	return execvp(name, argv);
-}
-
-int
-execlpe(const char *name, const char *arg, ...)
-{
-	va_list ap;
-	char **argv, **envp;
-	size_t i;
-
-	va_start(ap, arg);
-	for (i = 2; va_arg(ap, char *) != NULL; i++)
-		continue;
-	va_end(ap);
-
-	argv = alloca(i * sizeof (char *));
-	
-	va_start(ap, arg);
-	argv[0] = __UNCONST(arg);
-	for (i = 1; (argv[i] = va_arg(ap, char *)) != NULL; i++) 
-		continue;
-	envp = va_arg(ap, char **);
-	va_end(ap);
-
-	return execvpe(name, argv, envp);
-}
diff --git a/lib/libc/gen/execv.c b/lib/libc/gen/execv.c
deleted file mode 100644
index 148b4c2b2..000000000
--- a/lib/libc/gen/execv.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: execv.c,v 1.10 2012/06/25 22:32:43 abs Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: execv.c,v 1.10 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <unistd.h>
-#include "reentrant.h"
-
-#ifdef __weak_alias
-__weak_alias(execv,_execv)
-#endif
-
-extern char **environ;
-
-int
-execv(const char *name, char * const *argv)
-{
-	return execve(name, argv, environ);
-}
diff --git a/lib/libc/gen/execvp.c b/lib/libc/gen/execvp.c
deleted file mode 100644
index 216a097ae..000000000
--- a/lib/libc/gen/execvp.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*	$NetBSD: execvp.c,v 1.31 2014/09/26 19:28:03 christos Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: execvp.c,v 1.31 2014/09/26 19:28:03 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <unistd.h>
-#include <paths.h>
-#include "reentrant.h"
-
-#ifdef __weak_alias
-__weak_alias(execvp,_execvp)
-__weak_alias(execvpe,_execvpe)
-#endif
-
-int
-execvpe(const char *name, char * const *argv, char * const * envp)
-{
-	const char **memp;
-	int cnt;
-	size_t lp, ln;
-	int eacces = 0;
-	unsigned int etxtbsy = 0;
-	char buf[PATH_MAX];
-	const char *bp, *path, *p;
-
-	_DIAGASSERT(name != NULL);
-
-	/* "" is not a valid filename; check this before traversing PATH. */
-	if (name[0] == '\0') {
-		errno = ENOENT;
-		goto done;
-	}
-	ln = strlen(name);
-	/* If it's an absolute or relative path name, it's easy. */
-	if (strchr(name, '/')) {
-		bp = name;
-		path = "";
-		goto retry;
-	}
-	bp = buf;
-
-	/* Get the path we're searching. */
-	if (!(path = getenv("PATH")))
-		path = _PATH_DEFPATH;
-
-	do {
-		/* Find the end of this path element. */
-		for (p = path; *path != 0 && *path != ':'; path++)
-			continue;
-		/*
-		 * It's a SHELL path -- double, leading and trailing colons
-		 * mean the current directory.
-		 */
-		if (p == path) {
-			p = ".";
-			lp = 1;
-		} else
-			lp = path - p;
-
-		/*
-		 * If the path is too long complain.  This is a possible
-		 * security issue; given a way to make the path too long
-		 * the user may execute the wrong program.
-		 */
-		if (lp + ln + 2 > sizeof(buf)) {
-			(void)write(STDERR_FILENO, "execvp: ", 8);
-			(void)write(STDERR_FILENO, p, lp);
-			(void)write(STDERR_FILENO, ": path too long\n", 16);
-			continue;
-		}
-		memcpy(buf, p, lp);
-		buf[lp] = '/';
-		memcpy(buf + lp + 1, name, ln);
-		buf[lp + ln + 1] = '\0';
-
-retry:		(void)execve(bp, argv, envp);
-		switch (errno) {
-		case EACCES:
-			eacces = 1;
-			break;
-		case ENOTDIR:
-		case ENOENT:
-			break;
-		case ENOEXEC:
-			for (cnt = 0; argv[cnt] != NULL; ++cnt)
-				continue;
-			/*
-			 * we can't use malloc here because, if we are doing
-			 * vfork+exec, it leaks memory in the parent.
-			 */
-			if ((memp = alloca((cnt + 2) * sizeof(*memp))) == NULL)
-				goto done;
-			memp[0] = _PATH_BSHELL;
-			memp[1] = bp;
-			(void)memcpy(&memp[2], &argv[1], cnt * sizeof(*memp));
-			(void)execve(_PATH_BSHELL, __UNCONST(memp), envp);
-			goto done;
-		case ETXTBSY:
-			if (etxtbsy < 3)
-				(void)sleep(++etxtbsy);
-			goto retry;
-		default:
-			goto done;
-		}
-	} while (*path++ == ':');	/* Otherwise, *path was NUL */
-	if (eacces)
-		errno = EACCES;
-	else if (!errno)
-		errno = ENOENT;
-done:
-	return (-1);
-}
-
-extern char **environ;
-
-int
-execvp(const char *name, char * const *argv)
-{
-	return execvpe(name, argv, environ);
-}
diff --git a/lib/libc/gen/extattr.c b/lib/libc/gen/extattr.c
deleted file mode 100644
index 5499b912c..000000000
--- a/lib/libc/gen/extattr.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/*	$NetBSD: extattr.c,v 1.4 2012/03/13 21:13:34 christos Exp $	*/
-
-/*-
- * Copyright (c) 2001 Robert N. M. Watson
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * TrustedBSD: Utility functions for extended attributes.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: extattr.c,v 1.4 2012/03/13 21:13:34 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/extattr.h>
-
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-const int extattr_namespaces[] = {
-	EXTATTR_NAMESPACE_USER,
-	EXTATTR_NAMESPACE_SYSTEM,
-	0,
-};  
-
-int
-extattr_namespace_to_string(int attrnamespace, char **string)
-{
-
-	switch(attrnamespace) {
-	case EXTATTR_NAMESPACE_USER:
-		if (string != NULL) {
-			if ((*string =
-			     strdup(EXTATTR_NAMESPACE_USER_STRING)) == NULL)
-				return (-1);
-		}
-		return (0);
-
-	case EXTATTR_NAMESPACE_SYSTEM:
-		if (string != NULL)
-			if ((*string =
-			     strdup(EXTATTR_NAMESPACE_SYSTEM_STRING)) == NULL)
-				return (-1);
-		return (0);
-
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-}
-
-int
-extattr_string_to_namespace(const char *string, int *attrnamespace)
-{
-
-	if (strcmp(string, EXTATTR_NAMESPACE_USER_STRING) == 0) {
-		if (attrnamespace != NULL)
-			*attrnamespace = EXTATTR_NAMESPACE_USER;
-		return (0);
-	} else if (strcmp(string, EXTATTR_NAMESPACE_SYSTEM_STRING) == 0) {
-		if (attrnamespace != NULL)
-			*attrnamespace = EXTATTR_NAMESPACE_SYSTEM;
-		return (0);
-	} else {
-		errno = EINVAL;
-		return (-1);
-	}
-}
-
-
-int
-extattr_copy_fd(int from_fd, int to_fd, int namespace)
-{
-	ssize_t llen, vlen, maxvlen;
-	size_t alen;
-	void *alist = NULL;
-	void *aval = NULL;
-	size_t i;
-	int error = -1;
-
-	llen = extattr_list_fd(from_fd, namespace, NULL, 0);
-	if (llen == -1) {
-		/* Silently ignore when EA are not supported */
-		if (errno == EOPNOTSUPP)
-			error = 0;
-		goto out;
-	}
-
-	if (llen == 0) {
-		error = 0;
-		goto out;
-	}
-
-	if ((alist = malloc((size_t)llen)) == NULL)
-		goto out;
-
-	llen = extattr_list_fd(from_fd, namespace, alist, (size_t)llen);
-	if (llen == -1)
-		goto out;
-
-	maxvlen = 1024;
-	if ((aval = malloc((size_t)maxvlen)) == NULL)
-		goto out;
-
-	for (i = 0; i < (size_t)llen; i += alen + 1) {
-		char aname[NAME_MAX + 1];
-		char *ap;
-
-		alen = ((uint8_t *)alist)[i];
-		ap = ((char *)alist) + i + 1;
-		(void)memcpy(aname, ap, alen);
-		aname[alen] = '\0';
-
-		vlen = extattr_get_fd(from_fd, namespace, aname, NULL, 0);
-		if (vlen == -1)
-			goto out;
-
-		if (vlen > maxvlen) {
-			if ((aval = realloc(aval, (size_t)vlen)) == NULL)
-				goto out;
-			maxvlen = vlen;
-		}
-
-		if ((vlen = extattr_get_fd(from_fd, namespace, aname,
-				      aval, (size_t)vlen)) == -1)
-			goto out;
-	
-		if (extattr_set_fd(to_fd, namespace, aname,
-				   aval, (size_t)vlen) != vlen)
-			goto out;
-	}
-
-	error = 0;
-out:
-	if (aval != NULL)
-		free(aval);
-	
-	if (alist != NULL)
-		free(alist);
-	
-	return error;
-}
-
-int
-extattr_copy_file(const char *from, const char *to, int namespace)
-{
-	ssize_t llen, vlen, maxvlen;
-	size_t alen;
-	void *alist = NULL;
-	void *aval = NULL;
-	size_t i;
-	int error = -1;
-
-	llen = extattr_list_file(from, namespace, NULL, 0);
-	if (llen == -1) {
-		/* Silently ignore when EA are not supported */
-		if (errno == EOPNOTSUPP)
-			error = 0;
-		goto out;
-	}
-
-	if (llen == 0) {
-		error = 0;
-		goto out;
-	}
-
-	if ((alist = malloc((size_t)llen)) == NULL)
-		goto out;
-
-	llen = extattr_list_file(from, namespace, alist, (size_t)llen);
-	if (llen == -1)
-		goto out;
-
-	maxvlen = 1024;
-	if ((aval = malloc((size_t)maxvlen)) == NULL)
-		goto out;
-
-	for (i = 0; i < (size_t)llen; i += alen + 1) {
-		char aname[NAME_MAX + 1];
-		char *ap;
-
-		alen = ((uint8_t *)alist)[i];
-		ap = ((char *)alist) + i + 1;
-		(void)memcpy(aname, ap, alen);
-		aname[alen] = '\0';
-
-		vlen = extattr_get_file(from, namespace, aname, NULL, 0);
-		if (vlen == -1)
-			goto out;
-
-		if (vlen > maxvlen) {
-			if ((aval = realloc(aval, (size_t)vlen)) == NULL)
-				goto out;
-			maxvlen = vlen;
-		}
-
-		if ((vlen = extattr_get_file(from, namespace, aname,							     aval, (size_t)vlen)) == -1)
-			goto out;
-	
-		if (extattr_set_file(to, namespace, aname,
-				     aval, (size_t)vlen) != vlen)
-			goto out;
-	}
-
-	error = 0;
-out:
-	if (aval != NULL)
-		free(aval);
-	
-	if (alist != NULL)
-		free(alist);
-	
-	return error;
-}
-
-int
-extattr_copy_link(const char *from, const char *to, int namespace)
-{
-	ssize_t llen, vlen, maxvlen;
-	size_t alen;
-	void *alist = NULL;
-	void *aval = NULL;
-	size_t i;
-	int error = -1;
-
-	llen = extattr_list_link(from, namespace, NULL, 0);
-	if (llen == -1) {
-		/* Silently ignore when EA are not supported */
-		if (errno == EOPNOTSUPP)
-			error = 0;
-		goto out;
-	}
-
-	if (llen == 0) {
-		error = 0;
-		goto out;
-	}
-
-	if ((alist = malloc((size_t)llen)) == NULL)
-		goto out;
-
-	llen = extattr_list_link(from, namespace, alist, (size_t)llen);
-	if (llen == -1)
-		goto out;
-
-	maxvlen = 1024;
-	if ((aval = malloc((size_t)maxvlen)) == NULL)
-		goto out;
-
-	for (i = 0; i < (size_t)llen; i += alen + 1) {
-		char aname[NAME_MAX + 1];
-		char *ap;
-
-		alen = ((uint8_t *)alist)[i];
-		ap = ((char *)alist) + i + 1;
-		(void)memcpy(aname, ap, alen);
-		aname[alen] = '\0';
-
-		vlen = extattr_get_link(from, namespace, aname, NULL, 0);
-		if (vlen == -1)
-			goto out;
-
-		if (vlen > maxvlen) {
-			if ((aval = realloc(aval, (size_t)vlen)) == NULL)
-				goto out;
-			maxvlen = vlen;
-		}
-
-		if ((vlen = extattr_get_link(from, namespace, aname,
-					     aval, (size_t)vlen)) == -1)
-			goto out;
-	
-		if (extattr_set_link(to, namespace, aname,
-				     aval, (size_t)vlen) != vlen)
-			goto out;
-	}
-
-	error = 0;
-out:
-	if (aval != NULL)
-		free(aval);
-	
-	if (alist != NULL)
-		free(alist);
-	
-	return error;
-}
-
-static int
-extattr_namespace_access(int namespace, int mode)
-{
-	switch (namespace) {
-	case EXTATTR_NAMESPACE_SYSTEM:
-		if ((mode & (R_OK|W_OK)) && getuid() != 0)
-			return -1;
-		break;
-	default:
-		break;
-	}
-	
-	return 0;
-}
-
-int
-fcpxattr(int from_fd, int to_fd)
-{
-	const int *ns;
-	int error;
-
-	for (ns = extattr_namespaces; *ns; ns++) {
-		if (extattr_namespace_access(*ns, R_OK|W_OK) != 0)
-			continue;
-	
-		if ((error = extattr_copy_fd(from_fd, to_fd, *ns)) != 0)
-			return error;
-	}
-
-	return 0;
-}
-
-int
-cpxattr(const char *from, const char *to)
-{
-	const int *ns;
-	int error;
-
-	for (ns = extattr_namespaces; *ns; ns++) {
-		if (extattr_namespace_access(*ns, R_OK|W_OK) != 0)
-			continue;
-	
-		if ((error = extattr_copy_file(from, to, *ns)) != 0)
-			return error;
-	}
-
-	return 0;
-}
-
-int
-lcpxattr(const char *from, const char *to)
-{
-	const int *ns;
-	int error;
-
-	for (ns = extattr_namespaces; *ns; ns++) {
-		if (extattr_namespace_access(*ns, R_OK|W_OK) != 0)
-			continue;
-	
-		if ((error = extattr_copy_link(from, to, *ns)) != 0)
-			return error;
-	}
-
-	return 0;
-}
diff --git a/lib/libc/gen/extattr_copy_file.3 b/lib/libc/gen/extattr_copy_file.3
deleted file mode 100644
index 9f9a2a00d..000000000
--- a/lib/libc/gen/extattr_copy_file.3
+++ /dev/null
@@ -1,105 +0,0 @@
-.\"	$NetBSD: extattr_copy_file.3,v 1.2 2011/12/16 15:21:13 manu Exp $
-.\"
-.\" Copyright (c) 2001 Dima Dorfman <dd@FreeBSD.org>
-.\" Copyright (c) 2011 Emmanuel Dreyfus <manu@NetBSD.org>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" FreeBSD: src/lib/libc/posix1e/extattr.3,v 1.5 2002/12/12 17:25:53 ru Exp
-.\"
-.Dd December 16, 2011
-.Dt EXTATTR_COPY_FILE 3
-.Os
-.Sh NAME
-.Nm extattr_copy_file ,
-.Nm extattr_copy_fd ,
-.Nm extattr_copy_link ,
-.Nm cpxattr ,
-.Nm fcpxattr ,
-.Nm lcpxattr
-.Nd copy extended attributes from a file to another one
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/extattr.h
-.Ft int
-.Fn extattr_copy_file "const char *from" "const char *to" "int namespace"
-.Ft int
-.Fn extattr_copy_fd "int from_fd" "int to_fd" "int namespace"
-.Ft int
-.Fn extattr_copy_link "const char *from" "const char *to" "int namespace"
-.Ft int
-.Fn cpxattr "const char *from" "const char *to"
-.Ft int
-.Fn fcpxattr "int from_fd" "int to_fd"
-.Ft int
-.Fn lcpxattr "const char *from" "const char *to"
-.Sh DESCRIPTION
-.Fn extattr_copy_file
-copies extended attributes of namespace
-.Ar namespace
-from a file to another one.
-.Fn extattr_copy_fd
-does the same using open file descriptors, and
-.Fn extattr_copy_link
-does the same as
-.Fn extattr_copy_file
-but operates on symbolic links themselves instead of their targets.
-.Pp
-.Fn cpxattr ,
-.Fn fcpxattr ,
-and
-.Fn lcpxattr
-respectively work the same was as
-.Fn extattr_copy_file ,
-.Fn extattr_copy_fd ,
-and
-.Fn extattr_copy_link ,
-but will copy extended attributes from all namespaces accessible to the user,
-silently skiping unaccessible namespaces.
-.Pp
-Please note that none of the extended attribute copying functions are atomic.
-.Sh RETURN VALUES
-If any of the calls are unsuccessful, the value \-1 is returned
-and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-Extended attribute copying functions may raise errors produced by
-.Xr extattr_list_file 2
-and
-.Xr extattr_get_file 2 .
-.Sh SEE ALSO
-.Xr getextattr 1 ,
-.Xr extattr_get_file 2 ,
-.Xr extattr_namespace_to_string 3 ,
-.Xr extattr 9
-.Sh HISTORY
-Extended attribute support was developed as part of the
-.Tn TrustedBSD
-Project, and introduced in
-.Fx 5.0
-and
-.Nx 3.0 .
-It was developed to support security extensions requiring additional labels
-to be associated with each file or directory.
diff --git a/lib/libc/gen/extattr_namespace_to_string.3 b/lib/libc/gen/extattr_namespace_to_string.3
deleted file mode 100644
index 6df4b11d4..000000000
--- a/lib/libc/gen/extattr_namespace_to_string.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\"	$NetBSD: extattr_namespace_to_string.3,v 1.1 2011/12/16 12:46:00 wiz Exp $
-.\"
-.\" Copyright (c) 2001 Dima Dorfman <dd@FreeBSD.org>
-.\" Copyright (c) 2011 Emmanuel Dreyfus <manu@NetBSD.org>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" FreeBSD: src/lib/libc/posix1e/extattr.3,v 1.5 2002/12/12 17:25:53 ru Exp
-.\"
-.Dd December 16, 2011
-.Dt EXTATTR_NAMESPACE_TO_STRING 3
-.Os
-.Sh NAME
-.Nm extattr_namespace_to_string ,
-.Nm extattr_string_to_namespace
-.Nd convert an extended attribute namespace identifier to a string and vice versa
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/extattr.h
-.Ft int
-.Fn extattr_namespace_to_string "int attrnamespace" "char **string"
-.Ft int
-.Fn extattr_string_to_namespace "const char *string" "int *attrnamespace"
-.Sh DESCRIPTION
-The
-.Fn extattr_namespace_to_string
-function converts a VFS extended attribute identifier to a human-readable
-string.
-The
-.Fn extattr_string_to_namespace
-converts a human-readable string representing a namespace to a
-namespace identifier.
-Although a file system may implement arbitrary namespaces,
-these functions only support the
-.Dv EXTATTR_NAMESPACE_USER
-.Pq Dq user
-and
-.Dv EXTATTR_NAMESPACE_SYSTEM
-.Pq Dq system
-namespaces,
-which are defined in
-.Xr extattr 9 .
-.Pp
-These functions are meant to be used in error reporting and other
-interactive tasks.
-For example,
-instead of printing the integer identifying an extended attribute in
-an error message,
-a program might use
-.Fn extattr_namespace_to_string
-to obtain a human-readable representation.
-Likewise,
-instead of requiring a user to enter the integer representing a namespace,
-an interactive program might ask for a name and use
-.Fn extattr_string_to_namespace
-to get the desired identifier.
-.Sh RETURN VALUES
-If any of the calls are unsuccessful, the value \-1 is returned
-and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The requested namespace could not be identified.
-.El
-.Sh SEE ALSO
-.Xr getextattr 1 ,
-.Xr extattr_get_file 2 ,
-.Xr extattr_copy_file 3 ,
-.Xr extattr 9
-.Sh HISTORY
-Extended attribute support was developed as part of the
-.Tn TrustedBSD
-Project, and introduced in
-.Fx 5.0
-and
-.Nx 3.0 .
-It was developed to support security extensions requiring additional labels
-to be associated with each file or directory.
diff --git a/lib/libc/gen/fabs_ieee754.c b/lib/libc/gen/fabs_ieee754.c
deleted file mode 100644
index b10a6ec07..000000000
--- a/lib/libc/gen/fabs_ieee754.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: fabs_ieee754.c,v 1.3 2013/11/29 22:15:26 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fabs_ieee754.c,v 1.3 2013/11/29 22:15:26 joerg Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.6 fabs - return the absolute value of the argument
- *          IEEE 754 double-precision version
- */
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(fabsl, fabs)
-#endif
-
-double
-fabs(double x)
-{
-	union ieee_double_u u;
-
-	u.dblu_d = x;
-
-	u.dblu_dbl.dbl_sign = 0;
-
-	return u.dblu_d;
-}
diff --git a/lib/libc/gen/fixunsdfsi_ieee754.c b/lib/libc/gen/fixunsdfsi_ieee754.c
deleted file mode 100644
index 550089c3b..000000000
--- a/lib/libc/gen/fixunsdfsi_ieee754.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: fixunsdfsi_ieee754.c,v 1.3 2013/04/30 01:44:07 matt Exp $	*/
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fixunsdfsi_ieee754.c,v 1.3 2013/04/30 01:44:07 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <float.h>
-#include <machine/ieee.h>
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-uint32_t __fixunsgen32(int, bool, size_t, size_t, const uint32_t *);
-
-uint32_t __fixunsdfsi(double);
-
-/*
- * Convert double to (unsigned) int.  All operations are done module 2^32.
- */
-uint32_t
-__fixunsdfsi(double x)
-{
-	const union ieee_double_u dblu = { .dblu_d = x };
-	const uint32_t frac[(DBL_FRACBITS + 31)/32 + 1] = {
-		[0] = 0,
-		[1] = dblu.dblu_dbl.dbl_fracl,
-		[2] = dblu.dblu_dbl.dbl_frach,
-	};
-
-	return __fixunsgen32(
-		dblu.dblu_dbl.dbl_exp - DBL_EXP_BIAS,
-		dblu.dblu_dbl.dbl_sign != 0,
-		DBL_MANT_DIG,
-		DBL_FRACHBITS,
-		&frac[__arraycount(frac)-1]);
-}
diff --git a/lib/libc/gen/fixunsgen64_ieee754.c b/lib/libc/gen/fixunsgen64_ieee754.c
deleted file mode 100644
index bb3417090..000000000
--- a/lib/libc/gen/fixunsgen64_ieee754.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*	$NetBSD: fixunsgen64_ieee754.c,v 1.1 2011/07/09 02:30:27 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fixunsgen64_ieee754.c,v 1.1 2011/07/09 02:30:27 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define	FIXUNSNAME(n)	n##64
-#define	UINTXX_T	uint64_t
-
-#include "fixunsgen_ieee754.c"
diff --git a/lib/libc/gen/fixunsgen_ieee754.c b/lib/libc/gen/fixunsgen_ieee754.c
deleted file mode 100644
index d10fd7a79..000000000
--- a/lib/libc/gen/fixunsgen_ieee754.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*	$NetBSD: fixunsgen_ieee754.c,v 1.3 2012/03/25 19:53:41 christos 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#if !defined(FIXUNSNAME) && defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fixunsgen_ieee754.c,v 1.3 2012/03/25 19:53:41 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stddef.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <float.h>
-
-#ifndef FIXUNSNAME
-#define	FIXUNSNAME(n)	n##32
-#define	UINTXX_T	uint32_t
-#endif
-
-__dso_hidden UINTXX_T
-	FIXUNSNAME(__fixunsgen)(int, bool, size_t, size_t, const uint32_t *);
-
-/*
- * Convert double to (unsigned) int.  All operations are done module 2^32.
- */
-UINTXX_T
-FIXUNSNAME(__fixunsgen)(int exp, bool sign, size_t mant_dig, size_t fracbits,
-	const uint32_t *frac)
-{
-	UINTXX_T tmp;
-
-	/*
-	 * If it's less than 1 (negative exponent), it's going to round
-	 * to zero.  If the exponent is so large that it is a multiple of
-	 * 2^N, then x module 2^N will be 0.  (we use the fact treating a
-	 * negative value as unsigned will be greater than nonnegative value)
-	 */
-	if (__predict_false((size_t)exp >= mant_dig + sizeof(UINTXX_T)*8))
-		return 0;
-
-	/*
-	 * This is simplier than it seems.  Basically we are constructing
-	 * fixed binary representation of the floating point number tossing
-	 * away bits that wont be in the modulis we return.
-	 */
-	tmp = 1;
-	for (size_t ebits = exp;;) {
-		if (ebits <= fracbits) {
-			/*
-			 * The current fraction has more bits than we need.
-			 * Shift the current value over and insert the bits
-			 * we want.  We're done.
-			 */
-			tmp <<= (unsigned int)ebits;
-			tmp |= *frac >> (fracbits - ebits);
-			break;
-		}
-		if (fracbits == sizeof(tmp)*4) {
-			/*
-			 * Shifts must be < sizeof(type).  If it's going to be
-			 * sizeof(type), just replace the value.
-			 */
-			tmp = *frac--;
-		} else {
-			tmp <<= (unsigned int)fracbits;
-			tmp |= *frac--;
-		}
-		ebits -= fracbits;
-		fracbits = sizeof(frac[0]) * 4;
-	}
-
-	/*
-	 * If the input was negative, make tmp negative module 2^32.
-	 */
-	if (sign)
-		tmp = -tmp;
-
-	return tmp;
-}
diff --git a/lib/libc/gen/fixunssfsi_ieee754.c b/lib/libc/gen/fixunssfsi_ieee754.c
deleted file mode 100644
index 41de76694..000000000
--- a/lib/libc/gen/fixunssfsi_ieee754.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: fixunssfsi_ieee754.c,v 1.3 2013/04/30 01:44:07 matt Exp $	*/
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fixunssfsi_ieee754.c,v 1.3 2013/04/30 01:44:07 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <float.h>
-#include <machine/ieee.h>
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-uint32_t __fixunsgen32(int, bool, size_t, size_t, const uint32_t *);
-
-uint32_t __fixunssfsi(float);
-
-/*
- * Convert float to (unsigned) int.  All operations are done module 2^32.
- */
-uint32_t
-__fixunssfsi(float x)
-{
-	const union ieee_single_u sngu = { .sngu_f = x };
-	const uint32_t frac[(SNG_FRACBITS + 31)/32 + 1] = {
-		[0] = 0,
-		[1] = sngu.sngu_sng.sng_frac,
-	};
-
-	return __fixunsgen32(
-		sngu.sngu_sng.sng_exp - SNG_EXP_BIAS,
-		sngu.sngu_sng.sng_sign != 0,
-		FLT_MANT_DIG,
-		SNG_FRACBITS,
-		&frac[__arraycount(frac)-1]);
-}
diff --git a/lib/libc/gen/fixunstfdi_ieee754.c b/lib/libc/gen/fixunstfdi_ieee754.c
deleted file mode 100644
index 9c906cfb9..000000000
--- a/lib/libc/gen/fixunstfdi_ieee754.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: fixunstfdi_ieee754.c,v 1.1 2011/07/09 02:30:27 matt Exp $	*/
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fixunstfdi_ieee754.c,v 1.1 2011/07/09 02:30:27 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <float.h>
-#include <machine/ieee.h>
-
-#if defined(__x86_64__) || defined(__i486__)
-#define	FIXUNS	__fixunsxfdi
-#else
-#define	FIXUNS	__fixunstfdi
-#endif
-
-uint64_t __fixunsgen64(int, bool, size_t, size_t, const uint32_t *);
-
-uint64_t FIXUNS(long double);
-
-/*
- * Convert long double to uint64_t.  All operations are done module 2^64.
- */
-uint64_t
-FIXUNS(long double x)
-{
-	const union ieee_ext_u extu = { .extu_ld = x };
-	uint32_t frac[(EXT_FRACBITS + 31)/32 + 2];
-
-	frac[0] = 0;
-	frac[1] = 0;
-
-	EXT_TO_ARRAY32(extu, &frac[2]);
-
-	return __fixunsgen64(
-		extu.extu_ext.ext_exp - EXT_EXP_BIAS,
-		extu.extu_ext.ext_sign != 0,
-		LDBL_MANT_DIG,
-		EXT_FRACHBITS,
-		&frac[__arraycount(frac)-1]);
-}
diff --git a/lib/libc/gen/fixunstfsi_ieee754.c b/lib/libc/gen/fixunstfsi_ieee754.c
deleted file mode 100644
index d055ce709..000000000
--- a/lib/libc/gen/fixunstfsi_ieee754.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: fixunstfsi_ieee754.c,v 1.2 2012/08/05 04:28:58 matt Exp $	*/
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fixunstfsi_ieee754.c,v 1.2 2012/08/05 04:28:58 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <float.h>
-#include <machine/ieee.h>
-
-#ifdef SOFTFLOAT
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#if defined(__x86_64__) || defined(__i486__)
-#define	FIXUNS	__fixunsxfsi
-#else
-#define	FIXUNS	__fixunstfsi
-#endif
-
-uint32_t __fixunsgen32(int, bool, size_t, size_t, const uint32_t *);
-
-uint32_t FIXUNS(long double);
-
-/*
- * Convert long double to (unsigned) int.  All operations are done module 2^32.
- */
-uint32_t
-FIXUNS(long double x)
-{
-	const union ieee_ext_u extu = { .extu_ld = x };
-	uint32_t frac[(EXT_FRACBITS + 31)/32 + 1];
-
-	frac[0] = 0;
-
-	EXT_TO_ARRAY32(extu, &frac[1]);
-
-	return __fixunsgen32(
-		extu.extu_ext.ext_exp - EXT_EXP_BIAS,
-		extu.extu_ext.ext_sign != 0,
-		LDBL_MANT_DIG,
-		EXT_FRACHBITS,
-		&frac[__arraycount(frac)-1]);
-}
diff --git a/lib/libc/gen/floatunditf_ieee754.c b/lib/libc/gen/floatunditf_ieee754.c
deleted file mode 100644
index 38f2f4023..000000000
--- a/lib/libc/gen/floatunditf_ieee754.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*	$NetBSD: floatunditf_ieee754.c,v 1.1 2014/01/30 15:06:18 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2014 Joerg Sonnenberger <joerg@NetBSD.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: floatunditf_ieee754.c,v 1.1 2014/01/30 15:06:18 joerg Exp $");
-
-#include <math.h>
-#include <machine/ieee.h>
-#include <limits.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-
-long double __floatunditf(uint64_t x);
-
-/*
- * Convert uint64_t to long double.
- */
-long double
-__floatunditf(uint64_t x)
-{
-	int exponent, zeros;
-	union ieee_ext_u ux;
-
-	/* Use the easier conversion routine for uint32_t if possible. */
-	if (x <= UINT32_MAX)
-		return (long double)(uint32_t)x;
-
-	zeros = __builtin_clzll(x);
-#ifdef LDBL_IMPLICIT_NBIT
-	exponent = 64 - zeros;
-	x <<= zeros + 1;
-#else
-	exponent = 63 - zeros;
-	x <<= zeros;
-#endif
-
-	ux.extu_exp = EXT_EXP_BIAS + exponent;
-	ux.extu_frach = (x >> (64 - EXT_FRACHBITS));
-	x <<= EXT_FRACHBITS;
-#ifdef EXT_FRACHMBITS
-	ux.extu_frachm = (x >> (64 - EXT_FRACHMBITS));
-	x <<= EXT_FRACHMBITS;
-#endif
-#ifdef EXT_FRACLMBITS
-	ux.extu_fraclm = (x >> (64 - EXT_FRACLMBITS));
-	x <<= EXT_FRACLMBITS;
-#endif
-	ux.extu_fracl = (x >> (64 - EXT_FRACLBITS));
-	ux.extu_sign = 0;
-
-	return ux.extu_ld;
-}
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libc/gen/floatunsidf_ieee754.c b/lib/libc/gen/floatunsidf_ieee754.c
deleted file mode 100644
index 03b40e1a2..000000000
--- a/lib/libc/gen/floatunsidf_ieee754.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: floatunsidf_ieee754.c,v 1.1 2013/08/23 16:01:35 matt Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: floatunsidf_ieee754.c,v 1.1 2013/08/23 16:01:35 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include <machine/ieee.h>
-
-double __floatunsidf(uint32_t);
-
-/*
- * Convert (unsigned) int to double.
- */
-double
-__floatunsidf(uint32_t x)
-{
-	union ieee_double_u u;
-
-	if (x == 0)
-		return 0.0;
-	if (x == 1)
-		return 1.0;
-
-	u_int l = __builtin_clz(x);
-	x <<= (l + 1);	/* clear implicit bit */
-
-	u.dblu_sign = 0;
-	u.dblu_exp = DBL_EXP_BIAS + 31 - l;
-	u.dblu_frach = x >> (32 - DBL_FRACHBITS);
-	u.dblu_fracl = x << (32 - DBL_FRACHBITS);
-
-	return u.dblu_d;
-}
diff --git a/lib/libc/gen/floatunsisf_ieee754.c b/lib/libc/gen/floatunsisf_ieee754.c
deleted file mode 100644
index 40174b557..000000000
--- a/lib/libc/gen/floatunsisf_ieee754.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: floatunsisf_ieee754.c,v 1.1 2013/08/23 16:01:35 matt Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: floatunsisf_ieee754.c,v 1.1 2013/08/23 16:01:35 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include <machine/ieee.h>
-
-float __floatunsisf(uint32_t);
-
-/*
- * Convert (unsigned) int to float.
- */
-float
-__floatunsisf(uint32_t x)
-{
-	union ieee_single_u u;
-
-	if (x == 0)
-		return 0.0;
-	if (x == 1)
-		return 1.0;
-
-	u_int l = __builtin_clz(x);
-	x <<= (l + 1);	/* clear implicit bit */
-
-	u.sngu_sign = 0;
-	u.sngu_exp = SNG_EXP_BIAS + 31 - l;
-	u.sngu_frac = x >> (32 - SNG_FRACBITS);
-
-	return u.sngu_f;
-}
diff --git a/lib/libc/gen/fmtcheck.3 b/lib/libc/gen/fmtcheck.3
deleted file mode 100644
index 8907521c3..000000000
--- a/lib/libc/gen/fmtcheck.3
+++ /dev/null
@@ -1,99 +0,0 @@
-.\"	$NetBSD: fmtcheck.3,v 1.8 2014/06/14 08:18:24 apb Exp $
-.\"
-.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This file 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.
-.\"
-.Dd June 14, 2014
-.Dt FMTCHECK 3
-.Os
-.Sh NAME
-.Nm fmtcheck
-.Nd sanitizes user-supplied printf(3)-style format string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft const char *
-.Fn fmtcheck "const char *fmt_suspect" "const char *fmt_default"
-.Sh DESCRIPTION
-The
-.Nm
-function scans
-.Fa fmt_suspect
-and
-.Fa fmt_default
-to determine if
-.Fa fmt_suspect
-will consume the same argument types as
-.Fa fmt_default
-and to ensure that
-.Fa fmt_suspect
-is a valid format string.
-.Pp
-The
-.Xr printf 3
-family of functions can not verify the types of arguments that they are
-passed at run-time.
-In some cases, like
-.Xr catgets 3 ,
-it is useful or necessary to use a user-supplied format string with no
-guarantee that the format string matches the specified parameters.
-.Pp
-The
-.Nm
-function was designed to be used in these cases, as in:
-.Bd -literal -offset indent
-printf(fmtcheck(user_format, standard_format), arg1, arg2);
-.Ed
-.Pp
-In the check, field widths, fillers, precisions, etc. are ignored (unless
-the field width or precision is an asterisk
-.Ql *
-instead of a digit string).
-Also, any text other than the format specifiers is completely ignored.
-.Pp
-Note that the formats may be quite different as long as they accept the
-same parameters.
-For example, "%ld %o %30s %#llx %-10.*e %n" is
-compatible with "This number %lu %d%% and string %s has %qd numbers
-and %.*g floats (%n)."
-However, "%o" is not equivalent to "%lx" because
-the first requires an integer and the second requires a long,
-and "%p" is not equivalent to "%lu" because
-the first requires a pointer and the second requires a long.
-.Sh RETURN VALUES
-If
-.Fa fmt_suspect
-is a valid format and consumes the same argument types as
-.Fa fmt_default ,
-then the
-.Nm
-function will return
-.Fa fmt_suspect .
-Otherwise, it will return
-.Fa fmt_default .
-.Sh SEE ALSO
-.Xr printf 3
diff --git a/lib/libc/gen/fmtcheck.c b/lib/libc/gen/fmtcheck.c
deleted file mode 100644
index 8d2653425..000000000
--- a/lib/libc/gen/fmtcheck.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*	$NetBSD: fmtcheck.c,v 1.9 2014/06/14 08:18:24 apb Exp $	*/
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code was contributed to The NetBSD Foundation by Allen Briggs.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fmtcheck.c,v 1.9 2014/06/14 08:18:24 apb Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#ifdef __weak_alias
-__weak_alias(fmtcheck,__fmtcheck)
-#endif
-
-enum __e_fmtcheck_types {
-	FMTCHECK_START,
-	FMTCHECK_SHORT,
-	FMTCHECK_INT,
-	FMTCHECK_LONG,
-	FMTCHECK_QUAD,
-	FMTCHECK_POINTER,
-	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_POINTER);
-	}
-	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/lib/libc/gen/fmtmsg.3 b/lib/libc/gen/fmtmsg.3
deleted file mode 100644
index 09a27083b..000000000
--- a/lib/libc/gen/fmtmsg.3
+++ /dev/null
@@ -1,220 +0,0 @@
-.\"	$NetBSD: fmtmsg.3,v 1.7 2011/04/11 05:59:11 jruoho Exp $
-.\"
-.\" Copyright (c) 1999 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.
-.\"
-.Dd April 11, 2011
-.Dt FMTMSG 3
-.Os
-.Sh NAME
-.Nm fmtmsg
-.Nd format and display a message
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fmtmsg.h
-.Ft int
-.Fn fmtmsg "long classification" "const char *label" "int severity" "const char *text" "const char *action" "const char *tag"
-.Sh DESCRIPTION
-The
-.Fn fmtmsg
-function can be used to display messages in the specified format.
-Messages may be written either to standard error, to the console, or both.
-.Pp
-A formatted message consists of up to five components specified in
-.Fa label ,
-.Fa severity ,
-.Fa text ,
-.Fa action
-and
-.Fa tag .
-Further information such as the origin of the message, the recoverability
-from the condition causing the message and where to display the message
-is specified in
-.Fa classification .
-.Ss Classification
-The
-.Fa classification
-argument consists of a major classification and several sub-classifications.
-It has no effect on the content of the message displayed.
-With the exception of the display sub-classification, only a single identifier
-may be specified for each (sub-)classification.
-The following classifications
-are available:
-.Bl -tag -width "XXX"
-.It Em Major classifications
-The source of the condition.
-Available identifiers are:
-.Dv MM_HARD
-(hardware),
-.Dv MM_SOFT
-(software), and
-.Dv MM_FIRM
-(firmware).
-.It Em Message source sub-classifications
-The type of software detecting the condition.
-Available identifiers are:
-.Dv MM_APPL
-(application),
-.Dv MM_UTIL
-(utility), and
-.Dv MM_OPSYS
-(operating system).
-.It Em Display sub-classifications
-The displays the formatted messages is to be written to.
-Available identifiers are:
-.Dv MM_PRINT
-(standard error stream) and
-.Dv MM_CONSOLE
-(system console).
-.It Em Status sub-classifications
-The capability of the calling software to recover from the condition.
-Available identifiers are:
-.Dv MM_RECOVER
-(recoverable) and
-.Dv MM_NRECOV
-(non-recoverable).
-.El
-.Pp
-If no
-.Fa classification
-is to be supplied,
-.Dv MM_NULLMC
-must be specified.
-.Ss Label
-The
-.Fa label
-argument identifies the source of the message.
-It consists of two fields separated by a colon (:).
-The first field is up to 10 characters, the second is up to 14 characters.
-.Pp
-If no
-.Fa label
-is to be supplied,
-.Dv MM_NULLLBL
-must be specified.
-.Ss Severity
-The seriousness of the condition causing the message.
-The following
-.Fa severity
-levels are available:
-.Bl -tag -width MM_WARNING -offset indent
-.It Dv MM_HALT
-The software has encountered a severe fault and is halting.
-.It Dv MM_ERROR
-The software has encountered a fault.
-.It Dv MM_WARNING
-The software has encountered an unusual non-fault condition.
-.It Dv MM_INFO
-The software informs about a non-error condition.
-.El
-.Pp
-If no
-.Fa severity
-level is to be supplied,
-.Dv MM_NOSEV
-must be specified.
-.Ss Text
-The description of the condition the software encountered.
-The character
-string is not limited to a specific size.
-.Pp
-If no
-.Fa text
-is to be supplied,
-.Dv MM_NOTXT
-must be specified.
-.Ss Action
-The first step to be taken to recover from the condition the software
-encountered; it will be preceded by the prefix
-.Dq TO FIX: .
-The character string is not limited to a specific size.
-.Pp
-If no
-.Fa action
-is to be supplied,
-.Dv MM_NOACT
-must be specified.
-.Ss Tag
-The on-line documentation which provides further information about the
-condition and the message, such as
-.Dq Xr fmtmsg 3 .
-The character string is not limited to a specific size.
-.Pp
-If no
-.Fa tag
-is to be supplied,
-.Dv MM_NOTAG
-must be specified.
-.Pp
-Further effect on the formatting of the message as displayed on the
-standard error stream (but not on the system console!) may be taken by
-setting the
-.Ev MSGVERB
-environment variable, which selects the subset of message components
-to be printed.
-It consists of a colon-separated list of the optional keywords
-.Fa label ,
-.Fa severity ,
-.Fa text ,
-.Fa action ,
-and
-.Fa tag ,
-which correspond to the arguments to
-.Fn fmtmsg
-with the same names.
-If
-.Ev MSGVERB
-is either not set or malformed (containing empty or unknown keywords),
-its content is ignored an all message components will be selected.
-.Pp
-Note that displaying a message on the system console may fail due to
-inappropriate privileges or a non-permissive file mode of the console device.
-.Sh RETURN VALUES
-The
-.Fn fmtmsg
-function returns one of the following values:
-.Bl -tag -width MM_NOTOKXXX
-.It Dv MM_OK
-The function succeeded.
-.It Dv MM_NOTOK
-The function failed completely.
-.It Dv MM_NOMSG
-The function was unable to generate a message on standard error,
-but otherwise succeeded.
-.It Dv MM_NOCOM
-The function was unable to generate a message on the console,
-but otherwise succeeded.
-.El
-.Sh SEE ALSO
-.Xr printf 3 ,
-.Xr syslog 3
-.Sh STANDARDS
-The
-.Fn fmtmsg
-function conforms to
-.St -xsh5 .
diff --git a/lib/libc/gen/fmtmsg.c b/lib/libc/gen/fmtmsg.c
deleted file mode 100644
index 1fd683b37..000000000
--- a/lib/libc/gen/fmtmsg.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/*	$NetBSD: fmtmsg.c,v 1.6 2014/09/18 13:58:20 christos Exp $	*/
-
-/*-
- * Copyright (c) 1999 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fmtmsg.c,v 1.6 2014/09/18 13:58:20 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <fmtmsg.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-static unsigned int	msgverb(const char *);
-static const char *	severity2str(int);
-static int		writeit(FILE *, unsigned int, const char *,
-			    const char *, const char *, const char *,
-			    const char *);
-
-#define MM_VERBLABEL		0x01U
-#define MM_VERBSEVERITY		0x02U
-#define MM_VERBTEXT		0x04U
-#define MM_VERBACTION		0x08U
-#define MM_VERBTAG		0x10U
-#define MM_VERBALL	\
-    (MM_VERBLABEL | MM_VERBSEVERITY | MM_VERBTEXT | MM_VERBACTION | \
-     MM_VERBTAG)
-
-static const struct keyword {
-	size_t			len;	/* strlen(keyword) */
-	const char * const	keyword;
-} keywords[] = {
-	{ 5,	"label"		},	/* log2(MM_VERBLABEL) */
-	{ 8,	"severity"	},	/* ... */
-	{ 4,	"text"		},
-	{ 6,	"action"	},
-	{ 3,	"tag"		}	/* log2(MM_VERBTAG) */
-};
-
-static const size_t nkeywords = sizeof (keywords) / sizeof (keywords[0]);
-
-/*
- * Convert a colon-separated list of known keywords to a set of MM_VERB*
- * flags, defaulting to `all' if not set, empty, or in presence of unknown
- * keywords.
- */
-static unsigned int
-msgverb(const char *str)
-{
-	u_int i;
-	unsigned int result;
-
-	if (str == NULL)
-		return (MM_VERBALL);
-
-	result = 0;
-	while (*str != '\0') {
-		for (i = 0; i < nkeywords; i++) {
-			if (memcmp(str, keywords[i].keyword, keywords[i].len)
-			    == 0 &&
-			    (*(str + keywords[i].len) == ':' ||
-			     *(str + keywords[i].len) == '\0'))
-				break;
-		}
-		if (i == nkeywords) {
-			result = MM_VERBALL;
-			break;
-		}
-
-		result |= (1 << i);
-		if (*(str += keywords[i].len) == ':')
-			str++;	/* Advance */
-	}
-	if (result == 0)
-		result = MM_VERBALL;
-
-	return (result);
-}
-
-static const char severities[][8] = {
-	"",		/* MM_NONE */
-	"HALT",
-	"ERROR",
-	"WARNING",
-	"INFO"
-};
-
-static const size_t nseverities = sizeof (severities) / sizeof (severities[0]);
-
-/*
- * Returns the string representation associated with the numerical severity
- * value, defaulting to NULL for an unknown value.
- */
-static const char *
-severity2str(int severity)
-{
-	const char *result;
-
-	if (severity >= 0 &&
-	    (u_int) severity < nseverities)
-		result = severities[severity];
-	else
-		result = NULL;
-
-	return (result);
-}
-
-/*
- * Format and write the message to the given stream, selecting those
- * components displayed from msgverb, returning the number of characters
- * written, or a negative value in case of an error.
- */
-static int
-writeit(FILE *stream, unsigned int which, const char *label,
-	const char *sevstr, const char *text, const char *action,
-	const char *tag)
-{
-	int nwritten;
-
-	nwritten = fprintf(stream, "%s%s%s%s%s%s%s%s%s%s%s",
-	    ((which & MM_VERBLABEL) && label != MM_NULLLBL) ?
-	    label : "",
-	    ((which & MM_VERBLABEL) && label != MM_NULLLBL) ?
-	    ": " : "",
-	    (which & MM_VERBSEVERITY) ?
-	    sevstr : "",
-	    (which & MM_VERBSEVERITY) ?
-	    ": " : "",
-	    ((which & MM_VERBTEXT) && text != MM_NULLTXT) ?
-	    text : "",
-	    ((which & MM_VERBLABEL) && label != MM_NULLLBL) ||
-	    ((which & MM_VERBSEVERITY)) ||
-	    ((which & MM_VERBTEXT) && text != MM_NULLTXT) ?
-	    "\n" : "",
-	    ((which & MM_VERBACTION) && action != MM_NULLACT) ?
-	    "TO FIX: " : "",
-	    ((which & MM_VERBACTION) && action != MM_NULLACT) ?
-	    action : "",
-	    ((which & MM_VERBACTION) && label != MM_NULLACT) ?
-	    " " : "",
-	    ((which & MM_VERBTAG) && tag != MM_NULLTAG) ?
-	    tag : "",
-	    ((which & MM_VERBACTION) && action != MM_NULLACT) ||
-	    ((which & MM_VERBTAG) && tag != MM_NULLTAG) ?
-	    "\n" : "");
-
-	return (nwritten);
-}
-
-int
-fmtmsg(long classification, const char *label, int severity,
-	const char *text, const char *action, const char *tag)
-{
-	FILE *console;
-	const char *p, *sevstr;
-	int result;
-
-	/* Validate label constraints, if not null. */
-	if (label != MM_NULLLBL) {
-		/*
-		 * Two fields, separated by a colon.  The first field is up to
-		 * 10 bytes, the second is up to 14 bytes.
-		 */
-		p = strchr(label, ':');
-		if (p ==  NULL || p - label > 10 || strlen(p + 1) > 14)
-			return (MM_NOTOK);
-	}
-	/* Validate severity argument. */
-	if ((sevstr = severity2str(severity)) == NULL)
-		return (MM_NOTOK);
-
-	/*
-	 * Fact in search for a better place: XSH5 does not define any
-	 * functionality for `classification' bits other than the display
-	 * subclassification.
-	 */
-
-	result = 0;
-
-	if (classification & MM_PRINT) {
-		if (writeit(stderr, msgverb(getenv("MSGVERB")),
-		    label, sevstr, text, action, tag) < 0)
-			result |= MM_NOMSG;
-	}
-	/* Similar to MM_PRINT but ignoring $MSGVERB. */
-	if (classification & MM_CONSOLE) {
-		if ((console = fopen(_PATH_CONSOLE, "we")) != NULL) {
-			if (writeit(console, MM_VERBALL,
-			    label, sevstr, text, action, tag) < 0)
-				result |= MM_NOCON;
-			/*
-			 * Ignore result: does not constitute ``generate a
-			 * console message.''
-			 */
-			(void)fclose(console);
-		} else {
-			result |= MM_NOCON;
-		}
-	}
-
-	if (result == (MM_NOMSG | MM_NOCON))
-		result = MM_NOTOK;
-
-	return (result == 0 ? MM_OK : result);
-}
diff --git a/lib/libc/gen/fnmatch.3 b/lib/libc/gen/fnmatch.3
deleted file mode 100644
index e14688691..000000000
--- a/lib/libc/gen/fnmatch.3
+++ /dev/null
@@ -1,140 +0,0 @@
-.\"	$NetBSD: fnmatch.3,v 1.22 2010/11/30 21:03:07 jruoho Exp $
-.\"
-.\" Copyright (c) 1989, 1991, 1993
-.\"	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.
-.\" 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.
-.\"
-.\"     @(#)fnmatch.3	8.3 (Berkeley) 4/28/95
-.\"
-.Dd November 30, 2010
-.Dt FNMATCH 3
-.Os
-.Sh NAME
-.Nm fnmatch
-.Nd match filename or pathname using shell glob rules
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fnmatch.h
-.Ft int
-.Fn fnmatch "const char *pattern" "const char *string" "int flags"
-.Sh DESCRIPTION
-The
-.Fn fnmatch
-function
-matches patterns according to the globbing rules used by the shell.
-It checks the string specified by the
-.Fa string
-argument to see if it matches the pattern specified by the
-.Fa pattern
-argument.
-.Pp
-The
-.Fa flags
-argument modifies the interpretation of
-.Fa pattern
-and
-.Fa string .
-The value of
-.Fa flags
-is the bitwise inclusive
-.Tn OR
-of any of the following
-constants, which are defined in the include file
-.Pa fnmatch.h .
-.Bl -tag -width FNM_LEADING_DIRXX
-.It Dv FNM_NOESCAPE
-Normally, every occurrence of a backslash
-.Pq Ql \e
-followed by a character in
-.Fa pattern
-is replaced by that character.
-This is done to negate any special meaning for the character.
-If the
-.Dv FNM_NOESCAPE
-flag is set, a backslash character is treated as an ordinary character.
-.It Dv FNM_PATHNAME
-Slash characters in
-.Fa string
-must be explicitly matched by slashes in
-.Fa pattern .
-If this flag is not set, then slashes are treated as regular characters.
-.It Dv FNM_PERIOD
-Leading periods in strings match periods in patterns.
-The definition of ``leading'' is related to the specification of
-.Dv FNM_PATHNAME .
-A period is always ``leading'' if it is the first character in
-.Ar string .
-Additionally, if
-.Dv FNM_PATHNAME
-is set,
-a period is ``leading'' if it immediately follows a slash.
-.It Dv FNM_LEADING_DIR
-Ignore
-.Dq /*
-rest after successful
-.Fa pattern
-matching.
-.It Dv FNM_CASEFOLD
-The pattern is matched in a case-insensitive fashion.
-.El
-.Sh RETURN VALUES
-The
-.Fn fnmatch
-function returns zero if
-.Fa string
-matches the pattern specified by
-.Fa pattern ,
-otherwise, it returns the value
-.Dv FNM_NOMATCH .
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr glob 3 ,
-.Xr regex 3 ,
-.Xr glob 7
-.Sh STANDARDS
-The
-.Fn fnmatch
-function conforms to
-.St -p1003.2-92 .
-The
-.Dv FNM_CASEFOLD
-flag is a
-.Nx
-extension.
-.Sh HISTORY
-The
-.Fn fnmatch
-function first appeared in
-.Bx 4.4 .
-.Sh BUGS
-The pattern
-.Ql *
-matches the empty string, even if
-.Dv FNM_PATHNAME
-is specified.
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c
deleted file mode 100644
index 0b878bd7d..000000000
--- a/lib/libc/gen/fnmatch.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*	$NetBSD: fnmatch.c,v 1.26 2014/10/12 22:32:33 christos Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
-#else
-__RCSID("$NetBSD: fnmatch.c,v 1.26 2014/10/12 22:32:33 christos Exp $");
-#endif
-#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 "namespace.h"
-
-#include <assert.h>
-#include <ctype.h>
-#include <fnmatch.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(fnmatch,_fnmatch)
-#endif
-
-#define	EOS	'\0'
-
-static inline int
-foldcase(int ch, int flags)
-{
-
-	if ((flags & FNM_CASEFOLD) != 0 && isupper(ch))
-		return tolower(ch);
-	return ch;
-}
-
-#define	FOLDCASE(ch, flags)	foldcase((unsigned char)(ch), (flags))
-
-static const char *
-rangematch(const char *pattern, int test, int flags)
-{
-	int negate, ok, need;
-	char c, c2;
-
-	_DIAGASSERT(pattern != NULL);
-
-	/*
-	 * 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 == '^')) != 0)
-		++pattern;
-	
-	need = 1;
-	for (ok = 0; (c = FOLDCASE(*pattern++, flags)) != ']' || need;) {
-		need = 0;
-		if (c == '/')
-			return (void *)-1;
-		if (c == '\\' && !(flags & FNM_NOESCAPE))
-			c = FOLDCASE(*pattern++, flags);
-		if (c == EOS)
-			return NULL;
-		if (*pattern == '-' 
-		    && (c2 = FOLDCASE(*(pattern + 1), flags)) != EOS &&
-		        c2 != ']') {
-			pattern += 2;
-			if (c2 == '\\' && !(flags & FNM_NOESCAPE))
-				c2 = FOLDCASE(*pattern++, flags);
-			if (c2 == EOS)
-				return NULL;
-			if (c <= test && test <= c2)
-				ok = 1;
-		} else if (c == test)
-			ok = 1;
-	}
-	return ok == negate ? NULL : pattern;
-}
-
-
-static int
-fnmatchx(const char *pattern, const char *string, int flags, size_t recursion)
-{
-	const char *stringstart, *r;
-	char c, test;
-
-	_DIAGASSERT(pattern != NULL);
-	_DIAGASSERT(string != NULL);
-
-	if (recursion-- == 0)
-		return FNM_NORES;
-
-	for (stringstart = string;;) {
-		switch (c = FOLDCASE(*pattern++, flags)) {
-		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 = FOLDCASE(*pattern, flags);
-			/* Collapse multiple stars. */
-			while (c == '*')
-				c = FOLDCASE(*++pattern, flags);
-
-			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 = FOLDCASE(*string, flags)) != EOS) {
-				int e;
-				switch ((e = fnmatchx(pattern, string,
-				    flags & ~FNM_PERIOD, recursion))) {
-				case FNM_NOMATCH:
-					break;
-				default:
-					return e;
-				}
-				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 ((r = rangematch(pattern,
-			    FOLDCASE(*string, flags), flags)) == NULL)
-				return FNM_NOMATCH;
-			if (r == (void *)-1) {
-				if (*string != '[')
-					return FNM_NOMATCH;
-			} else
-				pattern = r;
-			++string;
-			break;
-		case '\\':
-			if (!(flags & FNM_NOESCAPE)) {
-				if ((c = FOLDCASE(*pattern++, flags)) == EOS) {
-					c = '\0';
-					--pattern;
-				}
-			}
-			/* FALLTHROUGH */
-		default:
-			if (c != FOLDCASE(*string++, flags))
-				return FNM_NOMATCH;
-			break;
-		}
-	}
-	/* NOTREACHED */
-}
-
-int
-fnmatch(const char *pattern, const char *string, int flags)
-{
-	return fnmatchx(pattern, string, flags, 64);
-}
diff --git a/lib/libc/gen/fpclassify.3 b/lib/libc/gen/fpclassify.3
deleted file mode 100644
index c8dcc1ba5..000000000
--- a/lib/libc/gen/fpclassify.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\"	$NetBSD: fpclassify.3,v 1.3 2008/04/30 13:10:50 martin Exp $
-.\"
-.\" Copyright (c) 2003 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.
-.\"
-.Dd January 14, 2004
-.Dt FPCLASSIFY 3
-.Os
-.Sh NAME
-.Nm fpclassify
-.Nd classify real floating type
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In math.h
-.Ft int
-.Fn fpclassify "real-floating x"
-.Sh DESCRIPTION
-The
-.Fn fpclassify
-macro performs classification of its argument
-.Fa x .
-An argument represented in a format wider than its semantic type is
-converted to its semantic type first.
-The classification is then based on the type of the argument.
-.Ss IEEE 754
-.Bl -tag -width "FP_SUBNORMALXXX" -compact -offset indent
-.It Dv FP_INFINITE
-infinity, either positive or negative
-.It Dv FP_NAN
-not-a-number
-.Pq Dq NaN
-.It Dv FP_NORMAL
-normal
-.It Dv FP_SUBNORMAL
-subnormal
-.It Dv FP_ZERO
-zero
-.El
-.Ss VAX
-.Bl -tag -width "FP_DIRTYZEROXXX" -compact -offset indent
-.It Dv FP_ROP
-reserved operand
-.Pq Dq ROP
-.It Dv FP_DIRTYZERO
-dirty zero
-.It Dv FP_NORMAL
-finite
-.It Dv FP_ZERO
-true zero
-.El
-.Sh RETURN VALUES
-The
-.Fn fpclassify
-macro returns the value of the number classification macro appropriate
-to its argument
-.Fa x
-as described above.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr isfinite 3 ,
-.Xr isnormal 3 ,
-.Xr math 3 ,
-.Xr signbit 3
-.Sh STANDARDS
-The
-.Fn fpclassify
-macro conforms to
-.St -isoC-99 .
diff --git a/lib/libc/gen/fpclassifyd_ieee754.c b/lib/libc/gen/fpclassifyd_ieee754.c
deleted file mode 100644
index ecce33194..000000000
--- a/lib/libc/gen/fpclassifyd_ieee754.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: fpclassifyd_ieee754.c,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpclassifyd_ieee754.c,v 1.2 2008/04/28 20:22:59 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.1 fpclassify - classify real floating type
- *          IEEE 754 double-precision version
- */
-int
-__fpclassifyd(double x)
-{
-	union ieee_double_u u;
-
-	u.dblu_d = x;
-
-	if (u.dblu_dbl.dbl_exp == 0) {
-		if (u.dblu_dbl.dbl_frach == 0 && u.dblu_dbl.dbl_fracl == 0)
-			return FP_ZERO;
-		else
-			return FP_SUBNORMAL;
-	} else if (u.dblu_dbl.dbl_exp == DBL_EXP_INFNAN) {
-		if (u.dblu_dbl.dbl_frach == 0 && u.dblu_dbl.dbl_fracl == 0)
-			return FP_INFINITE;
-		else
-			return FP_NAN;
-	}
-
-	return FP_NORMAL;
-}
diff --git a/lib/libc/gen/fpclassifyf_ieee754.c b/lib/libc/gen/fpclassifyf_ieee754.c
deleted file mode 100644
index 2e522d5f1..000000000
--- a/lib/libc/gen/fpclassifyf_ieee754.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: fpclassifyf_ieee754.c,v 1.3 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpclassifyf_ieee754.c,v 1.3 2008/04/28 20:22:59 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.1 fpclassify - classify real floating type
- *          IEEE 754 single-precision version
- */
-int
-__fpclassifyf(float x)
-{
-	union ieee_single_u u;
-
-	u.sngu_f = x;
-
-	if (u.sngu_sng.sng_exp == 0) {
-		if (u.sngu_sng.sng_frac == 0)
-			return FP_ZERO;
-		else
-			return FP_SUBNORMAL;
-	} else if (u.sngu_sng.sng_exp == SNG_EXP_INFNAN) {
-		if (u.sngu_sng.sng_frac == 0)
-			return FP_INFINITE;
-		else
-			return FP_NAN;
-	}
-
-	return FP_NORMAL;
-}
diff --git a/lib/libc/gen/fpclassifyl_ieee754.c b/lib/libc/gen/fpclassifyl_ieee754.c
deleted file mode 100644
index 2aa6fc2aa..000000000
--- a/lib/libc/gen/fpclassifyl_ieee754.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*	$NetBSD: fpclassifyl_ieee754.c,v 1.3 2013/11/23 11:40:56 martin Exp $	*/
-
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpclassifyl_ieee754.c,v 1.3 2013/11/23 11:40:56 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-/*
- * 7.12.3.1 fpclassify - classify real floating type
- *          IEEE 754 compatible 128-bit extended-precision version
- */
-int
-__fpclassifyl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	if (u.extu_ext.ext_exp == 0) {
-		if (u.extu_ext.ext_frach == 0
-#if EXT_FRACHMBITS
-		    && u.extu_ext.ext_frachm == 0
-#endif
-#if EXT_FRACLMBITS
-		    && u.extu_ext.ext_fraclm == 0
-#endif
-		    && u.extu_ext.ext_fracl == 0)
-			return FP_ZERO;
-		else
-			return FP_SUBNORMAL;
-	} else if (u.extu_ext.ext_exp == EXT_EXP_INFNAN) {
-		if (u.extu_ext.ext_frach == 0
-#if EXT_FRACHMBITS
-		    && u.extu_ext.ext_frachm == 0
-#endif
-#if EXT_FRACLMBITS
-		    && u.extu_ext.ext_fraclm == 0
-#endif
-		    && u.extu_ext.ext_fracl == 0)
-			return FP_INFINITE;
-		else
-			return FP_NAN;
-	}
-
-	return FP_NORMAL;
-}
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libc/gen/fpgetmask.3 b/lib/libc/gen/fpgetmask.3
deleted file mode 100644
index 9ca8aa6b4..000000000
--- a/lib/libc/gen/fpgetmask.3
+++ /dev/null
@@ -1,172 +0,0 @@
-.\"	$NetBSD: fpgetmask.3,v 1.12 2011/03/27 22:55:07 wiz Exp $
-.\"
-.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Ross Harvey.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd March 26, 2011
-.Dt FPGETMASK 3
-.Os
-.Sh NAME
-.Nm fpgetmask ,
-.Nm fpgetprec ,
-.Nm fpgetround ,
-.Nm fpgetsticky ,
-.Nm fpsetmask ,
-.Nm fpsetprec ,
-.Nm fpsetround ,
-.Nm fpsetsticky
-.Nd IEEE FP mode control
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ieeefp.h
-.Ft fp_except_t
-.Fn fpgetmask void
-.Ft fp_prec_t
-.Fn fpgetprec void
-.Ft fp_rnd_t
-.Fn fpgetround void
-.Ft fp_except_t
-.Fn fpgetsticky void
-.Ft fp_except_t
-.Fn fpsetmask "fp_except_t mask"
-.Ft fp_prec_t
-.Fn fpsetprec "fp_prec_t prec"
-.Ft fp_rnd_t
-.Fn fpsetround "fp_rnd_t rnd_dir"
-.Ft fp_except_t
-.Fn fpsetsticky "fp_except_t sticky"
-.Sh DESCRIPTION
-A rounding mode
-.Ft fp_rnd_t
-is one of:
-.Bl -column -offset indent FP_RZ
-.It Dv FP_RZ Ta rounding towards Em zero
-.It Dv FP_RM Ta rounding down to Pq Em Minus infinity
-.It Dv FP_RN Ta rounding to Em nearest
-.It Dv FP_RP Ta rounding down to Pq Em Plus infinity
-.El
-The default mode is
-.Dv FP_RN .
-.Pp
-An
-.Ft fp_except_t
-value is a bitmask specifying an exception type and containing any of
-the values listed below.
-.Bl -column -offset indent FP_X_UFLxx
-.It Dv FP_X_INV Ta Invalid\ Operation
-.It Dv FP_X_DZ Ta Division\ by\ zero
-.It Dv FP_X_OFL Ta Overflow
-.It Dv FP_X_UFL Ta Underflow
-.It Dv FP_X_IMP Ta Imprecision (inexact)
-.It Dv FP_X_IOV Ta Integer\ Overflow
-.El
-.Pp
-An
-.Ft fp_prec_t
-specifies the precision of the floating point operations listed below.
-.Bl -column -offset indent FP_RPS
-.It Dv FP_PS Ta Dv 24 bit (single-precision)
-.It Dv FP_PRS Ta reserved
-.It Dv FP_PD Ta Dv 53 bit (double-precision)
-.It Dv FP_PE Ta Dv 64 bit (extended-precision)
-.El
-.Pp
-The
-.Fn fpsetmask
-function will set the current exception mask, i.e., it will cause
-future operations with the specified result status to raise the
-.Dv SIGFPE
-exception.
-The
-.Fn fpgetmask
-function will return the current exception mask.
-.Pp
-The
-.Fn fpgetprec
-function will return the current floating point precision.
-The
-.Fn fpsetprec
-function will set the floating point precision and will return
-the previous precision.
-.Pp
-The
-.Fn fpsetround
-function will cause future operations to use the specified dynamic
-rounding mode.
-The
-.Fn fpgetround
-function will return the current rounding mode.
-.Bl -tag -width Note:x
-.It Em Note :
-On some architectures, instructions can optionally specify static
-rounding modes and exception enables that will supersede the specified
-dynamic mode.
-On other architectures, these features may not be fully supported.
-.El
-.Pp
-A
-.Dq sticky
-status word may be maintained in which a bit is set every time an
-exceptional floating point condition is encountered, whether or not a
-.Dv SIGFPE
-is generated.
-The
-.Fn fpsetsticky
-function will set or clear the specified exception history bits.
-The
-.Fn fpgetsticky
-function will return the exception history bits.
-.Sh RETURN VALUES
-The
-.Fn fpgetround
-and
-.Fn fpsetround
-functions return the
-.Pq previous
-rounding mode.
-The
-.Fn fpgetmask ,
-.Fn fpsetmask ,
-.Fn fpgetsticky ,
-and
-.Fn fpsetsticky
-functions return the
-.Pq previous
-exception mask and exception history bits.
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr fenv 3
-.Sh BUGS
-There is no way to return an unsupported value.
-Not all processors support all the modes.
-These interfaces are deprecated and the ones
-in
-.Xr fenv 3
-should be used, although the interfaces in
-.Xr fenv 3
-don't support getting or setting the precision.
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
deleted file mode 100644
index 908055561..000000000
--- a/lib/libc/gen/fstab.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*	$NetBSD: fstab.c,v 1.31 2012/03/13 21:13:34 christos Exp $	*/
-
-/*
- * Copyright (c) 1980, 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fstab.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fstab.c,v 1.31 2012/03/13 21:13:34 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <fstab.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(endfsent,_endfsent)
-__weak_alias(getfsent,_getfsent)
-__weak_alias(getfsfile,_getfsfile)
-__weak_alias(getfsspec,_getfsspec)
-__weak_alias(setfsent,_setfsent)
-#endif
-
-static FILE *_fs_fp;
-static size_t _fs_lineno = 0;
-static const char *_fs_file = _PATH_FSTAB;
-static struct fstab _fs_fstab;
-
-static char *nextfld(char **, const char *);
-static int fstabscan(void);
-
-
-static char *
-nextfld(char **str, const char *sep)
-{
-	char *ret;
-
-	_DIAGASSERT(str != NULL);
-	_DIAGASSERT(sep != NULL);
-
-	while ((ret = stresep(str, sep, '\\')) != NULL && *ret == '\0')
-		continue;
-	return ret;
-}
-
-
-static int
-fstabscan(void)
-{
-	char *cp, *lp, *sp;
-#define	MAXLINELENGTH	1024
-	static char line[MAXLINELENGTH];
-	char subline[MAXLINELENGTH];
-	static const char sep[] = ":\n";
-	static const char ws[] = " \t\n";
-	static const char *fstab_type[] = {
-	    FSTAB_RW, FSTAB_RQ, FSTAB_RO, FSTAB_SW, FSTAB_DP, FSTAB_XX, NULL 
-	};
-
-	(void)memset(&_fs_fstab, 0, sizeof(_fs_fstab));
-	for (;;) {
-		if (!(lp = fgets(line, (int)sizeof(line), _fs_fp)))
-			return 0;
-		_fs_lineno++;
-/* OLD_STYLE_FSTAB */
-		if (!strpbrk(lp, " \t")) {
-			_fs_fstab.fs_spec = nextfld(&lp, sep);
-			if (!_fs_fstab.fs_spec || *_fs_fstab.fs_spec == '#')
-				continue;
-			_fs_fstab.fs_file = nextfld(&lp, sep);
-			_fs_fstab.fs_type = nextfld(&lp, sep);
-			if (_fs_fstab.fs_type) {
-				if (!strcmp(_fs_fstab.fs_type, FSTAB_XX))
-					continue;
-				_fs_fstab.fs_mntops = _fs_fstab.fs_type;
-				_fs_fstab.fs_vfstype =
-				    __UNCONST(
-				    strcmp(_fs_fstab.fs_type, FSTAB_SW) ?
-				    "ufs" : "swap");
-				if ((cp = nextfld(&lp, sep)) != NULL) {
-					_fs_fstab.fs_freq = atoi(cp);
-					if ((cp = nextfld(&lp, sep)) != NULL) {
-						_fs_fstab.fs_passno = atoi(cp);
-						return 1;
-					}
-				}
-			}
-			goto bad;
-		}
-/* OLD_STYLE_FSTAB */
-		_fs_fstab.fs_spec = nextfld(&lp, ws);
-		if (!_fs_fstab.fs_spec || *_fs_fstab.fs_spec == '#')
-			continue;
-		_fs_fstab.fs_file = nextfld(&lp, ws);
-		_fs_fstab.fs_vfstype = nextfld(&lp, ws);
-		_fs_fstab.fs_mntops = nextfld(&lp, ws);
-		if (_fs_fstab.fs_mntops == NULL)
-			goto bad;
-		_fs_fstab.fs_freq = 0;
-		_fs_fstab.fs_passno = 0;
-		if ((cp = nextfld(&lp, ws)) != NULL) {
-			_fs_fstab.fs_freq = atoi(cp);
-			if ((cp = nextfld(&lp, ws)) != NULL)
-				_fs_fstab.fs_passno = atoi(cp);
-		}
-
-		/* subline truncated iff line truncated */
-		(void)strlcpy(subline, _fs_fstab.fs_mntops, sizeof(subline));
-		sp = subline;
-
-		while ((cp = nextfld(&sp, ",")) != NULL) {
-			const char **tp;
-
-			if (strlen(cp) != 2)
-				continue;
-
-			for (tp = fstab_type; *tp; tp++)
-				if (strcmp(cp, *tp) == 0) {
-					_fs_fstab.fs_type = __UNCONST(*tp);
-					break;
-				}
-			if (*tp)
-				break;
-		}
-		if (_fs_fstab.fs_type == NULL)
-			goto bad;
-		if (strcmp(_fs_fstab.fs_type, FSTAB_XX) == 0)
-			continue;
-		if (cp != NULL)
-			return 1;
-
-bad:
-		warnx("%s, %lu: Missing fields", _fs_file, (u_long)_fs_lineno);
-	}
-	/* NOTREACHED */
-}
-
-struct fstab *
-getfsent(void)
-{
-	if ((!_fs_fp && !setfsent()) || !fstabscan())
-		return NULL;
-	return &_fs_fstab;
-}
-
-struct fstab *
-getfsspec(const char *name)
-{
-
-	_DIAGASSERT(name != NULL);
-
-	if (setfsent())
-		while (fstabscan())
-			if (!strcmp(_fs_fstab.fs_spec, name))
-				return &_fs_fstab;
-	return NULL;
-}
-
-struct fstab *
-getfsfile(const char *name)
-{
-
-	_DIAGASSERT(name != NULL);
-
-	if (setfsent())
-		while (fstabscan())
-			if (!strcmp(_fs_fstab.fs_file, name))
-				return &_fs_fstab;
-	return NULL;
-}
-
-int
-setfsent(void)
-{
-	_fs_lineno = 0;
-	if (_fs_fp) {
-		rewind(_fs_fp);
-		return 1;
-	}
-	if ((_fs_fp = fopen(_PATH_FSTAB, "re")) == NULL) {
-		warn("Cannot open `%s'", _PATH_FSTAB);
-		return 0;
-	}
-	return 1;
-}
-
-void
-endfsent(void)
-{
-	if (_fs_fp) {
-		(void)fclose(_fs_fp);
-		_fs_fp = NULL;
-	}
-}
diff --git a/lib/libc/gen/ftok.3 b/lib/libc/gen/ftok.3
deleted file mode 100644
index f465707bd..000000000
--- a/lib/libc/gen/ftok.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\"	$NetBSD: ftok.3,v 1.18 2014/03/18 18:20:37 riastradh Exp $
-.\"
-.\" Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.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 ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, 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.
-.\"
-.Dd April 27, 2010
-.Dt FTOK 3
-.Os
-.Sh NAME
-.Nm ftok
-.Nd create IPC identifier from path name
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ipc.h
-.Ft key_t
-.Fn ftok "const char *path" "int id"
-.Sh DESCRIPTION
-The
-.Fn ftok
-function attempts to create a unique key suitable for use with the
-.Xr msgget 2 ,
-.Xr semget 2
-and
-.Xr shmget 2
-functions given the
-.Fa path
-of an existing file and a user-selectable
-.Fa id .
-.Pp
-The specified
-.Fa path
-must specify an existing file that is accessible to the calling process
-or the call will fail.
-Also, note that links to files will return the same key, given the same
-.Fa id .
-.Pp
-Only the 8 least significant bits of
-.Fa id
-are used in the key generation; the rest of the bits are ignored.
-.Sh RETURN VALUES
-The
-.Fn ftok
-function will return ((key_t)-1) if
-.Fa path
-does not exist or if it cannot be accessed by the calling process.
-.Sh SEE ALSO
-.Xr msgget 2 ,
-.Xr semget 2 ,
-.Xr shmget 2
-.Sh STANDARDS
-The
-.Fn ftok
-function conforms to
-.St -p1003.1 .
-.Sh HISTORY
-The
-.Fn ftok
-function originated with System V and is typically used by programs
-that use the System V IPC routines.
-.Sh AUTHORS
-.An Thorsten Lockert Aq Mt tholo@sigmasoft.com
-.Sh BUGS
-The returned key is computed based on the device and inode of the
-specified
-.Fa path
-in combination with the given
-.Fa id .
-Thus it is quite possible for the routine to return duplicate keys
-given that those fields are not 8- and 16-bit quantities like they
-were on System V based systems where this library routine's ancestor
-were originally created.
diff --git a/lib/libc/gen/ftok.c b/lib/libc/gen/ftok.c
deleted file mode 100644
index b50c3d486..000000000
--- a/lib/libc/gen/ftok.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: ftok.c,v 1.11 2012/03/20 16:36:05 matt Exp $	*/
-
-/*
- * Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.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 ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ftok.c,v 1.11 2012/03/20 16:36:05 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ipc.h>
-
-#include <assert.h>
-#include <errno.h>
-
-#ifdef __weak_alias
-__weak_alias(ftok,_ftok)
-#endif
-
-key_t
-ftok(const char *path, int id)
-{
-	struct stat st;
-
-	_DIAGASSERT(path != NULL);
-
-	if (stat(path, &st) < 0)
-		return (key_t)-1;
-
-	return (key_t)
-	    (id << 24 | (st.st_dev & 0xff) << 16 | (st.st_ino & 0xffff));
-}
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
deleted file mode 100644
index d8968193b..000000000
--- a/lib/libc/gen/fts.3
+++ /dev/null
@@ -1,773 +0,0 @@
-.\"	$NetBSD: fts.3,v 1.31 2013/06/30 19:19:12 wiz Exp $
-.\"
-.\" Copyright (c) 1989, 1991, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
-.\"
-.Dd March 30, 2011
-.Dt FTS 3
-.Os
-.Sh NAME
-.Nm fts ,
-.Nm fts_open ,
-.Nm fts_read ,
-.Nm fts_children ,
-.Nm fts_set ,
-.Nm fts_close
-.Nd traverse a file hierarchy
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/stat.h
-.In fts.h
-.Ft FTS *
-.Fo fts_open
-.Fa "char * const *path_argv"
-.Fa "int options"
-.Fa "int (*compar)(const FTSENT **, const FTSENT **)"
-.Fc
-.Ft FTSENT *
-.Fn fts_read "FTS *ftsp"
-.Ft FTSENT *
-.Fn fts_children "FTS *ftsp" "int options"
-.Ft int
-.Fn fts_set "FTS *ftsp" "FTSENT *f" "int options"
-.Ft int
-.Fn fts_close "FTS *ftsp"
-.Sh DESCRIPTION
-The
-.Nm
-functions are provided for traversing
-.Ux
-file hierarchies.
-A simple overview is that the
-.Fn fts_open
-function returns a
-.Dq handle
-on a file hierarchy, which is then supplied to
-the other
-.Nm
-functions.
-The function
-.Fn fts_read
-returns a pointer to a structure describing one of the files in the file
-hierarchy.
-The function
-.Fn fts_children
-returns a pointer to a linked list of structures, each of which describes
-one of the files contained in a directory in the hierarchy.
-In general, directories are visited two distinguishable times; in pre-order
-(before any of their descendants are visited) and in post-order (after all
-of their descendants have been visited).
-Files are visited once.
-It is possible to walk the hierarchy
-.Dq logically
-(ignoring symbolic links)
-or physically (visiting symbolic links), order the walk of the hierarchy or
-prune and/or re-visit portions of the hierarchy.
-.Pp
-Two structures are defined (and typedef'd) in the include file
-.In fts.h .
-The first is
-.Fa FTS ,
-the structure that represents the file hierarchy itself.
-The second is
-.Fa FTSENT ,
-the structure that represents a file in the file
-hierarchy.
-Normally, an
-.Fa FTSENT
-structure is returned for every file in the file
-hierarchy.
-In this manual page,
-.Dq file
-and
-.Dq Fa FTSENT No structure
-are generally
-interchangeable.
-The
-.Fa FTSENT
-structure contains at least the following fields, which are
-described in greater detail below:
-.Bd -literal -offset 2n
-typedef struct _ftsent {
-	u_short fts_info;		/* flags for FTSENT structure */
-	char *fts_accpath;		/* access path */
-	char *fts_path;			/* root path */
-	short fts_pathlen;		/* strlen(fts_path) */
-	char *fts_name;			/* file name */
-	short fts_namelen;		/* strlen(fts_name) */
-	short fts_level;		/* depth (\-1 to N) */
-	int fts_errno;			/* file errno */
-	long fts_number;		/* local numeric value */
-	void *fts_pointer;		/* local address value */
-	struct ftsent *fts_parent;	/* parent directory */
-	struct ftsent *fts_link;	/* next file structure */
-	struct ftsent *fts_cycle;	/* cycle structure */
-	struct stat *fts_statp;		/* stat(2) information */
-} FTSENT;
-.Ed
-.Pp
-These fields are defined as follows:
-.Bl -tag -width "fts_namelen"
-.It Fa fts_info
-One of the following flags describing the returned
-.Fa FTSENT
-structure and
-the file it represents.
-With the exception of directories without errors
-.Pq Dv FTS_D ,
-all of these
-entries are terminal, that is, they will not be revisited, nor will any
-of their descendants be visited.
-.Bl  -tag -width FTS_DEFAULT
-.It Dv FTS_D
-A directory being visited in pre-order.
-.It Dv FTS_DC
-A directory that causes a cycle in the tree.
-(The
-.Fa fts_cycle
-field of the
-.Fa FTSENT
-structure will be filled in as well).
-.It Dv FTS_DEFAULT
-Any
-.Fa FTSENT
-structure that represents a file type not explicitly described
-by one of the other
-.Fa fts_info
-values.
-.It Dv FTS_DNR
-A directory which cannot be read.
-This is an error return, and the
-.Fa fts_errno
-field will be set to indicate what caused the error.
-.It Dv FTS_DOT
-A file named
-.Ql \&.
-or
-.Ql ..
-which was not specified as a file name to
-.Fn fts_open
-(see
-.Dv FTS_SEEDOT ) .
-.It Dv FTS_DP
-A directory being visited in post-order.
-The contents of the
-.Fa FTSENT
-structure will be unchanged from when
-it was returned in pre-order, i.e., with the
-.Fa fts_info
-field set to
-.Dv FTS_D .
-.It Dv FTS_ERR
-This is an error return, and the
-.Fa fts_errno
-field will be set to indicate what caused the error.
-.It Dv FTS_F
-A regular file.
-.It Dv FTS_NS
-A file for which no
-.Xr stat 2
-information was available.
-The contents of the
-.Fa fts_statp
-field are undefined.
-This is an error return, and the
-.Fa fts_errno
-field will be set to indicate what caused the error.
-.It Dv FTS_NSOK
-A file for which no
-.Xr stat 2
-information was requested.
-The contents of the
-.Fa fts_statp
-field are undefined.
-.It Dv FTS_SL
-A symbolic link.
-.It Dv FTS_SLNONE
-A symbolic link with a non-existent target.
-The contents of the
-.Fa fts_statp
-field reference the file characteristic information for the symbolic link
-itself.
-.It Dv FTS_W
-A whiteout object.
-.El
-.It Fa fts_accpath
-A path for accessing the file from the current directory.
-.It Fa fts_path
-The path for the file relative to the root of the traversal.
-This path contains the path specified to
-.Fn fts_open
-as a prefix.
-.It Fa fts_pathlen
-The length of the string referenced by
-.Fa fts_path .
-.It Fa fts_name
-The name of the file.
-.It Fa fts_namelen
-The length of the string referenced by
-.Fa fts_name .
-.It Fa fts_level
-The depth of the traversal, numbered from \-1 to N, where this file
-was found.
-The
-.Fa FTSENT
-structure representing the parent of the starting point (or root)
-of the traversal is numbered \-1, and the
-.Fa FTSENT
-structure for the root
-itself is numbered 0.
-.It Fa fts_errno
-Upon return of a
-.Fa FTSENT
-structure from the
-.Fn fts_children
-or
-.Fn fts_read
-functions, with its
-.Fa fts_info
-field set to
-.Dv FTS_DNR ,
-.Dv FTS_ERR
-or
-.Dv FTS_NS ,
-the
-.Fa fts_errno
-field contains the value of the external variable
-.Va errno
-specifying the cause of the error.
-Otherwise, the contents of the
-.Fa fts_errno
-field are undefined.
-.It Fa fts_number
-This field is provided for the use of the application program and is
-not modified by the
-.Nm
-functions.
-It is initialized to 0.
-.It Fa fts_pointer
-This field is provided for the use of the application program and is
-not modified by the
-.Nm
-functions.
-It is initialized to
-.Dv NULL .
-.It Fa fts_parent
-A pointer to the
-.Fa FTSENT
-structure referencing the file in the hierarchy
-immediately above the current file, i.e., the directory of which this
-file is a member.
-A parent structure for the initial entry point is provided as well,
-however, only the
-.Fa fts_level ,
-.Fa fts_number
-and
-.Fa fts_pointer
-fields are guaranteed to be initialized.
-.It Fa fts_link
-Upon return from the
-.Fn fts_children
-function, the
-.Fa fts_link
-field points to the next structure in the
-.Dv NULL Ns -terminated
-linked list of directory members.
-Otherwise, the contents of the
-.Fa fts_link
-field are undefined.
-.It Fa fts_cycle
-If a directory causes a cycle in the hierarchy (see
-.Dv FTS_DC ) ,
-either because
-of a hard link between two directories, or a symbolic link pointing to a
-directory, the
-.Fa fts_cycle
-field of the structure will point to the
-.Fa FTSENT
-structure in the hierarchy that references the same file as the current
-.Fa FTSENT
-structure.
-Otherwise, the contents of the
-.Fa fts_cycle
-field are undefined.
-.It Fa fts_statp
-A pointer to
-.Xr stat 2
-information for the file.
-.El
-.Pp
-A single buffer is used for all of the paths of all of the files in the
-file hierarchy.
-Therefore, the
-.Fa fts_path
-and
-.Fa fts_accpath
-fields are guaranteed to be
-.Dv NUL Ns -terminated
-.Em only
-for the file most recently returned by
-.Fn fts_read .
-To use these fields to reference any files represented by other
-.Fa FTSENT
-structures will require that the path buffer be modified using the
-information contained in that
-.Fa FTSENT
-structure's
-.Fa fts_pathlen
-field.
-Any such modifications should be undone before further calls to
-.Fn fts_read
-are attempted.
-The
-.Fa fts_name
-field is always
-.Dv NUL Ns -terminated .
-.Sh FTS_OPEN
-The
-.Fn fts_open
-function takes a pointer to an array of character pointers naming one
-or more paths which make up a logical file hierarchy to be traversed.
-The array must be terminated by a
-.Dv NULL
-pointer.
-.Pp
-There are
-a number of options, at least one of which (either
-.Dv FTS_LOGICAL
-or
-.Dv FTS_PHYSICAL )
-must be specified.
-The options are selected by
-.Em or Ns 'ing
-the following values:
-.Bl -tag -width "FTS_COMFOLLOW "
-.It Dv FTS_COMFOLLOW
-This option causes any symbolic link specified as a root path to be
-followed immediately whether or not
-.Dv FTS_LOGICAL
-is also specified.
-.It Dv FTS_LOGICAL
-This option causes the
-.Nm
-routines to return
-.Fa FTSENT
-structures for the targets of symbolic links
-instead of the symbolic links themselves.
-If this option is set, the only symbolic links for which
-.Fa FTSENT
-structures
-are returned to the application are those referencing non-existent files.
-Either
-.Dv FTS_LOGICAL
-or
-.Dv FTS_PHYSICAL
-.Em must
-be provided to the
-.Fn fts_open
-function.
-.It Dv FTS_NOCHDIR
-As a performance optimization, the
-.Nm
-functions change directories as they walk the file hierarchy.
-This has the side-effect that an application cannot rely on being
-in any particular directory during the traversal.
-The
-.Dv FTS_NOCHDIR
-option turns off this optimization, and the
-.Nm
-functions will not change the current directory.
-Note that applications should not themselves change their current directory
-and try to access files unless
-.Dv FTS_NOCHDIR
-is specified and absolute
-pathnames were provided as arguments to
-.Fn fts_open .
-.It Dv FTS_NOSTAT
-By default, returned
-.Fa FTSENT
-structures reference file characteristic information (the
-.Fa statp
-field) for each file visited.
-This option relaxes that requirement as a performance optimization,
-allowing the
-.Nm
-functions to set the
-.Fa fts_info
-field to
-.Dv FTS_NSOK
-and leave the contents of the
-.Fa statp
-field undefined.
-.It Dv FTS_PHYSICAL
-This option causes the
-.Nm
-routines to return
-.Fa FTSENT
-structures for symbolic links themselves instead
-of the target files they point to.
-If this option is set,
-.Fa FTSENT
-structures for all symbolic links in the
-hierarchy are returned to the application.
-Either
-.Dv FTS_LOGICAL
-or
-.Dv FTS_PHYSICAL
-.Em must
-be provided to the
-.Fn fts_open
-function.
-.It Dv FTS_SEEDOT
-By default, unless they are specified as path arguments to
-.Fn fts_open ,
-any files named
-.Ql \&.
-or
-.Ql ..
-encountered in the file hierarchy are ignored.
-This option causes the
-.Nm
-routines to return
-.Fa FTSENT
-structures for them.
-.It Dv FTS_WHITEOUT
-Return whiteout entries, which are normally hidden.
-.It Dv FTS_XDEV
-This option prevents
-.Nm
-from descending into directories that have a different device number
-than the file from which the descent began.
-.El
-.Pp
-The argument
-.Fn compar
-specifies a user-defined function which may be used to order the traversal
-of the hierarchy.
-It
-takes two pointers to pointers to
-.Fa FTSENT
-structures as arguments and
-should return a negative value, zero, or a positive value to indicate
-if the file referenced by its first argument comes before, in any order
-with respect to, or after, the file referenced by its second argument.
-The
-.Fa fts_accpath ,
-.Fa fts_path
-and
-.Fa fts_pathlen
-fields of the
-.Fa FTSENT
-structures may
-.Em never
-be used in this comparison.
-If the
-.Fa fts_info
-field is set to
-.Dv FTS_NS
-or
-.Dv FTS_NSOK ,
-the
-.Fa fts_statp
-field may not either.
-If the
-.Fn compar
-argument is
-.Dv NULL ,
-the directory traversal order is in the order listed in
-.Fa path_argv
-for the root paths, and in the order listed in the directory for
-everything else.
-.Sh FTS_READ
-The
-.Fn fts_read
-function returns a pointer to an
-.Fa FTSENT
-structure describing a file in
-the hierarchy.
-Directories (that are readable and do not cause cycles) are visited at
-least twice, once in pre-order and once in post-order.
-All other files are visited at least once.
-(Hard links between directories that do not cause cycles or symbolic
-links to symbolic links may cause files to be visited more than once,
-or directories more than twice.)
-.Pp
-If all the members of the hierarchy have been returned,
-.Fn fts_read
-returns
-.Dv NULL
-and sets the external variable
-.Va errno
-to 0.
-If an error unrelated to a file in the hierarchy occurs,
-.Fn fts_read
-returns
-.Dv NULL
-and sets
-.Va errno
-appropriately.
-If an error related to a returned file occurs, a pointer to an
-.Fa FTSENT
-structure is returned, and
-.Va errno
-may or may not have been set (see
-.Fa fts_info ) .
-.Pp
-The
-.Fa FTSENT
-structures returned by
-.Fn fts_read
-may be overwritten after a call to
-.Fn fts_close
-on the same file hierarchy stream, or, after a call to
-.Fn fts_read
-on the same file hierarchy stream unless they represent a file of type
-directory, in which case they will not be overwritten until after a call to
-.Fn fts_read
-after the
-.Fa FTSENT
-structure has been returned by the function
-.Fn fts_read
-in post-order.
-.Sh FTS_CHILDREN
-The
-.Fn fts_children
-function returns a pointer to an
-.Fa FTSENT
-structure describing the first entry in a
-.Dv NULL Ns -terminated
-linked list of the files in the directory represented by the
-.Fa FTSENT
-structure most recently returned by
-.Fn fts_read .
-The list is linked through the
-.Fa fts_link
-field of the
-.Fa FTSENT
-structure, and is ordered by the user-specified comparison function, if any.
-Repeated calls to
-.Fn fts_children
-will recreate this linked list.
-.Pp
-As a special case, if
-.Fn fts_read
-has not yet been called for a hierarchy,
-.Fn fts_children
-will return a pointer to the files in the logical directory specified to
-.Fn fts_open ,
-i.e., the arguments specified to
-.Fn fts_open .
-Otherwise, if the
-.Fa FTSENT
-structure most recently returned by
-.Fn fts_read
-is not a directory being visited in pre-order,
-or the directory does not contain any files,
-.Fn fts_children
-returns
-.Dv NULL
-and sets
-.Va errno
-to zero.
-If an error occurs,
-.Fn fts_children
-returns
-.Dv NULL
-and sets
-.Va errno
-appropriately.
-.Pp
-The
-.Fa FTSENT
-structures returned by
-.Fn fts_children
-may be overwritten after a call to
-.Fn fts_children ,
-.Fn fts_close
-or
-.Fn fts_read
-on the same file hierarchy stream.
-.Pp
-.Em Option
-may be set to the following value:
-.Bl -tag -width "FTS_COMFOLLOW "
-.It Dv FTS_NAMEONLY
-Only the names of the files are needed.
-The contents of all the fields in the returned linked list of structures
-are undefined with the exception of the
-.Fa fts_name
-and
-.Fa fts_namelen
-fields.
-.El
-.Sh FTS_SET
-The function
-.Fn fts_set
-allows the user application to determine further processing for the
-file
-.Fa f
-of the stream
-.Fa ftsp .
-The
-.Fn fts_set
-function
-returns 0 on success, and \-1 if an error occurs.
-.Em Option
-must be set to one of the following values:
-.Bl -tag -width "FTS_COMFOLLOW "
-.It Dv FTS_AGAIN
-Re-visit the file; any file type may be re-visited.
-The next call to
-.Fn fts_read
-will return the referenced file.
-The
-.Fa fts_stat
-and
-.Fa fts_info
-fields of the structure will be reinitialized at that time,
-but no other fields will have been changed.
-This option is meaningful only for the most recently returned
-file from
-.Fn fts_read .
-Normal use is for post-order directory visits, where it causes the
-directory to be re-visited (in both pre and post-order) as well as all
-of its descendants.
-.It Dv FTS_FOLLOW
-The referenced file must be a symbolic link.
-If the referenced file is the one most recently returned by
-.Fn fts_read ,
-the next call to
-.Fn fts_read
-returns the file with the
-.Fa fts_info
-and
-.Fa fts_statp
-fields reinitialized to reflect the target of the symbolic link instead
-of the symbolic link itself.
-If the file is one of those most recently returned by
-.Fn fts_children ,
-the
-.Fa fts_info
-and
-.Fa fts_statp
-fields of the structure, when returned by
-.Fn fts_read ,
-will reflect the target of the symbolic link instead of the symbolic link
-itself.
-In either case, if the target of the symbolic link does not exist the
-fields of the returned structure will be unchanged and the
-.Fa fts_info
-field will be set to
-.Dv FTS_SLNONE .
-.Pp
-If the target of the link is a directory, the pre-order return, followed
-by the return of all of its descendants, followed by a post-order return,
-is done.
-.It Dv FTS_SKIP
-No descendants of this file are visited.
-The file may be one of those most recently returned by either
-.Fn fts_children
-or
-.Fn fts_read .
-.El
-.Sh FTS_CLOSE
-The
-.Fn fts_close
-function closes a file hierarchy stream
-.Fa ftsp
-and restores the current directory to the directory from which
-.Fn fts_open
-was called to open
-.Fa ftsp .
-The
-.Fn fts_close
-function
-returns 0 on success, and \-1 if an error occurs.
-.Sh ERRORS
-The function
-.Fn fts_open
-may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr open 2
-and
-.Xr malloc 3 .
-.Pp
-The function
-.Fn fts_close
-may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr chdir 2
-and
-.Xr close 2 .
-.Pp
-The functions
-.Fn fts_read
-and
-.Fn fts_children
-may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr chdir 2 ,
-.Xr malloc 3 ,
-.Xr opendir 3 ,
-.Xr readdir 3
-and
-.Xr stat 2 .
-.Pp
-In addition,
-.Fn fts_children ,
-.Fn fts_open
-and
-.Fn fts_set
-may fail and set
-.Va errno
-as follows:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The options were invalid.
-.El
-.Sh SEE ALSO
-.Xr find 1 ,
-.Xr chdir 2 ,
-.Xr stat 2 ,
-.Xr qsort 3 ,
-.Xr symlink 7
-.Sh STANDARDS
-The
-.Nm
-utility was expected to be included in the
-.St -p1003.1-88
-revision.
-But twenty years later, it still was not included in the
-.St -p1003.1-2008
-revision.
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
deleted file mode 100644
index 256b4baa9..000000000
--- a/lib/libc/gen/fts.c
+++ /dev/null
@@ -1,1268 +0,0 @@
-/*	$NetBSD: fts.c,v 1.48 2015/01/29 15:55:21 manu Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
-#else
-__RCSID("$NetBSD: fts.c,v 1.48 2015/01/29 15:55:21 manu Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <fts.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#if ! HAVE_NBTOOL_CONFIG_H
-#define	HAVE_STRUCT_DIRENT_D_NAMLEN
-#endif
-
-static FTSENT	*fts_alloc(FTS *, const char *, size_t);
-static FTSENT	*fts_build(FTS *, int);
-static void	 fts_free(FTSENT *);
-static void	 fts_lfree(FTSENT *);
-static void	 fts_load(FTS *, FTSENT *);
-static size_t	 fts_maxarglen(char * const *);
-static size_t	 fts_pow2(size_t);
-static int	 fts_palloc(FTS *, size_t);
-static void	 fts_padjust(FTS *, FTSENT *);
-static FTSENT	*fts_sort(FTS *, FTSENT *, size_t);
-static unsigned short fts_stat(FTS *, FTSENT *, int);
-static int	 fts_safe_changedir(const FTS *, const FTSENT *, int,
-    const char *);
-
-#if defined(ALIGNBYTES) && defined(ALIGN)
-#define	FTS_ALLOC_ALIGNED	1
-#else
-#undef	FTS_ALLOC_ALIGNED
-#endif
-
-#ifndef ftsent_namelen_truncate
-#define ftsent_namelen_truncate(a)	\
-    ((a) > UINT_MAX ? UINT_MAX : (unsigned int)(a))
-#endif
-#ifndef ftsent_pathlen_truncate
-#define ftsent_pathlen_truncate(a) \
-    ((a) > UINT_MAX ? UINT_MAX : (unsigned int)(a))
-#endif
-#ifndef fts_pathlen_truncate
-#define fts_pathlen_truncate(a)	\
-    ((a) > UINT_MAX ? UINT_MAX : (unsigned int)(a))
-#endif
-#ifndef fts_nitems_truncate
-#define fts_nitems_truncate(a) \
-    ((a) > UINT_MAX ? UINT_MAX : (unsigned int)(a))
-#endif
-
-#define	ISDOT(a)	(a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
-
-#define	CLR(opt)	(sp->fts_options &= ~(opt))
-#define	ISSET(opt)	(sp->fts_options & (opt))
-#define	SET(opt)	(sp->fts_options |= (opt))
-
-#define	CHDIR(sp, path)	(!ISSET(FTS_NOCHDIR) && chdir(path))
-#define	FCHDIR(sp, fd)	(!ISSET(FTS_NOCHDIR) && fchdir(fd))
-
-/* fts_build flags */
-#define	BCHILD		1		/* fts_children */
-#define	BNAMES		2		/* fts_children, names only */
-#define	BREAD		3		/* fts_read */
-
-#ifndef DTF_HIDEW
-#undef FTS_WHITEOUT
-#endif
-
-FTS *
-fts_open(char * const *argv, int options,
-    int (*compar)(const FTSENT **, const FTSENT **))
-{
-	FTS *sp;
-	FTSENT *p, *root;
-	size_t nitems;
-	FTSENT *parent, *tmp = NULL;	/* pacify gcc */
-	size_t len;
-
-	_DIAGASSERT(argv != NULL);
-
-	/* Options check. */
-	if (options & ~FTS_OPTIONMASK) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/* Allocate/initialize the stream */
-	if ((sp = malloc(sizeof(FTS))) == NULL)
-		return (NULL);
-	memset(sp, 0, sizeof(FTS));
-	sp->fts_compar = compar;
-	sp->fts_options = options;
-
-	/* Logical walks turn on NOCHDIR; symbolic links are too hard. */
-	if (ISSET(FTS_LOGICAL))
-		SET(FTS_NOCHDIR);
-
-	/*
-	 * Start out with 1K of path space, and enough, in any case,
-	 * to hold the user's paths.
-	 */
-	if (fts_palloc(sp, MAX(fts_maxarglen(argv), MAXPATHLEN)))
-		goto mem1;
-
-	/* Allocate/initialize root's parent. */
-	if ((parent = fts_alloc(sp, "", 0)) == NULL)
-		goto mem2;
-	parent->fts_level = FTS_ROOTPARENTLEVEL;
-
-	/* Allocate/initialize root(s). */
-	for (root = NULL, nitems = 0; *argv; ++argv, ++nitems) {
-		/* Don't allow zero-length paths. */
-		if ((len = strlen(*argv)) == 0) {
-			errno = ENOENT;
-			goto mem3;
-		}
-
-		if ((p = fts_alloc(sp, *argv, len)) == NULL)
-			goto mem3;
-		p->fts_level = FTS_ROOTLEVEL;
-		p->fts_parent = parent;
-		p->fts_accpath = p->fts_name;
-		p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW));
-
-		/* Command-line "." and ".." are real directories. */
-		if (p->fts_info == FTS_DOT)
-			p->fts_info = FTS_D;
-
-		/*
-		 * If comparison routine supplied, traverse in sorted
-		 * order; otherwise traverse in the order specified.
-		 */
-		if (compar) {
-			p->fts_link = root;
-			root = p;
-		} else {
-			p->fts_link = NULL;
-			if (root == NULL)
-				tmp = root = p;
-			else {
-				tmp->fts_link = p;
-				tmp = p;
-			}
-		}
-	}
-	if (compar && nitems > 1)
-		root = fts_sort(sp, root, nitems);
-
-	/*
-	 * Allocate a dummy pointer and make fts_read think that we've just
-	 * finished the node before the root(s); set p->fts_info to FTS_INIT
-	 * so that everything about the "current" node is ignored.
-	 */
-	if ((sp->fts_cur = fts_alloc(sp, "", 0)) == NULL)
-		goto mem3;
-	sp->fts_cur->fts_link = root;
-	sp->fts_cur->fts_info = FTS_INIT;
-
-	/*
-	 * If using chdir(2), grab a file descriptor pointing to dot to ensure
-	 * that we can get back here; this could be avoided for some paths,
-	 * but almost certainly not worth the effort.  Slashes, symbolic links,
-	 * and ".." are all fairly nasty problems.  Note, if we can't get the
-	 * descriptor we run anyway, just more slowly.
-	 */
-#ifndef O_CLOEXEC
-#define O_CLOEXEC 0
-#endif
-	if (!ISSET(FTS_NOCHDIR)) {
-		if ((sp->fts_rfd = open(".", O_RDONLY | O_CLOEXEC, 0)) == -1)
-			SET(FTS_NOCHDIR);
-	}
-
-	if (nitems == 0)
-		fts_free(parent);
-
-	return (sp);
-
-mem3:	fts_lfree(root);
-	fts_free(parent);
-mem2:	free(sp->fts_path);
-mem1:	free(sp);
-	return (NULL);
-}
-
-static void
-fts_load(FTS *sp, FTSENT *p)
-{
-	size_t len;
-	char *cp;
-
-	_DIAGASSERT(sp != NULL);
-	_DIAGASSERT(p != NULL);
-
-	/*
-	 * Load the stream structure for the next traversal.  Since we don't
-	 * actually enter the directory until after the preorder visit, set
-	 * the fts_accpath field specially so the chdir gets done to the right
-	 * place and the user can access the first node.  From fts_open it's
-	 * known that the path will fit.
-	 */
-	len = p->fts_pathlen = p->fts_namelen;
-	memmove(sp->fts_path, p->fts_name, len + 1);
-	if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) {
-		len = strlen(++cp);
-		memmove(p->fts_name, cp, len + 1);
-		p->fts_namelen = ftsent_namelen_truncate(len);
-	}
-	p->fts_accpath = p->fts_path = sp->fts_path;
-	sp->fts_dev = p->fts_dev;
-}
-
-int
-fts_close(FTS *sp)
-{
-	FTSENT *freep, *p;
-	int saved_errno = 0;
-
-	_DIAGASSERT(sp != NULL);
-
-	/*
-	 * This still works if we haven't read anything -- the dummy structure
-	 * points to the root list, so we step through to the end of the root
-	 * list which has a valid parent pointer.
-	 */
-	if (sp->fts_cur) {
-		if (sp->fts_cur->fts_flags & FTS_SYMFOLLOW)
-			(void)close(sp->fts_cur->fts_symfd);
-		for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) {
-			freep = p;
-			p = p->fts_link ? p->fts_link : p->fts_parent;
-			fts_free(freep);
-		}
-		fts_free(p);
-	}
-
-	/* Free up child linked list, sort array, path buffer. */
-	if (sp->fts_child)
-		fts_lfree(sp->fts_child);
-	if (sp->fts_array)
-		free(sp->fts_array);
-	free(sp->fts_path);
-
-	/* Return to original directory, save errno if necessary. */
-	if (!ISSET(FTS_NOCHDIR)) {
-		if (fchdir(sp->fts_rfd) == -1)
-			saved_errno = errno;
-		(void)close(sp->fts_rfd);
-	}
-
-	/* Free up the stream pointer. */
-	free(sp);
-	if (saved_errno) {
-		errno = saved_errno;
-		return -1;
-	}
-
-	return 0;
-}
-
-#if !defined(__FTS_COMPAT_TAILINGSLASH)
-
-/*
- * Special case of "/" at the end of the path so that slashes aren't
- * appended which would cause paths to be written as "....//foo".
- */
-#define	NAPPEND(p)							\
-	(p->fts_path[p->fts_pathlen - 1] == '/'				\
-	    ? p->fts_pathlen - 1 : p->fts_pathlen)
-
-#else /* !defined(__FTS_COMPAT_TAILINGSLASH) */
-
-/*
- * compatibility with the old behaviour.
- *
- * Special case a root of "/" so that slashes aren't appended which would
- * cause paths to be written as "//foo".
- */
-
-#define	NAPPEND(p)							\
-	(p->fts_level == FTS_ROOTLEVEL && p->fts_pathlen == 1 &&	\
-	    p->fts_path[0] == '/' ? 0 : p->fts_pathlen)
-
-#endif /* !defined(__FTS_COMPAT_TAILINGSLASH) */
-
-FTSENT *
-fts_read(FTS *sp)
-{
-	FTSENT *p, *tmp;
-	int instr;
-	char *t;
-	int saved_errno;
-
-	_DIAGASSERT(sp != NULL);
-
-	/* If finished or unrecoverable error, return NULL. */
-	if (sp->fts_cur == NULL || ISSET(FTS_STOP))
-		return (NULL);
-
-	/* Set current node pointer. */
-	p = sp->fts_cur;
-
-	/* Save and zero out user instructions. */
-	instr = p->fts_instr;
-	p->fts_instr = FTS_NOINSTR;
-
-	/* Any type of file may be re-visited; re-stat and re-turn. */
-	if (instr == FTS_AGAIN) {
-		p->fts_info = fts_stat(sp, p, 0);
-		return (p);
-	}
-
-	/*
-	 * Following a symlink -- SLNONE test allows application to see
-	 * SLNONE and recover.  If indirecting through a symlink, have
-	 * keep a pointer to current location.  If unable to get that
-	 * pointer, follow fails.
-	 */
-	if (instr == FTS_FOLLOW &&
-	    (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) {
-		p->fts_info = fts_stat(sp, p, 1);
-		if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
-			if ((p->fts_symfd = open(".", O_RDONLY | O_CLOEXEC, 0))
-			    == -1) {
-				p->fts_errno = errno;
-				p->fts_info = FTS_ERR;
-			} else
-				p->fts_flags |= FTS_SYMFOLLOW;
-		}
-		return (p);
-	}
-
-	/* Directory in pre-order. */
-	if (p->fts_info == FTS_D) {
-		/* If skipped or crossed mount point, do post-order visit. */
-		if (instr == FTS_SKIP ||
-		    (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) {
-			if (p->fts_flags & FTS_SYMFOLLOW)
-				(void)close(p->fts_symfd);
-			if (sp->fts_child) {
-				fts_lfree(sp->fts_child);
-				sp->fts_child = NULL;
-			}
-			p->fts_info = FTS_DP;
-			return (p);
-		}
-
-		/* Rebuild if only read the names and now traversing. */
-		if (sp->fts_child && ISSET(FTS_NAMEONLY)) {
-			CLR(FTS_NAMEONLY);
-			fts_lfree(sp->fts_child);
-			sp->fts_child = NULL;
-		}
-
-		/*
-		 * Cd to the subdirectory.
-		 *
-		 * If have already read and now fail to chdir, whack the list
-		 * to make the names come out right, and set the parent errno
-		 * so the application will eventually get an error condition.
-		 * Set the FTS_DONTCHDIR flag so that when we logically change
-		 * directories back to the parent we don't do a chdir.
-		 *
-		 * If haven't read do so.  If the read fails, fts_build sets
-		 * FTS_STOP or the fts_info field of the node.
-		 */
-		if (sp->fts_child) {
-			if (fts_safe_changedir(sp, p, -1, p->fts_accpath)) {
-				p->fts_errno = errno;
-				p->fts_flags |= FTS_DONTCHDIR;
-				for (p = sp->fts_child; p; p = p->fts_link)
-					p->fts_accpath =
-					    p->fts_parent->fts_accpath;
-			}
-		} else if ((sp->fts_child = fts_build(sp, BREAD)) == NULL) {
-			if (ISSET(FTS_STOP))
-				return (NULL);
-			return (p);
-		}
-		p = sp->fts_child;
-		sp->fts_child = NULL;
-		goto name;
-	}
-
-next:	
-	/* Move to the next node on this level. */
-	tmp = p;
-
-	/* 
-	 * We are going to free sp->fts_cur, set it to NULL so 
-	 * that fts_close() does not attempt to free it again 
-	 * if we exit without setting it to a new value because
-	 * FCHDIR() failed below.
-	 */
-	assert(tmp == sp->fts_cur);
-	sp->fts_cur = NULL;
-	
-	if ((p = p->fts_link) != NULL) {
-		fts_free(tmp);
-
-		/*
-		 * If reached the top, return to the original directory, and
-		 * load the paths for the next root.
-		 */
-		if (p->fts_level == FTS_ROOTLEVEL) {
-			if (FCHDIR(sp, sp->fts_rfd)) {
-				SET(FTS_STOP);
-				return (NULL);
-			}
-			fts_load(sp, p);
-			return (sp->fts_cur = p);
-		}
-
-		/*
-		 * User may have called fts_set on the node.  If skipped,
-		 * ignore.  If followed, get a file descriptor so we can
-		 * get back if necessary.
-		 */
-		if (p->fts_instr == FTS_SKIP)
-			goto next;
-		if (p->fts_instr == FTS_FOLLOW) {
-			p->fts_info = fts_stat(sp, p, 1);
-			if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
-				if ((p->fts_symfd =
-				    open(".", O_RDONLY | O_CLOEXEC, 0)) == -1) {
-					p->fts_errno = errno;
-					p->fts_info = FTS_ERR;
-				} else
-					p->fts_flags |= FTS_SYMFOLLOW;
-			}
-			p->fts_instr = FTS_NOINSTR;
-		}
-
-name:		t = sp->fts_path + NAPPEND(p->fts_parent);
-		*t++ = '/';
-		memmove(t, p->fts_name, (size_t)(p->fts_namelen + 1));
-		return (sp->fts_cur = p);
-	}
-
-	/* Move up to the parent node. */
-	p = tmp->fts_parent;
-	fts_free(tmp);
-
-	if (p->fts_level == FTS_ROOTPARENTLEVEL) {
-		/*
-		 * Done; free everything up and set errno to 0 so the user
-		 * can distinguish between error and EOF.
-		 */
-		fts_free(p);
-		errno = 0;
-		return (sp->fts_cur = NULL);
-	}
-
-	/* NUL terminate the pathname. */
-	sp->fts_path[p->fts_pathlen] = '\0';
-
-	/*
-	 * Return to the parent directory.  If at a root node or came through
-	 * a symlink, go back through the file descriptor.  Otherwise, cd up
-	 * one directory.
-	 */
-	if (p->fts_level == FTS_ROOTLEVEL) {
-		if (FCHDIR(sp, sp->fts_rfd)) {
-			SET(FTS_STOP);
-			return (NULL);
-		}
-	} else if (p->fts_flags & FTS_SYMFOLLOW) {
-		if (FCHDIR(sp, p->fts_symfd)) {
-			saved_errno = errno;
-			(void)close(p->fts_symfd);
-			errno = saved_errno;
-			SET(FTS_STOP);
-			return (NULL);
-		}
-		(void)close(p->fts_symfd);
-	} else if (!(p->fts_flags & FTS_DONTCHDIR) &&
-	    fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
-		SET(FTS_STOP);
-		return (NULL);
-	}
-	p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
-	return (sp->fts_cur = p);
-}
-
-/*
- * Fts_set takes the stream as an argument although it's not used in this
- * implementation; it would be necessary if anyone wanted to add global
- * semantics to fts using fts_set.  An error return is allowed for similar
- * reasons.
- */
-/* ARGSUSED */
-int
-fts_set(FTS *sp, FTSENT *p, int instr)
-{
-
-	_DIAGASSERT(sp != NULL);
-	_DIAGASSERT(p != NULL);
-
-	if (instr && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
-	    instr != FTS_NOINSTR && instr != FTS_SKIP) {
-		errno = EINVAL;
-		return (1);
-	}
-	p->fts_instr = instr;
-	return (0);
-}
-
-FTSENT *
-fts_children(FTS *sp, int instr)
-{
-	FTSENT *p;
-	int fd;
-
-	_DIAGASSERT(sp != NULL);
-
-	if (instr && instr != FTS_NAMEONLY) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/* Set current node pointer. */
-	p = sp->fts_cur;
-
-	/*
-	 * Errno set to 0 so user can distinguish empty directory from
-	 * an error.
-	 */
-	errno = 0;
-
-	/* Fatal errors stop here. */
-	if (ISSET(FTS_STOP))
-		return (NULL);
-
-	/* Return logical hierarchy of user's arguments. */
-	if (p->fts_info == FTS_INIT)
-		return (p->fts_link);
-
-	/*
-	 * If not a directory being visited in pre-order, stop here.  Could
-	 * allow FTS_DNR, assuming the user has fixed the problem, but the
-	 * same effect is available with FTS_AGAIN.
-	 */
-	if (p->fts_info != FTS_D /* && p->fts_info != FTS_DNR */)
-		return (NULL);
-
-	/* Free up any previous child list. */
-	if (sp->fts_child)
-		fts_lfree(sp->fts_child);
-
-	if (instr == FTS_NAMEONLY) {
-		SET(FTS_NAMEONLY);
-		instr = BNAMES;
-	} else
-		instr = BCHILD;
-
-	/*
-	 * If using chdir on a relative path and called BEFORE fts_read does
-	 * its chdir to the root of a traversal, we can lose -- we need to
-	 * chdir into the subdirectory, and we don't know where the current
-	 * directory is, so we can't get back so that the upcoming chdir by
-	 * fts_read will work.
-	 */
-	if (p->fts_level != FTS_ROOTLEVEL || p->fts_accpath[0] == '/' ||
-	    ISSET(FTS_NOCHDIR))
-		return (sp->fts_child = fts_build(sp, instr));
-
-	if ((fd = open(".", O_RDONLY | O_CLOEXEC, 0)) == -1)
-		return (sp->fts_child = NULL);
-	sp->fts_child = fts_build(sp, instr);
-	if (fchdir(fd)) {
-		(void)close(fd);
-		return (NULL);
-	}
-	(void)close(fd);
-	return (sp->fts_child);
-}
-
-/*
- * This is the tricky part -- do not casually change *anything* in here.  The
- * idea is to build the linked list of entries that are used by fts_children
- * and fts_read.  There are lots of special cases.
- *
- * The real slowdown in walking the tree is the stat calls.  If FTS_NOSTAT is
- * set and it's a physical walk (so that symbolic links can't be directories),
- * we can do things quickly.  First, if it's a 4.4BSD file system, the type
- * of the file is in the directory entry.  Otherwise, we assume that the number
- * of subdirectories in a node is equal to the number of links to the parent.
- * The former skips all stat calls.  The latter skips stat calls in any leaf
- * directories and for any files after the subdirectories in the directory have
- * been found, cutting the stat calls by about 2/3.
- */
-static FTSENT *
-fts_build(FTS *sp, int type)
-{
-	struct dirent *dp;
-	FTSENT *p, *head;
-	size_t nitems;
-	FTSENT *cur, *tail;
-	DIR *dirp;
-	void *oldaddr;
-	size_t dnamlen;
-	int cderrno, descend, level, nlinks, saved_errno, nostat, doadjust;
-	size_t len, maxlen;
-#ifdef FTS_WHITEOUT
-	int oflag;
-#endif
-	char *cp = NULL;	/* pacify gcc */
-
-	_DIAGASSERT(sp != NULL);
-
-	/* Set current node pointer. */
-	cur = sp->fts_cur;
-
-	/*
-	 * Open the directory for reading.  If this fails, we're done.
-	 * If being called from fts_read, set the fts_info field.
-	 */
-#ifdef FTS_WHITEOUT
-	if (ISSET(FTS_WHITEOUT))
-		oflag = DTF_NODUP|DTF_REWIND;
-	else
-		oflag = DTF_HIDEW|DTF_NODUP|DTF_REWIND;
-#else
-#define	__opendir2(path, flag) opendir(path)
-#endif
-	if ((dirp = __opendir2(cur->fts_accpath, oflag)) == NULL) {
-		if (type == BREAD) {
-			cur->fts_info = FTS_DNR;
-			cur->fts_errno = errno;
-		}
-		return (NULL);
-	}
-
-	/*
-	 * Nlinks is the number of possible entries of type directory in the
-	 * directory if we're cheating on stat calls, 0 if we're not doing
-	 * any stat calls at all, -1 if we're doing stats on everything.
-	 */
-	if (type == BNAMES) {
-		nlinks = 0;
-		nostat = 1;
-	} else if (ISSET(FTS_NOSTAT) && ISSET(FTS_PHYSICAL)) {
-		nlinks = cur->fts_nlink - (ISSET(FTS_SEEDOT) ? 0 : 2);
-		nostat = 1;
-	} else {
-		nlinks = -1;
-		nostat = 0;
-	}
-
-#ifdef notdef
-	(void)printf("nlinks == %d (cur: %d)\n", nlinks, cur->fts_nlink);
-	(void)printf("NOSTAT %d PHYSICAL %d SEEDOT %d\n",
-	    ISSET(FTS_NOSTAT), ISSET(FTS_PHYSICAL), ISSET(FTS_SEEDOT));
-#endif
-	/*
-	 * If we're going to need to stat anything or we want to descend
-	 * and stay in the directory, chdir.  If this fails we keep going,
-	 * but set a flag so we don't chdir after the post-order visit.
-	 * We won't be able to stat anything, but we can still return the
-	 * names themselves.  Note, that since fts_read won't be able to
-	 * chdir into the directory, it will have to return different path
-	 * names than before, i.e. "a/b" instead of "b".  Since the node
-	 * has already been visited in pre-order, have to wait until the
-	 * post-order visit to return the error.  There is a special case
-	 * here, if there was nothing to stat then it's not an error to
-	 * not be able to stat.  This is all fairly nasty.  If a program
-	 * needed sorted entries or stat information, they had better be
-	 * checking FTS_NS on the returned nodes.
-	 */
-	cderrno = 0;
-	if (nlinks || type == BREAD) {
-		if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
-			if (nlinks && type == BREAD)
-				cur->fts_errno = errno;
-			cur->fts_flags |= FTS_DONTCHDIR;
-			descend = 0;
-			cderrno = errno;
-		} else
-			descend = 1;
-	} else
-		descend = 0;
-
-	/*
-	 * Figure out the max file name length that can be stored in the
-	 * current path -- the inner loop allocates more path as necessary.
-	 * We really wouldn't have to do the maxlen calculations here, we
-	 * could do them in fts_read before returning the path, but it's a
-	 * lot easier here since the length is part of the dirent structure.
-	 *
-	 * If not changing directories set a pointer so that can just append
-	 * each new name into the path.
-	 */
-	len = NAPPEND(cur);
-	if (ISSET(FTS_NOCHDIR)) {
-		cp = sp->fts_path + len;
-		*cp++ = '/';
-	}
-	len++;
-	maxlen = sp->fts_pathlen - len;
-
-#if defined(__FTS_COMPAT_LEVEL)
-	if (cur->fts_level == SHRT_MAX) {
-		(void)closedir(dirp);
-		cur->fts_info = FTS_ERR;
-		SET(FTS_STOP);
-		errno = ENAMETOOLONG;
-		return (NULL);
-	}
-#endif
-
-	level = cur->fts_level + 1;
-
-	/* Read the directory, attaching each entry to the `link' pointer. */
-	doadjust = 0;
-	for (head = tail = NULL, nitems = 0; (dp = readdir(dirp)) != NULL;) {
-
-		if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
-			continue;
-
-#if defined(HAVE_STRUCT_DIRENT_D_NAMLEN)
-		dnamlen = dp->d_namlen;
-#else
-		dnamlen = strlen(dp->d_name);
-#endif
-		if ((p = fts_alloc(sp, dp->d_name, dnamlen)) == NULL)
-			goto mem1;
-		if (dnamlen >= maxlen) {	/* include space for NUL */
-			oldaddr = sp->fts_path;
-			if (fts_palloc(sp, dnamlen + len + 1)) {
-				/*
-				 * No more memory for path or structures.  Save
-				 * errno, free up the current structure and the
-				 * structures already allocated.
-				 */
-mem1:				saved_errno = errno;
-				if (p)
-					fts_free(p);
-				fts_lfree(head);
-				(void)closedir(dirp);
-				errno = saved_errno;
-				cur->fts_info = FTS_ERR;
-				SET(FTS_STOP);
-				return (NULL);
-			}
-			/* Did realloc() change the pointer? */
-			if (oldaddr != sp->fts_path) {
-				doadjust = 1;
-				if (ISSET(FTS_NOCHDIR))
-					cp = sp->fts_path + len;
-			}
-			maxlen = sp->fts_pathlen - len;
-		}
-
-#if defined(__FTS_COMPAT_LENGTH)
-		if (len + dnamlen >= USHRT_MAX) {
-			/*
-			 * In an FTSENT, fts_pathlen is an unsigned short
-			 * so it is possible to wraparound here.
-			 * If we do, free up the current structure and the
-			 * structures already allocated, then error out
-			 * with ENAMETOOLONG.
-			 */
-			fts_free(p);
-			fts_lfree(head);
-			(void)closedir(dirp);
-			cur->fts_info = FTS_ERR;
-			SET(FTS_STOP);
-			errno = ENAMETOOLONG;
-			return (NULL);
-		}
-#endif
-		p->fts_level = level;
-		p->fts_pathlen = ftsent_pathlen_truncate(len + dnamlen);
-		p->fts_parent = sp->fts_cur;
-
-#ifdef FTS_WHITEOUT
-		if (dp->d_type == DT_WHT)
-			p->fts_flags |= FTS_ISW;
-#endif
-
-		if (cderrno) {
-			if (nlinks) {
-				p->fts_info = FTS_NS;
-				p->fts_errno = cderrno;
-			} else
-				p->fts_info = FTS_NSOK;
-			p->fts_accpath = cur->fts_accpath;
-		} else if (nlinks == 0
-#ifdef DT_DIR
-		    || (nostat &&
-		    dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
-#endif
-		    ) {
-			p->fts_accpath =
-			    ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name;
-			p->fts_info = FTS_NSOK;
-		} else {
-			/* Build a file name for fts_stat to stat. */
-			if (ISSET(FTS_NOCHDIR)) {
-				p->fts_accpath = p->fts_path;
-				memmove(cp, p->fts_name,
-				        (size_t)(p->fts_namelen + 1));
-			} else
-				p->fts_accpath = p->fts_name;
-			/* Stat it. */
-			p->fts_info = fts_stat(sp, p, 0);
-
-			/* Decrement link count if applicable. */
-			if (nlinks > 0 && (p->fts_info == FTS_D ||
-			    p->fts_info == FTS_DC || p->fts_info == FTS_DOT))
-				--nlinks;
-		}
-
-		/* We walk in directory order so "ls -f" doesn't get upset. */
-		p->fts_link = NULL;
-		if (head == NULL)
-			head = tail = p;
-		else {
-			tail->fts_link = p;
-			tail = p;
-		}
-		++nitems;
-	}
-	(void)closedir(dirp);
-
-	/*
-	 * If had to realloc the path, adjust the addresses for the rest
-	 * of the tree.
-	 */
-	if (doadjust)
-		fts_padjust(sp, head);
-
-	/*
-	 * If not changing directories, reset the path back to original
-	 * state.
-	 */
-	if (ISSET(FTS_NOCHDIR)) {
-		if (len == sp->fts_pathlen || nitems == 0)
-			--cp;
-		*cp = '\0';
-	}
-
-	/*
-	 * If descended after called from fts_children or after called from
-	 * fts_read and nothing found, get back.  At the root level we use
-	 * the saved fd; if one of fts_open()'s arguments is a relative path
-	 * to an empty directory, we wind up here with no other way back.  If
-	 * can't get back, we're done.
-	 */
-	if (descend && (type == BCHILD || !nitems) &&
-	    (cur->fts_level == FTS_ROOTLEVEL ?
-	    FCHDIR(sp, sp->fts_rfd) :
-	    fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
-		cur->fts_info = FTS_ERR;
-		SET(FTS_STOP);
-		return (NULL);
-	}
-
-	/* If didn't find anything, return NULL. */
-	if (!nitems) {
-		if (type == BREAD)
-			cur->fts_info = FTS_DP;
-		return (NULL);
-	}
-
-	/* Sort the entries. */
-	if (sp->fts_compar && nitems > 1)
-		head = fts_sort(sp, head, nitems);
-	return (head);
-}
-
-static unsigned short
-fts_stat(FTS *sp, FTSENT *p, int follow)
-{
-	FTSENT *t;
-	dev_t dev;
-	__fts_ino_t ino;
-	__fts_stat_t *sbp, sb;
-	int saved_errno;
-
-	_DIAGASSERT(sp != NULL);
-	_DIAGASSERT(p != NULL);
-
-	/* If user needs stat info, stat buffer already allocated. */
-	sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
-
-#ifdef FTS_WHITEOUT
-	/* check for whiteout */
-	if (p->fts_flags & FTS_ISW) {
-		if (sbp != &sb) {
-			memset(sbp, '\0', sizeof (*sbp));
-			sbp->st_mode = S_IFWHT;
-		}
-		return (FTS_W);
-	}
-#endif
-
-	/*
-	 * If doing a logical walk, or application requested FTS_FOLLOW, do
-	 * a stat(2).  If that fails, check for a non-existent symlink.  If
-	 * fail, set the errno from the stat call.
-	 */
-	if (ISSET(FTS_LOGICAL) || follow) {
-		if (stat(p->fts_accpath, sbp)) {
-			saved_errno = errno;
-			if (!lstat(p->fts_accpath, sbp)) {
-				errno = 0;
-				return (FTS_SLNONE);
-			}
-			p->fts_errno = saved_errno;
-			goto err;
-		}
-	} else if (lstat(p->fts_accpath, sbp)) {
-		p->fts_errno = errno;
-err:		memset(sbp, 0, sizeof(*sbp));
-		return (FTS_NS);
-	}
-
-	if (S_ISDIR(sbp->st_mode)) {
-		/*
-		 * Set the device/inode.  Used to find cycles and check for
-		 * crossing mount points.  Also remember the link count, used
-		 * in fts_build to limit the number of stat calls.  It is
-		 * understood that these fields are only referenced if fts_info
-		 * is set to FTS_D.
-		 */
-		dev = p->fts_dev = sbp->st_dev;
-		ino = p->fts_ino = sbp->st_ino;
-		p->fts_nlink = sbp->st_nlink;
-
-		if (ISDOT(p->fts_name))
-			return (FTS_DOT);
-
-		/*
-		 * Cycle detection is done by brute force when the directory
-		 * is first encountered.  If the tree gets deep enough or the
-		 * number of symbolic links to directories is high enough,
-		 * something faster might be worthwhile.
-		 */
-		for (t = p->fts_parent;
-		    t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent)
-			if (ino == t->fts_ino && dev == t->fts_dev) {
-				p->fts_cycle = t;
-				return (FTS_DC);
-			}
-		return (FTS_D);
-	}
-	if (S_ISLNK(sbp->st_mode))
-		return (FTS_SL);
-	if (S_ISREG(sbp->st_mode))
-		return (FTS_F);
-	return (FTS_DEFAULT);
-}
-
-static FTSENT *
-fts_sort(FTS *sp, FTSENT *head, size_t nitems)
-{
-	FTSENT **ap, *p;
-
-	_DIAGASSERT(sp != NULL);
-	_DIAGASSERT(head != NULL);
-
-	/*
-	 * Construct an array of pointers to the structures and call qsort(3).
-	 * Reassemble the array in the order returned by qsort.  If unable to
-	 * sort for memory reasons, return the directory entries in their
-	 * current order.  Allocate enough space for the current needs plus
-	 * 40 so don't realloc one entry at a time.
-	 */
-	if (nitems > sp->fts_nitems) {
-		FTSENT **new;
-
-		new = realloc(sp->fts_array, sizeof(FTSENT *) * (nitems + 40));
-		if (new == 0)
-			return (head);
-		sp->fts_array = new;
-		sp->fts_nitems = fts_nitems_truncate(nitems + 40);
-	}
-	for (ap = sp->fts_array, p = head; p; p = p->fts_link)
-		*ap++ = p;
-	qsort((void *)sp->fts_array, nitems, sizeof(FTSENT *),
-		(int (*)(const void *, const void *))sp->fts_compar);
-	for (head = *(ap = sp->fts_array); --nitems; ++ap)
-		ap[0]->fts_link = ap[1];
-	ap[0]->fts_link = NULL;
-	return (head);
-}
-
-static FTSENT *
-fts_alloc(FTS *sp, const char *name, size_t namelen)
-{
-	FTSENT *p;
-#if defined(FTS_ALLOC_ALIGNED)
-	size_t len;
-#endif
-
-	_DIAGASSERT(sp != NULL);
-	_DIAGASSERT(name != NULL);
-
-#if defined(FTS_ALLOC_ALIGNED)
-	/*
-	 * The file name is a variable length array and no stat structure is
-	 * necessary if the user has set the nostat bit.  Allocate the FTSENT
-	 * structure, the file name and the stat structure in one chunk, but
-	 * be careful that the stat structure is reasonably aligned.  Since the
-	 * fts_name field is declared to be of size 1, the fts_name pointer is
-	 * namelen + 2 before the first possible address of the stat structure.
-	 */
-	len = sizeof(FTSENT) + namelen;
-	if (!ISSET(FTS_NOSTAT))
-		len += sizeof(*(p->fts_statp)) + ALIGNBYTES;
-	if ((p = malloc(len)) == NULL)
-		return (NULL);
-
-	if (!ISSET(FTS_NOSTAT))
-		p->fts_statp = (__fts_stat_t *)ALIGN(
-		    (unsigned long)(p->fts_name + namelen + 2));
-#else
-	if ((p = malloc(sizeof(FTSENT) + namelen)) == NULL)
-		return (NULL);
-
-	if (!ISSET(FTS_NOSTAT))
-		if ((p->fts_statp = malloc(sizeof(*(p->fts_statp)))) == NULL) {
-			free(p);
-			return (NULL);
-		}
-#endif
-
-        if (ISSET(FTS_NOSTAT))
-                p->fts_statp = NULL;
-
-	/* Copy the name plus the trailing NULL. */
-	memmove(p->fts_name, name, namelen + 1);
-
-	p->fts_namelen = ftsent_namelen_truncate(namelen);
-	p->fts_path = sp->fts_path;
-	p->fts_errno = 0;
-	p->fts_flags = 0;
-	p->fts_instr = FTS_NOINSTR;
-	p->fts_number = 0;
-	p->fts_pointer = NULL;
-	return (p);
-}
-
-static void
-fts_free(FTSENT *p)
-{
-#if !defined(FTS_ALLOC_ALIGNED)
-	if (p->fts_statp)
-		free(p->fts_statp);
-#endif
-	free(p);
-}
-
-static void
-fts_lfree(FTSENT *head)
-{
-	FTSENT *p;
-
-	/* XXX: head may be NULL ? */
-
-	/* Free a linked list of structures. */
-	while ((p = head) != NULL) {
-		head = head->fts_link;
-		fts_free(p);
-	}
-}
-
-static size_t
-fts_pow2(size_t x)
-{
-
-	x--;
-	x |= x>>1;
-	x |= x>>2;
-	x |= x>>4;
-	x |= x>>8;
-	x |= x>>16;
-#if LONG_BIT > 32
-	x |= x>>32;
-#endif
-#if LONG_BIT > 64
-	x |= x>>64;
-#endif
-	x++;
-	return (x);
-}
-
-/*
- * Allow essentially unlimited paths; find, rm, ls should all work on any tree.
- * Most systems will allow creation of paths much longer than MAXPATHLEN, even
- * though the kernel won't resolve them.  Round up the new size to a power of 2,
- * so we don't realloc the path 2 bytes at a time.
- */
-static int
-fts_palloc(FTS *sp, size_t size)
-{
-	char *new;
-
-	_DIAGASSERT(sp != NULL);
-
-#ifdef __FTS_COMPAT_LENGTH
-	/* Protect against fts_pathlen overflow. */
-	if (size > USHRT_MAX + 1) {
-		errno = ENAMETOOLONG;
-		return (1);
-	}
-#endif
-	size = fts_pow2(size);
-	new = realloc(sp->fts_path, size);
-	if (new == 0)
-		return (1);
-	sp->fts_path = new;
-	sp->fts_pathlen = fts_pathlen_truncate(size);
-	return (0);
-}
-
-/*
- * When the path is realloc'd, have to fix all of the pointers in structures
- * already returned.
- */
-static void
-fts_padjust(FTS *sp, FTSENT *head)
-{
-	FTSENT *p;
-	char *addr;
-
-	_DIAGASSERT(sp != NULL);
-
-#define	ADJUST(p) do {							\
-	if ((p)->fts_accpath != (p)->fts_name)				\
-		(p)->fts_accpath =					\
-		    addr + ((p)->fts_accpath - (p)->fts_path);		\
-	(p)->fts_path = addr;						\
-} while (/*CONSTCOND*/0)
-
-	addr = sp->fts_path;
-
-	/* Adjust the current set of children. */
-	for (p = sp->fts_child; p; p = p->fts_link)
-		ADJUST(p);
-
-	/* Adjust the rest of the tree, including the current level. */
-	for (p = head; p->fts_level >= FTS_ROOTLEVEL;) {
-		ADJUST(p);
-		p = p->fts_link ? p->fts_link : p->fts_parent;
-	}
-}
-
-static size_t
-fts_maxarglen(char * const *argv)
-{
-	size_t len, max;
-
-	_DIAGASSERT(argv != NULL);
-
-	for (max = 0; *argv; ++argv)
-		if ((len = strlen(*argv)) > max)
-			max = len;
-	return (max + 1);
-}
-
-#if defined(__minix)
-#if ! HAVE_NBTOOL_CONFIG_H
-#include <minix/dmap.h>
-#else
-#define NONE_MAJOR 0
-#endif
-#endif /* defined(__minix) */
-
-/*
- * Change to dir specified by fd or p->fts_accpath without getting
- * tricked by someone changing the world out from underneath us.
- * Assumes p->fts_dev and p->fts_ino are filled in.
- */
-static int
-fts_safe_changedir(const FTS *sp, const FTSENT *p, int fd, const char *path)
-{
-	int oldfd = fd, ret = -1;
-	__fts_stat_t sb;
-
-	if (ISSET(FTS_NOCHDIR))
-		return 0;
-
-	if (oldfd < 0 && (fd = open(path, O_RDONLY | O_CLOEXEC)) == -1)
-		return -1;
-
-	if (fstat(fd, &sb) == -1)
-		goto bail;
-
-#if defined(__minix)
-	/*
-	 * Skip the safety check on file systems where inodes are not static.
-	 * On such file systems, a file may legitimately be assigned a new
-	 * inode number due to being deleted and regenerated while we are
-	 * running.  This behavior is not POSIX compliant, but necessary for
-	 * certain types of file systems.  Currently, we assume that this
-	 * applies to all (and only) file systems that are not device backed.
-	 * In the future, we may have to obtain an appropriate flag through
-	 * statvfs(3) instead.
-	 */
-	if ((sb.st_ino != p->fts_ino || sb.st_dev != p->fts_dev)
-		&& major(sb.st_dev) != NONE_MAJOR) {
-#else
-	if (sb.st_ino != p->fts_ino || sb.st_dev != p->fts_dev) {
-#endif /*  defined(__minix) */
-		errno = ENOENT;
-		goto bail;
-	}
-
-	ret = fchdir(fd);
-
-bail:
-	if (oldfd < 0) {
-		int save_errno = errno;
-		(void)close(fd);
-		errno = save_errno;
-	}
-	return ret;
-}
diff --git a/lib/libc/gen/ftw.3 b/lib/libc/gen/ftw.3
deleted file mode 100644
index 4343823ac..000000000
--- a/lib/libc/gen/ftw.3
+++ /dev/null
@@ -1,214 +0,0 @@
-.\"	$NetBSD: ftw.3,v 1.5 2010/04/30 04:39:16 jruoho Exp $
-.\"
-.\"	From OpenBSD: ftw.3,v 1.4 2003/10/30 18:52:58 jmc Exp
-.\"
-.\" Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
-.\"
-.\" 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.
-.\"
-.\" Sponsored in part by the Defense Advanced Research Projects
-.\" Agency (DARPA) and Air Force Research Laboratory, Air Force
-.\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
-.\"
-.Dd April 30, 2010
-.Dt FTW 3
-.Os
-.Sh NAME
-.Nm ftw, nftw
-.Nd traverse (walk) a file tree
-.Sh SYNOPSIS
-.In ftw.h
-.Ft int
-.Fo ftw
-.Fa "const char *path"
-.Fa "int (*fn)(const char *, const struct stat *, int)"
-.Fa "int maxfds"
-.Fc
-.Ft int
-.Fo nftw
-.Fa "const char *path"
-.Fa "int (*fn)(const\ char\ *, const\ struct\ stat\ *, int, struct\ FTW\ *)"
-.Fa "int maxfds"
-.Fa "int flags"
-.Fc
-.Sh DESCRIPTION
-.Bf -symbolic
-These functions are provided for compatibility with legacy code.
-New code should use the
-.Xr fts 3
-functions.
-.Ef
-.Pp
-The
-.Fn ftw
-and
-.Fn nftw
-functions traverse (walk) the directory hierarchy rooted in
-.Fa path .
-For each object in the hierarchy, these functions call the function
-pointed to by
-.Fa fn .
-The
-.Fn ftw
-function passes this function a pointer to a NUL-terminated string containing
-the name of the object, a pointer to a stat structure corresponding to the
-object, and an integer flag.
-The
-.Fn nftw
-function passes the aforementioned arguments plus a pointer to a
-.Dv FTW
-structure as defined by
-.In ftw.h
-(shown below):
-.Bd -literal
-struct FTW {
-    int base;	/* offset of basename into pathname */
-    int level;	/* directory depth relative to starting point */
-};
-.Ed
-.Pp
-Possible values for the flag passed to
-.Fa fn
-are:
-.Bl -tag -width FTW_DNR
-.It Dv FTW_F
-A regular file.
-.It Dv FTW_D
-A directory being visited in pre-order.
-.It Dv FTW_DNR
-A directory which cannot be read.
-The directory will not be descended into.
-.It Dv FTW_DP
-A directory being visited in post-order
-.Pq Fn nftw No only .
-.It Dv FTW_NS
-A file for which no
-.Xr stat 2
-information was available.
-The contents of the stat structure are undefined.
-.It Dv FTW_SL
-A symbolic link.
-.It Dv FTW_SLN
-A symbolic link with a non-existent target
-.Pq Fn nftw No only .
-.El
-.Pp
-The
-.Fn ftw
-function traverses the tree in pre-order.
-That is, it processes the directory before the directory's contents.
-.Pp
-The
-.Fa maxfds
-argument specifies the maximum number of file descriptors
-to keep open while traversing the tree.
-It has no effect in this implementation.
-.Pp
-The
-.Fn nftw
-function has an additional
-.Fa flags
-argument with the following possible values:
-.Bl -tag -width FTW_MOUNT
-.It Dv FTW_PHYS
-Physical walk, don't follow symbolic links.
-.It Dv FTW_MOUNT
-The walk will not cross a mount point.
-.It FTW_DEPTH
-Process directories in post-order.
-Contents of a directory are visited before the directory itself.
-By default,
-.Fn nftw
-traverses the tree in pre-order.
-.It FTW_CHDIR
-Change to a directory before reading it.
-By default,
-.Fn nftw
-will change its starting directory.
-The current working directory will be restored to its original value before
-.Fn nftw
-returns.
-.El
-.Sh RETURN VALUES
-If the tree was traversed successfully, the
-.Fn ftw
-and
-.Fn nftw
-functions return 0.
-If the function pointed to by
-.Fa fn
-returns a non-zero value,
-.Fn ftw
-and
-.Fn nftw
-will stop processing the tree and return the value from
-.Fa fn .
-Both functions return \-1 if an error is detected.
-.Sh ERRORS
-The
-.Fn ftw
-and
-.Fn nftw
-functions may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr close 2 ,
-.Xr open 2 ,
-.Xr stat 2 ,
-.Xr malloc 3 ,
-.Xr opendir 3 ,
-and
-.Xr readdir 3 .
-If the
-.Dv FGTW_CHDIR
-flag is set, the
-.Fn nftw
-function may fail and set
-.Va errno
-for any of the errors specified for
-.Xr chdir 2 .
-In addition, either function may fail and set
-.Va errno
-as follows:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa maxfds
-argument is less than 1 or greater than
-.Dv OPEN_MAX .
-.El
-.Sh SEE ALSO
-.Xr chdir 2 ,
-.Xr close 2 ,
-.Xr open 2 ,
-.Xr stat 2 ,
-.Xr fts 3 ,
-.Xr malloc 3 ,
-.Xr opendir 3 ,
-.Xr readdir 3
-.Sh STANDARDS
-The
-.Fn ftw
-and
-.Fn nftw
-functions conform to
-.St -p1003.1-2001 .
-The
-.St -p1003.1-2008
-revision marked the function
-.Fn ftw
-as obsolete.
-.Sh BUGS
-The
-.Fa maxfds
-argument is currently ignored.
diff --git a/lib/libc/gen/ftw.c b/lib/libc/gen/ftw.c
deleted file mode 100644
index a7f6bbdb6..000000000
--- a/lib/libc/gen/ftw.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* $NetBSD: ftw.c,v 1.1 2005/12/30 23:07:32 agc Exp $ */
-
-/*	From OpenBSD: ftw.c,v 1.2 2003/07/21 21:15:32 millert Exp 	*/
-
-/*
- * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * 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.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: ftw.c,v 1.1 2005/12/30 23:07:32 agc Exp $");
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fts.h>
-#include <ftw.h>
-#include <limits.h>
-
-int
-ftw(const char *path, int (*fn)(const char *, const struct stat *, int),
-    int nfds)
-{
-	/* LINTED */
-	char * const paths[2] = { __UNCONST(path), NULL };
-	FTSENT *cur;
-	FTS *ftsp;
-	int fnflag, error, sverrno;
-
-	/* XXX - nfds is currently unused */
-	if (nfds < 1 || nfds > OPEN_MAX) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	ftsp = fts_open(paths, FTS_COMFOLLOW | FTS_NOCHDIR, NULL);
-	if (ftsp == NULL)
-		return (-1);
-	error = 0;
-	while ((cur = fts_read(ftsp)) != NULL) {
-		switch (cur->fts_info) {
-		case FTS_D:
-			fnflag = FTW_D;
-			break;
-		case FTS_DNR:
-			fnflag = FTW_DNR;
-			break;
-		case FTS_DP:
-			/* we only visit in preorder */
-			continue;
-		case FTS_F:
-		case FTS_DEFAULT:
-			fnflag = FTW_F;
-			break;
-		case FTS_NS:
-		case FTS_NSOK:
-		case FTS_SLNONE:
-			fnflag = FTW_NS;
-			break;
-		case FTS_SL:
-			fnflag = FTW_SL;
-			break;
-		case FTS_DC:
-			errno = ELOOP;
-			/* FALLTHROUGH */
-		default:
-			error = -1;
-			goto done;
-		}
-		error = fn(cur->fts_path, cur->fts_statp, fnflag);
-		if (error != 0)
-			break;
-	}
-done:
-	sverrno = errno;
-	if (fts_close(ftsp) != 0 && error == 0)
-		error = -1;
-	else
-		errno = sverrno;
-	return (error);
-}
diff --git a/lib/libc/gen/getbsize.3 b/lib/libc/gen/getbsize.3
deleted file mode 100644
index b3c100208..000000000
--- a/lib/libc/gen/getbsize.3
+++ /dev/null
@@ -1,90 +0,0 @@
-.\"	$NetBSD: getbsize.3,v 1.9 2003/08/07 16:42:48 agc Exp $
-.\"
-.\" 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.
-.\"
-.\"     @(#)getbsize.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd May 30, 2003
-.Dt GETBSIZE 3
-.Os
-.Sh NAME
-.Nm getbsize
-.Nd get user block size
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft char *
-.Fn getbsize "int *headerlenp" "long *blocksizep"
-.Sh DESCRIPTION
-The
-.Nm getbsize
-function determines the user's preferred block size based on the value of the
-.Dq BLOCKSIZE
-environment variable; see
-.Xr environ 7
-for details on its use and format.
-.Pp
-The
-.Nm getbsize
-function returns a pointer to a
-.Dv NUL
-terminated string describing
-the block size, something like
-.Dq 1K-blocks .
-If the
-.Fa headerlenp
-parameter is not
-.Dv NULL
-the memory referenced by
-.Fa headerlenp
-is filled in with the length of the string (not including the
-terminating
-.Dv NUL ) .
-If the
-.Fa blocksizep
-parameter is not
-.Dv NULL
-the memory referenced by
-.Fa blocksizep
-is filled in with block size, in bytes.
-.Pp
-If the user's block size is unreasonable, a warning message is
-written to standard error and the returned information reflects
-a block size of 512 bytes.
-.Sh SEE ALSO
-.Xr df 1 ,
-.Xr du 1 ,
-.Xr ls 1 ,
-.Xr systat 1 ,
-.Xr environ 7
-.Sh HISTORY
-The
-.Nm getbsize
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/gen/getbsize.c b/lib/libc/gen/getbsize.c
deleted file mode 100644
index a9ce2c14e..000000000
--- a/lib/libc/gen/getbsize.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*	$NetBSD: getbsize.c,v 1.17 2012/06/25 22:32:43 abs Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getbsize.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getbsize.c,v 1.17 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(getbsize,_getbsize)
-#endif
-
-char *
-getbsize(int *headerlenp, long *blocksizep)
-{
-	static char header[20];
-	long n, max, mul, blocksize;
-	char *ep, *p;
-	const char *form;
-
-#define	KB	(1024L)
-#define	MB	(1024L * 1024L)
-#define	GB	(1024L * 1024L * 1024L)
-#define	MAXB	GB		/* No tera, peta, nor exa. */
-	form = "";
-	if ((p = getenv("BLOCKSIZE")) != NULL && *p != '\0') {
-		if ((n = strtol(p, &ep, 10)) < 0)
-			goto underflow;
-		if (n == 0)
-			n = 1;
-		if (*ep && ep[1])
-			goto fmterr;
-		switch (*ep) {
-		case 'G': case 'g':
-			form = "G";
-			max = MAXB / GB;
-			mul = GB;
-			break;
-		case 'K': case 'k':
-			form = "K";
-			max = MAXB / KB;
-			mul = KB;
-			break;
-		case 'M': case 'm':
-			form = "M";
-			max = MAXB / MB;
-			mul = MB;
-			break;
-		case '\0':
-			max = MAXB;
-			mul = 1;
-			break;
-		default:
-fmterr:			warnx("%s: unknown blocksize", p);
-			n = 512;
-			mul = 1;
-			max = 0;
-			break;
-		}
-		if (n > max) {
-			warnx("maximum blocksize is %ldG", MAXB / GB);
-			n = max;
-		}
-		if ((blocksize = n * mul) < 512) {
-underflow:		warnx("%s: minimum blocksize is 512", p);
-			form = "";
-			blocksize = n = 512;
-		}
-	} else
-		blocksize = n = 512;
-
-	if (headerlenp)
-		*headerlenp =
-		    snprintf(header, sizeof(header), "%ld%s-blocks", n, form);
-	if (blocksizep)
-		*blocksizep = blocksize;
-	return (header);
-}
diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c
deleted file mode 100644
index 9b78276c6..000000000
--- a/lib/libc/gen/getcap.c
+++ /dev/null
@@ -1,1212 +0,0 @@
-/*	$NetBSD: getcap.c,v 1.56 2014/09/24 13:18:52 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Casey Leedom of Lawrence Livermore National Laboratory.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getcap.c	8.3 (Berkeley) 3/25/94";
-#else
-__RCSID("$NetBSD: getcap.c,v 1.56 2014/09/24 13:18:52 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifndef SMALL
-#include "namespace.h"
-#endif
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <assert.h>
-#include <stddef.h>
-#include <ctype.h>
-#ifndef SMALL
-#include <db.h>
-#endif
-#include <errno.h>	
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#if defined(__weak_alias) && !defined(SMALL)
-__weak_alias(cgetcap,_cgetcap)
-__weak_alias(cgetclose,_cgetclose)
-__weak_alias(cgetent,_cgetent)
-__weak_alias(cgetfirst,_cgetfirst)
-__weak_alias(cgetmatch,_cgetmatch)
-__weak_alias(cgetnext,_cgetnext)
-__weak_alias(cgetnum,_cgetnum)
-__weak_alias(cgetset,_cgetset)
-__weak_alias(cgetstr,_cgetstr)
-__weak_alias(cgetustr,_cgetustr)
-__weak_alias(csetexpandtc,_csetexpandtc)
-#endif
-
-#define	BFRAG		1024
-#define	BSIZE		1024
-#define	ESC		('[' & 037)	/* ASCII ESC */
-#define	MAX_RECURSION	32		/* maximum getent recursion */
-#define	SFRAG		100		/* cgetstr mallocs in SFRAG chunks */
-
-#define RECOK	(char)0
-#define TCERR	(char)1
-#define	SHADOW	(char)2
-
-static size_t	 topreclen;	/* toprec length */
-static char	*toprec;	/* Additional record specified by cgetset() */
-static int	 gottoprec;	/* Flag indicating retrieval of toprecord */
-static int	 expandtc = 1;	/* flag to expand tc= or not */
-
-#ifndef SMALL
-static int	cdbget(DB *, char **, const char *);
-#endif
-static int 	getent(char **, size_t *, const char * const *, int,
-    const char *, int, char *);
-static int	nfcmp(char *, char *);
-
-/*
- * Cgetset() allows the addition of a user specified buffer to be added
- * to the database array, in effect "pushing" the buffer on top of the
- * virtual database. 0 is returned on success, -1 on failure.
- */
-int
-cgetset(const char *ent)
-{
-	const char *source, *check;
-	char *dest;
-
-	if (ent == NULL) {
-		if (toprec != NULL)
-			free(toprec);
-                toprec = NULL;
-                topreclen = 0;
-                return 0;
-        }
-        topreclen = strlen(ent);
-        if ((toprec = malloc(topreclen + 1)) == NULL) {
-		errno = ENOMEM;
-                return -1;
-	}
-	gottoprec = 0;
-
-	source = ent;
-	dest = toprec;
-	while (*source != '\0') { /* Strip whitespace */
-		*dest++ = *source++; /* Do not check first field */
-		while (*source == ':') {
-			check = source + 1;
-			while (*check && (isspace((unsigned char)*check) ||
-			    (*check=='\\' && isspace((unsigned char)check[1]))))
-				++check;
-			if (*check == ':')
-				source = check;
-			else
-				break;
-
-		}
-	}
-	*dest = 0;
-
-        return 0;
-}
-
-/*
- * Cgetcap searches the capability record buf for the capability cap with
- * type `type'.  A pointer to the value of cap is returned on success, NULL
- * if the requested capability couldn't be found.
- *
- * Specifying a type of ':' means that nothing should follow cap (:cap:).
- * In this case a pointer to the terminating ':' or NUL will be returned if
- * cap is found.
- *
- * If (cap, '@') or (cap, terminator, '@') is found before (cap, terminator)
- * return NULL.
- */
-char *
-cgetcap(char *buf, const char *cap, int type)
-{
-	char *bp;
-	const char *cp;
-
-	_DIAGASSERT(buf != NULL);
-	_DIAGASSERT(cap != NULL);
-
-	bp = buf;
-	for (;;) {
-		/*
-		 * Skip past the current capability field - it's either the
-		 * name field if this is the first time through the loop, or
-		 * the remainder of a field whose name failed to match cap.
-		 */
-		for (;;)
-			if (*bp == '\0')
-				return NULL;
-			else if (*bp++ == ':')
-				break;
-
-		/*
-		 * Try to match (cap, type) in buf.
-		 */
-		for (cp = cap; *cp == *bp && *bp != '\0'; cp++, bp++)
-			continue;
-		if (*cp != '\0')
-			continue;
-		if (*bp == '@')
-			return NULL;
-		if (type == ':') {
-			if (*bp != '\0' && *bp != ':')
-				continue;
-			return bp;
-		}
-		if (*bp != type)
-			continue;
-		bp++;
-		return *bp == '@' ? NULL : bp;
-	}
-	/* NOTREACHED */
-}
-
-/*
- * Cgetent extracts the capability record name from the NULL terminated file
- * array db_array and returns a pointer to a malloc'd copy of it in buf.
- * Buf must be retained through all subsequent calls to cgetcap, cgetnum,
- * cgetflag, and cgetstr, but may then be free'd.  0 is returned on success,
- * -1 if the requested record couldn't be found, -2 if a system error was
- * encountered (couldn't open/read a file, etc.), and -3 if a potential
- * reference loop is detected.
- */
-/* coverity[+alloc : arg-*0] */
-int
-cgetent(char **buf, const char * const *db_array, const char *name)
-{
-	size_t dummy;
-
-	_DIAGASSERT(buf != NULL);
-	_DIAGASSERT(db_array != NULL);
-	_DIAGASSERT(name != NULL);
-
-	return getent(buf, &dummy, db_array, -1, name, 0, NULL);
-}
-
-void
-csetexpandtc(int etc)
-{
-	expandtc = etc;
-}
-
-/*
- * Getent implements the functions of cgetent.  If fd is non-negative,
- * *db_array has already been opened and fd is the open file descriptor.  We
- * do this to save time and avoid using up file descriptors for tc=
- * recursions.
- *
- * Getent returns the same success/failure codes as cgetent.  On success, a
- * pointer to a malloc'ed capability record with all tc= capabilities fully
- * expanded and its length (not including trailing ASCII NUL) are left in
- * *cap and *len.
- *
- * Basic algorithm:
- *	+ Allocate memory incrementally as needed in chunks of size BFRAG
- *	  for capability buffer.
- *	+ Recurse for each tc=name and interpolate result.  Stop when all
- *	  names interpolated, a name can't be found, or depth exceeds
- *	  MAX_RECURSION.
- */
-/* coverity[+alloc : arg-*0] */
-static int
-getent(char **cap, size_t *len, const char * const *db_array, int fd,
-    const char *name, int depth, char *nfield)
-{
-	char *record, *newrecord;
-	char *r_end, *rp;	/* pacify gcc */
-	const char * const *db_p;
-	int myfd, eof, foundit;
-	int tc_not_resolved;
-	
-	_DIAGASSERT(cap != NULL);
-	_DIAGASSERT(len != NULL);
-	_DIAGASSERT(db_array != NULL);
-	/* fd may be -1 */
-	_DIAGASSERT(name != NULL);
-	/* nfield may be NULL */
-
-	myfd = 0;
-	rp = NULL;
-
-	/*
-	 * Return with ``loop detected'' error if we've recursed more than
-	 * MAX_RECURSION times.
-	 */
-	if (depth > MAX_RECURSION)
-		return -3;
-
-	/*
-	 * Check if we have a top record from cgetset().
-         */
-	if (depth == 0 && toprec != NULL && cgetmatch(toprec, name) == 0) {
-		if ((record = malloc(topreclen + BFRAG)) == NULL) {
-			errno = ENOMEM;
-			return -2;
-		}
-		(void)strcpy(record, toprec);	/* XXX: strcpy is safe */
-		db_p = db_array;
-		rp = record + topreclen + 1;
-		r_end = rp + BFRAG;
-		goto tc_exp;
-	}
-	/*
-	 * Allocate first chunk of memory.
-	 */
-	if ((record = malloc(BFRAG)) == NULL) {
-		errno = ENOMEM;
-		return -2;
-	}
-	r_end = record + BFRAG;
-	foundit = 0;
-	/*
-	 * Loop through database array until finding the record.
-	 */
-
-	for (db_p = db_array; *db_p != NULL; db_p++) {
-		eof = 0;
-
-		/*
-		 * Open database if not already open.
-		 */
-
-		if (fd >= 0) {
-			(void)lseek(fd, (off_t)0, SEEK_SET);
-		} else {
-#ifndef SMALL
-			DB *capdbp;
-			char pbuf[MAXPATHLEN];
-			char *cbuf;
-			int retval;
-			size_t clen;
-
-			(void)snprintf(pbuf, sizeof(pbuf), "%s.db", *db_p);
-			if ((capdbp = dbopen(pbuf, O_RDONLY | O_CLOEXEC, 0,
-			    DB_HASH, 0)) != NULL) {
-				free(record);
-				retval = cdbget(capdbp, &record, name);
-				if (retval < 0) {
-					/* no record available */
-					(void)capdbp->close(capdbp);
-					return retval;
-				}
-				/* save the data; close frees it */
-				clen = strlen(record);
-				if ((cbuf = malloc(clen + 1)) == NULL) {
-					(void)capdbp->close(capdbp);
-					errno = ENOMEM;
-					return -2;
-				}
-				memmove(cbuf, record, clen + 1);
-				if (capdbp->close(capdbp) < 0) {
-					int serrno = errno;
-
-					free(cbuf);
-					errno = serrno;
-					return -2;
-				}
-				*len = clen;
-				*cap = cbuf;
-				return retval;
-			} else
-#endif
-			{
-				fd = open(*db_p, O_RDONLY | O_CLOEXEC, 0);
-				if (fd < 0) {
-					/* No error on unfound file. */
-					continue;
-				}
-				myfd = 1;
-			}
-		}
-		/*
-		 * Find the requested capability record ...
-		 */
-		{
-		char buf[BUFSIZ];
-		char *b_end, *bp, *cp;
-		int c, slash;
-
-		/*
-		 * Loop invariants:
-		 *	There is always room for one more character in record.
-		 *	R_end always points just past end of record.
-		 *	Rp always points just past last character in record.
-		 *	B_end always points just past last character in buf.
-		 *	Bp always points at next character in buf.
-		 *	Cp remembers where the last colon was.
-		 */
-		b_end = buf;
-		bp = buf;
-		cp = NULL;
-		slash = 0;
-		for (;;) {
-			/*
-			 * Read in a line implementing (\, newline)
-			 * line continuation.
-			 */
-			rp = record;
-			for (;;) {
-				if (bp >= b_end) {
-					ssize_t n;
-		
-					n = read(fd, buf, sizeof(buf));
-					if (n <= 0) {
-						if (myfd)
-							(void)close(fd);
-						if (n < 0) {
-							int serrno = errno;
-
-							free(record);
-							errno = serrno;
-							return -2;
-						} else {
-							fd = -1;
-							eof = 1;
-							break;
-						}
-					}
-					b_end = buf+n;
-					bp = buf;
-				}
-	
-				c = *bp++;
-				if (c == '\n') {
-					if (slash) {
-						slash = 0;
-						rp--;
-						continue;
-					} else
-						break;
-				}
-				if (slash) {
-					slash = 0;
-					cp = 0;
-				}
-				if (c == ':') {
-					/*
-					 * If the field was `empty' (i.e.
-					 * contained only white space), back up
-					 * to the colon (eliminating the
-					 * field).
-					 */
-					if (cp != NULL)
-						rp = cp;
-					else
-						cp = rp;
-				} else if (c == '\\') {
-					slash = 1;
-				} else if (c != ' ' && c != '\t') {
-					/*
-					 * Forget where the colon was, as this
-					 * is not an empty field.
-					 */
-					cp = 0;
-				}
-				*rp++ = c;
-
-				/*
-				 * Enforce loop invariant: if no room 
-				 * left in record buffer, try to get
-				 * some more.
-				 */
-				if (rp >= r_end) {
-					ptrdiff_t pos;
-					size_t newsize;
-
-					pos = rp - record;
-					newsize = r_end - record + BFRAG;
-					newrecord = realloc(record, newsize);
-					if (newrecord == NULL) {
-						free(record);
-						if (myfd)
-							(void)close(fd);
-						errno = ENOMEM;
-						return -2;
-					}
-					record = newrecord;
-					r_end = record + newsize;
-					rp = record + pos;
-				}
-			}
-			/* Eliminate any white space after the last colon. */
-			if (cp)
-				rp = cp + 1;
-			/* Loop invariant lets us do this. */
-			*rp++ = '\0';
-
-			/*
-			 * If encountered eof check next file.
-			 */
-			if (eof)
-				break;
-				
-			/*
-			 * Toss blank lines and comments.
-			 */
-			if (*record == '\0' || *record == '#')
-				continue;
-	
-			/*
-			 * See if this is the record we want ...
-			 */
-			if (cgetmatch(record, name) == 0)
-				if (nfield == NULL || !nfcmp(nfield, record)) {
-					foundit = 1;
-					break;	/* found it! */
-				}
-		}
-		}
-		if (foundit)
-			break;
-	}
-
-	if (!foundit)
-		return -1;
-
-	/*
-	 * Got the capability record, but now we have to expand all tc=name
-	 * references in it ...
-	 */
-tc_exp:
-	tc_not_resolved = 0;
-	if (expandtc) {
-		char *newicap, *s;
-		size_t ilen, newilen;
-		int iret;
-		ptrdiff_t diff, tclen;
-		char *icap, *scan, *tc, *tcstart, *tcend;
-
-		/*
-		 * Loop invariants:
-		 *	There is room for one more character in record.
-		 *	R_end points just past end of record.
-		 *	Rp points just past last character in record.
-		 *	Scan points at remainder of record that needs to be
-		 *	scanned for tc=name constructs.
-		 */
-		scan = record;
-		for (;;) {
-			if ((tc = cgetcap(scan, "tc", '=')) == NULL)
-				break;
-
-			/*
-			 * Find end of tc=name and stomp on the trailing `:'
-			 * (if present) so we can use it to call ourselves.
-			 */
-			s = tc;
-			for (;;)
-				if (*s == '\0')
-					break;
-				else
-					if (*s++ == ':') {
-						*(s - 1) = '\0';
-						break;
-					}
-			tcstart = tc - 3;
-			tclen = s - tcstart;
-			tcend = s;
-
-			iret = getent(&icap, &ilen, db_p, fd, tc, depth+1, 
-				      NULL);
-			newicap = icap;		/* Put into a register. */
-			newilen = ilen;
-			if (iret != 0) {
-				/* an error */
-				if (iret < -1) {
-					if (myfd)
-						(void)close(fd);
-					free(record);
-					return iret;
-				}
-				if (iret == 1)
-					tc_not_resolved = 1;
-				/* couldn't resolve tc */
-				if (iret == -1) {
-					*(s - 1) = ':';			
-					scan = s - 1;
-					tc_not_resolved = 1;
-					continue;
-					
-				}
-			}
-			/* not interested in name field of tc'ed record */
-			s = newicap;
-			for (;;)
-				if (*s == '\0')
-					break;
-				else if (*s++ == ':')
-					break;
-			newilen -= s - newicap;
-			newicap = s;
-
-			/* make sure interpolated record is `:'-terminated */
-			s += newilen;
-			if (*(s - 1) != ':') {
-				*s = ':';	/* overwrite NUL with : */
-				newilen++;
-			}
-
-			/*
-			 * Make sure there's enough room to insert the
-			 * new record.
-			 */
-			diff = newilen - tclen;
-			if (diff >= r_end - rp) {
-				ptrdiff_t pos, tcpos, tcposend;
-				size_t newsize;
-
-				pos = rp - record;
-				newsize = r_end - record + diff + BFRAG;
-				tcpos = tcstart - record;
-				tcposend = tcend - record;
-				newrecord = realloc(record, newsize);
-				if (newrecord == NULL) {
-					free(record);
-					if (myfd)
-						(void)close(fd);
-					free(icap);
-					errno = ENOMEM;
-					return -2;
-				}
-				record = newrecord;
-				r_end = record + newsize;
-				rp = record + pos;
-				tcstart = record + tcpos;
-				tcend = record + tcposend;
-			}
-
-			/*
-			 * Insert tc'ed record into our record.
-			 */
-			s = tcstart + newilen;
-			memmove(s, tcend,  (size_t)(rp - tcend));
-			memmove(tcstart, newicap, newilen);
-			rp += diff;
-			free(icap);
-
-			/*
-			 * Start scan on `:' so next cgetcap works properly
-			 * (cgetcap always skips first field).
-			 */
-			scan = s - 1;
-		}
-	
-	}
-	/*
-	 * Close file (if we opened it), give back any extra memory, and
-	 * return capability, length and success.
-	 */
-	if (myfd)
-		(void)close(fd);
-	*len = rp - record - 1;	/* don't count NUL */
-	if (r_end > rp) {
-		if ((newrecord = 
-		     realloc(record, (size_t)(rp - record))) == NULL) {
-			free(record);
-			errno = ENOMEM;
-			return -2;
-		}
-		record = newrecord;
-	}
-		
-	*cap = record;
-	if (tc_not_resolved)
-		return 1;
-	return 0;
-}	
-
-#ifndef SMALL
-static int
-cdbget(DB *capdbp, char **bp, const char *name)
-{
-	DBT key;
-	DBT data;
-
-	_DIAGASSERT(capdbp != NULL);
-	_DIAGASSERT(bp != NULL);
-	_DIAGASSERT(name != NULL);
-
-	key.data = __UNCONST(name);
-	key.size = strlen(name);
-
-	for (;;) {
-		/* Get the reference. */
-		switch(capdbp->get(capdbp, &key, &data, 0)) {
-		case -1:
-			return -2;
-		case 1:
-			return -1;
-		}
-
-		/* If not an index to another record, leave. */
-		if (((char *)data.data)[0] != SHADOW)
-			break;
-
-		key.data = (char *)data.data + 1;
-		key.size = data.size - 1;
-	}
-	
-	*bp = (char *)data.data + 1;
-	return ((char *)(data.data))[0] == TCERR ? 1 : 0;
-}
-#endif
-
-/*
- * Cgetmatch will return 0 if name is one of the names of the capability
- * record buf, -1 if not.
- */
-int
-cgetmatch(const char *buf, const char *name)
-{
-	const char *np, *bp;
-
-	_DIAGASSERT(buf != NULL);
-	_DIAGASSERT(name != NULL);
-
-	/*
-	 * Start search at beginning of record.
-	 */
-	bp = buf;
-	for (;;) {
-		/*
-		 * Try to match a record name.
-		 */
-		np = name;
-		for (;;)
-			if (*np == '\0') {
-				if (*bp == '|' || *bp == ':' || *bp == '\0')
-					return 0;
-				else
-					break;
-			} else if (*bp++ != *np++)
-				break;
-
-		/*
-		 * Match failed, skip to next name in record.
-		 */
-		if (bp > buf)
-			bp--;	/* a '|' or ':' may have stopped the match */
-		else
-			return -1;
-		for (;;)
-			if (*bp == '\0' || *bp == ':')
-				return -1;	/* match failed totally */
-			else if (*bp++ == '|')
-				break;		/* found next name */
-	}
-}
-
-int
-cgetfirst(char **buf, const char * const *db_array)
-{
-
-	_DIAGASSERT(buf != NULL);
-	_DIAGASSERT(db_array != NULL);
-
-	(void)cgetclose();
-	return cgetnext(buf, db_array);
-}
-
-static FILE *pfp;
-static int slash;
-static const char * const *dbp;
-
-int
-cgetclose(void)
-{
-	if (pfp != NULL) {
-		(void)fclose(pfp);
-		pfp = NULL;
-	}
-	dbp = NULL;
-	gottoprec = 0;
-	slash = 0;
-	return 0;
-}
-
-/*
- * Cgetnext() gets either the first or next entry in the logical database 
- * specified by db_array.  It returns 0 upon completion of the database, 1
- * upon returning an entry with more remaining, and -1 if an error occurs.
- */
-/* coverity[+alloc : arg-*0] */
-int
-cgetnext(char **bp, const char * const *db_array)
-{
-	size_t len = 0;
-	int status, done;
-	char *cp, *line, *rp, *np, buf[BSIZE], nbuf[BSIZE];
-	size_t dummy;
-
-	_DIAGASSERT(bp != NULL);
-	_DIAGASSERT(db_array != NULL);
-
-	if (dbp == NULL)
-		dbp = db_array;
-
-	if (pfp == NULL && (pfp = fopen(*dbp, "re")) == NULL) {
-		(void)cgetclose();
-		return -1;
-	}
-	for (;;) {
-		if (toprec != NULL && !gottoprec) {
-			gottoprec = 1;
-			line = toprec;
-		} else {
-			line = fgetln(pfp, &len);
-			if (line == NULL) {
-				if (pfp == NULL)
-					return -1;
-				if (ferror(pfp)) {
-					(void)cgetclose();
-					return -1;
-				} else {
-					(void)fclose(pfp);
-					pfp = NULL;
-					if (*++dbp == NULL) {
-						(void)cgetclose();
-						return 0;
-					} else if ((pfp =
-					    fopen(*dbp, "re")) == NULL) {
-						(void)cgetclose();
-						return -1;
-					} else
-						continue;
-				}
-			} else
-				line[len - 1] = '\0';
-			if (len == 1) {
-				slash = 0;
-				continue;
-			}
-			if (isspace((unsigned char)*line) ||
-			    *line == ':' || *line == '#' || slash) {
-				if (line[len - 2] == '\\')
-					slash = 1;
-				else
-					slash = 0;
-				continue;
-			}
-			if (line[len - 2] == '\\')
-				slash = 1;
-			else
-				slash = 0;
-		}			
-
-
-		/* 
-		 * Line points to a name line.
-		 */
-		if (len > sizeof(nbuf))
-			return -1;
-		done = 0;
-		np = nbuf;
-		for (;;) {
-			for (cp = line; *cp != '\0'; cp++) {
-				if (*cp == ':') {
-					*np++ = ':';
-					done = 1;
-					break;
-				}
-				if (*cp == '\\')
-					break;
-				*np++ = *cp;
-			}
-			if (done) {
-				*np = '\0';
-				break;
-			} else { /* name field extends beyond the line */
-				line = fgetln(pfp, &len);
-				if (line == NULL && pfp) {
-					if (ferror(pfp)) {
-						(void)cgetclose();
-						return -1;
-					}
-					(void)fclose(pfp);
-					pfp = NULL;
-					*np = '\0';
-					break;
-				} else
-					line[len - 1] = '\0';
-			}
-		}
-		if (len > sizeof(buf))
-			return -1;
-		rp = buf;
-		for (cp = nbuf; *cp != '\0'; cp++)
-			if (*cp == '|' || *cp == ':')
-				break;
-			else
-				*rp++ = *cp;
-
-		*rp = '\0';
-		/* 
-		 * XXX 
-		 * Last argument of getent here should be nbuf if we want true
-		 * sequential access in the case of duplicates.  
-		 * With NULL, getent will return the first entry found
-		 * rather than the duplicate entry record.  This is a 
-		 * matter of semantics that should be resolved.
-		 */
-		status = getent(bp, &dummy, db_array, -1, buf, 0, NULL);
-		if (status == -2 || status == -3)
-			(void)cgetclose();
-
-		return status + 1;
-	}
-	/* NOTREACHED */
-}
-
-/*
- * Cgetstr retrieves the value of the string capability cap from the
- * capability record pointed to by buf.  A pointer to a decoded, NUL
- * terminated, malloc'd copy of the string is returned in the char *
- * pointed to by str.  The length of the string not including the trailing
- * NUL is returned on success, -1 if the requested string capability
- * couldn't be found, -2 if a system error was encountered (storage
- * allocation failure).
- */
-int
-cgetstr(char *buf, const char *cap, char **str)
-{
-	u_int m_room;
-	const char *bp;
-	char *mp;
-	ptrdiff_t len;
-	char *mem, *newmem;
-
-	_DIAGASSERT(buf != NULL);
-	_DIAGASSERT(cap != NULL);
-	_DIAGASSERT(str != NULL);
-
-	/*
-	 * Find string capability cap
-	 */
-	bp = cgetcap(buf, cap, '=');
-	if (bp == NULL)
-		return -1;
-
-	/*
-	 * Conversion / storage allocation loop ...  Allocate memory in
-	 * chunks SFRAG in size.
-	 */
-	if ((mem = malloc(SFRAG)) == NULL) {
-		errno = ENOMEM;
-		return -2;	/* couldn't even allocate the first fragment */
-	}
-	m_room = SFRAG;
-	mp = mem;
-
-	while (*bp != ':' && *bp != '\0') {
-		/*
-		 * Loop invariants:
-		 *	There is always room for one more character in mem.
-		 *	Mp always points just past last character in mem.
-		 *	Bp always points at next character in buf.
-		 */
-		if (*bp == '^') {
-			bp++;
-			if (*bp == ':' || *bp == '\0')
-				break;	/* drop unfinished escape */
-			*mp++ = *bp++ & 037;
-		} else if (*bp == '\\') {
-			bp++;
-			if (*bp == ':' || *bp == '\0')
-				break;	/* drop unfinished escape */
-			if ('0' <= *bp && *bp <= '7') {
-				int n, i;
-
-				n = 0;
-				i = 3;	/* maximum of three octal digits */
-				do {
-					n = n * 8 + (*bp++ - '0');
-				} while (--i && '0' <= *bp && *bp <= '7');
-				*mp++ = n;
-			}
-			else switch (*bp++) {
-				case 'b': case 'B':
-					*mp++ = '\b';
-					break;
-				case 't': case 'T':
-					*mp++ = '\t';
-					break;
-				case 'n': case 'N':
-					*mp++ = '\n';
-					break;
-				case 'f': case 'F':
-					*mp++ = '\f';
-					break;
-				case 'r': case 'R':
-					*mp++ = '\r';
-					break;
-				case 'e': case 'E':
-					*mp++ = ESC;
-					break;
-				case 'c': case 'C':
-					*mp++ = ':';
-					break;
-				default:
-					/*
-					 * Catches '\', '^', and
-					 *  everything else.
-					 */
-					*mp++ = *(bp-1);
-					break;
-			}
-		} else
-			*mp++ = *bp++;
-		m_room--;
-
-		/*
-		 * Enforce loop invariant: if no room left in current
-		 * buffer, try to get some more.
-		 */
-		if (m_room == 0) {
-			size_t size = mp - mem;
-
-			if ((newmem = realloc(mem, size + SFRAG)) == NULL) {
-				free(mem);
-				return -2;
-			}
-			mem = newmem;
-			m_room = SFRAG;
-			mp = mem + size;
-		}
-	}
-	*mp++ = '\0';	/* loop invariant let's us do this */
-	m_room--;
-	len = mp - mem - 1;
-
-	/*
-	 * Give back any extra memory and return value and success.
-	 */
-	if (m_room != 0) {
-		if ((newmem = realloc(mem, (size_t)(mp - mem))) == NULL) {
-			free(mem);
-			return -2;
-		}
-		mem = newmem;
-	}
-	*str = mem;
-	_DIAGASSERT(__type_fit(int, len));
-	return (int)len;
-}
-
-/*
- * Cgetustr retrieves the value of the string capability cap from the
- * capability record pointed to by buf.  The difference between cgetustr()
- * and cgetstr() is that cgetustr does not decode escapes but rather treats
- * all characters literally.  A pointer to a  NUL terminated malloc'd 
- * copy of the string is returned in the char pointed to by str.  The 
- * length of the string not including the trailing NUL is returned on success,
- * -1 if the requested string capability couldn't be found, -2 if a system 
- * error was encountered (storage allocation failure).
- */
-int
-cgetustr(char *buf, const char *cap, char **str)
-{
-	u_int m_room;
-	const char *bp;
-	char *mp;
-	size_t len;
-	char *mem, *newmem;
-
-	_DIAGASSERT(buf != NULL);
-	_DIAGASSERT(cap != NULL);
-	_DIAGASSERT(str != NULL);
-
-	/*
-	 * Find string capability cap
-	 */
-	if ((bp = cgetcap(buf, cap, '=')) == NULL)
-		return -1;
-
-	/*
-	 * Conversion / storage allocation loop ...  Allocate memory in
-	 * chunks SFRAG in size.
-	 */
-	if ((mem = malloc(SFRAG)) == NULL) {
-		errno = ENOMEM;
-		return -2;	/* couldn't even allocate the first fragment */
-	}
-	m_room = SFRAG;
-	mp = mem;
-
-	while (*bp != ':' && *bp != '\0') {
-		/*
-		 * Loop invariants:
-		 *	There is always room for one more character in mem.
-		 *	Mp always points just past last character in mem.
-		 *	Bp always points at next character in buf.
-		 */
-		*mp++ = *bp++;
-		m_room--;
-
-		/*
-		 * Enforce loop invariant: if no room left in current
-		 * buffer, try to get some more.
-		 */
-		if (m_room == 0) {
-			size_t size = mp - mem;
-
-			if ((newmem = realloc(mem, size + SFRAG)) == NULL) {
-				free(mem);
-				return -2;
-			}
-			mem = newmem;
-			m_room = SFRAG;
-			mp = mem + size;
-		}
-	}
-	*mp++ = '\0';	/* loop invariant let's us do this */
-	m_room--;
-	len = mp - mem - 1;
-
-	/*
-	 * Give back any extra memory and return value and success.
-	 */
-	if (m_room != 0) {
-		if ((newmem = realloc(mem, (size_t)(mp - mem))) == NULL) {
-			free(mem);
-			return -2;
-		}
-		mem = newmem;
-	}
-	*str = mem;
-	_DIAGASSERT(__type_fit(int, len));
-	return (int)len;
-}
-
-/*
- * Cgetnum retrieves the value of the numeric capability cap from the
- * capability record pointed to by buf.  The numeric value is returned in
- * the long pointed to by num.  0 is returned on success, -1 if the requested
- * numeric capability couldn't be found.
- */
-int
-cgetnum(char *buf, const char *cap, long *num)
-{
-	long n;
-	int base, digit;
-	const char *bp;
-
-	_DIAGASSERT(buf != NULL);
-	_DIAGASSERT(cap != NULL);
-	_DIAGASSERT(num != NULL);
-
-	/*
-	 * Find numeric capability cap
-	 */
-	bp = cgetcap(buf, cap, '#');
-	if (bp == NULL)
-		return -1;
-
-	/*
-	 * Look at value and determine numeric base:
-	 *	0x... or 0X...	hexadecimal,
-	 * else	0...		octal,
-	 * else			decimal.
-	 */
-	if (*bp == '0') {
-		bp++;
-		if (*bp == 'x' || *bp == 'X') {
-			bp++;
-			base = 16;
-		} else
-			base = 8;
-	} else
-		base = 10;
-
-	/*
-	 * Conversion loop ...
-	 */
-	n = 0;
-	for (;;) {
-		if ('0' <= *bp && *bp <= '9')
-			digit = *bp - '0';
-		else if ('a' <= *bp && *bp <= 'f')
-			digit = 10 + *bp - 'a';
-		else if ('A' <= *bp && *bp <= 'F')
-			digit = 10 + *bp - 'A';
-		else
-			break;
-
-		if (digit >= base)
-			break;
-
-		n = n * base + digit;
-		bp++;
-	}
-
-	/*
-	 * Return value and success.
-	 */
-	*num = n;
-	return 0;
-}
-
-
-/*
- * Compare name field of record.
- */
-static int
-nfcmp(char *nf, char *rec)
-{
-	char *cp, tmp;
-	int ret;
-
-	_DIAGASSERT(nf != NULL);
-	_DIAGASSERT(rec != NULL);
-
-	for (cp = rec; *cp != ':'; cp++)
-		continue;
-	
-	tmp = *(cp + 1);
-	*(cp + 1) = '\0';
-	ret = strcmp(nf, rec);
-	*(cp + 1) = tmp;
-
-	return ret;
-}
diff --git a/lib/libc/gen/getcwd.3 b/lib/libc/gen/getcwd.3
deleted file mode 100644
index 712d5a94a..000000000
--- a/lib/libc/gen/getcwd.3
+++ /dev/null
@@ -1,172 +0,0 @@
-.\"	$NetBSD: getcwd.3,v 1.18 2010/04/29 06:54:26 jruoho Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)getcwd.3	8.2 (Berkeley) 12/11/93
-.\"
-.Dd April 29, 2010
-.Dt GETCWD 3
-.Os
-.Sh NAME
-.Nm getcwd ,
-.Nm getwd
-.Nd get working directory pathname
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft char *
-.Fn getcwd "char *buf" "size_t size"
-.Ft char *
-.Fn getwd "char *buf"
-.Sh DESCRIPTION
-The
-.Fn getcwd
-function copies the absolute pathname of the current working directory
-into the memory referenced by
-.Fa buf
-and returns a pointer to
-.Fa buf .
-The
-.Fa size
-argument is the size, in bytes, of the array referenced by
-.Fa buf .
-.Pp
-If
-.Fa buf
-is
-.Dv NULL ,
-space is allocated as necessary to store the pathname.
-This space may later be
-.Xr free 3 Ns 'd .
-.Pp
-The function
-.Fn getwd
-is a compatibility routine which calls
-.Fn getcwd
-with its
-.Fa buf
-argument and a size of
-.Dv MAXPATHLEN
-(as defined in the include
-file
-.In sys/param.h ) .
-Obviously,
-.Fa buf
-should be at least
-.Dv MAXPATHLEN
-bytes in length.
-.Pp
-These routines have traditionally been used by programs to save the
-name of a working directory for the purpose of returning to it.
-A much faster and less error-prone method of accomplishing this is to
-open the current directory
-.Pq Ql \&.
-and use the
-.Xr fchdir 2
-function to return.
-.Sh RETURN VALUES
-Upon successful completion, a pointer to the pathname is returned.
-Otherwise a
-.Dv NULL
-pointer is returned and the global variable
-.Va errno
-is set to indicate the error.
-In addition,
-.Fn getwd
-copies the error message associated with
-.Va errno
-into the memory referenced by
-.Fa buf .
-.Sh ERRORS
-The
-.Fn getcwd
-function
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Read or search permission was denied for a component of the pathname.
-.It Bq Er EINVAL
-The
-.Fa size
-argument is zero.
-.It Bq Er ENOENT
-A component of the pathname no longer exists.
-.It Bq Er ENOMEM
-Insufficient memory is available.
-.It Bq Er ERANGE
-The
-.Fa size
-argument is greater than zero but smaller than the length of the pathname
-plus 1.
-.El
-.Sh SEE ALSO
-.Xr chdir 2 ,
-.Xr fchdir 2 ,
-.Xr malloc 3 ,
-.Xr strerror 3
-.Sh STANDARDS
-The
-.Fn getwd
-and
-.Fn getcwd
-functions conform to
-.St -p1003.1-90 .
-The
-.St -p1003.1-2004
-revision marked
-.Fn getwd
-as legacy and recommended the use of
-.Fn getcwd
-instead.
-The
-.St -p1003.1-2008
-revision removed
-.Fn getwd
-from the specification.
-.Pp
-The ability to specify a
-.Dv NULL
-pointer and have
-.Fn getcwd
-allocate memory as necessary is an extension.
-.Sh HISTORY
-The
-.Fn getwd
-function appeared in
-.Bx 4.0 .
-.Sh SECURITY CONSIDERATIONS
-As
-.Fn getwd
-does not know the length of the supplied buffer, it is possible
-for a long (but valid) path to overflow the buffer and provide
-a means for an attacker to exploit the caller.
-.Fn getcwd
-should be used in place of
-.Fn getwd
-(the latter is only provided for compatibility purposes).
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c
deleted file mode 100644
index a0763a6e0..000000000
--- a/lib/libc/gen/getcwd.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*	$NetBSD: getcwd.c,v 1.53 2012/06/21 23:29:23 enami Exp $	*/
-
-/*
- * Copyright (c) 1989, 1991, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Jan-Simon Pendry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getcwd.c	8.5 (Berkeley) 2/7/95";
-#else
-__RCSID("$NetBSD: getcwd.c,v 1.53 2012/06/21 23:29:23 enami Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ssp/ssp.h>
-
-#include "extern.h"
-
-#ifdef __weak_alias
-__weak_alias(getcwd,_getcwd)
-__weak_alias(_sys_getcwd,_getcwd)
-__weak_alias(realpath,_realpath)
-#endif
-
-/*
- * char *realpath(const char *path, char *resolved);
- *
- * Find the real name of path, by removing all ".", ".." and symlink
- * components.  Returns (resolved) on success, or (NULL) on failure,
- * in which case the path which caused trouble is left in (resolved).
- */
-char *
-realpath(const char * __restrict path, char * __restrict resolved)
-{
-	struct stat sb;
-	int idx = 0, nlnk = 0;
-	const char *q;
-	char *p, wbuf[2][MAXPATHLEN], *fres;
-	size_t len;
-	ssize_t n;
-
-	/* POSIX sez we must test for this */
-	if (path == NULL) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	if (resolved == NULL) {
-		fres = resolved = malloc(MAXPATHLEN);
-		if (resolved == NULL)
-			return NULL;
-	} else
-		fres = NULL;
-
-
-	/*
-	 * Build real path one by one with paying an attention to .,
-	 * .. and symbolic link.
-	 */
-
-	/*
-	 * `p' is where we'll put a new component with prepending
-	 * a delimiter.
-	 */
-	p = resolved;
-
-	if (*path == '\0') {
-		*p = '\0';
-		errno = ENOENT;
-		goto out;
-	}
-
-	/* If relative path, start from current working directory. */
-	if (*path != '/') {
-		/* check for resolved pointer to appease coverity */
-		if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-			p[0] = '.';
-			p[1] = '\0';
-			goto out;
-		}
-		len = strlen(resolved);
-		if (len > 1)
-			p += len;
-	}
-
-loop:
-	/* Skip any slash. */
-	while (*path == '/')
-		path++;
-
-	if (*path == '\0') {
-		if (p == resolved)
-			*p++ = '/';
-		*p = '\0';
-		return resolved;
-	}
-
-	/* Find the end of this component. */
-	q = path;
-	do
-		q++;
-	while (*q != '/' && *q != '\0');
-
-	/* Test . or .. */
-	if (path[0] == '.') {
-		if (q - path == 1) {
-			path = q;
-			goto loop;
-		}
-		if (path[1] == '.' && q - path == 2) {
-			/* Trim the last component. */
-			if (p != resolved)
-				while (*--p != '/')
-					continue;
-			path = q;
-			goto loop;
-		}
-	}
-
-	/* Append this component. */
-	if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-		errno = ENAMETOOLONG;
-		if (p == resolved)
-			*p++ = '/';
-		*p = '\0';
-		goto out;
-	}
-	p[0] = '/';
-	memcpy(&p[1], path,
-	    /* LINTED We know q > path. */
-	    q - path);
-	p[1 + q - path] = '\0';
-
-	/*
-	 * If this component is a symlink, toss it and prepend link
-	 * target to unresolved path.
-	 */
-	if (lstat(resolved, &sb) == -1)
-		goto out;
-
-	if (S_ISLNK(sb.st_mode)) {
-		if (nlnk++ >= MAXSYMLINKS) {
-			errno = ELOOP;
-			goto out;
-		}
-		n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-		if (n < 0)
-			goto out;
-		if (n == 0) {
-			errno = ENOENT;
-			goto out;
-		}
-
-		/* Append unresolved path to link target and switch to it. */
-		if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-			errno = ENAMETOOLONG;
-			goto out;
-		}
-		memcpy(&wbuf[idx][n], q, len + 1);
-		path = wbuf[idx];
-		idx ^= 1;
-
-		/* If absolute symlink, start from root. */
-		if (*path == '/')
-			p = resolved;
-		goto loop;
-	}
-	if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-		errno = ENOTDIR;
-		goto out;
-	}
-
-	/* Advance both resolved and unresolved path. */
-	p += 1 + q - path;
-	path = q;
-	goto loop;
-out:
-	free(fres);
-	return NULL;
-}
-
-char *
-__ssp_real(getcwd)(char *pt, size_t size)
-{
-	char *npt;
-
-	/*
-	 * If a buffer is specified, the size has to be non-zero.
-	 */
-	if (pt != NULL) {
-		if (size == 0) {
-			/* __getcwd(pt, 0) results ERANGE. */
-			errno = EINVAL;
-			return (NULL);
-		}
-		if (__getcwd(pt, size) >= 0)
-			return (pt);
-		return (NULL);
-	}
-
-	/*
-	 * If no buffer specified by the user, allocate one as necessary.
-	 */
-	size = 1024 >> 1;
-	do {
-		if ((npt = realloc(pt, size <<= 1)) == NULL)
-			break;
-		pt = npt;
-		if (__getcwd(pt, size) >= 0)
-			return (pt);
-	} while (size <= MAXPATHLEN * 4 && errno == ERANGE);
-
-	free(pt);
-	return (NULL);
-}
diff --git a/lib/libc/gen/getdevmajor.3 b/lib/libc/gen/getdevmajor.3
deleted file mode 100644
index 97db9b0e5..000000000
--- a/lib/libc/gen/getdevmajor.3
+++ /dev/null
@@ -1,118 +0,0 @@
-.\"	$NetBSD: getdevmajor.3,v 1.5 2009/03/24 22:34:54 drochner Exp $
-.\"
-.\" Copyright (c) 2004 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Andrew Brown.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.Dd January 20, 2009
-.Dt GETDEVMAJOR 3
-.Os
-.Sh NAME
-.Nm getdevmajor
-.Nd get block or character device major number
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.In sys/stat.h
-.Ft devmajor_t
-.Fn getdevmajor "const char *name" "mode_t type"
-.Sh DESCRIPTION
-The
-.Fn getdevmajor
-function returns the major device number of the block or character
-device specified by
-.Ar name
-and a file type matching the one encoded in
-.Fa type
-which must be one of
-.Dv S_IFBLK
-or
-.Dv S_IFCHR .
-.Sh RETURN VALUES
-If no device matches the specified values, no information is
-available, or an error occurs,
-.Dv NODEVMAJOR
-is returned and
-.Va errno
-is set to indicate the error.
-.Sh EXAMPLES
-To retrieve the major number for
-.Xr pty 4
-slave devices (aka pts devices):
-.Bd -literal -offset indent
-#include \*[Lt]stdlib.h\*[Gt]
-#include \*[Lt]sys/stat.h\*[Gt]
-.sp
-devmajor_t pts;
-pts = getdevmajor("pts", S_IFCHR);
-.Ed
-.Pp
-To retrieve the major numbers for the block and character
-.Xr wd 4
-devices:
-.Bd -literal -offset indent
-#include \*[Lt]stdlib.h\*[Gt]
-#include \*[Lt]sys/stat.h\*[Gt]
-.sp
-devmajor_t c, b;
-c = getdevmajor("wd", S_IFCHR);
-b = getdevmajor("wd", S_IFBLK);
-.Ed
-.Sh ERRORS
-The
-.Fn getdevmajor
-function may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr malloc 3
-and
-.Xr sysctlbyname 3 .
-In addition, the following errors may be reported:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of the
-.Fa type
-argument is not
-.Dv S_IFCHR
-or
-.Dv S_IFBLK .
-.It Bq Er ENOENT
-The named device is not found.
-.El
-.Sh SEE ALSO
-.Xr stat 2 ,
-.Xr devname 3 ,
-.Xr malloc 3 ,
-.Xr sysctlbyname 3
-.Sh HISTORY
-The
-.Fn getdevmajor
-function call appeared in
-.Nx 3.0 .
diff --git a/lib/libc/gen/getdevmajor.c b/lib/libc/gen/getdevmajor.c
deleted file mode 100644
index 95cb7ca00..000000000
--- a/lib/libc/gen/getdevmajor.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*	$NetBSD: getdevmajor.c,v 1.6 2012/03/13 21:13:35 christos Exp $ */
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Andrew Brown.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getdevmajor.c,v 1.6 2012/03/13 21:13:35 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(getdevmajor,_getdevmajor)
-#endif
-
-/*
- * XXX temporary alias because getdevmajor() was renamed
- * in -current for some time
- */
-dev_t __getdevmajor50(const char *, mode_t);
-dev_t
-__getdevmajor50(const char *name, mode_t type)
-{
-
-	return (dev_t)getdevmajor(name, type);
-}
-
-devmajor_t
-getdevmajor(const char *name, mode_t type)
-{
-	struct kinfo_drivers kd[200], *kdp = &kd[0];
-	size_t i, sz = sizeof(kd);
-	int rc;
-	devmajor_t n = NODEVMAJOR;
-
-	if (type != S_IFCHR && type != S_IFBLK) {
-		errno = EINVAL;
-		return n;
-	}
-
-	do {
-		rc = sysctlbyname("kern.drivers", kdp, &sz, NULL, 0);
-		if (rc == -1) {
-			if (errno != ENOMEM)
-				goto out;
-			if (kdp != &kd[0])
-				free(kdp);
-			if ((kdp = malloc(sz)) == NULL)
-				return n;
-		}
-	} while (rc == -1);
-
-	sz /= sizeof(*kdp);
-
-	for (i = 0; i < sz; i++) {
-		if (strcmp(name, kdp[i].d_name) == 0) {
-			if (type == S_IFCHR)
-				n = kdp[i].d_cmajor;
-			else
-				n = kdp[i].d_bmajor;
-			break;
-		}
-	}
-	if (i >= sz)
-		errno = ENOENT;
-
-  out:
-	if (kdp != &kd[0])
-		free(kdp);
-
-	return n;
-}
diff --git a/lib/libc/gen/getdiskbyname.3 b/lib/libc/gen/getdiskbyname.3
deleted file mode 100644
index 93c01e428..000000000
--- a/lib/libc/gen/getdiskbyname.3
+++ /dev/null
@@ -1,105 +0,0 @@
-.\"	$NetBSD: getdiskbyname.3,v 1.13 2009/08/19 15:47:39 joerg Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)getdiskbyname.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt GETDISKBYNAME 3
-.Os
-.Sh NAME
-.Nm getdiskbyname ,
-.Nm setdisktab
-.Nd get generic disk description by its name
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/disklabel.h
-.In disktab.h
-.Ft int
-.Fn setdisktab "char *name"
-.Ft struct disklabel *
-.Fn getdiskbyname "const char *name"
-.Sh DESCRIPTION
-The
-.Fn getdiskbyname
-function
-takes a disk name (e.g.
-.Ql rm03 )
-and returns a prototype disk label
-describing its geometry information and the standard
-disk partition tables.
-All information is obtained from the
-.Xr disktab 5
-file.
-.Pp
-The
-.Fn setdisktab
-function changes the default
-.Sy disktab
-file name from
-.Pa /etc/disktab
-.Pq aka Dv _PATH_DISKTAB
-to
-.Fa name .
-.Sh RETURN VALUES
-.Fn getdiskbyname
-returns a null pointer if the entry is not found in the current
-.Pa disktab
-file.
-.Pp
-.Fn setdisktab
-returns 0 on success and \-1 if
-.Fa name
-is a null pointer or points to an empty string.
-.Sh FILES
-.Bl -tag -width /etc/disktab -compact
-.It Pa /etc/disktab
-the default database of disk types.
-.El
-.Sh SEE ALSO
-.Xr disklabel 5 ,
-.Xr disktab 5 ,
-.Xr disklabel 8
-.Sh HISTORY
-The
-.Fn getdiskbyname
-function appeared in
-.Bx 4.3 .
-.Pp
-The
-.Fn setdisktab
-function appeared in
-.Nx 1.4 .
-.Sh BUGS
-The
-.Fn getdiskbyname
-function leaves its results in an internal static object and returns a
-pointer to that object.
-Subsequent calls will modify the same object.
diff --git a/lib/libc/gen/getdomainname.3 b/lib/libc/gen/getdomainname.3
deleted file mode 100644
index 44f6244f3..000000000
--- a/lib/libc/gen/getdomainname.3
+++ /dev/null
@@ -1,99 +0,0 @@
-.\"	$NetBSD: getdomainname.3,v 1.16 2015/02/06 17:35:46 ginsbach Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd May 6, 1994
-.Dt GETDOMAINNAME 3
-.Os
-.Sh NAME
-.Nm getdomainname ,
-.Nm setdomainname
-.Nd get/set domain name of current host
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn getdomainname "char *name" "size_t namelen"
-.Ft int
-.Fn setdomainname "const char *name" "size_t namelen"
-.Sh DESCRIPTION
-.Fn getdomainname
-returns the standard domain name for the current host, as
-previously set by
-.Fn setdomainname .
-The parameter
-.Fa namelen
-specifies the size of the
-.Fa name
-array.
-The returned name is null-terminated unless insufficient
-space is provided.
-.Pp
-.Fn setdomainname
-sets the domain name of the host machine to be
-.Fa name ,
-which has length
-.Fa namelen .
-This call is restricted to the super-user and
-is normally used only when the system is bootstrapped.
-.Sh RETURN VALUES
-If the call succeeds a value of 0 is returned.
-If the call fails, a value of \-1 is returned and an error code is
-placed in the global location
-.Va errno .
-.Sh ERRORS
-The following errors may be returned by these calls:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa name
-or
-.Fa namelen
-parameter gave an
-invalid address.
-.It Bq Er EPERM
-The caller tried to set the domain name and was not the super-user.
-.El
-.Sh SEE ALSO
-.Xr gethostid 3 ,
-.Xr gethostname 3 ,
-.Xr sysctl 3
-.Sh HISTORY
-The
-.Nm
-function call appeared in
-.Bx 4.2 .
-.Sh BUGS
-Domain names are limited to
-.Dv MAXHOSTNAMELEN
-(from
-.Ao Pa sys/param.h Ac )
-characters including null-termination, currently 256.
diff --git a/lib/libc/gen/getdomainname.c b/lib/libc/gen/getdomainname.c
deleted file mode 100644
index cd58c7788..000000000
--- a/lib/libc/gen/getdomainname.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: getdomainname.c,v 1.13 2012/06/25 22:32:43 abs Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)gethostname.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getdomainname.c,v 1.13 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(getdomainname,_getdomainname)
-#endif
-
-int
-getdomainname(char *name, size_t namelen)
-{
-	int mib[2];
-	size_t size;
-	int olderrno;
-
-	_DIAGASSERT(name != NULL);
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_DOMAINNAME;
-	size = namelen;
-	olderrno = errno;
-	if (sysctl(mib, 2, name, &size, NULL, 0) == -1) {
-		if (errno == ENOMEM) {
-			errno = olderrno;
-			return (0);
-		}
-		return (-1);
-	}
-
-	return (0);
-}
diff --git a/lib/libc/gen/getfsent.3 b/lib/libc/gen/getfsent.3
deleted file mode 100644
index abfecfefd..000000000
--- a/lib/libc/gen/getfsent.3
+++ /dev/null
@@ -1,149 +0,0 @@
-.\"	$NetBSD: getfsent.3,v 1.12 2012/04/07 03:47:30 christos Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)getfsent.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd March 6, 2012
-.Dt GETFSENT 3
-.Os
-.Sh NAME
-.Nm getfsent ,
-.Nm getfsspec ,
-.Nm getfsfile ,
-.Nm setfsent ,
-.Nm endfsent
-.Nd get file system descriptor file entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fstab.h
-.Ft struct fstab *
-.Fn getfsent void
-.Ft struct fstab *
-.Fn getfsspec "const char *spec"
-.Ft struct fstab *
-.Fn getfsfile "const char *file"
-.Ft int
-.Fn setfsent void
-.Ft void
-.Fn endfsent void
-.Sh DESCRIPTION
-The
-.Fn getfsent ,
-.Fn getfsspec ,
-and
-.Fn getfsfile
-functions
-each return a pointer to an object with the following structure
-containing the broken-out fields of a line in the file system
-description file,
-.In fstab.h .
-.Bd -literal -offset indent
-struct fstab {
-	char	*fs_spec;	/* block special device name */
-	char	*fs_file;	/* file system path prefix */
-	char	*fs_vfstype;	/* type of file system */
-	char	*fs_mntops;	/* comma separated mount options */
-	char	*fs_type;	/* rw, ro, sw, or xx */
-	int	fs_freq;	/* dump frequency, in days */
-	int	fs_passno;	/* pass number on parallel dump */
-};
-.Ed
-.Pp
-The fields have meanings described in
-.Xr fstab 5 .
-.Pp
-The
-.Fn setfsent
-function
-opens the file (closing any previously opened file) or rewinds it
-if it is already open.
-.Pp
-The
-.Fn endfsent
-function
-closes the file.
-.Pp
-The
-.Fn getfsspec
-and
-.Fn getfsfile
-functions
-search the entire file (opening it if necessary) for a matching special
-file name or file system file name.
-.Pp
-For programs wishing to read the entire database,
-.Fn getfsent
-reads the next entry (opening the file if necessary).
-.Pp
-All entries in the file with a type field equivalent to
-.Dv FSTAB_XX
-are ignored.
-.Sh RETURN VALUES
-The
-.Fn getfsent ,
-.Fn getfsspec ,
-and
-.Fn getfsfile
-functions
-return a null pointer (0) on
-.Dv EOF
-or error.
-The
-.Fn setfsent
-function
-returns 0 on failure, 1 on success.
-The
-.Fn endfsent
-function
-returns nothing.
-.Sh FILES
-.Bl -tag -width /etc/fstab -compact
-.It Pa /etc/fstab
-.El
-.Sh SEE ALSO
-.Xr getfsspecname 3 ,
-.Xr fstab 5
-.Sh HISTORY
-The
-.Fn getfsent
-function appeared in
-.Bx 4.0 ;
-the
-.Fn endfsent ,
-.Fn getfsfile ,
-.Fn getfsspec ,
-and
-.Fn setfsent
-functions appeared in
-.Bx 4.3 .
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
diff --git a/lib/libc/gen/getgrent.3 b/lib/libc/gen/getgrent.3
deleted file mode 100644
index 9e89befe2..000000000
--- a/lib/libc/gen/getgrent.3
+++ /dev/null
@@ -1,344 +0,0 @@
-.\"	$NetBSD: getgrent.3,v 1.31 2011/04/28 16:34:01 wiz Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"     @(#)getgrent.3	8.2 (Berkeley) 4/19/94
-.\"
-.Dd April 30, 2008
-.Dt GETGRENT 3
-.Os
-.Sh NAME
-.Nm getgrent ,
-.Nm getgrent_r ,
-.Nm getgrgid ,
-.Nm getgrgid_r ,
-.Nm getgrnam ,
-.Nm getgrnam_r ,
-.Nm setgroupent ,
-.\" .Nm setgrfile ,
-.Nm setgrent ,
-.Nm endgrent
-.Nd group database operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In grp.h
-.Ft struct group *
-.Fn getgrent void
-.Ft int
-.Fo getgrent_r
-.Fa "struct group *grp"
-.Fa "char *buffer"
-.Fa "size_t buflen"
-.Fa "struct group **result"
-.Fc
-.Ft struct group *
-.Fn getgrgid "gid_t gid"
-.Ft int
-.Fo getgrgid_r
-.Fa "gid_t gid"
-.Fa "struct group *grp"
-.Fa "char *buffer"
-.Fa "size_t buflen"
-.Fa "struct group **result"
-.Fc
-.Ft struct group *
-.Fn getgrnam "const char *name"
-.Ft int
-.Fo getgrnam_r
-.Fa "const char *name"
-.Fa "struct group *grp"
-.Fa "char *buffer"
-.Fa "size_t buflen"
-.Fa "struct group **result"
-.Fc
-.Ft int
-.Fn setgroupent "int stayopen"
-.\" .Ft void
-.\" .Fn setgrfile "const char *name"
-.Ft void
-.Fn setgrent void
-.Ft void
-.Fn endgrent void
-.Sh DESCRIPTION
-These functions operate on the group database which is described in
-.Xr group 5 .
-Each line of the database is defined by the structure
-.Ar group
-found in the include
-file
-.In grp.h :
-.Bd -literal -offset indent
-struct group {
-	char	*gr_name;	/* group name */
-	char	*gr_passwd;	/* group password */
-	gid_t	gr_gid;		/* group id */
-	char	**gr_mem;	/* group members */
-};
-.Ed
-.Pp
-The functions
-.Fn getgrnam
-and
-.Fn getgrgid
-search the group database for the given group name pointed to by
-.Ar name
-or the group id pointed to by
-.Ar gid ,
-respectively, returning the first one encountered.
-Identical group names or group ids may result in undefined behavior.
-.Pp
-The
-.Fn getgrent
-function sequentially reads the group database and is intended for programs
-that wish to step through the complete list of groups.
-.Pp
-All three functions will open the group file for reading, if necessary.
-.Pp
-The functions
-.Fn getgrnam_r ,
-.Fn getgrgid_r ,
-and
-.Fn getgrent_r
-act like their non re-entrant counterparts
-respectively, updating the contents of
-.Ar grp
-and storing a pointer to that in
-.Ar result ,
-and returning
-.Dv 0 .
-Storage used by
-.Ar grp
-is allocated from
-.Ar buffer ,
-which is
-.Ar buflen
-bytes in size.
-If the requested entry cannot be found,
-.Ar result
-will point to
-.Dv NULL
-and
-.Dv 0
-will be returned.
-If an error occurs,
-a non-zero error number will be returned and
-.Ar result
-will point to
-.Dv NULL .
-Calling
-.Fn getgrent_r
-from multiple threads will result in each thread reading a disjoint portion
-of the group database.
-.Pp
-The
-.Fn setgroupent
-function opens the file, or rewinds it if it is already open.
-If
-.Fa stayopen
-is non-zero, file descriptors are left open, significantly speeding
-functions subsequent calls.
-This functionality is unnecessary for
-.Fn getgrent
-as it doesn't close its file descriptors by default.
-It should also be noted that it is dangerous for long-running
-programs to use this functionality as the group file may be updated.
-.Pp
-The
-.Fn setgrent
-function is equivalent to
-.Fn setgroupent
-with an argument of zero.
-.Pp
-The
-.Fn endgrent
-function closes any open files.
-.Sh RETURN VALUES
-The functions
-.Fn getgrgid ,
-.Fn getgrnam ,
-and
-.Fn getgrent
-return a valid pointer to a group structure on success
-and a
-.Dv NULL
-pointer if the entry was not found or an error occured.
-If an error occured, the global variable
-.Dv errno
-is set to indicate the nature of the failure.
-.Pp
-The functions
-.Fn getgrgid_r ,
-.Fn getgrnam_r ,
-and
-.Fn getgrent_r
-return
-.Dv 0
-on success or entry not found, and non-zero on failure, setting the global
-variable
-.Dv errno
-to indicate the nature of the failure.
-.Pp
-The
-.Fn setgroupent
-function returns the value 1 if successful, otherwise the value
-0 is returned, setting the global variable
-.Dv errno
-to indicate the nature of the failure.
-.Pp
-The
-.Fn endgrent
-and
-.Fn setgrent
-functions have no return value.
-.Sh FILES
-.Bl -tag -width /etc/group -compact
-.It Pa /etc/group
-group database file
-.El
-.Sh COMPATIBILITY
-The historic function
-.Fn setgrfile ,
-which allowed the specification of alternative group databases, has
-been deprecated and is no longer available.
-.Sh ERRORS
-The following error codes may be set in
-.Va errno
-for
-.Nm getgrent ,
-.Nm getgrent_r ,
-.Nm getgrnam ,
-.Nm getgrnam_r ,
-.Nm getgrgid ,
-.Nm getgrgid_r ,
-and
-.Nm setgroupent :
-.Bl -tag -width Er
-.It Bq Er EINTR
-A signal was caught during the database search.
-.It Bq Er EIO
-An I/O error has occurred.
-.It Bq Er EMFILE
-The limit on open files for this process has been reached.
-.It Bq Er ENFILE
-The system limit on open files has been reached.
-.El
-.Pp
-The following error code may be set in
-.Va errno
-for
-.Nm getgrent_r ,
-.Nm getgrnam_r ,
-and
-.Nm getgrgid_r :
-.Bl -tag -width Er
-.It Bq Er ERANGE
-The resulting
-.Ft struct group
-does not fit in the space defined by
-.Dv buffer
-and
-.Dv buflen
-.El
-.Pp
-Other
-.Dv errno
-values may be set depending on the specific database backends.
-.Sh SEE ALSO
-.Xr getpwent 3 ,
-.Xr group 5 ,
-.Xr nsswitch.conf 5
-.Sh STANDARDS
-The
-.Fn getgrgid
-and
-.Fn getgrnam
-functions conform to
-.St -p1003.1-90 .
-The
-.Fn getgrgid_r
-and
-.Fn getgrnam_r
-functions conform to
-.St -p1003.1c-95 .
-The
-.Fn endgrent ,
-.Fn getgrent ,
-and
-.Fn setgrent
-functions conform to
-.St -xpg4.2
-and
-.St -p1003.1-2004
-(XSI extension).
-.Sh HISTORY
-The functions
-.Fn endgrent ,
-.Fn getgrent ,
-.Fn getgrgid ,
-.Fn getgrnam ,
-and
-.Fn setgrent
-appeared in
-.At v7 .
-The functions
-.Fn setgrfile
-and
-.Fn setgroupent
-appeared in
-.Bx 4.3 Reno .
-The functions
-.Fn getgrgid_r
-and
-.Fn getgrnam_r
-appeared in
-.Nx 3.0 .
-.Sh BUGS
-The functions
-.Fn getgrent ,
-.Fn getgrgid ,
-.Fn getgrnam ,
-.Fn setgroupent
-and
-.Fn setgrent
-leave their results in an internal static object and return
-a pointer to that object.
-Subsequent calls to the same function will modify the same object.
-.Pp
-The functions
-.Fn getgrent ,
-.Fn endgrent ,
-.Fn setgroupent ,
-and
-.Fn setgrent
-are fairly useless in a networked environment and should be
-avoided, if possible.
-.Fn getgrent
-makes no attempt to suppress duplicate information if multiple
-sources are specified in
-.Xr nsswitch.conf 5
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
deleted file mode 100644
index 783446528..000000000
--- a/lib/libc/gen/getgrent.c
+++ /dev/null
@@ -1,1954 +0,0 @@
-/*	$NetBSD: getgrent.c,v 1.67 2012/08/29 18:50:35 dholland Exp $	*/
-
-/*-
- * Copyright (c) 1999-2000, 2004-2005 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1994, Jason Downs. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getgrent.c	8.2 (Berkeley) 3/21/94";
-#else
-__RCSID("$NetBSD: getgrent.c,v 1.67 2012/08/29 18:50:35 dholland Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <sys/param.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <grp.h>
-#include <limits.h>
-#include <nsswitch.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-
-#ifdef HESIOD
-#include <hesiod.h>
-#endif
-
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#include "gr_private.h"
-
-#ifdef __weak_alias
-__weak_alias(endgrent,_endgrent)
-__weak_alias(getgrent,_getgrent)
-__weak_alias(getgrent_r,_getgrent_r)
-__weak_alias(getgrgid,_getgrgid)
-__weak_alias(getgrgid_r,_getgrgid_r)
-__weak_alias(getgrnam,_getgrnam)
-__weak_alias(getgrnam_r,_getgrnam_r)
-__weak_alias(setgrent,_setgrent)
-__weak_alias(setgroupent,_setgroupent)
-#endif
-
-#ifdef _REENTRANT
-mutex_t	__grmutex = MUTEX_INITIALIZER;
-#endif
-
-/*
- * _gr_memfrombuf
- *	Obtain want bytes from buffer (of size buflen) and return a pointer
- *	to the available memory after adjusting buffer/buflen.
- *	Returns NULL if there is insufficient space.
- */
-static char *
-_gr_memfrombuf(size_t want, char **buffer, size_t *buflen)
-{
-	char	*rv;
-
-	if (want > *buflen) {
-		errno = ERANGE;
-		return NULL;
-	}
-	rv = *buffer;
-	*buffer += want;
-	*buflen -= want;
-	return rv;
-}
-
-/*
- * _gr_parse
- *	Parses entry as a line per group(5) (without the trailing \n)
- *	and fills in grp with corresponding values; memory for strings
- *	and arrays will be allocated from buf (of size buflen).
- *	Returns 1 if parsed successfully, 0 on parse failure.
- */
-static int
-_gr_parse(const char *entry, struct group *grp, char *buf, size_t buflen)
-{
-	unsigned long	id;
-	const char	*bp;
-	char		*ep;
-	size_t		count;
-	int		memc;
-
-	_DIAGASSERT(entry != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buf != NULL);
-
-#define COPYTOBUF(to) \
-	do { \
-		(to) = _gr_memfrombuf(count+1, &buf, &buflen); \
-		if ((to) == NULL) \
-			return 0; \
-		memmove((to), entry, count); \
-		to[count] = '\0'; \
-	} while (0)	/* LINTED */
-
-#if 0
-	if (*entry == '+')			/* fail on compat `+' token */
-		return 0;
-#endif
-
-	count = strcspn(entry, ":");		/* parse gr_name */
-	if (entry[count] == '\0')
-		return 0;
-	COPYTOBUF(grp->gr_name);
-	entry += count + 1;
-
-	count = strcspn(entry, ":");		/* parse gr_passwd */
-	if (entry[count] == '\0')
-		return 0;
-	COPYTOBUF(grp->gr_passwd);
-	entry += count + 1;
-
-	count = strcspn(entry, ":");		/* parse gr_gid */
-	if (entry[count] == '\0')
-		return 0;
-	id = strtoul(entry, &ep, 10);
-	if (id > GID_MAX || *ep != ':')
-		return 0;
-	grp->gr_gid = (gid_t)id;
-	entry += count + 1;
-
-	memc = 1;				/* for final NULL */
-	if (*entry != '\0')
-		memc++;				/* for first item */
-	for (bp = entry; *bp != '\0'; bp++) {
-		if (*bp == ',')
-			memc++;
-	}
-				/* grab ALIGNed char **gr_mem from buf */
-	ep = _gr_memfrombuf(memc * sizeof(char *) + ALIGNBYTES, &buf, &buflen);
-	if (ep == NULL)
-		return 0;
-	grp->gr_mem = (char **)ALIGN(ep);
-
-	for (memc = 0; *entry != '\0'; memc++) {
-		count = strcspn(entry, ",");	/* parse member */
-		COPYTOBUF(grp->gr_mem[memc]);
-		entry += count;
-		if (*entry == ',')
-			entry++;
-	}
-
-#undef COPYTOBUF
-
-	grp->gr_mem[memc] = NULL;
-	return 1;
-}
-
-/*
- * _gr_copy
- *	Copy the contents of fromgrp to grp; memory for strings
- *	and arrays will be allocated from buf (of size buflen).
- *	Returns 1 if copied successfully, 0 on copy failure.
- *	NOTE: fromgrp must not use buf for its own pointers.
- */
-static int
-_gr_copy(struct group *fromgrp, struct group *grp, char *buf, size_t buflen)
-{
-	char	*ep;
-	int	memc;
-
-	_DIAGASSERT(fromgrp != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buf != NULL);
-
-#define COPYSTR(to, from) \
-	do { \
-		size_t count = strlen((from)); \
-		(to) = _gr_memfrombuf(count+1, &buf, &buflen); \
-		if ((to) == NULL) \
-			return 0; \
-		memmove((to), (from), count); \
-		to[count] = '\0'; \
-	} while (0)	/* LINTED */
-
-	COPYSTR(grp->gr_name, fromgrp->gr_name);
-	COPYSTR(grp->gr_passwd, fromgrp->gr_passwd);
-	grp->gr_gid = fromgrp->gr_gid;
-
-	if (fromgrp->gr_mem == NULL)
-		return 0;
-
-	for (memc = 0; fromgrp->gr_mem[memc]; memc++)
-		continue;
-	memc++;					/* for final NULL */
-
-				/* grab ALIGNed char **gr_mem from buf */
-	ep = _gr_memfrombuf(memc * sizeof(char *) + ALIGNBYTES, &buf, &buflen);
-	grp->gr_mem = (char **)ALIGN(ep);
-	if (grp->gr_mem == NULL)
-		return 0;
-
-	for (memc = 0; fromgrp->gr_mem[memc]; memc++) {
-		COPYSTR(grp->gr_mem[memc], fromgrp->gr_mem[memc]);
-	}
-
-#undef COPYSTR
-
-	grp->gr_mem[memc] = NULL;
-	return 1;
-}
-
-		/*
-		 *	files methods
-		 */
-
-int
-__grstart_files(struct __grstate_files *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	if (state->fp == NULL) {
-		state->fp = fopen(_PATH_GROUP, "re");
-		if (state->fp == NULL)
-			return NS_UNAVAIL;
-	} else {
-		rewind(state->fp);
-	}
-	return NS_SUCCESS;
-}
-
-int
-__grend_files(struct __grstate_files *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	if (state->fp) {
-		(void) fclose(state->fp);
-		state->fp = NULL;
-	}
-	return NS_SUCCESS;
-}
-
-/*
- * __grscan_files
- *	Scan state->fp for the next desired entry.
- *	If search is zero, return the next entry.
- *	If search is non-zero, look for a specific name (if name != NULL),
- *	or a specific gid (if name == NULL).
- *	Sets *retval to the errno if the result is not NS_SUCCESS
- *	or NS_NOTFOUND.
- */
-int
-__grscan_files(int *retval, struct group *grp, char *buffer, size_t buflen,
-	struct __grstate_files *state, int search, const char *name, gid_t gid)
-{
-	int	rv;
-	char	filebuf[_GETGR_R_SIZE_MAX], *ep;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(state != NULL);
-	/* name is NULL to indicate searching for gid */
-
-	*retval = 0;
-
-	if (state->fp == NULL) {	/* only start if file not open yet */
-		rv = __grstart_files(state);
-		if (rv != NS_SUCCESS)
-			goto filesgrscan_out;
-	}
-
-	rv = NS_NOTFOUND;
-
-							/* scan line by line */
-	while (fgets(filebuf, (int)sizeof(filebuf), state->fp) != NULL) {
-		ep = strchr(filebuf, '\n');
-		if (ep == NULL) {	/* skip lines that are too big */
-			int ch;
-
-			while ((ch = getc(state->fp)) != '\n' && ch != EOF)
-				continue;
-			continue;
-		}
-		*ep = '\0';				/* clear trailing \n */
-
-		if (filebuf[0] == '+')			/* skip compat line */
-			continue;
-
-							/* validate line */
-		if (! _gr_parse(filebuf, grp, buffer, buflen)) {
-			continue;			/* skip bad lines */
-		}
-		if (! search) {				/* just want this one */
-			rv = NS_SUCCESS;
-			break;
-		}
-							/* want specific */
-		if ((name && strcmp(name, grp->gr_name) == 0) ||
-		    (!name && gid == grp->gr_gid)) {
-			rv = NS_SUCCESS;
-			break;
-		}
-	}
-
- filesgrscan_out:
-	if (rv != NS_SUCCESS && rv != NS_NOTFOUND)
-		*retval = errno;
-	return rv;
-}
-
-
-static struct __grstate_files	_files_state;
-					/* storage for non _r functions */
-static struct group		_files_group;
-static char			_files_groupbuf[_GETGR_R_SIZE_MAX];
-
-/*ARGSUSED*/
-static int
-_files_setgrent(void *nsrv, void *nscb, va_list ap)
-{
-
-	_files_state.stayopen = 0;
-	return __grstart_files(&_files_state);
-}
-
-/*ARGSUSED*/
-static int
-_files_setgroupent(void *nsrv, void *nscb, va_list ap)
-{
-	int	*retval		= va_arg(ap, int *);
-	int	 stayopen	= va_arg(ap, int);
-
-	int	rv;
-
-	_files_state.stayopen = stayopen;
-	rv = __grstart_files(&_files_state);
-	*retval = (rv == NS_SUCCESS);
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_files_endgrent(void *nsrv, void *nscb, va_list ap)
-{
-
-	_files_state.stayopen = 0;
-	return __grend_files(&_files_state);
-}
-
-/*ARGSUSED*/
-static int
-_files_getgrent(void *nsrv, void *nscb, va_list ap)
-{
-	struct group	**retval = va_arg(ap, struct group **);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = __grscan_files(&rerror, &_files_group,
-	    _files_groupbuf, sizeof(_files_groupbuf),
-	    &_files_state, 0, NULL, 0);
-	if (rv == NS_SUCCESS)
-		*retval = &_files_group;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_files_getgrent_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	struct group	*grp	= va_arg(ap, struct group *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct group   **result	= va_arg(ap, struct group **);
-
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	rv = __grscan_files(retval, grp, buffer, buflen,
-	    &_files_state, 0, NULL, 0);
-	if (rv == NS_SUCCESS)
-		*result = grp;
-	else
-		*result = NULL;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_files_getgrgid(void *nsrv, void *nscb, va_list ap)
-{
-	struct group	**retval = va_arg(ap, struct group **);
-	gid_t		 gid	= va_arg(ap, gid_t);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = __grstart_files(&_files_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	rv = __grscan_files(&rerror, &_files_group,
-	    _files_groupbuf, sizeof(_files_groupbuf),
-	    &_files_state, 1, NULL, gid);
-	if (!_files_state.stayopen)
-		__grend_files(&_files_state);
-	if (rv == NS_SUCCESS)
-		*retval = &_files_group;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_files_getgrgid_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	gid_t		 gid	= va_arg(ap, gid_t);
-	struct group	*grp	= va_arg(ap, struct group *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct group   **result	= va_arg(ap, struct group **);
-
-	struct __grstate_files state;
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	memset(&state, 0, sizeof(state));
-	rv = __grscan_files(retval, grp, buffer, buflen, &state, 1, NULL, gid);
-	__grend_files(&state);
-	if (rv == NS_SUCCESS)
-		*result = grp;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_files_getgrnam(void *nsrv, void *nscb, va_list ap)
-{
-	struct group	**retval = va_arg(ap, struct group **);
-	const char	*name	= va_arg(ap, const char *);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = __grstart_files(&_files_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	rv = __grscan_files(&rerror, &_files_group,
-	    _files_groupbuf, sizeof(_files_groupbuf),
-	    &_files_state, 1, name, 0);
-	if (!_files_state.stayopen)
-		__grend_files(&_files_state);
-	if (rv == NS_SUCCESS)
-		*retval = &_files_group;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_files_getgrnam_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	const char	*name	= va_arg(ap, const char *);
-	struct group	*grp	= va_arg(ap, struct group *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct group   **result	= va_arg(ap, struct group **);
-
-	struct __grstate_files state;
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	memset(&state, 0, sizeof(state));
-	rv = __grscan_files(retval, grp, buffer, buflen, &state, 1, name, 0);
-	__grend_files(&state);
-	if (rv == NS_SUCCESS)
-		*result = grp;
-	return rv;
-}
-
-
-#ifdef HESIOD
-		/*
-		 *	dns methods
-		 */
-
-int
-__grstart_dns(struct __grstate_dns *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	state->num = 0;
-	if (state->context == NULL) {			/* setup Hesiod */
-		if (hesiod_init(&state->context) == -1)
-			return NS_UNAVAIL;
-	}
-
-	return NS_SUCCESS;
-}
-
-int
-__grend_dns(struct __grstate_dns *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	state->num = 0;
-	if (state->context) {
-		hesiod_end(state->context);
-		state->context = NULL;
-	}
-	return NS_SUCCESS;
-}
-
-/*
- * __grscan_dns
- *	Search Hesiod for the next desired entry.
- *	If search is zero, return the next entry.
- *	If search is non-zero, look for a specific name (if name != NULL),
- *	or a specific gid (if name == NULL).
- */
-int
-__grscan_dns(int *retval, struct group *grp, char *buffer, size_t buflen,
-	struct __grstate_dns *state, int search, const char *name, gid_t gid)
-{
-	const char	**curzone;
-	char		**hp, *ep;
-	int		rv;
-
-	static const char *zones_gid_group[] = {
-		"gid",
-		"group",
-		NULL
-	};
-
-	static const char *zones_group[] = {
-		"group",
-		NULL
-	};
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(state != NULL);
-	/* name is NULL to indicate searching for gid */
-
-	*retval = 0;
-
-	if (state->context == NULL) {	/* only start if Hesiod not setup */
-		rv = __grstart_dns(state);
-		if (rv != NS_SUCCESS)
-			return rv;
-	}
-
- next_dns_entry:
-	hp = NULL;
-	rv = NS_NOTFOUND;
-
-	if (! search) {			/* find next entry */
-		if (state->num == -1)		/* exhausted search */
-			return NS_NOTFOUND;
-						/* find group-NNN */
-		snprintf(buffer, buflen, "group-%u", state->num);
-		state->num++;
-		curzone = zones_group;
-	} else if (name) {		/* find group name */
-		snprintf(buffer, buflen, "%s", name);
-		curzone = zones_group;
-	} else {			/* find gid */
-		snprintf(buffer, buflen, "%u", (unsigned int)gid);
-		curzone = zones_gid_group;
-	}
-
-	for (; *curzone; curzone++) {		/* search zones */
-		hp = hesiod_resolve(state->context, buffer, *curzone);
-		if (hp != NULL)
-			break;
-		if (errno != ENOENT) {
-			rv = NS_UNAVAIL;
-			goto dnsgrscan_out;
-		}
-	}
-	if (*curzone == NULL) {
-		if (! search)
-			state->num = -1;
-		goto dnsgrscan_out;
-	}
-
-	if ((ep = strchr(hp[0], '\n')) != NULL)
-		*ep = '\0';				/* clear trailing \n */
-	if (_gr_parse(hp[0], grp, buffer, buflen)) {	/* validate line */
-		if (! search) {				/* just want this one */
-			rv = NS_SUCCESS;
-		} else if ((name && strcmp(name, grp->gr_name) == 0) ||
-		    (!name && gid == grp->gr_gid)) {	/* want specific */
-			rv = NS_SUCCESS;
-		}
-	} else {					/* dodgy entry */
-		if (!search) {			/* try again if ! searching */
-			hesiod_free_list(state->context, hp);
-			goto next_dns_entry;
-		}
-	}
-
- dnsgrscan_out:
-	if (rv != NS_SUCCESS && rv != NS_NOTFOUND)
-		*retval = errno;
-	if (hp)
-		hesiod_free_list(state->context, hp);
-	return rv;
-}
-
-static struct __grstate_dns	_dns_state;
-					/* storage for non _r functions */
-static struct group		_dns_group;
-static char			_dns_groupbuf[_GETGR_R_SIZE_MAX];
-
-/*ARGSUSED*/
-static int
-_dns_setgrent(void *nsrv, void *nscb, va_list ap)
-{
-
-	_dns_state.stayopen = 0;
-	return __grstart_dns(&_dns_state);
-}
-
-/*ARGSUSED*/
-static int
-_dns_setgroupent(void *nsrv, void *nscb, va_list ap)
-{
-	int	*retval		= va_arg(ap, int *);
-	int	 stayopen	= va_arg(ap, int);
-
-	int	rv;
-
-	_dns_state.stayopen = stayopen;
-	rv = __grstart_dns(&_dns_state);
-	*retval = (rv == NS_SUCCESS);
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_dns_endgrent(void *nsrv, void *nscb, va_list ap)
-{
-
-	_dns_state.stayopen = 0;
-	return __grend_dns(&_dns_state);
-}
-
-/*ARGSUSED*/
-static int
-_dns_getgrent(void *nsrv, void *nscb, va_list ap)
-{
-	struct group	**retval = va_arg(ap, struct group **);
-
-	int	  rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = __grscan_dns(&rerror, &_dns_group,
-	    _dns_groupbuf, sizeof(_dns_groupbuf), &_dns_state, 0, NULL, 0);
-	if (rv == NS_SUCCESS)
-		*retval = &_dns_group;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_dns_getgrent_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	struct group	*grp	= va_arg(ap, struct group *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct group   **result	= va_arg(ap, struct group **);
-
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	rv = __grscan_dns(retval, grp, buffer, buflen,
-	    &_dns_state, 0, NULL, 0);
-	if (rv == NS_SUCCESS)
-		*result = grp;
-	else
-		*result = NULL;
-	return rv;
-}
-/*ARGSUSED*/
-static int
-_dns_getgrgid(void *nsrv, void *nscb, va_list ap)
-{
-	struct group	**retval = va_arg(ap, struct group **);
-	gid_t		 gid	= va_arg(ap, gid_t);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = __grstart_dns(&_dns_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	rv = __grscan_dns(&rerror, &_dns_group,
-	    _dns_groupbuf, sizeof(_dns_groupbuf), &_dns_state, 1, NULL, gid);
-	if (!_dns_state.stayopen)
-		__grend_dns(&_dns_state);
-	if (rv == NS_SUCCESS)
-		*retval = &_dns_group;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_dns_getgrgid_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	gid_t		 gid	= va_arg(ap, gid_t);
-	struct group	*grp	= va_arg(ap, struct group *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct group   **result	= va_arg(ap, struct group **);
-
-	struct __grstate_dns state;
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	memset(&state, 0, sizeof(state));
-	rv = __grscan_dns(retval, grp, buffer, buflen, &state, 1, NULL, gid);
-	__grend_dns(&state);
-	if (rv == NS_SUCCESS)
-		*result = grp;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_dns_getgrnam(void *nsrv, void *nscb, va_list ap)
-{
-	struct group	**retval = va_arg(ap, struct group **);
-	const char	*name	= va_arg(ap, const char *);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = __grstart_dns(&_dns_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	rv = __grscan_dns(&rerror, &_dns_group,
-	    _dns_groupbuf, sizeof(_dns_groupbuf), &_dns_state, 1, name, 0);
-	if (!_dns_state.stayopen)
-		__grend_dns(&_dns_state);
-	if (rv == NS_SUCCESS)
-		*retval = &_dns_group;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_dns_getgrnam_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	const char	*name	= va_arg(ap, const char *);
-	struct group	*grp	= va_arg(ap, struct group *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct group   **result	= va_arg(ap, struct group **);
-
-	struct __grstate_dns state;
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	memset(&state, 0, sizeof(state));
-	rv = __grscan_dns(retval, grp, buffer, buflen, &state, 1, name, 0);
-	__grend_dns(&state);
-	if (rv == NS_SUCCESS)
-		*result = grp;
-	return rv;
-}
-
-#endif /* HESIOD */
-
-
-#ifdef YP
-		/*
-		 *	nis methods
-		 */
-
-int
-__grstart_nis(struct __grstate_nis *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	state->done = 0;
-	if (state->current) {
-		free(state->current);
-		state->current = NULL;
-	}
-	if (state->domain == NULL) {			/* setup NIS */
-		switch (yp_get_default_domain(&state->domain)) {
-		case 0:
-			break;
-		case YPERR_RESRC:
-			return NS_TRYAGAIN;
-		default:
-			return NS_UNAVAIL;
-		}
-	}
-	return NS_SUCCESS;
-}
-
-int
-__grend_nis(struct __grstate_nis *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	if (state->domain) {
-		state->domain = NULL;
-	}
-	state->done = 0;
-	if (state->current) {
-		free(state->current);
-		state->current = NULL;
-	}
-	return NS_SUCCESS;
-}
-
-/*
- * __grscan_nis
- *	Search NIS for the next desired entry.
- *	If search is zero, return the next entry.
- *	If search is non-zero, look for a specific name (if name != NULL),
- *	or a specific gid (if name == NULL).
- */
-int
-__grscan_nis(int *retval, struct group *grp, char *buffer, size_t buflen,
-	struct __grstate_nis *state, int search, const char *name, gid_t gid)
-{
-	const char *map;
-	char	*key, *data;
-	int	nisr, rv, keylen, datalen;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(state != NULL);
-	/* name is NULL to indicate searching for gid */
-
-	*retval = 0;
-
-	if (state->domain == NULL) {	/* only start if NIS not setup */
-		rv = __grstart_nis(state);
-		if (rv != NS_SUCCESS)
-			return rv;
-	}
-
- next_nis_entry:
-	key = NULL;
-	data = NULL;
-	rv = NS_SUCCESS;
-
-	if (! search) 	{			/* find next entry */
-		if (state->done)			/* exhausted search */
-			return NS_NOTFOUND;
-		map = "group.byname";
-		if (state->current) {			/* already searching */
-			nisr = yp_next(state->domain, map,
-			    state->current, state->currentlen,
-			    &key, &keylen, &data, &datalen);
-			free(state->current);
-			state->current = NULL;
-			switch (nisr) {
-			case 0:
-				state->current = key;
-				state->currentlen = keylen;
-				key = NULL;
-				break;
-			case YPERR_NOMORE:
-				rv = NS_NOTFOUND;
-				state->done = 1;
-				break;
-			default:
-				rv = NS_UNAVAIL;
-				break;
-			}
-		} else {				/* new search */
-			if (yp_first(state->domain, map,
-			    &state->current, &state->currentlen,
-			    &data, &datalen)) {
-				rv = NS_UNAVAIL;
-			}
-		}
-	} else {				/* search for specific item */
-		if (name) {			/* find group name */
-			snprintf(buffer, buflen, "%s", name);
-			map = "group.byname";
-		} else {			/* find gid */
-			snprintf(buffer, buflen, "%u", (unsigned int)gid);
-			map = "group.bygid";
-		}
-		nisr = yp_match(state->domain, map, buffer, (int)strlen(buffer),
-		    &data, &datalen);
-		switch (nisr) {
-		case 0:
-			break;
-		case YPERR_KEY:
-			rv = NS_NOTFOUND;
-			break;
-		default:
-			rv = NS_UNAVAIL;
-			break;
-		}
-	}
-	if (rv == NS_SUCCESS) {				/* validate data */
-		data[datalen] = '\0';			/* clear trailing \n */
-		if (_gr_parse(data, grp, buffer, buflen)) {
-			if (! search) {			/* just want this one */
-				rv = NS_SUCCESS;
-			} else if ((name && strcmp(name, grp->gr_name) == 0) ||
-			    (!name && gid == grp->gr_gid)) {
-							/* want specific */
-				rv = NS_SUCCESS;
-			}
-		} else {				/* dodgy entry */
-			if (!search) {		/* try again if ! searching */
-				free(data);
-				goto next_nis_entry;
-			}
-		}
-	}
-
-	if (rv != NS_SUCCESS && rv != NS_NOTFOUND)
-		*retval = errno;
-	if (key)
-		free(key);
-	if (data)
-		free(data);
-	return rv;
-}
-
-static struct __grstate_nis	_nis_state;
-					/* storage for non _r functions */
-static struct group		_nis_group;
-static char			_nis_groupbuf[_GETGR_R_SIZE_MAX];
-
-/*ARGSUSED*/
-static int
-_nis_setgrent(void *nsrv, void *nscb, va_list ap)
-{
-
-	_nis_state.stayopen = 0;
-	return __grstart_nis(&_nis_state);
-}
-
-/*ARGSUSED*/
-static int
-_nis_setgroupent(void *nsrv, void *nscb, va_list ap)
-{
-	int	*retval		= va_arg(ap, int *);
-	int	 stayopen	= va_arg(ap, int);
-
-	int	rv;
-
-	_nis_state.stayopen = stayopen;
-	rv = __grstart_nis(&_nis_state);
-	*retval = (rv == NS_SUCCESS);
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_nis_endgrent(void *nsrv, void *nscb, va_list ap)
-{
-
-	return __grend_nis(&_nis_state);
-}
-
-/*ARGSUSED*/
-static int
-_nis_getgrent(void *nsrv, void *nscb, va_list ap)
-{
-	struct group	**retval = va_arg(ap, struct group **);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = __grscan_nis(&rerror, &_nis_group,
-	    _nis_groupbuf, sizeof(_nis_groupbuf), &_nis_state, 0, NULL, 0);
-	if (rv == NS_SUCCESS)
-		*retval = &_nis_group;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_nis_getgrent_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	struct group	*grp	= va_arg(ap, struct group *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct group   **result	= va_arg(ap, struct group **);
-
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	rv = __grscan_nis(retval, grp, buffer, buflen,
-	    &_nis_state, 0, NULL, 0);
-	if (rv == NS_SUCCESS)
-		*result = grp;
-	else
-		*result = NULL;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_nis_getgrgid(void *nsrv, void *nscb, va_list ap)
-{
-	struct group	**retval = va_arg(ap, struct group **);
-	gid_t		 gid	= va_arg(ap, gid_t);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = __grstart_nis(&_nis_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	rv = __grscan_nis(&rerror, &_nis_group,
-	    _nis_groupbuf, sizeof(_nis_groupbuf), &_nis_state, 1, NULL, gid);
-	if (!_nis_state.stayopen)
-		__grend_nis(&_nis_state);
-	if (rv == NS_SUCCESS)
-		*retval = &_nis_group;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_nis_getgrgid_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	gid_t		 gid	= va_arg(ap, gid_t);
-	struct group	*grp	= va_arg(ap, struct group *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct group   **result	= va_arg(ap, struct group **);
-
-	struct __grstate_nis state;
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-/* remark: we run under a global mutex inside of this module ... */
-	if (_nis_state.stayopen)
-	  { /* use global state only if stayopen is set - otherwiese we would blow up getgrent_r() ... */
-	     rv = __grscan_nis(retval, grp, buffer, buflen, &_nis_state, 1, NULL, gid);
-	  }
-	else
-	  {
-	    memset(&state, 0, sizeof(state));
-	    rv = __grscan_nis(retval, grp, buffer, buflen, &state, 1, NULL, gid);
-	    __grend_nis(&state);
-	  }
-	if (rv == NS_SUCCESS)
-		*result = grp;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_nis_getgrnam(void *nsrv, void *nscb, va_list ap)
-{
-	struct group	**retval = va_arg(ap, struct group **);
-	const char	*name	= va_arg(ap, const char *);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = __grstart_nis(&_nis_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	rv = __grscan_nis(&rerror, &_nis_group,
-	    _nis_groupbuf, sizeof(_nis_groupbuf), &_nis_state, 1, name, 0);
-	if (!_nis_state.stayopen)
-		__grend_nis(&_nis_state);
-	if (rv == NS_SUCCESS)
-		*retval = &_nis_group;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_nis_getgrnam_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	const char	*name	= va_arg(ap, const char *);
-	struct group	*grp	= va_arg(ap, struct group *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct group   **result	= va_arg(ap, struct group **);
-
-	struct __grstate_nis state;
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-/* remark: we run under a global mutex inside of this module ... */
-	if (_nis_state.stayopen)
-	  { /* use global state only if stayopen is set - otherwiese we would blow up getgrent_r() ... */
-	     rv = __grscan_nis(retval, grp, buffer, buflen, &_nis_state, 1, name, 0);
-	  }
-	else
-	  {
-	    memset(&state, 0, sizeof(state));
-	    rv = __grscan_nis(retval, grp, buffer, buflen, &state, 1, name, 0);
-	    __grend_nis(&state);
-	  }
-	if (rv == NS_SUCCESS)
-		*result = grp;
-	return rv;
-}
-
-#endif /* YP */
-
-
-#ifdef _GROUP_COMPAT
-		/*
-		 *	compat methods
-		 */
-
-int
-__grstart_compat(struct __grstate_compat *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	if (state->fp == NULL) {
-		state->fp = fopen(_PATH_GROUP, "re");
-		if (state->fp == NULL)
-			return NS_UNAVAIL;
-	} else {
-		rewind(state->fp);
-	}
-	return NS_SUCCESS;
-}
-
-int
-__grend_compat(struct __grstate_compat *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	if (state->name) {
-		free(state->name);
-		state->name = NULL;
-	}
-	if (state->fp) {
-		(void) fclose(state->fp);
-		state->fp = NULL;
-	}
-	return NS_SUCCESS;
-}
-
-
-/*
- * __grbad_compat
- *	log an error if "files" or "compat" is specified in
- *	group_compat database
- */
-/*ARGSUSED*/
-int
-__grbad_compat(void *nsrv, void *nscb, va_list ap)
-{
-	static int warned;
-
-	_DIAGASSERT(nsrv != NULL);
-	_DIAGASSERT(nscb != NULL);
-
-	if (!warned) {
-		syslog(LOG_ERR,
-			"nsswitch.conf group_compat database can't use '%s'",
-			(const char *)nscb);
-	}
-	warned = 1;
-	return NS_UNAVAIL;
-}
-
-/*
- * __grscan_compat
- *	Scan state->fp for the next desired entry.
- *	If search is zero, return the next entry.
- *	If search is non-zero, look for a specific name (if name != NULL),
- *	or a specific gid (if name == NULL).
- *	Sets *retval to the errno if the result is not NS_SUCCESS or
- *	NS_NOTFOUND.
- *
- *	searchfunc is invoked when a compat "+" lookup is required;
- *	searchcookie is passed as the first argument to searchfunc,
- *	the second argument is the group result.
- *	This should return NS_NOTFOUND when "no more groups" from compat src.
- *	If searchfunc is NULL then nsdispatch of getgrent is used.
- *	This is primarily intended for getgroupmembership(3)'s compat backend.
- */
-int
-__grscan_compat(int *retval, struct group *grp, char *buffer, size_t buflen,
-	struct __grstate_compat *state, int search, const char *name, gid_t gid,
-	int (*searchfunc)(void *, struct group **), void *searchcookie)
-{
-	int		rv;
-	char		filebuf[_GETGR_R_SIZE_MAX], *ep;
-
-	static const ns_dtab compatentdtab[] = {
-		NS_FILES_CB(__grbad_compat, "files")
-		NS_DNS_CB(_dns_getgrent_r, NULL)
-		NS_NIS_CB(_nis_getgrent_r, NULL)
-		NS_COMPAT_CB(__grbad_compat, "compat")
-		NS_NULL_CB
-	};
-	static const ns_dtab compatgiddtab[] = {
-		NS_FILES_CB(__grbad_compat, "files")
-		NS_DNS_CB(_dns_getgrgid_r, NULL)
-		NS_NIS_CB(_nis_getgrgid_r, NULL)
-		NS_COMPAT_CB(__grbad_compat, "compat")
-		NS_NULL_CB
-	};
-	static const ns_dtab compatnamdtab[] = {
-		NS_FILES_CB(__grbad_compat, "files")
-		NS_DNS_CB(_dns_getgrnam_r, NULL)
-		NS_NIS_CB(_nis_getgrnam_r, NULL)
-		NS_COMPAT_CB(__grbad_compat, "compat")
-		NS_NULL_CB
-	};
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(state != NULL);
-	/* name is NULL to indicate searching for gid */
-
-	*retval = 0;
-
-	if (state->fp == NULL) {	/* only start if file not open yet */
-		rv = __grstart_compat(state);
-		if (rv != NS_SUCCESS)
-			goto compatgrscan_out;
-	}
-	rv = NS_NOTFOUND;
-
-	for (;;) {					/* loop through file */
-		if (state->name != NULL) {
-					/* processing compat entry */
-			int		crv, cretval;
-			struct group	cgrp, *cgrpres;
-
-			if (state->name[0]) {		/* specific +group: */
-				crv = nsdispatch(NULL, compatnamdtab,
-				    NSDB_GROUP_COMPAT, "getgrnam_r",
-				    __nsdefaultnis,
-				    &cretval, state->name,
-				    &cgrp, filebuf, sizeof(filebuf), &cgrpres);
-				free(state->name);	/* (only check 1 grp) */
-				state->name = NULL;
-			} else if (!search) {		/* any group */
-				if (searchfunc) {
-					crv = searchfunc(searchcookie,
-					    &cgrpres);
-				} else {
-					crv = nsdispatch(NULL, compatentdtab,
-					    NSDB_GROUP_COMPAT, "getgrent_r",
-					    __nsdefaultnis,
-					    &cretval, &cgrp, filebuf,
-					    sizeof(filebuf), &cgrpres);
-				}
-			} else if (name) {		/* specific group */
-				crv = nsdispatch(NULL, compatnamdtab,
-				    NSDB_GROUP_COMPAT, "getgrnam_r",
-				    __nsdefaultnis,
-				    &cretval, name,
-				    &cgrp, filebuf, sizeof(filebuf), &cgrpres);
-			} else {			/* specific gid */
-				crv = nsdispatch(NULL, compatgiddtab,
-				    NSDB_GROUP_COMPAT, "getgrgid_r",
-				    __nsdefaultnis,
-				    &cretval, gid,
-				    &cgrp, filebuf, sizeof(filebuf), &cgrpres);
-			}
-			if (crv != NS_SUCCESS) {	/* not found */
-				free(state->name);
-				state->name = NULL;
-				continue;		/* try next line */
-			}
-			if (!_gr_copy(cgrpres, grp, buffer, buflen)) {
-				rv = NS_UNAVAIL;
-				break;
-			}
-			goto compatgrscan_cmpgrp;	/* skip to grp test */
-		}
-
-							/* get next file line */
-		if (fgets(filebuf, (int)sizeof(filebuf), state->fp) == NULL)
-			break;
-
-		ep = strchr(filebuf, '\n');
-		if (ep == NULL) {	/* skip lines that are too big */
-			int ch;
-
-			while ((ch = getc(state->fp)) != '\n' && ch != EOF)
-				continue;
-			continue;
-		}
-		*ep = '\0';				/* clear trailing \n */
-
-		if (filebuf[0] == '+') {		/* parse compat line */
-			if (state->name)
-				free(state->name);
-			state->name = NULL;
-			switch(filebuf[1]) {
-			case ':':
-			case '\0':
-				state->name = strdup("");
-				break;
-			default:
-				ep = strchr(filebuf + 1, ':');
-				if (ep == NULL)
-					break;
-				*ep = '\0';
-				state->name = strdup(filebuf + 1);
-				break;
-			}
-			if (state->name == NULL) {
-				rv = NS_UNAVAIL;
-				break;
-			}
-			continue;
-		}
-
-							/* validate line */
-		if (! _gr_parse(filebuf, grp, buffer, buflen)) {
-			continue;			/* skip bad lines */
-		}
-
- compatgrscan_cmpgrp:
-		if (! search) {				/* just want this one */
-			rv = NS_SUCCESS;
-			break;
-		}
-							/* want specific */
-		if ((name && strcmp(name, grp->gr_name) == 0) ||
-		    (!name && gid == grp->gr_gid)) {
-			rv = NS_SUCCESS;
-			break;
-		}
-
-	}
-
- compatgrscan_out:
-	if (rv != NS_SUCCESS && rv != NS_NOTFOUND)
-		*retval = errno;
-	return rv;
-}
-
-static struct __grstate_compat	_compat_state;
-					/* storage for non _r functions */
-static struct group		_compat_group;
-static char			_compat_groupbuf[_GETGR_R_SIZE_MAX];
-
-/*ARGSUSED*/
-static int
-_compat_setgrent(void *nsrv, void *nscb, va_list ap)
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(__grbad_compat, "files")
-		NS_DNS_CB(_dns_setgrent, NULL)
-		NS_NIS_CB(_nis_setgrent, NULL)
-		NS_COMPAT_CB(__grbad_compat, "compat")
-		NS_NULL_CB
-	};
-
-					/* force group_compat setgrent() */
-	(void) nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "setgrent",
-	    __nsdefaultnis_forceall);
-
-					/* reset state, keep fp open */
-	_compat_state.stayopen = 0;
-	return __grstart_compat(&_compat_state);
-}
-
-/*ARGSUSED*/
-static int
-_compat_setgroupent(void *nsrv, void *nscb, va_list ap)
-{
-	int	*retval		= va_arg(ap, int *);
-	int	 stayopen	= va_arg(ap, int);
-
-	int	rv;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(__grbad_compat, "files")
-		NS_DNS_CB(_dns_setgroupent, NULL)
-		NS_NIS_CB(_nis_setgroupent, NULL)
-		NS_COMPAT_CB(__grbad_compat, "compat")
-		NS_NULL_CB
-	};
-
-					/* force group_compat setgroupent() */
-	(void) nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "setgroupent",
-	    __nsdefaultnis_forceall, &rv, stayopen);
-
-	_compat_state.stayopen = stayopen;
-	rv = __grstart_compat(&_compat_state);
-	*retval = (rv == NS_SUCCESS);
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_compat_endgrent(void *nsrv, void *nscb, va_list ap)
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(__grbad_compat, "files")
-		NS_DNS_CB(_dns_endgrent, NULL)
-		NS_NIS_CB(_nis_endgrent, NULL)
-		NS_COMPAT_CB(__grbad_compat, "compat")
-		NS_NULL_CB
-	};
-
-					/* force group_compat endgrent() */
-	(void) nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "endgrent",
-	    __nsdefaultnis_forceall);
-
-					/* reset state, close fp */
-	_compat_state.stayopen = 0;
-	return __grend_compat(&_compat_state);
-}
-
-/*ARGSUSED*/
-static int
-_compat_getgrent(void *nsrv, void *nscb, va_list ap)
-{
-	struct group	**retval = va_arg(ap, struct group **);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = __grscan_compat(&rerror, &_compat_group,
-	    _compat_groupbuf, sizeof(_compat_groupbuf),
-	    &_compat_state, 0, NULL, 0, NULL, NULL);
-	if (rv == NS_SUCCESS)
-		*retval = &_compat_group;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_compat_getgrent_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	struct group	*grp	= va_arg(ap, struct group *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct group   **result	= va_arg(ap, struct group **);
-
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	rv = __grscan_compat(retval, grp, buffer, buflen,
-	    &_compat_state, 0, NULL, 0, NULL, NULL);
-	if (rv == NS_SUCCESS)
-		*result = grp;
-	else
-		*result = NULL;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_compat_getgrgid(void *nsrv, void *nscb, va_list ap)
-{
-	struct group	**retval = va_arg(ap, struct group **);
-	gid_t		 gid	= va_arg(ap, gid_t);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = __grstart_compat(&_compat_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	rv = __grscan_compat(&rerror, &_compat_group,
-	    _compat_groupbuf, sizeof(_compat_groupbuf),
-	    &_compat_state, 1, NULL, gid, NULL, NULL);
-	if (!_compat_state.stayopen)
-		__grend_compat(&_compat_state);
-	if (rv == NS_SUCCESS)
-		*retval = &_compat_group;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_compat_getgrgid_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	gid_t		 gid	= va_arg(ap, gid_t);
-	struct group	*grp	= va_arg(ap, struct group *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct group   **result	= va_arg(ap, struct group **);
-
-	struct __grstate_compat	state;
-	int		rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	memset(&state, 0, sizeof(state));
-	rv = __grscan_compat(retval, grp, buffer, buflen, &state,
-	    1, NULL, gid, NULL, NULL);
-	__grend_compat(&state);
-	if (rv == NS_SUCCESS)
-		*result = grp;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_compat_getgrnam(void *nsrv, void *nscb, va_list ap)
-{
-	struct group	**retval = va_arg(ap, struct group **);
-	const char	*name	= va_arg(ap, const char *);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = __grstart_compat(&_compat_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	rv = __grscan_compat(&rerror, &_compat_group,
-	    _compat_groupbuf, sizeof(_compat_groupbuf),
-	    &_compat_state, 1, name, 0, NULL, NULL);
-	if (!_compat_state.stayopen)
-		__grend_compat(&_compat_state);
-	if (rv == NS_SUCCESS)
-		*retval = &_compat_group;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_compat_getgrnam_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	const char	*name	= va_arg(ap, const char *);
-	struct group	*grp	= va_arg(ap, struct group *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct group   **result	= va_arg(ap, struct group **);
-
-	struct __grstate_compat	state;
-	int		rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	memset(&state, 0, sizeof(state));
-	rv = __grscan_compat(retval, grp, buffer, buflen, &state,
-	    1, name, 0, NULL, NULL);
-	__grend_compat(&state);
-	if (rv == NS_SUCCESS)
-		*result = grp;
-	return rv;
-}
-
-#endif	/* _GROUP_COMPAT */
-
-
-		/*
-		 *	public functions
-		 */
-
-struct group *
-getgrent(void)
-{
-	int		rv;
-	struct group	*retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getgrent, NULL)
-		NS_DNS_CB(_dns_getgrent, NULL)
-		NS_NIS_CB(_nis_getgrent, NULL)
-		NS_COMPAT_CB(_compat_getgrent, NULL)
-		NS_NULL_CB
-	};
-
-	mutex_lock(&__grmutex);
-	rv = nsdispatch(NULL, dtab, NSDB_GROUP, "getgrent", __nsdefaultcompat,
-	    &retval);
-	mutex_unlock(&__grmutex);
-	return (rv == NS_SUCCESS) ? retval : NULL;
-}
-
-int
-getgrent_r(struct group *grp, char *buffer, size_t buflen,
-    struct group **result)
-{
-	int		rv, retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getgrent_r, NULL)
-		NS_DNS_CB(_dns_getgrent_r, NULL)
-		NS_NIS_CB(_nis_getgrent_r, NULL)
-		NS_COMPAT_CB(_compat_getgrent_r, NULL)
-		NS_NULL_CB
-	};
-
-	mutex_lock(&__grmutex);
-	rv = nsdispatch(NULL, dtab, NSDB_GROUP, "getgrent_r", __nsdefaultcompat,
-	    &retval, grp, buffer, buflen, result);
-	mutex_unlock(&__grmutex);
-	switch (rv) {
-	case NS_SUCCESS:
-	case NS_NOTFOUND:
-		return 0;
-	default:
-		return retval;
-	}
-}
-
-
-struct group *
-getgrgid(gid_t gid)
-{
-	int		rv;
-	struct group	*retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getgrgid, NULL)
-		NS_DNS_CB(_dns_getgrgid, NULL)
-		NS_NIS_CB(_nis_getgrgid, NULL)
-		NS_COMPAT_CB(_compat_getgrgid, NULL)
-		NS_NULL_CB
-	};
-
-	mutex_lock(&__grmutex);
-	rv = nsdispatch(NULL, dtab, NSDB_GROUP, "getgrgid", __nsdefaultcompat,
-	    &retval, gid);
-	mutex_unlock(&__grmutex);
-	return (rv == NS_SUCCESS) ? retval : NULL;
-}
-
-int
-getgrgid_r(gid_t gid, struct group *grp, char *buffer, size_t buflen,
-	struct group **result)
-{
-	int	rv, retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getgrgid_r, NULL)
-		NS_DNS_CB(_dns_getgrgid_r, NULL)
-		NS_NIS_CB(_nis_getgrgid_r, NULL)
-		NS_COMPAT_CB(_compat_getgrgid_r, NULL)
-		NS_NULL_CB
-	};
-
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	retval = 0;
-	mutex_lock(&__grmutex);
-	rv = nsdispatch(NULL, dtab, NSDB_GROUP, "getgrgid_r", __nsdefaultcompat,
-	    &retval, gid, grp, buffer, buflen, result);
-	mutex_unlock(&__grmutex);
-	switch (rv) {
-	case NS_SUCCESS:
-	case NS_NOTFOUND:
-		return 0;
-	default:
-		return retval;
-	}
-}
-
-struct group *
-getgrnam(const char *name)
-{
-	int		rv;
-	struct group	*retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getgrnam, NULL)
-		NS_DNS_CB(_dns_getgrnam, NULL)
-		NS_NIS_CB(_nis_getgrnam, NULL)
-		NS_COMPAT_CB(_compat_getgrnam, NULL)
-		NS_NULL_CB
-	};
-
-	mutex_lock(&__grmutex);
-	rv = nsdispatch(NULL, dtab, NSDB_GROUP, "getgrnam", __nsdefaultcompat,
-	    &retval, name);
-	mutex_unlock(&__grmutex);
-	return (rv == NS_SUCCESS) ? retval : NULL;
-}
-
-int
-getgrnam_r(const char *name, struct group *grp, char *buffer, size_t buflen,
-	struct group **result)
-{
-	int	rv, retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getgrnam_r, NULL)
-		NS_DNS_CB(_dns_getgrnam_r, NULL)
-		NS_NIS_CB(_nis_getgrnam_r, NULL)
-		NS_COMPAT_CB(_compat_getgrnam_r, NULL)
-		NS_NULL_CB
-	};
-
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(grp != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	retval = 0;
-	mutex_lock(&__grmutex);
-	rv = nsdispatch(NULL, dtab, NSDB_GROUP, "getgrnam_r", __nsdefaultcompat,
-	    &retval, name, grp, buffer, buflen, result);
-	mutex_unlock(&__grmutex);
-	switch (rv) {
-	case NS_SUCCESS:
-	case NS_NOTFOUND:
-		return 0;
-	default:
-		return retval;
-	}
-}
-
-void
-endgrent(void)
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_endgrent, NULL)
-		NS_DNS_CB(_dns_endgrent, NULL)
-		NS_NIS_CB(_nis_endgrent, NULL)
-		NS_COMPAT_CB(_compat_endgrent, NULL)
-		NS_NULL_CB
-	};
-
-	mutex_lock(&__grmutex);
-					/* force all endgrent() methods */
-	(void) nsdispatch(NULL, dtab, NSDB_GROUP, "endgrent",
-	    __nsdefaultcompat_forceall);
-	mutex_unlock(&__grmutex);
-}
-
-int
-setgroupent(int stayopen)
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_setgroupent, NULL)
-		NS_DNS_CB(_dns_setgroupent, NULL)
-		NS_NIS_CB(_nis_setgroupent, NULL)
-		NS_COMPAT_CB(_compat_setgroupent, NULL)
-		NS_NULL_CB
-	};
-	int	rv, retval;
-
-	mutex_lock(&__grmutex);
-					/* force all setgroupent() methods */
-	rv = nsdispatch(NULL, dtab, NSDB_GROUP, "setgroupent",
-	    __nsdefaultcompat_forceall, &retval, stayopen);
-	mutex_unlock(&__grmutex);
-	return (rv == NS_SUCCESS) ? retval : 0;
-}
-
-void
-setgrent(void)
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_setgrent, NULL)
-		NS_DNS_CB(_dns_setgrent, NULL)
-		NS_NIS_CB(_nis_setgrent, NULL)
-		NS_COMPAT_CB(_compat_setgrent, NULL)
-		NS_NULL_CB
-	};
-
-	mutex_lock(&__grmutex);
-					/* force all setgrent() methods */
-	(void) nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent",
-	    __nsdefaultcompat_forceall);
-	mutex_unlock(&__grmutex);
-}
diff --git a/lib/libc/gen/getgrouplist.3 b/lib/libc/gen/getgrouplist.3
deleted file mode 100644
index 7638ab027..000000000
--- a/lib/libc/gen/getgrouplist.3
+++ /dev/null
@@ -1,152 +0,0 @@
-.\"	$NetBSD: getgrouplist.3,v 1.14 2008/05/02 18:11:04 martin Exp $
-.\"
-.\" Copyright (c) 2005 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Luke Mewburn.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)getgrouplist.3	8.1 (Berkeley) 6/9/93
-.\"
-.Dd January 6, 2005
-.Dt GETGROUPLIST 3
-.Os
-.Sh NAME
-.Nm getgrouplist ,
-.Nm getgroupmembership ,
-.Nd calculate group access list
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn getgrouplist "const char *name" "gid_t basegid" "gid_t *groups" "int *ngroups"
-.Ft int
-.Fn getgroupmembership "const char *name" "gid_t basegid" "gid_t *groups" "int maxgrp" "int *ngroups"
-.Sh DESCRIPTION
-The
-.Fn getgrouplist
-and
-.Fn getgroupmembership
-functions read through the group database and calculate
-the group access list for the user specified in
-.Fa name .
-The
-.Fa basegid
-is automatically included in the groups list.
-Typically this value is given as
-the group number from the password database.
-.Pp
-The resulting group list is returned in the integer array pointed to by
-.Fa groups .
-.Pp
-For
-.Fn getgrouplist ,
-the caller specifies the size of the
-.Fa groups
-array in the integer pointed to by
-.Fa ngroups .
-.Pp
-For
-.Fn getgroupmembership ,
-the caller specifies the size of the
-.Fa groups
-array in
-.Fa maxgrp .
-.Pp
-The actual number of groups found is returned in
-.Fa ngroups .
-.Pp
-Duplicate group ids will be suppressed from the result.
-.Sh RETURN VALUES
-The
-.Fn getgrouplist
-and
-.Fn getgroupmembership
-functions
-return 0 if successful, and
-return \-1 if the size of the group list is too small to
-hold all the user's groups.
-In the latter case, the
-.Fa groups
-array will be filled with as many groups as will fit and
-.Fa ngroups
-will contain the total number of groups found.
-.Sh FILES
-.Bl -tag -width /etc/group -compact
-.It Pa /etc/group
-group membership list
-.El
-.Sh SEE ALSO
-.Xr setgroups 2 ,
-.Xr initgroups 3 ,
-.Xr group 5
-.Sh HISTORY
-The
-.Fn getgrouplist
-function first appeared in
-.Bx 4.4 .
-The
-.Fn getgroupmembership
-function first appeared in
-.Nx 3.0
-to address an API deficiency in
-.Fn getgrouplist .
-.Sh BUGS
-The
-.Fn getgrouplist
-function
-uses the routines based on
-.Xr getgrent 3 .
-If the invoking program uses any of these routines,
-the group structure will
-be overwritten in the call to
-.Fn getgrouplist .
diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c
deleted file mode 100644
index cd152ec7d..000000000
--- a/lib/libc/gen/getgrouplist.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: getgrouplist.c,v 1.22 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004-2005 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getgrouplist.c	8.2 (Berkeley) 12/8/94";
-#else
-__RCSID("$NetBSD: getgrouplist.c,v 1.22 2008/04/28 20:22:59 martin Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * calculate group access list
- */
-
-#include "namespace.h"
-#include <sys/param.h>
-
-#include <assert.h>
-#include <nsswitch.h>
-#include <stdarg.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(getgrouplist,_getgrouplist)
-#endif
-
-int
-getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
-{
-	int	rv, groupc;
-
-	_DIAGASSERT(uname != NULL);
-	/* groups may be NULL if just sizing when invoked with *grpcnt = 0 */
-	_DIAGASSERT(grpcnt != NULL);
-
-	groupc = 0;
-	rv = getgroupmembership(uname, agroup, groups, *grpcnt, &groupc);
-	*grpcnt = groupc;	/* set groupc to the actual # of groups */
-	return rv;
-}
diff --git a/lib/libc/gen/getgroupmembership.c b/lib/libc/gen/getgroupmembership.c
deleted file mode 100644
index 78687c0a5..000000000
--- a/lib/libc/gen/getgroupmembership.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/*	$NetBSD: getgroupmembership.c,v 1.4 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004-2005 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getgroupmembership.c,v 1.4 2008/04/28 20:22:59 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * calculate group access list
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <sys/param.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <grp.h>
-#include <limits.h>
-#include <nsswitch.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef HESIOD
-#include <hesiod.h>
-#endif
-
-#include "gr_private.h"
-
-#ifdef __weak_alias
-__weak_alias(getgroupmembership,_getgroupmembership)
-#endif
-
-/*
- * __gr_addgid
- *	Add gid to the groups array (of maxgrp size) at the position
- *	indicated by *groupc, unless it already exists or *groupc is
- *	past &groups[maxgrp].
- *	Returns 1 upon success (including duplicate suppression), 0 otherwise.
- */
-static int
-__gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *groupc)
-{
-	int	ret, dupc;
-
-	_DIAGASSERT(groupc != NULL);
-	_DIAGASSERT(groups != NULL);
-
-						/* skip duplicates */
-	for (dupc = 0; dupc < MIN(maxgrp, *groupc); dupc++) {
-		if (groups[dupc] == gid)
-			return 1;
-	}
-
-	ret = 1;
-	if (*groupc < maxgrp)			/* add this gid */
-		groups[*groupc] = gid;
-	else
-		ret = 0;
-	(*groupc)++;
-	return ret;
-}
-
-
-/*ARGSUSED*/
-static int
-_files_getgroupmembership(void *retval, void *cb_data, va_list ap)
-{
-	int		*result	= va_arg(ap, int *);
-	const char 	*uname	= va_arg(ap, const char *);
-	gid_t		 agroup	= va_arg(ap, gid_t);
-	gid_t		*groups	= va_arg(ap, gid_t *);
-	int		 maxgrp	= va_arg(ap, int);
-	int		*groupc	= va_arg(ap, int *);
-
-	struct __grstate_files	state;
-	struct group		grp;
-	char			grpbuf[_GETGR_R_SIZE_MAX];
-	int			rv, i;
-
-	_DIAGASSERT(result != NULL);
-	_DIAGASSERT(uname != NULL);
-	/* groups may be NULL if just sizing when invoked with maxgrp = 0 */
-	_DIAGASSERT(groupc != NULL);
-
-						/* install primary group */
-	(void) __gr_addgid(agroup, groups, maxgrp, groupc);
-
-	memset(&state, 0, sizeof(state));
-	while (__grscan_files(&rv, &grp, grpbuf, sizeof(grpbuf), &state,
-				0, NULL, 0) == NS_SUCCESS) {
-						/* scan members */
-		for (i = 0; grp.gr_mem[i]; i++) {
-			if (strcmp(grp.gr_mem[i], uname) != 0)
-				continue;
-			if (! __gr_addgid(grp.gr_gid, groups, maxgrp, groupc))
-				*result = -1;
-			break;
-		}
-	}
-	__grend_files(&state);
-	return NS_NOTFOUND;
-}
-
-
-#ifdef HESIOD
-
-/*ARGSUSED*/
-static int
-_dns_getgroupmembership(void *retval, void *cb_data, va_list ap)
-{
-	int		*result	= va_arg(ap, int *);
-	const char 	*uname	= va_arg(ap, const char *);
-	gid_t		 agroup	= va_arg(ap, gid_t);
-	gid_t		*groups	= va_arg(ap, gid_t *);
-	int		 maxgrp	= va_arg(ap, int);
-	int		*groupc	= va_arg(ap, int *);
-
-	struct __grstate_dns	state;
-	struct group		grp;
-	char			grpbuf[_GETGR_R_SIZE_MAX];
-	unsigned long		id;
-	void			*context;
-	char			**hp, *cp, *ep;
-	int			rv, i;
-
-	_DIAGASSERT(result != NULL);
-	_DIAGASSERT(uname != NULL);
-	/* groups may be NULL if just sizing when invoked with maxgrp = 0 */
-	_DIAGASSERT(groupc != NULL);
-
-						/* install primary group */
-	(void) __gr_addgid(agroup, groups, maxgrp, groupc);
-
-	hp = NULL;
-	rv = NS_NOTFOUND;
-
-	if (hesiod_init(&context) == -1)		/* setup hesiod */
-		return NS_UNAVAIL;
-
-	hp = hesiod_resolve(context, uname, "grplist");	/* find grplist */
-	if (hp == NULL) {
-		if (errno != ENOENT) {			/* wasn't "not found"*/
-			rv = NS_UNAVAIL;
-			goto dnsgroupmembers_out;
-		}
-			/* grplist not found, fallback to _dns_grscan */
-		memset(&state, 0, sizeof(state));
-		while (__grscan_dns(&rv, &grp, grpbuf, sizeof(grpbuf), &state,
-					0, NULL, 0) == NS_SUCCESS) {
-							/* scan members */
-			for (i = 0; grp.gr_mem[i]; i++) {
-				if (strcmp(grp.gr_mem[i], uname) != 0)
-					continue;
-				if (! __gr_addgid(grp.gr_gid, groups, maxgrp,
-				    groupc))
-					*result = -1;
-				break;
-			}
-		}
-		__grend_dns(&state);
-		rv = NS_NOTFOUND;
-		goto dnsgroupmembers_out;
-	}
-
-	if ((ep = strchr(hp[0], '\n')) != NULL)
-		*ep = '\0';				/* clear trailing \n */
-
-	for (cp = hp[0]; *cp != '\0'; ) {		/* parse grplist */
-		if ((cp = strchr(cp, ':')) == NULL)	/* skip grpname */
-			break;
-		cp++;
-		id = strtoul(cp, &ep, 10);		/* parse gid */
-		if (id > GID_MAX || (*ep != ':' && *ep != '\0')) {
-			rv = NS_UNAVAIL;
-			goto dnsgroupmembers_out;
-		}
-		cp = ep;
-		if (*cp == ':')
-			cp++;
-
-							/* add gid */
-		if (! __gr_addgid((gid_t)id, groups, maxgrp, groupc))
-			*result = -1;
-	}
-
-	rv = NS_NOTFOUND;
-
- dnsgroupmembers_out:
-	if (hp)
-		hesiod_free_list(context, hp);
-	hesiod_end(context);
-	return rv;
-}
-
-#endif /* HESIOD */
-
-
-#ifdef YP
-
-/*ARGSUSED*/
-static int
-_nis_getgroupmembership(void *retval, void *cb_data, va_list ap)
-{
-	int		*result	= va_arg(ap, int *);
-	const char 	*uname	= va_arg(ap, const char *);
-	gid_t		 agroup	= va_arg(ap, gid_t);
-	gid_t		*groups	= va_arg(ap, gid_t *);
-	int		 maxgrp	= va_arg(ap, int);
-	int		*groupc	= va_arg(ap, int *);
-
-	struct __grstate_nis	state;
-	struct group		grp;
-	char			grpbuf[_GETGR_R_SIZE_MAX];
-	int			rv, i;
-
-	_DIAGASSERT(result != NULL);
-	_DIAGASSERT(uname != NULL);
-	/* groups may be NULL if just sizing when invoked with maxgrp = 0 */
-	_DIAGASSERT(groupc != NULL);
-
-						/* install primary group */
-	(void) __gr_addgid(agroup, groups, maxgrp, groupc);
-
-	memset(&state, 0, sizeof(state));
-	while (__grscan_nis(&rv, &grp, grpbuf, sizeof(grpbuf), &state,
-				0, NULL, 0) == NS_SUCCESS) {
-						/* scan members */
-		for (i = 0; grp.gr_mem[i]; i++) {
-			if (strcmp(grp.gr_mem[i], uname) != 0)
-				continue;
-			if (! __gr_addgid(grp.gr_gid, groups, maxgrp, groupc))
-				*result = -1;
-			break;
-		}
-	}
-	__grend_nis(&state);
-
-	return NS_NOTFOUND;
-}
-
-#endif /* YP */
-
-
-#ifdef _GROUP_COMPAT
-
-struct __compatggm {
-	const char	*uname;		/* user to search for */
-	gid_t		*groups;
-	gid_t		 agroup;
-	int		 maxgrp;
-	int		*groupc;
-};
-
-static int
-_compat_ggm_search(void *cookie, struct group **groupres)
-{
-	struct __compatggm	*cp;
-	int			rerror, crv;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(__grbad_compat, "files")
-		NS_DNS_CB(_dns_getgroupmembership, NULL)
-		NS_NIS_CB(_nis_getgroupmembership, NULL)
-		NS_COMPAT_CB(__grbad_compat, "compat")
-		NS_NULL_CB
-	};
-
-	*groupres = NULL;	/* we don't care about this */
-	cp = (struct __compatggm *)cookie;
-
-	crv = nsdispatch(NULL, dtab,
-	    NSDB_GROUP_COMPAT, "getgroupmembership",
-	    __nsdefaultnis,
-	    &rerror, cp->uname, cp->agroup, cp->groups, cp->maxgrp, cp->groupc);
-
-	if (crv == NS_SUCCESS)
-		crv = NS_NOTFOUND;	/* indicate "no more +: entries" */
-
-	return crv;
-}
-
-/* ARGSUSED */
-static int
-_compat_getgroupmembership(void *retval, void *cb_data, va_list ap)
-{
-	int		*result	= va_arg(ap, int *);
-	const char 	*uname	= va_arg(ap, const char *);
-	gid_t		 agroup	= va_arg(ap, gid_t);
-	gid_t		*groups	= va_arg(ap, gid_t *);
-	int		 maxgrp	= va_arg(ap, int);
-	int		*groupc	= va_arg(ap, int *);
-
-	struct __grstate_compat	state;
-	struct __compatggm	ggmstate;
-	struct group		grp;
-	char			grpbuf[_GETGR_R_SIZE_MAX];
-	int			rv, i;
-
-	_DIAGASSERT(result != NULL);
-	_DIAGASSERT(uname != NULL);
-	/* groups may be NULL if just sizing when invoked with maxgrp = 0 */
-	_DIAGASSERT(groupc != NULL);
-
-						/* install primary group */
-	(void) __gr_addgid(agroup, groups, maxgrp, groupc);
-
-	memset(&state, 0, sizeof(state));
-	memset(&ggmstate, 0, sizeof(ggmstate));
-	ggmstate.uname = uname;
-	ggmstate.groups = groups;
-	ggmstate.agroup = agroup;
-	ggmstate.maxgrp = maxgrp;
-	ggmstate.groupc = groupc;
-
-	while (__grscan_compat(&rv, &grp, grpbuf, sizeof(grpbuf), &state,
-				0, NULL, 0, _compat_ggm_search, &ggmstate)
-		== NS_SUCCESS) {
-						/* scan members */
-		for (i = 0; grp.gr_mem[i]; i++) {
-			if (strcmp(grp.gr_mem[i], uname) != 0)
-				continue;
-			if (! __gr_addgid(grp.gr_gid, groups, maxgrp, groupc))
-				*result = -1;
-			break;
-		}
-	}
-
-	__grend_compat(&state);
-	return NS_NOTFOUND;
-}
-
-#endif	/* _GROUP_COMPAT */
-
-
-int
-getgroupmembership(const char *uname, gid_t agroup,
-    gid_t *groups, int maxgrp, int *groupc)
-{
-	int	rerror;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getgroupmembership, NULL)
-		NS_DNS_CB(_dns_getgroupmembership, NULL)
-		NS_NIS_CB(_nis_getgroupmembership, NULL)
-		NS_COMPAT_CB(_compat_getgroupmembership, NULL)
-		NS_NULL_CB
-	};
-
-	_DIAGASSERT(uname != NULL);
-	/* groups may be NULL if just sizing when invoked with maxgrp = 0 */
-	_DIAGASSERT(groupc != NULL);
-
-	*groupc = 0;
-
-	mutex_lock(&__grmutex);
-			/*
-			 * Call each backend.
-			 * For compatibility with getgrent(3) semantics,
-			 * a backend should return NS_NOTFOUND even upon
-			 * completion, to allow result merging to occur.
-			 */
-	(void) nsdispatch(NULL, dtab, NSDB_GROUP, "getgroupmembership",
-	    __nsdefaultcompat,
-	    &rerror, uname, agroup, groups, maxgrp, groupc);
-	mutex_unlock(&__grmutex);
-
-	if (*groupc > maxgrp)			/* too many groups found */
-		return -1;
-	else
-		return 0;
-}
diff --git a/lib/libc/gen/gethostname.3 b/lib/libc/gen/gethostname.3
deleted file mode 100644
index 610b1a8a5..000000000
--- a/lib/libc/gen/gethostname.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\"	$NetBSD: gethostname.3,v 1.18 2015/09/03 04:05:38 jnemeth Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd September 2, 2015
-.Dt GETHOSTNAME 3
-.Os
-.Sh NAME
-.Nm gethostname ,
-.Nm sethostname
-.Nd get/set name of current host
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn gethostname "char *name" "size_t namelen"
-.Ft int
-.Fn sethostname "const char *name" "size_t namelen"
-.Sh DESCRIPTION
-.Fn gethostname
-returns the standard host name for the current machine, as
-previously set by
-.Fn sethostname .
-The parameter
-.Fa namelen
-specifies the size of the
-.Fa name
-array.
-The returned name is null-terminated unless insufficient
-space is provided.
-.Pp
-.Fn sethostname
-sets the name of the host machine to be
-.Fa name ,
-which has length
-.Fa namelen .
-This call is restricted to the super-user and
-is normally used only when the system is bootstrapped.
-.Sh RETURN VALUES
-If the call succeeds a value of 0 is returned.
-If the call fails, a value of \-1 is returned and an error code is
-placed in the global location
-.Va errno .
-.Sh ERRORS
-If the
-.Fn gethostname
-or
-.Fn sethostname
-functions fail,
-they will set
-.Va errno
-for any of the errors specified for the routine
-.Xr sysctl 3 .
-.Sh SEE ALSO
-.Xr gethostid 3 ,
-.Xr sysctl 3 ,
-.Xr sysctl 8
-.Sh STANDARDS
-The
-.Fn gethostname
-function conforms to
-.St -xpg4.2 .
-.Sh HISTORY
-The
-.Nm
-function call appeared in
-.Bx 4.2 .
-.Sh BUGS
-Host names are limited to
-.Dv MAXHOSTNAMELEN
-(from
-.Ao Pa sys/param.h Ac )
-characters including null-termination, currently 256.
diff --git a/lib/libc/gen/gethostname.c b/lib/libc/gen/gethostname.c
deleted file mode 100644
index 8d1eed6ca..000000000
--- a/lib/libc/gen/gethostname.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: gethostname.c,v 1.13 2012/06/25 22:32:43 abs Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)gethostname.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: gethostname.c,v 1.13 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(gethostname,_gethostname)
-#endif
-
-int
-gethostname(char *name, size_t namelen)
-{
-	int mib[2];
-	size_t size;
-
-	_DIAGASSERT(name != NULL);
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTNAME;
-	size = namelen;
-	if (sysctl(mib, 2, name, &size, NULL, 0) == -1)
-		return (-1);
-
-	return (0);
-}
diff --git a/lib/libc/gen/getlastlogx.3 b/lib/libc/gen/getlastlogx.3
deleted file mode 100644
index cb7404c31..000000000
--- a/lib/libc/gen/getlastlogx.3
+++ /dev/null
@@ -1,173 +0,0 @@
-.\"	$NetBSD: getlastlogx.3,v 1.2 2008/04/30 13:10:50 martin Exp $
-.\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Thomas Klausner.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd August 26, 2003
-.Dt GETLASTLOGX 3
-.Os
-.Sh NAME
-.Nm getlastlogx ,
-.Nm getutmp ,
-.Nm getutmpx ,
-.Nm updlastlogx ,
-.Nm updwtmpx ,
-.Nm utmpxname
-.Nd user accounting database functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In utmpx.h
-.Ft struct lastlogx *
-.Fn getlastlogx "const char *fname" "uid_t uid" "struct lastlogx *ll"
-.Ft void
-.Fn getutmp "const struct utmpx *ux" "struct utmp *u"
-.Ft void
-.Fn getutmpx "const struct utmp *u" "struct utmpx *ux"
-.Ft int
-.Fn updlastlogx "const char *fname" "uid_t uid" "struct lastlogx *ll"
-.Ft int
-.Fn updwtmpx "const char *file" "const struct utmpx *utx"
-.Ft int
-.Fn utmpxname "const char *fname"
-.Sh DESCRIPTION
-The
-.Fn getlastlogx
-function looks up the entry for the user with user id
-.Fa uid
-in the
-.Xr lastlogx 5
-file given by
-.Fa fname
-and returns it in
-.Fa \&ll .
-If the provided
-.Fa \&ll
-is
-.Dv NULL ,
-the necessary space will be allocated by
-.Fn getlastlogx
-and should be
-.Fn free Ns d
-by the caller.
-.Pp
-The
-.Fn getutmp
-function fills out the entries in the struct utmp
-.Fa u
-with the data provided in the struct utmpx
-.Fa ux .
-.Fn getutmpx
-does the opposite, filling out the entries in the struct utmpx
-.Fa ux
-with the data provided in the struct utmp
-.Fa u ,
-and initializing all the unknown fields to 0.
-The sole exception is the
-.Fa ut_type
-field, which will be initialized to
-.Dv USER_PROCESS .
-.Pp
-The
-.Fn updlastlogx
-function tries to update the information for the user with the user id
-.Fa uid
-in the
-.Xr lastlogx 5
-file given by
-.Fa fname
-with the data supplied in
-.Fa \&ll .
-A
-.Ft struct lastlogx
-is defined like this:
-.Bd -literal
-struct lastlogx {
-        struct timeval ll_tv;           /* time entry was created */
-        char ll_line[_UTX_LINESIZE];    /* tty name */
-        char ll_host[_UTX_HOSTSIZE];    /* host name */
-        struct sockaddr_storage ll_ss;  /* address where entry was made from */
-};
-.Ed
-All the fields should be filled out by the caller.
-.Pp
-The
-.Fn updwtmpx
-function updates the
-.Xr wtmpx 5
-file
-.Fa file
-with the
-.Xr utmpx 5
-entry
-.Fa utx .
-.Pp
-The
-.Fn utmpxname
-function sets the default
-.Xr utmpx 5
-database file name to
-.Fa fname .
-.Sh RETURN VALUES
-.Fn getlastlogx
-returns the found entry on success, or
-.Dv NULL
-if it could not open the database, could not find an entry matching
-.Fa uid
-in there, or could not allocate the necessary space (in case
-.Fa \&ll
-was
-.Dv NULL ) .
-.Pp
-.Fn utmpxname
-returns 1 on success, or 0 if the supplied file name was too long or
-did not end with
-.Sq x .
-.Pp
-.Fn updlastlogx
-and
-.Fn updwtmpx
-return 0 on success, or \-1 in case the database or file respectively
-could not be opened or the data not written into it.
-.Sh SEE ALSO
-.Xr endutxent 3 ,
-.Xr loginx 3 ,
-.Xr utmpx 5
-.Sh HISTORY
-The functions
-.Fn getutmp ,
-.Fn getutmpx ,
-.Fn updwtmpx ,
-and
-.Fn utmpxname
-first appeared in
-.Tn Solaris .
-.Nm getlastlogx
-and
-.Nm updlastlogx
-first appeared in
-.Nx 2.0 .
diff --git a/lib/libc/gen/getloadavg.3 b/lib/libc/gen/getloadavg.3
deleted file mode 100644
index 7f879b00a..000000000
--- a/lib/libc/gen/getloadavg.3
+++ /dev/null
@@ -1,66 +0,0 @@
-.\"	$NetBSD: getloadavg.3,v 1.15 2011/04/12 04:55:05 jruoho Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"     @(#)getloadavg.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 12, 2011
-.Dt GETLOADAVG 3
-.Os
-.Sh NAME
-.Nm getloadavg
-.Nd get system load averages
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn getloadavg "double loadavg[]" "int nelem"
-.Sh DESCRIPTION
-The
-.Fn getloadavg
-function returns the number of processes in the system run queue
-averaged over various periods of time.
-Up to
-.Fa nelem
-samples are retrieved and assigned to successive elements of
-.Fa loadavg Ns Bq .
-The system imposes a maximum of 3 samples, representing averages
-over the last 1, 5, and 15 minutes, respectively.
-.Sh RETURN VALUES
-If the load average was unobtainable, \-1 is returned; otherwise,
-the number of samples actually retrieved is returned.
-.Sh SEE ALSO
-.Xr uptime 1 ,
-.Xr kvm_getloadavg 3 ,
-.Xr sysctl 3
-.Sh HISTORY
-The
-.Fn getloadavg
-function appeared in
-.Bx 4.3 Reno .
diff --git a/lib/libc/gen/getloadavg.c b/lib/libc/gen/getloadavg.c
deleted file mode 100644
index f548c42d9..000000000
--- a/lib/libc/gen/getloadavg.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*	$NetBSD: getloadavg.c,v 1.14 2012/03/13 21:13:36 christos Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getloadavg.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getloadavg.c,v 1.14 2012/03/13 21:13:36 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/sysctl.h>
-#include <uvm/uvm_param.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(getloadavg,_getloadavg)
-#endif
-
-/*
- * getloadavg() -- Get system load averages.
- *
- * Put `nelem' samples into `loadavg' array.
- * Return number of samples retrieved, or -1 on error.
- */
-int
-getloadavg(double loadavg[], int nelem)
-{
-	struct loadavg loadinfo;
-	static const int mib[] = { CTL_VM, VM_LOADAVG };
-	size_t size, i;
-
-	_DIAGASSERT(loadavg != NULL);
-	_DIAGASSERT(nelem >= 0);
-
-	size = sizeof(loadinfo);
-	if (sysctl(mib, (u_int)__arraycount(mib), &loadinfo, &size, NULL, 0)
-	    == -1)
-		return -1;
-
-	size = MIN((size_t)nelem, __arraycount(loadinfo.ldavg));
-	for (i = 0; i < size; i++)
-		loadavg[i] = (double) loadinfo.ldavg[i] / loadinfo.fscale;
-	return nelem;
-}
diff --git a/lib/libc/gen/getlogin.c b/lib/libc/gen/getlogin.c
deleted file mode 100644
index 3821f66e5..000000000
--- a/lib/libc/gen/getlogin.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*	$NetBSD: getlogin.c,v 1.15 2009/01/11 02:46:27 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getlogin.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getlogin.c,v 1.15 2009/01/11 02:46:27 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <pwd.h>
-#include <utmp.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include "reentrant.h"
-#include "extern.h"
-
-#ifdef __weak_alias
-__weak_alias(getlogin,_getlogin)
-__weak_alias(getlogin_r,_getlogin_r)
-#if !defined(__minix)
-__weak_alias(setlogin,_setlogin)
-#endif /* !defined(__minix) */
-#endif
-
-int	__logname_valid;		/* known to setlogin() */
-static char logname[MAXLOGNAME + 1];
-
-#ifdef _REENTRANT
-static mutex_t	logname_mutex = MUTEX_INITIALIZER;
-#endif
-
-char *
-getlogin(void)
-{
-	char *rv;
-
-	mutex_lock(&logname_mutex);
-	if (__logname_valid == 0) {
-		if (__getlogin(logname, sizeof(logname) - 1) < 0) {
-			mutex_unlock(&logname_mutex);
-			return ((char *)NULL);
-		}
-		__logname_valid = 1;
-	}
-	rv = (*logname ? logname : (char *)NULL);
-	mutex_unlock(&logname_mutex);
-
-	return rv;
-}
-
-int
-getlogin_r(char *name, size_t namelen)
-{
-	size_t len;
-	int rv;
-
-	mutex_lock(&logname_mutex);
-	if (__logname_valid == 0) {
-		if (__getlogin(logname, sizeof(logname) - 1) < 0) {
-			rv = errno;
-			mutex_unlock(&logname_mutex);
-			return (rv);
-		}
-		__logname_valid = 1;
-	}
-	len = strlen(logname) + 1;
-	if (len > namelen) {
-		rv = ERANGE;
-	} else {
-		strncpy(name, logname, len);
-		rv = 0;
-	}
-	mutex_unlock(&logname_mutex);
-
-	return (rv);
-}
-
-#if !defined(__minix)
-int
-setlogin(const char *name)
-{
-	int retval; 
-
-	retval = __setlogin(name);
-	__logname_valid = 0;
-
-	return (retval);
-}
-#endif /* !defined(__minix) */
diff --git a/lib/libc/gen/getmntinfo.3 b/lib/libc/gen/getmntinfo.3
deleted file mode 100644
index 1b2227b99..000000000
--- a/lib/libc/gen/getmntinfo.3
+++ /dev/null
@@ -1,115 +0,0 @@
-.\"	$NetBSD: getmntinfo.3,v 1.15 2004/05/05 08:48:36 jdolecek Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"     @(#)getmntinfo.3	8.1 (Berkeley) 6/9/93
-.\"
-.Dd April 14, 2004
-.Dt GETMNTINFO 3
-.Os
-.Sh NAME
-.Nm getmntinfo
-.Nd get information about mounted file systems
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/statvfs.h
-.Ft int
-.Fn getmntinfo "struct statvfs **mntbufp" "int flags"
-.Sh DESCRIPTION
-The
-.Fn getmntinfo
-function returns an array of
-.Em statvfs
-structures describing each currently mounted file system (see
-.Xr statvfs 2 ) .
-.Pp
-The
-.Fn getmntinfo
-function
-passes its
-.Fa flags
-parameter transparently to
-.Xr getvfsstat 2 .
-.Sh RETURN VALUES
-On successful completion,
-.Fn getmntinfo
-returns a count of the number of elements in the array.
-The pointer to the array is stored into
-.Fa mntbufp .
-.Pp
-If an error occurs, zero is returned and the external variable
-.Va errno
-is set to indicate the error.
-Although the pointer
-.Fa mntbufp
-will be unmodified, any information previously returned by
-.Fn getmntinfo
-will be lost.
-.Sh ERRORS
-The
-.Fn getmntinfo
-function
-may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr getvfsstat 2
-or
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr getvfsstat 2 ,
-.Xr mount 2 ,
-.Xr statvfs 2 ,
-.Xr mount 8
-.Sh HISTORY
-The
-.Fn getmntinfo
-function first appeared in
-.Bx 4.4 .
-It was converted from using
-.Xr getfsstat 2
-to
-.Xr getvfsstat 2
-in
-.Nx 3.0 .
-.Sh BUGS
-The
-.Fn getmntinfo
-function writes the array of structures to an internal static object
-and returns
-a pointer to that object.
-Subsequent calls to
-.Fn getmntinfo
-will modify the same object.
-.Pp
-The memory allocated by
-.Fn getmntinfo
-cannot be
-.Xr free 3 Ns 'd
-by the application.
diff --git a/lib/libc/gen/getmntinfo.c b/lib/libc/gen/getmntinfo.c
deleted file mode 100644
index a8615c6a7..000000000
--- a/lib/libc/gen/getmntinfo.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: getmntinfo.c,v 1.17 2012/03/20 16:36:05 matt Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getmntinfo.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getmntinfo.c,v 1.17 2012/03/20 16:36:05 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/ucred.h>
-#include <sys/mount.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/*
- * Return information about mounted filesystems.
- */
-int
-getmntinfo(struct statvfs **mntbufp, int flags)
-{
-	static struct statvfs *mntbuf;
-	static int mntsize;
-	static size_t bufsize;
-
-	_DIAGASSERT(mntbufp != NULL);
-
-	if (mntsize <= 0 &&
-	    (mntsize = getvfsstat(NULL, (size_t)0, MNT_NOWAIT)) == -1)
-		return (0);
-	if (bufsize > 0 &&
-	    (mntsize = getvfsstat(mntbuf, bufsize, flags)) == -1)
-		return (0);
-	while (bufsize <= mntsize * sizeof(struct statvfs)) {
-		if (mntbuf)
-			free(mntbuf);
-		bufsize = (mntsize + 1) * sizeof(struct statvfs);
-		if ((mntbuf = malloc(bufsize)) == NULL)
-			return (0);
-		if ((mntsize = getvfsstat(mntbuf, bufsize, flags)) == -1)
-			return (0);
-	}
-	*mntbufp = mntbuf;
-	return (mntsize);
-}
diff --git a/lib/libc/gen/getnetgrent.3 b/lib/libc/gen/getnetgrent.3
deleted file mode 100644
index 7e456937e..000000000
--- a/lib/libc/gen/getnetgrent.3
+++ /dev/null
@@ -1,124 +0,0 @@
-.\"	$NetBSD: getnetgrent.3,v 1.12 2003/08/07 16:42:50 agc Exp $
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)getnetgrent.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd January 16, 1999
-.Dt GETNETGRENT 3
-.Os
-.Sh NAME
-.Nm getnetgrent ,
-.Nm innetgr ,
-.Nm setnetgrent ,
-.Nm endnetgrent
-.Nd netgroup database operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netgroup.h
-.Ft int
-.Fn getnetgrent "const char **host" "const char **user" "const char **domain"
-.Ft int
-.Fn innetgr "const char *netgroup" "const char *host" "const char *user" "const char *domain"
-.Ft void
-.Fn setnetgrent "const char *netgroup"
-.Ft void
-.Fn endnetgrent void
-.Sh DESCRIPTION
-These functions operate on the netgroup database file which is described in
-.Xr netgroup 5 .
-.Pp
-The database defines a set of netgroups, each made up of one or more triples:
-.Bd -literal -offset indent
-(host, user, domain)
-.Ed
-.Pp
-that defines a combination of host, user and domain.
-Any of the three fields may be specified as ``wildcards'' that match any
-string.
-.Pp
-The function
-.Fn getnetgrent
-sets the three pointer arguments to the strings of the next member of the
-current netgroup.
-If any of the string pointers are
-.Dv NULL
-that field is considered a wildcard.
-.Pp
-The functions
-.Fn setnetgrent
-and
-.Fn endnetgrent
-set the current netgroup and terminate the current netgroup respectively.
-If
-.Fn setnetgrent
-is called with a different netgroup than the previous call, an implicit
-.Fn endnetgrent
-is implied.
-.Fn setnetgrent
-also sets the offset to the first member of the netgroup.
-.Pp
-The function
-.Fn innetgr
-searches for a match of all fields within the specified group.
-If any of the
-.Sy host ,
-.Sy user ,
-or
-.Sy domain
-arguments are
-.Dv NULL
-those fields will match any string value in the netgroup member.
-.Sh RETURN VALUES
-The function
-.Fn getnetgrent
-returns 0 for ``no more netgroup members'' and 1 otherwise.
-The function
-.Fn innetgr
-returns 1 for a successful match and 0 otherwise.
-The functions
-.Fn setnetgrent
-and
-.Fn endnetgrent
-have no return value.
-.Sh FILES
-.Bl -tag -width /etc/netgroup -compact
-.It Pa /etc/netgroup
-netgroup database file
-.El
-.Sh SEE ALSO
-.Xr netgroup 5 ,
-.Xr nsswitch.conf 5
-.Sh BUGS
-The function
-.Fn getnetgrent
-returns pointers to dynamically allocated data areas that are free'd when
-the function
-.Fn endnetgrent
-is called.
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
deleted file mode 100644
index 410ef1c7b..000000000
--- a/lib/libc/gen/getnetgrent.c
+++ /dev/null
@@ -1,990 +0,0 @@
-/*	$NetBSD: getnetgrent.c,v 1.42 2012/03/20 16:36:05 matt Exp $	*/
-
-/*
- * Copyright (c) 1994 Christos Zoulas
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getnetgrent.c,v 1.42 2012/03/20 16:36:05 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <db.h>
-#include <err.h>
-#include <fcntl.h>
-#define _NETGROUP_PRIVATE
-#include <stringlist.h>
-#include <netgroup.h>
-#include <nsswitch.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/ypclnt.h>
-#include <rpcsvc/yp_prot.h>
-#endif
-
-#ifdef __weak_alias
-__weak_alias(endnetgrent,_endnetgrent)
-__weak_alias(getnetgrent,_getnetgrent)
-__weak_alias(innetgr,_innetgr)
-__weak_alias(setnetgrent,_setnetgrent)
-#endif
-
-#define _NG_STAR(s)	(((s) == NULL || *(s) == '\0') ? _ngstar : s)
-#define _NG_EMPTY(s)	((s) == NULL ? "" : s)
-#define _NG_ISSPACE(p)	(isspace((unsigned char) (p)) || (p) == '\n')
-
-static const char _ngstar[] = "*";
-static struct netgroup *_nghead = NULL;
-static struct netgroup *_nglist = NULL;
-static DB *_ng_db;
-
-static int getstring(char **, int, __aconst char **);
-static struct netgroup *getnetgroup(char **);
-static int lookup(char *, char **, int);
-static int addgroup(StringList *, char *);
-static int in_check(const char *, const char *, const char *,
-    struct netgroup *);
-static int in_find(StringList *, char *, const char *, const char *,
-    const char *);
-static char *in_lookup1(const char *, const char *, int);
-static int in_lookup(const char *, const char *, const char *, int);
-
-#ifdef NSSRC_FILES
-static const ns_src default_files_nis[] = {
-	{ NSSRC_FILES,	NS_SUCCESS | NS_NOTFOUND },
-#ifdef YP
-	{ NSSRC_NIS,	NS_SUCCESS },
-#endif
-	{ 0, 0 },
-};
-#endif
-
-/*
- * getstring(): Get a string delimited by the character, skipping leading and
- * trailing blanks and advancing the pointer
- */
-static int
-getstring(char **pp, int del, char __aconst **str)
-{
-	size_t len;
-	char *sp, *ep, *dp;
-
-	_DIAGASSERT(pp != NULL);
-	_DIAGASSERT(str != NULL);
-
-	/* skip leading blanks */
-	for (sp = *pp; *sp && _NG_ISSPACE(*sp); sp++)
-		continue;
-
-	/* accumulate till delimiter or space */
-	for (ep = sp; *ep && *ep != del && !_NG_ISSPACE(*ep); ep++)
-		continue;
-
-	/* hunt for the delimiter */
-	for (dp = ep; *dp && *dp != del && _NG_ISSPACE(*dp); dp++)
-		continue;
-
-	if (*dp != del) {
-		*str = NULL;
-		return 0;
-	}
-
-	*pp = ++dp;
-
-	len = (ep - sp) + 1;
-	if (len > 1) {
-		dp = malloc(len);
-		if (dp == NULL)
-			return 0;
-		(void)memcpy(dp, sp, len);
-		dp[len - 1] = '\0';
-	} else
-		dp = NULL;
-
-	*str = dp;
-	return 1;
-}
-
-
-/*
- * getnetgroup(): Parse a netgroup, and advance the pointer
- */
-static struct netgroup *
-getnetgroup(char **pp)
-{
-	struct netgroup *ng;
-
-	_DIAGASSERT(pp != NULL);
-	_DIAGASSERT(*pp != NULL);
-
-	ng = malloc(sizeof(struct netgroup));
-	if (ng == NULL)
-		return NULL;
-
-	(*pp)++;	/* skip '(' */
-	if (!getstring(pp, ',', &ng->ng_host))
-		goto badhost;
-
-	if (!getstring(pp, ',', &ng->ng_user))
-		goto baduser;
-
-	if (!getstring(pp, ')', &ng->ng_domain))
-		goto baddomain;
-
-#ifdef DEBUG_NG
-	{
-		char buf[1024];
-		(void) fprintf(stderr, "netgroup %s\n",
-		    _ng_print(buf, sizeof(buf), ng));
-	}
-#endif
-	return ng;
-
-baddomain:
-	if (ng->ng_user)
-		free(ng->ng_user);
-baduser:
-	if (ng->ng_host)
-		free(ng->ng_host);
-badhost:
-	free(ng);
-	return NULL;
-}
-
-void
-_ng_cycle(const char *grp, const StringList *sl)
-{
-	size_t i;
-	warnx("netgroup: Cycle in group `%s'", grp);
-	(void)fprintf(stderr, "groups: ");
-	for (i = 0; i < sl->sl_cur; i++)
-		(void)fprintf(stderr, "%s ", sl->sl_str[i]);
-	(void)fprintf(stderr, "\n");
-}
-
-static int _local_lookup(void *, void *, va_list);
-
-/*ARGSUSED*/
-static int
-_local_lookup(void *rv, void *cb_data, va_list ap)
-{
-	char	 *name = va_arg(ap, char *);
-	char	**line = va_arg(ap, char **);
-	int	  bywhat = va_arg(ap, int);
-
-	DBT	 key, data;
-	size_t	 len;
-	char	*ks;
-	int	 r;
-
-	if (_ng_db == NULL)
-		return NS_UNAVAIL;
-
-	len = strlen(name) + 2;
-	ks = malloc(len);
-	if (ks == NULL)
-		return NS_UNAVAIL;
-
-	ks[0] = bywhat;
-	(void)memcpy(&ks[1], name, len - 1);
-
-	key.data = (u_char *)ks;
-	key.size = len;
-
-	r = (*_ng_db->get)(_ng_db, &key, &data, 0);
-	free(ks);
-	switch (r) {
-	case 0:
-		break;
-	case 1:
-		return NS_NOTFOUND;
-	case -1:
-			/* XXX: call endnetgrent() here ? */
-		return NS_UNAVAIL;
-	}
-
-	*line = strdup(data.data);
-	if (*line == NULL)
-		return NS_UNAVAIL;
-	return NS_SUCCESS;
-}
-
-#ifdef YP
-static int _nis_lookup(void *, void *, va_list);
-
-/*ARGSUSED*/
-static int
-_nis_lookup(void *rv, void *cb_data, va_list ap)
-{
-	char	 *name = va_arg(ap, char *);
-	char	**line = va_arg(ap, char **);
-	int	  bywhat = va_arg(ap, int);
-
-	static char	*__ypdomain;
-	int              i;
-	const char      *map = NULL;
-
-	if(__ypdomain == NULL) {
-		switch (yp_get_default_domain(&__ypdomain)) {
-		case 0:
-			break;
-		case YPERR_RESRC:
-			return NS_TRYAGAIN;
-		default:
-			return NS_UNAVAIL;
-		}
-	}
-
-	switch (bywhat) {
-	case _NG_KEYBYNAME:
-		map = "netgroup";
-		break;
-
-	case _NG_KEYBYUSER:
-		map = "netgroup.byuser";
-		break;
-
-	case _NG_KEYBYHOST:
-		map = "netgroup.byhost";
-		break;
-
-	default:
-		abort();
-	}
-
-	*line = NULL;
-	switch (yp_match(__ypdomain, map, name, (int)strlen(name), line, &i)) {
-	case 0:
-		return NS_SUCCESS;
-	case YPERR_KEY:
-		if (*line)
-			free(*line);
-		return NS_NOTFOUND;
-	default:
-		if (*line)
-			free(*line);
-		return NS_UNAVAIL;
-	}
-	/* NOTREACHED */
-}
-#endif
-
-#ifdef NSSRC_FILES
-/*
- * lookup(): Find the given key in the database or yp, and return its value
- * in *line; returns 1 if key was found, 0 otherwise
- */
-static int
-lookup(char *name, char	**line, int bywhat)
-{
-	int		r;
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_local_lookup, NULL)
-		NS_NIS_CB(_nis_lookup, NULL)
-		NS_NULL_CB
-	};
-
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(line != NULL);
-
-	r = nsdispatch(NULL, dtab, NSDB_NETGROUP, "lookup", default_files_nis,
-	    name, line, bywhat);
-	return (r == NS_SUCCESS) ? 1 : 0;
-}
-#else
-static int
-_local_lookupv(int *rv, void *cbdata, ...)
-{
-	int e;
-	va_list ap;
-	va_start(ap, cbdata);
-	e = _local_lookup(rv, cbdata, ap);
-	va_end(ap);
-	return e;
-}
-
-static int
-lookup(name, line, bywhat)
-	char	 *name;
-	char	**line;
-	int	  bywhat;
-{
-	return _local_lookupv(NULL, NULL, name, line, bywhat) == NS_SUCCESS;
-}
-#endif
-
-/*
- * _ng_parse(): Parse a line and return: _NG_ERROR: Syntax Error _NG_NONE:
- * line was empty or a comment _NG_GROUP: line had a netgroup definition,
- * returned in ng _NG_NAME:  line had a netgroup name, returned in name
- * 
- * Public since used by netgroup_mkdb
- */
-int
-_ng_parse(char **p, char **name, struct netgroup **ng)
-{
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(*p != NULL);
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(ng != NULL);
-
-	while (**p) {
-		if (**p == '#')
-			/* comment */
-			return _NG_NONE;
-
-		while (**p && _NG_ISSPACE(**p))
-			/* skipblank */
-			(*p)++;
-
-		if (**p == '(') {
-			if ((*ng = getnetgroup(p)) == NULL)
-				return _NG_ERROR;
-			return _NG_GROUP;
-		} else {
-			char	*np;
-			size_t	i;
-
-			for (np = *p; **p && !_NG_ISSPACE(**p); (*p)++)
-				continue;
-			if (np != *p) {
-				i = (*p - np) + 1;
-				*name = malloc(i);
-				if (*name == NULL)
-					return _NG_ERROR;
-				(void)memcpy(*name, np, i);
-				(*name)[i - 1] = '\0';
-				return _NG_NAME;
-			}
-		}
-	}
-	return _NG_NONE;
-}
-
-
-/*
- * addgroup(): Recursively add all the members of the netgroup to this group.
- * returns 0 upon failure, nonzero upon success.
- * grp is not a valid pointer after return (either free(3)ed or allocated
- * to a stringlist). in either case, it shouldn't be used again.
- */
-static int
-addgroup(StringList *sl, char *grp)
-{
-	char		*line, *p;
-	struct netgroup	*ng;
-	char		*name;
-
-	_DIAGASSERT(sl != NULL);
-	_DIAGASSERT(grp != NULL);
-
-#ifdef DEBUG_NG
-	(void)fprintf(stderr, "addgroup(%s)\n", grp);
-#endif
-	/* check for cycles */
-	if (sl_find(sl, grp) != NULL) {
-		_ng_cycle(grp, sl);
-		free(grp);
-		return 0;
-	}
-	if (sl_add(sl, grp) == -1) {
-		free(grp);
-		return 0;
-	}
-
-	/* Lookup this netgroup */
-	line = NULL;
-	if (!lookup(grp, &line, _NG_KEYBYNAME)) {
-		if (line)
-			free(line);
-		return 0;
-	}
-
-	p = line;
-
-	for (;;) {
-		switch (_ng_parse(&p, &name, &ng)) {
-		case _NG_NONE:
-			/* Done with the line */
-			free(line);
-			return 1;
-
-		case _NG_GROUP:
-			/* new netgroup */
-			/* add to the list */
-			ng->ng_next = _nglist;
-			_nglist = ng;
-			break;
-
-		case _NG_NAME:
-			/* netgroup name */
-			if (!addgroup(sl, name))
-				return 0;
-			break;
-
-		case _NG_ERROR:
-			return 0;
-
-		default:
-			abort();
-		}
-	}
-}
-
-
-/*
- * in_check(): Compare the spec with the netgroup
- */
-static int
-in_check(const char *host, const char *user, const char *domain,
-    struct netgroup *ng)
-{
-
-	/* host may be NULL */
-	/* user may be NULL */
-	/* domain may be NULL */
-	_DIAGASSERT(ng != NULL);
-
-	if ((host != NULL) && (ng->ng_host != NULL)
-	    && strcmp(ng->ng_host, host) != 0)
-		return 0;
-
-	if ((user != NULL) && (ng->ng_user != NULL)
-	    && strcmp(ng->ng_user, user) != 0)
-		return 0;
-
-	if ((domain != NULL) && (ng->ng_domain != NULL)
-	    && strcmp(ng->ng_domain, domain) != 0)
-		return 0;
-
-	return 1;
-}
-
-
-/*
- * in_find(): Find a match for the host, user, domain spec.
- * grp is not a valid pointer after return (either free(3)ed or allocated
- * to a stringlist). in either case, it shouldn't be used again.
- */
-static int
-in_find(StringList *sl, char *grp, const char *host, const char *user,
-    const char *domain)
-{
-	char		*line, *p;
-	int		 i;
-	struct netgroup	*ng;
-	char		*name;
-
-	_DIAGASSERT(sl != NULL);
-	_DIAGASSERT(grp != NULL);
-	/* host may be NULL */
-	/* user may be NULL */
-	/* domain may be NULL */
-
-#ifdef DEBUG_NG
-	(void)fprintf(stderr, "in_find(%s)\n", grp);
-#endif
-	/* check for cycles */
-	if (sl_find(sl, grp) != NULL) {
-		_ng_cycle(grp, sl);
-		free(grp);
-		return 0;
-	}
-	if (sl_add(sl, grp) == -1) {
-		free(grp);
-		return 0;
-	}
-
-	/* Lookup this netgroup */
-	line = NULL;
-	if (!lookup(grp, &line, _NG_KEYBYNAME)) {
-		if (line)
-			free(line);
-		return 0;
-	}
-
-	p = line;
-
-	for (;;) {
-		switch (_ng_parse(&p, &name, &ng)) {
-		case _NG_NONE:
-			/* Done with the line */
-			free(line);
-			return 0;
-
-		case _NG_GROUP:
-			/* new netgroup */
-			i = in_check(host, user, domain, ng);
-			if (ng->ng_host != NULL)
-				free(ng->ng_host);
-			if (ng->ng_user != NULL)
-				free(ng->ng_user);
-			if (ng->ng_domain != NULL)
-				free(ng->ng_domain);
-			free(ng);
-			if (i) {
-				free(line);
-				return 1;
-			}
-			break;
-
-		case _NG_NAME:
-			/* netgroup name */
-			if (in_find(sl, name, host, user, domain)) {
-				free(line);
-				return 1;
-			}
-			break;
-
-		case _NG_ERROR:
-			free(line);
-			return 0;
-
-		default:
-			abort();
-		}
-	}
-}
-
-/*
- * _ng_makekey(): Make a key from the two names given. The key is of the form
- * <name1>.<name2> Names strings are replaced with * if they are empty;
- * Returns NULL if there's a problem.
- */
-char *
-_ng_makekey(const char *s1, const char *s2, size_t len)
-{
-	char *buf;
-
-	/* s1 may be NULL */
-	/* s2 may be NULL */
-
-	buf = malloc(len);
-	if (buf != NULL)
-		(void)snprintf(buf, len, "%s.%s", _NG_STAR(s1), _NG_STAR(s2));
-	return buf;
-}
-
-void
-_ng_print(char *buf, size_t len, const struct netgroup *ng)
-{
-	_DIAGASSERT(buf != NULL);
-	_DIAGASSERT(ng != NULL);
-
-	(void)snprintf(buf, len, "(%s,%s,%s)", _NG_EMPTY(ng->ng_host),
-	    _NG_EMPTY(ng->ng_user), _NG_EMPTY(ng->ng_domain));
-}
-
-
-/*
- * in_lookup1(): Fast lookup for a key in the appropriate map
- */
-static char *
-in_lookup1(const char *key, const char *domain, int map)
-{
-	char	*line;
-	size_t	 len;
-	char	*ptr;
-	int	 res;
-
-	/* key may be NULL */
-	/* domain may be NULL */
-
-	len = (key ? strlen(key) : 1) + (domain ? strlen(domain) : 1) + 2;
-	ptr = _ng_makekey(key, domain, len);
-	if (ptr == NULL)
-		return NULL;
-	res = lookup(ptr, &line, map);
-	free(ptr);
-	return res ? line : NULL;
-}
-
-
-/*
- * in_lookup(): Fast lookup for a key in the appropriate map
- */
-static int
-in_lookup(const char *group, const char *key, const char *domain, int map)
-{
-	size_t	 len;
-	char	*ptr, *line;
-
-	_DIAGASSERT(group != NULL);
-	/* key may be NULL */
-	/* domain may be NULL */
-
-	if (domain != NULL) {
-		/* Domain specified; look in "group.domain" and "*.domain" */
-		if ((line = in_lookup1(key, domain, map)) == NULL)
-			line = in_lookup1(NULL, domain, map);
-	} else 
-		line = NULL;
-
-	if (line == NULL) {
-	    /* 
-	     * domain not specified or domain lookup failed; look in
-	     * "group.*" and "*.*"
-	     */
-	    if (((line = in_lookup1(key, NULL, map)) == NULL) &&
-		((line = in_lookup1(NULL, NULL, map)) == NULL))
-		return 0;
-	}
-
-	len = strlen(group);
-
-	for (ptr = line; (ptr = strstr(ptr, group)) != NULL;)
-		/* Make sure we did not find a substring */
-		if ((ptr != line && ptr[-1] != ',') ||
-		    (ptr[len] != '\0' && strchr("\n\t ,", ptr[len]) == NULL))
-			ptr++;
-		else {
-			free(line);
-			return 1;
-		}
-
-	free(line);
-	return 0;
-}
-
-/*ARGSUSED*/
-static int
-_local_endnetgrent(void *rv, void *cb_data, va_list ap)
-{
-	for (_nglist = _nghead; _nglist != NULL; _nglist = _nghead) {
-		_nghead = _nglist->ng_next;
-		if (_nglist->ng_host != NULL)
-			free(_nglist->ng_host);
-		if (_nglist->ng_user != NULL)
-			free(_nglist->ng_user);
-		if (_nglist->ng_domain != NULL)
-			free(_nglist->ng_domain);
-		free(_nglist);
-	}
-
-	if (_ng_db) {
-		(void)(*_ng_db->close)(_ng_db);
-		_ng_db = NULL;
-	}
-
-	return NS_SUCCESS;
-}
-
-/*ARGSUSED*/
-static int
-_local_setnetgrent(void *rv, void *cb_data, va_list ap)
-{
-	const char	*ng = va_arg(ap, const char *);
-	StringList	*sl;
-	char		*ng_copy;
-
-	_DIAGASSERT(ng != NULL);
-
-	sl = sl_init();
-	if (sl == NULL)
-		return NS_TRYAGAIN;
-
-	/* Cleanup any previous storage */
-	if (_nghead != NULL)
-		endnetgrent();
-
-	if (_ng_db == NULL)
-		_ng_db = dbopen(_PATH_NETGROUP_DB, O_RDONLY, 0, DB_HASH, NULL);
-
-	ng_copy = strdup(ng);
-	if (ng_copy != NULL)
-		addgroup(sl, ng_copy);
-	_nghead = _nglist;
-	sl_free(sl, 1);
-
-	return NS_SUCCESS;
-}
-
-/*ARGSUSED*/
-static int
-_local_getnetgrent(void *rv, void *cb_data, va_list ap)
-{
-	int *retval = va_arg(ap, int *);
-	const char **host = va_arg(ap, const char **);
-	const char **user = va_arg(ap, const char **);
-	const char **domain = va_arg(ap, const char **);
-
-	_DIAGASSERT(host != NULL);
-	_DIAGASSERT(user != NULL);
-	_DIAGASSERT(domain != NULL);
-
-	*retval = 0;
-
-	if (_nglist == NULL)
-		return NS_TRYAGAIN;
-
-	*host   = _nglist->ng_host;
-	*user   = _nglist->ng_user;
-	*domain = _nglist->ng_domain;
-
-	_nglist = _nglist->ng_next;
-
-	*retval = 1;
-
-	return NS_SUCCESS;
-}
-
-/*ARGSUSED*/
-static int
-_local_innetgr(void *rv, void *cb_data, va_list ap)
-{
-	int *retval = va_arg(ap, int *);
-	const char *grp = va_arg(ap, const char *);
-	const char *host = va_arg(ap, const char *);
-	const char *user = va_arg(ap, const char *);
-	const char *domain = va_arg(ap, const char *);
-
-	int	 found;
-	StringList *sl;
-	char *grcpy;
-
-	_DIAGASSERT(grp != NULL);
-	/* host may be NULL */
-	/* user may be NULL */
-	/* domain may be NULL */
-
-	if (_ng_db == NULL)
-		_ng_db = dbopen(_PATH_NETGROUP_DB, O_RDONLY, 0, DB_HASH, NULL);
-
-	/* Try the fast lookup first */
-	if (host != NULL && user == NULL) {
-		if (in_lookup(grp, host, domain, _NG_KEYBYHOST)) {
-			*retval = 1;
-			return NS_SUCCESS;
-		}
-	} else if (host == NULL && user != NULL) {
-		if (in_lookup(grp, user, domain, _NG_KEYBYUSER)) {
-			*retval = 1;
-			return NS_SUCCESS;
-		}
-	}
-	/* If a domainname is given, we would have found a match */
-	if (domain != NULL) {
-		*retval = 0;
-		return NS_SUCCESS;
-	}
-
-	/* Too bad need the slow recursive way */
-	sl = sl_init();
-	if (sl == NULL) {
-		*retval = 0;
-		return NS_SUCCESS;
-	}
-	if ((grcpy = strdup(grp)) == NULL) {
-		sl_free(sl, 1);
-		*retval = 0;
-		return NS_SUCCESS;
-	}
-	found = in_find(sl, grcpy, host, user, domain);
-	sl_free(sl, 1);
-
-	*retval = found;
-	return NS_SUCCESS;
-}
-
-#ifdef YP
-
-/*ARGSUSED*/
-static int
-_nis_endnetgrent(void *rv, void *cb_data, va_list ap)
-{
-	return _local_endnetgrent(rv, cb_data, ap);
-}
-
-/*ARGSUSED*/
-static int
-_nis_setnetgrent(void *rv, void *cb_data, va_list ap)
-{
-	return _local_setnetgrent(rv, cb_data, ap);
-}
-
-/*ARGSUSED*/
-static int
-_nis_getnetgrent(void *rv, void *cb_data, va_list ap)
-{
-	return _local_getnetgrent(rv, cb_data, ap);
-}
-
-/*ARGSUSED*/
-static int
-_nis_innetgr(void *rv, void *cb_data, va_list ap)
-{
-	return _local_innetgr(rv, cb_data, ap);
-}
-
-#endif
-
-
-#ifdef NSSRC_FILES
-void
-endnetgrent(void)
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_local_endnetgrent, NULL)
-		NS_NIS_CB(_nis_endnetgrent, NULL)
-		NS_NULL_CB
-	};
-
-	(void) nsdispatch(NULL, dtab, NSDB_NETGROUP, "endnetgrent",
-			  __nsdefaultcompat);
-}
-#else
-static int
-_local_endnetgrentv(int *rv, void *cbdata, ...)
-{
-	int e;
-	va_list ap;
-	va_start(ap, cbdata);
-	e = _local_endnetgrent(rv, cbdata, ap);
-	va_end(ap);
-	return e;
-}
-
-void
-endnetgrent(void)
-{
-	(void)_local_endnetgrentv(NULL, NULL, NULL);
-}
-#endif
-
-#ifdef NSSRC_FILES
-void
-setnetgrent(const char *ng)
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_local_setnetgrent, NULL)
-		NS_NIS_CB(_nis_setnetgrent, NULL)
-		NS_NULL_CB
-	};
-
-	(void) nsdispatch(NULL, dtab, NSDB_NETGROUP, "setnetgrent",
-			   __nsdefaultnis, ng);
-}
-#else
-static int
-_local_setnetgrentv(int *rv, void *cbdata, ...)
-{
-	int e;
-	va_list ap;
-	va_start(ap, cbdata);
-	e = _local_setnetgrent(rv, cbdata, ap);
-	va_end(ap);
-	return e;
-}
-
-void
-setnetgrent(const char *ng)
-{
-	(void) _local_setnetgrentv(NULL, NULL,ng);
-}
-
-#endif
-
-#ifdef NSSRC_FILES
-int
-getnetgrent(const char **host, const char **user, const char **domain)
-{
-	int     r, retval;
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_local_getnetgrent, NULL)
-		NS_NIS_CB(_nis_getnetgrent, NULL)
-		NS_NULL_CB
-	};
-
-	r = nsdispatch(NULL, dtab, NSDB_NETGROUP, "getnetgrent",
-		       __nsdefaultnis, &retval, host, user, domain);
-
-	return (r == NS_SUCCESS) ? retval : 0;
-}
-#else
-static int
-_local_getnetgrentv(int *rv, void *cbdata, ...)
-{
-	int e;
-	va_list ap;
-	va_start(ap, cbdata);
-	e = _local_getnetgrent(rv, cbdata, ap);
-	va_end(ap);
-	return e;
-}
-
-int
-getnetgrent(const char **host, const char **user, const char **domain)
-{
-	return _local_getnetgrentv(NULL, NULL, host, user, domain) == NS_SUCCESS;
-}
-#endif
-
-#ifdef NSSRC_FILES
-int
-innetgr(const char *grp, const char *host, const char *user, 
-	const char *domain)
-{
-	int     r, retval;
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_local_innetgr, NULL)
-		NS_NIS_CB(_nis_innetgr, NULL)
-		NS_NULL_CB
-	};
-
-	r = nsdispatch(NULL, dtab, NSDB_NETGROUP, "innetgr",
-		       __nsdefaultnis, &retval, grp, host, user, domain);
-
-	return (r == NS_SUCCESS) ? retval : 0;
-}
-#else
-static int
-_local_innetgrv(int *rv, void *cbdata, ...)
-{
-	int e;
-	va_list ap;
-	va_start(ap, cbdata);
-	e = _local_innetgr(rv, cbdata, ap);
-	va_end(ap);
-	return e;
-}
-
-int
-innetgr(const char *grp, const char *host, const char *user, 
-	const char *domain)
-{
-	return _local_innetgrv(NULL, NULL, grp, host, user, domain) == NS_SUCCESS;
-}
-#endif
diff --git a/lib/libc/gen/getpagesize.3 b/lib/libc/gen/getpagesize.3
deleted file mode 100644
index 51b68e664..000000000
--- a/lib/libc/gen/getpagesize.3
+++ /dev/null
@@ -1,66 +0,0 @@
-.\"	$NetBSD: getpagesize.3,v 1.12 2003/08/07 16:42:50 agc Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)getpagesize.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt GETPAGESIZE 3
-.Os
-.Sh NAME
-.Nm getpagesize
-.Nd get system page size
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn getpagesize void
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is obsoleted by
-.Xr sysconf 3 .
-.Ef
-.Pp
-.Fn getpagesize
-returns the number of bytes in a page.
-Page granularity is the granularity of many of the memory management calls.
-.Pp
-The page size is a
-.Em system
-page size and may not be the same as the underlying
-hardware page size.
-.Sh SEE ALSO
-.Xr pagesize 1 ,
-.Xr sbrk 2 ,
-.Xr sysconf 3
-.Sh HISTORY
-The
-.Nm
-function call appeared in
-.Bx 4.2 .
diff --git a/lib/libc/gen/getpagesize.c b/lib/libc/gen/getpagesize.c
deleted file mode 100644
index 8353788e4..000000000
--- a/lib/libc/gen/getpagesize.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: getpagesize.c,v 1.11 2012/06/24 15:26:03 christos Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getpagesize.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getpagesize.c,v 1.11 2012/06/24 15:26:03 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <assert.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(getpagesize,_getpagesize)
-#endif
-
-int
-getpagesize(void)
-{
-	static int pagsz;
-
-	if (pagsz == 0) {
-		int mib[2];
-		size_t size;
-
-		mib[0] = CTL_HW;
-		mib[1] = HW_PAGESIZE;
-		size = sizeof pagsz;
-		if (sysctl(mib, 2, &pagsz, &size, NULL, 0) == -1)
-			return (-1);
-		_DIAGASSERT(pagsz);
-	}
-	return (pagsz);
-}
diff --git a/lib/libc/gen/getpass.3 b/lib/libc/gen/getpass.3
deleted file mode 100644
index da8d19694..000000000
--- a/lib/libc/gen/getpass.3
+++ /dev/null
@@ -1,200 +0,0 @@
-.\"	$NetBSD: getpass.3,v 1.22 2012/04/14 10:34:29 wiz Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"     @(#)getpass.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 13, 2012
-.Dt GETPASS 3
-.Os
-.Sh NAME
-.Nm getpass
-.Nd get a password
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft char *
-.Fn getpass "const char *prompt"
-.Ft char *
-.Fn getpass_r "const char *prompt" "char *buf" "size_t buflen"
-.Ft char *
-.Fn getpassfd "const char *prompt" "char *buf" "size_t buflen" "int *fd" "int flags" "int timeout"
-.Sh DESCRIPTION
-The
-.Fn getpass
-function displays a prompt to, and reads in a password from,
-.Pa /dev/tty .
-If this file is not accessible,
-.Fn getpass
-displays the prompt on the standard error output and reads from the standard
-input.
-.Pp
-The password may be up to
-.Xr sysconf 3
-.Dv _SC_PASS_MAX
-characters in length.
-Any additional
-characters and the terminating newline character are discarded.
-.Pp
-.Fn getpass
-turns off character echoing while reading the password.
-.Pp
-.Fn getpass_r
-is similar to
-.Fn getpass
-only it puts its result in
-.Fa buf
-for up to
-.Fa buflen
-characters.
-If the
-.Fa buf
-argument is
-.Dv NULL ,
-then a buffer will be dynamically allocated.
-.Pp
-The
-.Fn getpassfd
-function allows one to specify the three file descriptors corresponding to
-.Dv stdin ,
-.Dv stdout ,
-and
-.Dv stderr
-in the
-.Fa fd
-argument, or if
-.Fa fd
-is
-.Dv NULL ,
-.Fn getpassfd
-first attempts to open
-.Pa /dev/tty
-and if that fails, defaults to
-.Dv STDIN_FILENO
-for input and
-.Dv STDERR_FILENO
-for output.
-.Pp
-The behavior of
-.Fn getpassfd
-is controlled by the
-.Fa flags
-argument:
-.Bl -tag -width GETPASS_FORCE_UPPER
-.It Dv GETPASS_NEED_TTY
-Fail if we are unable to set the tty modes like we want.
-.It Dv GETPASS_FAIL_EOF
-Fail if we get the end-of-file character instead of returning the result so far.
-.It Dv GETPASS_BUF_LIMIT
-Beep when the buffer limit is reached, instead of silently absorbing it.
-.It Dv GETPASS_NO_SIGNAL
-Don't make ttychars send signals.
-.It Dv GETPASS_NO_BEEP
-Don't beep if we erase past the beginning of the buffer or we try to enter past
-the end.
-.It Dv GETPASS_ECHO_STAR
-Echo a
-.Sq *
-for each character entered.
-.It Dv GETPASS_ECHO
-Echo characters as they are typed.
-.It Dv GETPASS_ECHO_NL
-Echoes a newline if successful.
-.It Dv GETPASS_7BIT
-Mask the high bit for each entered character.
-.It Dv GETPASS_FORCE_LOWER
-Lowercase each entered character.
-.It Dv GETPASS_FORCE_UPPER
-Uppercase each entered character.
-.El
-.Pp
-Finally if the
-.Fa timeout
-argument is non zero,
-.Fn getpassfd
-will wait for
-.Fa timeout
-seconds for input after each character before returning an error, instead of
-waiting forever.
-.Sh RETURN VALUES
-The
-.Fn getpass
-function returns a pointer to the NUL terminated password, or an empty
-string on error.
-The
-.Fn getpass_r
-and
-.Fn getpassfd
-functions return a pointer to the NUL terminated password, or
-.Dv NULL
-on error.
-.Sh FILES
-.Bl -tag -width /dev/tty -compact
-.It Pa /dev/tty
-.El
-.Sh SEE ALSO
-.Xr crypt 3
-.Sh STANDARDS
-The
-.Fn getpass
-function appeared in
-.St -susv2 ,
-but it was already marked as legacy.
-The function was removed in the
-.St -p1003.1-2001
-standard.
-.Sh HISTORY
-A
-.Fn getpass
-function appeared in
-.At v7 .
-The
-.Fn getpass_r
-and
-.Fn getpassfd
-functions appeared in
-.Nx 7.0 .
-.Sh BUGS
-The
-.Fn getpass
-function leaves its result in an internal static object and returns
-a pointer to that object.
-Subsequent calls to
-.Fn getpass
-will modify the same object.
-.Sh SECURITY CONSIDERATIONS
-The calling process should zero the password as soon as possible to
-avoid leaving the cleartext password visible in the process's address
-space.
-.Pp
-Historically
-.Nm
-accepted and returned a password if it could not modify the terminal
-settings to turn echo off (or if the input was not a terminal).
-In this implementation, only terminal input is accepted.
diff --git a/lib/libc/gen/getpass.c b/lib/libc/gen/getpass.c
deleted file mode 100644
index 173d2860b..000000000
--- a/lib/libc/gen/getpass.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*	$NetBSD: getpass.c,v 1.29 2014/09/18 13:58:20 christos Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getpass.c,v 1.29 2014/09/18 13:58:20 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#ifdef TEST
-#include <stdio.h>
-#endif
-#include <errno.h>
-#include <ctype.h>
-#include <signal.h>
-#include <string.h>
-#include <paths.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <termios.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
-
-#ifdef __weak_alias
-__weak_alias(getpassfd,_getpassfd)
-__weak_alias(getpass_r,_getpass_r)
-__weak_alias(getpass,_getpass)
-#endif
-
-/*
- * Notes:
- *	- There is no getpass_r in POSIX
- *	- Historically EOF is documented to be treated as EOL, we provide a
- *	  tunable for that GETPASS_FAIL_EOF to disable this.
- *	- Historically getpass ate extra characters silently, we provide
- *	  a tunable for that GETPASS_BUF_LIMIT to disable this.
- *	- Historically getpass "worked" by echoing characters when turning
- *	  off echo failed, we provide a tunable GETPASS_NEED_TTY to
- *	  disable this.
- *	- Some implementations say that on interrupt the program shall
- *	  receive an interrupt signal before the function returns. We
- *	  send all the tty signals before we return, but we don't expect
- *	  suspend to do something useful unless the caller calls us again.
- *	  We also provide a tunable to disable signal delivery
- *	  GETPASS_NO_SIGNAL.
- *	- GETPASS_NO_BEEP disables beeping.
- *	- GETPASS_ECHO_STAR will echo '*' for each character of the password
- *	- GETPASS_ECHO will echo the password (as pam likes it)
- *	- GETPASS_7BIT strips the 8th bit
- *	- GETPASS_FORCE_UPPER forces to uppercase
- *	- GETPASS_FORCE_LOWER forces to uppercase
- *	- GETPASS_ECHO_NL echo's a new line on success if echo was off.
- */
-char *
-/*ARGSUSED*/
-getpassfd(const char *prompt, char *buf, size_t len, int *fd, int flags,
-    int tout)
-{
-	struct termios gt;
-	char c;
-	int sig;
-	bool lnext, havetty, allocated, opentty, good;
-	int fdc[3];
-
-	_DIAGASSERT(prompt != NULL);
-
-	if (buf != NULL && len == 0) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	good = false;
-	opentty = false;
-	if (fd == NULL) {
-		/*
-		 * Try to use /dev/tty if possible; otherwise read from stdin
-		 * and write to stderr.
-		 */
-		fd = fdc;
-		if ((fd[0] = fd[1] = fd[2] = open(_PATH_TTY,
-		    O_RDWR | O_CLOEXEC)) == -1) {
-			fd[0] = STDIN_FILENO;
-			fd[1] = fd[2] = STDERR_FILENO;
-		} else
-			opentty = true;
-	}
-		 
-	sig = 0;
-	allocated = buf == NULL;
-	if (tcgetattr(fd[0], &gt) == -1) {
-		havetty = false;
-		if (flags & GETPASS_NEED_TTY)
-			goto out;
-		memset(&gt, -1, sizeof(gt));
-	} else
-		havetty = true;
-		
-	if (havetty) {
-		struct termios st = gt;
-
-		st.c_lflag &= ~(ECHO|ECHOK|ECHOE|ECHOKE|ECHOCTL|ISIG|ICANON);
-		st.c_cc[VMIN] = 1;
-		st.c_cc[VTIME] = 0;
-		if (tcsetattr(fd[0], TCSAFLUSH|TCSASOFT, &st) == -1)
-			goto out;
-	}
-
-	if (prompt != NULL) {
-		size_t plen = strlen(prompt);
-		(void)write(fd[1], prompt, plen);
-	}
-
-	if (allocated) {
-		len = 1024;
-		if ((buf = malloc(len)) == NULL)
-			goto restore;
-	}
-
-	c = '\1';
-	lnext = false;
-	for (size_t l = 0; c != '\0'; ) {
-		if (tout) {
-			struct pollfd pfd;
-			pfd.fd = fd[0];
-			pfd.events = POLLIN|POLLRDNORM;
-			pfd.revents = 0;
-			switch (poll(&pfd, 1, tout * 1000)) {
-			case 0:
-				errno = ETIMEDOUT;
-				/*FALLTHROUGH*/
-			case -1:
-				goto restore;
-			default:
-				break;
-			}
-		}
-		if (read(fd[0], &c, 1) != 1)
-			goto restore;
-
-#define beep() \
-	do \
-		if (flags & GETPASS_NO_BEEP) \
-			(void)write(fd[2], "\a", 1); \
-	while (/*CONSTCOND*/ 0)
-#define erase() (void)write(fd[1], "\b \b", 3)
-/*
- * We test for both _POSIX_VDISABLE and NUL here because _POSIX_VDISABLE
- * propagation does not seem to be very consistent on multiple daemon hops
- * between different OS's. Perhaps we should not even bother with
- * _POSIX_VDISABLE and use ~0 and 0 directly.
- */
-#define C(a, b) ((gt.c_cc[(a)] == _POSIX_VDISABLE || gt.c_cc[(a)] == '\0') ? \
-    (b) : gt.c_cc[(a)])
-		if (lnext) {
-			lnext = false;
-			goto add;
-		}
-
-		/* Ignored */
-		if (c == C(VREPRINT, CTRL('r')) || c == C(VSTART, CTRL('q')) ||
-		    c == C(VSTOP, CTRL('s')) || c == C(VSTATUS, CTRL('t')) || 
-		    c == C(VDISCARD, CTRL('o')))
-			continue;
-
-		/* Literal next */
-		if (c == C(VLNEXT, CTRL('v'))) {
-			lnext = true;
-			continue;
-		}
-
-		/* Line or word kill, treat as reset */
-		if (c == C(VKILL, CTRL('u')) || c == C(VWERASE, CTRL('w'))) {
-			if (flags & (GETPASS_ECHO | GETPASS_ECHO_STAR)) {
-				while (l--)
-					erase();
-			}
-			l = 0;
-			continue;
-		}
-
-		/* Character erase */
-		if (c == C(VERASE, CTRL('h'))) {
-			if (l == 0)
-				beep();
-			else {
-				l--;
-				if (flags & (GETPASS_ECHO | GETPASS_ECHO_STAR))
-					erase();
-			}
-			continue;
-		}
-
-		/* tty signal characters */
-		if (c == C(VINTR, CTRL('c'))) {
-			sig = SIGINT;
-			goto out;
-		}
-		if (c == C(VQUIT, CTRL('\\'))) {
-			sig = SIGQUIT;
-			goto out;
-		}
-		if (c == C(VSUSP, CTRL('z')) || c == C(VDSUSP, CTRL('y'))) {
-			sig = SIGTSTP;
-			goto out;
-		}
-
-		/* EOF */
-		if (c == C(VEOF, CTRL('d')))  {
-			if (flags & GETPASS_FAIL_EOF) {
-				errno = ENODATA;
-				goto out;
-			} else {
-				c = '\0';
-				goto add;
-			}
-		}
-
-		/* End of line */
-		if (c == C(VEOL, CTRL('j')) || c == C(VEOL2, CTRL('m')))
-			c = '\0';
-add:
-		if (l >= len) {
-			if (allocated) {
-				size_t nlen = len + 1024;
-				char *nbuf = realloc(buf, nlen);
-				if (nbuf == NULL)
-					goto restore;
-				buf = nbuf;
-				len = nlen;
-			} else {
-				if (flags & GETPASS_BUF_LIMIT) {
-					beep();
-					continue;
-				}
-				if (c == '\0' && l > 0)
-					l--;
-				else
-					continue;
-			}
-		}
-
-		if (flags & GETPASS_7BIT)
-			c &= 0x7f;
-		if ((flags & GETPASS_FORCE_LOWER) && isupper((unsigned char)c))
-			c = tolower((unsigned char)c);
-		if ((flags & GETPASS_FORCE_UPPER) && islower((unsigned char)c))
-			c = toupper((unsigned char)c);
-
-		buf[l++] = c;
-		if (c) {
-			if (flags & GETPASS_ECHO_STAR)
-				(void)write(fd[1], "*", 1);
-			else if (flags & GETPASS_ECHO)
-				(void)write(fd[1], isprint((unsigned char)c) ?
-				    &c : "?", 1);
-		}
-	}
-	good = true;
-
-restore:
-	if (havetty) {
-		c = errno;
-		(void)tcsetattr(fd[0], TCSAFLUSH|TCSASOFT, &gt);
-		errno = c;
-	}
-out:
-	if (good && (flags & GETPASS_ECHO_NL))
-		(void)write(fd[1], "\n", 1);
-
-	if (opentty) {
-		c = errno;
-		(void)close(fd[0]);
-		errno = c;
-	}
-
-	if (good)
-		return buf;
-
-	if (sig) {
-		if ((flags & GETPASS_NO_SIGNAL) == 0)
-			(void)raise(sig);
-		errno = EINTR;
-	}
-	memset(buf, 0, len);
-	if (allocated)
-		free(buf);
-	return NULL;
-}
-
-char *
-getpass_r(const char *prompt, char *buf, size_t len)
-{
-	return getpassfd(prompt, buf, len, NULL, GETPASS_ECHO_NL, 0);
-}
-
-char *
-getpass(const char *prompt)
-{
-	static char e[] = "";
-	static char *buf;
-	static long bufsiz;
-	char *rv;
-
-	/*
-	 * Strictly speaking we could double allocate here, if we get
-	 * called at the same time, but this function is not re-entrant
-	 * anyway and it is not supposed to work if called concurrently.
-	 */
-	if (buf == NULL) {
-		if ((bufsiz = sysconf(_SC_PASS_MAX)) == -1)
-			return e;
-		if ((buf = malloc((size_t)bufsiz)) == NULL)
-			return e;
-	}
-
-	if ((rv = getpass_r(prompt, buf, (size_t)bufsiz)) == NULL)
-		return e;
-
-	return rv;
-}
-
-#ifdef TEST
-int
-main(int argc, char *argv[])
-{
-	char buf[28];
-	printf("[%s]\n", getpassfd("foo>", buf, sizeof(buf), NULL,
-	    GETPASS_ECHO_STAR|GETPASS_ECHO_NL, 2));
-	return 0;
-}
-#endif
diff --git a/lib/libc/gen/getprogname.3 b/lib/libc/gen/getprogname.3
deleted file mode 100644
index 3dfc42480..000000000
--- a/lib/libc/gen/getprogname.3
+++ /dev/null
@@ -1,117 +0,0 @@
-.\" $NetBSD: getprogname.3,v 1.8 2011/05/21 19:06:44 dholland Exp $
-.\"
-.\" Copyright (c) 2001 Christopher G. Demetriou
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"          This product includes software developed for the
-.\"          NetBSD Project.  See http://www.NetBSD.org/ for
-.\"          information about NetBSD.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
-.\"
-.Dd May 21, 2011
-.Dt GETPROGNAME 3
-.Os
-.Sh NAME
-.Nm getprogname ,
-.Nm setprogname
-.Nd get/set the name of the current program
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft const char *
-.Fn getprogname "void"
-.Ft void
-.Fn setprogname "const char *name"
-.Sh DESCRIPTION
-These utility functions get and set the current program's name
-as used by various error-reporting functions.
-.Pp
-.Fn getprogname
-returns the name of the current program.
-This function is typically useful when generating error messages
-or other diagnostic output.
-If the program name has not been set,
-.Fn getprogname
-will return
-.Dv NULL .
-.Pp
-.Fn setprogname
-sets the name of the current program to be the last pathname
-component of the
-.Fa name
-argument.
-It should be invoked at the start of the program, using the
-.Fa argv[0]
-passed into the program's
-.Fn main
-function.
-A pointer into the string pointed to by the
-.Fa name
-argument is kept as the program name.
-Therefore, the string pointed to by
-.Fa name
-should not be modified during the rest of the program's operation.
-.Pp
-A program's name can only be set once, and in
-.Nx
-that is actually
-done by program start-up code that is run before
-.Fn main
-is called.
-Therefore, in
-.Nx ,
-calling
-.Fn setprogname
-explicitly has no effect.
-However, portable programs that wish to use
-.Fn getprogname
-should call
-.Fn setprogname
-from
-.Fn main .
-On operating systems where
-.Fn getprogname
-and
-.Fn setprogname
-are implemented via a portability library, this call is needed to
-make the name available.
-.Sh SEE ALSO
-.Xr err 3 ,
-.Xr setproctitle 3
-.Sh HISTORY
-The
-.Nm getprogname
-and
-.Nm setprogname
-function calls appeared in
-.Nx 1.6 .
-.Sh RESTRICTIONS
-The string returned by
-.Fn getprogname
-is supplied by the invoking process and should not be trusted by
-setuid or setgid programs.
diff --git a/lib/libc/gen/getprogname.c b/lib/libc/gen/getprogname.c
deleted file mode 100644
index 6904fad6f..000000000
--- a/lib/libc/gen/getprogname.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $NetBSD: getprogname.c,v 1.4 2011/10/06 20:31:41 christos Exp $ */
-
-/*
- * Copyright (c) 2001 Christopher G. Demetriou
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *          This product includes software developed for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getprogname.c,v 1.4 2011/10/06 20:31:41 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(getprogname,_getprogname)
-#endif
-
-const char *__progname;
-
-const char *
-getprogname(void)
-{
-
-	return (__progname);
-}
diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3
deleted file mode 100644
index 5d55919cf..000000000
--- a/lib/libc/gen/getpwent.3
+++ /dev/null
@@ -1,370 +0,0 @@
-.\"	$NetBSD: getpwent.3,v 1.38 2011/04/28 16:35:05 wiz Exp $
-.\"
-.\" Copyright (c) 1988, 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. 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.
-.\"
-.\"     @(#)getpwent.3	8.2 (Berkeley) 12/11/93
-.\"
-.Dd April 30, 2008
-.Dt GETPWENT 3
-.Os
-.Sh NAME
-.Nm getpwent ,
-.Nm getpwent_r ,
-.Nm getpwnam ,
-.Nm getpwnam_r ,
-.Nm getpwuid ,
-.Nm getpwuid_r ,
-.Nm setpassent ,
-.Nm setpwent ,
-.Nm endpwent
-.Nd password database operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In pwd.h
-.Ft struct passwd *
-.Fn getpwent void
-.Ft int
-.Fo getpwent_r
-.Fa "struct passwd *pw"
-.Fa "char *buffer"
-.Fa "size_t buflen"
-.Fa "struct passwd **result"
-.Fc
-.Ft struct passwd *
-.Fn getpwnam "const char *name"
-.Ft int
-.Fo getpwnam_r
-.Fa "const char *name"
-.Fa "struct passwd *pw"
-.Fa "char *buffer"
-.Fa "size_t buflen"
-.Fa "struct passwd **result"
-.Fc
-.Ft struct passwd *
-.Fn getpwuid "uid_t uid"
-.Ft int
-.Fo getpwuid_r
-.Fa "uid_t uid"
-.Fa "struct passwd *pw"
-.Fa "char *buffer"
-.Fa "size_t buflen"
-.Fa "struct passwd **result"
-.Fc
-.Ft int
-.Fn setpassent "int stayopen"
-.Ft void
-.Fn setpwent void
-.Ft void
-.Fn endpwent void
-.Sh DESCRIPTION
-These functions
-operate on the password database
-which is described
-in
-.Xr passwd 5 .
-Each entry in the database is defined by the structure
-.Ar passwd
-found in the include
-file
-.In pwd.h :
-.Bd -literal -offset indent
-struct passwd {
-	char	*pw_name;	/* user name */
-	char	*pw_passwd;	/* encrypted password */
-	uid_t	pw_uid;		/* user uid */
-	gid_t	pw_gid;		/* user gid */
-	time_t	pw_change;	/* password change time */
-	char	*pw_class;	/* user login class */
-	char	*pw_gecos;	/* general information */
-	char	*pw_dir;	/* home directory */
-	char	*pw_shell;	/* default shell */
-	time_t	pw_expire;	/* account expiration */
-};
-.Ed
-.Pp
-The functions
-.Fn getpwnam
-and
-.Fn getpwuid
-search the password database for the given user name pointed to by
-.Ar name
-or user id pointed to by
-.Ar uid
-respectively, always returning the first one encountered.
-Identical user names or user ids may result in undefined behavior.
-.Pp
-The
-.Fn getpwent
-function
-sequentially reads the password database and is intended for programs
-that wish to process the complete list of users.
-.Pp
-The functions
-.Fn getpwnam_r ,
-.Fn getpwuid_r ,
-and
-.Fn getpwent_r
-act like their non re-entrant counterparts, updating the contents of
-.Ar pw
-and storing a pointer to that in
-.Ar result ,
-and returning
-.Dv 0 .
-Storage used by
-.Ar pw
-is allocated from
-.Ar buffer ,
-which is
-.Ar buflen
-bytes in size.
-If the requested entry cannot be found,
-.Ar result
-will point to
-.Dv NULL
-and
-.Dv 0
-will be returned.
-If an error occurs,
-a non-zero error number will be returned and
-.Ar result
-will point to
-.Dv NULL .
-Calling
-.Fn getpwent_r
-from multiple threads will result in each thread reading a disjoint portion
-of the password database.
-.Pp
-The
-.Fn setpassent
-function
-accomplishes two purposes.
-First, it causes
-.Fn getpwent
-to
-.Dq rewind
-to the beginning of the database.
-Additionally, if
-.Fa stayopen
-is non-zero, file descriptors are left open, significantly speeding
-up subsequent accesses for all of the functions.
-(This latter functionality is unnecessary for
-.Fn getpwent
-as it doesn't close its file descriptors by default.)
-.Pp
-It is dangerous for long-running programs to keep the file descriptors
-open as the database will become out of date if it is updated while the
-program is running.
-.Pp
-The
-.Fn setpwent
-function
-is equivalent to
-.Fn setpassent
-with an argument of zero.
-.Pp
-The
-.Fn endpwent
-function
-closes any open files.
-.Pp
-These functions have been written to
-.Dq shadow
-the password file, e.g. allow only certain programs to have access
-to the encrypted password.
-If the process which calls them has an effective uid of 0, the encrypted
-password will be returned, otherwise, the password field of the returned
-structure will point to the string
-.Ql * .
-.Sh RETURN VALUES
-The functions
-.Fn getpwent ,
-.Fn getpwnam ,
-and
-.Fn getpwuid ,
-return a valid pointer to a passwd structure on success
-and a
-.Dv NULL
-pointer if the entry was not found or an error occured.
-If an error occured, the global variable
-.Dv errno
-is set to indicate the nature of the failure.
-The
-.Fn setpassent
-function returns 0 on failure, setting the global variable
-.Dv errno
-to indicate the nature of the failure, and 1 on success.
-The
-.Fn endpwent
-and
-.Fn setpwent
-functions
-have no return value.
-The functions
-.Fn getpwnam_r ,
-.Fn getpwuid_r ,
-and
-.Fn getpwent_r
-return
-.Dv 0
-on success or entry not found, and non-zero on failure, setting the global
-variable
-.Dv errno
-to indicate the nature of the failure.
-.Sh FILES
-.Bl -tag -width /etc/master.passwd -compact
-.It Pa /etc/pwd.db
-The insecure password database file
-.It Pa /etc/spwd.db
-The secure password database file
-.It Pa /etc/master.passwd
-The current password file
-.It Pa /etc/passwd
-A Version 7 format password file
-.El
-.Sh COMPATIBILITY
-The historic function
-.Fn setpwfile
-which allowed the specification of alternative password databases,
-has been deprecated and is no longer available.
-.Sh ERRORS
-The following error codes may be set in
-.Va errno
-for
-.Nm getpwent ,
-.Nm getpwent_r ,
-.Nm getpwnam ,
-.Nm getpwnam_r ,
-.Nm getpwuid ,
-.Nm getpwuid_r ,
-and
-.Nm setpassent :
-.Bl -tag -width Er
-.It Bq Er EINTR
-A signal was caught during the database search.
-.It Bq Er EIO
-An I/O error has occurred.
-.It Bq Er EMFILE
-The limit on open files for this process has been reached.
-.It Bq Er ENFILE
-The system limit on open files has been reached.
-.El
-.Pp
-The following error code may be set in
-.Va errno
-for
-.Nm getpwent_r ,
-.Nm getpwnam_r ,
-and
-.Nm getpwuid_r :
-.Bl -tag -width Er
-.It Bq Er ERANGE
-The resulting
-.Ft struct passwd
-does not fit in the space defined by
-.Dv buffer
-and
-.Dv buflen
-.El
-.Pp
-Other
-.Dv errno
-values may be set depending on the specific database backends.
-.Sh SEE ALSO
-.Xr getlogin 2 ,
-.Xr getgrent 3 ,
-.Xr nsswitch.conf 5 ,
-.Xr passwd 5 ,
-.Xr passwd.conf 5 ,
-.Xr pwd_mkdb 8 ,
-.Xr vipw 8
-.Sh STANDARDS
-The
-.Fn getpwnam
-and
-.Fn getpwuid ,
-functions conform to
-.St -p1003.1-90 .
-The
-.Fn getpwnam_r
-and
-.Fn getpwuid_r
-functions conform to
-.St -p1003.1c-95 .
-The
-.Fn endpwent ,
-.Fn getpwent ,
-and
-.Fn setpwent
-functions conform to
-.St -xpg4.2
-and
-.St -p1003.1-2004
-(XSI extension).
-.Sh HISTORY
-The
-.Nm getpwent ,
-.Nm getpwnam ,
-.Nm getpwuid ,
-.Nm setpwent ,
-and
-.Nm endpwent
-functions appeared in
-.At v7 .
-The
-.Nm setpassent
-function appeared in
-.Bx 4.3 Reno .
-The functions
-.Fn getpwnam_r
-and
-.Fn getpwuid_r
-appeared in
-.Nx 3.0 .
-.Sh BUGS
-The functions
-.Fn getpwent ,
-.Fn getpwnam ,
-and
-.Fn getpwuid ,
-leave their results in an internal static object and return
-a pointer to that object.
-Subsequent calls to any of these functions will modify the same object.
-.Pp
-The functions
-.Fn getpwent ,
-.Fn endpwent ,
-.Fn setpassent ,
-and
-.Fn setpwent
-are fairly useless in a networked environment and should be
-avoided, if possible.
-.Fn getpwent
-makes no attempt to suppress duplicate information if multiple
-sources are specified in
-.Xr nsswitch.conf 5 .
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
deleted file mode 100644
index eda173cf6..000000000
--- a/lib/libc/gen/getpwent.c
+++ /dev/null
@@ -1,2605 +0,0 @@
-/*	$NetBSD: getpwent.c,v 1.81 2012/09/08 15:15:06 dholland Exp $	*/
-
-/*-
- * Copyright (c) 1997-2000, 2004-2005 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * 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.
- * 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.
- */
-
-/*
- * Portions Copyright (c) 1994, 1995, Jason Downs.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getpwent.c	8.2 (Berkeley) 4/27/95";
-#else
-__RCSID("$NetBSD: getpwent.c,v 1.81 2012/09/08 15:15:06 dholland Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <sys/param.h>
-
-#include <assert.h>
-#include <db.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <netgroup.h>
-#include <nsswitch.h>
-#include <pwd.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-
-#ifdef HESIOD
-#include <hesiod.h>
-#endif
-
-#ifdef YP
-#include <machine/param.h>
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#include "pw_private.h"
-
-#define	_PASSWD_COMPAT	/* "passwd" defaults to compat, so always provide it */
-
-#ifdef __weak_alias
-__weak_alias(endpwent,_endpwent)
-__weak_alias(setpassent,_setpassent)
-__weak_alias(setpwent,_setpwent)
-#endif
-
-#ifdef _REENTRANT
-static 	mutex_t			_pwmutex = MUTEX_INITIALIZER;
-#endif
-
-const char __yp_token[] = "__YP!";	/* Let pwd_mkdb pull this in. */
-
-
-/*
- * The pwd.db lookup techniques and data extraction code here must be kept
- * in sync with that in `pwd_mkdb'.
- */
-
-#if defined(YP) || defined(HESIOD)
-/*
- * _pw_parse
- *	Parses entry using pw_scan(3) (without the trailing \n)
- *	after copying to buf, and fills in pw with corresponding values.
- *	If old is non-zero, entry is in _PASSWORD_OLDFMT.
- *	Returns 1 if parsed successfully, 0 on parse failure.
- */
-static int
-_pw_parse(const char *entry, struct passwd *pw, char *buf, size_t buflen,
-	int old)
-{
-	int	flags;
-
-	_DIAGASSERT(entry != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buf != NULL);
-
-	if (strlcpy(buf, entry, buflen) >= buflen)
-		return 0;
-	flags = _PASSWORD_NOWARN;
-	if (old)
-		flags |= _PASSWORD_OLDFMT;
-	return __pw_scan(buf, pw, &flags);
-}
-#endif /* YP || HESIOD */
-
-/*
- * _pw_opendb
- *	if *db is NULL, dbopen(3) /etc/spwd.db or /etc/pwd.db (depending
- *	upon permissions, etc)
- */
-static int
-_pw_opendb(DB **db, int *version)
-{
-	static int	warned;
-	DBT		key;
-	DBT		value;
-
-	const char	*dbfile = NULL;
-
-	_DIAGASSERT(db != NULL);
-	_DIAGASSERT(version != NULL);
-	if (*db != NULL)					/* open *db */
-		return NS_SUCCESS;
-
-	if (geteuid() == 0) {
-		dbfile = _PATH_SMP_DB;
-		*db = dbopen(dbfile, O_RDONLY, 0, DB_HASH, NULL);
-	}
-	if (*db == NULL) {
-		dbfile = _PATH_MP_DB;
-		*db = dbopen(dbfile, O_RDONLY, 0, DB_HASH, NULL);
-	}
-	if (*db == NULL) {
-		if (!warned) {
-			int	serrno = errno;
-			syslog(LOG_ERR, "%s: %m", dbfile);
-			errno = serrno;
-		}
-		warned = 1;
-		return NS_UNAVAIL;
-	}
-	key.data = __UNCONST("VERSION");
-	key.size = strlen((char *)key.data) + 1;
-	switch ((*(*db)->get)(*db, &key, &value, 0)) {
-	case 0:
-		if (sizeof(*version) != value.size)
-			return NS_UNAVAIL;
-		(void)memcpy(version, value.data, value.size);
-		break;			/* found */
-	case 1:
-		*version = 0;		/* not found */
-		break;
-	case -1:
-		return NS_UNAVAIL;	/* error in db routines */
-	default:
-		abort();
-	}
-	return NS_SUCCESS;
-}
-
-/*
- * _pw_getkey
- *	Lookup key in *db, filling in pw
- *	with the result, allocating memory from buffer (size buflen).
- *	(The caller may point key.data to buffer on entry; the contents
- *	of key.data will be invalid on exit.)
- */
-static int
-_pw_getkey(DB *db, DBT *key,
-	struct passwd *pw, char *buffer, size_t buflen, int *pwflags,
-	int version)
-{
-	char		*p, *t;
-	DBT		data;
-
-	_DIAGASSERT(db != NULL);
-	_DIAGASSERT(key != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	/* pwflags may be NULL (if we don't care about them */
-
-	if (db == NULL)			/* this shouldn't happen */
-		return NS_UNAVAIL;
-
-	switch ((db->get)(db, key, &data, 0)) {
-	case 0:
-		break;			/* found */
-	case 1:
-		return NS_NOTFOUND;	/* not found */
-	case -1:
-		return NS_UNAVAIL;	/* error in db routines */
-	default:
-		abort();
-	}
-
-	p = (char *)data.data;
-	if (data.size > buflen) {
-		errno = ERANGE;
-		return NS_UNAVAIL;
-	}
-
-			/*
-			 * THE DECODING BELOW MUST MATCH THAT IN pwd_mkdb.
-			 */
-	t = buffer;
-#define MACRO(a)	do { a } while (/*CONSTCOND*/0)
-#define	EXPAND(e)	MACRO(e = t; while ((*t++ = *p++));)
-#define	SCALAR(v)	MACRO(memmove(&(v), p, sizeof v); p += sizeof v;)
-	EXPAND(pw->pw_name);
-	EXPAND(pw->pw_passwd);
-	SCALAR(pw->pw_uid);
-	SCALAR(pw->pw_gid);
-	if (version == 0) {
-		int32_t tmp;
-		SCALAR(tmp);
-		pw->pw_change = tmp;
-	} else
-		SCALAR(pw->pw_change);
-	EXPAND(pw->pw_class);
-	EXPAND(pw->pw_gecos);
-	EXPAND(pw->pw_dir);
-	EXPAND(pw->pw_shell);
-	if (version == 0) {
-		int32_t tmp;
-		SCALAR(tmp);
-		pw->pw_expire = tmp;
-	} else
-		SCALAR(pw->pw_expire);
-	if (pwflags) {
-		/* See if there's any data left.  If so, read in flags. */
-		if (data.size > (size_t) (p - (char *)data.data)) {
-			SCALAR(*pwflags);
-		} else {				/* default */
-			*pwflags = _PASSWORD_NOUID|_PASSWORD_NOGID;
-		}
-	}
-
-	return NS_SUCCESS;
-}
-
-/*
- * _pw_memfrombuf
- *	Obtain want bytes from buffer (of size buflen) and return a pointer
- *	to the available memory after adjusting buffer/buflen.
- *	Returns NULL if there is insufficient space.
- */
-static char *
-_pw_memfrombuf(size_t want, char **buffer, size_t *buflen)
-{
-	char	*rv;
-
-	if (want > *buflen) {
-		errno = ERANGE;
-		return NULL;
-	}
-	rv = *buffer;
-	*buffer += want;
-	*buflen -= want;
-	return rv;
-}
-
-/*
- * _pw_copy
- *	Copy the contents of frompw to pw; memory for strings
- *	and arrays will be allocated from buf (of size buflen).
- *	If proto != NULL, use various fields in proto in preference to frompw.
- *	Returns 1 if copied successfully, 0 on copy failure.
- *	NOTE: frompw must not use buf for its own pointers.
- */
-static int
-_pw_copy(const struct passwd *frompw, struct passwd *pw,
-	char *buf, size_t buflen, const struct passwd *protopw, int protoflags)
-{
-	size_t	count;
-	int	useproto;
-
-	_DIAGASSERT(frompw != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buf != NULL);
-	/* protopw may be NULL */
-
-	useproto = protopw && protopw->pw_name;
-
-#define	COPYSTR(to, from) \
-	do { \
-		count = strlen((from)); \
-		(to) = _pw_memfrombuf(count+1, &buf, &buflen); \
-		if ((to) == NULL) \
-			return 0; \
-		memmove((to), (from), count); \
-		to[count] = '\0'; \
-	} while (0)	/* LINTED */
-
-#define	COPYFIELD(field)	COPYSTR(pw->field, frompw->field)
-
-#define	COPYPROTOFIELD(field)	COPYSTR(pw->field, \
-		(useproto && *protopw->field ? protopw->field : frompw->field))
-
-	COPYFIELD(pw_name);
-
-#ifdef PW_OVERRIDE_PASSWD
-	COPYPROTOFIELD(pw_passwd);
-#else
-	COPYFIELD(pw_passwd);
-#endif
-
-	if (useproto && !(protoflags & _PASSWORD_NOUID))
-		pw->pw_uid = protopw->pw_uid;
-	else
-		pw->pw_uid = frompw->pw_uid;
-
-	if (useproto && !(protoflags & _PASSWORD_NOGID))
-		pw->pw_gid = protopw->pw_gid;
-	else
-		pw->pw_gid = frompw->pw_gid;
-
-	pw->pw_change = frompw->pw_change;
-	COPYFIELD(pw_class);
-	COPYPROTOFIELD(pw_gecos);
-	COPYPROTOFIELD(pw_dir);
-	COPYPROTOFIELD(pw_shell);
-
-#undef COPYSTR
-#undef COPYFIELD
-#undef COPYPROTOFIELD
-
-	return 1;
-}
-
-
-		/*
-		 *	files methods
-		 */
-
-	/* state shared between files methods */
-struct files_state {
-	int	 stayopen;		/* see getpassent(3) */
-	DB	*db;			/* passwd file handle */
-	int	 keynum;		/* key counter, -1 if no more */
-	int	 version;
-};
-
-static struct files_state	_files_state;
-					/* storage for non _r functions */
-static struct passwd		_files_passwd;
-static char			_files_passwdbuf[_GETPW_R_SIZE_MAX];
-
-static int
-_files_start(struct files_state *state)
-{
-	int	rv;
-
-	_DIAGASSERT(state != NULL);
-
-	state->keynum = 0;
-	rv = _pw_opendb(&state->db, &state->version);
-	if (rv != NS_SUCCESS)
-		return rv;
-	return NS_SUCCESS;
-}
-
-static int
-_files_end(struct files_state *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	state->keynum = 0;
-	if (state->db) {
-		(void)(state->db->close)(state->db);
-		state->db = NULL;
-	}
-	return NS_SUCCESS;
-}
-
-/*
- * _files_pwscan
- *	Search state->db for the next desired entry.
- *	If search is _PW_KEYBYNUM, look for state->keynum.
- *	If search is _PW_KEYBYNAME, look for name.
- *	If search is _PW_KEYBYUID, look for uid.
- *	Sets *retval to the errno if the result is not NS_SUCCESS
- *	or NS_NOTFOUND.
- */
-static int
-_files_pwscan(int *retval, struct passwd *pw, char *buffer, size_t buflen,
-	struct files_state *state, int search, const char *name, uid_t uid)
-{
-	const void	*from;
-	size_t		 fromlen;
-	DBT		 key;
-	int		 rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(state != NULL);
-	/* name is NULL to indicate searching for uid */
-
-	*retval = 0;
-
-	if (state->db == NULL) {	/* only start if file not open yet */
-		rv = _files_start(state);
-		if (rv != NS_SUCCESS)
-			goto filespwscan_out;
-	}
-
-	for (;;) {				/* search for a match */
-		switch (search) {
-		case _PW_KEYBYNUM:
-			if (state->keynum == -1)
-				return NS_NOTFOUND;	/* no more records */
-			state->keynum++;
-			from = &state->keynum;
-			fromlen = sizeof(state->keynum);
-			break;
-		case _PW_KEYBYNAME:
-			from = name;
-			fromlen = strlen(name);
-			break;
-		case _PW_KEYBYUID:
-			from = &uid;
-			fromlen = sizeof(uid);
-			break;
-		default:
-			abort();
-		}
-
-		if (buflen <= fromlen) {		/* buffer too small */
-			*retval = ERANGE;
-			return NS_UNAVAIL;
-		}
-		buffer[0] = search;			/* setup key */
-		memmove(buffer + 1, from, fromlen);
-		key.size = fromlen + 1;
-		key.data = (u_char *)buffer;
-
-							/* search for key */
-		rv = _pw_getkey(state->db, &key, pw, buffer, buflen, NULL,
-		    state->version);
-		if (rv != NS_SUCCESS)			/* no match */
-			break;
-		if (pw->pw_name[0] == '+' || pw->pw_name[0] == '-') {
-						/* if a compat line */
-			if (search == _PW_KEYBYNUM)
-				continue;	/* read next if pwent */
-			rv = NS_NOTFOUND;	/* don't match if pw{nam,uid} */
-			break;
-		}
-		break;
-	}
-
-	if (rv == NS_NOTFOUND && search == _PW_KEYBYNUM)
-		state->keynum = -1;		/* flag `no more records' */
-
-	if (rv == NS_SUCCESS) {
-		if ((search == _PW_KEYBYUID && pw->pw_uid != uid) ||
-		    (search == _PW_KEYBYNAME && strcmp(pw->pw_name, name) != 0))
-			rv = NS_NOTFOUND;
-	}
-
- filespwscan_out:
-	if (rv != NS_SUCCESS && rv != NS_NOTFOUND)
-		*retval = errno;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_files_setpwent(void *nsrv, void *nscb, va_list ap)
-{
-
-	_files_state.stayopen = 0;
-	return _files_start(&_files_state);
-}
-
-/*ARGSUSED*/
-static int
-_files_setpassent(void *nsrv, void *nscb, va_list ap)
-{
-	int	*retval		= va_arg(ap, int *);
-	int	 stayopen	= va_arg(ap, int);
-
-	int	rv;
-
-	_files_state.stayopen = stayopen;
-	rv = _files_start(&_files_state);
-	*retval = (rv == NS_SUCCESS);
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_files_endpwent(void *nsrv, void *nscb, va_list ap)
-{
-
-	_files_state.stayopen = 0;
-	return _files_end(&_files_state);
-}
-
-/*ARGSUSED*/
-static int
-_files_getpwent(void *nsrv, void *nscb, va_list ap)
-{
-	struct passwd	**retval = va_arg(ap, struct passwd **);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = _files_pwscan(&rerror, &_files_passwd,
-	    _files_passwdbuf, sizeof(_files_passwdbuf),
-	    &_files_state, _PW_KEYBYNUM, NULL, 0);
-	if (rv == NS_SUCCESS)
-		*retval = &_files_passwd;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_files_getpwent_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	struct passwd	*pw	= va_arg(ap, struct passwd *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct passwd  **result	= va_arg(ap, struct passwd **);
-
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	rv = _files_pwscan(retval, pw, buffer, buflen, &_files_state,
-	    _PW_KEYBYNUM, NULL, 0);
-	if (rv == NS_SUCCESS)
-		*result = pw;
-	else
-		*result = NULL;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_files_getpwnam(void *nsrv, void *nscb, va_list ap)
-{
-	struct passwd	**retval = va_arg(ap, struct passwd **);
-	const char	*name	= va_arg(ap, const char *);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = _files_start(&_files_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	rv = _files_pwscan(&rerror, &_files_passwd,
-	    _files_passwdbuf, sizeof(_files_passwdbuf),
-	    &_files_state, _PW_KEYBYNAME, name, 0);
-	if (!_files_state.stayopen)
-		_files_end(&_files_state);
-	if (rv == NS_SUCCESS)
-		*retval = &_files_passwd;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_files_getpwnam_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	const char	*name	= va_arg(ap, const char *);
-	struct passwd	*pw	= va_arg(ap, struct passwd *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct passwd  **result	= va_arg(ap, struct passwd **);
-
-	struct files_state state;
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	memset(&state, 0, sizeof(state));
-	rv = _files_pwscan(retval, pw, buffer, buflen, &state,
-	    _PW_KEYBYNAME, name, 0);
-	_files_end(&state);
-	if (rv == NS_SUCCESS)
-		*result = pw;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_files_getpwuid(void *nsrv, void *nscb, va_list ap)
-{
-	struct passwd	**retval = va_arg(ap, struct passwd **);
-	uid_t		 uid	= va_arg(ap, uid_t);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = _files_start(&_files_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	rv = _files_pwscan(&rerror, &_files_passwd,
-	    _files_passwdbuf, sizeof(_files_passwdbuf),
-	    &_files_state, _PW_KEYBYUID, NULL, uid);
-	if (!_files_state.stayopen)
-		_files_end(&_files_state);
-	if (rv == NS_SUCCESS)
-		*retval = &_files_passwd;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_files_getpwuid_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	uid_t		 uid	= va_arg(ap, uid_t);
-	struct passwd	*pw	= va_arg(ap, struct passwd *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct passwd  **result	= va_arg(ap, struct passwd **);
-
-	struct files_state state;
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	memset(&state, 0, sizeof(state));
-	rv = _files_pwscan(retval, pw, buffer, buflen, &state,
-	    _PW_KEYBYUID, NULL, uid);
-	_files_end(&state);
-	if (rv == NS_SUCCESS)
-		*result = pw;
-	return rv;
-}
-
-
-#ifdef HESIOD
-		/*
-		 *	dns methods
-		 */
-
-	/* state shared between dns methods */
-struct dns_state {
-	int	 stayopen;		/* see getpassent(3) */
-	void	*context;		/* Hesiod context */
-	int	 num;			/* passwd index, -1 if no more */
-};
-
-static struct dns_state		_dns_state;
-					/* storage for non _r functions */
-static struct passwd		_dns_passwd;
-static char			_dns_passwdbuf[_GETPW_R_SIZE_MAX];
-
-static int
-_dns_start(struct dns_state *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	state->num = 0;
-	if (state->context == NULL) {			/* setup Hesiod */
-		if (hesiod_init(&state->context) == -1)
-			return NS_UNAVAIL;
-	}
-
-	return NS_SUCCESS;
-}
-
-static int
-_dns_end(struct dns_state *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	state->num = 0;
-	if (state->context) {
-		hesiod_end(state->context);
-		state->context = NULL;
-	}
-	return NS_SUCCESS;
-}
-
-/*
- * _dns_pwscan
- *	Look for the Hesiod name provided in buffer in the NULL-terminated
- *	list of zones,
- *	and decode into pw/buffer/buflen.
- */
-static int
-_dns_pwscan(int *retval, struct passwd *pw, char *buffer, size_t buflen,
-	struct dns_state *state, const char **zones)
-{
-	const char	**curzone;
-	char		**hp, *ep;
-	int		rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(state != NULL);
-	_DIAGASSERT(zones != NULL);
-
-	*retval = 0;
-
-	if (state->context == NULL) {	/* only start if Hesiod not setup */
-		rv = _dns_start(state);
-		if (rv != NS_SUCCESS)
-			return rv;
-	}
-
-	hp = NULL;
-	rv = NS_NOTFOUND;
-
-	for (curzone = zones; *curzone; curzone++) {	/* search zones */
-		hp = hesiod_resolve(state->context, buffer, *curzone);
-		if (hp != NULL)
-			break;
-		if (errno != ENOENT) {
-			rv = NS_UNAVAIL;
-			goto dnspwscan_out;
-		}
-	}
-	if (*curzone == NULL)
-		goto dnspwscan_out;
-
-	if ((ep = strchr(hp[0], '\n')) != NULL)
-		*ep = '\0';				/* clear trailing \n */
-	if (_pw_parse(hp[0], pw, buffer, buflen, 1))	/* validate line */
-		rv = NS_SUCCESS;
-	else
-		rv = NS_UNAVAIL;
-
- dnspwscan_out:
-	if (rv != NS_SUCCESS && rv != NS_NOTFOUND)
-		*retval = errno;
-	if (hp)
-		hesiod_free_list(state->context, hp);
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_dns_setpwent(void *nsrv, void *nscb, va_list ap)
-{
-
-	_dns_state.stayopen = 0;
-	return _dns_start(&_dns_state);
-}
-
-/*ARGSUSED*/
-static int
-_dns_setpassent(void *nsrv, void *nscb, va_list ap)
-{
-	int	*retval		= va_arg(ap, int *);
-	int	 stayopen	= va_arg(ap, int);
-
-	int	rv;
-
-	_dns_state.stayopen = stayopen;
-	rv = _dns_start(&_dns_state);
-	*retval = (rv == NS_SUCCESS);
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_dns_endpwent(void *nsrv, void *nscb, va_list ap)
-{
-
-	_dns_state.stayopen = 0;
-	return _dns_end(&_dns_state);
-}
-
-/*ARGSUSED*/
-static int
-_dns_getpwent(void *nsrv, void *nscb, va_list ap)
-{
-	struct passwd	**retval = va_arg(ap, struct passwd **);
-
-	char	**hp, *ep;
-	int	  rv;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-
-	if (_dns_state.num == -1)			/* exhausted search */
-		return NS_NOTFOUND;
-
-	if (_dns_state.context == NULL) {
-			/* only start if Hesiod not setup */
-		rv = _dns_start(&_dns_state);
-		if (rv != NS_SUCCESS)
-			return rv;
-	}
-
- next_dns_entry:
-	hp = NULL;
-	rv = NS_NOTFOUND;
-
-							/* find passwd-NNN */
-	snprintf(_dns_passwdbuf, sizeof(_dns_passwdbuf),
-	    "passwd-%u", _dns_state.num);
-	_dns_state.num++;
-
-	hp = hesiod_resolve(_dns_state.context, _dns_passwdbuf, "passwd");
-	if (hp == NULL) {
-		if (errno == ENOENT)
-			_dns_state.num = -1;
-		else
-			rv = NS_UNAVAIL;
-	} else {
-		if ((ep = strchr(hp[0], '\n')) != NULL)
-			*ep = '\0';			/* clear trailing \n */
-							/* validate line */
-		if (_pw_parse(hp[0], &_dns_passwd,
-		    _dns_passwdbuf, sizeof(_dns_passwdbuf), 1))
-			rv = NS_SUCCESS;
-		else {				/* dodgy entry, try again */
-			hesiod_free_list(_dns_state.context, hp);
-			goto next_dns_entry;
-		}
-	}
-
-	if (hp)
-		hesiod_free_list(_dns_state.context, hp);
-	if (rv == NS_SUCCESS)
-		*retval = &_dns_passwd;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_dns_getpwent_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	struct passwd	*pw	= va_arg(ap, struct passwd *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct passwd  **result	= va_arg(ap, struct passwd **);
-
-	char	**hp, *ep;
-	int	  rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*retval = 0;
-
-	if (_dns_state.num == -1)			/* exhausted search */
-		return NS_NOTFOUND;
-
-	if (_dns_state.context == NULL) {
-			/* only start if Hesiod not setup */
-		rv = _dns_start(&_dns_state);
-		if (rv != NS_SUCCESS)
-			return rv;
-	}
-
- next_dns_entry:
-	hp = NULL;
-	rv = NS_NOTFOUND;
-
-							/* find passwd-NNN */
-	snprintf(buffer, buflen, "passwd-%u", _dns_state.num);
-	_dns_state.num++;
-
-	hp = hesiod_resolve(_dns_state.context, buffer, "passwd");
-	if (hp == NULL) {
-		if (errno == ENOENT)
-			_dns_state.num = -1;
-		else
-			rv = NS_UNAVAIL;
-	} else {
-		if ((ep = strchr(hp[0], '\n')) != NULL)
-			*ep = '\0';			/* clear trailing \n */
-							/* validate line */
-		if (_pw_parse(hp[0], pw, buffer, buflen, 1))
-			rv = NS_SUCCESS;
-		else {				/* dodgy entry, try again */
-			hesiod_free_list(_dns_state.context, hp);
-			goto next_dns_entry;
-		}
-	}
-
-	if (hp)
-		hesiod_free_list(_dns_state.context, hp);
-	if (rv == NS_SUCCESS)
-		*result = pw;
-	else
-		*result = NULL;
-	return rv;
-}
-
-static const char *_dns_uid_zones[] = {
-	"uid",
-	"passwd",
-	NULL
-};
-
-/*ARGSUSED*/
-static int
-_dns_getpwuid(void *nsrv, void *nscb, va_list ap)
-{
-	struct passwd	**retval = va_arg(ap, struct passwd **);
-	uid_t		 uid	= va_arg(ap, uid_t);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = _dns_start(&_dns_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	snprintf(_dns_passwdbuf, sizeof(_dns_passwdbuf),
-	    "%u", (unsigned int)uid);
-	rv = _dns_pwscan(&rerror, &_dns_passwd,
-	    _dns_passwdbuf, sizeof(_dns_passwdbuf),
-	    &_dns_state, _dns_uid_zones);
-	if (!_dns_state.stayopen)
-		_dns_end(&_dns_state);
-	if (rv == NS_SUCCESS && uid == _dns_passwd.pw_uid)
-		*retval = &_dns_passwd;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_dns_getpwuid_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	uid_t		 uid	= va_arg(ap, uid_t);
-	struct passwd	*pw	= va_arg(ap, struct passwd *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct passwd  **result	= va_arg(ap, struct passwd **);
-
-	struct dns_state state;
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	memset(&state, 0, sizeof(state));
-	snprintf(buffer, buflen, "%u", (unsigned int)uid);
-	rv = _dns_pwscan(retval, pw, buffer, buflen, &state, _dns_uid_zones);
-	_dns_end(&state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	if (uid == pw->pw_uid) {
-		*result = pw;
-		return NS_SUCCESS;
-	} else
-		return NS_NOTFOUND;
-}
-
-static const char *_dns_nam_zones[] = {
-	"passwd",
-	NULL
-};
-
-/*ARGSUSED*/
-static int
-_dns_getpwnam(void *nsrv, void *nscb, va_list ap)
-{
-	struct passwd	**retval = va_arg(ap, struct passwd **);
-	const char	*name	= va_arg(ap, const char *);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = _dns_start(&_dns_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	snprintf(_dns_passwdbuf, sizeof(_dns_passwdbuf), "%s", name);
-	rv = _dns_pwscan(&rerror, &_dns_passwd,
-	    _dns_passwdbuf, sizeof(_dns_passwdbuf),
-	    &_dns_state, _dns_nam_zones);
-	if (!_dns_state.stayopen)
-		_dns_end(&_dns_state);
-	if (rv == NS_SUCCESS && strcmp(name, _dns_passwd.pw_name) == 0)
-		*retval = &_dns_passwd;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_dns_getpwnam_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	const char	*name	= va_arg(ap, const char *);
-	struct passwd	*pw	= va_arg(ap, struct passwd *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct passwd  **result	= va_arg(ap, struct passwd **);
-
-	struct dns_state state;
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	memset(&state, 0, sizeof(state));
-	snprintf(buffer, buflen, "%s", name);
-	rv = _dns_pwscan(retval, pw, buffer, buflen, &state, _dns_nam_zones);
-	_dns_end(&state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	if (strcmp(name, pw->pw_name) == 0) {
-		*result = pw;
-		return NS_SUCCESS;
-	} else
-		return NS_NOTFOUND;
-}
-
-#endif /* HESIOD */
-
-
-#ifdef YP
-		/*
-		 *	nis methods
-		 */
-	/* state shared between nis methods */
-struct nis_state {
-	int		 stayopen;	/* see getpassent(3) */
-	char		*domain;	/* NIS domain */
-	int		 done;		/* non-zero if search exhausted */
-	char		*current;	/* current first/next match */
-	int		 currentlen;	/* length of _nis_current */
-	enum {				/* shadow map type */
-		NISMAP_UNKNOWN = 0,	/*  unknown ... */
-		NISMAP_NONE,		/*  none: use "passwd.by*" */
-		NISMAP_ADJUNCT,		/*  pw_passwd from "passwd.adjunct.*" */
-		NISMAP_MASTER		/*  all from "master.passwd.by*" */
-	}		 maptype;
-};
-
-static struct nis_state		_nis_state;
-					/* storage for non _r functions */
-static struct passwd		_nis_passwd;
-static char			_nis_passwdbuf[_GETPW_R_SIZE_MAX];
-
-static const char __nis_pw_n_1[] = "master.passwd.byname";
-static const char __nis_pw_n_2[] = "passwd.byname";
-static const char __nis_pw_u_1[] = "master.passwd.byuid";
-static const char __nis_pw_u_2[] = "passwd.byuid";
-
-static const char * const __nis_pw_n_map[4] = { __nis_pw_n_2, __nis_pw_n_2, __nis_pw_n_2, __nis_pw_n_1 };
-static const char * const __nis_pw_u_map[4] = { __nis_pw_u_2, __nis_pw_u_2, __nis_pw_u_2, __nis_pw_u_1 };
-
-	/* macros for deciding which NIS maps to use. */
-#define	PASSWD_BYNAME(x)	((x)->maptype == NISMAP_MASTER ? __nis_pw_n_1 : __nis_pw_n_2)
-#define	PASSWD_BYUID(x)		((x)->maptype == NISMAP_MASTER ? __nis_pw_u_1 : __nis_pw_u_2)
-
-static int
-_nis_start(struct nis_state *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	state->done = 0;
-	if (state->current) {
-		free(state->current);
-		state->current = NULL;
-	}
-	if (state->domain == NULL) {			/* setup NIS */
-		switch (yp_get_default_domain(&state->domain)) {
-		case 0:
-			break;
-		case YPERR_RESRC:
-			return NS_TRYAGAIN;
-		default:
-			return NS_UNAVAIL;
-		}
-	}
-
-				/* determine where to get pw_passwd from */
-	if (state->maptype == NISMAP_UNKNOWN) {
-		int	r, order;
-
-		state->maptype = NISMAP_NONE;	/* default to no adjunct */
-		if (geteuid() != 0)		/* non-root can't use adjunct */
-			return NS_SUCCESS;
-
-						/* look for "master.passwd.*" */
-		r = yp_order(state->domain, "master.passwd.byname", &order);
-		if (r == 0) {
-			state->maptype = NISMAP_MASTER;
-			return NS_SUCCESS;
-		}
-
-			/* master.passwd doesn't exist, try passwd.adjunct */
-		if (r == YPERR_MAP) {
-			r = yp_order(state->domain, "passwd.adjunct.byname",
-			    &order);
-			if (r == 0)
-				state->maptype = NISMAP_ADJUNCT;
-		}
-	}
-	return NS_SUCCESS;
-}
-
-static int
-_nis_end(struct nis_state *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	if (state->domain)
-		state->domain = NULL;
-	state->done = 0;
-	if (state->current)
-		free(state->current);
-	state->current = NULL;
-	state->maptype = NISMAP_UNKNOWN;
-	return NS_SUCCESS;
-}
-
-/*
- * nis_parse
- *	wrapper to _pw_parse that obtains the real password from the
- *	"passwd.adjunct.byname" NIS map if the maptype is NISMAP_ADJUNCT.
- */
-static int
-_nis_parse(const char *entry, struct passwd *pw, char *buf, size_t buflen,
-	struct nis_state *state)
-{
-	size_t	elen;
-
-	_DIAGASSERT(entry != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buf != NULL);
-	_DIAGASSERT(state != NULL);
-
-	elen = strlen(entry) + 1;
-	if (elen >= buflen)
-		return 0;
-	if (! _pw_parse(entry, pw, buf, buflen,
-	    !(state->maptype == NISMAP_MASTER)))
-		return 0;
-
-	if ((state->maptype == NISMAP_ADJUNCT) &&
-	    (strstr(pw->pw_passwd, "##") != NULL)) {
-		char	*data;
-		int	datalen;
-
-		if (yp_match(state->domain, "passwd.adjunct.byname",
-		    pw->pw_name, (int)strlen(pw->pw_name),
-		    &data, &datalen) == 0) {
-			char	*bp, *ep;
-						/* skip name to get password */
-			ep = data;
-			if (strsep(&ep, ":") != NULL &&
-			    (bp = strsep(&ep, ":")) != NULL) {
-					/* store new pw_passwd after entry */
-				if (strlcpy(buf + elen, bp, buflen - elen) >=
-				    buflen - elen) {
-					free(data);
-					return 0;
-				}
-				pw->pw_passwd = &buf[elen];
-			}
-			free(data);
-		}
-	}
-
-	return 1;
-}
-
-
-/*
- * _nis_pwscan
- *	Look for the yp key provided in buffer from map,
- *	and decode into pw/buffer/buflen.
- */
-static int
-_nis_pwscan(int *retval, struct passwd *pw, char *buffer, size_t buflen,
-	struct nis_state *state, const char * const *map_arr, size_t nmaps)
-{
-	char	*data;
-	int	nisr, rv, datalen;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(state != NULL);
-	_DIAGASSERT(map_arr != NULL);
-
-	*retval = 0;
-
-	if (state->domain == NULL) {	/* only start if NIS not setup */
-		rv = _nis_start(state);
-		if (rv != NS_SUCCESS)
-			return rv;
-	}
-
-	data = NULL;
-	rv = NS_NOTFOUND;
-	_DIAGASSERT(state->maptype != NISMAP_UNKNOWN &&
-		    (unsigned)state->maptype < nmaps);
-
-							/* search map */
-	nisr = yp_match(state->domain, map_arr[state->maptype], buffer, (int)strlen(buffer),
-	    &data, &datalen);
-	switch (nisr) {
-	case 0:
-		data[datalen] = '\0';			/* clear trailing \n */
-		if (_nis_parse(data, pw, buffer, buflen, state))
-			rv = NS_SUCCESS;		/* validate line */
-		else
-			rv = NS_UNAVAIL;
-		break;
-	case YPERR_KEY:
-		break;
-	default:
-		rv = NS_UNAVAIL;
-		break;
-	}
-
-	if (rv != NS_SUCCESS && rv != NS_NOTFOUND)
-		*retval = errno;
-	if (data)
-		free(data);
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_nis_setpwent(void *nsrv, void *nscb, va_list ap)
-{
-
-	_nis_state.stayopen = 0;
-	return _nis_start(&_nis_state);
-}
-
-/*ARGSUSED*/
-static int
-_nis_setpassent(void *nsrv, void *nscb, va_list ap)
-{
-	int	*retval		= va_arg(ap, int *);
-	int	 stayopen	= va_arg(ap, int);
-
-	int	rv;
-
-	_nis_state.stayopen = stayopen;
-	rv = _nis_start(&_nis_state);
-	*retval = (rv == NS_SUCCESS);
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_nis_endpwent(void *nsrv, void *nscb, va_list ap)
-{
-
-	return _nis_end(&_nis_state);
-}
-
-
-/*ARGSUSED*/
-static int
-_nis_getpwent(void *nsrv, void *nscb, va_list ap)
-{
-	struct passwd	**retval = va_arg(ap, struct passwd **);
-
-	char	*key, *data;
-	int	keylen, datalen, rv, nisr;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-
-	if (_nis_state.done)				/* exhausted search */
-		return NS_NOTFOUND;
-	if (_nis_state.domain == NULL) {
-					/* only start if NIS not setup */
-		rv = _nis_start(&_nis_state);
-		if (rv != NS_SUCCESS)
-			return rv;
-	}
-
- next_nis_entry:
-	key = NULL;
-	data = NULL;
-	rv = NS_NOTFOUND;
-
-	if (_nis_state.current) {			/* already searching */
-		nisr = yp_next(_nis_state.domain, PASSWD_BYNAME(&_nis_state),
-		    _nis_state.current, _nis_state.currentlen,
-		    &key, &keylen, &data, &datalen);
-		free(_nis_state.current);
-		_nis_state.current = NULL;
-		switch (nisr) {
-		case 0:
-			_nis_state.current = key;
-			_nis_state.currentlen = keylen;
-			key = NULL;
-			break;
-		case YPERR_NOMORE:
-			_nis_state.done = 1;
-			goto nisent_out;
-		default:
-			rv = NS_UNAVAIL;
-			goto nisent_out;
-		}
-	} else {					/* new search */
-		if (yp_first(_nis_state.domain, PASSWD_BYNAME(&_nis_state),
-		    &_nis_state.current, &_nis_state.currentlen,
-		    &data, &datalen)) {
-			rv = NS_UNAVAIL;
-			goto nisent_out;
-		}
-	}
-
-	data[datalen] = '\0';				/* clear trailing \n */
-							/* validate line */
-	if (_nis_parse(data, &_nis_passwd,
-	    _nis_passwdbuf, sizeof(_nis_passwdbuf), &_nis_state))
-		rv = NS_SUCCESS;
-	else {					/* dodgy entry, try again */
-		free(data);
-		goto next_nis_entry;
-	}
-
- nisent_out:
-	if (key)
-		free(key);
-	if (data)
-		free(data);
-	if (rv == NS_SUCCESS)
-		*retval = &_nis_passwd;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_nis_getpwent_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	struct passwd	*pw	= va_arg(ap, struct passwd *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct passwd  **result	= va_arg(ap, struct passwd **);
-
-	char	*key, *data;
-	int	keylen, datalen, rv, nisr;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*retval = 0;
-
-	if (_nis_state.done)				/* exhausted search */
-		return NS_NOTFOUND;
-	if (_nis_state.domain == NULL) {
-					/* only start if NIS not setup */
-		rv = _nis_start(&_nis_state);
-		if (rv != NS_SUCCESS)
-			return rv;
-	}
-
- next_nis_entry:
-	key = NULL;
-	data = NULL;
-	rv = NS_NOTFOUND;
-
-	if (_nis_state.current) {			/* already searching */
-		nisr = yp_next(_nis_state.domain, PASSWD_BYNAME(&_nis_state),
-		    _nis_state.current, _nis_state.currentlen,
-		    &key, &keylen, &data, &datalen);
-		free(_nis_state.current);
-		_nis_state.current = NULL;
-		switch (nisr) {
-		case 0:
-			_nis_state.current = key;
-			_nis_state.currentlen = keylen;
-			key = NULL;
-			break;
-		case YPERR_NOMORE:
-			_nis_state.done = 1;
-			goto nisent_out;
-		default:
-			rv = NS_UNAVAIL;
-			goto nisent_out;
-		}
-	} else {					/* new search */
-		if (yp_first(_nis_state.domain, PASSWD_BYNAME(&_nis_state),
-		    &_nis_state.current, &_nis_state.currentlen,
-		    &data, &datalen)) {
-			rv = NS_UNAVAIL;
-			goto nisent_out;
-		}
-	}
-
-	data[datalen] = '\0';				/* clear trailing \n */
-							/* validate line */
-	if (_nis_parse(data, pw, buffer, buflen, &_nis_state))
-		rv = NS_SUCCESS;
-	else {					/* dodgy entry, try again */
-		if (key)
-			free(key);
-		free(data);
-		goto next_nis_entry;
-	}
-
- nisent_out:
-	if (key)
-		free(key);
-	if (data)
-		free(data);
-	if (rv == NS_SUCCESS)
-		*result = pw;
-	else
-		*result = NULL;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_nis_getpwuid(void *nsrv, void *nscb, va_list ap)
-{
-	struct passwd	**retval = va_arg(ap, struct passwd **);
-	uid_t		 uid	= va_arg(ap, uid_t);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = _nis_start(&_nis_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	snprintf(_nis_passwdbuf, sizeof(_nis_passwdbuf), "%u", (unsigned int)uid);
-	rv = _nis_pwscan(&rerror, &_nis_passwd,
-	    _nis_passwdbuf, sizeof(_nis_passwdbuf),
-	    &_nis_state, __nis_pw_u_map, __arraycount(__nis_pw_u_map));
-	if (!_nis_state.stayopen)
-		_nis_end(&_nis_state);
-	if (rv == NS_SUCCESS && uid == _nis_passwd.pw_uid)
-		*retval = &_nis_passwd;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_nis_getpwuid_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	uid_t		 uid	= va_arg(ap, uid_t);
-	struct passwd	*pw	= va_arg(ap, struct passwd *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct passwd  **result	= va_arg(ap, struct passwd **);
-
-	struct nis_state state;
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	snprintf(buffer, buflen, "%u", (unsigned int)uid);
-/* remark: we run under a global mutex inside of this module ... */
-	if (_nis_state.stayopen)
-	  { /* use global state only if stayopen is set - otherwise we would blow up getpwent_r() ... */
-	    rv = _nis_pwscan(retval, pw, buffer, buflen,
-		&_nis_state, __nis_pw_u_map, __arraycount(__nis_pw_u_map));
-	  }
-	else
-	  { /* keep old semantic if no stayopen set - no need to call _nis_start() here - _nis_pwscan() will do it for us ... */
-	    /* use same way as in getgrent.c ... */
-	    memset(&state, 0, sizeof(state));
-	    rv = _nis_pwscan(retval, pw, buffer, buflen,
-		&state, __nis_pw_u_map, __arraycount(__nis_pw_u_map));
-	    _nis_end(&state);
-	  }
-	if (rv != NS_SUCCESS)
-		return rv;
-	if (uid == pw->pw_uid) {
-		*result = pw;
-		return NS_SUCCESS;
-	} else
-		return NS_NOTFOUND;
-}
-
-/*ARGSUSED*/
-static int
-_nis_getpwnam(void *nsrv, void *nscb, va_list ap)
-{
-	struct passwd	**retval = va_arg(ap, struct passwd **);
-	const char	*name	= va_arg(ap, const char *);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = _nis_start(&_nis_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	snprintf(_nis_passwdbuf, sizeof(_nis_passwdbuf), "%s", name);
-	rv = _nis_pwscan(&rerror, &_nis_passwd,
-	    _nis_passwdbuf, sizeof(_nis_passwdbuf),
-	    &_nis_state, __nis_pw_n_map, __arraycount(__nis_pw_n_map));
-	if (!_nis_state.stayopen)
-		_nis_end(&_nis_state);
-	if (rv == NS_SUCCESS && strcmp(name, _nis_passwd.pw_name) == 0)
-		*retval = &_nis_passwd;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_nis_getpwnam_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	const char	*name	= va_arg(ap, const char *);
-	struct passwd	*pw	= va_arg(ap, struct passwd *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct passwd  **result	= va_arg(ap, struct passwd **);
-
-	struct nis_state state;
-	int	rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	snprintf(buffer, buflen, "%s", name);
-/* remark: we run under a global mutex inside of this module ... */
-	if (_nis_state.stayopen)
-	  { /* use global state only if stayopen is set - otherwise we would blow up getpwent_r() ... */
-	    rv = _nis_pwscan(retval, pw, buffer, buflen,
-		&_nis_state, __nis_pw_n_map, __arraycount(__nis_pw_n_map));
-	  }
-	else
-	  { /* keep old semantic if no stayopen set - no need to call _nis_start() here - _nis_pwscan() will do it for us ... */
-	    /* use same way as in getgrent.c ... */
-	    memset(&state, 0, sizeof(state));
-	    rv = _nis_pwscan(retval, pw, buffer, buflen,
-		&state, __nis_pw_n_map, __arraycount(__nis_pw_n_map));
-	    _nis_end(&state);
-	  }
-	if (rv != NS_SUCCESS)
-		return rv;
-	if (strcmp(name, pw->pw_name) == 0) {
-		*result = pw;
-		return NS_SUCCESS;
-	} else
-		return NS_NOTFOUND;
-}
-
-#endif /* YP */
-
-
-#ifdef _PASSWD_COMPAT
-		/*
-		 *	compat methods
-		 */
-
-	/* state shared between compat methods */
-
-struct compat_state {
-	int		 stayopen;	/* see getpassent(3) */
-	DB		*db;		/* passwd DB */
-	int		 keynum;	/* key counter, -1 if no more */
-	enum {				/* current compat mode */
-		COMPAT_NOTOKEN = 0,	/*  no compat token present */
-		COMPAT_NONE,		/*  parsing normal pwd.db line */
-		COMPAT_FULL,		/*  parsing `+' entries */
-		COMPAT_USER,		/*  parsing `+name' entries */
-		COMPAT_NETGROUP		/*  parsing `+@netgroup' entries */
-	}		 mode;
-	char		*user;		/* COMPAT_USER "+name" */
-	DB		*exclude;	/* compat exclude DB */
-	struct passwd	 proto;		/* proto passwd entry */
-	char		 protobuf[_GETPW_R_SIZE_MAX];
-					/* buffer for proto ptrs */
-	int		 protoflags;	/* proto passwd flags */
-	int		 version;
-};
-
-static struct compat_state	_compat_state;
-					/* storage for non _r functions */
-static struct passwd		_compat_passwd;
-static char			_compat_passwdbuf[_GETPW_R_SIZE_MAX];
-
-static int
-_compat_start(struct compat_state *state)
-{
-	int	rv;
-
-	_DIAGASSERT(state != NULL);
-
-	state->keynum = 0;
-	if (state->db == NULL) {		/* not open yet */
-		DBT	key, data;
-		DBT	pkey, pdata;
-		char	bf[MAXLOGNAME];
-
-		rv = _pw_opendb(&state->db, &state->version);
-		if (rv != NS_SUCCESS)
-			return rv;
-
-		state->mode = COMPAT_NOTOKEN;
-
-		/*
-		 *	Determine if the "compat" token is present in pwd.db;
-		 *	either "__YP!" or PW_KEYBYNAME+"+".
-		 *	Only works if pwd_mkdb installs the token.
-		 */
-		key.data = (u_char *)__UNCONST(__yp_token);
-		key.size = strlen(__yp_token);
-
-		bf[0] = _PW_KEYBYNAME;	 /* Pre-token database support. */
-		bf[1] = '+';
-		pkey.data = (u_char *)bf;
-		pkey.size = 2;
-
-		if ((state->db->get)(state->db, &key, &data, 0) == 0
-		    || (state->db->get)(state->db, &pkey, &pdata, 0) == 0)
-			state->mode = COMPAT_NONE;
-	}
-	return NS_SUCCESS;
-}
-
-static int
-_compat_end(struct compat_state *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	state->keynum = 0;
-	if (state->db) {
-		(void)(state->db->close)(state->db);
-		state->db = NULL;
-	}
-	state->mode = COMPAT_NOTOKEN;
-	if (state->user)
-		free(state->user);
-	state->user = NULL;
-	if (state->exclude != NULL)
-		(void)(state->exclude->close)(state->exclude);
-	state->exclude = NULL;
-	state->proto.pw_name = NULL;
-	state->protoflags = 0;
-	return NS_SUCCESS;
-}
-
-/*
- * _compat_add_exclude
- *	add the name to the exclude list in state->exclude.
- */
-static int
-_compat_add_exclude(struct compat_state *state, const char *name)
-{
-	DBT	key, data;
-
-	_DIAGASSERT(state != NULL);
-	_DIAGASSERT(name != NULL);
-
-				/* initialize the exclusion table if needed */
-	if (state->exclude == NULL) {
-		state->exclude = dbopen(NULL, O_RDWR, 600, DB_HASH, NULL);
-		if (state->exclude == NULL)
-			return 0;
-	}
-
-	key.size = strlen(name);			/* set up the key */
-	key.data = (u_char *)__UNCONST(name);
-
-	data.data = NULL;				/* data is nothing */
-	data.size = 0;
-
-							/* store it */
-	if ((state->exclude->put)(state->exclude, &key, &data, 0) == -1)
-		return 0;
-
-	return 1;
-}
-
-/*
- * _compat_is_excluded
- *	test if a name is on the compat mode exclude list
- */
-static int
-_compat_is_excluded(struct compat_state *state, const char *name)
-{
-	DBT	key, data;
-
-	_DIAGASSERT(state != NULL);
-	_DIAGASSERT(name != NULL);
-
-	if (state->exclude == NULL)
-		return 0;	/* nothing excluded */
-
-	key.size = strlen(name);			/* set up the key */
-	key.data = (u_char *)__UNCONST(name);
-
-	if ((state->exclude->get)(state->exclude, &key, &data, 0) == 0)
-		return 1;				/* is excluded */
-
-	return 0;
-}
-
-
-/*
- * _passwdcompat_bad
- *	log an error if "files" or "compat" is specified in
- *	passwd_compat database
- */
-/*ARGSUSED*/
-static int
-_passwdcompat_bad(void *nsrv, void *nscb, va_list ap)
-{
-	static int warned;
-
-	_DIAGASSERT(nsrv != NULL);
-	_DIAGASSERT(nscb != NULL);
-
-	if (!warned) {
-		syslog(LOG_ERR,
-			"nsswitch.conf passwd_compat database can't use '%s'",
-			(char *)nscb);
-	}
-	warned = 1;
-	return NS_UNAVAIL;
-}
-
-/*
- * _passwdcompat_setpassent
- *	Call setpassent for all passwd_compat sources.
- */
-static int
-_passwdcompat_setpassent(int stayopen)
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_passwdcompat_bad, "files")
-		NS_DNS_CB(_dns_setpassent, NULL)
-		NS_NIS_CB(_nis_setpassent, NULL)
-		NS_COMPAT_CB(_passwdcompat_bad, "compat")
-		NS_NULL_CB
-	};
-
-	int	rv, result;
-
-	rv = nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "setpassent",
-	    __nsdefaultnis_forceall, &result, stayopen);
-	return rv;
-}
-
-/*
- * _passwdcompat_endpwent
- *	Call endpwent for all passwd_compat sources.
- */
-static int
-_passwdcompat_endpwent(void)
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_passwdcompat_bad, "files")
-		NS_DNS_CB(_dns_endpwent, NULL)
-		NS_NIS_CB(_nis_endpwent, NULL)
-		NS_COMPAT_CB(_passwdcompat_bad, "compat")
-		NS_NULL_CB
-	};
-
-	return nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "endpwent",
-	    __nsdefaultnis_forceall);
-}
-
-/*
- * _passwdcompat_pwscan
- *	When a name lookup in compat mode is required (e.g., `+name', or a
- *	name in `+@netgroup'), look it up in the 'passwd_compat' nsswitch
- *	database.
- *	Fail if passwd_compat contains files or compat.
- */
-static int
-_passwdcompat_pwscan(struct passwd *pw, char *buffer, size_t buflen,
-	int search, const char *name, uid_t uid)
-{
-	static const ns_dtab compatentdtab[] = {
-		NS_FILES_CB(_passwdcompat_bad, "files")
-		NS_DNS_CB(_dns_getpwent_r, NULL)
-		NS_NIS_CB(_nis_getpwent_r, NULL)
-		NS_COMPAT_CB(_passwdcompat_bad, "compat")
-		NS_NULL_CB
-	};
-	static const ns_dtab compatuiddtab[] = {
-		NS_FILES_CB(_passwdcompat_bad, "files")
-		NS_DNS_CB(_dns_getpwuid_r, NULL)
-		NS_NIS_CB(_nis_getpwuid_r, NULL)
-		NS_COMPAT_CB(_passwdcompat_bad, "compat")
-		NS_NULL_CB
-	};
-	static const ns_dtab compatnamdtab[] = {
-		NS_FILES_CB(_passwdcompat_bad, "files")
-		NS_DNS_CB(_dns_getpwnam_r, NULL)
-		NS_NIS_CB(_nis_getpwnam_r, NULL)
-		NS_COMPAT_CB(_passwdcompat_bad, "compat")
-		NS_NULL_CB
-	};
-
-	int		rv, crv;
-	struct passwd	*cpw;
-
-	switch (search) {
-	case _PW_KEYBYNUM:
-		rv = nsdispatch(NULL, compatentdtab,
-		    NSDB_PASSWD_COMPAT, "getpwent_r", __nsdefaultnis,
-		    &crv, pw, buffer, buflen, &cpw);
-		break;
-	case _PW_KEYBYNAME:
-		_DIAGASSERT(name != NULL);
-		rv = nsdispatch(NULL, compatnamdtab,
-		    NSDB_PASSWD_COMPAT, "getpwnam_r", __nsdefaultnis,
-		    &crv, name, pw, buffer, buflen, &cpw);
-		break;
-	case _PW_KEYBYUID:
-		rv = nsdispatch(NULL, compatuiddtab,
-		    NSDB_PASSWD_COMPAT, "getpwuid_r", __nsdefaultnis,
-		    &crv, uid, pw, buffer, buflen, &cpw);
-		break;
-	default:
-		abort();
-		/*NOTREACHED*/
-	}
-	return rv;
-}
-
-/*
- * _compat_pwscan
- *	Search state->db for the next desired entry.
- *	If search is _PW_KEYBYNUM, look for state->keynum.
- *	If search is _PW_KEYBYNAME, look for name.
- *	If search is _PW_KEYBYUID, look for uid.
- *	Sets *retval to the errno if the result is not NS_SUCCESS
- *	or NS_NOTFOUND.
- */
-static int
-_compat_pwscan(int *retval, struct passwd *pw, char *buffer, size_t buflen,
-	struct compat_state *state, int search, const char *name, uid_t uid)
-{
-	DBT		 key;
-	int		 rv, r, pwflags;
-	const char	*user, *host, *dom;
-	const void	*from;
-	size_t		 fromlen;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(state != NULL);
-	/* name may be NULL */
-
-	*retval = 0;
-
-	if (state->db == NULL) {
-		rv = _compat_start(state);
-		if (rv != NS_SUCCESS)
-			return rv;
-	}
-	if (buflen <= 1) {			/* buffer too small */
-		*retval = ERANGE;
-		return NS_UNAVAIL;
-	}
-
-	for (;;) {				/* loop over pwd.db */
-		rv = NS_NOTFOUND;
-		if (state->mode != COMPAT_NOTOKEN &&
-		    state->mode != COMPAT_NONE) {
-						/* doing a compat lookup */
-			struct passwd	cpw;
-			char		cbuf[_GETPW_R_SIZE_MAX];
-
-			switch (state->mode) {
-
-			case COMPAT_FULL:
-					/* get next user or lookup by key */
-				rv = _passwdcompat_pwscan(&cpw,
-				    cbuf, sizeof(cbuf), search, name, uid);
-				if (rv != NS_SUCCESS)
-					state->mode = COMPAT_NONE;
-				break;
-
-			case COMPAT_NETGROUP:
-/* XXXREENTRANT: getnetgrent is not thread safe */
-					/* get next user from netgroup */
-				r = getnetgrent(&host, &user, &dom);
-				if (r == 0) {	/* end of group */
-					endnetgrent();
-					state->mode = COMPAT_NONE;
-					break;
-				}
-				if (!user || !*user)
-					break;
-				rv = _passwdcompat_pwscan(&cpw,
-				    cbuf, sizeof(cbuf),
-				    _PW_KEYBYNAME, user, 0);
-				break;
-
-			case COMPAT_USER:
-					/* get specific user */
-				if (state->user == NULL) {
-					state->mode = COMPAT_NONE;
-					break;
-				}
-				rv = _passwdcompat_pwscan(&cpw,
-				    cbuf, sizeof(cbuf),
-				    _PW_KEYBYNAME, state->user, 0);
-				free(state->user);
-				state->user = NULL;
-				state->mode = COMPAT_NONE;
-				break;
-
-			case COMPAT_NOTOKEN:
-			case COMPAT_NONE:
-				abort();
-
-			}
-			if (rv != NS_SUCCESS)	/* if not matched, next loop */
-				continue;
-
-				/* copy cpw to pw, applying prototype */
-			if (! _pw_copy(&cpw, pw, buffer, buflen,
-			    &state->proto, state->protoflags)) {
-				rv = NS_UNAVAIL;
-				break;
-			}
-
-			if (_compat_is_excluded(state, pw->pw_name))
-				continue;	/* excluded; next loop */
-
-			if ((search == _PW_KEYBYNAME
-					&& strcmp(pw->pw_name, name) != 0)
-			    || (search == _PW_KEYBYUID && pw->pw_uid != uid)) {
-				continue;	/* not specific; next loop */
-			}
-
-			break;			/* exit loop if found */
-		} else {			/* not a compat line */
-			state->proto.pw_name = NULL;
-						/* clear prototype */
-		}
-
-		if (state->mode == COMPAT_NOTOKEN) {
-				/* no compat token; do direct lookup */
-			switch (search) {
-			case _PW_KEYBYNUM:
-				if (state->keynum == -1)  /* no more records */
-					return NS_NOTFOUND;
-				state->keynum++;
-				from = &state->keynum;
-				fromlen = sizeof(state->keynum);
-				break;
-			case _PW_KEYBYNAME:
-				from = name;
-				fromlen = strlen(name);
-				break;
-			case _PW_KEYBYUID:
-				from = &uid;
-				fromlen = sizeof(uid);
-				break;
-			default:
-				abort();
-			}
-			buffer[0] = search;
-		} else {
-				/* compat token; do line by line */
-			if (state->keynum == -1)  /* no more records */
-				return NS_NOTFOUND;
-			state->keynum++;
-			from = &state->keynum;
-			fromlen = sizeof(state->keynum);
-			buffer[0] = _PW_KEYBYNUM;
-		}
-
-		if (buflen <= fromlen) {		/* buffer too small */
-			*retval = ERANGE;
-			return NS_UNAVAIL;
-		}
-		memmove(buffer + 1, from, fromlen);	/* setup key */
-		key.size = fromlen + 1;
-		key.data = (u_char *)buffer;
-
-		rv = _pw_getkey(state->db, &key, pw, buffer, buflen, &pwflags,
-		    state->version);
-		if (rv != NS_SUCCESS)		/* stop on error */
-			break;
-
-		if (state->mode == COMPAT_NOTOKEN)
-			break;			/* stop if no compat token */
-
-		if (pw->pw_name[0] == '+') {
-						/* compat inclusion */
-			switch(pw->pw_name[1]) {
-			case '\0':		/* `+' */
-				state->mode = COMPAT_FULL;
-						/* reset passwd_compat search */
-/* XXXREENTRANT: setpassent is not thread safe ? */
-				(void) _passwdcompat_setpassent(_compat_state.stayopen);
-				break;
-			case '@':		/* `+@netgroup' */
-				state->mode = COMPAT_NETGROUP;
-						/* reset netgroup search */
-/* XXXREENTRANT: setnetgrent is not thread safe */
-				setnetgrent(pw->pw_name + 2);
-				break;
-			default:		/* `+name' */
-				state->mode = COMPAT_USER;
-				if (state->user)
-					free(state->user);
-				state->user = strdup(pw->pw_name + 1);
-				break;
-			}
-						/* save the prototype */
-			state->protoflags = pwflags;
-			if (! _pw_copy(pw, &state->proto, state->protobuf,
-			    sizeof(state->protobuf), NULL, 0)) {
-				rv = NS_UNAVAIL;
-				break;
-			}
-			continue;		/* loop again after inclusion */
-		} else if (pw->pw_name[0] == '-') {
-						/* compat exclusion */
-			rv = NS_SUCCESS;
-			switch(pw->pw_name[1]) {
-			case '\0':		/* `-' */
-				break;
-			case '@':		/* `-@netgroup' */
-/* XXXREENTRANT: {set,get,end}netgrent is not thread safe */
-				setnetgrent(pw->pw_name + 2);
-				while (getnetgrent(&host, &user, &dom)) {
-					if (!user || !*user)
-						continue;
-					if (! _compat_add_exclude(state,user)) {
-						rv = NS_UNAVAIL;
-						break;
-					}
-				}
-				endnetgrent();
-				break;
-			default:		/* `-name' */
-				if (! _compat_add_exclude(state,
-				    pw->pw_name + 1)) {
-					rv = NS_UNAVAIL;
-				}
-				break;
-			}
-			if (rv != NS_SUCCESS)	/* exclusion failure */
-				break;
-			continue;		/* loop again after exclusion */
-		}
-		if (search == _PW_KEYBYNUM ||
-		    (search == _PW_KEYBYUID && pw->pw_uid == uid) ||
-		    (search == _PW_KEYBYNAME && strcmp(pw->pw_name, name) == 0))
-			break;			/* token mode match found */
-	}
-
-	if (rv == NS_NOTFOUND &&
-	    (search == _PW_KEYBYNUM || state->mode != COMPAT_NOTOKEN))
-		state->keynum = -1;		/* flag `no more records' */
-
-	if (rv == NS_SUCCESS) {
-		if ((search == _PW_KEYBYNAME && strcmp(pw->pw_name, name) != 0)
-		    || (search == _PW_KEYBYUID && pw->pw_uid != uid))
-			rv = NS_NOTFOUND;
-	}
-
-	if (rv != NS_SUCCESS && rv != NS_NOTFOUND)
-		*retval = errno;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_compat_setpwent(void *nsrv, void *nscb, va_list ap)
-{
-
-					/* force passwd_compat setpwent() */
-	(void) _passwdcompat_setpassent(0);
-
-					/* reset state, keep db open */
-	_compat_state.stayopen = 0;
-	return _compat_start(&_compat_state);
-}
-
-/*ARGSUSED*/
-static int
-_compat_setpassent(void *nsrv, void *nscb, va_list ap)
-{
-	int	*retval		= va_arg(ap, int *);
-	int	 stayopen	= va_arg(ap, int);
-
-	int	rv;
-
-					/* force passwd_compat setpassent() */
-	(void) _passwdcompat_setpassent(stayopen);
-
-	_compat_state.stayopen = stayopen;
-	rv = _compat_start(&_compat_state);
-	*retval = (rv == NS_SUCCESS);
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_compat_endpwent(void *nsrv, void *nscb, va_list ap)
-{
-
-					/* force passwd_compat endpwent() */
-	(void) _passwdcompat_endpwent();
-
-					/* reset state, close db */
-	_compat_state.stayopen = 0;
-	return _compat_end(&_compat_state);
-}
-
-
-/*ARGSUSED*/
-static int
-_compat_getpwent(void *nsrv, void *nscb, va_list ap)
-{
-	struct passwd	**retval = va_arg(ap, struct passwd **);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = _compat_pwscan(&rerror, &_compat_passwd,
-	    _compat_passwdbuf, sizeof(_compat_passwdbuf),
-	    &_compat_state, _PW_KEYBYNUM, NULL, 0);
-	if (rv == NS_SUCCESS)
-		*retval = &_compat_passwd;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_compat_getpwent_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	struct passwd	*pw	= va_arg(ap, struct passwd *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct passwd  **result	= va_arg(ap, struct passwd **);
-
-	int		rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	rv = _compat_pwscan(retval, pw, buffer, buflen, &_compat_state,
-	    _PW_KEYBYNUM, NULL, 0);
-	if (rv == NS_SUCCESS)
-		*result = pw;
-	else
-		*result = NULL;
-	return rv;
-}
-
-
-/*ARGSUSED*/
-static int
-_compat_getpwnam(void *nsrv, void *nscb, va_list ap)
-{
-	struct passwd	**retval = va_arg(ap, struct passwd **);
-	const char	*name	= va_arg(ap, const char *);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = _compat_start(&_compat_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	rv = _compat_pwscan(&rerror, &_compat_passwd,
-	    _compat_passwdbuf, sizeof(_compat_passwdbuf),
-	    &_compat_state, _PW_KEYBYNAME, name, 0);
-	if (!_compat_state.stayopen)
-		_compat_end(&_compat_state);
-	if (rv == NS_SUCCESS)
-		*retval = &_compat_passwd;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_compat_getpwnam_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	const char	*name	= va_arg(ap, const char *);
-	struct passwd	*pw	= va_arg(ap, struct passwd *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct passwd  **result	= va_arg(ap, struct passwd **);
-
-	struct compat_state	state;
-	int		rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	memset(&state, 0, sizeof(state));
-	rv = _compat_pwscan(retval, pw, buffer, buflen, &state,
-	    _PW_KEYBYNAME, name, 0);
-	_compat_end(&state);
-	if (rv == NS_SUCCESS)
-		*result = pw;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_compat_getpwuid(void *nsrv, void *nscb, va_list ap)
-{
-	struct passwd	**retval = va_arg(ap, struct passwd **);
-	uid_t		 uid	= va_arg(ap, uid_t);
-
-	int	rv, rerror;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	rv = _compat_start(&_compat_state);
-	if (rv != NS_SUCCESS)
-		return rv;
-	rv = _compat_pwscan(&rerror, &_compat_passwd,
-	    _compat_passwdbuf, sizeof(_compat_passwdbuf),
-	    &_compat_state, _PW_KEYBYUID, NULL, uid);
-	if (!_compat_state.stayopen)
-		_compat_end(&_compat_state);
-	if (rv == NS_SUCCESS)
-		*retval = &_compat_passwd;
-	return rv;
-}
-
-/*ARGSUSED*/
-static int
-_compat_getpwuid_r(void *nsrv, void *nscb, va_list ap)
-{
-	int		*retval	= va_arg(ap, int *);
-	uid_t		 uid	= va_arg(ap, uid_t);
-	struct passwd	*pw	= va_arg(ap, struct passwd *);
-	char		*buffer	= va_arg(ap, char *);
-	size_t		 buflen	= va_arg(ap, size_t);
-	struct passwd  **result	= va_arg(ap, struct passwd **);
-
-	struct compat_state	state;
-	int		rv;
-
-	_DIAGASSERT(retval != NULL);
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	memset(&state, 0, sizeof(state));
-	rv = _compat_pwscan(retval, pw, buffer, buflen, &state,
-	    _PW_KEYBYUID, NULL, uid);
-	_compat_end(&state);
-	if (rv == NS_SUCCESS)
-		*result = pw;
-	return rv;
-}
-
-#endif /* _PASSWD_COMPAT */
-
-
-		/*
-		 *	public functions
-		 */
-
-struct passwd *
-getpwent(void)
-{
-	int		r;
-	struct passwd	*retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getpwent, NULL)
-		NS_DNS_CB(_dns_getpwent, NULL)
-		NS_NIS_CB(_nis_getpwent, NULL)
-		NS_COMPAT_CB(_compat_getpwent, NULL)
-		NS_NULL_CB
-	};
-
-	mutex_lock(&_pwmutex);
-	r = nsdispatch(NULL, dtab, NSDB_PASSWD, "getpwent", __nsdefaultcompat,
-	    &retval);
-	mutex_unlock(&_pwmutex);
-	return (r == NS_SUCCESS) ? retval : NULL;
-}
-
-int
-getpwent_r(struct passwd *pwd, char *buffer, size_t buflen,
-    struct passwd **result)
-{
-	int	r, retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getpwent_r, NULL)
-		NS_DNS_CB(_dns_getpwent_r, NULL)
-		NS_NIS_CB(_nis_getpwent_r, NULL)
-		NS_COMPAT_CB(_compat_getpwent_r, NULL)
-		NS_NULL_CB
-	};
-
-	_DIAGASSERT(pwd != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	retval = 0;
-	mutex_lock(&_pwmutex);
-	r = nsdispatch(NULL, dtab, NSDB_PASSWD, "getpwent_r", __nsdefaultcompat,
-	    &retval, pwd, buffer, buflen, result);
-	mutex_unlock(&_pwmutex);
-	switch (r) {
-	case NS_SUCCESS:
-	case NS_NOTFOUND:
-		return 0;
-	default:
-		return retval;
-	}
-}
-
-
-struct passwd *
-getpwnam(const char *name)
-{
-	int		rv;
-	struct passwd	*retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getpwnam, NULL)
-		NS_DNS_CB(_dns_getpwnam, NULL)
-		NS_NIS_CB(_nis_getpwnam, NULL)
-		NS_COMPAT_CB(_compat_getpwnam, NULL)
-		NS_NULL_CB
-	};
-
-	mutex_lock(&_pwmutex);
-	rv = nsdispatch(NULL, dtab, NSDB_PASSWD, "getpwnam", __nsdefaultcompat,
-	    &retval, name);
-	mutex_unlock(&_pwmutex);
-	return (rv == NS_SUCCESS) ? retval : NULL;
-}
-
-int
-getpwnam_r(const char *name, struct passwd *pwd, char *buffer, size_t buflen,
-	struct passwd **result)
-{
-	int	r, retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getpwnam_r, NULL)
-		NS_DNS_CB(_dns_getpwnam_r, NULL)
-		NS_NIS_CB(_nis_getpwnam_r, NULL)
-		NS_COMPAT_CB(_compat_getpwnam_r, NULL)
-		NS_NULL_CB
-	};
-
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(pwd != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	retval = 0;
-	mutex_lock(&_pwmutex);
-	r = nsdispatch(NULL, dtab, NSDB_PASSWD, "getpwnam_r", __nsdefaultcompat,
-	    &retval, name, pwd, buffer, buflen, result);
-	mutex_unlock(&_pwmutex);
-	switch (r) {
-	case NS_SUCCESS:
-	case NS_NOTFOUND:
-		return 0;
-	default:
-		return retval;
-	}
-}
-
-struct passwd *
-getpwuid(uid_t uid)
-{
-	int		rv;
-	struct passwd	*retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getpwuid, NULL)
-		NS_DNS_CB(_dns_getpwuid, NULL)
-		NS_NIS_CB(_nis_getpwuid, NULL)
-		NS_COMPAT_CB(_compat_getpwuid, NULL)
-		NS_NULL_CB
-	};
-
-	mutex_lock(&_pwmutex);
-	rv = nsdispatch(NULL, dtab, NSDB_PASSWD, "getpwuid", __nsdefaultcompat,
-	    &retval, uid);
-	mutex_unlock(&_pwmutex);
-	return (rv == NS_SUCCESS) ? retval : NULL;
-}
-
-int
-getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, size_t buflen,
-	struct passwd **result)
-{
-	int	r, retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getpwuid_r, NULL)
-		NS_DNS_CB(_dns_getpwuid_r, NULL)
-		NS_NIS_CB(_nis_getpwuid_r, NULL)
-		NS_COMPAT_CB(_compat_getpwuid_r, NULL)
-		NS_NULL_CB
-	};
-
-	_DIAGASSERT(pwd != NULL);
-	_DIAGASSERT(buffer != NULL);
-	_DIAGASSERT(result != NULL);
-
-	*result = NULL;
-	retval = 0;
-	mutex_lock(&_pwmutex);
-	r = nsdispatch(NULL, dtab, NSDB_PASSWD, "getpwuid_r", __nsdefaultcompat,
-	    &retval, uid, pwd, buffer, buflen, result);
-	mutex_unlock(&_pwmutex);
-	switch (r) {
-	case NS_SUCCESS:
-	case NS_NOTFOUND:
-		return 0;
-	default:
-		return retval;
-	}
-}
-
-void
-endpwent(void)
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_endpwent, NULL)
-		NS_DNS_CB(_dns_endpwent, NULL)
-		NS_NIS_CB(_nis_endpwent, NULL)
-		NS_COMPAT_CB(_compat_endpwent, NULL)
-		NS_NULL_CB
-	};
-
-	mutex_lock(&_pwmutex);
-					/* force all endpwent() methods */
-	(void) nsdispatch(NULL, dtab, NSDB_PASSWD, "endpwent",
-	    __nsdefaultcompat_forceall);
-	mutex_unlock(&_pwmutex);
-}
-
-/*ARGSUSED*/
-int
-setpassent(int stayopen)
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_setpassent, NULL)
-		NS_DNS_CB(_dns_setpassent, NULL)
-		NS_NIS_CB(_nis_setpassent, NULL)
-		NS_COMPAT_CB(_compat_setpassent, NULL)
-		NS_NULL_CB
-	};
-	int	rv, retval;
-
-	mutex_lock(&_pwmutex);
-					/* force all setpassent() methods */
-	rv = nsdispatch(NULL, dtab, NSDB_PASSWD, "setpassent",
-	    __nsdefaultcompat_forceall, &retval, stayopen);
-	mutex_unlock(&_pwmutex);
-	return (rv == NS_SUCCESS) ? retval : 0;
-}
-
-void
-setpwent(void)
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_setpwent, NULL)
-		NS_DNS_CB(_dns_setpwent, NULL)
-		NS_NIS_CB(_nis_setpwent, NULL)
-		NS_COMPAT_CB(_compat_setpwent, NULL)
-		NS_NULL_CB
-	};
-
-	mutex_lock(&_pwmutex);
-					/* force all setpwent() methods */
-	(void) nsdispatch(NULL, dtab, NSDB_PASSWD, "setpwent",
-	    __nsdefaultcompat_forceall);
-	mutex_unlock(&_pwmutex);
-}
diff --git a/lib/libc/gen/getttyent.3 b/lib/libc/gen/getttyent.3
deleted file mode 100644
index bb7aacda1..000000000
--- a/lib/libc/gen/getttyent.3
+++ /dev/null
@@ -1,219 +0,0 @@
-.\"	$NetBSD: getttyent.3,v 1.21 2014/02/07 20:20:56 christos Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"     @(#)getttyent.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd February 7, 2014
-.Dt GETTTYENT 3
-.Os
-.Sh NAME
-.Nm getttyent ,
-.Nm getttynam ,
-.Nm setttyent ,
-.Nm setttyentpath ,
-.Nm endttyent
-.Nd get ttys file entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ttyent.h
-.Ft struct ttyent *
-.Fn getttyent void
-.Ft struct ttyent *
-.Fn getttynam "const char *name"
-.Ft int
-.Fn setttyent void
-.Ft int
-.Fn setttyentpath "const char *path"
-.Ft int
-.Fn endttyent void
-.Sh DESCRIPTION
-The
-.Fn getttyent ,
-and
-.Fn getttynam
-functions
-each return a pointer to an object, with the following structure,
-containing the broken-out fields of a line from the tty description
-file.
-.Bd -literal
-struct ttyent {
-	char	*ty_name;	/* terminal device name */
-	char	*ty_getty;	/* command to execute */
-	char	*ty_type;	/* terminal type */
-#define	TTY_ON		0x01	/* enable logins */
-#define	TTY_SECURE	0x02	/* allow uid of 0 to login */
-#define	TTY_LOCAL	0x04	/* set 'CLOCAL' on open (dev. specific) */
-#define	TTY_RTSCTS	0x08	/* set 'CRTSCTS' on open (dev. specific) */
-#define	TTY_SOFTCAR	0x10	/* ignore hardware carrier (dev. spec.) */
-#define	TTY_MDMBUF	0x20	/* set 'MDMBUF' on open (dev. specific) */
-#define	TTY_DTRCTS	0x40	/* set 'CDTRCTS' on open (dev. specific) */
-	int	ty_status;	/* flag values */
-	char	*ty_window;	/* command for window manager */
-	char	*ty_comment;	/* comment field */
-	char	*ty_class;	/* category of tty usage */
-};
-.Ed
-.Pp
-The fields are as follows:
-.Bl -tag -width ty_comment
-.It Fa ty_name
-The name of the character-special file.
-.It Fa ty_getty
-The name of the command invoked by
-.Xr init 8
-to initialize tty line characteristics.
-.It Fa ty_type
-The name of the default terminal type connected to this tty line.
-.It Fa ty_status
-A mask of bit fields which indicate various actions allowed on this
-tty line.
-The possible flags are as follows:
-.Bl -tag -width TTY_SOFTCAR
-.It Dv TTY_ON
-Enables logins (i.e.,
-.Xr init 8
-will start the command referenced by
-.Fa ty_getty
-on this entry).
-.It Dv TTY_SECURE
-Allow users with a uid of 0 to login on this terminal.
-.It Dv TTY_LOCAL
-If the terminal port's driver supports it, cause the line
-to be treated as ``local.''
-.It Dv TTY_MDMBUF
-If the terminal port's driver supports it, use
-DTR/DCD hardware flow control on the line by default.
-.It Dv TTY_RTSCTS
-If the terminal port's driver supports it, use
-full-duplex RTS/CTS hardware flow control on the line
-by default.
-.It Dv TTY_SOFTCAR
-If the terminal port's driver supports it, ignore hardware
-carrier on the line.
-.El
-.It Fa ty_window
-The command to execute for a window system associated with the line.
-.It Fa ty_comment
-Any trailing comment field, with any leading hash marks (``#'') or
-whitespace removed.
-.It Fa ty_class
-A key indexing into a capfile style database (/etc/ttyclasses)
-of attributes for this class of tty.
-No attributes are currently defined or used,
-so there are currently no functions to retrieve them.
-.El
-.Pp
-If any of the fields pointing to character strings are unspecified,
-they are returned as null pointers.
-The field
-.Fa ty_status
-will be zero if no flag values are specified.
-.Pp
-See
-.Xr ttys 5
-for a more complete discussion of the meaning and usage of the
-fields.
-.Pp
-The
-.Fn getttyent
-function
-reads the next line from the ttys file, opening the file if necessary.
-The
-.Fn setttyent
-function
-rewinds the file if open, or opens the file if it is unopened.
-The
-.Fn setttyentpath
-function
-is equivalent to
-.Fn setttyent
-but accepts an additional argument to read the ttys information from
-an alternate file instead of the default location
-.Pq defined in Dv _PATH_TTYS .
-The
-.Fn endttyent
-function
-closes any open files.
-.Pp
-The
-.Fn getttynam
-function
-searches from the beginning of the file until a matching
-.Fa name
-is found
-(or until
-.Dv EOF
-is encountered).
-.Sh RETURN VALUES
-The routines
-.Fn getttyent
-and
-.Fn getttynam
-return a null pointer on
-.Dv EOF
-or error.
-The
-.Fn setttyent
-and
-.Fn setttyentpath
-functions
-and
-.Fn endttyent
-return 0 on failure and 1 on success.
-.Sh FILES
-.Bl -tag -width /etc/ttys -compact
-.It Pa /etc/ttys
-.El
-.Sh SEE ALSO
-.Xr login 1 ,
-.Xr ttyslot 3 ,
-.Xr capfile 5 ,
-.Xr gettytab 5 ,
-.Xr ttys 5 ,
-.Xr getty 8 ,
-.Xr init 8 ,
-.Xr ttyflags 8
-.Sh HISTORY
-The
-.Fn getttyent ,
-.Fn getttynam ,
-.Fn setttyent ,
-and
-.Fn endttyent
-functions appeared in
-.Bx 4.3 .
-The
-.Fn setttyentpath
-function appeared in
-.Nx 4.0 .
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c
deleted file mode 100644
index 6585ebefa..000000000
--- a/lib/libc/gen/getttyent.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/*	$NetBSD: getttyent.c,v 1.26 2013/06/30 10:07:43 martin Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getttyent.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getttyent.c,v 1.26 2013/06/30 10:07:43 martin Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <ttyent.h>
-#include <errno.h>
-#include <err.h>
-#include <stdlib.h>
-
-#include <sys/sysctl.h>
-#include <sys/utsname.h>
-
-#ifdef __weak_alias
-__weak_alias(endttyent,_endttyent)
-__weak_alias(getttyent,_getttyent)
-__weak_alias(getttynam,_getttynam)
-__weak_alias(setttyent,_setttyent)
-__weak_alias(setttyentpath,_setttyentpath)
-#endif
-
-static FILE *tf;
-static size_t lineno = 0;
-static char *skip(char *, char *);
-static char *value(char *);
-
-struct ttyent *
-getttynam(const char *tty)
-{
-	struct ttyent *t;
-
-	_DIAGASSERT(tty != NULL);
-
-	setttyent();
-	while ((t = getttyent()) != NULL)
-		if (!strcmp(tty, t->ty_name))
-			break;
-	endttyent();
-	return (t);
-}
-
-struct ttyent *
-getttyent(void)
-{
-	static struct ttyent tty;
-	int c;
-	char *p;
-	size_t len;
-	static char *line = NULL;
-	char zapchar;
-
-	if (line)
-		free(line);
-
-	if (!tf && !setttyent())
-		return NULL;
-
-	for (;;) {
-		errno = 0;
-		line = fparseln(tf, &len, &lineno, NULL, FPARSELN_UNESCALL);
-		if (line == NULL) {
-			if (errno != 0)
-				warn(__func__);
-			return NULL;
-		}
-		for (p = line; *p && isspace((unsigned char)*p); p++)
-			continue;
-		if (*p && *p != '#')
-			break;
-		free(line);
-	}
-
-	tty.ty_name = p;
-	p = skip(p, &zapchar);
-	if (*(tty.ty_getty = p) == '\0')
-		tty.ty_getty = tty.ty_type = NULL;
-	else {
-		p = skip(p, &zapchar);
-		if (*(tty.ty_type = p) == '\0')
-			tty.ty_type = NULL;
-		else
-			p = skip(p, &zapchar);
-	}
-	tty.ty_status = 0;
-	tty.ty_window = NULL;
-	tty.ty_class = NULL;
-
-#define	scmp(e)	!strncmp(p, e, sizeof(e) - 1) && (isspace((unsigned char) p[sizeof(e) - 1]) || p[sizeof(e) - 1] == '\0')
-#define	vcmp(e)	!strncmp(p, e, sizeof(e) - 1) && p[sizeof(e) - 1] == '='
-	for (; *p; p = skip(p, &zapchar)) {
-		if (scmp(_TTYS_OFF))
-			tty.ty_status &= ~TTY_ON;
-		else if (scmp(_TTYS_ON))
-			tty.ty_status |= TTY_ON;
-		else if (scmp(_TTYS_SECURE))
-			tty.ty_status |= TTY_SECURE;
-		else if (scmp(_TTYS_LOCAL))
-			tty.ty_status |= TTY_LOCAL;
-		else if (scmp(_TTYS_RTSCTS))
-			tty.ty_status |= TTY_RTSCTS;
-		else if (scmp(_TTYS_DTRCTS))
-			tty.ty_status |= TTY_DTRCTS;
-		else if (scmp(_TTYS_SOFTCAR))
-			tty.ty_status |= TTY_SOFTCAR;
-		else if (scmp(_TTYS_MDMBUF))
-			tty.ty_status |= TTY_MDMBUF;
-		else if (vcmp(_TTYS_WINDOW))
-			tty.ty_window = value(p);
-		else if (vcmp(_TTYS_CLASS))
-			tty.ty_class = value(p);
-		else
-			warnx("%s: %s, %lu: unknown option `%s'",
-			    __func__, _PATH_TTYS, (unsigned long)lineno, p);
-	}
-
-	if (zapchar == '#' || *p == '#')
-		while ((c = *++p) == ' ' || c == '\t')
-			continue;
-	tty.ty_comment = p;
-	if (*p == '\0')
-		tty.ty_comment = NULL;
-	if ((p = strchr(p, '\n')) != NULL)
-		*p = '\0';
-	return &tty;
-}
-
-#define	QUOTED	1
-
-/*
- * Skip over the current field, removing quotes, and return a pointer to
- * the next field.
- */
-static char *
-skip(char *p, char *zapchar)
-{
-	char *t;
-	int c, q;
-
-	_DIAGASSERT(p != NULL);
-	*zapchar = '\0';
-
-	for (q = 0, t = p; (c = *p) != '\0'; p++) {
-		if (c == '"') {
-			q ^= QUOTED;	/* obscure, but nice */
-			continue;
-		}
-		if (q == QUOTED && *p == '\\' && *(p+1) == '"')
-			p++;
-		*t++ = *p;
-		if (q == QUOTED)
-			continue;
-		if (c == '#') {
-			*zapchar = c;
-			*p = '\0';
-			*--t = '\0';
-			return p;
-		}
-		if (c == '\t' || c == ' ' || c == '\n') {
-			*zapchar = c;
-			*p++ = '\0';
-			while ((c = *p) == '\t' || c == ' ' || c == '\n')
-				p++;
-			*--t = '\0';
-			return p;
-		}
-	}
-	if (t != p)
-		*t = '\0';
-	return p;
-}
-
-static char *
-value(char *p)
-{
-
-	_DIAGASSERT(p != NULL);
-
-	return (p = strchr(p, '=')) != NULL ? ++p : NULL;
-}
-
-int
-setttyentpath(const char *path)
-{
-	lineno = 0;
-	if (tf) {
-		rewind(tf);
-		return 1;
-	}
-
-	/*
-	 * Try <path>.$MACHINE (e.g. etc/ttys.amd64)
-	 */
-	{
-		char machine[_SYS_NMLN];
-		const int mib[] = { [0] = CTL_HW, [1] = HW_MACHINE, };
-		size_t len = sizeof(machine);
-
-		if (sysctl(mib, (u_int)__arraycount(mib), machine, &len,
-		     NULL, 0) != -1) {
-			char npath[PATH_MAX];
-			(void)snprintf(npath, sizeof(npath), "%s.%s", path,
-			    machine);
-			if ((tf = fopen(npath, "re")) != NULL)
-				return 1;
-		}
-	}
-
-	if ((tf = fopen(path, "re")) != NULL)
-		return 1;
-	return 0;
-}
-
-int
-setttyent(void)
-{
-	return setttyentpath(_PATH_TTYS);
-}
-
-int
-endttyent(void)
-{
-	int rval;
-
-	if (tf) {
-		rval = !(fclose(tf) == EOF);
-		tf = NULL;
-		return rval;
-	}
-	return 1;
-}
diff --git a/lib/libc/gen/getusershell.3 b/lib/libc/gen/getusershell.3
deleted file mode 100644
index 1b36738ee..000000000
--- a/lib/libc/gen/getusershell.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\"	$NetBSD: getusershell.3,v 1.10 2004/11/23 04:38:19 lukem Exp $
-.\"
-.\" Copyright (c) 1985, 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. 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.
-.\"
-.\"     @(#)getusershell.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd November 23, 2004
-.Dt GETUSERSHELL 3
-.Os
-.Sh NAME
-.Nm getusershell ,
-.Nm setusershell ,
-.Nm endusershell
-.Nd get valid user shells
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft char *
-.Fn getusershell void
-.Ft void
-.Fn setusershell void
-.Ft void
-.Fn endusershell void
-.Sh DESCRIPTION
-The
-.Fn getusershell
-function
-returns a pointer to a valid user shell as defined by the
-system manager in the shells database as described in
-.Xr shells 5 .
-If the shells database is not available,
-.Fn getusershell
-behaves as if
-.Pa /bin/sh
-and
-.Pa /bin/csh
-were listed.
-.Pp
-The
-.Fn getusershell
-function
-reads the next
-line (opening the file if necessary);
-.Fn setusershell
-rewinds the file;
-.Fn endusershell
-closes it.
-.Sh FILES
-.Bl -tag -width /etc/shells -compact
-.It Pa /etc/shells
-.El
-.Sh DIAGNOSTICS
-The routine
-.Fn getusershell
-returns a null pointer (0) on
-.Dv EOF .
-.Sh SEE ALSO
-.Xr nsswitch.conf 5 ,
-.Xr shells 5
-.Sh HISTORY
-The
-.Fn getusershell
-function appeared in
-.Bx 4.3 .
-.Sh BUGS
-The
-.Fn getusershell
-function leaves its result in an internal static object and returns
-a pointer to that object.
-Subsequent calls to
-.Fn getusershell
-will modify the same object.
diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c
deleted file mode 100644
index c7f5c2895..000000000
--- a/lib/libc/gen/getusershell.c
+++ /dev/null
@@ -1,547 +0,0 @@
-/*	$NetBSD: getusershell.c,v 1.29 2012/03/13 21:13:36 christos Exp $	*/
-
-/*-
- * Copyright (c) 1999, 2005 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getusershell.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getusershell.c,v 1.29 2012/03/13 21:13:36 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <sys/param.h>
-#include <sys/file.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <nsswitch.h>
-#include <paths.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef HESIOD
-#include <hesiod.h>
-#endif
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/ypclnt.h>
-#include <rpcsvc/yp_prot.h>
-#endif
-
-#ifdef __weak_alias
-__weak_alias(endusershell,_endusershell)
-__weak_alias(getusershell,_getusershell)
-__weak_alias(setusershell,_setusershell)
-#endif
-
-/*
- * Local shells should NOT be added here.
- * They should be added in /etc/shells.
- */
-static const char *const okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
-
-#ifdef _REENTRANT
-static mutex_t __shellmutex = MUTEX_INITIALIZER;
-#endif
-
-static char		  curshell[MAXPATHLEN + 2];
-
-static const char *const *curokshell = okshells;
-static int		  shellsfound = 0;
-
-		/*
-		 *	files methods
-		 */
-
-	/* state shared between files methods */
-struct files_state {
-	FILE	*fp;
-};
-
-static struct files_state _files_state;
-
-
-static int
-_files_start(struct files_state *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	if (state->fp == NULL) {
-		state->fp = fopen(_PATH_SHELLS, "re");
-		if (state->fp == NULL)
-			return NS_UNAVAIL;
-	} else {
-		rewind(state->fp);
-	}
-	return NS_SUCCESS;
-}
-
-static int
-_files_end(struct files_state *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	if (state->fp) {
-		(void) fclose(state->fp);
-		state->fp = NULL;
-	}
-	return NS_SUCCESS;
-}
-
-/*ARGSUSED*/
-static int
-_files_setusershell(void *nsrv, void *nscb, va_list ap)
-{
-
-	return _files_start(&_files_state);
-}
-
-/*ARGSUSED*/
-static int
-_files_endusershell(void *nsrv, void *nscb, va_list ap)
-{
-
-	return _files_end(&_files_state);
-}
-
-/*ARGSUSED*/
-static int
-_files_getusershell(void *nsrv, void *nscb, va_list ap)
-{
-	char	**retval = va_arg(ap, char **);
-
-	char	*sp, *cp;
-	int	 rv;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-	if (_files_state.fp == NULL) {	/* only start if file not open yet */
-		rv = _files_start(&_files_state);
-		if (rv != NS_SUCCESS)
-			return rv;
-	}
-
-	while (fgets(curshell, (int)sizeof(curshell) - 1, _files_state.fp)
-	    != NULL) {
-		sp = cp = curshell;
-		while (*cp != '#' && *cp != '/' && *cp != '\0')
-			cp++;
-		if (*cp == '#' || *cp == '\0')
-			continue;
-		sp = cp;
-		while (!isspace((unsigned char) *cp) && *cp != '#'
-		    && *cp != '\0')
-			cp++;
-		*cp++ = '\0';
-		*retval = sp;
-		return NS_SUCCESS;
-	}
-
-	return NS_NOTFOUND;
-}
-
-
-#ifdef HESIOD
-		/*
-		 *	dns methods
-		 */
-
-	/* state shared between dns methods */
-struct dns_state {
-	void	*context;		/* Hesiod context */
-	int	 num;			/* shell index, -1 if no more */
-};
-
-static struct dns_state		_dns_state;
-
-static int
-_dns_start(struct dns_state *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	state->num = 0;
-	if (state->context == NULL) {			/* setup Hesiod */
-		if (hesiod_init(&state->context) == -1)
-			return NS_UNAVAIL;
-	}
-
-	return NS_SUCCESS;
-}
-
-static int
-_dns_end(struct dns_state *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	state->num = 0;
-	if (state->context) {
-		hesiod_end(state->context);
-		state->context = NULL;
-	}
-	return NS_SUCCESS;
-}
-
-/*ARGSUSED*/
-static int
-_dns_setusershell(void *nsrv, void *nscb, va_list ap)
-{
-
-	return _dns_start(&_dns_state);
-}
-
-/*ARGSUSED*/
-static int
-_dns_endusershell(void *nsrv, void *nscb, va_list ap)
-{
-
-	return _dns_end(&_dns_state);
-}
-
-/*ARGSUSED*/
-static int
-_dns_getusershell(void *nsrv, void *nscb, va_list ap)
-{
-	char	**retval = va_arg(ap, char **);
-
-	char	  shellname[] = "shells-NNNNNNNNNN";
-	char	**hp, *ep;
-	int	  rv;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-
-	if (_dns_state.num == -1)			/* exhausted search */
-		return NS_NOTFOUND;
-
-	if (_dns_state.context == NULL) {
-			/* only start if Hesiod not setup */
-		rv = _dns_start(&_dns_state);
-		if (rv != NS_SUCCESS)
-			return rv;
-	}
-
-	hp = NULL;
-	rv = NS_NOTFOUND;
-
-							/* find shells-NNN */
-	snprintf(shellname, sizeof(shellname), "shells-%d", _dns_state.num);
-	_dns_state.num++;
-
-	hp = hesiod_resolve(_dns_state.context, shellname, "shells");
-	if (hp == NULL) {
-		if (errno == ENOENT)
-			rv = NS_NOTFOUND;
-		else
-			rv = NS_UNAVAIL;
-	} else {
-		if ((ep = strchr(hp[0], '\n')) != NULL)
-			*ep = '\0';			/* clear trailing \n */
-						/* only use first result */
-		strlcpy(curshell, hp[0], sizeof(curshell));
-		*retval = curshell;
-		rv = NS_SUCCESS;
-	}
-
-	if (hp)
-		hesiod_free_list(_dns_state.context, hp);
-	if (rv != NS_SUCCESS)
-		_dns_state.num = -1;		/* any failure halts search */
-	return rv;
-}
-
-#endif /* HESIOD */
-
-
-#ifdef YP
-		/*
-		 *	nis methods
-		 */
-	/* state shared between nis methods */
-struct nis_state {
-	char		*domain;	/* NIS domain */
-	int		 done;		/* non-zero if search exhausted */
-	char		*current;	/* current first/next match */
-	int		 currentlen;	/* length of _nis_current */
-};
-
-static struct nis_state		_nis_state;
-
-static int
-_nis_start(struct nis_state *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	state->done = 0;
-	if (state->current) {
-		free(state->current);
-		state->current = NULL;
-	}
-	if (state->domain == NULL) {			/* setup NIS */
-		switch (yp_get_default_domain(&state->domain)) {
-		case 0:
-			break;
-		case YPERR_RESRC:
-			return NS_TRYAGAIN;
-		default:
-			return NS_UNAVAIL;
-		}
-	}
-	return NS_SUCCESS;
-}
-
-static int
-_nis_end(struct nis_state *state)
-{
-
-	_DIAGASSERT(state != NULL);
-
-	if (state->domain)
-		state->domain = NULL;
-	state->done = 0;
-	if (state->current)
-		free(state->current);
-	state->current = NULL;
-	return NS_SUCCESS;
-}
-
-/*ARGSUSED*/
-static int
-_nis_setusershell(void *nsrv, void *nscb, va_list ap)
-{
-
-	return _nis_start(&_nis_state);
-}
-
-/*ARGSUSED*/
-static int
-_nis_endusershell(void *nsrv, void *nscb, va_list ap)
-{
-
-	return _nis_end(&_nis_state);
-}
-
-/*ARGSUSED*/
-static int
-_nis_getusershell(void *nsrv, void *nscb, va_list ap)
-{
-	char	**retval = va_arg(ap, char **);
-
-	char	*key, *data;
-	int	keylen, datalen, rv, nisr;
-
-	_DIAGASSERT(retval != NULL);
-
-	*retval = NULL;
-
-	if (_nis_state.done)				/* exhausted search */
-		return NS_NOTFOUND;
-	if (_nis_state.domain == NULL) {
-					/* only start if NIS not setup */
-		rv = _nis_start(&_nis_state);
-		if (rv != NS_SUCCESS)
-			return rv;
-	}
-
-	key = NULL;
-	data = NULL;
-	rv = NS_NOTFOUND;
-
-	if (_nis_state.current) {			/* already searching */
-		nisr = yp_next(_nis_state.domain, "shells",
-		    _nis_state.current, _nis_state.currentlen,
-		    &key, &keylen, &data, &datalen);
-		free(_nis_state.current);
-		_nis_state.current = NULL;
-		switch (nisr) {
-		case 0:
-			_nis_state.current = key;
-			_nis_state.currentlen = keylen;
-			key = NULL;
-			break;
-		case YPERR_NOMORE:
-			rv = NS_NOTFOUND;
-			goto nisent_out;
-		default:
-			rv = NS_UNAVAIL;
-			goto nisent_out;
-		}
-	} else {					/* new search */
-		if (yp_first(_nis_state.domain, "shells",
-		    &_nis_state.current, &_nis_state.currentlen,
-		    &data, &datalen)) {
-			rv = NS_UNAVAIL;
-			goto nisent_out;
-		}
-	}
-
-	data[datalen] = '\0';				/* clear trailing \n */
-	strlcpy(curshell, data, sizeof(curshell));
-	*retval = curshell;
-	rv = NS_SUCCESS;
-
- nisent_out:
-	if (key)
-		free(key);
-	if (data)
-		free(data);
-	if (rv != NS_SUCCESS)			/* any failure halts search */
-		_nis_state.done = 1;
-	return rv;
-}
-
-#endif /* YP */
-
-
-		/*
-		 *	public functions
-		 */
-
-void
-endusershell(void)
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_endusershell, NULL)
-		NS_DNS_CB(_dns_endusershell, NULL)
-		NS_NIS_CB(_nis_endusershell, NULL)
-		NS_NULL_CB
-	};
-
-	mutex_lock(&__shellmutex);
-
-	curokshell = okshells;		/* reset okshells fallback state */
-	shellsfound = 0;
-
-					/* force all endusershell() methods */
-	(void) nsdispatch(NULL, dtab, NSDB_SHELLS, "endusershell",
-	    __nsdefaultfiles_forceall);
-	mutex_unlock(&__shellmutex);
-}
-
-__aconst char *
-getusershell(void)
-{
-	int		 rv;
-	__aconst char	*retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getusershell, NULL)
-		NS_DNS_CB(_dns_getusershell, NULL)
-		NS_NIS_CB(_nis_getusershell, NULL)
-		NS_NULL_CB
-	};
-
-	mutex_lock(&__shellmutex);
-
-	retval = NULL;
-	do {
-		rv = nsdispatch(NULL, dtab, NSDB_SHELLS, "getusershell",
-		    __nsdefaultsrc, &retval);
-				/* loop until failure or non-blank result */
-	} while (rv == NS_SUCCESS && retval[0] == '\0');
-
-	if (rv == NS_SUCCESS) {
-		shellsfound++;
-	} else if (shellsfound == 0) {	/* no shells; fall back to okshells */
-		if (curokshell != NULL) {
-			retval = __UNCONST(*curokshell);
-			curokshell++;
-			rv = NS_SUCCESS;
-		}
-	}
-
-	mutex_unlock(&__shellmutex);
-	return (rv == NS_SUCCESS) ? retval : NULL;
-}
-
-void
-setusershell(void)
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_setusershell, NULL)
-		NS_DNS_CB(_dns_setusershell, NULL)
-		NS_NIS_CB(_nis_setusershell, NULL)
-		NS_NULL_CB
-	};
-
-	mutex_lock(&__shellmutex);
-
-	curokshell = okshells;		/* reset okshells fallback state */
-	shellsfound = 0;
-
-					/* force all setusershell() methods */
-	(void) nsdispatch(NULL, dtab, NSDB_SHELLS, "setusershell",
-	    __nsdefaultfiles_forceall);
-	mutex_unlock(&__shellmutex);
-}
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
deleted file mode 100644
index 0c3598ffb..000000000
--- a/lib/libc/gen/glob.3
+++ /dev/null
@@ -1,531 +0,0 @@
-.\"	$NetBSD: glob.3,v 1.42 2012/12/27 21:17:47 christos Exp $
-.\"
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)glob.3	8.3 (Berkeley) 4/16/94
-.\"
-.Dd December 27, 2012
-.Dt GLOB 3
-.Os
-.Sh NAME
-.Nm glob ,
-.Nm globfree ,
-.Nm glob_pattern_p
-.Nd generate pathnames matching a pattern
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In glob.h
-.Ft int
-.Fn glob "const char * restrict pattern" "int flags" "int (*errfunc)(const char *, int)" "glob_t * restrict pglob"
-.Ft void
-.Fn globfree "glob_t *pglob"
-.Ft int
-.Fn glob_pattern_p "const char *pattern" "int quote"
-.Sh DESCRIPTION
-The
-.Fn glob
-function
-is a pathname generator that implements the rules for file name pattern
-matching used by the shell.
-.Pp
-The include file
-.Pa glob.h
-defines the structure type
-.Fa glob_t ,
-which contains at least the following fields:
-.Bd -literal
-typedef struct {
-	size_t gl_pathc;	/* count of total paths so far */
-	size_t gl_matchc;	/* count of paths matching pattern */
-	size_t gl_offs;		/* reserved at beginning of gl_pathv */
-	int gl_flags;		/* returned flags */
-	char **gl_pathv;	/* list of paths matching pattern */
-} glob_t;
-.Ed
-.Pp
-The argument
-.Fa pattern
-is a pointer to a pathname pattern to be expanded.
-The
-.Fn glob
-argument
-matches all accessible pathnames against the pattern and creates
-a list of the pathnames that match.
-In order to have access to a pathname,
-.Fn glob
-requires search permission on every component of a path except the last
-and read permission on each directory of any filename component of
-.Fa pattern
-that contains any of the special characters
-.Ql * ,
-.Ql \&?
-or
-.Ql \&[ .
-.Pp
-The
-.Fn glob
-argument
-stores the number of matched pathnames into the
-.Fa gl_pathc
-field, and a pointer to a list of pointers to pathnames into the
-.Fa gl_pathv
-field.
-The first pointer after the last pathname is
-.Dv NULL .
-If the pattern does not match any pathnames, the returned number of
-matched paths is set to zero.
-.Pp
-It is the caller's responsibility to create the structure pointed to by
-.Fa pglob .
-The
-.Fn glob
-function allocates other space as needed, including the memory pointed
-to by
-.Fa gl_pathv .
-.Pp
-The argument
-.Fa flags
-is used to modify the behavior of
-.Fn glob .
-The value of
-.Fa flags
-is the bitwise inclusive
-.Tn OR
-of any of the following
-values defined in
-.Pa glob.h :
-.Bl -tag -width GLOB_ALTDIRFUNC
-.It Dv GLOB_APPEND
-Append pathnames generated to the ones from a previous call (or calls)
-to
-.Fn glob .
-The value of
-.Fa gl_pathc
-will be the total matches found by this call and the previous call(s).
-The pathnames are appended to, not merged with the pathnames returned by
-the previous call(s).
-Between calls, the caller must not change the setting of the
-.Dv GLOB_DOOFFS
-flag, nor change the value of
-.Fa gl_offs
-when
-.Dv GLOB_DOOFFS
-is set, nor (obviously) call
-.Fn globfree
-for
-.Fa pglob .
-.It Dv GLOB_DOOFFS
-Make use of the
-.Fa gl_offs
-field.
-If this flag is set,
-.Fa gl_offs
-is used to specify how many
-.Dv NULL
-pointers to prepend to the beginning
-of the
-.Fa gl_pathv
-field.
-In other words,
-.Fa gl_pathv
-will point to
-.Fa gl_offs
-.Dv NULL
-pointers,
-followed by
-.Fa gl_pathc
-pathname pointers, followed by a
-.Dv NULL
-pointer.
-.It Dv GLOB_ERR
-Causes
-.Fn glob
-to return when it encounters a directory that it cannot open or read.
-Ordinarily,
-.Fn glob
-continues to find matches.
-.It Dv GLOB_MARK
-Each pathname that is a directory that matches
-.Fa pattern
-has a slash
-appended.
-.It Dv GLOB_NOCHECK
-If
-.Fa pattern
-does not match any pathname, then
-.Fn glob
-returns a list
-consisting of only
-.Fa pattern ,
-with one level of backslash escapes removed,
-the number of total pathnames set to 1, and the number of matched
-pathnames set to 0.
-.It Dv GLOB_NOSORT
-By default, the pathnames are sorted in ascending
-.Tn ASCII
-order;
-this flag prevents that sorting (speeding up
-.Fn glob ) .
-.El
-.Pp
-The following values may also be included in
-.Fa flags ,
-however, they are non-standard extensions to
-.St -p1003.2 .
-.Bl -tag -width GLOB_ALTDIRFUNC
-.It Dv GLOB_ALTDIRFUNC
-The following additional fields in the pglob structure have been
-initialized with alternate functions for glob to use to open, read,
-and close directories and to get stat information on names found
-in those directories.
-.Bd -literal
-	void *(*gl_opendir)(const char * name);
-	struct dirent *(*gl_readdir)(void *);
-	void (*gl_closedir)(void *);
-	int (*gl_lstat)(const char *name, struct stat *st);
-	int (*gl_stat)(const char *name, struct stat *st);
-.Ed
-.Pp
-This extension is provided to allow programs such as
-.Xr restore 8
-to provide globbing from directories stored on tape.
-.It Dv GLOB_BRACE
-Pre-process the pattern string to expand
-.Ql {pat,pat,...}
-strings like
-.Xr csh 1 .
-The pattern
-.Ql {}
-is left unexpanded for historical reasons
-.Po
-.Xr csh 1
-does the same thing to ease typing of
-.Xr find 1
-patterns
-.Pc .
-.It Dv GLOB_LIMIT
-Limit the amount of memory used to store matched strings to
-.Li 64K ,
-the number of
-.Xr stat 2
-calls to 128, and the number of
-.Xr readdir 3
-calls to 16K.
-This option should be set for programs that can be coerced to a denial of
-service attack via patterns that expand to a very large number of matches,
-such as a long string of
-.Li */../*/..
-.It Dv GLOB_MAGCHAR
-Set by the
-.Fn glob
-function if the pattern included globbing characters.
-See the description of the usage of the
-.Fa gl_matchc
-structure member for more details.
-.It Dv GLOB_NOESCAPE
-Disable the use of the backslash
-.Pq Ql \e
-character for quoting.
-.It Dv GLOB_NOMAGIC
-Is the same as
-.Dv GLOB_NOCHECK
-but it only appends the
-.Fa pattern
-if it does not contain any of the special characters ``*'', ``?'' or ``[''.
-.Dv GLOB_NOMAGIC
-is provided to simplify implementing the historic
-.Xr csh 1
-globbing behavior and should probably not be used anywhere else.
-.It Dv GLOB_NO_DOTDIRS
-Hide
-.Sq Li \&.
-and
-.Sq Li \&..
-from metacharacter matches, regardless of whether
-.Dv GLOB_PERIOD
-is set and whether the pattern component begins with a literal period.
-.It Dv GLOB_PERIOD
-Allow metacharacters to match a leading period in a filename.
-.It Dv GLOB_STAR
-Indicates that two adjacent
-.Li *
-characters will do a recursive match in all subdirs, without following
-symbolic links and three adjacent
-.Li *
-characters will also follow symbolic links.
-.It Dv GLOB_TILDE
-Expand patterns that start with
-.Ql ~
-to user name home directories.
-.El
-.Pp
-If, during the search, a directory is encountered that cannot be opened
-or read and
-.Fa errfunc
-is
-.Pf non- Dv NULL ,
-.Fn glob
-calls
-.Fa (*errfunc)(path, errno) .
-This may be unintuitive: a pattern like
-.Ql */Makefile
-will try to
-.Xr stat 2
-.Ql foo/Makefile
-even if
-.Ql foo
-is not a directory, resulting in a
-call to
-.Fa errfunc .
-The error routine can suppress this action by testing for
-.Dv ENOENT
-and
-.Dv ENOTDIR ;
-however, the
-.Dv GLOB_ERR
-flag will still cause an immediate
-return when this happens.
-.Pp
-If
-.Fa errfunc
-returns non-zero,
-.Fn glob
-stops the scan and returns
-.Dv GLOB_ABORTED
-after setting
-.Fa gl_pathc
-and
-.Fa gl_pathv
-to reflect any paths already matched.
-This also happens if an error is encountered and
-.Dv GLOB_ERR
-is set in
-.Fa flags ,
-regardless of the return value of
-.Fa errfunc ,
-if called.
-If
-.Dv GLOB_ERR
-is not set and either
-.Fa errfunc
-is
-.Dv NULL
-or
-.Fa errfunc
-returns zero, the error is ignored.
-.Pp
-The
-.Fn globfree
-function frees any space associated with
-.Fa pglob
-from a previous call(s) to
-.Fn glob .
-.Pp
-The
-.Fn glob_pattern_p
-returns
-.Dv 1
-if the
-.Fa pattern
-has any special characters that
-.Fn glob
-will interpret and
-.Dv 0
-otherwise.
-If the
-.Fa quote
-argument is non-zero, then backslash quoted characters are ignored.
-.Pp
-The historical
-.Dv GLOB_QUOTE
-flag is no longer supported.
-Per
-.St -p1003.2-92 ,
-backslash escaping of special characters is the default behaviour;
-it may be disabled by specifying the
-.Dv GLOB_NOESCAPE
-flag.
-.Sh RETURN VALUES
-On successful completion,
-.Fn glob
-returns zero.
-In addition the fields of
-.Fa pglob
-contain the values described below:
-.Bl -tag -width GLOB_NOCHECK
-.It Fa gl_pathc
-contains the total number of matched pathnames so far.
-This includes other matches from previous invocations of
-.Fn glob
-if
-.Dv GLOB_APPEND
-was specified.
-.It Fa gl_matchc
-contains the number of matched pathnames in the current invocation of
-.Fn glob .
-.It Fa gl_flags
-contains a copy of the
-.Fa flags
-parameter with the bit
-.Dv GLOB_MAGCHAR
-set if
-.Fa pattern
-contained any of the special characters ``*'', ``?'' or ``['', cleared
-if not.
-.It Fa gl_pathv
-contains a pointer to a
-.Dv NULL Ns -terminated
-list of matched pathnames.
-However, if
-.Fa gl_pathc
-is zero, the contents of
-.Fa gl_pathv
-are undefined.
-.El
-.Pp
-If
-.Fn glob
-terminates due to an error, it sets
-.Va errno
-and returns one of the following non-zero constants, which are defined
-in the include file
-.In glob.h :
-.Bl -tag -width GLOB_ABORTEDXXX
-.It Dv GLOB_ABORTED
-The scan was stopped because an error was encountered and either
-.Dv GLOB_ERR
-was set or
-.Fa (*errfunc)()
-returned non-zero.
-.It Dv GLOB_NOMATCH
-The pattern does not match any existing pathname, and
-.Dv GLOB_NOCHECK
-was not set in
-.Dv flags .
-.It Dv GLOB_NOSPACE
-An attempt to allocate memory failed, or if
-.Va errno
-was 0
-.Li GLOB_LIMIT
-was specified in the flags and
-.Li ARG_MAX
-patterns were matched.
-.El
-.Pp
-The historical
-.Dv GLOB_ABEND
-return constant is no longer supported.
-Portable applications should use the
-.Dv GLOB_ABORTED
-constant instead.
-.Pp
-The arguments
-.Fa pglob\-\*[Gt]gl_pathc
-and
-.Fa pglob\-\*[Gt]gl_pathv
-are still set as specified above.
-.Sh ENVIRONMENT
-.Bl -tag -width HOME -compact
-.It Ev HOME
-If defined, used as the home directory of the current user in
-tilde expansions.
-.El
-.Sh EXAMPLES
-A rough equivalent of
-.Ql "ls -l *.c *.h"
-can be obtained with the
-following code:
-.Bd -literal -offset indent
-glob_t g;
-
-g.gl_offs = 2;
-glob("*.c", GLOB_DOOFFS, NULL, \*[Am]g);
-glob("*.h", GLOB_DOOFFS | GLOB_APPEND, NULL, \*[Am]g);
-g.gl_pathv[0] = "ls";
-g.gl_pathv[1] = "-l";
-execvp("ls", g.gl_pathv);
-.Ed
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr fnmatch 3 ,
-.Xr regexp 3 ,
-.Xr glob 7
-.Sh STANDARDS
-The
-.Fn glob
-function is expected to be
-.St -p1003.2
-compatible with the exception
-that the flags
-.Dv GLOB_ALTDIRFUNC ,
-.Dv GLOB_BRACE ,
-.Dv GLOB_LIMIT ,
-.Dv GLOB_MAGCHAR ,
-.Dv GLOB_NOESCAPE ,
-.Dv GLOB_NOMAGIC ,
-.Dv GLOB_NO_DOTDIRS ,
-.Dv GLOB_PERIOD ,
-.Dv GLOB_STAR ,
-.Dv GLOB_TILDE ,
-and the fields
-.Fa gl_matchc
-and
-.Fa gl_flags
-should not be used by applications striving for strict
-.Tn POSIX
-conformance.
-.Sh HISTORY
-The
-.Fn glob
-and
-.Fn globfree
-functions first appeared in
-.Bx 4.4 .
-The
-.Fn glob_pattern_p
-function is modelled after the one found in glibc.
-.Sh BUGS
-Patterns longer than
-.Dv MAXPATHLEN
-may cause unchecked errors.
-.Pp
-The
-.Fn glob
-function may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr stat 2 ,
-.Xr closedir 3 ,
-.Xr opendir 3 ,
-.Xr readdir 3 ,
-.Xr malloc 3 ,
-and
-.Xr free 3 .
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
deleted file mode 100644
index f623e25ca..000000000
--- a/lib/libc/gen/glob.c
+++ /dev/null
@@ -1,1149 +0,0 @@
-/*	$NetBSD: glob.c,v 1.35 2013/03/20 23:44:47 lukem Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
-#else
-__RCSID("$NetBSD: glob.c,v 1.35 2013/03/20 23:44:47 lukem Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * glob(3) -- a superset of the one defined in POSIX 1003.2.
- *
- * The [!...] convention to negate a range is supported (SysV, Posix, ksh).
- *
- * Optional extra services, controlled by flags not defined by POSIX:
- *
- * GLOB_MAGCHAR:
- *	Set in gl_flags if pattern contained a globbing character.
- * GLOB_NOMAGIC:
- *	Same as GLOB_NOCHECK, but it will only append pattern if it did
- *	not contain any magic characters.  [Used in csh style globbing]
- * GLOB_ALTDIRFUNC:
- *	Use alternately specified directory access functions.
- * GLOB_TILDE:
- *	expand ~user/foo to the /home/dir/of/user/foo
- * GLOB_BRACE:
- *	expand {1,2}{a,b} to 1a 1b 2a 2b 
- * GLOB_PERIOD:
- *	allow metacharacters to match leading dots in filenames.
- * GLOB_NO_DOTDIRS:
- *	. and .. are hidden from wildcards, even if GLOB_PERIOD is set.
- * gl_matchc:
- *	Number of matches in the current invocation of glob.
- */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <glob.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef HAVE_NBTOOL_CONFIG_H
-#define NO_GETPW_R
-#endif
-
-#define	GLOB_LIMIT_STRING	65536	/* number of readdirs */
-#define	GLOB_LIMIT_STAT		128	/* number of stat system calls */
-#define	GLOB_LIMIT_READDIR	16384	/* total buffer size of path strings */
-#define	GLOB_LIMIT_PATH		1024	/* number of path elements */
-#define GLOB_LIMIT_BRACE	128	/* Number of brace calls */
-
-struct glob_limit {
-	size_t l_string;
-	size_t l_stat;	
-	size_t l_readdir;	
-	size_t l_brace;
-};
-
-/*
- * XXX: For NetBSD 1.4.x compatibility. (kill me l8r)
- */
-#ifndef _DIAGASSERT
-#define _DIAGASSERT(a)
-#endif
-
-#define	DOLLAR		'$'
-#define	DOT		'.'
-#define	EOS		'\0'
-#define	LBRACKET	'['
-#define	NOT		'!'
-#define	QUESTION	'?'
-#define	QUOTE		'\\'
-#define	RANGE		'-'
-#define	RBRACKET	']'
-#define	SEP		'/'
-#define	STAR		'*'
-#define	TILDE		'~'
-#define	UNDERSCORE	'_'
-#define	LBRACE		'{'
-#define	RBRACE		'}'
-#define	SLASH		'/'
-#define	COMMA		','
-
-#ifndef USE_8BIT_CHARS
-
-#define	M_QUOTE		0x8000
-#define	M_PROTECT	0x4000
-#define	M_MASK		0xffff
-#define	M_ASCII		0x00ff
-
-typedef unsigned short Char;
-
-#else
-
-#define	M_QUOTE		(Char)0x80
-#define	M_PROTECT	(Char)0x40
-#define	M_MASK		(Char)0xff
-#define	M_ASCII		(Char)0x7f
-
-typedef char Char;
-
-#endif
-
-
-#define	CHAR(c)		((Char)((c)&M_ASCII))
-#define	META(c)		((Char)((c)|M_QUOTE))
-#define	M_ALL		META('*')
-#define	M_END		META(']')
-#define	M_NOT		META('!')
-#define	M_ONE		META('?')
-#define	M_RNG		META('-')
-#define	M_SET		META('[')
-#define	ismeta(c)	(((c)&M_QUOTE) != 0)
-
-
-static int	 compare(const void *, const void *);
-static int	 g_Ctoc(const Char *, char *, size_t);
-static int	 g_lstat(Char *, __gl_stat_t  *, glob_t *);
-static DIR	*g_opendir(Char *, glob_t *);
-static Char	*g_strchr(const Char *, int);
-static int	 g_stat(Char *, __gl_stat_t *, glob_t *);
-static int	 glob0(const Char *, glob_t *, struct glob_limit *);
-static int	 glob1(Char *, glob_t *, struct glob_limit *);
-static int	 glob2(Char *, Char *, Char *, const Char *, glob_t *,
-    struct glob_limit *);
-static int	 glob3(Char *, Char *, Char *, const Char *, const Char *,
-    const Char *, glob_t *, struct glob_limit *);
-static int	 globextend(const Char *, glob_t *, struct glob_limit *);
-static const Char *globtilde(const Char *, Char *, size_t, glob_t *);
-static int	 globexp1(const Char *, glob_t *, struct glob_limit *);
-static int	 globexp2(const Char *, const Char *, glob_t *, int *,
-    struct glob_limit *);
-static int	 match(const Char *, const Char *, const Char *);
-#ifdef DEBUG
-static void	 qprintf(const char *, Char *);
-#endif
-
-int
-glob(const char * __restrict pattern, int flags, int (*errfunc)(const char *,
-    int), glob_t * __restrict pglob)
-{
-	const unsigned char *patnext;
-	int c;
-	Char *bufnext, *bufend, patbuf[MAXPATHLEN+1];
-	struct glob_limit limit = { 0, 0, 0, 0 };
-
-	_DIAGASSERT(pattern != NULL);
-
-	patnext = (const unsigned char *) pattern;
-	if (!(flags & GLOB_APPEND)) {
-		pglob->gl_pathc = 0;
-		pglob->gl_pathv = NULL;
-		if (!(flags & GLOB_DOOFFS))
-			pglob->gl_offs = 0;
-	}
-	pglob->gl_flags = flags & ~GLOB_MAGCHAR;
-	pglob->gl_errfunc = errfunc;
-	pglob->gl_matchc = 0;
-
-	bufnext = patbuf;
-	bufend = bufnext + MAXPATHLEN;
-	if (flags & GLOB_NOESCAPE) {
-		while (bufnext < bufend && (c = *patnext++) != EOS) 
-			*bufnext++ = c;
-	} else {
-		/* Protect the quoted characters. */
-		while (bufnext < bufend && (c = *patnext++) != EOS) 
-			if (c == QUOTE) {
-				if ((c = *patnext++) == EOS) {
-					c = QUOTE;
-					--patnext;
-				}
-				*bufnext++ = c | M_PROTECT;
-			}
-			else
-				*bufnext++ = c;
-	}
-	*bufnext = EOS;
-
-	if (flags & GLOB_BRACE)
-	    return globexp1(patbuf, pglob, &limit);
-	else
-	    return glob0(patbuf, pglob, &limit);
-}
-
-/*
- * Expand recursively a glob {} pattern. When there is no more expansion
- * invoke the standard globbing routine to glob the rest of the magic
- * characters
- */
-static int
-globexp1(const Char *pattern, glob_t *pglob, struct glob_limit *limit)
-{
-	const Char* ptr = pattern;
-	int rv;
-
-	_DIAGASSERT(pattern != NULL);
-	_DIAGASSERT(pglob != NULL);
-
-	if ((pglob->gl_flags & GLOB_LIMIT) &&
-	    limit->l_brace++ >= GLOB_LIMIT_BRACE) {
-		errno = 0;
-		return GLOB_NOSPACE;
-	}
-
-	/* Protect a single {}, for find(1), like csh */
-	if (pattern[0] == LBRACE && pattern[1] == RBRACE && pattern[2] == EOS)
-		return glob0(pattern, pglob, limit);
-
-	while ((ptr = (const Char *) g_strchr(ptr, LBRACE)) != NULL)
-		if (!globexp2(ptr, pattern, pglob, &rv, limit))
-			return rv;
-
-	return glob0(pattern, pglob, limit);
-}
-
-
-/*
- * Recursive brace globbing helper. Tries to expand a single brace.
- * If it succeeds then it invokes globexp1 with the new pattern.
- * If it fails then it tries to glob the rest of the pattern and returns.
- */
-static int
-globexp2(const Char *ptr, const Char *pattern, glob_t *pglob, int *rv,
-    struct glob_limit *limit)
-{
-	int     i;
-	Char   *lm, *ls;
-	const Char *pe, *pm, *pl;
-	Char    patbuf[MAXPATHLEN + 1];
-
-	_DIAGASSERT(ptr != NULL);
-	_DIAGASSERT(pattern != NULL);
-	_DIAGASSERT(pglob != NULL);
-	_DIAGASSERT(rv != NULL);
-
-	/* copy part up to the brace */
-	for (lm = patbuf, pm = pattern; pm != ptr; *lm++ = *pm++)
-		continue;
-	ls = lm;
-
-	/* Find the balanced brace */
-	for (i = 0, pe = ++ptr; *pe; pe++)
-		if (*pe == LBRACKET) {
-			/* Ignore everything between [] */
-			for (pm = pe++; *pe != RBRACKET && *pe != EOS; pe++)
-				continue;
-			if (*pe == EOS) {
-				/* 
-				 * We could not find a matching RBRACKET.
-				 * Ignore and just look for RBRACE
-				 */
-				pe = pm;
-			}
-		}
-		else if (*pe == LBRACE)
-			i++;
-		else if (*pe == RBRACE) {
-			if (i == 0)
-				break;
-			i--;
-		}
-
-	/* Non matching braces; just glob the pattern */
-	if (i != 0 || *pe == EOS) {
-		/*
-		 * we use `pattern', not `patbuf' here so that that
-		 * unbalanced braces are passed to the match
-		 */
-		*rv = glob0(pattern, pglob, limit);
-		return 0;
-	}
-
-	for (i = 0, pl = pm = ptr; pm <= pe; pm++) {
-		switch (*pm) {
-		case LBRACKET:
-			/* Ignore everything between [] */
-			for (pl = pm++; *pm != RBRACKET && *pm != EOS; pm++)
-				continue;
-			if (*pm == EOS) {
-				/* 
-				 * We could not find a matching RBRACKET.
-				 * Ignore and just look for RBRACE
-				 */
-				pm = pl;
-			}
-			break;
-
-		case LBRACE:
-			i++;
-			break;
-
-		case RBRACE:
-			if (i) {
-				i--;
-				break;
-			}
-			/* FALLTHROUGH */
-		case COMMA:
-			if (i && *pm == COMMA)
-				break;
-			else {
-				/* Append the current string */
-				for (lm = ls; (pl < pm); *lm++ = *pl++)
-					continue;
-				/* 
-				 * Append the rest of the pattern after the
-				 * closing brace
-				 */
-				for (pl = pe + 1; (*lm++ = *pl++) != EOS;)
-					continue;
-
-				/* Expand the current pattern */
-#ifdef DEBUG
-				qprintf("globexp2", patbuf);
-#endif
-				*rv = globexp1(patbuf, pglob, limit);
-
-				/* move after the comma, to the next string */
-				pl = pm + 1;
-			}
-			break;
-
-		default:
-			break;
-		}
-	}
-	*rv = 0;
-	return 0;
-}
-
-
-
-/*
- * expand tilde from the passwd file.
- */
-static const Char *
-globtilde(const Char *pattern, Char *patbuf, size_t patsize, glob_t *pglob)
-{
-	struct passwd *pwd;
-	const char *h;
-	const Char *p;
-	Char *b;
-	char *d;
-	Char *pend = &patbuf[patsize / sizeof(Char)];
-#ifndef NO_GETPW_R
-	struct passwd pwres;
-	char pwbuf[1024];
-#endif
-
-	pend--;
-
-	_DIAGASSERT(pattern != NULL);
-	_DIAGASSERT(patbuf != NULL);
-	_DIAGASSERT(pglob != NULL);
-
-	if (*pattern != TILDE || !(pglob->gl_flags & GLOB_TILDE))
-		return pattern;
-
-	/* Copy up to the end of the string or / */
-	for (p = pattern + 1, d = (char *)(void *)patbuf; 
-	     d < (char *)(void *)pend && *p && *p != SLASH; 
-	     *d++ = *p++)
-		continue;
-
-	if (d == (char *)(void *)pend)
-		return NULL;
-
-	*d = EOS;
-	d = (char *)(void *)patbuf;
-
-	if (*d == EOS) {
-		/* 
-		 * handle a plain ~ or ~/ by expanding $HOME 
-		 * first and then trying the password file
-		 */
-		if ((h = getenv("HOME")) == NULL) {
-#ifdef NO_GETPW_R
-			if ((pwd = getpwuid(getuid())) == NULL)
-#else
-			if (getpwuid_r(getuid(), &pwres, pwbuf, sizeof(pwbuf),
-			    &pwd) != 0 || pwd == NULL)
-#endif
-				return pattern;
-			else
-				h = pwd->pw_dir;
-		}
-	}
-	else {
-		/*
-		 * Expand a ~user
-		 */
-#ifdef NO_GETPW_R
-		if ((pwd = getpwnam(d)) == NULL)
-#else
-		if (getpwnam_r(d, &pwres, pwbuf, sizeof(pwbuf), &pwd) != 0 ||
-		    pwd == NULL)
-#endif
-			return pattern;
-		else
-			h = pwd->pw_dir;
-	}
-
-	/* Copy the home directory */
-	for (b = patbuf; b < pend && *h; *b++ = *h++)
-		continue;
-
-	if (b == pend)
-		return NULL;
-	
-	/* Append the rest of the pattern */
-	while (b < pend && (*b++ = *p++) != EOS)
-		continue;
-
-	if (b == pend)
-		return NULL;
-
-	return patbuf;
-}
-	
-
-/*
- * The main glob() routine: compiles the pattern (optionally processing
- * quotes), calls glob1() to do the real pattern matching, and finally
- * sorts the list (unless unsorted operation is requested).  Returns 0
- * if things went well, nonzero if errors occurred.  It is not an error
- * to find no matches.
- */
-static int
-glob0(const Char *pattern, glob_t *pglob, struct glob_limit *limit)
-{
-	const Char *qpatnext;
-	int c, error;
-	__gl_size_t oldpathc;
-	Char *bufnext, patbuf[MAXPATHLEN+1];
-
-	_DIAGASSERT(pattern != NULL);
-	_DIAGASSERT(pglob != NULL);
-
-	if ((qpatnext = globtilde(pattern, patbuf, sizeof(patbuf),
-	    pglob)) == NULL)
-		return GLOB_ABEND;
-	oldpathc = pglob->gl_pathc;
-	bufnext = patbuf;
-
-	/* We don't need to check for buffer overflow any more. */
-	while ((c = *qpatnext++) != EOS) {
-		switch (c) {
-		case LBRACKET:
-			c = *qpatnext;
-			if (c == NOT)
-				++qpatnext;
-			if (*qpatnext == EOS ||
-			    g_strchr(qpatnext+1, RBRACKET) == NULL) {
-				*bufnext++ = LBRACKET;
-				if (c == NOT)
-					--qpatnext;
-				break;
-			}
-			*bufnext++ = M_SET;
-			if (c == NOT)
-				*bufnext++ = M_NOT;
-			c = *qpatnext++;
-			do {
-				*bufnext++ = CHAR(c);
-				if (*qpatnext == RANGE &&
-				    (c = qpatnext[1]) != RBRACKET) {
-					*bufnext++ = M_RNG;
-					*bufnext++ = CHAR(c);
-					qpatnext += 2;
-				}
-			} while ((c = *qpatnext++) != RBRACKET);
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			*bufnext++ = M_END;
-			break;
-		case QUESTION:
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			*bufnext++ = M_ONE;
-			break;
-		case STAR:
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			/* collapse adjacent stars to one [or three if globstar]
-			 * to avoid exponential behavior
-			 */
-			if (bufnext == patbuf || bufnext[-1] != M_ALL ||
-			    ((pglob->gl_flags & GLOB_STAR) != 0 && 
-			    (bufnext - 1 == patbuf || bufnext[-2] != M_ALL ||
-			    bufnext - 2 == patbuf || bufnext[-3] != M_ALL)))
-				*bufnext++ = M_ALL;
-			break;
-		default:
-			*bufnext++ = CHAR(c);
-			break;
-		}
-	}
-	*bufnext = EOS;
-#ifdef DEBUG
-	qprintf("glob0", patbuf);
-#endif
-
-	if ((error = glob1(patbuf, pglob, limit)) != 0)
-		return error;
-
-	if (pglob->gl_pathc == oldpathc) {	
-		/*
-		 * If there was no match we are going to append the pattern 
-		 * if GLOB_NOCHECK was specified or if GLOB_NOMAGIC was
-		 * specified and the pattern did not contain any magic
-		 * characters GLOB_NOMAGIC is there just for compatibility
-		 * with csh.
-		 */
-		if ((pglob->gl_flags & GLOB_NOCHECK) ||
-		    ((pglob->gl_flags & (GLOB_NOMAGIC|GLOB_MAGCHAR))
-		     == GLOB_NOMAGIC)) {
-			return globextend(pattern, pglob, limit);
-		} else {
-			return GLOB_NOMATCH;
-		}
-	} else if (!(pglob->gl_flags & GLOB_NOSORT)) {
-		qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc,
-		    (size_t)pglob->gl_pathc - oldpathc, sizeof(char *),
-		    compare);
-	}
-
-	return 0;
-}
-
-static int
-compare(const void *p, const void *q)
-{
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(q != NULL);
-
-	return strcoll(*(const char * const *)p, *(const char * const *)q);
-}
-
-static int
-glob1(Char *pattern, glob_t *pglob, struct glob_limit *limit)
-{
-	Char pathbuf[MAXPATHLEN+1];
-
-	_DIAGASSERT(pattern != NULL);
-	_DIAGASSERT(pglob != NULL);
-
-	/* A null pathname is invalid -- POSIX 1003.1 sect. 2.4. */
-	if (*pattern == EOS)
-		return 0;
-	/*
-	 * we save one character so that we can use ptr >= limit,
-	 * in the general case when we are appending non nul chars only.
-	 */
-	return glob2(pathbuf, pathbuf,
-	    pathbuf + (sizeof(pathbuf) / sizeof(*pathbuf)) - 1, pattern,
-	    pglob, limit);
-}
-
-/*
- * The functions glob2 and glob3 are mutually recursive; there is one level
- * of recursion for each segment in the pattern that contains one or more
- * meta characters.
- */
-static int
-glob2(Char *pathbuf, Char *pathend, Char *pathlim, const Char *pattern,
-    glob_t *pglob, struct glob_limit *limit)
-{
-	__gl_stat_t sb;
-	const Char *p;
-	Char *q;
-	int anymeta;
-
-	_DIAGASSERT(pathbuf != NULL);
-	_DIAGASSERT(pathend != NULL);
-	_DIAGASSERT(pattern != NULL);
-	_DIAGASSERT(pglob != NULL);
-
-#ifdef DEBUG
-	qprintf("glob2", pathbuf);
-#endif
-	/*
-	 * Loop over pattern segments until end of pattern or until
-	 * segment with meta character found.
-	 */
-	for (anymeta = 0;;) {
-		if (*pattern == EOS) {		/* End of pattern? */
-			*pathend = EOS;
-			if (g_lstat(pathbuf, &sb, pglob))
-				return 0;
-		
-			if ((pglob->gl_flags & GLOB_LIMIT) &&
-			    limit->l_stat++ >= GLOB_LIMIT_STAT) {
-				errno = 0;
-				*pathend++ = SEP;
-				*pathend = EOS;
-				return GLOB_NOSPACE;
-			}
-			if (((pglob->gl_flags & GLOB_MARK) &&
-			    pathend[-1] != SEP) && (S_ISDIR(sb.st_mode) ||
-			    (S_ISLNK(sb.st_mode) &&
-			    (g_stat(pathbuf, &sb, pglob) == 0) &&
-			    S_ISDIR(sb.st_mode)))) {
-				if (pathend >= pathlim)
-					return GLOB_ABORTED;
-				*pathend++ = SEP;
-				*pathend = EOS;
-			}
-			++pglob->gl_matchc;
-			return globextend(pathbuf, pglob, limit);
-		}
-
-		/* Find end of next segment, copy tentatively to pathend. */
-		q = pathend;
-		p = pattern;
-		while (*p != EOS && *p != SEP) {
-			if (ismeta(*p))
-				anymeta = 1;
-			if (q >= pathlim)
-				return GLOB_ABORTED;
-			*q++ = *p++;
-		}
-
-                if (!anymeta) {
-			pathend = q;
-			pattern = p;
-			while (*pattern == SEP) {
-				if (pathend >= pathlim)
-					return GLOB_ABORTED;
-				*pathend++ = *pattern++;
-			}
-		} else			/* Need expansion, recurse. */
-			return glob3(pathbuf, pathend, pathlim, pattern, p,
-			    pattern, pglob, limit);
-	}
-	/* NOTREACHED */
-}
-
-static int
-glob3(Char *pathbuf, Char *pathend, Char *pathlim, const Char *pattern,
-    const Char *restpattern, const Char *pglobstar, glob_t *pglob,
-    struct glob_limit *limit)
-{
-	struct dirent *dp;
-	DIR *dirp;
-	__gl_stat_t sbuf;
-	int error;
-	char buf[MAXPATHLEN];
-	int globstar = 0;
-	int chase_symlinks = 0;
-	const Char *termstar = NULL;
-
-	/*
-	 * The readdirfunc declaration can't be prototyped, because it is
-	 * assigned, below, to two functions which are prototyped in glob.h
-	 * and dirent.h as taking pointers to differently typed opaque
-	 * structures.
-	 */
-	struct dirent *(*readdirfunc)(void *);
-
-	_DIAGASSERT(pathbuf != NULL);
-	_DIAGASSERT(pathend != NULL);
-	_DIAGASSERT(pattern != NULL);
-	_DIAGASSERT(restpattern != NULL);
-	_DIAGASSERT(pglob != NULL);
-
-	*pathend = EOS;
-	errno = 0;
-	    
-	while (pglobstar < restpattern) {
-		if ((pglobstar[0] & M_MASK) == M_ALL &&
-		    (pglobstar[1] & M_MASK) == M_ALL) {
-			globstar = 1;
-			chase_symlinks = (pglobstar[2] & M_MASK) == M_ALL;
-			termstar = pglobstar + (2 + chase_symlinks);
-			break;
-		}
-		pglobstar++;
-	} 
-
-	if (globstar) {
-		error = pglobstar == pattern && termstar == restpattern ?
-		    *restpattern == EOS ?
-		    glob2(pathbuf, pathend, pathlim, restpattern - 1, pglob,
-		    limit) :
-		    glob2(pathbuf, pathend, pathlim, restpattern + 1, pglob,
-		    limit) :
-		    glob3(pathbuf, pathend, pathlim, pattern, restpattern,
-		    termstar, pglob, limit);
-		if (error)
-			return error;
-		*pathend = EOS;
-	}
-
-	if (*pathbuf && (g_lstat(pathbuf, &sbuf, pglob) ||
-	    !S_ISDIR(sbuf.st_mode)
-#ifdef S_IFLINK
-	     && ((globstar && !chase_symlinks) || !S_ISLNK(sbuf.st_mode))
-#endif
-	    ))
-		return 0;
-
-	if ((dirp = g_opendir(pathbuf, pglob)) == NULL) {
-		if (pglob->gl_errfunc) {
-			if (g_Ctoc(pathbuf, buf, sizeof(buf)))
-				return GLOB_ABORTED;
-			if (pglob->gl_errfunc(buf, errno) ||
-			    pglob->gl_flags & GLOB_ERR)
-				return GLOB_ABORTED;
-		}
-		/*
-		 * Posix/XOpen: glob should return when it encounters a
-		 * directory that it cannot open or read
-		 * XXX: Should we ignore ENOTDIR and ENOENT though?
-		 * I think that Posix had in mind EPERM...
-		 */
-		if (pglob->gl_flags & GLOB_ERR)
-			return GLOB_ABORTED;
-
-		return 0;
-	}
-
-	error = 0;
-
-	/* Search directory for matching names. */
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		readdirfunc = pglob->gl_readdir;
-	else
-		readdirfunc = (struct dirent *(*)(void *)) readdir;
-	while ((dp = (*readdirfunc)(dirp)) != NULL) {
-		unsigned char *sc;
-		Char *dc;
-
-		if ((pglob->gl_flags & GLOB_LIMIT) &&
-		    limit->l_readdir++ >= GLOB_LIMIT_READDIR) {
-			errno = 0;
-			*pathend++ = SEP;
-			*pathend = EOS;
-			error = GLOB_NOSPACE;
-			break;
-		}
-
-		/*
-		 * Initial DOT must be matched literally, unless we have
-		 * GLOB_PERIOD set.
-		 */
-		if ((pglob->gl_flags & GLOB_PERIOD) == 0)
-			if (dp->d_name[0] == DOT && *pattern != DOT)
-				continue;
-		/*
-		 * If GLOB_NO_DOTDIRS is set, . and .. vanish.
-		 */
-		if ((pglob->gl_flags & GLOB_NO_DOTDIRS) &&
-		    (dp->d_name[0] == DOT) &&
-		    ((dp->d_name[1] == EOS) ||
-		     ((dp->d_name[1] == DOT) && (dp->d_name[2] == EOS))))
-			continue;
-		/*
-		 * The resulting string contains EOS, so we can
-		 * use the pathlim character, if it is the nul
-		 */
-		for (sc = (unsigned char *) dp->d_name, dc = pathend; 
-		     dc <= pathlim && (*dc++ = *sc++) != EOS;)
-			continue;
-
-		/*
-		 * Have we filled the buffer without seeing EOS?
-		 */
-		if (dc > pathlim && *pathlim != EOS) {
-			/*
-			 * Abort when requested by caller, otherwise
-			 * reset pathend back to last SEP and continue
-			 * with next dir entry.
-			 */
-			if (pglob->gl_flags & GLOB_ERR) {
-				error = GLOB_ABORTED;
-				break;
-			}
-			else {
-				*pathend = EOS;
-				continue;
-			}
-		}
-
-		if (globstar) {
-#ifdef S_IFLNK
-			if (!chase_symlinks &&
-			    (g_lstat(pathbuf, &sbuf, pglob) ||
-			    S_ISLNK(sbuf.st_mode)))
-				continue;
-#endif
-
-			if (!match(pathend, pattern, termstar))
-				continue;
-	    
-			if (--dc < pathlim - 2)
-				*dc++ = SEP;
-			*dc = EOS;
-			error = glob2(pathbuf, dc, pathlim, pglobstar,
-			    pglob, limit);
-			if (error)
-				break;
-			*pathend = EOS;
-		} else {
-			if (!match(pathend, pattern, restpattern)) {
-				*pathend = EOS;
-				continue;
-			}
-			error = glob2(pathbuf, --dc, pathlim, restpattern,
-			    pglob, limit);
-			if (error)
-				break;
-		}
-	}
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		(*pglob->gl_closedir)(dirp);
-	else
-		closedir(dirp);
-
-	/*
-	 * Again Posix X/Open issue with regards to error handling.
-	 */
-	if ((error || errno) && (pglob->gl_flags & GLOB_ERR))
-		return GLOB_ABORTED;
-
-	return error;
-}
-
-
-/*
- * Extend the gl_pathv member of a glob_t structure to accommodate a new item,
- * add the new item, and update gl_pathc.
- *
- * This assumes the BSD realloc, which only copies the block when its size
- * crosses a power-of-two boundary; for v7 realloc, this would cause quadratic
- * behavior.
- *
- * Return 0 if new item added, error code if memory couldn't be allocated.
- *
- * Invariant of the glob_t structure:
- *	Either gl_pathc is zero and gl_pathv is NULL; or gl_pathc > 0 and
- *	gl_pathv points to (gl_offs + gl_pathc + 1) items.
- */
-static int
-globextend(const Char *path, glob_t *pglob, struct glob_limit *limit)
-{
-	char **pathv;
-	size_t i, newsize, len;
-	char *copy;
-	const Char *p;
-
-	_DIAGASSERT(path != NULL);
-	_DIAGASSERT(pglob != NULL);
-
-	newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
-	if ((pglob->gl_flags & GLOB_LIMIT) &&
-	    newsize > GLOB_LIMIT_PATH * sizeof(*pathv))
-		goto nospace;
-	pathv = pglob->gl_pathv ? realloc(pglob->gl_pathv, newsize) :
-	    malloc(newsize);
-	if (pathv == NULL)
-		return GLOB_NOSPACE;
-
-	if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) {
-		/* first time around -- clear initial gl_offs items */
-		pathv += pglob->gl_offs;
-		for (i = pglob->gl_offs + 1; --i > 0; )
-			*--pathv = NULL;
-	}
-	pglob->gl_pathv = pathv;
-
-	for (p = path; *p++;)
-		continue;
-	len = (size_t)(p - path);
-	limit->l_string += len;
-	if ((copy = malloc(len)) != NULL) {
-		if (g_Ctoc(path, copy, len)) {
-			free(copy);
-			return GLOB_ABORTED;
-		}
-		pathv[pglob->gl_offs + pglob->gl_pathc++] = copy;
-	}
-	pathv[pglob->gl_offs + pglob->gl_pathc] = NULL;
-
-	if ((pglob->gl_flags & GLOB_LIMIT) &&
-	    (newsize + limit->l_string) >= GLOB_LIMIT_STRING)
-		goto nospace;
-
-	return copy == NULL ? GLOB_NOSPACE : 0;
-nospace:
-	errno = 0;
-	return GLOB_NOSPACE;
-}
-
-
-/*
- * pattern matching function for filenames.  Each occurrence of the *
- * pattern causes a recursion level.
- */
-static int
-match(const Char *name, const Char *pat, const Char *patend)
-{
-	int ok, negate_range;
-	Char c, k;
-
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(pat != NULL);
-	_DIAGASSERT(patend != NULL);
-
-	while (pat < patend) {
-		c = *pat++;
-		switch (c & M_MASK) {
-		case M_ALL:
-			while (pat < patend && (*pat & M_MASK) == M_ALL)
-				pat++;	/* eat consecutive '*' */
-			if (pat == patend)
-				return 1;
-			for (; !match(name, pat, patend); name++)
-				if (*name == EOS)
-					return 0;
-			return 1;
-		case M_ONE:
-			if (*name++ == EOS)
-				return 0;
-			break;
-		case M_SET:
-			ok = 0;
-			if ((k = *name++) == EOS)
-				return 0;
-			if ((negate_range = ((*pat & M_MASK) == M_NOT)) != EOS)
-				++pat;
-			while (((c = *pat++) & M_MASK) != M_END)
-				if ((*pat & M_MASK) == M_RNG) {
-					if (c <= k && k <= pat[1])
-						ok = 1;
-					pat += 2;
-				} else if (c == k)
-					ok = 1;
-			if (ok == negate_range)
-				return 0;
-			break;
-		default:
-			if (*name++ != c)
-				return 0;
-			break;
-		}
-	}
-	return *name == EOS;
-}
-
-/* Free allocated data belonging to a glob_t structure. */
-void
-globfree(glob_t *pglob)
-{
-	size_t i;
-	char **pp;
-
-	_DIAGASSERT(pglob != NULL);
-
-	if (pglob->gl_pathv != NULL) {
-		pp = pglob->gl_pathv + pglob->gl_offs;
-		for (i = pglob->gl_pathc; i--; ++pp)
-			if (*pp)
-				free(*pp);
-		free(pglob->gl_pathv);
-		pglob->gl_pathv = NULL;
-		pglob->gl_pathc = 0;
-	}
-}
-
-#ifndef __LIBC12_SOURCE__
-int
-glob_pattern_p(const char *pattern, int quote)
-{
-	int range = 0;
-
-	for (; *pattern; pattern++)
-		switch (*pattern) {
-		case QUESTION:
-		case STAR:
-			return 1;
-
-		case QUOTE:
-			if (quote && pattern[1] != EOS)
-			      ++pattern;
-			break;
-
-		case LBRACKET:
-			range = 1;
-			break;
-
-		case RBRACKET:
-			if (range)
-			      return 1;
-			break;
-		default:
-			break;
-		}
-
-	  return 0;
-}
-#endif
-
-static DIR *
-g_opendir(Char *str, glob_t *pglob)
-{
-	char buf[MAXPATHLEN];
-
-	_DIAGASSERT(str != NULL);
-	_DIAGASSERT(pglob != NULL);
-
-	if (!*str)
-		(void)strlcpy(buf, ".", sizeof(buf));
-	else {
-		if (g_Ctoc(str, buf, sizeof(buf)))
-			return NULL;
-	}
-
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return (*pglob->gl_opendir)(buf);
-
-	return opendir(buf);
-}
-
-static int
-g_lstat(Char *fn, __gl_stat_t *sb, glob_t *pglob)
-{
-	char buf[MAXPATHLEN];
-
-	_DIAGASSERT(fn != NULL);
-	_DIAGASSERT(sb != NULL);
-	_DIAGASSERT(pglob != NULL);
-
-	if (g_Ctoc(fn, buf, sizeof(buf)))
-		return -1;
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return (*pglob->gl_lstat)(buf, sb);
-	return lstat(buf, sb);
-}
-
-static int
-g_stat(Char *fn, __gl_stat_t *sb, glob_t *pglob)
-{
-	char buf[MAXPATHLEN];
-
-	_DIAGASSERT(fn != NULL);
-	_DIAGASSERT(sb != NULL);
-	_DIAGASSERT(pglob != NULL);
-
-	if (g_Ctoc(fn, buf, sizeof(buf)))
-		return -1;
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return (*pglob->gl_stat)(buf, sb);
-	return stat(buf, sb);
-}
-
-static Char *
-g_strchr(const Char *str, int ch)
-{
-
-	_DIAGASSERT(str != NULL);
-
-	do {
-		if (*str == ch)
-			return __UNCONST(str);
-	} while (*str++);
-	return NULL;
-}
-
-static int
-g_Ctoc(const Char *str, char *buf, size_t len)
-{
-	char *dc;
-
-	_DIAGASSERT(str != NULL);
-	_DIAGASSERT(buf != NULL);
-
-	if (len == 0)
-		return 1;
-
-	for (dc = buf; len && (*dc++ = *str++) != EOS; len--)
-		continue;
-
-	return len == 0;
-}
-
-#ifdef DEBUG
-static void 
-qprintf(const char *str, Char *s)
-{
-	Char *p;
-
-	_DIAGASSERT(str != NULL);
-	_DIAGASSERT(s != NULL);
-
-	(void)printf("%s:\n", str);
-	for (p = s; *p; p++)
-		(void)printf("%c", CHAR(*p));
-	(void)printf("\n");
-	for (p = s; *p; p++)
-		(void)printf("%c", *p & M_PROTECT ? '"' : ' ');
-	(void)printf("\n");
-	for (p = s; *p; p++)
-		(void)printf("%c", ismeta(*p) ? '_' : ' ');
-	(void)printf("\n");
-}
-#endif
diff --git a/lib/libc/gen/gr_private.h b/lib/libc/gen/gr_private.h
deleted file mode 100644
index 2532a1754..000000000
--- a/lib/libc/gen/gr_private.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*	$NetBSD: gr_private.h,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004-2005 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Structures and functions used by various group(5) public functions
- * and their back-end implementations.
- * These are subject to change without notice and should not be used
- * outside of libc (even by third-party nss_*.so modules implementing
- * group(5) back-ends).
- */
-
-#define _GROUP_COMPAT	/* "group" defaults to compat, so always provide it */
-
-
-#if defined(__minix) && defined(_REENTRANT)
-	/*
-	 * mutex to serialize the public group(5) functions use of the
-	 * back-end implementations, which may not be reentrant.
-	 */
-extern 	mutex_t		__grmutex;
-#endif /* defined(__minix) */
-
-	/*
-	 * files methods
-	 */
-struct __grstate_files {	/* state shared between files methods */
-	int	 stayopen;	/* see getgroupent(3) */
-	FILE	*fp;		/* groups file handle */
-};
-
-extern int	__grstart_files(struct __grstate_files *);
-extern int	__grend_files(struct __grstate_files *);
-extern int	__grscan_files(int *, struct group *, char *, size_t,
-			struct __grstate_files *, int, const char *, gid_t);
-
-	/*
-	 * dns methods
-	 */
-struct __grstate_dns {		/* state shared between dns methods */
-	int	 stayopen;	/* see getgroupent(3) */
-	void	*context;	/* Hesiod context */
-	int	 num;		/* group index, -1 if no more */
-};
-
-extern int	__grstart_dns(struct __grstate_dns *);
-extern int	__grend_dns(struct __grstate_dns *state);
-extern int	__grscan_dns(int *, struct group *, char *, size_t,
-			struct __grstate_dns *, int, const char *, gid_t);
-
-	/*
-	 * nis methods
-	 */
-struct __grstate_nis {		/* state shared between nis methods */
-	int	 stayopen;	/* see getgroupent(3) */
-	char	*domain;	/* NIS domain */
-	int	 done;		/* non-zero if search exhausted */
-	char	*current;	/* current first/next match */
-	int	 currentlen;	/* length of _nis_current */
-};
-
-extern int	__grstart_nis(struct __grstate_nis *);
-extern int	__grend_nis(struct __grstate_nis *);
-extern int	__grscan_nis(int *, struct group *, char *, size_t,
-			struct __grstate_nis *, int, const char *, gid_t);
-
-	/*
-	 * compat methods
-	 */
-struct __grstate_compat {	/* state shared between compat methods */
-	int	 stayopen;	/* see getgroupent(3) */
-	FILE	*fp;		/* file handle */
-/*
- * XXX:	convert name to a separate compatstate enum and grow name as necessary
- *	instead of using strdup & free for each + line
- */
-	char	*name;		/* NULL if reading file,	*/
-				/*   "" if compat "+",		*/
-				/* name if compat "+name"	*/
-};
-
-extern int	__grbad_compat(void *nsrv, void *nscb, va_list ap);
-extern int	__grstart_compat(struct __grstate_compat *);
-extern int	__grend_compat(struct __grstate_compat *);
-extern int	__grscan_compat(int *, struct group *, char *, size_t,
-			struct __grstate_compat *, int, const char *, gid_t,
-			int (*)(void *, struct group **), void *);
diff --git a/lib/libc/gen/humanize_number.3 b/lib/libc/gen/humanize_number.3
deleted file mode 100644
index b078c3785..000000000
--- a/lib/libc/gen/humanize_number.3
+++ /dev/null
@@ -1,168 +0,0 @@
-.\"	$NetBSD: humanize_number.3,v 1.11 2011/08/20 21:35:32 wiz Exp $
-.\"
-.\" Copyright (c) 1999, 2002, 2008 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Luke Mewburn and by Tomas Svensson.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 14, 2011
-.Dt HUMANIZE_NUMBER 3
-.Os
-.Sh NAME
-.Nm dehumanize_number ,
-.Nm humanize_number
-.Nd format a number into a human readable form and vice versa
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn dehumanize_number "const char *str" "int64_t *result"
-.Ft int
-.Fn humanize_number "char *buffer" "size_t len" "int64_t number" "const char *suffix" "int scale" "int flags"
-.Sh DESCRIPTION
-The
-.Fn humanize_number
-function formats the signed 64 bit quantity given in
-.Fa number
-into
-.Fa buffer .
-A space and then
-.Fa suffix
-is appended to the end.
-.Fa buffer
-must be at least
-.Fa len
-bytes long.
-.Pp
-If the formatted number (including
-.Fa suffix )
-would be too long to fit into
-.Fa buffer ,
-then divide
-.Fa number
-by 1024 until it will.
-In this case, prefix
-.Fa suffix
-with the appropriate SI designator.
-.Pp
-The prefixes are:
-.Bl -column "Prefix" "Description" "Multiplier" -offset indent
-.It Sy "Prefix" Ta Sy "Description" Ta Sy "Multiplier"
-.It k	kilo	1024
-.It M	mega	1048576
-.It G	giga	1073741824
-.It T	tera	1099511627776
-.It P	peta	1125899906842624
-.It E	exa	1152921504606846976
-.El
-.Pp
-.Fa len
-must be at least 4 plus the length of
-.Fa suffix ,
-in order to ensure a useful result is generated into
-.Fa buffer .
-To use a specific prefix, specify this as
-.Fa scale
-(Multiplier = 1024 ^ scale).
-This can not be combined with any of the
-.Fa scale
-flags below.
-.Pp
-The following flags may be passed in
-.Pa scale :
-.Bl -tag -width Dv -offset indent
-.It Dv HN_AUTOSCALE
-Format the buffer using the lowest multiplier possible.
-.It Dv HN_GETSCALE
-Return the prefix index number (the number of times
-.Fa number
-must be divided to fit) instead of formatting it to the buffer.
-.El
-.Pp
-The following flags may be passed in
-.Pa flags :
-.Bl -tag -width Dv -offset indent
-.It Dv HN_DECIMAL
-If the final result is less than 10, display it using one digit.
-.It Dv HN_NOSPACE
-Do not put a space between
-.Fa number
-and the prefix.
-.It Dv HN_B
-Use 'B' (bytes) as prefix if the original result does not have a prefix.
-.It Dv HN_DIVISOR_1000
-Divide
-.Fa number
-with 1000 instead of 1024.
-.El
-.Pp
-The
-.Fn dehumanize_number
-function parses the string representing an integral value given in
-.Fa str
-and stores the numerical value in the integer pointed to by
-.Fa result .
-The provided string may hold one of the suffixes, which will be interpreted
-and used to scale up its accompanying numerical value.
-.Sh RETURN VALUES
-.Fn humanize_number
-returns the number of characters stored in
-.Fa buffer
-(excluding the terminating NUL) upon success, or \-1 upon failure.
-If
-.Dv HN_GETSCALE
-is specified, the prefix index number will be returned instead.
-.Pp
-.Fn dehumanize_number
-returns 0 if the string was parsed correctly.
-A \-1 is returned to indicate failure and an error code is stored in
-.Va errno .
-.Sh ERRORS
-.Fn dehumanize_number
-will fail and no number will be stored in
-.Fa result
-if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The string in
-.Fa str
-was empty or carried an unknown suffix.
-.It Bq Er ERANGE
-The string in
-.Fa str
-represented a number that does not fit in
-.Fa result .
-.El
-.Sh SEE ALSO
-.Xr strsuftoll 3 ,
-.Xr orders 7 ,
-.Xr humanize_number 9
-.Sh HISTORY
-.Fn humanize_number
-first appeared in
-.Nx 2.0 .
-.Pp
-.Fn dehumanize_number
-first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/gen/humanize_number.c b/lib/libc/gen/humanize_number.c
deleted file mode 100644
index 533560f31..000000000
--- a/lib/libc/gen/humanize_number.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*	$NetBSD: humanize_number.c,v 1.16 2012/03/17 20:01:14 christos Exp $	*/
-
-/*
- * Copyright (c) 1997, 1998, 1999, 2002 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, by Luke Mewburn and by Tomas Svensson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: humanize_number.c,v 1.16 2012/03/17 20:01:14 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <locale.h>
-
-int
-humanize_number(char *buf, size_t len, int64_t bytes,
-    const char *suffix, int scale, int flags)
-{
-	const char *prefixes, *sep;
-	int	b, r, s1, s2, sign;
-	int64_t	divisor, max, post = 1;
-	size_t	i, baselen, maxscale;
-
-	_DIAGASSERT(buf != NULL);
-	_DIAGASSERT(suffix != NULL);
-	_DIAGASSERT(scale >= 0);
-
-	if (flags & HN_DIVISOR_1000) {
-		/* SI for decimal multiplies */
-		divisor = 1000;
-		if (flags & HN_B)
-			prefixes = "B\0k\0M\0G\0T\0P\0E";
-		else
-			prefixes = "\0\0k\0M\0G\0T\0P\0E";
-	} else {
-		/*
-		 * binary multiplies
-		 * XXX IEC 60027-2 recommends Ki, Mi, Gi...
-		 */
-		divisor = 1024;
-		if (flags & HN_B)
-			prefixes = "B\0K\0M\0G\0T\0P\0E";
-		else
-			prefixes = "\0\0K\0M\0G\0T\0P\0E";
-	}
-
-#define	SCALE2PREFIX(scale)	(&prefixes[(scale) << 1])
-	maxscale = 7;
-
-	if ((size_t)scale >= maxscale &&
-	    (scale & (HN_AUTOSCALE | HN_GETSCALE)) == 0)
-		return (-1);
-
-	if (buf == NULL || suffix == NULL)
-		return (-1);
-
-	if (len > 0)
-		buf[0] = '\0';
-	if (bytes < 0) {
-		sign = -1;
-		baselen = 3;		/* sign, digit, prefix */
-		if (-bytes < INT64_MAX / 100)
-			bytes *= -100;
-		else {
-			bytes = -bytes;
-			post = 100;
-			baselen += 2;
-		}
-	} else {
-		sign = 1;
-		baselen = 2;		/* digit, prefix */
-		if (bytes < INT64_MAX / 100)
-			bytes *= 100;
-		else {
-			post = 100;
-			baselen += 2;
-		}
-	}
-	if (flags & HN_NOSPACE)
-		sep = "";
-	else {
-		sep = " ";
-		baselen++;
-	}
-	baselen += strlen(suffix);
-
-	/* Check if enough room for `x y' + suffix + `\0' */
-	if (len < baselen + 1)
-		return (-1);
-
-	if (scale & (HN_AUTOSCALE | HN_GETSCALE)) {
-		/* See if there is additional columns can be used. */
-		for (max = 100, i = len - baselen; i-- > 0;)
-			max *= 10;
-
-		/*
-		 * Divide the number until it fits the given column.
-		 * If there will be an overflow by the rounding below,
-		 * divide once more.
-		 */
-		for (i = 0; bytes >= max - 50 && i < maxscale; i++)
-			bytes /= divisor;
-
-		if (scale & HN_GETSCALE) {
-			_DIAGASSERT(__type_fit(int, i));
-			return (int)i;
-		}
-	} else
-		for (i = 0; i < (size_t)scale && i < maxscale; i++)
-			bytes /= divisor;
-	bytes *= post;
-
-	/* If a value <= 9.9 after rounding and ... */
-	if (bytes < 995 && i > 0 && flags & HN_DECIMAL) {
-		/* baselen + \0 + .N */
-		if (len < baselen + 1 + 2)
-			return (-1);
-		b = ((int)bytes + 5) / 10;
-		s1 = b / 10;
-		s2 = b % 10;
-		r = snprintf(buf, len, "%d%s%d%s%s%s",
-		    sign * s1, localeconv()->decimal_point, s2,
-		    sep, SCALE2PREFIX(i), suffix);
-	} else
-		r = snprintf(buf, len, "%" PRId64 "%s%s%s",
-		    sign * ((bytes + 50) / 100),
-		    sep, SCALE2PREFIX(i), suffix);
-
-	return (r);
-}
diff --git a/lib/libc/gen/infinity_ieee754.c b/lib/libc/gen/infinity_ieee754.c
deleted file mode 100644
index 56a540c69..000000000
--- a/lib/libc/gen/infinity_ieee754.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*	$NetBSD: infinity_ieee754.c,v 1.3 2005/06/12 05:21:27 lukem Exp $	*/
-
-/*
- * IEEE-compatible infinity.c -- public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: infinity_ieee754.c,v 1.3 2005/06/12 05:21:27 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-const union __double_u __infinity =
-#if BYTE_ORDER == BIG_ENDIAN
-	{ { 0x7f, 0xf0, 0, 0, 0, 0,    0,    0 } };
-#else
-	{ {    0,    0, 0, 0, 0, 0, 0xf0, 0x7f } };
-#endif
diff --git a/lib/libc/gen/infinityf_ieee754.c b/lib/libc/gen/infinityf_ieee754.c
deleted file mode 100644
index fedbcf36d..000000000
--- a/lib/libc/gen/infinityf_ieee754.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*	$NetBSD: infinityf_ieee754.c,v 1.2 2005/06/12 05:21:27 lukem Exp $	*/
-
-/*
- * IEEE-compatible infinityf.c -- public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: infinityf_ieee754.c,v 1.2 2005/06/12 05:21:27 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-
-const union __float_u __infinityf =
-#if BYTE_ORDER == BIG_ENDIAN
-	{ { 0x7f, 0x80,     0,    0 } };
-#else
-	{ {    0,    0,  0x80, 0x7f } };
-#endif
diff --git a/lib/libc/gen/infinityl_dbl_ieee754.c b/lib/libc/gen/infinityl_dbl_ieee754.c
deleted file mode 100644
index 3b77bdfe8..000000000
--- a/lib/libc/gen/infinityl_dbl_ieee754.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*	$NetBSD: infinityl_dbl_ieee754.c,v 1.1 2003/10/25 22:31:20 kleink Exp $	*/
-
-/*
- * IEEE-compatible infinityl.c -- public domain.
- * For platforms where long double == double.
- */
-
-#include <float.h>
-#include <math.h>
-#include <machine/endian.h>
-
-#if LDBL_MANT_DIG != DBL_MANT_DIG
-#error double / long double mismatch
-#endif
-
-const union __long_double_u __infinityl =
-#if BYTE_ORDER == BIG_ENDIAN
-	{ { 0x7f, 0xf0, 0, 0, 0, 0,    0,    0 } };
-#else
-	{ {    0,    0, 0, 0, 0, 0, 0xf0, 0x7f } };
-#endif
diff --git a/lib/libc/gen/infinityl_ieee754.c b/lib/libc/gen/infinityl_ieee754.c
deleted file mode 100644
index 7506faac0..000000000
--- a/lib/libc/gen/infinityl_ieee754.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*	$NetBSD: infinityl_ieee754.c,v 1.1 2011/01/17 23:53:03 matt Exp $	*/
-
-/*
- * IEEE-compatible infinityl.c for 64-bit or 128-bit long double format.
- * This is public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: infinityl_ieee754.c,v 1.1 2011/01/17 23:53:03 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-#include <machine/endian.h>
-#include <machine/ieee.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-#define	LDBL_EXPBITS		EXT_EXPBITS
-#define	LDBL_EXP_INFNAN		EXT_EXP_INFNAN
-#else
-#define	LDBL_EXPBITS		DBL_EXPBITS
-#define	LDBL_EXP_INFNAN		DBL_EXP_INFNAN
-#endif
-
-#define	EXP_INFNAN		(LDBL_EXP_INFNAN << (31 - LDBL_EXPBITS))
-
-const union __long_double_u __infinityl = { {
-#if BYTE_ORDER == BIG_ENDIAN
-	[0] = (EXP_INFNAN >> 24) & 0x7f,
-	[1] = (EXP_INFNAN >> 16) & 0xff,
-	[2] = (EXP_INFNAN >>  8) & 0xff,
-	[3] = (EXP_INFNAN >>  0) & 0xff,
-#else
-	[sizeof(long double)-4] = (EXP_INFNAN >>  0) & 0xff,
-	[sizeof(long double)-3] = (EXP_INFNAN >>  8) & 0xff,
-	[sizeof(long double)-2] = (EXP_INFNAN >> 16) & 0xff,
-	[sizeof(long double)-1] = (EXP_INFNAN >> 24) & 0x7f,
-#endif
-} };
diff --git a/lib/libc/gen/initdir.c b/lib/libc/gen/initdir.c
deleted file mode 100644
index a0623e5e1..000000000
--- a/lib/libc/gen/initdir.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*	$NetBSD: initdir.c,v 1.3 2012/03/13 21:13:36 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: initdir.c,v 1.3 2012/03/13 21:13:36 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include "extern.h"
-
-#include <sys/param.h>
-
-#include <assert.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "dirent_private.h"
-
-#define	MAXITERATIONS	100
-
-int
-_initdir(DIR *dirp, int fd, const char *name)
-{
-	int flags = dirp->dd_flags;
-	int pagesz;
-	int incr;
-
-	/*
-	 * If the machine's page size is an exact multiple of DIRBLKSIZ,
-	 * use a buffer that is cluster boundary aligned.
-	 * Hopefully this can be a big win someday by allowing page trades
-	 * to user space to be done by getdents()
-	 */
-	if (((pagesz = getpagesize()) % DIRBLKSIZ) == 0)
-		incr = pagesz;
-	else
-		incr = DIRBLKSIZ;
-
-	if ((flags & DTF_REWIND) && name == NULL) {
-		return EINVAL;
-	}
-	if ((flags & __DTF_READALL) != 0) {
-		size_t len;
-		size_t space;
-		char *buf, *nbuf;
-		char *ddptr;
-		char *ddeptr;
-		int n;
-		struct dirent **dpv;
-		int i;
-
-		/*
-		 * The strategy here for directories on top of a union stack
-		 * is to read all the directory entries into a buffer, sort
-		 * the buffer, and remove duplicate entries by setting the
-		 * inode number to zero.
-		 *
-		 * For directories on an NFS mounted filesystem, we try
-	 	 * to get a consistent snapshot by trying until we have
-		 * successfully read all of the directory without errors
-		 * (i.e. 'bad cookie' errors from the server because
-		 * the directory was modified). These errors should not
-		 * happen often, but need to be dealt with.
-		 */
-		i = 0;
-retry:
-		len = 0;
-		space = 0;
-		buf = 0;
-		ddptr = 0;
-
-		do {
-			/*
-			 * Always make at least DIRBLKSIZ bytes
-			 * available to getdents
-			 */
-			if (space < DIRBLKSIZ) {
-				space += incr;
-				len += incr;
-				nbuf = realloc(buf, len);
-				if (nbuf == NULL) {
-					dirp->dd_buf = buf;
-					return errno;
-				}
-				buf = nbuf;
-				ddptr = buf + (len - space);
-			}
-
-			dirp->dd_seek = lseek(fd, (off_t)0, SEEK_CUR);
-			n = getdents(fd, ddptr, space);
-			/*
-			 * For NFS: EINVAL means a bad cookie error
-			 * from the server. Keep trying to get a
-			 * consistent view, in this case this means
-			 * starting all over again.
-			 */
-			if (n == -1 && errno == EINVAL &&
-			    (flags & __DTF_RETRY_ON_BADCOOKIE) != 0) {
-				free(buf);
-				lseek(fd, (off_t)0, SEEK_SET);
-				if (++i > MAXITERATIONS)
-					return EINVAL;
-				goto retry;
-			}
-			if (n > 0) {
-				ddptr += n;
-				space -= n;
-			}
-		} while (n > 0);
-
-		ddeptr = ddptr;
-
-		/*
-		 * Re-open the directory.
-		 * This has the effect of rewinding back to the
-		 * top of the union stack and is needed by
-		 * programs which plan to fchdir to a descriptor
-		 * which has also been read -- see fts.c.
-		 */
-		if (flags & DTF_REWIND) {
-			(void) close(fd);
-			if ((fd = open(name, O_RDONLY | O_CLOEXEC)) == -1) {
-				dirp->dd_buf = buf;
-				return errno;
-			}
-		}
-
-		/*
-		 * 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.
-		 */
-		if ((flags & DTF_NODUP) != 0) {
-			for (dpv = 0;;) {
-				for (n = 0, ddptr = buf; ddptr < ddeptr;) {
-					struct dirent *dp;
-
-					dp = (struct dirent *)(void *)ddptr;
-					if ((long)dp & _DIRENT_ALIGN(dp))
-						break;
-					/*
-					 * d_reclen is unsigned,
-					 * so no need to compare <= 0
-					 */
-					if (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, (size_t)n, sizeof(*dpv),
-					    alphasort);
-
-					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 !defined(__minix)
-						if (dp->d_type == DT_WHT &&
-						    (flags & DTF_HIDEW))
-							dp->d_fileno = 0;
-#endif /* !defined(__minix) */
-					}
-
-					free(dpv);
-					break;
-				} else {
-					dpv = malloc((n + 1) *
-					    sizeof(struct dirent *));
-					if (dpv == NULL)
-						break;
-				}
-			}
-		}
-
-		_DIAGASSERT(__type_fit(int, len));
-		dirp->dd_len = (int)len;
-		dirp->dd_size = ddptr - dirp->dd_buf;
-	} else {
-		dirp->dd_len = incr;
-		dirp->dd_buf = malloc((size_t)dirp->dd_len);
-		if (dirp->dd_buf == NULL)
-			return errno;
-		dirp->dd_seek = 0;
-		flags &= ~DTF_REWIND;
-	}
-	dirp->dd_loc = 0;
-	dirp->dd_fd = fd;
-	dirp->dd_flags = flags;
-	/*
-	 * Set up seek point for rewinddir.
-	 */
-	(void)_telldir_unlocked(dirp);
-	return 0;
-}
-
-void
-_finidir(DIR *dirp)
-{
-	struct dirpos *poslist;
-
-	free(dirp->dd_buf);
-
-	/* free seekdir/telldir storage */
-	for (poslist = dirp->dd_internal; poslist; ) {
-		struct dirpos *nextpos = poslist->dp_next;
-		free(poslist);
-		poslist = nextpos;
-	}
-	dirp->dd_internal = NULL;
-}
diff --git a/lib/libc/gen/initgroups.3 b/lib/libc/gen/initgroups.3
deleted file mode 100644
index 56e52a4f1..000000000
--- a/lib/libc/gen/initgroups.3
+++ /dev/null
@@ -1,91 +0,0 @@
-.\"	$NetBSD: initgroups.3,v 1.15 2003/08/07 16:42:51 agc Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)initgroups.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd August 10, 2002
-.Dt INITGROUPS 3
-.Os
-.Sh NAME
-.Nm initgroups
-.Nd initialize supplementary group IDs
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn initgroups "const char *name" "gid_t basegid"
-.Sh DESCRIPTION
-The
-.Fn initgroups
-function
-uses the
-.Xr getgrouplist 3
-function to calculate the supplementary group IDs for the user
-specified in
-.Fa name .
-This group list is then set up for the current process using
-.Xr setgroups 2 .
-The
-.Fa basegid
-is automatically included in the group list.
-Typically this value is given as
-the group number from the password file.
-.Pp
-If the groups database lists more than
-.Ev NGROUPS
-groups for
-.Fa name
-(including one for
-.Fa basegid ) ,
-the later groups are ignored.
-.Sh RETURN VALUES
-The
-.Fn initgroups
-function
-returns \-1 if it was not invoked by the super-user.
-.Sh SEE ALSO
-.Xr setgroups 2 ,
-.Xr getgrouplist 3
-.Sh HISTORY
-The
-.Fn initgroups
-function appeared in
-.Bx 4.2 .
-.Sh BUGS
-The
-.Fn getgrouplist
-function called by
-.Fn initgroups
-uses the routines based on
-.Xr getgrent 3 .
-If the invoking program uses any of these routines,
-the group structure will
-be overwritten in the call to
-.Fn initgroups .
diff --git a/lib/libc/gen/initgroups.c b/lib/libc/gen/initgroups.c
deleted file mode 100644
index 86c6f4ef3..000000000
--- a/lib/libc/gen/initgroups.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: initgroups.c,v 1.22 2012/06/25 22:32:43 abs Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)initgroups.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: initgroups.c,v 1.22 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#ifdef __weak_alias
-__weak_alias(initgroups,_initgroups)
-#endif
-
-int
-initgroups(const char *uname, gid_t agroup)
-{
-	gid_t groups_list[NGROUPS];
-	int ngroups;
-	gid_t *groups = groups_list;
-	int rval;
-
-	_DIAGASSERT(uname != NULL);
-
-	ngroups = NGROUPS;
-	if (getgrouplist(uname, agroup, groups, &ngroups) == -1) {
-		int maxgroups = ngroups;
-		groups = calloc((size_t)maxgroups, sizeof *groups);
-		if (groups == NULL)
-			return -1;
-		if (getgrouplist(uname, agroup, groups, &ngroups) == -1)
-			ngroups = maxgroups;
-	}
-	rval = setgroups(ngroups, groups);
-	if (rval == -1 && errno == EINVAL) {
-		int ng = (int)sysconf(_SC_NGROUPS_MAX);
-		if (ng > 0 && ng < ngroups)
-			rval = setgroups(ng, groups);
-	}
-	if (groups != groups_list)
-		free(groups);
-	return rval;
-}
diff --git a/lib/libc/gen/isalnum.3 b/lib/libc/gen/isalnum.3
deleted file mode 100644
index 53d6ec08f..000000000
--- a/lib/libc/gen/isalnum.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\"	$NetBSD: isalnum.3,v 1.15 2008/04/17 16:25:36 apb Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)isalnum.3	5.2 (Berkeley) 6/29/91
-.\"
-.Dd April 17, 2008
-.Dt ISALNUM 3
-.Os
-.Sh NAME
-.Nm isalnum
-.Nd alphanumeric character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isalnum "int c"
-.Sh DESCRIPTION
-The
-.Fn isalnum
-function tests for any character for which
-.Xr isalpha 3
-or
-.Xr isdigit 3
-is true.
-.Sh RETURN VALUES
-The
-.Fn isalnum
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isalnum
-function conforms to
-.St -ansiC .
-.Sh CAVEATS
-The argument to
-.Fn isalnum
-must be
-.Dv EOF
-or representable as an
-.Vt unsigned char ;
-otherwise, the behavior is undefined.
-See the
-.Sx CAVEATS
-section of
-.Xr ctype 3
-for more details.
diff --git a/lib/libc/gen/isalpha.3 b/lib/libc/gen/isalpha.3
deleted file mode 100644
index 51c9022ae..000000000
--- a/lib/libc/gen/isalpha.3
+++ /dev/null
@@ -1,114 +0,0 @@
-.\"	$NetBSD: isalpha.3,v 1.14 2008/04/17 16:25:36 apb Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)isalpha.3	5.2 (Berkeley) 6/29/91
-.\"
-.Dd April 17, 2008
-.Dt ISALPHA 3
-.Os
-.Sh NAME
-.Nm isalpha
-.Nd alphabetic character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isalpha "int c"
-.Sh DESCRIPTION
-The
-.Fn isalpha
-function tests for any character for which
-.Xr isupper 3
-or
-.Xr islower 3
-is true and
-.\" , or any of an implementation-defined set of characters
-for which none of
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr ispunct 3 ,
-or
-.Xr isspace 3
-is true.
-In the
-.Em ``C''
-locale,
-.Fn isalpha
-returns true only for the characters for which
-.Xr isupper 3
-or
-.Xr islower 3
-is true.
-.Sh RETURN VALUES
-The
-.Fn isalpha
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isascii 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isalpha
-function conforms to
-.St -ansiC .
-.Sh CAVEATS
-The argument to
-.Fn isalpha
-must be
-.Dv EOF
-or representable as an
-.Vt unsigned char ;
-otherwise, the behavior is undefined.
-See the
-.Sx CAVEATS
-section of
-.Xr ctype 3
-for more details.
diff --git a/lib/libc/gen/isascii.3 b/lib/libc/gen/isascii.3
deleted file mode 100644
index ecb5830dc..000000000
--- a/lib/libc/gen/isascii.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"	$NetBSD: isascii.3,v 1.18 2010/04/30 04:46:18 jruoho Exp $
-.\"
-.\" Copyright (c) 1989, 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     @(#)isascii.3	5.1 (Berkeley) 5/2/91
-.\"
-.Dd April 30, 2010
-.Dt ISASCII 3
-.Os
-.Sh NAME
-.Nm isascii
-.Nd test for ASCII character
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isascii "int c"
-.Sh DESCRIPTION
-The
-.Fn isascii
-function tests for an
-.Tn ASCII
-character, which is any character with a value in the
-range from 0 to 127, inclusive.
-.Pp
-The
-.Fn isascii
-is defined on all integer values.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isascii
-function conforms to
-.St -xpg4
-and
-.St -p1003.1-2001 .
-The
-.St -p1003.1-2008
-revision however marked it as obsolete, noting that
-.Fn isascii
-cannot be used portably in a localized application.
diff --git a/lib/libc/gen/isascii.c b/lib/libc/gen/isascii.c
deleted file mode 100644
index d5fff2d03..000000000
--- a/lib/libc/gen/isascii.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: isascii.c,v 1.4 2012/06/25 22:32:43 abs Exp $	*/
-
-/*
- * Copyright (c) 1989 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.
- *
- * 	from:	@(#)isctype.c	5.2 (Berkeley) 6/1/90
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: isascii.c,v 1.4 2012/06/25 22:32:43 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define _CTYPE_NOINLINE
-#include <ctype.h>
-
-int
-isascii(int c)
-{
-	return ((unsigned)(c) <= 0177);
-}
diff --git a/lib/libc/gen/isatty.c b/lib/libc/gen/isatty.c
deleted file mode 100644
index e7191966c..000000000
--- a/lib/libc/gen/isatty.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: isatty.c,v 1.13 2012/06/25 22:32:43 abs 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isatty.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isatty.c,v 1.13 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <termios.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(isatty,_isatty)
-#endif
-
-int
-isatty(int fd)
-{
-	struct termios t;
-
-	return(tcgetattr(fd, &t) != -1);
-}
diff --git a/lib/libc/gen/isblank.3 b/lib/libc/gen/isblank.3
deleted file mode 100644
index 59a5ca167..000000000
--- a/lib/libc/gen/isblank.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\"	$NetBSD: isblank.3,v 1.13 2008/04/17 16:25:36 apb Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)isspace.3	5.3 (Berkeley) 7/31/91
-.\"
-.Dd April 17, 2008
-.Dt ISBLANK 3
-.Os
-.Sh NAME
-.Nm isblank
-.Nd blank-space character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isblank "int c"
-.Sh DESCRIPTION
-The
-.Fn isblank
-function tests for the standard blank-space characters.
-The standard blank-space characters are the following:
-.Pp
-.Bl -tag -width xxxxx -offset indent -compact
-.It Sq \0
-Space character.
-.It Li \et
-Horizontal tab.
-.El
-.Pp
-In the
-.Em ``C''
-locale,
-.Fn isblank
-returns true only for the standard blank-space characters.
-.Sh RETURN VALUES
-The
-.Fn isblank
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh CAVEATS
-The argument to
-.Fn isblank
-must be
-.Dv EOF
-or representable as an
-.Vt unsigned char ;
-otherwise, the behavior is undefined.
-See the
-.Sx CAVEATS
-section of
-.Xr ctype 3
-for more details.
diff --git a/lib/libc/gen/iscntrl.3 b/lib/libc/gen/iscntrl.3
deleted file mode 100644
index efea8f8b8..000000000
--- a/lib/libc/gen/iscntrl.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\"	$NetBSD: iscntrl.3,v 1.13 2008/04/17 16:25:36 apb Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)iscntrl.3	5.2 (Berkeley) 6/29/91
-.\"
-.Dd April 17, 2008
-.Dt ISCNTRL 3
-.Os
-.Sh NAME
-.Nm iscntrl
-.Nd control character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn iscntrl "int c"
-.Sh DESCRIPTION
-The
-.Fn iscntrl
-function tests for any control character.
-.Sh RETURN VALUES
-The
-.Fn iscntrl
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr isblank 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn iscntrl
-function conforms to
-.St -ansiC .
-.Sh CAVEATS
-The argument to
-.Fn iscntrl
-must be
-.Dv EOF
-or representable as an
-.Vt unsigned char ;
-otherwise, the behavior is undefined.
-See the
-.Sx CAVEATS
-section of
-.Xr ctype 3
-for more details.
diff --git a/lib/libc/gen/isctype.c b/lib/libc/gen/isctype.c
deleted file mode 100644
index b0b8ba4d8..000000000
--- a/lib/libc/gen/isctype.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* $NetBSD: isctype.c,v 1.25 2013/08/19 22:43:28 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: isctype.c,v 1.25 2013/08/19 22:43:28 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/ctype_bits.h>
-#define _CTYPE_NOINLINE
-#include <ctype.h>
-#include <langinfo.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include <stdio.h>
-#if EOF != -1
-#error "EOF != -1"
-#endif
-
-#include "runetype_local.h"
-#include "setlocale_local.h"
-
-#define _RUNE_LOCALE(loc) \
-    ((_RuneLocale *)((loc)->part_impl[(size_t)LC_CTYPE]))
-
-#define _ISCTYPE_FUNC(name, bit) \
-int \
-is##name(int c) \
-{ \
-	return (int)_ctype_tab_[c + 1] & (bit); \
-} \
-int \
-is##name ## _l(int c, locale_t loc) \
-{ \
-	return (int)((_RUNE_LOCALE(loc)->rl_ctype_tab[c + 1]) & (bit)); \
-}
-
-_ISCTYPE_FUNC(alnum, (_CTYPE_A|_CTYPE_D))
-_ISCTYPE_FUNC(alpha,  _CTYPE_A)
-_ISCTYPE_FUNC(blank,  _CTYPE_BL)
-_ISCTYPE_FUNC(cntrl,  _CTYPE_C            )
-_ISCTYPE_FUNC(digit,  _CTYPE_D)
-_ISCTYPE_FUNC(graph,  _CTYPE_G)
-_ISCTYPE_FUNC(lower,  _CTYPE_L            )
-_ISCTYPE_FUNC(print,  _CTYPE_R)
-_ISCTYPE_FUNC(punct,  _CTYPE_P            )
-_ISCTYPE_FUNC(space,  _CTYPE_S            )
-_ISCTYPE_FUNC(upper,  _CTYPE_U            )
-_ISCTYPE_FUNC(xdigit, _CTYPE_X)
-
-int
-toupper(int c)
-{
-	return (int)_toupper_tab_[c + 1];
-}
-
-int
-toupper_l(int c, locale_t loc)
-{
-	return (int)(_RUNE_LOCALE(loc)->rl_toupper_tab[c + 1]);
-}
-
-int
-tolower(int c)
-{
-	return (int)_tolower_tab_[c + 1];
-}
-
-int
-tolower_l(int c, locale_t loc)
-{
-	return (int)(_RUNE_LOCALE(loc)->rl_tolower_tab[c + 1]);
-}
-
-int
-_toupper(int c)
-{
-	return (c - 'a' + 'A');
-}
-
-int
-_tolower(int c)
-{
-	return (c - 'A' + 'a');
-}
diff --git a/lib/libc/gen/isdigit.3 b/lib/libc/gen/isdigit.3
deleted file mode 100644
index 80e297c37..000000000
--- a/lib/libc/gen/isdigit.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\"	$NetBSD: isdigit.3,v 1.14 2008/04/17 16:25:36 apb Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)isdigit.3	5.2 (Berkeley) 6/29/91
-.\"
-.Dd April 17, 2008
-.Dt ISDIGIT 3
-.Os
-.Sh NAME
-.Nm isdigit
-.Nd decimal-digit character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isdigit "int c"
-.Sh DESCRIPTION
-The
-.Fn isdigit
-function tests for any decimal-digit character.
-.Sh RETURN VALUES
-The
-.Fn isdigit
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isdigit
-function conforms to
-.St -ansiC .
-.Sh CAVEATS
-The argument to
-.Fn isdigit
-must be
-.Dv EOF
-or representable as an
-.Vt unsigned char ;
-otherwise, the behavior is undefined.
-See the
-.Sx CAVEATS
-section of
-.Xr ctype 3
-for more details.
diff --git a/lib/libc/gen/isfinite.3 b/lib/libc/gen/isfinite.3
deleted file mode 100644
index dd7eb1bae..000000000
--- a/lib/libc/gen/isfinite.3
+++ /dev/null
@@ -1,78 +0,0 @@
-.\"	$NetBSD: isfinite.3,v 1.4 2011/08/06 11:02:41 jruoho Exp $
-.\"
-.\" Copyright (c) 2003 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.
-.\"
-.Dd August 6, 2011
-.Dt ISFINITE 3
-.Os
-.Sh NAME
-.Nm isfinite
-.Nd test for finite value
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In math.h
-.Ft int
-.Fn isfinite "real-floating x"
-.Sh DESCRIPTION
-The
-.Fn isfinite
-determines whether its argument
-.Fa x
-has a finite value.
-An argument represented in a format wider than its semantic type is
-converted to its semantic type first.
-The determination is then based on the type of the argument.
-.Ss IEEE 754
-It is determined whether the value of
-.Fa x
-is zero, subnormal, or normal, and neither infinite nor NaN.
-.Ss VAX
-It is determined whether the value of
-.Fa x
-is true zero or finite, and neither dirty zero nor ROP.
-.Sh RETURN VALUES
-The
-.Fn isfinite
-macro returns a non-zero value if the value of
-.Fa x
-is finite.
-Otherwise 0 is returned.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr finite 3 ,
-.Xr fpclassify 3 ,
-.Xr isnormal 3 ,
-.Xr math 3 ,
-.Xr signbit 3
-.Sh STANDARDS
-The
-.Fn isfinite
-macro conforms to
-.St -isoC-99 .
diff --git a/lib/libc/gen/isfinited_ieee754.c b/lib/libc/gen/isfinited_ieee754.c
deleted file mode 100644
index 7cdf6eb78..000000000
--- a/lib/libc/gen/isfinited_ieee754.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: isfinited_ieee754.c,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: isfinited_ieee754.c,v 1.2 2008/04/28 20:22:59 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.2 isfinite - determine whether an argument has finite value
- *          IEEE 754 double-precision version
- */
-int
-__isfinited(double x)
-{
-	union ieee_double_u u;
-
-	u.dblu_d = x;
-
-	if (u.dblu_dbl.dbl_exp == DBL_EXP_INFNAN)
-		return 0;
-
-	return 1;
-}
diff --git a/lib/libc/gen/isfinitef_ieee754.c b/lib/libc/gen/isfinitef_ieee754.c
deleted file mode 100644
index 6014fb723..000000000
--- a/lib/libc/gen/isfinitef_ieee754.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: isfinitef_ieee754.c,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: isfinitef_ieee754.c,v 1.2 2008/04/28 20:22:59 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.2 isfinite - determine whether an argument has finite value
- *          IEEE 754 single-precision version
- */
-int
-__isfinitef(float x)
-{
-	union ieee_single_u u;
-
-	u.sngu_f = x;
-
-	if (u.sngu_sng.sng_exp == SNG_EXP_INFNAN)
-		return 0;
-
-	return 1;
-}
diff --git a/lib/libc/gen/isfinitel_ieee754.c b/lib/libc/gen/isfinitel_ieee754.c
deleted file mode 100644
index d95bfb4c6..000000000
--- a/lib/libc/gen/isfinitel_ieee754.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: isfinitel_ieee754.c,v 1.1 2011/01/17 23:53:03 matt Exp $	*/
-
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: isfinitel_ieee754.c,v 1.1 2011/01/17 23:53:03 matt Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-/*
- * 7.12.3.2 isfinite - determine whether an argument has finite value
- *          IEEE 754 compatible 128-bit extended-precision version
- */
-int
-__isfinitel(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	if (u.extu_ext.ext_exp == EXT_EXP_INFNAN)
-		return 0;
-
-	return 1;
-}
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libc/gen/isgraph.3 b/lib/libc/gen/isgraph.3
deleted file mode 100644
index 083e82c4b..000000000
--- a/lib/libc/gen/isgraph.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\"	$NetBSD: isgraph.3,v 1.14 2008/04/17 16:25:36 apb Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)isgraph.3	5.2 (Berkeley) 6/29/91
-.\"
-.Dd April 17, 2008
-.Dt ISGRAPH 3
-.Os
-.Sh NAME
-.Nm isgraph
-.Nd printing character test (space character exclusive)
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isgraph "int c"
-.Sh DESCRIPTION
-The
-.Fn isgraph
-function tests for any printing character except space ('\ ').
-.Sh RETURN VALUES
-The
-.Fn isgraph
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isgraph
-function conforms to
-.St -ansiC .
-.Sh CAVEATS
-The argument to
-.Fn isgraph
-must be
-.Dv EOF
-or representable as an
-.Vt unsigned char ;
-otherwise, the behavior is undefined.
-See the
-.Sx CAVEATS
-section of
-.Xr ctype 3
-for more details.
diff --git a/lib/libc/gen/isgreater.3 b/lib/libc/gen/isgreater.3
deleted file mode 100644
index e6fed54a4..000000000
--- a/lib/libc/gen/isgreater.3
+++ /dev/null
@@ -1,104 +0,0 @@
-.\" $NetBSD: isgreater.3,v 1.1 2007/02/22 22:08:20 drochner Exp $
-.\"
-.\" Copyright (c) 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: /repoman/r/ncvs/src/lib/libc/gen/isgreater.3,v 1.3 2005/02/06 03:23:31 das Exp
-.\"
-.Dd February 12, 2003
-.Dt ISGREATER 3
-.Os
-.Sh NAME
-.Nm isgreater , isgreaterequal , isless , islessequal ,
-.Nm islessgreater , isunordered
-.Nd "compare two floating-point numbers"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In math.h
-.Ft int
-.Fn isgreater "real-floating x" "real-floating y"
-.Ft int
-.Fn isgreaterequal "real-floating x" "real-floating y"
-.Ft int
-.Fn isless "real-floating x" "real-floating y"
-.Ft int
-.Fn islessequal "real-floating x" "real-floating y"
-.Ft int
-.Fn islessgreater "real-floating x" "real-floating y"
-.Ft int
-.Fn isunordered "real-floating x" "real-floating y"
-.Sh DESCRIPTION
-Each of the macros
-.Fn isgreater ,
-.Fn isgreaterequal ,
-.Fn isless ,
-.Fn islessequal ,
-and
-.Fn islessgreater
-take arguments
-.Fa x
-and
-.Fa y
-and return a non-zero value if and only if its nominal
-relation on
-.Fa x
-and
-.Fa y
-is true.
-These macros always return zero if either
-argument is not a number (NaN), but unlike the corresponding C
-operators, they never raise a floating point exception.
-.Pp
-The
-.Fn isunordered
-macro takes arguments
-.Fa x
-and
-.Fa y
-and returns non-zero if and only if neither
-.Fa x
-nor
-.Fa y
-are NaNs.
-For any pair of floating-point values, one
-of the relationships (less, greater, equal, unordered) holds.
-.Sh SEE ALSO
-.Xr fpclassify 3 ,
-.Xr math 3 ,
-.Xr signbit 3
-.Sh STANDARDS
-The
-.Fn isgreater ,
-.Fn isgreaterequal ,
-.Fn isless ,
-.Fn islessequal ,
-.Fn islessgreater ,
-and
-.Fn isunordered
-macros conform to
-.St -isoC-99 .
-.Sh HISTORY
-The relational macros described above first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/gen/isinf.3 b/lib/libc/gen/isinf.3
deleted file mode 100644
index 713e0ca70..000000000
--- a/lib/libc/gen/isinf.3
+++ /dev/null
@@ -1,84 +0,0 @@
-.\"	$NetBSD: isinf.3,v 1.12 2004/03/04 23:47:56 wiz Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)isinf.3	8.2 (Berkeley) 1/29/94
-.\"
-.Dd March 5, 2004
-.Dt ISINF 3
-.Os
-.Sh NAME
-.Nm isinf
-.Nd test for infinity
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In math.h
-.Ft int
-.Fn isinf "real-floating x"
-.Sh DESCRIPTION
-The
-.Fn isinf
-macro determines whether its argument
-.Fa x
-is an infinity (positive or negative).
-An argument represented in a format wider than its semantic type is
-converted to its semantic type first.
-The determination is then based on the type of the argument.
-.Ss IEEE 754
-It is determined whether the value of
-.Fa x
-is an infinity.
-.Ss VAX
-Infinities are not supported.
-.Sh RETURN VALUES
-The
-.Fn isinf
-macro returns a non-zero value if the value of
-.Fa x
-is an infinity.
-Otherwise 0 is returned.
-.Sh SEE ALSO
-.Xr fpclassify 3 ,
-.Xr isfinite 3 ,
-.Xr isinff 3 ,
-.Xr isnan 3 ,
-.Xr isnanf 3 ,
-.Xr isnormal 3 ,
-.Xr math 3 ,
-.Xr signbit 3
-.Rs
-.%T "IEEE Standard for Binary Floating-Point Arithmetic"
-.%Q ANSI
-.%R Std 754-1985
-.Re
-.Sh STANDARDS
-The
-.Fn isinf
-macro conforms to
-.St -isoC-99 .
diff --git a/lib/libc/gen/isinfd_ieee754.c b/lib/libc/gen/isinfd_ieee754.c
deleted file mode 100644
index 18899b740..000000000
--- a/lib/libc/gen/isinfd_ieee754.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: isinfd_ieee754.c,v 1.1 2004/03/04 23:42:39 kleink 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.
- * 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.
- *
- * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isinfd_ieee754.c,v 1.1 2004/03/04 23:42:39 kleink Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/* libc.so.12 ABI compatbility */
-#ifdef __weak_alias
-__weak_alias(isinf,__isinfd)
-#endif
-
-/*
- * 7.12.3.3 isinf - test for infinity
- *          IEEE 754 double-precision version
- */
-int
-__isinfd(double x)
-{
-	union ieee_double_u u;
-
-	u.dblu_d = x;
-
-	return (u.dblu_dbl.dbl_exp == DBL_EXP_INFNAN &&
-	    (u.dblu_dbl.dbl_frach == 0 && u.dblu_dbl.dbl_fracl == 0));
-}
diff --git a/lib/libc/gen/isinff_ieee754.c b/lib/libc/gen/isinff_ieee754.c
deleted file mode 100644
index 62f4e0f45..000000000
--- a/lib/libc/gen/isinff_ieee754.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: isinff_ieee754.c,v 1.1 2004/03/04 23:42:39 kleink 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.
- * 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.
- *
- * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isinff_ieee754.c,v 1.1 2004/03/04 23:42:39 kleink Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.3 isinf - test for infinity
- *          IEEE 754 single-precision version
- */
-int
-__isinff(float x)
-{
-	union ieee_single_u u;
-
-	u.sngu_f = x;
-
-	return (u.sngu_sng.sng_exp == SNG_EXP_INFNAN &&
-	    u.sngu_sng.sng_frac == 0);
-}
diff --git a/lib/libc/gen/isinfl_ieee754.c b/lib/libc/gen/isinfl_ieee754.c
deleted file mode 100644
index d45a06884..000000000
--- a/lib/libc/gen/isinfl_ieee754.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: isinfl_ieee754.c,v 1.5 2013/11/21 14:14:13 martin 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.
- * 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.
- *
- * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isinfl_ieee754.c,v 1.5 2013/11/21 14:14:13 martin Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/ieee.h>
-#include <math.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-/*
- * 7.12.3.3 isinf - test for infinity
- *          IEEE 754 compatible 128-bit extended-precision version
- */
-int
-__isinfl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	return u.extu_ext.ext_exp == EXT_EXP_INFNAN
-	    && u.extu_ext.ext_frach == 0
-#if EXT_FRACHMBITS
-	    && u.extu_ext.ext_frachm == 0
-#endif
-#if EXT_FRACLMBITS
-	    && u.extu_ext.ext_fraclm == 0
-#endif
-	    && u.extu_ext.ext_fracl == 0;
-}
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libc/gen/islower.3 b/lib/libc/gen/islower.3
deleted file mode 100644
index 1322e36e0..000000000
--- a/lib/libc/gen/islower.3
+++ /dev/null
@@ -1,107 +0,0 @@
-.\"	$NetBSD: islower.3,v 1.14 2008/04/17 16:25:36 apb Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)islower.3	5.2 (Berkeley) 6/29/91
-.\"
-.Dd April 17, 2008
-.Dt ISLOWER 3
-.Os
-.Sh NAME
-.Nm islower
-.Nd lower-case character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn islower "int c"
-.Sh DESCRIPTION
-The
-.Fn islower
-function tests for any lower-case letter
-.\" or any of an
-.\" implementation-defined set of characters
-for which none of
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr ispunct 3 ,
-or
-.Xr isspace 3
-is true.
-In the
-.Em ``C''
-locale,
-.Fn islower
-returns true only for the characters defined as lower-case letters.
-.Sh RETURN VALUES
-The
-.Fn islower
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn islower
-function conforms to
-.St -ansiC .
-.Sh CAVEATS
-The argument to
-.Fn islower
-must be
-.Dv EOF
-or representable as an
-.Vt unsigned char ;
-otherwise, the behavior is undefined.
-See the
-.Sx CAVEATS
-section of
-.Xr ctype 3
-for more details.
diff --git a/lib/libc/gen/isnan.3 b/lib/libc/gen/isnan.3
deleted file mode 100644
index 42442147c..000000000
--- a/lib/libc/gen/isnan.3
+++ /dev/null
@@ -1,86 +0,0 @@
-.\"	$NetBSD: isnan.3,v 1.2 2004/03/04 23:49:31 wiz Exp $
-.\"
-.\" 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. 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: @(#)isinf.3	8.2 (Berkeley) 1/29/94
-.\"	from: NetBSD: isinf.3,v 1.10 2003/08/07 16:42:52 agc Exp
-.\"
-.Dd March 5, 2004
-.Dt ISNAN 3
-.Os
-.Sh NAME
-.Nm isnan
-.Nd test for not-a-number
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In math.h
-.Ft int
-.Fn isnan "real-floating x"
-.Sh DESCRIPTION
-The
-.Fn isnan
-macro determines whether its argument
-.Fa x
-is not-a-number
-.Pq Dq NaN .
-An argument represented in a format wider than its semantic type is
-converted to its semantic type first.
-The determination is then based on the type of the argument.
-.Ss IEEE 754
-It is determined whether the value of
-.Fa x
-is a NaN.
-.Ss VAX
-NaNs are not supported.
-.Sh RETURN VALUES
-The
-.Fn isnan
-macro returns a non-zero value if the value of
-.Fa x
-is a NaN.
-Otherwise 0 is returned.
-.Sh SEE ALSO
-.Xr fpclassify 3 ,
-.Xr isfinite 3 ,
-.Xr isinf 3 ,
-.Xr isinff 3 ,
-.Xr isnanf 3 ,
-.Xr isnormal 3 ,
-.Xr math 3 ,
-.Xr signbit 3
-.Rs
-.%T "IEEE Standard for Binary Floating-Point Arithmetic"
-.%Q ANSI
-.%R Std 754-1985
-.Re
-.Sh STANDARDS
-The
-.Fn isnan
-macro conforms to
-.St -isoC-99 .
diff --git a/lib/libc/gen/isnand_ieee754.c b/lib/libc/gen/isnand_ieee754.c
deleted file mode 100644
index 0ce4bd936..000000000
--- a/lib/libc/gen/isnand_ieee754.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: isnand_ieee754.c,v 1.1 2004/03/04 23:42:39 kleink 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.
- * 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.
- *
- * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isnand_ieee754.c,v 1.1 2004/03/04 23:42:39 kleink Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/* libc.so.12 ABI compatbility */
-#ifdef __weak_alias
-__weak_alias(isnan,__isnand)
-#endif
-
-/*
- * 7.12.3.4 isnan - test for a NaN
- *          IEEE 754 double-precision version
- */
-int
-__isnand(double x)
-{
-	union ieee_double_u u;
-
-	u.dblu_d = x;
-
-	return (u.dblu_dbl.dbl_exp == DBL_EXP_INFNAN &&
-	    (u.dblu_dbl.dbl_frach != 0 || u.dblu_dbl.dbl_fracl != 0));
-}
diff --git a/lib/libc/gen/isnanf_ieee754.c b/lib/libc/gen/isnanf_ieee754.c
deleted file mode 100644
index ee3b94dec..000000000
--- a/lib/libc/gen/isnanf_ieee754.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: isnanf_ieee754.c,v 1.1 2004/03/04 23:42:39 kleink 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.
- * 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.
- *
- * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isnanf_ieee754.c,v 1.1 2004/03/04 23:42:39 kleink Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.4 isnan - test for a NaN
- *          IEEE 754 single-precision version
- */
-int
-__isnanf(float x)
-{
-	union ieee_single_u u;
-
-	u.sngu_f = x;
-
-	return (u.sngu_sng.sng_exp == SNG_EXP_INFNAN &&
-	    u.sngu_sng.sng_frac != 0);
-}
diff --git a/lib/libc/gen/isnanl_ieee754.c b/lib/libc/gen/isnanl_ieee754.c
deleted file mode 100644
index 77f407316..000000000
--- a/lib/libc/gen/isnanl_ieee754.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: isnanl_ieee754.c,v 1.7 2013/11/21 14:14:13 martin 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.
- * 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.
- *
- * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: isnanl_ieee754.c,v 1.7 2013/11/21 14:14:13 martin Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/ieee.h>
-#include <math.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-/*
- * 7.12.3.4 isnan - test for a NaN
- *          IEEE 754 compatible 128-bit extended-precision version
- */
-int
-__isnanl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	return u.extu_ext.ext_exp == EXT_EXP_INFNAN 
-	    && (u.extu_ext.ext_frach != 0
-#if EXT_FRACHMBITS
-	     || u.extu_ext.ext_frachm != 0
-#endif
-#if EXT_FRACLMBITS
-	     || u.extu_ext.ext_fraclm != 0
-#endif
-	     || u.extu_ext.ext_fracl != 0);
-}
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libc/gen/isnormal.3 b/lib/libc/gen/isnormal.3
deleted file mode 100644
index 7ccda97fc..000000000
--- a/lib/libc/gen/isnormal.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\"	$NetBSD: isnormal.3,v 1.3 2008/04/30 13:10:50 martin Exp $
-.\"
-.\" Copyright (c) 2003 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.
-.\"
-.Dd October 29, 2003
-.Dt ISNORMAL 3
-.Os
-.Sh NAME
-.Nm isnormal
-.Nd test for normal value
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In math.h
-.Ft int
-.Fn isnormal "real-floating x"
-.Sh DESCRIPTION
-The
-.Fn isnormal
-macro determines whether its argument
-.Fa x
-has a normal value.
-An argument represented in a format wider than its semantic type is
-converted to its semantic type first.
-The determination is then based on the type of the argument.
-.Ss IEEE 754
-It is determined whether the value of
-.Fa x
-is normal, and neither zero, subnormal, infinite nor NaN.
-.Ss VAX
-It is determined whether the value of
-.Fa x
-is finite, and neither true zero, dirty zero nor ROP.
-.Sh RETURN VALUES
-The
-.Fn isnormal
-macro returns a non-zero value if the value of
-.Fa x
-is finite.
-Otherwise 0 is returned.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr fpclassify 3 ,
-.Xr isfinite 3 ,
-.Xr math 3 ,
-.Xr signbit 3
-.Sh STANDARDS
-The
-.Fn isnormal
-macro conforms to
-.St -isoC-99 .
diff --git a/lib/libc/gen/isprint.3 b/lib/libc/gen/isprint.3
deleted file mode 100644
index e2091097c..000000000
--- a/lib/libc/gen/isprint.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\"	$NetBSD: isprint.3,v 1.13 2008/04/17 16:25:36 apb Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)isprint.3	5.2 (Berkeley) 6/29/91
-.\"
-.Dd April 17, 2008
-.Dt ISPRINT 3
-.Os
-.Sh NAME
-.Nm isprint
-.Nd printing character test (space character inclusive)
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isprint "int c"
-.Sh DESCRIPTION
-The
-.Fn isprint
-function tests for any printing character including space (' ').
-.Sh RETURN VALUES
-The
-.Fn isprint
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isprint
-function conforms to
-.St -ansiC .
-.Sh CAVEATS
-The argument to
-.Fn isprint
-must be
-.Dv EOF
-or representable as an
-.Vt unsigned char ;
-otherwise, the behavior is undefined.
-See the
-.Sx CAVEATS
-section of
-.Xr ctype 3
-for more details.
diff --git a/lib/libc/gen/ispunct.3 b/lib/libc/gen/ispunct.3
deleted file mode 100644
index 8d32ac67e..000000000
--- a/lib/libc/gen/ispunct.3
+++ /dev/null
@@ -1,96 +0,0 @@
-.\"	$NetBSD: ispunct.3,v 1.13 2008/04/17 16:25:36 apb Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"	@(#)ispunct.3	5.2 (Berkeley) 6/29/91
-.\"
-.Dd April 17, 2008
-.Dt ISPUNCT 3
-.Os
-.Sh NAME
-.Nm ispunct
-.Nd punctuation character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn ispunct "int c"
-.Sh DESCRIPTION
-The
-.Fn ispunct
-function tests for any printing character except space (' ') or a
-character for which
-.Xr isalnum 3
-is true.
-.Sh RETURN VALUES
-The
-.Fn ispunct
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn ispunct
-function conforms to
-.St -ansiC .
-.Sh CAVEATS
-The argument to
-.Fn ispunct
-must be
-.Dv EOF
-or representable as an
-.Vt unsigned char ;
-otherwise, the behavior is undefined.
-See the
-.Sx CAVEATS
-section of
-.Xr ctype 3
-for more details.
diff --git a/lib/libc/gen/isspace.3 b/lib/libc/gen/isspace.3
deleted file mode 100644
index 4c6d1306a..000000000
--- a/lib/libc/gen/isspace.3
+++ /dev/null
@@ -1,120 +0,0 @@
-.\"	$NetBSD: isspace.3,v 1.15 2012/10/03 19:28:44 wiz Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)isspace.3	5.3 (Berkeley) 7/31/91
-.\"
-.Dd April 17, 2008
-.Dt ISSPACE 3
-.Os
-.Sh NAME
-.Nm isspace
-.Nd white-space character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isspace "int c"
-.Sh DESCRIPTION
-The
-.Fn isspace
-function tests for the standard white-space characters
-.\" or for any
-.\" of an implementation-defined set of characters
-for which
-.Xr isalnum 3
-is false.
-The standard white-space characters are the following:
-.Pp
-.Bl -tag -width xxxxx -offset indent -compact
-.It Sq \0
-Space character.
-.It Li \ef
-Form feed.
-.It Li \en
-New-line.
-.It Li \er
-Carriage return.
-.It Li \et
-Horizontal tab.
-.It Li \ev
-Vertical tab.
-.El
-.Pp
-In the
-.Em ``C''
-locale,
-.Fn isspace
-returns true only for the standard white-space characters.
-.Sh RETURN VALUES
-The
-.Fn isspace
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isspace
-function conforms to
-.St -ansiC .
-.Sh CAVEATS
-The argument to
-.Fn isspace
-must be
-.Dv EOF
-or representable as an
-.Vt unsigned char ;
-otherwise, the behavior is undefined.
-See the
-.Sx CAVEATS
-section of
-.Xr ctype 3
-for more details.
diff --git a/lib/libc/gen/isupper.3 b/lib/libc/gen/isupper.3
deleted file mode 100644
index d969eca56..000000000
--- a/lib/libc/gen/isupper.3
+++ /dev/null
@@ -1,105 +0,0 @@
-.\"	$NetBSD: isupper.3,v 1.14 2008/04/17 16:25:36 apb Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)isupper.3	5.2 (Berkeley) 6/29/91
-.\"
-.Dd April 17, 2008
-.Dt ISUPPER 3
-.Os
-.Sh NAME
-.Nm isupper
-.Nd upper-case character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isupper "int c"
-.Sh DESCRIPTION
-The
-.Fn isupper
-function tests for any upper-case letter or any of an
-implementation-defined set of characters for which none of
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr ispunct 3 ,
-or
-.Xr isspace 3
-is true.
-In the
-.Em ``C''
-locale,
-.Fn isupper
-returns true only for the characters defined as upper-case letters.
-.Sh RETURN VALUES
-The
-.Fn isupper
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isupper
-function conforms to
-.St -ansiC .
-.Sh CAVEATS
-The argument to
-.Fn isupper
-must be
-.Dv EOF
-or representable as an
-.Vt unsigned char ;
-otherwise, the behavior is undefined.
-See the
-.Sx CAVEATS
-section of
-.Xr ctype 3
-for more details.
diff --git a/lib/libc/gen/isxdigit.3 b/lib/libc/gen/isxdigit.3
deleted file mode 100644
index 7777af032..000000000
--- a/lib/libc/gen/isxdigit.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\"	$NetBSD: isxdigit.3,v 1.13 2008/04/17 16:25:36 apb Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)isxdigit.3	5.2 (Berkeley) 6/29/91
-.\"
-.Dd April 17, 2008
-.Dt ISXDIGIT 3
-.Os
-.Sh NAME
-.Nm isxdigit
-.Nd hexadecimal-digit character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isxdigit "int c"
-.Sh DESCRIPTION
-The
-.Fn isxdigit
-function tests for any hexadecimal-digit character.
-.Sh RETURN VALUES
-The
-.Fn isxdigit
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isxdigit
-function conforms to
-.St -ansiC .
-.Sh CAVEATS
-The argument to
-.Fn isxdigit
-must be
-.Dv EOF
-or representable as an
-.Vt unsigned char ;
-otherwise, the behavior is undefined.
-See the
-.Sx CAVEATS
-section of
-.Xr ctype 3
-for more details.
diff --git a/lib/libc/gen/ldexp_ieee754.c b/lib/libc/gen/ldexp_ieee754.c
deleted file mode 100644
index cc8149a6a..000000000
--- a/lib/libc/gen/ldexp_ieee754.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*	$NetBSD: ldexp_ieee754.c,v 1.5 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ldexp_ieee754.c,v 1.5 2008/04/28 20:22:59 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <machine/ieee.h>
-#include <errno.h>
-#include <math.h>
-
-/*
- * Multiply the given value by 2^expon.
- */
-double
-ldexp(double val, int expon)
-{
-	int oldexp, newexp;
-	union ieee_double_u u, mul;
-
-	u.dblu_d = val;
-	oldexp = u.dblu_dbl.dbl_exp;
-
-	/*
-	 * If input is zero, Inf or NaN, just return it.
-	 */
-	if (u.dblu_d == 0.0 || oldexp == DBL_EXP_INFNAN)
-		return (val);
-
-	if (oldexp == 0) {
-		/*
-		 * u.v is denormal.  We must adjust it so that the exponent
-		 * arithmetic below will work.
-		 */
-		if (expon <= DBL_EXP_BIAS) {
-			/*
-			 * Optimization: if the scaling can be done in a single
-			 * multiply, or underflows, just do it now.
-			 */
-			if (expon <= -DBL_FRACBITS) {
-				errno = ERANGE;
-				return (val < 0.0 ? -0.0 : 0.0);
-			}
-			mul.dblu_d = 0.0;
-			mul.dblu_dbl.dbl_exp = expon + DBL_EXP_BIAS;
-			u.dblu_d *= mul.dblu_d;
-			if (u.dblu_d == 0.0) {
-				errno = ERANGE;
-				return (val < 0.0 ? -0.0 : 0.0);
-			}
-			return (u.dblu_d);
-		} else {
-			/*
-			 * We know that expon is very large, and therefore the
-			 * result cannot be denormal (though it may be Inf).
-			 * Shift u.v by just enough to make it normal.
-			 */
-			mul.dblu_d = 0.0;
-			mul.dblu_dbl.dbl_exp = DBL_FRACBITS + DBL_EXP_BIAS;
-			u.dblu_d *= mul.dblu_d;
-			expon -= DBL_FRACBITS;
-			oldexp = u.dblu_dbl.dbl_exp;
-		}
-	}
-
-	/*
-	 * u.v is now normalized and oldexp has been adjusted if necessary.
-	 * Calculate the new exponent and check for underflow and overflow.
-	 */
-	newexp = oldexp + expon;
-
-	if (newexp <= 0) {
-		/*
-		 * The output number is either denormal or underflows (see
-		 * comments in machine/ieee.h).
-		 */
-		if (newexp <= -DBL_FRACBITS) {
-			errno = ERANGE;
-			return (val < 0.0 ? -0.0 : 0.0);
-		}
-		/*
-		 * Denormalize the result.  We do this with a multiply.  If
-		 * expon is very large, it won't fit in a double, so we have
-		 * to adjust the exponent first.  This is safe because we know
-		 * that u.v is normal at this point.
-		 */
-		if (expon <= -DBL_EXP_BIAS) {
-			u.dblu_dbl.dbl_exp = 1;
-			expon += oldexp - 1;
-		}
-		mul.dblu_d = 0.0;
-		mul.dblu_dbl.dbl_exp = expon + DBL_EXP_BIAS;
-		u.dblu_d *= mul.dblu_d;
-		return (u.dblu_d);
-	} else if (newexp >= DBL_EXP_INFNAN) {
-		/*
-		 * The result overflowed; return +/-Inf.
-		 */
-		u.dblu_dbl.dbl_exp = DBL_EXP_INFNAN;
-		u.dblu_dbl.dbl_frach = 0;
-		u.dblu_dbl.dbl_fracl = 0;
-		errno = ERANGE;
-		return (u.dblu_d);
-	} else {
-		/*
-		 * The result is normal; just replace the old exponent with the
-		 * new one.
-		 */
-		u.dblu_dbl.dbl_exp = newexp;
-		return (u.dblu_d);
-	}
-}
diff --git a/lib/libc/gen/lockf.3 b/lib/libc/gen/lockf.3
deleted file mode 100644
index 8a0716683..000000000
--- a/lib/libc/gen/lockf.3
+++ /dev/null
@@ -1,262 +0,0 @@
-.\" $NetBSD: lockf.3,v 1.12 2011/10/15 21:35:49 rmind Exp $
-.\"
-.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Klaus Klein and S.P. Zeidler.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd October 15, 2011
-.Dt LOCKF 3
-.Os
-.Sh NAME
-.Nm lockf
-.Nd record locking on files
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn lockf "int filedes" "int function" "off_t size"
-.Sh DESCRIPTION
-The
-.Fn lockf
-function allows sections of a file to be locked with advisory-mode locks.
-Calls to
-.Fn lockf
-from other processes which attempt to lock the locked file section will
-either return an error value or block until the section becomes unlocked.
-All the locks for a process are removed when the process terminates.
-.Pp
-The argument
-.Fa filedes
-is an open file descriptor.
-The file descriptor must have been opened either for write-only
-.Dv ( O_WRONLY )
-or read/write
-.Dv ( O_RDWR )
-operation.
-.Pp
-The
-.Fa function
-argument is a control value which specifies the action to be taken.
-The permissible values for
-.Fa function
-are as follows:
-.Pp
-.Bl -tag -width F_ULOCKXX -compact -offset indent
-.It Sy Function
-.Sy Description
-.It Dv F_ULOCK
-unlock locked sections
-.It Dv F_LOCK
-lock a section for exclusive use
-.It Dv F_TLOCK
-test and lock a section for exclusive use
-.It Dv F_TEST
-test a section for locks by other processes
-.El
-.Pp
-.Dv F_ULOCK
-removes locks from a section of the file;
-.Dv F_LOCK
-and
-.Dv F_TLOCK
-both lock a section of a file if the section is available;
-.Dv F_TEST
-detects if a lock by another process is present on the specified section.
-.Pp
-The
-.Fa size
-argument is the number of contiguous bytes to be locked or
-unlocked.
-The section to be locked or unlocked starts at the current
-offset in the file and extends forward for a positive size or backward
-for a negative size (the preceding bytes up to but not including the
-current offset).
-However, it is not permitted to lock a section that
-starts or extends before the beginning of the file.
-If
-.Fa size
-is 0, the section from the current offset through the largest possible
-file offset is locked (that is, from the current offset through the
-present or any future end-of-file).
-.Pp
-The sections locked with
-.Dv F_LOCK
-or
-.Dv F_TLOCK
-may, in whole or in part, contain or be contained by a previously
-locked section for the same process.
-When this occurs, or if adjacent
-locked sections would occur, the sections are combined into a single
-locked section.
-If the request would cause the number of locks to
-exceed a system-imposed limit, the request will fail.
-.Pp
-.Dv F_LOCK
-and
-.Dv F_TLOCK
-requests differ only by the action taken if the section is not
-available.
-.Dv F_LOCK
-blocks the calling process until the section is available.
-.Dv F_TLOCK
-makes the function fail if the section is already locked by another
-process.
-.Pp
-File locks are released on first close by the locking process of any
-file descriptor for the file.
-.Pp
-.Dv F_ULOCK
-requests release (wholly or in part) one or more locked sections
-controlled by the process.
-Locked sections will be unlocked starting
-at the current file offset through
-.Fa size
-bytes or to the end of file if size is 0.
-When all of a locked section
-is not released (that is, when the beginning or end of the area to be
-unlocked falls within a locked section), the remaining portions of
-that section are still locked by the process.
-Releasing the center
-portion of a locked section will cause the remaining locked beginning
-and end portions to become two separate locked sections.
-If the
-request would cause the number of locks in the system to exceed a
-system-imposed limit, the request will fail.
-.Pp
-An
-.Dv F_ULOCK
-request in which size is non-zero and the offset of the last byte of
-the requested section is the maximum value for an object of type
-off_t, when the process has an existing lock in which size is 0 and
-which includes the last byte of the requested section, will be treated
-as a request to unlock from the start of the requested section with a
-size equal to 0.
-Otherwise an
-.Dv F_ULOCK
-request will attempt to unlock only the requested section.
-.Pp
-A potential for deadlock occurs if a process controlling a locked
-region is put to sleep by attempting to lock the locked region of
-another process.
-This implementation detects that sleeping until a
-locked region is unlocked would cause a deadlock and fails with an
-.Er EDEADLK
-error.
-.Pp
-.Fn lockf ,
-.Xr fcntl 2
-and
-.Xr flock 2
-locks may be safely used concurrently.
-.Pp
-Blocking on a section is interrupted by any signal.
-.Sh RETURN VALUES
-If successful, the
-.Fn lockf
-function returns 0.
-Otherwise, it returns \-1, sets
-.Va errno
-to indicate an error, and existing locks are not changed.
-.Sh ERRORS
-.Fn lockf
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The argument
-.Fa function
-is
-.Dv F_TLOCK
-or
-.Dv F_TEST
-and the section is already locked by another process.
-.It Bq Er EBADF
-The argument
-.Fa filedes
-is not a valid open file descriptor.
-.Pp
-The argument
-.Fa function
-is
-.Dv F_LOCK
-or
-.Dv F_TLOCK ,
-and
-.Fa filedes
-is not a valid file descriptor open for writing.
-.It Bq Er EDEADLK
-The argument
-.Fa function
-is
-.Dv F_LOCK
-and a deadlock is detected.
-.It Bq Er EINTR
-The argument
-.Fa function
-is F_LOCK
-and
-.Fn lockf
-was interrupted by the delivery of a signal.
-.It Bq Er EINVAL
-The argument
-.Fa function
-is not one of
-.Dv F_ULOCK ,
-.Dv F_LOCK ,
-.Dv F_TLOCK
-or
-.Dv F_TEST .
-.Pp
-The argument
-.Fa filedes
-refers to a file that does not support locking.
-.It Bq Er ENOLCK
-The argument
-.Fa function
-is
-.Dv F_ULOCK ,
-.Dv F_LOCK
-or
-.Dv F_TLOCK ,
-and satisfying the lock or unlock request would result in the number
-of locked regions in the system exceeding a system-imposed limit.
-.El
-.Sh SEE ALSO
-.Xr fcntl 2 ,
-.Xr flock 2 ,
-.Xr flockfile 3
-.Sh STANDARDS
-The
-.Fn lockf
-function conforms to
-.St -xpg4.2
-and
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn lockf
-function first appeared in
-.Fx 1.4 .
diff --git a/lib/libc/gen/lockf.c b/lib/libc/gen/lockf.c
deleted file mode 100644
index 6f82f5e2c..000000000
--- a/lib/libc/gen/lockf.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*	$NetBSD: lockf.c,v 1.4 2012/06/25 22:32:43 abs Exp $	*/
-
-/*-
- * Copyright (c) 1997 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: lockf.c,v 1.4 2012/06/25 22:32:43 abs Exp $");
-#endif
-
-#include "namespace.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(lockf,_lockf)
-#endif
-
-
-int
-lockf(int filedes, int function, off_t size)
-{
-	struct flock fl;
-	int cmd;
-
-	fl.l_start = 0;
-	fl.l_len = size;
-	fl.l_whence = SEEK_CUR;
-
-	switch (function) {
-	case F_ULOCK:
-		cmd = F_SETLK;
-		fl.l_type = F_UNLCK;
-		break;
-	case F_LOCK:
-		cmd = F_SETLKW;
-		fl.l_type = F_WRLCK;
-		break;
-	case F_TLOCK:
-		cmd = F_SETLK;
-		fl.l_type = F_WRLCK;
-		break;
-	case F_TEST:
-		fl.l_type = F_WRLCK;
-		if (fcntl(filedes, F_GETLK, &fl) == -1)
-			return (-1);
-		if (fl.l_type == F_UNLCK || fl.l_pid == getpid())
-			return (0);
-		errno = EAGAIN;
-		return (-1);
-		/* NOTREACHED */
-	default:
-		errno = EINVAL;
-		return (-1);
-		/* NOTREACHED */
-	}
-
-	return (fcntl(filedes, cmd, &fl));
-}
diff --git a/lib/libc/gen/makecontext.3 b/lib/libc/gen/makecontext.3
deleted file mode 100644
index 0742e2185..000000000
--- a/lib/libc/gen/makecontext.3
+++ /dev/null
@@ -1,169 +0,0 @@
-.\"	$NetBSD: makecontext.3,v 1.10 2012/05/04 12:28:03 joerg Exp $
-.\"
-.\" Copyright (c) 2001, 2009 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.
-.\"
-.Dd May 4, 2012
-.Dt MAKECONTEXT 3
-.Os
-.Sh NAME
-.Nm makecontext ,
-.Nm swapcontext
-.Nd manipulate user contexts
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ucontext.h
-.Ft void
-.Fn makecontext "ucontext_t *ucp" "void (*func)()" "int argc" ...
-.Ft int
-.Fn swapcontext "ucontext_t * restrict oucp" "ucontext_t * restrict ucp"
-.Sh DESCRIPTION
-The
-.Fn makecontext
-function modifies the object pointed to by
-.Fa ucp ,
-which has been initialized using
-.Xr getcontext 2 .
-When this context is resumed using
-.Fn swapcontext
-or
-.Xr setcontext 2 ,
-program execution continues as if
-.Fa func
-had been called with the arguments specified after
-.Fa argc
-in the call of
-.Fn makecontext .
-The value of
-.Fa argc
-must be equal to the number of integer arguments following it,
-and must be equal to the number of integer arguments expected by
-.Fa func ;
-otherwise, the behavior is undefined.
-.Pp
-Before being modified using
-.Fn makecontext ,
-a stack must be allocated for the context (in the
-.Fa uc_stack
-member), and a context to resume after
-.Fa func
-has returned must be determined (pointed to by the
-.Fa uc_link
-member);
-otherwise, the behavior is undefined.
-If
-.Fa uc_link
-is a null pointer, then the context is the main context,
-and the process will exit with an exit status of 0 upon return.
-.Pp
-The
-.Fn swapcontext
-function saves the current context in the object pointed to by
-.Fa oucp ,
-sets the current context to that specified in the object pointed to by
-.Fa ucp ,
-and resumes execution.
-When a context saved by
-.Fn swapcontext
-is restored using
-.Xr setcontext 2 ,
-execution will resume as if the corresponding invocation of
-.Fn swapcontext
-had just returned (successfully).
-.Sh RETURN VALUES
-The
-.Fn makecontext
-function returns no value.
-.Pp
-On success,
-.Fn swapcontext
-returns a value of 0,
-Otherwise, \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn swapcontext
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa oucp
-argument or the
-.Fa ucp
-argument points to an invalid address.
-.It Bq Er EINVAL
-The contents of the datum pointed to by
-.Fa ucp
-are invalid.
-.El
-.Sh SEE ALSO
-.Xr _exit 2 ,
-.Xr getcontext 2 ,
-.Xr setcontext 2 ,
-.Xr ucontext 2
-.Sh STANDARDS
-The
-.Fn makecontext
-and
-.Fn swapcontext
-functions conform to
-.St -xsh5
-and
-.St -p1003.1-2001 .
-.Pp
-The
-.St -p1003.1-2004
-revision marked the functions
-.Fn makecontext
-and
-.Fn swapcontext
-as obsolete, citing portability issues and recommending the use of
-.Tn POSIX
-threads instead.
-The
-.St -p1003.1-2008
-revision removed the functions from the specification.
-.Pp
-.Bf -symbolic
-The standard does not clearly define the type of integer arguments
-passed to
-.Fa func
-via
-.Fn makecontext ;
-portable applications should not rely on the implementation detail that
-it may be possible to pass pointer arguments to functions.
-.Ef
-This may be clarified in a future revision of the standard.
-.Sh HISTORY
-The
-.Fn makecontext
-and
-.Fn swapcontext
-functions first appeared in
-.At V.4 .
diff --git a/lib/libc/gen/modf_ieee754.c b/lib/libc/gen/modf_ieee754.c
deleted file mode 100644
index 39b4d0543..000000000
--- a/lib/libc/gen/modf_ieee754.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* $NetBSD: modf_ieee754.c,v 1.4 2012/03/22 13:25:45 he 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 <machine/ieee.h>
-#include <errno.h>
-#include <math.h>
-
-/*
- * double modf(double val, double *iptr)
- * returns: f and i such that |f| < 1.0, (f + i) = val, and
- *	sign(f) == sign(i) == sign(val).
- *
- * Beware signedness when doing subtraction, and also operand size!
- */
-double
-modf(double val, double *iptr)
-{
-	union ieee_double_u u, v;
-	u_int64_t frac;
-
-	/*
-	 * If input is +/-Inf or NaN, return +/-0 or NaN.
-	 */
-	u.dblu_d = val;
-	if (u.dblu_dbl.dbl_exp == DBL_EXP_INFNAN) {
-		*iptr = u.dblu_d;
-		return (0.0 / u.dblu_d);
-	}
-
-	/*
-	 * If input can't have a fractional part, return
-	 * (appropriately signed) zero, and make i be the input.
-	 */
-	if ((int)u.dblu_dbl.dbl_exp - DBL_EXP_BIAS > DBL_FRACBITS - 1) {
-		*iptr = u.dblu_d;
-		v.dblu_d = 0.0;
-		v.dblu_dbl.dbl_sign = u.dblu_dbl.dbl_sign;
-		return (v.dblu_d);
-	}
-
-	/*
-	 * If |input| < 1.0, return it, and set i to the appropriately
-	 * signed zero.
-	 */
-	if (u.dblu_dbl.dbl_exp < DBL_EXP_BIAS) {
-		v.dblu_d = 0.0;
-		v.dblu_dbl.dbl_sign = u.dblu_dbl.dbl_sign;
-		*iptr = v.dblu_d;
-		return (u.dblu_d);
-	}
-
-	/*
-	 * There can be a fractional part of the input.
-	 * If you look at the math involved for a few seconds, it's
-	 * plain to see that the integral part is the input, with the
-	 * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed,
-	 * the fractional part is the part with the rest of the
-	 * bits zeroed.  Just zeroing the high bits to get the
-	 * fractional part would yield a fraction in need of
-	 * normalization.  Therefore, we take the easy way out, and
-	 * just use subtraction to get the fractional part.
-	 */
-	v.dblu_d = u.dblu_d;
-	/* Zero the low bits of the fraction, the sleazy way. */
-	frac = ((u_int64_t)v.dblu_dbl.dbl_frach << 32) + v.dblu_dbl.dbl_fracl;
-	frac >>= DBL_FRACBITS - (u.dblu_dbl.dbl_exp - DBL_EXP_BIAS);
-	frac <<= DBL_FRACBITS - (u.dblu_dbl.dbl_exp - DBL_EXP_BIAS);
-	v.dblu_dbl.dbl_fracl = (u_int) (frac & 0xffffffffULL);
-	v.dblu_dbl.dbl_frach = (u_int) (frac >> 32);
-	*iptr = v.dblu_d;
-
-	u.dblu_d -= v.dblu_d;
-	u.dblu_dbl.dbl_sign = v.dblu_dbl.dbl_sign;
-	return (u.dblu_d);
-}
diff --git a/lib/libc/gen/nftw.c b/lib/libc/gen/nftw.c
deleted file mode 100644
index 0e5134261..000000000
--- a/lib/libc/gen/nftw.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* $NetBSD */
-
-/*	From OpenBSD: nftw.c,v 1.2 2003/07/21 21:15:32 millert Exp 	*/
-
-/*
- * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * 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.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- */
-
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: nftw.c,v 1.1 2005/12/30 23:07:32 agc Exp $");
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fts.h>
-#include <ftw.h>
-#include <limits.h>
-
-int
-nftw(const char *path, int (*fn)(const char *, const struct stat *, int,
-     struct FTW *), int nfds, int ftwflags)
-{
-	/* LINTED */
-	char * const paths[2] = { __UNCONST(path), NULL };
-	struct FTW f;
-	FTSENT *cur;
-	FTS *ftsp;
-	int ftsflags, fnflag, error, postorder, sverrno;
-
-	/* XXX - nfds is currently unused */
-	if (nfds < 1 || nfds > OPEN_MAX) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	ftsflags = FTS_COMFOLLOW;
-	if (!(ftwflags & FTW_CHDIR))
-		ftsflags |= FTS_NOCHDIR;
-	if (ftwflags & FTW_MOUNT)
-		ftsflags |= FTS_XDEV;
-	if (ftwflags & FTW_PHYS)
-		ftsflags |= FTS_PHYSICAL;
-	postorder = (ftwflags & FTW_DEPTH) != 0;
-	ftsp = fts_open(paths, ftsflags, NULL);
-	if (ftsp == NULL)
-		return (-1);
-	error = 0;
-	while ((cur = fts_read(ftsp)) != NULL) {
-		switch (cur->fts_info) {
-		case FTS_D:
-			if (postorder)
-				continue;
-			fnflag = FTW_D;
-			break;
-		case FTS_DNR:
-			fnflag = FTW_DNR;
-			break;
-		case FTS_DP:
-			if (!postorder)
-				continue;
-			fnflag = FTW_DP;
-			break;
-		case FTS_F:
-		case FTS_DEFAULT:
-			fnflag = FTW_F;
-			break;
-		case FTS_NS:
-		case FTS_NSOK:
-			fnflag = FTW_NS;
-			break;
-		case FTS_SL:
-			fnflag = FTW_SL;
-			break;
-		case FTS_SLNONE:
-			fnflag = FTW_SLN;
-			break;
-		case FTS_DC:
-			errno = ELOOP;
-			/* FALLTHROUGH */
-		default:
-			error = -1;
-			goto done;
-		}
-		f.base = cur->fts_pathlen - cur->fts_namelen;
-		f.level = cur->fts_level;
-		error = fn(cur->fts_path, cur->fts_statp, fnflag, &f);
-		if (error != 0)
-			break;
-	}
-done:
-	sverrno = errno;
-	(void) fts_close(ftsp);
-	errno = sverrno;
-	return (error);
-}
diff --git a/lib/libc/gen/nice.3 b/lib/libc/gen/nice.3
deleted file mode 100644
index 3aa293f45..000000000
--- a/lib/libc/gen/nice.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\"	$NetBSD: nice.3,v 1.14 2011/05/01 02:54:22 christos Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)nice.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 30, 2011
-.Dt NICE 3
-.Os
-.Sh NAME
-.Nm nice
-.Nd set program scheduling priority
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn nice "int incr"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is obsoleted by
-.Xr setpriority 2 .
-.Ef
-.Pp
-The
-.Fn nice
-function obtains the scheduling priority of the process
-from the system and sets it to the priority value specified in
-.Fa incr .
-The priority is a value in the range -20 to 20.
-The default priority is 0; lower priorities cause more favorable scheduling.
-Only a process with appropriate privileges may lower priorities.
-.Pp
-Children inherit the priority of their parent processes via
-.Xr fork 2 .
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn nice
-returns the new nice value minus
-.Dv NZERO .
-Otherwise, \-1 is returned, the process' nice value is not changed, and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn nice
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EPERM
-The
-.Fa incr
-argument is negative and the caller does not have appropriate privileges.
-.El
-.Sh SEE ALSO
-.Xr nice 1 ,
-.Xr fork 2 ,
-.Xr setpriority 2 ,
-.Xr renice 8
-.Sh STANDARDS
-The
-.Fn nice
-function conforms to
-.St -xpg4.2 .
-.Sh HISTORY
-A
-.Fn nice
-syscall appeared in
-.At v6 .
diff --git a/lib/libc/gen/nice.c b/lib/libc/gen/nice.c
deleted file mode 100644
index 19d671148..000000000
--- a/lib/libc/gen/nice.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: nice.c,v 1.13 2011/05/01 02:49:54 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)nice.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: nice.c,v 1.13 2011/05/01 02:49:54 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <errno.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(nice,_nice)
-#endif
-
-/*
- * Backwards compatible nice.
- */
-int
-nice(int incr)
-{
-	int prio;
-
-	errno = 0;
-	prio = getpriority(PRIO_PROCESS, 0);
-	if (prio == -1 && errno)
-		return -1;
-	if (setpriority(PRIO_PROCESS, 0, prio + incr) == -1) {
-		if (errno == EACCES)
-			errno = EPERM;
-		return -1;
-	}
-	return getpriority(PRIO_PROCESS, 0);
-}
diff --git a/lib/libc/gen/nlist.3 b/lib/libc/gen/nlist.3
deleted file mode 100644
index 2a9f9917a..000000000
--- a/lib/libc/gen/nlist.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"	$NetBSD: nlist.3,v 1.11 2003/08/07 16:42:53 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)nlist.3	8.3 (Berkeley) 4/19/94
-.\"
-.Dd April 19, 1994
-.Dt NLIST 3
-.Os
-.Sh NAME
-.Nm nlist
-.Nd retrieve symbol table name list from an executable file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In nlist.h
-.Ft int
-.Fn nlist "const char *filename" "struct nlist *nl"
-.Sh DESCRIPTION
-The
-.Fn nlist
-function
-retrieves name list entries from the symbol table of an
-executable file.
-(See
-.Xr a.out 5 . )
-The argument
-.Fa \&nl
-is set to reference the
-beginning of the list.
-The list is preened of binary and invalid data;
-if an entry in the
-name list is valid, the
-.Fa n_type
-and
-.Fa n_value
-for the entry are copied into the list
-referenced by
-.Fa \&nl .
-No other data is copied.
-The last entry in the list is always
-.Dv NULL .
-.Sh RETURN VALUES
-The number of invalid entries is returned if successful; otherwise,
-if the file
-.Fa filename
-does not exist or is not executable, the returned value is \-1.
-.Sh SEE ALSO
-.Xr a.out 5
-.Sh HISTORY
-A
-.Fn nlist
-function appeared in
-.At v6 .
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
deleted file mode 100644
index ec2531801..000000000
--- a/lib/libc/gen/nlist.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/* $NetBSD: nlist.c,v 1.25 2014/09/18 13:58:20 christos Exp $ */
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * 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 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: nlist.c,v 1.25 2014/09/18 13:58:20 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <nlist.h>
-
-#if 0
-#ifdef __weak_alias
-__weak_alias(nlist,_nlist)
-#endif
-#endif
-
-#include "nlist_private.h"
-
-static const struct {
-	int	(*fdnlist)(int, struct nlist *);
-} fdnlist_fmts[] = {
-#ifdef NLIST_AOUT
-	{	__fdnlist_aout		},
-#endif
-#ifdef NLIST_COFF
-	{	__fdnlist_coff		},
-#endif
-#ifdef NLIST_ECOFF
-	{	__fdnlist_ecoff		},
-#endif
-#ifdef NLIST_ELF32
-	{	__fdnlist_elf32		},
-#endif
-#ifdef NLIST_ELF64
-	{	__fdnlist_elf64		},
-#endif
-};
-	
-int
-nlist(const char *name, struct nlist *list)
-{
-	int fd, n;
-
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(list != NULL);
-
-	fd = open(name, O_RDONLY | O_CLOEXEC, 0);
-	if (fd < 0)
-		return (-1);
-	n = __fdnlist(fd, list);
-	(void)close(fd);
-	return (n);
-}
-
-int
-__fdnlist(int fd, struct nlist *list)
-{
-	size_t i;
-	int rv;
-
-	_DIAGASSERT(fd != -1);
-	_DIAGASSERT(list != NULL);
-
-	for (i = 0; i < sizeof(fdnlist_fmts) / sizeof(fdnlist_fmts[0]); i++)
-		if ((rv = (*fdnlist_fmts[i].fdnlist)(fd, list)) != -1)
-			return (rv);
-	return (-1);
-}
diff --git a/lib/libc/gen/nlist_aout.c b/lib/libc/gen/nlist_aout.c
deleted file mode 100644
index 618f35f07..000000000
--- a/lib/libc/gen/nlist_aout.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/* $NetBSD: nlist_aout.c,v 1.23 2012/03/21 15:32:26 christos Exp $ */
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * 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 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: nlist_aout.c,v 1.23 2012/03/21 15:32:26 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-struct nlist;
-#include "nlist_private.h"
-
-#ifdef NLIST_AOUT
-#include <a.out.h>
-#include <sys/exec_aout.h>
-
-int
-__fdnlist_aout(int fd, struct nlist *list)
-{
-	struct nlist *p, *s;
-	char *strtab;
-	off_t stroff, symoff;
-	int nent;
-	size_t strsize, symsize, cc;
-	struct nlist nbuf[1024];
-	struct exec exec;
-	struct stat st;
-	char *scoreboard, *scored;
-
-	_DIAGASSERT(fd != -1);
-	_DIAGASSERT(list != NULL);
-
-	if (pread(fd, &exec, sizeof(exec), (off_t)0) != sizeof(exec) ||
-	    N_BADMAG(exec) || fstat(fd, &st) < 0)
-		return (-1);
-
-	symoff = N_SYMOFF(exec);
-	symsize = (size_t)exec.a_syms;
-	stroff = symoff + symsize;
-
-	/* Check for files too large to mmap. */
-	if ((uintmax_t)(st.st_size - stroff) > (uintmax_t)SIZE_T_MAX) {
-		errno = EFBIG;
-		return (-1);
-	}
-	/*
-	 * Map string table into our address space.  This gives us
-	 * an easy way to randomly access all the strings, without
-	 * making the memory allocation permanent as with malloc/free
-	 * (i.e., munmap will return it to the system).
-	 */
-	strsize = (size_t)(st.st_size - stroff);
-	strtab = mmap(NULL, strsize, PROT_READ, MAP_PRIVATE|MAP_FILE,
-	    fd, stroff);
-	if (strtab == (char *)-1)
-		return (-1);
-	/*
-	 * clean out any left-over information for all valid entries.
-	 * Type and value defined to be 0 if not found; historical
-	 * versions cleared other and desc as well.  Also figure out
-	 * the largest string length so don't read any more of the
-	 * string table than we have to.
-	 *
-	 * XXX clearing anything other than n_type and n_value violates
-	 * the semantics given in the man page.
-	 */
-	nent = 0;
-	for (p = list; !ISLAST(p); ++p) {
-		p->n_type = 0;
-		p->n_other = 0;
-		p->n_desc = 0;
-		p->n_value = 0;
-		++nent;
-	}
-	if (lseek(fd, symoff, SEEK_SET) == -1)
-		return (-1);
-#if defined(__SSP__) || defined(__SSP_ALL__)
-	scoreboard = malloc((size_t)nent);
-#else
-	scoreboard = alloca((size_t)nent);
-#endif
-	if (scoreboard == NULL)
-		return (-1);
-	(void)memset(scoreboard, 0, (size_t)nent);
-
-	while (symsize > 0) {
-		cc = MIN(symsize, sizeof(nbuf));
-		if (read(fd, nbuf, cc) != (ssize_t) cc)
-			break;
-		symsize -= cc;
-		for (s = nbuf; cc > 0; ++s, cc -= sizeof(*s)) {
-			long soff = s->n_un.n_strx;
-
-			if (soff == 0 || (s->n_type & N_STAB) != 0)
-				continue;
-			for (p = list, scored = scoreboard; !ISLAST(p);
-			    p++, scored++)
-				if (*scored == 0 &&
-				    !strcmp(&strtab[(size_t)soff],
-				    p->n_un.n_name)) {
-					p->n_value = s->n_value;
-					p->n_type = s->n_type;
-					p->n_desc = s->n_desc;
-					p->n_other = s->n_other;
-					*scored = 1;
-					if (--nent <= 0)
-						break;
-				}
-		}
-	}
-	munmap(strtab, strsize);
-#if defined(__SSP__) || defined(__SSP_ALL__)
-	free(scoreboard);
-#endif
-	return (nent);
-}
-#endif /* NLIST_AOUT */
diff --git a/lib/libc/gen/nlist_coff.c b/lib/libc/gen/nlist_coff.c
deleted file mode 100644
index c808c82aa..000000000
--- a/lib/libc/gen/nlist_coff.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/* $NetBSD: nlist_coff.c,v 1.11 2012/03/22 14:18:34 christos Exp $ */
-
-/*
- * 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nlist_coff.c,v 1.11 2012/03/22 14:18:34 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <nlist.h>
-
-#include "nlist_private.h"
-#ifdef NLIST_COFF
-#include <sys/exec_coff.h>
-#endif
-
-#ifdef NLIST_COFF
-
-#define ES_LEN 18
-struct coff_extsym {
-	union {
-		char u_name[8];
-		struct {
-			int u_zero;
-			int u_offset;
-		} s;
-	} u;
-	int32_t es_value;
-	int16_t es_scnum;
-	int16_t es_type;
-	int8_t es_class;
-	int8_t es_numaux;
-};
-#define es_name u.u_name
-#define es_zero u.s.u_zero
-#define es_offset u.s.u_offset
-
-int
-__fdnlist_coff(int fd, struct nlist *list)
-{
-	struct nlist *p;
-	struct coff_filehdr *filehdrp;
-	struct stat st;
-	char *mappedfile;
-	size_t mappedsize;
-	u_long symoff, extstroff;
-	int rv, nent;
-	long i, nesyms;
-
-	_DIAGASSERT(fd != -1);
-	_DIAGASSERT(list != NULL);
-
-	rv = -1;
-
-	/*
-	 * If we can't fstat() the file, something bad is going on.
-	 */
-	if (fstat(fd, &st) < 0)
-		goto out;
-
-	/*
-	 * Map the file in its entirety.
-	 */
-	if ((uintmax_t)st.st_size > (uintmax_t)SIZE_T_MAX) {
-		errno = EFBIG;
-		goto out;
-	}
-	mappedsize = (size_t)st.st_size;
-	mappedfile = mmap(NULL, mappedsize, PROT_READ, MAP_PRIVATE|MAP_FILE,
-	    fd, 0);
-	if (mappedfile == MAP_FAILED)
-		goto out;
-
-	/*
-	 * Make sure we can access the executable's header
-	 * directly, and make sure we recognize the executable
-	 * as an COFF binary.
-	 */
-	if (mappedsize < sizeof (struct coff_filehdr))
-		goto unmap;
-	filehdrp = (void *)&mappedfile[0];
-
-	if (COFF_BADMAG(filehdrp))
-		goto unmap;
-
-	/*
-	 * Find the symbol list.
-	 */
-	symoff = filehdrp->f_symptr;
-	nesyms = filehdrp->f_nsyms;
-
-	if (symoff + ES_LEN * nesyms > mappedsize)
-		goto unmap;
-	extstroff = symoff + ES_LEN * nesyms;
-
-	nent = 0;
-	for (p = list; !ISLAST(p); ++p) {
-		p->n_type = 0;
-		p->n_other = 0;
-		p->n_desc = 0;
-		p->n_value = 0;
-		++nent;
-	}
-
-	for (i = 0; i < nesyms; i++) {
-		char *symtabname;
-		const char *nlistname;
-		struct coff_extsym esym;
-		char name[10];
-
-		memcpy(&esym, &mappedfile[symoff + ES_LEN * i], ES_LEN);
-		if (esym.es_numaux != 0) {
-			i += esym.es_numaux;	/* XXX Skip aux entry */
-			continue;
-		}
-			
-		if (esym.es_zero != 0) {
-			memcpy(name, esym.es_name, 8);
-			name[8] = 0;
-			symtabname = name;
-		} else if (esym.es_offset != 0)
-			symtabname = &mappedfile[extstroff + esym.es_offset];
-		else
-			continue;
-
-		for (p = list; !ISLAST(p); p++) {
-			nlistname = N_NAME(p);
-			if (!strcmp(symtabname, nlistname)) {
-				/*
-				 * Translate (roughly) from COFF to nlist
-				 */
-				p->n_value = esym.es_value;
-				p->n_type = N_EXT;		/* XXX */
-				p->n_desc = 0;			/* XXX */
-				p->n_other = 0;			/* XXX */
-
-				if (--nent <= 0)
-					goto done;
-				break;	/* into next run of outer loop */
-			}
-		}
-	}
-
-done:
-	rv = nent;
-unmap:
-	munmap(mappedfile, mappedsize);
-out:
-	return rv;
-}
-
-#endif /* NLIST_COFF */
diff --git a/lib/libc/gen/nlist_ecoff.c b/lib/libc/gen/nlist_ecoff.c
deleted file mode 100644
index 8ac558912..000000000
--- a/lib/libc/gen/nlist_ecoff.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* $NetBSD: nlist_ecoff.c,v 1.23 2012/03/20 00:31:24 matt Exp $ */
-
-/*
- * 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nlist_ecoff.c,v 1.23 2012/03/20 00:31:24 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <nlist.h>
-
-#include "nlist_private.h"
-#ifdef NLIST_ECOFF
-#include <sys/exec_ecoff.h>
-#endif
-
-#ifdef NLIST_ECOFF
-#define	check(off, size) \
-	((size_t)off >= mappedsize || (size_t)(off + size) > mappedsize)
-
-int
-__fdnlist_ecoff(int fd, struct nlist *list)
-{
-	struct nlist *p;
-	const struct ecoff_exechdr *exechdrp;
-	const struct ecoff_symhdr *symhdrp;
-	const struct ecoff_extsym *esyms;
-	struct stat st;
-	const char *mappedfile;
-	size_t mappedsize;
-	u_long symhdroff, extstroff;
-	u_int symhdrsize;
-	int rv, nent;
-	long i, nesyms;
-
-	_DIAGASSERT(fd != -1);
-	_DIAGASSERT(list != NULL);
-
-	rv = -1;
-
-	/*
-	 * If we can't fstat() the file, something bad is going on.
-	 */
-	if (fstat(fd, &st) < 0)
-		goto out;
-
-	/*
-	 * Map the file in its entirety.
-	 */
-	if ((uintmax_t)st.st_size > (uintmax_t)SIZE_T_MAX) {
-		errno = EFBIG;
-		goto out;
-	}
-	mappedsize = (size_t)st.st_size;
-	mappedfile = mmap(NULL, mappedsize, PROT_READ, MAP_PRIVATE|MAP_FILE,
-	    fd, 0);
-	if (mappedfile == MAP_FAILED)
-		goto out;
-
-	/*
-	 * Make sure we can access the executable's header
-	 * directly, and make sure the recognize the executable
-	 * as an ECOFF binary.
-	 */
-	if (check(0, sizeof *exechdrp))
-		goto unmap;
-	exechdrp = (const void *)mappedfile;
-
-	if (ECOFF_BADMAG(exechdrp))
-		goto unmap;
-
-	/*
-	 * Find the symbol list.
-	 */
-	symhdroff = exechdrp->f.f_symptr;
-	symhdrsize = exechdrp->f.f_nsyms;
-
-	if ((symhdroff + sizeof *symhdrp) > mappedsize ||
-	    sizeof *symhdrp != symhdrsize)
-		goto unmap;
-	symhdrp = (const void *)&mappedfile[symhdroff];
-
-	nesyms = symhdrp->esymMax;
-	if (check(symhdrp->cbExtOffset, nesyms * sizeof *esyms))
-		goto unmap;
-	esyms = (const void *)&mappedfile[symhdrp->cbExtOffset];
-	extstroff = symhdrp->cbSsExtOffset;
-
-	/*
-	 * Clean out any left-over information for all valid entries.
-	 * Type and value are defined to be 0 if not found; historical
-	 * versions cleared other and desc as well.
-	 *
-	 * XXX Clearing anything other than n_type and n_value violates
-	 * the semantics given in the man page.
-	 */
-	nent = 0;
-	for (p = list; !ISLAST(p); ++p) {
-		p->n_type = 0;
-		p->n_other = 0;
-		p->n_desc = 0;
-		p->n_value = 0;
-		++nent;
-	}
-
-	for (i = 0; i < nesyms; i++) {
-		for (p = list; !ISLAST(p); p++) {
-			const char *nlistname;
-			const char *symtabname;
-
-			/* This may be incorrect */
-			nlistname = N_NAME(p);
-			if (*nlistname == '_')
-				nlistname++;
-
-			symtabname =
-			    &mappedfile[extstroff + esyms[i].es_strindex];
-
-			if (!strcmp(symtabname, nlistname)) {
-				/*
-				 * Translate (roughly) from ECOFF to nlist
-				 */
-				p->n_value = esyms[i].es_value;
-				p->n_type = N_EXT;		/* XXX */
-				p->n_desc = 0;			/* XXX */
-				p->n_other = 0;			/* XXX */
-
-				if (--nent <= 0)
-					goto done;
-				break;	/* into next run of outer loop */
-			}
-		}
-	}
-
-done:
-	rv = nent;
-unmap:
-	munmap(__UNCONST(mappedfile), mappedsize);
-out:
-	return rv;
-}
-
-#endif /* NLIST_ECOFF */
diff --git a/lib/libc/gen/nlist_elf32.c b/lib/libc/gen/nlist_elf32.c
deleted file mode 100644
index 0b08ba97e..000000000
--- a/lib/libc/gen/nlist_elf32.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/* $NetBSD: nlist_elf32.c,v 1.38 2015/05/20 04:37:45 matt Exp $ */
-
-/*
- * 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nlist_elf32.c,v 1.38 2015/05/20 04:37:45 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-/* If not included by nlist_elf64.c, ELFSIZE won't be defined. */
-#ifndef ELFSIZE
-#define	ELFSIZE		32
-#endif
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <nlist.h>
-
-#include "nlist_private.h"
-#if defined(NLIST_ELF32) || defined(NLIST_ELF64)
-#include <sys/exec_elf.h>
-#endif
-
-#include <sys/ksyms.h>		/* after sys/exec_elf.h */
-
-#if (defined(NLIST_ELF32) && (ELFSIZE == 32)) || \
-    (defined(NLIST_ELF64) && (ELFSIZE == 64))
-
-/* No need to check for off < 0 because it is unsigned */
-#define	check(off, size)	(off + size > mappedsize)
-#define	BAD			goto out
-#define	BADUNMAP		goto unmap
-
-int
-ELFNAMEEND(__fdnlist)(int fd, struct nlist *list)
-{
-	struct stat st;
-	Elf_Ehdr ehdr;
-#if defined(_LP64) || ELFSIZE == 32 || defined(ELF64_MACHDEP_ID)
-#if (ELFSIZE == 32)
-	Elf32_Half nshdr;
-#elif (ELFSIZE == 64)
-	Elf64_Word nshdr;
-#endif
-	/* Only support 64+32 mode on LP64 and those that have defined */
-	/* ELF64_MACHDEP_ID, otherwise no support for 64 mode on ILP32 */
-	Elf_Ehdr *ehdrp;
-	Elf_Shdr *shdrp, *symshdrp, *symstrshdrp;
-	Elf_Sym *symp;
-	Elf_Off shdr_off;
-	Elf_Word shdr_size;
-	struct nlist *p;
-	char *mappedfile, *strtab;
-	size_t mappedsize, nsyms;
-	int nent;
-#endif
-	int rv;
-	size_t i;
-
-	_DIAGASSERT(fd != -1);
-	_DIAGASSERT(list != NULL);
-
-	rv = -1;
-
-	/*
-	 * If we can't fstat() the file, something bad is going on.
-	 */
-	if (fstat(fd, &st) < 0)
-		BAD;
-
-	/*
-	 * Map the file in its entirety.
-	 */
-	if ((uintmax_t)st.st_size > (uintmax_t)SIZE_T_MAX) {
-		errno = EFBIG;
-		BAD;
-	}
-
-	/*
-	 * Read the elf header of the file.
-	 */
-	if ((ssize_t)(i = pread(fd, &ehdr, sizeof(Elf_Ehdr), (off_t)0)) == -1)
-		BAD;
-
-	/*
-	 * Check that the elf header is correct.
-	 */
-	if (i != sizeof(Elf_Ehdr))
-		BAD;
-	if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0 ||
-	    ehdr.e_ident[EI_CLASS] != ELFCLASS)
-		BAD;
-
-	switch (ehdr.e_machine) {
-	ELFDEFNNAME(MACHDEP_ID_CASES)
-
-	default:
-		BAD;
-	}
-#if defined(_LP64) || ELFSIZE == 32 || defined(ELF64_MACHDEP_ID)
-	symshdrp = symstrshdrp = NULL;
-
-	/* Only support 64+32 mode on LP64 and those that have defined */
-	/* ELF64_MACHDEP_ID, otherwise no support for 64 mode on ILP32 */
-	if (S_ISCHR(st.st_mode)) {
-		const char *nlistname;
-		Elf_Sym sym;
-
-		/*
-		 * Character device; assume /dev/ksyms.
-		 */
-		nent = 0;
-		for (p = list; !ISLAST(p); ++p) {
-			struct ksyms_gsymbol kg;
-			int error;
-
-			p->n_other = 0;
-			p->n_desc = 0;
-			nlistname = N_NAME(p);
-			if (*nlistname == '_')
-				nlistname++;
-
-			memset(&kg, 0, sizeof(kg));
-			kg.kg_name = nlistname;
-#ifdef OKIOCGSYMBOL
-			struct ksyms_ogsymbol okg;
-			error = ioctl(fd, KIOCGSYMBOL, &kg);
-			if (error == 0) {
-				sym = kg.kg_sym;
-			} else if (error && errno == ENOTTY) {
-				memset(&okg, 0, sizeof(okg));
-				okg.kg_name = nlistname;
-				okg.kg_sym = &sym;
-				error = ioctl(fd, OKIOCGSYMBOL, &okg);
-			}
-#else
-			kg.kg_sym = &sym;
-			error = ioctl(fd, KIOCGSYMBOL, &kg);
-#endif
-			if (error == 0
-#if !defined(_LP64) && ELFSIZE == 64
-#if __mips__
-			    && (intptr_t)sym.st_value == (intmax_t)sym.st_value
-#else
-			    && (uintptr_t)sym.st_value == sym.st_value
-#endif
-#endif
-			    && 1) {
-				p->n_value = (uintptr_t)sym.st_value;
-				switch (ELF_ST_TYPE(sym.st_info)) {
-				case STT_NOTYPE:
-					p->n_type = N_UNDF;
-					break;
-				case STT_COMMON:
-				case STT_OBJECT:
-					p->n_type = N_DATA;
-					break;
-				case STT_FUNC:
-					p->n_type = N_TEXT;
-					break;
-				case STT_FILE:
-					p->n_type = N_FN;
-					break;
-				default:
-					p->n_type = 0;
-					/* catch other enumerations for gcc */
-					break;
-				}
-				if (ELF_ST_BIND(sym.st_info) != STB_LOCAL)
-					p->n_type |= N_EXT;
-			} else {
-				nent++;
-				p->n_value = 0;
-				p->n_type = 0;
-			}
-		}
-		return nent;
-	}
-
-	mappedsize = (size_t)st.st_size;
-	mappedfile = mmap(NULL, mappedsize, PROT_READ, MAP_PRIVATE|MAP_FILE,
-	    fd, (off_t)0);
-	if (mappedfile == (char *)-1)
-		BAD;
-
-	/*
-	 * Make sure we can access the executable's header
-	 * directly, and make sure the recognize the executable
-	 * as an ELF binary.
-	 */
-	if (check(0, sizeof *ehdrp))
-		BADUNMAP;
-	ehdrp = (Elf_Ehdr *)(void *)&mappedfile[0];
-
-	/*
-	 * Find the symbol list and string table.
-	 */
-	nshdr = ehdrp->e_shnum;
-	shdr_off = ehdrp->e_shoff;
-	shdr_size = ehdrp->e_shentsize * nshdr;
-
-	if (check(shdr_off, shdr_size) ||
-	    (sizeof *shdrp != ehdrp->e_shentsize))
-		BADUNMAP;
-	shdrp = (void *)&mappedfile[(size_t)shdr_off];
-
-	for (i = 0; i < nshdr; i++) {
-		if (shdrp[i].sh_type == SHT_SYMTAB) {
-			symshdrp = &shdrp[i];
-			symstrshdrp = &shdrp[shdrp[i].sh_link];
-		}
-	}
-
-	/* Make sure we're not stripped. */
-	if (symshdrp == NULL || symshdrp->sh_offset == 0)
-		BADUNMAP;
-
-	/* Make sure the symbols and strings are safely mapped. */
-	if (check(symshdrp->sh_offset, symshdrp->sh_size))
-		BADUNMAP;
-	if (check(symstrshdrp->sh_offset, symstrshdrp->sh_size))
-		BADUNMAP;
-
-	symp = (void *)&mappedfile[(size_t)symshdrp->sh_offset];
-	nsyms = (size_t)(symshdrp->sh_size / sizeof(*symp));
-	strtab = &mappedfile[(size_t)symstrshdrp->sh_offset];
-
-	/*
-	 * Clean out any left-over information for all valid entries.
-	 * Type and value are defined to be 0 if not found; historical
-	 * versions cleared other and desc as well.
-	 *
-	 * XXX Clearing anything other than n_type and n_value violates
-	 * the semantics given in the man page.
-	 */
-	nent = 0;
-	for (p = list; !ISLAST(p); ++p) {
-		p->n_type = 0;
-		p->n_other = 0;
-		p->n_desc = 0;
-		p->n_value = 0;
-		++nent;
-	}
-
-	for (i = 0; i < nsyms; i++) {
-		for (p = list; !ISLAST(p); ++p) {
-			const char *nlistname;
-			char *symtabname;
-
-			/* This may be incorrect */
-			nlistname = N_NAME(p);
-			if (*nlistname == '_')
-				nlistname++;
-
-			symtabname = &strtab[symp[i].st_name];
-
-			if (!strcmp(symtabname, nlistname)) {
-				/*
-				 * Translate (roughly) from ELF to nlist
-				 */
-				p->n_value = (uintptr_t)symp[i].st_value;
-				switch (ELF_ST_TYPE(symp[i].st_info)) {
-				case STT_NOTYPE:
-					p->n_type = N_UNDF;
-					break;
-				case STT_OBJECT:
-				case STT_COMMON:
-					p->n_type = N_DATA;
-					break;
-				case STT_FUNC:
-					p->n_type = N_TEXT;
-					break;
-				case STT_FILE:
-					p->n_type = N_FN;
-					break;
-				default:
-					/* catch other enumerations for gcc */
-					break;
-				}
-				if (ELF_ST_BIND(symp[i].st_info) != STB_LOCAL)
-					p->n_type |= N_EXT;
-				p->n_desc = 0;			/* XXX */
-				p->n_other = 0;			/* XXX */
-
-				if (--nent <= 0)
-					goto done;
-				break;	/* into next run of outer loop */
-			}
-		}
-	}
-
-done:
-	rv = nent;
-unmap:
-	munmap(mappedfile, mappedsize);
-#endif /* _LP64 || ELFSIZE == 32 || ELF64_MACHDEP_ID */
-out:
-	return (rv);
-}
-
-#endif
diff --git a/lib/libc/gen/nlist_elf64.c b/lib/libc/gen/nlist_elf64.c
deleted file mode 100644
index 9f9cff26b..000000000
--- a/lib/libc/gen/nlist_elf64.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $NetBSD: nlist_elf64.c,v 1.6 2003/07/26 19:24:43 salo Exp $ */
-
-/*
- * 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nlist_elf64.c,v 1.6 2003/07/26 19:24:43 salo Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define	ELFSIZE		64
-
-#include "nlist_elf32.c"
diff --git a/lib/libc/gen/nlist_private.h b/lib/libc/gen/nlist_private.h
deleted file mode 100644
index 651652480..000000000
--- a/lib/libc/gen/nlist_private.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* $NetBSD: nlist_private.h,v 1.23 2015/06/13 17:28:42 dennis Exp $ */
-
-/*
- * 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#if defined(__alpha__)
-#  define	NLIST_ECOFF
-#  define	NLIST_ELF64
-#elif defined(__x86_64__)
-#  define	NLIST_ELF64
-#  define	NLIST_ELF32
-#elif defined(__mips__)
-#  define	NLIST_ECOFF
-#  define	NLIST_ELF32
-#  ifndef __mips_o32
-#    define	NLIST_ELF64
-#  endif
-#elif defined(__arm__) || defined(__i386__) || defined (__m68k__) || \
-    defined(__powerpc__) || defined(__vax__)
-#  define	NLIST_AOUT
-#  define	NLIST_ELF32
-#elif defined(__sparc__)
-#  define	NLIST_AOUT
-#  define	NLIST_ELF32
-#  define	NLIST_ELF64
-#elif defined(__SH5__)
-#  define	NLIST_ELF32
-#  define	NLIST_ELF64
-#elif defined(__sh__)
-#  define	NLIST_COFF
-#  define	NLIST_ELF32
-#elif defined(__hppa__)
-#  define	NLIST_ELF32
-#elif defined(__riscv__)
-#  define	NLIST_ELF32
-#  ifdef __riscv64
-#    define	NLIST_ELF64
-#  endif
-#elif defined(__aarch64__)
-#  define	NLIST_ELF64
-#else
-#  define	NLIST_AOUT
-/* #define	NLIST_ECOFF */
-/* #define	NLIST_ELF32 */
-/* #define	NLIST_ELF64 */
-#endif
-
-#define	ISLAST(p)	(N_NAME(p) == 0 || N_NAME(p)[0] == 0)
-
-struct nlist;
-
-#ifdef NLIST_AOUT
-int	__fdnlist_aout(int, struct nlist *);
-#endif
-#ifdef NLIST_COFF
-int	__fdnlist_coff(int, struct nlist *);
-#endif
-#ifdef NLIST_ECOFF
-int	__fdnlist_ecoff(int, struct nlist *);
-#endif
-#ifdef NLIST_ELF32
-int	__fdnlist_elf32(int, struct nlist *);
-#endif
-#ifdef NLIST_ELF64
-int	__fdnlist_elf64(int, struct nlist *);
-#endif
diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
deleted file mode 100644
index 5442e6a1c..000000000
--- a/lib/libc/gen/opendir.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*	$NetBSD: opendir.c,v 1.39 2014/11/26 16:48:43 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)opendir.c	8.7 (Berkeley) 12/10/94";
-#else
-__RCSID("$NetBSD: opendir.c,v 1.39 2014/11/26 16:48:43 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include "extern.h"
-
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "dirent_private.h"
-
-static DIR	*__opendir_common(int, const char *, int);
-
-__weak_alias(fdopendir,_fdopendir)
-
-/*
- * Open a directory.
- */
-DIR *
-opendir(const char *name)
-{
-
-	_DIAGASSERT(name != NULL);
-
-	return (__opendir2(name, DTF_HIDEW|DTF_NODUP));
-}
-
-DIR *
-__opendir2(const char *name, int flags)
-{
-	DIR *dirp;
-	int fd;
-
-	if ((fd = open(name, O_RDONLY|O_DIRECTORY|O_NONBLOCK|O_CLOEXEC)) == -1)
-		return NULL;
-
-	dirp = __opendir_common(fd, name, flags);
-	if (dirp == NULL) {
-		int serrno = errno;
-		(void)close(fd);
-		errno = serrno;
-	}
-	return dirp;
-}
-
-#ifndef __LIBC12_SOURCE__
-DIR *
-_fdopendir(int fd)
-{
-	struct stat sb;
-
-	if (fstat(fd, &sb) == -1)
-		return NULL;
-
-	if (!S_ISDIR(sb.st_mode)) {
-		errno = ENOTDIR;
-		return NULL;
-	}
-
-	/* This is optional according to POSIX, but a good measure */
-	if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
-		return NULL;
-
-	return __opendir_common(fd, NULL, DTF_HIDEW|DTF_NODUP);
-}
-#endif
-
-static DIR *
-__opendir_common(int fd, const char *name, int flags)
-{
-	DIR *dirp;
-	int serrno;
-#if !defined(__minix)
-	struct statvfs sfb;
-#else
-	struct stat sb;
-#endif /* !defined(__minix) */
-	int error;
-
-#if defined(__minix)
-	dirp = NULL; /* LSC: Make sure the pointer is initialized */
-	if (fstat(fd, &sb) || !S_ISDIR(sb.st_mode)) {
-		errno = ENOTDIR;
-		goto error;
-	}
-#endif /* defined(__minix) */
-
-	if ((dirp = malloc(sizeof(*dirp))) == NULL)
-		goto error;
-	dirp->dd_buf = NULL;
-	dirp->dd_internal = NULL;
-#ifdef _REENTRANT
-	if (__isthreaded) {
-		if ((dirp->dd_lock = malloc(sizeof(mutex_t))) == NULL)
-			goto error;
-		mutex_init((mutex_t *)dirp->dd_lock, NULL);
-	}
-#endif
-
-	/*
-	 * Tweak flags for the underlying filesystem.
-	 */
-
-#if defined(__minix)
-	/* MOUNT_UNION and MOUNT_NFS not supported */
-	flags &= ~DTF_NODUP;
-#else
-	if (fstatvfs1(fd, &sfb, ST_NOWAIT) < 0)
-		goto error;
-	if ((flags & DTF_NODUP) != 0) {
-		if (!strncmp(sfb.f_fstypename, MOUNT_UNION,
-		    sizeof(sfb.f_fstypename)) ||
-		    (sfb.f_flag & MNT_UNION) != 0) {
-			flags |= __DTF_READALL;
-		} else {
-			flags &= ~DTF_NODUP;
-		}
-	}
-	if (!strncmp(sfb.f_fstypename, MOUNT_NFS, sizeof(sfb.f_fstypename))) {
-		flags |= __DTF_READALL | __DTF_RETRY_ON_BADCOOKIE;
-	}
-#endif /* !defined(__minix) */
-
-	dirp->dd_flags = flags;
-	error = _initdir(dirp, fd, name);
-	if (error) {
-		errno = error;
-		goto error;
-	}
-
-	return (dirp);
-error:
-	serrno = errno;
-	if (dirp != NULL) {
-#ifdef _REENTRANT
-		if (__isthreaded) {
-			mutex_destroy((mutex_t *)dirp->dd_lock);
-			free(dirp->dd_lock);
-		}
-#endif
-		free(dirp->dd_buf);
-	}
-	free(dirp);
-	errno = serrno;
-	return NULL;
-}
diff --git a/lib/libc/gen/pause.3 b/lib/libc/gen/pause.3
deleted file mode 100644
index 413ffbb9a..000000000
--- a/lib/libc/gen/pause.3
+++ /dev/null
@@ -1,92 +0,0 @@
-.\"	$NetBSD: pause.3,v 1.15 2003/08/07 16:42:55 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)pause.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt PAUSE 3
-.Os
-.Sh NAME
-.Nm pause
-.Nd stop until signal
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn pause void
-.Sh DESCRIPTION
-.Bf -symbolic
-Pause is made obsolete by
-.Xr sigsuspend 2 .
-.Ef
-.Pp
-The
-.Fn pause
-function
-forces a process to pause until
-a signal is received from either the
-.Xr kill 2
-function
-or an interval timer.
-(See
-.Xr setitimer 2 . )
-Upon termination of a signal handler started during a
-.Fn pause ,
-the
-.Fn pause
-call will return.
-.Sh RETURN VALUES
-Always returns \-1.
-.Sh ERRORS
-The
-.Fn pause
-function
-always returns:
-.Bl -tag -width Er
-.It Bq Er EINTR
-The call was interrupted.
-.El
-.Sh SEE ALSO
-.Xr kill 2 ,
-.Xr poll 2 ,
-.Xr select 2 ,
-.Xr setitimer 2 ,
-.Xr sigsuspend 2
-.Sh STANDARDS
-The
-.Fn pause
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-A
-.Fn pause
-syscall
-appeared in
-.At v6 .
diff --git a/lib/libc/gen/pause.c b/lib/libc/gen/pause.c
deleted file mode 100644
index 06414c54e..000000000
--- a/lib/libc/gen/pause.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: pause.c,v 1.11 2012/06/24 15:26:03 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)pause.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: pause.c,v 1.11 2012/06/24 15:26:03 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <signal.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(pause,_pause)
-#endif
-
-/*
- * Backwards compatible pause.
- */
-int
-pause(void)
-{
-	sigset_t omask;
-
-	if (sigprocmask(SIG_BLOCK, NULL, &omask) == -1)
-		return -1;
-
-	return sigsuspend(&omask);
-}
diff --git a/lib/libc/gen/popen.3 b/lib/libc/gen/popen.3
deleted file mode 100644
index 4c51f892a..000000000
--- a/lib/libc/gen/popen.3
+++ /dev/null
@@ -1,227 +0,0 @@
-.\"	$NetBSD: popen.3,v 1.20 2015/01/21 08:35:31 wiz Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)popen.3	8.2 (Berkeley) 5/3/95
-.\"
-.Dd January 19, 2015
-.Dt POPEN 3
-.Os
-.Sh NAME
-.Nm popen ,
-.Nm popenve ,
-.Nm pclose
-.Nd process
-.Tn I/O
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft FILE *
-.Fn popen "const char *command" "const char *type"
-.Ft FILE *
-.Fn popenve "const char *path" "char * const *argv" "char * const *envp" "const char *type"
-.Ft int
-.Fn pclose "FILE *stream"
-.Sh DESCRIPTION
-The
-.Fn popen
-function
-.Dq opens
-a process by creating an IPC connection,
-forking,
-and invoking the shell.
-Historically,
-.Nm popen
-was implemented with a unidirectional pipe;
-hence many implementations of
-.Nm popen
-only allow the
-.Fa type
-argument to specify reading or writing, not both.
-Since
-.Nm popen
-is now implemented using sockets, the
-.Fa type
-may request a bidirectional data flow.
-The
-.Fa type
-argument is a pointer to a null-terminated string
-which must be
-.Ql r
-for reading,
-.Ql w
-for writing, or
-.Ql r+
-for reading and writing.
-In addition if the character
-.Ql e
-is present in the
-.Fa type
-string, the file descriptor used internally is set to be closed on
-.Xr exec 3 .
-.Pp
-The
-.Fa command
-argument is a pointer to a null-terminated string
-containing a shell command line.
-This command is passed to
-.Pa /bin/sh
-using the
-.Fl c
-flag; interpretation, if any, is performed by the shell.
-.Pp
-The
-.Fn popenve
-function is similar to
-.Fn popen
-but the first three arguments are passed
-to
-.Xr execve 2
-and there is no shell involved in the command invocation.
-.Pp
-The return value from
-.Fn popen
-and
-.Fn popenve
-is a normal standard
-.Tn I/O
-stream in all respects
-save that it must be closed with
-.Fn pclose
-rather than
-.Fn fclose .
-Writing to such a stream
-writes to the standard input of the command;
-the command's standard output is the same as that of the process that called
-.Fn popen ,
-unless this is altered by the command itself.
-Conversely, reading from a
-.Dq popened
-stream reads the command's standard output, and
-the command's standard input is the same as that of the process that called
-.Fn popen .
-.Pp
-Note that output
-.Fn popen
-streams are fully buffered by default.
-.Pp
-The
-.Fn pclose
-function waits for the associated process to terminate
-and returns the exit status of the command
-as returned by
-.Fn wait4 .
-.Sh RETURN VALUES
-The
-.Fn popen
-function returns
-.Dv NULL
-if the
-.Xr vfork 2 ,
-.Xr pipe 2 ,
-or
-.Xr socketpair 2
-calls fail,
-or if it cannot allocate memory, preserving
-the errno from those functions.
-.Pp
-The
-.Fn pclose
-function
-returns \-1 if
-.Fa stream
-is not associated with a
-.Dq popened
-command, if
-.Fa stream
-has already been
-.Dq pclosed ,
-setting errno to
-.Dv ESRCH
-or if
-.Xr wait4 2
-returns an error, preserving the errno returned by
-.Xr wait4 2 .
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr execve 2 ,
-.Xr fork 2 ,
-.Xr pipe 2 ,
-.Xr socketpair 2 ,
-.Xr wait4 2 ,
-.Xr fclose 3 ,
-.Xr fflush 3 ,
-.Xr fopen 3 ,
-.Xr shquote 3 ,
-.Xr stdio 3 ,
-.Xr system 3
-.Sh STANDARDS
-The
-.Fn popen
-and
-.Fn pclose
-functions conform to
-.St -p1003.2-92 .
-.Sh HISTORY
-A
-.Fn popen
-and a
-.Fn pclose
-function appeared in
-.At v7 .
-.Sh BUGS
-Since the standard input of a command opened for reading
-shares its seek offset with the process that called
-.Fn popen ,
-if the original process has done a buffered read,
-the command's input position may not be as expected.
-Similarly, the output from a command opened for writing
-may become intermingled with that of the original process.
-The latter can be avoided by calling
-.Xr fflush 3
-before
-.Fn popen .
-.Pp
-Failure to execute the shell
-is indistinguishable from the shell's failure to execute command,
-or an immediate exit of the command.
-The only hint is an exit status of 127.
-.Pp
-The
-.Fn popen
-argument
-always calls
-.Xr sh 1 ,
-never calls
-.Xr csh 1 .
-.Pp
-The
-.Fn popenve
-function first appeared in
-.Nx 8 .
diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c
deleted file mode 100644
index 0ed6dcc0c..000000000
--- a/lib/libc/gen/popen.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/*	$NetBSD: popen.c,v 1.35 2015/02/02 22:07:05 christos Exp $	*/
-
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software written by Ken Arnold and
- * published in UNIX Review, Vol. 6, No. 8.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 5/3/95";
-#else
-__RCSID("$NetBSD: popen.c,v 1.35 2015/02/02 22:07:05 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <paths.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "env.h"
-
-#ifdef __weak_alias
-__weak_alias(popen,_popen)
-__weak_alias(pclose,_pclose)
-#endif
-
-static struct pid {
-	struct pid *next;
-	FILE *fp;
-#ifdef _REENTRANT
-	int fd;
-#endif
-	pid_t pid;
-} *pidlist; 
-	
-#ifdef _REENTRANT
-static rwlock_t pidlist_lock = RWLOCK_INITIALIZER;
-#endif
-
-static struct pid *
-pdes_get(int *pdes, const char **type)
-{
-	struct pid *cur;
-	int flags = strchr(*type, 'e') ? O_CLOEXEC : 0;
-	int serrno;
-
-	if (strchr(*type, '+')) {
-		int stype = flags ? (SOCK_STREAM | SOCK_CLOEXEC) : SOCK_STREAM;
-		*type = "r+";
-		if (socketpair(AF_LOCAL, stype, 0, pdes) < 0)
-			return NULL;
-	} else  {
-		*type = strrchr(*type, 'r') ? "r" : "w";
-		if (pipe2(pdes, flags) == -1)
-			return NULL;
-	}
-
-	if ((cur = malloc(sizeof(*cur))) != NULL)
-		return cur;
-	serrno = errno;
-	(void)close(pdes[0]);
-	(void)close(pdes[1]);
-	errno = serrno;
-	return NULL;
-}
-
-static void
-pdes_child(int *pdes, const char *type)
-{
-	struct pid *old;
-
-	/* POSIX.2 B.3.2.2 "popen() shall ensure that any streams
-	   from previous popen() calls that remain open in the 
-	   parent process are closed in the new child process. */
-	for (old = pidlist; old; old = old->next)
-#ifdef _REENTRANT
-		(void)close(old->fd); /* don't allow a flush */
-#else
-		(void)close(fileno(old->fp)); /* don't allow a flush */
-#endif
-
-	if (type[0] == 'r') {
-		(void)close(pdes[0]);
-		if (pdes[1] != STDOUT_FILENO) {
-			(void)dup2(pdes[1], STDOUT_FILENO);
-			(void)close(pdes[1]);
-		}
-		if (type[1] == '+')
-			(void)dup2(STDOUT_FILENO, STDIN_FILENO);
-	} else {
-		(void)close(pdes[1]);
-		if (pdes[0] != STDIN_FILENO) {
-			(void)dup2(pdes[0], STDIN_FILENO);
-			(void)close(pdes[0]);
-		}
-	}
-}
-
-static void
-pdes_parent(int *pdes, struct pid *cur, pid_t pid, const char *type)
-{
-	FILE *iop;
-
-	/* Parent; assume fdopen can't fail. */
-	if (*type == 'r') {
-		iop = fdopen(pdes[0], type);
-#ifdef _REENTRANT
-		cur->fd = pdes[0];
-#endif
-		(void)close(pdes[1]);
-	} else {
-		iop = fdopen(pdes[1], type);
-#ifdef _REENTRANT
-		cur->fd = pdes[1];
-#endif
-		(void)close(pdes[0]);
-	}
-
-	/* Link into list of file descriptors. */
-	cur->fp = iop;
-	cur->pid =  pid;
-	cur->next = pidlist;
-	pidlist = cur;
-}
-
-static void
-pdes_error(int *pdes, struct pid *cur)
-{
-	free(cur);
-	(void)close(pdes[0]);
-	(void)close(pdes[1]);
-}
-
-FILE *
-popen(const char *cmd, const char *type)
-{
-	struct pid *cur;
-	int pdes[2], serrno;
-	pid_t pid;
-
-	_DIAGASSERT(cmd != NULL);
-	_DIAGASSERT(type != NULL);
-
-	if ((cur = pdes_get(pdes, &type)) == NULL)
-		return NULL;
-
-#ifdef _REENTRANT
-	(void)rwlock_rdlock(&pidlist_lock);
-#endif
-	(void)__readlockenv();
-	switch (pid = vfork()) {
-	case -1:			/* Error. */
-		serrno = errno;
-		(void)__unlockenv();
-#ifdef _REENTRANT
-		(void)rwlock_unlock(&pidlist_lock);
-#endif
-		pdes_error(pdes, cur);
-		errno = serrno;
-		return NULL;
-		/* NOTREACHED */
-	case 0:				/* Child. */
-		pdes_child(pdes, type);
-		execl(_PATH_BSHELL, "sh", "-c", cmd, NULL);
-		_exit(127);
-		/* NOTREACHED */
-	}
-	(void)__unlockenv();
-
-	pdes_parent(pdes, cur, pid, type);
-
-#ifdef _REENTRANT
-	(void)rwlock_unlock(&pidlist_lock);
-#endif
-
-	return cur->fp;
-}
-
-FILE *
-popenve(const char *cmd, char *const *argv, char *const *envp, const char *type)
-{
-	struct pid *cur;
-	int pdes[2], serrno;
-	pid_t pid;
-
-	_DIAGASSERT(cmd != NULL);
-	_DIAGASSERT(type != NULL);
-
-	if ((cur = pdes_get(pdes, &type)) == NULL)
-		return NULL;
-
-#ifdef _REENTRANT
-	(void)rwlock_rdlock(&pidlist_lock);
-#endif
-	switch (pid = vfork()) {
-	case -1:			/* Error. */
-		serrno = errno;
-#ifdef _REENTRANT
-		(void)rwlock_unlock(&pidlist_lock);
-#endif
-		pdes_error(pdes, cur);
-		errno = serrno;
-		return NULL;
-		/* NOTREACHED */
-	case 0:				/* Child. */
-		pdes_child(pdes, type);
-		execve(cmd, argv, envp);
-		_exit(127);
-		/* NOTREACHED */
-	}
-
-	pdes_parent(pdes, cur, pid, type);
-
-#ifdef _REENTRANT
-	(void)rwlock_unlock(&pidlist_lock);
-#endif
-
-	return cur->fp;
-}
-
-/*
- * pclose --
- *	Pclose returns -1 if stream is not associated with a `popened' command,
- *	if already `pclosed', or waitpid returns an error.
- */
-int
-pclose(FILE *iop)
-{
-	struct pid *cur, *last;
-	int pstat;
-	pid_t pid;
-
-	_DIAGASSERT(iop != NULL);
-
-#ifdef _REENTRANT
-	rwlock_wrlock(&pidlist_lock);
-#endif
-
-	/* Find the appropriate file pointer. */
-	for (last = NULL, cur = pidlist; cur; last = cur, cur = cur->next)
-		if (cur->fp == iop)
-			break;
-	if (cur == NULL) {
-#ifdef _REENTRANT
-		(void)rwlock_unlock(&pidlist_lock);
-#endif
-		errno = ESRCH;
-		return -1;
-	}
-
-	(void)fclose(iop);
-
-	/* Remove the entry from the linked list. */
-	if (last == NULL)
-		pidlist = cur->next;
-	else
-		last->next = cur->next;
-
-#ifdef _REENTRANT
-	(void)rwlock_unlock(&pidlist_lock);
-#endif
-
-	do {
-		pid = waitpid(cur->pid, &pstat, 0);
-	} while (pid == -1 && errno == EINTR);
-
-	free(cur);
-
-	return pid == -1 ? -1 : pstat;
-}
diff --git a/lib/libc/gen/posix_spawn.3 b/lib/libc/gen/posix_spawn.3
deleted file mode 100644
index 67f5bb408..000000000
--- a/lib/libc/gen/posix_spawn.3
+++ /dev/null
@@ -1,484 +0,0 @@
-.\" $NetBSD: posix_spawn.3,v 1.6 2014/02/02 16:59:06 wiz Exp $
-.\"
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawn.3,v 1.2.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
-.\"
-.Dd February 2, 2014
-.Dt POSIX_SPAWN 3
-.Os
-.Sh NAME
-.Nm posix_spawn ,
-.Nm posix_spawnp
-.Nd "spawn a process"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawn "pid_t *restrict pid" "const char *restrict path" "const posix_spawn_file_actions_t *file_actions" "const posix_spawnattr_t *restrict attrp" "char *const argv[restrict]" "char *const envp[restrict]"
-.Ft int
-.Fn posix_spawnp "pid_t *restrict pid" "const char *restrict file" "const posix_spawn_file_actions_t *file_actions" "const posix_spawnattr_t *restrict attrp" "char *const argv[restrict]" "char *const envp[restrict]"
-.Sh DESCRIPTION
-The
-.Fn posix_spawn
-and
-.Fn posix_spawnp
-functions create a new process (child process) from the specified
-process image.
-The new process image is constructed from a regular executable
-file called the new process image file.
-.Pp
-When a C program is executed as the result of this call, it is
-entered as a C-language function call as follows:
-.Bd -literal -offset indent
-int main(int argc, char *argv[]);
-.Ed
-.Pp
-where
-.Fa argc
-is the argument count and
-.Fa argv
-is an array of character pointers to the arguments themselves.
-In addition, the variable:
-.Bd -literal -offset indent
-extern char **environ;
-.Ed
-.Pp
-points to an array of character pointers to
-the environment strings.
-.Pp
-The argument
-.Fa argv
-is an array of character pointers to null-terminated
-strings.
-The last member of this array is a null pointer and is not counted
-in
-.Fa argc .
-These strings constitute the argument list available to the new process
-image.
-The value in
-.Fa argv Ns [0]
-should point to
-a filename that is associated with the process image being started by
-the
-.Fn posix_spawn
-or
-.Fn posix_spawnp
-function.
-.Pp
-The argument
-.Fa envp
-is an array of character pointers to null-terminated strings.
-These strings constitute the environment for the new process image.
-The environment array is terminated by a null pointer.
-.Pp
-The
-.Fa path
-argument to
-.Fn posix_spawn
-is a pathname that identifies the new process image file to execute.
-.Pp
-The
-.Fa file
-parameter to
-.Fn posix_spawnp
-is used to construct a pathname that identifies the new process
-image file.
-If the file parameter contains a slash character, the file parameter
-is used as the pathname for the new process image file.
-Otherwise, the path prefix for this file is obtained by a search
-of the directories passed as the environment variable
-.Dq Ev PATH .
-If this variable is not specified,
-the default path is set according to the
-.Dv _PATH_DEFPATH
-definition in
-.In paths.h ,
-which is set to
-.Dq Ev /usr/bin:/bin .
-.Pp
-If
-.Fa file_actions
-is a null pointer, then file descriptors open in the
-calling process remain open in the child process, except for those
-whose close-on-exec flag
-.Dv FD_CLOEXEC
-is set (see
-.Fn fcntl ) .
-For those
-file descriptors that remain open, all attributes of the corresponding
-open file descriptions, including file locks (see
-.Fn fcntl ) ,
-remain unchanged.
-.Pp
-If
-.Fa file_actions
-is not
-.Dv NULL ,
-then the file descriptors open in the child process are
-those open in the calling process as modified by the spawn file
-actions object pointed to by
-.Fa file_actions
-and the
-.Dv FD_CLOEXEC
-flag of each remaining open file descriptor after the spawn file actions
-have been processed.
-The effective order of processing the spawn file actions are:
-.Bl -enum
-.It
-The set of open file descriptors for the child process initially
-are the same set as is open for the calling process.
-All attributes of the corresponding open file descriptions, including
-file locks (see
-.Fn fcntl ) ,
-remain unchanged.
-.It
-The signal mask, signal default actions, and the effective user and
-group IDs for the child process are changed as specified in the
-attributes object referenced by
-.Fa attrp .
-.It
-The file actions specified by the spawn file actions object are
-performed in the order in which they were added to the spawn file
-actions object.
-.It
-Any file descriptor that has its
-.Dv FD_CLOEXEC
-flag set (see
-.Fn fcntl )
-is closed.
-.El
-.Pp
-The maximum number of
-.Fa file_actions
-objects is limited to the
-.Dv RLIMIT_NOFILE
-rlimit times 2.
-.Pp
-The
-.Vt posix_spawnattr_t
-spawn attributes object type is defined in
-.In spawn.h .
-It contains the attributes defined below.
-.Pp
-If the
-.Dv POSIX_SPAWN_SETPGROUP
-flag is set in the spawn-flags attribute of the object referenced by
-.Fa attrp ,
-and the spawn-pgroup attribute of the same object is non-zero, then the
-child's process group is as specified in the spawn-pgroup
-attribute of the object referenced by
-.Fa attrp .
-.Pp
-As a special case, if the
-.Dv POSIX_SPAWN_SETPGROUP
-flag is set in the spawn-flags attribute of the object referenced by
-.Fa attrp ,
-and the spawn-pgroup attribute of the same object is set to zero, then
-the child is in a new process group with a process group ID equal
-to its process ID.
-.Pp
-If the
-.Dv POSIX_SPAWN_SETPGROUP
-flag is not set in the spawn-flags attribute of the object referenced by
-.Fa attrp ,
-the new child process inherits the parent's process group.
-.Pp
-If the
-.Dv POSIX_SPAWN_SETSCHEDPARAM
-flag is set in the spawn-flags attribute of the object referenced by
-.Fa attrp ,
-but
-.Dv POSIX_SPAWN_SETSCHEDULER
-is not set, the new process image initially has the scheduling
-policy of the calling process with the scheduling parameters specified
-in the spawn-schedparam attribute of the object referenced by
-.Fa attrp .
-.Pp
-If the
-.Dv POSIX_SPAWN_SETSCHEDULER
-flag is set in the spawn-flags attribute of the object referenced by
-.Fa attrp
-(regardless of the setting of the
-.Dv POSIX_SPAWN_SETSCHEDPARAM
-flag), the new process image initially has the scheduling policy
-specified in the spawn-schedpolicy attribute of the object referenced by
-.Fa attrp
-and the scheduling parameters specified in the spawn-schedparam
-attribute of the same object.
-.Pp
-The
-.Dv POSIX_SPAWN_RESETIDS
-flag in the spawn-flags attribute of the object referenced by
-.Fa attrp
-governs the effective user ID of the child process.
-If this flag is not set, the child process inherits the parent
-process' effective user ID.
-If this flag is set, the child process' effective user ID is reset
-to the parent's real user ID.
-In either case, if the set-user-ID mode bit of the new process image
-file is set, the effective user ID of the child process becomes
-that file's owner ID before the new process image begins execution.
-.Pp
-The
-.Dv POSIX_SPAWN_RESETIDS
-flag in the spawn-flags attribute of the object referenced by
-.Fa attrp
-also governs the effective group ID of the child process.
-If this flag is not set, the child process inherits the parent
-process' effective group ID.
-If this flag is set, the child process' effective group ID is
-reset to the parent's real group ID.
-In either case, if the set-group-ID mode bit of the new process image
-file is set, the effective group ID of the child process becomes
-that file's group ID before the new process image begins execution.
-.Pp
-If the
-.Dv POSIX_SPAWN_SETSIGMASK
-flag is set in the spawn-flags attribute of the object referenced by
-.Fa attrp ,
-the child process initially has the signal mask specified in the
-spawn-sigmask attribute of the object referenced by
-.Fa attrp .
-.Pp
-If the
-.Dv POSIX_SPAWN_SETSIGDEF
-flag is set in the spawn-flags attribute of the object referenced by
-.Fa attrp ,
-the signals specified in the spawn-sigdefault attribute of the same
-object is set to their default actions in the child process.
-Signals set to the default action in the parent process is set to
-the default action in the child process.
-.Pp
-Signals set to be caught by the calling process is set to the
-default action in the child process.
-.Pp
-Signals set to be ignored by the calling process image is set to
-be ignored by the child process, unless otherwise specified by the
-.Dv POSIX_SPAWN_SETSIGDEF
-flag being set in the spawn-flags attribute of the object referenced by
-.Fa attrp
-and the signals being indicated in the spawn-sigdefault attribute
-of the object referenced by
-.Fa attrp .
-.Pp
-If the value of the
-.Fa attrp
-pointer is
-.Dv NULL ,
-then the default values are used.
-.Pp
-All process attributes, other than those influenced by the attributes
-set in the object referenced by
-.Fa attrp
-as specified above or by the file descriptor manipulations specified in
-.Fa file_actions ,
-appear in the new process image as though
-.Fn vfork
-had been called to create a child process and then
-.Fn execve
-had been called by the child process to execute the new process image.
-.Pp
-The implementation uses vfork(), thus the fork handlers are not run when
-.Fn posix_spawn
-or
-.Fn posix_spawnp
-is called.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn posix_spawn
-and
-.Fn posix_spawnp
-return the process ID of the child process to the parent process,
-in the variable pointed to by a
-.Pf non- Dv NULL
-.Fa pid
-argument, and return zero as the function return value.
-Otherwise, no child process is created, no value is stored into
-the variable pointed to by
-.Fa pid ,
-and an error number is returned as the function return value to
-indicate the error.
-If the
-.Fa pid
-argument is a null pointer, the process ID of the child is not returned
-to the caller.
-.Sh ERRORS
-.Bl -enum
-.It
-If
-.Fn posix_spawn
-and
-.Fn posix_spawnp
-fail for any of the reasons that would cause
-.Fn vfork
-or one of the
-.Nm exec
-to fail, an error value is returned as described by
-.Fn vfork
-and
-.Nm exec ,
-respectively (or, if the error occurs after the calling process successfully
-returns, the child process exits with exit status 127).
-.It
-If
-.Nm POSIX_SPAWN_SETPGROUP
-is set in the spawn-flags attribute of the object referenced by attrp, and
-.Fn posix_spawn
-or
-.Fn posix_spawnp
-fails while changing the child's process group, an error value is returned as
-described by
-.Fn setpgid
-(or, if the error occurs after the calling process successfully returns,
-the child process exits with exit status 127).
-.It
-If
-.Nm POSIX_SPAWN_SETSCHEDPARAM
-is set and
-.Nm POSIX_SPAWN_SETSCHEDULER
-is not set in the spawn-flags attribute of the object referenced by attrp, then
-if
-.Fn posix_spawn
-or
-.Fn posix_spawnp
-fails for any of the reasons that would cause
-.Fn sched_setparam
-to fail, an error value is returned as described by
-.Fn sched_setparam
-(or, if the error occurs after the calling process successfully returns, the
-child process exits with exit status 127).
-.It
-If
-.Nm POSIX_SPAWN_SETSCHEDULER
-is set in the spawn-flags attribute of the object referenced by attrp, and if
-.Fn posix_spawn
-or
-.Fn posix_spawnp
-fails for any of the reasons that would cause
-.Fn sched_setscheduler
-to fail, an error value is returned as described by
-.Fn sched_setscheduler
-(or, if the error occurs after the calling process successfully returns,
-the child process exits with exit status 127).
-.It
-If the
-.Fa file_actions
-argument is not
-.Dv NULL ,
-and specifies any
-.Fn close ,
-.Fn dup2 ,
-or
-.Fn open
-actions to be performed, and if
-.Fn posix_spawn
-or
-.Fn posix_spawnp
-fails for any of the reasons that would cause
-.Fn close ,
-.Fn dup2 ,
-or
-.Fn open
-to fail, an error value is returned as described by
-.Fn close ,
-.Fn dup2 ,
-and
-.Fn open ,
-respectively (or, if the error occurs after the calling process successfully
-returns, the child process exits with exit status 127). An open file action
-may, by itself, result in any of the errors described by
-.Fn close
-or
-.Fn dup2 ,
-in addition to those described by
-.Fn open .
-Finally, if the number of
-.Fa file_actions
-objects exceeds the allowed limit,
-.Er EINVAL
-is returned.
-.El
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr dup2 2 ,
-.Xr execve 2 ,
-.Xr fcntl 2 ,
-.Xr open 2 ,
-.Xr setpgid 2 ,
-.Xr vfork 2 ,
-.Xr posix_spawn_file_actions_addclose 3 ,
-.Xr posix_spawn_file_actions_adddup2 3 ,
-.Xr posix_spawn_file_actions_addopen 3 ,
-.Xr posix_spawn_file_actions_destroy 3 ,
-.Xr posix_spawn_file_actions_init 3 ,
-.Xr posix_spawnattr_destroy 3 ,
-.Xr posix_spawnattr_getflags 3 ,
-.Xr posix_spawnattr_getpgroup 3 ,
-.Xr posix_spawnattr_getschedparam 3 ,
-.Xr posix_spawnattr_getschedpolicy 3 ,
-.Xr posix_spawnattr_getsigdefault 3 ,
-.Xr posix_spawnattr_getsigmask 3 ,
-.Xr posix_spawnattr_init 3 ,
-.Xr posix_spawnattr_setflags 3 ,
-.Xr posix_spawnattr_setpgroup 3 ,
-.Xr posix_spawnattr_setschedparam 3 ,
-.Xr posix_spawnattr_setschedpolicy 3 ,
-.Xr posix_spawnattr_setsigdefault 3 ,
-.Xr posix_spawnattr_setsigmask 3 ,
-.Xr sched_setparam 3 ,
-.Xr sched_setscheduler 3
-.Sh STANDARDS
-The
-.Fn posix_spawn
-and
-.Fn posix_spawnp
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawn
-and
-.Fn posix_spawnp
-functions first appeared in
-.Fx 8.0 .
-The library parts were ported and a kernel implementation of
-.Fn posix_spawn
-added for
-.Nx 6.0
-during Google Summer of Code by Charles Zhang and Martin Husemann.
-.Sh AUTHORS
-.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
deleted file mode 100644
index 9a23d6f9e..000000000
--- a/lib/libc/gen/posix_spawn_file_actions_addopen.3
+++ /dev/null
@@ -1,190 +0,0 @@
-.\" $NetBSD: posix_spawn_file_actions_addopen.3,v 1.5 2014/02/02 16:59:13 wiz Exp $
-.\"
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_addopen.3,v 1.2.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
-.\"
-.Dd February 2, 2014
-.Dt POSIX_SPAWN_FILE_ACTIONS_ADDOPEN 3
-.Os
-.Sh NAME
-.Nm posix_spawn_file_actions_addopen ,
-.Nm posix_spawn_file_actions_adddup2 ,
-.Nm posix_spawn_file_actions_addclose
-.Nd "add open, dup2 or close action to spawn file actions object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawn_file_actions_addopen "posix_spawn_file_actions_t * file_actions" "int fildes" "const char *restrict path" "int oflag" "mode_t mode"
-.Ft int
-.Fn posix_spawn_file_actions_adddup2 "posix_spawn_file_actions_t * file_actions" "int fildes" "int newfildes"
-.Ft int
-.Fn posix_spawn_file_actions_addclose "posix_spawn_file_actions_t * file_actions" "int fildes"
-.Sh DESCRIPTION
-These functions add an open, dup2 or close action to a spawn
-file actions object.
-.Pp
-A spawn file actions object is of type
-.Vt posix_spawn_file_actions_t
-(defined in
-.In spawn.h )
-and is used to specify a series of actions to be performed by a
-.Fn posix_spawn
-or
-.Fn posix_spawnp
-operation in order to arrive at the set of open file descriptors for the
-child process given the set of open file descriptors of the parent.
-.Pp
-A spawn file actions object, when passed to
-.Fn posix_spawn
-or
-.Fn posix_spawnp ,
-specify how the set of open file descriptors in the calling
-process is transformed into a set of potentially open file descriptors
-for the spawned process.
-This transformation is as if the specified sequence of actions was
-performed exactly once, in the context of the spawned process (prior to
-execution of the new process image), in the order in which the actions
-were added to the object; additionally, when the new process image is
-executed, any file descriptor (from this new set) which has its
-.Dv FD_CLOEXEC
-flag set is closed (see
-.Fn posix_spawn ) .
-.Pp
-The
-.Fn posix_spawn_file_actions_addopen
-function adds an open action to the object referenced by
-.Fa file_actions
-that causes the file named by
-.Fa path
-to be opened (as if
-.Bd -literal -offset indent
-open(path, oflag, mode)
-.Ed
-.Pp
-had been called, and the returned file descriptor, if not
-.Fa fildes ,
-had been changed to
-.Fa fildes )
-when a new process is spawned using this file actions object.
-If
-.Fa fildes
-was already an open file descriptor, it is closed before the new
-file is opened.
-.Pp
-The string described by
-.Fa path
-is copied by the
-.Fn posix_spawn_file_actions_addopen
-function.
-.Pp
-The
-.Fn posix_spawn_file_actions_adddup2
-function adds a dup2 action to the object referenced by
-.Fa file_actions
-that causes the file descriptor
-.Fa fildes
-to be duplicated as
-.Fa newfildes
-(as if
-.Bd -literal -offset indent
-dup2(fildes, newfildes)
-.Ed
-.Pp
-had been called) when a new process is spawned using this file actions object.
-.Pp
-The
-.Fn posix_spawn_file_actions_addclose
-function adds a close action to the object referenced by
-.Fa file_actions
-that causes the file descriptor
-.Fa fildes
-to be closed (as if
-.Bd -literal -offset indent
-close(fildes)
-.Ed
-.Pp
-had been called) when a new process is spawned using this file actions
-object.
-.Sh RETURN VALUES
-Upon successful completion, these functions return zero;
-otherwise, an error number is returned to indicate the error.
-.Sh ERRORS
-These
-functions fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The value specified by
-.Fa fildes
-or
-.Fa newfildes
-is negative.
-.It Bq Er EINVAL
-The value specified by
-.Fa file_actions
-is invalid.
-.It Bq Er ENOMEM
-Insufficient memory exists to add to the spawn file actions object.
-.El
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr dup2 2 ,
-.Xr open 2 ,
-.Xr posix_spawn 3 ,
-.Xr posix_spawn_file_actions_destroy 3 ,
-.Xr posix_spawn_file_actions_init 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawn_file_actions_addopen ,
-.Fn posix_spawn_file_actions_adddup2
-and
-.Fn posix_spawn_file_actions_addclose
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawn_file_actions_addopen ,
-.Fn posix_spawn_file_actions_adddup2
-and
-.Fn posix_spawn_file_actions_addclose
-functions first appeared in
-.Fx 8.0
-and imported for
-.Nx 6.0 .
-.Sh AUTHORS
-.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
deleted file mode 100644
index d33a09c26..000000000
--- a/lib/libc/gen/posix_spawn_file_actions_init.3
+++ /dev/null
@@ -1,112 +0,0 @@
-.\" $NetBSD: posix_spawn_file_actions_init.3,v 1.5 2014/02/02 16:59:13 wiz Exp $
-.\"
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_init.3,v 1.1.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
-.\"
-.Dd February 2, 2014
-.Dt POSIX_SPAWN_FILE_ACTIONS_INIT 3
-.Os
-.Sh NAME
-.Nm posix_spawn_file_actions_init ,
-.Nm posix_spawn_file_actions_destroy
-.Nd "initialize and destroy spawn file actions object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawn_file_actions_init "posix_spawn_file_actions_t * file_actions"
-.Ft int
-.Fn posix_spawn_file_actions_destroy "posix_spawn_file_actions_t * file_actions"
-.Sh DESCRIPTION
-The
-.Fn posix_spawn_file_actions_init
-function initialize the object referenced by
-.Fn file_actions
-to contain no file actions for
-.Fn posix_spawn
-or
-.Fn posix_spawnp .
-Initializing an already initialized spawn file actions object may cause
-memory to be leaked.
-.Pp
-The
-.Fn posix_spawn_file_actions_destroy
-function destroy the object referenced by
-.Fa file_actions ;
-the object becomes, in effect, uninitialized.
-A destroyed spawn file actions object can be reinitialized using
-.Fn posix_spawn_file_actions_init .
-The object should not be used after it has been destroyed.
-.Sh RETURN VALUES
-Upon successful completion, these functions return zero;
-otherwise, an error number is returned to indicate the error.
-.Sh ERRORS
-The
-.Fn posix_spawn_file_actions_init
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value specified by
-.Fa file_actions
-is invalid.
-.It Bq Er ENOMEM
-Insufficient memory exists to initialize the spawn file actions object.
-.El
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawn_file_actions_addclose 3 ,
-.Xr posix_spawn_file_actions_adddup2 3 ,
-.Xr posix_spawn_file_actions_addopen 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawn_file_actions_init
-and
-.Fn posix_spawn_file_actions_destroy
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawn_file_actions_init
-and
-.Fn posix_spawn_file_actions_destroy
-functions first appeared in
-.Fx 8.0
-and imported for
-.Nx 6.0 .
-.Sh AUTHORS
-.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawn_fileactions.c b/lib/libc/gen/posix_spawn_fileactions.c
deleted file mode 100644
index c19ab69df..000000000
--- a/lib/libc/gen/posix_spawn_fileactions.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*-
- * Copyright (c) 2008 Ed Schouten <ed@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>
-__RCSID("$NetBSD: posix_spawn_fileactions.c,v 1.4 2014/02/02 14:54:39 martin Exp $");
-
-#include "namespace.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <sched.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <spawn.h>
-
-#define MIN_SIZE	16
-
-/*
- * File descriptor actions
- */
-
-int
-posix_spawn_file_actions_init(posix_spawn_file_actions_t *fa)
-{
-	if (fa == NULL)
-		return EINVAL;
-
-	fa->fae = malloc(MIN_SIZE * sizeof(struct posix_spawn_file_actions_entry));
-	if (fa->fae == NULL)
-		return ENOMEM;
-	fa->size = MIN_SIZE;
-	fa->len = 0;
-
-	return 0;
-}
-
-int
-posix_spawn_file_actions_destroy(posix_spawn_file_actions_t *fa)
-{
-	unsigned int i;
-
-	if (fa == NULL)
-		return EINVAL;
-
-	for (i = 0; i < fa->len; i++) {
-		if (fa->fae[i].fae_action == FAE_OPEN)
-			free(fa->fae[i].fae_path);
-	}
-
-	free(fa->fae);
-	return 0;
-}
-
-static int
-posix_spawn_file_actions_getentry(posix_spawn_file_actions_t *fa,
-    unsigned int *i)
-{
-	posix_spawn_file_actions_entry_t *fae;
-
-	if (fa == NULL)
-		return EINVAL;
-
-	if (fa->len < fa->size)
-		goto out;
-
-	fae = realloc(fa->fae, (fa->size + MIN_SIZE) * sizeof(*fa->fae));
-	if (fae == NULL)
-		return ENOMEM;
-
-	fa->fae = fae;
-	fa->size += MIN_SIZE;
-
-out:
-	*i = fa->len;
-	return 0;
-}
-
-int
-posix_spawn_file_actions_addopen(posix_spawn_file_actions_t * __restrict fa,
-    int fildes, const char * __restrict path, int oflag, mode_t mode)
-{
-	char *faepath;
-	unsigned int i;
-	int error;
-
-	if (fildes < 0)
-		return EBADF;
-
-	error = posix_spawn_file_actions_getentry(fa, &i);
-	if (error)
-		return error;
-
-	faepath = strdup(path);
-	if (faepath == NULL)
-		return ENOMEM;
-
-	fa->fae[i].fae_action = FAE_OPEN;
-	fa->fae[i].fae_path = faepath;
-	fa->fae[i].fae_fildes = fildes;
-	fa->fae[i].fae_oflag = oflag;
-	fa->fae[i].fae_mode = mode;
-	fa->len++;
-
-	return 0;
-}
-
-int
-posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t *fa,
-    int fildes, int newfildes)
-{
-	unsigned int i;
-	int error;
-
-	if (fildes < 0 || newfildes < 0)
-		return EBADF;
-
-	error = posix_spawn_file_actions_getentry(fa, &i);
-	if (error)
-		return error;
-
-	fa->fae[i].fae_action = FAE_DUP2;
-	fa->fae[i].fae_fildes = fildes;
-	fa->fae[i].fae_newfildes = newfildes;
-	fa->len++;
-
-	return 0;
-}
-
-int
-posix_spawn_file_actions_addclose(posix_spawn_file_actions_t *fa,
-    int fildes)
-{
-	unsigned int i;
-	int error;
-
-	if (fildes < 0)
-		return EBADF;
-
-	error = posix_spawn_file_actions_getentry(fa, &i);
-	if (error)
-		return error;
-
-	fa->fae[i].fae_action = FAE_CLOSE;
-	fa->fae[i].fae_fildes = fildes;
-	fa->len++;
-
-	return 0;
-}
diff --git a/lib/libc/gen/posix_spawn_sched.c b/lib/libc/gen/posix_spawn_sched.c
deleted file mode 100644
index dc1dda9e7..000000000
--- a/lib/libc/gen/posix_spawn_sched.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * Copyright (c) 2008 Ed Schouten <ed@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>
-__RCSID("$NetBSD: posix_spawn_sched.c,v 1.2 2014/02/02 14:54:39 martin Exp $");
-
-#include "namespace.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <sched.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <spawn.h>
-
-/*
- * Spawn attributes
- */
-
-int
-posix_spawnattr_init(posix_spawnattr_t *ret)
-{
-	if (ret == NULL)
-		return -1;
-	
-	memset(ret, 0, sizeof(posix_spawnattr_t));
-	return 0;
-}
-
-int
-posix_spawnattr_destroy(posix_spawnattr_t *sa)
-{
-	if (sa == NULL)
-		return -1;
-
-	return 0;
-}
-
-int
-posix_spawnattr_getflags(const posix_spawnattr_t * __restrict sa,
-    short * __restrict flags)
-{
-	*flags = sa->sa_flags;
-	return 0;
-}
-
-int
-posix_spawnattr_getpgroup(const posix_spawnattr_t * __restrict sa,
-    pid_t * __restrict pgroup)
-{
-	*pgroup = sa->sa_pgroup;
-	return 0;
-}
-
-int
-posix_spawnattr_getschedparam(const posix_spawnattr_t * __restrict sa,
-    struct sched_param * __restrict schedparam)
-{
-	*schedparam = sa->sa_schedparam;
-	return 0;
-}
-
-int
-posix_spawnattr_getschedpolicy(const posix_spawnattr_t * __restrict sa,
-    int * __restrict schedpolicy)
-{
-	*schedpolicy = sa->sa_schedpolicy;
-	return 0;
-}
-
-int
-posix_spawnattr_getsigdefault(const posix_spawnattr_t * __restrict sa,
-    sigset_t * __restrict sigdefault)
-{
-	*sigdefault = sa->sa_sigdefault;
-	return 0;
-}
-
-int
-posix_spawnattr_getsigmask(const posix_spawnattr_t * __restrict sa,
-    sigset_t * __restrict sigmask)
-{
-	*sigmask = sa->sa_sigmask;
-	return 0;
-}
-
-int
-posix_spawnattr_setflags(posix_spawnattr_t *sa, short flags)
-{
-	sa->sa_flags = flags;
-	return 0;
-}
-
-int
-posix_spawnattr_setpgroup(posix_spawnattr_t *sa, pid_t pgroup)
-{
-	sa->sa_pgroup = pgroup;
-	return 0;
-}
-
-int
-posix_spawnattr_setschedparam(posix_spawnattr_t * __restrict sa,
-    const struct sched_param * __restrict schedparam)
-{
-	sa->sa_schedparam = *schedparam;
-	return 0;
-}
-
-int
-posix_spawnattr_setschedpolicy(posix_spawnattr_t *sa, int schedpolicy)
-{
-	sa->sa_schedpolicy = schedpolicy;
-	return 0;
-}
-
-int
-posix_spawnattr_setsigdefault(posix_spawnattr_t * __restrict sa,
-    const sigset_t * __restrict sigdefault)
-{
-	sa->sa_sigdefault = *sigdefault;
-	return 0;
-}
-
-int
-posix_spawnattr_setsigmask(posix_spawnattr_t * __restrict sa,
-    const sigset_t * __restrict sigmask)
-{
-	sa->sa_sigmask = *sigmask;
-	return 0;
-}
diff --git a/lib/libc/gen/posix_spawnattr_getflags.3 b/lib/libc/gen/posix_spawnattr_getflags.3
deleted file mode 100644
index bb29c53be..000000000
--- a/lib/libc/gen/posix_spawnattr_getflags.3
+++ /dev/null
@@ -1,115 +0,0 @@
-.\" $NetBSD: posix_spawnattr_getflags.3,v 1.4 2014/03/18 18:20:37 riastradh Exp $
-.\"
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getflags.3,v 1.1.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
-.\"
-.Dd December 20, 2011
-.Dt POSIX_SPAWNATTR_GETFLAGS 3
-.Os
-.Sh NAME
-.Nm posix_spawnattr_getflags ,
-.Nm posix_spawnattr_setflags
-.Nd "get and set the spawn-flags attribute of a spawn attributes object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawnattr_getflags "const posix_spawnattr_t *restrict attr" "short *restrict flags"
-.Ft int
-.Fn posix_spawnattr_setflags "posix_spawnattr_t *attr" "short flags"
-.Sh DESCRIPTION
-The
-.Fn posix_spawnattr_getflags
-function obtains the value of the spawn-flags attribute from the
-attributes object referenced by
-.Fa attr .
-.Pp
-The
-.Fn posix_spawnattr_setflags
-function sets the spawn-flags attribute in an initialized
-attributes object referenced by
-.Fa attr .
-.Pp
-The spawn-flags attribute is used to indicate which process attributes
-are to be changed in the new process image when invoking
-.Fn posix_spawn
-or
-.Fn posix_spawnp .
-It is the bitwise-inclusive OR of zero or more of the following flags
-(see
-.Fn posix_spawn ) :
-.Bl -tag -offset indent
-.It Dv POSIX_SPAWN_RESETIDS
-.It Dv POSIX_SPAWN_SETPGROUP
-.It Dv POSIX_SPAWN_SETSIGDEF
-.It Dv POSIX_SPAWN_SETSIGMASK
-.It Dv POSIX_SPAWN_SETSCHEDPARAM
-.It Dv POSIX_SPAWN_SETSCHEDULER
-.El
-.Pp
-These flags are defined in
-.In spawn.h .
-The default value of this attribute is as if no flags were set.
-.Sh RETURN VALUES
-The
-.Fn posix_spawnattr_getflags
-and
-.Fn posix_spawnattr_setflags
-functions return zero.
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawnattr_destroy 3 ,
-.Xr posix_spawnattr_init 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawnattr_getflags
-and
-.Fn posix_spawnattr_setflags
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawnattr_getflags
-and
-.Fn posix_spawnattr_setflags
-functions first appeared in
-.Fx 8.0
-and imported for
-.Nx 6.0 .
-.Sh AUTHORS
-.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
deleted file mode 100644
index 7f6c6fb3d..000000000
--- a/lib/libc/gen/posix_spawnattr_getpgroup.3
+++ /dev/null
@@ -1,100 +0,0 @@
-.\" $NetBSD: posix_spawnattr_getpgroup.3,v 1.4 2014/03/18 18:20:37 riastradh Exp $
-.\"
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getpgroup.3,v 1.1.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
-.\"
-.Dd December 20, 2011
-.Dt POSIX_SPAWNATTR_GETPGROUP 3
-.Os
-.Sh NAME
-.Nm posix_spawnattr_getpgroup ,
-.Nm posix_spawnattr_setpgroup
-.Nd "get and set the spawn-pgroup attribute of a spawn attributes object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawnattr_getpgroup "const posix_spawnattr_t *restrict attr" "pid_t *restrict pgroup"
-.Ft int
-.Fn posix_spawnattr_setpgroup "posix_spawnattr_t *attr" "pid_t pgroup"
-.Sh DESCRIPTION
-The
-.Fn posix_spawnattr_getpgroup
-function obtains the value of the spawn-pgroup attribute from the
-attributes object referenced by
-.Fa attr .
-.Pp
-The
-.Fn posix_spawnattr_setpgroup
-function sets the spawn-pgroup attribute in an initialized
-attributes object referenced by
-.Fa attr .
-.Pp
-The spawn-pgroup attribute represents the process group to be joined by
-the new process image in a spawn operation (if
-.Dv POSIX_SPAWN_SETPGROUP
-is set in the spawn-flags attribute).
-The default value of this attribute is zero.
-.Sh RETURN VALUES
-The
-.Fn posix_spawnattr_getpgroup
-and
-.Fn posix_spawnattr_setpgroup
-functions return zero.
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawnattr_destroy 3 ,
-.Xr posix_spawnattr_init 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawnattr_getpgroup
-and
-.Fn posix_spawnattr_setpgroup
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawnattr_getpgroup
-and
-.Fn posix_spawnattr_setpgroup
-functions first appeared in
-.Fx 8.0
-and imported for
-.Nx 6.0 .
-.Sh AUTHORS
-.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
deleted file mode 100644
index c5936bbec..000000000
--- a/lib/libc/gen/posix_spawnattr_getschedparam.3
+++ /dev/null
@@ -1,104 +0,0 @@
-.\" $NetBSD: posix_spawnattr_getschedparam.3,v 1.4 2014/03/18 18:20:37 riastradh Exp $
-.\"
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedparam.3,v 1.1.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
-.\"
-.Dd December 20, 2011
-.Dt POSIX_SPAWNATTR_GETSCHEDPARAM 3
-.Os
-.Sh NAME
-.Nm posix_spawnattr_getschedparam ,
-.Nm posix_spawnattr_setschedparam
-.Nd "get and set the spawn-schedparam attribute of a spawn attributes object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawnattr_getschedparam "const posix_spawnattr_t *restrict attr" "struct sched_param *restrict schedparam"
-.Ft int
-.Fn posix_spawnattr_setschedparam "posix_spawnattr_t *attr" "const struct sched_param *restrict schedparam"
-.Sh DESCRIPTION
-The
-.Fn posix_spawnattr_getschedparam
-function obtains the value of the spawn-schedparam attribute from the
-attributes object referenced by
-.Fa attr .
-.Pp
-The
-.Fn posix_spawnattr_setschedparam
-function sets the spawn-schedparam attribute in an initialized attributes
-object referenced by
-.Fa attr .
-.Pp
-The spawn-schedparam attribute represents the scheduling parameters to
-be assigned to the new process image in a spawn operation (if
-.Dv POSIX_SPAWN_SETSCHEDULER
-or
-.Dv POSIX_SPAWN_SETSCHEDPARAM
-is set in the spawn-flags attribute).
-The default value of this attribute is unspecified.
-.Sh RETURN VALUES
-The
-.Fn posix_spawnattr_getschedparam
-and
-.Fn posix_spawnattr_setschedparam
-functions return zero.
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawnattr_destroy 3 ,
-.Xr posix_spawnattr_getschedpolicy 3 ,
-.Xr posix_spawnattr_init 3 ,
-.Xr posix_spawnattr_setschedpolicy 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawnattr_getschedparam
-and
-.Fn posix_spawnattr_setschedparam
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawnattr_getschedparam
-and
-.Fn posix_spawnattr_setschedparam
-functions first appeared in
-.Fx 8.0
-and imported for
-.Nx 6.0 .
-.Sh AUTHORS
-.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
deleted file mode 100644
index 19e3a1522..000000000
--- a/lib/libc/gen/posix_spawnattr_getschedpolicy.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" $NetBSD: posix_spawnattr_getschedpolicy.3,v 1.4 2014/03/18 18:20:37 riastradh Exp $
-.\"
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedpolicy.3,v 1.1.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
-.\"
-.Dd December 20, 2011
-.Dt POSIX_SPAWNATTR_GETSCHEDPOLICY 3
-.Os
-.Sh NAME
-.Nm posix_spawnattr_getschedpolicy ,
-.Nm posix_spawnattr_setschedpolicy
-.Nd "get and set the spawn-schedpolicy attribute of a spawn attributes object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawnattr_getschedpolicy "const posix_spawnattr_t *restrict attr" "int *restrict schedpolicy"
-.Ft int
-.Fn posix_spawnattr_setschedpolicy "posix_spawnattr_t *attr" "int schedpolicy"
-.Sh DESCRIPTION
-The
-.Fn posix_spawnattr_getschedpolicy
-function obtains the value of the spawn-schedpolicy attribute from the
-attributes object referenced by
-.Fa attr .
-.Pp
-The
-.Fn posix_spawnattr_setschedpolicy
-function sets the spawn-schedpolicy attribute in an initialized attributes
-object referenced by
-.Fa attr .
-.Pp
-The spawn-schedpolicy attribute represents the scheduling policy to
-be assigned to the new process image in a spawn operation (if
-.Dv POSIX_SPAWN_SETSCHEDULER
-is set in the spawn-flags attribute).
-The default value of this attribute is unspecified.
-.Sh RETURN VALUES
-The
-.Fn posix_spawnattr_getschedpolicy
-and
-.Fn posix_spawnattr_setschedpolicy
-functions return zero.
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawnattr_destroy 3 ,
-.Xr posix_spawnattr_getschedparam 3 ,
-.Xr posix_spawnattr_init 3 ,
-.Xr posix_spawnattr_setschedparam 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawnattr_getschedpolicy
-and
-.Fn posix_spawnattr_setschedpolicy
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawnattr_getschedpolicy
-and
-.Fn posix_spawnattr_setschedpolicy
-functions first appeared in
-.Fx 8.0
-and imported for
-.Nx 6.0 .
-.Sh AUTHORS
-.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
deleted file mode 100644
index a3a321e2e..000000000
--- a/lib/libc/gen/posix_spawnattr_getsigdefault.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" $NetBSD: posix_spawnattr_getsigdefault.3,v 1.4 2014/03/18 18:20:37 riastradh Exp $
-.\"
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigdefault.3,v 1.1.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
-.\"
-.Dd December 20, 2011
-.Dt POSIX_SPAWNATTR_GETSIGDEFAULT 3
-.Os
-.Sh NAME
-.Nm posix_spawnattr_getsigdefault ,
-.Nm posix_spawnattr_setsigdefault
-.Nd "get and set the spawn-sigdefault attribute of a spawn attributes object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawnattr_getsigdefault "const posix_spawnattr_t *restrict attr" "sigset_t *restrict sigdefault"
-.Ft int
-.Fn posix_spawnattr_setsigdefault "posix_spawnattr_t *attr" "const sigset_t *restrict sigdefault"
-.Sh DESCRIPTION
-The
-.Fn posix_spawnattr_getsigdefault
-function obtains the value of the spawn-sigdefault attribute from the
-attributes object referenced by
-.Fa attr .
-.Pp
-The
-.Fn posix_spawnattr_setsigdefault
-function sets the spawn-sigdefault attribute in an initialized attributes
-object referenced by
-.Fa attr .
-.Pp
-The spawn-sigdefault attribute represents the set of signals to be forced to
-default signal handling in the new process image (if
-.Dv POSIX_SPAWN_SETSIGDEF
-is set in the spawn-flags attribute) by a spawn operation.
-The default value of this attribute is an empty signal set.
-.Sh RETURN VALUES
-The
-.Fn posix_spawnattr_getsigdefault
-and
-.Fn posix_spawnattr_setsigdefault
-functions return zero.
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawnattr_destroy 3 ,
-.Xr posix_spawnattr_getsigmask 3 ,
-.Xr posix_spawnattr_init 3 ,
-.Xr posix_spawnattr_setsigmask 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawnattr_getsigdefault
-and
-.Fn posix_spawnattr_setsigdefault
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawnattr_getsigdefault
-and
-.Fn posix_spawnattr_setsigdefault
-functions first appeared in
-.Fx 8.0
-and imported for
-.Nx 6.0 .
-.Sh AUTHORS
-.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
deleted file mode 100644
index 0b0ad4c52..000000000
--- a/lib/libc/gen/posix_spawnattr_getsigmask.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\" $NetBSD: posix_spawnattr_getsigmask.3,v 1.4 2014/03/18 18:20:37 riastradh Exp $
-.\"
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigmask.3,v 1.1.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
-.\"
-.Dd December 20, 2011
-.Dt POSIX_SPAWNATTR_GETSIGMASK 3
-.Os
-.Sh NAME
-.Nm posix_spawnattr_getsigmask ,
-.Nm posix_spawnattr_setsigmask
-.Nd "get and set the spawn-sigmask attribute of a spawn attributes object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawnattr_getsigmask "const posix_spawnattr_t *restrict attr" "sigset_t *restrict sigmask"
-.Ft int
-.Fn posix_spawnattr_setsigmask "posix_spawnattr_t *attr" "const sigset_t *restrict sigmask"
-.Sh DESCRIPTION
-The
-.Fn posix_spawnattr_getsigmask
-function obtains the value of the spawn-sigmask attribute from the
-attributes object referenced by
-.Fa attr .
-.Pp
-The
-.Fn posix_spawnattr_setsigmask
-function sets the spawn-sigmask attribute in an initialized attributes
-object referenced by
-.Fa attr .
-.Pp
-The spawn-sigmask attribute represents the signal mask in effect in the
-new process image of a spawn operation (if
-.Dv POSIX_SPAWN_SETSIGMASK
-is set in the spawn-flags attribute).
-The default value of this attribute is unspecified.
-.Sh RETURN VALUES
-The
-.Fn posix_spawnattr_getsigmask
-and
-.Fn posix_spawnattr_setsigmask
-functions return zero.
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawnattr_destroy 3 ,
-.Xr posix_spawnattr_init 3 ,
-.Xr posix_spawnattr_setsigmask 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawnattr_getsigmask
-and
-.Fn posix_spawnattr_setsigmask
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawnattr_getsigmask
-and
-.Fn posix_spawnattr_setsigmask
-functions first appeared in
-.Fx 8.0
-and imported for
-.Nx 6.0 .
-.Sh AUTHORS
-.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
deleted file mode 100644
index 2358bc0a9..000000000
--- a/lib/libc/gen/posix_spawnattr_init.3
+++ /dev/null
@@ -1,127 +0,0 @@
-.\" $NetBSD: posix_spawnattr_init.3,v 1.4 2014/03/18 18:20:37 riastradh Exp $
-.\"
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_init.3,v 1.1.2.1.4.1 2010/06/14 02:09:06 kensmith Exp $
-.\"
-.Dd December 20, 2011
-.Dt POSIX_SPAWNATTR_INIT 3
-.Os
-.Sh NAME
-.Nm posix_spawnattr_init ,
-.Nm posix_spawnattr_destroy
-.Nd "initialize and destroy spawn attributes object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawnattr_init "posix_spawnattr_t * attr"
-.Ft int
-.Fn posix_spawnattr_destroy "posix_spawnattr_t * attr"
-.Sh DESCRIPTION
-The
-.Fn posix_spawnattr_init
-function initializes a spawn attributes object
-.Fa attr
-with the default value for all of the individual attributes used by the
-implementation.
-Initializing an already initialized spawn attributes object may cause
-memory to be leaked.
-.Pp
-The
-.Fn posix_spawnattr_destroy
-function destroys a spawn attributes object.
-A destroyed
-.Fa attr
-attributes object can be reinitialized using
-.Fn posix_spawnattr_init .
-The object should not be used after it has been destroyed.
-.Pp
-A spawn attributes object is of type
-.Vt posix_spawnattr_t
-(defined in
-.In spawn.h )
-and is used to specify the inheritance of process attributes across a
-spawn operation.
-.Pp
-The resulting spawn attributes object (possibly modified by setting
-individual attribute values), is used to modify the behavior of
-.Fn posix_spawn
-or
-.Fn posix_spawnp .
-After a spawn attributes object has been used to spawn a process by a
-call to a
-.Fn posix_spawn
-or
-.Fn posix_spawnp ,
-any function affecting the attributes object (including destruction)
-will not affect any process that has been spawned in this way.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn posix_spawnattr_init
-and
-.Fn posix_spawnattr_destroy
-return zero;
-otherwise, an error number is returned to indicate the error.
-.Sh ERRORS
-The
-.Fn posix_spawnattr_init
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-Insufficient memory exists to initialize the spawn file actions object.
-.El
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawnattr_init
-and
-.Fn posix_spawnattr_destroy
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawnattr_init
-and
-.Fn posix_spawnattr_destroy
-functions first appeared in
-.Fx 8.0
-and imported for
-.Nx 6.0 .
-.Sh AUTHORS
-.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnp.c b/lib/libc/gen/posix_spawnp.c
deleted file mode 100644
index 5149f625d..000000000
--- a/lib/libc/gen/posix_spawnp.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*	$NetBSD: posix_spawnp.c,v 1.2 2012/02/22 17:51:01 martin Exp $	*/
-
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Martin Husemann <martin@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: posix_spawnp.c,v 1.2 2012/02/22 17:51:01 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <spawn.h>
-
-
-int posix_spawnp(pid_t * __restrict pid, const char * __restrict file,
-    const posix_spawn_file_actions_t *fa,
-    const posix_spawnattr_t * __restrict sa,
-    char * const *__restrict cav, char * const *__restrict env)
-{
-	char fpath[FILENAME_MAX], *last, *p;
-	char *path;
-
-	/*
-	 * If there is a / in the filename, or no PATH environment variable
-	 * set, fall straight through to posix_spawn().
-	 */
-	if (strchr(file, '/') != NULL || (path = getenv("PATH")) == NULL)
-		return posix_spawn(pid, file, fa, sa, cav, env);
-
-	path = strdup(path);
-	if (path == NULL)
-		return ENOMEM;
-
-	/*
-	 * Find an executable image with the given name in the PATH
-	 */
-	for (p = strtok_r(path, ":", &last); p;
-	    p = strtok_r(NULL, ":", &last)) {
-		snprintf(fpath, sizeof fpath, "%s/%s", p, file);
-		fpath[FILENAME_MAX-1] = 0;
-		if (access(fpath, X_OK) == 0)
-			break;
-	}
-	free(path);
-
-	/*
-	 * Use posix_spawn() with the found binary
-	 */
-	return posix_spawn(pid, fpath, fa, sa, cav, env);
-}
-
diff --git a/lib/libc/gen/psignal.3 b/lib/libc/gen/psignal.3
deleted file mode 100644
index 05e5922fc..000000000
--- a/lib/libc/gen/psignal.3
+++ /dev/null
@@ -1,105 +0,0 @@
-.\"	$NetBSD: psignal.3,v 1.17 2010/08/27 08:38:41 christos Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)psignal.3	8.2 (Berkeley) 2/27/95
-.\"
-.Dd August 27, 2010
-.Dt PSIGNAL 3
-.Os
-.Sh NAME
-.Nm psignal ,
-.Nm psiginfo ,
-.Nm sys_siglist ,
-.Nm sys_signame
-.Nd system signal messages
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft void
-.Fn psignal "int sig" "const char *s"
-.Fn psiginfo "const siginfo_t *si" "const char *s"
-.Vt extern const char * const sys_siglist[];
-.Vt extern const char * const sys_signame[];
-.Sh DESCRIPTION
-The
-.Fn psignal
-function locates the descriptive message
-string for the given signal number
-.Fa sig
-and writes it to the standard error.
-.Pp
-If the argument
-.Fa s
-is
-.Pf non- Dv NULL
-it is written to the standard error file descriptor
-prior to the message string,
-immediately followed by a colon and a space.
-If the signal number is not recognized
-.Pq Xr sigaction 2 ,
-the string
-.Dq "Unknown signal"
-is produced.
-.Pp
-The
-.Fn psiginfo
-function produces the same output as the
-.Fn psignal
-function, only it uses the signal number information from the
-.Fa si
-argument.
-.Pp
-The message strings can be accessed directly using the external array
-.Va sys_siglist ,
-indexed by recognized signal numbers.
-The external array
-.Va sys_signame
-is used similarly and contains short, upper-case abbreviations for signals
-which are useful for recognizing signal names in user input.
-The defined variable
-.Dv NSIG
-contains a count of the strings in
-.Va sys_siglist
-and
-.Va sys_signame .
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr perror 3 ,
-.Xr setlocale 3 ,
-.Xr strsignal 3
-.Sh HISTORY
-The
-.Fn psignal
-function appeared in
-.Bx 4.2 .
-The
-.Fn psiginfo
-function appeared in
-.Nx 6.0 .
diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c
deleted file mode 100644
index 4472be69c..000000000
--- a/lib/libc/gen/psignal.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: psignal.c,v 1.23 2012/03/13 21:13:36 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)psignal.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: psignal.c,v 1.23 2012/03/13 21:13:36 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/uio.h>
-
-#include <limits.h>
-#include <signal.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "extern.h"
-
-#ifdef __weak_alias
-__weak_alias(psignal,_psignal)
-#endif
-
-void
-psignal(int sig, const char *s)
-{
-	struct iovec *v;
-	struct iovec iov[4];
-	char buf[NL_TEXTMAX];
-
-	v = iov;
-	if (s && *s) {
-		v->iov_base = __UNCONST(s);
-		v->iov_len = strlen(s);
-		v++;
-		v->iov_base = __UNCONST(": ");
-		v->iov_len = 2;
-		v++;
-	}
-	v->iov_base = __UNCONST(__strsignal((int)sig, buf, sizeof(buf)));
-	v->iov_len = strlen(v->iov_base);
-	v++;
-	v->iov_base = __UNCONST("\n");
-	v->iov_len = 1;
-	(void)writev(STDERR_FILENO, iov, (int)((v - iov) + 1));
-}
-
-void
-psiginfo(const siginfo_t *si, const char *s)
-{
-	psignal(si->si_signo, s);
-}
diff --git a/lib/libc/gen/pthread_atfork.3 b/lib/libc/gen/pthread_atfork.3
deleted file mode 100644
index b29f414dd..000000000
--- a/lib/libc/gen/pthread_atfork.3
+++ /dev/null
@@ -1,129 +0,0 @@
-.\"	$NetBSD: pthread_atfork.3,v 1.7 2014/07/19 14:58:50 wiz Exp $
-.\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Nathan J. Williams.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd July 18, 2014
-.Dt PTHREAD_ATFORK 3
-.Os
-.Sh NAME
-.Nm pthread_atfork
-.Nd register handlers to be called when process forks
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In pthread.h
-.Ft int
-.Fn pthread_atfork "void (*prepare)(void)" "void (*parent)(void)" "void (*child)(void)"
-.Sh DESCRIPTION
-The
-.Fn pthread_atfork
-function registers the provided handler functions to be called when the
-.Xr fork 2
-function is called.
-Each of the three handlers is called at a different place in the
-.Xr fork 2
-sequence.
-The
-.Ar prepare
-handler is called in the parent process before the fork happens, the
-.Ar parent
-handler is called in the parent process after the fork has happened, and the
-.Ar child
-handler is called in the child process after the fork has happened.
-The
-.Ar parent
-and
-.Ar child
-handlers are called in the order in which they were registered, while the
-.Ar prepare
-handlers are called in reverse of the order in which they were registered.
-.Pp
-Any of the handlers given may be
-.Dv NULL .
-.Pp
-The intended use of
-.Fn pthread_atfork
-is to provide a consistent state to a child process from a multithreaded parent
-process where locks may be acquired and released asynchronously with respect to the
-.Xr fork 2
-call.
-Each subsystem with locks that are used in a child process should register
-handlers with
-.Fn pthread_atfork
-that acquires those locks in the
-.Ar prepare
-handler and releases them in the
-.Ar parent
-handler.
-.Sh RETURN VALUES
-The
-.Fn pthread_atfork
-function returns 0 on success and an error number on failure.
-.Sh ERRORS
-The following error code may be returned:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-Insufficient memory exists to register the fork handlers.
-.El
-.Sh SEE ALSO
-.Xr fork 2 ,
-.Xr pthread_mutex 3 ,
-.Xr signal 7
-.Sh STANDARDS
-The
-.Fn pthread_atfork
-function conforms to
-.St -p1003.1c-95 .
-.Sh HISTORY
-The
-.Fn pthread_atfork
-function first appeared in
-.Nx 2.0 .
-.Sh CAVEATS
-After calling
-.Xr fork 2
-from a multithreaded process, it is only safe to call
-async-signal-safe functions until calling one of the
-.Xr exec 3
-functions.
-The
-.Fn pthread_*
-functions are not async-signal-safe, so it is not safe to use such functions
-in the
-.Ar child
-handler.
-POSIX does not mandate that
-.Fn pthread_mutex_unlock
-be async-signal-safe, but it is in
-.Nx
-and thus safe to use within the
-.Ar child
-handler.
-.Sh BUGS
-There is no way to unregister a handler registered with
-.Fn pthread_atfork .
diff --git a/lib/libc/gen/pthread_atfork.c b/lib/libc/gen/pthread_atfork.c
deleted file mode 100644
index 2d8252645..000000000
--- a/lib/libc/gen/pthread_atfork.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*	$NetBSD: pthread_atfork.c,v 1.10 2015/01/20 18:31:25 christos Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nathan J. Williams.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pthread_atfork.c,v 1.10 2015/01/20 18:31:25 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/queue.h>
-#include "reentrant.h"
-
-#ifdef __weak_alias
-__weak_alias(pthread_atfork, _pthread_atfork)
-__weak_alias(fork, _fork)
-#endif /* __weak_alias */
-
-pid_t	__fork(void);	/* XXX */
-
-struct atfork_callback {
-	SIMPLEQ_ENTRY(atfork_callback) next;
-	void (*fn)(void);
-};
-
-/*
- * Hypothetically, we could protect the queues with a rwlock which is
- * write-locked by pthread_atfork() and read-locked by fork(), but
- * since the intended use of the functions is obtaining locks to hold
- * across the fork, forking is going to be serialized anyway.
- */
-static struct atfork_callback atfork_builtin;
-#ifdef _REENTRANT
-static mutex_t atfork_lock = MUTEX_INITIALIZER;
-#endif
-SIMPLEQ_HEAD(atfork_callback_q, atfork_callback);
-
-static struct atfork_callback_q prepareq = SIMPLEQ_HEAD_INITIALIZER(prepareq);
-static struct atfork_callback_q parentq = SIMPLEQ_HEAD_INITIALIZER(parentq);
-static struct atfork_callback_q childq = SIMPLEQ_HEAD_INITIALIZER(childq);
-
-static struct atfork_callback *
-af_alloc(void)
-{
-
-	if (atfork_builtin.fn == NULL)
-		return &atfork_builtin;
-
-	return malloc(sizeof(atfork_builtin));
-}
-
-static void
-af_free(struct atfork_callback *af)
-{
-
-	if (af != &atfork_builtin)
-		free(af);
-}
-
-int
-pthread_atfork(void (*prepare)(void), void (*parent)(void),
-    void (*child)(void))
-{
-	struct atfork_callback *newprepare, *newparent, *newchild;
-
-	newprepare = newparent = newchild = NULL;
-
-	mutex_lock(&atfork_lock);
-	if (prepare != NULL) {
-		newprepare = af_alloc();
-		if (newprepare == NULL) {
-			mutex_unlock(&atfork_lock);
-			return ENOMEM;
-		}
-		newprepare->fn = prepare;
-	}
-
-	if (parent != NULL) {
-		newparent = af_alloc();
-		if (newparent == NULL) {
-			if (newprepare != NULL)
-				af_free(newprepare);
-			mutex_unlock(&atfork_lock);
-			return ENOMEM;
-		}
-		newparent->fn = parent;
-	}
-
-	if (child != NULL) {
-		newchild = af_alloc();
-		if (newchild == NULL) {
-			if (newprepare != NULL)
-				af_free(newprepare);
-			if (newparent != NULL)
-				af_free(newparent);
-			mutex_unlock(&atfork_lock);
-			return ENOMEM;
-		}
-		newchild->fn = child;
-	}
-
-	/*
-	 * The order in which the functions are called is specified as
-	 * LIFO for the prepare handler and FIFO for the others; insert
-	 * at the head and tail as appropriate so that SIMPLEQ_FOREACH()
-	 * produces the right order.
-	 */
-	if (prepare)
-		SIMPLEQ_INSERT_HEAD(&prepareq, newprepare, next);
-	if (parent)
-		SIMPLEQ_INSERT_TAIL(&parentq, newparent, next);
-	if (child)
-		SIMPLEQ_INSERT_TAIL(&childq, newchild, next);
-	mutex_unlock(&atfork_lock);
-
-	return 0;
-}
-
-pid_t
-fork(void)
-{
-	struct atfork_callback *iter;
-	pid_t ret;
-
-	mutex_lock(&atfork_lock);
-	SIMPLEQ_FOREACH(iter, &prepareq, next)
-		(*iter->fn)();
-
-	ret = __fork();
-
-	if (ret != 0) {
-		/*
-		 * We are the parent. It doesn't matter here whether
-		 * the fork call succeeded or failed.
-		 */
-		SIMPLEQ_FOREACH(iter, &parentq, next)
-			(*iter->fn)();
-		mutex_unlock(&atfork_lock);
-	} else {
-		/* We are the child */
-		SIMPLEQ_FOREACH(iter, &childq, next)
-			(*iter->fn)();
-		/*
-		 * Note: We are explicitly *not* unlocking
-		 * atfork_lock.  Unlocking atfork_lock is problematic,
-		 * because if any threads in the parent blocked on it
-		 * between the initial lock and the fork() syscall,
-		 * unlocking in the child will try to schedule
-		 * threads, and either the internal mutex interlock or
-		 * the runqueue spinlock could have been held at the
-		 * moment of fork(). Since the other threads do not
-		 * exist in this process, the spinlock will never be
-		 * unlocked, and we would wedge.
-		 * Instead, we reinitialize atfork_lock, since we know
-		 * that the state of the atfork lists is consistent here,
-		 * and that there are no other threads to be affected by
-		 * the forcible cleaning of the queue.
-		 * This permits double-forking to work, although
-		 * it requires knowing that it's "safe" to initialize
-		 * a locked mutex in this context.
-		 *
-		 * The problem exists for users of this interface,
-		 * too, since the intented use of pthread_atfork() is
-		 * to acquire locks across the fork call to ensure
-		 * that the child sees consistent state. There's not
-		 * much that can usefully be done in a child handler,
-		 * and conventional wisdom discourages using them, but
-		 * they're part of the interface, so here we are...
-		 */
-		mutex_init(&atfork_lock, NULL);
-	}
-
-	return ret;
-}
diff --git a/lib/libc/gen/pw_private.h b/lib/libc/gen/pw_private.h
deleted file mode 100644
index ee451d8e2..000000000
--- a/lib/libc/gen/pw_private.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*	$NetBSD: pw_private.h,v 1.3 2012/03/20 16:36:05 matt Exp $	*/
-
-/*
- * Written by Jason R. Thorpe <thorpej@NetBSD.org>, June 26, 1998.
- * Public domain.
- */
-
-int	__pw_scan(char *bp, struct passwd *pw, int *flags);
diff --git a/lib/libc/gen/pw_scan.c b/lib/libc/gen/pw_scan.c
deleted file mode 100644
index 7c162d8c6..000000000
--- a/lib/libc/gen/pw_scan.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*	$NetBSD: pw_scan.c,v 1.23 2012/03/13 21:13:36 christos Exp $	*/
-
-/*
- * Copyright (c) 1987, 1993, 1994, 1995
- *	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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#include "compat_pwd.h"
-
-#else
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pw_scan.c,v 1.23 2012/03/13 21:13:36 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(_LIBC)
-#include "namespace.h"
-#endif
-#include <sys/types.h>
-
-#include <assert.h>
-#include <err.h>
-#include <limits.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#ifdef _LIBC
-#include "pw_private.h"
-#endif
-#endif /* ! HAVE_NBTOOL_CONFIG_H */
-
-static int
-gettime(time_t *res, const char *p, int *flags, int dowarn, int flag)
-{
-	long long l;
-	char *ep;
-	const char *vp;
-
-	if (*p == '\0') {
-		*flags |= flag;
-		*res = 0;
-		return 1;
-	}
-	l = strtoll(p, &ep, 0);
-	if (p == ep || *ep != '\0') {
-		vp = "Invalid number";
-		goto done;
-	}
-	if (errno == ERANGE && (l == LLONG_MAX || l == LLONG_MIN)) {
-		vp = strerror(errno);
-		goto done;
-	}
-	_DIAGASSERT(__type_fit(time_t, l));
-	*res = (time_t)l;
-	return 1;
-done:
-	if (dowarn) {
-		warnx("%s `%s' for %s time", vp, p,
-		    flag == _PASSWORD_NOEXP ? "expiration" : "change");
-	}
-	return 0;
-
-}
-
-static int
-getid(unsigned long *res, const char *p, int *flags, int dowarn, int flag)
-{
-	unsigned long ul;
-	char *ep;
-
-	if (*p == '\0') {
-		*flags |= flag;
-		*res = 0;
-		return 1;
-	}
-	ul = strtoul(p, &ep, 0);
-	if (p == ep || *ep != '\0') {
-		ep = __UNCONST("Invalid number");
-		goto done;
-	}
-	if (errno == ERANGE && ul == ULONG_MAX) {
-		ep = strerror(errno);
-		goto done;
-	}
-	if (ul > *res) {
-		ep = strerror(ERANGE);
-		goto done;
-	}
-
-	*res = ul;
-	return 1;
-done:
-	if (dowarn)
-		warnx("%s %s `%s'", ep, 
-		    flag == _PASSWORD_NOUID ? "uid" : "gid", p);
-	return 0;
-
-}
-
-int
-#ifdef _LIBC
-__pw_scan(char *bp, struct passwd *pw, int *flags)
-#else
-pw_scan( char *bp, struct passwd *pw, int *flags)
-#endif
-{
-	unsigned long id;
-	time_t ti;
-	int root, inflags;
-	int dowarn;
-	const char *p, *sh;
-
-	_DIAGASSERT(bp != NULL);
-	_DIAGASSERT(pw != NULL);
-
-	if (flags) {
-		inflags = *flags;
-		*flags = 0;
-	} else {
-		inflags = 0;
-		flags = &inflags;
-	}
-	dowarn = !(inflags & _PASSWORD_NOWARN);
-
-	if (!(pw->pw_name = strsep(&bp, ":")))		/* login */
-		goto fmt;
-	if (strlen(pw->pw_name) > (LOGIN_NAME_MAX - 1)) {
-		if (dowarn)
-			warnx("username too long, `%s' > %d", pw->pw_name,
-			    LOGIN_NAME_MAX - 1);
-		return 0;
-	}
-
-	root = !strcmp(pw->pw_name, "root");
-
-	if (!(pw->pw_passwd = strsep(&bp, ":")))	/* passwd */
-		goto fmt;
-
-	if (!(p = strsep(&bp, ":")))			/* uid */
-		goto fmt;
-
-	id = UID_MAX;
-	if (!getid(&id, p, flags, dowarn, _PASSWORD_NOUID))
-		return 0;
-
-	if (root && id) {
-		if (dowarn)
-			warnx("root uid should be 0");
-		return 0;
-	}
-
-	pw->pw_uid = (uid_t)id;
-
-	if (!(p = strsep(&bp, ":")))			/* gid */
-		goto fmt;
-
-	id = GID_MAX;
-	if (!getid(&id, p, flags, dowarn, _PASSWORD_NOGID))
-		return 0;
-
-	pw->pw_gid = (gid_t)id;
-
-	if (inflags & _PASSWORD_OLDFMT) {
-		pw->pw_class = __UNCONST("");
-		pw->pw_change = 0;
-		pw->pw_expire = 0;
-		*flags |= (_PASSWORD_NOCHG | _PASSWORD_NOEXP);
-	} else {
-		pw->pw_class = strsep(&bp, ":");	/* class */
-		if (!(p = strsep(&bp, ":")))		/* change */
-			goto fmt;
-		if (!gettime(&ti, p, flags, dowarn, _PASSWORD_NOCHG))
-			return 0;
-		pw->pw_change = ti;
-
-		if (!(p = strsep(&bp, ":")))		/* expire */
-			goto fmt;
-		if (!gettime(&ti, p, flags, dowarn, _PASSWORD_NOEXP))
-			return 0;
-		pw->pw_expire = ti;
-	}
-
-	pw->pw_gecos = strsep(&bp, ":");		/* gecos */
-	pw->pw_dir = strsep(&bp, ":");			/* directory */
-	if (!(pw->pw_shell = strsep(&bp, ":")))		/* shell */
-		goto fmt;
-
-#if ! HAVE_NBTOOL_CONFIG_H
-	p = pw->pw_shell;
-	if (root && *p)					/* empty == /bin/sh */
-		for (setusershell();;) {
-			if (!(sh = getusershell())) {
-				if (dowarn)
-					warnx("warning, unknown root shell");
-				break;
-			}
-			if (!strcmp(p, sh))
-				break;	
-		}
-#endif
-
-	if ((p = strsep(&bp, ":")) != NULL) {			/* too many */
-fmt:		
-		if (dowarn)
-			warnx("corrupted entry");
-		return 0;
-	}
-
-	return 1;
-}
diff --git a/lib/libc/gen/pwcache.3 b/lib/libc/gen/pwcache.3
deleted file mode 100644
index c0b679af9..000000000
--- a/lib/libc/gen/pwcache.3
+++ /dev/null
@@ -1,220 +0,0 @@
-.\"	$NetBSD: pwcache.3,v 1.17 2008/05/02 18:11:04 martin Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"
-.\"     @(#)pwcache.3	8.1 (Berkeley) 6/9/93
-.\"
-.Dd January 24, 2002
-.Dt PWCACHE 3
-.Os
-.Sh NAME
-.Nm pwcache ,
-.Nm user_from_uid ,
-.Nm group_from_gid
-.Nd cache password and group entries
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In pwd.h
-.Ft const char *
-.Fn user_from_uid "uid_t uid" "int nouser"
-.Ft int
-.Fn uid_from_user "const char *name" "uid_t *uid"
-.Ft int
-.Fn pwcache_userdb "int (*setpassent)(int)" "void (*endpwent)(void)" "struct passwd * (*getpwnam)(const char *)" "struct passwd * (*getpwuid)(uid_t)"
-.In grp.h
-.Ft const char *
-.Fn group_from_gid "gid_t gid" "int nogroup"
-.Ft int
-.Fn gid_from_group "const char *name" "gid_t *gid"
-.Ft int
-.Fn pwcache_groupdb "int (*setgroupent)(int)" "void (*endgrent)(void)" "struct group * (*getgrnam)(const char *)" "struct group * (*getgrgid)(gid_t)"
-.Sh DESCRIPTION
-The
-.Fn user_from_uid
-function returns the user name associated with the argument
-.Fa uid .
-The user name is cached so that multiple calls with the same
-.Fa uid
-do not require additional calls to
-.Xr getpwuid 3 .
-If there is no user associated with the
-.Fa uid ,
-a pointer is returned
-to a string representation of the
-.Fa uid ,
-unless the argument
-.Fa nouser
-is non-zero, in which case a
-.Dv NULL
-pointer is returned.
-.Pp
-The
-.Fn group_from_gid
-function returns the group name associated with the argument
-.Fa gid .
-The group name is cached so that multiple calls with the same
-.Fa gid
-do not require additional calls to
-.Xr getgrgid 3 .
-If there is no group associated with the
-.Fa gid ,
-a pointer is returned
-to a string representation of the
-.Fa gid ,
-unless the argument
-.Fa nogroup
-is non-zero, in which case a
-.Dv NULL
-pointer is returned.
-.Pp
-The
-.Fn uid_from_user
-function returns the uid associated with the argument
-.Fa name .
-The uid is cached so that multiple calls with the same
-.Fa name
-do not require additional calls to
-.Xr getpwnam 3 .
-If there is no uid associated with the
-.Fa name ,
-the
-.Fn uid_from_user
-function returns \-1; otherwise it stores the uid at the location pointed to by
-.Fa uid
-and returns 0.
-.Pp
-The
-.Fn gid_from_group
-function returns the gid associated with the argument
-.Fa name .
-The gid is cached so that multiple calls with the same
-.Fa name
-do not require additional calls to
-.Xr getgrnam 3 .
-If there is no gid associated with the
-.Fa name ,
-the
-.Fn gid_from_group
-function returns \-1; otherwise it stores the gid at the location pointed to by
-.Fa gid
-and returns 0.
-.Pp
-The
-.Fn pwcache_userdb
-function changes the user database access routines which
-.Fn user_from_uid
-and
-.Fn uid_from_user
-call to search for users.
-The caches are flushed and the existing
-.Fn endpwent
-method is called before switching to the new routines.
-.Fa getpwnam
-and
-.Fa getpwuid
-must be provided, and
-.Fa setpassent
-and
-.Fa endpwent
-may be
-.Dv NULL
-pointers.
-.Pp
-The
-.Fn pwcache_groupdb
-function changes the group database access routines which
-.Fn group_from_gid
-and
-.Fn gid_from_group
-call to search for groups.
-The caches are flushed and the existing
-.Fn endgrent
-method is called before switching to the new routines.
-.Fa getgrnam
-and
-.Fa getgrgid
-must be provided, and
-.Fa setgroupent
-and
-.Fa endgrent
-may be
-.Dv NULL
-pointers.
-.Sh SEE ALSO
-.Xr getgrgid 3 ,
-.Xr getgrnam 3 ,
-.Xr getpwnam 3 ,
-.Xr getpwuid 3
-.Sh HISTORY
-The
-.Fn user_from_uid
-and
-.Fn group_from_gid
-functions first appeared in
-.Bx 4.4 .
-.Pp
-The
-.Fn uid_from_user
-and
-.Fn gid_from_group
-functions first appeared in
-.Nx 1.4 .
-.Pp
-The
-.Fn pwcache_userdb
-and
-.Fn pwcache_groupdb
-functions first appeared in
-.Nx 1.6 .
diff --git a/lib/libc/gen/pwcache.c b/lib/libc/gen/pwcache.c
deleted file mode 100644
index 2caf96a51..000000000
--- a/lib/libc/gen/pwcache.c
+++ /dev/null
@@ -1,643 +0,0 @@
-/*	$NetBSD: pwcache.c,v 1.31 2010/03/23 20:28:59 drochner Exp $	*/
-
-/*-
- * Copyright (c) 1992 Keith Muller.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Keith Muller of the University of California, San Diego.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (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 HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-/*
- * XXX Undefine the renames of these functions so that we don't
- * XXX rename the versions found in the host's <pwd.h> by mistake!
- */
-#undef group_from_gid
-#undef user_from_uid
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
-#else
-__RCSID("$NetBSD: pwcache.c,v 1.31 2010/03/23 20:28:59 drochner Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <assert.h>
-#include <grp.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#if HAVE_NBTOOL_CONFIG_H
-/* XXX Now, re-apply the renaming that we undid above. */
-#define	group_from_gid	__nbcompat_group_from_gid
-#define	user_from_uid	__nbcompat_user_from_uid
-#endif
-
-#ifdef __weak_alias
-__weak_alias(user_from_uid,_user_from_uid)
-__weak_alias(group_from_gid,_group_from_gid)
-__weak_alias(pwcache_groupdb,_pwcache_groupdb)
-#endif
-
-#if !HAVE_PWCACHE_USERDB || HAVE_NBTOOL_CONFIG_H
-#include "pwcache.h"
-
-/*
- * routines that control user, group, uid and gid caches (for the archive
- * member print routine).
- * IMPORTANT:
- * these routines cache BOTH hits and misses, a major performance improvement
- */
-
-/*
- * function pointers to various name lookup routines.
- * these may be changed as necessary.
- */
-static	int		(*_pwcache_setgroupent)(int)		= setgroupent;
-static	void		(*_pwcache_endgrent)(void)		= endgrent;
-static	struct group *	(*_pwcache_getgrnam)(const char *)	= getgrnam;
-static	struct group *	(*_pwcache_getgrgid)(gid_t)		= getgrgid;
-static	int		(*_pwcache_setpassent)(int)		= setpassent;
-static	void		(*_pwcache_endpwent)(void)		= endpwent;
-static	struct passwd *	(*_pwcache_getpwnam)(const char *)	= getpwnam;
-static	struct passwd *	(*_pwcache_getpwuid)(uid_t)		= getpwuid;
-
-/*
- * internal state
- */
-static	int	pwopn;		/* is password file open */
-static	int	gropn;		/* is group file open */
-static	UIDC	**uidtb;	/* uid to name cache */
-static	GIDC	**gidtb;	/* gid to name cache */
-static	UIDC	**usrtb;	/* user name to uid cache */
-static	GIDC	**grptb;	/* group name to gid cache */
-
-static	int	uidtb_fail;	/* uidtb_start() failed ? */
-static	int	gidtb_fail;	/* gidtb_start() failed ? */
-static	int	usrtb_fail;	/* usrtb_start() failed ? */
-static	int	grptb_fail;	/* grptb_start() failed ? */
-
-
-static	u_int	st_hash(const char *, size_t, int);
-static	int	uidtb_start(void);
-static	int	gidtb_start(void);
-static	int	usrtb_start(void);
-static	int	grptb_start(void);
-
-
-static u_int
-st_hash(const char *name, size_t len, int tabsz)
-{
-	u_int key = 0;
-
-	_DIAGASSERT(name != NULL);
-
-	while (len--) {
-		key += *name++;
-		key = (key << 8) | (key >> 24);
-	}
-
-	return (key % tabsz);
-}
-
-/*
- * uidtb_start
- *	creates an an empty uidtb
- * Return:
- *	0 if ok, -1 otherwise
- */
-static int
-uidtb_start(void)
-{
-
-	if (uidtb != NULL)
-		return (0);
-	if (uidtb_fail)
-		return (-1);
-	if ((uidtb = (UIDC **)calloc(UID_SZ, sizeof(UIDC *))) == NULL) {
-		++uidtb_fail;
-		return (-1);
-	}
-	return (0);
-}
-
-/*
- * gidtb_start
- *	creates an an empty gidtb
- * Return:
- *	0 if ok, -1 otherwise
- */
-static int
-gidtb_start(void)
-{
-
-	if (gidtb != NULL)
-		return (0);
-	if (gidtb_fail)
-		return (-1);
-	if ((gidtb = (GIDC **)calloc(GID_SZ, sizeof(GIDC *))) == NULL) {
-		++gidtb_fail;
-		return (-1);
-	}
-	return (0);
-}
-
-/*
- * usrtb_start
- *	creates an an empty usrtb
- * Return:
- *	0 if ok, -1 otherwise
- */
-static int
-usrtb_start(void)
-{
-
-	if (usrtb != NULL)
-		return (0);
-	if (usrtb_fail)
-		return (-1);
-	if ((usrtb = (UIDC **)calloc(UNM_SZ, sizeof(UIDC *))) == NULL) {
-		++usrtb_fail;
-		return (-1);
-	}
-	return (0);
-}
-
-/*
- * grptb_start
- *	creates an an empty grptb
- * Return:
- *	0 if ok, -1 otherwise
- */
-static int
-grptb_start(void)
-{
-
-	if (grptb != NULL)
-		return (0);
-	if (grptb_fail)
-		return (-1);
-	if ((grptb = (GIDC **)calloc(GNM_SZ, sizeof(GIDC *))) == NULL) {
-		++grptb_fail;
-		return (-1);
-	}
-	return (0);
-}
-
-/*
- * user_from_uid()
- *	caches the name (if any) for the uid. If noname clear, we always
- *	return the stored name (if valid or invalid match).
- *	We use a simple hash table.
- * Return
- *	Pointer to stored name (or a empty string)
- */
-const char *
-user_from_uid(uid_t uid, int noname)
-{
-	struct passwd *pw;
-	UIDC *ptr, **pptr;
-
-	if ((uidtb == NULL) && (uidtb_start() < 0))
-		return (NULL);
-
-	/*
-	 * see if we have this uid cached
-	 */
-	pptr = uidtb + (uid % UID_SZ);
-	ptr = *pptr;
-
-	if ((ptr != NULL) && (ptr->valid > 0) && (ptr->uid == uid)) {
-		/*
-		 * have an entry for this uid
-		 */
-		if (!noname || (ptr->valid == VALID))
-			return (ptr->name);
-		return (NULL);
-	}
-
-	/*
-	 * No entry for this uid, we will add it
-	 */
-	if (!pwopn) {
-		if (_pwcache_setpassent != NULL)
-			(*_pwcache_setpassent)(1);
-		++pwopn;
-	}
-
-	if (ptr == NULL)
-		*pptr = ptr = (UIDC *)malloc(sizeof(UIDC));
-
-	if ((pw = (*_pwcache_getpwuid)(uid)) == NULL) {
-		/*
-		 * no match for this uid in the local password file
-		 * a string that is the uid in numeric format
-		 */
-		if (ptr == NULL)
-			return (NULL);
-		ptr->uid = uid;
-		(void)snprintf(ptr->name, UNMLEN, "%lu", (long) uid);
-		ptr->valid = INVALID;
-		if (noname)
-			return (NULL);
-	} else {
-		/*
-		 * there is an entry for this uid in the password file
-		 */
-		if (ptr == NULL)
-			return (pw->pw_name);
-		ptr->uid = uid;
-		(void)strlcpy(ptr->name, pw->pw_name, UNMLEN);
-		ptr->valid = VALID;
-	}
-	return (ptr->name);
-}
-
-/*
- * group_from_gid()
- *	caches the name (if any) for the gid. If noname clear, we always
- *	return the stored name (if valid or invalid match).
- *	We use a simple hash table.
- * Return
- *	Pointer to stored name (or a empty string)
- */
-const char *
-group_from_gid(gid_t gid, int noname)
-{
-	struct group *gr;
-	GIDC *ptr, **pptr;
-
-	if ((gidtb == NULL) && (gidtb_start() < 0))
-		return (NULL);
-
-	/*
-	 * see if we have this gid cached
-	 */
-	pptr = gidtb + (gid % GID_SZ);
-	ptr = *pptr;
-
-	if ((ptr != NULL) && (ptr->valid > 0) && (ptr->gid == gid)) {
-		/*
-		 * have an entry for this gid
-		 */
-		if (!noname || (ptr->valid == VALID))
-			return (ptr->name);
-		return (NULL);
-	}
-
-	/*
-	 * No entry for this gid, we will add it
-	 */
-	if (!gropn) {
-		if (_pwcache_setgroupent != NULL)
-			(*_pwcache_setgroupent)(1);
-		++gropn;
-	}
-
-	if (ptr == NULL)
-		*pptr = ptr = (GIDC *)malloc(sizeof(GIDC));
-
-	if ((gr = (*_pwcache_getgrgid)(gid)) == NULL) {
-		/*
-		 * no match for this gid in the local group file, put in
-		 * a string that is the gid in numberic format
-		 */
-		if (ptr == NULL)
-			return (NULL);
-		ptr->gid = gid;
-		(void)snprintf(ptr->name, GNMLEN, "%lu", (long) gid);
-		ptr->valid = INVALID;
-		if (noname)
-			return (NULL);
-	} else {
-		/*
-		 * there is an entry for this group in the group file
-		 */
-		if (ptr == NULL)
-			return (gr->gr_name);
-		ptr->gid = gid;
-		(void)strlcpy(ptr->name, gr->gr_name, GNMLEN);
-		ptr->valid = VALID;
-	}
-	return (ptr->name);
-}
-
-/*
- * uid_from_user()
- *	caches the uid for a given user name. We use a simple hash table.
- * Return
- *	the uid (if any) for a user name, or a -1 if no match can be found
- */
-int
-uid_from_user(const char *name, uid_t *uid)
-{
-	struct passwd *pw;
-	UIDC *ptr, **pptr;
-	size_t namelen;
-
-	/*
-	 * return -1 for mangled names
-	 */
-	if (name == NULL || ((namelen = strlen(name)) == 0))
-		return (-1);
-	if ((usrtb == NULL) && (usrtb_start() < 0))
-		return (-1);
-
-	/*
-	 * look up in hash table, if found and valid return the uid,
-	 * if found and invalid, return a -1
-	 */
-	pptr = usrtb + st_hash(name, namelen, UNM_SZ);
-	ptr = *pptr;
-
-	if ((ptr != NULL) && (ptr->valid > 0) && !strcmp(name, ptr->name)) {
-		if (ptr->valid == INVALID)
-			return (-1);
-		*uid = ptr->uid;
-		return (0);
-	}
-
-	if (!pwopn) {
-		if (_pwcache_setpassent != NULL)
-			(*_pwcache_setpassent)(1);
-		++pwopn;
-	}
-
-	if (ptr == NULL)
-		*pptr = ptr = (UIDC *)malloc(sizeof(UIDC));
-
-	/*
-	 * no match, look it up, if no match store it as an invalid entry,
-	 * or store the matching uid
-	 */
-	if (ptr == NULL) {
-		if ((pw = (*_pwcache_getpwnam)(name)) == NULL)
-			return (-1);
-		*uid = pw->pw_uid;
-		return (0);
-	}
-	(void)strlcpy(ptr->name, name, UNMLEN);
-	if ((pw = (*_pwcache_getpwnam)(name)) == NULL) {
-		ptr->valid = INVALID;
-		return (-1);
-	}
-	ptr->valid = VALID;
-	*uid = ptr->uid = pw->pw_uid;
-	return (0);
-}
-
-/*
- * gid_from_group()
- *	caches the gid for a given group name. We use a simple hash table.
- * Return
- *	the gid (if any) for a group name, or a -1 if no match can be found
- */
-int
-gid_from_group(const char *name, gid_t *gid)
-{
-	struct group *gr;
-	GIDC *ptr, **pptr;
-	size_t namelen;
-
-	/*
-	 * return -1 for mangled names
-	 */
-	if (name == NULL || ((namelen = strlen(name)) == 0))
-		return (-1);
-	if ((grptb == NULL) && (grptb_start() < 0))
-		return (-1);
-
-	/*
-	 * look up in hash table, if found and valid return the uid,
-	 * if found and invalid, return a -1
-	 */
-	pptr = grptb + st_hash(name, namelen, GID_SZ);
-	ptr = *pptr;
-
-	if ((ptr != NULL) && (ptr->valid > 0) && !strcmp(name, ptr->name)) {
-		if (ptr->valid == INVALID)
-			return (-1);
-		*gid = ptr->gid;
-		return (0);
-	}
-
-	if (!gropn) {
-		if (_pwcache_setgroupent != NULL)
-			(*_pwcache_setgroupent)(1);
-		++gropn;
-	}
-
-	if (ptr == NULL)
-		*pptr = ptr = (GIDC *)malloc(sizeof(GIDC));
-
-	/*
-	 * no match, look it up, if no match store it as an invalid entry,
-	 * or store the matching gid
-	 */
-	if (ptr == NULL) {
-		if ((gr = (*_pwcache_getgrnam)(name)) == NULL)
-			return (-1);
-		*gid = gr->gr_gid;
-		return (0);
-	}
-
-	(void)strlcpy(ptr->name, name, GNMLEN);
-	if ((gr = (*_pwcache_getgrnam)(name)) == NULL) {
-		ptr->valid = INVALID;
-		return (-1);
-	}
-	ptr->valid = VALID;
-	*gid = ptr->gid = gr->gr_gid;
-	return (0);
-}
-
-#define FLUSHTB(arr, len, fail)				\
-	do {						\
-		if (arr != NULL) {			\
-			for (i = 0; i < len; i++)	\
-				if (arr[i] != NULL)	\
-					free(arr[i]);	\
-			arr = NULL;			\
-		}					\
-		fail = 0;				\
-	} while (/* CONSTCOND */0);
-
-int
-pwcache_userdb(
-	int		(*a_setpassent)(int),
-	void		(*a_endpwent)(void),
-	struct passwd *	(*a_getpwnam)(const char *),
-	struct passwd *	(*a_getpwuid)(uid_t))
-{
-	int i;
-
-		/* a_setpassent and a_endpwent may be NULL */
-	if (a_getpwnam == NULL || a_getpwuid == NULL)
-		return (-1);
-
-	if (_pwcache_endpwent != NULL)
-		(*_pwcache_endpwent)();
-	FLUSHTB(uidtb, UID_SZ, uidtb_fail);
-	FLUSHTB(usrtb, UNM_SZ, usrtb_fail);
-	pwopn = 0;
-	_pwcache_setpassent = a_setpassent;
-	_pwcache_endpwent = a_endpwent;
-	_pwcache_getpwnam = a_getpwnam;
-	_pwcache_getpwuid = a_getpwuid;
-
-	return (0);
-}
-
-int
-pwcache_groupdb(
-	int		(*a_setgroupent)(int),
-	void		(*a_endgrent)(void),
-	struct group *	(*a_getgrnam)(const char *),
-	struct group *	(*a_getgrgid)(gid_t))
-{
-	int i;
-
-		/* a_setgroupent and a_endgrent may be NULL */
-	if (a_getgrnam == NULL || a_getgrgid == NULL)
-		return (-1);
-
-	if (_pwcache_endgrent != NULL)
-		(*_pwcache_endgrent)();
-	FLUSHTB(gidtb, GID_SZ, gidtb_fail);
-	FLUSHTB(grptb, GNM_SZ, grptb_fail);
-	gropn = 0;
-	_pwcache_setgroupent = a_setgroupent;
-	_pwcache_endgrent = a_endgrent;
-	_pwcache_getgrnam = a_getgrnam;
-	_pwcache_getgrgid = a_getgrgid;
-
-	return (0);
-}
-
-
-#ifdef TEST_PWCACHE
-
-struct passwd *
-test_getpwnam(const char *name)
-{
-	static struct passwd foo;
-
-	memset(&foo, 0, sizeof(foo));
-	if (strcmp(name, "toor") == 0) {
-		foo.pw_uid = 666;
-		return &foo;
-	}
-	return (getpwnam(name));
-}
-
-int
-main(int argc, char *argv[])
-{
-	uid_t	u;
-	int	r, i;
-
-	printf("pass 1 (default userdb)\n");
-	for (i = 1; i < argc; i++) {
-		printf("i: %d, pwopn %d usrtb_fail %d usrtb %p\n",
-		    i, pwopn, usrtb_fail, usrtb);
-		r = uid_from_user(argv[i], &u);
-		if (r == -1)
-			printf("  uid_from_user %s: failed\n", argv[i]);
-		else
-			printf("  uid_from_user %s: %d\n", argv[i], u);
-	}
-	printf("pass 1 finish: pwopn %d usrtb_fail %d usrtb %p\n",
-		    pwopn, usrtb_fail, usrtb);
-
-	puts("");
-	printf("pass 2 (replacement userdb)\n");
-	printf("pwcache_userdb returned %d\n",
-	    pwcache_userdb(setpassent, test_getpwnam, getpwuid));
-	printf("pwopn %d usrtb_fail %d usrtb %p\n", pwopn, usrtb_fail, usrtb);
-
-	for (i = 1; i < argc; i++) {
-		printf("i: %d, pwopn %d usrtb_fail %d usrtb %p\n",
-		    i, pwopn, usrtb_fail, usrtb);
-		u = -1;
-		r = uid_from_user(argv[i], &u);
-		if (r == -1)
-			printf("  uid_from_user %s: failed\n", argv[i]);
-		else
-			printf("  uid_from_user %s: %d\n", argv[i], u);
-	}
-	printf("pass 2 finish: pwopn %d usrtb_fail %d usrtb %p\n",
-		    pwopn, usrtb_fail, usrtb);
-
-	puts("");
-	printf("pass 3 (null pointers)\n");
-	printf("pwcache_userdb returned %d\n",
-	    pwcache_userdb(NULL, NULL, NULL));
-
-	return (0);
-}
-#endif	/* TEST_PWCACHE */
-#endif	/* !HAVE_PWCACHE_USERDB */
diff --git a/lib/libc/gen/pwcache.h b/lib/libc/gen/pwcache.h
deleted file mode 100644
index 3bd651b60..000000000
--- a/lib/libc/gen/pwcache.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: pwcache.h,v 1.5 2003/11/10 08:51:51 wiz Exp $	*/
-
-/*-
- * Copyright (c) 1992 Keith Muller.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Keith Muller of the University of California, San Diego.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *      @(#)cache.h	8.1 (Berkeley) 5/31/93
- */
-
-/*
- * Constants and data structures used to implement group and password file
- * caches. Traditional passwd/group cache routines perform quite poorly with
- * archives. The chances of hitting a valid lookup with an archive is quite a
- * bit worse than with files already resident on the file system. These misses
- * create a MAJOR performance cost. To address this problem, these routines
- * cache both hits and misses.
- *
- * NOTE:  name lengths must be as large as those stored in ANY PROTOCOL and
- * as stored in the passwd and group files. CACHE SIZES MUST BE PRIME
- */
-#define UNMLEN		32	/* >= user name found in any protocol */
-#define GNMLEN		32	/* >= group name found in any protocol */
-#define UID_SZ		317	/* size of uid to user_name cache */
-#define UNM_SZ		317	/* size of user_name to uid cache */
-#define GID_SZ		251	/* size of gid to group_name cache */
-#define GNM_SZ		251	/* size of group_name to gid cache */
-#define VALID		1	/* entry and name are valid */
-#define INVALID		2	/* entry valid, name NOT valid */
-
-/*
- * Node structures used in the user, group, uid, and gid caches.
- */
-
-typedef struct uidc {
-	int valid;		/* is this a valid or a miss entry */
-	char name[UNMLEN];	/* uid name */
-	uid_t uid;		/* cached uid */
-} UIDC;
-
-typedef struct gidc {
-	int valid;		/* is this a valid or a miss entry */
-	char name[GNMLEN];	/* gid name */
-	gid_t gid;		/* cached gid */
-} GIDC;
diff --git a/lib/libc/gen/raise.3 b/lib/libc/gen/raise.3
deleted file mode 100644
index bbef77457..000000000
--- a/lib/libc/gen/raise.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\"	$NetBSD: raise.3,v 1.10 2011/05/09 09:06:21 jruoho Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)raise.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd May 9, 2011
-.Dt RAISE 3
-.Os
-.Sh NAME
-.Nm raise
-.Nd send a signal to the current thread
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn raise "int sig"
-.Sh DESCRIPTION
-The
-.Fn raise
-function sends the signal
-.Fa sig
-to the current thread.
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, a value of \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn raise
-function
-may fail and set
-.Va errno
-for any of the errors specified for the
-library functions
-.Xr _lwp_self 2
-and
-.Xr _lwp_kill 2 .
-.Sh SEE ALSO
-.Xr kill 2 ,
-.Xr raise_default_signal 3
-.Sh STANDARDS
-The
-.Fn raise
-function
-conforms to
-.St -ansiC
-and
-.St -susv2 .
diff --git a/lib/libc/gen/raise.c b/lib/libc/gen/raise.c
deleted file mode 100644
index 2c77d665c..000000000
--- a/lib/libc/gen/raise.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: raise.c,v 1.8 2009/01/29 23:52:21 rmind Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)raise.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: raise.c,v 1.8 2009/01/29 23:52:21 rmind Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <lwp.h>
-#include <signal.h>
-
-int
-raise(int s)
-{
-
-	return _lwp_kill(_lwp_self(), s);
-}
diff --git a/lib/libc/gen/randomid.3 b/lib/libc/gen/randomid.3
deleted file mode 100644
index dbb31cef6..000000000
--- a/lib/libc/gen/randomid.3
+++ /dev/null
@@ -1,148 +0,0 @@
-.\"	$NetBSD: randomid.3,v 1.7 2006/01/05 19:45:29 rpaulo Exp $
-.\"
-.\" Copyright (C) 2006 The NetBSD Foundation
-.\" All rights reserved.
-.\"
-.\" Copyright (C) 2003 WIDE Project.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the project nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd January 5, 2006
-.Dt RANDOMID 3
-.Os
-.Sh NAME
-.Nm randomid
-.Nm randomid_new ,
-.Nm randomid_delete ,
-.Nd provide pseudo-random data stream without repetitions
-.Sh SYNOPSIS
-.In sys/types.h
-.In randomid.h
-.Ft uint32_t
-.Fn randomid "randomid_t ctx"
-.Ft randomid_t
-.Fn randomid_new "int bits" "long timeo"
-.Ft void
-.Fn randomid_delete "randomid_t ctx"
-.Sh DESCRIPTION
-The
-.Fn randomid
-function provides pseudo-random data stream,
-which is guaranteed not to generate the same number twice during
-a certain duration.
-.Fa ctx
-is the context which holds internal state for the random number generator.
-.Pp
-To initialize a context,
-.Fa randomid_new
-is used.
-.Fa bits
-specifies the bitwidth of the value generated by
-.Fn randomid .
-Currently 32, 20, and 16 are supported.
-.Fa timeo
-specifies the reinitialization interval in seconds.
-.Fa timeo
-has to be bigger than
-.Dv RANDOMID_TIMEO_MIN .
-.Fa randomid_new
-returns a dynamically-allocated memory region allocated by
-.Xr malloc 3 .
-.Pp
-.Fn randomid_delete
-will
-.Xr free 3
-the internal state
-.Fa ctx .
-.Pp
-The same number may appear after two reinitialization events of the internal state,
-.Fa ctx .
-Reinitialization happens when the random number generator cycle is exhausted,
-or
-.Fa timeo
-seconds have passed since the last reinitialization.
-For instance,
-.Fa ctx
-configured to generate 16 bit data stream will reinitialize its internal state
-every 30000 calls to
-.Fn randomid
-.Po
-or after
-.Fa timeo
-seconds
-.Pc ,
-therefore the same data will not appear until after 30000 calls to
-.Fn randomid
-.Po
-or after
-.Fa timeo
-seconds
-.Pc .
-.Pp
-The internal state,
-.Fa ctx ,
-determines the data stream generated by
-.Fn randomid .
-.Fa ctx
-must be allocated per data stream
-.Pq such as a specific data field .
-It must not be shared among multiple data streams with different usage.
-.\"
-.Sh EXAMPLES
-.Bd -literal -offset indent
-#include \*[Lt]stdio.h\*[Gt]
-#include \*[Lt]sys/types.h\*[Gt]
-#include \*[Lt]randomid.h\*[Gt]
-
-uint32_t
-genid(void)
-{
-	static randomid_t ctx = NULL;
-
-	if (!ctx)
-		ctx = randomid_new(16, (long)3600);
-	return randomid(ctx);
-}
-.Ed
-.\"
-.Sh ERRORS
-.Fn randomid_new
-returns
-.Dv NULL
-on error and sets the external variable
-.Va errno .
-.\"
-.Sh SEE ALSO
-.Xr arc4random 3
-.\"
-.Sh HISTORY
-The pseudo-random data stream generator was designed by Niels Provos for
-.Ox
-IPv4 fragment ID generation.
-.Fn randomid
-is a generalized version of the generator, reworked by Jun-ichiro itojun Hagino,
-and was introduced in
-.Nx 2.0 .
diff --git a/lib/libc/gen/randomid.c b/lib/libc/gen/randomid.c
deleted file mode 100644
index 4eb9a3b32..000000000
--- a/lib/libc/gen/randomid.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*	$NetBSD: randomid.c,v 1.13 2009/01/11 02:46:27 christos Exp $	*/
-/*	$KAME: ip6_id.c,v 1.8 2003/09/06 13:41:06 itojun Exp $	*/
-/*	$OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert Exp $	*/
-
-/*
- * Copyright (C) 2003 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Copyright 1998 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Theo de Raadt <deraadt@openbsd.org> came up with the idea of using
- * such a mathematical system to generate more random (yet non-repeating)
- * ids to solve the resolver/named problem.  But Niels designed the
- * actual system based on the constraints.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-/*
- * seed = random (bits - 1) bit
- * n = prime, g0 = generator to n,
- * j = random so that gcd(j,n-1) == 1
- * g = g0^j mod n will be a generator again.
- *
- * X[0] = random seed.
- * X[n] = a*X[n-1]+b mod m is a Linear Congruential Generator
- * with a = 7^(even random) mod m,
- *      b = random with gcd(b,m) == 1
- *      m = constant and a maximal period of m-1.
- *
- * The transaction id is determined by:
- * id[n] = seed xor (g^X[n] mod n)
- *
- * Effectivly the id is restricted to the lower (bits - 1) bits, thus
- * yielding two different cycles by toggling the msb on and off.
- * This avoids reuse issues caused by reseeding.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: randomid.c,v 1.13 2009/01/11 02:46:27 christos Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <randomid.h>
-
-#ifdef __weak_alias
-__weak_alias(randomid,_randomid)
-__weak_alias(randomid_new,_randomid_new)
-__weak_alias(randomid_delete,_randomid_delete)
-#endif
-
-struct randomconf {
-	const int	rc_bits; /* resulting bits */
-	const u_int32_t rc_max;	/* Uniq cycle, avoid blackjack prediction */
-	const u_int32_t rc_gen;	/* Starting generator */
-	const u_int32_t rc_n;	/* ru_n: prime, ru_n - 1: product of pfacts[] */
-	const u_int32_t rc_agen; /* determine ru_a as ru_agen^(2*rand) */
-	const u_int32_t rc_m;	/* ru_m = 2^x*3^y */
-	const u_int32_t rc_pfacts[4];	/* factors of ru_n */
-	const int	rc_skip;	/* skip values */
-};
-
-struct randomid_ctx {
-	struct randomconf *ru_conf;
-#define ru_bits		ru_conf->rc_bits
-#define ru_max		ru_conf->rc_max
-#define ru_gen		ru_conf->rc_gen
-#define ru_n		ru_conf->rc_n
-#define ru_agen		ru_conf->rc_agen
-#define ru_m		ru_conf->rc_m
-#define ru_pfacts	ru_conf->rc_pfacts
-#define ru_skip		ru_conf->rc_skip
-	long ru_out;		/* Time after wich will be reseeded */
-	u_int32_t ru_counter;
-	u_int32_t ru_msb;
-
-	u_int32_t ru_x;
-	u_int32_t ru_seed, ru_seed2;
-	u_int32_t ru_a, ru_b;
-	u_int32_t ru_g;
-	time_t ru_reseed;
-};
-
-static struct randomconf randomconf[] = {
-  {
-	32,			/* resulting bits */
-	1000000000,		/* Uniq cycle, avoid blackjack prediction */
-	2,			/* Starting generator */
-	2147483629,		/* RU_N-1 = 2^2*3^2*59652323 */
-	7,			/* determine ru_a as RU_AGEN^(2*rand) */
-	1836660096,		/* RU_M = 2^7*3^15 - don't change */
-	{ 2, 3, 59652323, 0 },	/* factors of ru_n */
-	3,			/* skip values */
-  },
-  {
-	20,			/* resulting bits */
-	200000,			/* Uniq cycle, avoid blackjack prediction */
-	2,			/* Starting generator */
-	524269,			/* RU_N-1 = 2^2*3^2*14563 */
-	7,			/* determine ru_a as RU_AGEN^(2*rand) */
-	279936,			/* RU_M = 2^7*3^7 - don't change */
-	{ 2, 3, 14563, 0 },	/* factors of ru_n */
-	3,			/* skip values */
-  },
-  {
-	16,			/* resulting bits */
-	30000,			/* Uniq cycle, avoid blackjack prediction */
-	2,			/* Starting generator */
-	32749,			/* RU_N-1 = 2^2*3*2729 */
-	7,			/* determine ru_a as RU_AGEN^(2*rand) */
-	31104,			/* RU_M = 2^7*3^5 - don't change */
-	{ 2, 3, 2729, 0 },	/* factors of ru_n */
-	0,			/* skip values */
-  },
-  {
-	.rc_bits = -1,		/* termination */
-  },
-};
-
-static u_int32_t pmod(u_int32_t, u_int32_t, u_int32_t);
-static void initid(struct randomid_ctx *);
-
-struct randomid_ctx *randomid_new(int, long);
-void randomid_delete(struct randomid_ctx *);
-u_int32_t randomid(struct randomid_ctx *);
-
-/*
- * Do a fast modular exponation, returned value will be in the range
- * of 0 - (mod-1)
- */
-
-static u_int32_t
-pmod(u_int32_t gen, u_int32_t expo, u_int32_t mod)
-{
-	u_int64_t s, t, u;
-
-	s = 1;
-	t = gen;
-	u = expo;
-
-	while (u) {
-		if (u & 1)
-			s = (s * t) % mod;
-		u >>= 1;
-		t = (t * t) % mod;
-	}
-	return ((u_int32_t)s & UINT32_MAX);
-}
-
-/*
- * Initalizes the seed and chooses a suitable generator. Also toggles
- * the msb flag. The msb flag is used to generate two distinct
- * cycles of random numbers and thus avoiding reuse of ids.
- *
- * This function is called from id_randomid() when needed, an
- * application does not have to worry about it.
- */
-static void
-initid(struct randomid_ctx *p)
-{
-	u_int32_t j, i;
-	int noprime = 1;
-	struct timeval tv;
-
-	p->ru_x = arc4random() % p->ru_m;
-
-	/* (bits - 1) bits of random seed */
-	p->ru_seed = arc4random() & (~0U >> (32 - p->ru_bits + 1));
-	p->ru_seed2 = arc4random() & (~0U >> (32 - p->ru_bits + 1));
-
-	/* Determine the LCG we use */
-	p->ru_b = (arc4random() & (~0U >> (32 - p->ru_bits))) | 1;
-	p->ru_a = pmod(p->ru_agen,
-	    (arc4random() & (~0U >> (32 - p->ru_bits))) & (~1U), p->ru_m);
-	while (p->ru_b % 3 == 0)
-		p->ru_b += 2;
-
-	j = arc4random() % p->ru_n;
-
-	/*
-	 * Do a fast gcd(j, RU_N - 1), so we can find a j with
-	 * gcd(j, RU_N - 1) == 1, giving a new generator for
-	 * RU_GEN^j mod RU_N
-	 */
-	while (noprime) {
-		for (i = 0; p->ru_pfacts[i] > 0; i++)
-			if (j % p->ru_pfacts[i] == 0)
-				break;
-
-		if (p->ru_pfacts[i] == 0)
-			noprime = 0;
-		else
-			j = (j + 1) % p->ru_n;
-	}
-
-	p->ru_g = pmod(p->ru_gen, j, p->ru_n);
-	p->ru_counter = 0;
-
-	gettimeofday(&tv, NULL);
-	p->ru_reseed = tv.tv_sec + p->ru_out;
-	p->ru_msb = p->ru_msb ? 0 : (1U << (p->ru_bits - 1));
-}
-
-struct randomid_ctx *
-randomid_new(int bits, long timeo)
-{
-	struct randomconf *conf;
-	struct randomid_ctx *ctx;
-
-	if (timeo < RANDOMID_TIMEO_MIN) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	for (conf = randomconf; conf->rc_bits > 0; conf++) {
-		if (bits == conf->rc_bits)
-			break;
-	}
-
-	/* unsupported bits */
-	if (bits != conf->rc_bits) {
-		errno = ENOTSUP;
-		return (NULL);
-	}
-
-	ctx = malloc(sizeof(*ctx));
-	if (!ctx)
-		return (NULL);
-
-	memset(ctx, 0, sizeof(*ctx));
-	ctx->ru_conf = conf;
-	ctx->ru_out = timeo;
-
-	return (ctx);
-}
-
-void
-randomid_delete(struct randomid_ctx *ctx)
-{
-
-	memset(ctx, 0, sizeof(*ctx));
-	free(ctx);
-}
-
-u_int32_t
-randomid(struct randomid_ctx *p)
-{
-	int i, n;
-	struct timeval tv;
-
-	gettimeofday(&tv, NULL);
-	if (p->ru_counter >= p->ru_max || tv.tv_sec > p->ru_reseed)
-		initid(p);
-
-	/* Skip a random number of ids */
-	if (p->ru_skip) {
-		n = arc4random() & p->ru_skip;
-		if (p->ru_counter + n >= p->ru_max)
-			initid(p);
-	} else
-		n = 0;
-
-	for (i = 0; i <= n; i++) {
-		/* Linear Congruential Generator */
-		p->ru_x = (u_int32_t)(((u_int64_t)p->ru_a * p->ru_x + p->ru_b) % p->ru_m);
-	}
-
-	p->ru_counter += i;
-
-	return (p->ru_seed ^ pmod(p->ru_g, p->ru_seed2 + p->ru_x, p->ru_n)) |
-	    p->ru_msb;
-}
diff --git a/lib/libc/gen/readdir.c b/lib/libc/gen/readdir.c
deleted file mode 100644
index e834621e2..000000000
--- a/lib/libc/gen/readdir.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*	$NetBSD: readdir.c,v 1.26 2012/06/25 22:32:43 abs Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)readdir.c	8.3 (Berkeley) 9/29/94";
-#else
-__RCSID("$NetBSD: readdir.c,v 1.26 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include "extern.h"
-#include <sys/param.h>
-
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "dirent_private.h"
-
-/*
- * get next entry in a directory.
- */
-struct dirent *
-_readdir_unlocked(DIR *dirp, int skipdeleted)
-{
-	struct dirent *dp;
-
-	for (;;) {
-		if (dirp->dd_loc >= dirp->dd_size) {
-			if (dirp->dd_flags & __DTF_READALL)
-				return (NULL);
-			dirp->dd_loc = 0;
-		}
-		if (dirp->dd_loc == 0 && !(dirp->dd_flags & __DTF_READALL)) {
-			dirp->dd_seek = lseek(dirp->dd_fd, (off_t)0, SEEK_CUR);
-			dirp->dd_size = getdents(dirp->dd_fd,
-			    dirp->dd_buf, (size_t)dirp->dd_len);
-			if (dirp->dd_size <= 0)
-				return (NULL);
-		}
-		dp = (struct dirent *)
-		    (void *)(dirp->dd_buf + (size_t)dirp->dd_loc);
-		if ((intptr_t)dp & _DIRENT_ALIGN(dp))/* bogus pointer check */
-			return (NULL);
-		/* d_reclen is unsigned; no need to compare it <= 0 */
-		if (dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc)
-			return (NULL);
-		dirp->dd_loc += dp->d_reclen;
-		if (dp->d_ino == 0 && skipdeleted)
-			continue;
-#if !defined(__minix)
-		if (dp->d_type == DT_WHT && (dirp->dd_flags & DTF_HIDEW))
-			continue;
-#endif /* !defined(__minix) */
-		return (dp);
-	}
-}
-
-struct dirent *
-readdir(DIR *dirp)
-{
-	struct dirent	*dp;
-
-#ifdef _REENTRANT
-	if (__isthreaded) {
-		mutex_lock((mutex_t *)dirp->dd_lock);
-		dp = _readdir_unlocked(dirp, 1);
-		mutex_unlock((mutex_t *)dirp->dd_lock);
-	}
-	else
-#endif
-		dp = _readdir_unlocked(dirp, 1);
-	return (dp);
-}
-
-int
-readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
-{
-	struct dirent *dp;
-	int saved_errno;
-
-	saved_errno = errno;
-	errno = 0;
-#ifdef _REENTRANT
-	if (__isthreaded) {
-		mutex_lock((mutex_t *)dirp->dd_lock);
-		if ((dp = _readdir_unlocked(dirp, 1)) != NULL)
-			memcpy(entry, dp, (size_t)_DIRENT_SIZE(dp));
-		mutex_unlock((mutex_t *)dirp->dd_lock);
-	}
-	else 
-#endif
-		if ((dp = _readdir_unlocked(dirp, 1)) != NULL)
-			memcpy(entry, dp, (size_t)_DIRENT_SIZE(dp));
-
-	if (errno != 0) {
-		if (dp == NULL)
-			return (errno);
-	} else
-		errno = saved_errno;
-
-	if (dp != NULL)
-		*result = entry;
-	else
-		*result = NULL;
-
-	return (0);
-}
diff --git a/lib/libc/gen/realpath.3 b/lib/libc/gen/realpath.3
deleted file mode 100644
index 335cafb91..000000000
--- a/lib/libc/gen/realpath.3
+++ /dev/null
@@ -1,163 +0,0 @@
-.\"	$NetBSD: realpath.3,v 1.18 2013/05/24 09:35:11 wiz Exp $
-.\"
-.\" Copyright (c) 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Jan-Simon Pendry.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)realpath.3	8.2 (Berkeley) 2/16/94
-.\"
-.Dd May 24, 2013
-.Dt REALPATH 3
-.Os
-.Sh NAME
-.Nm realpath
-.Nd returns the canonicalized absolute pathname
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In stdlib.h
-.Ft "char *"
-.Fn realpath "const char * restrict pathname" "char * restrict resolvedname"
-.Sh DESCRIPTION
-The
-.Fn realpath
-function resolves all symbolic links, extra
-.Dq /
-characters and references to
-.Pa /./
-and
-.Pa /../
-in
-.Fa pathname ,
-and copies the resulting absolute pathname into
-the memory referenced by
-.Fa resolvedname .
-The
-.Fa resolvedname
-argument
-.Em must
-refer to a buffer capable of storing at least
-.Dv MAXPATHLEN
-characters, or be
-.Dv NULL .
-.Pp
-The
-.Fn realpath
-function will resolve both absolute and relative paths
-and return the absolute pathname corresponding to
-.Fa pathname .
-.Sh RETURN VALUES
-If
-.Fa resolvedname
-is
-.Dv NULL ,
-it will be allocated and the returned pointer can be deallocated using
-.Xr free 3 .
-The
-.Fn realpath
-function returns
-.Fa resolvedname
-on success.
-If an error occurs,
-.Fn realpath
-returns
-.Dv NULL ,
-and
-.Fa resolvedname
-was not allocated by
-.Fn realpath ,
-it will contain the pathname which caused the problem.
-.Sh ERRORS
-The function
-.Fn realpath
-may fail and set the external variable
-.Va errno
-for any of the errors specified for the library functions
-.\" First sorted by section, then by name.
-.Xr lstat 2 ,
-.Xr readlink 2 ,
-.Xr getcwd 3
-and
-.Xr malloc 3 .
-.Pp
-In addition, the following errors may be reported:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of the
-.Fa pathname
-argument is
-.Dv NULL .
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the
-.Fa pathname .
-.It Bq Er ENAMETOOLONG
-The resulting absolute pathname exceeds
-.Dv MAXPATHLEN
-characters.
-.It Bq Er ENOENT
-The value of the
-.Fa pathname
-argument is an empty string;
-or a symbolic link to an empty string is encountered.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.El
-.Sh SEE ALSO
-.Xr getcwd 3
-.Sh STANDARDS
-.Fn realpath
-first appeared in
-.St -xpg4.2
-and is part of
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn realpath
-function call first appeared in
-.Bx 4.4 .
-In
-.Nx 7.0
-the function was updated to accept a
-.Dv NULL
-pointer for the
-.Fa resolvedname
-argument.
-.Sh BUGS
-This implementation of
-.Fn realpath
-differs slightly from the Solaris implementation.
-The
-.Bx 4.4
-version always returns absolute pathnames,
-whereas the Solaris implementation will,
-under certain circumstances, return a relative
-.Fa resolvedname
-when given a relative
-.Fa pathname .
diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c
deleted file mode 100644
index a16685247..000000000
--- a/lib/libc/gen/rewinddir.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: rewinddir.c,v 1.13 2010/09/26 02:26:59 yamt Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)rewinddir.c	8.1 (Berkeley) 6/8/93";
-#else
-__RCSID("$NetBSD: rewinddir.c,v 1.13 2010/09/26 02:26:59 yamt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include "extern.h"
-#include <sys/types.h>
-
-#include <unistd.h>
-#include <dirent.h>
-
-#include "dirent_private.h"
-
-#ifdef __weak_alias
-__weak_alias(rewinddir,_rewinddir)
-#endif
-
-void
-rewinddir(DIR *dirp)
-{
-	int fd;
-
-#ifdef _REENTRANT
-	if (__isthreaded) {
-		mutex_lock((mutex_t *)dirp->dd_lock);
-	}
-#endif
-	fd = dirp->dd_fd;
-	_finidir(dirp);
-	dirp->dd_seek = lseek(fd, (off_t)0, SEEK_SET);
-	_initdir(dirp, fd, NULL);
-#ifdef _REENTRANT
-	if (__isthreaded) {
-		mutex_unlock((mutex_t *)dirp->dd_lock);
-	}
-#endif
-}
diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3
deleted file mode 100644
index 01d88b2c9..000000000
--- a/lib/libc/gen/scandir.3
+++ /dev/null
@@ -1,113 +0,0 @@
-.\"	$NetBSD: scandir.3,v 1.14 2010/12/17 19:20:42 njoly Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)scandir.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 29, 2010
-.Dt SCANDIR 3
-.Os
-.Sh NAME
-.Nm scandir ,
-.Nm alphasort
-.Nd scan a directory
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In dirent.h
-.Ft int
-.Fn scandir "const char *dirname" "struct dirent ***namelist" "int \*(lp*select\*(rp\*(lpconst struct dirent *\*(rp" "int \*(lp*compar\*(rp\*(lpconst void *, const void *\*(rp"
-.Ft int
-.Fn alphasort "const void *d1" "const void *d2"
-.Sh DESCRIPTION
-The
-.Fn scandir
-function
-reads the directory
-.Fa dirname
-and builds an array of pointers to directory
-entries using
-.Xr malloc 3 .
-It returns the number of entries in the array.
-A pointer to the array of directory entries is stored in the location
-referenced by
-.Fa namelist .
-.Pp
-The
-.Fa select
-parameter is a pointer to a user supplied subroutine which is called by
-.Fn scandir
-to select which entries are to be included in the array.
-The select routine is passed a
-pointer to a directory entry and should return a non-zero
-value if the directory entry is to be included in the array.
-If
-.Fa select
-is null, then all the directory entries will be included.
-.Pp
-The
-.Fa compar
-parameter is a pointer to a user supplied subroutine which is passed to
-.Xr qsort 3
-to sort the completed array.
-If this pointer is null, the array is not sorted.
-.Pp
-The
-.Fn alphasort
-function
-is a routine which can be used for the
-.Fa compar
-parameter to sort the array alphabetically.
-.Pp
-The memory allocated for the array can be deallocated with
-.Xr free 3 ,
-by freeing each pointer in the array and then the array itself.
-.Sh DIAGNOSTICS
-Returns \-1 if the directory cannot be opened for reading or if
-.Xr malloc 3
-cannot allocate enough memory to hold all the data structures.
-.Sh SEE ALSO
-.Xr directory 3 ,
-.Xr dirent 3 ,
-.Xr malloc 3 ,
-.Xr qsort 3
-.Sh STANDARDS
-The
-.Fn scandir
-and
-.Fn alphasort
-functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn scandir
-and
-.Fn alphasort
-functions appeared in
-.Bx 4.2 .
diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
deleted file mode 100644
index ed3aac8d8..000000000
--- a/lib/libc/gen/scandir.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*	$NetBSD: scandir.c,v 1.27 2012/03/13 21:13:36 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)scandir.c	8.3 (Berkeley) 1/2/94";
-#else
-__RCSID("$NetBSD: scandir.c,v 1.27 2012/03/13 21:13:36 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Scan the directory dirname calling selectfn to make a list of selected
- * directory entries then sort using qsort and compare routine dcomp.
- * Returns the number of entries and a pointer to a list of pointers to
- * struct dirent (through namelist). Returns -1 if there were any errors.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * Compute an estimate of the number of entries in a directory based on
- * the file size. Returns the estimated number of entries or 0 on failure.
- */
-static size_t
-dirsize(int fd, size_t olen)
-{
-	struct stat stb;
-	size_t nlen;
-
-	if (fstat(fd, &stb) == -1)
-		return 0;
-	/*
-	 * Estimate the array size by taking the size of the directory file
-	 * and dividing it by a multiple of the minimum size entry. 
-	 */
-	nlen = (size_t)(stb.st_size / _DIRENT_MINSIZE((struct dirent *)0));
-	/*
-	 * If the size turns up 0, switch to an alternate strategy and use the
-	 * file size as the number of entries like ZFS returns. If that turns
-	 * out to be 0 too return a minimum of 10 entries, plus the old length.
-	 */
-	if (nlen == 0)
-		nlen = (size_t)(stb.st_size ? stb.st_size : 10);
-	return olen + nlen;
-}
-
-int
-scandir(const char *dirname, struct dirent ***namelist,
-    int (*selectfn)(const struct dirent *),
-    int (*dcomp)(const void *, const void *))
-{
-	struct dirent *d, *p, **names, **newnames;
-	size_t nitems, arraysz;
-	DIR *dirp;
-
-	_DIAGASSERT(dirname != NULL);
-	_DIAGASSERT(namelist != NULL);
-
-	if ((dirp = opendir(dirname)) == NULL)
-		return -1;
-
-	if ((arraysz = dirsize(dirp->dd_fd, 0)) == 0)
-		goto bad;
-
-	names = malloc(arraysz * sizeof(*names));
-	if (names == NULL)
-		goto bad;
-
-	nitems = 0;
-	while ((d = readdir(dirp)) != NULL) {
-		if (selectfn != NULL && !(*selectfn)(d))
-			continue;	/* just selected names */
-
-		/*
-		 * Check to make sure the array has space left and
-		 * realloc the maximum size.
-		 */
-		if (nitems >= arraysz) {
-			if ((arraysz = dirsize(dirp->dd_fd, arraysz)) == 0)
-				goto bad2;
-			newnames = realloc(names, arraysz * sizeof(*names));
-			if (newnames == NULL)
-				goto bad2;
-			names = newnames;
-		}
-
-		/*
-		 * Make a minimum size copy of the data
-		 */
-		p = malloc((size_t)_DIRENT_SIZE(d));
-		if (p == NULL)
-			goto bad2;
-		p->d_fileno = d->d_fileno;
-		p->d_reclen = d->d_reclen;
-		p->d_type = d->d_type;
-		p->d_namlen = d->d_namlen;
-		(void)memmove(p->d_name, d->d_name, (size_t)(p->d_namlen + 1));
-		names[nitems++] = p;
-	}
-	(void)closedir(dirp);
-	if (nitems && dcomp != NULL)
-		qsort(names, nitems, sizeof(*names), dcomp);
-	*namelist = names;
-	_DIAGASSERT(__type_fit(int, nitems));
-	return (int)nitems;
-
-bad2:
-	while (nitems-- > 0)
-		free(names[nitems]);
-	free(names);
-bad:
-	(void)closedir(dirp);
-	return -1;
-}
diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c
deleted file mode 100644
index 1c78fb0d9..000000000
--- a/lib/libc/gen/seekdir.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: seekdir.c,v 1.15 2013/03/06 11:27:46 yamt Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)seekdir.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: seekdir.c,v 1.15 2013/03/06 11:27:46 yamt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include "extern.h"
-#include <sys/param.h>
-
-#include <dirent.h>
-
-#include "dirent_private.h"
-
-#ifdef __weak_alias
-__weak_alias(seekdir,_seekdir)
-#endif
-
-/*
- * Seek to an entry in a directory.
- * _seekdir_unlocked is in telldir.c so that it can share opaque
- * data structures.
- */
-void
-seekdir(DIR *dirp, long loc)
-{
-
-#ifdef _REENTRANT
-	if (__isthreaded) {
-		mutex_lock((mutex_t *)dirp->dd_lock);
-		_seekdir_unlocked(dirp, loc);
-		mutex_unlock((mutex_t *)dirp->dd_lock);
-	} else
-#endif
-		_seekdir_unlocked(dirp, loc);
-}
diff --git a/lib/libc/gen/setdomainname.c b/lib/libc/gen/setdomainname.c
deleted file mode 100644
index b392c1fc2..000000000
--- a/lib/libc/gen/setdomainname.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: setdomainname.c,v 1.13 2012/06/25 22:32:43 abs Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)sethostname.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: setdomainname.c,v 1.13 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(setdomainname,_setdomainname)
-#endif
-
-int
-setdomainname(const char *name, size_t namelen)
-{
-	int mib[2];
-
-	_DIAGASSERT(name != NULL);
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_DOMAINNAME;
-	if (sysctl(mib, 2, NULL, NULL, name, namelen) == -1)
-		return (-1);
-	return (0);
-}
diff --git a/lib/libc/gen/sethostname.c b/lib/libc/gen/sethostname.c
deleted file mode 100644
index 4da934ae4..000000000
--- a/lib/libc/gen/sethostname.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: sethostname.c,v 1.13 2012/06/25 22:32:43 abs Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)sethostname.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: sethostname.c,v 1.13 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(sethostname,_sethostname)
-#endif
-
-int
-sethostname(const char *name, size_t namelen)
-{
-	int mib[2];
-
-	_DIAGASSERT(name != NULL);
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTNAME;
-	if (sysctl(mib, 2, NULL, NULL, name, namelen) == -1)
-		return (-1);
-	return (0);
-}
diff --git a/lib/libc/gen/setjmp.3 b/lib/libc/gen/setjmp.3
deleted file mode 100644
index 2c4b38961..000000000
--- a/lib/libc/gen/setjmp.3
+++ /dev/null
@@ -1,229 +0,0 @@
-.\"	$NetBSD: setjmp.3,v 1.17 2008/05/31 16:15:07 enami Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)setjmp.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 1, 2008
-.Dt SETJMP 3
-.Os
-.Sh NAME
-.Nm sigsetjmp ,
-.Nm siglongjmp ,
-.Nm setjmp ,
-.Nm longjmp ,
-.Nm _setjmp ,
-.Nm _longjmp ,
-.Nm longjmperror
-.Nd non-local jumps
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In setjmp.h
-.Ft int
-.Fn sigsetjmp "sigjmp_buf env" "int savemask"
-.Ft void
-.Fn siglongjmp "sigjmp_buf env" "int val"
-.Ft int
-.Fn setjmp "jmp_buf env"
-.Ft void
-.Fn longjmp "jmp_buf env" "int val"
-.Ft int
-.Fn _setjmp "jmp_buf env"
-.Ft void
-.Fn _longjmp "jmp_buf env" "int val"
-.Ft void
-.Fn longjmperror void
-.Sh DESCRIPTION
-The
-.Fn sigsetjmp ,
-.Fn setjmp ,
-and
-.Fn _setjmp
-functions save their calling environment in
-.Fa env .
-Each of these functions returns 0.
-.Pp
-The corresponding
-.Fn longjmp
-functions restore the environment saved by the most recent
-invocation of the respective
-.Fn setjmp
-function.
-They then return so that program execution continues as if the corresponding
-invocation of the
-.Fn setjmp
-call had just returned the value specified by
-.Fa val ,
-instead of 0.
-.Pp
-Pairs of calls may be intermixed, i.e., both
-.Fn sigsetjmp
-and
-.Fn siglongjmp
-as well as
-.Fn setjmp
-and
-.Fn longjmp
-combinations may be used in the same program.
-However, individual calls may not, e.g., the
-.Fa env
-argument to
-.Fn setjmp
-may not be passed to
-.Fn siglongjmp .
-.Pp
-The
-.Fn longjmp
-routines may not be called after the routine which called the
-.Fn setjmp
-routines returns.
-.Pp
-All accessible objects have values as of the time
-.Fn longjmp
-routine was called, except that the values of objects of automatic storage
-invocation duration that do not have the
-.Li volatile
-type and have been changed between the
-.Fn setjmp
-invocation and
-.Fn longjmp
-call are indeterminate.
-.Pp
-The
-.Fn setjmp Ns / Ns Fn longjmp
-function pairs save and restore the signal mask while
-.Fn _setjmp Ns / Ns Fn _longjmp
-function pairs save and restore only the register set and the stack.
-(See
-.Fn sigprocmask 2 . )
-.Pp
-The
-.Fn sigsetjmp Ns / Ns Fn siglongjmp
-function pairs save and restore the signal mask if the argument
-.Fa savemask
-is non-zero.
-Otherwise, only the register set and the stack are saved.
-.Pp
-In other words,
-.Fn setjmp Ns / Ns Fn longjmp
-are functionally equivalent to
-.Fn sigsetjmp Ns / Ns Fn siglongjmp
-when
-.Fn sigsetjmp
-is called with a non-zero
-.Fa savemask
-argument.
-Conversely,
-.Fn _setjmp Ns / Ns Fn _longjmp
-are functionally equivalent to
-.Fn sigsetjmp Ns / Ns Fn siglongjmp
-when
-.Fn sigsetjmp
-is called with a zero-value
-.Fa savemask .
-.Pp
-The
-.Fn sigsetjmp Ns / Ns Fn siglongjmp
-interfaces are preferred for maximum portability.
-.Sh ERRORS
-If the contents of the
-.Fa env
-are corrupted or correspond to an environment that has already returned,
-the
-.Fn longjmp
-routine calls the routine
-.Xr longjmperror 3 .
-If
-.Fn longjmperror
-returns, the program is aborted (see
-.Xr abort 3 ) .
-The default version of
-.Fn longjmperror
-prints the message
-.Dq Li longjmp botch
-to standard error and returns.
-User programs wishing to exit more gracefully should write their own
-versions of
-.Fn longjmperror .
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr sigaltstack 2 ,
-.Xr sigprocmask 2 ,
-.Xr pthread_sigmask 3 ,
-.Xr signal 3
-.Sh STANDARDS
-The
-.Fn setjmp
-and
-.Fn longjmp
-functions conform to
-.St -ansiC .
-The
-.Fn sigsetjmp
-and
-.Fn siglongjmp
-functions conform to
-.St -p1003.1-90 .
-.Sh CAVEATS
-Historically, on
-.At V ,
-the
-.Fn setjmp Ns / Ns Fn longjmp
-functions have been equivalent to the
-.Bx
-.Fn _setjmp Ns / Ns Fn _longjmp
-functions and do not restore the signal mask.
-Because of this discrepancy, the
-.Fn sigsetjmp Ns / Ns Fn siglongjmp
-interfaces should be used if portability is desired.
-.Pp
-Use of
-.Fn longjmp
-or
-.Fn siglongjmp
-from inside a signal handler is not as easy as it might seem.
-Generally speaking, all possible code paths between the
-.Fn setjmp
-and
-.Fn longjmp
-must be signal race safe.
-Furthermore, the code paths must not do resource management
-(such as
-.Xr open 2
-or
-.Xr close 2 )
-without blocking the signal in question, or resources might
-be mismanaged.
-Obviously this makes
-.Fn longjmp
-much less useful than previously thought.
diff --git a/lib/libc/gen/setjmperr.c b/lib/libc/gen/setjmperr.c
deleted file mode 100644
index 5b1432e15..000000000
--- a/lib/libc/gen/setjmperr.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: setjmperr.c,v 1.8 2012/06/24 15:26:03 christos Exp $	*/
-
-/*
- * Copyright (c) 1980, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)setjmperr.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: setjmperr.c,v 1.8 2012/06/24 15:26:03 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * This routine is called from longjmp() when an error occurs.
- * Programs that wish to exit gracefully from this error may
- * write their own versions.
- * If this routine returns, the program is aborted.
- */
-
-#include <setjmp.h>
-#include <unistd.h>
-
-void
-longjmperror(void)
-{
-#define	ERRMSG	"longjmp botch.\n"
-	(void)write(STDERR_FILENO, ERRMSG, sizeof(ERRMSG) - 1);
-}
diff --git a/lib/libc/gen/setmode.3 b/lib/libc/gen/setmode.3
deleted file mode 100644
index 9c131d25e..000000000
--- a/lib/libc/gen/setmode.3
+++ /dev/null
@@ -1,150 +0,0 @@
-.\"	$NetBSD: setmode.3,v 1.21 2009/01/11 02:46:27 christos Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"     @(#)setmode.3	8.2 (Berkeley) 4/28/95
-.\"
-.Dd January 4, 2009
-.Dt SETMODE 3
-.Os
-.Sh NAME
-.Nm getmode ,
-.Nm setmode
-.Nd modify mode bits
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft void *
-.Fn setmode "const char *mode_str"
-.Ft mode_t
-.Fn getmode "const void *set" "mode_t mode"
-.Sh DESCRIPTION
-The
-.Fn setmode
-function accepts a string representation of a file mode change,
-compiles it to binary form, and returns an abstract representation
-that may be passed to
-.Fn getmode .
-The string may be an numeric (octal) or symbolic string of the form
-accepted by
-.Xr chmod 1 ,
-and may represent either an exact mode to set or a change to make to
-the existing mode.
-.Pp
-The
-.Fn getmode
-function
-adjusts the file permission bits given by
-.Fa mode
-according to the compiled change representation
-.Fa set ,
-and returns the adjusted mode.
-While only the permission bits are altered, other parts of the file
-mode, particularly the type, may be examined.
-.Pp
-Because some of the possible symbolic values are defined relative to
-the file creation mask,
-.Fn setmode
-may call
-.Xr umask 2 ,
-temporarily changing the mask.
-If this occurs, the file creation mask will be restored before
-.Fn setmode
-returns.
-If the calling program changes the value of its file creation mask
-after calling
-.Fn setmode ,
-.Fn setmode
-must be called again to recompile the mode string if
-.Fn getmode
-is to modify future file modes correctly.
-.Pp
-If the mode passed to
-.Fn setmode
-is invalid,
-.Fn setmode
-returns
-.Dv NULL .
-.Sh EXAMPLES
-The effects of the shell command
-.Ql "chmod a+x myscript.sh"
-can be duplicated as follows:
-.Bd -literal -offset indent
-const char *file = "myscript.sh";
-struct stat st;
-mode_t newmode;
-
-stat(file, \*[Am]st);
-newmode = getmode(setmode("a+x"), st.st_mode);
-chmod(file, newmode);
-.Ed
-.Sh ERRORS
-The
-.Fn setmode
-function
-may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr malloc 3
-or
-.Xr strtol 3 .
-In addition,
-.Fn setmode
-will fail and set
-.Va errno
-to:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa mode
-argument does not represent a valid mode.
-.El
-.Sh SEE ALSO
-.Xr chmod 1 ,
-.Xr stat 2 ,
-.Xr umask 2 ,
-.Xr malloc 3
-.Sh HISTORY
-The
-.Fn getmode
-and
-.Fn setmode
-functions first appeared in
-.Bx 4.4 .
-.Sh BUGS
-Each call to
-.Nm setmode
-allocates a small amount of memory that there is no correct way to
-free.
-.Pp
-The type of
-.Fa set
-should really be some opaque struct type used only by these functions
-rather than
-.Ft void * .
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
deleted file mode 100644
index a2ea01d4c..000000000
--- a/lib/libc/gen/setmode.c
+++ /dev/null
@@ -1,485 +0,0 @@
-/*	$NetBSD: setmode.c,v 1.34 2012/06/25 22:32:43 abs Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Dave Borman at Cray Research, 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)setmode.c	8.2 (Berkeley) 3/25/94";
-#else
-__RCSID("$NetBSD: setmode.c,v 1.34 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <unistd.h>
-
-#ifdef SETMODE_DEBUG
-#include <stdio.h>
-#endif
-
-#ifdef __weak_alias
-__weak_alias(getmode,_getmode)
-__weak_alias(setmode,_setmode)
-#endif
-
-#define	SET_LEN	6		/* initial # of bitcmd struct to malloc */
-#define	SET_LEN_INCR 4		/* # of bitcmd structs to add as needed */
-
-typedef struct bitcmd {
-	char	cmd;
-	char	cmd2;
-	mode_t	bits;
-} BITCMD;
-
-#define	CMD2_CLR	0x01
-#define	CMD2_SET	0x02
-#define	CMD2_GBITS	0x04
-#define	CMD2_OBITS	0x08
-#define	CMD2_UBITS	0x10
-
-static BITCMD	*addcmd(BITCMD *, mode_t, mode_t, mode_t, mode_t);
-static void	 compress_mode(BITCMD *);
-#ifdef SETMODE_DEBUG
-static void	 dumpmode(BITCMD *);
-#endif
-
-/*
- * Given the old mode and an array of bitcmd structures, apply the operations
- * described in the bitcmd structures to the old mode, and return the new mode.
- * Note that there is no '=' command; a strict assignment is just a '-' (clear
- * bits) followed by a '+' (set bits).
- */
-mode_t
-getmode(const void *bbox, mode_t omode)
-{
-	const BITCMD *set;
-	mode_t clrval, newmode, value;
-
-	_DIAGASSERT(bbox != NULL);
-
-	set = (const BITCMD *)bbox;
-	newmode = omode;
-	for (value = 0;; set++)
-		switch(set->cmd) {
-		/*
-		 * When copying the user, group or other bits around, we "know"
-		 * where the bits are in the mode so that we can do shifts to
-		 * copy them around.  If we don't use shifts, it gets real
-		 * grundgy with lots of single bit checks and bit sets.
-		 */
-		case 'u':
-			value = (newmode & S_IRWXU) >> 6;
-			goto common;
-
-		case 'g':
-			value = (newmode & S_IRWXG) >> 3;
-			goto common;
-
-		case 'o':
-			value = newmode & S_IRWXO;
-common:			if (set->cmd2 & CMD2_CLR) {
-				clrval =
-				    (set->cmd2 & CMD2_SET) ?  S_IRWXO : value;
-				if (set->cmd2 & CMD2_UBITS)
-					newmode &= ~((clrval<<6) & set->bits);
-				if (set->cmd2 & CMD2_GBITS)
-					newmode &= ~((clrval<<3) & set->bits);
-				if (set->cmd2 & CMD2_OBITS)
-					newmode &= ~(clrval & set->bits);
-			}
-			if (set->cmd2 & CMD2_SET) {
-				if (set->cmd2 & CMD2_UBITS)
-					newmode |= (value<<6) & set->bits;
-				if (set->cmd2 & CMD2_GBITS)
-					newmode |= (value<<3) & set->bits;
-				if (set->cmd2 & CMD2_OBITS)
-					newmode |= value & set->bits;
-			}
-			break;
-
-		case '+':
-			newmode |= set->bits;
-			break;
-
-		case '-':
-			newmode &= ~set->bits;
-			break;
-
-		case 'X':
-			if (omode & (S_IFDIR|S_IXUSR|S_IXGRP|S_IXOTH))
-				newmode |= set->bits;
-			break;
-
-		case '\0':
-		default:
-#ifdef SETMODE_DEBUG
-			(void)printf("getmode:%04o -> %04o\n", omode, newmode);
-#endif
-			return (newmode);
-		}
-}
-
-#define	ADDCMD(a, b, c, d) do {						\
-	if (set >= endset) {						\
-		BITCMD *newset;						\
-		setlen += SET_LEN_INCR;					\
-		newset = realloc(saveset, sizeof(BITCMD) * setlen);	\
-		if (newset == NULL)					\
-			goto out;					\
-		set = newset + (set - saveset);				\
-		saveset = newset;					\
-		endset = newset + (setlen - 2);				\
-	}								\
-	set = addcmd(set, (mode_t)(a), (mode_t)(b), (mode_t)(c), (d));	\
-} while (/*CONSTCOND*/0)
-
-#define	STANDARD_BITS	(S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO)
-
-void *
-setmode(const char *p)
-{
-	int serrno;
-	char op, *ep;
-	BITCMD *set, *saveset, *endset;
-	sigset_t signset, sigoset;
-	mode_t mask, perm, permXbits, who;
-	long lval;
-	int equalopdone = 0;	/* pacify gcc */
-	int setlen;
-
-	if (!*p) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	/*
-	 * Get a copy of the mask for the permissions that are mask relative.
-	 * Flip the bits, we want what's not set.  Since it's possible that
-	 * the caller is opening files inside a signal handler, protect them
-	 * as best we can.
-	 */
-	sigfillset(&signset);
-	(void)sigprocmask(SIG_BLOCK, &signset, &sigoset);
-	(void)umask(mask = umask(0));
-	mask = ~mask;
-	(void)sigprocmask(SIG_SETMASK, &sigoset, NULL);
-
-	setlen = SET_LEN + 2;
-	
-	if ((set = malloc((u_int)(sizeof(BITCMD) * setlen))) == NULL)
-		return (NULL);
-	saveset = set;
-	endset = set + (setlen - 2);
-
-	/*
-	 * If an absolute number, get it and return; disallow non-octal digits
-	 * or illegal bits.
-	 */
-	if (isdigit((unsigned char)*p)) {
-		errno = 0;
-		lval = strtol(p, &ep, 8);
-		if (*ep) {
-			errno = EINVAL;
-			goto out;
-		}
-		if (errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN))
-			goto out;
-		if (lval & ~(STANDARD_BITS|S_ISTXT)) {
-			errno = EINVAL;
-			goto out;
-		}
-		perm = (mode_t)lval;
-		ADDCMD('=', (STANDARD_BITS|S_ISTXT), perm, mask);
-		set->cmd = 0;
-		return (saveset);
-	}
-
-	/*
-	 * Build list of structures to set/clear/copy bits as described by
-	 * each clause of the symbolic mode.
-	 */
-	for (;;) {
-		/* First, find out which bits might be modified. */
-		for (who = 0;; ++p) {
-			switch (*p) {
-			case 'a':
-				who |= STANDARD_BITS;
-				break;
-			case 'u':
-				who |= S_ISUID|S_IRWXU;
-				break;
-			case 'g':
-				who |= S_ISGID|S_IRWXG;
-				break;
-			case 'o':
-				who |= S_IRWXO;
-				break;
-			default:
-				goto getop;
-			}
-		}
-
-getop:		if ((op = *p++) != '+' && op != '-' && op != '=') {
-			errno = EINVAL;
-			goto out;
-		}
-		if (op == '=')
-			equalopdone = 0;
-
-		who &= ~S_ISTXT;
-		for (perm = 0, permXbits = 0;; ++p) {
-			switch (*p) {
-			case 'r':
-				perm |= S_IRUSR|S_IRGRP|S_IROTH;
-				break;
-			case 's':
-				/*
-				 * If specific bits where requested and 
-				 * only "other" bits ignore set-id. 
-				 */
-				if (who == 0 || (who & ~S_IRWXO))
-					perm |= S_ISUID|S_ISGID;
-				break;
-			case 't':
-				/*
-				 * If specific bits where requested and 
-				 * only "other" bits ignore set-id. 
-				 */
-				if (who == 0 || (who & ~S_IRWXO)) {
-					who |= S_ISTXT;
-					perm |= S_ISTXT;
-				}
-				break;
-			case 'w':
-				perm |= S_IWUSR|S_IWGRP|S_IWOTH;
-				break;
-			case 'X':
-				permXbits = S_IXUSR|S_IXGRP|S_IXOTH;
-				break;
-			case 'x':
-				perm |= S_IXUSR|S_IXGRP|S_IXOTH;
-				break;
-			case 'u':
-			case 'g':
-			case 'o':
-				/*
-				 * When ever we hit 'u', 'g', or 'o', we have
-				 * to flush out any partial mode that we have,
-				 * and then do the copying of the mode bits.
-				 */
-				if (perm) {
-					ADDCMD(op, who, perm, mask);
-					perm = 0;
-				}
-				if (op == '=')
-					equalopdone = 1;
-				if (op == '+' && permXbits) {
-					ADDCMD('X', who, permXbits, mask);
-					permXbits = 0;
-				}
-				ADDCMD(*p, who, op, mask);
-				break;
-
-			default:
-				/*
-				 * Add any permissions that we haven't already
-				 * done.
-				 */
-				if (perm || (op == '=' && !equalopdone)) {
-					if (op == '=')
-						equalopdone = 1;
-					ADDCMD(op, who, perm, mask);
-					perm = 0;
-				}
-				if (permXbits) {
-					ADDCMD('X', who, permXbits, mask);
-					permXbits = 0;
-				}
-				goto apply;
-			}
-		}
-
-apply:		if (!*p)
-			break;
-		if (*p != ',')
-			goto getop;
-		++p;
-	}
-	set->cmd = 0;
-#ifdef SETMODE_DEBUG
-	(void)printf("Before compress_mode()\n");
-	dumpmode(saveset);
-#endif
-	compress_mode(saveset);
-#ifdef SETMODE_DEBUG
-	(void)printf("After compress_mode()\n");
-	dumpmode(saveset);
-#endif
-	return (saveset);
-out:
-	serrno = errno;
-	free(saveset);
-	errno = serrno;
-	return NULL;
-}
-
-static BITCMD *
-addcmd(BITCMD *set, mode_t op, mode_t who, mode_t oparg, mode_t mask)
-{
-
-	_DIAGASSERT(set != NULL);
-
-	switch (op) {
-	case '=':
-		set->cmd = '-';
-		set->bits = who ? who : STANDARD_BITS;
-		set++;
-
-		op = '+';
-		/* FALLTHROUGH */
-	case '+':
-	case '-':
-	case 'X':
-		set->cmd = op;
-		set->bits = (who ? who : mask) & oparg;
-		break;
-
-	case 'u':
-	case 'g':
-	case 'o':
-		set->cmd = op;
-		if (who) {
-			set->cmd2 = ((who & S_IRUSR) ? CMD2_UBITS : 0) |
-				    ((who & S_IRGRP) ? CMD2_GBITS : 0) |
-				    ((who & S_IROTH) ? CMD2_OBITS : 0);
-			set->bits = (mode_t)~0;
-		} else {
-			set->cmd2 = CMD2_UBITS | CMD2_GBITS | CMD2_OBITS;
-			set->bits = mask;
-		}
-	
-		if (oparg == '+')
-			set->cmd2 |= CMD2_SET;
-		else if (oparg == '-')
-			set->cmd2 |= CMD2_CLR;
-		else if (oparg == '=')
-			set->cmd2 |= CMD2_SET|CMD2_CLR;
-		break;
-	}
-	return (set + 1);
-}
-
-#ifdef SETMODE_DEBUG
-static void
-dumpmode(BITCMD *set)
-{
-
-	_DIAGASSERT(set != NULL);
-
-	for (; set->cmd; ++set)
-		(void)printf("cmd: '%c' bits %04o%s%s%s%s%s%s\n",
-		    set->cmd, set->bits, set->cmd2 ? " cmd2:" : "",
-		    set->cmd2 & CMD2_CLR ? " CLR" : "",
-		    set->cmd2 & CMD2_SET ? " SET" : "",
-		    set->cmd2 & CMD2_UBITS ? " UBITS" : "",
-		    set->cmd2 & CMD2_GBITS ? " GBITS" : "",
-		    set->cmd2 & CMD2_OBITS ? " OBITS" : "");
-}
-#endif
-
-/*
- * Given an array of bitcmd structures, compress by compacting consecutive
- * '+', '-' and 'X' commands into at most 3 commands, one of each.  The 'u',
- * 'g' and 'o' commands continue to be separate.  They could probably be 
- * compacted, but it's not worth the effort.
- */
-static void
-compress_mode(BITCMD *set)
-{
-	BITCMD *nset;
-	int setbits, clrbits, Xbits, op;
-
-	_DIAGASSERT(set != NULL);
-
-	for (nset = set;;) {
-		/* Copy over any 'u', 'g' and 'o' commands. */
-		while ((op = nset->cmd) != '+' && op != '-' && op != 'X') {
-			*set++ = *nset++;
-			if (!op)
-				return;
-		}
-
-		for (setbits = clrbits = Xbits = 0;; nset++) {
-			if ((op = nset->cmd) == '-') {
-				clrbits |= nset->bits;
-				setbits &= ~nset->bits;
-				Xbits &= ~nset->bits;
-			} else if (op == '+') {
-				setbits |= nset->bits;
-				clrbits &= ~nset->bits;
-				Xbits &= ~nset->bits;
-			} else if (op == 'X')
-				Xbits |= nset->bits & ~setbits;
-			else
-				break;
-		}
-		if (clrbits) {
-			set->cmd = '-';
-			set->cmd2 = 0;
-			set->bits = clrbits;
-			set++;
-		}
-		if (setbits) {
-			set->cmd = '+';
-			set->cmd2 = 0;
-			set->bits = setbits;
-			set++;
-		}
-		if (Xbits) {
-			set->cmd = 'X';
-			set->cmd2 = 0;
-			set->bits = Xbits;
-			set++;
-		}
-	}
-}
diff --git a/lib/libc/gen/setproctitle.3 b/lib/libc/gen/setproctitle.3
deleted file mode 100644
index 8d32011f7..000000000
--- a/lib/libc/gen/setproctitle.3
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" $NetBSD: setproctitle.3,v 1.18 2003/07/26 19:24:44 salo Exp $
-.\"
-.\" Copyright (c) 1994, 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 for the
-.\"          NetBSD Project.  See http://www.NetBSD.org/ for
-.\"          information about NetBSD.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
-.\"
-.Dd April 13, 1994
-.Dt SETPROCTITLE 3
-.Os
-.Sh NAME
-.Nm setproctitle
-.Nd set process title
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn setproctitle "const char *fmt" "..."
-.Sh DESCRIPTION
-The
-.Fn setproctitle
-function sets the invoking process's title.
-The process title is set to the last component of the program
-name, followed by a colon and the formatted string specified
-by
-.Va fmt .
-If
-.Va fmt
-is
-.Dv NULL ,
-the colon and formatted string are omitted.
-The length of a process title is limited to 2048 bytes.
-.Sh EXAMPLES
-Set the process title to the program name, with no further information:
-.Bd -literal -offset indent
-setproctitle(NULL);
-.Ed
-.Pp
-Set the process title to the program name, an informational string,
-and the process id:
-.Bd -literal -offset indent
-setproctitle("foo! (%d)", getpid());
-.Ed
-.Sh SEE ALSO
-.Xr ps 1 ,
-.Xr w 1 ,
-.Xr getprogname 3 ,
-.Xr printf 3
-.Sh HISTORY
-The
-.Fn setproctitle
-function first appeared in
-.Nx 1.0 .
-.Sh CAVEATS
-It is important never to pass a string with user-supplied data as a
-format without using
-.Ql %s .
-An attacker can put format specifiers in the string to mangle your stack,
-leading to a possible security hole.
-This holds true even if you have built the string
-.Dq by hand
-using a function like
-.Fn snprintf ,
-as the resulting string may still contain user-supplied conversion specifiers
-for later interpolation by
-.Fn setproctitle .
-.Pp
-Always be sure to use the proper secure idiom:
-.Bd -literal -offset indent
-setproctitle("%s", string);
-.Ed
diff --git a/lib/libc/gen/setproctitle.c b/lib/libc/gen/setproctitle.c
deleted file mode 100644
index 513892264..000000000
--- a/lib/libc/gen/setproctitle.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* $NetBSD: setproctitle.c,v 1.22 2008/01/03 04:26:27 christos Exp $ */
-
-/*
- * Copyright (c) 1994, 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: setproctitle.c,v 1.22 2008/01/03 04:26:27 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/exec.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(setproctitle,_setproctitle)
-#endif
-
-#define	MAX_PROCTITLE	2048
-
-/*
- * For compatibility with old versions of crt0 that didn't define __ps_strings,
- * define it as a common here.
- */
-struct ps_strings *__ps_strings;
-
-void
-setproctitle(const char *fmt, ...)
-{
-	static char buf[MAX_PROCTITLE], *bufp;
-	const char *pname = getprogname();
-
-	if (fmt != NULL) {
-		int len = snprintf(buf, sizeof(buf), "%s: ", pname);
-		if (len >= 0) {
-			va_list ap;
-
-			va_start(ap, fmt);
-			(void)vsnprintf(buf + len, sizeof(buf) - len, fmt, ap);
-			va_end(ap);
-		}
-	} else
-		(void)snprintf(buf, sizeof(buf), "%s", pname);
-
-	bufp = buf;
-
-#ifdef	USRSTACK
-	/*
-	 * For compatibility with old versions of crt0 and old kernels, set
-	 * __ps_strings to a default value if it's null.
-	 * But only if USRSTACK is defined.  It might not be defined if
-	 * user-level code can not assume it's a constant (i.e. m68k).
-	 */
-	if (__ps_strings == 0)
-		__ps_strings = PS_STRINGS;
-#endif	/* USRSTACK */
-
-	if (__ps_strings != 0) {
-		__ps_strings->ps_nargvstr = 1;
-		__ps_strings->ps_argvstr = &bufp;
-	}
-}
diff --git a/lib/libc/gen/setprogname.c b/lib/libc/gen/setprogname.c
deleted file mode 100644
index 489952371..000000000
--- a/lib/libc/gen/setprogname.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* $NetBSD: setprogname.c,v 1.3 2003/07/26 19:24:44 salo Exp $ */
-
-/*
- * Copyright (c) 2001 Christopher G. Demetriou
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *          This product includes software developed for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: setprogname.c,v 1.3 2003/07/26 19:24:44 salo Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-/* In NetBSD, the program name is set by crt0.  It can't be overridden. */
-#undef	REALLY_SET_PROGNAME
-
-#include <stdlib.h>
-
-#ifdef REALLY_SET_PROGNAME
-#include <string.h>
-
-extern const char *__progname;
-#endif
-
-/*ARGSUSED*/
-void
-setprogname(const char *progname)
-{
-
-#ifdef REALLY_SET_PROGNAME
-	__progname = strrchr(progname, '/');
-	if (__progname == NULL)
-		__progname = progname;
-	else
-		__progname++;
-#endif
-}
diff --git a/lib/libc/gen/shquote.3 b/lib/libc/gen/shquote.3
deleted file mode 100644
index 026467fcf..000000000
--- a/lib/libc/gen/shquote.3
+++ /dev/null
@@ -1,244 +0,0 @@
-.\" $NetBSD: shquote.3,v 1.9 2008/09/07 08:55:46 apb Exp $
-.\"
-.\" Copyright (c) 2001 Christopher G. Demetriou
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"          This product includes software developed for the
-.\"          NetBSD Project.  See http://www.NetBSD.org/ for
-.\"          information about NetBSD.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
-.\"
-.Dd September 7, 2008
-.Dt SHQUOTE 3
-.Os
-.Sh NAME
-.Nm shquote ,
-.Nm shquotev
-.Nd quote argument strings for use with the shell
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft size_t
-.Fn shquote "const char *arg" "char *buf" "size_t bufsize"
-.Ft size_t
-.Fn shquotev "int argc" "char * const *argv" "char *buf" "size_t bufsize"
-.Sh DESCRIPTION
-The
-.Fn shquote
-and
-.Fn shquotev
-functions copy strings and transform the copies by adding shell
-escape and quoting characters.
-They are used to encapsulate
-arguments to be included in command strings passed to the
-.Fn system
-and
-.Fn popen
-functions, so that the arguments will have the correct values
-after being evaluated by the shell.
-.Pp
-The exact method of quoting and escaping may vary, and is intended
-to match the conventions of the shell used by
-.Fn system
-and
-.Fn popen .
-It may not match the conventions used by other shells.
-In this implementation, the following
-transformation is applied to each input string:
-.Bl -bullet -width indent
-.It
-it is surrounded by single quotes
-.Pq ' ,
-.It
-any single quotes in the input are escaped by replacing them with
-the four-character sequence:
-.Li '\e'' ,
-and
-.It
-extraneous pairs of single quotes (caused by multiple adjacent single
-quotes in the input string, or by single quotes at the beginning or
-end of the input string) are elided.
-.El
-.Pp
-The
-.Fn shquote
-function transforms the string specified by its
-.Fa arg
-argument, and places the result into the memory pointed to by
-.Fa buf .
-.Pp
-The
-.Fn shquotev
-function transforms each of the
-.Fa argc
-strings specified by the array
-.Fa argv
-independently.
-The transformed strings are placed in the memory pointed to by
-.Fa buf ,
-separated by spaces.
-It does not modify the pointer array specified by
-.Fa argv
-or the strings pointed to by the pointers in the array.
-.Pp
-Both functions write up to
-.Fa bufsize
-- 1 characters of output into the buffer pointed to by
-.Fa buf ,
-then add a
-.Li NUL
-character to terminate the output string.
-If
-.Fa bufsize
-is given as zero, the
-.Fa buf
-parameter is ignored and no output is written.
-.Sh RETURN VALUES
-The
-.Fn shquote
-and
-.Fn shquotev
-functions return the number of characters necessary to hold the
-result from operating on their input strings,
-not including the terminating
-.Li NUL .
-That is, they return the length of the string that would have
-been written to the output buffer, if it were large enough.
-If an error occurs during processing, the value ((size_t)\-1)
-is returned and
-.Va errno
-is set appropriately.
-.Sh EXAMPLES
-The following code fragment demonstrates how you might use
-.Fn shquotev
-to construct a command string to be used with
-.Fn system .
-The command uses an environment variable (which will be expanded by
-the shell) to determine the actual program to run.
-Note that the environment variable may be expanded by
-the shell into multiple words.
-The first word of the expansion will be used by the shell
-as the name of the program to run,
-and the rest will be passed as arguments to the program.
-.Bd -literal -offset indent
-char **argv, c, *cmd;
-size_t cmdlen, len, qlen;
-int argc;
-
-\&...
-
-/*
- * Size buffer to hold the command string, and allocate it.
- * Buffer of length one given to snprintf() for portability.
- */
-cmdlen = snprintf(\*[Am]c, 1, "${PROG-%s} ", PROG_DEFAULT);
-qlen = shquotev(argc, argv, NULL, 0);
-if (qlen == (size_t)-1) {
-	\&...
-}
-cmdlen += qlen + 1;
-cmd = malloc(cmdlen);
-if (cmd == NULL) {
-	\&...
-}
-
-/* Create the command string. */
-len = snprintf(cmd, cmdlen, "${PROG-%s} ", PROG_DEFAULT);
-qlen = shquotev(argc, argv, cmd + len, cmdlen - len);
-if (qlen == (size_t)-1) {
-	/* Should not ever happen. */
-	\&...
-}
-len += qlen;
-
-/* "cmd" can now be passed to system(). */
-.Ed
-.Pp
-The following example shows how you would implement the same
-functionality using the
-.Fn shquote
-function directly.
-.Bd -literal -offset indent
-char **argv, c, *cmd;
-size_t cmdlen, len, qlen;
-int argc, i;
-
-\&...
-
-/*
- * Size buffer to hold the command string, and allocate it.
- * Buffer of length one given to snprintf() for portability.
- */
-cmdlen = snprintf(\*[Am]c, 1, "${PROG-%s} ", PROG_DEFAULT);
-for (i = 0; i \*[Lt] argc; i++) {
-	qlen = shquote(argv[i], NULL, 0);
-	if (qlen == (size_t)-1) {
-		\&...
-	}
-	cmdlen += qlen + 1;
-}
-cmd = malloc(cmdlen);
-if (cmd == NULL) {
-	\&...
-}
-
-/* Start the command string with the env var reference. */
-len = snprintf(cmd, cmdlen, "${PROG-%s} ", PROG_DEFAULT);
-
-/* Quote all of the arguments when copying them. */
-for (i = 0; i \*[Lt] argc; i++) {
-	qlen = shquote(argv[i], cmd + len, cmdlen - len);
-	if (qlen == (size_t)-1) {
-		/* Should not ever happen. */
-		\&...
-	}
-	len += qlen;
-	cmd[len++] = ' ';
-}
-cmd[--len] = '\e0';
-
-/* "cmd" can now be passed to system(). */
-.Ed
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr popen 3 ,
-.Xr system 3
-.Sh BUGS
-This implementation does not currently handle strings containing multibyte
-characters properly.
-To address this issue,
-.Pa /bin/sh
-.Po
-the shell used by
-.Fn system
-and
-.Fn popen
-.Pc
-must first be fixed to handle multibyte characters.
-When that has been done,
-these functions can have multibyte character support enabled.
diff --git a/lib/libc/gen/shquote.c b/lib/libc/gen/shquote.c
deleted file mode 100644
index e72837f5f..000000000
--- a/lib/libc/gen/shquote.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/* $NetBSD: shquote.c,v 1.8 2006/03/19 02:33:02 christos Exp $ */
-
-/*
- * Copyright (c) 2001 Christopher G. Demetriou
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *          This product includes software developed for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: shquote.c,v 1.8 2006/03/19 02:33:02 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Define SHQUOTE_USE_MULTIBYTE if you want shquote() to handle multibyte
- * characters using mbrtowc().
- *
- * Please DO NOT rip this #ifdef out of the code.  It's also here to help
- * portability.
- */
-#undef	SHQUOTE_USE_MULTIBYTE
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <string.h>
-#ifdef SHQUOTE_USE_MULTIBYTE
-#include <limits.h>
-#include <stdio.h>
-#include <wchar.h>
-#endif
-
-#ifdef __weak_alias
-__weak_alias(shquote,_shquote)
-#endif
-
-/*
- * shquote():
- *
- * Requotes arguments so that they'll be interpreted properly by the
- * shell (/bin/sh).
- *
- * Wraps single quotes around the string, and replaces single quotes
- * in the string with the sequence:
- *	'\''
- *
- * Returns the number of characters required to hold the resulting quoted
- * argument.
- *
- * The buffer supplied is filled in and NUL-terminated.  If 'bufsize'
- * indicates that the buffer is too short to hold the output string, the
- * first (bufsize - 1) bytes of quoted argument are filled in and the
- * buffer is NUL-terminated.
- *
- * Changes could be made to optimize the length of strings output by this
- * function:
- *
- *	* if there are no metacharacters or whitespace in the input,
- *	  the output could be the input string.
- */
-
-#ifdef SHQUOTE_USE_MULTIBYTE
-
-#define	XLATE_OUTCH(x)		wcrtomb(outch, (x), &mbso)
-#define	XLATE_INCH()						\
-    do {							\
-	n = mbrtowc(&c, arg, MB_CUR_MAX, &mbsi);		\
-    } while (/*LINTED const cond*/0)
-
-#else
-
-#define	XLATE_OUTCH(x)		(outch[0] = (x), 1)
-#define	XLATE_INCH()						\
-    do {							\
-	n = ((c = *arg) != '\0') ? 1 : 0;			\
-    } while (/*LINTED const cond*/0)
-
-#endif
-
-#define	PUT(x)							\
-    do {							\
-	outchlen = XLATE_OUTCH(x);				\
-	if (outchlen == (size_t)-1)				\
-		goto bad;					\
-	rv += outchlen;						\
-	if (bufsize != 0) {					\
-		if (bufsize < outchlen ||			\
-		    (bufsize == outchlen &&			\
-		     outch[outchlen - 1] != '\0')) {		\
-			*buf = '\0';				\
-			bufsize = 0;				\
-		} else {					\
-			memcpy(buf, outch, outchlen);		\
-			buf += outchlen;			\
-			bufsize -= outchlen;			\
-		}						\
-	}							\
-    } while (/*LINTED const cond*/0)
-
-size_t
-shquote(const char *arg, char *buf, size_t bufsize)
-{
-#ifdef SHQUOTE_USE_MULTIBYTE
-	char outch[MB_LEN_MAX];
-	mbstate_t mbsi, mbso;
-	wchar_t c, lastc;
-	size_t outchlen;
-#else
-	char outch[1];
-	char c, lastc;
-	size_t outchlen;
-#endif
-	size_t rv;
-	int n;
-
-	rv = 0;
-	lastc = 0;
-#ifdef SHQUOTE_USE_MULTIBYTE
-	memset(&mbsi, 0, sizeof mbsi);
-	memset(&mbso, 0, sizeof mbso);
-#endif
-
-	if (*arg != '\'')
-		PUT('\'');
-	for (;;) {
-		XLATE_INCH();
-		if (n <= 0)
-			break;
-		arg += n;
-		lastc = c;
-
-		if (c == '\'') {
-			if (rv != 0)
-				PUT('\'');
-			PUT('\\');
-			PUT('\'');
-			for (;;) {
-				XLATE_INCH();
-				if (n <= 0 || c != '\'')
-					break;
-				PUT('\\');
-				PUT('\'');
-				arg += n;
-			}
-			if (n > 0)
-				PUT('\'');
-		} else
-			PUT(c);
-	}
-	if (lastc != '\'')
-		PUT('\'');
-
-	/* Put multibyte or NUL terminator, but don't count the NUL. */
-	PUT('\0');
-	rv--;
-
-	return rv;
-
-bad:
-	/* A multibyte character encoding or decoding error occurred. */
-	return (size_t)-1;
-}
diff --git a/lib/libc/gen/shquotev.c b/lib/libc/gen/shquotev.c
deleted file mode 100644
index 4953f47ff..000000000
--- a/lib/libc/gen/shquotev.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* $NetBSD: shquotev.c,v 1.5 2005/06/12 05:21:27 lukem Exp $ */
-
-/*
- * Copyright (c) 2001 Christopher G. Demetriou
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *          This product includes software developed for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: shquotev.c,v 1.5 2005/06/12 05:21:27 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <stdlib.h>
-
-/*
- * shquotev():
- *
- * Apply shquote() to a set of strings, separating the results by spaces.
- */
-
-size_t
-shquotev(int argc, char * const * argv, char *buf, size_t bufsize)
-{
-	size_t rv, callrv;
-	int i;
-
-	rv = 0;
-
-	if (argc == 0) {
-		if (bufsize != 0)
-			*buf = '\0';
-		return rv;
-	}
-
-	for (i = 0; i < argc; i++) {
-		callrv = shquote(argv[i], buf, bufsize);
-		if (callrv == (size_t)-1)
-			goto bad;
-		rv += callrv;
-		buf += callrv;
-		bufsize = (bufsize > callrv) ? (bufsize - callrv) : 0;
-
-		if (i < (argc - 1)) {
-			rv++;
-			if (bufsize > 1) {
-				*buf++ = ' ';
-				bufsize--;
-			}
-		}
-	}
-
-	return rv;
-
-bad:
-	return (size_t)-1;
-}
diff --git a/lib/libc/gen/sighold.3 b/lib/libc/gen/sighold.3
deleted file mode 100644
index b29e46bfa..000000000
--- a/lib/libc/gen/sighold.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\"	$NetBSD: sighold.3,v 1.5 2010/04/30 04:39:16 jruoho Exp $
-.\"
-.\" Copyright (c) 2003 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.
-.\"
-.Dd April 30, 2010
-.Dt SIGHOLD 3
-.Os
-.Sh NAME
-.Nm sighold
-.Nd manipulate current signal mask
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sighold "int sig"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by
-.Xr sigprocmask 2 .
-.Ef
-.Pp
-The
-.Fn sighold
-function adds the signal
-.Fa sig
-to the calling process' signal mask.
-.Sh RETURN VALUES
-If successful, the
-.Fn sighold
-function returns 0.
-Otherwise \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn sighold
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The argument
-.Fa sig
-is not a valid signal number.
-.El
-.Sh SEE ALSO
-.Xr sigprocmask 2 ,
-.Xr sigrelse 3
-.Sh STANDARDS
-The
-.Fn sighold
-function conforms to
-.St -p1003.1-2001 .
-It was however marked as obsolete in the
-.St -p1003.1-2008
-revision of the standard.
diff --git a/lib/libc/gen/sighold.c b/lib/libc/gen/sighold.c
deleted file mode 100644
index 7fa70c983..000000000
--- a/lib/libc/gen/sighold.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: sighold.c,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sighold.c,v 1.2 2008/04/28 20:22:59 martin Exp $");
-#endif
-
-#include "namespace.h"
-#include <signal.h>
-#include <stddef.h>
-
-int
-sighold(int sig)
-{
-	sigset_t set;
-
-	sigemptyset(&set);
-	if (sigaddset(&set, sig) != 0)
-		return (-1);
-
-	return (sigprocmask(SIG_BLOCK, &set, NULL));
-}
diff --git a/lib/libc/gen/sigignore.3 b/lib/libc/gen/sigignore.3
deleted file mode 100644
index 41ed44e83..000000000
--- a/lib/libc/gen/sigignore.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"	$NetBSD: sigignore.3,v 1.6 2010/04/30 06:48:20 wiz Exp $
-.\"
-.\" Copyright (c) 2003 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.
-.\"
-.Dd April 30, 2010
-.Dt SIGIGNORE 3
-.Os
-.Sh NAME
-.Nm sigignore
-.Nd manipulate signal dispositions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigignore "int sig"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by
-.Xr sigaction 2 .
-.Ef
-.Pp
-The
-.Fn sigignore
-function sets the disposition of the signal
-.Fa sig
-to
-.Dv SIG_IGN .
-.Sh RETURN VALUES
-If successful, the
-.Fn sigignore
-function returns 0.
-Otherwise \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn sigignore
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The argument
-.Fa sig
-is not a valid signal number;
-or an attempt is made to ignore a signal that cannot be ignored,
-such as
-.Dv SIGKILL
-or
-.Dv SIGSTOP .
-.El
-.Sh SEE ALSO
-.Xr sigaction 2
-.Sh STANDARDS
-The
-.Fn sigignore
-function conforms to
-.St -p1003.1-2001 .
-It was however marked as obsolete in the
-.St -p1003.1-2008
-revision of the standard.
diff --git a/lib/libc/gen/sigignore.c b/lib/libc/gen/sigignore.c
deleted file mode 100644
index e9d73221b..000000000
--- a/lib/libc/gen/sigignore.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: sigignore.c,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sigignore.c,v 1.2 2008/04/28 20:22:59 martin Exp $");
-#endif
-
-#include "namespace.h"
-#include <signal.h>
-#include <stddef.h>
-
-int
-sigignore(int sig)
-{
-	struct sigaction sa;
-
-	sa.sa_handler = SIG_IGN;
-	if (sigemptyset(&sa.sa_mask) != 0)
-		return (-1);
-	sa.sa_flags = 0;
-
-	return (sigaction(sig, &sa, NULL));
-}
diff --git a/lib/libc/gen/siginterrupt.3 b/lib/libc/gen/siginterrupt.3
deleted file mode 100644
index f03283316..000000000
--- a/lib/libc/gen/siginterrupt.3
+++ /dev/null
@@ -1,105 +0,0 @@
-.\"	$NetBSD: siginterrupt.3,v 1.11 2003/08/07 16:42:56 agc Exp $
-.\"
-.\" Copyright (c) 1985, 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. 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.
-.\"
-.\"     @(#)siginterrupt.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt SIGINTERRUPT 3
-.Os
-.Sh NAME
-.Nm siginterrupt
-.Nd allow signals to interrupt system calls
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn siginterrupt "int sig" "int flag"
-.Sh DESCRIPTION
-The
-.Fn siginterrupt
-function
-is used to change the system call restart
-behavior when a system call is interrupted by the specified signal.
-If the flag is false (0), then system calls will be restarted if
-they are interrupted by the specified signal
-and no data has been transferred yet.
-System call restart is the default behavior on
-.Bx 4.2 .
-.Pp
-If the flag is true (1),
-then restarting of system calls is disabled.
-If a system call is interrupted by the specified signal
-and no data has been transferred,
-the system call will return \-1 with the global variable
-.Va errno
-set to
-.Dv EINTR .
-Interrupted system calls that have started transferring
-data will return the amount of data actually transferred.
-System call interrupt is the signal behavior found on
-.Bx 4.1
-and
-.At V
-systems.
-.Pp
-Note that the new
-.Bx 4.2
-signal handling semantics are not
-altered in any other way.
-Most notably, signal handlers always remain installed until
-explicitly changed by a subsequent
-.Xr sigaction 2
-call, and the signal mask operates as documented in
-.Xr sigaction 2 .
-Programs may switch between restartable and interruptible
-system call operation as often as desired in the execution of a program.
-.Pp
-Issuing a
-.Fn siginterrupt 3
-call during the execution of a signal handler will cause
-the new action to take place on the next signal to be caught.
-.Sh NOTES
-This library routine uses an extension of the
-.Xr sigaction 2
-system call that is not available in
-.Bx 4.2 ,
-hence it should not be used if backward compatibility is needed.
-.Sh RETURN VALUES
-A 0 value indicates that the call succeeded.
-A \-1 value indicates that an invalid signal number has been supplied.
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsuspend 2
-.Sh HISTORY
-The
-.Fn siginterrupt
-function appeared in
-.Bx 4.3 .
diff --git a/lib/libc/gen/siginterrupt.c b/lib/libc/gen/siginterrupt.c
deleted file mode 100644
index 1e79d42ce..000000000
--- a/lib/libc/gen/siginterrupt.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: siginterrupt.c,v 1.13 2012/06/25 22:32:43 abs Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)siginterrupt.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: siginterrupt.c,v 1.13 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <signal.h>
-
-#ifdef __weak_alias
-__weak_alias(siginterrupt,_siginterrupt)
-#endif
-
-extern sigset_t __sigintr;
-/*
- * Set signal state to prevent restart of system calls
- * after an instance of the indicated signal.
- */
-int
-siginterrupt(int sig, int flag)
-{
-	struct sigaction sa;
-	int ret;
-
-	if ((ret = sigaction(sig, (struct sigaction *)0, &sa)) < 0)
-		return (ret);
-	if (flag) {
-		sigaddset(&__sigintr, sig);
-		sa.sa_flags &= ~SA_RESTART;
-	} else {
-		sigdelset(&__sigintr, sig);
-		sa.sa_flags |= SA_RESTART;
-	}
-	return (sigaction(sig, &sa, (struct sigaction *)0));
-}
diff --git a/lib/libc/gen/siglist.c b/lib/libc/gen/siglist.c
deleted file mode 100644
index 3b2e464b5..000000000
--- a/lib/libc/gen/siglist.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*	$NetBSD: siglist.c,v 1.17 2007/01/17 23:24:22 hubertf Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)siglist.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: siglist.c,v 1.17 2007/01/17 23:24:22 hubertf Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <signal.h>
-
-static const char *const __siglist14[] = {
-	"Signal 0",			/* 0 */
-	"Hangup",			/* 1 SIGHUP */
-	"Interrupt",			/* 2 SIGINT */
-	"Quit",				/* 3 SIGQUIT */
-	"Illegal instruction",		/* 4 SIGILL */
-	"Trace/BPT trap",		/* 5 SIGTRAP */
-	"Abort trap",			/* 6 SIGABRT */
-	"EMT trap",			/* 7 SIGEMT */
-	"Floating point exception",	/* 8 SIGFPE */
-	"Killed",			/* 9 SIGKILL */
-	"Bus error",			/* 10 SIGBUS */
-	"Segmentation fault",		/* 11 SIGSEGV */
-	"Bad system call",		/* 12 SIGSYS */
-	"Broken pipe",			/* 13 SIGPIPE */
-	"Alarm clock",			/* 14 SIGALRM */
-	"Terminated",			/* 15 SIGTERM */
-	"Urgent I/O condition",		/* 16 SIGURG */
-	"Suspended (signal)",		/* 17 SIGSTOP */
-	"Suspended",			/* 18 SIGTSTP */
-	"Continued",			/* 19 SIGCONT */
-	"Child exited",			/* 20 SIGCHLD */
-	"Stopped (tty input)",		/* 21 SIGTTIN */
-	"Stopped (tty output)",		/* 22 SIGTTOU */
-	"I/O possible",			/* 23 SIGIO */
-	"Cputime limit exceeded",	/* 24 SIGXCPU */
-	"Filesize limit exceeded",	/* 25 SIGXFSZ */
-	"Virtual timer expired",	/* 26 SIGVTALRM */
-	"Profiling timer expired",	/* 27 SIGPROF */
-	"Window size changes",		/* 28 SIGWINCH */
-	"Information request",		/* 29 SIGINFO */
-	"User defined signal 1",	/* 30 SIGUSR1 */
-	"User defined signal 2",	/* 31 SIGUSR2 */
-	"Power fail/restart",		/* 32 SIGPWR */
-	"Real time signal 0",		/* 33 SIGRTMIN + 0 */
-	"Real time signal 1",		/* 34 SIGRTMIN + 1 */
-	"Real time signal 2",		/* 35 SIGRTMIN + 2 */
-	"Real time signal 3",		/* 36 SIGRTMIN + 3 */
-	"Real time signal 4",		/* 37 SIGRTMIN + 4 */
-	"Real time signal 5",		/* 38 SIGRTMIN + 5 */
-	"Real time signal 6",		/* 39 SIGRTMIN + 6 */
-	"Real time signal 7",		/* 40 SIGRTMIN + 7 */
-	"Real time signal 8",		/* 41 SIGRTMIN + 8 */
-	"Real time signal 9",		/* 42 SIGRTMIN + 9 */
-	"Real time signal 10",		/* 43 SIGRTMIN + 10 */
-	"Real time signal 11",		/* 44 SIGRTMIN + 11 */
-	"Real time signal 12",		/* 45 SIGRTMIN + 12 */
-	"Real time signal 13",		/* 46 SIGRTMIN + 13 */
-	"Real time signal 14",		/* 47 SIGRTMIN + 14 */
-	"Real time signal 15",		/* 48 SIGRTMIN + 15 */
-	"Real time signal 16",		/* 49 SIGRTMIN + 16 */
-	"Real time signal 17",		/* 50 SIGRTMIN + 17 */
-	"Real time signal 18",		/* 51 SIGRTMIN + 18 */
-	"Real time signal 19",		/* 52 SIGRTMIN + 19 */
-	"Real time signal 20",		/* 53 SIGRTMIN + 20 */
-	"Real time signal 21",		/* 54 SIGRTMIN + 21 */
-	"Real time signal 22",		/* 55 SIGRTMIN + 22 */
-	"Real time signal 23",		/* 56 SIGRTMIN + 23 */
-	"Real time signal 24",		/* 57 SIGRTMIN + 24 */
-	"Real time signal 25",		/* 58 SIGRTMIN + 25 */
-	"Real time signal 26",		/* 59 SIGRTMIN + 26 */
-	"Real time signal 27",		/* 60 SIGRTMIN + 27 */
-	"Real time signal 28",		/* 61 SIGRTMIN + 28 */
-	"Real time signal 29",		/* 62 SIGRTMIN + 29 */
-	"Real time signal 30",		/* 63 SIGRTMIN + 30 */
-};
-
-const int __sys_nsig14 = sizeof(__siglist14) / sizeof(__siglist14[0]);
-
-const char * const *__sys_siglist14 = __siglist14;
diff --git a/lib/libc/gen/signal.3 b/lib/libc/gen/signal.3
deleted file mode 100644
index e554195a3..000000000
--- a/lib/libc/gen/signal.3
+++ /dev/null
@@ -1,191 +0,0 @@
-.\"	$NetBSD: signal.3,v 1.24 2004/06/13 19:17:06 lha Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)signal.3	8.3 (Berkeley) 4/19/94
-.\"
-.Dd June 11, 2004
-.Dt SIGNAL 3
-.Os
-.Sh NAME
-.Nm signal
-.Nd simplified software signal facilities
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.\" The following is Quite Ugly, but syntactically correct.  Don't try to
-.\" fix it.
-.Ft void \*(lp*
-.Fn signal "int sig" "void \*(lp*func\*(rp\*(lpint\*(rp\*(rp\*(rp\*(lpint"
-.Sh DESCRIPTION
-This
-.Fn signal
-facility
-is a simplified interface to the more general
-.Xr sigaction 2
-facility.
-.Pp
-Signals allow the manipulation of a process from outside its
-domain as well as allowing the process to manipulate itself or
-copies of itself (children).
-There are two general types of signals:
-those that cause termination of a process and those that do not.
-Signals which cause termination of a program might result from
-an irrecoverable error or might be the result of a user at a terminal
-typing the `interrupt' character.
-Signals are used when a process is stopped because it wishes to access
-its control terminal while in the background (see
-.Xr tty 4 ) .
-Signals are optionally generated
-when a process resumes after being stopped,
-when the status of child processes changes,
-or when input is ready at the control terminal.
-Most signals result in the termination of the process receiving them
-if no action
-is taken; some signals instead cause the process receiving them
-to be stopped, or are simply discarded if the process has not
-requested otherwise.
-Except for the
-.Dv SIGKILL
-and
-.Dv SIGSTOP
-signals, the
-.Fn signal
-function allows for a signal to be caught, to be ignored, or to generate
-an interrupt.
-See
-.Xr signal 7
-for comprehensive list of supported signals.
-.Pp
-The
-.Fa func
-procedure allows a user to choose the action upon receipt of a signal.
-To set the default action of the signal to occur as listed above,
-.Fa func
-should be
-.Dv SIG_DFL .
-A
-.Dv SIG_DFL
-resets the default action.
-To ignore the signal
-.Fa func
-should be
-.Dv SIG_IGN .
-This will cause subsequent instances of the signal to be ignored
-and pending instances to be discarded.
-If
-.Dv SIG_IGN
-is not used,
-further occurrences of the signal are
-automatically blocked and
-.Fa func
-is called.
-.Pp
-The handled signal is unblocked when the
-function returns and
-the process continues from where it left off when the signal occurred.
-.Bf -symbolic
-Unlike previous signal facilities, the handler
-func() remains installed after a signal has been delivered.
-.Ef
-.Pp
-For some system calls, if a signal is caught while the call is
-executing and the call is prematurely terminated,
-the call is automatically restarted.
-(The handler is installed using the
-.Dv SA_RESTART
-flag with
-.Xr sigaction 2 ) .
-The affected system calls include
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr sendto 2 ,
-.Xr recvfrom 2 ,
-.Xr sendmsg 2
-and
-.Xr recvmsg 2
-on a communications channel or a low speed device
-and during a
-.Xr ioctl 2
-or
-.Xr wait 2 .
-However, calls that have already committed are not restarted,
-but instead return a partial success (for example, a short read count).
-.Pp
-When a process which has installed signal handlers forks,
-the child process inherits the signals.
-All caught signals may be reset to their default action by a call
-to the
-.Xr execve 2
-function;
-ignored signals remain ignored.
-.Pp
-Only functions that are async-signal-safe can safely be used in signal
-handlers, see
-.Xr signal 7
-for a complete list.
-.Sh RETURN VALUES
-The previous action is returned on a successful call.
-Otherwise,
-.Dv SIG_ERR
-is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn signal
-will fail and no action will take place if one of the following occur:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Specified
-.Em sig
-is not a valid signal number.
-.It Bq Er EINVAL
-An attempt is made to ignore or supply a handler for
-.Dv SIGKILL
-or
-.Dv SIGSTOP .
-.El
-.Sh SEE ALSO
-.Xr kill 1 ,
-.Xr kill 2 ,
-.Xr ptrace 2 ,
-.Xr sigaction 2 ,
-.Xr sigaltstack 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsuspend 2 ,
-.Xr psignal 3 ,
-.Xr setjmp 3 ,
-.Xr strsignal 3 ,
-.Xr tty 4 ,
-.Xr signal 7
-.Sh HISTORY
-This
-.Fn signal
-facility appeared in
-.Bx 4.0 .
diff --git a/lib/libc/gen/signal.c b/lib/libc/gen/signal.c
deleted file mode 100644
index cc3cce2c5..000000000
--- a/lib/libc/gen/signal.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: signal.c,v 1.13 2012/06/25 22:32:44 abs Exp $	*/
-
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)signal.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: signal.c,v 1.13 2012/06/25 22:32:44 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Almost backwards compatible signal.
- */
-#include "namespace.h"
-#include <signal.h>
-
-#ifdef __weak_alias
-__weak_alias(signal,_signal)
-#endif
-
-sigset_t __sigintr;		/* shared with siginterrupt */
-
-sig_t
-signal(int s, sig_t a)
-{
-	struct sigaction sa, osa;
-
-	sa.sa_handler = a;
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = 0;
-	if (!sigismember(&__sigintr, s))
-		sa.sa_flags |= SA_RESTART;
-	if (sigaction(s, &sa, &osa) < 0)
-		return (SIG_ERR);
-	return (osa.sa_handler);
-}
diff --git a/lib/libc/gen/signame.c b/lib/libc/gen/signame.c
deleted file mode 100644
index a5f137d78..000000000
--- a/lib/libc/gen/signame.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*	$NetBSD: signame.c,v 1.13 2005/09/13 01:44:09 christos Exp $	*/
-
-/*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "from: @(#)siglist.c	5.6 (Berkeley) 2/23/91";*/
-#else
-__RCSID("$NetBSD: signame.c,v 1.13 2005/09/13 01:44:09 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <signal.h>
-#include <unistd.h>
-
-static const char *const __signame14[] = {
-	"Signal 0",	/* 0 */
-	"HUP",		/* 1 SIGHUP */
-	"INT",		/* 2 SIGINT */
-	"QUIT",		/* 3 SIGQUIT */
-	"ILL",		/* 4 SIGILL */
-	"TRAP",		/* 5 SIGTRAP */
-	"ABRT",		/* 6 SIGABRT */
-	"EMT",		/* 7 SIGEMT */
-	"FPE",		/* 8 SIGFPE */
-	"KILL",		/* 9 SIGKILL */
-	"BUS",		/* 10 SIGBUS */
-	"SEGV",		/* 11 SIGSEGV */
-	"SYS",		/* 12 SIGSYS */
-	"PIPE",		/* 13 SIGPIPE */
-	"ALRM",		/* 14 SIGALRM */
-	"TERM",		/* 15 SIGTERM */
-	"URG",		/* 16 SIGURG */
-	"STOP",		/* 17 SIGSTOP */
-	"TSTP",		/* 18 SIGTSTP */
-	"CONT",		/* 19 SIGCONT */
-	"CHLD",		/* 20 SIGCHLD */
-	"TTIN",		/* 21 SIGTTIN */
-	"TTOU",		/* 22 SIGTTOU */
-	"IO",		/* 23 SIGIO */
-	"XCPU",		/* 24 SIGXCPU */
-	"XFSZ",		/* 25 SIGXFSZ */
-	"VTALRM",	/* 26 SIGVTALRM */
-	"PROF",		/* 27 SIGPROF */
-	"WINCH",	/* 28 SIGWINCH */
-	"INFO",		/* 29 SIGINFO */
-	"USR1",		/* 30 SIGUSR1 */
-	"USR2",		/* 31 SIGUSR2 */
-	"PWR",		/* 32 SIGPWR */
-	"RT0",		/* 33 SIGRTMIN + 0 */
-	"RT1",		/* 34 SIGRTMIN + 1 */
-	"RT2",		/* 35 SIGRTMIN + 2 */
-	"RT3",		/* 36 SIGRTMIN + 3 */
-	"RT4",		/* 37 SIGRTMIN + 4 */
-	"RT5",		/* 38 SIGRTMIN + 5 */
-	"RT6",		/* 39 SIGRTMIN + 6 */
-	"RT7",		/* 40 SIGRTMIN + 7 */
-	"RT8",		/* 41 SIGRTMIN + 8 */
-	"RT9",		/* 42 SIGRTMIN + 9 */
-	"RT10",		/* 43 SIGRTMIN + 10 */
-	"RT11",		/* 44 SIGRTMIN + 11 */
-	"RT12",		/* 45 SIGRTMIN + 12 */
-	"RT13",		/* 46 SIGRTMIN + 13 */
-	"RT14",		/* 47 SIGRTMIN + 14 */
-	"RT15",		/* 48 SIGRTMIN + 15 */
-	"RT16",		/* 49 SIGRTMIN + 16 */
-	"RT17",		/* 50 SIGRTMIN + 17 */
-	"RT18",		/* 51 SIGRTMIN + 18 */
-	"RT19",		/* 52 SIGRTMIN + 19 */
-	"RT20",		/* 53 SIGRTMIN + 20 */
-	"RT21",		/* 54 SIGRTMIN + 21 */
-	"RT22",		/* 55 SIGRTMIN + 22 */
-	"RT23",		/* 56 SIGRTMIN + 23 */
-	"RT24",		/* 57 SIGRTMIN + 24 */
-	"RT25",		/* 58 SIGRTMIN + 25 */
-	"RT26",		/* 59 SIGRTMIN + 26 */
-	"RT27",		/* 60 SIGRTMIN + 27 */
-	"RT28",		/* 61 SIGRTMIN + 28 */
-	"RT29",		/* 62 SIGRTMIN + 29 */
-	"RT30",		/* 63 SIGRTMIN + 30 */
-};
-
-const char * const *__sys_signame14 = __signame14;
diff --git a/lib/libc/gen/signbit.3 b/lib/libc/gen/signbit.3
deleted file mode 100644
index 71e3eb599..000000000
--- a/lib/libc/gen/signbit.3
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"	$NetBSD: signbit.3,v 1.3 2008/04/30 13:10:50 martin Exp $
-.\"
-.\" Copyright (c) 2003 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.
-.\"
-.Dd October 29, 2003
-.Dt SIGNBIT 3
-.Os
-.Sh NAME
-.Nm signbit
-.Nd test sign
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In math.h
-.Ft int
-.Fn signbit "real-floating x"
-.Sh DESCRIPTION
-The
-.Fn signbit
-macro determines whether the sign of its argument value
-.Fa x
-is negative.
-An argument represented in a format wider than its semantic type is
-converted to its semantic type first.
-The determination is then based on the type of the argument.
-.Ss IEEE754
-The sign is determined for all values, including infinities, zeroes,
-and NaNs
-.Ss VAX
-The sign is determined for finites, true zeros, and dirty zeroes;
-for ROPs the sign is reported negative.
-.Sh RETURN VALUES
-The
-.Fn signbit
-macro returns a non-zero value if the sign of its value
-.Fa x
-is negative.
-Otherwise 0 is returned.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr fpclassify 3 ,
-.Xr isfinite 3 ,
-.Xr isnormal 3 ,
-.Xr math 3
-.Sh STANDARDS
-The
-.Fn signbit
-macro conforms to
-.St -isoC-99 .
diff --git a/lib/libc/gen/signbitd_ieee754.c b/lib/libc/gen/signbitd_ieee754.c
deleted file mode 100644
index 9ea2f169f..000000000
--- a/lib/libc/gen/signbitd_ieee754.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: signbitd_ieee754.c,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: signbitd_ieee754.c,v 1.2 2008/04/28 20:22:59 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.6 signbit - determine whether the sign of an argument is negative
- *          IEEE 754 double-precision version
- */
-int
-__signbitd(double x)
-{
-	union ieee_double_u u;
-
-	u.dblu_d = x;
-
-	return (u.dblu_dbl.dbl_sign == 1);
-}
diff --git a/lib/libc/gen/signbitf_ieee754.c b/lib/libc/gen/signbitf_ieee754.c
deleted file mode 100644
index df63bd7bc..000000000
--- a/lib/libc/gen/signbitf_ieee754.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: signbitf_ieee754.c,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: signbitf_ieee754.c,v 1.2 2008/04/28 20:22:59 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-/*
- * 7.12.3.6 signbit - determine whether the sign of an argument is negative
- *          IEEE 754 single-precision version
- */
-int
-__signbitf(float x)
-{
-	union ieee_single_u u;
-
-	u.sngu_f = x;
-
-	return (u.sngu_sng.sng_sign == 1);
-}
diff --git a/lib/libc/gen/signbitl_ieee754.c b/lib/libc/gen/signbitl_ieee754.c
deleted file mode 100644
index 7e8b1535e..000000000
--- a/lib/libc/gen/signbitl_ieee754.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: signbitl_ieee754.c,v 1.1 2011/01/17 23:53:03 matt Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD");
-#endif
-
-#include <machine/ieee.h>
-#include <math.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-
-/*
- * 7.12.3.6 signbit - determine whether the sign of an argument is negative
- *          IEEE 754 compatible 128-bit extended-precision version
- */
-int
-__signbitl(long double x)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-
-	return (u.extu_ext.ext_sign == 1);
-}
-
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libc/gen/sigrelse.3 b/lib/libc/gen/sigrelse.3
deleted file mode 100644
index f70cc49e0..000000000
--- a/lib/libc/gen/sigrelse.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\"	$NetBSD: sigrelse.3,v 1.4 2010/04/30 04:39:16 jruoho Exp $
-.\"
-.\" Copyright (c) 2003 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.
-.\"
-.Dd April 30, 2010
-.Dt SIGRELSE 3
-.Os
-.Sh NAME
-.Nm sigrelse
-.Nd manipulate current signal mask
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigrelse "int sig"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by
-.Xr sigprocmask 2 .
-.Ef
-.Pp
-The
-.Fn sigrelse
-function removes the signal
-.Fa sig
-from the calling process' signal mask.
-.Sh RETURN VALUES
-If successful, the
-.Fn sigrelse
-function returns 0.
-Otherwise \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn sigrelse
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The argument
-.Fa sig
-is not a valid signal number.
-.El
-.Sh SEE ALSO
-.Xr sigprocmask 2 ,
-.Xr sighold 3
-.Sh STANDARDS
-The
-.Fn sigrelse
-function conforms to
-.St -p1003.1-2001 .
-It was however marked as obsolete in the
-.St -p1003.1-2008
-revision of the standard.
diff --git a/lib/libc/gen/sigrelse.c b/lib/libc/gen/sigrelse.c
deleted file mode 100644
index 6a6643efc..000000000
--- a/lib/libc/gen/sigrelse.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: sigrelse.c,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sigrelse.c,v 1.2 2008/04/28 20:22:59 martin Exp $");
-#endif
-
-#include "namespace.h"
-#include <signal.h>
-#include <stddef.h>
-
-int
-sigrelse(int sig)
-{
-	sigset_t set;
-
-	sigemptyset(&set);
-	if (sigaddset(&set, sig) != 0)
-		return (-1);
-
-	return (sigprocmask(SIG_UNBLOCK, &set, NULL));
-}
diff --git a/lib/libc/gen/sigset.3 b/lib/libc/gen/sigset.3
deleted file mode 100644
index c5da28189..000000000
--- a/lib/libc/gen/sigset.3
+++ /dev/null
@@ -1,125 +0,0 @@
-.\"	$NetBSD: sigset.3,v 1.8 2010/04/30 06:48:20 wiz Exp $
-.\"
-.\" Copyright (c) 2003 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.
-.\"
-.Dd April 30, 2010
-.Dt SIGSET 3
-.Os
-.Sh NAME
-.Nm sigset
-.Nd manipulate signal dispositions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.\" The following is Quite Ugly, but syntactically correct.  Don't try to
-.\" fix it.
-.Ft void \*(lp*
-.Fn sigset "int sig" "void \*(lp*disp\*(rp\*(lpint\*(rp\*(rp\*(rp\*(lpint"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by
-.Xr sigaction 2
-and
-.Xr sigprocmask 2 .
-.Ef
-.Pp
-The
-.Fn sigset
-function manipulates the disposition of the signal
-.Fa sig .
-The new disposition is given in
-.Fa disp .
-.Pp
-If
-.Fa disp
-is one of
-.Dv SIG_DFL ,
-.Dv SIG_IGN ,
-or the address of a handler function,
-the disposition of
-.Fa sig
-is changed accordingly, and
-.Fa sig
-is removed from the process' signal mask.
-Also, if
-.Fa disp
-is the address of a handler function,
-.Fa sig
-will be added to the process' signal mask during execution of the handler.
-.Pp
-If
-.Fa disp
-is equal to
-.Dv SIG_HOLD ,
-.Fa sig
-is added to the calling process' signal mask and the disposition of
-.Fa sig
-remains unchanged.
-.Sh RETURN VALUES
-If successful, the
-.Fn sigset
-function returns
-.Dv SIG_HOLD
-if
-.Fa sig
-had been blocked,
-and the previous disposition of
-.Fa sig
-if it had not been blocked.
-Otherwise
-.Dv SIG_ERR
-is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn sigset
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The argument
-.Fa sig
-is not a valid signal number;
-or an attempt is made to ignore a signal that cannot be ignored,
-such as
-.Dv SIGKILL
-or
-.Dv SIGSTOP .
-.El
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr sigprocmask 2
-.Sh STANDARDS
-The
-.Fn sigset
-function conforms to
-.St -p1003.1-2001 .
-It was however marked as obsolete in the
-.St -p1003.1-2008
-revision of the standard.
diff --git a/lib/libc/gen/sigset.c b/lib/libc/gen/sigset.c
deleted file mode 100644
index 466f41da1..000000000
--- a/lib/libc/gen/sigset.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*	$NetBSD: sigset.c,v 1.2 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sigset.c,v 1.2 2008/04/28 20:22:59 martin Exp $");
-#endif
-
-#include "namespace.h"
-#include <errno.h>
-#include <signal.h>
-#include <stddef.h>
-
-sig_t
-sigset(int sig, void (*disp)(int))
-{
-	sigset_t set, oset;
-	struct sigaction sa, osa;
-
-	osa.sa_handler = SIG_ERR;
-
-	if (disp == SIG_HOLD) {
-		/* Add sig to current signal mask. */
-		if (sigemptyset(&set) != 0)
-			goto out;
-		if (sigaddset(&set, sig) != 0)
-			goto out;
-		if (sigprocmask(SIG_BLOCK, &set, &oset) != 0)
-			goto out;
-
-		if (sigismember(&oset, sig)) {
-			/* Had been masked before, return SIG_HOLD. */
-			osa.sa_handler = SIG_HOLD;
-		} else {
-			/* Return previous disposition. */
-		 	(void)sigaction(sig, NULL, &osa);
-		}
-	} else if (disp == SIG_ERR) {
-		errno = EINVAL;
-	} else {
-		/* Set up and install new disposition. */
-		sa.sa_handler = disp;
-		if (sigemptyset(&sa.sa_mask) != 0)
-			goto out;
-		sa.sa_flags = 0;
-
-		if (sigaction(sig, &sa, &osa) != 0) {
-			osa.sa_handler = SIG_ERR;
-			goto out;
-		}
-			
-		/* Delete sig from current signal mask. */
-		if (sigemptyset(&set) != 0)
-			return (SIG_ERR);
-		if (sigaddset(&set, sig) != 0)
-			return (SIG_ERR);
-		if (sigprocmask(SIG_UNBLOCK, &set, &oset) != 0)
-			return (SIG_ERR);
-
-		/* If had been masked before, return SIG_HOLD. */
-		if (sigismember(&oset, sig))
-			osa.sa_handler = SIG_HOLD;
-	}
-
- out:
-	return (osa.sa_handler);
-}
diff --git a/lib/libc/gen/sigsetops.3 b/lib/libc/gen/sigsetops.3
deleted file mode 100644
index e97e130da..000000000
--- a/lib/libc/gen/sigsetops.3
+++ /dev/null
@@ -1,124 +0,0 @@
-.\"	$NetBSD: sigsetops.3,v 1.14 2003/08/07 16:42:57 agc Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)sigsetops.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt SIGSETOPS 3
-.Os
-.Sh NAME
-.Nm sigemptyset ,
-.Nm sigfillset ,
-.Nm sigaddset ,
-.Nm sigdelset ,
-.Nm sigismember
-.Nd manipulate signal sets
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigemptyset "sigset_t *set"
-.Ft int
-.Fn sigfillset "sigset_t *set"
-.Ft int
-.Fn sigaddset "sigset_t *set" "int signo"
-.Ft int
-.Fn sigdelset "sigset_t *set" "int signo"
-.Ft int
-.Fn sigismember "sigset_t *set" "int signo"
-.Sh DESCRIPTION
-These functions manipulate signal sets stored in a
-.Fa sigset_t .
-Either
-.Fn sigemptyset
-or
-.Fn sigfillset
-must be called for every object of type
-.Fa sigset_t
-before any other use of the object.
-.Pp
-The
-.Fn sigemptyset
-function initializes a signal set to be empty.
-.Pp
-The
-.Fn sigfillset
-function initializes a signal set to contain all signals.
-.Pp
-The
-.Fn sigaddset
-function adds the specified signal
-.Fa signo
-to the signal set.
-.Pp
-The
-.Fn sigdelset
-function deletes the specified signal
-.Fa signo
-from the signal set.
-.Pp
-The
-.Fn sigismember
-function returns whether a specified signal
-.Fa signo
-is contained in the signal set.
-.Pp
-.Fn sigemptyset
-and
-.Fn sigfillset
-are provided as macros, but actual functions are available
-if their names are undefined (with #undef
-.Em name ) .
-.Sh RETURN VALUES
-The
-.Fn sigismember
-function returns 1
-if the signal is a member of the set,
-a 0 otherwise.
-The other functions return 0 upon success.
-A \-1 return value
-indicates an error occurred and the global variable
-.Va errno
-is set to indicate the reason.
-.Sh ERRORS
-These functions could fail if one of the following occurs:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-.Fa signo
-has an invalid value.
-.El
-.Sh SEE ALSO
-.Xr kill 2 ,
-.Xr sigaction 2 ,
-.Xr sigsuspend 2 ,
-.Xr signal 7
-.Sh STANDARDS
-These functions conform to
-.St -p1003.1-90 .
diff --git a/lib/libc/gen/sigsetops.c b/lib/libc/gen/sigsetops.c
deleted file mode 100644
index 5b227355a..000000000
--- a/lib/libc/gen/sigsetops.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: sigsetops.c,v 1.16 2010/07/31 00:04:43 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sigsetops.c	8.1 (Berkeley) 6/4/93
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)sigsetops.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: sigsetops.c,v 1.16 2010/07/31 00:04:43 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#define	__SIGSETOPS_BODY
-
-#include <errno.h>
-#include <signal.h>
diff --git a/lib/libc/gen/sleep.3 b/lib/libc/gen/sleep.3
deleted file mode 100644
index 9cf8e19a3..000000000
--- a/lib/libc/gen/sleep.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\"	$NetBSD: sleep.3,v 1.15 2003/08/07 16:42:57 agc Exp $
-.\"
-.\" Copyright (c) 1986, 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. 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.
-.\"
-.\"     @(#)sleep.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt SLEEP 3
-.Os
-.Sh NAME
-.Nm sleep
-.Nd suspend process execution for interval of seconds
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft unsigned int
-.Fn sleep "unsigned int seconds"
-.Sh DESCRIPTION
-The
-.Fn sleep
-function suspends execution of the calling process until either the
-number of seconds specified by
-.Fa seconds
-have elapsed or a signal is delivered to the calling process and its
-action is to invoke a signal-catching function or to terminate the
-process.
-The suspension time may be longer than requested due to the
-scheduling of other activity by the system.
-.Sh RETURN VALUES
-If the
-.Fn sleep
-function returns because the requested time has elapsed, the value
-returned will be zero.
-If the
-.Fn sleep
-function returns due to the delivery of a signal, the value returned
-will be the unslept amount (the request time minus the time actually
-slept) in seconds.
-.Sh SEE ALSO
-.Xr nanosleep 2 ,
-.Xr usleep 3
-.Sh STANDARDS
-The
-.Fn sleep
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-A
-.Fn sleep
-function appeared in
-.At v7 .
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c
deleted file mode 100644
index abb60d398..000000000
--- a/lib/libc/gen/sleep.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: sleep.c,v 1.23 2012/06/25 22:32:44 abs Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sleep.c,v 1.23 2012/06/25 22:32:44 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <time.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(sleep,_sleep)
-#endif
-
-unsigned int
-sleep(unsigned int seconds)
-{
-	struct timespec rqt, rmt;
-
-	rqt.tv_sec  = seconds;
-	rqt.tv_nsec = 0;
-
-	nanosleep(&rqt, &rmt);
-
-	return (unsigned int)rmt.tv_sec;
-}
diff --git a/lib/libc/gen/stringlist.3 b/lib/libc/gen/stringlist.3
deleted file mode 100644
index 2eb83fc6a..000000000
--- a/lib/libc/gen/stringlist.3
+++ /dev/null
@@ -1,144 +0,0 @@
-.\"	$NetBSD: stringlist.3,v 1.15 2010/05/06 09:46:49 jruoho Exp $
-.\"
-.\" Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This file was contributed to The NetBSD Foundation by Luke Mewburn.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 6, 2010
-.Dt STRINGLIST 3
-.Os
-.Sh NAME
-.Nm stringlist ,
-.Nm sl_init ,
-.Nm sl_add ,
-.Nm sl_free ,
-.Nm sl_find ,
-.Nm sl_delete
-.Nd stringlist manipulation functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stringlist.h
-.Ft StringList *
-.Fn sl_init
-.Ft int
-.Fn sl_add "StringList *sl" "char *item"
-.Ft void
-.Fn sl_free "StringList *sl" "int freeall"
-.Ft char *
-.Fn sl_find "StringList *sl" "const char *item"
-.Ft int
-.Fn sl_delete "StringList *sl" "const char *item" "int freeit"
-.Sh DESCRIPTION
-The
-.Nm
-functions manipulate stringlists, which are lists of
-strings that extend automatically if necessary.
-.Pp
-The
-.Ar StringList
-structure has the following definition:
-.Bd -literal -offset indent
-typedef struct _stringlist {
-	char	**sl_str;
-	size_t	  sl_max;
-	size_t	  sl_cur;
-} StringList;
-.Ed
-.Pp
-where:
-.Bl -tag -width "sl_str" -offset indent
-.It Ar sl_str
-is a pointer to the base of the array containing the list,
-.It Ar sl_max
-is the size of
-.Ar sl_str ,
-and
-.It Ar sl_cur
-is the offset in
-.Ar sl_str
-of the current element.
-.El
-.Pp
-The following stringlist manipulation functions are available:
-.Bl -tag -width "sl_delete()" -offset 2n
-.It Fn sl_init
-Create a stringlist.
-Returns a pointer to a
-.Ar StringList ,
-or
-.Dv NULL
-in case of failure.
-.It Fn sl_free
-Releases memory occupied by
-.Ar sl
-and the
-.Ar sl-\*[Gt]sl_str
-array.
-If
-.Ar freeall
-is non-zero, then each of the items within
-.Ar sl-\*[Gt]sl_str
-is released as well.
-.It Fn sl_add
-Add
-.Ar item
-to
-.Ar sl-\*[Gt]sl_str
-at
-.Ar sl-\*[Gt]sl_cur ,
-extending the size of
-.Ar sl-\*[Gt]sl_str .
-Returns zero upon success, \-1 upon failure.
-.It Fn sl_find
-Find
-.Ar item
-in
-.Ar sl ,
-returning
-.Dv NULL
-if it's not found.
-.It Fn sl_delete
-Remove
-.Ar item
-from the list.
-If
-.Ar freeit
-is non-zero, the string is freed.
-Returns
-.Dv 0
-if the name is found
-and
-.Dv \-1
-if the name is not found.
-.El
-.Sh SEE ALSO
-.Xr free 3 ,
-.Xr malloc 3
-.Sh HISTORY
-The
-.Nm
-functions appeared in
-.Nx 1.3 .
diff --git a/lib/libc/gen/stringlist.c b/lib/libc/gen/stringlist.c
deleted file mode 100644
index c86ff630c..000000000
--- a/lib/libc/gen/stringlist.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*	$NetBSD: stringlist.c,v 1.14 2015/05/21 01:29:13 christos Exp $	*/
-
-/*-
- * Copyright (c) 1994, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: stringlist.c,v 1.14 2015/05/21 01:29:13 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stringlist.h>
-
-#ifdef __weak_alias
-__weak_alias(sl_add,_sl_add)
-__weak_alias(sl_find,_sl_find)
-__weak_alias(sl_free,_sl_free)
-__weak_alias(sl_init,_sl_init)
-__weak_alias(sl_delete,_sl_delete)
-#endif
-
-#define _SL_CHUNKSIZE	20
-
-/*
- * sl_init(): Initialize a string list
- */
-StringList *
-sl_init(void)
-{
-	StringList *sl;
-
-	sl = malloc(sizeof(StringList));
-	if (sl == NULL)
-		return NULL;
-
-	sl->sl_cur = 0;
-	sl->sl_max = _SL_CHUNKSIZE;
-	sl->sl_str = NULL;
-	errno = reallocarr(&sl->sl_str, sl->sl_max, sizeof(char *));
-	if (errno) {
-		free(sl);
-		sl = NULL;
-	}
-	return sl;
-}
-
-
-/*
- * sl_add(): Add an item to the string list
- */
-int
-sl_add(StringList *sl, char *name)
-{
-
-	_DIAGASSERT(sl != NULL);
-
-	if (sl->sl_cur == sl->sl_max - 1) {
-		char	**new = sl->sl_str;
-
-		errno = reallocarr(&new, (sl->sl_max + _SL_CHUNKSIZE),
-		    sizeof(char *));
-		if (errno)
-			return -1;
-		sl->sl_max += _SL_CHUNKSIZE;
-		sl->sl_str = new;
-	}
-	sl->sl_str[sl->sl_cur++] = name;
-	return 0;
-}
-
-
-/*
- * sl_free(): Free a stringlist
- */
-void
-sl_free(StringList *sl, int all)
-{
-	size_t i;
-
-	if (sl == NULL)
-		return;
-	if (sl->sl_str) {
-		if (all)
-			for (i = 0; i < sl->sl_cur; i++)
-				free(sl->sl_str[i]);
-		free(sl->sl_str);
-	}
-	free(sl);
-}
-
-
-/*
- * sl_find(): Find a name in the string list
- */
-char *
-sl_find(StringList *sl, const char *name)
-{
-	size_t i;
-
-	_DIAGASSERT(sl != NULL);
-
-	for (i = 0; i < sl->sl_cur; i++)
-		if (strcmp(sl->sl_str[i], name) == 0)
-			return sl->sl_str[i];
-
-	return NULL;
-}
-
-int
-sl_delete(StringList *sl, const char *name, int all)
-{
-	size_t i, j;
-
-	for (i = 0; i < sl->sl_cur; i++)
-		if (strcmp(sl->sl_str[i], name) == 0) {
-			if (all)
-				free(sl->sl_str[i]);
-			for (j = i + 1; j < sl->sl_cur; j++)
-				sl->sl_str[j - 1] = sl->sl_str[j];
-			sl->sl_str[--sl->sl_cur] = NULL;
-			return 0;
-		}
-	return -1;
-}
-
diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3
deleted file mode 100644
index 30bf56264..000000000
--- a/lib/libc/gen/sysconf.3
+++ /dev/null
@@ -1,331 +0,0 @@
-.\"	$NetBSD: sysconf.3,v 1.44 2015/08/20 11:05:39 wiz Exp $
-.\"
-.\" 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.
-.\"
-.\"	@(#)sysconf.3	8.3 (Berkeley) 4/19/94
-.\"
-.Dd August 20, 2015
-.Dt SYSCONF 3
-.Os
-.Sh NAME
-.Nm sysconf
-.Nd get configurable system variables
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft long
-.Fn sysconf "int name"
-.Sh DESCRIPTION
-This interface is defined by
-.St -p1003.1-88 .
-A far more complete interface is available using
-.Xr sysctl 3 .
-.Pp
-The
-.Fn sysconf
-function provides a method for applications to determine the current
-value of a configurable system limit or option variable.
-The
-.Fa name
-argument specifies the system variable to be queried.
-Symbolic constants for each name value are found in the include file
-.In unistd.h .
-.Pp
-The available values are as follows:
-.Bl -tag -width "123456"
-.It Li _SC_ARG_MAX
-The maximum bytes of argument to
-.Xr execve 2 .
-.It Li _SC_ATEXIT_MAX
-The maximum number of functions that may be registered with
-.Xr atexit 3 .
-.It Li _SC_BARRIERS
-The version of
-.St -p1003.1
-and its
-Barriers
-option to which the system attempts to conform,
-otherwise \-1.
-.It Li _SC_CLOCK_SELECTION
-Return the
-.Tn POSIX
-version the implementation of the Clock Selection Option
-on this system conforms to,
-or \-1 if unavailable.
-.It Li _SC_CHILD_MAX
-The maximum number of simultaneous processes per user id.
-.It Li _SC_CLK_TCK
-The number of clock ticks per second.
-.It Li _SC_FSYNC
-Return 1 if the File Synchronization Option is available on this system,
-otherwise \-1.
-.It Li _SC_HOST_NAME_MAX
-The maximum size of a hostname, including
-.Dv NULL .
-.It Li _SC_IOV_MAX
-The maximum number of
-.Va iovec
-structures that a process has available for use with
-.Xr preadv 2 ,
-.Xr pwritev 2 ,
-.Xr readv 2 ,
-.Xr recvmsg 2 ,
-.Xr sendmsg 2
-or
-.Xr writev 2 .
-.It Li _SC_JOB_CONTROL
-Return 1 if job control is available on this system, otherwise \-1.
-.It Li _SC_LOGIN_NAME_MAX
-Returns the size of the storage required for a login name, in bytes,
-including the terminating NUL.
-.It Li _SC_MAPPED_FILES
-Return 1 if the Memory Mapped Files Option is available on this system,
-otherwise \-1.
-.It Li _SC_MEMLOCK
-Return 1 if the Process Memory Locking Option is available on this system,
-otherwise \-1.
-.It Li _SC_MEMLOCK_RANGE
-Return 1 if the Range Memory Locking Option is available on this system,
-otherwise \-1.
-.It Li _SC_MEMORY_PROTECTION
-Return 1 if the Memory Protection Option is available on this system,
-otherwise \-1.
-.It Li _SC_MONOTONIC_CLOCK
-Return the
-.Tn POSIX
-version the implementation of the Monotonic Clock Option
-on this system conforms to,
-or \-1 if unavailable.
-.It Li _SC_NGROUPS_MAX
-The maximum number of supplemental groups.
-.It Li _SC_OPEN_MAX
-The maximum number of open files per process.
-.It Li _SC_PAGESIZE
-The size of a system page in bytes.
-.It Li _SC_PASS_MAX
-The maximum length of the password, not counting
-.Dv NULL .
-.It Li _SC_READER_WRITER_LOCKS
-The version of
-.St -p1003.1
-and its
-Read-Write Locks
-option to which the system attempts to conform,
-otherwise \-1.
-.It Li _SC_REGEXP
-Return 1 if
-.Tn POSIX
-regular expressions are available on this system, otherwise \-1.
-.It Li _SC_SEMAPHORES
-The version of
-.St -p1003.1
-and its
-Semaphores
-option to which the system attempts to conform,
-otherwise \-1.
-.It Li _SC_SHELL
-Return 1 if
-.Tn POSIX
-shell is available on this system, otherwise \-1.
-.It Li _SC_SPIN_LOCKS
-The version of
-.St -p1003.1
-and its
-Spin Locks
-option to which the system attempts to conform,
-otherwise \-1.
-.It Li _SC_STREAM_MAX
-The minimum maximum number of streams that a process may have open
-at any one time.
-.It Li _SC_SYMLOOP_MAX
-The maximum number of symbolic links that may be expanded in a path name.
-.It Li _SC_SYNCHRONIZED_IO
-Return 1 if the Synchronized I/O Option is available on this system,
-otherwise \-1.
-.It Li _SC_THREADS
-The version of
-.St -p1003.1
-and its
-Threads
-option to which the system attempts to conform,
-otherwise \-1.
-.It Li _SC_TIMERS
-The version of
-.St -p1003.1
-and its
-Timers
-option to which the system attempts to conform,
-otherwise \-1.
-.It Li _SC_TZNAME_MAX
-The minimum maximum number of types supported for the name of a
-timezone.
-.It Li _SC_SAVED_IDS
-Returns 1 if saved set-group and saved set-user ID is available,
-otherwise \-1.
-.It Li _SC_VERSION
-The version of ISO/IEC 9945 (POSIX 1003.1) with which the system
-attempts to comply.
-.It Li _SC_XOPEN_SHM
-Return 1 if the
-.St -xpg4.2
-Shared Memory
-option is available on this system,
-otherwise \-1.
-.Pp
-Availability of the
-Shared Memory
-option depends on the
-.Li SYSVSHM
-kernel option.
-.It Li _SC_BC_BASE_MAX
-The maximum ibase/obase values in the
-.Xr bc 1
-utility.
-.It Li _SC_BC_DIM_MAX
-The maximum array size in the
-.Xr bc 1
-utility.
-.It Li _SC_BC_SCALE_MAX
-The maximum scale value in the
-.Xr bc 1
-utility.
-.It Li _SC_BC_STRING_MAX
-The maximum string length in the
-.Xr bc 1
-utility.
-.It Li _SC_COLL_WEIGHTS_MAX
-The maximum number of weights that can be assigned to any entry of
-the LC_COLLATE order keyword in the locale definition file.
-.It Li _SC_EXPR_NEST_MAX
-The maximum number of expressions that can be nested within
-parenthesis by the
-.Xr expr 1
-utility.
-.It Li _SC_LINE_MAX
-The maximum length in bytes of a text-processing utility's input
-line.
-.It Li _SC_RE_DUP_MAX
-The maximum number of repeated occurrences of a regular expression
-permitted when using interval notation.
-.It Li _SC_2_VERSION
-The version of POSIX 1003.2 with which the system attempts to comply.
-.It Li _SC_2_C_BIND
-Return 1 if the system's C-language development facilities support the
-C-Language Bindings Option, otherwise \-1.
-.It Li _SC_2_C_DEV
-Return 1 if the system supports the C-Language Development Utilities Option,
-otherwise \-1.
-.It Li _SC_2_CHAR_TERM
-Return 1 if the system supports at least one terminal type capable of
-all operations described in POSIX 1003.2, otherwise \-1.
-.It Li _SC_2_FORT_DEV
-Return 1 if the system supports the FORTRAN Development Utilities Option,
-otherwise \-1.
-.It Li _SC_2_FORT_RUN
-Return 1 if the system supports the FORTRAN Runtime Utilities Option,
-otherwise \-1.
-.It Li _SC_2_LOCALEDEF
-Return 1 if the system supports the creation of locales, otherwise \-1.
-.It Li _SC_2_SW_DEV
-Return 1 if the system supports the Software Development Utilities Option,
-otherwise \-1.
-.It Li _SC_2_UPE
-Return 1 if the system supports the User Portability Utilities Option,
-otherwise \-1.
-.It Li _SC_GETGR_R_SIZE_MAX
-The minimum size of the
-.Fa buffer
-passed to
-.Xr getgrgid_r 3
-and
-.Xr getgrnam_r 3 .
-.It Li _SC_GETPW_R_SIZE_MAX
-The minimum size of the
-.Fa buffer
-passed to
-.Xr getpwnam_r 3
-and
-.Xr getpwuid_r 3 .
-.It Li _SC_NPROCESSORS_CONF
-The number of processors configured.
-.It Li _SC_NPROCESSORS_ONLN
-The number of processors online (capable of running processes).
-.It Li _SC_PHYS_PAGES
-The amount of physical memory on the system in
-.Li _SC_PAGESIZE
-bytes.
-.El
-.Sh RETURN VALUES
-If the call to
-.Nm sysconf
-is not successful, \-1 is returned and
-.Va errno
-is set appropriately.
-Otherwise, if the variable is associated with functionality that is not
-supported, \-1 is returned and
-.Va errno
-is not modified.
-Otherwise, the current variable value is returned.
-.Sh ERRORS
-The
-.Fn sysconf
-function may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr sysctl 3 .
-In addition, the following error may be reported:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of the
-.Fa name
-argument is invalid.
-.El
-.Sh SEE ALSO
-.Xr getconf 1 ,
-.Xr limits 3 ,
-.Xr sysctl 3
-.Sh STANDARDS
-The
-.Fn sysconf
-function conforms to
-.St -p1003.1-90 .
-The constants
-.Li _SC_NPROCESSORS_CONF
-and
-.Li _SC_NPROCESSORS_ONLN
-are not part of the standard, but are provided by many systems.
-.Sh HISTORY
-The
-.Nm sysconf
-function first appeared in
-.Bx 4.4 .
-.Sh BUGS
-The value for _SC_STREAM_MAX is a minimum maximum, and required to be
-the same as ANSI C's FOPEN_MAX, so the returned value is a ridiculously
-small and misleading number.
diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c
deleted file mode 100644
index 3ff5d84fd..000000000
--- a/lib/libc/gen/sysconf.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/*	$NetBSD: sysconf.c,v 1.36 2013/12/19 19:11:50 rmind Exp $	*/
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Sean Eric Fagan of Cygnus Support.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)sysconf.c	8.2 (Berkeley) 3/20/94";
-#else
-__RCSID("$NetBSD: sysconf.c,v 1.36 2013/12/19 19:11:50 rmind Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <time.h>
-#include <unistd.h>
-#include <paths.h>
-#include <pwd.h>
-
-#ifdef __weak_alias
-__weak_alias(sysconf,__sysconf)
-#endif
-
-/*
- * sysconf --
- *	get configurable system variables.
- *
- * XXX
- * POSIX 1003.1 (ISO/IEC 9945-1, 4.8.1.3) states that the variable values
- * not change during the lifetime of the calling process.  This would seem
- * to require that any change to system limits kill all running processes.
- * A workaround might be to cache the values when they are first retrieved
- * and then simply return the cached value on subsequent calls.  This is
- * less useful than returning up-to-date values, however.
- */
-long
-sysconf(int name)
-{
-	struct rlimit rl;
-	size_t len;
-	uint64_t mem;
-	int mib[CTL_MAXNAME], value;
-	unsigned int mib_len;
-	struct clockinfo tmpclock;
-	static int clk_tck;
-
-	len = sizeof(value);
-
-	/* Default length of the MIB */
-	mib_len = 2;
-
-	switch (name) {
-
-/* 1003.1 */
-	case _SC_ARG_MAX:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_ARGMAX;
-		break;
-	case _SC_CHILD_MAX:
-		return (getrlimit(RLIMIT_NPROC, &rl) ? -1 : (long)rl.rlim_cur);
-	case _O_SC_CLK_TCK:
-		/*
-		 * For applications compiled when CLK_TCK was a compile-time
-		 * constant.
-		 */
-		return 100;
-	case _SC_CLK_TCK:
-		/*
-		 * Has to be handled specially because it returns a
-		 * struct clockinfo instead of an integer. Also, since
-		 * this might be called often by some things that
-		 * don't grok CLK_TCK can be a macro expanding to a
-		 * function, cache the value.
-		 */
-		if (clk_tck == 0) {
-			mib[0] = CTL_KERN;
-			mib[1] = KERN_CLOCKRATE;
-			len = sizeof(struct clockinfo);
-			clk_tck = sysctl(mib, 2, &tmpclock, &len, NULL, 0)
-			    == -1 ? -1 : tmpclock.hz;
-		}
-		return(clk_tck);
-	case _SC_JOB_CONTROL:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_JOB_CONTROL;
-		goto yesno;
-	case _SC_NGROUPS_MAX:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_NGROUPS;
-		break;
-	case _SC_OPEN_MAX:
-		return (getrlimit(RLIMIT_NOFILE, &rl) ? -1 : (long)rl.rlim_cur);
-	case _SC_STREAM_MAX:
-		mib[0] = CTL_USER;
-		mib[1] = USER_STREAM_MAX;
-		break;
-	case _SC_TZNAME_MAX:
-		mib[0] = CTL_USER;
-		mib[1] = USER_TZNAME_MAX;
-		break;
-	case _SC_SAVED_IDS:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_SAVED_IDS;
-		goto yesno;
-	case _SC_VERSION:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_POSIX1;
-		break;
-
-/* 1003.1b */
-	case _SC_PAGESIZE:
-		return _getpagesize();
-	case _SC_FSYNC:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_FSYNC;
-		goto yesno;
-	case _SC_SYNCHRONIZED_IO:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_SYNCHRONIZED_IO;
-		goto yesno;
-	case _SC_MAPPED_FILES:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_MAPPED_FILES;
-		goto yesno;
-	case _SC_MEMLOCK:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_MEMLOCK;
-		goto yesno;
-	case _SC_MEMLOCK_RANGE:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_MEMLOCK_RANGE;
-		goto yesno;
-	case _SC_MEMORY_PROTECTION:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_MEMORY_PROTECTION;
-		goto yesno;
-	case _SC_MONOTONIC_CLOCK:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_MONOTONIC_CLOCK;
-		goto yesno;
-	case _SC_SEMAPHORES:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_POSIX_SEMAPHORES;
-		goto yesno;
-	case _SC_TIMERS:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_POSIX_TIMERS;
-		goto yesno;
-
-/* 1003.1c */
-	case _SC_LOGIN_NAME_MAX:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_LOGIN_NAME_MAX;
-		break;
-	case _SC_THREADS:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_POSIX_THREADS;
-		goto yesno;
-
-/* 1003.1j */
-	case _SC_BARRIERS:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_POSIX_BARRIERS;
-		goto yesno;
-	case _SC_SPIN_LOCKS:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_POSIX_SPIN_LOCKS;
-		goto yesno;
-	/* Historical; Threads option in 1003.1-2001 */
-	case _SC_READER_WRITER_LOCKS:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_POSIX_READER_WRITER_LOCKS;
-		goto yesno;
-
-/* 1003.2 */
-	case _SC_BC_BASE_MAX:
-		mib[0] = CTL_USER;
-		mib[1] = USER_BC_BASE_MAX;
-		break;
-	case _SC_BC_DIM_MAX:
-		mib[0] = CTL_USER;
-		mib[1] = USER_BC_DIM_MAX;
-		break;
-	case _SC_BC_SCALE_MAX:
-		mib[0] = CTL_USER;
-		mib[1] = USER_BC_SCALE_MAX;
-		break;
-	case _SC_BC_STRING_MAX:
-		mib[0] = CTL_USER;
-		mib[1] = USER_BC_STRING_MAX;
-		break;
-	case _SC_COLL_WEIGHTS_MAX:
-		mib[0] = CTL_USER;
-		mib[1] = USER_COLL_WEIGHTS_MAX;
-		break;
-	case _SC_EXPR_NEST_MAX:
-		mib[0] = CTL_USER;
-		mib[1] = USER_EXPR_NEST_MAX;
-		break;
-	case _SC_LINE_MAX:
-		mib[0] = CTL_USER;
-		mib[1] = USER_LINE_MAX;
-		break;
-	case _SC_RE_DUP_MAX:
-		mib[0] = CTL_USER;
-		mib[1] = USER_RE_DUP_MAX;
-		break;
-	case _SC_2_VERSION:
-		mib[0] = CTL_USER;
-		mib[1] = USER_POSIX2_VERSION;
-		break;
-	case _SC_2_C_BIND:
-		mib[0] = CTL_USER;
-		mib[1] = USER_POSIX2_C_BIND;
-		goto yesno;
-	case _SC_2_C_DEV:
-		mib[0] = CTL_USER;
-		mib[1] = USER_POSIX2_C_DEV;
-		goto yesno;
-	case _SC_2_CHAR_TERM:
-		mib[0] = CTL_USER;
-		mib[1] = USER_POSIX2_CHAR_TERM;
-		goto yesno;
-	case _SC_2_FORT_DEV:
-		mib[0] = CTL_USER;
-		mib[1] = USER_POSIX2_FORT_DEV;
-		goto yesno;
-	case _SC_2_FORT_RUN:
-		mib[0] = CTL_USER;
-		mib[1] = USER_POSIX2_FORT_RUN;
-		goto yesno;
-	case _SC_2_LOCALEDEF:
-		mib[0] = CTL_USER;
-		mib[1] = USER_POSIX2_LOCALEDEF;
-		goto yesno;
-	case _SC_2_SW_DEV:
-		mib[0] = CTL_USER;
-		mib[1] = USER_POSIX2_SW_DEV;
-		goto yesno;
-	case _SC_2_UPE:
-		mib[0] = CTL_USER;
-		mib[1] = USER_POSIX2_UPE;
-		goto yesno;
-
-/* XPG 4.2 */
-	case _SC_IOV_MAX:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_IOV_MAX;
-		break;
-	case _SC_XOPEN_SHM:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_SYSVIPC;
-		mib[2] = KERN_SYSVIPC_SHM;
-		mib_len = 3;
-		goto yesno;
-
-/* 1003.1-2001, XSI Option Group */
-	case _SC_AIO_LISTIO_MAX:
-		if (sysctlgetmibinfo("kern.aio_listio_max", &mib[0], &mib_len,
-		    NULL, NULL, NULL, SYSCTL_VERSION))
-			return -1;
-		break; 
-	case _SC_AIO_MAX:
-		if (sysctlgetmibinfo("kern.aio_max", &mib[0], &mib_len,
-		    NULL, NULL, NULL, SYSCTL_VERSION))
-			return -1;
-		break; 
-	case _SC_ASYNCHRONOUS_IO:
-		if (sysctlgetmibinfo("kern.posix_aio", &mib[0], &mib_len,
-		    NULL, NULL, NULL, SYSCTL_VERSION))
-			return -1;
-		goto yesno;
-	case _SC_MESSAGE_PASSING:
-		if (sysctlgetmibinfo("kern.posix_msg", &mib[0], &mib_len,
-		    NULL, NULL, NULL, SYSCTL_VERSION))
-			return -1;
-		goto yesno;
-	case _SC_MQ_OPEN_MAX:
-		if (sysctlgetmibinfo("kern.mqueue.mq_open_max", &mib[0],
-		    &mib_len, NULL, NULL, NULL, SYSCTL_VERSION))
-			return -1;
-		break; 
-	case _SC_MQ_PRIO_MAX:
-		if (sysctlgetmibinfo("kern.mqueue.mq_prio_max", &mib[0],
-		    &mib_len, NULL, NULL, NULL, SYSCTL_VERSION))
-			return -1;
-		break; 
-	case _SC_PRIORITY_SCHEDULING:
-		if (sysctlgetmibinfo("kern.posix_sched", &mib[0], &mib_len,
-		    NULL, NULL, NULL, SYSCTL_VERSION))
-			return -1;
-		goto yesno;
-	case _SC_ATEXIT_MAX:
-		mib[0] = CTL_USER;
-		mib[1] = USER_ATEXIT_MAX;
-		break;
-
-/* 1003.1-2001, TSF */
-	case _SC_GETGR_R_SIZE_MAX:
-		return _GETGR_R_SIZE_MAX;
-	case _SC_GETPW_R_SIZE_MAX:
-		return _GETPW_R_SIZE_MAX;
-
-/* Unsorted */
-	case _SC_HOST_NAME_MAX:
-		return MAXHOSTNAMELEN;
-	case _SC_PASS_MAX:
-		return _PASSWORD_LEN;
-	case _SC_REGEXP:
-		return _POSIX_REGEXP;
-	case _SC_SHARED_MEMORY_OBJECTS:
-		return _POSIX_SHARED_MEMORY_OBJECTS;
-	case _SC_SHELL:
-		return _POSIX_SHELL;
-#ifndef __minix
-	case _SC_SPAWN:
-		return _POSIX_SPAWN;
-#endif /* !__minix */
-	case _SC_SYMLOOP_MAX:
-		return MAXSYMLINKS;
-
-yesno:		if (sysctl(mib, mib_len, &value, &len, NULL, 0) == -1)
-			return (-1);
-		if (value == 0)
-			return (-1);
-		return (value);
-
-/* Extensions */
-	case _SC_NPROCESSORS_CONF:
-		mib[0] = CTL_HW;
-		mib[1] = HW_NCPU;
-		break;
-	case _SC_NPROCESSORS_ONLN:
-		mib[0] = CTL_HW;
-		mib[1] = HW_NCPUONLINE;
-		break;
-
-/* Linux/Solaris */
-	case _SC_PHYS_PAGES:
-		len = sizeof(mem);
-		mib[0] = CTL_HW;
-		mib[1] = HW_PHYSMEM64;
-		return sysctl(mib, 2, &mem, &len, NULL, 0) == -1 ? -1 : 
-		    (long)(mem / _getpagesize()); 
-
-/* Native */
-	case _SC_SCHED_RT_TS:
-		if (sysctlgetmibinfo("kern.sched.rtts", &mib[0], &mib_len,
-		    NULL, NULL, NULL, SYSCTL_VERSION))      
-			return -1;              
-		break;
-	case _SC_SCHED_PRI_MIN:
-		if (sysctlgetmibinfo("kern.sched.pri_min", &mib[0], &mib_len,
-		    NULL, NULL, NULL, SYSCTL_VERSION))
-			return -1;
-		break;
-	case _SC_SCHED_PRI_MAX:
-		if (sysctlgetmibinfo("kern.sched.pri_max", &mib[0], &mib_len,
-		    NULL, NULL, NULL, SYSCTL_VERSION))
-			return -1;
-		break;
-	case _SC_THREAD_DESTRUCTOR_ITERATIONS:
-		return _POSIX_THREAD_DESTRUCTOR_ITERATIONS;
-	case _SC_THREAD_KEYS_MAX:
-		return _POSIX_THREAD_KEYS_MAX;
-	case _SC_THREAD_STACK_MIN:
-		return _getpagesize();
-	case _SC_THREAD_THREADS_MAX:
-		if (sysctlgetmibinfo("kern.maxproc", &mib[0], &mib_len,
-		    NULL, NULL, NULL, SYSCTL_VERSION))	/* XXX */
-			return -1;
-		goto yesno;
-	case _SC_THREAD_ATTR_STACKADDR:
-		return _POSIX_THREAD_ATTR_STACKADDR;
-	case _SC_THREAD_ATTR_STACKSIZE:
-		return _POSIX_THREAD_ATTR_STACKSIZE;
-	case _SC_THREAD_SAFE_FUNCTIONS:
-		return _POSIX_THREAD_SAFE_FUNCTIONS;
-	case _SC_THREAD_PRIORITY_SCHEDULING:
-	case _SC_THREAD_PRIO_INHERIT:
-	case _SC_THREAD_PRIO_PROTECT:
-	case _SC_THREAD_PROCESS_SHARED:
-		return -1;
-	case _SC_TTY_NAME_MAX:
-		return pathconf(_PATH_DEV, _PC_NAME_MAX);
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-	return (sysctl(mib, mib_len, &value, &len, NULL, 0) == -1 ? -1 : value); 
-}
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
deleted file mode 100644
index 2fd2c12bf..000000000
--- a/lib/libc/gen/sysctl.3
+++ /dev/null
@@ -1,739 +0,0 @@
-.\"	$NetBSD: sysctl.3,v 1.202 2014/06/13 22:05:15 wiz Exp $
-.\"
-.\" 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.
-.\"
-.\"	@(#)sysctl.3	8.4 (Berkeley) 5/9/95
-.\"
-.Dd June 13, 2014
-.Dt SYSCTL 3
-.Os
-.Sh NAME
-.Nm sysctl ,
-.Nm sysctlbyname ,
-.Nm sysctlgetmibinfo ,
-.Nm sysctlnametomib ,
-.Nm asysctl ,
-.Nm asysctlbyname
-.Nd get or set system information
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/sysctl.h
-.Ft int
-.Fn sysctl "const int *name" "u_int namelen" "void *oldp" "size_t *oldlenp" \
-"const void *newp" "size_t newlen"
-.Ft int
-.Fn sysctlbyname "const char *sname" "void *oldp" "size_t *oldlenp" \
-"const void *newp" "size_t newlen"
-.Ft int
-.Fn sysctlgetmibinfo "const char *sname" "int *name" "u_int *namelenp" \
-"char *cname" "size_t *csz" "struct sysctlnode **rnode" "int v"
-.Ft int
-.Fn sysctlnametomib "const char *sname" "int *name" "size_t *namelenp"
-.Ft void *
-.Fn asysctl "const int *name" "size_t namelen" "size_t *len"
-.Ft void *
-.Fn asysctlbyname "const char *sname" "size_t *len"
-.Sh DESCRIPTION
-The
-.Nm
-function retrieves system information and allows processes with
-appropriate privileges to set system information.
-The information available from
-.Nm
-consists of integers, strings, and tables.
-Information may be retrieved and set from the command interface
-using the
-.Xr sysctl 8
-utility.
-.Pp
-Unless explicitly noted below,
-.Nm
-returns a consistent snapshot of the data requested.
-Consistency is obtained by locking the destination
-buffer into memory so that the data may be copied out without blocking.
-Calls to
-.Nm
-are serialized to avoid deadlock.
-.Pp
-The state is described using a ``Management Information Base'' (MIB)
-style name, listed in
-.Fa name ,
-which is a
-.Fa namelen
-length array of integers.
-.Pp
-The
-.Fn sysctlbyname
-function accepts a string representation of a MIB entry and internally
-maps it to the appropriate numeric MIB representation.
-Its semantics are otherwise no different from
-.Fn sysctl .
-.Pp
-The information is copied into the buffer specified by
-.Fa oldp .
-The size of the buffer is given by the location specified by
-.Fa oldlenp
-before the call,
-and that location gives the amount of data copied after a successful call.
-If the amount of data available is greater
-than the size of the buffer supplied,
-the call supplies as much data as fits in the buffer provided
-and returns with the error code ENOMEM.
-If the old value is not desired,
-.Fa oldp
-and
-.Fa oldlenp
-should be set to
-.Dv NULL .
-.Pp
-The size of the available data can be determined by calling
-.Nm
-with a
-.Dv NULL
-parameter for
-.Fa oldp .
-The size of the available data will be returned in the location pointed to by
-.Fa oldlenp .
-For some operations, the amount of space may change often.
-For these operations,
-the system attempts to round up so that the returned size is
-large enough for a call to return the data shortly thereafter.
-.Pp
-To set a new value,
-.Fa newp
-is set to point to a buffer of length
-.Fa newlen
-from which the requested value is to be taken.
-If a new value is not to be set,
-.Fa newp
-should be set to
-.Dv NULL
-and
-.Fa newlen
-set to 0.
-.Pp
-The
-.Fn sysctlnametomib
-function can be used to map the string representation of a MIB entry
-to the numeric version.
-The
-.Fa name
-argument should point to an array of integers large enough to hold the
-MIB, and
-.Fa namelenp
-should indicate the number of integer slots available.
-Following a successful translation, the size_t indicated by
-.Fa namelenp
-will be changed to show the number of slots consumed.
-.Pp
-The
-.Fn sysctlgetmibinfo
-function performs name translation similar to
-.Fn sysctlnametomib ,
-but also canonicalizes the name (or returns the first erroneous token
-from the string being parsed) into the space indicated by
-.Fa cname
-and
-.Fa csz .
-.Fa csz
-should indicate the size of the buffer pointed to by
-.Fa cname
-and on return, will indicate the size of the returned string including
-the trailing
-.Sq nul
-character.
-.Pp
-The
-.Fa rnode
-and
-.Fa v
-arguments to
-.Fn sysctlgetmibinfo
-are used to provide a tree for it to parse into, and to get back
-either a pointer to, or a copy of, the terminal node.
-If
-.Fa rnode
-is
-.Dv NULL ,
-.Fn sysctlgetmibinfo
-uses its own internal tree for parsing, and checks it against the
-kernel at each call, to make sure that the name-to-number mapping is
-kept up to date.
-The
-.Fa v
-argument is ignored in this case.
-If
-.Fa rnode
-is not
-.Dv NULL
-but the pointer it references is, on a successful return,
-.Fa rnode
-will be adjusted to point to a copy of the terminal node.
-The
-.Fa v
-argument indicates which version of the
-.Nm
-node structure the caller wants.
-The application must later
-.Fn free
-this copy.
-If neither
-.Fa rnode
-nor the pointer it references are
-.Dv NULL ,
-the pointer is used as the address of a tree over which the parsing is
-done.
-In this last case, the tree is not checked against the kernel, no
-refreshing of the mappings is performed, and the value given by
-.Fa v
-must agree with the version indicated by the tree.
-It is recommended that applications always use
-.Dv SYSCTL_VERSION
-as the value for
-.Fa v ,
-as defined in the include file
-.Pa sys/sysctl.h .
-.Pp
-The numeric and text names of sysctl variables are described in
-.Xr sysctl 7 .
-The numeric names are defined as preprocessor macros.
-The top level names are defined with a CTL_ prefix in
-.In sys/sysctl.h .
-The next and subsequent levels down have different prefixes for each
-subtree.
-.Pp
-For example, the following retrieves the maximum number of processes allowed
-in the system - the
-.Li kern.maxproc
-variable:
-.Bd -literal -offset indent -compact
-int mib[2], maxproc;
-size_t len;
-.sp
-mib[0] = CTL_KERN;
-mib[1] = KERN_MAXPROC;
-len = sizeof(maxproc);
-sysctl(mib, 2, \*[Am]maxproc, \*[Am]len, NULL, 0);
-.Ed
-.sp
-To retrieve the standard search path for the system utilities -
-.Li user.cs_path :
-.Bd -literal -offset indent -compact
-int mib[2];
-size_t len;
-char *p;
-.sp
-mib[0] = CTL_USER;
-mib[1] = USER_CS_PATH;
-sysctl(mib, 2, NULL, \*[Am]len, NULL, 0);
-p = malloc(len);
-sysctl(mib, 2, p, \*[Am]len, NULL, 0);
-.Ed
-.Pp
-The
-.Fn asysctl
-and
-.Fn asysctlbyname
-functions are wrappers for
-.Fn sysctl
-and
-.Fn sysctlbyname .
-They return memory allocated with
-.Xr malloc 3
-and resize the buffer in a loop until all data fits.
-.Sh DYNAMIC OPERATIONS
-Several meta-identifiers are provided to perform operations on the
-.Nm
-tree itself, or support alternate means of accessing the data
-instrumented by the
-.Nm
-tree.
-.Bl -column CTLXCREATESYMXXX
-.It Sy Name	Description
-.It CTL\_QUERY	Retrieve a mapping of names to numbers below a given node
-.It CTL\_CREATE	Create a new node
-.It CTL\_CREATESYM	Create a new node by its kernel symbol
-.It CTL\_DESTROY	Destroy a node
-.It CTL\_DESCRIBE	Retrieve node descriptions
-.El
-.Pp
-The core interface to all of these meta-functions is the structure
-that the kernel uses to describe the tree internally, as defined in
-.In sys/sysctl.h
-as:
-.Pp
-.Bd -literal
-struct sysctlnode {
-        uint32_t sysctl_flags;          /* flags and type */
-        int32_t sysctl_num;             /* mib number */
-        char sysctl_name[SYSCTL_NAMELEN]; /* node name */
-        uint32_t sysctl_ver;        /* node's version vs. rest of tree */
-        uint32_t __rsvd;
-        union {
-                struct {
-                        uint32_t suc_csize; /* size of child node array */
-                        uint32_t suc_clen; /* number of valid children */
-                        struct sysctlnode* suc_child; /* array of child nodes */
-                } scu_child;
-                struct {
-                        void *sud_data; /* pointer to external data */
-                        size_t sud_offset; /* offset to data */
-                } scu_data;
-                int32_t scu_alias;      /* node this node refers to */
-                int32_t scu_idata;      /* immediate "int" data */
-                u_quad_t scu_qdata;     /* immediate "u_quad_t" data */
-        } sysctl_un;
-        size_t _sysctl_size;            /* size of instrumented data */
-        sysctlfn _sysctl_func;          /* access helper function */
-        struct sysctlnode *sysctl_parent; /* parent of this node */
-        const char *sysctl_desc;        /* description of node */
-};
-
-#define sysctl_csize    sysctl_un.scu_child.suc_csize
-#define sysctl_clen     sysctl_un.scu_child.suc_clen
-#define sysctl_child    sysctl_un.scu_child.suc_child
-#define sysctl_data     sysctl_un.scu_data.sud_data
-#define sysctl_offset   sysctl_un.scu_data.sud_offset
-#define sysctl_alias    sysctl_un.scu_alias
-#define sysctl_idata    sysctl_un.scu_idata
-#define sysctl_qdata    sysctl_un.scu_qdata
-.Ed
-.Pp
-Querying the tree to discover the name to number mapping permits
-dynamic discovery of all the data that the tree currently has
-instrumented.
-For example, to discover all the nodes below the
-CTL_VFS node:
-.Pp
-.Bd -literal -offset indent -compact
-struct sysctlnode query, vfs[128];
-int mib[2];
-size_t len;
-.sp
-mib[0] = CTL_VFS;
-mib[1] = CTL_QUERY;
-memset(\*[Am]query, 0, sizeof(query));
-query.sysctl_flags = SYSCTL_VERSION;
-len = sizeof(vfs);
-sysctl(mib, 2, \*[Am]vfs[0], \*[Am]len, \*[Am]query, sizeof(query));
-.Ed
-.Pp
-Note that a reference to an empty node with
-.Fa sysctl_flags
-set to
-.Dv SYSCTL_VERSION
-is passed to sysctl in order to indicate the version that the program
-is using.
-All dynamic operations passing nodes into sysctl require that the
-version be explicitly specified.
-.Pp
-Creation and destruction of nodes works by constructing part of a new
-node description (or a description of the existing node) and invoking
-CTL_CREATE (or CTL_CREATESYM) or CTL_DESTROY at the parent of the new
-node, with a pointer to the new node passed via the
-.Fa new
-and
-.Fa newlen
-arguments.
-If valid values for
-.Fa old
-and
-.Fa oldlenp
-are passed, a copy of the new node once in the tree will be returned.
-If the create operation fails because a node with the same name or MIB
-number exists, a copy of the conflicting node will be returned.
-.Pp
-The minimum requirements for creating a node are setting the
-.Fa sysctl_flags
-to indicate the new node's type,
-.Fa sysctl_num
-to either the new node's number (or CTL_CREATE or CTL_CREATESYM if a
-dynamically allocated MIB number is acceptable),
-.Fa sysctl_size
-to the size of the data to be instrumented (which must agree with the
-given type), and
-.Fa sysctl_name
-must be set to the new node's name.
-Nodes that are not of type
-.Dq node
-must also have some description of the data to be instrumented, which
-will vary depending on what is to be instrumented.
-.Pp
-If existing kernel data is to be covered by this new node, its address
-should be given in
-.Fa sysctl_data
-or, if CTL_CREATESYM is used,
-.Fa sysctl_data
-should be set to a string containing its name from the kernel's symbol
-table.
-If new data is to be instrumented and an initial value is available,
-the new integer or quad type data should be placed into either
-.Fa sysctl_idata
-or
-.Fa sysctl_qdata ,
-respectively, along with the SYSCTL_IMMEDIATE flag being set, or
-.Fa sysctl_data
-should be set to point to a copy of the new data, and the
-SYSCTL_OWNDATA flag must be set.
-This latter method is the only way that new string and struct type
-nodes can be initialized.
-Invalid kernel addresses are accepted, but any attempt to access those
-nodes will return an error.
-.Pp
-The
-.Fa sysctl_csize ,
-.Fa sysctl_clen ,
-.Fa sysctl_child ,
-.Fa sysctl_parent ,
-and
-.Fa sysctl_alias
-members are used by the kernel to link the tree together and must be
-.Dv NULL
-or 0.
-Nodes created in this manner cannot have helper functions, so
-.Fa sysctl_func
-must also be
-.Dv NULL .
-If the
-.Fa sysctl_ver
-member is non-zero, it must match either the version of the parent or
-the version at the root of the MIB or an error is returned.
-This can be used to ensure that nodes are only added or removed from a
-known state of the tree.
-Note: It may not be possible to determine the version at the root
-of the tree.
-.Pp
-This example creates a new subtree and adds a node to it that controls the
-.Fa audiodebug
-kernel variable, thereby making it tunable at at any time, without
-needing to use
-.Xr ddb 4
-or
-.Xr kvm 3
-to alter the kernel's memory directly.
-.Pp
-.Bd -literal -offset indent -compact
-struct sysctlnode node;
-int mib[2];
-size_t len;
-.sp
-mib[0] = CTL_CREATE;		/* create at top-level */
-len = sizeof(node);
-memset(\*[Am]node, 0, len);
-node.sysctl_flags = SYSCTL_VERSION|CTLFLAG_READWRITE|CTLTYPE_NODE;
-snprintf(node.sysctl_name, sizeof(node.sysctl_name), "local");
-node.sysctl_num = CTL_CREATE;	/* request dynamic MIB number */
-sysctl(\*[Am]mib[0], 1, \*[Am]node, \*[Am]len, \*[Am]node, len);
-.sp
-mib[0] = node.sysctl_num;	/* use new MIB number */
-mib[1] = CTL_CREATESYM;		/* create at second level */
-len = sizeof(node);
-memset(\*[Am]node, 0, len);
-node.sysctl_flags = SYSCTL_VERSION|CTLFLAG_READWRITE|CTLTYPE_INT;
-snprintf(node.sysctl_name, sizeof(node.sysctl_name), "audiodebug");
-node.sysctl_num = CTL_CREATE;
-node.sysctl_data = "audiodebug"; /* kernel symbol to be used */
-sysctl(\*[Am]mib[0], 2, NULL, NULL, \*[Am]node, len);
-.Ed
-.Pp
-The process for deleting nodes is similar, but less data needs to
-be supplied.
-Only the
-.Fa sysctl_num
-field
-needs to be filled in; almost all other fields must be left blank.
-The
-.Fa sysctl_name
-and/or
-.Fa sysctl_ver
-fields can be filled in with the name and version of the existing node
-as additional checks on what will be deleted.
-If all the given data fail to match any node, nothing will be deleted.
-If valid values for
-.Fa old
-and
-.Fa oldlenp
-are supplied and a node is deleted, a copy of what was in the MIB tree
-will be returned.
-.Pp
-This sample code shows the deletion of the two nodes created in the
-above example:
-.Pp
-.Bd -literal -offset indent -compact
-int mib[2];
-.sp
-len = sizeof(node);
-memset(\*[Am]node, 0, len);
-node.sysctl_flags = SYSCTL_VERSION;
-.sp
-mib[0] = 3214;			/* assumed number for "local" */
-mib[1] = CTL_DESTROY;
-node.sysctl_num = 3215;		/* assumed number for "audiodebug" */
-sysctl(\*[Am]mib[0], 2, NULL, NULL, \*[Am]node, len);
-.sp
-mib[0] = CTL_DESTROY;
-node.sysctl_num = 3214;		/* now deleting "local" */
-sysctl(\*[Am]mib[0], 1, NULL, NULL, \*[Am]node, len);
-.Ed
-.Pp
-Descriptions of each of the nodes can also be retrieved, if they are
-available.
-Descriptions can be retrieved in bulk at each level or on a per-node
-basis.
-The layout of the buffer into which the descriptions are returned is a
-series of variable length structures, each of which describes its own
-size.
-The length indicated includes the terminating
-.Sq nul
-character.
-Nodes that have no description or where the description is not
-available are indicated by an empty string.
-The
-.Fa descr_ver
-will match the
-.Fa sysctl_ver
-value for a given node, so that descriptions for nodes whose number
-have been recycled can be detected and ignored or discarded.
-.Pp
-.Bd -literal
-struct sysctldesc {
-        int32_t         descr_num;      /* mib number of node */
-        uint32_t        descr_ver;      /* version of node */
-        uint32_t        descr_len;      /* length of description string */
-        char            descr_str[1];   /* not really 1...see above */
-};
-.Ed
-.Pp
-The
-.Fn NEXT_DESCR
-macro can be used to skip to the next description in the retrieved
-list.
-.Pp
-.Bd -literal -offset indent -compact
-struct sysctlnode desc;
-struct sysctldesc *d;
-char buf[1024];
-int mib[2];
-size_t len;
-.sp
-/* retrieve kern-level descriptions */
-mib[0] = CTL_KERN;
-mib[1] = CTL_DESCRIBE;
-d = (struct sysctldesc *)\*[Am]buf[0];
-len = sizeof(buf);
-sysctl(mib, 2, d, \*[Am]len, NULL, 0);
-while ((caddr_t)d \*[Lt] (caddr_t)\*[Am]buf[len]) {
-	printf("node %d: %.*s\\n", d-\*[Gt]descr_num, d-\*[Gt]descr_len,
-	    d-\*[Gt]descr_str);
-	d = NEXT_DESCR(d);
-}
-.sp
-/* retrieve description for kern.securelevel */
-memset(\*[Am]desc, 0, sizeof(desc));
-desc.sysctl_flags = SYSCTL_VERSION;
-desc.sysctl_num = KERN_SECURELEVEL;
-d = (struct sysctldesc *)\*[Am]buf[0];
-len = sizeof(buf);
-sysctl(mib, 2, d, \*[Am]len, \*[Am]desc, sizeof(desc));
-printf("kern.securelevel: %.*s\\n", d-\*[Gt]descr_len, d-\*[Gt]descr_str);
-.Ed
-.Pp
-Descriptions can also be set as follows, subject to the following rules:
-.Pp
-.Bl -bullet -compact
-.It
-The kernel securelevel is at zero or lower
-.It
-The caller has super-user privileges
-.It
-The node does not currently have a description
-.It
-The node is not marked as
-.Dq permanent
-.El
-.Pp
-.Bd -literal -offset indent -compact
-struct sysctlnode desc;
-int mib[2];
-.sp
-/* presuming the given top-level node was just added... */
-mib[0] = 3214; /* mib numbers taken from previous examples */
-mib[1] = CTL_DESCRIBE;
-memset(\*[Am]desc, 0, sizeof(desc));
-desc.sysctl_flags = SYSCTL_VERSION;
-desc.sysctl_num = 3215;
-desc.sysctl_desc = "audio debug control knob";
-sysctl(mib, 2, NULL, NULL, \*[Am]desc, sizeof(desc));
-.Ed
-.Pp
-Upon successfully setting a description, the new description will be
-returned in the space indicated by the
-.Fa oldp
-and
-.Fa oldlenp
-arguments.
-.Pp
-The
-.Fa sysctl_flags
-field in the struct sysctlnode contains the sysctl version, node type
-information, and a number of flags.
-The macros
-.Fn SYSCTL_VERS ,
-.Fn SYSCTL_TYPE ,
-and
-.Fn SYSCTL_FLAGS
-can be used to access the different fields.
-Valid flags are:
-.Bl -column CTLFLAGXPERMANENTXXX
-.It Sy Name	Description
-.It CTLFLAG\_READONLY	Node is read-only
-.It CTLFLAG\_READWRITE	Node is writable by the superuser
-.It CTLFLAG\_ANYWRITE	Node is writable by anyone
-.It CTLFLAG\_PRIVATE	Node is readable only by the superuser
-.It CTLFLAG\_PERMANENT	Node cannot be removed (cannot be set by
-processes)
-.It CTLFLAG\_OWNDATA	Node owns data and does not instrument
-existing data
-.It CTLFLAG\_IMMEDIATE	Node contains instrumented data and does not
-instrument existing data
-.It CTLFLAG\_HEX	Node's contents should be displayed in a hexadecimal
-form
-.It CTLFLAG\_ROOT	Node is the root of a tree (cannot be set at
-any time)
-.It CTLFLAG\_ANYNUMBER	Node matches any MIB number (cannot be set by
-processes)
-.It CTLFLAG\_HIDDEN	Node not displayed by default
-.It CTLFLAG\_ALIAS	Node refers to a sibling node (cannot be set
-by processes)
-.It CTLFLAG\_OWNDESC	Node owns its own description string space
-.El
-.Sh RETURN VALUES
-If the call to
-.Nm
-is successful, 0 is returned.
-Otherwise \-1 is returned and
-.Va errno
-is set appropriately.
-.Sh FILES
-.Bl -tag -width \*[Lt]netinet6/udp6Xvar.h\*[Gt] -compact
-.It Aq Pa sys/sysctl.h
-definitions for top level identifiers, second level kernel and hardware
-identifiers, and user level identifiers
-.It Aq Pa sys/socket.h
-definitions for second level network identifiers
-.It Aq Pa sys/gmon.h
-definitions for third level profiling identifiers
-.It Aq Pa uvm/uvm_param.h
-definitions for second level virtual memory identifiers
-.It Aq Pa netinet/in.h
-definitions for third level IPv4/v6 identifiers and
-fourth level IPv4/v6 identifiers
-.It Aq Pa netinet/icmp_var.h
-definitions for fourth level ICMP identifiers
-.It Aq Pa netinet/icmp6.h
-definitions for fourth level ICMPv6 identifiers
-.It Aq Pa netinet/tcp_var.h
-definitions for fourth level TCP identifiers
-.It Aq Pa netinet/udp_var.h
-definitions for fourth level UDP identifiers
-.It Aq Pa netinet6/udp6_var.h
-definitions for fourth level IPv6 UDP identifiers
-.It Aq Pa netinet6/ipsec.h
-definitions for fourth level IPsec identifiers
-.It Aq Pa netkey/key_var.h
-definitions for third level PF_KEY identifiers
-.It Aq Pa machine/cpu.h
-definitions for second level machdep identifiers
-.El
-.Sh ERRORS
-The following errors may be reported:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The buffer
-.Fa name ,
-.Fa oldp ,
-.Fa newp ,
-or length pointer
-.Fa oldlenp
-contains an invalid address, or the requested value is temporarily
-unavailable.
-.It Bq Er EINVAL
-The
-.Fa name
-array is zero or greater than
-.Dv CTL_MAXNAME ;
-or a non-null
-.Fa newp
-is given and its specified length in
-.Fa newlen
-is too large or too small, or the given value is not acceptable for
-the given node.
-.It Bq Er EISDIR
-The
-.Fa name
-array specifies an intermediate rather than terminal name.
-.It Bq Er ENOENT
-The
-.Fa name
-array specifies a node that does not exist in the tree;
-or an attempt was made to destroy a node that does not exist, or to
-create or destroy a node below a node that does not exist.
-.It Bq Er ENOMEM
-The length pointed to by
-.Fa oldlenp
-is too short to hold the requested value.
-.It Bq Er ENOTDIR
-The
-.Fa name
-array specifies a node below a node that addresses data.
-.It Bq Er ENOTEMPTY
-An attempt was made to destroy a node that still has children.
-.It Bq Er EOPNOTSUPP
-The
-.Fa name
-array specifies a value that is unknown or a meta-operation was
-attempted that the requested node does not support.
-.It Bq Er EPERM
-An attempt is made to set a read-only value; or
-a process without appropriate privilege attempts to set a value or to
-create or destroy a node; or
-an attempt to change a value protected by the current kernel security
-level is made.
-.El
-.Sh SEE ALSO
-.Xr sysctl 7 ,
-.Xr sysctl 8 ,
-.Xr secmodel_securelevel 9
-.\" .Xr sysctl 9
-.Sh HISTORY
-The
-.Nm
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c
deleted file mode 100644
index 11e5d102c..000000000
--- a/lib/libc/gen/sysctl.c
+++ /dev/null
@@ -1,391 +0,0 @@
-/*	$NetBSD: sysctl.c,v 1.35 2015/02/05 16:05:20 christos Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)sysctl.c	8.2 (Berkeley) 1/4/94";
-#else
-__RCSID("$NetBSD: sysctl.c,v 1.35 2015/02/05 16:05:20 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#define __COMPAT_SYSCTL
-#include <sys/sysctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <paths.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include "extern.h"
-
-#ifdef __weak_alias
-__weak_alias(sysctl,_sysctl)
-#endif
-
-/*
- * handles requests off the user subtree
- */
-static int user_sysctl(const int *, u_int, void *, size_t *,
-			const void *, size_t);
-
-/*
- * copies out individual nodes taking target version into account
- */
-static size_t __cvt_node_out(uint, const struct sysctlnode *, void **,
-			     size_t *);
-
-#include <stdlib.h>
-
-int
-sysctl(const int *name, unsigned int namelen,
-	void *oldp, size_t *oldlenp,
-	const void *newp, size_t newlen)
-{
-	size_t oldlen, savelen;
-	int error;
-
-	if (name[0] != CTL_USER)
-		return (__sysctl(name, namelen, oldp, oldlenp,
-				 newp, newlen));
-
-	oldlen = (oldlenp == NULL) ? 0 : *oldlenp;
-	savelen = oldlen;
-	error = user_sysctl(name + 1, namelen - 1, oldp, &oldlen, newp, newlen);
-
-	if (error != 0) {
-		errno = error;
-		return (-1);
-	}
-
-	if (oldlenp != NULL) {
-		*oldlenp = oldlen;
-		if (oldp != NULL && oldlen > savelen) {
-			errno = ENOMEM;
-			return (-1);
-		}
-	}
-
-	return (0);
-}
-
-static int
-user_sysctl(const int *name, unsigned int namelen,
-	void *oldp, size_t *oldlenp,
-	const void *newp, size_t newlen)
-{
-#define _INT(s, n, v, d) {					\
-	.sysctl_flags = CTLFLAG_IMMEDIATE|CTLFLAG_PERMANENT|	\
-			CTLTYPE_INT|SYSCTL_VERSION,		\
-	.sysctl_size = sizeof(int),				\
-	.sysctl_name = (s),					\
-	.sysctl_num = (n),					\
-	.sysctl_un.scu_idata = (v),				\
-	.sysctl_desc = (d),					\
-	}
-
-	/*
-	 * the nodes under the "user" node
-	 */
-	static const struct sysctlnode sysctl_usermib[] = {
-#if defined(lint)
-		/*
-		 * lint doesn't like my initializers
-		 */
-		0
-#else /* !lint */
-		{
-			.sysctl_flags = SYSCTL_VERSION|CTLFLAG_PERMANENT|
-				CTLTYPE_STRING,
-			.sysctl_size = sizeof(_PATH_STDPATH),
-			.sysctl_name = "cs_path",
-			.sysctl_num = USER_CS_PATH,
-			.sysctl_data = __UNCONST(_PATH_STDPATH),
-			.sysctl_desc = __UNCONST(
-				"A value for the PATH environment variable "
-				"that finds all the standard utilities"),
-		},
-		_INT("bc_base_max", USER_BC_BASE_MAX, BC_BASE_MAX,
-		     "The maximum ibase/obase values in the bc(1) utility"),
-		_INT("bc_dim_max", USER_BC_DIM_MAX, BC_DIM_MAX,
-		     "The maximum array size in the bc(1) utility"),
-		_INT("bc_scale_max", USER_BC_SCALE_MAX, BC_SCALE_MAX,
-		     "The maximum scale value in the bc(1) utility"),
-		_INT("bc_string_max", USER_BC_STRING_MAX, BC_STRING_MAX,
-		     "The maximum string length in the bc(1) utility"),
-		_INT("coll_weights_max", USER_COLL_WEIGHTS_MAX,
-		     COLL_WEIGHTS_MAX, "The maximum number of weights that can "
-		     "be assigned to any entry of the LC_COLLATE order keyword "
-		     "in the locale definition file"),
-		_INT("expr_nest_max", USER_EXPR_NEST_MAX, EXPR_NEST_MAX,
-		     "The maximum number of expressions that can be nested "
-		     "within parenthesis by the expr(1) utility"),
-		_INT("line_max", USER_LINE_MAX, LINE_MAX, "The maximum length "
-		     "in bytes of a text-processing utility's input line"),
-		_INT("re_dup_max", USER_RE_DUP_MAX, RE_DUP_MAX, "The maximum "
-		     "number of repeated occurrences of a regular expression "
-		     "permitted when using interval notation"),
-		_INT("posix2_version", USER_POSIX2_VERSION, _POSIX2_VERSION,
-		     "The version of POSIX 1003.2 with which the system "
-		     "attempts to comply"),
-#ifdef _POSIX2_C_BIND
-		_INT("posix2_c_bind", USER_POSIX2_C_BIND, 1,
-		     "Whether the system's C-language development facilities "
-		     "support the C-Language Bindings Option"),
-#else
-		_INT("posix2_c_bind", USER_POSIX2_C_BIND, 0,
-		     "Whether the system's C-language development facilities "
-		     "support the C-Language Bindings Option"),
-#endif
-#ifdef POSIX2_C_DEV
-		_INT("posix2_c_dev", USER_POSIX2_C_DEV, 1,
-		     "Whether the system supports the C-Language Development "
-		     "Utilities Option"),
-#else
-		_INT("posix2_c_dev", USER_POSIX2_C_DEV, 0,
-		     "Whether the system supports the C-Language Development "
-		     "Utilities Option"),
-#endif
-#ifdef POSIX2_CHAR_TERM
-		_INT("posix2_char_term", USER_POSIX2_CHAR_TERM, 1,
-		     "Whether the system supports at least one terminal type "
-		     "capable of all operations described in POSIX 1003.2"),
-#else
-		_INT("posix2_char_term", USER_POSIX2_CHAR_TERM, 0,
-		     "Whether the system supports at least one terminal type "
-		     "capable of all operations described in POSIX 1003.2"),
-#endif
-#ifdef POSIX2_FORT_DEV
-		_INT("posix2_fort_dev", USER_POSIX2_FORT_DEV, 1,
-		     "Whether the system supports the FORTRAN Development "
-		     "Utilities Option"),
-#else
-		_INT("posix2_fort_dev", USER_POSIX2_FORT_DEV, 0,
-		     "Whether the system supports the FORTRAN Development "
-		     "Utilities Option"),
-#endif
-#ifdef POSIX2_FORT_RUN
-		_INT("posix2_fort_run", USER_POSIX2_FORT_RUN, 1,
-		     "Whether the system supports the FORTRAN Runtime "
-		     "Utilities Option"),
-#else
-		_INT("posix2_fort_run", USER_POSIX2_FORT_RUN, 0,
-		     "Whether the system supports the FORTRAN Runtime "
-		     "Utilities Option"),
-#endif
-#ifdef POSIX2_LOCALEDEF
-		_INT("posix2_localedef", USER_POSIX2_LOCALEDEF, 1,
-		     "Whether the system supports the creation of locales"),
-#else
-		_INT("posix2_localedef", USER_POSIX2_LOCALEDEF, 0,
-		     "Whether the system supports the creation of locales"),
-#endif
-#ifdef POSIX2_SW_DEV
-		_INT("posix2_sw_dev", USER_POSIX2_SW_DEV, 1,
-		     "Whether the system supports the Software Development "
-		     "Utilities Option"),
-#else
-		_INT("posix2_sw_dev", USER_POSIX2_SW_DEV, 0,
-		     "Whether the system supports the Software Development "
-		     "Utilities Option"),
-#endif
-#ifdef POSIX2_UPE
-		_INT("posix2_upe", USER_POSIX2_UPE, 1,
-		     "Whether the system supports the User Portability "
-		     "Utilities Option"),
-#else
-		_INT("posix2_upe", USER_POSIX2_UPE, 0,
-		     "Whether the system supports the User Portability "
-		     "Utilities Option"),
-#endif
-		_INT("stream_max", USER_STREAM_MAX, FOPEN_MAX,
-		     "The minimum maximum number of streams that a process "
-		     "may have open at any one time"),
-		_INT("tzname_max", USER_TZNAME_MAX, NAME_MAX,
-		     "The minimum maximum number of types supported for the "
-		     "name of a timezone"),
-		_INT("atexit_max", USER_ATEXIT_MAX, -1,
-		     "The maximum number of functions that may be registered "
-		     "with atexit(3)"),
-#endif /* !lint */
-	};
-#undef _INT
-
-	static const int clen = sizeof(sysctl_usermib) /
-		sizeof(sysctl_usermib[0]);
-
-	const struct sysctlnode *node;
-	int ni;
-	size_t l, sz;
-
-	/*
-	 * none of these nodes are writable and they're all terminal (for now)
-	 */
-	if (namelen != 1)
-		return (EINVAL);
-
-	l = *oldlenp;
-	if (name[0] == CTL_QUERY) {
-		uint v;
-		node = newp;
-		if (node == NULL)
-			return (EINVAL);
-		else if (SYSCTL_VERS(node->sysctl_flags) == SYSCTL_VERS_1 &&
-			 newlen == sizeof(struct sysctlnode))
-			v = SYSCTL_VERS_1;
-		else
-			return (EINVAL);
-
-		sz = 0;
-		for (ni = 0; ni < clen; ni++)
-			sz += __cvt_node_out(v, &sysctl_usermib[ni], &oldp, &l);
-		*oldlenp = sz;
-		return (0);
-	}
-
-	if (name[0] == CTL_DESCRIBE) {
-		/*
-		 * XXX make sure this is larger than the largest
-		 * "user" description
-		 */
-		char buf[192];
-		struct sysctldesc *d1 = (void *)&buf[0], *d2 = oldp;
-		size_t d;
-
-		node = newp;
-		if (node != NULL &&
-		    (SYSCTL_VERS(node->sysctl_flags) < SYSCTL_VERS_1 ||
-		     newlen != sizeof(struct sysctlnode)))
-			return (EINVAL);
-
-		sz = 0;
-		for (ni = 0; ni < clen; ni++) {
-			memset(&buf[0], 0, sizeof(buf));
-			if (node != NULL &&
-			    node->sysctl_num != sysctl_usermib[ni].sysctl_num)
-				continue;
-			d1->descr_num = sysctl_usermib[ni].sysctl_num;
-			d1->descr_ver = sysctl_usermib[ni].sysctl_ver;
-			if (sysctl_usermib[ni].sysctl_desc == NULL)
-				d1->descr_len = 1;
-			else {
-				size_t dlen;
-				(void)strlcpy(d1->descr_str,
-					sysctl_usermib[ni].sysctl_desc,
-					sizeof(buf) - sizeof(*d1));
-				dlen = strlen(d1->descr_str) + 1;
-				_DIAGASSERT(__type_fit(uint32_t, dlen));
-				d1->descr_len = (uint32_t)dlen;
-			}
-			d = (size_t)__sysc_desc_adv(NULL, d1->descr_len);
-			if (d2 != NULL)
-				memcpy(d2, d1, d);
-			sz += d;
-			d2 = (struct sysctldesc *)(void *)((char *)d2 + d);
-			if (node != NULL)
-				break;
-		}
-		*oldlenp = sz;
-		if (sz == 0 && node != NULL)
-			return (ENOENT);
-		return (0);
-
-	}
-
-	/*
-	 * none of these nodes are writable
-	 */
-	if (newp != NULL || newlen != 0)
-		return (EPERM);
-	
-	node = &sysctl_usermib[0];
-	for (ni = 0; ni	< clen; ni++)
-		if (name[0] == node[ni].sysctl_num)
-			break;
-	if (ni == clen)
-		return (EOPNOTSUPP);
-
-	node = &node[ni];
-	if (node->sysctl_flags & CTLFLAG_IMMEDIATE) {
-		switch (SYSCTL_TYPE(node->sysctl_flags)) {
-		case CTLTYPE_INT:
-			newp = &node->sysctl_idata;
-			break;
-		case CTLTYPE_QUAD:
-			newp = &node->sysctl_qdata;
-			break;
-		default:
-			return (EINVAL);
-		}
-	}
-	else
-		newp = node->sysctl_data;
-
-	l = MIN(l, node->sysctl_size);
-	if (oldp != NULL)
-		memcpy(oldp, newp, l);
-	*oldlenp = node->sysctl_size;
-
-	return (0);
-}
-
-static size_t
-__cvt_node_out(uint v, const struct sysctlnode *n, void **o, size_t *l)
-{
-	const void *src = n;
-	size_t sz;
-
-	switch (v) {
-#if (SYSCTL_VERSION != SYSCTL_VERS_1)
-#error __cvt_node_out: no support for SYSCTL_VERSION
-#endif /* (SYSCTL_VERSION != SYSCTL_VERS_1) */
-
-	case SYSCTL_VERSION:
-		sz = sizeof(struct sysctlnode);
-		break;
-
-	default:
-		sz = 0;
-		break;
-	}
-
-	if (sz > 0 && *o != NULL && *l >= sz) {
-		memcpy(*o, src, sz);
-		*o = sz + (caddr_t)*o;
-		*l -= sz;
-	}
-
-	return(sz);
-}
diff --git a/lib/libc/gen/sysctlbyname.c b/lib/libc/gen/sysctlbyname.c
deleted file mode 100644
index 0a6be7f32..000000000
--- a/lib/libc/gen/sysctlbyname.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: sysctlbyname.c,v 1.7 2010/12/13 23:10:13 pooka Exp $ */
-
-/*-
- * Copyright (c) 2003,2004 The NetBSD Foundation, Inc.
- *	All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Andrew Brown.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sysctlbyname.c,v 1.7 2010/12/13 23:10:13 pooka Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifndef RUMP_ACTION
-#include "namespace.h"
-#endif
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#ifdef RUMP_ACTION
-#include <rump/rump_syscalls.h>
-#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
-#else
-#ifdef __weak_alias
-__weak_alias(sysctlbyname,_sysctlbyname)
-#endif
-#endif
-
-/*
- * trivial sysctlbyname() function for the "lazy".
- */
-int
-sysctlbyname(const char *gname, void *oldp, size_t *oldlenp,
-	     const void *newp, size_t newlen)
-{
-	int name[CTL_MAXNAME], rc;
-	u_int namelen;
-
-	rc = sysctlgetmibinfo(gname, &name[0], &namelen, NULL, NULL, NULL,
-			      SYSCTL_VERSION);
-	if (rc == 0)
-		rc = sysctl(&name[0], namelen, oldp, oldlenp, newp, newlen);
-	return (rc);
-}
diff --git a/lib/libc/gen/sysctlgetmibinfo.c b/lib/libc/gen/sysctlgetmibinfo.c
deleted file mode 100644
index 19d94f545..000000000
--- a/lib/libc/gen/sysctlgetmibinfo.c
+++ /dev/null
@@ -1,611 +0,0 @@
-/*	$NetBSD: sysctlgetmibinfo.c,v 1.11 2014/05/16 12:22:32 martin Exp $ */
-
-/*-
- * Copyright (c) 2003,2004 The NetBSD Foundation, Inc.
- *	All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Andrew Brown.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sysctlgetmibinfo.c,v 1.11 2014/05/16 12:22:32 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifndef RUMP_ACTION
-#include "namespace.h"
-#ifdef _REENTRANT
-#include "reentrant.h"
-#endif /* _REENTRANT */
-#endif /* RUMP_ACTION */
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef RUMP_ACTION
-#include <rump/rump_syscalls.h>
-#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
-#else
-#ifdef __weak_alias
-__weak_alias(__learn_tree,___learn_tree)
-__weak_alias(sysctlgetmibinfo,_sysctlgetmibinfo)
-#endif
-#endif
-
-/*
- * the place where we attach stuff we learn on the fly, not
- * necessarily used.
- */
-static struct sysctlnode sysctl_mibroot = {
-#if defined(lint)
-	/*
-	 * lint doesn't like my initializers
-	 */
-	0
-#else /* !lint */
-	.sysctl_flags = SYSCTL_VERSION|CTLFLAG_ROOT|CTLTYPE_NODE,
-	.sysctl_size = sizeof(struct sysctlnode),
-	.sysctl_name = "(root)",
-#endif /* !lint */
-};
-
-/*
- * routines to handle learning and cleanup
- */
-static int compar(const void *, const void *);
-static void free_children(struct sysctlnode *);
-static void relearnhead(void);
-
-/*
- * specifically not static since sysctl(8) "borrows" it.
- */
-int __learn_tree(int *, u_int, struct sysctlnode *);
-
-/*
- * for ordering nodes -- a query may or may not be given them in
- * numeric order
- */
-static int
-compar(const void *a, const void *b)
-{
-
-	return (((const struct sysctlnode *)a)->sysctl_num -
-		((const struct sysctlnode *)b)->sysctl_num);
-}
-
-/*
- * recursively nukes a branch or an entire tree from the given node
- */
-static void
-free_children(struct sysctlnode *rnode) 
-{
-	struct sysctlnode *node;
-
-	if (rnode == NULL ||
-	    SYSCTL_TYPE(rnode->sysctl_flags) != CTLTYPE_NODE ||
-	    rnode->sysctl_child == NULL)
-		return;
-
-	for (node = rnode->sysctl_child;
-	     node < &rnode->sysctl_child[rnode->sysctl_clen];
-	     node++) {
-		free_children(node);
-	}
-	free(rnode->sysctl_child);
-	rnode->sysctl_child = NULL;
-}
-
-/*
- * verifies that the head of the tree in the kernel is the same as the
- * head of the tree we already got, integrating new stuff and removing
- * old stuff, if it's not.
- */
-static void
-relearnhead(void)
-{
-	struct sysctlnode *h, *i, *o, qnode;
-	size_t si, so;
-	int rc, name;
-	size_t nlen, olen, ni, oi;
-	uint32_t t;
-
-	/*
-	 * if there's nothing there, there's no need to expend any
-	 * effort
-	 */
-	if (sysctl_mibroot.sysctl_child == NULL)
-		return;
-
-	/*
-	 * attempt to pull out the head of the tree, starting with the
-	 * size we have now, and looping if we need more (or less)
-	 * space
-	 */
-	si = 0;
-	so = sysctl_mibroot.sysctl_clen * sizeof(struct sysctlnode);
-	name = CTL_QUERY;
-	memset(&qnode, 0, sizeof(qnode));
-	qnode.sysctl_flags = SYSCTL_VERSION;
-	do {
-		si = so;
-		h = malloc(si);
-		rc = sysctl(&name, 1, h, &so, &qnode, sizeof(qnode));
-		if (rc == -1 && errno != ENOMEM)
-			return;
-		if (si < so)
-			free(h);
-	} while (si < so);
-
-	/*
-	 * order the new copy of the head
-	 */
-	nlen = so / sizeof(struct sysctlnode);
-	qsort(h, nlen, sizeof(struct sysctlnode), compar);
-
-	/*
-	 * verify that everything is the same.  if it is, we don't
-	 * need to do any more work here.
-	 */
-	olen = sysctl_mibroot.sysctl_clen;
-	rc = (nlen == olen) ? 0 : 1;
-	o = sysctl_mibroot.sysctl_child;
-	for (ni = 0; rc == 0 && ni < nlen; ni++) {
-		if (h[ni].sysctl_num != o[ni].sysctl_num ||
-		    h[ni].sysctl_ver != o[ni].sysctl_ver)
-			rc = 1;
-	}
-	if (rc == 0) {
-		free(h);
-		return;
-	}
-
-	/*
-	 * something changed.  h will become the new head, and we need
-	 * pull over any subtrees we already have if they're the same
-	 * version.
-	 */
-	i = h;
-	ni = oi = 0;
-	while (ni < nlen && oi < olen) {
-		/*
-		 * something was inserted or deleted
-		 */
-		if (SYSCTL_TYPE(i[ni].sysctl_flags) == CTLTYPE_NODE)
-			i[ni].sysctl_child = NULL;
-		if (i[ni].sysctl_num != o[oi].sysctl_num) {
-			if (i[ni].sysctl_num < o[oi].sysctl_num) {
-				ni++;
-			}
-			else {
-				free_children(&o[oi]);
-				oi++;
-			}
-			continue;
-		}
-
-		/*
-		 * same number, but different version, so throw away
-		 * any accumulated children
-		 */
-		if (i[ni].sysctl_ver != o[oi].sysctl_ver)
-			free_children(&o[oi]);
-
-		/*
-		 * this node is the same, but we only need to
-		 * move subtrees.
-		 */
-		else if (SYSCTL_TYPE(i[ni].sysctl_flags) == CTLTYPE_NODE) {	
-			/*
-			 * move subtree to new parent
-			 */
-			i[ni].sysctl_clen = o[oi].sysctl_clen;
-			i[ni].sysctl_csize = o[oi].sysctl_csize;
-			i[ni].sysctl_child = o[oi].sysctl_child;
-			/*
-			 * reparent inherited subtree
-			 */
-			for (t = 0;
-			     i[ni].sysctl_child != NULL &&
-				     t < i[ni].sysctl_clen;
-			     t++)
-				i[ni].sysctl_child[t].sysctl_parent = &i[ni];
-		}
-		ni++;
-		oi++;
-	}
-
-	/*
-	 * left over new nodes need to have empty subtrees cleared
-	 */
-	while (ni < nlen) {
-		if (SYSCTL_TYPE(i[ni].sysctl_flags) == CTLTYPE_NODE)
-			i[ni].sysctl_child = NULL;
-		ni++;
-	}
-
-	/*
-	 * left over old nodes need to be cleaned out
-	 */
-	while (oi < olen) {
-		free_children(&o[oi]);
-		oi++;
-	}
-
-	/*
-	 * pop new head in
-	 */
-	_DIAGASSERT(__type_fit(uint32_t, nlen));
-	sysctl_mibroot.sysctl_csize =
-	    sysctl_mibroot.sysctl_clen = (uint32_t)nlen;
-	sysctl_mibroot.sysctl_child = h;
-	free(o);
-}
-
-/*
- * sucks in the children at a given level and attaches it to the tree.
- */
-int
-__learn_tree(int *name, u_int namelen, struct sysctlnode *pnode)
-{
-	struct sysctlnode qnode;
-	uint32_t rc;
-	size_t sz;
-
-	if (pnode == NULL)
-		pnode = &sysctl_mibroot;
-	if (SYSCTL_TYPE(pnode->sysctl_flags) != CTLTYPE_NODE) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (pnode->sysctl_child != NULL)
-		return (0);
-
-	if (pnode->sysctl_clen == 0)
-		sz = SYSCTL_DEFSIZE * sizeof(struct sysctlnode);
-	else
-		sz = pnode->sysctl_clen * sizeof(struct sysctlnode);
-	pnode->sysctl_child = malloc(sz);
-	if (pnode->sysctl_child == NULL)
-		return (-1);
-
-	name[namelen] = CTL_QUERY;
-	pnode->sysctl_clen = 0;
-	pnode->sysctl_csize = 0;
-	memset(&qnode, 0, sizeof(qnode));
-	qnode.sysctl_flags = SYSCTL_VERSION;
-	rc = sysctl(name, namelen + 1, pnode->sysctl_child, &sz,
-		    &qnode, sizeof(qnode));
-	if (sz == 0) {
-		free(pnode->sysctl_child);
-		pnode->sysctl_child = NULL;
-		return (rc);
-	}
-	if (rc) {
-		free(pnode->sysctl_child);
-		pnode->sysctl_child = NULL;
-		if ((sz % sizeof(struct sysctlnode)) != 0)
-			errno = EINVAL;
-		if (errno != ENOMEM)
-			return (rc);
-	}
-
-	if (pnode->sysctl_child == NULL) {
-		pnode->sysctl_child = malloc(sz);
-		if (pnode->sysctl_child == NULL)
-			return (-1);
-
-		rc = sysctl(name, namelen + 1, pnode->sysctl_child, &sz,
-			    &qnode, sizeof(qnode));
-		if (rc) {
-			free(pnode->sysctl_child);
-			pnode->sysctl_child = NULL;
-			return (rc);
-		}
-	}
-
-	/*
-	 * how many did we get?
-	 */
-	sz /= sizeof(struct sysctlnode);
-	pnode->sysctl_csize = pnode->sysctl_clen = (uint32_t)sz;
-	if (pnode->sysctl_clen != sz) {
-		free(pnode->sysctl_child);
-		pnode->sysctl_child = NULL;
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/*
-	 * you know, the kernel doesn't really keep them in any
-	 * particular order...just like entries in a directory
-	 */
-	qsort(pnode->sysctl_child, pnode->sysctl_clen, 
-	    sizeof(struct sysctlnode), compar);
-
-	/*
-	 * rearrange parent<->child linkage
-	 */
-	for (rc = 0; rc < pnode->sysctl_clen; rc++) {
-		pnode->sysctl_child[rc].sysctl_parent = pnode;
-		if (SYSCTL_TYPE(pnode->sysctl_child[rc].sysctl_flags) ==
-		    CTLTYPE_NODE) {
-			/*
-			 * these nodes may have children, but we
-			 * haven't discovered that yet.
-			 */
-			pnode->sysctl_child[rc].sysctl_child = NULL;
-		}
-		pnode->sysctl_child[rc].sysctl_desc = NULL;
-	}
-
-	return (0);
-}
-
-/*
- * that's "given name" as a string, the integer form of the name fit
- * to be passed to sysctl(), "canonicalized name" (optional), and a
- * pointer to the length of the integer form.  oh, and then a pointer
- * to the node, in case you (the caller) care.  you can leave them all
- * NULL except for gname, though that might be rather pointless,
- * unless all you wanna do is verify that a given name is acceptable.
- *
- * returns either 0 (everything was fine) or -1 and sets errno
- * accordingly.  if errno is set to EAGAIN, we detected a change to
- * the mib while parsing, and you should try again.  in the case of an
- * invalid node name, cname will be set to contain the offending name.
- */
-#ifdef _REENTRANT
-static mutex_t sysctl_mutex = MUTEX_INITIALIZER;
-static int sysctlgetmibinfo_unlocked(const char *, int *, u_int *, char *,
-				     size_t *, struct sysctlnode **, int);
-#endif /* __REENTRANT */
-
-int
-sysctlgetmibinfo(const char *gname, int *iname, u_int *namelenp,
-		 char *cname, size_t *csz, struct sysctlnode **rnode, int v)
-#ifdef _REENTRANT
-{
-	int rc;
-
-	mutex_lock(&sysctl_mutex);
-	rc = sysctlgetmibinfo_unlocked(gname, iname, namelenp, cname, csz,
-				       rnode, v);
-	mutex_unlock(&sysctl_mutex);
-
-	return (rc);
-}
-
-static int
-sysctlgetmibinfo_unlocked(const char *gname, int *iname, u_int *namelenp,
-			  char *cname, size_t *csz, struct sysctlnode **rnode,
-			  int v)
-#endif /* _REENTRANT */
-{
-	struct sysctlnode *pnode, *node;
-	int name[CTL_MAXNAME], n, haven;
-	u_int ni, nl;
-	intmax_t q;
-	char sep[2], token[SYSCTL_NAMELEN],
-		pname[SYSCTL_NAMELEN * CTL_MAXNAME + CTL_MAXNAME];
-	const char *piece, *dot;
-	char *t;
-	size_t l;
-
-	if (rnode != NULL) {
-		if (*rnode == NULL) {
-			/* XXX later deal with dealing back a sub version */
-			if (v != SYSCTL_VERSION)
-				return (EINVAL);
-
-			pnode = &sysctl_mibroot;
-		}
-		else {
-			/* this is just someone being silly */
-			if (SYSCTL_VERS((*rnode)->sysctl_flags) != (uint32_t)v)
-				return (EINVAL);
-
-			/* XXX later deal with other people's trees */
-			if (SYSCTL_VERS((*rnode)->sysctl_flags) !=
-			    SYSCTL_VERSION)
-				return (EINVAL);
-
-			pnode = *rnode;
-		}
-	}
-	else
-		pnode = &sysctl_mibroot;
-
-	if (pnode == &sysctl_mibroot)
-		relearnhead();
-
-	nl = ni = 0;
-	token[0] = '\0';
-	pname[0] = '\0';
-	node = NULL;
-
-	/*
-	 * default to using '.' as the separator, but allow '/' as
-	 * well, and then allow a leading separator
-	 */
-	if ((dot = strpbrk(gname, "./")) == NULL)
-		sep[0] = '.';
-	else
-		sep[0] = dot[0];
-	sep[1] = '\0';
-	if (gname[0] == sep[0]) {
-		strlcat(pname, sep, sizeof(pname));
-		gname++;
-	}
-
-#define COPY_OUT_DATA(t, c, cs, nlp, l) do {			\
-		if ((c) != NULL && (cs) != NULL)		\
-			*(cs) = strlcpy((c), (t), *(cs));	\
-		else if ((cs) != NULL)				\
-			*(cs) = strlen(t) + 1;			\
-		if ((nlp) != NULL)				\
-			*(nlp) = (l);				\
-	} while (/*CONSTCOND*/0)
-
-	piece = gname;
-	while (piece != NULL && *piece != '\0') {
-		/*
-		 * what was i looking for?
-		 */
-		dot = strchr(piece, sep[0]);
-		if (dot == NULL) {
-			l = strlcpy(token, piece, sizeof(token));
-			if (l > sizeof(token)) {
-				COPY_OUT_DATA(piece, cname, csz, namelenp, nl);
-				errno = ENAMETOOLONG;
-				return (-1);
-			}
-		}
-		else if (dot - piece > (intptr_t)(sizeof(token) - 1)) {
-			COPY_OUT_DATA(token, cname, csz, namelenp, nl);
-			errno = ENAMETOOLONG;
-			return (-1);
-		}
-		else {
-			strncpy(token, piece, (size_t)(dot - piece));
-			token[dot - piece] = '\0';
-		}
-
-		/*
-		 * i wonder if this "token" is an integer?
-		 */
-		errno = 0;
-		q = strtoimax(token, &t, 0);
-		n = (int)q;
-		if (errno != 0 || *t != '\0')
-			haven = 0;
-		else if (q < INT_MIN || q > UINT_MAX)
-			haven = 0;
-		else
-			haven = 1;
-
-		/*
-		 * make sure i have something to look at
-		 */
-		if (SYSCTL_TYPE(pnode->sysctl_flags) != CTLTYPE_NODE) {
-			if (haven && nl > 0) {
-				strlcat(pname, sep, sizeof(pname));
-				goto just_numbers;
-			}
-			COPY_OUT_DATA(token, cname, csz, namelenp, nl);
-			errno = ENOTDIR;
-			return (-1);
-		}
-		if (pnode->sysctl_child == NULL) {
-			if (__learn_tree(name, nl, pnode) == -1) {
-				COPY_OUT_DATA(token, cname, csz, namelenp, nl);
-				return (-1);
-			}
-		}
-		node = pnode->sysctl_child;
-		if (node == NULL) {
-			COPY_OUT_DATA(token, cname, csz, namelenp, nl);
-			errno = ENOENT;
-			return (-1);
-		}
-
-		/*
-		 * now...is it there?
-		 */
-		for (ni = 0; ni < pnode->sysctl_clen; ni++)
-			if ((haven && ((n == node[ni].sysctl_num) ||
-			    (node[ni].sysctl_flags & CTLFLAG_ANYNUMBER))) ||
-			    strcmp(token, node[ni].sysctl_name) == 0)
-				break;
-		if (ni >= pnode->sysctl_clen) {
-			COPY_OUT_DATA(token, cname, csz, namelenp, nl);
-			errno = ENOENT;
-			return (-1);
-		}
-
-		/*
-		 * ah...it is.
-		 */
-		pnode = &node[ni];
-		if (nl > 0)
-			strlcat(pname, sep, sizeof(pname));
-		if (haven && n != pnode->sysctl_num) {
- just_numbers:
-			strlcat(pname, token, sizeof(pname));
-			name[nl] = n;
-		}
-		else {
-			strlcat(pname, pnode->sysctl_name, sizeof(pname));
-			name[nl] = pnode->sysctl_num;
-		}
-		piece = (dot != NULL) ? dot + 1 : NULL;
-		nl++;
-		if (nl == CTL_MAXNAME) {
-			COPY_OUT_DATA(token, cname, csz, namelenp, nl);
-			errno = ERANGE;
-			return (-1);
-		}
-	}
-
-	if (nl == 0) {
-		if (namelenp != NULL)
-			*namelenp = 0;
-		errno = EINVAL;
-		return (-1);
-	}
-
-	COPY_OUT_DATA(pname, cname, csz, namelenp, nl);
-	if (iname != NULL && namelenp != NULL)
-		memcpy(iname, &name[0], MIN(nl, *namelenp) * sizeof(int));
-	if (namelenp != NULL)
-		*namelenp = nl;
-	if (rnode != NULL) {
-		if (*rnode != NULL)
-			/*
-			 * they gave us a private tree to work in, so
-			 * we give back a pointer into that private
-			 * tree
-			 */
-			*rnode = pnode;
-		else {
-			/*
-			 * they gave us a place to put the node data,
-			 * so give them a copy
-			 */
-			*rnode = malloc(sizeof(struct sysctlnode));
-			if (*rnode != NULL) {
-				**rnode = *pnode;
-				(*rnode)->sysctl_child = NULL;
-				(*rnode)->sysctl_parent = NULL;
-			}
-		}
-	}
-
-	return (0);
-}
diff --git a/lib/libc/gen/sysctlnametomib.c b/lib/libc/gen/sysctlnametomib.c
deleted file mode 100644
index 735f4f0d0..000000000
--- a/lib/libc/gen/sysctlnametomib.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: sysctlnametomib.c,v 1.7 2012/03/13 21:13:37 christos Exp $ */
-
-/*-
- * Copyright (c) 2003,2004 The NetBSD Foundation, Inc.
- *	All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Andrew Brown.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sysctlnametomib.c,v 1.7 2012/03/13 21:13:37 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifndef RUMP_ACTION
-#include "namespace.h"
-#endif
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <assert.h>
-
-#ifdef RUMP_ACTION
-#include <rump/rump_syscalls.h>
-#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
-#else
-#ifdef __weak_alias
-__weak_alias(sysctlnametomib,_sysctlnametomib)
-#endif
-#endif /* RUMP_ACTION */
-
-/*
- * freebsd compatible sysctlnametomib() function, implemented as an
- * extremely thin wrapper around sysctlgetmibinfo().  i think the use
- * of size_t as the third argument is erroneous, but what can we do
- * about that?
- */
-int
-sysctlnametomib(const char *gname, int *iname, size_t *namelenp)
-{
-	u_int unamelen;
-	int rc;
-
-	_DIAGASSERT(__type_fit(u_int, *namelenp));
-	unamelen = (u_int)*namelenp;
-	rc = sysctlgetmibinfo(gname, iname, &unamelen, NULL, NULL, NULL,
-			      SYSCTL_VERSION);
-	*namelenp = unamelen;
-
-	return (rc);
-}
diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3
deleted file mode 100644
index 1b7baeda6..000000000
--- a/lib/libc/gen/syslog.3
+++ /dev/null
@@ -1,517 +0,0 @@
-.\"	$NetBSD: syslog.3,v 1.29 2011/07/25 19:42:50 njoly Exp $
-.\"	$OpenBSD: syslog.3,v 1.25 2005/07/22 03:16:58 jaredy Exp $
-.\"
-.\" Copyright (c) 1985, 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. 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.
-.\"
-.\"     @(#)syslog.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd May 3, 2010
-.Dt SYSLOG 3
-.Os
-.Sh NAME
-.Nm syslog ,
-.Nm syslog_r ,
-.Nm vsyslog ,
-.Nm vsyslog_r ,
-.Nm syslogp ,
-.Nm syslogp_r ,
-.Nm vsyslogp ,
-.Nm vsyslogp_r ,
-.Nm openlog ,
-.Nm openlog_r ,
-.Nm closelog ,
-.Nm closelog_r ,
-.Nm setlogmask ,
-.Nm setlogmask_r
-.Nd control system log
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In syslog.h
-.Ft void
-.Fn syslog "int priority" "const char *message" "..."
-.Ft void
-.Fn syslog_r "int priority" "struct syslog_data *data" "const char *message" "..."
-.Ft void
-.Fn syslogp "int priority" "const char *msgid" "const char *sdfmt" "const char *message" "..."
-.Ft void
-.Fn syslogp_r "int priority" "struct syslog_data *data" "const char *msgid" "const char *sdfmt" "const char *message" "..."
-.\" .Ft void
-.\" .Fn syslog_ss "int priority" "struct syslog_data *data" "const char *message" "..."
-.Ft void
-.Fn openlog "const char *ident" "int logopt" "int facility"
-.Ft void
-.Fn openlog_r "const char *ident" "int logopt" "int facility" "struct syslog_data *data"
-.Ft void
-.Fn closelog void
-.Ft void
-.Fn closelog_r "struct syslog_data *data"
-.Ft int
-.Fn setlogmask "int maskpri"
-.Ft int
-.Fn setlogmask_r "int maskpri" "struct syslog_data *data"
-.In stdarg.h
-.Ft void
-.Fn vsyslog "int priority" "const char *message" "va_list args"
-.Ft void
-.Fn vsyslog_r "int priority" "struct syslog_data *data" "const char *message" "va_list args"
-.Ft void
-.Fn vsyslogp "int priority" "const char *msgid" "const char *sdfmt" "const char *message" "va_list args"
-.Ft void
-.Fn vsyslogp_r "int priority" "struct syslog_data *data" "const char *msgid" "const char *sdfmt" "const char *message" "va_list args"
-.\" .Ft void
-.\" .Fn vsyslog_ss "int priority" "struct syslog_data *data" "const char *message" "va_list args"
-.Sh DESCRIPTION
-The
-.Fn syslog
-function
-writes
-.Fa message
-to the system message logger.
-The message is then written to the system console, log files,
-logged-in users, or forwarded to other machines as appropriate (see
-.Xr syslogd 8 ) .
-.Pp
-The message is identical to a
-.Xr printf 3
-format string, except that
-.Ql %m
-is replaced by the current error
-message.
-(As denoted by the global variable
-.Va errno ;
-see
-.Xr strerror 3 . )
-A trailing newline is added if none is present.
-.\" shouldn't the newline statement be removed?
-.\" when logging through a socket a newline is
-.\" not added nor is it required. -- ms
-.Pp
-The
-.Fn syslog_r
-function is a multithread-safe version of the
-.Fn syslog
-function.
-It takes a pointer to a
-.Fa syslog_data
-structure which is used to store
-information.
-This parameter must be initialized before
-.Fn syslog_r
-is called.
-The
-.Dv SYSLOG_DATA_INIT
-constant is used for this purpose.
-The
-.Fa syslog_data
-structure and the
-.Dv SYSLOG_DATA_INIT
-constant are defined as:
-.Bd -literal -offset indent
-struct syslog_data {
-        int             log_file;
-        int             connected;
-        int             opened;
-        int             log_stat;
-        const char     *log_tag;
-        int             log_fac;
-        int             log_mask;
-};
-
-#define SYSLOG_DATA_INIT { \e
-    .log_file = -1, \e
-    .log_fac = LOG_USER, \e
-    .log_mask = 0xff, \e
-}
-.Ed
-.Pp
-The structure is composed of the following elements:
-.Bl -tag -width connected -offset indent
-.It Va log_file
-contains the file descriptor of the file where the message is logged
-.It Va connected
-indicates if connect has been done
-.It Va opened
-indicates if
-.Fn openlog_r
-has been called
-.It Va log_stat
-status bits, set by
-.Fn openlog_r
-.It Va log_tag
-string to tag the entry with
-.It Va log_fac
-facility code
-.It Va log_mask
-mask of priorities to be logged
-.El
-.\" .Pp
-.\" The
-.\" .Fn syslog_ss
-.\" is the async-signal-safe version of
-.\" .Fn syslog_r
-.\" and is also multithread-safe.
-.\" It has the following limitations:
-.\" .Bl -enum -offset indent
-.\" .It
-.\" The format string cannot contain multi-byte character sequences.
-.\" .It
-.\" Floating point formats are not supported and print
-.\" .Dq UNK .
-.\" .It
-.\" The time of the event is not sent to
-.\" .Xr syslogd 8 .
-.\" .It
-.\" The error string in the %m format is not printed symbolically but as
-.\" .Dq Error %d .
-.\" .El
-.\" .Pp
-.\" For more information about async-signal-safe functions and signal handlers, see
-.\" .Xr signal 7 .
-.Pp
-The
-.Fn vsyslog
-function
-is an alternative form in which the arguments have already been captured
-using the variable-length argument facilities of
-.Xr stdarg 3 .
-.Pp
-The
-.Fn syslogp
-variants take additional arguments which correspond to new fields in the
-syslog-protocol message format.
-All three arguments are evaluated as
-.Xr printf 3
-format strings and any of them can be
-.Dv NULL .
-This enables applications to use message IDs, structured data, and UTF-8 encoded
-content in messages.
-.Pp
-The message is tagged with
-.Fa priority .
-Priorities are encoded as a
-.Fa facility
-and a
-.Em level .
-The facility describes the part of the system
-generating the message.
-The level is selected from the following
-.Em ordered
-(high to low) list:
-.Bl -tag -width LOG_AUTHPRIV
-.It Dv LOG_EMERG
-A panic condition.
-This is normally broadcast to all users.
-.It Dv LOG_ALERT
-A condition that should be corrected immediately, such as a corrupted
-system database.
-.It Dv LOG_CRIT
-Critical conditions, e.g., hard device errors.
-.It Dv LOG_ERR
-Errors.
-.It Dv LOG_WARNING
-Warning messages.
-.It Dv LOG_NOTICE
-Conditions that are not error conditions,
-but should possibly be handled specially.
-.It Dv LOG_INFO
-Informational messages.
-.It Dv LOG_DEBUG
-Messages that contain information
-normally of use only when debugging a program.
-.El
-.Pp
-The
-.Fn vsyslog_r
-is used the same way as
-.Fn vsyslog
-except that it takes an additional pointer to a
-.Fa syslog_data
-structure.
-It is a multithread-safe version of the
-.Fn vsyslog
-function described above.
-.\" The
-.\" .Fn vsyslog_ss
-.\" is the async-signal-safe version of
-.\" .Fn vsyslog_r ,
-.\" is also multithread-safe, and has the same limitations as
-.\" .Fn syslog_ss .
-.Pp
-The
-.Fn openlog
-function
-provides for more specialized processing of the messages sent
-by
-.Fn syslog
-and
-.Fn vsyslog .
-The parameter
-.Fa ident
-is a string that will be prepended to every message.
-The
-.Fa logopt
-argument
-is a bit field specifying logging options, which is formed by
-.Tn OR Ns 'ing
-one or more of the following values:
-.Bl -tag -width LOG_AUTHPRIV
-.It Dv LOG_CONS
-If
-.Fn syslog
-cannot pass the message to
-.Xr syslogd 8
-it will attempt to write the message to the console
-.Pq Dq Pa /dev/console .
-.It Dv LOG_NDELAY
-Open the connection to
-.Xr syslogd 8
-immediately.
-Normally the open is delayed until the first message is logged.
-Useful for programs that need to manage the order in which file
-descriptors are allocated.
-.It Dv LOG_PERROR
-Write the message to standard error output as well to the system log.
-.It Dv LOG_PID
-Log the process id with each message: useful for identifying
-instantiations of daemons.
-(This PID is placed within brackets
-between the ident and the message.)
-.El
-.Pp
-The
-.Fa facility
-parameter encodes a default facility to be assigned to all messages
-that do not have an explicit facility encoded:
-.Bl -tag -width LOG_AUTHPRIV
-.It Dv LOG_AUTH
-The authorization system:
-.Xr login 1 ,
-.Xr su 1 ,
-.Xr getty 8 ,
-etc.
-.It Dv LOG_AUTHPRIV
-The same as
-.Dv LOG_AUTH ,
-but logged to a file readable only by
-selected individuals.
-.It Dv LOG_CRON
-The cron daemon:
-.Xr cron 8 .
-.It Dv LOG_DAEMON
-System daemons, such as
-.Xr routed 8 ,
-that are not provided for explicitly by other facilities.
-.It Dv LOG_FTP
-The file transfer protocol daemon:
-.Xr ftpd 8 .
-.It Dv LOG_KERN
-Messages generated by the kernel.
-These cannot be generated by any user processes.
-.It Dv LOG_LPR
-The line printer spooling system:
-.Xr lpr 1 ,
-.Xr lpc 8 ,
-.Xr lpd 8 ,
-etc.
-.It Dv LOG_MAIL
-The mail system.
-.It Dv LOG_NEWS
-The network news system.
-.It Dv LOG_SYSLOG
-Messages generated internally by
-.Xr syslogd 8 .
-.It Dv LOG_USER
-Messages generated by random user processes.
-This is the default facility identifier if none is specified.
-.It Dv LOG_UUCP
-The uucp system.
-.It Dv LOG_LOCAL0
-Reserved for local use.
-Similarly for
-.Dv LOG_LOCAL1
-through
-.Dv LOG_LOCAL7 .
-.El
-.Pp
-The
-.Fn openlog_r
-function is the multithread-safe version of the
-.Fn openlog
-function.
-It takes an additional pointer to a
-.Fa syslog_data
-structure.
-This function must be used in conjunction with the other
-multithread-safe functions.
-.Pp
-The
-.Fn closelog
-function
-can be used to close the log file.
-.Pp
-The
-.Fn closelog_r
-does the same thing as
-.Xr closelog 3
-but in a multithread-safe way and takes an additional
-pointer to a
-.Fa syslog_data
-structure.
-.Pp
-The
-.Fn setlogmask
-function
-sets the log priority mask to
-.Fa maskpri
-and returns the previous mask.
-Calls to
-.Fn syslog
-with a priority not set in
-.Fa maskpri
-are rejected.
-The mask for an individual priority
-.Fa pri
-is calculated by the macro
-.Fn LOG_MASK pri ;
-the mask for all priorities up to and including
-.Fa toppri
-is given by the macro
-.Fn LOG_UPTO toppri .
-The default allows all priorities to be logged.
-.Pp
-The
-.Fn setlogmask_r
-function is the multithread-safe version of
-.Fn setlogmask .
-It takes an additional pointer to a
-.Fa syslog_data
-structure.
-.Sh RETURN VALUES
-The routines
-.Fn closelog ,
-.Fn closelog_r ,
-.Fn openlog ,
-.Fn openlog_r ,
-.Fn syslog ,
-.Fn syslog_r ,
-.Fn vsyslog ,
-.Fn vsyslog_r ,
-.Fn syslogp ,
-.Fn syslogp_r ,
-.Fn vsyslogp ,
-and
-.Fn vsyslogp_r
-return no value.
-.Pp
-The routines
-.Fn setlogmask
-and
-.Fn setlogmask_r
-always return the previous log mask level.
-.Sh EXAMPLES
-.Bd -literal -offset indent -compact
-syslog(LOG_ALERT, "who: internal error 23");
-
-openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP);
-
-setlogmask(LOG_UPTO(LOG_ERR));
-
-syslog(LOG_INFO, "Connection from host %d", CallingHost);
-
-syslog(LOG_INFO|LOG_LOCAL2, "foobar error: %m");
-
-syslogp(LOG_INFO|LOG_LOCAL2, NULL, NULL, "foobar error: %m");
-
-syslogp(LOG_INFO, "ID%d", "[meta language=\e"en-US\e"]",
-        "event: %s", 42, EventDescription);
-.Ed
-.Pp
-For the multithread-safe functions:
-.Bd -literal -offset indent
-struct syslog_data sdata = SYSLOG_DATA_INIT;
-
-syslog_r(LOG_INFO|LOG_LOCAL2, \*[Am]sdata, "foobar error: %m");
-.Ed
-.Sh SEE ALSO
-.Xr logger 1 ,
-.Xr syslogd 8
-.Rs
-.%R RFC
-.%N 3164
-.%D August 2001
-.%T The BSD syslog Protocol
-.Re
-.Rs
-.%R Internet-Draft
-.%N draft-ietf-syslog-protocol-23
-.%D September 2007
-.%T The syslog Protocol
-.Re
-.Sh HISTORY
-These non-multithread-safe functions appeared in
-.Bx 4.2 .
-The multithread-safe functions appeared in
-.Ox 3.1
-and then in
-.Nx 4.0 .
-The async-signal-safe functions appeared in
-.Nx 4.0 .
-The syslog-protocol functions appeared in
-.Nx 5.0 .
-.Sh CAVEATS
-It is important never to pass a string with user-supplied data as a
-format without using
-.Ql %s .
-An attacker can put format specifiers in the string to mangle your stack,
-leading to a possible security hole.
-This holds true even if you have built the string
-.Dq by hand
-using a function like
-.Fn snprintf ,
-as the resulting string may still contain user-supplied conversion specifiers
-for later interpolation by
-.Fn syslog .
-.Pp
-Always be sure to use the proper secure idiom:
-.Bd -literal -offset indent
-syslog(priority, "%s", string);
-.Ed
-.Pp
-With
-.Fn syslogp
-the caller is responsible to use the right formatting for the message fields.
-A
-.Fa msgid
-must only contain up to 32 ASCII characters.
-A
-.Fa sdfmt
-has strict rules for paranthesis and character quoting.
-If the
-.Fa msgfmt
-contains UTF-8 characters, then it has to start with a Byte Order Mark.
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
deleted file mode 100644
index 5ece67ddd..000000000
--- a/lib/libc/gen/syslog.c
+++ /dev/null
@@ -1,586 +0,0 @@
-/*	$NetBSD: syslog.c,v 1.54 2014/09/18 13:58:20 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)syslog.c	8.5 (Berkeley) 4/29/95";
-#else
-__RCSID("$NetBSD: syslog.c,v 1.54 2014/09/18 13:58:20 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/syslog.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <netdb.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include "reentrant.h"
-#include "extern.h"
-
-#ifdef __weak_alias
-__weak_alias(closelog,_closelog)
-__weak_alias(openlog,_openlog)
-__weak_alias(setlogmask,_setlogmask)
-__weak_alias(syslog,_syslog)
-__weak_alias(vsyslog,_vsyslog)
-__weak_alias(syslogp,_syslogp)
-__weak_alias(vsyslogp,_vsyslogp)
-#endif
-
-static struct syslog_data sdata = SYSLOG_DATA_INIT;
-
-static void	openlog_unlocked_r(const char *, int, int,
-    struct syslog_data *);
-static void	disconnectlog_r(struct syslog_data *);
-static void	connectlog_r(struct syslog_data *);
-
-#define LOG_SIGNAL_SAFE	(int)0x80000000
-
-
-#ifdef _REENTRANT
-static mutex_t	syslog_mutex = MUTEX_INITIALIZER;
-#endif
-
-/*
- * syslog, vsyslog --
- *	print message on log file; output is intended for syslogd(8).
- */
-void
-syslog(int pri, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vsyslog(pri, fmt, ap);
-	va_end(ap);
-}
-
-void
-vsyslog(int pri, const char *fmt, va_list ap)
-{
-	vsyslog_r(pri, &sdata, fmt, ap);
-}
-
-/*
- * syslogp, vsyslogp --
- *	like syslog but take additional arguments for MSGID and SD
- */
-void
-syslogp(int pri, const char *msgid, const char *sdfmt, const char *msgfmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, msgfmt);
-	vsyslogp(pri, msgid, sdfmt, msgfmt, ap);
-	va_end(ap);
-}
-
-void
-vsyslogp(int pri, const char *msgid, const char *sdfmt, const char *msgfmt, va_list ap)
-{
-	vsyslogp_r(pri, &sdata, msgid, sdfmt, msgfmt, ap);
-}
-
-void
-openlog(const char *ident, int logstat, int logfac)
-{
-	openlog_r(ident, logstat, logfac, &sdata);
-}
-
-void
-closelog(void)
-{
-	closelog_r(&sdata);
-}
-
-/* setlogmask -- set the log mask level */
-int
-setlogmask(int pmask)
-{
-	return setlogmask_r(pmask, &sdata);
-}
-
-/* Reentrant version of syslog, i.e. syslog_r() */
-
-void
-syslog_r(int pri, struct syslog_data *data, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vsyslog_r(pri, data, fmt, ap);
-	va_end(ap);
-}
-
-void
-syslogp_r(int pri, struct syslog_data *data, const char *msgid,
-	const char *sdfmt, const char *msgfmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, msgfmt);
-	vsyslogp_r(pri, data, msgid, sdfmt, msgfmt, ap);
-	va_end(ap);
-}
-
-void
-syslog_ss(int pri, struct syslog_data *data, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vsyslog_r(pri | LOG_SIGNAL_SAFE, data, fmt, ap);
-	va_end(ap);
-}
-
-void
-syslogp_ss(int pri, struct syslog_data *data, const char *msgid,
-	const char *sdfmt, const char *msgfmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, msgfmt);
-	vsyslogp_r(pri | LOG_SIGNAL_SAFE, data, msgid, sdfmt, msgfmt, ap);
-	va_end(ap);
-}
-
-void
-vsyslog_ss(int pri, struct syslog_data *data, const char *fmt, va_list ap)
-{
-	vsyslog_r(pri | LOG_SIGNAL_SAFE, data, fmt, ap);
-}
-
-void
-vsyslogp_ss(int pri, struct syslog_data *data, const char *msgid,
-	const char *sdfmt, const char *msgfmt, va_list ap)
-{
-	vsyslogp_r(pri | LOG_SIGNAL_SAFE, data, msgid, sdfmt, msgfmt, ap);
-}
-
-
-void
-vsyslog_r(int pri, struct syslog_data *data, const char *fmt, va_list ap)
-{
-	vsyslogp_r(pri, data, NULL, NULL, fmt, ap);
-}
-
-void
-vsyslogp_r(int pri, struct syslog_data *data, const char *msgid,
-	const char *sdfmt, const char *msgfmt, va_list ap)
-{
-	static const char BRCOSP[] = "]: ";
-	static const char CRLF[] = "\r\n";
-	size_t cnt, prlen, tries;
-	char ch, *p, *t;
-	struct timeval tv;
-	struct tm tmnow;
-	time_t now;
-	int fd, saved_errno;
-#define TBUF_LEN	2048
-#define FMT_LEN		1024
-#define MAXTRIES	10
-	char tbuf[TBUF_LEN], fmt_cpy[FMT_LEN], fmt_cat[FMT_LEN] = "";
-	size_t tbuf_left, fmt_left, msgsdlen;
-	char *fmt = fmt_cat;
-	int signal_safe = pri & LOG_SIGNAL_SAFE;
-	struct iovec iov[7];	/* prog + [ + pid + ]: + fmt + crlf */
-	int opened, iovcnt;
-
-	pri &= ~LOG_SIGNAL_SAFE;
-
-#define INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
-	/* Check for invalid bits. */
-	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
-		syslog_r(INTERNALLOG | signal_safe, data,
-		    "syslog_r: unknown facility/priority: %x", pri);
-		pri &= LOG_PRIMASK|LOG_FACMASK;
-	}
-
-	/* Check priority against setlogmask values. */
-	if (!(LOG_MASK(LOG_PRI(pri)) & data->log_mask))
-		return;
-
-	saved_errno = errno;
-
-	/* Set default facility if none specified. */
-	if ((pri & LOG_FACMASK) == 0)
-		pri |= data->log_fac;
-
-	/* Build the message. */
-	p = tbuf;
-	tbuf_left = TBUF_LEN;
-
-#define DEC()							\
-	do {							\
-		if (prlen >= tbuf_left)				\
-			prlen = tbuf_left - 1;			\
-		p += prlen;					\
-		tbuf_left -= prlen;				\
-	} while (/*CONSTCOND*/0)
-
-	prlen = snprintf_ss(p, tbuf_left, "<%d>1 ", pri);
-	DEC();
-
-	if (!signal_safe && (gettimeofday(&tv, NULL) != -1)) {
-		/* strftime() implies tzset(), localtime_r() doesn't. */
-		tzset();
-		now = (time_t) tv.tv_sec;
-		localtime_r(&now, &tmnow);
-
-		prlen = strftime(p, tbuf_left, "%FT%T", &tmnow);
-		DEC();
-		prlen = snprintf(p, tbuf_left, ".%06ld", (long)tv.tv_usec);
-		DEC();
-		prlen = strftime(p, tbuf_left-1, "%z", &tmnow);
-		/* strftime gives eg. "+0200", but we need "+02:00" */
-		if (prlen == 5) {
-			p[prlen+1] = p[prlen];
-			p[prlen]   = p[prlen-1];
-			p[prlen-1] = p[prlen-2];
-			p[prlen-2] = ':';
-			prlen += 1;
-		}
-	} else {
-		prlen = snprintf_ss(p, tbuf_left, "-");
-#if 0
-		/*
-		 * if gmtime_r() was signal-safe we could output
-		 * the UTC-time:
-		 */
-		gmtime_r(&now, &tmnow);
-		prlen = strftime(p, tbuf_left, "%FT%TZ", &tmnow);
-#endif
-	}
-
-#if !defined(__minix)
-	if (data == &sdata)
-		mutex_lock(&syslog_mutex);
-#endif /* !defined(__minix) */
-
-	if (data->log_hostname[0] == '\0' && gethostname(data->log_hostname,
-	    sizeof(data->log_hostname)) == -1) {
-		/* can this really happen? */
-		data->log_hostname[0] = '-';
-		data->log_hostname[1] = '\0';
-	}
-
-	DEC();
-	prlen = snprintf_ss(p, tbuf_left, " %s ", data->log_hostname);
-
-	if (data->log_tag == NULL)
-		data->log_tag = getprogname();
-
-	DEC();
-	prlen = snprintf_ss(p, tbuf_left, "%s ",
-	    data->log_tag ? data->log_tag : "-");
-
-#if !defined(__minix)
-	if (data == &sdata)
-		mutex_unlock(&syslog_mutex);
-#endif /* !defined(__minix) */
-
-	if (data->log_stat & (LOG_PERROR|LOG_CONS)) {
-		iovcnt = 0;
-		iov[iovcnt].iov_base = p;
-		iov[iovcnt].iov_len = prlen - 1;
-		iovcnt++;
-	}
-	DEC();
-
-	if (data->log_stat & LOG_PID) {
-		prlen = snprintf_ss(p, tbuf_left, "%d ", getpid());
-		if (data->log_stat & (LOG_PERROR|LOG_CONS)) {
-			iov[iovcnt].iov_base = __UNCONST("[");
-			iov[iovcnt].iov_len = 1;
-			iovcnt++;
-			iov[iovcnt].iov_base = p;
-			iov[iovcnt].iov_len = prlen - 1;
-			iovcnt++;
-			iov[iovcnt].iov_base = __UNCONST(BRCOSP);
-			iov[iovcnt].iov_len = 3;
-			iovcnt++;
-		}
-	} else {
-		prlen = snprintf_ss(p, tbuf_left, "- ");
-		if (data->log_stat & (LOG_PERROR|LOG_CONS)) {
-			iov[iovcnt].iov_base = __UNCONST(BRCOSP + 1);
-			iov[iovcnt].iov_len = 2;
-			iovcnt++;
-		}
-	}
-	DEC();
-
-	/*
-	 * concat the format strings, then use one vsnprintf()
-	 */
-	if (msgid != NULL && *msgid != '\0') {
-		strlcat(fmt_cat, msgid, FMT_LEN);
-		strlcat(fmt_cat, " ", FMT_LEN);
-	} else
-		strlcat(fmt_cat, "- ", FMT_LEN);
-
-	if (sdfmt != NULL && *sdfmt != '\0') {
-		strlcat(fmt_cat, sdfmt, FMT_LEN);
-	} else
-		strlcat(fmt_cat, "-", FMT_LEN);
-
-	if (data->log_stat & (LOG_PERROR|LOG_CONS))
-		msgsdlen = strlen(fmt_cat) + 1;
-	else
-		msgsdlen = 0;	/* XXX: GCC */
-
-	if (msgfmt != NULL && *msgfmt != '\0') {
-		strlcat(fmt_cat, " ", FMT_LEN);
-		strlcat(fmt_cat, msgfmt, FMT_LEN);
-	}
-
-	/*
-	 * We wouldn't need this mess if printf handled %m, or if
-	 * strerror() had been invented before syslog().
-	 */
-	for (t = fmt_cpy, fmt_left = FMT_LEN; (ch = *fmt) != '\0'; ++fmt) {
-		if (ch == '%' && fmt[1] == 'm') {
-			char ebuf[128];
-			++fmt;
-			if (signal_safe ||
-			    strerror_r(saved_errno, ebuf, sizeof(ebuf)))
-				prlen = snprintf_ss(t, fmt_left, "Error %d",
-				    saved_errno);
-			else
-				prlen = snprintf_ss(t, fmt_left, "%s", ebuf);
-			if (prlen >= fmt_left)
-				prlen = fmt_left - 1;
-			t += prlen;
-			fmt_left -= prlen;
-		} else if (ch == '%' && fmt[1] == '%' && fmt_left > 2) {
-			*t++ = '%';
-			*t++ = '%';
-			fmt++;
-			fmt_left -= 2;
-		} else {
-			if (fmt_left > 1) {
-				*t++ = ch;
-				fmt_left--;
-			}
-		}
-	}
-	*t = '\0';
-
-	if (signal_safe)
-		prlen = vsnprintf_ss(p, tbuf_left, fmt_cpy, ap);
-	else
-		prlen = vsnprintf(p, tbuf_left, fmt_cpy, ap);
-
-	if (data->log_stat & (LOG_PERROR|LOG_CONS)) {
-		iov[iovcnt].iov_base = p + msgsdlen;
-		iov[iovcnt].iov_len = prlen - msgsdlen;
-		iovcnt++;
-	}
-
-	DEC();
-	cnt = p - tbuf;
-
-	/* Output to stderr if requested. */
-	if (data->log_stat & LOG_PERROR) {
-		iov[iovcnt].iov_base = __UNCONST(CRLF + 1);
-		iov[iovcnt].iov_len = 1;
-		(void)writev(STDERR_FILENO, iov, iovcnt + 1);
-	}
-
-	/* Get connected, output the message to the local logger. */
-#if !defined(__minix)
-	if (data == &sdata)
-		mutex_lock(&syslog_mutex);
-#endif /* !defined(__minix) */
-	opened = !data->log_opened;
-	if (opened)
-		openlog_unlocked_r(data->log_tag, data->log_stat, 0, data);
-	connectlog_r(data);
-
-	/*
-	 * If the send() failed, there are two likely scenarios:
-	 *  1) syslogd was restarted
-	 *  2) /dev/log is out of socket buffer space
-	 * We attempt to reconnect to /dev/log to take care of
-	 * case #1 and keep send()ing data to cover case #2
-	 * to give syslogd a chance to empty its socket buffer.
-	 */
-	for (tries = 0; tries < MAXTRIES; tries++) {
-		if (send(data->log_file, tbuf, cnt, 0) != -1)
-			break;
-		if (errno != ENOBUFS) {
-			disconnectlog_r(data);
-			connectlog_r(data);
-		} else
-			(void)usleep(1);
-	}
-
-	/*
-	 * Output the message to the console; try not to block
-	 * as a blocking console should not stop other processes.
-	 * Make sure the error reported is the one from the syslogd failure.
-	 */
-	if (tries == MAXTRIES && (data->log_stat & LOG_CONS) &&
-	    (fd = open(_PATH_CONSOLE,
-		O_WRONLY | O_NONBLOCK | O_CLOEXEC, 0)) >= 0) {
-		iov[iovcnt].iov_base = __UNCONST(CRLF);
-		iov[iovcnt].iov_len = 2;
-		(void)writev(fd, iov, iovcnt + 1);
-		(void)close(fd);
-	}
-
-#if !defined(__minix)
-	if (data == &sdata)
-		mutex_unlock(&syslog_mutex);
-#endif /* !defined(__minix) */
-
-	if (data != &sdata && opened) {
-		/* preserve log tag */
-		const char *ident = data->log_tag;
-		closelog_r(data);
-		data->log_tag = ident;
-	}
-}
-
-static void
-disconnectlog_r(struct syslog_data *data)
-{
-	/*
-	 * If the user closed the FD and opened another in the same slot,
-	 * that's their problem.  They should close it before calling on
-	 * system services.
-	 */
-	if (data->log_file != -1) {
-		(void)close(data->log_file);
-		data->log_file = -1;
-	}
-	data->log_connected = 0;		/* retry connect */
-}
-
-static void
-connectlog_r(struct syslog_data *data)
-{
-	/* AF_UNIX address of local logger */
-	static const struct sockaddr_un sun = {
-		.sun_family = AF_LOCAL,
-		.sun_len = sizeof(sun),
-		.sun_path = _PATH_LOG,
-	};
-
-	if (data->log_file == -1 || fcntl(data->log_file, F_GETFL, 0) == -1) {
-		if ((data->log_file = socket(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC,
-		    0)) == -1)
-			return;
-		data->log_connected = 0;
-	}
-	if (!data->log_connected) {
-		if (connect(data->log_file,
-		    (const struct sockaddr *)(const void *)&sun,
-		    (socklen_t)sizeof(sun)) == -1)
-		{
-			(void)close(data->log_file);
-			data->log_file = -1;
-		} else
-			data->log_connected = 1;
-	}
-}
-
-static void
-openlog_unlocked_r(const char *ident, int logstat, int logfac,
-    struct syslog_data *data)
-{
-	if (ident != NULL)
-		data->log_tag = ident;
-	data->log_stat = logstat;
-	if (logfac != 0 && (logfac &~ LOG_FACMASK) == 0)
-		data->log_fac = logfac;
-
-	if (data->log_stat & LOG_NDELAY)	/* open immediately */
-		connectlog_r(data);
-
-	data->log_opened = 1;
-}
-
-void
-openlog_r(const char *ident, int logstat, int logfac, struct syslog_data *data)
-{
-#if !defined(__minix)
-	if (data == &sdata)
-		mutex_lock(&syslog_mutex);
-#endif /* !defined(__minix) */
-	openlog_unlocked_r(ident, logstat, logfac, data);
-#if !defined(__minix)
-	if (data == &sdata)
-		mutex_unlock(&syslog_mutex);
-#endif /* !defined(__minix) */
-}
-
-void
-closelog_r(struct syslog_data *data)
-{
-#if !defined(__minix)
-	if (data == &sdata)
-		mutex_lock(&syslog_mutex);
-#endif /* !defined(__minix) */
-	(void)close(data->log_file);
-	data->log_file = -1;
-	data->log_connected = 0;
-	data->log_tag = NULL;
-#if !defined(__minix)
-	if (data == &sdata)
-		mutex_unlock(&syslog_mutex);
-#endif /* !defined(__minix) */
-}
-
-int
-setlogmask_r(int pmask, struct syslog_data *data)
-{
-	int omask;
-
-	omask = data->log_mask;
-	if (pmask != 0)
-		data->log_mask = pmask;
-	return omask;
-}
diff --git a/lib/libc/gen/telldir.c b/lib/libc/gen/telldir.c
deleted file mode 100644
index 1bbe14390..000000000
--- a/lib/libc/gen/telldir.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*	$NetBSD: telldir.c,v 1.20 2013/03/06 11:27:28 yamt Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)telldir.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: telldir.c,v 1.20 2013/03/06 11:27:28 yamt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include "extern.h"
-#include <sys/param.h>
-
-#include <assert.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "dirent_private.h"
-
-#ifdef __weak_alias
-__weak_alias(telldir,_telldir)
-#endif
-
-long
-telldir(DIR *dirp)
-{
-	long rv;
-#ifdef _REENTRANT
-	if (__isthreaded) {
-		mutex_lock((mutex_t *)dirp->dd_lock);
-		rv = _telldir_unlocked(dirp);
-		mutex_unlock((mutex_t *)dirp->dd_lock);
-	} else
-#endif
-		rv = _telldir_unlocked(dirp);
-	return rv;
-}
-
-/*
- * return a pointer into a directory
- */
-long
-_telldir_unlocked(DIR *dirp)
-{
-	struct dirpos *lp;
-
-	for (lp = dirp->dd_internal; lp; lp = lp->dp_next)
-		if (lp->dp_seek == dirp->dd_seek &&
-		    lp->dp_loc == dirp->dd_loc)
-			return (intptr_t)lp;
-
-	if ((lp = malloc(sizeof(*lp))) == NULL)
-		return (-1);
-
-	lp->dp_seek = dirp->dd_seek;
-	lp->dp_loc = dirp->dd_loc;
-	lp->dp_next = dirp->dd_internal;
-	dirp->dd_internal = lp;
-
-	return (intptr_t)lp;
-}
-
-/*
- * seek to an entry in a directory.
- * Only values returned by "telldir" should be passed to seekdir.
- */
-void
-_seekdir_unlocked(DIR *dirp, long loc)
-{
-	struct dirpos *lp;
-
-	_DIAGASSERT(dirp != NULL);
-
-	for (lp = dirp->dd_internal; lp; lp = lp->dp_next)
-		if ((intptr_t)lp == loc)
-			break;
-
-	if (lp == NULL)
-		return;
-
-	if (lp->dp_loc == dirp->dd_loc && lp->dp_seek == dirp->dd_seek)
-		return;
-
-	dirp->dd_seek = lseek(dirp->dd_fd, lp->dp_seek, SEEK_SET);
-	dirp->dd_loc = 0;
-	while (dirp->dd_loc < lp->dp_loc)
-		if (_readdir_unlocked(dirp, 0) == NULL)
-			break;
-}
diff --git a/lib/libc/gen/time.3 b/lib/libc/gen/time.3
deleted file mode 100644
index b361f4db6..000000000
--- a/lib/libc/gen/time.3
+++ /dev/null
@@ -1,107 +0,0 @@
-.\"	$NetBSD: time.3,v 1.16 2011/11/05 18:17:29 christos Exp $
-.\"
-.\" Copyright (c) 1989, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)time.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd November 5, 2011
-.Dt TIME 3
-.Os
-.Sh NAME
-.Nm time
-.Nd get time of day
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft time_t
-.Fn time "time_t *tloc"
-.Sh DESCRIPTION
-The
-.Fn time
-function
-returns the value of time in seconds since 0 hours, 0 minutes,
-0 seconds, January 1, 1970, Coordinated Universal Time.
-.Pp
-A copy of the time value may be saved to the area indicated by the
-pointer
-.Fa tloc .
-If
-.Fa tloc
-is a
-.Dv NULL
-pointer, no value is stored.
-.Pp
-Upon successful completion,
-.Fn time
-returns the value of time.
-Otherwise a value of
-.Po
-.Po Fa time_t Pc \-1
-.Pc
-is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr gettimeofday 2 ,
-.Xr ctime 3
-.Sh STANDARDS
-The
-.Fn time
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-A
-.Fn time
-function appeared in
-.At v2 .
-It returned a 32-bit value measuring sixtieths of a second, leading to
-rollover every 2.26 years.
-In
-.At v6 ,
-the precision of
-.Fn time
-was changed to seconds, allowing 135.6 years between rollovers.
-.Pp
-In
-.Nx 6.0
-the
-.Vt time_t
-type was changed to be 64 bits wide, including on 32-bit machines,
-making rollover a concern for the far distant future only.
-Note however that any code making the incorrect assumption that
-.Vt time_t
-is the same as
-.Vt long
-will fail on 32-bit machines in 2038.
diff --git a/lib/libc/gen/time.c b/lib/libc/gen/time.c
deleted file mode 100644
index 47107ab29..000000000
--- a/lib/libc/gen/time.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: time.c,v 1.12 2012/03/13 21:13:37 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: time.c,v 1.12 2012/03/13 21:13:37 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <time.h>
-
-time_t
-time(time_t *t)
-{
-	struct timeval tt;
-
-	if (gettimeofday(&tt, NULL) == -1)
-		return (time_t)-1;
-	if (t != NULL)
-		*t = (time_t)tt.tv_sec;
-	return (time_t)tt.tv_sec;
-}
diff --git a/lib/libc/gen/times.3 b/lib/libc/gen/times.3
deleted file mode 100644
index f14d9eb2d..000000000
--- a/lib/libc/gen/times.3
+++ /dev/null
@@ -1,151 +0,0 @@
-.\"	$NetBSD: times.3,v 1.15 2003/08/07 16:42:58 agc Exp $
-.\"
-.\" Copyright (c) 1990, 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. 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.
-.\"
-.\"     @(#)times.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt TIMES 3
-.Os
-.Sh NAME
-.Nm times
-.Nd process times
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/times.h
-.Ft clock_t
-.Fn times "struct tms *tp"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is obsoleted by
-.Xr getrusage 2
-and
-.Xr gettimeofday 2 .
-.Ef
-.Pp
-The
-.Fn times
-function returns the value of time in clock ticks since 0 hours, 0
-minutes, 0 seconds, January 1, 1970, Coordinated Universal Time (UTC).
-.Pp
-The number of clock ticks per second may be determined by calling
-.Xr sysconf 3
-with the
-.Dv _SC_CLK_TCK
-request.
-It is generally (but not always) between 60 and 1024.
-.Pp
-Note that at the common rate of 100 ticks per second on many
-.Nx
-ports, and with a 32-bit unsigned clock_t, this value first wrapped in 1971.
-.Pp
-The
-.Fn times
-call also fills in the structure pointed to by
-.Fa tp
-with time-accounting information.
-.Pp
-The
-.Fa tms
-structure is defined as follows:
-.Bd -literal -offset indent
-typedef struct {
-	clock_t tms_utime;
-	clock_t tms_stime;
-	clock_t tms_cutime;
-	clock_t tms_cstime;
-}
-.Ed
-.Pp
-The elements of this structure are defined as follows:
-.Bl -tag -width tms_cutime
-.It Fa tms_utime
-The
-.Tn CPU
-time charged for the execution of user instructions.
-.It Fa tms_stime
-The
-.Tn CPU
-time charged for execution by the system on behalf of
-the process.
-.It Fa tms_cutime
-The sum of the
-.Fa tms_utime  s
-and
-.Fa tms_cutime  s
-of the child processes.
-.It Fa tms_cstime
-The sum of the
-.Fa tms_stime Ns s
-and
-.Fa tms_cstime Ns s
-of the child processes.
-.El
-.Pp
-All times are measured in clock ticks, as defined above.
-Note that at 100 ticks per second,
-and with a 32-bit unsigned clock_t,
-the values wrap after 497 days.
-.Pp
-The times of a terminated child process are included in the
-.Fa tms_cutime
-and
-.Fa tms_cstime
-elements of the parent when one of the
-.Xr wait 2
-functions returns the process ID of the terminated child to the parent.
-If an error occurs,
-.Fn times
-returns the value
-.Pq (clock_t)\-1 ,
-and sets
-.Va errno
-to indicate the error.
-.Sh ERRORS
-The
-.Fn times
-function
-may fail and set the global variable
-.Va errno
-for any of the errors specified for the library
-routines
-.Xr getrusage 2
-and
-.Xr gettimeofday 2 .
-.Sh SEE ALSO
-.Xr time 1 ,
-.Xr getrusage 2 ,
-.Xr gettimeofday 2 ,
-.Xr wait 2 ,
-.Xr sysconf 3
-.Sh STANDARDS
-The
-.Fn times
-function conforms to
-.St -p1003.1-90 .
diff --git a/lib/libc/gen/times.c b/lib/libc/gen/times.c
deleted file mode 100644
index 55b05a18b..000000000
--- a/lib/libc/gen/times.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*	$NetBSD: times.c,v 1.15 2009/01/11 02:46:27 christos Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)times.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: times.c,v 1.15 2009/01/11 02:46:27 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/resource.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <time.h>
-
-/*
- * Convert usec to clock ticks; could do (usec * CLK_TCK) / 1000000,
- * but this would overflow if we switch to nanosec.
- */
-#define	CONVTCK(r)	\
-    (clock_t)(r.tv_sec * clk_tck + r.tv_usec / (1000000 / (uint)clk_tck))
-
-#ifndef __times_rusage
-#define __times_rusage struct rusage
-#endif
-#ifndef __times_timeval
-#define __times_timeval struct timeval
-#endif
-
-clock_t
-times(struct tms *tp)
-{
-	__times_rusage ru;
-	__times_timeval t;
-	static clock_t clk_tck;
-	
-	_DIAGASSERT(tp != NULL);
-
-	/*
-	 * we use a local copy of CLK_TCK because it expands to a
-	 * moderately expensive function call.
-	 */
-	if (clk_tck == 0)
-		clk_tck = (clock_t)CLK_TCK;
-
-	if (getrusage(RUSAGE_SELF, &ru) < 0)
-		return ((clock_t)-1);
-	tp->tms_utime = CONVTCK(ru.ru_utime);
-	tp->tms_stime = CONVTCK(ru.ru_stime);
-	if (getrusage(RUSAGE_CHILDREN, &ru) < 0)
-		return ((clock_t)-1);
-	tp->tms_cutime = CONVTCK(ru.ru_utime);
-	tp->tms_cstime = CONVTCK(ru.ru_stime);
-	if (gettimeofday(&t, (struct timezone *)0))
-		return ((clock_t)-1);
-	return ((clock_t)(CONVTCK(t)));
-}
diff --git a/lib/libc/gen/timezone.3 b/lib/libc/gen/timezone.3
deleted file mode 100644
index 6a202dad8..000000000
--- a/lib/libc/gen/timezone.3
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"	$NetBSD: timezone.3,v 1.12 2003/08/07 16:42:58 agc Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)timezone.3	8.2 (Berkeley) 4/19/94
-.\"
-.Dd April 19, 1994
-.Dt TIMEZONE 3
-.Os
-.Sh NAME
-.Nm timezone
-.Nd return the timezone abbreviation
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.Ft char *
-.Fn timezone "int zone" "int dst"
-.Sh DESCRIPTION
-.Bf -symbolic
-.\" This interface is available from the compatibility library, libcompat;
-This interface is available for compatibility only and will disappear in a
-future software release;
-it is impossible to reliably map timezone's arguments to a time zone
-abbreviation.
-See
-.Xr ctime 3 ;
-see
-.Xr tzset 3
-for the new definition of this interface.
-.Ef
-.Pp
-The
-.Fn timezone
-function returns a pointer to a time zone abbreviation for the specified
-.Ar zone
-and
-.Ar dst
-values.
-.Ar Zone
-is the number of minutes west of GMT and
-.Ar dst
-is non-zero if daylight savings time is in effect.
-.Sh SEE ALSO
-.Xr ctime 3 ,
-.Xr tzset 3
-.Sh HISTORY
-A
-.Fn timezone
-function appeared in
-.At v7 .
diff --git a/lib/libc/gen/toascii.3 b/lib/libc/gen/toascii.3
deleted file mode 100644
index e2c0e0f62..000000000
--- a/lib/libc/gen/toascii.3
+++ /dev/null
@@ -1,83 +0,0 @@
-.\"	$NetBSD: toascii.3,v 1.13 2010/04/30 04:46:18 jruoho Exp $
-.\"
-.\" 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.
-.\"
-.\"	@(#)toascii.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 30, 2010
-.Dt TOASCII 3
-.Os
-.Sh NAME
-.Nm toascii
-.Nd convert a byte to 7-bit ASCII
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn toascii "int c"
-.Sh DESCRIPTION
-The
-.Fn toascii
-function returns the argument with all but the lower 7 bits cleared.
-.Sh RETURN VALUES
-The
-.Fn toascii
-function always returns a valid ASCII character.
-The result is a non-negative integer in the
-range from 0 to 127, inclusive.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn toascii
-function conforms to
-.St -xpg4
-and
-.St -p1003.1-2001 .
-The
-.St -p1003.1-2008
-revision however marked it as obsolete, noting that
-.Fn toascii
-cannot be used portably in a localized application.
diff --git a/lib/libc/gen/toascii.c b/lib/libc/gen/toascii.c
deleted file mode 100644
index c8f76afad..000000000
--- a/lib/libc/gen/toascii.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: toascii.c,v 1.3 2012/06/25 22:32:44 abs Exp $	*/
-
-/*
- * Copyright (c) 1989 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.
- *
- * 	from:	@(#)isctype.c	5.2 (Berkeley) 6/1/90
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: toascii.c,v 1.3 2012/06/25 22:32:44 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <ctype.h>
-
-#undef toascii
-int
-toascii(int c)
-{
-	return ((c) & 0177);
-}
diff --git a/lib/libc/gen/tolower.3 b/lib/libc/gen/tolower.3
deleted file mode 100644
index 253a55e2a..000000000
--- a/lib/libc/gen/tolower.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\"	$NetBSD: tolower.3,v 1.14 2008/04/17 16:25:36 apb Exp $
-.\"
-.\" Copyright (c) 1989, 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"	@(#)tolower.3	5.2 (Berkeley) 6/29/91
-.\"
-.Dd April 17, 2008
-.Dt TOLOWER 3
-.Os
-.Sh NAME
-.Nm tolower
-.Nd upper case to lower case letter conversion
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn tolower "int c"
-.Sh DESCRIPTION
-The
-.Fn tolower
-function converts an upper-case letter to the corresponding lower-case
-letter.
-.Sh RETURN VALUES
-If the argument is an upper-case letter, the
-.Fn tolower
-function returns the corresponding lower-case letter if there is
-one; otherwise the argument is returned unchanged.
-.\" In the
-.\" .Em ``C''
-.\" locale,
-.\" .Fn tolower
-.\" maps only the characters for which
-.\" .Xr isupper
-.\" is true to the corresponding characters for which
-.\" .Xr islower
-.\" is true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn tolower
-function conforms to
-.St -ansiC .
-.Sh CAVEATS
-The argument to
-.Fn tolower
-must be
-.Dv EOF
-or representable as an
-.Vt unsigned char ;
-otherwise, the behavior is undefined.
-See the
-.Sx CAVEATS
-section of
-.Xr ctype 3
-for more details.
diff --git a/lib/libc/gen/tolower_.c b/lib/libc/gen/tolower_.c
deleted file mode 100644
index 11ee962e2..000000000
--- a/lib/libc/gen/tolower_.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: tolower_.c,v 1.14 2013/04/13 10:16:27 joerg Exp $	*/
-
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_RCS) && !defined(lint)
-__RCSID("$NetBSD: tolower_.c,v 1.14 2013/04/13 10:16:27 joerg Exp $");
-#endif /* LIBC_RCS and not lint */
-
-#include <sys/ctype_bits.h>
-#include <stdio.h>
-#include "ctype_local.h"
-
-#if EOF != -1
-#error "EOF != -1"
-#endif
-
-const short _C_tolower_tab_[1 + _CTYPE_NUM_CHARS] = {
-	EOF,
-	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
-	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,
-	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17,
-	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f,
-	0x20,	0x21,	0x22,	0x23,	0x24,	0x25,	0x26,	0x27,
-	0x28,	0x29,	0x2a,	0x2b,	0x2c,	0x2d,	0x2e,	0x2f,
-	0x30,	0x31,	0x32,	0x33,	0x34,	0x35,	0x36,	0x37,
-	0x38,	0x39,	0x3a,	0x3b,	0x3c,	0x3d,	0x3e,	0x3f,
-	0x40,	'a',	'b',	'c',	'd',	'e',	'f',	'g',
-	'h',	'i',	'j',	'k',	'l',	'm',	'n',	'o',
-	'p',	'q',	'r',	's',	't',	'u',	'v',	'w',
-	'x',	'y',	'z',	0x5b,	0x5c,	0x5d,	0x5e,	0x5f,
-	0x60,	0x61,	0x62,	0x63,	0x64,	0x65,	0x66,	0x67,
-	0x68,	0x69,	0x6a,	0x6b,	0x6c,	0x6d,	0x6e,	0x6f,
-	0x70,	0x71,	0x72,	0x73,	0x74,	0x75,	0x76,	0x77,
-	0x78,	0x79,	0x7a,	0x7b,	0x7c,	0x7d,	0x7e,	0x7f,
-	0x80,	0x81,	0x82,	0x83,	0x84,	0x85,	0x86,	0x87,
-	0x88,	0x89,	0x8a,	0x8b,	0x8c,	0x8d,	0x8e,	0x8f,
-	0x90,	0x91,	0x92,	0x93,	0x94,	0x95,	0x96,	0x97,
-	0x98,	0x99,	0x9a,	0x9b,	0x9c,	0x9d,	0x9e,	0x9f,
-	0xa0,	0xa1,	0xa2,	0xa3,	0xa4,	0xa5,	0xa6,	0xa7,
-	0xa8,	0xa9,	0xaa,	0xab,	0xac,	0xad,	0xae,	0xaf,
-	0xb0,	0xb1,	0xb2,	0xb3,	0xb4,	0xb5,	0xb6,	0xb7,
-	0xb8,	0xb9,	0xba,	0xbb,	0xbc,	0xbd,	0xbe,	0xbf,
-	0xc0,	0xc1,	0xc2,	0xc3,	0xc4,	0xc5,	0xc6,	0xc7,
-	0xc8,	0xc9,	0xca,	0xcb,	0xcc,	0xcd,	0xce,	0xcf,
-	0xd0,	0xd1,	0xd2,	0xd3,	0xd4,	0xd5,	0xd6,	0xd7,
-	0xd8,	0xd9,	0xda,	0xdb,	0xdc,	0xdd,	0xde,	0xdf,
-	0xe0,	0xe1,	0xe2,	0xe3,	0xe4,	0xe5,	0xe6,	0xe7,
-	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef,
-	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7,
-	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff
-};
-
-#ifdef __BUILD_LEGACY
-#ifdef __weak_alias
-__weak_alias(_C_tolower_, _C_tolower_tab_)
-#endif
-#endif
-
-const short *_tolower_tab_ = &_C_tolower_tab_[0];
diff --git a/lib/libc/gen/toupper.3 b/lib/libc/gen/toupper.3
deleted file mode 100644
index b927a5460..000000000
--- a/lib/libc/gen/toupper.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\"	$NetBSD: toupper.3,v 1.17 2008/04/17 16:25:36 apb Exp $
-.\"
-.\" Copyright (c) 1989, 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"	@(#)toupper.3	5.2 (Berkeley) 6/29/91
-.\"
-.Dd April 17, 2008
-.Dt TOUPPER 3
-.Os
-.Sh NAME
-.Nm toupper
-.Nd lower case to upper case letter conversion
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn toupper "int c"
-.Sh DESCRIPTION
-The
-.Fn toupper
-function converts a lower-case letter to the corresponding
-upper-case letter.
-.Sh RETURN VALUES
-If the argument is a lower-case letter, the
-.Fn toupper
-function returns the corresponding upper-case letter if there is
-one; otherwise the argument is returned unchanged.
-.\" In the
-.\" .Em ``C''
-.\" locale,
-.\" .Fn toupper
-.\" maps only the characters for which
-.\" .Xr islower
-.\" is true to the corresponding characters for which
-.\" .Xr isupper
-.\" is true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr toascii 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn toupper
-function conforms to
-.St -ansiC .
-.Sh CAVEATS
-The argument to
-.Fn toupper
-must be
-.Dv EOF
-or representable as an
-.Vt unsigned char ;
-otherwise, the behavior is undefined.
-See the
-.Sx CAVEATS
-section of
-.Xr ctype 3
-for more details.
diff --git a/lib/libc/gen/toupper_.c b/lib/libc/gen/toupper_.c
deleted file mode 100644
index 46d038497..000000000
--- a/lib/libc/gen/toupper_.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: toupper_.c,v 1.14 2013/04/13 10:16:27 joerg Exp $	*/
-
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_RCS) && !defined(lint)
-__RCSID("$NetBSD: toupper_.c,v 1.14 2013/04/13 10:16:27 joerg Exp $");
-#endif /* LIBC_RCS and not lint */
-
-#include <sys/ctype_bits.h>
-#include <stdio.h>
-#include "ctype_local.h"
-
-#if EOF != -1
-#error "EOF != -1"
-#endif
-
-const short _C_toupper_tab_[1 + _CTYPE_NUM_CHARS] = {
-	EOF,
-	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
-	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,
-	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17,
-	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f,
-	0x20,	0x21,	0x22,	0x23,	0x24,	0x25,	0x26,	0x27,
-	0x28,	0x29,	0x2a,	0x2b,	0x2c,	0x2d,	0x2e,	0x2f,
-	0x30,	0x31,	0x32,	0x33,	0x34,	0x35,	0x36,	0x37,
-	0x38,	0x39,	0x3a,	0x3b,	0x3c,	0x3d,	0x3e,	0x3f,
-	0x40,	0x41,	0x42,	0x43,	0x44,	0x45,	0x46,	0x47,
-	0x48,	0x49,	0x4a,	0x4b,	0x4c,	0x4d,	0x4e,	0x4f,
-	0x50,	0x51,	0x52,	0x53,	0x54,	0x55,	0x56,	0x57,
-	0x58,	0x59,	0x5a,	0x5b,	0x5c,	0x5d,	0x5e,	0x5f,
-	0x60,	'A',	'B',	'C',	'D',	'E',	'F',	'G',
-	'H',	'I',	'J',	'K',	'L',	'M',	'N',	'O',
-	'P',	'Q',	'R',	'S',	'T',	'U',	'V',	'W',
-	'X',	'Y',	'Z',	0x7b,	0x7c,	0x7d,	0x7e,	0x7f,
-	0x80,	0x81,	0x82,	0x83,	0x84,	0x85,	0x86,	0x87,
-	0x88,	0x89,	0x8a,	0x8b,	0x8c,	0x8d,	0x8e,	0x8f,
-	0x90,	0x91,	0x92,	0x93,	0x94,	0x95,	0x96,	0x97,
-	0x98,	0x99,	0x9a,	0x9b,	0x9c,	0x9d,	0x9e,	0x9f,
-	0xa0,	0xa1,	0xa2,	0xa3,	0xa4,	0xa5,	0xa6,	0xa7,
-	0xa8,	0xa9,	0xaa,	0xab,	0xac,	0xad,	0xae,	0xaf,
-	0xb0,	0xb1,	0xb2,	0xb3,	0xb4,	0xb5,	0xb6,	0xb7,
-	0xb8,	0xb9,	0xba,	0xbb,	0xbc,	0xbd,	0xbe,	0xbf,
-	0xc0,	0xc1,	0xc2,	0xc3,	0xc4,	0xc5,	0xc6,	0xc7,
-	0xc8,	0xc9,	0xca,	0xcb,	0xcc,	0xcd,	0xce,	0xcf,
-	0xd0,	0xd1,	0xd2,	0xd3,	0xd4,	0xd5,	0xd6,	0xd7,
-	0xd8,	0xd9,	0xda,	0xdb,	0xdc,	0xdd,	0xde,	0xdf,
-	0xe0,	0xe1,	0xe2,	0xe3,	0xe4,	0xe5,	0xe6,	0xe7,
-	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef,
-	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7,
-	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff
-};
-
-#ifdef __BUILD_LEGACY
-#ifdef __weak_alias
-__weak_alias(_C_toupper_, _C_toupper_tab_)
-#endif
-#endif
-
-const short *_toupper_tab_ = &_C_toupper_tab_[0];
diff --git a/lib/libc/gen/ttyname.3 b/lib/libc/gen/ttyname.3
deleted file mode 100644
index eddfa0175..000000000
--- a/lib/libc/gen/ttyname.3
+++ /dev/null
@@ -1,204 +0,0 @@
-.\"	$NetBSD: ttyname.3,v 1.24 2012/06/03 21:42:46 joerg Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)ttyname.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 1, 2012
-.Dt TTYNAME 3
-.Os
-.Sh NAME
-.Nm ttyname ,
-.Nm ttyname_r ,
-.Nm isatty ,
-.Nm ttyslot
-.Nd get name of associated terminal (tty) from file descriptor
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft char *
-.Fn ttyname "int fd"
-.Ft int
-.Fn ttyname_r "int fd" "char *buf" "size_t len"
-.Ft int
-.Fn isatty "int fd"
-.In stdlib.h
-.Ft int
-.Fn ttyslot "void"
-.Sh DESCRIPTION
-These functions operate on the system file descriptors for terminal
-type devices.
-These descriptors are not related to the standard
-.Tn I/O
-.Dv FILE
-typedef, but refer to the special device files found in
-.Pa /dev
-and named
-.Pa /dev/tty Ns Em xx
-and for which an entry exists in the initialization file
-.Pa /etc/ttys
-(see
-.Xr ttys 5 ) ,
-or for pseudo-terminal devices created in ptyfs and named
-.Pa /dev/pts/ Ns Em n .
-.Pp
-The
-.Fn isatty
-function
-determines if the file descriptor
-.Fa fd
-refers to a valid terminal type device.
-.Pp
-The
-.Fn ttyname
-function gets the related device name of a file descriptor for
-which
-.Fn isatty
-is true.
-The
-.Fn ttyname_r
-is the reentrant version of the above, and it places the results in
-.Fa buf .
-If there is not enough space to place the results (indicated by
-.Fa len ) ,
-then it returns an error.
-.Pp
-The
-.Fn ttyslot
-function
-fetches the current process' control terminal number from the
-.Xr ttys 5
-file entry.
-If the terminal is a pseudo-terminal, and there is no special entry
-in the
-.Xr ttys 5
-file for it, the slot number returned is 1 + (last slot number) +
-minor(tty).
-This will return a consistent and unique number for each pseudo-terminal
-device without requiring one to enumerate all of them in
-.Xr ttys 5 .
-.Sh IMPLEMENTATION NOTES
-As an optimisation, these functions attempt to obtain information about
-all devices from the
-.Pa /var/run/dev.cdb
-database, if it exists.
-If the database exists but is out of date, then these functions
-may produce incorrect results.
-The database should be updated using the
-.Xr dev_mkdb 8
-command.
-.Sh RETURN VALUES
-The
-.Fn ttyname
-function returns the NUL-terminated name if the device is found and
-.Fn isatty
-is true; otherwise
-a
-.Dv NULL
-pointer is returned and
-.Va errno
-is set to indicate the error.
-.Pp
-The
-.Fn ttyname_r
-functions returns 0 on success and an error code on failure.
-.Pp
-The
-.Fn isatty
-function returns 1 if
-.Fa fd
-is associated with a terminal device; otherwise it returns 0 and
-.Va errno
-is set to indicate the error.
-.Pp
-The
-.Fn ttyslot
-function
-returns the unit number of the device file if found; otherwise
-the value zero is returned.
-.Sh FILES
-.Bl -tag -width /etc/ttys -compact
-.It Pa /dev/\(**
-.It Pa /etc/ttys
-.El
-.Sh ERRORS
-The
-.Fn ttyname ,
-.Fn ttyname_r ,
-and
-.Fn isatty
-functions will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid file descriptor.
-.It Bq Er ENOTTY
-The
-.Fa fd
-argument does not refer to a terminal device.
-.El
-.Pp
-The
-.Fn ttyname_r
-function will also fail if:
-.Bl -tag -width Er
-.It Bq Er ENOENT
-The terminal device is not found.
-This can happen if the device node has been removed after it was opened.
-.It Bq Er ERANGE
-The buffer provided is not large enough to fit the result.
-.El
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr ttys 5 ,
-.Xr dev_mkdb 8
-.Sh STANDARDS
-The
-.Fn ttyname
-and
-.Fn isatty
-functions conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-.Fn isatty ,
-.Fn ttyname ,
-and
-.Fn ttyslot
-functions appeared in
-.At v7 .
-.\" Use of the .Pa /var/run/dev.cdb file was added in netBSD 6.0.
-.Sh BUGS
-The
-.Fn ttyname
-function leaves its result in an internal static object and returns
-a pointer to that object.
-Subsequent calls to
-.Fn ttyname
-will modify the same object.
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c
deleted file mode 100644
index 878e6792d..000000000
--- a/lib/libc/gen/ttyname.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*	$NetBSD: ttyname.c,v 1.26 2012/06/12 18:17:04 joerg 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)ttyname.c	8.2 (Berkeley) 1/27/94";
-#else
-__RCSID("$NetBSD: ttyname.c,v 1.26 2012/06/12 18:17:04 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <paths.h>
-#include <string.h>
-#include <stdlib.h>
-#include <termios.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(ttyname,_ttyname)
-__weak_alias(ttyname_r,_ttyname_r)
-#endif
-
-int
-ttyname_r(int fd, char *buf, size_t len)
-{
-	struct stat sb;
-	struct termios ttyb;
-	struct ptmget ptm;
-
-	_DIAGASSERT(fd != -1);
-
-	/* If it is a pty, deal with it quickly */
-	if (ioctl(fd, TIOCPTSNAME, &ptm) != -1) {
-		if (strlcpy(buf, ptm.sn, len) >= len) {
-			return ERANGE;
-		}
-		return 0;
-	}
-
-	/* Must be a terminal. */
-	if (tcgetattr(fd, &ttyb) == -1)
-		return errno;
-
-	if (fstat(fd, &sb))
-		return errno;
-
-	if (strlcpy(buf, _PATH_DEV, len) >= len)
-		return ERANGE;
-	buf += strlen(_PATH_DEV);
-	len -= strlen(_PATH_DEV);
-	return devname_r(sb.st_rdev, sb.st_mode & S_IFMT, buf, len);
-}
-
-char *
-ttyname(int fd)
-{
-	static char buf[PATH_MAX];
-	int rv;
-	
-	rv = ttyname_r(fd, buf, sizeof(buf));
-	if (rv != 0) {
-		errno = rv;
-		return NULL;
-	}
-	return buf;
-}
diff --git a/lib/libc/gen/ttyslot.c b/lib/libc/gen/ttyslot.c
deleted file mode 100644
index 4fc89ee5e..000000000
--- a/lib/libc/gen/ttyslot.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$NetBSD: ttyslot.c,v 1.13 2009/01/11 02:46:27 christos 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)ttyslot.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: ttyslot.c,v 1.13 2009/01/11 02:46:27 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <ttyent.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-
-#ifdef __weak_alias
-__weak_alias(ttyslot,_ttyslot)
-#endif
-
-int
-ttyslot(void)
-{
-	struct ttyent *ttyp;
-	int slot = 0, ispty = 0;
-	char *p;
-	int cnt;
-	char *name;
-	struct ptmget ptm;
-
-	setttyent();
-	for (cnt = 0; cnt < 3; ++cnt) {
-		if (ioctl(cnt, TIOCPTSNAME, &ptm) != -1) {
-#if !defined(__minix)
-			ispty = 1;
-#endif /* !defined(__minix) */
-			name = ptm.sn;
-		} else if ((name = ttyname(cnt)) != NULL) {
-			ispty = 0;
-		} else
-			continue;
-
-		if ((p = strstr(name, "/pts/")) != NULL)
-			++p;
-		else if ((p = strrchr(name, '/')) != NULL)
-			++p;
-		else
-			p = name;
-
-		for (slot = 1; (ttyp = getttyent()) != NULL; ++slot)
-			if (!strcmp(ttyp->ty_name, p)) {
-				endttyent();
-				return slot;
-			}
-		break;
-	}
-	endttyent();
-	if (ispty) {
-		struct stat st;
-		if (fstat(cnt, &st) == -1)
-			return 0;
-		return slot + (int)minor(st.st_rdev) + 1;
-	}
-	return 0;
-}
diff --git a/lib/libc/gen/ualarm.3 b/lib/libc/gen/ualarm.3
deleted file mode 100644
index 39b91ae09..000000000
--- a/lib/libc/gen/ualarm.3
+++ /dev/null
@@ -1,103 +0,0 @@
-.\"	$NetBSD: ualarm.3,v 1.19 2011/05/02 17:34:05 jruoho Exp $
-.\"
-.\" Copyright (c) 1986, 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. 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.
-.\"
-.\"     @(#)ualarm.3	8.2 (Berkeley) 4/19/94
-.\"
-.Dd May 2, 2011
-.Dt UALARM 3
-.Os
-.Sh NAME
-.Nm ualarm
-.Nd schedule signal after specified time
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft useconds_t
-.Fn ualarm "useconds_t microseconds" "useconds_t interval"
-.Sh DESCRIPTION
-.Bf -symbolic
-This is a simplified interface to
-.Xr setitimer 2 .
-.Ef
-.Pp
-The
-.Fn ualarm
-function
-waits a count of
-.Ar microseconds
-before asserting the terminating signal
-.Dv SIGALRM .
-System activity or time used in processing the call may cause a slight
-delay.
-.Pp
-If the
-.Fa interval
-argument is non-zero, the
-.Dv SIGALRM
-signal will be sent
-to the process every
-.Fa interval
-microseconds after the timer expires (e.g. after
-.Fa microseconds
-microseconds have passed).
-.Sh RETURN VALUES
-When the signal has successfully been caught,
-.Fn ualarm
-returns the amount of time left on the clock.
-The maximum number of
-.Ar microseconds
-allowed
-is 2147483647.
-If there is an error setting the timer,
-.Fn ualarm
-returns ((useconds_t) -1).
-.Sh SEE ALSO
-.Xr getitimer 2 ,
-.Xr setitimer 2 ,
-.Xr sigaction 2 ,
-.Xr sigsuspend 2 ,
-.Xr alarm 3 ,
-.Xr signal 3 ,
-.Xr sigvec 3 ,
-.Xr sleep 3 ,
-.Xr usleep 3
-.Sh STANDARDS
-The
-.Fn ualarm
-function conforms to
-.St -p1003.1-2001 .
-However, the later
-.St -p1003.1-2008
-revision removed the function from the specification.
-.Sh HISTORY
-The
-.Fn ualarm
-function appeared in
-.Bx 4.3 .
diff --git a/lib/libc/gen/ualarm.c b/lib/libc/gen/ualarm.c
deleted file mode 100644
index 74c655bf5..000000000
--- a/lib/libc/gen/ualarm.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: ualarm.c,v 1.11 2012/06/25 22:32:44 abs Exp $	*/
-
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)ualarm.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: ualarm.c,v 1.11 2012/06/25 22:32:44 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/time.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(ualarm,_ualarm)
-#endif
-
-#define	USPS	1000000		/* # of microseconds in a second */
-
-/*
- * Generate a SIGALRM signal in ``usecs'' microseconds.
- * If ``reload'' is non-zero, keep generating SIGALRM
- * every ``reload'' microseconds after the first signal.
- */
-useconds_t
-ualarm(useconds_t usecs, useconds_t reload)
-{
-	struct itimerval new, old;
-
-	new.it_interval.tv_usec = reload % USPS;
-	new.it_interval.tv_sec = reload / USPS;
-	
-	new.it_value.tv_usec = usecs % USPS;
-	new.it_value.tv_sec = usecs / USPS;
-
-	if (setitimer(ITIMER_REAL, &new, &old) == 0)
-		return (useconds_t)(old.it_value.tv_sec * USPS +
-		    old.it_value.tv_usec);
-
-	return (useconds_t)-1;
-}
diff --git a/lib/libc/gen/ulimit.3 b/lib/libc/gen/ulimit.3
deleted file mode 100644
index 5312050cf..000000000
--- a/lib/libc/gen/ulimit.3
+++ /dev/null
@@ -1,119 +0,0 @@
-.\"	$NetBSD: ulimit.3,v 1.9 2010/04/30 05:09:23 jruoho Exp $
-.\"
-.\" Copyright (c) 1999 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.
-.\"
-.Dd April 30, 2010
-.Dt ULIMIT 3
-.Os
-.Sh NAME
-.Nm ulimit
-.Nd get and set process limits
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ulimit.h
-.Ft long int
-.Fn ulimit "int cmd" ...
-.Sh DESCRIPTION
-The
-.Fn ulimit
-function provides a method to query or alter resource limits of the calling
-process.
-The method to be performed is specified by the
-.Fa cmd
-argument; possible values are:
-.Bl -tag -width UL_GETFSIZEXX
-.It Li UL_GETFSIZE
-Return the soft file size limit of the process.
-The value returned is in units of 512-byte blocks.
-If the result cannot be represented in an object of type
-.Fa long int ,
-the result is unspecified.
-.It Li UL_SETFSIZE
-Set the hard and soft file size limits of the process to the value of the
-second argument passed, which is in units of 512-byte blocks, and which is
-expected to be of type
-.Fa long int .
-The new file size limit of the process is returned.
-Any process may decrease the limit, but raising it is only permitted if
-the caller is the super-user.
-.El
-.Pp
-If successful, the
-.Fn ulimit
-function will not change the setting of
-.Va errno .
-.Sh RETURN VALUES
-If successful, the
-.Fn ulimit
-function returns the value of the requested limit.
-Otherwise, it returns \-1, sets
-.Va errno
-to indicate an error, and the limit is not changed.
-Therefore, to detect an error condition applications should set
-.Va errno
-to 0, call
-.Fn ulimit ,
-and check if \-1 is returned and
-.Va errno
-is non-zero.
-.Sh ERRORS
-The
-.Fn ulimit
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa cmd
-argument is not valid.
-.It Bq Er EPERM
-It was attempted to increase a limit, and the caller is not the super-user.
-.El
-.Sh SEE ALSO
-.Xr getrlimit 2 ,
-.Xr setrlimit 2
-.Sh STANDARDS
-The
-.Fn ulimit
-function conforms to
-.St -xsh5
-and
-.St -p1003.1-2001 .
-It was marked as obsolete in the
-.St -p1003.1-2008
-revision, which recommended the use of
-.Xr getrlimit 2
-and
-.Xr setrlimit 2
-instead, noting that because
-.Fn ulimit
-uses the type
-.Vt long
-rather than
-.Vt rlim_t ,
-it may not be sufficient for file sizes on many current systems.
diff --git a/lib/libc/gen/ulimit.c b/lib/libc/gen/ulimit.c
deleted file mode 100644
index ba61a22f9..000000000
--- a/lib/libc/gen/ulimit.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: ulimit.c,v 1.3 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ulimit.c,v 1.3 2008/04/28 20:22:59 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/resource.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <ulimit.h>
-
-long int
-ulimit(int cmd, ...)
-{
-	va_list ap;
-	struct rlimit rlimit;
-	long int new_limit, result;
-
-	va_start(ap, cmd);
-
-	result = -1L;
-	switch (cmd) {
-	case UL_GETFSIZE:
-		if (getrlimit(RLIMIT_FSIZE, &rlimit) == 0)
-			result = (long int)(rlimit.rlim_cur / 512);
-		break;
-	case UL_SETFSIZE:
-		new_limit = va_arg(ap, long int);
-		rlimit.rlim_cur = rlimit.rlim_max = (rlim_t)new_limit * 512;
-		if (setrlimit(RLIMIT_FSIZE, &rlimit) == 0)
-			result = new_limit;
-		break;
-	default:
-		errno = EINVAL;
-	}
-
-	va_end(ap);
-
-	return (result);
-}
diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3
deleted file mode 100644
index 8de5a4d0e..000000000
--- a/lib/libc/gen/uname.3
+++ /dev/null
@@ -1,114 +0,0 @@
-.\"	$NetBSD: uname.3,v 1.13 2014/06/14 14:32:43 apb Exp $
-.\"
-.\" Copyright (c) 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	@(#)uname.3	8.1 (Berkeley) 1/4/94
-.\"
-.Dd June 14, 2014
-.Dt UNAME 3
-.Os
-.Sh NAME
-.Nm uname
-.Nd get system identification
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/utsname.h
-.Ft int
-.Fn uname "struct utsname *name"
-.Sh DESCRIPTION
-The
-.Fn uname
-function stores nul-terminated strings of information identifying
-the current system into the structure referenced by
-.Fa name .
-.Pp
-The
-.Em utsname
-structure is defined in the
-.In sys/utsname.h
-header file, and contains the following members:
-.Bl -tag -width nodenameXXXX -offset indent
-.It Va sysname
-Name of the operating system implementation.
-Equivalent to the
-.Xr sysctl 7
-.Va kern.ostype
-variable.
-.It Va nodename
-Network name of this machine.
-Equivalent to the
-.Xr sysctl 7
-.Va kern.hostname
-variable.
-.It Va release
-Release level of the operating system.
-Equivalent to the
-.Xr sysctl 7
-.Va kern.osrelease
-variable.
-.It Va version
-Version level of the operating system.
-Equivalent to the
-.Xr sysctl 7
-.Va kern.version
-variable, except that very long values are truncated,
-and newlines are converted to spaces.
-.It Va machine
-Machine hardware platform.
-Equivalent to the
-.Xr sysctl 7
-.Va hw.machine
-variable.
-.El
-.Sh RETURN VALUES
-If
-.Nm uname
-is successful, 0 is returned, otherwise, \-1 is returned and
-.Va errno
-is set appropriately.
-.Sh ERRORS
-The
-.Fn uname
-function may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr sysctl 3 .
-.Sh SEE ALSO
-.Xr uname 1 ,
-.Xr sysctl 3
-.Sh STANDARDS
-The
-.Fn uname
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Nm uname
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/gen/uname.c b/lib/libc/gen/uname.c
deleted file mode 100644
index de3c886f8..000000000
--- a/lib/libc/gen/uname.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*	$NetBSD: uname.c,v 1.12 2014/06/14 13:09:37 apb Exp $	*/
-
-/*-
- * Copyright (c) 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)uname.c	8.1 (Berkeley) 1/4/94";
-#else
-__RCSID("$NetBSD: uname.c,v 1.12 2014/06/14 13:09:37 apb Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/utsname.h>
-
-#include <assert.h>
-#include <errno.h>
-
-#ifdef __weak_alias
-__weak_alias(uname,_uname)
-#endif
-
-int
-uname(struct utsname *name)
-{
-	int mib[2];
-	size_t len;
-	char *p;
-
-	_DIAGASSERT(name != NULL);
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_OSTYPE;
-	len = sizeof(name->sysname);
-	if (sysctl(mib, 2, &name->sysname, &len, NULL, 0) == -1)
-		goto error;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTNAME;
-	len = sizeof(name->nodename);
-	if (sysctl(mib, 2, &name->nodename, &len, NULL, 0) == -1)
-		goto error;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_OSRELEASE;
-	len = sizeof(name->release);
-	if (sysctl(mib, 2, &name->release, &len, NULL, 0) == -1)
-		goto error;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_VERSION;
-	len = sizeof(name->version);
-	if (sysctl(mib, 2, &name->version, &len, NULL, 0) == -1) {
-		if (errno == ENOMEM) {
-			/*
-			 * string is too long for {struct utsname}.version.
-			 * Just use the truncated string.
-			 * XXX: We could mark the truncation with "..."
-			 */
-			name->version[sizeof(name->version) - 1] = '\0';
-		}
-		else goto error;
-	}
-
-	/* The version may have newlines in it, turn them into spaces. */
-	for (p = name->version; len--; ++p) {
-		if (*p == '\n' || *p == '\t') {
-			if (len > 1)
-				*p = ' ';
-			else
-				*p = '\0';
-		}
-	}
-
-	mib[0] = CTL_HW;
-	mib[1] = HW_MACHINE;
-	len = sizeof(name->machine);
-	if (sysctl(mib, 2, &name->machine, &len, NULL, 0) == -1)
-		goto error;
-	return (0);
-
-error:
-	return (-1);
-}
diff --git a/lib/libc/gen/unvis.3 b/lib/libc/gen/unvis.3
deleted file mode 100644
index b856a730e..000000000
--- a/lib/libc/gen/unvis.3
+++ /dev/null
@@ -1,259 +0,0 @@
-.\"	$NetBSD: unvis.3,v 1.27 2012/12/15 07:34:36 wiz Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"     @(#)unvis.3	8.2 (Berkeley) 12/11/93
-.\"
-.Dd March 12, 2011
-.Dt UNVIS 3
-.Os
-.Sh NAME
-.Nm unvis ,
-.Nm strunvis
-.Nd decode a visual representation of characters
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In vis.h
-.Ft int
-.Fn unvis "char *cp" "int c" "int *astate" "int flag"
-.Ft int
-.Fn strunvis "char *dst" "const char *src"
-.Ft int
-.Fn strnunvis "char *dst" "size_t dlen" "const char *src"
-.Ft int
-.Fn strunvisx "char *dst" "const char *src" "int flag"
-.Ft int
-.Fn strnunvisx "char *dst" "size_t dlen" "const char *src" "int flag"
-.Sh DESCRIPTION
-The
-.Fn unvis ,
-.Fn strunvis
-and
-.Fn strunvisx
-functions
-are used to decode a visual representation of characters, as produced
-by the
-.Xr vis 3
-function, back into
-the original form.
-.Pp
-The
-.Fn unvis
-function is called with successive characters in
-.Ar c
-until a valid sequence is recognized, at which time the decoded
-character is available at the character pointed to by
-.Ar cp .
-.Pp
-The
-.Fn strunvis
-function decodes the characters pointed to by
-.Ar src
-into the buffer pointed to by
-.Ar dst .
-The
-.Fn strunvis
-function simply copies
-.Ar src
-to
-.Ar dst ,
-decoding any escape sequences along the way,
-and returns the number of characters placed into
-.Ar dst ,
-or \-1 if an
-invalid escape sequence was detected.
-The size of
-.Ar dst
-should be equal to the size of
-.Ar src
-(that is, no expansion takes place during decoding).
-.Pp
-The
-.Fn strunvisx
-function does the same as the
-.Fn strunvis
-function,
-but it allows you to add a flag that specifies the style the string
-.Ar src
-is encoded with.
-Currently, the supported flags are:
-.Dv VIS_HTTPSTYLE
-and
-.Dv VIS_MIMESTYLE .
-.Pp
-The
-.Fn unvis
-function implements a state machine that can be used to decode an
-arbitrary stream of bytes.
-All state associated with the bytes being decoded is stored outside the
-.Fn unvis
-function (that is, a pointer to the state is passed in), so
-calls decoding different streams can be freely intermixed.
-To start decoding a stream of bytes, first initialize an integer to zero.
-Call
-.Fn unvis
-with each successive byte, along with a pointer
-to this integer, and a pointer to a destination character.
-The
-.Fn unvis
-function has several return codes that must be handled properly.
-They are:
-.Bl -tag -width UNVIS_VALIDPUSH
-.It Li \&0 No (zero)
-Another character is necessary; nothing has been recognized yet.
-.It Dv UNVIS_VALID
-A valid character has been recognized and is available at the location
-pointed to by
-.Fa cp .
-.It Dv UNVIS_VALIDPUSH
-A valid character has been recognized and is available at the location
-pointed to by
-.Fa cp ;
-however, the character currently passed in should be passed in again.
-.It Dv UNVIS_NOCHAR
-A valid sequence was detected, but no character was produced.
-This return code is necessary to indicate a logical break between characters.
-.It Dv UNVIS_SYNBAD
-An invalid escape sequence was detected, or the decoder is in an unknown state.
-The decoder is placed into the starting state.
-.El
-.Pp
-When all bytes in the stream have been processed, call
-.Fn unvis
-one more time with flag set to
-.Dv UNVIS_END
-to extract any remaining character (the character passed in is ignored).
-.Pp
-The
-.Fa flag
-argument is also used to specify the encoding style of the source.
-If set to
-.Dv VIS_HTTPSTYLE
-or
-.Dv VIS_HTTP1808 ,
-.Fn unvis
-will decode URI strings as specified in RFC 1808.
-If set to
-.Dv VIS_HTTP1866 ,
-.Fn unvis
-will decode entity references and numeric character references
-as specified in RFC 1866.
-If set to
-.Dv VIS_MIMESTYLE ,
-.Fn unvis
-will decode MIME Quoted-Printable strings as specified in RFC 2045.
-If set to
-.Dv VIS_NOESCAPE ,
-.Fn unvis
-will not decode
-.Ql \e
-quoted characters.
-.Pp
-The following code fragment illustrates a proper use of
-.Fn unvis .
-.Bd -literal -offset indent
-int state = 0;
-char out;
-
-while ((ch = getchar()) != EOF) {
-again:
-	switch(unvis(\*[Am]out, ch, \*[Am]state, 0)) {
-	case 0:
-	case UNVIS_NOCHAR:
-		break;
-	case UNVIS_VALID:
-		(void)putchar(out);
-		break;
-	case UNVIS_VALIDPUSH:
-		(void)putchar(out);
-		goto again;
-	case UNVIS_SYNBAD:
-		errx(EXIT_FAILURE, "Bad character sequence!");
-	}
-}
-if (unvis(\*[Am]out, '\e0', \*[Am]state, UNVIS_END) == UNVIS_VALID)
-	(void)putchar(out);
-.Ed
-.Sh ERRORS
-The functions
-.Fn strunvis ,
-.Fn strnunvis ,
-.Fn strunvisx ,
-and
-.Fn strnunvisx
-will return \-1 on error and set
-.Va errno
-to:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-An invalid escape sequence was detected, or the decoder is in an unknown state.
-.El
-.Pp
-In addition the functions
-.Fn strnunvis
-and
-.Fn strnunvisx
-will can also set
-.Va errno
-on error to:
-.Bl -tag -width Er
-.It Bq Er ENOSPC
-Not enough space to perform the conversion.
-.El
-.Sh SEE ALSO
-.Xr unvis 1 ,
-.Xr vis 1 ,
-.Xr vis 3
-.Rs
-.%A R. Fielding
-.%T Relative Uniform Resource Locators
-.%O RFC1808
-.Re
-.Sh HISTORY
-The
-.Fn unvis
-function
-first appeared in
-.Bx 4.4 .
-The
-.Fn strnunvis
-and
-.Fn strnunvisx
-functions appeared in
-.Nx 6.0 .
-.Sh BUGS
-The names
-.Dv VIS_HTTP1808
-and
-.Dv VIS_HTTP1866
-are wrong.
-Percent-encoding was defined in RFC 1738, the original RFC for URL.
-RFC 1866 defines HTML 2.0, an application of SGML, from which it
-inherits concepts of numeric character references and entity
-references.
diff --git a/lib/libc/gen/unvis.c b/lib/libc/gen/unvis.c
deleted file mode 100644
index 30fad8154..000000000
--- a/lib/libc/gen/unvis.c
+++ /dev/null
@@ -1,559 +0,0 @@
-/*	$NetBSD: unvis.c,v 1.44 2014/09/26 15:43:36 roy Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: unvis.c,v 1.44 2014/09/26 15:43:36 roy Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <errno.h>
-#include <vis.h>
-
-#ifdef __weak_alias
-__weak_alias(strnunvisx,_strnunvisx)
-#endif
-
-#if !HAVE_VIS
-/*
- * decode driven by state machine
- */
-#define	S_GROUND	0	/* haven't seen escape char */
-#define	S_START		1	/* start decoding special sequence */
-#define	S_META		2	/* metachar started (M) */
-#define	S_META1		3	/* metachar more, regular char (-) */
-#define	S_CTRL		4	/* control char started (^) */
-#define	S_OCTAL2	5	/* octal digit 2 */
-#define	S_OCTAL3	6	/* octal digit 3 */
-#define	S_HEX		7	/* mandatory hex digit */
-#define	S_HEX1		8	/* http hex digit */
-#define	S_HEX2		9	/* http hex digit 2 */
-#define	S_MIME1		10	/* mime hex digit 1 */
-#define	S_MIME2		11	/* mime hex digit 2 */
-#define	S_EATCRNL	12	/* mime eating CRNL */
-#define	S_AMP		13	/* seen & */
-#define	S_NUMBER	14	/* collecting number */
-#define	S_STRING	15	/* collecting string */
-
-#define	isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
-#define	xtod(c)		(isdigit(c) ? (c - '0') : ((tolower(c) - 'a') + 10))
-#define	XTOD(c)		(isdigit(c) ? (c - '0') : ((c - 'A') + 10))
-
-/*
- * RFC 1866
- */
-static const struct nv {
-	char name[7];
-	uint8_t value;
-} nv[] = {
-	{ "AElig",	198 }, /* capital AE diphthong (ligature)  */
-	{ "Aacute",	193 }, /* capital A, acute accent  */
-	{ "Acirc",	194 }, /* capital A, circumflex accent  */
-	{ "Agrave",	192 }, /* capital A, grave accent  */
-	{ "Aring",	197 }, /* capital A, ring  */
-	{ "Atilde",	195 }, /* capital A, tilde  */
-	{ "Auml",	196 }, /* capital A, dieresis or umlaut mark  */
-	{ "Ccedil",	199 }, /* capital C, cedilla  */
-	{ "ETH",	208 }, /* capital Eth, Icelandic  */
-	{ "Eacute",	201 }, /* capital E, acute accent  */
-	{ "Ecirc",	202 }, /* capital E, circumflex accent  */
-	{ "Egrave",	200 }, /* capital E, grave accent  */
-	{ "Euml",	203 }, /* capital E, dieresis or umlaut mark  */
-	{ "Iacute",	205 }, /* capital I, acute accent  */
-	{ "Icirc",	206 }, /* capital I, circumflex accent  */
-	{ "Igrave",	204 }, /* capital I, grave accent  */
-	{ "Iuml",	207 }, /* capital I, dieresis or umlaut mark  */
-	{ "Ntilde",	209 }, /* capital N, tilde  */
-	{ "Oacute",	211 }, /* capital O, acute accent  */
-	{ "Ocirc",	212 }, /* capital O, circumflex accent  */
-	{ "Ograve",	210 }, /* capital O, grave accent  */
-	{ "Oslash",	216 }, /* capital O, slash  */
-	{ "Otilde",	213 }, /* capital O, tilde  */
-	{ "Ouml",	214 }, /* capital O, dieresis or umlaut mark  */
-	{ "THORN",	222 }, /* capital THORN, Icelandic  */
-	{ "Uacute",	218 }, /* capital U, acute accent  */
-	{ "Ucirc",	219 }, /* capital U, circumflex accent  */
-	{ "Ugrave",	217 }, /* capital U, grave accent  */
-	{ "Uuml",	220 }, /* capital U, dieresis or umlaut mark  */
-	{ "Yacute",	221 }, /* capital Y, acute accent  */
-	{ "aacute",	225 }, /* small a, acute accent  */
-	{ "acirc",	226 }, /* small a, circumflex accent  */
-	{ "acute",	180 }, /* acute accent  */
-	{ "aelig",	230 }, /* small ae diphthong (ligature)  */
-	{ "agrave",	224 }, /* small a, grave accent  */
-	{ "amp",	 38 }, /* ampersand  */
-	{ "aring",	229 }, /* small a, ring  */
-	{ "atilde",	227 }, /* small a, tilde  */
-	{ "auml",	228 }, /* small a, dieresis or umlaut mark  */
-	{ "brvbar",	166 }, /* broken (vertical) bar  */
-	{ "ccedil",	231 }, /* small c, cedilla  */
-	{ "cedil",	184 }, /* cedilla  */
-	{ "cent",	162 }, /* cent sign  */
-	{ "copy",	169 }, /* copyright sign  */
-	{ "curren",	164 }, /* general currency sign  */
-	{ "deg",	176 }, /* degree sign  */
-	{ "divide",	247 }, /* divide sign  */
-	{ "eacute",	233 }, /* small e, acute accent  */
-	{ "ecirc",	234 }, /* small e, circumflex accent  */
-	{ "egrave",	232 }, /* small e, grave accent  */
-	{ "eth",	240 }, /* small eth, Icelandic  */
-	{ "euml",	235 }, /* small e, dieresis or umlaut mark  */
-	{ "frac12",	189 }, /* fraction one-half  */
-	{ "frac14",	188 }, /* fraction one-quarter  */
-	{ "frac34",	190 }, /* fraction three-quarters  */
-	{ "gt",		 62 }, /* greater than  */
-	{ "iacute",	237 }, /* small i, acute accent  */
-	{ "icirc",	238 }, /* small i, circumflex accent  */
-	{ "iexcl",	161 }, /* inverted exclamation mark  */
-	{ "igrave",	236 }, /* small i, grave accent  */
-	{ "iquest",	191 }, /* inverted question mark  */
-	{ "iuml",	239 }, /* small i, dieresis or umlaut mark  */
-	{ "laquo",	171 }, /* angle quotation mark, left  */
-	{ "lt",		 60 }, /* less than  */
-	{ "macr",	175 }, /* macron  */
-	{ "micro",	181 }, /* micro sign  */
-	{ "middot",	183 }, /* middle dot  */
-	{ "nbsp",	160 }, /* no-break space  */
-	{ "not",	172 }, /* not sign  */
-	{ "ntilde",	241 }, /* small n, tilde  */
-	{ "oacute",	243 }, /* small o, acute accent  */
-	{ "ocirc",	244 }, /* small o, circumflex accent  */
-	{ "ograve",	242 }, /* small o, grave accent  */
-	{ "ordf",	170 }, /* ordinal indicator, feminine  */
-	{ "ordm",	186 }, /* ordinal indicator, masculine  */
-	{ "oslash",	248 }, /* small o, slash  */
-	{ "otilde",	245 }, /* small o, tilde  */
-	{ "ouml",	246 }, /* small o, dieresis or umlaut mark  */
-	{ "para",	182 }, /* pilcrow (paragraph sign)  */
-	{ "plusmn",	177 }, /* plus-or-minus sign  */
-	{ "pound",	163 }, /* pound sterling sign  */
-	{ "quot",	 34 }, /* double quote  */
-	{ "raquo",	187 }, /* angle quotation mark, right  */
-	{ "reg",	174 }, /* registered sign  */
-	{ "sect",	167 }, /* section sign  */
-	{ "shy",	173 }, /* soft hyphen  */
-	{ "sup1",	185 }, /* superscript one  */
-	{ "sup2",	178 }, /* superscript two  */
-	{ "sup3",	179 }, /* superscript three  */
-	{ "szlig",	223 }, /* small sharp s, German (sz ligature)  */
-	{ "thorn",	254 }, /* small thorn, Icelandic  */
-	{ "times",	215 }, /* multiply sign  */
-	{ "uacute",	250 }, /* small u, acute accent  */
-	{ "ucirc",	251 }, /* small u, circumflex accent  */
-	{ "ugrave",	249 }, /* small u, grave accent  */
-	{ "uml",	168 }, /* umlaut (dieresis)  */
-	{ "uuml",	252 }, /* small u, dieresis or umlaut mark  */
-	{ "yacute",	253 }, /* small y, acute accent  */
-	{ "yen",	165 }, /* yen sign  */
-	{ "yuml",	255 }, /* small y, dieresis or umlaut mark  */
-};
-
-/*
- * unvis - decode characters previously encoded by vis
- */
-int
-unvis(char *cp, int c, int *astate, int flag)
-{
-	unsigned char uc = (unsigned char)c;
-	unsigned char st, ia, is, lc;
-
-/*
- * Bottom 8 bits of astate hold the state machine state.
- * Top 8 bits hold the current character in the http 1866 nv string decoding
- */
-#define GS(a)		((a) & 0xff)
-#define SS(a, b)	(((uint32_t)(a) << 24) | (b))
-#define GI(a)		((uint32_t)(a) >> 24)
-
-	_DIAGASSERT(cp != NULL);
-	_DIAGASSERT(astate != NULL);
-	st = GS(*astate);
-
-	if (flag & UNVIS_END) {
-		switch (st) {
-		case S_OCTAL2:
-		case S_OCTAL3:
-		case S_HEX2:
-			*astate = SS(0, S_GROUND);
-			return UNVIS_VALID;
-		case S_GROUND:
-			return UNVIS_NOCHAR;
-		default:
-			return UNVIS_SYNBAD;
-		}
-	}
-
-	switch (st) {
-
-	case S_GROUND:
-		*cp = 0;
-		if ((flag & VIS_NOESCAPE) == 0 && c == '\\') {
-			*astate = SS(0, S_START);
-			return UNVIS_NOCHAR;
-		}
-		if ((flag & VIS_HTTP1808) && c == '%') {
-			*astate = SS(0, S_HEX1);
-			return UNVIS_NOCHAR;
-		}
-		if ((flag & VIS_HTTP1866) && c == '&') {
-			*astate = SS(0, S_AMP);
-			return UNVIS_NOCHAR;
-		}
-		if ((flag & VIS_MIMESTYLE) && c == '=') {
-			*astate = SS(0, S_MIME1);
-			return UNVIS_NOCHAR;
-		}
-		*cp = c;
-		return UNVIS_VALID;
-
-	case S_START:
-		switch(c) {
-		case '\\':
-			*cp = c;
-			*astate = SS(0, S_GROUND);
-			return UNVIS_VALID;
-		case '0': case '1': case '2': case '3':
-		case '4': case '5': case '6': case '7':
-			*cp = (c - '0');
-			*astate = SS(0, S_OCTAL2);
-			return UNVIS_NOCHAR;
-		case 'M':
-			*cp = (char)0200;
-			*astate = SS(0, S_META);
-			return UNVIS_NOCHAR;
-		case '^':
-			*astate = SS(0, S_CTRL);
-			return UNVIS_NOCHAR;
-		case 'n':
-			*cp = '\n';
-			*astate = SS(0, S_GROUND);
-			return UNVIS_VALID;
-		case 'r':
-			*cp = '\r';
-			*astate = SS(0, S_GROUND);
-			return UNVIS_VALID;
-		case 'b':
-			*cp = '\b';
-			*astate = SS(0, S_GROUND);
-			return UNVIS_VALID;
-		case 'a':
-			*cp = '\007';
-			*astate = SS(0, S_GROUND);
-			return UNVIS_VALID;
-		case 'v':
-			*cp = '\v';
-			*astate = SS(0, S_GROUND);
-			return UNVIS_VALID;
-		case 't':
-			*cp = '\t';
-			*astate = SS(0, S_GROUND);
-			return UNVIS_VALID;
-		case 'f':
-			*cp = '\f';
-			*astate = SS(0, S_GROUND);
-			return UNVIS_VALID;
-		case 's':
-			*cp = ' ';
-			*astate = SS(0, S_GROUND);
-			return UNVIS_VALID;
-		case 'E':
-			*cp = '\033';
-			*astate = SS(0, S_GROUND);
-			return UNVIS_VALID;
-		case 'x':
-			*astate = SS(0, S_HEX);
-			return UNVIS_NOCHAR;
-		case '\n':
-			/*
-			 * hidden newline
-			 */
-			*astate = SS(0, S_GROUND);
-			return UNVIS_NOCHAR;
-		case '$':
-			/*
-			 * hidden marker
-			 */
-			*astate = SS(0, S_GROUND);
-			return UNVIS_NOCHAR;
-		default:
-			if (isgraph(c)) {
-				*cp = c;
-				*astate = SS(0, S_GROUND);
-				return UNVIS_VALID;
-			}
-		}
-		goto bad;
-
-	case S_META:
-		if (c == '-')
-			*astate = SS(0, S_META1);
-		else if (c == '^')
-			*astate = SS(0, S_CTRL);
-		else 
-			goto bad;
-		return UNVIS_NOCHAR;
-
-	case S_META1:
-		*astate = SS(0, S_GROUND);
-		*cp |= c;
-		return UNVIS_VALID;
-
-	case S_CTRL:
-		if (c == '?')
-			*cp |= 0177;
-		else
-			*cp |= c & 037;
-		*astate = SS(0, S_GROUND);
-		return UNVIS_VALID;
-
-	case S_OCTAL2:	/* second possible octal digit */
-		if (isoctal(uc)) {
-			/*
-			 * yes - and maybe a third
-			 */
-			*cp = (*cp << 3) + (c - '0');
-			*astate = SS(0, S_OCTAL3);
-			return UNVIS_NOCHAR;
-		}
-		/*
-		 * no - done with current sequence, push back passed char
-		 */
-		*astate = SS(0, S_GROUND);
-		return UNVIS_VALIDPUSH;
-
-	case S_OCTAL3:	/* third possible octal digit */
-		*astate = SS(0, S_GROUND);
-		if (isoctal(uc)) {
-			*cp = (*cp << 3) + (c - '0');
-			return UNVIS_VALID;
-		}
-		/*
-		 * we were done, push back passed char
-		 */
-		return UNVIS_VALIDPUSH;
-
-	case S_HEX:
-		if (!isxdigit(uc))
-			goto bad;
-		/*FALLTHROUGH*/
-	case S_HEX1:
-		if (isxdigit(uc)) {
-			*cp = xtod(uc);
-			*astate = SS(0, S_HEX2);
-			return UNVIS_NOCHAR;
-		}
-		/*
-		 * no - done with current sequence, push back passed char
-		 */
-		*astate = SS(0, S_GROUND);
-		return UNVIS_VALIDPUSH;
-
-	case S_HEX2:
-		*astate = S_GROUND;
-		if (isxdigit(uc)) {
-			*cp = xtod(uc) | (*cp << 4);
-			return UNVIS_VALID;
-		}
-		return UNVIS_VALIDPUSH;
-
-	case S_MIME1:
-		if (uc == '\n' || uc == '\r') {
-			*astate = SS(0, S_EATCRNL);
-			return UNVIS_NOCHAR;
-		}
-		if (isxdigit(uc) && (isdigit(uc) || isupper(uc))) {
-			*cp = XTOD(uc);
-			*astate = SS(0, S_MIME2);
-			return UNVIS_NOCHAR;
-		}
-		goto bad;
-
-	case S_MIME2:
-		if (isxdigit(uc) && (isdigit(uc) || isupper(uc))) {
-			*astate = SS(0, S_GROUND);
-			*cp = XTOD(uc) | (*cp << 4);
-			return UNVIS_VALID;
-		}
-		goto bad;
-
-	case S_EATCRNL:
-		switch (uc) {
-		case '\r':
-		case '\n':
-			return UNVIS_NOCHAR;
-		case '=':
-			*astate = SS(0, S_MIME1);
-			return UNVIS_NOCHAR;
-		default:
-			*cp = uc;
-			*astate = SS(0, S_GROUND);
-			return UNVIS_VALID;
-		}
-
-	case S_AMP:
-		*cp = 0;
-		if (uc == '#') {
-			*astate = SS(0, S_NUMBER);
-			return UNVIS_NOCHAR;
-		}
-		*astate = SS(0, S_STRING);
-		/*FALLTHROUGH*/
-
-	case S_STRING:
-		ia = *cp;		/* index in the array */
-		is = GI(*astate);	/* index in the string */
-		lc = is == 0 ? 0 : nv[ia].name[is - 1];	/* last character */
-
-		if (uc == ';')
-			uc = '\0';
-
-		for (; ia < __arraycount(nv); ia++) {
-			if (is != 0 && nv[ia].name[is - 1] != lc)
-				goto bad;
-			if (nv[ia].name[is] == uc)
-				break;
-		}
-
-		if (ia == __arraycount(nv))
-			goto bad;
-
-		if (uc != 0) {
-			*cp = ia;
-			*astate = SS(is + 1, S_STRING);
-			return UNVIS_NOCHAR;
-		}
-
-		*cp = nv[ia].value;
-		*astate = SS(0, S_GROUND);
-		return UNVIS_VALID;
-
-	case S_NUMBER:
-		if (uc == ';')
-			return UNVIS_VALID;
-		if (!isdigit(uc))
-			goto bad;
-		*cp += (*cp * 10) + uc - '0';
-		return UNVIS_NOCHAR;
-
-	default:
-	bad:
-		/*
-		 * decoder in unknown state - (probably uninitialized)
-		 */
-		*astate = SS(0, S_GROUND);
-		return UNVIS_SYNBAD;
-	}
-}
-
-/*
- * strnunvisx - decode src into dst
- *
- *	Number of chars decoded into dst is returned, -1 on error.
- *	Dst is null terminated.
- */
-
-int
-strnunvisx(char *dst, size_t dlen, const char *src, int flag)
-{
-	char c;
-	char t = '\0', *start = dst;
-	int state = 0;
-
-	_DIAGASSERT(src != NULL);
-	_DIAGASSERT(dst != NULL);
-#define CHECKSPACE() \
-	do { \
-		if (dlen-- == 0) { \
-			errno = ENOSPC; \
-			return -1; \
-		} \
-	} while (/*CONSTCOND*/0)
-
-	while ((c = *src++) != '\0') {
- again:
-		switch (unvis(&t, c, &state, flag)) {
-		case UNVIS_VALID:
-			CHECKSPACE();
-			*dst++ = t;
-			break;
-		case UNVIS_VALIDPUSH:
-			CHECKSPACE();
-			*dst++ = t;
-			goto again;
-		case 0:
-		case UNVIS_NOCHAR:
-			break;
-		case UNVIS_SYNBAD:
-			errno = EINVAL;
-			return -1;
-		default:
-			_DIAGASSERT(/*CONSTCOND*/0);
-			errno = EINVAL;
-			return -1;
-		}
-	}
-	if (unvis(&t, c, &state, UNVIS_END) == UNVIS_VALID) {
-		CHECKSPACE();
-		*dst++ = t;
-	}
-	CHECKSPACE();
-	*dst = '\0';
-	return (int)(dst - start);
-}
-
-int
-strunvisx(char *dst, const char *src, int flag)
-{
-	return strnunvisx(dst, (size_t)~0, src, flag);
-}
-
-int
-strunvis(char *dst, const char *src)
-{
-	return strnunvisx(dst, (size_t)~0, src, 0);
-}
-
-int
-strnunvis(char *dst, size_t dlen, const char *src)
-{
-	return strnunvisx(dst, dlen, src, 0);
-}
-#endif
diff --git a/lib/libc/gen/usleep.3 b/lib/libc/gen/usleep.3
deleted file mode 100644
index 12ae2e2d7..000000000
--- a/lib/libc/gen/usleep.3
+++ /dev/null
@@ -1,104 +0,0 @@
-.\"	$NetBSD: usleep.3,v 1.19 2010/04/29 17:29:56 jruoho Exp $
-.\"
-.\" Copyright (c) 1986, 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. 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.
-.\"
-.\"     @(#)usleep.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 29, 2010
-.Dt USLEEP 3
-.Os
-.Sh NAME
-.Nm usleep
-.Nd suspend execution for interval of microseconds
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn usleep "useconds_t microseconds"
-.Sh DESCRIPTION
-The
-.Fn usleep
-function
-suspends execution of the calling process
-until either the number of microseconds specified by
-.Fa microseconds
-have elapsed or a signal is delivered to the calling process and its
-action is to invoke a signal catching function or to terminate the
-process.
-The suspension time may be longer than requested due to the
-scheduling of other activity by the system.
-.Pp
-The
-.Fa microseconds
-argument must be less than 1,000,000.
-If the value of
-.Fa microseconds
-is 0, then the call has no effect.
-.Sh RETURN VALUES
-On successful completion,
-.Fn usleep
-returns 0.
-Otherwise, it returns \-1 and sets
-.Va errno
-to indicate the error.
-.Sh ERRORS
-The
-.Fn usleep
-function may fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa microseconds
-interval specified 1,000,000 or more microseconds.
-.El
-.Sh SEE ALSO
-.Xr nanosleep 2 ,
-.Xr sleep 3
-.Sh STANDARDS
-The
-.Fn usleep
-function conforms to
-.St -xpg4.2 .
-It later appeared in the
-.Tn POSIX
-standard, but in
-.St -p1003.1-2004
-it was marked as legacy and the use of
-.Xr nanosleep 2
-was recommended instead.
-The
-.St -p1003.1-2008
-revision removed
-.Fn usleep
-from the specification.
-.Sh HISTORY
-The
-.Fn usleep
-function appeared in
-.Bx 4.3 .
diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c
deleted file mode 100644
index 8a7dcfb88..000000000
--- a/lib/libc/gen/usleep.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: usleep.c,v 1.20 2012/06/25 22:32:44 abs Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: usleep.c,v 1.20 2012/06/25 22:32:44 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <errno.h>
-#include <time.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(usleep,_usleep)
-#endif
-
-int
-usleep(useconds_t useconds)
-{
-	struct timespec ts;
-
-	if (useconds == 0)
-		return (0);
-
-	if (useconds >= 1000000) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	ts.tv_sec  = 0;
-	ts.tv_nsec = useconds * 1000;
-
-	nanosleep(&ts, NULL);
-
-	return (0);
-}
diff --git a/lib/libc/gen/utime.3 b/lib/libc/gen/utime.3
deleted file mode 100644
index 365088950..000000000
--- a/lib/libc/gen/utime.3
+++ /dev/null
@@ -1,149 +0,0 @@
-.\"	$NetBSD: utime.3,v 1.22 2014/10/19 16:47:51 njoly Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)utime.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 29, 2010
-.Dt UTIME 3
-.Os
-.Sh NAME
-.Nm utime
-.Nd set file times
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In utime.h
-.Ft int
-.Fn utime "const char *file" "const struct utimbuf *timep"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is obsoleted by
-.Xr utimes 2 .
-.Ef
-.Pp
-The
-.Fn utime
-function sets the access and modification times of the named file.
-.Pp
-If
-.Fa timep
-is
-.Dv NULL ,
-the access and modification times are set to the current time.
-The calling process must be the owner of the file or have permission to
-write the file.
-.Pp
-If
-.Fa timep
-is
-.Pf non- Dv NULL ,
-.Fa time
-is assumed to be a pointer to a utimbuf structure, as defined in
-.In utime.h :
-.Bd -literal -offset indent
-struct utimbuf {
-	time_t actime;          /* Access time */
-	time_t modtime;         /* Modification time */
-};
-.Ed
-.Pp
-The access time is set to the value of the actime member, and the
-modification time is set to the value of the modtime member.
-The times are measured in seconds since 0 hours, 0 minutes, 0
-seconds, January 1, 1970 Coordinated Universal Time (UTC).
-The calling process must be the owner of the file or be the super-user.
-.Pp
-In either case, the inode-change-time of the file is set to the current
-time.
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn utime
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix;
-or 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
-.Fa file
-or
-.Fa times
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-The pathname contains a character with the high-order bit set.
-.It Bq Er EIO
-An I/O error occurred while reading or writing the affected inode.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters,
-or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.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
-.Sh SEE ALSO
-.Xr stat 2 ,
-.Xr utimes 2
-.Sh STANDARDS
-The
-.Fn utime
-function conforms to
-.St -p1003.1-90 .
-It was however marked as legacy in the
-.St -p1003.1-2008
-revision of the standard.
-.Sh HISTORY
-A
-.Fn utime
-function appeared in
-.At v7 .
diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c
deleted file mode 100644
index d41aac74c..000000000
--- a/lib/libc/gen/utime.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: utime.c,v 1.14 2012/06/25 22:32:44 abs Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)utime.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: utime.c,v 1.14 2012/06/25 22:32:44 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/time.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stddef.h>
-#include <utime.h>
-
-int
-utime(const char *path, const struct utimbuf *times)
-{
-	struct timeval tv[2], *tvp;
-
-	_DIAGASSERT(path != NULL);
-
-	if (times == (struct utimbuf *) NULL)
-		tvp = NULL;
-	else {
-		tv[0].tv_sec = times->actime;
-		tv[1].tv_sec = times->modtime;
-		tv[0].tv_usec = tv[1].tv_usec = 0;
-		tvp = tv;
-	}
-	return (utimes(path, tvp));
-}
diff --git a/lib/libc/gen/utimens.c b/lib/libc/gen/utimens.c
deleted file mode 100644
index 9fb9beeb8..000000000
--- a/lib/libc/gen/utimens.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: utimens.c,v 1.1 2012/11/03 19:39:21 christos Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: utimens.c,v 1.1 2012/11/03 19:39:21 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#define _INCOMPLETE_XOPEN_C063
-#include <fcntl.h>
-#include <sys/stat.h>
-
-int
-utimens(const char *path, const struct timespec *times)
-{
-	return utimensat(AT_FDCWD, path, times, 0);
-}
-
-int
-lutimens(const char *path, const struct timespec *times)
-{
-	return utimensat(AT_FDCWD, path, times, AT_SYMLINK_NOFOLLOW);
-}
diff --git a/lib/libc/gen/utmp.c b/lib/libc/gen/utmp.c
deleted file mode 100644
index 9fb0799db..000000000
--- a/lib/libc/gen/utmp.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*	$NetBSD: utmp.c,v 1.10 2011/10/15 23:00:02 christos Exp $	 */
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: utmp.c,v 1.10 2011/10/15 23:00:02 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <utmp.h>
-#include <sys/stat.h>
-
-static struct utmp utmp;
-static FILE *ut;
-static char utfile[MAXPATHLEN] = _PATH_UTMP;
-
-void
-setutent(void)
-{
-	if (ut == NULL)
-		return;
-	(void)fseeko(ut, (off_t)0, SEEK_SET);
-}
-
-struct utmp *
-getutent(void)
-{
-	if (ut == NULL) {
-		struct stat st;
-		off_t numentries;
-		if ((ut = fopen(utfile, "re")) == NULL)
-			return NULL;
-		if (fstat(fileno(ut), &st) == -1)
-			goto out;
-		/*
-		 * If we have a an old version utmp file bail.
-		 */
-		numentries = st.st_size / sizeof(utmp);
-		if ((off_t)(numentries * sizeof(utmp)) != st.st_size)
-			goto out;
-	}
-	if (fread(&utmp, sizeof(utmp), 1, ut) == 1)
-		return &utmp;
-out:
-	(void)fclose(ut);
-	return NULL;
-}
-
-void
-endutent(void)
-{
-	if (ut != NULL) {
-		(void)fclose(ut);
-		ut = NULL;
-	}
-}
-
-int
-utmpname(const char *fname)
-{
-	size_t len = strlen(fname);
-
-	if (len >= sizeof(utfile))
-		return 0;
-
-	/* must not end in x! */
-	if (fname[len - 1] == 'x')
-		return 0;
-
-	(void)strlcpy(utfile, fname, sizeof(utfile));
-	endutent();
-	return 1;
-}
diff --git a/lib/libc/gen/utmpx.c b/lib/libc/gen/utmpx.c
deleted file mode 100644
index edc13f7c5..000000000
--- a/lib/libc/gen/utmpx.c
+++ /dev/null
@@ -1,488 +0,0 @@
-/*	$NetBSD: utmpx.c,v 1.35 2015/05/23 11:48:13 christos Exp $	 */
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: utmpx.c,v 1.35 2015/05/23 11:48:13 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-
-#include <assert.h>
-#include <db.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <utmp.h>
-#include <utmpx.h>
-#include <vis.h>
-
-static FILE *fp;
-static int readonly = 0;
-static int version = 1;
-static struct utmpx ut;
-static char utfile[MAXPATHLEN] = _PATH_UTMPX;
-
-static struct utmpx *utmp_update(const struct utmpx *);
-
-static const char vers[] = "utmpx-2.00";
-
-struct otimeval {
-	long tv_sec;
-	long tv_usec;
-};
-
-static void
-old2new(struct utmpx *utx)
-{
-	struct otimeval otv;
-	struct timeval *tv = &utx->ut_tv;
-	(void)memcpy(&otv, tv, sizeof(otv));
-	tv->tv_sec = otv.tv_sec;
-	tv->tv_usec = (suseconds_t)otv.tv_usec;
-}
-
-static void
-new2old(struct utmpx *utx)
-{
-	struct otimeval otv;
-	struct timeval *tv = &utx->ut_tv;
-
-	otv.tv_sec = (long)tv->tv_sec;
-	otv.tv_usec = (long)tv->tv_usec;
-	(void)memcpy(tv, &otv, sizeof(otv));
-}
-
-void
-setutxent(void)
-{
-
-	(void)memset(&ut, 0, sizeof(ut));
-	if (fp == NULL)
-		return;
-	(void)fseeko(fp, (off_t)sizeof(ut), SEEK_SET);
-}
-
-
-void
-endutxent(void)
-{
-
-	(void)memset(&ut, 0, sizeof(ut));
-	if (fp != NULL) {
-		(void)fclose(fp);
-		fp = NULL;
-		readonly = 0;
-	}
-}
-
-
-struct utmpx *
-getutxent(void)
-{
-
-	if (fp == NULL) {
-		struct stat st;
-
-		if ((fp = fopen(utfile, "re+")) == NULL)
-			if ((fp = fopen(utfile, "we+")) == NULL) {
-				if ((fp = fopen(utfile, "re")) == NULL)
-					goto fail;
-				else
-					readonly = 1;
-			}
-					
-
-		/* get file size in order to check if new file */
-		if (fstat(fileno(fp), &st) == -1)
-			goto failclose;
-
-		if (st.st_size == 0) {
-			/* new file, add signature record */
-			(void)memset(&ut, 0, sizeof(ut));
-			ut.ut_type = SIGNATURE;
-			(void)memcpy(ut.ut_user, vers, sizeof(vers));
-			if (fwrite(&ut, sizeof(ut), 1, fp) != 1)
-				goto failclose;
-		} else {
-			/* old file, read signature record */
-			if (fread(&ut, sizeof(ut), 1, fp) != 1)
-				goto failclose;
-			if (memcmp(ut.ut_user, vers, 5) != 0 ||
-			    ut.ut_type != SIGNATURE)
-				goto failclose;
-		}
-		version = ut.ut_user[6] - '0';
-	}
-
-	if (fread(&ut, sizeof(ut), 1, fp) != 1)
-		goto fail;
-	if (version == 1)
-		old2new(&ut);
-
-	return &ut;
-failclose:
-	(void)fclose(fp);
-fail:
-	(void)memset(&ut, 0, sizeof(ut));
-	return NULL;
-}
-
-
-struct utmpx *
-getutxid(const struct utmpx *utx)
-{
-
-	_DIAGASSERT(utx != NULL);
-
-	if (utx->ut_type == EMPTY)
-		return NULL;
-
-	do {
-		if (ut.ut_type == EMPTY)
-			continue;
-		switch (utx->ut_type) {
-		case EMPTY:
-			return NULL;
-		case RUN_LVL:
-		case BOOT_TIME:
-		case OLD_TIME:
-		case NEW_TIME:
-			if (ut.ut_type == utx->ut_type)
-				return &ut;
-			break;
-		case INIT_PROCESS:
-		case LOGIN_PROCESS:
-		case USER_PROCESS:
-		case DEAD_PROCESS:
-			switch (ut.ut_type) {
-			case INIT_PROCESS:
-			case LOGIN_PROCESS:
-			case USER_PROCESS:
-			case DEAD_PROCESS:
-				if (memcmp(ut.ut_id, utx->ut_id,
-				    sizeof(ut.ut_id)) == 0)
-					return &ut;
-				break;
-			default:
-				break;
-			}
-			break;
-		default:
-			return NULL;
-		}
-	} while (getutxent() != NULL);
-	return NULL;
-}
-
-
-struct utmpx *
-getutxline(const struct utmpx *utx)
-{
-
-	_DIAGASSERT(utx != NULL);
-
-	do {
-		switch (ut.ut_type) {
-		case EMPTY:
-			break;
-		case LOGIN_PROCESS:
-		case USER_PROCESS:
-			if (strncmp(ut.ut_line, utx->ut_line,
-			    sizeof(ut.ut_line)) == 0)
-				return &ut;
-			break;
-		default:
-			break;
-		}
-	} while (getutxent() != NULL);
-	return NULL;
-}
-
-
-struct utmpx *
-pututxline(const struct utmpx *utx)
-{
-	struct utmpx temp, *u = NULL;
-	int gotlock = 0;
-
-	_DIAGASSERT(utx != NULL);
-
-	if (utx == NULL)
-		return NULL;
-
-	if (strcmp(_PATH_UTMPX, utfile) == 0) {
-		if (geteuid() == 0) {
-			if (fp != NULL && readonly)
-				endutxent();
-		} else {
-			if (fp == NULL || readonly)
-				return utmp_update(utx);
-		}
-	}
-
-
-	(void)memcpy(&temp, utx, sizeof(temp));
-
-	if (fp == NULL) {
-		(void)getutxent();
-		if (fp == NULL || readonly)
-			return NULL;
-	}
-
-	if (getutxid(&temp) == NULL) {
-		setutxent();
-		if (getutxid(&temp) == NULL) {
-			if (lockf(fileno(fp), F_LOCK, (off_t)0) == -1)
-				return NULL;
-			gotlock++;
-			if (fseeko(fp, (off_t)0, SEEK_END) == -1)
-				goto fail;
-		}
-	}
-
-	if (!gotlock) {
-		/* we are not appending */
-		if (fseeko(fp, -(off_t)sizeof(ut), SEEK_CUR) == -1)
-			return NULL;
-	}
-
-	if (version == 1)
-		new2old(&temp);
-	if (fwrite(&temp, sizeof (temp), 1, fp) != 1)
-		goto fail;
-
-	if (fflush(fp) == -1)
-		goto fail;
-
-	u = memcpy(&ut, &temp, sizeof(ut));
-fail:
-	if (gotlock) {
-		if (lockf(fileno(fp), F_ULOCK, (off_t)0) == -1)
-			return NULL;
-	}
-	return u;
-}
-
-
-static struct utmpx *
-utmp_update(const struct utmpx *utx)
-{
-	char buf[sizeof(*utx) * 4 + 1];
-	pid_t pid;
-	int status;
-
-	_DIAGASSERT(utx != NULL);
-
-	(void)strvisx(buf, (const char *)(const void *)utx, sizeof(*utx),
-	    VIS_WHITE | VIS_NOLOCALE);
-	switch (pid = fork()) {
-	case 0:
-		(void)execl(_PATH_UTMP_UPDATE,
-		    strrchr(_PATH_UTMP_UPDATE, '/') + 1, buf, NULL);
-		_exit(1);
-		/*NOTREACHED*/
-	case -1:
-		return NULL;
-	default:
-		if (waitpid(pid, &status, 0) == -1)
-			return NULL;
-		if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
-			return memcpy(&ut, utx, sizeof(ut));
-		return NULL;
-	}
-
-}
-
-/*
- * The following are extensions and not part of the X/Open spec.
- */
-int
-updwtmpx(const char *file, const struct utmpx *utx)
-{
-	int fd;
-	int saved_errno;
-
-	_DIAGASSERT(file != NULL);
-	_DIAGASSERT(utx != NULL);
-
-	fd = open(file, O_WRONLY|O_APPEND|O_SHLOCK|O_CLOEXEC);
-
-	if (fd == -1) {
-		if ((fd = open(file, O_CREAT|O_WRONLY|O_EXLOCK|O_CLOEXEC, 0644)) == -1)
-			return -1;
-		(void)memset(&ut, 0, sizeof(ut));
-		ut.ut_type = SIGNATURE;
-		(void)memcpy(ut.ut_user, vers, sizeof(vers));
-		if (write(fd, &ut, sizeof(ut)) == -1)
-			goto failed;
-	}
-	if (write(fd, utx, sizeof(*utx)) == -1)
-		goto failed;
-	if (close(fd) == -1)
-		return -1;
-	return 0;
-
-  failed:
-	saved_errno = errno;
-	(void) close(fd);
-	errno = saved_errno;
-	return -1;
-}
-
-
-int
-utmpxname(const char *fname)
-{
-	size_t len;
-
-	_DIAGASSERT(fname != NULL);
-
-	len = strlen(fname);
-
-	if (len >= sizeof(utfile))
-		return 0;
-
-	/* must end in x! */
-	if (fname[len - 1] != 'x')
-		return 0;
-
-	(void)strlcpy(utfile, fname, sizeof(utfile));
-	endutxent();
-	return 1;
-}
-
-
-void
-getutmp(const struct utmpx *ux, struct utmp *u)
-{
-
-	_DIAGASSERT(ux != NULL);
-	_DIAGASSERT(u != NULL);
-
-	(void)memcpy(u->ut_name, ux->ut_name, sizeof(u->ut_name));
-	(void)memcpy(u->ut_line, ux->ut_line, sizeof(u->ut_line));
-	(void)memcpy(u->ut_host, ux->ut_host, sizeof(u->ut_host));
-	u->ut_time = ux->ut_tv.tv_sec;
-}
-
-void
-getutmpx(const struct utmp *u, struct utmpx *ux)
-{
-
-	_DIAGASSERT(ux != NULL);
-	_DIAGASSERT(u != NULL);
-
-	(void)memcpy(ux->ut_name, u->ut_name, sizeof(u->ut_name));
-	(void)memcpy(ux->ut_line, u->ut_line, sizeof(u->ut_line));
-	(void)memcpy(ux->ut_host, u->ut_host, sizeof(u->ut_host));
-	ux->ut_tv.tv_sec = u->ut_time;
-	ux->ut_tv.tv_usec = 0;
-	(void)memset(&ux->ut_ss, 0, sizeof(ux->ut_ss));
-	ux->ut_pid = 0;
-	ux->ut_type = USER_PROCESS;
-	ux->ut_session = 0;
-	ux->ut_exit.e_termination = 0;
-	ux->ut_exit.e_exit = 0;
-}
-
-struct lastlogx *
-getlastlogx(const char *fname, uid_t uid, struct lastlogx *ll)
-{
-	DBT key, data;
-	DB *db;
-
-	_DIAGASSERT(fname != NULL);
-	_DIAGASSERT(ll != NULL);
-
-	db = dbopen(fname, O_RDONLY|O_SHLOCK|O_CLOEXEC, 0, DB_HASH, NULL);
-
-	if (db == NULL)
-		return NULL;
-
-	key.data = &uid;
-	key.size = sizeof(uid);
-
-	if ((db->get)(db, &key, &data, 0) != 0)
-		goto error;
-
-	if (data.size != sizeof(*ll)) {
-		errno = EFTYPE;
-		goto error;
-	}
-
-	if (ll == NULL)
-		if ((ll = malloc(sizeof(*ll))) == NULL)
-			goto done;
-
-	(void)memcpy(ll, data.data, sizeof(*ll));
-	goto done;
-error:
-	ll = NULL;
-done:
-	(db->close)(db);
-	return ll;
-}
-
-int
-updlastlogx(const char *fname, uid_t uid, struct lastlogx *ll)
-{
-	DBT key, data;
-	int error = 0;
-	DB *db;
-
-	_DIAGASSERT(fname != NULL);
-	_DIAGASSERT(ll != NULL);
-
-	db = dbopen(fname, O_RDWR|O_CREAT|O_EXLOCK|O_CLOEXEC, 0644, DB_HASH, NULL);
-
-	if (db == NULL)
-		return -1;
-
-	key.data = &uid;
-	key.size = sizeof(uid);
-	data.data = ll;
-	data.size = sizeof(*ll);
-	if ((db->put)(db, &key, &data, 0) != 0)
-		error = -1;
-
-	(db->close)(db);
-	return error;
-}
diff --git a/lib/libc/gen/valloc.3 b/lib/libc/gen/valloc.3
deleted file mode 100644
index 2c49a0de7..000000000
--- a/lib/libc/gen/valloc.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\"	$NetBSD: valloc.3,v 1.14 2010/05/08 11:22:58 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)valloc.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd May 6, 2010
-.Dt VALLOC 3
-.Os
-.Sh NAME
-.Nm valloc
-.Nd aligned memory allocation function
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void *
-.Fn valloc "size_t size"
-.Sh DESCRIPTION
-.Bf -symbolic
-The
-.Fn valloc
-function is obsoleted by the current version of
-.Xr malloc 3 ,
-which aligns page-sized and larger allocations.
-.Ef
-.Pp
-The
-.Fn valloc
-function
-allocates
-.Fa size
-bytes aligned on a page boundary.
-It is implemented by calling
-.Xr malloc 3
-with a slightly larger request, saving the true beginning of the block
-allocated, and returning a properly aligned pointer.
-.Sh RETURN VALUES
-The
-.Fn valloc
-function returns
-a pointer to the allocated space if successful; otherwise
-a null pointer is returned
-.Sh HISTORY
-The
-.Fn valloc
-function appeared in
-.Bx 3.0 .
-.Sh BUGS
-A
-.Fn vfree
-function has not been implemented.
diff --git a/lib/libc/gen/valloc.c b/lib/libc/gen/valloc.c
deleted file mode 100644
index 6a175faf0..000000000
--- a/lib/libc/gen/valloc.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: valloc.c,v 1.11 2012/06/25 22:32:44 abs Exp $	*/
-
-/*
- * Copyright (c) 1980, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)valloc.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: valloc.c,v 1.11 2012/06/25 22:32:44 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(valloc,_valloc)
-#endif
-
-void *
-valloc(size_t i)
-{
-	long valsiz = getpagesize(), j;
-	void *cp = malloc((size_t)(i + (valsiz-1)));
-
-	j = ((long)cp + (valsiz-1)) &~ (valsiz-1);
-	return ((void *)j);
-}
diff --git a/lib/libc/gen/verr.c b/lib/libc/gen/verr.c
deleted file mode 100644
index bfa9b365a..000000000
--- a/lib/libc/gen/verr.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: verr.c,v 1.16 2014/01/16 17:21:38 christos Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: verr.c,v 1.16 2014/01/16 17:21:38 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <err.h>
-#include <errno.h>
-
-#ifdef __weak_alias
-__weak_alias(verr, _verr)
-#endif
-
-#if !HAVE_ERR_H
-__dead void
-verr(int eval, const char *fmt, va_list ap)
-{
-	verrc(eval, errno, fmt, ap);
-}
-#endif
diff --git a/lib/libc/gen/verrc.c b/lib/libc/gen/verrc.c
deleted file mode 100644
index 6670e1709..000000000
--- a/lib/libc/gen/verrc.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: verrc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: verrc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <err.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(verrc, _verrc)
-#endif
-
-#if !HAVE_ERR_H || !HAVE_DECL_ERRC
-__dead void
-verrc(int eval, int code, const char *fmt, va_list ap)
-{
-	(void)fprintf(stderr, "%s: ", getprogname());
-	if (fmt != NULL) {
-		(void)vfprintf(stderr, fmt, ap);
-		(void)fprintf(stderr, ": ");
-	}
-	(void)fprintf(stderr, "%s\n", strerror(code));
-	exit(eval);
-}
-#endif
diff --git a/lib/libc/gen/verrx.c b/lib/libc/gen/verrx.c
deleted file mode 100644
index e220a4b5f..000000000
--- a/lib/libc/gen/verrx.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: verrx.c,v 1.15 2011/07/17 20:54:34 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: verrx.c,v 1.15 2011/07/17 20:54:34 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <err.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(verrx, _verrx)
-#endif
-
-#if !HAVE_ERR_H
-__dead void
-verrx(int eval, const char *fmt, va_list ap)
-{
-	(void)fprintf(stderr, "%s: ", getprogname());
-	if (fmt != NULL)
-		(void)vfprintf(stderr, fmt, ap);
-	(void)fprintf(stderr, "\n");
-	exit(eval);
-}
-#endif
diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
deleted file mode 100644
index 77c711ede..000000000
--- a/lib/libc/gen/vis.3
+++ /dev/null
@@ -1,540 +0,0 @@
-.\"	$NetBSD: vis.3,v 1.43 2015/05/23 11:47:56 christos Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"     @(#)vis.3	8.1 (Berkeley) 6/9/93
-.\"
-.Dd May 23, 2015
-.Dt VIS 3
-.Os
-.Sh NAME
-.Nm vis ,
-.Nm nvis ,
-.Nm strvis ,
-.Nm strnvis ,
-.Nm strvisx ,
-.Nm strnvisx ,
-.Nm strenvisx ,
-.Nm svis ,
-.Nm snvis ,
-.Nm strsvis ,
-.Nm strsnvis ,
-.Nm strsvisx ,
-.Nm strsnvisx ,
-.Nm strsenvisx
-.Nd visually encode characters
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In vis.h
-.Ft char *
-.Fn vis "char *dst" "int c" "int flag" "int nextc"
-.Ft char *
-.Fn nvis "char *dst" "size_t dlen" "int c" "int flag" "int nextc"
-.Ft int
-.Fn strvis "char *dst" "const char *src" "int flag"
-.Ft int
-.Fn strnvis "char *dst" "size_t dlen" "const char *src" "int flag"
-.Ft int
-.Fn strvisx "char *dst" "const char *src" "size_t len" "int flag"
-.Ft int
-.Fn strnvisx "char *dst" "size_t dlen" "const char *src" "size_t len" "int flag"
-.Ft int
-.Fn strenvisx "char *dst" "size_t dlen" "const char *src" "size_t len" "int flag" "int *cerr_ptr"
-.Ft char *
-.Fn svis "char *dst" "int c" "int flag" "int nextc" "const char *extra"
-.Ft char *
-.Fn snvis "char *dst" "size_t dlen" "int c" "int flag" "int nextc" "const char *extra"
-.Ft int
-.Fn strsvis "char *dst" "const char *src" "int flag" "const char *extra"
-.Ft int
-.Fn strsnvis "char *dst" "size_t dlen" "const char *src" "int flag" "const char *extra"
-.Ft int
-.Fn strsvisx "char *dst" "const char *src" "size_t len" "int flag" "const char *extra"
-.Ft int
-.Fn strsnvisx "char *dst" "size_t dlen" "const char *src" "size_t len" "int flag" "const char *extra"
-.Ft int
-.Fn strsenvisx "char *dst" "size_t dlen" "const char *src" "size_t len" "int flag" "const char *extra" "int *cerr_ptr"
-.Sh DESCRIPTION
-The
-.Fn vis
-function
-copies into
-.Fa dst
-a string which represents the character
-.Fa c .
-If
-.Fa c
-needs no encoding, it is copied in unaltered.
-The string is null terminated, and a pointer to the end of the string is
-returned.
-The maximum length of any encoding is four
-bytes (not including the trailing
-.Dv NUL ) ;
-thus, when
-encoding a set of characters into a buffer, the size of the buffer should
-be four times the number of bytes encoded, plus one for the trailing
-.Dv NUL .
-The flag parameter is used for altering the default range of
-characters considered for encoding and for altering the visual
-representation.
-The additional character,
-.Fa nextc ,
-is only used when selecting the
-.Dv VIS_CSTYLE
-encoding format (explained below).
-.Pp
-The
-.Fn strvis ,
-.Fn strnvis ,
-.Fn strvisx ,
-and
-.Fn strnvisx
-functions copy into
-.Fa dst
-a visual representation of
-the string
-.Fa src .
-The
-.Fn strvis
-and
-.Fn strnvis
-functions encode characters from
-.Fa src
-up to the
-first
-.Dv NUL .
-The
-.Fn strvisx
-and
-.Fn strnvisx
-functions encode exactly
-.Fa len
-characters from
-.Fa src
-(this
-is useful for encoding a block of data that may contain
-.Dv NUL Ns 's ) .
-Both forms
-.Dv NUL
-terminate
-.Fa dst .
-The size of
-.Fa dst
-must be four times the number
-of bytes encoded from
-.Fa src
-(plus one for the
-.Dv NUL ) .
-Both
-forms return the number of characters in
-.Fa dst
-(not including the trailing
-.Dv NUL ) .
-The
-.Dq Nm n
-versions of the functions also take an additional argument
-.Fa dlen
-that indicates the length of the
-.Fa dst
-buffer.
-If
-.Fa dlen
-is not large enough to fit the converted string then the
-.Fn strnvis
-and
-.Fn strnvisx
-functions return \-1 and set
-.Va errno
-to
-.Dv ENOSPC .
-The
-.Fn strenvisx
-function takes an additional argument,
-.Fa cerr_ptr ,
-that is used to pass in and out a multibyte conversion error flag.
-This is useful when processing single characters at a time when
-it is possible that the locale may be set to something other
-than the locale of the characters in the input data.
-.Pp
-The functions
-.Fn svis ,
-.Fn snvis ,
-.Fn strsvis ,
-.Fn strsnvis ,
-.Fn strsvisx ,
-.Fn strsnvisx ,
-and
-.Fn strsenvisx
-correspond to
-.Fn vis ,
-.Fn nvis ,
-.Fn strvis ,
-.Fn strnvis ,
-.Fn strvisx ,
-.Fn strnvisx ,
-and
-.Fn strenvisx
-but have an additional argument
-.Fa extra ,
-pointing to a
-.Dv NUL
-terminated list of characters.
-These characters will be copied encoded or backslash-escaped into
-.Fa dst .
-These functions are useful e.g. to remove the special meaning
-of certain characters to shells.
-.Pp
-The encoding is a unique, invertible representation composed entirely of
-graphic characters; it can be decoded back into the original form using
-the
-.Xr unvis 3 ,
-.Xr strunvis 3
-or
-.Xr strnunvis 3
-functions.
-.Pp
-There are two parameters that can be controlled: the range of
-characters that are encoded (applies only to
-.Fn vis ,
-.Fn nvis ,
-.Fn strvis ,
-.Fn strnvis ,
-.Fn strvisx ,
-and
-.Fn strnvisx ) ,
-and the type of representation used.
-By default, all non-graphic characters,
-except space, tab, and newline are encoded (see
-.Xr isgraph 3 ) .
-The following flags
-alter this:
-.Bl -tag -width VIS_WHITEX
-.It Dv VIS_GLOB
-Also encode the magic characters
-.Ql ( * ,
-.Ql \&? ,
-.Ql \&[ ,
-and
-.Ql # )
-recognized by
-.Xr glob 3 .
-.It Dv VIS_SHELL
-Also encode the meta characters used by shells (in addition to the glob
-characters):
-.Ql ( ' ,
-.Ql ` ,
-.Ql \&" ,
-.Ql \&; ,
-.Ql & ,
-.Ql < ,
-.Ql > ,
-.Ql \&( ,
-.Ql \&) ,
-.Ql \&| ,
-.Ql \&] ,
-.Ql \e ,
-.Ql $ ,
-.Ql \&! ,
-.Ql \&^ ,
-and
-.Ql ~ ) .
-.It Dv VIS_SP
-Also encode space.
-.It Dv VIS_TAB
-Also encode tab.
-.It Dv VIS_NL
-Also encode newline.
-.It Dv VIS_WHITE
-Synonym for
-.Dv VIS_SP | VIS_TAB | VIS_NL .
-.It Dv VIS_META
-Synonym for
-.Dv VIS_WHITE | VIS_GLOB | VIS_SHELL .
-.It Dv VIS_SAFE
-Only encode
-.Dq unsafe
-characters.
-Unsafe means control characters which may cause common terminals to perform
-unexpected functions.
-Currently this form allows space, tab, newline, backspace, bell, and
-return \(em in addition to all graphic characters \(em unencoded.
-.El
-.Pp
-(The above flags have no effect for
-.Fn svis ,
-.Fn snvis ,
-.Fn strsvis ,
-.Fn strsnvis ,
-.Fn strsvisx ,
-and
-.Fn strsnvisx .
-When using these functions, place all graphic characters to be
-encoded in an array pointed to by
-.Fa extra .
-In general, the backslash character should be included in this array, see the
-warning on the use of the
-.Dv VIS_NOSLASH
-flag below).
-.Pp
-There are four forms of encoding.
-All forms use the backslash character
-.Ql \e
-to introduce a special
-sequence; two backslashes are used to represent a real backslash,
-except
-.Dv VIS_HTTPSTYLE
-that uses
-.Ql % ,
-or
-.Dv VIS_MIMESTYLE
-that uses
-.Ql = .
-These are the visual formats:
-.Bl -tag -width VIS_CSTYLE
-.It (default)
-Use an
-.Ql M
-to represent meta characters (characters with the 8th
-bit set), and use caret
-.Ql ^
-to represent control characters (see
-.Xr iscntrl 3 ) .
-The following formats are used:
-.Bl -tag -width xxxxx
-.It Dv \e^C
-Represents the control character
-.Ql C .
-Spans characters
-.Ql \e000
-through
-.Ql \e037 ,
-and
-.Ql \e177
-(as
-.Ql \e^? ) .
-.It Dv \eM-C
-Represents character
-.Ql C
-with the 8th bit set.
-Spans characters
-.Ql \e241
-through
-.Ql \e376 .
-.It Dv \eM^C
-Represents control character
-.Ql C
-with the 8th bit set.
-Spans characters
-.Ql \e200
-through
-.Ql \e237 ,
-and
-.Ql \e377
-(as
-.Ql \eM^? ) .
-.It Dv \e040
-Represents
-.Tn ASCII
-space.
-.It Dv \e240
-Represents Meta-space.
-.El
-.Pp
-.It Dv VIS_CSTYLE
-Use C-style backslash sequences to represent standard non-printable
-characters.
-The following sequences are used to represent the indicated characters:
-.Bd -unfilled -offset indent
-.Li \ea Tn  \(em BEL No (007)
-.Li \eb Tn  \(em BS No (010)
-.Li \ef Tn  \(em NP No (014)
-.Li \en Tn  \(em NL No (012)
-.Li \er Tn  \(em CR No (015)
-.Li \es Tn  \(em SP No (040)
-.Li \et Tn  \(em HT No (011)
-.Li \ev Tn  \(em VT No (013)
-.Li \e0 Tn  \(em NUL No (000)
-.Ed
-.Pp
-When using this format, the
-.Fa nextc
-parameter is looked at to determine if a
-.Dv NUL
-character can be encoded as
-.Ql \e0
-instead of
-.Ql \e000 .
-If
-.Fa nextc
-is an octal digit, the latter representation is used to
-avoid ambiguity.
-.It Dv VIS_OCTAL
-Use a three digit octal sequence.
-The form is
-.Ql \eddd
-where
-.Em d
-represents an octal digit.
-.It Dv VIS_HTTPSTYLE
-Use URI encoding as described in RFC 1738.
-The form is
-.Ql %xx
-where
-.Em x
-represents a lower case hexadecimal digit.
-.It Dv VIS_MIMESTYLE
-Use MIME Quoted-Printable encoding as described in RFC 2045, only don't
-break lines and don't handle CRLF.
-The form is
-.Ql =XX
-where
-.Em X
-represents an upper case hexadecimal digit.
-.El
-.Pp
-There is one additional flag,
-.Dv VIS_NOSLASH ,
-which inhibits the
-doubling of backslashes and the backslash before the default
-format (that is, control characters are represented by
-.Ql ^C
-and
-meta characters as
-.Ql M-C ) .
-With this flag set, the encoding is
-ambiguous and non-invertible.
-.Sh MULTIBYTE CHARACTER SUPPORT
-These functions support multibyte character input.
-The encoding conversion is influenced by the setting of the
-.Ev LC_CTYPE
-environment variable which defines the set of characters
-that can be copied without encoding.
-.Pp
-If
-.Dv VIS_NOLOCALE
-is set, processing is done assuming the C locale and overriding
-any other environment settings.
-.Pp
-When 8-bit data is present in the input,
-.Ev LC_CTYPE
-must be set to the correct locale or to the C locale.
-If the locales of the data and the conversion are mismatched,
-multibyte character recognition may fail and encoding will be performed
-byte-by-byte instead.
-.Pp
-As noted above,
-.Fa dst
-must be four times the number of bytes processed from
-.Fa src .
-But note that each multibyte character can be up to
-.Dv MB_LEN_MAX
-bytes
-.\" (see
-.\" .Xr multibyte 3 )
-so in terms of multibyte characters,
-.Fa dst
-must be four times
-.Dv MB_LEN_MAX
-times the number of characters processed from
-.Fa src .
-.Sh ENVIRONMENT
-.Bl -tag -width ".Ev LC_CTYPE"
-.It Ev LC_CTYPE
-Specify the locale of the input data.
-Set to C if the input data locale is unknown.
-.El
-.Sh ERRORS
-The functions
-.Fn nvis
-and
-.Fn snvis
-will return
-.Dv NULL
-and the functions
-.Fn strnvis ,
-.Fn strnvisx ,
-.Fn strsnvis ,
-and
-.Fn strsnvisx ,
-will return \-1 when the
-.Fa dlen
-destination buffer size is not enough to perform the conversion while
-setting
-.Va errno
-to:
-.Bl -tag -width ".Bq Er ENOSPC"
-.It Bq Er ENOSPC
-The destination buffer size is not large enough to perform the conversion.
-.El
-.Sh SEE ALSO
-.Xr unvis 1 ,
-.Xr vis 1 ,
-.Xr glob 3 ,
-.\" .Xr multibyte 3 ,
-.Xr unvis 3
-.Rs
-.%A T. Berners-Lee
-.%T Uniform Resource Locators (URL)
-.%O "RFC 1738"
-.Re
-.Rs
-.%T "Multipurpose Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies"
-.%O "RFC 2045"
-.Re
-.Sh HISTORY
-The
-.Fn vis ,
-.Fn strvis ,
-and
-.Fn strvisx
-functions first appeared in
-.Bx 4.4 .
-The
-.Fn svis ,
-.Fn strsvis ,
-and
-.Fn strsvisx
-functions appeared in
-.Nx 1.5 .
-The buffer size limited versions of the functions
-.Po Fn nvis ,
-.Fn strnvis ,
-.Fn strnvisx ,
-.Fn snvis ,
-.Fn strsnvis ,
-and
-.Fn strsnvisx Pc
-appeared in
-.Nx 6.0
-and
-.Fx 9.2 .
-Myltibyte character support was added in
-.Nx 7.0
-and
-.Fx 9.2 .
diff --git a/lib/libc/gen/vis.c b/lib/libc/gen/vis.c
deleted file mode 100644
index a453d0603..000000000
--- a/lib/libc/gen/vis.c
+++ /dev/null
@@ -1,744 +0,0 @@
-/*	$NetBSD: vis.c,v 1.70 2015/05/26 21:42:46 christos Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1999, 2005 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vis.c,v 1.70 2015/05/26 21:42:46 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
-#define	_DIAGASSERT(x)	assert(x)
-#endif
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <assert.h>
-#include <vis.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#ifdef __weak_alias
-__weak_alias(strvisx,_strvisx)
-#endif
-
-#if !HAVE_VIS || !HAVE_SVIS
-#include <ctype.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
-/*
- * The reason for going through the trouble to deal with character encodings
- * in vis(3), is that we use this to safe encode output of commands. This
- * safe encoding varies depending on the character set. For example if we
- * display ps output in French, we don't want to display French characters
- * as M-foo.
- */
-
-static wchar_t *do_svis(wchar_t *, wint_t, int, wint_t, const wchar_t *);
-
-#undef BELL
-#define BELL L'\a'
- 
-#if defined(LC_C_LOCALE)
-#define iscgraph(c)      isgraph_l(c, LC_C_LOCALE)
-#else
-/* Keep it simple for now, no locale stuff */
-#define iscgraph(c)	isgraph(c)
-#ifdef notyet
-#include <locale.h>
-static int
-iscgraph(int c) {
-	int rv;
-	char *ol;
-
-	ol = setlocale(LC_CTYPE, "C");
-	rv = isgraph(c);
-	if (ol)
-		setlocale(LC_CTYPE, ol);
-	return rv;
-}
-#endif
-#endif
-
-#define ISGRAPH(flags, c) \
-    (((flags) & VIS_NOLOCALE) ? iscgraph(c) : iswgraph(c))
-
-#define iswoctal(c)	(((u_char)(c)) >= L'0' && ((u_char)(c)) <= L'7')
-#define iswwhite(c)	(c == L' ' || c == L'\t' || c == L'\n')
-#define iswsafe(c)	(c == L'\b' || c == BELL || c == L'\r')
-#define xtoa(c)		L"0123456789abcdef"[c]
-#define XTOA(c)		L"0123456789ABCDEF"[c]
-
-#define MAXEXTRAS	30
-
-static const wchar_t char_shell[] = L"'`\";&<>()|{}]\\$!^~";
-static const wchar_t char_glob[] = L"*?[#";
-
-#if !HAVE_NBTOOL_CONFIG_H
-#ifndef __minix
-/*
- * On NetBSD MB_LEN_MAX is currently 32 which does not fit on any integer
- * integral type and it is probably wrong, since currently the maximum
- * number of bytes and character needs is 6. Until this is fixed, the
- * loops below are using sizeof(uint64_t) - 1 instead of MB_LEN_MAX, and
- * the assertion is commented out.
- */
-#ifdef __FreeBSD__
-/*
- * On FreeBSD including <sys/systm.h> for CTASSERT only works in kernel
- * mode.
- */
-#ifndef CTASSERT
-#define CTASSERT(x)             _CTASSERT(x, __LINE__)
-#define _CTASSERT(x, y)         __CTASSERT(x, y)
-#define __CTASSERT(x, y)        typedef char __assert ## y[(x) ? 1 : -1]
-#endif
-#endif /* __FreeBSD__ */
-CTASSERT(MB_LEN_MAX <= sizeof(uint64_t));
-#endif /* !__minix */
-#endif
-
-/*
- * This is do_hvis, for HTTP style (RFC 1808)
- */
-static wchar_t *
-do_hvis(wchar_t *dst, wint_t c, int flags, wint_t nextc, const wchar_t *extra)
-{
-	if (iswalnum(c)
-	    /* safe */
-	    || c == L'$' || c == L'-' || c == L'_' || c == L'.' || c == L'+'
-	    /* extra */
-	    || c == L'!' || c == L'*' || c == L'\'' || c == L'(' || c == L')'
-	    || c == L',')
-		dst = do_svis(dst, c, flags, nextc, extra);
-	else {
-		*dst++ = L'%';
-		*dst++ = xtoa(((unsigned int)c >> 4) & 0xf);
-		*dst++ = xtoa((unsigned int)c & 0xf);
-	}
-
-	return dst;
-}
-
-/*
- * This is do_mvis, for Quoted-Printable MIME (RFC 2045)
- * NB: No handling of long lines or CRLF.
- */
-static wchar_t *
-do_mvis(wchar_t *dst, wint_t c, int flags, wint_t nextc, const wchar_t *extra)
-{
-	if ((c != L'\n') &&
-	    /* Space at the end of the line */
-	    ((iswspace(c) && (nextc == L'\r' || nextc == L'\n')) ||
-	    /* Out of range */
-	    (!iswspace(c) && (c < 33 || (c > 60 && c < 62) || c > 126)) ||
-	    /* Specific char to be escaped */
-	    wcschr(L"#$@[\\]^`{|}~", c) != NULL)) {
-		*dst++ = L'=';
-		*dst++ = XTOA(((unsigned int)c >> 4) & 0xf);
-		*dst++ = XTOA((unsigned int)c & 0xf);
-	} else
-		dst = do_svis(dst, c, flags, nextc, extra);
-	return dst;
-}
-
-/*
- * Output single byte of multibyte character.
- */
-static wchar_t *
-do_mbyte(wchar_t *dst, wint_t c, int flags, wint_t nextc, int iswextra)
-{
-	if (flags & VIS_CSTYLE) {
-		switch (c) {
-		case L'\n':
-			*dst++ = L'\\'; *dst++ = L'n';
-			return dst;
-		case L'\r':
-			*dst++ = L'\\'; *dst++ = L'r';
-			return dst;
-		case L'\b':
-			*dst++ = L'\\'; *dst++ = L'b';
-			return dst;
-		case BELL:
-			*dst++ = L'\\'; *dst++ = L'a';
-			return dst;
-		case L'\v':
-			*dst++ = L'\\'; *dst++ = L'v';
-			return dst;
-		case L'\t':
-			*dst++ = L'\\'; *dst++ = L't';
-			return dst;
-		case L'\f':
-			*dst++ = L'\\'; *dst++ = L'f';
-			return dst;
-		case L' ':
-			*dst++ = L'\\'; *dst++ = L's';
-			return dst;
-		case L'\0':
-			*dst++ = L'\\'; *dst++ = L'0';
-			if (iswoctal(nextc)) {
-				*dst++ = L'0';
-				*dst++ = L'0';
-			}
-			return dst;
-		/* We cannot encode these characters in VIS_CSTYLE
-		 * because they special meaning */
-		case L'n':
-		case L'r':
-		case L'b':
-		case L'a':
-		case L'v':
-		case L't':
-		case L'f':
-		case L's':
-		case L'0':
-		case L'M':
-		case L'^':
-		case L'$': /* vis(1) -l */
-			break;
-		default:
-			if (ISGRAPH(flags, c) && !iswoctal(c)) {
-				*dst++ = L'\\';
-				*dst++ = c;
-				return dst;
-			}
-		}
-	}
-	if (iswextra || ((c & 0177) == L' ') || (flags & VIS_OCTAL)) {
-		*dst++ = L'\\';
-		*dst++ = (u_char)(((u_int32_t)(u_char)c >> 6) & 03) + L'0';
-		*dst++ = (u_char)(((u_int32_t)(u_char)c >> 3) & 07) + L'0';
-		*dst++ =			     (c	      & 07) + L'0';
-	} else {
-		if ((flags & VIS_NOSLASH) == 0)
-			*dst++ = L'\\';
-
-		if (c & 0200) {
-			c &= 0177;
-			*dst++ = L'M';
-		}
-
-		if (iswcntrl(c)) {
-			*dst++ = L'^';
-			if (c == 0177)
-				*dst++ = L'?';
-			else
-				*dst++ = c + L'@';
-		} else {
-			*dst++ = L'-';
-			*dst++ = c;
-		}
-	}
-
-	return dst;
-}
-
-/*
- * This is do_vis, the central code of vis.
- * dst:	      Pointer to the destination buffer
- * c:	      Character to encode
- * flags:     Flags word
- * nextc:     The character following 'c'
- * extra:     Pointer to the list of extra characters to be
- *	      backslash-protected.
- */
-static wchar_t *
-do_svis(wchar_t *dst, wint_t c, int flags, wint_t nextc, const wchar_t *extra)
-{
-	int iswextra, i, shft;
-	uint64_t bmsk, wmsk;
-
-	iswextra = wcschr(extra, c) != NULL;
-	if (!iswextra && (ISGRAPH(flags, c) || iswwhite(c) ||
-	    ((flags & VIS_SAFE) && iswsafe(c)))) {
-		*dst++ = c;
-		return dst;
-	}
-
-	/* See comment in istrsenvisx() output loop, below. */
-	wmsk = 0;
-	for (i = sizeof(wmsk) - 1; i >= 0; i--) {
-		shft = i * NBBY;
-		bmsk = (uint64_t)0xffLL << shft;
-		wmsk |= bmsk;
-		if ((c & wmsk) || i == 0)
-			dst = do_mbyte(dst, (wint_t)(
-			    (uint64_t)(c & bmsk) >> shft),
-			    flags, nextc, iswextra);
-	}
-
-	return dst;
-}
-
-typedef wchar_t *(*visfun_t)(wchar_t *, wint_t, int, wint_t, const wchar_t *);
-
-/*
- * Return the appropriate encoding function depending on the flags given.
- */
-static visfun_t
-getvisfun(int flags)
-{
-	if (flags & VIS_HTTPSTYLE)
-		return do_hvis;
-	if (flags & VIS_MIMESTYLE)
-		return do_mvis;
-	return do_svis;
-}
-
-/*
- * Expand list of extra characters to not visually encode.
- */
-static wchar_t *
-makeextralist(int flags, const char *src)
-{
-	wchar_t *dst, *d;
-	size_t len;
-	const wchar_t *s;
-
-	len = strlen(src);
-	if ((dst = calloc(len + MAXEXTRAS, sizeof(*dst))) == NULL)
-		return NULL;
-
-	if ((flags & VIS_NOLOCALE) || mbstowcs(dst, src, len) == (size_t)-1) {
-		size_t i;
-		for (i = 0; i < len; i++)
-			dst[i] = (wchar_t)(u_char)src[i];
-		d = dst + len;
-	} else
-		d = dst + wcslen(dst);
-
-	if (flags & VIS_GLOB)
-		for (s = char_glob; *s; *d++ = *s++)
-			continue;
-
-	if (flags & VIS_SHELL)
-		for (s = char_shell; *s; *d++ = *s++)
-			continue;
-
-	if (flags & VIS_SP) *d++ = L' ';
-	if (flags & VIS_TAB) *d++ = L'\t';
-	if (flags & VIS_NL) *d++ = L'\n';
-	if ((flags & VIS_NOSLASH) == 0) *d++ = L'\\';
-	*d = L'\0';
-
-	return dst;
-}
-
-/*
- * istrsenvisx()
- * 	The main internal function.
- *	All user-visible functions call this one.
- */
-static int
-istrsenvisx(char *mbdst, size_t *dlen, const char *mbsrc, size_t mblength,
-    int flags, const char *mbextra, int *cerr_ptr)
-{
-	wchar_t *dst, *src, *pdst, *psrc, *start, *extra;
-	size_t len, olen;
-	uint64_t bmsk, wmsk;
-	wint_t c;
-	visfun_t f;
-	int clen = 0, cerr, error = -1, i, shft;
-	ssize_t mbslength, maxolen;
-
-	_DIAGASSERT(mbdst != NULL);
-	_DIAGASSERT(mbsrc != NULL || mblength == 0);
-	_DIAGASSERT(mbextra != NULL);
-
-	/*
-	 * Input (mbsrc) is a char string considered to be multibyte
-	 * characters.  The input loop will read this string pulling
-	 * one character, possibly multiple bytes, from mbsrc and
-	 * converting each to wchar_t in src.
-	 *
-	 * The vis conversion will be done using the wide char
-	 * wchar_t string.
-	 *
-	 * This will then be converted back to a multibyte string to
-	 * return to the caller.
-	 */
-
-	/* Allocate space for the wide char strings */
-	psrc = pdst = extra = NULL;
-	if ((psrc = calloc(mblength + 1, sizeof(*psrc))) == NULL)
-		return -1;
-	if ((pdst = calloc((4 * mblength) + 1, sizeof(*pdst))) == NULL)
-		goto out;
-	dst = pdst;
-	src = psrc;
-
-	if (flags & VIS_NOLOCALE) {
-		/* Do one byte at a time conversion */
-		cerr = 1;
-	} else {
-		/* Use caller's multibyte conversion error flag. */
-		cerr = cerr_ptr ? *cerr_ptr : 0;
-	}
-
-	/*
-	 * Input loop.
-	 * Handle up to mblength characters (not bytes).  We do not
-	 * stop at NULs because we may be processing a block of data
-	 * that includes NULs.
-	 */
-	mbslength = (ssize_t)mblength;
-	/*
-	 * When inputing a single character, must also read in the
-	 * next character for nextc, the look-ahead character.
-	 */
-	if (mbslength == 1)
-		mbslength++;
-	while (mbslength > 0) {
-		/* Convert one multibyte character to wchar_t. */
-		if (!cerr)
-			clen = mbtowc(src, mbsrc, MB_LEN_MAX);
-		if (cerr || clen < 0) {
-			/* Conversion error, process as a byte instead. */
-			*src = (wint_t)(u_char)*mbsrc;
-			clen = 1;
-			cerr = 1;
-		}
-		if (clen == 0)
-			/*
-			 * NUL in input gives 0 return value. process
-			 * as single NUL byte and keep going.
-			 */
-			clen = 1;
-		/* Advance buffer character pointer. */
-		src++;
-		/* Advance input pointer by number of bytes read. */
-		mbsrc += clen;
-		/* Decrement input byte count. */
-		mbslength -= clen;
-	}
-	len = src - psrc;
-	src = psrc;
-	/*
-	 * In the single character input case, we will have actually
-	 * processed two characters, c and nextc.  Reset len back to
-	 * just a single character.
-	 */
-	if (mblength < len)
-		len = mblength;
-
-	/* Convert extra argument to list of characters for this mode. */
-	extra = makeextralist(flags, mbextra);
-	if (!extra) {
-		if (dlen && *dlen == 0) {
-			errno = ENOSPC;
-			goto out;
-		}
-		*mbdst = '\0';		/* can't create extra, return "" */
-		error = 0;
-		goto out;
-	}
-
-	/* Look up which processing function to call. */
-	f = getvisfun(flags);
-
-	/*
-	 * Main processing loop.
-	 * Call do_Xvis processing function one character at a time
-	 * with next character available for look-ahead.
-	 */
-	for (start = dst; len > 0; len--) {
-		c = *src++;
-		dst = (*f)(dst, c, flags, len >= 1 ? *src : L'\0', extra);
-		if (dst == NULL) {
-			errno = ENOSPC;
-			goto out;
-		}
-	}
-
-	/* Terminate the string in the buffer. */
-	*dst = L'\0';
-
-	/*
-	 * Output loop.
-	 * Convert wchar_t string back to multibyte output string.
-	 * If we have hit a multi-byte conversion error on input,
-	 * output byte-by-byte here.  Else use wctomb().
-	 */
-	len = wcslen(start);
-	maxolen = dlen ? *dlen : (wcslen(start) * MB_LEN_MAX + 1);
-	olen = 0;
-	for (dst = start; len > 0; len--) {
-		if (!cerr)
-			clen = wctomb(mbdst, *dst);
-		if (cerr || clen < 0) {
-			/*
-			 * Conversion error, process as a byte(s) instead.
-			 * Examine each byte and higher-order bytes for
-			 * data.  E.g.,
-			 *	0x000000000000a264 -> a2 64
-			 *	0x000000001f00a264 -> 1f 00 a2 64
-			 */
-			clen = 0;
-			wmsk = 0;
-			for (i = sizeof(wmsk) - 1; i >= 0; i--) {
-				shft = i * NBBY;
-				bmsk = (uint64_t)0xffLL << shft;
-				wmsk |= bmsk;
-				if ((*dst & wmsk) || i == 0)
-					mbdst[clen++] = (char)(
-					    (uint64_t)(*dst & bmsk) >>
-					    shft);
-			}
-			cerr = 1;
-		}
-		/* If this character would exceed our output limit, stop. */
-		if (olen + clen > (size_t)maxolen)
-			break;
-		/* Advance output pointer by number of bytes written. */
-		mbdst += clen;
-		/* Advance buffer character pointer. */
-		dst++;
-		/* Incrment output character count. */
-		olen += clen;
-	}
-
-	/* Terminate the output string. */
-	*mbdst = '\0';
-
-	if (flags & VIS_NOLOCALE) {
-		/* Pass conversion error flag out. */
-		if (cerr_ptr)
-			*cerr_ptr = cerr;
-	}
-
-	free(extra);
-	free(pdst);
-	free(psrc);
-
-	return (int)olen;
-out:
-	free(extra);
-	free(pdst);
-	free(psrc);
-	return error;
-}
-
-static int
-istrsenvisxl(char *mbdst, size_t *dlen, const char *mbsrc,
-    int flags, const char *mbextra, int *cerr_ptr)
-{
-	return istrsenvisx(mbdst, dlen, mbsrc,
-	    mbsrc != NULL ? strlen(mbsrc) : 0, flags, mbextra, cerr_ptr);
-}
-
-#endif
-
-#if !HAVE_SVIS
-/*
- *	The "svis" variants all take an "extra" arg that is a pointer
- *	to a NUL-terminated list of characters to be encoded, too.
- *	These functions are useful e. g. to encode strings in such a
- *	way so that they are not interpreted by a shell.
- */
-
-char *
-svis(char *mbdst, int c, int flags, int nextc, const char *mbextra)
-{
-	char cc[2];
-	int ret;
-
-	cc[0] = c;
-	cc[1] = nextc;
-
-	ret = istrsenvisx(mbdst, NULL, cc, 1, flags, mbextra, NULL);
-	if (ret < 0)
-		return NULL;
-	return mbdst + ret;
-}
-
-char *
-snvis(char *mbdst, size_t dlen, int c, int flags, int nextc, const char *mbextra)
-{
-	char cc[2];
-	int ret;
-
-	cc[0] = c;
-	cc[1] = nextc;
-
-	ret = istrsenvisx(mbdst, &dlen, cc, 1, flags, mbextra, NULL);
-	if (ret < 0)
-		return NULL;
-	return mbdst + ret;
-}
-
-int
-strsvis(char *mbdst, const char *mbsrc, int flags, const char *mbextra)
-{
-	return istrsenvisxl(mbdst, NULL, mbsrc, flags, mbextra, NULL);
-}
-
-int
-strsnvis(char *mbdst, size_t dlen, const char *mbsrc, int flags, const char *mbextra)
-{
-	return istrsenvisxl(mbdst, &dlen, mbsrc, flags, mbextra, NULL);
-}
-
-int
-strsvisx(char *mbdst, const char *mbsrc, size_t len, int flags, const char *mbextra)
-{
-	return istrsenvisx(mbdst, NULL, mbsrc, len, flags, mbextra, NULL);
-}
-
-int
-strsnvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags,
-    const char *mbextra)
-{
-	return istrsenvisx(mbdst, &dlen, mbsrc, len, flags, mbextra, NULL);
-}
-
-int
-strsenvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags,
-    const char *mbextra, int *cerr_ptr)
-{
-	return istrsenvisx(mbdst, &dlen, mbsrc, len, flags, mbextra, cerr_ptr);
-}
-#endif
-
-#if !HAVE_VIS
-/*
- * vis - visually encode characters
- */
-char *
-vis(char *mbdst, int c, int flags, int nextc)
-{
-	char cc[2];
-	int ret;
-
-	cc[0] = c;
-	cc[1] = nextc;
-
-	ret = istrsenvisx(mbdst, NULL, cc, 1, flags, "", NULL);
-	if (ret < 0)
-		return NULL;
-	return mbdst + ret;
-}
-
-char *
-nvis(char *mbdst, size_t dlen, int c, int flags, int nextc)
-{
-	char cc[2];
-	int ret;
-
-	cc[0] = c;
-	cc[1] = nextc;
-
-	ret = istrsenvisx(mbdst, &dlen, cc, 1, flags, "", NULL);
-	if (ret < 0)
-		return NULL;
-	return mbdst + ret;
-}
-
-/*
- * strvis - visually encode characters from src into dst
- *
- *	Dst must be 4 times the size of src to account for possible
- *	expansion.  The length of dst, not including the trailing NULL,
- *	is returned.
- */
-
-int
-strvis(char *mbdst, const char *mbsrc, int flags)
-{
-	return istrsenvisxl(mbdst, NULL, mbsrc, flags, "", NULL);
-}
-
-int
-strnvis(char *mbdst, size_t dlen, const char *mbsrc, int flags)
-{
-	return istrsenvisxl(mbdst, &dlen, mbsrc, flags, "", NULL);
-}
-
-/*
- * strvisx - visually encode characters from src into dst
- *
- *	Dst must be 4 times the size of src to account for possible
- *	expansion.  The length of dst, not including the trailing NULL,
- *	is returned.
- *
- *	Strvisx encodes exactly len characters from src into dst.
- *	This is useful for encoding a block of data.
- */
-
-int
-strvisx(char *mbdst, const char *mbsrc, size_t len, int flags)
-{
-	return istrsenvisx(mbdst, NULL, mbsrc, len, flags, "", NULL);
-}
-
-int
-strnvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags)
-{
-	return istrsenvisx(mbdst, &dlen, mbsrc, len, flags, "", NULL);
-}
-
-int
-strenvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags,
-    int *cerr_ptr)
-{
-	return istrsenvisx(mbdst, &dlen, mbsrc, len, flags, "", cerr_ptr);
-}
-#endif
diff --git a/lib/libc/gen/vwarn.c b/lib/libc/gen/vwarn.c
deleted file mode 100644
index 5a89358a3..000000000
--- a/lib/libc/gen/vwarn.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: vwarn.c,v 1.16 2014/01/16 17:21:38 christos Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vwarn.c,v 1.16 2014/01/16 17:21:38 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <err.h>
-#include <errno.h>
-
-#ifdef __weak_alias
-__weak_alias(vwarn, _vwarn)
-#endif
-
-#if !HAVE_ERR_H
-void
-vwarn(const char *fmt, va_list ap)
-{
-	vwarnc(errno, fmt, ap);
-}
-#endif
diff --git a/lib/libc/gen/vwarnc.c b/lib/libc/gen/vwarnc.c
deleted file mode 100644
index 20d4f3e36..000000000
--- a/lib/libc/gen/vwarnc.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: vwarnc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: vwarnc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <err.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(vwarnc, _vwarnc)
-#endif
-
-#if !HAVE_ERR_H || !HAVE_DECL_VWARNC
-void
-vwarnc(int code, const char *fmt, va_list ap)
-{
-	(void)fprintf(stderr, "%s: ", getprogname());
-	if (fmt != NULL) {
-		(void)vfprintf(stderr, fmt, ap);
-		(void)fprintf(stderr, ": ");
-	}
-	(void)fprintf(stderr, "%s\n", strerror(code));
-}
-#endif
diff --git a/lib/libc/gen/vwarnx.c b/lib/libc/gen/vwarnx.c
deleted file mode 100644
index eedf550f0..000000000
--- a/lib/libc/gen/vwarnx.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: vwarnx.c,v 1.15 2011/07/17 20:54:34 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: vwarnx.c,v 1.15 2011/07/17 20:54:34 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <err.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(vwarnx, _vwarnx)
-#endif
-
-#if !HAVE_ERR_H
-void
-vwarnx(const char *fmt, va_list ap)
-{
-	(void)fprintf(stderr, "%s: ", getprogname());
-	if (fmt != NULL)
-		(void)vfprintf(stderr, fmt, ap);
-	(void)fprintf(stderr, "\n");
-}
-#endif
diff --git a/lib/libc/gen/wait.c b/lib/libc/gen/wait.c
deleted file mode 100644
index 776e276b2..000000000
--- a/lib/libc/gen/wait.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: wait.c,v 1.9 2012/03/20 16:36:05 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)wait.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: wait.c,v 1.9 2012/03/20 16:36:05 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-
-#ifdef __weak_alias
-__weak_alias(wait,_wait)
-#endif
-
-
-pid_t
-wait(int *istat)
-{
-	return (wait4(WAIT_ANY, istat, 0, (struct rusage *)NULL));
-}
diff --git a/lib/libc/gen/wait3.c b/lib/libc/gen/wait3.c
deleted file mode 100644
index 9dfbeaa2e..000000000
--- a/lib/libc/gen/wait3.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: wait3.c,v 1.10 2012/03/20 16:36:05 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)wait3.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: wait3.c,v 1.10 2012/03/20 16:36:05 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-
-pid_t
-wait3(int *istat, int options, struct rusage *rup)
-{
-	return (wait4(WAIT_ANY, istat, options, rup));
-}
diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c
deleted file mode 100644
index 46a831793..000000000
--- a/lib/libc/gen/waitpid.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: waitpid.c,v 1.9 2003/08/07 16:43:01 agc 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)waitpid.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: waitpid.c,v 1.9 2003/08/07 16:43:01 agc Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-
-#ifdef __weak_alias
-__weak_alias(waitpid,_waitpid)
-#endif
-
-pid_t
-waitpid(pid_t pid, int *istat, int options)
-{
-	return (wait4(pid, istat, options, (struct rusage *)0));
-}
diff --git a/lib/libc/gen/warn.c b/lib/libc/gen/warn.c
deleted file mode 100644
index 2f784662e..000000000
--- a/lib/libc/gen/warn.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: warn.c,v 1.14 2007/06/18 14:13:54 ginsbach Exp $	*/
-
-/*-
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: warn.c,v 1.14 2007/06/18 14:13:54 ginsbach Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <err.h>
-#include <stdarg.h>
-
-#ifdef __weak_alias
-__weak_alias(warn, _warn)
-#endif
-
-#if !HAVE_ERR_H
-void
-warn(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vwarn(fmt, ap);
-	va_end(ap);
-}
-#endif
diff --git a/lib/libc/gen/warnc.c b/lib/libc/gen/warnc.c
deleted file mode 100644
index 38d588ed6..000000000
--- a/lib/libc/gen/warnc.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: warnc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $	*/
-
-/*-
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: warnc.c,v 1.3 2014/06/06 11:38:41 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <err.h>
-#include <stdarg.h>
-
-#ifdef __weak_alias
-__weak_alias(warnc, _warnc)
-#endif
-
-#if !HAVE_ERR_H || !HAVE_DECL_WARNC
-void
-warnc(int code, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vwarnc(code, fmt, ap);
-	va_end(ap);
-}
-#endif
diff --git a/lib/libc/gen/warnx.c b/lib/libc/gen/warnx.c
deleted file mode 100644
index e703c5332..000000000
--- a/lib/libc/gen/warnx.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: warnx.c,v 1.14 2007/06/18 14:13:54 ginsbach Exp $	*/
-
-/*-
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: warnx.c,v 1.14 2007/06/18 14:13:54 ginsbach Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <err.h>
-#include <stdarg.h>
-
-#ifdef __weak_alias
-__weak_alias(warnx, _warnx)
-#endif
-
-#if !HAVE_ERR_H
-void
-warnx(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vwarnx(fmt, ap);
-	va_end(ap);
-}
-#endif
diff --git a/lib/libc/gen/wordexp.3 b/lib/libc/gen/wordexp.3
deleted file mode 100644
index 62eae0a97..000000000
--- a/lib/libc/gen/wordexp.3
+++ /dev/null
@@ -1,226 +0,0 @@
-.\"	$NetBSD: wordexp.3,v 1.2 2006/04/24 20:27:34 jld Exp $
-.\"
-.\" Copyright (c) 2002 Tim J. Robbins
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: /repoman/r/ncvs/src/lib/libc/gen/wordexp.3,v 1.6 2003/09/08 19:57:14 ru Exp $
-.\"
-.Dd July 13, 2004
-.Dt WORDEXP 3
-.Os
-.Sh NAME
-.Nm wordexp
-.Nd "perform shell-style word expansions"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wordexp.h
-.Ft int
-.Fn wordexp "const char * restrict words" "wordexp_t * restrict pwordexp" "int flags"
-.Ft void
-.Fn wordfree "wordexp_t *pwordexp"
-.Sh DESCRIPTION
-The
-.Fn wordexp
-function performs shell-style word expansion on
-.Fa words
-and places the list of expanded words into the structure pointed to by
-.Fa pwordexp .
-.Pp
-The
-.Fa flags
-argument is the bitwise inclusive OR of any of the following constants:
-.Bl -tag -width ".Dv WRDE_SHOWERR"
-.It Dv WRDE_APPEND
-Append the words to those generated by a previous call to
-.Fn wordexp .
-.It Dv WRDE_DOOFFS
-As many
-.Dv NULL
-pointers as are specified by the
-.Va we_offs
-member of
-.Fa we
-are added to the front of
-.Va we_wordv .
-.It Dv WRDE_NOCMD
-Disallow command substitution in
-.Fa words .
-See the note in
-.Sx BUGS
-before using this.
-.It Dv WRDE_REUSE
-The
-.Fa we
-argument was passed to a previous successful call to
-.Fn wordexp
-but has not been passed to
-.Fn wordfree .
-The implementation may reuse the space allocated to it.
-.It Dv WRDE_SHOWERR
-Do not redirect shell error messages to
-.Pa /dev/null .
-.It Dv WRDE_UNDEF
-Report error on an attempt to expand an undefined shell variable.
-.El
-.Pp
-The structure type
-.Nm wordexp_t
-includes the following members:
-.Bd -literal -offset indent
-size_t	we_wordc
-char	**we_wordv
-size_t	we_offs
-.Ed
-.Pp
-The
-.Fa we_wordc
-member is the count of generated words.
-.Pp
-The
-.Fa we_wordv
-member points to a list of pointers to expanded words.
-.Pp
-The
-.Fa we_offs
-member is the number of slots to reserve at the beginning of the
-.Fa we_wordv
-member.
-.Pp
-It is the caller's responsibility to allocate the storage pointed to by
-.Fa pwordexp .
-The
-.Fn wordexp
-function allocates other space as needed, including memory
-pointed to by the
-.Fa we_wordv
-member.
-.Pp
-The
-.Fn wordfree
-function frees the memory allocated by
-.Fn wordexp .
-.Sh IMPLEMENTATION NOTES
-The
-.Fn wordexp
-function is implemented as a wrapper around the undocumented
-.Ic wordexp
-shell built-in command.
-.Sh RETURN VALUES
-The
-.Fn wordexp
-function returns zero if successful, otherwise it returns one of the following
-error codes:
-.Bl -tag -width ".Dv WRDE_NOSPACE"
-.It Dv WRDE_BADCHAR
-The
-.Fa words
-argument contains one of the following unquoted characters:
-.Aq newline ,
-.Ql | ,
-.Ql \*[Am] ,
-.Ql \&; ,
-.Ql \*[Lt] ,
-.Ql \*[Gt] ,
-.Ql \&( ,
-.Ql \&) ,
-.Ql { ,
-.Ql } .
-.It Dv WRDE_BADVAL
-An attempt was made to expand an undefined shell variable and
-.Dv WRDE_UNDEF
-is set in
-.Fa flags .
-.It Dv WRDE_CMDSUB
-An attempt was made to use command substitution and
-.Dv WRDE_NOCMD
-is set in
-.Fa flags .
-.It Dv WRDE_NOSPACE
-Not enough memory to store the result.
-.It Dv WRDE_SYNTAX
-Shell syntax error in
-.Fa words .
-.It Dv WRDE_ERRNO
-An internal error occured and
-.Va errno
-is set to indicate the error.
-.El
-.Pp
-The
-.Fn wordfree
-function returns no value.
-.Sh ENVIRONMENT
-.Bl -tag -width ".Ev IFS"
-.It Ev IFS
-Field separator.
-.El
-.Sh EXAMPLES
-Invoke the editor on all
-.Pa .c
-files in the current directory
-and
-.Pa /etc/motd
-(error checking omitted):
-.Bd -literal -offset indent
-wordexp_t we;
-
-wordexp("${EDITOR:-vi} *.c /etc/motd", \*[Am]we, 0);
-execvp(we-\*[Gt]we_wordv[0], we-\*[Gt]we_wordv);
-.Ed
-.Sh DIAGNOSTICS
-Diagnostic messages from the shell are written to the standard error output
-if
-.Dv WRDE_SHOWERR
-is set in
-.Fa flags .
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr fnmatch 3 ,
-.Xr glob 3 ,
-.Xr popen 3 ,
-.Xr system 3
-.Sh STANDARDS
-The
-.Fn wordexp
-and
-.Fn wordfree
-functions conform to
-.St -p1003.1-2001 .
-Their first release was in
-.St -p1003.2-92 .
-The return value
-.Dv WRDE_ERRNO
-is an extension.
-.Sh BUGS
-Do not pass untrusted user data to
-.Fn wordexp ,
-regardless of whether the
-.Dv WRDE_NOCMD
-flag is set.
-The
-.Fn wordexp
-function attempts to detect input that would cause commands to be
-executed before passing it to the shell
-but it does not use the same parser so it may be fooled.
diff --git a/lib/libc/gen/wordexp.c b/lib/libc/gen/wordexp.c
deleted file mode 100644
index a05db38eb..000000000
--- a/lib/libc/gen/wordexp.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/*	$NetBSD: wordexp.c,v 1.3 2009/02/12 04:10:52 lukem Exp $	*/
-
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "namespace.h"
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <wordexp.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-__FBSDID("$FreeBSD: /repoman/r/ncvs/src/lib/libc/gen/wordexp.c,v 1.5 2004/04/09 11:32:32 tjr Exp $");
-#else
-__RCSID("$NetBSD: wordexp.c,v 1.3 2009/02/12 04:10:52 lukem Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-static int	we_askshell(const char *, wordexp_t *, int);
-static int	we_check(const char *, int);
-
-/*
- * wordexp --
- *	Perform shell word expansion on `words' and place the resulting list
- *	of words in `we'. See wordexp(3).
- *
- */
-int
-wordexp(const char * __restrict words, wordexp_t * __restrict we, int flags)
-{
-	int error;
-
-	_DIAGASSERT(we != NULL);
-	_DIAGASSERT(words != NULL);
-	if (flags & WRDE_REUSE)
-		wordfree(we);
-	if ((flags & WRDE_APPEND) == 0) {
-		we->we_wordc = 0;
-		we->we_wordv = NULL;
-		we->we_strings = NULL;
-		we->we_nbytes = 0;
-	}
-	if ((error = we_check(words, flags)) != 0) {
-		wordfree(we);
-		return (error);
-	}
-	if ((error = we_askshell(words, we, flags)) != 0) {
-		wordfree(we);
-		return (error);
-	}
-	return (0);
-}
-
-/*
- * we_askshell --
- *	Use the `wordexp' /bin/sh builtin function to do most of the work
- *	in expanding the word string. This function is complicated by
- *	memory management.
- */
-static int
-we_askshell(const char *words, wordexp_t *we, int flags)
-{
-	int pdes[2];			/* Pipe to child */
-	size_t nwords, nbytes;		/* Number of words, bytes from child */
-	int i;				/* Handy integer */
-	unsigned int ui;		/* For array iteration */
-	size_t sofs;			/* Offset into we->we_strings */
-	size_t vofs;			/* Offset into we->we_wordv */
-	pid_t pid;			/* Process ID of child */
-	int status;			/* Child exit status */
-	const char *ifs;		/* IFS env. var. */
-	char *np, *p;			/* Handy pointers */
-	char *nstrings;			/* Temporary for realloc() */
-	char **nwv;			/* Temporary for realloc() */
-	FILE *fp;			/* Stream to read pipe */
-	extern char **environ;
-	char *cmd;
-
-	if ((ifs = getenv("IFS")) == NULL)
-		ifs = " \t\n";
-	if (asprintf(&cmd, "wordexp%c%s\n", *ifs, words) < 0)
-		return (WRDE_NOSPACE);
-	if (pipe(pdes) < 0) {
-		free(cmd);
-		return (WRDE_ERRNO);
-	}
-	if ((fp = fdopen(pdes[0], "r")) == NULL) {
-		free(cmd);
-		return (WRDE_ERRNO);
-	}
-	if ((pid = fork()) < 0) {
-		free(cmd);
-		fclose(fp);
-		close(pdes[1]);
-		return (WRDE_ERRNO);
-	}
-	else if (pid == 0) {
-		/*
-		 * We are the child; just get /bin/sh to run the wordexp
-		 * builtin on `words'.
-		 */
-		int devnull;
-
-		close(pdes[0]);
-		if (pdes[1] != STDOUT_FILENO) {
-			if (dup2(pdes[1], STDOUT_FILENO) < 0)
-				_exit(1);
-			close(pdes[1]);
-		}
-		if ((flags & WRDE_SHOWERR) == 0) {
-			if ((devnull = open(_PATH_DEVNULL, O_RDWR, 0666)) < 0)
-				_exit(1);
-			if (dup2(devnull, STDERR_FILENO) < 0)
-				_exit(1);
-			close(devnull);
-		}
-		execle(_PATH_BSHELL, "sh", flags & WRDE_UNDEF ? "-u" : "+u",
-		    "-c", cmd, (char *)NULL, environ);
-		_exit(1);
-	}
-
-	/*
-	 * We are the parent; read the output of the shell wordexp function,
-	 * which is a decimal word count, an null, a decimal byte count,
-	 * (not including terminating null bytes), a null and then followed
-	 * by the expanded words separated by nulls.
-	 */
-	free(cmd);
-	close(pdes[1]);
-	/* read the word count */	
-	nwords = 0;
-	while ((i = getc(fp)) != EOF) {
-		if (i == '\0')
-			break;
-		nwords *= 10;
-		nwords += (i - '0');
-	}
-	/* read the byte count */
-	nbytes = 0;
-	while ((i = getc(fp)) != EOF) {
-		if (i == '\0')
-			break;
-		nbytes *= 10;
-		nbytes += (i - '0');
-	}
-	if (i == EOF) {
-		fclose(fp);
-		waitpid(pid, &status, 0);
-		return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX);
-	}
-	nbytes += nwords;
-
-	/*
-	 * Allocate or reallocate (when flags & WRDE_APPEND) the word vector
-	 * and string storage buffers for the expanded words we're about to
-	 * read from the child.
-	 */
-	sofs = we->we_nbytes;
-	vofs = we->we_wordc;
-	if ((flags & (WRDE_DOOFFS|WRDE_APPEND)) == (WRDE_DOOFFS|WRDE_APPEND))
-		vofs += we->we_offs;
-	we->we_wordc += nwords;
-	we->we_nbytes += nbytes;
-	if ((nwv = realloc(we->we_wordv, (we->we_wordc + 1 +
-	    (flags & WRDE_DOOFFS ?  we->we_offs : 0)) *
-	    sizeof(char *))) == NULL) {
-		fclose(fp);
-		waitpid(pid, &status, 0);
-		return (WRDE_NOSPACE);
-	}
-	we->we_wordv = nwv;
-	if ((nstrings = realloc(we->we_strings, we->we_nbytes)) == NULL) {
-		fclose(fp);
-		waitpid(pid, &status, 0);
-		return (WRDE_NOSPACE);
-	}
-	for (ui = 0; ui < vofs; ui++)
-		if (we->we_wordv[ui] != NULL)
-			we->we_wordv[ui] += nstrings - we->we_strings;
-	we->we_strings = nstrings;
-
-	if (fread(we->we_strings + sofs, sizeof(char), nbytes, fp) != nbytes) {
-		fclose(fp);
-		waitpid(pid, &status, 0);
-		return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX);
-	}
-
-	if (waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) ||
-	    WEXITSTATUS(status) != 0) {
-		fclose(fp);
-		return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX);
-	}
-	fclose(fp);
-
-	/*
-	 * Break the null-terminated expanded word strings out into
-	 * the vector.
-	 */
-	if (vofs == 0 && flags & WRDE_DOOFFS)
-		while (vofs < we->we_offs)
-			we->we_wordv[vofs++] = NULL;
-	p = we->we_strings + sofs;
-	while (nwords-- != 0) {
-		we->we_wordv[vofs++] = p;
-		if ((np = memchr(p, '\0', nbytes)) == NULL)
-			return (WRDE_NOSPACE);	/* XXX */
-		nbytes -= np - p + 1;
-		p = np + 1;
-	}
-	we->we_wordv[vofs] = NULL;
-
-	return (0);
-}
-
-/*
- * we_check --
- *	Check that the string contains none of the following unquoted
- *	special characters: <newline> |&;<>(){}
- *	or command substitutions when WRDE_NOCMD is set in flags.
- */
-static int
-we_check(const char *words, int flags)
-{
-	char c;
-	int dquote, level, quote, squote;
-
-	quote = squote = dquote = 0;
-	while ((c = *words++) != '\0') {
-		switch (c) {
-		case '\\':
-			quote ^= 1;
-			continue;
-		case '\'':
-			if (quote + dquote == 0)
-				squote ^= 1;
-			break;
-		case '"':
-			if (quote + squote == 0)
-				dquote ^= 1;
-			break;
-		case '`':
-			if (quote + squote == 0 && flags & WRDE_NOCMD)
-				return (WRDE_CMDSUB);
-			while ((c = *words++) != '\0' && c != '`')
-				if (c == '\\' && (c = *words++) == '\0')
-					break;
-			if (c == '\0')
-				return (WRDE_SYNTAX);
-			break;
-		case '|': case '&': case ';': case '<': case '>':
-		case '{': case '}': case '(': case ')': case '\n':
-			if (quote + squote + dquote == 0)
-				return (WRDE_BADCHAR);
-			break;
-		case '$':
-			if ((c = *words++) == '\0')
-				break;
-			else if (quote + squote == 0 && c == '(') {
-				if (flags & WRDE_NOCMD && *words != '(')
-					return (WRDE_CMDSUB);
-				level = 1;
-				while ((c = *words++) != '\0') {
-					if (c == '\\') {
-						if ((c = *words++) == '\0')
-							break;
-					} else if (c == '(')
-						level++;
-					else if (c == ')' && --level == 0)
-						break;
-				}
-				if (c == '\0' || level != 0)
-					return (WRDE_SYNTAX);
-			} else if (quote + squote == 0 && c == '{') {
-				level = 1;
-				while ((c = *words++) != '\0') {
-					if (c == '\\') {
-						if ((c = *words++) == '\0')
-							break;
-					} else if (c == '{')
-						level++;
-					else if (c == '}' && --level == 0)
-						break;
-				}
-				if (c == '\0' || level != 0)
-					return (WRDE_SYNTAX);
-			} else
-				c = *--words;
-			break;
-		default:
-			break;
-		}
-		quote = 0;
-	}
-	if (quote + squote + dquote != 0)
-		return (WRDE_SYNTAX);
-
-	return (0);
-}
-
-/*
- * wordfree --
- *	Free the result of wordexp(). See wordexp(3).
- *
- */
-void
-wordfree(wordexp_t *we)
-{
-	_DIAGASSERT(we != NULL);
-	free(we->we_wordv);
-	free(we->we_strings);
-	we->we_wordv = NULL;
-	we->we_strings = NULL;
-	we->we_nbytes = 0;
-	we->we_wordc = 0;
-}
diff --git a/lib/libc/gmon/Makefile.inc b/lib/libc/gmon/Makefile.inc
deleted file mode 100644
index eff0810d8..000000000
--- a/lib/libc/gmon/Makefile.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.11 2014/09/17 11:37:28 joerg Exp $
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-# gmon sources
-.PATH: ${.CURDIR}/gmon ${ARCHDIR}/gmon
-
-.-include "${ARCHDIR}/gmon/Makefile.inc"
-
-SRCS+=	gmon.c mcount.c
-MAN+=	moncontrol.3
-MLINKS+=moncontrol.3 monstartup.3
-
-.if (${MACHINE_CPU} == "mips")
-# Turn off as(1) warnings on MIPS, since warnings are fatal with WARNS>0
-# and mcount.c causes warnings from as(1).
-# mcount.c should be fixed and this test removed.
-#
-COPTS.mcount.c+=${${ACTIVE_CXX} == "gcc":? -Wa,--no-warn :}
-.endif
-
-
-# mcount and gmon cannot be compiled with profiling
-mcount.po: mcount.o
-	cp mcount.o mcount.po
-
-gmon.po: gmon.o
-	cp gmon.o gmon.po
diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c
deleted file mode 100644
index 28c19bd04..000000000
--- a/lib/libc/gmon/gmon.c
+++ /dev/null
@@ -1,553 +0,0 @@
-/*	$NetBSD: gmon.c,v 1.35 2014/09/18 13:58:20 christos Exp $	*/
-
-/*
- * Copyright (c) 2003, 2004 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Nathan J. Williams for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project by
- *	Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1983, 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if !defined(lint) && defined(LIBC_SCCS)
-#if 0
-static char sccsid[] = "@(#)gmon.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: gmon.c,v 1.35 2014/09/18 13:58:20 christos Exp $");
-#endif
-#endif
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/gmon.h>
-#include <sys/mman.h>
-#include <sys/sysctl.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <unistd.h>
-#include <err.h>
-#include "extern.h"
-#include "reentrant.h"
-
-struct gmonparam _gmonparam = { .state = GMON_PROF_OFF };
-
-#ifdef _REENTRANT
-struct gmonparam *_gmonfree;
-struct gmonparam *_gmoninuse;
-mutex_t _gmonlock = MUTEX_INITIALIZER;
-thread_key_t _gmonkey;
-struct gmonparam _gmondummy;
-#endif
-
-static u_int	s_scale;
-/* see profil(2) where this is describe (incorrectly) */
-#define		SCALE_1_TO_1	0x10000L
-
-void	moncontrol(int);
-void	monstartup(u_long, u_long);
-void	_mcleanup(void);
-static int hertz(void);
-
-#ifdef _REENTRANT
-static void _m_gmon_destructor(void *);
-struct gmonparam *_m_gmon_alloc(void)
-    __attribute__((__no_instrument_function__));
-static void _m_gmon_merge(void);
-static void _m_gmon_merge_two(struct gmonparam *, struct gmonparam *);
-#endif
-
-void
-monstartup(u_long lowpc, u_long highpc)
-{
-	u_long o;
-	char *cp;
-	struct gmonparam *p = &_gmonparam;
-
-	/*
-	 * round lowpc and highpc to multiples of the density we're using
-	 * so the rest of the scaling (here and in gprof) stays in ints.
-	 */
-	p->lowpc = rounddown(lowpc, HISTFRACTION * sizeof(HISTCOUNTER));
-	p->highpc = roundup(highpc, HISTFRACTION * sizeof(HISTCOUNTER));
-	p->textsize = p->highpc - p->lowpc;
-	p->kcountsize = p->textsize / HISTFRACTION;
-	p->hashfraction = HASHFRACTION;
-	p->fromssize = p->textsize / p->hashfraction;
-	p->tolimit = p->textsize * ARCDENSITY / 100;
-	if (p->tolimit < MINARCS)
-		p->tolimit = MINARCS;
-	else if (p->tolimit > MAXARCS)
-		p->tolimit = MAXARCS;
-	p->tossize = p->tolimit * sizeof(struct tostruct);
-
-	cp = sbrk((intptr_t)(p->kcountsize + p->fromssize + p->tossize));
-	if (cp == (char *)-1) {
-		warnx("%s: out of memory", __func__);
-		return;
-	}
-#ifdef notdef
-	(void)memset(cp, 0, p->kcountsize + p->fromssize + p->tossize);
-#endif
-	p->tos = (struct tostruct *)(void *)cp;
-	cp += (size_t)p->tossize;
-	p->kcount = (u_short *)(void *)cp;
-	cp += (size_t)p->kcountsize;
-	p->froms = (u_short *)(void *)cp;
-
-	__minbrk = sbrk((intptr_t)0);
-	p->tos[0].link = 0;
-
-	o = p->highpc - p->lowpc;
-	if (p->kcountsize < o) {
-#ifndef notdef
-		s_scale = ((float)p->kcountsize / o ) * SCALE_1_TO_1;
-#else /* avoid floating point */
-		u_long quot = o / p->kcountsize;
-		
-		if (quot >= 0x10000)
-			s_scale = 1;
-		else if (quot >= 0x100)
-			s_scale = 0x10000 / quot;
-		else if (o >= 0x800000)
-			s_scale = 0x1000000 / (o / (p->kcountsize >> 8));
-		else
-			s_scale = 0x1000000 / ((o << 8) / p->kcountsize);
-#endif
-	} else
-		s_scale = SCALE_1_TO_1;
-
-#ifdef _REENTRANT
-	_gmondummy.state = GMON_PROF_BUSY;
-	thr_keycreate(&_gmonkey, _m_gmon_destructor);
-#endif
-	moncontrol(1);
-}
-
-#ifdef _REENTRANT
-static void
-_m_gmon_destructor(void *arg)
-{
-	struct gmonparam *p = arg, *q, **prev;
-
-	if (p == &_gmondummy)
-		return;
-
-	thr_setspecific(_gmonkey, &_gmondummy);
-
-	mutex_lock(&_gmonlock);
-	/* XXX eww, linear list traversal. */
-	for (q = _gmoninuse, prev = &_gmoninuse;
-	     q != NULL;
-	     prev = (struct gmonparam **)(void *)&q->kcount,	/* XXX */
-		 q = (struct gmonparam *)(void *)q->kcount) {
-		if (q == p)
-			*prev = (struct gmonparam *)(void *)q->kcount;
-	}
-	p->kcount = (u_short *)(void *)_gmonfree;
-	_gmonfree = p;
-	mutex_unlock(&_gmonlock);
-
-	thr_setspecific(_gmonkey, NULL);
-}
-
-struct gmonparam *
-_m_gmon_alloc(void)
-{
-	struct gmonparam *p;
-	char *cp;
-
-	mutex_lock(&_gmonlock);
-	if (_gmonfree != NULL) {
-		p = _gmonfree;
-		_gmonfree = (struct gmonparam *)(void *)p->kcount;
-		p->kcount = (u_short *)(void *)_gmoninuse;
-		_gmoninuse = p;
-	} else {
-		mutex_unlock(&_gmonlock);
-		cp = mmap(NULL,
-		    (size_t)(sizeof (struct gmonparam) + 
-			_gmonparam.fromssize + _gmonparam.tossize),
-		    PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, (off_t)0);
-		p = (void *)cp;
-		*p = _gmonparam;
-		p->kcount = NULL;
-		cp += sizeof (struct gmonparam);
-		memset(cp, 0, (size_t)(p->fromssize + p->tossize));
-		p->froms = (u_short *)(void *)cp;
-		p->tos = (struct tostruct *)(void *)(cp + p->fromssize);
-		mutex_lock(&_gmonlock);
-		p->kcount = (u_short *)(void *)_gmoninuse;
-		_gmoninuse = p;
-	}
-	mutex_unlock(&_gmonlock);
-	thr_setspecific(_gmonkey, p);
-
-	return p;
-}
-
-static void
-_m_gmon_merge_two(struct gmonparam *p, struct gmonparam *q)
-{
-	u_long fromindex;
-	u_short *frompcindex, qtoindex, toindex;
-	u_long selfpc;
-	u_long endfrom;
-	long count;
-	struct tostruct *top;
-	
-	endfrom = (q->fromssize / sizeof(*q->froms));
-	for (fromindex = 0; fromindex < endfrom; fromindex++) {
-		if (q->froms[fromindex] == 0)
-			continue;
-		for (qtoindex = q->froms[fromindex]; qtoindex != 0;
-		     qtoindex = q->tos[qtoindex].link) {
-			selfpc = q->tos[qtoindex].selfpc;
-			count = q->tos[qtoindex].count;
-			/* cribbed from mcount */
-			frompcindex = &p->froms[fromindex];
-			toindex = *frompcindex;
-			if (toindex == 0) {
-				/*
-				 *	first time traversing this arc
-				 */
-				toindex = ++p->tos[0].link;
-				if (toindex >= p->tolimit)
-					/* halt further profiling */
-					goto overflow;
-				
-				*frompcindex = (u_short)toindex;
-				top = &p->tos[(size_t)toindex];
-				top->selfpc = selfpc;
-				top->count = count;
-				top->link = 0;
-				goto done;
-			}
-			top = &p->tos[(size_t)toindex];
-			if (top->selfpc == selfpc) {
-				/*
-				 * arc at front of chain; usual case.
-				 */
-				top->count+= count;
-				goto done;
-			}
-			/*
-			 * have to go looking down chain for it.
-			 * top points to what we are looking at,
-			 * we know it is not at the head of the chain.
-			 */
-			for (; /* goto done */; ) {
-				if (top->link == 0) {
-					/*
-					 * top is end of the chain and
-					 * none of the chain had
-					 * top->selfpc == selfpc.  so
-					 * we allocate a new tostruct
-					 * and link it to the head of
-					 * the chain.
-					 */
-					toindex = ++p->tos[0].link;
-					if (toindex >= p->tolimit)
-						goto overflow;
-					
-					top = &p->tos[(size_t)toindex];
-					top->selfpc = selfpc;
-					top->count = count;
-					top->link = *frompcindex;
-					*frompcindex = (u_short)toindex;
-					goto done;
-				}
-				/*
-				 * otherwise, check the next arc on the chain.
-				 */
-				top = &p->tos[top->link];
-				if (top->selfpc == selfpc) {
-					/*
-					 * there it is.
-					 * add to its count.
-					 */
-					top->count += count;
-					goto done;
-				}
-				
-			}
-
-		done: ;
-		}
-
-	}
- overflow: ;
- 
-}
-
-static void
-_m_gmon_merge(void)
-{
-	struct gmonparam *q;
-
-	mutex_lock(&_gmonlock);
-
-	for (q = _gmonfree; q != NULL;
-	    q = (struct gmonparam *)(void *)q->kcount)
-		_m_gmon_merge_two(&_gmonparam, q);
-
-	for (q = _gmoninuse; q != NULL;
-	    q = (struct gmonparam *)(void *)q->kcount) {
-		q->state = GMON_PROF_OFF;
-		_m_gmon_merge_two(&_gmonparam, q);
-	}
-
-	mutex_unlock(&_gmonlock);
-}
-#endif
-
-void
-_mcleanup(void)
-{
-	int fd;
-	int fromindex;
-	int endfrom;
-	u_long frompc;
-	int toindex;
-	struct rawarc rawarc;
-	struct gmonparam *p = &_gmonparam;
-	struct gmonhdr gmonhdr, *hdr;
-	struct clockinfo clockinfo;
-#if !defined(__minix)
-	int mib[2];
-	size_t size;
-#endif /* !defined(__minix) */
-	char *profdir;
-	const char *proffile;
-	char  buf[PATH_MAX];
-#ifdef DEBUG
-	int logfd, len;
-	char buf2[200];
-#endif
-
-	/*
-	 * We disallow writing to the profiling file, if we are a
-	 * set{u,g}id program and our effective {u,g}id does not match
-	 * our real one.
-	 */
-	if (issetugid() && (geteuid() != getuid() || getegid() != getgid())) {
-		warnx("%s: Profiling of set{u,g}id binaries is not"
-		    " allowed", __func__);
-		return;
-	}
-
-	if (p->state == GMON_PROF_ERROR)
-		warnx("%s: tos overflow", __func__);
-
-#if defined(__minix)
-	clockinfo.profhz = sysconf(_SC_CLK_TCK);
-#else
-	size = sizeof(clockinfo);
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_CLOCKRATE;
-	if (sysctl(mib, 2, &clockinfo, &size, NULL, 0) < 0) {
-		/*
-		 * Best guess
-		 */
-		clockinfo.profhz = hertz();
-	} else if (clockinfo.profhz == 0) {
-		if (clockinfo.hz != 0)
-			clockinfo.profhz = clockinfo.hz;
-		else
-			clockinfo.profhz = hertz();
-	}
-#endif /* defined(__minix) */
-
-	moncontrol(0);
-
-	if ((profdir = getenv("PROFDIR")) != NULL) {
-		/* If PROFDIR contains a null value, no profiling 
-		   output is produced */
-		if (*profdir == '\0')
-			return;
-
-		if (snprintf(buf, sizeof buf, "%s/%d.%s",
-		    profdir, getpid(), getprogname()) >= (int)(sizeof buf)) {
-			warnx("%s: internal buffer overflow, PROFDIR too long",
-			    __func__);
-			return;
-		}
-		
-		proffile = buf;
-	} else {
-		proffile = "gmon.out";
-	}
-
-#define OPEN_FLAGS (O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC)
-	fd = open(proffile, OPEN_FLAGS, 0666);
-	if (fd < 0) {
-		warn("%s: Cannot open `%s'", __func__, proffile);
-		return;
-	}
-#ifdef DEBUG
-	logfd = open("gmon.log", OPEN_FLAGS, 0664);
-	if (logfd < 0) {
-		warn("%s: Cannot open `%s'", __func__, "gmon.log");
-		(void)close(fd);
-		return;
-	}
-	len = snprintf(buf2, sizeof buf2, "[mcleanup1] kcount %p ssiz %lu\n",
-	    p->kcount, p->kcountsize);
-	(void)write(logfd, buf2, (size_t)len);
-#endif
-#ifdef _REENTRANT
-	_m_gmon_merge();
-#endif
-	hdr = (struct gmonhdr *)&gmonhdr;
-	hdr->lpc = p->lowpc;
-	hdr->hpc = p->highpc;
-	hdr->ncnt = (int)(p->kcountsize + sizeof(gmonhdr));
-	hdr->version = GMONVERSION;
-	hdr->profrate = clockinfo.profhz;
-	(void)write(fd, hdr, sizeof *hdr);
-	(void)write(fd, p->kcount, (size_t)p->kcountsize);
-	endfrom = (int)(p->fromssize / sizeof(*p->froms));
-	for (fromindex = 0; fromindex < endfrom; fromindex++) {
-		if (p->froms[fromindex] == 0)
-			continue;
-
-		frompc = p->lowpc;
-		frompc += fromindex * p->hashfraction * sizeof(*p->froms);
-		for (toindex = p->froms[fromindex]; toindex != 0;
-		     toindex = p->tos[toindex].link) {
-#ifdef DEBUG
-			len = snprintf(buf2, sizeof buf2,
-			"[mcleanup2] frompc 0x%lx selfpc 0x%lx count %lu\n" ,
-				(u_long)frompc, (u_long)p->tos[toindex].selfpc,
-				(u_long)p->tos[toindex].count);
-			(void)write(logfd, buf2, (size_t)len);
-#endif
-			rawarc.raw_frompc = frompc;
-			rawarc.raw_selfpc = p->tos[toindex].selfpc;
-			rawarc.raw_count = p->tos[toindex].count;
-			(void)write(fd, &rawarc, sizeof rawarc);
-		}
-	}
-	(void)close(fd);
-#ifdef DEBUG
-	(void)close(logfd);
-#endif
-}
-
-/*
- * Control profiling
- *	profiling is what mcount checks to see if
- *	all the data structures are ready.
- */
-void
-moncontrol(int mode)
-{
-	struct gmonparam *p = &_gmonparam;
-
-	if (mode) {
-		/* start */
-		profil((char *)(void *)p->kcount, (size_t)p->kcountsize,
-		    p->lowpc, s_scale);
-		p->state = GMON_PROF_ON;
-	} else {
-		/* stop */
-		profil(NULL, 0, (u_long)0, 0);
-		p->state = GMON_PROF_OFF;
-	}
-}
-
-#if !defined(__minix)
-/*
- * discover the tick frequency of the machine
- * if something goes wrong, we return 0, an impossible hertz.
- */
-static int
-hertz(void)
-{
-        struct itimerspec tim;
-	timer_t t;
-	int rv = 0;
-
-        tim.it_interval.tv_sec = 0;
-        tim.it_interval.tv_nsec = 1;
-        tim.it_value.tv_sec = 0;
-        tim.it_value.tv_nsec = 0;
-
-	if (timer_create(CLOCK_REALTIME, NULL, &t) == -1)
-		return 0;
-
-	if (timer_settime(t, 0, &tim, NULL) == -1)
-		goto out;
-
-	if (timer_gettime(t, &tim) == -1)
-		goto out;
-
-        if (tim.it_interval.tv_nsec < 2)
-		goto out;
-
-	rv = (int)(1000000000LL / tim.it_interval.tv_nsec);
-out:
-	(void)timer_delete(t);
-	return rv;
-}
-#endif /* !defined(__minix) */
diff --git a/lib/libc/gmon/moncontrol.3 b/lib/libc/gmon/moncontrol.3
deleted file mode 100644
index bc3dc3257..000000000
--- a/lib/libc/gmon/moncontrol.3
+++ /dev/null
@@ -1,115 +0,0 @@
-.\"	$NetBSD: moncontrol.3,v 1.10 2009/04/11 15:33:27 joerg Exp $
-.\"
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)moncontrol.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt MONCONTROL 3
-.Os
-.Sh NAME
-.Nm moncontrol ,
-.Nm monstartup
-.Nd control execution profile
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.Fn moncontrol "int mode"
-.Fn monstartup "u_long *lowpc" "u_long *highpc"
-.Sh DESCRIPTION
-An executable program compiled using the
-.Fl pg
-option to
-.Xr cc 1
-automatically includes calls to collect statistics for the
-.Xr gprof 1
-call-graph execution profiler.
-In typical operation, profiling begins at program startup
-and ends when the program calls exit.
-When the program exits, the profiling data are written to the file
-.Em gmon.out ,
-then
-.Xr gprof 1
-can be used to examine the results.
-.Pp
-.Fn moncontrol
-selectively controls profiling within a program.
-When the program starts, profiling begins.
-To stop the collection of histogram ticks and call counts use
-.Fn moncontrol 0 ;
-to resume the collection of histogram ticks and call counts use
-.Fn moncontrol 1 .
-This feature allows the cost of particular operations to be measured.
-Note that an output file will be produced on program exit
-regardless of the state of
-.Fn moncontrol .
-.Pp
-Programs that are not loaded with
-.Fl pg
-may selectively collect profiling statistics by calling
-.Fn monstartup
-with the range of addresses to be profiled.
-.Fa lowpc
-and
-.Fa highpc
-specify the address range that is to be sampled;
-the lowest address sampled is that of
-.Fa lowpc
-and the highest is just below
-.Fa highpc .
-Only functions in that range that have been compiled with the
-.Fl pg
-option to
-.Xr cc 1
-will appear in the call graph part of the output;
-however, all functions in that address range will
-have their execution time measured.
-Profiling begins on return from
-.Fn monstartup .
-.Sh ENVIRONMENT
-.Bl -tag -width "PROFDIR"
-.It Ev PROFDIR
-Directory to place the output file(s) in.
-When this is set, instead of writing the profiling output to
-.Pa gmon.out ,
-a filename is generated from the process id and name of the program
-(e.g.,
-.Pa 123.a.out ) .
-If you are profiling a program that forks,
-or otherwise creates multiple copies,
-setting this is the only reasonable way to get all profiling data.
-.El
-.Sh FILES
-.Bl -tag -width ".Pa gmon.out" -compact
-.It Pa gmon.out
-execution data file
-.El
-.Sh SEE ALSO
-.Xr cc 1 ,
-.Xr gprof 1 ,
-.Xr profil 2
diff --git a/lib/libc/hash/Makefile.inc b/lib/libc/hash/Makefile.inc
deleted file mode 100644
index beecbf416..000000000
--- a/lib/libc/hash/Makefile.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.12 2012/07/08 01:21:12 rmind Exp $
-#	$OpenBSD: Makefile.inc,v 1.5 1997/07/17 06:02:42 millert Exp $
-
-# hash functions
-.PATH: ${ARCHDIR}/hash ${.CURDIR}/hash
-
-.include "${.CURDIR}/hash/md2/Makefile.inc"
-.include "${.CURDIR}/hash/rmd160/Makefile.inc"
-.include "${.CURDIR}/hash/sha1/Makefile.inc"
-.include "${.CURDIR}/hash/sha2/Makefile.inc"
-
-.include "${.CURDIR}/hash/murmurhash/Makefile.inc"
diff --git a/lib/libc/hash/hashhl.c b/lib/libc/hash/hashhl.c
deleted file mode 100644
index 2d79e230a..000000000
--- a/lib/libc/hash/hashhl.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* $NetBSD: hashhl.c,v 1.7 2014/09/24 13:18:52 christos Exp $ */
-
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@login.dkuug.dk> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- */
-
-/*
- * Modified September 24, 2005 by Elad Efrat <elad@NetBSD.org>
- * Modified April 29, 1997 by Jason R. Thorpe <thorpej@NetBSD.org>
- */
-
-#ifdef HASH_ALGORITHM
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-/*
- * Do all the name mangling before we include "namespace.h"
- */
-#define	CONCAT(x,y)	__CONCAT(x,y)
-
-#ifndef HASH_FNPREFIX
-#define	HASH_FNPREFIX	HASH_ALGORITHM
-#endif /* !HASH_FNPREFIX */
-
-#define	FNPREFIX(x)	CONCAT(HASH_FNPREFIX,x)
-#define	HASH_CTX	CONCAT(HASH_ALGORITHM,_CTX)
-#define	HASH_LEN	CONCAT(HASH_ALGORITHM,_DIGEST_LENGTH)
-#define	HASH_STRLEN	CONCAT(HASH_ALGORITHM,_DIGEST_STRING_LENGTH)
-
-#if !defined(_KERNEL) && defined(__weak_alias) && !defined(HAVE_NBTOOL_CONFIG_H)
-#define	WA(a,b)	__weak_alias(a,b)
-WA(FNPREFIX(End),CONCAT(_,FNPREFIX(End)))
-WA(FNPREFIX(FileChunk),CONCAT(_,FNPREFIX(FileChunk)))
-WA(FNPREFIX(File),CONCAT(_,FNPREFIX(File)))
-WA(FNPREFIX(Data),CONCAT(_,FNPREFIX(Data)))
-#undef WA
-#endif
-
-#include "namespace.h"
-#include HASH_INCLUDE
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#ifndef MIN
-#define	MIN(x,y)	((x)<(y)?(x):(y))
-#endif /* !MIN */
-
-char *
-FNPREFIX(End)(HASH_CTX *ctx, char *buf)
-{
-	int i;
-	unsigned char digest[HASH_LEN];
-	static const char hex[]="0123456789abcdef";
-
-	_DIAGASSERT(ctx != 0);
-
-	if (buf == NULL)
-		buf = malloc((size_t)HASH_STRLEN);
-	if (buf == NULL)
-		return (NULL);
-
-	FNPREFIX(Final)(digest, ctx);
-
-	for (i = 0; i < HASH_LEN; i++) {
-		buf[i+i] = hex[(u_int32_t)digest[i] >> 4];
-		buf[i+i+1] = hex[digest[i] & 0x0f];
-	}
-
-	buf[i+i] = '\0';
-	return (buf);
-}
-
-char *
-FNPREFIX(FileChunk)(const char *filename, char *buf, off_t off, off_t len)
-{
-	struct stat sb;
-	u_char buffer[BUFSIZ];
-	HASH_CTX ctx;
-	int fd, save_errno;
-	ssize_t nr;
-
-	FNPREFIX(Init)(&ctx);
-
-	if ((fd = open(filename, O_RDONLY | O_CLOEXEC)) < 0)
-		return (NULL);
-	if (len == 0) {
-		if (fstat(fd, &sb) == -1) {
-			close(fd);
-			return (NULL);
-		}
-		len = sb.st_size;
-	}
-	if (off > 0 && lseek(fd, off, SEEK_SET) < 0) {
-		close(fd);
-		return (NULL);
-	}
-
-	while ((nr = read(fd, buffer, (size_t) MIN((off_t)sizeof(buffer), len)))
-	    > 0) {
-		FNPREFIX(Update)(&ctx, buffer, (unsigned int)nr);
-		if (len > 0 && (len -= nr) == 0)
-			break;
-	}
-
-	save_errno = errno;
-	close(fd);
-	errno = save_errno;
-	return (nr < 0 ? NULL : FNPREFIX(End)(&ctx, buf));
-}
-
-char *
-FNPREFIX(File)(const char *filename, char *buf)
-{
-	return (FNPREFIX(FileChunk)(filename, buf, (off_t)0, (off_t)0));
-}
-
-char *
-FNPREFIX(Data)(const unsigned char *data, size_t len, char *buf)
-{
-	HASH_CTX ctx;
-
-	_DIAGASSERT(data != 0);
-
-	FNPREFIX(Init)(&ctx);
-	FNPREFIX(Update)(&ctx, data, (unsigned int)len);
-	return (FNPREFIX(End)(&ctx, buf));
-}
-
-#endif /* HASH_ALGORITHM */
diff --git a/lib/libc/hash/md2/Makefile.inc b/lib/libc/hash/md2/Makefile.inc
deleted file mode 100644
index 8e1adf531..000000000
--- a/lib/libc/hash/md2/Makefile.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2005/09/24 20:51:14 elad Exp $
-
-# hash functions
-.PATH: ${.CURDIR}/hash/md2
-
-SRCS+=	md2.c md2hl.c
-
-MAN+=	md2.3
-
-MLINKS+=md2.3 MD2Init.3 md2.3 MD2Update.3 md2.3 MD2Final.3
-MLINKS+=md2.3 MD2End.3  md2.3 MD2File.3   md2.3 MD2Data.3
-MLINKS+=md2.3 MD2Transform.3  md2.3 MD2FileChunk.3
diff --git a/lib/libc/hash/md2/md2.3 b/lib/libc/hash/md2/md2.3
deleted file mode 100644
index e6f819cf9..000000000
--- a/lib/libc/hash/md2/md2.3
+++ /dev/null
@@ -1,123 +0,0 @@
-.\" $NetBSD: md2.3,v 1.1 2005/09/24 20:51:14 elad Exp $
-.\"
-.\" ----------------------------------------------------------------------------
-.\" "THE BEER-WARE LICENSE" (Revision 42):
-.\" <phk@login.dkuug.dk> wrote this file.  As long as you retain this notice you
-.\" can do whatever you want with this stuff. If we meet some day, and you think
-.\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
-.\" ----------------------------------------------------------------------------
-.\"
-.\"	from FreeBSD Id: mdX.3,v 1.7 1996/10/22 16:28:56 phk Exp
-.\"
-.Dd September 24, 2005
-.Dt MD2 3
-.Os
-.Sh NAME
-.Nm MD2Init ,
-.Nm MD2Update ,
-.Nm MD2Final ,
-.Nm MD2End ,
-.Nm MD2File ,
-.Nm MD2Data
-.Nd calculate the RSA Data Security, Inc.,
-.Dq MD2
-message digest
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In mdX.h
-.Ft void
-.Fn MD2Init "MD2_CTX *context"
-.Ft void
-.Fn MD2Update "MD2_CTX *context" "const unsigned char *data" "unsigned int len"
-.Ft void
-.Fn MD2Final "unsigned char digest[16]" "MD2_CTX *context"
-.Ft "char *"
-.Fn MD2End "MD2_CTX *context" "char *buf"
-.Ft "char *"
-.Fn MD2File "const char *filename" "char *buf"
-.Ft "char *"
-.Fn MD2Data "const unsigned char *data" "unsigned int len" "char *buf"
-.Sh DESCRIPTION
-The MD2 functions calculate a 128-bit cryptographic checksum (digest)
-for any number of input bytes.
-A cryptographic checksum is a one-way
-hash-function, that is, you cannot find (except by exhaustive search)
-the input corresponding to a particular output.
-This net result is
-a ``fingerprint'' of the input-data, which doesn't disclose the actual
-input.
-.Pp
-The MD2 routines should not be used for any security-related purpose.
-.Pp
-The
-.Fn MD2Init ,
-.Fn MD2Update ,
-and
-.Fn MD2Final
-functions are the core functions.
-Allocate an MD2_CTX, initialize it with
-.Fn MD2Init ,
-run over the data with
-.Fn MD2Update ,
-and finally extract the result using
-.Fn MD2Final .
-.Pp
-.Fn MD2End
-is a wrapper for
-.Fn MD2Final
-which converts the return value to a 33-character
-(including the terminating '\e0')
-.Tn ASCII
-string which represents the 128 bits in hexadecimal.
-.Pp
-.Fn MD2File
-calculates the digest of a file, and uses
-.Fn MD2End
-to return the result.
-If the file cannot be opened, a null pointer is returned.
-.Fn MD2Data
-calculates the digest of a chunk of data in memory, and uses
-.Fn MD2End
-to return the result.
-.Pp
-When using
-.Fn MD2End ,
-.Fn MD2File ,
-or
-.Fn MD2Data ,
-the
-.Ar buf
-argument can be a null pointer, in which case the returned string
-is allocated with
-.Xr malloc 3
-and subsequently must be explicitly deallocated using
-.Xr free 3
-after use.
-If the
-.Ar buf
-argument is non-null it must point to at least 33 characters of buffer space.
-.Sh SEE ALSO
-.Xr md2 3 ,
-.Rs
-.%A B. Kaliski
-.%T The MD2 Message-Digest Algorithm
-.%O RFC 1319
-.Re
-.Rs
-.%A RSA Laboratories
-.%T Frequently Asked Questions About today's Cryptography
-.Re
-.Sh HISTORY
-These functions appeared in
-.Nx 1.3 .
-.Sh AUTHORS
-The original MD2 routines were developed by
-.Tn RSA
-Data Security, Inc., and published in the above references.
-This code is a public domain implementation by Andrew Brown.
-.Sh BUGS
-No method is known to exist which finds two files having the same hash value,
-nor to find a file with a specific hash value.
-There is on the other hand no guarantee that such a method doesn't exist.
diff --git a/lib/libc/hash/md2/md2.c b/lib/libc/hash/md2/md2.c
deleted file mode 100644
index b353a7918..000000000
--- a/lib/libc/hash/md2/md2.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*	$NetBSD: md2.c,v 1.7 2012/06/25 22:32:44 abs Exp $	*/
-
-/*
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Andrew Brown.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: md2.c,v 1.7 2012/06/25 22:32:44 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-
-#include <assert.h>
-#include <md2.h>
-#include <string.h>
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#if !HAVE_MD2_H
-
-/* cut-n-pasted from rfc1319 */
-static unsigned char S[256] = {
-	41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6,
-	19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188,
-	76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24,
-	138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251,
-	245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63,
-	148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50,
-	39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165,
-	181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210,
-	150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157,
-	112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27,
-	96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15,
-	85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197,
-	234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65,
-	129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123,
-	8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233,
-	203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228,
-	166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237,
-	31, 26, 219, 153, 141, 51, 159, 17, 131, 20
-};
-
-/* cut-n-pasted from rfc1319 */
-static const unsigned char *pad[] = {
-	(const unsigned char *)"",
-	(const unsigned char *)"\001",
-	(const unsigned char *)"\002\002",
-	(const unsigned char *)"\003\003\003",
-	(const unsigned char *)"\004\004\004\004",
-	(const unsigned char *)"\005\005\005\005\005",
-	(const unsigned char *)"\006\006\006\006\006\006",
-	(const unsigned char *)"\007\007\007\007\007\007\007",
-	(const unsigned char *)"\010\010\010\010\010\010\010\010",
-	(const unsigned char *)"\011\011\011\011\011\011\011\011\011",
-	(const unsigned char *)"\012\012\012\012\012\012\012\012\012\012",
-	(const unsigned char *)"\013\013\013\013\013\013\013\013\013\013\013",
-	(const unsigned char *)
-	"\014\014\014\014\014\014\014\014\014\014\014\014",
-	(const unsigned char *)
-	"\015\015\015\015\015\015\015\015\015\015\015\015\015",
-	(const unsigned char *)
-	"\016\016\016\016\016\016\016\016\016\016\016\016\016\016",
-	(const unsigned char *)
-	"\017\017\017\017\017\017\017\017\017\017\017\017\017\017\017",
-	(const unsigned char *)
-	"\020\020\020\020\020\020\020\020\020\020\020\020\020\020\020\020"
-};
-
-/*
- * XXX This should not be visible, but due to an accident, it is
- * XXX so it must remain so.
- */
-/*static*/ void MD2Transform __P((MD2_CTX *));
-
-#ifdef __weak_alias
-__weak_alias(MD2Init,_MD2Init)
-__weak_alias(MD2Update,_MD2Update)
-__weak_alias(MD2Final,_MD2Final)
-__weak_alias(MD2Transform,_MD2Transform)
-#endif
-
-void
-MD2Init(MD2_CTX *context)
-{
-	_DIAGASSERT(context != 0);
-
-	context->i = 16;
-	memset(&context->C[0], 0, sizeof(context->C));
-	memset(&context->X[0], 0, sizeof(context->X));
-}
-
-void
-MD2Update(MD2_CTX *context, const unsigned char *input, unsigned int inputLen)
-{
-	unsigned int idx, piece;
-
-	_DIAGASSERT(context != 0);
-	_DIAGASSERT(input != 0);
-
-	for (idx = 0; idx < inputLen; idx += piece) {
-		piece = 32 - context->i;
-		if ((inputLen - idx) < piece)
-			piece = inputLen - idx;
-		memcpy(&context->X[context->i], &input[idx], (size_t)piece);
-		if ((context->i += piece) == 32)
-			MD2Transform(context); /* resets i */
-	}
-}
-
-void
-MD2Final(unsigned char digest[16], MD2_CTX *context)
-{
-	unsigned int padlen;
-
-	_DIAGASSERT(digest != 0);
-	_DIAGASSERT(context != 0);
-
-	/* padlen should be 1..16 */
-	padlen = 32 - context->i;
-
-	/* add padding */
-	MD2Update(context, pad[padlen], padlen);
-
-	/* add checksum */
-	MD2Update(context, &context->C[0], (unsigned int) sizeof(context->C));
-
-	/* copy out final digest */
-	memcpy(digest, &context->X[0], (size_t)16);
-
-	/* reset the context */
-	MD2Init(context);
-}
-
-/*static*/ void
-MD2Transform(MD2_CTX *context)
-{
-	uint32_t l, j, k, t;
-
-	/* set block "3" and update "checksum" */
-	for (l = context->C[15], j = 0; j < 16; j++) {
-		context->X[32 + j] = context->X[j] ^ context->X[16 + j];
-		l = context->C[j] ^= S[context->X[16 + j] ^ l];
-	}
-
-	/* mangle input block */
-	for (t = j = 0; j < 18; t = (t + j) % 256, j++)
-		for (k = 0; k < 48; k++)
-			t = context->X[k] = (context->X[k] ^ S[t]);
-
-	/* reset input pointer */
-	context->i = 16;
-}
-
-#endif /* !HAVE_MD2_H */
diff --git a/lib/libc/hash/md2/md2hl.c b/lib/libc/hash/md2/md2hl.c
deleted file mode 100644
index 64eb2bef9..000000000
--- a/lib/libc/hash/md2/md2hl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: md2hl.c,v 1.4 2008/04/13 02:04:31 dholland Exp $ */
-
-/*
- * Derived from code written by Jason R. Thorpe <thorpej@NetBSD.org>,
- * April 29, 1997.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: md2hl.c,v 1.4 2008/04/13 02:04:31 dholland Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define	HASH_ALGORITHM	MD2
-#define HASH_INCLUDE	<md2.h>
-
-#include "../hashhl.c"
diff --git a/lib/libc/hash/murmurhash/Makefile.inc b/lib/libc/hash/murmurhash/Makefile.inc
deleted file mode 100644
index e109fc6e5..000000000
--- a/lib/libc/hash/murmurhash/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2012/07/08 11:43:47 rmind Exp $
-
-.PATH: ${.CURDIR}/hash/murmurhash
-
-SRCS+=	murmurhash.c
diff --git a/lib/libc/hash/rmd160/Makefile.inc b/lib/libc/hash/rmd160/Makefile.inc
deleted file mode 100644
index 0caf265e0..000000000
--- a/lib/libc/hash/rmd160/Makefile.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2005/09/24 19:04:52 elad Exp $
-
-# hash functions
-.PATH: ${.CURDIR}/hash/rmd160
-
-SRCS+=	rmd160.c rmd160hl.c
-
-MAN+=	rmd160.3
-
-MLINKS+=rmd160.3 RMD160Init.3    rmd160.3 RMD160Update.3
-MLINKS+=rmd160.3 RMD160Final.3   rmd160.3 RMD160Transform.3
-MLINKS+=rmd160.3 RMD160End.3     rmd160.3 RMD160File.3
-MLINKS+=rmd160.3 RMD160Data.3
diff --git a/lib/libc/hash/rmd160/rmd160.3 b/lib/libc/hash/rmd160/rmd160.3
deleted file mode 100644
index f9d64e09e..000000000
--- a/lib/libc/hash/rmd160/rmd160.3
+++ /dev/null
@@ -1,225 +0,0 @@
-.\"	$NetBSD: rmd160.3,v 1.3 2010/04/05 21:26:30 joerg Exp $
-.\"	$OpenBSD: rmd160.3,v 1.12 2000/04/18 03:01:29 aaron Exp $
-.\"
-.\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-.\" 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.
-.\"
-.\" See http://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html
-.\"	for detailed information about RIPEMD-160.
-.\"
-.Dd July 16, 1997
-.Dt RMD160 3
-.Os
-.Sh NAME
-.Nm RMD160Init ,
-.Nm RMD160Update ,
-.Nm RMD160Final ,
-.Nm RMD160Transform ,
-.Nm RMD160End ,
-.Nm RMD160File ,
-.Nm RMD160Data
-.Nd calculate the ``RIPEMD-160'' message digest
-.Sh SYNOPSIS
-.In sys/types.h
-.In rmd160.h
-.Ft void
-.Fn RMD160Init "RMD160_CTX *context"
-.Ft void
-.Fn RMD160Update "RMD160_CTX *context" "const u_char *data" "u_int nbytes"
-.Ft void
-.Fn RMD160Final "u_char digest[20]" "RMD160_CTX *context"
-.Ft void
-.Fn RMD160Transform "uint32_t state[5]" "const uint32_t block[16]"
-.Ft "char *"
-.Fn RMD160End "RMD160_CTX *context" "char *buf"
-.Ft "char *"
-.Fn RMD160File "char *filename" "char *buf"
-.Ft "char *"
-.Fn RMD160Data "u_char *data" "size_t len" "char *buf"
-.Sh DESCRIPTION
-The RMD160 functions implement the 160-bit RIPE message digest hash algorithm
-(RMD-160).
-RMD-160 is used to generate a condensed representation
-of a message called a message digest.
-The algorithm takes a
-message less than 2^64 bits as input and produces a 160-bit digest
-suitable for use as a digital signature.
-.Pp
-The RMD160 functions are considered to be more secure than the
-.Xr md4 3
-and
-.Xr md5 3
-functions and at least as secure as the
-.Xr sha1 3
-function.
-All share a similar interface.
-.Pp
-The
-.Fn RMD160Init
-function initializes a RMD160_CTX
-.Ar context
-for use with
-.Fn RMD160Update ,
-and
-.Fn RMD160Final .
-The
-.Fn RMD160Update
-function adds
-.Ar data
-of length
-.Ar nbytes
-to the RMD160_CTX specified by
-.Ar context .
-.Fn RMD160Final
-is called when all data has been added via
-.Fn RMD160Update
-and stores a message digest in the
-.Ar digest
-parameter.
-When a null pointer is passed to
-.Fn RMD160Final
-as first argument only the final padding will be applied and the
-current context can still be used with
-.Fn RMD160Update .
-.Pp
-The
-.Fn RMD160Transform
-function is used by
-.Fn RMD160Update
-to hash 512-bit blocks and forms the core of the algorithm.
-Most programs should use the interface provided by
-.Fn RMD160Init ,
-.Fn RMD160Update
-and
-.Fn RMD160Final
-instead of calling
-.Fn RMD160Transform
-directly.
-.Pp
-The
-.Fn RMD160End
-function is a front end for
-.Fn RMD160Final
-which converts the digest into an
-.Tn ASCII
-representation of the 160 bit digest in hexadecimal.
-.Pp
-The
-.Fn RMD160File
-function calculates the digest for a file and returns the result via
-.Fn RMD160End .
-If
-.Fn RMD160File
-is unable to open the file a NULL pointer is returned.
-.Pp
-The
-.Fn RMD160Data
-function
-calculates the digest of an arbitrary string and returns the result via
-.Fn RMD160End .
-.Pp
-For each of the
-.Fn RMD160End ,
-.Fn RMD160File ,
-and
-.Fn RMD160Data
-functions the
-.Ar buf
-parameter should either be a string of at least 41 characters in
-size or a NULL pointer.
-In the latter case, space will be dynamically allocated via
-.Xr malloc 3
-and should be freed using
-.Xr free 3
-when it is no longer needed.
-.Sh EXAMPLES
-The follow code fragment will calculate the digest for
-the string "abc" which is ``0x8eb208f7e05d987a9b044a8e98c6b087f15a0bfc''.
-.Bd -literal -offset indent
-RMD160_CTX rmd;
-u_char results[20];
-char *buf;
-int n;
-
-buf = "abc";
-n = strlen(buf);
-RMD160Init(\*[Am]rmd);
-RMD160Update(\*[Am]rmd, (u_char *)buf, n);
-RMD160Final(results, \*[Am]rmd);
-
-/* Print the digest as one long hex value */
-printf("0x");
-for (n = 0; n \*[Lt] 20; n++)
-	printf("%02x", results[n]);
-putchar('\en');
-.Ed
-.Pp
-Alternately, the helper functions could be used in the following way:
-.Bd -literal -offset indent
-RMD160_CTX rmd;
-u_char output[41];
-char *buf = "abc";
-
-printf("0x%s\en", RMD160Data(buf, strlen(buf), output));
-.Ed
-.Sh SEE ALSO
-.Xr rmd160 1 ,
-.Xr md4 3 ,
-.Xr md5 3 ,
-.Xr sha1 3
-.Pp
-.Rs
-.%A H. Dobbertin, A. Bosselaers, B. Preneel
-.%T RIPEMD-160, a strengthened version of RIPEMD
-.Re
-.Rs
-.%T Information technology - Security techniques - Hash-functions - Part 3: Dedicated hash-functions
-.%O ISO/IEC 10118-3
-.Re
-.Rs
-.%A H. Dobbertin, A. Bosselaers, B. Preneel
-.%T The RIPEMD-160 cryptographic hash function
-.%J Dr. Dobb's Journal
-.%V Vol. 22, No. 1
-.%D January 1997
-.%P pp. 24-28
-.Re
-.Sh HISTORY
-The RMD-160 functions appeared in
-.Ox 2.1 .
-.Sh AUTHORS
-This implementation of RMD-160 was written by Antoon Bosselaers.
-.Pp
-The
-.Fn RMD160End ,
-.Fn RMD160File ,
-and
-.Fn RMD160Data
-helper functions are derived from code written by Poul-Henning Kamp.
-.Sh BUGS
-If a message digest is to be copied to a multi-byte type (ie:
-an array of five 32-bit integers) it will be necessary to
-perform byte swapping on little endian machines such as the i386, alpha,
-and VAX.
diff --git a/lib/libc/hash/rmd160/rmd160hl.c b/lib/libc/hash/rmd160/rmd160hl.c
deleted file mode 100644
index 85cc8373c..000000000
--- a/lib/libc/hash/rmd160/rmd160hl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: rmd160hl.c,v 1.6 2008/04/13 02:04:32 dholland Exp $ */
-
-/*
- * Derived from code written by Jason R. Thorpe <thorpej@NetBSD.org>,
- * April 29, 1997.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: rmd160hl.c,v 1.6 2008/04/13 02:04:32 dholland Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define	HASH_ALGORITHM	RMD160
-#define HASH_INCLUDE	<sys/rmd160.h>
-
-#include "../hashhl.c"
diff --git a/lib/libc/hash/sha1/Makefile.inc b/lib/libc/hash/sha1/Makefile.inc
deleted file mode 100644
index 99c35cf29..000000000
--- a/lib/libc/hash/sha1/Makefile.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.2 2006/10/27 18:29:21 drochner Exp $
-
-# hash functions
-.PATH: ${.CURDIR}/hash/sha1
-
-SRCS+=	sha1.c sha1hl.c
-
-MAN+=	sha1.3
-
-MLINKS+=sha1.3 SHA1Init.3 sha1.3 SHA1Update.3 sha1.3 SHA1Final.3
-MLINKS+=sha1.3 SHA1End.3  sha2.3 SHA1File.3   sha1.3 SHA1Data.3
-MLINKS+=sha1.3 SHA1Transform.3  sha1.3 SHA1FileChunk.3
diff --git a/lib/libc/hash/sha1/sha1.3 b/lib/libc/hash/sha1/sha1.3
deleted file mode 100644
index 762fd03c5..000000000
--- a/lib/libc/hash/sha1/sha1.3
+++ /dev/null
@@ -1,203 +0,0 @@
-.\"	$NetBSD: sha1.3,v 1.6 2010/04/05 21:27:01 joerg Exp $
-.\"	$OpenBSD: sha1.3,v 1.9 1998/03/07 22:18:12 millert Exp $
-.\"
-.\" Copyright (c) 1997, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
-.\"
-.\" 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.
-.\"
-.\" See http://csrc.nist.gov/fips/fip180-1.txt for the detailed standard
-.\"
-.Dd July 10, 1997
-.Dt SHA1 3
-.Os
-.Sh NAME
-.Nm SHA1Init ,
-.Nm SHA1Update ,
-.Nm SHA1Final ,
-.Nm SHA1Transform ,
-.Nm SHA1End ,
-.Nm SHA1File ,
-.Nm SHA1Data
-.Nd calculate the NIST Secure Hash Algorithm
-.Sh SYNOPSIS
-.In sys/types.h
-.In sha1.h
-.Ft void
-.Fn SHA1Init "SHA1_CTX *context"
-.Ft void
-.Fn SHA1Update "SHA1_CTX *context" "const uint8_t *data" "u_int len"
-.Ft void
-.Fn SHA1Final "uint8_t digest[20]" "SHA1_CTX *context"
-.Ft void
-.Fn SHA1Transform "uint32_t state[5]" "uint8_t buffer[64]"
-.Ft "char *"
-.Fn SHA1End "SHA1_CTX *context" "char *buf"
-.Ft "char *"
-.Fn SHA1File "char *filename" "char *buf"
-.Ft "char *"
-.Fn SHA1Data "uint8_t *data" "size_t len" "char *buf"
-.Sh DESCRIPTION
-The SHA1 functions implement the NIST Secure Hash Algorithm (SHA-1),
-FIPS PUB 180-1.
-SHA-1 is used to generate a condensed representation
-of a message called a message digest.
-The algorithm takes a
-message less than 2^64 bits as input and produces a 160-bit digest
-suitable for use as a digital signature.
-.Pp
-The SHA1 functions are considered to be more secure than the
-.Xr md4 3
-and
-.Xr md5 3
-functions with which they share a similar interface.
-.Pp
-The
-.Fn SHA1Init
-function initializes a SHA1_CTX
-.Ar context
-for use with
-.Fn SHA1Update ,
-and
-.Fn SHA1Final .
-The
-.Fn SHA1Update
-function adds
-.Ar data
-of length
-.Ar len
-to the SHA1_CTX specified by
-.Ar context .
-.Fn SHA1Final
-is called when all data has been added via
-.Fn SHA1Update
-and stores a message digest in the
-.Ar digest
-parameter.
-When a null pointer is passed to
-.Fn SHA1Final
-as first argument only the final padding will be applied and the
-current context can still be used with
-.Fn SHA1Update .
-.Pp
-The
-.Fn SHA1Transform
-function is used by
-.Fn SHA1Update
-to hash 512-bit blocks and forms the core of the algorithm.
-Most programs should use the interface provided by
-.Fn SHA1Init ,
-.Fn SHA1Update
-and
-.Fn SHA1Final
-instead of calling
-.Fn SHA1Transform
-directly.
-.Pp
-The
-.Fn SHA1End
-function is a front end for
-.Fn SHA1Final
-which converts the digest into an
-.Tn ASCII
-representation of the 160 bit digest in hexadecimal.
-.Pp
-The
-.Fn SHA1File
-function calculates the digest for a file and returns the result via
-.Fn SHA1End .
-If
-.Fn SHA1File
-is unable to open the file a NULL pointer is returned.
-.Pp
-The
-.Fn SHA1Data
-function
-calculates the digest of an arbitrary string and returns the result via
-.Fn SHA1End .
-.Pp
-For each of the
-.Fn SHA1End ,
-.Fn SHA1File ,
-and
-.Fn SHA1Data
-functions the
-.Ar buf
-parameter should either be a string of at least 41 characters in
-size or a NULL pointer.
-In the latter case, space will be dynamically
-allocated via
-.Xr malloc 3
-and should be freed using
-.Xr free 3
-when it is no longer needed.
-.Sh EXAMPLES
-The follow code fragment will calculate the digest for
-the string "abc" which is ``0xa9993e36476816aba3e25717850c26c9cd0d89d''.
-.Bd -literal -offset indent
-SHA1_CTX sha;
-uint8_t results[20];
-char *buf;
-int n;
-
-buf = "abc";
-n = strlen(buf);
-SHA1Init(\*[Am]sha);
-SHA1Update(\*[Am]sha, (uint8_t *)buf, n);
-SHA1Final(results, \*[Am]sha);
-
-/* Print the digest as one long hex value */
-printf("0x");
-for (n = 0; n \*[Lt] 20; n++)
-	printf("%02x", results[n]);
-putchar('\en');
-.Ed
-.Pp
-Alternately, the helper functions could be used in the following way:
-.Bd -literal -offset indent
-SHA1_CTX sha;
-uint8_t output[41];
-char *buf = "abc";
-
-printf("0x%s", SHA1Data(buf, strlen(buf), output));
-.Ed
-.Sh SEE ALSO
-.\"	.Xr sha1 1 ,
-.Xr md5 1 ,
-.Xr md4 3 ,
-.Xr md5 3
-.Pp
-.Rs
-.%A J. Burrows
-.%T The Secure Hash Standard
-.%O FIPS PUB 180-1
-.Re
-.Sh HISTORY
-The SHA-1 functions appeared in
-.Nx 1.4 .
-.Sh AUTHORS
-This implementation of SHA-1 was written by Steve Reid.
-.Pp
-The
-.Fn SHA1End ,
-.Fn SHA1File ,
-and
-.Fn SHA1Data
-helper functions are derived from code written by Poul-Henning Kamp.
-.Sh BUGS
-This implementation of SHA-1 has not been validated by NIST
-and as such is not in official compliance with the standard.
-.Pp
-If a message digest is to be copied to a multi-byte type (ie:
-an array of five 32-bit integers) it will be necessary to
-perform byte swapping on little endian machines such as the i386, alpha,
-and VAX.
diff --git a/lib/libc/hash/sha1/sha1hl.c b/lib/libc/hash/sha1/sha1hl.c
deleted file mode 100644
index a73f4df82..000000000
--- a/lib/libc/hash/sha1/sha1hl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: sha1hl.c,v 1.4 2008/04/13 02:04:32 dholland Exp $ */
-
-/*
- * Derived from code written by Jason R. Thorpe <thorpej@NetBSD.org>,
- * April 29, 1997.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sha1hl.c,v 1.4 2008/04/13 02:04:32 dholland Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define	HASH_ALGORITHM	SHA1
-#define HASH_INCLUDE	<sha1.h>
-
-#include "../hashhl.c"
diff --git a/lib/libc/hash/sha2/Makefile.inc b/lib/libc/hash/sha2/Makefile.inc
deleted file mode 100644
index 4d13c2fdc..000000000
--- a/lib/libc/hash/sha2/Makefile.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 2009/05/26 08:04:11 joerg Exp $
-
-# hash functions
-.PATH: ${.CURDIR}/hash/sha2
-
-SRCS+=	sha2.c sha224hl.c sha256hl.c sha384hl.c sha512hl.c
-
-MAN+=	sha2.3
-
-MLINKS+=sha2.3 SHA224_Init.3 sha2.3 SHA224_Update.3 sha2.3 SHA224_Final.3
-MLINKS+=sha2.3 SHA224_End.3  sha2.3 SHA224_File.3   sha2.3 SHA224_Data.3
-MLINKS+=sha2.3 SHA224_Transform.3  sha2.3 SHA224_FileChunk.3
-MLINKS+=sha2.3 SHA256_Init.3 sha2.3 SHA256_Update.3 sha2.3 SHA256_Final.3
-MLINKS+=sha2.3 SHA256_End.3  sha2.3 SHA256_File.3   sha2.3 SHA256_Data.3
-MLINKS+=sha2.3 SHA256_Transform.3  sha2.3 SHA256_FileChunk.3
-MLINKS+=sha2.3 SHA384_Init.3 sha2.3 SHA384_Update.3 sha2.3 SHA384_Final.3
-MLINKS+=sha2.3 SHA384_End.3  sha2.3 SHA384_File.3   sha2.3 SHA384_Data.3
-MLINKS+=sha2.3 SHA384_Transform.3  sha2.3 SHA384_FileChunk.3
-MLINKS+=sha2.3 SHA512_Init.3 sha2.3 SHA512_Update.3 sha2.3 SHA512_Final.3
-MLINKS+=sha2.3 SHA512_End.3  sha2.3 SHA512_File.3   sha2.3 SHA512_Data.3
-MLINKS+=sha2.3 SHA512_Transform.3  sha2.3 SHA512_FileChunk.3
diff --git a/lib/libc/hash/sha2/sha2.3 b/lib/libc/hash/sha2/sha2.3
deleted file mode 100644
index 8192cf57e..000000000
--- a/lib/libc/hash/sha2/sha2.3
+++ /dev/null
@@ -1,304 +0,0 @@
-.\" $NetBSD: sha2.3,v 1.5 2009/05/26 08:04:12 joerg Exp $
-.\"	$OpenBSD: sha2.3,v 1.11 2004/06/22 01:57:29 jfb Exp $
-.\"
-.\" Copyright (c) 2003, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
-.\"
-.\" 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.
-.\"
-.\" Sponsored in part by the Defense Advanced Research Projects
-.\" Agency (DARPA) and Air Force Research Laboratory, Air Force
-.\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
-.\"
-.\" See http://www.nist.gov/sha/ for the detailed standard
-.\"
-.Dd May 20, 2009
-.Dt SHA2 3
-.Os
-.Sh NAME
-.Nm SHA256_Init ,
-.Nm SHA256_Update ,
-.Nm SHA256_Pad ,
-.Nm SHA256_Final ,
-.Nm SHA256_Transform ,
-.Nm SHA256_End ,
-.Nm SHA256_File ,
-.Nm SHA256_FileChunk ,
-.Nm SHA256_Data
-.Nd calculate the NIST Secure Hash Standard (version 2)
-.Sh SYNOPSIS
-.In sys/types.h
-.In sha2.h
-.Ft void
-.Fn SHA224_Init "SHA224_CTX *context"
-.Ft void
-.Fn SHA224_Update "SHA224_CTX *context" "const uint8_t *data" "size_t len"
-.Ft void
-.Fn SHA224_Pad "SHA224_CTX *context"
-.Ft void
-.Fn SHA224_Final "uint8_t digest[SHA224_DIGEST_LENGTH]" "SHA224_CTX *context"
-.Ft void
-.Fn SHA224_Transform "uint32_t state[8]" "const uint8_t buffer[SHA224_BLOCK_LENGTH]"
-.Ft "char *"
-.Fn SHA224_End "SHA224_CTX *context" "char *buf"
-.Ft "char *"
-.Fn SHA224_File "const char *filename" "char *buf"
-.Ft "char *"
-.Fn SHA224_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length"
-.Ft "char *"
-.Fn SHA224_Data "uint8_t *data" "size_t len" "char *buf"
-.Ft void
-.Fn SHA256_Init "SHA256_CTX *context"
-.Ft void
-.Fn SHA256_Update "SHA256_CTX *context" "const uint8_t *data" "size_t len"
-.Ft void
-.Fn SHA256_Pad "SHA256_CTX *context"
-.Ft void
-.Fn SHA256_Final "uint8_t digest[SHA256_DIGEST_LENGTH]" "SHA256_CTX *context"
-.Ft void
-.Fn SHA256_Transform "uint32_t state[8]" "const uint8_t buffer[SHA256_BLOCK_LENGTH]"
-.Ft "char *"
-.Fn SHA256_End "SHA256_CTX *context" "char *buf"
-.Ft "char *"
-.Fn SHA256_File "const char *filename" "char *buf"
-.Ft "char *"
-.Fn SHA256_FileChunk "const char *filename" "char *buf" "off_t offset" "off_t length"
-.Ft "char *"
-.Fn SHA256_Data "uint8_t *data" "size_t len" "char *buf"
-.Ft void
-.Fn SHA384_Init "SHA384_CTX *context"
-.Ft void
-.Fn SHA384_Update "SHA384_CTX *context" "const uint8_t *data" "size_t len"
-.Ft void
-.Fn SHA384_Pad "SHA384_CTX *context"
-.Ft void
-.Fn SHA384_Final "uint8_t digest[SHA384_DIGEST_LENGTH]" "SHA384_CTX *context"
-.Ft void
-.Fn SHA384_Transform "uint64_t state[8]" "const uint8_t buffer[SHA384_BLOCK_LENGTH]"
-.Ft "char *"
-.Fn SHA384_End "SHA384_CTX *context" "char *buf"
-.Ft "char *"
-.Fn SHA384_File "char *filename" "char *buf"
-.Ft "char *"
-.Fn SHA384_FileChunk "char *filename" "char *buf" "off_t offset" "off_t length"
-.Ft "char *"
-.Fn SHA384_Data "uint8_t *data" "size_t len" "char *buf"
-.Ft void
-.Fn SHA512_Init "SHA512_CTX *context"
-.Ft void
-.Fn SHA512_Update "SHA512_CTX *context" "const uint8_t *data" "size_t len"
-.Ft void
-.Fn SHA512_Pad "SHA512_CTX *context"
-.Ft void
-.Fn SHA512_Final "uint8_t digest[SHA512_DIGEST_LENGTH]" "SHA512_CTX *context"
-.Ft void
-.Fn SHA512_Transform "uint64_t state[8]" "const uint8_t buffer[SHA512_BLOCK_LENGTH]"
-.Ft "char *"
-.Fn SHA512_End "SHA512_CTX *context" "char *buf"
-.Ft "char *"
-.Fn SHA512_File "char *filename" "char *buf"
-.Ft "char *"
-.Fn SHA512_FileChunk "char *filename" "char *buf" "off_t offset" "off_t length"
-.Ft "char *"
-.Fn SHA512_Data "uint8_t *data" "size_t len" "char *buf"
-.Sh DESCRIPTION
-The SHA2 functions implement the NIST Secure Hash Standard,
-FIPS PUB 180-2.
-The SHA2 functions are used to generate a condensed representation of a
-message called a message digest, suitable for use as a digital signature.
-There are four families of functions, with names corresponding to
-the number of bits in the resulting message digest.
-The SHA-224 and SHA-256 functions are limited to processing a message of less
-than 2^64 bits as input.
-The SHA-384 and SHA-512 functions can process a message of at most 2^128 - 1
-bits as input.
-.Pp
-The SHA2 functions are considered to be more secure than the
-.Xr sha1 3
-functions with which they share a similar interface.
-The 224, 256, 384, and 512-bit versions of SHA2 share the same interface.
-For brevity, only the 256-bit variants are described below.
-.Pp
-The
-.Fn SHA256_Init
-function initializes a SHA256_CTX
-.Ar context
-for use with
-.Fn SHA256_Update ,
-and
-.Fn SHA256_Final .
-The
-.Fn SHA256_Update
-function adds
-.Ar data
-of length
-.Ar len
-to the SHA256_CTX specified by
-.Ar context .
-.Fn SHA256_Final
-is called when all data has been added via
-.Fn SHA256_Update
-and stores a message digest in the
-.Ar digest
-parameter.
-.Pp
-The
-.Fn SHA256_Pad
-function can be used to apply padding to the message digest as in
-.Fn SHA256_Final ,
-but the current context can still be used with
-.Fn SHA256_Update .
-.Pp
-The
-.Fn SHA256_Transform
-function is used by
-.Fn SHA256_Update
-to hash 512-bit blocks and forms the core of the algorithm.
-Most programs should use the interface provided by
-.Fn SHA256_Init ,
-.Fn SHA256_Update ,
-and
-.Fn SHA256_Final
-instead of calling
-.Fn SHA256_Transform
-directly.
-.Pp
-The
-.Fn SHA256_End
-function is a front end for
-.Fn SHA256_Final
-which converts the digest into an
-.Tn ASCII
-representation of the digest in hexadecimal.
-.Pp
-The
-.Fn SHA256_File
-function calculates the digest for a file and returns the result via
-.Fn SHA256_End .
-If
-.Fn SHA256_File
-is unable to open the file, a
-.Dv NULL
-pointer is returned.
-.Pp
-.Fn SHA256_FileChunk
-behaves like
-.Fn SHA256_File
-but calculates the digest only for that portion of the file starting at
-.Fa offset
-and continuing for
-.Fa length
-bytes or until end of file is reached, whichever comes first.
-A zero
-.Fa length
-can be specified to read until end of file.
-A negative
-.Fa length
-or
-.Fa offset
-will be ignored.
-.Pp
-The
-.Fn SHA256_Data
-function
-calculates the digest of an arbitrary string and returns the result via
-.Fn SHA256_End .
-.Pp
-For each of the
-.Fn SHA256_End ,
-.Fn SHA256_File ,
-.Fn SHA256_FileChunk ,
-and
-.Fn SHA256_Data
-functions the
-.Ar buf
-parameter should either be a string large enough to hold the resulting digest
-(e.g.,
-.Ev SHA224_DIGEST_STRING_LENGTH ,
-.Ev SHA256_DIGEST_STRING_LENGTH ,
-.Ev SHA384_DIGEST_STRING_LENGTH ,
-or
-.Ev SHA512_DIGEST_STRING_LENGTH ,
-depending on the function being used)
-or a
-.Dv NULL
-pointer.
-In the latter case, space will be dynamically allocated via
-.Xr malloc 3
-and should be freed using
-.Xr free 3
-when it is no longer needed.
-.Sh EXAMPLES
-The following code fragment will calculate the SHA-256 digest for the string
-.Qq abc ,
-which is
-.Dq 0xba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad .
-.Bd -literal -offset indent
-SHA256_CTX ctx;
-uint8_t results[SHA256_DIGEST_LENGTH];
-char *buf;
-int n;
-
-buf = "abc";
-n = strlen(buf);
-SHA256_Init(\*[Am]ctx);
-SHA256_Update(\*[Am]ctx, (uint8_t *)buf, n);
-SHA256_Final(results, \*[Am]ctx);
-
-/* Print the digest as one long hex value */
-printf("0x");
-for (n = 0; n \*[Lt] SHA256_DIGEST_LENGTH; n++)
-	printf("%02x", results[n]);
-putchar('\en');
-.Ed
-.Pp
-Alternately, the helper functions could be used in the following way:
-.Bd -literal -offset indent
-SHA256_CTX ctx;
-uint8_t output[SHA256_DIGEST_STRING_LENGTH];
-char *buf = "abc";
-
-printf("0x%s\en", SHA256_Data(buf, strlen(buf), output));
-.Ed
-.Sh SEE ALSO
-.Xr cksum 1 ,
-.Xr md4 3 ,
-.Xr md5 3 ,
-.Xr rmd160 3 ,
-.Xr sha1 3
-.Rs
-.%T Secure Hash Standard
-.%O FIPS PUB 180-2
-.Re
-.Sh HISTORY
-The SHA2 functions appeared in
-.Ox 3.4
-and
-.Nx 3.0 .
-.Sh AUTHORS
-This implementation of the SHA functions was written by Aaron D. Gifford.
-.Pp
-The
-.Fn SHA256_End ,
-.Fn SHA256_File ,
-.Fn SHA256_FileChunk ,
-and
-.Fn SHA256_Data
-helper functions are derived from code written by Poul-Henning Kamp.
-.Sh CAVEATS
-This implementation of the Secure Hash Standard has not been validated by
-NIST and as such is not in official compliance with the standard.
-.Pp
-If a message digest is to be copied to a multi-byte type (i.e.:
-an array of five 32-bit integers) it will be necessary to
-perform byte swapping on little endian machines such as the i386, alpha,
-and vax.
diff --git a/lib/libc/hash/sha2/sha224hl.c b/lib/libc/hash/sha2/sha224hl.c
deleted file mode 100644
index 8f5379c72..000000000
--- a/lib/libc/hash/sha2/sha224hl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: sha224hl.c,v 1.2 2014/12/11 21:54:13 riastradh Exp $ */
-
-/*
- * Derived from code written by Jason R. Thorpe <thorpej@NetBSD.org>,
- * May 20, 2009.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: sha224hl.c,v 1.2 2014/12/11 21:54:13 riastradh Exp $");
-
-#define	HASH_ALGORITHM	SHA224
-#define	HASH_FNPREFIX	SHA224_
-#define HASH_INCLUDE	<sys/sha2.h>
-
-#include "../hashhl.c"
diff --git a/lib/libc/hash/sha2/sha256hl.c b/lib/libc/hash/sha2/sha256hl.c
deleted file mode 100644
index 960f4daad..000000000
--- a/lib/libc/hash/sha2/sha256hl.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: sha256hl.c,v 1.8 2008/04/13 02:04:32 dholland Exp $ */
-
-/*
- * Derived from code written by Jason R. Thorpe <thorpej@NetBSD.org>,
- * April 29, 1997.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sha256hl.c,v 1.8 2008/04/13 02:04:32 dholland Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define	HASH_ALGORITHM	SHA256
-#define	HASH_FNPREFIX	SHA256_
-#define HASH_INCLUDE	<sys/sha2.h>
-
-#include "../hashhl.c"
diff --git a/lib/libc/hash/sha2/sha384hl.c b/lib/libc/hash/sha2/sha384hl.c
deleted file mode 100644
index c503d8b7a..000000000
--- a/lib/libc/hash/sha2/sha384hl.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: sha384hl.c,v 1.8 2008/04/13 02:04:32 dholland Exp $ */
-
-/*
- * Derived from code written by Jason R. Thorpe <thorpej@NetBSD.org>,
- * April 29, 1997.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sha384hl.c,v 1.8 2008/04/13 02:04:32 dholland Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define	HASH_ALGORITHM	SHA384
-#define	HASH_FNPREFIX	SHA384_
-#define HASH_INCLUDE	<sys/sha2.h>
-
-#include "../hashhl.c"
diff --git a/lib/libc/hash/sha2/sha512hl.c b/lib/libc/hash/sha2/sha512hl.c
deleted file mode 100644
index bc46b16fa..000000000
--- a/lib/libc/hash/sha2/sha512hl.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: sha512hl.c,v 1.8 2008/04/13 02:04:32 dholland Exp $ */
-
-/*
- * Derived from code written by Jason R. Thorpe <thorpej@NetBSD.org>,
- * April 29, 1997.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sha512hl.c,v 1.8 2008/04/13 02:04:32 dholland Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define	HASH_ALGORITHM	SHA512
-#define	HASH_FNPREFIX	SHA512_
-#define HASH_INCLUDE	<sys/sha2.h>
-
-#include "../hashhl.c"
diff --git a/lib/libc/iconv/Makefile.inc b/lib/libc/iconv/Makefile.inc
deleted file mode 100644
index c53d3bedc..000000000
--- a/lib/libc/iconv/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2012/01/20 16:31:29 joerg Exp $
-
-.PATH:	${ARCHDIR}/iconv ${.CURDIR}/iconv
-
-SRCS+=	iconv.c
-MAN+=	iconv.3
-MLINKS+=iconv.3 iconv_open.3 iconv.3 iconv_close.3
-
-CPPFLAGS.iconv.c+=	-I${LIBCDIR}/citrus
diff --git a/lib/libc/iconv/iconv.3 b/lib/libc/iconv/iconv.3
deleted file mode 100644
index a65feab0e..000000000
--- a/lib/libc/iconv/iconv.3
+++ /dev/null
@@ -1,277 +0,0 @@
-.\" $NetBSD: iconv.3,v 1.21 2013/05/12 10:44:23 wiz Exp $
-.\"
-.\" Copyright (c)2003 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd March 11, 2013
-.Dt ICONV 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm iconv_open ,
-.Nm iconv_close ,
-.Nm iconv
-.Nd codeset conversion functions
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In iconv.h
-.Ft iconv_t
-.Fn iconv_open "const char *dstname" "const char *srcname"
-.Ft int
-.Fn iconv_close "iconv_t cd"
-.Ft size_t
-.Fn iconv "iconv_t cd" "const char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-The
-.Fn iconv_open
-function opens a converter from the codeset
-.Fa srcname
-to the codeset
-.Fa dstname
-and returns its descriptor.
-.Pp
-The
-.Fn iconv_close
-function closes the specified converter
-.Fa cd .
-.Pp
-The
-.Fn iconv
-function converts the string in the buffer
-.Fa *src
-of length
-.Fa *srcleft
-bytes and stores the converted string in the buffer
-.Fa *dst
-of size
-.Fa *dstleft
-bytes.
-After calling
-.Fn iconv ,
-the values pointed to by
-.Fa src ,
-.Fa srcleft ,
-.Fa dst ,
-and
-.Fa dstleft
-are updated as follows:
-.Bl -tag -width 01234567 -offset indent
-.It Fa *src
-Pointer to the byte just after the last character fetched.
-.It Fa *srcleft
-Number of remaining bytes in the source buffer.
-.It Fa *dst
-Pointer to the byte just after the last character stored.
-.It Fa *dstleft
-Number of remainder bytes in the destination buffer.
-.El
-.Pp
-If the string pointed to by
-.Fa *src
-contains a byte sequence which is not a valid character in the source
-codeset, the conversion stops just after the last successful conversion.
-If the output buffer is too small to store the converted
-character, the conversion also stops in the same way.
-In these cases, the values pointed to by
-.Fa src ,
-.Fa srcleft ,
-.Fa dst ,
-and
-.Fa dstleft
-are updated to the state just after the last successful conversion.
-.Pp
-If the string pointed to by
-.Fa *src
-contains a character which is valid under the source codeset but
-can not be converted to the destination codeset,
-the character is replaced by an
-.Dq invalid character
-which depends on the destination codeset, e.g.,
-.Sq \&? ,
-and the conversion is continued.
-.Fn iconv
-returns the number of such
-.Dq invalid conversions .
-.Pp
-If
-.Fa src
-or
-.Fa *src
-is
-.Dv NULL
-and the source and/or destination codesets are stateful,
-.Fn iconv
-places these into their initial state.
-.Bl -enum -offset indent
-.It
-If both
-.Fa dst
-and
-.Fa *dst
-are
-.No non- Ns Dv NULL ,
-.Fn iconv
-stores the shift sequence for the destination switching to the initial state
-in the buffer pointed to by
-.Fa *dst .
-The buffer size is specified by the value pointed to by
-.Fa dstleft
-as above.
-.Fn iconv
-will fail if the buffer is too small to store the shift sequence.
-.It
-On the other hand,
-.Fa dst
-or
-.Fa *dst
-may be
-.Dv NULL .
-In this case, the shift sequence for the destination switching
-to the initial state is discarded.
-.El
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-Upon successful completion of
-.Fn iconv_open ,
-it returns a conversion descriptor.
-Otherwise,
-.Fn iconv_open
-returns (iconv_t)\-1 and sets
-.Va errno
-to indicate the error.
-.Pp
-Upon successful completion of
-.Fn iconv_close ,
-it returns 0.
-Otherwise,
-.Fn iconv_close
-returns \-1 and sets errno to indicate the error.
-.Pp
-Upon successful completion of
-.Fn iconv ,
-it returns the number of
-.Dq invalid
-conversions.
-Otherwise,
-.Fn iconv
-returns (size_t)\-1 and sets errno to indicate the error.
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-The
-.Fn iconv_open
-function may cause an error in the following cases:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-There is no converter specified by
-.Fa srcname
-and
-.Fa dstname .
-.It Bq Er ENOMEM
-Memory is exhausted.
-.El
-.Pp
-The
-.Fn iconv_close
-function may cause an error in the following case:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The conversion descriptor specified by
-.Fa cd
-is invalid.
-.El
-.Pp
-The
-.Fn iconv
-function may cause an error in the following cases:
-.Bl -tag -width Er
-.It Bq Er E2BIG
-The output buffer pointed to by
-.Fa *dst
-is too small to store the result string.
-.It Bq Er EBADF
-The conversion descriptor specified by
-.Fa cd
-is invalid.
-.It Bq Er EILSEQ
-The string pointed to by
-.Fa *src
-contains a byte sequence which does not describe a valid character of
-the source codeset.
-.It Bq Er EINVAL
-The string pointed to by
-.Fa *src
-terminates with an incomplete character or shift sequence.
-.El
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr iconv 1
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-.Fn iconv_open ,
-.Fn iconv_close ,
-and
-.Fn iconv
-conform to
-.St -p1003.1-2001 .
-.Pp
-Historically, the definition of
-.Ft iconv
-has not been consistent across operating systems.
-This is due to an unfortunate historical mistake, documented in
-.Lk https://www5.opengroup.org/sophocles2/show_mail.tpl?&source=L&listname=austin-group-l&id=7404 "this e-mail".
-The standards page for the header file
-.In iconv.h
-defined the second argument of
-.Fn iconv
-as
-.Ft char ** ,
-but the standards page for the
-.Fn iconv
-implementation defined it as
-.Ft const char ** .
-The standards committee later chose to change the function definition to
-follow the header file definition
-.Pq without const ,
-even though the version with const is arguably more correct.
-.Nx
-has always used the const form.
-It was decided to reject the committee's regression and become
-.Pq technically
-incompatible.
-GNU libiconv has taken the
-.Lk http://www.gnu.org/savannah-checkouts/gnu/libiconv/documentation/libiconv-1.14/ "same route".
-Most third party software affected by this issue already handles it
-during configuration.
-.\" ----------------------------------------------------------------------
-.Sh BUGS
-If
-.Fn iconv
-is aborted due to the occurrence of some error,
-the
-.Dq invalid conversion
-count mentioned above is unfortunately lost.
diff --git a/lib/libc/iconv/iconv.c b/lib/libc/iconv/iconv.c
deleted file mode 100644
index 4bb4a7915..000000000
--- a/lib/libc/iconv/iconv.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*	$NetBSD: iconv.c,v 1.13 2012/01/20 16:31:29 joerg Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: iconv.c,v 1.13 2012/01/20 16:31:29 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <paths.h>
-#include <sys/queue.h>
-
-#include <iconv.h>
-
-#ifdef __weak_alias
-__weak_alias(iconv, _iconv)
-__weak_alias(iconv_open, _iconv_open)
-__weak_alias(iconv_close, _iconv_close)
-#endif
-
-#include <sys/types.h>
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_esdb.h"
-#include "citrus_hash.h"
-#include "citrus_iconv.h"
-
-#define ISBADF(_h_)	(!(_h_) || (_h_) == (iconv_t)-1)
-
-
-iconv_t
-iconv_open(const char *out, const char *in)
-{
-	int ret;
-	struct _citrus_iconv *handle;
-
-	ret = _citrus_iconv_open(&handle, _PATH_ICONV, in, out);
-	if (ret) {
-		errno = ret == ENOENT? EINVAL : ret;
-		return ((iconv_t)-1);
-	}
-
-	return ((iconv_t)(void *)handle);
-}
-
-int
-iconv_close(iconv_t handle)
-{
-	if (ISBADF(handle)) {
-		errno = EBADF;
-		return (-1);
-	}
-
-	_citrus_iconv_close((struct _citrus_iconv *)(void *)handle);
-
-	return (0);
-}
-
-size_t
-iconv(iconv_t handle, const char **in, size_t *szin, char **out, size_t *szout)
-{
-	int err;
-	size_t ret;
-
-	if (ISBADF(handle)) {
-		errno = EBADF;
-		return ((size_t)-1);
-	}
-
-	err = _citrus_iconv_convert(
-		(struct _citrus_iconv *)(void *)handle, in, szin, out, szout,
-		0, &ret);
-	if (err) {
-		errno = err;
-		ret = (size_t)-1;
-	}
-
-	return (ret);
-}
-
-size_t
-__iconv(iconv_t handle, const char **in, size_t *szin, char **out,
-	size_t *szout, u_int32_t flags, size_t *invalids)
-{
-	int err;
-	size_t ret;
-
-	if (ISBADF(handle)) {
-		errno = EBADF;
-		return ((size_t)-1);
-	}
-
-	err = _citrus_iconv_convert(
-		(struct _citrus_iconv *)(void *)handle, in, szin, out, szout,
-		flags, &ret);
-	if (invalids)
-		*invalids = ret;
-	if (err) {
-		errno = err;
-		ret = (size_t)-1;
-	}
-
-	return (ret);
-}
-
-int
-__iconv_get_list(char ***rlist, size_t *rsz)
-{
-	int ret;
-
-	ret = _citrus_esdb_get_list(rlist, rsz);
-	if (ret) {
-		errno = ret;
-		return -1;
-	}
-
-	return 0;
-}
-
-void
-__iconv_free_list(char **list, size_t sz)
-{
-	_citrus_esdb_free_list(list, sz);
-}
diff --git a/lib/libc/include/env.h b/lib/libc/include/env.h
deleted file mode 100644
index 72d506adc..000000000
--- a/lib/libc/include/env.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: env.h,v 1.3 2015/01/20 18:31:25 christos Exp $	*/
-
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matthias Scheler.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-
-#include <stdbool.h>
-
-#include "reentrant.h"
-
-extern ssize_t __getenvslot(const char *name, size_t l_name, bool allocate);
-extern char *__findenvvar(const char *name, size_t l_name);
-
-#ifdef _REENTRANT
-extern bool __readlockenv(void);
-extern bool __writelockenv(void);
-extern bool __unlockenv(void);
-#else
-static __inline bool
-__readlockenv(void)
-{
-	return true;
-}
-
-static __inline bool
-__writelockenv(void)
-{
-	return true;
-}
-
-static __inline bool
-__unlockenv(void)
-{
-	return true;
-}
-#endif
-
-extern char **environ;
diff --git a/lib/libc/include/extern.h b/lib/libc/include/extern.h
deleted file mode 100644
index a66f0f782..000000000
--- a/lib/libc/include/extern.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: extern.h,v 1.23 2013/08/19 13:03:12 joerg Exp $	*/
-
-/*
- * Copyright (c) 1997 Christos Zoulas.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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 <stdarg.h>
-#include <ucontext.h>
-
-#ifndef __LOCALE_T_DECLARED
-typedef struct _locale		*locale_t;
-#define __LOCALE_T_DECLARED
-#endif /* __LOCALE_T_DECLARED */
-
-__BEGIN_DECLS
-extern char *__minbrk;
-int __getcwd(char *, size_t);
-int __getlogin(char *, size_t);
-int __setlogin(const char *);
-void _resumecontext(void) __dead;
-__dso_hidden int	_strerror_lr(int, char *, size_t, locale_t);
-const char *__strerror(int , char *, size_t);
-const char *__strsignal(int , char *, size_t);
-char *__dtoa(double, int, int, int *, int *, char **);
-void __freedtoa(char *);
-int __sysctl(const int *, unsigned int, void *, size_t *, const void *, size_t);
-
-struct sigaction;
-int __sigaction_sigtramp(int, const struct sigaction *,
-    struct sigaction *, const void *, int);
-
-#ifdef WIDE_DOUBLE
-char *__hdtoa(double, const char *, int, int *, int *, char **);
-char *__hldtoa(long double, const char *, int, int *, int *,  char **);
-char *__ldtoa(long double *, int, int, int *, int *, char **);
-#endif
-
-#ifndef __LIBC12_SOURCE__
-struct syslog_data;
-void	syslog_ss(int, struct syslog_data *, const char *, ...)
-    __RENAME(__syslog_ss60) __printflike(3, 4);
-void    vsyslog_ss(int, struct syslog_data *, const char *, va_list) 
-    __RENAME(__vsyslog_ss60) __printflike(3, 0); 
-void	syslogp_ss(int, struct syslog_data *, const char *, const char *, 
-    const char *, ...) __RENAME(__syslogp_ss60) __printflike(5, 0);
-void	vsyslogp_ss(int, struct syslog_data *, const char *, const char *, 
-    const char *, va_list) __RENAME(__vsyslogp_ss60) __printflike(5, 0);
-#endif
-
-void	_malloc_prefork(void);
-void	_malloc_postfork(void);
-
-int	_sys_setcontext(const ucontext_t *);
-
-__END_DECLS
diff --git a/lib/libc/include/fd_setsize.h b/lib/libc/include/fd_setsize.h
deleted file mode 100644
index 235b1ad1c..000000000
--- a/lib/libc/include/fd_setsize.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _FD_SETSIZE_H
-#define _FD_SETSIZE_H
-
-/*
- * If you need a bigger FD_SETSIZE, this is NOT the place to set it.
- * This file is a fallback for BIND ports which don't specify their own.
- */
-
-#endif /* _FD_SETSIZE_H */
diff --git a/lib/libc/include/isc/assertions.h b/lib/libc/include/isc/assertions.h
deleted file mode 100644
index 7db7361d0..000000000
--- a/lib/libc/include/isc/assertions.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*	$NetBSD: assertions.h,v 1.5 2009/04/12 17:07:16 christos Exp $	*/
-
-/*
- * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1997-2001  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.
- */
-
-/*
- * Id: assertions.h,v 1.5 2008/11/14 02:36:51 marka Exp
- */
-
-#ifndef ASSERTIONS_H
-#define ASSERTIONS_H		1
-
-typedef enum {
-	assert_require, assert_ensure, assert_insist, assert_invariant
-} assertion_type;
-
-typedef void (*assertion_failure_callback)(const char *, int, assertion_type,
-					   const char *, int);
-
-/* coverity[+kill] */
-extern assertion_failure_callback __assertion_failed;
-void set_assertion_failure_callback(assertion_failure_callback f);
-const char *assertion_type_to_text(assertion_type type);
-
-#if defined(CHECK_ALL) || defined(__COVERITY__)
-#define CHECK_REQUIRE		1
-#define CHECK_ENSURE		1
-#define CHECK_INSIST		1
-#define CHECK_INVARIANT		1
-#endif
-
-#if defined(CHECK_NONE) && !defined(__COVERITY__)
-#define CHECK_REQUIRE		0
-#define CHECK_ENSURE		0
-#define CHECK_INSIST		0
-#define CHECK_INVARIANT		0
-#endif
-
-#ifdef _DIAGNOSTIC
-#ifndef CHECK_REQUIRE
-#define CHECK_REQUIRE		1
-#endif
-
-#ifndef CHECK_ENSURE
-#define CHECK_ENSURE		1
-#endif
-
-#ifndef CHECK_INSIST
-#define CHECK_INSIST		1
-#endif
-
-#ifndef CHECK_INVARIANT
-#define CHECK_INVARIANT		1
-#endif
-#endif	/* _DIAGNOSTIC */
-
-#if CHECK_REQUIRE != 0
-#define REQUIRE(cond) \
-	((void) ((cond) || \
-		 ((__assertion_failed)(__FILE__, __LINE__, assert_require, \
-				       #cond, 0), 0)))
-#define REQUIRE_ERR(cond) \
-	((void) ((cond) || \
-		 ((__assertion_failed)(__FILE__, __LINE__, assert_require, \
-				       #cond, 1), 0)))
-#else
-#define REQUIRE(cond)		((void) (cond))
-#define REQUIRE_ERR(cond)	((void) (cond))
-#endif /* CHECK_REQUIRE */
-
-#if CHECK_ENSURE != 0
-#define ENSURE(cond) \
-	((void) ((cond) || \
-		 ((__assertion_failed)(__FILE__, __LINE__, assert_ensure, \
-				       #cond, 0), 0)))
-#define ENSURE_ERR(cond) \
-	((void) ((cond) || \
-		 ((__assertion_failed)(__FILE__, __LINE__, assert_ensure, \
-				       #cond, 1), 0)))
-#else
-#define ENSURE(cond)		((void) (cond))
-#define ENSURE_ERR(cond)	((void) (cond))
-#endif /* CHECK_ENSURE */
-
-#if CHECK_INSIST != 0
-#define INSIST(cond) \
-	((void) ((cond) || \
-		 ((__assertion_failed)(__FILE__, __LINE__, assert_insist, \
-				       #cond, 0), 0)))
-#define INSIST_ERR(cond) \
-	((void) ((cond) || \
-		 ((__assertion_failed)(__FILE__, __LINE__, assert_insist, \
-				       #cond, 1), 0)))
-#else
-#if !defined(__lint__)
-#define INSIST(cond)		((void) (cond))
-#define INSIST_ERR(cond)	((void) (cond))
-#else /* !__lint__ */
-#define INSIST(cond)
-#define INSIST_ERR(cond)
-#endif /* !__lint__ */
-#endif /* CHECK_INSIST */
-
-#if CHECK_INVARIANT != 0
-#define INVARIANT(cond) \
-	((void) ((cond) || \
-		 ((__assertion_failed)(__FILE__, __LINE__, assert_invariant, \
-				       #cond, 0), 0)))
-#define INVARIANT_ERR(cond) \
-	((void) ((cond) || \
-		 ((__assertion_failed)(__FILE__, __LINE__, assert_invariant, \
-				       #cond, 1), 0)))
-#else
-#define INVARIANT(cond)		((void) (cond))
-#define INVARIANT_ERR(cond)	((void) (cond))
-#endif /* CHECK_INVARIANT */
-#endif /* ASSERTIONS_H */
-/*! \file */
diff --git a/lib/libc/include/isc/dst.h b/lib/libc/include/isc/dst.h
deleted file mode 100644
index a25cf011d..000000000
--- a/lib/libc/include/isc/dst.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*	$NetBSD: dst.h,v 1.2 2014/08/03 19:14:24 wiz Exp $	*/
-
-#ifndef DST_H
-#define DST_H
-
-#ifndef HAS_DST_KEY
-typedef struct dst_key {
-	char	*dk_key_name;   /*%< name of the key */
-	int	dk_key_size;    /*%< this is the size of the key in bits */
-	int	dk_proto;       /*%< what protocols this key can be used for */
-	int	dk_alg;         /*%< algorithm number from key record */
-	u_int32_t dk_flags;     /*%< and the flags of the public key */
-	u_int16_t dk_id;        /*%< identifier of the key */
-} DST_KEY;
-#endif /* HAS_DST_KEY */
-/*
- * do not taint namespace
- */
-#define	dst_bsafe_init		__dst_bsafe_init
-#define	dst_buffer_to_key	__dst_buffer_to_key
-#define	dst_check_algorithm	__dst_check_algorithm
-#define	dst_compare_keys	__dst_compare_keys
-#define	dst_cylink_init		__dst_cylink_init
-#define	dst_dnskey_to_key	__dst_dnskey_to_key
-#define	dst_eay_dss_init	__dst_eay_dss_init
-#define	dst_free_key		__dst_free_key
-#define	dst_generate_key	__dst_generate_key
-#define	dst_hmac_md5_init	__dst_hmac_md5_init
-#define	dst_init		__dst_init
-#define	dst_key_to_buffer	__dst_key_to_buffer
-#define	dst_key_to_dnskey	__dst_key_to_dnskey
-#define	dst_read_key		__dst_read_key
-#define	dst_rsaref_init		__dst_rsaref_init
-#define	dst_s_build_filename	__dst_s_build_filename
-#define	dst_s_calculate_bits	__dst_s_calculate_bits
-#define	dst_s_conv_bignum_b64_to_u8	__dst_s_conv_bignum_b64_to_u8
-#define	dst_s_conv_bignum_u8_to_b64	__dst_s_conv_bignum_u8_to_b64
-#define	dst_s_dns_key_id	__dst_s_dns_key_id
-#define	dst_s_dump		__dst_s_dump
-#define	dst_s_filename_length	__dst_s_filename_length
-#define	dst_s_fopen		__dst_s_fopen
-#define	dst_s_get_int16		__dst_s_get_int16
-#define	dst_s_get_int32		__dst_s_get_int32
-#define	dst_s_id_calc		__dst_s_id_calc
-#define	dst_s_put_int16		__dst_s_put_int16
-#define	dst_s_put_int32		__dst_s_put_int32
-#define	dst_s_quick_random	__dst_s_quick_random
-#define	dst_s_quick_random_set	__dst_s_quick_random_set
-#define	dst_s_random		__dst_s_random
-#define	dst_s_semi_random	__dst_s_semi_random
-#define	dst_s_verify_str	__dst_s_verify_str
-#define	dst_sig_size		__dst_sig_size
-#define	dst_sign_data		__dst_sign_data
-#define	dst_verify_data		__dst_verify_data
-#define	dst_write_key		__dst_write_key
-
-/* 
- * DST Crypto API definitions 
- */
-void     dst_init(void);
-int      dst_check_algorithm(const int);
-
-
-int dst_sign_data(const int,	 	/*!<   specifies INIT/UPDATE/FINAL/ALL  */
-		  DST_KEY *,	 	/*!<   the key to use  */
-		  void **,	 	/*!<   pointer to state structure  */
-		  const u_char *,	/*!<   data to be signed  */
-		  const int,	 	/*!<   length of input data  */
-		  u_char *,	 	/*!<   buffer to write signature to  */
-		  const int);	 	/*!<   size of output buffer  */
-int dst_verify_data(const int,	 	/*!<   specifies INIT/UPDATE/FINAL/ALL  */
-		    DST_KEY *,	 	/*!<   the key to use  */
-		    void **,	 	/*!<   pointer to state structure  */
-		    const u_char *,	/*!<   data to be verified  */
-		    const int,	 	/*!<   length of input data  */
-		    const u_char *,	/*!<   buffer containing signature  */
-		    const int);	 	/*!<   length of signature  */
-DST_KEY *dst_read_key(const char *,	/*!<   name of key  */
-		      const u_int16_t,	/*!<   key tag identifier  */
-		      const int,	/*!<   key algorithm  */
-		      const int);	/*!<   Private/PublicKey wanted */
-int      dst_write_key(const DST_KEY *,	/*!<   key to write out  */
-		       const int); 	/*!<   Public/Private  */
-DST_KEY *dst_dnskey_to_key(const char *,	/*!<   KEY record name  */
-			   const u_char *,	/*!<   KEY RDATA  */
-			   const int);		/*!<   size of input buffer */
-int      dst_key_to_dnskey(const DST_KEY *,	/*!<   key to translate  */
-			   u_char *,		/*!<   output buffer  */
-			   const int);		/*!<   size of out_storage */
-DST_KEY *dst_buffer_to_key(const char *,  	/*!<   name of the key  */
-			   const int,	  	/*!<   algorithm  */
-			   const int,	  	/*!<   dns flags  */
-			   const int,	  	/*!<   dns protocol  */
-			   const u_char *, 	/*!<   key in dns wire fmt  */
-			   const int);	  	/*!<   size of key  */
-int     dst_key_to_buffer(DST_KEY *, u_char *, int);
-
-DST_KEY *dst_generate_key(const char *,    	/*!<   name of new key  */
-			  const int,       	/*!<   key algorithm to generate  */
-			  const int,      	/*!<   size of new key  */
-			  const int,       	/*!<   alg dependent parameter */
-			  const int,     	/*!<   key DNS flags  */
-			  const int);		/*!<   key DNS protocol  */
-DST_KEY *dst_free_key(DST_KEY *);
-int      dst_compare_keys(const DST_KEY *, const DST_KEY *);
-
-int	dst_sig_size(DST_KEY *);
-
-
-/* support for dns key tags/ids */
-u_int16_t dst_s_dns_key_id(const u_char *, const int);
-u_int16_t dst_s_id_calc(const u_char *, const int);
-
-/* Used by callers as well as by the library.  */
-#define RAW_KEY_SIZE    8192        /*%< large enough to store any key */
-/* DST_API control flags */
-/* These are used used in functions dst_sign_data and dst_verify_data */
-#define SIG_MODE_INIT		1  /*%< initialize digest */
-#define SIG_MODE_UPDATE		2  /*%< add data to digest */
-#define SIG_MODE_FINAL		4  /*%< generate/verify signature */
-#define SIG_MODE_ALL		(SIG_MODE_INIT|SIG_MODE_UPDATE|SIG_MODE_FINAL)
-
-/* Flags for dst_read_private_key()  */
-#define DST_FORCE_READ		0x1000000
-#define DST_CAN_SIGN		0x010F
-#define DST_NO_AUTHEN		0x8000
-#define DST_EXTEND_FLAG         0x1000
-#define DST_STANDARD		0
-#define DST_PRIVATE             0x2000000
-#define DST_PUBLIC              0x4000000
-#define DST_RAND_SEMI           1
-#define DST_RAND_STD            2
-#define DST_RAND_KEY            3
-#define DST_RAND_DSS            4
-
-
-/* DST algorithm codes */
-#define KEY_RSA			1
-#define KEY_DH			2
-#define KEY_DSA			3
-#define KEY_PRIVATE		254
-#define KEY_EXPAND		255
-#define KEY_HMAC_MD5		157
-#define KEY_HMAC_SHA1		158
-#define UNKNOWN_KEYALG		0
-#define DST_MAX_ALGS            KEY_HMAC_SHA1
-
-/* DST constants to locations in KEY record  changes in new KEY record */
-#define DST_FLAGS_SIZE		2
-#define DST_KEY_PROT		2
-#define DST_KEY_ALG		3
-#define DST_EXT_FLAG            4
-#define DST_KEY_START		4
-
-#ifndef SIGN_F_NOKEY 
-#define SIGN_F_NOKEY		0xC000
-#endif
-
-/* error codes from dst routines */
-#define SIGN_INIT_FAILURE	(-23)
-#define SIGN_UPDATE_FAILURE	(-24)
-#define SIGN_FINAL_FAILURE	(-25)
-#define VERIFY_INIT_FAILURE	(-26)
-#define VERIFY_UPDATE_FAILURE	(-27)
-#define VERIFY_FINAL_FAILURE	(-28)
-#define MISSING_KEY_OR_SIGNATURE (-30)
-#define UNSUPPORTED_KEYALG	(-31)
-
-#endif /* DST_H */
-/*! \file */
diff --git a/lib/libc/include/isc/eventlib.h b/lib/libc/include/isc/eventlib.h
deleted file mode 100644
index 4e9cc2e40..000000000
--- a/lib/libc/include/isc/eventlib.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*	$NetBSD: eventlib.h,v 1.3 2009/04/12 17:07:16 christos Exp $	*/
-
-/*
- * 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/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.
- */
-
-/* eventlib.h - exported interfaces for eventlib
- * vix 09sep95 [initial]
- *
- * Id: eventlib.h,v 1.7 2008/11/14 02:36:51 marka Exp
- */
-
-#ifndef _EVENTLIB_H
-#define _EVENTLIB_H
-
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/time.h>
-#include <stdio.h>
-
-#ifndef __P
-# define __EVENTLIB_P_DEFINED
-# ifdef __STDC__
-#  define __P(x) x
-# else
-#  define __P(x) ()
-# endif
-#endif
-
-/* In the absence of branded types... */
-typedef struct { void *opaque; } evConnID;
-typedef struct { void *opaque; } evFileID;
-typedef struct { void *opaque; } evStreamID;
-typedef struct { void *opaque; } evTimerID;
-typedef struct { void *opaque; } evWaitID;
-typedef struct { void *opaque; } evContext;
-typedef struct { void *opaque; } evEvent;
-
-#define	evInitID(id) ((id)->opaque = NULL)
-#define	evTestID(id) ((id).opaque != NULL)
-
-typedef void (*evConnFunc)__P((evContext, void *, int, const void *, int,
-			       const void *, int));
-typedef void (*evFileFunc)__P((evContext, void *, int, int));
-typedef	void (*evStreamFunc)__P((evContext, void *, int, int));
-typedef void (*evTimerFunc)__P((evContext, void *,
-				struct timespec, struct timespec));
-typedef	void (*evWaitFunc)__P((evContext, void *, const void *));
-
-typedef	struct { unsigned char mask[256/8]; } evByteMask;
-#define	EV_BYTEMASK_BYTE(b) ((b) / 8)
-#define	EV_BYTEMASK_MASK(b) (1 << ((b) % 8))
-#define	EV_BYTEMASK_SET(bm, b) \
-	((bm).mask[EV_BYTEMASK_BYTE(b)] |= EV_BYTEMASK_MASK(b))
-#define	EV_BYTEMASK_CLR(bm, b) \
-	((bm).mask[EV_BYTEMASK_BYTE(b)] &= ~EV_BYTEMASK_MASK(b))
-#define	EV_BYTEMASK_TST(bm, b) \
-	((bm).mask[EV_BYTEMASK_BYTE(b)] & EV_BYTEMASK_MASK(b))
-
-#define	EV_POLL		1
-#define	EV_WAIT		2
-#define	EV_NULL		4
-
-#define	EV_READ		1
-#define	EV_WRITE	2
-#define	EV_EXCEPT	4
-
-#define EV_WASNONBLOCKING 8	/* Internal library use. */
-
-/* eventlib.c */
-#define evCreate	__evCreate
-#define evSetDebug	__evSetDebug
-#define evDestroy	__evDestroy
-#define evGetNext	__evGetNext
-#define evDispatch	__evDispatch
-#define evDrop		__evDrop
-#define evMainLoop	__evMainLoop
-#define evHighestFD	__evHighestFD
-#define evGetOption	__evGetOption
-#define evSetOption	__evSetOption
-
-int  evCreate __P((evContext *));
-void evSetDebug __P((evContext, int, FILE *));
-int  evDestroy __P((evContext));
-int  evGetNext __P((evContext, evEvent *, int));
-int  evDispatch __P((evContext, evEvent));
-void evDrop __P((evContext, evEvent));
-int  evMainLoop __P((evContext));
-int  evHighestFD __P((evContext));
-int  evGetOption __P((evContext *, const char *, int *));
-int  evSetOption __P((evContext *, const char *, int));
-
-/* ev_connects.c */
-#define evListen	__evListen
-#define evConnect	__evConnect
-#define evCancelConn	__evCancelConn
-#define evHold		__evHold
-#define evUnhold	__evUnhold
-#define evTryAccept	__evTryAccept
-
-int evListen __P((evContext, int, int, evConnFunc, void *, evConnID *));
-int evConnect __P((evContext, int, const void *, int,
-		   evConnFunc, void *, evConnID *));
-int evCancelConn __P((evContext, evConnID));
-int evHold __P((evContext, evConnID));
-int evUnhold __P((evContext, evConnID));
-int evTryAccept __P((evContext, evConnID, int *));
-
-/* ev_files.c */
-#define evSelectFD	__evSelectFD
-#define evDeselectFD	__evDeselectFD
-
-int evSelectFD __P((evContext, int, int, evFileFunc, void *, evFileID *));
-int evDeselectFD __P((evContext, evFileID));
-
-/* ev_streams.c */
-#define evConsIovec	__evConsIovec
-#define evWrite		__evWrite
-#define evRead		__evRead
-#define evTimeRW	__evTimeRW
-#define evUntimeRW	__evUntimeRW
-#define	evCancelRW	__evCancelRW
-
-struct iovec evConsIovec __P((void *, size_t));
-int evWrite __P((evContext, int, const struct iovec *, int,
-		 evStreamFunc func, void *, evStreamID *));
-int evRead __P((evContext, int, const struct iovec *, int,
-		evStreamFunc func, void *, evStreamID *));
-int evTimeRW __P((evContext, evStreamID, evTimerID timer));
-int evUntimeRW __P((evContext, evStreamID));
-int evCancelRW __P((evContext, evStreamID));
-
-/* ev_timers.c */
-#define evConsTime	__evConsTime
-#define evAddTime	__evAddTime
-#define evSubTime	__evSubTime
-#define evCmpTime	__evCmpTime
-#define	evTimeSpec	__evTimeSpec
-#define	evTimeVal	__evTimeVal
-
-#define evNowTime		__evNowTime
-#define evUTCTime		__evUTCTime
-#define evLastEventTime		__evLastEventTime
-#define evSetTimer		__evSetTimer
-#define evClearTimer		__evClearTimer
-#define evConfigTimer		__evConfigTimer
-#define evResetTimer		__evResetTimer
-#define evSetIdleTimer		__evSetIdleTimer
-#define evClearIdleTimer	__evClearIdleTimer
-#define evResetIdleTimer	__evResetIdleTimer
-#define evTouchIdleTimer	__evTouchIdleTimer
-
-struct timespec evConsTime __P((time_t sec, long nsec));
-struct timespec evAddTime __P((struct timespec, struct timespec));
-struct timespec evSubTime __P((struct timespec, struct timespec));
-struct timespec evNowTime __P((void));
-struct timespec evUTCTime __P((void));
-struct timespec evLastEventTime __P((evContext));
-struct timespec evTimeSpec __P((struct timeval));
-struct timeval evTimeVal __P((struct timespec));
-int evCmpTime __P((struct timespec, struct timespec));
-int evSetTimer __P((evContext, evTimerFunc, void *, struct timespec,
-		    struct timespec, evTimerID *));
-int evClearTimer __P((evContext, evTimerID));
-int evConfigTimer __P((evContext, evTimerID, const char *param,
-		      int value));
-int evResetTimer __P((evContext, evTimerID, evTimerFunc, void *,
-		      struct timespec, struct timespec));
-int evSetIdleTimer __P((evContext, evTimerFunc, void *, struct timespec,
-			evTimerID *));
-int evClearIdleTimer __P((evContext, evTimerID));
-int evResetIdleTimer __P((evContext, evTimerID, evTimerFunc, void *,
-			  struct timespec));
-int evTouchIdleTimer __P((evContext, evTimerID));
-
-/* ev_waits.c */
-#define evWaitFor	__evWaitFor
-#define evDo		__evDo
-#define evUnwait	__evUnwait
-#define evDefer		__evDefer
-
-int evWaitFor __P((evContext, const void *, evWaitFunc, void *, evWaitID *));
-int evDo __P((evContext, const void *));
-int evUnwait __P((evContext, evWaitID));
-int evDefer __P((evContext, evWaitFunc, void *));
-
-#ifdef __EVENTLIB_P_DEFINED
-# undef __P
-#endif
-
-#endif /*_EVENTLIB_H*/
-
-/*! \file */
diff --git a/lib/libc/include/isc/heap.h b/lib/libc/include/isc/heap.h
deleted file mode 100644
index 30cec98f2..000000000
--- a/lib/libc/include/isc/heap.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: heap.h,v 1.1.1.4 2009/04/12 16:35:44 christos Exp $	*/
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1997,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.
- */
-
-typedef int (*heap_higher_priority_func)(void *, void *);
-typedef void (*heap_index_func)(void *, int);
-typedef void (*heap_for_each_func)(void *, void *);
-
-typedef struct heap_context {
-	int array_size;
-	int array_size_increment;
-	int heap_size;
-	void **heap;
-	heap_higher_priority_func higher_priority;
-	heap_index_func index;
-} *heap_context;
-
-#define heap_new	__heap_new
-#define heap_free	__heap_free
-#define heap_insert	__heap_insert
-#define heap_delete	__heap_delete
-#define heap_increased	__heap_increased
-#define heap_decreased	__heap_decreased
-#define heap_element	__heap_element
-#define heap_for_each	__heap_for_each
-
-heap_context	heap_new(heap_higher_priority_func, heap_index_func, int);
-int		heap_free(heap_context);
-int		heap_insert(heap_context, void *);
-int		heap_delete(heap_context, int);
-int		heap_increased(heap_context, int);
-int		heap_decreased(heap_context, int);
-void *		heap_element(heap_context, int);
-int		heap_for_each(heap_context, heap_for_each_func, void *);
-
-/*! \file */
diff --git a/lib/libc/include/isc/list.h b/lib/libc/include/isc/list.h
deleted file mode 100644
index 46f2e79be..000000000
--- a/lib/libc/include/isc/list.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*	$NetBSD: list.h,v 1.5 2009/04/12 17:07:16 christos Exp $	*/
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1997,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.
- */
-
-#ifndef LIST_H
-#define LIST_H 1
-#include <isc/assertions.h>
-
-#define LIST(type) struct { type *head, *tail; }
-#define INIT_LIST(list) \
-	do { (list).head = NULL; (list).tail = NULL; } while (/*CONSTCOND*/0)
-
-#define LINK(type) struct { type *prev, *next; }
-#define INIT_LINK_TYPE(elt, link, type) \
-	do { \
-		(elt)->link.prev = (type *)(-1); \
-		(elt)->link.next = (type *)(-1); \
-	} while (/*CONSTCOND*/0)
-#define INIT_LINK(elt, link) \
-	INIT_LINK_TYPE(elt, link, void)
-#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)
-#define EMPTY(list) ((list).head == NULL)
-
-#define PREPEND(list, elt, link) \
-	do { \
-		INSIST(!LINKED(elt, link));\
-		if ((list).head != NULL) \
-			(list).head->link.prev = (elt); \
-		else \
-			(list).tail = (elt); \
-		(elt)->link.prev = NULL; \
-		(elt)->link.next = (list).head; \
-		(list).head = (elt); \
-	} while (/*CONSTCOND*/0)
-
-#define APPEND(list, elt, link) \
-	do { \
-		INSIST(!LINKED(elt, link));\
-		if ((list).tail != NULL) \
-			(list).tail->link.next = (elt); \
-		else \
-			(list).head = (elt); \
-		(elt)->link.prev = (list).tail; \
-		(elt)->link.next = NULL; \
-		(list).tail = (elt); \
-	} while (/*CONSTCOND*/0)
-
-#define UNLINK_TYPE(list, elt, link, type) \
-	do { \
-		INSIST(LINKED(elt, link));\
-		if ((elt)->link.next != NULL) \
-			(elt)->link.next->link.prev = (elt)->link.prev; \
-		else { \
-			INSIST((list).tail == (elt)); \
-			(list).tail = (elt)->link.prev; \
-		} \
-		if ((elt)->link.prev != NULL) \
-			(elt)->link.prev->link.next = (elt)->link.next; \
-		else { \
-			INSIST((list).head == (elt)); \
-			(list).head = (elt)->link.next; \
-		} \
-		INIT_LINK_TYPE(elt, link, type); \
-	} while (/*CONSTCOND*/0)
-#define UNLINK(list, elt, link) \
-	UNLINK_TYPE(list, elt, link, void)
-
-#define PREV(elt, link) ((elt)->link.prev)
-#define NEXT(elt, link) ((elt)->link.next)
-
-#define INSERT_BEFORE(list, before, elt, link) \
-	do { \
-		INSIST(!LINKED(elt, link));\
-		if ((before)->link.prev == NULL) \
-			PREPEND(list, elt, link); \
-		else { \
-			(elt)->link.prev = (before)->link.prev; \
-			(before)->link.prev = (elt); \
-			(elt)->link.prev->link.next = (elt); \
-			(elt)->link.next = (before); \
-		} \
-	} while (/*CONSTCOND*/0)
-
-#define INSERT_AFTER(list, after, elt, link) \
-	do { \
-		INSIST(!LINKED(elt, link));\
-		if ((after)->link.next == NULL) \
-			APPEND(list, elt, link); \
-		else { \
-			(elt)->link.next = (after)->link.next; \
-			(after)->link.next = (elt); \
-			(elt)->link.next->link.prev = (elt); \
-			(elt)->link.prev = (after); \
-		} \
-	} while (/*CONSTCOND*/0)
-
-#define ENQUEUE(list, elt, link) APPEND(list, elt, link)
-#define DEQUEUE(list, elt, link) UNLINK(list, elt, link)
-
-#endif /* LIST_H */
-/*! \file */
diff --git a/lib/libc/include/isc/memcluster.h b/lib/libc/include/isc/memcluster.h
deleted file mode 100644
index 3c1b489cb..000000000
--- a/lib/libc/include/isc/memcluster.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: memcluster.h,v 1.1.1.4 2009/04/12 16:35:44 christos Exp $	*/
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1997,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.
- */
-
-#ifndef MEMCLUSTER_H
-#define MEMCLUSTER_H
-
-#include <stdio.h>
-
-#define meminit		__meminit
-#ifdef MEMCLUSTER_DEBUG
-#define memget(s)	__memget_debug(s, __FILE__, __LINE__)
-#define memput(p, s)	__memput_debug(p, s, __FILE__, __LINE__)
-#else /*MEMCLUSTER_DEBUG*/
-#ifdef MEMCLUSTER_RECORD
-#define memget(s)	__memget_record(s, __FILE__, __LINE__)
-#define memput(p, s)	__memput_record(p, s, __FILE__, __LINE__)
-#else /*MEMCLUSTER_RECORD*/
-#define memget		__memget
-#define memput		__memput
-#endif /*MEMCLUSTER_RECORD*/
-#endif /*MEMCLUSTER_DEBUG*/
-#define memstats	__memstats
-#define memactive	__memactive
-
-int	meminit(size_t, size_t);
-void *	__memget(size_t);
-void 	__memput(void *, size_t);
-void *	__memget_debug(size_t, const char *, int);
-void 	__memput_debug(void *, size_t, const char *, int);
-void *	__memget_record(size_t, const char *, int);
-void 	__memput_record(void *, size_t, const char *, int);
-void 	memstats(FILE *);
-int	memactive(void);
-
-#endif /* MEMCLUSTER_H */
-/*! \file */
diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h
deleted file mode 100644
index 309a686f3..000000000
--- a/lib/libc/include/namespace.h
+++ /dev/null
@@ -1,939 +0,0 @@
-/*	$NetBSD: namespace.h,v 1.179 2015/09/10 14:05:06 christos Exp $	*/
-
-/*-
- * Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (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 _NAMESPACE_H_
-#define _NAMESPACE_H_
-
-#include <sys/cdefs.h>
-
-#ifndef __lint__
-#define aio_suspend	_aio_suspend
-#define brk		_brk
-#define catclose	_catclose
-#define catgets		_catgets
-#define catopen		_catopen
-#define catopen_l	_catopen_l
-#define daylight	_daylight
-#define difftime	_difftime
-#define devname_r	_devname_r
-#define err		_err
-#define errc		_errc
-#define errx		_errx
-#ifdef _REENTRANT
-#define fileno		_fileno
-#endif /* _REENTRANT */
-#define fork		_fork
-#define fseeko		_fseeko
-#define ftello		_ftello
-#define getcontext	_getcontext
-#define getenv_r	_getenv_r
-#define imaxabs		_imaxabs
-#define imaxdiv		_imaxdiv
-#define inet_aton	_inet_aton
-#define inet_pton	_inet_pton
-#define pipe		_pipe
-#define sbrk		_sbrk
-#define strerror_l	_strerror_l
-#define strerror_r	_strerror_r
-#define strlcat		_strlcat
-#define strlcpy		_strlcpy
-#define strtod_l	_strtod_l
-#define strtof		_strtof
-#define strtof_l	_strtof_l
-#define strtoi		_strtoi
-#define strtoi_l	_strtoi_l
-#define strtoimax	_strtoimax
-#define strtoimax_l	_strtoimax_l
-#define strtold		_strtold
-#define strtold_l	_strtold_l
-#define strtoll		_strtoll
-#define strtoll_l	_strtoll_l
-#define strtou		_strtou
-#define strtou_l	_strtou_l
-#define strtoull	_strtoull
-#define strtoull_l	_strtoull_l
-#define strtoumax	_strtoumax
-#define strtoumax_l	_strtoumax_l
-#define sys_errlist	_sys_errlist
-#define sys_nerr	_sys_nerr
-#define sys_siglist	_sys_siglist
-#define	sys_nsig	_sys_nsig
-#define sysconf		__sysconf
-#define verr		_verr
-#define verrc		_verrc
-#define verrx		_verrx
-#define vwarn		_vwarn
-#define vwarnc		_vwarnc
-#define vwarnx		_vwarnx
-#define warn		_warn
-#define warnc		_warnc
-#define warnx		_warnx
-
-#ifdef __weak_alias
-#define MD2Data			_MD2Data
-#define MD2End			_MD2End
-#define MD2FileChunk		_MD2FileChunk
-#define MD2File			_MD2File
-#define MD2Final		_MD2Final
-#define MD2Init			_MD2Init
-#define MD2Transform		_MD2Transform
-#define MD2Update		_MD2Update
-#define MD4Data			_MD4Data
-#define MD4End			_MD4End
-#define MD4FileChunk		_MD4FileChunk
-#define MD4File			_MD4File
-#define MD4Final		_MD4Final
-#define MD4Init			_MD4Init
-#define MD4Transform		_MD4Transform
-#define MD4Update		_MD4Update
-#define MD5Data			_MD5Data
-#define MD5End			_MD5End
-#define MD5FileChunk		_MD5FileChunk
-#define MD5File			_MD5File
-#define MD5Final		_MD5Final
-#define MD5Init			_MD5Init
-#define MD5Transform		_MD5Transform
-#define MD5Update		_MD5Update
-#define RMD160Data		_RMD160Data
-#define RMD160End		_RMD160End
-#define RMD160FileChunk		_RMD160FileChunk
-#define RMD160File		_RMD160File
-#define RMD160Final		_RMD160Final
-#define RMD160Init		_RMD160Init
-#define RMD160Transform		_RMD160Transform
-#define RMD160Update		_RMD160Update
-#define SHA1Data		_SHA1Data
-#define SHA1End			_SHA1End
-#define SHA1FileChunk		_SHA1FileChunk
-#define SHA1File		_SHA1File
-#define SHA1Final		_SHA1Final
-#define SHA1Init		_SHA1Init
-#define SHA1Transform		_SHA1Transform
-#define SHA1Update		_SHA1Update
-#define SHA224_Data		_SHA224_Data
-#define SHA224_End		_SHA224_End
-#define SHA224_FileChunk	_SHA224_FileChunk
-#define SHA224_File		_SHA224_File
-#define SHA224_Final		_SHA224_Final
-#define SHA224_Init		_SHA224_Init
-#define SHA224_Transform	_SHA224_Transform
-#define SHA224_Update		_SHA224_Update
-#define SHA256_Data		_SHA256_Data
-#define SHA256_End		_SHA256_End
-#define SHA256_FileChunk	_SHA256_FileChunk
-#define SHA256_File		_SHA256_File
-#define SHA256_Final		_SHA256_Final
-#define SHA256_Init		_SHA256_Init
-#define SHA256_Transform	_SHA256_Transform
-#define SHA256_Update		_SHA256_Update
-#define SHA384_Data		_SHA384_Data
-#define SHA384_End		_SHA384_End
-#define SHA384_FileChunk	_SHA384_FileChunk
-#define SHA384_File		_SHA384_File
-#define SHA384_Final		_SHA384_Final
-#define SHA384_Init		_SHA384_Init
-#define SHA384_Transform	_SHA384_Transform
-#define SHA384_Update		_SHA384_Update
-#define SHA512_Data		_SHA512_Data
-#define SHA512_End		_SHA512_End
-#define SHA512_FileChunk	_SHA512_FileChunk
-#define SHA512_File		_SHA512_File
-#define SHA512_Final		_SHA512_Final
-#define SHA512_Init		_SHA512_Init
-#define SHA512_Transform	_SHA512_Transform
-#define SHA512_Update		_SHA512_Update
-#define a64l			_a64l
-#define adjtime			_adjtime
-#define alarm			_alarm
-#define allocaddrinfo		_allocaddrinfo
-#define alphasort		_alphasort
-#define arc4random		_arc4random
-#define arc4random_addrandom	_arc4random_addrandom
-#define arc4random_buf		_arc4random_buf
-#define arc4random_stir		_arc4random_stir
-#define arc4random_uniform	_arc4random_uniform
-#define asctime_r		_asctime_r
-#define asprintf		_asprintf
-#define asprintf_l		_asprintf_l
-#define asysctl			_asysctl
-#define asysctlbyname		_asysctlbyname
-#define atoll			_atoll
-#define authnone_create		_authnone_create
-#define authunix_create		_authunix_create
-#define authunix_create_default _authunix_create_default
-#define basename		_basename
-#define bindresvport		_bindresvport
-#define bindresvport_sa		_bindresvport_sa
-#define bm_comp			_bm_comp
-#define bm_exec			_bm_exec
-#define bm_free			_bm_free
-#define callrpc			_callrpc
-#define cdbr_close		_cdbr_close
-#define cdbr_find		_cdbr_find
-#define cdbr_get		_cdbr_get
-#define cdbr_open		_cdbr_open
-#define cdbr_open_mem		_cdbr_open_mem
-#define cdbw_close		_cdbw_close
-#define cdbw_open		_cdbw_open
-#define cdbw_put		_cdbw_put
-#define cdbw_put_data		_cdbw_put_data
-#define cdbw_put_key		_cdbw_put_key
-#define cdbw_output		_cdbw_output
-#define cfgetispeed		_cfgetispeed
-#define cfgetospeed		_cfgetospeed
-#define cfmakeraw		_cfmakeraw
-#define cfsetispeed		_cfsetispeed
-#define cfsetospeed		_cfsetospeed
-#define cfsetspeed		_cfsetspeed
-#define cgetcap			_cgetcap
-#define cgetclose		_cgetclose
-#define cgetent			_cgetent
-#define cgetfirst		_cgetfirst
-#define cgetmatch		_cgetmatch
-#define cgetnext		_cgetnext
-#define cgetnum			_cgetnum
-#define cgetset			_cgetset
-#define cgetstr			_cgetstr
-#define cgetustr		_cgetustr
-#define clnt_broadcast		_clnt_broadcast
-#define clnt_create		_clnt_create
-#define clnt_create_vers	_clnt_create_vers
-#define clnt_dg_create		_clnt_dg_create
-#define clnt_pcreateerror	_clnt_pcreateerror
-#define clnt_perrno		_clnt_perrno
-#define clnt_perror		_clnt_perror
-#define clnt_raw_create		_clnt_raw_create
-#define clnt_tli_create		_clnt_tli_create
-#define clnt_tp_create		_clnt_tp_create
-#define clnt_spcreateerror	_clnt_spcreateerror
-#define clnt_sperrno		_clnt_sperrno
-#define clnt_sperror		_clnt_sperror
-#define clnt_vc_create		_clnt_vc_create
-#define clntraw_create		_clntraw_create
-#define clnttcp_create		_clnttcp_create
-#define clntudp_bufcreate	_clntudp_bufcreate
-#define clntudp_create		_clntudp_create
-#define clock_gettime		_clock_gettime
-#define clock_getres		_clock_getres
-#define clock_settime		_clock_settime
-#define closedir		_closedir
-#define closelog		_closelog
-#define closelog_r		_closelog_r
-#define confstr			_confstr
-#define consttime_memequal	_consttime_memequal
-#define csetexpandtc		_csetexpandtc
-#define ctermid			_ctermid
-#define ctime_r			_ctime_r
-#define ctime_rz		_ctime_rz
-#define daemon			_daemon
-#define dbopen			_dbopen
-#define devname			_devname
-#define difftime		_difftime
-#define dirname			_dirname
-#define dn_expand		_dn_expand
-#define dprintf_l		_dprintf_l
-#define drand48			_drand48
-#define duplocale		_duplocale
-#define endfsent		_endfsent
-#define endgrent		_endgrent
-#define endhostent		_endhostent
-#define endnetconfig		_endnetconfig
-#define endnetent		_endnetent
-#define endnetgrent		_endnetgrent
-#define endnetpath		_endnetpath
-#define endprotoent		_endprotoent
-#define endprotoent_r		_endprotoent_r
-#define endpwent		_endpwent
-#define endrpcent		_endrpcent
-#define endservent		_endservent
-#define endservent_r		_endservent_r
-#define endttyent		_endttyent
-#define endusershell		_endusershell
-#define erand48			_erand48
-#define ether_aton		_ether_aton
-#define ether_hostton		_ether_hostton
-#define ether_line		_ether_line
-#define ether_ntoa		_ether_ntoa
-#define ether_ntohost		_ether_ntohost
-#define execl			_execl
-#define execle			_execle
-#define execlp			_execlp
-#define execlpe			_execlpe
-#define execv			_execv
-#define execvp			_execvp
-#define execvpe			_execvpe
-#define explicit_memset		_explicit_memset
-#define fdiscard		_fdiscard
-#define fdopen			_fdopen
-#define fgetln			_fgetln
-#define fgetwln			_fgetwln
-#define fhstatvfs		_fhstatvfs
-#define flockfile		_flockfile
-#define ftrylockfile		_ftrylockfile
-#define funlockfile		_funlockfile
-#define fnmatch			_fnmatch
-#define fparseln		_fparseln
-#define fprintf_l		_fprintf_l
-#define fpgetmask		_fpgetmask
-#define fpgetprec		_fpgetprec
-#define fpgetround		_fpgetround
-#define fpgetsticky		_fpgetsticky
-#define fpsetmask		_fpsetmask
-#define fpsetprec		_fpsetprec
-#define fpsetround		_fpsetround
-#define fpsetsticky		_fpsetsticky
-#define freenetconfigent	_freenetconfigent
-#define freeaddrinfo		_freeaddrinfo
-#define freeifaddrs		_freeifaddrs
-#define freelocale		_freelocale
-#define fscanf_l		_fscanf_l
-#define fstatvfs		_fstatvfs
-#define ftok			_ftok
-#define ftruncate		_ftruncate
-#define fts_children		_fts_children
-#define fts_close		_fts_close
-#define fts_open		_fts_open
-#define fts_read		_fts_read
-#define fts_set			_fts_set
-#define fwprintf_l		_fwprintf_l
-#define fwscanf_l		_fwscanf_l
-#define gai_strerror		_gai_strerror
-#define get_myaddress		_get_myaddress
-#define getaddrinfo		_getaddrinfo
-#define getbsize		_getbsize
-#define getcwd			_getcwd
-#define getdelim		_getdelim
-#define getdevmajor		_getdevmajor
-#define getdiskbyname		_getdiskbyname
-#define getdomainname		_getdomainname
-#define getfsent		_getfsent
-#define getfsfile		_getfsfile
-#define getfsspec		_getfsspec
-#define getgrent		_getgrent
-#define getgrent_r		_getgrent_r
-#define getgrgid		_getgrgid
-#define getgrgid_r		_getgrgid_r
-#define getgrnam		_getgrnam
-#define getgrnam_r		_getgrnam_r
-#define getgrouplist		_getgrouplist
-#define getgroupmembership	_getgroupmembership
-#define gethostbyaddr		_gethostbyaddr
-#define gethostbyname		_gethostbyname
-#define gethostent		_gethostent
-#define gethostname		_gethostname
-#define getifaddrs		_getifaddrs
-#define getline			_getline
-#define getloadavg		_getloadavg
-#define getlogin		_getlogin
-#define getlogin_r		_getlogin_r
-#define getmntinfo		_getmntinfo
-#define getmode			_getmode
-#define getnameinfo		_getnameinfo
-#define getnetbyaddr		_getnetbyaddr
-#define getnetbyname		_getnetbyname
-#define getnetconfig		_getnetconfig
-#define getnetconfigent		_getnetconfigent
-#define getnetent		_getnetent
-#define getnetgrent		_getnetgrent
-#define getnetpath		_getnetpath
-#define getopt			_getopt
-#define getopt_long		_getopt_long
-#define getpagesize		_getpagesize
-#define getpass			_getpass
-#define getpassfd		_getpassfd
-#define getpass_r		_getpass_r
-#define getprogname		_getprogname
-#define getprotobyname		_getprotobyname
-#define getprotobyname_r	_getprotobyname_r
-#define getprotobynumber	_getprotobynumber
-#define getprotobynumber_r	_getprotobynumber_r
-#define getprotoent		_getprotoent
-#define getprotoent_r		_getprotoent_r
-#define getpwent		_getpwent
-#define getpwent_r		_getpwent_r
-#define getpwnam		_getpwnam
-#define getpwnam_r		_getpwnam_r
-#define getpwuid		_getpwuid
-#define getpwuid_r		_getpwuid_r
-#define getrpcbyname		_getrpcbyname
-#define getrpcbyname_r		_getrpcbyname_r
-#define getrpcbynumber		_getrpcbynumber
-#define getrpcbynumber_r	_getrpcbynumber_r
-#define getrpcent		_getrpcent
-#define getrpcent_r		_getrpcent_r
-#define getrpcport		_getrpcport
-#define getservbyname		_getservbyname
-#define getservbyname_r		_getservbyname_r
-#define getservbyport		_getservbyport
-#define getservbyport_r		_getservbyport_r
-#define getservent		_getservent
-#define getservent_r		_getservent_r
-#define getsubopt		_getsubopt
-#define getttyent		_getttyent
-#define getttynam		_getttynam
-#define getusershell		_getusershell
-#define glob			_glob
-#define globfree		_globfree
-#define gmtime_r		_gmtime_r
-#define group_from_gid		_group_from_gid
-#define heapsort		_heapsort
-#define herror			_herror
-#define hes_error		_hes_error
-#define hes_free		_hes_free
-#define hes_init		_hes_init
-#define hes_resolve		_hes_resolve
-#define hes_to_bind		_hes_to_bind
-#define hesiod_end		_hesiod_end
-#define hesiod_free_list	_hesiod_free_list
-#define hesiod_init		_hesiod_init
-#define hesiod_resolve		_hesiod_resolve
-#define hesiod_to_bind		_hesiod_to_bind
-#define iconv			_iconv
-#define iconv_open		_iconv_open
-#define iconv_close		_iconv_close
-#define if_freenameindex	_if_freenameindex
-#define if_indextoname		_if_indextoname
-#define if_nameindex		_if_nameindex
-#define if_nametoindex		_if_nametoindex
-#define in6addr_any		_in6addr_any
-#define in6addr_linklocal_allnodes	_in6addr_linklocal_allnodes
-#define in6addr_linklocal_allrouters	_in6addr_linklocal_allrouters
-#define in6addr_loopback	_in6addr_loopback
-#define in6addr_nodelocal_allnodes	_in6addr_nodelocal_allnodes
-#define inet6_option_alloc	_inet6_option_alloc
-#define inet6_option_append	_inet6_option_append
-#define inet6_option_find	_inet6_option_find
-#define inet6_option_init	_inet6_option_init
-#define inet6_option_next	_inet6_option_next
-#define inet6_option_space	_inet6_option_space
-#define inet6_opt_init		_inet6_opt_init
-#define inet6_opt_append	_inet6_opt_append
-#define inet6_opt_finish	_inet6_opt_finish
-#define inet6_opt_set_val	_inet6_opt_set_val
-#define inet6_opt_next		_inet6_opt_next
-#define inet6_opt_find		_inet6_opt_find
-#define inet6_opt_get_val	_inet6_opt_get_val
-#define inet6_rthdr_add		_inet6_rthdr_add
-#define inet6_rthdr_getaddr	_inet6_rthdr_getaddr
-#define inet6_rthdr_getflags	_inet6_rthdr_getflags
-#define inet6_rthdr_init	_inet6_rthdr_init
-#define inet6_rthdr_lasthop	_inet6_rthdr_lasthop
-#define inet6_rthdr_segments	_inet6_rthdr_segments
-#define inet6_rthdr_space	_inet6_rthdr_space
-#define inet6_rth_space		_inet6_rth_space
-#define inet6_rth_init		_inet6_rth_init
-#define inet6_rth_add		_inet6_rth_add
-#define inet6_rth_reverse	_inet6_rth_reverse
-#define inet6_rth_segments	_inet6_rth_segments
-#define inet6_rth_getaddr	_inet6_rth_getaddr
-#define inet_cidr_ntop		_inet_cidr_ntop
-#define inet_cidr_pton		_inet_cidr_pton
-#define inet_lnaof		_inet_lnaof
-#define inet_makeaddr		_inet_makeaddr
-#define inet_net_ntop		_inet_net_ntop
-#define inet_net_pton		_inet_net_pton
-#define inet_neta		_inet_neta
-#define inet_netof		_inet_netof
-#define inet_network		_inet_network
-#define inet_nsap_addr		_inet_nsap_addr
-#define inet_nsap_ntoa		_inet_nsap_ntoa
-#define inet_ntoa		_inet_ntoa
-#define inet_ntop		_inet_ntop
-#define initgroups		_initgroups
-#define initstate		_initstate
-#define innetgr			_innetgr
-#define isatty			_isatty
-#define jrand48			_jrand48
-#define kill			_kill
-#define l64a			_l64a
-#define l64a_r			_l64a_r
-#define lcong48			_lcong48
-#define llabs			_llabs
-#define lldiv			_lldiv
-#define localtime_r		_localtime_r
-#define localtime_rz		_localtime_rz
-#define lockf			_lockf
-#define lrand48			_lrand48
-#define lseek			_lseek
-#define membar_producer		_membar_producer
-#define mergesort		_mergesort
-#define mi_vector_hash		_mi_vector_hash
-#define mkstemp			_mkstemp
-#define mktime_z		_mktime_z
-#define mmap			_mmap
-#define mpool_close		_mpool_close
-#define mpool_filter		_mpool_filter
-#define mpool_get		_mpool_get
-#define mpool_new		_mpool_new
-#define mpool_open		_mpool_open
-#define mpool_put		_mpool_put
-#define mpool_sync		_mpool_sync
-#define mq_timedreceive		_mq_timedreceive
-#define mq_timedsend		_mq_timedsend
-#define mrand48			_mrand48
-#define murmurhash2		_murmurhash2
-#define nc_perror		_nc_perror
-#define nc_sperror		_nc_sperror
-#define nanosleep		_nanosleep
-#define newlocale		_newlocale
-#define nice			_nice
-#if 0
-#define nlist			_nlist
-#endif
-#define nl_langinfo_l		_nl_langinfo_l
-#define nrand48			_nrand48
-#define ntp_adjtime		_ntp_adjtime
-#define nsdispatch		_nsdispatch
-#define offtime			_offtime
-#define opendir			_opendir
-#define fdopendir		_fdopendir
-#define openlog			_openlog
-#define openlog_r		_openlog_r
-#define pause			_pause
-#define pclose			_pclose
-#define pmap_getmaps		_pmap_getmaps
-#define pmap_getport		_pmap_getport
-#define pmap_rmtcall		_pmap_rmtcall
-#define pmap_set		_pmap_set
-#define pmap_unset		_pmap_unset
-#define pollts			_pollts
-#define popen			_popen
-#define posix2time		_posix2time
-#define posix2time_z		_posix2time_z
-#define pread			_pread
-#define printf_l		_printf_l
-#define pselect			_pselect
-#define posix_fallocate		_posix_fallocate
-#define psignal			_psignal
-#define pthread_atfork		_pthread_atfork
-#define ptree_init		ptree_init
-#define ptree_insert_node	ptree_insert_node
-#define ptree_insert_mask_node	ptree_insert_mask_node
-#define ptree_find_filtered_node	ptree_find_filtered_node
-#define ptree_remove_node	ptree_remove_node
-#define ptree_iterate		ptree_iterate
-#define putenv			_putenv
-#define pwcache_groupdb		_pwcache_groupdb
-#define pwcache_userdb		_pwcache_userdb
-#define pwrite			_pwrite
-#define qabs			_qabs
-#define qdiv			_qdiv
-#define radixsort		_radixsort
-#define random			_random
-#define randomid		_randomid
-#define randomid_new		_randomid_new
-#define randomid_delete		_randomid_delete
-#define read			_read
-#define readdir			_readdir
-#define readdir_r		_readdir_r
-#define readlink		_readlink
-#define reallocarr		_reallocarr
-#define realpath		_realpath
-#define regcomp			_regcomp
-#define regerror		_regerror
-#define regexec			_regexec
-#define regfree			_regfree
-#define registerrpc		_registerrpc
-#define res_init		_res_init
-#define res_mkquery		_res_mkquery
-#define res_query		_res_query
-#define res_search		_res_search
-#define rewinddir		_rewinddir
-#define rpc_broadcast		_rpc_broadcast
-#define rpc_broadcast_exp	_rpc_broadcast_exp
-#define rpc_call		_rpc_call
-#define rpc_control		_rpc_control
-#define rpc_reg			_rpc_reg
-#define rpcb_getmaps		_rpcb_getmaps
-#define rpcb_gettime		_rpcb_gettime
-#define rpcb_rmtcall		_rpcb_rmtcall
-#define rpcb_set		_rpcb_set
-#define rpcb_taddr2uaddr	_rpcb_taddr2uaddr
-#define rpcb_uaddr2taddr	_rpcb_uaddr2taddr
-#define rpcb_unset		_rpcb_unset
-#define scandir			_scandir
-#define scanf_l			_scanf_l
-#define seed48			_seed48
-#define seekdir			_seekdir
-#define select			_select
-#define send			_send
-#define setdomainname		_setdomainname
-#define setenv			_setenv
-#define setfsent		_setfsent
-#define setgrent		_setgrent
-#define setgroupent		_setgroupent
-#define sethostent		_sethostent
-#define sethostname		_sethostname
-#define setlogin		_setlogin
-#define setlogmask		_setlogmask
-#define setlogmask_r		_setlogmask_r
-#define setmode			_setmode
-#define setnetconfig		_setnetconfig
-#define setnetent		_setnetent
-#define setnetgrent		_setnetgrent
-#define setpassent		_setpassent
-#define setnetpath		_setnetpath
-#define setproctitle		_setproctitle
-#define setprotoent		_setprotoent
-#define setprotoent_r		_setprotoent_r
-#define setpwent		_setpwent
-#define setrpcent		_setrpcent
-#define setservent		_setservent
-#define setservent_r		_setservent_r
-#define setstate		_setstate
-#define setttyent		_setttyent
-#define setttyentpath		_setttyentpath
-#define settimeofday		_settimeofday
-#define setusershell		_setusershell
-#define shm_open		_shm_open
-#define shm_unlink		_shm_unlink
-#define shquote			_shquote
-#define siginterrupt		_siginterrupt
-#define signal			_signal
-#define sigtimedwait		_sigtimedwait
-#define sl_add			_sl_add
-#define sl_create		_sl_create
-#define sl_delete		_sl_delete
-#define sl_find			_sl_find
-#define sl_free			_sl_free
-#define sl_init			_sl_init
-#define sleep			_sleep
-#ifndef snprintf
-#define snprintf		_snprintf
-#endif
-#define snprintf_l		_snprintf_l
-#define snprintf_ss		_snprintf_ss
-#define sprintf_l		_sprintf_l
-#define sradixsort		_sradixsort
-#define srand48			_srand48
-#define srandom			_srandom
-#define sscanf_l		_sscanf_l
-#define statvfs(a, b)		_statvfs(a, b)
-#define strcasecmp		_strcasecmp
-#define strcoll_l		_strcoll_l
-#define strdup			_strdup
-#define stresep			_stresep
-#define strftime_l		_strftime_l
-#define strftime_lz		_strftime_lz
-#define strftime_z		_strftime_z
-#define strndup			_strndup
-#define strncasecmp		_strncasecmp
-#define strptime		_strptime
-#define strptime_l		_strptime_l
-#define strsep			_strsep
-#define strsignal		_strsignal
-#define strsuftoll	 	_strsuftoll
-#define strsuftollx	 	_strsuftollx
-#define strtok_r		_strtok_r
-#define strnunvisx		_strnunvisx
-#define strvisx			_strvisx
-#define strxfrm_l		_strxfrm_l
-#define svc_auth_reg		_svc_auth_reg
-#define svc_create		_svc_create
-#define svc_dg_create		_svc_dg_create
-#define svc_exit		_svc_exit
-#define svc_fd_create		_svc_fd_create
-#define svc_getreq		_svc_getreq
-#define svc_getreqset		_svc_getreqset
-#define svc_getreq_common	_svc_getreq_common
-#define svc_raw_create		_svc_raw_create
-#define svc_register		_svc_register
-#define svc_reg			_svc_reg
-#define svc_run			_svc_run
-#define svc_sendreply		_svc_sendreply
-#define svc_tli_create		_svc_tli_create
-#define svc_tp_create		_svc_tp_create
-#define svc_unregister		_svc_unregister
-#define svc_unreg		_svc_unreg
-#define svc_vc_create		_svc_vc_create
-#define svcerr_auth		_svcerr_auth
-#define svcerr_decode		_svcerr_decode
-#define svcerr_noproc		_svcerr_noproc
-#define svcerr_noprog		_svcerr_noprog
-#define svcerr_progvers		_svcerr_progvers
-#define svcerr_systemerr	_svcerr_systemerr
-#define svcerr_weakauth		_svcerr_weakauth
-#define svcfd_create		_svcfd_create
-#define svcraw_create		_svcraw_create
-#define svctcp_create		_svctcp_create
-#define svcudp_bufcreate	_svcudp_bufcreate
-#define svcudp_create		_svcudp_create
-#define svcudp_enablecache	_svcudp_enablecache
-#define sysarch			_sys_sysarch
-#define swprintf_l		_swprintf_l
-#define swscanf_l		_swscanf_l
-#define sysctl			_sysctl
-#define sysctlbyname		_sysctlbyname
-#define sysctlgetmibinfo	_sysctlgetmibinfo
-#define sysctlnametomib		_sysctlnametomib
-#define syslog			_syslog
-#define syslog_r		_syslog_r
-#define syslog_ss		_syslog_ss
-#define syslogp			_syslogp
-#define syslogp_r		_syslogp_r
-#define syslogp_ss		_syslogp_ss
-#define taddr2uaddr		_taddr2uaddr
-#define tcdrain			_tcdrain
-#define tcflow			_tcflow
-#define tcflush			_tcflush
-#define tcgetattr		_tcgetattr
-#define tcgetpgrp		_tcgetpgrp
-#define tcgetsid		_tcgetsid
-#define tcsendbreak		_tcsendbreak
-#define tcsetattr		_tcsetattr
-#define tcsetpgrp		_tcsetpgrp
-#define telldir			_telldir
-#define time			_time
-#define time2posix		_time2posix
-#define timegm			_timegm
-#define timelocal		_timelocal
-#define timeoff			_timeoff
-#define times			_times
-#define ttyname			_ttyname
-#define ttyname_r		_ttyname_r
-#define ttyslot			_ttyslot
-#define tzname			_tzname
-#define tzset			_tzset
-#define tzsetwall		_tzsetwall
-#define uaddr2taddr		_uaddr2taddr
-#define ualarm			_ualarm
-#define uname			_uname
-#define unsetenv		_unsetenv
-#define user_from_uid		_user_from_uid
-#define usleep			_usleep
-#define utime			_utime
-#define uuid_create_nil		_uuid_create_nil
-#define uuid_is_nil		_uuid_is_nil
-#define valloc			_valloc
-#define vasprintf		_vasprintf
-#define vasprintf_l		_vasprintf_l
-#define	vdprintf		_vdprintf
-#ifndef vsnprintf
-#define vsnprintf		_vsnprintf
-#endif
-#define vdprintf_l		_vdprintf_l
-#define vdprintf_l		_vdprintf_l
-#define vfprintf_l		_vfprintf_l
-#define vfwprintf_l		_vfwprintf_l
-#define vprintf_l		_vprintf_l
-#define vscanf_l		_vscanf_l
-#define vsscanf_l		_vsscanf_l
-#define vswscanf_l		_vswscanf_l
-#define vsnprintf_l		_vsnprintf_l
-#define vsnprintf_ss		_vsnprintf_ss
-#define vsprintf_l		_vsprintf_l
-#define vswprintf_l		_vswprintf_l
-#define vwprintf_l		_vwprintf_l
-#define vwscanf_l		_vwscanf_l
-#define vsyslog			_vsyslog
-#define vsyslog_r		_vsyslog_r
-#define vsyslog_ss		_vsyslog_ss
-#define vsyslogp		_vsyslogp
-#define vsyslogp_r		_vsyslogp_r
-#define vsyslogp_ss		_vsyslogp_ss
-#define wait			_wait
-#define wait3			_wait3
-#define wait4			_wait4
-#define waitpid			_waitpid
-#define wcscasecmp		_wcscasecmp
-#define wcscasecmp_l		_wcscasecmp_l
-#define wcsdup			_wcsdup
-#define wcsftime_l		_wcsftime_l
-#define wcsncasecmp		_wcsncasecmp
-#define wcsncasecmp_l		_wcsncasecmp_l
-#define wcstof			_wcstof
-#define wcstof_l		_wcstof_l
-#define wcstod			_wcstod
-#define wcstod_l		_wcstod_l
-#define wcstold			_wcstold
-#define wcstold_l		_wcstold_l
-#define wcwidth			_wcwidth
-#define wcwidth_l		_wcwidth_l
-#define wprintf_l		_wprintf_l
-#define wscanf_l		_wscanf_l
-#define xdr_accepted_reply	_xdr_accepted_reply
-#define xdr_array		_xdr_array
-#define xdr_authunix_parms	_xdr_authunix_parms
-#define xdr_bool		_xdr_bool
-#define xdr_bytes		_xdr_bytes
-#define xdr_callhdr		_xdr_callhdr
-#define xdr_callmsg		_xdr_callmsg
-#define xdr_char		_xdr_char
-#define xdr_datum		_xdr_datum
-#define xdr_des_block		_xdr_des_block
-#define xdr_domainname		_xdr_domainname
-#define xdr_double		_xdr_double
-#define xdr_enum		_xdr_enum
-#define xdr_float		_xdr_float
-#define xdr_free		_xdr_free
-#define	xdr_hyper		_xdr_hyper
-#define xdr_int			_xdr_int
-#define xdr_int16_t		_xdr_int16_t
-#define xdr_int32_t		_xdr_int32_t
-#define xdr_int64_t		_xdr_int64_t
-#define xdr_long		_xdr_long
-#define	xdr_longlong_t		_xdr_longlong_t
-#define xdr_mapname		_xdr_mapname
-#define xdr_netbuf		_xdr_netbuf
-#define xdr_netobj		_xdr_netobj
-#define xdr_opaque		_xdr_opaque
-#define xdr_opaque_auth		_xdr_opaque_auth
-#define xdr_peername		_xdr_peername
-#define xdr_pmap		_xdr_pmap
-#define xdr_pmaplist		_xdr_pmaplist
-#define xdr_pointer		_xdr_pointer
-#define xdr_reference		_xdr_reference
-#define xdr_rejected_reply	_xdr_rejected_reply
-#define xdr_replymsg		_xdr_replymsg
-#define xdr_rmtcall_args	_xdr_rmtcall_args
-#define xdr_rmtcallres		_xdr_rmtcallres
-#define xdr_rpcb		_xdr_rpcb
-#define xdr_rpcb_entry		_xdr_rpcb_entry
-#define xdr_rpcb_entry_list_ptr	_xdr_rpcb_entry_list_ptr
-#define xdr_rpcb_rmtcallargs	_xdr_rpcb_rmtcallargs
-#define xdr_rpcb_rmtcallres	_xdr_rpcb_rmtcallres
-#define xdr_rpcb_stat		_xdr_rpcb_stat
-#define xdr_rpcb_stat_byvers	_xdr_rpcb_stat_byvers
-#define xdr_rpcblist		_xdr_rpcblist
-#define xdr_rpcblist_ptr	_xdr_rpcblist_ptr
-#define xdr_rpcbs_addrlist	_xdr_rpcbs_addrlist
-#define xdr_rpcbs_addrlist_ptr	_xdr_rpcbs_addrlist_ptr
-#define xdr_rpcbs_proc		_xdr_rpcbs_proc
-#define xdr_rpcbs_rmtcalllist	_xdr_rpcbs_rmtcalllist
-#define xdr_rpcbs_rmtcalllist_ptr	_xdr_rpcbs_rmtcalllist_ptr
-#define xdr_rpcbs		_xdr_rpcbs
-#define xdr_rpcbs		_xdr_rpcbs
-#define xdr_short		_xdr_short
-#define xdr_sizeof		_xdr_sizeof
-#define xdr_string		_xdr_string
-#define xdr_u_char		_xdr_u_char
-#define	xdr_u_hyper		_xdr_u_hyper
-#define xdr_u_int		_xdr_u_int
-#define xdr_u_int16_t		_xdr_u_int16_t
-#define xdr_u_int32_t		_xdr_u_int32_t
-#define xdr_u_int64_t		_xdr_u_int64_t
-#define xdr_u_long		_xdr_u_long
-#define	xdr_u_longlong_t	_xdr_u_longlong_t
-#define xdr_u_short		_xdr_u_short
-#define xdr_union		_xdr_union
-#define xdr_vector		_xdr_vector
-#define xdr_void		_xdr_void
-#define xdr_wrapstring		_xdr_wrapstring
-#define xdr_yp_inaddr		_xdr_yp_inaddr
-#define xdr_ypall		_xdr_ypall
-#define xdr_ypbind_resp		_xdr_ypbind_resp
-#define xdr_ypbind_setdom	_xdr_ypbind_setdom
-#define xdr_ypdomain_wrap_string	_xdr_ypdomain_wrap_string
-#define xdr_ypmap_parms		_xdr_ypmap_parms
-#define xdr_ypmap_wrap_string	_xdr_ypmap_wrap_string
-#define xdr_ypmaplist		_xdr_ypmaplist
-#define xdr_ypowner_wrap_string _xdr_ypowner_wrap_string
-#define xdr_yppushresp_xfr	_xdr_yppushresp_xfr
-#define xdr_ypreq_key		_xdr_ypreq_key
-#define xdr_ypreq_nokey		_xdr_ypreq_nokey
-#define xdr_ypreq_xfr		_xdr_ypreq_xfr
-#define xdr_ypresp_key_val	_xdr_ypresp_key_val
-#define xdr_ypresp_maplist	_xdr_ypresp_maplist
-#define xdr_ypresp_master	_xdr_ypresp_master
-#define xdr_ypresp_order	_xdr_ypresp_order
-#define xdr_ypresp_val		_xdr_ypresp_val
-#define xdrmem_create		_xdrmem_create
-#define xdrrec_create		_xdrrec_create
-#define xdrrec_endofrecord	_xdrrec_endofrecord
-#define xdrrec_eof		_xdrrec_eof
-#define xdrrec_skiprecord	_xdrrec_skiprecord
-#define xdrstdio_create		_xdrstdio_create
-#define xprt_register		_xprt_register
-#define xprt_unregister		_xprt_unregister
-#define yp_all			_yp_all
-#define yp_bind			_yp_bind
-#define yp_first		_yp_first
-#define yp_get_default_domain	_yp_get_default_domain
-#define yp_maplist		_yp_maplist
-#define yp_master		_yp_master
-#define yp_match		_yp_match
-#define yp_next			_yp_next
-#define yp_order		_yp_order
-#define yp_unbind		_yp_unbind
-#define yperr_string		_yperr_string
-#define ypprot_err		_ypprot_err
-#define yp_setbindtries		_yp_setbindtries
-#define dlopen			__dlopen
-#define dlclose			__dlclose
-#define dlsym			__dlsym
-#define dlerror			__dlerror
-#define dladdr			__dladdr
-#define fmtcheck		__fmtcheck
-
-/* RB trees */
-#define	rb_tree_init		_rb_tree_init
-#define	rb_tree_find_node	_rb_tree_find_node
-#define	rb_tree_find_node_geq	_rb_tree_find_node_geq
-#define	rb_tree_find_node_leq	_rb_tree_find_node_leq
-#define	rb_tree_insert_node	_rb_tree_insert_node
-#define	rb_tree_remove_node	_rb_tree_remove_node
-#define	rb_tree_iterate		_rb_tree_iterate
-#ifdef RBDEBUG
-#define	rb_tree_check		_rb_tree_check
-#define	rb_tree_depths		_rb_tree_depths
-#endif
-
-/* rpc locks */
-#define authdes_lock		__rpc_authdes_lock
-#define authnone_lock		__rpc_authnone_lock
-#define authsvc_lock		__rpc_authsvc_lock
-#define clnt_fd_lock		__rpc_clnt_fd_lock
-#define clntraw_lock		__rpc_clntraw_lock
-#define dname_lock		__rpc_dname_lock
-#define dupreq_lock		__rpc_dupreq_lock
-#define keyserv_lock		__rpc_keyserv_lock
-#define libnsl_trace_lock	__rpc_libnsl_trace_lock
-#define loopnconf_lock		__rpc_loopnconf_lock
-#define ops_lock		__rpc_ops_lock
-#define portnum_lock		__rpc_portnum_lock
-#define proglst_lock		__rpc_proglst_lock
-#define rpcbaddr_cache_lock	__rpc_rpcbaddr_cache_lock
-#define rpcsoc_lock		__rpc_rpcsoc_lock
-#define svc_fd_lock		__rpc_svc_fd_lock
-#define svc_lock		__rpc_svc_lock
-#define svcraw_lock		__rpc_svcraw_lock
-#define xprtlist_lock		__rpc_xprtlist_lock
-
-#define __learn_tree		___learn_tree
-
-#if defined(__minix)
-#define sprofile _sprofile	/* LSC: Is this really needed? */
-
-/* Needed to allow RS and VM to provide their own implementations. */
-#define munmap			_munmap
-
-#endif /* defined(__minix) */
-#endif /* __weak_alias */
-#endif /* !__lint__ */
-
-#endif /* _NAMESPACE_H_ */
diff --git a/lib/libc/include/pathnames.h b/lib/libc/include/pathnames.h
deleted file mode 100644
index 5705c6838..000000000
--- a/lib/libc/include/pathnames.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*	$NetBSD: pathnames.h,v 1.6 2008/05/29 14:51:25 mrg Exp $	*/
-
-/*
- * Copyright (c) 1997 Matthew R. Green
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-#ifdef RESCUEDIR
-#define	_PATH_BIN_RCMD	RESCUEDIR "/rcmd"
-#else
-#define	_PATH_BIN_RCMD	"/bin/rcmd"
-#endif
diff --git a/lib/libc/include/port_after.h b/lib/libc/include/port_after.h
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/libc/include/port_before.h b/lib/libc/include/port_before.h
deleted file mode 100644
index c87338979..000000000
--- a/lib/libc/include/port_before.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "namespace.h"
-#include <sys/cdefs.h>
-#define ISC_FORMAT_PRINTF(a,b) __attribute__((__format__(__printf__,a,b)))
-#define ISC_SOCKLEN_T	socklen_t
-#ifdef __minix
-#define DE_CONST(c,v)	v = __UNCONST(c)
-#else
-#define DE_CONST(c,v)	v = ((c) ? \
-	strchr((const void *)(c), *(const char *)(const void *)(c)) : NULL)
-#endif
-#ifndef lint
-#define UNUSED(a)	(void)&a
-#else
-#define UNUSED(a)	a = a
-#endif
diff --git a/lib/libc/include/reentrant.h b/lib/libc/include/reentrant.h
deleted file mode 100644
index 55be7f022..000000000
--- a/lib/libc/include/reentrant.h
+++ /dev/null
@@ -1,353 +0,0 @@
-/*	$NetBSD: reentrant.h,v 1.18 2015/01/20 18:31:25 christos Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin, by Nathan J. Williams, and by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Requirements:
- * 
- * 1. The thread safe mechanism should be lightweight so the library can
- *    be used by non-threaded applications without unreasonable overhead.
- * 
- * 2. There should be no dependency on a thread engine for non-threaded
- *    applications.
- * 
- * 3. There should be no dependency on any particular thread engine.
- * 
- * 4. The library should be able to be compiled without support for thread
- *    safety.
- * 
- * 
- * Rationale:
- * 
- * One approach for thread safety is to provide discrete versions of the
- * library: one thread safe, the other not.  The disadvantage of this is
- * that libc is rather large, and two copies of a library which are 99%+
- * identical is not an efficent use of resources.
- * 
- * Another approach is to provide a single thread safe library.  However,
- * it should not add significant run time or code size overhead to non-
- * threaded applications.
- * 
- * Since the NetBSD C library is used in other projects, it should be
- * easy to replace the mutual exclusion primitives with ones provided by
- * another system.  Similarly, it should also be easy to remove all
- * support for thread safety completely if the target environment does
- * not support threads.
- * 
- * 
- * Implementation Details:
- * 
- * The thread primitives used by the library (mutex_t, mutex_lock, etc.)
- * are macros which expand to the cooresponding primitives provided by
- * the thread engine or to nothing.  The latter is used so that code is
- * not unreasonably cluttered with #ifdefs when all thread safe support
- * is removed.
- * 
- * The thread macros can be directly mapped to the mutex primitives from
- * pthreads, however it should be reasonably easy to wrap another mutex
- * implementation so it presents a similar interface.
- * 
- * The thread functions operate by dispatching to symbols which are, by
- * default, weak-aliased to no-op functions in thread-stub/thread-stub.c
- * (some uses of thread operations are conditional on __isthreaded, but
- * not all of them are).
- *
- * When the thread library is linked in, it provides strong-alias versions
- * of those symbols which dispatch to its own real thread operations.
- *
- */
-
-#if !defined(__minix) || !defined(_LIBC_REENTRANT_H)
-#ifdef __minix
-/*
- * If _REENTRANT is not defined, the header may not be included more than once.
- * This is probably a NetBSD libc bug, but for now we solve it for MINIX3 only.
- */
-#define _LIBC_REENTRANT_H
-#endif /* __minix */
-
-/*
- * Abstract thread interface for thread-safe libraries.  These routines
- * will use stubs in libc if the application is not linked against the
- * pthread library, and the real function in the pthread library if it
- * is.
- */
-
-#ifndef __minix
-
-#include <pthread.h>
-#include <signal.h>
-
-#define	mutex_t			pthread_mutex_t
-#define	MUTEX_INITIALIZER	PTHREAD_MUTEX_INITIALIZER
-
-#define	mutexattr_t		pthread_mutexattr_t
-
-#define	MUTEX_TYPE_NORMAL	PTHREAD_MUTEX_NORMAL
-#define	MUTEX_TYPE_ERRORCHECK	PTHREAD_MUTEX_ERRORCHECK
-#define	MUTEX_TYPE_RECURSIVE	PTHREAD_MUTEX_RECURSIVE
-
-#define	cond_t			pthread_cond_t
-#define	COND_INITIALIZER	PTHREAD_COND_INITIALIZER
-
-#define	condattr_t		pthread_condattr_t
-
-#define	rwlock_t		pthread_rwlock_t
-#define	RWLOCK_INITIALIZER	PTHREAD_RWLOCK_INITIALIZER
-
-#define	rwlockattr_t		pthread_rwlockattr_t
-
-#define	thread_key_t		pthread_key_t
-
-#define	thr_t			pthread_t
-
-#define	thrattr_t		pthread_attr_t
-
-#define	once_t			pthread_once_t
-#define	ONCE_INITIALIZER	PTHREAD_ONCE_INIT
-
-#else /* __minix */
-
-typedef struct {
-	int pto_done;
-} once_t;
-#define ONCE_INITIALIZER	{ .pto_done = 0 }
-
-#endif /* __minix */
-
-#ifdef _REENTRANT
-
-#ifndef __LIBC_THREAD_STUBS
-
-__BEGIN_DECLS
-int	__libc_mutex_init(mutex_t *, const mutexattr_t *);
-int	__libc_mutex_lock(mutex_t *);
-int	__libc_mutex_trylock(mutex_t *);
-int	__libc_mutex_unlock(mutex_t *);
-int	__libc_mutex_destroy(mutex_t *);
-
-int	__libc_mutexattr_init(mutexattr_t *);
-int	__libc_mutexattr_settype(mutexattr_t *, int);
-int	__libc_mutexattr_destroy(mutexattr_t *);
-__END_DECLS
-
-#define	mutex_init(m, a)	__libc_mutex_init((m), (a))
-#define	mutex_lock(m)		__libc_mutex_lock((m))
-#define	mutex_trylock(m)	__libc_mutex_trylock((m))
-#define	mutex_unlock(m)		__libc_mutex_unlock((m))
-#define	mutex_destroy(m)	__libc_mutex_destroy((m))
-
-#define	mutexattr_init(ma)	__libc_mutexattr_init((ma))
-#define	mutexattr_settype(ma, t) __libc_mutexattr_settype((ma), (t))
-#define	mutexattr_destroy(ma)	__libc_mutexattr_destroy((ma))
-
-__BEGIN_DECLS
-int	__libc_cond_init(cond_t *, const condattr_t *);
-int	__libc_cond_signal(cond_t *);
-int	__libc_cond_broadcast(cond_t *);
-int	__libc_cond_wait(cond_t *, mutex_t *);
-#ifndef __LIBC12_SOURCE__
-int	__libc_cond_timedwait(cond_t *, mutex_t *, const struct timespec *);
-#endif
-int	__libc_cond_destroy(cond_t *);
-__END_DECLS
-
-#define	cond_init(c, t, a)     	__libc_cond_init((c), (a))
-#define	cond_signal(c)		__libc_cond_signal((c))
-#define	cond_broadcast(c)	__libc_cond_broadcast((c))
-#define	cond_wait(c, m)		__libc_cond_wait((c), (m))
-#define	cond_timedwait(c, m, t)	__libc_cond_timedwait((c), (m), (t))
-#define	cond_destroy(c)		__libc_cond_destroy((c))
-
-__BEGIN_DECLS
-int	__libc_rwlock_init(rwlock_t *, const rwlockattr_t *);
-int	__libc_rwlock_rdlock(rwlock_t *);
-int	__libc_rwlock_wrlock(rwlock_t *);
-int	__libc_rwlock_tryrdlock(rwlock_t *);
-int	__libc_rwlock_trywrlock(rwlock_t *);
-int	__libc_rwlock_unlock(rwlock_t *);
-int	__libc_rwlock_destroy(rwlock_t *);
-__END_DECLS
-
-#define	rwlock_init(l, a)	__libc_rwlock_init((l), (a))
-#define	rwlock_rdlock(l)	__libc_rwlock_rdlock((l))
-#define	rwlock_wrlock(l)	__libc_rwlock_wrlock((l))
-#define	rwlock_tryrdlock(l)	__libc_rwlock_tryrdlock((l))
-#define	rwlock_trywrlock(l)	__libc_rwlock_trywrlock((l))
-#define	rwlock_unlock(l)	__libc_rwlock_unlock((l))
-#define	rwlock_destroy(l)	__libc_rwlock_destroy((l))
-
-__BEGIN_DECLS
-int	__libc_thr_keycreate(thread_key_t *, void (*)(void *));
-int	__libc_thr_setspecific(thread_key_t, const void *);
-void	*__libc_thr_getspecific(thread_key_t);
-int	__libc_thr_keydelete(thread_key_t);
-__END_DECLS
-
-#define	thr_keycreate(k, d)	__libc_thr_keycreate((k), (d))
-#define	thr_setspecific(k, p)	__libc_thr_setspecific((k), (p))
-#define	thr_getspecific(k)	__libc_thr_getspecific((k))
-#define	thr_keydelete(k)	__libc_thr_keydelete((k))
-
-__BEGIN_DECLS
-int	__libc_thr_once(once_t *, void (*)(void));
-int	__libc_thr_sigsetmask(int, const sigset_t *, sigset_t *);
-thr_t	__libc_thr_self(void);
-int	__libc_thr_yield(void);
-void	__libc_thr_create(thr_t *, const thrattr_t *,
-	    void *(*)(void *), void *);
-void	__libc_thr_exit(void *) __attribute__((__noreturn__));
-int	*__libc_thr_errno(void);
-int	__libc_thr_setcancelstate(int, int *);
-unsigned int	__libc_thr_curcpu(void);
-
-extern int __isthreaded;
-__END_DECLS
-
-#define	thr_once(o, f)		__libc_thr_once((o), (f))
-#define	thr_sigsetmask(f, n, o)	__libc_thr_sigsetmask((f), (n), (o))
-#define	thr_self()		__libc_thr_self()
-#define	thr_yield()		__libc_thr_yield()
-#define	thr_create(tp, ta, f, a) __libc_thr_create((tp), (ta), (f), (a))
-#define	thr_exit(v)		__libc_thr_exit((v))
-#define	thr_errno()		__libc_thr_errno()
-#define	thr_enabled()		(__isthreaded)
-#define thr_setcancelstate(n, o) __libc_thr_setcancelstate((n),(o))
-#define thr_curcpu()		__libc_thr_curcpu()
-
-#else /* __LIBC_THREAD_STUBS */
-
-__BEGIN_DECLS
-void	__libc_thr_init_stub(void);
-
-int	__libc_mutex_init_stub(mutex_t *, const mutexattr_t *);
-int	__libc_mutex_lock_stub(mutex_t *);
-int	__libc_mutex_trylock_stub(mutex_t *);
-int	__libc_mutex_unlock_stub(mutex_t *);
-int	__libc_mutex_destroy_stub(mutex_t *);
-
-int	__libc_mutexattr_init_stub(mutexattr_t *); 
-int	__libc_mutexattr_destroy_stub(mutexattr_t *);
-int	__libc_mutexattr_settype_stub(mutexattr_t *, int);
-
-int	__libc_cond_init_stub(cond_t *, const condattr_t *);
-int	__libc_cond_signal_stub(cond_t *);
-int	__libc_cond_broadcast_stub(cond_t *);
-int	__libc_cond_wait_stub(cond_t *, mutex_t *);
-int	__libc_cond_timedwait_stub(cond_t *, mutex_t *,
-				   const struct timespec *);
-int	__libc_cond_destroy_stub(cond_t *);
-
-int	__libc_rwlock_init_stub(rwlock_t *, const rwlockattr_t *);
-int	__libc_rwlock_rdlock_stub(rwlock_t *);
-int	__libc_rwlock_wrlock_stub(rwlock_t *);
-int	__libc_rwlock_tryrdlock_stub(rwlock_t *);
-int	__libc_rwlock_trywrlock_stub(rwlock_t *);
-int	__libc_rwlock_unlock_stub(rwlock_t *);
-int	__libc_rwlock_destroy_stub(rwlock_t *);
-
-int	__libc_thr_keycreate_stub(thread_key_t *, void (*)(void *));
-int	__libc_thr_setspecific_stub(thread_key_t, const void *);
-void	*__libc_thr_getspecific_stub(thread_key_t);
-int	__libc_thr_keydelete_stub(thread_key_t);
-
-int	__libc_thr_once_stub(once_t *, void (*)(void));
-int	__libc_thr_sigsetmask_stub(int, const sigset_t *, sigset_t *);
-thr_t	__libc_thr_self_stub(void);
-int	__libc_thr_yield_stub(void);
-int	__libc_thr_create_stub(thr_t *, const thrattr_t *,
-	    void *(*)(void *), void *);
-void	__libc_thr_exit_stub(void *) __dead;
-int	*__libc_thr_errno_stub(void);
-int	__libc_thr_setcancelstate_stub(int, int *);
-int	__libc_thr_equal_stub(pthread_t, pthread_t);
-unsigned int	__libc_thr_curcpu_stub(void);
-__END_DECLS
-
-#endif /* __LIBC_THREAD_STUBS */
-
-#define	FLOCKFILE(fp)		__flockfile_internal(fp, 1)
-#define	FUNLOCKFILE(fp)		__funlockfile_internal(fp, 1)
-
-#else /* _REENTRANT */
-
-#ifndef __empty
-#define __empty do {} while (/*CONSTCOND*/0)
-#endif
-#define	mutex_init(m, a) __empty
-#define	mutex_lock(m) __empty
-#define	mutex_trylock(m) __empty
-#define	mutex_unlock(m)	__empty
-#define	mutex_destroy(m) __empty
-
-#define	cond_init(c, t, a) __empty
-#define	cond_signal(c) __empty
-#define	cond_broadcast(c) __empty
-#define	cond_wait(c, m) __empty
-#define	cond_timedwait(c, m, t) __empty
-#define	cond_destroy(c) __empty
-
-#define	rwlock_init(l, a) __empty
-#define	rwlock_rdlock(l) __empty
-#define	rwlock_wrlock(l) __empty
-#define	rwlock_tryrdlock(l) __empty
-#define	rwlock_trywrlock(l) __empty
-#define	rwlock_unlock(l) __empty
-#define	rwlock_destroy(l) __empty
-
-#define	thr_keycreate(k, d) /*LINTED*/0
-#define	thr_setspecific(k, p) __empty
-#define	thr_getspecific(k) /*LINTED*/0
-#define	thr_keydelete(k) __empty
-
-#define	mutexattr_init(ma) __empty
-#define	mutexattr_settype(ma, t) __empty
-#define	mutexattr_destroy(ma) __empty
-
-static inline int
-thr_once(once_t *once_control, void (*routine)(void))
-{
-	if (__predict_false(once_control->pto_done == 0)) {
-		(*routine)();
-		once_control->pto_done = 1;
-	}
-	return 0;
-}
-#define	thr_sigsetmask(f, n, o)	__empty
-#define	thr_self() __empty
-#define	thr_errno() __empty
-#define	thr_curcpu()		((unsigned int)0)
-
-#define	FLOCKFILE(fp) __empty
-#define	FUNLOCKFILE(fp) __empty
-
-#endif /* _REENTRANT */
-
-#endif /* !defined(__minix) || !defined(_LIBC_REENTRANT_H) */
diff --git a/lib/libc/include/resolv_mt.h b/lib/libc/include/resolv_mt.h
deleted file mode 100644
index 73a8dcc18..000000000
--- a/lib/libc/include/resolv_mt.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: resolv_mt.h,v 1.1.1.3 2009/04/12 16:35:44 christos Exp $	*/
-
-#ifndef _RESOLV_MT_H
-#define _RESOLV_MT_H
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-
-/* Access functions for the libresolv private interface */
-
-int	__res_enable_mt(void);
-int	__res_disable_mt(void);
-
-/* Per-thread context */
-
-typedef struct {
-int	no_hosts_fallback_private;
-int	retry_save;
-int	retry_private;
-char	inet_nsap_ntoa_tmpbuf[255*3];
-char	sym_ntos_unname[20];
-char	sym_ntop_unname[20];
-char	p_option_nbuf[40];
-char	p_time_nbuf[40];
-char	precsize_ntoa_retbuf[sizeof "90000000.00"];
-char	loc_ntoa_tmpbuf[sizeof
-"1000 60 60.000 N 1000 60 60.000 W -12345678.00m 90000000.00m 90000000.00m 90000000.00m"];
-char	p_secstodate_output[15];
-} mtctxres_t;
-
-/* Thread-specific data (TSD) */
-
-mtctxres_t	*___mtctxres(void);
-#define mtctxres	(___mtctxres())
-
-/* Various static data that should be TSD */
-
-#define sym_ntos_unname		(mtctxres->sym_ntos_unname)
-#define sym_ntop_unname		(mtctxres->sym_ntop_unname)
-#define inet_nsap_ntoa_tmpbuf	(mtctxres->inet_nsap_ntoa_tmpbuf)
-#define p_option_nbuf		(mtctxres->p_option_nbuf)
-#define p_time_nbuf		(mtctxres->p_time_nbuf)
-#define precsize_ntoa_retbuf	(mtctxres->precsize_ntoa_retbuf)
-#define loc_ntoa_tmpbuf		(mtctxres->loc_ntoa_tmpbuf)
-#define p_secstodate_output	(mtctxres->p_secstodate_output)
-
-#endif /* _RESOLV_MT_H */
diff --git a/lib/libc/inet/Makefile.inc b/lib/libc/inet/Makefile.inc
deleted file mode 100644
index 28cf81625..000000000
--- a/lib/libc/inet/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2014/01/16 20:31:43 christos Exp $
-
-# net sources
-.PATH: ${.CURDIR}/inet
-
-SRCS+=	inet_addr.c inet_cidr_ntop.c \
-	inet_cidr_pton.c inet_lnaof.c inet_makeaddr.c \
-	inet_net_ntop.c inet_net_pton.c inet_neta.c inet_netof.c \
-	inet_network.c inet_ntoa.c inet_ntop.c inet_pton.c nsap_addr.c
diff --git a/lib/libc/inet/inet.3 b/lib/libc/inet/inet.3
deleted file mode 100644
index d028c5e7b..000000000
--- a/lib/libc/inet/inet.3
+++ /dev/null
@@ -1,401 +0,0 @@
-.\"	$NetBSD: inet.3,v 1.5 2012/07/25 14:51:15 ginsbach Exp $
-.\"
-.\" Copyright (c) 1983, 1990, 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. 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.
-.\"
-.\"     @(#)inet.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd July 25, 2012
-.Dt INET 3
-.Os
-.Sh NAME
-.Nm inet_addr ,
-.Nm inet_aton ,
-.Nm inet_lnaof ,
-.Nm inet_makeaddr ,
-.Nm inet_netof ,
-.Nm inet_network ,
-.Nm inet_ntoa ,
-.Nm inet_ntop ,
-.Nm inet_pton ,
-.Nm addr ,
-.Nm ntoa ,
-.Nm network
-.Nd Internet address manipulation routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In arpa/inet.h
-.Ft in_addr_t
-.Fn inet_addr "const char *cp"
-.Ft int
-.Fn inet_aton "const char *cp" "struct in_addr *addr"
-.Ft in_addr_t
-.Fn inet_lnaof "struct in_addr in"
-.Ft struct in_addr
-.Fn inet_makeaddr "in_addr_t net" "in_addr_t lna"
-.Ft in_addr_t
-.Fn inet_netof "struct in_addr in"
-.Ft in_addr_t
-.Fn inet_network "const char *cp"
-.Ft char *
-.Fn inet_ntoa "struct in_addr in"
-.Ft const char *
-.Fn inet_ntop "int af" "const void * restrict src" "char * restrict dst" "socklen_t size"
-.Ft int
-.Fn inet_pton "int af" "const char * restrict src" "void * restrict dst"
-.Sh DESCRIPTION
-The routines
-.Fn inet_aton ,
-.Fn inet_addr
-and
-.Fn inet_network
-interpret character strings representing
-numbers expressed in the Internet standard
-.Qq dotted quad
-notation.
-.Pp
-The
-.Fn inet_pton
-function converts a presentation format address (that is, printable form
-as held in a character string) to network format (usually a
-.Ft struct in_addr
-or some other internal binary representation, in network byte order).
-It returns 1 if the address was valid for the specified address family, or
-0 if the address wasn't parsable in the specified address family, or -1
-if some system error occurred (in which case
-.Va errno
-will have been set).
-This function is presently valid for
-.Dv AF_INET
-and
-.Dv AF_INET6 .
-.Pp
-The
-.Fn inet_aton
-routine interprets the specified character string as an Internet address,
-placing the address into the structure provided.
-It returns 1 if the string was successfully interpreted,
-or 0 if the string is invalid.
-.Pp
-The
-.Fn inet_addr
-and
-.Fn inet_network
-functions return numbers suitable for use
-as Internet addresses and Internet network
-numbers, respectively.
-.Pp
-The function
-.Fn inet_ntop
-converts an address from network format (usually a
-.Ft struct in_addr
-or some other binary form, in network byte order) to presentation format
-(suitable for external display purposes).
-It returns NULL if a system error occurs (in which case,
-.Va errno
-will have been set), or it returns a pointer to the destination string.
-The
-.Ar size
-parameter is the size of the
-.Ar buf
-argument.
-.Pp
-The routine
-.Fn inet_ntoa
-takes an Internet address and returns an
-.Tn ASCII
-string representing the address in
-.Qq dotted quad
-notation.
-.Pp
-The routine
-.Fn inet_makeaddr
-takes an Internet network number and a local network address (both in
-host order) and constructs an Internet address from it.
-Note that to convert only a single value to a
-.Ft struct in_addr
-form that value should be passed as the first parameter and
-.Ql 0L
-should be given for the second parameter.
-.Pp
-The routines
-.Fn inet_netof
-and
-.Fn inet_lnaof
-break apart Internet host addresses, returning the network number and
-local network address part, respectively (both in host order).
-.Pp
-All Internet addresses are returned in network
-order (bytes ordered from left to right).
-All network numbers and local address parts are
-returned as machine format integer values.
-.Sh INTERNET ADDRESSES (IP VERSION 4)
-Values specified using the
-.Qq dotted quad
-notation take one
-of the following forms:
-.Bd -literal -offset indent
-a.b.c.d
-a.b.c
-a.b
-a
-.Ed
-.Pp
-When four parts are specified, each is interpreted
-as a byte of data and assigned, from left to right,
-to the four bytes of an Internet address.
-Note that when an Internet address is viewed as a 32-bit
-integer quantity on a system that uses little-endian
-byte order (e.g.
-.Tn Intel i386, i486
-and
-.Tn Pentium
-processors) the bytes referred to above appear as
-.Dq Li d.c.b.a .
-That is, little-endian bytes are ordered from right to left.
-.Pp
-When a three part address is specified, the last
-part is interpreted as a 16-bit quantity and placed
-in the right-most two bytes of the network address.
-This makes the three part address format convenient
-for specifying Class B network addresses as
-.Dq Li 128.net.host .
-.Pp
-When a two part address is supplied, the last part
-is interpreted as a 24-bit quantity and placed in
-the right most three bytes of the network address.
-This makes the two part address format convenient
-for specifying Class A network addresses as
-.Dq Li net.host .
-.Pp
-When only one part is given, the value is stored
-directly in the network address without any byte
-rearrangement.
-.Pp
-All numbers supplied as
-.Dq parts
-in a
-.Qq dotted quad
-notation
-may be decimal, octal, or hexadecimal, as specified
-in the C language (i.e., a leading 0x or 0X implies
-hexadecimal; otherwise, a leading 0 implies octal;
-otherwise, the number is interpreted as decimal).
-.Sh INTERNET ADDRESSES (IP VERSION 6)
-In order to support scoped IPv6 addresses,
-the use of
-.Xr getaddrinfo 3
-and
-.Xr getnameinfo 3
-is recommended rather than the functions presented here.
-.Pp
-The presentation format of an IPv6 address is given in RFC 2373:
-.Pp
-There are three conventional forms for representing IPv6 addresses as
-text strings:
-.Bl -enum
-.It
-The preferred form is x:x:x:x:x:x:x:x, where the 'x's are the
-hexadecimal values of the eight 16-bit pieces of the address.
-Examples:
-.Bd -literal -offset indent
-FEDC:BA98:7654:3210:FEDC:BA98:7654:3210
-1080:0:0:0:8:800:200C:417A
-.Ed
-.Pp
-Note that it is not necessary to write the leading zeros in an
-individual field, but there must be at least one numeral in
-every field (except for the case described in 2).
-.It
-Due to the method of allocating certain styles of IPv6
-addresses, it will be common for addresses to contain long
-strings of zero bits.
-In order to make writing addresses
-containing zero bits easier, a special syntax is available to
-compress the zeros.
-The use of ``::'' indicates multiple groups of 16-bits of zeros.
-The ``::'' can only appear once in an address.
-The ``::'' can also be used to compress the leading
-and/or trailing zeros in an address.
-.Pp
-For example the following addresses:
-.Bd -literal -offset indent
-1080:0:0:0:8:800:200C:417A  a unicast address
-FF01:0:0:0:0:0:0:43         a multicast address
-0:0:0:0:0:0:0:1             the loopback address
-0:0:0:0:0:0:0:0             the unspecified addresses
-.Ed
-.Pp
-may be represented as:
-.Bd -literal -offset indent
-1080::8:800:200C:417A       a unicast address
-FF01::43                    a multicast address
-::1                         the loopback address
-::                          the unspecified addresses
-.Ed
-.It
-An alternative form that is sometimes more convenient when
-dealing with a mixed environment of IPv4 and IPv6 nodes is
-x:x:x:x:x:x:d.d.d.d, where the 'x's are the hexadecimal values
-of the six high-order 16-bit pieces of the address, and the 'd's
-are the decimal values of the four low-order 8-bit pieces of the
-address (standard IPv4 representation).
-Examples:
-.Bd -literal -offset indent
-0:0:0:0:0:0:13.1.68.3
-0:0:0:0:0:FFFF:129.144.52.38
-.Ed
-.Pp
-or in compressed form:
-.Bd -literal -offset indent
-::13.1.68.3
-::FFFF:129.144.52.38
-.Ed
-.El
-.Sh DIAGNOSTICS
-The constant
-.Dv INADDR_NONE
-is returned by
-.Fn inet_addr
-and
-.Fn inet_network
-for malformed requests.
-.Sh ERRORS
-The
-.Fn inet_ntop
-and
-.Fn inet_pton
-functions may fail with
-.Bl -tag -width Er
-.It Bq Er EAFNOSUPPORT
-The value of
-.Fa af
-was not
-.Dv AF_INET
-or
-.Dv AF_INET6 .
-.El
-.Pp
-The
-.Fn inet_ntop
-function may fail with
-.Bl -tag -width Er
-.It Bq Er ENOSPC
-The
-.Fa size
-indicated for
-.Fa dst
-was too small to store the presentation form of the network address.
-.El
-.Sh SEE ALSO
-.Xr byteorder 3 ,
-.Xr gethostbyname 3 ,
-.Xr getnetent 3 ,
-.Xr inet_net 3 ,
-.Xr hosts 5 ,
-.Xr networks 5
-.Rs
-.%R RFC 2373
-.%D July 1998
-.%T "IP Version 6 Addressing Architecture"
-.Re
-.Rs
-.%R RFC 3493
-.%D February 2003
-.%T "Basic Socket Interface Extensions for IPv6"
-.Re
-.Sh STANDARDS
-The
-.Fn inet_ntop
-and
-.Fn inet_pton
-functions conform to
-.St -p1003.1-2001 .
-Note that
-.Fn inet_pton
-does not accept 1-, 2-, or 3-part dotted addresses; all four parts
-must be specified.
-Additionally all four parts of a dotted address must be decimal.
-This is a narrower input set than that accepted by
-.Fn inet_aton .
-.Sh HISTORY
-The
-.Fn inet_addr ,
-.Fn inet_network ,
-.Fn inet_makeaddr ,
-.Fn inet_lnaof
-and
-.Fn inet_netof
-functions appeared in
-.Bx 4.2 .
-They were changed to use
-.Vt in_addr_t
-in place of
-.Vt unsigned long
-in
-.Nx 2.0 .
-The
-.Fn inet_aton
-and
-.Fn inet_ntoa
-functions appeared in
-.Bx 4.3 .
-The
-.Fn inet_pton
-and
-.Fn inet_ntop
-functions appeared in BIND 4.9.4 and thence
-.Nx 1.3 ;
-they were also in
-.St -xns5.2 .
-.Sh BUGS
-The value
-.Dv INADDR_NONE
-(0xffffffff) is a valid broadcast address, but
-.Fn inet_addr
-cannot return that value without indicating failure.
-The newer
-.Fn inet_aton
-function does not share this problem.
-.Pp
-The problem of host byte ordering versus network byte ordering is
-confusing.
-.Pp
-The string returned by
-.Fn inet_ntoa
-resides in a static memory area.
-.Pp
-The function
-.Fn inet_addr
-should return a
-.Vt struct in_addr .
-.Pp
-The function
-.Fn inet_network
-does not support byte rearrangement for one, two, and three
-part addresses.
diff --git a/lib/libc/inet/inet6_option_space.3 b/lib/libc/inet/inet6_option_space.3
deleted file mode 100644
index c6407ae3f..000000000
--- a/lib/libc/inet/inet6_option_space.3
+++ /dev/null
@@ -1,448 +0,0 @@
-.\"	$NetBSD: inet6_option_space.3,v 1.3 2010/03/22 19:30:54 joerg Exp $
-.\"	$KAME: inet6_option_space.3,v 1.7 2000/05/17 14:32:13 itojun Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\" 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.
-.\"
-.Dd December 10, 1999
-.Dt INET6_OPTION_SPACE 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_option_space ,
-.Nm inet6_option_init ,
-.Nm inet6_option_append ,
-.Nm inet6_option_alloc ,
-.Nm inet6_option_next ,
-.Nm inet6_option_find
-.Nd IPv6 Hop-by-Hop and Destination Options manipulation
-.\"
-.Sh SYNOPSIS
-.In netinet/in.h
-.Ft "int"
-.Fn inet6_option_space "int nbytes"
-.Ft "int"
-.Fn inet6_option_init "void *bp" "struct cmsghdr **cmsgp" "int type"
-.Ft "int"
-.Fn inet6_option_append "struct cmsghdr *cmsg" "const uint8_t *typep" "int multx" "int plusy"
-.Ft "uint8_t *"
-.Fn inet6_option_alloc "struct cmsghdr *cmsg" "int datalen" "int multx" "int plusy"
-.Ft "int"
-.Fn inet6_option_next "const struct cmsghdr *cmsg" "uint8_t **tptrp"
-.Ft "int"
-.Fn inet6_option_find "const struct cmsghdr *cmsg" "uint8_t **tptrp" "int type"
-.\"
-.Sh DESCRIPTION
-.\"
-Building and parsing the Hop-by-Hop and Destination options is
-complicated due to alignment constraints, padding and
-ancillary data manipulation.
-RFC 2292 defines a set of functions to help the application.
-The function prototypes for
-these functions are all in the
-.In netinet/in.h
-header.
-.\"
-.Ss inet6_option_space
-.Fn inet6_option_space
-returns the number of bytes required to hold an option when it is stored as
-ancillary data, including the
-.Li cmsghdr
-structure at the beginning,
-and any padding at the end
-.Po
-to make its size a multiple of 8 bytes
-.Pc .
-The argument is the size of the structure defining the option,
-which must include any pad bytes at the beginning
-.Po
-the value
-.Li y
-in the alignment term
-.Dq Li xn + y
-.Pc ,
-the type byte, the length byte, and the option data.
-.Pp
-Note: If multiple options are stored in a single ancillary data
-object, which is the recommended technique, this function
-overestimates the amount of space required by the size of
-.Li N-1
-.Li cmsghdr
-structures,
-where
-.Li N
-is the number of options to be stored in the object.
-This is of little consequence, since it is assumed that most
-Hop-by-Hop option headers and Destination option headers carry only
-one option
-.Pq appendix B of [RFC 2460] .
-.\"
-.Ss inet6_option_init
-.Fn inet6_option_init
-is called once per ancillary data object that will
-contain either Hop-by-Hop or Destination options.
-It returns
-.Li 0
-on success or
-.Li -1
-on an error.
-.Pp
-.Fa bp
-is a pointer to previously allocated space that will contain the
-ancillary data object.
-It must be large enough to contain all the
-individual options to be added by later calls to
-.Fn inet6_option_append
-and
-.Fn inet6_option_alloc .
-.Pp
-.Fa cmsgp
-is a pointer to a pointer to a
-.Li cmsghdr
-structure.
-.Fa *cmsgp
-is initialized by this function to point to the
-.Li cmsghdr
-structure constructed by this function in the buffer pointed to by
-.Fa bp .
-.Pp
-.Fa type
-is either
-.Dv IPV6_HOPOPTS
-or
-.Dv IPV6_DSTOPTS .
-This
-.Fa type
-is stored in the
-.Li cmsg_type
-member of the
-.Li cmsghdr
-structure pointed to by
-.Fa *cmsgp .
-.\"
-.Ss inet6_option_append
-This function appends a Hop-by-Hop option or a Destination option
-into an ancillary data object that has been initialized by
-.Fn inet6_option_init .
-This function returns
-.Li 0
-if it succeeds or
-.Li -1
-on an error.
-.Pp
-.Fa cmsg
-is a pointer to the
-.Li cmsghdr
-structure that must have been
-initialized by
-.Fn inet6_option_init .
-.Pp
-.Fa typep
-is a pointer to the 8-bit option type.
-It is assumed that this
-field is immediately followed by the 8-bit option data length field,
-which is then followed immediately by the option data.
-The caller
-initializes these three fields
-.Pq the type-length-value, or TLV
-before calling this function.
-.Pp
-The option type must have a value from
-.Li 2
-to
-.Li 255 ,
-inclusive.
-.Po
-.Li 0
-and
-.Li 1
-are reserved for the
-.Li Pad1
-and
-.Li PadN
-options, respectively.
-.Pc
-.Pp
-The option data length must have a value between
-.Li 0
-and
-.Li 255 ,
-inclusive, and is the length of the option data that follows.
-.Pp
-.Fa multx
-is the value
-.Li x
-in the alignment term
-.Dq Li xn + y .
-It must have a value of
-.Li 1 ,
-.Li 2 ,
-.Li 4 ,
-or
-.Li 8 .
-.Pp
-.Fa plusy
-is the value
-.Li y
-in the alignment term
-.Dq Li xn + y .
-It must have a value between
-.Li 0
-and
-.Li 7 ,
-inclusive.
-.\"
-.Ss inet6_option_alloc
-This function appends a Hop-by-Hop option or a Destination option
-into an ancillary data object that has been initialized by
-.Fn inet6_option_init .
-This function returns a pointer to the 8-bit
-option type field that starts the option on success, or
-.Dv NULL
-on an error.
-.Pp
-The difference between this function and
-.Fn inet6_option_append
-is that the latter copies the contents of a previously built option into
-the ancillary data object while the current function returns a
-pointer to the space in the data object where the option's TLV must
-then be built by the caller.
-.Pp
-.Fa cmsg
-is a pointer to the
-.Li cmsghdr
-structure that must have been
-initialized by
-.Fn inet6_option_init .
-.Pp
-.Fa datalen
-is the value of the option data length byte for this option.
-This value is required as an argument to allow the function to
-determine if padding must be appended at the end of the option.
-.Po
-The
-.Fn inet6_option_append
-function does not need a data length argument
-since the option data length must already be stored by the caller.
-.Pc
-.Pp
-.Fa multx
-is the value
-.Li x
-in the alignment term
-.Dq Li xn + y .
-It must have a value of
-.Li 1 ,
-.Li 2 ,
-.Li 4 ,
-or
-.Li 8 .
-.Pp
-.Fa plusy
-is the value
-.Li y
-in the alignment term
-.Dq Li xn + y .
-It must have a value between
-.Li 0
-and
-.Li 7 ,
-inclusive.
-.\"
-.Ss inet6_option_next
-This function processes the next Hop-by-Hop option or Destination
-option in an ancillary data object.
-If another option remains to be
-processed, the return value of the function is
-.Li 0
-and
-.Fa *tptrp
-points to
-the 8-bit option type field
-.Po
-which is followed by the 8-bit option
-data length, followed by the option data
-.Pc .
-If no more options remain
-to be processed, the return value is
-.Li -1
-and
-.Fa *tptrp
-is
-.Dv NULL .
-If an error occurs, the return value is
-.Li -1
-and
-.Fa *tptrp
-is not
-.Dv NULL .
-.Pp
-.Fa cmsg
-is a pointer to
-.Li cmsghdr
-structure of which
-.Li cmsg_level
-equals
-.Dv IPPROTO_IPV6
-and
-.Li cmsg_type
-equals either
-.Dv IPV6_HOPOPTS
-or
-.Dv IPV6_DSTOPTS .
-.Pp
-.Fa tptrp
-is a pointer to a pointer to an 8-bit byte and
-.Fa *tptrp
-is used
-by the function to remember its place in the ancillary data object
-each time the function is called.
-The first time this function is
-called for a given ancillary data object,
-.Fa *tptrp
-must be set to
-.Dv NULL .
-.Pp
-Each time this function returns success,
-.Fa *tptrp
-points to the 8-bit
-option type field for the next option to be processed.
-.\"
-.Ss inet6_option_find
-This function is similar to the previously described
-.Fn inet6_option_next
-function, except this function lets the caller
-specify the option type to be searched for, instead of always
-returning the next option in the ancillary data object.
-.Fa cmsg
-is a
-pointer to
-.Li cmsghdr
-structure of which
-.Li cmsg_level
-equals
-.Dv IPPROTO_IPV6
-and
-.Li cmsg_type
-equals either
-.Dv IPV6_HOPOPTS
-or
-.Dv IPV6_DSTOPTS .
-.Pp
-.Fa tptrp
-is a pointer to a pointer to an 8-bit byte and
-.Fa *tptrp
-is used
-by the function to remember its place in the ancillary data object
-each time the function is called.
-The first time this function is
-called for a given ancillary data object,
-.Fa *tptrp
-must be set to
-.Dv NULL .
-.Pa
-This function starts searching for an option of the specified type
-beginning after the value of
-.Fa *tptrp .
-If an option of the specified
-type is located, this function returns
-.Li 0
-and
-.Fa *tptrp
-points to the 8-
-bit option type field for the option of the specified type.
-If an
-option of the specified type is not located, the return value is
-.Li -1
-and
-.Fa *tptrp
-is
-.Dv NULL .
-If an error occurs, the return value is
-.Li -1
-and
-.Fa *tptrp
-is not
-.Dv NULL .
-.\"
-.Sh EXAMPLES
-RFC 2292 gives comprehensive examples in chapter 6.
-.\"
-.Sh DIAGNOSTICS
-.Fn inet6_option_init
-and
-.Fn inet6_option_append
-return
-.Li 0
-on success or
-.Li -1
-on an error.
-.Pp
-.Fn inet6_option_alloc
-returns
-.Dv NULL
-on an error.
-.Pp
-On errors,
-.Fn inet6_option_next
-and
-.Fn inet6_option_find
-return
-.Li -1
-setting
-.Fa *tptrp
-to non
-.Dv NULL
-value.
-.\"
-.Sh SEE ALSO
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%T "Advanced Sockets API for IPv6"
-.%N RFC 2292
-.%D February 1998
-.Re
-.Rs
-.%A S. Deering
-.%A R. Hinden
-.%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC 2460
-.%D December 1998
-.Re
-.\"
-.Sh STANDARDS
-The functions
-are documented in
-.Dq Advanced Sockets API for IPv6
-.Pq RFC 2292 .
-.\"
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
-.\"
-.Sh BUGS
-The text was shamelessly copied from RFC 2292.
diff --git a/lib/libc/inet/inet6_rthdr_space.3 b/lib/libc/inet/inet6_rthdr_space.3
deleted file mode 100644
index 50f852cc4..000000000
--- a/lib/libc/inet/inet6_rthdr_space.3
+++ /dev/null
@@ -1,321 +0,0 @@
-.\"	$NetBSD: inet6_rthdr_space.3,v 1.2 2010/03/22 19:30:54 joerg Exp $
-.\"	$KAME: inet6_rthdr_space.3,v 1.8 2000/05/17 14:30:15 itojun Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\" 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.
-.\"
-.Dd December 10, 1999
-.Dt INET6_RTHDR_SPACE 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_rthdr_space ,
-.Nm inet6_rthdr_init ,
-.Nm inet6_rthdr_add ,
-.Nm inet6_rthdr_lasthop ,
-.Nm inet6_rthdr_reverse ,
-.Nm inet6_rthdr_segments ,
-.Nm inet6_rthdr_getaddr ,
-.Nm inet6_rthdr_getflags
-.Nd IPv6 Routing Header Options manipulation
-.\"
-.Sh SYNOPSIS
-.In netinet/in.h
-.Ft size_t
-.Fn inet6_rthdr_space "int type" "int segments"
-.Ft "struct cmsghdr *"
-.Fn inet6_rthdr_init "void *bp" "int type"
-.Ft int
-.Fn inet6_rthdr_add "struct cmsghdr *cmsg" "const struct in6_addr *addr" "unsigned int flags"
-.Ft int
-.Fn inet6_rthdr_lasthop "struct cmsghdr *cmsg" "unsigned int flags"
-.Ft int
-.Fn inet6_rthdr_reverse "const struct cmsghdr *in" "struct cmsghdr *out"
-.Ft int
-.Fn inet6_rthdr_segments "const struct cmsghdr *cmsg"
-.Ft "struct in6_addr *"
-.Fn inet6_rthdr_getaddr "struct cmsghdr *cmsg" "int index"
-.Ft int
-.Fn inet6_rthdr_getflags "const struct cmsghdr *cmsg" "int index"
-.\"
-.Sh DESCRIPTION
-RFC 2292 IPv6 advanced API defines eight
-functions that the application calls to build and examine a Routing
-header.
-Four functions build a Routing header:
-.Bl -hang
-.It Fn inet6_rthdr_space
-return #bytes required for ancillary data
-.It Fn inet6_rthdr_init
-initialize ancillary data for Routing header
-.It Fn inet6_rthdr_add
-add IPv6 address \*[Am] flags to Routing header
-.It Fn inet6_rthdr_lasthop
-specify the flags for the final hop
-.El
-.Pp
-Four functions deal with a returned Routing header:
-.Bl -hang
-.It Fn inet6_rthdr_reverse
-reverse a Routing header
-.It Fn inet6_rthdr_segments
-return #segments in a Routing header
-.It Fn inet6_rthdr_getaddr
-fetch one address from a Routing header
-.It Fn inet6_rthdr_getflags
-fetch one flag from a Routing header
-.El
-.Pp
-The function prototypes for these functions are all in the
-.In netinet/in.h
-header.
-.\"
-.Ss inet6_rthdr_space
-This function returns the number of bytes required to hold a Routing
-header of the specified
-.Fa type
-containing the specified number of
-.Fa segments
-.Pq addresses .
-For an IPv6 Type 0 Routing header, the number
-of segments must be between 1 and 23, inclusive.
-The return value
-includes the size of the cmsghdr structure that precedes the Routing
-header, and any required padding.
-.Pp
-If the return value is 0, then either the type of the Routing header
-is not supported by this implementation or the number of segments is
-invalid for this type of Routing header.
-.Pp
-Note: This function returns the size but does not allocate the space
-required for the ancillary data.
-This allows an application to
-allocate a larger buffer, if other ancillary data objects are
-desired, since all the ancillary data objects must be specified to
-.Xr sendmsg 2
-as a single
-.Li msg_control
-buffer.
-.\"
-.Ss inet6_rthdr_init
-This function initializes the buffer pointed to by
-.Fa bp
-to contain a
-.Li cmsghdr
-structure followed by a Routing header of the specified
-.Fa type .
-The
-.Li cmsg_len
-member of the
-.Li cmsghdr
-structure is initialized to the
-size of the structure plus the amount of space required by the
-Routing header.
-The
-.Li cmsg_level
-and
-.Li cmsg_type
-members are also initialized as required.
-.Pp
-The caller must allocate the buffer and its size can be determined by
-calling
-.Fn inet6_rthdr_space .
-.Pp
-Upon success the return value is the pointer to the
-.Li cmsghdr
-structure, and this is then used as the first argument to the next
-two functions.
-Upon an error the return value is
-.Dv NULL .
-.\"
-.Ss inet6_rthdr_add
-This function adds the address pointed to by
-.Fa addr
-to the end of the
-Routing header being constructed and sets the type of this hop to the
-value of
-.Fa flags .
-For an IPv6 Type 0 Routing header,
-.Fa flags
-must be
-either
-.Dv IPV6_RTHDR_LOOSE
-or
-.Dv IPV6_RTHDR_STRICT .
-.Pp
-If successful, the
-.Li cmsg_len
-member of the
-.Li cmsghdr
-structure is
-updated to account for the new address in the Routing header and the
-return value of the function is 0.
-Upon an error the return value of
-the function is -1.
-.\"
-.Ss inet6_rthdr_lasthop
-This function specifies the Strict/Loose flag for the final hop of a
-Routing header.
-For an IPv6 Type 0 Routing header,
-.Fa flags
-must be either
-.Dv IPV6_RTHDR_LOOSE
-or
-.Dv IPV6_RTHDR_STRICT .
-.Pp
-The return value of the function is 0 upon success, or -1 upon an error.
-.Pp
-Notice that a Routing header specifying
-.Li N
-intermediate nodes requires
-.Li N+1
-Strict/Loose flags.
-This requires
-.Li N
-calls to
-.Fn inet6_rthdr_add
-followed by one call to
-.Fn inet6_rthdr_lasthop .
-.\"
-.Ss inet6_rthdr_reverse
-This function takes a Routing header that was received as ancillary
-data
-.Po
-pointed to by the first argument,
-.Fa in
-.Pc
-and writes a new Routing
-header that sends datagrams along the reverse of that route.
-Both
-arguments are allowed to point to the same buffer
-.Pq that is, the reversal can occur in place .
-.Pp
-The return value of the function is 0 on success, or -1 upon an
-error.
-.\"
-.Ss inet6_rthdr_segments
-This function returns the number of segments
-.Pq addresses
-contained in
-the Routing header described by
-.Fa cmsg .
-On success the return value is
-between 1 and 23, inclusive.
-The return value of the function is -1 upon an error.
-.\"
-.Ss inet6_rthdr_getaddr
-This function returns a pointer to the IPv6 address specified by
-.Fa index
-.Po
-which must have a value between 1 and the value returned by
-.Fn inet6_rthdr_segments
-.Pc
-in the Routing header described by
-.Fa cmsg .
-An
-application should first call
-.Fn inet6_rthdr_segments
-to obtain the number of segments in the Routing header.
-.Pp
-Upon an error the return value of the function is
-.Dv NULL .
-.\"
-.Ss inet6_rthdr_getflags
-This function returns the flags value specified by
-.Fa index
-.Po
-which must
-have a value between 0 and the value returned by
-.Fn inet6_rthdr_segments
-.Pc
-in the Routing header described by
-.Fa cmsg .
-For an IPv6 Type 0 Routing header the return value will be either
-.Dv IPV6_RTHDR_LOOSE
-or
-.Dv IPV6_RTHDR_STRICT .
-.Pp
-Upon an error the return value of the function is -1.
-.Pp
-Note: Addresses are indexed starting at 1, and flags starting at 0,
-to maintain consistency with the terminology and figures in RFC 2460.
-.\"
-.Sh EXAMPLES
-RFC 2292 gives comprehensive examples in chapter 8.
-.\"
-.Sh DIAGNOSTICS
-.Fn inet6_rthdr_space
-returns 0 on errors.
-.Pp
-.Fn inet6_rthdr_add ,
-.Fn inet6_rthdr_lasthop
-and
-.Fn inet6_rthdr_reverse
-return 0 on success, and returns -1 on error.
-.Pp
-.Fn inet6_rthdr_init
-and
-.Fn inet6_rthdr_getaddr
-return
-.Dv NULL
-on error.
-.Pp
-.Fn inet6_rthdr_segments
-and
-.Fn inet6_rthdr_getflags
-return -1 on error.
-.\"
-.Sh SEE ALSO
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%T "Advanced Sockets API for IPv6"
-.%N RFC 2292
-.%D February 1998
-.Re
-.Rs
-.%A S. Deering
-.%A R. Hinden
-.%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC 2460
-.%D December 1998
-.Re
-.\"
-.Sh STANDARDS
-The functions
-are documented in
-.Dq Advanced Sockets API for IPv6
-.Pq RFC 2292 .
-.\"
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
-.\"
-.Sh BUGS
-The text was shamelessly copied from RFC 2292.
-.Pp
-.Fn inet6_rthdr_reverse
-is not implemented yet.
diff --git a/lib/libc/inet/inet_cidr_ntop.c b/lib/libc/inet/inet_cidr_ntop.c
deleted file mode 100644
index 0f9202586..000000000
--- a/lib/libc/inet/inet_cidr_ntop.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*	$NetBSD: inet_cidr_ntop.c,v 1.8 2012/03/13 21:13:38 christos Exp $	*/
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1998,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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static const char rcsid[] = "Id: inet_cidr_ntop.c,v 1.7 2006/10/11 02:18:18 marka Exp";
-#else
-__RCSID("$NetBSD: inet_cidr_ntop.c,v 1.8 2012/03/13 21:13:38 christos Exp $");
-#endif
-#endif
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "port_after.h"
-
-#ifdef __weak_alias
-__weak_alias(inet_cidr_ntop,_inet_cidr_ntop)
-#endif
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static char *
-inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size);
-static char *
-inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size);
-
-/*%
- * char *
- * inet_cidr_ntop(af, src, bits, dst, size)
- *	convert network address from network to presentation format.
- *	"src"'s size is determined from its "af".
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	192.5.5.1/28 has a nonzero host part, which means it isn't a network
- *	as called for by inet_net_ntop() but it can be a host address with
- *	an included netmask.
- * author:
- *	Paul Vixie (ISC), October 1998
- */
-char *
-inet_cidr_ntop(int af, const void *src, int bits, char *dst, size_t size) {
-	switch (af) {
-	case AF_INET:
-		return (inet_cidr_ntop_ipv4(src, bits, dst, size));
-	case AF_INET6:
-		return (inet_cidr_ntop_ipv6(src, bits, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-}
-
-static int
-decoct(const u_char *src, size_t bytes, char *dst, size_t size) {
-	char *odst = dst;
-	char *t;
-	size_t b;
-
-	for (b = 1; b <= bytes; b++) {
-		if (size < sizeof "255.")
-			return (0);
-		t = dst;
-		dst += SPRINTF((dst, "%u", *src++));
-		if (b != bytes) {
-			*dst++ = '.';
-			*dst = '\0';
-		}
-		size -= (size_t)(dst - t);
-	}
-	_DIAGASSERT(__type_fit(int, dst - odst));
-	return (int)(dst - odst);
-}
-
-/*%
- * static char *
- * inet_cidr_ntop_ipv4(src, bits, dst, size)
- *	convert IPv4 network address from network to presentation format.
- *	"src"'s size is determined from its "af".
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0b11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), October 1998
- */
-static char *
-inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size) {
-	char *odst = dst;
-	size_t len = 4;
-	size_t b;
-	size_t bytes;
-
-	if ((bits < -1) || (bits > 32)) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/* Find number of significant bytes in address. */
-	if (bits == -1)
-		len = 4;
-	else
-		for (len = 1, b = 1 ; b < 4U; b++)
-			if (*(src + b))
-				len = b + 1;
-
-	/* Format whole octets plus nonzero trailing octets. */
-	bytes = (((bits <= 0) ? 1 : bits) + 7) / 8;
-	if (len > bytes)
-		bytes = len;
-	b = decoct(src, bytes, dst, size);
-	if (b == 0U)
-		goto emsgsize;
-	dst += b;
-	size -= b;
-
-	if (bits != -1) {
-		/* Format CIDR /width. */
-		if (size < sizeof "/32")
-			goto emsgsize;
-		dst += SPRINTF((dst, "/%u", bits));
-	}
-
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
- 
-static char *
-inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size) {
-	/*
-	 * Note that int32_t and int16_t need only be "at least" large enough
-	 * to contain a value of the specified size.  On some systems, like
-	 * Crays, there is no such thing as an integer variable with 16 bits.
-	 * Keep this in mind if you think this function should have been coded
-	 * to use pointer overlays.  All the world's not a VAX.
-	 */
-	char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255/128"];
-	char *tp;
-	struct { int base, len; } best, cur;
-	u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
-	int i;
-
-	if ((bits < -1) || (bits > 128)) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/*
-	 * Preprocess:
-	 *	Copy the input (bytewise) array into a wordwise array.
-	 *	Find the longest run of 0x00's in src[] for :: shorthanding.
-	 */
-	memset(words, '\0', sizeof words);
-	for (i = 0; i < NS_IN6ADDRSZ; i++)
-		words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
-	best.base = -1;
-	best.len = 0;
-	cur.base = -1;
-	cur.len = 0;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		if (words[i] == 0) {
-			if (cur.base == -1)
-				cur.base = i, cur.len = 1;
-			else
-				cur.len++;
-		} else {
-			if (cur.base != -1) {
-				if (best.base == -1 || cur.len > best.len)
-					best = cur;
-				cur.base = -1;
-			}
-		}
-	}
-	if (cur.base != -1) {
-		if (best.base == -1 || cur.len > best.len)
-			best = cur;
-	}
-	if (best.base != -1 && best.len < 2)
-		best.base = -1;
-
-	/*
-	 * Format the result.
-	 */
-	tp = tmp;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		/* Are we inside the best run of 0x00's? */
-		if (best.base != -1 && i >= best.base &&
-		    i < (best.base + best.len)) {
-			if (i == best.base)
-				*tp++ = ':';
-			continue;
-		}
-		/* Are we following an initial run of 0x00s or any real hex? */
-		if (i != 0)
-			*tp++ = ':';
-		/* Is this address an encapsulated IPv4? */
-		if (i == 6 && best.base == 0 && (best.len == 6 ||
-		    (best.len == 7 && words[7] != 0x0001) ||
-		    (best.len == 5 && words[5] == 0xffff))) {
-			size_t n;
-
-			if (src[15] || bits == -1 || bits > 120)
-				n = 4;
-			else if (src[14] || bits > 112)
-				n = 3;
-			else
-				n = 2;
-			n = decoct(src+12, n, tp, sizeof tmp - (tp - tmp));
-			if (n == 0) {
-				errno = EMSGSIZE;
-				return (NULL);
-			}
-			tp += strlen(tp);
-			break;
-		}
-		tp += SPRINTF((tp, "%x", words[i]));
-	}
-
-	/* Was it a trailing run of 0x00's? */
-	if (best.base != -1 && (best.base + best.len) == 
-	    (NS_IN6ADDRSZ / NS_INT16SZ))
-		*tp++ = ':';
-	*tp = '\0';
-
-	if (bits != -1)
-		tp += SPRINTF((tp, "/%u", bits));
-
-	/*
-	 * Check for overflow, copy, and we're done.
-	 */
-	if ((size_t)(tp - tmp) > size) {
-		errno = EMSGSIZE;
-		return (NULL);
-	}
-	strcpy(dst, tmp);
-	return (dst);
-}
-
-/*! \file */
diff --git a/lib/libc/inet/inet_cidr_pton.c b/lib/libc/inet/inet_cidr_pton.c
deleted file mode 100644
index 2911f45f2..000000000
--- a/lib/libc/inet/inet_cidr_pton.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*	$NetBSD: inet_cidr_pton.c,v 1.8 2012/03/20 17:08:13 matt Exp $	*/
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1998,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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static const char rcsid[] = "Id: inet_cidr_pton.c,v 1.6 2005/04/27 04:56:19 sra Exp";
-#else
-__RCSID("$NetBSD: inet_cidr_pton.c,v 1.8 2012/03/20 17:08:13 matt Exp $");
-#endif
-#endif
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <isc/assertions.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-#ifdef __weak_alias
-__weak_alias(inet_cidr_pton,_inet_cidr_pton)
-#endif
-
-static int	inet_cidr_pton_ipv4(const char *src, u_char *dst,
-					 int *bits, int ipv6);
-static int	inet_cidr_pton_ipv6(const char *src, u_char *dst, int *bits);
-
-static int	getbits(const char *, int ipv6);
-
-/*%
- * int
- * inet_cidr_pton(af, src, dst, *bits)
- *	convert network address from presentation to network format.
- *	accepts inet_pton()'s input for this "af" plus trailing "/CIDR".
- *	"dst" is assumed large enough for its "af".  "bits" is set to the
- *	/CIDR prefix length, which can have defaults (like /32 for IPv4).
- * return:
- *	-1 if an error occurred (inspect errno; ENOENT means bad format).
- *	0 if successful conversion occurred.
- * note:
- *	192.5.5.1/28 has a nonzero host part, which means it isn't a network
- *	as called for by inet_net_pton() but it can be a host address with
- *	an included netmask.
- * author:
- *	Paul Vixie (ISC), October 1998
- */
-int
-inet_cidr_pton(int af, const char *src, void *dst, int *bits) {
-	switch (af) {
-	case AF_INET:
-		return (inet_cidr_pton_ipv4(src, dst, bits, 0));
-	case AF_INET6:
-		return (inet_cidr_pton_ipv6(src, dst, bits));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-}
-
-static const char digits[] = "0123456789";
-
-static int
-inet_cidr_pton_ipv4(const char *src, u_char *dst, int *pbits, int ipv6) {
-	const u_char *odst = dst;
-	int ch, bits;
-	ptrdiff_t n, tmp;
-	size_t size = 4;
-
-	/* Get the mantissa. */
-	while (ch = *src++, (isascii(ch) && isdigit(ch))) {
-		tmp = 0;
-		do {
-			n = strchr(digits, ch) - digits;
-			INSIST(n >= 0 && n <= 9);
-			tmp *= 10;
-			tmp += n;
-			if (tmp > 255)
-				goto enoent;
-		} while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch));
-		if (size-- == 0U)
-			goto emsgsize;
-		*dst++ = (u_char) tmp;
-		if (ch == '\0' || ch == '/')
-			break;
-		if (ch != '.')
-			goto enoent;
-	}
-
-	/* Get the prefix length if any. */
-	bits = -1;
-	if (ch == '/' && dst > odst) {
-		bits = getbits(src, ipv6);
-		if (bits == -2)
-			goto enoent;
-	} else if (ch != '\0')
-		goto enoent;
-
-	/* Prefix length can default to /32 only if all four octets spec'd. */
-	if (bits == -1) {
-		if (dst - odst == 4)
-			bits = ipv6 ? 128 : 32;
-		else
-			goto enoent;
-	}
-
-	/* If nothing was written to the destination, we found no address. */
-	if (dst == odst)
-		goto enoent;
-
-	/* If prefix length overspecifies mantissa, life is bad. */
-	if (((bits - (ipv6 ? 96 : 0)) / 8) > (dst - odst))
-		goto enoent;
-
-	/* Extend address to four octets. */
-	while (size-- > 0U)
-		*dst++ = 0;
-
-	*pbits = bits;
-	return (0);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-static int
-inet_cidr_pton_ipv6(const char *src, u_char *dst, int *pbits) {
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, saw_xdigit;
-	u_int val;
-	int bits;
-
-	memset((tp = tmp), '\0', NS_IN6ADDRSZ);
-	endp = tp + NS_IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			return (0);
-	curtok = src;
-	saw_xdigit = 0;
-	val = 0;
-	bits = -1;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (int)(pch - xdigits);
-			if (val > 0xffff)
-				return (0);
-			saw_xdigit = 1;
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!saw_xdigit) {
-				if (colonp)
-					return (0);
-				colonp = tp;
-				continue;
-			} else if (*src == '\0') {
-				return (0);
-			}
-			if (tp + NS_INT16SZ > endp)
-				return (0);
-			*tp++ = (u_char) (val >> 8) & 0xff;
-			*tp++ = (u_char) val & 0xff;
-			saw_xdigit = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-		    inet_cidr_pton_ipv4(curtok, tp, &bits, 1) == 0) {
-			tp += NS_INADDRSZ;
-			saw_xdigit = 0;
-			break;	/*%< '\\0' was seen by inet_pton4(). */
-		}
-		if (ch == '/') {
-			bits = getbits(src, 1);
-			if (bits == -2)
-				goto enoent;
-			break;
-		}
-		goto enoent;
-	}
-	if (saw_xdigit) {
-		if (tp + NS_INT16SZ > endp)
-			goto emsgsize;
-		*tp++ = (u_char) (val >> 8) & 0xff;
-		*tp++ = (u_char) val & 0xff;
-	}
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const ptrdiff_t n = tp - colonp;
-		int i;
-
-		if (tp == endp)
-			goto enoent;
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-
-	memcpy(dst, tmp, NS_IN6ADDRSZ);
-
-	*pbits = bits;
-	return (0);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-static int
-getbits(const char *src, int ipv6) {
-	int bits = 0;
-	char *cp, ch;
-	
-	if (*src == '\0')			/*%< syntax */
-		return (-2);
-	do {
-		ch = *src++;
-		cp = strchr(digits, ch);
-		if (cp == NULL)			/*%< syntax */
-			return (-2);
-		bits *= 10;
-		bits += (int)(cp - digits);
-		if (bits == 0 && *src != '\0')	/*%< no leading zeros */
-			return (-2);
-		if (bits > (ipv6 ? 128 : 32))	/*%< range error */
-			return (-2);
-	} while (*src != '\0');
-
-	return (bits);
-}
-
-/*! \file */
diff --git a/lib/libc/inet/inet_lnaof.c b/lib/libc/inet/inet_lnaof.c
deleted file mode 100644
index 3f66cbef7..000000000
--- a/lib/libc/inet/inet_lnaof.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: inet_lnaof.c,v 1.1 2004/05/20 23:13:02 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)inet_lnaof.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: inet_lnaof.c,v 1.1 2004/05/20 23:13:02 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#ifdef __weak_alias
-__weak_alias(inet_lnaof,_inet_lnaof)
-#endif
-
-/*
- * Return the local network address portion of an
- * internet address; handles class a/b/c network
- * number formats.
- */
-in_addr_t
-inet_lnaof(struct in_addr in)
-{
-	in_addr_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return ((i)&IN_CLASSA_HOST);
-	else if (IN_CLASSB(i))
-		return ((i)&IN_CLASSB_HOST);
-	else
-		return ((i)&IN_CLASSC_HOST);
-}
diff --git a/lib/libc/inet/inet_makeaddr.c b/lib/libc/inet/inet_makeaddr.c
deleted file mode 100644
index 0dfdd439b..000000000
--- a/lib/libc/inet/inet_makeaddr.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: inet_makeaddr.c,v 1.1 2004/05/20 23:13:02 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)inet_makeaddr.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: inet_makeaddr.c,v 1.1 2004/05/20 23:13:02 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#ifdef __weak_alias
-__weak_alias(inet_makeaddr,_inet_makeaddr)
-#endif
-
-/*
- * Formulate an Internet address from network + host.  Used in
- * building addresses stored in the ifnet structure.
- */
-struct in_addr
-inet_makeaddr(in_addr_t net, in_addr_t host)
-{
-	in_addr_t addr;
-	struct in_addr ret;
-
-	if (net < 128)
-		addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
-	else if (net < 65536)
-		addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
-	else if (net < 16777216L)
-		addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
-	else
-		addr = net | host;
-	ret.s_addr = htonl(addr);
-	return ret;
-}
diff --git a/lib/libc/inet/inet_net.3 b/lib/libc/inet/inet_net.3
deleted file mode 100644
index 3d9b6ef5f..000000000
--- a/lib/libc/inet/inet_net.3
+++ /dev/null
@@ -1,198 +0,0 @@
-.\"	$NetBSD: inet_net.3,v 1.5 2012/07/20 20:48:59 wiz Exp $
-.\"
-.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Luke Mewburn.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd July 20, 2012
-.Dt INET_NET 3
-.Os
-.Sh NAME
-.Nm inet_net_ntop ,
-.Nm inet_net_pton
-.Nd Internet network number manipulation routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.In netinet/in.h
-.In arpa/inet.h
-.Ft char *
-.Fn inet_net_ntop "int af" "const void *src" "int bits" "char *dst" "size_t size"
-.Ft int
-.Fn inet_net_pton "int af" "const char *src" "void *dst" "size_t size"
-.Sh DESCRIPTION
-The
-.Fn inet_net_ntop
-function converts an Internet network number from network format (usually a
-.Vt struct in_addr
-or some other binary form, in network byte order) to CIDR presentation format
-(suitable for external display purposes).
-The
-.Fa bits
-argument is the number of bits in
-.Fa src
-that are the network number.
-It returns
-.Dv NULL
-if an error occurs (in which case
-.Va errno
-will have been set), or it returns a pointer to the destination string.
-.Pp
-The
-.Fn inet_net_pton
-function converts a presentation format Internet network number (that is,
-printable form as held in a character string) to network format (usually a
-.Vt struct in_addr
-or some other internal binary representation, in network byte order).
-It returns the number of bits (either computed based on the class, or
-specified with /CIDR), or \-1 if a failure occurred
-(in which case
-.Va errno
-will have been set).
-.Pp
-The currently supported values for
-.Fa af
-are
-.Dv AF_INET
-and
-.Dv AF_INET6 .
-The
-.Fa size
-argument is the size of the result buffer
-.Fa dst .
-.Sh NETWORK NUMBERS (IP VERSION 4)
-Internet network numbers may be specified in one of the following forms:
-.Bd -literal -offset indent
-a.b.c.d/bits
-a.b.c.d
-a.b.c
-a.b
-a
-.Ed
-.Pp
-When four parts are specified, each is interpreted
-as a byte of data and assigned, from left to right,
-to the four bytes of an Internet network number.
-Note that when an Internet network number is viewed as a 32-bit
-integer quantity on a system that uses little-endian
-byte order (such as the
-.Tn Intel 386 , 486 ,
-and
-.Tn Pentium
-processors) the bytes referred to above appear as
-.Dq Li d.c.b.a .
-That is, little-endian bytes are ordered from right to left.
-.Pp
-When a three part number is specified, the last
-part is interpreted as a 16-bit quantity and placed
-in the rightmost two bytes of the Internet network number.
-This makes the three part number format convenient
-for specifying Class B network numbers as
-.Dq Li 128.net.host .
-.Pp
-When a two part number is supplied, the last part
-is interpreted as a 24-bit quantity and placed in
-the rightmost three bytes of the Internet network number.
-This makes the two part number format convenient
-for specifying Class A network numbers as
-.Dq Li net.host .
-.Pp
-When only one part is given, the value is stored
-directly in the Internet network number without any byte
-rearrangement.
-.Pp
-All numbers supplied as
-.Dq parts
-in a
-.Ql \&.
-notation
-may be decimal, octal, or hexadecimal, as specified
-in the C language (i.e., a leading 0x or 0X implies
-hexadecimal; otherwise, a leading 0 implies octal;
-otherwise, the number is interpreted as decimal).
-.\"
-.\" .Sh NETWORK NUMBERS (IP VERSION 6)
-.\" XXX - document this!
-.\"
-.Sh ERRORS
-The
-.Fn inet_net_ntop
-and
-.Fn inet_net_pton
-functions may fail with
-.Bl -tag -width Er
-.It Bq Er EAFNOSUPPORT
-The value of
-.Fa af
-was not
-.Dv AF_INET
-or
-.Dv AF_INET6 .
-.It Bq Er EMSGSIZE
-The conversion of
-.Fa src
-overflows
-.Fa size
-of
-.Fa dst .
-.El
-.Pp
-The
-.Fn inet_net_ntop
-function may fail with
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa bits
-argument contains an invalid number of bits
-for the requested address family.
-.El
-.Pp
-The
-.Fn inet_net_pton
-function may fail with
-.Bl -tag -width Er
-.It Bq Er ENOENT
-The
-.Fa src
-was not a valid Internet network number.
-.El
-.Sh SEE ALSO
-.Xr byteorder 3 ,
-.Xr inet 3 ,
-.Xr networks 5
-.Sh HISTORY
-The
-.Fn inet_net_ntop
-and
-.Fn inet_net_pton
-functions appeared in BIND 4.9.4 and thence
-.Nx 1.3 .
-Support for
-.Dv AF_INET6
-appeared in
-.Nx 1.6 .
diff --git a/lib/libc/inet/inet_net_ntop.c b/lib/libc/inet/inet_net_ntop.c
deleted file mode 100644
index 41b2813f5..000000000
--- a/lib/libc/inet/inet_net_ntop.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static const char rcsid[] = "Id: inet_net_ntop.c,v 1.1.2.1 2002/08/02 02:17:21 marka Exp ";
-#else
-__RCSID("$NetBSD: inet_net_ntop.c,v 1.3 2012/03/20 17:08:13 matt Exp $");
-#endif
-#endif
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "port_after.h"
-
-#ifdef __weak_alias
-__weak_alias(inet_net_ntop,_inet_net_ntop)
-#endif
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) sprintf x
-#endif
-
-static char *	inet_net_ntop_ipv4(const u_char *src, int bits,
-					char *dst, size_t size);
-static char *	inet_net_ntop_ipv6(const u_char *src, int bits,
-					char *dst, size_t size);
-
-/*
- * char *
- * inet_net_ntop(af, src, bits, dst, size)
- *	convert network number from network to presentation format.
- *	generates CIDR style result always.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-char *
-inet_net_ntop(int af, const void *src, int bits, char *dst, size_t size)
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_net_ntop_ipv4(src, bits, dst, size));
-	case AF_INET6:
-		return (inet_net_ntop_ipv6(src, bits, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-}
-
-/*
- * static char *
- * inet_net_ntop_ipv4(src, bits, dst, size)
- *	convert IPv4 network number from network to presentation format.
- *	generates CIDR style result always.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0b11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-static char *
-inet_net_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
-{
-	char *odst = dst;
-	char *t;
-	u_int m;
-	int b;
-
-	if (bits < 0 || bits > 32) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	if (bits == 0) {
-		if (size < sizeof "0")
-			goto emsgsize;
-		*dst++ = '0';
-		size--;
-		*dst = '\0';
-	}
-
-	/* Format whole octets. */
-	for (b = bits / 8; b > 0; b--) {
-		if (size <= sizeof "255.")
-			goto emsgsize;
-		t = dst;
-		dst += SPRINTF((dst, "%u", *src++));
-		if (b > 1) {
-			*dst++ = '.';
-			*dst = '\0';
-		}
-		size -= (size_t)(dst - t);
-	}
-
-	/* Format partial octet. */
-	b = bits % 8;
-	if (b > 0) {
-		if (size <= sizeof ".255")
-			goto emsgsize;
-		t = dst;
-		if (dst != odst)
-			*dst++ = '.';
-		m = ((1 << b) - 1) << (8 - b);
-		dst += SPRINTF((dst, "%u", *src & m));
-		size -= (size_t)(dst - t);
-	}
-
-	/* Format CIDR /width. */
-	if (size <= sizeof "/32")
-		goto emsgsize;
-	dst += SPRINTF((dst, "/%u", bits));
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
-
-/*
- * static char *
- * inet_net_ntop_ipv6(src, bits, fakebits, dst, size)
- *	convert IPv6 network number from network to presentation format.
- *	generates CIDR style result always. Picks the shortest representation
- *	unless the IP is really IPv4.
- *	always prints specified number of bits (bits).
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0x11110000 in its fourth octet.
- * author:
- *	Vadim Kogan (UCB), June 2001
- *  Original version (IPv4) by Paul Vixie (ISC), July 1996
- */
-
-static char *
-inet_net_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
-{
-	u_int	m;
-	int	b;
-	size_t	p;
-	size_t	zero_s, zero_l, tmp_zero_s, tmp_zero_l;
-	size_t	i;
-	int	is_ipv4 = 0;
-	unsigned char inbuf[16];
-	char outbuf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255/128")];
-	char	*cp;
-	size_t	words;
-	u_char	*s;
-
-	if (bits < 0 || bits > 128) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	cp = outbuf;
-
-	if (bits == 0) {
-		*cp++ = ':';
-		*cp++ = ':';
-		*cp = '\0';
-	} else {
-		/* Copy src to private buffer.  Zero host part. */	
-		p = (bits + 7) / 8;
-		memcpy(inbuf, src, p);
-		memset(inbuf + p, 0, 16 - p);
-		b = bits % 8;
-		if (b != 0) {
-			m = ~0 << (8 - b);
-			inbuf[p-1] &= m;
-		}
-
-		s = inbuf;
-
-		/* how many words need to be displayed in output */
-		words = (bits + 15) / 16;
-		if (words == 1)
-			words = 2;
-		
-		/* Find the longest substring of zero's */
-		zero_s = zero_l = tmp_zero_s = tmp_zero_l = 0;
-		for (i = 0; i < (words * 2); i += 2) {
-			if ((s[i] | s[i+1]) == 0) {
-				if (tmp_zero_l == 0)
-					tmp_zero_s = i / 2;
-				tmp_zero_l++;
-			} else {
-				if (tmp_zero_l && zero_l < tmp_zero_l) {
-					zero_s = tmp_zero_s;
-					zero_l = tmp_zero_l;
-					tmp_zero_l = 0;
-				}
-			}
-		}
-
-		if (tmp_zero_l && zero_l < tmp_zero_l) {
-			zero_s = tmp_zero_s;
-			zero_l = tmp_zero_l;
-		}
-
-		if (zero_l != words && zero_s == 0 && ((zero_l == 6) ||
-		    ((zero_l == 5 && s[10] == 0xff && s[11] == 0xff) ||
-		    ((zero_l == 7 && s[14] != 0 && s[15] != 1)))))
-			is_ipv4 = 1;
-
-		/* Format whole words. */
-		for (p = 0; p < words; p++) {
-			if (zero_l != 0 && p >= zero_s && p < zero_s + zero_l) {
-				/* Time to skip some zeros */
-				if (p == zero_s)
-					*cp++ = ':';
-				if (p == words - 1)
-					*cp++ = ':';
-				s++;
-				s++;
-				continue;
-			}
-
-			if (is_ipv4 && p > 5 ) {
-				*cp++ = (p == 6) ? ':' : '.';
-				cp += SPRINTF((cp, "%u", *s++));
-				/* we can potentially drop the last octet */
-				if (p != 7 || bits > 120) {
-					*cp++ = '.';
-					cp += SPRINTF((cp, "%u", *s++));
-				}
-			} else {
-				if (cp != outbuf)
-					*cp++ = ':';
-				cp += SPRINTF((cp, "%x", *s * 256 + s[1]));
-				s += 2;
-			}
-		}
-	}
-	/* Format CIDR /width. */
-	(void)SPRINTF((cp, "/%u", bits));
-	if (strlen(outbuf) + 1 > size)
-		goto emsgsize;
-	strcpy(dst, outbuf);
-	
-	return (dst);
-
-emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
diff --git a/lib/libc/inet/inet_net_pton.c b/lib/libc/inet/inet_net_pton.c
deleted file mode 100644
index 57b978289..000000000
--- a/lib/libc/inet/inet_net_pton.c
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static const char rcsid[] = "Id: inet_net_pton.c,v 1.4.2.1 2002/08/02 02:17:21 marka Exp ";
-#else
-__RCSID("$NetBSD: inet_net_pton.c,v 1.4 2012/03/20 17:08:13 matt Exp $");
-#endif
-#endif
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <isc/assertions.h>
-#include <stddef.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "port_after.h"
-
-#ifdef __weak_alias
-__weak_alias(inet_net_pton,_inet_net_pton)
-#endif
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-
-/*
- * static int
- * inet_net_pton_ipv4(src, dst, size)
- *	convert IPv4 network number from presentation to network format.
- *	accepts hex octets, hex strings, decimal octets, and /CIDR.
- *	"size" is in bytes and describes "dst".
- * return:
- *	number of bits, either imputed classfully or specified with /CIDR,
- *	or -1 if some failure occurred (check errno).  ENOENT means it was
- *	not an IPv4 network specification.
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0b11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), June 1996
- */
-static int
-inet_net_pton_ipv4(const char *src, u_char *dst, size_t size)
-{
-	static const char xdigits[] = "0123456789abcdef";
-	static const char digits[] = "0123456789";
-	int ch, dirty, bits;
-	ptrdiff_t n, tmp;
-	const u_char *odst = dst;
-
-	tmp = 0;
-	ch = *src++;
-	if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
-	    && isascii((u_char)(src[1]))
-	    && isxdigit((u_char)(src[1]))) {
-		/* Hexadecimal: Eat nybble string. */
-		if (size == 0)
-			goto emsgsize;
-		dirty = 0;
-		src++;	/* skip x or X. */
-		while ((ch = *src++) != '\0' && isascii((u_char)ch)
-		    && isxdigit((u_char)ch)) {
-			if (isupper((u_char)ch))
-				ch = tolower((u_char)ch);
-			n = strchr(xdigits, ch) - xdigits;
-			INSIST(n >= 0 && n <= 15);
-			if (dirty == 0)
-				tmp = n;
-			else
-				tmp = (tmp << 4) | n;
-			if (++dirty == 2) {
-				if (size-- == 0)
-					goto emsgsize;
-				*dst++ = (u_char) tmp;
-				dirty = 0;
-			}
-		}
-		if (dirty) {  /* Odd trailing nybble? */
-			if (size-- == 0)
-				goto emsgsize;
-			*dst++ = (u_char) (tmp << 4);
-		}
-	} else if (isascii((u_char)ch) && isdigit((u_char)ch)) {
-		/* Decimal: eat dotted digit string. */
-		for (;;) {
-			tmp = 0;
-			do {
-				n = strchr(digits, ch) - digits;
-				INSIST(n >= 0 && n <= 9);
-				tmp *= 10;
-				tmp += n;
-				if (tmp > 255)
-					goto enoent;
-			} while ((ch = *src++) != '\0' &&
-				 isascii((u_char)ch) && isdigit((u_char)ch));
-			if (size-- == 0)
-				goto emsgsize;
-			*dst++ = (u_char) tmp;
-			if (ch == '\0' || ch == '/')
-				break;
-			if (ch != '.')
-				goto enoent;
-			ch = *src++;
-			if (!isascii((u_char)ch) || !isdigit((u_char)ch))
-				goto enoent;
-		}
-	} else
-		goto enoent;
-
-	bits = -1;
-	if (ch == '/' && isascii((u_char)(src[0])) &&
-	    isdigit((u_char)(src[0])) && dst > odst) {
-		/* CIDR width specifier.  Nothing can follow it. */
-		ch = *src++;	/* Skip over the /. */
-		bits = 0;
-		do {
-			n = strchr(digits, ch) - digits;
-			INSIST(n >= 0 && n <= 9);
-			bits *= 10;
-			bits += (int)n;
-			if (bits > 32)
-				goto emsgsize;
-		} while ((ch = *src++) != '\0' && isascii((u_char)ch)
-		    && isdigit((u_char)ch));
-		if (ch != '\0')
-			goto enoent;
-	}
-
-	/* Firey death and destruction unless we prefetched EOS. */
-	if (ch != '\0')
-		goto enoent;
-
-	/* If nothing was written to the destination, we found no address. */
-	if (dst == odst)
-		goto enoent;
-	/* If no CIDR spec was given, infer width from net class. */
-	if (bits == -1) {
-		if (*odst >= 240)	/* Class E */
-			bits = 32;
-		else if (*odst >= 224)	/* Class D */
-			bits = 4;
-		else if (*odst >= 192)	/* Class C */
-			bits = 24;
-		else if (*odst >= 128)	/* Class B */
-			bits = 16;
-		else			/* Class A */
-			bits = 8;
-		/* If imputed mask is narrower than specified octets, widen. */
-		if (bits >= 8 && bits < ((dst - odst) * 8))
-			bits = (int)(dst - odst) * 8;
-	}
-	/* Extend network to cover the actual mask. */
-	while (bits > ((dst - odst) * 8)) {
-		if (size-- == 0)
-			goto emsgsize;
-		*dst++ = '\0';
-	}
-	return (bits);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-static int
-getbits(const char *src, int *bitsp)
-{
-	static const char digits[] = "0123456789";
-	int n;
-	int val;
-	char ch;
-
-	val = 0;
-	n = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		pch = strchr(digits, ch);
-		if (pch != NULL) {
-			if (n++ != 0 && val == 0)	/* no leading zeros */
-				return (0);
-			val *= 10;
-			val += (int)(pch - digits);
-			if (val > 128)			/* range */
-				return (0);
-			continue;
-		}
-		return (0);
-	}
-	if (n == 0)
-		return (0);
-	*bitsp = val;
-	return (1);
-}
-
-static int
-getv4(const char *src, u_char *dst, int *bitsp)
-{
-	static const char digits[] = "0123456789";
-	u_char *odst = dst;
-	int n;
-	u_int val;
-	char ch;
-
-	val = 0;
-	n = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		pch = strchr(digits, ch);
-		if (pch != NULL) {
-			if (n++ != 0 && val == 0)	/* no leading zeros */
-				return (0);
-			val *= 10;
-			val += (int)(pch - digits);
-			if (val > 255)			/* range */
-				return (0);
-			continue;
-		}
-		if (ch == '.' || ch == '/') {
-			if (dst - odst > 3)		/* too many octets? */
-				return (0);
-			*dst++ = val;
-			if (ch == '/')
-				return (getbits(src, bitsp));
-			val = 0;
-			n = 0;
-			continue;
-		}
-		return (0);
-	}
-	if (n == 0)
-		return (0);
-	if (dst - odst > 3)		/* too many octets? */
-		return (0);
-	*dst++ = val;
-	return (1);
-}
-
-static int
-inet_net_pton_ipv6(const char *src, u_char *dst, size_t size)
-{
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, saw_xdigit;
-	u_int val;
-	int digits;
-	int bits;
-	size_t bytes;
-	int words;
-	int ipv4;
-
-	memset((tp = tmp), '\0', NS_IN6ADDRSZ);
-	endp = tp + NS_IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			goto enoent;
-	curtok = src;
-	saw_xdigit = 0;
-	val = 0;
-	digits = 0;
-	bits = -1;
-	ipv4 = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (int)(pch - xdigits);
-			if (++digits > 4)
-				goto enoent;
-			saw_xdigit = 1;
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!saw_xdigit) {
-				if (colonp)
-					goto enoent;
-				colonp = tp;
-				continue;
-			} else if (*src == '\0')
-				goto enoent;
-			if (tp + NS_INT16SZ > endp)
-				return (0);
-			*tp++ = (u_char) (val >> 8) & 0xff;
-			*tp++ = (u_char) val & 0xff;
-			saw_xdigit = 0;
-			digits = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-		     getv4(curtok, tp, &bits) > 0) {
-			tp += NS_INADDRSZ;
-			saw_xdigit = 0;
-			ipv4 = 1;
-			break;	/* '\0' was seen by inet_pton4(). */
-		}
-		if (ch == '/' && getbits(src, &bits) > 0)
-			break;
-		goto enoent;
-	}
-	if (saw_xdigit) {
-		if (tp + NS_INT16SZ > endp)
-			goto enoent;
-		*tp++ = (u_char) (val >> 8) & 0xff;
-		*tp++ = (u_char) val & 0xff;
-	}
-	if (bits == -1)
-		bits = 128;
-
-	words = (bits + 15) / 16;
-	if (words < 2)
-		words = 2;
-	if (ipv4)
-		words = 8;
-	endp =  tmp + 2 * words;
-
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const ptrdiff_t n = tp - colonp;
-		int i;
-
-		if (tp == endp)
-			goto enoent;
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-	if (tp != endp)
-		goto enoent;
-
-	bytes = (bits + 7) / 8;
-	if (bytes > size)
-		goto emsgsize;
-	memcpy(dst, tmp, bytes);
-	return (bits);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-/*
- * int
- * inet_net_pton(af, src, dst, size)
- *	convert network number from presentation to network format.
- *	accepts hex octets, hex strings, decimal octets, and /CIDR.
- *	"size" is in bytes and describes "dst".
- * return:
- *	number of bits, either imputed classfully or specified with /CIDR,
- *	or -1 if some failure occurred (check errno).  ENOENT means it was
- *	not a valid network specification.
- * author:
- *	Paul Vixie (ISC), June 1996
- */
-int
-inet_net_pton(int af, const char *src, void *dst, size_t size)
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_net_pton_ipv4(src, dst, size));
-	case AF_INET6:
-		return (inet_net_pton_ipv6(src, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-}
diff --git a/lib/libc/inet/inet_neta.c b/lib/libc/inet/inet_neta.c
deleted file mode 100644
index 41692aa90..000000000
--- a/lib/libc/inet/inet_neta.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*	$NetBSD: inet_neta.c,v 1.3 2012/06/25 22:32:44 abs Exp $	*/
-
-/*
- * Copyright (c) 1996 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static const char rcsid[] = "Id: inet_neta.c,v 8.2 1996/08/08 06:54:44 vixie Exp ";
-#else
-__RCSID("$NetBSD: inet_neta.c,v 1.3 2012/06/25 22:32:44 abs Exp $");
-#endif
-#endif
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(inet_neta,_inet_neta)
-#endif
-
-/*
- * char *
- * inet_neta(src, dst, size)
- *	format a u_long network number into presentation format.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	format of ``src'' is as for inet_network().
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-char *
-inet_neta(u_long src, char *dst, size_t size)
-{
-	char *odst = dst;
-	char *ep;
-	int advance;
-
-	_DIAGASSERT(dst != NULL);
-
-	if (src == 0x00000000) {
-		if (size < sizeof "0.0.0.0")
-			goto emsgsize;
-		strlcpy(dst, "0.0.0.0", size);
-		return dst;
-	}
-	ep = dst + size;
-	if (ep <= dst)
-		goto emsgsize;
-	while (src & 0xffffffffUL) {
-		u_char b = (u_char)((src & 0xff000000UL) >> 24);
-
-		src <<= 8;
-		if (b || src) {
-			advance = snprintf(dst, (size_t)(ep - dst), "%u", b);
-			if (advance <= 0 || advance >= ep - dst)
-				goto emsgsize;
-			dst += advance;
-			if (src != 0L) {
-				if (dst + 1 >= ep)
-					goto emsgsize;
-				*dst++ = '.';
-				*dst = '\0';
-			}
-		}
-	}
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
diff --git a/lib/libc/inet/inet_netof.c b/lib/libc/inet/inet_netof.c
deleted file mode 100644
index 4758f3e38..000000000
--- a/lib/libc/inet/inet_netof.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: inet_netof.c,v 1.1 2004/05/20 23:13:02 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)inet_netof.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: inet_netof.c,v 1.1 2004/05/20 23:13:02 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#ifdef __weak_alias
-__weak_alias(inet_netof,_inet_netof)
-#endif
-
-/*
- * Return the network number from an internet
- * address; handles class a/b/c network #'s.
- */
-in_addr_t
-inet_netof(struct in_addr in)
-{
-	in_addr_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return (((i)&IN_CLASSA_NET) >> IN_CLASSA_NSHIFT);
-	else if (IN_CLASSB(i))
-		return (((i)&IN_CLASSB_NET) >> IN_CLASSB_NSHIFT);
-	else
-		return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
-}
diff --git a/lib/libc/inet/inet_network.c b/lib/libc/inet/inet_network.c
deleted file mode 100644
index 135675d58..000000000
--- a/lib/libc/inet/inet_network.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*	$NetBSD: inet_network.c,v 1.4 2008/01/20 04:56:08 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)inet_network.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: inet_network.c,v 1.4 2008/01/20 04:56:08 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <ctype.h>
-#ifdef _DIAGNOSTIC
-#include <stddef.h>	/* for NULL */
-#endif
-
-#ifdef __weak_alias
-__weak_alias(inet_network,_inet_network)
-#endif
-
-/*
- * Internet network address interpretation routine.
- * The library routines call this routine to interpret
- * network numbers.
- */
-in_addr_t
-inet_network(const char *cp)
-{
-	in_addr_t val;
-	size_t i, n;
-	u_char c;
-	in_addr_t parts[4], *pp = parts;
-	int digit, base;
-
-	_DIAGASSERT(cp != NULL);
-
-again:
-	val = 0; base = 10; digit = 0;
-	if (*cp == '0')
-		digit = 1, base = 8, cp++;
-	if (*cp == 'x' || *cp == 'X')
-		digit = 0, base = 16, cp++;
-	while ((c = *cp) != 0) {
-		if (isdigit(c)) {
-			if (base == 8 && (c == '8' || c == '9'))
-				return (INADDR_NONE);
-			val = (val * base) + (c - '0');
-			cp++;
-			digit = 1;
-			continue;
-		}
-		if (base == 16 && isxdigit(c)) {
-			val = (val << 4) + (c + 10 - (islower(c) ? 'a' : 'A'));
-			cp++;
-			digit = 1;
-			continue;
-		}
-		break;
-	}
-	if (!digit)
-		return (INADDR_NONE);
-	if (pp >= parts + 4 || val > 0xff)
-		return (INADDR_NONE);
-	if (*cp == '.') {
-		*pp++ = val, cp++;
-		goto again;
-	}
-	if (*cp && !isspace((u_char) *cp))
-		return (INADDR_NONE);
-	*pp++ = val;
-	n = pp - parts;
-	if (n > 4)
-		return (INADDR_NONE);
-	for (val = 0, i = 0; i < n; i++) {
-		val <<= 8;
-		val |= parts[i] & 0xff;
-	}
-	return (val);
-}
diff --git a/lib/libc/inet/inet_ntoa.c b/lib/libc/inet/inet_ntoa.c
deleted file mode 100644
index 6ed023b41..000000000
--- a/lib/libc/inet/inet_ntoa.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: inet_ntoa.c,v 1.2 2012/03/13 21:13:38 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: inet_ntoa.c,v 1.2 2012/03/13 21:13:38 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(inet_ntoa,_inet_ntoa)
-#endif
-
-/*
- * Convert network-format internet address
- * to base 256 d.d.d.d representation.
- */
-/*const*/ char *
-inet_ntoa(struct in_addr in) {
-	static char ret[18];
-
-	strlcpy(ret, "[inet_ntoa error]", sizeof(ret));
-	(void) inet_ntop(AF_INET, &in, ret, (socklen_t)sizeof ret);
-	return ret;
-}
diff --git a/lib/libc/inet/inet_ntop.c b/lib/libc/inet/inet_ntop.c
deleted file mode 100644
index d27a5b150..000000000
--- a/lib/libc/inet/inet_ntop.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*	$NetBSD: inet_ntop.c,v 1.11 2014/02/10 16:30:54 christos Exp $	*/
-
-/*
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static const char rcsid[] = "Id: inet_ntop.c,v 1.5 2005/11/03 22:59:52 marka Exp";
-#else
-__RCSID("$NetBSD: inet_ntop.c,v 1.11 2014/02/10 16:30:54 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "port_after.h"
-
-#ifdef __weak_alias
-__weak_alias(inet_ntop,_inet_ntop)
-#endif
-
-/*%
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static const char *inet_ntop4(const u_char *src, char *dst, socklen_t size);
-static const char *inet_ntop6(const u_char *src, char *dst, socklen_t size);
-
-/* char *
- * inet_ntop(af, src, dst, size)
- *	convert a network format address to presentation format.
- * return:
- *	pointer to presentation format address (`dst'), or NULL (see errno).
- * author:
- *	Paul Vixie, 1996.
- */
-const char *
-inet_ntop(int af, const void *src, char *dst, socklen_t size)
-{
-
-	_DIAGASSERT(src != NULL);
-	_DIAGASSERT(dst != NULL);
-
-	switch (af) {
-	case AF_INET:
-		return inet_ntop4(src, dst, size);
-	case AF_INET6:
-		return inet_ntop6(src, dst, size);
-	default:
-		errno = EAFNOSUPPORT;
-		return NULL;
-	}
-	/* NOTREACHED */
-}
-
-/* const char *
- * inet_ntop4(src, dst, size)
- *	format an IPv4 address, more or less like inet_ntoa()
- * return:
- *	`dst' (as a const)
- * notes:
- *	(1) uses no statics
- *	(2) takes a u_char* not an in_addr as input
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop4(const u_char *src, char *dst, socklen_t size)
-{
-	char tmp[sizeof "255.255.255.255"];
-	int l;
-
-	_DIAGASSERT(src != NULL);
-	_DIAGASSERT(dst != NULL);
-
-	l = snprintf(tmp, sizeof(tmp), "%u.%u.%u.%u",
-	    src[0], src[1], src[2], src[3]);
-	if (l <= 0 || (socklen_t) l >= size)
-		return NULL;
-	strlcpy(dst, tmp, size);
-	return dst;
-}
-
-/* const char *
- * inet_ntop6(src, dst, size)
- *	convert IPv6 binary address into presentation (printable) format
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop6(const u_char *src, char *dst, socklen_t size)
-{
-	/*
-	 * Note that int32_t and int16_t need only be "at least" large enough
-	 * to contain a value of the specified size.  On some systems, like
-	 * Crays, there is no such thing as an integer variable with 16 bits.
-	 * Keep this in mind if you think this function should have been coded
-	 * to use pointer overlays.  All the world's not a VAX.
-	 */
-	char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"];
-	char *tp, *ep;
-	struct { int base, len; } best, cur;
-	u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
-	int i;
-	int advance;
-
-	_DIAGASSERT(src != NULL);
-	_DIAGASSERT(dst != NULL);
-
-	/*
-	 * Preprocess:
-	 *	Copy the input (bytewise) array into a wordwise array.
-	 *	Find the longest run of 0x00's in src[] for :: shorthanding.
-	 */
-	memset(words, '\0', sizeof words);
-	for (i = 0; i < NS_IN6ADDRSZ; i++)
-		words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
-	best.base = -1;
-	best.len = 0;
-	cur.base = -1;
-	cur.len = 0;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		if (words[i] == 0) {
-			if (cur.base == -1)
-				cur.base = i, cur.len = 1;
-			else
-				cur.len++;
-		} else {
-			if (cur.base != -1) {
-				if (best.base == -1 || cur.len > best.len)
-					best = cur;
-				cur.base = -1;
-			}
-		}
-	}
-	if (cur.base != -1) {
-		if (best.base == -1 || cur.len > best.len)
-			best = cur;
-	}
-	if (best.base != -1 && best.len < 2)
-		best.base = -1;
-
-	/*
-	 * Format the result.
-	 */
-	tp = tmp;
-	ep = tmp + sizeof(tmp);
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		/* Are we inside the best run of 0x00's? */
-		if (best.base != -1 && i >= best.base &&
-		    i < (best.base + best.len)) {
-			if (i == best.base)
-				*tp++ = ':';
-			continue;
-		}
-		/* Are we following an initial run of 0x00s or any real hex? */
-		if (i != 0) {
-			if (tp + 1 >= ep)
-				goto out;
-			*tp++ = ':';
-		}
-		/* Is this address an encapsulated IPv4? */
-		if (i == 6 && best.base == 0 &&
-		    (best.len == 6 ||
-		    (best.len == 7 && words[7] != 0x0001) ||
-		    (best.len == 5 && words[5] == 0xffff))) {
-			if (!inet_ntop4(src + 12, tp, (socklen_t)(ep - tp)))
-				goto out;
-			tp += strlen(tp);
-			break;
-		}
-		advance = snprintf(tp, (size_t)(ep - tp), "%x", words[i]);
-		if (advance <= 0 || advance >= ep - tp)
-			goto out;
-		tp += advance;
-	}
-	/* Was it a trailing run of 0x00's? */
-	if (best.base != -1 && (best.base + best.len) == 
-	    (NS_IN6ADDRSZ / NS_INT16SZ)) {
-		if (tp + 1 >= ep)
-			goto out;
-		*tp++ = ':';
-	}
-	if (tp + 1 >= ep)
-		goto out;
-	*tp++ = '\0';
-
-	/*
-	 * Check for overflow, copy, and we're done.
-	 */
-	if ((size_t)(tp - tmp) > size)
-		goto out;
-	strlcpy(dst, tmp, size);
-	return dst;
-out:
-	errno = ENOSPC;
-	return NULL;
-}
-
-/*! \file */
diff --git a/lib/libc/inet/inet_pton.c b/lib/libc/inet/inet_pton.c
deleted file mode 100644
index c1e9a698a..000000000
--- a/lib/libc/inet/inet_pton.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/*	$NetBSD: inet_pton.c,v 1.8 2012/03/13 21:13:38 christos Exp $	*/
-
-/*
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static const char rcsid[] = "Id: inet_pton.c,v 1.5 2005/07/28 06:51:47 marka Exp";
-#else
-__RCSID("$NetBSD: inet_pton.c,v 1.8 2012/03/13 21:13:38 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <stddef.h>
-#include <string.h>
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-
-#include "port_after.h"
-
-#ifdef __weak_alias
-__weak_alias(inet_pton,_inet_pton)
-#endif
-
-/*%
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static int	inet_pton4(const char *src, u_char *dst, int pton);
-static int	inet_pton6(const char *src, u_char *dst);
-
-/* int
- * inet_pton(af, src, dst)
- *	convert from presentation format (which usually means ASCII printable)
- *	to network format (which is usually some kind of binary format).
- * return:
- *	1 if the address was valid for the specified address family
- *	0 if the address wasn't valid (`dst' is untouched in this case)
- *	-1 if some other error occurred (`dst' is untouched in this case, too)
- * author:
- *	Paul Vixie, 1996.
- */
-int
-inet_pton(int af, const char *src, void *dst)
-{
-
-	_DIAGASSERT(src != NULL);
-	_DIAGASSERT(dst != NULL);
-
-	switch (af) {
-	case AF_INET:
-		return (inet_pton4(src, dst, 1));
-	case AF_INET6:
-		return (inet_pton6(src, dst));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-	/* NOTREACHED */
-}
-
-/* int
- * inet_pton4(src, dst, pton)
- *	when last arg is 0: inet_aton(). with hexadecimal, octal and shorthand.
- *	when last arg is 1: inet_pton(). decimal dotted-quad only.
- * return:
- *	1 if `src' is a valid input, else 0.
- * notice:
- *	does not touch `dst' unless it's returning 1.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton4(const char *src, u_char *dst, int pton)
-{
-	u_int32_t val;
-	u_int digit, base;
-	ptrdiff_t n;
-	unsigned char c;
-	u_int parts[4];
-	u_int *pp = parts;
-
-	_DIAGASSERT(src != NULL);
-	_DIAGASSERT(dst != NULL);
-
-	c = *src;
-	for (;;) {
-		/*
-		 * Collect number up to ``.''.
-		 * Values are specified as for C:
-		 * 0x=hex, 0=octal, isdigit=decimal.
-		 */
-		if (!isdigit(c))
-			return (0);
-		val = 0; base = 10;
-		if (c == '0') {
-			c = *++src;
-			if (c == 'x' || c == 'X')
-				base = 16, c = *++src;
-			else if (isdigit(c) && c != '9')
-				base = 8;
-		}
-		/* inet_pton() takes decimal only */
-		if (pton && base != 10)
-			return (0);
-		for (;;) {
-			if (isdigit(c)) {
-				digit = c - '0';
-				if (digit >= base)
-					break;
-				val = (val * base) + digit;
-				c = *++src;
-			} else if (base == 16 && isxdigit(c)) {
-				digit = c + 10 - (islower(c) ? 'a' : 'A');
-				if (digit >= 16)
-					break;
-				val = (val << 4) | digit;
-				c = *++src;
-			} else
-				break;
-		}
-		if (c == '.') {
-			/*
-			 * Internet format:
-			 *	a.b.c.d
-			 *	a.b.c	(with c treated as 16 bits)
-			 *	a.b	(with b treated as 24 bits)
-			 *	a	(with a treated as 32 bits)
-			 */
-			if (pp >= parts + 3)
-				return (0);
-			*pp++ = val;
-			c = *++src;
-		} else
-			break;
-	}
-	/*
-	 * Check for trailing characters.
-	 */
-	if (c != '\0' && !isspace(c))
-		return (0);
-	/*
-	 * Concoct the address according to
-	 * the number of parts specified.
-	 */
-	n = pp - parts + 1;
-	/* inet_pton() takes dotted-quad only.  it does not take shorthand. */
-	if (pton && n != 4)
-		return (0);
-	switch (n) {
-
-	case 0:
-		return (0);		/* initial nondigit */
-
-	case 1:				/* a -- 32 bits */
-		break;
-
-	case 2:				/* a.b -- 8.24 bits */
-		if (parts[0] > 0xff || val > 0xffffff)
-			return (0);
-		val |= parts[0] << 24;
-		break;
-
-	case 3:				/* a.b.c -- 8.8.16 bits */
-		if ((parts[0] | parts[1]) > 0xff || val > 0xffff)
-			return (0);
-		val |= (parts[0] << 24) | (parts[1] << 16);
-		break;
-
-	case 4:				/* a.b.c.d -- 8.8.8.8 bits */
-		if ((parts[0] | parts[1] | parts[2] | val) > 0xff)
-			return (0);
-		val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
-		break;
-	}
-	if (dst) {
-		val = htonl(val);
-		memcpy(dst, &val, NS_INADDRSZ);
-	}
-	return (1);
-}
-
-/* int
- * inet_pton6(src, dst)
- *	convert presentation level address to network order binary form.
- * return:
- *	1 if `src' is a valid [RFC1884 2.2] address, else 0.
- * notice:
- *	(1) does not touch `dst' unless it's returning 1.
- *	(2) :: in a full address is silently ignored.
- * credit:
- *	inspired by Mark Andrews.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton6(const char *src, u_char *dst)
-{
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, seen_xdigits;
-	u_int val;
-
-	_DIAGASSERT(src != NULL);
-	_DIAGASSERT(dst != NULL);
-
-	memset((tp = tmp), '\0', NS_IN6ADDRSZ);
-	endp = tp + NS_IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			return (0);
-	curtok = src;
-	seen_xdigits = 0;
-	val = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (int)(pch - xdigits);
-			if (++seen_xdigits > 4)
-				return (0);
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!seen_xdigits) {
-				if (colonp)
-					return (0);
-				colonp = tp;
-				continue;
-			} else if (*src == '\0')
-				return (0);
-			if (tp + NS_INT16SZ > endp)
-				return (0);
-			*tp++ = (u_char) (val >> 8) & 0xff;
-			*tp++ = (u_char) val & 0xff;
-			seen_xdigits = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-		    inet_pton4(curtok, tp, 1) > 0) {
-			tp += NS_INADDRSZ;
-			seen_xdigits = 0;
-			break;	/*%< '\\0' was seen by inet_pton4(). */
-		}
-		return (0);
-	}
-	if (seen_xdigits) {
-		if (tp + NS_INT16SZ > endp)
-			return (0);
-		*tp++ = (u_char) (val >> 8) & 0xff;
-		*tp++ = (u_char) val & 0xff;
-	}
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const ptrdiff_t n = tp - colonp;
-		int i;
-
-		if (tp == endp)
-			return (0);
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-	if (tp != endp)
-		return (0);
-	memcpy(dst, tmp, NS_IN6ADDRSZ);
-	return (1);
-}
-
-/*! \file */
diff --git a/lib/libc/inet/nsap_addr.c b/lib/libc/inet/nsap_addr.c
deleted file mode 100644
index 8633205a9..000000000
--- a/lib/libc/inet/nsap_addr.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*	$NetBSD: nsap_addr.c,v 1.6 2009/04/12 17:07:17 christos Exp $	*/
-
-/*
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static const char rcsid[] = "Id: nsap_addr.c,v 1.5 2005/07/28 06:51:48 marka Exp";
-#else
-__RCSID("$NetBSD: nsap_addr.c,v 1.6 2009/04/12 17:07:17 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <resolv_mt.h>
-
-#include "port_after.h"
-
-#ifdef __weak_alias
-__weak_alias(inet_nsap_addr,_inet_nsap_addr)
-__weak_alias(inet_nsap_ntoa,_inet_nsap_ntoa)
-#endif
-
-static char
-xtob(int c) {
-	return (c - (((c >= '0') && (c <= '9')) ? '0' : '7'));
-}
-
-u_int
-inet_nsap_addr(const char *ascii, u_char *binary, int maxlen) {
-	u_char c, nib;
-	u_int len = 0;
-
-	_DIAGASSERT(ascii != NULL);
-	_DIAGASSERT(binary != NULL);
-
-	if (ascii[0] != '0' || (ascii[1] != 'x' && ascii[1] != 'X'))
-		return (0);
-	ascii += 2;
-
-	while ((c = *ascii++) != '\0' && len < (u_int)maxlen) {
-		if (c == '.' || c == '+' || c == '/')
-			continue;
-		if (!isascii(c))
-			return (0);
-		if (islower(c))
-			c = toupper(c);
-		if (isxdigit(c)) {
-			nib = xtob(c);
-			c = *ascii++;
-			if (c != '\0') {
-				c = toupper(c);
-				if (isxdigit(c)) {
-					*binary++ = (nib << 4) | xtob(c);
-					len++;
-				} else
-					return (0);
-			}
-			else
-				return (0);
-		}
-		else
-			return (0);
-	}
-	return (len);
-}
-
-char *
-inet_nsap_ntoa(int binlen, const u_char *binary, char *ascii) {
-	int nib;
-	int i;
-	char *tmpbuf = inet_nsap_ntoa_tmpbuf;
-	char *start;
-
-	_DIAGASSERT(binary != NULL);
-
-	if (ascii)
-		start = ascii;
-	else {
-		ascii = tmpbuf;
-		start = tmpbuf;
-	}
-
-	*ascii++ = '0';
-	*ascii++ = 'x';
-
-	if (binlen > 255)
-		binlen = 255;
-
-	for (i = 0; i < binlen; i++) {
-		nib = (u_int32_t)*binary >> 4;
-		*ascii++ = nib + (nib < 10 ? '0' : '7');
-		nib = *binary++ & 0x0f;
-		*ascii++ = nib + (nib < 10 ? '0' : '7');
-		if (((i % 2) == 0 && (i + 1) < binlen))
-			*ascii++ = '.';
-	}
-	*ascii = '\0';
-	return (start);
-}
-
-/*! \file */
diff --git a/lib/libc/isc/Makefile.inc b/lib/libc/isc/Makefile.inc
deleted file mode 100644
index e7947d41a..000000000
--- a/lib/libc/isc/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2004/05/20 19:52:14 christos Exp $
-
-# net sources
-.PATH: ${.CURDIR}/isc
-
-SRCS+=	assertions.c ev_timers.c ev_streams.c
diff --git a/lib/libc/isc/assertions.c b/lib/libc/isc/assertions.c
deleted file mode 100644
index 5e8ee7b3f..000000000
--- a/lib/libc/isc/assertions.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*	$NetBSD: assertions.c,v 1.7 2011/09/16 16:05:58 joerg Exp $	*/
-
-/*
- * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1997, 1999, 2001  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.
- */
-
-#include <sys/cdefs.h>
-#if !defined(LINT) && !defined(CODECENTER) && !defined(lint)
-#ifdef notdef
-static const char rcsid[] = "Id: assertions.c,v 1.5 2008/11/14 02:36:51 marka Exp";
-#else
-__RCSID("$NetBSD: assertions.c,v 1.7 2011/09/16 16:05:58 joerg Exp $");
-#endif
-#endif
-
-#include "port_before.h"
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <isc/assertions.h>
-
-#include "port_after.h"
-
-/*
- * Forward.
- */
-
-__dead static void default_assertion_failed(const char *, int, assertion_type,
-				     const char *, int);
-
-/*
- * Public.
- */
-
-assertion_failure_callback __assertion_failed = default_assertion_failed;
-
-void
-set_assertion_failure_callback(assertion_failure_callback f) {
-	if (f == NULL)
-		__assertion_failed = default_assertion_failed;
-	else
-		__assertion_failed = f;
-}
-
-const char *
-assertion_type_to_text(assertion_type type) {
-	const char *result;
-
-	switch (type) {
-	case assert_require:
-		result = "REQUIRE";
-		break;
-	case assert_ensure:
-		result = "ENSURE";
-		break;
-	case assert_insist:
-		result = "INSIST";
-		break;
-	case assert_invariant:
-		result = "INVARIANT";
-		break;
-	default:
-		result = NULL;
-	}
-	return (result);
-}
-
-/*
- * Private.
- */
-
-/* coverity[+kill] */
-static void
-default_assertion_failed(const char *file, int line, assertion_type type,
-			 const char *cond, int print_errno)
-{
-	fprintf(stderr, "%s:%d: %s(%s)%s%s failed.\n",
-		file, line, assertion_type_to_text(type), cond,
-		(print_errno) ? ": " : "",
-		(print_errno) ? strerror(errno) : "");
-	abort();
-	/* NOTREACHED */
-}
-
-/*! \file */
diff --git a/lib/libc/isc/ev_streams.c b/lib/libc/isc/ev_streams.c
deleted file mode 100644
index 2804b9f5b..000000000
--- a/lib/libc/isc/ev_streams.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/*	$NetBSD: ev_streams.c,v 1.6 2009/04/12 17:07:17 christos Exp $	*/
-
-/*
- * 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.
- */
-
-/* ev_streams.c - implement asynch stream file IO for the eventlib
- * vix 04mar96 [initial]
- */
-
-#include <sys/cdefs.h>
-#if !defined(LINT) && !defined(CODECENTER) && !defined(lint)
-#ifdef notdef
-static const char rcsid[] = "Id: ev_streams.c,v 1.5 2005/04/27 04:56:36 sra Exp";
-#else
-__RCSID("$NetBSD: ev_streams.c,v 1.6 2009/04/12 17:07:17 christos Exp $");
-#endif
-#endif
-
-#include "port_before.h"
-#include "fd_setsize.h"
-
-#include <sys/types.h>
-#include <sys/uio.h>
-
-#include <errno.h>
-
-#include <isc/eventlib.h>
-#include <isc/assertions.h>
-#include "eventlib_p.h"
-
-#include "port_after.h"
-
-#ifndef _LIBC
-static int	copyvec(evStream *str, const struct iovec *iov, int iocnt);
-static void	consume(evStream *str, size_t bytes);
-static void	done(evContext opaqueCtx, evStream *str);
-static void	writable(evContext opaqueCtx, void *uap, int fd, int evmask);
-static void	readable(evContext opaqueCtx, void *uap, int fd, int evmask);
-#endif
-
-struct iovec
-evConsIovec(void *buf, size_t cnt) {
-	struct iovec ret;
-
-	memset(&ret, 0xf5, sizeof ret);
-	ret.iov_base = buf;
-	ret.iov_len = cnt;
-	return (ret);
-}
-
-#ifndef _LIBC
-int
-evWrite(evContext opaqueCtx, int fd, const struct iovec *iov, int iocnt,
-	evStreamFunc func, void *uap, evStreamID *id)
-{
-	evContext_p *ctx = opaqueCtx.opaque;
-	evStream *new;
-	int save;
-
-	OKNEW(new);
-	new->func = func;
-	new->uap = uap;
-	new->fd = fd;
-	new->flags = 0;
-	if (evSelectFD(opaqueCtx, fd, EV_WRITE, writable, new, &new->file) < 0)
-		goto free;
-	if (copyvec(new, iov, iocnt) < 0)
-		goto free;
-	new->prevDone = NULL;
-	new->nextDone = NULL;
-	if (ctx->streams != NULL)
-		ctx->streams->prev = new;
-	new->prev = NULL;
-	new->next = ctx->streams;
-	ctx->streams = new;
-	if (id != NULL)
-		id->opaque = new;
-	return (0);
- free:
-	save = errno;
-	FREE(new);
-	errno = save;
-	return (-1);
-}
-
-int
-evRead(evContext opaqueCtx, int fd, const struct iovec *iov, int iocnt,
-       evStreamFunc func, void *uap, evStreamID *id)
-{
-	evContext_p *ctx = opaqueCtx.opaque;
-	evStream *new;
-	int save;
-
-	OKNEW(new);
-	new->func = func;
-	new->uap = uap;
-	new->fd = fd;
-	new->flags = 0;
-	if (evSelectFD(opaqueCtx, fd, EV_READ, readable, new, &new->file) < 0)
-		goto free;
-	if (copyvec(new, iov, iocnt) < 0)
-		goto free;
-	new->prevDone = NULL;
-	new->nextDone = NULL;
-	if (ctx->streams != NULL)
-		ctx->streams->prev = new;
-	new->prev = NULL;
-	new->next = ctx->streams;
-	ctx->streams = new;
-	if (id)
-		id->opaque = new;
-	return (0);
- free:
-	save = errno;
-	FREE(new);
-	errno = save;
-	return (-1);
-}
-
-int
-evTimeRW(evContext opaqueCtx, evStreamID id, evTimerID timer) /*ARGSUSED*/ {
-	evStream *str = id.opaque;
-
-	UNUSED(opaqueCtx);
-
-	str->timer = timer;
-	str->flags |= EV_STR_TIMEROK;
-	return (0);
-}
-
-int
-evUntimeRW(evContext opaqueCtx, evStreamID id) /*ARGSUSED*/ {
-	evStream *str = id.opaque;
-
-	UNUSED(opaqueCtx);
-
-	str->flags &= ~EV_STR_TIMEROK;
-	return (0);
-}
-
-int
-evCancelRW(evContext opaqueCtx, evStreamID id) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evStream *old = id.opaque;
-
-	/*
-	 * The streams list is doubly threaded.  First, there's ctx->streams
-	 * that's used by evDestroy() to find and cancel all streams.  Second,
-	 * there's ctx->strDone (head) and ctx->strLast (tail) which thread
-	 * through the potentially smaller number of "IO completed" streams,
-	 * used in evGetNext() to avoid scanning the entire list.
-	 */
-
-	/* Unlink from ctx->streams. */
-	if (old->prev != NULL)
-		old->prev->next = old->next;
-	else
-		ctx->streams = old->next;
-	if (old->next != NULL)
-		old->next->prev = old->prev;
-
-	/*
-	 * If 'old' is on the ctx->strDone list, remove it.  Update
-	 * ctx->strLast if necessary.
-	 */
-	if (old->prevDone == NULL && old->nextDone == NULL) {
-		/*
-		 * Either 'old' is the only item on the done list, or it's
-		 * not on the done list.  If the former, then we unlink it
-		 * from the list.  If the latter, we leave the list alone.
-		 */
-		if (ctx->strDone == old) {
-			ctx->strDone = NULL;
-			ctx->strLast = NULL;
-		}
-	} else {
-		if (old->prevDone != NULL)
-			old->prevDone->nextDone = old->nextDone;
-		else
-			ctx->strDone = old->nextDone;
-		if (old->nextDone != NULL)
-			old->nextDone->prevDone = old->prevDone;
-		else
-			ctx->strLast = old->prevDone;
-	}
-
-	/* Deallocate the stream. */
-	if (old->file.opaque)
-		evDeselectFD(opaqueCtx, old->file);
-	memput(old->iovOrig, sizeof (struct iovec) * old->iovOrigCount);
-	FREE(old);
-	return (0);
-}
-
-/* Copy a scatter/gather vector and initialize a stream handler's IO. */
-static int
-copyvec(evStream *str, const struct iovec *iov, int iocnt) {
-	int i;
-
-	str->iovOrig = (struct iovec *)memget(sizeof(struct iovec) * iocnt);
-	if (str->iovOrig == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	str->ioTotal = 0;
-	for (i = 0; i < iocnt; i++) {
-		str->iovOrig[i] = iov[i];
-		str->ioTotal += iov[i].iov_len;
-	}
-	str->iovOrigCount = iocnt;
-	str->iovCur = str->iovOrig;
-	str->iovCurCount = str->iovOrigCount;
-	str->ioDone = 0;
-	return (0);
-}
-
-/* Pull off or truncate lead iovec(s). */
-static void
-consume(evStream *str, size_t bytes) {
-	while (bytes > 0U) {
-		if (bytes < (size_t)str->iovCur->iov_len) {
-			str->iovCur->iov_len -= bytes;
-			str->iovCur->iov_base = (void *)
-				((u_char *)str->iovCur->iov_base + bytes);
-			str->ioDone += bytes;
-			bytes = 0;
-		} else {
-			bytes -= str->iovCur->iov_len;
-			str->ioDone += str->iovCur->iov_len;
-			str->iovCur++;
-			str->iovCurCount--;
-		}
-	}
-}
-
-/* Add a stream to Done list and deselect the FD. */
-static void
-done(evContext opaqueCtx, evStream *str) {
-	evContext_p *ctx = opaqueCtx.opaque;
-
-	if (ctx->strLast != NULL) {
-		str->prevDone = ctx->strLast;
-		ctx->strLast->nextDone = str;
-		ctx->strLast = str;
-	} else {
-		INSIST(ctx->strDone == NULL);
-		ctx->strDone = ctx->strLast = str;
-	}
-	evDeselectFD(opaqueCtx, str->file);
-	str->file.opaque = NULL;
-	/* evDrop() will call evCancelRW() on us. */
-}
-
-/* Dribble out some bytes on the stream.  (Called by evDispatch().) */
-static void
-writable(evContext opaqueCtx, void *uap, int fd, int evmask) {
-	evStream *str = uap;
-	int bytes;
-
-	UNUSED(evmask);
-
-	bytes = writev(fd, str->iovCur, str->iovCurCount);
-	if (bytes > 0) {
-		if ((str->flags & EV_STR_TIMEROK) != 0)
-			evTouchIdleTimer(opaqueCtx, str->timer);
-		consume(str, bytes);
-	} else {
-		if (bytes < 0 && errno != EINTR) {
-			str->ioDone = -1;
-			str->ioErrno = errno;
-		}
-	}
-	if (str->ioDone == -1 || str->ioDone == str->ioTotal)
-		done(opaqueCtx, str);
-}
-
-/* Scoop up some bytes from the stream.  (Called by evDispatch().) */
-static void
-readable(evContext opaqueCtx, void *uap, int fd, int evmask) {
-	evStream *str = uap;
-	int bytes;
-
-	UNUSED(evmask);
-
-	bytes = readv(fd, str->iovCur, str->iovCurCount);
-	if (bytes > 0) {
-		if ((str->flags & EV_STR_TIMEROK) != 0)
-			evTouchIdleTimer(opaqueCtx, str->timer);
-		consume(str, bytes);
-	} else {
-		if (bytes == 0)
-			str->ioDone = 0;
-		else {
-			if (errno != EINTR) {
-				str->ioDone = -1;
-				str->ioErrno = errno;
-			}
-		}
-	}
-	if (str->ioDone <= 0 || str->ioDone == str->ioTotal)
-		done(opaqueCtx, str);
-}
-#endif
-
-/*! \file */
diff --git a/lib/libc/isc/ev_timers.c b/lib/libc/isc/ev_timers.c
deleted file mode 100644
index 40521a78d..000000000
--- a/lib/libc/isc/ev_timers.c
+++ /dev/null
@@ -1,519 +0,0 @@
-/*	$NetBSD: ev_timers.c,v 1.11 2012/03/21 00:34:54 christos Exp $	*/
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995-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.
- */
-
-/* ev_timers.c - implement timers for the eventlib
- * vix 09sep95 [initial]
- */
-
-#include <sys/cdefs.h>
-#if !defined(LINT) && !defined(CODECENTER) && !defined(lint)
-#ifdef notdef
-static const char rcsid[] = "Id: ev_timers.c,v 1.6 2005/04/27 04:56:36 sra Exp";
-#else
-__RCSID("$NetBSD: ev_timers.c,v 1.11 2012/03/21 00:34:54 christos Exp $");
-#endif
-#endif
-
-/* Import. */
-
-#include "port_before.h"
-#include "fd_setsize.h"
-
-#include <errno.h>
-
-#include <isc/assertions.h>
-#include <isc/eventlib.h>
-#include "eventlib_p.h"
-
-#include "port_after.h"
-
-/* Constants. */
-
-#define	MILLION 1000000
-#define BILLION 1000000000
-
-/* Forward. */
-
-#ifndef _LIBC
-static int due_sooner(void *, void *);
-static void set_index(void *, int);
-static void free_timer(void *, void *);
-static void print_timer(void *, void *);
-static void idle_timeout(evContext, void *, struct timespec, struct timespec);
-
-/* Private type. */
-
-typedef struct {
-	evTimerFunc	func;
-	void *		uap;
-	struct timespec	lastTouched;
-	struct timespec	max_idle;
-	evTimer *	timer;
-} idle_timer;
-#endif
-
-/* Public. */
-
-struct timespec
-evConsTime(time_t sec, long nsec) {
-	struct timespec x;
-
-	x.tv_sec = sec;
-	x.tv_nsec = nsec;
-	return (x);
-}
-
-struct timespec
-evAddTime(struct timespec addend1, struct timespec addend2) {
-	struct timespec x;
-
-	x.tv_sec = addend1.tv_sec + addend2.tv_sec;
-	x.tv_nsec = addend1.tv_nsec + addend2.tv_nsec;
-	if (x.tv_nsec >= BILLION) {
-		x.tv_sec++;
-		x.tv_nsec -= BILLION;
-	}
-	return (x);
-}
-
-struct timespec
-evSubTime(struct timespec minuend, struct timespec subtrahend) {
-	struct timespec x;
-
-	x.tv_sec = minuend.tv_sec - subtrahend.tv_sec;
-	if (minuend.tv_nsec >= subtrahend.tv_nsec)
-		x.tv_nsec = minuend.tv_nsec - subtrahend.tv_nsec;
-	else {
-		x.tv_nsec = BILLION - subtrahend.tv_nsec + minuend.tv_nsec;
-		x.tv_sec--;
-	}
-	return (x);
-}
-
-int
-evCmpTime(struct timespec a, struct timespec b) {
-#define SGN(x) ((x) < 0 ? (-1) : (x) > 0 ? (1) : (0));
-	time_t s = a.tv_sec - b.tv_sec;
-	long n;
-
-	if (s != 0)
-		return SGN(s);
-
-	n = a.tv_nsec - b.tv_nsec;
-	return SGN(n);
-}
-
-struct timespec
-evNowTime(void)
-{
-	struct timeval now;
-#ifdef CLOCK_REALTIME
-	struct timespec tsnow;
-	int m = CLOCK_REALTIME;
-
-#ifdef CLOCK_MONOTONIC
-#ifndef _LIBC
-	if (__evOptMonoTime)
-		m = CLOCK_MONOTONIC;
-#endif
-#endif
-	if (clock_gettime(m, &tsnow) == 0)
-		return (tsnow);
-#endif
-	if (gettimeofday(&now, NULL) < 0)
-		return (evConsTime((time_t)0, 0L));
-	return (evTimeSpec(now));
-}
-
-struct timespec
-evUTCTime(void) {
-	struct timeval now;
-#ifdef CLOCK_REALTIME
-	struct timespec tsnow;
-	if (clock_gettime(CLOCK_REALTIME, &tsnow) == 0)
-		return (tsnow);
-#endif
-	if (gettimeofday(&now, NULL) < 0)
-		return (evConsTime((time_t)0, 0L));
-	return (evTimeSpec(now));
-}
-
-#ifndef _LIBC
-struct timespec
-evLastEventTime(evContext opaqueCtx) {
-	evContext_p *ctx = opaqueCtx.opaque;
-
-	return (ctx->lastEventTime);
-}
-#endif
-
-struct timespec
-evTimeSpec(struct timeval tv) {
-	struct timespec ts;
-
-	ts.tv_sec = tv.tv_sec;
-	ts.tv_nsec = tv.tv_usec * 1000;
-	return (ts);
-}
-
-struct timeval
-evTimeVal(struct timespec ts) {
-	struct timeval tv;
-
-	tv.tv_sec = ts.tv_sec;
-	tv.tv_usec = (suseconds_t)(ts.tv_nsec / 1000);
-	return (tv);
-}
-
-#ifndef _LIBC
-int
-evSetTimer(evContext opaqueCtx,
-	   evTimerFunc func,
-	   void *uap,
-	   struct timespec due,
-	   struct timespec inter,
-	   evTimerID *opaqueID
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *id;
-
-	evPrintf(ctx, 1,
-"evSetTimer(ctx %p, func %p, uap %p, due %ld.%09ld, inter %ld.%09ld)\n",
-		 ctx, func, uap,
-		 (long)due.tv_sec, due.tv_nsec,
-		 (long)inter.tv_sec, inter.tv_nsec);
-
-#ifdef __hpux
-	/*
-	 * tv_sec and tv_nsec are unsigned.
-	 */
-	if (due.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-
-	if (inter.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-#else
-	if (due.tv_sec < 0 || due.tv_nsec < 0 || due.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-
-	if (inter.tv_sec < 0 || inter.tv_nsec < 0 || inter.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-#endif
-
-	/* due={0,0} is a magic cookie meaning "now." */
-	if (due.tv_sec == (time_t)0 && due.tv_nsec == 0L)
-		due = evNowTime();
-
-	/* Allocate and fill. */
-	OKNEW(id);
-	id->func = func;
-	id->uap = uap;
-	id->due = due;
-	id->inter = inter;
-
-	if (heap_insert(ctx->timers, id) < 0)
-		return (-1);
-
-	/* Remember the ID if the caller provided us a place for it. */
-	if (opaqueID)
-		opaqueID->opaque = id;
-
-	if (ctx->debug > 7) {
-		evPrintf(ctx, 7, "timers after evSetTimer:\n");
-		(void) heap_for_each(ctx->timers, print_timer, (void *)ctx);
-	}
-
-	return (0);
-}
-
-int
-evClearTimer(evContext opaqueCtx, evTimerID id) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *del = id.opaque;
-
-	if (ctx->cur != NULL &&
-	    ctx->cur->type == Timer &&
-	    ctx->cur->u.timer.this == del) {
-		evPrintf(ctx, 8, "deferring delete of timer (executing)\n");
-		/*
-		 * Setting the interval to zero ensures that evDrop() will
-		 * clean up the timer.
-		 */
-		del->inter = evConsTime(0, 0);
-		return (0);
-	}
-
-	if (heap_element(ctx->timers, del->index) != del)
-		EV_ERR(ENOENT);
-
-	if (heap_delete(ctx->timers, del->index) < 0)
-		return (-1);
-	FREE(del);
-
-	if (ctx->debug > 7) {
-		evPrintf(ctx, 7, "timers after evClearTimer:\n");
-		(void) heap_for_each(ctx->timers, print_timer, (void *)ctx);
-	}
-
-	return (0);
-}
-
-int
-evConfigTimer(evContext opaqueCtx,
-	     evTimerID id,
-	     const char *param,
-	     int value
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *timer = id.opaque;
-	int result=0;
-
-	UNUSED(value);
-
-	if (heap_element(ctx->timers, timer->index) != timer)
-		EV_ERR(ENOENT);
-
-	if (strcmp(param, "rate") == 0)
-		timer->mode |= EV_TMR_RATE;
-	else if (strcmp(param, "interval") == 0)
-		timer->mode &= ~EV_TMR_RATE;
-	else
-		EV_ERR(EINVAL);
-
-	return (result);
-}
-
-int
-evResetTimer(evContext opaqueCtx,
-	     evTimerID id,
-	     evTimerFunc func,
-	     void *uap,
-	     struct timespec due,
-	     struct timespec inter
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *timer = id.opaque;
-	struct timespec old_due;
-	int result=0;
-
-	if (heap_element(ctx->timers, timer->index) != timer)
-		EV_ERR(ENOENT);
-
-#ifdef __hpux
-	/*
-	 * tv_sec and tv_nsec are unsigned.
-	 */
-	if (due.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-
-	if (inter.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-#else
-	if (due.tv_sec < 0 || due.tv_nsec < 0 || due.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-
-	if (inter.tv_sec < 0 || inter.tv_nsec < 0 || inter.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-#endif
-
-	old_due = timer->due;
-
-	timer->func = func;
-	timer->uap = uap;
-	timer->due = due;
-	timer->inter = inter;
-
-	switch (evCmpTime(due, old_due)) {
-	case -1:
-		result = heap_increased(ctx->timers, timer->index);
-		break;
-	case 0:
-		result = 0;
-		break;
-	case 1:
-		result = heap_decreased(ctx->timers, timer->index);
-		break;
-	}
-
-	if (ctx->debug > 7) {
-		evPrintf(ctx, 7, "timers after evResetTimer:\n");
-		(void) heap_for_each(ctx->timers, print_timer, (void *)ctx);
-	}
-
-	return (result);
-}
-
-int
-evSetIdleTimer(evContext opaqueCtx,
-		evTimerFunc func,
-		void *uap,
-		struct timespec max_idle,
-		evTimerID *opaqueID
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	idle_timer *tt;
-
-	/* Allocate and fill. */
-	OKNEW(tt);
-	tt->func = func;
-	tt->uap = uap;
-	tt->lastTouched = ctx->lastEventTime;
-	tt->max_idle = max_idle;
-
-	if (evSetTimer(opaqueCtx, idle_timeout, tt,
-		       evAddTime(ctx->lastEventTime, max_idle),
-		       max_idle, opaqueID) < 0) {
-		FREE(tt);
-		return (-1);
-	}
-
-	tt->timer = opaqueID->opaque;
-
-	return (0);
-}
-
-int
-evClearIdleTimer(evContext opaqueCtx, evTimerID id) {
-	evTimer *del = id.opaque;
-	idle_timer *tt = del->uap;
-
-	FREE(tt);
-	return (evClearTimer(opaqueCtx, id));
-}
-
-int
-evResetIdleTimer(evContext opaqueCtx,
-		 evTimerID opaqueID,
-		 evTimerFunc func,
-		 void *uap,
-		 struct timespec max_idle
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *timer = opaqueID.opaque;
-	idle_timer *tt = timer->uap;
-
-	tt->func = func;
-	tt->uap = uap;
-	tt->lastTouched = ctx->lastEventTime;
-	tt->max_idle = max_idle;
-
-	return (evResetTimer(opaqueCtx, opaqueID, idle_timeout, tt,
-			     evAddTime(ctx->lastEventTime, max_idle),
-			     max_idle));
-}
-
-int
-evTouchIdleTimer(evContext opaqueCtx, evTimerID id) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *t = id.opaque;
-	idle_timer *tt = t->uap;
-
-	tt->lastTouched = ctx->lastEventTime;
-
-	return (0);
-}
-
-/* Public to the rest of eventlib. */
-
-heap_context
-evCreateTimers(const evContext_p *ctx) {
-
-	UNUSED(ctx);
-
-	return (heap_new(due_sooner, set_index, 2048));
-}
-
-void
-evDestroyTimers(const evContext_p *ctx) {
-	(void) heap_for_each(ctx->timers, free_timer, NULL);
-	(void) heap_free(ctx->timers);
-}
-
-/* Private. */
-
-static int
-due_sooner(void *a, void *b) {
-	evTimer *a_timer, *b_timer;
-
-	a_timer = a;
-	b_timer = b;
-	return (evCmpTime(a_timer->due, b_timer->due) < 0);
-}
-
-static void
-set_index(void *what, int idx) {
-	evTimer *timer;
-
-	timer = what;
-	timer->index = idx;
-}
-
-static void
-free_timer(void *what, void *uap) {
-	evTimer *t = what;
-
-	UNUSED(uap);
-
-	FREE(t);
-}
-
-static void
-print_timer(void *what, void *uap) {
-	evTimer *cur = what;
-	evContext_p *ctx = uap;
-
-	cur = what;
-	evPrintf(ctx, 7,
-	    "  func %p, uap %p, due %ld.%09ld, inter %ld.%09ld\n",
-		 cur->func, cur->uap,
-		 (long)cur->due.tv_sec, cur->due.tv_nsec,
-		 (long)cur->inter.tv_sec, cur->inter.tv_nsec);
-}
-
-static void
-idle_timeout(evContext opaqueCtx,
-	     void *uap,
-	     struct timespec due,
-	     struct timespec inter
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	idle_timer *this = uap;
-	struct timespec idle;
-
-	UNUSED(due);
-	UNUSED(inter);
-	
-	idle = evSubTime(ctx->lastEventTime, this->lastTouched);
-	if (evCmpTime(idle, this->max_idle) >= 0) {
-		(this->func)(opaqueCtx, this->uap, this->timer->due,
-			     this->max_idle);
-		/*
-		 * Setting the interval to zero will cause the timer to
-		 * be cleaned up in evDrop().
-		 */
-		this->timer->inter = evConsTime(0L, 0L);
-		FREE(this);
-	} else {
-		/* evDrop() will reschedule the timer. */
-		this->timer->inter = evSubTime(this->max_idle, idle);
-	}
-}
-#endif
-
-/*! \file */
diff --git a/lib/libc/isc/eventlib_p.h b/lib/libc/isc/eventlib_p.h
deleted file mode 100644
index 4d6b78855..000000000
--- a/lib/libc/isc/eventlib_p.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/*	$NetBSD: eventlib_p.h,v 1.3 2009/04/12 17:07:17 christos Exp $	*/
-
-/*
- * Copyright (c) 2005 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995-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.
- */
-
-/*! \file 
- * \brief private interfaces for eventlib
- * \author vix 09sep95 [initial]
- *
- * Id: eventlib_p.h,v 1.9 2006/03/09 23:57:56 marka Exp
- */
-
-#ifndef _EVENTLIB_P_H
-#define _EVENTLIB_P_H
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/un.h>
-
-#define EVENTLIB_DEBUG 1
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <isc/heap.h>
-#include <isc/list.h>
-#include <isc/memcluster.h>
-
-#define	EV_MASK_ALL	(EV_READ | EV_WRITE | EV_EXCEPT)
-#define EV_ERR(e)		return (errno = (e), -1)
-#define OK(x)		if ((x) < 0) EV_ERR(errno); else (void)NULL
-#define OKFREE(x, y)	if ((x) < 0) { FREE((y)); EV_ERR(errno); } \
-			else (void)NULL
-
-#define	NEW(p)		if (((p) = memget(sizeof *(p))) != NULL) \
-				FILL(p); \
-			else \
-				(void)NULL;
-#define OKNEW(p)	if (!((p) = memget(sizeof *(p)))) { \
-				errno = ENOMEM; \
-				return (-1); \
-			} else \
-				FILL(p)
-#define FREE(p)		memput((p), sizeof *(p))
-
-#if EVENTLIB_DEBUG
-#define FILL(p)		memset((p), 0xF5, sizeof *(p))
-#else
-#define FILL(p)
-#endif
-
-#ifdef USE_POLL
-#ifdef HAVE_STROPTS_H
-#include <stropts.h>
-#endif
-#include <poll.h>
-#endif /* USE_POLL */
-
-typedef struct evConn {
-	evConnFunc	func;
-	void *		uap;
-	int		fd;
-	int		flags;
-#define EV_CONN_LISTEN		0x0001		/*%< Connection is a listener. */
-#define EV_CONN_SELECTED	0x0002		/*%< evSelectFD(conn->file). */
-#define EV_CONN_BLOCK		0x0004		/*%< Listener fd was blocking. */
-	evFileID	file;
-	struct evConn *	prev;
-	struct evConn *	next;
-} evConn;
-
-typedef struct evAccept {
-	int		fd;
-	union {
-		struct sockaddr		sa;
-		struct sockaddr_in	in;
-#ifndef NO_SOCKADDR_UN
-		struct sockaddr_un	un;
-#endif
-	}		la;
-	ISC_SOCKLEN_T	lalen;
-	union {
-		struct sockaddr		sa;
-		struct sockaddr_in	in;
-#ifndef NO_SOCKADDR_UN
-		struct sockaddr_un	un;
-#endif
-	}		ra;
-	ISC_SOCKLEN_T	ralen;
-	int		ioErrno;
-	evConn *	conn;
-	LINK(struct evAccept) link;
-} evAccept;
-
-typedef struct evFile {
-	evFileFunc	func;
-	void *		uap;
-	int		fd;
-	int		eventmask;
-	int		preemptive;
-	struct evFile *	prev;
-	struct evFile *	next;
-	struct evFile *	fdprev;
-	struct evFile *	fdnext;
-} evFile;
-
-typedef struct evStream {
-	evStreamFunc	func;
-	void *		uap;
-	evFileID	file;
-	evTimerID	timer;
-	int		flags;
-#define EV_STR_TIMEROK	0x0001	/*%< IFF timer valid. */
-	int		fd;
-	struct iovec *	iovOrig;
-	int		iovOrigCount;
-	struct iovec *	iovCur;
-	int		iovCurCount;
-	int		ioTotal;
-	int		ioDone;
-	int		ioErrno;
-	struct evStream	*prevDone, *nextDone;
-	struct evStream	*prev, *next;
-} evStream;
-
-typedef struct evTimer {
-	evTimerFunc	func;
-	void *		uap;
-	struct timespec	due, inter;
-	int		index;
-	int		mode;
-#define EV_TMR_RATE	1
-} evTimer;
-
-typedef struct evWait {
-	evWaitFunc	func;
-	void *		uap;
-	const void *	tag;
-	struct evWait *	next;
-} evWait;
-
-typedef struct evWaitList {
-	evWait *		first;
-	evWait *		last;
-	struct evWaitList *	prev;
-	struct evWaitList *	next;
-} evWaitList;
-
-typedef struct evEvent_p {
-	enum {  Accept, File, Stream, Timer, Wait, Free, Null  } type;
-	union {
-		struct {  evAccept *this;  }			accept;
-		struct {  evFile *this; int eventmask;  }	file;
-		struct {  evStream *this;  }			stream;
-		struct {  evTimer *this;  }			timer;
-		struct {  evWait *this;  }			wait;
-		struct {  struct evEvent_p *next;  }		free;
-		struct {  const void *placeholder;  }		null;
-	} u;
-} evEvent_p;
-
-#ifdef USE_POLL
-typedef struct { 
-	void		*ctx;	/* pointer to the evContext_p   */ 
-	uint32_t	type;	/* READ, WRITE, EXCEPT, nonblk  */ 
-	uint32_t	result;	/* 1 => revents, 0 => events    */ 
-} __evEmulMask; 
-
-#define emulMaskInit(ctx, field, ev, lastnext) \
-	ctx->field.ctx = ctx; \
-	ctx->field.type = ev; \
-	ctx->field.result = lastnext; 
-  
-extern short	*__fd_eventfield(int fd, __evEmulMask *maskp); 
-extern short	__poll_event(__evEmulMask *maskp); 
-extern void		__fd_clr(int fd, __evEmulMask *maskp); 
-extern void		__fd_set(int fd, __evEmulMask *maskp); 
-
-#undef  FD_ZERO 
-#define FD_ZERO(maskp) 
-  
-#undef  FD_SET 
-#define FD_SET(fd, maskp) \
-	__fd_set(fd, maskp) 
-
-#undef  FD_CLR 
-#define FD_CLR(fd, maskp) \
-	__fd_clr(fd, maskp) 
-
-#undef  FD_ISSET 
-#define FD_ISSET(fd, maskp) \
-	((*__fd_eventfield(fd, maskp) & __poll_event(maskp)) != 0) 
-
-#endif /* USE_POLL */
-
-typedef struct {
-	/* Global. */
-	const evEvent_p	*cur;
-	/* Debugging. */
-	int		debug;
-	FILE		*output;
-	/* Connections. */
-	evConn		*conns;
-	LIST(evAccept)	accepts;
-	/* Files. */
-	evFile		*files, *fdNext;
-#ifndef USE_POLL
-	fd_set		rdLast, rdNext;
-	fd_set		wrLast, wrNext;
-	fd_set		exLast, exNext;
-	fd_set		nonblockBefore;
-	int		fdMax, fdCount, highestFD;
-	evFile		*fdTable[FD_SETSIZE];
-#else
-	struct pollfd	*pollfds;	/* Allocated as needed  */ 
-	evFile		**fdTable;	/* Ditto                */ 
-	int		maxnfds;	/* # elements in above  */ 
-	int		firstfd;	/* First active fd      */ 
-	int		fdMax;		/* Last active fd       */ 
-	int		fdCount;	/* # fd:s with I/O      */ 
-	int		highestFD;	/* max fd allowed by OS */ 
-	__evEmulMask	rdLast, rdNext; 
-	__evEmulMask	wrLast, wrNext; 
-	__evEmulMask	exLast, exNext; 
-	__evEmulMask	nonblockBefore; 
-#endif /* USE_POLL */
-#ifdef EVENTLIB_TIME_CHECKS
-	struct timespec	lastSelectTime;
-	int		lastFdCount;
-#endif
-	/* Streams. */
-	evStream	*streams;
-	evStream	*strDone, *strLast;
-	/* Timers. */
-	struct timespec	lastEventTime;
-	heap_context	timers;
-	/* Waits. */
-	evWaitList	*waitLists;
-	evWaitList	waitDone;
-} evContext_p;
-
-/* eventlib.c */
-#define evPrintf __evPrintf
-void evPrintf(const evContext_p *ctx, int level, const char *fmt, ...)
-     ISC_FORMAT_PRINTF(3, 4);
-
-#ifdef USE_POLL
-extern int evPollfdRealloc(evContext_p *ctx, int pollfd_chunk_size, int fd);
-#endif /* USE_POLL */
-
-/* ev_timers.c */
-#define evCreateTimers __evCreateTimers
-heap_context evCreateTimers(const evContext_p *);
-#define evDestroyTimers __evDestroyTimers
-void evDestroyTimers(const evContext_p *);
-
-/* ev_waits.c */
-#define evFreeWait __evFreeWait
-evWait *evFreeWait(evContext_p *ctx, evWait *old);
-
-/* Global options */
-extern int	__evOptMonoTime;
-
-#endif /*_EVENTLIB_P_H*/
diff --git a/lib/libc/libcincludes.mk b/lib/libc/libcincludes.mk
deleted file mode 100644
index 32b0b3125..000000000
--- a/lib/libc/libcincludes.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#	$NetBSD: libcincludes.mk,v 1.2 2014/08/10 23:39:08 matt Exp $
-
-# Makefile fragment shared across several parts that want to look
-# inside libc's include tree.
-
-LIBC_MACHINE_ARCH?=	${MACHINE_ARCH}
-LIBC_MACHINE_CPU?=	${MACHINE_CPU}
-
-.if defined(LIBC_MACHINE_ARCH) && \
-    exists(${NETBSDSRCDIR}/lib/libc/arch/${LIBC_MACHINE_ARCH}/SYS.h)
-ARCHSUBDIR=	${LIBC_MACHINE_ARCH}
-.elif exists(${NETBSDSRCDIR}/lib/libc/arch/${LIBC_MACHINE_CPU}/SYS.h)
-ARCHSUBDIR=	${LIBC_MACHINE_CPU}
-.else
-.BEGIN:
-	@echo no ARCHDIR for ${LIBC_MACHINE_ARCH} nor ${LIBC_MACHINE_CPU}
-	@false
-.endif
-
-ARCHDIR=	${NETBSDSRCDIR}/lib/libc/arch/${ARCHSUBDIR}
diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc
deleted file mode 100644
index b6cd592fc..000000000
--- a/lib/libc/locale/Makefile.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-#	from: @(#)Makefile.inc	5.1 (Berkeley) 2/18/91
-#	$NetBSD: Makefile.inc,v 1.64 2013/08/18 20:03:48 joerg Exp $
-
-# locale sources
-.PATH: ${ARCHDIR}/locale ${.CURDIR}/locale
-
-SRCS+=	setlocale.c __mb_cur_max.c \
-	duplocale.c global_locale.c fix_grouping.c \
-	freelocale.c localeconv.c newlocale.c nl_langinfo.c \
-	generic_lc_all.c dummy_lc_collate.c \
-	wcstol.c wcstoll.c wcstoimax.c wcstoul.c wcstoull.c wcstoumax.c \
-	wcstod.c wcstof.c wcstold.c wcscoll.c wcsxfrm.c wcsftime.c
-
-# citrus multibyte locale support
-# we have quirk for libc.a - see the last part of lib/libc/Makefile
-CPPFLAGS+=	-DWITH_RUNE -I${.CURDIR}
-SRCS+=	_wctrans.c _wctype.c rune.c runetable.c \
-	multibyte_c90.c multibyte_amd1.c iswctype_mb.c
-CPPFLAGS.rune.c+=		-I${LIBCDIR}/citrus
-CPPFLAGS.runetable.c+=		-I${LIBCDIR}/citrus
-CPPFLAGS.multibyte_c90.c+=	-I${LIBCDIR}/citrus
-CPPFLAGS.multibyte_amd1.c+=	-I${LIBCDIR}/citrus
-
-MAN+=	setlocale.3 nl_langinfo.3
-
-MAN+=	mbtowc.3 mbstowcs.3 wctomb.3 wcstombs.3 mblen.3 \
-
-MAN+=	btowc.3 mbrtowc.3 mbsrtowcs.3 \
-	wctob.3 wcrtomb.3 wcsrtombs.3 \
-	mbrlen.3 mbsinit.3
-
-MAN+=	iswalnum.3 wctype.3 iswctype.3 \
-	towlower.3 wctrans.3 towctrans.3 \
-	wcwidth.3
-
-MAN+=	wcstol.3 wcstod.3 \
-	wcscoll.3 wcsxfrm.3 \
-	wcsftime.3
-
-MLINKS+=setlocale.3 localeconv.3
-
-MLINKS+=iswalnum.3 iswalpha.3 iswalnum.3 iswblank.3 \
-	iswalnum.3 iswcntrl.3 iswalnum.3 iswdigit.3 \
-	iswalnum.3 iswgraph.3 iswalnum.3 iswlower.3 \
-	iswalnum.3 iswprint.3 iswalnum.3 iswpunct.3 \
-	iswalnum.3 iswspace.3 iswalnum.3 iswupper.3 \
-	iswalnum.3 iswxdigit.3
-
-MLINKS+=towlower.3 towupper.3
-
-MLINKS+=wcstod.3 wcstof.3 wcstod.3 wcstold.3
-MLINKS+=wcstol.3 wcstoll.3 wcstol.3 wcstoimax.3 \
-	wcstol.3 wcstoul.3 wcstol.3 wcstoull.3 wcstol.3 wcstoumax.3
-
-COPTS.wcsftime.c = -Wno-format-nonliteral
diff --git a/lib/libc/locale/__mb_cur_max.c b/lib/libc/locale/__mb_cur_max.c
deleted file mode 100644
index 08c8f1d49..000000000
--- a/lib/libc/locale/__mb_cur_max.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*	$NetBSD: __mb_cur_max.c,v 1.2 2001/01/25 01:25:06 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __mb_cur_max.c,v 1.2 2001/01/25 01:25:06 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <limits.h>
-
-size_t __mb_cur_max = 1;
-size_t __mb_len_max_runtime = MB_LEN_MAX;
-
diff --git a/lib/libc/locale/__wctoint.h b/lib/libc/locale/__wctoint.h
deleted file mode 100644
index c5b695f12..000000000
--- a/lib/libc/locale/__wctoint.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* $NetBSD: __wctoint.h,v 1.1 2001/09/28 11:25:37 yamt Exp $ */
-
-/*-
- * Copyright (c)2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Citrus: xpg4dl/FreeBSD/lib/libc/locale/__wctoint.h,v 1.1 2001/09/21 13:52:32 yamt Exp $
- */
-
-
-__inline static int
-__wctoint(wchar_t wc)
-{
-	int n;
-
-	/* XXX I expect compiler to optimize this. :D */
-	switch (wc) {
-	case L'0': n = 0; break;
-	case L'1': n = 1; break;
-	case L'2': n = 2; break;
-	case L'3': n = 3; break;
-	case L'4': n = 4; break;
-	case L'5': n = 5; break;
-	case L'6': n = 6; break;
-	case L'7': n = 7; break;
-	case L'8': n = 8; break;
-	case L'9': n = 9; break;
-	case L'A': case L'a': n = 10; break;
-	case L'B': case L'b': n = 11; break;
-	case L'C': case L'c': n = 12; break;
-	case L'D': case L'd': n = 13; break;
-	case L'E': case L'e': n = 14; break;
-	case L'F': case L'f': n = 15; break;
-	case L'G': case L'g': n = 16; break;
-	case L'H': case L'h': n = 17; break;
-	case L'I': case L'i': n = 18; break;
-	case L'J': case L'j': n = 19; break;
-	case L'K': case L'k': n = 20; break;
-	case L'L': case L'l': n = 21; break;
-	case L'M': case L'm': n = 22; break;
-	case L'N': case L'n': n = 23; break;
-	case L'O': case L'o': n = 24; break;
-	case L'P': case L'p': n = 25; break;
-	case L'Q': case L'q': n = 26; break;
-	case L'R': case L'r': n = 27; break;
-	case L'S': case L's': n = 28; break;
-	case L'T': case L't': n = 29; break;
-	case L'U': case L'u': n = 30; break;
-	case L'V': case L'v': n = 31; break;
-	case L'W': case L'w': n = 32; break;
-	case L'X': case L'x': n = 33; break;
-	case L'Y': case L'y': n = 34; break;
-	case L'Z': case L'z': n = 35; break;
-	default: n = -1; break; /* error */
-	}
-
-	return n;
-}
diff --git a/lib/libc/locale/_wcstod.h b/lib/libc/locale/_wcstod.h
deleted file mode 100644
index 1b3cc4a5c..000000000
--- a/lib/libc/locale/_wcstod.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* $NetBSD: _wcstod.h,v 1.4 2013/05/17 12:55:57 joerg Exp $ */
-
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * aINre met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Original version ID:
- *   FreeBSD: /repoman/r/ncvs/src/lib/libc/locale/wcstod.c,v 1.4 2004/04/07 09:47:56 tjr Exp
- *   NetBSD: wcstod.c,v 1.8 2006/04/13 01:25:13 tnozaki Exp
- */
-
-/*
- * function template for wcstof, wcstod, wcstold.
- *
- * parameters:
- *	_FUNCNAME    : function name
- *	_RETURN_TYPE : return type
- *	_STRTOD_FUNC : real conversion function
- */
-#ifndef __WCSTOD_H_
-#define __WCSTOD_H_
-
-#include <locale.h>
-#include "setlocale_local.h"
-#define INT_NAME_(pre, middle, post) pre ## middle ## post
-#define INT_NAME(pre, middle, post) INT_NAME_(pre, middle, post)
-
-/*
- * Convert a string to a double-precision number.
- *
- * This is the wide-character counterpart of strto{f,d,ld}(). So that
- * we do not have to duplicate the code of strto{f,d,ld}() here,
- * we convert the supplied wide-character string to multibyte and
- * call strto{f,d,ld}() on the result.
- * This assumes that the multibyte encoding is compatible with ASCII
- * for at least the digits, radix character and letters.
- */
-static _RETURN_TYPE
-INT_NAME(_int_, _FUNCNAME, _l)(const wchar_t * __restrict nptr,
-			   wchar_t ** __restrict endptr, locale_t loc)
-{
-	const wchar_t *src, *start;
-	_RETURN_TYPE val;
-	char *buf, *end;
-	size_t bufsiz, len;
-
-	_DIAGASSERT(nptr != NULL);
-	/* endptr may be null */
-
-	src = nptr;
-	while (iswspace_l((wint_t)*src, loc) != 0)
-		++src;
-	if (*src == L'\0')
-		goto no_convert;
-
-	/*
-	 * Convert the supplied numeric wide-char. string to multibyte.
-	 *
-	 * We could attempt to find the end of the numeric portion of the
-	 * wide-char. string to avoid converting unneeded characters but
-	 * choose not to bother; optimising the uncommon case where
-	 * the input string contains a lot of text after the number
-	 * duplicates a lot of strto{f,d,ld}()'s functionality and
-	 * slows down the most common cases.
-	 */
-	start = src;
-	len = wcstombs_l(NULL, src, 0, loc);
-	if (len == (size_t)-1)
-		/* errno = EILSEQ */
-		goto no_convert;
-
-	_DIAGASSERT(len > 0);
-
-	bufsiz = len;
-	buf = (void *)malloc(bufsiz + 1);
-	if (buf == NULL)
-		/* errno = ENOMEM */
-		goto no_convert;
-
-	len = wcstombs_l(buf, src, bufsiz + 1, loc);
-
-	_DIAGASSERT(len == bufsiz);
-	_DIAGASSERT(buf[len] == '\0');
-
-	/* Let strto{f,d,ld}() do most of the work for us. */
-	val = _STRTOD_FUNC(buf, &end, loc);
-	if (buf == end) {
-		free(buf);
-		goto no_convert;
-	}
-
-	/*
-	 * We only know where the number ended in the _multibyte_
-	 * representation of the string. If the caller wants to know
-	 * where it ended, count multibyte characters to find the
-	 * corresponding position in the wide-char string.
-	 */
-	if (endptr != NULL)
-		/* XXX Assume each wide char is one byte. */
-		*endptr = __UNCONST(start + (size_t)(end - buf));
-
-	free(buf);
-
-	return val;
-
-no_convert:
-	if (endptr != NULL)
-		*endptr = __UNCONST(nptr);
-	return 0;
-}
-
-_RETURN_TYPE
-INT_NAME(, _FUNCNAME, )(const wchar_t * __restrict nptr,
-    wchar_t ** __restrict endptr)
-{
-	return INT_NAME(_int_, _FUNCNAME, _l)(nptr, endptr, _current_locale());
-}
-
-_RETURN_TYPE
-INT_NAME(, _FUNCNAME, _l)(const wchar_t * __restrict nptr,
-    wchar_t ** __restrict endptr, locale_t loc)
-{
-	return INT_NAME(_int_, _FUNCNAME, _l)(nptr, endptr, loc);
-}
-#endif /*__WCSTOD_H_*/
diff --git a/lib/libc/locale/_wcstol.h b/lib/libc/locale/_wcstol.h
deleted file mode 100644
index 1dc24c4f5..000000000
--- a/lib/libc/locale/_wcstol.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* $NetBSD: _wcstol.h,v 1.6 2013/05/17 12:55:57 joerg Exp $ */
-
-/*-
- * 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. 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.
- *
- * Original version ID:
- * @(#)strtol.c	8.1 (Berkeley) 6/4/93
- * NetBSD: wcstol.c,v 1.1 2001/09/27 16:30:36 yamt Exp
- * Citrus: xpg4dl/FreeBSD/lib/libc/locale/wcstol.c,v 1.2 2001/09/21 16:11:41 yamt Exp
- */
-
-/*
- * function template for wcstol, wcstoll and wcstoimax.
- *
- * parameters:
- *	_FUNCNAME : function name
- *      __INT     : return type
- *      __INT_MIN : lower limit of the return type
- *      __INT_MAX : upper limit of the return type
- */
-
-#include <locale.h>
-#include "setlocale_local.h"
-#define INT_FUNCNAME_(pre, name, post)	pre ## name ## post
-#define INT_FUNCNAME(pre, name, post)	INT_FUNCNAME_(pre, name, post)
-
-static __INT
-INT_FUNCNAME(_int_, _FUNCNAME, _l)(const wchar_t *nptr, wchar_t **endptr,
-				   int base, locale_t loc)
-{
-	const wchar_t *s;
-	__INT acc, cutoff;
-	wint_t wc;
-	int i;
-	int neg, any, cutlim;
-
-	_DIAGASSERT(nptr != NULL);
-	/* endptr may be NULL */
-
-#ifdef __GNUC__
-	(void)&acc; (void)&cutoff;
-#endif
-
-	/* check base value */
-	if (base && (base < 2 || base > 36)) {
-		errno = EINVAL;
-		return 0;
-	}
-
-	/*
-	 * Skip white space and pick up leading +/- sign if any.
-	 * If base is 0, allow 0x for hex and 0 for octal, else
-	 * assume decimal; if base is already 16, allow 0x.
-	 */
-	s = nptr;
-	do {
-		wc = (wchar_t) *s++;
-	} while (iswspace_l(wc, loc));
-	if (wc == L'-') {
-		neg = 1;
-		wc = *s++;
-	} else {
-		neg = 0;
-		if (wc == L'+')
-			wc = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    wc == L'0' && (*s == L'x' || *s == L'X')) {
-		wc = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = wc == L'0' ? 8 : 10;
-
-	/*
-	 * See strtol for comments as to the logic used.
-	 */
-	cutoff = neg ? __INT_MIN : __INT_MAX;
-	cutlim = (int)(cutoff % base);
-	cutoff /= base;
-	if (neg) {
-		if (cutlim > 0) {
-			cutlim -= base;
-			cutoff += 1;
-		}
-		cutlim = -cutlim;
-	}
-	for (acc = 0, any = 0;; wc = (wchar_t) *s++) {
-		i = __wctoint(wc);
-		if (i == -1)
-			break;
-		if (i >= base)
-			break;
-		if (any < 0)
-			continue;
-		if (neg) {
-			if (acc < cutoff || (acc == cutoff && i > cutlim)) {
-				any = -1;
-				acc = __INT_MIN;
-				errno = ERANGE;
-			} else {
-				any = 1;
-				acc *= base;
-				acc -= i;
-			}
-		} else {
-			if (acc > cutoff || (acc == cutoff && i > cutlim)) {
-				any = -1;
-				acc = __INT_MAX;
-				errno = ERANGE;
-			} else {
-				any = 1;
-				acc *= base;
-				acc += i;
-			}
-		}
-	}
-	if (endptr != 0)
-		*endptr = __UNCONST(any ? s - 1 : nptr);
-	return (acc);
-}
-
-__INT
-_FUNCNAME(const wchar_t *nptr, wchar_t **endptr, int base)
-{
-	return INT_FUNCNAME(_int_, _FUNCNAME, _l)(nptr, endptr, base,
-						  _current_locale());
-}
-
-__INT
-INT_FUNCNAME(, _FUNCNAME, _l)(const wchar_t *nptr, wchar_t **endptr,
-			      int base, locale_t loc)
-{
-	return INT_FUNCNAME(_int_, _FUNCNAME, _l)(nptr, endptr, base, loc);
-}
diff --git a/lib/libc/locale/_wcstoul.h b/lib/libc/locale/_wcstoul.h
deleted file mode 100644
index 98e7ca73c..000000000
--- a/lib/libc/locale/_wcstoul.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* $NetBSD: _wcstoul.h,v 1.6 2013/05/17 12:55:57 joerg Exp $ */
-
-/*
- * 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. 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.
- *
- * Original version ID:
- * @(#)strtoul.c	8.1 (Berkeley) 6/4/93
- * Citrus: xpg4dl/FreeBSD/lib/libc/locale/wcstoul.c,v 1.2 2001/09/21 16:11:41 yamt Exp
- * NetBSD: wcstoul.c,v 1.1 2001/09/27 16:30:37 yamt Exp
- */
-
-/*
- * function template for wcstoul, wcstoull and wcstoumax.
- *
- * parameters:
- *	_FUNCNAME  : function name
- *      __UINT     : return type
- *      __UINT_MAX : upper limit of the return type
- */
-
-#include <locale.h>
-#include "setlocale_local.h"
-#define INT_FUNCNAME_(pre, name, post)	pre ## name ## post
-#define INT_FUNCNAME(pre, name, post)	INT_FUNCNAME_(pre, name, post)
-
-static __UINT
-INT_FUNCNAME(_int_, _FUNCNAME, _l)(const wchar_t *nptr, wchar_t **endptr,
-				   int base, locale_t loc)
-{
-	const wchar_t *s;
-	__UINT acc, cutoff;
-	wint_t wc;
-	int i;
-	int neg, any, cutlim;
-
-	_DIAGASSERT(nptr != NULL);
-	/* endptr may be NULL */
-
-	if (base && (base < 2 || base > 36)) {
-		errno = EINVAL;
-		return 0;
-	}
-
-	/*
-	 * Skip white space and pick up leading +/- sign if any.
-	 * If base is 0, allow 0x for hex and 0 for octal, else
-	 * assume decimal; if base is already 16, allow 0x.
-	 */
-	s = nptr;
-	do {
-		wc = (wchar_t) *s++;
-	} while (iswspace_l(wc, loc));
-	if (wc == L'-') {
-		neg = 1;
-		wc = *s++;
-	} else {
-		neg = 0;
-		if (wc == L'+')
-			wc = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    wc == L'0' && (*s == L'x' || *s == L'X')) {
-		wc = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = wc == L'0' ? 8 : 10;
-
-	/*
-	 * See strtoul for comments as to the logic used.
-	 */
-	cutoff = __UINT_MAX / (__UINT)base;
-	cutlim = (int)(__UINT_MAX % (__UINT)base);
-	for (acc = 0, any = 0;; wc = (wchar_t) *s++) {
-		i = __wctoint(wc);
-		if (i == (wint_t)-1)
-			break;
-		if (i >= base)
-			break;
-		if (any < 0)
-			continue;
-		if (acc > cutoff || (acc == cutoff && i > cutlim)) {
-			any = -1;
-			acc = __UINT_MAX;
-			errno = ERANGE;
-		} else {
-			any = 1;
-			acc *= (__UINT)base;
-			acc += i;
-		}
-	}
-	if (neg && any > 0)
-		acc = -acc;
-	if (endptr != 0)
-		*endptr = __UNCONST(any ? s - 1 : nptr);
-	return (acc);
-}
-
-__UINT
-_FUNCNAME(const wchar_t *nptr, wchar_t **endptr, int base)
-{
-	return INT_FUNCNAME(_int_, _FUNCNAME, _l)(nptr, endptr, base,
-						  _current_locale());
-}
-
-__UINT
-INT_FUNCNAME(, _FUNCNAME, _l)(const wchar_t *nptr, wchar_t **endptr,
-			      int base, locale_t loc)
-{
-	return INT_FUNCNAME(_int_, _FUNCNAME, _l)(nptr, endptr, base, loc);
-}
diff --git a/lib/libc/locale/_wctrans.c b/lib/libc/locale/_wctrans.c
deleted file mode 100644
index c432c4ef6..000000000
--- a/lib/libc/locale/_wctrans.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*	$NetBSD: _wctrans.c,v 1.17 2010/06/13 04:14:57 tnozaki Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _wctrans.c,v 1.17 2010/06/13 04:14:57 tnozaki Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <assert.h>
-#include <wctype.h>
-
-#include "runetype_local.h"
-#include "_wctrans_local.h"
-
-/*
- * _towctrans_ext:
- *	translate a character (extended part)
- */
-wint_t
-_towctrans_ext(wint_t c, struct _WCTransEntry const *te)
-{
-	__nbrune_t c0;
-	uint32_t x;
-	_RuneRange *rr;
-	_RuneEntry *base, *re;
-
-	_DIAGASSERT(te != NULL);
-
-	if (c == WEOF)
-		return (c);
-
-	c0 = (__nbrune_t)c; /* XXX assumes wchar_t = int */
-	rr = te->te_extmap;
-	base = rr->rr_rune_ranges;
-	for (x = rr->rr_nranges; x != 0; x >>= 1) {
-		re = base + (x >> 1);
-		if (re->re_min <= c0 && re->re_max >= c0)
-			return (re->re_map + c0 - re->re_min);
-		else if (c0 >= re->re_max) {
-			base = re + 1;
-			x--;
-		}
-	}
-
-	return (c);
-}
diff --git a/lib/libc/locale/_wctrans_local.h b/lib/libc/locale/_wctrans_local.h
deleted file mode 100644
index d288ce767..000000000
--- a/lib/libc/locale/_wctrans_local.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: _wctrans_local.h,v 1.9 2010/06/02 15:47:25 tnozaki Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _WCTRANS_LOCAL_H_
-#define _WCTRANS_LOCAL_H_
-
-__BEGIN_DECLS
-wint_t	_towctrans_ext(wint_t, _WCTransEntry const *);
-__END_DECLS
-
-static __inline wint_t
-_towctrans_priv(wint_t c, _WCTransEntry const *te)
-{
-	return (_RUNE_ISCACHED(c)
-		? (wint_t)te->te_cached[(size_t)c]
-		: _towctrans_ext(c, te));
-}
-
-static __inline struct _WCTransEntry *
-_wctrans_lower(_RuneLocale *rl)
-{
-	_DIAGASSERT(rl->rl_wctrans[_WCTRANS_INDEX_LOWER].te_name != NULL);
-
-	return (&rl->rl_wctrans[_WCTRANS_INDEX_LOWER]);
-}
-
-static __inline struct _WCTransEntry *
-_wctrans_upper(_RuneLocale *rl)
-{
-	_DIAGASSERT(rl->rl_wctrans[_WCTRANS_INDEX_UPPER].te_name != NULL);
-
-	return (&rl->rl_wctrans[_WCTRANS_INDEX_UPPER]);
-}
-
-#endif /*_WCTRANS_LOCAL_H_*/
diff --git a/lib/libc/locale/_wctype.c b/lib/libc/locale/_wctype.c
deleted file mode 100644
index 5e22ceb62..000000000
--- a/lib/libc/locale/_wctype.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* $NetBSD: _wctype.c,v 1.9 2010/06/13 04:14:57 tnozaki Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _wctype.c,v 1.9 2010/06/13 04:14:57 tnozaki Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <wctype.h>
-
-#include "runetype_local.h"
-#include "_wctrans_local.h"
-#include "_wctype_local.h"
-
-_RuneType
-_runetype_priv(_RuneLocale const *rl, wint_t wc)
-{
-	__nbrune_t wc0;
-	_RuneRange const *rr;
-	_RuneEntry *base, *re;
-	uint32_t x;
-
-	_DIAGASSERT(rl != NULL);
-
-	if (wc == WEOF)
-		return 0U;
-	if (_RUNE_ISCACHED(wc))
-		return rl->rl_runetype[(size_t)wc];
-	wc0 = (__nbrune_t)wc;
-	rr = &rl->rl_runetype_ext;
-	_DIAGASSERT(rr != NULL);
-	base = rr->rr_rune_ranges;
-	for (x = rr->rr_nranges; x != (uint32_t)0; x >>= 1) {
-		re = base + (x >> 1);
-		if (re->re_min <= wc0 && re->re_max >= wc0) {
-			if (re->re_rune_types)
-				return re->re_rune_types[wc0 - re->re_min];
-			else
-				return re->re_map;
-		} else if (wc0 > re->re_max) {
-			base = re + 1;
-			--x;
-		}
-	}
-	return (_RuneType)0U;
-}
-
-int
-_iswctype_priv(_RuneLocale const *rl,
-    wint_t wc, _WCTypeEntry const *te)
-{
-	return !!(_runetype_priv(rl, wc) & te->te_mask);
-}
diff --git a/lib/libc/locale/_wctype_local.h b/lib/libc/locale/_wctype_local.h
deleted file mode 100644
index 8c0322445..000000000
--- a/lib/libc/locale/_wctype_local.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $NetBSD: _wctype_local.h,v 1.3 2010/06/02 15:47:25 tnozaki Exp $ */
-
-/*-
- * Copyright (c) 2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _WCTYPE_LOCAL_H_
-#define _WCTYPE_LOCAL_H_
-
-__BEGIN_DECLS
-_RuneType	_runetype_priv(_RuneLocale const *, wint_t);
-int		_iswctype_priv(_RuneLocale const *, wint_t, _WCTypeEntry const *);
-__END_DECLS
-
-#endif /*_WCTYPE_LOCAL_H_*/
diff --git a/lib/libc/locale/aliasname_local.h b/lib/libc/locale/aliasname_local.h
deleted file mode 100644
index bad619b7d..000000000
--- a/lib/libc/locale/aliasname_local.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* $NetBSD: aliasname_local.h,v 1.3 2009/01/11 02:46:28 christos Exp $ */
-
-/*-
- * Copyright (c)2002 YAMAMOTO Takashi,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _ALIASNAME_LOCAL_H_
-#define _ALIASNAME_LOCAL_H_
-
-const char *__unaliasname(const char *, const char *, void *, size_t);
-
-static __inline int
-__isforcemapping(const char *name)
-{
-	/* don't use strcasecmp, it owes locale. */
-	return
-	    name[0] == '/' &&
-	    (name[1] == 'F' || name[1] == 'f') &&
-	    (name[2] == 'O' || name[2] == 'o') &&
-	    (name[3] == 'R' || name[3] == 'r') &&
-	    (name[4] == 'C' || name[4] == 'c') &&
-	    (name[5] == 'E' || name[5] == 'e') &&
-	    name[6] == '\0';
-}
-
-#endif /*_ALIASNAME_LOCAL_H_*/
diff --git a/lib/libc/locale/btowc.3 b/lib/libc/locale/btowc.3
deleted file mode 100644
index 003531d50..000000000
--- a/lib/libc/locale/btowc.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" $NetBSD: btowc.3,v 1.4 2004/01/24 16:58:54 wiz Exp $
-.\"
-.\" Copyright (c)2003 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd March 3, 2003
-.Dt BTOWC 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm btowc
-.Nd convert a single byte character to a wide character
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wint_t
-.Fn btowc "int c"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-The
-.Fn btowc
-function converts a single byte character
-.Fa c
-in the initial shift state of the current locale to a corresponding
-wide character.
-.Pp
-The behaviour of
-.Fn btowc
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-The
-.Fn btowc
-function returns:
-.Bl -tag -width 012345678901
-.It Dv WEOF
-If
-.Fa c
-is
-.Dv EOF
-or if (unsigned char)
-.Fa c
-does not correspond to a valid single byte character representation.
-.It (otherwise)
-A wide character corresponding to
-.Fa c .
-.El
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-No errors are defined.
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr mbrtowc 3 ,
-.Xr setlocale 3 ,
-.Xr wctob 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn btowc
-function conforms to
-.St -isoC-amd1 .
diff --git a/lib/libc/locale/ctype_local.h b/lib/libc/locale/ctype_local.h
deleted file mode 100644
index b8a230c72..000000000
--- a/lib/libc/locale/ctype_local.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $NetBSD: ctype_local.h,v 1.5 2013/04/13 10:21:20 joerg Exp $ */
-
-/*-
- * Copyright (c) 2010 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _CTYPE_LOCAL_H_
-#define _CTYPE_LOCAL_H_
-
-#include <limits.h>
-
-#define _CTYPE_NUM_CHARS	(1 << CHAR_BIT)
-#define _CTYPE_CACHE_SIZE	(1 << 8)
-
-#define _COMPAT_U	0x01
-#define _COMPAT_L	0x02
-#define _COMPAT_N	0x04
-#define _COMPAT_S	0x08
-#define _COMPAT_P	0x10
-#define _COMPAT_C	0x20
-#define _COMPAT_X	0x40
-#define _COMPAT_B	0x80
-
-extern const unsigned short _C_ctype_tab_[];
-extern const short _C_toupper_tab_[];
-extern const short _C_tolower_tab_[];
-
-#ifdef __BUILD_LEGACY
-extern const unsigned char	*_ctype_;
-extern const unsigned char	_C_compat_bsdctype[];
-#endif
-
-#endif /*_CTYPE_LOCAL_H_*/
diff --git a/lib/libc/locale/dummy_lc_collate.c b/lib/libc/locale/dummy_lc_collate.c
deleted file mode 100644
index 10c952c5f..000000000
--- a/lib/libc/locale/dummy_lc_collate.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $NetBSD: dummy_lc_collate.c,v 1.3 2012/03/04 21:14:56 tnozaki Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: dummy_lc_collate.c,v 1.3 2012/03/04 21:14:56 tnozaki Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <langinfo.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "setlocale_local.h"
-
-/*
- * macro required by dummy_lc_template.h
- */
-#define _PREFIX(name)		__CONCAT(_dummy_LC_COLLATE_,name)
-
-#define _CATEGORY_ID		LC_COLLATE
-#define _CATEGORY_NAME		"LC_COLLATE"
-
-#include "dummy_lc_template.h"
diff --git a/lib/libc/locale/dummy_lc_template.h b/lib/libc/locale/dummy_lc_template.h
deleted file mode 100644
index ac9e3de1b..000000000
--- a/lib/libc/locale/dummy_lc_template.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $NetBSD: dummy_lc_template.h,v 1.4 2013/04/14 23:30:16 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _DUMMY_LC_TEMPLATE_H_
-#define _DUMMY_LC_TEMPLATE_H_
-
-#include "generic_lc_template_decl.h"
-
-const char *
-_PREFIX(setlocale)(const char * __restrict name,
-    struct _locale * __restrict locale)
-{
-	if (name != NULL) {
-		if (*name == '\0')
-			name = _get_locale_env(_CATEGORY_NAME);
-		if (strcmp(name, locale->part_name[(size_t)_CATEGORY_ID])) {
-			if (!strcmp(_C_LOCALE, name))
-				name = _C_LOCALE;
-			else if (!strcmp(_POSIX_LOCALE, name))
-				name = _POSIX_LOCALE;
-			else
-				return NULL;
-			locale->part_name[(size_t)_CATEGORY_ID] = name;
-		}
-	}
-	return locale->part_name[(size_t)_CATEGORY_ID];
-}
-
-#endif /*_DUMMY_LC_TEMPLATE_H_*/
diff --git a/lib/libc/locale/duplocale.c b/lib/libc/locale/duplocale.c
deleted file mode 100644
index 6217fdaf1..000000000
--- a/lib/libc/locale/duplocale.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $NetBSD: duplocale.c,v 1.1 2013/04/30 00:45:05 joerg Exp $ */
-
-/*-
- * Copyright (c)2008, 2011 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: duplocale.c,v 1.1 2013/04/30 00:45:05 joerg Exp $");
-
-#include "namespace.h"
-
-#include <stdlib.h>
-#include <locale.h>
-#include <string.h>
-
-#include "setlocale_local.h"
-
-__weak_alias(duplocale, _duplocale)
-
-locale_t
-duplocale(locale_t src)
-{
-	struct _locale *dst;
-
-	dst = malloc(sizeof(*dst));
-	if (dst != NULL)
-		memcpy(dst, src, sizeof(*dst));
-
-	return dst;
-}
diff --git a/lib/libc/locale/fix_grouping.c b/lib/libc/locale/fix_grouping.c
deleted file mode 100644
index 8fe5911b0..000000000
--- a/lib/libc/locale/fix_grouping.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* $NetBSD: fix_grouping.c,v 1.6 2012/03/21 14:11:24 christos Exp $ */
-
-/*
- * Copyright (c) 2001 Alexey Zelkin <phantom@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.
- *
- * Original version ID:
- *     FreeBSD: fix_grouping.c,v 1.8 2003/06/26 10:46:16 phantom Exp
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fix_grouping.c,v 1.6 2012/03/21 14:11:24 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <limits.h>
-#include <stddef.h>
-
-#include "fix_grouping.h"
-
-#ifndef NBCHAR_MAX
-#define NBCHAR_MAX	(char)CHAR_MAX
-#endif
-
-#ifndef __UNCONST
-#define __UNCONST(a)    ((void *)(unsigned long)(const void *)(a))
-#endif
-
-static const char nogrouping[] = { NBCHAR_MAX, '\0' };
-
-/* don't use libc's isdigit, it owes locale. */
-#define isdigit(c)	(c >= '0' && c <= '9')
-
-/*
- * Internal helper used to convert grouping sequences from string
- * representation into POSIX specified form, i.e.
- *
- * "3;3;-1" -> "\003\003\177\000"
- */
-
-const char *
-__fix_locale_grouping_str(const char *str)
-{
-	char *src, *dst;
-	char n;
-
-	if (str == NULL || *str == '\0') {
-		return nogrouping;
-	}
-
-	for (src = __UNCONST(str), dst = __UNCONST(str); *src != '\0'; src++) {
-
-		/* input string examples: "3;3", "3;2;-1" */
-		if (*src == ';')
-			continue;
-	
-		if (*src == '-' && *(src+1) == '1') {
-			*dst++ = NBCHAR_MAX;
-			src++;
-			continue;
-		}
-
-		if (!isdigit((unsigned char)*src)) {
-			/* broken grouping string */
-			return nogrouping;
-		}
-
-		/* assume all numbers <= 99 */
-		n = *src - '0';
-		if (isdigit((unsigned char)*(src+1))) {
-			src++;
-			n *= 10;
-			n += *src - '0';
-		}
-
-		*dst = n;
-		/* NOTE: assume all input started with "0" as 'no grouping' */
-		if (*dst == '\0')
-			return (dst == __UNCONST(str)) ? nogrouping : str;
-		dst++;
-	}
-	*dst = '\0';
-	return str;
-}
diff --git a/lib/libc/locale/fix_grouping.h b/lib/libc/locale/fix_grouping.h
deleted file mode 100644
index 7da873372..000000000
--- a/lib/libc/locale/fix_grouping.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $NetBSD: fix_grouping.h,v 1.2 2009/01/11 02:46:28 christos Exp $ */
-
-/*-
- * Copyright (c) 2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _FIX_GROUPING_H_
-#define _FIX_GROUPING_H_
-
-__BEGIN_DECLS
-const char *__fix_locale_grouping_str(const char *);
-__END_DECLS
-
-#endif /*_FIX_GROUPING_H_*/
diff --git a/lib/libc/locale/freelocale.c b/lib/libc/locale/freelocale.c
deleted file mode 100644
index 8d408cc6e..000000000
--- a/lib/libc/locale/freelocale.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $NetBSD: freelocale.c,v 1.2 2013/05/17 12:55:57 joerg Exp $ */
-
-/*-
- * Copyright (c)2008, 2011 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: freelocale.c,v 1.2 2013/05/17 12:55:57 joerg Exp $");
-
-#include "namespace.h"
-
-#define __SETLOCALE_SOURCE__
-#include <assert.h>
-#include <locale.h>
-#include <stdlib.h>
-
-#include "setlocale_local.h"
-
-__weak_alias(freelocale, _freelocale)
-
-void
-freelocale(locale_t locale)
-{
-
-	_DIAGASSERT(locale != LC_GLOBAL_LOCALE);
-	_DIAGASSERT(locale != LC_C_LOCALE);
-	_DIAGASSERT(locale != NULL);
-	free(locale);
-}
diff --git a/lib/libc/locale/generic_lc_all.c b/lib/libc/locale/generic_lc_all.c
deleted file mode 100644
index 1c7f43e74..000000000
--- a/lib/libc/locale/generic_lc_all.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* $NetBSD: generic_lc_all.c,v 1.5 2013/04/14 23:30:16 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: generic_lc_all.c,v 1.5 2013/04/14 23:30:16 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <langinfo.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "setlocale_local.h"
-
-/*
- * macro required by all template headers
- */
-#define _PREFIX(name)	__CONCAT(_generic_LC_ALL_, name)
-
-#include "generic_lc_template_decl.h"
-
-const char *
-_generic_LC_ALL_setlocale(const char * __restrict name,
-    struct _locale * __restrict locale)
-{
-	_locale_set_t sl;
-	char head[_LOCALENAME_LEN_MAX * (_LC_LAST - 1)], *tail;
-	const char *tokens[_LC_LAST], *s, *t;
-	int load_locale_success, i, j;
-
-	sl = _find_category(1);
-	_DIAGASSERT(sl != NULL);
-	load_locale_success = 0;
-	if (name != NULL) {
-		strlcpy(&head[0], name, sizeof(head));
-		tokens[1] = &head[0];
-		tail = strchr(tokens[1], '/');
-		if (tail == NULL) {
-			for (i = 2; i < _LC_LAST; ++i)
-				tokens[i] = tokens[1];
-		} else {
-			*tail++ = '\0';
-			for (i = 2; i < _LC_LAST - 1; ++i) {
-				tokens[i] = (const char *)tail;
-				tail = strchr(tokens[i], '/');
-				if (tail == NULL)
-					return NULL;
-				*tail++ = '\0';
-			}
-			tokens[_LC_LAST - 1] = (const char *)tail;
-			tail = strchr(tokens[i], '/');
-			if (tail != NULL)
-				return NULL;
-		}
-		if ((*sl)(tokens[1], locale) != NULL)
-			load_locale_success = 1;
-	}
-	s = (*sl)(NULL, locale);
-	_DIAGASSERT(s != NULL);
-	strlcpy(&locale->query[0], s, sizeof(locale->query));
-	for (i = 2, j = 0; i < _LC_LAST; ++i) {
-		sl = _find_category(i);
-		_DIAGASSERT(sl != NULL);
-		if (name != NULL) {
-			if ((*sl)(tokens[i], locale) != NULL)
-				load_locale_success = 1;
-		}
-		t = (*sl)(NULL, locale);
-		_DIAGASSERT(t != NULL);
-		if (j == 0) {
-			if (!strcmp(s, t))
-				continue;
-			for (j = 2; j < i; ++j) {
-				strlcat(&locale->query[0], "/",
-				    sizeof(locale->query));
-				strlcat(&locale->query[0], s,
-				    sizeof(locale->query));
-			}
-		}
-		strlcat(&locale->query[0], "/", sizeof(locale->query));
-		strlcat(&locale->query[0], t, sizeof(locale->query));
-	}
-	if (name != NULL && !load_locale_success)
-		return NULL;
-	return (const char *)&locale->query[0];
-}
-
diff --git a/lib/libc/locale/generic_lc_template_decl.h b/lib/libc/locale/generic_lc_template_decl.h
deleted file mode 100644
index c90eb8353..000000000
--- a/lib/libc/locale/generic_lc_template_decl.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $NetBSD: generic_lc_template_decl.h,v 1.4 2013/04/14 23:30:16 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _GENERIC_LC_TEMPLATE_DECL_H_
-#define _GENERIC_LC_TEMPLATE_DECL_H_
-
-const char * _PREFIX(setlocale)(const char * __restrict,
-    struct _locale * __restrict);
-
-#endif /*_GENERIC_LC_TEMPLATE_DECL_H_*/
diff --git a/lib/libc/locale/global_locale.c b/lib/libc/locale/global_locale.c
deleted file mode 100644
index 2dc016112..000000000
--- a/lib/libc/locale/global_locale.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* $NetBSD: global_locale.c,v 1.21 2013/09/13 13:13:32 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: global_locale.c,v 1.21 2013/09/13 13:13:32 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/ctype_bits.h>
-#include <sys/localedef.h>
-#include <langinfo.h>
-#include <limits.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include <stdlib.h>
-
-#include "runetype_local.h"
-#include "setlocale_local.h"
-
-#ifndef NBCHAR_MAX
-#define NBCHAR_MAX (char)CHAR_MAX
-#endif
-
-static const _MessagesLocale _DefaultMessagesLocale = {
-	"^[Yy]",
-	"^[Nn]",
-	"yes",
-	"no"
-};
-
-static const _MonetaryLocale _DefaultMonetaryLocale = {
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	(char)CHAR_MAX,
-	(char)CHAR_MAX,
-	(char)CHAR_MAX,
-	(char)CHAR_MAX,
-	(char)CHAR_MAX,
-	(char)CHAR_MAX,
-	(char)CHAR_MAX,
-	(char)CHAR_MAX,
-	(char)CHAR_MAX,
-	(char)CHAR_MAX,
-	(char)CHAR_MAX,
-	(char)CHAR_MAX,
-	(char)CHAR_MAX,
-	(char)CHAR_MAX
-};
-
-static const _NumericLocale _DefaultNumericLocale = {
-	".",
-	"",
-	""
-};
-
-static const _TimeLocale _DefaultTimeLocale = 
-{
-	{
-		"Sun","Mon","Tue","Wed","Thu","Fri","Sat",
-	},
-	{
-		"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
-		"Friday", "Saturday"
-	},
-	{
-		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-	},
-	{
-		"January", "February", "March", "April", "May", "June", "July",
-		"August", "September", "October", "November", "December"
-	},
-	{
-		"AM", "PM"
-	},
-	"%a %b %e %H:%M:%S %Y",
-	"%m/%d/%y",
-	"%H:%M:%S",
-	"%I:%M:%S %p"
-};
-
-static const char _lc_C_locale_name[] = _C_LOCALE;
-
-__dso_hidden const struct _locale_cache_t _C_cache = {
-    .ldata = {
-	.decimal_point		= __UNCONST("."),
-	.thousands_sep		= __UNCONST(""),
-	.grouping		= __UNCONST(""),
-	.int_curr_symbol	= __UNCONST(""),
-	.currency_symbol	= __UNCONST(""),
-	.mon_decimal_point	= __UNCONST(""),
-	.mon_thousands_sep	= __UNCONST(""),
-	.mon_grouping		= __UNCONST(""),
-	.positive_sign		= __UNCONST(""),
-	.negative_sign		= __UNCONST(""),
-	.int_frac_digits	= NBCHAR_MAX,
-	.frac_digits		= NBCHAR_MAX,
-	.p_cs_precedes		= NBCHAR_MAX,
-	.p_sep_by_space		= NBCHAR_MAX,
-	.n_cs_precedes		= NBCHAR_MAX,
-	.n_sep_by_space		= NBCHAR_MAX,
-	.p_sign_posn		= NBCHAR_MAX,
-	.n_sign_posn		= NBCHAR_MAX,
-	.int_p_cs_precedes	= NBCHAR_MAX,
-	.int_n_cs_precedes	= NBCHAR_MAX,
-	.int_p_sep_by_space	= NBCHAR_MAX,
-	.int_n_sep_by_space	= NBCHAR_MAX,
-	.int_p_sign_posn	= NBCHAR_MAX,
-	.int_n_sign_posn	= NBCHAR_MAX,
-    },
-    .monetary_name = _lc_C_locale_name,
-    .numeric_name = _lc_C_locale_name,
-};
-
-__dso_protected struct _locale _lc_global_locale = {
-    .cache = &_C_cache,
-    .query = { _C_LOCALE },
-    .part_name = {
-	[(size_t)LC_ALL     ] = _lc_C_locale_name,
-	[(size_t)LC_COLLATE ] = _lc_C_locale_name,
-	[(size_t)LC_CTYPE   ] = _lc_C_locale_name,
-	[(size_t)LC_MONETARY] = _lc_C_locale_name,
-	[(size_t)LC_NUMERIC ] = _lc_C_locale_name,
-	[(size_t)LC_TIME    ] = _lc_C_locale_name,
-	[(size_t)LC_MESSAGES] = _lc_C_locale_name,
-    },
-    .part_impl = {
-	[(size_t)LC_ALL     ] = (_locale_part_t)NULL,
-	[(size_t)LC_COLLATE ] = (_locale_part_t)NULL,
-	[(size_t)LC_CTYPE   ] = (_locale_part_t)
-	    __UNCONST(&_DefaultRuneLocale),
-	[(size_t)LC_MONETARY] = (_locale_part_t)
-	    __UNCONST(&_DefaultMonetaryLocale),
-	[(size_t)LC_NUMERIC ] = (_locale_part_t)
-	    __UNCONST(&_DefaultNumericLocale),
-	[(size_t)LC_MESSAGES] = (_locale_part_t)
-	    __UNCONST(&_DefaultMessagesLocale),
-	[(size_t)LC_TIME] = (_locale_part_t)
-	    __UNCONST(&_DefaultTimeLocale),
-    },
-};
-
-__dso_protected const struct _locale _lc_C_locale = {
-    .cache = &_C_cache,
-    .query = { _C_LOCALE },
-    .part_name = {
-	[(size_t)LC_ALL     ] = _lc_C_locale_name,
-	[(size_t)LC_COLLATE ] = _lc_C_locale_name,
-	[(size_t)LC_CTYPE   ] = _lc_C_locale_name,
-	[(size_t)LC_MONETARY] = _lc_C_locale_name,
-	[(size_t)LC_NUMERIC ] = _lc_C_locale_name,
-	[(size_t)LC_TIME    ] = _lc_C_locale_name,
-	[(size_t)LC_MESSAGES] = _lc_C_locale_name,
-    },
-    .part_impl = {
-	[(size_t)LC_ALL     ] = (_locale_part_t)NULL,
-	[(size_t)LC_COLLATE ] = (_locale_part_t)NULL,
-	[(size_t)LC_CTYPE   ] = (_locale_part_t)
-	    __UNCONST(&_DefaultRuneLocale),
-	[(size_t)LC_MONETARY] = (_locale_part_t)
-	    __UNCONST(&_DefaultMonetaryLocale),
-	[(size_t)LC_NUMERIC ] = (_locale_part_t)
-	    __UNCONST(&_DefaultNumericLocale),
-	[(size_t)LC_MESSAGES] = (_locale_part_t)
-	    __UNCONST(&_DefaultMessagesLocale),
-	[(size_t)LC_TIME] = (_locale_part_t)
-	    __UNCONST(&_DefaultTimeLocale),
-    },
-};
diff --git a/lib/libc/locale/iswalnum.3 b/lib/libc/locale/iswalnum.3
deleted file mode 100644
index d986995a1..000000000
--- a/lib/libc/locale/iswalnum.3
+++ /dev/null
@@ -1,116 +0,0 @@
-.\"	$NetBSD: iswalnum.3,v 1.9 2004/01/24 16:58:54 wiz Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)isalnum.3	5.2 (Berkeley) 6/29/91
-.\"
-.Dd December 22, 2000
-.Dt ISWALNUM 3
-.Os
-.Sh NAME
-.Nm iswalnum ,
-.Nm iswalpha ,
-.Nm iswblank ,
-.Nm iswcntrl ,
-.Nm iswdigit ,
-.Nm iswgraph ,
-.Nm iswlower ,
-.Nm iswprint ,
-.Nm iswpunct ,
-.Nm iswspace ,
-.Nm iswupper ,
-.Nm iswxdigit
-.Nd wide character classification utilities
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wctype.h
-.Ft int
-.Fn iswalnum "wint_t wc"
-.Ft int
-.Fn iswalpha "wint_t wc"
-.Ft int
-.Fn iswblank "wint_t wc"
-.Ft int
-.Fn iswcntrl "wint_t wc"
-.Ft int
-.Fn iswdigit "wint_t wc"
-.Ft int
-.Fn iswgraph "wint_t wc"
-.Ft int
-.Fn iswlower "wint_t wc"
-.Ft int
-.Fn iswprint "wint_t wc"
-.Ft int
-.Fn iswpunct "wint_t wc"
-.Ft int
-.Fn iswspace "wint_t wc"
-.Ft int
-.Fn iswupper "wint_t wc"
-.Ft int
-.Fn iswxdigit "wint_t wc"
-.Sh DESCRIPTION
-The functions are character classification utility functions,
-for use with wide characters
-.Po
-.Fa wchar_t
-or
-.Fa wint_t
-.Pc .
-See the description of singlebyte classification functions, like
-.Xr isalnum 3 ,
-for details.
-.Sh RETURN VALUES
-The functions return zero if the character tests false and
-return non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3
-.Sh STANDARDS
-The functions conform to
-.St -isoC-99 .
-.Sh CAVEATS
-The argument to these functions must be
-.Dv WEOF
-or a valid
-.Fa wchar_t
-value with the current locale; otherwise, the result is undefined.
diff --git a/lib/libc/locale/iswctype.3 b/lib/libc/locale/iswctype.3
deleted file mode 100644
index 6225844ae..000000000
--- a/lib/libc/locale/iswctype.3
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" $NetBSD: iswctype.3,v 1.7 2007/05/21 15:20:40 tnozaki Exp $
-.\"
-.\" Copyright (c)2003 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd March 4, 2003
-.Dt ISWCTYPE 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm iswctype
-.Nd test a character for character class identifier
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In wctype.h
-.Ft int
-.Fn iswctype "wint_t wc" "wctype_t charclass"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-The
-.Fn iswctype
-function returns a boolean value that indicates whether a wide character
-.Fa wc
-is in
-.Fa charclass .
-.Pp
-The behaviour of
-.Fn iswctype
-is undefined if the
-.Fn iswctype
-function is called with an invalid
-.Fa charclass
-(changes of
-.Dv LC_CTYPE
-category invalidate
-.Fa charclass )
-or invalid wide character
-.Fa wc .
-.Pp
-The behaviour of
-.Fn iswctype
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-The
-.Fn iswctype
-returns:
-.Bl -tag -width 012345678901
-.It 0
-.Fa wc
-is not in
-.Fa charclass .
-.It non-zero
-.Fa wc
-is in
-.Fa charclass .
-.El
-.Pp
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-No errors are defined.
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr setlocale 3 ,
-.Xr towctrans 3 ,
-.Xr wctrans 3 ,
-.Xr wctype 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn iswctype
-function conforms to
-.St -isoC-amd1 .
diff --git a/lib/libc/locale/iswctype_mb.c b/lib/libc/locale/iswctype_mb.c
deleted file mode 100644
index b0ee10a91..000000000
--- a/lib/libc/locale/iswctype_mb.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/* $NetBSD: iswctype_mb.c,v 1.13 2013/05/17 12:55:57 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: iswctype_mb.c,v 1.13 2013/05/17 12:55:57 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "setlocale_local.h"
-
-#include "runetype_local.h"
-#include "_wctype_local.h"
-#include "_wctrans_local.h"
-
-#define _RUNE_LOCALE(loc) ((_RuneLocale const *) \
-    (loc)->part_impl[(size_t)LC_CTYPE])
-
-#define _ISWCTYPE_FUNC(name, index)			\
-int							\
-isw##name##_l(wint_t wc, locale_t loc)			\
-{							\
-	_RuneLocale const *rl;				\
-	_WCTypeEntry const *te;				\
-							\
-	rl = _RUNE_LOCALE(loc);				\
-	te = &rl->rl_wctype[index];			\
-	return _iswctype_priv(rl, wc, te);		\
-}							\
-int							\
-isw##name(wint_t wc)					\
-{							\
-	return isw##name##_l(wc, _current_locale());	\
-}
-
-_ISWCTYPE_FUNC(alnum,  _WCTYPE_INDEX_ALNUM)
-_ISWCTYPE_FUNC(alpha,  _WCTYPE_INDEX_ALPHA)
-_ISWCTYPE_FUNC(blank,  _WCTYPE_INDEX_BLANK)
-_ISWCTYPE_FUNC(cntrl,  _WCTYPE_INDEX_CNTRL)
-_ISWCTYPE_FUNC(digit,  _WCTYPE_INDEX_DIGIT)
-_ISWCTYPE_FUNC(graph,  _WCTYPE_INDEX_GRAPH)
-_ISWCTYPE_FUNC(lower,  _WCTYPE_INDEX_LOWER)
-_ISWCTYPE_FUNC(print,  _WCTYPE_INDEX_PRINT)
-_ISWCTYPE_FUNC(punct,  _WCTYPE_INDEX_PUNCT)
-_ISWCTYPE_FUNC(space,  _WCTYPE_INDEX_SPACE)
-_ISWCTYPE_FUNC(upper,  _WCTYPE_INDEX_UPPER)
-_ISWCTYPE_FUNC(xdigit, _WCTYPE_INDEX_XDIGIT)
-
-#define _TOWCTRANS_FUNC(name, index)			\
-wint_t							\
-tow##name##_l(wint_t wc, locale_t loc)			\
-{							\
-	_RuneLocale const *rl;				\
-	_WCTransEntry const *te;			\
-							\
-	rl = _RUNE_LOCALE(loc);				\
-	te = &rl->rl_wctrans[index];			\
-	return _towctrans_priv(wc, te);			\
-}							\
-wint_t							\
-tow##name(wint_t wc)					\
-{							\
-	return tow##name##_l(wc, _current_locale());	\
-}
-_TOWCTRANS_FUNC(upper, _WCTRANS_INDEX_UPPER)
-_TOWCTRANS_FUNC(lower, _WCTRANS_INDEX_LOWER)
-
-wctype_t
-wctype_l(const char *charclass, locale_t loc)
-{
-	_RuneLocale const *rl;
-	size_t i;
-
-	rl = _RUNE_LOCALE(loc);
-	for (i = 0; i < _WCTYPE_NINDEXES; ++i) {
-		if (!strcmp(rl->rl_wctype[i].te_name, charclass))
-			return (wctype_t)__UNCONST(&rl->rl_wctype[i]);
-	}
-	return (wctype_t)NULL;
-}
-
-wctype_t
-wctype(const char *charclass)
-{
-	return wctype_l(charclass, _current_locale());
-}
-
-wctrans_t
-wctrans_l(const char *charmap, locale_t loc)
-{
-	_RuneLocale const *rl;
-	size_t i;
-
-	rl = _RUNE_LOCALE(loc);
-	for (i = 0; i < _WCTRANS_NINDEXES; ++i) {
-		_DIAGASSERT(rl->rl_wctrans[i].te_name != NULL);
-		if (!strcmp(rl->rl_wctrans[i].te_name, charmap))
-			return (wctrans_t)__UNCONST(&rl->rl_wctype[i]);
-	}
-	return (wctrans_t)NULL;
-}
-
-wctrans_t
-wctrans(const char *charmap)
-{
-	return wctrans_l(charmap, _current_locale());
-}
-
-int
-iswctype_l(wint_t wc, wctype_t charclass, locale_t loc)
-{
-	_RuneLocale const *rl;
-	_WCTypeEntry const *te;
-
-	if (charclass == NULL) {
-		errno = EINVAL;
-		return 0;
-	}
-
-	rl = _RUNE_LOCALE(loc);
-	te = (_WCTypeEntry const *)(void *)charclass;
-	return _iswctype_priv(rl, wc, te);
-}
-
-int
-iswctype(wint_t wc, wctype_t charclass)
-{
-	return iswctype_l(wc, charclass, _current_locale());
-}
-
-wint_t
-towctrans(wint_t wc, wctrans_t charmap)
-{
-	_WCTransEntry const *te;
-
-	if (charmap == NULL) {
-		errno = EINVAL;
-		return wc;
-	}
-	te = (_WCTransEntry const *)(void *)charmap;
-	return _towctrans_priv(wc, te);
-}
-
-/* ARGSUSED */
-wint_t
-towctrans_l(wint_t wc, wctrans_t charmap, locale_t loc)
-{
-	return towctrans(wc, charmap);
-}
-
-__weak_alias(wcwidth,_wcwidth)
-__weak_alias(wcwidth_l,_wcwidth_l)
-
-int
-wcwidth_l(wchar_t wc, locale_t loc)
-{
-	_RuneLocale const *rl;
-	_RuneType x;
-
-	if (wc == L'\0')
-		return 0;
-
-	rl = _RUNE_LOCALE(loc);
-	x = _runetype_priv(rl, wc);
-	if (x & _RUNETYPE_R)
-		return ((unsigned)x & _RUNETYPE_SWM) >> _RUNETYPE_SWS;
-	return -1;
-}
-
-int
-wcwidth(wchar_t wc)
-{
-	return wcwidth_l(wc, _current_locale());
-}
-
-int
-wcswidth_l(const wchar_t * __restrict ws, size_t wn, locale_t loc)
-{
-	_RuneLocale const *rl;
-	_RuneType x;
-	int width;
-
-	_DIAGASSERT(ws != NULL);
-
-	rl = _RUNE_LOCALE(loc);
-	width = 0;
-	while (wn > 0 && *ws != L'\0') {
-		x = _runetype_priv(rl, *ws);
-		if ((x & _RUNETYPE_R) == 0)
-			return -1;
-		width += ((unsigned)x & _RUNETYPE_SWM) >> _RUNETYPE_SWS;
-		++ws, --wn;
-	}
-	return width;
-}
-
-int
-wcswidth(const wchar_t * __restrict ws, size_t wn)
-{
-	return wcswidth_l(ws, wn, _current_locale());
-}
diff --git a/lib/libc/locale/localeconv.c b/lib/libc/locale/localeconv.c
deleted file mode 100644
index 6ec10571a..000000000
--- a/lib/libc/locale/localeconv.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $NetBSD: localeconv.c,v 1.22 2013/09/13 13:13:32 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: localeconv.c,v 1.22 2013/09/13 13:13:32 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <langinfo.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-
-#include "setlocale_local.h"
-
-struct lconv *
-localeconv(void)
-{
-	return localeconv_l(_current_locale());
-}
-
-struct lconv *
-localeconv_l(locale_t loc)
-{
-	return __UNCONST(&loc->cache->ldata);
-}
diff --git a/lib/libc/locale/localeio.h b/lib/libc/locale/localeio.h
deleted file mode 100644
index 815729eb6..000000000
--- a/lib/libc/locale/localeio.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: localeio.h,v 1.4 2010/06/19 13:26:52 tnozaki Exp $	*/
-/*
- * Copyright (c) 2008, The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Brian Ginsbach.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-__BEGIN_DECLS
-int _localeio_map_file(const char * __restrict,
-    void ** __restrict, size_t * __restrict);
-void _localeio_unmap_file(void *, size_t);
-int __loadlocale(const char *, size_t, size_t, size_t, void *);
-__END_DECLS
diff --git a/lib/libc/locale/mblen.3 b/lib/libc/locale/mblen.3
deleted file mode 100644
index e40f9a434..000000000
--- a/lib/libc/locale/mblen.3
+++ /dev/null
@@ -1,180 +0,0 @@
-.\" $NetBSD: mblen.3,v 1.6 2006/10/14 07:51:01 wiz Exp $
-.\"
-.\" Copyright (c)2002 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd February 3, 2002
-.Dt MBLEN 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm mblen
-.Nd get number of bytes in a multibyte character
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn mblen "const char *s" "size_t n"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-The
-.Fn mblen
-function usually determines the number of bytes in
-a multibyte character pointed to by
-.Fa s
-and returns it.
-This function shall only examine max n bytes of the array beginning from
-.Fa s .
-.Pp
-In state-dependent encodings,
-.Fa s
-may point the special sequence bytes to change the shift-state.
-Although such sequence bytes corresponds to no individual
-wide-character code,
-the
-.Fn mblen
-changes the own state by them and treats them
-as if they are a part of the subsequent multibyte character.
-.Pp
-Unlike
-.Xr mbrlen 3 ,
-the first
-.Fa n
-bytes pointed to by
-.Fa s
-need to form an entire multibyte character.
-Otherwise, this function causes an error.
-.Pp
-.Fn mblen
-is equivalent to the following call, except the internal state of the
-.Xr mbtowc 3
-function is not affected:
-.Bd -literal -offset indent
-mbtowc(NULL, s, n);
-.Ed
-.Pp
-Calling any other functions in
-.Lb libc
-never changes the internal
-state of
-.Fn mblen ,
-except for calling
-.Xr setlocale 3
-with the
-.Dv LC_CTYPE
-category changed to that of the current locale.
-Such
-.Xr setlocale 3
-calls cause the internal state of this function to be indeterminate.
-.Pp
-The behaviour of
-.Fn mblen
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.Pp
-These are the special cases:
-.Bl -tag -width 0123456789
-.It "s == NULL"
-.Fn mblen
-initializes its own internal state to an initial state, and
-determines whether the current encoding is state-dependent.
-This function returns 0 if the encoding is state-independent,
-otherwise non-zero.
-.It "n == 0"
-In this case,
-the first
-.Fa n
-bytes of the array pointed to by
-.Fa s
-never form a complete character.
-Thus,
-.Fn mblen
-always fails.
-.El
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-Normally,
-.Fn mblen
-returns:
-.Bl -tag -width 0123456789
-.It "0"
-.Fa s
-points to a nul byte
-.Pq Sq \e0 .
-.It "positive"
-The value returned is
-a number of bytes for the valid multibyte character pointed to by
-.Fa s .
-There are no cases that this value is greater than
-.Fa n
-or the value of the
-.Dv MB_CUR_MAX
-macro.
-.It "-1"
-.Fa s
-points to an invalid or incomplete multibyte character.
-The
-.Fn mblen
-also sets
-.Va errno
-to indicate the error.
-.El
-.Pp
-When
-.Fa s
-is equal to
-.Dv NULL ,
-the
-.Fn mblen
-returns:
-.Bl -tag -width 0123456789
-.It "0"
-The current encoding is state-independent.
-.It "non-zero"
-The current encoding is state-dependent.
-.El
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-.Fn mblen
-may cause an error in the following case:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-.Fa s
-points to an invalid or incomplete multibyte character.
-.El
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr mbrlen 3 ,
-.Xr mbtowc 3 ,
-.Xr setlocale 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn mblen
-function conforms to
-.St -ansiC .
diff --git a/lib/libc/locale/mbrlen.3 b/lib/libc/locale/mbrlen.3
deleted file mode 100644
index 34cd0e47f..000000000
--- a/lib/libc/locale/mbrlen.3
+++ /dev/null
@@ -1,206 +0,0 @@
-.\" $NetBSD: mbrlen.3,v 1.9 2008/02/28 19:36:51 tnozaki Exp $
-.\"
-.\" Copyright (c)2002 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd February 3, 2002
-.Dt MBRLEN 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm mbrlen
-.Nd get number of bytes in a multibyte character (restartable)
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fn mbrlen "const char * restrict s" "size_t n" "mbstate_t * restrict ps"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-The
-.Fn mbrlen
-function usually determines the number of bytes in
-a multibyte character pointed to by
-.Fa s
-and returns it.
-This function shall only examine max n bytes of the array beginning from
-.Fa s .
-.Pp
-.Fn mbrlen
-is equivalent to the following call (except
-.Fa ps
-is evaluated only once):
-.Bd -literal -offset indent
-mbrtowc(NULL, s, n, (ps != NULL) ? ps : \*[Am]internal);
-.Ed
-.Pp
-Here,
-.Fa internal
-is an internal state object.
-.Pp
-In state-dependent encodings,
-.Fa s
-may point to the special sequence bytes to change the shift-state.
-Although such sequence bytes corresponds to no individual
-wide-character code, these affect the conversion state object pointed
-to by
-.Fa ps ,
-and the
-.Fn mbrlen
-treats the special sequence bytes
-as if these are a part of the subsequent multibyte character.
-.Pp
-Unlike
-.Xr mblen 3 ,
-.Fn mbrlen
-may accept the byte sequence when it is not a complete character
-but possibly contains part of a valid character.
-In this case, this function will accept all such bytes
-and save them into the conversion state object pointed to by
-.Fa ps .
-They will be used on subsequent calls of this function to restart
-the conversion suspended.
-.Pp
-The behaviour of
-.Fn mbrlen
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.Pp
-These are the special cases:
-.Bl -tag -width 0123456789
-.It "s == NULL"
-.Fn mbrlen
-sets the conversion state object pointed to by
-.Fa ps
-to an initial state and always returns 0.
-Unlike
-.Xr mblen 3 ,
-the value returned does not indicate whether the current encoding of
-the locale is state-dependent.
-.Pp
-In this case,
-.Fn mbrlen
-ignores
-.Fa n .
-.It "n == 0"
-In this case,
-the first
-.Fa n
-bytes of the array pointed to by
-.Fa s
-never form a complete character.
-Thus,
-.Fn mbrlen
-always returns (size_t)-2.
-.It "ps == NULL"
-.Fn mbrlen
-uses its own internal state object to keep the conversion state,
-instead of
-.Fa ps
-mentioned in this manual page.
-.Pp
-Calling any other functions in
-.Lb libc
-never changes the internal
-state of
-.Fn mbrlen ,
-except for calling
-.Xr setlocale 3
-with a changing
-.Dv LC_CTYPE
-category of the current locale.
-Such
-.Xr setlocale 3
-calls cause the internal state of this function to be indeterminate.
-This internal state is initialized at startup time of the program.
-.El
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-The
-.Fn mbrlen
-returns:
-.Bl -tag -width 0123456789
-.It "0"
-.Fa s
-points to a nul byte
-.Pq Sq \e0 .
-.It "positive"
-The value returned is
-a number of bytes for the valid multibyte character pointed to by
-.Fa s .
-There are no cases that this value is greater than
-.Fa n
-or the value of the
-.Dv MB_CUR_MAX
-macro.
-.It "(size_t)-2"
-.Fa s
-points to the byte sequence which possibly contains part of a valid
-multibyte character, but which is incomplete.
-When
-.Fa n
-is at least
-.Dv MB_CUR_MAX ,
-this case can only occur if the array pointed to by
-.Fa s
-contains a redundant shift sequence.
-.It "(size_t)-1"
-.Fa s
-points to an illegal byte sequence which does not form a valid multibyte
-character.
-In this case,
-.Fn mbrtowc
-sets
-.Va errno
-to indicate the error.
-.El
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-.Fn mbrlen
-may cause an error in the following case:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-.Fa s
-points to an invalid multibyte character.
-.It Bq Er EINVAL
-.Fa ps
-points to an invalid or uninitialized mbstate_t object.
-.El
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr mblen 3 ,
-.Xr mbrtowc 3 ,
-.Xr setlocale 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn mbrlen
-function conforms to
-.St -isoC-amd1 .
-The restrict qualifier is added at
-.St -isoC-99 .
diff --git a/lib/libc/locale/mbrtowc.3 b/lib/libc/locale/mbrtowc.3
deleted file mode 100644
index 80f7a5979..000000000
--- a/lib/libc/locale/mbrtowc.3
+++ /dev/null
@@ -1,196 +0,0 @@
-.\" $NetBSD: mbrtowc.3,v 1.8 2006/10/16 09:10:29 wiz Exp $
-.\"
-.\" Copyright (c)2002 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd February 4, 2002
-.Dt MBRTOWC 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm mbrtowc
-.Nd converts a multibyte character to a wide character (restartable)
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fn mbrtowc "wchar_t * restrict pwc" "const char * restrict s" "size_t n" \
-"mbstate_t * restrict ps"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-The
-.Fn mbrtowc
-usually converts the multibyte character pointed to by
-.Fa s
-to a wide character, and stores the wide character
-to the wchar_t object pointed to by
-.Fa pwc
-if
-.Fa pwc
-is
-.Pf non- Dv NULL
-and
-.Fa s
-points to a valid character.
-The conversion happens in accordance with, and changes the conversion
-state described in the mbstate_t object pointed to by
-.Fa ps .
-This function may examine at most
-.Fa n
-bytes of the array beginning from
-.Fa s .
-.Pp
-If
-.Fa s
-points to a valid character and the character corresponds to a nul wide
-character, then the
-.Fn mbrtowc
-places the mbstate_t object pointed to by
-.Fa ps
-to an initial conversion state.
-.Pp
-Unlike
-.Xr mbtowc 3 ,
-the
-.Fn mbrtowc
-may accept the byte sequence pointed to by
-.Fa s
-not forming a complete multibyte character
-but which may be part of a valid character.
-In this case, this function will accept all such bytes
-and save them into the conversion state object pointed to by
-.Fa ps .
-They will be used at subsequent calls of this function to restart
-the conversion suspended.
-.Pp
-The behaviour of
-.Fn mbrtowc
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.Pp
-These are the special cases:
-.Bl -tag -width 012345678901
-.It "s == NULL"
-.Fn mbrtowc
-sets the conversion state object pointed to by
-.Fa ps
-to an initial state and always returns 0.
-Unlike
-.Xr mbtowc 3 ,
-the value returned does not indicate whether the current encoding of
-the locale is state-dependent.
-.Pp
-In this case,
-.Fn mbrtowc
-ignores
-.Fa pwc
-and
-.Fa n ,
-and is equivalent to the following call:
-.Bd -literal -offset indent
-mbrtowc(NULL, "", 1, ps);
-.Ed
-.It "pwc == NULL"
-The conversion from a multibyte character to a wide character has
-taken place and the conversion state may be affected, but the resulting
-wide character is discarded.
-.It "ps == NULL"
-.Fn mbrtowc
-uses its own internal state object to keep the conversion state,
-instead of
-.Fa ps
-mentioned in this manual page.
-.Pp
-Calling any other functions in
-.Lb libc
-never changes the internal state of
-.Fn mbrtowc ,
-which is initialized at startup time of the program.
-.El
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-In the usual cases,
-.Fn mbrtowc
-returns:
-.Bl -tag -width 012345678901
-.It 0
-The next bytes pointed to by
-.Fa s
-form a nul character.
-.It positive
-If
-.Fa s
-points to a valid character,
-.Fn mbrtowc
-returns the number of bytes in the character.
-.It (size_t)-2
-.Fa s
-points to a byte sequence which possibly contains part of a valid
-multibyte character, but which is incomplete.
-When
-.Fa n
-is at least
-.Dv MB_CUR_MAX ,
-this case can only occur if the array pointed to by
-.Fa s
-contains a redundant shift sequence.
-.It (size_t)-1
-.Fa s
-points to an illegal byte sequence which does not form a valid multibyte
-character.
-In this case,
-.Fn mbrtowc
-sets
-.Va errno
-to indicate the error.
-.El
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-.Fn mbrtowc
-may cause an error in the following case:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-.Fa s
-points to an invalid or incomplete multibyte character.
-.It Bq Er EINVAL
-.Fa ps
-points to an invalid or uninitialized mbstate_t object.
-.El
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr mbrlen 3 ,
-.Xr mbtowc 3 ,
-.Xr setlocale 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn mbrtowc
-function conforms to
-.St -isoC-amd1 .
-The restrict qualifier is added at
-.St -isoC-99 .
diff --git a/lib/libc/locale/mbsinit.3 b/lib/libc/locale/mbsinit.3
deleted file mode 100644
index 63ef147b7..000000000
--- a/lib/libc/locale/mbsinit.3
+++ /dev/null
@@ -1,74 +0,0 @@
-.\" $NetBSD: mbsinit.3,v 1.6 2006/10/16 08:42:16 wiz Exp $
-.\"
-.\" Copyright (c)2002 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd February 3, 2002
-.Dt MBSINIT 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm mbsinit
-.Nd determines whether the state object is in the initial state
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft int
-.Fn mbsinit "const mbstate_t *ps"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-The
-.Fn mbsinit
-determines whether the state object pointed to by
-.Fa ps
-is the initial conversion state, or not.
-.Pp
-.Fa ps
-may be a null pointer.
-In this case,
-.Fn mbsinit
-will always return non-zero.
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-.Fn mbsinit
-returns:
-.Bl -tag -width 0123456789
-.It 0
-The current state is not the initial state.
-.It non-zero
-The current state is the initial state or
-.Fa ps
-is a null pointer.
-.El
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-No errors are defined.
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn mbsinit
-conforms to
-.St -isoC-amd1 .
diff --git a/lib/libc/locale/mbsrtowcs.3 b/lib/libc/locale/mbsrtowcs.3
deleted file mode 100644
index a353420c4..000000000
--- a/lib/libc/locale/mbsrtowcs.3
+++ /dev/null
@@ -1,181 +0,0 @@
-.\" $NetBSD: mbsrtowcs.3,v 1.12 2010/12/16 17:42:27 wiz Exp $
-.\"
-.\" Copyright (c)2002 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd February 4, 2002
-.Dt MBSRTOWCS 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm mbsrtowcs
-.Nd converts a multibyte character string to a wide-character string \
-(restartable)
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fn mbsrtowcs "wchar_t * restrict pwcs" "const char ** restrict s" "size_t n" \
-"mbstate_t * restrict ps"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-The
-.Fn mbsrtowcs
-converts the multibyte character string indirectly pointed to by
-.Fa s
-to the corresponding wide-character string, and stores it in the
-array pointed to by
-.Fa pwcs .
-The conversion stops due to the following reasons:
-.Bl -bullet
-.It
-The conversion reaches a nul byte.
-In this case, the nul byte is also converted.
-.It
-The
-.Fn mbsrtowcs
-has already stored
-.Fa n
-wide characters.
-.It
-The conversion encounters an invalid character.
-.El
-.Pp
-Each character will be converted as if
-.Xr mbrtowc 3
-is continuously called.
-.Pp
-After conversion,
-if
-.Fa pwcs
-is not a null pointer,
-the pointer object pointed to by
-.Fa s
-is a null pointer (if the conversion is stopped due to reaching a
-nul byte) or the first byte of the character just after the last
-character converted.
-.Pp
-If
-.Fa pwcs
-is not a null pointer and the conversion is stopped due to reaching
-a nul byte, the
-.Fn mbsrtowcs
-places the state object pointed to by
-.Fa ps
-to an initial state after the conversion has taken place.
-.Pp
-The behaviour of
-.Fn mbsrtowcs
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.Pp
-These are the special cases:
-.Bl -tag -width 012345678901
-.It "s == NULL || *s == NULL"
-Undefined (may cause the program to crash).
-.It "pwcs == NULL"
-The conversion has taken place, but the resulting wide-character string
-was discarded.
-In this case, the pointer object pointed to by
-.Fa s
-is not modified and
-.Fa n
-is ignored.
-.It "ps == NULL"
-The
-.Fn mbsrtowcs
-uses its own internal state object to keep the conversion state,
-instead of
-.Fa ps
-mentioned in this manual page.
-.Pp
-Calling any other functions in
-.Lb libc
-never changes the internal state of
-.Fn mbsrtowcs ,
-which is initialized at startup time of the program.
-.El
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-.Fn mbsrtowcs
-returns:
-.Bl -tag -width 012345678901
-.It 0 or positive
-The value returned is the number of elements stored in the array
-pointed to by
-.Fa pwcs ,
-except for a terminating nul wide character (if any).
-If
-.Fa pwcs
-is not
-.Dv NULL
-and the value returned is equal to
-.Fa n ,
-the wide-character string pointed to by
-.Fa pwcs
-is not nul-terminated.
-If
-.Fa pwcs
-is a null pointer, the value returned is the number of elements to contain
-the whole string converted, except for a terminating nul wide character.
-.It (size_t)-1
-The array indirectly pointed to by
-.Fa s
-contains a byte sequence forming invalid character.
-In this case,
-.Fn mbsrtowcs
-sets
-.Va errno
-to indicate the error.
-.El
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-.Fn mbsrtowcs
-may cause an error in the following case:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-The pointer pointed to by
-.Fa s
-points to an invalid or incomplete multibyte character.
-.It Bq Er EINVAL
-.Fa ps
-points to an invalid or uninitialized mbstate_t object.
-.El
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr mbrtowc 3 ,
-.Xr mbstowcs 3 ,
-.Xr setlocale 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn mbsrtowcs
-function conforms to
-.St -isoC-amd1 .
-The restrict qualifier is added at
-.St -isoC-99 .
diff --git a/lib/libc/locale/mbstowcs.3 b/lib/libc/locale/mbstowcs.3
deleted file mode 100644
index f0435fcae..000000000
--- a/lib/libc/locale/mbstowcs.3
+++ /dev/null
@@ -1,129 +0,0 @@
-.\" $NetBSD: mbstowcs.3,v 1.12 2011/03/16 09:32:12 mbalmer Exp $
-.\"
-.\" Copyright (c)2002 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd March 16, 2011
-.Dt MBSTOWCS 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm mbstowcs
-.Nd converts a multibyte character string to a wide-character string
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft size_t
-.Fn mbstowcs "wchar_t * restrict pwcs" "const char * restrict s" "size_t n"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-.Fn mbstowcs
-converts a nul-terminated multibyte character string pointed to by
-.Fa s
-to the corresponding wide-character string and stores it in the array
-pointed to by
-.Fa pwcs .
-This function may modify the first at most
-.Fa n
-elements of the array pointed to by
-.Fa pwcs .
-Each character will be converted as if
-.Xr mbtowc 3
-is continuously called, except the internal state of
-.Xr mbtowc 3
-will not be affected.
-.Pp
-For state-dependent encoding,
-.Fn mbstowcs
-implies the multibyte character string pointed to by
-.Fa s
-always begins with an initial state.
-.Pp
-These are the special cases:
-.Bl -tag -width 012345678901
-.It pwcs == NULL
-.Fn mbstowcs
-returns the number of elements to store the whole wide-character string
-corresponding to the multibyte character string pointed to by
-.Fa s .
-In this case,
-.Fa n
-is ignored.
-.It s == NULL
-Undefined (may cause the program to crash).
-.El
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-.Fn mbstowcs
-returns:
-.Bl -tag -width 012345678901
-.It 0 or positive
-Number of elements stored in the array pointed to by
-.Fa pwcs .
-There are no cases that the value returned is greater than
-.Fa n
-(unless
-.Fa pwcs
-is a null pointer) or the value of the
-.Dv MB_CUR_MAX
-macro.
-If the return value is equal to
-.Fa n ,
-the string pointed to by
-.Fa pwcs
-will not be nul-terminated.
-.It (size_t)-1
-.Fa s
-points to a string containing an invalid or incomplete multibyte character.
-The
-.Fn mbstowcs
-also sets
-.Va errno
-to indicate the error.
-.El
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-.Fn mbstowcs
-may cause an error in the following case:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-.Fa s
-points to a string containing an invalid or incomplete multibyte character.
-.El
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr mbtowc 3 ,
-.Xr setlocale 3 ,
-.Xr wcstombs 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn mbstowcs
-function conforms to
-.St -ansiC .
-The restrict qualifier is added at
-.St -isoC-99 .
diff --git a/lib/libc/locale/mbtowc.3 b/lib/libc/locale/mbtowc.3
deleted file mode 100644
index 317fb3344..000000000
--- a/lib/libc/locale/mbtowc.3
+++ /dev/null
@@ -1,182 +0,0 @@
-.\" $NetBSD: mbtowc.3,v 1.8 2006/10/16 09:10:29 wiz Exp $
-.\"
-.\" Copyright (c)2002 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd February 3, 2002
-.Dt MBTOWC 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm mbtowc
-.Nd converts a multibyte character to a wide character
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn mbtowc "wchar_t * restrict pwc" "const char * restrict s" "size_t n"
-.Sh DESCRIPTION
-.Fn mbtowc
-usually converts the multibyte character pointed to by
-.Fa s
-to a wide character, and stores it in the wchar_t object pointed to by
-.Fa pwc
-if
-.Fa pwc
-is
-.Pf non- Dv NULL
-and
-.Fa s
-points to a valid character.
-This function may inspect at most n bytes of the array beginning from
-.Fa s .
-.Pp
-In state-dependent encodings,
-.Fa s
-may point to the special sequence bytes to change the shift-state.
-Although such sequence bytes correspond to no individual
-wide-character code,
-.Fn mbtowc
-changes its own state by the sequence bytes and treats them
-as if they are a part of the subsequence multibyte character.
-.Pp
-Unlike
-.Xr mbrtowc 3 ,
-the first
-.Fa n
-bytes pointed to by
-.Fa s
-need to form an entire multibyte character.
-Otherwise, this function causes an error.
-.Pp
-Calling any other functions in
-.Lb libc
-never changes the internal state of
-.Fn mbtowc ,
-except for calling
-.Xr setlocale 3
-with changing the
-.Dv LC_CTYPE
-category of the current locale.
-Such
-.Xr setlocale 3
-call causes the internal state of this function to be indeterminate.
-.Pp
-The behaviour of
-.Fn mbtowc
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.Pp
-There are special cases:
-.Bl -tag -width 012345678901
-.It s == NULL
-.Fn mbtowc
-initializes its own internal state to an initial state, and
-determines whether the current encoding is state-dependent.
-This function returns 0 if the encoding is state-independent,
-otherwise non-zero.
-In this case,
-.Fa pwc
-is completely ignored.
-.It pwc == NULL
-.Fn mbtowc
-executes the conversion as if
-.Fa pwc
-is non-NULL, but a result of the conversion is discarded.
-.It n == 0
-In this case,
-the first
-.Fa n
-bytes of the array pointed to by
-.Fa s
-never form a complete character.
-Thus, the
-.Fn mbtowc
-always fails.
-.El
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-Normally, the
-.Fn mbtowc
-returns:
-.Bl -tag -width 012345678901
-.It 0
-.Fa s
-points to a nul byte
-.Pq Sq \e0 .
-.It positive
-Number of bytes for the valid multibyte character pointed to by
-.Fa s .
-There are no cases that the value returned is greater than
-the value of the
-.Dv MB_CUR_MAX
-macro.
-.It -1
-.Fa s
-points to an invalid or an incomplete multibyte character.
-The
-.Fn mbtowc
-also sets
-.Va errno
-to indicate the error.
-.El
-.Pp
-When
-.Fa s
-is equal to
-.Dv NULL ,
-.Fn mbtowc
-returns:
-.Bl -tag -width 0123456789
-.It 0
-The current encoding is state-independent.
-.It non-zero
-The current encoding is state-dependent.
-.El
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-.Fn mbtowc
-may cause an error in the following case:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-.Fa s
-points to an invalid or incomplete multibyte character.
-.El
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr mblen 3 ,
-.Xr mbrtowc 3 ,
-.Xr setlocale 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn mbtowc
-function conforms to
-.St -ansiC .
-The restrict qualifier is added at
-.St -isoC-99 .
diff --git a/lib/libc/locale/multibyte.h b/lib/libc/locale/multibyte.h
deleted file mode 100644
index f22c31c3f..000000000
--- a/lib/libc/locale/multibyte.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*	$NetBSD: multibyte.h,v 1.6 2013/08/18 20:03:48 joerg Exp $	*/
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _MULTIBYTE_H_
-#define _MULTIBYTE_H_
-
-/* mbstate_t private */
-
-#ifdef _BSD_MBSTATE_T_
-typedef	_BSD_MBSTATE_T_	mbstate_t;
-#undef _BSD_MBSTATE_T_
-#endif
-
-typedef struct _RuneStatePriv {
-	_RuneLocale	*__runelocale;
-	char		__private __attribute__((__aligned__));
-} _RuneStatePriv;
-
-typedef union _RuneState {
-	mbstate_t		__pad;
-	struct _RuneStatePriv	__priv;
-#define rs_runelocale		__priv.__runelocale
-#define rs_private		__priv.__private
-} _RuneState;
-#define _PRIVSIZE	(sizeof(mbstate_t)-offsetof(_RuneStatePriv, __private))
-
-#define _RUNE_LOCALE(loc) \
-    ((_RuneLocale *)((loc)->part_impl[(size_t)LC_CTYPE]))
-
-#define _CITRUS_CTYPE(loc) \
-    (((_RuneLocale *)((loc)->part_impl[(size_t)LC_CTYPE]))->rl_citrus_ctype)
-
-/* */
-
-static __inline _RuneState *
-_ps_to_runestate(mbstate_t *ps)
-{
-	return (_RuneState *)(void *)ps;
-}
-
-static __inline _RuneState const *
-_ps_to_runestate_const(mbstate_t const *ps)
-{
-	return (_RuneState const *)(void const *)ps;
-}
-
-static __inline _RuneLocale *
-_ps_to_runelocale(mbstate_t const *ps)
-{
-	return _ps_to_runestate_const(ps)->rs_runelocale;
-}
-
-static __inline _citrus_ctype_t
-_ps_to_ctype(mbstate_t const *ps, locale_t loc)
-{
-	if (!ps)
-		return _CITRUS_CTYPE(loc);
-
-	_DIAGASSERT(_ps_to_runelocale(ps) != NULL);
-
-	return _ps_to_runelocale(ps)->rl_citrus_ctype;
-}
-
-static __inline void *
-_ps_to_private(mbstate_t *ps)
-{
-	if (ps == NULL)
-		return NULL;
-	return (void *)&_ps_to_runestate(ps)->rs_private;
-}
-
-static __inline void const *
-_ps_to_private_const(mbstate_t const *ps)
-{
-	if (ps == NULL)
-		return NULL;
-	return (void const *)&_ps_to_runestate_const(ps)->rs_private;
-}
-
-static __inline void
-_init_ps(_RuneLocale *rl, mbstate_t *ps)
-{
-	size_t dum;
-	_ps_to_runestate(ps)->rs_runelocale = rl;
-	_citrus_ctype_mbrtowc(rl->rl_citrus_ctype, NULL, NULL, 0,
-			      _ps_to_private(ps), &dum);
-}
-
-static __inline void
-_fixup_ps(_RuneLocale *rl, mbstate_t *ps, int forceinit)
-{
-	/* for future multi-locale facility */
-	_DIAGASSERT(rl != NULL);
-
-	if (ps != NULL && (_ps_to_runelocale(ps) == NULL || forceinit)) {
-		_init_ps(rl, ps);
-	}
-}
-
-#endif /*_MULTIBYTE_H_*/
diff --git a/lib/libc/locale/multibyte_amd1.c b/lib/libc/locale/multibyte_amd1.c
deleted file mode 100644
index e733f90fa..000000000
--- a/lib/libc/locale/multibyte_amd1.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*	$NetBSD: multibyte_amd1.c,v 1.14 2013/08/18 20:03:48 joerg Exp $	*/
-
-/*-
- * Copyright (c)2002, 2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: multibyte_amd1.c,v 1.14 2013/08/18 20:03:48 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#include <langinfo.h>
-#include <stdlib.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include <wchar.h>
-
-#include "setlocale_local.h"
-
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "runetype_local.h"
-#include "multibyte.h"
-
-size_t
-mbrlen_l(const char *s, size_t n, mbstate_t *ps, locale_t loc)
-{
-	size_t ret;
-	int err0;
-
-	_fixup_ps(_RUNE_LOCALE(loc), ps, s == NULL);
-
-	err0 = _citrus_ctype_mbrlen(_ps_to_ctype(ps, loc), s, n,
-				     _ps_to_private(ps), &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-size_t
-mbrlen(const char *s, size_t n, mbstate_t *ps)
-{
-	return mbrlen_l(s, n, ps, _current_locale());
-}
-
-int
-mbsinit_l(const mbstate_t *ps, locale_t loc)
-{
-	int ret;
-	int err0;
-	_RuneLocale *rl;
-
-	if (ps == NULL)
-		return 1;
-
-	if (_ps_to_runelocale(ps) == NULL)
-		rl = _RUNE_LOCALE(loc);
-	else
-		rl = _ps_to_runelocale(ps);
-
-	/* mbsinit should cause no error... */
-	err0 = _citrus_ctype_mbsinit(rl->rl_citrus_ctype,
-				      _ps_to_private_const(ps), &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-int
-mbsinit(const mbstate_t *ps)
-{
-	return mbsinit_l(ps, _current_locale());
-}
-
-size_t
-mbrtowc_l(wchar_t *pwc, const char *s, size_t n, mbstate_t *ps, locale_t loc)
-{
-	size_t ret;
-	int err0;
-
-	_fixup_ps(_RUNE_LOCALE(loc), ps, s == NULL);
-
-	err0 = _citrus_ctype_mbrtowc(_ps_to_ctype(ps, loc), pwc, s, n,
-				      _ps_to_private(ps), &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-size_t
-mbrtowc(wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
-{
-	return mbrtowc_l(pwc, s, n, ps, _current_locale());
-}
-
-size_t
-mbsrtowcs_l(wchar_t *pwcs, const char **s, size_t n, mbstate_t *ps,
-    locale_t loc)
-{
-	size_t ret;
-	int err0;
-
-	_fixup_ps(_RUNE_LOCALE(loc), ps, s == NULL);
-
-	err0 = _citrus_ctype_mbsrtowcs(_ps_to_ctype(ps, loc), pwcs, s, n,
-					_ps_to_private(ps), &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-size_t
-mbsrtowcs(wchar_t *pwcs, const char **s, size_t n, mbstate_t *ps)
-{
-	return mbsrtowcs_l(pwcs, s, n, ps, _current_locale());
-}
-
-size_t
-mbsnrtowcs_l(wchar_t *pwcs, const char **s, size_t in, size_t n, mbstate_t *ps,
-    locale_t loc)
-{
-	size_t ret;
-	int err0;
-
-	_fixup_ps(_RUNE_LOCALE(loc), ps, s == NULL);
-
-	err0 = _citrus_ctype_mbsnrtowcs(_ps_to_ctype(ps, loc), pwcs, s, in, n,
-					_ps_to_private(ps), &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-size_t
-mbsnrtowcs(wchar_t *pwcs, const char **s, size_t in, size_t n, mbstate_t *ps)
-{
-	return mbsnrtowcs_l(pwcs, s, in, n, ps, _current_locale());
-}
-
-size_t
-wcrtomb_l(char *s, wchar_t wc, mbstate_t *ps, locale_t loc)
-{
-	size_t ret;
-	int err0;
-
-	_fixup_ps(_RUNE_LOCALE(loc), ps, s == NULL);
-
-	err0 = _citrus_ctype_wcrtomb(_ps_to_ctype(ps, loc), s, wc,
-				       _ps_to_private(ps), &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-size_t
-wcrtomb(char *s, wchar_t wc, mbstate_t *ps)
-{
-	return wcrtomb_l(s, wc, ps, _current_locale());
-}
-
-size_t
-wcsrtombs_l(char *s, const wchar_t **ppwcs, size_t n, mbstate_t *ps,
-    locale_t loc)
-{
-	size_t ret;
-	int err0;
-
-	_fixup_ps(_RUNE_LOCALE(loc), ps, s == NULL);
-
-	err0 = _citrus_ctype_wcsrtombs(_ps_to_ctype(ps, loc), s, ppwcs, n,
-					_ps_to_private(ps), &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-size_t
-wcsrtombs(char *s, const wchar_t **ppwcs, size_t n, mbstate_t *ps)
-{
-	return wcsrtombs_l(s, ppwcs, n, ps, _current_locale());
-}
-
-wint_t
-btowc_l(int c, locale_t loc)
-{
-	wint_t ret;
-	int err0;
-
-	err0 = _citrus_ctype_btowc(_CITRUS_CTYPE(loc), c, &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-wint_t
-btowc(int c)
-{
-	return btowc_l(c, _current_locale());
-}
-
-int
-wctob_l(wint_t wc, locale_t loc)
-{
-	int ret;
-	int err0;
-
-	err0 = _citrus_ctype_wctob(_CITRUS_CTYPE(loc), wc, &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-int
-wctob(wint_t wc)
-{
-	return wctob_l(wc, _current_locale());
-}
-
-size_t
-_mb_cur_max_l(locale_t loc)
-{
-
-	return _citrus_ctype_get_mb_cur_max(_CITRUS_CTYPE(loc));
-}
diff --git a/lib/libc/locale/multibyte_c90.c b/lib/libc/locale/multibyte_c90.c
deleted file mode 100644
index 2e0deb859..000000000
--- a/lib/libc/locale/multibyte_c90.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*	$NetBSD: multibyte_c90.c,v 1.12 2013/08/18 20:03:48 joerg Exp $	*/
-
-/*-
- * Copyright (c)2002, 2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: multibyte_c90.c,v 1.12 2013/08/18 20:03:48 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#include <langinfo.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include <stdlib.h>
-#include <wchar.h>
-
-#include "setlocale_local.h"
-
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "runetype_local.h"
-#include "multibyte.h"
-
-int
-mblen_l(const char *s, size_t n, locale_t loc)
-{
-	int ret;
-	int err0;
-
-	err0 = _citrus_ctype_mblen(_CITRUS_CTYPE(loc), s, n, &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-
-int
-mblen(const char *s, size_t n)
-{
-	return mblen_l(s, n, _current_locale());
-}
-
-size_t
-mbstowcs_l(wchar_t *pwcs, const char *s, size_t n, locale_t loc)
-{
-	size_t ret;
-	int err0;
-
-	err0 = _citrus_ctype_mbstowcs(_CITRUS_CTYPE(loc), pwcs, s, n, &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-size_t
-mbstowcs(wchar_t *pwcs, const char *s, size_t n)
-{
-	return mbstowcs_l(pwcs, s, n, _current_locale());
-}
-
-int
-mbtowc_l(wchar_t *pw, const char *s, size_t n, locale_t loc)
-{
-	int ret;
-	int err0;
-
-	err0 = _citrus_ctype_mbtowc(_CITRUS_CTYPE(loc), pw, s, n, &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-int
-mbtowc(wchar_t *pw, const char *s, size_t n)
-{
-	return mbtowc_l(pw, s, n, _current_locale());
-}
-
-size_t
-wcstombs_l(char *s, const wchar_t *wcs, size_t n, locale_t loc)
-{
-	size_t ret;
-	int err0;
-
-	err0 = _citrus_ctype_wcstombs(_CITRUS_CTYPE(loc), s, wcs, n, &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-size_t
-wcstombs(char *s, const wchar_t *wcs, size_t n)
-{
-	return wcstombs_l(s, wcs, n, _current_locale());
-}
-
-size_t
-wcsnrtombs_l(char *s, const wchar_t **ppwcs, size_t in, size_t n, mbstate_t *ps,
-    locale_t loc)
-{
-	size_t ret;
-	int err0;
-
-	_fixup_ps(_RUNE_LOCALE(loc), ps, s == NULL);
-
-	err0 = _citrus_ctype_wcsnrtombs(_ps_to_ctype(ps, loc), s, ppwcs, in, n,
-					_ps_to_private(ps), &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-size_t
-wcsnrtombs(char *s, const wchar_t **ppwcs, size_t in, size_t n, mbstate_t *ps)
-{
-	return wcsnrtombs_l(s, ppwcs, in, n, ps, _current_locale());
-}
-
-int
-wctomb_l(char *s, wchar_t wc, locale_t loc)
-{
-	int ret;
-	int err0;
-
-	err0 = _citrus_ctype_wctomb(_CITRUS_CTYPE(loc), s, wc, &ret);
-	if (err0)
-		errno = err0;
-
-	return ret;
-}
-
-int
-wctomb(char *s, wchar_t wc)
-{
-	return wctomb_l(s, wc, _current_locale());
-}
diff --git a/lib/libc/locale/nb_lc_messages_misc.h b/lib/libc/locale/nb_lc_messages_misc.h
deleted file mode 100644
index c3f01d770..000000000
--- a/lib/libc/locale/nb_lc_messages_misc.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $NetBSD: nb_lc_messages_misc.h,v 1.7 2013/09/13 13:13:32 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NB_LC_MESSAGES_MISC_H_
-#define _NB_LC_MESSAGES_MISC_H_
-
-/*
- * macro required by nb_lc_template(_decl).h
- */
-#define _CATEGORY_TYPE		_MessagesLocale
-
-/* ARGSUSED */
-static __inline void
-_PREFIX(update_global)(_MessagesLocale *data)
-{
-}
-
-/*
- * macro required by nb_lc_template.h
- */
-#define _CATEGORY_ID		LC_MESSAGES
-#define _CATEGORY_NAME		"LC_MESSAGES"
-
-#endif /*_NB_LC_MESSAGES_MISC_H_*/
diff --git a/lib/libc/locale/nb_lc_monetary_misc.h b/lib/libc/locale/nb_lc_monetary_misc.h
deleted file mode 100644
index 7d66b09bf..000000000
--- a/lib/libc/locale/nb_lc_monetary_misc.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $NetBSD: nb_lc_monetary_misc.h,v 1.7 2013/09/13 13:13:32 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NB_LC_MONETARY_MISC_H_
-#define _NB_LC_MONETARY_MISC_H_
-
-/*
- * macro required by nb_lc_template(_decl).h
- */
-#define _CATEGORY_TYPE		_MonetaryLocale
-
-/* ARGSUSED */
-static __inline void
-_PREFIX(update_global)(_MonetaryLocale *data)
-{
-}
-
-/*
- * macro required by nb_lc_template.h
- */
-#define _CATEGORY_ID		LC_MONETARY
-#define _CATEGORY_NAME		"LC_MONETARY"
-
-#endif /*_RUNE_LC_MONETARY_MISC_H_*/
diff --git a/lib/libc/locale/nb_lc_numeric_misc.h b/lib/libc/locale/nb_lc_numeric_misc.h
deleted file mode 100644
index 34ba80d68..000000000
--- a/lib/libc/locale/nb_lc_numeric_misc.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $NetBSD: nb_lc_numeric_misc.h,v 1.7 2013/09/13 13:13:32 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NB_LC_NUMERIC_MISC_H_
-#define _NB_LC_NUMERIC_MISC_H_
-
-/*
- * macro required by nb_lc_template(_decl).h
- */
-#define _CATEGORY_TYPE		_NumericLocale
-
-/* ARGSUSED */
-static __inline void
-_PREFIX(update_global)(_NumericLocale *data)
-{
-}
-
-/*
- * macro required by nb_lc_template.h
- */
-#define _CATEGORY_ID		LC_NUMERIC
-#define _CATEGORY_NAME		"LC_NUMERIC"
-
-#endif /*_NB_LC_NUMERIC_MISC_H_*/
diff --git a/lib/libc/locale/nb_lc_template.h b/lib/libc/locale/nb_lc_template.h
deleted file mode 100644
index e60aead83..000000000
--- a/lib/libc/locale/nb_lc_template.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/* $NetBSD: nb_lc_template.h,v 1.8 2013/09/13 13:13:32 joerg Exp $ */
-
-/*-
- * Copyright (c)1999, 2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Paul Kranenburg.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef _NB_LC_TEMPLATE_H_
-#define _NB_LC_TEMPLATE_H_
-
-#define _nb_part_t		_PREFIX(part_t)
-#define _nb_part_cache		_PREFIX(part_cache)
-#define _nb_mutex		_PREFIX(mutex)
-
-typedef struct _nb_part_t {
-	char name[_LOCALENAME_LEN_MAX];
-	_CATEGORY_TYPE *impl;
-	SIMPLEQ_ENTRY(_nb_part_t) entry;
-} _nb_part_t;
-
-static SIMPLEQ_HEAD(, _nb_part_t) _nb_part_cache =
-    SIMPLEQ_HEAD_INITIALIZER(_nb_part_cache);
-
-#ifdef _REENTRANT
-static mutex_t _nb_mutex = MUTEX_INITIALIZER;
-#endif
-
-static int
-_PREFIX(load_sub)(const char * __restrict name, const char * __restrict real,
-    const char ** __restrict out_name, _CATEGORY_TYPE ** __restrict out_impl,
-    int force)
-{
-	const char *cached_name;
-	_CATEGORY_TYPE *cached_impl;
-	_nb_part_t *p;
-	int ret;
-
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(out_name != NULL);
-	_DIAGASSERT(out_impl != NULL);
-
-	if (!strcmp(_C_LOCALE, name)) {
-		cached_name = _lc_C_locale.part_name[_CATEGORY_ID];
-		cached_impl = _lc_C_locale.part_impl[_CATEGORY_ID];
-	} else if (!strcmp(_POSIX_LOCALE, name)) {
-		cached_name = _POSIX_LOCALE;
-		cached_impl = _lc_C_locale.part_impl[_CATEGORY_ID];
-	} else {
-		SIMPLEQ_FOREACH(p, &_nb_part_cache, entry) {
-			if (!strcmp((const char *)&p->name[0], name)) {
-				cached_name = p->name;
-				cached_impl = p->impl;
-				goto found;
-			}
-		}
-		p = malloc(sizeof(*p));
-		if (p == NULL)
-			return ENOMEM;
-		if (force) {
-			p->impl = _lc_C_locale.part_impl[_CATEGORY_ID];
-		} else {
-			_DIAGASSERT(_PathLocale != NULL);
-			ret = _PREFIX(create_impl)((const char *)_PathLocale,
-			    name, &p->impl);
-			if (ret) {
-				free(p);
-				return ret;
-			}
-		}
-		strlcpy(&p->name[0], name, sizeof(p->name));
-		SIMPLEQ_INSERT_TAIL(&_nb_part_cache, p, entry);
-		cached_name = p->name;
-		cached_impl = p->impl;
-	}
-found:
-	if (real != NULL) {
-		p = malloc(sizeof(*p));
-		if (p == NULL)
-			return ENOMEM;
-		strlcpy(&p->name[0], real, sizeof(p->name));
-		cached_name = p->name;
-		p->impl = cached_impl;
-		SIMPLEQ_INSERT_TAIL(&_nb_part_cache, p, entry);
-	}
-	*out_name = cached_name;
-	*out_impl = cached_impl;
-	return 0;
-}
-
-static __inline int
-_PREFIX(load)(const char * __restrict name,
-    const char ** __restrict out_name, _CATEGORY_TYPE ** __restrict out_impl)
-{
-	int ret, force;
-	char path[PATH_MAX + 1], loccat[PATH_MAX + 1], buf[PATH_MAX + 1];
-	const char *aliaspath, *alias;
-
-#define _LOAD_SUB_ALIAS(key)						\
-do {									\
-	alias = __unaliasname(aliaspath, key, &buf[0], sizeof(buf));	\
-	if (alias != NULL) {						\
-		ret = (force = !__isforcemapping(alias))		\
-		    ? _PREFIX(load_sub)(name, NULL, out_name, out_impl, \
-				        force)	\
-		    : _PREFIX(load_sub)(alias, name, out_name, out_impl, \
-				        force);	\
-		_DIAGASSERT(!ret || !force);				\
-		goto done;						\
-	}								\
-} while (/*CONSTCOND*/0)
-
-	/* (1) non-aliased file */
-	mutex_lock(&_nb_mutex);
-	ret = _PREFIX(load_sub)(name, NULL, out_name, out_impl, 0);
-	if (ret != ENOENT)
-		goto done;
-
-	/* (2) lookup locname/catname type alias */
-	_DIAGASSERT(_PathLocale != NULL);
-	snprintf(&path[0], sizeof(path),
-	    "%s/" _LOCALE_ALIAS_NAME, _PathLocale);
-	aliaspath = (const char *)&path[0];
-	snprintf(&loccat[0], sizeof(loccat),
-	    "%s/" _CATEGORY_NAME, name);
-	_LOAD_SUB_ALIAS((const char *)&loccat[0]);
-
-	/* (3) lookup locname type alias */
-	_LOAD_SUB_ALIAS(name);
-
-done:
-	mutex_unlock(&_nb_mutex);
-	return ret;
-}
-
-const char *
-_PREFIX(setlocale)(const char * __restrict name,
-    struct _locale * __restrict locale)
-{
-	const char *loaded_name;
-	_CATEGORY_TYPE *loaded_impl;
-
-	/* name may be NULL */
-	_DIAGASSERT(locale != NULL);
-
-	if (name != NULL) {
-		if (*name == '\0')
-			name = _get_locale_env(_CATEGORY_NAME);
-		_DIAGASSERT(name != NULL);
-		_DIAGASSERT(locale->part_name[(size_t)_CATEGORY_ID] != NULL);
-		if (strcmp(name, locale->part_name[(size_t)_CATEGORY_ID])) {
-			if (_PREFIX(load)(name, &loaded_name, &loaded_impl))
-				return NULL;
-			locale->part_name[(size_t)_CATEGORY_ID] = loaded_name;
-			locale->part_impl[(size_t)_CATEGORY_ID] = loaded_impl;
-			if (locale == &_lc_global_locale)
-				_PREFIX(update_global)(loaded_impl);
-		}
-	}
-	return locale->part_name[(size_t)_CATEGORY_ID];
-}
-
-#endif /*_NB_LC_TEMPLATE_H_*/
diff --git a/lib/libc/locale/nb_lc_template_decl.h b/lib/libc/locale/nb_lc_template_decl.h
deleted file mode 100644
index bf7cb5d99..000000000
--- a/lib/libc/locale/nb_lc_template_decl.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: nb_lc_template_decl.h,v 1.4 2013/09/13 13:13:32 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NB_LC_TEMPLATE_DECL_H_
-#define _NB_LC_TEMPLATE_DECL_H_
-
-#include "generic_lc_template_decl.h"
-
-static __inline int
-_PREFIX(create_impl)(const char * __restrict,
-    const char * __restrict, _CATEGORY_TYPE ** __restrict);
-
-static __inline void
-_PREFIX(update_global)(_CATEGORY_TYPE *);
-
-#endif /*_NB_LC_TEMPLATE_DECL_H_*/
diff --git a/lib/libc/locale/nb_lc_time_misc.h b/lib/libc/locale/nb_lc_time_misc.h
deleted file mode 100644
index c286f0905..000000000
--- a/lib/libc/locale/nb_lc_time_misc.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* $NetBSD: nb_lc_time_misc.h,v 1.8 2013/09/13 13:13:32 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NB_LC_TIME_MISC_H_
-#define _NB_LC_TIME_MISC_H_
-
-/*
- * macro required by nb_lc_template(_decl).h
- */
-#define _CATEGORY_TYPE		_TimeLocale
-
-#define ABDAY_IDX(idx)	((size_t)idx - (size_t)ABDAY_1)
-#define DAY_IDX(idx)	((size_t)idx - (size_t)DAY_1)
-#define ABMON_IDX(idx)	((size_t)idx - (size_t)ABMON_1)
-#define MON_IDX(idx)	((size_t)idx - (size_t)MON_1)
-#define AM_PM_IDX(idx)	((size_t)idx - (size_t)AM_STR)
-
-/* ARGSUSED */
-static __inline void
-_PREFIX(update_global)(_TimeLocale *data)
-{
-}
-
-/*
- * macro required by nb_lc_template.h
- */
-#define _CATEGORY_ID		LC_TIME
-#define _CATEGORY_NAME		"LC_TIME"
-
-#endif /*_NB_LC_TIME_MISC_H_*/
diff --git a/lib/libc/locale/newlocale.c b/lib/libc/locale/newlocale.c
deleted file mode 100644
index 7955e3b20..000000000
--- a/lib/libc/locale/newlocale.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* $NetBSD: newlocale.c,v 1.3 2013/09/13 13:13:32 joerg Exp $ */
-
-/*-
- * Copyright (c)2008, 2011 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: newlocale.c,v 1.3 2013/09/13 13:13:32 joerg Exp $");
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "setlocale_local.h"
-
-__weak_alias(newlocale, _newlocale)
-
-locale_t
-newlocale(int mask, const char *name, locale_t src)
-{
-	struct _locale *dst;
-	char head[_LOCALENAME_LEN_MAX * (_LC_LAST - 1)], *tail;
-	const char *tokens[_LC_LAST - 1];
-	_locale_set_t l;
-	int i, howmany, categories[_LC_LAST - 1];
-
-	if (name == NULL)
-		name = _C_LOCALE;
-	dst = malloc(sizeof(*dst));
-	if (dst == NULL)
-		return (locale_t)NULL;
-	if (src == NULL)
-		src = _current_locale();
-	memcpy(dst, src, sizeof(*src));
-	strlcpy(&head[0], name, sizeof(head));
-	tokens[0] = (const char *)&head[0];
-	tail = strchr(tokens[0], '/');
-	if (tail == NULL) {
-		for (i = 1; i < _LC_LAST; ++i) {
-			if (mask & (1 << i)) {
-				l = _find_category(i);
-				_DIAGASSERT(l != NULL);
-				(*l)(tokens[0], dst);
-			}
-		}
-	} else {
-		*tail++ = '\0';
-		howmany = 0;
-		for (i = 1; i < _LC_LAST; ++i) {
-			if (mask & (1 << i))
-				categories[howmany++] = i;
-		}
-		if (howmany-- > 0) {
-			for (i = 1; i < howmany; ++i) {
-				tokens[i] = (const char *)tail;
-				tail = strchr(tokens[i], '/');
-				if (tail == NULL) {
-					free(dst);
-					return NULL;
-				}
-			}
-			tokens[howmany] = tail;
-			tail = strchr(tokens[howmany], '/');
-			if (tail != NULL) {
-				free(dst);
-				return NULL;
-			}
-			for (i = 0; i <= howmany; ++i) {
-				l = _find_category(categories[i]);
-				_DIAGASSERT(l != NULL);
-				(*l)(tokens[i], dst);
-			}
-		}
-	}
-	if (_setlocale_cache(dst, NULL)) {
-		free(dst);
-		return NULL;
-	}
-	return (locale_t)dst;
-}
diff --git a/lib/libc/locale/nl_langinfo.3 b/lib/libc/locale/nl_langinfo.3
deleted file mode 100644
index d58bf6b69..000000000
--- a/lib/libc/locale/nl_langinfo.3
+++ /dev/null
@@ -1,149 +0,0 @@
-.\"	$NetBSD: nl_langinfo.3,v 1.20 2011/04/14 05:50:49 jruoho Exp $
-.\"
-.\" Written by J.T. Conklin <jtc@NetBSD.org>.
-.\" Public domain.
-.\"
-.Dd April 14, 2011
-.Dt NL_LANGINFO 3
-.Os
-.Sh NAME
-.Nm nl_langinfo
-.Nd get locale information
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In langinfo.h
-.Ft char *
-.Fn nl_langinfo "nl_item item"
-.Sh DESCRIPTION
-The
-.Fn nl_langinfo
-function returns a pointer to a string containing information
-set by the program's locale.
-.Pp
-The names and values of
-.Fa item
-are defined in
-.In langinfo.h .
-The entries under Category indicate in which
-.Xr setlocale 3
-category each item is defined.
-.Bl -column ERA_D_T_FMT LC_MESSAGES
-.It Sy Constant Ta Sy Category Ta Sy Meaning
-.It CODESET	LC_CTYPE	Codeset name
-.It D_T_FMT	LC_TIME	String for formatting date and time
-.It D_FMT	LC_TIME	Date format string
-.It T_FMT	LC_TIME	Time format string
-.It T_FMT_AMPM	LC_TIME	A.M. or P.M. time format string
-.It AM_STR	LC_TIME	Ante-meridiem affix
-.It PM_STR	LC_TIME	Post-meridiem affix
-.It DAY_1	LC_TIME	Name of the first day of the week (e.g.: Sunday)
-.It DAY_2	LC_TIME	Name of the second day of the week (e.g.: Monday)
-.It DAY_3	LC_TIME	Name of the third day of the week (e.g.: Tuesday)
-.It DAY_4	LC_TIME	Name of the fourth day of the week (e.g.: Wednesday)
-.It DAY_5	LC_TIME	Name of the fifth day of the week (e.g.: Thursday)
-.It DAY_6	LC_TIME	Name of the sixth day of the week (e.g.: Friday)
-.It DAY_7	LC_TIME	Name of the seventh day of the week (e.g.: Saturday)
-.It ABDAY_1	LC_TIME	Abbreviated name of the first day of the week
-.It ABDAY_2	LC_TIME	Abbreviated name of the second day of the week
-.It ABDAY_3	LC_TIME	Abbreviated name of the third day of the week
-.It ABDAY_4	LC_TIME	Abbreviated name of the fourth day of the week
-.It ABDAY_5	LC_TIME	Abbreviated name of the fifth day of the week
-.It ABDAY_6	LC_TIME	Abbreviated name of the sixth day of the week
-.It ABDAY_7	LC_TIME	Abbreviated name of the seventh day of the week
-.It MON_1	LC_TIME	Name of the first month of the year
-.It MON_2	LC_TIME	Name of the second month
-.It MON_3	LC_TIME	Name of the third month
-.It MON_4	LC_TIME	Name of the fourth month
-.It MON_5	LC_TIME	Name of the fifth month
-.It MON_6	LC_TIME	Name of the sixth month
-.It MON_7	LC_TIME	Name of the seventh month
-.It MON_8	LC_TIME	Name of the eighth month
-.It MON_9	LC_TIME	Name of the ninth month
-.It MON_10	LC_TIME	Name of the tenth month
-.It MON_11	LC_TIME	Name of the eleventh month
-.It MON_12	LC_TIME	Name of the twelfth month
-.It ABMON_1	LC_TIME	Abbreviated name of the first month
-.It ABMON_2	LC_TIME	Abbreviated name of the second month
-.It ABMON_3	LC_TIME	Abbreviated name of the third month
-.It ABMON_4	LC_TIME	Abbreviated name of the fourth month
-.It ABMON_5	LC_TIME	Abbreviated name of the fifth month
-.It ABMON_6	LC_TIME	Abbreviated name of the sixth month
-.It ABMON_7	LC_TIME	Abbreviated name of the seventh month
-.It ABMON_8	LC_TIME	Abbreviated name of the eighth month
-.It ABMON_9	LC_TIME	Abbreviated name of the ninth month
-.It ABMON_10	LC_TIME	Abbreviated name of the tenth month
-.It ABMON_11	LC_TIME	Abbreviated name of the eleventh month
-.It ABMON_12	LC_TIME	Abbreviated name of the twelfth month
-.It ERA	LC_TIME	Era description segments
-.It ERA_D_FMT	LC_TIME	Era date format string
-.It ERA_D_T_FMT	LC_TIME	Era date and time format string
-.It ERA_T_FMT	LC_TIME	Era time format string
-.It ALT_DIGITS	LC_TIME	Alternative symbols for digits
-.It RADIXCHAR	LC_NUMERIC	Radix character
-.It THOUSEP	LC_NUMERIC	Separator for thousands
-.It YESEXPR	LC_MESSAGES	Affirmative response expression
-.It NOEXPR	LC_MESSAGES	Negative response expression
-.\".It CRNCYSTR	LC_MONETARY	Local currency symbol
-.El
-.Sh RETURN VALUES
-.Fn nl_langinfo
-returns a pointer to an empty string if
-.Fa item
-is invalid.
-.Sh EXAMPLES
-The following example uses
-.Fn nl_langinfo
-to obtain the date and time format for the current locale:
-.Pp
-.Bd -literal -offset indent
-#include \*[Lt]time.h\*[Gt]
-#include \*[Lt]langinfo.h\*[Gt]
-#include \*[Lt]locale.h\*[Gt]
-
-int main(void)
-{
-	char datestring[100];
-	struct tm *tm;
-	time_t t;
-	char *ptr;
-
-	t = time(NULL);
-	tm = localtime(\*[Am]t);
-	(void)setlocale(LC_ALL, "");
-	ptr = nl_langinfo(D_T_FMT);
-	strftime(datestring, sizeof(datestring), ptr, tm);
-	printf("%s\en", datestring);
-	return (0);
-}
-.Ed
-.\" .Pp
-.\" The following example uses
-.\" .Fn nl_langinfo
-.\" to obtain the setting of the currency symbol for the current locale:
-.\" .Pp
-.\" .Bd
-.\" 	#include \*[Lt]langinfo.h\*[Gt]
-.\" 	#include \*[Lt]locale.h\*[Gt]
-.\" 	int main(void)
-.\" 	{
-.\" 		char *ptr;
-.\" 		(void)setlocale(LC_ALL, "");
-.\" 		ptr = nl_langinfo(CRNCYSTR);
-.\" 		printf("%s", ptr);
-.\" 	}
-.\" .Ed
-.Sh SEE ALSO
-.Xr setlocale 3 ,
-.Xr tm 3 ,
-.Xr nls 7
-.Sh STANDARDS
-The
-.Fn nl_langinfo
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn nl_langinfo
-function appeared in
-.Nx 1.0 .
diff --git a/lib/libc/locale/nl_langinfo.c b/lib/libc/locale/nl_langinfo.c
deleted file mode 100644
index 7d0c2f906..000000000
--- a/lib/libc/locale/nl_langinfo.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* $NetBSD: nl_langinfo.c,v 1.17 2013/08/20 19:58:30 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: nl_langinfo.c,v 1.17 2013/08/20 19:58:30 joerg Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/localedef.h>
-#include <langinfo.h>
-#include <stddef.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "runetype_local.h"
-#include "setlocale_local.h"
-
-static const char langinfo_category[] = {
-    [ D_T_FMT ] = LC_TIME,
-    [ D_FMT ] = LC_TIME,
-    [ T_FMT ] = LC_TIME,
-    [ T_FMT_AMPM ] = LC_TIME,
-    [ AM_STR ] = LC_TIME,
-    [ PM_STR ] = LC_TIME,
-    [ DAY_1 ] = LC_TIME,
-    [ DAY_2 ] = LC_TIME,
-    [ DAY_3 ] = LC_TIME,
-    [ DAY_4 ] = LC_TIME,
-    [ DAY_5 ] = LC_TIME,
-    [ DAY_6 ] = LC_TIME,
-    [ DAY_7 ] = LC_TIME,
-    [ ABDAY_1 ] = LC_TIME,
-    [ ABDAY_2 ] = LC_TIME,
-    [ ABDAY_3 ] = LC_TIME,
-    [ ABDAY_4 ] = LC_TIME,
-    [ ABDAY_5 ] = LC_TIME,
-    [ ABDAY_6 ] = LC_TIME,
-    [ ABDAY_7 ] = LC_TIME,
-    [ MON_1 ] = LC_TIME,
-    [ MON_2 ] = LC_TIME,
-    [ MON_3 ] = LC_TIME,
-    [ MON_4 ] = LC_TIME,
-    [ MON_5 ] = LC_TIME,
-    [ MON_6 ] = LC_TIME,
-    [ MON_7 ] = LC_TIME,
-    [ MON_8 ] = LC_TIME,
-    [ MON_9 ] = LC_TIME,
-    [ MON_10 ] = LC_TIME,
-    [ MON_11 ] = LC_TIME,
-    [ MON_12 ] = LC_TIME,
-    [ ABMON_1 ] = LC_TIME,
-    [ ABMON_2 ] = LC_TIME,
-    [ ABMON_3 ] = LC_TIME,
-    [ ABMON_4 ] = LC_TIME,
-    [ ABMON_5 ] = LC_TIME,
-    [ ABMON_6 ] = LC_TIME,
-    [ ABMON_7 ] = LC_TIME,
-    [ ABMON_8 ] = LC_TIME,
-    [ ABMON_9 ] = LC_TIME,
-    [ ABMON_10 ] = LC_TIME,
-    [ ABMON_11 ] = LC_TIME,
-    [ ABMON_12 ] = LC_TIME,
-    [ RADIXCHAR ] = LC_NUMERIC,
-    [ THOUSEP ] = LC_NUMERIC,
-    [ YESSTR ] = LC_MESSAGES,
-    [ YESEXPR ] = LC_MESSAGES,
-    [ NOSTR ] = LC_MESSAGES,
-    [ NOEXPR ] = LC_MESSAGES,
-    [ CRNCYSTR ] = 0,
-    [ CODESET ] = LC_CTYPE,
-    [ ERA ] = 0,
-    [ ERA_D_FMT ] = 0,
-    [ ERA_D_T_FMT ] = 0,
-    [ ERA_T_FMT ] = 0,
-    [ ALT_DIGITS ] = 0,
-};
-
-static const uint16_t langinfo_offset[] = {
-    [ D_T_FMT ] = offsetof(_TimeLocale, d_t_fmt),
-    [ D_FMT ] = offsetof(_TimeLocale, d_fmt),
-    [ T_FMT ] = offsetof(_TimeLocale, t_fmt),
-    [ T_FMT_AMPM ] = offsetof(_TimeLocale, t_fmt_ampm),
-    [ AM_STR ] = offsetof(_TimeLocale, am_pm[0]),
-    [ PM_STR ] = offsetof(_TimeLocale, am_pm[1]),
-    [ DAY_1 ] = offsetof(_TimeLocale, day[0]),
-    [ DAY_2 ] = offsetof(_TimeLocale, day[1]),
-    [ DAY_3 ] = offsetof(_TimeLocale, day[2]),
-    [ DAY_4 ] = offsetof(_TimeLocale, day[3]),
-    [ DAY_5 ] = offsetof(_TimeLocale, day[4]),
-    [ DAY_6 ] = offsetof(_TimeLocale, day[5]),
-    [ DAY_7 ] = offsetof(_TimeLocale, day[6]),
-    [ ABDAY_1 ] = offsetof(_TimeLocale, abday[0]),
-    [ ABDAY_2 ] = offsetof(_TimeLocale, abday[1]),
-    [ ABDAY_3 ] = offsetof(_TimeLocale, abday[2]),
-    [ ABDAY_4 ] = offsetof(_TimeLocale, abday[3]),
-    [ ABDAY_5 ] = offsetof(_TimeLocale, abday[4]),
-    [ ABDAY_6 ] = offsetof(_TimeLocale, abday[5]),
-    [ ABDAY_7 ] = offsetof(_TimeLocale, abday[6]),
-    [ MON_1 ] = offsetof(_TimeLocale, mon[0]),
-    [ MON_2 ] = offsetof(_TimeLocale, mon[1]),
-    [ MON_3 ] = offsetof(_TimeLocale, mon[2]),
-    [ MON_4 ] = offsetof(_TimeLocale, mon[3]),
-    [ MON_5 ] = offsetof(_TimeLocale, mon[4]),
-    [ MON_6 ] = offsetof(_TimeLocale, mon[5]),
-    [ MON_7 ] = offsetof(_TimeLocale, mon[6]),
-    [ MON_8 ] = offsetof(_TimeLocale, mon[7]),
-    [ MON_9 ] = offsetof(_TimeLocale, mon[8]),
-    [ MON_10 ] = offsetof(_TimeLocale, mon[9]),
-    [ MON_11 ] = offsetof(_TimeLocale, mon[10]),
-    [ MON_12 ] = offsetof(_TimeLocale, mon[11]),
-    [ ABMON_1 ] = offsetof(_TimeLocale, abmon[0]),
-    [ ABMON_2 ] = offsetof(_TimeLocale, abmon[1]),
-    [ ABMON_3 ] = offsetof(_TimeLocale, abmon[2]),
-    [ ABMON_4 ] = offsetof(_TimeLocale, abmon[3]),
-    [ ABMON_5 ] = offsetof(_TimeLocale, abmon[4]),
-    [ ABMON_6 ] = offsetof(_TimeLocale, abmon[5]),
-    [ ABMON_7 ] = offsetof(_TimeLocale, abmon[6]),
-    [ ABMON_8 ] = offsetof(_TimeLocale, abmon[7]),
-    [ ABMON_9 ] = offsetof(_TimeLocale, abmon[8]),
-    [ ABMON_10 ] = offsetof(_TimeLocale, abmon[9]),
-    [ ABMON_11 ] = offsetof(_TimeLocale, abmon[10]),
-    [ ABMON_12 ] = offsetof(_TimeLocale, abmon[11]),
-    [ RADIXCHAR ] = offsetof(_NumericLocale, decimal_point),
-    [ THOUSEP ] = offsetof(_NumericLocale, thousands_sep),
-    [ YESSTR ] = offsetof(_MessagesLocale, yesstr),
-    [ YESEXPR ] = offsetof(_MessagesLocale, yesexpr),
-    [ NOSTR ] = offsetof(_MessagesLocale, nostr),
-    [ NOEXPR ] = offsetof(_MessagesLocale, noexpr),
-    [ CRNCYSTR ] = 0,
-    [ CODESET ] = offsetof(_RuneLocale, rl_codeset),
-    [ ERA ] = 0,
-    [ ERA_D_FMT ] = 0,
-    [ ERA_D_T_FMT ] = 0,
-    [ ERA_T_FMT ] = 0,
-    [ ALT_DIGITS ] = 0,
-};
-
-__weak_alias(nl_langinfo_l, _nl_langinfo_l)
-
-char *
-nl_langinfo(nl_item item)
-{
-
-	return nl_langinfo_l(item, _current_locale());
-}
-
-char *
-nl_langinfo_l(nl_item item, locale_t loc)
-{
-	char *s;
-	int category;
-	size_t offset;
-
-	if (item < 0 || item >= (long)__arraycount(langinfo_category))
-		return __UNCONST(""); /* Outside the defined range */
-
-	category = langinfo_category[item];
-	if (category == 0)
-		return __UNCONST(""); /* Not in use */
-	offset = langinfo_offset[item];
-
-	memcpy(&s, (char *)loc->part_impl[category] + offset, sizeof(s));
-	if (s == NULL)
-		return __UNCONST("");
-	else
-		return s;
-}
diff --git a/lib/libc/locale/rune.c b/lib/libc/locale/rune.c
deleted file mode 100644
index 75f641f92..000000000
--- a/lib/libc/locale/rune.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/*	$NetBSD: rune.c,v 1.46 2013/04/13 10:21:20 joerg Exp $	*/
-/*-
- * Copyright (c)2010 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/endian.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <wchar.h>
-
-#include "setlocale_local.h"
-
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-
-#include "runetype_local.h"
-
-#include "multibyte.h"
-
-#include "_wctype_local.h"
-#include "_wctrans_local.h"
-
-typedef struct {
-	_RuneLocale rl;
-	unsigned short	rlp_ctype_tab  [_CTYPE_NUM_CHARS + 1];
-	short		rlp_tolower_tab[_CTYPE_NUM_CHARS + 1];
-	short		rlp_toupper_tab[_CTYPE_NUM_CHARS + 1];
-	char		rlp_codeset[33]; /* XXX */
-
-#ifdef __BUILD_LEGACY
-	unsigned char	rlp_compat_bsdctype[_CTYPE_NUM_CHARS + 1];
-#endif
-} _RuneLocalePriv;
-
-static __inline void
-_rune_wctype_init(_RuneLocale *rl)
-{
-	memcpy(&rl->rl_wctype, &_DefaultRuneLocale.rl_wctype,
-	    sizeof(rl->rl_wctype));
-}
-
-static __inline void
-_rune_wctrans_init(_RuneLocale *rl)
-{
-	rl->rl_wctrans[_WCTRANS_INDEX_LOWER].te_name   = "tolower";
-	rl->rl_wctrans[_WCTRANS_INDEX_LOWER].te_cached = &rl->rl_maplower[0];
-	rl->rl_wctrans[_WCTRANS_INDEX_LOWER].te_extmap = &rl->rl_maplower_ext;
-	rl->rl_wctrans[_WCTRANS_INDEX_UPPER].te_name   = "toupper";
-	rl->rl_wctrans[_WCTRANS_INDEX_UPPER].te_cached = &rl->rl_mapupper[0];
-	rl->rl_wctrans[_WCTRANS_INDEX_UPPER].te_extmap = &rl->rl_mapupper_ext;
-}
-
-static __inline void
-_rune_init_priv(_RuneLocalePriv *rlp)
-{
-#if _CTYPE_CACHE_SIZE != _CTYPE_NUM_CHARS
-	int i;
-
-	for (i = _CTYPE_CACHE_SIZE; i < _CTYPE_NUM_CHARS; ++i) {
-		rlp->rlp_ctype_tab  [i + 1] = 0;
-		rlp->rlp_tolower_tab[i + 1] = i;
-		rlp->rlp_toupper_tab[i + 1] = i;
-
-#ifdef __BUILD_LEGACY
-		rlp->rlp_compat_bsdctype[i + 1] = 0;
-#endif
-	}
-#endif
-	rlp->rlp_ctype_tab  [0] = 0;
-	rlp->rlp_tolower_tab[0] = EOF;
-	rlp->rlp_toupper_tab[0] = EOF;
-
-	rlp->rl.rl_ctype_tab   = (const unsigned short *)&rlp->rlp_ctype_tab[0];
-	rlp->rl.rl_tolower_tab = (const short *)&rlp->rlp_tolower_tab[0];
-	rlp->rl.rl_toupper_tab = (const short *)&rlp->rlp_toupper_tab[0];
-	rlp->rl.rl_codeset     = (const char *)&rlp->rlp_codeset[0];
-
-	_rune_wctype_init(&rlp->rl);
-	_rune_wctrans_init(&rlp->rl);
-
-#ifdef __BUILD_LEGACY
-	rlp->rlp_compat_bsdctype[0] = 0;
-	rlp->rl.rl_compat_bsdctype = (const unsigned char *)
-	    &rlp->rlp_compat_bsdctype[0];
-#endif
-}
-
-static __inline void
-_rune_find_codeset(char *s, size_t n,
-    char *var, size_t *plenvar)
-{
-	size_t lenvar;
-	const char *endvar;
-
-#define _RUNE_CODESET_LEN (sizeof(_RUNE_CODESET)-1)
-
-	lenvar = *plenvar;
-	for (/**/; lenvar > _RUNE_CODESET_LEN; ++var, --lenvar) {
-		if (!memcmp(var, _RUNE_CODESET, _RUNE_CODESET_LEN)) {
-			*var = '\0';
-			*plenvar -= lenvar;
-			endvar = &var[_RUNE_CODESET_LEN];
-			while (n-- > 1 && lenvar-- > _RUNE_CODESET_LEN) {
-				if (*endvar == ' ' || *endvar == '\t')
-					break;
-				*s++ = *endvar++;
-			}
-			break;
-		}
-	}
-	*s = '\0';
-}
-
-#ifdef __BUILD_LEGACY
-static __inline int
-_runetype_to_bsdctype(_RuneType bits)
-{
-	int ret;
-
-	if (bits == (_RuneType)0)
-		return 0;
-	ret = 0;
-	if (bits & _RUNETYPE_U)
-		ret |= _COMPAT_U;
-	if (bits & _RUNETYPE_L)
-		ret |= _COMPAT_L;
-	if (bits & _RUNETYPE_D)
-		ret |= _COMPAT_N;
-	if (bits & _RUNETYPE_S)
-		ret |= _COMPAT_S;
-	if (bits & _RUNETYPE_P)
-		ret |= _COMPAT_P;
-	if (bits & _RUNETYPE_C)
-		ret |= _COMPAT_C;
-	if ((bits & (_RUNETYPE_X | _RUNETYPE_D)) == _RUNETYPE_X)
-		ret |= _COMPAT_X;
-	if ((bits & (_RUNETYPE_R | _RUNETYPE_G)) == _RUNETYPE_R)
-		ret |= _COMPAT_B;
-	return ret;
-}
-#endif /* __BUILD_LEGACY */
-
-static __inline int
-_rune_read_file(const char * __restrict var, size_t lenvar,
-    _RuneLocale ** __restrict prl)
-{
-	int ret, i;
-	const _FileRuneLocale *frl;
-	const _FileRuneEntry *fre;
-	const uint32_t *frune;
-	_RuneLocalePriv *rlp;
-	_RuneLocale *rl;
-	_RuneEntry *re;
-	uint32_t *rune;
-	uint32_t runetype_len, maplower_len, mapupper_len, variable_len;
-	size_t len, n;
-
-	if (lenvar < sizeof(*frl))
-		return EFTYPE;
-	lenvar -= sizeof(*frl);
-	frl = (const _FileRuneLocale *)(const void *)var;
-	if (memcmp(_RUNECT10_MAGIC, &frl->frl_magic[0], sizeof(frl->frl_magic)))
-		return EFTYPE;
-
-	runetype_len = be32toh(frl->frl_runetype_ext.frr_nranges);
-	maplower_len = be32toh(frl->frl_maplower_ext.frr_nranges);
-	mapupper_len = be32toh(frl->frl_mapupper_ext.frr_nranges);
-	len = runetype_len + maplower_len + mapupper_len;
-
-	fre = (const _FileRuneEntry *)(const void *)(frl + 1);
-	frune = (const uint32_t *)(const void *)(fre + len);
-
-	variable_len = be32toh((uint32_t)frl->frl_variable_len);
-
-	n = len * sizeof(*fre);
-	if (lenvar < n)
-		return EFTYPE;
-	lenvar -= n;
-
-	n = sizeof(*rlp) + (len * sizeof(*re)) + lenvar;
-	rlp = (_RuneLocalePriv *)malloc(n);
-	if (rlp == NULL)
-		return ENOMEM;
-	_rune_init_priv(rlp);
-
-	rl = &rlp->rl;
-	re = (_RuneEntry *)(void *)(rlp + 1);
-	rune = (uint32_t *)(void *)(re + len);
-
-	for (i = 0; i < _CTYPE_CACHE_SIZE; ++i) {
-		rl->rl_runetype[i] = be32toh(frl->frl_runetype[i]);
-		rl->rl_maplower[i] = be32toh((uint32_t)frl->frl_maplower[i]);
-		rl->rl_mapupper[i] = be32toh((uint32_t)frl->frl_mapupper[i]);
-	}
-
-#define READ_RANGE(name)						\
-do {									\
-	const _FileRuneEntry *end_fre;					\
-	const uint32_t *end_frune;					\
-									\
-	rl->rl_##name##_ext.rr_nranges = name##_len;			\
-	rl->rl_##name##_ext.rr_rune_ranges = re;			\
-									\
-	end_fre = fre + name##_len;					\
-	while (fre < end_fre) {						\
-		re->re_min = be32toh((uint32_t)fre->fre_min);		\
-		re->re_max = be32toh((uint32_t)fre->fre_max);		\
-		re->re_map = be32toh((uint32_t)fre->fre_map);		\
-		if (re->re_map != 0) {					\
-			re->re_rune_types = NULL;			\
-		} else {						\
-			re->re_rune_types = rune;			\
-			len = re->re_max - re->re_min + 1;		\
-			n = len * sizeof(*frune);			\
-			if (lenvar < n) {				\
-				ret = EFTYPE;				\
-				goto err;				\
-			}						\
-			lenvar -= n;					\
-			end_frune = frune + len;			\
-			while (frune < end_frune)			\
-				*rune++ = be32toh(*frune++);		\
-		}							\
-		++fre, ++re;						\
-	}								\
-} while (/*CONSTCOND*/0)
-
-	READ_RANGE(runetype);
-	READ_RANGE(maplower);
-	READ_RANGE(mapupper);
-
-	if (lenvar < variable_len) {
-		ret = EFTYPE;
-		goto err;
-	}
-
-	memcpy((void *)rune, (void const *)frune, variable_len);
-	rl->rl_variable_len = variable_len;
-	rl->rl_variable = (void *)rune;
-
-	_rune_find_codeset(rlp->rlp_codeset, sizeof(rlp->rlp_codeset),
-	    (char *)rl->rl_variable, &rl->rl_variable_len);
-
-	ret = _citrus_ctype_open(&rl->rl_citrus_ctype, frl->frl_encoding,
-	    rl->rl_variable, rl->rl_variable_len, _PRIVSIZE);
-	if (ret)
-		goto err;
-	if (__mb_len_max_runtime <
-	    _citrus_ctype_get_mb_cur_max(rl->rl_citrus_ctype)) {
-		ret = EINVAL;
-		goto err;
-	}
-
-	for (i = 0; i < _CTYPE_CACHE_SIZE; ++i) {
-		wint_t wc;
-		_RuneType rc;
-
-		ret = _citrus_ctype_btowc(rl->rl_citrus_ctype, i, &wc);
-		if (ret)
-			goto err;
-		if (wc == WEOF) {
-			rlp->rlp_ctype_tab[i + 1] = 0;
-			rlp->rlp_tolower_tab[i + 1] = i;
-			rlp->rlp_toupper_tab[i + 1] = i;
-		} else {
-			rc = _runetype_priv(rl, wc);
-			rlp->rlp_ctype_tab[i + 1] = (unsigned short)
-			    ((rc & ~_RUNETYPE_SWM) >> 8);
-
-#ifdef __BUILD_LEGACY
-			rlp->rlp_compat_bsdctype[i + 1]
-			  = _runetype_to_bsdctype(rc);
-#endif
-
-#define CONVERT_MAP(name)						\
-do {									\
-	wint_t map;							\
-	int c;								\
-									\
-	map = _towctrans_priv(wc, _wctrans_##name(rl));			\
-	if (map == wc || (_citrus_ctype_wctob(rl->rl_citrus_ctype,	\
-	    map, &c)  || c == EOF))					\
-		c = i;							\
-	rlp->rlp_to##name##_tab[i + 1] = (short)c;			\
-} while (/*CONSTCOND*/0)
-
-			CONVERT_MAP(lower);
-			CONVERT_MAP(upper);
-		}
-	}
-	*prl = rl;
-	return 0;
-
-err:
-	free(rlp);
-	return ret;
-}
-
-int
-_rune_load(const char * __restrict var, size_t lenvar,
-    _RuneLocale ** __restrict prl)
-{
-	int ret;
-
-	_DIAGASSERT(var != NULL || lenvar < 1);
-	_DIAGASSERT(prl != NULL);
-
-	if (lenvar < 1)
-		return EFTYPE;
-	switch (*var) {
-	case 'R':
-		ret = _rune_read_file(var, lenvar, prl);
-		break;
-	default:
-		ret = EFTYPE;
-	}
-	return ret;
-}
diff --git a/lib/libc/locale/runetable.c b/lib/libc/locale/runetable.c
deleted file mode 100644
index a484f60d6..000000000
--- a/lib/libc/locale/runetable.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/*	$NetBSD: runetable.c,v 1.29 2013/08/18 20:03:48 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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: src/lib/libc/locale/table.c,v 1.13 2000/02/08 07:43:25 obrien Exp $
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 6/27/93";
-#else
-__RCSID("$NetBSD: runetable.c,v 1.29 2013/08/18 20:03:48 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <wchar.h>
-
-#include "citrus_module.h"
-#include "citrus_ctype.h"
-#include "runetype_local.h"
-
-__dso_hidden const _RuneLocale _DefaultRuneLocale = {
-    {	/*00*/	_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-	/*08*/	_RUNETYPE_C,
-		_RUNETYPE_C|_RUNETYPE_S|_RUNETYPE_B,
-		_RUNETYPE_C|_RUNETYPE_S,
-		_RUNETYPE_C|_RUNETYPE_S,
-		_RUNETYPE_C|_RUNETYPE_S,
-		_RUNETYPE_C|_RUNETYPE_S,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-	/*10*/	_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-	/*18*/	_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-		_RUNETYPE_C,
-	/*20*/	_RUNETYPE_S|_RUNETYPE_B|_RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-	/*28*/	_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-	/*30*/	_RUNETYPE_D|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_X|_RUNETYPE_SW1|0,
-		_RUNETYPE_D|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_X|_RUNETYPE_SW1|1,
-		_RUNETYPE_D|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_X|_RUNETYPE_SW1|2,
-		_RUNETYPE_D|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_X|_RUNETYPE_SW1|3,
-		_RUNETYPE_D|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_X|_RUNETYPE_SW1|4,
-		_RUNETYPE_D|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_X|_RUNETYPE_SW1|5,
-		_RUNETYPE_D|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_X|_RUNETYPE_SW1|6,
-		_RUNETYPE_D|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_X|_RUNETYPE_SW1|7,
-	/*38*/	_RUNETYPE_D|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_X|_RUNETYPE_SW1|8,
-		_RUNETYPE_D|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_X|_RUNETYPE_SW1|9,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-	/*40*/	_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_X|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1|10,
-		_RUNETYPE_U|_RUNETYPE_X|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1|11,
-		_RUNETYPE_U|_RUNETYPE_X|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1|12,
-		_RUNETYPE_U|_RUNETYPE_X|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1|13,
-		_RUNETYPE_U|_RUNETYPE_X|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1|14,
-		_RUNETYPE_U|_RUNETYPE_X|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1|15,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-	/*48*/	_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-	/*50*/	_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-	/*58*/	_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_U|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-	/*60*/	_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_X|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1|10,
-		_RUNETYPE_L|_RUNETYPE_X|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1|11,
-		_RUNETYPE_L|_RUNETYPE_X|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1|12,
-		_RUNETYPE_L|_RUNETYPE_X|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1|13,
-		_RUNETYPE_L|_RUNETYPE_X|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1|14,
-		_RUNETYPE_L|_RUNETYPE_X|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1|15,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-	/*68*/	_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-	/*70*/	_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-	/*78*/	_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_L|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_A|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_P|_RUNETYPE_R|_RUNETYPE_G|_RUNETYPE_SW1,
-		_RUNETYPE_C,
-#ifdef ALL_80_TO_FF_SW1
-	/*80*/	_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-	/*90*/	_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-	/*A0*/	_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-	/*B0*/	_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-	/*C0*/	_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-	/*D0*/	_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-	/*E0*/	_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-	/*F0*/	_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-		_RUNETYPE_R|_RUNETYPE_SW1, _RUNETYPE_R|_RUNETYPE_SW1,
-#endif
-    },
-    {	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
-     	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,
-	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17,
-     	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f,
-	0x20,	0x21,	0x22,	0x23,	0x24,	0x25,	0x26,	0x27,
-     	0x28,	0x29,	0x2a,	0x2b,	0x2c,	0x2d,	0x2e,	0x2f,
-	0x30,	0x31,	0x32,	0x33,	0x34,	0x35,	0x36,	0x37,
-     	0x38,	0x39,	0x3a,	0x3b,	0x3c,	0x3d,	0x3e,	0x3f,
-	0x40,	'a',	'b',	'c',	'd',	'e',	'f',	'g',
-     	'h',	'i',	'j',	'k',	'l',	'm',	'n',	'o',
-	'p',	'q',	'r',	's',	't',	'u',	'v',	'w',
-     	'x',	'y',	'z',	0x5b,	0x5c,	0x5d,	0x5e,	0x5f,
-	0x60,	'a',	'b',	'c',	'd',	'e',	'f',	'g',
-     	'h',	'i',	'j',	'k',	'l',	'm',	'n',	'o',
-	'p',	'q',	'r',	's',	't',	'u',	'v',	'w',
-     	'x',	'y',	'z',	0x7b,	0x7c,	0x7d,	0x7e,	0x7f,
-	0x80,	0x81,	0x82,	0x83,	0x84,	0x85,	0x86,	0x87,
-     	0x88,	0x89,	0x8a,	0x8b,	0x8c,	0x8d,	0x8e,	0x8f,
-	0x90,	0x91,	0x92,	0x93,	0x94,	0x95,	0x96,	0x97,
-     	0x98,	0x99,	0x9a,	0x9b,	0x9c,	0x9d,	0x9e,	0x9f,
-	0xa0,	0xa1,	0xa2,	0xa3,	0xa4,	0xa5,	0xa6,	0xa7,
-     	0xa8,	0xa9,	0xaa,	0xab,	0xac,	0xad,	0xae,	0xaf,
-	0xb0,	0xb1,	0xb2,	0xb3,	0xb4,	0xb5,	0xb6,	0xb7,
-     	0xb8,	0xb9,	0xba,	0xbb,	0xbc,	0xbd,	0xbe,	0xbf,
-	0xc0,	0xc1,	0xc2,	0xc3,	0xc4,	0xc5,	0xc6,	0xc7,
-     	0xc8,	0xc9,	0xca,	0xcb,	0xcc,	0xcd,	0xce,	0xcf,
-	0xd0,	0xd1,	0xd2,	0xd3,	0xd4,	0xd5,	0xd6,	0xd7,
-     	0xd8,	0xd9,	0xda,	0xdb,	0xdc,	0xdd,	0xde,	0xdf,
-	0xe0,	0xe1,	0xe2,	0xe3,	0xe4,	0xe5,	0xe6,	0xe7,
-     	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef,
-	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7,
-     	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff,
-    },
-    {	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
-     	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,
-	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17,
-     	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f,
-	0x20,	0x21,	0x22,	0x23,	0x24,	0x25,	0x26,	0x27,
-     	0x28,	0x29,	0x2a,	0x2b,	0x2c,	0x2d,	0x2e,	0x2f,
-	0x30,	0x31,	0x32,	0x33,	0x34,	0x35,	0x36,	0x37,
-     	0x38,	0x39,	0x3a,	0x3b,	0x3c,	0x3d,	0x3e,	0x3f,
-	0x40,	'A',	'B',	'C',	'D',	'E',	'F',	'G',
-     	'H',	'I',	'J',	'K',	'L',	'M',	'N',	'O',
-	'P',	'Q',	'R',	'S',	'T',	'U',	'V',	'W',
-     	'X',	'Y',	'Z',	0x5b,	0x5c,	0x5d,	0x5e,	0x5f,
-	0x60,	'A',	'B',	'C',	'D',	'E',	'F',	'G',
-     	'H',	'I',	'J',	'K',	'L',	'M',	'N',	'O',
-	'P',	'Q',	'R',	'S',	'T',	'U',	'V',	'W',
-     	'X',	'Y',	'Z',	0x7b,	0x7c,	0x7d,	0x7e,	0x7f,
-	0x80,	0x81,	0x82,	0x83,	0x84,	0x85,	0x86,	0x87,
-     	0x88,	0x89,	0x8a,	0x8b,	0x8c,	0x8d,	0x8e,	0x8f,
-	0x90,	0x91,	0x92,	0x93,	0x94,	0x95,	0x96,	0x97,
-     	0x98,	0x99,	0x9a,	0x9b,	0x9c,	0x9d,	0x9e,	0x9f,
-	0xa0,	0xa1,	0xa2,	0xa3,	0xa4,	0xa5,	0xa6,	0xa7,
-     	0xa8,	0xa9,	0xaa,	0xab,	0xac,	0xad,	0xae,	0xaf,
-	0xb0,	0xb1,	0xb2,	0xb3,	0xb4,	0xb5,	0xb6,	0xb7,
-     	0xb8,	0xb9,	0xba,	0xbb,	0xbc,	0xbd,	0xbe,	0xbf,
-	0xc0,	0xc1,	0xc2,	0xc3,	0xc4,	0xc5,	0xc6,	0xc7,
-     	0xc8,	0xc9,	0xca,	0xcb,	0xcc,	0xcd,	0xce,	0xcf,
-	0xd0,	0xd1,	0xd2,	0xd3,	0xd4,	0xd5,	0xd6,	0xd7,
-     	0xd8,	0xd9,	0xda,	0xdb,	0xdc,	0xdd,	0xde,	0xdf,
-	0xe0,	0xe1,	0xe2,	0xe3,	0xe4,	0xe5,	0xe6,	0xe7,
-     	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef,
-	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7,
-     	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff,
-    },
-    { 0, NULL },
-    { 0, NULL },
-    { 0, NULL },
-    NULL, 0,
-    "646",
-    &_citrus_ctype_default,
-    {
-	{   "towlower",
-	    __UNCONST(&_DefaultRuneLocale.rl_maplower[0]),
-	    __UNCONST(&_DefaultRuneLocale.rl_maplower_ext)
-	},
-	{   "towupper",
-	    __UNCONST(&_DefaultRuneLocale.rl_mapupper[0]),
-	    __UNCONST(&_DefaultRuneLocale.rl_mapupper_ext)
-	},
-    },
-    {
-	    { "alnum", _RUNETYPE_A|_RUNETYPE_D },
-	    { "alpha", _RUNETYPE_A },
-	    { "blank", _RUNETYPE_B },
-	    { "cntrl", _RUNETYPE_C },
-	    { "digit", _RUNETYPE_D },
-	    { "graph", _RUNETYPE_G },
-	    { "lower", _RUNETYPE_L },
-	    { "print", _RUNETYPE_R },
-	    { "punct", _RUNETYPE_P },
-	    { "space", _RUNETYPE_S },
-	    { "upper", _RUNETYPE_U },
-	    { "xdigit", _RUNETYPE_X },
-    },
-    _C_ctype_tab_,
-    _C_tolower_tab_,
-    _C_toupper_tab_,
-
-#ifdef __BUILD_LEGACY
-    _C_compat_bsdctype,
-#endif
-};
diff --git a/lib/libc/locale/runetype_file.h b/lib/libc/locale/runetype_file.h
deleted file mode 100644
index 67d59dbf8..000000000
--- a/lib/libc/locale/runetype_file.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* $NetBSD: runetype_file.h,v 1.3 2010/06/20 02:23:15 tnozaki Exp $ */
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)runetype.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef	_RUNETYPE_FILE_H_
-#define	_RUNETYPE_FILE_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include "ctype_local.h"
-
-/* for cross host tools on older systems */
-#ifndef UINT32_C
-/* assumes sizeof(unsigned int)>=4 */
-#define UINT32_C(c) ((uint32_t)(c##U))
-#endif
-
-typedef uint32_t	__nbrune_t;
-typedef uint64_t	__runepad_t;
-
-#define _DEFAULT_INVALID_RUNE ((__nbrune_t)-3)
-
-/*
- * The lower 8 bits of runetype[] contain the digit value of the rune.
- */
-typedef uint32_t _RuneType;
-#define	_RUNETYPE_A	UINT32_C(0x00000100)	/* Alpha */
-#define	_RUNETYPE_C	UINT32_C(0x00000200)	/* Control */
-#define	_RUNETYPE_D	UINT32_C(0x00000400)	/* Digit */
-#define	_RUNETYPE_G	UINT32_C(0x00000800)	/* Graph */
-#define	_RUNETYPE_L	UINT32_C(0x00001000)	/* Lower */
-#define	_RUNETYPE_P	UINT32_C(0x00002000)	/* Punct */
-#define	_RUNETYPE_S	UINT32_C(0x00004000)	/* Space */
-#define	_RUNETYPE_U	UINT32_C(0x00008000)	/* Upper */
-#define	_RUNETYPE_X	UINT32_C(0x00010000)	/* X digit */
-#define	_RUNETYPE_B	UINT32_C(0x00020000)	/* Blank */
-#define	_RUNETYPE_R	UINT32_C(0x00040000)	/* Print */
-#define	_RUNETYPE_I	UINT32_C(0x00080000)	/* Ideogram */
-#define	_RUNETYPE_T	UINT32_C(0x00100000)	/* Special */
-#define	_RUNETYPE_Q	UINT32_C(0x00200000)	/* Phonogram */
-#define	_RUNETYPE_SWM	UINT32_C(0xc0000000)/* Mask to get screen width data */
-#define	_RUNETYPE_SWS	30		/* Bits to shift to get width */
-#define	_RUNETYPE_SW0	UINT32_C(0x20000000)	/* 0 width character */
-#define	_RUNETYPE_SW1	UINT32_C(0x40000000)	/* 1 width character */
-#define	_RUNETYPE_SW2	UINT32_C(0x80000000)	/* 2 width character */
-#define	_RUNETYPE_SW3	UINT32_C(0xc0000000)	/* 3 width character */
-
-/*
- * rune file format.  network endian.
- */
-typedef struct {
-	int32_t		fre_min;	/* First rune of the range */
-	int32_t		fre_max;	/* Last rune (inclusive) of the range */
-	int32_t		fre_map;	/* What first maps to in maps */
-	uint32_t	fre_pad1;	/* backward compatibility */
-	__runepad_t	fre_pad2;	/* backward compatibility */
-} __packed _FileRuneEntry;
-
-
-typedef struct {
-	uint32_t	frr_nranges;	/* Number of ranges stored */
-	uint32_t	frr_pad1;	/* backward compatibility */
-	__runepad_t	frr_pad2;	/* backward compatibility */
-} __packed _FileRuneRange;
-
-
-typedef struct {
-	char		frl_magic[8];	/* Magic saying what version we are */
-	char		frl_encoding[32];/* ASCII name of this encoding */
-
-	__runepad_t	frl_pad1;	/* backward compatibility */
-	__runepad_t	frl_pad2;	/* backward compatibility */
-	int32_t		frl_invalid_rune;
-	uint32_t	frl_pad3;	/* backward compatibility */
-
-	_RuneType	frl_runetype[_CTYPE_CACHE_SIZE];
-	int32_t		frl_maplower[_CTYPE_CACHE_SIZE];
-	int32_t		frl_mapupper[_CTYPE_CACHE_SIZE];
-
-	/*
-	 * The following are to deal with Runes larger than _CTYPE_CACHE_SIZE - 1.
-	 * Their data is actually contiguous with this structure so as to make
-	 * it easier to read/write from/to disk.
-	 */
-	_FileRuneRange	frl_runetype_ext;
-	_FileRuneRange	frl_maplower_ext;
-	_FileRuneRange	frl_mapupper_ext;
-
-	__runepad_t	frl_pad4;	/* backward compatibility */
-	int32_t		frl_variable_len;/* how long that data is */
-	uint32_t	frl_pad5;	/* backward compatibility */
-
-	/* variable size data follows */
-} __packed _FileRuneLocale;
-
-
-/* magic number for LC_CTYPE (rune)locale declaration */
-#define	_RUNECT10_MAGIC	"RuneCT10"	/* Indicates version 0 of RuneLocale */
-
-/* codeset tag */
-#define _RUNE_CODESET "CODESET="
-
-#endif	/* !_RUNETYPE_FILE_H_ */
diff --git a/lib/libc/locale/runetype_local.h b/lib/libc/locale/runetype_local.h
deleted file mode 100644
index 675fea941..000000000
--- a/lib/libc/locale/runetype_local.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*	$NetBSD: runetype_local.h,v 1.14 2013/08/18 20:03:48 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)rune.h	8.1 (Berkeley) 6/27/93
- *	@(#)runetype.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef	_RUNETYPE_LOCAL_H_
-#define	_RUNETYPE_LOCAL_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <stdio.h>
-
-#include "ctype_local.h"
-#include "runetype_file.h"
-
-#define _RUNE_ISCACHED(c)	((c)>=0 && (c)<_CTYPE_CACHE_SIZE)
-
-
-/*
- * expanded rune locale declaration.  local to the host.  host endian.
- */
-typedef struct {
-	__nbrune_t	re_min;		/* First rune of the range */
-	__nbrune_t	re_max;		/* Last rune (inclusive) of the range */
-	__nbrune_t	re_map;		/* What first maps to in maps */
-	_RuneType	*re_rune_types;	/* Array of types in range */
-} _RuneEntry;
-
-
-typedef struct {
-	uint32_t	rr_nranges;	/* Number of ranges stored */
-	_RuneEntry	*rr_rune_ranges;
-} _RuneRange;
-
-
-/*
- * wctrans stuffs.
- */
-typedef struct _WCTransEntry {
-	const char	*te_name;
-	__nbrune_t	*te_cached;
-	_RuneRange	*te_extmap;
-} _WCTransEntry;
-#define _WCTRANS_INDEX_LOWER	0
-#define _WCTRANS_INDEX_UPPER	1
-#define _WCTRANS_NINDEXES	2
-
-/*
- * wctype stuffs.
- */
-typedef struct _WCTypeEntry {
-	const char	*te_name;
-	_RuneType	te_mask;
-} _WCTypeEntry;
-#define _WCTYPE_INDEX_ALNUM	0
-#define _WCTYPE_INDEX_ALPHA	1
-#define _WCTYPE_INDEX_BLANK	2
-#define _WCTYPE_INDEX_CNTRL	3
-#define _WCTYPE_INDEX_DIGIT	4
-#define _WCTYPE_INDEX_GRAPH	5
-#define _WCTYPE_INDEX_LOWER	6
-#define _WCTYPE_INDEX_PRINT	7
-#define _WCTYPE_INDEX_PUNCT	8
-#define _WCTYPE_INDEX_SPACE	9
-#define _WCTYPE_INDEX_UPPER	10
-#define _WCTYPE_INDEX_XDIGIT	11
-#define _WCTYPE_NINDEXES	12
-
-/*
- * ctype stuffs
- */
-
-typedef struct _RuneLocale {
-	/*
-	 * copied from _FileRuneLocale
-	 */
-	_RuneType	rl_runetype[_CTYPE_CACHE_SIZE];
-	__nbrune_t	rl_maplower[_CTYPE_CACHE_SIZE];
-	__nbrune_t	rl_mapupper[_CTYPE_CACHE_SIZE];
-	_RuneRange	rl_runetype_ext;
-	_RuneRange	rl_maplower_ext;
-	_RuneRange	rl_mapupper_ext;
-
-	void		*rl_variable;
-	size_t		rl_variable_len;
-
-	/*
-	 * the following portion is generated on the fly
-	 */
-	const char			*rl_codeset;
-	struct _citrus_ctype_rec	*rl_citrus_ctype;
-	_WCTransEntry			rl_wctrans[_WCTRANS_NINDEXES];
-	_WCTypeEntry			rl_wctype[_WCTYPE_NINDEXES];
-
-	const unsigned short		*rl_ctype_tab;
-	const short			*rl_tolower_tab;
-	const short			*rl_toupper_tab;
-
-#ifdef __BUILD_LEGACY
-	const unsigned char		*rl_compat_bsdctype;
-#endif
-} _RuneLocale;
-
-/*
- * global variables
- */
-extern __dso_hidden const _RuneLocale _DefaultRuneLocale;
-
-__BEGIN_DECLS
-int _rune_load(const char * __restrict, size_t, _RuneLocale ** __restrict);
-__END_DECLS
-
-#endif	/* !_RUNETYPE_LOCAL_H_ */
diff --git a/lib/libc/locale/setlocale.3 b/lib/libc/locale/setlocale.3
deleted file mode 100644
index 9d88b9929..000000000
--- a/lib/libc/locale/setlocale.3
+++ /dev/null
@@ -1,407 +0,0 @@
-.\"	$NetBSD: setlocale.3,v 1.21 2004/01/24 16:58:54 wiz Exp $
-.\"
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley at BSDI.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"	@(#)setlocale.3	8.1 (Berkeley) 6/9/93
-.\"
-.Dd May 30, 2003
-.Dt SETLOCALE 3
-.Os
-.Sh NAME
-.Nm setlocale ,
-.Nm localeconv
-.Nd natural language formatting for C
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In locale.h
-.Ft char *
-.Fn setlocale "int category" "const char *locale"
-.Ft struct lconv *
-.Fn localeconv "void"
-.Sh DESCRIPTION
-The
-.Fn setlocale
-function sets the C library's notion
-of natural language formatting style
-for particular sets of routines.
-Each such style is called a
-.Sq locale
-and is invoked using an appropriate name passed as a C string.
-The
-.Fn localeconv
-routine returns the current locale's parameters
-for formatting numbers.
-.Pp
-The
-.Fn setlocale
-function recognizes several categories of routines.
-These are the categories and the sets of routines they select:
-.Bl -tag -width LC_MONETARY
-.It Dv LC_ALL
-Set the entire locale generically.
-.It Dv LC_COLLATE
-Set a locale for string collation routines.
-This controls alphabetic ordering in
-.Fn strcoll
-and
-.Fn strxfrm .
-.It Dv LC_CTYPE
-Set a locale for the
-.Xr ctype 3
-functions.
-This controls recognition of upper and lower case,
-alphabetic or non-alphabetic characters,
-and so on.
-The real work is done by the
-.Fn setrunelocale
-function.
-.It Dv LC_MESSAGES
-Set a locale for message catalogs.
-This controls the selection of message catalogs by the
-.Xr catgets 3
-and
-.Xr gettext 3
-families of functions.
-.It Dv LC_MONETARY
-Set a locale for formatting monetary values;
-this affects the
-.Fn localeconv
-function.
-.It Dv LC_NUMERIC
-Set a locale for formatting numbers.
-This controls the formatting of decimal points
-in input and output of floating point numbers
-in functions such as
-.Fn printf
-and
-.Fn scanf ,
-as well as values returned by
-.Fn localeconv .
-.It Dv LC_TIME
-Set a locale for formatting dates and times using the
-.Fn strftime
-function.
-.El
-.Pp
-Only three locales are defined by default,
-the empty string
-.Li "\&""\|""
-which denotes the native environment, and the
-.Li "\&""C""
-and
-.Li "\&""POSIX""
-locales, which denote the C language environment.
-A
-.Fa locale
-argument of
-.Dv NULL
-causes
-.Fn setlocale
-to return the current locale.
-By default, C programs start in the
-.Li "\&""C""
-locale.
-The format of the locale string is described in
-.Xr nls 7 .
-.Pp
-The only function in the library that sets the locale is
-.Fn setlocale ;
-the locale is never changed as a side effect of some other routine.
-.Pp
-Changing the setting of
-.Dv LC_MESSAGES
-has no effect on catalogs that have already been opened by
-.Xr catopen 3 .
-.Pp
-The
-.Fn localeconv
-function returns a pointer to a structure
-which provides parameters for formatting numbers,
-especially currency values:
-.Bd -literal -offset indent
-struct lconv {
-	char	*decimal_point;
-	char	*thousands_sep;
-	char	*grouping;
-	char	*int_curr_symbol;
-	char	*currency_symbol;
-	char	*mon_decimal_point;
-	char	*mon_thousands_sep;
-	char	*mon_grouping;
-	char	*positive_sign;
-	char	*negative_sign;
-	char	int_frac_digits;
-	char	frac_digits;
-	char	p_cs_precedes;
-	char	p_sep_by_space;
-	char	n_cs_precedes;
-	char	n_sep_by_space;
-	char	p_sign_posn;
-	char	n_sign_posn;
-	char	int_p_cs_precedes;
-	char	int_n_cs_precedes;
-	char	int_p_sep_by_space;
-	char	int_n_sep_by_space;
-	char	int_p_sign_posn;
-	char	int_n_sign_posn;
-};
-.Ed
-.Pp
-The individual fields have the following meanings:
-.Bl -tag -width int_p_sep_by_space
-.It Fa decimal_point
-The decimal point character, except for monetary values.
-.It Fa thousands_sep
-The separator between groups of digits
-before the decimal point, except for monetary values.
-.It Fa grouping
-The sizes of the groups of digits, except for monetary values.
-This is a pointer to a vector of integers, each of size
-.Va char ,
-representing group size from low order digit groups
-to high order (right to left).
-The list may be terminated with 0 or
-.Dv CHAR_MAX .
-If the list is terminated with 0,
-the last group size before the 0 is repeated to account for all the digits.
-If the list is terminated with
-.Dv CHAR_MAX ,
-no more grouping is performed.
-.It Fa int_curr_symbol
-The standardized (ISO 4217:1995) international currency symbol.
-.It Fa currency_symbol
-The local currency symbol.
-.It Fa mon_decimal_point
-The decimal point character for monetary values.
-.It Fa mon_thousands_sep
-The separator for digit groups in monetary values.
-.It Fa mon_grouping
-Like
-.Fa grouping
-but for monetary values.
-.It Fa positive_sign
-The character used to denote nonnegative monetary values,
-usually the empty string.
-.It Fa negative_sign
-The character used to denote negative monetary values,
-usually a minus sign.
-.It Fa int_frac_digits
-The number of digits after the decimal point
-in an internationally formatted monetary value.
-.It Fa frac_digits
-The number of digits after the decimal point
-in an locally formatted monetary value.
-.It Fa p_cs_precedes
-1 if the currency symbol precedes the monetary value
-for nonnegative values, 0 if it follows.
-.It Fa p_sep_by_space
-1 if a space is inserted between the currency symbol
-and the monetary value for nonnegative values, 0 otherwise.
-.It Fa n_cs_precedes
-Like
-.Fa p_cs_precedes
-but for negative values.
-.It Fa n_sep_by_space
-Like
-.Fa p_sep_by_space
-but for negative values.
-.It Fa p_sign_posn
-The location of the
-.Fa positive_sign
-with respect to a nonnegative quantity and the
-.Fa currency_symbol .
-.It Fa n_sign_posn
-Like
-.Fa p_sign_posn
-but for negative currency values.
-.It Fa int_p_cs_precedes
-1 if the currency symbol precedes the internationally
-formatted monetary value for nonnegative values, 0 if it follows.
-.It Fa int_n_cs_precedes
-Like
-.Fa int_p_cs_precedes
-but for negative values.
-.It Fa int_p_sep_by_space
-1 if a space is inserted between the currency symbol
-and the internationally formatted monetary value for
-nonnegative values, 0 otherwise.
-.It Fa int_n_sep_by_space
-Like
-.Fa int_p_sep_by_space
-but for negative values.
-.It Fa int_p_sign_posn
-The location of the
-.Fa positive_sign
-with respect to a nonnegative quantity and the
-.Fa currency_symbol ,
-for internationally formatted nonnegative monetary values.
-.It Fa int_n_sign_posn
-Like
-.Fa int_p_sign_posn
-but for negative values.
-.El
-.Pp
-The positional parameters in
-.Fa p_sign_posn ,
-.Fa n_sign_posn ,
-.Fa int_p_sign_posn
-and
-.Fa int_n_sign_posn
-are encoded as follows:
-.Bl -tag -width 3n -compact
-.It Li 0
-Parentheses around the entire string.
-.It Li 1
-Before the string.
-.It Li 2
-After the string.
-.It Li 3
-Just before
-.Fa currency_symbol .
-.It Li 4
-Just after
-.Fa currency_symbol .
-.El
-.Pp
-Unless mentioned above,
-an empty string as a value for a field
-indicates a zero length result or
-a value that is not in the current locale.
-A
-.Dv CHAR_MAX
-result similarly denotes an unavailable value.
-.Sh RETURN VALUES
-The
-.Fn setlocale
-function returns
-.Dv NULL
-and fails to change the locale
-if the given combination of
-.Fa category
-and
-.Fa locale
-makes no sense.
-The
-.Fn localeconv
-function returns a pointer to a static object
-which may be altered by later calls to
-.Fn setlocale
-or
-.Fn localeconv .
-.Sh EXAMPLES
-The following code illustrates how a program can initialize the
-international environment for one language, while selectively
-modifying the program's locale such that regular expressions and
-string operations can be applied to text recorded in a different
-language:
-.Bd -literal
-	setlocale(LC_ALL, "de");
-	setlocale(LC_COLLATE, "fr");
-.Ed
-.Pp
-When a process is started, its current locale is set to the C or POSIX
-locale.
-An internationalized program that depends on locale data not defined in
-the C or POSIX locale must invoke the setlocale subroutine in the
-following manner before using any of the locale-specific information:
-.Bd -literal
-	setlocale(LC_ALL, "");
-.Ed
-.\" .Sh FILES							XXX
-.\" .Bl -tag -width /usr/share/locale/locale/category -compact	XXX
-.\" .It Pa $PATH_LOCALE/\fIlocale\fP/\fIcategory\fP		XXX
-.\" .It Pa /usr/share/locale/\fIlocale\fP/\fIcategory\fP	XXX
-.\" locale file for the locale \fIlocale\fP			XXX
-.\" and the category \fIcategory\fP.				XXX
-.\" .El
-.Sh SEE ALSO
-.Xr catopen 3 ,
-.Xr gettext 3 ,
-.Xr nl_langinfo 3 ,
-.Xr nls 7
-.\" .Xr strcoll 3 ,						XXX
-.\" .Xr strxfrm 3						XXX
-.Sh STANDARDS
-The
-.Fn setlocale
-and
-.Fn localeconv
-functions conform to
-.St -ansiC
-and
-.St -isoC-90 .
-.Pp
-The
-.Fa int_p_cs_precedes ,
-.Fa int_n_cs_precedes ,
-.Fa int_p_sep_by_space ,
-.Fa int_n_sep_by_space ,
-.Fa int_p_sign_posn
-and
-.Fa int_n_sign_posn
-members of
-.Ft struct lconv
-were introduced in
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn setlocale
-and
-.Fn localeconv
-functions first appeared in
-.Bx 4.4 .
-.Sh BUGS
-The current implementation supports only the
-.Li "\&""C""
-and
-.Li "\&""POSIX""
-locales for all but the
-.Dv LC_CTYPE
-locale.
-.Pp
-In spite of the gnarly currency support in
-.Fn localeconv ,
-the standards don't include any functions
-for generalized currency formatting.
-.Pp
-.Dv LC_COLLATE
-does not make sense for many languages.
-Use of
-.Dv LC_MONETARY
-could lead to misleading results until we have a real time currency
-conversion function.
-.Dv LC_NUMERIC
-and
-.Dv LC_TIME
-are personal choices and should not be wrapped up with the other categories.
-.Pp
-Multibyte locales aren't supported for static binaries.
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
deleted file mode 100644
index c5d436574..000000000
--- a/lib/libc/locale/setlocale.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* $NetBSD: setlocale.c,v 1.64 2013/09/13 13:13:32 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: setlocale.c,v 1.64 2013/09/13 13:13:32 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/localedef.h>
-#include <locale.h>
-#include <limits.h>
-#include <paths.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "setlocale_local.h"
-
-const char *_PathLocale = NULL;
-
-static _locale_set_t all_categories[_LC_LAST] = {
-	[LC_ALL     ] = &_generic_LC_ALL_setlocale,
-	[LC_COLLATE ] = &_dummy_LC_COLLATE_setlocale,
-	[LC_CTYPE   ] = &_citrus_LC_CTYPE_setlocale,
-	[LC_MONETARY] = &_citrus_LC_MONETARY_setlocale,
-	[LC_NUMERIC ] = &_citrus_LC_NUMERIC_setlocale,
-	[LC_TIME    ] = &_citrus_LC_TIME_setlocale,
-	[LC_MESSAGES] = &_citrus_LC_MESSAGES_setlocale,
-};
-
-/* XXX Consider locking the list. Race condition leaks memory. */
-static SLIST_HEAD(, _locale_cache_t) caches = {
-    __UNCONST(&_C_cache)
-};
-
-int
-_setlocale_cache(locale_t loc, struct _locale_cache_t *cache)
-{
-	const char *monetary_name = loc->part_name[LC_MONETARY];
-	const char *numeric_name = loc->part_name[LC_NUMERIC];
-	_NumericLocale *numeric = loc->part_impl[LC_NUMERIC];
-	_MonetaryLocale *monetary = loc->part_impl[LC_MONETARY];
-	struct lconv *ldata;
-
-	struct _locale_cache_t *old_cache;
-
-	SLIST_FOREACH(old_cache, &caches, cache_link) {
-		if (monetary_name != old_cache->monetary_name &&
-		    strcmp(monetary_name, old_cache->monetary_name) != 0)
-			continue;
-		if (numeric_name != old_cache->numeric_name &&
-		    strcmp(numeric_name, old_cache->numeric_name) != 0)
-			continue;
-		loc->cache = old_cache;
-		free(cache);
-		return 0;
-	}
-
-	if (cache == NULL) {
-		cache = malloc(sizeof(*cache));
-		if (cache == NULL)
-			return -1;
-	}
-
-	cache->monetary_name = monetary_name;
-	cache->numeric_name = numeric_name;
-	ldata = &cache->ldata;
-
-	ldata->decimal_point = __UNCONST(numeric->decimal_point);
-	ldata->thousands_sep = __UNCONST(numeric->thousands_sep);
-	ldata->grouping      = __UNCONST(numeric->grouping);
-
-	ldata->int_curr_symbol   = __UNCONST(monetary->int_curr_symbol);
-	ldata->currency_symbol   = __UNCONST(monetary->currency_symbol);
-	ldata->mon_decimal_point = __UNCONST(monetary->mon_decimal_point);
-	ldata->mon_thousands_sep = __UNCONST(monetary->mon_thousands_sep);
-	ldata->mon_grouping      = __UNCONST(monetary->mon_grouping);
-	ldata->positive_sign     = __UNCONST(monetary->positive_sign);
-	ldata->negative_sign     = __UNCONST(monetary->negative_sign);
-
-	ldata->int_frac_digits    = monetary->int_frac_digits;
-	ldata->frac_digits        = monetary->frac_digits;
-	ldata->p_cs_precedes      = monetary->p_cs_precedes;
-	ldata->p_sep_by_space     = monetary->p_sep_by_space;
-	ldata->n_cs_precedes      = monetary->n_cs_precedes;
-	ldata->n_sep_by_space     = monetary->n_sep_by_space;
-	ldata->p_sign_posn        = monetary->p_sign_posn;
-	ldata->n_sign_posn        = monetary->n_sign_posn;
-	ldata->int_p_cs_precedes  = monetary->int_p_cs_precedes;
-	ldata->int_n_cs_precedes  = monetary->int_n_cs_precedes;
-	ldata->int_p_sep_by_space = monetary-> int_p_sep_by_space;
-	ldata->int_n_sep_by_space = monetary->int_n_sep_by_space;
-	ldata->int_p_sign_posn    = monetary->int_p_sign_posn;
-	ldata->int_n_sign_posn    = monetary->int_n_sign_posn;
-	SLIST_INSERT_HEAD(&caches, cache, cache_link);
-
-	loc->cache = cache;
-	return 0;
-}
-
-_locale_set_t
-_find_category(int category)
-{
-	static int initialised;
-
-	if (!initialised) {
-		if (issetugid() || ((_PathLocale == NULL &&
-		    (_PathLocale = getenv("PATH_LOCALE")) == NULL) ||
-		    *_PathLocale == '\0'))
-			_PathLocale = _PATH_LOCALE;
-		initialised = 1;
-	}
-
-	if (category >= LC_ALL && category < _LC_LAST)
-		return all_categories[category];
-	return NULL;
-}
-
-const char *
-_get_locale_env(const char *category)
-{
-	const char *name;
-
-	/* 1. check LC_ALL */
-	name = (const char *)getenv("LC_ALL");
-	if (name == NULL || *name == '\0') {
-		/* 2. check LC_* */
-		name = (const char *)getenv(category);
-		if (name == NULL || *name == '\0') {
-			/* 3. check LANG */
-			name = getenv("LANG");
-		}
-	}
-	if (name == NULL || *name == '\0' || strchr(name, '/'))
-		/* 4. if none is set, fall to "C" */
-		name = _C_LOCALE;
-	return name;
-}
-
-char *
-__setlocale(int category, const char *name)
-{
-	_locale_set_t sl;
-	locale_t loc;
-	struct _locale_cache_t *cache;
-	const char *result;
-
-	sl = _find_category(category);
-	if (sl == NULL)
-		return NULL;
-	cache = malloc(sizeof(*cache));
-	if (cache == NULL)
-		return NULL;
-	loc = _current_locale();
-	result = (*sl)(name, loc);
-	_setlocale_cache(loc, cache);
-	return __UNCONST(result);
-}
-
-char *
-setlocale(int category, const char *locale)
-{
-
-	/* locale may be NULL */
-
-	__mb_len_max_runtime = MB_LEN_MAX;
-	return __setlocale(category, locale);
-}
diff --git a/lib/libc/locale/setlocale_local.h b/lib/libc/locale/setlocale_local.h
deleted file mode 100644
index 0d03c06a4..000000000
--- a/lib/libc/locale/setlocale_local.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $NetBSD: setlocale_local.h,v 1.15 2013/09/13 13:13:32 joerg Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _SETLOCALE_LOCAL_H_
-#define _SETLOCALE_LOCAL_H_
-
-#include <sys/queue.h>
-#include <locale.h>
-
-#include "ctype_local.h"
-
-#define _LOCALENAME_LEN_MAX 33
-
-#define _C_LOCALE		"C"
-#define _POSIX_LOCALE		"POSIX"
-
-extern const char		*_PathLocale;
-#define _LOCALE_ALIAS_NAME	"locale.alias"
-
-typedef void *_locale_part_t;
-
-struct _locale_cache_t {
-	SLIST_ENTRY(_locale_cache_t) cache_link;
-	const char *monetary_name;
-	const char *numeric_name;
-	struct lconv ldata;
-};
-
-struct _locale {
-	const struct _locale_cache_t *cache;
-	char query[_LOCALENAME_LEN_MAX * (_LC_LAST - 1)];
-	const char *part_name[_LC_LAST];
-	_locale_part_t part_impl[_LC_LAST];
-};
-
-typedef const char *(*_locale_set_t)(const char * __restrict,
-    struct _locale * __restrict);
-
-__BEGIN_DECLS
-_locale_set_t		_find_category(int);
-const char		*_get_locale_env(const char *);
-char			*__setlocale(int, const char *);
-
-const char *_generic_LC_ALL_setlocale(
-    const char * __restrict, struct _locale * __restrict);
-const char *_dummy_LC_COLLATE_setlocale(
-    const char * __restrict, struct _locale * __restrict);
-const char *_citrus_LC_CTYPE_setlocale(
-    const char * __restrict, struct _locale * __restrict);
-const char *_citrus_LC_MONETARY_setlocale(
-    const char * __restrict, struct _locale * __restrict);
-const char *_citrus_LC_NUMERIC_setlocale(
-    const char * __restrict, struct _locale * __restrict);
-const char *_citrus_LC_TIME_setlocale(
-    const char * __restrict, struct _locale * __restrict);
-const char *_citrus_LC_MESSAGES_setlocale(
-    const char * __restrict, struct _locale * __restrict);
-
-int _setlocale_cache(locale_t, struct _locale_cache_t *);
-__END_DECLS
-
-#ifdef _LIBC
-extern __dso_protected struct _locale	_lc_global_locale;
-extern __dso_hidden const struct _locale_cache_t _C_cache;
-
-static __inline struct _locale *
-_current_locale(void)
-{
-	return &_lc_global_locale;
-}
-#endif
-
-extern size_t __mb_len_max_runtime;
-
-#endif /*_SETLOCALE_LOCAL_H_*/
diff --git a/lib/libc/locale/towctrans.3 b/lib/libc/locale/towctrans.3
deleted file mode 100644
index 7772755ad..000000000
--- a/lib/libc/locale/towctrans.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" $NetBSD: towctrans.3,v 1.6 2005/06/27 14:18:36 wiz Exp $
-.\"
-.\" Copyright (c)2003 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd March 4, 2003
-.Dt TOWCTRANS 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm towctrans
-.Nd convert a wide character with a specified map
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In wctype.h
-.Ft wint_t
-.Fn towctrans "wint_t wc" "wctrans_t charmap"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-The
-.Fn towctrans
-function converts a wide character
-.Fa wc
-with a character mapping
-.Fa charmap .
-.Pp
-The behaviour of
-.Fn towctrans
-is undefined if the
-.Fn towctrans
-function is called with an invalid
-.Fa charmap
-(changes of
-.Dv LC_CTYPE
-category invalidate
-.Fa charmap )
-or invalid wide character
-.Fa wc .
-.Pp
-The behaviour of
-.Fn towctrans
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-.Fn towctrans
-returns the resulting character of the conversion.
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-No errors are defined.
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr iswctype 3 ,
-.Xr setlocale 3 ,
-.Xr wctrans 3 ,
-.Xr wctype 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn towctrans
-function conforms to
-.St -isoC-amd1 .
diff --git a/lib/libc/locale/towlower.3 b/lib/libc/locale/towlower.3
deleted file mode 100644
index f6a675b10..000000000
--- a/lib/libc/locale/towlower.3
+++ /dev/null
@@ -1,69 +0,0 @@
-.\"	$NetBSD: towlower.3,v 1.7 2003/09/08 17:54:31 wiz Exp $
-.\"
-.\" Copyright (c) 1989, 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"	@(#)tolower.3	5.2 (Berkeley) 6/29/91
-.\"
-.Dd December 22, 2000
-.Dt TOWLOWER 3
-.Os
-.Sh NAME
-.Nm towlower
-.Nd wide character case letter conversion utilities
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wctype.h
-.Ft wint_t
-.Fn towlower "wint_t wc"
-.Ft wint_t
-.Fn towupper "wint_t wc"
-.Sh DESCRIPTION
-The
-.Fn towlower
-function converts an upper-case wide character to the corresponding lower-case
-letter.
-The
-.Fn towupper
-function converts an lower-case wide character to the corresponding upper-case
-letter.
-.Sh RETURN VALUES
-If the argument is an upper/lower-case letter, the
-.Fn tolower
-function returns the corresponding counterpart if there is
-one; otherwise the argument is returned unchanged.
-.Sh SEE ALSO
-.Xr tolower 3 ,
-.Xr toupper 3
-.Sh STANDARDS
-The functions conform to
-.St -isoC-99 .
diff --git a/lib/libc/locale/wcrtomb.3 b/lib/libc/locale/wcrtomb.3
deleted file mode 100644
index fb03f05f8..000000000
--- a/lib/libc/locale/wcrtomb.3
+++ /dev/null
@@ -1,145 +0,0 @@
-.\" $NetBSD: wcrtomb.3,v 1.9 2007/02/20 08:33:25 wiz Exp $
-.\"
-.\" Copyright (c)2002 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd February 4, 2002
-.Dt WCRTOMB 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm wcrtomb
-.Nd converts a wide character to a multibyte character (restartable)
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fn wcrtomb "char * restrict s" "wchar_t wc" "mbstate_t * restrict ps"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-.Fn wcrtomb
-converts the wide character given by
-.Fa wc
-to the corresponding multibyte character, and stores it in the array
-pointed to by
-.Fa s
-unless
-.Fa s
-is a null pointer.
-This function will modify the first at most
-.Dv MB_CUR_MAX
-bytes of the array pointed to by
-.Fa s .
-.Pp
-The behaviour of
-.Fn wcrtomb
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.Pp
-These are the special cases:
-.Bl -tag -width 012345678901
-.It "wc == 0"
-For state-dependent encodings,
-.Fn wcrtomb
-stores a nul byte preceded by special byte sequence (if any)
-to return to an initial state in the array pointed to by
-.Fa s ,
-and the state object pointed to by
-.Fa ps
-also returns to an initial state.
-.It "s == NULL"
-.Fn wcrtomb
-just places
-.Fa ps
-into an initial state.
-It is equivalent to the following call:
-.Bd -literal -offset indent
-wcrtomb(buf, L'\\0', ps);
-.Ed
-.Pp
-Here,
-.Fa buf
-is a dummy buffer.
-In this case,
-.Fa wc
-is ignored.
-.It "ps == NULL"
-.Fn mbrtowc
-uses its own internal state object to keep the conversion state,
-instead of
-.Fa ps
-mentioned in this manual page.
-.Pp
-Calling any other functions in
-.Lb libc
-never changes the internal
-state of
-.Fn mbrtowc ,
-which is initialized at startup time of the program.
-.El
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-.Fn wcrtomb
-returns:
-.Bl -tag -width 012345678901
-.It "positive"
-The number of bytes (including any shift sequences)
-which are stored in the array.
-.It "(size_t)-1"
-.Fa wc
-is not a valid wide character.
-In this case,
-.Fn wcrtomb
-also sets
-.Va errno
-to indicate the error.
-.El
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-.Fn wcrtomb
-may cause an error in the following case:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-.Fa wc
-is not a valid wide character.
-.It Bq Er EINVAL
-.Fa ps
-points to an invalid or uninitialized mbstate_t object.
-.El
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr setlocale 3 ,
-.Xr wctomb 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn wcrtomb
-function conforms to
-.St -isoC-amd1 .
-The restrict qualifier is added at
-.St -isoC-99 .
diff --git a/lib/libc/locale/wcscoll.3 b/lib/libc/locale/wcscoll.3
deleted file mode 100644
index 1e238158e..000000000
--- a/lib/libc/locale/wcscoll.3
+++ /dev/null
@@ -1,112 +0,0 @@
-.\" $NetBSD: wcscoll.3,v 1.3 2010/12/16 17:42:27 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)strcoll.3	8.1 (Berkeley) 6/4/93
-.\" FreeBSD: src/lib/libc/string/strcoll.3,v 1.11 2001/10/01 16:09:00 ru Exp
-.\" FreeBSD: /repoman/r/ncvs/src/lib/libc/string/wcscoll.3,v 1.2 2002/12/09 14:04:05 ru Exp
-.\"
-.Dd October 13, 2006
-.Dt WCSCOLL 3
-.Os
-.Sh NAME
-.Nm wcscoll
-.Nd compare wide strings according to current collation
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft int
-.Fn wcscoll "const wchar_t *s1" "const wchar_t *s2"
-.Sh DESCRIPTION
-The
-.Fn wcscoll
-function compares the nul-terminated strings
-.Fa s1
-and
-.Fa s2
-according to the current locale collation order.
-In the
-.Dq Li C
-locale,
-.Fn wcscoll
-is equivalent to
-.Fn wcscmp .
-.Sh RETURN VALUES
-The
-.Fn wcscoll
-function returns an integer greater than, equal to, or less than
-0, if
-.Fa s1
-is greater than, equal to, or less than
-.Fa s2 .
-.Pp
-No return value is reserved to indicate errors;
-callers should set
-.Va errno
-to 0 before calling
-.Fn wcscoll .
-If it is non-zero upon return from
-.Fn wcscoll ,
-an error has occurred.
-.Sh ERRORS
-The
-.Fn wcscoll
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-An invalid wide-character code was specified.
-.It Bq Er ENOMEM
-Cannot allocate enough memory for temporary buffers.
-.El
-.Sh SEE ALSO
-.Xr setlocale 3 ,
-.Xr strcoll 3 ,
-.Xr wcscmp 3 ,
-.Xr wcsxfrm 3
-.Sh STANDARDS
-The
-.Fn wcscoll
-function conforms to
-.St -isoC-99 .
-.Sh BUGS
-The current implementation of
-.Fn wcscoll
-function disregards
-.Dv LC_COLLATE
-locales, and falls back to using the
-.Fn wcscmp
-function.
diff --git a/lib/libc/locale/wcscoll.c b/lib/libc/locale/wcscoll.c
deleted file mode 100644
index 00ac32328..000000000
--- a/lib/libc/locale/wcscoll.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: wcscoll.c,v 1.4 2013/05/17 12:55:57 joerg Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcscoll.c,v 1.4 2013/05/17 12:55:57 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <wchar.h>
-#include <locale.h>
-#include "setlocale_local.h"
-
-/*
- * Compare strings with using collating information.
- */
-int
-wcscoll_l(const wchar_t *s1, const wchar_t *s2, locale_t loc)
-{
-	/* XXX: LC_COLLATE should be implemented. */
-	/* LINTED */ (void)loc;
-	return (wcscmp(s1, s2));
-}
-
-int
-wcscoll(const wchar_t *s1, const wchar_t *s2)
-{
-	return wcscoll_l(s1, s2, _current_locale());
-}
diff --git a/lib/libc/locale/wcsftime.3 b/lib/libc/locale/wcsftime.3
deleted file mode 100644
index 4cd59849f..000000000
--- a/lib/libc/locale/wcsftime.3
+++ /dev/null
@@ -1,70 +0,0 @@
-.\" $NetBSD: wcsftime.3,v 1.3 2011/04/14 05:50:49 jruoho Exp $
-.\"
-.\" Copyright (c) 2002 Tim J. Robbins
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: /repoman/r/ncvs/src/lib/libc/locale/wcsftime.3,v 1.2 2002/11/29 17:35:09 ru Exp $
-.\"
-.Dd April 14, 2011
-.Dt WCSFTIME 3
-.Os
-.Sh NAME
-.Nm wcsftime
-.Nd "convert date and time to a wide-character string"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fo wcsftime
-.Fa "wchar_t * restrict wcs" "size_t maxsize"
-.Fa "const wchar_t * restrict format" "const struct tm * restrict timeptr"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn wcsftime
-function is equivalent to the
-.Fn strftime
-function except for the types of its arguments
-and the return value indicating the number of wide characters.
-Refer to
-.Xr strftime 3
-for a detailed description.
-.Sh COMPATIBILITY
-Some early implementations of
-.Fn wcsftime
-had a
-.Fa format
-argument with type
-.Vt "const char *"
-instead of
-.Vt "const wchar_t *" .
-.Sh SEE ALSO
-.Xr strftime 3 ,
-.Xr tm 3
-.Sh STANDARDS
-The
-.Fn wcsftime
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libc/locale/wcsftime.c b/lib/libc/locale/wcsftime.c
deleted file mode 100644
index 72ef92ca6..000000000
--- a/lib/libc/locale/wcsftime.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*	 $NetBSD: wcsftime.c,v 1.5 2013/08/19 20:41:15 joerg Exp $	*/
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: wcsftime.c,v 1.5 2013/08/19 20:41:15 joerg Exp $");
-
-#define __SETLOCALE_SOURCE__
-#include "namespace.h"
-#include <errno.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdlib.h>
-#include <time.h>
-#include <wchar.h>
-
-#include "setlocale_local.h"
-
-__weak_alias(wcsftime_l, _wcsftime_l)
-
-/*
- * Convert date and time to a wide-character string.
- *
- * This is the wide-character counterpart of strftime(). So that we do not
- * have to duplicate the code of strftime(), we convert the format string to
- * multibyte, call strftime(), then convert the result back into wide
- * characters.
- *
- * This technique loses in the presence of stateful multibyte encoding if any
- * of the conversions in the format string change conversion state. When
- * stateful encoding is implemented, we will need to reset the state between
- * format specifications in the format string.
- */
-size_t
-wcsftime(wchar_t *wcs, size_t maxsize,
-    const wchar_t *format, const struct tm *timeptr)
-{
-	return wcsftime_l(wcs, maxsize, format, timeptr, _current_locale());
-}
-
-size_t
-wcsftime_l(wchar_t *wcs, size_t maxsize,
-    const wchar_t *format, const struct tm *timeptr, locale_t loc)
-{
-	char *dst, *dstp, *sformat;
-	size_t n, sflen;
-	int sverrno;
-
-	sformat = dst = NULL;
-
-	/*
-	 * Convert the supplied format string to a multibyte representation
-	 * for strftime(), which only handles single-byte characters.
-	 */
-	sflen = wcstombs_l(NULL, format, 0, loc);
-	if (sflen == (size_t)-1)
-		goto error;
-	if ((sformat = malloc(sflen + 1)) == NULL)
-		goto error;
-	wcstombs_l(sformat, format, sflen + 1, loc);
-
-	/*
-	 * Allocate memory for longest multibyte sequence that will fit
-	 * into the caller's buffer and call strftime() to fill it.
-	 * Then, copy and convert the result back into wide characters in
-	 * the caller's buffer.
-	 */
-	if (SIZE_T_MAX / MB_CUR_MAX_L(loc) <= maxsize) {
-		/* maxsize is preposterously large - avoid int. overflow. */
-		errno = EINVAL;
-		goto error;
-	}
-	dst = malloc(maxsize * MB_CUR_MAX_L(loc));
-	if (dst == NULL)
-		goto error;
-	if (strftime_l(dst, maxsize, sformat, timeptr, loc) == 0)
-		goto error;
-	dstp = dst;
-	n = mbstowcs_l(wcs, dstp, maxsize, loc);
-	if (n == (size_t)-2 || n == (size_t)-1)
-		goto error;
-
-	free(sformat);
-	free(dst);
-	return n;
-
-error:
-	sverrno = errno;
-	free(sformat);
-	free(dst);
-	errno = sverrno;
-	return 0;
-}
diff --git a/lib/libc/locale/wcsrtombs.3 b/lib/libc/locale/wcsrtombs.3
deleted file mode 100644
index 1f30eb9ad..000000000
--- a/lib/libc/locale/wcsrtombs.3
+++ /dev/null
@@ -1,176 +0,0 @@
-.\" $NetBSD: wcsrtombs.3,v 1.13 2010/12/16 17:42:27 wiz Exp $
-.\"
-.\" Copyright (c)2002 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd August 8, 2006
-.Dt WCSRTOMBS 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm wcsrtombs
-.Nd converts a wide-character string to a multibyte character string \
-(restartable)
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fn wcsrtombs "char * restrict s" "const wchar_t ** restrict pwcs" \
-"size_t n" "mbstate_t * restrict ps"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-The
-.Fn wcsrtombs
-converts the nul-terminated wide-character string indirectly pointed
-to by
-.Fa pwcs
-to the corresponding multibyte character string,
-and stores it in the array pointed to by
-.Fa s .
-The conversion stops due to the following reasons:
-.Bl -bullet
-.It
-The conversion reaches a nul wide character.
-In this case, the nul wide character is also converted.
-.It
-The
-.Fn wcsrtombs
-has already stored
-.Fa n
-bytes in the array pointed to by
-.Fa s .
-.It
-The conversion encounters an invalid character.
-.El
-.Pp
-Each character will be converted as if
-.Xr wcrtomb 3
-is continuously called, except the internal state of
-.Xr wcrtomb 3
-will not be affected.
-.Pp
-After conversion,
-if
-.Fa s
-is not a null pointer, the pointer object pointed to by
-.Fa pwcs
-is a null pointer (if the conversion is stopped due to reaching a
-nul wide character) or the first byte of the character just after
-the last character converted.
-.Pp
-If
-.Fa s
-is not a null pointer and the conversion is stopped due to reaching
-a nul wide character,
-.Fn wcsrtombs
-places the state object pointed to by
-.Fa ps
-to an initial state after the conversion is taken place.
-.Pp
-The behaviour of
-.Fn wcsrtombs
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.Pp
-These are the special cases:
-.Bl -tag -width 012345678901
-.It "s == NULL"
-.Fn wcsrtombs
-returns the number of bytes to store the whole multibyte character string
-corresponding to the wide-character string pointed to by
-.Fa pwcs ,
-not including the terminating nul byte.
-In this case,
-.Fa n
-is ignored.
-.It "pwcs == NULL || *pwcs == NULL"
-Undefined (may cause the program to crash).
-.It "ps == NULL"
-.Fn wcsrtombs
-uses its own internal state object to keep the conversion state,
-instead of
-.Fa ps
-mentioned in this manual page.
-.Pp
-Calling any other functions in
-.Lb libc
-never changes the internal
-state of
-.Fn wcsrtombs ,
-which is initialized at startup time of the program.
-.El
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-.Fn wcsrtombs
-returns:
-.Bl -tag -width 012345678901
-.It 0 or positive
-Number of bytes stored in the array pointed to by
-.Fa s ,
-except for a nul byte.
-There are no cases that the value returned is greater than
-.Fa n
-(unless
-.Fa s
-is a null pointer).
-If the return value is equal to
-.Fa n ,
-the string pointed to by
-.Fa s
-will not be nul-terminated.
-.It (size_t)-1
-.Fa pwcs
-points to a string containing an invalid wide character.
-The
-.Fn wcsrtombs
-also sets
-.Va errno
-to indicate the error.
-.El
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-.Fn wcsrtombs
-may cause an error in the following case:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-.Fa pwcs
-points to a string containing an invalid wide character.
-.El
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr setlocale 3 ,
-.Xr wcrtomb 3 ,
-.Xr wcstombs 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn wcsrtombs
-function conforms to
-.St -ansiC .
-The restrict qualifier is added at
-.St -isoC-99 .
diff --git a/lib/libc/locale/wcstod.3 b/lib/libc/locale/wcstod.3
deleted file mode 100644
index 965527faf..000000000
--- a/lib/libc/locale/wcstod.3
+++ /dev/null
@@ -1,78 +0,0 @@
-.\" $NetBSD: wcstod.3,v 1.5 2007/05/21 15:29:51 tnozaki Exp $
-.\"
-.\" Copyright (c) 2002, 2003 Tim J. Robbins
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: wcstod.3,v 1.4 2003/05/22 13:02:27 ru Exp $
-.\"
-.Dd February 22, 2003
-.Dt WCSTOD 3
-.Os
-.Sh NAME
-.Nm wcstof ,
-.Nm wcstod ,
-.Nm wcstold
-.Nd convert string to
-.Vt float , double ,
-or
-.Vt "long double"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft float
-.Fn wcstof "const wchar_t * restrict nptr" "wchar_t ** restrict endptr"
-.Ft "long double"
-.Fn wcstold "const wchar_t * restrict nptr" "wchar_t ** restrict endptr"
-.Ft double
-.Fn wcstod "const wchar_t * restrict nptr" "wchar_t ** restrict endptr"
-.Sh DESCRIPTION
-The
-.Fn wcstof ,
-.Fn wcstod ,
-and
-.Fn wcstold
-functions are the wide-character versions of the
-.Fn strtof ,
-.Fn strtod ,
-and
-.Fn strtold
-functions.
-Refer to
-.Xr strtod 3
-for details.
-.Sh SEE ALSO
-.Xr strtod 3 ,
-.Xr wcstol 3
-.Sh STANDARDS
-The
-.Fn wcstod
-function conforms to
-.St -isoC-amd1 .
-The
-.Fn wcstof
-and
-.Fn wcstold
-functions conform to
-.St -isoC-99 .
diff --git a/lib/libc/locale/wcstod.c b/lib/libc/locale/wcstod.c
deleted file mode 100644
index 94cfd001c..000000000
--- a/lib/libc/locale/wcstod.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $NetBSD: wcstod.c,v 1.15 2013/04/18 22:23:17 joerg Exp $ */
-
-/*-
- * Copyright (c)2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcstod.c,v 1.15 2013/04/18 22:23:17 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
-
-__weak_alias(wcstod,_wcstod)
-
-#define _FUNCNAME	wcstod
-#define _RETURN_TYPE	double
-#define _STRTOD_FUNC	strtod_l
-
-#include "_wcstod.h"
diff --git a/lib/libc/locale/wcstof.c b/lib/libc/locale/wcstof.c
deleted file mode 100644
index 9052cd3d3..000000000
--- a/lib/libc/locale/wcstof.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $NetBSD: wcstof.c,v 1.4 2013/04/18 22:23:18 joerg Exp $ */
-
-/*-
- * Copyright (c)2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcstof.c,v 1.4 2013/04/18 22:23:18 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
-
-__weak_alias(wcstof,_wcstof)
-
-#define _FUNCNAME	wcstof
-#define _RETURN_TYPE	float
-#define _STRTOD_FUNC	strtof_l
-
-#include "_wcstod.h"
diff --git a/lib/libc/locale/wcstoimax.c b/lib/libc/locale/wcstoimax.c
deleted file mode 100644
index 7b5ea95aa..000000000
--- a/lib/libc/locale/wcstoimax.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $NetBSD: wcstoimax.c,v 1.3 2007/03/10 00:12:23 hubertf Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcstoimax.c,v 1.3 2007/03/10 00:12:23 hubertf Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "__wctoint.h"
-
-#define	_FUNCNAME	wcstoimax
-#define	__INT		intmax_t
-#define	__INT_MIN	INTMAX_MIN
-#define	__INT_MAX	INTMAX_MAX
-
-#include "_wcstol.h"
diff --git a/lib/libc/locale/wcstol.3 b/lib/libc/locale/wcstol.3
deleted file mode 100644
index 549928592..000000000
--- a/lib/libc/locale/wcstol.3
+++ /dev/null
@@ -1,96 +0,0 @@
-.\" $NetBSD: wcstol.3,v 1.3 2010/12/16 17:42:27 wiz Exp $
-.\"
-.\" Copyright (c) 2002 Tim J. Robbins
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: src/lib/libc/locale/wcstol.3,v 1.4 2002/11/29 17:35:09 ru Exp $
-.\"
-.Dd September 7, 2002
-.Dt WCSTOL 3
-.Os
-.Sh NAME
-.Nm wcstol , wcstoul ,
-.Nm wcstoll , wcstoull ,
-.Nm wcstoimax , wcstoumax
-.Nd "convert a wide-character string value to a"
-.Vt long ,
-.Vt "unsigned long" ,
-.Vt "long long" ,
-.Vt "unsigned long long" ,
-.Vt intmax_t
-or
-.Vt uintmax_t
-integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft long
-.Fn wcstol "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base"
-.Ft "unsigned long"
-.Fn wcstoul "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base"
-.Ft "long long"
-.Fn wcstoll "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base"
-.Ft "unsigned long long"
-.Fn wcstoull "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base"
-.In inttypes.h
-.Ft intmax_t
-.Fn wcstoimax "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base"
-.Ft uintmax_t
-.Fn wcstoumax "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base"
-.Sh DESCRIPTION
-The
-.Fn wcstol ,
-.Fn wcstoul ,
-.Fn wcstoll ,
-.Fn wcstoull ,
-.Fn wcstoimax
-and
-.Fn wcstoumax
-functions are wide-character versions of the
-.Fn strtol ,
-.Fn strtoul ,
-.Fn strtoll ,
-.Fn strtoull ,
-.Fn strtoimax
-and
-.Fn strtoumax
-functions, respectively.
-Refer to their manual pages (for example
-.Xr strtol 3 )
-for details.
-.Sh SEE ALSO
-.Xr strtol 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The
-.Fn wcstol ,
-.Fn wcstoul ,
-.Fn wcstoll ,
-.Fn wcstoull ,
-.Fn wcstoimax
-and
-.Fn wcstoumax
-functions conform to
-.St -isoC-99 .
diff --git a/lib/libc/locale/wcstol.c b/lib/libc/locale/wcstol.c
deleted file mode 100644
index 0bb35b7c0..000000000
--- a/lib/libc/locale/wcstol.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $NetBSD: wcstol.c,v 1.4 2007/03/10 00:12:23 hubertf Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcstol.c,v 1.4 2007/03/10 00:12:23 hubertf Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "__wctoint.h"
-
-#define	_FUNCNAME	wcstol
-#define	__INT		long
-#define	__INT_MIN	LONG_MIN
-#define	__INT_MAX	LONG_MAX
-
-#include "_wcstol.h"
diff --git a/lib/libc/locale/wcstold.c b/lib/libc/locale/wcstold.c
deleted file mode 100644
index 35e4c9231..000000000
--- a/lib/libc/locale/wcstold.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $NetBSD: wcstold.c,v 1.4 2013/04/18 22:23:18 joerg Exp $ */
-
-/*-
- * Copyright (c)2006 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcstold.c,v 1.4 2013/04/18 22:23:18 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
-
-__weak_alias(wcstold,_wcstold)
-
-#define _FUNCNAME	wcstold
-#define _RETURN_TYPE	long double
-#define _STRTOD_FUNC	strtold_l
-
-#include "_wcstod.h"
diff --git a/lib/libc/locale/wcstoll.c b/lib/libc/locale/wcstoll.c
deleted file mode 100644
index 332d87622..000000000
--- a/lib/libc/locale/wcstoll.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $NetBSD: wcstoll.c,v 1.3 2007/03/10 00:12:23 hubertf Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcstoll.c,v 1.3 2007/03/10 00:12:23 hubertf Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "__wctoint.h"
-
-#define	_FUNCNAME	wcstoll
-#define	__INT		/* LONGLONG */ long long int
-#define	__INT_MIN	LLONG_MIN
-#define	__INT_MAX	LLONG_MAX
-
-#include "_wcstol.h"
diff --git a/lib/libc/locale/wcstombs.3 b/lib/libc/locale/wcstombs.3
deleted file mode 100644
index 0a93b8354..000000000
--- a/lib/libc/locale/wcstombs.3
+++ /dev/null
@@ -1,133 +0,0 @@
-.\" $NetBSD: wcstombs.3,v 1.13 2011/03/16 09:32:12 mbalmer Exp $
-.\"
-.\" Copyright (c)2002 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd March 16, 2011
-.Dt WCSTOMBS 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm wcstombs
-.Nd converts a wide-character string to a multibyte character string
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft size_t
-.Fn wcstombs "char * restrict s" "const wchar_t * restrict pwcs" "size_t n"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-.Fn wcstombs
-converts the nul-terminated wide-character string pointed to by
-.Fa pwcs
-to the corresponding multibyte character string,
-and stores it in the array pointed to by
-.Fa s .
-This function may modify the first at most
-.Fa n
-bytes of the array pointed to by
-.Fa s .
-Each character will be converted as if
-.Xr wctomb 3
-is continuously called, except the internal state of
-.Xr wctomb 3
-will not be affected.
-.Pp
-For state-dependent encoding, the
-.Fn wcstombs
-implies the result multibyte character string pointed to by
-.Fa s
-always to begin with an initial state.
-.Pp
-The behaviour of
-.Fn wcstombs
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.Pp
-These are the special cases:
-.Bl -tag -width 012345678901
-.It s == NULL
-The
-.Fn wcstombs
-returns the number of bytes to store the whole multibyte character string
-corresponding to the wide-character string pointed to by
-.Fa pwcs .
-In this case,
-.Fa n
-is ignored.
-.It pwcs == NULL
-Undefined (may cause the program to crash).
-.El
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-.Fn wcstombs
-returns:
-.Bl -tag -width 012345678901
-.It 0 or positive
-Number of bytes stored in the array pointed to by
-.Fa s .
-There are no cases that the value returned is greater than
-.Fa n
-(unless
-.Fa s
-is a null pointer).
-If the return value is equal to
-.Fa n ,
-the string pointed to by
-.Fa s
-will not be nul-terminated.
-.It (size_t)-1
-.Fa pwcs
-points to a string containing an invalid wide character.
-.Fn wcstombs
-also sets
-.Va errno
-to indicate the error.
-.El
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-.Fn wcstombs
-may cause an error in the following case:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-.Fa pwcs
-points to a string containing an invalid wide character.
-.El
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr mbstowcs 3 ,
-.Xr setlocale 3 ,
-.Xr wctomb 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn wcstombs
-function conforms to
-.St -ansiC .
-The restrict qualifier is added at
-.St -isoC-99 .
diff --git a/lib/libc/locale/wcstoul.c b/lib/libc/locale/wcstoul.c
deleted file mode 100644
index a29d610b7..000000000
--- a/lib/libc/locale/wcstoul.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: wcstoul.c,v 1.4 2007/03/10 00:12:23 hubertf Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcstoul.c,v 1.4 2007/03/10 00:12:23 hubertf Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "__wctoint.h"
-
-#define	_FUNCNAME	wcstoul
-#define	__UINT		unsigned long
-#define	__UINT_MAX	ULONG_MAX
-
-#include "_wcstoul.h"
diff --git a/lib/libc/locale/wcstoull.c b/lib/libc/locale/wcstoull.c
deleted file mode 100644
index 6ef74023f..000000000
--- a/lib/libc/locale/wcstoull.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: wcstoull.c,v 1.3 2007/03/10 00:12:23 hubertf Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcstoull.c,v 1.3 2007/03/10 00:12:23 hubertf Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "__wctoint.h"
-
-#define	_FUNCNAME	wcstoull
-#define	__UINT		/* LONGLONG */ unsigned long long int
-#define	__UINT_MAX	ULLONG_MAX
-
-#include "_wcstoul.h"
diff --git a/lib/libc/locale/wcstoumax.c b/lib/libc/locale/wcstoumax.c
deleted file mode 100644
index fc11ec515..000000000
--- a/lib/libc/locale/wcstoumax.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: wcstoumax.c,v 1.3 2007/03/10 00:12:23 hubertf Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcstoumax.c,v 1.3 2007/03/10 00:12:23 hubertf Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "__wctoint.h"
-
-#define	_FUNCNAME	wcstoumax
-#define	__UINT		uintmax_t
-#define	__UINT_MAX	UINTMAX_MAX
-
-#include "_wcstoul.h"
diff --git a/lib/libc/locale/wcsxfrm.3 b/lib/libc/locale/wcsxfrm.3
deleted file mode 100644
index 96d07cc6a..000000000
--- a/lib/libc/locale/wcsxfrm.3
+++ /dev/null
@@ -1,107 +0,0 @@
-.\" $NetBSD: wcsxfrm.3,v 1.4 2010/12/16 17:42:27 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)strxfrm.3	8.1 (Berkeley) 6/4/93
-.\" FreeBSD: src/lib/libc/string/strxfrm.3,v 1.16 2002/09/06 11:24:06 tjr Exp
-.\" FreeBSD: /repoman/r/ncvs/src/lib/libc/string/wcsxfrm.3,v 1.2 2002/12/09 14:04:05 ru Exp
-.\"
-.Dd October 13, 2006
-.Dt WCSXFRM 3
-.Os
-.Sh NAME
-.Nm wcsxfrm
-.Nd transform a wide string under locale
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fn wcsxfrm "wchar_t * restrict dst" "const wchar_t * restrict src" "size_t n"
-.Sh DESCRIPTION
-The
-.Fn wcsxfrm
-function transforms a nul-terminated wide-character string pointed to by
-.Fa src
-according to the current locale collation order then copies the
-transformed string into
-.Fa dst .
-No more than
-.Fa n
-wide characters are copied into
-.Fa dst ,
-including the terminating nul character added.
-If
-.Fa n
-is set to 0
-(it helps to determine an actual size needed for transformation),
-.Fa dst
-is permitted to be a null pointer.
-.Pp
-Comparing two strings using
-.Fn wcscmp
-after
-.Fn wcsxfrm
-is equivalent to comparing two original strings with
-.Fn wcscoll .
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn wcsxfrm
-returns the length of the transformed string not including
-the terminating nul character.
-If this value is
-.Fa n
-or more, the contents of
-.Fa dst
-are indeterminate.
-.Sh SEE ALSO
-.Xr setlocale 3 ,
-.Xr strxfrm 3 ,
-.Xr wcscmp 3 ,
-.Xr wcscoll 3
-.Sh STANDARDS
-The
-.Fn wcsxfrm
-function conforms to
-.St -isoC-99 .
-.Sh BUGS
-The current implementation of
-.Fn wcsxfrm
-function disregards
-.Dv LC_COLLATE
-locales, and falls back to using the
-.Fn wcsncpy
-function.
diff --git a/lib/libc/locale/wcsxfrm.c b/lib/libc/locale/wcsxfrm.c
deleted file mode 100644
index 2fc706c27..000000000
--- a/lib/libc/locale/wcsxfrm.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: wcsxfrm.c,v 1.5 2013/05/17 12:55:57 joerg Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcsxfrm.c,v 1.5 2013/05/17 12:55:57 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <wchar.h>
-#include <locale.h>
-#include "setlocale_local.h"
-
-/*
- * Compare strings with using collating information.
- */
-size_t
-wcsxfrm_l(wchar_t *s1, const wchar_t *s2, size_t n, locale_t loc)
-{
-	size_t len;
-
-	/* XXX: LC_COLLATE should be implemented. */
-	/* LINTED */(void)loc;
-
-	len = wcslen(s2);
-	if (len<n)
-		wcscpy(s1, s2);
-	else {
-		/*
-		 * SUSv3 says:
-		 *   If the value returned is n or more, the contents
-		 *   of the array pointed to by ws1 are unspecified.
-		 */
-		/* thus, do nothing */
-	}
-
-	return (len);
-}
-
-size_t
-wcsxfrm(wchar_t *s1, const wchar_t *s2, size_t n)
-{
-	return wcsxfrm_l(s1, s2, n, _current_locale());
-}
diff --git a/lib/libc/locale/wctob.3 b/lib/libc/locale/wctob.3
deleted file mode 100644
index f12de66ca..000000000
--- a/lib/libc/locale/wctob.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" $NetBSD: wctob.3,v 1.4 2004/01/24 16:58:54 wiz Exp $
-.\"
-.\" Copyright (c)2003 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd March 3, 2003
-.Dt WCTOB 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm wctob
-.Nd convert a wide character to a single byte character
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In wchar.h
-.Ft int
-.Fn wctob "wint_t wc"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-The
-.Fn wctob
-function converts a wide character
-.Fa wc
-to a corresponding single byte character in the initial shift state of
-the current locale.
-.Pp
-The behaviour of
-.Fn wctob
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-The
-.Fn wctob
-function returns:
-.Bl -tag -width 012345678901
-.It Dv EOF
-If
-.Fa wc
-is
-.Dv WEOF
-or if
-.Fa wc
-does not correspond to a valid single byte character representation.
-.It (otherwise)
-A single byte character corresponding to
-.Fa wc .
-.El
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-No errors are defined.
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr btowc 3 ,
-.Xr setlocale 3 ,
-.Xr wcrtomb 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn wctob
-function conforms to
-.St -isoC-amd1 .
diff --git a/lib/libc/locale/wctomb.3 b/lib/libc/locale/wctomb.3
deleted file mode 100644
index 9ce3fbb7c..000000000
--- a/lib/libc/locale/wctomb.3
+++ /dev/null
@@ -1,131 +0,0 @@
-.\" $NetBSD: wctomb.3,v 1.5 2006/10/14 07:51:01 wiz Exp $
-.\"
-.\" Copyright (c)2002 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd February 3, 2002
-.Dt WCTOMB 3
-.Os
-.Sh NAME
-.Nm wctomb
-.Nd converts a wide character to a multibyte character
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn wctomb "char * s" "const wchar_t wchar"
-.Sh DESCRIPTION
-The
-.Fn wctomb
-converts the wide character
-.Fa wchar
-to the corresponding multibyte character, and stores it in the array
-pointed to by
-.Fa s .
-.Fn wctomb
-may store at most
-.Dv MB_CUR_MAX
-bytes in the array.
-.Pp
-In state-dependent encoding,
-.Fn wctomb
-may store the special sequence to change the conversion state
-before an actual multibyte character into the array pointed to by
-.Fa s .
-If
-.Fa wchar
-is a nul wide character
-.Pq Sq \e0 ,
-this function sets its own internal state to an initial conversion state.
-.Pp
-Calling any other functions in
-.Lb libc
-never changes the internal state of
-.Fn wctomb ,
-except changing the
-.Dv LC_CTYPE
-category of the current locale by calling
-.Xr setlocale 3 .
-Such
-.Xr setlocale 3
-calls cause the internal state of this function to be indeterminate.
-.Pp
-The behaviour of
-.Fn wctomb
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.Pp
-There is one special case:
-.Bl -tag -width 012345678901
-.It s == NULL
-.Fn wctomb
-initializes its own internal state to an initial state, and
-determines whether the current encoding is state-dependent.
-This function returns 0 if the encoding is state-independent,
-otherwise non-zero.
-In this case,
-.Fa wchar
-is completely ignored.
-.El
-.Sh RETURN VALUES
-Normally,
-.Fn wctomb
-returns:
-.Bl -tag -width 012345678901
-.It positive
-Number of bytes for the valid multibyte character pointed to by
-.Fa s .
-There are no cases that the value returned is greater than
-.Fa n
-or the value of the
-.Dv MB_CUR_MAX
-macro.
-.It -1
-.Fa wchar
-is an invalid wide character.
-.El
-.Pp
-If
-.Fa s
-is equal to
-.Dv NULL ,
-.Fn mbtowc
-returns:
-.Bl -tag -width 0123456789
-.It 0
-The current encoding is state-independent.
-.It non-zero
-The current encoding is state-dependent.
-.El
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr setlocale 3
-.Sh STANDARDS
-The
-.Fn wctomb
-function conforms to
-.St -ansiC .
diff --git a/lib/libc/locale/wctrans.3 b/lib/libc/locale/wctrans.3
deleted file mode 100644
index 9d412aaa6..000000000
--- a/lib/libc/locale/wctrans.3
+++ /dev/null
@@ -1,89 +0,0 @@
-.\" $NetBSD: wctrans.3,v 1.4 2004/01/24 16:58:54 wiz Exp $
-.\"
-.\" Copyright (c)2003 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd March 4, 2003
-.Dt WCTRANS 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm wctrans
-.Nd get character mapping identifier by name
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In wctype.h
-.Ft wctrans_t
-.Fn wctrans "const char *charmap"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-The
-.Fn wctrans
-function returns a character mapping identifier corresponding to the
-locale-specific character mapping name
-.Fa charmap .
-This identifier can be used on the subsequent calls of
-.Fn towctrans .
-The following names are defined in all locales:
-.Bd -literal -offset indent
-tolower toupper
-.Ed
-.Pp
-The behaviour of
-.Fn wctrans
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-.Fn wctrans
-returns:
-.Bl -tag -width 012345678901
-.It 0
-If the string
-.Fa charmap
-does not corresponding to a valid character mapping name.
-.It non-zero
-A character mapping identifier corresponding to
-.Fa charmap .
-.El
-.Pp
-Note: wctype_t is a scalar type, e.g., a pointer.
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-No errors are defined.
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr iswctype 3 ,
-.Xr setlocale 3 ,
-.Xr wctype 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn towctrans
-function conforms to
-.St -isoC-amd1 .
diff --git a/lib/libc/locale/wctype.3 b/lib/libc/locale/wctype.3
deleted file mode 100644
index fd92f8f5f..000000000
--- a/lib/libc/locale/wctype.3
+++ /dev/null
@@ -1,91 +0,0 @@
-.\" $NetBSD: wctype.3,v 1.6 2007/05/21 15:20:40 tnozaki Exp $
-.\"
-.\" Copyright (c)2003 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd March 4, 2003
-.Dt WCTYPE 3
-.Os
-.\" ----------------------------------------------------------------------
-.Sh NAME
-.Nm wctype
-.Nd get character class identifier by name
-.\" ----------------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ----------------------------------------------------------------------
-.Sh SYNOPSIS
-.In wctype.h
-.Ft wctype_t
-.Fn wctype "const char *charclass"
-.\" ----------------------------------------------------------------------
-.Sh DESCRIPTION
-The
-.Fn wctype
-function returns a character class identifier corresponding to the
-locale-specific character class name
-.Fa charclass .
-This identifier can be used in subsequent calls of
-.Fn iswctype .
-The following names are defined in all locales:
-.Bd -literal -offset indent
-alnum alpha blank cntrl digit graph
-lower print punct space upper xdigit
-.Ed
-.Pp
-The behaviour of
-.Fn wctype
-is affected by the
-.Dv LC_CTYPE
-category of the current locale.
-.\" ----------------------------------------------------------------------
-.Sh RETURN VALUES
-.Fn wctype
-returns:
-.Bl -tag -width 012345678901
-.It 0
-If
-.Fa charclass
-does not correspond to a valid character class name.
-.It non-zero
-A character class identifier corresponding to
-.Fa charclass .
-.El
-.Pp
-Note: wctype_t is a scalar type, e.g., a pointer.
-.\" ----------------------------------------------------------------------
-.Sh ERRORS
-No errors are defined.
-.\" ----------------------------------------------------------------------
-.Sh SEE ALSO
-.Xr iswctype 3 ,
-.Xr setlocale 3 ,
-.Xr towctrans 3 ,
-.Xr wctrans 3
-.\" ----------------------------------------------------------------------
-.Sh STANDARDS
-The
-.Fn wctype
-function conforms to
-.St -isoC-amd1 .
diff --git a/lib/libc/locale/wcwidth.3 b/lib/libc/locale/wcwidth.3
deleted file mode 100644
index 9c7fab49d..000000000
--- a/lib/libc/locale/wcwidth.3
+++ /dev/null
@@ -1,89 +0,0 @@
-.\" $NetBSD: wcwidth.3,v 1.3 2006/10/14 07:51:01 wiz Exp $
-.\" FreeBSD: src/lib/libc/locale/wcwidth.3,v 1.6 2004/08/17 04:56:03 trhodes Exp
-.\"
-.\" Copyright (c) 2002 Tim J. Robbins
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"
-.Dd August 17, 2004
-.Dt WCWIDTH 3
-.Os
-.Sh NAME
-.Nm wcwidth
-.Nd "number of column positions of a wide-character code"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft int
-.Fn wcwidth "wchar_t wc"
-.Sh DESCRIPTION
-The
-.Fn wcwidth
-function determines the number of column positions required to
-display the wide character
-.Fa wc .
-.Sh RETURN VALUES
-The
-.Fn wcwidth
-function returns 0 if the
-.Fa wc
-argument is a nul wide character (L'\e0'),
-\-1 if
-.Fa wc
-is not printable,
-otherwise it returns the number of column positions the
-character occupies.
-.Sh EXAMPLES
-This code fragment reads text from standard input and
-breaks lines that are more than 20 column positions wide,
-similar to the
-.Xr fold 1
-utility:
-.Bd -literal -offset indent
-wint_t ch;
-int column, w;
-
-column = 0;
-while ((ch = getwchar()) != WEOF) {
-	w = wcwidth(ch);
-	if (w \*[Gt] 0 \*[Am]\*[Am] column + w \*[Gt]= 20) {
-		putwchar(L'\en');
-		column = 0;
-	}
-	putwchar(ch);
-	if (ch == L'\en')
-		column = 0;
-	else if (w \*[Gt] 0)
-		column += w;
-}
-.Ed
-.Sh SEE ALSO
-.Xr iswprint 3 ,
-.Xr wcswidth 3
-.Sh STANDARDS
-The
-.Fn wcwidth
-function conforms to
-.St -p1003.1-2001 .
diff --git a/lib/libc/md/Makefile.inc b/lib/libc/md/Makefile.inc
deleted file mode 100644
index 56637532c..000000000
--- a/lib/libc/md/Makefile.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.7 2005/09/24 20:51:14 elad Exp $
-
-.include <bsd.own.mk>
-
-# MD4/MD5 sources
-.PATH: ${ARCHDIR}/md ${.CURDIR}/md
-
-SRCS+=	md4c.c md5c.c md4hl.c md5hl.c
-
-MAN+=	md4.3 md5.3
-
-MLINKS+=md4.3 MD4Init.3 md4.3 MD4Update.3 md4.3 MD4Final.3
-MLINKS+=md4.3 MD4End.3  md4.3 MD4File.3   md4.3 MD4Data.3
-MLINKS+=md5.3 MD5Init.3 md5.3 MD5Update.3 md5.3 MD5Final.3
-MLINKS+=md5.3 MD5End.3  md5.3 MD5File.3   md5.3 MD5Data.3
-
-CLEANFILES+=	md[45]hl.c md[45].3
-
-.if ${MKMAN} != "no"
-md4.3: mdX.3
-	sed -e 's/mdX/md4/g' -e 's/MDX/MD4/g' $> > $@
-	cat ${>:H}/md4.copyright >> $@
-
-md5.3: mdX.3
-	sed -e 's/mdX/md5/g' -e 's/MDX/MD5/g' $> > $@
-	cat ${>:H}/md5.copyright >> $@
-.endif
diff --git a/lib/libc/md/md2hl.c b/lib/libc/md/md2hl.c
deleted file mode 100644
index 8d26581ab..000000000
--- a/lib/libc/md/md2hl.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*	$NetBSD: md2hl.c,v 1.5 2005/06/12 05:34:34 lukem Exp $	*/
-
-/*
- * Written by Jason R. Thorpe <thorpej@NetBSD.org>, April 29, 1997.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: md2hl.c,v 1.5 2005/06/12 05:34:34 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define	MDALGORITHM	MD2
-
-#include "namespace.h"
-#include <md2.h>
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#if !HAVE_MD2_H
-#include "mdXhl.c"
-#endif
diff --git a/lib/libc/md/md4.copyright b/lib/libc/md/md4.copyright
deleted file mode 100644
index 5a395f0c2..000000000
--- a/lib/libc/md/md4.copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-.\"	$NetBSD: md4.copyright,v 1.1 1997/01/30 01:01:40 thorpej Exp $
-.\" from FreeBSD Id: md4.copyright,v 1.2 1996/10/09 21:00:43 wollman Exp
-Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-.Pp
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD4 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD4 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-.Pp
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-.Pp
-These notices must be retained in any copies of any part of this
-documentation and/or software.
diff --git a/lib/libc/md/md4hl.c b/lib/libc/md/md4hl.c
deleted file mode 100644
index 4517bf10a..000000000
--- a/lib/libc/md/md4hl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	$NetBSD: md4hl.c,v 1.7 2005/09/26 03:01:41 christos Exp $	*/
-
-/*
- * Written by Jason R. Thorpe <thorpej@NetBSD.org>, April 29, 1997.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: md4hl.c,v 1.7 2005/09/26 03:01:41 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define	MDALGORITHM	MD4
-#define MDINCLUDE	<md4.h>
-
-#include "mdXhl.c"
diff --git a/lib/libc/md/md5.copyright b/lib/libc/md/md5.copyright
deleted file mode 100644
index b7e1beed9..000000000
--- a/lib/libc/md/md5.copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-.\"	$NetBSD: md5.copyright,v 1.1 1997/01/30 01:01:41 thorpej Exp $
-.\" from FreeBSD Id: md5.copyright,v 1.2 1996/10/09 21:00:46 wollman Exp
-Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-.Pp
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-.Pp
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-.Pp
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-.Pp
-These notices must be retained in any copies of any part of this
-documentation and/or software.
diff --git a/lib/libc/md/md5hl.c b/lib/libc/md/md5hl.c
deleted file mode 100644
index 7604efa05..000000000
--- a/lib/libc/md/md5hl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	$NetBSD: md5hl.c,v 1.7 2005/09/26 03:01:41 christos Exp $	*/
-
-/*
- * Written by Jason R. Thorpe <thorpej@NetBSD.org>, April 29, 1997.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: md5hl.c,v 1.7 2005/09/26 03:01:41 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define	MDALGORITHM	MD5
-#define MDINCLUDE	<md5.h>
-
-#include "mdXhl.c"
diff --git a/lib/libc/md/mdX.3 b/lib/libc/md/mdX.3
deleted file mode 100644
index 39934b515..000000000
--- a/lib/libc/md/mdX.3
+++ /dev/null
@@ -1,143 +0,0 @@
-.\"	$NetBSD: mdX.3,v 1.10 2003/06/13 01:28:41 lukem Exp $
-.\"
-.\" ----------------------------------------------------------------------------
-.\" "THE BEER-WARE LICENSE" (Revision 42):
-.\" <phk@login.dkuug.dk> wrote this file.  As long as you retain this notice you
-.\" can do whatever you want with this stuff. If we meet some day, and you think
-.\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
-.\" ----------------------------------------------------------------------------
-.\"
-.\"	from FreeBSD Id: mdX.3,v 1.7 1996/10/22 16:28:56 phk Exp
-.\"
-.Dd June 13, 2003
-.Dt MDX 3
-.Os
-.Sh NAME
-.Nm MDXInit ,
-.Nm MDXUpdate ,
-.Nm MDXFinal ,
-.Nm MDXEnd ,
-.Nm MDXFile ,
-.Nm MDXData
-.Nd calculate the RSA Data Security, Inc.,
-.Dq MDX
-message digest
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In mdX.h
-.Ft void
-.Fn MDXInit "MDX_CTX *context"
-.Ft void
-.Fn MDXUpdate "MDX_CTX *context" "const unsigned char *data" "unsigned int len"
-.Ft void
-.Fn MDXFinal "unsigned char digest[16]" "MDX_CTX *context"
-.Ft "char *"
-.Fn MDXEnd "MDX_CTX *context" "char *buf"
-.Ft "char *"
-.Fn MDXFile "const char *filename" "char *buf"
-.Ft "char *"
-.Fn MDXData "const unsigned char *data" "unsigned int len" "char *buf"
-.Sh DESCRIPTION
-The MDX functions calculate a 128-bit cryptographic checksum (digest)
-for any number of input bytes.
-A cryptographic checksum is a one-way
-hash-function, that is, you cannot find (except by exhaustive search)
-the input corresponding to a particular output.
-This net result is
-a ``fingerprint'' of the input-data, which doesn't disclose the actual
-input.
-.Pp
-MD2 is the slowest, MD4 is the fastest and MD5 is somewhere in the middle.
-MD2 can only be used for Privacy-Enhanced Mail.
-MD4 has been criticized for being too weak, so MD5 was developed in
-response as ``MD4 with safety-belts''.
-When in doubt, use MD5.
-.Pp
-The
-.Fn MDXInit ,
-.Fn MDXUpdate ,
-and
-.Fn MDXFinal
-functions are the core functions.
-Allocate an MDX_CTX, initialize it with
-.Fn MDXInit ,
-run over the data with
-.Fn MDXUpdate ,
-and finally extract the result using
-.Fn MDXFinal .
-.Pp
-.Fn MDXEnd
-is a wrapper for
-.Fn MDXFinal
-which converts the return value to a 33-character
-(including the terminating '\e0')
-.Tn ASCII
-string which represents the 128 bits in hexadecimal.
-.Pp
-.Fn MDXFile
-calculates the digest of a file, and uses
-.Fn MDXEnd
-to return the result.
-If the file cannot be opened, a null pointer is returned.
-.Fn MDXData
-calculates the digest of a chunk of data in memory, and uses
-.Fn MDXEnd
-to return the result.
-.Pp
-When using
-.Fn MDXEnd ,
-.Fn MDXFile ,
-or
-.Fn MDXData ,
-the
-.Ar buf
-argument can be a null pointer, in which case the returned string
-is allocated with
-.Xr malloc 3
-and subsequently must be explicitly deallocated using
-.Xr free 3
-after use.
-If the
-.Ar buf
-argument is non-null it must point to at least 33 characters of buffer space.
-.Sh SEE ALSO
-.Xr md2 3 ,
-.Xr md4 3 ,
-.Xr md5 3
-.Rs
-.%A B. Kaliski
-.%T The MD2 Message-Digest Algorithm
-.%O RFC 1319
-.Re
-.Rs
-.%A R. Rivest
-.%T The MD4 Message-Digest Algorithm
-.%O RFC 1186
-.Re
-.Rs
-.%A R. Rivest
-.%T The MD5 Message-Digest Algorithm
-.%O RFC 1321
-.Re
-.Rs
-.%A RSA Laboratories
-.%T Frequently Asked Questions About today's Cryptography
-.Re
-.Sh HISTORY
-These functions appeared in
-.Nx 1.3 .
-.Sh AUTHORS
-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 Poul-Henning Kamp
-.Aq Li phk@login.dkuug.dk
-.Pp
-Phk ristede runen.
-.Sh BUGS
-No method is known to exist which finds two files having the same hash value,
-nor to find a file with a specific hash value.
-There is on the other hand no guarantee that such a method doesn't exist.
-.Sh COPYRIGHT
diff --git a/lib/libc/md/mdXhl.c b/lib/libc/md/mdXhl.c
deleted file mode 100644
index 0e3225e42..000000000
--- a/lib/libc/md/mdXhl.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*	$NetBSD: mdXhl.c,v 1.13 2014/09/24 13:18:52 christos Exp $	*/
-
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@login.dkuug.dk> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * from FreeBSD Id: mdXhl.c,v 1.8 1996/10/25 06:48:12 bde Exp
- */
-
-/*
- * Modified April 29, 1997 by Jason R. Thorpe <thorpej@NetBSD.org>
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#define	CONCAT(x,y)	__CONCAT(x,y)
-#define	MDNAME(x)	CONCAT(MDALGORITHM,x)
-
-#if !defined(_KERNEL) && defined(__weak_alias) && !defined(HAVE_NBTOOL_CONFIG_H)
-#define	WA(a,b)	__weak_alias(a,b)
-WA(MDNAME(End),CONCAT(_,MDNAME(End)))
-WA(MDNAME(File),CONCAT(_,MDNAME(File)))
-WA(MDNAME(Data),CONCAT(_,MDNAME(Data)))
-#undef WA
-#endif
-
-#include "namespace.h"
-
-#include <sys/types.h>
-
-#include MDINCLUDE
-#include <assert.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-char *
-MDNAME(End)(MDNAME(_CTX) *ctx, char *buf)
-{
-	int i;
-	unsigned char digest[16];
-	static const char hex[]="0123456789abcdef";
-
-	_DIAGASSERT(ctx != 0);
-
-	if (buf == NULL)
-		buf = malloc(33);
-	if (buf == NULL)
-		return (NULL);
-
-	MDNAME(Final)(digest, ctx);
-
-	for (i = 0; i < 16; i++) {
-		buf[i+i] = hex[(u_int32_t)digest[i] >> 4];
-		buf[i+i+1] = hex[digest[i] & 0x0f];
-	}
-
-	buf[i+i] = '\0';
-	return (buf);
-}
-
-char *
-MDNAME(File)(const char *filename, char *buf)
-{
-	unsigned char buffer[BUFSIZ];
-	MDNAME(_CTX) ctx;
-	int f, j;
-	ssize_t i;
-
-	_DIAGASSERT(filename != 0);
-	/* buf may be NULL */
-
-	MDNAME(Init)(&ctx);
-	f = open(filename, O_RDONLY | O_CLOEXEC, 0666);
-	if (f < 0)
-		return NULL;
-
-	while ((i = read(f, buffer, sizeof(buffer))) > 0)
-		MDNAME(Update)(&ctx, buffer, (unsigned int)i);
-
-	j = errno;
-	close(f);
-	errno = j;
-
-	if (i < 0)
-		return NULL;
-
-	return (MDNAME(End)(&ctx, buf));
-}
-
-char *
-MDNAME(Data)(const unsigned char *data, unsigned int len, char *buf)
-{
-	MDNAME(_CTX) ctx;
-
-	_DIAGASSERT(data != 0);
-
-	MDNAME(Init)(&ctx);
-	MDNAME(Update)(&ctx, data, len);
-	return (MDNAME(End)(&ctx, buf));
-}
diff --git a/lib/libc/misc/Makefile.inc b/lib/libc/misc/Makefile.inc
deleted file mode 100644
index 08a246c2c..000000000
--- a/lib/libc/misc/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2013/01/29 19:14:02 matt Exp $
-#	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
-
-.PATH: ${ARCHDIR}/misc ${.CURDIR}/misc
-
-# constructor
-SRCS+=	initfini.c
-
-# for -fstack-protector
-SRCS+=	stack_protector.c
diff --git a/lib/libc/misc/initfini.c b/lib/libc/misc/initfini.c
deleted file mode 100644
index 8eef018ee..000000000
--- a/lib/libc/misc/initfini.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* 	$NetBSD: initfini.c,v 1.11 2013/08/19 22:14:37 matt Exp $	 */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Andrew Doran.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: initfini.c,v 1.11 2013/08/19 22:14:37 matt Exp $");
-
-#ifdef _LIBC
-#include "namespace.h"
-#endif
-
-#include <sys/param.h>
-#include <sys/exec.h>
-#include <sys/tls.h>
-#include <stdbool.h>
-
-void	_libc_init(void) __attribute__((__constructor__, __used__));
-
-void	__guard_setup(void);
-void	__libc_thr_init(void);
-void	__libc_atomic_init(void);
-void	__libc_atexit_init(void);
-void	__libc_env_init(void);
-
-#if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
-__dso_hidden void	__libc_static_tls_setup(void);
-#endif
-
-#ifdef __weak_alias
-__weak_alias(_dlauxinfo,___dlauxinfo)
-static void *__libc_dlauxinfo;
-
-void *___dlauxinfo(void) __pure;
-
-void *
-___dlauxinfo(void)
-{
-	return __libc_dlauxinfo;
-}
-#endif
-
-static bool libc_initialised;
-
-void _libc_init(void);
-
-/*
- * Declare as common symbol to allow new libc with older binaries to
- * not trigger an undefined reference.
- */
-struct ps_strings *__ps_strings;
-
-/*
- * _libc_init is called twice.  The first time explicitly by crt0.o
- * (for newer versions) and the second time as indirectly via _init().
- */
-void __section(".text.startup")
-_libc_init(void)
-{
-
-	if (libc_initialised)
-		return;
-
-	libc_initialised = 1;
-
-	if (__ps_strings != NULL)
-		__libc_dlauxinfo = __ps_strings->ps_argvstr +
-		    __ps_strings->ps_nargvstr + __ps_strings->ps_nenvstr + 2;
-
-	/* For -fstack-protector */
-	__guard_setup();
-
-#if defined(__minix) && defined(_REENTRANT)
-	/* Atomic operations */
-	__libc_atomic_init();
-#endif /* defined(__minix) && defined(_REENTRANT) */
-
-#if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
-	/* Initialize TLS for statically linked programs. */
-	__libc_static_tls_setup();
-#endif
-
-#if defined(__minix) && defined(_REENTRANT)
-	/* Threads */
-	__libc_thr_init();
-#endif /* defined(__minix) && defined(_REENTRANT) */
-
-	/* Initialize the atexit mutexes */
-	__libc_atexit_init();
-
-	/* Initialize environment memory RB tree. */
-	__libc_env_init();
-}
diff --git a/lib/libc/misc/stack_protector.c b/lib/libc/misc/stack_protector.c
deleted file mode 100644
index 34cf9cf6e..000000000
--- a/lib/libc/misc/stack_protector.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*	$NetBSD: stack_protector.c,v 1.9 2013/08/19 22:14:37 matt Exp $	*/
-/*	$OpenBSD: stack_protector.c,v 1.10 2006/03/31 05:34:44 deraadt Exp $	*/
-
-/*
- * Copyright (c) 2002 Hiroaki Etoh, Federico G. Schwindt, and Miodrag Vallat.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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>
-__RCSID("$NetBSD: stack_protector.c,v 1.9 2013/08/19 22:14:37 matt Exp $");
-
-#ifdef _LIBC
-#include "namespace.h"
-#endif
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <ssp/ssp.h>
-#include <signal.h>
-#include <string.h>
-#include <unistd.h>
-#ifdef _LIBC
-#include <syslog.h>
-#include "extern.h"
-#else
-#define __sysctl sysctl
-void xprintf(const char *fmt, ...);
-#include <stdlib.h>
-#endif
-
-long __stack_chk_guard[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-static void __fail(const char *) __attribute__((__noreturn__));
-__dead void __stack_chk_fail_local(void);
-void __guard_setup(void);
-
-void __section(".text.startup")
-__guard_setup(void)
-{
-#if !defined(__minix)
-	static const int mib[2] = { CTL_KERN, KERN_ARND };
-	size_t len;
-#endif /* !defined(__minix) */
-
-	if (__stack_chk_guard[0] != 0)
-		return;
-
-#if !defined(__minix)
-	len = sizeof(__stack_chk_guard);
-	if (__sysctl(mib, (u_int)__arraycount(mib), __stack_chk_guard, &len,
-	    NULL, 0) == -1 || len != sizeof(__stack_chk_guard)) {
-#endif /* !defined(__minix) */
-		/* If sysctl was unsuccessful, use the "terminator canary". */
-		((unsigned char *)(void *)__stack_chk_guard)[0] = 0;
-		((unsigned char *)(void *)__stack_chk_guard)[1] = 0;
-		((unsigned char *)(void *)__stack_chk_guard)[2] = '\n';
-		((unsigned char *)(void *)__stack_chk_guard)[3] = 255;
-#if !defined(__minix)
-	}
-#endif /* !defined(__minix) */
-}
-
-/*ARGSUSED*/
-static void
-__fail(const char *msg)
-{
-#ifdef _LIBC
-	struct syslog_data sdata = SYSLOG_DATA_INIT;
-/* MINIX: #endif */
-	struct sigaction sa;
-	sigset_t mask;
-
-	/* Immediately block all signal handlers from running code */
-	(void)sigfillset(&mask);
-	(void)sigdelset(&mask, SIGABRT);
-	(void)sigprocmask(SIG_BLOCK, &mask, NULL);
-
-/* MINIX: #ifdef _LIBC */
-	/* This may fail on a chroot jail... */
-	syslog_ss(LOG_CRIT, &sdata, "%s", msg);
-#else
-	xprintf("%s: %s\n", getprogname(), msg);
-#endif
-
-#if defined(__minix) && defined(_LIBC)
-	(void)memset(&sa, 0, sizeof(sa));
-	(void)sigemptyset(&sa.sa_mask);
-	sa.sa_flags = 0;
-	sa.sa_handler = SIG_DFL;
-	(void)sigaction(SIGABRT, &sa, NULL);
-	(void)raise(SIGABRT);
-#endif /* defined(__minix) && defined(_LIBC) */
-	_exit(127);
-}
-
-void
-__stack_chk_fail(void)
-{
-	__fail("stack overflow detected; terminated");
-}
-
-void
-__chk_fail(void)
-{
-	__fail("buffer overflow detected; terminated");
-}
-
-void
-__stack_chk_fail_local(void)
-{
-	__stack_chk_fail();
-}
diff --git a/lib/libc/nameser/Makefile.inc b/lib/libc/nameser/Makefile.inc
deleted file mode 100644
index 317a1c3a5..000000000
--- a/lib/libc/nameser/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2004/05/20 20:02:26 christos Exp $
-
-# net sources
-.PATH: ${.CURDIR}/nameser
-
-SRCS+=	ns_name.c ns_netint.c ns_parse.c ns_print.c \
-	ns_samedomain.c ns_ttl.c
diff --git a/lib/libc/nameser/ns_name.c b/lib/libc/nameser/ns_name.c
deleted file mode 100644
index 3a48c21df..000000000
--- a/lib/libc/nameser/ns_name.c
+++ /dev/null
@@ -1,1175 +0,0 @@
-/*	$NetBSD: ns_name.c,v 1.11 2014/03/07 01:07:01 christos Exp $	*/
-
-/*
- * 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#ifdef notdef
-static const char rcsid[] = "Id: ns_name.c,v 1.11 2009/01/23 19:59:16 each Exp";
-#else
-__RCSID("$NetBSD: ns_name.c,v 1.11 2014/03/07 01:07:01 christos Exp $");
-#endif
-#endif
-
-#include "port_before.h"
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <limits.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) ((int)strlen(sprintf/**/x))
-#else
-# define SPRINTF(x) (sprintf x)
-#endif
-
-#define NS_TYPE_ELT			0x40 /*%< EDNS0 extended label type */
-#define DNS_LABELTYPE_BITSTRING		0x41
-
-/* Data. */
-
-static const char	digits[] = "0123456789";
-
-static const char digitvalue[256] = {
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,	/*16*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*32*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*48*/
-	 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, -1, -1, -1, -1, -1, -1, /*64*/
-	-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*80*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*96*/
-	-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*112*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*128*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -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*/
-};
-
-/* Forward. */
-
-static int		special(int);
-static int		printable(int);
-static int		dn_find(const u_char *, const u_char *,
-				const u_char * const *,
-				const u_char * const *);
-static int		encode_bitsring(const char **, const char *,
-					unsigned char **, unsigned char **,
-					unsigned const char *);
-static int		labellen(const u_char *);
-static int		decode_bitstring(const unsigned char **,
-					 char *, const char *);
-
-/* Public. */
-
-/*%
- *	Convert an encoded domain name to printable ascii as per RFC1035.
-
- * return:
- *\li	Number of bytes written to buffer, or -1 (with errno set)
- *
- * notes:
- *\li	The root is returned as "."
- *\li	All other domains are returned in non absolute form
- */
-int
-ns_name_ntop(const u_char *src, char *dst, size_t dstsiz)
-{
-	const u_char *cp;
-	char *dn, *eom;
-	u_char c;
-	u_int n;
-	int l;
-
-	cp = src;
-	dn = dst;
-	eom = dst + dstsiz;
-
-	while ((n = *cp++) != 0) {
-		if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-			/* Some kind of compression pointer. */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (dn != dst) {
-			if (dn >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			*dn++ = '.';
-		}
-		if ((l = labellen(cp - 1)) < 0) {
-			errno = EMSGSIZE; /*%< XXX */
-			return (-1);
-		}
-		if (dn + l >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if ((n & NS_CMPRSFLGS) == NS_TYPE_ELT) {
-			int m;
-
-			if (n != DNS_LABELTYPE_BITSTRING) {
-				/* XXX: labellen should reject this case */
-				errno = EINVAL;
-				return (-1);
-			}
-			if ((m = decode_bitstring(&cp, dn, eom)) < 0)
-			{
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			dn += m; 
-			continue;
-		}
-		for (; l > 0; l--) {
-			c = *cp++;
-			if (special(c)) {
-				if (dn + 1 >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = '\\';
-				*dn++ = (char)c;
-			} else if (!printable(c)) {
-				if (dn + 3 >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = '\\';
-				*dn++ = digits[c / 100];
-				*dn++ = digits[(c % 100) / 10];
-				*dn++ = digits[c % 10];
-			} else {
-				if (dn >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = (char)c;
-			}
-		}
-	}
-	if (dn == dst) {
-		if (dn >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*dn++ = '.';
-	}
-	if (dn >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*dn++ = '\0';
-	_DIAGASSERT(__type_fit(int, dn - dst));
-	return (int)(dn - dst);
-}
-
-/*%
- *	Convert a ascii string into an encoded domain name as per RFC1035.
- *
- * return:
- *
- *\li	-1 if it fails
- *\li	1 if string was fully qualified
- *\li	0 is string was not fully qualified
- *
- * notes:
- *\li	Enforces label and domain length limits.
- */
-int
-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;
-
-	escaped = 0;
-	bp = dst;
-	eom = dst + dstsiz;
-	label = bp++;
-
-	while ((c = *src++) != 0) {
-		if (escaped) {
-			if (c == '[') { /*%< start a bit string label */
-				if ((cp = strchr(src, ']')) == NULL) {
-					errno = EINVAL; /*%< ??? */
-					return (-1);
-				}
-				if ((e = encode_bitsring(&src, cp + 2,
-							 &label, &bp, eom))
-				    != 0) {
-					errno = e;
-					return (-1);
-				}
-				escaped = 0;
-				label = bp++;
-				if ((c = *src++) == 0)
-					goto done;
-				else if (c != '.') {
-					errno = EINVAL;
-					return	(-1);
-				}
-				continue;
-			}
-			else if ((cp = strchr(digits, c)) != NULL) {
-				n = (int)(cp - digits) * 100;
-				if ((c = *src++) == 0 ||
-				    (cp = strchr(digits, c)) == NULL) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				n += (int)(cp - digits) * 10;
-				if ((c = *src++) == 0 ||
-				    (cp = strchr(digits, c)) == NULL) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				n += (int)(cp - digits);
-				if (n > 255) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				c = n;
-			}
-			escaped = 0;
-		} else if (c == '\\') {
-			escaped = 1;
-			continue;
-		} else if (c == '.') {
-			c = (int)(bp - label - 1);
-			if ((c & NS_CMPRSFLGS) != 0) {	/*%< Label too big. */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (label >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			*label = c;
-			/* Fully qualified ? */
-			if (*src == '\0') {
-				if (c != 0) {
-					if (bp >= eom) {
-						errno = EMSGSIZE;
-						return (-1);
-					}
-					*bp++ = '\0';
-				}
-				if ((bp - dst) > MAXCDNAME) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				if (dstlen != NULL)
-					*dstlen = (bp - dst);
-				return (1);
-			}
-			if (c == 0 || *src == '.') {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			label = bp++;
-			continue;
-		}
-		if (bp >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*bp++ = (u_char)c;
-	}
-	c = (int)(bp - label - 1);
-	if ((c & NS_CMPRSFLGS) != 0) {		/*%< Label too big. */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-  done:
-	if (label >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*label = c;
-	if (c != 0) {
-		if (bp >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*bp++ = 0;
-	}
-	if ((bp - dst) > MAXCDNAME) {	/*%< src too big */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	if (dstlen != NULL)
-		*dstlen = (bp - dst);
-	return (0);
-}
-
-/*%
- *	Convert a network strings labels into all lowercase.
- *
- * return:
- *\li	Number of bytes written to buffer, or -1 (with errno set)
- *
- * notes:
- *\li	Enforces label and domain length limits.
- */
-
-int
-ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz)
-{
-	const u_char *cp;
-	u_char *dn, *eom;
-	u_char c;
-	u_int n;
-	int l;
-
-	cp = src;
-	dn = dst;
-	eom = dst + dstsiz;
-
-	if (dn >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	while ((n = *cp++) != 0) {
-		if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-			/* Some kind of compression pointer. */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*dn++ = n;
-		if ((l = labellen(cp - 1)) < 0) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (dn + l >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		for (; l > 0; l--) {
-			c = *cp++;
-			if (isascii(c) && isupper(c))
-				*dn++ = tolower(c);
-			else
-				*dn++ = c;
-		}
-	}
-	*dn++ = '\0';
-	_DIAGASSERT(__type_fit(int, dn - dst));
-	return (int)(dn - dst);
-}
-
-/*%
- *	Unpack a domain name from a message, source may be compressed.
- *
- * return:
- *\li	-1 if it fails, or consumed octets if it succeeds.
- */
-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;
-	int n, len, checked, l;
-
-	len = -1;
-	checked = 0;
-	dstp = dst;
-	srcp = src;
-	dstlim = dst + dstsiz;
-	if (srcp < msg || srcp >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	/* Fetch next label in domain name. */
-	while ((n = *srcp++) != 0) {
-		/* Check for indirection. */
-		switch (n & NS_CMPRSFLGS) {
-		case 0:
-		case NS_TYPE_ELT:
-			/* Limit checks. */
-			if ((l = labellen(srcp - 1)) < 0) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (dstp + l + 1 >= dstlim || srcp + l >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			checked += l + 1;
-			*dstp++ = n;
-			memcpy(dstp, srcp, (size_t)l);
-			dstp += l;
-			srcp += l;
-			break;
-
-		case NS_CMPRSFLGS:
-			if (srcp >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (len < 0) {
-				_DIAGASSERT(__type_fit(int, srcp - src + 1));
-				len = (int)(srcp - src + 1);
-			}
-			n = ((n & 0x3f) << 8) | (*srcp & 0xff);
-			if (n >= eom - msg) {  /*%< Out of range. */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			srcp = msg + n;
-			checked += 2;
-			/*
-			 * Check for loops in the compressed name;
-			 * if we've looked at the whole message,
-			 * there must be a loop.
-			 */
-			if (checked >= eom - msg) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			break;
-
-		default:
-			errno = EMSGSIZE;
-			return (-1);			/*%< flag error */
-		}
-	}
-	*dstp++ = 0;
-	if (dstlen != NULL)
-		*dstlen = dstp - dst;
-	if (len < 0) {
-		_DIAGASSERT(__type_fit(int, srcp - src));
-		len = (int)(srcp - src);
-	}
-	return len;
-}
-
-/*%
- *	Pack domain name 'domain' into 'comp_dn'.
- *
- * return:
- *\li	Size of the compressed name, or -1.
- *
- * notes:
- *\li	'dnptrs' is an array of pointers to previous compressed names.
- *\li	dnptrs[0] is a pointer to the beginning of the message. The array
- *	ends with NULL.
- *\li	'lastdnptr' is a pointer to the end of the array pointed to
- *	by 'dnptrs'.
- *
- * Side effects:
- *\li	The list of pointers in dnptrs is updated for labels inserted into
- *	the message as we compress the name.  If 'dnptr' is NULL, we don't
- *	try to compress names. If 'lastdnptr' is NULL, we don't update the
- *	list.
- */
-int
-ns_name_pack(const u_char *src, u_char *dst, int dstsiz,
-	     const u_char **dnptrs, const u_char **lastdnptr)
-{
-	u_char *dstp;
-	const u_char **cpp, **lpp, *eob, *msg;
-	const u_char *srcp;
-	int n, l, first = 1;
-
-	srcp = src;
-	dstp = dst;
-	eob = dstp + dstsiz;
-	lpp = cpp = NULL;
-	if (dnptrs != NULL) {
-		if ((msg = *dnptrs++) != NULL) {
-			for (cpp = dnptrs; *cpp != NULL; cpp++)
-				continue;
-			lpp = cpp;	/*%< end of list to search */
-		}
-	} else
-		msg = NULL;
-
-	/* make sure the domain we are about to add is legal */
-	l = 0;
-	do {
-		int l0;
-
-		n = *srcp;
-		if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if ((l0 = labellen(srcp)) < 0) {
-			errno = EINVAL;
-			return (-1);
-		}
-		l += l0 + 1;
-		if (l > MAXCDNAME) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		srcp += l0 + 1;
-	} while (n != 0);
-
-	/* from here on we need to reset compression pointer array on error */
-	srcp = src;
-	do {
-		/* Look to see if we can use pointers. */
-		n = *srcp;
-		if (n != 0 && msg != NULL) {
-			l = dn_find(srcp, msg, (const u_char * const *)dnptrs,
-				    (const u_char * const *)lpp);
-			if (l >= 0) {
-				if (dstp + 1 >= eob) {
-					goto cleanup;
-				}
-				*dstp++ = ((u_int32_t)l >> 8) | NS_CMPRSFLGS;
-				*dstp++ = l % 256;
-				_DIAGASSERT(__type_fit(int, dstp - dst));
-				return (int)(dstp - dst);
-			}
-			/* Not found, save it. */
-			if (lastdnptr != NULL && cpp < lastdnptr - 1 &&
-			    (dstp - msg) < 0x4000 && first) {
-				*cpp++ = dstp;
-				*cpp = NULL;
-				first = 0;
-			}
-		}
-		/* copy label to buffer */
-		if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-			/* Should not happen. */
-			goto cleanup;
-		}
-		n = labellen(srcp);
-		if (dstp + 1 + n >= eob) {
-			goto cleanup;
-		}
-		memcpy(dstp, srcp, (size_t)(n + 1));
-		srcp += n + 1;
-		dstp += n + 1;
-	} while (n != 0);
-
-	if (dstp > eob) {
-cleanup:
-		if (msg != NULL)
-			*lpp = NULL;
-		errno = EMSGSIZE;
-		return (-1);
-	} 
-	_DIAGASSERT(__type_fit(int, dstp - dst));
-	return (int)(dstp - dst);
-}
-
-/*%
- *	Expand compressed domain name to presentation format.
- *
- * return:
- *\li	Number of bytes read out of `src', or -1 (with errno set).
- *
- * note:
- *\li	Root domain returns as "." not "".
- */
-int
-ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src,
-		   char *dst, size_t dstsiz)
-{
-	u_char tmp[NS_MAXCDNAME];
-	int n;
-	
-	if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1)
-		return (-1);
-	if (ns_name_ntop(tmp, dst, dstsiz) == -1)
-		return (-1);
-	return (n);
-}
-
-/*%
- *	Compress a domain name into wire format, using compression pointers.
- *
- * return:
- *\li	Number of bytes consumed in `dst' or -1 (with errno set).
- *
- * notes:
- *\li	'dnptrs' is an array of pointers to previous compressed names.
- *\li	dnptrs[0] is a pointer to the beginning of the message.
- *\li	The list ends with NULL.  'lastdnptr' is a pointer to the end of the
- *	array pointed to by 'dnptrs'. Side effect is to update the list of
- *	pointers for labels inserted into the message as we compress the name.
- *\li	If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr'
- *	is NULL, we don't update the list.
- */
-int
-ns_name_compress(const char *src, u_char *dst, size_t dstsiz,
-		 const u_char **dnptrs, const u_char **lastdnptr)
-{
-	u_char tmp[NS_MAXCDNAME];
-
-	if (ns_name_pton(src, tmp, sizeof tmp) == -1)
-		return (-1);
-	return (ns_name_pack(tmp, dst, (int)dstsiz, dnptrs, lastdnptr));
-}
-
-/*%
- * Reset dnptrs so that there are no active references to pointers at or
- * after src.
- */
-void
-ns_name_rollback(const u_char *src, const u_char **dnptrs,
-		 const u_char **lastdnptr)
-{
-	while (dnptrs < lastdnptr && *dnptrs != NULL) {
-		if (*dnptrs >= src) {
-			*dnptrs = NULL;
-			break;
-		}
-		dnptrs++;
-	}
-}
-
-/*%
- *	Advance *ptrptr to skip over the compressed name it points at.
- *
- * return:
- *\li	0 on success, -1 (with errno set) on failure.
- */
-int
-ns_name_skip(const u_char **ptrptr, const u_char *eom)
-{
-	const u_char *cp;
-	u_int n;
-	int l;
-
-	cp = *ptrptr;
-	while (cp < eom && (n = *cp++) != 0) {
-		/* Check for indirection. */
-		switch (n & NS_CMPRSFLGS) {
-		case 0:			/*%< normal case, n == len */
-			cp += n;
-			continue;
-		case NS_TYPE_ELT: /*%< EDNS0 extended label */
-			if ((l = labellen(cp - 1)) < 0) {
-				errno = EMSGSIZE; /*%< XXX */
-				return (-1);
-			}
-			cp += l;
-			continue;
-		case NS_CMPRSFLGS:	/*%< indirection */
-			cp++;
-			break;
-		default:		/*%< illegal type */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		break;
-	}
-	if (cp > eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*ptrptr = cp;
-	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,
-					    (size_t)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, (size_t)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. */
-
-/*%
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	is this characted special ("in need of quoting") ?
- *
- * return:
- *\li	boolean.
- */
-static int
-special(int ch) {
-	switch (ch) {
-	case 0x22: /*%< '"' */
-	case 0x2E: /*%< '.' */
-	case 0x3B: /*%< ';' */
-	case 0x5C: /*%< '\\' */
-	case 0x28: /*%< '(' */
-	case 0x29: /*%< ')' */
-	/* Special modifiers in zone files. */
-	case 0x40: /*%< '@' */
-	case 0x24: /*%< '$' */
-		return (1);
-	default:
-		return (0);
-	}
-}
-
-/*%
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	is this character visible and not a space when printed ?
- *
- * return:
- *\li	boolean.
- */
-static int
-printable(int ch) {
-	return (ch > 0x20 && ch < 0x7f);
-}
-
-/*%
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	convert this character to lower case if it's upper case.
- */
-static int
-mklower(int ch) {
-	if (ch >= 0x41 && ch <= 0x5A)
-		return (ch + 0x20);
-	return (ch);
-}
-
-/*%
- *	Search for the counted-label name in an array of compressed names.
- *
- * return:
- *\li	offset from msg if found, or -1.
- *
- * notes:
- *\li	dnptrs is the pointer to the first name on the list,
- *\li	not the pointer to the start of the message.
- */
-static int
-dn_find(const u_char *domain, const u_char *msg,
-	const u_char * const *dnptrs,
-	const u_char * const *lastdnptr)
-{
-	const u_char *dn, *cp, *sp;
-	const u_char * const *cpp;
-	u_int n;
-
-	for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
-		sp = *cpp;
-		/*
-		 * terminate search on:
-		 * root label
-		 * compression pointer
-		 * unusable offset
-		 */
-		while (*sp != 0 && (*sp & NS_CMPRSFLGS) == 0 &&
-		       (sp - msg) < 0x4000) {
-			dn = domain;
-			cp = sp;
-			while ((n = *cp++) != 0) {
-				/*
-				 * check for indirection
-				 */
-				switch (n & NS_CMPRSFLGS) {
-				case 0:		/*%< normal case, n == len */
-					n = labellen(cp - 1); /*%< XXX */
-					if (n != *dn++)
-						goto next;
-
-					for (; n > 0; n--)
-						if (mklower(*dn++) !=
-						    mklower(*cp++))
-							goto next;
-					/* Is next root for both ? */
-					if (*dn == '\0' && *cp == '\0') {
-						_DIAGASSERT(__type_fit(int,
-						    sp - msg));
-						return (int)(sp - msg);
-					}
-					if (*dn)
-						continue;
-					goto next;
-				case NS_CMPRSFLGS:	/*%< indirection */
-					cp = msg + (((n & 0x3f) << 8) | *cp);
-					break;
-
-				default:	/*%< illegal type */
-					errno = EMSGSIZE;
-					return (-1);
-				}
-			}
- next: ;
-			sp += *sp + 1;
-		}
-	}
-	errno = ENOENT;
-	return (-1);
-}
-
-static int
-decode_bitstring(const unsigned char **cpp, char *dn, const char *eom)
-{
-	const unsigned char *cp = *cpp;
-	char *beg = dn, tc;
-	int b, blen, plen, i;
-
-	if ((blen = (*cp & 0xff)) == 0)
-		blen = 256;
-	plen = (blen + 3) / 4;
-	plen += (int)sizeof("\\[x/]") + (blen > 99 ? 3 : (blen > 9) ? 2 : 1);
-	if (dn + plen >= eom)
-		return (-1);
-
-	cp++;
-	i = SPRINTF((dn, "\\[x"));
-	if (i < 0)
-		return (-1);
-	dn += i;
-	for (b = blen; b > 7; b -= 8, cp++) {
-		i = SPRINTF((dn, "%02x", *cp & 0xff));
-		if (i < 0)
-			return (-1);
-		dn += i;
-	}
-	if (b > 4) {
-		tc = *cp++;
-		i = SPRINTF((dn, "%02x", tc & (0xff << (8 - b))));
-		if (i < 0)
-			return (-1);
-		dn += i;
-	} else if (b > 0) {
-		tc = *cp++;
-		i = SPRINTF((dn, "%1x",
-			       (((u_int32_t)tc >> 4) & 0x0f) & (0x0f << (4 - b)))); 
-		if (i < 0)
-			return (-1);
-		dn += i;
-	}
-	i = SPRINTF((dn, "/%d]", blen));
-	if (i < 0)
-		return (-1);
-	dn += i;
-
-	*cpp = cp;
-	_DIAGASSERT(__type_fit(int, dn - beg));
-	return (int)(dn - beg);
-}
-
-static int
-encode_bitsring(const char **bp, const char *end, unsigned char **labelp,
-		unsigned char ** dst, unsigned const char *eom)
-{
-	int afterslash = 0;
-	const char *cp = *bp;
-	unsigned char *tp;
-	char c;
-	const char *beg_blen;
-	char *end_blen = NULL;
-	int value = 0, count = 0, tbcount = 0, blen = 0;
-
-	beg_blen = end_blen = NULL;
-
-	/* a bitstring must contain at least 2 characters */
-	if (end - cp < 2)
-		return (EINVAL);
-
-	/* XXX: currently, only hex strings are supported */
-	if (*cp++ != 'x')
-		return (EINVAL);
-	if (!isxdigit((*cp) & 0xff)) /*%< reject '\[x/BLEN]' */
-		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);
-				blen = (int)strtol(beg_blen, &end_blen, 10);
-				if (*end_blen != ']')
-					return (EINVAL);
-			}
-			if (count)
-				*tp++ = ((value << 4) & 0xff);
-			cp++;	/*%< skip ']' */
-			goto done;
-		case '/':
-			afterslash = 1;
-			break;
-		default:
-			if (afterslash) {
-				if (!isdigit(c&0xff))
-					return (EINVAL);
-				if (beg_blen == NULL) {
-					
-					if (c == '0') {
-						/* blen never begings with 0 */
-						return (EINVAL);
-					}
-					beg_blen = cp;
-				}
-			} else {
-				if (!isxdigit(c&0xff))
-					return (EINVAL);
-				value <<= 4;
-				value += digitvalue[(int)c];
-				count += 4;
-				tbcount += 4;
-				if (tbcount > 256)
-					return (EINVAL);
-				if (count == 8) {
-					*tp++ = value;
-					count = 0;
-				}
-			}
-			break;
-		}
-	}
-  done:
-	if (cp >= end || tp >= eom)
-		return (EMSGSIZE);
-
-	/*
-	 * bit length validation:
-	 * If a <length> is present, the number of digits in the <bit-data>
-	 * MUST be just sufficient to contain the number of bits specified
-	 * by the <length>. If there are insignificant bits in a final
-	 * hexadecimal or octal digit, they MUST be zero.
-	 * RFC2673, Section 3.2.
-	 */
-	if (blen > 0) {
-		int traillen;
-
-		if (((blen + 3) & ~3) != tbcount)
-			return (EINVAL);
-		traillen = tbcount - blen; /*%< between 0 and 3 */
-		if (((value << (8 - traillen)) & 0xff) != 0)
-			return (EINVAL);
-	}
-	else
-		blen = tbcount;
-	if (blen == 256)
-		blen = 0;
-
-	/* encode the type and the significant bit fields */
-	**labelp = DNS_LABELTYPE_BITSTRING;
-	**dst = blen;
-
-	*bp = cp;
-	*dst = tp;
-
-	return (0);
-}
-
-static int
-labellen(const u_char *lp)
-{
-	int bitlen;
-	u_char l = *lp;
-
-	if ((l & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-		/* should be avoided by the caller */
-		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 (-1);	/*%< unknwon ELT */
-	}
-	return (l);
-}
-
-/*! \file */
diff --git a/lib/libc/nameser/ns_netint.c b/lib/libc/nameser/ns_netint.c
deleted file mode 100644
index 750699283..000000000
--- a/lib/libc/nameser/ns_netint.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: ns_netint.c,v 1.7 2012/03/13 21:13:39 christos Exp $	*/
-
-/*
- * 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#ifdef notdef
-static const char rcsid[] = "Id: ns_netint.c,v 1.3 2005/04/27 04:56:40 sra Exp";
-#else
-__RCSID("$NetBSD: ns_netint.c,v 1.7 2012/03/13 21:13:39 christos Exp $");
-#endif
-#endif
-
-/* Import. */
-
-#include "port_before.h"
-
-#include <arpa/nameser.h>
-
-#include "port_after.h"
-
-/* Public. */
-
-uint16_t
-ns_get16(const u_char *src) {
-	uint16_t dst;
-
-	NS_GET16(dst, src);
-	return dst;
-}
-
-uint32_t
-ns_get32(const u_char *src) {
-	u_int32_t dst;
-
-	NS_GET32(dst, src);
-	return dst;
-}
-
-void
-ns_put16(uint16_t src, u_char *dst) {
-	NS_PUT16(src, dst);
-}
-
-void
-ns_put32(uint32_t src, u_char *dst) {
-	NS_PUT32(src, dst);
-}
-
-/*! \file */
diff --git a/lib/libc/nameser/ns_parse.c b/lib/libc/nameser/ns_parse.c
deleted file mode 100644
index 0379a7d42..000000000
--- a/lib/libc/nameser/ns_parse.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*	$NetBSD: ns_parse.c,v 1.9 2012/03/13 21:13:39 christos Exp $	*/
-
-/*
- * 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#ifdef notdef
-static const char rcsid[] = "Id: ns_parse.c,v 1.10 2009/01/23 19:59:16 each Exp";
-#else
-__RCSID("$NetBSD: ns_parse.c,v 1.9 2012/03/13 21:13:39 christos Exp $");
-#endif
-#endif
-
-/* Import. */
-
-#include "port_before.h"
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-
-#include "port_after.h"
-
-/* Forward. */
-
-static void	setsection(ns_msg *msg, ns_sect sect);
-
-/* Macros. */
-
-#if !defined(SOLARIS2) || defined(__COVERITY__)
-#define RETERR(err) do { errno = (err); return (-1); } while (/*NOTREACHED*//*CONSTCOND*/0)
-#else
-#define RETERR(err) \
-	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. */
-struct _ns_flagdata _ns_flagdata[16] = {
-	{ 0x8000, 15 },		/*%< qr. */
-	{ 0x7800, 11 },		/*%< opcode. */
-	{ 0x0400, 10 },		/*%< aa. */
-	{ 0x0200, 9 },		/*%< tc. */
-	{ 0x0100, 8 },		/*%< rd. */
-	{ 0x0080, 7 },		/*%< ra. */
-	{ 0x0040, 6 },		/*%< z. */
-	{ 0x0020, 5 },		/*%< ad. */
-	{ 0x0010, 4 },		/*%< cd. */
-	{ 0x000f, 0 },		/*%< rcode. */
-	{ 0x0000, 0 },		/*%< expansion (1/6). */
-	{ 0x0000, 0 },		/*%< expansion (2/6). */
-	{ 0x0000, 0 },		/*%< expansion (3/6). */
-	{ 0x0000, 0 },		/*%< expansion (4/6). */
-	{ 0x0000, 0 },		/*%< expansion (5/6). */
-	{ 0x0000, 0 },		/*%< expansion (6/6). */
-};
-
-int ns_msg_getflag(ns_msg handle, int flag) {
-	return((u_int32_t)((handle)._flags & _ns_flagdata[flag].mask) >> _ns_flagdata[flag].shift);
-}
-
-int
-ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) {
-	const u_char *optr = ptr;
-
-	for (; count > 0; count--) {
-		int b, rdlength;
-
-		b = dn_skipname(ptr, eom);
-		if (b < 0)
-			RETERR(EMSGSIZE);
-		ptr += b/*Name*/ + NS_INT16SZ/*Type*/ + NS_INT16SZ/*Class*/;
-		if (section != ns_s_qd) {
-			if (ptr + NS_INT32SZ + NS_INT16SZ > eom)
-				RETERR(EMSGSIZE);
-			ptr += NS_INT32SZ/*TTL*/;
-			NS_GET16(rdlength, ptr);
-			ptr += rdlength/*RData*/;
-		}
-	}
-	if (ptr > eom)
-		RETERR(EMSGSIZE);
-	_DIAGASSERT(__type_fit(int, ptr - optr));
-	return (int)(ptr - optr);
-}
-
-int
-ns_initparse(const u_char *msg, int msglen, ns_msg *handle) {
-	const u_char *eom = msg + msglen;
-	int i;
-
-	handle->_msg = msg;
-	handle->_eom = eom;
-	if (msg + NS_INT16SZ > eom)
-		RETERR(EMSGSIZE);
-	NS_GET16(handle->_id, msg);
-	if (msg + NS_INT16SZ > eom)
-		RETERR(EMSGSIZE);
-	NS_GET16(handle->_flags, msg);
-	for (i = 0; i < ns_s_max; i++) {
-		if (msg + NS_INT16SZ > eom)
-			RETERR(EMSGSIZE);
-		NS_GET16(handle->_counts[i], msg);
-	}
-	for (i = 0; i < ns_s_max; i++)
-		if (handle->_counts[i] == 0)
-			handle->_sections[i] = NULL;
-		else {
-			int b = ns_skiprr(msg, eom, (ns_sect)i,
-					  handle->_counts[i]);
-
-			if (b < 0)
-				return (-1);
-			handle->_sections[i] = msg;
-			msg += b;
-		}
-	if (msg != eom)
-		RETERR(EMSGSIZE);
-	setsection(handle, ns_s_max);
-	return (0);
-}
-
-int
-ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) {
-	int b;
-	int tmp;
-
-	/* Make section right. */
-	tmp = section;
-	if (tmp < 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 = dn_expand(handle->_msg, handle->_eom,
-		      handle->_msg_ptr, rr->name, NS_MAXDNAME);
-	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);
-}
-
-/*
- * 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. */
-	tmp = section;
-	if (tmp < 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
-setsection(ns_msg *msg, ns_sect sect) {
-	msg->_sect = sect;
-	if (sect == ns_s_max) {
-		msg->_rrnum = -1;
-		msg->_msg_ptr = NULL;
-	} else {
-		msg->_rrnum = 0;
-		msg->_msg_ptr = msg->_sections[(int)sect];
-	}
-}
-
-/*! \file */
diff --git a/lib/libc/nameser/ns_print.c b/lib/libc/nameser/ns_print.c
deleted file mode 100644
index b6a18f5bd..000000000
--- a/lib/libc/nameser/ns_print.c
+++ /dev/null
@@ -1,1264 +0,0 @@
-/*	$NetBSD: ns_print.c,v 1.11 2012/03/13 21:13:39 christos Exp $	*/
-
-/*
- * 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#ifdef notdef
-static const char rcsid[] = "Id: ns_print.c,v 1.12 2009/03/03 05:29:58 each Exp";
-#else
-__RCSID("$NetBSD: ns_print.c,v 1.11 2012/03/13 21:13:39 christos Exp $");
-#endif
-#endif
-
-/* Import. */
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <isc/assertions.h>
-#include <isc/dst.h>
-#include <assert.h>
-#include <errno.h>
-#include <resolv.h>
-#include <stddef.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) ((int)strlen(sprintf/**/x))
-#else
-# define SPRINTF(x) (sprintf x)
-#endif
-
-/* Forward. */
-
-static size_t	prune_origin(const char *name, const char *origin);
-static int	charstr(const u_char *rdata, const u_char *edata,
-			char **buf, size_t *buflen);
-static int	addname(const u_char *msg, size_t msglen,
-			const u_char **p, const char *origin,
-			char **buf, size_t *buflen);
-static void	addlen(size_t len, char **buf, size_t *buflen);
-static int	addstr(const char *src, size_t len,
-		       char **buf, size_t *buflen);
-static int	addtab(size_t len, size_t target, int spaced,
-		       char **buf, size_t *buflen);
-
-/* Macros. */
-
-#define	T(x) \
-	do { \
-		if ((x) < 0) \
-			return (-1); \
-	} while (/*CONSTCOND*/0)
-
-static const char base32hex[] =
-        "0123456789ABCDEFGHIJKLMNOPQRSTUV=0123456789abcdefghijklmnopqrstuv";
-
-/* Public. */
-
-/*%
- *	Convert an RR to presentation format.
- *
- * return:
- *\li	Number of characters written to buf, or -1 (check errno).
- */
-int
-ns_sprintrr(const ns_msg *handle, const ns_rr *rr,
-	    const char *name_ctx, const char *origin,
-	    char *buf, size_t buflen)
-{
-	int n;
-
-	n = ns_sprintrrf(ns_msg_base(*handle), ns_msg_size(*handle),
-			 ns_rr_name(*rr), ns_rr_class(*rr), ns_rr_type(*rr),
-			 ns_rr_ttl(*rr), ns_rr_rdata(*rr), ns_rr_rdlen(*rr),
-			 name_ctx, origin, buf, buflen);
-	return (n);
-}
-
-/*%
- *	Convert the fields of an RR into presentation format.
- *
- * return:
- *\li	Number of characters written to buf, or -1 (check errno).
- */
-int
-ns_sprintrrf(const u_char *msg, size_t msglen,
-	    const char *name, ns_class class, ns_type type,
-	    u_long ttl, const u_char *rdata, size_t rdlen,
-	    const char *name_ctx, const char *origin,
-	    char *buf, size_t buflen)
-{
-	const char *obuf = buf;
-	const u_char *edata = rdata + rdlen;
-	int spaced = 0;
-
-	const char *comment;
-	char tmp[100];
-	int len, x;
-
-	/*
-	 * Owner.
-	 */
-	if (name_ctx != NULL && ns_samename(name_ctx, name) == 1) {
-		T(addstr("\t\t\t", (size_t)3, &buf, &buflen));
-	} else {
-		len = (int)prune_origin(name, origin);
-		if (*name == '\0') {
-			goto root;
-		} else if (len == 0) {
-			T(addstr("@\t\t\t", (size_t)4, &buf, &buflen));
-		} else {
-			T(addstr(name, (size_t)len, &buf, &buflen));
-			/* Origin not used or not root, and no trailing dot? */
-			if (((origin == NULL || origin[0] == '\0') ||
-			    (origin[0] != '.' && origin[1] != '\0' &&
-			    name[len] == '\0')) && name[len - 1] != '.') {
- root:
-				T(addstr(".", (size_t)1, &buf, &buflen));
-				len++;
-			}
-			T(spaced = addtab((size_t)len, 24, spaced, &buf, &buflen));
-		}
-	}
-
-	/*
-	 * TTL, Class, Type.
-	 */
-	T(x = ns_format_ttl(ttl, buf, buflen));
-	addlen((size_t)x, &buf, &buflen);
-	len = SPRINTF((tmp, " %s %s", p_class(class), p_type(type)));
-	T(addstr(tmp, (size_t)len, &buf, &buflen));
-	T(spaced = addtab((size_t)(x + len), (size_t)16, spaced, &buf, &buflen));
-
-	/*
-	 * RData.
-	 */
-	switch (type) {
-	case ns_t_a:
-		if (rdlen != (size_t)NS_INADDRSZ)
-			goto formerr;
-		(void) inet_ntop(AF_INET, rdata, buf, (socklen_t)buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-
-	case ns_t_cname:
-	case ns_t_mb:
-	case ns_t_mg:
-	case ns_t_mr:
-	case ns_t_ns:
-	case ns_t_ptr:
-	case ns_t_dname:
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-
-	case ns_t_hinfo:
-	case ns_t_isdn:
-		/* First word. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", (size_t)1, &buf, &buflen));
-
-		    
-		/* Second word, optional in ISDN records. */
-		if (type == ns_t_isdn && rdata == edata)
-			break;
-		    
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		break;
-
-	case ns_t_soa: {
-		u_long t;
-
-		/* Server name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", (size_t)1, &buf, &buflen));
-
-		/* Administrator name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" (\n", (size_t)3, &buf, &buflen));
-		spaced = 0;
-
-		if ((edata - rdata) != 5*NS_INT32SZ)
-			goto formerr;
-
-		/* Serial number. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", (size_t)5, &buf, &buflen));
-		len = SPRINTF((tmp, "%lu", t));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-		T(spaced = addtab((size_t)len, (size_t)16, spaced, &buf, &buflen));
-		T(addstr("; serial\n", (size_t)9, &buf, &buflen));
-		spaced = 0;
-
-		/* Refresh interval. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", (size_t)5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen((size_t)len, &buf, &buflen);
-		T(spaced = addtab((size_t)len, (size_t)16, spaced, &buf, &buflen));
-		T(addstr("; refresh\n", (size_t)10, &buf, &buflen));
-		spaced = 0;
-
-		/* Retry interval. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", (size_t)5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen((size_t)len, &buf, &buflen);
-		T(spaced = addtab((size_t)len, (size_t)16, spaced, &buf, &buflen));
-		T(addstr("; retry\n", (size_t)8, &buf, &buflen));
-		spaced = 0;
-
-		/* Expiry. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", (size_t)5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen((size_t)len, &buf, &buflen);
-		T(spaced = addtab((size_t)len, (size_t)16, spaced, &buf, &buflen));
-		T(addstr("; expiry\n", (size_t)9, &buf, &buflen));
-		spaced = 0;
-
-		/* Minimum TTL. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", (size_t)5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen((size_t)len, &buf, &buflen);
-		T(addstr(" )", (size_t)2, &buf, &buflen));
-		T(spaced = addtab((size_t)len, (size_t)16, spaced, &buf, &buflen));
-		T(addstr("; minimum\n", (size_t)10, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_mx:
-	case ns_t_afsdb:
-	case ns_t_rt:
-	case ns_t_kx: {
-		u_int t;
-
-		if (rdlen < (size_t)NS_INT16SZ)
-			goto formerr;
-
-		/* Priority. */
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-
-		/* Target. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_px: {
-		u_int t;
-
-		if (rdlen < (size_t)NS_INT16SZ)
-			goto formerr;
-
-		/* Priority. */
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-
-		/* Name1. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", (size_t)1, &buf, &buflen));
-
-		/* Name2. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_x25:
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		break;
-
-	case ns_t_txt:
-	case ns_t_spf:
-		while (rdata < edata) {
-			T(len = charstr(rdata, edata, &buf, &buflen));
-			if (len == 0)
-				goto formerr;
-			rdata += len;
-			if (rdata < edata)
-				T(addstr(" ", (size_t)1, &buf, &buflen));
-		}
-		break;
-
-	case ns_t_nsap: {
-		char t[2+255*3];
-
-		(void) inet_nsap_ntoa((int)rdlen, rdata, t);
-		T(addstr(t, strlen(t), &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_aaaa:
-		if (rdlen != (size_t)NS_IN6ADDRSZ)
-			goto formerr;
-		(void) inet_ntop(AF_INET6, rdata, buf, (socklen_t)buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-
-	case ns_t_loc: {
-		char t[255];
-
-		/* XXX protocol format checking? */
-		(void) loc_ntoa(rdata, t);
-		T(addstr(t, strlen(t), &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_naptr: {
-		u_int order, preference;
-		char t[50];
-
-		if (rdlen < 2U*NS_INT16SZ)
-			goto formerr;
-
-		/* Order, Precedence. */
-		order = ns_get16(rdata);	rdata += NS_INT16SZ;
-		preference = ns_get16(rdata);	rdata += NS_INT16SZ;
-		len = SPRINTF((t, "%u %u ", order, preference));
-		T(addstr(t, (size_t)len, &buf, &buflen));
-
-		/* Flags. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", (size_t)1, &buf, &buflen));
-
-		/* Service. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", (size_t)1, &buf, &buflen));
-
-		/* Regexp. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len < 0)
-			return (-1);
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", (size_t)1, &buf, &buflen));
-
-		/* Server. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_srv: {
-		u_int priority, weight, port;
-		char t[50];
-
-		if (rdlen < 3U*NS_INT16SZ)
-			goto formerr;
-
-		/* Priority, Weight, Port. */
-		priority = ns_get16(rdata);  rdata += NS_INT16SZ;
-		weight   = ns_get16(rdata);  rdata += NS_INT16SZ;
-		port     = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((t, "%u %u %u ", priority, weight, port));
-		T(addstr(t, (size_t)len, &buf, &buflen));
-
-		/* Server. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_minfo:
-	case ns_t_rp:
-		/* Name1. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", (size_t)1, &buf, &buflen));
-
-		/* Name2. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-
-	case ns_t_wks: {
-		int n, lcnt;
-
-		if (rdlen < 1U + NS_INT32SZ)
-			goto formerr;
-
-		/* Address. */
-		(void) inet_ntop(AF_INET, rdata, buf, (socklen_t)buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		rdata += NS_INADDRSZ;
-
-		/* Protocol. */
-		len = SPRINTF((tmp, " %u ( ", *rdata));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-		rdata += NS_INT8SZ;
-
-		/* Bit map. */
-		n = 0;
-		lcnt = 0;
-		while (rdata < edata) {
-			u_int c = *rdata++;
-			do {
-				if (c & 0200) {
-					if (lcnt == 0) {
-						T(addstr("\n\t\t\t\t", (size_t)5,
-							 &buf, &buflen));
-						lcnt = 10;
-						spaced = 0;
-					}
-					len = SPRINTF((tmp, "%d ", n));
-					T(addstr(tmp, (size_t)len, &buf, &buflen));
-					lcnt--;
-				}
-				c <<= 1;
-			} while (++n & 07);
-		}
-		T(addstr(")", (size_t)1, &buf, &buflen));
-
-		break;
-	    }
-
-	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;
-		int n;
-
-		if (rdlen < 0U + NS_INT16SZ + NS_INT8SZ + NS_INT8SZ)
-			goto formerr;
-
-		/* Key flags, Protocol, Algorithm. */
-#ifndef _LIBC
-		key_id = dst_s_dns_key_id(rdata, edata-rdata);
-#else
-		key_id = 0;
-#endif
-		keyflags = ns_get16(rdata);  rdata += NS_INT16SZ;
-		protocol = *rdata++;
-		algorithm = *rdata++;
-		len = SPRINTF((tmp, "0x%04x %u %u",
-			       keyflags, protocol, algorithm));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-
-		/* Public key data. */
-		len = b64_ntop(rdata, (size_t)(edata - rdata),
-			       base64_key, sizeof base64_key);
-		if (len < 0)
-			goto formerr;
-		if (len > 15) {
-			T(addstr(" (", (size_t)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, (size_t)MIN(len - n, 48),
-				 &buf, &buflen));
-		}
-		if (len > 15)
-			T(addstr(" )", (size_t)2, &buf, &buflen));
-		n = SPRINTF((tmp, " ; key_tag= %u", key_id));
-		T(addstr(tmp, (size_t)n, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_sig:
-	case ns_t_rrsig: {
-		char base64_key[NS_MD5RSA_MAX_BASE64];
-		u_int typ, algorithm, labels, footprint;
-		const char *leader;
-		u_long t;
-		int n;
-
-		if (rdlen < 22U)
-			goto formerr;
-
-		/* Type covered, Algorithm, Label count, Original TTL. */
-	        typ = ns_get16(rdata);  rdata += NS_INT16SZ;
-		algorithm = *rdata++;
-		labels = *rdata++;
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s %d %d %lu ",
-			       p_type((int)typ), algorithm, labels, t));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-		if (labels > (u_int)dn_count_labels(name))
-			goto formerr;
-
-		/* Signature expiry. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-
-		/* Time signed. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-
-		/* Signature Footprint. */
-		footprint = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", footprint));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-
-		/* Signer's name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		/* Signature. */
-		len = b64_ntop(rdata, (size_t)(edata - rdata),
-			       base64_key, sizeof base64_key);
-		if (len > 15) {
-			T(addstr(" (", (size_t)2, &buf, &buflen));
-			leader = "\n\t\t";
-			spaced = 0;
-		} else
-			leader = " ";
-		if (len < 0)
-			goto formerr;
-		for (n = 0; n < len; n += 48) {
-			T(addstr(leader, strlen(leader), &buf, &buflen));
-			T(addstr(base64_key + n, (size_t)MIN(len - n, 48),
-				 &buf, &buflen));
-		}
-		if (len > 15)
-			T(addstr(" )", (size_t)2, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_nxt: {
-		ptrdiff_t n, c;
-
-		/* Next domain name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		/* Type bit map. */
-		n = edata - rdata;
-		for (c = 0; c < n*8; c++)
-			if (NS_NXT_BIT_ISSET(c, rdata)) {
-				len = SPRINTF((tmp, " %s", p_type((int)c)));
-				T(addstr(tmp, (size_t)len, &buf, &buflen));
-			}
-		break;
-	    }
-
-	case ns_t_cert: {
-		u_int c_type, key_tag, alg;
-		int n;
-		size_t siz;
-		char base64_cert[8192], tmp1[40];
-		const char *leader;
-
-		c_type  = ns_get16(rdata); rdata += NS_INT16SZ;
-		key_tag = ns_get16(rdata); rdata += NS_INT16SZ;
-		alg = (u_int) *rdata++;
-
-		len = SPRINTF((tmp1, "%d %d %d ", c_type, key_tag, alg));
-		T(addstr(tmp1, (size_t)len, &buf, &buflen));
-		siz = (edata-rdata)*4/3 + 4; /* "+4" accounts for trailing \0 */
-		if (siz > sizeof(base64_cert) * 3/4) {
-			const char *str = "record too long to print";
-			T(addstr(str, strlen(str), &buf, &buflen));
-		}
-		else {
-			len = b64_ntop(rdata, (size_t)(edata-rdata),
-			    base64_cert, siz);
-
-			if (len < 0)
-				goto formerr;
-			else if (len > 15) {
-				T(addstr(" (", (size_t)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_cert + n, (size_t)MIN(len - n, 48),
-					 &buf, &buflen));
-			}
-			if (len > 15)
-				T(addstr(" )", (size_t)2, &buf, &buflen));
-		}
-		break;
-	    }
-
-	case ns_t_tkey: {
-		/* KJD - need to complete this */
-		u_long t;
-		int mode, err, keysize;
-
-		/* Algorithm name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", (size_t)1, &buf, &buflen));
-
-		/* Inception. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-
-		/* Experation. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-
-		/* Mode , Error, Key Size. */
-		/* Priority, Weight, Port. */
-		mode = ns_get16(rdata);  rdata += NS_INT16SZ;
-		err  = ns_get16(rdata);  rdata += NS_INT16SZ;
-		keysize  = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u %u %u ", mode, err, keysize));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-
-		/* XXX need to dump key, print otherdata length & other data */
-		break;
-	    }
-
-	case ns_t_tsig: {
-		/* BEW - need to complete this */
-		int n;
-
-		T(len = addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", (size_t)1, &buf, &buflen));
-		rdata += 8; /*%< time */
-		n = ns_get16(rdata); rdata += INT16SZ;
-		rdata += n; /*%< sig */
-		n = ns_get16(rdata); rdata += INT16SZ; /*%< original id */
-		sprintf(buf, "%d", ns_get16(rdata));
-		rdata += INT16SZ;
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-	    }
-
-	case ns_t_a6: {
-		struct in6_addr a;
-		int pbyte, pbit;
-
-		/* prefix length */
-		if (rdlen == 0U) goto formerr;
-		len = SPRINTF((tmp, "%d ", *rdata));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-		pbit = *rdata;
-		if (pbit > 128) goto formerr;
-		pbyte = (pbit & ~7) / 8;
-		rdata++;
-
-		/* address suffix: provided only when prefix len != 128 */
-		if (pbit < 128) {
-			if (rdata + pbyte >= edata) goto formerr;
-			memset(&a, 0, sizeof(a));
-			memcpy(&a.s6_addr[pbyte], rdata, sizeof(a) - pbyte);
-			(void) inet_ntop(AF_INET6, &a, buf, (socklen_t)buflen);
-			addlen(strlen(buf), &buf, &buflen);
-			rdata += sizeof(a) - pbyte;
-		}
-
-		/* prefix name: provided only when prefix len > 0 */
-		if (pbit == 0)
-			break;
-		if (rdata >= edata) goto formerr;
-		T(addstr(" ", (size_t)1, &buf, &buflen));
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		
-		break;
-	    }
-
-	case ns_t_opt: {
-		len = SPRINTF((tmp, "%u bytes", class));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-		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, (size_t)len, &buf, &buflen));
-		} else
-			if (rdlen < 2U) goto formerr;
-
-		len = SPRINTF((tmp, "%u ", *rdata));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-		rdata++;
-
-		len = SPRINTF((tmp, "%u ", *rdata));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-		rdata++;
-
-		while (rdata < edata) {
-			len = SPRINTF((tmp, "%02X", *rdata));
-			T(addstr(tmp, (size_t)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, (size_t)len, &buf, &buflen));
-		rdata++;
-
-		len = SPRINTF((tmp, "%u ", *rdata));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-		rdata++;
-
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, (size_t)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, (size_t)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[(((uint32_t)rdata[0]>>3)&0x1f)];
-				tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)];
-				tmp[2] = tmp[3] = tmp[4] = '=';
-				tmp[5] = tmp[6] = tmp[7] = '=';
-				break;
-			case 2:
-				tmp[0] = base32hex[(((uint32_t)rdata[0]>>3)&0x1f)];
-				tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)|
-						   (((uint32_t)rdata[1]>>6)&0x03)];
-				tmp[2] = base32hex[(((uint32_t)rdata[1]>>1)&0x1f)];
-				tmp[3] = base32hex[(((uint32_t)rdata[1]<<4)&0x10)];
-				tmp[4] = tmp[5] = tmp[6] = tmp[7] = '=';
-				break;
-			case 3:
-				tmp[0] = base32hex[(((uint32_t)rdata[0]>>3)&0x1f)];
-				tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)|
-						   (((uint32_t)rdata[1]>>6)&0x03)];
-				tmp[2] = base32hex[(((uint32_t)rdata[1]>>1)&0x1f)];
-				tmp[3] = base32hex[(((uint32_t)rdata[1]<<4)&0x10)|
-						   (((uint32_t)rdata[2]>>4)&0x0f)];
-				tmp[4] = base32hex[(((uint32_t)rdata[2]<<1)&0x1e)];
-				tmp[5] = tmp[6] = tmp[7] = '=';
-				break;
-			case 4:
-				tmp[0] = base32hex[(((uint32_t)rdata[0]>>3)&0x1f)];
-				tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)|
-						   (((uint32_t)rdata[1]>>6)&0x03)];
-				tmp[2] = base32hex[(((uint32_t)rdata[1]>>1)&0x1f)];
-				tmp[3] = base32hex[(((uint32_t)rdata[1]<<4)&0x10)|
-						   (((uint32_t)rdata[2]>>4)&0x0f)];
-				tmp[4] = base32hex[(((uint32_t)rdata[2]<<1)&0x1e)|
-						   (((uint32_t)rdata[3]>>7)&0x01)];
-				tmp[5] = base32hex[(((uint32_t)rdata[3]>>2)&0x1f)];
-				tmp[6] = base32hex[((uint32_t)rdata[3]<<3)&0x18];
-				tmp[7] = '=';
-				break;
-			default:
-				tmp[0] = base32hex[(((uint32_t)rdata[0]>>3)&0x1f)];
-				tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)|
-						   (((uint32_t)rdata[1]>>6)&0x03)];
-				tmp[2] = base32hex[(((uint32_t)rdata[1]>>1)&0x1f)];
-				tmp[3] = base32hex[(((uint32_t)rdata[1]<<4)&0x10)|
-						   (((uint32_t)rdata[2]>>4)&0x0f)];
-				tmp[4] = base32hex[(((uint32_t)rdata[2]<<1)&0x1e)|
-						   (((uint32_t)rdata[3]>>7)&0x01)];
-				tmp[5] = base32hex[(((uint32_t)rdata[3]>>2)&0x1f)];
-				tmp[6] = base32hex[(((uint32_t)rdata[3]<<3)&0x18)|
-						   (((uint32_t)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((ns_type)c)));
-					T(addstr(tmp, (size_t)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((ns_type)c)));
-					T(addstr(tmp, (size_t)len, &buf, &buflen));
-				}
-			}
-			rdata += l;
-		}
-		break;
-	    }
-
-	case ns_t_dhcid: {
-		int n;
-		unsigned int siz;
-		char base64_dhcid[8192];
-		const char *leader;
-
-		siz = (int)(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, (size_t)(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,
-				    (size_t)MIN(len - n, 48), &buf, &buflen));
-			}
-			if (len > 15)
-				T(addstr(" )", 2, &buf, &buflen));
-		}
-		break;
-	}
-
-	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, (size_t)len, &buf, &buflen));
-		rdata++;
-
-		len = SPRINTF((tmp, "%u ", *rdata));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-		rdata++;
-		
-		len = SPRINTF((tmp, "%u ", *rdata));
-		T(addstr(tmp, (size_t)len, &buf, &buflen));
-		rdata++;
-
-		switch (rdata[-2]) {
-		case 0:
-			T(addstr(".", 1, &buf, &buflen));
-			break;
-		case 1:
-			(void) inet_ntop(AF_INET, rdata, buf, (socklen_t)buflen);
-			addlen(strlen(buf), &buf, &buflen);
-			rdata += 4;
-			break;
-		case 2:
-			(void) inet_ntop(AF_INET6, rdata, buf, (socklen_t)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 = (int)(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, (size_t)(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,
-				    (size_t)MIN(len - n, 48), &buf, &buflen));
-			}
-			if (len > 15)
-				T(addstr(" )", 2, &buf, &buflen));
-		}
-		break;
-	}
-
-	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, (size_t)len, &buf, &buflen));
-
-			for (i = 0; i < hip_len; i++) {
-				len = sprintf(tmp, "%02X", *rdata);
-				T(addstr(tmp, (size_t)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, (size_t)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;
-	}
-	_DIAGASSERT(__type_fit(int, buf - obuf));
-	return (int)(buf - obuf);
- formerr:
-	comment = "RR format error";
- hexify: {
-	int n, m;
-	char *p;
-
-	len = SPRINTF((tmp, "\\# %u%s\t; %s", (unsigned)(edata - rdata),
-		       rdlen != 0U ? " (" : "", comment));
-	T(addstr(tmp, (size_t)len, &buf, &buflen));
-	while (rdata < edata) {
-		p = tmp;
-		p += SPRINTF((p, "\n\t"));
-		spaced = 0;
-		n = MIN(16, (int)(edata - rdata));
-		for (m = 0; m < n; m++)
-			p += SPRINTF((p, "%02x ", rdata[m]));
-		T(addstr(tmp, (size_t)(p - tmp), &buf, &buflen));
-		if (n < 16) {
-			T(addstr(")", (size_t)1, &buf, &buflen));
-			T(addtab((size_t)(p - tmp + 1), (size_t)48, spaced, &buf, &buflen));
-		}
-		p = tmp;
-		p += SPRINTF((p, "; "));
-		for (m = 0; m < n; m++)
-			*p++ = (isascii(rdata[m]) && isprint(rdata[m]))
-				? rdata[m]
-				: '.';
-		T(addstr(tmp, (size_t)(p - tmp), &buf, &buflen));
-		rdata += n;
-	}
-	_DIAGASSERT(__type_fit(int, buf - obuf));
-	return (int)(buf - obuf);
-    }
-}
-
-/* Private. */
-
-/*%
- * size_t
- * prune_origin(name, origin)
- *	Find out if the name is at or under the current origin.
- * return:
- *	Number of characters in name before start of origin,
- *	or length of name if origin does not match.
- * notes:
- *	This function should share code with samedomain().
- */
-static size_t
-prune_origin(const char *name, const char *origin) {
-	const char *oname = name;
-
-	while (*name != '\0') {
-		if (origin != NULL && ns_samename(name, origin) == 1)
-			return (name - oname - (name > oname));
-		while (*name != '\0') {
-			if (*name == '\\') {
-				name++;
-				/* XXX need to handle \nnn form. */
-				if (*name == '\0')
-					break;
-			} else if (*name == '.') {
-				name++;
-				break;
-			}
-			name++;
-		}
-	}
-	return (name - oname);
-}
-
-/*%
- * int
- * charstr(rdata, edata, buf, buflen)
- *	Format a <character-string> into the presentation buffer.
- * return:
- *	Number of rdata octets consumed
- *	0 for protocol format error
- *	-1 for output buffer error
- * side effects:
- *	buffer is advanced on success.
- */
-static int
-charstr(const u_char *rdata, const u_char *edata, char **buf, size_t *buflen) {
-	const u_char *odata = rdata;
-	size_t save_buflen = *buflen;
-	char *save_buf = *buf;
-
-	if (addstr("\"", (size_t)1, buf, buflen) < 0)
-		goto enospc;
-	if (rdata < edata) {
-		int n = *rdata;
-
-		if (rdata + 1 + n <= edata) {
-			rdata++;
-			while (n-- > 0) {
-				if (strchr("\n\"\\", *rdata) != NULL)
-					if (addstr("\\", (size_t)1, buf, buflen) < 0)
-						goto enospc;
-				if (addstr((const char *)rdata, (size_t)1,
-					   buf, buflen) < 0)
-					goto enospc;
-				rdata++;
-			}
-		}
-	}
-	if (addstr("\"", (size_t)1, buf, buflen) < 0)
-		goto enospc;
-	_DIAGASSERT(__type_fit(int, rdata - odata));
-	return (int)(rdata - odata);
- enospc:
-	errno = ENOSPC;
-	*buf = save_buf;
-	*buflen = save_buflen;
-	return (-1);
-}
-
-static int
-addname(const u_char *msg, size_t msglen,
-	const u_char **pp, const char *origin,
-	char **buf, size_t *buflen)
-{
-	size_t newlen, save_buflen = *buflen;
-	char *save_buf = *buf;
-	int n;
-
-	n = dn_expand(msg, msg + msglen, *pp, *buf, (int)*buflen);
-	if (n < 0)
-		goto enospc;	/*%< Guess. */
-	newlen = prune_origin(*buf, origin);
-	if (**buf == '\0') {
-		goto root;
-	} else if (newlen == 0U) {
-		/* Use "@" instead of name. */
-		if (newlen + 2 > *buflen)
-			goto enospc;        /* No room for "@\0". */
-		(*buf)[newlen++] = '@';
-		(*buf)[newlen] = '\0';
-	} else {
-		if (((origin == NULL || origin[0] == '\0') ||
-		    (origin[0] != '.' && origin[1] != '\0' &&
-		    (*buf)[newlen] == '\0')) && (*buf)[newlen - 1] != '.') {
-			/* No trailing dot. */
- root:
-			if (newlen + 2 > *buflen)
-				goto enospc;	/* No room for ".\0". */
-			(*buf)[newlen++] = '.';
-			(*buf)[newlen] = '\0';
-		}
-	}
-	*pp += n;
-	addlen(newlen, buf, buflen);
-	**buf = '\0';
-	_DIAGASSERT(__type_fit(int, newlen));
-	return (int)newlen;
- enospc:
-	errno = ENOSPC;
-	*buf = save_buf;
-	*buflen = save_buflen;
-	return (-1);
-}
-
-static void
-addlen(size_t len, char **buf, size_t *buflen) {
-	INSIST(len <= *buflen);
-	*buf += len;
-	*buflen -= len;
-}
-
-static int
-addstr(const char *src, size_t len, char **buf, size_t *buflen) {
-	if (len >= *buflen) {
-		errno = ENOSPC;
-		return (-1);
-	}
-	memcpy(*buf, src, len);
-	addlen(len, buf, buflen);
-	**buf = '\0';
-	return (0);
-}
-
-static int
-addtab(size_t len, size_t target, int spaced, char **buf, size_t *buflen) {
-	size_t save_buflen = *buflen;
-	char *save_buf = *buf;
-	ptrdiff_t t;
-
-	if (spaced || len >= target - 1) {
-		T(addstr("  ", (size_t)2, buf, buflen));
-		spaced = 1;
-	} else {
-		for (t = (target - len - 1) / 8; t >= 0; t--)
-			if (addstr("\t", (size_t)1, buf, buflen) < 0) {
-				*buflen = save_buflen;
-				*buf = save_buf;
-				return (-1);
-			}
-		spaced = 0;
-	}
-	return (spaced);
-}
-
-/*! \file */
diff --git a/lib/libc/nameser/ns_samedomain.c b/lib/libc/nameser/ns_samedomain.c
deleted file mode 100644
index 9b8f863ae..000000000
--- a/lib/libc/nameser/ns_samedomain.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*	$NetBSD: ns_samedomain.c,v 1.8 2012/11/22 20:22:31 christos Exp $	*/
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995,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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#ifdef notdef
-static const char rcsid[] = "Id: ns_samedomain.c,v 1.6 2005/04/27 04:56:40 sra Exp";
-#else
-__RCSID("$NetBSD: ns_samedomain.c,v 1.8 2012/11/22 20:22:31 christos Exp $");
-#endif
-#endif
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <arpa/nameser.h>
-#include <errno.h>
-#include <string.h>
-
-#include "port_after.h"
-
-#ifdef _LIBRESOLV
-/*%
- *	Check whether a name belongs to a domain.
- *
- * Inputs:
- *\li	a - the domain whose ancestory is being verified
- *\li	b - the potential ancestor we're checking against
- *
- * Return:
- *\li	boolean - is a at or below b?
- *
- * Notes:
- *\li	Trailing dots are first removed from name and domain.
- *	Always compare complete subdomains, not only whether the
- *	domain name is the trailing string of the given name.
- *
- *\li	"host.foobar.top" lies in "foobar.top" and in "top" and in ""
- *	but NOT in "bar.top"
- */
-
-int
-ns_samedomain(const char *a, const char *b) {
-	size_t la, lb, i;
-	int diff, escaped;
-	const char *cp;
-
-	la = strlen(a);
-	lb = strlen(b);
-
-	/* Ignore a trailing label separator (i.e. an unescaped dot) in 'a'. */
-	if (la != 0U && a[la - 1] == '.') {
-		escaped = 0;
-		/* Note this loop doesn't get executed if la==1. */
-		for (i = la - 1; i > 0; i--)
-			if (a[i - 1] == '\\') {
-				if (escaped)
-					escaped = 0;
-				else
-					escaped = 1;
-			} else
-				break;
-		if (!escaped)
-			la--;
-	}
-
-	/* Ignore a trailing label separator (i.e. an unescaped dot) in 'b'. */
-	if (lb != 0U && b[lb - 1] == '.') {
-		escaped = 0;
-		/* note this loop doesn't get executed if lb==1 */
-		for (i = lb - 1; i > 0; i--)
-			if (b[i - 1] == '\\') {
-				if (escaped)
-					escaped = 0;
-				else
-					escaped = 1;
-			} else
-				break;
-		if (!escaped)
-			lb--;
-	}
-
-	/* lb == 0 means 'b' is the root domain, so 'a' must be in 'b'. */
-	if (lb == 0U)
-		return (1);
-
-	/* 'b' longer than 'a' means 'a' can't be in 'b'. */
-	if (lb > la)
-		return (0);
-
-	/* 'a' and 'b' being equal at this point indicates sameness. */
-	if (lb == la)
-		return (strncasecmp(a, b, lb) == 0);
-
-	/* Ok, we know la > lb. */
-
-	diff = (int)(la - lb);
-
-	/*
-	 * If 'a' is only 1 character longer than 'b', then it can't be
-	 * a subdomain of 'b' (because of the need for the '.' label
-	 * separator).
-	 */
-	if (diff < 2)
-		return (0);
-
-	/*
-	 * If the character before the last 'lb' characters of 'b'
-	 * isn't '.', then it can't be a match (this lets us avoid
-	 * having "foobar.com" match "bar.com").
-	 */
-	if (a[diff - 1] != '.')
-		return (0);
-
-	/*
-	 * We're not sure about that '.', however.  It could be escaped
-         * and thus not a really a label separator.
-	 */
-	escaped = 0;
-	for (i = diff - 1; i > 0; i--)
-		if (a[i - 1] == '\\') {
-			if (escaped)
-				escaped = 0;
-			else
-				escaped = 1;
-		} else
-			break;
-	if (escaped)
-		return (0);
-	  
-	/* Now compare aligned trailing substring. */
-	cp = a + diff;
-	return (strncasecmp(cp, b, lb) == 0);
-}
-
-/*%
- *	is "a" a subdomain of "b"?
- */
-int
-ns_subdomain(const char *a, const char *b) {
-	return (ns_samename(a, b) != 1 && ns_samedomain(a, b));
-}
-#endif
-#ifdef _LIBC
-/*%
- *	make a canonical copy of domain name "src"
- *
- * notes:
- * \code
- *	foo -> foo.
- *	foo. -> foo.
- *	foo.. -> foo.
- *	foo\. -> foo\..
- *	foo\\. -> foo\\.
- * \endcode
- */
-
-int
-ns_makecanon(const char *src, char *dst, size_t dstsize) {
-	size_t n = strlen(src);
-
-	if (n + sizeof "." > dstsize) {			/*%< Note: sizeof == 2 */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	strcpy(dst, src);
-	while (n >= 1U && dst[n - 1] == '.')		/*%< Ends in "." */
-		if (n >= 2U && dst[n - 2] == '\\' &&	/*%< Ends in "\." */
-		    (n < 3U || dst[n - 3] != '\\'))	/*%< But not "\\." */
-			break;
-		else
-			dst[--n] = '\0';
-	dst[n++] = '.';
-	dst[n] = '\0';
-	return (0);
-}
-
-/*%
- *	determine whether domain name "a" is the same as domain name "b"
- *
- * return:
- *\li	-1 on error
- *\li	0 if names differ
- *\li	1 if names are the same
- */
-
-int
-ns_samename(const char *a, const char *b) {
-	char ta[NS_MAXDNAME], tb[NS_MAXDNAME];
-
-	if (ns_makecanon(a, ta, sizeof ta) < 0 ||
-	    ns_makecanon(b, tb, sizeof tb) < 0)
-		return (-1);
-	if (strcasecmp(ta, tb) == 0)
-		return (1);
-	else
-		return (0);
-}
-#endif
-/*! \file */
diff --git a/lib/libc/nameser/ns_ttl.c b/lib/libc/nameser/ns_ttl.c
deleted file mode 100644
index e895e5a5b..000000000
--- a/lib/libc/nameser/ns_ttl.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*	$NetBSD: ns_ttl.c,v 1.8 2012/03/13 21:13:39 christos Exp $	*/
-
-/*
- * 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#ifdef notdef
-static const char rcsid[] = "Id: ns_ttl.c,v 1.4 2005/07/28 06:51:49 marka Exp";
-#else
-__RCSID("$NetBSD: ns_ttl.c,v 1.8 2012/03/13 21:13:39 christos Exp $");
-#endif
-#endif
-
-/* Import. */
-
-#include "port_before.h"
-
-#include <arpa/nameser.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-/* Forward. */
-
-static int	fmt1(int t, char s, char **buf, size_t *buflen);
-
-/* Macros. */
-
-#define T(x) if ((x) < 0) return (-1)
-
-/* Public. */
-
-int
-ns_format_ttl(u_long src, char *dst, size_t dstlen) {
-	char *odst = dst;
-	int secs, mins, hours, days, weeks, x;
-	char *p;
-
-	secs = (int)(src % 60);   src /= 60;
-	mins = (int)(src % 60);   src /= 60;
-	hours = (int)(src % 24);  src /= 24;
-	days = (int)(src % 7);    src /= 7;
-	weeks = (int)src;       src = 0;
-
-	x = 0;
-	if (weeks) {
-		T(fmt1(weeks, 'W', &dst, &dstlen));
-		x++;
-	}
-	if (days) {
-		T(fmt1(days, 'D', &dst, &dstlen));
-		x++;
-	}
-	if (hours) {
-		T(fmt1(hours, 'H', &dst, &dstlen));
-		x++;
-	}
-	if (mins) {
-		T(fmt1(mins, 'M', &dst, &dstlen));
-		x++;
-	}
-	if (secs || !(weeks || days || hours || mins)) {
-		T(fmt1(secs, 'S', &dst, &dstlen));
-		x++;
-	}
-
-	if (x > 1) {
-		int ch;
-
-		for (p = odst; (ch = *p) != '\0'; p++)
-			if (isascii(ch) && isupper(ch))
-				*p = tolower(ch);
-	}
-
-	_DIAGASSERT(__type_fit(int, dst - odst));
-	return (int)(dst - odst);
-}
-
-#ifndef _LIBC
-int
-ns_parse_ttl(const char *src, u_long *dst) {
-	u_long ttl, tmp;
-	int ch, digits, dirty;
-
-	ttl = 0;
-	tmp = 0;
-	digits = 0;
-	dirty = 0;
-	while ((ch = *src++) != '\0') {
-		if (!isascii(ch) || !isprint(ch))
-			goto einval;
-		if (isdigit(ch)) {
-			tmp *= 10;
-			tmp += (ch - '0');
-			digits++;
-			continue;
-		}
-		if (digits == 0)
-			goto einval;
-		if (islower(ch))
-			ch = toupper(ch);
-		switch (ch) {
-		case 'W':  tmp *= 7;	/*FALLTHROUGH*/
-		case 'D':  tmp *= 24;	/*FALLTHROUGH*/
-		case 'H':  tmp *= 60;	/*FALLTHROUGH*/
-		case 'M':  tmp *= 60;	/*FALLTHROUGH*/
-		case 'S':  break;
-		default:   goto einval;
-		}
-		ttl += tmp;
-		tmp = 0;
-		digits = 0;
-		dirty = 1;
-	}
-	if (digits > 0) {
-		if (dirty)
-			goto einval;
-		else
-			ttl += tmp;
-	} else if (!dirty)
-		goto einval;
-	*dst = ttl;
-	return (0);
-
- einval:
-	errno = EINVAL;
-	return (-1);
-}
-#endif
-
-/* Private. */
-
-static int
-fmt1(int t, char s, char **buf, size_t *buflen) {
-	char tmp[50];
-	size_t len;
-
-	len = SPRINTF((tmp, "%d%c", t, s));
-	if (len + 1 > *buflen)
-		return (-1);
-	strcpy(*buf, tmp);
-	*buf += len;
-	*buflen -= len;
-	return (0);
-}
-
-/*! \file */
diff --git a/lib/libc/net/Lint_htonl.c b/lib/libc/net/Lint_htonl.c
deleted file mode 100644
index e1d7e03bf..000000000
--- a/lib/libc/net/Lint_htonl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_htonl.c,v 1.4 2001/08/22 07:42:08 itojun Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <sys/types.h>
-#undef htonl
-
-/*ARGSUSED*/
-uint32_t
-htonl(host32)
-	uint32_t host32;
-{
-	return (0);
-}
diff --git a/lib/libc/net/Lint_htons.c b/lib/libc/net/Lint_htons.c
deleted file mode 100644
index f0b06b292..000000000
--- a/lib/libc/net/Lint_htons.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_htons.c,v 1.4 2001/08/22 07:42:09 itojun Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <sys/types.h>
-#undef htons
-
-/*ARGSUSED*//*NOSTRICT*/
-uint16_t
-htons(host16)
-	uint16_t host16;
-{
-	return (0);
-}
diff --git a/lib/libc/net/Lint_ntohl.c b/lib/libc/net/Lint_ntohl.c
deleted file mode 100644
index c2be9e467..000000000
--- a/lib/libc/net/Lint_ntohl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_ntohl.c,v 1.4 2001/08/22 07:42:09 itojun Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <sys/types.h>
-#undef ntohl
-
-/*ARGSUSED*/
-uint32_t
-ntohl(net32)
-	uint32_t net32;
-{
-	return (0);
-}
diff --git a/lib/libc/net/Lint_ntohs.c b/lib/libc/net/Lint_ntohs.c
deleted file mode 100644
index 6841907e4..000000000
--- a/lib/libc/net/Lint_ntohs.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_ntohs.c,v 1.4 2001/08/22 07:42:09 itojun Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <sys/types.h>
-#undef ntohs
-
-/*ARGSUSED*//*NOSTRICT*/
-uint16_t
-ntohs(net16)
-	uint16_t net16;
-{
-	return (0);
-}
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
deleted file mode 100644
index fa29213c5..000000000
--- a/lib/libc/net/Makefile.inc
+++ /dev/null
@@ -1,146 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.86 2015/04/15 19:13:46 mrg Exp $
-#	@(#)Makefile.inc	8.2 (Berkeley) 9/5/93
-
-# net sources
-.PATH: ${ARCHDIR}/net ${.CURDIR}/net
-
-SRCS+=	base64.c ethers.c gethnamaddr.c getifaddrs.c \
-	getnetnamadr.c getnetent.c getpeereid.c \
-	getprotobyname.c getprotobynumber.c getprotoent.c \
-	getprotobyname_r.c getprotobynumber_r.c getprotoent_r.c \
-	getservbyname.c getservbyport.c getservent.c \
-	getservbyname_r.c getservbyport_r.c getservent_r.c \
-	iso_addr.c linkaddr.c \
-	nsdispatch.c nslexer.l nsparser.y nsap_addr.c \
-	rcmd.c recv.c send.c sethostent.c \
-	sockatmark.c
-
-.if (${MKHESIOD} != "no")
-SRCS+=	hesiod.c
-.endif
-
-SRCS+=	getaddrinfo.c getnameinfo.c
-.if (${USE_INET6} != "no")
-SRCS+=	ip6opt.c rthdr.c vars6.c inet6_scopeid.c
-.endif
-SRCS+=	if_indextoname.c if_nameindex.c if_nametoindex.c
-
-LPREFIX=_nsyy
-YPREFIX=_nsyy
-YHEADER=1
-
-CLEANFILES+=nsparser.c nslexer.c nsparser.h
-
-nslexer.c: nslexer.l nsparser.h
-	${_MKTARGET_LEX}
-	${LEX.l} -t ${.IMPSRC} | sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET}
-
-# machine-dependent net sources
-# m-d Makefile.inc must include sources for:
-#	htonl() htons() ntohl() ntohs()
-
-.include "${ARCHDIR}/net/Makefile.inc"
-
-MAN+=	byteorder.3 ethers.3 gethostbyname.3 getifaddrs.3 \
-	getnetent.3 getprotoent.3 getpeereid.3 \
-	getservent.3 inet.3 inet_net.3 linkaddr.3 \
-	nsdispatch.3 rcmd.3 resolver.3 sockatmark.3
-
-.if (${MKHESIOD} != "no")
-MAN+=	hesiod.3
-.endif
-
-MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \
-	byteorder.3 ntohs.3
-MLINKS+=ethers.3 ether_aton.3 ethers.3 ether_hostton.3 ethers.3 ether_line.3 \
-	ethers.3 ether_ntoa.3 ethers.3 ether_ntohost.3
-MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \
-	gethostbyname.3 gethostent.3 gethostbyname.3 sethostent.3 \
-	gethostbyname.3 herror.3 gethostbyname.3 hstrerror.3 \
-	gethostbyname.3 gethostbyname2.3
-MLINKS+=getnetent.3 endnetent.3 getnetent.3 getnetbyaddr.3 \
-	getnetent.3 getnetbyname.3 getnetent.3 setnetent.3
-MLINKS+=getprotoent.3 endprotoent.3 getprotoent.3 getprotobyname.3 \
-	getprotoent.3 getprotobynumber.3 getprotoent.3 setprotoent.3
-MLINKS+=getservent.3 endservent.3 getservent.3 getservbyname.3 \
-	getservent.3 getservbyport.3 getservent.3 setservent.3
-.if (${MKHESIOD} != "no")
-MLINKS+=hesiod.3 hesiod_end.3 hesiod.3 hesiod_free_list.3 \
-	hesiod.3 hesiod_init.3 hesiod.3 hesiod_resolve.3 \
-	hesiod.3 hesiod_to_bind.3
-.endif
-MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_aton.3 \
-	inet.3 inet_lnaof.3 inet.3 inet_makeaddr.3 inet.3 inet_netof.3 \
-	inet.3 inet_network.3 inet.3 inet_ntoa.3 inet.3 network.3 \
-	inet.3 ntoa.3 inet.3 inet_ntop.3 inet.3 inet_pton.3
-MLINKS+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.3
-MLINKS+=linkaddr.3 link_addr.3 linkaddr.3 link_ntoa.3 linkaddr.3 linkntoa.3
-MLINKS+=rcmd.3 iruserok.3 rcmd.3 rresvport.3 rcmd.3 ruserok.3 rcmd.3 orcmd.3
-MLINKS+=resolver.3 dn_comp.3 \
-	resolver.3 dn_expand.3 \
-	resolver.3 fp_nquery.3 \
-	resolver.3 fp_resstat.3 \
-	resolver.3 hostalias.3 \
-	resolver.3 p_query.3 \
-	resolver.3 res_close.3 \
-	resolver.3 res_findzonecut.3 \
-	resolver.3 res_getservers.3 \
-	resolver.3 res_hostalias.3 \
-	resolver.3 res_init.3 \
-	resolver.3 res_isourserver.3 \
-	resolver.3 res_mkquery.3 \
-	resolver.3 res_nclose.3 \
-	resolver.3 res_ndestroy.3 \
-	resolver.3 res_ninit.3 \
-	resolver.3 res_nmkquery.3 \
-	resolver.3 res_nmkupdate.3 \
-	resolver.3 res_nquery.3 \
-	resolver.3 res_nquerydomain.3 \
-	resolver.3 res_nsearch.3 \
-	resolver.3 res_nsend.3 \
-	resolver.3 res_nsendsigned.3 \
-	resolver.3 res_nupdate.3 \
-	resolver.3 res_ourserver_p.3 \
-	resolver.3 res_pquery.3 \
-	resolver.3 res_query.3 \
-	resolver.3 res_querydomain.3 \
-	resolver.3 res_search.3 \
-	resolver.3 res_send.3 \
-	resolver.3 res_setservers.3 \
-	resolver.3 res_update.3
-
-# IPv6
-MAN+=	gai_strerror.3 getaddrinfo.3 getnameinfo.3 if_indextoname.3 \
-	inet6_option_space.3 inet6_rthdr_space.3 \
-	inet6_opt_init.3 inet6_rth_space.3 inet6_getscopeid.3
-MLINKS+=getaddrinfo.3 freeaddrinfo.3 \
-	getaddrinfo.3 allocaddrinfo.3 \
-	getifaddrs.3 freeifaddrs.3 \
-	if_indextoname.3 if_nametoindex.3 if_indextoname.3 if_nameindex.3 \
-	if_indextoname.3 if_freenameindex.3 \
-	inet6_getscopeid.3 inet6_putscopeid.3 \
-	inet6_option_space.3 inet6_option_init.3 \
-	inet6_option_space.3 inet6_option_append.3 \
-	inet6_option_space.3 inet6_option_alloc.3 \
-	inet6_option_space.3 inet6_option_next.3 \
-	inet6_option_space.3 inet6_option_find.3 \
-	inet6_rthdr_space.3 inet6_rthdr_init.3 \
-	inet6_rthdr_space.3 inet6_rthdr_add.3 \
-	inet6_rthdr_space.3 inet6_rthdr_lasthop.3 \
-	inet6_rthdr_space.3 inet6_rthdr_reverse.3 \
-	inet6_rthdr_space.3 inet6_rthdr_segments.3 \
-	inet6_rthdr_space.3 inet6_rthdr_getaddr.3 \
-	inet6_rthdr_space.3 inet6_rthdr_getflags.3 \
-	inet6_opt_init.3 inet6_opt_append.3 \
-	inet6_opt_init.3 inet6_opt_finish.3 \
-	inet6_opt_init.3 inet6_opt_set_val.3 \
-	inet6_opt_init.3 inet6_opt_next.3 \
-	inet6_opt_init.3 inet6_opt_find.3 \
-	inet6_opt_init.3 inet6_opt_get_val.3 \
-	inet6_rth_space.3 inet6_rth_init.3 \
-	inet6_rth_space.3 inet6_rth_add.3 \
-	inet6_rth_space.3 inet6_rth_reverse.3 \
-	inet6_rth_space.3 inet6_rth_segments.3 \
-	inet6_rth_space.3 inet6_rth_getaddr.3 \
-	rcmd.3 rcmd_af.3 rcmd.3 iruserok_sa.3 rcmd.3 rresvport_af.3 \
-	rcmd.3 orcmd_af.3
diff --git a/lib/libc/net/base64.c b/lib/libc/net/base64.c
deleted file mode 100644
index 053cfd17c..000000000
--- a/lib/libc/net/base64.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/*	$NetBSD: base64.c,v 1.16 2014/11/24 15:43:21 christos Exp $	*/
-
-/*
- * 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.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static const char rcsid[] = "Id: base64.c,v 1.4 2005/04/27 04:56:34 sra Exp";
-#else
-__RCSID("$NetBSD: base64.c,v 1.16 2014/11/24 15:43:21 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "port_after.h"
-
-#define Assert(Cond) if (!(Cond)) abort()
-
-static const char Base64[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static const char Pad64 = '=';
-
-/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-   The following encoding technique is taken from RFC1521 by Borenstein
-   and Freed.  It is reproduced here in a slightly edited form for
-   convenience.
-
-   A 65-character subset of US-ASCII is used, enabling 6 bits to be
-   represented per printable character. (The extra 65th character, "=",
-   is used to signify a special processing function.)
-
-   The encoding process represents 24-bit groups of input bits as output
-   strings of 4 encoded characters. Proceeding from left to right, a
-   24-bit input group is formed by concatenating 3 8-bit input groups.
-   These 24 bits are then treated as 4 concatenated 6-bit groups, each
-   of which is translated into a single digit in the base64 alphabet.
-
-   Each 6-bit group is used as an index into an array of 64 printable
-   characters. The character referenced by the index is placed in the
-   output string.
-
-                         Table 1: The Base64 Alphabet
-
-      Value Encoding  Value Encoding  Value Encoding  Value Encoding
-          0 A            17 R            34 i            51 z
-          1 B            18 S            35 j            52 0
-          2 C            19 T            36 k            53 1
-          3 D            20 U            37 l            54 2
-          4 E            21 V            38 m            55 3
-          5 F            22 W            39 n            56 4
-          6 G            23 X            40 o            57 5
-          7 H            24 Y            41 p            58 6
-          8 I            25 Z            42 q            59 7
-          9 J            26 a            43 r            60 8
-         10 K            27 b            44 s            61 9
-         11 L            28 c            45 t            62 +
-         12 M            29 d            46 u            63 /
-         13 N            30 e            47 v
-         14 O            31 f            48 w         (pad) =
-         15 P            32 g            49 x
-         16 Q            33 h            50 y
-
-   Special processing is performed if fewer than 24 bits are available
-   at the end of the data being encoded.  A full encoding quantum is
-   always completed at the end of a quantity.  When fewer than 24 input
-   bits are available in an input group, zero bits are added (on the
-   right) to form an integral number of 6-bit groups.  Padding at the
-   end of the data is performed using the '=' character.
-
-   Since all base64 input is an integral number of octets, only the
-         -------------------------------------------------                       
-   following cases can arise:
-   
-       (1) the final quantum of encoding input is an integral
-           multiple of 24 bits; here, the final unit of encoded
-	   output will be an integral multiple of 4 characters
-	   with no "=" padding,
-       (2) the final quantum of encoding input is exactly 8 bits;
-           here, the final unit of encoded output will be two
-	   characters followed by two "=" padding characters, or
-       (3) the final quantum of encoding input is exactly 16 bits;
-           here, the final unit of encoded output will be three
-	   characters followed by one "=" padding character.
-   */
-
-int
-b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) {
-	size_t datalength = 0;
-	u_char input[3];
-	u_char output[4];
-	size_t i;
-
-	_DIAGASSERT(src != NULL);
-	_DIAGASSERT(target != NULL);
-
-	while (2U < srclength) {
-		input[0] = *src++;
-		input[1] = *src++;
-		input[2] = *src++;
-		srclength -= 3;
-
-		output[0] = (uint32_t)input[0] >> 2;
-		output[1] = ((uint32_t)(input[0] & 0x03) << 4) +
-		    ((uint32_t)input[1] >> 4);
-		output[2] = ((uint32_t)(input[1] & 0x0f) << 2) +
-		    ((uint32_t)input[2] >> 6);
-		output[3] = input[2] & 0x3f;
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-		Assert(output[3] < 64);
-
-		if (datalength + 4 > targsize)
-			return -1;
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		target[datalength++] = Base64[output[2]];
-		target[datalength++] = Base64[output[3]];
-	}
-    
-	/* Now we worry about padding. */
-	if (0U != srclength) {
-		/* Get what's left. */
-		input[0] = input[1] = input[2] = '\0';
-		for (i = 0; i < srclength; i++)
-			input[i] = *src++;
-	
-		output[0] = (uint32_t)input[0] >> 2;
-		output[1] = ((uint32_t)(input[0] & 0x03) << 4) +
-		    ((uint32_t)input[1] >> 4);
-		output[2] = ((uint32_t)(input[1] & 0x0f) << 2) +
-		    ((uint32_t)input[2] >> 6);
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-
-		if (datalength + 4 > targsize)
-			return -1;
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		if (srclength == 1U)
-			target[datalength++] = Pad64;
-		else
-			target[datalength++] = Base64[output[2]];
-		target[datalength++] = Pad64;
-	}
-	if (datalength >= targsize)
-		return -1;
-	target[datalength] = '\0';	/*%< Returned value doesn't count \\0. */
-	_DIAGASSERT(__type_fit(int, datalength));
-	return (int)datalength;
-}
-
-/* skips all whitespace anywhere.
-   converts characters, four at a time, starting at (or after)
-   src from base - 64 numbers into three 8 bit bytes in the target area.
-   it returns the number of data bytes stored at the target, or -1 on error.
- */
-
-int
-b64_pton(char const *src, u_char *target, size_t targsize)
-{
-	size_t tarindex;
-	int state, ch;
-	u_char nextbyte;
-	char *pos;
-
-	_DIAGASSERT(src != NULL);
-	_DIAGASSERT(target != NULL);
-
-	state = 0;
-	tarindex = 0;
-
-	while ((ch = (u_char) *src++) != '\0') {
-		if (isspace(ch))	/*%< Skip whitespace anywhere. */
-			continue;
-
-		if (ch == Pad64)
-			break;
-
-		pos = strchr(Base64, ch);
-		if (pos == NULL) 	/*%< A non-base64 character. */
-			return -1;
-
-		switch (state) {
-		case 0:
-			if (target) {
-				if (tarindex >= targsize)
-					return -1;
-				target[tarindex] = (u_char)(pos - Base64) << 2;
-			}
-			state = 1;
-			break;
-		case 1:
-			if (target) {
-				if (tarindex >= targsize)
-					return -1;
-				target[tarindex] |= 
-				    (uint32_t)(pos - Base64) >> 4;
-				nextbyte = (u_char)((pos - Base64) & 0x0f) << 4;
-				if (tarindex + 1 < targsize)
-					target[tarindex + 1] = nextbyte;
-				else if (nextbyte)
-					return -1;
-			}
-			tarindex++;
-			state = 2;
-			break;
-		case 2:
-			if (target) {
-				if (tarindex >= targsize)
-					return -1;
-				target[tarindex] |= 
-					(uint32_t)(pos - Base64) >> 2;
-				nextbyte = (u_char)((pos - Base64) & 0x03) << 6;
-				if (tarindex + 1 < targsize)
-					target[tarindex + 1] = nextbyte;
-				else if (nextbyte)
-					return -1;
-			}
-			tarindex++;
-			state = 3;
-			break;
-		case 3:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return -1;
-				target[tarindex] |= (u_char)(pos - Base64);
-			}
-			tarindex++;
-			state = 0;
-			break;
-		default:
-			abort();
-		}
-	}
-
-	/*
-	 * We are done decoding Base-64 chars.  Let's see if we ended
-	 * on a byte boundary, and/or with erroneous trailing characters.
-	 */
-
-	if (ch == Pad64) {		/*%< We got a pad char. */
-		ch = *src++;		/*%< Skip it, get next. */
-		switch (state) {
-		case 0:		/*%< Invalid = in first position */
-		case 1:		/*%< Invalid = in second position */
-			return -1;
-
-		case 2:		/*%< Valid, means one byte of info */
-			/* Skip any number of spaces. */
-			for (; ch != '\0'; ch = (u_char) *src++)
-				if (!isspace(ch))
-					break;
-			/* Make sure there is another trailing = sign. */
-			if (ch != Pad64)
-				return -1;
-			ch = *src++;		/*%< Skip the = */
-			/* Fall through to "single trailing =" case. */
-			/* FALLTHROUGH */
-
-		case 3:		/*%< Valid, means two bytes of info */
-			/*
-			 * We know this char is an =.  Is there anything but
-			 * whitespace after it?
-			 */
-			for (; ch != '\0'; ch = (u_char) *src++)
-				if (!isspace(ch))
-					return -1;
-
-			/*
-			 * Now make sure for cases 2 and 3 that the "extra"
-			 * bits that slopped past the last full byte were
-			 * zeros.  If we don't check them, they become a
-			 * subliminal channel.
-			 */
-			if (target && tarindex < targsize &&
-			    target[tarindex] != 0)
-				return -1;
-		}
-	} else {
-		/*
-		 * We ended by seeing the end of the string.  Make sure we
-		 * have no partial bytes lying around.
-		 */
-		if (state != 0)
-			return -1;
-	}
-
-	_DIAGASSERT(__type_fit(int, tarindex));
-	return (int)tarindex;
-}
-
-/*! \file */
diff --git a/lib/libc/net/byteorder.3 b/lib/libc/net/byteorder.3
deleted file mode 100644
index 68502eb96..000000000
--- a/lib/libc/net/byteorder.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\"	$NetBSD: byteorder.3,v 1.15 2011/05/03 04:07:39 jruoho Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)byteorder.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd May 3, 2011
-.Dt BYTEORDER 3
-.Os
-.Sh NAME
-.Nm htonl ,
-.Nm htons ,
-.Nm ntohl ,
-.Nm ntohs
-.Nd convert values between host and network byte order
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In arpa/inet.h
-.Ft uint32_t
-.Fn htonl "uint32_t host32"
-.Ft uint16_t
-.Fn htons "uint16_t host16"
-.Ft uint32_t
-.Fn ntohl "uint32_t net32"
-.Ft uint16_t
-.Fn ntohs "uint16_t net16"
-.Sh DESCRIPTION
-These routines convert 16 and 32 bit quantities between network
-byte order and host byte order.
-.Pp
-On machines which have a byte order which is the same as the network
-order, these routines are defined as macros that expand to the value of
-their argument.
-.Pp
-These routines are most often used in conjunction with Internet
-addresses and ports as returned by
-.Xr gethostbyname 3
-and
-.Xr getservent 3 .
-.Sh SEE ALSO
-.Xr bswap 3 ,
-.Xr gethostbyname 3 ,
-.Xr getservent 3
-.Sh STANDARDS
-The described functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Nm byteorder
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-The `l' and `s' suffixes in the names are not meaningful in machines
-where long integers are not 32 bits.
diff --git a/lib/libc/net/ethers.3 b/lib/libc/net/ethers.3
deleted file mode 100644
index 212ed1fde..000000000
--- a/lib/libc/net/ethers.3
+++ /dev/null
@@ -1,120 +0,0 @@
-.\"	$NetBSD: ethers.3,v 1.13 2003/04/16 13:34:41 wiz Exp $
-.\"
-.\" Written by roland@frob.com.  Public domain.
-.\"
-.Dd November 2, 1997
-.Dt ETHERS 3
-.Os
-.Sh NAME
-.Nm ether_ntoa ,
-.Nm ether_aton ,
-.Nm ether_ntohost ,
-.Nm ether_hostton ,
-.Nm ether_line ,
-.Nd get ethers entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In net/if.h
-.In net/if_ether.h
-.Ft char *
-.Fn ether_ntoa "const struct ether_addr *e"
-.Ft struct ether_addr *
-.Fn ether_aton "const char *s"
-.Ft int
-.Fn ether_ntohost "char *hostname" "const struct ether_addr *e"
-.Ft int
-.Fn ether_hostton "const char *hostname" "struct ether_addr *e"
-.Ft int
-.Fn ether_line "const char *line" "struct ether_addr *e" "char *hostname"
-.Sh DESCRIPTION
-Ethernet addresses are represented by the
-following structure:
-.Bd -literal -offset indent
-struct ether_addr {
-        u_char  ether_addr_octet[6];
-};
-.Ed
-.Pp
-The
-.Fn ether_ntoa
-function converts this structure into an ASCII string of the form
-``xx:xx:xx:xx:xx:xx'', consisting of 6 hexadecimal numbers separated
-by colons.  It returns a pointer to a static buffer that is reused for
-each call.
-The
-.Fn ether_aton
-converts an ASCII string of the same form and to a structure
-containing the 6 octets of the address.  It returns a pointer to a
-static structure that is reused for each call.
-.Pp
-The
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions interrogate the data base mapping host names to Ethernet
-addresses,
-.Pa /etc/ethers .
-The
-.Fn ether_ntohost
-function looks up the given Ethernet address and writes the associated
-host name into the character buffer passed.
-The
-.Fn ether_hostton
-function looks up the given host name and writes the associated
-Ethernet address into the structure passed.  Both functions return
-zero if they find the requested host name or address, and -1 if not.
-Each call reads
-.Pa /etc/ethers
-from the beginning; if a + appears alone on a line in the file, then
-.Fn ether_hostton
-will consult the
-.Pa ethers.byname
-YP map, and
-.Fn ether_ntohost
-will consult the
-.Pa ethers.byaddr
-YP map.
-.Pp
-The
-.Fn ether_line
-function parses a line from the
-.Pa /etc/ethers
-file and fills in the passed ``struct ether_addr'' and character
-buffer with the Ethernet address and host name on the line.  It
-returns zero if the line was successfully parsed and -1 if not.
-.Pp
-The
-.Fa hostname
-buffer for
-.Fn ether_line
-and
-.Fn ether_ntohost
-should be at least
-.Dv MAXHOSTNAMELEN
-+ 1
-characters long, to prevent a buffer overflow during parsing.
-.Sh FILES
-.Bl -tag -width /etc/ethers -compact
-.It Pa /etc/ethers
-.El
-.Sh SEE ALSO
-.Xr ethers 5
-.Sh HISTORY
-The
-.Fn ether_ntoa ,
-.Fn ether_aton ,
-.Fn ether_ntohost ,
-.Fn ether_hostton ,
-and
-.Fn ether_line
-functions were adopted from
-.Tn SunOS
-and appeared in
-.Nx 1.0 .
-.Sh BUGS
-The data space used by these functions is static; if future use
-requires the data, it should be copied before any subsequent calls to
-these functions overwrite it.
diff --git a/lib/libc/net/ethers.c b/lib/libc/net/ethers.c
deleted file mode 100644
index 3cafbde36..000000000
--- a/lib/libc/net/ethers.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*	$NetBSD: ethers.c,v 1.25 2014/09/18 13:58:20 christos Exp $	*/
-
-/* 
- * ethers(3N) a la Sun.
- *
- * Written by Roland McGrath <roland@frob.com> 10/14/93.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ethers.c,v 1.25 2014/09/18 13:58:20 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <net/if_ether.h>
-#include <netinet/in.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef YP
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#ifdef __weak_alias
-__weak_alias(ether_aton,_ether_aton)
-__weak_alias(ether_hostton,_ether_hostton)
-__weak_alias(ether_line,_ether_line)
-__weak_alias(ether_ntoa,_ether_ntoa)
-__weak_alias(ether_ntohost,_ether_ntohost)
-#endif
-
-#ifndef _PATH_ETHERS
-#define _PATH_ETHERS "/etc/ethers"
-#endif
-
-char *
-ether_ntoa(const struct ether_addr *e)
-{
-	static char a[18];
-
-	_DIAGASSERT(e != NULL);
-
-	(void) snprintf(a, sizeof a, "%02x:%02x:%02x:%02x:%02x:%02x",
-	    e->ether_addr_octet[0], e->ether_addr_octet[1],
-	    e->ether_addr_octet[2], e->ether_addr_octet[3],
-	    e->ether_addr_octet[4], e->ether_addr_octet[5]);
-	return a;
-}
-
-struct ether_addr *
-ether_aton(const char *s)
-{
-	static struct ether_addr n;
-	u_int i[6];
-
-	_DIAGASSERT(s != NULL);
-
-	if (sscanf(s, " %x:%x:%x:%x:%x:%x ", &i[0], &i[1],
-	    &i[2], &i[3], &i[4], &i[5]) == 6) {
-		n.ether_addr_octet[0] = (u_char)i[0];
-		n.ether_addr_octet[1] = (u_char)i[1];
-		n.ether_addr_octet[2] = (u_char)i[2];
-		n.ether_addr_octet[3] = (u_char)i[3];
-		n.ether_addr_octet[4] = (u_char)i[4];
-		n.ether_addr_octet[5] = (u_char)i[5];
-		return &n;
-	}
-	return NULL;
-}
-
-int
-ether_ntohost(char *hostname, const struct ether_addr *e)
-{
-	FILE *f; 
-	char *p;
-	struct ether_addr try;
-
-	_DIAGASSERT(hostname != NULL);
-	_DIAGASSERT(e != NULL);
-
-#ifdef YP
-	char trybuf[sizeof "xx:xx:xx:xx:xx:xx"];
-	int trylen;
-	trylen = snprintf(trybuf, sizeof trybuf, "%x:%x:%x:%x:%x:%x", 
-	    e->ether_addr_octet[0], e->ether_addr_octet[1],
-	    e->ether_addr_octet[2], e->ether_addr_octet[3],
-	    e->ether_addr_octet[4], e->ether_addr_octet[5]);
-#endif
-
-	f = fopen(_PATH_ETHERS, "re");
-	if (f == NULL)
-		return -1;
-	for (p = NULL;;) {
-		free(p);
-		p = fparseln(f, NULL, NULL, NULL, FPARSELN_UNESCALL);
-		if (p == NULL)
-			break;
-#ifdef YP
-		/* A + in the file means try YP now.  */
-		if (strcmp(p, "+") == 0) {
-			char *ypbuf, *ypdom;
-			int ypbuflen;
-
-			if (yp_get_default_domain(&ypdom))
-				continue;
-			if (yp_match(ypdom, "ethers.byaddr", trybuf,
-			    trylen, &ypbuf, &ypbuflen))
-				continue;
-			ypbuflen = ether_line(ypbuf, &try, hostname);
-			free(ypbuf);
-			if (ypbuflen == 0)
-				goto done;
-			continue;
-		}
-#endif
-		if (ether_line(p, &try, hostname) == 0 &&
-		    memcmp(&try, e, sizeof try) == 0)
-			goto done;
-	}
-	free(p);
-	(void)fclose(f);
-	errno = ENOENT;
-	return -1;
-done:
-	free(p);
-	(void)fclose(f);
-	return 0;
-}
-
-int
-ether_hostton(const char *hostname, struct ether_addr *e)
-{
-	FILE *f;
-	char *p;
-	char try[MAXHOSTNAMELEN + 1];
-#ifdef YP
-	int hostlen = (int)strlen(hostname);
-#endif
-
-	_DIAGASSERT(hostname != NULL);
-	_DIAGASSERT(e != NULL);
-
-	f = fopen(_PATH_ETHERS, "re");
-	if (f == NULL)
-		return -1;
-
-	for (p = NULL;;) {
-		free(p);
-		p = fparseln(f, NULL, NULL, NULL, FPARSELN_UNESCALL);
-		if (p == NULL)
-			break;
-#ifdef YP
-		/* A + in the file means try YP now.  */
-		if (strcmp(p, "+") == 0) {
-			char *ypbuf, *ypdom;
-			int ypbuflen;
-
-			if (yp_get_default_domain(&ypdom))
-				continue;
-			if (yp_match(ypdom, "ethers.byname", hostname, hostlen,
-			    &ypbuf, &ypbuflen))
-				continue;
-			ypbuflen = ether_line(ypbuf, e, try);
-			free(ypbuf);
-			if (ypbuflen == 0)
-				goto done;
-			continue;
-		}
-#endif
-		if (ether_line(p, e, try) == 0 && strcmp(hostname, try) == 0)
-			goto done;
-	}
-	free(p);
-	(void)fclose(f);
-	errno = ENOENT;
-	return -1;
-done:
-	free(p);
-	(void)fclose(f);
-	return 0;
-}
-
-int
-ether_line(const char *l, struct ether_addr *e, char *hostname)
-{
-	u_int i[6];
-
-#define S2(arg) #arg
-#define S1(arg) S2(arg)
-	static const char fmt[] = " %x:%x:%x:%x:%x:%x"
-	    " %" S1(MAXHOSTNAMELEN) "s\n";
-#undef S2
-#undef S1
-	
-	_DIAGASSERT(l != NULL);
-	_DIAGASSERT(e != NULL);
-	_DIAGASSERT(hostname != NULL);
-
-	if (sscanf(l, fmt,
-	    &i[0], &i[1], &i[2], &i[3], &i[4], &i[5], hostname) == 7) {
-		e->ether_addr_octet[0] = (u_char)i[0];
-		e->ether_addr_octet[1] = (u_char)i[1];
-		e->ether_addr_octet[2] = (u_char)i[2];
-		e->ether_addr_octet[3] = (u_char)i[3];
-		e->ether_addr_octet[4] = (u_char)i[4];
-		e->ether_addr_octet[5] = (u_char)i[5];
-		return 0;
-	}
-	errno = EINVAL;
-	return -1;
-}
diff --git a/lib/libc/net/gai_strerror.3 b/lib/libc/net/gai_strerror.3
deleted file mode 100644
index d3e905935..000000000
--- a/lib/libc/net/gai_strerror.3
+++ /dev/null
@@ -1,96 +0,0 @@
-.\"	$NetBSD: gai_strerror.3,v 1.5 2010/03/22 19:30:54 joerg Exp $
-.\"	$KAME: gai_strerror.3,v 1.1 2005/01/05 03:04:47 itojun Exp $
-.\"	$OpenBSD: gai_strerror.3,v 1.4 2004/12/20 23:04:53 millert Exp $
-.\"
-.\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) 2000, 2001  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.
-.\"
-.Dd February 22, 2006
-.Dt GAI_STRERROR 3
-.Os
-.Sh NAME
-.Nm gai_strerror
-.Nd get error message string from EAI_xxx error code
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netdb.h
-.Ft const char *
-.Fn gai_strerror "int ecode"
-.Sh DESCRIPTION
-The
-.Fn gai_strerror
-function returns an error message string corresponding to the error code
-returned by
-.Xr getaddrinfo 3
-or
-.Xr getnameinfo 3 .
-.Pp
-The following error codes and their meaning are defined in
-.In netdb.h :
-.Pp
-.Bl -tag -width "EAI_ADDRFAMILYXX" -offset indent -compact
-.It Dv EAI_ADDRFAMILY
-address family for
-.Fa hostname
-not supported
-.It Dv EAI_AGAIN
-temporary failure in name resolution
-.It Dv EAI_BADFLAGS
-invalid value for
-.Fa ai_flags
-.It Dv EAI_BADHINTS
-invalid value for
-.Fa hints
-.It Dv EAI_FAIL
-non-recoverable failure in name resolution
-.It Dv EAI_FAMILY
-.Fa ai_family
-not supported.
-.It Dv EAI_MEMORY
-memory allocation failure
-.It Dv EAI_NODATA
-no address associated with
-.Fa hostname
-.It Dv EAI_NONAME
-.Fa hostname
-or
-.Fa servname
-not provided, or not known
-.It Dv EAI_OVERFLOW
-argument buffer overflow
-.It Dv EAI_PROTOCOL
-resolved protocol is unknown
-.It Dv EAI_SERVICE
-.Fa servname
-not supported for
-.Fa ai_socktype
-.It Dv EAI_SOCKTYPE
-.Fa ai_socktype
-not supported
-.It Dv EAI_SYSTEM
-system error returned in
-.Va errno
-.El
-.Sh RETURN VALUES
-.Fn gai_strerror
-returns a pointer to the error message string corresponding to
-.Fa ecode .
-If
-.Fa ecode
-is out of range, an implementation-specific error message string is returned.
-.Sh SEE ALSO
-.Xr getaddrinfo 3 ,
-.Xr getnameinfo 3
diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
deleted file mode 100644
index 384d6810b..000000000
--- a/lib/libc/net/getaddrinfo.3
+++ /dev/null
@@ -1,491 +0,0 @@
-.\"	$NetBSD: getaddrinfo.3,v 1.57 2013/05/03 21:13:34 wiz Exp $
-.\"	$KAME: getaddrinfo.3,v 1.36 2005/01/05 03:23:05 itojun Exp $
-.\"	$OpenBSD: getaddrinfo.3,v 1.35 2004/12/21 03:40:31 jaredy Exp $
-.\"
-.\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) 2000, 2001  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.
-.\"
-.Dd April 30, 2013
-.Dt GETADDRINFO 3
-.Os
-.Sh NAME
-.Nm getaddrinfo ,
-.Nm freeaddrinfo ,
-.Nm allocaddrinfo
-.Nd host and service name to socket address structure
-.Sh SYNOPSIS
-.In netdb.h
-.Ft int
-.Fn getaddrinfo "const char * restrict hostname" \
-    "const char * restrict servname" \
-    "const struct addrinfo * restrict hints" "struct addrinfo ** restrict res"
-.Ft void
-.Fn freeaddrinfo "struct addrinfo *ai"
-.Ft struct addrinfo *
-.Fn allocaddrinfo "socklen_t len"
-.Sh DESCRIPTION
-The
-.Fn getaddrinfo
-function is used to get a list of
-.Tn IP
-addresses and port numbers for host
-.Fa hostname
-and service
-.Fa servname .
-It is a replacement for and provides more flexibility than the
-.Xr gethostbyname 3
-and
-.Xr getservbyname 3
-functions.
-.Pp
-The
-.Fa hostname
-and
-.Fa servname
-arguments are either pointers to NUL-terminated strings or the null pointer.
-An acceptable value for
-.Fa hostname
-is either a valid host name or a numeric host address string consisting
-of a dotted decimal IPv4 address or an IPv6 address.
-The
-.Fa servname
-is either a decimal port number or a service name listed in
-.Xr services 5 .
-At least one of
-.Fa hostname
-and
-.Fa servname
-must be non-null.
-.Pp
-.Fa hints
-is an optional pointer to a
-.Li struct addrinfo ,
-as defined by
-.In netdb.h :
-.Bd -literal
-struct addrinfo {
-	int ai_flags;		/* input flags */
-	int ai_family;		/* address family for socket */
-	int ai_socktype;	/* socket type */
-	int ai_protocol;	/* protocol for socket */
-	socklen_t ai_addrlen;	/* length of socket-address */
-	struct sockaddr *ai_addr; /* socket-address for socket */
-	char *ai_canonname;	/* canonical name for service location */
-	struct addrinfo *ai_next; /* pointer to next in list */
-};
-.Ed
-.Pp
-This structure can be used to provide hints concerning the type of socket
-that the caller supports or wishes to use.
-The caller can supply the following structure elements in
-.Fa hints :
-.Bl -tag -width "ai_socktypeXX"
-.It Fa ai_family
-The address
-.Pq and protocol
-family that should be used.
-When
-.Fa ai_family
-is set to
-.Dv AF_UNSPEC ,
-it means the caller will accept any address family supported by the
-operating system.
-Note that while address families
-.Pq Dv AF_*
-and protocol families
-.Pq Dv PF_*
-are theoretically distinct, in practice the distinction has been lost.
-.\" (.Dv !? Consistent with usage below though...)
-.Dv "RFC 3493"
-defines
-.Fn getaddrinfo
-in terms of the address family constants
-.Dv AF_*
-even though
-.Fa ai_family
-is to be passed as a protocol family to
-.Xr socket 2 .
-.It Fa ai_socktype
-Denotes the type of socket that is wanted:
-.Dv SOCK_STREAM ,
-.Dv SOCK_DGRAM ,
-or
-.Dv SOCK_RAW .
-When
-.Fa ai_socktype
-is zero the caller will accept any socket type.
-.It Fa ai_protocol
-Indicates which transport protocol is desired,
-.Dv IPPROTO_UDP
-or
-.Dv IPPROTO_TCP .
-If
-.Fa ai_protocol
-is zero the caller will accept any protocol.
-.It Fa ai_flags
-.Fa ai_flags
-is formed by
-.Tn OR Ns 'ing
-the following values:
-.Bl -tag -width "AI_CANONNAMEXX"
-.It Dv AI_CANONNAME
-If the
-.Dv AI_CANONNAME
-bit is set, a successful call to
-.Fn getaddrinfo
-will return a NUL-terminated string containing the canonical name
-of the specified hostname in the
-.Fa ai_canonname
-element of the first
-.Li addrinfo
-structure returned.
-.It Dv AI_NUMERICHOST
-If the
-.Dv AI_NUMERICHOST
-bit is set, it indicates that
-.Fa hostname
-should be treated as a numeric string defining an IPv4 or IPv6 address
-and no name resolution should be attempted.
-.It Dv AI_NUMERICSERV
-If the
-.Dv AI_NUMERICSERV
-bit is set, it indicates that the
-.Fa servname
-string contains a numeric port number.
-This is used to prevent service name resolution.
-.It Dv AI_PASSIVE
-If the
-.Dv AI_PASSIVE
-bit is set it indicates that the returned socket address structure
-is intended for use in a call to
-.Xr bind 2 .
-In this case, if the
-.Fa hostname
-argument is the null pointer, then the IP address portion of the
-socket address structure will be set to
-.Dv INADDR_ANY
-for an IPv4 address or
-.Dv IN6ADDR_ANY_INIT
-for an IPv6 address.
-.Pp
-If the
-.Dv AI_PASSIVE
-bit is not set, the returned socket address structure will be ready
-for use in a call to
-.Xr connect 2
-for a connection-oriented protocol or
-.Xr connect 2 ,
-.Xr sendto 2 ,
-or
-.Xr sendmsg 2
-if a connectionless protocol was chosen.
-The
-.Tn IP
-address portion of the socket address structure will be set to the
-loopback address if
-.Fa hostname
-is the null pointer and
-.Dv AI_PASSIVE
-is not set.
-.It Dv AI_SRV
-Perform SRV (RFC 2782) record lookups first.
-This is a non-portable extension.
-.El
-.El
-.Pp
-All other elements of the
-.Li addrinfo
-structure passed via
-.Fa hints
-must be zero or the null pointer.
-.Pp
-If
-.Fa hints
-is the null pointer,
-.Fn getaddrinfo
-behaves as if the caller provided a
-.Li struct addrinfo
-with
-.Fa ai_family
-set to
-.Dv AF_UNSPEC
-and all other elements set to zero or
-.Dv NULL .
-.Pp
-After a successful call to
-.Fn getaddrinfo ,
-.Fa *res
-is a pointer to a linked list of one or more
-.Li addrinfo
-structures.
-The list can be traversed by following the
-.Fa ai_next
-pointer in each
-.Li addrinfo
-structure until a null pointer is encountered.
-The three members
-.Fa ai_family ,
-.Fa ai_socktype ,
-and
-.Fa ai_protocol
-in each returned
-.Li addrinfo
-structure are suitable for a call to
-.Xr socket 2 .
-For each
-.Li addrinfo
-structure in the list, the
-.Fa ai_addr
-member points to a filled-in socket address structure of length
-.Fa ai_addrlen .
-.Pp
-This implementation of
-.Fn getaddrinfo
-allows numeric IPv6 address notation with scope identifier,
-as documented in chapter 11 of draft-ietf-ipv6-scoping-arch-02.txt.
-By appending the percent character and scope identifier to addresses,
-one can fill the
-.Li sin6_scope_id
-field for addresses.
-This would make management of scoped addresses easier
-and allows cut-and-paste input of scoped addresses.
-.Pp
-At this moment the code supports only link-local addresses with the format.
-The scope identifier is hardcoded to the name of the hardware interface
-associated
-with the link
-.Po
-such as
-.Li ne0
-.Pc .
-An example is
-.Dq Li fe80::1%ne0 ,
-which means
-.Do
-.Li fe80::1
-on the link associated with the
-.Li ne0
-interface
-.Dc .
-.Pp
-The current implementation assumes a one-to-one relationship between
-the interface and link, which is not necessarily true from the specification.
-.Pp
-All of the information returned by
-.Fn getaddrinfo
-is dynamically allocated: the
-.Li addrinfo
-structures themselves as well as the socket address structures and
-the canonical host name strings included in the
-.Li addrinfo
-structures.
-.Pp
-Memory allocated for the dynamically allocated structures created by
-a successful call to
-.Fn getaddrinfo
-is released by the
-.Fn freeaddrinfo
-function.
-The
-.Fa ai
-pointer should be an
-.Li addrinfo
-structure created by a call to
-.Fn getaddrinfo
-or
-.Fn allocaddrinfo .
-The
-.Fn allocaddrinfo
-function is intended primarily for authors of
-.Xr nsdispatch 3
-plugins implementing
-.Fn getaddrinfo
-backends.
-.Fn allocaddrinfo
-allocates a
-.Li struct addrinfo
-in a way that is compatible with being returned from
-.Fn getaddrinfo
-and being ultimately freed by
-.Fn freeaddrinfo .
-The returned structure is zeroed, except for the
-.Fa ai_addr
-field, which
-will point to
-.Fa len
-bytes of memory for storage of a socket address.
-It is safe to allocate memory separately for
-.Fa ai_canonname
-with
-.Xr malloc 3 ,
-or in any other way that is compatible with deallocation by
-.Xr free 3 .
-.Sh RETURN VALUES
-.Fn getaddrinfo
-returns zero on success or one of the error codes listed in
-.Xr gai_strerror 3
-if an error occurs.
-.Sh EXAMPLES
-The following code tries to connect to
-.Dq Li www.kame.net
-service
-.Dq Li http
-via a stream socket.
-It loops through all the addresses available, regardless of address family.
-If the destination resolves to an IPv4 address, it will use an
-.Dv AF_INET
-socket.
-Similarly, if it resolves to IPv6, an
-.Dv AF_INET6
-socket is used.
-Observe that there is no hardcoded reference to a particular address family.
-The code works even if
-.Fn getaddrinfo
-returns addresses that are not IPv4/v6.
-.Bd -literal -offset indent
-struct addrinfo hints, *res, *res0;
-int error;
-int s;
-const char *cause = NULL;
-
-memset(\*[Am]hints, 0, sizeof(hints));
-hints.ai_family = AF_UNSPEC;
-hints.ai_socktype = SOCK_STREAM;
-error = getaddrinfo("www.kame.net", "http", \*[Am]hints, \*[Am]res0);
-if (error) {
-	errx(1, "%s", gai_strerror(error));
-	/*NOTREACHED*/
-}
-s = -1;
-for (res = res0; res; res = res-\*[Gt]ai_next) {
-	s = socket(res-\*[Gt]ai_family, res-\*[Gt]ai_socktype,
-	    res-\*[Gt]ai_protocol);
-	if (s \*[Lt] 0) {
-		cause = "socket";
-		continue;
-	}
-
-	if (connect(s, res-\*[Gt]ai_addr, res-\*[Gt]ai_addrlen) \*[Lt] 0) {
-		cause = "connect";
-		close(s);
-		s = -1;
-		continue;
-	}
-
-	break;	/* okay we got one */
-}
-if (s \*[Lt] 0) {
-	err(1, "%s", cause);
-	/*NOTREACHED*/
-}
-freeaddrinfo(res0);
-.Ed
-.Pp
-The following example tries to open a wildcard listening socket onto service
-.Dq Li http ,
-for all the address families available.
-.Bd -literal -offset indent
-struct addrinfo hints, *res, *res0;
-int error;
-int s[MAXSOCK];
-int nsock;
-const char *cause = NULL;
-
-memset(\*[Am]hints, 0, sizeof(hints));
-hints.ai_family = AF_UNSPEC;
-hints.ai_socktype = SOCK_STREAM;
-hints.ai_flags = AI_PASSIVE;
-error = getaddrinfo(NULL, "http", \*[Am]hints, \*[Am]res0);
-if (error) {
-	errx(1, "%s", gai_strerror(error));
-	/*NOTREACHED*/
-}
-nsock = 0;
-for (res = res0; res \*[Am]\*[Am] nsock \*[Lt] MAXSOCK; res = res-\*[Gt]ai_next) {
-	s[nsock] = socket(res-\*[Gt]ai_family, res-\*[Gt]ai_socktype,
-	    res-\*[Gt]ai_protocol);
-	if (s[nsock] \*[Lt] 0) {
-		cause = "socket";
-		continue;
-	}
-
-	if (bind(s[nsock], res-\*[Gt]ai_addr, res-\*[Gt]ai_addrlen) \*[Lt] 0) {
-		cause = "bind";
-		close(s[nsock]);
-		continue;
-	}
-	(void) listen(s[nsock], 5);
-
-	nsock++;
-}
-if (nsock == 0) {
-	err(1, "%s", cause);
-	/*NOTREACHED*/
-}
-freeaddrinfo(res0);
-.Ed
-.Sh SEE ALSO
-.Xr bind 2 ,
-.Xr connect 2 ,
-.Xr send 2 ,
-.Xr socket 2 ,
-.Xr gai_strerror 3 ,
-.Xr gethostbyname 3 ,
-.Xr getnameinfo 3 ,
-.Xr getservbyname 3 ,
-.Xr resolver 3 ,
-.Xr hosts 5 ,
-.Xr resolv.conf 5 ,
-.Xr services 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Rs
-.%A R. Gilligan
-.%A S. Thomson
-.%A J. Bound
-.%A J. McCann
-.%A W. Stevens
-.%T Basic Socket Interface Extensions for IPv6
-.%R RFC 3493
-.%D February 2003
-.Re
-.Rs
-.%A S. Deering
-.%A B. Haberman
-.%A T. Jinmei
-.%A E. Nordmark
-.%A B. Zill
-.%T "IPv6 Scoped Address Architecture"
-.%R internet draft
-.%N draft-ietf-ipv6-scoping-arch-02.txt
-.%O work in progress material
-.Re
-.Rs
-.%A Craig Metz
-.%T "Protocol Independence Using the Sockets API"
-.%I USENIX Association
-.%B Proceedings of the FREENIX Track: 2000 USENIX Annual Technical Conference
-.%D June 18-23, 2000
-.%P 99-108
-.%U http://www.usenix.org/events/usenix2000/freenix/metzprotocol/metzprotocol.pdf
-.Re
-.Sh STANDARDS
-The
-.Fn getaddrinfo
-function is defined by the
-.St -p1003.1g-2000
-draft specification and documented in
-.Dv "RFC 3493" ,
-.Dq Basic Socket Interface Extensions for IPv6 .
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
deleted file mode 100644
index b15a4267b..000000000
--- a/lib/libc/net/getaddrinfo.c
+++ /dev/null
@@ -1,2334 +0,0 @@
-/*	$NetBSD: getaddrinfo.c,v 1.109 2015/09/10 14:05:06 christos Exp $	*/
-/*	$KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Issues to be discussed:
- * - Return values.  There are nonstandard return values defined and used
- *   in the source code.  This is because RFC2553 is silent about which error
- *   code must be returned for which situation.
- * - IPv4 classful (shortened) form.  RFC2553 is silent about it.  XNET 5.2
- *   says to use inet_aton() to convert IPv4 numeric to binary (alows
- *   classful form as a result).
- *   current code - disallow classful form for IPv4 (due to use of inet_pton).
- * - freeaddrinfo(NULL).  RFC2553 is silent about it.  XNET 5.2 says it is
- *   invalid.
- *   current code - SEGV on freeaddrinfo(NULL)
- * Note:
- * - The code filters out AFs that are not supported by the kernel,
- *   when globbing NULL hostname (to loopback, or wildcard).  Is it the right
- *   thing to do?  What is the relationship with post-RFC2553 AI_ADDRCONFIG
- *   in ai_flags?
- * - (post-2553) semantics of AI_ADDRCONFIG itself is too vague.
- *   (1) what should we do against numeric hostname (2) what should we do
- *   against NULL hostname (3) what is AI_ADDRCONFIG itself.  AF not ready?
- *   non-loopback address configured?  global address configured?
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getaddrinfo.c,v 1.109 2015/09/10 14:05:06 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifndef RUMP_ACTION
-#include "namespace.h"
-#endif
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ifaddrs.h>
-
-#include <syslog.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#include "servent.h"
-
-#ifndef RUMP_ACTION
-#ifdef __weak_alias
-__weak_alias(getaddrinfo,_getaddrinfo)
-__weak_alias(allocaddrinfo,_allocaddrinfo)
-__weak_alias(freeaddrinfo,_freeaddrinfo)
-__weak_alias(gai_strerror,_gai_strerror)
-#endif
-#endif
-
-#define SUCCESS 0
-#define ANY 0
-#define YES 1
-#define NO  0
-
-static const char in_addrany[] = { 0, 0, 0, 0 };
-static const char in_loopback[] = { 127, 0, 0, 1 };
-#ifdef INET6
-static const char in6_addrany[] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-static const char in6_loopback[] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
-};
-#endif
-
-static const struct afd {
-	int a_af;
-	int a_addrlen;
-	int a_socklen;
-	int a_off;
-	const char *a_addrany;
-	const char *a_loopback;
-	int a_scoped;
-} afdl [] = {
-#ifdef INET6
-	{PF_INET6, sizeof(struct in6_addr),
-	 sizeof(struct sockaddr_in6),
-	 offsetof(struct sockaddr_in6, sin6_addr),
-	 in6_addrany, in6_loopback, 1},
-#endif
-	{PF_INET, sizeof(struct in_addr),
-	 sizeof(struct sockaddr_in),
-	 offsetof(struct sockaddr_in, sin_addr),
-	 in_addrany, in_loopback, 0},
-	{0, 0, 0, 0, NULL, NULL, 0},
-};
-
-struct explore {
-	int e_af;
-	int e_socktype;
-	int e_protocol;
-	const char *e_protostr;
-	int e_wild;
-#define WILD_AF(ex)		((ex)->e_wild & 0x01)
-#define WILD_SOCKTYPE(ex)	((ex)->e_wild & 0x02)
-#define WILD_PROTOCOL(ex)	((ex)->e_wild & 0x04)
-};
-
-static const struct explore explore[] = {
-#if 0
-	{ PF_LOCAL, 0, ANY, ANY, NULL, 0x01 },
-#endif
-#ifdef INET6
-	{ PF_INET6, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 },
-	{ PF_INET6, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 },
-	{ PF_INET6, SOCK_RAW, ANY, NULL, 0x05 },
-#endif
-	{ PF_INET, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 },
-	{ PF_INET, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 },
-	{ PF_INET, SOCK_RAW, ANY, NULL, 0x05 },
-	{ PF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 },
-	{ PF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 },
-	{ PF_UNSPEC, SOCK_RAW, ANY, NULL, 0x05 },
-	{ -1, 0, 0, NULL, 0 },
-};
-
-#ifdef INET6
-#define PTON_MAX	16
-#else
-#define PTON_MAX	4
-#endif
-
-static const ns_src default_dns_files[] = {
-	{ NSSRC_FILES,	NS_SUCCESS },
-	{ NSSRC_DNS,	NS_SUCCESS },
-	{ 0, 0 }
-};
-
-#define MAXPACKET	(64*1024)
-
-typedef union {
-	HEADER hdr;
-	u_char buf[MAXPACKET];
-} querybuf;
-
-struct res_target {
-	struct res_target *next;
-	const char *name;	/* domain name */
-	int qclass, qtype;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer buffer */
-	int n;			/* result length */
-};
-
-struct srvinfo {
-       struct srvinfo *next;
-       char name[MAXDNAME];
-       int port, pri, weight;
-};
-
-static int gai_srvok(const char *);
-static int str2number(const char *);
-static int explore_fqdn(const struct addrinfo *, const char *,
-    const char *, struct addrinfo **, struct servent_data *);
-static int explore_null(const struct addrinfo *,
-    const char *, struct addrinfo **, struct servent_data *);
-static int explore_numeric(const struct addrinfo *, const char *,
-    const char *, struct addrinfo **, const char *, struct servent_data *);
-static int explore_numeric_scope(const struct addrinfo *, const char *,
-    const char *, struct addrinfo **, struct servent_data *);
-static int get_canonname(const struct addrinfo *,
-    struct addrinfo *, const char *);
-static struct addrinfo *get_ai(const struct addrinfo *,
-    const struct afd *, const char *);
-static int get_portmatch(const struct addrinfo *, const char *,
-    struct servent_data *);
-static int get_port(const struct addrinfo *, const char *, int,
-    struct servent_data *);
-static const struct afd *find_afd(int);
-static int addrconfig(uint64_t *);
-#ifdef INET6
-static int ip6_str2scopeid(char *, struct sockaddr_in6 *, u_int32_t *);
-#endif
-
-static struct addrinfo *getanswer(const querybuf *, int, const char *, int,
-    const struct addrinfo *);
-static void aisort(struct addrinfo *s, res_state res);
-static struct addrinfo * _dns_query(struct res_target *,
-    const struct addrinfo *, res_state, int);
-static struct addrinfo * _dns_srv_lookup(const char *, const char *,
-    const struct addrinfo *);
-static struct addrinfo * _dns_host_lookup(const char *,
-    const struct addrinfo *);
-static int _dns_getaddrinfo(void *, void *, va_list);
-static void _sethtent(FILE **);
-static void _endhtent(FILE **);
-static struct addrinfo *_gethtent(FILE **, const char *,
-    const struct addrinfo *);
-static int _files_getaddrinfo(void *, void *, va_list);
-#ifdef YP
-static struct addrinfo *_yphostent(char *, const struct addrinfo *);
-static int _yp_getaddrinfo(void *, void *, va_list);
-#endif
-
-static int res_queryN(const char *, struct res_target *, res_state);
-static int res_searchN(const char *, struct res_target *, res_state);
-static int res_querydomainN(const char *, const char *,
-    struct res_target *, res_state);
-
-static const char * const ai_errlist[] = {
-	"Success",
-	"Address family for hostname not supported",	/* EAI_ADDRFAMILY */
-	"Temporary failure in name resolution",		/* EAI_AGAIN	  */
-	"Invalid value for ai_flags",			/* EAI_BADFLAGS	  */
-	"Non-recoverable failure in name resolution",	/* EAI_FAIL	  */
-	"ai_family not supported",			/* EAI_FAMILY	  */
-	"Memory allocation failure",			/* EAI_MEMORY	  */
-	"No address associated with hostname",		/* EAI_NODATA	  */
-	"hostname nor servname provided, or not known", /* EAI_NONAME	  */
-	"servname not supported for ai_socktype",	/* EAI_SERVICE	  */
-	"ai_socktype not supported",			/* EAI_SOCKTYPE	  */
-	"System error returned in errno",		/* EAI_SYSTEM	  */
-	"Invalid value for hints",			/* EAI_BADHINTS	  */
-	"Resolved protocol is unknown",			/* EAI_PROTOCOL	  */
-	"Argument buffer overflow",			/* EAI_OVERFLOW	  */
-	"Unknown error",				/* EAI_MAX	  */
-};
-
-/* XXX macros that make external reference is BAD. */
-
-#define GET_AI(ai, afd, addr)					\
-do {								\
-	/* external reference: pai, error, and label free */	\
-	(ai) = get_ai(pai, (afd), (addr));			\
-	if ((ai) == NULL) {					\
-		error = EAI_MEMORY;				\
-		goto free;					\
-	}							\
-} while (/*CONSTCOND*/0)
-
-#define GET_PORT(ai, serv, svd)					\
-do {								\
-	/* external reference: error and label free */		\
-	error = get_port((ai), (serv), 0, (svd));		\
-	if (error != 0)						\
-		goto free;					\
-} while (/*CONSTCOND*/0)
-
-#define GET_CANONNAME(ai, str)					\
-do {								\
-	/* external reference: pai, error and label free */	\
-	error = get_canonname(pai, (ai), (str));		\
-	if (error != 0)						\
-		goto free;					\
-} while (/*CONSTCOND*/0)
-
-#define ERR(err)						\
-do {								\
-	/* external reference: error, and label bad */		\
-	error = (err);						\
-	goto bad;						\
-	/*NOTREACHED*/						\
-} while (/*CONSTCOND*/0)
-
-#define MATCH_FAMILY(x, y, w)						\
-	((x) == (y) || (/*CONSTCOND*/(w) && ((x) == PF_UNSPEC ||	\
-	    (y) == PF_UNSPEC)))
-#define MATCH(x, y, w)							\
-	((x) == (y) || (/*CONSTCOND*/(w) && ((x) == ANY || (y) == ANY)))
-
-const char *
-gai_strerror(int ecode)
-{
-	if (ecode < 0 || ecode > EAI_MAX)
-		ecode = EAI_MAX;
-	return ai_errlist[ecode];
-}
-
-void
-freeaddrinfo(struct addrinfo *ai)
-{
-	struct addrinfo *next;
-
-	_DIAGASSERT(ai != NULL);
-
-	do {
-		next = ai->ai_next;
-		if (ai->ai_canonname)
-			free(ai->ai_canonname);
-		/* no need to free(ai->ai_addr) */
-		free(ai);
-		ai = next;
-	} while (ai);
-}
-
-/*
- * We don't want localization to affect us
- */
-#define PERIOD '.'
-#define hyphenchar(c) ((c) == '-')
-#define periodchar(c) ((c) == PERIOD)
-#define underschar(c) ((c) == '_')
-#define alphachar(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z'))
-#define digitchar(c) ((c) >= '0' && (c) <= '9')
-
-#define firstchar(c)  (alphachar(c) || digitchar(c) || underschar(c))
-#define lastchar(c)   (alphachar(c) || digitchar(c))
-#define middlechar(c) (lastchar(c) || hyphenchar(c))
-
-static int
-gai_srvok(const char *dn)
-{
-	int nch, pch, ch;
-
-	for (pch = PERIOD, nch = ch = *dn++; ch != '\0'; pch = ch, ch = nch) {
-		if (periodchar(ch))
-			continue;
-		if (periodchar(pch)) {
-			if (!firstchar(ch))
-				return 0;
-		} else if (periodchar(nch) || nch == '\0') {
-			if (!lastchar(ch))
-				return 0;
-		} else if (!middlechar(ch))
-			return 0;
-       }
-       return 1;
-}
-
-static in_port_t *
-getport(struct addrinfo *ai) {
-	static in_port_t p;
-
-	switch (ai->ai_family) {
-	case AF_INET:
-		return &((struct sockaddr_in *)(void *)ai->ai_addr)->sin_port;
-#ifdef INET6
-	case AF_INET6:
-		return &((struct sockaddr_in6 *)(void *)ai->ai_addr)->sin6_port;
-#endif
-	default:
-		p = 0;
-		/* XXX: abort()? */
-		return &p;
-	}
-}
-
-static int
-str2number(const char *p)
-{
-	char *ep;
-	unsigned long v;
-
-	_DIAGASSERT(p != NULL);
-
-	if (*p == '\0')
-		return -1;
-	ep = NULL;
-	errno = 0;
-	v = strtoul(p, &ep, 10);
-	if (errno == 0 && ep && *ep == '\0' && v <= INT_MAX)
-		return (int)v;
-	else
-		return -1;
-}
-
-int
-getaddrinfo(const char *hostname, const char *servname,
-    const struct addrinfo *hints, struct addrinfo **res)
-{
-	struct addrinfo sentinel;
-	struct addrinfo *cur;
-	int error = 0;
-	struct addrinfo ai;
-	struct addrinfo ai0;
-	struct addrinfo *pai;
-	const struct explore *ex;
-	struct servent_data svd;
-	uint64_t mask = (uint64_t)~0ULL;
-
-	/* hostname is allowed to be NULL */
-	/* servname is allowed to be NULL */
-	/* hints is allowed to be NULL */
-	_DIAGASSERT(res != NULL);
-
-	(void)memset(&svd, 0, sizeof(svd));
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-	memset(&ai, 0, sizeof(ai));
-	pai = &ai;
-	pai->ai_flags = 0;
-	pai->ai_family = PF_UNSPEC;
-	pai->ai_socktype = ANY;
-	pai->ai_protocol = ANY;
-	pai->ai_addrlen = 0;
-	pai->ai_canonname = NULL;
-	pai->ai_addr = NULL;
-	pai->ai_next = NULL;
-
-	if (hostname == NULL && servname == NULL)
-		return EAI_NONAME;
-	if (hints) {
-		/* error check for hints */
-		if (hints->ai_addrlen || hints->ai_canonname ||
-		    hints->ai_addr || hints->ai_next)
-			ERR(EAI_BADHINTS); /* xxx */
-		if (hints->ai_flags & ~AI_MASK)
-			ERR(EAI_BADFLAGS);
-		switch (hints->ai_family) {
-		case PF_UNSPEC:
-		case PF_INET:
-#ifdef INET6
-		case PF_INET6:
-#endif
-			break;
-		default:
-			ERR(EAI_FAMILY);
-		}
-		memcpy(pai, hints, sizeof(*pai));
-
-		/*
-		 * if both socktype/protocol are specified, check if they
-		 * are meaningful combination.
-		 */
-		if (pai->ai_socktype != ANY && pai->ai_protocol != ANY) {
-			for (ex = explore; ex->e_af >= 0; ex++) {
-				if (pai->ai_family != ex->e_af)
-					continue;
-				if (ex->e_socktype == ANY)
-					continue;
-				if (ex->e_protocol == ANY)
-					continue;
-				if (pai->ai_socktype == ex->e_socktype
-				 && pai->ai_protocol != ex->e_protocol) {
-					ERR(EAI_BADHINTS);
-				}
-			}
-		}
-	}
-
-	if ((pai->ai_flags & AI_ADDRCONFIG) != 0 && addrconfig(&mask) == -1)
-		ERR(EAI_FAIL);
-
-	/*
-	 * check for special cases.  (1) numeric servname is disallowed if
-	 * socktype/protocol are left unspecified. (2) servname is disallowed
-	 * for raw and other inet{,6} sockets.
-	 */
-	if (MATCH_FAMILY(pai->ai_family, PF_INET, 1)
-#ifdef PF_INET6
-	 || MATCH_FAMILY(pai->ai_family, PF_INET6, 1)
-#endif
-	    ) {
-		ai0 = *pai;	/* backup *pai */
-
-		if (pai->ai_family == PF_UNSPEC) {
-#ifdef PF_INET6
-			pai->ai_family = PF_INET6;
-#else
-			pai->ai_family = PF_INET;
-#endif
-		}
-		error = get_portmatch(pai, servname, &svd);
-		if (error)
-			goto bad;
-
-		*pai = ai0;
-	}
-
-	ai0 = *pai;
-
-	/* NULL hostname, or numeric hostname */
-	for (ex = explore; ex->e_af >= 0; ex++) {
-		*pai = ai0;
-
-		/* ADDRCONFIG check */
-		if ((((uint64_t)1 << ex->e_af) & mask) == 0)
-			continue;
-
-		/* PF_UNSPEC entries are prepared for DNS queries only */
-		if (ex->e_af == PF_UNSPEC)
-			continue;
-
-		if (!MATCH_FAMILY(pai->ai_family, ex->e_af, WILD_AF(ex)))
-			continue;
-		if (!MATCH(pai->ai_socktype, ex->e_socktype, WILD_SOCKTYPE(ex)))
-			continue;
-		if (!MATCH(pai->ai_protocol, ex->e_protocol, WILD_PROTOCOL(ex)))
-			continue;
-		if (pai->ai_family == PF_UNSPEC)
-			pai->ai_family = ex->e_af;
-		if (pai->ai_socktype == ANY && ex->e_socktype != ANY)
-			pai->ai_socktype = ex->e_socktype;
-		if (pai->ai_protocol == ANY && ex->e_protocol != ANY)
-			pai->ai_protocol = ex->e_protocol;
-
-		if (hostname == NULL)
-			error = explore_null(pai, servname, &cur->ai_next,
-			    &svd);
-		else
-			error = explore_numeric_scope(pai, hostname, servname,
-			    &cur->ai_next, &svd);
-
-		if (error)
-			goto free;
-
-		while (cur->ai_next)
-			cur = cur->ai_next;
-	}
-
-	/*
-	 * XXX
-	 * If numeric representation of AF1 can be interpreted as FQDN
-	 * representation of AF2, we need to think again about the code below.
-	 */
-	if (sentinel.ai_next)
-		goto good;
-
-	if (hostname == NULL)
-		ERR(EAI_NODATA);
-	if (pai->ai_flags & AI_NUMERICHOST)
-		ERR(EAI_NONAME);
-
-	/*
-	 * hostname as alphabetical name.
-	 * we would like to prefer AF_INET6 than AF_INET, so we'll make a
-	 * outer loop by AFs.
-	 */
-	for (ex = explore; ex->e_af >= 0; ex++) {
-		*pai = ai0;
-
-
-		/* ADDRCONFIG check */
-		/* PF_UNSPEC entries are prepared for DNS queries only */
-		if (ex->e_af != PF_UNSPEC &&
-		    (((uint64_t)1 << ex->e_af) & mask) == 0)
-			continue;
-
-		/* require exact match for family field */
-		if (pai->ai_family != ex->e_af)
-			continue;
-
-		if (!MATCH(pai->ai_socktype, ex->e_socktype,
-				WILD_SOCKTYPE(ex))) {
-			continue;
-		}
-		if (!MATCH(pai->ai_protocol, ex->e_protocol,
-				WILD_PROTOCOL(ex))) {
-			continue;
-		}
-
-		if (pai->ai_socktype == ANY && ex->e_socktype != ANY)
-			pai->ai_socktype = ex->e_socktype;
-		if (pai->ai_protocol == ANY && ex->e_protocol != ANY)
-			pai->ai_protocol = ex->e_protocol;
-
-		error = explore_fqdn(pai, hostname, servname, &cur->ai_next,
-		    &svd);
-
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-
-	/* XXX */
-	if (sentinel.ai_next)
-		error = 0;
-
-	if (error)
-		goto free;
-
-	if (sentinel.ai_next) {
- good:
-		endservent_r(&svd);
-		*res = sentinel.ai_next;
-		return SUCCESS;
-	} else
-		error = EAI_FAIL;
- free:
- bad:
-	endservent_r(&svd);
-	if (sentinel.ai_next)
-		freeaddrinfo(sentinel.ai_next);
-	*res = NULL;
-	return error;
-}
-
-/*
- * FQDN hostname, DNS lookup
- */
-static int
-explore_fqdn(const struct addrinfo *pai, const char *hostname,
-    const char *servname, struct addrinfo **res, struct servent_data *svd)
-{
-	struct addrinfo *result;
-	struct addrinfo *cur;
-	int error = 0;
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getaddrinfo, NULL)
-		{ NSSRC_DNS, _dns_getaddrinfo, NULL },	/* force -DHESIOD */
-		NS_NIS_CB(_yp_getaddrinfo, NULL)
-		NS_NULL_CB
-	};
-
-	_DIAGASSERT(pai != NULL);
-	/* hostname may be NULL */
-	/* servname may be NULL */
-	_DIAGASSERT(res != NULL);
-
-	result = NULL;
-
-	/*
-	 * if the servname does not match socktype/protocol, ignore it.
-	 */
-	if (get_portmatch(pai, servname, svd) != 0)
-		return 0;
-
-	switch (nsdispatch(&result, dtab, NSDB_HOSTS, "getaddrinfo",
-	    default_dns_files, hostname, pai, servname)) {
-	case NS_TRYAGAIN:
-		error = EAI_AGAIN;
-		goto free;
-	case NS_UNAVAIL:
-		error = EAI_FAIL;
-		goto free;
-	case NS_NOTFOUND:
-		error = EAI_NODATA;
-		goto free;
-	case NS_SUCCESS:
-		error = 0;
-		for (cur = result; cur; cur = cur->ai_next) {
-			/* Check for already filled port. */
-			if (*getport(cur))
-				continue;
-			GET_PORT(cur, servname, svd);
-			/* canonname should be filled already */
-		}
-		break;
-	}
-
-	*res = result;
-
-	return 0;
-
-free:
-	if (result)
-		freeaddrinfo(result);
-	return error;
-}
-
-/*
- * hostname == NULL.
- * passive socket -> anyaddr (0.0.0.0 or ::)
- * non-passive socket -> localhost (127.0.0.1 or ::1)
- */
-static int
-explore_null(const struct addrinfo *pai, const char *servname,
-    struct addrinfo **res, struct servent_data *svd)
-{
-	int s;
-	const struct afd *afd;
-	struct addrinfo *cur;
-	struct addrinfo sentinel;
-	int error;
-
-	_DIAGASSERT(pai != NULL);
-	/* servname may be NULL */
-	_DIAGASSERT(res != NULL);
-
-	*res = NULL;
-	sentinel.ai_next = NULL;
-	cur = &sentinel;
-
-	/*
-	 * filter out AFs that are not supported by the kernel
-	 * XXX errno?
-	 */
-	s = socket(pai->ai_family, SOCK_DGRAM, 0);
-	if (s < 0) {
-		if (errno != EMFILE)
-			return 0;
-	} else
-		close(s);
-
-	/*
-	 * if the servname does not match socktype/protocol, ignore it.
-	 */
-	if (get_portmatch(pai, servname, svd) != 0)
-		return 0;
-
-	afd = find_afd(pai->ai_family);
-	if (afd == NULL)
-		return 0;
-
-	if (pai->ai_flags & AI_PASSIVE) {
-		GET_AI(cur->ai_next, afd, afd->a_addrany);
-		/* xxx meaningless?
-		 * GET_CANONNAME(cur->ai_next, "anyaddr");
-		 */
-		GET_PORT(cur->ai_next, servname, svd);
-	} else {
-		GET_AI(cur->ai_next, afd, afd->a_loopback);
-		/* xxx meaningless?
-		 * GET_CANONNAME(cur->ai_next, "localhost");
-		 */
-		GET_PORT(cur->ai_next, servname, svd);
-	}
-	cur = cur->ai_next;
-
-	*res = sentinel.ai_next;
-	return 0;
-
-free:
-	if (sentinel.ai_next)
-		freeaddrinfo(sentinel.ai_next);
-	return error;
-}
-
-/*
- * numeric hostname
- */
-static int
-explore_numeric(const struct addrinfo *pai, const char *hostname,
-    const char *servname, struct addrinfo **res, const char *canonname,
-    struct servent_data *svd)
-{
-	const struct afd *afd;
-	struct addrinfo *cur;
-	struct addrinfo sentinel;
-	int error;
-	char pton[PTON_MAX];
-
-	_DIAGASSERT(pai != NULL);
-	/* hostname may be NULL */
-	/* servname may be NULL */
-	_DIAGASSERT(res != NULL);
-
-	*res = NULL;
-	sentinel.ai_next = NULL;
-	cur = &sentinel;
-
-	/*
-	 * if the servname does not match socktype/protocol, ignore it.
-	 */
-	if (get_portmatch(pai, servname, svd) != 0)
-		return 0;
-
-	afd = find_afd(pai->ai_family);
-	if (afd == NULL)
-		return 0;
-
-	switch (afd->a_af) {
-#if 0 /*X/Open spec*/
-	case AF_INET:
-		if (inet_aton(hostname, (struct in_addr *)pton) == 1) {
-			if (pai->ai_family == afd->a_af ||
-			    pai->ai_family == PF_UNSPEC /*?*/) {
-				GET_AI(cur->ai_next, afd, pton);
-				GET_PORT(cur->ai_next, servname, svd);
-				if ((pai->ai_flags & AI_CANONNAME)) {
-					/*
-					 * Set the numeric address itself as
-					 * the canonical name, based on a
-					 * clarification in rfc2553bis-03.
-					 */
-					GET_CANONNAME(cur->ai_next, canonname);
-				}
-				while (cur && cur->ai_next)
-					cur = cur->ai_next;
-			} else
-				ERR(EAI_FAMILY);	/*xxx*/
-		}
-		break;
-#endif
-	default:
-		if (inet_pton(afd->a_af, hostname, pton) == 1) {
-			if (pai->ai_family == afd->a_af ||
-			    pai->ai_family == PF_UNSPEC /*?*/) {
-				GET_AI(cur->ai_next, afd, pton);
-				GET_PORT(cur->ai_next, servname, svd);
-				if ((pai->ai_flags & AI_CANONNAME)) {
-					/*
-					 * Set the numeric address itself as
-					 * the canonical name, based on a
-					 * clarification in rfc2553bis-03.
-					 */
-					GET_CANONNAME(cur->ai_next, canonname);
-				}
-				while (cur->ai_next)
-					cur = cur->ai_next;
-			} else
-				ERR(EAI_FAMILY);	/*xxx*/
-		}
-		break;
-	}
-
-	*res = sentinel.ai_next;
-	return 0;
-
-free:
-bad:
-	if (sentinel.ai_next)
-		freeaddrinfo(sentinel.ai_next);
-	return error;
-}
-
-/*
- * numeric hostname with scope
- */
-static int
-explore_numeric_scope(const struct addrinfo *pai, const char *hostname,
-    const char *servname, struct addrinfo **res, struct servent_data *svd)
-{
-#if !defined(SCOPE_DELIMITER) || !defined(INET6)
-	return explore_numeric(pai, hostname, servname, res, hostname, svd);
-#else
-	const struct afd *afd;
-	struct addrinfo *cur;
-	int error;
-	char *cp, *hostname2 = NULL, *scope, *addr;
-	struct sockaddr_in6 *sin6;
-
-	_DIAGASSERT(pai != NULL);
-	/* hostname may be NULL */
-	/* servname may be NULL */
-	_DIAGASSERT(res != NULL);
-
-	/*
-	 * if the servname does not match socktype/protocol, ignore it.
-	 */
-	if (get_portmatch(pai, servname, svd) != 0)
-		return 0;
-
-	afd = find_afd(pai->ai_family);
-	if (afd == NULL)
-		return 0;
-
-	if (!afd->a_scoped)
-		return explore_numeric(pai, hostname, servname, res, hostname,
-		    svd);
-
-	cp = strchr(hostname, SCOPE_DELIMITER);
-	if (cp == NULL)
-		return explore_numeric(pai, hostname, servname, res, hostname,
-		    svd);
-
-	/*
-	 * Handle special case of <scoped_address><delimiter><scope id>
-	 */
-	hostname2 = strdup(hostname);
-	if (hostname2 == NULL)
-		return EAI_MEMORY;
-	/* terminate at the delimiter */
-	hostname2[cp - hostname] = '\0';
-	addr = hostname2;
-	scope = cp + 1;
-
-	error = explore_numeric(pai, addr, servname, res, hostname, svd);
-	if (error == 0) {
-		u_int32_t scopeid;
-
-		for (cur = *res; cur; cur = cur->ai_next) {
-			if (cur->ai_family != AF_INET6)
-				continue;
-			sin6 = (struct sockaddr_in6 *)(void *)cur->ai_addr;
-			if (ip6_str2scopeid(scope, sin6, &scopeid) == -1) {
-				free(hostname2);
-				return(EAI_NODATA); /* XXX: is return OK? */
-			}
-			sin6->sin6_scope_id = scopeid;
-		}
-	}
-
-	free(hostname2);
-
-	return error;
-#endif
-}
-
-static int
-get_canonname(const struct addrinfo *pai, struct addrinfo *ai, const char *str)
-{
-
-	_DIAGASSERT(pai != NULL);
-	_DIAGASSERT(ai != NULL);
-	_DIAGASSERT(str != NULL);
-
-	if ((pai->ai_flags & AI_CANONNAME) != 0) {
-		ai->ai_canonname = strdup(str);
-		if (ai->ai_canonname == NULL)
-			return EAI_MEMORY;
-	}
-	return 0;
-}
-
-struct addrinfo *
-allocaddrinfo(socklen_t addrlen)
-{
-	struct addrinfo *ai;
-
-	ai = calloc(sizeof(struct addrinfo) + addrlen, 1);
-	if (ai) {
-		ai->ai_addr = (void *)(ai+1);
-		ai->ai_addrlen = ai->ai_addr->sa_len = addrlen;
-	}
-
-	return ai;
-}
-
-static struct addrinfo *
-get_ai(const struct addrinfo *pai, const struct afd *afd, const char *addr)
-{
-	char *p;
-	struct addrinfo *ai;
-	struct sockaddr *save;
-
-	_DIAGASSERT(pai != NULL);
-	_DIAGASSERT(afd != NULL);
-	_DIAGASSERT(addr != NULL);
-
-	ai = allocaddrinfo((socklen_t)afd->a_socklen);
-	if (ai == NULL)
-		return NULL;
-
-	save = ai->ai_addr;
-	memcpy(ai, pai, sizeof(struct addrinfo));
-
-	/* since we just overwrote all of ai, we have
-	   to restore ai_addr and ai_addrlen */
-	ai->ai_addr = save;
-	ai->ai_addrlen = (socklen_t)afd->a_socklen;
-
-	ai->ai_addr->sa_family = ai->ai_family = afd->a_af;
-	p = (char *)(void *)(ai->ai_addr);
-	memcpy(p + afd->a_off, addr, (size_t)afd->a_addrlen);
-	return ai;
-}
-
-static int
-get_portmatch(const struct addrinfo *ai, const char *servname,
-    struct servent_data *svd)
-{
-
-	_DIAGASSERT(ai != NULL);
-	/* servname may be NULL */
-
-	return get_port(ai, servname, 1, svd);
-}
-
-static int
-get_port(const struct addrinfo *ai, const char *servname, int matchonly,
-    struct servent_data *svd)
-{
-	const char *proto;
-	struct servent *sp;
-	int port;
-	int allownumeric;
-
-	_DIAGASSERT(ai != NULL);
-	/* servname may be NULL */
-
-	if (servname == NULL)
-		return 0;
-	switch (ai->ai_family) {
-	case AF_INET:
-#ifdef AF_INET6
-	case AF_INET6:
-#endif
-		break;
-	default:
-		return 0;
-	}
-
-	switch (ai->ai_socktype) {
-	case SOCK_RAW:
-		return EAI_SERVICE;
-	case SOCK_DGRAM:
-	case SOCK_STREAM:
-		allownumeric = 1;
-		break;
-	case ANY:
-		/*
-		 * This was 0.	It is now 1 so that queries specifying
-		 * a NULL hint, or hint without socktype (but, hopefully,
-		 * with protocol) and numeric address actually work.
-		 */
-		allownumeric = 1;
-		break;
-	default:
-		return EAI_SOCKTYPE;
-	}
-
-	port = str2number(servname);
-	if (port >= 0) {
-		if (!allownumeric)
-			return EAI_SERVICE;
-		if (port < 0 || port > 65535)
-			return EAI_SERVICE;
-		port = htons(port);
-	} else {
-		struct servent sv;
-		if (ai->ai_flags & AI_NUMERICSERV)
-			return EAI_NONAME;
-
-		switch (ai->ai_socktype) {
-		case SOCK_DGRAM:
-			proto = "udp";
-			break;
-		case SOCK_STREAM:
-			proto = "tcp";
-			break;
-		default:
-			proto = NULL;
-			break;
-		}
-
-		sp = getservbyname_r(servname, proto, &sv, svd);
-		if (sp == NULL)
-			return EAI_SERVICE;
-		port = sp->s_port;
-	}
-
-	if (!matchonly)
-		*getport(__UNCONST(ai)) = port;
-	return 0;
-}
-
-static const struct afd *
-find_afd(int af)
-{
-	const struct afd *afd;
-
-	if (af == PF_UNSPEC)
-		return NULL;
-	for (afd = afdl; afd->a_af; afd++) {
-		if (afd->a_af == af)
-			return afd;
-	}
-	return NULL;
-}
-
-/*
- * AI_ADDRCONFIG check: Build a mask containing a bit set for each address
- * family configured in the system.
- *
- */
-static int
-addrconfig(uint64_t *mask)
-{
-	struct ifaddrs *ifaddrs, *ifa;
-
-	if (getifaddrs(&ifaddrs) == -1)
-		return -1;
-
-	*mask = 0;
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next)
-		if (ifa->ifa_addr && (ifa->ifa_flags & IFF_UP)) {
-			_DIAGASSERT(ifa->ifa_addr->sa_family < 64);
-			*mask |= (uint64_t)1 << ifa->ifa_addr->sa_family;
-		}
-
-	freeifaddrs(ifaddrs);
-	return 0;
-}
-
-#ifdef INET6
-/* convert a string to a scope identifier. XXX: IPv6 specific */
-static int
-ip6_str2scopeid(char *scope, struct sockaddr_in6 *sin6, u_int32_t *scopeid)
-{
-	u_long lscopeid;
-	struct in6_addr *a6;
-	char *ep;
-
-	_DIAGASSERT(scope != NULL);
-	_DIAGASSERT(sin6 != NULL);
-	_DIAGASSERT(scopeid != NULL);
-
-	a6 = &sin6->sin6_addr;
-
-	/* empty scopeid portion is invalid */
-	if (*scope == '\0')
-		return -1;
-
-	if (IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6)) {
-		/*
-		 * We currently assume a one-to-one mapping between links
-		 * and interfaces, so we simply use interface indices for
-		 * like-local scopes.
-		 */
-		*scopeid = if_nametoindex(scope);
-		if (*scopeid == 0)
-			goto trynumeric;
-		return 0;
-	}
-
-	/* still unclear about literal, allow numeric only - placeholder */
-	if (IN6_IS_ADDR_SITELOCAL(a6) || IN6_IS_ADDR_MC_SITELOCAL(a6))
-		goto trynumeric;
-	if (IN6_IS_ADDR_MC_ORGLOCAL(a6))
-		goto trynumeric;
-	else
-		goto trynumeric;	/* global */
-
-	/* try to convert to a numeric id as a last resort */
-  trynumeric:
-	errno = 0;
-	lscopeid = strtoul(scope, &ep, 10);
-	*scopeid = (u_int32_t)(lscopeid & 0xffffffffUL);
-	if (errno == 0 && ep && *ep == '\0' && *scopeid == lscopeid)
-		return 0;
-	else
-		return -1;
-}
-#endif
-
-/* code duplicate with gethnamaddr.c */
-
-static const char AskedForGot[] =
-	"gethostby*.getanswer: asked for \"%s\", got \"%s\"";
-
-static struct addrinfo *
-getanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
-    const struct addrinfo *pai)
-{
-	struct addrinfo sentinel, *cur;
-	struct addrinfo ai, *aip;
-	const struct afd *afd;
-	char *canonname;
-	const HEADER *hp;
-	const u_char *cp;
-	int n;
-	const u_char *eom;
-	char *bp, *ep;
-	int type, class, ancount, qdcount;
-	int haveanswer, had_error;
-	char tbuf[MAXDNAME];
-	int (*name_ok) (const char *);
-	char hostbuf[8*1024];
-	int port, pri, weight;
-	struct srvinfo *srvlist, *srv, *csrv;
-
-	_DIAGASSERT(answer != NULL);
-	_DIAGASSERT(qname != NULL);
-	_DIAGASSERT(pai != NULL);
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	canonname = NULL;
-	eom = answer->buf + anslen;
-	switch (qtype) {
-	case T_A:
-	case T_AAAA:
-	case T_ANY:	/*use T_ANY only for T_A/T_AAAA lookup*/
-		name_ok = res_hnok;
-		break;
-	case T_SRV:
-		name_ok = gai_srvok;
-		break;
-	default:
-		return NULL;	/* XXX should be abort(); */
-	}
-	/*
-	 * find first satisfactory answer
-	 */
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	bp = hostbuf;
-	ep = hostbuf + sizeof hostbuf;
-	cp = answer->buf + HFIXEDSZ;
-	if (qdcount != 1) {
-		h_errno = NO_RECOVERY;
-		return (NULL);
-	}
-	n = dn_expand(answer->buf, eom, cp, bp, (int)(ep - bp));
-	if ((n < 0) || !(*name_ok)(bp)) {
-		h_errno = NO_RECOVERY;
-		return (NULL);
-	}
-	cp += n + QFIXEDSZ;
-	if (qtype == T_A || qtype == T_AAAA || qtype == T_ANY) {
-		/* res_send() has already verified that the query name is the
-		 * same as the one we sent; this just gets the expanded name
-		 * (i.e., with the succeeding search-domain tacked on).
-		 */
-		n = (int)strlen(bp) + 1;		/* for the \0 */
-		if (n >= MAXHOSTNAMELEN) {
-			h_errno = NO_RECOVERY;
-			return (NULL);
-		}
-		canonname = bp;
-		bp += n;
-		/* The qname can be abbreviated, but h_name is now absolute. */
-		qname = canonname;
-	}
-	haveanswer = 0;
-	had_error = 0;
-	srvlist = NULL;
-	while (ancount-- > 0 && cp < eom && !had_error) {
-		n = dn_expand(answer->buf, eom, cp, bp, (int)(ep - bp));
-		if ((n < 0) || !(*name_ok)(bp)) {
-			had_error++;
-			continue;
-		}
-		cp += n;			/* name */
-		type = _getshort(cp);
-		cp += INT16SZ;			/* type */
-		class = _getshort(cp);
-		cp += INT16SZ + INT32SZ;	/* class, TTL */
-		n = _getshort(cp);
-		cp += INT16SZ;			/* len */
-		if (class != C_IN) {
-			/* XXX - debug? syslog? */
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		if ((qtype == T_A || qtype == T_AAAA || qtype == T_ANY) &&
-		    type == T_CNAME) {
-			n = dn_expand(answer->buf, eom, cp, tbuf, (int)sizeof tbuf);
-			if ((n < 0) || !(*name_ok)(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			/* Get canonical name. */
-			n = (int)strlen(tbuf) + 1;	/* for the \0 */
-			if (n > ep - bp || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strlcpy(bp, tbuf, (size_t)(ep - bp));
-			canonname = bp;
-			bp += n;
-			continue;
-		}
-		if (qtype == T_ANY) {
-			if (!(type == T_A || type == T_AAAA)) {
-				cp += n;
-				continue;
-			}
-		} else if (type != qtype) {
-			if (type != T_KEY && type != T_SIG) {
-				struct syslog_data sd = SYSLOG_DATA_INIT;
-				syslog_r(LOG_NOTICE|LOG_AUTH, &sd,
-	       "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"",
-				       qname, p_class(C_IN), p_type(qtype),
-				       p_type(type));
-			}
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		switch (type) {
-		case T_A:
-		case T_AAAA:
-			if (strcasecmp(canonname, bp) != 0) {
-				struct syslog_data sd = SYSLOG_DATA_INIT;
-				syslog_r(LOG_NOTICE|LOG_AUTH, &sd,
-				       AskedForGot, canonname, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			if (type == T_A && n != INADDRSZ) {
-				cp += n;
-				continue;
-			}
-			if (type == T_AAAA && n != IN6ADDRSZ) {
-				cp += n;
-				continue;
-			}
-			if (type == T_AAAA) {
-				struct in6_addr in6;
-				memcpy(&in6, cp, IN6ADDRSZ);
-				if (IN6_IS_ADDR_V4MAPPED(&in6)) {
-					cp += n;
-					continue;
-				}
-			}
-			if (!haveanswer) {
-				int nn;
-
-				canonname = bp;
-				nn = (int)strlen(bp) + 1;	/* for the \0 */
-				bp += nn;
-			}
-
-			/* don't overwrite pai */
-			ai = *pai;
-			ai.ai_family = (type == T_A) ? AF_INET : AF_INET6;
-			afd = find_afd(ai.ai_family);
-			if (afd == NULL) {
-				cp += n;
-				continue;
-			}
-			cur->ai_next = get_ai(&ai, afd, (const char *)cp);
-			if (cur->ai_next == NULL)
-				had_error++;
-			while (cur && cur->ai_next)
-				cur = cur->ai_next;
-			cp += n;
-			break;
-		case T_SRV:
-			/* Add to SRV list. Insertion sort on priority. */
-			pri = _getshort(cp);
-			cp += INT16SZ;
-			weight = _getshort(cp);
-			cp += INT16SZ;
-			port = _getshort(cp);
-			cp += INT16SZ;
-			n = dn_expand(answer->buf, eom, cp, tbuf,
-			    (int)sizeof(tbuf));
-			if ((n < 0) || !res_hnok(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (strlen(tbuf) + 1 >= MAXDNAME) {
-				had_error++;
-				continue;
-			}
-			srv = malloc(sizeof(*srv));
-			if (!srv) {
-				had_error++;
-				continue;
-			}
-			strlcpy(srv->name, tbuf, sizeof(srv->name));
-			srv->pri = pri;
-			srv->weight = weight;
-			srv->port = port;
-			/* Weight 0 is sorted before other weights. */
-			if (!srvlist
-			    || srv->pri < srvlist->pri
-			    || (srv->pri == srvlist->pri &&
-			    (!srv->weight || srvlist->weight))) {
-				srv->next = srvlist;
-				srvlist = srv;
-			} else {
-				for (csrv = srvlist;
-				    csrv->next && csrv->next->pri <= srv->pri;
-				    csrv = csrv->next) {
-					if (csrv->next->pri == srv->pri
-					    && (!srv->weight ||
-					    csrv->next->weight))
-						break;
-				}
-				srv->next = csrv->next;
-				csrv->next = srv;
-			}
-			continue; /* Don't add to haveanswer yet. */
-		default:
-			abort();
-		}
-		if (!had_error)
-			haveanswer++;
-	}
-
-	if (srvlist) {
-		res_state res;
-		/*
-		 * Check for explicit rejection.
-		 */
-		if (!srvlist->next && !srvlist->name[0]) {
-			free(srvlist);
-			h_errno = HOST_NOT_FOUND;
-			return NULL;
-		}
-		res = __res_get_state();
-		if (res == NULL) {
-			while (srvlist != NULL) {
-				srv = srvlist;
-				srvlist = srvlist->next;
-				free(srv);
-			}
-			h_errno = NETDB_INTERNAL;
-			return NULL;
-		}
-
-		while (srvlist) {
-			struct res_target q, q2;
-
-			srv = srvlist;
-			srvlist = srvlist->next;
-
-			/*
-			 * Since res_* doesn't give the additional
-			 * section, we always look up.
-			 */
-			memset(&q, 0, sizeof(q));
-			memset(&q2, 0, sizeof(q2));
-
-			q.name = srv->name;
-			q.qclass = C_IN;
-			q.qtype = T_AAAA;
-			q.next = &q2;
-			q2.name = srv->name;
-			q2.qclass = C_IN;
-			q2.qtype = T_A;
-
-			aip = _dns_query(&q, pai, res, 0);
-
-			if (aip != NULL) {
-				cur->ai_next = aip;
-				while (cur && cur->ai_next) {
-					cur = cur->ai_next;
-					*getport(cur) = htons(srv->port);
-					haveanswer++;
-				}
-			}
-			free(srv);
-		}
-		__res_put_state(res);
-	}
-	if (haveanswer) {
-		if (!sentinel.ai_next->ai_canonname)
-		       (void)get_canonname(pai, sentinel.ai_next,
-			   canonname ? canonname : qname);
-		h_errno = NETDB_SUCCESS;
-		return sentinel.ai_next;
-	}
-
-	h_errno = NO_RECOVERY;
-	return NULL;
-}
-
-#define SORTEDADDR(p)	(((struct sockaddr_in *)(void *)(p->ai_next->ai_addr))->sin_addr.s_addr)
-#define SORTMATCH(p, s) ((SORTEDADDR(p) & (s).mask) == (s).addr.s_addr)
-
-static void
-aisort(struct addrinfo *s, res_state res)
-{
-	struct addrinfo head, *t, *p;
-	int i;
-
-	head.ai_next = NULL;
-	t = &head;
-
-	for (i = 0; i < res->nsort; i++) {
-		p = s;
-		while (p->ai_next) {
-			if ((p->ai_next->ai_family != AF_INET)
-			|| SORTMATCH(p, res->sort_list[i])) {
-				t->ai_next = p->ai_next;
-				t = t->ai_next;
-				p->ai_next = p->ai_next->ai_next;
-			} else {
-				p = p->ai_next;
-			}
-		}
-	}
-
-	/* add rest of list and reset s to the new list*/
-	t->ai_next = s->ai_next;
-	s->ai_next = head.ai_next;
-}
-
-static struct addrinfo *
-_dns_query(struct res_target *q, const struct addrinfo *pai,
-    res_state res, int dosearch)
-{
-	struct res_target *q2 = q->next;
- 	querybuf *buf, *buf2;
-	struct addrinfo sentinel, *cur, *ai;
-
-#ifdef DNS_DEBUG
-	struct res_target *iter;
-	for (iter = q; iter; iter = iter->next)
-		printf("Query type %d for %s\n", iter->qtype, iter->name);
-#endif
-
- 	buf = malloc(sizeof(*buf));
- 	if (buf == NULL) {
- 		h_errno = NETDB_INTERNAL;
-		return NULL;
- 	}
- 	buf2 = malloc(sizeof(*buf2));
- 	if (buf2 == NULL) {
- 		free(buf);
- 		h_errno = NETDB_INTERNAL;
-		return NULL;
-	}
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	q->answer = buf->buf;
-	q->anslen = sizeof(buf->buf);
-	if (q2) {
-		q2->answer = buf2->buf;
-		q2->anslen = sizeof(buf2->buf);
-	}
-
-	if (dosearch) {
-		if (res_searchN(q->name, q, res) < 0)
-			goto out;
-	} else {
-		if (res_queryN(q->name, q, res) < 0)
-			goto out;
-	}
-
-	ai = getanswer(buf, q->n, q->name, q->qtype, pai);
-	if (ai) {
-		cur->ai_next = ai;
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-	if (q2) {
-		ai = getanswer(buf2, q2->n, q2->name, q2->qtype, pai);
-		if (ai)
-			cur->ai_next = ai;
- 	}
-	free(buf);
-	free(buf2);
-	return sentinel.ai_next;
-out:
-	free(buf);
-	free(buf2);
-	return NULL;
-}
-
-/*ARGSUSED*/
-static struct addrinfo *
-_dns_srv_lookup(const char *name, const char *servname,
-    const struct addrinfo *pai)
-{
-	static const char * const srvprotos[] = { "tcp", "udp" };
-	static const int srvnottype[] = { SOCK_DGRAM, SOCK_STREAM };
-	static const int nsrvprotos = 2;
-	struct addrinfo sentinel, *cur, *ai;
-	struct servent *serv, sv;
-	struct servent_data svd;
-	struct res_target q;
-	res_state res;
-	char *tname;
-	int i;
-
-	res = __res_get_state();
-	if (res == NULL)
-		return NULL;
-
-	memset(&svd, 0, sizeof(svd));
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	/*
-	 * Iterate over supported SRV protocols.
-	 * (currently UDP and TCP only)
-	 */
-	for (i = 0; i < nsrvprotos; i++) {
-		/*
-		 * Check that the caller didn't specify a hint
-		 * which precludes this protocol.
-		 */
-		if (pai->ai_socktype == srvnottype[i])
-			continue;
-		/*
-		 * If the caller specified a port,
-		 * then lookup the database for the
-		 * official service name.
-		 */
-		serv = getservbyname_r(servname, srvprotos[i], &sv, &svd);
-		if (serv == NULL)
-			continue;
-
-		/*
-		 * Construct service DNS name.
-		 */
-		if (asprintf(&tname, "_%s._%s.%s", serv->s_name, serv->s_proto,
-		    name) < 0)
-			continue;
-
-		memset(&q, 0, sizeof(q));
-		q.name = tname;
-		q.qclass = C_IN;
-		q.qtype = T_SRV;
-
-		/*
-		 * Do SRV query.
-		 */
-		ai = _dns_query(&q, pai, res, 1);
-		if (ai) {
-			cur->ai_next = ai;
-			while (cur && cur->ai_next)
-				cur = cur->ai_next;
-		}
-		free(tname);
-	}
-
-	if (res->nsort)
-		aisort(&sentinel, res);
-
-	__res_put_state(res);
-
-	return sentinel.ai_next;
-}
-
-/*ARGSUSED*/
-static struct addrinfo *
-_dns_host_lookup(const char *name, const struct addrinfo *pai)
-{
-	struct res_target q, q2;
-	struct addrinfo sentinel, *ai;
-	res_state res;
-
-	res = __res_get_state();
-	if (res == NULL)
-		return NULL;
-
-	memset(&q, 0, sizeof(q2));
-	memset(&q2, 0, sizeof(q2));
-
-	switch (pai->ai_family) {
-	case AF_UNSPEC:
-		/* prefer IPv6 */
-		q.name = name;
-		q.qclass = C_IN;
-		q.qtype = T_AAAA;
-		q.next = &q2;
-		q2.name = name;
-		q2.qclass = C_IN;
-		q2.qtype = T_A;
-		break;
-	case AF_INET:
-		q.name = name;
-		q.qclass = C_IN;
-		q.qtype = T_A;
-		break;
-	case AF_INET6:
-		q.name = name;
-		q.qclass = C_IN;
-		q.qtype = T_AAAA;
-		break;
-	default:
-		__res_put_state(res);
-		h_errno = NETDB_INTERNAL;
-		return NULL;
-	}
-
-	ai = _dns_query(&q, pai, res, 1);
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	sentinel.ai_next = ai;
-
-	if (ai != NULL && res->nsort)
-		aisort(&sentinel, res);
-
-	__res_put_state(res);
-
-	return sentinel.ai_next;
-}
-
-/*ARGSUSED*/
-static int
-_dns_getaddrinfo(void *rv, void *cb_data, va_list ap)
-{
-	struct addrinfo *ai = NULL;
-	const char *name, *servname;
-	const struct addrinfo *pai;
-
-	name = va_arg(ap, char *);
-	pai = va_arg(ap, const struct addrinfo *);
-	servname = va_arg(ap, char *);
-
-	/*
-	 * Try doing SRV lookup on service first.
-	 */
-	if (servname
-#ifdef AI_SRV
-	    && (pai->ai_flags & AI_SRV)
-#endif
-	    && !(pai->ai_flags & AI_NUMERICSERV)
-	    && str2number(servname) == -1) {
-
-#ifdef DNS_DEBUG
-		printf("%s: try SRV lookup\n", __func__);
-#endif
-		ai = _dns_srv_lookup(name, servname, pai);
-	}
-
-	/*
-	 * Do lookup on name.
-	 */
-	if (ai == NULL) {
-
-#ifdef DNS_DEBUG
-		printf("%s: try HOST lookup\n", __func__);
-#endif
-		ai = _dns_host_lookup(name, pai);
-
-		if (ai == NULL) {
-			switch (h_errno) {
-			case HOST_NOT_FOUND:
-				return NS_NOTFOUND;
-			case TRY_AGAIN:
-				return NS_TRYAGAIN;
-			default:
-				return NS_UNAVAIL;
-			}
-		}
-	}
-
-	*((struct addrinfo **)rv) = ai;
-	return NS_SUCCESS;
-}
-
-static void
-_sethtent(FILE **hostf)
-{
-
-	if (!*hostf)
-		*hostf = fopen(_PATH_HOSTS, "re");
-	else
-		rewind(*hostf);
-}
-
-static void
-_endhtent(FILE **hostf)
-{
-
-	if (*hostf) {
-		(void) fclose(*hostf);
-		*hostf = NULL;
-	}
-}
-
-static struct addrinfo *
-_gethtent(FILE **hostf, const char *name, const struct addrinfo *pai)
-{
-	char *p;
-	char *cp, *tname, *cname;
-	struct addrinfo hints, *res0, *res;
-	int error;
-	const char *addr;
-	char hostbuf[8*1024];
-
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(pai != NULL);
-
-	if (!*hostf && !(*hostf = fopen(_PATH_HOSTS, "re")))
-		return (NULL);
- again:
-	if (!(p = fgets(hostbuf, (int)sizeof hostbuf, *hostf)))
-		return (NULL);
-	if (*p == '#')
-		goto again;
-	if (!(cp = strpbrk(p, "#\n")))
-		goto again;
-	*cp = '\0';
-	if (!(cp = strpbrk(p, " \t")))
-		goto again;
-	*cp++ = '\0';
-	addr = p;
-	/* if this is not something we're looking for, skip it. */
-	cname = NULL;
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (!cname)
-			cname = cp;
-		tname = cp;
-		if ((cp = strpbrk(cp, " \t")) != NULL)
-			*cp++ = '\0';
-		if (strcasecmp(name, tname) == 0)
-			goto found;
-	}
-	goto again;
-
-found:
-	hints = *pai;
-	hints.ai_flags = AI_NUMERICHOST;
-	error = getaddrinfo(addr, NULL, &hints, &res0);
-	if (error)
-		goto again;
-	for (res = res0; res; res = res->ai_next) {
-		/* cover it up */
-		res->ai_flags = pai->ai_flags;
-
-		if (pai->ai_flags & AI_CANONNAME) {
-			if (get_canonname(pai, res, cname) != 0) {
-				freeaddrinfo(res0);
-				goto again;
-			}
-		}
-	}
-	return res0;
-}
-
-/*ARGSUSED*/
-static int
-_files_getaddrinfo(void *rv, void *cb_data, va_list ap)
-{
-	const char *name;
-	const struct addrinfo *pai;
-	struct addrinfo sentinel, *cur;
-	struct addrinfo *p;
-#ifndef _REENTRANT
-	static
-#endif
-	FILE *hostf = NULL;
-
-	name = va_arg(ap, char *);
-	pai = va_arg(ap, const struct addrinfo *);
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	_sethtent(&hostf);
-	while ((p = _gethtent(&hostf, name, pai)) != NULL) {
-		cur->ai_next = p;
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-	_endhtent(&hostf);
-
-	*((struct addrinfo **)rv) = sentinel.ai_next;
-	if (sentinel.ai_next == NULL)
-		return NS_NOTFOUND;
-	return NS_SUCCESS;
-}
-
-#ifdef YP
-/*ARGSUSED*/
-static struct addrinfo *
-_yphostent(char *line, const struct addrinfo *pai)
-{
-	struct addrinfo sentinel, *cur;
-	struct addrinfo hints, *res, *res0;
-	int error;
-	char *p;
-	const char *addr, *canonname;
-	char *nextline;
-	char *cp;
-
-	_DIAGASSERT(line != NULL);
-	_DIAGASSERT(pai != NULL);
-
-	p = line;
-	addr = canonname = NULL;
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-nextline:
-	/* terminate line */
-	cp = strchr(p, '\n');
-	if (cp) {
-		*cp++ = '\0';
-		nextline = cp;
-	} else
-		nextline = NULL;
-
-	cp = strpbrk(p, " \t");
-	if (cp == NULL) {
-		if (canonname == NULL)
-			return (NULL);
-		else
-			goto done;
-	}
-	*cp++ = '\0';
-
-	addr = p;
-
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (!canonname)
-			canonname = cp;
-		if ((cp = strpbrk(cp, " \t")) != NULL)
-			*cp++ = '\0';
-	}
-
-	hints = *pai;
-	hints.ai_flags = AI_NUMERICHOST;
-	error = getaddrinfo(addr, NULL, &hints, &res0);
-	if (error == 0) {
-		for (res = res0; res; res = res->ai_next) {
-			/* cover it up */
-			res->ai_flags = pai->ai_flags;
-
-			if (pai->ai_flags & AI_CANONNAME)
-				(void)get_canonname(pai, res, canonname);
-		}
-	} else
-		res0 = NULL;
-	if (res0) {
-		cur->ai_next = res0;
-		while (cur->ai_next)
-			cur = cur->ai_next;
-	}
-
-	if (nextline) {
-		p = nextline;
-		goto nextline;
-	}
-
-done:
-	return sentinel.ai_next;
-}
-
-/*ARGSUSED*/
-static int
-_yp_getaddrinfo(void *rv, void *cb_data, va_list ap)
-{
-	struct addrinfo sentinel, *cur;
-	struct addrinfo *ai = NULL;
-	char *ypbuf;
-	int ypbuflen, r;
-	const char *name;
-	const struct addrinfo *pai;
-	char *ypdomain;
-
-	if (_yp_check(&ypdomain) == 0)
-		return NS_UNAVAIL;
-
-	name = va_arg(ap, char *);
-	pai = va_arg(ap, const struct addrinfo *);
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	/* hosts.byname is only for IPv4 (Solaris8) */
-	if (pai->ai_family == PF_UNSPEC || pai->ai_family == PF_INET) {
-		r = yp_match(ypdomain, "hosts.byname", name,
-			(int)strlen(name), &ypbuf, &ypbuflen);
-		if (r == 0) {
-			struct addrinfo ai4;
-
-			ai4 = *pai;
-			ai4.ai_family = AF_INET;
-			ai = _yphostent(ypbuf, &ai4);
-			if (ai) {
-				cur->ai_next = ai;
-				while (cur && cur->ai_next)
-					cur = cur->ai_next;
-			}
-		}
-		free(ypbuf);
-	}
-
-	/* ipnodes.byname can hold both IPv4/v6 */
-	r = yp_match(ypdomain, "ipnodes.byname", name,
-		(int)strlen(name), &ypbuf, &ypbuflen);
-	if (r == 0) {
-		ai = _yphostent(ypbuf, pai);
-		if (ai)
-			cur->ai_next = ai;
-		free(ypbuf);
-	}
-
-	if (sentinel.ai_next == NULL) {
-		h_errno = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	}
-	*((struct addrinfo **)rv) = sentinel.ai_next;
-	return NS_SUCCESS;
-}
-#endif
-
-/* resolver logic */
-
-/*
- * Formulate a normal query, send, and await answer.
- * Returned answer is placed in supplied buffer "answer".
- * Perform preliminary check of answer, returning success only
- * if no error is indicated and the answer count is nonzero.
- * Return the size of the response on success, -1 on error.
- * Error number is left in h_errno.
- *
- * Caller must parse answer and determine whether it answers the question.
- */
-static int
-res_queryN(const char *name, /* domain name */ struct res_target *target,
-    res_state res)
-{
-	u_char buf[MAXPACKET];
-	HEADER *hp;
-	int n;
-	struct res_target *t;
-	int rcode;
-	int ancount;
-
-	_DIAGASSERT(name != NULL);
-	/* XXX: target may be NULL??? */
-
-	rcode = NOERROR;
-	ancount = 0;
-
-	for (t = target; t; t = t->next) {
-		int class, type;
-		u_char *answer;
-		int anslen;
-
-		hp = (HEADER *)(void *)t->answer;
-		hp->rcode = NOERROR;	/* default */
-
-		/* make it easier... */
-		class = t->qclass;
-		type = t->qtype;
-		answer = t->answer;
-		anslen = t->anslen;
-#ifdef DEBUG
-		if (res->options & RES_DEBUG)
-			printf(";; res_nquery(%s, %d, %d)\n", name, class, type);
-#endif
-
-		n = res_nmkquery(res, QUERY, name, class, type, NULL, 0, NULL,
-		    buf, (int)sizeof(buf));
-#ifdef RES_USE_EDNS0
-		if (n > 0 && (res->options & RES_USE_EDNS0) != 0)
-			n = res_nopt(res, n, buf, (int)sizeof(buf), anslen);
-#endif
-		if (n <= 0) {
-#ifdef DEBUG
-			if (res->options & RES_DEBUG)
-				printf(";; res_nquery: mkquery failed\n");
-#endif
-			h_errno = NO_RECOVERY;
-			return n;
-		}
-		n = res_nsend(res, buf, n, answer, anslen);
-#if 0
-		if (n < 0) {
-#ifdef DEBUG
-			if (res->options & RES_DEBUG)
-				printf(";; res_query: send error\n");
-#endif
-			h_errno = TRY_AGAIN;
-			return n;
-		}
-#endif
-
-		if (n < 0 || hp->rcode != NOERROR || ntohs(hp->ancount) == 0) {
-			rcode = hp->rcode;	/* record most recent error */
-#ifdef DEBUG
-			if (res->options & RES_DEBUG)
-				printf(";; rcode = %u, ancount=%u\n", hp->rcode,
-				    ntohs(hp->ancount));
-#endif
-			continue;
-		}
-
-		ancount += ntohs(hp->ancount);
-
-		t->n = n;
-	}
-
-	if (ancount == 0) {
-		switch (rcode) {
-		case NXDOMAIN:
-			h_errno = HOST_NOT_FOUND;
-			break;
-		case SERVFAIL:
-			h_errno = TRY_AGAIN;
-			break;
-		case NOERROR:
-			h_errno = NO_DATA;
-			break;
-		case FORMERR:
-		case NOTIMP:
-		case REFUSED:
-		default:
-			h_errno = NO_RECOVERY;
-			break;
-		}
-		return -1;
-	}
-	return ancount;
-}
-
-/*
- * Formulate a normal query, send, and retrieve answer in supplied buffer.
- * Return the size of the response on success, -1 on error.
- * If enabled, implement search rules until answer or unrecoverable failure
- * is detected.	 Error code, if any, is left in h_errno.
- */
-static int
-res_searchN(const char *name, struct res_target *target, res_state res)
-{
-	const char *cp, * const *domain;
-	HEADER *hp;
-	u_int dots;
-	char buf[MAXHOSTNAMELEN];
-	int trailing_dot, ret, saved_herrno;
-	int got_nodata = 0, got_servfail = 0, tried_as_is = 0;
-
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(target != NULL);
-
-	hp = (HEADER *)(void *)target->answer;	/*XXX*/
-
-	errno = 0;
-	h_errno = HOST_NOT_FOUND;	/* default, if we never query */
-	dots = 0;
-	for (cp = name; *cp; cp++)
-		dots += (*cp == '.');
-	trailing_dot = 0;
-	if (cp > name && *--cp == '.')
-		trailing_dot++;
-
-	/*
-	 * if there aren't any dots, it could be a user-level alias
-	 */
-	if (!dots && (cp = res_hostalias(res, name, buf, sizeof(buf))) != NULL) {
-		ret = res_queryN(cp, target, res);
-		return ret;
-	}
-
-	/*
-	 * If there are dots in the name already, let's just give it a try
-	 * 'as is'.  The threshold can be set with the "ndots" option.
-	 */
-	saved_herrno = -1;
-	if (dots >= res->ndots) {
-		ret = res_querydomainN(name, NULL, target, res);
-		if (ret > 0)
-			return (ret);
-		saved_herrno = h_errno;
-		tried_as_is++;
-	}
-
-	/*
-	 * We do at least one level of search if
-	 *	- there is no dot and RES_DEFNAME is set, or
-	 *	- there is at least one dot, there is no trailing dot,
-	 *	  and RES_DNSRCH is set.
-	 */
-	if ((!dots && (res->options & RES_DEFNAMES)) ||
-	    (dots && !trailing_dot && (res->options & RES_DNSRCH))) {
-		int done = 0;
-
-		for (domain = (const char * const *)res->dnsrch;
-		   *domain && !done;
-		   domain++) {
-
-			ret = res_querydomainN(name, *domain, target, res);
-			if (ret > 0)
-				return ret;
-
-			/*
-			 * If no server present, give up.
-			 * If name isn't found in this domain,
-			 * keep trying higher domains in the search list
-			 * (if that's enabled).
-			 * On a NO_DATA error, keep trying, otherwise
-			 * a wildcard entry of another type could keep us
-			 * from finding this entry higher in the domain.
-			 * If we get some other error (negative answer or
-			 * server failure), then stop searching up,
-			 * but try the input name below in case it's
-			 * fully-qualified.
-			 */
-			if (errno == ECONNREFUSED) {
-				h_errno = TRY_AGAIN;
-				return -1;
-			}
-
-			switch (h_errno) {
-			case NO_DATA:
-				got_nodata++;
-				/* FALLTHROUGH */
-			case HOST_NOT_FOUND:
-				/* keep trying */
-				break;
-			case TRY_AGAIN:
-				if (hp->rcode == SERVFAIL) {
-					/* try next search element, if any */
-					got_servfail++;
-					break;
-				}
-				/* FALLTHROUGH */
-			default:
-				/* anything else implies that we're done */
-				done++;
-			}
-			/*
-			 * if we got here for some reason other than DNSRCH,
-			 * we only wanted one iteration of the loop, so stop.
-			 */
-			if (!(res->options & RES_DNSRCH))
-				done++;
-		}
-	}
-
-	/*
-	 * if we have not already tried the name "as is", do that now.
-	 * note that we do this regardless of how many dots were in the
-	 * name or whether it ends with a dot.
-	 */
-	if (!tried_as_is) {
-		ret = res_querydomainN(name, NULL, target, res);
-		if (ret > 0)
-			return ret;
-	}
-
-	/*
-	 * if we got here, we didn't satisfy the search.
-	 * if we did an initial full query, return that query's h_errno
-	 * (note that we wouldn't be here if that query had succeeded).
-	 * else if we ever got a nodata, send that back as the reason.
-	 * else send back meaningless h_errno, that being the one from
-	 * the last DNSRCH we did.
-	 */
-	if (saved_herrno != -1)
-		h_errno = saved_herrno;
-	else if (got_nodata)
-		h_errno = NO_DATA;
-	else if (got_servfail)
-		h_errno = TRY_AGAIN;
-	return -1;
-}
-
-/*
- * Perform a call on res_query on the concatenation of name and domain,
- * removing a trailing dot from name if domain is NULL.
- */
-static int
-res_querydomainN(const char *name, const char *domain,
-    struct res_target *target, res_state res)
-{
-	char nbuf[MAXDNAME];
-	const char *longname = nbuf;
-	size_t n, d;
-
-	_DIAGASSERT(name != NULL);
-	/* XXX: target may be NULL??? */
-
-#ifdef DEBUG
-	if (res->options & RES_DEBUG)
-		printf(";; res_querydomain(%s, %s)\n",
-			name, domain?domain:"<Nil>");
-#endif
-	if (domain == NULL) {
-		/*
-		 * Check for trailing '.';
-		 * copy without '.' if present.
-		 */
-		n = strlen(name);
-		if (n + 1 > sizeof(nbuf)) {
-			h_errno = NO_RECOVERY;
-			return -1;
-		}
-		if (n > 0 && name[--n] == '.') {
-			strncpy(nbuf, name, n);
-			nbuf[n] = '\0';
-		} else
-			longname = name;
-	} else {
-		n = strlen(name);
-		d = strlen(domain);
-		if (n + 1 + d + 1 > sizeof(nbuf)) {
-			h_errno = NO_RECOVERY;
-			return -1;
-		}
-		snprintf(nbuf, sizeof(nbuf), "%s.%s", name, domain);
-	}
-	return res_queryN(longname, target, res);
-}
-
-#ifdef TEST
-int
-main(int argc, char *argv[]) {
-	struct addrinfo *ai, *sai;
-	int i, e;
-	char buf[1024];
-
-	for (i = 1; i < argc; i++) {
-		if ((e = getaddrinfo(argv[i], NULL, NULL, &sai)) != 0)
-			warnx("%s: %s", argv[i], gai_strerror(e));
-		for (ai = sai; ai; ai = ai->ai_next) {
-			sockaddr_snprintf(buf, sizeof(buf), "%a", ai->ai_addr);
-             		printf("flags=0x%x family=%d socktype=%d protocol=%d "
-			    "addrlen=%zu addr=%s canonname=%s next=%p\n",
-			    ai->ai_flags,
-             		    ai->ai_family,
-             		    ai->ai_socktype,
-             		    ai->ai_protocol,
-             		    (size_t)ai->ai_addrlen,
-			    buf,
-			    ai->ai_canonname,
-			    ai->ai_next);
-		}
-		if (sai)
-			freeaddrinfo(sai);
-	}
-	return 0;
-}
-#endif
diff --git a/lib/libc/net/gethnamaddr.c b/lib/libc/net/gethnamaddr.c
deleted file mode 100644
index a83435ceb..000000000
--- a/lib/libc/net/gethnamaddr.c
+++ /dev/null
@@ -1,1363 +0,0 @@
-/*	$NetBSD: gethnamaddr.c,v 1.92 2015/09/22 16:16:02 christos Exp $	*/
-
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 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.
- * 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.
- * -
- * 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
- * CORPORATION 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--
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "Id: gethnamaddr.c,v 8.21 1997/06/01 20:34:37 vixie Exp ";
-#else
-__RCSID("$NetBSD: gethnamaddr.c,v 1.92 2015/09/22 16:16:02 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(_LIBC)
-#include "namespace.h"
-#endif
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <syslog.h>
-
-#ifndef LOG_AUTH
-# define LOG_AUTH 0
-#endif
-
-#define MULTI_PTRS_ARE_ALIASES 1	/* XXX - experimental */
-
-#include <nsswitch.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#include "hostent.h"
-
-#if defined(_LIBC) && defined(__weak_alias)
-__weak_alias(gethostbyaddr,_gethostbyaddr)
-__weak_alias(gethostbyname,_gethostbyname)
-__weak_alias(gethostent,_gethostent)
-#endif
-
-#define maybe_ok(res, nm, ok) (((res)->options & RES_NOCHECKNAME) != 0U || \
-                               (ok)(nm) != 0)
-#define maybe_hnok(res, hn) maybe_ok((res), (hn), res_hnok)
-#define maybe_dnok(res, dn) maybe_ok((res), (dn), res_dnok)
-
-#define addalias(d, s, arr, siz) do {			\
-	if (d >= &arr[siz]) {				\
-		char **xptr = realloc(arr, (siz + 10) * sizeof(*arr)); \
-		if (xptr == NULL)			\
-			goto nospc;			\
-		d = xptr + (d - arr);			\
-		arr = xptr;				\
-		siz += 10;				\
-	}						\
-	*d++ = s;					\
-} while (/*CONSTCOND*/0)
-
-#define setup(arr, siz) do {				\
-	arr = malloc((siz = 10) * sizeof(*arr)); 	\
-	if (arr == NULL)				\
-		goto nospc;				\
-} while (/*CONSTCOND*/0)
-
-
-static const char AskedForGot[] =
-    "gethostby*.getanswer: asked for \"%s\", got \"%s\"";
-
-
-#ifdef YP
-static char *__ypdomain;
-#endif
-
-#define	MAXPACKET	(64*1024)
-
-typedef union {
-	HEADER hdr;
-	u_char buf[MAXPACKET];
-} querybuf;
-
-typedef union {
-	int32_t al;
-	char ac;
-} align;
-
-#ifdef DEBUG
-static void debugprintf(const char *, res_state, ...)
-	__attribute__((__format__(__printf__, 1, 3)));
-#endif
-static struct hostent *getanswer(const querybuf *, int, const char *, int,
-    res_state, struct hostent *, char *, size_t, int *);
-static void map_v4v6_address(const char *, char *);
-static void map_v4v6_hostent(struct hostent *, char **, char *);
-static void addrsort(char **, int, res_state);
-
-void dns_service(void);
-#undef dn_skipname
-int dn_skipname(const u_char *, const u_char *);
-
-#ifdef YP
-static struct hostent *_yp_hostent(char *, int, struct getnamaddr *);
-#endif
-
-static struct hostent *gethostbyname_internal(const char *, int, res_state,
-    struct hostent *, char *, size_t, int *);
-
-static const ns_src default_dns_files[] = {
-	{ NSSRC_FILES, 	NS_SUCCESS },
-	{ NSSRC_DNS, 	NS_SUCCESS },
-	{ 0, 0 }
-};
-
-
-#ifdef DEBUG
-static void
-debugprintf(const char *msg, res_state res, ...)
-{
-	_DIAGASSERT(msg != NULL);
-
-	if (res->options & RES_DEBUG) {
-		int save = errno;
-		va_list ap;
-
-		va_start (ap, res);
-		vprintf(msg, ap);
-		va_end (ap);
-		
-		errno = save;
-	}
-}
-#else
-# define debugprintf(msg, res, num) /*nada*/
-#endif
-
-#define BOUNDED_INCR(x) \
-	do { \
-		cp += (x); \
-		if (cp > eom) \
-			goto no_recovery; \
-	} while (/*CONSTCOND*/0)
-
-#define BOUNDS_CHECK(ptr, count) \
-	do { \
-		if ((ptr) + (count) > eom) \
-			goto no_recovery; \
-	} while (/*CONSTCOND*/0)
-
-static struct hostent *
-getanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
-    res_state res, struct hostent *hent, char *buf, size_t buflen, int *he)
-{
-	const HEADER *hp;
-	const u_char *cp;
-	int n;
-	size_t qlen;
-	const u_char *eom, *erdata;
-	char *bp, **ap, **hap, *ep;
-	int type, class, ancount, qdcount;
-	int haveanswer, had_error;
-	int toobig = 0;
-	char tbuf[MAXDNAME];
-	char **aliases;
-	size_t maxaliases;
-	char *addr_ptrs[MAXADDRS];
-	const char *tname;
-	int (*name_ok)(const char *);
-
-	_DIAGASSERT(answer != NULL);
-	_DIAGASSERT(qname != NULL);
-
-	tname = qname;
-	hent->h_name = NULL;
-	eom = answer->buf + anslen;
-	switch (qtype) {
-	case T_A:
-	case T_AAAA:
-		name_ok = res_hnok;
-		break;
-	case T_PTR:
-		name_ok = res_dnok;
-		break;
-	default:
-		*he = NO_RECOVERY;
-		return NULL;	/* XXX should be abort(); */
-	}
-
-	setup(aliases, maxaliases);
-	/*
-	 * find first satisfactory answer
-	 */
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	bp = buf;
-	ep = buf + buflen;
-	cp = answer->buf;
-	BOUNDED_INCR(HFIXEDSZ);
-	if (qdcount != 1)
-		goto no_recovery;
-
-	n = dn_expand(answer->buf, eom, cp, bp, (int)(ep - bp));
-	if ((n < 0) || !maybe_ok(res, bp, name_ok))
-		goto no_recovery;
-
-	BOUNDED_INCR(n + QFIXEDSZ);
-	if (qtype == T_A || qtype == T_AAAA) {
-		/* res_send() has already verified that the query name is the
-		 * same as the one we sent; this just gets the expanded name
-		 * (i.e., with the succeeding search-domain tacked on).
-		 */
-		n = (int)strlen(bp) + 1;		/* for the \0 */
-		if (n >= MAXHOSTNAMELEN)
-			goto no_recovery;
-		hent->h_name = bp;
-		bp += n;
-		/* The qname can be abbreviated, but h_name is now absolute. */
-		qname = hent->h_name;
-	}
-	hent->h_aliases = ap = aliases;
-	hent->h_addr_list = hap = addr_ptrs;
-	*ap = NULL;
-	*hap = NULL;
-	haveanswer = 0;
-	had_error = 0;
-	while (ancount-- > 0 && cp < eom && !had_error) {
-		n = dn_expand(answer->buf, eom, cp, bp, (int)(ep - bp));
-		if ((n < 0) || !maybe_ok(res, bp, name_ok)) {
-			had_error++;
-			continue;
-		}
-		cp += n;			/* name */
-		BOUNDS_CHECK(cp, 3 * INT16SZ + INT32SZ);
-		type = _getshort(cp);
- 		cp += INT16SZ;			/* type */
-		class = _getshort(cp);
- 		cp += INT16SZ + INT32SZ;	/* class, TTL */
-		n = _getshort(cp);
-		cp += INT16SZ;			/* len */
-		BOUNDS_CHECK(cp, n);
-		erdata = cp + n;
-		if (class != C_IN) {
-			/* XXX - debug? syslog? */
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) {
-			n = dn_expand(answer->buf, eom, cp, tbuf,
-			    (int)sizeof tbuf);
-			if ((n < 0) || !maybe_ok(res, tbuf, name_ok)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata)
-				goto no_recovery;
-			/* Store alias. */
-			addalias(ap, bp, aliases, maxaliases);
-			n = (int)strlen(bp) + 1;	/* for the \0 */
-			if (n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			bp += n;
-			/* Get canonical name. */
-			n = (int)strlen(tbuf) + 1;	/* for the \0 */
-			if (n > ep - bp || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strlcpy(bp, tbuf, (size_t)(ep - bp));
-			hent->h_name = bp;
-			bp += n;
-			continue;
-		}
-		if (qtype == T_PTR && type == T_CNAME) {
-			n = dn_expand(answer->buf, eom, cp, tbuf,
-			    (int)sizeof tbuf);
-			if (n < 0 || !maybe_dnok(res, tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata)
-				goto no_recovery;
-			/* Get canonical name. */
-			n = (int)strlen(tbuf) + 1;	/* for the \0 */
-			if (n > ep - bp || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strlcpy(bp, tbuf, (size_t)(ep - bp));
-			tname = bp;
-			bp += n;
-			continue;
-		}
-		if (type != qtype) {
-			if (type != T_KEY && type != T_SIG)
-				syslog(LOG_NOTICE|LOG_AUTH,
-	       "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"",
-				       qname, p_class(C_IN), p_type(qtype),
-				       p_type(type));
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		switch (type) {
-		case T_PTR:
-			if (strcasecmp(tname, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, qname, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			n = dn_expand(answer->buf, eom, cp, bp, (int)(ep - bp));
-			if ((n < 0) || !maybe_hnok(res, bp)) {
-				had_error++;
-				break;
-			}
-#if MULTI_PTRS_ARE_ALIASES
-			cp += n;
-			if (cp != erdata)
-				goto no_recovery;
-			if (!haveanswer)
-				hent->h_name = bp;
-			else
-				addalias(ap, bp, aliases, maxaliases);
-			if (n != -1) {
-				n = (int)strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-			}
-			break;
-#else
-			hent->h_name = bp;
-			if (res->options & RES_USE_INET6) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-				map_v4v6_hostent(hent, &bp, ep);
-			}
-			goto success;
-#endif
-		case T_A:
-		case T_AAAA:
-			if (strcasecmp(hent->h_name, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, hent->h_name, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			if (n != hent->h_length) {
-				cp += n;
-				continue;
-			}
-			if (type == T_AAAA) {
-				struct in6_addr in6;
-				memcpy(&in6, cp, NS_IN6ADDRSZ);
-				if (IN6_IS_ADDR_V4MAPPED(&in6)) {
-					cp += n;
-					continue;
-				}
-			}
-			if (!haveanswer) {
-				int nn;
-
-				hent->h_name = bp;
-				nn = (int)strlen(bp) + 1;	/* for the \0 */
-				bp += nn;
-			}
-
-			bp += sizeof(align) -
-			    (size_t)((u_long)bp % sizeof(align));
-
-			if (bp + n >= ep) {
-				debugprintf("size (%d) too big\n", res, n);
-				had_error++;
-				continue;
-			}
-			if (hap >= &addr_ptrs[MAXADDRS - 1]) {
-				if (!toobig++) {
-					debugprintf("Too many addresses (%d)\n",
-						res, MAXADDRS);
-				}
-				cp += n;
-				continue;
-			}
-			(void)memcpy(*hap++ = bp, cp, (size_t)n);
-			bp += n;
-			cp += n;
-			if (cp != erdata)
-				goto no_recovery;
-			break;
-		default:
-			abort();
-		}
-		if (!had_error)
-			haveanswer++;
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		*hap = NULL;
-		/*
-		 * Note: we sort even if host can take only one address
-		 * in its return structures - should give it the "best"
-		 * address in that case, not some random one
-		 */
-		if (res->nsort && haveanswer > 1 && qtype == T_A)
-			addrsort(addr_ptrs, haveanswer, res);
-		if (!hent->h_name) {
-			n = (int)strlen(qname) + 1;	/* for the \0 */
-			if (n > ep - bp || n >= MAXHOSTNAMELEN)
-				goto no_recovery;
-			strlcpy(bp, qname, (size_t)(ep - bp));
-			hent->h_name = bp;
-			bp += n;
-		}
-		if (res->options & RES_USE_INET6)
-			map_v4v6_hostent(hent, &bp, ep);
-	    	goto success;
-	}
-no_recovery:
-	free(aliases);
-	*he = NO_RECOVERY;
-	return NULL;
-success:
-	bp = (char *)ALIGN(bp);
-	n = (int)(ap - aliases);
-	qlen = (n + 1) * sizeof(*hent->h_aliases);
-	if ((size_t)(ep - bp) < qlen)
-		goto nospc;
-	hent->h_aliases = (void *)bp;
-	memcpy(bp, aliases, qlen);
-	free(aliases);
-	aliases = NULL;
-
-	bp += qlen;
-	n = (int)(hap - addr_ptrs);
-	qlen = (n + 1) * sizeof(*hent->h_addr_list);
-	if ((size_t)(ep - bp) < qlen)
-		goto nospc;
-	hent->h_addr_list = (void *)bp;
-	memcpy(bp, addr_ptrs, qlen);
-	*he = NETDB_SUCCESS;
-	return hent;
-nospc:
-	free(aliases);
-	errno = ENOSPC;
-	*he = NETDB_INTERNAL;
-	return NULL;
-}
-
-struct hostent *
-gethostbyname_r(const char *name, struct hostent *hp, char *buf, size_t buflen,
-    int *he)
-{
-	res_state res = __res_get_state();
-
-	if (res == NULL) {
-		*he = NETDB_INTERNAL;
-		return NULL;
-	}
-
-	_DIAGASSERT(name != NULL);
-
-	if (res->options & RES_USE_INET6) {
-		struct hostent *nhp = gethostbyname_internal(name, AF_INET6,
-		    res, hp, buf, buflen, he);
-		if (nhp) {
-			__res_put_state(res);
-			return nhp;
-		}
-	}
-	hp = gethostbyname_internal(name, AF_INET, res, hp, buf, buflen, he);
-	__res_put_state(res);
-	return hp;
-}
-
-struct hostent *
-gethostbyname2_r(const char *name, int af, struct hostent *hp, char *buf,
-    size_t buflen, int *he)
-{
-	res_state res = __res_get_state();
-
-	if (res == NULL) {
-		*he = NETDB_INTERNAL;
-		return NULL;
-	}
-	hp = gethostbyname_internal(name, af, res, hp, buf, buflen, he);
-	__res_put_state(res);
-	return hp;
-}
-
-static struct hostent *
-gethostbyname_internal(const char *name, int af, res_state res,
-    struct hostent *hp, char *buf, size_t buflen, int *he)
-{
-	const char *cp;
-	struct getnamaddr info;
-	char hbuf[MAXHOSTNAMELEN];
-	size_t size;
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_hf_gethtbyname, NULL)
-		{ NSSRC_DNS, _dns_gethtbyname, NULL },	/* force -DHESIOD */
-		NS_NIS_CB(_yp_gethtbyname, NULL)
-		NS_NULL_CB
-	};
-
-	_DIAGASSERT(name != NULL);
-
-	switch (af) {
-	case AF_INET:
-		size = NS_INADDRSZ;
-		break;
-	case AF_INET6:
-		size = NS_IN6ADDRSZ;
-		break;
-	default:
-		*he = NETDB_INTERNAL;
-		errno = EAFNOSUPPORT;
-		return NULL;
-	}
-	if (buflen < size)
-		goto nospc;
-
-	hp->h_addrtype = af;
-	hp->h_length = (int)size;
-
-	/*
-	 * if there aren't any dots, it could be a user-level alias.
-	 * this is also done in res_nquery() since we are not the only
-	 * function that looks up host names.
-	 */
-	if (!strchr(name, '.') && (cp = res_hostalias(res, name,
-	    hbuf, sizeof(hbuf))))
-		name = cp;
-
-	/*
-	 * disallow names consisting only of digits/dots, unless
-	 * they end in a dot.
-	 */
-	if (isdigit((u_char) name[0]))
-		for (cp = name;; ++cp) {
-			if (!*cp) {
-				if (*--cp == '.')
-					break;
-				/*
-				 * All-numeric, no dot at the end.
-				 * Fake up a hostent as if we'd actually
-				 * done a lookup.
-				 */
-				goto fake;
-			}
-			if (!isdigit((u_char) *cp) && *cp != '.') 
-				break;
-		}
-	if ((isxdigit((u_char) name[0]) && strchr(name, ':') != NULL) ||
-	    name[0] == ':')
-		for (cp = name;; ++cp) {
-			if (!*cp) {
-				if (*--cp == '.')
-					break;
-				/*
-				 * All-IPv6-legal, no dot at the end.
-				 * Fake up a hostent as if we'd actually
-				 * done a lookup.
-				 */
-				goto fake;
-			}
-			if (!isxdigit((u_char) *cp) && *cp != ':' && *cp != '.')
-				break;
-		}
-
-	*he = NETDB_INTERNAL;
-	info.hp = hp;
-	info.buf = buf;
-	info.buflen = buflen;
-	info.he = he;
-	if (nsdispatch(&info, dtab, NSDB_HOSTS, "gethostbyname",
-	    default_dns_files, name, strlen(name), af) != NS_SUCCESS)
-		return NULL;
-	*he = NETDB_SUCCESS;
-	return hp;
-nospc:
-	*he = NETDB_INTERNAL;
-	errno = ENOSPC;
-	return NULL;
-fake:
-	HENT_ARRAY(hp->h_addr_list, 1, buf, buflen);
-	HENT_ARRAY(hp->h_aliases, 0, buf, buflen);
-
-	hp->h_aliases[0] = NULL;
-	if (size > buflen)
-		goto nospc;
-
-	if (inet_pton(af, name, buf) <= 0) {
-		*he = HOST_NOT_FOUND;
-		return NULL;
-	}
-	hp->h_addr_list[0] = buf;
-	hp->h_addr_list[1] = NULL;
-	buf += size;
-	buflen -= size;
-	HENT_SCOPY(hp->h_name, name, buf, buflen);
-	if (res->options & RES_USE_INET6)
-		map_v4v6_hostent(hp, &buf, buf + buflen);
-	*he = NETDB_SUCCESS;
-	return hp;
-}
-
-struct hostent *
-gethostbyaddr_r(const void *addr, socklen_t len, int af, struct hostent *hp,
-    char *buf, size_t buflen, int *he)
-{
-	const u_char *uaddr = (const u_char *)addr;
-	socklen_t size;
-	struct getnamaddr info;
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_hf_gethtbyaddr, NULL)
-		{ NSSRC_DNS, _dns_gethtbyaddr, NULL },	/* force -DHESIOD */
-		NS_NIS_CB(_yp_gethtbyaddr, NULL)
-		NS_NULL_CB
-	};
-	
-	_DIAGASSERT(addr != NULL);
-
-	if (af == AF_INET6 && len == NS_IN6ADDRSZ &&
-	    (IN6_IS_ADDR_LINKLOCAL((const struct in6_addr *)addr) ||
-	     IN6_IS_ADDR_SITELOCAL((const struct in6_addr *)addr))) {
-		*he = HOST_NOT_FOUND;
-		return NULL;
-	}
-	if (af == AF_INET6 && len == NS_IN6ADDRSZ &&
-	    (IN6_IS_ADDR_V4MAPPED((const struct in6_addr *)addr) ||
-	     IN6_IS_ADDR_V4COMPAT((const struct in6_addr *)addr))) {
-		/* Unmap. */
-		uaddr += NS_IN6ADDRSZ - NS_INADDRSZ;
-		addr = uaddr;
-		af = AF_INET;
-		len = NS_INADDRSZ;
-	}
-	switch (af) {
-	case AF_INET:
-		size = NS_INADDRSZ;
-		break;
-	case AF_INET6:
-		size = NS_IN6ADDRSZ;
-		break;
-	default:
-		errno = EAFNOSUPPORT;
-		*he = NETDB_INTERNAL;
-		return NULL;
-	}
-	if (size != len) {
-		errno = EINVAL;
-		*he = NETDB_INTERNAL;
-		return NULL;
-	}
-	info.hp = hp;
-	info.buf = buf;
-	info.buflen = buflen;
-	info.he = he;
-	*he = NETDB_INTERNAL;
-	if (nsdispatch(&info, dtab, NSDB_HOSTS, "gethostbyaddr",
-	    default_dns_files, uaddr, len, af) != NS_SUCCESS)
-		return NULL;
-	*he = NETDB_SUCCESS;
-	return hp;
-}
-
-struct hostent *
-gethostent_r(FILE *hf, struct hostent *hent, char *buf, size_t buflen, int *he)
-{
-	char *p, *name;
-	char *cp, **q;
-	int af, len;
-	size_t anum;
-	char **aliases;
-	size_t maxaliases;
-	struct in6_addr host_addr;
-
-	if (hf == NULL) {
-		*he = NETDB_INTERNAL;
-		errno = EINVAL;
-		return NULL;
-	}
-	p = NULL;
-	setup(aliases, maxaliases);
-	for (;;) {
-		free(p);
-		p = fparseln(hf, NULL, NULL, NULL, FPARSELN_UNESCALL);
-		if (p == NULL) {
-			free(aliases);
-			*he = HOST_NOT_FOUND;
-			return NULL;
-		}
-		if (!(cp = strpbrk(p, " \t")))
-			continue;
-		*cp++ = '\0';
-		if (inet_pton(AF_INET6, p, &host_addr) > 0) {
-			af = AF_INET6;
-			len = NS_IN6ADDRSZ;
-		} else {
-			if (inet_pton(AF_INET, p, &host_addr) <= 0)
-				continue;
-
-			res_state res = __res_get_state();
-			if (res == NULL)
-				goto nospc;
-			if (res->options & RES_USE_INET6) {
-				map_v4v6_address(buf, buf);
-				af = AF_INET6;
-				len = NS_IN6ADDRSZ;
-			} else {
-				af = AF_INET;
-				len = NS_INADDRSZ;
-			}
-			__res_put_state(res);
-		}
-
-		/* if this is not something we're looking for, skip it. */
-		if (hent->h_addrtype != 0 && hent->h_addrtype != af)
-			continue;
-		if (hent->h_length != 0 && hent->h_length != len)
-			continue;
-
-		while (*cp == ' ' || *cp == '\t')
-			cp++;
-		if ((cp = strpbrk(name = cp, " \t")) != NULL)
-			*cp++ = '\0';
-		q = aliases;
-		while (cp && *cp) {
-			if (*cp == ' ' || *cp == '\t') {
-				cp++;
-				continue;
-			}
-			addalias(q, cp, aliases, maxaliases);
-			if ((cp = strpbrk(cp, " \t")) != NULL)
-				*cp++ = '\0';
-		}
-		break;
-	}
-	hent->h_length = len;
-	hent->h_addrtype = af;
-	HENT_ARRAY(hent->h_addr_list, 1, buf, buflen);
-	anum = (size_t)(q - aliases);
-	HENT_ARRAY(hent->h_aliases, anum, buf, buflen);
-	HENT_COPY(hent->h_addr_list[0], &host_addr, hent->h_length, buf,
-	    buflen);
-	hent->h_addr_list[1] = NULL;
-
-	HENT_SCOPY(hent->h_name, name, buf, buflen);
-	for (size_t i = 0; i < anum; i++)
-		HENT_SCOPY(hent->h_aliases[i], aliases[i], buf, buflen);
-	hent->h_aliases[anum] = NULL;
-
-	*he = NETDB_SUCCESS;
-	free(p);
-	free(aliases);
-	return hent;
-nospc:
-	free(p);
-	free(aliases);
-	errno = ENOSPC;
-	*he = NETDB_INTERNAL;
-	return NULL;
-}
-
-static void
-map_v4v6_address(const char *src, char *dst)
-{
-	u_char *p = (u_char *)dst;
-	char tmp[NS_INADDRSZ];
-	int i;
-
-	_DIAGASSERT(src != NULL);
-	_DIAGASSERT(dst != NULL);
-
-	/* Stash a temporary copy so our caller can update in place. */
-	(void)memcpy(tmp, src, NS_INADDRSZ);
-	/* Mark this ipv6 addr as a mapped ipv4. */
-	for (i = 0; i < 10; i++)
-		*p++ = 0x00;
-	*p++ = 0xff;
-	*p++ = 0xff;
-	/* Retrieve the saved copy and we're done. */
-	(void)memcpy(p, tmp, NS_INADDRSZ);
-}
-
-static void
-map_v4v6_hostent(struct hostent *hp, char **bpp, char *ep)
-{
-	char **ap;
-
-	_DIAGASSERT(hp != NULL);
-	_DIAGASSERT(bpp != NULL);
-	_DIAGASSERT(ep != NULL);
-
-	if (hp->h_addrtype != AF_INET || hp->h_length != NS_INADDRSZ)
-		return;
-	hp->h_addrtype = AF_INET6;
-	hp->h_length = NS_IN6ADDRSZ;
-	for (ap = hp->h_addr_list; *ap; ap++) {
-		int i = (int)(sizeof(align) -
-		    (size_t)((u_long)*bpp % sizeof(align)));
-
-		if (ep - *bpp < (i + NS_IN6ADDRSZ)) {
-			/* Out of memory.  Truncate address list here.  XXX */
-			*ap = NULL;
-			return;
-		}
-		*bpp += i;
-		map_v4v6_address(*ap, *bpp);
-		*ap = *bpp;
-		*bpp += NS_IN6ADDRSZ;
-	}
-}
-
-static void
-addrsort(char **ap, int num, res_state res)
-{
-	int i, j;
-	char **p;
-	short aval[MAXADDRS];
-	int needsort = 0;
-
-	_DIAGASSERT(ap != NULL);
-
-	p = ap;
-	for (i = 0; i < num; i++, p++) {
-	    for (j = 0 ; (unsigned)j < res->nsort; j++)
-		if (res->sort_list[j].addr.s_addr == 
-		    (((struct in_addr *)(void *)(*p))->s_addr &
-		    res->sort_list[j].mask))
-			break;
-	    aval[i] = j;
-	    if (needsort == 0 && i > 0 && j < aval[i-1])
-		needsort = i;
-	}
-	if (!needsort)
-	    return;
-
-	while (needsort < num) {
-	    for (j = needsort - 1; j >= 0; j--) {
-		if (aval[j] > aval[j+1]) {
-		    char *hp;
-
-		    i = aval[j];
-		    aval[j] = aval[j+1];
-		    aval[j+1] = i;
-
-		    hp = ap[j];
-		    ap[j] = ap[j+1];
-		    ap[j+1] = hp;
-		} else
-		    break;
-	    }
-	    needsort++;
-	}
-}
-
-
-/*ARGSUSED*/
-int
-_dns_gethtbyname(void *rv, void *cb_data, va_list ap)
-{
-	querybuf *buf;
-	int n, type;
-	struct hostent *hp;
-	const char *name;
-	res_state res;
-	struct getnamaddr *info = rv;
-
-	_DIAGASSERT(rv != NULL);
-
-	name = va_arg(ap, char *);
-	/* NOSTRICT skip string len */(void)va_arg(ap, int);
-	info->hp->h_addrtype = va_arg(ap, int);
-
-	switch (info->hp->h_addrtype) {
-	case AF_INET:
-		info->hp->h_length = NS_INADDRSZ;
-		type = T_A;
-		break;
-	case AF_INET6:
-		info->hp->h_length = NS_IN6ADDRSZ;
-		type = T_AAAA;
-		break;
-	default:
-		return NS_UNAVAIL;
-	}
-	buf = malloc(sizeof(*buf));
-	if (buf == NULL) {
-		*info->he = NETDB_INTERNAL;
-		return NS_NOTFOUND;
-	}
-	res = __res_get_state();
-	if (res == NULL) {
-		free(buf);
-		*info->he = NETDB_INTERNAL;
-		return NS_NOTFOUND;
-	}
-	n = res_nsearch(res, name, C_IN, type, buf->buf, (int)sizeof(buf->buf));
-	if (n < 0) {
-		free(buf);
-		debugprintf("res_nsearch failed (%d)\n", res, n);
-		__res_put_state(res);
-		return NS_NOTFOUND;
-	}
-	hp = getanswer(buf, n, name, type, res, info->hp, info->buf,
-	    info->buflen, info->he);
-	free(buf);
-	__res_put_state(res);
-	if (hp == NULL)
-		switch (*info->he) {
-		case HOST_NOT_FOUND:
-			return NS_NOTFOUND;
-		case TRY_AGAIN:
-			return NS_TRYAGAIN;
-		default:
-			return NS_UNAVAIL;
-		}
-	return NS_SUCCESS;
-}
-
-/*ARGSUSED*/
-int
-_dns_gethtbyaddr(void *rv, void	*cb_data, va_list ap)
-{
-	char qbuf[MAXDNAME + 1], *qp, *ep;
-	int n;
-	querybuf *buf;
-	struct hostent *hp;
-	const unsigned char *uaddr;
-	int advance;
-	res_state res;
-	char *bf;
-	size_t blen;
-	struct getnamaddr *info = rv;
-
-	_DIAGASSERT(rv != NULL);
-
-	uaddr = va_arg(ap, unsigned char *);
-	info->hp->h_length = va_arg(ap, int);
-	info->hp->h_addrtype = va_arg(ap, int);
-
-	switch (info->hp->h_addrtype) {
-	case AF_INET:
-		(void)snprintf(qbuf, sizeof(qbuf), "%u.%u.%u.%u.in-addr.arpa",
-		    (uaddr[3] & 0xff), (uaddr[2] & 0xff),
-		    (uaddr[1] & 0xff), (uaddr[0] & 0xff));
-		break;
-
-	case AF_INET6:
-		qp = qbuf;
-		ep = qbuf + sizeof(qbuf) - 1;
-		for (n = NS_IN6ADDRSZ - 1; n >= 0; n--) {
-			advance = snprintf(qp, (size_t)(ep - qp), "%x.%x.",
-			    uaddr[n] & 0xf,
-			    ((unsigned int)uaddr[n] >> 4) & 0xf);
-			if (advance > 0 && qp + advance < ep)
-				qp += advance;
-			else
-				goto norecovery;
-		}
-		if (strlcat(qbuf, "ip6.arpa", sizeof(qbuf)) >= sizeof(qbuf))
-			goto norecovery;
-		break;
-	default:
-		goto norecovery;
-	}
-
-	buf = malloc(sizeof(*buf));
-	if (buf == NULL) {
-		goto nospc;
-	}
-	res = __res_get_state();
-	if (res == NULL) {
-		free(buf);
-		goto nospc;
-	}
-	n = res_nquery(res, qbuf, C_IN, T_PTR, buf->buf, (int)sizeof(buf->buf));
-	if (n < 0) {
-		free(buf);
-		debugprintf("res_nquery failed (%d)\n", res, n);
-		__res_put_state(res);
-		*info->he = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	}
-	hp = getanswer(buf, n, qbuf, T_PTR, res, info->hp, info->buf,
-	    info->buflen, info->he);
-	free(buf);
-	if (hp == NULL) {
-		__res_put_state(res);
-		switch (*info->he) {
-		case HOST_NOT_FOUND:
-			return NS_NOTFOUND;
-		case TRY_AGAIN:
-			return NS_TRYAGAIN;
-		default:
-			return NS_UNAVAIL;
-		}
-	}
-
-	bf = (void *)(hp->h_addr_list + 2);
-	blen = (size_t)(bf - info->buf);
-	if (blen + info->hp->h_length > info->buflen)
-		goto nospc;
-	hp->h_addr_list[0] = bf;
-	hp->h_addr_list[1] = NULL;
-	(void)memcpy(bf, uaddr, (size_t)info->hp->h_length);
-	if (info->hp->h_addrtype == AF_INET && (res->options & RES_USE_INET6)) {
-		if (blen + NS_IN6ADDRSZ > info->buflen) {
-			__res_put_state(res);
-			goto nospc;
-		}
-		map_v4v6_address(bf, bf);
-		hp->h_addrtype = AF_INET6;
-		hp->h_length = NS_IN6ADDRSZ;
-	}
-
-	__res_put_state(res);
-	*info->he = NETDB_SUCCESS;
-	return NS_SUCCESS;
-nospc:
-	*info->he = NETDB_INTERNAL;
-	return NS_UNAVAIL;
-norecovery:
-	*info->he = NO_RECOVERY;
-	return NS_UNAVAIL;
-}
-
-#ifdef YP
-/*ARGSUSED*/
-static struct hostent *
-_yp_hostent(char *line, int af, struct getnamaddr *info)
-{
-	struct in6_addr host_addrs[MAXADDRS];
-	char **aliases;
-	size_t maxaliases;
-	char *p = line;
-	char *cp, **q, *ptr;
-	size_t len, anum, i;
-	int addrok;
-	int more;
-	size_t naddrs;
-	struct hostent *hp = info->hp;
-
-	_DIAGASSERT(line != NULL);
-
-	hp->h_name = NULL;
-	hp->h_addrtype = af;
-	switch (af) {
-	case AF_INET:
-		hp->h_length = NS_INADDRSZ;
-		break;
-	case AF_INET6:
-		hp->h_length = NS_IN6ADDRSZ;
-		break;
-	default:
-		return NULL;
-	}
-	setup(aliases, maxaliases);
-	naddrs = 0;
-	q = aliases;
-
-nextline:
-	/* check for host_addrs overflow */
-	if (naddrs >= __arraycount(host_addrs))
-		goto done;
-
-	more = 0;
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		goto done;
-	*cp++ = '\0';
-
-	/* p has should have an address */
-	addrok = inet_pton(af, p, &host_addrs[naddrs]);
-	if (addrok != 1) {
-		/* skip to the next line */
-		while (cp && *cp) {
-			if (*cp == '\n') {
-				cp++;
-				goto nextline;
-			}
-			cp++;
-		}
-		goto done;
-	}
-	naddrs++;
-
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = cp;
-	cp = strpbrk(p, " \t\n");
-	if (cp != NULL) {
-		if (*cp == '\n')
-			more = 1;
-		*cp++ = '\0';
-	}
-	if (!hp->h_name)
-		hp->h_name = p;
-	else if (strcmp(hp->h_name, p) == 0)
-		;
-	else
-		addalias(q, p, aliases, maxaliases);
-	p = cp;
-	if (more)
-		goto nextline;
-
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (*cp == '\n') {
-			cp++;
-			goto nextline;
-		}
-		addalias(q, cp, aliases, maxaliases);
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-
-done:
-	if (hp->h_name == NULL) {
-		free(aliases);
-		return NULL;
-	}
-
-	ptr = info->buf;
-	len = info->buflen;
-
-	anum = (size_t)(q - aliases);
-	HENT_ARRAY(hp->h_addr_list, naddrs, ptr, len);
-	HENT_ARRAY(hp->h_aliases, anum, ptr, len);
-
-	for (i = 0; i < naddrs; i++)
-		HENT_COPY(hp->h_addr_list[i], &host_addrs[i], hp->h_length,
-		    ptr, len);
-	hp->h_addr_list[naddrs] = NULL;
-
-	HENT_SCOPY(hp->h_name, hp->h_name, ptr, len);
-
-	for (i = 0; i < anum; i++)
-		HENT_SCOPY(hp->h_aliases[i], aliases[i], ptr, len);
-	hp->h_aliases[anum] = NULL;
-	free(aliases);
-
-	return hp;
-nospc:
-	free(aliases);
-	*info->he = NETDB_INTERNAL;
-	errno = ENOSPC;
-	return NULL;
-}
-
-/*ARGSUSED*/
-int
-_yp_gethtbyaddr(void *rv, void *cb_data, va_list ap)
-{
-	struct hostent *hp = NULL;
-	char *ypcurrent;
-	int ypcurrentlen, r;
-	char name[INET6_ADDRSTRLEN];	/* XXX enough? */
-	const unsigned char *uaddr;
-	int af;
-	const char *map;
-	struct getnamaddr *info = rv;
-
-	_DIAGASSERT(rv != NULL);
-
-	uaddr = va_arg(ap, unsigned char *);
-	/* NOSTRICT skip len */(void)va_arg(ap, int);
-	af = va_arg(ap, int);
-	
-	if (!__ypdomain) {
-		if (_yp_check(&__ypdomain) == 0)
-			return NS_UNAVAIL;
-	}
-	/*
-	 * XXX unfortunately, we cannot support IPv6 extended scoped address
-	 * notation here.  gethostbyaddr() is not scope-aware.  too bad.
-	 */
-	if (inet_ntop(af, uaddr, name, (socklen_t)sizeof(name)) == NULL)
-		return NS_UNAVAIL;
-	switch (af) {
-	case AF_INET:
-		map = "hosts.byaddr";
-		break;
-	default:
-		map = "ipnodes.byaddr";
-		break;
-	}
-	ypcurrent = NULL;
-	r = yp_match(__ypdomain, map, name,
-		(int)strlen(name), &ypcurrent, &ypcurrentlen);
-	if (r == 0)
-		hp = _yp_hostent(ypcurrent, af, info);
-	else
-		hp = NULL;
-	free(ypcurrent);
-	if (hp == NULL) {
-		*info->he = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	}
-	return NS_SUCCESS;
-}
-
-/*ARGSUSED*/
-int
-_yp_gethtbyname(void *rv, void *cb_data, va_list ap)
-{
-	struct hostent *hp;
-	char *ypcurrent;
-	int ypcurrentlen, r;
-	const char *name;
-	int af;
-	const char *map;
-	struct getnamaddr *info = rv;
-
-	_DIAGASSERT(rv != NULL);
-
-	name = va_arg(ap, char *);
-	/* NOSTRICT skip string len */(void)va_arg(ap, int);
-	af = va_arg(ap, int);
-
-	if (!__ypdomain) {
-		if (_yp_check(&__ypdomain) == 0)
-			return NS_UNAVAIL;
-	}
-	switch (af) {
-	case AF_INET:
-		map = "hosts.byname";
-		break;
-	default:
-		map = "ipnodes.byname";
-		break;
-	}
-	ypcurrent = NULL;
-	r = yp_match(__ypdomain, map, name,
-		(int)strlen(name), &ypcurrent, &ypcurrentlen);
-	if (r == 0)
-		hp = _yp_hostent(ypcurrent, af, info);
-	else
-		hp = NULL;
-	free(ypcurrent);
-	if (hp == NULL) {
-		*info->he = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	}
-	return NS_SUCCESS;
-}
-#endif
-
-/*
- * Non-reentrant versions.
- */
-FILE *_h_file;
-static struct hostent h_ent;
-static char h_buf[16384];
-
-struct hostent *
-gethostbyaddr(const void *addr, socklen_t len, int af) {
-	return gethostbyaddr_r(addr, len, af, &h_ent, h_buf, sizeof(h_buf),
-	    &h_errno);
-}
-
-struct hostent *
-gethostbyname(const char *name) {
-	return gethostbyname_r(name, &h_ent, h_buf, sizeof(h_buf), &h_errno);
-}
-
-struct hostent *
-gethostbyname2(const char *name, int af) {
-	return gethostbyname2_r(name, af, &h_ent, h_buf, sizeof(h_buf),
-	    &h_errno);
-}
-
-struct hostent *
-gethostent(void)
-{
-	if (_h_file == NULL) {
-		sethostent_r(&_h_file);
-		if (_h_file == NULL) {
-			h_errno = NETDB_INTERNAL;
-			return NULL;
-		}
-	}
-	memset(&h_ent, 0, sizeof(h_ent));
-	return gethostent_r(_h_file, &h_ent, h_buf, sizeof(h_buf), &h_errno);
-}
-
diff --git a/lib/libc/net/gethostbyname.3 b/lib/libc/net/gethostbyname.3
deleted file mode 100644
index 4d1cb5a12..000000000
--- a/lib/libc/net/gethostbyname.3
+++ /dev/null
@@ -1,333 +0,0 @@
-.\"	$NetBSD: gethostbyname.3,v 1.29 2013/08/19 07:18:42 christos Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\" 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.
-.\"
-.\"     @(#)gethostbyname.3   8.4 (Berkeley) 5/25/95
-.\"
-.Dd August 19, 2013
-.Dt GETHOSTBYNAME 3
-.Os
-.Sh NAME
-.Nm gethostbyname ,
-.Nm gethostbyname2 ,
-.Nm gethostbyaddr ,
-.Nm gethostent ,
-.Nm sethostent ,
-.Nm endhostent ,
-.Nm herror ,
-.Nm hstrerror
-.Nd get network host entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netdb.h
-.Fd extern int h_errno;
-.Ft struct hostent *
-.Fn gethostbyname "const char *name"
-.Ft struct hostent *
-.Fn gethostbyname2 "const char *name" "int af"
-.Ft struct hostent *
-.Fn gethostbyaddr "const void *addr" "socklen_t len" "int type"
-.Ft struct hostent *
-.Fn gethostent void
-.Ft void
-.Fn sethostent "int stayopen"
-.Ft void
-.Fn endhostent void
-.Ft void
-.Fn herror "const char *string"
-.Ft const char *
-.Fn hstrerror "int err"
-.Sh DESCRIPTION
-The
-.Fn gethostbyname ,
-.Fn gethostbyname2
-and
-.Fn gethostbyaddr
-functions
-each return a pointer to an object with the
-following structure describing an internet host.
-.Bd -literal
-struct	hostent {
-	char	*h_name;	/* official name of host */
-	char	**h_aliases;	/* alias list */
-	int	h_addrtype;	/* host address type */
-	int	h_length;	/* length of address */
-	char	**h_addr_list;	/* list of addresses from name server */
-};
-#define	h_addr  h_addr_list[0]	/* address, for backward compatibility */
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width h_addr_list
-.It Fa h_name
-Official name of the host.
-.It Fa h_aliases
-A NULL-terminated array of alternative names for the host.
-.It Fa h_addrtype
-The type of address being returned; currently always
-.Dv AF_INET .
-.It Fa h_length
-The length, in bytes, of the address.
-.It Fa h_addr_list
-A NULL-terminated array of network addresses for the host.
-Host addresses are returned in network byte order.
-.It Fa h_addr
-The first address in
-.Fa h_addr_list ;
-this is for backward compatibility.
-.El
-.Pp
-In the case of
-.Fn gethostbyname
-and
-.Fn gethostbyname2 ,
-the host is specified by name,
-or using a string representation of a numeric address.
-In the case of
-.Fn gethostbyaddr ,
-the host is specified using a binary representation of an address.
-.Pp
-The returned
-.Ft "struct hostent"
-structure may contain
-the result of a simple string to binary conversion,
-information obtained from the domain name resolver (see
-.Xr resolver 3 ) ,
-broken-out fields from a line in
-.Pa /etc/hosts ,
-or database entries supplied by the
-.Xr yp 8
-system.
-The order of the lookups is controlled by the
-.Sq hosts
-entry in
-.Xr nsswitch.conf 5 .
-.Pp
-When using the domain name resolver,
-.Fn gethostbyname
-and
-.Fn gethostbyname2
-will search for the named host in the current domain and its parents
-unless the name ends in a dot.
-If the name contains no dot, and if the environment variable
-.Dq Ev HOSTALIASES
-contains the name of an alias file, the alias file will first be searched
-for an alias matching the input name.
-See
-.Xr hostname 7
-for the domain search procedure and the alias file format.
-.Pp
-The
-.Fn gethostbyname2
-function is an evolution of
-.Fn gethostbyname
-which is intended to allow lookups in address families other than
-.Dv AF_INET ,
-for example
-.Dv AF_INET6 .
-Currently the
-.Fa af
-argument must be specified as
-.Dv AF_INET
-or
-.Dv AF_INET6 ,
-else the function will return
-.Dv NULL
-after having set
-.Va h_errno
-to
-.Dv NETDB_INTERNAL .
-.Pp
-The
-.Fn gethostent
-function
-reads the next line of the
-.Pa /etc/hosts
-file, opening the file if necessary.
-.Pp
-The
-.Fn sethostent
-function
-may be used to request the use of a connected
-.Tn TCP
-socket for queries.
-If the
-.Fa stayopen
-flag is non-zero,
-this sets the option to send all queries to the name server using
-.Tn TCP
-and to retain the connection after each call to
-.Fn gethostbyname ,
-.Fn gethostbyname2 ,
-or
-.Fn gethostbyaddr .
-Otherwise, queries are performed using
-.Tn UDP
-datagrams.
-.Pp
-The
-.Fn endhostent
-function
-closes the
-.Tn TCP
-connection.
-.Pp
-The
-.Fn herror
-function writes a message to the diagnostic output consisting of the
-string parameter
-.Fa s ,
-the constant string ": ", and a message corresponding to the value of
-.Va h_errno .
-.Pp
-The
-.Fn hstrerror
-function returns a string which is the message text corresponding to the
-value of the
-.Fa err
-parameter.
-.Sh FILES
-.Bl -tag -width /etc/hosts -compact
-.It Pa /etc/hosts
-.El
-.Sh DIAGNOSTICS
-Error return status from
-.Fn gethostbyent ,
-.Fn gethostbyname ,
-.Fn gethostbyname2 ,
-and
-.Fn gethostbyaddr
-is indicated by return of a null pointer.
-The external integer
-.Va h_errno
-may then be checked to see whether this is a temporary failure
-or an invalid or unknown host.
-The routine
-.Fn herror
-can be used to print an error message describing the failure.
-If its argument
-.Fa string
-is
-.Pf non Dv -NULL ,
-it is printed, followed by a colon and a space.
-The error message is printed with a trailing newline.
-.Pp
-The variable
-.Va h_errno
-can have the following values:
-.Bl -tag -width HOST_NOT_FOUND
-.It Dv HOST_NOT_FOUND
-No such host is known.
-.It Dv TRY_AGAIN
-This is usually a temporary error
-and means that the local server did not receive
-a response from an authoritative server.
-A retry at some later time may succeed.
-.It Dv NO_RECOVERY
-Some unexpected server failure was encountered.
-This is a non-recoverable error.
-.It Dv NO_DATA
-The requested name is valid but does not have an IP address;
-this is not a temporary error.
-This means that the name is known to the name server but there is no address
-associated with this name.
-Another type of request to the name server using this domain name
-will result in an answer;
-for example, a mail-forwarder may be registered for this domain.
-.El
-.Sh SEE ALSO
-.Xr resolver 3 ,
-.Xr hosts 5 ,
-.Xr nsswitch.conf 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Sh HISTORY
-The
-.Fn herror
-function appeared in
-.Bx 4.3 .
-The
-.Fn endhostent ,
-.Fn gethostbyaddr ,
-.Fn gethostbyname ,
-.Fn gethostent ,
-and
-.Fn sethostent
-functions appeared in
-.Bx 4.2 .
-The
-.Fn gethostbyname2
-function first appeared in bind-4.9.4.
-IPv6 support was implemented in WIDE Hydrangea IPv6 protocol stack kit.
-.Sh CAVEATS
-If the search routines specified in
-.Xr nsswitch.conf 5
-decide to read the
-.Pa /etc/hosts
-file,
-.Fn gethostbyname ,
-.Fn gethostbyname2 ,
-and
-.Fn gethostbyaddr
-will
-read the next line of the file,
-re-opening the file if necessary.
-.Pp
-The
-.Fn sethostent
-function
-opens and/or rewinds the file
-.Pa /etc/hosts .
-If the
-.Fa stayopen
-argument is non-zero,
-the file will not be closed after each call to
-.Fn gethostbyname ,
-.Fn gethostbyname2 ,
-.Fn gethostbyaddr ,
-or
-.Fn gethostent .
-.Pp
-The
-.Fn endhostent
-function closes the file.
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Only the Internet
-address format is currently understood.
-.Pp
-The
-.Fn gethostent
-does not currently follow the search order specified in
-.Xr nsswitch.conf 5
-and only reads the
-.Pa /etc/hosts
-file.
diff --git a/lib/libc/net/getifaddrs.3 b/lib/libc/net/getifaddrs.3
deleted file mode 100644
index be1e53079..000000000
--- a/lib/libc/net/getifaddrs.3
+++ /dev/null
@@ -1,197 +0,0 @@
-.\"	$NetBSD: getifaddrs.3,v 1.14 2013/04/07 23:12:36 wiz Exp $
-.\"	BSDI	getifaddrs.3,v 2.5 2000/02/23 14:51:59 dab Exp
-.\"
-.\" Copyright (c) 1995, 1999
-.\"	Berkeley Software Design, Inc.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.Dd April 7, 2013
-.Dt GETIFADDRS 3
-.Os
-.Sh NAME
-.Nm getifaddrs
-.Nd get interface addresses
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In ifaddrs.h
-.Ft int
-.Fn getifaddrs "struct ifaddrs **ifap"
-.Ft void
-.Fn freeifaddrs "struct ifaddrs *ifp"
-.Sh DESCRIPTION
-The
-.Fn getifaddrs
-function stores a reference to a linked list of the network interfaces
-on the local machine in the memory referenced by
-.Fa ifap .
-The list consists of
-.Nm ifaddrs
-structures, as defined in the include file
-.In ifaddrs.h .
-The
-.Nm ifaddrs
-structure contains at least the following entries:
-.Bd -literal
-    struct ifaddrs   *ifa_next;         /* Pointer to next struct */
-    char             *ifa_name;         /* Interface name */
-    u_int             ifa_flags;        /* Interface flags */
-    struct sockaddr  *ifa_addr;         /* Interface address */
-    struct sockaddr  *ifa_netmask;      /* Interface netmask */
-    struct sockaddr  *ifa_broadaddr;    /* Interface broadcast address */
-    struct sockaddr  *ifa_dstaddr;      /* P2P interface destination */
-    void             *ifa_data;		/* Address specific data */
-.Ed
-.Pp
-The
-.Li ifa_next
-field contains a pointer to the next structure on the list.
-This field is
-.Dv NULL
-in last structure on the list.
-.Pp
-The
-.Li ifa_name
-field contains the interface name.
-.Pp
-The
-.Li ifa_flags
-field contains the interface flags, as set by
-.Xr ifconfig 8
-utility.
-.Pp
-The
-.Li ifa_addr
-field references either the address of the interface or the link level
-address of the interface, if one exists, otherwise it is
-.Dv NULL .
-(The
-.Li sa_family
-field of the
-.Li ifa_addr
-field should be consulted to determine the format of the
-.Li ifa_addr
-address.)
-.Pp
-The
-.Li ifa_netmask
-field references the netmask associated with
-.Li ifa_addr ,
-if one is set, otherwise it is
-.Dv NULL .
-.Pp
-The
-.Li ifa_broadaddr
-field,
-which should only be referenced for non-P2P interfaces,
-references the broadcast address associated with
-.Li ifa_addr ,
-if one exists, otherwise it is
-.Dv NULL .
-.Pp
-The
-.Li ifa_dstaddr
-field references the destination address on a P2P interface,
-if one exists, otherwise it is
-.Dv NULL .
-.Pp
-The
-.Li ifa_data
-field references address family specific data.
-For
-.Dv AF_LINK
-addresses it contains a pointer to the
-.Fa struct if_data
-.Pq as defined in include file Aq Pa net/if.h
-which contains various interface attributes and statistics.
-For all other address families, it is
-.Dv NULL .
-.Pp
-The data returned by
-.Fn getifaddrs
-is dynamically allocated and should be freed using
-.Fn freeifaddrs
-when no longer needed.
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, a value of -1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh EXAMPLES
-The following example program prints a list of all addresses configured
-on the system.
-.Bd -literal -offset indent
-#include \*[Lt]sys/types.h\*[Gt]
-#include \*[Lt]sys/socket.h\*[Gt]
-#include \*[Lt]stdio.h\*[Gt]
-#include \*[Lt]ifaddrs.h\*[Gt]
-#include \*[Lt]util.h\*[Gt]
-#include \*[Lt]err.h\*[Gt]
-#include \*[Lt]stdlib.h\*[Gt]
-
-int
-main(int argc, char *argv[])
-{
-	struct ifaddrs *ifa, *a;
-
-	if (getifaddrs(\*[Am]ifa) == -1)
-		err(EXIT_FAILURE, "getifaddrs");
-
-	for (a = ifa; a; a = a->ifa_next) {
-		char buf[1024];
-		sockaddr_snprintf(buf, sizeof(buf), "%f %a",
-		    a->ifa_addr);
-		printf("%s %x %s\\n", a->ifa_name, a->ifa_flags, buf);
-	}
-	freeifaddrs(ifa);
-	return EXIT_SUCCESS;
-}
-.Ed
-.Sh ERRORS
-The
-.Fn getifaddrs
-may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr ioctl 2 ,
-.Xr socket 2 ,
-.Xr malloc 3
-or
-.Xr sysctl 3 .
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr socket 2 ,
-.Xr sysctl 3 ,
-.Xr networking 4 ,
-.Xr ifconfig 8
-.Sh HISTORY
-The
-.Nm
-implementation first appeared in
-.Bsx .
-.Sh BUGS
-If both
-.In net/if.h
-and
-.In ifaddrs.h
-are being included,
-.In net/if.h
-.Em must
-be included before
-.In ifaddrs.h .
diff --git a/lib/libc/net/getifaddrs.c b/lib/libc/net/getifaddrs.c
deleted file mode 100644
index b46fd2241..000000000
--- a/lib/libc/net/getifaddrs.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/*	$NetBSD: getifaddrs.c,v 1.15 2012/03/13 21:13:40 christos Exp $	*/
-
-/*
- * Copyright (c) 1995, 1999
- *	Berkeley Software Design, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	BSDI getifaddrs.c,v 2.12 2000/02/23 14:51:59 dab Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getifaddrs.c,v 1.15 2012/03/13 21:13:40 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifndef RUMP_ACTION
-#include "namespace.h"
-#endif
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <sys/param.h>
-#include <net/route.h>
-#include <sys/sysctl.h>
-#include <net/if_dl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(__weak_alias) && !defined(RUMP_ACTION)
-__weak_alias(getifaddrs,_getifaddrs)
-__weak_alias(freeifaddrs,_freeifaddrs)
-#endif
-
-#ifdef RUMP_ACTION
-#include <rump/rump_syscalls.h>
-#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
-#endif
-
-#define	SA_RLEN(sa)	RT_ROUNDUP((sa)->sa_len)
-
-int
-getifaddrs(struct ifaddrs **pif)
-{
-	size_t icnt = 1;
-	size_t dcnt = 0;
-	size_t ncnt = 0;
-	static const int mib[] = {
-		CTL_NET,
-		PF_ROUTE,
-		0,			/* protocol */
-		0,			/* wildcard address family */
-		NET_RT_IFLIST,
-		0			/* no flags */
-	};
-	size_t needed;
-	char *buf;
-	char *next;
-	struct ifaddrs cif;
-	char *p, *p0;
-	struct rt_msghdr *rtm;
-	struct if_msghdr *ifm;
-	struct ifa_msghdr *ifam;
-	struct sockaddr *sa;
-	struct ifaddrs *ifa, *ift;
-	u_short idx = 0;
-	int i;
-	size_t len, alen;
-	char *data;
-	char *names;
-
-	_DIAGASSERT(pif != NULL);
-
-	if (sysctl(mib, (u_int)__arraycount(mib), NULL, &needed, NULL, 0) < 0)
-		return (-1);
-	if ((buf = malloc(needed)) == NULL)
-		return (-1);
-	if (sysctl(mib, (u_int)__arraycount(mib), buf, &needed, NULL, 0) < 0) {
-		free(buf);
-		return (-1);
-	}
-
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)(void *)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-		switch (rtm->rtm_type) {
-		case RTM_IFINFO:
-			ifm = (struct if_msghdr *)(void *)rtm;
-			if (ifm->ifm_addrs & RTA_IFP) {
-				const struct sockaddr_dl *dl;
-
-				idx = ifm->ifm_index;
-				++icnt;
-				dl = (struct sockaddr_dl *)(void *)(ifm + 1);
-				dcnt += SA_RLEN((const struct sockaddr *)(const void *)dl) +
-				    ALIGNBYTES;
-				dcnt += sizeof(ifm->ifm_data);
-				ncnt += dl->sdl_nlen + 1;
-			} else
-				idx = 0;
-			break;
-
-		case RTM_NEWADDR:
-			ifam = (struct ifa_msghdr *)(void *)rtm;
-			if (idx && ifam->ifam_index != idx)
-				abort();	/* this cannot happen */
-
-#define	RTA_MASKS	(RTA_NETMASK | RTA_IFA | RTA_BRD)
-			if (idx == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0)
-				break;
-			p = (char *)(void *)(ifam + 1);
-			++icnt;
-			/* Scan to look for length of address */
-			alen = 0;
-			for (p0 = p, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				if (i == RTAX_IFA) {
-					alen = len;
-					break;
-				}
-				p += len;
-			}
-			for (p = p0, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				if (i == RTAX_NETMASK && sa->sa_len == 0)
-					dcnt += alen;
-				else
-					dcnt += len;
-				p += len;
-			}
-			break;
-		}
-	}
-
-	if (icnt + dcnt + ncnt == 1) {
-		*pif = NULL;
-		free(buf);
-		return (0);
-	}
-	data = malloc(sizeof(struct ifaddrs) * icnt + dcnt + ncnt);
-	if (data == NULL) {
-		free(buf);
-		return(-1);
-	}
-
-	ifa = (struct ifaddrs *)(void *)data;
-	data += sizeof(struct ifaddrs) * icnt;
-	names = data + dcnt;
-
-	memset(ifa, 0, sizeof(struct ifaddrs) * icnt);
-	ift = ifa;
-
-	idx = 0;
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)(void *)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-		switch (rtm->rtm_type) {
-		case RTM_IFINFO:
-			ifm = (struct if_msghdr *)(void *)rtm;
-			if (ifm->ifm_addrs & RTA_IFP) {
-				const struct sockaddr_dl *dl;
-
-				idx = ifm->ifm_index;
-				dl = (struct sockaddr_dl *)(void *)(ifm + 1);
-
-				memset(&cif, 0, sizeof(cif));
-
-				cif.ifa_name = names;
-				cif.ifa_flags = (int)ifm->ifm_flags;
-				memcpy(names, dl->sdl_data,
-				    (size_t)dl->sdl_nlen);
-				names[dl->sdl_nlen] = 0;
-				names += dl->sdl_nlen + 1;
-
-				cif.ifa_addr = (struct sockaddr *)(void *)data;
-				memcpy(data, dl, (size_t)dl->sdl_len);
-				data += SA_RLEN((const struct sockaddr *)(const void *)dl);
-
-				/* ifm_data needs to be aligned */
-				cif.ifa_data = data = (void *)ALIGN(data);
-				memcpy(data, &ifm->ifm_data, sizeof(ifm->ifm_data));
- 				data += sizeof(ifm->ifm_data);
-			} else
-				idx = 0;
-			break;
-
-		case RTM_NEWADDR:
-			ifam = (struct ifa_msghdr *)(void *)rtm;
-			if (idx && ifam->ifam_index != idx)
-				abort();	/* this cannot happen */
-
-			if (idx == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0)
-				break;
-			ift->ifa_name = cif.ifa_name;
-			ift->ifa_flags = cif.ifa_flags;
-			ift->ifa_data = NULL;
-			p = (char *)(void *)(ifam + 1);
-			/* Scan to look for length of address */
-			alen = 0;
-			for (p0 = p, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				if (i == RTAX_IFA) {
-					alen = len;
-					break;
-				}
-				p += len;
-			}
-			for (p = p0, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				switch (i) {
-				case RTAX_IFA:
-					ift->ifa_addr =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					if (ift->ifa_addr->sa_family == AF_LINK)
-						ift->ifa_data = cif.ifa_data;
-					break;
-
-				case RTAX_NETMASK:
-					ift->ifa_netmask =
-					    (struct sockaddr *)(void *)data;
-					if (sa->sa_len == 0) {
-						memset(data, 0, alen);
-						data += alen;
-						break;
-					}
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				case RTAX_BRD:
-					ift->ifa_broadaddr =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-				}
-				p += len;
-			}
-
-
-			ift = (ift->ifa_next = ift + 1);
-			break;
-		}
-	}
-
-	free(buf);
-	if (--ift >= ifa) {
-		ift->ifa_next = NULL;
-		*pif = ifa;
-	} else {
-		*pif = NULL;
-		free(ifa);
-	}
-	return (0);
-}
-
-void
-freeifaddrs(struct ifaddrs *ifp)
-{
-
-	_DIAGASSERT(ifp != NULL);
-
-	free(ifp);
-}
diff --git a/lib/libc/net/getnameinfo.3 b/lib/libc/net/getnameinfo.3
deleted file mode 100644
index 01e691905..000000000
--- a/lib/libc/net/getnameinfo.3
+++ /dev/null
@@ -1,272 +0,0 @@
-.\"	$NetBSD: getnameinfo.3,v 1.41 2013/08/18 10:40:06 wiz Exp $
-.\"	$KAME: getnameinfo.3,v 1.37 2005/01/05 03:23:05 itojun Exp $
-.\"	$OpenBSD: getnameinfo.3,v 1.36 2004/12/21 09:48:20 jmc Exp $
-.\"
-.\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) 2000, 2001  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.
-.\"
-.Dd August 18, 2013
-.Dt GETNAMEINFO 3
-.Os
-.Sh NAME
-.Nm getnameinfo
-.Nd socket address structure to hostname and service name
-.Sh SYNOPSIS
-.In netdb.h
-.Ft int
-.Fn getnameinfo "const struct sockaddr * restrict sa" "socklen_t salen" \
-    "char * restrict host" "socklen_t hostlen" "char * restrict serv" \
-    "socklen_t servlen" "int flags"
-.Sh DESCRIPTION
-The
-.Fn getnameinfo
-function is used to convert a
-.Li sockaddr
-structure to a pair of host name and service strings.
-It is a replacement for and provides more flexibility than the
-.Xr gethostbyaddr 3
-and
-.Xr getservbyport 3
-functions and is the converse of the
-.Xr getaddrinfo 3
-function.
-.Pp
-The
-.Li sockaddr
-structure
-.Fa sa
-should point to a
-.Li sockaddr_in
-(for IPv4),
-.Li sockaddr_in6
-(for IPv6),
-.Li sockaddr_atalk
-(for AppleTalk),
-.Li sockaddr_link
-(for link layer),
-or
-.Li sockaddr_local
-(for local/unix)
-structures that are
-.Fa salen
-bytes long.
-.Pp
-The host and service names associated with
-.Fa sa
-are stored in
-.Fa host
-and
-.Fa serv
-which have length parameters
-.Fa hostlen
-and
-.Fa servlen .
-The maximum value for
-.Fa hostlen
-is
-.Dv NI_MAXHOST
-and the maximum value for
-.Fa servlen
-is
-.Dv NI_MAXSERV ,
-as defined by
-.In netdb.h .
-If a length parameter is zero, no string will be stored.
-Otherwise, enough space must be provided to store the
-host name or service string plus a byte for the NUL terminator.
-.Pp
-The
-.Fa flags
-argument is formed by
-.Sy OR Ns 'ing
-the following values:
-.Bl -tag -width "NI_NUMERICHOSTXX"
-.It Dv NI_NOFQDN
-A fully qualified domain name is not required for local hosts.
-The local part of the fully qualified domain name is returned instead.
-.It Dv NI_NUMERICHOST
-Return the address in numeric form, as if calling
-.Xr inet_ntop 3 ,
-instead of a host name.
-.It Dv NI_NAMEREQD
-A name is required.
-If the host name cannot be found in DNS and this flag is set,
-a non-zero error code is returned.
-If the host name is not found and the flag is not set, the
-address is returned in numeric form.
-.It NI_NUMERICSERV
-The service name is returned as a digit string representing the port number.
-.It NI_DGRAM
-Specifies that the service being looked up is a datagram
-service, and causes
-.Xr getservbyport 3
-to be called with a second argument of
-.Dq udp
-instead of its default of
-.Dq tcp .
-This is required for the few ports (512\-514) that have different services
-for
-.Tn UDP
-and
-.Tn TCP .
-.El
-.Pp
-This implementation allows numeric IPv6 address notation with scope identifier,
-as documented in chapter 11 of draft-ietf-ipv6-scoping-arch-02.txt.
-IPv6 link-local address will appear as a string like
-.Dq Li fe80::1%ne0 .
-Refer to
-.Xr getaddrinfo 3
-for more information.
-.Sh RETURN VALUES
-.Fn getnameinfo
-returns zero on success or one of the error codes listed in
-.Xr gai_strerror 3
-if an error occurs.
-.Sh EXAMPLES
-The following code tries to get a numeric host name, and service name,
-for a given socket address.
-Observe that there is no hardcoded reference to a particular address family.
-.Bd -literal -offset indent
-struct sockaddr *sa;	/* input */
-char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
-
-if (getnameinfo(sa, sa-\*[Gt]sa_len, hbuf, sizeof(hbuf), sbuf,
-    sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV)) {
-	errx(1, "could not get numeric hostname");
-	/*NOTREACHED*/
-}
-printf("host=%s, serv=%s\en", hbuf, sbuf);
-.Ed
-.Pp
-The following version checks if the socket address has a reverse address mapping:
-.Bd -literal -offset indent
-struct sockaddr *sa;	/* input */
-char hbuf[NI_MAXHOST];
-
-if (getnameinfo(sa, sa-\*[Gt]sa_len, hbuf, sizeof(hbuf), NULL, 0,
-    NI_NAMEREQD)) {
-	errx(1, "could not resolve hostname");
-	/*NOTREACHED*/
-}
-printf("host=%s\en", hbuf);
-.Ed
-.Sh SEE ALSO
-.Xr gai_strerror 3 ,
-.Xr getaddrinfo 3 ,
-.Xr gethostbyaddr 3 ,
-.Xr getservbyport 3 ,
-.Xr inet_ntop 3 ,
-.Xr resolver 3 ,
-.Xr hosts 5 ,
-.Xr resolv.conf 5 ,
-.Xr services 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Rs
-.%A R. Gilligan
-.%A S. Thomson
-.%A J. Bound
-.%A W. Stevens
-.%T Basic Socket Interface Extensions for IPv6
-.%R RFC 2553
-.%D March 1999
-.Re
-.Rs
-.%A S. Deering
-.%A B. Haberman
-.%A T. Jinmei
-.%A E. Nordmark
-.%A B. Zill
-.%T "IPv6 Scoped Address Architecture"
-.%R internet draft
-.%N draft-ietf-ipv6-scoping-arch-02.txt
-.%O work in progress material
-.Re
-.Rs
-.%A Craig Metz
-.%T Protocol Independence Using the Sockets API
-.%B "Proceedings of the FREENIX track: 2000 USENIX annual technical conference"
-.%D June 2000
-.Re
-.Sh STANDARDS
-The
-.Fn getnameinfo
-function is defined by the
-.St -p1003.1g-2000
-draft specification and documented in
-.Sy "RFC 2553" ,
-.Dq Basic Socket Interface Extensions for IPv6 .
-.Sh CAVEATS
-.Fn getnameinfo
-can return both numeric and FQDN forms of the address specified in
-.Fa sa .
-There is no return value that indicates whether the string returned in
-.Fa host
-is a result of binary to numeric-text translation (like
-.Xr inet_ntop 3 ) ,
-or is the result of a DNS reverse lookup.
-Because of this, malicious parties could set up a PTR record as follows:
-.Bd -literal -offset indent
-1.0.0.127.in-addr.arpa. IN PTR  10.1.1.1
-.Ed
-.Pp
-and trick the caller of
-.Fn getnameinfo
-into believing that
-.Fa sa
-is
-.Li 10.1.1.1
-when it is actually
-.Li 127.0.0.1 .
-.Pp
-To prevent such attacks, the use of
-.Dv NI_NAMEREQD
-is recommended when the result of
-.Fn getnameinfo
-is used for access control purposes:
-.Bd -literal -offset indent
-struct sockaddr *sa;
-socklen_t salen;
-char addr[NI_MAXHOST];
-struct addrinfo hints, *res;
-int error;
-
-error = getnameinfo(sa, salen, addr, sizeof(addr),
-    NULL, 0, NI_NAMEREQD);
-if (error == 0) {
-	memset(\*[Am]hints, 0, sizeof(hints));
-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-	hints.ai_flags = AI_NUMERICHOST;
-	if (getaddrinfo(addr, "0", \*[Am]hints, \*[Am]res) == 0) {
-		/* malicious PTR record */
-		freeaddrinfo(res);
-		printf("bogus PTR record\en");
-		return -1;
-	}
-	/* addr is FQDN as a result of PTR lookup */
-} else {
-	/* addr is numeric string */
-	error = getnameinfo(sa, salen, addr, sizeof(addr),
-	    NULL, 0, NI_NUMERICHOST);
-}
-.Ed
-.\".Sh BUGS
-.\".Ox
-.\"intentionally uses a different
-.\".Dv NI_MAXHOST
-.\"value from what
-.\".Tn "RFC 2553"
-.\"suggests, to avoid buffer length handling mistakes.
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c
deleted file mode 100644
index c7186a181..000000000
--- a/lib/libc/net/getnameinfo.c
+++ /dev/null
@@ -1,626 +0,0 @@
-/*	$NetBSD: getnameinfo.c,v 1.59 2015/09/22 16:15:08 christos Exp $	*/
-/*	$KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $	*/
-
-/*
- * Copyright (c) 2000 Ben Harris.
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Issues to be discussed:
- * - Thread safe-ness must be checked
- * - RFC2553 says that we should raise error on short buffer.  X/Open says
- *   we need to truncate the result.  We obey RFC2553 (and X/Open should be
- *   modified).  ipngwg rough consensus seems to follow RFC2553.
- * - What is "local" in NI_FQDN?
- * - NI_NAMEREQD and NI_NUMERICHOST conflict with each other.
- * - (KAME extension) always attach textual scopeid (fe80::1%lo0), if
- *   sin6_scope_id is filled - standardization status?
- *   XXX breaks backward compat for code that expects no scopeid.
- *   beware on merge.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getnameinfo.c,v 1.59 2015/09/22 16:15:08 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifndef RUMP_ACTION
-#include "namespace.h"
-#endif
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_ieee1394.h>
-#include <net/if_types.h>
-#include <netatalk/at.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <assert.h>
-#include <limits.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stddef.h>
-#include <string.h>
-
-#include "servent.h"
-#include "hostent.h"
-
-#ifndef RUMP_ACTION
-#ifdef __weak_alias
-__weak_alias(getnameinfo,_getnameinfo)
-#endif
-#endif
-
-static const struct afd {
-	int		a_af;
-	socklen_t	a_addrlen;
-	socklen_t	a_socklen;
-	int		a_off;
-} afdl [] = {
-#ifdef INET6
-	{PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6),
-		offsetof(struct sockaddr_in6, sin6_addr)},
-#endif
-	{PF_INET, sizeof(struct in_addr), sizeof(struct sockaddr_in),
-		offsetof(struct sockaddr_in, sin_addr)},
-	{0, 0, 0, 0},
-};
-
-struct sockinet {
-	u_char	si_len;
-	u_char	si_family;
-	u_short	si_port;
-};
-
-static int getnameinfo_inet(const struct sockaddr *, socklen_t, char *,
-    socklen_t, char *, socklen_t, int);
-#ifdef INET6
-static int ip6_parsenumeric(const struct sockaddr *, const char *, char *,
-				 socklen_t, int);
-static int ip6_sa2str(const struct sockaddr_in6 *, char *, size_t, int);
-#endif
-static int getnameinfo_atalk(const struct sockaddr *, socklen_t, char *,
-    socklen_t, char *, socklen_t, int);
-static int getnameinfo_local(const struct sockaddr *, socklen_t, char *,
-    socklen_t, char *, socklen_t, int);
-
-static int getnameinfo_link(const struct sockaddr *, socklen_t, char *,
-    socklen_t, char *, socklen_t, int);
-static int hexname(const uint8_t *, size_t, char *, socklen_t);
-
-/*
- * Top-level getnameinfo() code.  Look at the address family, and pick an
- * appropriate function to call.
- */
-int
-getnameinfo(const struct sockaddr *sa, socklen_t salen,
-	char *host, socklen_t hostlen,
-	char *serv, socklen_t servlen,
-	int flags)
-{
-
-	switch (sa->sa_family) {
-	case AF_APPLETALK:
-		return getnameinfo_atalk(sa, salen, host, hostlen,
-		    serv, servlen, flags);
-	case AF_INET:
-	case AF_INET6:
-		return getnameinfo_inet(sa, salen, host, hostlen,
-		    serv, servlen, flags);
-	case AF_LINK:
-		return getnameinfo_link(sa, salen, host, hostlen,
-		    serv, servlen, flags);
-	case AF_LOCAL:
-		return getnameinfo_local(sa, salen, host, hostlen,
-		    serv, servlen, flags);
-	default:
-		return EAI_FAMILY;
-	}
-}
-
-/*
- * getnameinfo_atalk():
- * Format an AppleTalk address into a printable format.
- */
-/* ARGSUSED */
-static int
-getnameinfo_atalk(const struct sockaddr *sa, socklen_t salen,
-    char *host, socklen_t hostlen, char *serv, socklen_t servlen,
-    int flags)
-{
-	char numserv[8];
-	int n, m=0;
-
-	const struct sockaddr_at *sat =
-	    (const struct sockaddr_at *)(const void *)sa;
-
-	if (serv != NULL && servlen > 0) {
-		snprintf(numserv, sizeof(numserv), "%u", sat->sat_port);
-		if (strlen(numserv) + 1 > servlen)
-			return EAI_MEMORY;
-		strlcpy(serv, numserv, servlen);
-	}
-
-        n = snprintf(host, hostlen, "%u.%u",
-	    ntohs(sat->sat_addr.s_net), sat->sat_addr.s_node);
-
-	if (n < 0 || (socklen_t)(m+n) >= hostlen)
-		goto errout;
-
-	m += n;
-
-	if (sat->sat_range.r_netrange.nr_phase) {
-        	n = snprintf(host+m, hostlen-m, " phase %u",
-			sat->sat_range.r_netrange.nr_phase);
-
-		if (n < 0 || (socklen_t)(m+n) >= hostlen)
-			goto errout;
-
-		m += n;
-	}
-	if (sat->sat_range.r_netrange.nr_firstnet) {
-        	n = snprintf(host+m, hostlen-m, " range %u - %u",
-			ntohs(sat->sat_range.r_netrange.nr_firstnet),
-			ntohs(sat->sat_range.r_netrange.nr_lastnet ));
-
-		if (n < 0 || (socklen_t)(m+n) >= hostlen)
-			goto errout;
-
-		m += n;
-	}
-
-	return 0;
-
-errout:
-	if (host && hostlen>0)
-		host[m] = '\0';	/* XXX ??? */
-
-	return EAI_MEMORY;
-}
-
-/*
- * getnameinfo_local():
- * Format an local address into a printable format.
- */
-/* ARGSUSED */
-static int
-getnameinfo_local(const struct sockaddr *sa, socklen_t salen,
-    char *host, socklen_t hostlen, char *serv, socklen_t servlen,
-    int flags)
-{
-	const struct sockaddr_un *sun =
-	    (const struct sockaddr_un *)(const void *)sa;
-
-	if (serv != NULL && servlen > 0)
-		serv[0] = '\0';
-
-	if (host && hostlen > 0)
-		strlcpy(host, sun->sun_path,
-		    MIN(sizeof(sun->sun_path) + 1, hostlen));
-
-	return 0;
-}
-
-/*
- * getnameinfo_inet():
- * Format an IPv4 or IPv6 sockaddr into a printable string.
- */
-static int
-getnameinfo_inet(const struct sockaddr *sa, socklen_t salen,
-	char *host, socklen_t hostlen,
-	char *serv, socklen_t servlen,
-	int flags)
-{
-	const struct afd *afd;
-	struct servent *sp;
-	struct hostent *hp;
-	u_short port;
-	int family, i;
-	const char *addr;
-	uint32_t v4a;
-	char numserv[512];
-	char numaddr[512];
-
-	/* sa is checked below */
-	/* host may be NULL */
-	/* serv may be NULL */
-
-	if (sa == NULL)
-		return EAI_FAIL;
-
-	family = sa->sa_family;
-	for (i = 0; afdl[i].a_af; i++)
-		if (afdl[i].a_af == family) {
-			afd = &afdl[i];
-			goto found;
-		}
-	return EAI_FAMILY;
-
- found:
-	if (salen != afd->a_socklen)
-		return EAI_FAIL;
-
-	/* network byte order */
-	port = ((const struct sockinet *)(const void *)sa)->si_port;
-	addr = (const char *)(const void *)sa + afd->a_off;
-
-	if (serv == NULL || servlen == 0) {
-		/*
-		 * do nothing in this case.
-		 * in case you are wondering if "&&" is more correct than
-		 * "||" here: rfc2553bis-03 says that serv == NULL OR
-		 * servlen == 0 means that the caller does not want the result.
-		 */
-	} else {
-		struct servent_data svd;
-		struct servent sv;
-
-		if (flags & NI_NUMERICSERV)
-			sp = NULL;
-		else {
-			(void)memset(&svd, 0, sizeof(svd));
-			sp = getservbyport_r(port,
-				(flags & NI_DGRAM) ? "udp" : "tcp", &sv, &svd);
-		}
-		if (sp) {
-			if (strlen(sp->s_name) + 1 > servlen) {
-				endservent_r(&svd);
-				return EAI_MEMORY;
-			}
-			strlcpy(serv, sp->s_name, servlen);
-			endservent_r(&svd);
-		} else {
-			snprintf(numserv, sizeof(numserv), "%u", ntohs(port));
-			if (strlen(numserv) + 1 > servlen)
-				return EAI_MEMORY;
-			strlcpy(serv, numserv, servlen);
-		}
-	}
-
-	switch (sa->sa_family) {
-	case AF_INET:
-		v4a = (uint32_t)
-		    ntohl(((const struct sockaddr_in *)
-		    (const void *)sa)->sin_addr.s_addr);
-		if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a))
-			flags |= NI_NUMERICHOST;
-		v4a >>= IN_CLASSA_NSHIFT;
-		if (v4a == 0)
-			flags |= NI_NUMERICHOST;
-		break;
-#ifdef INET6
-	case AF_INET6:
-	    {
-		const struct sockaddr_in6 *sin6;
-		sin6 = (const struct sockaddr_in6 *)(const void *)sa;
-		switch (sin6->sin6_addr.s6_addr[0]) {
-		case 0x00:
-			if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr))
-				;
-			else if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr))
-				;
-			else
-				flags |= NI_NUMERICHOST;
-			break;
-		default:
-			if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
-				flags |= NI_NUMERICHOST;
-			}
-			else if (IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
-				flags |= NI_NUMERICHOST;
-			break;
-		}
-	    }
-		break;
-#endif
-	}
-	if (host == NULL || hostlen == 0) {
-		/*
-		 * do nothing in this case.
-		 * in case you are wondering if "&&" is more correct than
-		 * "||" here: rfc2553bis-03 says that host == NULL or
-		 * hostlen == 0 means that the caller does not want the result.
-		 */
-	} else if (flags & NI_NUMERICHOST) {
-		size_t numaddrlen;
-
-		/* NUMERICHOST and NAMEREQD conflicts with each other */
-		if (flags & NI_NAMEREQD)
-			return EAI_NONAME;
-
-		switch(afd->a_af) {
-#ifdef INET6
-		case AF_INET6:
-		{
-			int error;
-
-			if ((error = ip6_parsenumeric(sa, addr, host,
-						      hostlen, flags)) != 0)
-				return(error);
-			break;
-		}
-#endif
-		default:
-			if (inet_ntop(afd->a_af, addr, numaddr,
-			    (socklen_t)sizeof(numaddr)) == NULL)
-				return EAI_SYSTEM;
-			numaddrlen = strlen(numaddr);
-			if (numaddrlen + 1 > hostlen) /* don't forget terminator */
-				return EAI_MEMORY;
-			strlcpy(host, numaddr, hostlen);
-			break;
-		}
-	} else {
-		struct hostent hent;
-		char hbuf[4096];
-		int he;
-		hp = gethostbyaddr_r(addr, afd->a_addrlen, afd->a_af, &hent,
-		    hbuf, sizeof(hbuf), &he);
-
-		if (hp) {
-#if 0
-			/*
-			 * commented out, since "for local host" is not
-			 * implemented here - see RFC2553 p30
-			 */
-			if (flags & NI_NOFQDN) {
-				char *p;
-				p = strchr(hp->h_name, '.');
-				if (p)
-					*p = '\0';
-			}
-#endif
-			if (strlen(hp->h_name) + 1 > hostlen) {
-				return EAI_MEMORY;
-			}
-			strlcpy(host, hp->h_name, hostlen);
-		} else {
-			switch (he) {
-			case NO_DATA:
-			case HOST_NOT_FOUND:
-				if (flags & NI_NAMEREQD)
-					return EAI_NONAME;
-				break;
-			case TRY_AGAIN:
-				return EAI_AGAIN;
-			case NETDB_SUCCESS:
-			case NETDB_INTERNAL:
-			case NO_RECOVERY:
-				/*FALLTHROUGH*/
-			default:
-				return EAI_SYSTEM;
-			}
-			switch(afd->a_af) {
-#ifdef INET6
-			case AF_INET6:
-			{
-				int error;
-
-				if ((error = ip6_parsenumeric(sa, addr, host,
-							      hostlen,
-							      flags)) != 0)
-					return(error);
-				break;
-			}
-#endif
-			default:
-				if (inet_ntop(afd->a_af, addr, host,
-				    hostlen) == NULL)
-					return EAI_SYSTEM;
-				break;
-			}
-		}
-	}
-	return(0);
-}
-
-#ifdef INET6
-static int
-ip6_parsenumeric(const struct sockaddr *sa, const char *addr, char *host,
-	socklen_t hostlen, int flags)
-{
-	size_t numaddrlen;
-	char numaddr[512];
-
-	_DIAGASSERT(sa != NULL);
-	_DIAGASSERT(addr != NULL);
-	_DIAGASSERT(host != NULL);
-
-	if (inet_ntop(AF_INET6, addr, numaddr, (socklen_t)sizeof(numaddr))
-	    == NULL)
-		return EAI_SYSTEM;
-
-	numaddrlen = strlen(numaddr);
-	if (numaddrlen + 1 > hostlen) /* don't forget terminator */
-		return EAI_OVERFLOW;
-	strlcpy(host, numaddr, hostlen);
-
-	if (((const struct sockaddr_in6 *)(const void *)sa)->sin6_scope_id) {
-		char zonebuf[MAXHOSTNAMELEN];
-		int zonelen;
-
-		zonelen = ip6_sa2str(
-		    (const struct sockaddr_in6 *)(const void *)sa,
-		    zonebuf, sizeof(zonebuf), flags);
-		if (zonelen < 0)
-			return EAI_OVERFLOW;
-		if ((size_t) zonelen + 1 + numaddrlen + 1 > hostlen)
-			return EAI_OVERFLOW;
-		/* construct <numeric-addr><delim><zoneid> */
-		memcpy(host + numaddrlen + 1, zonebuf,
-		    (size_t)zonelen);
-		host[numaddrlen] = SCOPE_DELIMITER;
-		host[numaddrlen + 1 + zonelen] = '\0';
-	}
-
-	return 0;
-}
-
-/* ARGSUSED */
-static int
-ip6_sa2str(const struct sockaddr_in6 *sa6, char *buf, size_t bufsiz, int flags)
-{
-	unsigned int ifindex;
-	const struct in6_addr *a6;
-	int n;
-
-	_DIAGASSERT(sa6 != NULL);
-	_DIAGASSERT(buf != NULL);
-
-	ifindex = (unsigned int)sa6->sin6_scope_id;
-	a6 = &sa6->sin6_addr;
-
-#ifdef NI_NUMERICSCOPE
-	if ((flags & NI_NUMERICSCOPE) != 0) {
-		n = snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id);
-		if (n < 0 || (size_t)n >= bufsiz)
-			return -1;
-		else
-			return n;
-	}
-#endif
-
-	/* if_indextoname() does not take buffer size.  not a good api... */
-	if ((IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6)) &&
-	    bufsiz >= IF_NAMESIZE) {
-		char *p = if_indextoname(ifindex, buf);
-		if (p) {
-			return (int)strlen(p);
-		}
-	}
-
-	/* last resort */
-	n = snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id);
-	if (n < 0 || (size_t) n >= bufsiz)
-		return -1;
-	else
-		return n;
-}
-#endif /* INET6 */
-
-
-/*
- * getnameinfo_link():
- * Format a link-layer address into a printable format, paying attention to
- * the interface type.
- */
-/* ARGSUSED */
-static int
-getnameinfo_link(const struct sockaddr *sa, socklen_t salen,
-    char *host, socklen_t hostlen, char *serv, socklen_t servlen,
-    int flags)
-{
-	const struct sockaddr_dl *sdl =
-	    (const struct sockaddr_dl *)(const void *)sa;
-	const struct ieee1394_hwaddr *iha;
-	int n;
-
-	if (serv != NULL && servlen > 0)
-		*serv = '\0';
-
-	if (sdl->sdl_nlen == 0 && sdl->sdl_alen == 0 && sdl->sdl_slen == 0) {
-		n = snprintf(host, hostlen, "link#%u", sdl->sdl_index);
-		goto out;
-	}
-
-	switch (sdl->sdl_type) {
-#ifdef IFT_ECONET
-	case IFT_ECONET:
-		if (sdl->sdl_alen < 2)
-			return EAI_FAMILY;
-		if (CLLADDR(sdl)[1] == 0)
-			n = snprintf(host, hostlen, "%u", CLLADDR(sdl)[0]);
-		else
-			n = snprintf(host, hostlen, "%u.%u",
-			    CLLADDR(sdl)[1], CLLADDR(sdl)[0]);
-		goto out;
-#endif
-	case IFT_IEEE1394:
-		if (sdl->sdl_alen < sizeof(iha->iha_uid))
-			return EAI_FAMILY;
-		iha =
-		    (const struct ieee1394_hwaddr *)(const void *)CLLADDR(sdl);
-		return hexname(iha->iha_uid, sizeof(iha->iha_uid),
-		    host, hostlen);
-	/*
-	 * The following have zero-length addresses.
-	 * IFT_ATM	(net/if_atmsubr.c)
-	 * IFT_FAITH	(net/if_faith.c)
-	 * IFT_GIF	(net/if_gif.c)
-	 * IFT_LOOP	(net/if_loop.c)
-	 * IFT_PPP	(net/if_ppp.c, net/if_spppsubr.c)
-	 * IFT_SLIP	(net/if_sl.c, net/if_strip.c)
-	 * IFT_STF	(net/if_stf.c)
-	 * IFT_L2VLAN	(net/if_vlan.c)
-	 * IFT_PROPVIRTUAL (net/if_bridge.h>
-	 */
-	/*
-	 * The following use IPv4 addresses as link-layer addresses:
-	 * IFT_OTHER	(net/if_gre.c)
-	 */
-	case IFT_ARCNET: /* default below is believed correct for all these. */
-	case IFT_ETHER:
-	case IFT_FDDI:
-	case IFT_HIPPI:
-	case IFT_ISO88025:
-	default:
-		return hexname((const uint8_t *)CLLADDR(sdl),
-		    (size_t)sdl->sdl_alen, host, hostlen);
-	}
-out:
-	if (n < 0 || (socklen_t) n >= hostlen) {
-		*host = '\0';
-		return EAI_MEMORY;
-	}
-	return 0;
-}
-
-static int
-hexname(const uint8_t *cp, size_t len, char *host, socklen_t hostlen)
-{
-	int n;
-	size_t i;
-	char *outp = host;
-
-	*outp = '\0';
-	for (i = 0; i < len; i++) {
-		n = snprintf(outp, hostlen, "%s%02x",
-		    i ? ":" : "", cp[i]);
-		if (n < 0 || (socklen_t) n >= hostlen) {
-			*host = '\0';
-			return EAI_MEMORY;
-		}
-		outp += n;
-		hostlen -= n;
-	}
-	return 0;
-}
diff --git a/lib/libc/net/getnetent.3 b/lib/libc/net/getnetent.3
deleted file mode 100644
index 622211ed1..000000000
--- a/lib/libc/net/getnetent.3
+++ /dev/null
@@ -1,152 +0,0 @@
-.\"	$NetBSD: getnetent.3,v 1.13 2004/05/08 18:52:15 kleink Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)getnetent.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd May 8, 2004
-.Dt GETNETENT 3
-.Os
-.Sh NAME
-.Nm getnetent ,
-.Nm getnetbyaddr ,
-.Nm getnetbyname ,
-.Nm setnetent ,
-.Nm endnetent
-.Nd get network entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netdb.h
-.Ft struct netent *
-.Fn getnetent
-.Ft struct netent *
-.Fn getnetbyname "const char *name"
-.Ft struct netent *
-.Fn getnetbyaddr "uint32_t net" "int type"
-.Fn setnetent "int stayopen"
-.Fn endnetent
-.Sh DESCRIPTION
-The
-.Fn getnetent ,
-.Fn getnetbyname ,
-and
-.Fn getnetbyaddr
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network data base as described in
-.Xr networks 5 .
-.Bd -literal -offset indent
-struct	netent {
-	char		*n_name;	/* official name of net */
-	char		**n_aliases;	/* alias list */
-	int		n_addrtype;	/* net number type */
-	uint32_t	n_net;		/* net number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width n_addrtype
-.It Fa n_name
-The official name of the network.
-.It Fa n_aliases
-A zero terminated list of alternative names for the network.
-.It Fa n_addrtype
-The type of the network number returned; currently only AF_INET.
-.It Fa n_net
-The network number.  Network numbers are returned in machine byte
-order.
-.El
-.Pp
-The
-.Fn getnetent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setnetent
-function
-opens and rewinds the file.  If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to
-.Fn getnetbyname
-or
-.Fn getnetbyaddr .
-.Pp
-The
-.Fn endnetent
-function
-closes the file.
-.Pp
-The
-.Fn getnetbyname
-function
-and
-.Fn getnetbyaddr
-sequentially search from the beginning
-of the file until a matching
-net name or
-net address and type is found,
-or until
-.Dv EOF
-is encountered.
-Network numbers are supplied in host order.
-.Sh FILES
-.Bl -tag -width /etc/networks -compact
-.It Pa /etc/networks
-.El
-.Sh DIAGNOSTICS
-Null pointer
-(0) returned on
-.Dv EOF
-or error.
-.Sh SEE ALSO
-.Xr networks 5 ,
-.Xr nsswitch.conf 5
-.Sh HISTORY
-The
-.Fn getnetent ,
-.Fn getnetbyaddr ,
-.Fn getnetbyname ,
-.Fn setnetent ,
-and
-.Fn endnetent
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-The data space used by
-these functions is static; if future use requires the data, it should be
-copied before any subsequent calls to these functions overwrite it.
-Only Internet network
-numbers are currently understood.
-Expecting network numbers to fit
-in no more than 32 bits is probably
-naive.
diff --git a/lib/libc/net/getnetent.c b/lib/libc/net/getnetent.c
deleted file mode 100644
index b777d49ac..000000000
--- a/lib/libc/net/getnetent.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*	$NetBSD: getnetent.c,v 1.21 2012/03/20 17:44:18 matt Exp $	*/
-
-/*
- * Copyright (c) 1983, 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.
- *
- * Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
- *    Dep. Matematica Universidade de Coimbra, Portugal, Europe
- *
- * 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.
- *
- * from getnetent.c   1.1 (Coimbra) 93/06/02
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getnetent.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp ";
-#else
-__RCSID("$NetBSD: getnetent.c,v 1.21 2012/03/20 17:44:18 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(endnetent,_endnetent)
-__weak_alias(getnetent,_getnetent)
-__weak_alias(setnetent,_setnetent)
-#endif
-
-#define	MAXALIASES	35
-
-static FILE *netf;
-static char line[BUFSIZ+1];
-static struct netent net;
-static char *net_aliases[MAXALIASES];
-int _net_stayopen;
-
-static void __setnetent(int);
-static void __endnetent(void);
-
-void
-setnetent(int stayopen)
-{
-
-	sethostent(stayopen);
-	__setnetent(stayopen);
-}
-
-void
-endnetent(void)
-{
-
-	endhostent();
-	__endnetent();
-}
-
-static void
-__setnetent(int f)
-{
-
-	if (netf == NULL)
-		netf = fopen(_PATH_NETWORKS, "re");
-	else
-		rewind(netf);
-	_net_stayopen |= f;
-}
-
-static void
-__endnetent(void)
-{
-
-	if (netf) {
-		fclose(netf);
-		netf = NULL;
-	}
-	_net_stayopen = 0;
-}
-
-struct netent *
-getnetent(void)
-{
-	char *p;
-	register char *cp, **q;
-
-	if (netf == NULL && (netf = fopen(_PATH_NETWORKS, "re")) == NULL)
-		return (NULL);
-#if (defined(__sparc__) && defined(_LP64)) ||		\
-    defined(__alpha__) ||				\
-    (defined(__i386__) && defined(_LP64)) ||		\
-    (defined(__sh__) && defined(_LP64))
-	net.__n_pad0 = 0;
-#endif
-again:
-	p = fgets(line, (int)sizeof line, netf);
-	if (p == NULL)
-		return (NULL);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		goto again;
-	*cp = '\0';
-	net.n_name = p;
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	net.n_net = inet_network(cp);
-	net.n_addrtype = AF_INET;
-	q = net.n_aliases = net_aliases;
-	if (p != NULL) {
-		cp = p;
-		while (cp && *cp) {
-			if (*cp == ' ' || *cp == '\t') {
-				cp++;
-				continue;
-			}
-			if (q < &net_aliases[MAXALIASES - 1])
-				*q++ = cp;
-			cp = strpbrk(cp, " \t");
-			if (cp != NULL)
-				*cp++ = '\0';
-		}
-	}
-	*q = NULL;
-	return (&net);
-}
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
deleted file mode 100644
index c3241c7c7..000000000
--- a/lib/libc/net/getnetnamadr.c
+++ /dev/null
@@ -1,648 +0,0 @@
-/*	$NetBSD: getnetnamadr.c,v 1.42 2012/03/13 21:13:41 christos Exp $	*/
-
-/* Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
- *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
- *
- * 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.
- */
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getnetbyaddr.c	8.1 (Berkeley) 6/4/93";
-static char sccsid_[] = "from getnetnamadr.c	1.4 (Coimbra) 93/06/03";
-static char rcsid[] = "Id: getnetnamadr.c,v 8.8 1997/06/01 20:34:37 vixie Exp ";
-#else
-__RCSID("$NetBSD: getnetnamadr.c,v 1.42 2012/03/13 21:13:41 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <nsswitch.h>
-#include <resolv.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#ifdef __weak_alias
-__weak_alias(getnetbyaddr,_getnetbyaddr)
-__weak_alias(getnetbyname,_getnetbyname)
-#endif
-
-extern int _net_stayopen;
-
-#define BYADDR 0
-#define BYNAME 1
-#define	MAXALIASES	35
-
-#define	MAXPACKET	(64*1024)
-
-typedef union {
-	HEADER	hdr;
-	u_char	buf[MAXPACKET];
-} querybuf;
-
-typedef union {
-	long	al;
-	char	ac;
-} align;
-
-#ifdef YP
-static char *__ypdomain;
-static char *__ypcurrent;
-static int   __ypcurrentlen;
-#endif
-
-static	struct netent net_entry;
-static	char *net_aliases[MAXALIASES];
-
-static int		parse_reversed_addr(const char *, in_addr_t *);
-static struct netent	*getnetanswer(querybuf *, int, int);
-static int		_files_getnetbyaddr(void *, void *, va_list);
-static int		_files_getnetbyname(void *, void *, va_list);
-static int		_dns_getnetbyaddr(void *, void *, va_list);
-static int		_dns_getnetbyname(void *, void *, va_list);
-#ifdef YP
-static int		_yp_getnetbyaddr(void *, void *, va_list);
-static int		_yp_getnetbyname(void *, void *, va_list);
-static struct netent	*_ypnetent(char *);
-#endif
-
-/*
- * parse_reversed_addr --
- *	parse str, which should be of the form 'd.c.b.a.IN-ADDR.ARPA'
- *	(a PTR as per RFC 1101) and convert into an in_addr_t of the
- *	address 'a.b.c.d'.
- *	returns 0 on success (storing in *result), or -1 on error.
- */
-static int
-parse_reversed_addr(const char *str, in_addr_t *result)
-{
-	unsigned long	octet[4];
-	const char	*sp;
-	char		*ep;
-	int		octidx;
-
-	sp = str;
-				/* find the four octets 'd.b.c.a.' */
-	for (octidx = 0; octidx < 4; octidx++) {
-					/* ensure it's a number */
-		if (!isdigit((unsigned char)*sp))
-			return -1;
-		octet[octidx] = strtoul(sp, &ep, 10);
-					/* with a trailing '.' */
-		if (*ep != '.')
-			return -1;
-					/* and is 0 <= octet <= 255 */
-		if (octet[octidx] > 255)
-			return -1;
-		sp = ep + 1;
-	}
-				/* ensure trailer is correct */
-	if (strcasecmp(sp, "IN-ADDR.ARPA") != 0)
-		return -1;
-	*result = 0;
-				/* build result from octets in reverse */
-	for (octidx = 3; octidx >= 0; octidx--) {
-		*result <<= 8;
-		*result |= (in_addr_t)(octet[octidx] & 0xff);
-	}
-	return 0;
-}
-
-static struct netent *
-getnetanswer(querybuf *answer, int anslen, int net_i)
-{
-	static char	n_name[MAXDNAME];
-	static char	netbuf[PACKETSZ];
-
-	HEADER		*hp;
-	u_char		*cp;
-	int		n;
-	u_char		*eom;
-	int		type, class, ancount, qdcount, haveanswer;
-	char		*in, *bp, **ap, *ep;
-
-	_DIAGASSERT(answer != NULL);
-
-	/*
-	 * find first satisfactory answer
-	 *
-	 *      answer --> +------------+  ( MESSAGE )
-	 *		   |   Header   |
-	 *		   +------------+
-	 *		   |  Question  | the question for the name server
-	 *		   +------------+
-	 *		   |   Answer   | RRs answering the question
-	 *		   +------------+
-	 *		   | Authority  | RRs pointing toward an authority
-	 *		   | Additional | RRs holding additional information
-	 *		   +------------+
-	 */
-	eom = answer->buf + anslen;
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount); /* #/records in the answer section */
-	qdcount = ntohs(hp->qdcount); /* #/entries in the question section */
-	bp = netbuf;
-	ep = netbuf + sizeof(netbuf);
-	cp = answer->buf + HFIXEDSZ;
-	if (!qdcount) {
-		if (hp->aa)
-			h_errno = HOST_NOT_FOUND;
-		else
-			h_errno = TRY_AGAIN;
-		return NULL;
-	}
-	while (qdcount-- > 0) {
-		n = __dn_skipname(cp, eom);
-		if (n < 0 || (cp + n + QFIXEDSZ) > eom) {
-			h_errno = NO_RECOVERY;
-			return(NULL);
-		}
-		cp += n + QFIXEDSZ;
-	}
-	ap = net_aliases;
-	*ap = NULL;
-	net_entry.n_aliases = net_aliases;
-	haveanswer = 0;
-	n_name[0] = '\0';
-	while (--ancount >= 0 && cp < eom) {
-		n = dn_expand(answer->buf, eom, cp, bp, (int)(ep - bp));
-		if ((n < 0) || !res_dnok(bp))
-			break;
-		cp += n;
-		(void)strlcpy(n_name, bp, sizeof(n_name));
-		GETSHORT(type, cp);
-		GETSHORT(class, cp);
-		cp += INT32SZ;		/* TTL */
-		GETSHORT(n, cp);
-		if (class == C_IN && type == T_PTR) {
-			n = dn_expand(answer->buf, eom, cp, bp, (int)(ep - bp));
-			if ((n < 0) || !res_hnok(bp)) {
-				cp += n;
-				return NULL;
-			}
-			cp += n;
-			*ap++ = bp;
-			bp += strlen(bp) + 1;
-			net_entry.n_addrtype =
-				(class == C_IN) ? AF_INET : AF_UNSPEC;
-			haveanswer++;
-		}
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		switch (net_i) {
-		case BYADDR:
-			net_entry.n_name = *net_entry.n_aliases;
-			net_entry.n_net = 0L;
-			break;
-		case BYNAME:
-			ap = net_entry.n_aliases;
-		next_alias:
-			in = *ap++;
-			if (in == NULL) {
-				h_errno = HOST_NOT_FOUND;
-				return NULL;
-			}
-			net_entry.n_name = n_name;
-			if (parse_reversed_addr(in, &net_entry.n_net) == -1)
-				goto next_alias;
-			break;
-		}
-		net_entry.n_aliases++;
-#if (defined(__sparc__) && defined(_LP64)) ||		\
-    defined(__alpha__) ||				\
-    (defined(__i386__) && defined(_LP64)) ||		\
-    (defined(__sh__) && defined(_LP64))
-		net_entry.__n_pad0 = 0;
-#endif
-		return &net_entry;
-	}
-	h_errno = TRY_AGAIN;
-	return NULL;
-}
-
-/*ARGSUSED*/
-static int
-_files_getnetbyaddr(void *cbrv, void *cbdata, va_list ap)
-{
-	struct netent	**retval = va_arg(ap, struct netent **);
-	uint32_t	  net	 = va_arg(ap, uint32_t);
-	int		  type	 = va_arg(ap, int);
-
-	struct netent	 *np;
-
-	setnetent(_net_stayopen);
-	while ((np = getnetent()) != NULL)
-		if (np->n_addrtype == type && np->n_net == net)
-			break;
-	if (!_net_stayopen)
-		endnetent();
-
-	if (np != NULL) {
-		*retval = np;
-		return NS_SUCCESS;
-	} else {
-		h_errno = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	}
-}
-
-/*ARGSUSED*/
-static int
-_dns_getnetbyaddr(void *cbrv, void *cbdata, va_list ap)
-{
-	struct netent	**retval = va_arg(ap, struct netent **);
-	uint32_t	  net	 = va_arg(ap, uint32_t);
-	int		  type	 = va_arg(ap, int);
-
-	unsigned int	 netbr[4];
-	int		 nn, anslen;
-	querybuf	*buf;
-	char		 qbuf[MAXDNAME];
-	uint32_t	 net2;
-	struct netent	*np;
-	res_state	 res;
-
-	if (type != AF_INET)
-		return NS_UNAVAIL;
-
-	for (nn = 4, net2 = net; net2; net2 >>= 8)
-		netbr[--nn] = (unsigned int)(net2 & 0xff);
-	switch (nn) {
-	default:
-		return NS_UNAVAIL;
-	case 3: 	/* Class A */
-		snprintf(qbuf, sizeof(qbuf), "0.0.0.%u.in-addr.arpa", netbr[3]);
-		break;
-	case 2: 	/* Class B */
-		snprintf(qbuf, sizeof(qbuf), "0.0.%u.%u.in-addr.arpa",
-		    netbr[3], netbr[2]);
-		break;
-	case 1: 	/* Class C */
-		snprintf(qbuf, sizeof(qbuf), "0.%u.%u.%u.in-addr.arpa",
-		    netbr[3], netbr[2], netbr[1]);
-		break;
-	case 0: 	/* Class D - E */
-		snprintf(qbuf, sizeof(qbuf), "%u.%u.%u.%u.in-addr.arpa",
-		    netbr[3], netbr[2], netbr[1], netbr[0]);
-		break;
-	}
-	buf = malloc(sizeof(*buf));
-	if (buf == NULL) {
-		h_errno = NETDB_INTERNAL;
-		return NS_NOTFOUND;
-	}
-	res = __res_get_state();
-	if (res == NULL) {
-		free(buf);
-		return NS_NOTFOUND;
-	}
-	anslen = res_nquery(res, qbuf, C_IN, T_PTR, buf->buf,
-	    (int)sizeof(buf->buf));
-	if (anslen < 0) {
-		free(buf);
-#ifdef DEBUG
-		if (res->options & RES_DEBUG)
-			printf("res_query failed\n");
-#endif
-		__res_put_state(res);
-		return NS_NOTFOUND;
-	}
-	__res_put_state(res);
-	np = getnetanswer(buf, anslen, BYADDR);
-	free(buf);
-	if (np) {
-		/* maybe net should be unsigned? */
-		uint32_t u_net = net;
-
-		/* Strip trailing zeros */
-		while ((u_net & 0xff) == 0 && u_net != 0)
-			u_net >>= 8;
-		np->n_net = u_net;
-	}
-
-	if (np != NULL) {
-		*retval = np;
-		return NS_SUCCESS;
-	} else {
-		h_errno = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	}
-}
-
-struct netent *
-getnetbyaddr(uint32_t net, int net_type)
-{
-	int		 rv;
-	struct netent	*retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getnetbyaddr, NULL)
-		{ NSSRC_DNS, _dns_getnetbyaddr, NULL },	/* force -DHESIOD */
-		NS_NIS_CB(_yp_getnetbyaddr, NULL)
-		NS_NULL_CB
-	};
-
-	retval = NULL;
-	h_errno = NETDB_INTERNAL;
-	rv = nsdispatch(NULL, dtab, NSDB_NETWORKS, "getnetbyaddr",
-	    __nsdefaultsrc, &retval, net, net_type);
-	if (rv == NS_SUCCESS) {
-		h_errno = NETDB_SUCCESS;
-		return retval;
-	}
-	return NULL;
-}
-
-/*ARGSUSED*/
-static int
-_files_getnetbyname(void *cbrv, void *cbdata, va_list ap)
-{
-	struct netent	**retval = va_arg(ap, struct netent **);
-	const char	 *name	 = va_arg(ap, const char *);
-
-	struct netent	 *np;
-	char		**cp;
-
-	setnetent(_net_stayopen);
-	while ((np = getnetent()) != NULL) {
-		if (strcasecmp(np->n_name, name) == 0)
-			break;
-		for (cp = np->n_aliases; *cp != 0; cp++)
-			if (strcasecmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	if (!_net_stayopen)
-		endnetent();
-
-	if (np != NULL) {
-		*retval = np;
-		return NS_SUCCESS;
-	} else {
-		h_errno = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	}
-}
-
-/*ARGSUSED*/
-static int
-_dns_getnetbyname(void *cbrv, void *cbdata, va_list ap)
-{
-	struct netent	**retval = va_arg(ap, struct netent **);
-	const char	 *name	 = va_arg(ap, const char *);
-
-	int		 anslen;
-	querybuf	*buf;
-	char		 qbuf[MAXDNAME];
-	struct netent	*np;
-	res_state	 res;
-
-	strlcpy(&qbuf[0], name, sizeof(qbuf));
-	buf = malloc(sizeof(*buf));
-	if (buf == NULL) {
-		h_errno = NETDB_INTERNAL;
-		return NS_NOTFOUND;
-	}
-	res = __res_get_state();
-	if (res == NULL) {
-		free(buf);
-		return NS_NOTFOUND;
-	}
-	anslen = res_nsearch(res, qbuf, C_IN, T_PTR, buf->buf,
-	    (int)sizeof(buf->buf));
-	if (anslen < 0) {
-		free(buf);
-#ifdef DEBUG
-		if (res->options & RES_DEBUG)
-			printf("res_search failed\n");
-#endif
-		__res_put_state(res);
-		return NS_NOTFOUND;
-	}
-	__res_put_state(res);
-	np = getnetanswer(buf, anslen, BYNAME);
-	free(buf);
-
-	if (np != NULL) {
-		*retval = np;
-		return NS_SUCCESS;
-	} else {
-		h_errno = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	}
-}
-
-struct netent *
-getnetbyname(const char *name)
-{
-	int		 rv;
-	struct netent	*retval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getnetbyname, NULL)
-		{ NSSRC_DNS, _dns_getnetbyname, NULL },	/* force -DHESIOD */
-		NS_NIS_CB(_yp_getnetbyname, NULL)
-		NS_NULL_CB
-	};
-
-	_DIAGASSERT(name != NULL);
-
-	retval = NULL;
-	h_errno = NETDB_INTERNAL;
-	rv = nsdispatch(NULL, dtab, NSDB_NETWORKS, "getnetbyname",
-	    __nsdefaultsrc, &retval, name);
-	if (rv == NS_SUCCESS) {
-		h_errno = NETDB_SUCCESS;
-		return retval;
-	}
-	return NULL;
-}
-
-#ifdef YP
-/*ARGSUSED*/
-static int
-_yp_getnetbyaddr(void *cbrv, void *cb_data, va_list ap)
-{
-	struct netent	**retval = va_arg(ap, struct netent **);
-	uint32_t	  net	 = va_arg(ap, uint32_t);
-	int		  type	 = va_arg(ap, int);
-
-	struct netent	*np;
-	char		 qbuf[MAXDNAME];
-	unsigned int	 netbr[4];
-	uint32_t	 net2;
-	int		 r;
-
-	if (type != AF_INET)
-		return NS_UNAVAIL;
-
-	if (!__ypdomain) {
-		if (_yp_check(&__ypdomain) == 0)
-			return NS_UNAVAIL;
-	}
-	np = NULL;
-	if (__ypcurrent)
-		free(__ypcurrent);
-	__ypcurrent = NULL;
-	for (r = 4, net2 = net; net2; net2 >>= 8)
-		netbr[--r] = (unsigned int)(net2 & 0xff);
-	switch (r) {
-	default:
-		return NS_UNAVAIL;
-	case 3: 	/* Class A */
-		snprintf(qbuf, sizeof(qbuf), "%u", netbr[3]);
-		break;
-	case 2: 	/* Class B */
-		snprintf(qbuf, sizeof(qbuf), "%u.%u", netbr[2], netbr[3]);
-		break;
-	case 1: 	/* Class C */
-		snprintf(qbuf, sizeof(qbuf), "%u.%u.%u", netbr[1], netbr[2],
-		    netbr[3]);
-		break;
-	case 0: 	/* Class D - E */
-		snprintf(qbuf, sizeof(qbuf), "%u.%u.%u.%u", netbr[0], netbr[1],
-		    netbr[2], netbr[3]);
-		break;
-	}
-	r = yp_match(__ypdomain, "networks.byaddr", qbuf, (int)strlen(qbuf),
-	    &__ypcurrent, &__ypcurrentlen);
-	if (r == 0)
-		np = _ypnetent(__ypcurrent);
-
-	if (np != NULL) {
-		*retval = np;
-		return NS_SUCCESS;
-	} else {
-		h_errno = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	}
-}
-
-/*ARGSUSED*/
-static int
-_yp_getnetbyname(void *cbrv, void *cbdata, va_list ap)
-{
-	struct netent	**retval = va_arg(ap, struct netent **);
-	const char	 *name	 = va_arg(ap, const char *);
-
-	struct netent	*np;
-	int		 r;
-
-	if (!__ypdomain) {
-		if (_yp_check(&__ypdomain) == 0)
-			return NS_UNAVAIL;
-	}
-	np = NULL;
-	if (__ypcurrent)
-		free(__ypcurrent);
-	__ypcurrent = NULL;
-	r = yp_match(__ypdomain, "networks.byname", name, (int)strlen(name),
-	    &__ypcurrent, &__ypcurrentlen);
-	if (r == 0)
-		np = _ypnetent(__ypcurrent);
-
-	if (np != NULL) {
-		*retval = np;
-		return NS_SUCCESS;
-	} else {
-		h_errno = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	}
-}
-
-static struct netent *
-_ypnetent(char *line)
-{
-	char *cp, *p, **q;
-
-	_DIAGASSERT(line != NULL);
-
-	net_entry.n_name = line;
-	cp = strpbrk(line, " \t");
-	if (cp == NULL)
-		return NULL;
-	*cp++ = '\0';
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	net_entry.n_net = inet_network(cp);
-#if (defined(__sparc__) && defined(_LP64)) ||		\
-    defined(__alpha__) ||				\
-    (defined(__i386__) && defined(_LP64)) ||		\
-    (defined(__sh__) && defined(_LP64))
-	net_entry.__n_pad0 = 0;
-#endif
-	net_entry.n_addrtype = AF_INET;
-	q = net_entry.n_aliases = net_aliases;
-	if (p != NULL)  {
-		cp = p;
-		while (cp && *cp) {
-			if (*cp == ' ' || *cp == '\t') {
-				cp++;
-				continue;
-			}
-			if (q < &net_aliases[MAXALIASES - 1])
-				*q++ = cp;
-			cp = strpbrk(cp, " \t");
-			if (cp != NULL)
-				*cp++ = '\0';
-		}
-	}
-	*q = NULL;
-
-	return &net_entry;
-}
-#endif
diff --git a/lib/libc/net/getpeereid.3 b/lib/libc/net/getpeereid.3
deleted file mode 100644
index 77df2b305..000000000
--- a/lib/libc/net/getpeereid.3
+++ /dev/null
@@ -1,142 +0,0 @@
-.\"
-.\" Copyright (c) 2001 Dima Dorfman.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: src/lib/libc/gen/getpeereid.3,v 1.6 2002/12/18 10:13:54 ru Exp $
-.\"
-.\" $NetBSD: getpeereid.3,v 1.2 2008/01/29 13:55:27 abs Exp $
-.\"
-.Dd August 8, 2007
-.Dt GETPEEREID 3
-.Os
-.Sh NAME
-.Nm getpeereid
-.Nd get the effective credentials of a UNIX-domain peer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In unistd.h
-.Ft int
-.Fn getpeereid "int s" "uid_t *euid" "gid_t *egid"
-.Sh DESCRIPTION
-The
-.Fn getpeereid
-function returns the effective user and group IDs of the
-peer connected to a
-.Ux Ns -domain
-socket.
-The argument
-.Fa s
-must be a
-.Ux Ns -domain
-socket
-.Pq Xr unix 4
-of type
-.Dv SOCK_STREAM
-on which either
-.Xr connect 2
-has been called, or one returned from
-.Xr accept 2
-after
-.Xr bind 2
-and
-.Xr listen 2
-have been called.
-If non-NULL, the effective used ID is placed in
-.Fa euid ,
-and the effective group ID in
-.Fa egid .
-.Pp
-The credentials returned to the
-.Xr accept 2
-caller are those of its peer at the time it called
-.Xr connect 2 ;
-the credentials returned to the
-.Xr connect 2
-caller are those of its peer at the time it called
-.Xr bind 2 .
-This mechanism is reliable; there is no way for either side to influence
-the credentials returned to its peer except by calling the appropriate
-system call (i.e., either
-.Xr connect 2
-or
-.Xr bind 2 )
-under different effective credentials.
-.Pp
-One common use of this routine is for a
-.Ux Ns -domain
-server
-to verify the credentials of its client.
-Likewise, the client can verify the credentials of the server.
-.Sh IMPLEMENTATION NOTES
-On
-.Nx ,
-.Fn getpeereid
-is implemented in terms of the
-.Dv LOCAL_PEEREID
-.Xr unix 4
-socket option.
-.Sh RETURN VALUES
-.Rv -std getpeereid
-.Sh ERRORS
-The
-.Fn getpeereid
-function
-fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is a file, not a socket.
-.It Bq Er ENOTCONN
-The argument
-.Fa s
-does not refer to a socket on which
-.Xr connect 2
-have been called nor one returned from
-.Xr listen 2 .
-.It Bq Er EINVAL
-The argument
-.Fa s
-does not refer to a socket of type
-.Dv SOCK_STREAM ,
-or the kernel returned invalid data.
-.El
-.Sh SEE ALSO
-.Xr connect 2 ,
-.Xr getpeername 2 ,
-.Xr getsockname 2 ,
-.Xr getsockopt 2 ,
-.Xr listen 2 ,
-.Xr unix 4
-.Sh HISTORY
-The
-.Fn getpeereid
-function appeared in
-.Nx 5.0 .
diff --git a/lib/libc/net/getpeereid.c b/lib/libc/net/getpeereid.c
deleted file mode 100644
index 72652caeb..000000000
--- a/lib/libc/net/getpeereid.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $NetBSD: getpeereid.c,v 1.2 2008/04/29 06:53:01 martin Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Arne H. Juul.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getpeereid.c,v 1.2 2008/04/29 06:53:01 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/un.h>
-#include <sys/socket.h>
-
-
-int
-getpeereid(int s, uid_t *euid, gid_t *egid)
-{
-	struct unpcbid cred;
-	socklen_t len = sizeof(cred);
-	if (getsockopt(s, 0, LOCAL_PEEREID, &cred, &len) < 0) {
-		return -1;
-	} else {
-		if (euid != NULL)
-			*euid = cred.unp_euid;
-		if (egid != NULL)
-			*egid = cred.unp_egid;
-		return 0;
-	}
-}
diff --git a/lib/libc/net/getprotobyname.c b/lib/libc/net/getprotobyname.c
deleted file mode 100644
index e5aa8300c..000000000
--- a/lib/libc/net/getprotobyname.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: getprotobyname.c,v 1.4 2008/04/28 20:23:00 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getprotobyname.c,v 1.4 2008/04/28 20:23:00 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <netdb.h>
-
-#include "protoent.h"
-
-#ifdef __weak_alias
-__weak_alias(getprotobyname,_getprotobyname)
-#endif
-
-#ifdef _REENTRANT
-extern mutex_t _protoent_mutex;
-#endif
-extern struct protoent_data _protoent_data;
-
-struct protoent *
-getprotobyname(const char *name)
-{
-	struct protoent *p;
-
-	mutex_lock(&_protoent_mutex);
-	p = getprotobyname_r(name, &_protoent_data.proto, &_protoent_data);
-	mutex_unlock(&_protoent_mutex);
-	return (p);
-}
diff --git a/lib/libc/net/getprotobyname_r.c b/lib/libc/net/getprotobyname_r.c
deleted file mode 100644
index 3b621e0ef..000000000
--- a/lib/libc/net/getprotobyname_r.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: getprotobyname_r.c,v 1.3 2005/04/18 19:39:45 kleink Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getprotoname.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getprotobyname_r.c,v 1.3 2005/04/18 19:39:45 kleink Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <netdb.h>
-#include <string.h>
-
-#include "protoent.h"
-
-#ifdef __weak_alias
-__weak_alias(getprotobyname_r,_getprotobyname_r)
-#endif
-
-struct protoent *
-getprotobyname_r(const char *name, struct protoent *pr,
-    struct protoent_data *pd)
-{
-	struct protoent *p;
-	char **cp;
-
-	_DIAGASSERT(name != NULL);
-
-	setprotoent_r(pd->stayopen, pd);
-	while ((p = getprotoent_r(pr, pd)) != NULL) {
-		if (strcmp(p->p_name, name) == 0)
-			break;
-		for (cp = p->p_aliases; *cp != NULL; cp++)
-			if (strcmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	if (!pd->stayopen)
-		if (pd->fp != NULL) {
-			(void)fclose(pd->fp);
-			pd->fp = NULL;
-		}
-	return p;
-}
diff --git a/lib/libc/net/getprotobynumber.c b/lib/libc/net/getprotobynumber.c
deleted file mode 100644
index 4840052d9..000000000
--- a/lib/libc/net/getprotobynumber.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: getprotobynumber.c,v 1.4 2008/04/28 20:23:00 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getprotobynumber.c,v 1.4 2008/04/28 20:23:00 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <netdb.h>
-
-#include "protoent.h"
-
-#ifdef __weak_alias
-__weak_alias(getprotobynumber,_getprotobynumber)
-#endif
-
-#ifdef _REENTRANT
-extern mutex_t _protoent_mutex;
-#endif
-extern struct protoent_data _protoent_data;
-
-struct protoent *
-getprotobynumber(int proto)
-{
-	struct protoent *p;
-
-	mutex_lock(&_protoent_mutex);
-	p = getprotobynumber_r(proto, &_protoent_data.proto, &_protoent_data);
-	mutex_unlock(&_protoent_mutex);
-	return (p);
-}
diff --git a/lib/libc/net/getprotobynumber_r.c b/lib/libc/net/getprotobynumber_r.c
deleted file mode 100644
index e1cb4f1ef..000000000
--- a/lib/libc/net/getprotobynumber_r.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: getprotobynumber_r.c,v 1.3 2005/04/18 19:39:45 kleink Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getproto.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getprotobynumber_r.c,v 1.3 2005/04/18 19:39:45 kleink Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <netdb.h>
-#include <stddef.h>
-
-#include "protoent.h"
-
-#ifdef __weak_alias
-__weak_alias(getprotobynumber_r,_getprotobynumber_r)
-#endif
-
-struct protoent *
-getprotobynumber_r(int proto, struct protoent *pr, struct protoent_data *pd)
-{
-	struct protoent *p;
-
-	setprotoent_r(pd->stayopen, pd);
-	while ((p = getprotoent_r(pr, pd)) != NULL)
-		if (p->p_proto == proto)
-			break;
-	if (!pd->stayopen)
-		if (pd->fp != NULL) {
-			(void)fclose(pd->fp);
-			pd->fp = NULL;
-		}
-	return p;
-}
diff --git a/lib/libc/net/getprotoent.3 b/lib/libc/net/getprotoent.3
deleted file mode 100644
index 44a3d5758..000000000
--- a/lib/libc/net/getprotoent.3
+++ /dev/null
@@ -1,156 +0,0 @@
-.\"	$NetBSD: getprotoent.3,v 1.13 2011/07/14 22:12:30 wiz Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)getprotoent.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd July 15, 2011
-.Dt GETPROTOENT 3
-.Os
-.Sh NAME
-.Nm getprotoent ,
-.Nm getprotobynumber ,
-.Nm getprotobyname ,
-.Nm setprotoent ,
-.Nm endprotoent
-.Nd get protocol entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netdb.h
-.Ft struct protoent *
-.Fn getprotoent
-.Ft struct protoent *
-.Fn getprotobyname "const char *name"
-.Ft struct protoent *
-.Fn getprotobynumber "int proto"
-.Ft void
-.Fn setprotoent "int stayopen"
-.Ft void
-.Fn endprotoent "void"
-.Sh DESCRIPTION
-The
-.Fn getprotoent ,
-.Fn getprotobyname ,
-and
-.Fn getprotobynumber
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network protocol data base,
-.Pa /etc/protocols .
-.Bd -literal -offset indent
-.Pp
-struct	protoent {
-	char	*p_name;	/* official name of protocol */
-	char	**p_aliases;	/* alias list */
-	int	p_proto;	/* protocol number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width p_aliases -offset indent
-.It Fa p_name
-The official name of the protocol.
-.It Fa p_aliases
-A zero terminated list of alternative names for the protocol.
-.It Fa p_proto
-The protocol number.
-.El
-.Pp
-The
-.Fn getprotoent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setprotoent
-function
-opens and rewinds the file.
-If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to
-.Fn getprotobyname
-or
-.Fn getprotobynumber .
-.Pp
-The
-.Fn endprotoent
-function
-closes the file.
-.Pp
-The
-.Fn getprotobyname
-function
-and
-.Fn getprotobynumber
-sequentially search from the beginning
-of the file until a matching
-protocol name or
-protocol number is found,
-or until
-.Dv EOF
-is encountered.
-.Sh RETURN VALUES
-Upon success,
-.Fn getprotoent ,
-.Fn getprotobyname ,
-and
-.Fn getprotobynumber
-return a pointer to the
-.Vt protoent
-structure as described above.
-A
-.Dv NULL
-pointer is returned on
-.Dv EOF
-or error.
-.Sh FILES
-.Bl -tag -width /etc/protocols -compact
-.It Pa /etc/protocols
-.El
-.Sh SEE ALSO
-.Xr protocols 5
-.Sh HISTORY
-The
-.Fn getprotoent ,
-.Fn getprotobynumber ,
-.Fn getprotobyname ,
-.Fn setprotoent ,
-and
-.Fn endprotoent
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-These functions use a static data space;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Only the Internet
-protocols are currently understood.
diff --git a/lib/libc/net/getprotoent.c b/lib/libc/net/getprotoent.c
deleted file mode 100644
index 1912b4e12..000000000
--- a/lib/libc/net/getprotoent.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*	$NetBSD: getprotoent.c,v 1.12 2008/04/28 20:23:00 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getprotoent.c,v 1.12 2008/04/28 20:23:00 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <netdb.h>
-
-#include "protoent.h"
-
-#ifdef __weak_alias
-__weak_alias(endprotoent,_endprotoent)
-__weak_alias(getprotoent,_getprotoent)
-__weak_alias(setprotoent,_setprotoent)
-#endif
-
-#ifdef _REENTRANT
-mutex_t _protoent_mutex = MUTEX_INITIALIZER;
-#endif
-struct protoent_data _protoent_data;
-
-void
-setprotoent(int f)
-{
-	mutex_lock(&_protoent_mutex);
-	setprotoent_r(f, &_protoent_data);
-	mutex_unlock(&_protoent_mutex);
-}
-
-void
-endprotoent(void)
-{
-	mutex_lock(&_protoent_mutex);
-	endprotoent_r(&_protoent_data);
-	mutex_unlock(&_protoent_mutex);
-}
-
-struct protoent *
-getprotoent(void)
-{
-	struct protoent *p;
-
-	mutex_lock(&_protoent_mutex);
-	p = getprotoent_r(&_protoent_data.proto, &_protoent_data);
-	mutex_unlock(&_protoent_mutex);
-	return (p);
-}
diff --git a/lib/libc/net/getprotoent_r.c b/lib/libc/net/getprotoent_r.c
deleted file mode 100644
index deae55075..000000000
--- a/lib/libc/net/getprotoent_r.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*	$NetBSD: getprotoent_r.c,v 1.6 2011/10/15 23:00:02 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getprotoent.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getprotoent_r.c,v 1.6 2011/10/15 23:00:02 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <netdb.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "protoent.h"
-
-#ifdef __weak_alias
-__weak_alias(endprotoent_r,_endprotoent_r)
-__weak_alias(getprotoent_r,_getprotoent_r)
-__weak_alias(setprotoent_r,_setprotoent_r)
-#endif
-
-void
-setprotoent_r(int f, struct protoent_data *pd)
-{
-	if (pd->fp == NULL)
-		pd->fp = fopen(_PATH_PROTOCOLS, "re");
-	else
-		rewind(pd->fp);
-	pd->stayopen |= f;
-}
-
-void
-endprotoent_r(struct protoent_data *pd)
-{
-	if (pd->fp) {
-		(void)fclose(pd->fp);
-		pd->fp = NULL;
-	}
-	if (pd->aliases) {
-		free(pd->aliases);
-		pd->aliases = NULL;
-		pd->maxaliases = 0;
-	}
-	if (pd->line) {
-		free(pd->line);
-		pd->line = NULL;
-	}
-	pd->stayopen = 0;
-}
-
-struct protoent *
-getprotoent_r(struct protoent *pr, struct protoent_data *pd)
-{
-	char *p, *cp, **q;
-	size_t i = 0;
-	int oerrno;
-
-	if (pd->fp == NULL && (pd->fp = fopen(_PATH_PROTOCOLS, "re")) == NULL)
-		return NULL;
-
-	for (;;) {
-		if (pd->line)
-			free(pd->line);
-		pd->line = fparseln(pd->fp, NULL, NULL, NULL,
-		    FPARSELN_UNESCALL);
-		if (pd->line == NULL)
-			return NULL;
-		pr->p_name = p = pd->line;
-		cp = strpbrk(p, " \t");
-		if (cp == NULL)
-			continue;
-		*cp++ = '\0';
-		while (*cp == ' ' || *cp == '\t')
-			cp++;
-		p = strpbrk(cp, " \t");
-		if (p != NULL)
-			*p++ = '\0';
-		pr->p_proto = atoi(cp);
-		if (pd->aliases == NULL) {
-			pd->maxaliases = 10;
-			pd->aliases = malloc(pd->maxaliases * sizeof(char *));
-			if (pd->aliases == NULL) {
-				oerrno = errno;
-				endprotoent_r(pd);
-				errno = oerrno;
-				return NULL;
-			}
-		}
-		q = pr->p_aliases = pd->aliases;
-		if (p != NULL) {
-			cp = p;
-			while (cp && *cp) {
-				if (*cp == ' ' || *cp == '\t') {
-					cp++;
-					continue;
-				}
-				if (i == pd->maxaliases - 2) {
-					pd->maxaliases *= 2;
-					q = realloc(q,
-					    pd->maxaliases * sizeof(char *));
-					if (q == NULL) {
-						oerrno = errno;
-						endprotoent_r(pd);
-						errno = oerrno;
-						return NULL;
-					}
-					pr->p_aliases = pd->aliases = q;
-				}
-				q[i++] = cp;
-
-				cp = strpbrk(cp, " \t");
-				if (cp != NULL)
-					*cp++ = '\0';
-			}
-		}
-		q[i] = NULL;
-		return pr;
-	}
-}
diff --git a/lib/libc/net/getservbyname.c b/lib/libc/net/getservbyname.c
deleted file mode 100644
index d208aded9..000000000
--- a/lib/libc/net/getservbyname.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: getservbyname.c,v 1.14 2008/04/28 20:23:00 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getservbyname.c,v 1.14 2008/04/28 20:23:00 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <netdb.h>
-
-#include "servent.h"
-
-#ifdef __weak_alias
-__weak_alias(getservbyname,_getservbyname)
-#endif
-
-#ifdef _REENTRANT
-extern mutex_t _servent_mutex;
-#endif
-extern struct servent_data _servent_data;
-
-struct servent *
-getservbyname(const char *name, const char *proto)
-{
-	struct servent *s;
-
-	mutex_lock(&_servent_mutex);
-	s = getservbyname_r(name, proto, &_servent_data.serv, &_servent_data);
-	mutex_unlock(&_servent_mutex);
-	return (s);
-}
diff --git a/lib/libc/net/getservbyname_r.c b/lib/libc/net/getservbyname_r.c
deleted file mode 100644
index 35d6e4099..000000000
--- a/lib/libc/net/getservbyname_r.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*	$NetBSD: getservbyname_r.c,v 1.9 2012/03/13 21:13:41 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getservbyname.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getservbyname_r.c,v 1.9 2012/03/13 21:13:41 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <cdbr.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "servent.h"
-
-#ifdef __weak_alias
-__weak_alias(getservbyname_r,_getservbyname_r)
-#endif
-
-static struct servent *
-_servent_getbyname(struct servent_data *sd, struct servent *sp,
-    const char *name, const char *proto)
-{
-
-	if ((sd->flags & (_SV_CDB | _SV_PLAINFILE)) == 0)
-		return NULL;
-
-	if (sd->flags & _SV_CDB) {
-		uint8_t buf[255 * 2 + 2];
-		size_t namelen, protolen;
-		const uint8_t *data, *data_end;
-		const void *data_ptr;
-		size_t datalen;
-
-		namelen = strlen(name);
-		if (namelen == 0 || namelen > 255)
-			return NULL;
-		if (proto != NULL) {
-			protolen = strlen(proto);
-			if (protolen == 0 || protolen > 255)
-				return NULL;
-		} else
-			protolen = 0;
-		if (namelen + protolen > 255)
-			return NULL;
-
-		buf[0] = (uint8_t)namelen;
-		buf[1] = (uint8_t)protolen;
-		memcpy(buf + 2, name, namelen);
-		memcpy(buf + 2 + namelen, proto, protolen);
-
-		if (cdbr_find(sd->cdb, buf, 2 + namelen + protolen,
-		    &data_ptr, &datalen))
-			return NULL;
-
-		if (datalen < namelen + protolen + 6)
-			return NULL;
-
-		data = data_ptr;
-		data_end = data + datalen;
-		if (protolen) {
-			if (data[2] != protolen)
-				return NULL;
-			if (memcmp(data + 3, proto, protolen + 1))
-				return NULL;
-		}
-		data += 3 + data[2] + 1;
-		if (data > data_end)
-			return NULL;
-		while (data != data_end) {
-			if (*data == '\0')
-				return NULL;
-			if (data + data[0] + 2 > data_end)
-				return NULL;
-			if (data[0] == namelen &&
-			    memcmp(data + 1, name, namelen + 1) == 0)
-				return _servent_parsedb(sd, sp, data_ptr,
-				    datalen);
-			data += data[0] + 2;
-		}
-		return NULL;
-	} else {
-		while (_servent_getline(sd) != -1) {
-			char **cp;
-			if (_servent_parseline(sd, sp) == NULL)
-				continue;
-
-			if (strcmp(name, sp->s_name) == 0)
-				goto gotname;
-
-			for (cp = sp->s_aliases; *cp; cp++)
-				if (strcmp(name, *cp) == 0)
-					goto gotname;
-			continue;
-gotname:
-			if (proto == NULL || strcmp(sp->s_proto, proto) == 0)
-				return sp;
-		}
-		return NULL;
-	}
-}
-
-struct servent *
-getservbyname_r(const char *name, const char *proto, struct servent *sp,
-    struct servent_data *sd)
-{
-	_DIAGASSERT(name != NULL);
-	/* proto may be NULL */
-
-	setservent_r(sd->flags & _SV_STAYOPEN, sd);
-	sp = _servent_getbyname(sd, sp, name, proto);
-	if (!(sd->flags & _SV_STAYOPEN))
-		_servent_close(sd);
-	return sp;
-}
diff --git a/lib/libc/net/getservbyport.c b/lib/libc/net/getservbyport.c
deleted file mode 100644
index 8562c3d3d..000000000
--- a/lib/libc/net/getservbyport.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: getservbyport.c,v 1.12 2008/04/28 20:23:00 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getservbyport.c,v 1.12 2008/04/28 20:23:00 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <netdb.h>
-
-#include "servent.h"
-
-#ifdef __weak_alias
-__weak_alias(getservbyport,_getservbyport)
-#endif
-
-#ifdef _REENTRANT
-extern mutex_t _servent_mutex;
-#endif
-extern struct servent_data _servent_data;
-
-struct servent *
-getservbyport(int port, const char *proto)
-{
-	struct servent *s;
-
-	mutex_lock(&_servent_mutex);
-	s = getservbyport_r(port, proto, &_servent_data.serv, &_servent_data);
-	mutex_unlock(&_servent_mutex);
-	return (s);
-}
diff --git a/lib/libc/net/getservbyport_r.c b/lib/libc/net/getservbyport_r.c
deleted file mode 100644
index 3d8f365c3..000000000
--- a/lib/libc/net/getservbyport_r.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*	$NetBSD: getservbyport_r.c,v 1.9 2012/03/13 21:13:41 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getservbyport.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getservbyport_r.c,v 1.9 2012/03/13 21:13:41 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <cdbr.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "servent.h"
-
-#ifdef __weak_alias
-__weak_alias(getservbyport_r,_getservbyport_r)
-#endif
-
-static struct servent *
-_servent_getbyport(struct servent_data *sd, struct servent *sp, int port,
-    const char *proto)
-{
-
-	if ((sd->flags & (_SV_CDB | _SV_PLAINFILE)) == 0)
-		return NULL;
-
-	if (sd->flags & _SV_CDB) {
-		uint8_t buf[255 + 4];
-		size_t protolen;
-		const uint8_t *data;
-		const void *data_ptr;
-		size_t datalen;
-
-		port = be16toh(port);
-
-		if (proto != NULL) {
-			protolen = strlen(proto);
-			if (protolen == 0 || protolen > 255)
-				return NULL;
-		} else
-			protolen = 0;
-		if (port < 0 || port > 65536)
-			return NULL;
-
-		buf[0] = 0;
-		buf[1] = (uint8_t)protolen;
-		be16enc(buf + 2, port);
-		memcpy(buf + 4, proto, protolen);
-
-		if (cdbr_find(sd->cdb, buf, 4 + protolen,
-		    &data_ptr, &datalen))
-			return NULL;
-
-		if (datalen < protolen + 4)
-			return NULL;
-
-		data = data_ptr;
-		if (be16dec(data) != port)
-			return NULL;
-		if (protolen) {
-			if (data[2] != protolen)
-				return NULL;
-			if (memcmp(data + 3, proto, protolen + 1))
-				return NULL;
-		}
-		return _servent_parsedb(sd, sp, data, datalen);
-	} else {
-		while (_servent_getline(sd) != -1) {
-			if (_servent_parseline(sd, sp) == NULL)
-				continue;
-			if (sp->s_port != port)
-				continue;
-			if (proto == NULL || strcmp(sp->s_proto, proto) == 0)
-				return sp;
-		}
-		return NULL;
-	}
-}
-
-struct servent *
-getservbyport_r(int port, const char *proto, struct servent *sp,
-    struct servent_data *sd)
-{
-	setservent_r(sd->flags & _SV_STAYOPEN, sd);
-	sp = _servent_getbyport(sd, sp, port, proto);
-	if (!(sd->flags & _SV_STAYOPEN))
-		_servent_close(sd);
-	return sp;
-}
diff --git a/lib/libc/net/getservent.3 b/lib/libc/net/getservent.3
deleted file mode 100644
index d6bcdfe28..000000000
--- a/lib/libc/net/getservent.3
+++ /dev/null
@@ -1,154 +0,0 @@
-.\"	$NetBSD: getservent.3,v 1.14 2003/08/07 16:43:10 agc Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)getservent.3      8.4 (Berkeley) 5/25/95
-.\"
-.Dd May 25, 1995
-.Dt GETSERVENT 3
-.Os
-.Sh NAME
-.Nm getservent ,
-.Nm getservbyport ,
-.Nm getservbyname ,
-.Nm setservent ,
-.Nm endservent
-.Nd get service entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netdb.h
-.Ft struct servent *
-.Fn getservent
-.Ft struct servent *
-.Fn getservbyname "const char *name" "const char *proto"
-.Ft struct servent *
-.Fn getservbyport "int port" "const char *proto"
-.Ft void
-.Fn setservent "int stayopen"
-.Ft void
-.Fn endservent void
-.Sh DESCRIPTION
-The
-.Fn getservent ,
-.Fn getservbyname ,
-and
-.Fn getservbyport
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network services data base,
-.Pa /etc/services .
-.Bd -literal -offset indent
-struct	servent {
-	char	*s_name;	/* official name of service */
-	char	**s_aliases;	/* alias list */
-	int	s_port;		/* port service resides at */
-	char	*s_proto;	/* protocol to use */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width s_aliases
-.It Fa s_name
-The official name of the service.
-.It Fa s_aliases
-A NULL terminated list of alternative names for the service.
-.It Fa s_port
-The port number at which the service resides.
-Port numbers must be given and are returned in network byte order.
-.It Fa s_proto
-The name of the protocol to use when contacting the
-service.
-.El
-.Pp
-The
-.Fn getservent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setservent
-function
-opens and rewinds the file.  If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to
-.Fn getservbyname
-or
-.Fn getservbyport .
-.Pp
-The
-.Fn endservent
-function
-closes the file.
-.Pp
-The
-.Fn getservbyname
-and
-.Fn getservbyport
-functions
-sequentially search from the beginning
-of the file until a matching
-protocol name or
-port number is found,
-or until
-.Dv EOF
-is encountered.
-If a protocol name is also supplied (non-\c
-.Dv NULL ) ,
-searches must also match the protocol.
-.Sh FILES
-.Bl -tag -width /etc/services -compact
-.It Pa /etc/services
-.El
-.Sh DIAGNOSTICS
-Null pointer
-(0) returned on
-.Dv EOF
-or error.
-.Sh SEE ALSO
-.Xr getprotoent 3 ,
-.Xr services 5
-.Sh HISTORY
-The
-.Fn getservent ,
-.Fn getservbyport ,
-.Fn getservbyname ,
-.Fn setservent ,
-and
-.Fn endservent
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Expecting port numbers to fit in a 32 bit
-quantity is probably naive.
diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c
deleted file mode 100644
index 5465d6aa6..000000000
--- a/lib/libc/net/getservent.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*	$NetBSD: getservent.c,v 1.12 2008/04/28 20:23:00 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getservent.c,v 1.12 2008/04/28 20:23:00 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <netdb.h>
-
-#include "servent.h"
-
-#ifdef __weak_alias
-__weak_alias(endservent,_endservent)
-__weak_alias(getservent,_getservent)
-__weak_alias(setservent,_setservent)
-#endif
-
-#ifdef _REENTRANT
-mutex_t _servent_mutex = MUTEX_INITIALIZER;
-#endif
-struct servent_data _servent_data;
-
-void
-setservent(int f)
-{
-	mutex_lock(&_servent_mutex);
-	setservent_r(f, &_servent_data);
-	mutex_unlock(&_servent_mutex);
-}
-
-void
-endservent(void)
-{
-	mutex_lock(&_servent_mutex);
-	endservent_r(&_servent_data);
-	mutex_unlock(&_servent_mutex);
-}
-
-struct servent *
-getservent(void)
-{
-	struct servent *s;
-
-	mutex_lock(&_servent_mutex);
-	s = getservent_r(&_servent_data.serv, &_servent_data);
-	mutex_unlock(&_servent_mutex);
-	return (s);
-}
diff --git a/lib/libc/net/getservent_r.c b/lib/libc/net/getservent_r.c
deleted file mode 100644
index fc2ca212e..000000000
--- a/lib/libc/net/getservent_r.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/*	$NetBSD: getservent_r.c,v 1.11 2011/10/15 23:00:02 christos Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getservent.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getservent_r.c,v 1.11 2011/10/15 23:00:02 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <cdbr.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "servent.h"
-
-#ifdef __weak_alias
-__weak_alias(endservent_r,_endservent_r)
-__weak_alias(getservent_r,_getservent_r)
-__weak_alias(setservent_r,_setservent_r)
-#endif
-
-int
-_servent_open(struct servent_data *sd)
-{
-	if (sd->flags & (_SV_CDB | _SV_PLAINFILE)) {
-		sd->flags |= _SV_FIRST;
-		return 0;
-	}
-
-	free(sd->line);
-	sd->line = NULL;
-	free(sd->cdb_buf);
-	sd->cdb_buf = NULL;
-	sd->cdb_buf_len = 0;
-	free(sd->aliases);
-	sd->aliases = NULL;
-	sd->maxaliases = 0;
-	sd->flags |= _SV_FIRST;
-
-	sd->cdb = cdbr_open(_PATH_SERVICES_CDB, CDBR_DEFAULT);
-	if (sd->cdb != NULL) {
-		sd->flags |= _SV_CDB;
-		return 0;
-	}
-		
-	sd->plainfile = fopen(_PATH_SERVICES, "re");
-	if (sd->plainfile != NULL) {
-		sd->flags |= _SV_PLAINFILE;
-		return 0;
-	}
-	return -1;
-}
-
-void
-_servent_close(struct servent_data *sd)
-{
-	if (sd->flags & _SV_CDB) {
-		cdbr_close(sd->cdb);
-		sd->cdb = NULL;
-		sd->flags &= ~_SV_CDB;
-	}
-
-	if (sd->flags & _SV_PLAINFILE) {
-		(void)fclose(sd->plainfile);
-		sd->plainfile = NULL;
-		sd->flags &= ~_SV_PLAINFILE;
-	}
-	sd->flags &= ~_SV_STAYOPEN;
-}
-
-
-int
-_servent_getline(struct servent_data *sd)
-{
-
-	if (sd->flags & _SV_CDB)
-		return -1;
-
-	if ((sd->flags & _SV_PLAINFILE) == 0)
-		return -1;
-
-	free(sd->line);
-	sd->line = NULL;
-
-	if (sd->flags & _SV_FIRST) {
-		(void)rewind((FILE *)sd->plainfile);
-		sd->flags &= ~_SV_FIRST;
-	}
-	sd->line = fparseln(sd->plainfile, NULL, NULL, NULL,
-	    FPARSELN_UNESCALL);
-	return sd->line == NULL ? -1 : 0;
-}
-
-struct servent *
-_servent_parseline(struct servent_data *sd, struct servent *sp)
-{
-	size_t i = 0;
-	int oerrno;
-	char *p, *cp, **q;
-
-	if (sd->line == NULL)
-		return NULL;
-
-	sp->s_name = p = sd->line;
-	p = strpbrk(p, " \t");
-	if (p == NULL)
-		return NULL;
-	*p++ = '\0';
-	while (*p == ' ' || *p == '\t')
-		p++;
-	cp = strpbrk(p, ",/");
-	if (cp == NULL)
-		return NULL;
-	*cp++ = '\0';
-	sp->s_port = htons((u_short)atoi(p));
-	sp->s_proto = cp;
-	if (sd->aliases == NULL) {
-		sd->maxaliases = 10;
-		sd->aliases = calloc(sd->maxaliases, sizeof(*sd->aliases));
-		if (sd->aliases == NULL) {
-			oerrno = errno;
-			endservent_r(sd);
-			errno = oerrno;
-			return NULL;
-		}
-	}
-	sp->s_aliases = sd->aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (i == sd->maxaliases - 2) {
-			sd->maxaliases *= 2;
-			q = realloc(sd->aliases, sd->maxaliases * sizeof(*q));
-			if (q == NULL) {
-				oerrno = errno;
-				endservent_r(sd);
-				errno = oerrno;
-				return NULL;
-			}
-			sp->s_aliases = sd->aliases = q;
-		}
-		sp->s_aliases[i++] = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	sp->s_aliases[i] = NULL;
-	return sp;
-}
-
-void
-setservent_r(int f, struct servent_data *sd)
-{
-	(void)_servent_open(sd);
-	sd->flags |= f ? _SV_STAYOPEN : 0;
-}
-
-void
-endservent_r(struct servent_data *sd)
-{
-	_servent_close(sd);
-	free(sd->aliases);
-	sd->aliases = NULL;
-	sd->maxaliases = 0;
-	free(sd->line);
-	sd->line = NULL;
-	free(sd->cdb_buf);
-	sd->cdb_buf = NULL;
-	sd->cdb_buf_len = 0;
-}
-
-struct servent *
-getservent_r(struct servent *sp, struct servent_data *sd)
-{
-
-	if ((sd->flags & (_SV_CDB | _SV_PLAINFILE)) == 0 &&
-	    _servent_open(sd) == -1)
-		return NULL;
-
-	if (sd->flags & _SV_CDB) {
-		const void *data;
-		size_t len;
-
-		if (sd->flags & _SV_FIRST) {
-			sd->cdb_index = 0;
-			sd->flags &= ~_SV_FIRST;
-		}
-
-		if (cdbr_get(sd->cdb, sd->cdb_index, &data, &len))
-			return NULL;
-		++sd->cdb_index;
-		return _servent_parsedb(sd, sp, data, len);
-	}
-	if (sd->flags & _SV_PLAINFILE) {
-		for (;;) {
-			if (_servent_getline(sd) == -1)
-				return NULL;
-			if (_servent_parseline(sd, sp) == NULL)
-				continue;
-			return sp;
-		}
-	}
-	return NULL;
-}
-
-struct servent *
-_servent_parsedb(struct servent_data *sd, struct servent *sp,
-    const uint8_t *data, size_t len)
-{
-	char **q;
-	size_t i;
-	int oerrno;
-
-	if ((sd->flags & _SV_STAYOPEN) == 0) {
-		if (len > sd->cdb_buf_len) {
-			void *tmp = realloc(sd->cdb_buf, len);
-			if (tmp == NULL)
-				goto fail;
-			sd->cdb_buf = tmp;
-			sd->cdb_buf_len = len;
-		}
-		memcpy(sd->cdb_buf, data, len);
-		data = sd->cdb_buf;
-	}
-
-	if (len < 2)
-		goto fail;
-	sp->s_port = htobe16(be16dec(data));
-	data += 2;
-	len -= 2;
-
-	if (len == 0 || len < (size_t)data[0] + 2)
-		goto fail;
-	sp->s_proto = __UNCONST(data + 1);
-
-	if (sp->s_proto[data[0]] != '\0')
-		goto fail;
-
-	len -= 2 + data[0];
-	data += 2 + data[0];
-
-	if (len == 0)
-		goto fail;
-	if (len < (size_t)data[0] + 2)
-		goto fail;
-
-	sp->s_name = __UNCONST(data + 1);
-	len -= 2 + data[0];
-	data += 2 + data[0];
-
-	if (sd->aliases == NULL) {
-		sd->maxaliases = 10;
-		sd->aliases = malloc(sd->maxaliases * sizeof(char *));
-		if (sd->aliases == NULL)
-			goto fail;
-	}
-	sp->s_aliases = sd->aliases;
-	i = 0;
-	while (len) {
-		if (len < (size_t)data[0] + 2)
-			goto fail;
-		if (i == sd->maxaliases - 2) {
-			sd->maxaliases *= 2;
-			q = realloc(sd->aliases, sd->maxaliases * sizeof(*q));
-			if (q == NULL)
-				goto fail;
-			sp->s_aliases = sd->aliases = q;
-		}
-		sp->s_aliases[i++] = __UNCONST(data + 1);
-		len -= 2 + data[0];
-		data += 2 + data[0];
-	}
-	sp->s_aliases[i] = NULL;
-	return sp;
-
-fail:
-	oerrno = errno;
-	endservent_r(sd);
-	errno = oerrno;
-	return NULL;
-}
-
diff --git a/lib/libc/net/hesiod.3 b/lib/libc/net/hesiod.3
deleted file mode 100644
index f2b9a3e1c..000000000
--- a/lib/libc/net/hesiod.3
+++ /dev/null
@@ -1,150 +0,0 @@
-.\"	$NetBSD: hesiod.3,v 1.7 2009/03/10 23:36:10 joerg Exp $
-.\"
-.\" from: #Id: hesiod.3,v 1.9.2.1 1997/01/03 21:02:23 ghudson Exp #
-.\"
-.\" Copyright 1988, 1996 by the 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 the above copyright
-.\" notice appear in all copies and that both that copyright
-.\" notice and this permission notice appear in 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.
-.\"
-.Dd September 16, 2001
-.Dt HESIOD 3
-.Os
-.Sh NAME
-.Nm hesiod ,
-.Nm hesiod_init ,
-.Nm hesiod_resolve ,
-.Nm hesiod_free_list ,
-.Nm hesiod_to_bind ,
-.Nm hesiod_end
-.Nd Hesiod name server interface library
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In hesiod.h
-.Ft int
-.Fn hesiod_init "void **context"
-.Ft char
-.Fn **hesiod_resolve "void *context" "const char *name" "const char *type"
-.Ft void
-.Fn hesiod_free_list "void *context" "char **list"
-.Ft char
-.Fn *hesiod_to_bind "void *context" "const char *name" "const char *type"
-.Ft void
-.Fn hesiod_end "void *context"
-.Sh DESCRIPTION
-This family of functions allows you to perform lookups of Hesiod
-information, which is stored as text records in the Domain Name
-Service.  To perform lookups, you must first initialize a
-.Fa context ,
-an opaque object which stores information used internally by the
-library between calls.
-.Fn hesiod_init
-initializes a context, storing a pointer to the context in the
-location pointed to by the
-.Fa context
-argument.
-.Fn hesiod_end
-frees the resources used by a context.
-.Pp
-.Fn hesiod_resolve
-is the primary interface to the library.  If successful, it returns a
-list of one or more strings giving the records matching
-.Fa name
-and
-.Fa type .
-The last element of the list is followed by a
-.Dv NULL
-pointer.  It is the caller's responsibility to call
-.Fn hesiod_free_list
-to free the resources used by the returned list.
-.Pp
-.Fn hesiod_to_bind
-converts
-.Fa name
-and
-.Fa type
-into the DNS name used by
-.Fn hesiod_resolve .
-It is the caller's responsibility to free the returned string using
-.Xr free 3 .
-.Sh RETURN VALUES
-If successful,
-.Fn hesiod_init
-returns 0; otherwise it returns \-1 and sets
-.Va errno
-to indicate the error.  On failure,
-.Fn hesiod_resolve
-and
-.Fn hesiod_to_bind
-return
-.Dv NULL
-and set the global variable
-.Va errno
-to indicate the error.
-.Sh ENVIRONMENT
-If the environment variable
-.Ev HES_DOMAIN
-is set, it will override the domain in the Hesiod configuration file.
-If the environment variable
-.Ev HESIOD_CONFIG
-is set, it specifies the location of the Hesiod configuration file.
-.Sh ERRORS
-Hesiod calls may fail because of:
-.Bl -tag -width ECONNREFUSED -compact
-.It Er ENOMEM
-Insufficient memory was available to carry out the requested operation.
-.It Er ENOEXEC
-.Fn hesiod_init
-failed because the Hesiod configuration file was invalid.
-.It Er ECONNREFUSED
-.Fn hesiod_resolve
-failed because no name server could be contacted to answer the query.
-.It Er EMSGSIZE
-.Fn hesiod_resolve
-or
-.Fn hesiod_to_bind
-failed because the query or response was too big to fit into the
-packet buffers.
-.It Er ENOENT
-.Fn hesiod_resolve
-failed because the name server had no text records matching
-.Fa name
-and
-.Fa type ,
-or
-.Fn hesiod_to_bind
-failed because the
-.Fa name
-argument had a domain extension which could not be resolved with type
-.Dq rhs-extension
-in the local Hesiod domain.
-.El
-.Sh SEE ALSO
-.Xr hesiod.conf 5 ,
-.Xr named 8
-.Rs
-.%T Hesiod - Project Athena Technical Plan -- Name Service
-.Re
-.Sh AUTHORS
-.An Steve Dyer, IBM/Project Athena
-.An Greg Hudson, MIT Team Athena
-.Pp
-Copyright 1987, 1988, 1995, 1996 by the Massachusetts Institute of Technology.
-.Sh BUGS
-The strings corresponding to the
-.Ev errno
-values set by the Hesiod functions are not particularly indicative of
-what went wrong, especially for
-.Er ENOEXEC
-and
-.Er ENOENT .
diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c
deleted file mode 100644
index f40df0e0d..000000000
--- a/lib/libc/net/hesiod.c
+++ /dev/null
@@ -1,632 +0,0 @@
-/*	$NetBSD: hesiod.c,v 1.28 2014/09/18 13:58:20 christos Exp $	*/
-
-/* Copyright (c) 1996 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM 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 1996 by the 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 the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in 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 file is part of the hesiod library.  It implements the core
- * portion of the hesiod resolver.
- *
- * This file is loosely based on an interim version of hesiod.c from
- * the BIND IRS library, which was in turn based on an earlier version
- * of this file.  Extensive changes have been made on each step of the
- * path.
- *
- * This implementation is thread-safe because it uses res_nsend().
- */
-
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__IDSTRING(rcsid_hesiod_c,
-    "#Id: hesiod.c,v 1.18.2.1 1997/01/03 20:48:20 ghudson Exp #");
-__IDSTRING(rcsid_hesiod_p_h,
-    "#Id: hesiod_p.h,v 1.1 1996/12/08 21:39:37 ghudson Exp #");
-__IDSTRING(rcsid_hescompat_c,
-    "#Id: hescompat.c,v 1.1.2.1 1996/12/16 08:37:45 ghudson Exp #");
-__RCSID("$NetBSD: hesiod.c,v 1.28 2014/09/18 13:58:20 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <hesiod.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(hesiod_init,_hesiod_init)
-__weak_alias(hesiod_end,_hesiod_end)
-__weak_alias(hesiod_to_bind,_hesiod_to_bind)
-__weak_alias(hesiod_resolve,_hesiod_resolve)
-__weak_alias(hesiod_free_list,_hesiod_free_list)
-__weak_alias(hes_init,_hes_init)
-__weak_alias(hes_to_bind,_hes_to_bind)
-__weak_alias(hes_resolve,_hes_resolve)
-__weak_alias(hes_error,_hes_error)
-__weak_alias(hes_free,_hes_free)
-#endif
-
-struct hesiod_p {
-	char	*lhs;			/* normally ".ns" */
-	char	*rhs;			/* AKA the default hesiod domain */
-	int	 classes[2];		/* The class search order. */
-};
-
-#define	MAX_HESRESP	1024
-
-static int	  read_config_file(struct hesiod_p *, const char *);
-static char	**get_txt_records(int, const char *);
-static int	  init_context(void);
-static void	  translate_errors(void);
-
-
-/*
- * hesiod_init --
- *	initialize a hesiod_p.
- */
-int 
-hesiod_init(void **context)
-{
-	struct hesiod_p	*ctx;
-	const char	*p, *configname;
-	int serrno;
-
-	_DIAGASSERT(context != NULL);
-
-	ctx = calloc(1, sizeof(struct hesiod_p));
-	if (ctx) {
-		*context = ctx;
-		/*
-		 * don't permit overrides from environment
-		 * for set.id programs
-		 */
-		if (issetugid())
-			configname = NULL;
-		else
-			configname = getenv("HESIOD_CONFIG");
-		if (!configname)
-			configname = _PATH_HESIOD_CONF;
-		if (read_config_file(ctx, configname) >= 0) {
-			/*
-			 * The default rhs can be overridden by an
-			 * environment variable, unless set.id.
-			 */
-			if (issetugid())
-				p = NULL;
-			else
-				p = getenv("HES_DOMAIN");
-			if (p) {
-				if (ctx->rhs)
-					free(ctx->rhs);
-				ctx->rhs = malloc(strlen(p) + 2);
-				if (ctx->rhs) {
-					*ctx->rhs = '.';
-					strcpy(ctx->rhs + 1,
-					    (*p == '.') ? p + 1 : p);
-					return 0;
-				} else
-					errno = ENOMEM;
-			} else
-				return 0;
-		}
-	} else
-		errno = ENOMEM;
-
-	serrno = errno;
-	if (ctx) {
-		if (ctx->lhs)
-			free(ctx->lhs);
-		if (ctx->rhs)
-			free(ctx->rhs);
-		free(ctx);
-	}
-	errno = serrno;
-	return -1;
-}
-
-/*
- * hesiod_end --
- *	Deallocates the hesiod_p.
- */
-void 
-hesiod_end(void *context)
-{
-	struct hesiod_p *ctx = (struct hesiod_p *) context;
-
-	_DIAGASSERT(context != NULL);
-
-	free(ctx->rhs);
-	if (ctx->lhs)
-		free(ctx->lhs);
-	free(ctx);
-}
-
-/*
- * hesiod_to_bind --
- * 	takes a hesiod (name, type) and returns a DNS
- *	name which is to be resolved.
- */
-char *
-hesiod_to_bind(void *context, const char *name, const char *type)
-{
-	struct hesiod_p *ctx = (struct hesiod_p *) context;
-	char		 bindname[MAXDNAME], *p, *ret, **rhs_list = NULL;
-	const char	*rhs;
-	size_t		 len;
-
-	_DIAGASSERT(context != NULL);
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(type != NULL);
-
-        if (strlcpy(bindname, name, sizeof(bindname)) >= sizeof(bindname)) {
-                errno = EMSGSIZE;
-                return NULL;
-        }
-
-	/*
-	 * Find the right right hand side to use, possibly
-	 * truncating bindname.
-	 */
-	p = strchr(bindname, '@');
-	if (p) {
-		*p++ = 0;
-		if (strchr(p, '.'))
-			rhs = name + (p - bindname);
-		else {
-			rhs_list = hesiod_resolve(context, p, "rhs-extension");
-			if (rhs_list)
-				rhs = *rhs_list;
-			else {
-				errno = ENOENT;
-				return NULL;
-			}
-		}
-	} else
-		rhs = ctx->rhs;
-
-	/* See if we have enough room. */
-	len = strlen(bindname) + 1 + strlen(type);
-	if (ctx->lhs)
-		len += strlen(ctx->lhs) + ((ctx->lhs[0] != '.') ? 1 : 0);
-	len += strlen(rhs) + ((rhs[0] != '.') ? 1 : 0);
-	if (len > sizeof(bindname) - 1) {
-		if (rhs_list)
-			hesiod_free_list(context, rhs_list);
-		errno = EMSGSIZE;
-		return NULL;
-	}
-	/* Put together the rest of the domain. */
-	strlcat(bindname, ".", sizeof(bindname));
-	strlcat(bindname, type, sizeof(bindname));
-	/* Only append lhs if it isn't empty. */
-	if (ctx->lhs && ctx->lhs[0] != '\0' ) {
-		if (ctx->lhs[0] != '.')
-			strlcat(bindname, ".", sizeof(bindname));
-		strlcat(bindname, ctx->lhs, sizeof(bindname));
-	}
-	if (rhs[0] != '.')
-		strlcat(bindname, ".", sizeof(bindname));
-	strlcat(bindname, rhs, sizeof(bindname));
-
-	/* rhs_list is no longer needed, since we're done with rhs. */
-	if (rhs_list)
-		hesiod_free_list(context, rhs_list);
-
-	/* Make a copy of the result and return it to the caller. */
-	ret = strdup(bindname);
-	if (ret == NULL)
-		errno = ENOMEM;
-	return ret;
-}
-
-/*
- * hesiod_resolve --
- *	Given a hesiod name and type, return an array of strings returned
- *	by the resolver.
- */
-char **
-hesiod_resolve(void *context, const char *name, const char *type)
-{
-	struct hesiod_p	*ctx = (struct hesiod_p *) context;
-	char		*bindname, **retvec;
-
-	_DIAGASSERT(context != NULL);
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(type != NULL);
-
-	bindname = hesiod_to_bind(context, name, type);
-	if (!bindname)
-		return NULL;
-
-	retvec = get_txt_records(ctx->classes[0], bindname);
-	if (retvec == NULL && errno == ENOENT && ctx->classes[1])
-		retvec = get_txt_records(ctx->classes[1], bindname);
-
-	free(bindname);
-	return retvec;
-}
-
-/*ARGSUSED*/
-void 
-hesiod_free_list(void *context, char **list)
-{
-	char  **p;
-
-	_DIAGASSERT(context != NULL);
-
-	if (list == NULL)
-		return;
-	for (p = list; *p; p++)
-		free(*p);
-	free(list);
-}
-
-
-/* read_config_file --
- *	Parse the /etc/hesiod.conf file.  Returns 0 on success,
- *	-1 on failure.  On failure, it might leave values in ctx->lhs
- *	or ctx->rhs which need to be freed by the caller.
- */
-static int 
-read_config_file(struct hesiod_p *ctx, const char *filename)
-{
-	char	*buf, *key, *data, *p, **which;
-	int	 n;
-	FILE	*fp;
-
-	_DIAGASSERT(ctx != NULL);
-	_DIAGASSERT(filename != NULL);
-
-	/* Set default query classes. */
-	ctx->classes[0] = C_IN;
-	ctx->classes[1] = C_HS;
-
-	/* Try to open the configuration file. */
-	fp = fopen(filename, "re");
-	if (!fp) {
-		/* Use compiled in default domain names. */
-		ctx->lhs = strdup(DEF_LHS);
-		ctx->rhs = strdup(DEF_RHS);
-		if (ctx->lhs && ctx->rhs)
-			return 0;
-		else {
-			errno = ENOMEM;
-			return -1;
-		}
-	}
-	ctx->lhs = NULL;
-	ctx->rhs = NULL;
-	for (; (buf = fparseln(fp, NULL, NULL, NULL, FPARSELN_UNESCALL))
-	    != NULL; free(buf)) {
-		p = buf;
-		while (*p == ' ' || *p == '\t')
-			p++;
-		key = p;
-		while (*p != ' ' && *p != '\t' && *p != '=' && *p)
-			p++;
-
-		if (*p == '\0')
-			continue;
-
-		*p++ = 0;
-
-		while (isspace((u_char) *p) || *p == '=')
-			p++;
-
-		if (*p == '\0')
-			continue;
-
-		data = p;
-		while (!isspace((u_char) *p) && *p)
-			p++;
-
-		*p = 0;
-
-		if (strcasecmp(key, "lhs") == 0 ||
-		    strcasecmp(key, "rhs") == 0) {
-			which = (strcasecmp(key, "lhs") == 0)
-			    ? &ctx->lhs : &ctx->rhs;
-			*which = strdup(data);
-			if (!*which) {
-				errno = ENOMEM;
-				free(buf);
-				(void)fclose(fp);
-				return -1;
-			}
-		} else {
-			if (strcasecmp(key, "classes") == 0) {
-				n = 0;
-				while (*data && n < 2) {
-					p = data;
-					while (*p && *p != ',')
-						p++;
-					if (*p)
-						*p++ = 0;
-					if (strcasecmp(data, "IN") == 0)
-						ctx->classes[n++] = C_IN;
-					else
-						if (strcasecmp(data, "HS") == 0)
-							ctx->classes[n++] =
-							    C_HS;
-					data = p;
-				}
-				while (n < 2)
-					ctx->classes[n++] = 0;
-			}
-		}
-	}
-	fclose(fp);
-
-	if (!ctx->rhs || ctx->classes[0] == 0 ||
-	    ctx->classes[0] == ctx->classes[1]) {
-		errno = ENOEXEC;
-		return -1;
-	}
-	return 0;
-}
-
-/*
- * get_txt_records --
- *	Given a DNS class and a DNS name, do a lookup for TXT records, and
- *	return a list of them.
- */
-static char **
-get_txt_records(int qclass, const char *name)
-{
-	HEADER		*hp;
-	unsigned char	 qbuf[PACKETSZ], abuf[MAX_HESRESP], *p, *eom, *eor;
-	char		*dst, **list;
-	int		 ancount, qdcount, i, j, n, skip, type, class, len;
-	res_state	 res = __res_get_state();
-
-	if (res == NULL)
-		return NULL;
-
-	_DIAGASSERT(name != NULL);
-
-	/* Construct the query. */
-	n = res_nmkquery(res, QUERY, name, qclass, T_TXT, NULL, 0,
-	    NULL, qbuf, PACKETSZ);
-	if (n < 0) {
-		errno = EMSGSIZE;
-		__res_put_state(res);
-		return NULL;
-	}
-
-	/* Send the query. */
-	n = res_nsend(res, qbuf, n, abuf, MAX_HESRESP);
-	__res_put_state(res);
-	if (n < 0) {
-		errno = ECONNREFUSED;
-		return NULL;
-	}
-	/* Parse the header of the result. */
-	hp = (HEADER *) (void *) abuf;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	p = abuf + sizeof(HEADER);
-	eom = abuf + n;
-
-	/*
-	 * Skip questions, trying to get to the answer section
-	 * which follows.
-	 */
-	for (i = 0; i < qdcount; i++) {
-		skip = dn_skipname(p, eom);
-		if (skip < 0 || p + skip + QFIXEDSZ > eom) {
-			errno = EMSGSIZE;
-			return NULL;
-		}
-		p += skip + QFIXEDSZ;
-	}
-
-	/* Allocate space for the text record answers. */
-	list = malloc((ancount + 1) * sizeof(char *));
-	if (!list) {
-		errno = ENOMEM;
-		return NULL;
-	}
-	/* Parse the answers. */
-	j = 0;
-	for (i = 0; i < ancount; i++) {
-		/* Parse the header of this answer. */
-		skip = dn_skipname(p, eom);
-		if (skip < 0 || p + skip + 10 > eom)
-			break;
-		type = p[skip + 0] << 8 | p[skip + 1];
-		class = p[skip + 2] << 8 | p[skip + 3];
-		len = p[skip + 8] << 8 | p[skip + 9];
-		p += skip + 10;
-		if (p + len > eom) {
-			errno = EMSGSIZE;
-			break;
-		}
-		/* Skip entries of the wrong class and type. */
-		if (class != qclass || type != T_TXT) {
-			p += len;
-			continue;
-		}
-		/* Allocate space for this answer. */
-		list[j] = malloc((size_t)len);
-		if (!list[j]) {
-			errno = ENOMEM;
-			break;
-		}
-		dst = list[j++];
-
-		/* Copy answer data into the allocated area. */
-		eor = p + len;
-		while (p < eor) {
-			n = (unsigned char) *p++;
-			if (p + n > eor) {
-				errno = EMSGSIZE;
-				break;
-			}
-			memcpy(dst, p, (size_t)n);
-			p += n;
-			dst += n;
-		}
-		if (p < eor) {
-			errno = EMSGSIZE;
-			break;
-		}
-		*dst = 0;
-	}
-
-	/*
-	 * If we didn't terminate the loop normally, something
-	 * went wrong.
-	 */
-	if (i < ancount) {
-		for (i = 0; i < j; i++)
-			free(list[i]);
-		free(list);
-		return NULL;
-	}
-	if (j == 0) {
-		errno = ENOENT;
-		free(list);
-		return NULL;
-	}
-	list[j] = NULL;
-	return list;
-}
-
-/*
- * COMPATIBILITY FUNCTIONS
- */
-
-static int	  inited = 0;
-static void	 *context;
-static int	  errval = HES_ER_UNINIT;
-
-int
-hes_init(void)
-{
-	init_context();
-	return errval;
-}
-
-char *
-hes_to_bind(const char *name, const char *type)
-{
-	static	char	*bindname;
-
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(type != NULL);
-
-	if (init_context() < 0)
-		return NULL;
-	if (bindname)
-		free(bindname);
-	bindname = hesiod_to_bind(context, name, type);
-	if (!bindname)
-		translate_errors();
-	return bindname;
-}
-
-char **
-hes_resolve(const char *name, const char *type)
-{
-	static char	**list;
-
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(type != NULL);
-
-	if (init_context() < 0)
-		return NULL;
-
-	/*
-	 * In the old Hesiod interface, the caller was responsible for
-	 * freeing the returned strings but not the vector of strings itself.
-	 */
-	if (list)
-		free(list);
-
-	list = hesiod_resolve(context, name, type);
-	if (!list)
-		translate_errors();
-	return list;
-}
-
-int
-hes_error(void)
-{
-	return errval;
-}
-
-void
-hes_free(char **hp)
-{
-	hesiod_free_list(context, hp);
-}
-
-static int
-init_context(void)
-{
-	if (!inited) {
-		inited = 1;
-		if (hesiod_init(&context) < 0) {
-			errval = HES_ER_CONFIG;
-			return -1;
-		}
-		errval = HES_ER_OK;
-	}
-	return 0;
-}
-
-static void
-translate_errors(void)
-{
-	switch (errno) {
-	case ENOENT:
-		errval = HES_ER_NOTFOUND;
-		break;
-	case ECONNREFUSED:
-	case EMSGSIZE:
-		errval = HES_ER_NET;
-		break;
-	default:
-		/* Not a good match, but the best we can do. */
-		errval = HES_ER_CONFIG;
-		break;
-	}
-}
diff --git a/lib/libc/net/hostent.h b/lib/libc/net/hostent.h
deleted file mode 100644
index 65fa5d717..000000000
--- a/lib/libc/net/hostent.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*	$NetBSD: hostent.h,v 1.2 2013/08/27 09:56:12 christos Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <netdb.h>
-#include <stdarg.h>
-
-/*
- * These are not being advertised because the interfaces are non-standard.
- * There are versions by linux, aix, qnx, sun, etc. Our versions are used
- * internally to provide thread safety; they mostly resemble qnx.
- */
-void sethostent_r(FILE **);
-struct hostent	*gethostent_r(FILE *, struct hostent *, char *, size_t, int *);
-void endhostent_r(FILE **);
-
-struct hostent *gethostbyname_r(const char *, struct hostent *, char *, size_t,
-    int *);
-struct hostent *gethostbyname2_r(const char *, int, struct hostent *, char *,
-    size_t, int *);
-struct hostent *gethostbyaddr_r(const void *, socklen_t, int, struct hostent *,
-    char *, size_t, int *);
-
-extern FILE *_h_file;
-
-/*
- * The following are internal API's and are used only for testing.
- */
-struct getnamaddr {
-	struct hostent *hp;
-	char *buf;
-	size_t buflen;
-	int *he;
-};
-
-/* /etc/hosts lookup */
-void _hf_sethostsfile(const char *);
-int _hf_gethtbyaddr(void *, void *, va_list);
-int _hf_gethtbyname(void *, void *, va_list);
-
-/* DNS lookup */
-int _dns_gethtbyaddr(void *, void *, va_list);
-int _dns_gethtbyname(void *, void *, va_list);
-
-#ifdef YP
-/* NIS lookup */
-int _yp_gethtbyaddr(void *, void *, va_list);
-int _yp_gethtbyname(void *, void *, va_list);
-#endif
-
-#define HENT_ARRAY(dst, anum, ptr, len) \
-	do { \
-		size_t _len = (anum + 1) * sizeof(*dst); \
-		if (_len > len) \
-			goto nospc; \
-		dst = (void *)ptr; \
-		ptr += _len; \
-		len -= _len; \
-	} while (/*CONSTCOND*/0)
-
-#define HENT_COPY(dst, src, slen, ptr, len) \
-	do { \
-		if ((size_t)slen > len) \
-			goto nospc; \
-		memcpy(ptr, src, (size_t)slen); \
-		dst = ptr; \
-		ptr += slen; \
-		len -= slen; \
-	} while (/* CONSTCOND */0)
-
-#define HENT_SCOPY(dst, src, ptr, len) \
-	do { \
-		size_t _len = strlen(src) + 1; \
-		HENT_COPY(dst, src, _len, ptr, len); \
-	} while (/* CONSTCOND */0)
-
-#define	MAXALIASES	35
-#define	MAXADDRS	35
diff --git a/lib/libc/net/if_indextoname.3 b/lib/libc/net/if_indextoname.3
deleted file mode 100644
index 6b27d194a..000000000
--- a/lib/libc/net/if_indextoname.3
+++ /dev/null
@@ -1,138 +0,0 @@
-.\"	$NetBSD: if_indextoname.3,v 1.12 2010/03/22 19:30:54 joerg Exp $
-.\"	$KAME: if_indextoname.3,v 1.10 2000/11/24 08:13:51 itojun Exp $
-.\"	BSDI	Id: if_indextoname.3,v 2.2 2000/04/17 22:38:05 dab Exp
-.\"
-.\" Copyright (c) 1997, 2000
-.\"	Berkeley Software Design, Inc.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd March 11, 2005
-.Dt IF_NAMETOINDEX 3
-.Os
-.Sh NAME
-.Nm if_nametoindex ,
-.Nm if_indextoname ,
-.Nm if_nameindex ,
-.Nm if_freenameindex
-.Nd provide mappings between interface names and indexes
-.Sh SYNOPSIS
-.In net/if.h
-.Ft unsigned int
-.Fn if_nametoindex "const char *ifname"
-.Ft char *
-.Fn if_indextoname "unsigned int ifindex" "char *ifname"
-.Ft struct if_nameindex *
-.Fn if_nameindex "void"
-.Ft void
-.Fn if_freenameindex "struct if_nameindex *ptr"
-.Sh DESCRIPTION
-The
-.Fn if_nametoindex
-function maps the interface name specified in
-.Ar ifname
-to its corresponding index.
-If the specified interface does not exist, it returns 0.
-.Pp
-The
-.Fn if_indextoname
-function maps the interface index specified in
-.Ar ifindex
-to it corresponding name, which is copied into the
-buffer pointed to by
-.Ar ifname ,
-which must be of at least IFNAMSIZ bytes.
-This pointer is also the return value of the function.
-If there is no interface corresponding to the specified
-index, NULL is returned.
-.Pp
-The
-.Fn if_nameindex
-function returns an array of
-.Nm if_nameindex
-structures, one structure per interface, as
-defined in the include file
-.In net/if.h .
-The
-.Nm if_nameindex
-structure contains at least the following entries:
-.Bd -literal
-    unsigned int   if_index;  /* 1, 2, ... */
-    char          *if_name;   /* null terminated name: "le0", ... */
-.Ed
-.Pp
-The end of the array of structures is indicated by a structure with an
-.Nm if_index
-of 0 and an
-.Nm if_name
-of NULL.
-A NULL pointer is returned upon an error.
-.Pp
-The
-.Fn if_freenameindex
-function frees the dynamic memory that was
-allocated by
-.Fn if_nameindex .
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn if_nametoindex
-returns the index number of the interface.
-If the interface is not found, a value of 0 is returned and
-.Va errno
-is set to
-.Er ENXIO .
-A value of 0 is also returned if an error
-occurs while retrieving the list of interfaces via
-.Xr getifaddrs 3 .
-.Pp
-Upon successful completion,
-.Fn if_indextoname
-returns
-.Ar ifname .
-If the interface is not found, a NULL pointer is returned and
-.Va errno
-is set to
-.Er ENXIO .
-A NULL pointer is also returned if an error
-occurs while retrieving the list of interfaces via
-.Xr getifaddrs 3 .
-.Pp
-The
-.Fn if_nameindex
-returns a NULL pointer if an error
-occurs while retrieving the list of interfaces via
-.Xr getifaddrs 3 ,
-or if sufficient memory cannot be allocated.
-.Sh SEE ALSO
-.Xr getifaddrs 3 ,
-.Xr networking 4
-.Sh STANDARDS
-The
-.Fn if_nametoindex ,
-.Fn if_indextoname ,
-.Fn if_nameindex ,
-and
-.Fn if_freenameindex
-functions conform to
-.St -p1003.1-2001 ,
-.St -xns5.2 ,
-and RFC 3493.
-.Sh HISTORY
-The implementation first appeared in
-.Bsx .
diff --git a/lib/libc/net/if_indextoname.c b/lib/libc/net/if_indextoname.c
deleted file mode 100644
index 32877bbd2..000000000
--- a/lib/libc/net/if_indextoname.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*	$NetBSD: if_indextoname.c,v 1.7 2010/12/13 23:10:12 pooka Exp $	*/
-/*	$KAME: if_indextoname.c,v 1.7 2000/11/08 03:09:30 itojun Exp $	*/
-
-/*-
- * Copyright (c) 1997, 2000
- *	Berkeley Software Design, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	BSDI Id: if_indextoname.c,v 2.3 2000/04/17 22:38:05 dab Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: if_indextoname.c,v 1.7 2010/12/13 23:10:12 pooka Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifndef RUMP_ACTION
-#include "namespace.h"
-#endif
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if_dl.h>
-#include <net/if.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#ifndef RUMP_ACTION
-#ifdef __weak_alias
-__weak_alias(if_indextoname,_if_indextoname)
-#endif
-#endif
-
-/*
- * From RFC 2533:
- *
- * The second function maps an interface index into its corresponding
- * name.
- *
- *    #include <net/if.h>
- *
- *    char  *if_indextoname(unsigned int ifindex, char *ifname);
- *
- * The ifname argument must point to a buffer of at least IF_NAMESIZE
- * bytes into which the interface name corresponding to the specified
- * index is returned.  (IF_NAMESIZE is also defined in <net/if.h> and
- * its value includes a terminating null byte at the end of the
- * interface name.) This pointer is also the return value of the
- * function.  If there is no interface corresponding to the specified
- * index, NULL is returned, and errno is set to ENXIO, if there was a
- * system error (such as running out of memory), if_indextoname returns
- * NULL and errno would be set to the proper value (e.g., ENOMEM).
- */
-
-char *
-if_indextoname(unsigned int ifindex, char *ifname)
-{
-	struct ifaddrs *ifaddrs, *ifa;
-	int error = 0;
-
-	if (getifaddrs(&ifaddrs) < 0)
-		return(NULL);	/* getifaddrs properly set errno */
-
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr &&
-		    ifa->ifa_addr->sa_family == AF_LINK &&
-		    ifindex == ((struct sockaddr_dl*)
-			(void *)ifa->ifa_addr)->sdl_index)
-			break;
-	}
-
-	if (ifa == NULL) {
-		error = ENXIO;
-		ifname = NULL;
-	}
-	else
-		strlcpy(ifname, ifa->ifa_name, IFNAMSIZ);
-
-	freeifaddrs(ifaddrs);
-
-	errno = error;
-	return(ifname);
-}
diff --git a/lib/libc/net/if_nameindex.c b/lib/libc/net/if_nameindex.c
deleted file mode 100644
index fdc2731cf..000000000
--- a/lib/libc/net/if_nameindex.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*	$NetBSD: if_nameindex.c,v 1.7 2012/03/13 21:13:41 christos Exp $	*/
-/*	$KAME: if_nameindex.c,v 1.8 2000/11/24 08:20:01 itojun Exp $	*/
-
-/*-
- * Copyright (c) 1997, 2000
- *	Berkeley Software Design, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	BSDI Id: if_nameindex.c,v 2.3 2000/04/17 22:38:05 dab Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: if_nameindex.c,v 1.7 2012/03/13 21:13:41 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if_dl.h>
-#include <net/if.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(if_nameindex,_if_nameindex)
-__weak_alias(if_freenameindex,_if_freenameindex)
-#endif
-/*
- * From RFC 2553:
- *
- * 4.3 Return All Interface Names and Indexes
- *
- *    The if_nameindex structure holds the information about a single
- *    interface and is defined as a result of including the <net/if.h>
- *    header.
- *
- *       struct if_nameindex {
- *         unsigned int   if_index;
- *         char          *if_name;
- *       };
- *
- *    The final function returns an array of if_nameindex structures, one
- *    structure per interface.
- *
- *       struct if_nameindex  *if_nameindex(void);
- *
- *    The end of the array of structures is indicated by a structure with
- *    an if_index of 0 and an if_name of NULL.  The function returns a NULL
- *    pointer upon an error, and would set errno to the appropriate value.
- *
- *    The memory used for this array of structures along with the interface
- *    names pointed to by the if_name members is obtained dynamically.
- *    This memory is freed by the next function.
- *
- * 4.4.  Free Memory
- *
- *    The following function frees the dynamic memory that was allocated by
- *    if_nameindex().
- *
- *        #include <net/if.h>
- *
- *        void  if_freenameindex(struct if_nameindex *ptr);
- *
- *    The argument to this function must be a pointer that was returned by
- *    if_nameindex().
- */
-
-struct if_nameindex *
-if_nameindex(void)
-{
-	struct ifaddrs *ifaddrs, *ifa;
-	size_t nbytes, ni;
-	struct if_nameindex *ifni, *ifni2;
-	char *cp;
-
-	if (getifaddrs(&ifaddrs) < 0)
-		return(NULL);
-
-	/*
-	 * First, find out how many interfaces there are, and how
-	 * much space we need for the string names.
-	 */
-	ni = 0;
-	nbytes = 0;
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr &&
-		    ifa->ifa_addr->sa_family == AF_LINK) {
-			nbytes += strlen(ifa->ifa_name) + 1;
-			ni++;
-		}
-	}
-
-	/*
-	 * Next, allocate a chunk of memory, use the first part
-	 * for the array of structures, and the last part for
-	 * the strings.
-	 */
-	cp = malloc((ni + 1) * sizeof(struct if_nameindex) + nbytes);
-	ifni = (struct if_nameindex *)(void *)cp;
-	if (ifni == NULL)
-		goto out;
-	cp += (ni + 1) * sizeof(struct if_nameindex);
-
-	/*
-	 * Now just loop through the list of interfaces again,
-	 * filling in the if_nameindex array and making copies
-	 * of all the strings.
-	 */
-	ifni2 = ifni;
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr &&
-		    ifa->ifa_addr->sa_family == AF_LINK) {
-			ifni2->if_index =
-			    ((struct sockaddr_dl*)
-			    (void *)ifa->ifa_addr)->sdl_index;
-			ifni2->if_name = cp;
-			strcpy(cp, ifa->ifa_name);
-			ifni2++;
-			cp += strlen(cp) + 1;
-		}
-	}
-	/*
-	 * Finally, don't forget to terminate the array.
-	 */
-	ifni2->if_index = 0;
-	ifni2->if_name = NULL;
-out:
-	freeifaddrs(ifaddrs);
-	return(ifni);
-}
-
-void
-if_freenameindex(struct if_nameindex *ptr)
-{
-	free(ptr);
-}
diff --git a/lib/libc/net/if_nametoindex.c b/lib/libc/net/if_nametoindex.c
deleted file mode 100644
index f69addd8a..000000000
--- a/lib/libc/net/if_nametoindex.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*	$NetBSD: if_nametoindex.c,v 1.5 2015/09/01 09:54:34 ozaki-r Exp $	*/
-/*	$KAME: if_nametoindex.c,v 1.6 2000/11/24 08:18:54 itojun Exp $	*/
-
-/*-
- * Copyright (c) 1997, 2000
- *	Berkeley Software Design, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	BSDI Id: if_nametoindex.c,v 2.3 2000/04/17 22:38:05 dab Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: if_nametoindex.c,v 1.5 2015/09/01 09:54:34 ozaki-r Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifndef RUMP_ACTION
-#include "namespace.h"
-#endif
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#ifndef RUMP_ACTION
-#ifdef __weak_alias
-__weak_alias(if_nametoindex,_if_nametoindex)
-#endif
-#endif
-
-/*
- * From RFC 2553:
- *
- * 4.1 Name-to-Index
- *
- *
- *    The first function maps an interface name into its corresponding
- *    index.
- *
- *       #include <net/if.h>
- *
- *       unsigned int  if_nametoindex(const char *ifname);
- *
- *    If the specified interface name does not exist, the return value is
- *    0, and errno is set to ENXIO.  If there was a system error (such as
- *    running out of memory), the return value is 0 and errno is set to the
- *    proper value (e.g., ENOMEM).
- */
-
-unsigned int
-if_nametoindex(const char *ifname)
-{
-	struct ifaddrs *ifaddrs, *ifa;
-	unsigned int ni;
-
-	if (getifaddrs(&ifaddrs) < 0)
-		return(0);
-
-	ni = 0;
-
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr &&
-		    ifa->ifa_addr->sa_family == AF_LINK &&
-		    strcmp(ifa->ifa_name, ifname) == 0) {
-			ni = ((struct sockaddr_dl*)
-			    (void *)ifa->ifa_addr)->sdl_index;
-			break;
-		}
-	}
-
-	freeifaddrs(ifaddrs);
-	if (!ni)
-		errno = ENXIO;
-	return(ni);
-}
diff --git a/lib/libc/net/inet6_getscopeid.3 b/lib/libc/net/inet6_getscopeid.3
deleted file mode 100644
index 4195019c6..000000000
--- a/lib/libc/net/inet6_getscopeid.3
+++ /dev/null
@@ -1,100 +0,0 @@
-.\"	$NetBSD: inet6_getscopeid.3,v 1.3 2013/10/31 00:30:14 wiz Exp $
-.\"-
-.\" Copyright (c) 2013 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"
-.Dd October 31, 2013
-.Dt INET6_GETSCOPEID 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_getscopeid ,
-.Nm inet6_putscopeid
-.Nd IPv6 scope id encoding and decoding functions
-.\"
-.Sh SYNOPSIS
-.In netinet/in.h
-.Ft void
-.Fn inet6_getscopeid "struct sockaddr_in6 *sin6" "int flags"
-.Ft void
-.Fn inet6_putscopeid "struct sockaddr_in6 *sin6" "int flags"
-.\"
-.Sh DESCRIPTION
-These functions implement a KAME-specific extension that encodes and
-decodes the scope id inside in the 3rd and 4th byte of the address,
-for link-local, site-local, and multicast-link-local addresses.
-The scope id helps deciding which interface is used for packets of
-that type.
-.Pp
-Typically those two bytes are
-.Dv 0
-for these kinds of addresses.
-The scope id is stored in network byte order.
-.Pp
-The
-.Fn inet6_getscopeid
-function retrieves the scope id from the 3rd and the 4th address bytes
-(from the
-.Va sin6_addr
-member of
-.Fa sin6 ) ,
-and sets the
-.Ft sin6_scope_id
-from them.
-It then clears the two address bytes.
-.Pp
-The
-.Fn inet6putscopeid
-function stores the scope id found in
-.Ft sin6_scope_id
-into the 3rd and 4th byte of the address
-(into the
-.Va sin6_addr
-member of
-.Fa sin6 ) .
-It then clears the
-.Va sin6_scope_id
-member of
-.Fa sin6 .
-.Pp
-The
-.Fa flags
-argument controls for which addresses this action is performed.
-It
-can be a combination of:
-.Bl -bullet
-.It
-.Dv INET6_IS_ADDR_LINKLOCAL
-.It
-.Dv INET6_IS_ADDR_MC_LINKLOCAL
-.It
-.Dv INET6_IS_ADDR_SITELOCAL
-.El
-.Sh HISTORY
-These functions first appeared in
-.Nx 7.0 .
diff --git a/lib/libc/net/inet6_opt_init.3 b/lib/libc/net/inet6_opt_init.3
deleted file mode 100644
index 17c73ed36..000000000
--- a/lib/libc/net/inet6_opt_init.3
+++ /dev/null
@@ -1,337 +0,0 @@
-.\"	$NetBSD: inet6_opt_init.3,v 1.2 2014/01/04 15:37:26 wiz Exp $
-.\"	$KAME: inet6_opt_init.3,v 1.7 2004/12/27 05:08:23 itojun Exp $
-.\"
-.\" Copyright (C) 2004 WIDE Project.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the project nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd December 23, 2004
-.Dt INET6_OPT_INIT 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_opt_init ,
-.Nm inet6_opt_append ,
-.Nm inet6_opt_finish ,
-.Nm inet6_opt_set_val ,
-.Nm inet6_opt_next ,
-.Nm inet6_opt_find ,
-.Nm inet6_opt_get_val
-.Nd IPv6 Hop-by-Hop and Destination Options manipulation
-.\"
-.Sh SYNOPSIS
-.In netinet/in.h
-.Ft "int"
-.Fn inet6_opt_init "void *extbuf" "socklen_t extlen"
-.Ft "int"
-.Fn inet6_opt_append "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t type" "socklen_t len" "u_int8_t align" "void **databufp"
-.Ft "int"
-.Fn inet6_opt_finish "void *extbuf" "socklen_t extlen" "int offset"
-.Ft "int"
-.Fn inet6_opt_set_val "void *databuf" "int offset" "void *val" "socklen_t vallen"
-.Ft "int"
-.Fn inet6_opt_next "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t *typep" "socklen_t *lenp" "void **databufp"
-.Ft "int"
-.Fn inet6_opt_find "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t type" "socklen_t *lenp" "void **databufp"
-.Ft "int"
-.Fn inet6_opt_get_val "void *databuf" "socklen_t offset" "void *val" "socklen_t vallen"
-.\"
-.Sh DESCRIPTION
-Building and parsing the Hop-by-Hop and Destination options is
-complicated.
-The advanced sockets API defines a set of functions to
-help applications create and manipulate Hop-by-Hope and Destination
-options.
-.\"This man page describes the functions specified in
-.\"IETF Draft RFC3542 while the
-.\".Xr inet6_options_space 3
-.\"man page documents the functions defined in RFC 2292.
-.\"It is expected
-.\"that this set of functions will supersede those in RFC 2292 but for
-.\"the time being both APIs are retained.
-These functions use the
-formatting rules specified in Appendix B in RFC2460, i.e., that the
-largest field is placed last in the option.
-The function prototypes
-for these functions are all contained in the
-.In netinet/in.h
-header file.
-.\"
-.Ss inet6_opt_init
-The
-.Fn inet6_opt_init
-function
-returns the number of bytes needed for an empty
-extension header, one without any options.
-If the
-.Va extbuf
-argument points to a valid section of memory
-then the
-.Fn inet6_opt_init
-function also initializes the extension header's length field.
-When attempting to initialize an extension buffer passed in the
-.Va extbuf argument
-.Fa extlen
-must be a positive multiple of 8 or else the function fails and
-returns \-1 to the caller.
-.\"
-.Ss inet6_opt_append
-The
-.Fn inet6_opt_append
-function can perform to different jobs.
-When a valid
-.Fa extbuf
-argument is supplied it appends an option to the extension buffer and
-returns the updated total length as well as a pointer to the newly
-created option in
-.Fa databufp .
-If the value
-of
-.Fa extbuf
-is
-.Dv NULL
-then the
-.Fn inet6_opt_append function only reports what the total length would
-be if the option were actually appended.
-The
-.Fa len
-and
-.Fa align
-arguments specify the length of the option and the required data
-alignment which must be used when appending the option.
-The
-.Fa offset
-argument should be the length returned by the
-.Fn inet6_opt_init
-function or a previous call to
-.Fn inet6_opt_append .
-.Pp
-The
-.Fa type
-argument is the 8-bit option type.
-.Pp
-After
-.Fn inet6_opt_append
-has been called, the application can use the buffer pointed to by
-.Fa databufp
-directly, or use
-.Fn inet6_opt_set_val
-to specify the data to be contained in the option.
-.Pp
-Option types of
-.Li 0
-and
-.Li 1
-are reserved for the
-.Li Pad1
-and
-.Li PadN
-options.
-All other values from 2 through 255 may be used by applications.
-.Pp
-The length of the option data is contained in an 8-bit value and so
-may contain any value from 0 through 255.
-.Pp
-The
-.Fa align
-parameter must have a value of 1, 2, 4, or 8 and cannot exceed the
-value of
-.Fa len .
-The alignment values represent no alignment, 16 bit, 32 bit and 64 bit
-alignments respectively.
-.\"
-.Ss inet6_opt_finish
-The
-.Fn inet6_opt_finish
-calculates the final padding necessary to make the extension header a
-multiple of 8 bytes, as required by the IPv6 extension header
-specification, and returns the extension header's updated total
-length.
-The
-.Fa offset
-argument should be the length returned by
-.Fn inet6_opt_init
-or
-.Fn inet6_opt_append .
-When
-.Fa extbuf
-is not
-.Dv NULL
-the function also sets up the appropriate padding bytes by inserting a
-Pad1 or PadN option of the proper length.
-.Pp
-If the extension header is too small to contain the proper padding
-then an error of \-1 is returned to the caller.
-.\"
-.Ss inet6_opt_set_val
-The
-.Fn inet6_opt_set_val
-function inserts data items of various sizes into the data portion of
-the option.
-The
-.Fa databuf
-argument is a pointer to memory that was returned by the
-.Fn inet6_opt_append
-call and the
-.Fa offset argument specifies where the option should be placed in the
-data buffer.
-The
-.Fa val
-argument points to an area of memory containing the data to be
-inserted into the extension header, and the
-.Fa vallen
-argument indicates how much data to copy.
-.Pp
-The caller should ensure that each field is aligned on its natural
-boundaries as described in Appendix B of RFC2460.
-.Pp
-The function returns the offset for the next field which is calculated as
-.Fa offset
-+
-.Fa vallen
-and is used when composing options with multiple fields.
-.\"
-.Ss inet6_opt_next
-The
-.Fn inet6_opt_next
-function parses received extension headers.
-The
-.Fa extbuf
-and
-.Fa extlen
-arguments specify the location and length of the extension header
-being parsed.
-The
-.Fa offset
-argument should either be zero, for the first option, or the length value
-returned by a previous call to
-.Fn inet6_opt_next
-or
-.Fn inet6_opt_find .
-The return value specifies the position where to continue scanning the
-extension buffer.
-The option is returned in the arguments
-.Fa typep , lenp ,
-and
-.Fa databufp .
-.Fa typep , lenp ,
-and
-.Fa databufp
-point to the 8-bit option type, the 8-bit option length and the option
-data respectively.
-This function does not return any PAD1 or PADN options.
-When an error occurs or there are no more options the return
-value is \-1.
-.\"
-.Ss inet6_opt_find
-The
-.Fn inet6_opt_find
-function searches the extension buffer for a particular option type,
-passed in through the
-.Fa type
-argument.
-If the option is found then the
-.Fa lenp
-and
-.Fa databufp
-arguments are updated to point to the option's length and data
-respectively.
-.Fa extbuf
-and
-.Fa extlen
-must point to a valid extension buffer and give its length.
-The
-.Fa offset
-argument can be used to search from a location anywhere in the
-extension header.
-.Ss inet6_opt_get_val
-The
-.Fn inet6_opt_get_val
-function extracts data items of various sizes in the data portion of
-the option.
-The
-.Fa databuf
-is a pointer returned by the
-.Fn inet6_opt_next
-or
-.Fn inet6_opt_find
-functions.
-The
-.Fa val
-argument points where the data will be extracted.
-The
-.Fa offset
-argument specifies from where in the data portion of the option the
-value should be extracted; the first byte of option data is specified
-by an offset of zero.
-.Pp
-It is expected that each field is aligned on its natural boundaries as
-described in Appendix B of RFC2460.
-.Pp
-The function returns the offset for the next field
-by calculating
-.Fa offset
-+
-.Fa vallen
-which can be used when extracting option content with multiple fields.
-Robust receivers must verify alignment before calling this function.
-.\"
-.Sh EXAMPLES
-RFC3542 gives comprehensive examples in Section 23.
-.Pp
-KAME also provides examples in the
-.Pa advapitest
-directory of its kit.
-.\"
-.Sh DIAGNOSTICS
-All the functions return
-\-1
-on an error.
-.\"
-.Sh SEE ALSO
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%A E. Nordmark
-.%A T. Jinmei
-.%T "Advanced Sockets API for IPv6"
-.%N RFC3542
-.%D October 2002
-.Re
-.Rs
-.%A S. Deering
-.%A R. Hinden
-.%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC2460
-.%D December 1998
-.Re
-.Sh STANDARDS
-The functions are documented in
-.Dq Advanced Sockets API for IPv6
-.Pq RFC3542 .
-.\"
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
diff --git a/lib/libc/net/inet6_option_space.3 b/lib/libc/net/inet6_option_space.3
deleted file mode 100644
index 28aadacc3..000000000
--- a/lib/libc/net/inet6_option_space.3
+++ /dev/null
@@ -1,448 +0,0 @@
-.\"	$NetBSD: inet6_option_space.3,v 1.17 2010/03/22 19:30:54 joerg Exp $
-.\"	$KAME: inet6_option_space.3,v 1.7 2000/05/17 14:32:13 itojun Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\" 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.
-.\"
-.Dd December 10, 1999
-.Dt INET6_OPTION_SPACE 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_option_space ,
-.Nm inet6_option_init ,
-.Nm inet6_option_append ,
-.Nm inet6_option_alloc ,
-.Nm inet6_option_next ,
-.Nm inet6_option_find
-.Nd IPv6 Hop-by-Hop and Destination Options manipulation
-.\"
-.Sh SYNOPSIS
-.In netinet/in.h
-.Ft "int"
-.Fn inet6_option_space "int nbytes"
-.Ft "int"
-.Fn inet6_option_init "void *bp" "struct cmsghdr **cmsgp" "int type"
-.Ft "int"
-.Fn inet6_option_append "struct cmsghdr *cmsg" "const uint8_t *typep" "int multx" "int plusy"
-.Ft "uint8_t *"
-.Fn inet6_option_alloc "struct cmsghdr *cmsg" "int datalen" "int multx" "int plusy"
-.Ft "int"
-.Fn inet6_option_next "const struct cmsghdr *cmsg" "uint8_t **tptrp"
-.Ft "int"
-.Fn inet6_option_find "const struct cmsghdr *cmsg" "uint8_t **tptrp" "int type"
-.\"
-.Sh DESCRIPTION
-.\"
-Building and parsing the Hop-by-Hop and Destination options is
-complicated due to alignment constraints, padding and
-ancillary data manipulation.
-RFC 2292 defines a set of functions to help the application.
-The function prototypes for
-these functions are all in the
-.In netinet/in.h
-header.
-.\"
-.Ss inet6_option_space
-.Fn inet6_option_space
-returns the number of bytes required to hold an option when it is stored as
-ancillary data, including the
-.Li cmsghdr
-structure at the beginning,
-and any padding at the end
-.Po
-to make its size a multiple of 8 bytes
-.Pc .
-The argument is the size of the structure defining the option,
-which must include any pad bytes at the beginning
-.Po
-the value
-.Li y
-in the alignment term
-.Dq Li xn + y
-.Pc ,
-the type byte, the length byte, and the option data.
-.Pp
-Note: If multiple options are stored in a single ancillary data
-object, which is the recommended technique, this function
-overestimates the amount of space required by the size of
-.Li N-1
-.Li cmsghdr
-structures,
-where
-.Li N
-is the number of options to be stored in the object.
-This is of little consequence, since it is assumed that most
-Hop-by-Hop option headers and Destination option headers carry only
-one option
-.Pq appendix B of [RFC 2460] .
-.\"
-.Ss inet6_option_init
-.Fn inet6_option_init
-is called once per ancillary data object that will
-contain either Hop-by-Hop or Destination options.
-It returns
-.Li 0
-on success or
-.Li -1
-on an error.
-.Pp
-.Fa bp
-is a pointer to previously allocated space that will contain the
-ancillary data object.
-It must be large enough to contain all the
-individual options to be added by later calls to
-.Fn inet6_option_append
-and
-.Fn inet6_option_alloc .
-.Pp
-.Fa cmsgp
-is a pointer to a pointer to a
-.Li cmsghdr
-structure.
-.Fa *cmsgp
-is initialized by this function to point to the
-.Li cmsghdr
-structure constructed by this function in the buffer pointed to by
-.Fa bp .
-.Pp
-.Fa type
-is either
-.Dv IPV6_HOPOPTS
-or
-.Dv IPV6_DSTOPTS .
-This
-.Fa type
-is stored in the
-.Li cmsg_type
-member of the
-.Li cmsghdr
-structure pointed to by
-.Fa *cmsgp .
-.\"
-.Ss inet6_option_append
-This function appends a Hop-by-Hop option or a Destination option
-into an ancillary data object that has been initialized by
-.Fn inet6_option_init .
-This function returns
-.Li 0
-if it succeeds or
-.Li -1
-on an error.
-.Pp
-.Fa cmsg
-is a pointer to the
-.Li cmsghdr
-structure that must have been
-initialized by
-.Fn inet6_option_init .
-.Pp
-.Fa typep
-is a pointer to the 8-bit option type.
-It is assumed that this
-field is immediately followed by the 8-bit option data length field,
-which is then followed immediately by the option data.
-The caller
-initializes these three fields
-.Pq the type-length-value, or TLV
-before calling this function.
-.Pp
-The option type must have a value from
-.Li 2
-to
-.Li 255 ,
-inclusive.
-.Po
-.Li 0
-and
-.Li 1
-are reserved for the
-.Li Pad1
-and
-.Li PadN
-options, respectively.
-.Pc
-.Pp
-The option data length must have a value between
-.Li 0
-and
-.Li 255 ,
-inclusive, and is the length of the option data that follows.
-.Pp
-.Fa multx
-is the value
-.Li x
-in the alignment term
-.Dq Li xn + y .
-It must have a value of
-.Li 1 ,
-.Li 2 ,
-.Li 4 ,
-or
-.Li 8 .
-.Pp
-.Fa plusy
-is the value
-.Li y
-in the alignment term
-.Dq Li xn + y .
-It must have a value between
-.Li 0
-and
-.Li 7 ,
-inclusive.
-.\"
-.Ss inet6_option_alloc
-This function appends a Hop-by-Hop option or a Destination option
-into an ancillary data object that has been initialized by
-.Fn inet6_option_init .
-This function returns a pointer to the 8-bit
-option type field that starts the option on success, or
-.Dv NULL
-on an error.
-.Pp
-The difference between this function and
-.Fn inet6_option_append
-is that the latter copies the contents of a previously built option into
-the ancillary data object while the current function returns a
-pointer to the space in the data object where the option's TLV must
-then be built by the caller.
-.Pp
-.Fa cmsg
-is a pointer to the
-.Li cmsghdr
-structure that must have been
-initialized by
-.Fn inet6_option_init .
-.Pp
-.Fa datalen
-is the value of the option data length byte for this option.
-This value is required as an argument to allow the function to
-determine if padding must be appended at the end of the option.
-.Po
-The
-.Fn inet6_option_append
-function does not need a data length argument
-since the option data length must already be stored by the caller.
-.Pc
-.Pp
-.Fa multx
-is the value
-.Li x
-in the alignment term
-.Dq Li xn + y .
-It must have a value of
-.Li 1 ,
-.Li 2 ,
-.Li 4 ,
-or
-.Li 8 .
-.Pp
-.Fa plusy
-is the value
-.Li y
-in the alignment term
-.Dq Li xn + y .
-It must have a value between
-.Li 0
-and
-.Li 7 ,
-inclusive.
-.\"
-.Ss inet6_option_next
-This function processes the next Hop-by-Hop option or Destination
-option in an ancillary data object.
-If another option remains to be
-processed, the return value of the function is
-.Li 0
-and
-.Fa *tptrp
-points to
-the 8-bit option type field
-.Po
-which is followed by the 8-bit option
-data length, followed by the option data
-.Pc .
-If no more options remain
-to be processed, the return value is
-.Li -1
-and
-.Fa *tptrp
-is
-.Dv NULL .
-If an error occurs, the return value is
-.Li -1
-and
-.Fa *tptrp
-is not
-.Dv NULL .
-.Pp
-.Fa cmsg
-is a pointer to
-.Li cmsghdr
-structure of which
-.Li cmsg_level
-equals
-.Dv IPPROTO_IPV6
-and
-.Li cmsg_type
-equals either
-.Dv IPV6_HOPOPTS
-or
-.Dv IPV6_DSTOPTS .
-.Pp
-.Fa tptrp
-is a pointer to a pointer to an 8-bit byte and
-.Fa *tptrp
-is used
-by the function to remember its place in the ancillary data object
-each time the function is called.
-The first time this function is
-called for a given ancillary data object,
-.Fa *tptrp
-must be set to
-.Dv NULL .
-.Pp
-Each time this function returns success,
-.Fa *tptrp
-points to the 8-bit
-option type field for the next option to be processed.
-.\"
-.Ss inet6_option_find
-This function is similar to the previously described
-.Fn inet6_option_next
-function, except this function lets the caller
-specify the option type to be searched for, instead of always
-returning the next option in the ancillary data object.
-.Fa cmsg
-is a
-pointer to
-.Li cmsghdr
-structure of which
-.Li cmsg_level
-equals
-.Dv IPPROTO_IPV6
-and
-.Li cmsg_type
-equals either
-.Dv IPV6_HOPOPTS
-or
-.Dv IPV6_DSTOPTS .
-.Pp
-.Fa tptrp
-is a pointer to a pointer to an 8-bit byte and
-.Fa *tptrp
-is used
-by the function to remember its place in the ancillary data object
-each time the function is called.
-The first time this function is
-called for a given ancillary data object,
-.Fa *tptrp
-must be set to
-.Dv NULL .
-.Pa
-This function starts searching for an option of the specified type
-beginning after the value of
-.Fa *tptrp .
-If an option of the specified
-type is located, this function returns
-.Li 0
-and
-.Fa *tptrp
-points to the 8-
-bit option type field for the option of the specified type.
-If an
-option of the specified type is not located, the return value is
-.Li -1
-and
-.Fa *tptrp
-is
-.Dv NULL .
-If an error occurs, the return value is
-.Li -1
-and
-.Fa *tptrp
-is not
-.Dv NULL .
-.\"
-.Sh EXAMPLES
-RFC 2292 gives comprehensive examples in chapter 6.
-.\"
-.Sh DIAGNOSTICS
-.Fn inet6_option_init
-and
-.Fn inet6_option_append
-return
-.Li 0
-on success or
-.Li -1
-on an error.
-.Pp
-.Fn inet6_option_alloc
-returns
-.Dv NULL
-on an error.
-.Pp
-On errors,
-.Fn inet6_option_next
-and
-.Fn inet6_option_find
-return
-.Li -1
-setting
-.Fa *tptrp
-to non
-.Dv NULL
-value.
-.\"
-.Sh SEE ALSO
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%T "Advanced Sockets API for IPv6"
-.%N RFC 2292
-.%D February 1998
-.Re
-.Rs
-.%A S. Deering
-.%A R. Hinden
-.%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC 2460
-.%D December 1998
-.Re
-.\"
-.Sh STANDARDS
-The functions
-are documented in
-.Dq Advanced Sockets API for IPv6
-.Pq RFC 2292 .
-.\"
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
-.\"
-.Sh BUGS
-The text was shamelessly copied from RFC 2292.
diff --git a/lib/libc/net/inet6_rth_space.3 b/lib/libc/net/inet6_rth_space.3
deleted file mode 100644
index 5fa489dfc..000000000
--- a/lib/libc/net/inet6_rth_space.3
+++ /dev/null
@@ -1,223 +0,0 @@
-.\"	$NetBSD: inet6_rth_space.3,v 1.2 2014/01/04 15:37:46 wiz Exp $
-.\"	$KAME: inet6_rth_space.3,v 1.7 2005/01/05 03:00:44 itojun Exp $
-.\"
-.\" Copyright (C) 2004 WIDE Project.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the project nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd December 24, 2004
-.Dt INET6_RTH_SPACE 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_rth_space ,
-.Nm inet6_rth_init ,
-.Nm inet6_rth_add ,
-.Nm inet6_rth_reverse ,
-.Nm inet6_rth_segments ,
-.Nm inet6_rth_getaddr
-.Nd IPv6 Routing Header Options manipulation
-.\"
-.Sh SYNOPSIS
-.In netinet/in.h
-.Ft socklen_t
-.Fn inet6_rth_space "int" "int"
-.Ft "void *"
-.Fn inet6_rth_init "void *" "socklen_t" "int" "int"
-.Ft int
-.Fn inet6_rth_add "void *" "const struct in6_addr *"
-.Ft int
-.Fn inet6_rth_reverse "const void *" "void *"
-.Ft int
-.Fn inet6_rth_segments "const void *"
-.Ft "struct in6_addr *"
-.Fn inet6_rth_getaddr "const void *" "int"
-.\"
-.Sh DESCRIPTION
-The IPv6 Advanced API, RFC 3542, defines the functions that an
-application calls to build and examine IPv6 Routing headers.
-Routing headers are used to perform source routing in IPv6 networks.
-The RFC uses the word
-.Dq segments
-to describe addresses and that is the term used here as well.
-All of the functions are defined in the
-.In netinet/in.h
-header file.
-The functions described in this manual page all operate
-on routing header structures which are defined in
-.In netinet/ip6.h
-but which should not need to be modified outside the use of this API.
-The size and shape of the route header structures may change, so using
-the APIs is a more portable, long term, solution.
-.Pp
-The functions in the API are split into two groups, those that build a
-routing header and those that parse a received routing header.
-We will describe the builder functions followed by the parser functions.
-.Ss inet6_rth_space
-The
-.Fn inet6_rth_space
-function returns the number of bytes required to hold a Routing Header
-of the type, specified in the
-.Fa type
-argument and containing the number of addresses specified in the
-.Fa segments
-argumment.
-When the type is
-.Dv IPV6_RTHDR_TYPE_0
-the number of segments must be from 0 through 127.
-Routing headers of type
-.Dv IPV6_RTHDR_TYPE_2
-contain only one segment, and are only used with Mobile IPv6.
-The return value from this function is the number of bytes required to
-store the routing header.
-If the value 0 is returned then either the
-route header type was not recognized or another error occurred.
-.Ss inet6_rth_init
-The
-.Fn inet6_rth_init
-function initializes the pre-allocated buffer pointed to by
-.Fa bp
-to contain a routing header of the specified type The
-.Fa bp_len
-argument is used to verify that the buffer is large enough.
-The caller must allocate the buffer pointed to by bp.
-The necessary buffer size should be determined by calling
-.Fn inet6_rth_space
-described in the previous sections.
-.Pp
-The
-.Fn inet6_rth_init
-function returns a pointer to
-.Fa bp
-on success and
-.Dv NULL
-when there is an error.
-.Ss inet6_rth_add
-The
-.Fn inet6_rth_add
-function adds the IPv6 address pointed to by
-.Fa addr
-to the end of the routing header being constructed.
-.Pp
-A successful addition results in the function returning 0, otherwise
-\-1 is returned.
-.Ss inet6_rth_reverse
-The
-.Fn inet6_rth_reverse
-function takes a routing header, pointed to by the
-argument
-.Fa in ,
-and writes a new routing header into the argument pointed to by
-.Fa out .
-The routing header at that sends datagrams along the reverse of that
-route.
-Both arguments are allowed to point to the same buffer meaning
-that the reversal can occur in place.
-.Pp
-The return value of the function is 0 on success, or \-1 when
-there is an error.
-.\"
-.Pp
-The next set of functions operate on a routing header that the
-application wants to parse.
-In the usual case such a routing header
-is received from the network, although these functions can also be
-used with routing headers that the application itself created.
-.Ss inet6_rth_segments
-The
-.Fn inet6_rth_segments
-function returns the number of segments contained in the
-routing header pointed to by
-.Fa bp .
-The return value is the number of segments contained in the routing
-header, or \-1 if an error occurred.
-It is not an error for 0 to be
-returned as a routing header may contain 0 segments.
-.\"
-.Ss inet6_rth_getaddr
-The
-.Fn inet6_rth_getaddr
-function is used to retrieve a single address from a routing header.
-The
-.Fa index
-is the location in the routing header from which the application wants
-to retrieve an address.
-The
-.Fa index
-parameter must have a value between 0 and one less than the number of
-segments present in the routing header.
-The
-.Fn inet6_rth_segments
-function, described in the last section, should be used to determine
-the total number of segments in the routing header.
-The
-.Fn inet6_rth_getaddr
-function returns a pointer to an IPv6 address on success or
-.Dv NULL
-when an error has occurred.
-.\"
-.Sh EXAMPLES
-RFC 3542 gives extensive examples in Section 21, Appendix B.
-.Pp
-KAME also provides examples in the advapitest directory of its kit.
-.\"
-.Sh DIAGNOSTICS
-The
-.Fn inet6_rth_space
-and
-.Fn inet6_rth_getaddr
-functions return 0 on errors.
-.Pp
-The
-.Fn inet6_rthdr_init
-function returns
-.Dv NULL
-on error.
-The
-.Fn inet6_rth_add
-and
-.Fn inet6_rth_reverse
-functions return 0 on success, or \-1 upon an error.
-.\"
-.Sh SEE ALSO
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%A E. Nordmark
-.%A T. Jinmei
-.%T "Advanced Sockets API for IPv6"
-.%N RFC 3542
-.%D May 2003
-.Re
-.Rs
-.%A S. Deering
-.%A R. Hinden
-.%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC2460
-.%D December 1998
-.Re
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
diff --git a/lib/libc/net/inet6_rthdr_space.3 b/lib/libc/net/inet6_rthdr_space.3
deleted file mode 100644
index 1d9a04396..000000000
--- a/lib/libc/net/inet6_rthdr_space.3
+++ /dev/null
@@ -1,321 +0,0 @@
-.\"	$NetBSD: inet6_rthdr_space.3,v 1.16 2010/03/22 19:30:54 joerg Exp $
-.\"	$KAME: inet6_rthdr_space.3,v 1.8 2000/05/17 14:30:15 itojun Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\" 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.
-.\"
-.Dd December 10, 1999
-.Dt INET6_RTHDR_SPACE 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_rthdr_space ,
-.Nm inet6_rthdr_init ,
-.Nm inet6_rthdr_add ,
-.Nm inet6_rthdr_lasthop ,
-.Nm inet6_rthdr_reverse ,
-.Nm inet6_rthdr_segments ,
-.Nm inet6_rthdr_getaddr ,
-.Nm inet6_rthdr_getflags
-.Nd IPv6 Routing Header Options manipulation
-.\"
-.Sh SYNOPSIS
-.In netinet/in.h
-.Ft size_t
-.Fn inet6_rthdr_space "int type" "int segments"
-.Ft "struct cmsghdr *"
-.Fn inet6_rthdr_init "void *bp" "int type"
-.Ft int
-.Fn inet6_rthdr_add "struct cmsghdr *cmsg" "const struct in6_addr *addr" "unsigned int flags"
-.Ft int
-.Fn inet6_rthdr_lasthop "struct cmsghdr *cmsg" "unsigned int flags"
-.Ft int
-.Fn inet6_rthdr_reverse "const struct cmsghdr *in" "struct cmsghdr *out"
-.Ft int
-.Fn inet6_rthdr_segments "const struct cmsghdr *cmsg"
-.Ft "struct in6_addr *"
-.Fn inet6_rthdr_getaddr "struct cmsghdr *cmsg" "int index"
-.Ft int
-.Fn inet6_rthdr_getflags "const struct cmsghdr *cmsg" "int index"
-.\"
-.Sh DESCRIPTION
-RFC 2292 IPv6 advanced API defines eight
-functions that the application calls to build and examine a Routing
-header.
-Four functions build a Routing header:
-.Bl -hang
-.It Fn inet6_rthdr_space
-return #bytes required for ancillary data
-.It Fn inet6_rthdr_init
-initialize ancillary data for Routing header
-.It Fn inet6_rthdr_add
-add IPv6 address \*[Am] flags to Routing header
-.It Fn inet6_rthdr_lasthop
-specify the flags for the final hop
-.El
-.Pp
-Four functions deal with a returned Routing header:
-.Bl -hang
-.It Fn inet6_rthdr_reverse
-reverse a Routing header
-.It Fn inet6_rthdr_segments
-return #segments in a Routing header
-.It Fn inet6_rthdr_getaddr
-fetch one address from a Routing header
-.It Fn inet6_rthdr_getflags
-fetch one flag from a Routing header
-.El
-.Pp
-The function prototypes for these functions are all in the
-.In netinet/in.h
-header.
-.\"
-.Ss inet6_rthdr_space
-This function returns the number of bytes required to hold a Routing
-header of the specified
-.Fa type
-containing the specified number of
-.Fa segments
-.Pq addresses .
-For an IPv6 Type 0 Routing header, the number
-of segments must be between 1 and 23, inclusive.
-The return value
-includes the size of the cmsghdr structure that precedes the Routing
-header, and any required padding.
-.Pp
-If the return value is 0, then either the type of the Routing header
-is not supported by this implementation or the number of segments is
-invalid for this type of Routing header.
-.Pp
-Note: This function returns the size but does not allocate the space
-required for the ancillary data.
-This allows an application to
-allocate a larger buffer, if other ancillary data objects are
-desired, since all the ancillary data objects must be specified to
-.Xr sendmsg 2
-as a single
-.Li msg_control
-buffer.
-.\"
-.Ss inet6_rthdr_init
-This function initializes the buffer pointed to by
-.Fa bp
-to contain a
-.Li cmsghdr
-structure followed by a Routing header of the specified
-.Fa type .
-The
-.Li cmsg_len
-member of the
-.Li cmsghdr
-structure is initialized to the
-size of the structure plus the amount of space required by the
-Routing header.
-The
-.Li cmsg_level
-and
-.Li cmsg_type
-members are also initialized as required.
-.Pp
-The caller must allocate the buffer and its size can be determined by
-calling
-.Fn inet6_rthdr_space .
-.Pp
-Upon success the return value is the pointer to the
-.Li cmsghdr
-structure, and this is then used as the first argument to the next
-two functions.
-Upon an error the return value is
-.Dv NULL .
-.\"
-.Ss inet6_rthdr_add
-This function adds the address pointed to by
-.Fa addr
-to the end of the
-Routing header being constructed and sets the type of this hop to the
-value of
-.Fa flags .
-For an IPv6 Type 0 Routing header,
-.Fa flags
-must be
-either
-.Dv IPV6_RTHDR_LOOSE
-or
-.Dv IPV6_RTHDR_STRICT .
-.Pp
-If successful, the
-.Li cmsg_len
-member of the
-.Li cmsghdr
-structure is
-updated to account for the new address in the Routing header and the
-return value of the function is 0.
-Upon an error the return value of
-the function is -1.
-.\"
-.Ss inet6_rthdr_lasthop
-This function specifies the Strict/Loose flag for the final hop of a
-Routing header.
-For an IPv6 Type 0 Routing header,
-.Fa flags
-must be either
-.Dv IPV6_RTHDR_LOOSE
-or
-.Dv IPV6_RTHDR_STRICT .
-.Pp
-The return value of the function is 0 upon success, or -1 upon an error.
-.Pp
-Notice that a Routing header specifying
-.Li N
-intermediate nodes requires
-.Li N+1
-Strict/Loose flags.
-This requires
-.Li N
-calls to
-.Fn inet6_rthdr_add
-followed by one call to
-.Fn inet6_rthdr_lasthop .
-.\"
-.Ss inet6_rthdr_reverse
-This function takes a Routing header that was received as ancillary
-data
-.Po
-pointed to by the first argument,
-.Fa in
-.Pc
-and writes a new Routing
-header that sends datagrams along the reverse of that route.
-Both
-arguments are allowed to point to the same buffer
-.Pq that is, the reversal can occur in place .
-.Pp
-The return value of the function is 0 on success, or -1 upon an
-error.
-.\"
-.Ss inet6_rthdr_segments
-This function returns the number of segments
-.Pq addresses
-contained in
-the Routing header described by
-.Fa cmsg .
-On success the return value is
-between 1 and 23, inclusive.
-The return value of the function is -1 upon an error.
-.\"
-.Ss inet6_rthdr_getaddr
-This function returns a pointer to the IPv6 address specified by
-.Fa index
-.Po
-which must have a value between 1 and the value returned by
-.Fn inet6_rthdr_segments
-.Pc
-in the Routing header described by
-.Fa cmsg .
-An
-application should first call
-.Fn inet6_rthdr_segments
-to obtain the number of segments in the Routing header.
-.Pp
-Upon an error the return value of the function is
-.Dv NULL .
-.\"
-.Ss inet6_rthdr_getflags
-This function returns the flags value specified by
-.Fa index
-.Po
-which must
-have a value between 0 and the value returned by
-.Fn inet6_rthdr_segments
-.Pc
-in the Routing header described by
-.Fa cmsg .
-For an IPv6 Type 0 Routing header the return value will be either
-.Dv IPV6_RTHDR_LOOSE
-or
-.Dv IPV6_RTHDR_STRICT .
-.Pp
-Upon an error the return value of the function is -1.
-.Pp
-Note: Addresses are indexed starting at 1, and flags starting at 0,
-to maintain consistency with the terminology and figures in RFC 2460.
-.\"
-.Sh EXAMPLES
-RFC 2292 gives comprehensive examples in chapter 8.
-.\"
-.Sh DIAGNOSTICS
-.Fn inet6_rthdr_space
-returns 0 on errors.
-.Pp
-.Fn inet6_rthdr_add ,
-.Fn inet6_rthdr_lasthop
-and
-.Fn inet6_rthdr_reverse
-return 0 on success, and returns -1 on error.
-.Pp
-.Fn inet6_rthdr_init
-and
-.Fn inet6_rthdr_getaddr
-return
-.Dv NULL
-on error.
-.Pp
-.Fn inet6_rthdr_segments
-and
-.Fn inet6_rthdr_getflags
-return -1 on error.
-.\"
-.Sh SEE ALSO
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%T "Advanced Sockets API for IPv6"
-.%N RFC 2292
-.%D February 1998
-.Re
-.Rs
-.%A S. Deering
-.%A R. Hinden
-.%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC 2460
-.%D December 1998
-.Re
-.\"
-.Sh STANDARDS
-The functions
-are documented in
-.Dq Advanced Sockets API for IPv6
-.Pq RFC 2292 .
-.\"
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
-.\"
-.Sh BUGS
-The text was shamelessly copied from RFC 2292.
-.Pp
-.Fn inet6_rthdr_reverse
-is not implemented yet.
diff --git a/lib/libc/net/inet6_scopeid.c b/lib/libc/net/inet6_scopeid.c
deleted file mode 100644
index 8369af0a4..000000000
--- a/lib/libc/net/inet6_scopeid.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: inet6_scopeid.c,v 1.2 2013/10/19 15:47:02 christos Exp $");
-
-#include <sys/endian.h>
-#include <string.h>
-#include <stdint.h>
-#include <netinet/in.h>
-#include <netinet6/in6.h>
-
-/* KAME idiosyncrasy */
-void
-inet6_getscopeid(struct sockaddr_in6 *sin6, int flags)
-{
-#if defined(__KAME__)
-	if ((IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr) &&
-	    (flags & INET6_IS_ADDR_LINKLOCAL)) ||
-	    (IN6_IS_ADDR_MC_LINKLOCAL(&sin6->sin6_addr) &&
-	    (flags & INET6_IS_ADDR_MC_LINKLOCAL)) ||
-	    (IN6_IS_ADDR_SITELOCAL(&sin6->sin6_addr) &&
-	    (flags & INET6_IS_ADDR_SITELOCAL))) {
-		uint16_t scope;
-		memcpy(&scope, &sin6->sin6_addr.s6_addr[2], sizeof(scope));
-		sin6->sin6_scope_id = ntohs(scope);
-		sin6->sin6_addr.s6_addr[2] = sin6->sin6_addr.s6_addr[3] = 0;
-	}
-#endif
-}
-
-void
-inet6_putscopeid(struct sockaddr_in6 *sin6, int flags)
-{
-#if defined(__KAME__)
-	if ((IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr) &&
-	    (flags & INET6_IS_ADDR_LINKLOCAL)) ||
-	    (IN6_IS_ADDR_MC_LINKLOCAL(&sin6->sin6_addr) &&
-	    (flags & INET6_IS_ADDR_MC_LINKLOCAL)) ||
-	    (IN6_IS_ADDR_SITELOCAL(&sin6->sin6_addr) &&
-	    (flags & INET6_IS_ADDR_SITELOCAL))) {
-	    uint16_t scope = htons(sin6->sin6_scope_id);
-		memcpy(&sin6->sin6_addr.s6_addr[2], &scope, sizeof(scope));
-		sin6->sin6_scope_id = 0;
-	}
-#endif
-}
diff --git a/lib/libc/net/ip6opt.c b/lib/libc/net/ip6opt.c
deleted file mode 100644
index 4e09f70a1..000000000
--- a/lib/libc/net/ip6opt.c
+++ /dev/null
@@ -1,657 +0,0 @@
-/*	$NetBSD: ip6opt.c,v 1.15 2014/02/07 02:36:06 christos Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ip6opt.c,v 1.15 2014/02/07 02:36:06 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/ip6.h>
-
-#include <assert.h>
-#include <stddef.h>
-#include <string.h>
-#include <stdio.h>
-
-#ifdef __weak_alias
-__weak_alias(inet6_option_alloc,_inet6_option_alloc)
-__weak_alias(inet6_option_append,_inet6_option_append)
-__weak_alias(inet6_option_find,_inet6_option_find)
-__weak_alias(inet6_option_init,_inet6_option_init)
-__weak_alias(inet6_option_next,_inet6_option_next)
-__weak_alias(inet6_option_space,_inet6_option_space)
-__weak_alias(inet6_opt_init, _inet6_opt_init)
-__weak_alias(inet6_opt_append, _inet6_opt_append)
-__weak_alias(inet6_opt_finish, _inet6_opt_finish)
-__weak_alias(inet6_opt_set_val, _inet6_opt_set_val)
-__weak_alias(inet6_opt_next, _inet6_opt_next)
-__weak_alias(inet6_opt_find, _inet6_opt_find)
-__weak_alias(inet6_opt_get_val, _inet6_opt_get_val)
-#endif
-
-static int ip6optlen(uint8_t *opt, uint8_t *lim);
-static void inet6_insert_padopt(uint8_t *p, size_t len);
-
-/*
- * This function returns the number of bytes required to hold an option
- * when it is stored as ancillary data, including the cmsghdr structure
- * at the beginning, and any padding at the end (to make its size a
- * multiple of 8 bytes).  The argument is the size of the structure
- * defining the option, which must include any pad bytes at the
- * beginning (the value y in the alignment term "xn + y"), the type
- * byte, the length byte, and the option data.
- */
-int
-inet6_option_space(int nbytes)
-{
-	size_t sp;
-	nbytes += 2;	/* we need space for nxt-hdr and length fields */
-	sp = CMSG_SPACE((nbytes + 7) & ~7);
-	_DIAGASSERT(__type_fit(int, sp));
-	return (int)sp;
-}
-
-/*
- * This function is called once per ancillary data object that will
- * contain either Hop-by-Hop or Destination options.  It returns 0 on
- * success or -1 on an error.
- */
-int
-inet6_option_init(void *bp, struct cmsghdr **cmsgp, int type)
-{
-	register struct cmsghdr *ch;
-
-	_DIAGASSERT(bp != NULL);
-	_DIAGASSERT(cmsgp != NULL);
-
-	ch = (struct cmsghdr *)bp;
-
-	/* argument validation */
-	if (type != IPV6_HOPOPTS && type != IPV6_DSTOPTS)
-		return(-1);
-	
-	ch->cmsg_level = IPPROTO_IPV6;
-	ch->cmsg_type = type;
-	ch->cmsg_len = CMSG_LEN(0);
-
-	*cmsgp = ch;
-	return(0);
-}
-
-/*
- * This function appends a Hop-by-Hop option or a Destination option
- * into an ancillary data object that has been initialized by
- * inet6_option_init().  This function returns 0 if it succeeds or -1 on
- * an error.
- * multx is the value x in the alignment term "xn + y" described
- * earlier.  It must have a value of 1, 2, 4, or 8.
- * plusy is the value y in the alignment term "xn + y" described
- * earlier.  It must have a value between 0 and 7, inclusive.
- */
-int
-inet6_option_append(struct cmsghdr *cmsg, const uint8_t *typep, int multx,
-	int plusy)
-{
-	size_t padlen, optlen, off;
-	register uint8_t *bp;
-	struct ip6_ext *eh;
-
-	_DIAGASSERT(cmsg != NULL);
-	_DIAGASSERT(typep != NULL);
-
-	bp = (uint8_t *)(void *)cmsg + cmsg->cmsg_len;
-	eh = (struct ip6_ext *)(void *)CMSG_DATA(cmsg);
-
-	/* argument validation */
-	if (multx != 1 && multx != 2 && multx != 4 && multx != 8)
-		return(-1);
-	if (plusy < 0 || plusy > 7)
-		return(-1);
-
-	/*
-	 * If this is the first option, allocate space for the
-	 * first 2 bytes(for next header and length fields) of
-	 * the option header.
-	 */
-	if (bp == (uint8_t *)(void *)eh) {
-		bp += 2;
-		cmsg->cmsg_len += 2;
-	}
-
-	/* calculate pad length before the option. */
-	off = bp - (uint8_t *)(void *)eh;
-	padlen = (((off % multx) + (multx - 1)) & ~(multx - 1)) -
-		(off % multx);
-	padlen += plusy;
-	padlen %= multx;	/* keep the pad as short as possible */
-	/* insert padding */
-	inet6_insert_padopt(bp, padlen);
-	_DIAGASSERT(__type_fit(socklen_t, padlen + cmsg->cmsg_len));
-	cmsg->cmsg_len += (socklen_t)padlen;
-	bp += padlen;
-
-	/* copy the option */
-	if (typep[0] == IP6OPT_PAD1)
-		optlen = 1;
-	else
-		optlen = typep[1] + 2;
-	memcpy(bp, typep, (size_t)optlen);
-	bp += optlen;
-	_DIAGASSERT(__type_fit(socklen_t, optlen + cmsg->cmsg_len));
-	cmsg->cmsg_len += (socklen_t)optlen;
-
-	/* calculate pad length after the option and insert the padding */
-	off = bp - (uint8_t *)(void *)eh;
-	padlen = ((off + 7) & ~7) - off;
-	inet6_insert_padopt(bp, padlen);
-	bp += padlen;
-	_DIAGASSERT(__type_fit(socklen_t, padlen + cmsg->cmsg_len));
-	cmsg->cmsg_len += (socklen_t)padlen;
-
-	/* update the length field of the ip6 option header */
-	off = bp - (uint8_t *)(void *)eh;
-	_DIAGASSERT(__type_fit(uint8_t, (off >> 3) - 1));
-	eh->ip6e_len = (uint8_t)((off >> 3) - 1);
-
-	return(0);
-}
-
-/*
- * This function appends a Hop-by-Hop option or a Destination option
- * into an ancillary data object that has been initialized by
- * inet6_option_init().  This function returns a pointer to the 8-bit
- * option type field that starts the option on success, or NULL on an
- * error.
- * The difference between this function and inet6_option_append() is
- * that the latter copies the contents of a previously built option into
- * the ancillary data object while the current function returns a
- * pointer to the space in the data object where the option's TLV must
- * then be built by the caller.
- * 
- */
-uint8_t *
-inet6_option_alloc(struct cmsghdr *cmsg, int datalen, int multx, int plusy)
-{
-	size_t padlen, off;
-	register uint8_t *bp;
-	uint8_t *retval;
-	struct ip6_ext *eh;
-
-	_DIAGASSERT(cmsg != NULL);
-
-	bp = (uint8_t *)(void *)cmsg + cmsg->cmsg_len;
-	eh = (struct ip6_ext *)(void *)CMSG_DATA(cmsg);
-
-	/* argument validation */
-	if (multx != 1 && multx != 2 && multx != 4 && multx != 8)
-		return(NULL);
-	if (plusy < 0 || plusy > 7)
-		return(NULL);
-
-	/*
-	 * If this is the first option, allocate space for the
-	 * first 2 bytes(for next header and length fields) of
-	 * the option header.
-	 */
-	if (bp == (uint8_t *)(void *)eh) {
-		bp += 2;
-		cmsg->cmsg_len += 2;
-	}
-
-	/* calculate pad length before the option. */
-	off = bp - (uint8_t *)(void *)eh;
-	padlen = (((off % multx) + (multx - 1)) & ~(multx - 1)) -
-		(off % multx);
-	padlen += plusy;
-	padlen %= multx;	/* keep the pad as short as possible */
-	/* insert padding */
-	inet6_insert_padopt(bp, padlen);
-	cmsg->cmsg_len += (socklen_t)padlen;
-	bp += padlen;
-
-	/* keep space to store specified length of data */
-	retval = bp;
-	bp += datalen;
-	cmsg->cmsg_len += datalen;
-
-	/* calculate pad length after the option and insert the padding */
-	off = bp - (uint8_t *)(void *)eh;
-	padlen = ((off + 7) & ~7) - off;
-	inet6_insert_padopt(bp, padlen);
-	bp += padlen;
-	_DIAGASSERT(__type_fit(socklen_t, padlen + cmsg->cmsg_len));
-	cmsg->cmsg_len += (socklen_t)padlen;
-
-	/* update the length field of the ip6 option header */
-	off = bp - (uint8_t *)(void *)eh;
-	_DIAGASSERT(__type_fit(uint8_t, (off >> 3) - 1));
-	eh->ip6e_len = (uint8_t)((off >> 3) - 1);
-
-	return(retval);
-}
-
-/*
- * This function processes the next Hop-by-Hop option or Destination
- * option in an ancillary data object.  If another option remains to be
- * processed, the return value of the function is 0 and *tptrp points to
- * the 8-bit option type field (which is followed by the 8-bit option
- * data length, followed by the option data).  If no more options remain
- * to be processed, the return value is -1 and *tptrp is NULL.  If an
- * error occurs, the return value is -1 and *tptrp is not NULL.
- * (RFC 2292, 6.3.5)
- */
-int
-inet6_option_next(const struct cmsghdr *cmsg, uint8_t **tptrp)
-{
-	struct ip6_ext *ip6e;
-	int hdrlen, optlen;
-	uint8_t *lim;
-
-	_DIAGASSERT(cmsg != NULL);
-	_DIAGASSERT(tptrp != NULL);
-
-	if (cmsg->cmsg_level != IPPROTO_IPV6 ||
-	    (cmsg->cmsg_type != IPV6_HOPOPTS &&
-	     cmsg->cmsg_type != IPV6_DSTOPTS))
-		return(-1);
-
-	/* message length validation */
-	if (cmsg->cmsg_len < CMSG_SPACE(sizeof(struct ip6_ext)))
-		return(-1);
-	ip6e = __UNCONST(CCMSG_DATA(cmsg));
-	hdrlen = (ip6e->ip6e_len + 1) << 3;
-	if (cmsg->cmsg_len < CMSG_SPACE(hdrlen))
-		return(-1);
-
-	/*
-	 * If the caller does not specify the starting point,
-	 * simply return the 1st option.
-	 * Otherwise, search the option list for the next option.
-	 */
-	lim = (uint8_t *)(void *)ip6e + hdrlen;
-	if (*tptrp == NULL)
-		*tptrp = (uint8_t *)(void *)(ip6e + 1);
-	else {
-		if ((optlen = ip6optlen(*tptrp, lim)) == 0)
-			return(-1);
-
-		*tptrp = *tptrp + optlen;
-	}
-	if (*tptrp >= lim) {	/* there is no option */
-		*tptrp = NULL;
-		return(-1);
-	}
-	/*
-	 * Finally, checks if the next option is safely stored in the
-	 * cmsg data.
-	 */
-	if (ip6optlen(*tptrp, lim) == 0)
-		return(-1);
-	else
-		return(0);
-}
-
-/*
- * This function is similar to the inet6_option_next() function,
- * except this function lets the caller specify the option type to be
- * searched for, instead of always returning the next option in the
- * ancillary data object.
- * Note: RFC 2292 says the type of tptrp is uint8_t *, but we think
- *       it's a typo. The variable should be type of uint8_t **.
- */
-int
-inet6_option_find(const struct cmsghdr *cmsg, uint8_t **tptrp, int type)
-{
-	struct ip6_ext *ip6e;
-	int hdrlen, optlen;
-	uint8_t *optp, *lim;
-
-	_DIAGASSERT(cmsg != NULL);
-	_DIAGASSERT(tptrp != NULL);
-
-	if (cmsg->cmsg_level != IPPROTO_IPV6 ||
-	    (cmsg->cmsg_type != IPV6_HOPOPTS &&
-	     cmsg->cmsg_type != IPV6_DSTOPTS))
-		return(-1);
-
-	/* message length validation */
-	if (cmsg->cmsg_len < CMSG_SPACE(sizeof(struct ip6_ext)))
-		return(-1);
-	ip6e = __UNCONST(CCMSG_DATA(cmsg));
-	hdrlen = (ip6e->ip6e_len + 1) << 3;
-	if (cmsg->cmsg_len < CMSG_SPACE(hdrlen))
-		return(-1);	
-
-	/*
-	 * If the caller does not specify the starting point,
-	 * search from the beginning of the option list.
-	 * Otherwise, search from *the next option* of the specified point.
-	 */
-	lim = (uint8_t *)(void *)ip6e + hdrlen;
-	if (*tptrp == NULL)
-		*tptrp = (uint8_t *)(void *)(ip6e + 1);
-	else {
-		if ((optlen = ip6optlen(*tptrp, lim)) == 0)
-			return(-1);
-
-		*tptrp = *tptrp + optlen;
-	}
-	for (optp = *tptrp; optp < lim; optp += optlen) {
-		if (*optp == type) {
-			*tptrp = optp;
-			return(0);
-		}
-		if ((optlen = ip6optlen(optp, lim)) == 0)
-			return(-1);
-	}
-
-	/* search failed */
-	*tptrp = NULL;
-	return(-1);
-}
-
-/*
- * Calculate the length of a given IPv6 option. Also checks
- * if the option is safely stored in user's buffer according to the
- * calculated length and the limitation of the buffer.
- */
-static int
-ip6optlen(uint8_t *opt, uint8_t *lim)
-{
-	int optlen;
-
-	_DIAGASSERT(opt != NULL);
-	_DIAGASSERT(lim != NULL);
-
-	if (*opt == IP6OPT_PAD1)
-		optlen = 1;
-	else {
-		/* is there enough space to store type and len? */
-		if (opt + 2 > lim)
-			return(0);
-		optlen = *(opt + 1) + 2;
-	}
-	if (opt + optlen <= lim)
-		return(optlen);
-
-	return(0);
-}
-
-static void
-inet6_insert_padopt(uint8_t *p, size_t len)
-{
-
-	_DIAGASSERT(p != NULL);
-
-	switch(len) {
-	 case 0:
-		 return;
-	 case 1:
-		 p[0] = IP6OPT_PAD1;
-		 return;
-	 default:
-		 p[0] = IP6OPT_PADN;
-		 _DIAGASSERT(__type_fit(uint8_t, len - 2));
-		 p[1] = (uint8_t)(len - 2); 
-		 memset(&p[2], 0, len - 2);
-		 return;
-	}
-}
-
-/*
- * The following functions are defined in RFC3542, which is a successor
- * of RFC2292.
- */
-
-int
-inet6_opt_init(void *extbuf, socklen_t extlen)
-{
-	struct ip6_ext *ext = (struct ip6_ext *)extbuf;
-
-	if (ext) {
-		if (extlen == 0 || (extlen % 8))
-			return (-1);
-		ext->ip6e_len = (extlen >> 3) - 1;
-	}
-
-	return (2);		/* sizeof the next and the length fields */
-}
-
-int
-inet6_opt_append(void *extbuf, socklen_t extlen, int offset, uint8_t type,
-		 socklen_t len, uint8_t align, void **databufp)
-{
-	int currentlen = offset;
-	size_t padlen = 0;
-
-	/*
-	 * The option type must have a value from 2 to 255, inclusive.
-	 * (0 and 1 are reserved for the Pad1 and PadN options, respectively.)
-	 */
-	if (type < 2)
-		return (-1);
-
-	/*
-	 * The option data length must have a value between 0 and 255,
-	 * inclusive, and is the length of the option data that follows.
-	 */
-	if (len > 255)
-		return (-1);
-
-	/*
-	 * The align parameter must have a value of 1, 2, 4, or 8.
-	 * The align value can not exceed the value of len.
-	 */
-	if (align != 1 && align != 2 && align != 4 && align != 8)
-		return (-1);
-	if (align > len)
-		return (-1);
-
-	/* Calculate the padding length. */
-	currentlen += 2 + len;	/* 2 means "type + len" */
-	if (currentlen % align)
-		padlen = align - (currentlen % align);
-
-	/* The option must fit in the extension header buffer. */
-	_DIAGASSERT(__type_fit(int, currentlen + padlen));
-	currentlen += (int)padlen;
-	if (extlen &&		/* XXX: right? */
-	    (socklen_t)currentlen > extlen)
-		return (-1);
-
-	if (extbuf) {
-		uint8_t *optp = (uint8_t *)extbuf + offset;
-
-		if (padlen == 1) {
-			/* insert a Pad1 option */
-			*optp = IP6OPT_PAD1;
-			optp++;
-		} else if (padlen > 0) {
-			/* insert a PadN option for alignment */
-			*optp++ = IP6OPT_PADN;
-			_DIAGASSERT(__type_fit(uint8_t, padlen - 2));
-			*optp++ = (uint8_t)(padlen - 2);
-			memset(optp, 0, padlen - 2);
-			optp += (padlen - 2);
-		}
-
-		*optp++ = type;
-		*optp++ = len;
-
-		*databufp = optp;
-	}
-
-	return (currentlen);
-}
-
-int
-inet6_opt_finish(void *extbuf, socklen_t extlen, int offset)
-{
-	int updatelen = offset > 0 ? (1 + ((offset - 1) | 7)) : 0;
-
-	if (extbuf) {
-		uint8_t *padp;
-		size_t padlen = updatelen - offset;
-
-		if ((socklen_t)updatelen > extlen || padlen >= 256 + 2)
-			return (-1);
-
-		padp = (uint8_t *)extbuf + offset;
-		if (padlen == 1)
-			*padp = IP6OPT_PAD1;
-		else if (padlen > 0) {
-			*padp++ = IP6OPT_PADN;
-			*padp++ = (uint8_t)(padlen - 2);
-			memset(padp, 0, padlen - 2);
-		}
-	}
-
-	return (updatelen);
-}
-
-int
-inet6_opt_set_val(void *databuf, int offset, void *val, socklen_t vallen)
-{
-
-	memcpy((uint8_t *)databuf + offset, val, vallen);
-	return (offset + vallen);
-}
-
-int
-inet6_opt_next(void *extbuf, socklen_t extlen, int offset, uint8_t *typep,
-	       socklen_t *lenp, void **databufp)
-{
-	uint8_t *optp, *lim;
-	int optlen;
-
-	/* Validate extlen. XXX: is the variable really necessary?? */
-	if (extlen == 0 || (extlen % 8))
-		return (-1);
-	lim = (uint8_t *)extbuf + extlen;
-
-	/*
-	 * If this is the first time this function called for this options
-	 * header, simply return the 1st option.
-	 * Otherwise, search the option list for the next option.
-	 */
-	if (offset == 0)
-		optp = (uint8_t *)(void *)((struct ip6_hbh *)extbuf + 1);
-	else
-		optp = (uint8_t *)extbuf + offset;
-
-	/* Find the next option skipping any padding options. */
-	while (optp < lim) {
-		ptrdiff_t rv;
-		switch(*optp) {
-		case IP6OPT_PAD1:
-			optp++;
-			break;
-		case IP6OPT_PADN:
-			if ((optlen = ip6optlen(optp, lim)) == 0)
-				goto optend;
-			optp += optlen;
-			break;
-		default:	/* found */
-			if ((optlen = ip6optlen(optp, lim)) == 0)
-				goto optend;
-			*typep = *optp;
-			*lenp = optlen - 2;
-			*databufp = optp + 2;
-			rv = optp + optlen - (uint8_t *)extbuf;
-			_DIAGASSERT(__type_fit(int, rv));
-			return (int)rv;
-		}
-	}
-
-  optend:
-	*databufp = NULL; /* for safety */
-	return (-1);
-}
-
-int
-inet6_opt_find(void *extbuf, socklen_t extlen, int offset, uint8_t type,
-	       socklen_t *lenp, void **databufp)
-{
-	uint8_t *optp, *lim;
-	int optlen;
-
-	/* Validate extlen. XXX: is the variable really necessary?? */
-	if (extlen == 0 || (extlen % 8))
-		return (-1);
-	lim = (uint8_t *)extbuf + extlen;
-
-	/*
-	 * If this is the first time this function called for this options
-	 * header, simply return the 1st option.
-	 * Otherwise, search the option list for the next option.
-	 */
-	if (offset == 0)
-		optp = (uint8_t *)(void *)((struct ip6_hbh *)extbuf + 1);
-	else
-		optp = (uint8_t *)extbuf + offset;
-
-	/* Find the specified option */
-	while (optp < lim) {
-		if ((optlen = ip6optlen(optp, lim)) == 0)
-			goto optend;
-
-		if (*optp == type) { /* found */
-			ptrdiff_t td;
-			*lenp = optlen - 2;
-			*databufp = optp + 2;
-			td = optp + optlen - (uint8_t *)extbuf;
-			_DIAGASSERT(__type_fit(int, td));
-			return (int)td;
-		}
-
-		optp += optlen;
-	}
-
-  optend:
-	*databufp = NULL; /* for safety */
-	return (-1);
-}
-
-int
-inet6_opt_get_val(void *databuf, int offset, void *val, socklen_t vallen)
-{
-
-	/* we can't assume alignment here */
-	memcpy(val, (uint8_t *)databuf + offset, vallen);
-
-	return (offset + vallen);
-}
diff --git a/lib/libc/net/iso_addr.c b/lib/libc/net/iso_addr.c
deleted file mode 100644
index 24ecbcd9e..000000000
--- a/lib/libc/net/iso_addr.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*	$NetBSD: iso_addr.c,v 1.15 2013/03/01 18:25:16 joerg Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)iso_addr.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: iso_addr.c,v 1.15 2013/03/01 18:25:16 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-
-#include <assert.h>
-#include <string.h>
-
-struct iso_addr {
-	uint8_t		isoa_len;	/* length (in bytes) */
-	char		isoa_genaddr[20];	/* general opaque address */
-};
-
-__BEGIN_DECLS
-struct iso_addr *iso_addr(const char *);
-char *iso_ntoa(const struct iso_addr *);
-__END_DECLS
-
-/* States*/
-#define VIRGIN	0
-#define GOTONE	1
-#define GOTTWO	2
-/* Inputs */
-#define	DIGIT	(4*0)
-#define	END	(4*1)
-#define DELIM	(4*2)
-
-struct iso_addr *
-iso_addr(const char *addr)
-{
-	static struct iso_addr out_addr;
-	register char *cp = out_addr.isoa_genaddr;
-	char *cplim = cp + sizeof(out_addr.isoa_genaddr);
-	register int byte = 0, state = VIRGIN;
-	register int newaddr = 0;	/* pacify gcc */
-
-	_DIAGASSERT(addr != NULL);
-
-	(void)memset(&out_addr, 0, sizeof (out_addr));
-	do {
-		if ((*addr >= '0') && (*addr <= '9')) {
-			newaddr = *addr - '0';
-		} else if ((*addr >= 'a') && (*addr <= 'f')) {
-			newaddr = *addr - 'a' + 10;
-		} else if ((*addr >= 'A') && (*addr <= 'F')) {
-			newaddr = *addr - 'A' + 10;
-		} else if (*addr == 0) 
-			state |= END;
-		else
-			state |= DELIM;
-		addr++;
-		switch (state /* | INPUT */) {
-		case GOTTWO | DIGIT:
-			*cp++ = byte; /*FALLTHROUGH*/
-		case VIRGIN | DIGIT:
-			state = GOTONE; byte = newaddr; continue;
-		case GOTONE | DIGIT:
-			state = GOTTWO; byte = newaddr + (byte << 4); continue;
-		default: /* | DELIM */
-			state = VIRGIN; *cp++ = byte; byte = 0; continue;
-		case GOTONE | END:
-		case GOTTWO | END:
-			*cp++ = byte; /* FALLTHROUGH */
-		case VIRGIN | END:
-			break;
-		}
-		break;
-	} while (cp < cplim); 
-	_DIAGASSERT(__type_fit(uint8_t, cp - out_addr.isoa_genaddr));
-	out_addr.isoa_len = (uint8_t)(cp - out_addr.isoa_genaddr);
-	return (&out_addr);
-}
-
-static const char hexlist[16] = "0123456789abcdef";
-
-char *
-iso_ntoa(const struct iso_addr *isoa)
-{
-	static char obuf[64];
-	char *out = obuf; 
-	size_t i;
-	const u_char *in = (const u_char *)isoa->isoa_genaddr;
-	const u_char *inlim = in + isoa->isoa_len;
-
-	_DIAGASSERT(isoa != NULL);
-
-	out[1] = 0;
-	while (in < inlim) {
-		i = *in++;
-		*out++ = '.';
-		if (i > 0xf) {
-			out[1] = hexlist[i & 0xf];
-			i >>= 4;
-			out[0] = hexlist[i];
-			out += 2;
-		} else
-			*out++ = hexlist[i];
-	}
-	*out = 0;
-	return(obuf + 1);
-}
diff --git a/lib/libc/net/linkaddr.3 b/lib/libc/net/linkaddr.3
deleted file mode 100644
index d0f590dff..000000000
--- a/lib/libc/net/linkaddr.3
+++ /dev/null
@@ -1,134 +0,0 @@
-.\"	$NetBSD: linkaddr.3,v 1.10 2003/08/07 16:43:11 agc Exp $
-.\"
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley at BSDI.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)linkaddr.3	8.1 (Berkeley) 7/28/93
-.\"
-.Dd July 28, 1993
-.Dt LINK_ADDR 3
-.Os
-.Sh NAME
-.Nm link_addr ,
-.Nm link_ntoa
-.Nd elementary address specification routines for link level access
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In net/if_dl.h
-.Ft void
-.Fn link_addr "const char *addr" "struct sockaddr_dl *sdl"
-.Ft char *
-.Fn link_ntoa "const struct sockaddr_dl *sdl"
-.Sh DESCRIPTION
-The routine
-.Fn link_addr
-interprets character strings representing link-level addresses,
-returning binary information suitable for use in system calls.
-The routine
-.Fn link_ntoa
-takes a link-level address and returns an
-.Tn ASCII
-string representing some of the information present, including the
-link level address itself, and the interface name or number, if present.
-This facility is experimental and is still subject to change.
-.Pp
-Prior to a call to
-.Fn link_addr ,
-.Fa sdl-\*[Gt]sdl_len
-must be initialized to the size of the link-level socket structure,
-typically
-.Fa sizeof(struct sockaddr_dl) .
-.Pp
-For
-.Fn link_addr ,
-the string
-.Fa addr
-may contain
-an optional network interface identifier of the form
-.Dq "name unit-number" ,
-suitable for the first argument to
-.Xr ifconfig 8 ,
-followed in all cases by a colon and
-an interface address in the form of
-groups of hexadecimal digits
-separated by periods.
-Each group represents a byte of address;
-address bytes are filled left to right from
-low order bytes through high order bytes.
-.Pp
-.\" A regular expression may make this format clearer:
-.\" .Bd -literal -offset indent
-.\" ([a-z]+[0-9]+:)?[0-9a-f]+(\e.[0-9a-f]+)*
-.\" .Ed
-.\" .Pp
-Thus
-.Li le0:8.0.9.13.d.30
-represents an ethernet address
-to be transmitted on the first Lance ethernet interface.
-.Sh RETURN VALUES
-.Fn link_ntoa
-always returns a null terminated string.
-.Fn link_addr
-has no return value (See
-.Sx BUGS ) .
-.Sh SEE ALSO
-.Xr ethers 3 ,
-.Xr iso 4
-.Sh HISTORY
-The
-.Fn link_addr
-and
-.Fn link_ntoa
-functions appeared in
-.Bx 4.3 Reno .
-.Sh BUGS
-The returned values for
-.Fn link_ntoa
-reside in a static memory area.
-.Pp
-The function
-.Fn link_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
-.Pp
-If the
-.Va sdl_len
-field of the link socket address
-.Fa sdl
-is 0,
-.Fn link_ntoa
-will not insert a colon before the interface address bytes.
-If this translated address is given to
-.Fn link_addr
-without inserting an initial colon,
-the latter will not interpret it correctly.
diff --git a/lib/libc/net/linkaddr.c b/lib/libc/net/linkaddr.c
deleted file mode 100644
index c807439d7..000000000
--- a/lib/libc/net/linkaddr.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*	$NetBSD: linkaddr.c,v 1.16 2012/03/20 17:44:18 matt Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)linkaddr.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: linkaddr.c,v 1.16 2012/03/20 17:44:18 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if_dl.h>
-
-#include <assert.h>
-#include <string.h>
-
-/* States*/
-#define NAMING	0
-#define GOTONE	1
-#define GOTTWO	2
-#define RESET	3
-/* Inputs */
-#define	DIGIT	(4*0)
-#define	END	(4*1)
-#define DELIM	(4*2)
-#define LETTER	(4*3)
-
-void
-link_addr(const char *addr, struct sockaddr_dl *sdl)
-{
-	register char *cp = sdl->sdl_data;
-	char *cplim = sdl->sdl_len + (char *)(void *)sdl;
-	int byte = 0, state = NAMING;
-	size_t newaddr = 0;	/* pacify gcc */
-
-	_DIAGASSERT(addr != NULL);
-	_DIAGASSERT(sdl != NULL);
-
-	(void)memset(&sdl->sdl_family, 0, (size_t)sdl->sdl_len - 1);
-	sdl->sdl_family = AF_LINK;
-	do {
-		state &= ~LETTER;
-		if ((*addr >= '0') && (*addr <= '9')) {
-			newaddr = *addr - '0';
-		} else if ((*addr >= 'a') && (*addr <= 'f')) {
-			newaddr = *addr - 'a' + 10;
-		} else if ((*addr >= 'A') && (*addr <= 'F')) {
-			newaddr = *addr - 'A' + 10;
-		} else if (*addr == 0) {
-			state |= END;
-		} else if (state == NAMING &&
-			   (((*addr >= 'A') && (*addr <= 'Z')) ||
-			   ((*addr >= 'a') && (*addr <= 'z'))))
-			state |= LETTER;
-		else
-			state |= DELIM;
-		addr++;
-		switch (state /* | INPUT */) {
-		case NAMING | DIGIT:
-		case NAMING | LETTER:
-			*cp++ = addr[-1];
-			continue;
-		case NAMING | DELIM:
-			state = RESET;
-			_DIAGASSERT(__type_fit(uint8_t, cp - sdl->sdl_data));
-			sdl->sdl_nlen = (uint8_t)(cp - sdl->sdl_data);
-			continue;
-		case GOTTWO | DIGIT:
-			*cp++ = byte;
-			/* FALLTHROUGH */
-		case RESET | DIGIT:
-			state = GOTONE;
-			byte = (int)newaddr;
-			continue;
-		case GOTONE | DIGIT:
-			state = GOTTWO;
-			byte = (int)newaddr + (byte << 4);
-			continue;
-		default: /* | DELIM */
-			state = RESET;
-			*cp++ = byte;
-			byte = 0;
-			continue;
-		case GOTONE | END:
-		case GOTTWO | END:
-			*cp++ = byte;
-			/* FALLTHROUGH */
-		case RESET | END:
-			break;
-		}
-		break;
-	} while (cp < cplim); 
-
-	_DIAGASSERT(__type_fit(uint8_t, cp - LLADDR(sdl)));
-	sdl->sdl_alen = (uint8_t)(cp - LLADDR(sdl));
-	newaddr = cp - (char *)(void *)sdl;
-	if (newaddr > sizeof(*sdl)) {
-		_DIAGASSERT(__type_fit(uint8_t, newaddr));
-		sdl->sdl_len = (uint8_t)newaddr;
-	}
-	return;
-}
-
-static const char hexlist[16] = "0123456789abcdef";
-
-char *
-link_ntoa(const struct sockaddr_dl *sdl)
-{
-	static char obuf[64];
-	register char *out = obuf; 
-	register size_t i;
-	const u_char *in = (const u_char *)CLLADDR(sdl);
-	const u_char *inlim = in + sdl->sdl_alen;
-	int firsttime = 1;
-
-	_DIAGASSERT(sdl != NULL);
-
-	if (sdl->sdl_nlen) {
-		(void)memcpy(obuf, sdl->sdl_data, (size_t)sdl->sdl_nlen);
-		out += sdl->sdl_nlen;
-		if (sdl->sdl_alen)
-			*out++ = ':';
-	}
-	while (in < inlim) {
-		if (firsttime)
-			firsttime = 0;
-		else
-			*out++ = '.';
-		i = *in++;
-		if (i > 0xf) {
-			out[1] = hexlist[i & 0xf];
-			i >>= 4;
-			out[0] = hexlist[i];
-			out += 2;
-		} else
-			*out++ = hexlist[i];
-	}
-	*out = 0;
-	return (obuf);
-}
diff --git a/lib/libc/net/nsdispatch.3 b/lib/libc/net/nsdispatch.3
deleted file mode 100644
index 8913b0ad6..000000000
--- a/lib/libc/net/nsdispatch.3
+++ /dev/null
@@ -1,959 +0,0 @@
-.\"	$NetBSD: nsdispatch.3,v 1.33 2015/01/04 21:38:58 wiz Exp $
-.\"
-.\" Copyright (c) 1997, 1998, 1999, 2004, 2005, 2008
-.\" The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Luke Mewburn; and by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 4, 2015
-.Dt NSDISPATCH 3
-.Os
-.Sh NAME
-.Nm nsdispatch
-.Nd name-service switch dispatcher routine
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In nsswitch.h
-.Ft int
-.Fo nsdispatch
-.Fa "void *nsdrv"
-.Fa "const ns_dtab dtab[]"
-.Fa "const char *database"
-.Fa "const char *name"
-.Fa "const ns_src defaults[]"
-.Fa "..."
-.Fc
-.Sh DESCRIPTION
-The
-.Fn nsdispatch
-function invokes the callback functions specified in
-.Fa dtab
-in the order given in
-.Pa /etc/nsswitch.conf
-for the database
-.Fa database
-until the action criteria for a source of that database is fulfilled.
-.Pp
-.Fa nsdrv
-is passed to each callback function to use as necessary
-(to pass back to the caller of
-.Fn nsdispatch ) .
-.Pp
-.Fa dtab
-is an array of
-.Fa ns_dtab
-structures, which have the following format:
-.Bl -item -offset indent
-.It
-.Bd -literal
-typedef struct {
-	const char *src;
-	nss_method cb;
-	void *cb_data;
-} ns_dtab;
-.Ed
-.It
-The
-.Fa dtab
-array should consist of one entry for each source type that has a
-static implementation,
-with
-.Fa src
-as the name of the source,
-.Fa cb
-as a callback function which handles that source, and
-.Fa cb_data
-as a pointer to arbitrary data to be passed to the callback function.
-The last entry in
-.Fa dtab
-should contain
-.Dv NULL
-values for
-.Fa src ,
-.Fa cb ,
-and
-.Fa cb_data .
-.It
-The callback function signature is described by the typedef:
-.Bd -ragged -offset indent
-.Ft typedef int
-.Fo \*(lp*nss_method\*(rp
-.Fa "void *cbrv"
-.Fa "void *cbdata"
-.Fa "va_list ap"
-.Fc ;
-.Bl -tag -width cbdata
-.It Fa cbrv
-The
-.Fa nsdrv
-that
-.Fn nsdispatch
-was invoked with.
-.It Fa cbdata
-The
-.Fa cb_data
-member of the array entry for the source that this
-callback function implements in the
-.Fa dtab
-argument of
-.Fn nsdispatch .
-.It Fa ap
-The
-.Fa ...
-arguments to
-.Fn nsdispatch ,
-converted to a
-.Ft va_list .
-.El
-.Ed
-.El
-.Pp
-.Fa database
-and
-.Fa name
-are used to select methods from optional per-source
-dynamically-loaded modules.
-.Fa name
-is usually the name of the function calling
-.Fn nsdispatch .
-Note that the callback functions provided by
-.Fa dtab
-take priority over those implemented in dynamically-loaded modules in the
-event of a conflict.
-.Pp
-.Fa defaults
-contains a list of default sources to try in the case of
-a missing or corrupt
-.Xr nsswitch.conf 5 ,
-or if there isn't a relevant entry for
-.Fa database .
-It is an array of
-.Fa ns_src
-structures, which have the following format:
-.Bl -item -offset indent
-.It
-.Bd -literal
-typedef struct {
-	const char *src;
-	uint32_t flags;
-} ns_src;
-.Ed
-.It
-The
-.Fa defaults
-array should consist of one entry for each source to consult by default
-indicated by
-.Fa src ,
-and
-.Fa flags
-set to the desired behavior
-(usually
-.Dv NS_SUCCESS ;
-refer to
-.Sx Callback function return values
-for more information).
-The last entry in
-.Fa defaults
-should have
-.Fa src
-set to
-.Dv NULL
-and
-.Fa flags
-set to 0.
-.It
-Some invokers of
-.Fn nsdispatch
-(such as
-.Xr setgrent 3 )
-need to force all callback functions to be invoked,
-irrespective of the action criteria listed in
-.Xr nsswitch.conf 5 .
-This can be achieved by adding
-.Dv NS_FORCEALL
-to
-.Fa defaults[0].flags
-before invoking
-.Fn nsdispatch .
-The return value of
-.Fn nsdispatch
-will be the result of the final callback function invoked.
-.It
-For convenience, a global variable defined as:
-.Dl extern const ns_src __nsdefaultsrc[];
-exists which contains a single default entry for
-.Sq files
-for use by callers which don't require complicated default rules.
-.El
-.Pp
-.Fa ...
-are optional extra arguments, which
-are passed to the appropriate callback function as a
-.Xr stdarg 3
-variable argument
-list of the type
-.Fa va_list .
-.Pp
-.Nm
-returns the value of the callback function that caused the dispatcher
-to finish, or
-.Dv NS_NOTFOUND
-otherwise.
-.\"
-.Ss Dynamically-loaded module interface
-The
-.Fn nsdispatch
-function loads callback functions from the run-time link-editor's search
-path using the following naming convention:
-.Bl -item -offset indent
-.It
-.Bd -literal
-nss_\*[Lt]source\*[Gt].so.\*[Lt]version\*[Gt]
-.Ed
-.Bl -tag -width XversionX
-.It Aq source
-The source that the module implements.
-.It Aq version
-The
-.Nm nsdispatch
-module interface version, which is defined by the integer
-.Dv NSS_MODULE_INTERFACE_VERSION ,
-which has the value 0.
-.El
-.El
-.Pp
-When a module is loaded,
-.Fn nsdispatch
-looks for and calls the following function in the module:
-.Pp
-.Bd -ragged -offset indent
-.Ft ns_mtab *
-.Fo nss_module_register
-.Fa "const char *source"
-.Fa "u_int *nelems"
-.Fa "nss_module_unregister_fn *unreg"
-.Fc ;
-.Pp
-.Bl -tag -width source
-.It Fa source
-The name of the source that the module implements, as used by
-.Fn nsdispatch
-to construct the module's name.
-.It Fa nelems
-A pointer to an unsigned integer that
-.Fn nss_module_register
-should set to the number of elements in the
-.Ft ns_mtab
-array returned by
-.Fn nss_module_register ,
-or
-.Dv 0
-if there was a failure.
-.It Fa unreg
-A pointer to a function pointer that
-.Fn nss_module_register
-can optionally set to an unregister function to be invoked when the module is
-unloaded, or
-.Dv NULL
-if there isn't one.
-.El
-.Ed
-.Pp
-The unregister function signature is described by the typedef:
-.Pp
-.Bd -ragged -offset indent
-.Ft typedef void
-.Fo \*(lp*nss_module_unregister_fn\*(rp
-.Fa "ns_mtab *mtab"
-.Fa "u_int nelems"
-.Fc ;
-.Pp
-.Bl -tag -width nelems
-.It Fa mtab
-The array of
-.Ft ns_mtab
-structures returned by
-.Fn nss_module_register .
-.It Fa nelems
-The
-.Fa *nelems
-value set by
-.Fn nss_module_register .
-.El
-.Ed
-.Pp
-.Fn nss_module_register
-returns an array of
-.Ft ns_mtab
-structures
-(with
-.Fa *nelems
-entries), or
-.Dv NULL
-if there was a failure.
-The
-.Ft ns_mtab
-structures have the following format:
-.Bl -item -offset indent
-.It
-.Bd -literal
-typedef struct {
-	const char *database;
-	const char *name;
-	nss_method method;
-	void *mdata;
-} ns_mtab;
-.Ed
-.It
-The
-.Fa mtab
-array should consist of one entry for each callback function (method)
-that is implemented,
-with
-.Fa database
-as the name of the database,
-.Fa name
-as the name of the callback function,
-.Fa method
-as the
-.Ft nss_method
-callback function that implements the method, and
-.Fa mdata
-as a pointer to arbitrary data to be passed to the callback function as its
-.Fa cbdata
-argument.
-.El
-.\"
-.Ss Valid source types
-While there is support for arbitrary sources, the following
-#defines for commonly implemented sources are provided:
-.Bl -column NSSRC_COMPAT COMPAT -offset indent
-.It Sy #define	Value
-.It NSSRC_FILES	"files"
-.It NSSRC_DNS	"dns"
-.It NSSRC_NIS	"nis"
-.It NSSRC_COMPAT	"compat"
-.El
-.Pp
-Refer to
-.Xr nsswitch.conf 5
-for a complete description of what each source type is.
-.\"
-.Ss Valid database types
-While there is support for arbitrary databases, the following
-#defines for currently implemented system databases are provided:
-.Bl -column NSDB_PASSWD_COMPAT PASSWD_COMPAT -offset indent
-.It Sy #define	Value
-.It NSDB_HOSTS	"hosts"
-.It NSDB_GROUP	"group"
-.It NSDB_GROUP_COMPAT	"group_compat"
-.It NSDB_NETGROUP	"netgroup"
-.It NSDB_NETWORKS	"networks"
-.It NSDB_PASSWD	"passwd"
-.It NSDB_PASSWD_COMPAT	"passwd_compat"
-.It NSDB_SHELLS	"shells"
-.El
-.Pp
-Refer to
-.Xr nsswitch.conf 5
-for a complete description of what each database is.
-.\"
-.Ss Callback function return values
-The callback functions should return one of the following values
-depending upon status of the lookup:
-.Bl -column NS_NOTFOUND -offset indent
-.It Sy "Return value"	Status code
-.It NS_SUCCESS	The requested entry was found.
-.It NS_NOTFOUND	The entry is not present at this source.
-.It NS_TRYAGAIN	The source is busy, and may respond to retries.
-.It NS_UNAVAIL	The source is not responding, or entry is corrupt.
-.El
-.\"
-.Sh CALLBACK FUNCTION API FOR STANDARD DATABASES
-The organization of the
-.Fa ap
-argument for an
-.Fn nss_method
-callback function for a standard method in a standard database is:
-.Bl -enum -offset indent -compact
-.It
-Pointer to return value of the standard function.
-.It
-First argument of the standard function.
-.It
-(etc.)
-.El
-.Pp
-For example, given the standard function
-.Xr getgrnam 3 :
-.Bd -ragged -offset indent -compact
-.Ft struct group *
-.Fn getgrnam "const char *name"
-.Ed
-the
-.Fa ap
-organization used by the callback functions is:
-.Bl -enum -offset indent -compact
-.It
-.Ft "struct group **"
-.It
-.Ft "const char *"
-.El
-.Pp
-.Sy NOTE:
-Not all standard databases are using this calling convention yet;
-those that aren't are noted below.
-These will be changed in the future.
-.Pp
-The callback function names and
-.Ft va_list
-organization for various standard database callback functions are:
-.\"
-.Ss Methods for hosts database
-.Bl -tag -width 3n
-.It Sy getaddrinfo
-.Ft "char *name" ,
-.Ft "const struct addrinfo *pai"
-.Pp
-Returns
-.Ft "struct addrinfo *"
-via
-.Ft "void *cbrv" .
-.It Sy gethostbyaddr
-.Ft "unsigned char *addr" ,
-.Ft "int addrlen" ,
-.Ft "int af"
-.Pp
-Returns
-.Ft "struct getnamaddr *"
-via
-.Ft "void *cbrv" .
-.It Sy gethostbyname
-.Ft "char *name" ,
-.Ft "int namelen" ,
-.Ft "int af"
-.Pp
-Returns
-.Ft "struct getnamaddr *"
-via
-.Ft "void *cbrv" .
-.El
-.Pp
-The
-.Ft "struct getnamaddr"
-is defined internally in libc as:
-.Bd -literal
-struct getnamaddr { 
-        struct hostent *hp;
-        char *buf; 
-        size_t buflen;
-        int *he; 
-}; 
-.Ed
-.\"
-.Ss Methods for group and group_compat databases
-.Bl -tag -width 3n
-.It Sy endgrent
-Empty
-.Fa ap .
-.Pp
-All methods for all sources are invoked for this method name.
-.It Sy getgrent
-.Ft "struct group **retval"
-.Pp
-.Fa *retval
-should be set to a pointer to an internal static
-.Ft "struct group"
-on success,
-.Dv NULL
-otherwise.
-.Pp
-.Xr getgrent 3
-returns
-.Fa *retval
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS ,
-.Dv NULL
-otherwise.
-.It Sy getgrent_r
-.Ft "int *retval" ,
-.Ft "struct group *grp" ,
-.Ft "char *buffer" ,
-.Ft "size_t buflen" ,
-.Ft "struct group **result"
-.Pp
-.Fa *retval
-should be set to an appropriate
-.Xr errno 2
-on failure.
-.Pp
-.Xr getgrent_r 3
-returns 0
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS
-or
-.Dv NS_NOTFOUND ,
-and
-.Fa *retval
-otherwise.
-.It Sy getgrgid
-.Ft "struct group **retval" ,
-.Ft "gid_t gid"
-.Pp
-.Fa *retval
-should be set to a pointer to an internal static
-.Ft "struct group"
-on success,
-.Dv NULL
-otherwise.
-.Pp
-.Xr getgrgid 3
-returns
-.Fa *retval
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS ,
-.Dv NULL
-otherwise.
-.It Sy getgrgid_r
-.Ft "int *retval" ,
-.Ft "gid_t gid" ,
-.Ft "struct group *grp" ,
-.Ft "char *buffer" ,
-.Ft "size_t buflen" ,
-.Ft "struct group **result"
-.Pp
-.Fa *retval
-should be set to an appropriate
-.Xr errno 2
-on failure.
-.Pp
-.Xr getgrgid_r 3
-returns 0
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS
-or
-.Dv NS_NOTFOUND ,
-and
-.Fa *retval
-otherwise.
-.It Sy getgrnam
-.Ft "struct group **retval" ,
-.Ft "const char *name"
-.Pp
-.Fa *retval
-should be set to a pointer to an internal static
-.Ft "struct group"
-on success,
-.Dv NULL
-otherwise.
-.Pp
-.Xr getgrnam 3
-returns
-.Fa *retval
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS ,
-.Dv NULL
-otherwise.
-.It Sy getgrnam_r
-.Ft "int *retval" ,
-.Ft "const char *name" ,
-.Ft "struct group *grp" ,
-.Ft "char *buffer" ,
-.Ft "size_t buflen" ,
-.Ft "struct group **result"
-.Pp
-.Fa *retval
-should be set to an appropriate
-.Xr errno 2
-on failure.
-.Pp
-.Xr getgrnam_r 3
-returns 0
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS
-or
-.Dv NS_NOTFOUND ,
-and
-.Fa *retval
-otherwise.
-.It Sy getgroupmembership
-.Ft "int *retval" ,
-.Ft "const char *name" ,
-.Ft "gid_t basegid" ,
-.Ft "gid_t *groups" ,
-.Ft "int maxgrp" ,
-.Ft "int *groupc"
-.Pp
-.Fa retval
-is unused.
-.Pp
-Lookups for
-.Sy group_compat
-are also stopped if
-.Dv NS_SUCCESS
-was returned to prevent multiple
-.Dq "+:"
-compat entries from being expanded.
-.Pp
-.Xr getgroupmembership 3
-returns
-is -1 if
-.Fa *groupc
-is greater than to
-.Fa maxgrp ,
-and 0 otherwise.
-.It Sy setgroupent
-.Ft "int *retval" ,
-.Ft "int stayopen"
-.Pp
-.Fa retval
-should be set to 0 on failure and 1 on success.
-.Pp
-All methods for all sources are invoked for this method name.
-.It Sy setgrent
-Empty
-.Fa ap .
-.Pp
-All methods for all sources are invoked for this method name.
-.El
-.\"
-.Ss Methods for netgroup database
-.Sy NOTE:
-The method APIs for this database will be changing in the near future.
-.Bl -tag -width 3n
-.It Sy endnetgrent
-Empty
-.Fa ap .
-.It Sy lookup
-.Ft "char *name" ,
-.Ft "char **line" ,
-.Ft "int bywhat"
-.Pp
-Find the given
-.Fa name
-and return its value in
-.Fa line .
-.Fa bywhat
-is one of
-.Dv _NG_KEYBYNAME ,
-.Dv _NG_KEYBYUSER ,
-or
-.Dv _NG_KEYBYHOST .
-.It Sy getnetgrent
-.Ft "int *retval" ,
-.Ft "const char **host" ,
-.Ft "const char **user" ,
-.Ft "const char **domain"
-.Pp
-.Fa *retval
-should be set to 0 for no more netgroup members and 1 otherwise.
-.Pp
-.Xr getnetgrent 3
-returns
-.Fa *retval
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS ,
-0 otherwise.
-.It Sy innetgr
-.Ft "int *retval" ,
-.Ft "const char *grp" ,
-.Ft "const char *host" ,
-.Ft "const char *user" ,
-.Ft "const char *domain"
-.Pp
-.Fa *retval
-should be set to 1 for a successful match and 0 otherwise.
-.It Sy setnetgrent
-.Ft "const char *netgroup"
-.El
-.\"
-.Ss Methods for networks database
-.Bl -tag -width 3n
-.It Sy getnetbyaddr
-.Ft "struct netent **retval" ,
-.Ft "uint32_t net" ,
-.Ft "int type"
-.Pp
-.Fa *retval
-should be set to a pointer to an internal static
-.Ft "struct netent"
-on success,
-.Dv NULL
-otherwise.
-.Pp
-.Xr getnetbyaddr 3
-returns
-.Fa *retval
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS ,
-.Dv NULL
-otherwise.
-.It Sy getnetbyname
-.Ft "struct netent **retval" ,
-.Ft "const char *name"
-.Pp
-.Fa *retval
-should be set to a pointer to an internal static
-.Ft "struct netent"
-on success,
-.Dv NULL
-otherwise.
-.Pp
-.Xr getnetbyname 3
-returns
-.Fa *retval
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS ,
-.Dv NULL
-otherwise.
-.El
-.\"
-.Ss Methods for passwd and passwd_compat databases
-.Bl -tag -width 3n
-.It Sy endpwent
-Empty
-.Fa ap .
-.Pp
-All methods for all sources are invoked for this method name.
-.It Sy getpwent
-.Ft "struct passwd **retval"
-.Pp
-.Fa *retval
-should be set to a pointer to an internal static
-.Ft "struct passwd"
-on success,
-.Dv NULL
-otherwise.
-.Pp
-.Xr getpwent 3
-returns
-.Fa *retval
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS ,
-.Dv NULL
-otherwise.
-.It Sy getpwent_r
-.Ft "int *retval" ,
-.Ft "struct passwd *pw" ,
-.Ft "char *buffer" ,
-.Ft "size_t buflen" ,
-.Ft "struct passwd **result"
-.Pp
-.Fa *retval
-should be set to an appropriate
-.Xr errno 2
-on failure.
-.Pp
-.Xr getpwent_r 3
-returns 0
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS
-or
-.Dv NS_NOTFOUND ,
-and
-.Fa *retval
-otherwise.
-.It Sy getpwnam
-.Ft "struct passwd **retval" ,
-.Ft "const char *name"
-.Pp
-.Fa *retval
-should be set to a pointer to an internal static
-.Ft "struct passwd"
-on success,
-.Dv NULL
-otherwise.
-.Pp
-.Xr getpwnam 3
-returns
-.Fa *retval
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS ,
-.Dv NULL
-otherwise.
-.It Sy getpwnam_r
-.Ft "int *retval" ,
-.Ft "const char *name" ,
-.Ft "struct passwd *pw" ,
-.Ft "char *buffer" ,
-.Ft "size_t buflen" ,
-.Ft "struct passwd **result"
-.Pp
-.Fa *retval
-should be set to an appropriate
-.Xr errno 2
-on failure.
-.Pp
-.Xr getpwnam_r 3
-returns 0
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS
-or
-.Dv NS_NOTFOUND ,
-and
-.Fa *retval
-otherwise.
-.It Sy getpwuid
-.Ft "struct passwd **retval" ,
-.Ft "uid_t uid"
-.Pp
-.Fa *retval
-should be set to a pointer to an internal static
-.Ft "struct passwd"
-on success,
-.Dv NULL
-otherwise.
-.Pp
-.Xr getpwuid 3
-returns
-.Fa *retval
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS ,
-.Dv NULL
-otherwise.
-.It Sy getpwuid_r
-.Ft "int *retval" ,
-.Ft "uid_t uid" ,
-.Ft "struct passwd *pw" ,
-.Ft "char *buffer" ,
-.Ft "size_t buflen" ,
-.Ft "struct passwd **result"
-.Pp
-.Fa *retval
-should be set to an appropriate
-.Xr errno 2
-on failure.
-.Pp
-.Xr getpwuid_r 3
-returns 0
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS
-or
-.Dv NS_NOTFOUND ,
-and
-.Fa *retval
-otherwise.
-.It Sy setpassent
-.Ft "int *retval" ,
-.Ft "int stayopen"
-.Pp
-.Fa retval
-should be set to 0 on failure and 1 on success.
-.Pp
-All methods for all sources are invoked for this method name.
-.It Sy setpwent
-Empty
-.Fa ap .
-.Pp
-All methods for all sources are invoked for this method name.
-.El
-.\"
-.Ss Methods for shells database
-.Bl -tag -width 3n
-.It Sy endusershell
-Empty
-.Fa ap .
-.Pp
-All methods for all sources are invoked for this method name.
-.It Sy getusershell
-.Ft "char **retval"
-.Pp
-.Xr getusershell 3
-returns
-.Fa *retval
-if
-.Fn nsdispatch
-returns
-.Dv NS_SUCCESS ,
-and 0 otherwise.
-.It Sy setusershell
-Empty
-.Fa ap .
-.Pp
-All methods for all sources are invoked for this method name.
-.El
-.\"
-.Sh SEE ALSO
-.Xr ld.elf_so 1 ,
-.Xr hesiod 3 ,
-.Xr stdarg 3 ,
-.Xr ypclnt 3 ,
-.Xr nsswitch.conf 5
-.Sh HISTORY
-The
-.Nm
-routines first appeared in
-.Nx 1.4 .
-Support for dynamically-loaded modules first appeared in
-.Nx 3.0 .
-.Sh AUTHORS
-.An Luke Mewburn
-.Aq Mt lukem@NetBSD.org
-wrote this freely distributable name-service switch implementation,
-using ideas from the
-.Tn ULTRIX
-.Xr svc.conf 5
-and
-.Tn Solaris
-.Xr nsswitch.conf 4
-manual pages.
-Support for dynamically-loaded modules was added by
-.An Jason Thorpe
-.Aq Mt thorpej@NetBSD.org ,
-based on code developed by the
-.Fx
-Project.
diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c
deleted file mode 100644
index 738f52b1a..000000000
--- a/lib/libc/net/nsdispatch.c
+++ /dev/null
@@ -1,692 +0,0 @@
-/*	$NetBSD: nsdispatch.c,v 1.38 2014/09/18 13:58:20 christos Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn; and by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * Portions of this software were developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nsdispatch.c,v 1.38 2014/09/18 13:58:20 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/queue.h>
-
-#include <assert.h>
-#ifdef __ELF__
-#include <dlfcn.h>
-#endif /* __ELF__ */
-#include <err.h>
-#include <fcntl.h>
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "reentrant.h"
-
-extern	FILE 	*_nsyyin;
-extern	int	 _nsyyparse(void);
-
-
-#ifdef __weak_alias
-__weak_alias(nsdispatch,_nsdispatch)
-#endif
-
-
-/*
- * default sourcelist: `files'
- */
-const ns_src __nsdefaultsrc[] = {
-	{ NSSRC_FILES,	NS_SUCCESS },
-	{ 0, 0 },
-};
-
-const ns_src __nsdefaultcompat[] = {
-	{ NSSRC_COMPAT,	NS_SUCCESS },
-	{ 0, 0 }
-};
-
-const ns_src __nsdefaultcompat_forceall[] = {
-	{ NSSRC_COMPAT,	NS_SUCCESS | NS_FORCEALL },
-	{ 0, 0 }
-};
-
-const ns_src __nsdefaultfiles[] = {
-	{ NSSRC_FILES,	NS_SUCCESS },
-	{ 0, 0 },
-};
-
-const ns_src __nsdefaultfiles_forceall[] = {
-	{ NSSRC_FILES,	NS_SUCCESS | NS_FORCEALL },
-	{ 0, 0 },
-};
-
-const ns_src __nsdefaultnis[] = {
-	{ NSSRC_NIS,	NS_SUCCESS },
-	{ 0, 0 }
-};
-
-const ns_src __nsdefaultnis_forceall[] = {
-	{ NSSRC_NIS,	NS_SUCCESS | NS_FORCEALL },
-	{ 0, 0 }
-};
-
-
-/* Database, source mappings. */
-static	u_int			 _nsmapsize;
-static	ns_dbt			*_nsmap;
-
-/* Nsswitch modules. */
-static	u_int			 _nsmodsize;
-static	ns_mod			*_nsmod;
-
-/* Placeholder for built-in modules' dlopen() handles. */
-static	void			*_nsbuiltin = &_nsbuiltin;
-
-#ifdef _REENTRANT
-/*
- * Global nsswitch data structures are mostly read-only, but we update them
- * when we read or re-read nsswitch.conf.
- */
-static 	rwlock_t		_nslock = RWLOCK_INITIALIZER;
-
-/*
- * List of threads currently in nsdispatch().  We use this to detect
- * recursive calls and avoid reloading configuration in such cases,
- * which could cause deadlock.
- */
-struct _ns_drec {
-	LIST_ENTRY(_ns_drec)	list;
-	thr_t			thr;
-};
-static LIST_HEAD(, _ns_drec) _ns_drec = LIST_HEAD_INITIALIZER(&_ns_drec);
-static mutex_t _ns_drec_lock = MUTEX_INITIALIZER;
-#endif /* _REENTRANT */
-
-
-/*
- * Runtime determination of whether we are dynamically linked or not.
- */
-#ifndef __ELF__
-#define	is_dynamic()		(0)	/* don't bother - switch to ELF! */
-#else
-__weakref_visible int rtld_DYNAMIC __weak_reference(_DYNAMIC);
-#define	is_dynamic()		(&rtld_DYNAMIC != NULL)
-#endif
-
-
-/*
- * size of dynamic array chunk for _nsmap and _nsmap[x].srclist (and other
- * growing arrays).
- */
-#define NSELEMSPERCHUNK		8
-
-/*
- * Dynamically growable arrays are used for lists of databases, sources,
- * and modules.  The following "vector" API is used to isolate the
- * common operations.
- */
-typedef void	(*_nsvect_free_elem)(void *);
-
-static void *
-_nsvect_append(const void *elem, void *vec, u_int *count, size_t esize)
-{
-	void	*p;
-
-	if ((*count % NSELEMSPERCHUNK) == 0) {
-		p = realloc(vec, (*count + NSELEMSPERCHUNK) * esize);
-		if (p == NULL)
-			return (NULL);
-		vec = p;
-	}
-	memmove((void *)(((uintptr_t)vec) + (*count * esize)), elem, esize);
-	(*count)++;
-	return (vec);
-}
-
-static void *
-_nsvect_elem(u_int i, void *vec, u_int count, size_t esize)
-{
-
-	if (i < count)
-		return ((void *)((uintptr_t)vec + (i * esize)));
-	else
-		return (NULL);
-}
-
-static void
-_nsvect_free(void *vec, u_int *count, size_t esize, _nsvect_free_elem free_elem)
-{
-	void	*elem;
-	u_int	 i;
-
-	for (i = 0; i < *count; i++) {
-		elem = _nsvect_elem(i, vec, *count, esize);
-		if (elem != NULL)
-			(*free_elem)(elem);
-	}
-	if (vec != NULL)
-		free(vec);
-	*count = 0;
-}
-#define	_NSVECT_FREE(v, c, s, f)					\
-do {									\
-	_nsvect_free((v), (c), (s), (f));				\
-	(v) = NULL;							\
-} while (/*CONSTCOND*/0)
-
-static int
-_nsdbtcmp(const void *a, const void *b)
-{
-
-	return (strcasecmp(((const ns_dbt *)a)->name,
-	    ((const ns_dbt *)b)->name));
-}
-
-static int
-_nsmodcmp(const void *a, const void *b)
-{
-
-	return (strcasecmp(((const ns_mod *)a)->name,
-	    ((const ns_mod *)b)->name));
-}
-
-static int
-_nsmtabcmp(const void *a, const void *b)
-{
-	int	cmp;
-
-	cmp = strcmp(((const ns_mtab *)a)->name,
-	    ((const ns_mtab *)b)->name);
-	if (cmp)
-		return (cmp);
-
-	return (strcasecmp(((const ns_mtab *)a)->database,
-	    ((const ns_mtab *)b)->database));
-}
-
-static void
-_nsmodfree(ns_mod *mod)
-{
-
-	free(__UNCONST(mod->name));
-	if (mod->handle == NULL)
-		return;
-	if (mod->unregister != NULL)
-		(*mod->unregister)(mod->mtab, mod->mtabsize);
-#ifdef __ELF__
-	if (mod->handle != _nsbuiltin)
-		(void) dlclose(mod->handle);
-#endif /* __ELF__ */
-}
-
-/*
- * Load a built-in or dyanamically linked module.  If the `reg_fn'
- * argument is non-NULL, assume a built-in module and use `reg_fn'
- * to register it.  Otherwise, search for a dynamic nsswitch module.
- */
-static int
-_nsloadmod(const char *source, nss_module_register_fn reg_fn)
-{
-#ifdef __ELF__
-	char	buf[PATH_MAX];
-#endif
-	ns_mod	mod, *new;
-
-	memset(&mod, 0, sizeof(mod));
-	mod.name = strdup(source);
-	if (mod.name == NULL)
-		return (-1);
-
-	if (reg_fn != NULL) {
-		/*
-		 * The placeholder is required, as a NULL handle
-		 * represents an invalid module.
-		 */
-		mod.handle = _nsbuiltin;
-	} else if (!is_dynamic()) {
-		goto out;
-	} else {
-#ifdef __ELF__
-		if (snprintf(buf, sizeof(buf), "nss_%s.so.%d", mod.name,
-		    NSS_MODULE_INTERFACE_VERSION) >= (int)sizeof(buf))
-			goto out;
-		mod.handle = dlopen(buf, RTLD_LOCAL | RTLD_LAZY);
-		if (mod.handle == NULL) {
-#ifdef _NSS_DEBUG
-			/*
-			 * This gets pretty annoying, since the built-in
-			 * sources are not yet modules.
-			 */
-			/* XXX log some error? */
-#endif
-			goto out;
-		}
-		reg_fn = (nss_module_register_fn) dlsym(mod.handle,
-		    "nss_module_register");
-		if (reg_fn == NULL) {
-			(void) dlclose(mod.handle);
-			mod.handle = NULL;
-			/* XXX log some error? */
-			goto out;
-		}
-#else /* ! __ELF__ */
-		mod.handle = NULL;
-#endif /* __ELF__ */
-	}
-	mod.mtab = (*reg_fn)(mod.name, &mod.mtabsize, &mod.unregister);
-	if (mod.mtab == NULL || mod.mtabsize == 0) {
-#ifdef __ELF__
-		if (mod.handle != _nsbuiltin)
-			(void) dlclose(mod.handle);
-#endif /* __ELF__ */
-		mod.handle = NULL;
-		/* XXX log some error? */
-		goto out;
-	}
-	if (mod.mtabsize > 1)
-		qsort(mod.mtab, mod.mtabsize, sizeof(mod.mtab[0]),
-		    _nsmtabcmp);
- out:
-	new = _nsvect_append(&mod, _nsmod, &_nsmodsize, sizeof(*_nsmod));
-	if (new == NULL) {
-		_nsmodfree(&mod);
-		return (-1);
-	}
-	_nsmod = new;
-	/* _nsmodsize already incremented */
-
-	qsort(_nsmod, _nsmodsize, sizeof(*_nsmod), _nsmodcmp);
-	return (0);
-}
-
-static void
-_nsloadbuiltin(void)
-{
-
-	/* Do nothing, for now. */
-}
-
-int
-_nsdbtaddsrc(ns_dbt *dbt, const ns_src *src)
-{
-	void		*new;
-	const ns_mod	*mod;
-	ns_mod		 modkey;
-
-	_DIAGASSERT(dbt != NULL);
-	_DIAGASSERT(src != NULL);
-
-	new = _nsvect_append(src, dbt->srclist, &dbt->srclistsize,
-	    sizeof(*src));
-	if (new == NULL)
-		return (-1);
-	dbt->srclist = new;
-	/* dbt->srclistsize already incremented */
-
-	modkey.name = src->name;
-	mod = bsearch(&modkey, _nsmod, _nsmodsize, sizeof(*_nsmod), _nsmodcmp);
-	if (mod == NULL)
-		return (_nsloadmod(src->name, NULL));
-
-	return (0);
-}
-
-void
-_nsdbtdump(const ns_dbt *dbt)
-{
-	unsigned int	i;
-
-	_DIAGASSERT(dbt != NULL);
-
-	printf("%s (%d source%s):", dbt->name, dbt->srclistsize,
-	    dbt->srclistsize == 1 ? "" : "s");
-	for (i = 0; i < dbt->srclistsize; i++) {
-		printf(" %s", dbt->srclist[i].name);
-		if (!(dbt->srclist[i].flags &
-		    (NS_UNAVAIL|NS_NOTFOUND|NS_TRYAGAIN)) &&
-		    (dbt->srclist[i].flags & NS_SUCCESS))
-			continue;
-		printf(" [");
-		if (!(dbt->srclist[i].flags & NS_SUCCESS))
-			printf(" SUCCESS=continue");
-		if (dbt->srclist[i].flags & NS_UNAVAIL)
-			printf(" UNAVAIL=return");
-		if (dbt->srclist[i].flags & NS_NOTFOUND)
-			printf(" NOTFOUND=return");
-		if (dbt->srclist[i].flags & NS_TRYAGAIN)
-			printf(" TRYAGAIN=return");
-		printf(" ]");
-	}
-	printf("\n");
-}
-
-static void
-_nssrclist_free(ns_src **src, u_int srclistsize)
-{
-	u_int	i;
-
-	for (i = 0; i < srclistsize; i++) {
-		if ((*src)[i].name != NULL)
-			free(__UNCONST((*src)[i].name));
-	}
-	free(*src);
-	*src = NULL;
-}
-
-static void
-_nsdbtfree(ns_dbt *dbt)
-{
-
-	_nssrclist_free(&dbt->srclist, dbt->srclistsize);
-	if (dbt->name != NULL)
-		free(__UNCONST(dbt->name));
-}
-
-int
-_nsdbtput(const ns_dbt *dbt)
-{
-	ns_dbt	*p;
-	void	*new;
-	u_int	i;
-
-	_DIAGASSERT(dbt != NULL);
-
-	for (i = 0; i < _nsmapsize; i++) {
-		p = _nsvect_elem(i, _nsmap, _nsmapsize, sizeof(*_nsmap));
-		if (strcasecmp(dbt->name, p->name) == 0) {
-					/* overwrite existing entry */
-			if (p->srclist != NULL)
-				_nssrclist_free(&p->srclist, p->srclistsize);
-			memmove(p, dbt, sizeof(*dbt));
-			return (0);
-		}
-	}
-	new = _nsvect_append(dbt, _nsmap, &_nsmapsize, sizeof(*_nsmap));
-	if (new == NULL)
-		return (-1);
-	_nsmap = new;
-	/* _nsmapsize already incremented */
-
-	return (0);
-}
-
-/*
- * This function is called each time nsdispatch() is called.  If this
- * is the first call, or if the configuration has changed, (re-)prepare
- * the global data used by NSS.
- */
-static int
-_nsconfigure(void)
-{
-#ifdef _REENTRANT
-	static mutex_t	_nsconflock = MUTEX_INITIALIZER;
-#endif
-	static time_t	_nsconfmod;
-	struct stat	statbuf;
-
-	mutex_lock(&_nsconflock);
-
-	if (stat(_PATH_NS_CONF, &statbuf) == -1) {
-		/*
-		 * No nsswitch.conf; just use whatever configuration we
-		 * currently have, or fall back on the defaults specified
-		 * by the caller.
-		 */
-		mutex_unlock(&_nsconflock);
-		return (0);
-	}
-
-	if (statbuf.st_mtime <= _nsconfmod) {
-		/* Internal state is up-to-date with nsswitch.conf. */
-		mutex_unlock(&_nsconflock);
-		return (0);
-	}
-
-	/*
-	 * Ok, we've decided we need to update the nsswitch configuration
-	 * structures.  Acquire a write-lock on _nslock while continuing
-	 * to hold _nsconflock.  Acquiring a write-lock blocks while
-	 * waiting for other threads already holding a read-lock to clear.
-	 * We hold _nsconflock for the duration, and update the time stamp
-	 * at the end of the update operation, at which time we release
-	 * both locks.
-	 */
-	rwlock_wrlock(&_nslock);
-
-	_nsyyin = fopen(_PATH_NS_CONF, "re");
-	if (_nsyyin == NULL) {
-		/*
-		 * Unable to open nsswitch.conf; behave as though the
-		 * stat() above failed.  Even though we have already
-		 * updated _nsconfmod, if the file reappears, the
-		 * mtime will change.
-		 */
-		goto out;
-	}
-
-	_NSVECT_FREE(_nsmap, &_nsmapsize, sizeof(*_nsmap),
-	    (_nsvect_free_elem) _nsdbtfree);
-	_NSVECT_FREE(_nsmod, &_nsmodsize, sizeof(*_nsmod),
-	    (_nsvect_free_elem) _nsmodfree);
-
-	_nsloadbuiltin();
-
-	_nsyyparse();
-	(void) fclose(_nsyyin);
-	if (_nsmapsize != 0)
-		qsort(_nsmap, _nsmapsize, sizeof(*_nsmap), _nsdbtcmp);
-
-	_nsconfmod = statbuf.st_mtime;
-
- out:
-	rwlock_unlock(&_nslock);
-	mutex_unlock(&_nsconflock);
-	return (0);
-}
-
-static nss_method
-_nsmethod(const char *source, const char *database, const char *method,
-    const ns_dtab disp_tab[], void **cb_data)
-{
-	int	curdisp;
-	ns_mod	*mod, modkey;
-	ns_mtab	*mtab, mtabkey;
-
-	if (disp_tab != NULL) {
-		for (curdisp = 0; disp_tab[curdisp].src != NULL; curdisp++) {
-			if (strcasecmp(source, disp_tab[curdisp].src) == 0) {
-				*cb_data = disp_tab[curdisp].cb_data;
-				return (disp_tab[curdisp].callback);
-			}
-		}
-	}
-
-	modkey.name = source;
-	mod = bsearch(&modkey, _nsmod, _nsmodsize, sizeof(*_nsmod),
-	    _nsmodcmp);
-	if (mod != NULL && mod->handle != NULL) {
-		mtabkey.database = database;
-		mtabkey.name = method;
-		mtab = bsearch(&mtabkey, mod->mtab, mod->mtabsize,
-		    sizeof(mod->mtab[0]), _nsmtabcmp);
-		if (mtab != NULL) {
-			*cb_data = mtab->mdata;
-			return (mtab->method);
-		}
-	}
-
-	*cb_data = NULL;
-	return (NULL);
-}
-
-int
-/*ARGSUSED*/
-nsdispatch(void *retval, const ns_dtab disp_tab[], const char *database,
-	    const char *method, const ns_src defaults[], ...)
-{
-	static int	 _nsdispatching;
-#ifdef _REENTRANT
-	struct _ns_drec	 drec, *ldrec;
-#endif
-	va_list		 ap;
-	int		 i, result;
-	ns_dbt		 key;
-	const ns_dbt	*dbt;
-	const ns_src	*srclist;
-	int		 srclistsize;
-	nss_method	 cb;
-	void		*cb_data;
-
-	/* retval may be NULL */
-	/* disp_tab may be NULL */
-	_DIAGASSERT(database != NULL);
-	_DIAGASSERT(method != NULL);
-	_DIAGASSERT(defaults != NULL);
-	if (database == NULL || method == NULL || defaults == NULL)
-		return (NS_UNAVAIL);
-
-	/*
-	 * In both the threaded and non-threaded cases, avoid reloading
-	 * the configuration if the current thread is already running
-	 * nsdispatch() (i.e. recursive call).
-	 *
-	 * In the non-threaded case, this avoids changing the data structures
-	 * while we're using them.
-	 *
-	 * In the threaded case, this avoids trying to take a write lock
-	 * while the current thread holds a read lock (which would result
-	 * in deadlock).
-	 */
-#ifdef _REENTRANT
-	if (__isthreaded) {
-		drec.thr = thr_self();
-		mutex_lock(&_ns_drec_lock);
-		LIST_FOREACH(ldrec, &_ns_drec, list) {
-			if (ldrec->thr == drec.thr)
-				break;
-		}
-		LIST_INSERT_HEAD(&_ns_drec, &drec, list);
-		mutex_unlock(&_ns_drec_lock);
-		if (ldrec == NULL && _nsconfigure()) {
-			mutex_lock(&_ns_drec_lock);
-			LIST_REMOVE(&drec, list);
-			mutex_unlock(&_ns_drec_lock);
-			return (NS_UNAVAIL);
-		}
-	} else
-#endif /* _REENTRANT */
-	if (_nsdispatching++ == 0 && _nsconfigure()) {
-		_nsdispatching--;
-		return (NS_UNAVAIL);
-	}
-
-	rwlock_rdlock(&_nslock);
-
-	key.name = database;
-	dbt = bsearch(&key, _nsmap, _nsmapsize, sizeof(*_nsmap), _nsdbtcmp);
-	if (dbt != NULL) {
-		srclist = dbt->srclist;
-		srclistsize = dbt->srclistsize;
-	} else {
-		srclist = defaults;
-		srclistsize = 0;
-		while (srclist[srclistsize].name != NULL)
-			srclistsize++;
-	}
-	result = 0;
-
-	for (i = 0; i < srclistsize; i++) {
-		cb = _nsmethod(srclist[i].name, database, method,
-		    disp_tab, &cb_data);
-		result = 0;
-		if (cb != NULL) {
-			va_start(ap, defaults);
-			result = (*cb)(retval, cb_data, ap);
-			va_end(ap);
-			if (defaults[0].flags & NS_FORCEALL)
-				continue;
-			if (result & srclist[i].flags)
-				break;
-		}
-	}
-	result &= NS_STATUSMASK;	/* clear private flags in result */
-
-	rwlock_unlock(&_nslock);
-
-#ifdef _REENTRANT
-	if (__isthreaded) {
-		mutex_lock(&_ns_drec_lock);
-		LIST_REMOVE(&drec, list);
-		mutex_unlock(&_ns_drec_lock);
-	} else
-#endif /* _REENTRANT */
-		_nsdispatching--;
-
-	return (result ? result : NS_NOTFOUND);
-}
diff --git a/lib/libc/net/nslexer.l b/lib/libc/net/nslexer.l
deleted file mode 100644
index 4c15aef7a..000000000
--- a/lib/libc/net/nslexer.l
+++ /dev/null
@@ -1,108 +0,0 @@
-%{
-/*	$NetBSD: nslexer.l,v 1.13 2012/06/25 22:32:45 abs Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nslexer.l,v 1.13 2012/06/25 22:32:45 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <ctype.h>
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <string.h>
-#include <syslog.h>
-
-#include "nsparser.h"
-
-%}
-
-%option yylineno nounput noinput
-%option never-interactive
-
-BLANK		[ \t]
-CR		\n
-STRING		[a-zA-Z][a-zA-Z0-9_]*
-
-%%
-
-{BLANK}+	;			/* skip whitespace */
-
-#.*		;			/* skip comments */
-
-\\{CR}		;			/* allow continuation */
-
-{CR}		return NL;
-
-[sS][uU][cC][cC][eE][sS][sS]		return SUCCESS;
-[uU][nN][aA][vV][aA][iI][lL]		return UNAVAIL;
-[nN][oO][tT][fF][oO][uU][nN][dD]	return NOTFOUND;
-[tT][rR][yY][aA][gG][aA][iI][nN]	return TRYAGAIN;
-
-[rR][eE][tT][uU][rR][nN]		return RETURN;
-[cC][oO][nN][tT][iI][nN][uU][eE]	return CONTINUE;
-
-{STRING}	{
-			char *p;
-			size_t i;
-
-			if ((p = strdup(yytext)) == NULL) {
-				syslog(LOG_ERR, "libc nsdispatch: %m");
-				return NL;
-			}
-
-			for (i = 0; i < strlen(p); i++) {
-				if (isupper((unsigned char)p[i]))
-					p[i] = tolower((unsigned char)p[i]);
-			}
-			_nsyylval.str = p;
-			return STRING;
-		}
-
-.		return yytext[0];
-
-%%
-
-#undef _nsyywrap
-int
-_nsyywrap(void)
-{
-	return 1;
-} /* _nsyywrap */
-
-void
-_nsyyerror(const char *msg)
-{
-
-	 syslog(LOG_WARNING, "libc nsdispatch: %s line %d: %s at '%s'",
-	    _PATH_NS_CONF, yylineno, msg, yytext);
-} /* _nsyyerror */
diff --git a/lib/libc/net/nsparser.y b/lib/libc/net/nsparser.y
deleted file mode 100644
index 4156d6264..000000000
--- a/lib/libc/net/nsparser.y
+++ /dev/null
@@ -1,191 +0,0 @@
-%{
-/*	$NetBSD: nsparser.y,v 1.12 2012/03/20 17:44:18 matt Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nsparser.y,v 1.12 2012/03/20 17:44:18 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <stdio.h>
-#include <string.h>
-#include <syslog.h>
-
-
-static	void	_nsaddsrctomap(const char *);
-
-static	ns_dbt		curdbt;
-static	ns_src		cursrc;
-
-extern char *	_nsyytext;
-extern int _nsyylineno;
-%}
-
-%union {
-	char *str;
-	int   mapval;
-}
-
-%token	NL
-%token	SUCCESS UNAVAIL NOTFOUND TRYAGAIN
-%token	RETURN CONTINUE
-%token	<str> STRING
-
-%type	<mapval> Status Action
-
-%%
-
-File
-	:	/* empty */
-	| Lines
-	;
-
-Lines
-	: Entry
-	| Lines Entry
-	;
-
-Entry
-	: NL
-	| Database ':' NL
-	| Database ':' Srclist NL
-		{
-			int lineno;
-
-			lineno = _nsyylineno - (*_nsyytext == '\n' ? 1 : 0);
-			if (_nsdbtput(&curdbt) == -1)
-				syslog(LOG_WARNING,
-				    "libc nsdispatch: %s line %d: %s",
-				    _PATH_NS_CONF, lineno,
-				    "error adding entry");
-		}
-	| error NL
-		{
-			yyerrok;
-		}
-	;
-
-Database
-	: STRING
-		{
-			curdbt.name = yylval.str;
-			curdbt.srclist = NULL;
-			curdbt.srclistsize = 0;
-		}
-	;
-
-Srclist
-	: Item
-	| Srclist Item
-	;
-
-Item
-	: STRING
-		{
-			cursrc.flags = NS_SUCCESS;
-			_nsaddsrctomap($1);
-		}
-	| STRING '[' { cursrc.flags = NS_SUCCESS; } Criteria ']'
-		{
-			_nsaddsrctomap($1);
-		}
-	;
-
-Criteria
-	: Criterion
-	| Criteria Criterion
-	;
-
-Criterion
-	: Status '=' Action
-		{
-			if ($3)		/* if action == RETURN set RETURN bit */
-				cursrc.flags |= $1;  
-			else		/* else unset it */
-				cursrc.flags &= ~$1;
-		}
-	;
-
-Status
-	: SUCCESS	{ $$ = NS_SUCCESS; }
-	| UNAVAIL	{ $$ = NS_UNAVAIL; }
-	| NOTFOUND	{ $$ = NS_NOTFOUND; }
-	| TRYAGAIN	{ $$ = NS_TRYAGAIN; }
-	;
-
-Action
-	: RETURN	{ $$ = 1L; }
-	| CONTINUE	{ $$ = 0L; }
-	;
-
-%%
-
-static void
-_nsaddsrctomap(const char *elem)
-{
-	unsigned int	i;
-	int		lineno;
-
-	_DIAGASSERT(elem != NULL);
-
-	lineno = _nsyylineno - (*_nsyytext == '\n' ? 1 : 0);
-	if (curdbt.srclistsize > 0) {
-		if ((strcasecmp(elem, NSSRC_COMPAT) == 0) ||
-		    (strcasecmp(curdbt.srclist[0].name, NSSRC_COMPAT) == 0)) {
-			syslog(LOG_WARNING,
-			    "libc nsdispatch: %s line %d: %s",
-			    _PATH_NS_CONF, lineno,
-			    "'compat' used with other sources");
-			return;
-		}
-	}
-	for (i = 0; i < curdbt.srclistsize; i++) {
-		if (strcasecmp(curdbt.srclist[i].name, elem) == 0) {
-			syslog(LOG_WARNING,
-			    "libc nsdispatch: %s line %d: %s '%s'",
-			    _PATH_NS_CONF, lineno,
-			    "duplicate source", elem);
-			return;
-		}
-	}
-	cursrc.name = elem;
-	if (_nsdbtaddsrc(&curdbt, &cursrc) == -1) {
-		syslog(LOG_WARNING,
-		    "libc nsdispatch: %s line %d: %s '%s'",
-		    _PATH_NS_CONF, lineno,
-		    "error adding", elem);
-	}
-}
diff --git a/lib/libc/net/protoent.h b/lib/libc/net/protoent.h
deleted file mode 100644
index 4c98a64f3..000000000
--- a/lib/libc/net/protoent.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: protoent.h,v 1.2 2008/04/28 20:23:00 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-
-struct protoent_data {
-        FILE *fp;
-	struct protoent proto;
-	char **aliases;
-	size_t maxaliases;
-	int stayopen;
-	char *line;
-	void *dummy;
-};
-
-struct protoent	*getprotoent_r(struct protoent *, struct protoent_data *);
-struct protoent	*getprotobyname_r(const char *,
-    struct protoent *, struct protoent_data *);
-struct protoent	*getprotobynumber_r(int,
-    struct protoent *, struct protoent_data *);
-void setprotoent_r(int, struct protoent_data *);
-void endprotoent_r(struct protoent_data *);
diff --git a/lib/libc/net/rcmd.3 b/lib/libc/net/rcmd.3
deleted file mode 100644
index 41b8ef0ed..000000000
--- a/lib/libc/net/rcmd.3
+++ /dev/null
@@ -1,311 +0,0 @@
-.\"	$NetBSD: rcmd.3,v 1.28 2010/03/22 19:30:54 joerg Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)rcmd.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd March 30, 2005
-.Dt RCMD 3
-.Os
-.Sh NAME
-.Nm rcmd ,
-.Nm orcmd ,
-.Nm rcmd_af ,
-.Nm orcmd_af ,
-.Nm rresvport ,
-.Nm rresvport_af ,
-.Nm iruserok ,
-.Nm ruserok ,
-.Nm iruserok_sa
-.Nd routines for returning a stream to a remote command
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn rcmd "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p"
-.Ft int
-.Fn orcmd "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p"
-.Ft int
-.Fn rcmd_af "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p" "int af"
-.Ft int
-.Fn orcmd_af "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p" "int af"
-.Ft int
-.Fn rresvport "int *port"
-.Ft int
-.Fn rresvport_af "int *port" "int family"
-.Ft int
-.Fn iruserok "uint32_t raddr" "int superuser" "const char *ruser" "const char *luser"
-.Ft int
-.Fn ruserok "const char *rhost" "int superuser" "const char *ruser" "const char *luser"
-.Ft int
-.Fn iruserok_sa "const void *raddr" "int rlen" "int superuser" "const char *ruser" "const char *luser"
-.Sh DESCRIPTION
-The
-.Fn rcmd
-function is available for use by anyone to run commands on a
-remote system.  It acts like the
-.Fn orcmd
-command, with the exception that it makes a call out to the
-.Xr rcmd 1
-command, or any other user-specified command, to perform the
-actual connection (thus not requiring
-that the caller be running as the super-user), and is only
-available for the
-.Dq shell/tcp
-port.
-The
-.Fn orcmd
-function
-is used by the super-user to execute a command on
-a remote machine using an authentication scheme based
-on reserved port numbers.
-While
-.Fn rcmd
-and
-.Fn orcmd
-can only handle IPv4 address in the first argument,
-.Fn rcmd_af
-and
-.Fn orcmd_af
-can handle other cases as well.
-The
-.Fn rresvport
-function
-returns a descriptor to a socket
-with an address in the privileged port space.
-The
-.Fn rresvport_af
-function is similar to
-.Fn rresvport ,
-but you can explicitly specify the address family to use.
-Calling
-.Fn rresvport_af
-with
-.Dv AF_INET
-has the same effect as
-.Fn rresvport .
-The
-.Fn iruserok
-and
-.Fn ruserok
-functions are used by servers
-to authenticate clients requesting service with
-.Fn rcmd .
-All six functions are present in the same file and are used
-by the
-.Xr rshd 8
-server (among others).
-.Fn iruserok_sa
-is an address family independent variant of
-.Fn iruserok .
-.Pp
-The
-.Fn rcmd
-function
-looks up the host
-.Fa *ahost
-using
-.Xr gethostbyname 3 ,
-returning \-1 if the host does not exist.
-Otherwise
-.Fa *ahost
-is set to the standard name of the host
-and a connection is established to a server
-residing at the well-known Internet port
-.Fa inport .
-.Pp
-If the connection succeeds,
-a socket in the Internet domain of type
-.Dv SOCK_STREAM
-is returned to the caller, and given to the remote
-command as
-.Em stdin
-and
-.Em stdout .
-If
-.Fa fd2p
-is non-zero, then an auxiliary channel to a control
-process will be set up, and a descriptor for it will be placed
-in
-.Fa *fd2p .
-The control process will return diagnostic
-output from the command (unit 2) on this channel, and will also
-accept bytes on this channel as being
-.Ux
-signal numbers, to be
-forwarded to the process group of the command.
-If
-.Fa fd2p
-is 0, then the
-.Em stderr
-(unit 2 of the remote
-command) will be made the same as the
-.Em stdout
-and no
-provision is made for sending arbitrary signals to the remote process,
-although you may be able to get its attention by using out-of-band data.
-.Pp
-.Fn rcmd_af
-and
-.Fn orcmd_af
-take address family in the last argument.
-If the last argument is
-.Dv PF_UNSPEC ,
-interpretation of
-.Fa *ahost
-will obey the underlying address resolution like DNS.
-.Pp
-The protocol is described in detail in
-.Xr rshd 8 .
-.Pp
-The
-.Fn rresvport
-and
-.Fn rresvport_af
-functions are used to obtain a socket with a privileged
-address bound to it.  This socket is suitable for use
-by
-.Fn rcmd
-and several other functions.  Privileged Internet ports are those
-in the range 0 to 1023.  Only the super-user
-is allowed to bind an address of this sort to a socket.
-.Pp
-The
-.Fn iruserok
-and
-.Fn ruserok
-functions take a remote host's IP address or name, respectively,
-two user names and a flag indicating whether the local user's
-name is that of the super-user.
-Then, if the user is
-.Em NOT
-the super-user, it checks the
-.Pa /etc/hosts.equiv
-file.
-If that lookup is not done, or is unsuccessful, the
-.Pa .rhosts
-in the local user's home directory is checked to see if the request for
-service is allowed.
-.Pp
-If this file does not exist, is not a regular file, is owned by anyone
-other than the user or the super-user, or is writable by anyone other
-than the owner, the check automatically fails.
-Zero is returned if the machine name is listed in the
-.Dq Pa hosts.equiv
-file, or the host and remote user name are found in the
-.Dq Pa .rhosts
-file; otherwise
-.Fn iruserok
-and
-.Fn ruserok
-return \-1.
-If the local domain (as obtained from
-.Xr gethostname 3 )
-is the same as the remote domain, only the machine name need be specified.
-.Pp
-If the IP address of the remote host is known,
-.Fn iruserok
-should be used in preference to
-.Fn ruserok ,
-as it does not require trusting the DNS server for the remote host's domain.
-.Pp
-While
-.Fn iruserok
-can handle IPv4 addresses only,
-.Fn iruserok_sa
-and
-.Fn ruserok
-can handle other address families as well, like IPv6.
-The first argument of
-.Fn iruserok_sa
-is typed as
-.Fa "void *"
-to avoid dependency between
-.In unistd.h
-and
-.In sys/socket.h .
-.Sh ENVIRONMENT
-.Bl -tag -width RCMD_CMDxx -compact
-.It Ev RCMD_CMD
-When using the
-.Fn rcmd
-function, this variable is used as the program to run instead of
-.Xr rcmd 1 .
-.El
-.Sh DIAGNOSTICS
-The
-.Fn rcmd
-function
-returns a valid socket descriptor on success.
-It returns \-1 on error and prints a diagnostic message on the standard error.
-.Pp
-The
-.Fn rresvport
-and
-.Fn rresvport_af
-function
-return a valid, bound socket descriptor on success.
-They return \-1 on error with the global value
-.Va errno
-set according to the reason for failure.
-The error code
-.Dv EAGAIN
-is overloaded to mean ``All network ports in use.''
-.Sh SEE ALSO
-.Xr rcmd 1 ,
-.Xr rlogin 1 ,
-.Xr rsh 1 ,
-.Xr intro 2 ,
-.Xr rexec 3 ,
-.Xr hosts.equiv 5 ,
-.Xr rhosts 5 ,
-.Xr rexecd 8 ,
-.Xr rlogind 8 ,
-.Xr rshd 8
-.Sh HISTORY
-The
-.Fn orcmd ,
-.Fn rresvport ,
-.Fn iruserok
-and
-.Fn ruserok
-functions appeared in
-.Bx 4.2 ,
-where the
-.Fn orcmd
-function was called
-.Fn rcmd .
-The (newer)
-.Fn rcmd
-function appeared in
-.Nx 1.3 .
-.Fn rcmd_af
-and
-.Fn rresvport_af
-were defined in RFC2292.
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
deleted file mode 100644
index cacb7075a..000000000
--- a/lib/libc/net/rcmd.c
+++ /dev/null
@@ -1,1021 +0,0 @@
-/*	$NetBSD: rcmd.c,v 1.71 2014/11/26 23:44:21 enami Exp $	*/
-
-/*
- * Copyright (c) 1983, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
-#else
-__RCSID("$NetBSD: rcmd.c,v 1.71 2014/11/26 23:44:21 enami Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef _LIBC
-#include "namespace.h"
-#endif
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/poll.h>
-#include <sys/wait.h>
-
-#include <netinet/in.h>
-#if !defined(__minix)
-#include <rpc/rpc.h>
-#endif /* !defined(__minix) */
-#include <arpa/inet.h>
-#include <netgroup.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <netdb.h>
-#include <paths.h>
-#include <pwd.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-
-#include "pathnames.h"
-
-int	orcmd(char **, u_int, const char *, const char *, const char *, int *);
-int	orcmd_af(char **, u_int, const char *, const char *, const char *,
-    int *, int);
-int	__ivaliduser(FILE *, u_int32_t, const char *, const char *);
-int	__ivaliduser_sa(FILE *, const struct sockaddr *, socklen_t,
-    const char *, const char *);
-static	int rshrcmd(int, char **, u_int32_t, const char *,
-    const char *, const char *, int *, const char *);
-static	int resrcmd(struct addrinfo *, char **, u_int32_t, const char *,
-    const char *, const char *, int *);
-static	int __icheckhost(const struct sockaddr *, socklen_t,
-    const char *);
-static	char *__gethostloop(const struct sockaddr *, socklen_t);
-
-int
-rcmd(char **ahost, int rport, const char *locuser, const char *remuser,
-    const char *cmd, int *fd2p)
-{
-
-	return rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, AF_INET);
-}
-
-int
-rcmd_af(char **ahost, int rport, const char *locuser, const char *remuser,
-    const char *cmd, int *fd2p, int af)
-{
-	static char hbuf[MAXHOSTNAMELEN];
-	char pbuf[NI_MAXSERV];
-	struct addrinfo hints, *res;
-	int error;
-	struct servent *sp;
-
-	_DIAGASSERT(ahost != NULL);
-	_DIAGASSERT(locuser != NULL);
-	_DIAGASSERT(remuser != NULL);
-	_DIAGASSERT(cmd != NULL);
-	/* fd2p may be NULL */
-
-	snprintf(pbuf, sizeof(pbuf), "%u", ntohs(rport));
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = af;
-	hints.ai_socktype = SOCK_STREAM;
-	hints.ai_flags = AI_CANONNAME;
-	error = getaddrinfo(*ahost, pbuf, &hints, &res);
-	if (error) {
-		warnx("%s: %s", *ahost, gai_strerror(error));	/*XXX*/
-		return -1;
-	}
-	if (res->ai_canonname) {
-		/*
-		 * Canonicalise hostname.
-		 * XXX: Should we really do this?
-		 */
-		strlcpy(hbuf, res->ai_canonname, sizeof(hbuf));
-		*ahost = hbuf;
-	}
-
-	/*
-	 * Check if rport is the same as the shell port, and that the fd2p.  If
-	 * it is not, the program isn't expecting 'rsh' and so we can't use the
-	 * RCMD_CMD environment.
-	 */
-	sp = getservbyname("shell", "tcp");
-	if (sp != NULL && sp->s_port == rport)
-		error = rshrcmd(af, ahost, (u_int32_t)rport,
-		    locuser, remuser, cmd, fd2p, getenv("RCMD_CMD"));
-	else
-		error = resrcmd(res, ahost, (u_int32_t)rport,
-		    locuser, remuser, cmd, fd2p);
-	freeaddrinfo(res);
-	return error;
-}
-
-/* this is simply a wrapper around hprcmd() that handles ahost first */
-int
-orcmd(char **ahost, u_int rport, const char *locuser, const char *remuser,
-    const char *cmd, int *fd2p)
-{
-	return orcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, AF_INET);
-}
-
-int
-orcmd_af(char **ahost, u_int rport, const char *locuser, const char *remuser,
-    const char *cmd, int *fd2p, int af)
-{
-	static char hbuf[MAXHOSTNAMELEN];
-	char pbuf[NI_MAXSERV];
-	struct addrinfo hints, *res;
-	int error;
-
-	_DIAGASSERT(ahost != NULL);
-	_DIAGASSERT(locuser != NULL);
-	_DIAGASSERT(remuser != NULL);
-	_DIAGASSERT(cmd != NULL);
-	/* fd2p may be NULL */
-
-	snprintf(pbuf, sizeof(pbuf), "%u", ntohs(rport));
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = af;
-	hints.ai_socktype = SOCK_STREAM;
-	hints.ai_flags = AI_CANONNAME;
-	error = getaddrinfo(*ahost, pbuf, &hints, &res);
-	if (error) {
-		warnx("%s: %s", *ahost, gai_strerror(error));	/*XXX*/
-		return -1;
-	}
-	if (res->ai_canonname) {
-		strlcpy(hbuf, res->ai_canonname, sizeof(hbuf));
-		*ahost = hbuf;
-	}
-	
-	error = resrcmd(res, ahost, rport, locuser, remuser, cmd, fd2p);
-	freeaddrinfo(res);
-	return error;
-}
-
-/*ARGSUSED*/
-static int
-resrcmd(struct addrinfo *res, char **ahost, u_int32_t rport,
-    const char *locuser, const char *remuser, const char *cmd, int *fd2p)
-{
-	struct addrinfo *r;
-	struct sockaddr_storage from;
-	struct pollfd reads[2];
-	sigset_t nmask, omask;
-	pid_t pid;
-	int s, lport, timo;
-	int pollr;
-	char c;
-	int refused;
-
-	_DIAGASSERT(res != NULL);
-	_DIAGASSERT(ahost != NULL);
-	_DIAGASSERT(locuser != NULL);
-	_DIAGASSERT(remuser != NULL);
-	_DIAGASSERT(cmd != NULL);
-	/* fd2p may be NULL */
-
-	r = res;
-	refused = 0;
-	pid = getpid();
-	sigemptyset(&nmask);
-	sigaddset(&nmask, SIGURG);
-	if (sigprocmask(SIG_BLOCK, &nmask, &omask) == -1)
-		return -1;
-	for (timo = 1, lport = IPPORT_RESERVED - 1;;) {
-		s = rresvport_af(&lport, r->ai_family);
-		if (s < 0) {
-			if (errno == EAGAIN)
-				warnx("rcmd: socket: All ports in use");
-			else
-				warn("rcmd: socket");
-			if (r->ai_next) {
-				r = r->ai_next;
-				continue;
-			} else {
-				(void)sigprocmask(SIG_SETMASK, &omask, NULL);
-				return -1;
-			}
-		}
-		fcntl(s, F_SETOWN, pid);
-		if (connect(s, r->ai_addr, r->ai_addrlen) >= 0)
-			break;
-		(void)close(s);
-		if (errno == EADDRINUSE) {
-			lport--;
-			continue;
-		} else if (errno == ECONNREFUSED)
-			refused++;
-		if (r->ai_next) {
-			int oerrno = errno;
-			char hbuf[NI_MAXHOST];
-			const int niflags = NI_NUMERICHOST;
-
-			hbuf[0] = '\0';
-			if (getnameinfo(r->ai_addr, r->ai_addrlen,
-			    hbuf, (socklen_t)sizeof(hbuf), NULL, 0, niflags) !=
-			    0)
-				strlcpy(hbuf, "(invalid)", sizeof(hbuf));
-			errno = oerrno;
-			warn("rcmd: connect to address %s", hbuf);
-			r = r->ai_next;
-			hbuf[0] = '\0';
-			if (getnameinfo(r->ai_addr, r->ai_addrlen,
-			    hbuf, (socklen_t)sizeof(hbuf), NULL, 0, niflags) !=
-			    0)
-				strlcpy(hbuf, "(invalid)", sizeof(hbuf));
-			(void)fprintf(stderr, "Trying %s...\n", hbuf);
-			continue;
-		}
-		if (refused && timo <= 16) {
-			(void)sleep((unsigned int)timo);
-			timo *= 2;
-			r = res;
-			refused = 0;
-			continue;
-		}
-		(void)fprintf(stderr, "%s: %s\n", res->ai_canonname,
-		    strerror(errno));
-		(void)sigprocmask(SIG_SETMASK, &omask, NULL);
-		return -1;
-	}
-	lport--;
-	if (fd2p == 0) {
-		write(s, "", 1);
-		lport = 0;
-	} else {
-		char num[8];
-		int s2 = rresvport_af(&lport, r->ai_family), s3;
-		socklen_t len = sizeof(from);
-
-		if (s2 < 0)
-			goto bad;
-		listen(s2, 1);
-		(void)snprintf(num, sizeof(num), "%d", lport);
-		if (write(s, num, strlen(num) + 1) !=
-		    (ssize_t) (strlen(num) + 1)) {
-			warn("rcmd: write (setting up stderr)");
-			(void)close(s2);
-			goto bad;
-		}
-		reads[0].fd = s;
-		reads[0].events = POLLIN;
-		reads[1].fd = s2;
-		reads[1].events = POLLIN;
-		errno = 0;
-		pollr = poll(reads, 2, INFTIM);
-		if (pollr < 1 || (reads[1].revents & POLLIN) == 0) {
-			if (errno != 0)
-				warn("poll: setting up stderr");
-			else
-				warnx(
-				    "poll: protocol failure in circuit setup");
-			(void)close(s2);
-			goto bad;
-		}
-		s3 = accept(s2, (struct sockaddr *)(void *)&from, &len);
-		(void)close(s2);
-		if (s3 < 0) {
-			warn("rcmd: accept");
-			lport = 0;
-			goto bad;
-		}
-		*fd2p = s3;
-		switch (((struct sockaddr *)(void *)&from)->sa_family) {
-		case AF_INET:
-#ifdef INET6
-		case AF_INET6:
-#endif
-			if (getnameinfo((struct sockaddr *)(void *)&from, len,
-			    NULL, 0, num, (socklen_t)sizeof(num),
-			    NI_NUMERICSERV) != 0 ||
-			    (atoi(num) >= IPPORT_RESERVED ||
-			     atoi(num) < IPPORT_RESERVED / 2)) {
-				warnx(
-				"rcmd: protocol failure in circuit setup.");
-				goto bad2;
-			}
-			break;
-		default:
-			break;
-		}
-	}
-
-	(void)write(s, locuser, strlen(locuser)+1);
-	(void)write(s, remuser, strlen(remuser)+1);
-	(void)write(s, cmd, strlen(cmd)+1);
-	if (read(s, &c, 1) != 1) {
-		warn("%s", *ahost);
-		goto bad2;
-	}
-	if (c != 0) {
-		while (read(s, &c, 1) == 1) {
-			(void)write(STDERR_FILENO, &c, 1);
-			if (c == '\n')
-				break;
-		}
-		goto bad2;
-	}
-	(void)sigprocmask(SIG_SETMASK, &omask, NULL);
-	return s;
-bad2:
-	if (lport)
-		(void)close(*fd2p);
-bad:
-	(void)close(s);
-	(void)sigprocmask(SIG_SETMASK, &omask, NULL);
-	return -1;
-}
-
-/*
- * based on code written by Chris Siebenmann <cks@utcc.utoronto.ca>
- */
-/* ARGSUSED */
-static int
-rshrcmd(int af, char **ahost, u_int32_t rport, const char *locuser,
-    const char *remuser, const char *cmd, int *fd2p, const char *rshcmd)
-{
-	pid_t pid;
-	int sp[2], ep[2];
-	char *p;
-	struct passwd *pw, pwres;
-	char pwbuf[1024];
-
-	_DIAGASSERT(ahost != NULL);
-	_DIAGASSERT(locuser != NULL);
-	_DIAGASSERT(remuser != NULL);
-	_DIAGASSERT(cmd != NULL);
-	/* fd2p may be NULL */
-
-	/* What rsh/shell to use. */
-	if (rshcmd == NULL)
-		rshcmd = _PATH_BIN_RCMD;
-
-	/* locuser must exist on this host. */
-	if (getpwnam_r(locuser, &pwres, pwbuf, sizeof(pwbuf), &pw) != 0 ||
-	    pw == NULL) {
-		warnx("%s: unknown user: %s", __func__, locuser);
-		return -1;
-	}
-
-	/* get a socketpair we'll use for stdin and stdout. */
-	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, sp) < 0) {
-		warn("%s: socketpair", __func__);
-		return -1;
-	}
-	/* we will use this for the fd2 pointer */
-	if (fd2p) {
-		if (socketpair(AF_LOCAL, SOCK_STREAM, 0, ep) < 0) {
-			warn("%s: socketpair", __func__);
-			return -1;
-		}
-		*fd2p = ep[0];
-	}
-	
-	pid = fork();
-	if (pid < 0) {
-		warn("%s: fork", __func__);
-		return -1;
-	}
-	if (pid == 0) {
-		/*
-		 * child
-		 * - we use sp[1] to be stdin/stdout, and close sp[0]
-		 * - with fd2p, we use ep[1] for stderr, and close ep[0]
-		 */
-		(void)close(sp[0]);
-		if (dup2(sp[1], 0) < 0 || dup2(0, 1) < 0) {
-			warn("%s: dup2", __func__);
-			_exit(1);
-		}
-		(void)close(sp[1]);
-		if (fd2p) {
-			if (dup2(ep[1], 2) < 0) {
-				warn("%s: dup2", __func__);
-				_exit(1);
-			}
-			(void)close(ep[0]);
-			(void)close(ep[1]);
-		} else if (dup2(0, 2) < 0) {
-			warn("%s: dup2", __func__);
-			_exit(1);
-		}
-		/* fork again to lose parent. */
-		pid = fork();
-		if (pid < 0) {
-			warn("%s: second fork", __func__);
-			_exit(1);
-		}
-		if (pid > 0)
-			_exit(0);
-
-		/* Orphan.  Become local user for rshprog. */
-		if (setuid(pw->pw_uid)) {
-			warn("%s: setuid(%lu)", __func__, (u_long)pw->pw_uid);
-			_exit(1);
-		}
-
-		/*
-		 * If we are rcmd'ing to "localhost" as the same user as we
-		 * are, then avoid running remote shell for efficiency.
-		 */
-		if (strcmp(*ahost, "localhost") == 0 &&
-		    strcmp(locuser, remuser) == 0) {
-			if (pw->pw_shell[0] == '\0')
-				rshcmd = _PATH_BSHELL;
-			else
-				rshcmd = pw->pw_shell;
-			p = strrchr(rshcmd, '/');
-			execlp(rshcmd, p ? p + 1 : rshcmd, "-c", cmd, NULL);
-		} else {
-			const char *program;
-			program = strrchr(rshcmd, '/');
-			program = program ? program + 1 : rshcmd;
-			if (fd2p)
-				/* ask rcmd to relay signal information */
-				setenv("RCMD_RELAY_SIGNAL", "YES", 1);
-			switch (af) {
-			case AF_INET:
-				execlp(rshcmd, program, "-4", "-l", remuser,
-				    *ahost, cmd, NULL);
-				break;
-
-			case AF_INET6:
-				execlp(rshcmd, program, "-6", "-l", remuser,
-				    *ahost, cmd, NULL);
-				break;
-
-			default:
-				/* typically AF_UNSPEC, plus whatever */
-				execlp(rshcmd, program,       "-l", remuser,
-				    *ahost, cmd, NULL);
-				break;
-			}
-		}
-		warn("%s: exec %s", __func__, rshcmd);
-		_exit(1);
-	}
-	/* Parent */
-	(void)close(sp[1]);
-	if (fd2p)
-		(void)close(ep[1]);
-
-	(void)waitpid(pid, NULL, 0);
-	return sp[0];
-}
-
-int
-rresvport(int *alport)
-{
-
-	_DIAGASSERT(alport != NULL);
-
-	return rresvport_af(alport, AF_INET);
-}
-
-int
-rresvport_af(int *alport, int family)
-{
-	return rresvport_af_addr(alport, family, NULL);
-}
-
-int
-rresvport_af_addr(int *alport, int family, void *addr)
-{
-	struct sockaddr_storage ss;
-	struct sockaddr *sa;
-	socklen_t salen;
-	int s;
-	u_int16_t *portp;
-
-	_DIAGASSERT(alport != NULL);
-
-	memset(&ss, 0, sizeof(ss));
-	sa = (struct sockaddr *)(void *)&ss;
-	switch (family) {
-	case AF_INET:
-#ifdef BSD4_4
-		sa->sa_len =
-#endif
-		salen = sizeof(struct sockaddr_in);
-		if (addr)
-			((struct sockaddr_in *)(void *)sa)->sin_addr =
-			    ((struct sockaddr_in *)addr)->sin_addr;
-		portp = &((struct sockaddr_in *)(void *)sa)->sin_port;
-		break;
-#ifdef INET6
-	case AF_INET6:
-#ifdef BSD4_4
-		sa->sa_len =
-#endif
-		salen = sizeof(struct sockaddr_in6);
-		if (addr)
-			((struct sockaddr_in6 *)(void *)sa)->sin6_addr =
-			    ((struct sockaddr_in6 *)addr)->sin6_addr;
-		portp = &((struct sockaddr_in6 *)(void *)sa)->sin6_port;
-		break;
-#endif
-	default:
-		errno = EAFNOSUPPORT;
-		return -1;
-	}
-	sa->sa_family = family;
-	s = socket(family, SOCK_STREAM, 0);
-	if (s < 0)
-		return -1;
-#if defined(BSD4_4) && !defined(__minix)
-	switch (family) {
-	case AF_INET:
-	case AF_INET6:
-		*portp = 0;
-		if (bindresvport(s, (struct sockaddr_in *)(void *)sa) < 0) {
-			int sverr = errno;
-
-			(void)close(s);
-			errno = sverr;
-			return -1;
-		}
-		*alport = (int)ntohs(*portp);
-		return s;
-	default:
-		/* is it necessary to try keep code for other AFs? */
-		break;
-	}
-#endif
-	for (;;) {
-		*portp = htons((u_short)*alport);
-		if (bind(s, sa, salen) >= 0)
-			return s;
-		if (errno != EADDRINUSE) {
-			(void)close(s);
-			return -1;
-		}
-		(*alport)--;
-		if (*alport == IPPORT_RESERVED/2) {
-			(void)close(s);
-			errno = EAGAIN;		/* close */
-			return -1;
-		}
-	}
-}
-
-int	__check_rhosts_file = 1;
-const char *__rcmd_errstr;
-
-int
-ruserok(const char *rhost, int superuser, const char *ruser, const char *luser)
-{
-	struct addrinfo hints, *res, *r;
-	int error;
-
-	_DIAGASSERT(rhost != NULL);
-	_DIAGASSERT(ruser != NULL);
-	_DIAGASSERT(luser != NULL);
-
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = PF_UNSPEC;
-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-	error = getaddrinfo(rhost, "0", &hints, &res);
-	if (error)
-		return -1;
-
-	for (r = res; r; r = r->ai_next) {
-		if (iruserok_sa(r->ai_addr, (int)r->ai_addrlen, superuser,
-		    ruser, luser) == 0) {
-			freeaddrinfo(res);
-			return 0;
-		}
-	}
-	freeaddrinfo(res);
-	return -1;
-}
-
-/*
- * New .rhosts strategy: We are passed an ip address. We spin through
- * hosts.equiv and .rhosts looking for a match. When the .rhosts only
- * has ip addresses, we don't have to trust a nameserver.  When it
- * contains hostnames, we spin through the list of addresses the nameserver
- * gives us and look for a match.
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-iruserok(u_int32_t raddr, int superuser, const char *ruser, const char *luser)
-{
-	struct sockaddr_in irsin;
-
-	memset(&irsin, 0, sizeof(irsin));
-	irsin.sin_family = AF_INET;
-#ifdef BSD4_4
-	irsin.sin_len = sizeof(irsin);
-#endif
-	memcpy(&irsin.sin_addr, &raddr, sizeof(irsin.sin_addr));
-	return iruserok_sa(&irsin, (socklen_t)sizeof(irsin), superuser, ruser,
-	    luser);
-}
-
-/*
- * 2nd and 3rd arguments are typed like this, to avoid dependency between
- * unistd.h and sys/socket.h.  There's no better way.
- */
-int
-iruserok_sa(const void *raddr, int rlen, int superuser, const char *ruser,
-    const char *luser)
-{
-	const struct sockaddr *sa;
-	struct stat sbuf;
-	struct passwd *pwd, pwres;
-	FILE *hostf;
-	uid_t uid;
-	gid_t gid;
-	int isvaliduser;
-	char pbuf[MAXPATHLEN];
-	char pwbuf[1024];
-
-	_DIAGASSERT(raddr != NULL);
-	_DIAGASSERT(ruser != NULL);
-	_DIAGASSERT(luser != NULL);
-
-	sa = raddr;
-
-	__rcmd_errstr = NULL;
-
-	hostf = superuser ? NULL : fopen(_PATH_HEQUIV, "re");
-
-	if (hostf) {
-		if (__ivaliduser_sa(hostf, sa, (socklen_t)rlen, luser,
-		    ruser) == 0) {
-			(void)fclose(hostf);
-			return 0;
-		}
-		(void)fclose(hostf);
-	}
-
-	isvaliduser = -1;
-	if (__check_rhosts_file || superuser) {
-
-		if (getpwnam_r(luser, &pwres, pwbuf, sizeof(pwbuf), &pwd) != 0
-		    || pwd == NULL)
-			return -1;
-		(void)strlcpy(pbuf, pwd->pw_dir, sizeof(pbuf));
-		(void)strlcat(pbuf, "/.rhosts", sizeof(pbuf));
-
-		/*
-		 * Change effective uid while opening and reading .rhosts.
-		 * If root and reading an NFS mounted file system, can't
-		 * read files that are protected read/write owner only.
-		 */
-		uid = geteuid();
-		gid = getegid();
-		(void)setegid(pwd->pw_gid);
-		(void)initgroups(pwd->pw_name, pwd->pw_gid);
-		(void)seteuid(pwd->pw_uid);
-		hostf = fopen(pbuf, "re");
-
-		if (hostf != NULL) {
-			/*
-			 * If not a regular file, or is owned by someone other
-			 * than user or root or if writable by anyone but the
-			 * owner, quit.
-			 */
-			if (lstat(pbuf, &sbuf) < 0)
-				__rcmd_errstr = ".rhosts lstat failed";
-			else if (!S_ISREG(sbuf.st_mode))
-				__rcmd_errstr = ".rhosts not regular file";
-			else if (fstat(fileno(hostf), &sbuf) < 0)
-				__rcmd_errstr = ".rhosts fstat failed";
-			else if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid)
-				__rcmd_errstr = "bad .rhosts owner";
-			else if (sbuf.st_mode & (S_IWGRP|S_IWOTH))
-				__rcmd_errstr =
-					".rhosts writable by other than owner";
-			else 
-				isvaliduser =
-				    __ivaliduser_sa(hostf, sa, (socklen_t)rlen,
-						    luser, ruser);
-
-			(void)fclose(hostf);
-		}
-		(void)seteuid(uid);
-		(void)setegid(gid);
-
-	}
-	return isvaliduser;
-}
-
-/*
- * XXX
- * Don't make static, used by lpd(8).  We will be able to change the function
- * into static function, when we bump libc major #.
- *
- * Returns 0 if ok, -1 if not ok.
- */
-#ifdef notdef	/*_LIBC*/
-static
-#endif
-int
-__ivaliduser(FILE *hostf, u_int32_t raddr, const char *luser,
-    const char *ruser)
-{
-	struct sockaddr_in ivusin;
-
-	memset(&ivusin, 0, sizeof(ivusin));
-	ivusin.sin_family = AF_INET;
-#ifdef BSD4_4
-	ivusin.sin_len = sizeof(ivusin);
-#endif
-	memcpy(&ivusin.sin_addr, &raddr, sizeof(ivusin.sin_addr));
-	return __ivaliduser_sa(hostf, (struct sockaddr *)(void *)&ivusin,
-	    (socklen_t)sizeof(ivusin), luser, ruser);
-}
-
-#ifdef notdef	/*_LIBC*/
-static
-#endif
-int
-__ivaliduser_sa(FILE *hostf, const struct sockaddr *raddr, socklen_t salen,
-    const char *luser, const char *ruser)
-{
-	char *user, *p;
-	int ch;
-	char buf[MAXHOSTNAMELEN + 128];		/* host + login */
-	const char *auser, *ahost;
-	int hostok, userok;
-	char *rhost = NULL;
-	int firsttime = 1;
-	char domain[MAXHOSTNAMELEN];
-
-	getdomainname(domain, sizeof(domain));
-
-	_DIAGASSERT(hostf != NULL);
-	_DIAGASSERT(luser != NULL);
-	_DIAGASSERT(ruser != NULL);
-
-	while (fgets(buf, (int)sizeof(buf), hostf)) {
-		p = buf;
-		/* Skip lines that are too long. */
-		if (strchr(p, '\n') == NULL) {
-			while ((ch = getc(hostf)) != '\n' && ch != EOF)
-				;
-			continue;
-		}
-		while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0') {
-			*p = isupper((unsigned char)*p) ?
-			    tolower((unsigned char)*p) : *p;
-			p++;
-		}
-		if (*p == ' ' || *p == '\t') {
-			*p++ = '\0';
-			while (*p == ' ' || *p == '\t')
-				p++;
-			user = p;
-			while (*p != '\n' && *p != ' ' &&
-			    *p != '\t' && *p != '\0')
-				p++;
-		} else
-			user = p;
-		*p = '\0';
-
-		if (p == buf)
-			continue;
-
-		auser = *user ? user : luser;
-		ahost = buf;
-
-		if (ahost[0] == '+')
-			switch (ahost[1]) {
-			case '\0':
-				hostok = 1;
-				break;
-
-			case '@':
-				if (firsttime) {
-					rhost = __gethostloop(raddr, salen);
-					firsttime = 0;
-				}
-				if (rhost)
-					hostok = innetgr(&ahost[2], rhost,
-					    NULL, domain);
-				else
-					hostok = 0;
-				break;
-
-			default:
-				hostok = __icheckhost(raddr, salen, &ahost[1]);
-				break;
-			}
-		else if (ahost[0] == '-')
-			switch (ahost[1]) {
-			case '\0':
-				hostok = -1;
-				break;
-
-			case '@':
-				if (firsttime) {
-					rhost = __gethostloop(raddr, salen);
-					firsttime = 0;
-				}
-				if (rhost)
-					hostok = -innetgr(&ahost[2], rhost,
-					    NULL, domain);
-				else
-					hostok = 0;
-				break;
-
-			default:
-				hostok =
-				    -__icheckhost(raddr, salen, &ahost[1]);
-				break;
-			}
-		else
-			hostok = __icheckhost(raddr, salen, ahost);
-
-
-		if (auser[0] == '+')
-			switch (auser[1]) {
-			case '\0':
-				userok = 1;
-				break;
-
-			case '@':
-				userok = innetgr(&auser[2], NULL, ruser,
-				    domain);
-				break;
-
-			default:
-				userok = strcmp(ruser, &auser[1]) == 0;
-				break;
-			}
-		else if (auser[0] == '-')
-			switch (auser[1]) {
-			case '\0':
-				userok = -1;
-				break;
-
-			case '@':
-				userok = -innetgr(&auser[2], NULL, ruser,
-				    domain);
-				break;
-
-			default:
-				userok =
-				    -(strcmp(ruser, &auser[1]) == 0 ? 1 : 0);
-				break;
-			}
-		else
-			userok = strcmp(ruser, auser) == 0;
-
-		/* Check if one component did not match */
-		if (hostok == 0 || userok == 0)
-			continue;
-
-		/* Check if we got a forbidden pair */
-		if (userok == -1 || hostok == -1)
-			return -1;
-
-		/* Check if we got a valid pair */
-		if (hostok == 1 && userok == 1)
-			return 0;
-	}
-	return -1;
-}
-
-/*
- * Returns "true" if match, 0 if no match.
- */
-static int
-__icheckhost(const struct sockaddr *raddr, socklen_t salen, const char *lhost)
-{
-	struct addrinfo hints, *res, *r;
-	char h1[NI_MAXHOST], h2[NI_MAXHOST];
-	int error;
-	const int niflags = NI_NUMERICHOST;
-
-	_DIAGASSERT(raddr != NULL);
-	_DIAGASSERT(lhost != NULL);
-
-	h1[0] = '\0';
-	if (getnameinfo(raddr, salen, h1, (socklen_t)sizeof(h1), NULL, 0,
-	    niflags) != 0)
-		return 0;
-
-	/* Resolve laddr into sockaddr */
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = raddr->sa_family;
-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-	res = NULL;
-	error = getaddrinfo(lhost, "0", &hints, &res);
-	if (error)
-		return 0;
-
-	/*
-	 * Try string comparisons between raddr and laddr.
-	 */
-	for (r = res; r; r = r->ai_next) {
-		h2[0] = '\0';
-		if (getnameinfo(r->ai_addr, r->ai_addrlen, h2,
-		    (socklen_t)sizeof(h2), NULL, 0, niflags) != 0)
-			continue;
-		if (strcmp(h1, h2) == 0) {
-			freeaddrinfo(res);
-			return 1;
-		}
-	}
-
-	/* No match. */
-	freeaddrinfo(res);
-	return 0;
-}
-
-/*
- * Return the hostname associated with the supplied address.
- * Do a reverse lookup as well for security. If a loop cannot
- * be found, pack the numeric IP address into the string.
- */
-static char *
-__gethostloop(const struct sockaddr *raddr, socklen_t salen)
-{
-	static char remotehost[NI_MAXHOST];
-	char h1[NI_MAXHOST], h2[NI_MAXHOST];
-	struct addrinfo hints, *res, *r;
-	int error;
-	const int niflags = NI_NUMERICHOST;
-
-	_DIAGASSERT(raddr != NULL);
-
-	h1[0] = remotehost[0] = '\0';
-	if (getnameinfo(raddr, salen, remotehost, (socklen_t)sizeof(remotehost),
-	    NULL, 0, NI_NAMEREQD) != 0)
-		return NULL;
-	if (getnameinfo(raddr, salen, h1, (socklen_t)sizeof(h1), NULL, 0,
-	    niflags) != 0)
-		return NULL;
-
-	/*
-	 * Look up the name and check that the supplied
-	 * address is in the list
-	 */
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = raddr->sa_family;
-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-	hints.ai_flags = AI_CANONNAME;
-	res = NULL;
-	error = getaddrinfo(remotehost, "0", &hints, &res);
-	if (error)
-		return NULL;
-
-	for (r = res; r; r = r->ai_next) {
-		h2[0] = '\0';
-		if (getnameinfo(r->ai_addr, r->ai_addrlen, h2,
-		    (socklen_t)sizeof(h2), NULL, 0, niflags) != 0)
-			continue;
-		if (strcmp(h1, h2) == 0) {
-			freeaddrinfo(res);
-			return remotehost;
-		}
-	}
-
-	/*
-	 * either the DNS adminstrator has made a configuration
-	 * mistake, or someone has attempted to spoof us
-	 */
-	syslog(LOG_NOTICE, "rcmd: address %s not listed for host %s",
-	    h1, res->ai_canonname ? res->ai_canonname : remotehost);
-	freeaddrinfo(res);
-	return NULL;
-}
diff --git a/lib/libc/net/recv.c b/lib/libc/net/recv.c
deleted file mode 100644
index deb03d096..000000000
--- a/lib/libc/net/recv.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: recv.c,v 1.10 2012/03/20 17:44:18 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)recv.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: recv.c,v 1.10 2012/03/20 17:44:18 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-
-ssize_t
-recv(int s, void *buf, size_t len, int flags)
-{
-	return (recvfrom(s, buf, len, flags, NULL, NULL));
-}
diff --git a/lib/libc/net/resolver.3 b/lib/libc/net/resolver.3
deleted file mode 100644
index 2e7821e99..000000000
--- a/lib/libc/net/resolver.3
+++ /dev/null
@@ -1,756 +0,0 @@
-.\"	$NetBSD: resolver.3,v 1.28 2013/11/14 00:13:41 wiz Exp $
-.\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
-.\"
-.\" 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.
-.\"
-.\" Copyright (c) 1985, 1995 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms are permitted provided
-.\" that: (1) source distributions retain this entire copyright notice and
-.\" comment, and (2) distributions including binaries display the following
-.\" acknowledgement:  ``This product includes software developed by the
-.\" University of California, Berkeley and its contributors'' in the
-.\" documentation or other materials provided with the distribution and in
-.\" all advertising materials mentioning features or use of this software.
-.\" 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-.\"
-.\"	@(#)resolver.3	6.5 (Berkeley) 6/23/90
-.\"	Id: resolver.man3,v 1.2 2009/01/21 00:12:34 each Exp
-.\"
-.Dd November 13, 2013
-.Dt RESOLVER 3
-.Os
-.Sh NAME
-.Nm res_ninit ,
-.Nm res_ourserver_p ,
-.Nm fp_resstat ,
-.Nm res_hostalias ,
-.Nm res_pquery ,
-.Nm res_nquery ,
-.Nm res_nsearch ,
-.Nm res_nquerydomain ,
-.Nm res_nmkquery ,
-.Nm res_nsend ,
-.Nm res_nupdate ,
-.Nm res_nmkupdate ,
-.Nm res_nclose ,
-.Nm res_nsendsigned ,
-.Nm res_findzonecut ,
-.Nm res_getservers ,
-.Nm res_setservers ,
-.Nm res_ndestroy ,
-.Nm dn_comp ,
-.Nm dn_expand ,
-.\" .Nm hstrerror ,
-.Nm res_init ,
-.Nm res_isourserver ,
-.Nm fp_nquery ,
-.Nm p_query ,
-.Nm hostalias ,
-.Nm res_query ,
-.Nm res_search ,
-.Nm res_querydomain ,
-.Nm res_mkquery ,
-.Nm res_send ,
-.Nm res_update ,
-.Nm res_close ,
-.\" .Nm herror
-.Nd resolver routines
-.Sh LIBRARY
-.Lb libc
-.Lb libresolv
-.Sh SYNOPSIS
-.In resolv.h
-.In res_update.h
-.Vt typedef struct __res_state *res_state ;
-.Pp
-.Ft int
-.Fn res_ninit "res_state statp"
-.Ft int
-.Fn res_ourserver_p "const res_state statp" "const struct sockaddr_in *addr"
-.Ft void
-.Fn fp_resstat "const res_state statp" "FILE *fp"
-.Ft "const char *"
-.Fn res_hostalias "const res_state statp" "const char *name" "char *buf" "size_t buflen"
-.Ft int
-.Fn res_pquery "const res_state statp" "const u_char *msg" "int msglen" "FILE *fp"
-.Ft int
-.Fn res_nquery "res_state statp" "const char *dname" "int class" "int type" "u_char *answer" "int anslen"
-.Ft int
-.Fn res_nsearch "res_state statp" "const char *dname" "int class" "int type" "u_char * answer" "int anslen"
-.Ft int
-.Fn res_nquerydomain "res_state statp" "const char *name" "const char *domain" "int class" "int type" "u_char *answer" "int anslen"
-.Ft int
-.Fo res_nmkquery
-.Fa "res_state statp"
-.Fa "int op"
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "const u_char *data"
-.Fa "int datalen"
-.Fa "const u_char *newrr"
-.Fa "u_char *buf"
-.Fa "int buflen"
-.Fc
-.Ft int
-.Fn res_nsend "res_state statp" "const u_char *msg" "int msglen" "u_char *answer" "int anslen"
-.Ft int
-.Fn res_nupdate "res_state statp" "ns_updrec *rrecp_in"
-.Ft int
-.Fn res_nmkupdate "res_state statp" "ns_updrec *rrecp_in" "u_char *buf" "int buflen"
-.Ft void
-.Fn res_nclose "res_state statp"
-.Ft int
-.Fn res_nsendsigned "res_state statp" "const u_char *msg" "int msglen" "ns_tsig_key *key" "u_char *answer" "int anslen"
-.Ft int
-.Fn res_findzonecut "res_state statp" "const char *dname" "ns_class class" "int options" "char *zname" "size_t zsize" "struct in_addr *addrs" "int naddrs"
-.Ft int
-.Fn res_getservers "res_state statp" "union res_sockaddr_union *set" "int cnt"
-.Ft void
-.Fn res_setservers "res_state statp" "const union res_sockaddr_union *set" "int cnt"
-.Ft void
-.Fn res_ndestroy "res_state statp"
-.Ft int
-.Fn dn_comp "const char *exp_dn" "u_char *comp_dn" "int length" "u_char **dnptrs" "u_char **lastdnptr"
-.Ft int
-.Fn dn_expand "const u_char *msg" "const u_char *eomorig" "const u_char *comp_dn" "char *exp_dn" "int  length"
-.\" .Ft "const char *"
-.\" .Fn hstrerror "int err"
-.Ss DEPRECATED
-.In sys/types.h
-.In netinet/in.h
-.In arpa/nameser.h
-.In resolv.h
-.In res_update.h
-.Ft int
-.Fn res_init "void"
-.Ft int
-.Fn res_isourserver "const struct sockaddr_in *addr"
-.Ft int
-.Fn fp_nquery "const u_char *msg" "int msglen" "FILE *fp"
-.Ft void
-.Fn p_query "const u_char *msg" "FILE *fp"
-.Ft "const char *"
-.Fn hostalias "const char *name"
-.Ft int
-.Fn res_query "const char *dname" "int class" "int type" "u_char *answer" "int anslen"
-.Ft int
-.Fn res_search "const char *dname" "int class" "int type" "u_char *answer" "int anslen"
-.Ft int
-.Fn res_querydomain "const char *name" "const char *domain" "int class" "int type" "u_char *answer" "int anslen"
-.Ft int
-.Fo res_mkquery
-.Fa "int op"
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "const char *data"
-.Fa "int datalen"
-.Fa "struct rrec *newrr"
-.Fa "u_char *buf"
-.Fa "int buflen"
-.Fc
-.Ft int
-.Fn res_send "const u_char *msg" "int msglen" "u_char *answer" "int anslen"
-.Ft int
-.Fn res_update "ns_updrec *rrecp_in"
-.Ft void
-.Fn res_close "void"
-.\" .Ft void
-.\" .Fn herror "const char *s"
-.Sh DESCRIPTION
-These routines are used for making, sending and interpreting
-query and reply messages with Internet domain name servers.
-.Pp
-State information is kept in
-.Fa statp
-and is used to control the behavior of these functions.
-.Fa statp
-should be set to all zeros prior to the first call to any of these functions.
-.Pp
-The functions
-.Fn res_init ,
-.Fn res_isourserver ,
-.Fn fp_nquery ,
-.Fn p_query ,
-.Fn hostalias ,
-.Fn res_query ,
-.Fn res_search ,
-.Fn res_querydomain ,
-.Fn res_mkquery ,
-.Fn res_send ,
-.Fn res_update ,
-.Fn res_close
-.\" and
-.\" .Fn herror
-are deprecated and are supplied for compatability with old source
-code.
-They use global configuration and state information that is
-kept in the structure
-.Ft _res
-rather than that referenced through
-.Ft statp .
-.Pp
-Most of the values in
-.Ft statp
-and
-.Ft _res
-are initialized on the first call to
-.Fn res_ninit
-/
-.Fn res_init
-to reasonable defaults and can be ignored.
-Options
-stored in
-.Ft statp->options
-/
-.Ft _res.options
-are defined in
-.Pa resolv.h
-and are as follows.
-Options are stored as a simple bit mask containing the bitwise
-.Dq OR
-of the options enabled.
-.Bl -tag -width "RES_USE_INET6"
-.It Dv RES_INIT
-True if the initial name server address and default domain name are
-initialized (i.e.,
-.Fn res_ninit
-/
-.Fn res_init
-has been called).
-.It Dv RES_DEBUG
-Print debugging messages.
-.It Dv RES_AAONLY
-Accept authoritative answers only.
-Should continue until it finds an authoritative answer or finds an error.
-Currently this is not implemented.
-.It Dv RES_USEVC
-Use TCP connections for queries instead of UDP datagrams.
-.It Dv RES_STAYOPEN
-Used with
-.Dv RES_USEVC
-to keep the TCP connection open between queries.
-This is useful only in programs that regularly do many queries.
-UDP should be the normal mode used.
-.It Dv RES_IGNTC
-Ignore truncation errors, i.e., don't retry with TCP.
-.It Dv RES_RECURSE
-Set the recursion-desired bit in queries.
-This is the default.
-(\c
-.Fn res_nsend
-/
-.Fn res_send
-does not do iterative queries and expects the name server
-to handle recursion.)
-.It Dv RES_DEFNAMES
-If set,
-.Fn res_nsearch
-/
-.Fn res_search
-will append the default domain name to single-component names
-(those that do not contain a dot).
-This option is enabled by default.
-.It Dv RES_DNSRCH
-If this option is set,
-.Fn res_nsearch
-/
-.Fn res_search
-will search for host names in the current domain and in parent domains; see
-.Xr hostname 7 .
-This is used by the standard host lookup routine
-.Xr gethostbyname 3 .
-This option is enabled by default.
-.It Dv RES_USE_INET6
-Enables support for IPv6-only applications.
-This causes IPv4 addresses to be returned as an IPv4 mapped address.
-For example, 10.1.1.1 will be returned as ::ffff:10.1.1.1.
-The option is meaningful with certain kernel configuration only.
-.It Dv RES_USE_EDNS0
-Enables support for OPT pseudo-RR for EDNS0 extension.
-With the option, resolver code will attach OPT pseudo-RR into DNS queries,
-to inform of our receive buffer size.
-The option will allow DNS servers to take advantage of non-default receive
-buffer size, and to send larger replies.
-DNS query packets with EDNS0 extension is not compatible with
-non-EDNS0 DNS servers.
-.It Dv RES_NOALIASES
-This option turns off the user level aliasing feature controlled by
-the
-.Ev HOSTALIASES
-environment variable.
-Network daemons should set this option.
-.It Dv RES_ROTATE
-This options causes the
-.Fn res_nsend
-/
-.Fn res_send
-to rotate the list of nameservers in
-.Fa statp->nsaddr_list
-/
-.Fa _res.nsaddr_list .
-.It Dv RES_KEEPTSIG
-This option causes
-.Fn res_nsendsigned
-to leave the message unchanged after TSIG verification; otherwise the TSIG
-record would be removed and the header updated.
-.It Dv RES_NOTLDQUERY
-This option causes
-.Fn res_nsearch
-to not attempt to resolve an unqualified name as if it were a top level
-domain (TLD).
-This option can cause problems if the site has "localhost" as a TLD rather
-than having localhost on one or more elements of the search list.
-This option has no effect if neither
-.Dv RES_DEFNAMES
-or
-.Dv RES_DNSRCH
-is set.
-.El
-.Pp
-The
-.Fn res_ninit
-/
-.Fn res_init
-routine
-reads the configuration file (if any; see
-.Xr resolv.conf 5 )
-to get the default domain name, search list and
-the Internet address of the local name server(s).
-If no server is configured, the host running the resolver is tried.
-The current domain name is defined by the hostname
-if not specified in the configuration file;
-it can be overridden by the environment variable
-.Ev LOCALDOMAIN .
-This environment variable may contain several blank-separated
-tokens if you wish to override the
-.Fa search list
-on a per-process basis.
-This is similar to the
-.Fa search
-command in the configuration file.
-Another environment variable
-.Ev RES_OPTIONS
-can be set to override certain internal resolver options which are otherwise
-set by changing fields in the
-.Ft statp
-/
-.Ft _res
-structure or are inherited from the configuration file's
-.Fa options
-command.
-The syntax of the
-.Ev RES_OPTIONS
-environment variable is explained in
-.Xr resolv.conf 5 .
-Initialization normally occurs on the first call
-to one of the other resolver routines.
-.Pp
-In
-.Nx
-the initialization code also sets up a
-.Xr kqueue 2
-and creates a
-.Xr kevent 2
-watching a file descriptor that points to the resolver file.
-Every resolver function calls the internal function
-.Fn __res_check
-which checks for a new
-.Xr kevent 2
-related to the
-.Xr resolv.conf 5
-file, and reloads the file if necessary.
-This does not work if the file is accessed through a symlink and the symlink
-changes to point to a different file.
-To fix the symlink issue one could add a system call per resolver call to
-get the current time, and reload every so often.
-This is not done currently, but it is under consideration.
-.Pp
-The memory referred to by
-.Ft statp
-must be set to all zeros prior to the first call to
-.Fn res_ninit .
-.Fn res_ndestroy
-should be call to free memory allocated by
-.Fn res_ninit
-after last use.
-.Pp
-The
-.Fn res_nquery
-/
-.Fn res_query
-functions provides interfaces to the server query mechanism.
-They constructs a query, sends it to the local server,
-awaits a response, and makes preliminary checks on the reply.
-The query requests information of the specified
-.Fa type
-and
-.Fa class
-for the specified fully-qualified domain name
-.Fa dname .
-The reply message is left in the
-.Fa answer
-buffer with length
-.Fa anslen
-supplied by the caller.
-.Fn res_nquery
-/
-.Fn res_query
-return \-1 on error or the length of the answer.
-.Pp
-The
-.Fn res_nsearch
-/
-.Fn res_search
-routines make a query and awaits a response like
-.Fn res_nquery
-/
-.Fn res_query ,
-but in addition, it implements the default and search rules
-controlled by the
-.Dv RES_DEFNAMES
-and
-.Dv RES_DNSRCH
-options.
-It returns the length of the first successful reply which is stored in
-.Ft answer
-or \-1 on error.
-.Pp
-The remaining routines are lower-level routines used by
-.Fn res_nquery
-/
-.Fn res_query .
-The
-.Fn res_nmkquery
-/
-.Fn res_mkquery
-functions
-constructs a standard query message and places it in
-.Fa buf .
-It returns the size of the query, or \-1 if the query is
-larger than
-.Fa buflen .
-The query type
-.Fa op
-is usually
-.Dv QUERY ,
-but can be any of the query types defined in
-.Aq Pa arpa/nameser.h .
-The domain name for the query is given by
-.Fa dname .
-.Fa newrr
-is currently unused but is intended for making update messages.
-.Pp
-The
-.Fn res_nsend
-/
-.Fn res_send
-/
-.Fn res_nsendsigned
-routines
-sends a pre-formatted query and returns an answer.
-It will call
-.Fn res_ninit
-/
-.Fn res_init
-if
-.Dv RES_INIT
-is not set, send the query to the local name server, and
-handle timeouts and retries.
-Additionally,
-.Fn res_nsendsigned
-will use TSIG signatures to add authentication to the query and verify the
-response.
-In this case, only one nameserver will be contacted.
-The length of the reply message is returned, or \-1 if there were errors.
-.Pp
-.Fn res_nquery
-/
-.Fn res_query ,
-.Fn res_nsearch
-/
-.Fn res_search
-and
-.Fn res_nsend
-/
-.Fn res_send
-return a length that may be bigger than
-.Fa anslen .
-In that case the query should be retried with a bigger buffer.
-NOTE the answer to the second query may be larger still so supplying
-a buffer that bigger that the answer returned by the previous
-query is recommended.
-.Pp
-.Fa answer
-MUST be big enough to receive a maximum UDP response from the server or
-parts of the answer will be silently discarded.
-The default maximum UDP response size is 512 bytes.
-.Pp
-The function
-.Fn res_ourserver_p
-returns true when
-.Fa inp
-is one of the servers in
-.Fa statp->nsaddr_list
-/
-.Fa _res.nsaddr_list .
-.Pp
-The functions
-.Fn fp_nquery
-/
-.Fn p_query
-print out the query and any answer in
-.Fa msg
-on
-.Fa fp .
-.Fn p_query
-is equivalent to
-.Fn fp_nquery
-with
-.Fa msglen
-set to 512.
-.Pp
-The function
-.Fn fp_resstat
-prints out the active flag bits in
-.Fa statp->options
-preceeded by the text ";; res options:" on
-.Fa file .
-.Pp
-The functions
-.Fn res_hostalias
-/
-.Fn hostalias
-lookup up name in the file referred to by the
-.Ev HOSTALIASES
-files return a fully qualified hostname if found or NULL if
-not found or an error occurred.
-.Fn res_hostalias
-uses
-.Fa buf
-to store the result in,
-.Fn hostalias
-uses a static buffer.
-.Pp
-The functions
-.Fn res_getservers
-and
-.Fn res_setservers
-are used to get and set the list of server to be queried.
-.Pp
-The functions
-.Fn res_nupdate
-/
-.Fn res_update
-take a list of ns_updrec
-.Fa rrecp_in .
-Identifies the containing zone for each record and groups the records
-according to containing zone maintaining in zone order then sends and update
-request to the servers for these zones.
-The number of zones updated is returned or \-1 on error.
-Note that
-.Fn res_nupdate
-will perform TSIG authenticated dynamic update operations if the key is not
-NULL.
-.Pp
-The function
-.Fn res_findzonecut
-discovers the closest enclosing zone cut for a specified domain name,
-and finds the IP addresses of the zone's master servers.
-.Pp
-The functions
-.Fn res_nmkupdate
-/
-.Fn res_mkupdate
-take a linked list of ns_updrec
-.Fa rrecp_in
-and construct a UPDATE message in
-.Fa buf .
-.Fn res_nmkupdate
-/
-.Fn res_mkupdate
-return the length of the constructed message on no error or one of the
-following error values.
-.Bl -inset -width "-5"
-.It \-1
-An error occurred parsing
-.Fa rrecp_in .
-.It \-2
-The buffer
-.Fa buf
-was too small.
-.It \-3
-The first record was not a zone section or there was a section order problem.
-The section order is S_ZONE, S_PREREQ and S_UPDATE.
-.It \-4
-A number overflow occurred.
-.It \-5
-Unknown operation or no records.
-.El
-.Pp
-The functions
-.Fn res_nclose
-/
-.Fn res_close
-close any open files referenced through
-.Fa statp
-/
-.Fa _res .
-.Pp
-The function
-.Fn res_ndestroy
-calls
-.Fn res_nclose
-then frees any memory allocated by
-.Fn res_ninit .
-.Pp
-The
-.Fn dn_comp
-function
-compresses the domain name
-.Fa exp_dn
-and stores it in
-.Fa comp_dn .
-The size of the compressed name is returned or \-1 if there were errors.
-The size of the array pointed to by
-.Fa comp_dn
-is given by
-.Fa length .
-The compression uses
-an array of pointers
-.Fa dnptrs
-to previously-compressed names in the current message.
-The first pointer points to
-the beginning of the message and the list ends with
-.Dv NULL .
-The limit to the array is specified by
-.Fa lastdnptr .
-A side effect of
-.Fn dn_comp
-is to update the list of pointers for labels inserted into the message
-as the name is compressed.
-If
-.Fa dnptr
-is
-.Dv NULL ,
-names are not compressed.
-If
-.Fa lastdnptr
-is
-.Dv NULL ,
-the list of labels is not updated.
-.Pp
-The
-.Fn dn_expand
-entry expands the compressed domain name
-.Fa comp_dn
-to a full domain name.
-The compressed name is contained in a query or reply message;
-.Fa msg
-is a pointer to the beginning of the message.
-.Fa eomorig
-is a pointer to the first location after the message.
-The uncompressed name is placed in the buffer indicated by
-.Fa exp_dn
-which is of size
-.Fa length .
-The size of compressed name is returned or \-1 if there was an error.
-.Pp
-The variables
-.Ft statp->res_h_errno
-/
-.Ft _res.res_h_errno
-and external variable
-.Ft h_errno
-is set whenever an error occurs during resolver operation.
-The following
-definitions are given in
-.Aq Pa netdb.h :
-.Bd -literal
-#define NETDB_INTERNAL -1
-/* see errno */
-#define NETDB_SUCCESS  0
-/* no problem */
-#define HOST_NOT_FOUND 1
-/* Authoritative Answer Host not found */
-#define TRY_AGAIN      2
-/* Non-Authoritative not found, or SERVFAIL */
-#define NO_RECOVERY    3
-/* Non-Recoverable: FORMERR, REFUSED, NOTIMP */
-#define NO_DATA        4
-/* Valid name, no data for requested type */
-.Ed
-.\" .Pp
-.\" The
-.\" .Fn herror
-.\" function writes a message to the diagnostic output consisting of the string
-.\" parameter
-.\" .Fa s ,
-.\" the constant string ": ", and a message corresponding to the value of
-.\" .Ft h_errno .
-.\" .Pp
-.\" The
-.\" .Fn hstrerror
-.\" function returns a string which is the message text corresponding to the
-.\" value of the
-.\" .Fa err
-.\" parameter.
-.Pp
-The following functions are only in
-.Dv libresolv :
-.Fn res_findzonecut ,
-.Fn res_nmkupdate ,
-.Fn res_nsendsigned ,
-and
-.Fn res_nupdate .
-All the rest are in both
-.Dv libc
-and
-.Dv libresolv .
-.Sh FILES
-.Bl -tag -width "/etc/resolv.conf    "
-.It Pa /etc/resolv.conf
-The configuration file, see
-.Xr resolv.conf 5 .
-.El
-.Sh SEE ALSO
-.Xr getaddrinfo 3 ,
-.Xr gethostbyaddr 3 ,
-.Xr gethostbyname 3 ,
-.Xr getnameinfo 3 ,
-.Xr resolv.conf 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Pp
-.%T RFC 974 ,
-.%T RFC 1032 ,
-.%T RFC 1033 ,
-.%T RFC 1034 ,
-.%T RFC 1035 ,
-.%T RFC 1535
-.Rs
-.%T "Name Server Operations Guide for BIND"
-.Re
-.Sh HISTORY
-The
-.Nm
-function appeared in
-.Bx 4.3 .
diff --git a/lib/libc/net/rthdr.c b/lib/libc/net/rthdr.c
deleted file mode 100644
index 9517cc0cc..000000000
--- a/lib/libc/net/rthdr.c
+++ /dev/null
@@ -1,459 +0,0 @@
-/*	$NetBSD: rthdr.c,v 1.18 2012/03/13 21:13:42 christos Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: rthdr.c,v 1.18 2012/03/13 21:13:42 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/ip6.h>
-
-#include <assert.h>
-#include <string.h>
-#include <stdio.h>
-
-#ifdef __weak_alias
-__weak_alias(inet6_rthdr_add,_inet6_rthdr_add)
-__weak_alias(inet6_rthdr_getaddr,_inet6_rthdr_getaddr)
-__weak_alias(inet6_rthdr_getflags,_inet6_rthdr_getflags)
-__weak_alias(inet6_rthdr_init,_inet6_rthdr_init)
-__weak_alias(inet6_rthdr_lasthop,_inet6_rthdr_lasthop)
-__weak_alias(inet6_rthdr_segments,_inet6_rthdr_segments)
-__weak_alias(inet6_rthdr_space,_inet6_rthdr_space)
-__weak_alias(inet6_rth_space, _inet6_rth_space)
-__weak_alias(inet6_rth_init, _inet6_rth_init)
-__weak_alias(inet6_rth_add, _inet6_rth_add)
-__weak_alias(inet6_rth_reverse, _inet6_rth_reverse)
-__weak_alias(inet6_rth_segments, _inet6_rth_segments)
-__weak_alias(inet6_rth_getaddr, _inet6_rth_getaddr)
-#endif
-
-/*
- * RFC2292 API
- */
-
-size_t
-inet6_rthdr_space(int type, int seg)
-{
-	switch (type) {
-	case IPV6_RTHDR_TYPE_0:
-		if (seg < 1 || seg > 23)
-			return (0);
-		return (CMSG_SPACE(sizeof(struct in6_addr) * seg +
-		    sizeof(struct ip6_rthdr0)));
-	default:
-		return (0);
-	}
-}
-
-struct cmsghdr *
-inet6_rthdr_init(void *bp, int type)
-{
-	struct cmsghdr *ch;
-	struct ip6_rthdr *rthdr;
-
-	_DIAGASSERT(bp != NULL);
-
-	ch = (struct cmsghdr *)bp;
-	rthdr = (struct ip6_rthdr *)(void *)CMSG_DATA(ch);
-
-	ch->cmsg_level = IPPROTO_IPV6;
-	ch->cmsg_type = IPV6_RTHDR;
-
-	switch (type) {
-	case IPV6_RTHDR_TYPE_0:
-#ifdef COMPAT_RFC2292
-		ch->cmsg_len = CMSG_LEN(sizeof(struct ip6_rthdr0) -
-		    sizeof(struct in6_addr));
-#else
-		ch->cmsg_len = CMSG_LEN(sizeof(struct ip6_rthdr0));
-#endif
-		(void)memset(rthdr, 0, sizeof(struct ip6_rthdr0));
-		rthdr->ip6r_type = IPV6_RTHDR_TYPE_0;
-		return (ch);
-	default:
-		return (NULL);
-	}
-}
-
-int
-inet6_rthdr_add(struct cmsghdr *cmsg, const struct in6_addr *addr, u_int flags)
-{
-	struct ip6_rthdr *rthdr;
-
-	_DIAGASSERT(cmsg != NULL);
-	_DIAGASSERT(addr != NULL);
-
-	rthdr = (struct ip6_rthdr *)(void *)CMSG_DATA(cmsg);
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		size_t len;
-		struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)(void *)rthdr;
-		if (flags != IPV6_RTHDR_LOOSE && flags != IPV6_RTHDR_STRICT)
-			return (-1);
-		if (rt0->ip6r0_segleft == 23)
-			return (-1);
-		if (flags != IPV6_RTHDR_LOOSE)
-			return (-1);
-		rt0->ip6r0_segleft++;
-		(void)memcpy(((caddr_t)(void *)rt0) +
-		    ((rt0->ip6r0_len + 1) << 3), addr, sizeof(struct in6_addr));
-		rt0->ip6r0_len += sizeof(struct in6_addr) >> 3;
-		len = CMSG_LEN((rt0->ip6r0_len + 1) << 3);
-		_DIAGASSERT(__type_fit(socklen_t, len));
-		cmsg->cmsg_len = (socklen_t)len;
-		break;
-	}
-	default:
-		return (-1);
-	}
-
-	return (0);
-}
-
-int
-inet6_rthdr_lasthop(struct cmsghdr *cmsg, unsigned int flags)
-{
-	struct ip6_rthdr *rthdr;
-
-	_DIAGASSERT(cmsg != NULL);
-
-	rthdr = (struct ip6_rthdr *)(void *)CMSG_DATA(cmsg);
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)(void *)rthdr;
-		if (rt0->ip6r0_segleft > 23)
-			return (-1);
-		if (flags != IPV6_RTHDR_LOOSE)
-			return (-1);
-		break;
-	}
-	default:
-		return (-1);
-	}
-
-	return (0);
-}
-
-#if 0
-int
-inet6_rthdr_reverse(const struct cmsghdr *in, struct cmsghdr *out)
-{
-
-	return (-1);
-}
-#endif
-
-int
-inet6_rthdr_segments(const struct cmsghdr *cmsg)
-{
-	const struct ip6_rthdr *rthdr;
-
-	_DIAGASSERT(cmsg != NULL);
-
-	rthdr = __UNCONST(CCMSG_DATA(cmsg));
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		const struct ip6_rthdr0 *rt0 =
-		    (const struct ip6_rthdr0 *)(const void *)rthdr;
-		size_t len;
-
-		if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len)
-			return (-1);
-
-		len = (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-		_DIAGASSERT(__type_fit(int, len));
-		return (int)len;
-	}
-
-	default:
-		return (-1);
-	}
-}
-
-struct in6_addr *
-inet6_rthdr_getaddr(struct cmsghdr *cmsg, int idx)
-{
-	struct ip6_rthdr *rthdr;
-
-	_DIAGASSERT(cmsg != NULL);
-
-	rthdr = (struct ip6_rthdr *)(void *)CMSG_DATA(cmsg);
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)(void *)rthdr;
-		int naddr;
-		size_t len;
-
-		if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len)
-			return NULL;
-		len = (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-		_DIAGASSERT(__type_fit(int, len));
-		naddr = (int)len;
-		if (idx <= 0 || naddr < idx)
-			return NULL;
-#ifdef COMPAT_RFC2292
-		return ((struct in6_addr *)(void *)(rt0 + 1)) + idx - 1;
-#else
-		return ((struct in6_addr *)(void *)(rt0 + 1)) + idx;
-#endif
-	}
-
-	default:
-		return NULL;
-	}
-}
-
-int
-inet6_rthdr_getflags(const struct cmsghdr *cmsg, int idx)
-{
-	const struct ip6_rthdr *rthdr;
-
-	_DIAGASSERT(cmsg != NULL);
-
-	rthdr = __UNCONST(CCMSG_DATA(cmsg));
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		const struct ip6_rthdr0 *rt0 = (const struct ip6_rthdr0 *)
-		(const void *)rthdr;
-		int naddr;
-		size_t len;
-
-		if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len)
-			return (-1);
-		len = (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-		_DIAGASSERT(__type_fit(int, len));
-		naddr = (int)len;
-		if (idx < 0 || naddr < idx)
-			return (-1);
-		return IPV6_RTHDR_LOOSE;
-	}
-
-	default:
-		return (-1);
-	}
-}
-
-/*
- * RFC3542 (2292bis) API
- */
-
-socklen_t
-inet6_rth_space(int type, int segments)
-{
-	switch (type) {
-	case IPV6_RTHDR_TYPE_0:
-		return (((segments * 2) + 1) << 3);
-	default:
-		return (0);	/* type not suppported */
-	}
-}
-
-void *
-inet6_rth_init(void *bp, socklen_t bp_len, int type, int segments)
-{
-	struct ip6_rthdr *rth;
-	struct ip6_rthdr0 *rth0;
-
-	_DIAGASSERT(bp != NULL);
-
-	rth = (struct ip6_rthdr *)bp;
-
-	switch (type) {
-	case IPV6_RTHDR_TYPE_0:
-		/* length validation */
-		if (bp_len < inet6_rth_space(IPV6_RTHDR_TYPE_0, segments))
-			return (NULL);
-
-		memset(bp, 0, bp_len);
-		rth0 = (struct ip6_rthdr0 *)(void *)rth;
-		rth0->ip6r0_len = segments * 2;
-		rth0->ip6r0_type = IPV6_RTHDR_TYPE_0;
-		rth0->ip6r0_segleft = 0;
-		rth0->ip6r0_reserved = 0;
-		break;
-	default:
-		return (NULL);	/* type not supported */
-	}
-
-	return (bp);
-}
-
-int
-inet6_rth_add(void *bp, const struct in6_addr *addr)
-{
-	struct ip6_rthdr *rth;
-	struct ip6_rthdr0 *rth0;
-	struct in6_addr *nextaddr;
-
-	_DIAGASSERT(bp != NULL);
-
-	rth = (struct ip6_rthdr *)bp;
-
-	switch (rth->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-		rth0 = (struct ip6_rthdr0 *)(void *)rth;
-		nextaddr = (struct in6_addr *)(void *)(rth0 + 1)
-		    + rth0->ip6r0_segleft;
-		*nextaddr = *addr;
-		rth0->ip6r0_segleft++;
-		break;
-	default:
-		return (-1);	/* type not supported */
-	}
-
-	return (0);
-}
-
-int
-inet6_rth_reverse(const void *in, void *out)
-{
-	const struct ip6_rthdr *rth_in;
-	const struct ip6_rthdr0 *rth0_in;
-	struct ip6_rthdr0 *rth0_out;
-	int i, segments;
-
-	_DIAGASSERT(in != NULL);
-	_DIAGASSERT(out != NULL);
-
-	rth_in = (const struct ip6_rthdr *)in;
-
-	switch (rth_in->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-		rth0_in = (const struct ip6_rthdr0 *)in;
-		rth0_out = (struct ip6_rthdr0 *)out;
-
-		/* parameter validation XXX too paranoid? */
-		if (rth0_in->ip6r0_len % 2)
-			return (-1);
-		segments = rth0_in->ip6r0_len / 2;
-
-		/* we can't use memcpy here, since in and out may overlap */
-		memmove((void *)rth0_out, (const void *)rth0_in,
-			(unsigned int)(((rth0_in->ip6r0_len) + 1) << 3));
-		rth0_out->ip6r0_segleft = segments;
-
-		/* reverse the addresses */
-		for (i = 0; i < segments / 2; i++) {
-			struct in6_addr addr_tmp, *addr1, *addr2;
-
-			addr1 = (struct in6_addr *)(void *)(rth0_out + 1) + i;
-			addr2 = (struct in6_addr *)(void *)(rth0_out + 1) +
-				(segments - i - 1);
-			addr_tmp = *addr1;
-			*addr1 = *addr2;
-			*addr2 = addr_tmp;
-		}
-		
-		break;
-	default:
-		return (-1);	/* type not supported */
-	}
-
-	return (0);
-}
-
-int
-inet6_rth_segments(const void *bp)
-{
-	const struct ip6_rthdr *rh;
-	const struct ip6_rthdr0 *rh0;
-	unsigned int addrs;
-
-	_DIAGASSERT(bp != NULL);
-
-	rh = (const struct ip6_rthdr *)bp;
-
-	switch (rh->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-		rh0 = (const struct ip6_rthdr0 *)bp;
-
-		/*
-		 * Validation for a type-0 routing header.
-		 * Is this too strict?
-		 */
-		if ((rh0->ip6r0_len % 2) != 0 ||
-		    (addrs = (rh0->ip6r0_len / 2)) < rh0->ip6r0_segleft)
-			return (-1);
-
-		return (addrs);
-	default:
-		return (-1);	/* unknown type */
-	}
-}
-
-struct in6_addr *
-inet6_rth_getaddr(const void *bp, int idx)
-{
-	const struct ip6_rthdr *rh;
-	const struct ip6_rthdr0 *rh0;
-	unsigned int addrs;
-
-	_DIAGASSERT(bp != NULL);
-
-	rh = (const struct ip6_rthdr *)bp;
-
-	switch (rh->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-		 rh0 = (const struct ip6_rthdr0 *)bp;
-		 
-		/*
-		 * Validation for a type-0 routing header.
-		 * Is this too strict?
-		 */
-		if ((rh0->ip6r0_len % 2) != 0 ||
-		    (addrs = (rh0->ip6r0_len / 2)) < rh0->ip6r0_segleft)
-			return (NULL);
-
-		if (idx < 0 || addrs <= (unsigned int)idx)
-			return (NULL);
-
-		return (((struct in6_addr *)(void *)__UNCONST(rh0 + 1)) + idx);
-	default:
-		return (NULL);	/* unknown type */
-	}
-}
diff --git a/lib/libc/net/send.c b/lib/libc/net/send.c
deleted file mode 100644
index 8cf95d8f2..000000000
--- a/lib/libc/net/send.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: send.c,v 1.10 2012/03/20 17:44:18 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)send.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: send.c,v 1.10 2012/03/20 17:44:18 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-
-#ifdef __weak_alias
-__weak_alias(send, _send)
-#endif
-
-ssize_t
-send(int s, const void *msg, size_t len, int flags)
-{
-
-	return (sendto(s, msg, len, flags, NULL, 0));
-}
diff --git a/lib/libc/net/servent.h b/lib/libc/net/servent.h
deleted file mode 100644
index c7dfcc214..000000000
--- a/lib/libc/net/servent.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: servent.h,v 1.4 2010/04/25 00:54:46 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-
-struct servent_data {
-	FILE *plainfile;
-	struct cdbr *cdb;
-	struct servent serv;
-	char **aliases;
-	size_t maxaliases;
-	int flags;
-#define	_SV_STAYOPEN	1
-#define	_SV_CDB		2
-#define	_SV_PLAINFILE	4
-#define	_SV_FIRST	8
-	uint32_t cdb_index;
-	uint8_t *cdb_buf;
-	size_t cdb_buf_len;
-	char *line;
-	void *dummy;
-};
-
-struct servent	*getservent_r(struct servent *, struct servent_data *);
-struct servent	*getservbyname_r(const char *, const char *,
-    struct servent *, struct servent_data *);
-struct servent	*getservbyport_r(int, const char *,
-    struct servent *, struct servent_data *);
-void setservent_r(int, struct servent_data *);
-void endservent_r(struct servent_data *);
-
-int _servent_open(struct servent_data *);
-void _servent_close(struct servent_data *);
-int _servent_getline(struct servent_data *);
-struct servent *_servent_parseline(struct servent_data *, struct servent *);
-struct servent *_servent_parsedb(struct servent_data *, struct servent *,
-    const uint8_t *, size_t);
diff --git a/lib/libc/net/sethostent.c b/lib/libc/net/sethostent.c
deleted file mode 100644
index b5f7ac8f2..000000000
--- a/lib/libc/net/sethostent.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*	$NetBSD: sethostent.c,v 1.20 2014/03/17 13:24:23 christos Exp $	*/
-
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)sethostent.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "Id: sethostent.c,v 8.5 1996/09/28 06:51:07 vixie Exp ";
-#else
-__RCSID("$NetBSD: sethostent.c,v 1.20 2014/03/17 13:24:23 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-#include <assert.h>
-#include <string.h>
-#include <nsswitch.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#include "hostent.h"
-
-#ifdef __weak_alias
-__weak_alias(sethostent,_sethostent)
-__weak_alias(endhostent,_endhostent)
-#endif
-
-#ifndef _REENTRANT
-void	res_close(void);
-#endif
-
-static struct hostent *_hf_gethtbyname2(const char *, int, struct getnamaddr *);
-
-void
-/*ARGSUSED*/
-sethostent(int stayopen)
-{
-#ifndef _REENTRANT
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1)
-		return;
-	if (stayopen)
-		_res.options |= RES_STAYOPEN | RES_USEVC;
-#endif
-	sethostent_r(&_h_file);
-}
-
-void
-endhostent(void)
-{
-#ifndef _REENTRANT
-	_res.options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_close();
-#endif
-	endhostent_r(&_h_file);
-}
-static const char *_h_hosts = _PATH_HOSTS;
-
-void
-_hf_sethostsfile(const char *f) {
-	_h_hosts = f;
-}
-
-void
-sethostent_r(FILE **hf)
-{
-	if (!*hf)
-		*hf = fopen(_h_hosts, "re");
-	else
-		rewind(*hf);
-}
-
-void
-endhostent_r(FILE **hf)
-{
-	if (*hf) {
-		(void)fclose(*hf);
-		*hf = NULL;
-	}
-}
-
-/*ARGSUSED*/
-int
-_hf_gethtbyname(void *rv, void *cb_data, va_list ap)
-{
-	struct hostent *hp;
-	const char *name;
-	int af;
-	struct getnamaddr *info = rv;
-
-	_DIAGASSERT(rv != NULL);
-
-	name = va_arg(ap, char *);
-	/* NOSTRICT skip string len */(void)va_arg(ap, int);
-	af = va_arg(ap, int);
-
-#if 0
-	{
-		res_state res = __res_get_state();
-		if (res == NULL)
-			return NS_NOTFOUND;
-		if (res->options & RES_USE_INET6)
-			hp = _hf_gethtbyname2(name, AF_INET6, info);
-		else
-			hp = NULL;
-		if (hp == NULL)
-			hp = _hf_gethtbyname2(name, AF_INET, info);
-		__res_put_state(res);
-	}
-#else
-	hp = _hf_gethtbyname2(name, af, info);
-#endif
-	if (hp == NULL) {
-		*info->he = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	}
-	return NS_SUCCESS;
-}
-
-struct hostent *
-_hf_gethtbyname2(const char *name, int af, struct getnamaddr *info)
-{
-	struct hostent *hp, hent;
-	char *buf, *ptr;
-	size_t len, anum, num, i;
-	FILE *hf;
-	char *aliases[MAXALIASES];
-	char *addr_ptrs[MAXADDRS];
-
-	_DIAGASSERT(name != NULL);
-
-	hf = NULL;
-	sethostent_r(&hf);
-	if (hf == NULL) {
-		errno = EINVAL;
-		*info->he = NETDB_INTERNAL;
-		return NULL;
-	}
-
-	if ((ptr = buf = malloc(len = info->buflen)) == NULL) {
-		*info->he = NETDB_INTERNAL;
-		return NULL;
-	}
-
-	anum = 0;		/* XXX: gcc */
-	hent.h_name = NULL;	/* XXX: gcc */
-	hent.h_addrtype = 0;	/* XXX: gcc */
-	hent.h_length = 0;	/* XXX: gcc */
-
-	for (num = 0; num < MAXADDRS;) {
-		info->hp->h_addrtype = af;
-		info->hp->h_length = 0;
-
-		hp = gethostent_r(hf, info->hp, info->buf, info->buflen,
-		    info->he);
-		if (hp == NULL)
-			break;
-
-		if (strcasecmp(hp->h_name, name) != 0) {
-			char **cp;
-			for (cp = hp->h_aliases; *cp != NULL; cp++)
-				if (strcasecmp(*cp, name) == 0)
-					break;
-			if (*cp == NULL) continue;
-		}
-
-		if (num == 0) {
-			hent.h_addrtype = af = hp->h_addrtype;
-			hent.h_length = hp->h_length;
-
-			HENT_SCOPY(hent.h_name, hp->h_name, ptr, len);
-			for (anum = 0; hp->h_aliases[anum]; anum++) {
-				if (anum >= __arraycount(aliases))
-					goto nospc;
-				HENT_SCOPY(aliases[anum], hp->h_aliases[anum],
-				    ptr, len);
-			}
-			ptr = (void *)ALIGN(ptr);
-			if ((size_t)(ptr - buf) >= info->buflen)
-				goto nospc;
-		}
-
-		if (num >= __arraycount(addr_ptrs))
-			goto nospc;
-		HENT_COPY(addr_ptrs[num], hp->h_addr_list[0], hp->h_length, ptr,
-		    len);
-		num++;
-	}
-	endhostent_r(&hf);
-
-	if (num == 0) {
-		*info->he = HOST_NOT_FOUND;
-		free(buf);
-		return NULL;
-	}
-
-	hp = info->hp;
-	ptr = info->buf;
-	len = info->buflen;
-
-	hp->h_addrtype = hent.h_addrtype;
-	hp->h_length = hent.h_length;
-
-	HENT_ARRAY(hp->h_aliases, anum, ptr, len);
-	HENT_ARRAY(hp->h_addr_list, num, ptr, len);
-
-	for (i = 0; i < num; i++)
-		HENT_COPY(hp->h_addr_list[i], addr_ptrs[i], hp->h_length, ptr,
-		    len);
-	hp->h_addr_list[num] = NULL;
-
-	HENT_SCOPY(hp->h_name, hent.h_name, ptr, len);
-
-	for (i = 0; i < anum; i++)
-		HENT_SCOPY(hp->h_aliases[i], aliases[i], ptr, len);
-	hp->h_aliases[anum] = NULL;
-
-	free(buf);
-	return hp;
-nospc:
-	*info->he = NETDB_INTERNAL;
-	free(buf);
-	errno = ENOSPC;
-	return NULL;
-}
-
-/*ARGSUSED*/
-int
-_hf_gethtbyaddr(void *rv, void *cb_data, va_list ap)
-{
-	struct hostent *hp;
-	const unsigned char *addr;
-	struct getnamaddr *info = rv;
-	FILE *hf;
-
-	_DIAGASSERT(rv != NULL);
-
-	addr = va_arg(ap, unsigned char *);
-	info->hp->h_length = va_arg(ap, int);
-	info->hp->h_addrtype = va_arg(ap, int);
-	
-	hf = NULL;
-	sethostent_r(&hf);
-	if (hf == NULL) {
-		*info->he = NETDB_INTERNAL;
-		return NS_UNAVAIL;
-	}
-	while ((hp = gethostent_r(hf, info->hp, info->buf, info->buflen,
-	    info->he)) != NULL)
-		if (!memcmp(hp->h_addr_list[0], addr, (size_t)hp->h_length))
-			break;
-	endhostent_r(&hf);
-
-	if (hp == NULL) {
-		*info->he = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	}
-	return NS_SUCCESS;
-}
diff --git a/lib/libc/net/sockatmark.3 b/lib/libc/net/sockatmark.3
deleted file mode 100644
index 58183f434..000000000
--- a/lib/libc/net/sockatmark.3
+++ /dev/null
@@ -1,103 +0,0 @@
-.\"	$NetBSD: sockatmark.3,v 1.9 2008/04/30 13:10:50 martin Exp $
-.\"
-.\" 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.
-.\"
-.Dd May 15, 2003
-.Dt SOCKATMARK 3
-.Os
-.Sh NAME
-.Nm sockatmark
-.Nd determine whether a socket is at the out-of-band mark
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft int
-.Fn sockatmark "int s"
-.Sh DESCRIPTION
-The
-.Nm sockatmark
-function determines whether the socket referenced by the file descriptor
-.Fa s
-is at the out-of-band mark.
-.Sh RETURN VALUES
-If successful, the
-.Nm sockatmark
-function returns 1 to indicate that the socket is at an out-of-band mark;
-0 is returned if there is no out-of-band mark or the mark is preceded
-by in-band data.
-Otherwise, -1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Nm sockatmark
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid file descriptor.
-.It Bq Er ENOTTY
-The file descriptor
-.Fa s
-does not refer to a socket.
-.El
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr recv 2 ,
-.Xr socket 2
-.Rs
-.%T "An Introductory 4.4BSD Interprocess Communication Tutorial"
-.%A Stuart Sechrest
-.Re
-.Pq see Pa /usr/share/doc/psd/20.ipctut
-.Rs
-.%T "Advanced 4.4BSD IPC Tutorial"
-.%A Samuel J. Leffler
-.%A Robert S. Fabry
-.%A William N. Joy
-.%A Phil Lapsley
-.%A Steve Miller
-.%A Chris Torek
-.Re
-.Pq see Pa /usr/share/doc/psd/21.ipc
-.Sh STANDARDS
-The
-.Nm sockatmark
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Nm sockatmark
-function appeared in
-.St -p1003.1g-2000
-as a replacement for the
-.Dv SIOCATMARK
-.Xr ioctl 2
-interface.
diff --git a/lib/libc/net/sockatmark.c b/lib/libc/net/sockatmark.c
deleted file mode 100644
index 40bedaa84..000000000
--- a/lib/libc/net/sockatmark.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: sockatmark.c,v 1.3 2012/03/20 17:44:18 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sockatmark.c,v 1.3 2012/03/20 17:44:18 matt Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-
-#include <assert.h>
-
-int
-sockatmark(int s)
-{
-	int val;
-
-	_DIAGASSERT(s != -1);
-
-	if (ioctl(s, SIOCATMARK, &val) == -1)
-		return (-1);
-
-	return (val);
-}
diff --git a/lib/libc/net/vars6.c b/lib/libc/net/vars6.c
deleted file mode 100644
index 09abc4c90..000000000
--- a/lib/libc/net/vars6.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: vars6.c,v 1.7 2005/08/07 16:00:01 christos Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vars6.c,v 1.7 2005/08/07 16:00:01 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <netinet/in.h>
-
-#ifdef __weak_alias
-__weak_alias(in6addr_any, _in6addr_any)
-__weak_alias(in6addr_loopback, _in6addr_loopback)
-__weak_alias(in6addr_nodelocal_allnodes, _in6addr_nodelocal_allnodes)
-__weak_alias(in6addr_linklocal_allnodes, _in6addr_linklocal_allnodes)
-__weak_alias(in6addr_linklocal_allrouters, _in6addr_linklocal_allrouters)
-#endif
-
-/*
- * Definitions of some constant IPv6 addresses.
- */
-const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
-const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;
-const struct in6_addr in6addr_nodelocal_allnodes = IN6ADDR_NODELOCAL_ALLNODES_INIT;
-const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_INIT;
-const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT;
-
diff --git a/lib/libc/nls/C.msg b/lib/libc/nls/C.msg
deleted file mode 100644
index cdc7c6853..000000000
--- a/lib/libc/nls/C.msg
+++ /dev/null
@@ -1,258 +0,0 @@
-$set 1
-$ EPERM
-1 Operation not permitted
-$ ENOENT
-2 No such file or directory
-$ ESRCH
-3 No such process
-$ EINTR
-4 Interrupted system call
-$ EIO
-5 Input/output error
-$ ENXIO
-6 Device not configured
-$ E2BIG
-7 Argument list too long
-$ ENOEXEC
-8 Exec format error
-$ EBADF
-9 Bad file descriptor
-$ ECHILD
-10 No child processes
-$ EDEADLK
-11 Resource deadlock avoided
-$ ENOMEM
-12 Cannot allocate memory
-$ EACCES
-13 Permission denied
-$ EFAULT
-14 Bad address
-$ ENOTBLK
-15 Block device required
-$ EBUSY
-16 Device busy
-$ EEXIST
-17 File exists
-$ EXDEV
-18 Cross-device link
-$ ENODEV
-19 Operation not supported by device
-$ ENOTDIR
-20 Not a directory
-$ EISDIR
-21 Is a directory
-$ EINVAL
-22 Invalid argument
-$ ENFILE
-23 Too many open files in system
-$ EMFILE
-24 Too many open files
-$ ENOTTY
-25 Inappropriate ioctl for device
-$ ETXTBSY
-26 Text file busy
-$ EFBIG
-27 File too large
-$ ENOSPC
-28 No space left on device
-$ ESPIPE
-29 Illegal seek
-$ EROFS
-30 Read-only file system
-$ EMLINK
-31 Too many links
-$ EPIPE
-32 Broken pipe
-$ EDOM
-33 Numerical argument out of domain
-$ ERANGE
-34 Result too large or too small
-$ EAGAIN, EWOULDBLOCK
-35 Resource temporarily unavailable
-$ EINPROGRESS
-36 Operation now in progress
-$ EALREADY
-37 Operation already in progress
-$ ENOTSOCK
-38 Socket operation on non-socket
-$ EDESTADDRREQ
-39 Destination address required
-$ EMSGSIZE
-40 Message too long
-$ EPROTOTYPE
-41 Protocol wrong type for socket
-$ ENOPROTOOPT
-42 Protocol option not available
-$ EPROTONOSUPPORT
-43 Protocol not supported
-$ ESOCKTNOSUPPORT
-44 Socket type not supported
-$ EOPNOTSUPP
-45 Operation not supported
-$ EPFNOSUPPORT
-46 Protocol family not supported
-$ EAFNOSUPPORT
-47 Address family not supported by protocol family
-$ EADDRINUSE
-48 Address already in use
-$ EADDRNOTAVAIL
-49 Can't assign requested address
-$ ENETDOWN
-50 Network is down
-$ ENETUNREACH
-51 Network is unreachable
-$ ENETRESET
-52 Network dropped connection on reset
-$ ECONNABORTED
-53 Software caused connection abort
-$ ECONNRESET
-54 Connection reset by peer
-$ ENOBUFS
-55 No buffer space available
-$ EISCONN
-56 Socket is already connected
-$ ENOTCONN
-57 Socket is not connected
-$ ESHUTDOWN
-58 Can't send after socket shutdown
-$ ETOOMANYREFS
-59 Too many references: can't splice
-$ ETIMEDOUT
-60 Connection timed out
-$ ECONNREFUSED
-61 Connection refused
-$ ELOOP
-62 Too many levels of symbolic links
-$ ENAMETOOLONG
-63 File name too long
-$ EHOSTDOWN
-64 Host is down
-$ EHOSTUNREACH
-65 No route to host
-$ ENOTEMPTY
-66 Directory not empty
-$ EPROCLIM
-67 Too many processes
-$ EUSERS
-68 Too many users
-$ EDQUOT
-69 Disc quota exceeded
-$ ESTALE
-70 Stale NFS file handle
-$ EREMOTE
-71 Too many levels of remote in path
-$ EBADRPC
-72 RPC struct is bad
-$ ERPCMISMATCH
-73 RPC version wrong
-$ EPROGUNAVAIL
-74 RPC prog. not avail
-$ EPROGMISMATCH
-75 Program version wrong
-$ EPROCUNAVAIL
-76 Bad procedure for program
-$ ENOLCK
-77 No locks available
-$ ENOSYS
-78 Function not implemented
-$ EFTYPE
-79 Inappropriate file type or format
-$ EAUTH
-80 Authentication error
-$ ENEEDAUTH
-81 Need authenticator
-$ EIDRM
-82 Identifier removed
-$ ENOMSG
-83 No message of desired type
-$ EOVERFLOW
-84 Value too large to be stored in data type
-$ EILSEQ
-85 Illegal byte sequence
-$ ENOTSUP
-86 Not supported
-$ ECANCELED
-87 Operation Canceled
-$ EBADMSG
-88 Bad or Corrupt message
-$ ENODATA
-89 No message available
-$ ENOSR
-90 No STREAM resources
-$ ENOSTR
-91 Not a STREAM
-$ ETIME
-92 STREAM ioctl timeout
-$ ENOATTR
-93 Attribute not found
-$ EMULTIHOP
-94 Multihop attempted
-$ ENOLINK
-95 Link has been severed
-$ EPROTO
-96 Protocol error
-$set 2
-$ SIGHUP
-1 Hangup
-$ SIGINT
-2 Interrupt
-$ SIGQUIT
-3 Quit
-$ SIGILL
-4 Illegal instruction
-$ SIGTRAP
-5 Trace/BPT trap
-$ SIGABRT
-6 Abort trap
-$ SIGEMT
-7 EMT trap
-$ SIGFPE
-8 Floating point exception
-$ SIGKILL
-9 Killed
-$ SIGBUS
-10 Bus error
-$ SIGSEGV
-11 Segmentation fault
-$ SIGSYS
-12 Bad system call
-$ SIGPIPE
-13 Broken pipe
-$ SIGALRM
-14 Alarm clock
-$ SIGTERM
-15 Terminated
-$ SIGURG
-16 Urgent I/O condition
-$ SIGSTOP
-17 Stopped (signal)
-$ SIGTSTP
-18 Stopped
-$ SIGCONT
-19 Continued
-$ SIGCHLD
-20 Child exited
-$ SIGTTIN
-21 Stopped (tty input)
-$ SIGTTOU
-22 Stopped (tty output)
-$ SIGIO
-23 I/O possible
-$ SIGXCPU
-24 Cputime limit exceeded
-$ SIGXFSZ
-25 Filesize limit exceeded
-$ SIGVTALRM
-26 Virtual timer expired
-$ SIGPROF
-27 Profiling timer expired
-$ SIGWINCH
-28 Window size changes
-$ SIGINFO
-29 Information request
-$ SIGUSR1
-30 User defined signal 1
-$ SIGUSR2
-31 User defined signal 2
-$ SIGPWR
-32 Power fail/restart
diff --git a/lib/libc/nls/Makefile.inc b/lib/libc/nls/Makefile.inc
deleted file mode 100644
index a505851a6..000000000
--- a/lib/libc/nls/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.12 2013/08/19 08:03:34 joerg Exp $
-
-.PATH: ${.CURDIR}/nls
-
-SRCS+=	catclose.c catgets.c catopen.c 
-MAN+=	catclose.3 catgets.3 catopen.3
-
-CPPFLAGS.catopen.c+=	-I${LIBCDIR}/citrus
-
diff --git a/lib/libc/nls/Pig.msg b/lib/libc/nls/Pig.msg
deleted file mode 100644
index edff3cd69..000000000
--- a/lib/libc/nls/Pig.msg
+++ /dev/null
@@ -1,236 +0,0 @@
-$set 1
-$ EPERM
-1 Operationway otnay ermittedpay
-$ ENOENT
-2 Onay uchsay ilefay orway irectoryday
-$ ESRCH
-3 Onay uchsay ocesspray
-$ EINTR
-4 Interruptedway ystemsay allcay
-$ EIO
-5 Inputway/outputway errorway
-$ ENXIO
-6 Eviceday otnay onfiguredcay
-$ E2BIG
-7 Argumentway istlay ootay onglay
-$ ENOEXEC
-8 Execway ormatfay errorway
-$ EBADF
-9 Adbay ilefay escriptorday
-$ ECHILD
-10 Onay ildchay ocessespray
-$ EDEADLK
-11 Esourceray eadlockday avoidedway
-$ ENOMEM
-12 Annotcay allocateway emorymay
-$ EACCES
-13 Ermissionpay eniedday
-$ EFAULT
-14 Adbay addressway
-$ ENOTBLK
-15 Ockblay eviceday equiredray
-$ EBUSY
-16 Eviceday usybay
-$ EEXIST
-17 Ilefay existsway
-$ EXDEV
-18 Osscray-eviceday inklay
-$ ENODEV
-19 Operationway otnay upportedsay ybay eviceday
-$ ENOTDIR
-20 Otnay away irectoryday
-$ EISDIR
-21 Isway away irectoryday
-$ EINVAL
-22 Invalidway argumentway
-$ ENFILE
-23 Ootay anymay openway ilesfay inway ystemsay
-$ EMFILE
-24 Ootay anymay openway ilesfay
-$ ENOTTY
-25 Inappropriateway ioctlway orfay eviceday
-$ ETXTBSY
-26 Exttay ilefay usybay
-$ EFBIG
-27 Ilefay ootay argelay
-$ ENOSPC
-28 Onay acespay eftlay onway eviceday
-$ ESPIPE
-29 Illegalway eeksay
-$ EROFS
-30 Eadray-onlyway ilefay ystemsay
-$ EMLINK
-31 Ootay anymay inkslay
-$ EPIPE
-32 Okenbray ipepay
-$ EDOM
-33 Umericalnay argumentway outway ofway omainday
-$ ERANGE
-34 Esultray ootay argelay
-$ EAGAIN, EWOULDBLOCK
-35 Esourceray emporarilytay unavailableway
-$ EINPROGRESS
-36 Operationway ownay inway ogresspray
-$ EALREADY
-37 Operationway alreadyway inway ogresspray
-$ ENOTSOCK
-38 Ocketsay operationway onway onnay-ocketsay
-$ EDESTADDRREQ
-39 Estinationday addressway equiredray
-$ EMSGSIZE
-40 Essagemay ootay onglay
-$ EPROTOTYPE
-41 Otocolpray ongwray ypetay orfay ocketsay
-$ ENOPROTOOPT
-42 Otocolpray otnay availableway
-$ EPROTONOSUPPORT
-43 Otocolpray otnay upportedsay
-$ ESOCKTNOSUPPORT
-44 Ocketsay ypetay otnay upportedsay
-$ EOPNOTSUPP
-45 Operationway otnay upportedsay
-$ EPFNOSUPPORT
-46 Otocolpray amilyfay otnay upportedsay
-$ EAFNOSUPPORT
-47 Addressway amilyfay otnay upportedsay ybay otocolpray amilyfay
-$ EADDRINUSE
-48 Addressway alreadyway inway useway
-$ EADDRNOTAVAIL
-49 Ancay'tay assignway equestedray addressway
-$ ENETDOWN
-50 Etworknay isway ownday
-$ ENETUNREACH
-51 Etworknay isway unreachableway
-$ ENETRESET
-52 Etworknay oppeddray onnectioncay onway esetray
-$ ECONNABORTED
-53 Oftwaresay ausedcay onnectioncay abortway
-$ ECONNRESET
-54 Onnectioncay esetray ybay eerpay
-$ ENOBUFS
-55 Onay ufferbay acespay availableway
-$ EISCONN
-56 Ocketsay isway alreadyway onnectedcay
-$ ENOTCONN
-57 Ocketsay isway otnay onnectedcay
-$ ESHUTDOWN
-58 Ancay'tay endsay afterway ocketsay utdownshay
-$ ETOOMANYREFS
-59 Ootay anymay eferencesray: ancay'tay icesplay
-$ ETIMEDOUT
-60 Onnectioncay imedtay outway
-$ ECONNREFUSED
-61 Onnectioncay efusedray
-$ ELOOP
-62 Ootay anymay evelslay ofway ymbolicsay inkslay
-$ ENAMETOOLONG
-63 Ilefay amenay ootay onglay
-$ EHOSTDOWN
-64 Osthay isway ownday
-$ EHOSTUNREACH
-65 Onay outeray otay osthay
-$ ENOTEMPTY
-66 Irectoryday otnay emptyway
-$ EPROCLIM
-67 Ootay anymay ocessespray
-$ EUSERS
-68 Ootay anymay usersway
-$ EDQUOT
-69 Iscday otaquay exceededway
-$ ESTALE
-70 Alestay NFSay ilefay andlehay
-$ EREMOTE
-71 Ootay anymay evelslay ofway emoteray inway athpay
-$ EBADRPC
-72 RPCay uctstray isway adbay
-$ ERPCMISMATCH
-73 RPCay ersionvay ongwray
-$ EPROGUNAVAIL
-74 RPCay ogpray. otnay availway
-$ EPROGMISMATCH
-75 Ogrampray ersionvay ongwray
-$ EPROCUNAVAIL
-76 Adbay ocedurepray orfay ogrampray
-$ ENOLCK
-77 Onay ockslay availableway
-$ ENOSYS
-78 Unctionfay otnay implementedway
-$ EFTYPE
-79 Inappropriateway ilefay ypetay orway ormatfay
-$ EAUTH
-80 Authenticationway errorway
-$ ENEEDAUTH
-81 Eednay authenticatorway
-$ EIDRM
-82 Identifierway emovedray
-$ ENOMSG
-83 Onay essagemay ofway esiredday ypetay
-$ EOVERFLOW
-84 Aluevay ootay argelay otay ebay oredstay inway ataday ypetay
-$ EILSEQ
-85 Illegalway ytebay equencesay
-$set 2
-$ SIGHUP
-1 Anguphay
-$ SIGINT
-2 Interruptway
-$ SIGQUIT
-3 Itquay
-$ SIGILL
-4 Illegalway instructionway
-$ SIGTRAP
-5 aceTray/BPTay aptray
-$ SIGABRT
-6 Abortway aptray
-$ SIGEMT
-7 EMTway aptray
-$ SIGFPE
-8 Oatingflay ointpay exceptionway
-$ SIGKILL
-9 Illedkay
-$ SIGBUS
-10 Usbay errorway
-$ SIGSEGV
-11 Egmentationsay aultfay
-$ SIGSYS
-12 Adbay ystemsay allcay
-$ SIGPIPE
-13 Okenbray ipepay
-$ SIGALRM
-14 Alarmway ockclay
-$ SIGTERM
-15 Erminatedtay
-$ SIGURG
-16 Urgentway Iway/Oway onditioncay
-$ SIGSTOP
-17 Oppedstay (ignalsay)
-$ SIGTSTP
-18 Oppedstay
-$ SIGCONT
-19 Ontinuedcay
-$ SIGCHLD
-20 Ildchay exitedway
-$ SIGTTIN
-21 Oppedstay (yttay inputway)
-$ SIGTTOU
-22 Oppedstay (yttay outputway)
-$ SIGIO
-23 Iway/Oway ossiblepay
-$ SIGXCPU
-24 Utimecpay imitlay exceededway
-$ SIGXFSZ
-25 Ilesizefay imitlay exceededway
-$ SIGVTALRM
-26 Irtualvay imertay expiredway
-$ SIGPROF
-27 Ofilingpray imertay expiredway
-$ SIGWINCH
-28 Indowway izesay angeschay
-$ SIGINFO
-29 Informationway equestray
-$ SIGUSR1
-30 Userway efinedday ignalsay 1
-$ SIGUSR2
-31 Userway efinedday ignalsay 2
-$ SIGPWR
-32 Owerpay ailfay/estartray
diff --git a/lib/libc/nls/ca.msg b/lib/libc/nls/ca.msg
deleted file mode 100644
index 740028fb8..000000000
--- a/lib/libc/nls/ca.msg
+++ /dev/null
@@ -1,258 +0,0 @@
-$set 1
-$ EPERM
-1 Operació no permesa
-$ ENOENT
-2 Arxiu o directori inexistent
-$ ESRCH
-3 Procés inexistent
-$ EINTR
-4 Crida del sistema interrompuda
-$ EIO
-5 Error d'entrada/sortida
-$ ENXIO
-6 Dispositiu no configurat
-$ E2BIG
-7 Llista de paràmetres massa llarga
-$ ENOEXEC
-8 Error en el format de l'executable
-$ EBADF
-9 Descriptor d'arxiu incorrecte
-$ ECHILD
-10 No hi ha processos fills
-$ EDEADLK
-11 S'ha evitat el bloqueig del recurs
-$ ENOMEM
-12 No es pot assignar la memòria demanada
-$ EACCES
-13 Permís denegat
-$ EFAULT
-14 Adreça incorrecta
-$ ENOTBLK
-15 Es necessita un dispositiu de blocs
-$ EBUSY
-16 Dispositiu ocupat
-$ EEXIST
-17 L'arxiu ja existeix
-$ EXDEV
-18 Enllaç entre dispositius
-$ ENODEV
-19 Operació no suportada pel dispositiu
-$ ENOTDIR
-20 No és un directori
-$ EISDIR
-21 És un directori
-$ EINVAL
-22 Paràmetre incorrecte
-$ ENFILE
-23 Hi ha massa arxius oberts al sistema
-$ EMFILE
-24 Hi ha massa arxius oberts
-$ ENOTTY
-25 L'ioctl no és adecuat per al dispositiu
-$ ETXTBSY
-26 Arxiu de text ocupat
-$ EFBIG
-27 Arxiu massa gran
-$ ENOSPC
-28 No queda espai lliure en el dispositiu
-$ ESPIPE
-29 Cerca il·legal
-$ EROFS
-30 Sistema d'arxius de només lectura
-$ EMLINK
-31 Massa enllaços
-$ EPIPE
-32 Canal (pipe) trencat
-$ EDOM
-33 El resultat surt fora de rang
-$ ERANGE
-34 Resultat massa gran
-$ EAGAIN, EWOULDBLOCK
-35 El recurs no està disponible temporalment
-$ EINPROGRESS
-36 L'operació es troba en progrés actualment
-$ EALREADY
-37 L'operació ja es troba en progrés
-$ ENOTSOCK
-38 Operació de tipus socket en quelcom que no ho és
-$ EDESTADDRREQ
-39 Es requereix l'adreça de destí
-$ EMSGSIZE
-40 Missatge massa llarg
-$ EPROTOTYPE
-41 Tipus de protocol incorrecte per al socket
-$ ENOPROTOOPT
-42 Protocol no disponible
-$ EPROTONOSUPPORT
-43 Protocol no suportat
-$ ESOCKTNOSUPPORT
-44 Tipus de socket no suportat
-$ EOPNOTSUPP
-45 Operació no suportada
-$ EPFNOSUPPORT
-46 Família de protocols no suportada
-$ EAFNOSUPPORT
-47 Família d'adreces no suportada per la família de protocols
-$ EADDRINUSE
-48 L'adreça ja es troba en ús
-$ EADDRNOTAVAIL
-49 No es pot assignar l'adreça demanada
-$ ENETDOWN
-50 La xarxa no es troba disponible
-$ ENETUNREACH
-51 No es pot accedir a la xarxa
-$ ENETRESET
-52 La connexió a la xarxa s'ha perdut durant la reinicialització
-$ ECONNABORTED
-53 El programari ha causat l'avort de la connexió
-$ ECONNRESET
-54 L'interlocutor ha reinicialitzat la comunicació
-$ ENOBUFS
-55 No hi ha prou espai per a la memoria intermèdia (buffer)
-$ EISCONN
-56 El socket ja es troba connectat
-$ ENOTCONN
-57 El socket no es troba connectat
-$ ESHUTDOWN
-58 No es pot enviar desprès de la desconnexió del socket
-$ ETOOMANYREFS
-59 Hi ha massa referències: no es poden unir
-$ ETIMEDOUT
-60 El temps de connexió s'ha esgotat
-$ ECONNREFUSED
-61 Connexió rebutjada
-$ ELOOP
-62 Hi ha massa nivells d'enllaços simbòlics
-$ ENAMETOOLONG
-63 Nom d'arxiu massa llarg
-$ EHOSTDOWN
-64 La màquina no es troba disponible
-$ EHOSTUNREACH
-65 No hi ha cap camí fins a la màquina
-$ ENOTEMPTY
-66 El directori no està buit
-$ EPROCLIM
-67 Hi ha massa processos
-$ EUSERS
-68 Hi ha massa usuaris
-$ EDQUOT
-69 Quota de disc sobrepassada
-$ ESTALE
-70 Descriptor d'arxiu NFS incorrecte
-$ EREMOTE
-71 Massa nivells en el camí de destí
-$ EBADRPC
-72 L'estructura RPC es incorrecta
-$ ERPCMISMATCH
-73 La versió del RPC es incorrecta
-$ EPROGUNAVAIL
-74 El programa RPC no es troba disponible
-$ EPROGMISMATCH
-75 Versió incorrecta del programa
-$ EPROCUNAVAIL
-76 Procediment erroni per al programa
-$ ENOLCK
-77 No hi ha bloquejos disponibles
-$ ENOSYS
-78 Funció no implementada
-$ EFTYPE
-79 Tipus d'arxiu o de format inadequat
-$ EAUTH
-80 Error d'autenticació
-$ ENEEDAUTH
-81 Es necessita un autenticador
-$ EIDRM
-82 Identificador eliminat
-$ ENOMSG
-83 No hi ha missatges del tipus desitjat
-$ EOVERFLOW
-84 Valor massa gran per a ésser emmagatzemat en el tipus de dades
-$ EILSEQ
-85 Seqüència de bytes il·legal
-$ ENOTSUP
-86 No suportat
-$ ECANCELED
-87 Operació cancel·lada
-$ EBADMSG
-88 Missatje incorrecte o corrupte
-$ ENODATA
-89 No hi ha missatges disponibles
-$ ENOSR
-90 No hi ha recursos de tipus STREAM
-$ ENOSTR
-91 No és un STREAM
-$ ETIME
-92 Temps d'espera esgotat en el ioctl STREAM
-$ ENOATTR
-93 Atribut inexistent
-$ EMULTIHOP
-94 S'ha intentat un multisalt
-$ ENOLINK
-95 L'enllaç s'ha servit
-$ EPROTO
-96 Error de protocol
-$set 2
-$ SIGHUP
-1 Fí de línia (hangup)
-$ SIGINT
-2 Interrupció
-$ SIGQUIT
-3 Finalització
-$ SIGILL
-4 Instrucció il·legal
-$ SIGTRAP
-5 Depuració (Trace/BPT)
-$ SIGABRT
-6 Crida d'avort
-$ SIGEMT
-7 Captura d'EMT
-$ SIGFPE
-8 Excepció de coma flotant
-$ SIGKILL
-9 Matat
-$ SIGBUS
-10 Error del bus
-$ SIGSEGV
-11 Error de segmentació
-$ SIGSYS
-12 Crida al sistema incorrecta
-$ SIGPIPE
-13 Canal (pipe) trencat
-$ SIGALRM
-14 Alarma de rellotge
-$ SIGTERM
-15 Finalitzat
-$ SIGURG
-16 Condició urgent d'E/S
-$ SIGSTOP
-17 Parat (per senyal)
-$ SIGTSTP
-18 Parat
-$ SIGCONT
-19 Continuant
-$ SIGCHLD
-20 El fill ha acabat
-$ SIGTTIN
-21 Parat (entrada de tty)
-$ SIGTTOU
-22 Parat (sortida de tty)
-$ SIGIO
-23 I/O permesa
-$ SIGXCPU
-24 S'ha sobrepassat el límit de temps de la CPU
-$ SIGXFSZ
-25 S'ha sobrepassat el límit de la longitud de l'arxiu
-$ SIGVTALRM
-26 El temporitzador virtual ha expirat
-$ SIGPROF
-27 El temporitzador del perfilador ha expirat
-$ SIGWINCH
-28 Canvis en la mida de la finestra
-$ SIGINFO
-29 Demanda d'informació
-$ SIGUSR1
-30 Senyal 1 definida per l'usuari
-$ SIGUSR2
-31 Senyal 2 definida per l'usuari
-$ SIGPWR
-32 Fallada/reinicialització de l'alimentació
diff --git a/lib/libc/nls/catclose.3 b/lib/libc/nls/catclose.3
deleted file mode 100644
index abfada75b..000000000
--- a/lib/libc/nls/catclose.3
+++ /dev/null
@@ -1,32 +0,0 @@
-.\"	$NetBSD: catclose.3,v 1.12 2003/07/26 19:24:49 salo Exp $
-.\"
-.\" Written by J.T. Conklin <jtc@NetBSD.org>.
-.\" Public domain.
-.\"
-.Dd May 29, 1994
-.Dt CATCLOSE 3
-.Os
-.Sh NAME
-.Nm catclose
-.Nd close message catalog
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In nl_types.h
-.Ft int
-.Fn catclose "nl_catd catd"
-.Sh DESCRIPTION
-The
-.Fn catclose
-function closes the message catalog specified by the argument
-.Fa catd .
-.Sh SEE ALSO
-.Xr gencat 1 ,
-.Xr catgets 3 ,
-.Xr catopen 3 ,
-.Xr nls 7
-.Sh STANDARDS
-The
-.Fn catclose
-function conforms to
-.St -xpg3 .
diff --git a/lib/libc/nls/catclose.c b/lib/libc/nls/catclose.c
deleted file mode 100644
index 760b0d0c7..000000000
--- a/lib/libc/nls/catclose.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: catclose.c,v 1.14 2012/06/25 22:32:45 abs Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: catclose.c,v 1.14 2012/06/25 22:32:45 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define _NLS_PRIVATE
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <nl_types.h>
-
-#ifdef __weak_alias
-__weak_alias(catclose, _catclose)
-#endif
-
-int
-_catclose(nl_catd catd)
-{
-	if (catd == (nl_catd) -1) {
-		errno = EBADF;
-		return -1;
-	}
-	
-	if (catd) {
-		munmap(catd->__data, (size_t)catd->__size);
-		free (catd);
-	}
-
-	return 0;
-}
diff --git a/lib/libc/nls/catgets.3 b/lib/libc/nls/catgets.3
deleted file mode 100644
index 87c798f78..000000000
--- a/lib/libc/nls/catgets.3
+++ /dev/null
@@ -1,73 +0,0 @@
-.\"	$NetBSD: catgets.3,v 1.16 2003/07/26 19:24:49 salo Exp $
-.\"
-.\" Written by J.T. Conklin <jtc@NetBSD.org>.
-.\" Public domain.
-.\"
-.Dd February 12, 2003
-.Dt CATGETS 3
-.Os
-.Sh NAME
-.Nm catgets
-.Nd retrieve string from message catalog
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In nl_types.h
-.Ft char *
-.Fn catgets "nl_catd catd" "int set_id" "int msg_id" "const char *s"
-.Sh DESCRIPTION
-The
-.Fn catgets
-function attempts to retrieve message
-.Fa msg_id
-of set
-.Fa set_id
-from the message catalog referenced by the descriptor
-.Fa catd .
-The argument
-.Fa s
-points to a default message which is returned if the function
-is unable to retrieve the specified message.
-.Sh RETURN VALUES
-If the specified message was retrieved successfully,
-.Fn catgets
-returns a pointer to an internal buffer containing the message string;
-otherwise it returns
-.Fa s .
-.Sh ERRORS
-The
-.Fn catgets
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa catd
-argument is not a valid message catalog descriptor open for reading.
-.It Bq Er EINTR
-The operation was interrupted by a signal.
-.It Bq Er ENOMSG
-The message identified by
-.Fa set_id
-and
-.Fa msg_id
-is not in the message catalog.
-.El
-.Sh SEE ALSO
-.Xr gencat 1 ,
-.Xr catclose 3 ,
-.Xr catopen 3 ,
-.Xr nls 7
-.Sh STANDARDS
-The
-.Fn catgets
-function conforms to
-.St -xpg4.2 .
-.Pp
-Major Unix vendors are split over the adoption of the two most
-important message catalog specifications: catgets or
-.Xr gettext 3 .
-The primary concern with the catgets interface is that every
-translatable string has to define a number (or a symbolic constant)
-which must correspond to the message in the catalog.
-Duplicate message IDs are not allowed.
-Constructing message catalogs is difficult.
diff --git a/lib/libc/nls/catgets.c b/lib/libc/nls/catgets.c
deleted file mode 100644
index 32eb17c74..000000000
--- a/lib/libc/nls/catgets.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*	$NetBSD: catgets.c,v 1.19 2012/06/25 22:32:45 abs Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: catgets.c,v 1.19 2012/06/25 22:32:45 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define _NLS_PRIVATE
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <nl_types.h>
-
-#ifdef __weak_alias
-__weak_alias(catgets, _catgets)
-#endif
-
-char *
-_catgets(nl_catd catd, int set_id, int msg_id, const char *s)
-{
-	struct _nls_cat_hdr *cat_hdr;
-	struct _nls_set_hdr *set_hdr;
-	struct _nls_msg_hdr *msg_hdr;
-	int l, u, i, r;
-
-	if (catd == (nl_catd) -1) {
-		errno = EBADF;
-		return __UNCONST(s);
-	}
-
-	cat_hdr = (struct _nls_cat_hdr *)catd->__data; 
-	set_hdr = (struct _nls_set_hdr *)(void *)((char *)catd->__data
-		+ sizeof(struct _nls_cat_hdr));
-
-	/* binary search, see knuth algorithm b */
-	l = 0;
-	u = ntohl((u_int32_t)cat_hdr->__nsets) - 1;
-	while (l <= u) {
-		i = (l + u) / 2;
-		r = set_id - ntohl((u_int32_t)set_hdr[i].__setno);
-
-		if (r == 0) {
-			msg_hdr = (struct _nls_msg_hdr *)
-			    (void *)((char *)catd->__data +
-			    sizeof(struct _nls_cat_hdr) +
-			    ntohl((u_int32_t)cat_hdr->__msg_hdr_offset));
-
-			l = ntohl((u_int32_t)set_hdr[i].__index);
-			u = l + ntohl((u_int32_t)set_hdr[i].__nmsgs) - 1;
-			while (l <= u) {
-				i = (l + u) / 2;
-				r = msg_id -
-				    ntohl((u_int32_t)msg_hdr[i].__msgno);
-				if (r == 0) {
-					return ((char *) catd->__data +
-					    sizeof(struct _nls_cat_hdr) +
-					    ntohl((u_int32_t)
-					    cat_hdr->__msg_txt_offset) +
-					    ntohl((u_int32_t)
-					    msg_hdr[i].__offset));
-				} else if (r < 0) {
-					u = i - 1;
-				} else {
-					l = i + 1;
-				}
-			}
-
-			/* not found */
-			goto notfound;
-
-		} else if (r < 0) {
-			u = i - 1;
-		} else {
-			l = i + 1;
-		}
-	}
-
-notfound:
-	/* not found */
-	errno = ENOMSG;
-	return __UNCONST(s);
-}
diff --git a/lib/libc/nls/catopen.3 b/lib/libc/nls/catopen.3
deleted file mode 100644
index c26364f75..000000000
--- a/lib/libc/nls/catopen.3
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"	$NetBSD: catopen.3,v 1.14 2003/07/26 19:24:49 salo Exp $
-.\"
-.\" Written by J.T. Conklin <jtc@NetBSD.org>.
-.\" Public domain.
-.\"
-.Dd May 29, 1994
-.Dt CATOPEN 3
-.Os
-.Sh NAME
-.Nm catopen
-.Nd open message catalog
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In nl_types.h
-.Ft nl_catd
-.Fn catopen "const char *name" "int oflag"
-.Sh DESCRIPTION
-The
-.Fn catopen
-function opens the message catalog specified by
-.Fa name
-and returns a message catalog descriptor.
-If
-.Fa name
-contains a
-.Sq /
-then
-.Fa name
-specifies the full pathname for the message catalog, otherwise the value
-of the environment variable
-.Ev NLSPATH
-is used with
-.Fa name
-substituted for %N.
-.Pp
-The
-.Fa oflag
-argument is reserved for future use and should be set to zero.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn catopen
-returns a message catalog descriptor.
-Otherwise, (nl_catd) -1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-Insufficient memory is available.
-.El
-.Sh SEE ALSO
-.Xr gencat 1 ,
-.Xr catclose 3 ,
-.Xr catgets 3 ,
-.Xr nls 7
-.Sh STANDARDS
-The
-.Fn catopen
-function conforms to
-.St -xpg3 .
diff --git a/lib/libc/nls/catopen.c b/lib/libc/nls/catopen.c
deleted file mode 100644
index d4a74981f..000000000
--- a/lib/libc/nls/catopen.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*	$NetBSD: catopen.c,v 1.33 2014/09/16 01:30:28 christos Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: catopen.c,v 1.33 2014/09/16 01:30:28 christos Exp $");
-
-#define _NLS_PRIVATE
-#define __SETLOCALE_SOURCE__
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#include <assert.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <locale.h>
-#include <nl_types.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_lookup.h"
-#include "citrus_aliasname_local.h"
-#include "setlocale_local.h"
-
-#define NLS_ALIAS_DB "/usr/share/nls/nls.alias"
-
-#define NLS_DEFAULT_PATH "/usr/share/nls/%L/%N.cat:/usr/share/nls/%N/%L"
-#define NLS_DEFAULT_LANG "C"
-
-__weak_alias(catopen, _catopen)
-__weak_alias(catopen_l, _catopen_l)
-
-static nl_catd load_msgcat(const char *);
-
-nl_catd
-catopen(const char *name, int oflag)
-{
-
-	return catopen_l(name, oflag, _current_locale());
-}
-
-nl_catd
-catopen_l(const char *name, int oflag, locale_t loc)
-{
-	char tmppath[PATH_MAX+1];
-	const char *nlspath;
-	const char *lang, *reallang;
-	char *t;
-	const char *s, *u;
-	nl_catd catd;
-	char langbuf[PATH_MAX];
-
-	if (name == NULL || *name == '\0')
-		return (nl_catd)-1;
-
-	/* absolute or relative path? */
-	if (strchr(name, '/'))
-		return load_msgcat(name);
-
-	if (issetugid() || (nlspath = getenv("NLSPATH")) == NULL)
-		nlspath = NLS_DEFAULT_PATH;
-	/*
-	 * Historical note:
-	 * http://www.hauN.org/ml/b-l-j/a/800/828.html (in japanese)
-	 */
-	if (oflag == NL_CAT_LOCALE) {
-		lang = loc->part_name[LC_MESSAGES];
-	} else {
-		lang = getenv("LANG");
-	}
-	if (lang == NULL || strchr(lang, '/'))
-		lang = NLS_DEFAULT_LANG;
-
-	reallang = __unaliasname(NLS_ALIAS_DB, lang, langbuf, sizeof(langbuf));
-	if (reallang == NULL)
-		reallang = lang;
-
-	s = nlspath;
-	t = tmppath;
-	do {
-		while (*s && *s != ':') {
-			if (*s == '%') {
-				switch (*(++s)) {
-				case 'L':	/* locale */
-					u = reallang;
-					while (*u && t < tmppath + PATH_MAX)
-						*t++ = *u++;
-					break;
-				case 'N':	/* name */
-					u = name;
-					while (*u && t < tmppath + PATH_MAX)
-						*t++ = *u++;
-					break;
-				case 'l':	/* lang */
-				case 't':	/* territory */
-				case 'c':	/* codeset */
-					break;
-				default:
-					if (t < tmppath + PATH_MAX)
-						*t++ = *s;
-				}
-			} else {
-				if (t < tmppath + PATH_MAX)
-					*t++ = *s;
-			}
-			s++;
-		}
-
-		*t = '\0';
-		catd = load_msgcat(tmppath);
-		if (catd != (nl_catd)-1)
-			return catd;
-
-		if (*s)
-			s++;
-		t = tmppath;
-	} while (*s);
-
-	return (nl_catd)-1;
-}
-
-static nl_catd
-load_msgcat(const char *path)
-{
-	struct stat st;
-	nl_catd catd;
-	void *data;
-	int fd;
-
-	_DIAGASSERT(path != NULL);
-
-	if ((fd = open(path, O_RDONLY|O_CLOEXEC)) == -1)
-		return (nl_catd)-1;
-
-	if (fstat(fd, &st) != 0) {
-		close (fd);
-		return (nl_catd)-1;
-	}
-
-	data = mmap(0, (size_t)st.st_size, PROT_READ, MAP_FILE|MAP_SHARED, fd,
-	    (off_t)0);
-	close (fd);
-
-	if (data == MAP_FAILED) {
-		return (nl_catd)-1;
-	}
-
-	if (ntohl((u_int32_t)((struct _nls_cat_hdr *)data)->__magic) !=
-	    _NLS_MAGIC) {
-		munmap(data, (size_t)st.st_size);
-		return (nl_catd)-1;
-	}
-
-	if ((catd = malloc(sizeof (*catd))) == NULL) {
-		munmap(data, (size_t)st.st_size);
-		return (nl_catd)-1;
-	}
-
-	catd->__data = data;
-	catd->__size = (int)st.st_size;
-	return catd;
-}
diff --git a/lib/libc/nls/cs.msg b/lib/libc/nls/cs.msg
deleted file mode 100644
index 97e6cbff4..000000000
--- a/lib/libc/nls/cs.msg
+++ /dev/null
@@ -1,258 +0,0 @@
-$set 1
-$ EPERM
-1 Operace není povolena
-$ ENOENT
-2 Neexistující soubor nebo adresáø
-$ ESRCH
-3 Proces neexistuje
-$ EINTR
-4 Systémové volání pøeru¹eno
-$ EIO
-5 Vstupní/výstupní chyba
-$ ENXIO
-6 Zaøízení není nakonfigurováno
-$ E2BIG
-7 Seznam argumentù je pøíli¹ dlouhý
-$ ENOEXEC
-8 Chyba formátu spu¹tìného souboru
-$ EBADF
-9 ©patný souborový deskriptor
-$ ECHILD
-10 Neexistuje ¾ádný potomek procesu
-$ EDEADLK
-11 Zabránìno uváznutí (deadlock) prostøedku
-$ ENOMEM
-12 Nedostatek pamìti
-$ EACCES
-13 Pøístup odmítnut
-$ EFAULT
-14 Chybná adresa
-$ ENOTBLK
-15 Vy¾adováno blokové zaøízení
-$ EBUSY
-16 Zdroj nebo zaøízení je zaneprázdnìno
-$ EEXIST
-17 Soubor existuje
-$ EXDEV
-18 Odkaz vede na jiné zaøízení
-$ ENODEV
-19 Operace není zaøízením podporována
-$ ENOTDIR
-20 Toto není adresáø
-$ EISDIR
-21 Toto je adresáø
-$ EINVAL
-22 Chybný argument
-$ ENFILE
-23 Pøíli¹ mnoho otevøených souborù v systému
-$ EMFILE
-24 Pøíli¹ mnoho otevøených souborù
-$ ENOTTY
-25 Pro dané zaøízení nevhodné ioctl
-$ ETXTBSY
-26 S textovým souborem se pracuje
-$ EFBIG
-27 Soubor je pøíli¹ velký
-$ ENOSPC
-28 Na zaøízení není volné místo
-$ ESPIPE
-29 Neplatný lseek(2)
-$ EROFS
-30 Souborový systém je pouze pro ètení
-$ EMLINK
-31 Pøíli¹ mnoho odkazù
-$ EPIPE
-32 Pøeru¹ená roura
-$ EDOM
-33 Èíselný argument mimo definièní obor
-$ ERANGE
-34 Výsledek pøíli¹ velký nebo pøíli¹ malý
-$ EAGAIN, EWOULDBLOCK
-35 Prostøedek je doèasnì nedostupný
-$ EINPROGRESS
-36 Operace nyní probíhá
-$ EALREADY
-37 Operace ji¾ probíhá
-$ ENOTSOCK
-38 Socketová operace na neèem, co není socket
-$ EDESTADDRREQ
-39 Vy¾adována adresa cíle
-$ EMSGSIZE
-40 Zpráva je pøíli¹ dlouhá
-$ EPROTOTYPE
-41 Protokol nepodporuje daný typ socketu
-$ ENOPROTOOPT
-42 Protokol není dostupný
-$ EPROTONOSUPPORT
-43 Protokol není podporován
-$ ESOCKTNOSUPPORT
-44 Typ socketu není podporován
-$ EOPNOTSUPP
-45 Operace není podporována
-$ EPFNOSUPPORT
-46 Rodina protokolù není podporována
-$ EAFNOSUPPORT
-47 Rodina adres není protokolem podporována
-$ EADDRINUSE
-48 Adresa je ji¾ pou¾ívána
-$ EADDRNOTAVAIL
-49 Není mo¾no pøidìlit po¾adovanou adresu
-$ ENETDOWN
-50 Sí» je odpojena
-$ ENETUNREACH
-51 Sí» je nedosa¾itelná
-$ ENETRESET
-52 Sí» zru¹ila spojení po resetu
-$ ECONNABORTED
-53 Program zpùsobil ukonèení spojení
-$ ECONNRESET
-54 Spojení zru¹eno partnerem
-$ ENOBUFS
-55 Vyrovnávací pamì» není k dispozici
-$ EISCONN
-56 Socket je ji¾ u¾ pøipojen
-$ ENOTCONN
-57 Socket není pøipojen
-$ ESHUTDOWN
-58 Není mo¾no posílat po shutdownu socketu
-$ ETOOMANYREFS
-59 Pøíli¹ mnoho referencí: nelze spojit
-$ ETIMEDOUT
-60 Pøekroèen èasový limit pokusu o spojení
-$ ECONNREFUSED
-61 Spojení odmítnuto
-$ ELOOP
-62 Pøíli¹ mnoho úrovní symbolických odkazù
-$ ENAMETOOLONG
-63 Jméno souboru pøíli¹ dlouhé
-$ EHOSTDOWN
-64 Vzdálený uzel je odpojen
-$ EHOSTUNREACH
-65 Neexistuje cesta ke vzdálenému uzlu
-$ ENOTEMPTY
-66 Adresáø není prázdný
-$ EPROCLIM
-67 Pøíli¹ mnoho procesù
-$ EUSERS
-68 Pøíli¹ mnoho u¾ivatelù
-$ EDQUOT
-69 Disková kvóta pøekroèena
-$ ESTALE
-70 Propadnutý souborový ukazatel pro NFS
-$ EREMOTE
-71 Pøíli¹ mnoho úrovní vzdáleného v cestì
-$ EBADRPC
-72 ©patná RPC struktura
-$ ERPCMISMATCH
-73 RPC: Nekompatibilní verze RPC
-$ EPROGUNAVAIL
-74 RPC: Program není dostupný
-$ EPROGMISMATCH
-75 RPC: Neshoda programu nebo verze
-$ EPROCUNAVAIL
-76 RPC: Procedura není dostupná
-$ ENOLCK
-77 Zámky souborových záznamù nejsou dostupné
-$ ENOSYS
-78 Funkce není implementována
-$ EFTYPE
-79 Nevhodný typ nebo formát souboru
-$ EAUTH
-80 Chyba autentifikace
-$ ENEEDAUTH
-81 Je tøeba se autentifikovat
-$ EIDRM
-82 Identifikátor zru¹en
-$ ENOMSG
-83 Neexistuje zpráva ¾ádaného typu
-$ EOVERFLOW
-84 Hodnota je pro daný datový typ pøíli¹ velká
-$ EILSEQ
-85 Neplatná posloupnost bajtù
-$ ENOTSUP
-86 Nepodporováno
-$ ECANCELED
-87 Operace strornována
-$ EBADMSG
-88 ©patná nebo poru¹ená zpráva
-$ ENODATA
-89 ®ádná zpráva není dostupná
-$ ENOSR
-90 ®ádné STREAM prostøedky
-$ ENOSTR
-91 Není STREAM
-$ ETIME
-92 Vypr¹el èasový limit STREAM ioctl
-$ ENOATTR
-93 Atribut nebyl nalezen
-$ EMULTIHOP
-94 Pokus o spojení pøes více uzlù
-$ ENOLINK
-95 Odkaz byl zpøetrhán
-$ EPROTO
-96 Chyba protokolu
-$set 2
-$ SIGHUP
-1 Terminál odpojen
-$ SIGINT
-2 Pøeru¹ení
-$ SIGQUIT
-3 Konec
-$ SIGILL
-4 Chybná instrukce
-$ SIGTRAP
-5 Ladící instrukce
-$ SIGABRT
-6 Násilné ukonèení
-$ SIGEMT
-7 Emulovaná instrukce
-$ SIGFPE
-8 Výjimka pohyblivé èárky
-$ SIGKILL
-9 Zabito
-$ SIGBUS
-10 Chyba sbìrnice
-$ SIGSEGV
-11 Chyba segmentace
-$ SIGSYS
-12 ©patné systémove volání
-$ SIGPIPE
-13 Broken pipe
-$ SIGALRM
-14 Alarm èasovaè
-$ SIGTERM
-15 Ukonèeno
-$ SIGURG
-16 Naléhavý I/O po¾adavek
-$ SIGSTOP
-17 Pozastaveno (signál)
-$ SIGTSTP
-18 Pozastaveno
-$ SIGCONT
-19 Pokraèování
-$ SIGCHLD
-20 Potomek procesu ukonèen
-$ SIGTTIN
-21 Pozastaveno (terminálový vstup)
-$ SIGTTOU
-22 Pozastaveno (terminálový výstup)
-$ SIGIO
-23 Vstup/výstup mo¾ný
-$ SIGXCPU
-24 Pøekroèen èasový limit pro CPU
-$ SIGXFSZ
-25 Pøekroèen limit velikosti souboru
-$ SIGVTALRM
-26 Vypr¹el virtuální èasovaè
-$ SIGPROF
-27 Vypr¹el profilovací èasovaè
-$ SIGWINCH
-28 Velikost okna zmìnìna
-$ SIGINFO
-29 Informaèní po¾adavek
-$ SIGUSR1
-30 U¾ivatelský signál 1
-$ SIGUSR2
-31 U¾ivatelský signál 2
-$ SIGPWR
-32 Selhání/nastartování napájení
diff --git a/lib/libc/nls/de.msg b/lib/libc/nls/de.msg
deleted file mode 100644
index 32d4101d2..000000000
--- a/lib/libc/nls/de.msg
+++ /dev/null
@@ -1,258 +0,0 @@
-$set 1
-$ EPERM
-1 Operation nicht erlaubt
-$ ENOENT
-2 Datei oder Verzeichnis nicht gefunden
-$ ESRCH
-3 Prozess nicht gefunden
-$ EINTR
-4 Interrupt innerhalb eines Systemaufrufs
-$ EIO
-5 Ein/Ausgabefehler
-$ ENXIO
-6 Gerät ist nicht konfiguriert
-$ E2BIG
-7 Argumentliste ist zu lang
-$ ENOEXEC
-8 Die Datei hat kein bekanntes ausführbares Format
-$ EBADF
-9 Ungültiger Dateideskriptor
-$ ECHILD
-10 Kein Kindprozess
-$ EDEADLK
-11 Ein Deadlock wurde vermieden
-$ ENOMEM
-12 Kann nicht genug Speicher belegen
-$ EACCES
-13 Zugriff verboten
-$ EFAULT
-14 Ungültige Adresse
-$ ENOTBLK
-15 Es wird ein Blockgerät benötigt
-$ EBUSY
-16 Das Gerät ist belegt
-$ EEXIST
-17 Datei existiert bereits
-$ EXDEV
-18 Link zwischen verschiedenen Geräten
-$ ENODEV
-19 Die Operation wird von diesem Gerät nicht unterstützt
-$ ENOTDIR
-20 Kein Verzeichnis
-$ EISDIR
-21 Ist ein Verzeichnis
-$ EINVAL
-22 Ungültiges Argument
-$ ENFILE
-23 Zu viele offene Dateien im gesamten System
-$ EMFILE
-24 Zu viele offene Dateien
-$ ENOTTY
-25 Ungültiger Ioctl für dieses Gerät
-$ ETXTBSY
-26 Ausführbare Datei wird benutzt
-$ EFBIG
-27 Datei zu groß
-$ ENOSPC
-28 Kein Platz mehr auf dem Gerät
-$ ESPIPE
-29 Ungültige Positionierung
-$ EROFS
-30 Dateisystem ist schreibgeschützt
-$ EMLINK
-31 Zu viele Links
-$ EPIPE
-32 Unterbrochene Pipe
-$ EDOM
-33 Numerisches Argument ausserhalb des Wertebereichs
-$ ERANGE
-34 Ergebnis zu groß oder zu klein
-$ EAGAIN, EWOULDBLOCK
-35 Ressource vorübergehend nicht verfügbar
-$ EINPROGRESS
-36 Operation wird jetzt fortgesetzt
-$ EALREADY
-37 Operation wird bereits ausgeführt
-$ ENOTSOCK
-38 Deskriptor ist kein Socket
-$ EDESTADDRREQ
-39 Zieladresse benötigt
-$ EMSGSIZE
-40 Nachricht zu lang
-$ EPROTOTYPE
-41 Ungültiger Protokolltyp für diesen Socket
-$ ENOPROTOOPT
-42 Protokoll nicht verfügbar
-$ EPROTONOSUPPORT
-43 Protokoll nicht unterstützt
-$ ESOCKTNOSUPPORT
-44 Sockettyp nicht unterstützt
-$ EOPNOTSUPP
-45 Operation nicht unterstützt
-$ EPFNOSUPPORT
-46 Protokollfamilie nicht unterstützt
-$ EAFNOSUPPORT
-47 Addressart wird von der Protokollfamilie nicht unterstützt
-$ EADDRINUSE
-48 Adresse wird bereits benutzt
-$ EADDRNOTAVAIL
-49 Kann angeforderte Adresse nicht belegen
-$ ENETDOWN
-50 Netzwerk nicht verfügbar
-$ ENETUNREACH
-51 Netzwerk nicht erreichbar
-$ ENETRESET
-52 Netzwerk hat Verbindung mit Reset abgebrochen
-$ ECONNABORTED
-53 Software verursachte einen Verbindungsabbruch
-$ ECONNRESET
-54 Verbindung wurde von der Gegenstelle geschlossen
-$ ENOBUFS
-55 Keine Buffer verfügbar
-$ EISCONN
-56 Socket ist schon verbunden
-$ ENOTCONN
-57 Socket ist nicht verbunden
-$ ESHUTDOWN
-58 Kann nach einem Socket-Shutdown nicht mehr senden
-$ ETOOMANYREFS
-59 Zu viele Referenzen, kann nicht verbinden
-$ ETIMEDOUT
-60 Verbindungsabbruch durch Zeitüberschreitung
-$ ECONNREFUSED
-61 Verbindung wurde abgelehnt
-$ ELOOP
-62 Zu viele symbolische Links (zirkulär?)
-$ ENAMETOOLONG
-63 Dateiname zu lang
-$ EHOSTDOWN
-64 Host nicht verfügbar
-$ EHOSTUNREACH
-65 Keine Route zum Host
-$ ENOTEMPTY
-66 Verzeichnis ist nicht leer
-$ EPROCLIM
-67 Zu viele Prozesse
-$ EUSERS
-68 Zu viele Benutzer
-$ EDQUOT
-69 Plattenplatzlimit erschöpft
-$ ESTALE
-70 Verwaister NFS-Dateideskriptor
-$ EREMOTE
-71 Zu viele Fernverweise in diesem Zugriff
-$ EBADRPC
-72 RPC-Struktur ist ungültig
-$ ERPCMISMATCH
-73 RPC-Version stimmt nicht
-$ EPROGUNAVAIL
-74 RPC-Programm nicht verfügbar
-$ EPROGMISMATCH
-75 Falsche Programmversion
-$ EPROCUNAVAIL
-76 Falsche Prozedur für dieses Programm
-$ ENOLCK
-77 Keine Dateisperren verfügbar
-$ ENOSYS
-78 Funktion nicht implementiert
-$ EFTYPE
-79 Ungültiger Dateityp oder Dateiformat
-$ EAUTH
-80 Authentikationsfehler
-$ ENEEDAUTH
-81 Authentikator benötigt
-$ EIDRM
-82 Identifizierung entfernt
-$ ENOMSG
-83 Keine Nachricht vom gewünschten Typ
-$ EOVERFLOW
-84 Wert zu groß, um in Datentyp zu speichern
-$ EILSEQ
-85 Illegale Byte-Sequenz
-$ ENOTSUP
-86 Operation nicht unterstützt
-$ ECANCELED
-87 Operation abgebrochen
-$ EBADMSG
-88 Ungültige Nachricht
-$ ENODATA
-89 Keine Nachricht verfügbar
-$ ENOSR
-90 Keine STREAM-Ressourcen verfügbar
-$ ENOSTR
-91 Kein STREAM
-$ ETIME
-92 Zeitüberschreitung bei STREAM Ioctl
-$ ENOATTR
-93 Attribut nicht gefunden
-$ EMULTIHOP
-94 Multihopversuch
-$ ENOLINK
-95 Verbindung wurde getrennt
-$ EPROTO
-96 Protokollfehler
-$set 2
-$ SIGHUP
-1 Verbindungsende
-$ SIGINT
-2 Unterbrechung
-$ SIGQUIT
-3 Programmende
-$ SIGILL
-4 Ungültiger Maschinenbefehl
-$ SIGTRAP
-5 Trace/BPT trap
-$ SIGABRT
-6 Abort trap
-$ SIGEMT
-7 EMT trap
-$ SIGFPE
-8 Fließkommafehler
-$ SIGKILL
-9 Unbedingter Programmabbruch
-$ SIGBUS
-10 Bus-Zugriffsfehler
-$ SIGSEGV
-11 Illegaler Speicherzugriff
-$ SIGSYS
-12 Ungültiger Systemaufruf
-$ SIGPIPE
-13 Unterbrochene Pipe
-$ SIGALRM
-14 Wecker
-$ SIGTERM
-15 Beendet
-$ SIGURG
-16 Dringende Ein/Ausgabeanforderung
-$ SIGSTOP
-17 Gestoppt (Signal)
-$ SIGTSTP
-18 Gestoppt
-$ SIGCONT
-19 Fortgesetzt
-$ SIGCHLD
-20 Kindprozess beendet
-$ SIGTTIN
-21 Gestoppt (Eingabe)
-$ SIGTTOU
-22 Gestoppt (Ausgabe)
-$ SIGIO
-23 Ein/Ausgabe ist möglich
-$ SIGXCPU
-24 CPU-Zeitlimit erschöpft
-$ SIGXFSZ
-25 Dateigröße hat das Limit erreicht
-$ SIGVTALRM
-26 Virtueller Wecker abgelaufen
-$ SIGPROF
-27 Profil-Wecker abgelaufen
-$ SIGWINCH
-28 Fenstergröße hat sich geändert
-$ SIGINFO
-29 Informationsanforderung
-$ SIGUSR1
-30 Benutzerdefiniertes Signal 1
-$ SIGUSR2
-31 Benutzerdefiniertes Signal 2
-$ SIGPWR
-32 Statusänderung der Energieversorgung
diff --git a/lib/libc/nls/es.msg b/lib/libc/nls/es.msg
deleted file mode 100644
index 7428ed6be..000000000
--- a/lib/libc/nls/es.msg
+++ /dev/null
@@ -1,258 +0,0 @@
-$set 1
-$ EPERM
-1 Operación no permitida
-$ ENOENT
-2 Archivo o directorio inexistente
-$ ESRCH
-3 Proceso inexistente
-$ EINTR
-4 Llamada del sistema interrumpida
-$ EIO
-5 Error de E/S
-$ ENXIO
-6 Dispositivo no configurado
-$ E2BIG
-7 La lista de argumentos es demasiado larga
-$ ENOEXEC
-8 Error en el formato del ejecutable 
-$ EBADF
-9 Descriptor de archivo incorrecto
-$ ECHILD
-10 No hay procesos hijo 
-$ EDEADLK
-11 Se ha evitado bloqueo del recurso
-$ ENOMEM
-12 No se pudo asignar la memoria pedida
-$ EACCES
-13 Permiso denegado
-$ EFAULT
-14 Dirección incorrecta
-$ ENOTBLK
-15 Se necesita un dispositivo de bloques
-$ EBUSY
-16 Dispositivo ocupado
-$ EEXIST
-17 El archivo ya existe
-$ EXDEV
-18 Enlace entre dispositivos
-$ ENODEV
-19 Operación inadecuada para este dispositivo
-$ ENOTDIR
-20 No es un directorio
-$ EISDIR
-21 Es un directorio
-$ EINVAL
-22 Argumento inadecuado
-$ ENFILE
-23 Hay demasiados archivos abiertos en el sistema
-$ EMFILE
-24 Hay demasiados archivos abiertos
-$ ENOTTY
-25 IOCTL inapropiado para el dispositivo
-$ ETXTBSY
-26 Archivo de texto ocupado
-$ EFBIG
-27 Archivo demasiado grande
-$ ENOSPC
-28 No queda espacio libre en el dispositivo
-$ ESPIPE
-29 Búsqueda ilegal
-$ EROFS
-30 Archivo del sistema de sólo lectura
-$ EMLINK
-31 Demasiados enlaces
-$ EPIPE
-32 Canal (pipe) roto
-$ EDOM
-33 El argumento numérico está fuera de rango
-$ ERANGE
-34 El resultado es demasiado grande
-$ EAGAIN, EWOULDBLOCK
-35 El recurso no está disponible temporalmente
-$ EINPROGRESS
-36 Operación actualmente en proceso
-$ EALREADY
-37 La operación ya estaba realizándose
-$ ENOTSOCK
-38 Operación de socket inaceptable por el dispositivo
-$ EDESTADDRREQ
-39 Se necesita una dirección de destino
-$ EMSGSIZE
-40 Mensaje demasiado largo
-$ EPROTOTYPE
-41 Tipo erróneo de protocolo para el socket
-$ ENOPROTOOPT
-42 Protocolo no disponible
-$ EPROTONOSUPPORT
-43 Protocolo no contemplado
-$ ESOCKTNOSUPPORT
-44 Tipo de socket no contemplado
-$ EOPNOTSUPP
-45 Operación no contemplada
-$ EPFNOSUPPORT
-46 Familia de protocolos no contemplada
-$ EAFNOSUPPORT
-47 Familia de direcciones no contemplada por la familia de protocolos
-$ EADDRINUSE
-48 La dirección ya está en uso
-$ EADDRNOTAVAIL
-49 No se pudo asignar la dirección pedida
-$ ENETDOWN
-50 La red no funciona
-$ ENETUNREACH
-51 No se puede acceder a la red
-$ ENETRESET
-52 La conexión a la red se interrumpió al reinicializar
-$ ECONNABORTED
-53 La conexión se ha abortado debido a problemas en el software
-$ ECONNRESET
-54 El interlocutor ha reinicializado la comunicación
-$ ENOBUFS
-55 No queda espacio en el buffer
-$ EISCONN
-56 El socket ya estaba conectado
-$ ENOTCONN
-57 El socket no está conectado
-$ ESHUTDOWN
-58 No se puede enviar tras la desconexión del socket
-$ ETOOMANYREFS
-59 Demasiadas referencias: no se pueden unir
-$ ETIMEDOUT
-60 El tiempo de conexión ha expirado
-$ ECONNREFUSED
-61 Conexión rehusada
-$ ELOOP
-62 Demasiados niveles de enlaces simbólicos
-$ ENAMETOOLONG
-63 Nombre de archivo demasiado largo
-$ EHOSTDOWN
-64 La máquina está fuera de servicio
-$ EHOSTUNREACH
-65 No hay ruta hasta la máquina
-$ ENOTEMPTY
-66 Directorio no vacío
-$ EPROCLIM
-67 Demasiados procesos
-$ EUSERS
-68 Demasiados usuarios
-$ EDQUOT
-69 Cuota de disco sobrepasada
-$ ESTALE
-70 Descriptor de archivo NFS inválido
-$ EREMOTE
-71 Ruta con demasiados niveles
-$ EBADRPC
-72 La estructura de la RPC es errónea
-$ ERPCMISMATCH
-73 La versión de la RPC es errónea
-$ EPROGUNAVAIL
-74 La RPC no está accesible
-$ EPROGMISMATCH
-75 Versión errónea del programa
-$ EPROCUNAVAIL
-76 Procedimiento erróneo para el programa
-$ ENOLCK
-77 No hay bloqueos disponibles
-$ ENOSYS
-78 Función no realizada
-$ EFTYPE
-79 Tipo de archivo o formato inapropiado
-$ EAUTH
-80 Error de la autentificación
-$ ENEEDAUTH
-81 Se necesita un autenticador
-$ EIDRM
-82 Identificador quitado
-$ ENOMSG
-83 No hay mensajes del tipo deseado
-$ EOVERFLOW
-84 Valor demasiado grande para ser almacenado en el tipo de datos
-$ EILSEQ
-85 Secuencia de bytes no legal
-$ ENOTSUP
-86 No soportado
-$ ECANCELED
-87 Operación cancelada
-$ EBADMSG
-88 Mensaje incorrecto o corrupto
-$ ENODATA
-89 No hay mensajes disponibles
-$ ENOSR
-90 No hay recursos de tipo STREAM
-$ ENOSTR
-91 No es un STREAM
-$ ETIME
-92 Tiempo de espera agotado en el ioctl STREAM
-$ ENOATTR
-93 Atributo no encontrado
-$ EMULTIHOP
-94 Se ha intentado un multisalto
-$ ENOLINK
-95 El enlace se ha servido
-$ EPROTO
-96 Error de protocolo
-$set 2
-$ SIGHUP
-1 Fín de línea (hangup)
-$ SIGINT
-2 Interrumpido
-$ SIGQUIT
-3 Terminado
-$ SIGILL
-4 Instrucción ilegal
-$ SIGTRAP
-5 Depuración
-$ SIGABRT
-6 Llamada de aborto
-$ SIGEMT
-7 Captura de EMT
-$ SIGFPE
-8 Excepción de coma flotante
-$ SIGKILL
-9 Matado
-$ SIGBUS
-10 Error en el bus
-$ SIGSEGV
-11 Fallo de segmentación
-$ SIGSYS
-12 Llamada al sistema errónea
-$ SIGPIPE
-13 Canal (pipe) roto
-$ SIGALRM
-14 Alarma del reloj
-$ SIGTERM
-15 Terminado
-$ SIGURG
-16 Condición urgente de E/S
-$ SIGSTOP
-17 Detenido (señal)
-$ SIGTSTP
-18 Detenido
-$ SIGCONT
-19 Continuando
-$ SIGCHLD
-20 Proceso hijo finalizado
-$ SIGTTIN
-21 Detenido (entrada tty)
-$ SIGTTOU
-22 Detenido (salida tty)
-$ SIGIO
-23 E/S posible
-$ SIGXCPU
-24 Se ha sobrepasado el tiempo límite de la CPU
-$ SIGXFSZ
-25 Se ha sobrepasado el límite de longitud de archivo
-$ SIGVTALRM
-26 Temporizador virtual expirado
-$ SIGPROF
-27 Temporizador de perfilación expirado
-$ SIGWINCH
-28 Cambios en el tamaño de la ventana
-$ SIGINFO
-29 Petición de información
-$ SIGUSR1
-30 Señal definida por el usuario nº 1
-$ SIGUSR2
-31 Señal definida por el usuario nº 2
-$ SIGPWR
-32 Fallo o reinicio de la alimentación
diff --git a/lib/libc/nls/fi.msg b/lib/libc/nls/fi.msg
deleted file mode 100644
index d9475498a..000000000
--- a/lib/libc/nls/fi.msg
+++ /dev/null
@@ -1,224 +0,0 @@
-$set 1
-$ EPERM
-1 Toimintoa ei sallita
-$ ENOENT
-2 Tiedostoa tai hakemistoa ei löydy
-$ ESRCH
-3 Prosessia ei löydy
-$ EINTR
-4 Systeemikutsu keskeytyi
-$ EIO
-5 Syöttö/tulostusvirhe
-$ ENXIO
-6 Laitetta ei määritelty
-$ E2BIG
-7 Liikaa argumentteja
-$ ENOEXEC
-8 Tuntematon ohjelmatyyppi
-$ EBADF
-9 Virheellinen tiedosto-osoitin
-$ ECHILD
-10 Ei lapsiprosesseja
-$ EDEADLK
-11 Resurssin ristiinlukitus vältetty
-$ ENOMEM
-12 Muistinvaraus epäonnistui
-$ EACCES
-13 Lupa kielletty
-$ EFAULT
-14 Virheellinen osoite
-$ ENOTBLK
-15 Tarvitaan lohko-osoitettava laite
-$ EBUSY
-16 Laite käytössä
-$ EEXIST
-17 Tiedosto on jo olemassa
-$ EXDEV
-18 Laitteiden välinen linkki
-$ ENODEV
-19 Laite ei tue toimintoa
-$ ENOTDIR
-20 Kohde ei ole hakemisto
-$ EISDIR
-21 Kohde on hakemisto
-$ EINVAL
-22 Virheellinen argumentti
-$ ENFILE
-23 Järjestelmässä on liian monta avointa tiedostoa
-$ EMFILE
-24 Liian monta avointa tiedostoa
-$ ENOTTY
-25 Virheellinen ohjaustoiminto laitteelle
-$ ETXTBSY
-26 Tiedosto on käytössä
-$ EFBIG
-27 Tiedosto liian suuri
-$ ENOSPC
-28 Laitteella ei ole tilaa
-$ ESPIPE
-29 Virheellinen haku
-$ EROFS
-30 Vain luettava tiedostojärjestelmä
-$ EMLINK
-31 Liian monta linkkiä
-$ EPIPE
-32 Katkennut putki
-$ EDOM
-33 Numeerinen syöte virheellinen
-$ ERANGE
-34 Tulos liian suuri
-$ EAGAIN, EWOULDBLOCK
-35 Resurssi ei ole tilapäisesti saatavilla
-$ EINPROGRESS
-36 Toiminta on käynnissä
-$ EALREADY
-37 Toiminta oli jo käynnissä
-$ ENOTSOCK
-38 Socket-operaatio muulla kuin socketilla
-$ EDESTADDRREQ
-39 Tarvitaan kohdeosoite
-$ EMSGSIZE
-40 Sanoma liian pitkä
-$ EPROTOTYPE
-41 Väärä protokolla socketille
-$ ENOPROTOOPT
-42 Protokolla ei ole käytettävissä
-$ EPROTONOSUPPORT
-43 Protokollaa ei tueta
-$ ESOCKTNOSUPPORT
-44 Socket-tyyppiä ei tueta
-$ EOPNOTSUPP
-45 Toimintoa ei tueta
-$ EPFNOSUPPORT
-46 Protokollaperhettä ei tueta
-$ EAFNOSUPPORT
-47 Protokollaperhe ei tue osoiteperhettä
-$ EADDRINUSE
-48 Osoite on jo käytössä
-$ EADDRNOTAVAIL
-49 Ei pysty antamaan pyydettyä osoitetta
-$ ENETDOWN
-50 Verkko ei ole käytettävissä
-$ ENETUNREACH
-51 Verkkoon ei ole yhteyttä
-$ ENETRESET
-52 Verkko sulki yhteyden
-$ ECONNABORTED
-53 Ohjelmiston aiheuttama yhteyden keskeytyminen
-$ ECONNRESET
-54 Isäntä nollasi yhteyden
-$ ENOBUFS
-55 Puskuritila on lopussa
-$ EISCONN
-56 Yhteys on jo olemassa
-$ ENOTCONN
-57 Yhteyttä ei ole olemassa
-$ ESHUTDOWN
-58 Lähettäminen ei ole mahdollista yhteyden katkaisun jälkeen
-$ ETOOMANYREFS
-59 Liikaa viittauksia: ei voi yhdistää
-$ ETIMEDOUT
-60 Yhteyden aikavalvontakatkaisu
-$ ECONNREFUSED
-61 Yhteys hylätty
-$ ELOOP
-62 Liian monta peräkkäistä symbolista linkkiä
-$ ENAMETOOLONG
-63 Tiedoston nimi on liian pitkä
-$ EHOSTDOWN
-64 Isäntä ei vastaa
-$ EHOSTUNREACH
-65 Ei reittiä isäntään
-$ ENOTEMPTY
-66 Hakemisto ei ole tyhjä
-$ EPROCLIM
-67 Liian monta prosessia
-$ EUSERS
-68 Liian monta käyttäjää
-$ EDQUOT
-69 Levytilarajoitus ylittyi
-$ ESTALE
-70 Vanhentunut NFS-yhteys
-$ EREMOTE
-71 Liian monta verkkolevyä polussa
-$ EBADRPC
-72 Virheellinen RPC-pyyntö
-$ ERPCMISMATCH
-73 Väärä RPC-versio
-$ EPROGUNAVAIL
-74 RPC ei käytettävissä
-$ EPROGMISMATCH
-75 Väärä ohjelmaversio
-$ EPROCUNAVAIL
-76 Väärä RPC-pyyntö ohjelmalle
-$ ENOLCK
-77 Lukitus ei käytettävissä
-$ ENOSYS
-78 Toimintoa ei ole
-$ EFTYPE
-79 Väärä tiedostotyyppi tai -formaatti
-$set 2
-$ SIGHUP
-1 Katkaisu
-$ SIGINT
-2 Keskeytys
-$ SIGQUIT
-3 Lopetus
-$ SIGILL
-4 Laiton käsky
-$ SIGTRAP
-5 Jäljitys/BPT ansa
-$ SIGABRT
-6 Poistumisansa
-$ SIGEMT
-7 EMT-ansa
-$ SIGFPE
-8 Liukulukuvirhe
-$ SIGKILL
-9 Tapettu
-$ SIGBUS
-10 Väylävirhe
-$ SIGSEGV
-11 Suojausvirhe
-$ SIGSYS
-12 Virheellinen systeemikutsu
-$ SIGPIPE
-13 Katkennut putki
-$ SIGALRM
-14 Hälytyskello
-$ SIGTERM
-15 Lopetettu
-$ SIGURG
-16 Kiireellinen syöttö/tulostus
-$ SIGSTOP
-17 Pysäytetty (signaali)
-$ SIGTSTP
-18 Pysäytetty
-$ SIGCONT
-19 Jatkettu
-$ SIGCHLD
-20 Lapsiprosessi päättynyt
-$ SIGTTIN
-21 Pysäytetty (tty-syöte)
-$ SIGTTOU
-22 Pysäytetty (tty-tuloste)
-$ SIGIO
-23 Syöttö ja tulostus mahdollisia
-$ SIGXCPU
-24 Keskusyksikköaikarajoitus ylitetty
-$ SIGXFSZ
-25 Tiedoston kokorajoitus ylitetty
-$ SIGVTALRM
-26 Virtuaali-ajastin laukesi
-$ SIGPROF
-27 Profilointiajastin laukesi
-$ SIGWINCH
-28 Ikkunan koko muuttuu
-$ SIGINFO
-29 Informaatiopyyntö
-$ SIGUSR1
-30 Käyttäjän määriteltävä signaali 1
-$ SIGUSR2
-31 Käyttäjän määriteltävä signaali 2
-$ SIGPWR
-32 Virransaannin tilassa muutos
diff --git a/lib/libc/nls/fr.msg b/lib/libc/nls/fr.msg
deleted file mode 100644
index 099670e53..000000000
--- a/lib/libc/nls/fr.msg
+++ /dev/null
@@ -1,252 +0,0 @@
-$set 1
-$ EPERM
-1 Opération non autorisée
-$ ENOENT
-2 Fichier ou répertoire introuvable
-$ ESRCH
-3 Processus introuvable
-$ EINTR
-4 Appel système interrompu
-$ EIO
-5 Erreur d'entrée/sortie
-$ ENXIO
-6 Périphérique non configuré
-$ E2BIG
-7 Liste de paramètres trop longue
-$ ENOEXEC
-8 Erreur de format d'exécutable
-$ EBADF
-9 Descripteur de fichier invalide
-$ ECHILD
-10 Pas de processus fils
-$ EDEADLK
-11 Etreinte fatale évitée
-$ ENOMEM
-12 Plus de mémoire
-$ EACCES
-13 Autorisation refusée
-$ EFAULT
-14 Adresse invalide
-$ ENOTBLK
-15 Nécessite un périphérique en mode bloc
-$ EBUSY
-16 Périphérique occupé
-$ EEXIST
-17 Fichier existant
-$ EXDEV
-18 Lien hors du périphérique
-$ ENODEV
-19 Opération non supportée par le périphérique
-$ ENOTDIR
-20 N'est pas un répertoire
-$ EISDIR
-21 C'est un réperoire
-$ EINVAL
-22 Paramètre invalide
-$ ENFILE
-23 Trop de fichiers ouverts dans le système
-$ EMFILE
-24 Trop de fichiers ouverts
-$ ENOTTY
-25 Ioctl inconnu du périphérique
-$ ETXTBSY
-26 Fichier exécutable utilisé
-$ EFBIG
-27 Fichier trop grand
-$ ENOSPC
-28 Plus de place sur le périphérique
-$ ESPIPE
-29 Positionnement illégal
-$ EROFS
-30 Système de fichier protégé en écriture
-$ EMLINK
-31 Trop de liens
-$ EPIPE
-32 Tube cassé
-$ EDOM
-33 Paramètre numérique hors du domaine
-$ ERANGE
-34 Résultat trop grand
-$ EAGAIN, EWOULDBLOCK
-35 Ressource temporairement indisponible
-$ EINPROGRESS
-36 Opération actuellement en cours
-$ EALREADY
-37 Opération déjà en cours
-$ ENOTSOCK
-38 Opération réservée aux sockets
-$ EDESTADDRREQ
-39 Adresse de destination nécéssaire
-$ EMSGSIZE
-40 Message trop long
-$ EPROTOTYPE
-41 Protocole inadapté au socket
-$ ENOPROTOOPT
-42 Protocole non disponible
-$ EPROTONOSUPPORT
-43 Protocole non supporté
-$ ESOCKTNOSUPPORT
-44 Type de socket non supporté
-$ EOPNOTSUPP
-45 Opération non supportée
-$ EPFNOSUPPORT
-46 Famille de protocoles non supportée
-$ EAFNOSUPPORT
-47 Famille d'adresses non supporté par cette famille de protocoles
-$ EADDRINUSE
-48 Adresse déjà utilisée
-$ EADDRNOTAVAIL
-49 Impossible d'affecter l'adresse demandée
-$ ENETDOWN
-50 Réseau arrêté
-$ ENETUNREACH
-51 Réseau non atteignable
-$ ENETRESET
-52 Connexion perdue après un RAZ du réseau
-$ ECONNABORTED
-53 Fin de connexion causée par logiciel
-$ ECONNRESET
-54 Connexion terminée par le correspondant
-$ ENOBUFS
-55 Plus de place pour la mémoire tampon
-$ EISCONN
-56 Socket déjà connecté
-$ ENOTCONN
-57 Socket non connecté
-$ ESHUTDOWN
-58 Impossible de transmettre après fermeture du socket
-$ ETOOMANYREFS
-59 Trop de références: impossible à réassembler
-$ ETIMEDOUT
-60 Délai de connexion expiré
-$ ECONNREFUSED
-61 Connexion refusée
-$ ELOOP
-62 Trop de niveaux de liens symboliques
-$ ENAMETOOLONG
-63 Nom de fichier trop long
-$ EHOSTDOWN
-64 Machine arrêtée
-$ EHOSTUNREACH
-65 Pas de route vers cette machine
-$ ENOTEMPTY
-66 Répertoire non vide
-$ EPROCLIM
-67 Trop de processus
-$ EUSERS
-68 Trop d'utilisateurs
-$ EDQUOT
-69 Quota disque épuisé
-$ ESTALE
-70 Identificateur NFS périmé
-$ EREMOTE
-71 Trop de points de montages dans le chemin
-$ EBADRPC
-72 Structure RPC invalide
-$ ERPCMISMATCH
-73 Mauvaise version RPC
-$ EPROGUNAVAIL
-74 Programme RPC non disponible
-$ EPROGMISMATCH
-75 Mauvaise version de programme
-$ EPROCUNAVAIL
-76 Procédure inexistante
-$ ENOLCK
-77 Pas de verrous disponibles
-$ ENOSYS
-78 Fonction non implémentée
-$ EFTYPE
-79 Type ou format de fichier inadapté
-$ EAUTH
-80 Erreur lors de l'authentification
-$ ENEEDAUTH
-81 Authentication nécessaire
-$ EIDRM  
-82 Identifiant supprimé
-$ ENOMSG
-83 Pas de message du type demandé
-$ EOVERFLOW
-84 Valeur trop grande pour stocker dans le type de données
-$ EILSEQ
-85 Séquence d'octets illégale
-$ ENOTSUP
-86 Non supporté
-$ ECANCELED
-87 Opération annulée
-$ EBADMSG
-88 Message invalide ou corrompu
-$ ENODATA
-89 Pas de message disponible
-$ ENOSR
-90 Pas de ressource de type STREAM disponible
-$ ENOSTR
-91 N'est pas un STREAM
-$ ETIME 
-92 Délai expiré pour un ioctl STREAM
-$ ENOATTR 
-93 Attribut non trouvé
-$set 2
-$ SIGHUP
-1 Raccroché
-$ SIGINT
-2 Interruption
-$ SIGQUIT
-3 Quitte
-$ SIGILL
-4 Instruction illégale
-$ SIGTRAP
-5 Point de trace/arrêt
-$ SIGABRT
-6 Avorté
-$ SIGEMT
-7 Appel émulateur
-$ SIGFPE
-8 Exception numérique
-$ SIGKILL
-9 Tué
-$ SIGBUS
-10 Erreur bus
-$ SIGSEGV
-11 Erreur de segmentation
-$ SIGSYS
-12 Appel système invalide
-$ SIGPIPE
-13 Tube cassé
-$ SIGALRM
-14 Alarme
-$ SIGTERM
-15 Terminé
-$ SIGURG
-16 Condition d'E/S urgente
-$ SIGSTOP
-17 Arrêté par un signal
-$ SIGTSTP
-18 Arrêté
-$ SIGCONT
-19 Reprise
-$ SIGCHLD
-20 Fin d'un fils
-$ SIGTTIN
-21 Arrêté (lecture sur tty)
-$ SIGTTOU
-22 Arrêté (écriture sur tty)
-$ SIGIO
-23 E/S possible
-$ SIGXCPU
-24 Limite du temps CPU atteinte
-$ SIGXFSZ
-25 Limite de taille de fichier atteinte
-$ SIGVTALRM
-26 Timer virtuel expiré
-$ SIGPROF
-27 Timer de profiling expiré
-$ SIGWINCH
-28 Changement de taille de la fenêtre
-$ SIGINFO
-29 Demande d'informations
-$ SIGUSR1
-30 Signal utilisateur 1
-$ SIGUSR2
-31 Signal utilisateur 2
-$ SIGPWR
-32 Coupure/reprise d'alimentation
diff --git a/lib/libc/nls/nl.msg b/lib/libc/nls/nl.msg
deleted file mode 100644
index dc63a290f..000000000
--- a/lib/libc/nls/nl.msg
+++ /dev/null
@@ -1,258 +0,0 @@
-$set 1
-$ EPERM
-1 Bewerking niet toegestaan
-$ ENOENT
-2 Bestand of directory niet gevonden
-$ ESRCH
-3 Taak bestaat niet
-$ EINTR
-4 Onderbroken systeemaanroep
-$ EIO
-5 Invoer/uitvoer fout
-$ ENXIO
-6 Apparaat niet geconfigureerd
-$ E2BIG
-7 Argumenten lijst is te lang
-$ ENOEXEC
-8 Programma kan niet worden uitgevoerd
-$ EBADF
-9 Ongeldige bestandsverwijzing
-$ ECHILD
-10 Geen kind processen
-$ EDEADLK
-11 Een "deadlock" is vermeden
-$ ENOMEM
-12 Kan geen geheugen meer verkrijgen
-$ EACCES
-13 Toegang geweigerd
-$ EFAULT
-14 Ongeldig adres
-$ ENOTBLK
-15 Een per blok adresseerbaar apparaat is vereist
-$ EBUSY
-16 Apparaat is bezig
-$ EEXIST
-17 Bestand bestaat reeds
-$ EXDEV
-18 Verwijzing tussen bestanden op verschillende bestandssystemen
-$ ENODEV
-19 Bewerking wordt niet ondersteund door dit apparaat
-$ ENOTDIR
-20 Dit is geen directory
-$ EISDIR
-21 Dit is een directory
-$ EINVAL
-22 Ongeldig argument
-$ ENFILE
-23 Te veel open bestanden in het systeem
-$ EMFILE
-24 Te veel open bestanden
-$ ENOTTY
-25 ioctl niet van toepassing op dit apparaat
-$ ETXTBSY
-26 Programma bestand is bezig
-$ EFBIG
-27 Bestand is te groot
-$ ENOSPC
-28 Geen ruimte meer op dit apparaat
-$ ESPIPE
-29 Onuitvoerbare zoekopdracht
-$ EROFS
-30 Van dit bestandssysteem kan alleen worden gelezen
-$ EMLINK
-31 Te veel bestandsverwijzingen
-$ EPIPE
-32 Verbroken pijp
-$ EDOM
-33 Numeriek argument valt buiten domein
-$ ERANGE
-34 Resultaat te groot of te klein
-$ EAGAIN, EWOULDBLOCK
-35 Middel tijdelijk onbeschikbaar
-$ EINPROGRESS
-36 Bewerking in gang gezet
-$ EALREADY
-37 Bewerking is al in gang gezet
-$ ENOTSOCK
-38 Voor deze bewerking is een contactpunt vereist
-$ EDESTADDRREQ
-39 Een bestemmingsadres is vereist
-$ EMSGSIZE
-40 Te grote boodschap
-$ EPROTOTYPE
-41 Protocol past niet bij dit contactpunt
-$ ENOPROTOOPT
-42 Protocol is niet beschikbaar
-$ EPROTONOSUPPORT
-43 Protocol is niet ondersteund
-$ ESOCKTNOSUPPORT
-44 Dit soort contactpunt is niet ondersteund
-$ EOPNOTSUPP
-45 Bewerking niet ondersteund
-$ EPFNOSUPPORT
-46 Protocol familie niet ondersteund
-$ EAFNOSUPPORT
-47 Adressen familie niet ondersteund door protocol familie
-$ EADDRINUSE
-48 Adres is al in gebruik
-$ EADDRNOTAVAIL
-49 Het gevraagde adres kan niet worden toegekend
-$ ENETDOWN
-50 Netwerk is plat
-$ ENETUNREACH
-51 Netwerk is onbereikbaar
-$ ENETRESET
-52 Netwerk onderbrak verbinding tijdens herstart
-$ ECONNABORTED
-53 Verbroken verbinding veroorzaakt door software
-$ ECONNRESET
-54 Verbinding werd aan de andere kant verbroken
-$ ENOBUFS
-55 Geen buffer ruimte meer beschikbaar
-$ EISCONN
-56 Dit contactpunt is al verbonden
-$ ENOTCONN
-57 Contactpunt is niet verbonden
-$ ESHUTDOWN
-58 Een afgesloten contactpunt kan geen gegevens meer verzenden
-$ ETOOMANYREFS
-59 Te veel verwijzingen: splitsen niet mogelijk
-$ ETIMEDOUT
-60 Verbinding te lang niet mogelijk
-$ ECONNREFUSED
-61 Verbinding geweigerd
-$ ELOOP
-62 Te veel niveaus van symbolische verwijzingen
-$ ENAMETOOLONG
-63 Bestandsnaam te lang
-$ EHOSTDOWN
-64 Bestemming niet actief
-$ EHOSTUNREACH
-65 Bestemming niet bereikbaar
-$ ENOTEMPTY
-66 Directory is niet leeg
-$ EPROCLIM
-67 Te veel taken
-$ EUSERS
-68 Te veel gebruikers
-$ EDQUOT
-69 Schijf quota overschreden
-$ ESTALE
-70 Verlopen NFS bestandsverwijzing
-$ EREMOTE
-71 Te veel verwijzingen op afstand in dit pad
-$ EBADRPC
-72 RPC argument structuur is incorrect
-$ ERPCMISMATCH
-73 RPC versie is verkeerd
-$ EPROGUNAVAIL
-74 RPC programma niet beschikbaar
-$ EPROGMISMATCH
-75 Programma versie is verkeerd
-$ EPROCUNAVAIL
-76 Taak kan door dit programma niet worden uitgevoerd
-$ ENOLCK
-77 Geen locks beschikbaar
-$ ENOSYS
-78 Deze systeem functie is niet geimplementeerd
-$ EFTYPE
-79 Bestandsformaat niet van toepassing
-$ EAUTH
-80 Aanmeldingsfout
-$ ENEEDAUTH
-81 Aanmeldingsprocedure benodigd
-$ EIDRM
-82 De aanwijzer is verwijderd
-$ ENOMSG
-83 Geen boodschap van het gewenste type
-$ EOVERFLOW
-84 Waarde te groot om te bewaren in data type
-$ EILSEQ
-85 Ongeldige byte reeks
-$ ENOTSUP
-86 Niet ondersteund
-$ ECANCELED
-87 Bewerking geannuleerd
-$ EBADMSG
-88 Verkeerde of defecte boodschap
-$ ENODATA
-89 Geen boodschap beschikbaar
-$ ENOSR
-90 Geen STREAM voorraad
-$ ENOSTR
-91 Dit is geen STREAM
-$ ETIME
-92 STREAM ioctl verlopen
-$ ENOATTR
-93 Attribuut niet gevonden
-$ EMULTIHOP
-94 Multihopverzoek
-$ ENOLINK
-95 Verbinding werd verstoord
-$ EPROTO
-96 Protocolfout
-$set 2
-$ SIGHUP
-1 Opgehangen
-$ SIGINT
-2 Onderbroken
-$ SIGQUIT
-3 Opgegeven
-$ SIGILL
-4 Verboden instructie
-$ SIGTRAP
-5 Spoor/BPT val
-$ SIGABRT
-6 Abort val
-$ SIGEMT
-7 EMT val
-$ SIGFPE
-8 Drijvende komma fout
-$ SIGKILL
-9 Gedood
-$ SIGBUS
-10 Bus fout
-$ SIGSEGV
-11 Segmentatie fout
-$ SIGSYS
-12 Verkeerde systeemaanroep
-$ SIGPIPE
-13 Gebroken pijp
-$ SIGALRM
-14 Wekker
-$ SIGTERM
-15 Beeindigd
-$ SIGURG
-16 Dringende I/O opgemerkt
-$ SIGSTOP
-17 Gestopt (signaal)
-$ SIGTSTP
-18 Gestopt
-$ SIGCONT
-19 Voortgezet
-$ SIGCHLD
-20 Kindproces beeindigd
-$ SIGTTIN
-21 Gestopt (tty invoer)
-$ SIGTTOU
-22 Gestopt (tty uitvoer)
-$ SIGIO
-23 I/O mogelijk
-$ SIGXCPU
-24 Te veel CPU tijd verbruikt
-$ SIGXFSZ
-25 Maximum bestandsgrootte overschreden
-$ SIGVTALRM
-26 Virtuele wekker
-$ SIGPROF
-27 Profiling wekker
-$ SIGWINCH
-28 Venstergrootte veranderd
-$ SIGINFO
-29 Informatie verzoek
-$ SIGUSR1
-30 Gebruikersignaal 1
-$ SIGUSR2
-31 Gebruikersignaal 2
-$ SIGPWR
-32 Stroom uitval/inschakeling
diff --git a/lib/libc/nls/no.msg b/lib/libc/nls/no.msg
deleted file mode 100644
index 762f45c50..000000000
--- a/lib/libc/nls/no.msg
+++ /dev/null
@@ -1,222 +0,0 @@
-$set 1
-$ EPERM
-1 Operasjonen er ikke tillatt
-$ ENOENT
-2 Filen eller katalogen finnes ikke
-$ ESRCH
-3 Prosessen finnes ikke
-$ EINTR
-4 Avbrudt systemkall
-$ EIO
-5 I/O feil
-$ ENXIO
-6 Enheten er ikke konfigurert
-$ E2BIG
-7 Argumentlisten er for lang
-$ ENOEXEC
-8 Ukjent kjørbart format
-$ EBADF
-9 Ugyldig fildeskriptor
-$ ECHILD
-10 Ingen barneprosess
-$ EDEADLK
-11 Vranglås unngått
-$ ENOMEM
-12 Kan ikke allokere nok minne
-$ EACCES
-13 Ingen adgang
-$ EFAULT
-14 Ugyldig adresse
-$ ENOTBLK
-15 Blokk-enhet påkrevd
-$ EBUSY
-16 Enheten er opptatt
-$ EEXIST
-17 Filen finnes
-$ EXDEV
-18 Link mellom forskjellige enheter
-$ ENODEV
-19 Operasjonen er ikke støttet av enheten
-$ ENOTDIR
-20 Ikke en katalog
-$ EISDIR
-21 Er en katalog
-$ EINVAL
-22 Ugyldig argument
-$ ENFILE
-23 For mange åpne filer i systemet
-$ EMFILE
-24 For mange åpne filer
-$ ENOTTY
-25 Ugyldig ioctl for enheten
-$ ETXTBSY
-26 Kjørbar fil i bruk
-$ EFBIG
-27 Filen er for stor
-$ ENOSPC
-28 Ingen ledig plass på enheten
-$ ESPIPE
-29 Ugyldig seek operasjon
-$ EROFS
-30 Filsystemet er skrivebeskyttet
-$ EMLINK
-31 For mange linker
-$ EPIPE
-32 Brudt pipe
-$ EDOM
-33 Numerisk argument utenfor arbeidsområdet
-$ ERANGE
-34 Resultatet er for stort
-$ EAGAIN, EWOULDBLOCK
-35 Ressurs midlertidig utilgjengelig
-$ EINPROGRESS
-36 Operasjonen er nå i gang
-$ EALREADY
-37 Operasjonen er allerede i gang
-$ ENOTSOCK
-38 Deskriptoren er ikke en socket
-$ EDESTADDRREQ
-39 Mottakeradresse er påkrevd
-$ EMSGSIZE
-40 Meldingen er for lang
-$ EPROTOTYPE
-41 Ugyldig protokolltype for denne socketen
-$ ENOPROTOOPT
-42 Protokollen er ikke tilgjengelig
-$ EPROTONOSUPPORT
-43 Protokollen er ikke støttet
-$ ESOCKTNOSUPPORT
-44 Socket-typen er ikke støttet
-$ EOPNOTSUPP
-45 Operasjonen er ikke støttet
-$ EPFNOSUPPORT
-46 Protokollfamilien er ikke støttet
-$ EAFNOSUPPORT
-47 Adressetypen er ikke støttet av protokollfamilien
-$ EADDRINUSE
-48 Adressen er allerede i bruk
-$ EADDRNOTAVAIL
-49 Kan ikke bruke den ønskede adressen
-$ ENETDOWN
-50 Nettverket er nede
-$ ENETUNREACH
-51 Nettverket er utilgjengelig
-$ ENETRESET
-52 Nettverket kuttet forbindelsen ved reset
-$ ECONNABORTED
-53 Programvaren forårsaket brudd av forbindelsen
-$ ECONNRESET
-54 Forbindelsen avbrudt av korrespondenten
-$ ENOBUFS
-55 Buffer-plass ikke tilgjengelig
-$ EISCONN
-56 Socketen er allerede forbundet
-$ ENOTCONN
-57 Socketen er ikke forbundet
-$ ESHUTDOWN
-58 Kan ikke sende etter at socketen er tatt ned
-$ ETOOMANYREFS
-59 For mange referanser: kan ikke slå dem sammen
-$ ETIMEDOUT
-60 Tiden til forbindelsen utløp
-$ ECONNREFUSED
-61 Forbindelse nektet
-$ ELOOP
-62 For mange nivåer med symbolske linker
-$ ENAMETOOLONG
-63 Filnavnet er for langt
-$ EHOSTDOWN
-64 Maskinen er nede
-$ EHOSTUNREACH
-65 Ingen rute til maskinen
-$ ENOTEMPTY
-66 Katalogen er ikke tom
-$ EPROCLIM
-67 For mange prosesser
-$ EUSERS
-68 For mange brukere
-$ EDQUOT
-69 Diskkvote overskredet
-$ ESTALE
-70 Fastlåst NFS fildeskriptor
-$ EREMOTE
-71 For mange nivåer med remote i stien
-$ EBADRPC
-72 Ugyldig RPC struktur
-$ ERPCMISMATCH
-73 Feil RPC versjon
-$ EPROGUNAVAIL
-74 RPC program ikke tilgjengelig
-$ EPROGMISMATCH
-75 Feil programversjon
-$ EPROCUNAVAIL
-76 Prosedyren finnes ikke i programmet
-$ ENOLCK
-77 Ingen låsing tilgjengelig
-$ ENOSYS
-78 Funksjonen er ikke implementert
-$ EFTYPE
-79 Ugyldig filtype eller format
-$set 2
-$ SIGHUP
-1 Hangup
-$ SIGINT
-2 Avbrudd
-$ SIGQUIT
-3 Avslutt
-$ SIGILL
-4 Ugyldig instruksjon
-$ SIGTRAP
-5 Trace/BPT trap
-$ SIGABRT
-6 Abort trap
-$ SIGEMT
-7 EMT trap
-$ SIGFPE
-8 Flyttallsfeil
-$ SIGKILL
-9 Drept
-$ SIGBUS
-10 Buss feil
-$ SIGSEGV
-11 Segmenteringsfeil
-$ SIGSYS
-12 Ugyldig systemkall
-$ SIGPIPE
-13 Brudt pipe
-$ SIGALRM
-14 Alarmklokke
-$ SIGTERM
-15 Terminert
-$ SIGURG
-16 Urgent I/O condition
-$ SIGSTOP
-17 Stoppet (signal)
-$ SIGTSTP
-18 Stoppet
-$ SIGCONT
-19 Fortsetter
-$ SIGCHLD
-20 Barn avsluttet
-$ SIGTTIN
-21 Stoppet (tty input)
-$ SIGTTOU
-22 Stoppet (tty output)
-$ SIGIO
-23 I/O mulig
-$ SIGXCPU
-24 CPU-tid overskredet
-$ SIGXFSZ
-25 Maksimal filstørrelse overskredet
-$ SIGVTALRM
-26 Virtuell timer utløpt
-$ SIGPROF
-27 Profileringstimer utløpt
-$ SIGWINCH
-28 Vindustørrelse endres
-$ SIGINFO
-29 Informasjonsforespørsel
-$ SIGUSR1
-30 Brukerdefinert signal 1
-$ SIGUSR2
-31 Brukerdefinert signal 2
diff --git a/lib/libc/nls/pl.msg b/lib/libc/nls/pl.msg
deleted file mode 100644
index 4c5d2533d..000000000
--- a/lib/libc/nls/pl.msg
+++ /dev/null
@@ -1,236 +0,0 @@
-$set 1
-$ EPERM
-1 Operacja nie dozwolona
-$ ENOENT
-2 Nie ma takiego pliku ani katalogu
-$ ESRCH
-3 Nie ma takiego procesu
-$ EINTR
-4 Przerwane wywo³anie systemowe
-$ EIO
-5 B³±d wej¶cia/wyj¶cia
-$ ENXIO
-6 Urz±dzenie nie skonfigurowane
-$ E2BIG
-7 Lista argumentów jest za d³uga
-$ ENOEXEC
-8 B³êdny format pliku wykonywalnego
-$ EBADF
-9 Z³y deskryptor pliku
-$ ECHILD
-10 Brak procesów potomnych
-$ EDEADLK
-11 Unikniêto zakleszczenia zasobów
-$ ENOMEM
-12 Brak pamiêci do przydzia³u
-$ EACCES
-13 Brak dostêpu
-$ EFAULT
-14 Z³y adres
-$ ENOTBLK
-15 Wymagane urz±dzenie blokowe
-$ EBUSY
-16 Urz±dzenie zajête
-$ EEXIST
-17 Plik istnieje
-$ EXDEV
-18 Powi±zanie miedzy urz±dzeniami
-$ ENODEV
-19 Operacja nie obs³ugiwana przez urz±dzenie
-$ ENOTDIR
-20 To nie jest katalog
-$ EISDIR
-21 To jest katalog
-$ EINVAL
-22 B³êdny argument
-$ ENFILE
-23 Za du¿o otwrtych plików w systemie
-$ EMFILE
-24 Za du¿o otwartych plików
-$ ENOTTY
-25 Niew³a¶ciwy dostêp do urz±dzenia
-$ ETXTBSY
-26 Plik tekstowy zajêty
-$ EFBIG
-27 Plik zbyt du¿y
-$ ENOSPC
-28 Nie ma miejsca na urz±dzeniu
-$ ESPIPE
-29 B³êdne przesuniêcie
-$ EROFS
-30 System plików tylko do odczytu
-$ EMLINK
-31 Za du¿o linków
-$ EPIPE
-32 Przerwany potok
-$ EDOM
-33 Argument liczbowy spoza zakresu
-$ ERANGE
-34 Za du¿y wynik
-$ EAGAIN, EWOULDBLOCK
-35 Zasoby chwilowo niedostêpne
-$ EINPROGRESS
-36 Operacja jest w³a¶nie wykonywana
-$ EALREADY
-37 Operacja jest ju¿ wykonywana
-$ ENOTSOCK
-38 Operacja na obiekcie, który nie jest gniazdem
-$ EDESTADDRREQ
-39 Wymagany adres przeznaczenia
-$ EMSGSIZE
-40 Wiadomo¶æ za d³uga
-$ EPROTOTYPE
-41 Ty protoko³u nie pasuje do gniazda
-$ ENOPROTOOPT
-42 Protocó³ nie jest dostêpny
-$ EPROTONOSUPPORT
-43 Protocó³ nie jest obs³ugiwany
-$ ESOCKTNOSUPPORT
-44 Nie obs³ugiwany typ gniazda
-$ EOPNOTSUPP
-45 Operacja nie obs³ugiwana
-$ EPFNOSUPPORT
-46 Nie obs³ugiwana rodzina protoko³ów
-$ EAFNOSUPPORT
-47 Rodzina adresów nie obs³ugiwana przez rodzinê protoko³ów
-$ EADDRINUSE
-48 Adres jest aktualnie w u¿yciu
-$ EADDRNOTAVAIL
-49 Nie mo¿na przypisaæ ¿±danego adresu
-$ ENETDOWN
-50 Sieæ nie dzia³a
-$ ENETUNREACH
-51 Sieæ jest niedostêpna
-$ ENETRESET
-52 Sieæ przerwa³a po³±czenie po resecie
-$ ECONNABORTED
-53 Oprogramowanie spowodowa³o przerwanie po³±czenia
-$ ECONNRESET
-54 Po³±czenie zerwane przez drug± stronê
-$ ENOBUFS
-55 Brak miejsca w buforze
-$ EISCONN
-56 Gniazdo jest ju¿ po³±czone
-$ ENOTCONN
-57 Gniazdo nie jest po³±czone
-$ ESHUTDOWN
-58 Nie mo¿na wysy³aæ po zamkniêciu gniazda
-$ ETOOMANYREFS
-59 Za du¿o powi±zañ: dowi±zanie nie mo¿liwe
-$ ETIMEDOUT
-60 Przekroczono czas oczekiwania na po³±czenie
-$ ECONNREFUSED
-61 Po³±czenie odrzucone
-$ ELOOP
-62 Za du¿o wzajemnych symlinków
-$ ENAMETOOLONG
-63 Zbyt d³uga nazwa pliku
-$ EHOSTDOWN
-64 Host jest wy³±czony
-$ EHOSTUNREACH
-65 Brak drogi do hosta
-$ ENOTEMPTY
-66 Katalog nie jest pusty
-$ EPROCLIM
-67 Za du¿o procesów
-$ EUSERS
-68 Zbyt wielu u¿ytkowników
-$ EDQUOT
-69 Przekroczono limit miejsca na dysku
-$ ESTALE
-70 Uchwyt pliku NFS jest nieaktualny
-$ EREMOTE
-71 Za du¿o poziomów zagnie¿d¿enia w ¶cie¿ce
-$ EBADRPC
-72 RPC b³êdna struktura
-$ ERPCMISMATCH
-73 RPC z³a wersja
-$ EPROGUNAVAIL
-74 RPC program niedostêpny
-$ EPROGMISMATCH
-75 Z³a wersja programu
-$ EPROCUNAVAIL
-76 Z³a procedura dla programu
-$ ENOLCK
-77 Blokady nie s± dostêpne
-$ ENOSYS
-78 Niezaimplementowana funkcja
-$ EFTYPE
-79 Niew³a¶ciwy typ lub format pliku
-$ EAUTH
-80 B³±d uwierzytelnienia
-$ ENEEDAUTH
-81 Wymagane uwierzytelnienie
-$ EIDRM
-82 Identyfikator zosta³ usuniêty
-$ ENOMSG
-83 Brak komunikatu po¿adanego typu
-$ EOVERFLOW
-84 Warto¶æ za du¿a aby zapamiêtaæ j± w zdefiniowanym typie danych
-$ EILSEQ
-85 B³êdna sekwencja bajtów
-$set 2
-$ SIGHUP
-1 Roz³±czenie
-$ SIGINT
-2 Przerwanie
-$ SIGQUIT
-3 Wyj¶cie
-$ SIGILL
-4 Nieznana instrukcja
-$ SIGTRAP
-5 Pu³apka debuggera/BPT
-$ SIGABRT
-6 Przerwanana pu³apka
-$ SIGEMT
-7 Pu³apka EMT
-$ SIGFPE
-8 B³±d w obliczeniach zmiennoprzecinkowych
-$ SIGKILL
-9 Unicestwiony
-$ SIGBUS
-10 B³±d szyny
-$ SIGSEGV
-11 Naruszenie ochrony pamiêci
-$ SIGSYS
-12 B³êdne wywo³anie systemowe
-$ SIGPIPE
-13 Przerwany potok
-$ SIGALRM
-14 Budzik
-$ SIGTERM
-15 Zakoñczony
-$ SIGURG
-16 Nag³y wypadek I/O
-$ SIGSTOP
-17 Zatrzymany (sygna³)
-$ SIGTSTP
-18 Zatrzymany
-$ SIGCONT
-19 Kontynuacja
-$ SIGCHLD
-20 Proces potomny zakoñczy³ pracê
-$ SIGTTIN
-21 Zatrzymany (wej¶cie z tty)
-$ SIGTTOU
-22 Zatrzymany (wyj¶cie z tty)
-$ SIGIO
-23 Wej/Wyj dozwolone
-$ SIGXCPU
-24 Przekroczony limit czasu procesora
-$ SIGXFSZ
-25 przekroczony limit wielko¶ci pliku
-$ SIGVTALRM
-26 Wirtualny stoper wyczerpany
-$ SIGPROF
-27 Koniec stopera profiluj±cego
-$ SIGWINCH
-28 Zmiana rozmiaru okna
-$ SIGINFO
-29 ¯±danie infromacji
-$ SIGUSR1
-30 Sygna³ u¿ytkownika 1
-$ SIGUSR2
-31 Sygna³ u¿ytkownika 2
-$ SIGPWR
-32 Awaria zasilania/restart
diff --git a/lib/libc/nls/sk.msg b/lib/libc/nls/sk.msg
deleted file mode 100644
index d784d375c..000000000
--- a/lib/libc/nls/sk.msg
+++ /dev/null
@@ -1,258 +0,0 @@
-$set 1
-$ EPERM
-1 Operácia nie je povolená
-$ ENOENT
-2 Neexistujúci súbor alebo adresár
-$ ESRCH
-3 Proces neexistuje
-$ EINTR
-4 Systémové volanie preru¹ené
-$ EIO
-5 Chyba vstupu/výstupu
-$ ENXIO
-6 Zariadenie nie je nakonfigurované
-$ E2BIG
-7 Príli¹ dlhý zoznam argumentov
-$ ENOEXEC
-8 Chybný formát spusteného súboru
-$ EBADF
-9 Chybný deskriptor súboru
-$ ECHILD
-10 Neexistuje ¾iaden potomok procesu
-$ EDEADLK
-11 Bolo zabránené zablokovaniu prostriedku
-$ ENOMEM
-12 Nie je mo¾né prideli» pamä»
-$ EACCES
-13 Prístup odmietnutý
-$ EFAULT
-14 Chybná adresa
-$ ENOTBLK
-15 Vy¾adované blokové zariadenie
-$ EBUSY
-16 Zariadenie je pou¾ívané
-$ EEXIST
-17 Súbor existuje
-$ EXDEV
-18 Odkaz medzi zariadeniami
-$ ENODEV
-19 Operácia nie je zariadením podporovaná
-$ ENOTDIR
-20 Nie je adresár
-$ EISDIR
-21 Je adresár
-$ EINVAL
-22 Chybný argument
-$ ENFILE
-23 Priveµa otvorených súborov v systéme
-$ EMFILE
-24 Priveµa otvorených súborov
-$ ENOTTY
-25 Nevhodné ioctl pre dané zariadenie
-$ ETXTBSY
-26 Textový súbor je pou¾ívaný
-$ EFBIG
-27 Súbor je príli¹ veµký
-$ ENOSPC
-28 Na zariadení nie je voµné miesto
-$ ESPIPE
-29 Neprípustné nastavenie pozície
-$ EROFS
-30 Súborový systém je len na èítanie
-$ EMLINK
-31 Priveµa odkazov
-$ EPIPE
-32 Preru¹ená rúra
-$ EDOM
-33 Èíselný argument mimo definièný obor
-$ ERANGE
-34 Výsledok príli¹ veµký alebo príli¹ malý
-$ EAGAIN, EWOULDBLOCK
-35 Zdroj je doèasne nedostupný
-$ EINPROGRESS
-36 Operácia práve prebieha
-$ EALREADY
-37 Operácia u¾ prebieha
-$ ENOTSOCK
-38 Socketová operácia na objekte, ktorý nie je socket
-$ EDESTADDRREQ
-39 Vy¾adovaná cieµová adresa
-$ EMSGSIZE
-40 Príli¹ dlhá správa
-$ EPROTOTYPE
-41 Protokol nie je socketom podporovaný
-$ ENOPROTOOPT
-42 Protokol nie je k dispozícii
-$ EPROTONOSUPPORT
-43 Protokol nie je podporovaný
-$ ESOCKTNOSUPPORT
-44 Typ socketu nie je podporovaný
-$ EOPNOTSUPP
-45 Operácia nie je podporovaná
-$ EPFNOSUPPORT
-46 Rodina protokolov nie je podporovaná
-$ EAFNOSUPPORT
-47 Rodina adries nie je podporovaná rodinou protokolov
-$ EADDRINUSE
-48 Adresa je u¾ pou¾ívaná
-$ EADDRNOTAVAIL
-49 Nie je mo¾né prideli» po¾adovanú adresu
-$ ENETDOWN
-50 Sie» je nefunkèná
-$ ENETUNREACH
-51 Sie» je nedostupná
-$ ENETRESET
-52 Sie» zru¹ila spojenie po resete
-$ ECONNABORTED
-53 Program spôsobil ukonèenie spojenia
-$ ECONNRESET
-54 Spojenie zru¹ené druhou stranou
-$ ENOBUFS
-55 Vyrovnávacia pamä» nie je k dispozícii
-$ EISCONN
-56 Socket je u¾ pripojený
-$ ENOTCONN
-57 Socket nie je pripojený
-$ ESHUTDOWN
-58 Nie je mo¾né posiela» po uzavretí socketu
-$ ETOOMANYREFS
-59 Príli¹ mnoho odkazov: nie je mo¾né spoji»
-$ ETIMEDOUT
-60 Èasový limit pre spojenie vypr¹al
-$ ECONNREFUSED
-61 Spojenie odmietnuté
-$ ELOOP
-62 Priveµa úrovní symbolických odkazov
-$ ENAMETOOLONG
-63 Meno súboru príli¹ dlhé
-$ EHOSTDOWN
-64 Vzdialený uzol je odpojený
-$ EHOSTUNREACH
-65 Neexistuje cesta k vzdialenému uzlu
-$ ENOTEMPTY
-66 Adresár nie je prázdny
-$ EPROCLIM
-67 Priveµa procesov
-$ EUSERS
-68 Priveµa pou¾ívateµov
-$ EDQUOT
-69 Disková kvóta prekroèená
-$ ESTALE
-70 Zastaralý NFS súborový ukazateµ
-$ EREMOTE
-71 Priveµa úrovní vzdialeného v ceste
-$ EBADRPC
-72 RPC ¹truktúra je chybná
-$ ERPCMISMATCH
-73 Chybná verzia RPC
-$ EPROGUNAVAIL
-74 RPC program nie je k dispozícii
-$ EPROGMISMATCH
-75 Chybná verzia RPC programu
-$ EPROCUNAVAIL
-76 Chybná RPC procedúra pre program
-$ ENOLCK
-77 Zámky nie sú k dispozícii
-$ ENOSYS
-78 Funkcia nie je implementovaná
-$ EFTYPE
-79 Nevhodný typ alebo formát súboru
-$ EAUTH
-80 Overenie práv neúspe¹né
-$ ENEEDAUTH
-81 Vy¾adovaný overovací objekt
-$ EIDRM
-82 Identifikátor odstránený
-$ ENOMSG
-83 Neexistuje správa ¾elaného typu
-$ EOVERFLOW
-84 Hodnota je pre daný dátový typ priveµká
-$ EILSEQ
-85 Neprípustná postupnos» bajtov
-$ ENOTSUP
-86 Nie je podporované
-$ ECANCELED
-87 Operácia zru¹ená
-$ EBADMSG
-88 Chybná alebo poru¹ená správa
-$ ENODATA
-89 ®iadna správa nie je k dispozícii
-$ ENOSR
-90 ®iadne STREAM zdroje
-$ ENOSTR
-91 Nie je STREAM
-$ ETIME
-92 Èasový limit pre STREAM ioctl vypr¹al
-$ ENOATTR
-93 Atribút nenájdený
-$ EMULTIHOP
-94 Pokus o spojenie cez viacero uzlov
-$ ENOLINK
-95 Odkaz bol pretrhnutý
-$ EPROTO
-96 Chyba protokolu
-$set 2
-$ SIGHUP
-1 Terminál odpojený
-$ SIGINT
-2 Preru¹enie
-$ SIGQUIT
-3 Koniec
-$ SIGILL
-4 Chybná in¹trukcia
-$ SIGTRAP
-5 Trasovacia/ladiaca in¹trukcia
-$ SIGABRT
-6 Násilné ukonèenie
-$ SIGEMT
-7 Emulovaná in¹trukcia
-$ SIGFPE
-8 Výnimka pohyblivej rádovej èiarky
-$ SIGKILL
-9 Zabité
-$ SIGBUS
-10 Chyba na zbernici
-$ SIGSEGV
-11 Chyba segmentácie
-$ SIGSYS
-12 Chybné systémové volanie
-$ SIGPIPE
-13 Preru¹ená rúra
-$ SIGALRM
-14 Budík
-$ SIGTERM
-15 Ukonèené
-$ SIGURG
-16 Naliehavý vstupný/výstupný stav
-$ SIGSTOP
-17 Pozastavené (signál)
-$ SIGTSTP
-18 Pozastavené
-$ SIGCONT
-19 Pokraèovanie
-$ SIGCHLD
-20 Potomok procesu ukonèený
-$ SIGTTIN
-21 Pozastavené (terminálový vstup)
-$ SIGTTOU
-22 Pozastavené (terminálový výstup)
-$ SIGIO
-23 Vstup/výstup mo¾ný
-$ SIGXCPU
-24 Prekroèený èasový limit pre procesor
-$ SIGXFSZ
-25 Prekroèený limit veµkosti súboru
-$ SIGVTALRM
-26 Vypr¹al virtuálny èasovaè
-$ SIGPROF
-27 Vypr¹al profilovací èasovaè
-$ SIGWINCH
-28 Veµkos» okna zmenená
-$ SIGINFO
-29 ®iados» o informáciu
-$ SIGUSR1
-30 Pou¾ívateµom definovaný signál 1
-$ SIGUSR2
-31 Pou¾ívateµom definovaný signál 2
-$ SIGPWR
-32 Zlyhanie/opakované spustenie napájania
diff --git a/lib/libc/nls/sv.msg b/lib/libc/nls/sv.msg
deleted file mode 100644
index a309983a8..000000000
--- a/lib/libc/nls/sv.msg
+++ /dev/null
@@ -1,224 +0,0 @@
-$set 1
-$ EPERM
-1 Otillåten operation
-$ ENOENT
-2 Filen eller katalogen finns ej
-$ ESRCH
-3 Denna process finns ej
-$ EINTR
-4 Avbrutet systemanrop
-$ EIO
-5 In-/utmatningsfel
-$ ENXIO
-6 Enheten är ej konfigurerad
-$ E2BIG
-7 Argumentlistan är för lång
-$ ENOEXEC
-8 Ej körbar fil
-$ EBADF
-9 Felaktigt filhandtag
-$ ECHILD
-10 Inga barnprocesser
-$ EDEADLK
-11 Undvek resursdödläge
-$ ENOMEM
-12 Kan ej erhålla minne
-$ EACCES
-13 Tillstånd nekas
-$ EFAULT
-14 Felaktig adress
-$ ENOTBLK
-15 Blockenhet krävs
-$ EBUSY
-16 Enheten är upptagen
-$ EEXIST
-17 Filen finns redan
-$ EXDEV
-18 Länken korsar enheter
-$ ENODEV
-19 Enheten stöder ej operationen
-$ ENOTDIR
-20 Är ej en katalog
-$ EISDIR
-21 Är en katalog
-$ EINVAL
-22 Ogiltigt argument
-$ ENFILE
-23 För många öppna filer i systemet
-$ EMFILE
-24 För många öppna filer
-$ ENOTTY
-25 Olämplig ioctl för enheten
-$ ETXTBSY
-26 Programfilen är upptagen
-$ EFBIG
-27 Filen är för stor
-$ ENOSPC
-28 Inget utrymme kvar på enheten
-$ ESPIPE
-29 Otillåten sökning
-$ EROFS
-30 Skrivskyddat filsystem
-$ EMLINK
-31 För många länkar
-$ EPIPE
-32 Avbruten kommunikationskanal
-$ EDOM
-33 Numeriskt argument utanför domänen
-$ ERANGE
-34 Resultatet är för stort
-$ EAGAIN, EWOULDBLOCK
-35 Resursen är tillfälligt otillgänglig
-$ EINPROGRESS
-36 Operationen är igång
-$ EALREADY
-37 Operationen är redan igång
-$ ENOTSOCK
-38 Sockeloperation på icke-sockel
-$ EDESTADDRREQ
-39 Destinationsadress erfordras
-$ EMSGSIZE
-40 För långt meddelande
-$ EPROTOTYPE
-41 Fel protokolltyp för sockeln
-$ ENOPROTOOPT
-42 Protokollet otillgängligt
-$ EPROTONOSUPPORT
-43 Protokollet är ej understött
-$ ESOCKTNOSUPPORT
-44 Sockeltypen är ej understödd
-$ EOPNOTSUPP
-45 Operationen är ej understödd
-$ EPFNOSUPPORT
-46 Protokollfamiljen är ej understödd
-$ EAFNOSUPPORT
-47 Adressfamiljen är ej understödd av protokollfamiljen
-$ EADDRINUSE
-48 Adressen är upptagen
-$ EADDRNOTAVAIL
-49 Kan ej tilldela den begärda adressen
-$ ENETDOWN
-50 Nätverket fungerar inte
-$ ENETUNREACH
-51 Nätverket är ej kontaktbart
-$ ENETRESET
-52 Nätverket tappade kontakten vid återställningen
-$ ECONNABORTED
-53 Mjukvara orsakade nedkoppling
-$ ECONNRESET
-54 Motparten avbröt uppkopplingen
-$ ENOBUFS
-55 Inget buffertutrymme tillgängligt
-$ EISCONN
-56 Sockeln är redan uppkopplad
-$ ENOTCONN
-57 Sockeln är ej uppkopplad
-$ ESHUTDOWN
-58 Kan ej sända efter att sockeln nedkopplats
-$ ETOOMANYREFS
-59 För många referenser: kan inte delas
-$ ETIMEDOUT
-60 Uppkopplingstiden tog slut
-$ ECONNREFUSED
-61 Uppkopplingen nekad
-$ ELOOP
-62 För många nivåer av symboliska länkar
-$ ENAMETOOLONG
-63 Alldeles för långt filnamn
-$ EHOSTDOWN
-64 Värddatorn är nere
-$ EHOSTUNREACH
-65 Väg till värddatorn saknas
-$ ENOTEMPTY
-66 Katalogen ej tom
-$ EPROCLIM
-67 För många processer
-$ EUSERS
-68 För många användare
-$ EDQUOT
-69 Diskkvot överskriden
-$ ESTALE
-70 Inaktuellt NFS-filhandtag
-$ EREMOTE
-71 För många fjärrnivåer i sökvägen
-$ EBADRPC
-72 Felaktig RPC-struktur
-$ ERPCMISMATCH
-73 Felaktig RPC-version
-$ EPROGUNAVAIL
-74 RPC-programmet otillgängligt
-$ EPROGMISMATCH
-75 Fel programversion
-$ EPROCUNAVAIL
-76 Felaktig procedur för programmet
-$ ENOLCK
-77 Inga lås tillgängliga
-$ ENOSYS
-78 Funktionen är ej implementerad
-$ EFTYPE
-79 Olämplig filtyp eller format
-$set 2
-$ SIGHUP
-1 Lägg på
-$ SIGINT
-2 Avbryt
-$ SIGQUIT
-3 Avsluta
-$ SIGILL
-4 Olaglig instruktion
-$ SIGTRAP
-5 Spår- eller brytpunktsfälla
-$ SIGABRT
-6 Avslutsfälla
-$ SIGEMT
-7 Emuleringsfälla
-$ SIGFPE
-8 Flyttalsavbrott
-$ SIGKILL
-9 Dräpt
-$ SIGBUS
-10 Bussfel
-$ SIGSEGV
-11 Segmentfel
-$ SIGSYS
-12 Felaktigt systemanrop
-$ SIGPIPE
-13 Avbruten kommunikationskanal
-$ SIGALRM
-14 Äggklocka
-$ SIGTERM
-15 Terminerad
-$ SIGURG
-16 Brådskande In/Ut-tillstånd
-$ SIGSTOP
-17 Stoppad (signal)
-$ SIGTSTP
-18 Stoppad
-$ SIGCONT
-19 Fortsätter
-$ SIGCHLD
-20 Barn avslutat
-$ SIGTTIN
-21 Stoppad (terminalinmatning)
-$ SIGTTOU
-22 Stoppad (terminalutmatning)
-$ SIGIO
-23 In- och utmatning möjlig
-$ SIGXCPU
-24 Cputidsgränsen överskriden
-$ SIGXFSZ
-25 Filstorleksgränsen överskriden
-$ SIGVTALRM
-26 Virtuella äggklockan ringde
-$ SIGPROF
-27 Profileringsäggklockan ringde
-$ SIGWINCH
-28 Fönsterstorleken ändras
-$ SIGINFO
-29 Informationsförfrågan
-$ SIGUSR1
-30 Användardefinierad signal 1
-$ SIGUSR2
-31 Användardefinierad signal 2
-$ SIGPWR
-32 Kraftbortfall/omstart
diff --git a/lib/libc/quad/Makefile.inc b/lib/libc/quad/Makefile.inc
deleted file mode 100644
index 1652b3f6d..000000000
--- a/lib/libc/quad/Makefile.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.17 2013/08/24 00:51:48 matt Exp $
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-# Quad support
-SRCS.quad=	cmpdi2.c ucmpdi2.c 
-SRCS.quad+=	divdi3.c moddi3.c 
-.if empty(LIBC_MACHINE_ARCH:Mearm*)
-SRCS.quad+=	fixdfdi.c fixsfdi.c
-SRCS.quad+=	fixunsdfdi.c fixunssfdi.c
-SRCS.quad+=	floatdidf.c floatdisf.c
-SRCS.quad+=	floatundidf.c floatundisf.c
-.endif
-SRCS.quad+=	muldi3.c
-SRCS.quad+=	negdi2.c
-SRCS.quad+=	qdivrem.c
-SRCS.quad+=	udivdi3.c umoddi3.c 
-
-.if   (${MACHINE_ARCH} == "m68k")
-SRCS.quad+=	ashldi3.S ashrdi3.S lshrdi3.S
-.elif (${MACHINE_ARCH} == "m68000")
-SRCS.quad+=	ashldi3.S lshrdi3.S
-.elif !empty(LIBC_MACHINE_ARCH:Mearm*)
-SRCS.quad+=	ashldi3.c ashrdi3.c lshrdi3.c lshldi3.c
-SRCS.quad+=	floatdidf_ieee754.c floatdisf_ieee754.c
-SRCS.quad+=	floatundidf_ieee754.c floatundisf_ieee754.c
-SRCS.quad+=	fixdfdi_ieee754.c fixsfdi_ieee754.c
-SRCS.quad+=	fixunsdfdi_ieee754.c fixunssfdi_ieee754.c
-.else
-SRCS.quad+=	ashldi3.c ashrdi3.c lshrdi3.c
-.endif
-
-# XXX as far as I can tell, these are never used and can be removed
-SRCS.quad+=	adddi3.c anddi3.c iordi3.c notdi2.c subdi3.c xordi3.c
-
-SRCS+=	${SRCS.quad}
-
-.PATH: ${ARCHDIR}/quad ${.CURDIR}/quad
diff --git a/lib/libc/quad/TESTS/Makefile b/lib/libc/quad/TESTS/Makefile
deleted file mode 100644
index decf428a2..000000000
--- a/lib/libc/quad/TESTS/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#	$NetBSD: Makefile,v 1.2 1995/02/27 17:31:26 cgd Exp $
-#	@(#)Makefile	8.1 (Berkeley) 6/4/93
-
-all: mul divrem
-
-MUL=	mul.c ../muldi3.c
-mul: ${MUL}
-	gcc -g -DSPARC_XXX ${MUL} -o $@
-
-DIVREM=	divrem.c ../qdivrem.c
-divrem: ${DIVREM}
-	gcc -g -DSPARC_XXX ${DIVREM} -o $@
diff --git a/lib/libc/quad/TESTS/divrem.c b/lib/libc/quad/TESTS/divrem.c
deleted file mode 100644
index 7c2139d85..000000000
--- a/lib/libc/quad/TESTS/divrem.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*	$NetBSD: divrem.c,v 1.4 2003/08/07 16:43:18 agc 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.
- * 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)divrem.c	8.1 (Berkeley) 6/4/93";
-#else
-static char rcsid[] = "$NetBSD: divrem.c,v 1.4 2003/08/07 16:43:18 agc Exp $";
-#endif
-#endif /* not lint */
-
-#include <stdio.h>
-
-main()
-{
-	union { long long q; unsigned int v[2]; } a, b, q, r;
-	char buf[300];
-	extern long long __qdivrem(unsigned long long, unsigned long long,
-	    unsigned long long *);
-
-	for (;;) {
-		printf("> ");
-		if (fgets(buf, sizeof buf, stdin) == NULL)
-			break;
-		if (sscanf(buf, "%u:%u %u:%u",
-			    &a.v[0], &a.v[1], &b.v[0], &b.v[1]) != 4 &&
-		    sscanf(buf, "0x%x:%x 0x%x:%x",
-			    &a.v[0], &a.v[1], &b.v[0], &b.v[1]) != 4) {
-			printf("eh?\n");
-			continue;
-		}
-		q.q = __qdivrem(a.q, b.q, &r.q);
-		printf("%x:%x /%% %x:%x => q=%x:%x r=%x:%x\n",
-		    a.v[0], a.v[1], b.v[0], b.v[1],
-		    q.v[0], q.v[1], r.v[0], r.v[1]);
-		printf("  = %X%08X / %X%08X => %X%08X\n\
-  = %X%08X %% %X%08X => %X%08X\n",
-		    a.v[0], a.v[1], b.v[0], b.v[1], q.v[0], q.v[1],
-		    a.v[0], a.v[1], b.v[0], b.v[1], r.v[0], r.v[1]);
-	}
-	exit(0);
-}
diff --git a/lib/libc/quad/TESTS/mul.c b/lib/libc/quad/TESTS/mul.c
deleted file mode 100644
index 2826d7a7b..000000000
--- a/lib/libc/quad/TESTS/mul.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: mul.c,v 1.4 2003/08/07 16:43:19 agc 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.
- * 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mul.c	8.1 (Berkeley) 6/4/93";
-#else
-static char rcsid[] = "$NetBSD: mul.c,v 1.4 2003/08/07 16:43:19 agc Exp $";
-#endif
-#endif /* not lint */
-
-#include <stdio.h>
-
-main()
-{
-	union { long long q; unsigned int v[2]; } a, b, m;
-	char buf[300];
-	extern long long __muldi3(long long, long long);
-
-	for (;;) {
-		printf("> ");
-		if (fgets(buf, sizeof buf, stdin) == NULL)
-			break;
-		if (sscanf(buf, "%u:%u %u:%u",
-			    &a.v[0], &a.v[1], &b.v[0], &b.v[1]) != 4 &&
-		    sscanf(buf, "0x%x:%x 0x%x:%x",
-			    &a.v[0], &a.v[1], &b.v[0], &b.v[1]) != 4) {
-			printf("eh?\n");
-			continue;
-		}
-		m.q = __muldi3(a.q, b.q);
-		printf("%x:%x * %x:%x => %x:%x\n",
-		    a.v[0], a.v[1], b.v[0], b.v[1], m.v[0], m.v[1]);
-		printf("  = %X%08X * %X%08X => %X%08X\n",
-		    a.v[0], a.v[1], b.v[0], b.v[1], m.v[0], m.v[1]);
-	}
-	exit(0);
-}
diff --git a/lib/libc/quad/fixdfdi.c b/lib/libc/quad/fixdfdi.c
deleted file mode 100644
index b45f4a80b..000000000
--- a/lib/libc/quad/fixdfdi.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: fixdfdi.c,v 1.7 2013/02/03 01:48:53 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fixdfdi.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fixdfdi.c,v 1.7 2013/02/03 01:48:53 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include "quad.h"
-
-/*
- * Convert double to (signed) quad.
- * We clamp anything that is out of range.
- */
-quad_t
-__fixdfdi(double x)
-{
-	if (x < 0)
-		if (x <= QUAD_MIN)
-			return (QUAD_MIN);
-		else
-			return ((quad_t)-(u_quad_t)-x);
-	else
-		if (x >= QUAD_MAX)
-			return (QUAD_MAX);
-		else
-			return ((quad_t)(u_quad_t)x);
-}
diff --git a/lib/libc/quad/fixdfdi_ieee754.c b/lib/libc/quad/fixdfdi_ieee754.c
deleted file mode 100644
index 9fc89c3ff..000000000
--- a/lib/libc/quad/fixdfdi_ieee754.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: fixdfdi_ieee754.c,v 1.1 2013/08/24 00:51:48 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fixdfdi_ieee754.c,v 1.1 2013/08/24 00:51:48 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include "quad.h"
-#include <limits.h>
-#include <stdbool.h>
-#include <machine/ieee.h>
-
-/*
- * Convert double to signed quad.
- * Not sure what to do with negative numbers---for now, anything out
- * of range becomes UQUAD_MAX.
- */
-quad_t
-__fixdfdi(double x)
-{
-	const union ieee_double_u ux = { .dblu_d = x };
-	signed int exp = ux.dblu_exp - DBL_EXP_BIAS;
-	const bool neg = ux.dblu_sign;
-	quad_t r;
-
-	if (exp >= 62)
-		return neg ? QUAD_MIN : QUAD_MAX;
-
-	r = 1 << DBL_FRACHBITS;		/* implicit bit */
-	r |= ux.dblu_frach;
-	exp -= DBL_FRACHBITS;
-	if (exp < 0) {
-		r >>= -exp;
-	} else if (exp > 0) {
-		r <<= DBL_FRACLBITS;
-		r |= ux.dblu_fracl;
-		exp -= DBL_FRACLBITS;
-		if (exp < 0) {
-			r >>= -exp;
-		} else if (exp > 0) {
-			r <<= exp;
-		}
-	}
-	return neg ? -r : r;
-}
diff --git a/lib/libc/quad/fixsfdi.c b/lib/libc/quad/fixsfdi.c
deleted file mode 100644
index c2647c082..000000000
--- a/lib/libc/quad/fixsfdi.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: fixsfdi.c,v 1.6 2013/02/03 01:48:53 matt Exp $	*/
-
-/*-
- * Copyright (c) 1992 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fixsfdi.c	5.1 (Berkeley) 7/7/92";
-#else
-__RCSID("$NetBSD: fixsfdi.c,v 1.6 2013/02/03 01:48:53 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include "quad.h"
-
-/*
- * Convert float to (signed) quad.
- * We clamp anything that is out of range.
- *
- * N.B.: must use new ANSI syntax (sorry).
- */
-quad_t
-__fixsfdi(float x)
-{
-	if (x < 0)
-		if (x <= QUAD_MIN)
-			return (QUAD_MIN);
-		else
-			return ((quad_t)-(u_quad_t)-x);
-	else
-		if (x >= QUAD_MAX)
-			return (QUAD_MAX);
-		else
-			return ((quad_t)(u_quad_t)x);
-}
diff --git a/lib/libc/quad/fixsfdi_ieee754.c b/lib/libc/quad/fixsfdi_ieee754.c
deleted file mode 100644
index 9376f8d26..000000000
--- a/lib/libc/quad/fixsfdi_ieee754.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: fixsfdi_ieee754.c,v 1.1 2013/08/24 00:51:48 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fixsfdi_ieee754.c,v 1.1 2013/08/24 00:51:48 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include "quad.h"
-#include <limits.h>
-#include <stdbool.h>
-#include <machine/ieee.h>
-
-/*
- * Convert float to signed quad.
- */
-quad_t
-__fixsfdi(float x)
-{
-	const union ieee_single_u ux = { .sngu_f = x };
-	signed int exp = ux.sngu_exp - SNG_EXP_BIAS;
-	const bool neg = ux.sngu_sign;
-	quad_t r;
-
-	if (exp < 0)
-		return 0;
-	if (exp > 62)
-		return neg ? QUAD_MIN : QUAD_MAX;
-
-	r = 1 << SNG_FRACBITS;		/* implicit bit */
-	r |= ux.sngu_frac;
-	exp -= SNG_FRACBITS;
-	if (exp < 0) {
-		r >>= -exp;
-	} else if (exp > 0) {
-		r <<= exp;
-	}
-	return neg ? -r : r;
-}
diff --git a/lib/libc/quad/fixunsdfdi.c b/lib/libc/quad/fixunsdfdi.c
deleted file mode 100644
index 60090f0a8..000000000
--- a/lib/libc/quad/fixunsdfdi.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*	$NetBSD: fixunsdfdi.c,v 1.11 2013/02/03 01:48:53 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fixunsdfdi.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fixunsdfdi.c,v 1.11 2013/02/03 01:48:53 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include "quad.h"
-
-#define	ONE_FOURTH	((int)1 << (unsigned int)(INT_BITS - 2))
-#define	ONE_HALF	(ONE_FOURTH * 2.0)
-#define	ONE		(ONE_FOURTH * 4.0)
-
-/*
- * Convert double to (unsigned) quad.
- * Not sure what to do with negative numbers---for now, anything out
- * of range becomes UQUAD_MAX.
- */
-u_quad_t
-__fixunsdfdi(double x)
-{
-	union uu t;
-	unsigned int tmp;
-
-	if (x < 0)
-		return (UQUAD_MAX);	/* ??? should be 0?  ERANGE??? */
-#ifdef notdef				/* this falls afoul of a GCC bug */
-	if (x >= UQUAD_MAX)
-		return (UQUAD_MAX);
-#else					/* so we wire in 2^64-1 instead */
-	if (x >= 18446744073709551615.0)	/* XXX */
-		return (UQUAD_MAX);
-#endif
-	/*
-	 * Now we know that 0 <= x <= 18446744073709549568.  The upper
-	 * limit is one ulp less than 18446744073709551615 tested for above.
-	 * Dividing this by 2^32 will *not* round irrespective of any
-	 * rounding modes (except if the result is an IEEE denorm).
-	 * Furthermore, the quotient will fit into a 32-bit integer.
-	 */
-	tmp = x / ONE;
-	t.ul[L] = (unsigned int) (x - tmp * ONE);
-	t.ul[H] = tmp;
-	return (t.uq);
-}
diff --git a/lib/libc/quad/fixunsdfdi_ieee754.c b/lib/libc/quad/fixunsdfdi_ieee754.c
deleted file mode 100644
index 32058c1cd..000000000
--- a/lib/libc/quad/fixunsdfdi_ieee754.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: fixunsdfdi_ieee754.c,v 1.1 2013/08/24 00:51:48 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fixunsdfdi_ieee754.c,v 1.1 2013/08/24 00:51:48 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include "quad.h"
-#include <limits.h>
-#include <machine/ieee.h>
-
-/*
- * Convert double to unsigned quad.
- * Not sure what to do with negative numbers---for now, anything out
- * of range becomes UQUAD_MAX.
- */
-u_quad_t
-__fixunsdfdi(double x)
-{
-	const union ieee_double_u ux = { .dblu_d = x };
-	signed int exp = ux.dblu_exp - DBL_EXP_BIAS;
-	u_quad_t r;
-
-	if (ux.dblu_sign)
-		return UQUAD_MAX;
-	if (exp > 63)
-		return UQUAD_MAX;
-	if (exp < 0)
-		return 0;
-
-	r = 1 << DBL_FRACHBITS;		/* implicit bit */
-	r |= ux.dblu_frach;
-	exp -= DBL_FRACHBITS;
-	if (exp == 0)
-		return r;
-	if (exp < 0)
-		return r >> -exp;
-
-	r <<= DBL_FRACLBITS;
-	r |= ux.dblu_fracl;
-	exp -= DBL_FRACLBITS;
-	if (exp == 0)
-		return r;
-	if (exp < 0)
-		return r >> -exp;
-
-	return r << exp;
-}
diff --git a/lib/libc/quad/fixunssfdi.c b/lib/libc/quad/fixunssfdi.c
deleted file mode 100644
index c7f7942d3..000000000
--- a/lib/libc/quad/fixunssfdi.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*	$NetBSD: fixunssfdi.c,v 1.9 2013/02/03 01:48:53 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fixunssfdi.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fixunssfdi.c,v 1.9 2013/02/03 01:48:53 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include "quad.h"
-
-#define	ONE_FOURTH	((int)1 << (unsigned int)(INT_BITS - 2))
-#define	ONE_HALF	(ONE_FOURTH * 2.0)
-#define	ONE		(ONE_FOURTH * 4.0)
-
-/*
- * Convert float to (unsigned) quad.  We do most of our work in double,
- * out of sheer paranoia.
- *
- * Not sure what to do with negative numbers---for now, anything out
- * of range becomes UQUAD_MAX.
- *
- * N.B.: must use new ANSI syntax (sorry).
- */
-u_quad_t
-__fixunssfdi(float f)
-{
-	double x, toppart;
-	union uu t;
-
-	if (f < 0)
-		return (UQUAD_MAX);	/* ??? should be 0?  ERANGE??? */
-#ifdef notdef				/* this falls afoul of a GCC bug */
-	if (f >= UQUAD_MAX)
-		return (UQUAD_MAX);
-#else					/* so we wire in 2^64-1 instead */
-	if (f >= 18446744073709551615.0)	/* XXX */
-		return (UQUAD_MAX);
-#endif
-	x = f;
-	/*
-	 * Get the upper part of the result.  Note that the divide
-	 * may round up; we want to avoid this if possible, so we
-	 * subtract `1/2' first.
-	 */
-	toppart = (x - ONE_HALF) / ONE;
-	/*
-	 * Now build a u_quad_t out of the top part.  The difference
-	 * between x and this is the bottom part (this may introduce
-	 * a few fuzzy bits, but what the heck).  With any luck this
-	 * difference will be nonnegative: x should wind up in the
-	 * range [0..UINT_MAX].  For paranoia, we assume [INT_MIN..
-	 * 2*UINT_MAX] instead.
-	 */
-	t.ul[H] = (unsigned int)toppart;
-	t.ul[L] = 0;
-	x -= (double)t.uq;
-	if (x < 0) {
-		t.ul[H]--;
-		x += UINT_MAX;
-	}
-	if (x > UINT_MAX) {
-		t.ul[H]++;
-		x -= UINT_MAX;
-	}
-	t.ul[L] = (u_int)x;
-	return (t.uq);
-}
diff --git a/lib/libc/quad/fixunssfdi_ieee754.c b/lib/libc/quad/fixunssfdi_ieee754.c
deleted file mode 100644
index 180e31e81..000000000
--- a/lib/libc/quad/fixunssfdi_ieee754.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: fixunssfdi_ieee754.c,v 1.1 2013/08/24 00:51:48 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fixunssfdi_ieee754.c,v 1.1 2013/08/24 00:51:48 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include "quad.h"
-#include <limits.h>
-#include <machine/ieee.h>
-
-/*
- * Convert float to unsigned quad.
- * Not sure what to do with negative numbers---for now, anything out
- * of range becomes UQUAD_MAX.
- */
-u_quad_t
-__fixunssfdi(float x)
-{
-	const union ieee_single_u ux = { .sngu_f = x };
-	signed int exp = ux.sngu_exp - SNG_EXP_BIAS;
-	u_quad_t r;
-
-	if (ux.sngu_sign)
-		return UQUAD_MAX;
-	if (exp > 63)
-		return UQUAD_MAX;
-	if (exp < 0)
-		return 0;
-
-	r = 1 << SNG_FRACBITS;		/* implicit bit */
-	r |= ux.sngu_frac;
-	exp -= SNG_FRACBITS;
-	if (exp == 0)
-		return r;
-	if (exp < 0)
-		return r >> -exp;
-
-	return r << exp;
-}
diff --git a/lib/libc/quad/floatdidf.c b/lib/libc/quad/floatdidf.c
deleted file mode 100644
index 967d4b2a5..000000000
--- a/lib/libc/quad/floatdidf.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*	$NetBSD: floatdidf.c,v 1.10 2013/02/03 01:48:53 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)floatdidf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: floatdidf.c,v 1.10 2013/02/03 01:48:53 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include "quad.h"
-
-/*
- * Convert (signed) quad to double.
- */
-double
-__floatdidf(quad_t x)
-{
-	double d;
-	union uu u;
-	int neg;
-
-	/*
-	 * Get an unsigned number first, by negating if necessary.
-	 */
-	if (x < 0)
-		u.q = -x, neg = 1;
-	else
-		u.q = x, neg = 0;
-
-	/*
-	 * Now u.ul[H] has the factor of 2^32 (or whatever) and u.ul[L]
-	 * has the units.  Ideally we could just set d, add INT_BITS to
-	 * its exponent, and then add the units, but this is portable
-	 * code and does not know how to get at an exponent.  Machine-
-	 * specific code may be able to do this more efficiently.
-	 */
-	d = (double)u.ul[H] * (((int)1 << (unsigned int)(INT_BITS - 2)) * 4.0);
-	d += u.ul[L];
-
-	return (neg ? -d : d);
-}
diff --git a/lib/libc/quad/floatdidf_ieee754.c b/lib/libc/quad/floatdidf_ieee754.c
deleted file mode 100644
index 8e6895d25..000000000
--- a/lib/libc/quad/floatdidf_ieee754.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: floatdidf_ieee754.c,v 1.1 2013/08/24 00:51:48 matt Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: floatdidf_ieee754.c,v 1.1 2013/08/24 00:51:48 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include <limits.h>
-#include <machine/ieee.h>
-#include "quad.h"
-
-double __floatdidf(quad_t);
-
-/*
- * Convert signed quad to double.
- */
-double
-__floatdidf(quad_t x)
-{
-	union ieee_double_u ux = { .dblu_d = 0.0 };
-
-	if (x == 0)
-		return 0.0;
-	if (x == 1)
-		return 1.0;
-
-	if (x < 0) {
-		if (x == QUAD_MIN)
-			return -0x1.0p63;
-		ux.dblu_sign = 1;
-		x = -x;
-	}
-	u_int l = __builtin_clzll(x);
-	x <<= (l + 1);	/* clear implicit bit */
-	x >>= 64 - (DBL_FRACHBITS + DBL_FRACLBITS);
-	union uu u = { .uq = x };
-	ux.dblu_frach = u.ul[H];
-	ux.dblu_fracl = u.ul[L];
-	ux.dblu_exp = DBL_EXP_BIAS + 63 - l;
-
-	return ux.dblu_d;
-}
diff --git a/lib/libc/quad/floatdisf.c b/lib/libc/quad/floatdisf.c
deleted file mode 100644
index 0a1092b95..000000000
--- a/lib/libc/quad/floatdisf.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: floatdisf.c,v 1.10 2013/02/03 01:48:53 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)floatdisf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: floatdisf.c,v 1.10 2013/02/03 01:48:53 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include "quad.h"
-
-/*
- * Convert (signed) quad to float.
- */
-float
-__floatdisf(quad_t x)
-{
-	float f;
-	union uu u;
-	int neg;
-
-	/*
-	 * Get an unsigned number first, by negating if necessary.
-	 */
-	if (x < 0)
-		u.q = -x, neg = 1;
-	else
-		u.q = x, neg = 0;
-
-	/*
-	 * Now u.ul[H] has the factor of 2^32 (or whatever) and u.ul[L]
-	 * has the units.  Ideally we could just set f, add INT_BITS to
-	 * its exponent, and then add the units, but this is portable
-	 * code and does not know how to get at an exponent.  Machine-
-	 * specific code may be able to do this more efficiently.
-	 *
-	 * Using double here may be excessive paranoia.
-	 */
-	f = (double)u.ul[H] * (((int)1 << (unsigned int)(INT_BITS - 2)) * 4.0);
-	f += u.ul[L];
-
-	return (neg ? -f : f);
-}
diff --git a/lib/libc/quad/floatdisf_ieee754.c b/lib/libc/quad/floatdisf_ieee754.c
deleted file mode 100644
index 6301fcfe8..000000000
--- a/lib/libc/quad/floatdisf_ieee754.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*	$NetBSD: floatdisf_ieee754.c,v 1.2 2013/08/24 00:51:48 matt Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: floatdisf_ieee754.c,v 1.2 2013/08/24 00:51:48 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include <limits.h>
-#include <machine/ieee.h>
-#include "quad.h"
-
-float __floatdisf(quad_t);
-
-/*
- * Convert signed quad to float.
- */
-float
-__floatdisf(quad_t x)
-{
-	union ieee_single_u ux = { .sngu_f = 0.0 };
-
-	if (x == 0)
-		return 0.0;
-	if (x == 1)
-		return 1.0;
-
-	if (x < 0) {
-		if (x == QUAD_MIN)
-			return -0x1.0p63;
-		ux.sngu_sign = 1;
-		x = -x;
-	}
-#if defined(_LP64) || defined(__mips_n32)
-	u_int l = __builtin_clzll(x);
-	x <<= (l + 1);	/* clear implicit bit */
-
-	ux.sngu_frac = (u_quad_t)x >> (64 - SNG_FRACBITS);
-#else
-	union uu u = { .uq = x };
-	uint32_t frac;
-	u_int l;
-	if (u.ul[H] == 0) {
-		l = __builtin_clz(u.ul[L]);
-		frac = u.ul[L] << (l + 1);	/* clear implicit bit */
-		l += 32;
-	} else {
-		l = __builtin_clz(u.ul[H]);
-		frac = u.ul[H] << (l + 1);	/* clear implicit bit */
-		frac |= u.ul[L] >> (32 - (l + 1));
-	}
-
-	ux.sngu_frac = frac >> (32 - SNG_FRACBITS);
-#endif
-	ux.sngu_exp = SNG_EXP_BIAS + 63 - l;
-
-	return ux.sngu_f;
-}
diff --git a/lib/libc/quad/floatundidf.c b/lib/libc/quad/floatundidf.c
deleted file mode 100644
index c2df84f0d..000000000
--- a/lib/libc/quad/floatundidf.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: floatundidf.c,v 1.4 2013/02/03 01:48:53 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)floatunsdidf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: floatundidf.c,v 1.4 2013/02/03 01:48:53 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include "quad.h"
-
-/*
- * Convert (unsigned) quad to double.
- * This is exactly like floatdidf.c except that negatives never occur.
- */
-double
-__floatundidf(u_quad_t x)
-{
-	double d;
-	union uu u;
-
-	u.uq = x;
-	d = (double)u.ul[H] * (((int)1 << (unsigned int)(INT_BITS - 2)) * 4.0);
-	d += u.ul[L];
-	return (d);
-}
diff --git a/lib/libc/quad/floatundidf_ieee754.c b/lib/libc/quad/floatundidf_ieee754.c
deleted file mode 100644
index 171945f5c..000000000
--- a/lib/libc/quad/floatundidf_ieee754.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: floatundidf_ieee754.c,v 1.2 2013/09/30 19:32:14 mlelstv Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: floatundidf_ieee754.c,v 1.2 2013/09/30 19:32:14 mlelstv Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include <limits.h>
-#include <machine/ieee.h>
-#include "quad.h"
-
-/*
- * Convert unsigned quad to double.
- */
-double
-__floatundidf(u_quad_t x)
-{
-	union ieee_double_u ux = { .dblu_d = 0.0 };
-
-	if (x == 0)
-		return 0.0;
-
-	u_int l = __builtin_clzll(x);
-	x <<= (l + 1);	/* clear implicit bit */
-	x >>= 64 - (DBL_FRACHBITS + DBL_FRACLBITS);
-	union uu u = { .uq = x };
-	ux.dblu_frach = u.ul[H];
-	ux.dblu_fracl = u.ul[L];
-	ux.dblu_exp = DBL_EXP_BIAS + 63 - l;
-
-	return ux.dblu_d;
-}
diff --git a/lib/libc/quad/floatundisf.c b/lib/libc/quad/floatundisf.c
deleted file mode 100644
index a2ad3ea50..000000000
--- a/lib/libc/quad/floatundisf.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: floatundisf.c,v 1.4 2013/02/03 01:48:53 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)floatdisf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: floatundisf.c,v 1.4 2013/02/03 01:48:53 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include "quad.h"
-
-/*
- * Convert (unsigned) quad to float.
- */
-float
-__floatundisf(u_quad_t x)
-{
-	float f;
-	union uu u;
-
-	u.q = x;
-
-	/*
-	 * Now u.ul[H] has the factor of 2^32 (or whatever) and u.ul[L]
-	 * has the units.  Ideally we could just set f, add INT_BITS to
-	 * its exponent, and then add the units, but this is portable
-	 * code and does not know how to get at an exponent.  Machine-
-	 * specific code may be able to do this more efficiently.
-	 *
-	 * Using double here may be excessive paranoia.
-	 */
-	f = (double)u.ul[H] * (((int)1 << (unsigned int)(INT_BITS - 2)) * 4.0);
-	f += u.ul[L];
-
-	return f;
-}
diff --git a/lib/libc/quad/floatundisf_ieee754.c b/lib/libc/quad/floatundisf_ieee754.c
deleted file mode 100644
index eebbcf807..000000000
--- a/lib/libc/quad/floatundisf_ieee754.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: floatundisf_ieee754.c,v 1.2 2013/08/24 00:51:48 matt Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: floatundisf_ieee754.c,v 1.2 2013/08/24 00:51:48 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include <machine/ieee.h>
-#include "quad.h"
-
-float __floatundisf(u_quad_t);
-
-/*
- * Convert unsigned quad to float.
- */
-float
-__floatundisf(u_quad_t x)
-{
-	union ieee_single_u ux = { .sngu_f = 0.0 };
-
-	if (x == 0)
-		return 0.0;
-	if (x == 1)
-		return 1.0;
-
-#if defined(_LP64) || defined(__mips_n32)
-	u_int l = __builtin_clzll(x);
-	x <<= (l + 1);	/* clear implicit bit */
-
-	ux.sngu_frac = x >> (64 - SNG_FRACBITS);
-#else
-	union uu u = { .uq = x };
-	uint32_t frac;
-	u_int l;
-	if (u.ul[H] == 0) {
-		l = __builtin_clz(u.ul[L]);
-		frac = u.ul[L] << (l + 1);	/* clear implicit bit */
-		l += 32;
-	} else {
-		l = __builtin_clz(u.ul[H]);
-		frac = u.ul[H] << (l + 1);	/* clear implicit bit */
-		frac |= u.ul[L] >> (32 - (l + 1));
-	}
-
-	ux.sngu_frac = frac >> (32 - SNG_FRACBITS);
-#endif
-	ux.sngu_exp = SNG_EXP_BIAS + 63 - l;
-
-	return ux.sngu_f;
-}
diff --git a/lib/libc/quad/floatunditf_ieee754.c b/lib/libc/quad/floatunditf_ieee754.c
deleted file mode 100644
index 0d30a9033..000000000
--- a/lib/libc/quad/floatunditf_ieee754.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*	$NetBSD: floatunditf_ieee754.c,v 1.4 2012/08/05 04:28:58 matt 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)floatunsdidf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: floatunditf_ieee754.c,v 1.4 2012/08/05 04:28:58 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef SOFTFLOAT
-#include "softfloat/softfloat-for-gcc.h"
-#endif
-
-#include "quad.h"
-#ifdef __vax__
-#error vax does not support a distinct long double
-#endif
-#include <machine/ieee.h>
-
-/*
- * Convert (unsigned) quad to long double.
- * This is exactly like floatdidf.c except that negatives never occur.
- */
-long double
-__floatunditf(u_quad_t x)
-{
-#if 0
-	long double ld;
-	union uu u;
-
-	u.uq = x;
-	ld = (long double)u.ul[H] * (((int)1 << (INT_BITS - 2)) * 4.0);
-	ld += u.ul[L];
-	return (ld);
-#else
-	union ieee_ext_u extu;
-	quad_t tmp = x;		/* must be signed */
-	unsigned int width = 64;
-	unsigned int bit = 0;
-	quad_t mask = ~(quad_t)0;
-
-	if (x == 0)
-		return 0.0L;
-	if (x == 1)
-		return 1.0L;
-
-	while (mask != 0 && (tmp >= 0)) {
-		width >>= 1;
-		mask <<= width;
-		if ((tmp & mask) == 0) {
-			tmp <<= width;
-			bit += width;
-		}
-	}
-
-	x <<= (bit + 1);
-	extu.extu_sign = 0;
-	extu.extu_exp = EXT_EXP_BIAS + (64 - (bit + 1));
-	extu.extu_frach = (unsigned int)(x >> (64 - EXT_FRACHBITS));
-	x <<= EXT_FRACHBITS;
-#ifdef EXT_FRACHMBITS
-	extu.extu_frachm =(unsigned int)(x >> (64 - EXT_FRACHMBITS));
-	x <<= EXT_FRACHMBITS;
-#endif
-#ifdef EXT_FRACLMBITS
-	extu.extu_fraclm =(unsigned int)(x >> (64 - EXT_FRACLMBITS));
-	x <<= EXT_FRACLMBITS;
-#endif
-	extu.extu_fracl =(unsigned int)(x >> (64 - EXT_FRACLBITS));
-
-	return extu.extu_ld;
-#endif
-}
diff --git a/lib/libc/regex/COPYRIGHT b/lib/libc/regex/COPYRIGHT
deleted file mode 100644
index f7a8f20c3..000000000
--- a/lib/libc/regex/COPYRIGHT
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: COPYRIGHT,v 1.5 2003/08/07 16:43:19 agc Exp $
-
-Copyright 1992, 1993, 1994 Henry Spencer.  All rights reserved.
-This software is not subject to any license of the American Telephone
-and Telegraph Company or of the Regents of the University of California.
-
-Permission is granted to anyone to use this software for any purpose on
-any computer system, and to alter it and redistribute it, subject
-to the following restrictions:
-
-1. The author is not responsible for the consequences of use of this
-   software, no matter how awful, even if they arise from flaws in it.
-
-2. The origin of this software must not be misrepresented, either by
-   explicit claim or by omission.  Since few users ever read sources,
-   credits must appear in the documentation.
-
-3. Altered versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.  Since few users
-   ever read sources, credits must appear in the documentation.
-
-4. This notice may not be removed or altered.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-/*-
- * Copyright (c) 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)COPYRIGHT	8.1 (Berkeley) 3/16/94
- */
diff --git a/lib/libc/regex/Makefile.inc b/lib/libc/regex/Makefile.inc
deleted file mode 100644
index 4dd74cf84..000000000
--- a/lib/libc/regex/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.7 1997/11/14 02:04:46 mrg Exp $
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-# regex sources
-.PATH: ${.CURDIR}/regex
-
-CPPFLAGS+=-DPOSIX_MISTAKE
-
-SRCS+=	regcomp.c regerror.c regexec.c regfree.c
-
-MAN+=	regex.3 re_format.7
-
-MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3 \
-	regex.3 regfree.3
diff --git a/lib/libc/regex/WHATSNEW b/lib/libc/regex/WHATSNEW
deleted file mode 100644
index 93eb93606..000000000
--- a/lib/libc/regex/WHATSNEW
+++ /dev/null
@@ -1,95 +0,0 @@
-#	$NetBSD: WHATSNEW,v 1.6 1995/02/27 13:28:25 cgd Exp $
-# @(#)WHATSNEW	8.3 (Berkeley) 3/18/94
-
-New in alpha3.4:  The complex bug alluded to below has been fixed (in a
-slightly kludgey temporary way that may hurt efficiency a bit; this is
-another "get it out the door for 4.4" release).  The tests at the end of
-the tests file have accordingly been uncommented.  The primary sign of
-the bug was that something like a?b matching ab matched b rather than ab.
-(The bug was essentially specific to this exact situation, else it would
-have shown up earlier.)
-
-New in alpha3.3:  The definition of word boundaries has been altered
-slightly, to more closely match the usual programming notion that "_"
-is an alphabetic.  Stuff used for pre-ANSI systems is now in a subdir,
-and the makefile no longer alludes to it in mysterious ways.  The
-makefile has generally been cleaned up some.  Fixes have been made
-(again!) so that the regression test will run without -DREDEBUG, at
-the cost of weaker checking.  A workaround for a bug in some folks'
-<assert.h> has been added.  And some more things have been added to
-tests, including a couple right at the end which are commented out
-because the code currently flunks them (complex bug; fix coming).
-Plus the usual minor cleanup.
-
-New in alpha3.2:  Assorted bits of cleanup and portability improvement
-(the development base is now a BSDI system using GCC instead of an ancient
-Sun system, and the newer compiler exposed some glitches).  Fix for a
-serious bug that affected REs using many [] (including REG_ICASE REs
-because of the way they are implemented), *sometimes*, depending on
-memory-allocation patterns.  The header-file prototypes no longer name
-the parameters, avoiding possible name conflicts.  The possibility that
-some clot has defined CHAR_MIN as (say) `-128' instead of `(-128)' is
-now handled gracefully.  "uchar" is no longer used as an internal type
-name (too many people have the same idea).  Still the same old lousy
-performance, alas.
-
-New in alpha3.1:  Basically nothing, this release is just a bookkeeping
-convenience.  Stay tuned.
-
-New in alpha3.0:  Performance is no better, alas, but some fixes have been
-made and some functionality has been added.  (This is basically the "get
-it out the door in time for 4.4" release.)  One bug fix:  regfree() didn't
-free the main internal structure (how embarrassing).  It is now possible
-to put NULs in either the RE or the target string, using (resp.) a new
-REG_PEND flag and the old REG_STARTEND flag.  The REG_NOSPEC flag to
-regcomp() makes all characters ordinary, so you can match a literal
-string easily (this will become more useful when performance improves!).
-There are now primitives to match beginnings and ends of words, although
-the syntax is disgusting and so is the implementation.  The REG_ATOI
-debugging interface has changed a bit.  And there has been considerable
-internal cleanup of various kinds.
-
-New in alpha2.3:  Split change list out of README, and moved flags notes
-into Makefile.  Macro-ized the name of regex(7) in regex(3), since it has
-to change for 4.4BSD.  Cleanup work in engine.c, and some new regression
-tests to catch tricky cases thereof.
-
-New in alpha2.2:  Out-of-date manpages updated.  Regerror() acquires two
-small extensions -- REG_ITOA and REG_ATOI -- which avoid debugging kludges
-in my own test program and might be useful to others for similar purposes.
-The regression test will now compile (and run) without REDEBUG.  The
-BRE \$ bug is fixed.  Most uses of "uchar" are gone; it's all chars now.
-Char/uchar parameters are now written int/unsigned, to avoid possible
-portability problems with unpromoted parameters.  Some unsigned casts have
-been introduced to minimize portability problems with shifting into sign
-bits.
-
-New in alpha2.1:  Lots of little stuff, cleanup and fixes.  The one big
-thing is that regex.h is now generated, using mkh, rather than being
-supplied in the distribution; due to circularities in dependencies,
-you have to build regex.h explicitly by "make h".  The two known bugs
-have been fixed (and the regression test now checks for them), as has a
-problem with assertions not being suppressed in the absence of REDEBUG.
-No performance work yet.
-
-New in alpha2:  Backslash-anything is an ordinary character, not an
-error (except, of course, for the handful of backslashed metacharacters
-in BREs), which should reduce script breakage.  The regression test
-checks *where* null strings are supposed to match, and has generally
-been tightened up somewhat.  Small bug fixes in parameter passing (not
-harmful, but technically errors) and some other areas.  Debugging
-invoked by defining REDEBUG rather than not defining NDEBUG.
-
-New in alpha+3:  full prototyping for internal routines, using a little
-helper program, mkh, which extracts prototypes given in stylized comments.
-More minor cleanup.  Buglet fix:  it's CHAR_BIT, not CHAR_BITS.  Simple
-pre-screening of input when a literal string is known to be part of the
-RE; this does wonders for performance.
-
-New in alpha+2:  minor bits of cleanup.  Notably, the number "32" for the
-word width isn't hardwired into regexec.c any more, the public header
-file prototypes the functions if __STDC__ is defined, and some small typos
-in the manpages have been fixed.
-
-New in alpha+1:  improvements to the manual pages, and an important
-extension, the REG_STARTEND option to regexec().
diff --git a/lib/libc/regex/cclass.h b/lib/libc/regex/cclass.h
deleted file mode 100644
index 3ab2ccba4..000000000
--- a/lib/libc/regex/cclass.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*	$NetBSD: cclass.h,v 1.7 2003/08/07 16:43:19 agc Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)cclass.h	8.3 (Berkeley) 3/20/94
- */
-
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)cclass.h	8.3 (Berkeley) 3/20/94
- */
-
-/* character-class table */
-static const struct cclass {
-	const char *name;
-	const char *chars;
-	const char *multis;
-} cclasses[] = {
-	{ "alnum",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
-0123456789",				"" },
-	{ "alpha",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
-					"" },
-	{ "blank",	" \t",		"" },
-	{ "cntrl",	"\007\b\t\n\v\f\r\1\2\3\4\5\6\16\17\20\21\22\23\24\
-\25\26\27\30\31\32\33\34\35\36\37\177",	"" },
-	{ "digit",	"0123456789",	"" },
-	{ "graph",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
-0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
-					"" },
-	{ "lower",	"abcdefghijklmnopqrstuvwxyz",
-					"" },
-	{ "print",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
-0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ ",
-					"" },
-	{ "punct",	"!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
-					"" },
-	{ "space",	"\t\n\v\f\r ",	"" },
-	{ "upper",	"ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-					"" },
-	{ "xdigit",	"0123456789ABCDEFabcdef",
-					"" },
-	{ NULL,		0,		"" }
-};
diff --git a/lib/libc/regex/cname.h b/lib/libc/regex/cname.h
deleted file mode 100644
index 4b9ef3919..000000000
--- a/lib/libc/regex/cname.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*	$NetBSD: cname.h,v 1.7 2003/08/07 16:43:19 agc Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)cname.h	8.3 (Berkeley) 3/20/94
- */
-
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)cname.h	8.3 (Berkeley) 3/20/94
- */
-
-/* character-name table */
-static const struct cname {
-	const char *name;
-	char code;
-} cnames[] = {
-	{ "NUL",			'\0' },
-	{ "SOH",			'\001' },
-	{ "STX",			'\002' },
-	{ "ETX",			'\003' },
-	{ "EOT",			'\004' },
-	{ "ENQ",			'\005' },
-	{ "ACK",			'\006' },
-	{ "BEL",			'\007' },
-	{ "alert",			'\007' },
-	{ "BS",				'\010' },
-	{ "backspace",			'\b' },
-	{ "HT",				'\011' },
-	{ "tab",			'\t' },
-	{ "LF",				'\012' },
-	{ "newline",			'\n' },
-	{ "VT",				'\013' },
-	{ "vertical-tab",		'\v' },
-	{ "FF",				'\014' },
-	{ "form-feed",			'\f' },
-	{ "CR",				'\015' },
-	{ "carriage-return",		'\r' },
-	{ "SO",				'\016' },
-	{ "SI",				'\017' },
-	{ "DLE",			'\020' },
-	{ "DC1",			'\021' },
-	{ "DC2",			'\022' },
-	{ "DC3",			'\023' },
-	{ "DC4",			'\024' },
-	{ "NAK",			'\025' },
-	{ "SYN",			'\026' },
-	{ "ETB",			'\027' },
-	{ "CAN",			'\030' },
-	{ "EM",				'\031' },
-	{ "SUB",			'\032' },
-	{ "ESC",			'\033' },
-	{ "IS4",			'\034' },
-	{ "FS",				'\034' },
-	{ "IS3",			'\035' },
-	{ "GS",				'\035' },
-	{ "IS2",			'\036' },
-	{ "RS",				'\036' },
-	{ "IS1",			'\037' },
-	{ "US",				'\037' },
-	{ "space",			' ' },
-	{ "exclamation-mark",		'!' },
-	{ "quotation-mark",		'"' },
-	{ "number-sign",		'#' },
-	{ "dollar-sign",		'$' },
-	{ "percent-sign",		'%' },
-	{ "ampersand",			'&' },
-	{ "apostrophe",			'\'' },
-	{ "left-parenthesis",		'(' },
-	{ "right-parenthesis",		')' },
-	{ "asterisk",			'*' },
-	{ "plus-sign",			'+' },
-	{ "comma",			',' },
-	{ "hyphen",			'-' },
-	{ "hyphen-minus",		'-' },
-	{ "period",			'.' },
-	{ "full-stop",			'.' },
-	{ "slash",			'/' },
-	{ "solidus",			'/' },
-	{ "zero",			'0' },
-	{ "one",			'1' },
-	{ "two",			'2' },
-	{ "three",			'3' },
-	{ "four",			'4' },
-	{ "five",			'5' },
-	{ "six",			'6' },
-	{ "seven",			'7' },
-	{ "eight",			'8' },
-	{ "nine",			'9' },
-	{ "colon",			':' },
-	{ "semicolon",			';' },
-	{ "less-than-sign",		'<' },
-	{ "equals-sign",		'=' },
-	{ "greater-than-sign",		'>' },
-	{ "question-mark",		'?' },
-	{ "commercial-at",		'@' },
-	{ "left-square-bracket",	'[' },
-	{ "backslash",			'\\' },
-	{ "reverse-solidus",		'\\' },
-	{ "right-square-bracket",	']' },
-	{ "circumflex",			'^' },
-	{ "circumflex-accent",		'^' },
-	{ "underscore",			'_' },
-	{ "low-line",			'_' },
-	{ "grave-accent",		'`' },
-	{ "left-brace",			'{' },
-	{ "left-curly-bracket",		'{' },
-	{ "vertical-line",		'|' },
-	{ "right-brace",		'}' },
-	{ "right-curly-bracket",	'}' },
-	{ "tilde",			'~' },
-	{ "DEL",			'\177' },
-	{ NULL,				0 },
-};
diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c
deleted file mode 100644
index 2a800d4ff..000000000
--- a/lib/libc/regex/engine.c
+++ /dev/null
@@ -1,1188 +0,0 @@
-/*	$NetBSD: engine.c,v 1.24 2012/03/13 21:13:42 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)engine.c	8.5 (Berkeley) 3/20/94
- */
-
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)engine.c	8.5 (Berkeley) 3/20/94
- */
-
-/*
- * The matching engine and friends.  This file is #included by regexec.c
- * after suitable #defines of a variety of macros used herein, so that
- * different state representations can be used without duplicating masses
- * of code.
- */
-
-#ifdef SNAMES
-#define	matcher	smatcher
-#define	fast	sfast
-#define	slow	sslow
-#define	dissect	sdissect
-#define	backref	sbackref
-#define	step	sstep
-#define	print	sprint
-#define	at	sat
-#define	match	smat
-#define	nope	snope
-#endif
-#ifdef LNAMES
-#define	matcher	lmatcher
-#define	fast	lfast
-#define	slow	lslow
-#define	dissect	ldissect
-#define	backref	lbackref
-#define	step	lstep
-#define	print	lprint
-#define	at	lat
-#define	match	lmat
-#define	nope	lnope
-#endif
-
-/* another structure passed up and down to avoid zillions of parameters */
-struct match {
-	struct re_guts *g;
-	int eflags;
-	regmatch_t *pmatch;	/* [nsub+1] (0 element unused) */
-	const char *offp;	/* offsets work from here */
-	const char *beginp;	/* start of string -- virtual NUL precedes */
-	const char *endp;	/* end of string -- virtual NUL here */
-	const char *coldp;	/* can be no match starting before here */
-	const char **lastpos;	/* [nplus+1] */
-	STATEVARS;
-	states st;		/* current states */
-	states fresh;		/* states for a fresh start */
-	states tmp;		/* temporary */
-	states empty;		/* empty set of states */
-};
-
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === engine.c === */
-static int matcher(struct re_guts *g, const char *string, size_t nmatch, regmatch_t pmatch[], int eflags);
-static const char *dissect(struct match *m, const char *start, const char *stop, sopno startst, sopno stopst);
-static const char *backref(struct match *m, const char *start, const char *stop, sopno startst, sopno stopst, sopno lev);
-static const char *fast(struct match *m, const char *start, const char *stop, sopno startst, sopno stopst);
-static const char *slow(struct match *m, const char *start, const char *stop, sopno startst, sopno stopst);
-static states step(struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft);
-#define	BOL	(OUT+1)
-#define	EOL	(BOL+1)
-#define	BOLEOL	(BOL+2)
-#define	NOTHING	(BOL+3)
-#define	BOW	(BOL+4)
-#define	EOW	(BOL+5)
-#define	CODEMAX	(BOL+5)		/* highest code used */
-#define	NONCHAR(c)	((c) > CHAR_MAX)
-#define	NNONCHAR	(CODEMAX-CHAR_MAX)
-#ifdef REDEBUG
-static void print(struct match *m, char *caption, states st, int ch, FILE *d);
-#endif
-#ifdef REDEBUG
-static void at(struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst);
-#endif
-#ifdef REDEBUG
-static char *pchar(int ch);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
-
-#ifdef REDEBUG
-#define	SP(t, s, c)	print(m, t, s, c, stdout)
-#define	AT(t, p1, p2, s1, s2)	at(m, t, p1, p2, s1, s2)
-#define	NOTE(str)	{ if (m->eflags&REG_TRACE) printf("=%s\n", (str)); }
-static int nope = 0;
-#else
-#define	SP(t, s, c)	/* nothing */
-#define	AT(t, p1, p2, s1, s2)	/* nothing */
-#define	NOTE(s)	/* nothing */
-#endif
-
-/*
- - matcher - the actual matching engine
- == static int matcher(struct re_guts *g, char *string, \
- ==	size_t nmatch, regmatch_t pmatch[], int eflags);
- */
-static int			/* 0 success, REG_NOMATCH failure */
-matcher(
-    struct re_guts *g,
-    const char *string,
-    size_t nmatch,
-    regmatch_t pmatch[],
-    int eflags)
-{
-	const char *endp;
-	size_t i;
-	struct match mv;
-	struct match *m = &mv;
-	const char *dp;
-	const sopno gf = g->firststate+1;	/* +1 for OEND */
-	const sopno gl = g->laststate;
-	const char *start;
-	const char *stop;
-	int error = 0;
-
-	_DIAGASSERT(g != NULL);
-	_DIAGASSERT(string != NULL);
-	/* pmatch checked below */
-
-	/* simplify the situation where possible */
-	if (g->cflags&REG_NOSUB)
-		nmatch = 0;
-	if (eflags&REG_STARTEND) {
-		_DIAGASSERT(pmatch != NULL);
-		start = string + (size_t)pmatch[0].rm_so;
-		stop = string + (size_t)pmatch[0].rm_eo;
-	} else {
-		start = string;
-		stop = start + strlen(start);
-	}
-	if (stop < start)
-		return(REG_INVARG);
-
-	/* prescreening; this does wonders for this rather slow code */
-	if (g->must != NULL) {
-		for (dp = start; dp < stop; dp++)
-			if (*dp == g->must[0] && (size_t)(stop - dp) >= g->mlen &&
-				memcmp(dp, g->must, g->mlen) == 0)
-				break;
-		if (dp == stop)		/* we didn't find g->must */
-			return(REG_NOMATCH);
-	}
-
-	/* match struct setup */
-	m->g = g;
-	m->eflags = eflags;
-	m->pmatch = NULL;
-	m->lastpos = NULL;
-	m->offp = string;
-	m->beginp = start;
-	m->endp = stop;
-	STATESETUP(m, 4);
-	SETUP(m->st);
-	SETUP(m->fresh);
-	SETUP(m->tmp);
-	SETUP(m->empty);
-	CLEAR(m->empty);
-
-	/* this loop does only one repetition except for backrefs */
-	for (;;) {
-		endp = fast(m, start, stop, gf, gl);
-		if (endp == NULL) {		/* a miss */
-			error = REG_NOMATCH;
-			goto done;
-		}
-		if (nmatch == 0 && !g->backrefs)
-			break;		/* no further info needed */
-
-		/* where? */
-		assert(m->coldp != NULL);
-		for (;;) {
-			NOTE("finding start");
-			endp = slow(m, m->coldp, stop, gf, gl);
-			if (endp != NULL)
-				break;
-			assert(m->coldp < m->endp);
-			m->coldp++;
-		}
-		if (nmatch == 1 && !g->backrefs)
-			break;		/* no further info needed */
-
-		/* oh my, he wants the subexpressions... */
-		if (m->pmatch == NULL)
-			m->pmatch = (regmatch_t *)malloc((m->g->nsub + 1) *
-							sizeof(regmatch_t));
-		if (m->pmatch == NULL) {
-			error = REG_ESPACE;
-			goto done;
-		}
-		for (i = 1; i <= m->g->nsub; i++)
-			m->pmatch[i].rm_so = m->pmatch[i].rm_eo = (regoff_t)-1;
-		if (!g->backrefs && !(m->eflags&REG_BACKR)) {
-			NOTE("dissecting");
-			dp = dissect(m, m->coldp, endp, gf, gl);
-		} else {
-			if (g->nplus > 0 && m->lastpos == NULL)
-				m->lastpos = malloc((g->nplus+1) *
-							sizeof(const char *));
-			if (g->nplus > 0 && m->lastpos == NULL) {
-				error = REG_ESPACE;
-				goto done;
-			}
-			NOTE("backref dissect");
-			dp = backref(m, m->coldp, endp, gf, gl, (sopno)0);
-		}
-		if (dp != NULL)
-			break;
-
-		/* uh-oh... we couldn't find a subexpression-level match */
-		assert(g->backrefs);	/* must be back references doing it */
-		assert(g->nplus == 0 || m->lastpos != NULL);
-		for (;;) {
-			if (dp != NULL || endp <= m->coldp)
-				break;		/* defeat */
-			NOTE("backoff");
-			endp = slow(m, m->coldp, endp-1, gf, gl);
-			if (endp == NULL)
-				break;		/* defeat */
-			/* try it on a shorter possibility */
-#ifndef NDEBUG
-			for (i = 1; i <= m->g->nsub; i++) {
-				assert(m->pmatch[i].rm_so == (regoff_t)-1);
-				assert(m->pmatch[i].rm_eo == (regoff_t)-1);
-			}
-#endif
-			NOTE("backoff dissect");
-			dp = backref(m, m->coldp, endp, gf, gl, (sopno)0);
-		}
-		assert(dp == NULL || dp == endp);
-		if (dp != NULL)		/* found a shorter one */
-			break;
-
-		/* despite initial appearances, there is no match here */
-		NOTE("false alarm");
-		start = m->coldp + 1;	/* recycle starting later */
-		assert(start <= stop);
-	}
-
-	/* fill in the details if requested */
-	if (nmatch > 0) {
-		_DIAGASSERT(pmatch != NULL);
-		pmatch[0].rm_so = m->coldp - m->offp;
-		pmatch[0].rm_eo = endp - m->offp;
-	}
-	if (nmatch > 1) {
-		assert(m->pmatch != NULL);
-		for (i = 1; i < nmatch; i++)
-			if (i <= m->g->nsub)
-				pmatch[i] = m->pmatch[i];
-			else {
-				pmatch[i].rm_so = (regoff_t)-1;
-				pmatch[i].rm_eo = (regoff_t)-1;
-			}
-	}
-
-done:
-	if (m->pmatch != NULL) {
-		free(m->pmatch);
-		m->pmatch = NULL;
-	}
-	if (m->lastpos != NULL) {
-		free(m->lastpos);
-		m->lastpos = NULL;
-	}
-	STATETEARDOWN(m);
-	return error;
-}
-
-/*
- - dissect - figure out what matched what, no back references
- == static const char *dissect(struct match *m, const char *start, \
- ==	const char *stop, sopno startst, sopno stopst);
- */
-static const char *			/* == stop (success) always */
-dissect(
-    struct match *m,
-    const char *start,
-    const char *stop,
-    sopno startst,
-    sopno stopst)
-{
-	int i;
-	sopno ss;	/* start sop of current subRE */
-	sopno es;	/* end sop of current subRE */
-	const char *sp;	/* start of string matched by it */
-	const char *stp; /* string matched by it cannot pass here */
-	const char *rest; /* start of rest of string */
-	const char *tail; /* string unmatched by rest of RE */
-	sopno ssub;	/* start sop of subsubRE */
-	sopno esub;	/* end sop of subsubRE */
-	const char *ssp; /* start of string matched by subsubRE */
-	const char *sep; /* end of string matched by subsubRE */
-	const char *oldssp; /* previous ssp */
-#ifndef NDEBUG
-	const char *dp;
-#endif
-
-	_DIAGASSERT(m != NULL);
-	_DIAGASSERT(start != NULL);
-	_DIAGASSERT(stop != NULL);
-
-	AT("diss", start, stop, startst, stopst);
-	sp = start;
-	for (ss = startst; ss < stopst; ss = es) {
-		/* identify end of subRE */
-		es = ss;
-		switch (OP(m->g->strip[es])) {
-		case OPLUS_:
-		case OQUEST_:
-			es += OPND(m->g->strip[es]);
-			break;
-		case OCH_:
-			while (OP(m->g->strip[es]) != O_CH)
-				es += OPND(m->g->strip[es]);
-			break;
-		}
-		es++;
-
-		/* figure out what it matched */
-		switch (OP(m->g->strip[ss])) {
-		case OEND:
-			assert(nope);
-			break;
-		case OCHAR:
-			sp++;
-			break;
-		case OBOL:
-		case OEOL:
-		case OBOW:
-		case OEOW:
-			break;
-		case OANY:
-		case OANYOF:
-			sp++;
-			break;
-		case OBACK_:
-		case O_BACK:
-			assert(nope);
-			break;
-		/* cases where length of match is hard to find */
-		case OQUEST_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = es - 1;
-			/* did innards match? */
-			if (slow(m, sp, rest, ssub, esub) != NULL) {
-#ifdef NDEBUG
-				(void)
-#else
-				dp = 
-#endif
-				    dissect(m, sp, rest, ssub, esub);
-				assert(dp == rest);
-			} else		/* no */
-				assert(sp == rest);
-			sp = rest;
-			break;
-		case OPLUS_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = es - 1;
-			ssp = sp;
-			oldssp = ssp;
-			for (;;) {	/* find last match of innards */
-				sep = slow(m, ssp, rest, ssub, esub);
-				if (sep == NULL || sep == ssp)
-					break;	/* failed or matched null */
-				oldssp = ssp;	/* on to next try */
-				ssp = sep;
-			}
-			if (sep == NULL) {
-				/* last successful match */
-				sep = ssp;
-				ssp = oldssp;
-			}
-			assert(sep == rest);	/* must exhaust substring */
-			assert(slow(m, ssp, sep, ssub, esub) == rest);
-#ifdef NDEBUG
-			(void)
-#else
-			dp =
-#endif
-			    dissect(m, ssp, sep, ssub, esub);
-			assert(dp == sep);
-			sp = rest;
-			break;
-		case OCH_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = ss + OPND(m->g->strip[ss]) - 1;
-			assert(OP(m->g->strip[esub]) == OOR1);
-			for (;;) {	/* find first matching branch */
-				if (slow(m, sp, rest, ssub, esub) == rest)
-					break;	/* it matched all of it */
-				/* that one missed, try next one */
-				assert(OP(m->g->strip[esub]) == OOR1);
-				esub++;
-				assert(OP(m->g->strip[esub]) == OOR2);
-				ssub = esub + 1;
-				esub += OPND(m->g->strip[esub]);
-				if (OP(m->g->strip[esub]) == OOR2)
-					esub--;
-				else
-					assert(OP(m->g->strip[esub]) == O_CH);
-			}
-#ifdef NDEBUG
-			(void)
-#else
-			dp =
-#endif
-			    dissect(m, sp, rest, ssub, esub);
-			assert(dp == rest);
-			sp = rest;
-			break;
-		case O_PLUS:
-		case O_QUEST:
-		case OOR1:
-		case OOR2:
-		case O_CH:
-			assert(nope);
-			break;
-		case OLPAREN:
-			i = OPND(m->g->strip[ss]);
-			assert(0 < i && i <= m->g->nsub);
-			m->pmatch[i].rm_so = sp - m->offp;
-			break;
-		case ORPAREN:
-			i = OPND(m->g->strip[ss]);
-			assert(0 < i && i <= m->g->nsub);
-			m->pmatch[i].rm_eo = sp - m->offp;
-			break;
-		default:		/* uh oh */
-			assert(nope);
-			break;
-		}
-	}
-
-	assert(sp == stop);
-	return(sp);
-}
-
-/*
- - backref - figure out what matched what, figuring in back references
- == static const char *backref(struct match *m, const char *start, \
- ==	const char *stop, sopno startst, sopno stopst, sopno lev);
- */
-static const char *		/* == stop (success) or NULL (failure) */
-backref(
-    struct match *m,
-    const char *start,
-    const char *stop,
-    sopno startst,
-    sopno stopst,
-    sopno lev)			/* PLUS nesting level */
-{
-	int i;
-	sopno ss;	/* start sop of current subRE */
-	const char *sp;	/* start of string matched by it */
-	sopno ssub;	/* start sop of subsubRE */
-	sopno esub;	/* end sop of subsubRE */
-	const char *ssp; /* start of string matched by subsubRE */
-	const char *dp;
-	size_t len;
-	int hard;
-	sop s;
-	regoff_t offsave;
-	cset *cs;
-
-	_DIAGASSERT(m != NULL);
-	_DIAGASSERT(start != NULL);
-	_DIAGASSERT(stop != NULL);
-
-	AT("back", start, stop, startst, stopst);
-	sp = start;
-
-	/* get as far as we can with easy stuff */
-	hard = 0;
-	for (ss = startst; !hard && ss < stopst; ss++)
-		switch (OP(s = m->g->strip[ss])) {
-		case OCHAR:
-			if (sp == stop || *sp++ != (char)OPND(s))
-				return(NULL);
-			break;
-		case OANY:
-			if (sp == stop)
-				return(NULL);
-			sp++;
-			break;
-		case OANYOF:
-			cs = &m->g->sets[OPND(s)];
-			if (sp == stop || !CHIN(cs, *sp++))
-				return(NULL);
-			break;
-		case OBOL:
-			if ( (sp == m->beginp && !(m->eflags&REG_NOTBOL)) ||
-					(sp < m->endp && *(sp-1) == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OEOL:
-			if ( (sp == m->endp && !(m->eflags&REG_NOTEOL)) ||
-					(sp < m->endp && *sp == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OBOW:
-			if (( (sp == m->beginp && !(m->eflags&REG_NOTBOL)) ||
-					(sp < m->endp && *(sp-1) == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) ||
-					(sp > m->beginp &&
-							!ISWORD(*(sp-1))) ) &&
-					(sp < m->endp && ISWORD(*sp)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OEOW:
-			if (( (sp == m->endp && !(m->eflags&REG_NOTEOL)) ||
-					(sp < m->endp && *sp == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) ||
-					(sp < m->endp && !ISWORD(*sp)) ) &&
-					(sp > m->beginp && ISWORD(*(sp-1))) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case O_QUEST:
-			break;
-		case OOR1:	/* matches null but needs to skip */
-			ss++;
-			s = m->g->strip[ss];
-			do {
-				assert(OP(s) == OOR2);
-				ss += OPND(s);
-			} while (OP(s = m->g->strip[ss]) != O_CH);
-			/* note that the ss++ gets us past the O_CH */
-			break;
-		default:	/* have to make a choice */
-			hard = 1;
-			break;
-		}
-	if (!hard) {		/* that was it! */
-		if (sp != stop)
-			return(NULL);
-		return(sp);
-	}
-	ss--;			/* adjust for the for's final increment */
-
-	/* the hard stuff */
-	AT("hard", sp, stop, ss, stopst);
-	s = m->g->strip[ss];
-	switch (OP(s)) {
-	case OBACK_:		/* the vilest depths */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		if (m->pmatch[i].rm_eo == (regoff_t)-1)
-			return(NULL);
-		assert(m->pmatch[i].rm_so != (regoff_t)-1);
-		len = (size_t)(m->pmatch[i].rm_eo - m->pmatch[i].rm_so);
-		if (len == 0)
-			return(NULL);
-		assert(stop - m->beginp >= len);
-		if (sp > stop - len)
-			return(NULL);	/* not enough left to match */
-		ssp = m->offp + (size_t)m->pmatch[i].rm_so;
-		if (memcmp(sp, ssp, len) != 0)
-			return(NULL);
-		while (m->g->strip[ss] != SOP(O_BACK, i))
-			ss++;
-		return(backref(m, sp+len, stop, ss+1, stopst, lev));
-
-	case OQUEST_:		/* to null or not */
-		dp = backref(m, sp, stop, ss+1, stopst, lev);
-		if (dp != NULL)
-			return(dp);	/* not */
-		return(backref(m, sp, stop, ss+OPND(s)+1, stopst, lev));
-
-	case OPLUS_:
-		assert(m->lastpos != NULL);
-		assert(lev+1 <= m->g->nplus);
-		m->lastpos[lev+1] = sp;
-		return(backref(m, sp, stop, ss+1, stopst, lev+1));
-
-	case O_PLUS:
-		if (sp == m->lastpos[lev])	/* last pass matched null */
-			return(backref(m, sp, stop, ss+1, stopst, lev-1));
-		/* try another pass */
-		m->lastpos[lev] = sp;
-		dp = backref(m, sp, stop, ss-OPND(s)+1, stopst, lev);
-		if (dp == NULL)
-			dp = backref(m, sp, stop, ss+1, stopst, lev-1);
-		return(dp);
-
-	case OCH_:		/* find the right one, if any */
-		ssub = ss + 1;
-		esub = ss + OPND(s) - 1;
-		assert(OP(m->g->strip[esub]) == OOR1);
-		for (;;) {	/* find first matching branch */
-			dp = backref(m, sp, stop, ssub, esub, lev);
-			if (dp != NULL)
-				return(dp);
-			/* that one missed, try next one */
-			if (OP(m->g->strip[esub]) == O_CH)
-				return(NULL);	/* there is none */
-			esub++;
-			assert(OP(m->g->strip[esub]) == OOR2);
-			ssub = esub + 1;
-			esub += OPND(m->g->strip[esub]);
-			if (OP(m->g->strip[esub]) == OOR2)
-				esub--;
-			else
-				assert(OP(m->g->strip[esub]) == O_CH);
-		}
-
-	case OLPAREN:		/* must undo assignment if rest fails */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		offsave = m->pmatch[i].rm_so;
-		m->pmatch[i].rm_so = sp - m->offp;
-		dp = backref(m, sp, stop, ss+1, stopst, lev);
-		if (dp != NULL)
-			return(dp);
-		m->pmatch[i].rm_so = offsave;
-		return(NULL);
-
-	case ORPAREN:		/* must undo assignment if rest fails */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		offsave = m->pmatch[i].rm_eo;
-		m->pmatch[i].rm_eo = sp - m->offp;
-		dp = backref(m, sp, stop, ss+1, stopst, lev);
-		if (dp != NULL)
-			return(dp);
-		m->pmatch[i].rm_eo = offsave;
-		return(NULL);
-
-	default:		/* uh oh */
-		assert(nope);
-		break;
-	}
-
-	/* "can't happen" */
-	assert(nope);
-	/* NOTREACHED */
-	return NULL;
-}
-
-/*
- - fast - step through the string at top speed
- == static const char *fast(struct match *m, const char *start, \
- ==	const char *stop, sopno startst, sopno stopst);
- */
-static const char *		/* where tentative match ended, or NULL */
-fast(
-    struct match *m,
-    const char *start,
-    const char *stop,
-    sopno startst,
-    sopno stopst)
-{
-	states st = m->st;
-	states fresh = m->fresh;
-	states tmp = m->tmp;
-	const char *p = start;
-	int c = (start == m->beginp) ? OUT : *(start-1);
-	int lastc;	/* previous c */
-	int flagch;
-	size_t i;
-	const char *coldp; /* last p after which no match was underway */
-
-	_DIAGASSERT(m != NULL);
-	_DIAGASSERT(start != NULL);
-	_DIAGASSERT(stop != NULL);
-
-	CLEAR(st);
-	SET1(st, startst);
-	st = step(m->g, startst, stopst, st, NOTHING, st);
-	ASSIGN(fresh, st);
-	SP("start", st, *p);
-	coldp = NULL;
-	for (;;) {
-		/* next character */
-		lastc = c;
-		c = (p == m->endp) ? OUT : *p;
-		if (EQ(st, fresh))
-			coldp = p;
-
-		/* is there an EOL and/or BOL between lastc and c? */
-		flagch = '\0';
-		i = 0;
-		if ( (lastc == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(lastc == OUT && !(m->eflags&REG_NOTBOL)) ) {
-			flagch = BOL;
-			i = m->g->nbol;
-		}
-		if ( (c == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(c == OUT && !(m->eflags&REG_NOTEOL)) ) {
-			flagch = (flagch == BOL) ? BOLEOL : EOL;
-			i += m->g->neol;
-		}
-		if (i != 0) {
-			for (; i > 0; i--)
-				st = step(m->g, startst, stopst, st, flagch, st);
-			SP("boleol", st, c);
-		}
-
-		/* how about a word boundary? */
-		if ( (flagch == BOL || (lastc != OUT && !ISWORD(lastc))) &&
-					(c != OUT && ISWORD(c)) ) {
-			flagch = BOW;
-		}
-		if ( (lastc != OUT && ISWORD(lastc)) &&
-				(flagch == EOL || (c != OUT && !ISWORD(c))) ) {
-			flagch = EOW;
-		}
-		if (flagch == BOW || flagch == EOW) {
-			st = step(m->g, startst, stopst, st, flagch, st);
-			SP("boweow", st, c);
-		}
-
-		/* are we done? */
-		if (ISSET(st, stopst) || p == stop)
-			break;		/* NOTE BREAK OUT */
-
-		/* no, we must deal with this character */
-		ASSIGN(tmp, st);
-		ASSIGN(st, fresh);
-		assert(c != OUT);
-		st = step(m->g, startst, stopst, tmp, c, st);
-		SP("aft", st, c);
-		assert(EQ(step(m->g, startst, stopst, st, NOTHING, st), st));
-		p++;
-	}
-
-	assert(coldp != NULL);
-	m->coldp = coldp;
-	if (ISSET(st, stopst))
-		return(p+1);
-	else
-		return(NULL);
-}
-
-/*
- - slow - step through the string more deliberately
- == static const char *slow(struct match *m, const char *start, \
- ==	const char *stop, sopno startst, sopno stopst);
- */
-static const char *			/* where it ended */
-slow(
-    struct match *m,
-    const char *start,
-    const char *stop,
-    sopno startst,
-    sopno stopst)
-{
-	states st = m->st;
-	states empty = m->empty;
-	states tmp = m->tmp;
-	const char *p = start;
-	int c = (start == m->beginp) ? OUT : *(start-1);
-	int lastc;	/* previous c */
-	int flagch;
-	size_t i;
-	const char *matchp;	/* last p at which a match ended */
-
-	_DIAGASSERT(m != NULL);
-	_DIAGASSERT(start != NULL);
-	_DIAGASSERT(stop != NULL);
-
-	AT("slow", start, stop, startst, stopst);
-	CLEAR(st);
-	SET1(st, startst);
-	SP("sstart", st, *p);
-	st = step(m->g, startst, stopst, st, NOTHING, st);
-	matchp = NULL;
-	for (;;) {
-		/* next character */
-		lastc = c;
-		c = (p == m->endp) ? OUT : *p;
-
-		/* is there an EOL and/or BOL between lastc and c? */
-		flagch = '\0';
-		i = 0;
-		if ( (lastc == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(lastc == OUT && !(m->eflags&REG_NOTBOL)) ) {
-			flagch = BOL;
-			i = m->g->nbol;
-		}
-		if ( (c == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(c == OUT && !(m->eflags&REG_NOTEOL)) ) {
-			flagch = (flagch == BOL) ? BOLEOL : EOL;
-			i += m->g->neol;
-		}
-		if (i != 0) {
-			for (; i > 0; i--)
-				st = step(m->g, startst, stopst, st, flagch, st);
-			SP("sboleol", st, c);
-		}
-
-		/* how about a word boundary? */
-		if ( (flagch == BOL || (lastc != OUT && !ISWORD(lastc))) &&
-					(c != OUT && ISWORD(c)) ) {
-			flagch = BOW;
-		}
-		if ( (lastc != OUT && ISWORD(lastc)) &&
-				(flagch == EOL || (c != OUT && !ISWORD(c))) ) {
-			flagch = EOW;
-		}
-		if (flagch == BOW || flagch == EOW) {
-			st = step(m->g, startst, stopst, st, flagch, st);
-			SP("sboweow", st, c);
-		}
-
-		/* are we done? */
-		if (ISSET(st, stopst))
-			matchp = p;
-		if (EQ(st, empty) || p == stop)
-			break;		/* NOTE BREAK OUT */
-
-		/* no, we must deal with this character */
-		ASSIGN(tmp, st);
-		ASSIGN(st, empty);
-		assert(c != OUT);
-		st = step(m->g, startst, stopst, tmp, c, st);
-		SP("saft", st, c);
-		assert(EQ(step(m->g, startst, stopst, st, NOTHING, st), st));
-		p++;
-	}
-
-	return(matchp);
-}
-
-
-/*
- - step - map set of states reachable before char to set reachable after
- == static states step(struct re_guts *g, sopno start, sopno stop, \
- ==	states bef, int ch, states aft);
- == #define	BOL	(OUT+1)
- == #define	EOL	(BOL+1)
- == #define	BOLEOL	(BOL+2)
- == #define	NOTHING	(BOL+3)
- == #define	BOW	(BOL+4)
- == #define	EOW	(BOL+5)
- == #define	CODEMAX	(BOL+5)		// highest code used
- == #define	NONCHAR(c)	((c) > CHAR_MAX)
- == #define	NNONCHAR	(CODEMAX-CHAR_MAX)
- */
-static states
-step(
-    struct re_guts *g,
-    sopno start,		/* start state within strip */
-    sopno stop,			/* state after stop state within strip */
-    states bef,			/* states reachable before */
-    int ch,			/* character or NONCHAR code */
-    states aft)			/* states already known reachable after */
-{
-	cset *cs;
-	sop s;
-	sopno pc;
-	onestate here;		/* note, macros know this name */
-	sopno look;
-	int i;
-
-	_DIAGASSERT(g != NULL);
-
-	for (pc = start, INIT(here, pc); pc != stop; pc++, INC(here)) {
-		s = g->strip[pc];
-		switch (OP(s)) {
-		case OEND:
-			assert(pc == stop-1);
-			break;
-		case OCHAR:
-			/* only characters can match */
-			assert(!NONCHAR(ch) || ch != (char)OPND(s));
-			if (ch == (char)OPND(s))
-				FWD(aft, bef, 1);
-			break;
-		case OBOL:
-			if (ch == BOL || ch == BOLEOL)
-				FWD(aft, bef, 1);
-			break;
-		case OEOL:
-			if (ch == EOL || ch == BOLEOL)
-				FWD(aft, bef, 1);
-			break;
-		case OBOW:
-			if (ch == BOW)
-				FWD(aft, bef, 1);
-			break;
-		case OEOW:
-			if (ch == EOW)
-				FWD(aft, bef, 1);
-			break;
-		case OANY:
-			if (!NONCHAR(ch))
-				FWD(aft, bef, 1);
-			break;
-		case OANYOF:
-			cs = &g->sets[OPND(s)];
-			if (!NONCHAR(ch) && CHIN(cs, ch))
-				FWD(aft, bef, 1);
-			break;
-		case OBACK_:		/* ignored here */
-		case O_BACK:
-			FWD(aft, aft, 1);
-			break;
-		case OPLUS_:		/* forward, this is just an empty */
-			FWD(aft, aft, 1);
-			break;
-		case O_PLUS:		/* both forward and back */
-			FWD(aft, aft, 1);
-			i = ISSETBACK(aft, OPND(s));
-			BACK(aft, aft, OPND(s));
-			if (!i && ISSETBACK(aft, OPND(s))) {
-				/* oho, must reconsider loop body */
-				pc -= OPND(s) + 1;
-				INIT(here, pc);
-			}
-			break;
-		case OQUEST_:		/* two branches, both forward */
-			FWD(aft, aft, 1);
-			FWD(aft, aft, OPND(s));
-			break;
-		case O_QUEST:		/* just an empty */
-			FWD(aft, aft, 1);
-			break;
-		case OLPAREN:		/* not significant here */
-		case ORPAREN:
-			FWD(aft, aft, 1);
-			break;
-		case OCH_:		/* mark the first two branches */
-			FWD(aft, aft, 1);
-			assert(OP(g->strip[pc+OPND(s)]) == OOR2);
-			FWD(aft, aft, OPND(s));
-			break;
-		case OOR1:		/* done a branch, find the O_CH */
-			if (ISSTATEIN(aft, here)) {
-				for (look = 1;
-						OP(s = g->strip[pc+look]) != O_CH;
-						look += OPND(s))
-					assert(OP(s) == OOR2);
-				FWD(aft, aft, look);
-			}
-			break;
-		case OOR2:		/* propagate OCH_'s marking */
-			FWD(aft, aft, 1);
-			if (OP(g->strip[pc+OPND(s)]) != O_CH) {
-				assert(OP(g->strip[pc+OPND(s)]) == OOR2);
-				FWD(aft, aft, OPND(s));
-			}
-			break;
-		case O_CH:		/* just empty */
-			FWD(aft, aft, 1);
-			break;
-		default:		/* ooooops... */
-			assert(nope);
-			break;
-		}
-	}
-
-	return(aft);
-}
-
-#ifdef REDEBUG
-/*
- - print - print a set of states
- == #ifdef REDEBUG
- == static void print(struct match *m, char *caption, states st, \
- ==	int ch, FILE *d);
- == #endif
- */
-static void
-print(
-    struct match *m,
-    char *caption,
-    states st,
-    int ch,
-    FILE *d)
-{
-	struct re_guts *g = m->g;
-	int i;
-	int first = 1;
-
-	_DIAGASSERT(m != NULL);
-	_DIAGASSERT(caption != NULL);
-
-	if (!(m->eflags&REG_TRACE))
-		return;
-
-	_DIAGASSERT(d != NULL);
-
-	fprintf(d, "%s", caption);
-	if (ch != '\0')
-		fprintf(d, " %s", pchar(ch));
-	for (i = 0; i < g->nstates; i++)
-		if (ISSET(st, i)) {
-			fprintf(d, "%s%d", (first) ? "\t" : ", ", i);
-			first = 0;
-		}
-	fprintf(d, "\n");
-}
-
-/* 
- - at - print current situation
- == #ifdef REDEBUG
- == static void at(struct match *m, char *title, char *start, char *stop, \
- ==						sopno startst, sopno stopst);
- == #endif
- */
-static void
-at(
-    struct match *m,
-    char *title,
-    char *start,
-    char *stop,
-    sopno startst,
-    sopno stopst)
-{
-
-	_DIAGASSERT(m != NULL);
-	_DIAGASSERT(title != NULL);
-	_DIAGASSERT(start != NULL);
-	_DIAGASSERT(stop != NULL);
-
-	if (!(m->eflags&REG_TRACE))
-		return;
-
-	printf("%s %s-", title, pchar(*start));
-	printf("%s ", pchar(*stop));
-	printf("%ld-%ld\n", (long)startst, (long)stopst);
-}
-
-#ifndef PCHARDONE
-#define	PCHARDONE	/* never again */
-/*
- - pchar - make a character printable
- == #ifdef REDEBUG
- == static char *pchar(int ch);
- == #endif
- *
- * Is this identical to regchar() over in debug.c?  Well, yes.  But a
- * duplicate here avoids having a debugging-capable regexec.o tied to
- * a matching debug.o, and this is convenient.  It all disappears in
- * the non-debug compilation anyway, so it doesn't matter much.
- */
-static char *			/* -> representation */
-pchar(
-    int ch)
-{
-	static char pbuf[10];
-
-	if (isprint(ch) || ch == ' ')
-		(void)snprintf(pbuf, sizeof pbuf, "%c", ch);
-	else
-		(void)snprintf(pbuf, sizeof pbuf, "\\%o", ch);
-	return(pbuf);
-}
-#endif
-#endif
-
-#undef	matcher
-#undef	fast
-#undef	slow
-#undef	dissect
-#undef	backref
-#undef	step
-#undef	print
-#undef	at
-#undef	match
-#undef	nope
diff --git a/lib/libc/regex/re_format.7 b/lib/libc/regex/re_format.7
deleted file mode 100644
index 653b558e3..000000000
--- a/lib/libc/regex/re_format.7
+++ /dev/null
@@ -1,315 +0,0 @@
-.\"	$NetBSD: re_format.7,v 1.11 2015/08/22 14:04:54 wiz Exp $
-.\"
-.\" Copyright (c) 1992, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Henry Spencer.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\" Copyright (c) 1992, 1993, 1994 Henry Spencer.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Henry Spencer.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"	@(#)re_format.7	8.3 (Berkeley) 3/20/94
-.\"
-.Dd March 20, 1994
-.Dt RE_FORMAT 7
-.Os
-.Sh NAME
-.Nm re_format
-.Nd POSIX 1003.2 regular expressions
-.Sh DESCRIPTION
-Regular expressions (``RE''s),
-as defined in POSIX 1003.2, come in two forms:
-modern REs (roughly those of
-.Xr egrep 1 ;
-1003.2 calls these ``extended'' REs)
-and obsolete REs (roughly those of
-.Xr ed 1 ;
-1003.2 ``basic'' REs).
-Obsolete REs mostly exist for backward compatibility in some old programs;
-they will be discussed at the end.
-1003.2 leaves some aspects of RE syntax and semantics open;
-`(*)' marks decisions on these aspects that
-may not be fully portable to other 1003.2 implementations.
-.Pp
-A (modern) RE is one(*) or more non-empty(*)
-.Em branches ,
-separated by `|'.
-It matches anything that matches one of the branches.
-.Pp
-A branch is one(*) or more
-.Em pieces ,
-concatenated.
-It matches a match for the first, followed by a match for the second, etc.
-.Pp
-A piece is an
-.Em atom
-possibly followed
-by a single(*) `*', `+', `?', or
-.Em bound .
-An atom followed by `*' matches a sequence of 0 or more matches of the atom.
-An atom followed by `+' matches a sequence of 1 or more matches of the atom.
-An atom followed by `?' matches a sequence of 0 or 1 matches of the atom.
-.Pp
-A
-.Em bound
-is `{' followed by an unsigned decimal integer, possibly followed by `,'
-possibly followed by another unsigned decimal integer,
-always followed by `}'.
-The integers must lie between 0 and RE_DUP_MAX (255(*)) inclusive,
-and if there are two of them, the first may not exceed the second.
-An atom followed by a bound containing one integer
-.Em i
-and no comma matches a sequence of exactly
-.Em i
-matches of the atom.
-An atom followed by a bound containing one integer
-.Em i
-and a comma matches a sequence of
-.Em i
-or more matches of the atom.
-An atom followed by a bound containing two integers
-.Em i
-and
-.Em j
-matches a sequence of
-.Em i
-through
-.Em j
-(inclusive) matches of the atom.
-.Pp
-An atom is a regular expression enclosed in `()' (matching a match for the
-regular expression), an empty set of `()' (matching the null string)(*), a
-.Em bracket expression
-(see below), `.' (matching any single character),
-`^' (matching the null string at the beginning of a line),
-`$' (matching the null string at the end of a line),
-a `\e' followed by one of the characters `^.[$()|*+?{\e'
-(matching that character taken as an ordinary character),
-a `\e' followed by any other character(*)
-(matching that character taken as an ordinary character,
-as if the `\e' had not been present(*)),
-or a single character with no other significance (matching that character).
-A `{' followed by a character other than a digit is an ordinary
-character, not the beginning of a bound(*).
-It is illegal to end an RE with `\e'.
-.Pp
-A
-.Em bracket expression
-is a list of characters enclosed in `[]'.
-It normally matches any single character from the list (but see below).
-If the list begins with `^',
-it matches any single character (but see below)
-.Em not
-from the rest of the list.
-If two characters in the list are separated by `\-', this is shorthand
-for the full
-.Em range
-of characters between those two (inclusive) in the collating sequence,
-e.g. `[0-9]' in ASCII matches any decimal digit.
-It is illegal(*) for two ranges to share an endpoint, e.g. `a-c-e'.
-Ranges are very collating-sequence-dependent,
-and portable programs should avoid relying on them.
-.Pp
-To include a literal `]' in the list, make it the first character
-(following a possible `^').
-To include a literal `\-', make it the first or last character,
-or the second endpoint of a range.
-To use a literal `\-' as the first endpoint of a range,
-enclose it in `[.' and `.]' to make it a collating element (see below).
-With the exception of these and some combinations using `[' (see next
-paragraphs), all other special characters, including `\e', lose their
-special significance within a bracket expression.
-.Pp
-Within a bracket expression, a collating element (a character,
-a multi-character sequence that collates as if it were a single character,
-or a collating-sequence name for either)
-enclosed in `[.' and `.]' stands for the
-sequence of characters of that collating element.
-The sequence is a single element of the bracket expression's list.
-A bracket expression containing a multi-character collating element
-can thus match more than one character,
-e.g. if the collating sequence includes a `ch' collating element,
-then the RE `[[.ch.]]*c' matches the first five characters
-of `chchcc'.
-.Pp
-Within a bracket expression, a collating element enclosed in `[=' and
-`=]' is an equivalence class, standing for the sequences of characters
-of all collating elements equivalent to that one, including itself.
-(If there are no other equivalent collating elements,
-the treatment is as if the enclosing delimiters were `[.' and `.]'.)
-For example, if o and '\(^o' are the members of an equivalence class,
-then `[[=o=]]', `[[=\(^o'=]]', and `[o\(^o']' are all synonymous.
-An equivalence class may not(*) be an endpoint
-of a range.
-.Pp
-Within a bracket expression, the name of a
-.Em character class
-enclosed in `[:' and `:]' stands for the list of all characters
-belonging to that class.
-Standard character class names are:
-.Bl -column "alnum" "digit" "xdigit"
-.It alnum	digit	punct
-.It alpha	graph	space
-.It blank	lower	upper
-.It cntrl	print	xdigit
-.El
-.Pp
-These stand for the character classes defined in
-.Xr ctype 3 .
-A locale may provide others.
-A character class may not be used as an endpoint of a range.
-.Pp
-There are two special cases(*) of bracket expressions:
-the bracket expressions `[[:\*[Lt]:]]' and `[[:\*[Gt]:]]' match
-the null string at the beginning and end of a word respectively.
-A word is defined as a sequence of word characters
-which is neither preceded nor followed by word characters.
-A word character is an
-.Em alnum
-character (as defined by
-.Xr ctype 3 )
-or an underscore.
-This is an extension, compatible with but not specified by POSIX 1003.2,
-and should be used with caution in software intended to be portable
-to other systems.
-.Pp
-In the event that an RE could match more than one substring of a given
-string, the RE matches the one starting earliest in the string.
-If the RE could match more than one substring starting at that point,
-it matches the longest.
-Subexpressions also match the longest possible substrings, subject to
-the constraint that the whole match be as long as possible,
-with subexpressions starting earlier in the RE taking priority over
-ones starting later.
-Note that higher-level subexpressions thus take priority over
-their lower-level component subexpressions.
-.Pp
-Match lengths are measured in characters, not collating elements.
-A null string is considered longer than no match at all.
-For example,
-`bb*' matches the three middle characters of `abbbc',
-`(wee|week)(knights|nights)' matches all ten characters of `weeknights',
-when `(.*).*' is matched against `abc' the parenthesized subexpression
-matches all three characters, and
-when `(a*)*' is matched against `bc' both the whole RE and the parenthesized
-subexpression match the null string.
-.Pp
-If case-independent matching is specified,
-the effect is much as if all case distinctions had vanished from the
-alphabet.
-When an alphabetic that exists in multiple cases appears as an
-ordinary character outside a bracket expression, it is effectively
-transformed into a bracket expression containing both cases,
-e.g. `x' becomes `[xX]'.
-When it appears inside a bracket expression, all case counterparts
-of it are added to the bracket expression, so that (e.g.) `[x]'
-becomes `[xX]' and `[^x]' becomes `[^xX]'.
-.Pp
-No particular limit is imposed on the length of REs(*).
-Programs intended to be portable should not employ REs longer
-than 256 bytes,
-as an implementation can refuse to accept such REs and remain
-POSIX-compliant.
-.Pp
-Obsolete (``basic'') regular expressions differ in several respects.
-`|', `+', and `?' are ordinary characters and there is no equivalent
-for their functionality.
-The delimiters for bounds are `\e{' and `\e}',
-with `{' and `}' by themselves ordinary characters.
-The parentheses for nested subexpressions are `\e(' and `\e)',
-with `(' and `)' by themselves ordinary characters.
-`^' is an ordinary character except at the beginning of the
-RE or(*) the beginning of a parenthesized subexpression,
-`$' is an ordinary character except at the end of the
-RE or(*) the end of a parenthesized subexpression,
-and `*' is an ordinary character if it appears at the beginning of the
-RE or the beginning of a parenthesized subexpression
-(after a possible leading `^').
-Finally, there is one new type of atom, a
-.Em back reference :
-`\e' followed by a non-zero decimal digit
-.Em d
-matches the same sequence of characters
-matched by the
-.Em d Ns th parenthesized subexpression
-(numbering subexpressions by the positions of their opening parentheses,
-left to right),
-so that (e.g.) `\e([bc]\e)\e1' matches `bb' or `cc' but not `bc'.
-.Sh SEE ALSO
-.Xr regex 3
-.Pp
-POSIX 1003.2, section 2.8 (Regular Expression Notation).
-.Sh BUGS
-Having two kinds of REs is a botch.
-.Pp
-The current 1003.2 spec says that `)' is an ordinary character in
-the absence of an unmatched `(';
-this was an unintentional result of a wording error, and change is likely.
-Avoid relying on it.
-.Pp
-Back references are a dreadful botch,
-posing major problems for efficient implementations.
-They are also somewhat vaguely defined
-(does `a\e(\e(b\e)*\e2\e)*d' match `abbbd'?).
-Avoid using them.
-.Pp
-1003.2's specification of case-independent matching is vague.
-The ``one case implies all cases'' definition given above
-is current consensus among implementors as to the right interpretation.
-.Pp
-The syntax for word boundaries is incredibly ugly.
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
deleted file mode 100644
index 6af97347c..000000000
--- a/lib/libc/regex/regcomp.c
+++ /dev/null
@@ -1,1925 +0,0 @@
-/*	$NetBSD: regcomp.c,v 1.36 2015/09/12 19:08:47 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)regcomp.c	8.5 (Berkeley) 3/20/94
- */
-
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)regcomp.c	8.5 (Berkeley) 3/20/94
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
-#else
-__RCSID("$NetBSD: regcomp.c,v 1.36 2015/09/12 19:08:47 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <regex.h>
-
-#ifdef __weak_alias
-__weak_alias(regcomp,_regcomp)
-#endif
-
-#include "utils.h"
-#include "regex2.h"
-
-#include "cclass.h"
-#include "cname.h"
-
-/*
- * parse structure, passed up and down to avoid global variables and
- * other clumsinesses
- */
-struct parse {
-	const char *next;	/* next character in RE */
-	const char *end;	/* end of string (-> NUL normally) */
-	int error;		/* has an error been seen? */
-	sop *strip;		/* malloced strip */
-	sopno ssize;		/* malloced strip size (allocated) */
-	sopno slen;		/* malloced strip length (used) */
-	size_t ncsalloc;	/* number of csets allocated */
-	struct re_guts *g;
-#	define	NPAREN	10	/* we need to remember () 1-9 for back refs */
-	sopno pbegin[NPAREN];	/* -> ( ([0] unused) */
-	sopno pend[NPAREN];	/* -> ) ([0] unused) */
-};
-
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === regcomp.c === */
-static void p_ere(struct parse *p, int stop, size_t reclimit);
-static void p_ere_exp(struct parse *p, size_t reclimit);
-static void p_str(struct parse *p);
-static void p_bre(struct parse *p, int end1, int end2, size_t reclimit);
-static int p_simp_re(struct parse *p, int starordinary, size_t reclimit);
-static int p_count(struct parse *p);
-static void p_bracket(struct parse *p);
-static void p_b_term(struct parse *p, cset *cs);
-static void p_b_cclass(struct parse *p, cset *cs);
-static void p_b_eclass(struct parse *p, cset *cs);
-static char p_b_symbol(struct parse *p);
-static char p_b_coll_elem(struct parse *p, int endc);
-static int othercase(int ch);
-static void bothcases(struct parse *p, int ch);
-static void ordinary(struct parse *p, int ch);
-static void nonnewline(struct parse *p);
-static void repeat(struct parse *p, sopno start, int from, int to, size_t reclimit);
-static int seterr(struct parse *p, int e);
-static cset *allocset(struct parse *p);
-static void freeset(struct parse *p, cset *cs);
-static sopno freezeset(struct parse *p, cset *cs);
-static int firstch(struct parse *p, cset *cs);
-static int nch(struct parse *p, cset *cs);
-static void mcadd(struct parse *p, cset *cs, const char *cp);
-#if 0
-static void mcsub(cset *cs, char *cp);
-static int mcin(cset *cs, char *cp);
-static char *mcfind(cset *cs, char *cp);
-#endif
-static void mcinvert(struct parse *p, cset *cs);
-static void mccase(struct parse *p, cset *cs);
-static int isinsets(struct re_guts *g, int c);
-static int samesets(struct re_guts *g, int c1, int c2);
-static void categorize(struct parse *p, struct re_guts *g);
-static sopno dupl(struct parse *p, sopno start, sopno finish);
-static void doemit(struct parse *p, sop op, sopno opnd);
-static void doinsert(struct parse *p, sop op, sopno opnd, sopno pos);
-static void dofwd(struct parse *p, sopno pos, sopno value);
-static int enlarge(struct parse *p, sopno size);
-static void stripsnug(struct parse *p, struct re_guts *g);
-static void findmust(struct parse *p, struct re_guts *g);
-static sopno pluscount(struct parse *p, struct re_guts *g);
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
-
-static char nuls[10];		/* place to point scanner in event of error */
-
-/*
- * macros for use with parse structure
- * BEWARE:  these know that the parse structure is named `p' !!!
- */
-#define	PEEK()	(*p->next)
-#define	PEEK2()	(*(p->next+1))
-#define	MORE()	(p->next < p->end)
-#define	MORE2()	(p->next+1 < p->end)
-#define	SEE(c)	(MORE() && PEEK() == (c))
-#define	SEETWO(a, b)	(MORE() && MORE2() && PEEK() == (a) && PEEK2() == (b))
-#define	EAT(c)	((SEE(c)) ? (NEXT(), 1) : 0)
-#define	EATTWO(a, b)	((SEETWO(a, b)) ? (NEXT2(), 1) : 0)
-#define	NEXT()	(p->next++)
-#define	NEXT2()	(p->next += 2)
-#define	NEXTn(n)	(p->next += (n))
-#define	GETNEXT()	(*p->next++)
-#define	SETERROR(e)	seterr(p, (e))
-#define	REQUIRE(co, e)	(void) ((co) || SETERROR(e))
-#define	MUSTSEE(c, e)	(REQUIRE(MORE() && PEEK() == (c), e))
-#define	MUSTEAT(c, e)	(void) (REQUIRE(MORE() && GETNEXT() == (c), e))
-#define	MUSTNOTSEE(c, e)	(REQUIRE(!MORE() || PEEK() != (c), e))
-#define	EMIT(op, sopnd)	doemit(p, (sop)(op), sopnd)
-#define	INSERT(op, pos)	doinsert(p, (sop)(op), HERE()-(pos)+1, pos)
-#define	AHEAD(pos)		dofwd(p, pos, HERE()-(pos))
-#define	ASTERN(sop, pos)	EMIT(sop, HERE()-pos)
-#define	HERE()		(p->slen)
-#define	THERE()		(p->slen - 1)
-#define	THERETHERE()	(p->slen - 2)
-#define	DROP(n)	(p->slen -= (n))
-
-#ifndef NDEBUG
-static int never = 0;		/* for use in asserts; shuts lint up */
-#else
-#define	never	0		/* some <assert.h>s have bugs too */
-#endif
-
-#define	MEMLIMIT	0x8000000
-#define MEMSIZE(p) \
-	((p)->ncsalloc / CHAR_BIT * (p)->g->csetsize + \
-	(p)->ncsalloc * sizeof(cset) + \
-	(p)->ssize * sizeof(sop))
-#define	RECLIMIT	256
-
-/*
- - regcomp - interface for parser and compilation
- = extern int regcomp(regex_t *, const char *, int);
- = #define	REG_BASIC	0000
- = #define	REG_EXTENDED	0001
- = #define	REG_ICASE	0002
- = #define	REG_NOSUB	0004
- = #define	REG_NEWLINE	0010
- = #define	REG_NOSPEC	0020
- = #define	REG_PEND	0040
- = #define	REG_DUMP	0200
- */
-int				/* 0 success, otherwise REG_something */
-regcomp(
-    regex_t *preg,
-    const char *pattern,
-    int cflags)
-{
-	struct parse pa;
-	struct re_guts *g;
-	struct parse *p = &pa;
-	int i;
-	size_t len;
-#ifdef REDEBUG
-#	define	GOODFLAGS(f)	(f)
-#else
-#	define	GOODFLAGS(f)	((f)&~REG_DUMP)
-#endif
-
-	_DIAGASSERT(preg != NULL);
-	_DIAGASSERT(pattern != NULL);
-
-	cflags = GOODFLAGS(cflags);
-	if ((cflags&REG_EXTENDED) && (cflags&REG_NOSPEC))
-		return(REG_INVARG);
-
-	if (cflags&REG_PEND) {
-		if (preg->re_endp < pattern)
-			return(REG_INVARG);
-		len = preg->re_endp - pattern;
-	} else
-		len = strlen(pattern);
-
-	/* do the mallocs early so failure handling is easy */
-	g = malloc(sizeof(struct re_guts) + (NC - 1) * sizeof(cat_t));
-	if (g == NULL)
-		return(REG_ESPACE);
-	p->ssize = len/(size_t)2*(size_t)3 + (size_t)1;	/* ugh */
-	p->strip = calloc(p->ssize, sizeof(sop));
-	p->slen = 0;
-	if (p->strip == NULL) {
-		free(g);
-		return(REG_ESPACE);
-	}
-
-	/* set things up */
-	p->g = g;
-	p->next = pattern;
-	p->end = p->next + len;
-	p->error = 0;
-	p->ncsalloc = 0;
-	for (i = 0; i < NPAREN; i++) {
-		p->pbegin[i] = 0;
-		p->pend[i] = 0;
-	}
-	g->csetsize = NC;
-	g->sets = NULL;
-	g->setbits = NULL;
-	g->ncsets = 0;
-	g->cflags = cflags;
-	g->iflags = 0;
-	g->nbol = 0;
-	g->neol = 0;
-	g->must = NULL;
-	g->mlen = 0;
-	g->nsub = 0;
-	g->ncategories = 1;	/* category 0 is "everything else" */
-	g->categories = &g->catspace[-(CHAR_MIN)];
-	(void) memset((char *)g->catspace, 0, NC*sizeof(cat_t));
-	g->backrefs = 0;
-
-	/* do it */
-	EMIT(OEND, 0);
-	g->firststate = THERE();
-	if (cflags&REG_EXTENDED)
-		p_ere(p, OUT, 0);
-	else if (cflags&REG_NOSPEC)
-		p_str(p);
-	else
-		p_bre(p, OUT, OUT, 0);
-	EMIT(OEND, 0);
-	g->laststate = THERE();
-
-	/* tidy up loose ends and fill things in */
-	categorize(p, g);
-	stripsnug(p, g);
-	findmust(p, g);
-	g->nplus = pluscount(p, g);
-	g->magic = MAGIC2;
-	preg->re_nsub = g->nsub;
-	preg->re_g = g;
-	preg->re_magic = MAGIC1;
-#ifndef REDEBUG
-	/* not debugging, so can't rely on the assert() in regexec() */
-	if (g->iflags&BAD)
-		SETERROR(REG_ASSERT);
-#endif
-
-	/* win or lose, we're done */
-	if (p->error != 0)	/* lose */
-		regfree(preg);
-	return(p->error);
-}
-
-/*
- - p_ere - ERE parser top level, concatenation and alternation
- == static void p_ere(struct parse *p, int stop, size_t reclimit);
- */
-static void
-p_ere(
-    struct parse *p,
-    int stop,			/* character this ERE should end at */
-    size_t reclimit)
-{
-	char c;
-	sopno prevback = 0;	/* pacify gcc */
-	sopno prevfwd = 0; 	/* pacify gcc */
-	sopno conc;
-	int first = 1;		/* is this the first alternative? */
-
-	_DIAGASSERT(p != NULL);
-
-	if (reclimit++ > RECLIMIT || p->error == REG_ESPACE) {
-		p->error = REG_ESPACE;
-		return;
-	}
-
-	for (;;) {
-		/* do a bunch of concatenated expressions */
-		conc = HERE();
-		while (MORE() && (c = PEEK()) != '|' && c != stop)
-			p_ere_exp(p, reclimit);
-		REQUIRE(HERE() != conc, REG_EMPTY);	/* require nonempty */
-
-		if (!EAT('|'))
-			break;		/* NOTE BREAK OUT */
-
-		if (first) {
-			INSERT(OCH_, conc);	/* offset is wrong */
-			prevfwd = conc;
-			prevback = conc;
-			first = 0;
-		}
-		ASTERN(OOR1, prevback);
-		prevback = THERE();
-		AHEAD(prevfwd);			/* fix previous offset */
-		prevfwd = HERE();
-		EMIT(OOR2, 0);			/* offset is very wrong */
-	}
-
-	if (!first) {		/* tail-end fixups */
-		AHEAD(prevfwd);
-		ASTERN(O_CH, prevback);
-	}
-
-	assert(!MORE() || SEE(stop));
-}
-
-/*
- - p_ere_exp - parse one subERE, an atom possibly followed by a repetition op
- == static void p_ere_exp(struct parse *p, size_t reclimit);
- */
-static void
-p_ere_exp(
-    struct parse *p,
-    size_t reclimit)
-{
-	char c;
-	sopno pos;
-	int count;
-	int count2;
-	sopno subno;
-	int wascaret = 0;
-
-	_DIAGASSERT(p != NULL);
-
-	assert(MORE());		/* caller should have ensured this */
-	c = GETNEXT();
-
-	pos = HERE();
-	switch (c) {
-	case '(':
-		REQUIRE(MORE(), REG_EPAREN);
-		p->g->nsub++;
-		subno = p->g->nsub;
-		if (subno < NPAREN)
-			p->pbegin[subno] = HERE();
-		EMIT(OLPAREN, subno);
-		if (!SEE(')'))
-			p_ere(p, ')', reclimit);
-		if (subno < NPAREN) {
-			p->pend[subno] = HERE();
-			assert(p->pend[subno] != 0);
-		}
-		EMIT(ORPAREN, subno);
-		MUSTEAT(')', REG_EPAREN);
-		break;
-#ifndef POSIX_MISTAKE
-	case ')':		/* happens only if no current unmatched ( */
-		/*
-		 * You may ask, why the ifndef?  Because I didn't notice
-		 * this until slightly too late for 1003.2, and none of the
-		 * other 1003.2 regular-expression reviewers noticed it at
-		 * all.  So an unmatched ) is legal POSIX, at least until
-		 * we can get it fixed.
-		 */
-		SETERROR(REG_EPAREN);
-		break;
-#endif
-	case '^':
-		EMIT(OBOL, 0);
-		p->g->iflags |= USEBOL;
-		p->g->nbol++;
-		wascaret = 1;
-		break;
-	case '$':
-		EMIT(OEOL, 0);
-		p->g->iflags |= USEEOL;
-		p->g->neol++;
-		break;
-	case '|':
-		SETERROR(REG_EMPTY);
-		break;
-	case '*':
-	case '+':
-	case '?':
-		SETERROR(REG_BADRPT);
-		break;
-	case '.':
-		if (p->g->cflags&REG_NEWLINE)
-			nonnewline(p);
-		else
-			EMIT(OANY, 0);
-		break;
-	case '[':
-		p_bracket(p);
-		break;
-	case '\\':
-		REQUIRE(MORE(), REG_EESCAPE);
-		c = GETNEXT();
-		ordinary(p, c);
-		break;
-	case '{':		/* okay as ordinary except if digit follows */
-		REQUIRE(!MORE() || !isdigit((unsigned char)PEEK()), REG_BADRPT);
-		/* FALLTHROUGH */
-	default:
-		ordinary(p, c);
-		break;
-	}
-
-	if (!MORE())
-		return;
-	c = PEEK();
-	/* we call { a repetition if followed by a digit */
-	if (!( c == '*' || c == '+' || c == '?' ||
-	    (c == '{' && MORE2() && isdigit((unsigned char)PEEK2())) ))
-		return;		/* no repetition, we're done */
-	NEXT();
-
-	REQUIRE(!wascaret, REG_BADRPT);
-	switch (c) {
-	case '*':	/* implemented as +? */
-		/* this case does not require the (y|) trick, noKLUDGE */
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		INSERT(OQUEST_, pos);
-		ASTERN(O_QUEST, pos);
-		break;
-	case '+':
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		break;
-	case '?':
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, pos);		/* offset slightly wrong */
-		ASTERN(OOR1, pos);		/* this one's right */
-		AHEAD(pos);			/* fix the OCH_ */
-		EMIT(OOR2, 0);			/* offset very wrong... */
-		AHEAD(THERE());			/* ...so fix it */
-		ASTERN(O_CH, THERETHERE());
-		break;
-	case '{':
-		count = p_count(p);
-		if (EAT(',')) {
-			if (isdigit((unsigned char)PEEK())) {
-				count2 = p_count(p);
-				REQUIRE(count <= count2, REG_BADBR);
-			} else		/* single number with comma */
-				count2 = INFINITY;
-		} else		/* just a single number */
-			count2 = count;
-		repeat(p, pos, count, count2, 0);
-		if (!EAT('}')) {	/* error heuristics */
-			while (MORE() && PEEK() != '}')
-				NEXT();
-			REQUIRE(MORE(), REG_EBRACE);
-			SETERROR(REG_BADBR);
-		}
-		break;
-	}
-
-	if (!MORE())
-		return;
-	c = PEEK();
-	if (!( c == '*' || c == '+' || c == '?' ||
-	    (c == '{' && MORE2() && isdigit((unsigned char)PEEK2())) ) )
-		return;
-	SETERROR(REG_BADRPT);
-}
-
-/*
- - p_str - string (no metacharacters) "parser"
- == static void p_str(struct parse *p);
- */
-static void
-p_str(
-    struct parse *p)
-{
-
-	_DIAGASSERT(p != NULL);
-
-	REQUIRE(MORE(), REG_EMPTY);
-	while (MORE())
-		ordinary(p, GETNEXT());
-}
-
-/*
- - p_bre - BRE parser top level, anchoring and concatenation
- == static void p_bre(struct parse *p, int end1, \
- ==	int end2, size_t reclimit);
- * Giving end1 as OUT essentially eliminates the end1/end2 check.
- *
- * This implementation is a bit of a kludge, in that a trailing $ is first
- * taken as an ordinary character and then revised to be an anchor.  The
- * only undesirable side effect is that '$' gets included as a character
- * category in such cases.  This is fairly harmless; not worth fixing.
- * The amount of lookahead needed to avoid this kludge is excessive.
- */
-static void
-p_bre(
-    struct parse *p,
-    int end1,		/* first terminating character */
-    int end2,		/* second terminating character */
-    size_t reclimit)
-{
-	sopno start;
-	int first = 1;			/* first subexpression? */
-	int wasdollar = 0;
-
-	_DIAGASSERT(p != NULL);
-
-	if (reclimit++ > RECLIMIT || p->error == REG_ESPACE) {
-		p->error = REG_ESPACE;
-		return;
-	}
-
-	start = HERE();
-
-	if (EAT('^')) {
-		EMIT(OBOL, 0);
-		p->g->iflags |= USEBOL;
-		p->g->nbol++;
-	}
-	while (MORE() && !SEETWO(end1, end2)) {
-		wasdollar = p_simp_re(p, first, reclimit);
-		first = 0;
-	}
-	if (wasdollar) {	/* oops, that was a trailing anchor */
-		DROP(1);
-		EMIT(OEOL, 0);
-		p->g->iflags |= USEEOL;
-		p->g->neol++;
-	}
-
-	REQUIRE(HERE() != start, REG_EMPTY);	/* require nonempty */
-}
-
-/*
- - p_simp_re - parse a simple RE, an atom possibly followed by a repetition
- == static int p_simp_re(struct parse *p, int starordinary, size_t reclimit);
- */
-static int			/* was the simple RE an unbackslashed $? */
-p_simp_re(
-    struct parse *p,
-    int starordinary,		/* is a leading * an ordinary character? */
-    size_t reclimit)
-{
-	int c;
-	int count;
-	int count2;
-	sopno pos, i;
-	sopno subno;
-#	define	BACKSL	(1<<CHAR_BIT)
-
-	_DIAGASSERT(p != NULL);
-
-	pos = HERE();		/* repetion op, if any, covers from here */
-
-	assert(MORE());		/* caller should have ensured this */
-	c = GETNEXT();
-	if (c == '\\') {
-		REQUIRE(MORE(), REG_EESCAPE);
-		c = BACKSL | (unsigned char)GETNEXT();
-	}
-	switch (c) {
-	case '.':
-		if (p->g->cflags&REG_NEWLINE)
-			nonnewline(p);
-		else
-			EMIT(OANY, 0);
-		break;
-	case '[':
-		p_bracket(p);
-		break;
-	case BACKSL|'{':
-		SETERROR(REG_BADRPT);
-		break;
-	case BACKSL|'(':
-		p->g->nsub++;
-		subno = p->g->nsub;
-		if (subno < NPAREN)
-			p->pbegin[subno] = HERE();
-		EMIT(OLPAREN, subno);
-		/* the MORE here is an error heuristic */
-		if (MORE() && !SEETWO('\\', ')'))
-			p_bre(p, '\\', ')', reclimit);
-		if (subno < NPAREN) {
-			p->pend[subno] = HERE();
-			assert(p->pend[subno] != 0);
-		}
-		EMIT(ORPAREN, subno);
-		REQUIRE(EATTWO('\\', ')'), REG_EPAREN);
-		break;
-	case BACKSL|')':	/* should not get here -- must be user */
-	case BACKSL|'}':
-		SETERROR(REG_EPAREN);
-		break;
-	case BACKSL|'1':
-	case BACKSL|'2':
-	case BACKSL|'3':
-	case BACKSL|'4':
-	case BACKSL|'5':
-	case BACKSL|'6':
-	case BACKSL|'7':
-	case BACKSL|'8':
-	case BACKSL|'9':
-		i = (c&~BACKSL) - '0';
-		assert(i < NPAREN);
-		if (p->pend[i] != 0) {
-			assert(i <= p->g->nsub);
-			EMIT(OBACK_, i);
-			assert(p->pbegin[i] != 0);
-			assert(OP(p->strip[p->pbegin[i]]) == OLPAREN);
-			assert(OP(p->strip[p->pend[i]]) == ORPAREN);
-			(void) dupl(p, p->pbegin[i]+1, p->pend[i]);
-			EMIT(O_BACK, i);
-		} else
-			SETERROR(REG_ESUBREG);
-		p->g->backrefs = 1;
-		break;
-	case '*':
-		REQUIRE(starordinary, REG_BADRPT);
-		/* FALLTHROUGH */
-	default:
-		ordinary(p, c &~ BACKSL);
-		break;
-	}
-
-	if (EAT('*')) {		/* implemented as +? */
-		/* this case does not require the (y|) trick, noKLUDGE */
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		INSERT(OQUEST_, pos);
-		ASTERN(O_QUEST, pos);
-	} else if (EATTWO('\\', '{')) {
-		count = p_count(p);
-		if (EAT(',')) {
-			if (MORE() && isdigit((unsigned char)PEEK())) {
-				count2 = p_count(p);
-				REQUIRE(count <= count2, REG_BADBR);
-			} else		/* single number with comma */
-				count2 = INFINITY;
-		} else		/* just a single number */
-			count2 = count;
-		repeat(p, pos, count, count2, 0);
-		if (!EATTWO('\\', '}')) {	/* error heuristics */
-			while (MORE() && !SEETWO('\\', '}'))
-				NEXT();
-			REQUIRE(MORE(), REG_EBRACE);
-			SETERROR(REG_BADBR);
-		}
-	} else if (c == (unsigned char)'$')	/* $ (but not \$) ends it */
-		return(1);
-
-	return(0);
-}
-
-/*
- - p_count - parse a repetition count
- == static int p_count(struct parse *p);
- */
-static int			/* the value */
-p_count(
-    struct parse *p)
-{
-	int count = 0;
-	int ndigits = 0;
-
-	_DIAGASSERT(p != NULL);
-
-	while (MORE() && isdigit((unsigned char)PEEK()) && count <= DUPMAX) {
-		count = count*10 + (GETNEXT() - '0');
-		ndigits++;
-	}
-
-	REQUIRE(ndigits > 0 && count <= DUPMAX, REG_BADBR);
-	return(count);
-}
-
-/*
- - p_bracket - parse a bracketed character list
- == static void p_bracket(struct parse *p);
- *
- * Note a significant property of this code:  if the allocset() did SETERROR,
- * no set operations are done.
- */
-static void
-p_bracket(
-    struct parse *p)
-{
-	cset *cs;
-	int invert = 0;
-	_DIAGASSERT(p != NULL);
-
-	cs = allocset(p);
-	if (cs == NULL)
-		return;
-
-	/* Dept of Truly Sickening Special-Case Kludges */
-	if (p->next + 5 < p->end && strncmp(p->next, "[:<:]]",
-					    (size_t)6) == 0) {
-		EMIT(OBOW, 0);
-		NEXTn(6);
-		return;
-	}
-	if (p->next + 5 < p->end && strncmp(p->next, "[:>:]]",
-					    (size_t)6) == 0) {
-		EMIT(OEOW, 0);
-		NEXTn(6);
-		return;
-	}
-
-	if (EAT('^'))
-		invert++;	/* make note to invert set at end */
-	if (EAT(']'))
-		CHadd(cs, ']');
-	else if (EAT('-'))
-		CHadd(cs, '-');
-	while (MORE() && PEEK() != ']' && !SEETWO('-', ']'))
-		p_b_term(p, cs);
-	if (EAT('-'))
-		CHadd(cs, '-');
-	MUSTEAT(']', REG_EBRACK);
-
-	if (p->error != 0)	/* don't mess things up further */
-		return;
-
-	if (p->g->cflags&REG_ICASE) {
-		ssize_t i;
-		int ci;
-
-		for (i = p->g->csetsize - 1; i >= 0; i--)
-			if (CHIN(cs, i) && isalpha(i)) {
-				ci = othercase((int)i);
-				if (ci != i)
-					CHadd(cs, ci);
-			}
-		if (cs->multis != NULL)
-			mccase(p, cs);
-	}
-	if (invert) {
-		ssize_t i;
-
-		for (i = p->g->csetsize - 1; i >= 0; i--)
-			if (CHIN(cs, i))
-				CHsub(cs, (int)i);
-			else
-				CHadd(cs, (int)i);
-		if (p->g->cflags&REG_NEWLINE)
-			CHsub(cs, '\n');
-		if (cs->multis != NULL)
-			mcinvert(p, cs);
-	}
-
-	assert(cs->multis == NULL);		/* xxx */
-
-	if (nch(p, cs) == 1) {		/* optimize singleton sets */
-		ordinary(p, firstch(p, cs));
-		freeset(p, cs);
-	} else
-		EMIT(OANYOF, freezeset(p, cs));
-}
-
-/*
- - p_b_term - parse one term of a bracketed character list
- == static void p_b_term(struct parse *p, cset *cs);
- */
-static void
-p_b_term(
-    struct parse *p,
-    cset *cs)
-{
-	char c;
-	char start, finish;
-	int i;
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(cs != NULL);
-
-	/* classify what we've got */
-	switch ((MORE()) ? PEEK() : '\0') {
-	case '[':
-		c = (MORE2()) ? PEEK2() : '\0';
-		break;
-
-	case '-':
-		SETERROR(REG_ERANGE);
-		return;			/* NOTE RETURN */
-
-	default:
-		c = '\0';
-		break;
-	}
-
-	switch (c) {
-	case ':':		/* character class */
-		NEXT2();
-		REQUIRE(MORE(), REG_EBRACK);
-		c = PEEK();
-		REQUIRE(c != '-' && c != ']', REG_ECTYPE);
-		p_b_cclass(p, cs);
-		REQUIRE(MORE(), REG_EBRACK);
-		REQUIRE(EATTWO(':', ']'), REG_ECTYPE);
-		break;
-	case '=':		/* equivalence class */
-		NEXT2();
-		REQUIRE(MORE(), REG_EBRACK);
-		c = PEEK();
-		REQUIRE(c != '-' && c != ']', REG_ECOLLATE);
-		p_b_eclass(p, cs);
-		REQUIRE(MORE(), REG_EBRACK);
-		REQUIRE(EATTWO('=', ']'), REG_ECOLLATE);
-		break;
-	default:		/* symbol, ordinary character, or range */
-/* xxx revision needed for multichar stuff */
-		start = p_b_symbol(p);
-		if (SEE('-') && MORE2() && PEEK2() != ']') {
-			/* range */
-			NEXT();
-			if (EAT('-'))
-				finish = '-';
-			else
-				finish = p_b_symbol(p);
-		} else
-			finish = start;
-/* xxx what about signed chars here... */
-		REQUIRE(start <= finish, REG_ERANGE);
-		for (i = start; i <= finish; i++)
-			CHadd(cs, i);
-		break;
-	}
-}
-
-/*
- - p_b_cclass - parse a character-class name and deal with it
- == static void p_b_cclass(struct parse *p, cset *cs);
- */
-static void
-p_b_cclass(
-    struct parse *p,
-    cset *cs)
-{
-	const char *sp;
-	const struct cclass *cp;
-	size_t len;
-	const char *u;
-	char c;
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(cs != NULL);
-
-	sp = p->next;
-
-	while (MORE() && isalpha((unsigned char)PEEK()))
-		NEXT();
-	len = p->next - sp;
-	for (cp = cclasses; cp->name != NULL; cp++)
-		if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
-			break;
-	if (cp->name == NULL) {
-		/* oops, didn't find it */
-		SETERROR(REG_ECTYPE);
-		return;
-	}
-
-	u = cp->chars;
-	while ((c = *u++) != '\0')
-		CHadd(cs, c);
-	for (u = cp->multis; *u != '\0'; u += strlen(u) + 1)
-		MCadd(p, cs, u);
-}
-
-/*
- - p_b_eclass - parse an equivalence-class name and deal with it
- == static void p_b_eclass(struct parse *p, cset *cs);
- *
- * This implementation is incomplete. xxx
- */
-static void
-p_b_eclass(
-    struct parse *p,
-    cset *cs)
-{
-	char c;
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(cs != NULL);
-
-	c = p_b_coll_elem(p, '=');
-	CHadd(cs, c);
-}
-
-/*
- - p_b_symbol - parse a character or [..]ed multicharacter collating symbol
- == static char p_b_symbol(struct parse *p);
- */
-static char			/* value of symbol */
-p_b_symbol(
-    struct parse *p)
-{
-	char value;
-
-	_DIAGASSERT(p != NULL);
-
-	REQUIRE(MORE(), REG_EBRACK);
-	if (!EATTWO('[', '.'))
-		return(GETNEXT());
-
-	/* collating symbol */
-	value = p_b_coll_elem(p, '.');
-	REQUIRE(EATTWO('.', ']'), REG_ECOLLATE);
-	return(value);
-}
-
-/*
- - p_b_coll_elem - parse a collating-element name and look it up
- == static char p_b_coll_elem(struct parse *p, int endc);
- */
-static char			/* value of collating element */
-p_b_coll_elem(
-    struct parse *p,
-    int endc)			/* name ended by endc,']' */
-{
-	const char *sp;
-	const struct cname *cp;
-	size_t len;
-
-	_DIAGASSERT(p != NULL);
-
-	sp = p->next;
-
-	while (MORE() && !SEETWO(endc, ']'))
-		NEXT();
-	if (!MORE()) {
-		SETERROR(REG_EBRACK);
-		return(0);
-	}
-	len = p->next - sp;
-	for (cp = cnames; cp->name != NULL; cp++)
-		if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
-			return(cp->code);	/* known name */
-	if (len == 1)
-		return(*sp);	/* single character */
-	SETERROR(REG_ECOLLATE);			/* neither */
-	return(0);
-}
-
-/*
- - othercase - return the case counterpart of an alphabetic
- == static int othercase(int ch);
- */
-static int			/* if no counterpart, return ch */
-othercase(
-    int ch)
-{
-	assert(isalpha(ch));
-	if (isupper(ch))
-		return(tolower(ch));
-	else if (islower(ch))
-		return(toupper(ch));
-	else			/* peculiar, but could happen */
-		return(ch);
-}
-
-/*
- - bothcases - emit a dualcase version of a two-case character
- == static void bothcases(struct parse *p, int ch);
- *
- * Boy, is this implementation ever a kludge...
- */
-static void
-bothcases(
-    struct parse *p,
-    int ch)
-{
-	const char *oldnext;
-	const char *oldend;
-	char bracket[3];
-
-	_DIAGASSERT(p != NULL);
-
-	oldnext = p->next;
-	oldend = p->end;
-
-	assert(othercase(ch) != ch);	/* p_bracket() would recurse */
-	p->next = bracket;
-	p->end = bracket+2;
-	bracket[0] = ch;
-	bracket[1] = ']';
-	bracket[2] = '\0';
-	p_bracket(p);
-	assert(p->next == bracket+2);
-	p->next = oldnext;
-	p->end = oldend;
-}
-
-/*
- - ordinary - emit an ordinary character
- == static void ordinary(struct parse *p, int ch);
- */
-static void
-ordinary(
-    struct parse *p,
-    int ch)
-{
-	cat_t *cap;
-	unsigned char uc = (unsigned char)ch;
-
-	_DIAGASSERT(p != NULL);
-
-	cap = p->g->categories;
-	if ((p->g->cflags & REG_ICASE) && isalpha(uc) && othercase(uc) != uc)
-		bothcases(p, uc);
-	else {
-		EMIT(OCHAR, (sopno)uc);
-		if (cap[uc] == 0) {
-			_DIAGASSERT(__type_fit(unsigned char,
-			    p->g->ncategories + 1));
-			cap[uc] = (unsigned char)p->g->ncategories++;
-		}
-	}
-}
-
-/*
- - nonnewline - emit REG_NEWLINE version of OANY
- == static void nonnewline(struct parse *p);
- *
- * Boy, is this implementation ever a kludge...
- */
-static void
-nonnewline(
-    struct parse *p)
-{
-	const char *oldnext;
-	const char *oldend;
-	char bracket[4];
-
-	_DIAGASSERT(p != NULL);
-
-	oldnext = p->next;
-	oldend = p->end;
-
-	p->next = bracket;
-	p->end = bracket+3;
-	bracket[0] = '^';
-	bracket[1] = '\n';
-	bracket[2] = ']';
-	bracket[3] = '\0';
-	p_bracket(p);
-	assert(p->next == bracket+3);
-	p->next = oldnext;
-	p->end = oldend;
-}
-
-/*
- - repeat - generate code for a bounded repetition, recursively if needed
- == static void repeat(struct parse *p, sopno start, int from, int to,
- == size_t reclimit);
- */
-static void
-repeat(
-    struct parse *p,
-    sopno start,		/* operand from here to end of strip */
-    int from,			/* repeated from this number */
-    int to,			/* to this number of times (maybe INFINITY) */
-    size_t reclimit)
-{
-	sopno finish;
-#	define	N	2
-#	define	INF	3
-#	define	REP(f, t)	((f)*8 + (t))
-#	define	MAP(n)	(((n) <= 1) ? (n) : ((n) == INFINITY) ? INF : N)
-	sopno copy;
-
-	_DIAGASSERT(p != NULL);
-
-	if (reclimit++ > RECLIMIT) 
-		p->error = REG_ESPACE;
-	if (p->error)
-		return;
-
-	finish = HERE();
-
-	assert(from <= to);
-
-	switch (REP(MAP(from), MAP(to))) {
-	case REP(0, 0):			/* must be user doing this */
-		DROP(finish-start);	/* drop the operand */
-		break;
-	case REP(0, 1):			/* as x{1,1}? */
-	case REP(0, N):			/* as x{1,n}? */
-	case REP(0, INF):		/* as x{1,}? */
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, start);		/* offset is wrong... */
-		repeat(p, start+1, 1, to, reclimit);
-		ASTERN(OOR1, start);
-		AHEAD(start);			/* ... fix it */
-		EMIT(OOR2, 0);
-		AHEAD(THERE());
-		ASTERN(O_CH, THERETHERE());
-		break;
-	case REP(1, 1):			/* trivial case */
-		/* done */
-		break;
-	case REP(1, N):			/* as x?x{1,n-1} */
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, start);
-		ASTERN(OOR1, start);
-		AHEAD(start);
-		EMIT(OOR2, 0);			/* offset very wrong... */
-		AHEAD(THERE());			/* ...so fix it */
-		ASTERN(O_CH, THERETHERE());
-		copy = dupl(p, start+1, finish+1);
-		assert(copy == finish+4);
-		repeat(p, copy, 1, to-1, reclimit);
-		break;
-	case REP(1, INF):		/* as x+ */
-		INSERT(OPLUS_, start);
-		ASTERN(O_PLUS, start);
-		break;
-	case REP(N, N):			/* as xx{m-1,n-1} */
-		copy = dupl(p, start, finish);
-		repeat(p, copy, from-1, to-1, reclimit);
-		break;
-	case REP(N, INF):		/* as xx{n-1,INF} */
-		copy = dupl(p, start, finish);
-		repeat(p, copy, from-1, to, reclimit);
-		break;
-	default:			/* "can't happen" */
-		SETERROR(REG_ASSERT);	/* just in case */
-		break;
-	}
-}
-
-/*
- - seterr - set an error condition
- == static int seterr(struct parse *p, int e);
- */
-static int			/* useless but makes type checking happy */
-seterr(
-    struct parse *p,
-    int e)
-{
-
-	_DIAGASSERT(p != NULL);
-
-	if (p->error == 0)	/* keep earliest error condition */
-		p->error = e;
-	p->next = nuls;		/* try to bring things to a halt */
-	p->end = nuls;
-	return(0);		/* make the return value well-defined */
-}
-
-/*
- - allocset - allocate a set of characters for []
- == static cset *allocset(struct parse *p);
- */
-static cset *
-allocset(
-    struct parse *p)
-{
-	size_t no;
-	size_t nc;
-	size_t nbytes;
-	cset *cs;
-	size_t css;
-	size_t i;
-	void *old_ptr;
-
-	_DIAGASSERT(p != NULL);
-
-	no = p->g->ncsets++;
-	css = (size_t)p->g->csetsize;
-	if (no >= p->ncsalloc) {	/* need another column of space */
-		p->ncsalloc += CHAR_BIT;
-		nc = p->ncsalloc;
-		assert(nc % CHAR_BIT == 0);
-		nbytes = nc / CHAR_BIT * css;
-		if (MEMSIZE(p) > MEMLIMIT)
-			goto oomem;
-		if (reallocarr(&p->g->sets, nc, sizeof(cset)))
-			goto oomem;
-		old_ptr = p->g->setbits;
-		if (reallocarr(&p->g->setbits, nc / CHAR_BIT, css)) {
-			free(old_ptr);
-			goto oomem;
-		}
-		if (old_ptr != p->g->setbits) {
-			for (i = 0; i < no; i++)
-				p->g->sets[i].ptr = p->g->setbits + css*(i/CHAR_BIT);
-		}
-		(void) memset((char *)p->g->setbits + (nbytes - css), 0, css);
-	}
-
-	cs = &p->g->sets[no];
-	cs->ptr = p->g->setbits + css*((no)/CHAR_BIT);
-	cs->mask = 1 << (unsigned int)((no) % CHAR_BIT);
-	cs->hash = 0;
-	cs->smultis = 0;
-	cs->multis = NULL;
-
-	return(cs);
-
-oomem:
-	SETERROR(REG_ESPACE);
-	/* caller's responsibility not to do set ops */
-	return NULL;
-}
-
-/*
- - freeset - free a now-unused set
- == static void freeset(struct parse *p, cset *cs);
- */
-static void
-freeset(
-    struct parse *p,
-    cset *cs)
-{
-	size_t i;
-	cset *top;
-	size_t css;
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(cs != NULL);
-
-	top = &p->g->sets[p->g->ncsets];
-	css = (size_t)p->g->csetsize;
-
-	for (i = 0; i < css; i++)
-		CHsub(cs, (int)i);
-	if (cs == top-1)	/* recover only the easy case */
-		p->g->ncsets--;
-}
-
-/*
- - freezeset - final processing on a set of characters
- == static int freezeset(struct parse *p, cset *cs);
- *
- * The main task here is merging identical sets.  This is usually a waste
- * of time (although the hash code minimizes the overhead), but can win
- * big if REG_ICASE is being used.  REG_ICASE, by the way, is why the hash
- * is done using addition rather than xor -- all ASCII [aA] sets xor to
- * the same value!
- */
-static sopno			/* set number */
-freezeset(
-    struct parse *p,
-    cset *cs)
-{
-	uch h;
-	size_t i;
-	cset *top;
-	cset *cs2;
-	size_t css;
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(cs != NULL);
-
-	h = cs->hash;
-	top = &p->g->sets[p->g->ncsets];
-	css = (size_t)p->g->csetsize;
-
-	/* look for an earlier one which is the same */
-	for (cs2 = &p->g->sets[0]; cs2 < top; cs2++)
-		if (cs2->hash == h && cs2 != cs) {
-			/* maybe */
-			for (i = 0; i < css; i++)
-				if (!!CHIN(cs2, i) != !!CHIN(cs, i))
-					break;		/* no */
-			if (i == css)
-				break;			/* yes */
-		}
-
-	if (cs2 < top) {	/* found one */
-		freeset(p, cs);
-		cs = cs2;
-	}
-
-	return (sopno)(cs - p->g->sets);
-}
-
-/*
- - firstch - return first character in a set (which must have at least one)
- == static int firstch(struct parse *p, cset *cs);
- */
-static int			/* character; there is no "none" value */
-firstch(
-    struct parse *p,
-    cset *cs)
-{
-	size_t i;
-	size_t css;
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(cs != NULL);
-
-	css = (size_t)p->g->csetsize;
-
-	for (i = 0; i < css; i++)
-		if (CHIN(cs, i))
-			return((char)i);
-	assert(never);
-	return(0);		/* arbitrary */
-}
-
-/*
- - nch - number of characters in a set
- == static int nch(struct parse *p, cset *cs);
- */
-static int
-nch(
-    struct parse *p,
-    cset *cs)
-{
-	size_t i;
-	size_t css;
-	int n = 0;
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(cs != NULL);
-
-	css = (size_t)p->g->csetsize;
-
-	for (i = 0; i < css; i++)
-		if (CHIN(cs, i))
-			n++;
-	return(n);
-}
-
-/*
- - mcadd - add a collating element to a cset
- == static void mcadd(struct parse *p, cset *cs, \
- ==	char *cp);
- */
-static void
-mcadd(
-    struct parse *p,
-    cset *cs,
-    const char *cp)
-{
-	size_t oldend;
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(cs != NULL);
-	_DIAGASSERT(cp != NULL);
-
-	oldend = cs->smultis;
-
-	cs->smultis += strlen(cp) + 1;
-	if (cs->multis == NULL)
-		cs->multis = malloc(cs->smultis);
-	else
-		cs->multis = realloc(cs->multis, cs->smultis);
-	if (cs->multis == NULL) {
-		SETERROR(REG_ESPACE);
-		return;
-	}
-
-	(void) strcpy(cs->multis + oldend - 1, cp);
-	cs->multis[cs->smultis - 1] = '\0';
-}
-
-#if 0
-/*
- - mcsub - subtract a collating element from a cset
- == static void mcsub(cset *cs, char *cp);
- */
-static void
-mcsub(
-    cset *cs,
-    char *cp)
-{
-	char *fp;
-	size_t len;
-
-	_DIAGASSERT(cs != NULL);
-	_DIAGASSERT(cp != NULL);
-
-	fp = mcfind(cs, cp);
-	len = strlen(fp);
-
-	assert(fp != NULL);
-	(void) memmove(fp, fp + len + 1,
-				cs->smultis - (fp + len + 1 - cs->multis));
-	cs->smultis -= len;
-
-	if (cs->smultis == 0) {
-		free(cs->multis);
-		cs->multis = NULL;
-		return;
-	}
-
-	cs->multis = realloc(cs->multis, cs->smultis);
-	assert(cs->multis != NULL);
-}
-
-/*
- - mcin - is a collating element in a cset?
- == static int mcin(cset *cs, char *cp);
- */
-static int
-mcin(
-    cset *cs,
-    char *cp)
-{
-
-	_DIAGASSERT(cs != NULL);
-	_DIAGASSERT(cp != NULL);
-
-	return(mcfind(cs, cp) != NULL);
-}
-
-/*
- - mcfind - find a collating element in a cset
- == static char *mcfind(cset *cs, char *cp);
- */
-static char *
-mcfind(
-    cset *cs,
-    char *cp)
-{
-	char *p;
-
-	_DIAGASSERT(cs != NULL);
-	_DIAGASSERT(cp != NULL);
-
-	if (cs->multis == NULL)
-		return(NULL);
-	for (p = cs->multis; *p != '\0'; p += strlen(p) + 1)
-		if (strcmp(cp, p) == 0)
-			return(p);
-	return(NULL);
-}
-#endif
-
-/*
- - mcinvert - invert the list of collating elements in a cset
- == static void mcinvert(struct parse *p, cset *cs);
- *
- * This would have to know the set of possibilities.  Implementation
- * is deferred.
- */
-/* ARGSUSED */
-static void
-mcinvert(
-    struct parse *p,
-    cset *cs)
-{
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(cs != NULL);
-
-	assert(cs->multis == NULL);	/* xxx */
-}
-
-/*
- - mccase - add case counterparts of the list of collating elements in a cset
- == static void mccase(struct parse *p, cset *cs);
- *
- * This would have to know the set of possibilities.  Implementation
- * is deferred.
- */
-/* ARGSUSED */
-static void
-mccase(
-    struct parse *p,
-    cset *cs)
-{
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(cs != NULL);
-
-	assert(cs->multis == NULL);	/* xxx */
-}
-
-/*
- - isinsets - is this character in any sets?
- == static int isinsets(struct re_guts *g, int c);
- */
-static int			/* predicate */
-isinsets(
-    struct re_guts *g,
-    int c)
-{
-	uch *col;
-	size_t i;
-	size_t ncols;
-	unsigned uc = (unsigned char)c;
-
-	_DIAGASSERT(g != NULL);
-
-	if (g->setbits == NULL)
-		return 0;
-
-	ncols = (g->ncsets+(CHAR_BIT-1)) / CHAR_BIT;
-
-	for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize)
-		if (col[uc] != 0)
-			return(1);
-	return(0);
-}
-
-/*
- - samesets - are these two characters in exactly the same sets?
- == static int samesets(struct re_guts *g, int c1, int c2);
- */
-static int			/* predicate */
-samesets(
-    struct re_guts *g,
-    int c1,
-    int c2)
-{
-	uch *col;
-	size_t i;
-	size_t ncols;
-	unsigned uc1 = (unsigned char)c1;
-	unsigned uc2 = (unsigned char)c2;
-
-	_DIAGASSERT(g != NULL);
-
-	ncols = (g->ncsets+(CHAR_BIT-1)) / CHAR_BIT;
-
-	for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize)
-		if (col[uc1] != col[uc2])
-			return(0);
-	return(1);
-}
-
-/*
- - categorize - sort out character categories
- == static void categorize(struct parse *p, struct re_guts *g);
- */
-static void
-categorize(
-    struct parse *p,
-    struct re_guts *g)
-{
-	cat_t *cats;
-	int c;
-	int c2;
-	cat_t cat;
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(g != NULL);
-
-	cats = g->categories;
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-		if (cats[c] == 0 && isinsets(g, c)) {
-			_DIAGASSERT(__type_fit(unsigned char,
-			    g->ncategories + 1));
-			cat = g->ncategories++;
-			cats[c] = cat;
-			for (c2 = c+1; c2 <= CHAR_MAX; c2++)
-				if (cats[c2] == 0 && samesets(g, c, c2))
-					cats[c2] = cat;
-		}
-}
-
-/*
- - dupl - emit a duplicate of a bunch of sops
- == static sopno dupl(struct parse *p, sopno start, sopno finish);
- */
-static sopno			/* start of duplicate */
-dupl(
-    struct parse *p,
-    sopno start,			/* from here */
-    sopno finish)			/* to this less one */
-{
-	sopno ret;
-	sopno len = finish - start;
-
-	_DIAGASSERT(p != NULL);
-
-	ret = HERE();
-
-	assert(finish >= start);
-	if (len == 0)
-		return(ret);
-	if (!enlarge(p, p->ssize + len))/* this many unexpected additions */
-		return ret;
-	(void)memcpy(p->strip + p->slen, p->strip + start,
-	    (size_t)len * sizeof(sop));
-	p->slen += len;
-	return(ret);
-}
-
-/*
- - doemit - emit a strip operator
- == static void doemit(struct parse *p, sop op, size_t opnd);
- *
- * It might seem better to implement this as a macro with a function as
- * hard-case backup, but it's just too big and messy unless there are
- * some changes to the data structures.  Maybe later.
- */
-static void
-doemit(
-    struct parse *p,
-    sop op,
-    sopno opnd)
-{
-	_DIAGASSERT(p != NULL);
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	/* deal with oversize operands ("can't happen", more or less) */
-	assert(opnd < 1<<OPSHIFT);
-
-	/* deal with undersized strip */
-	if (p->slen >= p->ssize)
-		if (!enlarge(p, (p->ssize+1) / 2 * 3))	/* +50% */
-			return;
-
-	/* finally, it's all reduced to the easy case */
-	p->strip[p->slen++] = (sop)SOP(op, opnd);
-}
-
-/*
- - doinsert - insert a sop into the strip
- == static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos);
- */
-static void
-doinsert(
-    struct parse *p,
-    sop op,
-    sopno opnd,
-    sopno pos)
-{
-	sopno sn;
-	sop s;
-	int i;
-
-	_DIAGASSERT(p != NULL);
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	sn = HERE();
-	EMIT(op, opnd);		/* do checks, ensure space */
-	assert(HERE() == sn+1);
-	s = p->strip[sn];
-
-	/* adjust paren pointers */
-	assert(pos > 0);
-	for (i = 1; i < NPAREN; i++) {
-		if (p->pbegin[i] >= pos) {
-			p->pbegin[i]++;
-		}
-		if (p->pend[i] >= pos) {
-			p->pend[i]++;
-		}
-	}
-
-	memmove(&p->strip[pos+1], &p->strip[pos], (HERE()-pos-1)*sizeof(sop));
-	p->strip[pos] = s;
-}
-
-/*
- - dofwd - complete a forward reference
- == static void dofwd(struct parse *p, sopno pos, sop value);
- */
-static void
-dofwd(
-    struct parse *p,
-    sopno pos,
-    sopno value)
-{
-
-	_DIAGASSERT(p != NULL);
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	assert(value < 1<<OPSHIFT);
-	p->strip[pos] = (sop)(OP(p->strip[pos]) | value);
-}
-
-/*
- - enlarge - enlarge the strip
- == static void enlarge(struct parse *p, sopno size);
- */
-static int
-enlarge(struct parse *p, sopno size)
-{
-	_DIAGASSERT(p != NULL);
-
-	if (p->ssize >= size)
-		return 1;
-
-	if (MEMSIZE(p) > MEMLIMIT || reallocarr(&p->strip, size, sizeof(sop))) {
-		SETERROR(REG_ESPACE);
-		return 0;
-	}
-	p->ssize = size;
-	return 1;
-}
-
-/*
- - stripsnug - compact the strip
- == static void stripsnug(struct parse *p, struct re_guts *g);
- */
-static void
-stripsnug(
-    struct parse *p,
-    struct re_guts *g)
-{
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(g != NULL);
-
-	g->nstates = p->slen;
-	g->strip = p->strip;
-	reallocarr(&g->strip, p->slen, sizeof(sop));
-	/* Ignore error as tries to free memory only. */
-}
-
-/*
- - findmust - fill in must and mlen with longest mandatory literal string
- == static void findmust(struct parse *p, struct re_guts *g);
- *
- * This algorithm could do fancy things like analyzing the operands of |
- * for common subsequences.  Someday.  This code is simple and finds most
- * of the interesting cases.
- *
- * Note that must and mlen got initialized during setup.
- */
-static void
-findmust(
-    struct parse *p,
-    struct re_guts *g)
-{
-	sop *scan;
-	sop *start = NULL;
-	sop *newstart = NULL;
-	sopno newlen;
-	sop s;
-	char *cp;
-	sopno i;
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(g != NULL);
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	/* find the longest OCHAR sequence in strip */
-	newlen = 0;
-	scan = g->strip + 1;
-	do {
-		s = *scan++;
-		switch (OP(s)) {
-		case OCHAR:		/* sequence member */
-			if (newlen == 0)		/* new sequence */
-				newstart = scan - 1;
-			newlen++;
-			break;
-		case OPLUS_:		/* things that don't break one */
-		case OLPAREN:
-		case ORPAREN:
-			break;
-		case OQUEST_:		/* things that must be skipped */
-		case OCH_:
-			scan--;
-			do {
-				scan += OPND(s);
-				s = *scan;
-				/* assert() interferes w debug printouts */
-				if (OP(s) != O_QUEST && OP(s) != O_CH &&
-							OP(s) != OOR2) {
-					g->iflags |= BAD;
-					return;
-				}
-			} while (OP(s) != O_QUEST && OP(s) != O_CH);
-			/* FALLTHROUGH */
-		default:		/* things that break a sequence */
-			if (newlen > g->mlen) {		/* ends one */
-				start = newstart;
-				g->mlen = newlen;
-			}
-			newlen = 0;
-			break;
-		}
-	} while (OP(s) != OEND);
-
-	if (start == NULL)
-		g->mlen = 0;
-
-	if (g->mlen == 0)	/* there isn't one */
-		return;
-
-	/* turn it into a character string */
-	g->must = malloc((size_t)g->mlen + 1);
-	if (g->must == NULL) {		/* argh; just forget it */
-		g->mlen = 0;
-		return;
-	}
-	cp = g->must;
-	scan = start;
-	for (i = g->mlen; i > 0; i--) {
-		while (OP(s = *scan++) != OCHAR)
-			continue;
-		assert(cp < g->must + g->mlen);
-		*cp++ = (char)OPND(s);
-	}
-	assert(cp == g->must + g->mlen);
-	*cp++ = '\0';		/* just on general principles */
-}
-
-/*
- - pluscount - count + nesting
- == static sopno pluscount(struct parse *p, struct re_guts *g);
- */
-static sopno			/* nesting depth */
-pluscount(
-    struct parse *p,
-    struct re_guts *g)
-{
-	sop *scan;
-	sop s;
-	sopno plusnest = 0;
-	sopno maxnest = 0;
-
-	_DIAGASSERT(p != NULL);
-	_DIAGASSERT(g != NULL);
-
-	if (p->error != 0)
-		return(0);	/* there may not be an OEND */
-
-	scan = g->strip + 1;
-	do {
-		s = *scan++;
-		switch (OP(s)) {
-		case OPLUS_:
-			plusnest++;
-			break;
-		case O_PLUS:
-			if (plusnest > maxnest)
-				maxnest = plusnest;
-			plusnest--;
-			break;
-		}
-	} while (OP(s) != OEND);
-	if (plusnest != 0)
-		g->iflags |= BAD;
-	return(maxnest);
-}
diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c
deleted file mode 100644
index e00d7c035..000000000
--- a/lib/libc/regex/regerror.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*	$NetBSD: regerror.c,v 1.23 2007/02/09 23:44:18 junyoung Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)regerror.c	8.4 (Berkeley) 3/20/94
- */
-
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)regerror.c	8.4 (Berkeley) 3/20/94
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
-#else
-__RCSID("$NetBSD: regerror.c,v 1.23 2007/02/09 23:44:18 junyoung Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <regex.h>
-
-#ifdef __weak_alias
-__weak_alias(regerror,_regerror)
-#endif
-
-#include "utils.h"
-
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === regerror.c === */
-static const char *regatoi(const regex_t *preg, char *localbuf, size_t buflen);
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
-/*
- = #define	REG_NOMATCH	 1
- = #define	REG_BADPAT	 2
- = #define	REG_ECOLLATE	 3
- = #define	REG_ECTYPE	 4
- = #define	REG_EESCAPE	 5
- = #define	REG_ESUBREG	 6
- = #define	REG_EBRACK	 7
- = #define	REG_EPAREN	 8
- = #define	REG_EBRACE	 9
- = #define	REG_BADBR	10
- = #define	REG_ERANGE	11
- = #define	REG_ESPACE	12
- = #define	REG_BADRPT	13
- = #define	REG_EMPTY	14
- = #define	REG_ASSERT	15
- = #define	REG_INVARG	16
- = #define	REG_ATOI	255	// convert name to number (!)
- = #define	REG_ITOA	0400	// convert number to name (!)
- */
-static const struct rerr {
-	int code;
-	const char *name;
-	const char *explain;
-} rerrs[] = {
-	{ REG_NOMATCH,	"REG_NOMATCH",	"regexec() failed to match" },
-	{ REG_BADPAT,	"REG_BADPAT",	"invalid regular expression" },
-	{ REG_ECOLLATE,	"REG_ECOLLATE",	"invalid collating element" },
-	{ REG_ECTYPE,	"REG_ECTYPE",	"invalid character class" },
-	{ REG_EESCAPE,	"REG_EESCAPE",	"trailing backslash (\\)" },
-	{ REG_ESUBREG,	"REG_ESUBREG",	"invalid backreference number" },
-	{ REG_EBRACK,	"REG_EBRACK",	"brackets ([ ]) not balanced" },
-	{ REG_EPAREN,	"REG_EPAREN",	"parentheses not balanced" },
-	{ REG_EBRACE,	"REG_EBRACE",	"braces not balanced" },
-	{ REG_BADBR,	"REG_BADBR",	"invalid repetition count(s)" },
-	{ REG_ERANGE,	"REG_ERANGE",	"invalid character range" },
-	{ REG_ESPACE,	"REG_ESPACE",	"out of memory" },
-	{ REG_BADRPT,	"REG_BADRPT",	"repetition-operator operand invalid" },
-	{ REG_EMPTY,	"REG_EMPTY",	"empty (sub)expression" },
-	{ REG_ASSERT,	"REG_ASSERT",	"\"can't happen\" -- you found a bug" },
-	{ REG_INVARG,	"REG_INVARG",	"invalid argument to regex routine" },
-	{ 0,		"",		"*** unknown regexp error code ***" }
-};
-
-/*
- * regerror - the interface to error numbers
- * extern size_t regerror(int, const regex_t *, char *, size_t);
- */
-/* ARGSUSED */
-size_t
-regerror(
-    int errcode,
-    const regex_t *preg,
-    char *errbuf,
-    size_t errbuf_size)
-{
-	const struct rerr *r;
-	size_t len;
-	int target = errcode &~ REG_ITOA;
-	const char *s;
-	char convbuf[50];
-
-	_DIAGASSERT(errcode != REG_ATOI || preg != NULL);
-	_DIAGASSERT(errbuf != NULL);
-
-	if (errcode == REG_ATOI)
-		s = regatoi(preg, convbuf, sizeof convbuf);
-	else {
-		for (r = rerrs; r->code != 0; r++)
-			if (r->code == target)
-				break;
-	
-		if (errcode & REG_ITOA) {
-			if (r->code != 0) {
-				(void)strlcpy(convbuf, r->name, sizeof convbuf);
-			} else
-				(void)snprintf(convbuf, sizeof convbuf,
-				    "REG_0x%x", target);
-			s = convbuf;
-		} else
-			s = r->explain;
-	}
-
-	len = strlen(s) + 1;
-	if (errbuf_size > 0)
-		(void)strlcpy(errbuf, s, errbuf_size);
-
-	return(len);
-}
-
-/*
- * regatoi - internal routine to implement REG_ATOI
- * static const char *regatoi(const regex_t *preg, char *localbuf,
- * size_t buflen);
- */
-static const char *
-regatoi(
-    const regex_t *preg,
-    char *localbuf,
-    size_t buflen)
-{
-	const struct rerr *r;
-
-	for (r = rerrs; r->code != 0; r++)
-		if (strcmp(r->name, preg->re_endp) == 0)
-			break;
-	if (r->code == 0)
-		return "0";
-
-	(void)snprintf(localbuf, buflen, "%d", r->code);
-	return localbuf;
-}
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
deleted file mode 100644
index 78ae7eaa1..000000000
--- a/lib/libc/regex/regex.3
+++ /dev/null
@@ -1,631 +0,0 @@
-.\"	$NetBSD: regex.3,v 1.22 2011/05/17 03:35:38 enami Exp $
-.\"
-.\" Copyright (c) 1992, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Henry Spencer.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\" Copyright (c) 1992, 1993, 1994 Henry Spencer.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Henry Spencer.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"	@(#)regex.3	8.4 (Berkeley) 3/20/94
-.\"
-.Dd December 29, 2003
-.Dt REGEX 3
-.Os
-.Sh NAME
-.Nm regex ,
-.Nm regcomp ,
-.Nm regexec ,
-.Nm regerror ,
-.Nm regfree
-.Nd regular-expression library
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In regex.h
-.Ft int
-.Fn regcomp "regex_t * restrict preg" "const char * restrict pattern" "int cflags"
-.Ft int
-.Fn regexec "const regex_t * restrict preg" "const char * restrict string" "size_t nmatch" "regmatch_t pmatch[]" "int eflags"
-.Ft size_t
-.Fn regerror "int errcode" "const regex_t * restrict preg" "char * restrict errbuf" "size_t errbuf_size"
-.Ft void
-.Fn regfree "regex_t *preg"
-.Sh DESCRIPTION
-These routines implement
-.St -p1003.2-92
-regular expressions (``RE''s);
-see
-.Xr re_format 7 .
-.Fn regcomp
-compiles an RE written as a string into an internal form,
-.Fn regexec
-matches that internal form against a string and reports results,
-.Fn regerror
-transforms error codes from either into human-readable messages,
-and
-.Fn regfree
-frees any dynamically-allocated storage used by the internal form
-of an RE.
-.Pp
-The header
-.In regex.h
-declares two structure types,
-.Fa regex_t
-and
-.Fa regmatch_t ,
-the former for compiled internal forms and the latter for match reporting.
-It also declares the four functions,
-a type
-.Fa regoff_t ,
-and a number of constants with names starting with ``REG_''.
-.Pp
-.Fn regcomp
-compiles the regular expression contained in the
-.Fa pattern
-string,
-subject to the flags in
-.Fa cflags ,
-and places the results in the
-.Fa regex_t
-structure pointed to by
-.Fa preg .
-.Fa cflags
-is the bitwise OR of zero or more of the following flags:
-.Bl -tag -width XXXREG_EXTENDED
-.It Dv REG_EXTENDED
-Compile modern (``extended'') REs, rather than the obsolete
-(``basic'') REs that are the default.
-.It Dv REG_BASIC
-This is a synonym for 0,
-provided as a counterpart to REG_EXTENDED to improve readability.
-.It Dv REG_NOSPEC
-Compile with recognition of all special characters turned off.
-All characters are thus considered ordinary, so the ``RE'' is a literal
-string.
-This is an extension, compatible with but not specified by
-.St -p1003.2-92 ,
-and should be used with caution in software intended to be portable to
-other systems.
-.Dv REG_EXTENDED
-and
-.Dv REG_NOSPEC
-may not be used in the same call to
-.Fn regcomp .
-.It Dv REG_ICASE
-Compile for matching that ignores upper/lower case distinctions.
-See
-.Xr re_format 7 .
-.It Dv REG_NOSUB
-Compile for matching that need only report success or failure, not
-what was matched.
-.It Dv REG_NEWLINE
-Compile for newline-sensitive matching.
-By default, newline is a completely ordinary character with no special
-meaning in either REs or strings.
-With this flag,
-`[^' bracket expressions and `.' never match newline,
-a `^' anchor matches the null string after any newline in the string
-in addition to its normal function,
-and the `$' anchor matches the null string before any newline in the
-string in addition to its normal function.
-.It Dv REG_PEND
-The regular expression ends, not at the first NUL, but just before the
-character pointed to by the
-.Fa re_endp
-member of the structure pointed to by
-.Fa preg .
-The
-.Fa re_endp
-member is of type
-.Fa "const\ char\ *" .
-This flag permits inclusion of NULs in the RE; they are considered
-ordinary characters.
-This is an extension, compatible with but not specified by
-.St -p1003.2-92 ,
-and should be used with caution in software intended to be portable to
-other systems.
-.El
-.Pp
-When successful,
-.Fn regcomp
-returns 0 and fills in the structure pointed to by
-.Fa preg .
-One member of that structure (other than
-.Fa re_endp )
-is publicized:
-.Fa re_nsub ,
-of type
-.Fa size_t ,
-contains the number of parenthesized subexpressions within the RE
-(except that the value of this member is undefined if the
-.Dv REG_NOSUB
-flag was used).
-If
-.Fn regcomp
-fails, it returns a non-zero error code;
-see
-.Sx DIAGNOSTICS .
-.Pp
-.Fn regexec
-matches the compiled RE pointed to by
-.Fa preg
-against the
-.Fa string ,
-subject to the flags in
-.Fa eflags ,
-and reports results using
-.Fa nmatch ,
-.Fa pmatch ,
-and the returned value.
-The RE must have been compiled by a previous invocation of
-.Fn regcomp .
-The compiled form is not altered during execution of
-.Fn regexec ,
-so a single compiled RE can be used simultaneously by multiple threads.
-.Pp
-By default,
-the NUL-terminated string pointed to by
-.Fa string
-is considered to be the text of an entire line, minus any terminating
-newline.
-The
-.Fa eflags
-argument is the bitwise OR of zero or more of the following flags:
-.Bl -tag -width XXXREG_NOTBOL
-.It Dv REG_NOTBOL
-The first character of the string
-is not the beginning of a line, so the `^' anchor should not match before it.
-This does not affect the behavior of newlines under
-.Dv REG_NEWLINE .
-.It Dv REG_NOTEOL
-The NUL terminating the string does not end a line, so the `$' anchor
-should not match before it.
-This does not affect the behavior of newlines under
-.Dv REG_NEWLINE .
-.It Dv REG_STARTEND
-The string is considered to start at
-.Fa string
-+
-.Fa pmatch[0].rm_so
-and to have a terminating NUL located at
-.Fa string
-+
-.Fa pmatch[0].rm_eo
-(there need not actually be a NUL at that location),
-regardless of the value of
-.Fa nmatch .
-See below for the definition of
-.Fa pmatch
-and
-.Fa nmatch .
-This is an extension, compatible with but not specified by
-.St -p1003.2-92 ,
-and should be used with caution in software intended to be portable to
-other systems.
-Note that a non-zero
-.Fa rm_so
-does not imply
-.Dv REG_NOTBOL ;
-.Dv REG_STARTEND
-affects only the location of the string, not how it is matched.
-.El
-.Pp
-See
-.Xr re_format 7
-for a discussion of what is matched in situations where an RE or a
-portion thereof could match any of several substrings of
-.Fa string .
-.Pp
-Normally,
-.Fn regexec
-returns 0 for success and the non-zero code
-.Dv REG_NOMATCH
-for failure.
-Other non-zero error codes may be returned in exceptional situations;
-see
-.Sx DIAGNOSTICS .
-.Pp
-If
-.Dv REG_NOSUB
-was specified in the compilation of the RE, or if
-.Fa nmatch
-is 0,
-.Fn regexec
-ignores the
-.Fa pmatch
-argument (but see below for the case where
-.Dv REG_STARTEND
-is specified).
-Otherwise,
-.Fa pmatch
-points to an array of
-.Fa nmatch
-structures of type
-.Fa regmatch_t .
-Such a structure has at least the members
-.Fa rm_so
-and
-.Fa rm_eo ,
-both of type
-.Fa regoff_t
-(a signed arithmetic type at least as large as an
-.Fa off_t
-and a
-.Fa ssize_t ) ,
-containing respectively the offset of the first character of a substring
-and the offset of the first character after the end of the substring.
-Offsets are measured from the beginning of the
-.Fa string
-argument given to
-.Fn regexec .
-An empty substring is denoted by equal offsets,
-both indicating the character following the empty substring.
-.Pp
-The 0th member of the
-.Fa pmatch
-array is filled in to indicate what substring of
-.Fa string
-was matched by the entire RE.
-Remaining members report what substring was matched by parenthesized
-subexpressions within the RE;
-member
-.Fa i
-reports subexpression
-.Fa i ,
-with subexpressions counted (starting at 1) by the order of their
-opening parentheses in the RE, left to right.
-Unused entries in the array\(emcorresponding either to subexpressions that
-did not participate in the match at all, or to subexpressions that do not
-exist in the RE (that is,
-.Fa i
-\*[Gt]
-.Fa preg-\*[Gt]re_nsub )
-\(emhave both
-.Fa rm_so
-and
-.Fa rm_eo
-set to -1.
-If a subexpression participated in the match several times,
-the reported substring is the last one it matched.
-(Note, as an example in particular, that when the RE `(b*)+' matches `bbb',
-the parenthesized subexpression matches each of the three `b's and then
-an infinite number of empty strings following the last `b',
-so the reported substring is one of the empties.)
-.Pp
-If
-.Dv REG_STARTEND
-is specified,
-.Fa pmatch
-must point to at least one
-.Fa regmatch_t
-(even if
-.Fa nmatch
-is 0 or
-.Dv REG_NOSUB
-was specified),
-to hold the input offsets for
-.Dv REG_STARTEND .
-Use for output is still entirely controlled by
-.Fa nmatch ;
-if
-.Fa nmatch
-is 0 or
-.Dv REG_NOSUB
-was specified,
-the value of
-.Fa pmatch [0]
-will not be changed by a successful
-.Fn regexec .
-.Pp
-.Fn regerror
-maps a non-zero
-.Fa errcode
-from either
-.Fn regcomp
-or
-.Fn regexec
-to a human-readable, printable message.
-If
-.Fa preg
-is non-NULL,
-the error code should have arisen from use of the
-.Fa regex_t
-pointed to by
-.Fa preg ,
-and if the error code came from
-.Fn regcomp ,
-it should have been the result from the most recent
-.Fn regcomp
-using that
-.Fa regex_t .
-.Po Fn regerror
-may be able to supply a more detailed message using information
-from the
-.Fa regex_t . Pc
-.Fn regerror
-places the NUL-terminated message into the buffer pointed to by
-.Fa errbuf ,
-limiting the length (including the NUL) to at most
-.Fa errbuf_size
-bytes.
-If the whole message won't fit,
-as much of it as will fit before the terminating NUL is supplied.
-In any case,
-the returned value is the size of buffer needed to hold the whole
-message (including terminating NUL).
-If
-.Fa errbuf_size
-is 0,
-.Fa errbuf
-is ignored but the return value is still correct.
-.Pp
-If the
-.Fa errcode
-given to
-.Fn regerror
-is first ORed with
-.Dv REG_ITOA ,
-the ``message'' that results is the printable name of the error code,
-e.g. ``REG_NOMATCH'',
-rather than an explanation thereof.
-If
-.Fa errcode
-is
-.Dv REG_ATOI ,
-then
-.Fa preg
-shall be non-NULL and the
-.Fa re_endp
-member of the structure it points to
-must point to the printable name of an error code;
-in this case, the result in
-.Fa errbuf
-is the decimal digits of
-the numeric value of the error code
-(0 if the name is not recognized).
-.Dv REG_ITOA
-and
-.Dv REG_ATOI
-are intended primarily as debugging facilities;
-they are extensions, compatible with but not specified by
-.St -p1003.2-92 ,
-and should be used with caution in software intended to be portable to
-other systems.
-Be warned also that they are considered experimental and changes are possible.
-.Pp
-.Fn regfree
-frees any dynamically-allocated storage associated with the compiled RE
-pointed to by
-.Fa preg .
-The remaining
-.Fa regex_t
-is no longer a valid compiled RE
-and the effect of supplying it to
-.Fn regexec
-or
-.Fn regerror
-is undefined.
-.Pp
-None of these functions references global variables except for tables
-of constants;
-all are safe for use from multiple threads if the arguments are safe.
-.Sh IMPLEMENTATION CHOICES
-There are a number of decisions that
-.St -p1003.2-92
-leaves up to the implementor,
-either by explicitly saying ``undefined'' or by virtue of them being
-forbidden by the RE grammar.
-This implementation treats them as follows.
-.Pp
-See
-.Xr re_format 7
-for a discussion of the definition of case-independent matching.
-.Pp
-There is no particular limit on the length of REs,
-except insofar as memory is limited.
-Memory usage is approximately linear in RE size, and largely insensitive
-to RE complexity, except for bounded repetitions.
-See BUGS for one short RE using them
-that will run almost any system out of memory.
-.Pp
-A backslashed character other than one specifically given a magic meaning
-by
-.St -p1003.2-92
-(such magic meanings occur only in obsolete [``basic''] REs)
-is taken as an ordinary character.
-.Pp
-Any unmatched [ is a
-.Dv REG_EBRACK
-error.
-.Pp
-Equivalence classes cannot begin or end bracket-expression ranges.
-The endpoint of one range cannot begin another.
-.Pp
-.Dv RE_DUP_MAX ,
-the limit on repetition counts in bounded repetitions, is 255.
-.Pp
-A repetition operator (?, *, +, or bounds) cannot follow another
-repetition operator.
-A repetition operator cannot begin an expression or subexpression
-or follow `^' or `|'.
-.Pp
-`|' cannot appear first or last in a (sub)expression or after another `|',
-i.e. an operand of `|' cannot be an empty subexpression.
-An empty parenthesized subexpression, `()', is legal and matches an
-empty (sub)string.
-An empty string is not a legal RE.
-.Pp
-A `{' followed by a digit is considered the beginning of bounds for a
-bounded repetition, which must then follow the syntax for bounds.
-A `{'
-.Em not
-followed by a digit is considered an ordinary character.
-.Pp
-`^' and `$' beginning and ending subexpressions in obsolete (``basic'')
-REs are anchors, not ordinary characters.
-.Sh DIAGNOSTICS
-Non-zero error codes from
-.Fn regcomp
-and
-.Fn regexec
-include the following:
-.Pp
-.Bl -tag -width XXXREG_ECOLLATE -compact
-.It Dv REG_NOMATCH
-.Fn regexec
-failed to match
-.It Dv REG_BADPAT
-invalid regular expression
-.It Dv REG_ECOLLATE
-invalid collating element
-.It Dv REG_ECTYPE
-invalid character class
-.It Dv REG_EESCAPE
-\e applied to unescapable character
-.It Dv REG_ESUBREG
-invalid backreference number
-.It Dv REG_EBRACK
-brackets [ ] not balanced
-.It Dv REG_EPAREN
-parentheses ( ) not balanced
-.It Dv REG_EBRACE
-braces { } not balanced
-.It Dv REG_BADBR
-invalid repetition count(s) in { }
-.It Dv REG_ERANGE
-invalid character range in [ ]
-.It Dv REG_ESPACE
-ran out of memory
-.It Dv REG_BADRPT
-?, *, or + operand invalid
-.It Dv REG_EMPTY
-empty (sub)expression
-.It Dv REG_ASSERT
-``can't happen''\(emyou found a bug
-.It Dv REG_INVARG
-invalid argument, e.g. negative-length string
-.El
-.Sh SEE ALSO
-.Xr grep 1 ,
-.Xr sed 1 ,
-.Xr re_format 7
-.Pp
-.St -p1003.2-92 ,
-sections 2.8 (Regular Expression Notation)
-and
-B.5 (C Binding for Regular Expression Matching).
-.Sh HISTORY
-Originally written by Henry Spencer.
-Altered for inclusion in the
-.Bx 4.4
-distribution.
-.Sh BUGS
-There is one known functionality bug.
-The implementation of internationalization is incomplete:
-the locale is always assumed to be the default one of
-.St -p1003.2-92 ,
-and only the collating elements etc. of that locale are available.
-.Pp
-The back-reference code is subtle and doubts linger about its correctness
-in complex cases.
-.Pp
-.Fn regexec
-performance is poor.
-This will improve with later releases.
-.Fa nmatch
-exceeding 0 is expensive;
-.Fa nmatch
-exceeding 1 is worse.
-.Fa regexec
-is largely insensitive to RE complexity
-.Em except
-that back references are massively expensive.
-RE length does matter; in particular, there is a strong speed bonus
-for keeping RE length under about 30 characters,
-with most special characters counting roughly double.
-.Pp
-.Fn regcomp
-implements bounded repetitions by macro expansion,
-which is costly in time and space if counts are large
-or bounded repetitions are nested.
-An RE like, say,
-`((((a{1,100}){1,100}){1,100}){1,100}){1,100}'
-will (eventually) run almost any existing machine out of swap space.
-.Pp
-There are suspected problems with response to obscure error conditions.
-Notably,
-certain kinds of internal overflow,
-produced only by truly enormous REs or by multiply nested bounded repetitions,
-are probably not handled well.
-.Pp
-Due to a mistake in
-.St -p1003.2-92 ,
-things like `a)b' are legal REs because `)' is a special character
-only in the presence of a previous unmatched `('.
-This can't be fixed until the spec is fixed.
-.Pp
-The standard's definition of back references is vague.
-For example, does
-`a\e(\e(b\e)*\e2\e)*d' match `abbbd'?
-Until the standard is clarified, behavior in such cases should not be
-relied on.
-.Pp
-The implementation of word-boundary matching is a bit of a kludge,
-and bugs may lurk in combinations of word-boundary matching and anchoring.
diff --git a/lib/libc/regex/regex2.h b/lib/libc/regex/regex2.h
deleted file mode 100644
index 7c877ee87..000000000
--- a/lib/libc/regex/regex2.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*	$NetBSD: regex2.h,v 1.13 2011/10/09 18:23:00 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)regex2.h	8.4 (Berkeley) 3/20/94
- */
-
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)regex2.h	8.4 (Berkeley) 3/20/94
- */
-
-/*
- * First, the stuff that ends up in the outside-world include file
- = typedef off_t regoff_t;
- = typedef struct {
- = 	int re_magic;
- = 	size_t re_nsub;		// number of parenthesized subexpressions
- = 	const char *re_endp;	// end pointer for REG_PEND
- = 	struct re_guts *re_g;	// none of your business :-)
- = } regex_t;
- = typedef struct {
- = 	regoff_t rm_so;		// start of match
- = 	regoff_t rm_eo;		// end of match
- = } regmatch_t;
- */
-/*
- * internals of regex_t
- */
-#define	MAGIC1	((('r'^0200)<<8) | 'e')
-
-/*
- * The internal representation is a *strip*, a sequence of
- * operators ending with an endmarker.  (Some terminology etc. is a
- * historical relic of earlier versions which used multiple strips.)
- * Certain oddities in the representation are there to permit running
- * the machinery backwards; in particular, any deviation from sequential
- * flow must be marked at both its source and its destination.  Some
- * fine points:
- *
- * - OPLUS_ and O_PLUS are *inside* the loop they create.
- * - OQUEST_ and O_QUEST are *outside* the bypass they create.
- * - OCH_ and O_CH are *outside* the multi-way branch they create, while
- *   OOR1 and OOR2 are respectively the end and the beginning of one of
- *   the branches.  Note that there is an implicit OOR2 following OCH_
- *   and an implicit OOR1 preceding O_CH.
- *
- * In state representations, an operator's bit is on to signify a state
- * immediately *preceding* "execution" of that operator.
- */
-typedef u_int32_t sop;	/* strip operator */
-typedef size_t sopno;
-#define	OPRMASK	((u_int32_t)0xf8000000UL)
-#define	OPDMASK	((u_int32_t)0x07ffffffUL)
-#define	OPSHIFT	((unsigned)27)
-#define	OP(n)	((n)&OPRMASK)
-#define	OPND(n)	((int)((n)&OPDMASK))
-#define	SOP(op, opnd)	((op)|(opnd))
-
-#define OPC(n)	(((u_int32_t)(n))<<OPSHIFT)
-/* operators		   meaning	operand			*/
-/*					(back, fwd are offsets)	*/
-#define	OEND	OPC(1)	/* endmarker	-			*/
-#define	OCHAR	OPC(2)	/* character	unsigned char		*/
-#define	OBOL	OPC(3)	/* left anchor	-			*/
-#define	OEOL	OPC(4)	/* right anchor	-			*/
-#define	OANY	OPC(5)	/* .		-			*/
-#define	OANYOF	OPC(6)	/* [...]	set number		*/
-#define	OBACK_	OPC(7)	/* begin \d	paren number		*/
-#define	O_BACK	OPC(8)	/* end \d	paren number		*/
-#define	OPLUS_	OPC(9)	/* + prefix	fwd to suffix		*/
-#define	O_PLUS	OPC(10)	/* + suffix	back to prefix		*/
-#define	OQUEST_	OPC(11)	/* ? prefix	fwd to suffix		*/
-#define	O_QUEST	OPC(12)	/* ? suffix	back to prefix		*/
-#define	OLPAREN	OPC(13)	/* (		fwd to )		*/
-#define	ORPAREN	OPC(14)	/* )		back to (		*/
-#define	OCH_	OPC(15)	/* begin choice	fwd to OOR2		*/
-#define	OOR1	OPC(16)	/* | pt. 1	back to OOR1 or OCH_	*/
-#define	OOR2	OPC(17)	/* | pt. 2	fwd to OOR2 or O_CH	*/
-#define	O_CH	OPC(18)	/* end choice	back to OOR1		*/
-#define	OBOW	OPC(19)	/* begin word	-			*/
-#define	OEOW	OPC(20)	/* end word	-			*/
-
-/*
- * Structure for [] character-set representation.  Character sets are
- * done as bit vectors, grouped 8 to a byte vector for compactness.
- * The individual set therefore has both a pointer to the byte vector
- * and a mask to pick out the relevant bit of each byte.  A hash code
- * simplifies testing whether two sets could be identical.
- *
- * This will get trickier for multicharacter collating elements.  As
- * preliminary hooks for dealing with such things, we also carry along
- * a string of multi-character elements, and decide the size of the
- * vectors at run time.
- */
-typedef struct {
-	uch *ptr;		/* -> uch [csetsize] */
-	uch mask;		/* bit within array */
-	uch hash;		/* hash code */
-	size_t smultis;
-	char *multis;		/* -> char[smulti]  ab\0cd\0ef\0\0 */
-} cset;
-/* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */
-#define	CHadd(cs, c)	((cs)->ptr[(uch)(c)] |= (cs)->mask, (cs)->hash += (c))
-#define	CHsub(cs, c)	((cs)->ptr[(uch)(c)] &= ~(cs)->mask, (cs)->hash -= (c))
-#define	CHIN(cs, c)	((cs)->ptr[(uch)(c)] & (cs)->mask)
-#define	MCadd(p, cs, cp)	mcadd(p, cs, cp)	/* regcomp() internal fns */
-#define	MCsub(p, cs, cp)	mcsub(p, cs, cp)
-#define	MCin(p, cs, cp)	mcin(p, cs, cp)
-
-/* stuff for character categories */
-typedef unsigned char cat_t;
-
-/*
- * main compiled-expression structure
- */
-struct re_guts {
-	int magic;
-#		define	MAGIC2	((('R'^0200)<<8)|'E')
-	sop *strip;		/* malloced area for strip */
-	size_t csetsize;	/* number of bits in a cset vector */
-	size_t ncsets;		/* number of csets in use */
-	cset *sets;		/* -> cset [ncsets] */
-	uch *setbits;		/* -> uch[csetsize][ncsets/CHAR_BIT] */
-	int cflags;		/* copy of regcomp() cflags argument */
-	sopno nstates;		/* = number of sops */
-	sopno firststate;	/* the initial OEND (normally 0) */
-	sopno laststate;	/* the final OEND */
-	int iflags;		/* internal flags */
-#		define	USEBOL	01	/* used ^ */
-#		define	USEEOL	02	/* used $ */
-#		define	BAD	04	/* something wrong */
-	size_t nbol;		/* number of ^ used */
-	size_t neol;		/* number of $ used */
-	size_t ncategories;	/* how many character categories */
-	cat_t *categories;	/* ->catspace[-CHAR_MIN] */
-	char *must;		/* match must contain this string */
-	size_t mlen;		/* length of must */
-	size_t nsub;		/* copy of re_nsub */
-	int backrefs;		/* does it use back references? */
-	sopno nplus;		/* how deep does it nest +s? */
-	/* catspace must be last */
-	cat_t catspace[1];	/* actually [NC] */
-};
-
-/* misc utilities */
-#define	OUT	(CHAR_MAX+1)	/* a non-character value */
-#define	ISWORD(c)	(isalnum((unsigned char)c) || (c) == '_')
diff --git a/lib/libc/regex/regexec.c b/lib/libc/regex/regexec.c
deleted file mode 100644
index f16e0b6b4..000000000
--- a/lib/libc/regex/regexec.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/*	$NetBSD: regexec.c,v 1.22 2012/03/13 21:13:43 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)regexec.c	8.3 (Berkeley) 3/20/94
- */
-
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)regexec.c	8.3 (Berkeley) 3/20/94
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)regexec.c	8.3 (Berkeley) 3/20/94";
-#else
-__RCSID("$NetBSD: regexec.c,v 1.22 2012/03/13 21:13:43 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * the outer shell of regexec()
- *
- * This file includes engine.c *twice*, after muchos fiddling with the
- * macros that code uses.  This lets the same code operate on two different
- * representations for state sets.
- */
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <regex.h>
-
-#ifdef __weak_alias
-__weak_alias(regexec,_regexec)
-#endif
-
-#include "utils.h"
-#include "regex2.h"
-
-/* macros for manipulating states, small version */
-#define	states	unsigned long
-#define	states1	unsigned long	/* for later use in regexec() decision */
-#define	CLEAR(v)	((v) = 0)
-#define	SET0(v, n)	((v) &= ~((unsigned long)1 << (n)))
-#define	SET1(v, n)	((v) |= (unsigned long)1 << (n))
-#define	ISSET(v, n)	(((v) & ((unsigned long)1 << (n))) != 0)
-#define	ASSIGN(d, s)	((d) = (s))
-#define	EQ(a, b)	((a) == (b))
-#define	STATEVARS	int dummy	/* dummy version */
-#define	STATESETUP(m, n)	/* nothing */
-#define	STATETEARDOWN(m)	/* nothing */
-#define	SETUP(v)	((v) = 0)
-#define	onestate	unsigned long
-#define	INIT(o, n)	((o) = (unsigned long)1 << (n))
-#define	INC(o)	((o) <<= 1)
-#define	ISSTATEIN(v, o)	(((v) & (o)) != 0)
-/* some abbreviations; note that some of these know variable names! */
-/* do "if I'm here, I can also be there" etc without branches */
-#define	FWD(dst, src, n)	((dst) |= ((unsigned long)(src)&(here)) << (n))
-#define	BACK(dst, src, n)	((dst) |= ((unsigned long)(src)&(here)) >> (n))
-#define	ISSETBACK(v, n)	(((v) & ((unsigned long)here >> (n))) != 0)
-/* function names */
-#define SNAMES			/* engine.c looks after details */
-
-#include "engine.c"
-
-/* now undo things */
-#undef	states
-#undef	CLEAR
-#undef	SET0
-#undef	SET1
-#undef	ISSET
-#undef	ASSIGN
-#undef	EQ
-#undef	STATEVARS
-#undef	STATESETUP
-#undef	STATETEARDOWN
-#undef	SETUP
-#undef	onestate
-#undef	INIT
-#undef	INC
-#undef	ISSTATEIN
-#undef	FWD
-#undef	BACK
-#undef	ISSETBACK
-#undef	SNAMES
-
-/* macros for manipulating states, large version */
-#define	states	char *
-#define	CLEAR(v)	memset(v, 0, (size_t)m->g->nstates)
-#define	SET0(v, n)	((v)[n] = 0)
-#define	SET1(v, n)	((v)[n] = 1)
-#define	ISSET(v, n)	((v)[n])
-#define	ASSIGN(d, s)	memcpy(d, s, (size_t)m->g->nstates)
-#define	EQ(a, b)	(memcmp(a, b, (size_t)m->g->nstates) == 0)
-#define	STATEVARS	int vn; char *space
-#define	STATESETUP(m, nv) \
-    if (((m)->space = malloc((size_t)((nv)*(m)->g->nstates))) == NULL) \
-	return(REG_ESPACE); \
-    else \
-	(m)->vn = 0
-
-#define	STATETEARDOWN(m)	{ free((m)->space); m->space = NULL; }
-#define	SETUP(v)	((v) = &m->space[(size_t)(m->vn++ * m->g->nstates)])
-#define	onestate	int
-#define	INIT(o, n)	((o) = (int)(n))
-#define	INC(o)	((o)++)
-#define	ISSTATEIN(v, o)	((v)[o])
-/* some abbreviations; note that some of these know variable names! */
-/* do "if I'm here, I can also be there" etc without branches */
-#define	FWD(dst, src, n)	((dst)[here+(n)] |= (src)[here])
-#define	BACK(dst, src, n)	((dst)[here-(n)] |= (src)[here])
-#define	ISSETBACK(v, n)	((v)[here - (n)])
-/* function names */
-#define	LNAMES			/* flag */
-
-#include "engine.c"
-
-/*
- - regexec - interface for matching
- = extern int regexec(const regex_t *, const char *, size_t, \
- =					regmatch_t [], int);
- = #define	REG_NOTBOL	00001
- = #define	REG_NOTEOL	00002
- = #define	REG_STARTEND	00004
- = #define	REG_TRACE	00400	// tracing of execution
- = #define	REG_LARGE	01000	// force large representation
- = #define	REG_BACKR	02000	// force use of backref code
- *
- * We put this here so we can exploit knowledge of the state representation
- * when choosing which matcher to call.  Also, by this point the matchers
- * have been prototyped.
- */
-int				/* 0 success, REG_NOMATCH failure */
-regexec(
-    const regex_t *preg,
-    const char *string,
-    size_t nmatch,
-    regmatch_t pmatch[],
-    int eflags)
-{
-	struct re_guts *g = preg->re_g;
-	char *s;
-#ifdef REDEBUG
-#	define	GOODFLAGS(f)	(f)
-#else
-#	define	GOODFLAGS(f)	((f)&(REG_NOTBOL|REG_NOTEOL|REG_STARTEND))
-#endif
-
-	_DIAGASSERT(preg != NULL);
-	_DIAGASSERT(string != NULL);
-
-	if (preg->re_magic != MAGIC1 || g->magic != MAGIC2)
-		return(REG_BADPAT);
-	assert(!(g->iflags&BAD));
-	if (g->iflags&BAD)		/* backstop for no-debug case */
-		return(REG_BADPAT);
-	eflags = GOODFLAGS(eflags);
-
-	s = __UNCONST(string);
-
-	if (g->nstates <= (sopno)(CHAR_BIT*sizeof(states1)) && !(eflags&REG_LARGE))
-		return(smatcher(g, s, nmatch, pmatch, eflags));
-	else
-		return(lmatcher(g, s, nmatch, pmatch, eflags));
-}
diff --git a/lib/libc/regex/regfree.c b/lib/libc/regex/regfree.c
deleted file mode 100644
index ce011eade..000000000
--- a/lib/libc/regex/regfree.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*	$NetBSD: regfree.c,v 1.15 2007/02/09 23:44:18 junyoung Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)regfree.c	8.3 (Berkeley) 3/20/94
- */
-
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)regfree.c	8.3 (Berkeley) 3/20/94
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)regfree.c	8.3 (Berkeley) 3/20/94";
-#else
-__RCSID("$NetBSD: regfree.c,v 1.15 2007/02/09 23:44:18 junyoung Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <regex.h>
-
-#ifdef __weak_alias
-__weak_alias(regfree,_regfree)
-#endif
-
-#include "utils.h"
-#include "regex2.h"
-
-/*
- - regfree - free everything
- = extern void regfree(regex_t *);
- */
-void
-regfree(
-    regex_t *preg)
-{
-	struct re_guts *g;
-
-	_DIAGASSERT(preg != NULL);
-
-	_DIAGASSERT(preg->re_magic == MAGIC1);
-	if (preg->re_magic != MAGIC1)	/* oops */
-		return;			/* nice to complain, but hard */
-
-	g = preg->re_g;
-	if (g == NULL || g->magic != MAGIC2)	/* oops again */
-		return;
-	preg->re_magic = 0;		/* mark it invalid */
-	g->magic = 0;			/* mark it invalid */
-
-	if (g->strip != NULL)
-		free(g->strip);
-	if (g->sets != NULL)
-		free(g->sets);
-	if (g->setbits != NULL)
-		free(g->setbits);
-	if (g->must != NULL)
-		free(g->must);
-	free(g);
-}
diff --git a/lib/libc/regex/utils.h b/lib/libc/regex/utils.h
deleted file mode 100644
index 762caeeb6..000000000
--- a/lib/libc/regex/utils.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*	$NetBSD: utils.h,v 1.6 2003/08/07 16:43:21 agc Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)utils.h	8.3 (Berkeley) 3/20/94
- */
-
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)utils.h	8.3 (Berkeley) 3/20/94
- */
-
-/* utility definitions */
-#define	DUPMAX		_POSIX2_RE_DUP_MAX	/* xxx is this right? */
-#define	INFINITY	(DUPMAX + 1)
-#define	NC		(CHAR_MAX - CHAR_MIN + 1)
-typedef unsigned char uch;
-
-/* switch off assertions (if not already off) if no REDEBUG */
-#ifndef REDEBUG
-#ifndef NDEBUG
-#define	NDEBUG	/* no assertions please */
-#endif
-#endif
-#include <assert.h>
-
-/* for old systems with bcopy() but no memmove() */
-#ifdef USEBCOPY
-#define	memmove(d, s, c)	bcopy(s, d, c)
-#endif
diff --git a/lib/libc/resolv/Makefile.inc b/lib/libc/resolv/Makefile.inc
deleted file mode 100644
index e4c560222..000000000
--- a/lib/libc/resolv/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2014/01/16 20:31:43 christos Exp $
-
-# net sources
-.PATH: ${.CURDIR}/resolv
-.if defined(__MINIX)
-CPPFLAGS+=-DCOMPAT__RES -DUSE_SELECT -DNEED_PSELECT
-.else
-CPPFLAGS+=-DCOMPAT__RES -DUSE_POLL
-.endif
-
-SRCS+=	h_errno.c herror.c res_comp.c res_data.c res_debug.c \
-	res_init.c res_mkquery.c res_query.c res_send.c \
-	res_state.c mtctxres.c
-# For COMPAT__RES
-SRCS+=	res_compat.c
diff --git a/lib/libc/resolv/h_errno.c b/lib/libc/resolv/h_errno.c
deleted file mode 100644
index ec18d35f7..000000000
--- a/lib/libc/resolv/h_errno.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: h_errno.c,v 1.3 2008/06/21 20:41:48 christos Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: h_errno.c,v 1.3 2008/06/21 20:41:48 christos Exp $");
-#endif
-
-#include <sys/types.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-#include <netdb.h>
-
-#undef h_errno
-
-extern int h_errno;
-extern struct __res_state _nres;
-
-int *
-__h_errno(void)
-{
-	return &_nres.res_h_errno;
-}
-
-void
-__h_errno_set(res_state res, int err)
-{
-	h_errno = res->res_h_errno = err;
-}
diff --git a/lib/libc/resolv/herror.c b/lib/libc/resolv/herror.c
deleted file mode 100644
index 4ce1a82fd..000000000
--- a/lib/libc/resolv/herror.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*	$NetBSD: herror.c,v 1.10 2015/02/24 17:56:20 christos Exp $	*/
-
-/*
- * Copyright (c) 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.
- * 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.
- */
-
-/*
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static const char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "Id: herror.c,v 1.4 2005/04/27 04:56:41 sra Exp";
-#else
-__RCSID("$NetBSD: herror.c,v 1.10 2015/02/24 17:56:20 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <netdb.h>
-#include <resolv.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "port_after.h"
-
-const char *h_errlist[] = {
-	"Resolver Error 0 (no error)",
-	"Unknown host",				/*%< 1 HOST_NOT_FOUND */
-	"Host name lookup failure",		/*%< 2 TRY_AGAIN */
-	"Unknown server error",			/*%< 3 NO_RECOVERY */
-	"No address associated with name",	/*%< 4 NO_ADDRESS */
-};
-int	h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
-
-#if !(__GLIBC__ > 2 || __GLIBC__ == 2 &&  __GLIBC_MINOR__ >= 3)
-#undef	h_errno
-int	h_errno;
-#endif
-
-#ifdef __weak_alias
-__weak_alias(herror,_herror)
-#endif
-
-/*%
- * herror --
- *	print the error indicated by the h_errno value.
- */
-void
-herror(const char *s) {
-	struct iovec iov[4], *v = iov;
-	char *t;
-
-	if (s != NULL && *s != '\0') {
-		DE_CONST(s, t);
-		v->iov_base = t;
-		v->iov_len = strlen(t);
-		v++;
-		DE_CONST(": ", t);
-		v->iov_base = t;
-		v->iov_len = 2;
-		v++;
-	}
-	DE_CONST(hstrerror(*__h_errno()), t);
-	v->iov_base = t;
-	v->iov_len = strlen(v->iov_base);
-	v++;
-	DE_CONST("\n", t);
-	v->iov_base = t;
-	v->iov_len = 1;
-	(void)writev(STDERR_FILENO, iov, (int)((v - iov) + 1));
-}
-
-/*%
- * hstrerror --
- *	return the string associated with a given "host" errno value.
- */
-const char *
-hstrerror(int err) {
-	if (err < 0)
-		return ("Resolver internal error");
-	else if (err < h_nerr)
-		return (h_errlist[err]);
-	return ("Unknown resolver error");
-}
-
-/*! \file */
diff --git a/lib/libc/resolv/mtctxres.c b/lib/libc/resolv/mtctxres.c
deleted file mode 100644
index 6e3281a75..000000000
--- a/lib/libc/resolv/mtctxres.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*	$NetBSD: mtctxres.c,v 1.4 2007/03/30 20:40:52 ghen Exp $	*/
-
-#include <port_before.h>
-#ifdef DO_PTHREADS
-#include <pthread.h>
-#endif
-#include <errno.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <string.h>
-#include <resolv_mt.h>
-#include <port_after.h>
-
-#ifdef DO_PTHREADS
-static pthread_key_t	key;
-static int		mt_key_initialized = 0;
-
-static int		__res_init_ctx(void);
-static void		__res_destroy_ctx(void *);
-
-#if defined(sun) && !defined(__GNUC__)
-#pragma init	(_mtctxres_init)
-#endif
-#endif
-
-static mtctxres_t	sharedctx;
-
-#ifdef DO_PTHREADS
-/*
- * Initialize the TSD key. By doing this at library load time, we're
- * implicitly running without interference from other threads, so there's
- * no need for locking.
- */
-static void
-_mtctxres_init(void) {
-	int pthread_keycreate_ret;
-
-	pthread_keycreate_ret = pthread_key_create(&key, __res_destroy_ctx);
-	if (pthread_keycreate_ret == 0)
-		mt_key_initialized = 1;
-}
-#endif
-
-/*
- * To support binaries that used the private MT-safe interface in
- * Solaris 8, we still need to provide the __res_enable_mt()
- * and __res_disable_mt() entry points. They're do-nothing routines.
- */
-int
-__res_enable_mt(void) {
-	return (-1);
-}
-
-int
-__res_disable_mt(void) {
-	return (0);
-}
-
-#ifdef DO_PTHREADS
-static int
-__res_init_ctx(void) {
-
-	mtctxres_t	*mt;
-	int		ret;
-
-
-	if (pthread_getspecific(key) != 0) {
-		/* Already exists */
-		return (0);
-	}
-
-	if ((mt = malloc(sizeof (mtctxres_t))) == 0) {
-		errno = ENOMEM;
-		return (-1);
-	}
-
-	memset(mt, 0, sizeof (mtctxres_t));
-
-	if ((ret = pthread_setspecific(key, mt)) != 0) {
-		free(mt);
-		errno = ret;
-		return (-1);
-	}
-
-	return (0);
-}
-
-static void
-__res_destroy_ctx(void *value) {
-
-	mtctxres_t	*mt = (mtctxres_t *)value;
-
-	if (mt != 0)
-		free(mt);
-}
-#endif
-
-mtctxres_t *
-___mtctxres(void) {
-#ifdef DO_PTHREADS
-	mtctxres_t	*mt;
-
-	/*
-	 * This if clause should only be executed if we are linking
-	 * statically.  When linked dynamically _mtctxres_init() should
-	 * be called at binding time due the #pragma above.
-	 */
-	if (!mt_key_initialized) {
-		static pthread_mutex_t keylock = PTHREAD_MUTEX_INITIALIZER;
-                if (pthread_mutex_lock(&keylock) == 0) {
-			_mtctxres_init();
-			(void) pthread_mutex_unlock(&keylock);
-		}
-	}
-
-	/*
-	 * If we have already been called in this thread return the existing
-	 * context.  Otherwise recreat a new context and return it.  If
-	 * that fails return a global context.
-	 */
-	if (mt_key_initialized) {
-		if (((mt = pthread_getspecific(key)) != 0) ||
-		    (__res_init_ctx() == 0 &&
-		     (mt = pthread_getspecific(key)) != 0)) {
-			return (mt);
-		}
-	}
-#endif
-	return (&sharedctx);
-}
diff --git a/lib/libc/resolv/res_comp.c b/lib/libc/resolv/res_comp.c
deleted file mode 100644
index a7d273178..000000000
--- a/lib/libc/resolv/res_comp.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*	$NetBSD: res_comp.c,v 1.13 2015/02/24 17:56:20 christos Exp $	*/
-
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-/*
- * 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
- * CORPORATION 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) 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.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static const char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "Id: res_comp.c,v 1.5 2005/07/28 06:51:50 marka Exp";
-#else
-__RCSID("$NetBSD: res_comp.c,v 1.13 2015/02/24 17:56:20 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <assert.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include "port_after.h"
-
-#ifdef __weak_alias
-__weak_alias(dn_expand,_dn_expand)
-__weak_alias(dn_comp,__dn_comp)
-#if defined(__minix)
-__weak_alias(dn_skipname,__dn_skipname)
-__weak_alias(res_hnok,__res_hnok)
-__weak_alias(res_ownok,__res_ownok)
-__weak_alias(res_mailok,__res_mailok)
-__weak_alias(res_dnok,__res_dnok)
-#endif /* defined(__minix) */
-#endif
-
-/*%
- * Expand compressed domain name 'src' to full domain name.
- *
- * \li 'msg' is a pointer to the begining of the message,
- * \li 'eom' points to the first location after the message,
- * \li 'dst' is a pointer to a buffer of size 'dstsiz' for the result.
- * \li Return size of compressed name or -1 if there was an error.
- */
-int
-dn_expand(const u_char *msg, const u_char *eom, const u_char *src,
-	  char *dst, int dstsiz)
-{
-	int n = ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz);
-
-	if (n > 0 && dst[0] == '.')
-		dst[0] = '\0';
-	return (n);
-}
-
-/*%
- * Pack domain name 'exp_dn' in presentation form into 'comp_dn'.
- *
- * \li Return the size of the compressed name or -1.
- * \li 'length' is the size of the array pointed to by 'comp_dn'.
- */
-int
-dn_comp(const char *src, u_char *dst, int dstsiz,
-	u_char **dnptrs, u_char **lastdnptr)
-{
-	return (ns_name_compress(src, dst, (size_t)dstsiz,
-				 (void *)dnptrs,
-				 (void *)lastdnptr));
-}
-
-/*%
- * Skip over a compressed domain name. Return the size or -1.
- */
-int
-dn_skipname(const u_char *ptr, const u_char *eom) {
-	const u_char *saveptr = ptr;
-
-	if (ns_name_skip(&ptr, eom) == -1)
-		return (-1);
-	_DIAGASSERT(__type_fit(int, ptr - saveptr));
-	return (int)(ptr - saveptr);
-}
-
-/*%
- * Verify that a domain name uses an acceptable character set.
- *
- * Note the conspicuous absence of ctype macros in these definitions.  On
- * non-ASCII hosts, we can't depend on string literals or ctype macros to
- * tell us anything about network-format data.  The rest of the BIND system
- * is not careful about this, but for some reason, we're doing it right here.
- */
-#define PERIOD 0x2e
-#define	hyphenchar(c) ((c) == 0x2d)
-#define bslashchar(c) ((c) == 0x5c)
-#define periodchar(c) ((c) == PERIOD)
-#define asterchar(c) ((c) == 0x2a)
-#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) \
-		   || ((c) >= 0x61 && (c) <= 0x7a))
-#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
-
-#define borderchar(c) (alphachar(c) || digitchar(c))
-#define middlechar(c) (borderchar(c) || hyphenchar(c))
-#define	domainchar(c) ((c) > 0x20 && (c) < 0x7f)
-
-int
-res_hnok(const char *dn) {
-	int pch = PERIOD, ch = *dn++;
-
-	while (ch != '\0') {
-		int nch = *dn++;
-
-		if (periodchar(ch)) {
-			;
-		} else if (periodchar(pch)) {
-			if (!borderchar(ch))
-				return (0);
-		} else if (periodchar(nch) || nch == '\0') {
-			if (!borderchar(ch))
-				return (0);
-		} else {
-			if (!middlechar(ch))
-				return (0);
-		}
-		pch = ch, ch = nch;
-	}
-	return (1);
-}
-
-/*%
- * hostname-like (A, MX, WKS) owners can have "*" as their first label
- * but must otherwise be as a host name.
- */
-int
-res_ownok(const char *dn) {
-	if (asterchar(dn[0])) {
-		if (periodchar(dn[1]))
-			return (res_hnok(dn+2));
-		if (dn[1] == '\0')
-			return (1);
-	}
-	return (res_hnok(dn));
-}
-
-/*%
- * SOA RNAMEs and RP RNAMEs can have any printable character in their first
- * label, but the rest of the name has to look like a host name.
- */
-int
-res_mailok(const char *dn) {
-	int ch, escaped = 0;
-
-	/* "." is a valid missing representation */
-	if (*dn == '\0')
-		return (1);
-
-	/* otherwise <label>.<hostname> */
-	while ((ch = *dn++) != '\0') {
-		if (!domainchar(ch))
-			return (0);
-		if (!escaped && periodchar(ch))
-			break;
-		if (escaped)
-			escaped = 0;
-		else if (bslashchar(ch))
-			escaped = 1;
-	}
-	if (periodchar(ch))
-		return (res_hnok(dn));
-	return (0);
-}
-
-/*%
- * This function is quite liberal, since RFC1034's character sets are only
- * recommendations.
- */
-int
-res_dnok(const char *dn) {
-	int ch;
-
-	while ((ch = *dn++) != '\0')
-		if (!domainchar(ch))
-			return (0);
-	return (1);
-}
-
-#ifdef BIND_4_COMPAT
-/*%
- * This module must export the following externally-visible symbols:
- *	___putlong
- *	___putshort
- *	__getlong
- *	__getshort
- * Note that one _ comes from C and the others come from us.
- */
-
-#ifdef SOLARIS2
-#ifdef  __putlong
-#undef  __putlong
-#endif
-#ifdef  __putshort
-#undef  __putshort
-#endif
-#pragma weak    putlong         =       __putlong
-#pragma weak    putshort        =       __putshort
-#endif /* SOLARIS2 */
-
-void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); }
-void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); }
-#ifndef __ultrix__
-u_int32_t _getlong(const u_char *src) { return (ns_get32(src)); }
-u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); }
-#endif /*__ultrix__*/
-#endif /*BIND_4_COMPAT*/
-
-/*! \file */
diff --git a/lib/libc/resolv/res_compat.c b/lib/libc/resolv/res_compat.c
deleted file mode 100644
index 01e30d254..000000000
--- a/lib/libc/resolv/res_compat.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: res_compat.c,v 1.3 2009/11/22 18:04:37 mbalmer Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: res_compat.c,v 1.3 2009/11/22 18:04:37 mbalmer Exp $");
-#endif
-
-#include <sys/types.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <string.h>
-#define __OLD_RES_STATE
-#include <resolv.h>
-
-#undef _res
-
-/*
- * Binary Compatibility; this symbol does not appear in a header file
- * Most userland programs use this to set res_options before res_init()
- * is called. There are hooks to res_init() to consult the data in this
- * structure. The hooks are provided indirectly by the two functions below.
- * We depend on the fact the first 440 [32 bit machines] bytes are
- * shared between the two structures.
- */
-#ifndef __BIND_NOSTATIC 
-struct __res_state _res
-#if defined(__BIND_RES_TEXT)
-	= { RES_TIMEOUT, }      /* Motorola, et al. */
-# endif 
-;
-
-void *__res_get_old_state(void);
-void __res_put_old_state(void *);
-
-void *
-__res_get_old_state(void)
-{
-	return &_res;
-}
-
-void
-__res_put_old_state(void *res)
-{
-	(void)memcpy(&_res, res, sizeof(_res));
-}
-#endif
diff --git a/lib/libc/resolv/res_data.c b/lib/libc/resolv/res_data.c
deleted file mode 100644
index 53c7e47a4..000000000
--- a/lib/libc/resolv/res_data.c
+++ /dev/null
@@ -1,363 +0,0 @@
-/*	$NetBSD: res_data.c,v 1.14 2009/10/24 05:35:37 christos Exp $	*/
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995-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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static const char rcsid[] = "Id: res_data.c,v 1.7 2008/12/11 09:59:00 marka Exp";
-#else
-__RCSID("$NetBSD: res_data.c,v 1.14 2009/10/24 05:35:37 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <res_update.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "port_after.h"
-
-#include "res_private.h"
-
-#ifdef __weak_alias
-__weak_alias(res_init,_res_init)
-__weak_alias(res_mkquery,_res_mkquery)
-__weak_alias(res_query,_res_query)
-__weak_alias(res_search,_res_search)
-__weak_alias(res_send,__res_send)
-__weak_alias(res_close,__res_close)
-/* XXX: these leaked in the old bind8 libc */
-__weak_alias(res_querydomain,__res_querydomain)
-__weak_alias(res_send_setqhook,__res_send_setqhook)
-__weak_alias(res_send_setrhook,__res_send_setrhook)
-#if 0
-__weak_alias(p_query,__p_query)
-__weak_alias(fp_query,__fp_query)
-__weak_alias(fp_nquery,__fp_nquery)
-__weak_alias(res_isourserver,__res_isourserver)
-__weak_alias(res_opt,_res_opt)
-__weak_alias(hostalias,__hostalias)
-#endif
-#endif
-
-const char *_res_opcodes[] = {
-	"QUERY",
-	"IQUERY",
-	"CQUERYM",
-	"CQUERYU",	/*%< experimental */
-	"NOTIFY",	/*%< experimental */
-	"UPDATE",
-	"6",
-	"7",
-	"8",
-	"9",
-	"10",
-	"11",
-	"12",
-	"13",
-	"ZONEINIT",
-	"ZONEREF",
-};
-
-#ifdef BIND_UPDATE
-const char *_res_sectioncodes[] = {
-	"ZONE",
-	"PREREQUISITES",
-	"UPDATE",
-	"ADDITIONAL",
-};
-#endif
-
-#ifndef __BIND_NOSTATIC 
-extern struct __res_state _nres;
-
-/* Proto. */
-
-int  res_ourserver_p(const res_state, const struct sockaddr *);
-
-int
-res_init(void) {
-	int rv;
-#ifdef COMPAT__RES
-	/*
-	 * Compatibility with program that were accessing _res directly
-	 * to set options. We keep another struct res that is the same
-	 * size as the original res structure, and then copy fields to
-	 * it so that we achieve the same initialization
-	 */
-	extern void *__res_get_old_state(void);
-	extern void __res_put_old_state(void *);
-	res_state ores = __res_get_old_state();
-
-	if (ores->options != 0)
-		_nres.options = ores->options;
-	if (ores->retrans != 0)
-		_nres.retrans = ores->retrans;
-	if (ores->retry != 0)
-		_nres.retry = ores->retry;
-#endif
-
-	/*
-	 * These three fields used to be statically initialized.  This made
-	 * it hard to use this code in a shared library.  It is necessary,
-	 * now that we're doing dynamic initialization here, that we preserve
-	 * the old semantics: if an application modifies one of these three
-	 * fields of _res before res_init() is called, res_init() will not
-	 * alter them.  Of course, if an application is setting them to
-	 * _zero_ before calling res_init(), hoping to override what used
-	 * to be the static default, we can't detect it and unexpected results
-	 * will follow.  Zero for any of these fields would make no sense,
-	 * so one can safely assume that the applications were already getting
-	 * unexpected results.
-	 *
-	 * _nres.options is tricky since some apps were known to diddle the bits
-	 * before res_init() was first called. We can't replicate that semantic
-	 * with dynamic initialization (they may have turned bits off that are
-	 * set in RES_DEFAULT).  Our solution is to declare such applications
-	 * "broken".  They could fool us by setting RES_INIT but none do (yet).
-	 */
-	if (!_nres.retrans)
-		_nres.retrans = RES_TIMEOUT;
-	if (!_nres.retry)
-		_nres.retry = 4;
-	if (!(_nres.options & RES_INIT))
-		_nres.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 (!_nres.id)
-		_nres.id = res_nrandomid(&_nres);
-
-	rv = __res_vinit(&_nres, 1);
-#ifdef COMPAT__RES
-	__res_put_old_state(&_nres);
-#endif
-	return rv;
-}
-
-void
-p_query(const u_char *msg) {
-	fp_query(msg, stdout);
-}
-
-void
-fp_query(const u_char *msg, FILE *file) {
-	fp_nquery(msg, PACKETSZ, file);
-}
-
-void
-fp_nquery(const u_char *msg, int len, FILE *file) {
-	if ((_nres.options & RES_INIT) == 0U && res_init() == -1)
-		return;
-
-	res_pquery(&_nres, msg, len, file);
-}
-
-int
-res_mkquery(int op,			/*!< opcode of query  */
-	    const char *dname,		/*!< domain name  */
-	    int class, int type,	/*!< class and type of query  */
-	    const u_char *data,		/*!< resource record data  */
-	    int datalen,		/*!< length of data  */
-	    const u_char *newrr_in,	/*!< new rr for modify or append  */
-	    u_char *buf,		/*!< buffer to put query  */
-	    int buflen)			/*!< size of buffer  */
-{
-	if ((_nres.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_nres, NETDB_INTERNAL);
-		return (-1);
-	}
-	return (res_nmkquery(&_nres, op, dname, class, type,
-			     data, datalen,
-			     newrr_in, buf, buflen));
-}
-
-#ifdef _LIBRESOLV
-int
-res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
-	if ((_nres.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_nres, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	return (res_nmkupdate(&_nres, rrecp_in, buf, buflen));
-}
-#endif
-
-int
-res_query(const char *name,	/*!< domain name  */
-	  int class, int type,	/*!< class and type of query  */
-	  u_char *answer,	/*!< buffer to put answer  */
-	  int anslen)		/*!< size of answer buffer  */
-{
-	if ((_nres.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_nres, NETDB_INTERNAL);
-		return (-1);
-	}
-	return (res_nquery(&_nres, name, class, type, answer, anslen));
-}
-
-void
-res_send_setqhook(res_send_qhook hook) {
-	_nres.qhook = hook;
-}
-
-void
-res_send_setrhook(res_send_rhook hook) {
-	_nres.rhook = hook;
-}
-
-int
-res_isourserver(const struct sockaddr_in *inp) {
-	return (res_ourserver_p(&_nres, (const struct sockaddr *)(const void *)inp));
-}
-
-int
-res_send(const u_char *buf, int buflen, u_char *ans, int anssiz) {
-	if ((_nres.options & RES_INIT) == 0U && res_init() == -1) {
-		/* errno should have been set by res_init() in this case. */
-		return (-1);
-	}
-
-	return (res_nsend(&_nres, buf, buflen, ans, anssiz));
-}
-
-#ifdef _LIBRESOLV
-int
-res_sendsigned(const u_char *buf, int buflen, ns_tsig_key *key,
-	       u_char *ans, int anssiz)
-{
-	if ((_nres.options & RES_INIT) == 0U && res_init() == -1) {
-		/* errno should have been set by res_init() in this case. */
-		return (-1);
-	}
-
-	return (res_nsendsigned(&_nres, buf, buflen, key, ans, anssiz));
-}
-#endif
-
-void
-res_close(void) {
-	res_nclose(&_nres);
-}
-
-#ifdef _LIBRESOLV
-int
-res_update(ns_updrec *rrecp_in) {
-	if ((_nres.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_nres, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	return (res_nupdate(&_nres, rrecp_in, NULL));
-}
-#endif
-
-int
-res_search(const char *name,	/*!< domain name  */
-	   int class, int type,	/*!< class and type of query  */
-	   u_char *answer,	/*!< buffer to put answer  */
-	   int anslen)		/*!< size of answer  */
-{
-	if ((_nres.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_nres, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	return (res_nsearch(&_nres, name, class, type, answer, anslen));
-}
-
-int
-res_querydomain(const char *name,
-		const char *domain,
-		int class, int type,	/*!< class and type of query  */
-		u_char *answer,		/*!< buffer to put answer  */
-		int anslen)		/*!< size of answer  */
-{
-	if ((_nres.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_nres, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	return (res_nquerydomain(&_nres, name, domain,
-				 class, type,
-				 answer, anslen));
-}
-
-int
-res_opt(int a, u_char *b, int c, int d)
-{
-	return res_nopt(&_nres, a, b, c, d);
-}
-
-u_int
-res_randomid(void) {
-	if ((_nres.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
-		return (u_int)-1;
-	}
-
-	return (res_nrandomid(&_nres));
-}
-
-const char *
-hostalias(const char *name) {
-	static char abuf[MAXDNAME];
-
-	return (res_hostalias(&_nres, name, abuf, sizeof abuf));
-}
-
-#ifdef ultrix
-int
-local_hostname_length(const char *hostname) {
-	int len_host, len_domain;
-
-	if (!*_nres.defdname)
-		res_init();
-	len_host = strlen(hostname);
-	len_domain = strlen(_nres.defdname);
-	if (len_host > len_domain &&
-	    !strcasecmp(hostname + len_host - len_domain, _nres.defdname) &&
-	    hostname[len_host - len_domain - 1] == '.')
-		return (len_host - len_domain - 1);
-	return (0);
-}
-#endif /*ultrix*/
-
-#endif
-
-/*! \file */
diff --git a/lib/libc/resolv/res_debug.c b/lib/libc/resolv/res_debug.c
deleted file mode 100644
index f95d69b63..000000000
--- a/lib/libc/resolv/res_debug.c
+++ /dev/null
@@ -1,1244 +0,0 @@
-/*	$NetBSD: res_debug.c,v 1.14 2015/02/24 17:56:20 christos Exp $	*/
-
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-/*
- * 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
- * CORPORATION 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.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static const char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "Id: res_debug.c,v 1.19 2009/02/26 11:20:20 tbox Exp";
-#else
-__RCSID("$NetBSD: res_debug.c,v 1.14 2015/02/24 17:56:20 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <math.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <resolv_mt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) sprintf x
-#endif
-
-extern const char *_res_opcodes[];
-extern const char *_res_sectioncodes[];
-
-#if 0
-#ifdef __weak_alias
-__weak_alias(res_pquery,__res_pquery)
-__weak_alias(res_nametoclass,__res_nametoclass)
-__weak_alias(res_nametotype,__res_nametotype)
-#endif
-#endif
-
-#ifndef _LIBC
-/*%
- * Print the current options.
- */
-void
-fp_resstat(const res_state statp, FILE *file) {
-	u_long mask;
-
-	fprintf(file, ";; res options:");
-	for (mask = 1;  mask != 0U;  mask <<= 1)
-		if (statp->options & mask)
-			fprintf(file, " %s", p_option(mask));
-	putc('\n', file);
-}
-#endif
-
-static void
-do_section(const res_state statp,
-	   ns_msg *handle, ns_sect section,
-	   int pflag, FILE *file)
-{
-	int n, sflag, rrnum;
-	static int buflen = 2048;
-	char *buf;
-	ns_opcode opcode;
-	ns_rr rr;
-
-	/*
-	 * Print answer records.
-	 */
-	sflag = (int)(statp->pfcode & pflag);
-	if (statp->pfcode && !sflag)
-		return;
-
-	buf = malloc((size_t)buflen);
-	if (buf == NULL) {
-		fprintf(file, ";; memory allocation failure\n");
-		return;
-	}
-
-	opcode = (ns_opcode) ns_msg_getflag(*handle, ns_f_opcode);
-	rrnum = 0;
-	for (;;) {
-		if (ns_parserr(handle, section, rrnum, &rr)) {
-			if (errno != ENODEV)
-				fprintf(file, ";; ns_parserr: %s\n",
-					strerror(errno));
-			else if (rrnum > 0 && sflag != 0 &&
-				 (statp->pfcode & RES_PRF_HEAD1))
-				putc('\n', file);
-			goto cleanup;
-		}
-		if (rrnum == 0 && sflag != 0 && (statp->pfcode & RES_PRF_HEAD1))
-			fprintf(file, ";; %s SECTION:\n",
-				p_section(section, opcode));
-		if (section == ns_s_qd)
-			fprintf(file, ";;\t%s, type = %s, class = %s\n",
-				ns_rr_name(rr),
-				p_type(ns_rr_type(rr)),
-				p_class(ns_rr_class(rr)));
-		else if (section == ns_s_ar && ns_rr_type(rr) == ns_t_opt) {
-			size_t rdatalen, ttl;
-			uint16_t optcode, optlen;
-
-			rdatalen = ns_rr_rdlen(rr);
-			ttl = ns_rr_ttl(rr);
-
-			fprintf(file,
-				"; EDNS: version: %zu, udp=%u, flags=%04zx\n",
-				(ttl>>16)&0xff, ns_rr_class(rr), ttl&0xffff);
-
-			while (rdatalen >= 4) {
-				const u_char *cp = ns_rr_rdata(rr);
-				int i;
-
-				GETSHORT(optcode, cp);
-				GETSHORT(optlen, cp);
-
-				if (optcode == NS_OPT_NSID) {
-					fputs("; NSID: ", file);
-					if (optlen == 0) {
-						fputs("; NSID\n", file);
-					} else {
-						fputs("; NSID: ", file);
-						for (i = 0; i < optlen; i++)
-							fprintf(file, "%02x ",
-								cp[i]);
-						fputs(" (",file);
-						for (i = 0; i < optlen; i++)
-							fprintf(file, "%c",
-								isprint(cp[i])?
-								cp[i] : '.');
-						fputs(")\n", file);
-					}
-				} else {
-					if (optlen == 0) {
-						fprintf(file, "; OPT=%u\n",
-							optcode);
-					} else {
-						fprintf(file, "; OPT=%u: ",
-							optcode);
-						for (i = 0; i < optlen; i++)
-							fprintf(file, "%02x ",
-								cp[i]);
-						fputs(" (",file);
-						for (i = 0; i < optlen; i++)
-							fprintf(file, "%c",
-								isprint(cp[i]) ?
-									cp[i] : '.');
-						fputs(")\n", file);
-					}
-				}
-				rdatalen -= 4 + optlen;
-			}
-		} else {
-			n = ns_sprintrr(handle, &rr, NULL, NULL,
-					buf, (u_int)buflen);
-			if (n < 0) {
-				if (errno == ENOSPC) {
-					free(buf);
-					buf = NULL;
-					if (buflen < 131072)
-						buf = malloc((size_t)(buflen += 1024));
-					if (buf == NULL) {
-						fprintf(file,
-					      ";; memory allocation failure\n");
-					      return;
-					}
-					continue;
-				}
-				fprintf(file, ";; ns_sprintrr: %s\n",
-					strerror(errno));
-				goto cleanup;
-			}
-			fputs(buf, file);
-			fputc('\n', file);
-		}
-		rrnum++;
-	}
- cleanup:
-	if (buf != NULL)
-		free(buf);
-}
-
-/*%
- * Print the contents of a query.
- * This is intended to be primarily a debugging routine.
- */
-void
-res_pquery(const res_state statp, const u_char *msg, int len, FILE *file) {
-	ns_msg handle;
-	int qdcount, ancount, nscount, arcount;
-	u_int opcode, rcode, id;
-
-	if (ns_initparse(msg, len, &handle) < 0) {
-		fprintf(file, ";; ns_initparse: %s\n", strerror(errno));
-		return;
-	}
-	opcode = ns_msg_getflag(handle, ns_f_opcode);
-	rcode = ns_msg_getflag(handle, ns_f_rcode);
-	id = ns_msg_id(handle);
-	qdcount = ns_msg_count(handle, ns_s_qd);
-	ancount = ns_msg_count(handle, ns_s_an);
-	nscount = ns_msg_count(handle, ns_s_ns);
-	arcount = ns_msg_count(handle, ns_s_ar);
-
-	/*
-	 * Print header fields.
-	 */
-	if ((!statp->pfcode) || (statp->pfcode & RES_PRF_HEADX) || rcode)
-		fprintf(file,
-			";; ->>HEADER<<- opcode: %s, status: %s, id: %d\n",
-			_res_opcodes[opcode], p_rcode((int)rcode), id);
-	if ((!statp->pfcode) || (statp->pfcode & RES_PRF_HEADX))
-		putc(';', file);
-	if ((!statp->pfcode) || (statp->pfcode & RES_PRF_HEAD2)) {
-		fprintf(file, "; flags:");
-		if (ns_msg_getflag(handle, ns_f_qr))
-			fprintf(file, " qr");
-		if (ns_msg_getflag(handle, ns_f_aa))
-			fprintf(file, " aa");
-		if (ns_msg_getflag(handle, ns_f_tc))
-			fprintf(file, " tc");
-		if (ns_msg_getflag(handle, ns_f_rd))
-			fprintf(file, " rd");
-		if (ns_msg_getflag(handle, ns_f_ra))
-			fprintf(file, " ra");
-		if (ns_msg_getflag(handle, ns_f_z))
-			fprintf(file, " ??");
-		if (ns_msg_getflag(handle, ns_f_ad))
-			fprintf(file, " ad");
-		if (ns_msg_getflag(handle, ns_f_cd))
-			fprintf(file, " cd");
-	}
-	if ((!statp->pfcode) || (statp->pfcode & RES_PRF_HEAD1)) {
-		fprintf(file, "; %s: %d",
-			p_section(ns_s_qd, (int)opcode), qdcount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_an, (int)opcode), ancount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_ns, (int)opcode), nscount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_ar, (int)opcode), arcount);
-	}
-	if ((!statp->pfcode) || (statp->pfcode &
-		(RES_PRF_HEADX | RES_PRF_HEAD2 | RES_PRF_HEAD1))) {
-		putc('\n',file);
-	}
-	/*
-	 * Print the various sections.
-	 */
-	do_section(statp, &handle, ns_s_qd, RES_PRF_QUES, file);
-	do_section(statp, &handle, ns_s_an, RES_PRF_ANS, file);
-	do_section(statp, &handle, ns_s_ns, RES_PRF_AUTH, file);
-	do_section(statp, &handle, ns_s_ar, RES_PRF_ADD, file);
-	if (qdcount == 0 && ancount == 0 &&
-	    nscount == 0 && arcount == 0)
-		putc('\n', file);
-}
-
-const u_char *
-p_cdnname(const u_char *cp, const u_char *msg, int len, FILE *file) {
-	char name[MAXDNAME];
-	int n;
-
-	if ((n = dn_expand(msg, msg + len, cp, name, (int)sizeof name)) < 0)
-		return (NULL);
-	if (name[0] == '\0')
-		putc('.', file);
-	else
-		fputs(name, file);
-	return (cp + n);
-}
-
-const u_char *
-p_cdname(const u_char *cp, const u_char *msg, FILE *file) {
-	return (p_cdnname(cp, msg, PACKETSZ, file));
-}
-
-/*%
- * Return a fully-qualified domain name from a compressed name (with
-   length supplied).  */
-
-const u_char *
-p_fqnname(const u_char *cp, const u_char *msg, int msglen, char *name,
-    int namelen)
-{
-	int n;
-	size_t newlen;
-
-	if ((n = dn_expand(msg, cp + msglen, cp, name, namelen)) < 0)
-		return (NULL);
-	newlen = strlen(name);
-	if (newlen == 0 || name[newlen - 1] != '.') {
-		if ((int)newlen + 1 >= namelen)	/*%< Lack space for final dot */
-			return (NULL);
-		else
-			strcpy(name + newlen, ".");
-	}
-	return (cp + n);
-}
-
-/* XXX:	the rest of these functions need to become length-limited, too. */
-
-const u_char *
-p_fqname(const u_char *cp, const u_char *msg, FILE *file) {
-	char name[MAXDNAME];
-	const u_char *n;
-
-	n = p_fqnname(cp, msg, MAXCDNAME, name, (int)sizeof name);
-	if (n == NULL)
-		return (NULL);
-	fputs(name, file);
-	return (n);
-}
-
-/*%
- * Names of RR classes and qclasses.  Classes and qclasses are the same, except
- * that C_ANY is a qclass but not a class.  (You can ask for records of class
- * C_ANY, but you can't have any records of that class in the database.)
- */
-const struct res_sym __p_class_syms[] = {
-	{C_IN,		"IN",		(char *)0},
-	{C_CHAOS,	"CH",		(char *)0},
-	{C_CHAOS,	"CHAOS",	(char *)0},
-	{C_HS,		"HS",		(char *)0},
-	{C_HS,		"HESIOD",	(char *)0},
-	{C_ANY,		"ANY",		(char *)0},
-	{C_NONE,	"NONE",		(char *)0},
-	{C_IN, 		(char *)0,	(char *)0}
-};
-
-/*%
- * Names of message sections.
- */
-const struct res_sym __p_default_section_syms[] = {
-	{ns_s_qd,	"QUERY",	(char *)0},
-	{ns_s_an,	"ANSWER",	(char *)0},
-	{ns_s_ns,	"AUTHORITY",	(char *)0},
-	{ns_s_ar,	"ADDITIONAL",	(char *)0},
-	{0,		(char *)0,	(char *)0}
-};
-
-const struct res_sym __p_update_section_syms[] = {
-	{S_ZONE,	"ZONE",		(char *)0},
-	{S_PREREQ,	"PREREQUISITE",	(char *)0},
-	{S_UPDATE,	"UPDATE",	(char *)0},
-	{S_ADDT,	"ADDITIONAL",	(char *)0},
-	{0,		(char *)0,	(char *)0}
-};
-
-const struct res_sym __p_key_syms[] = {
-	{NS_ALG_MD5RSA,		"RSA",		"RSA KEY with MD5 hash"},
-	{NS_ALG_DH,		"DH",		"Diffie Hellman"},
-	{NS_ALG_DSA,		"DSA",		"Digital Signature Algorithm"},
-	{NS_ALG_EXPIRE_ONLY,	"EXPIREONLY",	"No algorithm"},
-	{NS_ALG_PRIVATE_OID,	"PRIVATE",	"Algorithm obtained from OID"},
-	{0,			NULL,		NULL}
-};
-
-const struct res_sym __p_cert_syms[] = {
-	{cert_t_pkix,	"PKIX",		"PKIX (X.509v3) Certificate"},
-	{cert_t_spki,	"SPKI",		"SPKI certificate"},
-	{cert_t_pgp,	"PGP",		"PGP certificate"},
-	{cert_t_url,	"URL",		"URL Private"},
-	{cert_t_oid,	"OID",		"OID Private"},
-	{0,		NULL,		NULL}
-};
-
-/*%
- * Names of RR types and qtypes.  Types and qtypes are the same, except
- * that T_ANY is a qtype but not a type.  (You can ask for records of type
- * T_ANY, but you can't have any records of that type in the database.)
- */
-const struct res_sym __p_type_syms[] = {
-	{ns_t_a,	"A",		"address"},
-	{ns_t_ns,	"NS",		"name server"},
-	{ns_t_md,	"MD",		"mail destination (deprecated)"},
-	{ns_t_mf,	"MF",		"mail forwarder (deprecated)"},
-	{ns_t_cname,	"CNAME",	"canonical name"},
-	{ns_t_soa,	"SOA",		"start of authority"},
-	{ns_t_mb,	"MB",		"mailbox"},
-	{ns_t_mg,	"MG",		"mail group member"},
-	{ns_t_mr,	"MR",		"mail rename"},
-	{ns_t_null,	"NULL",		"null"},
-	{ns_t_wks,	"WKS",		"well-known service (deprecated)"},
-	{ns_t_ptr,	"PTR",		"domain name pointer"},
-	{ns_t_hinfo,	"HINFO",	"host information"},
-	{ns_t_minfo,	"MINFO",	"mailbox information"},
-	{ns_t_mx,	"MX",		"mail exchanger"},
-	{ns_t_txt,	"TXT",		"text"},
-	{ns_t_rp,	"RP",		"responsible person"},
-	{ns_t_afsdb,	"AFSDB",	"DCE or AFS server"},
-	{ns_t_x25,	"X25",		"X25 address"},
-	{ns_t_isdn,	"ISDN",		"ISDN address"},
-	{ns_t_rt,	"RT",		"router"},
-	{ns_t_nsap,	"NSAP",		"nsap address"},
-	{ns_t_nsap_ptr,	"NSAP_PTR",	"domain name pointer"},
-	{ns_t_sig,	"SIG",		"signature"},
-	{ns_t_key,	"KEY",		"key"},
-	{ns_t_px,	"PX",		"mapping information"},
-	{ns_t_gpos,	"GPOS",		"geographical position (withdrawn)"},
-	{ns_t_aaaa,	"AAAA",		"IPv6 address"},
-	{ns_t_loc,	"LOC",		"location"},
-	{ns_t_nxt,	"NXT",		"next valid name (unimplemented)"},
-	{ns_t_eid,	"EID",		"endpoint identifier (unimplemented)"},
-	{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"},
-	{ns_t_axfr,	"AXFR",		"zone transfer"},
-	{ns_t_zxfr,	"ZXFR",		"compressed zone transfer"},
-	{ns_t_mailb,	"MAILB",	"mailbox-related data (deprecated)"},
-	{ns_t_maila,	"MAILA",	"mail agent (deprecated)"},
-	{ns_t_naptr,	"NAPTR",	"URN Naming Authority"},
-	{ns_t_kx,	"KX",		"Key Exchange"},
-	{ns_t_cert,	"CERT",		"Certificate"},
-	{ns_t_a6,	"A6",		"IPv6 Address"},
-	{ns_t_dname,	"DNAME",	"dname"},
-	{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}
-};
-
-/*%
- * Names of DNS rcodes.
- */
-const struct res_sym __p_rcode_syms[] = {
-	{ns_r_noerror,	"NOERROR",		"no error"},
-	{ns_r_formerr,	"FORMERR",		"format error"},
-	{ns_r_servfail,	"SERVFAIL",		"server failed"},
-	{ns_r_nxdomain,	"NXDOMAIN",		"no such domain name"},
-	{ns_r_notimpl,	"NOTIMP",		"not implemented"},
-	{ns_r_refused,	"REFUSED",		"refused"},
-	{ns_r_yxdomain,	"YXDOMAIN",		"domain name exists"},
-	{ns_r_yxrrset,	"YXRRSET",		"rrset exists"},
-	{ns_r_nxrrset,	"NXRRSET",		"rrset doesn't exist"},
-	{ns_r_notauth,	"NOTAUTH",		"not authoritative"},
-	{ns_r_notzone,	"NOTZONE",		"Not in zone"},
-	{ns_r_max,	"",			""},
-	{ns_r_badsig,	"BADSIG",		"bad signature"},
-	{ns_r_badkey,	"BADKEY",		"bad key"},
-	{ns_r_badtime,	"BADTIME",		"bad time"},
-	{0, 		NULL,			NULL}
-};
-
-int
-sym_ston(const struct res_sym *syms, const char *name, int *success) {
-	for (; syms->name != 0; syms++) {
-		if (strcasecmp (name, syms->name) == 0) {
-			if (success)
-				*success = 1;
-			return (syms->number);
-		}
-	}
-	if (success)
-		*success = 0;
-	return (syms->number);		/*%< The default value. */
-}
-
-const char *
-sym_ntos(const struct res_sym *syms, int number, int *success) {
-	char *unname = sym_ntos_unname;
-
-	for (; syms->name != 0; syms++) {
-		if (number == syms->number) {
-			if (success)
-				*success = 1;
-			return (syms->name);
-		}
-	}
-
-	sprintf(unname, "%d", number);		/*%< XXX nonreentrant */
-	if (success)
-		*success = 0;
-	return (unname);
-}
-
-const char *
-sym_ntop(const struct res_sym *syms, int number, int *success) {
-	char *unname = sym_ntop_unname;
-
-	for (; syms->name != 0; syms++) {
-		if (number == syms->number) {
-			if (success)
-				*success = 1;
-			return (syms->humanname);
-		}
-	}
-	sprintf(unname, "%d", number);		/*%< XXX nonreentrant */
-	if (success)
-		*success = 0;
-	return (unname);
-}
-
-/*%
- * Return a string for the type.
- */
-const char *
-p_type(int type) {
-	int success;
-	const char *result;
-	static char typebuf[20];
-
-	result = sym_ntos(__p_type_syms, type, &success);
-	if (success)
-		return (result);
-	if (type < 0 || type > 0xffff)
-		return ("BADTYPE");
-	sprintf(typebuf, "TYPE%d", type);
-	return (typebuf);
-}
-
-/*%
- * Return a string for the type.
- */
-const char *
-p_section(int section, int opcode) {
-	const struct res_sym *symbols;
-
-	switch (opcode) {
-	case ns_o_update:
-		symbols = __p_update_section_syms;
-		break;
-	default:
-		symbols = __p_default_section_syms;
-		break;
-	}
-	return (sym_ntos(symbols, section, (int *)0));
-}
-
-/*%
- * Return a mnemonic for class.
- */
-const char *
-p_class(int class) {
-	int success;
-	const char *result;
-	static char classbuf[20];
-
-	result = sym_ntos(__p_class_syms, class, &success);
-	if (success)
-		return (result);
-	if (class < 0 || class > 0xffff)
-		return ("BADCLASS");
-	sprintf(classbuf, "CLASS%d", class);
-	return (classbuf);
-}
-
-/*%
- * Return a mnemonic for an option
- */
-const char *
-p_option(u_long option) {
-	char *nbuf = p_option_nbuf;
-
-	switch (option) {
-	case RES_INIT:		return "init";
-	case RES_DEBUG:		return "debug";
-	case RES_AAONLY:	return "aaonly(unimpl)";
-	case RES_USEVC:		return "usevc";
-	case RES_PRIMARY:	return "primry(unimpl)";
-	case RES_IGNTC:		return "igntc";
-	case RES_RECURSE:	return "recurs";
-	case RES_DEFNAMES:	return "defnam";
-	case RES_STAYOPEN:	return "styopn";
-	case RES_DNSRCH:	return "dnsrch";
-	case RES_INSECURE1:	return "insecure1";
-	case RES_INSECURE2:	return "insecure2";
-	case RES_NOALIASES:	return "noaliases";
-	case RES_USE_INET6:	return "inet6";
-#ifdef RES_USE_EDNS0	/*%< KAME extension */
-	case RES_USE_EDNS0:	return "edns0";
-	case RES_NSID:		return "nsid";
-#endif
-#ifdef RES_USE_DNAME
-	case RES_USE_DNAME:	return "dname";
-#endif
-#ifdef RES_USE_DNSSEC
-	case RES_USE_DNSSEC:	return "dnssec";
-#endif
-#ifdef RES_NOTLDQUERY
-	case RES_NOTLDQUERY:	return "no-tld-query";
-#endif
-#ifdef RES_NO_NIBBLE2
-	case RES_NO_NIBBLE2:	return "no-nibble2";
-#endif
-				/* XXX nonreentrant */
-	default:		sprintf(nbuf, "?0x%lx?", (u_long)option);
-				return (nbuf);
-	}
-}
-
-/*%
- * Return a mnemonic for a time to live.
- */
-const char *
-p_time(u_int32_t value) {
-	char *nbuf = p_time_nbuf;
-
-	if (ns_format_ttl((u_long)value, nbuf, sizeof nbuf) < 0)
-		sprintf(nbuf, "%u", value);
-	return (nbuf);
-}
-
-/*%
- * Return a string for the rcode.
- */
-const char *
-p_rcode(int rcode) {
-	return (sym_ntos(__p_rcode_syms, rcode, (int *)0));
-}
-
-/*%
- * Return a string for a res_sockaddr_union.
- */
-const char *
-p_sockun(union res_sockaddr_union u, char *buf, size_t size) {
-	char ret[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:123.123.123.123"];
-
-	switch (u.sin.sin_family) {
-	case AF_INET:
-		inet_ntop(AF_INET, &u.sin.sin_addr, ret, (socklen_t)sizeof ret);
-		break;
-#ifdef HAS_INET6_STRUCTS
-	case AF_INET6:
-		inet_ntop(AF_INET6, &u.sin6.sin6_addr, ret, sizeof ret);
-		break;
-#endif
-	default:
-		sprintf(ret, "[af%d]", u.sin.sin_family);
-		break;
-	}
-	if (size > 0U) {
-		strncpy(buf, ret, size - 1);
-		buf[size - 1] = '0';
-	}
-	return (buf);
-}
-
-/*%
- * routines to convert between on-the-wire RR format and zone file format.
- * Does not contain conversion to/from decimal degrees; divide or multiply
- * by 60*60*1000 for that.
- */
-
-static unsigned int poweroften[10] = {1, 10, 100, 1000, 10000, 100000,
-				      1000000,10000000,100000000,1000000000};
-
-/*% takes an XeY precision/size value, returns a string representation. */
-static const char *
-precsize_ntoa(u_int32_t prec)
-{
-	char *retbuf = precsize_ntoa_retbuf;
-	unsigned long val;
-	int mantissa, exponent;
-
-	mantissa = (int)((prec >> 4) & 0x0f) % 10;
-	exponent = (int)((prec >> 0) & 0x0f) % 10;
-
-	val = mantissa * poweroften[exponent];
-
-	(void) sprintf(retbuf, "%lu.%.2lu", val/100, val%100);
-	return (retbuf);
-}
-
-/*% converts ascii size/precision X * 10**Y(cm) to 0xXY.  moves pointer.  */
-static u_int8_t
-precsize_aton(const char **strptr) {
-	unsigned int mval = 0, cmval = 0;
-	u_int8_t retval = 0;
-	const char *cp;
-	int exponent;
-	int mantissa;
-
-	cp = *strptr;
-
-	while (isdigit((unsigned char)*cp))
-		mval = mval * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/*%< centimeters */
-		cp++;
-		if (isdigit((unsigned char)*cp)) {
-			cmval = (*cp++ - '0') * 10;
-			if (isdigit((unsigned char)*cp)) {
-				cmval += (*cp++ - '0');
-			}
-		}
-	}
-	cmval = (mval * 100) + cmval;
-
-	for (exponent = 0; exponent < 9; exponent++)
-		if (cmval < poweroften[exponent+1])
-			break;
-
-	mantissa = cmval / poweroften[exponent];
-	if (mantissa > 9)
-		mantissa = 9;
-
-	retval = (mantissa << 4) | exponent;
-
-	*strptr = cp;
-
-	return (retval);
-}
-
-/*% converts ascii lat/lon to unsigned encoded 32-bit number.  moves pointer. */
-static u_int32_t
-latlon2ul(const char **latlonstrptr, int *which) {
-	const char *cp;
-	u_int32_t retval;
-	int deg = 0, min = 0, secs = 0, secsfrac = 0;
-
-	cp = *latlonstrptr;
-
-	while (isdigit((unsigned char)*cp))
-		deg = deg * 10 + (*cp++ - '0');
-
-	while (isspace((unsigned char)*cp))
-		cp++;
-
-	if (!(isdigit((unsigned char)*cp)))
-		goto fndhemi;
-
-	while (isdigit((unsigned char)*cp))
-		min = min * 10 + (*cp++ - '0');
-
-	while (isspace((unsigned char)*cp))
-		cp++;
-
-	if (!(isdigit((unsigned char)*cp)))
-		goto fndhemi;
-
-	while (isdigit((unsigned char)*cp))
-		secs = secs * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/*%< decimal seconds */
-		cp++;
-		if (isdigit((unsigned char)*cp)) {
-			secsfrac = (*cp++ - '0') * 100;
-			if (isdigit((unsigned char)*cp)) {
-				secsfrac += (*cp++ - '0') * 10;
-				if (isdigit((unsigned char)*cp)) {
-					secsfrac += (*cp++ - '0');
-				}
-			}
-		}
-	}
-
-	while (!isspace((unsigned char)*cp))	/*%< if any trailing garbage */
-		cp++;
-
-	while (isspace((unsigned char)*cp))
-		cp++;
-
- fndhemi:
-	switch (*cp) {
-	case 'N': case 'n':
-	case 'E': case 'e':
-		retval = ((unsigned)1<<31)
-			+ (((((deg * 60) + min) * 60) + secs) * 1000)
-			+ secsfrac;
-		break;
-	case 'S': case 's':
-	case 'W': case 'w':
-		retval = ((unsigned)1<<31)
-			- (((((deg * 60) + min) * 60) + secs) * 1000)
-			- secsfrac;
-		break;
-	default:
-		retval = 0;	/*%< invalid value -- indicates error */
-		break;
-	}
-
-	switch (*cp) {
-	case 'N': case 'n':
-	case 'S': case 's':
-		*which = 1;	/*%< latitude */
-		break;
-	case 'E': case 'e':
-	case 'W': case 'w':
-		*which = 2;	/*%< longitude */
-		break;
-	default:
-		*which = 0;	/*%< error */
-		break;
-	}
-
-	cp++;			/*%< skip the hemisphere */
-	while (!isspace((unsigned char)*cp))	/*%< if any trailing garbage */
-		cp++;
-
-	while (isspace((unsigned char)*cp))	/*%< move to next field */
-		cp++;
-
-	*latlonstrptr = cp;
-
-	return (retval);
-}
-
-/*%
- * converts a zone file representation in a string to an RDATA on-the-wire
- * representation. */
-int
-loc_aton(const char *ascii, u_char *binary)
-{
-	const char *cp, *maxcp;
-	u_char *bcp;
-
-	u_int32_t latit = 0, longit = 0, alt = 0;
-	u_int32_t lltemp1 = 0, lltemp2 = 0;
-	int altmeters = 0, altfrac = 0, altsign = 1;
-	u_int8_t hp = 0x16;	/*%< default = 1e6 cm = 10000.00m = 10km */
-	u_int8_t vp = 0x13;	/*%< default = 1e3 cm = 10.00m */
-	u_int8_t siz = 0x12;	/*%< default = 1e2 cm = 1.00m */
-	int which1 = 0, which2 = 0;
-
-	cp = ascii;
-	maxcp = cp + strlen(ascii);
-
-	lltemp1 = latlon2ul(&cp, &which1);
-
-	lltemp2 = latlon2ul(&cp, &which2);
-
-	switch (which1 + which2) {
-	case 3:			/*%< 1 + 2, the only valid combination */
-		if ((which1 == 1) && (which2 == 2)) { /*%< normal case */
-			latit = lltemp1;
-			longit = lltemp2;
-		} else if ((which1 == 2) && (which2 == 1)) { /*%< reversed */
-			longit = lltemp1;
-			latit = lltemp2;
-		} else {	/*%< some kind of brokenness */
-			return (0);
-		}
-		break;
-	default:		/*%< we didn't get one of each */
-		return (0);
-	}
-
-	/* altitude */
-	if (*cp == '-') {
-		altsign = -1;
-		cp++;
-	}
-
-	if (*cp == '+')
-		cp++;
-
-	while (isdigit((unsigned char)*cp))
-		altmeters = altmeters * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/*%< decimal meters */
-		cp++;
-		if (isdigit((unsigned char)*cp)) {
-			altfrac = (*cp++ - '0') * 10;
-			if (isdigit((unsigned char)*cp)) {
-				altfrac += (*cp++ - '0');
-			}
-		}
-	}
-
-	alt = (10000000 + (altsign * (altmeters * 100 + altfrac)));
-
-	while (!isspace((unsigned char)*cp) && (cp < maxcp)) /*%< if trailing garbage or m */
-		cp++;
-
-	while (isspace((unsigned char)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	siz = precsize_aton(&cp);
-
-	while (!isspace((unsigned char)*cp) && (cp < maxcp))	/*%< if trailing garbage or m */
-		cp++;
-
-	while (isspace((unsigned char)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	hp = precsize_aton(&cp);
-
-	while (!isspace((unsigned char)*cp) && (cp < maxcp))	/*%< if trailing garbage or m */
-		cp++;
-
-	while (isspace((unsigned char)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	vp = precsize_aton(&cp);
-
- defaults:
-
-	bcp = binary;
-	*bcp++ = (u_int8_t) 0;	/*%< version byte */
-	*bcp++ = siz;
-	*bcp++ = hp;
-	*bcp++ = vp;
-	PUTLONG(latit,bcp);
-	PUTLONG(longit,bcp);
-	PUTLONG(alt,bcp);
-
-	return (16);		/*%< size of RR in octets */
-}
-
-/*% takes an on-the-wire LOC RR and formats it in a human readable format. */
-const char *
-loc_ntoa(const u_char *binary, char *ascii)
-{
-	static const char *error = "?";
-	static char tmpbuf[sizeof
-"1000 60 60.000 N 1000 60 60.000 W -12345678.00m 90000000.00m 90000000.00m 90000000.00m"];
-	const u_char *cp = binary;
-
-	int latdeg, latmin, latsec, latsecfrac;
-	int longdeg, longmin, longsec, longsecfrac;
-	char northsouth, eastwest;
-	const char *altsign;
-	int altmeters, altfrac;
-
-	const u_int32_t referencealt = 100000 * 100;
-
-	int32_t latval, longval, altval;
-	u_int32_t templ;
-	u_int8_t sizeval, hpval, vpval, versionval;
-
-	char *sizestr, *hpstr, *vpstr;
-
-	versionval = *cp++;
-
-	if (ascii == NULL)
-		ascii = tmpbuf;
-
-	if (versionval) {
-		(void) sprintf(ascii, "; error: unknown LOC RR version");
-		return (ascii);
-	}
-
-	sizeval = *cp++;
-
-	hpval = *cp++;
-	vpval = *cp++;
-
-	GETLONG(templ, cp);
-	latval = (templ - ((unsigned)1<<31));
-
-	GETLONG(templ, cp);
-	longval = (templ - ((unsigned)1<<31));
-
-	GETLONG(templ, cp);
-	if (templ < referencealt) { /*%< below WGS 84 spheroid */
-		altval = referencealt - templ;
-		altsign = "-";
-	} else {
-		altval = templ - referencealt;
-		altsign = "";
-	}
-
-	if (latval < 0) {
-		northsouth = 'S';
-		latval = -latval;
-	} else
-		northsouth = 'N';
-
-	latsecfrac = latval % 1000;
-	latval = latval / 1000;
-	latsec = latval % 60;
-	latval = latval / 60;
-	latmin = latval % 60;
-	latval = latval / 60;
-	latdeg = latval;
-
-	if (longval < 0) {
-		eastwest = 'W';
-		longval = -longval;
-	} else
-		eastwest = 'E';
-
-	longsecfrac = longval % 1000;
-	longval = longval / 1000;
-	longsec = longval % 60;
-	longval = longval / 60;
-	longmin = longval % 60;
-	longval = longval / 60;
-	longdeg = longval;
-
-	altfrac = altval % 100;
-	altmeters = (altval / 100);
-
-	sizestr = strdup(precsize_ntoa((u_int32_t)sizeval));
-	hpstr = strdup(precsize_ntoa((u_int32_t)hpval));
-	vpstr = strdup(precsize_ntoa((u_int32_t)vpval));
-
-	sprintf(ascii,
-	    "%d %.2d %.2d.%.3d %c %d %.2d %.2d.%.3d %c %s%d.%.2dm %sm %sm %sm",
-		latdeg, latmin, latsec, latsecfrac, northsouth,
-		longdeg, longmin, longsec, longsecfrac, eastwest,
-		altsign, altmeters, altfrac,
-		(sizestr != NULL) ? sizestr : error,
-		(hpstr != NULL) ? hpstr : error,
-		(vpstr != NULL) ? vpstr : error);
-
-	if (sizestr != NULL)
-		free(sizestr);
-	if (hpstr != NULL)
-		free(hpstr);
-	if (vpstr != NULL)
-		free(vpstr);
-
-	return (ascii);
-}
-
-
-/*% Return the number of DNS hierarchy levels in the name. */
-int
-dn_count_labels(const char *name) {
-	size_t len, i, count;
-
-	len = strlen(name);
-	for (i = 0, count = 0; i < len; i++) {
-		/* XXX need to check for \. or use named's nlabels(). */
-		if (name[i] == '.')
-			count++;
-	}
-
-	/* don't count initial wildcard */
-	if (name[0] == '*')
-		if (count)
-			count--;
-
-	/* don't count the null label for root. */
-	/* if terminating '.' not found, must adjust */
-	/* count to include last label */
-	if (len > 0 && name[len-1] != '.')
-		count++;
-	_DIAGASSERT(__type_fit(int, count));
-	return (int)count;
-}
-
-/*%
- * 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 *
-p_secstodate (u_long secs) {
-	/* XXX nonreentrant */
-	char *output = p_secstodate_output;
-	time_t myclock = secs;
-	struct tm *mytime;
-#ifdef HAVE_TIME_R
-	struct tm res;
-	
-	mytime = gmtime_r(&myclock, &res);
-#else
-	mytime = gmtime(&myclock);
-#endif
-	mytime->tm_year += 1900;
-	mytime->tm_mon += 1;
-	sprintf(output, "%04d%02d%02d%02d%02d%02d",
-		mytime->tm_year, mytime->tm_mon, mytime->tm_mday,
-		mytime->tm_hour, mytime->tm_min, mytime->tm_sec);
-	return (output);
-}
-
-u_int16_t
-res_nametoclass(const char *buf, int *successp) {
-	unsigned long result;
-	char *endptr;
-	int success;
-
-	result = sym_ston(__p_class_syms, buf, &success);
-	if (success)
-		goto done;
-
-	if (strncasecmp(buf, "CLASS", 5) != 0 ||
-	    !isdigit((unsigned char)buf[5]))
-		goto done;
-	errno = 0;
-	result = strtoul(buf + 5, &endptr, 10);
-	if (errno == 0 && *endptr == '\0' && result <= 0xffffU)
-		success = 1;
- done:
-	if (successp)
-		*successp = success;
-	return (u_int16_t)(result);
-}
-
-u_int16_t
-res_nametotype(const char *buf, int *successp) {
-	unsigned long result;
-	char *endptr;
-	int success;
-
-	result = sym_ston(__p_type_syms, buf, &success);
-	if (success)
-		goto done;
-
-	if (strncasecmp(buf, "type", 4) != 0 ||
-	    !isdigit((unsigned char)buf[4]))
-		goto done;
-	errno = 0;
-	result = strtoul(buf + 4, &endptr, 10);
-	if (errno == 0 && *endptr == '\0' && result <= 0xffffU)
-		success = 1;
- done:
-	if (successp)
-		*successp = success;
-	return (u_int16_t)(result);
-}
-
-/*! \file */
diff --git a/lib/libc/resolv/res_debug.h b/lib/libc/resolv/res_debug.h
deleted file mode 100644
index b3231f825..000000000
--- a/lib/libc/resolv/res_debug.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: res_debug.h,v 1.2 2012/03/13 21:13:43 christos Exp $	*/
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 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.
- */
-
-#ifndef _RES_DEBUG_H_
-#define _RES_DEBUG_H_
-
-#ifndef DEBUG
-#   define Dprint(cond, args) /*empty*/
-#   define DprintQ(cond, args, query, size) /*empty*/
-#   define Aerror(statp, file, string, error, address) /*empty*/
-#   define Perror(statp, file, string, error) /*empty*/
-#else
-#   define Dprint(cond, args) if (cond) {fprintf args;} else {}
-#   define DprintQ(cond, args, query, size) if (cond) {\
-			fprintf args;\
-			res_pquery(statp, (query), (int)(size), stdout);\
-		} else {}
-#endif
-
-#endif /* _RES_DEBUG_H_ */ 
-/*! \file */
diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c
deleted file mode 100644
index b9a95d6f6..000000000
--- a/lib/libc/resolv/res_init.c
+++ /dev/null
@@ -1,963 +0,0 @@
-/*	$NetBSD: res_init.c,v 1.30 2015/02/24 17:56:20 christos Exp $	*/
-
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-/*
- * 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
- * CORPORATION 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) 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static const char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
-static const char rcsid[] = "Id: res_init.c,v 1.26 2008/12/11 09:59:00 marka Exp";
-#else
-__RCSID("$NetBSD: res_init.c,v 1.30 2015/02/24 17:56:20 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#if !defined(__minix)
-#include <sys/event.h>
-#endif /* !defined(__minix) */
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <netdb.h>
-
-#define HAVE_MD5
-#include <md5.h>
-
-#ifndef HAVE_MD5
-# include "../dst/md5.h"
-#else
-# ifdef SOLARIS2
-#  include <sys/md5.h>
-# endif
-#endif
-#ifndef _MD5_H_
-# define _MD5_H_ 1	/*%< make sure we do not include rsaref md5.h file */
-#endif
-
-#include "port_after.h"
-
-#if 0
-#ifdef __weak_alias
-__weak_alias(res_ninit,_res_ninit)
-__weak_alias(res_randomid,__res_randomid)
-__weak_alias(res_nclose,_res_nclose)
-__weak_alias(res_ndestroy,_res_ndestroy)
-__weak_alias(res_get_nibblesuffix,__res_get_nibblesuffix)
-__weak_alias(res_get_nibblesuffix2,__res_get_nibblesuffix2)
-__weak_alias(res_getservers,__res_getservers)
-__weak_alias(res_setservers,__res_setservers)
-#endif
-#endif
-
-
-/* ensure that sockaddr_in6 and IN6ADDR_ANY_INIT are declared / defined */
-#include <resolv.h>
-
-#include "res_private.h"
-
-#define RESOLVSORT
-/*% Options.  Should all be left alone. */
-#ifndef DEBUG
-#define DEBUG
-#endif
-
-#ifdef SOLARIS2
-#include <sys/systeminfo.h>
-#endif
-
-static void res_setoptions(res_state, const char *, const char *);
-
-#ifdef RESOLVSORT
-static const char sort_mask[] = "/&";
-#define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
-static uint32_t net_mask(struct in_addr);
-#endif
-
-#if !defined(isascii)	/*%< XXX - could be a function */
-# define isascii(c) (!(c & 0200))
-#endif
-
-static struct timespec __res_conf_time;
-#if !defined(__minix)
-static const struct timespec ts = { 0, 0 };
-#endif /* !defined(__minix) */
-
-const char *__res_conf_name = _PATH_RESCONF;
-
-/*
- * Resolver state default settings.
- */
-
-/*%
- * Set up default settings.  If the configuration file exist, the values
- * there will have precedence.  Otherwise, the server address is set to
- * INADDR_ANY and the default domain name comes from the gethostname().
- *
- * An interrim version of this code (BIND 4.9, pre-4.4BSD) used 127.0.0.1
- * rather than INADDR_ANY ("0.0.0.0") as the default name server address
- * since it was noted that INADDR_ANY actually meant ``the first interface
- * you "ifconfig"'d at boot time'' and if this was a SLIP or PPP interface,
- * it had to be "up" in order for you to reach your own name server.  It
- * was later decided that since the recommended practice is to always 
- * install local static routes through 127.0.0.1 for all your network
- * interfaces, that we could solve this problem without a code change.
- *
- * The configuration file should always be used, since it is the only way
- * to specify a default domain.  If you are running a server on your local
- * machine, you should say "nameserver 0.0.0.0" or "nameserver 127.0.0.1"
- * in the configuration file.
- *
- * Return 0 if completes successfully, -1 on error
- */
-int
-res_ninit(res_state statp) {
-	return (__res_vinit(statp, 0));
-}
-
-/*% This function has to be reachable by res_data.c but not publically. */
-int
-__res_vinit(res_state statp, int preinit) {
-	register FILE *fp;
-	register char *cp, **pp;
-	register int n;
-	char buf[BUFSIZ];
-	int nserv = 0;    /*%< number of nameserver records read from file */
-	int haveenv = 0;
-	int havesearch = 0;
-#ifdef RESOLVSORT
-	int nsort = 0;
-	char *net;
-#endif
-	int dots;
-	union res_sockaddr_union u[2];
-	int maxns = MAXNS;
-
-	RES_SET_H_ERRNO(statp, 0);
-
-	if ((statp->options & RES_INIT) != 0U)
-		res_ndestroy(statp);
-
-	if (!preinit) {
-		statp->retrans = RES_TIMEOUT;
-		statp->retry = RES_DFLRETRY;
-		statp->options = RES_DEFAULT;
-	}
-	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);
-#else
-	u[nserv].sin.sin_addr.s_addr = INADDR_ANY;
-#endif
-	u[nserv].sin.sin_family = AF_INET;
-	u[nserv].sin.sin_port = htons(NAMESERVER_PORT);
-#ifdef HAVE_SA_LEN
-	u[nserv].sin.sin_len = sizeof(struct sockaddr_in);
-#endif
-	nserv++;
-#ifdef HAS_INET6_STRUCTS
-#ifdef USELOOPBACK
-	u[nserv].sin6.sin6_addr = in6addr_loopback;
-#else
-	u[nserv].sin6.sin6_addr = in6addr_any;
-#endif
-	u[nserv].sin6.sin6_family = AF_INET6;
-	u[nserv].sin6.sin6_port = htons(NAMESERVER_PORT);
-#ifdef HAVE_SA_LEN
-	u[nserv].sin6.sin6_len = sizeof(struct sockaddr_in6);
-#endif
-	nserv++;
-#endif
-	statp->nscount = 0;
-	statp->ndots = 1;
-	statp->pfcode = 0;
-	statp->_vcsock = -1;
-	statp->_flags = 0;
-	statp->qhook = NULL;
-	statp->rhook = NULL;
-	statp->_u._ext.nscount = 0;
-	statp->_u._ext.ext = malloc(sizeof(*statp->_u._ext.ext));
-	if (statp->_u._ext.ext != NULL) {
-	        memset(statp->_u._ext.ext, 0, sizeof(*statp->_u._ext.ext));
-		statp->_u._ext.ext->nsaddrs[0].sin = statp->nsaddr;
-		strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa");
-		strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int");
-	} else {
-		/*
-		 * Historically res_init() rarely, if at all, failed.
-		 * Examples and applications exist which do not check
-		 * our return code.  Furthermore several applications
-		 * simply call us to get the systems domainname.  So
-		 * rather than immediately fail here we store the
-		 * failure, which is returned later, in h_errno.  And
-		 * prevent the collection of 'nameserver' information
-		 * by setting maxns to 0.  Thus applications that fail
-		 * to check our return code wont be able to make
-		 * queries anyhow.
-		 */
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		maxns = 0;
-	}
-#ifdef RESOLVSORT
-	statp->nsort = 0;
-#endif
-	res_setservers(statp, u, nserv);
-
-#ifdef	SOLARIS2
-	/*
-	 * The old libresolv derived the defaultdomain from NIS/NIS+.
-	 * We want to keep this behaviour
-	 */
-	{
-		char buf[sizeof(statp->defdname)], *cp;
-		int ret;
-
-		if ((ret = sysinfo(SI_SRPC_DOMAIN, buf, sizeof(buf))) > 0 &&
-			(unsigned int)ret <= sizeof(buf)) {
-			if (buf[0] == '+')
-				buf[0] = '.';
-			cp = strchr(buf, '.');
-			cp = (cp == NULL) ? buf : (cp + 1);
-			(void)strlcpy(statp->defdname, cp,
-			    sizeof(statp->defdname));
-		}
-	}
-#endif	/* SOLARIS2 */
-
-	/* Allow user to override the local domain definition */
-	if ((cp = getenv("LOCALDOMAIN")) != NULL) {
-		(void)strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
-		statp->defdname[sizeof(statp->defdname) - 1] = '\0';
-		haveenv++;
-
-		/*
-		 * Set search list to be blank-separated strings
-		 * from rest of env value.  Permits users of LOCALDOMAIN
-		 * to still have a search list, and anyone to set the
-		 * one that they want to use as an individual (even more
-		 * important now that the rfc1535 stuff restricts searches)
-		 */
-		cp = statp->defdname;
-		pp = statp->dnsrch;
-		*pp++ = cp;
-		for (n = 0; *cp && pp < statp->dnsrch + MAXDNSRCH; cp++) {
-			if (*cp == '\n')	/*%< silly backwards compat */
-				break;
-			else if (*cp == ' ' || *cp == '\t') {
-				*cp = 0;
-				n = 1;
-			} else if (n) {
-				*pp++ = cp;
-				n = 0;
-				havesearch = 1;
-			}
-		}
-		/* null terminate last domain if there are excess */
-		while (*cp != '\0' && *cp != ' ' && *cp != '\t' && *cp != '\n')
-			cp++;
-		*cp = '\0';
-		*pp++ = 0;
-	}
-
-#define	MATCH(line, name) \
-	(!strncmp(line, name, sizeof(name) - 1) && \
-	(line[sizeof(name) - 1] == ' ' || \
-	 line[sizeof(name) - 1] == '\t'))
-
-	nserv = 0;
-	if ((fp = fopen(__res_conf_name, "re")) != NULL) {
-	    struct stat st;
-#if !defined(__minix)
-	    struct kevent kc;
-#endif /* !defined(__minix) */
-
-	    /* read the config file */
-	    while (fgets(buf, (int)sizeof(buf), fp) != NULL) {
-		/* skip comments */
-		if (*buf == ';' || *buf == '#')
-			continue;
-		/* read default domain name */
-		if (MATCH(buf, "domain")) {
-		    if (haveenv)	/*%< skip if have from environ */
-			    continue;
-		    cp = buf + sizeof("domain") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			    cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			    continue;
-		    strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
-		    statp->defdname[sizeof(statp->defdname) - 1] = '\0';
-		    if ((cp = strpbrk(statp->defdname, " \t\n")) != NULL)
-			    *cp = '\0';
-		    havesearch = 0;
-		    continue;
-		}
-		/* set search list */
-		if (MATCH(buf, "search")) {
-		    if (haveenv)	/*%< skip if have from environ */
-			    continue;
-		    cp = buf + sizeof("search") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			    cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			    continue;
-		    strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
-		    statp->defdname[sizeof(statp->defdname) - 1] = '\0';
-		    if ((cp = strchr(statp->defdname, '\n')) != NULL)
-			    *cp = '\0';
-		    /*
-		     * Set search list to be blank-separated strings
-		     * on rest of line.
-		     */
-		    cp = statp->defdname;
-		    pp = statp->dnsrch;
-		    *pp++ = cp;
-		    for (n = 0; *cp && pp < statp->dnsrch + MAXDNSRCH; cp++) {
-			    if (*cp == ' ' || *cp == '\t') {
-				    *cp = 0;
-				    n = 1;
-			    } else if (n) {
-				    *pp++ = cp;
-				    n = 0;
-			    }
-		    }
-		    /* null terminate last domain if there are excess */
-		    while (*cp != '\0' && *cp != ' ' && *cp != '\t')
-			    cp++;
-		    *cp = '\0';
-		    *pp++ = 0;
-		    havesearch = 1;
-		    continue;
-		}
-		/* read nameservers to query */
-		if (MATCH(buf, "nameserver") && nserv < maxns) {
-		    struct addrinfo hints, *ai;
-		    char sbuf[NI_MAXSERV];
-		    const size_t minsiz =
-		        sizeof(statp->_u._ext.ext->nsaddrs[0]);
-
-		    cp = buf + sizeof("nameserver") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			cp++;
-		    cp[strcspn(cp, ";# \t\n")] = '\0';
-		    if ((*cp != '\0') && (*cp != '\n')) {
-			memset(&hints, 0, sizeof(hints));
-			hints.ai_family = PF_UNSPEC;
-			hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-			hints.ai_flags = AI_NUMERICHOST;
-			sprintf(sbuf, "%u", NAMESERVER_PORT);
-			if (getaddrinfo(cp, sbuf, &hints, &ai) == 0 &&
-			    ai->ai_addrlen <= minsiz) {
-			    if (statp->_u._ext.ext != NULL) {
-				memcpy(&statp->_u._ext.ext->nsaddrs[nserv],
-				    ai->ai_addr, ai->ai_addrlen);
-			    }
-			    if (ai->ai_addrlen <=
-			        sizeof(statp->nsaddr_list[nserv])) {
-				memcpy(&statp->nsaddr_list[nserv],
-				    ai->ai_addr, ai->ai_addrlen);
-			    } else
-				statp->nsaddr_list[nserv].sin_family = 0;
-			    freeaddrinfo(ai);
-			    nserv++;
-			}
-		    }
-		    continue;
-		}
-#ifdef RESOLVSORT
-		if (MATCH(buf, "sortlist")) {
-		    struct in_addr a;
-
-		    cp = buf + sizeof("sortlist") - 1;
-		    while (nsort < MAXRESOLVSORT) {
-			while (*cp == ' ' || *cp == '\t')
-			    cp++;
-			if (*cp == '\0' || *cp == '\n' || *cp == ';')
-			    break;
-			net = cp;
-			while (*cp && !ISSORTMASK(*cp) && *cp != ';' &&
-			       isascii(*cp) && !isspace((unsigned char)*cp))
-				cp++;
-			n = *cp;
-			*cp = 0;
-			if (inet_aton(net, &a)) {
-			    statp->sort_list[nsort].addr = a;
-			    if (ISSORTMASK(n)) {
-				*cp++ = n;
-				net = cp;
-				while (*cp && *cp != ';' &&
-					isascii(*cp) &&
-					!isspace((unsigned char)*cp))
-				    cp++;
-				n = *cp;
-				*cp = 0;
-				if (inet_aton(net, &a)) {
-				    statp->sort_list[nsort].mask = a.s_addr;
-				} else {
-				    statp->sort_list[nsort].mask = 
-					net_mask(statp->sort_list[nsort].addr);
-				}
-			    } else {
-				statp->sort_list[nsort].mask = 
-				    net_mask(statp->sort_list[nsort].addr);
-			    }
-			    nsort++;
-			}
-			*cp = n;
-		    }
-		    continue;
-		}
-#endif
-		if (MATCH(buf, "options")) {
-		    res_setoptions(statp, buf + sizeof("options") - 1, "conf");
-		    continue;
-		}
-	    }
-	    if (nserv > 0) 
-		statp->nscount = nserv;
-#ifdef RESOLVSORT
-	    statp->nsort = nsort;
-#endif
-	    statp->_u._ext.ext->resfd = fcntl(fileno(fp), F_DUPFD_CLOEXEC);
-	    (void) fclose(fp);
-	    if (fstat(statp->_u._ext.ext->resfd, &st) != -1)
-		    __res_conf_time = statp->_u._ext.ext->res_conf_time =
-			st.st_mtimespec;
-#if !defined(__minix)
-	    statp->_u._ext.ext->kq = kqueue1(O_CLOEXEC);
-	    EV_SET(&kc, statp->_u._ext.ext->resfd, EVFILT_VNODE,
-		EV_ADD|EV_ENABLE|EV_CLEAR, NOTE_DELETE|NOTE_WRITE| NOTE_EXTEND|
-		NOTE_ATTRIB|NOTE_LINK|NOTE_RENAME|NOTE_REVOKE, 0, 0);
-	    (void)kevent(statp->_u._ext.ext->kq, &kc, 1, NULL, 0, &ts);
-#else
-	statp->_u._ext.ext->kq = -1;
-#endif /* !defined(__minix) */
-	} else {
-	    statp->_u._ext.ext->kq = -1;
-	    statp->_u._ext.ext->resfd = -1;
-	}
-/*
- * Last chance to get a nameserver.  This should not normally
- * be necessary
- */
-#ifdef NO_RESOLV_CONF
-	if(nserv == 0)
-		nserv = get_nameservers(statp);
-#endif
-
-	if (statp->defdname[0] == 0 &&
-	    gethostname(buf, sizeof(statp->defdname) - 1) == 0 &&
-	    (cp = strchr(buf, '.')) != NULL)
-		strcpy(statp->defdname, cp + 1);
-
-	/* find components of local domain that might be searched */
-	if (havesearch == 0) {
-		pp = statp->dnsrch;
-		*pp++ = statp->defdname;
-		*pp = NULL;
-
-		dots = 0;
-		for (cp = statp->defdname; *cp; cp++)
-			dots += (*cp == '.');
-
-		cp = statp->defdname;
-		while (pp < statp->dnsrch + MAXDFLSRCH) {
-			if (dots < LOCALDOMAINPARTS)
-				break;
-			cp = strchr(cp, '.') + 1;    /*%< we know there is one */
-			*pp++ = cp;
-			dots--;
-		}
-		*pp = NULL;
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG) {
-			printf(";; res_init()... default dnsrch list:\n");
-			for (pp = statp->dnsrch; *pp; pp++)
-				printf(";;\t%s\n", *pp);
-			printf(";;\t..END..\n");
-		}
-#endif
-	}
-
-	if ((cp = getenv("RES_OPTIONS")) != NULL)
-		res_setoptions(statp, cp, "env");
-	statp->options |= RES_INIT;
-	return (statp->res_h_errno);
-}
-
-int
-res_check(res_state statp, struct timespec *mtime)
-{
-#if defined(__minix)
-	/*
-	 * XXX: No update on change.
-	 */
-	return 0;
-#else
-	/*
-	 * If the times are equal, then we check if there
-	 * was a kevent related to resolv.conf and reload.
-	 * If the times are not equal, then we don't bother
-	 * to check the kevent, because another thread already
-	 * did, loaded and changed the time.
-	 */
-	if (timespeccmp(&statp->_u._ext.ext->res_conf_time,
-	    &__res_conf_time, ==)) {
-		struct kevent ke;
-		if (statp->_u._ext.ext->kq == -1)
-			goto out;
-
-		switch (kevent(statp->_u._ext.ext->kq, NULL, 0, &ke, 1, &ts)) {
-		case 0:
-		case -1:
-out:
-			if (mtime)
-				*mtime = __res_conf_time;
-			return 0;
-		default:
-			break;
-		}
-	}
-	(void)__res_vinit(statp, 0);
-	if (mtime)
-		*mtime = __res_conf_time;
-	return 1;
-#endif /* defined(__minix) */
-}
-
-static void
-res_setoptions(res_state statp, const char *options, const char *source)
-{
-	const char *cp = options;
-	int i;
-	size_t j;
-	struct __res_state_ext *ext = statp->_u._ext.ext;
-
-#ifdef DEBUG
-	if (statp->options & RES_DEBUG)
-		printf(";; res_setoptions(\"%s\", \"%s\")...\n",
-		       options, source);
-#endif
-	while (*cp) {
-		/* skip leading and inner runs of spaces */
-		while (*cp == ' ' || *cp == '\t')
-			cp++;
-		/* search for and process individual options */
-		if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
-			i = atoi(cp + sizeof("ndots:") - 1);
-			if (i <= RES_MAXNDOTS)
-				statp->ndots = i;
-			else
-				statp->ndots = RES_MAXNDOTS;
-#ifdef DEBUG
-			if (statp->options & RES_DEBUG)
-				printf(";;\tndots=%d\n", statp->ndots);
-#endif
-		} else if (!strncmp(cp, "timeout:", sizeof("timeout:") - 1)) {
-			i = atoi(cp + sizeof("timeout:") - 1);
-			if (i <= RES_MAXRETRANS)
-				statp->retrans = i;
-			else
-				statp->retrans = RES_MAXRETRANS;
-#ifdef DEBUG
-			if (statp->options & RES_DEBUG)
-				printf(";;\ttimeout=%d\n", statp->retrans);
-#endif
-#ifdef	SOLARIS2
-		} else if (!strncmp(cp, "retrans:", sizeof("retrans:") - 1)) {
-			/*
-		 	 * For backward compatibility, 'retrans' is
-		 	 * supported as an alias for 'timeout', though
-		 	 * without an imposed maximum.
-		 	 */
-			statp->retrans = atoi(cp + sizeof("retrans:") - 1);
-		} else if (!strncmp(cp, "retry:", sizeof("retry:") - 1)){
-			/*
-			 * For backward compatibility, 'retry' is
-			 * supported as an alias for 'attempts', though
-			 * without an imposed maximum.
-			 */
-			statp->retry = atoi(cp + sizeof("retry:") - 1);
-#endif	/* SOLARIS2 */
-		} else if (!strncmp(cp, "attempts:", sizeof("attempts:") - 1)){
-			i = atoi(cp + sizeof("attempts:") - 1);
-			if (i <= RES_MAXRETRY)
-				statp->retry = i;
-			else
-				statp->retry = RES_MAXRETRY;
-#ifdef DEBUG
-			if (statp->options & RES_DEBUG)
-				printf(";;\tattempts=%d\n", statp->retry);
-#endif
-		} else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
-#ifdef DEBUG
-			if (!(statp->options & RES_DEBUG)) {
-				printf(";; res_setoptions(\"%s\", \"%s\")..\n",
-				       options, source);
-				statp->options |= RES_DEBUG;
-			}
-			printf(";;\tdebug\n");
-#endif
-		} else if (!strncmp(cp, "no_tld_query",
-				    sizeof("no_tld_query") - 1) ||
-			   !strncmp(cp, "no-tld-query",
-				    sizeof("no-tld-query") - 1)) {
-			statp->options |= RES_NOTLDQUERY;
-		} else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
-			statp->options |= RES_USE_INET6;
-		} else if (!strncmp(cp, "rotate", sizeof("rotate") - 1)) {
-			statp->options |= RES_ROTATE;
-		} else if (!strncmp(cp, "no-check-names",
-				    sizeof("no-check-names") - 1)) {
-			statp->options |= RES_NOCHECKNAME;
-		} else if (!strncmp(cp, "check-names",
-				    sizeof("check-names") - 1)) {
-			statp->options &= ~RES_NOCHECKNAME;
-		}
-#ifdef RES_USE_EDNS0
-		else if (!strncmp(cp, "edns0", sizeof("edns0") - 1)) {
-			statp->options |= RES_USE_EDNS0;
-		}
-#endif
-		else if (!strncmp(cp, "dname", sizeof("dname") - 1)) {
-			statp->options |= RES_USE_DNAME;
-		}
-		else if (!strncmp(cp, "nibble:", sizeof("nibble:") - 1)) {
-			if (ext == NULL)
-				goto skip;
-			cp += sizeof("nibble:") - 1;
-			j = MIN(strcspn(cp, " \t"), sizeof(ext->nsuffix) - 1);
-			strncpy(ext->nsuffix, cp, j);
-			ext->nsuffix[j] = '\0';
-		}
-		else if (!strncmp(cp, "nibble2:", sizeof("nibble2:") - 1)) {
-			if (ext == NULL)
-				goto skip;
-			cp += sizeof("nibble2:") - 1;
-			j = MIN(strcspn(cp, " \t"), sizeof(ext->nsuffix2) - 1);
-			strncpy(ext->nsuffix2, cp, j);
-			ext->nsuffix2[j] = '\0';
-		}
-		else if (!strncmp(cp, "v6revmode:", sizeof("v6revmode:") - 1)) {
-			cp += sizeof("v6revmode:") - 1;
-			/* "nibble" and "bitstring" used to be valid */
-			if (!strncmp(cp, "single", sizeof("single") - 1)) {
-				statp->options |= RES_NO_NIBBLE2;
-			} else if (!strncmp(cp, "both", sizeof("both") - 1)) {
-				statp->options &=
-					 ~RES_NO_NIBBLE2;
-			}
-		}
-		else {
-			/* XXX - print a warning here? */
-		}
-   skip:
-		/* skip to next run of spaces */
-		while (*cp && *cp != ' ' && *cp != '\t')
-			cp++;
-	}
-}
-
-#ifdef RESOLVSORT
-/* XXX - should really support CIDR which means explicit masks always. */
-static uint32_t
-net_mask(struct in_addr in) /*!< XXX - should really use system's version of this  */
-{
-	register uint32_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return (htonl(IN_CLASSA_NET));
-	else if (IN_CLASSB(i))
-		return (htonl(IN_CLASSB_NET));
-	return (htonl(IN_CLASSC_NET));
-}
-#endif
-
-static u_char srnd[16];
-
-void
-res_rndinit(res_state statp)
-{
-	struct timeval now;
-	uint32_t u32;
-	uint16_t u16;
-	u_char *rnd = statp->_rnd == NULL ? srnd : statp->_rnd;
-
-	gettimeofday(&now, NULL);
-	u32 = (uint32_t)now.tv_sec;
-	memcpy(rnd, &u32, 4);
-	u32 = now.tv_usec;
-	memcpy(rnd + 4, &u32, 4);
-	u32 += (uint32_t)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;
-	uint16_t u16;
-	MD5_CTX ctx;
-	u_char *rnd = statp->_rnd == NULL ? srnd : statp->_rnd;
-
-	gettimeofday(&now, NULL);
-	u16 = (uint16_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);
-}
-
-/*%
- * This routine is for closing the socket if a virtual circuit is used and
- * the program wants to close it.  This provides support for endhostent()
- * which expects to close the socket.
- *
- * This routine is not expected to be user visible.
- */
-void
-res_nclose(res_state statp)
-{
-	int ns;
-
-	if (statp->_vcsock >= 0) { 
-		(void) close(statp->_vcsock);
-		statp->_vcsock = -1;
-		statp->_flags &= ~(RES_F_VC | RES_F_CONN);
-	}
-	for (ns = 0; ns < statp->_u._ext.nscount; ns++) {
-		if (statp->_u._ext.nssocks[ns] != -1) {
-			(void) close(statp->_u._ext.nssocks[ns]);
-			statp->_u._ext.nssocks[ns] = -1;
-		}
-	}
-}
-
-void
-res_ndestroy(res_state statp)
-{
-	res_nclose(statp);
-	if (statp->_u._ext.ext != NULL) {
-		if (statp->_u._ext.ext->kq != -1)
-			(void)close(statp->_u._ext.ext->kq);
-		if (statp->_u._ext.ext->resfd != -1)
-			(void)close(statp->_u._ext.ext->resfd);
-		free(statp->_u._ext.ext);
-		statp->_u._ext.ext = NULL;
-	}
-	if (statp->_rnd != NULL) {
-		free(statp->_rnd);
-		statp->_rnd = NULL;
-	}
-	statp->options &= ~RES_INIT;
-}
-
-const char *
-res_get_nibblesuffix(res_state statp)
-{
-	if (statp->_u._ext.ext)
-		return (statp->_u._ext.ext->nsuffix);
-	return ("ip6.arpa");
-}
-
-const char *
-res_get_nibblesuffix2(res_state statp)
-{
-	if (statp->_u._ext.ext)
-		return (statp->_u._ext.ext->nsuffix2);
-	return ("ip6.int");
-}
-
-void
-res_setservers(res_state statp, const union res_sockaddr_union *set, int cnt)
-{
-	int i, nserv;
-	size_t size;
-
-	/* close open servers */
-	res_nclose(statp);
-
-	/* cause rtt times to be forgotten */
-	statp->_u._ext.nscount = 0;
-
-	nserv = 0;
-	for (i = 0; i < cnt && nserv < MAXNS; i++) {
-		switch (set->sin.sin_family) {
-		case AF_INET:
-			size = sizeof(set->sin);
-			if (statp->_u._ext.ext)
-				memcpy(&statp->_u._ext.ext->nsaddrs[nserv],
-					&set->sin, size);
-			if (size <= sizeof(statp->nsaddr_list[nserv]))
-				memcpy(&statp->nsaddr_list[nserv],
-					&set->sin, size);
-			else
-				statp->nsaddr_list[nserv].sin_family = 0;
-			nserv++;
-			break;
-
-#ifdef HAS_INET6_STRUCTS
-		case AF_INET6:
-			size = sizeof(set->sin6);
-			if (statp->_u._ext.ext)
-				memcpy(&statp->_u._ext.ext->nsaddrs[nserv],
-					&set->sin6, size);
-			if (size <= sizeof(statp->nsaddr_list[nserv]))
-				memcpy(&statp->nsaddr_list[nserv],
-					&set->sin6, size);
-			else
-				statp->nsaddr_list[nserv].sin_family = 0;
-			nserv++;
-			break;
-#endif
-
-		default:
-			break;
-		}
-		set++;
-	}
-	statp->nscount = nserv;
-	
-}
-
-int
-res_getservers(res_state statp, union res_sockaddr_union *set, int cnt)
-{
-	int i;
-	size_t size;
-	uint16_t family;
-
-	for (i = 0; i < statp->nscount && i < cnt; i++) {
-		if (statp->_u._ext.ext)
-			family = statp->_u._ext.ext->nsaddrs[i].sin.sin_family;
-		else 
-			family = statp->nsaddr_list[i].sin_family;
-
-		switch (family) {
-		case AF_INET:
-			size = sizeof(set->sin);
-			if (statp->_u._ext.ext)
-				memcpy(&set->sin,
-				       &statp->_u._ext.ext->nsaddrs[i],
-				       size);
-			else
-				memcpy(&set->sin, &statp->nsaddr_list[i],
-				       size);
-			break;
-
-#ifdef HAS_INET6_STRUCTS
-		case AF_INET6:
-			size = sizeof(set->sin6);
-			if (statp->_u._ext.ext)
-				memcpy(&set->sin6,
-				       &statp->_u._ext.ext->nsaddrs[i],
-				       size);
-			else
-				memcpy(&set->sin6, &statp->nsaddr_list[i],
-				       size);
-			break;
-#endif
-
-		default:
-			set->sin.sin_family = 0;
-			break;
-		}
-		set++;
-	}
-	return (statp->nscount);
-}
-
-/*! \file */
diff --git a/lib/libc/resolv/res_mkquery.c b/lib/libc/resolv/res_mkquery.c
deleted file mode 100644
index c7a17ead6..000000000
--- a/lib/libc/resolv/res_mkquery.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/*	$NetBSD: res_mkquery.c,v 1.15 2015/02/24 17:56:20 christos Exp $	*/
-
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-/*
- * 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
- * CORPORATION 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static const char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "Id: res_mkquery.c,v 1.10 2008/12/11 09:59:00 marka Exp";
-#else
-__RCSID("$NetBSD: res_mkquery.c,v 1.15 2015/02/24 17:56:20 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <assert.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include "port_after.h"
-
-#if 0
-#ifdef __weak_alias
-__weak_alias(res_nmkquery,_res_nmkquery)
-__weak_alias(res_nopt,_res_nopt)
-#endif
-#endif
-
-/* Options.  Leave them on. */
-#ifndef DEBUG
-#define DEBUG
-#endif
-
-extern const char *_res_opcodes[];
-
-/*%
- * Form all types of queries.
- * Returns the size of the result or -1.
- */
-int
-res_nmkquery(res_state statp,
-	     int op,			/*!< opcode of query  */
-	     const char *dname,		/*!< domain name  */
-	     int class, int type,	/*!< class and type of query  */
-	     const u_char *data,	/*!< resource record data  */
-	     int datalen,		/*!< length of data  */
-	     const u_char *newrr_in,	/*!< new rr for modify or append  */
-	     u_char *buf,		/*!< buffer to put query  */
-	     int buflen)		/*!< size of buffer  */
-{
-	register HEADER *hp;
-	register u_char *cp, *ep;
-	register int n;
-	u_char *dnptrs[20], **dpp, **lastdnptr;
-
-	UNUSED(newrr_in);
-
-#ifdef DEBUG
-	if (statp->options & RES_DEBUG)
-		printf(";; res_nmkquery(%s, %s, %s, %s)\n",
-		       _res_opcodes[op], dname, p_class(class), p_type(type));
-#endif
-	/*
-	 * Initialize header fields.
-	 */
-	if ((buf == NULL) || (buflen < HFIXEDSZ))
-		return (-1);
-	memset(buf, 0, HFIXEDSZ);
-	hp = (HEADER *)(void *)buf;
-	statp->id = res_nrandomid(statp);
-	hp->id = htons(statp->id);
-	hp->opcode = op;
-	hp->rd = (statp->options & RES_RECURSE) != 0U;
-	hp->rcode = NOERROR;
-	cp = buf + HFIXEDSZ;
-	ep = buf + buflen;
-	dpp = dnptrs;
-	*dpp++ = buf;
-	*dpp++ = NULL;
-	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-	/*
-	 * perform opcode specific processing
-	 */
-	switch (op) {
-	case QUERY:	/*FALLTHROUGH*/
-	case NS_NOTIFY_OP:
-		if (ep - cp < QFIXEDSZ)
-			return (-1);
-		if ((n = dn_comp(dname, cp, (int)(ep - cp - QFIXEDSZ), dnptrs,
-		    lastdnptr)) < 0)
-			return (-1);
-		cp += n;
-		ns_put16(type, cp);
-		cp += INT16SZ;
-		ns_put16(class, cp);
-		cp += INT16SZ;
-		hp->qdcount = htons(1);
-		if (op == QUERY || data == NULL)
-			break;
-		/*
-		 * Make an additional record for completion domain.
-		 */
-		if ((ep - cp) < RRFIXEDSZ)
-			return (-1);
-		n = dn_comp((const char *)data, cp, (int)(ep - cp - RRFIXEDSZ),
-			    dnptrs, lastdnptr);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		ns_put16(T_NULL, cp);
-		cp += INT16SZ;
-		ns_put16(class, cp);
-		cp += INT16SZ;
-		ns_put32(0, cp);
-		cp += INT32SZ;
-		ns_put16(0, cp);
-		cp += INT16SZ;
-		hp->arcount = htons(1);
-		break;
-
-	case IQUERY:
-		/*
-		 * Initialize answer section
-		 */
-		if (ep - cp < 1 + RRFIXEDSZ + datalen)
-			return (-1);
-		*cp++ = '\0';	/*%< no domain name */
-		ns_put16(type, cp);
-		cp += INT16SZ;
-		ns_put16(class, cp);
-		cp += INT16SZ;
-		ns_put32(0, cp);
-		cp += INT32SZ;
-		ns_put16(datalen, cp);
-		cp += INT16SZ;
-		if (datalen) {
-			memcpy(cp, data, (size_t)datalen);
-			cp += datalen;
-		}
-		hp->ancount = htons(1);
-		break;
-
-	default:
-		return (-1);
-	}
-	_DIAGASSERT(__type_fit(int, cp - buf));
-	return (int)(cp - buf);
-}
-
-#ifdef RES_USE_EDNS0
-/* attach OPT pseudo-RR, as documented in RFC2671 (EDNS0). */
-
-int
-res_nopt(res_state statp,
-	 int n0,		/*%< current offset in buffer */
-	 u_char *buf,		/*%< buffer to put query */
-	 int buflen,		/*%< size of buffer */
-	 int anslen)		/*%< UDP answer buffer size */
-{
-	register HEADER *hp;
-	register u_char *cp, *ep;
-	u_int16_t flags = 0;
-
-#ifdef DEBUG
-	if ((statp->options & RES_DEBUG) != 0U)
-		printf(";; res_nopt()\n");
-#endif
-
-	hp = (HEADER *)(void *)buf;
-	cp = buf + n0;
-	ep = buf + buflen;
-
-	if ((ep - cp) < 1 + RRFIXEDSZ)
-		return (-1);
-
-	*cp++ = 0;				/*%< "." */
-	ns_put16(ns_t_opt, cp);			/*%< TYPE */
-	cp += INT16SZ;
-	if (anslen > 0xffff)
-		anslen = 0xffff;
-	ns_put16(anslen, cp);			/*%< CLASS = UDP payload size */
-	cp += INT16SZ;
-	*cp++ = NOERROR;			/*%< extended RCODE */
-	*cp++ = 0;				/*%< EDNS version */
-
-	if (statp->options & RES_USE_DNSSEC) {
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf(";; res_opt()... ENDS0 DNSSEC\n");
-#endif
-		flags |= NS_OPT_DNSSEC_OK;
-	}
-	ns_put16(flags, cp);
-	cp += INT16SZ;
-
-	ns_put16(0U, cp);			/*%< RDLEN */
-	cp += INT16SZ;
-
-	hp->arcount = htons(ntohs(hp->arcount) + 1);
-
-	_DIAGASSERT(__type_fit(int, cp - buf));
-	return (int)(cp - buf);
-}
-
-/*
- * Construct variable data (RDATA) block for OPT psuedo-RR, append it
- * to the buffer, then update the RDLEN field (previously set to zero by
- * res_nopt()) with the new RDATA length.
- */
-int
-res_nopt_rdata(res_state statp,
-	  int n0,	 	/*%< current offset in buffer */
-	  u_char *buf,	 	/*%< buffer to put query */
-	  int buflen,		/*%< size of buffer */
-	  u_char *rdata,	/*%< ptr to start of opt rdata */
-	  u_short code,		/*%< OPTION-CODE */
-	  u_short len,		/*%< OPTION-LENGTH */
-	  u_char *data)		/*%< OPTION_DATA */
-{
-	register u_char *cp, *ep;
-
-#ifdef DEBUG
-	if ((statp->options & RES_DEBUG) != 0U)
-		printf(";; res_nopt_rdata()\n");
-#endif
-
-	cp = buf + n0;
-	ep = buf + buflen;
-
-	if ((ep - cp) < (4 + len))
-		return (-1);
-
-	if (rdata < (buf + 2) || rdata >= ep)
-		return (-1);
-
-	ns_put16(code, cp);
-	cp += INT16SZ;
-
-	ns_put16(len, cp);
-	cp += INT16SZ;
-
-	memcpy(cp, data, (size_t)len);
-	cp += len;
-
-	_DIAGASSERT(__type_fit(u_short, cp - rdata));
-	len = (u_short)(cp - rdata);
-	ns_put16(len, rdata - 2);	/* Update RDLEN field */
-
-	_DIAGASSERT(__type_fit(int, cp - buf));
-	return (int)(cp - buf);
-}
-#endif
-
-/*! \file */
diff --git a/lib/libc/resolv/res_private.h b/lib/libc/resolv/res_private.h
deleted file mode 100644
index 6f78bc0e7..000000000
--- a/lib/libc/resolv/res_private.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*	$NetBSD: res_private.h,v 1.3 2009/10/24 17:24:01 christos Exp $	*/
-
-#ifndef res_private_h
-#define res_private_h
-
-struct __res_state_ext {
-	union res_sockaddr_union nsaddrs[MAXNS];
-	struct sort_list {
-		int     af;
-		union {
-			struct in_addr  ina;
-			struct in6_addr in6a;
-		} addr, mask;
-	} sort_list[MAXRESOLVSORT];
-	char nsuffix[64];
-	char nsuffix2[64];
-	struct timespec res_conf_time;
-	int kq, resfd;
-};
-
-extern int res_ourserver_p(const res_state, const struct sockaddr *);
-extern int __res_vinit(res_state, int);
-
-#endif
-
-/*! \file */
diff --git a/lib/libc/resolv/res_query.c b/lib/libc/resolv/res_query.c
deleted file mode 100644
index 6dd6d1263..000000000
--- a/lib/libc/resolv/res_query.c
+++ /dev/null
@@ -1,478 +0,0 @@
-/*	$NetBSD: res_query.c,v 1.16 2015/02/24 17:56:20 christos Exp $	*/
-
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-/*
- * 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
- * CORPORATION 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) 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static const char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "Id: res_query.c,v 1.11 2008/11/14 02:36:51 marka Exp";
-#else
-__RCSID("$NetBSD: res_query.c,v 1.16 2015/02/24 17:56:20 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include "port_after.h"
-
-#if 0
-#ifdef __weak_alias
-__weak_alias(res_nquery,_res_nquery)
-__weak_alias(res_nsearch,_res_nsearch)
-__weak_alias(res_nquerydomain,__res_nquerydomain)
-__weak_alias(res_hostalias,__res_hostalias)
-#endif
-#endif
-
-/* Options.  Leave them on. */
-#ifndef DEBUG
-#define DEBUG
-#endif
-
-#if PACKETSZ > 1024
-#define MAXPACKET	PACKETSZ
-#else
-#define MAXPACKET	1024
-#endif
-
-/*%
- * Formulate a normal query, send, and await answer.
- * Returned answer is placed in supplied buffer "answer".
- * Perform preliminary check of answer, returning success only
- * if no error is indicated and the answer count is nonzero.
- * Return the size of the response on success, -1 on error.
- * Error number is left in H_ERRNO.
- *
- * Caller must parse answer and determine whether it answers the question.
- */
-int
-res_nquery(res_state statp,
-	   const char *name,	/*%< domain name */
-	   int class, int type,	/*%< class and type of query */
-	   u_char *answer,	/*%< buffer to put answer */
-	   int anslen)		/*%< size of answer buffer */
-{
-	u_char buf[MAXPACKET];
-	HEADER *hp = (HEADER *)(void *)answer;
-	u_int oflags;
-	u_char *rdata;
-	int n;
-
-	oflags = statp->_flags;
-
-again:
-	hp->rcode = NOERROR;	/*%< default */
-#ifdef DEBUG
-	if (statp->options & RES_DEBUG)
-		printf(";; res_query(%s, %d, %d)\n", name, class, type);
-#endif
-
-	n = res_nmkquery(statp, QUERY, name, class, type, NULL, 0, NULL,
-			 buf, (int)sizeof(buf));
-#ifdef RES_USE_EDNS0
-	if (n > 0 && (statp->_flags & RES_F_EDNS0ERR) == 0 &&
-	    (statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC|RES_NSID)) != 0U) {
-		n = res_nopt(statp, n, buf, (int)sizeof(buf), anslen);
-		rdata = &buf[n];
-		if (n > 0 && (statp->options & RES_NSID) != 0U) {
-			n = res_nopt_rdata(statp, n, buf, (int)sizeof(buf),
-			    rdata, NS_OPT_NSID, 0, NULL);
-		}
-	}
-#endif
-	if (n <= 0) {
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf(";; res_query: mkquery failed\n");
-#endif
-		RES_SET_H_ERRNO(statp, NO_RECOVERY);
-		return (n);
-	}
-
-	n = res_nsend(statp, buf, n, answer, anslen);
-	if (n < 0) {
-#ifdef RES_USE_EDNS0
-		/* if the query choked with EDNS0, retry without EDNS0 */
-		if ((statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0U &&
-		    ((oflags ^ statp->_flags) & RES_F_EDNS0ERR) != 0) {
-			statp->_flags |= RES_F_EDNS0ERR;
-			if (statp->options & RES_DEBUG)
-				printf(";; res_nquery: retry without EDNS0\n");
-			goto again;
-		}
-#endif
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf(";; res_query: send error\n");
-#endif
-		RES_SET_H_ERRNO(statp, TRY_AGAIN);
-		return (n);
-	}
-
-	if (hp->rcode != NOERROR || ntohs(hp->ancount) == 0) {
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf(";; rcode = (%s), counts = an:%d ns:%d ar:%d\n",
-			       p_rcode(hp->rcode),
-			       ntohs(hp->ancount),
-			       ntohs(hp->nscount),
-			       ntohs(hp->arcount));
-#endif
-		switch (hp->rcode) {
-		case NXDOMAIN:
-			RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-			break;
-		case SERVFAIL:
-			RES_SET_H_ERRNO(statp, TRY_AGAIN);
-			break;
-		case NOERROR:
-			RES_SET_H_ERRNO(statp, NO_DATA);
-			break;
-		case FORMERR:
-		case NOTIMP:
-		case REFUSED:
-		default:
-			RES_SET_H_ERRNO(statp, NO_RECOVERY);
-			break;
-		}
-		return (-1);
-	}
-	return (n);
-}
-
-/*%
- * Formulate a normal query, send, and retrieve answer in supplied buffer.
- * Return the size of the response on success, -1 on error.
- * If enabled, implement search rules until answer or unrecoverable failure
- * is detected.  Error code, if any, is left in H_ERRNO.
- */
-int
-res_nsearch(res_state statp,
-	    const char *name,	/*%< domain name */
-	    int class, int type,	/*%< class and type of query */
-	    u_char *answer,	/*%< buffer to put answer */
-	    int anslen)		/*%< size of answer */
-{
-	const char *cp, * const *domain;
-	HEADER *hp = (HEADER *)(void *)answer;
-	char tmp[NS_MAXDNAME];
-	u_int dots;
-	int trailing_dot, ret, saved_herrno;
-	int got_nodata = 0, got_servfail = 0, root_on_list = 0;
-	int tried_as_is = 0;
-	int searched = 0;
-
-	errno = 0;
-	RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);  /*%< True if we never query. */
-	dots = 0;
-	for (cp = name; *cp != '\0'; cp++)
-		dots += (*cp == '.');
-	trailing_dot = 0;
-	if (cp > name && *--cp == '.')
-		trailing_dot++;
-
-	/* If there aren't any dots, it could be a user-level alias. */
-	if (!dots && (cp = res_hostalias(statp, name, tmp, sizeof tmp))!= NULL)
-		return (res_nquery(statp, cp, class, type, answer, anslen));
-
-	/*
-	 * If there are enough dots in the name, let's just give it a
-	 * try 'as is'. The threshold can be set with the "ndots" option.
-	 * Also, query 'as is', if there is a trailing dot in the name.
-	 */
-	saved_herrno = -1;
-	if (dots >= statp->ndots || trailing_dot) {
-		ret = res_nquerydomain(statp, name, NULL, class, type,
-					 answer, anslen);
-		if (ret > 0 || trailing_dot)
-			return (ret);
-		saved_herrno = statp->res_h_errno;
-		tried_as_is++;
-	}
-
-	/*
-	 * We do at least one level of search if
-	 *	- there is no dot and RES_DEFNAME is set, or
-	 *	- there is at least one dot, there is no trailing dot,
-	 *	  and RES_DNSRCH is set.
-	 */
-	if ((!dots && (statp->options & RES_DEFNAMES) != 0U) ||
-	    (dots && !trailing_dot && (statp->options & RES_DNSRCH) != 0U)) {
-		int done = 0;
-
-		for (domain = (const char * const *)statp->dnsrch;
-		     *domain && !done;
-		     domain++) {
-			searched = 1;
-
-			if (domain[0][0] == '\0' ||
-			    (domain[0][0] == '.' && domain[0][1] == '\0'))
-				root_on_list++;
-
-			ret = res_nquerydomain(statp, name, *domain,
-					       class, type,
-					       answer, anslen);
-			if (ret > 0)
-				return (ret);
-
-			/*
-			 * If no server present, give up.
-			 * If name isn't found in this domain,
-			 * keep trying higher domains in the search list
-			 * (if that's enabled).
-			 * On a NO_DATA error, keep trying, otherwise
-			 * a wildcard entry of another type could keep us
-			 * from finding this entry higher in the domain.
-			 * If we get some other error (negative answer or
-			 * server failure), then stop searching up,
-			 * but try the input name below in case it's
-			 * fully-qualified.
-			 */
-			if (errno == ECONNREFUSED) {
-				RES_SET_H_ERRNO(statp, TRY_AGAIN);
-				return (-1);
-			}
-
-			switch (statp->res_h_errno) {
-			case NO_DATA:
-				got_nodata++;
-				/* FALLTHROUGH */
-			case HOST_NOT_FOUND:
-				/* keep trying */
-				break;
-			case TRY_AGAIN:
-				if (hp->rcode == SERVFAIL) {
-					/* try next search element, if any */
-					got_servfail++;
-					break;
-				}
-				/* FALLTHROUGH */
-			default:
-				/* anything else implies that we're done */
-				done++;
-			}
-
-			/* if we got here for some reason other than DNSRCH,
-			 * we only wanted one iteration of the loop, so stop.
-			 */
-			if ((statp->options & RES_DNSRCH) == 0U)
-				done++;
-		}
-	}
-
-	/*
-	 * If the query has not already been tried as is then try it
-	 * unless RES_NOTLDQUERY is set and there were no dots.
-	 */
-	if ((dots || !searched || (statp->options & RES_NOTLDQUERY) == 0U) &&
-	    !(tried_as_is || root_on_list)) {
-		ret = res_nquerydomain(statp, name, NULL, class, type,
-				       answer, anslen);
-		if (ret > 0)
-			return (ret);
-	}
-
-	/* if we got here, we didn't satisfy the search.
-	 * if we did an initial full query, return that query's H_ERRNO
-	 * (note that we wouldn't be here if that query had succeeded).
-	 * else if we ever got a nodata, send that back as the reason.
-	 * else send back meaningless H_ERRNO, that being the one from
-	 * the last DNSRCH we did.
-	 */
-	if (saved_herrno != -1)
-		RES_SET_H_ERRNO(statp, saved_herrno);
-	else if (got_nodata)
-		RES_SET_H_ERRNO(statp, NO_DATA);
-	else if (got_servfail)
-		RES_SET_H_ERRNO(statp, TRY_AGAIN);
-	return (-1);
-}
-
-/*%
- * Perform a call on res_query on the concatenation of name and domain,
- * removing a trailing dot from name if domain is NULL.
- */
-int
-res_nquerydomain(res_state statp,
-	    const char *name,
-	    const char *domain,
-	    int class, int type,	/*%< class and type of query */
-	    u_char *answer,		/*%< buffer to put answer */
-	    int anslen)		/*%< size of answer */
-{
-	char nbuf[MAXDNAME];
-	const char *longname = nbuf;
-	size_t n, d;
-
-#ifdef DEBUG
-	if (statp->options & RES_DEBUG)
-		printf(";; res_nquerydomain(%s, %s, %d, %d)\n",
-		       name, domain?domain:"<Nil>", class, type);
-#endif
-	if (domain == NULL) {
-		/*
-		 * Check for trailing '.';
-		 * copy without '.' if present.
-		 */
-		n = strlen(name);
-		if (n >= MAXDNAME) {
-			RES_SET_H_ERRNO(statp, NO_RECOVERY);
-			return (-1);
-		}
-		if (n && name[--n] == '.') {
-			strncpy(nbuf, name, n);
-			nbuf[n] = '\0';
-		} else
-			longname = name;
-	} else {
-		n = strlen(name);
-		d = strlen(domain);
-		if (n + d + 1 >= MAXDNAME) {
-			RES_SET_H_ERRNO(statp, NO_RECOVERY);
-			return (-1);
-		}
-		sprintf(nbuf, "%s.%s", name, domain);
-	}
-	return (res_nquery(statp, longname, class, type, answer, anslen));
-}
-
-const char *
-res_hostalias(const res_state statp, const char *name, char *dst, size_t siz) {
-	char *file, *cp1, *cp2;
-	char buf[BUFSIZ];
-	FILE *fp;
-
-	if (statp->options & RES_NOALIASES)
-		return (NULL);
-	/*
-	 * forbid hostaliases for setuid binary, due to possible security
-	 * breach.
-	 */
-	if (issetugid())
-		return (NULL);
-	file = getenv("HOSTALIASES");
-	if (file == NULL || (fp = fopen(file, "re")) == NULL)
-		return (NULL);
-	buf[sizeof(buf) - 1] = '\0';
-	while (fgets(buf, (int)sizeof(buf), fp)) {
-		for (cp1 = buf; *cp1 && !isspace((unsigned char)*cp1); ++cp1)
-			;
-		if (!*cp1)
-			break;
-		*cp1 = '\0';
-		if (ns_samename(buf, name) == 1) {
-			while (isspace((unsigned char)*++cp1))
-				;
-			if (!*cp1)
-				break;
-			for (cp2 = cp1 + 1; *cp2 &&
-			     !isspace((unsigned char)*cp2); ++cp2)
-				;
-			*cp2 = '\0';
-			strncpy(dst, cp1, siz - 1);
-			dst[siz - 1] = '\0';
-			fclose(fp);
-			return (dst);
-		}
-	}
-	fclose(fp);
-	return (NULL);
-}
-
-/*! \file */
diff --git a/lib/libc/resolv/res_send.c b/lib/libc/resolv/res_send.c
deleted file mode 100644
index 0c67a73d6..000000000
--- a/lib/libc/resolv/res_send.c
+++ /dev/null
@@ -1,1225 +0,0 @@
-/*	$NetBSD: res_send.c,v 1.30 2015/02/24 17:56:20 christos Exp $	*/
-
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-/*
- * 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
- * CORPORATION 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) 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#ifdef notdef
-static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "Id: res_send.c,v 1.22 2009/01/22 23:49:23 tbox Exp";
-#else
-__RCSID("$NetBSD: res_send.c,v 1.30 2015/02/24 17:56:20 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*! \file
- * \brief
- * Send query to name server and wait for reply.
- */
-
-#include "namespace.h"
-#include "port_before.h"
-#ifndef USE_KQUEUE
-#include "fd_setsize.h"
-#endif /* USE_KQUEUE */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#ifdef USE_KQUEUE
-#include <sys/event.h>
-#endif /* USE_KQUEUE */
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <signal.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <isc/eventlib.h>
-
-#include "port_after.h"
-
-#if 0
-#ifdef __weak_alias
-__weak_alias(res_ourserver_p,__res_ourserver_p)
-__weak_alias(res_nameinquery,__res_nameinquery)
-__weak_alias(res_queriesmatch,__res_queriesmatch)
-__weak_alias(res_nsend,__res_nsend)
-#endif
-#endif
-
-#ifndef SOCK_NOSIGPIPE
-#define SOCK_NOSIGPIPE 0
-#endif
-#ifndef SOCK_NOCLOEXEC
-#define SOCK_NOCLOEXEC 0
-#endif
-
-#ifdef USE_POLL
-#ifdef HAVE_STROPTS_H
-#include <stropts.h>
-#endif
-#include <poll.h>
-#endif /* USE_POLL */
-
-/* Options.  Leave them on. */
-#ifndef DEBUG
-#define DEBUG
-#endif
-#include "res_debug.h"
-#include "res_private.h"
-
-#define EXT(res) ((res)->_u._ext)
-
-#if !defined(USE_POLL) && !defined(USE_KQUEUE)
-static const int highestFD = FD_SETSIZE - 1;
-#endif
-
-/* Forward. */
-
-static socklen_t	get_salen(const struct sockaddr *);
-static struct sockaddr * get_nsaddr(res_state, size_t);
-static int		send_vc(res_state, const void *, size_t,
-				u_char *, int, int *, int);
-static int		send_dg(res_state,
-#ifdef USE_KQUEUE
-				int,
-#endif
-				const void *, size_t,
-				u_char *, int, int *, int, int,
-				int *, int *);
-static void		Aerror(const res_state, FILE *, const char *, int,
-			       const struct sockaddr *, socklen_t);
-static void		Perror(const res_state, FILE *, const char *, int);
-static int		sock_eq(struct sockaddr *, struct sockaddr *);
-#if defined(NEED_PSELECT) && !defined(USE_POLL) && !defined(USE_KQUEUE)
-static int		pselect(int, void *, void *, void *,
-				struct timespec *,
-				const sigset_t *);
-#endif
-void res_pquery(const res_state, const u_char *, int, FILE *);
-
-static const int niflags = NI_NUMERICHOST | NI_NUMERICSERV;
-
-/* Public. */
-
-/*%
- *	looks up "ina" in _res.ns_addr_list[]
- *
- * returns:
- *\li	0  : not found
- *\li	>0 : found
- *
- * author:
- *\li	paul vixie, 29may94
- */
-int
-res_ourserver_p(const res_state statp, const struct sockaddr *sa) {
-	const struct sockaddr_in *inp, *srv;
-	const struct sockaddr_in6 *in6p, *srv6;
-	int ns;
-
-	switch (sa->sa_family) {
-	case AF_INET:
-		inp = (const struct sockaddr_in *)(const void *)sa;
-		for (ns = 0;  ns < statp->nscount;  ns++) {
-			srv = (struct sockaddr_in *)(void *)get_nsaddr(statp, (size_t)ns);
-			if (srv->sin_family == inp->sin_family &&
-			    srv->sin_port == inp->sin_port &&
-			    (srv->sin_addr.s_addr == INADDR_ANY ||
-			     srv->sin_addr.s_addr == inp->sin_addr.s_addr))
-				return (1);
-		}
-		break;
-	case AF_INET6:
-		if (EXT(statp).ext == NULL)
-			break;
-		in6p = (const struct sockaddr_in6 *)(const void *)sa;
-		for (ns = 0;  ns < statp->nscount;  ns++) {
-			srv6 = (struct sockaddr_in6 *)(void *)get_nsaddr(statp, (size_t)ns);
-			if (srv6->sin6_family == in6p->sin6_family &&
-			    srv6->sin6_port == in6p->sin6_port &&
-#ifdef HAVE_SIN6_SCOPE_ID
-			    (srv6->sin6_scope_id == 0 ||
-			     srv6->sin6_scope_id == in6p->sin6_scope_id) &&
-#endif
-			    (IN6_IS_ADDR_UNSPECIFIED(&srv6->sin6_addr) ||
-			     IN6_ARE_ADDR_EQUAL(&srv6->sin6_addr, &in6p->sin6_addr)))
-				return (1);
-		}
-		break;
-	default:
-		break;
-	}
-	return (0);
-}
-
-/*%
- *	look for (name,type,class) in the query section of packet (buf,eom)
- *
- * requires:
- *\li	buf + HFIXEDSZ <= eom
- *
- * returns:
- *\li	-1 : format error
- *\li	0  : not found
- *\li	>0 : found
- *
- * author:
- *\li	paul vixie, 29may94
- */
-int
-res_nameinquery(const char *name, int type, int class,
-		const u_char *buf, const u_char *eom)
-{
-	const u_char *cp = buf + HFIXEDSZ;
-	int qdcount = ntohs(((const HEADER*)(const void *)buf)->qdcount);
-
-	while (qdcount-- > 0) {
-		char tname[MAXDNAME+1];
-		int n, ttype, tclass;
-
-		n = dn_expand(buf, eom, cp, tname, (int)sizeof tname);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		if (cp + 2 * INT16SZ > eom)
-			return (-1);
-		ttype = ns_get16(cp); cp += INT16SZ;
-		tclass = ns_get16(cp); cp += INT16SZ;
-		if (ttype == type && tclass == class &&
-		    ns_samename(tname, name) == 1)
-			return (1);
-	}
-	return (0);
-}
-
-/*%
- *	is there a 1:1 mapping of (name,type,class)
- *	in (buf1,eom1) and (buf2,eom2)?
- *
- * returns:
- *\li	-1 : format error
- *\li	0  : not a 1:1 mapping
- *\li	>0 : is a 1:1 mapping
- *
- * author:
- *\li	paul vixie, 29may94
- */
-int
-res_queriesmatch(const u_char *buf1, const u_char *eom1,
-		 const u_char *buf2, const u_char *eom2)
-{
-	const u_char *cp = buf1 + HFIXEDSZ;
-	int qdcount = ntohs(((const HEADER*)(const void *)buf1)->qdcount);
-
-	if (buf1 + HFIXEDSZ > eom1 || buf2 + HFIXEDSZ > eom2)
-		return (-1);
-
-	/*
-	 * Only header section present in replies to
-	 * dynamic update packets.
-	 */
-	if ((((const HEADER *)(const void *)buf1)->opcode == ns_o_update) &&
-	    (((const HEADER *)(const void *)buf2)->opcode == ns_o_update))
-		return (1);
-
-	if (qdcount != ntohs(((const HEADER*)(const void *)buf2)->qdcount))
-		return (0);
-	while (qdcount-- > 0) {
-		char tname[MAXDNAME+1];
-		int n, ttype, tclass;
-
-		n = dn_expand(buf1, eom1, cp, tname, (int)sizeof tname);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		if (cp + 2 * INT16SZ > eom1)
-			return (-1);
-		ttype = ns_get16(cp);	cp += INT16SZ;
-		tclass = ns_get16(cp); cp += INT16SZ;
-		if (!res_nameinquery(tname, ttype, tclass, buf2, eom2))
-			return (0);
-	}
-	return (1);
-}
-
-int
-res_nsend(res_state statp,
-	  const u_char *buf, int buflen, u_char *ans, int anssiz)
-{
-	int gotsomewhere, terrno, tries, v_circuit, resplen, ns, n;
-#ifdef USE_KQUEUE
-	int kq;
-#endif
-	char abuf[NI_MAXHOST];
-
-	(void)res_check(statp, NULL);
-
-	/* No name servers or res_init() failure */
-	if (statp->nscount == 0 || EXT(statp).ext == NULL) {
-		errno = ESRCH;
-		return (-1);
-	}
-	if (anssiz < HFIXEDSZ) {
-		errno = EINVAL;
-		return (-1);
-	}
-	DprintQ((statp->options & RES_DEBUG) || (statp->pfcode & RES_PRF_QUERY),
-		(stdout, ";; res_send()\n"), buf, buflen);
-	v_circuit = (statp->options & RES_USEVC) || buflen > PACKETSZ;
-	gotsomewhere = 0;
-	terrno = ETIMEDOUT;
-
-#ifdef USE_KQUEUE
-	if ((kq = kqueue1(O_CLOEXEC)) == -1) {
-		return (-1);
-	}
-#endif
-
-	/*
-	 * If the ns_addr_list in the resolver context has changed, then
-	 * invalidate our cached copy and the associated timing data.
-	 */
-	if (EXT(statp).nscount != 0) {
-		int needclose = 0;
-		struct sockaddr_storage peer;
-		ISC_SOCKLEN_T peerlen;
-
-		if (EXT(statp).nscount != statp->nscount)
-			needclose++;
-		else
-			for (ns = 0; ns < statp->nscount; ns++) {
-				if (statp->nsaddr_list[ns].sin_family &&
-				    !sock_eq((struct sockaddr *)(void *)&statp->nsaddr_list[ns],
-					     (struct sockaddr *)(void *)&EXT(statp).ext->nsaddrs[ns])) {
-					needclose++;
-					break;
-				}
-
-				if (EXT(statp).nssocks[ns] == -1)
-					continue;
-				peerlen = sizeof(peer);
-				if (getpeername(EXT(statp).nssocks[ns],
-				    (struct sockaddr *)(void *)&peer, &peerlen) < 0) {
-					needclose++;
-					break;
-				}
-				if (!sock_eq((struct sockaddr *)(void *)&peer,
-				    get_nsaddr(statp, (size_t)ns))) {
-					needclose++;
-					break;
-				}
-			}
-		if (needclose) {
-			res_nclose(statp);
-			EXT(statp).nscount = 0;
-		}
-	}
-
-	/*
-	 * Maybe initialize our private copy of the ns_addr_list.
-	 */
-	if (EXT(statp).nscount == 0) {
-		for (ns = 0; ns < statp->nscount; ns++) {
-			EXT(statp).nstimes[ns] = RES_MAXTIME;
-			EXT(statp).nssocks[ns] = -1;
-			if (!statp->nsaddr_list[ns].sin_family)
-				continue;
-			EXT(statp).ext->nsaddrs[ns].sin =
-				 statp->nsaddr_list[ns];
-		}
-		EXT(statp).nscount = statp->nscount;
-	}
-
-	/*
-	 * Some resolvers want to even out the load on their nameservers.
-	 * Note that RES_BLAST overrides RES_ROTATE.
-	 */
-	if ((statp->options & RES_ROTATE) != 0U &&
-	    (statp->options & RES_BLAST) == 0U) {
-		union res_sockaddr_union inu;
-		struct sockaddr_in ina;
-		int lastns = statp->nscount - 1;
-		int fd;
-		u_int16_t nstime;
-
-		if (EXT(statp).ext != NULL)
-			inu = EXT(statp).ext->nsaddrs[0];
-		ina = statp->nsaddr_list[0];
-		fd = EXT(statp).nssocks[0];
-		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 + 1];
-			statp->nsaddr_list[ns] = statp->nsaddr_list[ns + 1];
-			EXT(statp).nssocks[ns] = EXT(statp).nssocks[ns + 1];
-			EXT(statp).nstimes[ns] = EXT(statp).nstimes[ns + 1];
-		}
-		if (EXT(statp).ext != NULL)
-			EXT(statp).ext->nsaddrs[lastns] = inu;
-		statp->nsaddr_list[lastns] = ina;
-		EXT(statp).nssocks[lastns] = fd;
-		EXT(statp).nstimes[lastns] = nstime;
-	}
-
-	/*
-	 * Send request, RETRY times, or until successful.
-	 */
-	for (tries = 0; tries < statp->retry; tries++) {
-	    for (ns = 0; ns < statp->nscount; ns++) {
-		struct sockaddr *nsap;
-		socklen_t nsaplen;
-		nsap = get_nsaddr(statp, (size_t)ns);
-		nsaplen = get_salen(nsap);
-		statp->_flags &= ~RES_F_LASTMASK;
-		statp->_flags |= (ns << RES_F_LASTSHIFT);
- same_ns:
-		if (statp->qhook) {
-			int done = 0, loops = 0;
-
-			do {
-				res_sendhookact act;
-
-				act = (*statp->qhook)(&nsap, &buf, &buflen,
-						      ans, anssiz, &resplen);
-				switch (act) {
-				case res_goahead:
-					done = 1;
-					break;
-				case res_nextns:
-					res_nclose(statp);
-					goto next_ns;
-				case res_done:
-#ifdef USE_KQUEUE
-					close(kq);
-#endif
-					return (resplen);
-				case res_modified:
-					/* give the hook another try */
-					if (++loops < 42) /*doug adams*/
-						break;
-					/*FALLTHROUGH*/
-				case res_error:
-					/*FALLTHROUGH*/
-				default:
-					goto fail;
-				}
-			} while (!done);
-		}
-
-		Dprint(((statp->options & RES_DEBUG) &&
-			getnameinfo(nsap, nsaplen, abuf,
-			    (socklen_t)sizeof(abuf), NULL, 0, niflags) == 0),
-		       (stdout, ";; Querying server (# %d) address = %s\n",
-			ns + 1, abuf));
-
-
-		if (v_circuit) {
-			/* Use VC; at most one attempt per server. */
-			tries = statp->retry;
-			n = send_vc(statp, buf, (size_t)buflen, ans, anssiz, &terrno,
-				    ns);
-			if (n < 0)
-				goto fail;
-			if (n == 0)
-				goto next_ns;
-			resplen = n;
-		} else {
-			/* Use datagrams. */
-			n = send_dg(statp,
-#ifdef USE_KQUEUE
-			    kq,
-#endif
-			    buf, (size_t)buflen, ans, anssiz, &terrno,
-			    ns, tries, &v_circuit, &gotsomewhere);
-			if (n < 0)
-				goto fail;
-			if (n == 0)
-				goto next_ns;
-			if (v_circuit)
-				goto same_ns;
-			resplen = n;
-		}
-
-		Dprint((statp->options & RES_DEBUG) ||
-		       ((statp->pfcode & RES_PRF_REPLY) &&
-			(statp->pfcode & RES_PRF_HEAD1)),
-		       (stdout, ";; got answer:\n"));
-
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, "%s", ""),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-
-		/*
-		 * If we have temporarily opened a virtual circuit,
-		 * or if we haven't been asked to keep a socket open,
-		 * close the socket.
-		 */
-		if ((v_circuit && (statp->options & RES_USEVC) == 0U) ||
-		    (statp->options & RES_STAYOPEN) == 0U) {
-			res_nclose(statp);
-		}
-		if (statp->rhook) {
-			int done = 0, loops = 0;
-
-			do {
-				res_sendhookact act;
-
-				act = (*statp->rhook)(nsap, buf, buflen,
-						      ans, anssiz, &resplen);
-				switch (act) {
-				case res_goahead:
-				case res_done:
-					done = 1;
-					break;
-				case res_nextns:
-					res_nclose(statp);
-					goto next_ns;
-				case res_modified:
-					/* give the hook another try */
-					if (++loops < 42) /*doug adams*/
-						break;
-					/*FALLTHROUGH*/
-				case res_error:
-					/*FALLTHROUGH*/
-				default:
-					goto fail;
-				}
-			} while (!done);
-
-		}
-#ifdef USE_KQUEUE
-		close(kq);
-#endif
-		return (resplen);
- next_ns: ;
-	   } /*foreach ns*/
-	} /*foreach retry*/
-	res_nclose(statp);
-#ifdef USE_KQUEUE
-	close(kq);
-#endif
-	if (!v_circuit) {
-		if (!gotsomewhere)
-			errno = ECONNREFUSED;	/*%< no nameservers found */
-		else
-			errno = ETIMEDOUT;	/*%< no answer obtained */
-	} else
-		errno = terrno;
-	return (-1);
- fail:
-	res_nclose(statp);
-#ifdef USE_KQUEUE
-	close(kq);
-#endif
-	return (-1);
-}
-
-/* Private */
-
-static socklen_t
-get_salen(const struct sockaddr *sa)
-{
-
-#ifdef HAVE_SA_LEN
-	/* There are people do not set sa_len.  Be forgiving to them. */
-	if (sa->sa_len)
-		return (socklen_t)sa->sa_len;
-#endif
-
-	if (sa->sa_family == AF_INET)
-		return (socklen_t)sizeof(struct sockaddr_in);
-	else if (sa->sa_family == AF_INET6)
-		return (socklen_t)sizeof(struct sockaddr_in6);
-	else
-		return 0;	/*%< unknown, die on connect */
-}
-
-/*%
- * pick appropriate nsaddr_list for use.  see res_init() for initialization.
- */
-static struct sockaddr *
-get_nsaddr(res_state statp, size_t n)
-{
-
-	if (!statp->nsaddr_list[n].sin_family && EXT(statp).ext) {
-		/*
-		 * - EXT(statp).ext->nsaddrs[n] holds an address that is larger
-		 *   than struct sockaddr, and
-		 * - user code did not update statp->nsaddr_list[n].
-		 */
-		return (struct sockaddr *)(void *)&EXT(statp).ext->nsaddrs[n];
-	} else {
-		/*
-		 * - user code updated statp->nsaddr_list[n], or
-		 * - statp->nsaddr_list[n] has the same content as
-		 *   EXT(statp).ext->nsaddrs[n].
-		 */
-		return (struct sockaddr *)(void *)&statp->nsaddr_list[n];
-	}
-}
-
-static int
-send_vc(res_state statp,
-	const void *buf, size_t buflen, u_char *ans, int anssiz,
-	int *terrno, int ns)
-{
-	const HEADER *hp = (const HEADER *)(const void *)buf;
-	HEADER *anhp = (HEADER *)(void *)ans;
-	struct sockaddr *nsap;
-	socklen_t nsaplen;
-	int truncating, connreset, resplen;
-	ssize_t n;
-	struct iovec iov[2];
-	u_short len;
-	u_char *cp;
-	void *tmp;
-#if defined(SO_NOSIGPIPE) && SOCK_NOSIGPIPE == 0
-	int on = 1;
-#endif
-
-	nsap = get_nsaddr(statp, (size_t)ns);
-	nsaplen = get_salen(nsap);
-
-	connreset = 0;
- same_ns:
-	truncating = 0;
-
-	/* Are we still talking to whom we want to talk to? */
-	if (statp->_vcsock >= 0 && (statp->_flags & RES_F_VC) != 0) {
-		struct sockaddr_storage peer;
-		ISC_SOCKLEN_T size = sizeof peer;
-
-		if (getpeername(statp->_vcsock,
-				(struct sockaddr *)(void *)&peer, &size) < 0 ||
-		    !sock_eq((struct sockaddr *)(void *)&peer, nsap)) {
-			res_nclose(statp);
-			statp->_flags &= ~RES_F_VC;
-		}
-	}
-
-	if (statp->_vcsock < 0 || (statp->_flags & RES_F_VC) == 0) {
-		if (statp->_vcsock >= 0)
-			res_nclose(statp);
-
-		statp->_vcsock = socket(nsap->sa_family, SOCK_STREAM
-			| SOCK_NOSIGPIPE | SOCK_CLOEXEC, 0);
-#if SOCK_CLOEXEC == 0
-		fcntl(statp->_vcsock, F_SETFD, FD_CLOEXEC);
-#endif
-#if !defined(USE_POLL) && !defined(USE_KQUEUE)
-		if (statp->_vcsock > highestFD) {
-			res_nclose(statp);
-			errno = ENOTSOCK;
-		}
-#endif
-		if (statp->_vcsock < 0) {
-			switch (errno) {
-			case EPROTONOSUPPORT:
-#ifdef EPFNOSUPPORT
-			case EPFNOSUPPORT:
-#endif
-			case EAFNOSUPPORT:
-				Perror(statp, stderr, "socket(vc)", errno);
-				return (0);
-			default:
-				*terrno = errno;
-				Perror(statp, stderr, "socket(vc)", errno);
-				return (-1);
-			}
-		}
-#if defined(SO_NOSIGPIPE) && SOCK_NOSIGPIPE == 0
-		/*
-		 * Disable generation of SIGPIPE when writing to a closed
-		 * socket.  Write should return -1 and set errno to EPIPE
-		 * instead.
-		 *
-		 * Push on even if setsockopt(SO_NOSIGPIPE) fails.
-		 */
-		(void)setsockopt(statp->_vcsock, SOL_SOCKET, SO_NOSIGPIPE, &on,
-				 (socklen_t)sizeof(on));
-#endif
-		errno = 0;
-		if (connect(statp->_vcsock, nsap, nsaplen) < 0) {
-			*terrno = errno;
-			Aerror(statp, stderr, "connect/vc", errno, nsap,
-			    nsaplen);
-			res_nclose(statp);
-			return (0);
-		}
-		statp->_flags |= RES_F_VC;
-	}
-
-	/*
-	 * Send length & message
-	 */
-	ns_put16((u_short)buflen, (u_char*)(void *)&len);
-	iov[0] = evConsIovec(&len, INT16SZ);
-	DE_CONST(buf, tmp);
-	iov[1] = evConsIovec(tmp, (size_t)buflen);
-	if (writev(statp->_vcsock, iov, 2) != (ssize_t)(INT16SZ + buflen)) {
-		*terrno = errno;
-		Perror(statp, stderr, "write failed", errno);
-		res_nclose(statp);
-		return (0);
-	}
-	/*
-	 * Receive length & response
-	 */
- read_len:
-	cp = ans;
-	len = INT16SZ;
-	while ((n = read(statp->_vcsock, (char *)cp, (size_t)len)) > 0) {
-		cp += n;
-		if ((len -= (u_short)n) == 0)
-			break;
-	}
-	if (n <= 0) {
-		*terrno = errno;
-		Perror(statp, stderr, "read failed", errno);
-		res_nclose(statp);
-		/*
-		 * A long running process might get its TCP
-		 * connection reset if the remote server was
-		 * restarted.  Requery the server instead of
-		 * trying a new one.  When there is only one
-		 * server, this means that a query might work
-		 * instead of failing.  We only allow one reset
-		 * per query to prevent looping.
-		 */
-		if (*terrno == ECONNRESET && !connreset) {
-			connreset = 1;
-			res_nclose(statp);
-			goto same_ns;
-		}
-		res_nclose(statp);
-		return (0);
-	}
-	resplen = ns_get16(ans);
-	if (resplen > anssiz) {
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; response truncated\n")
-		       );
-		truncating = 1;
-		len = anssiz;
-	} else
-		len = resplen;
-	if (len < HFIXEDSZ) {
-		/*
-		 * Undersized message.
-		 */
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; undersized: %d\n", len));
-		*terrno = EMSGSIZE;
-		res_nclose(statp);
-		return (0);
-	}
-	cp = ans;
-	while (len != 0 && (n = read(statp->_vcsock, (char *)cp, (size_t)len)) > 0){
-		cp += n;
-		len -= (u_short)n;
-	}
-	if (n <= 0) {
-		*terrno = errno;
-		Perror(statp, stderr, "read(vc)", errno);
-		res_nclose(statp);
-		return (0);
-	}
-	if (truncating) {
-		/*
-		 * Flush rest of answer so connection stays in synch.
-		 */
-		anhp->tc = 1;
-		len = resplen - anssiz;
-		while (len != 0) {
-			char junk[PACKETSZ];
-
-			n = read(statp->_vcsock, junk,
-				 (len > sizeof junk) ? sizeof junk : len);
-			if (n > 0)
-				len -= (u_short)n;
-			else
-				break;
-		}
-	}
-	/*
-	 * If the calling applicating has bailed out of
-	 * a previous call and failed to arrange to have
-	 * the circuit closed or the server has got
-	 * itself confused, then drop the packet and
-	 * wait for the correct one.
-	 */
-	if (hp->id != anhp->id) {
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, ";; old answer (unexpected):\n"),
-			ans, (resplen > anssiz) ? anssiz: resplen);
-		goto read_len;
-	}
-
-	/*
-	 * All is well, or the error is fatal.  Signal that the
-	 * next nameserver ought not be tried.
-	 */
-	return (resplen);
-}
-
-static int
-send_dg(res_state statp,
-#ifdef USE_KQUEUE
-	int kq,
-#endif
-	const void *buf, size_t buflen, u_char *ans,
-	int anssiz, int *terrno, int ns, int tries, int *v_circuit,
-	int *gotsomewhere)
-{
-	const HEADER *hp = (const HEADER *)(const void *)buf;
-	HEADER *anhp = (HEADER *)(void *)ans;
-	const struct sockaddr *nsap;
-	socklen_t nsaplen;
-	struct timespec now, timeout, finish;
-	struct sockaddr_storage from;
-	ISC_SOCKLEN_T fromlen;
-	ssize_t resplen;
-	int seconds, n, s;
-#ifdef USE_KQUEUE
-	struct kevent kv;
-#else
-#ifdef USE_POLL
-	int     polltimeout;
-	struct pollfd   pollfd;
-#else
-	fd_set dsmask;
-#endif
-#endif
-
-	nsap = get_nsaddr(statp, (size_t)ns);
-	nsaplen = get_salen(nsap);
-	if (EXT(statp).nssocks[ns] == -1) {
-		EXT(statp).nssocks[ns] = socket(nsap->sa_family, SOCK_DGRAM
-			| SOCK_CLOEXEC, 0);
-#if SOCK_CLOEXEC == 0
-		fcntl(EXT(statp)nssocks[ns], F_SETFD, FD_CLOEXEC);
-#endif
-#if !defined(USE_POLL) && !defined(USE_KQUEUE)
-		if (EXT(statp).nssocks[ns] > highestFD) {
-			res_nclose(statp);
-			errno = ENOTSOCK;
-		}
-#endif
-		if (EXT(statp).nssocks[ns] < 0) {
-			switch (errno) {
-			case EPROTONOSUPPORT:
-#ifdef EPFNOSUPPORT
-			case EPFNOSUPPORT:
-#endif
-			case EAFNOSUPPORT:
-				Perror(statp, stderr, "socket(dg)", errno);
-				return (0);
-			default:
-				*terrno = errno;
-				Perror(statp, stderr, "socket(dg)", errno);
-				return (-1);
-			}
-		}
-#ifndef CANNOT_CONNECT_DGRAM
-		/*
-		 * On a 4.3BSD+ machine (client and server,
-		 * actually), sending to a nameserver datagram
-		 * port with no nameserver will cause an
-		 * ICMP port unreachable message to be returned.
-		 * If our datagram socket is "connected" to the
-		 * server, we get an ECONNREFUSED error on the next
-		 * socket operation, and select returns if the
-		 * error message is received.  We can thus detect
-		 * the absence of a nameserver without timing out.
-		 *
-		 * When the option "insecure1" is specified, we'd
-		 * rather expect to see responses from an "unknown"
-		 * address.  In order to let the kernel accept such
-		 * responses, do not connect the socket here.
-		 * XXX: or do we need an explicit option to disable
-		 * connecting?
- 		 */
-		if (!(statp->options & RES_INSECURE1) &&
-		    connect(EXT(statp).nssocks[ns], nsap, nsaplen) < 0) {
-			Aerror(statp, stderr, "connect(dg)", errno, nsap,
-			    nsaplen);
-			res_nclose(statp);
-			return (0);
-		}
-#endif /* !CANNOT_CONNECT_DGRAM */
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; new DG socket\n"))
-	}
-	s = EXT(statp).nssocks[ns];
-#ifndef CANNOT_CONNECT_DGRAM
-	if (statp->options & RES_INSECURE1) {
-		if (sendto(s, buf, buflen, 0, nsap, nsaplen) !=
-		    (ssize_t)buflen) {
-			Aerror(statp, stderr, "sendto", errno, nsap, nsaplen);
-			res_nclose(statp);
-			return (0);
-		}
-	} else if (send(s, buf, buflen, 0) != (ssize_t)buflen) {
-		Perror(statp, stderr, "send", errno);
-		res_nclose(statp);
-		return (0);
-	}
-#else /* !CANNOT_CONNECT_DGRAM */
-	if (sendto(s, buf, buflen, 0, nsap, nsaplen) != (ssize_t)buflen)
-	{
-		Aerror(statp, stderr, "sendto", errno, nsap, nsaplen);
-		res_nclose(statp);
-		return (0);
-	}
-#endif /* !CANNOT_CONNECT_DGRAM */
-
-	/*
-	 * Wait for reply.
-	 */
-	seconds = (statp->retrans << tries);
-	if (ns > 0)
-		seconds /= statp->nscount;
-	if (seconds <= 0)
-		seconds = 1;
-	now = evNowTime();
-	timeout = evConsTime((time_t)seconds, 0L);
-	finish = evAddTime(now, timeout);
-	goto nonow;
- wait:
-	now = evNowTime();
- nonow:
-#ifndef USE_POLL
-	if (evCmpTime(finish, now) > 0)
-		timeout = evSubTime(finish, now);
-	else
-		timeout = evConsTime(0L, 0L);
-#ifdef USE_KQUEUE
-	EV_SET(&kv, s, EVFILT_READ, EV_ADD | EV_ONESHOT, 0, 0, 0);
-	n = kevent(kq, &kv, 1, &kv, 1, &timeout);
-#else
-	FD_ZERO(&dsmask);
-	FD_SET(s, &dsmask);
-	n = pselect(s + 1, &dsmask, NULL, NULL, &timeout, NULL);
-#endif
-#else
-	timeout = evSubTime(finish, now);
-	if (timeout.tv_sec < 0)
-		timeout = evConsTime((time_t)0, 0L);
-	polltimeout = 1000*(int)timeout.tv_sec +
-		(int)timeout.tv_nsec/1000000;
-	pollfd.fd = s;
-	pollfd.events = POLLRDNORM;
-	n = poll(&pollfd, 1, polltimeout);
-#endif /* USE_POLL */
-
-	if (n == 0) {
-		Dprint(statp->options & RES_DEBUG, (stdout, ";; timeout\n"));
-		*gotsomewhere = 1;
-		return (0);
-	}
-	if (n < 0) {
-#if defined(USE_POLL)
-		static const char *fun = "poll";
-#elif defined(USE_SELECT)
-		static const char *fun = "select";
-#elif defined(USE_KQUEUE)
-		static const char *fun = "kevent";
-#endif
-		if (errno == EINTR)
-			goto wait;
-		Perror(statp, stderr, fun, errno);
-		res_nclose(statp);
-		return (0);
-	}
-#ifdef USE_KQUEUE
-	if ((int)kv.ident != s)
-		goto wait;
-#endif
-	errno = 0;
-	fromlen = sizeof(from);
-	resplen = recvfrom(s, (char*)ans, (size_t)anssiz,0,
-			   (struct sockaddr *)(void *)&from, &fromlen);
-	if (resplen <= 0) {
-		Perror(statp, stderr, "recvfrom", errno);
-		res_nclose(statp);
-		return (0);
-	}
-	*gotsomewhere = 1;
-	if (resplen < HFIXEDSZ) {
-		/*
-		 * Undersized message.
-		 */
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; undersized: %zd\n",
-			resplen));
-		*terrno = EMSGSIZE;
-		res_nclose(statp);
-		return (0);
-	}
-	if (hp->id != anhp->id) {
-		/*
-		 * response from old query, ignore it.
-		 * XXX - potential security hazard could
-		 *	 be detected here.
-		 */
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, ";; old answer:\n"),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-		goto wait;
-	}
-	if (!(statp->options & RES_INSECURE1) &&
-	    !res_ourserver_p(statp, (struct sockaddr *)(void *)&from)) {
-		/*
-		 * response from wrong server? ignore it.
-		 * XXX - potential security hazard could
-		 *	 be detected here.
-		 */
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, ";; not our server:\n"),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-		goto wait;
-	}
-#ifdef RES_USE_EDNS0
-	if (anhp->rcode == FORMERR && (statp->options & RES_USE_EDNS0) != 0U) {
-		/*
-		 * Do not retry if the server do not understand EDNS0.
-		 * The case has to be captured here, as FORMERR packet do not
-		 * carry query section, hence res_queriesmatch() returns 0.
-		 */
-		DprintQ(statp->options & RES_DEBUG,
-			(stdout, "server rejected query with EDNS0:\n"),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-		/* record the error */
-		statp->_flags |= RES_F_EDNS0ERR;
-		res_nclose(statp);
-		return (0);
-	}
-#endif
-	if (!(statp->options & RES_INSECURE2) &&
-	    !res_queriesmatch(buf, (const u_char *)buf + buflen,
-			      ans, ans + anssiz)) {
-		/*
-		 * response contains wrong query? ignore it.
-		 * XXX - potential security hazard could
-		 *	 be detected here.
-		 */
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, ";; wrong query name:\n"),
-			ans, (int)(resplen > anssiz) ? anssiz : resplen);
-		goto wait;
-	}
-	if (anhp->rcode == SERVFAIL ||
-	    anhp->rcode == NOTIMP ||
-	    anhp->rcode == REFUSED) {
-		DprintQ(statp->options & RES_DEBUG,
-			(stdout, "server rejected query:\n"),
-			ans, (int)(resplen > anssiz) ? anssiz : resplen);
-		res_nclose(statp);
-		/* don't retry if called from dig */
-		if (!statp->pfcode)
-			return (0);
-	}
-	if (!(statp->options & RES_IGNTC) && anhp->tc) {
-		/*
-		 * To get the rest of answer,
-		 * use TCP with same server.
-		 */
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; truncated answer\n"));
-		*v_circuit = 1;
-		res_nclose(statp);
-		return (1);
-	}
-	/*
-	 * All is well, or the error is fatal.  Signal that the
-	 * next nameserver ought not be tried.
-	 */
-	_DIAGASSERT(__type_fit(int, resplen));
-	return (int)resplen;
-}
-
-static void
-Aerror(const res_state statp, FILE *file, const char *string, int error,
-       const struct sockaddr *address, socklen_t alen)
-{
-	int save = errno;
-	char hbuf[NI_MAXHOST];
-	char sbuf[NI_MAXSERV];
-
-	if ((statp->options & RES_DEBUG) != 0U) {
-		if (getnameinfo(address, alen, hbuf,
-		    (socklen_t)sizeof(hbuf), sbuf, (socklen_t)sizeof(sbuf),
-		    niflags)) {
-			strncpy(hbuf, "?", sizeof(hbuf) - 1);
-			hbuf[sizeof(hbuf) - 1] = '\0';
-			strncpy(sbuf, "?", sizeof(sbuf) - 1);
-			sbuf[sizeof(sbuf) - 1] = '\0';
-		}
-		fprintf(file, "res_send: %s ([%s].%s): %s\n",
-			string, hbuf, sbuf, strerror(error));
-	}
-	errno = save;
-}
-
-static void
-Perror(const res_state statp, FILE *file, const char *string, int error) {
-	int save = errno;
-
-	if ((statp->options & RES_DEBUG) != 0U)
-		fprintf(file, "res_send: %s: %s\n",
-			string, strerror(error));
-	errno = save;
-}
-
-static int
-sock_eq(struct sockaddr *a, struct sockaddr *b) {
-	struct sockaddr_in *a4, *b4;
-	struct sockaddr_in6 *a6, *b6;
-
-	if (a->sa_family != b->sa_family)
-		return 0;
-	switch (a->sa_family) {
-	case AF_INET:
-		a4 = (struct sockaddr_in *)(void *)a;
-		b4 = (struct sockaddr_in *)(void *)b;
-		return a4->sin_port == b4->sin_port &&
-		    a4->sin_addr.s_addr == b4->sin_addr.s_addr;
-	case AF_INET6:
-		a6 = (struct sockaddr_in6 *)(void *)a;
-		b6 = (struct sockaddr_in6 *)(void *)b;
-		return a6->sin6_port == b6->sin6_port &&
-#ifdef HAVE_SIN6_SCOPE_ID
-		    a6->sin6_scope_id == b6->sin6_scope_id &&
-#endif
-		    IN6_ARE_ADDR_EQUAL(&a6->sin6_addr, &b6->sin6_addr);
-	default:
-		return 0;
-	}
-}
-
-#if defined(NEED_PSELECT) && !defined(USE_POLL) && !defined(USE_KQUEUE)
-/* XXX needs to move to the porting library. */
-static int
-pselect(int nfds, void *rfds, void *wfds, void *efds,
-	struct timespec *tsp, const sigset_t *sigmask)
-{
-	struct timeval tv, *tvp;
-	sigset_t sigs;
-	int n;
-
-	if (tsp) {
-		tvp = &tv;
-		tv = evTimeVal(*tsp);
-	} else
-		tvp = NULL;
-	if (sigmask)
-		sigprocmask(SIG_SETMASK, sigmask, &sigs);
-	n = select(nfds, rfds, wfds, efds, tvp);
-	if (sigmask)
-		sigprocmask(SIG_SETMASK, &sigs, NULL);
-	if (tsp)
-		*tsp = evTimeSpec(tv);
-	return (n);
-}
-#endif
diff --git a/lib/libc/resolv/res_state.c b/lib/libc/resolv/res_state.c
deleted file mode 100644
index f758862ed..000000000
--- a/lib/libc/resolv/res_state.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*	$NetBSD: res_state.c,v 1.8 2009/01/11 02:46:29 christos Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: res_state.c,v 1.8 2009/01/11 02:46:29 christos Exp $");
-#endif
-
-#include <sys/types.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <resolv.h>
-
-struct __res_state _nres
-# if defined(__BIND_RES_TEXT)
-	= { .retrans = RES_TIMEOUT, }	/*%< Motorola, et al. */
-# endif
-	;
-
-res_state __res_get_state_nothread(void);
-void __res_put_state_nothread(res_state);
-
-#ifdef __weak_alias
-__weak_alias(__res_get_state, __res_get_state_nothread)
-__weak_alias(__res_put_state, __res_put_state_nothread)
-/* Source compatibility; only for single threaded programs */
-__weak_alias(__res_state, __res_get_state_nothread)
-#endif
-
-res_state
-__res_get_state_nothread(void)
-{
-	if ((_nres.options & RES_INIT) == 0 && res_ninit(&_nres) == -1) {
-		h_errno = NETDB_INTERNAL;
-		return NULL;
-	}
-	return &_nres;
-}
-
-void
-/*ARGSUSED*/
-__res_put_state_nothread(res_state res)
-{
-}
diff --git a/lib/libc/rpc/DISCLAIMER b/lib/libc/rpc/DISCLAIMER
deleted file mode 100644
index 2e3a51ed5..000000000
--- a/lib/libc/rpc/DISCLAIMER
+++ /dev/null
@@ -1,32 +0,0 @@
-/*	$NetBSD: DISCLAIMER,v 1.3 2013/03/11 20:19:28 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
deleted file mode 100644
index 4791e7e09..000000000
--- a/lib/libc/rpc/Makefile.inc
+++ /dev/null
@@ -1,169 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.22 2015/04/15 19:13:47 mrg Exp $
-
-# librpc sources
-.PATH:	${.CURDIR}/rpc
-
-SRCS+=	auth_none.c auth_unix.c authunix_prot.c bindresvport.c \
-	clnt_bcast.c clnt_dg.c clnt_generic.c clnt_perror.c \
-	clnt_raw.c clnt_simple.c \
-	clnt_vc.c rpc_dtablesize.c \
-	getnetconfig.c getnetpath.c getrpcent.c getrpcport.c \
-	mt_misc.c pmap_clnt.c pmap_getmaps.c pmap_getport.c pmap_prot.c \
-	pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c rpc_callmsg.c \
-	rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c \
-	svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c svc_raw.c \
-	svc_run.c svc_simple.c svc_vc.c \
-	xdr.c xdr_array.c xdr_float.c xdr_mem.c xdr_rec.c xdr_reference.c \
-	xdr_stdio.c xdr_sizeof.c __rpc_getxid.c
-
-CPPFLAGS+=	-DPORTMAP
-
-MAN+=	bindresvport.3 getnetconfig.3 getnetpath.3 getrpcent.3 getrpcport.3 \
-	rpc.3 rpc_soc.3 rpc_clnt_auth.3 rpc_clnt_calls.3 rpc_clnt_create.3 \
-	rpc_svc_calls.3 rpc_svc_create.3 rpc_svc_err.3 rpc_svc_reg.3 \
-	rpc_xdr.3 rpcbind.3 xdr.3
-MLINKS+=	bindresvport.3 bindresvport_sa.3 \
-		getnetconfig.3 setnetconfig.3 \
-		getnetconfig.3 getnetconfigent.3 \
-		getnetconfig.3 endnetconfig.3 \
-		getnetconfig.3 nc_perror.3 \
-		getnetconfig.3 nc_sperror.3 \
-		getnetpath.3 setnetpath.3 \
-		getnetpath.3 endnetpath.3 \
-		getrpcent.3 getrpcbyname.3 \
-		getrpcent.3 getrpcbynumber.3 \
-		getrpcent.3 endrpcent.3 \
-		getrpcent.3 setrpcent.3 \
-		rpc_clnt_auth.3 auth_destroy.3 \
-		rpc_clnt_auth.3 authnone_create.3 \
-		rpc_clnt_auth.3 authsys_create.3 \
-		rpc_clnt_auth.3 authsys_create_default.3 \
-		rpc_clnt_calls.3 clnt_call.3 \
-		rpc_clnt_calls.3 clnt_perrno.3 \
-		rpc_clnt_calls.3 clnt_perror.3 \
-		rpc_clnt_calls.3 clnt_sperrno.3 \
-		rpc_clnt_calls.3 clnt_sperror.3 \
-		rpc_clnt_calls.3 rpc_call.3 \
-		rpc_clnt_calls.3 rpc_broadcast.3 \
-		rpc_clnt_calls.3 rpc_broadcast_exp.3 \
-		rpc_clnt_calls.3 clnt_freeres.3 \
-		rpc_clnt_calls.3 clnt_geterr.3 \
-		rpc_clnt_create.3 clnt_control.3 \
-		rpc_clnt_create.3 clnt_create.3 \
-		rpc_clnt_create.3 clnt_create_vers.3 \
-		rpc_clnt_create.3 clnt_destroy.3 \
-		rpc_clnt_create.3 clnt_pcreateerror.3 \
-		rpc_clnt_create.3 clnt_spcreateerror.3 \
-		rpc_clnt_create.3 clnt_dg_create.3 \
-		rpc_clnt_create.3 clnt_raw_create.3 \
-		rpc_clnt_create.3 clnt_tli_create.3 \
-		rpc_clnt_create.3 clnt_tp_create.3 \
-		rpc_clnt_create.3 clnt_vc_create.3 \
-		rpc_svc_calls.3 svc_dg_enablecache.3 \
-		rpc_svc_calls.3 svc_exit.3 \
-		rpc_svc_calls.3 svc_freeargs.3 \
-		rpc_svc_calls.3 svc_getargs.3 \
-		rpc_svc_calls.3 svc_getreq_common.3 \
-		rpc_svc_calls.3 svc_getreq_poll.3 \
-		rpc_svc_calls.3 svc_getreqset.3 \
-		rpc_svc_calls.3 svc_getrpccaller.3 \
-		rpc_svc_calls.3 __svc_getcallercreds.3 \
-		rpc_svc_calls.3 svc_pollset.3 \
-		rpc_svc_calls.3 svc_run.3 \
-		rpc_svc_calls.3 svc_sendreply.3 \
-		rpc_svc_create.3 svc_control.3 \
-		rpc_svc_create.3 svc_create.3 \
-		rpc_svc_create.3 svc_dg_create.3 \
-		rpc_svc_create.3 svc_destroy.3 \
-		rpc_svc_create.3 svc_fd_create.3 \
-		rpc_svc_create.3 svc_raw_create.3 \
-		rpc_svc_create.3 svc_tli_create.3 \
-		rpc_svc_create.3 svc_tp_create.3 \
-		rpc_svc_create.3 svc_vc_create.3 \
-		rpc_svc_err.3 svcerr_auth.3 \
-		rpc_svc_err.3 svcerr_decode.3 \
-		rpc_svc_err.3 svcerr_noproc.3 \
-		rpc_svc_err.3 svcerr_noprog.3 \
-		rpc_svc_err.3 svcerr_progvers.3 \
-		rpc_svc_err.3 svcerr_systemerr.3 \
-		rpc_svc_err.3 svcerr_weakauth.3 \
-		rpc_svc_reg.3 rpc_reg.3 \
-		rpc_svc_reg.3 svc_reg.3 \
-		rpc_svc_reg.3 svc_unreg.3 \
-		rpc_svc_reg.3 svc_auth_reg.3 \
-		rpc_svc_reg.3 xprt_register.3 \
-		rpc_svc_reg.3 xprt_unregister.3 \
-		rpc_xdr.3 xdr_accepted_reply.3 \
-		rpc_xdr.3 xdr_authsys_parms.3 \
-		rpc_xdr.3 xdr_callhdr.3 \
-		rpc_xdr.3 xdr_callmsg.3 \
-		rpc_xdr.3 xdr_opaque_auth.3 \
-		rpc_xdr.3 xdr_rejected_reply.3 \
-		rpc_xdr.3 xdr_replymsg.3 \
-		rpcbind.3 rpcb_getmaps.3 \
-		rpcbind.3 rpcb_getaddr.3 \
-		rpcbind.3 rpcb_gettime.3 \
-		rpcbind.3 rpcb_rmtcall.3 \
-		rpcbind.3 rpcb_set.3 \
-		rpcbind.3 rpcb_unset.3 \
-		rpc_soc.3 authunix_create.3 \
-		rpc_soc.3 authunix_create_default.3 \
-		rpc_soc.3 callrpc.3 \
-		rpc_soc.3 clnt_broadcast.3 \
-		rpc_soc.3 clntraw_create.3 \
-		rpc_soc.3 clnttcp_create.3 \
-		rpc_soc.3 clntudp_bufcreate.3 \
-		rpc_soc.3 clntudp_create.3 \
-		rpc_soc.3 get_myaddress.3 \
-		rpc_soc.3 pmap_getmaps.3 \
-		rpc_soc.3 pmap_getport.3 \
-		rpc_soc.3 pmap_rmtcall.3 \
-		rpc_soc.3 pmap_set.3 \
-		rpc_soc.3 pmap_unset.3 \
-		rpc_soc.3 registerrpc.3 \
-		rpc_soc.3 rpc_createerr.3 \
-		rpc_soc.3 svc_fds.3 \
-		rpc_soc.3 svc_fdset.3 \
-		rpc_soc.3 svc_getcaller.3 \
-		rpc_soc.3 svc_register.3 \
-		rpc_soc.3 svc_unregister.3 \
-		rpc_soc.3 svcfd_create.3 \
-		rpc_soc.3 svcraw_create.3 \
-		rpc_soc.3 svctcp_create.3 \
-		rpc_soc.3 svcudp_create.3 \
-		rpc_soc.3 svcudp_bufcreate.3 \
-		rpc_soc.3 xdr_pmap.3 \
-		rpc_soc.3 xdr_pmaplist.3 \
-		xdr.3 xdr_array.3 \
-		xdr.3 xdr_bool.3 \
-		xdr.3 xdr_bytes.3 \
-		xdr.3 xdr_char.3 \
-		xdr.3 xdr_destroy.3 \
-		xdr.3 xdr_double.3 \
-		xdr.3 xdr_enum.3 \
-		xdr.3 xdr_float.3 \
-		xdr.3 xdr_free.3 \
-		xdr.3 xdr_getpos.3 \
-		xdr.3 xdr_inline.3 \
-		xdr.3 xdr_int.3 \
-		xdr.3 xdr_long.3 \
-		xdr.3 xdrmem_create.3 \
-		xdr.3 xdr_opaque.3 \
-		xdr.3 xdr_pointer.3 \
-		xdr.3 xdrrec_create.3 \
-		xdr.3 xdrrec_endofrecord.3 \
-		xdr.3 xdrrec_eof.3 \
-		xdr.3 xdrrec_skiprecord.3 \
-		xdr.3 xdr_reference.3 \
-		xdr.3 xdr_setpos.3 \
-		xdr.3 xdr_short.3 \
-		xdr.3 xdr_sizeof.3 \
-		xdr.3 xdrstdio_create.3 \
-		xdr.3 xdr_string.3 \
-		xdr.3 xdr_u_char.3 \
-		xdr.3 xdr_u_long.3 \
-		xdr.3 xdr_u_short.3 \
-		xdr.3 xdr_union.3 \
-		xdr.3 xdr_vector.3 \
-		xdr.3 xdr_void.3 \
-		xdr.3 xdr_wrapstring.3
diff --git a/lib/libc/rpc/__rpc_getxid.c b/lib/libc/rpc/__rpc_getxid.c
deleted file mode 100644
index ab350d4e9..000000000
--- a/lib/libc/rpc/__rpc_getxid.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: __rpc_getxid.c,v 1.3 2003/09/13 21:27:46 itojun Exp $	*/
-/*	$OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert Exp $	*/
-
-/*
- * Copyright (C) 2003 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __rpc_getxid.c,v 1.3 2003/09/13 21:27:46 itojun Exp $");
-#endif
-
-#include <sys/types.h>
-
-#include "namespace.h"
-
-#include <stdlib.h>
-#include <randomid.h>
-#include <rpc/rpc.h>
-#include "rpc_internal.h"
-
-u_int32_t
-__rpc_getxid(void)
-{
-	static randomid_t ctx = NULL;
-
-	if (!ctx) {
-		ctx = randomid_new(32, RANDOMID_TIMEO_DEFAULT);
-		if (!ctx)
-			abort();
-	}
-
-	return randomid(ctx);
-}
diff --git a/lib/libc/rpc/auth_none.c b/lib/libc/rpc/auth_none.c
deleted file mode 100644
index 5f47a4e75..000000000
--- a/lib/libc/rpc/auth_none.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*	$NetBSD: auth_none.c,v 1.16 2013/03/11 20:19:28 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)auth_none.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: auth_none.c,v 1.16 2013/03/11 20:19:28 tron Exp $");
-#endif
-#endif
-
-/*
- * auth_none.c
- * Creates a client authentication handle for passing "null" 
- * credentials and verifiers to remote systems. 
- * 
- * Copyright (C) 1984, Sun Microsystems, Inc. 
- */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <stdlib.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-
-#ifdef __weak_alias
-__weak_alias(authnone_create,_authnone_create)
-#endif
-
-#define MAX_MARSHAL_SIZE 20
-
-/*
- * Authenticator operations routines
- */
-
-static bool_t authnone_marshal(AUTH *, XDR *);
-static void authnone_verf(AUTH *);
-static bool_t authnone_validate(AUTH *, struct opaque_auth *);
-static bool_t authnone_refresh(AUTH *);
-static void authnone_destroy(AUTH *);
-
-static const struct auth_ops ops = {
-	authnone_verf,
-	authnone_marshal,
-	authnone_validate,
-	authnone_refresh,
-	authnone_destroy
-};
-
-static struct authnone_private {
-	AUTH	no_client;
-	char	marshalled_client[MAX_MARSHAL_SIZE];
-	u_int	mcnt;
-} *authnone_private;
-
-AUTH *
-authnone_create(void)
-{
-	struct authnone_private *ap = authnone_private;
-	XDR xdr_stream;
-	XDR *xdrs;
-
-	if (ap == 0) {
-		ap = (struct authnone_private *)calloc(1, sizeof (*ap));
-		if (ap == 0)
-			return (0);
-		authnone_private = ap;
-	}
-	if (!ap->mcnt) {
-		ap->no_client.ah_cred = ap->no_client.ah_verf = _null_auth;
-		ap->no_client.ah_ops = &ops;
-		xdrs = &xdr_stream;
-		xdrmem_create(xdrs, ap->marshalled_client,
-		    (u_int)MAX_MARSHAL_SIZE, XDR_ENCODE);
-		(void)xdr_opaque_auth(xdrs, &ap->no_client.ah_cred);
-		(void)xdr_opaque_auth(xdrs, &ap->no_client.ah_verf);
-		ap->mcnt = XDR_GETPOS(xdrs);
-		XDR_DESTROY(xdrs);
-	}
-	return (&ap->no_client);
-}
-
-/*ARGSUSED*/
-static bool_t
-authnone_marshal(AUTH *client, XDR *xdrs)
-{
-	struct authnone_private *ap = authnone_private;
-
-	_DIAGASSERT(xdrs != NULL);
-
-	if (ap == 0)
-		return (0);
-	return ((*xdrs->x_ops->x_putbytes)(xdrs,
-	    ap->marshalled_client, ap->mcnt));
-}
-
-/*ARGSUSED*/
-static void 
-authnone_verf(AUTH *client)
-{
-}
-
-/*ARGSUSED*/
-static bool_t
-authnone_validate(AUTH *client, struct opaque_auth *auth)
-{
-
-	return (TRUE);
-}
-
-/*ARGSUSED*/
-static bool_t
-authnone_refresh(AUTH *client)
-{
-
-	return (FALSE);
-}
-
-/*ARGSUSED*/
-static void
-authnone_destroy(AUTH *client)
-{
-}
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
deleted file mode 100644
index e0b980b12..000000000
--- a/lib/libc/rpc/auth_unix.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/*	$NetBSD: auth_unix.c,v 1.26 2014/10/18 08:33:23 snj Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)auth_unix.c	2.2 88/08/01 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: auth_unix.c,v 1.26 2014/10/18 08:33:23 snj Exp $");
-#endif
-#endif
-
-/*
- * auth_unix.c, Implements UNIX style authentication parameters. 
- *  
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * The system is very weak.  The client uses no encryption for its
- * credentials and only sends null verifiers.  The server sends backs
- * null verifiers or optionally a verifier that suggests a new short hand
- * for the credentials.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/param.h>
-
-#include <assert.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_unix.h>
-
-#ifdef __weak_alias
-__weak_alias(authunix_create,_authunix_create)
-__weak_alias(authunix_create_default,_authunix_create_default)
-#endif
-
-
-/* auth_unix.c */
-static void authunix_nextverf(AUTH *);
-static bool_t authunix_marshal(AUTH *, XDR *);
-static bool_t authunix_validate(AUTH *, struct opaque_auth *);
-static bool_t authunix_refresh(AUTH *);
-static void authunix_destroy(AUTH *);
-static void marshal_new_auth(AUTH *);
-static const struct auth_ops *authunix_ops(void);
-
-/*
- * This struct is pointed to by the ah_private field of an auth_handle.
- */
-struct audata {
-	struct opaque_auth	au_origcred;	/* original credentials */
-	struct opaque_auth	au_shcred;	/* short hand cred */
-	u_long			au_shfaults;	/* short hand cache faults */
-	char			au_marshed[MAX_AUTH_BYTES];
-	u_int			au_mpos;	/* xdr pos at end of marshed */
-};
-#define	AUTH_PRIVATE(auth)	((struct audata *)auth->ah_private)
-
-/*
- * Create a unix style authenticator.
- * Returns an auth handle with the given stuff in it.
- */
-AUTH *
-authunix_create(char *machname, int uid, int gid, int len, int *aup_gids)
-{
-	struct authunix_parms aup;
-	char mymem[MAX_AUTH_BYTES];
-	struct timeval now;
-	XDR xdrs;
-	AUTH *auth;
-	struct audata *au;
-
-	/*
-	 * Allocate and set up auth handle
-	 */
-	au = NULL;
-	auth = mem_alloc(sizeof(*auth));
-#ifndef KERNEL
-	if (auth == NULL) {
-		warn("%s: out of memory", __func__);
-		goto cleanup_authunix_create;
-	}
-#endif
-	au = mem_alloc(sizeof(*au));
-#ifndef KERNEL
-	if (au == NULL) {
-		warn("%s: out of memory", __func__);
-		goto cleanup_authunix_create;
-	}
-#endif
-	auth->ah_ops = authunix_ops();
-	auth->ah_private = au;
-	auth->ah_verf = au->au_shcred = _null_auth;
-	au->au_shfaults = 0;
-	au->au_origcred.oa_base = NULL;
-
-	/*
-	 * fill in param struct from the given params
-	 */
-	(void)gettimeofday(&now, NULL);
-	aup.aup_time = (u_long)now.tv_sec;	/* XXX: truncate on 32 bit */
-	aup.aup_machname = machname;
-	aup.aup_uid = uid;
-	aup.aup_gid = gid;
-	aup.aup_len = (u_int)len;
-	aup.aup_gids = aup_gids;
-
-	/*
-	 * Serialize the parameters into origcred
-	 */
-	xdrmem_create(&xdrs, mymem, MAX_AUTH_BYTES, XDR_ENCODE);
-	if (! xdr_authunix_parms(&xdrs, &aup)) 
-		abort();
-	au->au_origcred.oa_length = len = XDR_GETPOS(&xdrs);
-	au->au_origcred.oa_flavor = AUTH_UNIX;
-#ifdef KERNEL
-	au->au_origcred.oa_base = mem_alloc((size_t)len);
-#else
-	if ((au->au_origcred.oa_base = mem_alloc((size_t)len)) == NULL) {
-		warn("%s: out of memory", __func__);
-		goto cleanup_authunix_create;
-	}
-#endif
-	memmove(au->au_origcred.oa_base, mymem, (size_t)len);
-
-	/*
-	 * set auth handle to reflect new cred.
-	 */
-	auth->ah_cred = au->au_origcred;
-	marshal_new_auth(auth);
-	return (auth);
-#ifndef KERNEL
- cleanup_authunix_create:
-	if (auth)
-		mem_free(auth, sizeof(*auth));
-	if (au) {
-		if (au->au_origcred.oa_base)
-			mem_free(au->au_origcred.oa_base, (u_int)len);
-		mem_free(au, sizeof(*au));
-	}
-	return (NULL);
-#endif
-}
-
-/*
- * Returns an auth handle with parameters determined by doing lots of
- * syscalls.
- */
-AUTH *
-authunix_create_default(void)
-{
-	int len;
-	char machname[MAXHOSTNAMELEN + 1];
-	uid_t uid;
-	gid_t gid;
-	gid_t gids[NGRPS];
-
-	if (gethostname(machname, sizeof machname) == -1)
-		abort();
-	machname[sizeof(machname) - 1] = 0;
-	uid = geteuid();
-	gid = getegid();
-	if ((len = getgroups(NGRPS, gids)) < 0)
-		abort();
-	/* XXX: interface problem; those should all have been unsigned */
-	return (authunix_create(machname, (int)uid, (int)gid, len,
-	    (int *)gids));
-}
-
-/*
- * authunix operations
- */
-
-/* ARGSUSED */
-static void
-authunix_nextverf(AUTH *auth)
-{
-	/* no action necessary */
-}
-
-static bool_t
-authunix_marshal(AUTH *auth, XDR *xdrs)
-{
-	struct audata *au;
-
-	_DIAGASSERT(auth != NULL);
-	_DIAGASSERT(xdrs != NULL);
-
-	au = AUTH_PRIVATE(auth);
-	return (XDR_PUTBYTES(xdrs, au->au_marshed, au->au_mpos));
-}
-
-static bool_t
-authunix_validate(AUTH *auth, struct opaque_auth *verf)
-{
-	struct audata *au;
-	XDR xdrs;
-
-	_DIAGASSERT(auth != NULL);
-	_DIAGASSERT(verf != NULL);
-
-	if (verf->oa_flavor == AUTH_SHORT) {
-		au = AUTH_PRIVATE(auth);
-		xdrmem_create(&xdrs, verf->oa_base, verf->oa_length,
-		    XDR_DECODE);
-
-		if (au->au_shcred.oa_base != NULL) {
-			mem_free(au->au_shcred.oa_base,
-			    au->au_shcred.oa_length);
-			au->au_shcred.oa_base = NULL;
-		}
-		if (xdr_opaque_auth(&xdrs, &au->au_shcred)) {
-			auth->ah_cred = au->au_shcred;
-		} else {
-			xdrs.x_op = XDR_FREE;
-			(void)xdr_opaque_auth(&xdrs, &au->au_shcred);
-			au->au_shcred.oa_base = NULL;
-			auth->ah_cred = au->au_origcred;
-		}
-		marshal_new_auth(auth);
-	}
-	return (TRUE);
-}
-
-static bool_t
-authunix_refresh(AUTH *auth)
-{
-	struct audata *au = AUTH_PRIVATE(auth);
-	struct authunix_parms aup;
-	struct timeval now;
-	XDR xdrs;
-	int stat;
-
-	_DIAGASSERT(auth != NULL);
-
-	if (auth->ah_cred.oa_base == au->au_origcred.oa_base) {
-		/* there is no hope.  Punt */
-		return (FALSE);
-	}
-	au->au_shfaults++;
-
-	/* first deserialize the creds back into a struct authunix_parms */
-	aup.aup_machname = NULL;
-	aup.aup_gids = NULL;
-	xdrmem_create(&xdrs, au->au_origcred.oa_base,
-	    au->au_origcred.oa_length, XDR_DECODE);
-	stat = xdr_authunix_parms(&xdrs, &aup);
-	if (! stat) 
-		goto done;
-
-	/* update the time and serialize in place */
-	(void)gettimeofday(&now, NULL);
-	aup.aup_time = (u_long)now.tv_sec;	/* XXX: truncate on 32 bit */
-	xdrs.x_op = XDR_ENCODE;
-	XDR_SETPOS(&xdrs, 0);
-	stat = xdr_authunix_parms(&xdrs, &aup);
-	if (! stat)
-		goto done;
-	auth->ah_cred = au->au_origcred;
-	marshal_new_auth(auth);
-done:
-	/* free the struct authunix_parms created by deserializing */
-	xdrs.x_op = XDR_FREE;
-	(void)xdr_authunix_parms(&xdrs, &aup);
-	XDR_DESTROY(&xdrs);
-	return (stat);
-}
-
-static void
-authunix_destroy(AUTH *auth)
-{
-	struct audata *au;
-
-	_DIAGASSERT(auth != NULL);
-
-	au = AUTH_PRIVATE(auth);
-	mem_free(au->au_origcred.oa_base, au->au_origcred.oa_length);
-
-	if (au->au_shcred.oa_base != NULL)
-		mem_free(au->au_shcred.oa_base, au->au_shcred.oa_length);
-
-	mem_free(auth->ah_private, sizeof(struct audata));
-
-	if (auth->ah_verf.oa_base != NULL)
-		mem_free(auth->ah_verf.oa_base, auth->ah_verf.oa_length);
-
-	mem_free(auth, sizeof(*auth));
-}
-
-/*
- * Marshals (pre-serializes) an auth struct.
- * sets private data, au_marshed and au_mpos
- */
-static void
-marshal_new_auth(AUTH *auth)
-{
-	XDR	xdr_stream;
-	XDR	*xdrs = &xdr_stream;
-	struct audata *au;
-
-	_DIAGASSERT(auth != NULL);
-
-	au = AUTH_PRIVATE(auth);
-	xdrmem_create(xdrs, au->au_marshed, MAX_AUTH_BYTES, XDR_ENCODE);
-	if ((! xdr_opaque_auth(xdrs, &(auth->ah_cred))) ||
-	    (! xdr_opaque_auth(xdrs, &(auth->ah_verf))))
-		warnx("%s: Fatal marshalling problem", __func__);
-	else
-		au->au_mpos = XDR_GETPOS(xdrs);
-	XDR_DESTROY(xdrs);
-}
-
-static const struct auth_ops *
-authunix_ops(void)
-{
-	static struct auth_ops ops;
-#ifdef _REENTRANT
-	extern mutex_t ops_lock;
-#endif
-
-	/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	mutex_lock(&ops_lock);
-	if (ops.ah_nextverf == NULL) {
-		ops.ah_nextverf = authunix_nextverf;
-		ops.ah_marshal = authunix_marshal;
-		ops.ah_validate = authunix_validate;
-		ops.ah_refresh = authunix_refresh;
-		ops.ah_destroy = authunix_destroy;
-	}
-	mutex_unlock(&ops_lock);
-	return (&ops);
-}
diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c
deleted file mode 100644
index 30fbd6806..000000000
--- a/lib/libc/rpc/authunix_prot.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*	$NetBSD: authunix_prot.c,v 1.16 2013/03/11 20:19:28 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)authunix_prot.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: authunix_prot.c,v 1.16 2013/03/11 20:19:28 tron Exp $");
-#endif
-#endif
-
-/*
- * authunix_prot.c
- * XDR for UNIX style authentication parameters for RPC
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-
-#include <assert.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_unix.h>
-
-#ifdef __weak_alias
-__weak_alias(xdr_authunix_parms,_xdr_authunix_parms)
-#endif
-
-/*
- * XDR for unix authentication parameters.
- */
-bool_t
-xdr_authunix_parms(XDR *xdrs, struct authunix_parms *p)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(p != NULL);
-
-	if (xdr_u_long(xdrs, &(p->aup_time))
-	    && xdr_string(xdrs, &(p->aup_machname), MAX_MACHINE_NAME)
-	    && xdr_int(xdrs, &(p->aup_uid))
-	    && xdr_int(xdrs, &(p->aup_gid))
-	    && xdr_array(xdrs, (char **)(void *)&(p->aup_gids),
-		    &(p->aup_len), NGRPS, (unsigned int)sizeof(int),
-		    (xdrproc_t)xdr_int) ) {
-		return (TRUE);
-	}
-	return (FALSE);
-}
diff --git a/lib/libc/rpc/bindresvport.3 b/lib/libc/rpc/bindresvport.3
deleted file mode 100644
index ddc853079..000000000
--- a/lib/libc/rpc/bindresvport.3
+++ /dev/null
@@ -1,106 +0,0 @@
-.\"	@(#)bindresvport.3n	2.2 88/08/02 4.0 RPCSRC; from 1.7 88/03/14 SMI
-.\"	$NetBSD: bindresvport.3,v 1.13 2007/01/27 07:58:47 cbiere Exp $
-.\"
-.Dd January 27, 2007
-.Dt BINDRESVPORT 3
-.Os
-.Sh NAME
-.Nm bindresvport ,
-.Nm bindresvport_sa
-.Nd bind a socket to a reserved privileged IP port
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In rpc/rpc.h
-.Ft int
-.Fn bindresvport "int sd" "struct sockaddr_in *sin"
-.Ft int
-.Fn bindresvport_sa "int sd" "struct sockaddr *sa"
-.Sh DESCRIPTION
-.Fn bindresvport
-and
-.Fn bindresvport_sa
-are used to bind a socket descriptor to a reserved privileged
-.Tn IP
-port, that is, a
-port number in the range 0-1023.
-The routine returns 0 if it is successful,
-otherwise -1 is returned and
-.Va errno
-set to reflect the cause of the error.
-.Pp
-If
-.Fa sin
-is a pointer to a
-.Ft "struct sockaddr_in"
-then the appropriate fields in the structure should be defined.
-Note that
-.Fa sin-\*[Gt]sin_family
-must be initialized to the address family of the socket, passed by
-.Fa sd .
-If
-.Fa sin-\*[Gt]sin_port
-is
-.Sq 0
-then a port (in the range 600-1023) will be
-chosen, and if
-.Xr bind 2
-is successful, the
-.Fa sin-\*[Gt]sin_port
-will be updated to contain the allocated port.
-.Pp
-If
-.Fa sin
-is the
-.Dv NULL
-pointer,
-a port will be allocated (as above).
-However, there is no way for
-.Fn bindresvport
-to return the allocated port in this case.
-.Xr getsockname 2
-can be used to determine the assigned port.
-.Pp
-Only root can bind to a privileged port; this call will fail for any
-other users.
-.Pp
-Function prototype of
-.Fn bindresvport
-is biased to
-.Dv AF_INET
-socket.
-.Fn bindresvport_sa
-acts exactly the same, with more neutral function prototype.
-Note that both functions behave exactly the same, and
-both support
-.Dv AF_INET6
-sockets as well as
-.Dv AF_INET
-sockets.
-.Sh RETURN VALUES
-If the bind is successful, a 0 value is returned.
-A return value of -1 indicates an error, which is
-further specified in the global
-.Va errno .
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EPFNOSUPPORT
-If second argument was supplied,
-and address family did not match between arguments.
-.El
-.Pp
-.Fn bindresvport
-may also fail and set
-.Va errno
-for any of the errors specified for the calls
-.Xr bind 2 ,
-.Xr getsockopt 2 ,
-or
-.Xr setsockopt 2 .
-.Sh SEE ALSO
-.Xr bind 2 ,
-.Xr getsockname 2 ,
-.Xr getsockopt 2 ,
-.Xr setsockopt 2 ,
-.Xr ip 4
diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c
deleted file mode 100644
index 6c8fa478c..000000000
--- a/lib/libc/rpc/bindresvport.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*	$NetBSD: bindresvport.c,v 1.25 2013/03/11 20:19:28 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)bindresvport.c 1.8 88/02/08 SMI";
-static char *sccsid = "@(#)bindresvport.c	2.2 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: bindresvport.c,v 1.25 2013/03/11 20:19:28 tron Exp $");
-#endif
-#endif
-
-/*
- * Copyright (c) 1987 by Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-#include "svc_fdset.h"
-
-#ifdef __weak_alias
-__weak_alias(bindresvport,_bindresvport)
-__weak_alias(bindresvport_sa,_bindresvport_sa)
-#endif
-
-/*
- * Bind a socket to a privileged IP port
- */
-int
-bindresvport(int sd, struct sockaddr_in *brsin)
-{
-	return bindresvport_sa(sd, (struct sockaddr *)(void *)brsin);
-}
-
-/*
- * Bind a socket to a privileged IP port
- */
-int
-bindresvport_sa(int sd, struct sockaddr *sa)
-{
-	int error, old;
-	struct sockaddr_storage myaddr;
-	struct sockaddr_in *brsin;
-#ifdef INET6
-	struct sockaddr_in6 *brsin6;
-#endif
-	int proto, portrange, portlow;
-	u_int16_t *portp;
-	socklen_t salen;
-	int af;
-
-	if (sa == NULL) {
-		salen = sizeof(myaddr);
-		sa = (struct sockaddr *)(void *)&myaddr;
-
-		if (getsockname(sd, sa, &salen) == -1)
-			return -1;	/* errno is correctly set */
-
-		af = sa->sa_family;
-		memset(sa, 0, salen);
-	} else
-		af = sa->sa_family;
-
-	switch (af) {
-	case AF_INET:
-		proto = IPPROTO_IP;
-		portrange = IP_PORTRANGE;
-		portlow = IP_PORTRANGE_LOW;
-		brsin = (struct sockaddr_in *)(void *)sa;
-		salen = sizeof(struct sockaddr_in);
-		portp = &brsin->sin_port;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		proto = IPPROTO_IPV6;
-		portrange = IPV6_PORTRANGE;
-		portlow = IPV6_PORTRANGE_LOW;
-		brsin6 = (struct sockaddr_in6 *)(void *)sa;
-		salen = sizeof(struct sockaddr_in6);
-		portp = &brsin6->sin6_port;
-		break;
-#endif
-	default:
-		errno = EPFNOSUPPORT;
-		return (-1);
-	}
-	sa->sa_family = af;
-	sa->sa_len = salen;
-
-	if (*portp == 0) {
-		socklen_t oldlen = sizeof(old);
-
-		error = getsockopt(sd, proto, portrange, &old, &oldlen);
-		if (error < 0)
-			return (error);
-		error = setsockopt(sd, proto, portrange, &portlow,
-		    (socklen_t)sizeof(portlow));
-		if (error < 0)
-			return (error);
-	}
-
-	error = bind(sd, sa, salen);
-
-	if (*portp == 0) {
-		int saved_errno = errno;
-
-		if (error < 0) {
-			if (setsockopt(sd, proto, portrange, &old,
-			    (socklen_t)sizeof(old)) < 0)
-				errno = saved_errno;
-			return (error);
-		}
-
-		if (sa != (struct sockaddr *)(void *)&myaddr) {
-			/* What did the kernel assign? */
-			if (getsockname(sd, sa, &salen) < 0)
-				errno = saved_errno;
-			return (error);
-		}
-	}
-	return (error);
-}
diff --git a/lib/libc/rpc/clnt_bcast.c b/lib/libc/rpc/clnt_bcast.c
deleted file mode 100644
index 1985f2cef..000000000
--- a/lib/libc/rpc/clnt_bcast.c
+++ /dev/null
@@ -1,688 +0,0 @@
-/*	$NetBSD: clnt_bcast.c,v 1.26 2013/03/11 20:19:28 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #ident	"@(#)clnt_bcast.c	1.18	94/05/03 SMI" */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)clnt_bcast.c 1.15 89/04/21 Copyr 1988 Sun Micro";
-#else
-__RCSID("$NetBSD: clnt_bcast.c,v 1.26 2013/03/11 20:19:28 tron Exp $");
-#endif
-#endif
-
-/*
- * clnt_bcast.c
- * Client interface to broadcast service.
- *
- * Copyright (C) 1988, Sun Microsystems, Inc.
- *
- * The following is kludged-up support for simple rpc broadcasts.
- * Someday a large, complicated system will replace these routines.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <ifaddrs.h>
-#include <sys/poll.h>
-#include <rpc/rpc.h>
-#ifdef PORTMAP
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_rmt.h>
-#endif
-#include <rpc/nettype.h>
-#include <arpa/inet.h>
-#ifdef RPC_DEBUG
-#include <stdio.h>
-#endif
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <err.h>
-#include <string.h>
-
-#include "rpc_internal.h"
-#include "svc_fdset.h"
-
-#define	MAXBCAST 20	/* Max no of broadcasting transports */
-#define	INITTIME 4000	/* Time to wait initially */
-#define	WAITTIME 8000	/* Maximum time to wait */
-
-/*
- * If nettype is NULL, it broadcasts on all the available
- * datagram_n transports. May potentially lead to broadacst storms
- * and hence should be used with caution, care and courage.
- *
- * The current parameter xdr packet size is limited by the max tsdu
- * size of the transport. If the max tsdu size of any transport is
- * smaller than the parameter xdr packet, then broadcast is not
- * sent on that transport.
- *
- * Also, the packet size should be less the packet size of
- * the data link layer (for ethernet it is 1400 bytes).  There is
- * no easy way to find out the max size of the data link layer and
- * we are assuming that the args would be smaller than that.
- *
- * The result size has to be smaller than the transport tsdu size.
- *
- * If PORTMAP has been defined, we send two packets for UDP, one for
- * rpcbind and one for portmap. For those machines which support
- * both rpcbind and portmap, it will cause them to reply twice, and
- * also here it will get two responses ... inefficient and clumsy.
- */
-
-#ifdef __weak_alias
-__weak_alias(rpc_broadcast_exp,_rpc_broadcast_exp)
-__weak_alias(rpc_broadcast,_rpc_broadcast)
-#endif
-
-struct broadif {
-	int index;
-	struct sockaddr_storage broadaddr;
-	TAILQ_ENTRY(broadif) link;
-};
-
-typedef TAILQ_HEAD(, broadif) broadlist_t;
-
-int __rpc_getbroadifs(int, int, int, broadlist_t *);
-void __rpc_freebroadifs(broadlist_t *);
-int __rpc_broadenable(int, int, struct broadif *);
-
-int __rpc_lowvers = 0;
-
-int
-__rpc_getbroadifs(int af, int proto, int socktype, broadlist_t *list)
-{
-	int count = 0;
-	struct broadif *bip;
-	struct ifaddrs *ifap, *ifp;
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-#endif
-	struct sockaddr_in *gbsin;
-	struct addrinfo hints, *res;
-
-	_DIAGASSERT(list != NULL);
-
-	if (getifaddrs(&ifp) < 0)
-		return 0;
-
-	memset(&hints, 0, sizeof hints);
-
-	hints.ai_family = af;
-	hints.ai_protocol = proto;
-	hints.ai_socktype = socktype;
-
-	if (getaddrinfo(NULL, "sunrpc", &hints, &res) != 0) {
-		freeifaddrs(ifp);
-		return 0;
-	}
-
-	for (ifap = ifp; ifap != NULL; ifap = ifap->ifa_next) {
-		if (ifap->ifa_addr->sa_family != af ||
-		    !(ifap->ifa_flags & IFF_UP))
-			continue;
-		bip = malloc(sizeof(*bip));
-		if (bip == NULL)
-			break;
-		bip->index = if_nametoindex(ifap->ifa_name);
-		if (
-#ifdef INET6
-		    af != AF_INET6 &&
-#endif
-		    (ifap->ifa_flags & IFF_BROADCAST) &&
-		    ifap->ifa_broadaddr) {
-			memcpy(&bip->broadaddr, ifap->ifa_broadaddr,
-			    (size_t)ifap->ifa_broadaddr->sa_len);
-			gbsin = (struct sockaddr_in *)(void *)&bip->broadaddr;
-			gbsin->sin_port =
-			    ((struct sockaddr_in *)
-			    (void *)res->ai_addr)->sin_port;
-		} else
-#ifdef INET6
-		if (af == AF_INET6 && (ifap->ifa_flags & IFF_MULTICAST)) {
-			sin6 = (struct sockaddr_in6 *)(void *)&bip->broadaddr;
-			inet_pton(af, RPCB_MULTICAST_ADDR, &sin6->sin6_addr);
-			sin6->sin6_family = af;
-			sin6->sin6_len = sizeof *sin6;
-			sin6->sin6_port =
-			    ((struct sockaddr_in6 *)
-			    (void *)res->ai_addr)->sin6_port;
-			sin6->sin6_scope_id = bip->index;
-		} else
-#endif
-		{
-			free(bip);
-			continue;
-		}
-		TAILQ_INSERT_TAIL(list, bip, link);
-		count++;
-	}
-	freeifaddrs(ifp);
-	freeaddrinfo(res);
-
-	return count;
-}
-
-void
-__rpc_freebroadifs(broadlist_t *list)
-{
-	struct broadif *bip, *next;
-
-	_DIAGASSERT(list != NULL);
-
-	bip = TAILQ_FIRST(list);
-
-	while (bip != NULL) {
-		next = TAILQ_NEXT(bip, link);
-		free(bip);
-		bip = next;
-	}
-}
-
-int
-/*ARGSUSED*/
-__rpc_broadenable(int af, int s, struct broadif *bip)
-{
-	int o = 1;
-
-#if 0
-	_DIAGASSERT(bip != NULL);
-
-	if (af == AF_INET6) {
-		fprintf(stderr, "set v6 multicast if to %d\n", bip->index);
-		if (setsockopt(s, IPPROTO_IPV6, IPV6_MULTICAST_IF, &bip->index,
-		    sizeof bip->index) < 0)
-			return -1;
-	} else
-#endif
-		if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, &o,
-		    (socklen_t)sizeof(o)) == -1)
-			return -1;
-
-	return 0;
-}
-
-
-enum clnt_stat
-rpc_broadcast_exp(
-	rpcprog_t	prog,		/* program number */
-	rpcvers_t	vers,		/* version number */
-	rpcproc_t	proc,		/* procedure number */
-	xdrproc_t	xargs,		/* xdr routine for args */
-	const char *	argsp,		/* pointer to args */
-	xdrproc_t	xresults,	/* xdr routine for results */
-	caddr_t		resultsp,	/* pointer to results */
-	resultproc_t	eachresult,	/* call with each result obtained */
-	int 		inittime,	/* how long to wait initially */
-	int 		waittime,	/* maximum time to wait */
-	const char *	nettype)	/* transport type */
-{
-	enum clnt_stat	stat = RPC_SUCCESS; /* Return status */
-	XDR 		xdr_stream; /* XDR stream */
-	XDR 		*xdrs = &xdr_stream;
-	struct rpc_msg	msg;	/* RPC message */
-	char 		*outbuf = NULL;	/* Broadcast msg buffer */
-	char		*inbuf = NULL; /* Reply buf */
-	ssize_t		inlen;
-	u_int 		maxbufsize = 0;
-	AUTH 		*sys_auth = authunix_create_default();
-	size_t		i;
-	void		*handle;
-	char		uaddress[1024];	/* A self imposed limit */
-	char		*uaddrp = uaddress;
-	int 		pmap_reply_flag; /* reply recvd from PORTMAP */
-	/* An array of all the suitable broadcast transports */
-	struct {
-		int fd;		/* File descriptor */
-		int af;
-		int proto;
-		struct netconfig *nconf; /* Netconfig structure */
-		u_int asize;	/* Size of the addr buf */
-		u_int dsize;	/* Size of the data buf */
-		struct sockaddr_storage raddr; /* Remote address */
-		broadlist_t nal;
-	} fdlist[MAXBCAST];
-	struct pollfd pfd[MAXBCAST];
-	nfds_t fdlistno = 0;
-	struct r_rpcb_rmtcallargs barg;	/* Remote arguments */
-	struct r_rpcb_rmtcallres bres; /* Remote results */
-	size_t outlen;
-	struct netconfig *nconf;
-	int msec;
-	int pollretval;
-	int fds_found;
-	struct timespec ts;
-
-#ifdef PORTMAP
-	size_t outlen_pmap = 0;
-	u_long port;		/* Remote port number */
-	int pmap_flag = 0;	/* UDP exists ? */
-	char *outbuf_pmap = NULL;
-	struct rmtcallargs barg_pmap;	/* Remote arguments */
-	struct rmtcallres bres_pmap; /* Remote results */
-	u_int udpbufsz = 0;
-#endif				/* PORTMAP */
-
-	if (sys_auth == NULL) {
-		return (RPC_SYSTEMERROR);
-	}
-	/*
-	 * initialization: create a fd, a broadcast address, and send the
-	 * request on the broadcast transport.
-	 * Listen on all of them and on replies, call the user supplied
-	 * function.
-	 */
-
-	if (nettype == NULL)
-		nettype = "datagram_n";
-	if ((handle = __rpc_setconf(nettype)) == NULL) {
-		AUTH_DESTROY(sys_auth);
-		return (RPC_UNKNOWNPROTO);
-	}
-	while ((nconf = __rpc_getconf(handle)) != NULL) {
-		int fd;
-		struct __rpc_sockinfo si;
-
-		if (nconf->nc_semantics != NC_TPI_CLTS)
-			continue;
-		if (fdlistno >= MAXBCAST)
-			break;	/* No more slots available */
-		if (!__rpc_nconf2sockinfo(nconf, &si))
-			continue;
-
-		TAILQ_INIT(&fdlist[fdlistno].nal);
-		if (__rpc_getbroadifs(si.si_af, si.si_proto, si.si_socktype, 
-		    &fdlist[fdlistno].nal) == 0)
-			continue;
-
-		fd = socket(si.si_af, si.si_socktype, si.si_proto);
-		if (fd < 0) {
-			stat = RPC_CANTSEND;
-			continue;
-		}
-		fdlist[fdlistno].af = si.si_af;
-		fdlist[fdlistno].proto = si.si_proto;
-		fdlist[fdlistno].fd = fd;
-		fdlist[fdlistno].nconf = nconf;
-		fdlist[fdlistno].asize = __rpc_get_a_size(si.si_af);
-		pfd[fdlistno].events = POLLIN | POLLPRI |
-			POLLRDNORM | POLLRDBAND;
-		pfd[fdlistno].fd = fdlist[fdlistno].fd = fd;
-		fdlist[fdlistno].dsize = __rpc_get_t_size(si.si_af, si.si_proto,
-							  0);
-
-		if (maxbufsize <= fdlist[fdlistno].dsize)
-			maxbufsize = fdlist[fdlistno].dsize;
-			
-#ifdef PORTMAP
-		if (si.si_af == AF_INET && si.si_proto == IPPROTO_UDP) {
-			udpbufsz = fdlist[fdlistno].dsize;
-			if ((outbuf_pmap = malloc(udpbufsz)) == NULL) {
-				close(fd);
-				stat = RPC_SYSTEMERROR;
-				goto done_broad;
-			}
-			pmap_flag = 1;
-		}
-#endif
-		fdlistno++;
-	}
-
-	if (fdlistno == 0) {
-		if (stat == RPC_SUCCESS)
-			stat = RPC_UNKNOWNPROTO;
-		goto done_broad;
-	}
-	if (maxbufsize == 0) {
-		if (stat == RPC_SUCCESS)
-			stat = RPC_CANTSEND;
-		goto done_broad;
-	}
-	inbuf = malloc(maxbufsize);
-	outbuf = malloc(maxbufsize);
-	if ((inbuf == NULL) || (outbuf == NULL)) {
-		stat = RPC_SYSTEMERROR;
-		goto done_broad;
-	}
-
-	/* Serialize all the arguments which have to be sent */
-	msg.rm_xid = __RPC_GETXID();
-	msg.rm_direction = CALL;
-	msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
-	msg.rm_call.cb_prog = RPCBPROG;
-	msg.rm_call.cb_vers = RPCBVERS;
-	msg.rm_call.cb_proc = RPCBPROC_CALLIT;
-	barg.prog = prog;
-	barg.vers = vers;
-	barg.proc = proc;
-	barg.args.args_val = argsp;
-	barg.xdr_args = xargs;
-	bres.addr = uaddrp;
-	bres.results.results_val = resultsp;
-	bres.xdr_res = xresults;
-	msg.rm_call.cb_cred = sys_auth->ah_cred;
-	msg.rm_call.cb_verf = sys_auth->ah_verf;
-	xdrmem_create(xdrs, outbuf, maxbufsize, XDR_ENCODE);
-	if ((!xdr_callmsg(xdrs, &msg)) ||
-	    (!xdr_rpcb_rmtcallargs(xdrs,
-	    (struct rpcb_rmtcallargs *)(void *)&barg))) {
-		stat = RPC_CANTENCODEARGS;
-		goto done_broad;
-	}
-	outlen = xdr_getpos(xdrs);
-	xdr_destroy(xdrs);
-
-#ifdef PORTMAP
-	/* Prepare the packet for version 2 PORTMAP */
-	if (pmap_flag) {
-		msg.rm_xid++;	/* One way to distinguish */
-		msg.rm_call.cb_prog = PMAPPROG;
-		msg.rm_call.cb_vers = PMAPVERS;
-		msg.rm_call.cb_proc = PMAPPROC_CALLIT;
-		barg_pmap.prog = prog;
-		barg_pmap.vers = vers;
-		barg_pmap.proc = proc;
-		barg_pmap.args_ptr = argsp;
-		barg_pmap.xdr_args = xargs;
-		bres_pmap.port_ptr = &port;
-		bres_pmap.xdr_results = xresults;
-		bres_pmap.results_ptr = resultsp;
-		xdrmem_create(xdrs, outbuf_pmap, udpbufsz, XDR_ENCODE);
-		if ((! xdr_callmsg(xdrs, &msg)) ||
-		    (! xdr_rmtcall_args(xdrs, &barg_pmap))) {
-			stat = RPC_CANTENCODEARGS;
-			goto done_broad;
-		}
-		outlen_pmap = xdr_getpos(xdrs);
-		xdr_destroy(xdrs);
-	}
-#endif				/* PORTMAP */
-
-	/*
-	 * Basic loop: broadcast the packets to transports which
-	 * support data packets of size such that one can encode
-	 * all the arguments.
-	 * Wait a while for response(s).
-	 * The response timeout grows larger per iteration.
-	 */
-	for (msec = inittime; msec <= waittime; msec += msec) {
-		struct broadif *bip;
-
-		/* Broadcast all the packets now */
-		for (i = 0; i < fdlistno; i++) {
-			if (fdlist[i].dsize < outlen) {
-				stat = RPC_CANTSEND;
-				continue;
-			}
-			for (bip = TAILQ_FIRST(&fdlist[i].nal); bip != NULL;
-			     bip = TAILQ_NEXT(bip, link)) {
-				void *addr;
-
-				addr = &bip->broadaddr;
-
-				__rpc_broadenable(fdlist[i].af, fdlist[i].fd,
-				    bip);
-
-				/*
-				 * Only use version 3 if lowvers is not set
-				 */
-
-				if (!__rpc_lowvers)
-					if ((size_t)sendto(fdlist[i].fd, outbuf,
-					    outlen, 0, (struct sockaddr*)addr,
-					    (socklen_t)fdlist[i].asize) !=
-					    outlen) {
-						warn("clnt_bcast: cannot send"
-						      " broadcast packet");
-						stat = RPC_CANTSEND;
-						continue;
-					}
-#ifdef RPC_DEBUG
-				if (!__rpc_lowvers)
-					fprintf(stderr, "Broadcast packet sent "
-						"for %s\n",
-						 fdlist[i].nconf->nc_netid);
-#endif
-#ifdef PORTMAP
-				/*
-				 * Send the version 2 packet also
-				 * for UDP/IP
-				 */
-				if (pmap_flag &&
-				    fdlist[i].proto == IPPROTO_UDP) {
-					if ((size_t)sendto(fdlist[i].fd,
-					    outbuf_pmap, outlen_pmap, 0, addr,
-					    (socklen_t)fdlist[i].asize) !=
-						outlen_pmap) {
-						warnx("clnt_bcast: "
-						    "Cannot send "
-						    "broadcast packet");
-						stat = RPC_CANTSEND;
-						continue;
-					}
-				}
-#ifdef RPC_DEBUG
-				fprintf(stderr, "PMAP Broadcast packet "
-					"sent for %s\n",
-					fdlist[i].nconf->nc_netid);
-#endif
-#endif				/* PORTMAP */
-			}
-			/* End for sending all packets on this transport */
-		}	/* End for sending on all transports */
-
-		if (eachresult == NULL) {
-			stat = RPC_SUCCESS;
-			goto done_broad;
-		}
-
-		/*
-		 * Get all the replies from these broadcast requests
-		 */
-	recv_again:
-		ts.tv_sec = msec / 1000;
-		ts.tv_nsec = (msec % 1000) * 1000000;
-
-		switch (pollretval = pollts(pfd, fdlistno, &ts, NULL)) {
-		case 0:		/* timed out */
-			stat = RPC_TIMEDOUT;
-			continue;
-		case -1:	/* some kind of error - we ignore it */
-			goto recv_again;
-		}		/* end of poll results switch */
-
-		for (i = fds_found = 0;
-		     i < fdlistno && fds_found < pollretval; i++) {
-			bool_t done = FALSE;
-
-			if (pfd[i].revents == 0)
-				continue;
-			else if (pfd[i].revents & POLLNVAL) {
-				/*
-				 * Something bad has happened to this descri-
-				 * ptor. We can cause pollts() to ignore
-				 * it simply by using a negative fd.  We do that
-				 * rather than compacting the pfd[] and fdlist[]
-				 * arrays.
-				 */
-				pfd[i].fd = -1;
-				fds_found++;
-				continue;
-			} else
-				fds_found++;
-#ifdef RPC_DEBUG
-			fprintf(stderr, "response for %s\n",
-				fdlist[i].nconf->nc_netid);
-#endif
-		try_again:
-			inlen = recvfrom(fdlist[i].fd, inbuf, fdlist[i].dsize,
-			    0, (struct sockaddr *)(void *)&fdlist[i].raddr,
-			    &fdlist[i].asize);
-			if (inlen < 0) {
-				if (errno == EINTR)
-					goto try_again;
-				warnx("clnt_bcast: Cannot receive reply to "
-					"broadcast");
-				stat = RPC_CANTRECV;
-				continue;
-			}
-			if (inlen < (ssize_t)sizeof(u_int32_t))
-				continue; /* Drop that and go ahead */
-			/*
-			 * see if reply transaction id matches sent id.
-			 * If so, decode the results. If return id is xid + 1
-			 * it was a PORTMAP reply
-			 */
-			if (*((u_int32_t *)(void *)(inbuf)) ==
-			    *((u_int32_t *)(void *)(outbuf))) {
-				pmap_reply_flag = 0;
-				msg.acpted_rply.ar_verf = _null_auth;
-				msg.acpted_rply.ar_results.where =
-					(caddr_t)(void *)&bres;
-				msg.acpted_rply.ar_results.proc =
-					(xdrproc_t)xdr_rpcb_rmtcallres;
-#ifdef PORTMAP
-			} else if (pmap_flag &&
-				*((u_int32_t *)(void *)(inbuf)) ==
-				*((u_int32_t *)(void *)(outbuf_pmap))) {
-				pmap_reply_flag = 1;
-				msg.acpted_rply.ar_verf = _null_auth;
-				msg.acpted_rply.ar_results.where =
-					(caddr_t)(void *)&bres_pmap;
-				msg.acpted_rply.ar_results.proc =
-					(xdrproc_t)xdr_rmtcallres;
-#endif				/* PORTMAP */
-			} else
-				continue;
-			xdrmem_create(xdrs, inbuf, (u_int)inlen, XDR_DECODE);
-			if (xdr_replymsg(xdrs, &msg)) {
-				if ((msg.rm_reply.rp_stat == MSG_ACCEPTED) &&
-				    (msg.acpted_rply.ar_stat == SUCCESS)) {
-					struct netbuf taddr, *np;
-					struct sockaddr_in *bsin;
-
-#ifdef PORTMAP
-					if (pmap_flag && pmap_reply_flag) {
-						bsin = (struct sockaddr_in *)
-						    (void *)&fdlist[i].raddr;
-						bsin->sin_port =
-						    htons((u_short)port);
-						taddr.len = taddr.maxlen = 
-						    fdlist[i].raddr.ss_len;
-						taddr.buf = &fdlist[i].raddr;
-						done = (*eachresult)(resultsp,
-						    &taddr, fdlist[i].nconf);
-					} else {
-#endif
-#ifdef RPC_DEBUG
-						fprintf(stderr, "uaddr %s\n",
-						    uaddrp);
-#endif
-						np = uaddr2taddr(
-						    fdlist[i].nconf, uaddrp);
-						done = (*eachresult)(resultsp,
-						    np, fdlist[i].nconf);
-						free(np);
-#ifdef PORTMAP
-					}
-#endif
-				}
-				/* otherwise, we just ignore the errors ... */
-			}
-			/* else some kind of deserialization problem ... */
-
-			xdrs->x_op = XDR_FREE;
-			msg.acpted_rply.ar_results.proc = (xdrproc_t) xdr_void;
-			(void) xdr_replymsg(xdrs, &msg);
-			(void) (*xresults)(xdrs, resultsp);
-			XDR_DESTROY(xdrs);
-			if (done) {
-				stat = RPC_SUCCESS;
-				goto done_broad;
-			} else {
-				goto recv_again;
-			}
-		}		/* The recv for loop */
-	}			/* The giant for loop */
-
-done_broad:
-	if (inbuf)
-		(void) free(inbuf);
-	if (outbuf)
-		(void) free(outbuf);
-#ifdef PORTMAP
-	if (outbuf_pmap)
-		(void) free(outbuf_pmap);
-#endif
-	for (i = 0; i < fdlistno; i++) {
-		(void) close(fdlist[i].fd);
-		__rpc_freebroadifs(&fdlist[i].nal);
-	}
-	AUTH_DESTROY(sys_auth);
-	(void) __rpc_endconf(handle);
-
-	return (stat);
-}
-
-
-enum clnt_stat
-rpc_broadcast(
-	rpcprog_t	prog,		/* program number */
-	rpcvers_t	vers,		/* version number */
-	rpcproc_t	proc,		/* procedure number */
-	xdrproc_t	xargs,		/* xdr routine for args */
-	const char *	argsp,		/* pointer to args */
-	xdrproc_t	xresults,	/* xdr routine for results */
-	caddr_t		resultsp,	/* pointer to results */
-	resultproc_t	eachresult,	/* call with each result obtained */
-	const char *	nettype)	/* transport type */
-{
-	enum clnt_stat	dummy;
-
-	dummy = rpc_broadcast_exp(prog, vers, proc, xargs, argsp,
-		xresults, resultsp, eachresult,
-		INITTIME, WAITTIME, nettype);
-	return (dummy);
-}
diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c
deleted file mode 100644
index 76dd576a5..000000000
--- a/lib/libc/rpc/clnt_dg.c
+++ /dev/null
@@ -1,766 +0,0 @@
-/*	$NetBSD: clnt_dg.c,v 1.29 2013/05/07 21:08:44 christos Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #ident	"@(#)clnt_dg.c	1.23	94/04/22 SMI" */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro";
-#else
-__RCSID("$NetBSD: clnt_dg.c,v 1.29 2013/05/07 21:08:44 christos Exp $");
-#endif
-#endif
-
-/*
- * Implements a connectionless client side RPC.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/poll.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <rpc/rpc.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <unistd.h>
-#include <err.h>
-
-#include "svc_fdset.h"
-#include "rpc_internal.h"
-
-#ifdef __weak_alias
-__weak_alias(clnt_dg_create,_clnt_dg_create)
-#endif
-
-#define	RPC_MAX_BACKOFF		30 /* seconds */
-
-
-static struct clnt_ops *clnt_dg_ops(void);
-static bool_t time_not_ok(struct timeval *);
-static enum clnt_stat clnt_dg_call(CLIENT *, rpcproc_t, xdrproc_t,
-    const char *, xdrproc_t, caddr_t, struct timeval);
-static void clnt_dg_geterr(CLIENT *, struct rpc_err *);
-static bool_t clnt_dg_freeres(CLIENT *, xdrproc_t, caddr_t);
-static void clnt_dg_abort(CLIENT *);
-static bool_t clnt_dg_control(CLIENT *, u_int, char *);
-static void clnt_dg_destroy(CLIENT *);
-
-
-
-
-/*
- *	This machinery implements per-fd locks for MT-safety.  It is not
- *	sufficient to do per-CLIENT handle locks for MT-safety because a
- *	user may create more than one CLIENT handle with the same fd behind
- *	it.  Therfore, we allocate an array of flags (dg_fd_locks), protected
- *	by the clnt_fd_lock mutex, and an array (dg_cv) of condition variables
- *	similarly protected.  Dg_fd_lock[fd] == 1 => a call is activte on some
- *	CLIENT handle created for that fd.
- *	The current implementation holds locks across the entire RPC and reply,
- *	including retransmissions.  Yes, this is silly, and as soon as this
- *	code is proven to work, this should be the first thing fixed.  One step
- *	at a time.
- */
-static int	*dg_fd_locks;
-#ifdef _REENTRANT
-#define __rpc_lock_value __isthreaded;
-extern mutex_t clnt_fd_lock;
-static cond_t	*dg_cv;
-#define	release_fd_lock(fd, mask) {		\
-	mutex_lock(&clnt_fd_lock);	\
-	dg_fd_locks[fd] = 0;		\
-	mutex_unlock(&clnt_fd_lock);	\
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);	\
-	cond_signal(&dg_cv[fd]);	\
-}
-#else
-#define release_fd_lock(fd,mask)
-#define __rpc_lock_value 0
-#endif
-
-static const char mem_err_clnt_dg[] = "clnt_dg_create: out of memory";
-
-/* VARIABLES PROTECTED BY clnt_fd_lock: dg_fd_locks, dg_cv */
-
-/*
- * Private data kept per client handle
- */
-struct cu_data {
-	int			cu_fd;		/* connections fd */
-	bool_t			cu_closeit;	/* opened by library */
-	struct sockaddr_storage	cu_raddr;	/* remote address */
-	int			cu_rlen;
-	struct timeval		cu_wait;	/* retransmit interval */
-	struct timeval		cu_total;	/* total time for the call */
-	struct rpc_err		cu_error;
-	XDR			cu_outxdrs;
-	u_int			cu_xdrpos;
-	u_int			cu_sendsz;	/* send size */
-	char			*cu_outbuf;
-	u_int			cu_recvsz;	/* recv size */
-	struct pollfd		cu_pfdp;
-	char			cu_inbuf[1];
-};
-
-/*
- * Connection less client creation returns with client handle parameters.
- * Default options are set, which the user can change using clnt_control().
- * fd should be open and bound.
- * NB: The rpch->cl_auth is initialized to null authentication.
- * 	Caller may wish to set this something more useful.
- *
- * sendsz and recvsz are the maximum allowable packet sizes that can be
- * sent and received. Normally they are the same, but they can be
- * changed to improve the program efficiency and buffer allocation.
- * If they are 0, use the transport default.
- *
- * If svcaddr is NULL, returns NULL.
- */
-CLIENT *
-clnt_dg_create(
-	int fd,				/* open file descriptor */
-	const struct netbuf *svcaddr,	/* servers address */
-	rpcprog_t program,		/* program number */
-	rpcvers_t version,		/* version number */
-	u_int sendsz,			/* buffer recv size */
-	u_int recvsz)			/* buffer send size */
-{
-	CLIENT *cl = NULL;		/* client handle */
-	struct cu_data *cu = NULL;	/* private data */
-	struct rpc_msg call_msg;
-#ifdef _REENTRANT
-	sigset_t mask;
-#endif
-	sigset_t newmask;
-	struct __rpc_sockinfo si;
-	int one = 1;
-
-	__clnt_sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	if (dg_fd_locks == NULL) {
-#ifdef _REENTRANT
-		size_t cv_allocsz;
-#endif
-		size_t fd_allocsz;
-		int dtbsize = __rpc_dtbsize();
-
-		fd_allocsz = dtbsize * sizeof (int);
-		dg_fd_locks = mem_alloc(fd_allocsz);
-		if (dg_fd_locks == NULL) {
-			goto err0;
-		} else
-			memset(dg_fd_locks, '\0', fd_allocsz);
-
-#ifdef _REENTRANT
-		cv_allocsz = dtbsize * sizeof (cond_t);
-		dg_cv = mem_alloc(cv_allocsz);
-		if (dg_cv == NULL) {
-			mem_free(dg_fd_locks, fd_allocsz);
-			dg_fd_locks = NULL;
-			goto err0;
-		} else {
-			int i;
-
-			for (i = 0; i < dtbsize; i++)
-				cond_init(&dg_cv[i], 0, (void *) 0);
-		}
-#endif
-	}
-
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-
-	if (svcaddr == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
-		return (NULL);
-	}
-
-	if (!__rpc_fd2sockinfo(fd, &si)) {
-		rpc_createerr.cf_stat = RPC_TLIERROR;
-		rpc_createerr.cf_error.re_errno = 0;
-		return (NULL);
-	}
-	/*
-	 * Find the receive and the send size
-	 */
-	sendsz = __rpc_get_t_size(si.si_af, si.si_proto, (int)sendsz);
-	recvsz = __rpc_get_t_size(si.si_af, si.si_proto, (int)recvsz);
-	if ((sendsz == 0) || (recvsz == 0)) {
-		rpc_createerr.cf_stat = RPC_TLIERROR; /* XXX */
-		rpc_createerr.cf_error.re_errno = 0;
-		return (NULL);
-	}
-
-	if ((cl = mem_alloc(sizeof (CLIENT))) == NULL)
-		goto err1;
-	/*
-	 * Should be multiple of 4 for XDR.
-	 */
-	sendsz = ((sendsz + 3) / 4) * 4;
-	recvsz = ((recvsz + 3) / 4) * 4;
-	cu = malloc(sizeof (*cu) + sendsz + recvsz);
-	if (cu == NULL)
-		goto err1;
-	memset(cu, 0, sizeof(*cu));
-	(void) memcpy(&cu->cu_raddr, svcaddr->buf, (size_t)svcaddr->len);
-	cu->cu_rlen = svcaddr->len;
-	cu->cu_outbuf = &cu->cu_inbuf[recvsz];
-	/* Other values can also be set through clnt_control() */
-#ifdef RUMP_RPC
-	cu->cu_wait.tv_sec = 15;	/* heuristically chosen */
-	cu->cu_wait.tv_usec = 0;
-#else
-	cu->cu_wait.tv_sec = 0;		/* for testing, 10x / second */
-	cu->cu_wait.tv_usec = 100000;
-#endif
-	cu->cu_total.tv_sec = -1;
-	cu->cu_total.tv_usec = -1;
-	cu->cu_sendsz = sendsz;
-	cu->cu_recvsz = recvsz;
-	call_msg.rm_xid = __RPC_GETXID();
-	call_msg.rm_call.cb_prog = program;
-	call_msg.rm_call.cb_vers = version;
-	xdrmem_create(&(cu->cu_outxdrs), cu->cu_outbuf, sendsz, XDR_ENCODE);
-	if (! xdr_callhdr(&(cu->cu_outxdrs), &call_msg)) {
-		rpc_createerr.cf_stat = RPC_CANTENCODEARGS;  /* XXX */
-		rpc_createerr.cf_error.re_errno = 0;
-		goto err2;
-	}
-	cu->cu_xdrpos = XDR_GETPOS(&(cu->cu_outxdrs));
-
-	/* XXX fvdl - do we still want this? */
-#if 0
-	(void)bindresvport_sa(fd, (struct sockaddr *)svcaddr->buf);
-#endif
-	ioctl(fd, FIONBIO, (char *)(void *)&one);
-
-	/*
-	 * By default, closeit is always FALSE. It is users responsibility
-	 * to do a close on it, else the user may use clnt_control
-	 * to let clnt_destroy do it for him/her.
-	 */
-	cu->cu_closeit = FALSE;
-	cu->cu_fd = fd;
-	cu->cu_pfdp.fd = cu->cu_fd;
-	cu->cu_pfdp.events = POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND;
-	cl->cl_ops = clnt_dg_ops();
-	cl->cl_private = (caddr_t)(void *)cu;
-	cl->cl_auth = authnone_create();
-	cl->cl_tp = NULL;
-	cl->cl_netid = NULL;
-	return (cl);
-err0:
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-err1:
-	warnx(mem_err_clnt_dg);
-	rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-	rpc_createerr.cf_error.re_errno = errno;
-err2:
-	if (cl) {
-		mem_free(cl, sizeof (CLIENT));
-		if (cu)
-			mem_free(cu, sizeof (*cu) + sendsz + recvsz);
-	}
-	return (NULL);
-}
-
-static enum clnt_stat
-clnt_dg_call(
-	CLIENT *	cl,		/* client handle */
-	rpcproc_t	proc,		/* procedure number */
-	xdrproc_t	xargs,		/* xdr routine for args */
-	const char *	argsp,		/* pointer to args */
-	xdrproc_t	xresults,	/* xdr routine for results */
-	caddr_t		resultsp,	/* pointer to results */
-	struct timeval	utimeout)	/* seconds to wait before giving up */
-{
-	struct cu_data *cu;
-	XDR *xdrs;
-	size_t outlen;
-	struct rpc_msg reply_msg;
-	XDR reply_xdrs;
-	bool_t ok;
-	int nrefreshes = 2;		/* number of times to refresh cred */
-	struct timeval timeout;
-	struct timeval retransmit_time;
-	struct timeval next_sendtime, starttime, time_waited, tv;
-#ifdef _REENTRANT
-	sigset_t mask, *maskp = &mask;
-#else
-	sigset_t *maskp = NULL;
-#endif
-	sigset_t newmask;
-	ssize_t recvlen = 0;
-	struct timespec ts;
-	int n;
-
-	_DIAGASSERT(cl != NULL);
-
-	cu = (struct cu_data *)cl->cl_private;
-
-	__clnt_sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (dg_fd_locks[cu->cu_fd])
-		cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock);
-	dg_fd_locks[cu->cu_fd] = __rpc_lock_value;
-	mutex_unlock(&clnt_fd_lock);
-	if (cu->cu_total.tv_usec == -1) {
-		timeout = utimeout;	/* use supplied timeout */
-	} else {
-		timeout = cu->cu_total;	/* use default timeout */
-	}
-
-	time_waited.tv_sec = 0;
-	time_waited.tv_usec = 0;
-	retransmit_time = next_sendtime = cu->cu_wait;
-	gettimeofday(&starttime, NULL);
-
-call_again:
-	xdrs = &(cu->cu_outxdrs);
-	xdrs->x_op = XDR_ENCODE;
-	XDR_SETPOS(xdrs, cu->cu_xdrpos);
-	/*
-	 * the transaction is the first thing in the out buffer
-	 */
-	(*(u_int32_t *)(void *)(cu->cu_outbuf))++;
-	if ((! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
-	    (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
-	    (! (*xargs)(xdrs, __UNCONST(argsp)))) {
-		cu->cu_error.re_status = RPC_CANTENCODEARGS;
-		goto out;
-	}
-	outlen = (size_t)XDR_GETPOS(xdrs);
-
-send_again:
-	if ((size_t)sendto(cu->cu_fd, cu->cu_outbuf, outlen, 0,
-	    (struct sockaddr *)(void *)&cu->cu_raddr, (socklen_t)cu->cu_rlen)
-	    != outlen) {
-		cu->cu_error.re_errno = errno;
-		cu->cu_error.re_status = RPC_CANTSEND;
-		goto out;
-	}
-
-	/*
-	 * Hack to provide rpc-based message passing
-	 */
-	if (timeout.tv_sec == 0 && timeout.tv_usec == 0) {
-		cu->cu_error.re_status = RPC_TIMEDOUT;
-		goto out;
-	}
-	/*
-	 * sub-optimal code appears here because we have
-	 * some clock time to spare while the packets are in flight.
-	 * (We assume that this is actually only executed once.)
-	 */
-	reply_msg.acpted_rply.ar_verf = _null_auth;
-	reply_msg.acpted_rply.ar_results.where = resultsp;
-	reply_msg.acpted_rply.ar_results.proc = xresults;
-
-
-	for (;;) {
-		/* Decide how long to wait. */
-		if (timercmp(&next_sendtime, &timeout, <))
-			timersub(&next_sendtime, &time_waited, &tv);
-		else
-			timersub(&timeout, &time_waited, &tv);
-		if (tv.tv_sec < 0 || tv.tv_usec < 0)
-			tv.tv_sec = tv.tv_usec = 0;
-		TIMEVAL_TO_TIMESPEC(&tv, &ts);
-
-		n = pollts(&cu->cu_pfdp, 1, &ts, maskp);
-		if (n == 1) {
-			/* We have some data now */
-			do {
-				recvlen = recvfrom(cu->cu_fd, cu->cu_inbuf,
-				    cu->cu_recvsz, 0, NULL, NULL);
-			} while (recvlen < 0 && errno == EINTR);
-			
-			if (recvlen < 0 && errno != EWOULDBLOCK) {
-				cu->cu_error.re_errno = errno;
-				cu->cu_error.re_status = RPC_CANTRECV;
-				goto out;
-			}
-			if (recvlen >= (ssize_t)sizeof(uint32_t)) {
-				if (memcmp(cu->cu_inbuf, cu->cu_outbuf,
-				    sizeof(uint32_t)) == 0)
-					/* Assume we have the proper reply. */
-					break;
-			}
-		}
-		if (n == -1) {
-			cu->cu_error.re_errno = errno;
-			cu->cu_error.re_status = RPC_CANTRECV;
-			goto out;
-		}
-
-		gettimeofday(&tv, NULL);
-		timersub(&tv, &starttime, &time_waited);
-
-		/* Check for timeout. */
-		if (timercmp(&time_waited, &timeout, >)) {
-			cu->cu_error.re_status = RPC_TIMEDOUT;
-			goto out;
-		}
-
-		/* Retransmit if necessary. */
-		if (timercmp(&time_waited, &next_sendtime, >)) {
-			/* update retransmit_time */
-			if (retransmit_time.tv_sec < RPC_MAX_BACKOFF)
-				timeradd(&retransmit_time, &retransmit_time,
-				    &retransmit_time);
-			timeradd(&next_sendtime, &retransmit_time,
-			    &next_sendtime);
-			goto send_again;
-		}
-	}
-
-	/*
-	 * now decode and validate the response
-	 */
-
-	xdrmem_create(&reply_xdrs, cu->cu_inbuf, (u_int)recvlen, XDR_DECODE);
-	ok = xdr_replymsg(&reply_xdrs, &reply_msg);
-	/* XDR_DESTROY(&reply_xdrs);	save a few cycles on noop destroy */
-	if (ok) {
-		if ((reply_msg.rm_reply.rp_stat == MSG_ACCEPTED) &&
-			(reply_msg.acpted_rply.ar_stat == SUCCESS))
-			cu->cu_error.re_status = RPC_SUCCESS;
-		else
-			_seterr_reply(&reply_msg, &(cu->cu_error));
-
-		if (cu->cu_error.re_status == RPC_SUCCESS) {
-			if (! AUTH_VALIDATE(cl->cl_auth,
-					    &reply_msg.acpted_rply.ar_verf)) {
-				cu->cu_error.re_status = RPC_AUTHERROR;
-				cu->cu_error.re_why = AUTH_INVALIDRESP;
-			}
-			if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) {
-				xdrs->x_op = XDR_FREE;
-				(void) xdr_opaque_auth(xdrs,
-					&(reply_msg.acpted_rply.ar_verf));
-			}
-		}		/* end successful completion */
-		/*
-		 * If unsuccesful AND error is an authentication error
-		 * then refresh credentials and try again, else break
-		 */
-		else if (cu->cu_error.re_status == RPC_AUTHERROR)
-			/* maybe our credentials need to be refreshed ... */
-			if (nrefreshes > 0 && AUTH_REFRESH(cl->cl_auth)) {
-				nrefreshes--;
-				goto call_again;
-			}
-		/* end of unsuccessful completion */
-	}	/* end of valid reply message */
-	else {
-		cu->cu_error.re_status = RPC_CANTDECODERES;
-
-	}
-out:
-	release_fd_lock(cu->cu_fd, mask);
-	return (cu->cu_error.re_status);
-}
-
-static void
-clnt_dg_geterr(CLIENT *cl, struct rpc_err *errp)
-{
-	struct cu_data *cu;
-
-	_DIAGASSERT(cl != NULL);
-	_DIAGASSERT(errp != NULL);
-
-	cu = (struct cu_data *)cl->cl_private;
-	*errp = cu->cu_error;
-}
-
-static bool_t
-clnt_dg_freeres(CLIENT *cl, xdrproc_t xdr_res, caddr_t res_ptr)
-{
-	struct cu_data *cu;
-	XDR *xdrs;
-	bool_t dummy;
-#ifdef _REENTRANT
-	sigset_t mask;
-#endif
-	sigset_t newmask;
-
-	_DIAGASSERT(cl != NULL);
-	cu = (struct cu_data *)cl->cl_private;
-	xdrs = &(cu->cu_outxdrs);
-
-	__clnt_sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (dg_fd_locks[cu->cu_fd])
-		cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock);
-	xdrs->x_op = XDR_FREE;
-	dummy = (*xdr_res)(xdrs, res_ptr);
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &mask, NULL);
-	cond_signal(&dg_cv[cu->cu_fd]);
-	return (dummy);
-}
-
-/*ARGSUSED*/
-static void
-clnt_dg_abort(CLIENT *h)
-{
-}
-
-static bool_t
-clnt_dg_control(CLIENT *cl, u_int request, char *info)
-{
-	struct cu_data *cu;
-	struct netbuf *addr;
-#ifdef _REENTRANT
-	sigset_t mask;
-#endif
-	sigset_t newmask;
-
-	_DIAGASSERT(cl != NULL);
-	/* info is handled below */
-
-	cu = (struct cu_data *)cl->cl_private;
-
-	__clnt_sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (dg_fd_locks[cu->cu_fd])
-		cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock);
-	dg_fd_locks[cu->cu_fd] = __rpc_lock_value;
-	mutex_unlock(&clnt_fd_lock);
-	switch (request) {
-	case CLSET_FD_CLOSE:
-		cu->cu_closeit = TRUE;
-		release_fd_lock(cu->cu_fd, mask);
-		return (TRUE);
-	case CLSET_FD_NCLOSE:
-		cu->cu_closeit = FALSE;
-		release_fd_lock(cu->cu_fd, mask);
-		return (TRUE);
-	}
-
-	/* for other requests which use info */
-	if (info == NULL) {
-		release_fd_lock(cu->cu_fd, mask);
-		return (FALSE);
-	}
-	switch (request) {
-	case CLSET_TIMEOUT:
-		if (time_not_ok((struct timeval *)(void *)info)) {
-			release_fd_lock(cu->cu_fd, mask);
-			return (FALSE);
-		}
-		cu->cu_total = *(struct timeval *)(void *)info;
-		break;
-	case CLGET_TIMEOUT:
-		*(struct timeval *)(void *)info = cu->cu_total;
-		break;
-	case CLGET_SERVER_ADDR:		/* Give him the fd address */
-		/* Now obsolete. Only for backward compatibility */
-		(void) memcpy(info, &cu->cu_raddr, (size_t)cu->cu_rlen);
-		break;
-	case CLSET_RETRY_TIMEOUT:
-		if (time_not_ok((struct timeval *)(void *)info)) {
-			release_fd_lock(cu->cu_fd, mask);
-			return (FALSE);
-		}
-		cu->cu_wait = *(struct timeval *)(void *)info;
-		break;
-	case CLGET_RETRY_TIMEOUT:
-		*(struct timeval *)(void *)info = cu->cu_wait;
-		break;
-	case CLGET_FD:
-		*(int *)(void *)info = cu->cu_fd;
-		break;
-	case CLGET_SVC_ADDR:
-		addr = (struct netbuf *)(void *)info;
-		addr->buf = &cu->cu_raddr;
-		addr->len = cu->cu_rlen;
-		addr->maxlen = sizeof cu->cu_raddr;
-		break;
-	case CLSET_SVC_ADDR:		/* set to new address */
-		addr = (struct netbuf *)(void *)info;
-		if (addr->len < sizeof cu->cu_raddr) {
-			release_fd_lock(cu->cu_fd, mask);
-			return (FALSE);
-		}
-		(void) memcpy(&cu->cu_raddr, addr->buf, (size_t)addr->len);
-		cu->cu_rlen = addr->len;
-		break;
-	case CLGET_XID:
-		/*
-		 * use the knowledge that xid is the
-		 * first element in the call structure *.
-		 * This will get the xid of the PREVIOUS call
-		 */
-		*(u_int32_t *)(void *)info =
-		    ntohl(*(u_int32_t *)(void *)cu->cu_outbuf);
-		break;
-
-	case CLSET_XID:
-		/* This will set the xid of the NEXT call */
-		*(u_int32_t *)(void *)cu->cu_outbuf =
-		    htonl(*(u_int32_t *)(void *)info - 1);
-		/* decrement by 1 as clnt_dg_call() increments once */
-		break;
-
-	case CLGET_VERS:
-		/*
-		 * This RELIES on the information that, in the call body,
-		 * the version number field is the fifth field from the
-		 * begining of the RPC header. MUST be changed if the
-		 * call_struct is changed
-		 */
-		*(u_int32_t *)(void *)info =
-		    ntohl(*(u_int32_t *)(void *)(cu->cu_outbuf +
-		    4 * BYTES_PER_XDR_UNIT));
-		break;
-
-	case CLSET_VERS:
-		*(u_int32_t *)(void *)(cu->cu_outbuf + 4 * BYTES_PER_XDR_UNIT)
-			= htonl(*(u_int32_t *)(void *)info);
-		break;
-
-	case CLGET_PROG:
-		/*
-		 * This RELIES on the information that, in the call body,
-		 * the program number field is the fourth field from the
-		 * begining of the RPC header. MUST be changed if the
-		 * call_struct is changed
-		 */
-		*(u_int32_t *)(void *)info =
-		    ntohl(*(u_int32_t *)(void *)(cu->cu_outbuf +
-		    3 * BYTES_PER_XDR_UNIT));
-		break;
-
-	case CLSET_PROG:
-		*(u_int32_t *)(void *)(cu->cu_outbuf + 3 * BYTES_PER_XDR_UNIT)
-			= htonl(*(u_int32_t *)(void *)info);
-		break;
-
-	default:
-		release_fd_lock(cu->cu_fd, mask);
-		return (FALSE);
-	}
-	release_fd_lock(cu->cu_fd, mask);
-	return (TRUE);
-}
-
-static void
-clnt_dg_destroy(CLIENT *cl)
-{
-	struct cu_data *cu;
-	int cu_fd;
-#ifdef _REENTRANT
-	sigset_t mask;
-#endif
-	sigset_t newmask;
-
-	_DIAGASSERT(cl != NULL);
-
-	cu = (struct cu_data *)cl->cl_private;
-	cu_fd = cu->cu_fd;
-
-	__clnt_sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (dg_fd_locks[cu_fd])
-		cond_wait(&dg_cv[cu_fd], &clnt_fd_lock);
-	if (cu->cu_closeit)
-		(void) close(cu_fd);
-	XDR_DESTROY(&(cu->cu_outxdrs));
-	mem_free(cu, (sizeof (*cu) + cu->cu_sendsz + cu->cu_recvsz));
-	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));
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &mask, NULL);
-	cond_signal(&dg_cv[cu_fd]);
-}
-
-static struct clnt_ops *
-clnt_dg_ops(void)
-{
-	static struct clnt_ops ops;
-#ifdef _REENTRANT
-	extern mutex_t	ops_lock;
-	sigset_t mask;
-#endif
-	sigset_t newmask;
-
-/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	__clnt_sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&ops_lock);
-	if (ops.cl_call == NULL) {
-		ops.cl_call = clnt_dg_call;
-		ops.cl_abort = clnt_dg_abort;
-		ops.cl_geterr = clnt_dg_geterr;
-		ops.cl_freeres = clnt_dg_freeres;
-		ops.cl_destroy = clnt_dg_destroy;
-		ops.cl_control = clnt_dg_control;
-	}
-	mutex_unlock(&ops_lock);
-	thr_sigsetmask(SIG_SETMASK, &mask, NULL);
-	return (&ops);
-}
-
-/*
- * Make sure that the time is not garbage.  -1 value is allowed.
- */
-static bool_t
-time_not_ok(struct timeval *t)
-{
-
-	_DIAGASSERT(t != NULL);
-
-	return (t->tv_sec < -1 || t->tv_sec > 100000000 ||
-		t->tv_usec < -1 || t->tv_usec > 1000000);
-}
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
deleted file mode 100644
index bab75b7b0..000000000
--- a/lib/libc/rpc/clnt_generic.c
+++ /dev/null
@@ -1,400 +0,0 @@
-/*	$NetBSD: clnt_generic.c,v 1.33 2014/05/28 14:45:19 christos Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #ident	"@(#)clnt_generic.c	1.20	94/05/03 SMI" */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)clnt_generic.c 1.32 89/03/16 Copyr 1988 Sun Micro";
-#else
-__RCSID("$NetBSD: clnt_generic.c,v 1.33 2014/05/28 14:45:19 christos Exp $");
-#endif
-#endif
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <assert.h>
-#include <stdio.h>
-#include <errno.h>
-#include <rpc/rpc.h>
-#include <rpc/nettype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "svc_fdset.h"
-#include "rpc_internal.h"
-
-#ifdef __weak_alias
-__weak_alias(clnt_create_vers,_clnt_create_vers)
-__weak_alias(clnt_create,_clnt_create)
-__weak_alias(clnt_tp_create,_clnt_tp_create)
-__weak_alias(clnt_tli_create,_clnt_tli_create)
-#endif
-
-/*
- * Generic client creation with version checking the value of
- * vers_out is set to the highest server supported value
- * vers_low <= vers_out <= vers_high  AND an error results
- * if this can not be done.
- */
-CLIENT *
-clnt_create_vers(
-	const char *	hostname,
-	rpcprog_t	prog,
-	rpcvers_t *	vers_out,
-	rpcvers_t	vers_low,
-	rpcvers_t	vers_high,
-	const char *	nettype)
-{
-	CLIENT *clnt;
-	struct timeval to;
-	enum clnt_stat rpc_stat;
-	struct rpc_err rpcerr;
-
-	_DIAGASSERT(hostname != NULL);
-	_DIAGASSERT(vers_out != NULL);
-	/* XXX: nettype appears to support being NULL */
-
-	clnt = clnt_create(hostname, prog, vers_high, nettype);
-	if (clnt == NULL) {
-		return (NULL);
-	}
-	to.tv_sec = 10;
-	to.tv_usec = 0;
-	rpc_stat = clnt_call(clnt, NULLPROC, (xdrproc_t) xdr_void,
-	    NULL, (xdrproc_t) xdr_void, NULL, to);
-	if (rpc_stat == RPC_SUCCESS) {
-		*vers_out = vers_high;
-		return (clnt);
-	}
-	if (rpc_stat == RPC_PROGVERSMISMATCH) {
-		unsigned long minvers, maxvers;
-
-		clnt_geterr(clnt, &rpcerr);
-		minvers = rpcerr.re_vers.low;
-		maxvers = rpcerr.re_vers.high;
-		if (maxvers < vers_high)
-			vers_high = (rpcvers_t)maxvers;
-		if (minvers > vers_low)
-			vers_low = (rpcvers_t)minvers;
-		if (vers_low > vers_high) {
-			goto error;
-		}
-		CLNT_CONTROL(clnt, CLSET_VERS, (char *)(void *)&vers_high);
-		rpc_stat = clnt_call(clnt, NULLPROC, (xdrproc_t) xdr_void,
-		    NULL, (xdrproc_t) xdr_void, NULL, to);
-		if (rpc_stat == RPC_SUCCESS) {
-			*vers_out = vers_high;
-			return (clnt);
-		}
-	}
-	clnt_geterr(clnt, &rpcerr);
-
-error:
-	rpc_createerr.cf_stat = rpc_stat;
-	rpc_createerr.cf_error = rpcerr;
-	clnt_destroy(clnt);
-	return (NULL);
-}
-
-/*
- * Top level client creation routine.
- * Generic client creation: takes (servers name, program-number, nettype) and
- * returns client handle. Default options are set, which the user can
- * change using the rpc equivalent of ioctl()'s.
- *
- * It tries for all the netids in that particular class of netid until
- * it succeeds.
- * XXX The error message in the case of failure will be the one
- * pertaining to the last create error.
- *
- * It calls clnt_tp_create();
- */
-CLIENT *
-clnt_create(
-	const char *	hostname,			/* server name */
-	rpcprog_t	prog,				/* program number */
-	rpcvers_t	vers,				/* version number */
-	const char *	nettype)			/* net type */
-{
-	struct netconfig *nconf;
-	CLIENT *clnt = NULL;
-	void *handle;
-	enum clnt_stat	save_cf_stat = RPC_SUCCESS;
-	struct rpc_err	save_cf_error;
-
-	_DIAGASSERT(hostname != NULL);
-	/* XXX: nettype appears to support being NULL */
-
-	if ((handle = __rpc_setconf(nettype)) == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-	rpc_createerr.cf_stat = RPC_SUCCESS;
-	while (clnt == NULL) {
-		if ((nconf = __rpc_getconf(handle)) == NULL) {
-			if (rpc_createerr.cf_stat == RPC_SUCCESS)
-				rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			break;
-		}
-#ifdef CLNT_DEBUG
-		printf("trying netid %s\n", nconf->nc_netid);
-#endif
-		clnt = clnt_tp_create(hostname, prog, vers, nconf);
-		if (clnt)
-			break;
-		else
-			/*
-			 *	Since we didn't get a name-to-address
-			 *	translation failure here, we remember
-			 *	this particular error.  The object of
-			 *	this is to enable us to return to the
-			 *	caller a more-specific error than the
-			 *	unhelpful ``Name to address translation
-			 *	failed'' which might well occur if we
-			 *	merely returned the last error (because
-			 *	the local loopbacks are typically the
-			 *	last ones in /etc/netconfig and the most
-			 *	likely to be unable to translate a host
-			 *	name).
-			 */
-			if (rpc_createerr.cf_stat != RPC_N2AXLATEFAILURE) {
-				save_cf_stat = rpc_createerr.cf_stat;
-				save_cf_error = rpc_createerr.cf_error;
-			}
-	}
-
-	/*
-	 *	Attempt to return an error more specific than ``Name to address
-	 *	translation failed''
-	 */
-	if ((rpc_createerr.cf_stat == RPC_N2AXLATEFAILURE) &&
-		(save_cf_stat != RPC_SUCCESS)) {
-		rpc_createerr.cf_stat = save_cf_stat;
-		rpc_createerr.cf_error = save_cf_error;
-	}
-	__rpc_endconf(handle);
-	return (clnt);
-}
-
-/*
- * Generic client creation: takes (servers name, program-number, netconf) and
- * returns client handle. Default options are set, which the user can
- * change using the rpc equivalent of ioctl()'s : clnt_control()
- * It finds out the server address from rpcbind and calls clnt_tli_create()
- */
-CLIENT *
-clnt_tp_create(
-	const char *		hostname,	/* server name */
-	rpcprog_t		prog,		/* program number */
-	rpcvers_t		vers,		/* version number */
-	const struct netconfig *nconf)		/* net config struct */
-{
-	struct netbuf *svcaddr;			/* servers address */
-	CLIENT *cl = NULL;			/* client handle */
-
-	_DIAGASSERT(hostname != NULL);
-	/* nconf is handled below */
-
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-
-	/*
-	 * Get the address of the server
-	 */
-	if ((svcaddr = __rpcb_findaddr(prog, vers, nconf, hostname,
-		&cl)) == NULL) {
-		/* appropriate error number is set by rpcbind libraries */
-		return (NULL);
-	}
-	if (cl == NULL) {
-		cl = clnt_tli_create(RPC_ANYFD, nconf, svcaddr,
-					prog, vers, 0, 0);
-	} else {
-		/* Reuse the CLIENT handle and change the appropriate fields */
-		if (CLNT_CONTROL(cl, CLSET_SVC_ADDR, (void *)svcaddr) == TRUE) {
-			if (cl->cl_netid == NULL) {
-				cl->cl_netid = strdup(nconf->nc_netid);
-				if (cl->cl_netid == NULL)
-					goto out;
-			}
-			if (cl->cl_tp == NULL) {
-				cl->cl_tp = strdup(nconf->nc_device);
-				if (cl->cl_tp == NULL)
-					goto out;
-			}
-			(void) CLNT_CONTROL(cl, CLSET_PROG, (void *)&prog);
-			(void) CLNT_CONTROL(cl, CLSET_VERS, (void *)&vers);
-		} else {
-			CLNT_DESTROY(cl);
-			cl = clnt_tli_create(RPC_ANYFD, nconf, svcaddr,
-					prog, vers, 0, 0);
-		}
-	}
-	free(svcaddr->buf);
-	free(svcaddr);
-	return (cl);
-out:
-	clnt_destroy(cl);
-	return NULL;
-}
-
-/*
- * Generic client creation:  returns client handle.
- * Default options are set, which the user can
- * change using the rpc equivalent of ioctl()'s : clnt_control().
- * If fd is RPC_ANYFD, it will be opened using nconf.
- * It will be bound if not so.
- * If sizes are 0; appropriate defaults will be chosen.
- */
-CLIENT *
-clnt_tli_create(
-	int fd,				/* fd */
-	const struct netconfig *nconf,	/* netconfig structure */
-	const struct netbuf *svcaddr,	/* servers address */
-	rpcprog_t prog,			/* program number */
-	rpcvers_t vers,			/* version number */
-	u_int sendsz,			/* send size */
-	u_int recvsz)			/* recv size */
-{
-	CLIENT *cl;			/* client handle */
-	bool_t madefd = FALSE;		/* whether fd opened here */
-	long servtype;
-	struct __rpc_sockinfo si;
-
-	/* nconf is handled below */
-	_DIAGASSERT(svcaddr != NULL);
-
-	if (fd == RPC_ANYFD) {
-		if (nconf == NULL) {
-			rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			return (NULL);
-		}
-
-		fd = __rpc_nconf2fd(nconf);
-
-		if (fd == -1)
-			goto err;
-
-		madefd = TRUE;
-		servtype = nconf->nc_semantics;
-		if (!__rpc_fd2sockinfo(fd, &si))
-			goto err;
-
-		(void)bindresvport(fd, NULL);
-	} else {
-		if (!__rpc_fd2sockinfo(fd, &si))
-			goto err;
-		servtype = __rpc_socktype2seman(si.si_socktype);
-		if (servtype == -1) {
-			rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			return NULL;
-		}
-
-	}
-
-	if (si.si_af != ((struct sockaddr *)svcaddr->buf)->sa_family) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNHOST;	/* XXX */
-		goto err1;
-	}
-
-	switch (servtype) {
-	case NC_TPI_COTS_ORD:
-		cl = clnt_vc_create(fd, svcaddr, prog, vers, sendsz, recvsz);
-		if (!nconf || !cl)
-			break;
-		(void)__rpc_setnodelay(fd, &si);
-		break;
-	case NC_TPI_CLTS:
-		cl = clnt_dg_create(fd, svcaddr, prog, vers, sendsz, recvsz);
-		break;
-	default:
-		goto err;
-	}
-
-	if (cl == NULL)
-		goto err1; /* borrow errors from clnt_dg/vc creates */
-	if (nconf) {
-		cl->cl_netid = strdup(nconf->nc_netid);
-		if (cl->cl_netid == NULL)
-			goto err0;
-		cl->cl_tp = strdup(nconf->nc_device);
-		if (cl->cl_tp == NULL)
-			goto err0;
-	} else {
-		cl->cl_netid = __UNCONST("");
-		cl->cl_tp = __UNCONST("");
-	}
-	if (madefd) {
-		(void) CLNT_CONTROL(cl, CLSET_FD_CLOSE, NULL);
-/*		(void) CLNT_CONTROL(cl, CLSET_POP_TIMOD, NULL);  */
-	};
-
-	return (cl);
-
-err0:
-	clnt_destroy(cl);
-err:
-	rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-	rpc_createerr.cf_error.re_errno = errno;
-err1:	if (madefd)
-		(void) close(fd);
-	return (NULL);
-}
-
-/*
- * Don't block thse so interactive programs don't get stuck in lalaland.
- * (easier to do this than making connect(2) non-blocking..)
- */
-int
-__clnt_sigfillset(sigset_t *ss) {
-	static const int usersig[] = {
-	    SIGHUP, SIGINT, SIGQUIT, SIGTERM, SIGTSTP
-	};
-	if (sigfillset(ss) == -1)
-		return -1;
-	for (size_t i = 0; i < __arraycount(usersig); i++)
-		if (sigdelset(ss, usersig[i]) == -1)
-			return -1;
-	return 0;
-}
diff --git a/lib/libc/rpc/clnt_perror.c b/lib/libc/rpc/clnt_perror.c
deleted file mode 100644
index e12ece416..000000000
--- a/lib/libc/rpc/clnt_perror.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*	$NetBSD: clnt_perror.c,v 1.30 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)clnt_perror.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: clnt_perror.c,v 1.30 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * clnt_perror.c
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- */
-#include "namespace.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-#include <rpc/types.h>
-#include <rpc/auth.h>
-#include <rpc/clnt.h>
-
-#ifdef __weak_alias
-__weak_alias(clnt_pcreateerror,_clnt_pcreateerror)
-__weak_alias(clnt_perrno,_clnt_perrno)
-__weak_alias(clnt_perror,_clnt_perror)
-__weak_alias(clnt_spcreateerror,_clnt_spcreateerror)
-__weak_alias(clnt_sperrno,_clnt_sperrno)
-__weak_alias(clnt_sperror,_clnt_sperror)
-#endif
-
-static char *buf;
-static size_t buflen;
-
-static char *_buf(void);
-static char *auth_errmsg(enum auth_stat);
-
-static char *
-_buf(void)
-{
-
-	buflen = 256;
-	if (buf == 0)
-		buf = malloc(buflen);
-	return (buf);
-}
-
-/*
- * Print reply error info
- */
-char *
-clnt_sperror(CLIENT *rpch, const char *s)
-{
-	struct rpc_err e;
-	char *err;
-	char *str;
-	char *strstart;
-	size_t len, i;
-
-	_DIAGASSERT(rpch != NULL);
-	_DIAGASSERT(s != NULL);
-
-	str = _buf(); /* side effect: sets "buflen" */
-	if (str == 0)
-		return (0);
-	len = buflen;
-	strstart = str;
-	CLNT_GETERR(rpch, &e);
-
-	i = snprintf(str, len, "%s: ", s);  
-	str += i;
-	len -= i;
-
-	(void)strncpy(str, clnt_sperrno(e.re_status), len - 1);
-	i = strlen(str);
-	str += i;
-	len -= i;
-
-	switch (e.re_status) {
-	case RPC_SUCCESS:
-	case RPC_CANTENCODEARGS:
-	case RPC_CANTDECODERES:
-	case RPC_TIMEDOUT:     
-	case RPC_PROGUNAVAIL:
-	case RPC_PROCUNAVAIL:
-	case RPC_CANTDECODEARGS:
-	case RPC_SYSTEMERROR:
-	case RPC_UNKNOWNHOST:
-	case RPC_UNKNOWNPROTO:
-	case RPC_PMAPFAILURE:
-	case RPC_PROGNOTREGISTERED:
-	case RPC_FAILED:
-		break;
-
-	case RPC_CANTSEND:
-	case RPC_CANTRECV:
-		i = snprintf(str, len, "; errno = %s", strerror(e.re_errno)); 
-		str += i;
-		len -= i;
-		break;
-
-	case RPC_VERSMISMATCH:
-		i = snprintf(str, len, "; low version = %u, high version = %u", 
-			e.re_vers.low, e.re_vers.high);
-		str += i;
-		len -= i;
-		break;
-
-	case RPC_AUTHERROR:
-		err = auth_errmsg(e.re_why);
-		i = snprintf(str, len, "; why = ");
-		str += i;
-		len -= i;
-		if (err != NULL) {
-			i = snprintf(str, len, "%s",err);
-		} else {
-			i = snprintf(str, len,
-				"(unknown authentication error - %d)",
-				(int) e.re_why);
-		}
-		str += i;
-		len -= i;
-		break;
-
-	case RPC_PROGVERSMISMATCH:
-		i = snprintf(str, len, "; low version = %u, high version = %u", 
-			e.re_vers.low, e.re_vers.high);
-		str += i;
-		len -= i;
-		break;
-
-	default:	/* unknown */
-		i = snprintf(str, len, "; s1 = %u, s2 = %u", 
-			e.re_lb.s1, e.re_lb.s2);
-		str += i;
-		len -= i;
-		break;
-	}
-	return(strstart) ;
-}
-
-void
-clnt_perror(CLIENT *rpch, const char *s)
-{
-
-	_DIAGASSERT(rpch != NULL);
-	_DIAGASSERT(s != NULL);
-
-	(void) fprintf(stderr, "%s\n", clnt_sperror(rpch,s));
-}
-
-static const char *const rpc_errlist[] = {
-	[RPC_SUCCESS] =			"RPC: Success",
-	[RPC_CANTENCODEARGS] =		"RPC: Can't encode arguments",
-	[RPC_CANTDECODERES] =		"RPC: Can't decode result",
-	[RPC_CANTSEND] =		"RPC: Unable to send",
-	[RPC_CANTRECV] =		"RPC: Unable to receive",
-	[RPC_TIMEDOUT] =		"RPC: Timed out",
-	[RPC_VERSMISMATCH] =		"RPC: Incompatible versions of RPC",
-	[RPC_AUTHERROR] = 		"RPC: Authentication error",
-	[RPC_PROGUNAVAIL] =		"RPC: Program unavailable",
-	[RPC_PROGVERSMISMATCH] =	"RPC: Program/version mismatch",
-	[RPC_PROCUNAVAIL] =		"RPC: Procedure unavailable",
-	[RPC_CANTDECODEARGS] =		"RPC: Server can't decode arguments",
-	[RPC_SYSTEMERROR] =		"RPC: Remote system error",
-	[RPC_UNKNOWNHOST] =		"RPC: Unknown host",
-	[RPC_PMAPFAILURE] =		"RPC: Port mapper failure",
-	[RPC_PROGNOTREGISTERED] =	"RPC: Program not registered",
-	[RPC_FAILED] =			"RPC: Failed (unspecified error)",
-	[RPC_UNKNOWNPROTO] =		"RPC: Unknown protocol",
-	[RPC_UNKNOWNADDR] =		"RPC: Remote address unknown",
-	[RPC_TLIERROR] =		"RPC: Misc error in the TLI library",
-	[RPC_NOBROADCAST] =		"RPC: Broadcasting not supported",
-	[RPC_N2AXLATEFAILURE] =		"RPC: Name -> addr translation failed",
-	[RPC_INPROGRESS] =		"RPC: In progress",
-	[RPC_STALERACHANDLE] =		"RPC: Stale handle",
-};
-
-
-/*
- * This interface for use by clntrpc
- */
-char *
-clnt_sperrno(enum clnt_stat stat)
-{
-	unsigned int errnum = stat;
-	const char *msg;
-
-	msg = NULL;
-	if (errnum < (sizeof(rpc_errlist)/sizeof(rpc_errlist[0]))) {
-		msg = rpc_errlist[errnum];
-	}
-	if (msg == NULL) {
-		msg = "RPC: (unknown error code)";
-	}
-	return __UNCONST(msg);
-}
-
-void
-clnt_perrno(enum clnt_stat num)
-{
-	(void) fprintf(stderr, "%s\n", clnt_sperrno(num));
-}
-
-
-char *
-clnt_spcreateerror(const char *s)
-{
-	char *str;
-	size_t len, i;
-
-	_DIAGASSERT(s != NULL);
-
-	str = _buf(); /* side effect: sets "buflen" */
-	if (str == 0)
-		return(0);
-	len = buflen;
-	i = snprintf(str, len, "%s: ", s);
-	len -= i;
-	(void)strncat(str, clnt_sperrno(rpc_createerr.cf_stat), len - 1);
-	switch (rpc_createerr.cf_stat) {
-	case RPC_PMAPFAILURE:
-		(void) strncat(str, " - ", len - 1);
-		(void) strncat(str,
-		    clnt_sperrno(rpc_createerr.cf_error.re_status), len - 4);
-		break;
-
-	case RPC_SYSTEMERROR:
-		(void)strncat(str, " - ", len - 1);
-		(void)strncat(str, strerror(rpc_createerr.cf_error.re_errno),
-		    len - 4);
-		break;
-
-	case RPC_CANTSEND:
-	case RPC_CANTDECODERES:
-	case RPC_CANTENCODEARGS:
-	case RPC_SUCCESS:
-	case RPC_UNKNOWNPROTO:
-	case RPC_PROGNOTREGISTERED:
-	case RPC_FAILED:
-	case RPC_UNKNOWNHOST:
-	case RPC_CANTDECODEARGS:
-	case RPC_PROCUNAVAIL:
-	case RPC_PROGVERSMISMATCH:
-	case RPC_PROGUNAVAIL:
-	case RPC_AUTHERROR:
-	case RPC_VERSMISMATCH:
-	case RPC_TIMEDOUT:
-	case RPC_CANTRECV:
-	default:
-		break;
-	}
-	return (str);
-}
-
-void
-clnt_pcreateerror(const char *s)
-{
-
-	_DIAGASSERT(s != NULL);
-
-	(void) fprintf(stderr, "%s\n", clnt_spcreateerror(s));
-}
-
-static const char *const auth_errlist[] = {
-	"Authentication OK",			/* 0 - AUTH_OK */
-	"Invalid client credential",		/* 1 - AUTH_BADCRED */
-	"Server rejected credential",		/* 2 - AUTH_REJECTEDCRED */
-	"Invalid client verifier", 		/* 3 - AUTH_BADVERF */
-	"Server rejected verifier", 		/* 4 - AUTH_REJECTEDVERF */
-	"Client credential too weak",		/* 5 - AUTH_TOOWEAK */
-	"Invalid server verifier",		/* 6 - AUTH_INVALIDRESP */
-	"Failed (unspecified error)"		/* 7 - AUTH_FAILED */
-};
-
-static char *
-auth_errmsg(enum auth_stat stat)
-{
-	unsigned int errnum = stat;
-
-	if (errnum < __arraycount(auth_errlist))
-		return __UNCONST(auth_errlist[errnum]);
-
-	return(NULL);
-}
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
deleted file mode 100644
index 556e91c05..000000000
--- a/lib/libc/rpc/clnt_raw.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/*	$NetBSD: clnt_raw.c,v 1.32 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)clnt_raw.c	2.2 88/08/01 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: clnt_raw.c,v 1.32 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * clnt_raw.c
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * Memory based rpc for simple testing and timing.
- * Interface to create an rpc client and server in the same process.
- * This lets us similate rpc and get round trip overhead, without
- * any interference from the kernel.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <assert.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rpc/rpc.h>
-#include <rpc/raw.h>
-
-#ifdef __weak_alias
-__weak_alias(clntraw_create,_clntraw_create)
-__weak_alias(clnt_raw_create,_clnt_raw_create)
-#endif
-
-#ifdef _REENTRANT
-extern mutex_t clntraw_lock;
-#endif
-
-#define MCALL_MSG_SIZE 24
-
-/*
- * This is the "network" we will be moving stuff over.
- */
-static struct clntraw_private {
-	CLIENT	client_object;
-	XDR	xdr_stream;
-	char	*_raw_buf;
-	union {
-	    struct rpc_msg	mashl_rpcmsg;
-	    char 		mashl_callmsg[MCALL_MSG_SIZE];
-	} u;
-	u_int	mcnt;
-} *clntraw_private;
-
-static enum clnt_stat clnt_raw_call(CLIENT *, rpcproc_t, xdrproc_t,
-    const char *, xdrproc_t, caddr_t, struct timeval);
-static void clnt_raw_geterr(CLIENT *, struct rpc_err *);
-static bool_t clnt_raw_freeres(CLIENT *, xdrproc_t, caddr_t);
-static void clnt_raw_abort(CLIENT *);
-static bool_t clnt_raw_control(CLIENT *, u_int, char *);
-static void clnt_raw_destroy(CLIENT *);
-static struct clnt_ops *clnt_raw_ops(void);
-
-/*
- * Create a client handle for memory based rpc.
- */
-CLIENT *
-clnt_raw_create(rpcprog_t prog, rpcvers_t vers)
-{
-	struct clntraw_private *clp = clntraw_private;
-	struct rpc_msg call_msg;
-	XDR *xdrs = &clp->xdr_stream;
-	CLIENT	*client = &clp->client_object;
-
-	mutex_lock(&clntraw_lock);
-	if (clp == NULL) {
-		clp = calloc((size_t)1, sizeof (*clp));
-		if (clp == NULL)
-			goto out;
-		if (__rpc_rawcombuf == NULL)
-			__rpc_rawcombuf =
-			    malloc(UDPMSGSIZE);
-		if (__rpc_rawcombuf == NULL)
-			goto out;
-		clp->_raw_buf = __rpc_rawcombuf;
-		clntraw_private = clp;
-	}
-	/*
-	 * pre-serialize the static part of the call msg and stash it away
-	 */
-	call_msg.rm_direction = CALL;
-	call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
-	/* XXX: prog and vers have been long historically :-( */
-	call_msg.rm_call.cb_prog = (u_int32_t)prog;
-	call_msg.rm_call.cb_vers = (u_int32_t)vers;
-	xdrmem_create(xdrs, clp->u.mashl_callmsg, MCALL_MSG_SIZE, XDR_ENCODE); 
-	if (! xdr_callhdr(xdrs, &call_msg))
-		warnx("%s: Fatal header serialization error", __func__);
-	clp->mcnt = XDR_GETPOS(xdrs);
-	XDR_DESTROY(xdrs);
-
-	/*
-	 * Set xdrmem for client/server shared buffer
-	 */
-	xdrmem_create(xdrs, clp->_raw_buf, UDPMSGSIZE, XDR_FREE);
-
-	/*
-	 * create client handle
-	 */
-	client->cl_ops = clnt_raw_ops();
-	client->cl_auth = authnone_create();
-	mutex_unlock(&clntraw_lock);
-	return (client);
-out:
-	if (clp)
-		free(clp);
-	mutex_unlock(&clntraw_lock);
-	return NULL;
-
-}
-
-/* ARGSUSED */
-static enum clnt_stat 
-clnt_raw_call(CLIENT *h, rpcproc_t proc, xdrproc_t xargs, const char *argsp,
-	xdrproc_t xresults, caddr_t resultsp, struct timeval timeout)
-{
-	struct clntraw_private *clp = clntraw_private;
-	XDR *xdrs = &clp->xdr_stream;
-	struct rpc_msg msg;
-	enum clnt_stat status;
-	struct rpc_err error;
-
-	_DIAGASSERT(h != NULL);
-
-	mutex_lock(&clntraw_lock);
-	if (clp == NULL) {
-		mutex_unlock(&clntraw_lock);
-		return (RPC_FAILED);
-	}
-	mutex_unlock(&clntraw_lock);
-
-call_again:
-	/*
-	 * send request
-	 */
-	xdrs->x_op = XDR_ENCODE;
-	XDR_SETPOS(xdrs, 0);
-	clp->u.mashl_rpcmsg.rm_xid ++ ;
-	if ((! XDR_PUTBYTES(xdrs, clp->u.mashl_callmsg, clp->mcnt)) ||
-	    (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
-	    (! AUTH_MARSHALL(h->cl_auth, xdrs)) ||
-	    (! (*xargs)(xdrs, __UNCONST(argsp)))) {
-		return (RPC_CANTENCODEARGS);
-	}
-	(void)XDR_GETPOS(xdrs);  /* called just to cause overhead */
-
-	/*
-	 * We have to call server input routine here because this is
-	 * all going on in one process. Yuk.
-	 */
-	svc_getreq_common(FD_SETSIZE);
-
-	/*
-	 * get results
-	 */
-	xdrs->x_op = XDR_DECODE;
-	XDR_SETPOS(xdrs, 0);
-	msg.acpted_rply.ar_verf = _null_auth;
-	msg.acpted_rply.ar_results.where = resultsp;
-	msg.acpted_rply.ar_results.proc = xresults;
-	if (! xdr_replymsg(xdrs, &msg)) {
-		/*
-		 * It's possible for xdr_replymsg() to fail partway
-		 * through its attempt to decode the result from the
-		 * server. If this happens, it will leave the reply
-		 * structure partially populated with dynamically
-		 * allocated memory. (This can happen if someone uses
-		 * clntudp_bufcreate() to create a CLIENT handle and
-		 * specifies a receive buffer size that is too small.)
-		 * This memory must be free()ed to avoid a leak.
-		 */
-		int op = xdrs->x_op;
-		xdrs->x_op = XDR_FREE;
-		xdr_replymsg(xdrs, &msg);
-		xdrs->x_op = op;
-		return (RPC_CANTDECODERES);
-	}
-	_seterr_reply(&msg, &error);
-	status = error.re_status;
-
-	if (status == RPC_SUCCESS) {
-		if (! AUTH_VALIDATE(h->cl_auth, &msg.acpted_rply.ar_verf)) {
-			status = RPC_AUTHERROR;
-		}
-	}  /* end successful completion */
-	else {
-		if (AUTH_REFRESH(h->cl_auth))
-			goto call_again;
-	}  /* end of unsuccessful completion */
-
-	if (status == RPC_SUCCESS) {
-		if (! AUTH_VALIDATE(h->cl_auth, &msg.acpted_rply.ar_verf)) {
-			status = RPC_AUTHERROR;
-		}
-		if (msg.acpted_rply.ar_verf.oa_base != NULL) {
-			xdrs->x_op = XDR_FREE;
-			(void)xdr_opaque_auth(xdrs, &(msg.acpted_rply.ar_verf));
-		}
-	}
-
-	return (status);
-}
-
-/*ARGSUSED*/
-static void
-clnt_raw_geterr(CLIENT *cl, struct rpc_err *error)
-{
-}
-
-
-/* ARGSUSED */
-static bool_t
-clnt_raw_freeres(CLIENT *cl, xdrproc_t xdr_res, caddr_t res_ptr)
-{
-	struct clntraw_private *clp = clntraw_private;
-	XDR *xdrs = &clp->xdr_stream;
-	bool_t rval;
-
-	mutex_lock(&clntraw_lock);
-	if (clp == NULL) {
-		rval = (bool_t) RPC_FAILED;
-		mutex_unlock(&clntraw_lock);
-		return (rval);
-	}
-	mutex_unlock(&clntraw_lock);
-	xdrs->x_op = XDR_FREE;
-	return ((*xdr_res)(xdrs, res_ptr));
-}
-
-/*ARGSUSED*/
-static void
-clnt_raw_abort(CLIENT *cl)
-{
-}
-
-/*ARGSUSED*/
-static bool_t
-clnt_raw_control(CLIENT *cl, u_int ui, char *str)
-{
-	return (FALSE);
-}
-
-/*ARGSUSED*/
-static void
-clnt_raw_destroy(CLIENT *cl)
-{
-}
-
-static struct clnt_ops *
-clnt_raw_ops(void)
-{
-	static struct clnt_ops ops;
-#ifdef _REENTRANT
-	extern mutex_t  ops_lock;
-#endif
-
-	/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	mutex_lock(&ops_lock);
-	if (ops.cl_call == NULL) {
-		ops.cl_call = clnt_raw_call;
-		ops.cl_abort = clnt_raw_abort;
-		ops.cl_geterr = clnt_raw_geterr;
-		ops.cl_freeres = clnt_raw_freeres;
-		ops.cl_destroy = clnt_raw_destroy;
-		ops.cl_control = clnt_raw_control;
-	}
-	mutex_unlock(&ops_lock);
-	return (&ops);
-}
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
deleted file mode 100644
index 3ac9fdbe3..000000000
--- a/lib/libc/rpc/clnt_simple.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*	$NetBSD: clnt_simple.c,v 1.33 2015/01/20 18:31:25 christos Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #ident	"@(#)clnt_simple.c	1.17	94/04/24 SMI" */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)clnt_simple.c 1.49 89/01/31 Copyr 1984 Sun Micro";
-#else
-__RCSID("$NetBSD: clnt_simple.c,v 1.33 2015/01/20 18:31:25 christos Exp $");
-#endif
-#endif
-
-/*
- * clnt_simple.c
- * Simplified front end to client rpc.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/param.h>
-#include <stdio.h>
-#include <assert.h>
-#include <errno.h>
-#include <rpc/rpc.h>
-#include <string.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(rpc_call,_rpc_call)
-#endif
-
-#ifndef MAXHOSTNAMELEN
-#define	MAXHOSTNAMELEN 64
-#endif
-
-#ifndef NETIDLEN
-#define	NETIDLEN 32
-#endif
-
-struct rpc_call_private {
-	int	valid;			/* Is this entry valid ? */
-	CLIENT	*client;		/* Client handle */
-	pid_t	pid;			/* process-id at moment of creation */
-	rpcprog_t prognum;		/* Program */
-	rpcvers_t versnum;		/* Version */
-	char	host[MAXHOSTNAMELEN];	/* Servers host */
-	char	nettype[NETIDLEN];	/* Network type */
-};
-static struct rpc_call_private *rpc_call_private_main;
-
-#ifdef _REENTRANT
-static void rpc_call_destroy(void *);
-
-static void
-rpc_call_destroy(void *vp)
-{
-	struct rpc_call_private *rcp = (struct rpc_call_private *)vp;
-
-	if (rcp) {
-		if (rcp->client)
-			CLNT_DESTROY(rcp->client);
-		free(rcp);
-	}
-}
-static thread_key_t rpc_call_key;
-static once_t rpc_call_once = ONCE_INITIALIZER;
-
-static void
-rpc_call_setup(void)
-{
-
-	thr_keycreate(&rpc_call_key, rpc_call_destroy);
-}
-#endif
-
-
-/*
- * This is the simplified interface to the client rpc layer.
- * The client handle is not destroyed here and is reused for
- * the future calls to same prog, vers, host and nettype combination.
- *
- * The total time available is 25 seconds.
- */
-enum clnt_stat
-rpc_call(
-	const char *	host,		/* host name */
-	rpcprog_t	prognum,	/* program number */
-	rpcvers_t	versnum,	/* version number */
-	rpcproc_t	procnum,	/* procedure number */
-	xdrproc_t	inproc,		/* in XDR procedures */
-	const char *	in,		/* recv data */
-	xdrproc_t	outproc,	/* out XDR procedures */
-	char *		out,		/* send data */
-	const char *	nettype)	/* nettype */
-{
-	struct rpc_call_private *rcp = (struct rpc_call_private *) 0;
-	enum clnt_stat clnt_stat;
-	struct timeval timeout, tottimeout;
-
-	_DIAGASSERT(host != NULL);
-	/* XXX: in may be NULL ??? */
-	/* XXX: out may be NULL ??? */
-	/* XXX: nettype may be NULL ??? */
-
-#ifdef _REENTRANT
-	if (__isthreaded) {
-		thr_once(&rpc_call_once, rpc_call_setup);
-		rcp = thr_getspecific(rpc_call_key);
-	} else
-#endif
-		rcp = rpc_call_private_main;
-	if (rcp == NULL) {
-		rcp = malloc(sizeof (*rcp));
-		if (rcp == NULL) {
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			rpc_createerr.cf_error.re_errno = errno;
-			return (rpc_createerr.cf_stat);
-		}
-#ifdef _REENTRANT
-		if (__isthreaded)
-			thr_setspecific(rpc_call_key, (void *) rcp);
-		else
-#endif
-			rpc_call_private_main = rcp;
-		rcp->valid = 0;
-		rcp->client = NULL;
-	}
-	if ((nettype == NULL) || (nettype[0] == 0))
-		nettype = "netpath";
-	if (!(rcp->valid && rcp->pid == getpid() &&
-		(rcp->prognum == prognum) &&
-		(rcp->versnum == versnum) &&
-		(!strcmp(rcp->host, host)) &&
-		(!strcmp(rcp->nettype, nettype)))) {
-		int fd;
-
-		rcp->valid = 0;
-		if (rcp->client)
-			CLNT_DESTROY(rcp->client);
-		/*
-		 * Using the first successful transport for that type
-		 */
-		rcp->client = clnt_create(host, prognum, versnum, nettype);
-		rcp->pid = getpid();
-		if (rcp->client == NULL) {
-			return (rpc_createerr.cf_stat);
-		}
-		/*
-		 * Set time outs for connectionless case.  Do it
-		 * unconditionally.  Faster than doing a t_getinfo()
-		 * and then doing the right thing.
-		 */
-		timeout.tv_usec = 0;
-		timeout.tv_sec = 5;
-		(void) CLNT_CONTROL(rcp->client,
-				CLSET_RETRY_TIMEOUT, (char *)(void *)&timeout);
-		if (CLNT_CONTROL(rcp->client, CLGET_FD, (char *)(void *)&fd))
-			(void)fcntl(fd, F_SETFD, FD_CLOEXEC);
-		rcp->prognum = prognum;
-		rcp->versnum = versnum;
-		if ((strlen(host) < (size_t)MAXHOSTNAMELEN) &&
-		    (strlen(nettype) < (size_t)NETIDLEN)) {
-			(void) strcpy(rcp->host, host);
-			(void) strcpy(rcp->nettype, nettype);
-			rcp->valid = 1;
-		} else {
-			rcp->valid = 0;
-		}
-	} /* else reuse old client */
-	tottimeout.tv_sec = 25;
-	tottimeout.tv_usec = 0;
-	clnt_stat = CLNT_CALL(rcp->client, procnum, inproc, in,
-	    outproc, out, tottimeout);
-	/*
-	 * if call failed, empty cache
-	 */
-	if (clnt_stat != RPC_SUCCESS)
-		rcp->valid = 0;
-	return (clnt_stat);
-}
diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c
deleted file mode 100644
index 155996887..000000000
--- a/lib/libc/rpc/clnt_vc.c
+++ /dev/null
@@ -1,796 +0,0 @@
-/*	$NetBSD: clnt_vc.c,v 1.26 2015/01/20 18:31:25 christos Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)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 sccsid[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
-#else
-__RCSID("$NetBSD: clnt_vc.c,v 1.26 2015/01/20 18:31:25 christos Exp $");
-#endif
-#endif
- 
-/*
- * 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.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/poll.h>
-#include <sys/socket.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <rpc/rpc.h>
-
-#include "svc_fdset.h"
-#include "rpc_internal.h"
-
-#ifdef __weak_alias
-__weak_alias(clnt_vc_create,_clnt_vc_create)
-#endif
-
-#define MCALL_MSG_SIZE 24
-
-static enum clnt_stat clnt_vc_call(CLIENT *, rpcproc_t, xdrproc_t,
-    const char *, xdrproc_t, caddr_t, struct timeval);
-static void clnt_vc_geterr(CLIENT *, struct rpc_err *);
-static bool_t clnt_vc_freeres(CLIENT *, xdrproc_t, caddr_t);
-static void clnt_vc_abort(CLIENT *);
-static bool_t clnt_vc_control(CLIENT *, u_int, char *);
-static void clnt_vc_destroy(CLIENT *);
-static struct clnt_ops *clnt_vc_ops(void);
-static bool_t time_not_ok(struct timeval *);
-static int read_vc(caddr_t, caddr_t, int);
-static int write_vc(caddr_t, caddr_t, int);
-
-struct ct_data {
-	int		ct_fd;
-	bool_t		ct_closeit;
-	struct timeval	ct_wait;
-	bool_t          ct_waitset;       /* wait set by clnt_control? */
-	struct netbuf	ct_addr; 
-	struct rpc_err	ct_error;
-	union {
-		char	ct_mcallc[MCALL_MSG_SIZE];	/* marshalled callmsg */
-		u_int32_t ct_mcalli;
-	} ct_u;
-	u_int		ct_mpos;			/* pos after marshal */
-	XDR		ct_xdrs;
-};
-
-/*
- *      This machinery implements per-fd locks for MT-safety.  It is not
- *      sufficient to do per-CLIENT handle locks for MT-safety because a
- *      user may create more than one CLIENT handle with the same fd behind
- *      it.  Therfore, we allocate an array of flags (vc_fd_locks), protected
- *      by the clnt_fd_lock mutex, and an array (vc_cv) of condition variables
- *      similarly protected.  Vc_fd_lock[fd] == 1 => a call is activte on some
- *      CLIENT handle created for that fd.
- *      The current implementation holds locks across the entire RPC and reply.
- *      Yes, this is silly, and as soon as this code is proven to work, this
- *      should be the first thing fixed.  One step at a time.
- */
-#ifdef _REENTRANT
-static int      *vc_fd_locks;
-#define __rpc_lock_value __isthreaded;
-extern mutex_t  clnt_fd_lock;
-static cond_t   *vc_cv;
-#define release_fd_lock(fd, mask) {             \
-	mutex_lock(&clnt_fd_lock);      \
-	vc_fd_locks[fd] = 0;            \
-	mutex_unlock(&clnt_fd_lock);    \
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);        \
-	cond_signal(&vc_cv[fd]);        \
-}
-#else
-#define release_fd_lock(fd,mask)
-#define __rpc_lock_value 0
-#endif
-
-static __inline void
-htonlp(void *dst, const void *src, uint32_t incr)
-{
-#if 0
-	uint32_t tmp;
-	memcpy(&tmp, src, sizeof(tmp));
-	tmp = htonl(tmp + incr);
-	memcpy(dst, &tmp, sizeof(tmp));
-#else
-	/* We are aligned, so we think */
-	*(uint32_t *)dst = htonl(*(const uint32_t *)src + incr);
-#endif
-}
-
-static __inline void
-ntohlp(void *dst, const void *src)
-{
-#if 0
-	uint32_t tmp;
-	memcpy(&tmp, src, sizeof(tmp));
-	tmp = ntohl(tmp);
-	memcpy(dst, &tmp, sizeof(tmp));
-#else
-	/* We are aligned, so we think */
-	*(uint32_t *)dst = htonl(*(const uint32_t *)src);
-#endif
-}
-
-/*
- * Create a client handle for a connection.
- * Default options are set, which the user can change using clnt_control()'s.
- * The rpc/vc package does buffering similar to stdio, so the client
- * must pick send and receive buffer sizes, 0 => use the default.
- * NB: fd is copied into a private area.
- * NB: The rpch->cl_auth is set null authentication. Caller may wish to
- * set this something more useful.
- *
- * fd should be an open socket
- */
-CLIENT *
-clnt_vc_create(
-	int fd,
-	const struct netbuf *raddr,
-	rpcprog_t prog,
-	rpcvers_t vers,
-	u_int sendsz,
-	u_int recvsz
-)
-{
-	CLIENT *h;
-	struct ct_data *ct = NULL;
-	struct rpc_msg call_msg;
-#ifdef _REENTRANT
-	sigset_t mask;
-#endif
-	sigset_t newmask;
-	struct sockaddr_storage ss;
-	socklen_t slen;
-	struct __rpc_sockinfo si;
-
-	_DIAGASSERT(raddr != NULL);
-
-	h  = mem_alloc(sizeof(*h));
-	if (h == NULL) {
-		warnx("clnt_vc_create: out of memory");
-		rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-		rpc_createerr.cf_error.re_errno = errno;
-		goto fooy;
-	}
-	ct = mem_alloc(sizeof(*ct));
-	if (ct == NULL) {
-		warnx("clnt_vc_create: out of memory");
-		rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-		rpc_createerr.cf_error.re_errno = errno;
-		goto fooy;
-	}
-
-	__clnt_sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-#ifdef _REENTRANT
-	mutex_lock(&clnt_fd_lock);
-	if (vc_fd_locks == NULL) {
-		size_t cv_allocsz, fd_allocsz;
-		int dtbsize = __rpc_dtbsize();
-
-		fd_allocsz = dtbsize * sizeof (int);
-		vc_fd_locks = mem_alloc(fd_allocsz);
-		if (vc_fd_locks == NULL) {
-			goto blooy;
-		} else
-			memset(vc_fd_locks, '\0', fd_allocsz);
-
-		_DIAGASSERT(vc_cv == NULL);
-		cv_allocsz = dtbsize * sizeof (cond_t);
-		vc_cv = mem_alloc(cv_allocsz);
-		if (vc_cv == NULL) {
-			mem_free(vc_fd_locks, fd_allocsz);
-			vc_fd_locks = NULL;
-			goto blooy;
-		} else {
-			int i;
-
-			for (i = 0; i < dtbsize; i++)
-				cond_init(&vc_cv[i], 0, (void *) 0);
-		}
-	} else
-		_DIAGASSERT(vc_cv != NULL);
-#endif
-
-	/*
-	 * XXX - fvdl connecting while holding a mutex?
-	 */
-	slen = sizeof ss;
-	if (getpeername(fd, (struct sockaddr *)(void *)&ss, &slen) < 0) {
-		if (errno != ENOTCONN) {
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			rpc_createerr.cf_error.re_errno = errno;
-			goto blooy;
-		}
-		if (connect(fd, (struct sockaddr *)raddr->buf, raddr->len) < 0){
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			rpc_createerr.cf_error.re_errno = errno;
-			goto blooy;
-		}
-	}
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-	if (!__rpc_fd2sockinfo(fd, &si))
-		goto fooy;
-
-	ct->ct_closeit = FALSE;
-
-	/*
-	 * Set up private data struct
-	 */
-	ct->ct_fd = fd;
-	ct->ct_wait.tv_usec = 0;
-	ct->ct_waitset = FALSE;
-	ct->ct_addr.buf = malloc((size_t)raddr->maxlen);
-	if (ct->ct_addr.buf == NULL)
-		goto fooy;
-	memcpy(ct->ct_addr.buf, raddr->buf, (size_t)raddr->len);
-	ct->ct_addr.len = raddr->len;
-	ct->ct_addr.maxlen = raddr->maxlen;
-
-	/*
-	 * Initialize call message
-	 */
-	call_msg.rm_xid = __RPC_GETXID();
-	call_msg.rm_direction = CALL;
-	call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
-	call_msg.rm_call.cb_prog = (u_int32_t)prog;
-	call_msg.rm_call.cb_vers = (u_int32_t)vers;
-
-	/*
-	 * pre-serialize the static part of the call msg and stash it away
-	 */
-	xdrmem_create(&(ct->ct_xdrs), ct->ct_u.ct_mcallc, MCALL_MSG_SIZE,
-	    XDR_ENCODE);
-	if (! xdr_callhdr(&(ct->ct_xdrs), &call_msg)) {
-		if (ct->ct_closeit) {
-			(void)close(fd);
-		}
-		goto fooy;
-	}
-	ct->ct_mpos = XDR_GETPOS(&(ct->ct_xdrs));
-	XDR_DESTROY(&(ct->ct_xdrs));
-
-	/*
-	 * Create a client handle which uses xdrrec for serialization
-	 * and authnone for authentication.
-	 */
-	h->cl_ops = clnt_vc_ops();
-	h->cl_private = ct;
-	h->cl_auth = authnone_create();
-	sendsz = __rpc_get_t_size(si.si_af, si.si_proto, (int)sendsz);
-	recvsz = __rpc_get_t_size(si.si_af, si.si_proto, (int)recvsz);
-	xdrrec_create(&(ct->ct_xdrs), sendsz, recvsz,
-	    h->cl_private, read_vc, write_vc);
-	return (h);
-
-blooy:
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-fooy:
-	/*
-	 * Something goofed, free stuff and barf
-	 */
-	if (ct)
-		mem_free(ct, sizeof(struct ct_data));
-	if (h)
-		mem_free(h, sizeof(CLIENT));
-	return (NULL);
-}
-
-static enum clnt_stat
-clnt_vc_call(
-	CLIENT *h,
-	rpcproc_t proc,
-	xdrproc_t xdr_args,
-	const char *args_ptr,
-	xdrproc_t xdr_results,
-	caddr_t results_ptr,
-	struct timeval timeout
-)
-{
-	struct ct_data *ct;
-	XDR *xdrs;
-	struct rpc_msg reply_msg;
-	u_int32_t x_id;
-	u_int32_t *msg_x_id;
-	bool_t shipnow;
-	int refreshes = 2;
-#ifdef _REENTRANT
-	sigset_t mask, newmask;
-#endif
-
-	_DIAGASSERT(h != NULL);
-
-	ct = (struct ct_data *) h->cl_private;
-
-#ifdef _REENTRANT
-	__clnt_sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (vc_fd_locks[ct->ct_fd])
-		cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock);
-	vc_fd_locks[ct->ct_fd] = __rpc_lock_value;
-	mutex_unlock(&clnt_fd_lock);
-#endif
-
-	xdrs = &(ct->ct_xdrs);
-	msg_x_id = &ct->ct_u.ct_mcalli;
-
-	if (!ct->ct_waitset) {
-		if (time_not_ok(&timeout) == FALSE)
-		ct->ct_wait = timeout;
-	}
-
-	shipnow =
-	    (xdr_results == NULL && timeout.tv_sec == 0
-	    && timeout.tv_usec == 0) ? FALSE : TRUE;
-
-call_again:
-	xdrs->x_op = XDR_ENCODE;
-	ct->ct_error.re_status = RPC_SUCCESS;
-	x_id = ntohl(--(*msg_x_id));
-	if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) ||
-	    (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
-	    (! AUTH_MARSHALL(h->cl_auth, xdrs)) ||
-	    (! (*xdr_args)(xdrs, __UNCONST(args_ptr)))) {
-		if (ct->ct_error.re_status == RPC_SUCCESS)
-			ct->ct_error.re_status = RPC_CANTENCODEARGS;
-		(void)xdrrec_endofrecord(xdrs, TRUE);
-		release_fd_lock(ct->ct_fd, mask);
-		return (ct->ct_error.re_status);
-	}
-	if (! xdrrec_endofrecord(xdrs, shipnow)) {
-		release_fd_lock(ct->ct_fd, mask);
-		return (ct->ct_error.re_status = RPC_CANTSEND);
-	}
-	if (! shipnow) {
-		release_fd_lock(ct->ct_fd, mask);
-		return (RPC_SUCCESS);
-	}
-	/*
-	 * Hack to provide rpc-based message passing
-	 */
-	if (timeout.tv_sec == 0 && timeout.tv_usec == 0) {
-		release_fd_lock(ct->ct_fd, mask);
-		return(ct->ct_error.re_status = RPC_TIMEDOUT);
-	}
-
-
-	/*
-	 * Keep receiving until we get a valid transaction id
-	 */
-	xdrs->x_op = XDR_DECODE;
-	for (;;) {
-		reply_msg.acpted_rply.ar_verf = _null_auth;
-		reply_msg.acpted_rply.ar_results.where = NULL;
-		reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
-		if (! xdrrec_skiprecord(xdrs)) {
-			release_fd_lock(ct->ct_fd, mask);
-			return (ct->ct_error.re_status);
-		}
-		/* now decode and validate the response header */
-		if (! xdr_replymsg(xdrs, &reply_msg)) {
-			if (ct->ct_error.re_status == RPC_SUCCESS)
-				continue;
-			release_fd_lock(ct->ct_fd, mask);
-			return (ct->ct_error.re_status);
-		}
-		if (reply_msg.rm_xid == x_id)
-			break;
-	}
-
-	/*
-	 * process header
-	 */
-	_seterr_reply(&reply_msg, &(ct->ct_error));
-	if (ct->ct_error.re_status == RPC_SUCCESS) {
-		if (! AUTH_VALIDATE(h->cl_auth,
-		    &reply_msg.acpted_rply.ar_verf)) {
-			ct->ct_error.re_status = RPC_AUTHERROR;
-			ct->ct_error.re_why = AUTH_INVALIDRESP;
-		} else if (! (*xdr_results)(xdrs, results_ptr)) {
-			if (ct->ct_error.re_status == RPC_SUCCESS)
-				ct->ct_error.re_status = RPC_CANTDECODERES;
-		}
-		/* free verifier ... */
-		if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) {
-			xdrs->x_op = XDR_FREE;
-			(void)xdr_opaque_auth(xdrs,
-			    &(reply_msg.acpted_rply.ar_verf));
-		}
-	}  /* end successful completion */
-	else {
-		/* maybe our credentials need to be refreshed ... */
-		if (refreshes-- && AUTH_REFRESH(h->cl_auth))
-			goto call_again;
-	}  /* end of unsuccessful completion */
-	release_fd_lock(ct->ct_fd, mask);
-	return (ct->ct_error.re_status);
-}
-
-static void
-clnt_vc_geterr(
-	CLIENT *h,
-	struct rpc_err *errp
-)
-{
-	struct ct_data *ct;
-
-	_DIAGASSERT(h != NULL);
-	_DIAGASSERT(errp != NULL);
-
-	ct = (struct ct_data *) h->cl_private;
-	*errp = ct->ct_error;
-}
-
-static bool_t
-clnt_vc_freeres(
-	CLIENT *cl,
-	xdrproc_t xdr_res,
-	caddr_t res_ptr
-)
-{
-	struct ct_data *ct;
-	XDR *xdrs;
-	bool_t dummy;
-#ifdef _REENTRANT
-	sigset_t mask;
-#endif
-	sigset_t newmask;
-
-	_DIAGASSERT(cl != NULL);
-
-	ct = (struct ct_data *)cl->cl_private;
-	xdrs = &(ct->ct_xdrs);
-
-	__clnt_sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-#ifdef _REENTRANT
-	while (vc_fd_locks[ct->ct_fd])
-		cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock);
-#endif
-
-	xdrs->x_op = XDR_FREE;
-	dummy = (*xdr_res)(xdrs, res_ptr);
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-	cond_signal(&vc_cv[ct->ct_fd]);
-
-	return dummy;
-}
-
-/*ARGSUSED*/
-static void
-clnt_vc_abort(CLIENT *cl)
-{
-}
-
-static bool_t
-clnt_vc_control(
-	CLIENT *cl,
-	u_int request,
-	char *info
-)
-{
-	struct ct_data *ct;
-	void *infop = info;
-#ifdef _REENTRANT
-	sigset_t mask;
-#endif
-	sigset_t newmask;
-
-	_DIAGASSERT(cl != NULL);
-
-	ct = (struct ct_data *)cl->cl_private;
-
-	__clnt_sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-#ifdef _REENTRANT
-	while (vc_fd_locks[ct->ct_fd])
-		cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock);
-	vc_fd_locks[ct->ct_fd] = __rpc_lock_value;
-#endif
-	mutex_unlock(&clnt_fd_lock);
-
-	switch (request) {
-	case CLSET_FD_CLOSE:
-		ct->ct_closeit = TRUE;
-		release_fd_lock(ct->ct_fd, mask);
-		return (TRUE);
-	case CLSET_FD_NCLOSE:
-		ct->ct_closeit = FALSE;
-		release_fd_lock(ct->ct_fd, mask);
-		return (TRUE);
-	default:
-		break;
-	}
-
-	/* for other requests which use info */
-	if (info == NULL) {
-		release_fd_lock(ct->ct_fd, mask);
-		return (FALSE);
-	}
-	switch (request) {
-	case CLSET_TIMEOUT:
-		if (time_not_ok((struct timeval *)(void *)info)) {
-			release_fd_lock(ct->ct_fd, mask);
-			return (FALSE);
-		}
-		ct->ct_wait = *(struct timeval *)infop;
-		ct->ct_waitset = TRUE;
-		break;
-	case CLGET_TIMEOUT:
-		*(struct timeval *)infop = ct->ct_wait;
-		break;
-	case CLGET_SERVER_ADDR:
-		(void) memcpy(info, ct->ct_addr.buf, (size_t)ct->ct_addr.len);
-		break;
-	case CLGET_FD:
-		*(int *)(void *)info = ct->ct_fd;
-		break;
-	case CLGET_SVC_ADDR:
-		/* The caller should not free this memory area */
-		*(struct netbuf *)(void *)info = ct->ct_addr;
-		break;
-	case CLSET_SVC_ADDR:		/* set to new address */
-		release_fd_lock(ct->ct_fd, mask);
-		return (FALSE);
-	case CLGET_XID:
-		/*
-		 * use the knowledge that xid is the
-		 * first element in the call structure
-		 * This will get the xid of the PREVIOUS call
-		 */
-		ntohlp(info, &ct->ct_u.ct_mcalli);
-		break;
-	case CLSET_XID:
-		/* This will set the xid of the NEXT call */
-		/* increment by 1 as clnt_vc_call() decrements once */
-		htonlp(&ct->ct_u.ct_mcalli, info, 1);
-		break;
-	case CLGET_VERS:
-		/*
-		 * This RELIES on the information that, in the call body,
-		 * the version number field is the fifth field from the
-		 * begining of the RPC header. MUST be changed if the
-		 * call_struct is changed
-		 */
-		ntohlp(info, ct->ct_u.ct_mcallc + 4 * BYTES_PER_XDR_UNIT);
-		break;
-
-	case CLSET_VERS:
-		htonlp(ct->ct_u.ct_mcallc + 4 * BYTES_PER_XDR_UNIT, info, 0);
-		break;
-
-	case CLGET_PROG:
-		/*
-		 * This RELIES on the information that, in the call body,
-		 * the program number field is the fourth field from the
-		 * begining of the RPC header. MUST be changed if the
-		 * call_struct is changed
-		 */
-		ntohlp(info, ct->ct_u.ct_mcallc + 3 * BYTES_PER_XDR_UNIT);
-		break;
-
-	case CLSET_PROG:
-		htonlp(ct->ct_u.ct_mcallc + 3 * BYTES_PER_XDR_UNIT, info, 0);
-		break;
-
-	default:
-		release_fd_lock(ct->ct_fd, mask);
-		return (FALSE);
-	}
-	release_fd_lock(ct->ct_fd, mask);
-	return (TRUE);
-}
-
-
-static void
-clnt_vc_destroy(CLIENT *cl)
-{
-	struct ct_data *ct;
-#ifdef _REENTRANT
-	int ct_fd;
-	sigset_t mask;
-#endif
-	sigset_t newmask;
-
-	_DIAGASSERT(cl != NULL);
-
-	ct = (struct ct_data *) cl->cl_private;
-
-	__clnt_sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-#ifdef _REENTRANT
-	ct_fd = ct->ct_fd;
-	while (vc_fd_locks[ct_fd])
-		cond_wait(&vc_cv[ct_fd], &clnt_fd_lock);
-#endif
-	if (ct->ct_closeit && ct->ct_fd != -1) {
-		(void)close(ct->ct_fd);
-	}
-	XDR_DESTROY(&(ct->ct_xdrs));
-	if (ct->ct_addr.buf)
-		free(ct->ct_addr.buf);
-	mem_free(ct, sizeof(struct ct_data));
-	mem_free(cl, sizeof(CLIENT));
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-
-	cond_signal(&vc_cv[ct_fd]);
-}
-
-/*
- * Interface between xdr serializer and tcp connection.
- * Behaves like the system calls, read & write, but keeps some error state
- * around for the rpc level.
- */
-static int
-read_vc(char *ctp, char *buf, int len)
-{
-	struct ct_data *ct = (struct ct_data *)(void *)ctp;
-	struct pollfd fd;
-	struct timespec ts;
-	ssize_t nread;
-
-	if (len == 0)
-		return (0);
-
-	TIMEVAL_TO_TIMESPEC(&ct->ct_wait, &ts);
-	fd.fd = ct->ct_fd;
-	fd.events = POLLIN;
-	for (;;) {
-		switch (pollts(&fd, 1, &ts, NULL)) {
-		case 0:
-			ct->ct_error.re_status = RPC_TIMEDOUT;
-			return (-1);
-
-		case -1:
-			if (errno == EINTR)
-				continue;
-			ct->ct_error.re_status = RPC_CANTRECV;
-			ct->ct_error.re_errno = errno;
-			return (-1);
-		}
-		break;
-	}
-	switch (nread = read(ct->ct_fd, buf, (size_t)len)) {
-
-	case 0:
-		/* premature eof */
-		ct->ct_error.re_errno = ECONNRESET;
-		ct->ct_error.re_status = RPC_CANTRECV;
-		nread = -1;  /* it's really an error */
-		break;
-
-	case -1:
-		ct->ct_error.re_errno = errno;
-		ct->ct_error.re_status = RPC_CANTRECV;
-		break;
-	}
-	return (int)nread;
-}
-
-static int
-write_vc(char *ctp, char *buf, int len)
-{
-	struct ct_data *ct = (struct ct_data *)(void *)ctp;
-	ssize_t i;
-	size_t cnt;
-
-	for (cnt = len; cnt > 0; cnt -= i, buf += i) {
-		if ((i = write(ct->ct_fd, buf, cnt)) == -1) {
-			ct->ct_error.re_errno = errno;
-			ct->ct_error.re_status = RPC_CANTSEND;
-			return (-1);
-		}
-	}
-	return len;
-}
-
-static struct clnt_ops *
-clnt_vc_ops(void)
-{
-	static struct clnt_ops ops;
-#ifdef _REENTRANT
-	extern mutex_t  ops_lock;
-	sigset_t mask;
-#endif
-	sigset_t newmask;
-
-	/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	__clnt_sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&ops_lock);
-	if (ops.cl_call == NULL) {
-		ops.cl_call = clnt_vc_call;
-		ops.cl_abort = clnt_vc_abort;
-		ops.cl_geterr = clnt_vc_geterr;
-		ops.cl_freeres = clnt_vc_freeres;
-		ops.cl_destroy = clnt_vc_destroy;
-		ops.cl_control = clnt_vc_control;
-	}
-	mutex_unlock(&ops_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-	return (&ops);
-}
-
-/*
- * Make sure that the time is not garbage.   -1 value is disallowed.
- * Note this is different from time_not_ok in clnt_dg.c
- */
-static bool_t
-time_not_ok(struct timeval *t)
-{
-
-	_DIAGASSERT(t != NULL);
-
-	return (t->tv_sec <= -1 || t->tv_sec > 100000000 ||
-		t->tv_usec <= -1 || t->tv_usec > 1000000);
-}
diff --git a/lib/libc/rpc/getnetconfig.3 b/lib/libc/rpc/getnetconfig.3
deleted file mode 100644
index cd3c30e4e..000000000
--- a/lib/libc/rpc/getnetconfig.3
+++ /dev/null
@@ -1,183 +0,0 @@
-.\" 	@(#)getnetconfig.3n 1.28 93/06/02 SMI; from SVr4
-.\"	$NetBSD: getnetconfig.3,v 1.7 2003/04/16 13:34:43 wiz Exp $
-.\" Copyright 1989 AT&T
-.Dd April 22, 2000
-.Dt GETNETCONFIG 3
-.Os
-.Sh NAME
-.Nm getnetconfig ,
-.Nm setnetconfig ,
-.Nm endnetconfig ,
-.Nm getnetconfigent ,
-.Nm freenetconfigent ,
-.Nm nc_perror ,
-.Nm nc_sperror
-.Nd get network configuration database entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netconfig.h
-.Ft struct netconfig *
-.Fn getnetconfig "void *handlep"
-.Ft void *
-.Fn setnetconfig "void"
-.Ft int
-.Fn endnetconfig "void *handlep"
-.Ft struct netconfig *
-.Fn getnetconfigent "const char *netid"
-.Ft void
-.Fn freenetconfigent "struct netconfig *netconfigp"
-.Ft void
-.Fn nc_perror "const char *msg"
-.Ft char *
-.Fn nc_sperror "void"
-.Sh DESCRIPTION
-The library routines described on this page
-provide the application access to
-the system network configuration database,
-.Pa /etc/netconfig .
-.Bd -literal
-struct netconfig {
-        char *nc_netid;              /* Network ID */
-        unsigned long nc_semantics;  /* Semantics */
-        unsigned long nc_flag;       /* Flags */
-        char *nc_protofmly;          /* Protocol family */
-        char *nc_proto;              /* Protocol name */
-        char *nc_device;             /* Network device pathname */
-        unsigned long nc_nlookups;   /* Number of directory lookup libs */
-        char **nc_lookups;           /* Names of the libraries */
-};
-.Ed
-.Pp
-.Fn getnetconfig
-returns a pointer to the
-current entry in the
-.Pa netconfig
-database, formatted as a struct netconfig.
-Successive calls will return successive netconfig
-entries in the netconfig database.
-.Fn getnetconfig
-can be used to search the entire netconfig
-file.
-.Fn getnetconfig
-returns
-.Dv NULL
-at the end of the file.
-.Fa handlep
-is the handle obtained through
-.Fn setnetconfig .
-.Pp
-A call to
-.Fn setnetconfig
-has the effect of ``binding'' to or
-``rewinding'' the netconfig database.
-.Fn setnetconfig
-must be called before the first call to
-.Fn getnetconfig
-and may be called at any other time.
-.Fn setnetconfig
-need not be called before a call to
-.Fn getnetconfigent .
-.Fn setnetconfig
-returns a unique handle to be used by
-.Fn getnetconfig .
-.Pp
-.Fn endnetconfig
-should be called when processing is complete to release resources for reuse.
-.Fa handlep
-is the handle obtained through
-.Fn setnetconfig .
-Programmers should be aware, however, that the last call to
-.Fn endnetconfig
-frees all memory allocated by
-.Fn getnetconfig
-for the
-struct netconfig data structure.
-.Fn endnetconfig
-may not be called before
-.Fn setnetconfig .
-.Pp
-.Fn getnetconfigent
-returns a pointer
-to the netconfig structure corresponding
-to
-.Fa netid .
-It returns
-.Dv NULL
-if
-.Fa netid
-is invalid
-(that is, does not name an entry in the netconfig database).
-.Pp
-.Fn freenetconfigent
-frees the netconfig structure pointed to by
-.Fa netconfigp
-(previously returned by
-.Fn getnetconfigent ) .
-.Pp
-.Fn nc_perror
-prints a message to the standard error indicating why any of the
-above routines failed.
-The message is prepended with the string
-.Fa msg
-and a colon.
-A newline character is appended at the end of the message.
-.Pp
-.Fn nc_sperror
-is similar to
-.Fn nc_perror
-but instead of sending the message
-to the standard error, will return a pointer to a string that
-contains the error message.
-.Pp
-.Fn nc_perror
-and
-.Fn nc_sperror
-can also be used with the
-.Va NETPATH
-access routines defined in
-.Xr getnetpath 3 .
-.Sh RETURN VALUES
-.Fn setnetconfig
-returns a unique handle to be used by
-.Fn getnetconfig .
-In the case of an error,
-.Fn setnetconfig
-returns NULL and
-.Fn nc_perror
-or
-.Fn nc_sperror
-can be used to print the reason for failure.
-.Pp
-.Fn getnetconfig
-returns a pointer to the current entry in the netconfig
-database, formatted as a struct netconfig.
-.Fn getnetconfig
-returns NULL
-at the end of the file, or upon failure.
-.Pp
-.Fn endnetconfig
-returns 0 on success and -1 on failure
-(for example, if
-.Fn setnetconfig
-was not called previously).
-.Pp
-On success,
-.Fn getnetconfigent
-returns a pointer to the
-.Li struct netconfig
-structure corresponding to
-.Ar netid ;
-otherwise it returns
-.Dv NULL .
-.Pp
-.Fn nc_sperror
-returns a pointer to a buffer which contains the error message string.
-This buffer is overwritten on each call.
-In multithreaded applications, this buffer is
-implemented as thread-specific data.
-.Sh FILES
-.Pa /etc/netconfig
-.Sh SEE ALSO
-.Xr getnetpath 3 ,
-.Xr netconfig 5
diff --git a/lib/libc/rpc/getnetconfig.c b/lib/libc/rpc/getnetconfig.c
deleted file mode 100644
index c45692b00..000000000
--- a/lib/libc/rpc/getnetconfig.c
+++ /dev/null
@@ -1,690 +0,0 @@
-/*	$NetBSD: getnetconfig.c,v 1.22 2014/09/18 13:58:20 christos Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static        char sccsid[] = "@(#)getnetconfig.c	1.12 91/12/19 SMI";
-#else
-__RCSID("$NetBSD: getnetconfig.c,v 1.22 2014/09/18 13:58:20 christos Exp $");
-#endif
-#endif
-
-/*
- * Copyright (c) 1989 by Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <stdio.h>
-#include <assert.h>
-#include <errno.h>
-#include <netconfig.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <rpc/rpc.h>
-#include "rpc_internal.h"
-
-#ifdef __weak_alias
-__weak_alias(getnetconfig,_getnetconfig)
-__weak_alias(setnetconfig,_setnetconfig)
-__weak_alias(endnetconfig,_endnetconfig)
-__weak_alias(getnetconfigent,_getnetconfigent)
-__weak_alias(freenetconfigent,_freenetconfigent)
-__weak_alias(nc_perror,_nc_perror)
-__weak_alias(nc_sperror,_nc_sperror)
-#endif
-
-/*
- * The five library routines in this file provide application access to the
- * system network configuration database, /etc/netconfig.  In addition to the
- * netconfig database and the routines for accessing it, the environment
- * variable NETPATH and its corresponding routines in getnetpath.c may also be
- * used to specify the network transport to be used.
- */
-
-
-/*
- * netconfig errors
- */
-
-#define NC_NONETCONFIG	ENOENT
-#define NC_NOMEM	ENOMEM
-#define NC_NOTINIT	EINVAL	    /* setnetconfig was not called first */
-#define NC_BADFILE	EBADF	    /* format for netconfig file is bad */
-
-/*
- * semantics as strings (should be in netconfig.h)
- */
-#define NC_TPI_CLTS_S	    "tpi_clts"
-#define	NC_TPI_COTS_S	    "tpi_cots"
-#define	NC_TPI_COTS_ORD_S   "tpi_cots_ord"
-#define	NC_TPI_RAW_S        "tpi_raw"
-
-/*
- * flags as characters (also should be in netconfig.h)
- */
-#define	NC_NOFLAG_C	'-'
-#define	NC_VISIBLE_C	'v'
-#define	NC_BROADCAST_C	'b'
-
-/*
- * Character used to indicate there is no name-to-address lookup library
- */
-#define NC_NOLOOKUP	"-"
-
-static const char * const _nc_errors[] = {
-	"Netconfig database not found",
-	"Not enough memory",
-	"Not initialized",
-	"Netconfig database has invalid format"
-};
-
-struct netconfig_info {
-	int		eof;	/* all entries has been read */
-	int		ref;	/* # of times setnetconfig() has been called */
-	struct netconfig_list	*head;	/* head of the list */
-	struct netconfig_list	*tail;	/* last of the list */
-};
-
-struct netconfig_list {
-	char			*linep;	/* hold line read from netconfig */
-	struct netconfig	*ncp;
-	struct netconfig_list	*next;
-};
-
-struct netconfig_vars {
-	    int   valid;	/* token that indicates valid netconfig_vars */
-	    int   flag;		/* first time flag */
-	    struct netconfig_list *nc_configs;
-	   			 /* pointer to the current netconfig entry */
-};
-
-#define NC_VALID	0xfeed
-#define NC_STORAGE	0xf00d
-#define NC_INVALID	0
-
-
-static int *__nc_error(void);
-static int parse_ncp(char *, struct netconfig *);
-static struct netconfig *dup_ncp(struct netconfig *);
-
-
-static FILE *nc_file;		/* for netconfig db */
-static struct netconfig_info	ni = { 0, 0, NULL, NULL};
-
-#define MAXNETCONFIGLINE    1000
-
-#ifdef _REENTRANT
-static thread_key_t nc_key;
-static once_t nc_once = ONCE_INITIALIZER;
-
-static void 
-__nc_error_setup(void)
-{
-	thr_keycreate(&nc_key, free);
-}
-#endif
-
-static int *
-__nc_error(void)
-{
-#ifdef _REENTRANT
-	int *nc_addr = NULL;
-#endif
-	static int nc_error = 0;
-
-#ifdef _REENTRANT
-	if (__isthreaded == 0)
-		return &nc_error;
-	thr_once(&nc_once, __nc_error_setup);
-	nc_addr = thr_getspecific(nc_key) ;
-	if (nc_addr == NULL) {
-		nc_addr = malloc(sizeof (int));
-		if (nc_addr == NULL)
-			return &nc_error;
-		if (thr_setspecific(nc_key, (void *) nc_addr) != 0) {
-			if (nc_addr)
-				free(nc_addr);
-			return &nc_error;
-		}
-		*nc_addr = 0;
-	}
-	return nc_addr;
-#else
-	return &nc_error;
-#endif
-}
-
-#define nc_error        (*(__nc_error()))
-/*
- * A call to setnetconfig() establishes a /etc/netconfig "session".  A session
- * "handle" is returned on a successful call.  At the start of a session (after
- * a call to setnetconfig()) searches through the /etc/netconfig database will
- * proceed from the start of the file.  The session handle must be passed to
- * getnetconfig() to parse the file.  Each call to getnetconfig() using the
- * current handle will process one subsequent entry in /etc/netconfig.
- * setnetconfig() must be called before the first call to getnetconfig().
- * (Handles are used to allow for nested calls to setnetpath()).
- *
- * A new session is established with each call to setnetconfig(), with a new
- * handle being returned on each call.  Previously established sessions remain
- * active until endnetconfig() is called with that session's handle as an
- * argument.
- *
- * setnetconfig() need *not* be called before a call to getnetconfigent().
- * setnetconfig() returns a NULL pointer on failure (for example, if
- * the netconfig database is not present).
- */
-void *
-setnetconfig(void)
-{
-	struct netconfig_vars *nc_vars;
-
-	if ((nc_vars = malloc(sizeof(*nc_vars))) == NULL) {
-		return(NULL);
-	}
-
-	/*
-	 * For multiple calls, i.e. nc_file is not NULL, we just return the
-	 * handle without reopening the netconfig db.
-	 */
-	ni.ref++;
-	if ((nc_file != NULL) || (nc_file = fopen(NETCONFIG, "re")) != NULL) {
-		nc_vars->valid = NC_VALID;
-		nc_vars->flag = 0;
-		nc_vars->nc_configs = ni.head;
-		return ((void *)nc_vars);
-	}
-	ni.ref--;
-	nc_error = NC_NONETCONFIG;
-	free(nc_vars);
-	return (NULL);
-}
-
-
-/*
- * When first called, getnetconfig() returns a pointer to the first entry in
- * the netconfig database, formatted as a struct netconfig.  On each subsequent
- * call, getnetconfig() returns a pointer to the next entry in the database.
- * getnetconfig() can thus be used to search the entire netconfig file.
- * getnetconfig() returns NULL at end of file.
- */
-
-struct netconfig *
-getnetconfig(void *handlep)
-{
-	struct netconfig_vars *ncp = (struct netconfig_vars *)handlep;
-	char *stringp;		/* tmp string pointer */
-	struct netconfig_list	*list;
-	struct netconfig *np;
-
-	/*
-	 * Verify that handle is valid
-	 */
-	if (ncp == NULL || nc_file == NULL) {
-		nc_error = NC_NOTINIT;
-		return (NULL);
-	}
-
-	switch (ncp->valid) {
-	case NC_VALID:
-		/*
-		 * If entry has already been read into the list,
-		 * we return the entry in the linked list.
-		 * If this is the first time call, check if there are any
-		 * entries in linked list.  If no entries, we need to read the
-		 * netconfig db.
-		 * If we have been here and the next entry is there, we just
-		 * return it.
-		 */
-		if (ncp->flag == 0) {	/* first time */
-			ncp->flag = 1;
-			ncp->nc_configs = ni.head;
-			if (ncp->nc_configs != NULL) /* entry already exist */
-				return(ncp->nc_configs->ncp);
-		}
-		else if (ncp->nc_configs != NULL &&
-		    ncp->nc_configs->next != NULL) {
-			ncp->nc_configs = ncp->nc_configs->next;
-			return(ncp->nc_configs->ncp);
-		}
-
-		/*
-		 * If we cannot find the entry in the list and is end of file,
-		 * we give up.
-		 */
-		if (ni.eof == 1)
-			return(NULL);
-		break;
-	default:
-		nc_error = NC_NOTINIT;
-		return (NULL);
-	}
-
-	stringp = malloc(MAXNETCONFIGLINE);
-	if (stringp == NULL)
-		return (NULL);
-
-#ifdef MEM_CHK
-	if (malloc_verify() == 0) {
-		fprintf(stderr, "memory heap corrupted in getnetconfig\n");
-		exit(1);
-	}
-#endif
-
-	/*
-	 * Read a line from netconfig file.
-	 */
-	do {
-		if (fgets(stringp, MAXNETCONFIGLINE, nc_file) == NULL) {
-			free(stringp);
-			ni.eof = 1;
-			return (NULL);
-		}
-	} while (*stringp == '#');
-
-	list = malloc(sizeof(*list));
-	if (list == NULL) {
-		free(stringp);
-		return(NULL);
-	}
-	np = malloc(sizeof(*np));
-	if (np == NULL) {
-		free(stringp);
-		free(list);
-		return(NULL);
-	}
-	list->ncp = np;
-	list->next = NULL;
-	list->ncp->nc_lookups = NULL;
-	list->linep = stringp;
-	if (parse_ncp(stringp, list->ncp) == -1) {
-		free(stringp);
-		free(np);
-		free(list);
-		return (NULL);
-	} else {
-		/*
-		 * If this is the first entry that's been read, it is the
-		 * head of the list.  If not, put the entry at the end of
-		 * the list.  Reposition the current pointer of the handle to
-		 * the last entry in the list.
-		 */
-		if (ni.head == NULL)		/* first entry */
-			ni.head = ni.tail = list;
-		else {
-			ni.tail->next = list;
-			ni.tail = ni.tail->next;
-		}
-		ncp->nc_configs = ni.tail;
-		return(ni.tail->ncp);
-	}
-}
-
-/*
- * endnetconfig() may be called to "unbind" or "close" the netconfig database
- * when processing is complete, releasing resources for reuse.  endnetconfig()
- * may not be called before setnetconfig().  endnetconfig() returns 0 on
- * success and -1 on failure (for example, if setnetconfig() was not called
- * previously).
- */
-int
-endnetconfig(void *handlep)
-{
-	struct netconfig_vars *nc_handlep = (struct netconfig_vars *)handlep;
-
-	struct netconfig_list *q, *p;
-
-	/*
-	 * Verify that handle is valid
-	 */
-	if (nc_handlep == NULL || (nc_handlep->valid != NC_VALID &&
-	    nc_handlep->valid != NC_STORAGE)) {
-		nc_error = NC_NOTINIT;
-		return (-1);
-	}
-
-	/*
-	 * Return 0 if anyone still needs it.
-	 */
-	nc_handlep->valid = NC_INVALID;
-	nc_handlep->flag = 0;
-	nc_handlep->nc_configs = NULL;
-	if (--ni.ref > 0) {
-		free(nc_handlep);
-		return(0);
-	}
-
-	/*
-	 * Noone needs these entries anymore, then frees them.
-	 * Make sure all info in netconfig_info structure has been
-	 * reinitialized.
-	 */
-	q = p = ni.head;
-	ni.eof = ni.ref = 0;
-	ni.head = NULL;
-	ni.tail = NULL;
-	while (q) {
-		p = q->next;
-		if (q->ncp->nc_lookups != NULL) free(q->ncp->nc_lookups);
-		free(q->ncp);
-		free(q->linep);
-		free(q);
-		q = p;
-	}
-	free(nc_handlep);
-
-	fclose(nc_file);
-	nc_file = NULL;
-	return (0);
-}
-
-/*
- * getnetconfigent(netid) returns a pointer to the struct netconfig structure
- * corresponding to netid.  It returns NULL if netid is invalid (that is, does
- * not name an entry in the netconfig database).  It returns NULL and sets
- * errno in case of failure (for example, if the netconfig database cannot be
- * opened).
- */
-
-struct netconfig *
-getnetconfigent(const char *netid)
-{
-	FILE *file;			/* NETCONFIG db's file pointer */
-	char *linep;			/* holds current netconfig line */
-	char *stringp;			/* temporary string pointer */
-	struct netconfig *ncp = NULL;   /* returned value */
-	struct netconfig_list *list;	/* pointer to cache list */
-
-	if (netid == NULL || strlen(netid) == 0)
-		return (NULL);
-
-	/*
-	 * Look up table if the entries have already been read and parsed in
-	 * getnetconfig(), then copy this entry into a buffer and return it.
-	 * If we cannot find the entry in the current list and there are more
-	 * entries in the netconfig db that has not been read, we then read the
-	 * db and try find the match netid.
-	 * If all the netconfig db has been read and placed into the list and
-	 * there is no match for the netid, return NULL.
-	 */
-	if (ni.head != NULL) {
-		for (list = ni.head; list; list = list->next) {
-			if (strcmp(list->ncp->nc_netid, netid) == 0)
-			    return(dup_ncp(list->ncp));
-		}
-		if (ni.eof == 1)	/* that's all the entries */
-			return(NULL);
-	}
-
-	if ((file = fopen(NETCONFIG, "re")) == NULL)
-	    return (NULL);
-
-	if ((linep = malloc(MAXNETCONFIGLINE)) == NULL) {
-		fclose(file);
-		return (NULL);
-	}
-	do {
-		ptrdiff_t len;
-		char *tmpp;	/* tmp string pointer */
-
-		do {
-			if ((stringp = fgets(linep, MAXNETCONFIGLINE, file))
-			    == NULL)
-				break;
-		} while (*stringp == '#');
-		if (stringp == NULL)	/* eof */
-			break;
-		if ((tmpp = strpbrk(stringp, "\t ")) == NULL) {
-					/* can't parse file */
-			nc_error = NC_BADFILE;
-			break;
-		}
-		if (strlen(netid) == (size_t) (len = tmpp - stringp) &&	/* a match */
-		    strncmp(stringp, netid, (size_t)len) == 0) {
-			if ((ncp = malloc(sizeof(*ncp))) == NULL)
-				break;
-			ncp->nc_lookups = NULL;
-			if (parse_ncp(linep, ncp) == -1) {
-				free(ncp);
-				ncp = NULL;
-			}
-			break;
-		}
-	} while (stringp != NULL);
-	if (ncp == NULL)
-		free(linep);
-	fclose(file);
-	return(ncp);
-}
-
-/*
- * freenetconfigent(netconfigp) frees the netconfig structure pointed to by
- * netconfigp (previously returned by getnetconfigent()).
- */
-
-void
-freenetconfigent(struct netconfig *netconfigp)
-{
-	if (netconfigp != NULL) {
-				/* holds all netconfigp's strings */
-		free(netconfigp->nc_netid);
-		if (netconfigp->nc_lookups != NULL)
-			free(netconfigp->nc_lookups);
-		free(netconfigp);
-	}
-}
-
-/*
- * Parse line and stuff it in a struct netconfig
- * Typical line might look like:
- *	udp tpi_cots vb inet udp /dev/udp /usr/lib/ip.so,/usr/local/ip.so
- *
- * We return -1 if any of the tokens don't parse, or malloc fails.
- *
- * Note that we modify stringp (putting NULLs after tokens) and
- * we set the ncp's string field pointers to point to these tokens within
- * stringp.
- */
-
-static int
-parse_ncp(
-	char *stringp,		/* string to parse */
-	struct netconfig *ncp)	/* where to put results */
-{
-	char    *tokenp;	/* for processing tokens */
-	char    *lasts;
-
-	_DIAGASSERT(stringp != NULL);
-	_DIAGASSERT(ncp != NULL);
-
-	nc_error = NC_BADFILE;
-			/* nearly anything that breaks is for this reason */
-	stringp[strlen(stringp)-1] = '\0';	/* get rid of newline */
-	/* netid */
-	if ((ncp->nc_netid = strtok_r(stringp, "\t ", &lasts)) == NULL)
-		return (-1);
-
-	/* semantics */
-	if ((tokenp = strtok_r(NULL, "\t ", &lasts)) == NULL)
-		return (-1);
-	if (strcmp(tokenp, NC_TPI_COTS_ORD_S) == 0)
-		ncp->nc_semantics = NC_TPI_COTS_ORD;
-	else if (strcmp(tokenp, NC_TPI_COTS_S) == 0)
-		ncp->nc_semantics = NC_TPI_COTS;
-	else if (strcmp(tokenp, NC_TPI_CLTS_S) == 0)
-		ncp->nc_semantics = NC_TPI_CLTS;
-	else if (strcmp(tokenp, NC_TPI_RAW_S) == 0)
-		ncp->nc_semantics = NC_TPI_RAW;
-	else
-		return (-1);
-
-	/* flags */
-	if ((tokenp = strtok_r(NULL, "\t ", &lasts)) == NULL)
-		return (-1);
-	for (ncp->nc_flag = NC_NOFLAG; *tokenp != '\0'; tokenp++) {
-		switch (*tokenp) {
-		case NC_NOFLAG_C:
-			break;
-		case NC_VISIBLE_C:
-			ncp->nc_flag |= NC_VISIBLE;
-			break;
-		case NC_BROADCAST_C:
-			ncp->nc_flag |= NC_BROADCAST;
-			break;
-		default:
-			return (-1);
-		}
-	}
-	/* protocol family */
-	if ((ncp->nc_protofmly = strtok_r(NULL, "\t ", &lasts)) == NULL)
-		return (-1);
-	/* protocol name */
-	if ((ncp->nc_proto = strtok_r(NULL, "\t ", &lasts)) == NULL)
-		return (-1);
-	/* network device */
-	if ((ncp->nc_device = strtok_r(NULL, "\t ", &lasts)) == NULL)
-		return (-1);
-	if ((tokenp = strtok_r(NULL, "\t ", &lasts)) == NULL)
-		return (-1);
-	if (strcmp(tokenp, NC_NOLOOKUP) == 0) {
-		ncp->nc_nlookups = 0;
-		ncp->nc_lookups = NULL;
-	} else {
-		char *cp;	    /* tmp string */
-
-		if (ncp->nc_lookups != NULL)	/* from last visit */
-			free(ncp->nc_lookups);
-		/* preallocate one string pointer */
-		ncp->nc_lookups = malloc(sizeof(*ncp->nc_lookups));
-		ncp->nc_nlookups = 0;
-		while ((cp = tokenp) != NULL) {
-			tokenp = _get_next_token(cp, ',');
-			ncp->nc_lookups[(size_t)ncp->nc_nlookups++] = cp;
-			ncp->nc_lookups = (char **)
-			    realloc(ncp->nc_lookups,
-			    (size_t)(ncp->nc_nlookups+1) *sizeof(char *));	
-						/* for next loop */
-		}
-	}
-	return (0);
-}
-
-/*
- * Returns a string describing the reason for failure.
- */
-char *
-nc_sperror(void)
-{
-	const char *message;
-
-	switch(nc_error) {
-	case NC_NONETCONFIG:
-		message = _nc_errors[0];
-		break;
-	case NC_NOMEM:
-		message = _nc_errors[1];
-		break;
-	case NC_NOTINIT:
-		message = _nc_errors[2];
-		break;
-	case NC_BADFILE:
-		message = _nc_errors[3];
-		break;
-	default:
-		message = "Unknown network selection error";
-	}
-	return __UNCONST(message);
-}
-
-/*
- * Prints a message onto standard error describing the reason for failure.
- */
-void
-nc_perror(const char *s)
-{
-
-	_DIAGASSERT(s != NULL);
-
-	fprintf(stderr, "%s: %s", s, nc_sperror());
-}
-
-/*
- * Duplicates the matched netconfig buffer.
- */
-static struct netconfig *
-dup_ncp(struct netconfig *ncp)
-{
-	struct netconfig	*p;
-	char	*tmp;
-	u_int	i;
-
-	_DIAGASSERT(ncp != NULL);
-
-	if ((tmp = malloc(MAXNETCONFIGLINE)) == NULL)
-		return(NULL);
-	if ((p = malloc(sizeof(*p))) == NULL) {
-		free(tmp);
-		return(NULL);
-	}
-	/*
-	 * First we dup all the data from matched netconfig buffer.  Then we
-	 * adjust some of the member pointer to a pre-allocated buffer where
-	 * contains part of the data.
-	 * To follow the convention used in parse_ncp(), we store all the
-	 * necessary information in the pre-allocated buffer and let each
-	 * of the netconfig char pointer member point to the right address
-	 * in the buffer.
-	 */
-	*p = *ncp;
-	p->nc_netid = (char *)strcpy(tmp,ncp->nc_netid);
-	tmp = strchr(tmp, '\0') + 1;
-	p->nc_protofmly = (char *)strcpy(tmp,ncp->nc_protofmly);
-	tmp = strchr(tmp, '\0') + 1;
-	p->nc_proto = (char *)strcpy(tmp,ncp->nc_proto);
-	tmp = strchr(tmp, '\0') + 1;
-	p->nc_device = (char *)strcpy(tmp,ncp->nc_device);
-	p->nc_lookups = malloc((size_t)(p->nc_nlookups+1) * sizeof(char *));
-	if (p->nc_lookups == NULL) {
-		free(p->nc_netid);
-		free(p);
-		return(NULL);
-	}
-	for (i=0; i < p->nc_nlookups; i++) {
-		tmp = strchr(tmp, '\0') + 1;
-		p->nc_lookups[i] = strcpy(tmp,ncp->nc_lookups[i]);
-	}
-	return(p);
-}
diff --git a/lib/libc/rpc/getnetpath.3 b/lib/libc/rpc/getnetpath.3
deleted file mode 100644
index b63116aae..000000000
--- a/lib/libc/rpc/getnetpath.3
+++ /dev/null
@@ -1,124 +0,0 @@
-.\"	@(#)getnetpath.3n 1.26 93/05/07 SMI; from SVr4
-.\"	$NetBSD: getnetpath.3,v 1.6 2003/04/16 13:34:43 wiz Exp $
-.\" Copyright 1989 AT&T
-.Dd April 22, 2000
-.Dt GETNETPATH 3
-.Os
-.Sh NAME
-.Nm getnetpath ,
-.Nm setnetpath ,
-.Nm endnetpath
-.Nd get /etc/netconfig entry corresponding to NETPATH component
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netconfig.h
-.Ft struct netconfig *
-.Fn getnetpath "void *handlep"
-.Ft void *
-.Fn setnetpath "void"
-.Ft int
-.Fn endnetpath "void *handlep"
-.Sh DESCRIPTION
-The routines described in this page provide the application access to the system
-network configuration database,
-.Pa /etc/netconfig ,
-as it is
-.Dq filtered
-by the NETPATH
-environment variable (see
-.Xr environ 7 ) .
-See
-.Xr getnetconfig 3
-for other routines that also access the
-network configuration database directly.
-The NETPATH variable is a list of colon-separated network identifiers.
-.Pp
-.Fn getnetpath
-returns a pointer to the
-netconfig database entry corresponding to the first valid
-NETPATH component.
-The netconfig entry is formatted as a struct netconfig.
-On each subsequent call,
-.Fn getnetpath
-returns a pointer to the netconfig entry that corresponds to the next
-valid NETPATH component.
-.Fn getnetpath
-can thus be used to search the netconfig database for all networks
-included in the NETPATH variable.
-When NETPATH has been exhausted,
-.Fn getnetpath
-returns NULL.
-.Pp
-A call to
-.Fn setnetpath
-.Dq binds
-to or
-.Dq rewinds
-NETPATH.
-.Fn setnetpath
-must be called before the first call to
-.Fn getnetpath
-and may be called at any other time.
-It returns a handle that is used by
-.Fn getnetpath .
-.Pp
-.Fn getnetpath
-silently ignores invalid NETPATH
-components.
-A NETPATH component is invalid if there is no corresponding
-entry in the netconfig database.
-.Pp
-If the NETPATH variable is unset,
-.Fn getnetpath
-behaves as if NETPATH
-were set to the sequence of
-.Dq default
-or
-.Dq visible
-networks in the netconfig database, in the
-order in which they are listed.
-.\"This proviso holds also for this
-.\"whole manpage.
-.Pp
-.Fn endnetpath
-may be called to
-.Dq unbind
-from NETPATH
-when processing is complete, releasing resources for reuse.
-Programmers should be aware, however, that
-.Fn endnetpath
-frees all memory allocated by
-.Fn getnetpath
-for the struct netconfig data structure.
-.Sh RETURN VALUES
-.Fn setnetpath
-returns a handle that is used by
-.Fn getnetpath .
-In case of an error,
-.Fn setnetpath
-returns NULL.
-.Pp
-.Fn endnetpath
-returns 0 on success and -1 on failure
-(for example, if
-.Fn setnetpath
-was not called previously).
-.Fn nc_perror
-or
-.Fn nc_sperror
-can be used to print out the reason for failure.
-See
-.Xr getnetconfig 3 .
-.Pp
-When first called,
-.Fn getnetpath
-returns a pointer to the netconfig database entry corresponding to the first
-valid NETPATH component.
-When NETPATH has been exhausted,
-.Fn getnetpath
-returns NULL.
-.Sh SEE ALSO
-.Xr getnetconfig 3 ,
-.Xr netconfig 5 ,
-.Xr environ 7
diff --git a/lib/libc/rpc/getnetpath.c b/lib/libc/rpc/getnetpath.c
deleted file mode 100644
index bf26936ea..000000000
--- a/lib/libc/rpc/getnetpath.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*	$NetBSD: getnetpath.c,v 1.17 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static        char sccsid[] = "@(#)getnetpath.c	1.11 91/12/19 SMI";
-#else
-__RCSID("$NetBSD: getnetpath.c,v 1.17 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * Copyright (c) 1989 by Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <stdio.h>
-#include <assert.h>
-#include <errno.h>
-#include <netconfig.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-
-#ifdef __weak_alias
-__weak_alias(getnetpath,_getnetpath)
-__weak_alias(setnetpath,_setnetpath)
-__weak_alias(endnetpath,_endnetpath)
-#endif
-
-/*
- * internal structure to keep track of a netpath "session"
- */
-struct netpath_chain {
-	struct netconfig *ncp;  		/* an nconf entry */
-	struct netpath_chain *nchain_next;	/* next nconf entry allocated */
-};
-
-
-struct netpath_vars {
-	int   valid;		/* token that indicates a valid netpath_vars */
-	void *nc_handlep;	/* handle for current netconfig "session" */
-	char *netpath;		/* pointer to current view-point in NETPATH */
-	char *netpath_start;	/* pointer to start of our copy of NETPATH */
-	struct netpath_chain *ncp_list;  /* list of nconfs allocated this session*/
-};
-
-#define NP_VALID	0xf00d
-#define NP_INVALID	0
-
-char *_get_next_token(char *, int);
-
-
-/*
- * A call to setnetpath() establishes a NETPATH "session".  setnetpath()
- * must be called before the first call to getnetpath().  A "handle" is
- * returned to distinguish the session; this handle should be passed
- * subsequently to getnetpath().  (Handles are used to allow for nested calls
- * to setnetpath()).
- * If setnetpath() is unable to establish a session (due to lack of memory
- * resources, or the absence of the /etc/netconfig file), a NULL pointer is
- * returned.
- */
-
-void *
-setnetpath(void)
-{
-	struct netpath_vars *np_sessionp;   /* this session's variables */
-	char *npp;				/* NETPATH env variable */
-
-#ifdef MEM_CHK
-	malloc_debug(1);
-#endif
-
-	if ((np_sessionp = malloc(sizeof(*np_sessionp))) == NULL)
-		return (NULL);
-	if ((np_sessionp->nc_handlep = setnetconfig()) == NULL) {
-		free(np_sessionp);
-		syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-		return (NULL);
-	}
-	np_sessionp->valid = NP_VALID;
-	np_sessionp->ncp_list = NULL;
-	if ((npp = getenv(NETPATH)) == NULL)
-		np_sessionp->netpath = NULL;
-	else {
-		(void) endnetconfig(np_sessionp->nc_handlep);
-					/* won't need nc session*/
-		np_sessionp->nc_handlep = NULL;
-		if ((np_sessionp->netpath = malloc(strlen(npp)+1)) == NULL) {
-			free(np_sessionp);
-			return (NULL);
-		} else
-			(void) strcpy(np_sessionp->netpath, npp);
-	}
-	np_sessionp->netpath_start = np_sessionp->netpath;
-	return ((void *)np_sessionp);
-}
-
-/*
- * When first called, getnetpath() returns a pointer to the netconfig
- * database entry corresponding to the first valid NETPATH component.  The
- * netconfig entry is formatted as a struct netconfig.
- * On each subsequent call, getnetpath returns a pointer to the netconfig
- * entry that corresponds to the next valid NETPATH component.  getnetpath
- * can thus be used to search the netconfig database for all networks
- * included in the NETPATH variable.
- * When NETPATH has been exhausted, getnetpath() returns NULL.  It returns
- * NULL and sets errno in case of an error (e.g., setnetpath was not called
- * previously).
- * getnetpath() silently ignores invalid NETPATH components.  A NETPATH
- * compnent is invalid if there is no corresponding entry in the netconfig
- * database.
- * If the NETPATH variable is unset, getnetpath() behaves as if NETPATH
- * were set to the sequence of default or visible networks in the netconfig
- * database, in the order in which they are listed.
- */
-
-struct netconfig *
-getnetpath(void *handlep)
-{
-	struct netpath_vars *np_sessionp = (struct netpath_vars *)handlep;
-	struct netconfig *ncp = NULL;   /* temp. holds a netconfig session */
-	struct netpath_chain *chainp;   /* holds chain of ncp's we alloc */
-	char  *npp;		/* holds current NETPATH */
-
-	if (np_sessionp == NULL || np_sessionp->valid != NP_VALID) {
-		errno = EINVAL;
-		return (NULL);
-	}
-	if (np_sessionp->netpath_start == NULL) { /* NETPATH was not set */
-		do {                /* select next visible network */
-			if (np_sessionp->nc_handlep == NULL) {
-				np_sessionp->nc_handlep = setnetconfig();
-				if (np_sessionp->nc_handlep == NULL)
-					syslog (LOG_ERR,
-					    "rpc: failed to open " NETCONFIG);
-			}
-			if ((ncp = getnetconfig(np_sessionp->nc_handlep))
-			    == NULL)
-				return(NULL);
-		} while ((ncp->nc_flag & NC_VISIBLE) == 0);
-		return (ncp);
-	}
-	/*
-	 * Find first valid network ID in netpath.
-	 */
-	while ((npp = np_sessionp->netpath) != NULL && strlen(npp) != 0) {
-		np_sessionp->netpath = _get_next_token(npp, ':');
-		/*
-		 * npp is a network identifier.
-		 */
-		if ((ncp = getnetconfigent(npp)) != NULL) {
-					/* cobble alloc chain entry */
-			chainp = malloc(sizeof (struct netpath_chain));
-			if (chainp == NULL) {
-				freenetconfigent(ncp);
-				return NULL;
-			}
-			chainp->ncp = ncp;
-			chainp->nchain_next = NULL;
-			if (np_sessionp->ncp_list == NULL)
-				np_sessionp->ncp_list = chainp;
-			else
-				np_sessionp->ncp_list->nchain_next = chainp;
-			return (ncp);
-		}
-		/* couldn't find this token in the database; go to next one. */
-	}
-	return (NULL);
-}
-
-/*
- * endnetpath() may be called to unbind NETPATH when processing is complete,
- * releasing resources for reuse.  It returns 0 on success and -1 on failure
- * (e.g. if setnetpath() was not called previously.
- */
-int
-endnetpath(void *handlep)
-{
-	struct netpath_vars *np_sessionp = (struct netpath_vars *)handlep;
-	struct netpath_chain *chainp, *lastp;
-
-	if (np_sessionp == NULL || np_sessionp->valid != NP_VALID) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (np_sessionp->nc_handlep != NULL)
-		endnetconfig(np_sessionp->nc_handlep);
-	if (np_sessionp->netpath_start != NULL)
-		free(np_sessionp->netpath_start);
-	for (chainp = np_sessionp->ncp_list; chainp != NULL;
-	    lastp=chainp, chainp=chainp->nchain_next, free(lastp)) {
-		freenetconfigent(chainp->ncp);
-	}
-	free(np_sessionp);
-#ifdef MEM_CHK
-	if (malloc_verify() == 0) {
-		fprintf(stderr, "memory heap corrupted in endnetpath\n");
-		exit(1);
-	}
-#endif
-	return (0);
-}
-
-
-/*
- * Returns pointer to the rest-of-the-string after the current token.
- * The token itself starts at arg, and we null terminate it.  We return NULL
- * if either the arg is empty, or if this is the last token.
- */
-
-char *
-_get_next_token(
-	char *npp,		/* string */
-	int token		/* char to parse string for */
-)
-{
-	char  *cp;		/* char pointer */
-	char  *np;		/* netpath pointer */
-	char  *ep;		/* escape pointer */
-
-	_DIAGASSERT(npp != NULL);
-
-	if ((cp = strchr(npp, token)) == NULL)
-		return (NULL);
-	/*
-	 * did find a token, but it might be escaped.
-	 */
-	if ((cp > npp) && (cp[-1] == '\\')) {
-		/*
-		 * if slash was also escaped, carry on, otherwise find
-		 * next token
-		 */
-		if ((cp > npp + 1) && (cp[-2] != '\\')) {
-			/* shift r-o-s  onto the escaped token */
-			strcpy(&cp[-1], cp);  /* XXX: overlapping string copy */
-			/*
-			 * Do a recursive call.
-			 * We don't know how many escaped tokens there might be.
-			 */
-			return (_get_next_token(cp, token));
-		}
-	}
-
-	*cp++ = '\0';		/* null-terminate token */
-	/* get rid of any backslash escapes */
-	ep = npp;
-	while ((np = strchr(ep, '\\')) != 0) {
-		if (np[1] == '\\')
-			np++;
-		strcpy(np, (ep = &np[1]));  /* XXX: overlapping string copy */
-	}
-	return (cp);		/* return ptr to r-o-s */
-}
diff --git a/lib/libc/rpc/getrpcent.3 b/lib/libc/rpc/getrpcent.3
deleted file mode 100644
index fd85ad476..000000000
--- a/lib/libc/rpc/getrpcent.3
+++ /dev/null
@@ -1,96 +0,0 @@
-.\"	@(#)getrpcent.3n	2.2 88/08/02 4.0 RPCSRC; from 1.11 88/03/14 SMI
-.\"	$NetBSD: getrpcent.3,v 1.14 2004/08/16 10:18:27 wiz Exp $
-.\"
-.Dd August 16, 2004
-.Dt GETRPCENT 3
-.Os
-.Sh NAME
-.Nm getrpcent ,
-.Nm getrpcbyname ,
-.Nm getrpcbynumber ,
-.Nm endrpcent ,
-.Nm setrpcent
-.Nd get RPC entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft struct rpcent *
-.Fn getrpcent void
-.Ft struct rpcent *
-.Fn getrpcbyname "const char *name"
-.Ft struct rpcent *
-.Fn getrpcbynumber "int number"
-.Ft void
-.Fn setrpcent "int stayopen"
-.Ft void
-.Fn endrpcent void
-.Sh DESCRIPTION
-.Fn getrpcent ,
-.Fn getrpcbyname ,
-and
-.Fn getrpcbynumber ,
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the rpc program number data base,
-.Pa /etc/rpc :
-.Bd -literal -offset indent
-struct rpcent {
-	char	*r_name;	/* name of server for this rpc program */
-	char	**r_aliases;	/* alias list */
-	long	r_number;	/* rpc program number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width r_aliases -offset indent
-.It r_name
-The name of the server for this rpc program.
-.It r_aliases
-A zero terminated list of alternative names for the rpc program.
-.It r_number
-The rpc program number for this service.
-.El
-.Pp
-.Fn getrpcent
-reads the next line of the file, opening the file if necessary.
-.Pp
-.Fn setrpcent
-opens and rewinds the file.
-If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to
-.Fn getrpcent
-(either directly, or indirectly through one of
-the other
-.Dq getrpc
-calls).
-.Pp
-.Fn endrpcent
-closes the file.
-.Pp
-.Fn getrpcbyname
-and
-.Fn getrpcbynumber
-sequentially search from the beginning
-of the file until a matching rpc program name or
-program number is found, or until end-of-file is encountered.
-.Sh FILES
-.Pa /etc/rpc
-.Sh DIAGNOSTICS
-A
-.Dv NULL
-pointer is returned on
-.Dv EOF
-or error.
-.Sh SEE ALSO
-.Xr rpc 5 ,
-.Xr rpcinfo 8 ,
-.Xr ypserv 8
-.Sh BUGS
-All information
-is contained in a static area
-so it must be copied if it is
-to be saved.
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
deleted file mode 100644
index 68242ccea..000000000
--- a/lib/libc/rpc/getrpcent.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*	$NetBSD: getrpcent.c,v 1.23 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)getrpcent.c 1.14 91/03/11 Copyr 1984 Sun Micro";
-#else
-__RCSID("$NetBSD: getrpcent.c,v 1.23 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * Copyright (c) 1984 by Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-
-#ifdef __weak_alias
-__weak_alias(endrpcent,_endrpcent)
-__weak_alias(getrpcbyname,_getrpcbyname)
-__weak_alias(getrpcbynumber,_getrpcbynumber)
-__weak_alias(getrpcent,_getrpcent)
-__weak_alias(setrpcent,_setrpcent)
-#endif
-
-/*
- * Internet version.
- */
-static struct rpcdata {
-	FILE	*rpcf;
-	int	stayopen;
-#define	MAXALIASES	35
-	char	*rpc_aliases[MAXALIASES];
-	struct	rpcent rpc;
-	char	line[BUFSIZ+1];
-} *rpcdata;
-
-static	struct rpcent *interpret(char *val, size_t len);
-
-#define	RPCDB	"/etc/rpc"
-
-static struct rpcdata *_rpcdata(void);
-
-static struct rpcdata *
-_rpcdata(void)
-{
-	struct rpcdata *d = rpcdata;
-
-	if (d == 0) {
-		d = (struct rpcdata *)calloc(1, sizeof (struct rpcdata));
-		rpcdata = d;
-	}
-	return (d);
-}
-
-struct rpcent *
-getrpcbynumber(int number)
-{
-	struct rpcent *rpc;
-
-	setrpcent(0);
-	while ((rpc = getrpcent()) != NULL) {
-		if (rpc->r_number == number)
-			break;
-	}
-	endrpcent();
-	return (rpc);
-}
-
-struct rpcent *
-getrpcbyname(const char *name)
-{
-	struct rpcent *rpc;
-	char **rp;
-
-	_DIAGASSERT(name != NULL);
-
-	setrpcent(0);
-	while ((rpc = getrpcent()) != NULL) {
-		if (strcmp(rpc->r_name, name) == 0)
-			break;
-		for (rp = rpc->r_aliases; *rp != NULL; rp++) {
-			if (strcmp(*rp, name) == 0)
-				goto found;
-		}
-	}
-found:
-	endrpcent();
-	return (rpc);
-}
-
-void
-setrpcent(int f)
-{
-	struct rpcdata *d = _rpcdata();
-
-	if (d == 0)
-		return;
-	if (d->rpcf == NULL)
-		d->rpcf = fopen(RPCDB, "re");
-	else
-		rewind(d->rpcf);
-	d->stayopen |= f;
-}
-
-void
-endrpcent(void)
-{
-	struct rpcdata *d = _rpcdata();
-
-	if (d == 0)
-		return;
-	if (d->rpcf && !d->stayopen) {
-		fclose(d->rpcf);
-		d->rpcf = NULL;
-	}
-}
-
-struct rpcent *
-getrpcent(void)
-{
-	struct rpcdata *d = _rpcdata();
-
-	if (d == 0)
-		return(NULL);
-	if (d->rpcf == NULL && (d->rpcf = fopen(RPCDB, "re")) == NULL)
-		return (NULL);
-	if (fgets(d->line, BUFSIZ, d->rpcf) == NULL)
-		return (NULL);
-	return (interpret(d->line, strlen(d->line)));
-}
-
-static struct rpcent *
-interpret(char *val, size_t len)
-{
-	struct rpcdata *d = _rpcdata();
-	char *p;
-	char *cp, **q;
-
-	_DIAGASSERT(val != NULL);
-
-	if (d == 0)
-		return (0);
-	(void) strncpy(d->line, val, len);
-	p = d->line;
-	d->line[len] = '\n';
-	if (*p == '#')
-		return (getrpcent());
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		return (getrpcent());
-	*cp = '\0';
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		return (getrpcent());
-	*cp++ = '\0';
-	/* THIS STUFF IS INTERNET SPECIFIC */
-	d->rpc.r_name = d->line;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	d->rpc.r_number = atoi(cp);
-	q = d->rpc.r_aliases = d->rpc_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL) 
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &(d->rpc_aliases[MAXALIASES - 1]))
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&d->rpc);
-}
diff --git a/lib/libc/rpc/getrpcport.3 b/lib/libc/rpc/getrpcport.3
deleted file mode 100644
index 1ac3a53d3..000000000
--- a/lib/libc/rpc/getrpcport.3
+++ /dev/null
@@ -1,34 +0,0 @@
-.\"	@(#)getrpcport.3r	2.2 88/08/02 4.0 RPCSRC; from 1.12 88/02/26 SMI
-.\"	$NetBSD: getrpcport.3,v 1.5 2003/01/18 11:29:04 thorpej Exp $
-.\"
-.Dd October 6, 1987
-.Dt GETRPCPORT 3
-.Os
-.Sh NAME
-.Nm getrpcport
-.Nd get RPC port number
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.Ft int
-.Fn getrpcport "char *host" "int prognum" "int versnum" "int proto"
-.Sh DESCRIPTION
-.Fn getrpcport
-returns the port number for version
-.Fa versnum
-of the RPC program
-.Fa prognum
-running on
-.Fa host
-and using protocol
-.Fa proto .
-It returns 0 if it cannot contact the portmapper, or if
-.Fa prognum
-is not registered.
-If
-.Fa prognum
-is registered but not with version
-.Fa versnum ,
-it will still return a port number (for some version of the program)
-indicating that the program is indeed registered.
-The version mismatch will be detected upon the first call to the service.
diff --git a/lib/libc/rpc/getrpcport.c b/lib/libc/rpc/getrpcport.c
deleted file mode 100644
index 2b175047e..000000000
--- a/lib/libc/rpc/getrpcport.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: getrpcport.c,v 1.18 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)getrpcport.c 1.3 87/08/11 SMI";
-static char *sccsid = "@(#)getrpcport.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: getrpcport.c,v 1.18 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * Copyright (c) 1985 by Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <assert.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_clnt.h>
-
-#ifdef __weak_alias
-__weak_alias(getrpcport,_getrpcport)
-#endif
-
-int
-getrpcport(char *host, int prognum, int versnum, int proto)
-{
-	struct sockaddr_in addr;
-	struct hostent *hp;
-
-	_DIAGASSERT(host != NULL);
-
-	if ((hp = gethostbyname(host)) == NULL)
-		return (0);
-	memset(&addr, 0, sizeof(addr));
-	addr.sin_len = sizeof(struct sockaddr_in);
-	addr.sin_family = AF_INET;
-	addr.sin_port =  0;
-	if (hp->h_length > addr.sin_len)
-		hp->h_length = addr.sin_len;
-	memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length);
-	/* Inconsistent interfaces need casts! :-( */
-	return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum, 
-	    (u_int)proto));
-}
diff --git a/lib/libc/rpc/mt_misc.c b/lib/libc/rpc/mt_misc.c
deleted file mode 100644
index 5e8bb2624..000000000
--- a/lib/libc/rpc/mt_misc.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*	$NetBSD: mt_misc.c,v 1.9 2012/03/20 17:14:50 matt Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Frank van der Linden.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- *	Define and initialize MT data for libnsl.
- *	The _libnsl_lock_init() function below is the library's .init handler.
- */
-
-/* #pragma ident	"@(#)mt_misc.c	1.24	93/04/29 SMI" */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: mt_misc.c,v 1.9 2012/03/20 17:14:50 matt Exp $");
-#endif
-
-#include	"namespace.h"
-#include	"reentrant.h"
-#include	<rpc/rpc.h>
-#include	<sys/time.h>
-#include	<stdlib.h>
-#include	<string.h>
-
-#ifdef _REENTRANT
-
-/* protects the services list (svc.c) */
-rwlock_t	svc_lock = RWLOCK_INITIALIZER;
-/* protects svc_fdset and the xports[] array */
-rwlock_t	svc_fd_lock = RWLOCK_INITIALIZER;
-/* protects the RPCBIND address cache */
-rwlock_t	rpcbaddr_cache_lock = RWLOCK_INITIALIZER;
-
-/* protects authdes cache (svcauth_des.c) */
-mutex_t	authdes_lock = MUTEX_INITIALIZER;
-/* auth_none.c serialization */
-mutex_t	authnone_lock = MUTEX_INITIALIZER;
-/* protects the Auths list (svc_auth.c) */
-mutex_t	authsvc_lock = MUTEX_INITIALIZER;
-/* protects client-side fd lock array */
-mutex_t	clnt_fd_lock = MUTEX_INITIALIZER;
-/* clnt_raw.c serialization */
-mutex_t	clntraw_lock = MUTEX_INITIALIZER;
-/* domainname and domain_fd (getdname.c) and default_domain (rpcdname.c) */
-mutex_t	dname_lock = MUTEX_INITIALIZER;
-/* dupreq variables (svc_dg.c) */
-mutex_t	dupreq_lock = MUTEX_INITIALIZER;
-/* protects first_time and hostname (key_call.c) */
-mutex_t	keyserv_lock = MUTEX_INITIALIZER;
-/* serializes rpc_trace() (rpc_trace.c) */
-mutex_t	libnsl_trace_lock = MUTEX_INITIALIZER;
-/* loopnconf (rpcb_clnt.c) */
-mutex_t	loopnconf_lock = MUTEX_INITIALIZER;
-/* serializes ops initializations */
-mutex_t	ops_lock = MUTEX_INITIALIZER;
-/* protects ``port'' static in bindresvport() */
-mutex_t	portnum_lock = MUTEX_INITIALIZER;
-/* protects proglst list (svc_simple.c) */
-mutex_t	proglst_lock = MUTEX_INITIALIZER;
-/* serializes clnt_com_create() (rpc_soc.c) */
-mutex_t	rpcsoc_lock = MUTEX_INITIALIZER;
-/* svc_raw.c serialization */
-mutex_t	svcraw_lock = MUTEX_INITIALIZER;
-/* xprtlist (svc_generic.c) */
-mutex_t	xprtlist_lock = MUTEX_INITIALIZER;
-/* serializes calls to public key routines */
-mutex_t serialize_pkey = MUTEX_INITIALIZER;
-
-#endif /* _REENTRANT */
-
-
-#undef	rpc_createerr
-
-struct rpc_createerr rpc_createerr;
-
-#ifdef _REENTRANT
-static thread_key_t rce_key;
-static once_t rce_once = ONCE_INITIALIZER;
-
-static void 
-__rpc_createerr_setup(void)
-{
-
-	thr_keycreate(&rce_key, free);
-}
-#endif /* _REENTRANT */
-
-struct rpc_createerr*
-__rpc_createerr(void)
-{
-#ifdef _REENTRANT
-	struct rpc_createerr *rce_addr = 0;
-
-	if (__isthreaded == 0)
-		return (&rpc_createerr);
-	thr_once(&rce_once, __rpc_createerr_setup);
-	rce_addr = thr_getspecific(rce_key);
-	if (rce_addr == NULL) {
-		rce_addr = malloc(sizeof(*rce_addr));
-		if (rce_addr == NULL)
-			return &rpc_createerr;
-		thr_setspecific(rce_key, (void *) rce_addr);
-		memset(rce_addr, 0, sizeof (struct rpc_createerr));
-	}
-		
-	return (rce_addr);
-#else
-	return &rpc_createerr;
-#endif
-}
diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c
deleted file mode 100644
index 4d0438b88..000000000
--- a/lib/libc/rpc/pmap_clnt.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*	$NetBSD: pmap_clnt.c,v 1.19 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_clnt.c	2.2 88/08/01 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: pmap_clnt.c,v 1.19 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * pmap_clnt.c
- * Client interface to pmap rpc service.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/nettype.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "rpc_internal.h"
-
-#ifdef __weak_alias
-__weak_alias(pmap_set,_pmap_set)
-__weak_alias(pmap_unset,_pmap_unset)
-#endif
-
-bool_t
-pmap_set(u_long program, u_long version, int protocol, int port)
-{
-	bool_t rslt;
-	struct netbuf *na;
-	struct netconfig *nconf;
-	char buf[32];
-
-	if ((protocol != IPPROTO_UDP) && (protocol != IPPROTO_TCP)) {
-		return (FALSE);
-	}
-	nconf = __rpc_getconfip(protocol == IPPROTO_UDP ? "udp" : "tcp");
-	if (nconf == NULL) {
-		return (FALSE);
-	}
-	snprintf(buf, sizeof buf, "0.0.0.0.%d.%d", 
-	    (((u_int32_t)port) >> 8) & 0xff, port & 0xff);
-	na = uaddr2taddr(nconf, buf);
-	if (na == NULL) {
-		freenetconfigent(nconf);
-		return (FALSE);
-	}
-	rslt = rpcb_set((rpcprog_t)program, (rpcvers_t)version, nconf, na);
-	free(na);
-	freenetconfigent(nconf);
-	return (rslt);
-}
-
-/*
- * Remove the mapping between program, version and port.
- * Calls the pmap service remotely to do the un-mapping.
- */
-bool_t
-pmap_unset(u_long program, u_long version)
-{
-	struct netconfig *nconf;
-	bool_t udp_rslt = FALSE;
-	bool_t tcp_rslt = FALSE;
-
-	nconf = __rpc_getconfip("udp");
-	if (nconf != NULL) {
-		udp_rslt = rpcb_unset((rpcprog_t)program, (rpcvers_t)version,
-		    nconf);
-		freenetconfigent(nconf);
-	}
-	nconf = __rpc_getconfip("tcp");
-	if (nconf != NULL) {
-		tcp_rslt = rpcb_unset((rpcprog_t)program, (rpcvers_t)version,
-		    nconf);
-		freenetconfigent(nconf);
-	}
-	/*
-	 * XXX: The call may still succeed even if only one of the
-	 * calls succeeded.  This was the best that could be
-	 * done for backward compatibility.
-	 */
-	return (tcp_rslt || udp_rslt);
-}
diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c
deleted file mode 100644
index b55c5add2..000000000
--- a/lib/libc/rpc/pmap_getmaps.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*	$NetBSD: pmap_getmaps.c,v 1.18 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_getmaps.c	2.2 88/08/01 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: pmap_getmaps.c,v 1.18 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * pmap_getmap.c
- * Client interface to pmap rpc service.
- * contains pmap_getmaps, which is only tcp service involved
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-
-#ifdef __weak_alias
-__weak_alias(pmap_getmaps,_pmap_getmaps)
-#endif
-
-#define NAMELEN 255
-#define MAX_BROADCAST_SIZE 1400
-
-/*
- * Get a copy of the current port maps.
- * Calls the pmap service remotely to do get the maps.
- */
-struct pmaplist *
-pmap_getmaps(struct sockaddr_in *address)
-{
-	struct pmaplist *head = NULL;
-	int sock = -1;
-	struct timeval minutetimeout;
-	CLIENT *client;
-
-	_DIAGASSERT(address != NULL);
-
-	minutetimeout.tv_sec = 60;
-	minutetimeout.tv_usec = 0;
-	address->sin_port = htons(PMAPPORT);
-	client = clnttcp_create(address, PMAPPROG,
-	    PMAPVERS, &sock, 50, 500);
-	if (client != NULL) {
-		if (CLNT_CALL(client, (rpcproc_t)PMAPPROC_DUMP,
-		    (xdrproc_t)xdr_void, NULL,
-		    (xdrproc_t)xdr_pmaplist, &head, minutetimeout) !=
-		    RPC_SUCCESS) {
-			clnt_perror(client, "pmap_getmaps rpc problem");
-		}
-		CLNT_DESTROY(client);
-	}
-	address->sin_port = 0;
-	return (head);
-}
diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c
deleted file mode 100644
index 7b4ae9fbe..000000000
--- a/lib/libc/rpc/pmap_getport.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*	$NetBSD: pmap_getport.c,v 1.19 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_getport.c	2.2 88/08/01 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: pmap_getport.c,v 1.19 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * pmap_getport.c
- * Client interface to pmap rpc service.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-
-#include <assert.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-
-#ifdef __weak_alias
-__weak_alias(pmap_getport,_pmap_getport)
-#endif
-
-static const struct timeval timeout = { 5, 0 };
-static const struct timeval tottimeout = { 60, 0 };
-
-/*
- * Find the mapped port for program,version.
- * Calls the pmap service remotely to do the lookup.
- * Returns 0 if no map exists.
- */
-
-static void
-remote_pmap_getport(CLIENT *client, struct pmap *parms, u_short *port)
-{
-	if (CLNT_CALL(client, (rpcproc_t)PMAPPROC_GETPORT, (xdrproc_t)xdr_pmap,
-	    parms, (xdrproc_t)xdr_u_short, port, tottimeout) != RPC_SUCCESS) {
-		rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-		clnt_geterr(client, &rpc_createerr.cf_error);
-	} else if (*port == 0) {
-		rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
-		clnt_geterr(client, &rpc_createerr.cf_error);
-	}
-	CLNT_DESTROY(client);
-}
-
-static CLIENT *
-get_client(struct sockaddr_in *address, int tcp)
-{
-	int sock = -1;
-	if (tcp)
-		return clnttcp_create(address, PMAPPROG, PMAPVERS, &sock, 0, 0);
-	else
-		return clntudp_bufcreate(address, PMAPPROG, PMAPVERS, timeout,
-		    &sock, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
-}
-
-u_short
-pmap_getport(struct sockaddr_in *address, u_long program, u_long version,
-    u_int protocol)
-{
-	u_short port = 0;
-	CLIENT *client;
-	struct pmap parms;
-
-	_DIAGASSERT(address != NULL);
-
-	parms.pm_prog = program;
-	parms.pm_vers = version;
-	parms.pm_prot = protocol;
-	parms.pm_port = 0;  /* not needed or used */
-
-	address->sin_port = htons(PMAPPORT);
-
-	client = get_client(address, protocol == IPPROTO_TCP);
-	if (client != NULL)
-		remote_pmap_getport(client, &parms, &port);
-
-	if (port == 0) {
-		client = get_client(address, protocol != IPPROTO_TCP);
-		if (client != NULL)
-			remote_pmap_getport(client, &parms, &port);
-	}
-
-	address->sin_port = 0;
-	return port;
-}
diff --git a/lib/libc/rpc/pmap_prot.c b/lib/libc/rpc/pmap_prot.c
deleted file mode 100644
index 381da4ae9..000000000
--- a/lib/libc/rpc/pmap_prot.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: pmap_prot.c,v 1.12 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_prot.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: pmap_prot.c,v 1.12 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * pmap_prot.c
- * Protocol for the local binder service, or pmap.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-
-#include <assert.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/pmap_prot.h>
-
-#ifdef __weak_alias
-__weak_alias(xdr_pmap,_xdr_pmap)
-#endif
-
-
-bool_t
-xdr_pmap(XDR *xdrs, struct pmap *regs)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(regs != NULL);
-
-	if (xdr_u_long(xdrs, &regs->pm_prog) && 
-		xdr_u_long(xdrs, &regs->pm_vers) && 
-		xdr_u_long(xdrs, &regs->pm_prot))
-		return (xdr_u_long(xdrs, &regs->pm_port));
-	return (FALSE);
-}
diff --git a/lib/libc/rpc/pmap_prot2.c b/lib/libc/rpc/pmap_prot2.c
deleted file mode 100644
index c49810a86..000000000
--- a/lib/libc/rpc/pmap_prot2.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*	$NetBSD: pmap_prot2.c,v 1.17 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_prot2.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: pmap_prot2.c,v 1.17 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * pmap_prot2.c
- * Protocol for the local binder service, or pmap.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-
-#include <assert.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/pmap_prot.h>
-
-#ifdef __weak_alias
-__weak_alias(xdr_pmaplist,_xdr_pmaplist)
-#endif
-
-/* 
- * What is going on with linked lists? (!)
- * First recall the link list declaration from pmap_prot.h:
- *
- * struct pmaplist {
- *	struct pmap pml_map;
- *	struct pmaplist *pml_map;
- * };
- *
- * Compare that declaration with a corresponding xdr declaration that 
- * is (a) pointer-less, and (b) recursive:
- *
- * typedef union switch (bool_t) {
- * 
- *	case TRUE: struct {
- *		struct pmap;
- * 		pmaplist_t foo;
- *	};
- *
- *	case FALSE: struct {};
- * } pmaplist_t;
- *
- * Notice that the xdr declaration has no nxt pointer while
- * the C declaration has no bool_t variable.  The bool_t can be
- * interpreted as ``more data follows me''; if FALSE then nothing
- * follows this bool_t; if TRUE then the bool_t is followed by
- * an actual struct pmap, and then (recursively) by the 
- * xdr union, pamplist_t.  
- *
- * This could be implemented via the xdr_union primitive, though this
- * would cause a one recursive call per element in the list.  Rather than do
- * that we can ``unwind'' the recursion
- * into a while loop and do the union arms in-place.
- *
- * The head of the list is what the C programmer wishes to past around
- * the net, yet is the data that the pointer points to which is interesting;
- * this sounds like a job for xdr_reference!
- */
-bool_t
-xdr_pmaplist(XDR *xdrs, struct pmaplist **rp)
-{
-	/*
-	 * more_elements is pre-computed in case the direction is
-	 * XDR_ENCODE or XDR_FREE.  more_elements is overwritten by
-	 * xdr_bool when the direction is XDR_DECODE.
-	 */
-	bool_t more_elements;
-	int freeing;
-	struct pmaplist **next	= NULL; /* pacify gcc */
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(rp != NULL);
-
-	freeing = (xdrs->x_op == XDR_FREE);
-
-	for (;;) {
-		more_elements = (bool_t)(*rp != NULL);
-		if (! xdr_bool(xdrs, &more_elements))
-			return (FALSE);
-		if (! more_elements)
-			return (TRUE);  /* we are done */
-		/*
-		 * the unfortunate side effect of non-recursion is that in
-		 * the case of freeing we must remember the next object
-		 * before we free the current object ...
-		 */
-		if (freeing)
-			next = &((*rp)->pml_next); 
-		if (! xdr_reference(xdrs, (caddr_t *)rp,
-		    (u_int)sizeof(struct pmaplist), (xdrproc_t)xdr_pmap))
-			return (FALSE);
-		rp = (freeing) ? next : &((*rp)->pml_next);
-	}
-}
-
-
-/*
- * xdr_pmaplist_ptr() is specified to take a PMAPLIST *, but is identical in
- * functionality to xdr_pmaplist().
- */
-bool_t
-xdr_pmaplist_ptr(XDR *xdrs, struct pmaplist *rp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(rp != NULL);
-
-	return xdr_pmaplist(xdrs, (struct pmaplist **)(void *)rp);
-}
diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c
deleted file mode 100644
index a39bf8551..000000000
--- a/lib/libc/rpc/pmap_rmt.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*	$NetBSD: pmap_rmt.c,v 1.34 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_rmt.c	2.2 88/08/01 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: pmap_rmt.c,v 1.34 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * pmap_rmt.c
- * Client interface to pmap rpc service.
- * remote call and broadcast service
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/poll.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_rmt.h>
-
-#ifdef __weak_alias
-__weak_alias(xdr_rmtcall_args,_xdr_rmtcall_args)
-__weak_alias(xdr_rmtcallres,_xdr_rmtcallres)
-#endif
-
-static const struct timeval timeout = { 3, 0 };
-
-/*
- * pmapper remote-call-service interface.
- * This routine is used to call the pmapper remote call service
- * which will look up a service program in the port maps, and then
- * remotely call that routine with the given parameters.  This allows
- * programs to do a lookup and call in one step.
-*/
-enum clnt_stat
-pmap_rmtcall(struct sockaddr_in *addr, u_long prog, u_long vers, u_long proc,
-    xdrproc_t xdrargs, caddr_t argsp, xdrproc_t xdrres, caddr_t resp,
-    struct timeval tout, u_long *port_ptr)
-{
-	int sock = -1;
-	CLIENT *client;
-	struct rmtcallargs a;
-	struct rmtcallres r;
-	enum clnt_stat stat;
-
-	_DIAGASSERT(addr != NULL);
-	_DIAGASSERT(port_ptr != NULL);
-
-	addr->sin_port = htons(PMAPPORT);
-	client = clntudp_create(addr, PMAPPROG, PMAPVERS, timeout, &sock);
-	if (client != NULL) {
-		a.prog = prog;
-		a.vers = vers;
-		a.proc = proc;
-		a.args_ptr = argsp;
-		a.xdr_args = xdrargs;
-		r.port_ptr = port_ptr;
-		r.results_ptr = resp;
-		r.xdr_results = xdrres;
-		stat = CLNT_CALL(client, (rpcproc_t)PMAPPROC_CALLIT,
-		    (xdrproc_t)xdr_rmtcall_args, &a, (xdrproc_t)xdr_rmtcallres,
-		    &r, tout);
-		CLNT_DESTROY(client);
-	} else {
-		stat = RPC_FAILED;
-	}
-	addr->sin_port = 0;
-	return (stat);
-}
-
-
-/*
- * XDR remote call arguments
- * written for XDR_ENCODE direction only
- */
-bool_t
-xdr_rmtcall_args(XDR *xdrs, struct rmtcallargs *cap)
-{
-	u_int lenposition, argposition, position;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(cap != NULL);
-
-	if (xdr_u_long(xdrs, &(cap->prog)) &&
-	    xdr_u_long(xdrs, &(cap->vers)) &&
-	    xdr_u_long(xdrs, &(cap->proc))) {
-		lenposition = XDR_GETPOS(xdrs);
-		if (! xdr_u_long(xdrs, &(cap->arglen)))
-		    return (FALSE);
-		argposition = XDR_GETPOS(xdrs);
-		if (! (*(cap->xdr_args))(xdrs, cap->args_ptr))
-		    return (FALSE);
-		position = XDR_GETPOS(xdrs);
-		cap->arglen = (u_long)position - (u_long)argposition;
-		XDR_SETPOS(xdrs, lenposition);
-		if (! xdr_u_long(xdrs, &(cap->arglen)))
-		    return (FALSE);
-		XDR_SETPOS(xdrs, position);
-		return (TRUE);
-	}
-	return (FALSE);
-}
-
-/*
- * XDR remote call results
- * written for XDR_DECODE direction only
- */
-bool_t
-xdr_rmtcallres(XDR *xdrs, struct rmtcallres *crp)
-{
-	caddr_t port_ptr;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(crp != NULL);
-
-	port_ptr = (caddr_t)(void *)crp->port_ptr;
-	if (xdr_reference(xdrs, &port_ptr, (u_int)sizeof(u_long),
-	    (xdrproc_t)xdr_u_long) && xdr_u_long(xdrs, &crp->resultslen)) {
-		crp->port_ptr = (u_long *)(void *)port_ptr;
-		return ((*(crp->xdr_results))(xdrs, crp->results_ptr));
-	}
-	return (FALSE);
-}
diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
deleted file mode 100644
index f9fd7f7e9..000000000
--- a/lib/libc/rpc/rpc.3
+++ /dev/null
@@ -1,416 +0,0 @@
-.\" @(#)rpc.3n 1.31 93/08/31 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\"	$NetBSD: rpc.3,v 1.24 2012/05/13 15:47:38 wiz Exp $
-.Dd May 7, 1993
-.Dt RPC 3
-.Os
-.Sh NAME
-.Nm rpc
-.Nd library routines for remote procedure calls
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.In netconfig.h
-.Sh DESCRIPTION
-These
-routines allow C language programs to make procedure
-calls on other machines across a network.
-First, the client sends a request to the server.
-On receipt of the request, the server calls a dispatch routine
-to perform the requested service, and then sends back a reply.
-.Pp
-All
-RPC routines require the header
-.In rpc/rpc.h .
-Routines that take a
-.Fa netconfig
-structure also require that
-.In netconfig.h
-be included.
-.Ss Nettype
-Some of the high-level
-RPC interface routines take a
-.Fa nettype
-string as one of the parameters
-(for example,
-.Fn clnt_create ,
-.Fn svc_create ,
-.Fn rpc_reg ,
-.Fn rpc_call .
-This string defines a class of transports which can be used
-for a particular application.
-.Pp
-.Fa nettype
-can be one of the following:
-.Bl -tag -width datagram_v
-.It netpath
-Choose from the transports which have been
-indicated by their token names in the
-.Ev NETPATH
-environment variable.
-If
-.Ev NETPATH
-is unset or
-.Dv NULL
-, it defaults to
-.Fa visible .
-.Fa netpath
-is the default
-.Fa nettype .
-.It visible
-Choose the transports which have the visible flag (v)
-set in the
-.Pa /etc/netconfig
-file.
-.It circuit_v
-This is same as
-.Fa visible
-except that it chooses only the connection oriented transports
-(semantics
-.Fa tpi_cots
-or
-.Fa tpi_cots_ord )
-from the entries in the
-.Pa /etc/netconfig
-file.
-.It datagram_v
-This is same as
-.Fa visible
-except that it chooses only the connectionless datagram transports
-(semantics
-.Fa tpi_clts )
-from the entries in the
-.Pa /etc/netconfig
-file.
-.It circuit_n
-This is same as
-.Fa netpath
-except that it chooses only the connection oriented datagram transports
-(semantics
-.Fa tpi_cots
-or
-.Fa tpi_cots_ord ) .
-.It datagram_n
-This is same as
-.Fa netpath
-except that it chooses only the connectionless datagram transports
-(semantics
-.Fa tpi_clts ) .
-.It udp
-This refers to Internet UDP, both version 4 and 6.
-.It tcp
-This refers to Internet TCP, both version 4 and 6.
-.El
-.Pp
-If
-.Fa nettype
-is
-.Dv NULL ,
-it defaults to
-.Fa netpath .
-The transports are tried in left to right order in the
-.Ev NETPATH
-variable or in top to down order in the
-.Pa /etc/netconfig
-file.
-.Ss Derived Types
-The derived types used in the RPC interfaces are defined as follows:
-.Bd -literal
-	typedef uint32_t rpcprog_t;
-	typedef uint32_t rpcvers_t;
-	typedef uint32_t rpcproc_t;
-	typedef uint32_t rpcprot_t;
-	typedef uint32_t rpcport_t;
-	typedef   int32_t rpc_inline_t;
-.Ed
-.Ss Data Structures
-Some of the data structures used by the
-RPC package are shown below.
-.Ss The AUTH Structure
-.Bd -literal
-/*
- * Authentication info. Opaque to client.
- */
-struct opaque_auth {
-    enum_t    oa_flavor;    /* flavor of auth */
-    caddr_t    oa_base;    /* address of more auth stuff */
-    u_int    oa_length;    /* not to exceed MAX_AUTH_BYTES */
-};
-
-/*
- * Auth handle, interface to client side authenticators.
- */
-typedef struct {
-    struct    opaque_auth    ah_cred;
-    struct    opaque_auth    ah_verf;
-    struct auth_ops {
-        void    (*ah_nextverf)(\|);
-        int    (*ah_marshal)(\|);    /* nextverf \*[Am] serialize */
-        int    (*ah_validate)(\|);    /* validate verifier */
-        int    (*ah_refresh)(\|);    /* refresh credentials */
-        void    (*ah_destroy)(\|);    /* destroy this structure */
-    } *ah_ops;
-    caddr_t ah_private;
-} AUTH;
-.Ed
-.Ss The CLIENT Structure
-.Bd -literal
-/*
- * Client rpc handle.
- * Created by individual implementations.
- * Client is responsible for initializing auth.
- */
-
-typedef struct {
-    AUTH    *cl_auth;    /* authenticator */
-    struct clnt_ops {
-        enum clnt_stat    (*cl_call)();    /* call remote procedure */
-        void    (*cl_abort)();        /* abort a call */
-        void    (*cl_geterr)();        /* get specific error code */
-        bool_t    (*cl_freeres)();    /* frees results */
-        void    (*cl_destroy)();    /* destroy this structure */
-        bool_t    (*cl_control)();    /* the ioctl() of rpc */
-    } *cl_ops;
-    caddr_t    cl_private;    /* private stuff */
-    char    *cl_netid;    /* network identifier */
-    char    *cl_tp;        /* device name */
-} CLIENT;
-.Ed
-.Ss The SVCXPRT structure
-.Bd -literal
-enum xprt_stat {
-    XPRT_DIED,
-    XPRT_MOREREQS,
-    XPRT_IDLE
-};
-
-/*
- * Server side transport handle
- */
-typedef struct {
-    int    xp_fd;    /* file descriptor for the server handle */
-    u_short    xp_port;    /* obsolete */
-    const struct xp_ops {
-        bool_t    (*xp_recv)();    /* receive incoming requests */
-        enum xprt_stat    (*xp_stat)();    /* get transport status */
-        bool_t    (*xp_getargs)();    /* get arguments */
-        bool_t    (*xp_reply)();      /* send reply */
-        bool_t    (*xp_freeargs)(); /* free mem allocated for args */
-        void    (*xp_destroy)();    /* destroy this struct */
-    } *xp_ops;
-    int    xp_addrlen;    /* length of remote addr.  Obsolete */
-    struct sockaddr_in    xp_raddr; /* Obsolete */
-    const struct xp_ops2 {
-        bool_t    (*xp_control)();    /* catch-all function */
-    } *xp_ops2;
-    char    *xp_tp;    /* transport provider device name */
-    char    *xp_netid;    /* network identifier */
-    struct netbuf    xp_ltaddr;    /* local transport address */
-    struct netbuf    xp_rtaddr;    /* remote transport address */
-    struct opaque_auth    xp_verf;    /* raw response verifier */
-    caddr_t    xp_p1;    /* private: for use by svc ops */
-    caddr_t    xp_p2;    /* private: for use by svc ops */
-    caddr_t    xp_p3;    /* private: for use by svc lib */
-    int    xp_type    /* transport type */
-} SVCXPRT;
-.Ed
-.Ss The svc_req structure
-.Bd -literal
-struct svc_req {
-    rpcprog_t    rq_prog;    /* service program number */
-    rpcvers_t    rq_vers;    /* service protocol version */
-    rpcproc_t    rq_proc;    /* the desired procedure */
-    struct opaque_auth    rq_cred;    /* raw creds from the wire */
-    caddr_t    rq_clntcred;    /* read only cooked cred */
-    SVCXPRT    *rq_xprt;    /* associated transport */
-};
-.Ed
-.Ss The XDR structure
-.Bd -literal
-/*
- * XDR operations.
- * XDR_ENCODE causes the type to be encoded into the stream.
- * XDR_DECODE causes the type to be extracted from the stream.
- * XDR_FREE can be used to release the space allocated by an XDR_DECODE
- * request.
- */
-enum xdr_op {
-    XDR_ENCODE=0,
-    XDR_DECODE=1,
-    XDR_FREE=2
-};
-/*
- * This is the number of bytes per unit of external data.
- */
-#define BYTES_PER_XDR_UNIT    (4)
-#define RNDUP(x)  ((((x) + BYTES_PER_XDR_UNIT - 1) /
-                   BYTES_PER_XDR_UNIT) \e * BYTES_PER_XDR_UNIT)
-
-/*
- * A xdrproc_t exists for each data type which is to be encoded or
- * decoded.  The second argument to the xdrproc_t is a pointer to
- * an opaque pointer.  The opaque pointer generally points to a
- * structure of the data type to be decoded.  If this points to 0,
- * then the type routines should allocate dynamic storage of the
- * appropriate size and return it.
- */
-typedef  bool_t (*xdrproc_t)(XDR *, const void *);
-
-/*
- * The XDR handle.
- * Contains operation which is being applied to the stream,
- * an operations vector for the particular implementation
- */
-typedef struct {
-    enum xdr_op    x_op;    /* operation; fast additional param */
-    struct xdr_ops {
-        bool_t    (*x_getlong)();    /* get a long from underlying stream */
-        bool_t    (*x_putlong)();    /* put a long to underlying stream */
-        bool_t    (*x_getbytes)(); /* get bytes from underlying stream */
-        bool_t    (*x_putbytes)(); /* put bytes to underlying stream */
-        u_int    (*x_getpostn)(); /* returns bytes off from beginning */
-        bool_t    (*x_setpostn)(); /* lets you reposition the stream */
-        long *    (*x_inline)();    /* buf quick ptr to buffered data */
-        void    (*x_destroy)();    /* free privates of this xdr_stream */
-    } *x_ops;
-    caddr_t    x_public;    /* users' data */
-    caddr_t    x_private;    /* pointer to private data */
-    caddr_t    x_base;    /* private used for position info */
-    int    x_handy;    /* extra private word */
-} XDR;
-
-/*
- * The netbuf structure. This structure is defined in \*[Lt]xti.h\*[Gt] on SysV
- * systems, but NetBSD does not use XTI.
- *
- * Usually, buf will point to a struct sockaddr, and len and maxlen
- * will contain the length and maximum length of that socket address,
- * respectively.
- */
-struct netbuf {
-	unsigned int maxlen;
-	unsigned int len;
-	void *buf;
-};
-
-/*
- * The format of the address and options arguments of the XTI t_bind call.
- * Only provided for compatibility, it should not be used other than
- * as an argument to svc_tli_create().
- */
-
-struct t_bind {
-	struct netbuf   addr;
-	unsigned int    qlen;
-};
-.Ed
-.Ss Index to Routines
-The following table lists RPC routines and the manual reference
-pages on which they are described:
-.Bl -column "authunix_create_default()" "rpc_clnt_create(3)"
-.It Em "RPC Routine" Ta Em "Manual Reference Page"
-.Pp
-.It Fn auth_destroy Ta Xr rpc_clnt_auth 3
-.It Fn authdes_create Ta Xr rpc_soc 3
-.It Fn authnone_create Ta Xr rpc_clnt_auth 3
-.It Fn authsys_create Ta Xr rpc_clnt_auth 3
-.It Fn authsys_create_default Ta Xr rpc_clnt_auth 3
-.It Fn authunix_create Ta Xr rpc_soc 3
-.It Fn authunix_create_default Ta Xr rpc_soc 3
-.It Fn callrpc Ta Xr rpc_soc 3
-.It Fn clnt_broadcast Ta Xr rpc_soc 3
-.It Fn clnt_call Ta Xr rpc_clnt_calls 3
-.It Fn clnt_control Ta Xr rpc_clnt_create 3
-.It Fn clnt_create Ta Xr rpc_clnt_create 3
-.It Fn clnt_destroy Ta Xr rpc_clnt_create 3
-.It Fn clnt_dg_create Ta Xr rpc_clnt_create 3
-.It Fn clnt_freeres Ta Xr rpc_clnt_calls 3
-.It Fn clnt_geterr Ta Xr rpc_clnt_calls 3
-.It Fn clnt_pcreateerror Ta Xr rpc_clnt_create 3
-.It Fn clnt_perrno Ta Xr rpc_clnt_calls 3
-.It Fn clnt_perror Ta Xr rpc_clnt_calls 3
-.It Fn clnt_raw_create Ta Xr rpc_clnt_create 3
-.It Fn clnt_spcreateerror Ta Xr rpc_clnt_create 3
-.It Fn clnt_sperrno Ta Xr rpc_clnt_calls 3
-.It Fn clnt_sperror Ta Xr rpc_clnt_calls 3
-.It Fn clnt_tli_create Ta Xr rpc_clnt_create 3
-.It Fn clnt_tp_create Ta Xr rpc_clnt_create 3
-.It Fn clnt_udpcreate Ta Xr rpc_soc 3
-.It Fn clnt_vc_create Ta Xr rpc_clnt_create 3
-.It Fn clntraw_create Ta Xr rpc_soc 3
-.It Fn clnttcp_create Ta Xr rpc_soc 3
-.It Fn clntudp_bufcreate Ta Xr rpc_soc 3
-.It Fn get_myaddress Ta Xr rpc_soc 3
-.It Fn pmap_getmaps Ta Xr rpc_soc 3
-.It Fn pmap_getport Ta Xr rpc_soc 3
-.It Fn pmap_rmtcall Ta Xr rpc_soc 3
-.It Fn pmap_set Ta Xr rpc_soc 3
-.It Fn pmap_unset Ta Xr rpc_soc 3
-.It Fn registerrpc Ta Xr rpc_soc 3
-.It Fn rpc_broadcast Ta Xr rpc_clnt_calls 3
-.It Fn rpc_broadcast_exp Ta Xr rpc_clnt_calls 3
-.It Fn rpc_call Ta Xr rpc_clnt_calls 3
-.It Fn rpc_reg Ta Xr rpc_svc_calls 3
-.It Fn svc_create Ta Xr rpc_svc_create 3
-.It Fn svc_destroy Ta Xr rpc_svc_create 3
-.It Fn svc_dg_create Ta Xr rpc_svc_create 3
-.It Fn svc_dg_enablecache Ta Xr rpc_svc_calls 3
-.It Fn svc_fd_create Ta Xr rpc_svc_create 3
-.It Fn svc_fds Ta Xr rpc_soc 3
-.It Fn svc_freeargs Ta Xr rpc_svc_reg 3
-.It Fn svc_getargs Ta Xr rpc_svc_reg 3
-.It Fn svc_getcaller Ta Xr rpc_soc 3
-.It Fn svc_getreq Ta Xr rpc_soc 3
-.It Fn svc_getreqset Ta Xr rpc_svc_calls 3
-.It Fn svc_getrpccaller Ta Xr rpc_svc_calls 3
-.It Fn svc_kerb_reg Ta Xr kerberos_rpc 3
-.It Fn svc_raw_create Ta Xr rpc_svc_create 3
-.It Fn svc_reg Ta Xr rpc_svc_calls 3
-.It Fn svc_register Ta Xr rpc_soc 3
-.It Fn svc_run Ta Xr rpc_svc_reg 3
-.It Fn svc_sendreply Ta Xr rpc_svc_reg 3
-.It Fn svc_tli_create Ta Xr rpc_svc_create 3
-.It Fn svc_tp_create Ta Xr rpc_svc_create 3
-.It Fn svc_unreg Ta Xr rpc_svc_calls 3
-.It Fn svc_unregister Ta  Xr rpc_soc 3
-.It Fn svc_vc_create Ta Xr rpc_svc_create 3
-.It Fn svcerr_auth Ta Xr rpc_svc_err 3
-.It Fn svcerr_decode Ta Xr rpc_svc_err 3
-.It Fn svcerr_noproc Ta Xr rpc_svc_err 3
-.It Fn svcerr_noprog Ta Xr rpc_svc_err 3
-.It Fn svcerr_progvers Ta Xr rpc_svc_err 3
-.It Fn svcerr_systemerr Ta Xr rpc_svc_err 3
-.It Fn svcerr_weakauth Ta Xr rpc_svc_err 3
-.It Fn svcfd_create Ta Xr rpc_soc 3
-.It Fn svcraw_create Ta Xr rpc_soc 3
-.It Fn svctcp_create Ta Xr rpc_soc 3
-.It Fn svcudp_bufcreate Ta Xr rpc_soc 3
-.It Fn svcudp_create Ta Xr rpc_soc 3
-.It Fn xdr_accepted_reply Ta Xr rpc_xdr 3
-.It Fn xdr_authsys_parms Ta Xr rpc_xdr 3
-.It Fn xdr_authunix_parms Ta Xr rpc_soc 3
-.It Fn xdr_callhdr Ta Xr rpc_xdr 3
-.It Fn xdr_callmsg Ta Xr rpc_xdr 3
-.It Fn xdr_opaque_auth Ta Xr rpc_xdr 3
-.It Fn xdr_rejected_reply Ta Xr rpc_xdr 3
-.It Fn xdr_replymsg Ta Xr rpc_xdr 3
-.It Fn xprt_register Ta Xr rpc_svc_calls 3
-.It Fn xprt_unregister Ta Xr rpc_svc_calls 3
-.El
-.Sh FILES
-.Pa /etc/netconfig
-.Sh SEE ALSO
-.Xr getnetconfig 3 ,
-.Xr getnetpath 3 ,
-.Xr rpc_clnt_auth 3 ,
-.Xr rpc_clnt_calls 3 ,
-.Xr rpc_clnt_create 3 ,
-.Xr rpc_svc_calls 3 ,
-.Xr rpc_svc_create 3 ,
-.Xr rpc_svc_err 3 ,
-.Xr rpc_svc_reg 3 ,
-.Xr rpc_xdr 3 ,
-.Xr rpcbind 3 ,
-.Xr xdr 3 ,
-.Xr netconfig 5
diff --git a/lib/libc/rpc/rpc_callmsg.c b/lib/libc/rpc/rpc_callmsg.c
deleted file mode 100644
index 80d6adc33..000000000
--- a/lib/libc/rpc/rpc_callmsg.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*	$NetBSD: rpc_callmsg.c,v 1.20 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)rpc_callmsg.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: rpc_callmsg.c,v 1.20 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * rpc_callmsg.c
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- */
-
-#include "namespace.h"
-
-#include <sys/param.h>
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-
-#ifdef __weak_alias
-__weak_alias(xdr_callmsg,_xdr_callmsg)
-#endif
-
-/*
- * XDR a call message
- */
-bool_t
-xdr_callmsg(XDR *xdrs, struct rpc_msg *cmsg)
-{
-	int32_t *buf;
-	struct opaque_auth *oa;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(cmsg != NULL);
-
-	if (xdrs->x_op == XDR_ENCODE) {
-		if (cmsg->rm_call.cb_cred.oa_length > MAX_AUTH_BYTES) {
-			return (FALSE);
-		}
-		if (cmsg->rm_call.cb_verf.oa_length > MAX_AUTH_BYTES) {
-			return (FALSE);
-		}
-		buf = XDR_INLINE(xdrs, 8 * BYTES_PER_XDR_UNIT
-			+ RNDUP(cmsg->rm_call.cb_cred.oa_length)
-			+ 2 * BYTES_PER_XDR_UNIT
-			+ RNDUP(cmsg->rm_call.cb_verf.oa_length));
-		if (buf != NULL) {
-			IXDR_PUT_INT32(buf, cmsg->rm_xid);
-			IXDR_PUT_ENUM(buf, cmsg->rm_direction);
-			if (cmsg->rm_direction != CALL) {
-				return (FALSE);
-			}
-			IXDR_PUT_INT32(buf, cmsg->rm_call.cb_rpcvers);
-			if (cmsg->rm_call.cb_rpcvers != RPC_MSG_VERSION) {
-				return (FALSE);
-			}
-			IXDR_PUT_INT32(buf, cmsg->rm_call.cb_prog);
-			IXDR_PUT_INT32(buf, cmsg->rm_call.cb_vers);
-			IXDR_PUT_INT32(buf, cmsg->rm_call.cb_proc);
-			oa = &cmsg->rm_call.cb_cred;
-			IXDR_PUT_ENUM(buf, oa->oa_flavor);
-			IXDR_PUT_INT32(buf, oa->oa_length);
-			if (oa->oa_length) {
-				memmove(buf, oa->oa_base, oa->oa_length);
-				buf += RNDUP(oa->oa_length) / sizeof (int32_t);
-			}
-			oa = &cmsg->rm_call.cb_verf;
-			IXDR_PUT_ENUM(buf, oa->oa_flavor);
-			IXDR_PUT_INT32(buf, oa->oa_length);
-			if (oa->oa_length) {
-				memmove(buf, oa->oa_base, oa->oa_length);
-				/* no real need....
-				buf += RNDUP(oa->oa_length) / sizeof (int32_t);
-				*/
-			}
-			return (TRUE);
-		}
-	}
-	if (xdrs->x_op == XDR_DECODE) {
-		buf = XDR_INLINE(xdrs, 8 * BYTES_PER_XDR_UNIT);
-		if (buf != NULL) {
-			cmsg->rm_xid = IXDR_GET_U_INT32(buf);
-			cmsg->rm_direction = IXDR_GET_ENUM(buf, enum msg_type);
-			if (cmsg->rm_direction != CALL) {
-				return (FALSE);
-			}
-			cmsg->rm_call.cb_rpcvers = IXDR_GET_U_INT32(buf);
-			if (cmsg->rm_call.cb_rpcvers != RPC_MSG_VERSION) {
-				return (FALSE);
-			}
-			cmsg->rm_call.cb_prog = IXDR_GET_U_INT32(buf);
-			cmsg->rm_call.cb_vers = IXDR_GET_U_INT32(buf);
-			cmsg->rm_call.cb_proc = IXDR_GET_U_INT32(buf);
-			oa = &cmsg->rm_call.cb_cred;
-			oa->oa_flavor = IXDR_GET_ENUM(buf, enum_t);
-			oa->oa_length = (u_int)IXDR_GET_U_INT32(buf);
-			if (oa->oa_length) {
-				if (oa->oa_length > MAX_AUTH_BYTES) {
-					return (FALSE);
-				}
-				if (oa->oa_base == NULL) {
-					oa->oa_base = mem_alloc(oa->oa_length);
-					if (oa->oa_base == NULL)
-						return (FALSE);
-				}
-				buf = XDR_INLINE(xdrs, RNDUP(oa->oa_length));
-				if (buf == NULL) {
-					if (xdr_opaque(xdrs, oa->oa_base,
-					    oa->oa_length) == FALSE) {
-						return (FALSE);
-					}
-				} else {
-					memmove(oa->oa_base, buf,
-					    oa->oa_length);
-					/* no real need....
-					buf += RNDUP(oa->oa_length) /
-						sizeof (int32_t);
-					*/
-				}
-			}
-			oa = &cmsg->rm_call.cb_verf;
-			buf = XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT);
-			if (buf == NULL) {
-				if (xdr_enum(xdrs, &oa->oa_flavor) == FALSE ||
-				    xdr_u_int(xdrs, &oa->oa_length) == FALSE) {
-					return (FALSE);
-				}
-			} else {
-				oa->oa_flavor = IXDR_GET_ENUM(buf, enum_t);
-				oa->oa_length = (u_int)IXDR_GET_U_INT32(buf);
-			}
-			if (oa->oa_length) {
-				if (oa->oa_length > MAX_AUTH_BYTES) {
-					return (FALSE);
-				}
-				if (oa->oa_base == NULL) {
-					oa->oa_base = mem_alloc(oa->oa_length);
-					if (oa->oa_base == NULL)
-						return (FALSE);
-				}
-				buf = XDR_INLINE(xdrs, RNDUP(oa->oa_length));
-				if (buf == NULL) {
-					if (xdr_opaque(xdrs, oa->oa_base,
-					    oa->oa_length) == FALSE) {
-						return (FALSE);
-					}
-				} else {
-					memmove(oa->oa_base, buf,
-					    oa->oa_length);
-					/* no real need...
-					buf += RNDUP(oa->oa_length) /
-						sizeof (int32_t);
-					*/
-				}
-			}
-			return (TRUE);
-		}
-	}
-	if (
-	    xdr_u_int32_t(xdrs, &(cmsg->rm_xid)) &&
-	    xdr_enum(xdrs, (enum_t *)(void *)&(cmsg->rm_direction)) &&
-	    (cmsg->rm_direction == CALL) &&
-	    xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) &&
-	    (cmsg->rm_call.cb_rpcvers == RPC_MSG_VERSION) &&
-	    xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_prog)) &&
-	    xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_vers)) &&
-	    xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_proc)) &&
-	    xdr_opaque_auth(xdrs, &(cmsg->rm_call.cb_cred)) )
-		return (xdr_opaque_auth(xdrs, &(cmsg->rm_call.cb_verf)));
-	return (FALSE);
-}
diff --git a/lib/libc/rpc/rpc_clnt_auth.3 b/lib/libc/rpc/rpc_clnt_auth.3
deleted file mode 100644
index 242958b8a..000000000
--- a/lib/libc/rpc/rpc_clnt_auth.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\" @(#)rpc_clnt_auth.3n 1.21 93/05/07 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_clnt_auth 1.4 89/07/20 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\"	$NetBSD: rpc_clnt_auth.3,v 1.6 2003/04/16 13:34:43 wiz Exp $
-.Dd May 7, 1993
-.Dt RPC_CLNT_AUTH 3
-.Os
-.Sh NAME
-.Nm auth_destroy ,
-.Nm authnone_create ,
-.Nm authsys_create ,
-.Nm authsys_create_default
-.Nd library routines for client side remote procedure call authentication
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft "void"
-.Fn auth_destroy "AUTH *auth"
-.Ft "AUTH *"
-.Fn authnone_create "void"
-.Ft "AUTH *"
-.Fn authsys_create "const char *host" "const uid_t uid" "const gid_t gid" "const int len" "const gid_t *aup_gids"
-.Ft "AUTH *"
-.Fn authsys_create_default "void"
-.Sh DESCRIPTION
-These routines are part of the
-RPC library that allows C language programs to make procedure
-calls on other machines across the network,
-with desired authentication.
-.Pp
-These routines are normally called after creating the
-.Dv CLIENT
-handle.
-The
-.Fa cl_auth
-field of the
-.Dv CLIENT
-structure should be initialized by the
-.Dv AUTH
-structure returned by some of the following routines.
-The client's authentication information
-is passed to the server when the
-RPC
-call is made.
-.Pp
-Only the
-.Dv NULL
-and the
-.Dv SYS
-style of authentication is discussed here.
-.Sh ROUTINES
-.Bl -tag -width authsys_create_default()
-.It Fn auth_destroy
-A function macro that destroys the authentication
-information associated with
-.Fa auth .
-Destruction usually involves deallocation
-of private data structures.
-The use of
-.Fn auth
-is undefined after calling
-.Fn auth_destroy .
-.Pp
-.It Fn authnone_create
-Create and return an RPC
-authentication handle that passes nonusable
-authentication information with each remote procedure call.
-This is the default authentication used by RPC.
-.Pp
-.It Fn authsys_create
-Create and return an RPC authentication handle that contains
-.Dv AUTH_SYS
-authentication information.
-The parameter
-.Fa host
-is the name of the machine on which the information was
-created;
-.Fa uid
-is the user's user ID;
-.Fa gid
-is the user's current group ID;
-.Fa len
-and
-.Fa aup_gids
-refer to a counted array of groups to which the user belongs.
-.Pp
-.It Fn authsys_create_default
-Call
-.Fn authsys_create
-with the appropriate parameters.
-.El
-.Sh SEE ALSO
-.Xr rpc 3 ,
-.Xr rpc_clnt_calls 3 ,
-.Xr rpc_clnt_create 3
diff --git a/lib/libc/rpc/rpc_clnt_calls.3 b/lib/libc/rpc/rpc_clnt_calls.3
deleted file mode 100644
index 2f464a1e9..000000000
--- a/lib/libc/rpc/rpc_clnt_calls.3
+++ /dev/null
@@ -1,296 +0,0 @@
-.\" @(#)rpc_clnt_calls.3n 1.30 93/08/31 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_clnt_calls 1.4 89/07/20 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\"	$NetBSD: rpc_clnt_calls.3,v 1.7 2005/12/03 15:16:19 yamt Exp $
-.Dd December 4, 2005
-.Dt RPC_CLNT_CALLS 3
-.Os
-.Sh NAME
-.Nm rpc_clnt_calls ,
-.Nm clnt_call ,
-.Nm clnt_freeres ,
-.Nm clnt_geterr ,
-.Nm clnt_perrno ,
-.Nm clnt_perror ,
-.Nm clnt_sperrno ,
-.Nm clnt_sperror ,
-.Nm rpc_broadcast ,
-.Nm rpc_broadcast_exp ,
-.Nm rpc_call
-.Nd library routines for client side calls
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft "enum clnt_stat"
-.Fn clnt_call "CLIENT *clnt" "const rpcproc_t procnum" "const xdrproc_t inproc" "const char *in" "const xdrproc_t outproc" "caddr_t out" "const struct timeval tout"
-.Ft bool_t
-.Fn clnt_freeres "CLIENT *clnt" "const xdrproc_t outproc" "caddr_t out"
-.Ft void
-.Fn clnt_geterr "const CLIENT * clnt" "struct rpc_err * errp"
-.Ft void
-.Fn clnt_perrno "const enum clnt_stat stat"
-.Ft void
-.Fn clnt_perror "const CLIENT * clnt" "const char *s"
-.Ft "char *"
-.Fn clnt_sperrno "const enum clnt_stat stat"
-.Ft "char *"
-.Fn clnt_sperror "const CLIENT *clnt" "const char * s"
-.\" Note the clustered Fn arguments. It can't take more than 9. XXX
-.Ft "enum clnt_stat"
-.Fn rpc_broadcast "const rpcprog_t prognum, const rpcvers_t versnum" "const rpcproc_t procnum" "const xdrproc_t inproc" "const char *in" "const xdrproc_t outproc" "caddr_t out" "const resultproc_t eachresult" "const char *nettype"
-.Ft "enum clnt_stat"
-.Fn rpc_broadcast_exp "rpcprog_t prognum, const rpcvers_t versnum" "const rpcproc_t procnum, const xdrproc_t xargs" "caddr_t argsp, const xdrproc_t xresults" "caddr_t resultsp" "const int inittime" "const int waittime" "const resultproc_t eachresult" "const char * nettype"
-.Ft "enum clnt_stat"
-.Fn rpc_call "const char *host, const rpcprog_t prognum" "const rpcvers_t versnum" "const rpcproc_t procnum, const xdrproc_t inproc" "const char *in" "const xdrproc_t outproc" "char *out" "const char *nettype"
-.Sh DESCRIPTION
-RPC library routines allow C language programs to make procedure
-calls on other machines across the network.
-First, the client calls a procedure to send a request to the server.
-Upon receipt of the request, the server calls a dispatch routine
-to perform the requested service, and then sends back a reply.
-.Pp
-The
-.Fn clnt_call ,
-.Fn rpc_call ,
-and
-.Fn rpc_broadcast
-routines handle the client side of the procedure call.
-The remaining routines deal with error handling in the case of errors.
-.Pp
-Some of the routines take a
-.Dv CLIENT
-handle as one of the parameters.
-A
-.Dv CLIENT
-handle can be created by an RPC creation routine such as
-.Fn clnt_create
-(see
-.Xr rpc_clnt_create 3 ) .
-.Pp
-These routines are safe for use in multithreaded applications.
-.Dv CLIENT
-handles can be shared between threads, however in this implementation
-requests by different threads are serialized (that is, the first request will
-receive its results before the second request is sent).
-.Sh ROUTINES
-See
-.Xr rpc 3
-for the definition of the
-.Dv CLIENT
-data structure.
-.Pp
-.Bl -tag -width XXXXX
-.It Fn clnt_call
-A function macro that calls the remote procedure
-.Fa procnum
-associated with the client handle,
-.Fa clnt ,
-which is obtained with an RPC
-client creation routine such as
-.Fn clnt_create
-(see
-.Xr rpc_clnt_create 3 ) .
-The parameter
-.Fn inproc
-is the XDR function used to encode the procedure's parameters, and
-.Fn outproc
-is the XDR function used to decode the procedure's results;
-.Fn in
-is the address of the procedure's argument(s), and
-.Fn out
-is the address of where to place the result(s).
-.Fn tout
-is the time allowed for results to be returned, which is overridden by
-a time-out set explicitly through
-.Fn clnt_control ,
-see
-.Xr rpc_clnt_create 3 .
-If the remote call succeeds, the status returned is
-.Dv RPC_SUCCESS ,
-otherwise an appropriate status is returned.
-.Pp
-.It Fn clnt_freeres
-A function macro that frees any data allocated by the
-RPC/XDR system when it decoded the results of an RPC call.
-The parameter
-.Fa out
-is the address of the results, and
-.Fa outproc
-is the XDR routine describing the results.
-This routine returns 1 if the results were successfully freed,
-and 0 otherwise.
-.Pp
-.It Fn clnt_geterr
-A function macro that copies the error structure out of the client
-handle to the structure at address
-.Fa errp .
-.Pp
-.It Fn clnt_perrno
-Print a message to standard error corresponding
-to the condition indicated by
-.Fa stat .
-A newline is appended.
-Normally used after a procedure call fails for a routine
-for which a client handle is not needed, for instance
-.Fn rpc_call .
-.Pp
-.It Fn clnt_perror
-Print a message to the standard error indicating why an
-RPC call failed;
-.Fa clnt
-is the handle used to do the call.
-The message is prepended with string
-.Fa s
-and a colon.
-A newline is appended.
-Normally used after a remote procedure call fails
-for a routine which requires a client handle,
-for instance
-.Fn clnt_call .
-.Pp
-.It Fn clnt_sperrno
-Take the same arguments as
-.Fn clnt_perrno ,
-but instead of sending a message to the standard error
-indicating why an RPC
-call failed, return a pointer to a string which contains the message.
-.Fn clnt_sperrno
-is normally used instead of
-.Fn clnt_perrno
-when the program does not have a standard error (as a program
-running as a server quite likely does not), or if the programmer
-does not want the message to be output with
-.Fn printf
-(see
-.Xr printf 3 ) ,
-or if a message format different than that supported by
-.Fn clnt_perrno
-is to be used.
-Note:
-unlike
-.Fn clnt_sperror
-and
-.Fn clnt_spcreaterror
-(see
-.Xr rpc_clnt_create 3 ) ,
-.Fn clnt_sperrno
-does not return pointer to static data so the
-result will not get overwritten on each call.
-.Pp
-.It Fn clnt_sperror
-Like
-.Fn clnt_perror ,
-except that (like
-.Fn clnt_sperrno )
-it returns a string instead of printing to standard error.
-However,
-.Fn clnt_sperror
-does not append a newline at the end of the message.
-Warning:
-returns pointer to a buffer that is overwritten
-on each call.
-.Pp
-.It Fn rpc_broadcast
-Like
-.Fn rpc_call ,
-except the call message is broadcast to
-all the connectionless transports specified by
-.Fa nettype .
-If
-.Fa nettype
-is
-.Dv NULL ,
-it defaults to
-.Dq netpath .
-Each time it receives a response,
-this routine calls
-.Fn eachresult ,
-whose form is:
-.Ft bool_t
-.Fn eachresult "caddr_t out" "const struct netbuf * addr" "const struct netconfig * netconf"
-where
-.Fa out
-is the same as
-.Fa out
-passed to
-.Fn rpc_broadcast ,
-except that the remote procedure's output is decoded there;
-.Fa addr
-points to the address of the machine that sent the results, and
-.Fa netconf
-is the netconfig structure of the transport on which the remote
-server responded.
-If
-.Fn eachresult
-returns 0,
-.Fn rpc_broadcast
-waits for more replies;
-otherwise it returns with appropriate status.
-Warning:
-broadcast file descriptors are limited in size to the
-maximum transfer size of that transport.
-For Ethernet, this value is 1500 bytes.
-.Fn rpc_broadcast
-uses
-.Dv AUTH_SYS
-credentials by default (see
-.Xr rpc_clnt_auth 3 ) .
-.Pp
-.It Fn rpc_broadcast_exp
-Like
-.Fn rpc_broadcast ,
-except that the initial timeout,
-.Fa inittime
-and the maximum timeout,
-.Fa waittime
-are specified in milliseconds.
-.Fa inittime
-is the initial time that
-.Fn rpc_broadcast_exp
-waits before resending the request.
-After the first resend, the re-transmission interval
-increases exponentially until it exceeds
-.Fa waittime .
-.Pp
-.It Fn rpc_call
-Call the remote procedure associated with
-.Fa prognum ,
-.Fa versnum ,
-and
-.Fa procnum
-on the machine,
-.Fa host .
-The parameter
-.Fa inproc
-is used to encode the procedure's parameters, and
-.Fa outproc
-is used to decode the procedure's results;
-.Fa in
-is the address of the procedure's argument(s), and
-.Fa out
-is the address of where to place the result(s).
-.Fa nettype
-can be any of the values listed on
-.Xr rpc 3 .
-This routine returns
-.Dv RPC_SUCCESS
-if it succeeds, or an appropriate status is returned.
-Use the
-.Fn clnt_perrno
-routine to translate failure status into error messages.
-Warning:
-.Fn rpc_call
-uses the first available transport belonging
-to the class
-.Fa nettype ,
-on which it can create a connection.
-You do not have control of timeouts or authentication
-using this routine.
-.El
-.Sh SEE ALSO
-.Xr printf 3 ,
-.Xr rpc 3 ,
-.Xr rpc_clnt_auth 3 ,
-.Xr rpc_clnt_create 3
diff --git a/lib/libc/rpc/rpc_clnt_create.3 b/lib/libc/rpc/rpc_clnt_create.3
deleted file mode 100644
index 0d29b30a1..000000000
--- a/lib/libc/rpc/rpc_clnt_create.3
+++ /dev/null
@@ -1,443 +0,0 @@
-.\" @(#)rpc_clnt_create.3n 1.36 93/08/31 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_clnt_create 1.5 89/07/24 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\"	$NetBSD: rpc_clnt_create.3,v 1.12 2011/05/17 03:35:39 enami Exp $
-.Dd May 23, 2009
-.Dt RPC_CLNT_CREATE 3
-.Os
-.Sh NAME
-.Nm rpc_clnt_create ,
-.Nm clnt_control ,
-.Nm clnt_create ,
-.Nm clnt_create_vers ,
-.Nm clnt_destroy ,
-.Nm clnt_dg_create ,
-.Nm clnt_pcreateerror ,
-.Nm clnt_raw_create ,
-.Nm clnt_spcreateerror ,
-.Nm clnt_tli_create ,
-.Nm clnt_tp_create ,
-.Nm clnt_vc_create ,
-.Nm rpc_createerr
-.Nd "library routines for dealing with creation and manipulation of CLIENT handles"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft bool_t
-.Fn clnt_control "CLIENT *clnt" "const u_int req" "char *info"
-.Ft "CLIENT *"
-.Fn clnt_create "const char * host" "const rpcprog_t prognum" "const rpcvers_t versnum" "const char *nettype"
-.Ft "CLIENT *"
-.Fn clnt_create_vers "const char * host" "const rpcprog_t prognum" "rpcvers_t *vers_outp" "const rpcvers_t vers_low" "const rpcvers_t vers_high" "char *nettype"
-.Ft void
-.Fn clnt_destroy "CLIENT * clnt"
-.Ft "CLIENT *"
-.Fn clnt_dg_create "const int fildes" "const struct netbuf *svcaddr" "const rpcprog_t prognum" "const rpcvers_t versnum" "const u_int sendsz" "const u_int recvsz"
-.Ft void
-.Fn clnt_pcreateerror "const char *s"
-.Ft "char *"
-.Fn clnt_spcreateerror "const char *s"
-.Ft "CLIENT *"
-.Fn clnt_raw_create "const rpcprog_t prognum" "const rpcvers_t versnum"
-.Ft "CLIENT *"
-.Fn clnt_tli_create "const int fildes" "const struct netconfig *netconf" "const struct netbuf *svcaddr" "const rpcprog_t prognum" "const rpcvers_t versnum" "const u_int sendsz" "const u_int recvsz"
-.Ft "CLIENT *"
-.Fn clnt_tp_create "const char * host" "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf"
-.Ft "CLIENT *"
-.Fn clnt_vc_create "const int fildes" "const struct netbuf *svcaddr" "const rpcprog_t prognum" "const rpcvers_t versnum" "const u_int sendsz" "const u_int recvsz"
-.Sh DESCRIPTION
-RPC library routines allow C language programs to make procedure
-calls on other machines across the network.
-First a
-.Dv CLIENT
-handle is created and then the client calls a procedure to send a
-request to the server.
-On receipt of the request, the server calls a dispatch routine
-to perform the requested service, and then sends a reply.
-.Sh ROUTINES
-.Bl -tag -width YYYYYYY
-.It Fn clnt_control
-A function macro to change or retrieve various information
-about a client object.
-.Fa req
-indicates the type of operation, and
-.Fa info
-is a pointer to the information.
-For both connectionless and connection-oriented transports,
-the supported values of
-.Fa req
-and their argument types and what they do are:
-.Bl -column "CLSET_FD_NCLOSE" "struct timeval *" "set total timeout"
-.It Dv CLSET_TIMEOUT Ta "struct timeval *" Ta "set total timeout"
-.It Dv CLGET_TIMEOUT Ta "struct timeval *" Ta "get total timeout"
-.El
-.Pp
-Note:
-if you set the timeout using
-.Fn clnt_control ,
-the timeout argument passed by
-.Fn clnt_call
-is ignored in all subsequent calls.
-.Pp
-Note:
-If you set the timeout value to 0
-.Fn clnt_control
-immediately returns an error
-.Pq Dv RPC_TIMEDOUT .
-Set the timeout parameter to 0 for batching calls.
-.Bl -column CLSET_FD_NCLOSE "struct timeval *" "do not close fd on destroy"
-.It Dv CLGET_SVC_ADDR Ta "struct netbuf *" Ta "get servers address"
-.It Dv CLGET_FD Ta "int *" Ta "get fd from handle"
-.It Dv CLSET_FD_CLOSE Ta "void" Ta "close fd on destroy"
-.It Dv CLSET_FD_NCLOSE Ta void Ta "don't close fd on destroy"
-.It Dv CLGET_VERS Ta "unsigned long *" Ta "get RPC program version"
-.It Dv CLSET_VERS Ta "unsigned long *" Ta "set RPC program version"
-.It Dv CLGET_XID Ta "unsigned long *" Ta "get XID of previous call"
-.It Dv CLSET_XID Ta "unsigned long *" Ta "set XID of next call"
-.El
-.Pp
-The following operations are valid for connectionless transports only:
-.Bl -column CLSET_RETRY_TIMEOUT "struct timeval *" "set total timeout"
-.It Dv CLSET_RETRY_TIMEOUT Ta "struct timeval *" Ta "set the retry timeout"
-.It Dv CLGET_RETRY_TIMEOUT Ta "struct timeval *" Ta "get the retry timeout"
-.El
-.Pp
-The retry timeout is the time that RPC
-waits for the server to reply before retransmitting the request.
-.Fn clnt_control
-returns
-.Dv TRUE
-on success and
-.Dv FALSE
-on failure.
-.Pp
-.It Fn clnt_create
-Generic client creation routine for program
-.Fa prognum
-and version
-.Fa versnum .
-.Fa host
-identifies the name of the remote host where the server
-is located.
-.Fa nettype
-indicates the class of transport protocol to use.
-The transports are tried in left to right order in
-.Ev NETPATH
-environment variable or in top to bottom order in
-the netconfig database.
-.Fn clnt_create
-tries all the transports of the
-.Fa nettype
-class available from the
-.Ev NETPATH
-environment variable and the netconfig database,
-and chooses the first successful one.
-A default timeout is set and can be modified using
-.Fn clnt_control .
-This routine returns
-.Dv NULL
-if it fails.
-The
-.Fn clnt_pcreateerror
-routine can be used to print the reason for failure.
-.Pp
-Note:
-.Fn clnt_create
-returns a valid client handle even
-if the particular version number supplied to
-.Fn clnt_create
-is not registered with the
-.Xr rpcbind 8
-service.
-This mismatch will be discovered by a
-.Fn clnt_call
-later (see
-.Xr rpc_clnt_calls 3 ) .
-.Pp
-.It Fn clnt_create_vers
-Generic client creation routine which is similar to
-.Fn clnt_create
-but which also checks for the
-version availability.
-.Fa host
-identifies the name of the remote host where the server
-is located.
-.Fa nettype
-indicates the class transport protocols to be used.
-If the routine is successful it returns a client handle created for
-the highest version between
-.Fa vers_low
-and
-.Fa vers_high
-that is supported by the server.
-.Fa vers_outp
-is set to this value.
-That is, after a successful return
-.Fa vers_low
-\*[Le]
-.Fa *vers_outp
-\*[Le]
-.Fa vers_high .
-If no version between
-.Fa vers_low
-and
-.Fa vers_high
-is supported by the server then the routine fails and returns
-.Dv NULL .
-A default timeout is set and can be modified using
-.Fn clnt_control .
-This routine returns
-.Dv NULL
-if it fails.
-The
-.Fn clnt_pcreateerror
-routine can be used to print the reason for failure.
-Note:
-.Fn clnt_create
-returns a valid client handle even
-if the particular version number supplied to
-.Fn clnt_create
-is not registered with the
-.Xr rpcbind 8
-service.
-This mismatch will be discovered by a
-.Fn clnt_call
-later (see
-.Xr rpc_clnt_calls 3 ) .
-However,
-.Fn clnt_create_vers
-does this for you and returns a valid handle
-only if a version within
-the range supplied is supported by the server.
-.Pp
-.It Fn clnt_destroy
-A function macro that destroys the client's RPC handle.
-Destruction usually involves deallocation
-of private data structures, including
-.Fa clnt
-itself.
-Use of
-.Fa clnt
-is undefined after calling
-.Fn clnt_destroy .
-If the RPC library opened the associated file descriptor, or
-.Dv CLSET_FD_CLOSE
-was set using
-.Fn clnt_control ,
-the file descriptor will be closed.
-The caller should call
-.Fn auth_destroy "clnt-\*[Gt]cl_auth"
-(before calling
-.Fn clnt_destroy )
-to destroy the associated
-.Dv AUTH
-structure (see
-.Xr rpc_clnt_auth 3 ) .
-.Pp
-.It Fn clnt_dg_create
-This routine creates an RPC client for the remote program
-.Fa prognum
-and version
-.Fa versnum ;
-the client uses a connectionless transport.
-The remote program is located at address
-.Fa svcaddr .
-The parameter
-.Fa fildes
-is an open and bound file descriptor.
-This routine will resend the call message in intervals of
-15 seconds until a response is received or until the
-call times out.
-The total time for the call to time out is specified by
-.Fn clnt_call
-(see
-.Fn clnt_call
-in
-.Xr rpc_clnt_calls 3 ) .
-The retry time out and the total time out periods can
-be changed using
-.Fn clnt_control .
-The user may set the size of the send and receive
-buffers with the parameters
-.Fa sendsz
-and
-.Fa recvsz ;
-values of 0 choose suitable defaults.
-This routine returns
-.Dv NULL
-if it fails.
-.Pp
-.It Fn clnt_pcreateerror
-Print a message to standard error indicating
-why a client RPC handle could not be created.
-The message is prepended with the string
-.Fa s
-and a colon, and appended with a newline.
-.Pp
-.It Fn clnt_spcreateerror
-Like
-.Fn clnt_pcreateerror ,
-except that it returns a string
-instead of printing to the standard error.
-A newline is not appended to the message in this case.
-Warning:
-returns a pointer to a buffer that is overwritten
-on each call.
-.Pp
-.It Fn clnt_raw_create
-This routine creates an RPC
-client handle for the remote program
-.Fa prognum
-and version
-.Fa versnum .
-The transport used to pass messages to the service is
-a buffer within the process's address space,
-so the corresponding RPC
-server should live in the same address space;
-(see
-.Fn svc_raw_create
-in
-.Xr rpc_svc_create 3 ) .
-This allows simulation of RPC and measurement of
-RPC overheads, such as round trip times,
-without any kernel or networking interference.
-This routine returns
-.Dv NULL
-if it fails.
-.Fn clnt_raw_create
-should be called after
-.Fn svc_raw_create .
-.Pp
-.It Fn clnt_tli_create
-This routine creates an RPC
-client handle for the remote program
-.Fa prognum
-and version
-.Fa versnum .
-The remote program is located at address
-.Fa svcaddr .
-If
-.Fa svcaddr
-is
-.Dv NULL
-and it is connection-oriented, it is assumed that the file descriptor
-is connected.
-For connectionless transports, if
-.Fa svcaddr
-is
-.Dv NULL ,
-.Dv RPC_UNKNOWNADDR
-error is set.
-.Fa fildes
-is a file descriptor which may be open, bound and connected.
-If it is
-.Dv RPC_ANYFD ,
-it opens a file descriptor on the transport specified by
-.Fa netconf .
-If
-.Fa fildes
-is
-.Dv RPC_ANYFD
-and
-.Fa netconf
-is
-.Dv NULL ,
-a
-.Dv RPC_UNKNOWNPROTO
-error is set.
-If
-.Fa fildes
-is unbound, then it will attempt to bind the descriptor.
-The user may specify the size of the buffers with the parameters
-.Fa sendsz
-and
-.Fa recvsz ;
-values of 0 choose suitable defaults.
-Depending upon the type of the transport (connection-oriented
-or connectionless),
-.Fn clnt_tli_create
-calls appropriate client creation routines.
-This routine returns
-.Dv NULL
-if it fails.
-The
-.Fn clnt_pcreateerror
-routine can be used to print the reason for failure.
-The remote rpcbind
-service (see
-.Xr rpcbind 8 )
-is not consulted for the address of the remote
-service.
-.Pp
-.It Fn clnt_tp_create
-Like
-.Fn clnt_create
-except
-.Fn clnt_tp_create
-tries only one transport specified through
-.Fa netconf .
-.Fn clnt_tp_create
-creates a client handle for the program
-.Fa prognum ,
-the version
-.Fa versnum ,
-and for the transport specified by
-.Fa netconf .
-Default options are set,
-which can be changed using
-.Fn clnt_control
-calls.
-The remote rpcbind service on the host
-.Fa host
-is consulted for the address of the remote service.
-This routine returns
-.Dv NULL
-if it fails.
-The
-.Fn clnt_pcreateerror
-routine can be used to print the reason for failure.
-.Pp
-.It Fn clnt_vc_create
-This routine creates an RPC
-client for the remote program
-.Fa prognum
-and version
-.Fa versnum ;
-the client uses a connection-oriented transport.
-The remote program is located at address
-.Fa svcaddr .
-The parameter
-.Fa fildes
-is an open and bound file descriptor.
-The user may specify the size of the send and receive buffers
-with the parameters
-.Fa sendsz
-and
-.Fa recvsz ;
-values of 0 choose suitable defaults.
-This routine returns
-.Dv NULL
-if it fails.
-The address
-.Fa svcaddr
-should not be
-.Dv NULL
-and should point to the actual address of the remote program.
-.Fn clnt_vc_create
-does not consult the remote rpcbind service for this information.
-.Pp
-.It struct rpc_createerr rpc_createerr;
-A global variable whose value is set by any RPC
-client handle creation routine
-that fails.
-It is used by the routine
-.Fn clnt_pcreateerror
-to print the reason for the failure.
-.El
-.Sh SEE ALSO
-.Xr rpc 3 ,
-.Xr rpc_clnt_auth 3 ,
-.Xr rpc_clnt_calls 3 ,
-.Xr rpcbind 8
diff --git a/lib/libc/rpc/rpc_commondata.c b/lib/libc/rpc/rpc_commondata.c
deleted file mode 100644
index ab27fe629..000000000
--- a/lib/libc/rpc/rpc_commondata.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: rpc_commondata.c,v 1.9 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)rpc_commondata.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: rpc_commondata.c,v 1.9 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-#include <rpc/rpc.h>
-
-/*
- * This file should only contain common data (global data) that is exported
- * by public interfaces 
- */
-struct opaque_auth _null_auth;
-fd_set svc_fdset;
-int svc_maxfd = -1;
-#ifndef _REENTRANT
-#undef rpc_createerr
-struct rpc_createerr rpc_createerr;
-#endif
diff --git a/lib/libc/rpc/rpc_dtablesize.c b/lib/libc/rpc/rpc_dtablesize.c
deleted file mode 100644
index 6561fe93f..000000000
--- a/lib/libc/rpc/rpc_dtablesize.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: rpc_dtablesize.c,v 1.16 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";
-static char *sccsid = "@(#)rpc_dtablesize.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: rpc_dtablesize.c,v 1.16 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-#include "namespace.h"
-
-#include <unistd.h>
-
-int _rpc_dtablesize(void);	/* XXX */
-
-/*
- * Cache the result of sysconf(_SC_OPEN_MAX), so we don't have to do an
- * expensive system call every time.
- */
-int
-_rpc_dtablesize(void)
-{
-	static int size;
-	if (size == 0)
-		size = (int)sysconf(_SC_OPEN_MAX);
-	return (size);
-}
diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c
deleted file mode 100644
index 6912eafbc..000000000
--- a/lib/libc/rpc/rpc_generic.c
+++ /dev/null
@@ -1,897 +0,0 @@
-/*	$NetBSD: rpc_generic.c,v 1.29 2013/04/05 03:17:38 dholland Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #pragma ident	"@(#)rpc_generic.c	1.17	94/04/24 SMI" */
-
-/*
- * rpc_generic.c, Miscl routines for RPC.
- *
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: rpc_generic.c,v 1.29 2013/04/05 03:17:38 dholland Exp $");
-#endif
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/resource.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <rpc/rpc.h>
-#include <assert.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <netdb.h>
-#include <netconfig.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <rpc/nettype.h>
-
-#include "svc_fdset.h"
-#include "rpc_internal.h"
-
-#ifdef __weak_alias
-__weak_alias(taddr2uaddr,_taddr2uaddr)
-__weak_alias(uaddr2taddr,_uaddr2taddr)
-#endif
-
-struct handle {
-	NCONF_HANDLE *nhandle;
-	int nflag;		/* Whether NETPATH or NETCONFIG */
-	int nettype;
-};
-
-static const struct _rpcnettype {
-	const char *name;
-	const int type;
-} _rpctypelist[] = {
-	{ "netpath", _RPC_NETPATH },
-	{ "visible", _RPC_VISIBLE },
-	{ "circuit_v", _RPC_CIRCUIT_V },
-	{ "datagram_v", _RPC_DATAGRAM_V },
-	{ "circuit_n", _RPC_CIRCUIT_N },
-	{ "datagram_n", _RPC_DATAGRAM_N },
-	{ "tcp", _RPC_TCP },
-	{ "udp", _RPC_UDP },
-	{ 0, _RPC_NONE }
-};
-
-struct netid_af {
-	const char	*netid;
-	int		af;
-	int		protocol;
-};
-
-static const struct netid_af na_cvt[] = {
-	{ "udp",  AF_INET,  IPPROTO_UDP },
-	{ "tcp",  AF_INET,  IPPROTO_TCP },
-#ifdef INET6
-	{ "udp6", AF_INET6, IPPROTO_UDP },
-	{ "tcp6", AF_INET6, IPPROTO_TCP },
-#endif
-	{ "local", AF_LOCAL, 0 }
-};
-
-#if 0
-static char *strlocase(char *);
-#endif
-static int getnettype(const char *);
-
-/*
- * Cache the result of getrlimit(), so we don't have to do an
- * expensive call every time.
- */
-int
-__rpc_dtbsize(void)
-{
-	static int tbsize;
-	struct rlimit rl;
-
-	if (tbsize) {
-		return (tbsize);
-	}
-	if (getrlimit(RLIMIT_NOFILE, &rl) == 0) {
-		return (tbsize = (int)rl.rlim_max);
-	}
-	/*
-	 * Something wrong.  I'll try to save face by returning a
-	 * pessimistic number.
-	 */
-	return (32);
-}
-
-
-/*
- * Find the appropriate buffer size
- */
-u_int
-/*ARGSUSED*/
-__rpc_get_t_size(
-	int af,
-	int proto,
-	int size)	/* Size requested */
-{
-	int maxsize, defsize;
-
-	maxsize = 256 * 1024;	/* XXX */
-	switch (proto) {
-	case IPPROTO_TCP:
-		defsize = 64 * 1024;	/* XXX */
-		break;
-	case IPPROTO_UDP:
-		defsize = UDPMSGSIZE;
-		break;
-	default:
-		defsize = RPC_MAXDATASIZE;
-		break;
-	}
-	if (size == 0)
-		return defsize;
-
-	/* Check whether the value is within the upper max limit */
-	return (size > maxsize ? (u_int)maxsize : (u_int)size);
-}
-
-/*
- * Find the appropriate address buffer size
- */
-u_int
-__rpc_get_a_size(int af)
-{
-	switch (af) {
-	case AF_INET:
-		return sizeof (struct sockaddr_in);
-#ifdef INET6
-	case AF_INET6:
-		return sizeof (struct sockaddr_in6);
-#endif
-	case AF_LOCAL:
-		return sizeof (struct sockaddr_un);
-	default:
-		break;
-	}
-	return ((u_int)RPC_MAXADDRSIZE);
-}
-
-#if 0
-static char *
-strlocase(char *p)
-{
-	char *t = p;
-
-	_DIAGASSERT(p != NULL);
-
-	for (; *p; p++)
-		if (isupper(*p))
-			*p = tolower(*p);
-	return (t);
-}
-#endif
-
-/*
- * Returns the type of the network as defined in <rpc/nettype.h>
- * If nettype is NULL, it defaults to NETPATH.
- */
-static int
-getnettype(const char *nettype)
-{
-	int i;
-
-	if ((nettype == NULL) || (nettype[0] == 0)) {
-		return (_RPC_NETPATH);	/* Default */
-	}
-
-#if 0
-	nettype = strlocase(nettype);
-#endif
-	for (i = 0; _rpctypelist[i].name; i++)
-		if (strcasecmp(nettype, _rpctypelist[i].name) == 0) {
-			return (_rpctypelist[i].type);
-		}
-	return (_rpctypelist[i].type);
-}
-
-/*
- * For the given nettype (tcp or udp only), return the first structure found.
- * This should be freed by calling freenetconfigent()
- */
-
-#ifdef _REENTRANT
-static thread_key_t tcp_key, udp_key;
-static once_t __rpc_getconfigp_once = ONCE_INITIALIZER;
-
-static void
-__rpc_getconfigp_setup(void)
-{
-
-	thr_keycreate(&tcp_key, free);
-	thr_keycreate(&udp_key, free);
-}
-#endif
-
-struct netconfig *
-__rpc_getconfip(const char *nettype)
-{
-	char *netid;
-	char *netid_tcp = NULL;
-	char *netid_udp = NULL;
-	static char *netid_tcp_main;
-	static char *netid_udp_main;
-	struct netconfig *dummy;
-#ifdef _REENTRANT
-	if (__isthreaded == 0) {
-		netid_udp = netid_udp_main;
-		netid_tcp = netid_tcp_main;
-	} else {
-		thr_once(&__rpc_getconfigp_once, __rpc_getconfigp_setup);
-		netid_tcp = thr_getspecific(tcp_key);
-		netid_udp = thr_getspecific(udp_key);
-	}
-#else
-	netid_udp = netid_udp_main;
-	netid_tcp = netid_tcp_main;
-#endif
-
-	_DIAGASSERT(nettype != NULL);
-
-	if (!netid_udp && !netid_tcp) {
-		struct netconfig *nconf;
-		void *confighandle;
-
-		if (!(confighandle = setnetconfig())) {
-			syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-			return (NULL);
-		}
-		while ((nconf = getnetconfig(confighandle)) != NULL) {
-			if (strcmp(nconf->nc_protofmly, NC_INET) == 0) {
-				if (strcmp(nconf->nc_proto, NC_TCP) == 0) {
-					netid_tcp = strdup(nconf->nc_netid);
-					if (netid_tcp == NULL)
-						return NULL;
-#ifdef _REENTRANT
-					if (__isthreaded == 0)
-						netid_tcp_main = netid_tcp;
-					else
-						thr_setspecific(tcp_key,
-							(void *) netid_tcp);
-#else
-					netid_tcp_main = netid_tcp;
-#endif
-				} else
-				if (strcmp(nconf->nc_proto, NC_UDP) == 0) {
-					netid_udp = strdup(nconf->nc_netid);
-					if (netid_udp == NULL)
-						return NULL;
-#ifdef _REENTRANT
-					if (__isthreaded == 0)
-						netid_udp_main = netid_udp;
-					else
-						thr_setspecific(udp_key,
-							(void *) netid_udp);
-#else
-					netid_udp_main = netid_udp;
-#endif
-				}
-			}
-		}
-		endnetconfig(confighandle);
-	}
-	if (strcmp(nettype, "udp") == 0)
-		netid = netid_udp;
-	else if (strcmp(nettype, "tcp") == 0)
-		netid = netid_tcp;
-	else {
-		return (NULL);
-	}
-	if ((netid == NULL) || (netid[0] == 0)) {
-		return (NULL);
-	}
-	dummy = getnetconfigent(netid);
-	return (dummy);
-}
-
-/*
- * Returns the type of the nettype, which should then be used with
- * __rpc_getconf().
- */
-void *
-__rpc_setconf(const char *nettype)
-{
-	struct handle *handle;
-
-	/* nettype may be NULL; getnettype() supports that */
-
-	handle = malloc(sizeof(*handle));
-	if (handle == NULL) {
-		return (NULL);
-	}
-	switch (handle->nettype = getnettype(nettype)) {
-	case _RPC_NETPATH:
-	case _RPC_CIRCUIT_N:
-	case _RPC_DATAGRAM_N:
-		if (!(handle->nhandle = setnetpath())) {
-			free(handle);
-			return (NULL);
-		}
-		handle->nflag = TRUE;
-		break;
-	case _RPC_VISIBLE:
-	case _RPC_CIRCUIT_V:
-	case _RPC_DATAGRAM_V:
-	case _RPC_TCP:
-	case _RPC_UDP:
-		if (!(handle->nhandle = setnetconfig())) {
-		        syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-			free(handle);
-			return (NULL);
-		}
-		handle->nflag = FALSE;
-		break;
-	default:
-		free(handle);
-		return (NULL);
-	}
-
-	return (handle);
-}
-
-/*
- * Returns the next netconfig struct for the given "net" type.
- * __rpc_setconf() should have been called previously.
- */
-struct netconfig *
-__rpc_getconf(void *vhandle)
-{
-	struct handle *handle;
-	struct netconfig *nconf;
-
-	handle = (struct handle *)vhandle;
-	if (handle == NULL) {
-		return (NULL);
-	}
-	for (;;) {
-		if (handle->nflag)
-			nconf = getnetpath(handle->nhandle);
-		else
-			nconf = getnetconfig(handle->nhandle);
-		if (nconf == NULL)
-			break;
-		if ((nconf->nc_semantics != NC_TPI_CLTS) &&
-			(nconf->nc_semantics != NC_TPI_COTS) &&
-			(nconf->nc_semantics != NC_TPI_COTS_ORD))
-			continue;
-		switch (handle->nettype) {
-		case _RPC_VISIBLE:
-			if (!(nconf->nc_flag & NC_VISIBLE))
-				continue;
-			/* FALLTHROUGH */
-		case _RPC_NETPATH:	/* Be happy */
-			break;
-		case _RPC_CIRCUIT_V:
-			if (!(nconf->nc_flag & NC_VISIBLE))
-				continue;
-			/* FALLTHROUGH */
-		case _RPC_CIRCUIT_N:
-			if ((nconf->nc_semantics != NC_TPI_COTS) &&
-				(nconf->nc_semantics != NC_TPI_COTS_ORD))
-				continue;
-			break;
-		case _RPC_DATAGRAM_V:
-			if (!(nconf->nc_flag & NC_VISIBLE))
-				continue;
-			/* FALLTHROUGH */
-		case _RPC_DATAGRAM_N:
-			if (nconf->nc_semantics != NC_TPI_CLTS)
-				continue;
-			break;
-		case _RPC_TCP:
-			if (((nconf->nc_semantics != NC_TPI_COTS) &&
-				(nconf->nc_semantics != NC_TPI_COTS_ORD)) ||
-				(strcmp(nconf->nc_protofmly, NC_INET)
-#ifdef INET6
-				 && strcmp(nconf->nc_protofmly, NC_INET6))
-#else
-				)
-#endif
-				||
-				strcmp(nconf->nc_proto, NC_TCP))
-				continue;
-			break;
-		case _RPC_UDP:
-			if ((nconf->nc_semantics != NC_TPI_CLTS) ||
-				(strcmp(nconf->nc_protofmly, NC_INET)
-#ifdef INET6
-				&& strcmp(nconf->nc_protofmly, NC_INET6))
-#else
-				)
-#endif
-				||
-				strcmp(nconf->nc_proto, NC_UDP))
-				continue;
-			break;
-		}
-		break;
-	}
-	return (nconf);
-}
-
-void
-__rpc_endconf(void *vhandle)
-{
-	struct handle *handle;
-
-	handle = (struct handle *) vhandle;
-	if (handle == NULL) {
-		return;
-	}
-	if (handle->nflag) {
-		endnetpath(handle->nhandle);
-	} else {
-		endnetconfig(handle->nhandle);
-	}
-	free(handle);
-}
-
-/*
- * Used to ping the NULL procedure for clnt handle.
- * Returns NULL if fails, else a non-NULL pointer.
- */
-void *
-rpc_nullproc(CLIENT *clnt)
-{
-	struct timeval TIMEOUT = {25, 0};
-
-	if (clnt_call(clnt, NULLPROC, (xdrproc_t) xdr_void, NULL,
-		(xdrproc_t) xdr_void, NULL, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return ((void *) clnt);
-}
-
-/*
- * Try all possible transports until
- * one succeeds in finding the netconf for the given fd.
- */
-struct netconfig *
-__rpcgettp(int fd)
-{
-	const char *netid;
-	struct __rpc_sockinfo si;
-
-	if (!__rpc_fd2sockinfo(fd, &si))
-		return NULL;
-
-	if (!__rpc_sockinfo2netid(&si, &netid))
-		return NULL;
-
-	return getnetconfigent(__UNCONST(netid));
-}
-
-int
-__rpc_fd2sockinfo(int fd, struct __rpc_sockinfo *sip)
-{
-	socklen_t len;
-	int type, proto;
-	struct sockaddr_storage ss;
-
-	_DIAGASSERT(sip != NULL);
-
-	len = sizeof ss;
-	if (getsockname(fd, (struct sockaddr *)(void *)&ss, &len) < 0)
-		return 0;
-	sip->si_alen = len;
-
-	len = sizeof type;
-	if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &type, &len) < 0)
-		return 0;
-
-	/* XXX */
-	if (ss.ss_family != AF_LOCAL) {
-		if (type == SOCK_STREAM)
-			proto = IPPROTO_TCP;
-		else if (type == SOCK_DGRAM)
-			proto = IPPROTO_UDP;
-		else
-			return 0;
-	} else
-		proto = 0;
-
-	sip->si_af = ss.ss_family;
-	sip->si_proto = proto;
-	sip->si_socktype = type;
-
-	return 1;
-}
-
-/*
- * Linear search, but the number of entries is small.
- */
-int
-__rpc_nconf2sockinfo(const struct netconfig *nconf, struct __rpc_sockinfo *sip)
-{
-	size_t i;
-
-	_DIAGASSERT(nconf != NULL);
-	_DIAGASSERT(sip != NULL);
-
-	for (i = 0; i < (sizeof na_cvt) / (sizeof (struct netid_af)); i++)
-		if (!strcmp(na_cvt[i].netid, nconf->nc_netid)) {
-			sip->si_af = na_cvt[i].af;
-			sip->si_proto = na_cvt[i].protocol;
-			sip->si_socktype =
-			    __rpc_seman2socktype((int)nconf->nc_semantics);
-			if (sip->si_socktype == -1)
-				return 0;
-			sip->si_alen = __rpc_get_a_size(sip->si_af);
-			return 1;
-		}
-
-	return 0;
-}
-
-int
-__rpc_nconf2fd(const struct netconfig *nconf)
-{
-	struct __rpc_sockinfo si;
-
-	_DIAGASSERT(nconf != NULL);
-
-	if (!__rpc_nconf2sockinfo(nconf, &si))
-		return 0;
-
-	return socket(si.si_af, si.si_socktype, si.si_proto);
-}
-
-int
-__rpc_sockinfo2netid(struct __rpc_sockinfo *sip, const char **netid)
-{
-	size_t i;
-
-	_DIAGASSERT(sip != NULL);
-	/* netid may be NULL */
-
-	for (i = 0; i < (sizeof na_cvt) / (sizeof (struct netid_af)); i++)
-		if (na_cvt[i].af == sip->si_af &&
-		    na_cvt[i].protocol == sip->si_proto) {
-			if (netid)
-				*netid = na_cvt[i].netid;
-			return 1;
-		}
-
-	return 0;
-}
-
-char *
-taddr2uaddr(const struct netconfig *nconf, const struct netbuf *nbuf)
-{
-	struct __rpc_sockinfo si;
-
-	_DIAGASSERT(nconf != NULL);
-	_DIAGASSERT(nbuf != NULL);
-
-	if (!__rpc_nconf2sockinfo(nconf, &si))
-		return NULL;
-	return __rpc_taddr2uaddr_af(si.si_af, nbuf);
-}
-
-struct netbuf *
-uaddr2taddr(const struct netconfig *nconf, const char *uaddr)
-{
-	struct __rpc_sockinfo si;
-
-	_DIAGASSERT(nconf != NULL);
-	_DIAGASSERT(uaddr != NULL);
-	
-	if (!__rpc_nconf2sockinfo(nconf, &si))
-		return NULL;
-	return __rpc_uaddr2taddr_af(si.si_af, uaddr);
-}
-
-char *
-__rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf)
-{
-	char *ret;
-	struct sockaddr_in *sinp;
-	struct sockaddr_un *sun;
-	char namebuf[INET_ADDRSTRLEN];
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-	char namebuf6[INET6_ADDRSTRLEN];
-#endif
-	u_int16_t port;
-
-	_DIAGASSERT(nbuf != NULL);
-
-	switch (af) {
-	case AF_INET:
-		sinp = nbuf->buf;
-		if (inet_ntop(af, &sinp->sin_addr, namebuf,
-		    (socklen_t)sizeof namebuf) == NULL)
-			return NULL;
-		port = ntohs(sinp->sin_port);
-		if (asprintf(&ret, "%s.%u.%u", namebuf, ((u_int32_t)port) >> 8,
-		    port & 0xff) < 0)
-			return NULL;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		sin6 = nbuf->buf;
-		if (inet_ntop(af, &sin6->sin6_addr, namebuf6,
-		    (socklen_t)sizeof namebuf6) == NULL)
-			return NULL;
-		port = ntohs(sin6->sin6_port);
-		if (asprintf(&ret, "%s.%u.%u", namebuf6, ((u_int32_t)port) >> 8,
-		    port & 0xff) < 0)
-			return NULL;
-		break;
-#endif
-	case AF_LOCAL:
-		sun = nbuf->buf;
-		sun->sun_path[sizeof(sun->sun_path) - 1] = '\0'; /* safety */
-		ret = strdup(sun->sun_path);
-		break;
-	default:
-		return NULL;
-	}
-
-	return ret;
-}
-
-struct netbuf *
-__rpc_uaddr2taddr_af(int af, const char *uaddr)
-{
-	struct netbuf *ret = NULL;
-	char *addrstr, *p;
-	unsigned port, portlo, porthi;
-	size_t len;
-	struct sockaddr_in *sinp;
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-#endif
-	struct sockaddr_un *sun;
-
-	_DIAGASSERT(uaddr != NULL);
-
-	addrstr = strdup(uaddr);
-	if (addrstr == NULL)
-		return NULL;
-
-	/*
-	 * AF_LOCAL addresses are expected to be absolute
-	 * pathnames, anything else will be AF_INET or AF_INET6.
-	 */
-	port = 0;
-	if (*addrstr != '/') {
-		p = strrchr(addrstr, '.');
-		if (p == NULL)
-			goto out;
-		portlo = (unsigned)atoi(p + 1);
-		*p = '\0';
-
-		p = strrchr(addrstr, '.');
-		if (p == NULL)
-			goto out;
-		porthi = (unsigned)atoi(p + 1);
-		*p = '\0';
-		port = (porthi << 8) | portlo;
-	}
-
-	ret = malloc(sizeof(*ret));
-	if (ret == NULL)
-		goto out;
-	
-	switch (af) {
-	case AF_INET:
-		sinp = malloc(sizeof(*sinp));
-		if (sinp == NULL)
-			goto out;
-		memset(sinp, 0, sizeof *sinp);
-		sinp->sin_family = AF_INET;
-		sinp->sin_port = htons(port);
-		if (inet_pton(AF_INET, addrstr, &sinp->sin_addr) <= 0) {
-			free(sinp);
-			free(ret);
-			ret = NULL;
-			goto out;
-		}
-		sinp->sin_len = ret->maxlen = ret->len = sizeof *sinp;
-		ret->buf = sinp;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		sin6 = malloc(sizeof(*sin6));
-		if (sin6 == NULL)
-			goto out;
-		memset(sin6, 0, sizeof *sin6);
-		sin6->sin6_family = AF_INET6;
-		sin6->sin6_port = htons(port);
-		if (inet_pton(AF_INET6, addrstr, &sin6->sin6_addr) <= 0) {
-			free(sin6);
-			free(ret);
-			ret = NULL;
-			goto out;
-		}
-		sin6->sin6_len = ret->maxlen = ret->len = sizeof *sin6;
-		ret->buf = sin6;
-		break;
-#endif
-	case AF_LOCAL:
-		sun = malloc(sizeof(*sun));
-		if (sun == NULL)
-			goto out;
-		memset(sun, 0, sizeof *sun);
-		sun->sun_family = AF_LOCAL;
-		strncpy(sun->sun_path, addrstr, sizeof(sun->sun_path) - 1);
-		len = SUN_LEN(sun);
-		_DIAGASSERT(__type_fit(uint8_t, len));
-		ret->len = ret->maxlen = sun->sun_len = (uint8_t)len;
-		ret->buf = sun;
-		break;
-	default:
-		break;
-	}
-out:
-	free(addrstr);
-	return ret;
-}
-
-int
-__rpc_seman2socktype(int semantics)
-{
-	switch (semantics) {
-	case NC_TPI_CLTS:
-		return SOCK_DGRAM;
-	case NC_TPI_COTS_ORD:
-		return SOCK_STREAM;
-	case NC_TPI_RAW:
-		return SOCK_RAW;
-	default:
-		break;
-	}
-
-	return -1;
-}
-
-int
-__rpc_socktype2seman(int socktype)
-{
-	switch (socktype) {
-	case SOCK_DGRAM:
-		return NC_TPI_CLTS;
-	case SOCK_STREAM:
-		return NC_TPI_COTS_ORD;
-	case SOCK_RAW:
-		return NC_TPI_RAW;
-	default:
-		break;
-	}
-
-	return -1;
-}
-
-/*
- * XXXX - IPv6 scope IDs can't be handled in universal addresses.
- * Here, we compare the original server address to that of the RPC
- * service we just received back from a call to rpcbind on the remote
- * machine. If they are both "link local" or "site local", copy
- * the scope id of the server address over to the service address.
- */
-/* ARGSUSED */
-int
-__rpc_fixup_addr(struct netbuf *new, const struct netbuf *svc)
-{
-#ifdef INET6
-	struct sockaddr *sa_new, *sa_svc;
-	struct sockaddr_in6 *sin6_new, *sin6_svc;
-
-	_DIAGASSERT(new != NULL);
-	_DIAGASSERT(svc != NULL);
-
-	sa_svc = (struct sockaddr *)svc->buf;
-	sa_new = (struct sockaddr *)new->buf;
-
-	if (sa_new->sa_family == sa_svc->sa_family &&
-	    sa_new->sa_family == AF_INET6) {
-		sin6_new = (struct sockaddr_in6 *)new->buf;
-		sin6_svc = (struct sockaddr_in6 *)svc->buf;
-
-		if ((IN6_IS_ADDR_LINKLOCAL(&sin6_new->sin6_addr) &&
-		     IN6_IS_ADDR_LINKLOCAL(&sin6_svc->sin6_addr)) ||
-		    (IN6_IS_ADDR_SITELOCAL(&sin6_new->sin6_addr) &&
-		     IN6_IS_ADDR_SITELOCAL(&sin6_svc->sin6_addr))) {
-			sin6_new->sin6_scope_id = sin6_svc->sin6_scope_id;
-		}
-	}
-#endif
-	return 1;
-}
-
-int
-__rpc_sockisbound(int fd)
-{
-	struct sockaddr_storage ss;
-	socklen_t slen;
-
-	slen = sizeof (struct sockaddr_storage);
-	if (getsockname(fd, (struct sockaddr *)(void *)&ss, &slen) < 0)
-		return 0;
-
-	switch (ss.ss_family) {
-		case AF_INET:
-			return (((struct sockaddr_in *)
-			    (void *)&ss)->sin_port != 0);
-#ifdef INET6
-		case AF_INET6:
-			return (((struct sockaddr_in6 *)
-			    (void *)&ss)->sin6_port != 0);
-#endif
-		case AF_LOCAL:
-			/* XXX check this */
-			return (((struct sockaddr_un *)
-			    (void *)&ss)->sun_path[0] != '\0');
-		default:
-			break;
-	}
-
-	return 0;
-}
-
-/*
- * For TCP transport, Host Requirements RFCs mandate
- * Nagle (RFC-896) processing.  But for RPC, Nagle
- * processing adds adds unwanted latency to the last,
- * partial TCP segment of each RPC message. See:
- *   R. W. Scheifler and J. Gettys, The X Window System,
- *   ACM Transactions on Graphics 16:8 (Aug. 1983), pp. 57-69. 
- * So for TCP transport, disable Nagle via TCP_NODELAY.
- * XXX: moral equivalent for non-TCP protocols?
- */
-int
-__rpc_setnodelay(int fd, const struct __rpc_sockinfo *si)
-{
-	int one = 1;
-	if (si->si_proto != IPPROTO_TCP)
-		return 0;
-	return setsockopt(fd, si->si_proto, TCP_NODELAY, &one,
-	    (socklen_t)sizeof(one));
-}
diff --git a/lib/libc/rpc/rpc_internal.h b/lib/libc/rpc/rpc_internal.h
deleted file mode 100644
index 2293273e5..000000000
--- a/lib/libc/rpc/rpc_internal.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: rpc_internal.h,v 1.7 2013/05/07 21:08:45 christos Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Frank van der Linden.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Private include file for XDR functions only used internally in libc.
- * These are not exported interfaces.
- */
-
-bool_t __xdrrec_getrec(XDR *, enum xprt_stat *, bool_t);
-bool_t __xdrrec_setnonblock(XDR *, int);
-void __xprt_unregister_unlocked(SVCXPRT *);
-bool_t __svc_clean_idle(fd_set *, int, bool_t);
-
-u_int __rpc_get_a_size(int);
-int __rpc_dtbsize(void);
-struct netconfig *__rpcgettp(int);
-int  __rpc_get_default_domain(char **);
-
-char *__rpc_taddr2uaddr_af(int, const struct netbuf *);
-struct netbuf *__rpc_uaddr2taddr_af(int, const char *);
-int __rpc_fixup_addr(struct netbuf *, const struct netbuf *);
-int __rpc_sockinfo2netid(struct __rpc_sockinfo *, const char **);
-int __rpc_seman2socktype(int);
-int __rpc_socktype2seman(int);
-void *rpc_nullproc(CLIENT *);
-int __rpc_sockisbound(int);
-
-struct netbuf *__rpcb_findaddr(rpcprog_t, rpcvers_t, const struct netconfig *,
-    const char *, CLIENT **);
-bool_t __rpc_control(int, void *);
-
-char *_get_next_token(char *, int);
-
-u_int32_t __rpc_getxid(void);
-#define __RPC_GETXID()	(__rpc_getxid())
-
-extern SVCXPRT **__svc_xports;
-extern int __svc_maxrec;
-
-int __clnt_sigfillset(sigset_t *);
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c
deleted file mode 100644
index 9c146411e..000000000
--- a/lib/libc/rpc/rpc_prot.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/*	$NetBSD: rpc_prot.c,v 1.21 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)rpc_prot.c	2.3 88/08/07 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: rpc_prot.c,v 1.21 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * rpc_prot.c
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * This set of routines implements the rpc message definition,
- * its serializer and some common rpc utility routines.
- * The routines are meant for various implementations of rpc -
- * they are NOT for the rpc client or rpc service implementations!
- * Because authentication stuff is easy and is part of rpc, the opaque
- * routines are also in this program.
- */
-
-#include "namespace.h"
-
-#include <sys/param.h>
-
-#include <assert.h>
-
-#include <rpc/rpc.h>
-
-#ifdef __weak_alias
-__weak_alias(xdr_accepted_reply,_xdr_accepted_reply)
-__weak_alias(xdr_callhdr,_xdr_callhdr)
-__weak_alias(xdr_des_block,_xdr_des_block)
-__weak_alias(xdr_opaque_auth,_xdr_opaque_auth)
-__weak_alias(xdr_rejected_reply,_xdr_rejected_reply)
-__weak_alias(xdr_replymsg,_xdr_replymsg)
-#endif
-
-static void accepted(enum accept_stat, struct rpc_err *);
-static void rejected(enum reject_stat, struct rpc_err *);
-
-/* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */
-
-/*
- * XDR an opaque authentication struct
- * (see auth.h)
- */
-bool_t
-xdr_opaque_auth(XDR *xdrs, struct opaque_auth *ap)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(ap != NULL);
-
-	if (xdr_enum(xdrs, &(ap->oa_flavor)))
-		return (xdr_bytes(xdrs, &ap->oa_base,
-			&ap->oa_length, MAX_AUTH_BYTES));
-	return (FALSE);
-}
-
-/*
- * XDR a DES block
- */
-bool_t
-xdr_des_block(XDR *xdrs, des_block *blkp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(blkp != NULL);
-
-	return (xdr_opaque(xdrs, (caddr_t)(void *)blkp,
-	    (u_int)sizeof(des_block)));
-}
-
-/* * * * * * * * * * * * * * XDR RPC MESSAGE * * * * * * * * * * * * * * * */
-
-/*
- * XDR the MSG_ACCEPTED part of a reply message union
- */
-bool_t 
-xdr_accepted_reply(XDR *xdrs, struct accepted_reply *ar)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(ar != NULL);
-
-	/* personalized union, rather than calling xdr_union */
-	if (! xdr_opaque_auth(xdrs, &(ar->ar_verf)))
-		return (FALSE);
-	if (! xdr_enum(xdrs, (enum_t *)(void *)&(ar->ar_stat)))
-		return (FALSE);
-	switch (ar->ar_stat) {
-
-	case SUCCESS:
-		return ((*(ar->ar_results.proc))(xdrs, ar->ar_results.where));
-
-	case PROG_MISMATCH:
-		if (! xdr_u_int32_t(xdrs, &(ar->ar_vers.low)))
-			return (FALSE);
-		return (xdr_u_int32_t(xdrs, &(ar->ar_vers.high)));
-
-	case GARBAGE_ARGS:
-	case SYSTEM_ERR:
-	case PROC_UNAVAIL:
-	case PROG_UNAVAIL:
-		break;
-	}
-	return (TRUE);  /* TRUE => open ended set of problems */
-}
-
-/*
- * XDR the MSG_DENIED part of a reply message union
- */
-bool_t 
-xdr_rejected_reply(XDR *xdrs, struct rejected_reply *rr)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(rr != NULL);
-
-	/* personalized union, rather than calling xdr_union */
-	if (! xdr_enum(xdrs, (enum_t *)(void *)&(rr->rj_stat)))
-		return (FALSE);
-	switch (rr->rj_stat) {
-
-	case RPC_MISMATCH:
-		if (! xdr_u_int32_t(xdrs, &(rr->rj_vers.low)))
-			return (FALSE);
-		return (xdr_u_int32_t(xdrs, &(rr->rj_vers.high)));
-
-	case AUTH_ERROR:
-		return (xdr_enum(xdrs, (enum_t *)(void *)&(rr->rj_why)));
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-static const struct xdr_discrim reply_dscrm[3] = {
-	{ (int)MSG_ACCEPTED, (xdrproc_t)xdr_accepted_reply },
-	{ (int)MSG_DENIED, (xdrproc_t)xdr_rejected_reply },
-	{ __dontcare__, NULL_xdrproc_t } };
-
-/*
- * XDR a reply message
- */
-bool_t
-xdr_replymsg(XDR *xdrs, struct rpc_msg *rmsg)
-{
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(rmsg != NULL);
-
-	if (
-	    xdr_u_int32_t(xdrs, &(rmsg->rm_xid)) && 
-	    xdr_enum(xdrs, (enum_t *)(void *)&(rmsg->rm_direction)) &&
-	    (rmsg->rm_direction == REPLY) )
-		return (xdr_union(xdrs, (enum_t *)(void *)&(rmsg->rm_reply.rp_stat),
-		   (caddr_t)(void *)&(rmsg->rm_reply.ru), reply_dscrm,
-		   NULL_xdrproc_t));
-	return (FALSE);
-}
-
-
-/*
- * Serializes the "static part" of a call message header.
- * The fields include: rm_xid, rm_direction, rpcvers, prog, and vers.
- * The rm_xid is not really static, but the user can easily munge on the fly.
- */
-bool_t
-xdr_callhdr(XDR *xdrs, struct rpc_msg *cmsg)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(cmsg != NULL);
-
-	cmsg->rm_direction = CALL;
-	cmsg->rm_call.cb_rpcvers = RPC_MSG_VERSION;
-	if (
-	    (xdrs->x_op == XDR_ENCODE) &&
-	    xdr_u_int32_t(xdrs, &(cmsg->rm_xid)) &&
-	    xdr_enum(xdrs, (enum_t *)(void *)&(cmsg->rm_direction)) &&
-	    xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) &&
-	    xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_prog)) )
-		return (xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_vers)));
-	return (FALSE);
-}
-
-/* ************************** Client utility routine ************* */
-
-static void
-accepted(enum accept_stat acpt_stat, struct rpc_err *error)
-{
-
-	_DIAGASSERT(error != NULL);
-
-	switch (acpt_stat) {
-
-	case PROG_UNAVAIL:
-		error->re_status = RPC_PROGUNAVAIL;
-		return;
-
-	case PROG_MISMATCH:
-		error->re_status = RPC_PROGVERSMISMATCH;
-		return;
-
-	case PROC_UNAVAIL:
-		error->re_status = RPC_PROCUNAVAIL;
-		return;
-
-	case GARBAGE_ARGS:
-		error->re_status = RPC_CANTDECODEARGS;
-		return;
-
-	case SYSTEM_ERR:
-		error->re_status = RPC_SYSTEMERROR;
-		return;
-
-	case SUCCESS:
-		error->re_status = RPC_SUCCESS;
-		return;
-	}
-	/* NOTREACHED */
-	/* something's wrong, but we don't know what ... */
-	error->re_status = RPC_FAILED;
-	error->re_lb.s1 = (int32_t)MSG_ACCEPTED;
-	error->re_lb.s2 = (int32_t)acpt_stat;
-}
-
-static void 
-rejected(enum reject_stat rjct_stat, struct rpc_err *error)
-{
-
-	_DIAGASSERT(error != NULL);
-
-	switch (rjct_stat) {
-	case RPC_MISMATCH:
-		error->re_status = RPC_VERSMISMATCH;
-		return;
-
-	case AUTH_ERROR:
-		error->re_status = RPC_AUTHERROR;
-		return;
-	}
-	/* something's wrong, but we don't know what ... */
-	/* NOTREACHED */
-	error->re_status = RPC_FAILED;
-	error->re_lb.s1 = (int32_t)MSG_DENIED;
-	error->re_lb.s2 = (int32_t)rjct_stat;
-}
-
-/*
- * given a reply message, fills in the error
- */
-void
-_seterr_reply(struct rpc_msg *msg, struct rpc_err *error)
-{
-
-	_DIAGASSERT(msg != NULL);
-	_DIAGASSERT(error != NULL);
-
-	/* optimized for normal, SUCCESSful case */
-	switch (msg->rm_reply.rp_stat) {
-
-	case MSG_ACCEPTED:
-		if (msg->acpted_rply.ar_stat == SUCCESS) {
-			error->re_status = RPC_SUCCESS;
-			return;
-		}
-		accepted(msg->acpted_rply.ar_stat, error);
-		break;
-
-	case MSG_DENIED:
-		rejected(msg->rjcted_rply.rj_stat, error);
-		break;
-
-	default:
-		error->re_status = RPC_FAILED;
-		error->re_lb.s1 = (int32_t)(msg->rm_reply.rp_stat);
-		break;
-	}
-	switch (error->re_status) {
-
-	case RPC_VERSMISMATCH:
-		error->re_vers.low = msg->rjcted_rply.rj_vers.low;
-		error->re_vers.high = msg->rjcted_rply.rj_vers.high;
-		break;
-
-	case RPC_AUTHERROR:
-		error->re_why = msg->rjcted_rply.rj_why;
-		break;
-
-	case RPC_PROGVERSMISMATCH:
-		error->re_vers.low = msg->acpted_rply.ar_vers.low;
-		error->re_vers.high = msg->acpted_rply.ar_vers.high;
-		break;
-
-	case RPC_FAILED:
-	case RPC_SUCCESS:
-	case RPC_PROGNOTREGISTERED:
-	case RPC_PMAPFAILURE:
-	case RPC_UNKNOWNPROTO:
-	case RPC_UNKNOWNHOST:
-	case RPC_SYSTEMERROR:
-	case RPC_CANTDECODEARGS:
-	case RPC_PROCUNAVAIL:
-	case RPC_PROGUNAVAIL:
-	case RPC_TIMEDOUT:
-	case RPC_CANTRECV:
-	case RPC_CANTSEND:
-	case RPC_CANTDECODERES:
-	case RPC_CANTENCODEARGS:
-	default:
-		break;
-	}
-}
diff --git a/lib/libc/rpc/rpc_soc.3 b/lib/libc/rpc/rpc_soc.3
deleted file mode 100644
index 995644210..000000000
--- a/lib/libc/rpc/rpc_soc.3
+++ /dev/null
@@ -1,1066 +0,0 @@
-.\"	@(#)rpc.3n	2.4 88/08/08 4.0 RPCSRC; from 1.19 88/06/24 SMI
-.\"	$NetBSD: rpc_soc.3,v 1.14 2013/03/04 17:29:03 christos Exp $
-.\" Converted to mdoc by Thomas Klausner <wiz@NetBSD.org>
-.\"
-.Dd December 12, 2008
-.Dt RPC_SOC 3
-.Os
-.Sh NAME
-.Nm rpc_soc ,
-.Nm auth_destroy ,
-.Nm authnone_create ,
-.Nm authunix_create ,
-.Nm authunix_create_default ,
-.Nm callrpc ,
-.Nm clnt_broadcast ,
-.Nm clnt_call ,
-.Nm clnt_control ,
-.Nm clnt_create ,
-.Nm clnt_destroy ,
-.Nm clnt_freeres ,
-.Nm clnt_geterr ,
-.Nm clnt_pcreateerror ,
-.Nm clnt_perrno ,
-.Nm clnt_perror ,
-.Nm clnt_spcreateerror ,
-.Nm clnt_sperrno ,
-.Nm clnt_sperror ,
-.Nm clntraw_create ,
-.Nm clnttcp_create ,
-.Nm clntudp_bufcreate ,
-.Nm clntudp_create ,
-.Nm get_myaddress ,
-.Nm pmap_getmaps ,
-.Nm pmap_getport ,
-.Nm pmap_rmtcall ,
-.Nm pmap_set ,
-.Nm pmap_unset ,
-.Nm registerrpc ,
-.Nm rpc_createerr ,
-.Nm svc_destroy ,
-.Nm svc_fds ,
-.Nm svc_fdset ,
-.Nm svc_getargs ,
-.Nm svc_getcaller ,
-.Nm svc_getreg ,
-.Nm svc_getregset ,
-.Nm svc_getrpccaller ,
-.Nm svc_register ,
-.Nm svc_run ,
-.Nm svc_sendreply ,
-.Nm svc_unregister ,
-.Nm svcerr_auth ,
-.Nm svcerr_decode ,
-.Nm svcerr_noproc ,
-.Nm svcerr_noprog ,
-.Nm svcerr_progvers ,
-.Nm svcerr_systemerr ,
-.Nm svcerr_weakauth ,
-.Nm svcfd_create ,
-.Nm svcraw_create ,
-.Nm xdr_accepted_reply ,
-.Nm xdr_authunix_parms ,
-.Nm xdr_callhdr ,
-.Nm xdr_callmsg ,
-.Nm xdr_opaque_auth ,
-.Nm xdr_pmap ,
-.Nm xdr_pmaplist ,
-.Nm xdr_rejected_reply ,
-.Nm xdr_replymsg ,
-.Nm xprt_register ,
-.Nm xprt_unregister
-.Nd library routines for remote procedure calls
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft void
-.Fn auth_destroy "AUTH *auth"
-.Ft AUTH *
-.Fn authnone_create "void"
-.Ft AUTH *
-.Fn authunix_create "char *host" "int uid" "int gid" "int len" "int *aup_gids"
-.Ft AUTH *
-.Fn authunix_create_default "void"
-.Ft int
-.Fn callrpc "char *host" "u_long prognum" "u_long versnum" \
-"u_long procnum" "xdrproc_t inproc" "char *in" "xdrproc_t outproc" "char *out"
-.Ft enum clnt_stat
-.Fn clnt_broadcast "u_long prognum" "u_long versnum" "u_long procnum" \
-"xdrproc_t inproc" "char *in" "xdrproc_t outproc" "char *out" \
-"resultproc_t eachresult"
-.Ft enum clnt_stat
-.Fn clnt_call "CLIENT *clnt" "u_long procnum" "xdrproc_t inproc" \
-"char *in" "xdrproc_t outproc" "char *out" "struct timeval tout"
-.Ft int
-.Fn clnt_destroy "CLIENT *clnt"
-.Ft CLIENT *
-.Fn clnt_create "char *host" "u_long prog" "u_long vers" "char *proto"
-.Ft bool_t
-.Fn clnt_control "CLIENT *cl" "u_int req" "char *info"
-.Ft int
-.Fn clnt_freeres "CLIENT *clnt" "xdrproc_t outproc" "char *out"
-.Ft void
-.Fn clnt_geterr "CLIENT *clnt" "struct rpc_err errp"
-.Ft void
-.Fn clnt_pcreateerror "char *s"
-.Ft void
-.Fn clnt_perrno "enum clnt_stat stat"
-.Ft int
-.Fn clnt_perror "CLIENT *clnt" "char *s"
-.Ft char *
-.Fn clnt_spcreateerror "const char *s"
-.Ft char *
-.Fn clnt_sperrno "enum clnt_stat stat"
-.Ft char *
-.Fn clnt_sperror "CLIENT *rpch" "char *s"
-.Ft CLIENT *
-.Fn clntraw_create "u_long prognum" "u_long versnum"
-.Ft CLIENT *
-.Fn clnttcp_create "struct sockaddr_in *addr" "u_long prognum" \
-"u_long versnum" "int *sockp" "u_int sendsz" "u_int recvsz"
-.Ft CLIENT *
-.Fn clntudp_create "struct sockaddr_in *addr" "u_long prognum" \
-"u_long versnum" "struct timeval wait" "int *sockp"
-.Ft CLIENT *
-.Fn clntudp_bufcreate "struct sockaddr_in *addr" "u_long prognum" \
-"u_long versnum" "struct timeval wait" "int *sockp" \
-"unsigned int sendsize" "unsigned int recosize"
-.Ft int
-.Fn get_myaddress "struct sockaddr_in *addr"
-.Ft struct pmaplist *
-.Fn pmap_getmaps "struct sockaddr_in *addr"
-.Ft u_short
-.Fn pmap_getport "struct sockaddr_in *addr" "u_long prognum" \
-"u_long versnum" "u_long protocol"
-.Ft enum clnt_stat
-.Fo pmap_rmtcall
-.Fa "struct sockaddr_in *addr"
-.Fa "u_long prognum"
-.Fa "u_long versnum"
-.Fa "u_long procnum"
-.Fa "xdrproc_t inproc"
-.Fa "char *in"
-.Fa "xdrpoc_t outproc"
-.Fa "char *out"
-.Fa "struct timeval tout"
-.Fa "u_long *portp"
-.Fc
-.Ft int
-.Fn pmap_set "u_long prognum" "u_long versnum" "int protocol" \
-"int port"
-.Ft int
-.Fn pmap_unset "u_long prognum" "u_long versnum"
-.Ft int
-.Fn registerrpc "u_long prognum" "u_long versnum" "u_long procnum" \
-"char *(*procname)()" "xdrproc_t inproc" "xdrproc_t outproc"
-.Fd struct rpc_createerr rpc_createerr;
-.Ft int
-.Fn svc_destroy "SVCXPRT *xprt"
-.Fd fd_set svc_fdset;
-.Fd int svc_fds;
-.Ft int
-.Fn svc_freeargs "SVCXPRT *xprt" "xdrproc_t inproc" "char *in"
-.Ft int
-.Fn svc_getargs "SVCXPRT *xprt" "xdrproc_t inproc" "char *in"
-.Ft struct sockaddr_in *
-.Fn svc_getcaller "SVCXPRT *xprt"
-.Ft int
-.Fn svc_getreqset "fd_set *rdfds"
-.Ft int
-.Fn svc_getreq "int rdfds"
-.Ft struct netbuf *
-.Fn svc_getrpccaller "SVCXPRT *xprt"
-.Ft int
-.Fn svc_register "SVCXPRT *xprt" "u_long prognum" "u_long versnum" \
-"void (*dispatch)()" "u_long protocol"
-.Ft int
-.Fn svc_run "void"
-.Ft int
-.Fn svc_sendreply "SVCXPRT *xprt" "xdrproc_t outproc" "char *out"
-.Ft void
-.Fn svc_unregister "u_long prognum" "u_long versnum"
-.Ft void
-.Fn svcerr_auth "SVCXPRT *xprt" "enum auth_stat why"
-.Ft void
-.Fn svcerr_decode "SVCXPRT *xprt"
-.Ft void
-.Fn svcerr_noproc "SVCXPRT *xprt"
-.Ft void
-.Fn svcerr_noprog "SVCXPRT *xprt"
-.Ft void
-.Fn svcerr_progvers "SVCXPRT *xprt"
-.Ft void
-.Fn svcerr_systemerr "SVCXPRT *xprt"
-.Ft void
-.Fn svcerr_weakauth "SVCXPRT *xprt"
-.Ft SVCXPRT *
-.Fn svcraw_create "void"
-.Ft SVCXPRT *
-.Fn svctcp_create "int sock" "u_int send_buf_size" \
-"u_int recv_buf_size"
-.Ft SVCXPRT *
-.Fn svcfd_create "int fd" "u_int sendsize" "u_int recvsize"
-.Ft SVCXPRT *
-.Fn svcudp_bufcreate "int sock" "u_int sendsize" "u_int recosize"
-.Ft SVCXPRT *
-.Fn svcudp_create "int sock"
-.Ft int
-.Fn xdr_accepted_reply "XDR *xdrs" "struct accepted_reply *ar"
-.Ft int
-.Fn xdr_authunix_parms "XDR *xdrs" "struct authunix_parms *aupp"
-.Ft void
-.Fn xdr_callhdr "XDR *xdrs" "struct rpc_msg *chdr"
-.Ft int
-.Fn xdr_callmsg "XDR *xdrs" "struct rpc_msg *cmsg"
-.Ft int
-.Fn xdr_opaque_auth "XDR *xdrs" "struct opaque_auth *ap"
-.Ft int
-.Fn xdr_pmap "XDR *xdrs" "struct pmap *regs"
-.Ft int
-.Fn xdr_pmaplist "XDR *xdrs" "struct pmaplist **rp"
-.Ft int
-.Fn xdr_rejected_reply "XDR *xdrs" "struct rejected_reply *rr"
-.Ft int
-.Fn xdr_replymsg "XDR *xdrs" "struct rpc_msg *rmsg"
-.Ft bool_t
-.Fn xprt_register "SVCXPRT *xprt"
-.Ft void
-.Fn xprt_unregister "SVCXPRT *xprt"
-.Sh DESCRIPTION
-.Em "The svc and clnt functions described in this page are the old, TS-RPC"
-.Em "interface to the XDR and RPC library, and exist for backward compatibility."
-.Em "The new interface is described in the pages referenced from"
-.Xr rpc 3 .
-.Pp
-These routines allow C programs to make procedure
-calls on other machines across the network.
-First, the client calls a procedure to send a
-data packet to the server.
-Upon receipt of the packet, the server calls a dispatch routine
-to perform the requested service, and then sends back a
-reply.
-Finally, the procedure call returns to the client.
-.\" XXX: NOTYET
-.\".Pp
-.\"Routines that are used for Secure RPC (DES authentication) are described in
-.\".Xr rpc_secure 3 .
-.\"Secure RPC can be used only if DES encryption is available.
-.Pp
-.Bl -tag -width xxx
-.It Fn auth_destroy
-A macro that destroys the authentication information associated with
-.Fa auth .
-Destruction usually involves deallocation of private data structures.
-The use of
-.Fa auth
-is undefined after calling
-.Fn auth_destroy .
-.It Fn authnone_create
-Create and returns an RPC authentication handle that passes nonusable
-authentication information with each remote procedure call.
-This is the default authentication used by RPC.
-.It Fn authunix_create
-Create and return an RPC authentication handle that contains
-.\" XXX: .UX ?
-authentication information.
-The parameter
-.Fa host
-is the name of the machine on which the information was
-created;
-.Fa uid
-is the user's user ID;
-.Fa gid
-is the user's current group id;
-.Fa len
-and
-.Fa aup_gids
-refer to a counted array of groups to which the user belongs.
-It is easy to impersonate a user.
-.It Fn authunix_create_default
-Calls
-.Fn authunix_create
-with the appropriate parameters.
-.It Fn callrpc
-Call the remote procedure associated with
-.Fa prognum ,
-.Fa versnum ,
-and
-.Fa procnum
-on the machine,
-.Fa host .
-The parameter
-.Fa in
-is the address of the procedure's argument(s), and
-.Fa out
-is the address of where to place the result(s);
-.Fa inproc
-is used to encode the procedure's parameters, and
-.Fa outproc
-is used to decode the procedure's results.
-This routine returns zero if it succeeds, or the value of
-.Va "enum clnt_stat"
-cast to an integer if it fails.
-The routine
-.Fn clnt_perrno
-is handy for translating failure statuses into messages.
-.Pp
-Warning: calling remote procedures with this routine
-uses UDP/IP as a transport; see
-.Fn clntudp_create
-for restrictions.
-You do not have control of timeouts or authentication using
-this routine.
-.It Fn clnt_broadcast
-Like
-.Fn callrpc ,
-except the call message is broadcast to all locally
-connected broadcast nets.
-Each time it receives a response, this routine calls
-.Fn eachresult ,
-whose form is
-.Ft int
-.Fn eachresult "char *out" "struct sockaddr_in *addr"
-where
-.Fa out
-is the same as
-.Fa out
-passed to
-.Fn clnt_broadcast ,
-except that the remote procedure's output is decoded there;
-.Fa addr
-points to the address of the machine that sent the results.
-If
-.Fn eachresult
-returns zero,
-.Fn clnt_broadcast
-waits for more replies; otherwise it returns with appropriate
-status.
-.Pp
-Warning: broadcast sockets are limited in size to the
-maximum transfer unit of the data link.
-For ethernet, this value is 1500 bytes.
-.It Fn clnt_call
-A macro that calls the remote procedure
-.Fa procnum
-associated with the client handle,
-.Fa clnt ,
-which is obtained with an RPC client creation routine such as
-.Fn clnt_create .
-The parameter
-.Fa in
-is the address of the procedure's argument(s), and
-.Fa out
-is the address of where to place the result(s);
-.Fa inproc
-is used to encode the procedure's parameters, and
-.Fa outproc
-is used to decode the procedure's results;
-.Fa tout
-is the time allowed for results to come back.
-.It Fn clnt_destroy
-A macro that destroys the client's RPC handle.
-Destruction usually involves deallocation
-of private data structures, including
-.Fa clnt
-itself.
-Use of
-.Fa clnt
-is undefined after calling
-.Fn clnt_destroy .
-If the RPC library opened the associated socket, it will close it
-also.
-Otherwise, the socket remains open.
-.It Fn clnt_create
-Generic client creation routine.
-.Fa host
-identifies the name of the remote host where the server
-is located.
-.Fa proto
-indicates which kind of transport protocol to use.
-The currently supported values for this field are
-.Dq udp
-and
-.Dq tcp .
-Default timeouts are set, but can be modified using
-.Fn clnt_control .
-.Pp
-.Em Warning :
-Using UDP has its shortcomings.
-Since UDP-based RPC messages can only hold up to 8 Kbytes of encoded
-data, this transport cannot be used for procedures that take
-large arguments or return huge results.
-.It Fn clnt_control
-A macro used to change or retrieve various information
-about a client object.
-.Fa req
-indicates the type of operation, and
-.Fa info
-is a pointer to the information.
-For both UDP and TCP the supported values of
-.Fa req
-and their argument types and what they do are:
-.Bl -tag -width CLSET_RETRY_TIMEOUTX
-.It CLSET_TIMEOUT
-.Vt struct timeval ;
-set total timeout.
-.It CLGET_TIMEOUT
-.Vt struct timeval ;
-get total timeout.
-.Pp
-Note: if you set the timeout using
-.Fn clnt_control ,
-the timeout parameter passed to
-.Fn clnt_call
-will be ignored in all future calls.
-.It CLGET_SERVER_ADDR
-.Vt struct sockaddr_in ;
-get server's address.
-.El
-.Pp
-The following operations are valid for UDP only:
-.Bl -tag -width CLSET_RETRY_TIMEOUT
-.It CLSET_RETRY_TIMEOUT
-.Vt struct timeval ;
-set the retry timeout.
-.It CLGET_RETRY_TIMEOUT
-.Vt struct timeval ;
-get the retry timeout.
-.Pp
-The retry timeout is the time that UDP RPC waits for the server to
-reply before retransmitting the request.
-.El
-.It Fn clnt_freeres
-A macro that frees any data allocated by the RPC/XDR system when it
-decoded the results of an RPC call.
-The parameter
-.Fa out
-is the address of the results, and
-.Fa outproc
-is the XDR routine describing the results.
-This routine returns one if the results were successfully freed,
-and zero otherwise.
-.It Fn clnt_geterr
-A macro that copies the error structure out of the client
-handle to the structure at address
-.Fa errp .
-.It Fn clnt_pcreateerror
-Print a message to standard error indicating why a client RPC handle
-could not be created.
-The message is prepended with string
-.Fa s
-and a colon.
-A newline character is appended at the end of the message.
-Used when a
-.Fn clnt_create ,
-.Fn clntraw_create ,
-.Fn clnttcp_create ,
-or
-.Fn clntudp_create
-call fails.
-.It Fn clnt_perrno
-Print a message to standard error corresponding
-to the condition indicated by
-.Fa stat .
-A newline character is appended at the end of the message.
-Used after
-.Fn callrpc .
-.It Fn clnt_perror
-Print a message to standard error indicating why an RPC call failed;
-.Fa clnt
-is the handle used to do the call.
-The message is prepended with string
-.Fa s
-and a colon.
-A newline character is appended at the end of the message.
-Used after
-.Fn clnt_call .
-.It Fn clnt_spcreateerror
-Like
-.Fn clnt_pcreateerror ,
-except that it returns a string
-instead of printing to the standard error.
-.Pp
-Bugs: returns pointer to static data that is overwritten
-on each call.
-.It Fn clnt_sperrno
-Take the same arguments as
-.Fn clnt_perrno ,
-but instead of sending a message to the standard error
-indicating why an RPC call failed, return a pointer to a string which
-contains the message.
-.Pp
-.Fn clnt_sperrno
-is used instead of
-.Fn clnt_perrno
-if the program does not have a standard error (as a program
-running as a server quite likely does not), or if the
-programmer does not want the message to be output with
-.Xr printf 3 ,
-or if a message format different than that supported by
-.Fn clnt_perrno
-is to be used.
-Note: unlike
-.Fn clnt_sperror
-and
-.Fn clnt_spcreateerror ,
-.Fn clnt_sperrno
-returns a pointer to static data, but the
-result will not get overwritten on each call.
-.It Fn clnt_sperror
-Like
-.Fn clnt_perror ,
-except that (like
-.Fn clnt_sperrno )
-it returns a string instead of printing to standard error.
-.Pp
-Bugs: returns pointer to static data that is overwritten
-on each call.
-.It Fn clntraw_create
-This routine creates a toy RPC client for the remote program
-.Fa prognum ,
-version
-.Fa versnum .
-The transport used to pass messages to the service is
-actually a buffer within the process's address space, so the
-corresponding RPC server should live in the same address space; see
-.Fn svcraw_create .
-This allows simulation of RPC and acquisition of RPC overheads, such
-as round trip times, without any kernel interference.
-This routine returns
-.Dv NULL
-if it fails.
-.It Fn clnttcp_create
-This routine creates an RPC client for the remote program
-.Fa prognum ,
-version
-.Fa versnum ;
-the client uses TCP/IP as a transport.
-The remote program is located at Internet address
-.Fa *addr .
-If
-.Fa addr-\*[Gt]sin_port
-is zero, then it is set to the actual port that the remote
-program is listening on (the remote
-.Xr rpcbind 8
-or
-.Cm portmap
-service is consulted for this information).
-The parameter
-.Fa sockp
-is a socket; if it is
-.Dv RPC_ANYSOCK ,
-then this routine opens a new one and sets
-.Fa sockp .
-Since TCP-based RPC uses buffered I/O ,
-the user may specify the size of the send and receive buffers
-with the parameters
-.Fa sendsz
-and
-.Fa recvsz ;
-values of zero choose suitable defaults.
-This routine returns
-.Dv NULL
-if it fails.
-.It Fn clntudp_create
-This routine creates an RPC client for the remote program
-.Fa prognum ,
-version
-.Fa versnum ;
-the client uses UDP/IP as a transport.
-The remote program is located at Internet address
-.Fa addr .
-If
-.Fa addr-\*[Gt]sin_port
-is zero, then it is set to actual port that the remote
-program is listening on (the remote
-.Xr rpcbind 8
-or
-.Cm portmap
-service is consulted for this information).
-The parameter
-.Fa sockp
-is a socket; if it is
-.Dv RPC_ANYSOCK ,
-then this routine opens a new one and sets
-.Fa sockp .
-The UDP transport resends the call message in intervals of
-.Fa wait
-time until a response is received or until the call times out.
-The total time for the call to time out is specified by
-.Fa clnt_call .
-.Pp
-Warning: since UDP-based RPC messages can only hold up to 8 Kbytes
-of encoded data, this transport cannot be used for procedures
-that take large arguments or return huge results.
-.It Fn clntudp_bufcreate
-This routine creates an RPC client for the remote program
-.Fa prognum ,
-on
-.Fa versnum ;
-the client uses UDP/IP as a transport.
-The remote program is located at Internet address
-.Fa addr .
-If
-.Fa addr-\*[Gt]sin_port
-is zero, then it is set to actual port that the remote
-program is listening on (the remote
-.Xr rpcbind 8
-or
-.Cm portmap
-service is consulted for this information).
-The parameter
-.Fa sockp
-is a socket; if it is
-.Dv RPC_ANYSOCK ,
-then this routine opens a new one and sets
-.Fa sockp .
-The UDP transport resends the call message in intervals of
-.Fa wait
-time until a response is received or until the call times out.
-The total time for the call to time out is specified by
-.Fa clnt_call .
-.Pp
-This allows the user to specify the maximum packet size for sending and
-receiving UDP-based RPC messages.
-.It Fn get_myaddress
-Stuff the machine's IP address into
-.Fa *addr ,
-without consulting the library routines that deal with
-.Pa /etc/hosts .
-The port number is always set to
-.Fn htons "PMAPPORT" .
-Returns zero on success, non-zero on failure.
-.It Fn pmap_getmaps
-A user interface to the
-.Xr rpcbind 8
-service, which returns a list of the current RPC program-to-port
-mappings on the host located at IP address
-.Fa *addr .
-This routine can return
-.Dv NULL .
-The command
-.Dl Cm rpcinfo Fl p
-uses this routine.
-.It Fn pmap_getport
-A user interface to the
-.Xr rpcbind 8
-service, which returns the port number
-on which waits a service that supports program number
-.Fa prognum ,
-version
-.Fa versnum ,
-and speaks the transport protocol associated with
-.Fa protocol .
-The value of
-.Fa protocol
-is most likely
-.Dv IPPROTO_UDP
-or
-.Dv IPPROTO_TCP .
-A return value of zero means that the mapping does not exist
-or that the RPC system failured to contact the remote
-.Xr rpcbind 8
-service.
-In the latter case, the global variable
-.Fn rpc_createerr
-contains the RPC status.
-.It Fn pmap_rmtcall
-A user interface to the
-.Xr rpcbind 8
-service, which instructs
-.Xr rpcbind 8
-on the host at IP address
-.Fa *addr
-to make an RPC call on your behalf to a procedure on that host.
-The parameter
-.Fa *portp
-will be modified to the program's port number if the
-procedure succeeds.
-The definitions of other parameters are discussed in
-.Fn callrpc
-and
-.Fn clnt_call .
-This procedure should be used for a
-.Dq ping
-and nothing else.
-See also
-.Fn clnt_broadcast .
-.It Fn pmap_set
-A user interface to the
-.Xr rpcbind 8
-service, which establishes a mapping between the triple
-.Fa [ prognum ,
-.Fa versnum ,
-.Fa protocol ]
-and
-.Fa port
-on the machine's
-.Xr rpcbind 8
-service.
-The value of
-.Fa protocol
-is most likely
-.Dv IPPROTO_UDP
-or
-.Dv IPPROTO_TCP .
-This routine returns one if it succeeds, zero otherwise.
-Automatically done by
-.Fn svc_register .
-.It Fn pmap_unset
-A user interface to the
-.Xr rpcbind 8
-service, which destroys all mapping between the triple
-.Fa [ prognum ,
-.Fa versnum ,
-.Fa * ]
-and
-.Fa ports
-on the machine's
-.Xr rpcbind 8
-service.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn registerrpc
-Register procedure
-.Fa procname
-with the RPC service package.
-If a request arrives for program
-.Fa prognum ,
-version
-.Fa versnum ,
-and procedure
-.Fa procnum ,
-.Fa procname
-is called with a pointer to its parameter(s);
-.Fa progname
-should return a pointer to its static result(s);
-.Fa inproc
-is used to decode the parameters while
-.Fa outproc
-is used to encode the results.
-This routine returns zero if the registration succeeded, \-1
-otherwise.
-.Pp
-Warning: remote procedures registered in this form
-are accessed using the UDP/IP transport; see
-.Fn svcudp_bufcreate
-for restrictions.
-.It struct rpc_createerr rpc_createerr ;
-A global variable whose value is set by any RPC
-client creation routine that does not succeed.
-Use the routine
-.Fn clnt_pcreateerror
-to print the reason why.
-.It Fn svc_destroy
-A macro that destroys the RPC service transport handle,
-.Fa xprt .
-Destruction usually involves deallocation
-of private data structures, including
-.Fa xprt
-itself.
-Use of
-.Fa xprt
-is undefined after calling this routine.
-.It fd_set svc_fdset ;
-A global variable reflecting the RPC service side's read file
-descriptor bit mask; it is suitable as a parameter to the
-.Xr select 2
-system call.
-This is only of interest if a service implementor does not call
-.Fn svc_run ,
-but rather does his own asynchronous event processing.
-This variable is read-only (do not pass its address to
-.Xr select 2 ! ) ,
-yet it may change after calls to
-.Fn svc_getreqset
-or any creation routines.
-.It int svc_fds;
-Similar to
-.Fn svc_fedset ,
-but limited to 32 descriptors.
-This interface is obsoleted by
-.Fn svc_fdset .
-.It Fn svc_freeargs
-A macro that frees any data allocated by the RPC/XDR
-system when it decoded the arguments to a service procedure using
-.Fn svc_getargs .
-This routine returns 1 if the results were successfully freed,
-and zero otherwise.
-.It Fn svc_getargs
-A macro that decodes the arguments of an RPC request associated with
-the RPC service transport handle,
-.Fa xprt .
-The parameter
-.Fa in
-is the address where the arguments will be placed;
-.Fa inproc
-is the XDR routine used to decode the arguments.
-This routine returns one if decoding succeeds, and zero otherwise.
-.It Fn svc_getcaller
-The obsolete way of getting the network address of the caller
-of a procedure associated with the RPC service transport handle,
-.Fa xprt ,
-use
-.Fn svc_getrpccaller .
-.It Fn svc_getreqset
-This routine is only of interest if a service implementor
-does not call
-.Fn svc_run ,
-but instead implements custom asynchronous event processing.
-It is called when the
-.Xr select 2
-system call has determined that an RPC request has arrived on some
-RPC socket(s) ;
-.Fa rdfds
-is the resultant read file descriptor bit mask.
-The routine returns when all sockets associated with the
-value of
-.Fa rdfds
-have been serviced.
-.It Fn svc_getreq
-Similar to
-.Fn svc_getreqset ,
-but limited to 32 descriptors.
-This interface is obsoleted by
-.Fn svc_getreqset .
-.It Fn svc_getrpccaller
-The approved way of getting the network address of the caller
-of a procedure associated with the RPC service transport handle,
-.Fa xprt .
-.It Fn svc_register
-Associates
-.Fa prognum
-and
-.Fa versnum
-with the service dispatch procedure,
-.Fa dispatch .
-If
-.Fa protocol
-is zero, the service is not registered with the
-.Xr rpcbind 8
-service.
-If
-.Fa protocol
-is non-zero, then a mapping of the triple
-.Fa [ prognum ,
-.Fa versnum ,
-.Fa protocol ]
-to
-.Fa xprt-\*[Gt]xp_port
-is established with the local
-.Xr rpcbind 8
-service (generally
-.Fa protocol
-is zero,
-.Dv IPPROTO_UDP
-or
-.Dv IPPROTO_TCP ) .
-The procedure
-.Fa dispatch
-has the following form:
-.Ft int
-.Fn dispatch "struct svc_req *request" "SVCXPRT *xprt" .
-.Pp
-The
-.Fn svc_register
-routine returns one if it succeeds, and zero otherwise.
-.It Fn svc_run
-This routine never returns.
-It waits for RPC requests to arrive, and calls the appropriate service
-procedure using
-.Fn svc_getreq
-when one arrives.
-This procedure is usually waiting for a
-.Xr select 2
-system call to return.
-.It Fn svc_sendreply
-Called by an RPC service's dispatch routine to send the results of a
-remote procedure call.
-The parameter
-.Fa xprt
-is the request's associated transport handle;
-.Fa outproc
-is the XDR routine which is used to encode the results; and
-.Fa out
-is the address of the results.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn svc_unregister
-Remove all mapping of the double
-.Fa [ prognum ,
-.Fa versnum ]
-to dispatch routines, and of the triple
-.Fa [ prognum ,
-.Fa versnum ,
-.Fa * ]
-to port number.
-.It Fn svcerr_auth
-Called by a service dispatch routine that refuses to perform
-a remote procedure call due to an authentication error.
-.It Fn svcerr_decode
-Called by a service dispatch routine that cannot successfully
-decode its parameters.
-See also
-.Fn svc_getargs .
-.It Fn svcerr_noproc
-Called by a service dispatch routine that does not implement
-the procedure number that the caller requests.
-.It Fn svcerr_noprog
-Called when the desired program is not registered with the RPC
-package.
-Service implementors usually do not need this routine.
-.It Fn svcerr_progvers
-Called when the desired version of a program is not registered
-with the RPC package.
-Service implementors usually do not need this routine.
-.It Fn svcerr_systemerr
-Called by a service dispatch routine when it detects a system error
-not covered by any particular protocol.
-For example, if a service can no longer allocate storage,
-it may call this routine.
-.It Fn svcerr_weakauth
-Called by a service dispatch routine that refuses to perform
-a remote procedure call due to insufficient
-authentication parameters.
-The routine calls
-.Fn svcerr_auth "xprt" "AUTH_TOOWEAK" .
-.It Fn svcraw_create
-This routine creates a toy RPC service transport, to which it returns
-a pointer.
-The transport is really a buffer within the process's address space,
-so the corresponding RPC client should live in the same address space;
-see
-.Fn clntraw_create .
-This routine allows simulation of RPC and acquisition of RPC overheads
-(such as round trip times), without any kernel interference.
-This routine returns
-.Dv NULL
-if it fails.
-.It Fn svctcp_create
-This routine creates a TCP/IP-based RPC service transport, to which it
-returns a pointer.
-The transport is associated with the socket
-.Fa sock ,
-which may be
-.Dv RPC_ANYSOCK ,
-in which case a new socket is created.
-If the socket is not bound to a local TCP
-port, then this routine binds it to an arbitrary port.
-Upon completion,
-.Fa xprt-\*[Gt]xp_sock
-is the transport's socket descriptor, and
-.Fa xprt-\*[Gt]xp_port
-is the transport's port number.
-This routine returns
-.Dv NULL
-if it fails.
-Since TCP-based RPC uses buffered I/O ,
-users may specify the size of buffers; values of zero
-choose suitable defaults.
-.It Fn svcfd_create
-Create a service on top of any open descriptor.
-Typically, this descriptor is a connected socket
-for a stream protocol such as TCP.
-.Fa sendsize
-and
-.Fa recvsize
-indicate sizes for the send and receive buffers.
-If they are zero, a reasonable default is chosen.
-.It Fn svcudp_bufcreate
-This routine creates a UDP/IP-based RPC
-service transport, to which it returns a pointer.
-The transport is associated with the socket
-.Fa sock ,
-which may be
-.Dv RPC_ANYSOCK ,
-in which case a new socket is created.
-If the socket is not bound to a local UDP
-port, then this routine binds it to an arbitrary port.
-Upon completion,
-.Fa xprt-\*[Gt]xp_sock
-is the transport's socket descriptor, and
-.Fa xprt-\*[Gt]xp_port
-is the transport's port number.
-This routine returns
-.Dv NULL
-if it fails.
-.Pp
-This allows the user to specify the maximum packet size for sending and
-receiving UDP-based RPC messages.
-.It Fn svcudp_create
-This acts as
-.Fn svcudp_bufcreate with
-predefined sizes for the maximum packet sizes.
-.It Fn xdr_accepted_reply
-Used for encoding RPC reply messages.
-This routine is useful for users who wish to generate RPC-style
-messages without using the RPC package.
-.It Fn xdr_authunix_parms
-Used for describing UNIX credentials.
-This routine is useful for users who wish to generate these
-credentials without using the RPC authentication package.
-.It Fn xdr_callhdr
-Used for describing RPC call header messages.
-This routine is useful for users who wish to generate RPC-style
-messages without using the RPC package.
-.It Fn xdr_callmsg
-Used for describing RPC call messages.
-This routine is useful for users who wish to generate RPC-style
-messages without using the RPC package.
-.It Fn xdr_opaque_auth
-Used for describing RPC authentication information messages.
-This routine is useful for users who wish to generate RPC-style
-messages without using the RPC package.
-.It Fn xdr_pmap
-Used for describing parameters to various
-.Xr rpcbind 8
-procedures, externally.
-This routine is useful for users who wish to generate
-these parameters without using the
-.Em pmap
-interface.
-.It Fn xdr_pmaplist
-Used for describing a list of port mappings, externally.
-This routine is useful for users who wish to generate
-these parameters without using the
-.Em pmap
-interface.
-.It Fn xdr_rejected_reply
-Used for describing RPC reply messages.
-This routine is useful for users who wish to generate RPC-style
-messages without using the RPC package.
-.It Fn xdr_replymsg
-Used for describing RPC reply messages.
-This routine is useful for users who wish to generate RPC-style
-messages without using the RPC package.
-.It Fn xprt_register
-After RPC service transport handles are created,
-they should register themselves with the RPC service package.
-This routine modifies the global variable
-.Va svc_fds .
-Service implementors usually do not need this routine.
-.It Fn xprt_unregister
-Before an RPC service transport handle is destroyed,
-it should unregister itself with the RPC service package.
-This routine modifies the global variable
-.Va svc_fds .
-Service implementors usually do not need this routine.
-.El
-.Sh SEE ALSO
-.\".Xr rpc_secure 3 ,
-.Xr xdr 3
-.Pp
-The following manuals:
-.Rs
-.%B Remote Procedure Calls: Protocol Specification
-.Re
-.Rs
-.%B Remote Procedure Call Programming Guide
-.Re
-.Rs
-.%B rpcgen Programming Guide
-.Re
-.Pp
-.Rs
-.%A Sun Microsystems, Inc., USC-ISI
-.%T "RPC: Remote Procedure Call Protocol Specification"
-.%J RFC
-.%V 1050
-.Re
diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c
deleted file mode 100644
index 1dfbe9340..000000000
--- a/lib/libc/rpc/rpc_soc.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/*	$NetBSD: rpc_soc.c,v 1.19 2014/05/28 14:45:57 christos Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* #ident	"@(#)rpc_soc.c	1.17	94/04/24 SMI" */
-
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- * In addition, portions of such source code were derived from Berkeley
- * 4.3 BSD under license from the Regents of the University of
- * California.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)rpc_soc.c 1.41 89/05/02 Copyr 1988 Sun Micro";
-#else
-__RCSID("$NetBSD: rpc_soc.c,v 1.19 2014/05/28 14:45:57 christos Exp $");
-#endif
-#endif
-
-#ifdef PORTMAP
-/*
- * rpc_soc.c
- *
- * The backward compatibility routines for the earlier implementation
- * of RPC, where the only transports supported were tcp/ip and udp/ip.
- * Based on berkeley socket abstraction, now implemented on the top
- * of TLI/Streams
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <stdio.h>
-#include <rpc/rpc.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/nettype.h>
-#include <netinet/in.h>
-#include <assert.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-
-#include "svc_fdset.h"
-#include "rpc_internal.h"
-
-#ifdef __weak_alias
-__weak_alias(clntudp_bufcreate,_clntudp_bufcreate)
-__weak_alias(clntudp_create,_clntudp_create)
-__weak_alias(clnttcp_create,_clnttcp_create)
-__weak_alias(clntraw_create,_clntraw_create)
-__weak_alias(get_myaddress,_get_myaddress)
-__weak_alias(svcfd_create,_svcfd_create)
-__weak_alias(svcudp_bufcreate,_svcudp_bufcreate)
-__weak_alias(svcudp_create,_svcudp_create)
-__weak_alias(svctcp_create,_svctcp_create)
-__weak_alias(svcraw_create,_svcraw_create)
-__weak_alias(callrpc,_callrpc)
-__weak_alias(registerrpc,_registerrpc)
-__weak_alias(clnt_broadcast,_clnt_broadcast)
-#endif
-
-#ifdef _REENTRANT
-extern mutex_t	rpcsoc_lock;
-#endif
-
-static CLIENT *clnt_com_create(struct sockaddr_in *, rpcprog_t, rpcvers_t,
-				    int *, u_int, u_int, const char *);
-static SVCXPRT *svc_com_create(int, u_int, u_int, const char *);
-static bool_t rpc_wrap_bcast(char *, struct netbuf *, struct netconfig *);
-
-/*
- * A common clnt create routine
- */
-static CLIENT *
-clnt_com_create(struct sockaddr_in *raddr, rpcprog_t prog, rpcvers_t vers,
-	int *sockp, u_int sendsz, u_int recvsz, const char *tp)
-{
-	CLIENT *cl;
-	int madefd = FALSE;
-	int fd;
-	struct netconfig *nconf;
-	struct netbuf bindaddr;
-
-	_DIAGASSERT(raddr != NULL);
-	_DIAGASSERT(sockp != NULL);
-	_DIAGASSERT(tp != NULL);
-
-	fd = *sockp;
-
-	mutex_lock(&rpcsoc_lock);
-	if ((nconf = __rpc_getconfip(tp)) == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		mutex_unlock(&rpcsoc_lock);
-		return (NULL);
-	}
-	if (fd == RPC_ANYSOCK) {
-		fd = __rpc_nconf2fd(nconf);
-		if (fd == -1)
-			goto syserror;
-		madefd = TRUE;
-	}
-
-	if (raddr->sin_port == 0) {
-		u_int proto;
-		u_short sport;
-
-		mutex_unlock(&rpcsoc_lock);	/* pmap_getport is recursive */
-		proto = strcmp(tp, "udp") == 0 ? IPPROTO_UDP : IPPROTO_TCP;
-		sport = pmap_getport(raddr, (u_long)prog, (u_long)vers,
-		    proto);
-		if (sport == 0) {
-			goto err;
-		}
-		raddr->sin_port = htons(sport);
-		mutex_lock(&rpcsoc_lock);	/* pmap_getport is recursive */
-	}
-
-	/* Transform sockaddr_in to netbuf */
-	bindaddr.maxlen = bindaddr.len =  sizeof (struct sockaddr_in);
-	bindaddr.buf = raddr;
-
-	(void)bindresvport(fd, NULL);
-	cl = clnt_tli_create(fd, nconf, &bindaddr, prog, vers,
-				sendsz, recvsz);
-	if (cl) {
-		if (madefd == TRUE) {
-			/*
-			 * The fd should be closed while destroying the handle.
-			 */
-			(void) CLNT_CONTROL(cl, CLSET_FD_CLOSE, NULL);
-			*sockp = fd;
-		}
-		(void) freenetconfigent(nconf);
-		mutex_unlock(&rpcsoc_lock);
-		return (cl);
-	}
-	goto err;
-
-syserror:
-	rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-	rpc_createerr.cf_error.re_errno = errno;
-
-err:	if (madefd == TRUE)
-		(void) close(fd);
-	(void) freenetconfigent(nconf);
-	mutex_unlock(&rpcsoc_lock);
-	return (NULL);
-}
-
-CLIENT *
-clntudp_bufcreate(struct sockaddr_in *raddr, u_long prog, u_long vers, struct timeval wait, int *sockp, u_int sendsz, u_int recvsz)
-{
-	CLIENT *cl;
-
-	_DIAGASSERT(raddr != NULL);
-	_DIAGASSERT(sockp != NULL);
-
-	cl = clnt_com_create(raddr, (rpcprog_t)prog, (rpcvers_t)vers, sockp,
-	    sendsz, recvsz, "udp");
-	if (cl == NULL) {
-		return (NULL);
-	}
-	(void) CLNT_CONTROL(cl, CLSET_RETRY_TIMEOUT, (char *)(void *)&wait);
-	return (cl);
-}
-
-CLIENT *
-clntudp_create(struct sockaddr_in *raddr, u_long program, u_long version,
-    struct timeval wait, int *sockp)
-{
-	return clntudp_bufcreate(raddr, program, version, wait, sockp,
-					UDPMSGSIZE, UDPMSGSIZE);
-}
-
-CLIENT *
-clnttcp_create(struct sockaddr_in *raddr, u_long prog, u_long vers, int *sockp,
-    u_int sendsz, u_int recvsz)
-{
-	return clnt_com_create(raddr, (rpcprog_t)prog, (rpcvers_t)vers, sockp,
-	    sendsz, recvsz, "tcp");
-}
-
-CLIENT *
-clntraw_create(u_long prog, u_long vers)
-{
-	return clnt_raw_create((rpcprog_t)prog, (rpcvers_t)vers);
-}
-
-/*
- * A common server create routine
- */
-static SVCXPRT *
-svc_com_create(int fd, u_int sendsize, u_int recvsize, const char *netid)
-{
-	struct netconfig *nconf;
-	SVCXPRT *svc;
-	int madefd = FALSE;
-	int port;
-	struct sockaddr_in sccsin;
-
-	_DIAGASSERT(netid != NULL);
-
-	if ((nconf = __rpc_getconfip(netid)) == NULL) {
-		(void) syslog(LOG_ERR, "Could not get %s transport", netid);
-		return (NULL);
-	}
-	if (fd == RPC_ANYSOCK) {
-		fd = __rpc_nconf2fd(nconf);
-		if (fd == -1) {
-			(void) freenetconfigent(nconf);
-			(void) syslog(LOG_ERR,
-			"svc%s_create: could not open connection", netid);
-			return (NULL);
-		}
-		madefd = TRUE;
-	}
-
-	memset(&sccsin, 0, sizeof sccsin);
-	sccsin.sin_family = AF_INET;
-	(void)bindresvport(fd, &sccsin);
-	listen(fd, SOMAXCONN);
-	svc = svc_tli_create(fd, nconf, NULL, sendsize, recvsize);
-	(void) freenetconfigent(nconf);
-	if (svc == NULL) {
-		if (madefd)
-			(void) close(fd);
-		return (NULL);
-	}
-	port = (((struct sockaddr_in *)svc->xp_ltaddr.buf)->sin_port);
-	svc->xp_port = ntohs(port);
-	return (svc);
-}
-
-SVCXPRT *
-svctcp_create(int fd, u_int sendsize, u_int recvsize)
-{
-	return svc_com_create(fd, sendsize, recvsize, "tcp");
-}
-
-SVCXPRT *
-svcudp_bufcreate(int fd, u_int sendsz, u_int recvsz)
-{
-	return svc_com_create(fd, sendsz, recvsz, "udp");
-}
-
-SVCXPRT *
-svcfd_create(int fd, u_int sendsize, u_int recvsize)
-{
-	return svc_fd_create(fd, sendsize, recvsize);
-}
-
-
-SVCXPRT *
-svcudp_create(int fd)
-{
-	return svc_com_create(fd, UDPMSGSIZE, UDPMSGSIZE, "udp");
-}
-
-SVCXPRT *
-svcraw_create(void)
-{
-	return svc_raw_create();
-}
-
-int
-get_myaddress(struct sockaddr_in *addr)
-{
-
-	_DIAGASSERT(addr != NULL);
-
-	memset((void *) addr, 0, sizeof(*addr));
-	addr->sin_family = AF_INET;
-	addr->sin_port = htons(PMAPPORT);
-	addr->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-	return (0);
-}
-
-/*
- * For connectionless "udp" transport. Obsoleted by rpc_call().
- */
-int
-callrpc(char *host, int prognum, int versnum, int procnum,
-	xdrproc_t inproc, char *in, xdrproc_t outproc, char *out)
-{
-	return (int)rpc_call(host, (rpcprog_t)prognum, (rpcvers_t)versnum,
-	    (rpcproc_t)procnum, inproc, in, outproc, out, "udp");
-}
-
-/*
- * For connectionless kind of transport. Obsoleted by rpc_reg()
- */
-int
-registerrpc(int prognum, int versnum, int procnum,
-	char *(*progname)(char [UDPMSGSIZE]),
-	xdrproc_t inproc, xdrproc_t outproc)
-{
-	return rpc_reg((rpcprog_t)prognum, (rpcvers_t)versnum,
-	    (rpcproc_t)procnum, progname, inproc, outproc, __UNCONST("udp"));
-}
-
-/*
- * All the following clnt_broadcast stuff is convulated; it supports
- * the earlier calling style of the callback function
- */
-#ifdef _REENTRANT
-static thread_key_t	clnt_broadcast_key;
-#endif
-static resultproc_t	clnt_broadcast_result_main;
-
-/*
- * Need to translate the netbuf address into sockaddr_in address.
- * Dont care about netid here.
- */
-/* ARGSUSED */
-static bool_t
-rpc_wrap_bcast(
-	char *resultp,		/* results of the call */
-	struct netbuf *addr,	/* address of the guy who responded */
-	struct netconfig *nconf) /* Netconf of the transport */
-{
-	resultproc_t clnt_broadcast_result;
-
-	_DIAGASSERT(resultp != NULL);
-	_DIAGASSERT(addr != NULL);
-	_DIAGASSERT(nconf != NULL);
-
-	if (strcmp(nconf->nc_netid, "udp"))
-		return (FALSE);
-#ifdef _REENTRANT
-	if (__isthreaded == 0)
-		clnt_broadcast_result = clnt_broadcast_result_main;
-	else
-		clnt_broadcast_result = thr_getspecific(clnt_broadcast_key);
-#else
-	clnt_broadcast_result = clnt_broadcast_result_main;
-#endif
-	return (*clnt_broadcast_result)(resultp,
-				(struct sockaddr_in *)addr->buf);
-}
-
-#ifdef _REENTRANT
-static once_t clnt_broadcast_once = ONCE_INITIALIZER;
-
-static void
-clnt_broadcast_setup(void)
-{
-
-	thr_keycreate(&clnt_broadcast_key, free);
-}
-#endif
-
-/*
- * Broadcasts on UDP transport. Obsoleted by rpc_broadcast().
- */
-enum clnt_stat
-clnt_broadcast(
-	u_long		prog,		/* program number */
-	u_long		vers,		/* version number */
-	u_long		proc,		/* procedure number */
-	xdrproc_t	xargs,		/* xdr routine for args */
-	caddr_t		argsp,		/* pointer to args */
-	xdrproc_t	xresults,	/* xdr routine for results */
-	caddr_t		resultsp,	/* pointer to results */
-	resultproc_t	eachresult)	/* call with each result obtained */
-{
-#ifdef _REENTRANT
-	if (__isthreaded == 0)
-		clnt_broadcast_result_main = eachresult;
-	else {
-		thr_once(&clnt_broadcast_once, clnt_broadcast_setup);
-		thr_setspecific(clnt_broadcast_key, (void *) eachresult);
-	}
-#else
-	clnt_broadcast_result_main = eachresult;
-#endif
-	return rpc_broadcast((rpcprog_t)prog, (rpcvers_t)vers,
-	    (rpcproc_t)proc, xargs, argsp, xresults, resultsp,
-	    (resultproc_t) rpc_wrap_bcast, "udp");
-}
-
-#endif /* PORTMAP */
diff --git a/lib/libc/rpc/rpc_svc_calls.3 b/lib/libc/rpc/rpc_svc_calls.3
deleted file mode 100644
index e04b6d49c..000000000
--- a/lib/libc/rpc/rpc_svc_calls.3
+++ /dev/null
@@ -1,261 +0,0 @@
-.\" @(#)rpc_svc_calls.3n 1.28 93/05/10 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_svc_calls 1.5 89/07/25 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\"	$NetBSD: rpc_svc_calls.3,v 1.12 2010/03/22 19:30:54 joerg Exp $
-.Dd May 3, 1993
-.Dt RPC_SVC_CALLS 3
-.Os
-.Sh NAME
-.Nm svc_dg_enablecache ,
-.Nm svc_exit ,
-.Nm svc_fdset ,
-.Nm svc_freeargs ,
-.Nm svc_getargs ,
-.Nm svc_getreq_common ,
-.Nm svc_getreq_poll ,
-.Nm svc_getreqset ,
-.Nm svc_getrpccaller ,
-.Nm svc_pollset ,
-.Nm svc_run ,
-.Nm svc_sendreply
-.Nd library routines for RPC servers
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft int
-.Fn svc_dg_enablecache "SVCXPRT *xprt" "const unsigned cache_size"
-.Ft void
-.Fn svc_exit "void"
-.Ft bool_t
-.Fn svc_freeargs "const SVCXPRT *xprt" "const xdrproc_t inproc" "caddr_t in"
-.Ft bool_t
-.Fn svc_getargs "const SVCXPRT *xprt" "const xdrproc_t inproc" "caddr_t in"
-.Ft void
-.Fn svc_getreq_common "const int fd"
-.Ft void
-.Fn svc_getreq_poll "struct pollfd *pfdp" "const int pollretval"
-.Ft void
-.Fn svc_getreqset "fd_set * rdfds"
-.Ft "struct netbuf *"
-.Fn svc_getrpccaller "const SVCXPRT *xprt"
-.Ft "struct sockcred *"
-.Fn __svc_getcallercreds "const SVCXPRT *xprt"
-.Vt struct pollfd svc_pollset[FD_SETSIZE];
-.Ft void
-.Fn svc_run "void"
-.Ft bool_t
-.Fn svc_sendreply "const SVCXPRT *xprt" "const xdrproc_t outproc" "const caddr_t *out"
-.Sh DESCRIPTION
-These routines are part of the
-RPC
-library which allows C language programs to make procedure
-calls on other machines across the network.
-.Pp
-These routines are associated with the server side of the
-RPC mechanism.
-Some of them are called by the server side dispatch function,
-while others
-(such as
-.Fn svc_run )
-are called when the server is initiated.
-.\" .Pp
-.\" In the current implementation, the service transport handle,
-.\" .Dv SVCXPRT ,
-.\" contains a single data area for decoding arguments and encoding results.
-.\" Therefore, this structure cannot be freely shared between threads that call
-.\" functions that do this.  Routines on this page that are affected by this
-.\" restriction are marked as unsafe for MT applications.
-.Sh ROUTINES
-See
-.Xr rpc 3
-for the definition of the
-.Dv SVCXPRT
-data structure.
-.Pp
-.Bl -tag -width __svc_getcallercreds()
-.It Fn svc_dg_enablecache
-This function allocates a duplicate request cache for the
-service endpoint
-.Fa xprt ,
-large enough to hold
-.Fa cache_size
-entries.
-Once enabled, there is no way to disable caching.
-This routine returns 0 if space necessary for a cache of the given size
-was successfully allocated, and 1 otherwise.
-.It Fn svc_exit
-This function when called by any of the RPC server procedure or
-otherwise, causes
-.Fn svc_run
-to return.
-.Pp
-As currently implemented,
-.Fn svc_exit
-zeroes the
-.Dv svc_fdset
-global variable.
-If RPC server activity is to be resumed,
-services must be reregistered with the RPC library
-either through one of the
-.Fn rpc_svc_create
-functions, or using
-.Fn xprt_register .
-.Fn svc_exit
-has global scope and ends all RPC server activity.
-.Ft "fd_set svc_fdset"
-A global variable reflecting the
-RPC server's read file descriptor bit mask; it is suitable as a parameter
-to the
-.Xr select 2
-system call.
-This is only of interest
-if service implementors do not call
-.Fn svc_run ,
-but rather do their own asynchronous event processing.
-This variable is read-only (do not pass its address to
-.Xr select 2 ! ) ,
-yet it may change after calls to
-.Fn svc_getreqset
-or any creation routines.
-.Pp
-.It Fn svc_freeargs
-A function macro that frees any data allocated by the
-RPC/XDR system when it decoded the arguments to a service procedure
-using
-.Fn svc_getargs .
-This routine returns
-.Dv TRUE
-if the results were successfully
-freed, and
-.Dv FALSE
-otherwise.
-.Pp
-.It Fn svc_getargs
-A function macro that decodes the arguments of an
-RPC request associated with the RPC
-service transport handle
-.Fa xprt .
-The parameter
-.Fa in
-is the address where the arguments will be placed;
-.Fa inproc
-is the XDR
-routine used to decode the arguments.
-This routine returns
-.Dv TRUE
-if decoding succeeds, and
-.Dv FALSE
-otherwise.
-.It Fn svc_getreq_common
-This routine is called to handle a request on the given
-file descriptor.
-.Pp
-.It Fn svc_getreq_poll
-This routine is only of interest if a service implementor
-does not call
-.Fn svc_run ,
-but instead implements custom asynchronous event processing.
-It is called when
-.Xr poll 2
-has determined that an RPC request has arrived on some RPC
-file descriptors;
-.Fn pollretval
-is the return value from
-.Xr poll 2
-and
-.Fa pfdp
-is the array of
-.Fa pollfd
-structures on which the
-.Xr poll 2
-was done.
-It is assumed to be an array large enough to
-contain the maximal number of descriptors allowed.
-.Pp
-.It Fn svc_getreqset
-This routine is only of interest if a service implementor
-does not call
-.Fn svc_run ,
-but instead implements custom asynchronous event processing.
-It is called when
-.Xr poll 2
-has determined that an RPC
-request has arrived on some RPC file descriptors;
-.Fa rdfds
-is the resultant read file descriptor bit mask.
-The routine returns when all file descriptors
-associated with the value of
-.Fa rdfds
-have been serviced.
-.Pp
-.It Fn svc_getrpccaller
-The approved way of getting the network address of the caller
-of a procedure associated with the
-RPC service transport handle
-.Fa xprt .
-.Pp
-.It Fn __svc_getcallercreds
-.Em Warning: this macro is specific to
-.Nx
-.Em and thus not portable.
-This macro returns a pointer to a sockcred structure, defined in
-.In sys/socket.h ,
-identifying the calling client.
-This only works if the client is calling the server over an
-.Dv AF_LOCAL
-socket.
-.It Fa struct pollfd svc_pollset[FD_SETSIZE];
-.Va svc_pollset
-is an array of
-.Vt pollfd
-structures derived from
-.Va svc_fdset[] .
-It is suitable as a parameter to the
-.Xr  poll 2
-system call.
-The derivation of
-.Va svc_pollset
-from
-.Va svc_fdset
-is made in the current implementation in
-.Fn svc_run .
-Service implementors who do not call
-.Fn svc_run
-and who wish to use this array must perform this derivation themselves.
-.Pp
-.It Fn svc_run
-This routine never returns.
-It waits for RPC
-requests to arrive, and calls the appropriate service
-procedure using
-.Fn svc_getreq_poll
-when one arrives.
-This procedure is usually waiting for the
-.Xr poll 2
-system call to return.
-.Pp
-.It Fn svc_sendreply
-Called by an RPC service's dispatch routine to send the results of a
-remote procedure call.
-The parameter
-.Fa xprt
-is the request's associated transport handle;
-.Fa outproc
-is the XDR
-routine which is used to encode the results; and
-.Fa out
-is the address of the results.
-This routine returns
-.Dv TRUE
-if it succeeds,
-.Dv FALSE
-otherwise.
-.El
-.Sh SEE ALSO
-.Xr poll 2 ,
-.Xr rpc 3 ,
-.Xr rpc_svc_create 3 ,
-.Xr rpc_svc_err 3 ,
-.Xr rpc_svc_reg 3
diff --git a/lib/libc/rpc/rpc_svc_create.3 b/lib/libc/rpc/rpc_svc_create.3
deleted file mode 100644
index ff07a5261..000000000
--- a/lib/libc/rpc/rpc_svc_create.3
+++ /dev/null
@@ -1,315 +0,0 @@
-.\" @(#)rpc_svc_create.3n 1.26 93/08/26 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_svc_create 1.3 89/06/28 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $NetBSD: rpc_svc_create.3,v 1.11 2010/03/22 19:30:54 joerg Exp $
-.Dd May 3, 1993
-.Dt RPC_SVC_CREATE 3
-.Os
-.Sh NAME
-.Nm rpc_svc_create ,
-.Nm svc_control ,
-.Nm svc_create ,
-.Nm svc_destroy ,
-.Nm svc_dg_create ,
-.Nm svc_fd_create ,
-.Nm svc_raw_create ,
-.Nm svc_tli_create ,
-.Nm svc_tp_create ,
-.Nm svc_vc_create
-.Nd library routines for the creation of server handles
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft bool_t
-.Fn svc_control "SVCXPRT *svc" "const u_int req" "void *info"
-.Ft int
-.Fn svc_create "const void (*dispatch)(struct svc_req *, SVCXPRT *)" "const rpcprog_t prognum" "const rpcvers_t versnum" "const char *nettype"
-.Ft SVCXPRT *"
-.Fn svc_dg_create "const int fildes" "const u_int sendsz" "const u_int recvsz"
-.Ft void
-.Fn svc_destroy "SVCXPRT *xprt"
-.Ft "SVCXPRT *"
-.Fn svc_fd_create "const int fildes" "const u_int sendsz" "const u_int recvsz"
-.Ft "SVCXPRT *"
-.Fn svc_raw_create "void"
-.Ft "SVCXPRT *"
-.Fn svc_tli_create "const int fildes" "const struct netconfig *netconf" "const struct t_bind *bindaddr" "const u_int sendsz" "const u_int recvsz"
-.Ft "SVCXPRT *"
-.Fn svc_tp_create "const void (*dispatch)(const struct svc_reg *, const SVCXPRT  *)" "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf"
-.Ft "SVCXPRT *"
-.Fn svc_vc_create "const int fildes" "const u_int sendsz" "const u_int recvsz"
-.Sh DESCRIPTION
-These routines are part of the RPC
-library which allows C language programs to make procedure
-calls on servers across the network.
-These routines deal with the creation of service handles.
-Once the handle is created, the server can be invoked by calling
-.Fn svc_run .
-.Sh ROUTINES
-See
-.Xr rpc 3
-for the definition of the
-.Dv SVCXPRT
-data structure.
-.Pp
-.Bl -tag -width XXXXX
-.It Fn svc_control
-A function to change or retrieve various information
-about a service object.
-.Fa req
-indicates the type of operation and
-.Fa info
-is a pointer to the information.
-The supported values of
-.Fa req ,
-their argument types, and what they do are:
-.Bl -tag -width SVCGET_XID
-.It Dv SVCGET_VERSQUIET
-If a request is received for a program number
-served by this server but the version number
-is outside the range registered with the server,
-an
-.Dv RPC_PROGVERSMISMATCH
-error will normally
-be returned.
-.Fa info
-should be a pointer to an integer.
-Upon successful completion of the
-.Dv SVCGET_VERSQUIET
-request,
-.Fa *info
-contains an
-integer which describes the server's current
-behavior:  0 indicates normal server behavior
-(that is, an
-.Dv RPC_PROGVERSMISMATCH
-error
-will be returned); 1 indicates that the out of
-range request will be silently ignored.
-.Pp
-.It Dv SVCSET_VERSQUIET
-If a request is received for a program number
-served by this server but the version number
-is outside the range registered with the server,
-an
-.Dv RPC_PROGVERSMISMATCH
-error will normally be returned.
-It is sometimes desirable to change this behavior.
-.Fa info
-should be a
-pointer to an integer which is either 0
-(indicating normal server behavior - an
-.Dv RPC_PROGVERSMISMATCH
-error will be returned),
-or 1 (indicating that the out of range request
-should be silently ignored).
-.El
-.Pp
-.It Fn svc_create
-.Fn svc_create
-creates server handles for all the transports
-belonging to the class
-.Fa nettype .
-.Fa nettype
-defines a class of transports which can be used
-for a particular application.
-The transports are tried in left to right order in
-.Ev NETPATH
-variable or in top to bottom order in the netconfig database.
-If
-.Fa nettype
-is
-.Dv NULL ,
-it defaults to
-.Dv netpath .
-.Pp
-.Fn svc_create
-registers itself with the rpcbind
-service (see
-.Xr rpcbind 8 ) .
-.Fa dispatch
-is called when there is a remote procedure call for the given
-.Fa prognum
-and
-.Fa versnum ;
-this requires calling
-.Fn svc_run
-(see
-.Fn svc_run
-in
-.Xr rpc_svc_reg 3 ) .
-If
-.Fn svc_create
-succeeds, it returns the number of server
-handles it created,
-otherwise it returns 0 and an error message is logged.
-.Pp
-.It Fn svc_destroy
-A function macro that destroys the RPC
-service handle
-.Fa xprt .
-Destruction usually involves deallocation
-of private data structures,
-including
-.Fa xprt
-itself.
-Use of
-.Fa xprt
-is undefined after calling this routine.
-.Pp
-.It Fn svc_dg_create
-This routine creates a connectionless RPC
-service handle, and returns a pointer to it.
-This routine returns
-.Dv NULL
-if it fails, and an error message is logged.
-.Fa sendsz
-and
-.Fa recvsz
-are parameters used to specify the size of the buffers.
-If they are 0, suitable defaults are chosen.
-The file descriptor
-.Fa fildes
-should be open and bound.
-The server is not registered with
-.Xr rpcbind 8 .
-.Em Warning :
-since connectionless-based RPC
-messages can only hold limited amount of encoded data,
-this transport cannot be used for procedures
-that take large arguments or return huge results.
-.Pp
-.It Fn svc_fd_create
-This routine creates a service on top of an open and bound file descriptor,
-and returns the handle to it.
-Typically, this descriptor is a connected file descriptor for a
-connection-oriented transport.
-.Fa sendsz
-and
-.Fa recvsz
-indicate sizes for the send and receive buffers.
-If they are 0, reasonable defaults are chosen.
-This routine returns
-.Dv NULL
-if it fails, and an error message is logged.
-.Pp
-.It Fn svc_raw_create
-This routine creates an RPC
-service handle and returns a pointer to it.
-The transport is really a buffer within the process's
-address space, so the corresponding RPC
-client should live in the same address space;
-(see
-.Fn clnt_raw_create
-in
-.Xr rpc_clnt_create 3 ) .
-This routine allows simulation of RPC and acquisition of
-RPC overheads (such as round trip times),
-without any kernel and networking interference.
-This routine returns
-.Dv NULL
-if it fails, and an error message is logged.
-.Em Note :
-.Fn svc_run
-should not be called when the raw interface is being used.
-.Pp
-.It Fn svc_tli_create
-This routine creates an RPC
-server handle, and returns a pointer to it.
-.Fa fildes
-is the file descriptor on which the service is listening.
-If
-.Fa fildes
-is
-.Dv RPC_ANYFD ,
-it opens a file descriptor on the transport specified by
-.Fa netconf .
-If the file descriptor is unbound and
-.Fa bindaddr
-is non-null
-.Fa fildes
-is bound to the address specified by
-.Fa bindaddr ,
-otherwise
-.Fa fildes
-is bound to a default address chosen by the transport.
-.Pp
-Note: the
-.Vt t_bind
-structure comes from the TLI/XTI SysV interface, which
-.Nx
-does not use.
-The structure is defined in
-.In rpc/types.h
-for compatibility as:
-.Bd -literal
-struct t_bind {
-    struct netbuf addr;	/* network address, see rpc(3) */
-    unsigned int  qlen;	/* queue length (for listen(2)) */
-};
-.Ed
-.Pp
-In the case where the default address is chosen,
-the number of outstanding connect requests is set to 8
-for connection-oriented transports.
-The user may specify the size of the send and receive buffers
-with the parameters
-.Fa sendsz
-and
-.Fa recvsz ;
-values of 0 choose suitable defaults.
-This routine returns
-.Dv NULL
-if it fails,
-and an error message is logged.
-The server is not registered with the
-.Xr rpcbind 8
-service.
-.Pp
-.It Fn svc_tp_create
-.Fn svc_tp_create
-creates a server handle for the network
-specified by
-.Fa netconf ,
-and registers itself with the rpcbind service.
-.Fa dispatch
-is called when there is a remote procedure call
-for the given
-.Fa prognum
-and
-.Fa versnum ;
-this requires calling
-.Fn svc_run .
-.Fn svc_tp_create
-returns the service handle if it succeeds,
-otherwise a
-.Dv NULL
-is returned and an error message is logged.
-.Pp
-.It Fn svc_vc_create
-This routine creates a connection-oriented RPC
-service and returns a pointer to it.
-This routine returns
-.Dv NULL
-if it fails, and an error message is logged.
-The users may specify the size of the send and receive buffers
-with the parameters
-.Fa sendsz
-and
-.Fa recvsz ;
-values of 0 choose suitable defaults.
-The file descriptor
-.Fa fildes
-should be open and bound.
-The server is not registered with the
-.Xr rpcbind 8
-service.
-.El
-.Sh SEE ALSO
-.Xr rpc 3 ,
-.Xr rpc_svc_calls 3 ,
-.Xr rpc_svc_err 3 ,
-.Xr rpc_svc_reg 3 ,
-.Xr rpcbind 8
diff --git a/lib/libc/rpc/rpc_svc_err.3 b/lib/libc/rpc/rpc_svc_err.3
deleted file mode 100644
index 0eb0ebc34..000000000
--- a/lib/libc/rpc/rpc_svc_err.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\" @(#)rpc_svc_err.3n 1.23 93/08/31 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_svc_err 1.4 89/06/28 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\"	$NetBSD: rpc_svc_err.3,v 1.6 2003/04/16 13:34:43 wiz Exp $
-.Dd May 3, 1993
-.Dt RPC_SVC_ERR 3
-.Os
-.Sh NAME
-.Nm rpc_svc_err ,
-.Nm svcerr_auth ,
-.Nm svcerr_decode ,
-.Nm svcerr_noproc ,
-.Nm svcerr_noprog ,
-.Nm svcerr_progvers ,
-.Nm svcerr_systemerr ,
-.Nm svcerr_weakauth
-.Nd library routines for server side remote procedure call errors
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft void
-.Fn svcerr_auth "const SVCXPRT1 *xprt" "const enum auth_stat why"
-.Ft void
-.Fn svcerr_decode "const SVCXPRT *xprt"
-.Ft void
-.Fn svcerr_noproc "const SVCXPRT *xprt"
-.Ft void
-.Fn svcerr_noprog "const SVCXPRT *xprt"
-.Ft void
-.Fn svcerr_progvers "const SVCXPRT *xprt" "rpcvers_t low_vers" "rpcvers_t high_vers"
-.Ft void
-.Fn svcerr_systemerr "const SVCXPRT *xprt"
-.Ft void
-.Fn svcerr_weakauth "const SVCXPRT *xprt"
-.Sh DESCRIPTION
-These routines are part of the RPC
-library which allows C language programs to make procedure
-calls on other machines across the network.
-.Pp
-These routines can be called by the server side
-dispatch function if there is any error in the
-transaction with the client.
-.Sh ROUTINES
-See
-.Xr rpc 3
-for the definition of the
-.Vt SVCXPRT
-data structure.
-.Pp
-.Bl -tag -width XXXXX
-.It Fn svcerr_auth
-Called by a service dispatch routine that refuses to perform
-a remote procedure call due to an authentication error.
-.Pp
-.Fn svcerr_decode
-Called by a service dispatch routine that cannot successfully
-decode the remote parameters
-(see
-.Fn svc_getargs
-in
-.Xr rpc_svc_reg 3 ) .
-.Pp
-.It Fn svcerr_noproc
-Called by a service dispatch routine that does not implement
-the procedure number that the caller requests.
-.Pp
-.It Fn svcerr_noprog
-Called when the desired program is not registered with the
-RPC package.
-Service implementors usually do not need this routine.
-.Pp
-.It Fn svcerr_progvers
-Called when the desired version of a program is not registered with the
-RPC package.
-.Fa low_vers
-is the lowest version number,
-and
-.Fa high_vers
-is the highest version number.
-Service implementors usually do not need this routine.
-.Pp
-.It Fn svcerr_systemerr
-Called by a service dispatch routine when it detects a system
-error not covered by any particular protocol.
-For example, if a service can no longer allocate storage,
-it may call this routine.
-.Pp
-.It Fn svcerr_weakauth
-Called by a service dispatch routine that refuses to perform
-a remote procedure call due to insufficient (but correct)
-authentication parameters.
-The routine calls
-.Fn svcerr_auth "xprt" "AUTH_TOOWEAK" .
-.El
-.Sh SEE ALSO
-.Xr rpc 3 ,
-.Xr rpc_svc_calls 3 ,
-.Xr rpc_svc_create 3 ,
-.Xr rpc_svc_reg 3
diff --git a/lib/libc/rpc/rpc_svc_reg.3 b/lib/libc/rpc/rpc_svc_reg.3
deleted file mode 100644
index ea9d474e8..000000000
--- a/lib/libc/rpc/rpc_svc_reg.3
+++ /dev/null
@@ -1,196 +0,0 @@
-.\" @(#)rpc_svc_reg.3n 1.32 93/08/31 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_svc_call 1.6 89/07/20 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\"	$NetBSD: rpc_svc_reg.3,v 1.10 2013/03/04 17:29:03 christos Exp $
-.Dd May 3, 1993
-.Dt RPC_SVC_REG 3
-.Os
-.Sh NAME
-.Nm rpc_svc_reg ,
-.Nm rpc_reg ,
-.Nm svc_reg ,
-.Nm svc_unreg ,
-.Nm svc_auth_reg ,
-.Nm xprt_register ,
-.Nm xprt_unregister
-.Nd library routines for registering servers
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft bool_t
-.Fn rpc_reg "const rpcprog_t prognum" "const rpcvers_t versnum" "const rpcproc_t procnum" "const char *(*procname)()" "const xdrproc_t inproc" "const xdrproc_t outproc" "const char *nettype"
-.Ft int
-.Fn svc_reg "const SVCXPRT *xprt" "const rpcprog_t prognum" "const rpcvers_t versnum" "const void (*dispatch(struct svc_req *, SVCXPRT *)" "const struct netconfig *netconf"
-.Ft void
-.Fn svc_unreg "const rpcprog_t prognum" "const rpcvers_t versnum"
-.Ft int
-.Fn svc_auth_reg "const int cred_flavor" "const enum auth_stat (*handler(struct svc_req *, struct rpc_msg *))"
-.Ft bool_t
-.Fn xprt_register "const SVCXPRT *xprt"
-.Ft void
-.Fn xprt_unregister "const SVCXPRT *xprt"
-.Sh DESCRIPTION
-These routines are a part of the RPC
-library which allows the RPC
-servers to register themselves with rpcbind
-(see
-.Xr rpcbind 8 ) ,
-and associate the given program and version
-number with the dispatch function.
-When the RPC server receives a RPC request, the library invokes the
-dispatch routine with the appropriate arguments.
-.Sh ROUTINES
-See
-.Xr rpc 3
-for the definition of the
-.Vt SVCXPRT
-data structure.
-.Pp
-.Bl -tag -width XXXXX
-.It Fn rpc_reg
-Register program
-.Fa prognum ,
-procedure
-.Fa procname ,
-and version
-.Fa versnum
-with the RPC
-service package.
-If a request arrives for program
-.Fa prognum ,
-version
-.Fa versnum ,
-and procedure
-.Fa procnum ,
-.Fa procname
-is called with a pointer to its parameter(s);
-.Fa procname
-should return a pointer to its static result(s);
-.Fa inproc
-is the XDR function used to decode the parameters while
-.Fa outproc
-is the XDR function used to encode the results.
-Procedures are registered on all available transports of the class
-.Fa nettype .
-See
-.Xr rpc 3 .
-This routine returns 0 if the registration succeeded,
--1 otherwise.
-.Pp
-.It Fn svc_reg
-Associates
-.Fa prognum
-and
-.Fa versnum
-with the service dispatch procedure,
-.Fa dispatch .
-If
-.Fa netconf
-is
-.Dv NULL ,
-the service is not registered with the
-.Xr rpcbind 8
-service.
-If
-.Fa netconf
-is non-zero,
-then a mapping of the triple
-[
-.Fa prognum ,
-.Fa versnum ,
-.Fa netconf-\*[Gt]nc_netid ]
-to
-.Fa xprt-\*[Gt]xp_ltaddr
-is established with the local rpcbind
-service.
-.Pp
-The
-.Fn svc_reg
-routine returns 1 if it succeeds,
-and 0 otherwise.
-.Pp
-.It Fn svc_unreg
-Remove from the rpcbind
-service, all mappings of the triple
-[
-.Fa prognum ,
-.Fa versnum ,
-all-transports ]
-to network address
-and all mappings within the RPC service package
-of the double
-[
-.Fa prognum ,
-.Fa versnum ]
-to dispatch routines.
-.Pp
-.It Fn svc_auth_reg
-Registers the service authentication routine
-.Fa handler
-with the dispatch mechanism so that it can be
-invoked to authenticate RPC requests received
-with authentication type
-.Fa cred_flavor .
-This interface allows developers to add new authentication
-types to their RPC applications without needing to modify
-the libraries.
-Service implementors usually do not need this routine.
-.Pp
-Typical service application would call
-.Fn svc_auth_reg
-after registering the service and prior to calling
-.Fn svc_run .
-When needed to process an RPC credential of type
-.Fa cred_flavor ,
-the
-.Fa handler
-procedure will be called with two parameters
-.Fa "struct svc_req *rqst" ,
-and
-.Fa "struct rpc_msg * msg" ,
-and is expected to return a valid
-.Vt "enum auth_stat"
-value.
-There is no provision to change or delete an authentication handler
-once registered.
-.Pp
-The
-.Fn svc_auth_reg
-routine returns 0 if the registration is successful,
-1 if
-.Fa cred_flavor
-already has an authentication handler registered for it,
-and -1 otherwise.
-.Pp
-.It Fn xprt_register
-After RPC service transport handle
-.Fa xprt
-is created, it is registered with the RPC
-service package.
-This routine modifies the global variable
-.Va svc_fdset
-(see
-.Xr rpc_svc_calls 3 ) .
-Service implementors usually do not need this routine.
-.Pp
-.It Fn xprt_unregister
-Before an RPC service transport handle
-.Fa xprt
-is destroyed, it unregisters itself with the
-RPC service package.
-This routine modifies the global variable
-.Va svc_fdset
-(see
-.Xr rpc_svc_calls 3 ) .
-Service implementors usually do not need this routine.
-.El
-.Sh SEE ALSO
-.Xr select 2 ,
-.Xr rpc 3 ,
-.Xr rpc_svc_calls 3 ,
-.Xr rpc_svc_create 3 ,
-.Xr rpc_svc_err 3 ,
-.Xr rpcbind 3 ,
-.Xr rpcbind 8
diff --git a/lib/libc/rpc/rpc_xdr.3 b/lib/libc/rpc/rpc_xdr.3
deleted file mode 100644
index 62e7c85fd..000000000
--- a/lib/libc/rpc/rpc_xdr.3
+++ /dev/null
@@ -1,100 +0,0 @@
-.\" @(#)rpc_xdr.3n 1.24 93/08/31 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_xdr.new 1.1 89/04/06 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $NetBSD: rpc_xdr.3,v 1.8 2009/04/11 16:03:29 joerg Exp $
-.Dd May 3, 1993
-.Dt RPC_XDR 3
-.Os
-.Sh NAME
-.Nm xdr_accepted_reply ,
-.Nm xdr_authsys_parms ,
-.Nm xdr_callhdr ,
-.Nm xdr_callmsg ,
-.Nm xdr_opaque_auth ,
-.Nm xdr_rejected_reply ,
-.Nm xdr_replymsg
-.Nd XDR library routines for remote procedure calls
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft bool_t
-.Fn xdr_accepted_reply "XDR *xdrs" "const struct accepted_reply *ar"
-.Ft bool_t
-.Fn xdr_authsys_parms "XDR *xdrs" "struct authsys_parms *aupp"
-.Ft void
-.Fn xdr_callhdr "XDR *xdrs" "struct rpc_msg *chdr"
-.Ft bool_t
-.Fn xdr_callmsg "XDR *xdrs" "struct rpc_msg *cmsg"
-.Ft bool_t
-.Fn xdr_opaque_auth "XDR *xdrs" "struct opaque_auth *ap"
-.Ft bool_t
-.Fn xdr_rejected_reply "XDR *xdrs" "const struct rejected_reply *rr"
-.Ft bool_t
-.Fn xdr_replymsg "XDR *xdrs" "const struct rpc_msg *rmsg"
-.Sh DESCRIPTION
-These routines are used for describing the
-RPC messages in XDR language.
-They should normally be used by those who do not
-want to use the RPC
-package directly.
-These routines return TRUE if they succeed, FALSE otherwise.
-.Sh ROUTINES
-See
-.Xr rpc 3
-for the definition of the
-.Vt XDR
-data structure.
-.Pp
-.Bl -tag -width XXXXX
-.It Fn xdr_accepted_reply
-Used to translate between RPC
-reply messages and their external representation.
-It includes the status of the RPC
-call in the XDR language format.
-In the case of success, it also includes the call results.
-.Pp
-.It Fn xdr_authsys_parms
-Used for describing UNIX operating system credentials.
-It includes machine-name, uid, gid list, etc.
-.Pp
-.It Fn xdr_callhdr
-Used for describing RPC call header messages.
-It encodes the static part of the call message header in the
-XDR language format.
-It includes information such as transaction
-ID, RPC version number, program and version number.
-.Pp
-.It Fn xdr_callmsg
-Used for describing
-RPC call messages.
-This includes all the  RPC
-call information such as transaction
-ID, RPC version number, program number, version number,
-authentication information, etc.
-This is normally used by servers to determine information about the client
-RPC call.
-.Pp
-.It Fn xdr_opaque_auth
-Used for describing RPC
-opaque authentication information messages.
-.Pp
-.It Fn xdr_rejected_reply
-Used for describing RPC reply messages.
-It encodes the rejected RPC message in the XDR language format.
-The message could be rejected either because of version
-number mis-match or because of authentication errors.
-.Pp
-.It Fn xdr_replymsg
-Used for describing RPC
-reply messages.
-It translates between the
-RPC reply message and its external representation.
-This reply could be either an acceptance,
-rejection or
-.Dv NULL .
-.El
-.Sh SEE ALSO
-.Xr rpc 3 ,
-.Xr xdr 3
diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c
deleted file mode 100644
index 89d57394c..000000000
--- a/lib/libc/rpc/rpcb_clnt.c
+++ /dev/null
@@ -1,1279 +0,0 @@
-/*	$NetBSD: rpcb_clnt.c,v 1.31 2015/03/26 11:31:57 justin Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #ident	"@(#)rpcb_clnt.c	1.27	94/04/24 SMI" */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)rpcb_clnt.c 1.30 89/06/21 Copyr 1988 Sun Micro";
-#else
-__RCSID("$NetBSD: rpcb_clnt.c,v 1.31 2015/03/26 11:31:57 justin Exp $");
-#endif
-#endif
-
-/*
- * rpcb_clnt.c
- * interface to rpcbind rpc service.
- *
- * Copyright (C) 1988, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/utsname.h>
-#include <rpc/rpc.h>
-#include <rpc/rpcb_prot.h>
-#include <rpc/nettype.h>
-#include <netconfig.h>
-#ifdef PORTMAP
-#include <netinet/in.h>		/* FOR IPPROTO_TCP/UDP definitions */
-#include <rpc/pmap_prot.h>
-#endif
-#include <assert.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-
-#include "svc_fdset.h"
-#include "rpc_internal.h"
-
-#ifdef __weak_alias
-__weak_alias(rpcb_set,_rpcb_set)
-__weak_alias(rpcb_unset,_rpcb_unset)
-__weak_alias(rpcb_getmaps,_rpcb_getmaps)
-__weak_alias(rpcb_taddr2uaddr,_rpcb_taddr2uaddr)
-__weak_alias(rpcb_uaddr2taddr,_rpcb_uaddr2taddr)
-#endif
-
-static struct timeval tottimeout = { 60, 0 };
-static const struct timeval rmttimeout = { 3, 0 };
-
-static const char nullstring[] = "\000";
-
-#define	CACHESIZE 6
-
-struct address_cache {
-	char *ac_host;
-	char *ac_netid;
-	char *ac_uaddr;
-	struct netbuf *ac_taddr;
-	struct address_cache *ac_next;
-};
-
-static struct address_cache *front;
-static int cachesize;
-
-#define	CLCR_GET_RPCB_TIMEOUT	1
-#define	CLCR_SET_RPCB_TIMEOUT	2
-
-
-extern int __rpc_lowvers;
-
-static struct address_cache *check_cache(const char *, const char *);
-static void delete_cache(struct netbuf *);
-static void add_cache(const char *, const char *, struct netbuf *, char *);
-static CLIENT *getclnthandle(const char *, const struct netconfig *, char **);
-static CLIENT *local_rpcb(void);
-static struct netbuf *got_entry(rpcb_entry_list_ptr, const struct netconfig *);
-
-/*
- * This routine adjusts the timeout used for calls to the remote rpcbind.
- * Also, this routine can be used to set the use of portmapper version 2
- * only when doing rpc_broadcasts
- * These are private routines that may not be provided in future releases.
- */
-bool_t
-__rpc_control(int request, void *info)
-{
-
-	_DIAGASSERT(info != NULL);
-
-	switch (request) {
-	case CLCR_GET_RPCB_TIMEOUT:
-		*(struct timeval *)info = tottimeout;
-		break;
-	case CLCR_SET_RPCB_TIMEOUT:
-		tottimeout = *(struct timeval *)info;
-		break;
-	case CLCR_SET_LOWVERS:
-		__rpc_lowvers = *(int *)info;
-		break;
-	case CLCR_GET_LOWVERS:
-		*(int *)info = __rpc_lowvers;
-		break;
-	default:
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-/*
- *	It might seem that a reader/writer lock would be more reasonable here.
- *	However because getclnthandle(), the only user of the cache functions,
- *	may do a delete_cache() operation if a check_cache() fails to return an
- *	address useful to clnt_tli_create(), we may as well use a mutex.
- */
-/*
- * As it turns out, if the cache lock is *not* a reader/writer lock, we will
- * block all clnt_create's if we are trying to connect to a host that's down,
- * since the lock will be held all during that time.
- */
-#ifdef _REENTRANT
-extern rwlock_t	rpcbaddr_cache_lock;
-#endif
-
-/*
- * The routines check_cache(), add_cache(), delete_cache() manage the
- * cache of rpcbind addresses for (host, netid).
- */
-
-static struct address_cache *
-check_cache(const char *host, const char *netid)
-{
-	struct address_cache *cptr;
-
-	_DIAGASSERT(host != NULL);
-	_DIAGASSERT(netid != NULL);
-
-	/* READ LOCK HELD ON ENTRY: rpcbaddr_cache_lock */
-
-	for (cptr = front; cptr != NULL; cptr = cptr->ac_next) {
-		if (!strcmp(cptr->ac_host, host) &&
-		    !strcmp(cptr->ac_netid, netid)) {
-#ifdef ND_DEBUG
-			fprintf(stderr, "Found cache entry for %s: %s\n",
-				host, netid);
-#endif
-			return (cptr);
-		}
-	}
-	return NULL;
-}
-
-static void
-delete_cache(struct netbuf *addr)
-{
-	struct address_cache *cptr, *prevptr = NULL;
-
-	_DIAGASSERT(addr != NULL);
-
-	/* WRITE LOCK HELD ON ENTRY: rpcbaddr_cache_lock */
-	for (cptr = front; cptr != NULL; cptr = cptr->ac_next) {
-		if (!memcmp(cptr->ac_taddr->buf, addr->buf, addr->len)) {
-			free(cptr->ac_host);
-			free(cptr->ac_netid);
-			free(cptr->ac_taddr->buf);
-			free(cptr->ac_taddr);
-			if (cptr->ac_uaddr)
-				free(cptr->ac_uaddr);
-			if (prevptr)
-				prevptr->ac_next = cptr->ac_next;
-			else
-				front = cptr->ac_next;
-			free(cptr);
-			cachesize--;
-			break;
-		}
-		prevptr = cptr;
-	}
-}
-
-static void
-add_cache(const char *host, const char *netid, struct netbuf *taddr,
-	char *uaddr)
-{
-	struct address_cache  *ad_cache, *cptr, *prevptr;
-
-	_DIAGASSERT(host != NULL);
-	_DIAGASSERT(netid != NULL);
-	/* uaddr may be NULL */
-	/* taddr may be NULL ??? */
-
-	ad_cache = malloc(sizeof(*ad_cache));
-	if (!ad_cache) {
-		return;
-	}
-	ad_cache->ac_host = strdup(host);
-	ad_cache->ac_netid = strdup(netid);
-	ad_cache->ac_uaddr = uaddr ? strdup(uaddr) : NULL;
-	ad_cache->ac_taddr = malloc(sizeof(*ad_cache->ac_taddr));
-	if (!ad_cache->ac_host || !ad_cache->ac_netid || !ad_cache->ac_taddr ||
-		(uaddr && !ad_cache->ac_uaddr)) {
-		goto out;
-	}
-	ad_cache->ac_taddr->len = ad_cache->ac_taddr->maxlen = taddr->len;
-	ad_cache->ac_taddr->buf = malloc(taddr->len);
-	if (ad_cache->ac_taddr->buf == NULL) {
-out:
-		if (ad_cache->ac_host)
-			free(ad_cache->ac_host);
-		if (ad_cache->ac_netid)
-			free(ad_cache->ac_netid);
-		if (ad_cache->ac_uaddr)
-			free(ad_cache->ac_uaddr);
-		if (ad_cache->ac_taddr)
-			free(ad_cache->ac_taddr);
-		free(ad_cache);
-		return;
-	}
-	memcpy(ad_cache->ac_taddr->buf, taddr->buf, taddr->len);
-#ifdef ND_DEBUG
-	fprintf(stderr, "Added to cache: %s : %s\n", host, netid);
-#endif
-
-/* VARIABLES PROTECTED BY rpcbaddr_cache_lock:  cptr */
-
-	rwlock_wrlock(&rpcbaddr_cache_lock);
-	if (cachesize < CACHESIZE) {
-		ad_cache->ac_next = front;
-		front = ad_cache;
-		cachesize++;
-	} else {
-		/* Free the last entry */
-		cptr = front;
-		prevptr = NULL;
-		while (cptr->ac_next) {
-			prevptr = cptr;
-			cptr = cptr->ac_next;
-		}
-
-#ifdef ND_DEBUG
-		fprintf(stderr, "Deleted from cache: %s : %s\n",
-			cptr->ac_host, cptr->ac_netid);
-#endif
-		free(cptr->ac_host);
-		free(cptr->ac_netid);
-		free(cptr->ac_taddr->buf);
-		free(cptr->ac_taddr);
-		if (cptr->ac_uaddr)
-			free(cptr->ac_uaddr);
-
-		if (prevptr) {
-			prevptr->ac_next = NULL;
-			ad_cache->ac_next = front;
-			front = ad_cache;
-		} else {
-			front = ad_cache;
-			ad_cache->ac_next = NULL;
-		}
-		free(cptr);
-	}
-	rwlock_unlock(&rpcbaddr_cache_lock);
-}
-
-/*
- * This routine will return a client handle that is connected to the
- * rpcbind. Returns NULL on error and free's everything.
- */
-static CLIENT *
-getclnthandle(const char *host, const struct netconfig *nconf, char **targaddr)
-{
-	CLIENT *client;
-	struct netbuf *addr, taddr;
-	struct netbuf addr_to_delete;
-	struct __rpc_sockinfo si;
-	struct addrinfo hints, *res, *tres;
-	struct address_cache *ad_cache;
-	char *tmpaddr;
-
-	_DIAGASSERT(host != NULL);
-	_DIAGASSERT(nconf != NULL);
-	/* targaddr may be NULL */
-
-/* VARIABLES PROTECTED BY rpcbaddr_cache_lock:  ad_cache */
-
-	/* Get the address of the rpcbind.  Check cache first */
-	client = NULL;
-	addr_to_delete.len = 0;
-	addr_to_delete.buf = NULL;
-	rwlock_rdlock(&rpcbaddr_cache_lock);
-	ad_cache = check_cache(host, nconf->nc_netid);
-	if (ad_cache != NULL) {
-		addr = ad_cache->ac_taddr;
-		client = clnt_tli_create(RPC_ANYFD, nconf, addr,
-		    (rpcprog_t)RPCBPROG, (rpcvers_t)RPCBVERS4, 0, 0);
-		if (client != NULL) {
-			if (targaddr)
-				*targaddr = ad_cache->ac_uaddr;
-			rwlock_unlock(&rpcbaddr_cache_lock);
-			return (client);
-		}
-		addr_to_delete.len = addr->len;
-		addr_to_delete.buf = malloc(addr->len);
-		if (addr_to_delete.buf == NULL) {
-			addr_to_delete.len = 0;
-		} else {
-			memcpy(addr_to_delete.buf, addr->buf, addr->len);
-		}
-	}
-	rwlock_unlock(&rpcbaddr_cache_lock);
-	if (addr_to_delete.len != 0) {
-		/*
-		 * Assume this may be due to cache data being
-		 *  outdated
-		 */
-		rwlock_wrlock(&rpcbaddr_cache_lock);
-		delete_cache(&addr_to_delete);
-		rwlock_unlock(&rpcbaddr_cache_lock);
-		free(addr_to_delete.buf);
-	}
-	if (!__rpc_nconf2sockinfo(nconf, &si)) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return NULL;
-	}
-
-	memset(&hints, 0, sizeof hints);
-	hints.ai_family = si.si_af;
-	hints.ai_socktype = si.si_socktype;
-	hints.ai_protocol = si.si_proto;
-
-#ifdef CLNT_DEBUG
-	printf("trying netid %s family %d proto %d socktype %d\n",
-	    nconf->nc_netid, si.si_af, si.si_proto, si.si_socktype);
-#endif
-
-	if (getaddrinfo(host, "sunrpc", &hints, &res) != 0) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNHOST;
-		return NULL;
-	}
-
-	for (tres = res; tres != NULL; tres = tres->ai_next) {
-		taddr.buf = tres->ai_addr;
-		taddr.len = taddr.maxlen = tres->ai_addrlen;
-
-#ifdef ND_DEBUG
-		{
-			char *ua;
-
-			ua = taddr2uaddr(nconf, &taddr);
-			fprintf(stderr, "Got it [%s]\n", ua);
-			free(ua);
-		}
-#endif
-
-#ifdef ND_DEBUG
-		{
-			int i;
-
-			fprintf(stderr, "\tnetbuf len = %d, maxlen = %d\n",
-				taddr.len, taddr.maxlen);
-			fprintf(stderr, "\tAddress is ");
-			for (i = 0; i < taddr.len; i++)
-				fprintf(stderr, "%u.", ((char *)(taddr.buf))[i]);
-			fprintf(stderr, "\n");
-		}
-#endif
-		client = clnt_tli_create(RPC_ANYFD, nconf, &taddr,
-		    (rpcprog_t)RPCBPROG, (rpcvers_t)RPCBVERS4, 0, 0);
-#ifdef ND_DEBUG
-		if (! client) {
-			clnt_pcreateerror("rpcbind clnt interface");
-		}
-#endif
-
-		if (client) {
-			tmpaddr = targaddr ? taddr2uaddr(nconf, &taddr) : NULL;
-			add_cache(host, nconf->nc_netid, &taddr, tmpaddr);
-			if (targaddr)
-				*targaddr = tmpaddr;
-			break;
-		}
-	}
-	freeaddrinfo(res);
-	return (client);
-}
-
-/* XXX */
-#define IN4_LOCALHOST_STRING	"127.0.0.1"
-#define IN6_LOCALHOST_STRING	"::1"
-
-/*
- * This routine will return a client handle that is connected to the local
- * rpcbind. Returns NULL on error and free's everything.
- */
-static CLIENT *
-local_rpcb(void)
-{
-	CLIENT *client;
-	static struct netconfig *loopnconf;
-	static const char *hostname;
-#ifdef _REENTRANT
-	extern mutex_t loopnconf_lock;
-#endif
-	int sock;
-	size_t tsize;
-	struct netbuf nbuf;
-	struct sockaddr_un sun;
-
-	/*
-	 * Try connecting to the local rpcbind through a local socket
-	 * first. If this doesn't work, try all transports defined in
-	 * the netconfig file.
-	 */
-	memset(&sun, 0, sizeof sun);
-	sock = socket(AF_LOCAL, SOCK_STREAM, 0);
-	if (sock < 0)
-		goto try_nconf;
-	sun.sun_family = AF_LOCAL;
-	strcpy(sun.sun_path, _PATH_RPCBINDSOCK);
-	tsize = SUN_LEN(&sun);
-	_DIAGASSERT(__type_fit(uint8_t, tsize));
-	nbuf.len = sun.sun_len = (uint8_t)tsize;
-	nbuf.maxlen = sizeof (struct sockaddr_un);
-	nbuf.buf = &sun;
-
-	tsize = __rpc_get_t_size(AF_LOCAL, 0, 0);
-	_DIAGASSERT(__type_fit(u_int, tsize));
-	client = clnt_vc_create(sock, &nbuf, (rpcprog_t)RPCBPROG,
-	    (rpcvers_t)RPCBVERS, (u_int)tsize, (u_int)tsize);
-
-	if (client != NULL) {
-		/* XXX - mark the socket to be closed in destructor */
-		(void) CLNT_CONTROL(client, CLSET_FD_CLOSE, NULL);
-		return client;
-	}
-
-	/* XXX - nobody needs this socket anymore, free the descriptor */
-	close(sock);
-
-try_nconf:
-
-/* VARIABLES PROTECTED BY loopnconf_lock: loopnconf */
-	mutex_lock(&loopnconf_lock);
-	if (loopnconf == NULL) {
-		struct netconfig *nconf, *tmpnconf = NULL;
-		void *nc_handle;
-		int fd;
-
-		nc_handle = setnetconfig();
-		if (nc_handle == NULL) {
-			/* fails to open netconfig file */
-			syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-			rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			mutex_unlock(&loopnconf_lock);
-			return (NULL);
-		}
-		while ((nconf = getnetconfig(nc_handle)) != NULL) {
-#ifdef INET6
-			if ((strcmp(nconf->nc_protofmly, NC_INET6) == 0 ||
-#else
-			if ((
-#endif
-			     strcmp(nconf->nc_protofmly, NC_INET) == 0) &&
-			    (nconf->nc_semantics == NC_TPI_COTS ||
-			     nconf->nc_semantics == NC_TPI_COTS_ORD)) {
-				fd = __rpc_nconf2fd(nconf);
-				/*
-				 * Can't create a socket, assume that
-				 * this family isn't configured in the kernel.
-				 */
-				if (fd < 0)
-					continue;
-				close(fd);
-				tmpnconf = nconf;
-				if (!strcmp(nconf->nc_protofmly, NC_INET))
-					hostname = IN4_LOCALHOST_STRING;
-				else
-					hostname = IN6_LOCALHOST_STRING;
-			}
-		}
-		if (tmpnconf == NULL) {
-			rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			mutex_unlock(&loopnconf_lock);
-			return (NULL);
-		}
-		loopnconf = getnetconfigent(tmpnconf->nc_netid);
-		/* loopnconf is never freed */
-		endnetconfig(nc_handle);
-	}
-	mutex_unlock(&loopnconf_lock);
-	client = getclnthandle(hostname, loopnconf, NULL);
-	return (client);
-}
-
-/*
- * Set a mapping between program, version and address.
- * Calls the rpcbind service to do the mapping.
- */
-bool_t
-rpcb_set(rpcprog_t program, rpcvers_t version,
-	const struct netconfig *nconf,	/* Network structure of transport */
-	const struct netbuf *address)	/* Services netconfig address */
-{
-	CLIENT *client;
-	bool_t rslt = FALSE;
-	RPCB parms;
-	char uidbuf[32];
-
-	/* parameter checking */
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (FALSE);
-	}
-	if (address == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
-		return (FALSE);
-	}
-	client = local_rpcb();
-	if (! client) {
-		return (FALSE);
-	}
-
-	/* convert to universal */
-	parms.r_addr = taddr2uaddr(__UNCONST(nconf), __UNCONST(address));
-	if (!parms.r_addr) {
-		CLNT_DESTROY(client);
-		rpc_createerr.cf_stat = RPC_N2AXLATEFAILURE;
-		return (FALSE); /* no universal address */
-	}
-	parms.r_prog = program;
-	parms.r_vers = version;
-	parms.r_netid = nconf->nc_netid;
-	/*
-	 * Though uid is not being used directly, we still send it for
-	 * completeness.  For non-unix platforms, perhaps some other
-	 * string or an empty string can be sent.
-	 */
-	(void) snprintf(uidbuf, sizeof uidbuf, "%d", geteuid());
-	parms.r_owner = uidbuf;
-
-	if (CLNT_CALL(client, (rpcproc_t)RPCBPROC_SET, (xdrproc_t) xdr_rpcb,
-	    (char *)(void *)&parms, (xdrproc_t) xdr_bool,
-	    (char *)(void *)&rslt, tottimeout) != RPC_SUCCESS) {
-		rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-		clnt_geterr(client, &rpc_createerr.cf_error);
-	}
-
-	CLNT_DESTROY(client);
-	free(parms.r_addr);
-	return (rslt);
-}
-
-/*
- * Remove the mapping between program, version and netbuf address.
- * Calls the rpcbind service to do the un-mapping.
- * If netbuf is NULL, unset for all the transports, otherwise unset
- * only for the given transport.
- */
-bool_t
-rpcb_unset(rpcprog_t program, rpcvers_t version, const struct netconfig *nconf)
-{
-	CLIENT *client;
-	bool_t rslt = FALSE;
-	RPCB parms;
-	char uidbuf[32];
-
-	client = local_rpcb();
-	if (! client) {
-		return (FALSE);
-	}
-
-	parms.r_prog = program;
-	parms.r_vers = version;
-	if (nconf)
-		parms.r_netid = nconf->nc_netid;
-	else {
-		parms.r_netid = __UNCONST(&nullstring[0]); /* unsets  all */
-	}
-	parms.r_addr = __UNCONST(&nullstring[0]);
-	(void) snprintf(uidbuf, sizeof uidbuf, "%d", geteuid());
-	parms.r_owner = uidbuf;
-
-	if (CLNT_CALL(client, (rpcproc_t)RPCBPROC_UNSET, (xdrproc_t) xdr_rpcb,
-	    (char *)(void *)&parms, (xdrproc_t) xdr_bool,
-	    (char *)(void *)&rslt, tottimeout) != RPC_SUCCESS) {
-		rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-		clnt_geterr(client, &rpc_createerr.cf_error);
-	}
-
-	CLNT_DESTROY(client);
-	return (rslt);
-}
-
-/*
- * From the merged list, find the appropriate entry
- */
-static struct netbuf *
-got_entry(rpcb_entry_list_ptr relp, const struct netconfig *nconf)
-{
-	struct netbuf *na = NULL;
-	rpcb_entry_list_ptr sp;
-	rpcb_entry *rmap;
-
-	_DIAGASSERT(nconf != NULL);
-
-	for (sp = relp; sp != NULL; sp = sp->rpcb_entry_next) {
-		rmap = &sp->rpcb_entry_map;
-		if ((strcmp(nconf->nc_proto, rmap->r_nc_proto) == 0) &&
-		    (strcmp(nconf->nc_protofmly, rmap->r_nc_protofmly) == 0) &&
-		    (nconf->nc_semantics == rmap->r_nc_semantics) &&
-		    (rmap->r_maddr != NULL) && (rmap->r_maddr[0] != 0)) {
-			na = uaddr2taddr(nconf, rmap->r_maddr);
-#ifdef ND_DEBUG
-			fprintf(stderr, "\tRemote address is [%s].\n",
-				rmap->r_maddr);
-			if (!na)
-				fprintf(stderr,
-				    "\tCouldn't resolve remote address!\n");
-#endif
-			break;
-		}
-	}
-	return (na);
-}
-
-/*
- * An internal function which optimizes rpcb_getaddr function.  It also
- * returns the client handle that it uses to contact the remote rpcbind.
- *
- * The algorithm used: If the transports is TCP or UDP, it first tries
- * version 2 (portmap), 4 and then 3 (svr4).  This order should be
- * changed in the next OS release to 4, 2 and 3.  We are assuming that by
- * that time, version 4 would be available on many machines on the network.
- * With this algorithm, we get performance as well as a plan for
- * obsoleting version 2.
- *
- * For all other transports, the algorithm remains as 4 and then 3.
- *
- * XXX: Due to some problems with t_connect(), we do not reuse the same client
- * handle for COTS cases and hence in these cases we do not return the
- * client handle.  This code will change if t_connect() ever
- * starts working properly.  Also look under clnt_vc.c.
- */
-struct netbuf *
-__rpcb_findaddr(rpcprog_t program, rpcvers_t version,
-	const struct netconfig *nconf, const char *host, CLIENT **clpp)
-{
-	CLIENT *client = NULL;
-	RPCB parms;
-	enum clnt_stat clnt_st;
-	char *ua = NULL;
-	rpcvers_t vers;
-	struct netbuf *address = NULL;
-	rpcvers_t start_vers = RPCBVERS4;
-	struct netbuf servaddr;
-
-	/* nconf is handled below */
-	_DIAGASSERT(host != NULL);
-	/* clpp may be NULL */
-
-	/* parameter checking */
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-
-	parms.r_addr = NULL;
-
-#ifdef PORTMAP
-	/* Try version 2 for TCP or UDP */
-	if (strcmp(nconf->nc_protofmly, NC_INET) == 0) {
-		u_short port = 0;
-		struct netbuf remote;
-		rpcvers_t pmapvers = 2;
-		struct pmap pmapparms;
-
-		/*
-		 * Try UDP only - there are some portmappers out
-		 * there that use UDP only.
-		 */
-		if (strcmp(nconf->nc_proto, NC_TCP) == 0) {
-			struct netconfig *newnconf;
-
-			if ((newnconf = getnetconfigent("udp")) == NULL) {
-				rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-				return (NULL);
-			}
-			client = getclnthandle(host, newnconf, &parms.r_addr);
-			freenetconfigent(newnconf);
-		} else {
-			client = getclnthandle(host, nconf, &parms.r_addr);
-		}
-		if (client == NULL) {
-			return (NULL);
-		}
-
-		/* Set the version */
-		CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&pmapvers);
-		pmapparms.pm_prog = program;
-		pmapparms.pm_vers = version;
-		pmapparms.pm_prot = strcmp(nconf->nc_proto, NC_TCP) ?
-					IPPROTO_UDP : IPPROTO_TCP;
-		pmapparms.pm_port = 0;	/* not needed */
-		clnt_st = CLNT_CALL(client, (rpcproc_t)PMAPPROC_GETPORT,
-		    (xdrproc_t) xdr_pmap, (caddr_t)(void *)&pmapparms,
-		    (xdrproc_t) xdr_u_short, (caddr_t)(void *)&port,
-		    tottimeout);
-		if (clnt_st != RPC_SUCCESS) {
-			if ((clnt_st == RPC_PROGVERSMISMATCH) ||
-				(clnt_st == RPC_PROGUNAVAIL))
-				goto try_rpcbind; /* Try different versions */
-			rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-			clnt_geterr(client, &rpc_createerr.cf_error);
-			goto error;
-		} else if (port == 0) {
-			address = NULL;
-			rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
-			goto error;
-		}
-		port = htons(port);
-		CLNT_CONTROL(client, CLGET_SVC_ADDR, (char *)(void *)&remote);
-		if (((address = malloc(sizeof(struct netbuf))) == NULL) ||
-		    ((address->buf = malloc(remote.len)) == NULL)) {
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			clnt_geterr(client, &rpc_createerr.cf_error);
-			if (address) {
-				free(address);
-				address = NULL;
-			}
-			goto error;
-		}
-		memcpy(address->buf, remote.buf, remote.len);
-		memcpy(&((char *)address->buf)[sizeof (short)],
-				(char *)(void *)&port, sizeof (short));
-		address->len = address->maxlen = remote.len;
-		goto done;
-	}
-#endif
-
-try_rpcbind:
-	/*
-	 * Now we try version 4 and then 3.
-	 * We also send the remote system the address we used to
-	 * contact it in case it can help to connect back with us
-	 */
-	parms.r_prog = program;
-	parms.r_vers = version;
-	parms.r_owner = __UNCONST(&nullstring[0]);	/* not needed; */
-							/* just for xdring */
-	parms.r_netid = nconf->nc_netid; /* not really needed */
-
-	/*
-	 * If a COTS transport is being used, try getting address via CLTS
-	 * transport.  This works only with version 4.
-	 * NOTE: This is being done for all transports EXCEPT LOOPBACK
-	 * because with loopback the cost to go to a COTS is same as
-	 * the cost to go through CLTS, plus you get the advantage of
-	 * finding out immediately if the local rpcbind process is dead.
-	 */
-#if 1
-	if ((nconf->nc_semantics == NC_TPI_COTS_ORD ||
-			nconf->nc_semantics == NC_TPI_COTS) &&
-	    (strcmp(nconf->nc_protofmly, NC_LOOPBACK) != 0))
-#else
-	if (client != NULL) {
-		CLNT_DESTROY(client);
-		client = NULL;
-	}
-	if (nconf->nc_semantics == NC_TPI_CLTS)
-#endif
-	{
-		void *handle;
-		struct netconfig *nconf_clts;
-		rpcb_entry_list_ptr relp = NULL;
-
-		if (client == NULL) {
-			/* This did not go through the above PORTMAP/TCP code */
-#if 1
-			if ((handle = __rpc_setconf("datagram_v")) != NULL)
-#else
-			if ((handle = __rpc_setconf("circuit_v")) != NULL)
-#endif
-			{
-				while ((nconf_clts = __rpc_getconf(handle))
-					!= NULL) {
-					if (strcmp(nconf_clts->nc_protofmly,
-						nconf->nc_protofmly) != 0) {
-						continue;
-					}
-					client = getclnthandle(host, nconf_clts,
-							&parms.r_addr);
-					break;
-				}
-				__rpc_endconf(handle);
-			}
-			if (client == NULL)
-				goto regular_rpcbind;	/* Go the regular way */
-		} else {
-			/* This is a UDP PORTMAP handle.  Change to version 4 */
-			vers = RPCBVERS4;
-			CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&vers);
-		}
-		/*
-		 * We also send the remote system the address we used to
-		 * contact it in case it can help it connect back with us
-		 */
-		if (parms.r_addr == NULL) {
-			/* for XDRing */
-			parms.r_addr = __UNCONST(&nullstring[0]); 
-		}
-		clnt_st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_GETADDRLIST,
-		    (xdrproc_t) xdr_rpcb, (char *)(void *)&parms,
-		    (xdrproc_t) xdr_rpcb_entry_list_ptr,
-		    (char *)(void *)&relp, tottimeout);
-		if (clnt_st == RPC_SUCCESS) {
-			if ((address = got_entry(relp, nconf)) != NULL) {
-				xdr_free((xdrproc_t) xdr_rpcb_entry_list_ptr,
-				    (char *)(void *)&relp);
-				CLNT_CONTROL(client, CLGET_SVC_ADDR,
-					(char *)(void *)&servaddr);
-				__rpc_fixup_addr(address, &servaddr);
-				goto done;
-			}
-			/* Entry not found for this transport */
-			xdr_free((xdrproc_t) xdr_rpcb_entry_list_ptr,
-			    (char *)(void *)&relp);
-			/*
-			 * XXX: should have perhaps returned with error but
-			 * since the remote machine might not always be able
-			 * to send the address on all transports, we try the
-			 * regular way with regular_rpcbind
-			 */
-			goto regular_rpcbind;
-		} else if ((clnt_st == RPC_PROGVERSMISMATCH) ||
-			(clnt_st == RPC_PROGUNAVAIL)) {
-			start_vers = RPCBVERS;	/* Try version 3 now */
-			goto regular_rpcbind; /* Try different versions */
-		} else {
-			rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-			clnt_geterr(client, &rpc_createerr.cf_error);
-			goto error;
-		}
-	}
-
-regular_rpcbind:
-
-	/* Now the same transport is to be used to get the address */
-#if 1
-	if (client && ((nconf->nc_semantics == NC_TPI_COTS_ORD) ||
-			(nconf->nc_semantics == NC_TPI_COTS)))
-#else
-	if (client && nconf->nc_semantics == NC_TPI_CLTS)
-#endif
-	{
-		/* A CLTS type of client - destroy it */
-		CLNT_DESTROY(client);
-		client = NULL;
-	}
-
-	if (client == NULL) {
-		client = getclnthandle(host, nconf, &parms.r_addr);
-		if (client == NULL) {
-			goto error;
-		}
-	}
-	if (parms.r_addr == NULL)
-		parms.r_addr = __UNCONST(&nullstring[0]);
-
-	/* First try from start_vers and then version 3 (RPCBVERS) */
-	for (vers = start_vers;  vers >= RPCBVERS; vers--) {
-		/* Set the version */
-		CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&vers);
-		clnt_st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_GETADDR,
-		    (xdrproc_t) xdr_rpcb, (char *)(void *)&parms,
-		    (xdrproc_t) xdr_wrapstring, (char *)(void *) &ua,
-		    tottimeout);
-		if (clnt_st == RPC_SUCCESS) {
-			if ((ua == NULL) || (ua[0] == 0)) {
-				/* address unknown */
-				rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
-				goto error;
-			}
-			address = uaddr2taddr(nconf, ua);
-#ifdef ND_DEBUG
-			fprintf(stderr, "\tRemote address is [%s]\n", ua);
-			if (!address)
-				fprintf(stderr,
-					"\tCouldn't resolve remote address!\n");
-#endif
-			xdr_free((xdrproc_t)xdr_wrapstring,
-			    (char *)(void *)&ua);
-
-			if (! address) {
-				/* We don't know about your universal address */
-				rpc_createerr.cf_stat = RPC_N2AXLATEFAILURE;
-				goto error;
-			}
-			CLNT_CONTROL(client, CLGET_SVC_ADDR,
-			    (char *)(void *)&servaddr);
-			__rpc_fixup_addr(address, &servaddr);
-			goto done;
-		} else if (clnt_st == RPC_PROGVERSMISMATCH) {
-			struct rpc_err rpcerr;
-
-			clnt_geterr(client, &rpcerr);
-			if (rpcerr.re_vers.low > RPCBVERS4)
-				goto error;  /* a new version, can't handle */
-		} else if (clnt_st != RPC_PROGUNAVAIL) {
-			/* Cant handle this error */
-			rpc_createerr.cf_stat = clnt_st;
-			clnt_geterr(client, &rpc_createerr.cf_error);
-			goto error;
-		}
-	}
-
-error:
-	if (client) {
-		CLNT_DESTROY(client);
-		client = NULL;
-	}
-done:
-	if (nconf->nc_semantics != NC_TPI_CLTS) {
-		/* This client is the connectionless one */
-		if (client) {
-			CLNT_DESTROY(client);
-			client = NULL;
-		}
-	}
-	if (clpp) {
-		*clpp = client;
-	} else if (client) {
-		CLNT_DESTROY(client);
-	}
-	return (address);
-}
-
-
-/*
- * Find the mapped address for program, version.
- * Calls the rpcbind service remotely to do the lookup.
- * Uses the transport specified in nconf.
- * Returns FALSE (0) if no map exists, else returns 1.
- *
- * Assuming that the address is all properly allocated
- */
-bool_t
-rpcb_getaddr(const rpcprog_t program, const rpcvers_t version,
-	const struct netconfig *nconf, struct netbuf *address,
-	const char *host)
-{
-	struct netbuf *na;
-
-	_DIAGASSERT(address != NULL);
-
-	if ((na = __rpcb_findaddr(program, version, nconf,
-				host, NULL)) == NULL)
-		return (FALSE);
-
-	if (na->len > address->maxlen) {
-		/* Too long address */
-		free(na->buf);
-		free(na);
-		rpc_createerr.cf_stat = RPC_FAILED;
-		return (FALSE);
-	}
-	memcpy(address->buf, na->buf, (size_t)na->len);
-	address->len = na->len;
-	free(na->buf);
-	free(na);
-	return (TRUE);
-}
-
-/*
- * Get a copy of the current maps.
- * Calls the rpcbind service remotely to get the maps.
- *
- * It returns only a list of the services
- * It returns NULL on failure.
- */
-rpcblist *
-rpcb_getmaps(const struct netconfig *nconf, const char *host)
-{
-	rpcblist_ptr head = NULL;
-	CLIENT *client;
-	enum clnt_stat clnt_st;
-	rpcvers_t vers = 0;
-
-	client = getclnthandle(host, nconf, NULL);
-	if (client == NULL) {
-		return (head);
-	}
-	clnt_st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_DUMP,
-	    (xdrproc_t) xdr_void, NULL, (xdrproc_t) xdr_rpcblist_ptr,
-	    (char *)(void *)&head, tottimeout);
-	if (clnt_st == RPC_SUCCESS)
-		goto done;
-
-	if ((clnt_st != RPC_PROGVERSMISMATCH) &&
-	    (clnt_st != RPC_PROGUNAVAIL)) {
-		rpc_createerr.cf_stat = RPC_RPCBFAILURE;
-		clnt_geterr(client, &rpc_createerr.cf_error);
-		goto done;
-	}
-
-	/* fall back to earlier version */
-	CLNT_CONTROL(client, CLGET_VERS, (char *)(void *)&vers);
-	if (vers == RPCBVERS4) {
-		vers = RPCBVERS;
-		CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&vers);
-		if (CLNT_CALL(client, (rpcproc_t)RPCBPROC_DUMP,
-		    (xdrproc_t) xdr_void, NULL, (xdrproc_t) xdr_rpcblist_ptr,
-		    (char *)(void *)&head, tottimeout) == RPC_SUCCESS)
-			goto done;
-	}
-	rpc_createerr.cf_stat = RPC_RPCBFAILURE;
-	clnt_geterr(client, &rpc_createerr.cf_error);
-
-done:
-	CLNT_DESTROY(client);
-	return (head);
-}
-
-/*
- * rpcbinder remote-call-service interface.
- * This routine is used to call the rpcbind remote call service
- * which will look up a service program in the address maps, and then
- * remotely call that routine with the given parameters. This allows
- * programs to do a lookup and call in one step.
-*/
-enum clnt_stat
-rpcb_rmtcall(
-	const struct netconfig *nconf,	/* Netconfig structure */
-	const char *host,		/* Remote host name */
-	rpcprog_t prog,
-	rpcvers_t vers,
-	rpcproc_t proc,			/* Remote proc identifiers */
-	xdrproc_t xdrargs,
-	const char *argsp,		/* Argument */
-	xdrproc_t xdrres,		/* XDR routines */
-	caddr_t resp,			/* Result */
-	struct timeval tout,		/* Timeout value for this call */
-	const struct netbuf *addr_ptr)	/* Preallocated netbuf address */
-{
-	CLIENT *client;
-	enum clnt_stat stat;
-	struct r_rpcb_rmtcallargs a;
-	struct r_rpcb_rmtcallres r;
-	rpcvers_t rpcb_vers;
-
-	stat = RPC_FAILED;	/* XXXGCC -Wuninitialized [dreamcast] */
-
-	client = getclnthandle(host, nconf, NULL);
-	if (client == NULL) {
-		return (RPC_FAILED);
-	}
-	CLNT_CONTROL(client, CLSET_RETRY_TIMEOUT, __UNCONST(&rmttimeout));
-	a.prog = prog;
-	a.vers = vers;
-	a.proc = proc;
-	a.args.args_val = argsp;
-	a.xdr_args = xdrargs;
-	r.addr = NULL;
-	r.results.results_val = resp;
-	r.xdr_res = xdrres;
-
-	for (rpcb_vers = RPCBVERS4; rpcb_vers >= RPCBVERS; rpcb_vers--) {
-		CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&rpcb_vers);
-		stat = CLNT_CALL(client, (rpcproc_t)RPCBPROC_CALLIT,
-		    (xdrproc_t) xdr_rpcb_rmtcallargs, (char *)(void *)&a,
-		    (xdrproc_t) xdr_rpcb_rmtcallres, (char *)(void *)&r, tout);
-		if ((stat == RPC_SUCCESS) && (addr_ptr != NULL)) {
-			struct netbuf *na;
-			na = uaddr2taddr(__UNCONST(nconf), r.addr);
-			if (!na) {
-				stat = RPC_N2AXLATEFAILURE;
-				((struct netbuf *)__UNCONST(addr_ptr))->len = 0;
-				goto error;
-			}
-			if (na->len > addr_ptr->maxlen) {
-				/* Too long address */
-				stat = RPC_FAILED; /* XXX A better error no */
-				free(na->buf);
-				free(na);
-				((struct netbuf *)__UNCONST(addr_ptr))->len = 0;
-				goto error;
-			}
-			memcpy(addr_ptr->buf, na->buf, (size_t)na->len);
-			((struct netbuf *)__UNCONST(addr_ptr))->len = na->len;
-			free(na->buf);
-			free(na);
-			break;
-		} else if ((stat != RPC_PROGVERSMISMATCH) &&
-			    (stat != RPC_PROGUNAVAIL)) {
-			goto error;
-		}
-	}
-error:
-	CLNT_DESTROY(client);
-	if (r.addr)
-		xdr_free((xdrproc_t) xdr_wrapstring, (char *)(void *)&r.addr);
-	return (stat);
-}
-
-/*
- * Gets the time on the remote host.
- * Returns 1 if succeeds else 0.
- */
-bool_t
-rpcb_gettime(const char *host, time_t *timep)
-{
-	CLIENT *client = NULL;
-	void *handle;
-	struct netconfig *nconf;
-	rpcvers_t vers;
-	enum clnt_stat st;
-
-
-	if ((host == NULL) || (host[0] == 0)) {
-		time(timep);
-		return (TRUE);
-	}
-
-	if ((handle = __rpc_setconf("netpath")) == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (FALSE);
-	}
-	rpc_createerr.cf_stat = RPC_SUCCESS;
-	while (client == NULL) {
-		if ((nconf = __rpc_getconf(handle)) == NULL) {
-			if (rpc_createerr.cf_stat == RPC_SUCCESS)
-				rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			break;
-		}
-		client = getclnthandle(host, nconf, NULL);
-		if (client)
-			break;
-	}
-	__rpc_endconf(handle);
-	if (client == NULL) {
-		return (FALSE);
-	}
-
-	st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_GETTIME,
-		(xdrproc_t) xdr_void, NULL,
-		(xdrproc_t) xdr_int, (char *)(void *)timep, tottimeout);
-
-	if ((st == RPC_PROGVERSMISMATCH) || (st == RPC_PROGUNAVAIL)) {
-		CLNT_CONTROL(client, CLGET_VERS, (char *)(void *)&vers);
-		if (vers == RPCBVERS4) {
-			/* fall back to earlier version */
-			vers = RPCBVERS;
-			CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&vers);
-			st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_GETTIME,
-				(xdrproc_t) xdr_void, NULL,
-				(xdrproc_t) xdr_int, (char *)(void *)timep,
-				tottimeout);
-		}
-	}
-	CLNT_DESTROY(client);
-	return (st == RPC_SUCCESS? TRUE: FALSE);
-}
-
-/*
- * Converts taddr to universal address.  This routine should never
- * really be called because local n2a libraries are always provided.
- */
-char *
-rpcb_taddr2uaddr(struct netconfig *nconf, struct netbuf *taddr)
-{
-	CLIENT *client;
-	char *uaddr = NULL;
-
-	/* parameter checking */
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-	if (taddr == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
-		return (NULL);
-	}
-	client = local_rpcb();
-	if (! client) {
-		return (NULL);
-	}
-
-	if (CLNT_CALL(client, (rpcproc_t)RPCBPROC_TADDR2UADDR,
-	    (xdrproc_t) xdr_netbuf, (char *)(void *)taddr,
-	    (xdrproc_t) xdr_wrapstring, (char *)(void *)&uaddr, tottimeout) 
-	    != RPC_SUCCESS) {
-		rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-		clnt_geterr(client, &rpc_createerr.cf_error);
-	}
-	CLNT_DESTROY(client);
-	return (uaddr);
-}
-
-/*
- * Converts universal address to netbuf.  This routine should never
- * really be called because local n2a libraries are always provided.
- */
-struct netbuf *
-rpcb_uaddr2taddr(struct netconfig *nconf, char *uaddr)
-{
-	CLIENT *client;
-	struct netbuf *taddr;
-
-
-	/* parameter checking */
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-	if (uaddr == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
-		return (NULL);
-	}
-	client = local_rpcb();
-	if (! client) {
-		return (NULL);
-	}
-
-	taddr = (struct netbuf *)calloc(1, sizeof (struct netbuf));
-	if (taddr == NULL) {
-		CLNT_DESTROY(client);
-		return (NULL);
-	}
-	if (CLNT_CALL(client, (rpcproc_t)RPCBPROC_UADDR2TADDR,
-	    (xdrproc_t) xdr_wrapstring, (char *)(void *)&uaddr,
-	    (xdrproc_t) xdr_netbuf, (char *)(void *)taddr,
-	    tottimeout) != RPC_SUCCESS) {
-		rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-		clnt_geterr(client, &rpc_createerr.cf_error);
-		free(taddr);
-		taddr = NULL;
-	}
-	CLNT_DESTROY(client);
-	return (taddr);
-}
diff --git a/lib/libc/rpc/rpcb_prot.c b/lib/libc/rpc/rpcb_prot.c
deleted file mode 100644
index a08ae95c2..000000000
--- a/lib/libc/rpc/rpcb_prot.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/*	$NetBSD: rpcb_prot.c,v 1.11 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #ident	"@(#)rpcb_prot.c	1.13	94/04/24 SMI" */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)rpcb_prot.c 1.9 89/04/21 Copyr 1984 Sun Micro";
-#else
-__RCSID("$NetBSD: rpcb_prot.c,v 1.11 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * rpcb_prot.c
- * XDR routines for the rpcbinder version 3.
- *
- * Copyright (C) 1984, 1988, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-
-#include <rpc/rpc.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/rpcb_prot.h>
-
-#include <assert.h>
-
-#ifdef __weak_alias
-__weak_alias(xdr_rpcb,_xdr_rpcb)
-__weak_alias(xdr_rpcblist_ptr,_xdr_rpcblist_ptr)
-__weak_alias(xdr_rpcblist,_xdr_rpcblist)
-__weak_alias(xdr_rpcb_entry,_xdr_rpcb_entry)
-__weak_alias(xdr_rpcb_entry_list_ptr,_xdr_rpcb_entry_list_ptr)
-__weak_alias(xdr_rpcb_rmtcallargs,_xdr_rpcb_rmtcallargs)
-__weak_alias(xdr_rpcb_rmtcallres,_xdr_rpcb_rmtcallres)
-__weak_alias(xdr_netbuf,_xdr_netbuf)
-#endif
-
-
-bool_t
-xdr_rpcb(XDR *xdrs, RPCB *objp)
-{
-
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_u_int32_t(xdrs, &objp->r_prog)) {
-		return (FALSE);
-	}
-	if (!xdr_u_int32_t(xdrs, &objp->r_vers)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_addr, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_owner, (u_int)~0)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-/*
- * rpcblist_ptr implements a linked list.  The RPCL definition from
- * rpcb_prot.x is:
- *
- * struct rpcblist {
- * 	rpcb		rpcb_map;
- *	struct rpcblist *rpcb_next;
- * };
- * typedef rpcblist *rpcblist_ptr;
- *
- * Recall that "pointers" in XDR are encoded as a boolean, indicating whether
- * there's any data behind the pointer, followed by the data (if any exists).
- * The boolean can be interpreted as ``more data follows me''; if FALSE then
- * nothing follows the boolean; if TRUE then the boolean is followed by an
- * actual struct rpcb, and another rpcblist_ptr (declared in RPCL as "struct
- * rpcblist *").
- *
- * This could be implemented via the xdr_pointer type, though this would
- * result in one recursive call per element in the list.  Rather than do that
- * we can ``unwind'' the recursion into a while loop and use xdr_reference to
- * serialize the rpcb elements.
- */
-
-bool_t
-xdr_rpcblist_ptr(XDR *xdrs, rpcblist_ptr *rp)
-{
-	/*
-	 * more_elements is pre-computed in case the direction is
-	 * XDR_ENCODE or XDR_FREE.  more_elements is overwritten by
-	 * xdr_bool when the direction is XDR_DECODE.
-	 */
-	bool_t more_elements;
-	int freeing;
-	rpcblist_ptr next;
-	rpcblist_ptr next_copy;
-
-	_DIAGASSERT(xdrs != NULL);
-	/* XXX: rp may be NULL ??? */
-
-	freeing = (xdrs->x_op == XDR_FREE);
-	next = NULL;
-
-	for (;;) {
-		more_elements = (bool_t)(*rp != NULL);
-		if (! xdr_bool(xdrs, &more_elements)) {
-			return (FALSE);
-		}
-		if (! more_elements) {
-			return (TRUE);  /* we are done */
-		}
-		/*
-		 * the unfortunate side effect of non-recursion is that in
-		 * the case of freeing we must remember the next object
-		 * before we free the current object ...
-		 */
-		if (freeing && *rp)
-			next = (*rp)->rpcb_next;
-		if (! xdr_reference(xdrs, (caddr_t *)rp,
-		    (u_int)sizeof (rpcblist), (xdrproc_t)xdr_rpcb)) {
-			return (FALSE);
-		}
-		if (freeing) {
-			next_copy = next;
-			rp = &next_copy;
-			/*
-			 * Note that in the subsequent iteration, next_copy
-			 * gets nulled out by the xdr_reference
-			 * but next itself survives.
-			 */
-		} else if (*rp) {
-			rp = &((*rp)->rpcb_next);
-		}
-	}
-	/*NOTREACHED*/
-}
-
-/*
- * xdr_rpcblist() is specified to take a RPCBLIST **, but is identical in
- * functionality to xdr_rpcblist_ptr().
- */
-bool_t
-xdr_rpcblist(XDR *xdrs, RPCBLIST **rp)
-{
-	bool_t	dummy;
-
-	dummy = xdr_rpcblist_ptr(xdrs, (rpcblist_ptr *)rp);
-	return (dummy);
-}
-
-
-bool_t
-xdr_rpcb_entry(XDR *xdrs, rpcb_entry *objp)
-{
-
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_string(xdrs, &objp->r_maddr, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_nc_netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_u_int32_t(xdrs, &objp->r_nc_semantics)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_nc_protofmly, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_nc_proto, (u_int)~0)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcb_entry_list_ptr(XDR *xdrs, rpcb_entry_list_ptr *rp)
-{
-	/*
-	 * more_elements is pre-computed in case the direction is
-	 * XDR_ENCODE or XDR_FREE.  more_elements is overwritten by
-	 * xdr_bool when the direction is XDR_DECODE.
-	 */
-	bool_t more_elements;
-	int freeing;
-	rpcb_entry_list_ptr next;
-	rpcb_entry_list_ptr next_copy;
-
-	_DIAGASSERT(xdrs != NULL);
-	/* XXX: rp is allowed to be NULL ??? */
-
-	freeing = (xdrs->x_op == XDR_FREE);
-	next = NULL;
-
-	for (;;) {
-		more_elements = (bool_t)(*rp != NULL);
-		if (! xdr_bool(xdrs, &more_elements)) {
-			return (FALSE);
-		}
-		if (! more_elements) {
-			return (TRUE);  /* we are done */
-		}
-		/*
-		 * the unfortunate side effect of non-recursion is that in
-		 * the case of freeing we must remember the next object
-		 * before we free the current object ...
-		 */
-		if (freeing && *rp)
-			next = (*rp)->rpcb_entry_next;
-		if (! xdr_reference(xdrs, (caddr_t *)rp,
-		    (u_int)sizeof (rpcb_entry_list),
-				    (xdrproc_t)xdr_rpcb_entry)) {
-			return (FALSE);
-		}
-		if (freeing) {
-			next_copy = next;
-			rp = &next_copy;
-			/*
-			 * Note that in the subsequent iteration, next_copy
-			 * gets nulled out by the xdr_reference
-			 * but next itself survives.
-			 */
-		} else if (*rp) {
-			rp = &((*rp)->rpcb_entry_next);
-		}
-	}
-	/*NOTREACHED*/
-}
-
-/*
- * XDR remote call arguments
- * written for XDR_ENCODE direction only
- */
-bool_t
-xdr_rpcb_rmtcallargs(XDR *xdrs, struct rpcb_rmtcallargs *p)
-{
-	struct r_rpcb_rmtcallargs *objp =
-	    (struct r_rpcb_rmtcallargs *)(void *)p;
-	u_int lenposition, argposition, position;
-	int32_t *buf;
-
-	_DIAGASSERT(p != NULL);
-
-	buf = XDR_INLINE(xdrs, 3 * BYTES_PER_XDR_UNIT);
-	if (buf == NULL) {
-		if (!xdr_u_int32_t(xdrs, &objp->prog)) {
-			return (FALSE);
-		}
-		if (!xdr_u_int32_t(xdrs, &objp->vers)) {
-			return (FALSE);
-		}
-		if (!xdr_u_int32_t(xdrs, &objp->proc)) {
-			return (FALSE);
-		}
-	} else {
-		IXDR_PUT_U_INT32(buf, objp->prog);
-		IXDR_PUT_U_INT32(buf, objp->vers);
-		IXDR_PUT_U_INT32(buf, objp->proc);
-	}
-
-	/*
-	 * All the jugglery for just getting the size of the arguments
-	 */
-	lenposition = XDR_GETPOS(xdrs);
-	if (! xdr_u_int(xdrs, &(objp->args.args_len))) {
-		return (FALSE);
-	}
-	argposition = XDR_GETPOS(xdrs);
-	if (! (*objp->xdr_args)(xdrs, objp->args.args_val)) {
-		return (FALSE);
-	}
-	position = XDR_GETPOS(xdrs);
-	objp->args.args_len = (u_int)((u_long)position - (u_long)argposition);
-	XDR_SETPOS(xdrs, lenposition);
-	if (! xdr_u_int(xdrs, &(objp->args.args_len))) {
-		return (FALSE);
-	}
-	XDR_SETPOS(xdrs, position);
-	return (TRUE);
-}
-
-/*
- * XDR remote call results
- * written for XDR_DECODE direction only
- */
-bool_t
-xdr_rpcb_rmtcallres(XDR *xdrs, struct rpcb_rmtcallres *p)
-{
-	bool_t dummy;
-	struct r_rpcb_rmtcallres *objp = (struct r_rpcb_rmtcallres *)(void *)p;
-
-	_DIAGASSERT(p != NULL);
-
-	if (!xdr_string(xdrs, &objp->addr, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_u_int(xdrs, &objp->results.results_len)) {
-		return (FALSE);
-	}
-	dummy = (*(objp->xdr_res))(xdrs, objp->results.results_val);
-	return (dummy);
-}
-
-bool_t
-xdr_netbuf(XDR *xdrs, struct netbuf *objp)
-{
-	bool_t dummy;
-
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_u_int32_t(xdrs, (u_int32_t *) &objp->maxlen)) {
-		return (FALSE);
-	}
-	dummy = xdr_bytes(xdrs, (char **)(void *)&(objp->buf),
-			(u_int *)&(objp->len), objp->maxlen);
-	return (dummy);
-}
diff --git a/lib/libc/rpc/rpcb_st_xdr.c b/lib/libc/rpc/rpcb_st_xdr.c
deleted file mode 100644
index d901c183d..000000000
--- a/lib/libc/rpc/rpcb_st_xdr.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*	$NetBSD: rpcb_st_xdr.c,v 1.10 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright 1991 Sun Microsystems, Inc.
- * rpcb_stat_xdr.c
- */
-
-/*
- * This file was generated from rpcb_prot.x, but includes only those
- * routines used with the rpcbind stats facility.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: rpcb_st_xdr.c,v 1.10 2013/03/11 20:19:29 tron Exp $");
-#endif
-
-#include "namespace.h"
-#include <rpc/rpc.h>
-
-#include <assert.h>
-
-/* Link list of all the stats about getport and getaddr */
-
-#ifdef __weak_alias
-__weak_alias(xdr_rpcbs_addrlist,_xdr_rpcbs_addrlist)
-__weak_alias(xdr_rpcbs_rmtcalllist,_xdr_rpcbs_rmtcalllist)
-__weak_alias(xdr_rpcbs_proc,_xdr_rpcbs_proc)
-__weak_alias(xdr_rpcbs_addrlist_ptr,_xdr_rpcbs_addrlist_ptr)
-__weak_alias(xdr_rpcbs_rmtcalllist_ptr,_xdr_rpcbs_rmtcalllist_ptr)
-__weak_alias(xdr_rpcb_stat,_xdr_rpcb_stat)
-__weak_alias(xdr_rpcb_stat_byvers,_xdr_rpcb_stat_byvers)
-#endif
-
-bool_t
-xdr_rpcbs_addrlist(XDR *xdrs, rpcbs_addrlist *objp)
-{
-
-	_DIAGASSERT(objp != NULL);
-
-	    if (!xdr_u_int32_t(xdrs, &objp->prog)) {
-		return (FALSE);
-	    }
-	    if (!xdr_u_int32_t(xdrs, &objp->vers)) {
-		return (FALSE);
-	    }
-	    if (!xdr_int(xdrs, &objp->success)) {
-		return (FALSE);
-	    }
-	    if (!xdr_int(xdrs, &objp->failure)) {
-		return (FALSE);
-	    }
-	    if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) {
-		return (FALSE);
-	    }
-
-	    if (!xdr_pointer(xdrs, (char **)(void *)&objp->next,
-			(u_int)sizeof (rpcbs_addrlist),
-			(xdrproc_t)xdr_rpcbs_addrlist)) {
-		return (FALSE);
-	    }
-
-	return (TRUE);
-}
-
-/* Link list of all the stats about rmtcall */
-
-bool_t
-xdr_rpcbs_rmtcalllist(XDR *xdrs, rpcbs_rmtcalllist *objp)
-{
-	int32_t *buf;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	if (xdrs->x_op == XDR_ENCODE) {
-	buf = XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT);
-	if (buf == NULL) {
-		if (!xdr_u_int32_t(xdrs, &objp->prog)) {
-			return (FALSE);
-		}
-		if (!xdr_u_int32_t(xdrs, &objp->vers)) {
-			return (FALSE);
-		}
-		if (!xdr_u_int32_t(xdrs, &objp->proc)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->success)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->failure)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->indirect)) {
-			return (FALSE);
-		}
-	} else {
-		IXDR_PUT_U_INT32(buf, objp->prog);
-		IXDR_PUT_U_INT32(buf, objp->vers);
-		IXDR_PUT_U_INT32(buf, objp->proc);
-		IXDR_PUT_INT32(buf, objp->success);
-		IXDR_PUT_INT32(buf, objp->failure);
-		IXDR_PUT_INT32(buf, objp->indirect);
-	}
-	if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_pointer(xdrs, (char **)(void *)&objp->next,
-			(u_int)sizeof (rpcbs_rmtcalllist),
-			(xdrproc_t)xdr_rpcbs_rmtcalllist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-	} else if (xdrs->x_op == XDR_DECODE) {
-	buf = XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT);
-	if (buf == NULL) {
-		if (!xdr_u_int32_t(xdrs, &objp->prog)) {
-			return (FALSE);
-		}
-		if (!xdr_u_int32_t(xdrs, &objp->vers)) {
-			return (FALSE);
-		}
-		if (!xdr_u_int32_t(xdrs, &objp->proc)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->success)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->failure)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->indirect)) {
-			return (FALSE);
-		}
-	} else {
-		objp->prog = (rpcprog_t)IXDR_GET_U_INT32(buf);
-		objp->vers = (rpcvers_t)IXDR_GET_U_INT32(buf);
-		objp->proc = (rpcproc_t)IXDR_GET_U_INT32(buf);
-		objp->success = (int)IXDR_GET_INT32(buf);
-		objp->failure = (int)IXDR_GET_INT32(buf);
-		objp->indirect = (int)IXDR_GET_INT32(buf);
-	}
-	if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_pointer(xdrs, (char **)(void *)&objp->next,
-			(u_int)sizeof (rpcbs_rmtcalllist),
-			(xdrproc_t)xdr_rpcbs_rmtcalllist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-	}
-	if (!xdr_u_int32_t(xdrs, &objp->prog)) {
-		return (FALSE);
-	}
-	if (!xdr_u_int32_t(xdrs, &objp->vers)) {
-		return (FALSE);
-	}
-	if (!xdr_u_int32_t(xdrs, &objp->proc)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->success)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->failure)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->indirect)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_pointer(xdrs, (char **)(void *)&objp->next,
-			(u_int)sizeof (rpcbs_rmtcalllist),
-			(xdrproc_t)xdr_rpcbs_rmtcalllist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcbs_proc(XDR *xdrs, rpcbs_proc objp)
-{
-	if (!xdr_vector(xdrs, (char *)(void *)objp, RPCBSTAT_HIGHPROC,
-	    (u_int)sizeof (int), (xdrproc_t)xdr_int)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcbs_addrlist_ptr(XDR *xdrs, rpcbs_addrlist_ptr *objp)
-{
-	if (!xdr_pointer(xdrs, (char **)objp, (u_int)sizeof (rpcbs_addrlist),
-			(xdrproc_t)xdr_rpcbs_addrlist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcbs_rmtcalllist_ptr(XDR *xdrs, rpcbs_rmtcalllist_ptr *objp)
-{
-	if (!xdr_pointer(xdrs, (char **)objp, (u_int)sizeof (rpcbs_rmtcalllist),
-			(xdrproc_t)xdr_rpcbs_rmtcalllist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcb_stat(XDR *xdrs, rpcb_stat *objp)
-{
-
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_rpcbs_proc(xdrs, objp->info)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->setinfo)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->unsetinfo)) {
-		return (FALSE);
-	}
-	if (!xdr_rpcbs_addrlist_ptr(xdrs, &objp->addrinfo)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-/*
- * One rpcb_stat structure is returned for each version of rpcbind
- * being monitored.
- */
-bool_t
-xdr_rpcb_stat_byvers(XDR *xdrs, rpcb_stat_byvers objp)
-{
-	if (!xdr_vector(xdrs, (char *)(void *)objp, RPCBVERS_STAT,
-	    (u_int)sizeof (rpcb_stat), (xdrproc_t)xdr_rpcb_stat)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
diff --git a/lib/libc/rpc/rpcbind.3 b/lib/libc/rpc/rpcbind.3
deleted file mode 100644
index 436b8ab51..000000000
--- a/lib/libc/rpc/rpcbind.3
+++ /dev/null
@@ -1,201 +0,0 @@
-.\" @(#)rpcbind.3n 1.25 93/05/07 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\"	$NetBSD: rpcbind.3,v 1.11 2009/04/11 16:07:20 joerg Exp $
-.Dd December 4, 2005
-.Dt RPCBIND 3
-.Os
-.Sh NAME
-.Nm rpcb_getmaps ,
-.Nm rpcb_getaddr ,
-.Nm rpcb_gettime ,
-.Nm rpcb_rmtcall ,
-.Nm rpcb_set ,
-.Nm rpcb_unset
-.Nd library routines for RPC bind service
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft "struct rpcblist *"
-.Fn rpcb_getmaps "const struct netconfig *netconf" "const char *host"
-.Ft bool_t
-.Fn rpcb_getaddr "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf" "struct netbuf *svcaddr" "const char *host"
-.Ft bool_t
-.Fn rpcb_gettime "const char *host" "time_t * timep"
-.Ft "enum clnt_stat"
-.Fn rpcb_rmtcall "const struct netconfig *netconf" "const char *host" "const rpcprog_t prognum, const rpcvers_t versnum" "const rpcproc_t procnum, const xdrproc_t inproc" "const char *in" "const xdrproc_t outproc" "caddr_t out" "const struct timeval tout, struct netbuf  *svcaddr"
-.Ft bool_t
-.Fn rpcb_set "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf" "const struct netbuf *svcaddr"
-.Ft bool_t
-.Fn rpcb_unset "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf"
-.Sh DESCRIPTION
-These routines allow client C programs to make procedure
-calls to the RPC binder service.
-(see
-.Xr rpcbind 8 )
-maintains a list of mappings between programs
-and their universal addresses.
-.Sh ROUTINES
-.Bl -tag -width XXXXX
-.It Fn rpcb_getmaps
-An interface to the rpcbind service,
-which returns a list of the current
-RPC program-to-address mappings on
-.Fa host .
-It uses the transport specified through
-.Fa netconf
-to contact the remote rpcbind
-service on
-.Fa host .
-This routine will return
-.Dv NULL ,
-if the remote rpcbind could not be contacted.
-.Pp
-.It Fn rpcb_getaddr
-An interface to the rpcbind
-service, which finds the address of the service on
-.Fa host
-that is registered with program number
-.Fa prognum ,
-version
-.Fa versnum ,
-and speaks the transport protocol associated with
-.Fa netconf .
-The address found is returned in
-.Fa svcaddr .
-.Fa svcaddr
-should be preallocated.
-This routine returns
-.Dv TRUE
-if it succeeds.
-A return value of
-.Dv FALSE
-means that the mapping does not exist
-or that the RPC
-system failed to contact the remote
-rpcbind service.
-In the latter case, the global variable
-.Va rpc_createerr
-(see
-.Xr rpc_clnt_create 3
-contains the
-RPC status.
-.Pp
-.It Fn rpcb_gettime
-This routine returns the time on
-.Fa host
-in
-.Fa timep .
-If
-.Fa host
-is
-.Dv NULL ,
-.Fn rpcb_gettime
-returns the time on its own machine.
-This routine returns
-.Dv TRUE
-if it succeeds,
-.Dv FALSE
-if it fails.
-.Fn rpcb_gettime
-can be used to synchronize the time between the
-client and the remote server.
-.Pp
-.It Fn rpcb_rmtcall
-An interface to the rpcbind service, which instructs
-rpcbind on
-.Fa host
-to make an RPC
-call on your behalf to a procedure on that host.
-The
-.Fn netconfig
-structure should correspond to a connectionless transport.
-The parameter
-.Fa svcaddr
-will be modified to the server's address if the procedure succeeds
-(see
-.Fn rpc_call
-and
-.Fn clnt_call
-in
-.Xr rpc_clnt_calls 3
-for the definitions of other parameters).
-.Pp
-This procedure should normally be used for a
-``ping'' and nothing else.
-This routine allows programs to do lookup and call, all in one step.
-.Pp
-Note: Even if the server is not running
-.Fn rpcb_rmtcall
-does not return any error messages to the caller.
-In such a case, the caller times out.
-.Pp
-Note:
-.Fn rpcb_rmtcall
-is only available for connectionless transports.
-.Pp
-.It Fn rpcb_set
-An interface to the rpcbind
-service, which establishes a mapping between the triple
-[
-.Fa prognum ,
-.Fa versnum ,
-.Fa netconf-\*[Gt]nc_netid ]
-and
-.Fa svcaddr
-on the machine's rpcbind
-service.
-The value of
-.Fa nc_netid
-must correspond to a network identifier that is defined by the
-netconfig database.
-This routine returns
-.Dv TRUE
-if it succeeds,
-.Dv FALSE
-otherwise.
-(See also
-.Fn svc_reg
-in
-.Xr rpc_svc_calls 3 .
-If there already exists such an entry with rpcbind,
-.Fn rpcb_set
-will fail.
-.Pp
-.It Fn rpcb_unset
-An interface to the rpcbind
-service, which destroys the mapping between the triple
-[
-.Fa prognum ,
-.Fa versnum ,
-.Fa netconf-\*[Gt]nc_netid ]
-and the address on the machine's rpcbind
-service.
-If
-.Fa netconf
-is
-.Dv NULL ,
-.Fn rpcb_unset
-destroys all mapping between the triple
-[
-.Fa prognum ,
-.Fa versnum ,
-.Fa all-transports ]
-and the addresses on the machine's rpcbind service.
-This routine returns
-.Dv TRUE
-if it succeeds,
-.Dv FALSE
-otherwise.
-Only the owner of the service or the super-user can destroy the mapping.
-(See also
-.Fn svc_unreg
-in
-.Xr rpc_svc_calls 3 .
-.El
-.Sh SEE ALSO
-.Xr rpc_clnt_calls 3 ,
-.Xr rpc_svc_calls 3 ,
-.Xr rpcbind 8 ,
-.Xr rpcinfo 8
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
deleted file mode 100644
index 98c2f83b2..000000000
--- a/lib/libc/rpc/svc.c
+++ /dev/null
@@ -1,770 +0,0 @@
-/*	$NetBSD: svc.c,v 1.34 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint) 
-#if 0
-static char *sccsid = "@(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)svc.c	2.4 88/08/11 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: svc.c,v 1.34 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * svc.c, Server-side remote procedure call interface.
- *
- * There are two sets of procedures here.  The xprt routines are
- * for handling transport handles.  The svc routines handle the
- * list of service routines.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/poll.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <err.h>
-
-#include <rpc/rpc.h>
-#ifdef PORTMAP
-#include <rpc/pmap_clnt.h>
-#endif
-
-#include "svc_fdset.h"
-#include "rpc_internal.h"
-
-#ifdef __weak_alias
-__weak_alias(svc_getreq,_svc_getreq)
-__weak_alias(svc_getreqset,_svc_getreqset)
-__weak_alias(svc_getreq_common,_svc_getreq_common)
-__weak_alias(svc_register,_svc_register)
-__weak_alias(svc_reg,_svc_reg)
-__weak_alias(svc_unreg,_svc_unreg)
-__weak_alias(svc_sendreply,_svc_sendreply)
-__weak_alias(svc_unregister,_svc_unregister)
-__weak_alias(svcerr_auth,_svcerr_auth)
-__weak_alias(svcerr_decode,_svcerr_decode)
-__weak_alias(svcerr_noproc,_svcerr_noproc)
-__weak_alias(svcerr_noprog,_svcerr_noprog)
-__weak_alias(svcerr_progvers,_svcerr_progvers)
-__weak_alias(svcerr_systemerr,_svcerr_systemerr)
-__weak_alias(svcerr_weakauth,_svcerr_weakauth)
-__weak_alias(xprt_register,_xprt_register)
-__weak_alias(xprt_unregister,_xprt_unregister)
-__weak_alias(rpc_control,_rpc_control)
-#endif
-
-SVCXPRT **__svc_xports;
-int __svc_maxrec;
-
-#define	RQCRED_SIZE	400		/* this size is excessive */
-
-#define SVC_VERSQUIET 0x0001		/* keep quiet about vers mismatch */
-#define version_keepquiet(xp) ((u_long)(xp)->xp_p3 & SVC_VERSQUIET)
-
-#define max(a, b) (a > b ? a : b)
-
-/*
- * The services list
- * Each entry represents a set of procedures (an rpc program).
- * The dispatch routine takes request structs and runs the
- * apropriate procedure.
- */
-static struct svc_callout {
-	struct svc_callout *sc_next;
-	rpcprog_t	    sc_prog;
-	rpcvers_t	    sc_vers;
-	char		   *sc_netid;
-	void		    (*sc_dispatch)(struct svc_req *, SVCXPRT *);
-} *svc_head;
-
-#ifdef _REENTRANT
-extern rwlock_t svc_lock;
-extern rwlock_t svc_fd_lock;
-#endif
-
-static struct svc_callout *svc_find(rpcprog_t, rpcvers_t,
-					 struct svc_callout **, char *);
-static void __xprt_do_unregister(SVCXPRT *xprt, bool_t dolock);
-
-/* ***************  SVCXPRT related stuff **************** */
-
-/*
- * Activate a transport handle.
- */
-bool_t
-xprt_register(SVCXPRT *xprt)
-{
-	int sock;
-
-	_DIAGASSERT(xprt != NULL);
-
-	sock = xprt->xp_fd;
-
-	rwlock_wrlock(&svc_fd_lock);
-	if (__svc_xports == NULL) {
-		__svc_xports = mem_alloc(FD_SETSIZE * sizeof(SVCXPRT *));
-		if (__svc_xports == NULL) {
-			warn("%s: out of memory", __func__);
-			goto out;
-		}
-		memset(__svc_xports, '\0', FD_SETSIZE * sizeof(SVCXPRT *));
-	}
-	if (sock >= FD_SETSIZE) {
-		warnx("%s: socket descriptor %d too large for setsize %u",
-		    __func__, sock, (unsigned)FD_SETSIZE);
-		goto out;
-	}
-	__svc_xports[sock] = xprt;
-	FD_SET(sock, get_fdset());
-	*get_fdsetmax() = max(*get_fdsetmax(), sock);
-	rwlock_unlock(&svc_fd_lock);
-	return (TRUE);
-
-out:
-	rwlock_unlock(&svc_fd_lock);
-	return (FALSE);
-}
-
-void
-xprt_unregister(SVCXPRT *xprt)
-{
-	__xprt_do_unregister(xprt, TRUE);
-}
-
-void
-__xprt_unregister_unlocked(SVCXPRT *xprt)
-{
-	__xprt_do_unregister(xprt, FALSE);
-}
-
-/*
- * De-activate a transport handle. 
- */
-static void
-__xprt_do_unregister(SVCXPRT *xprt, bool_t dolock)
-{ 
-	int sock;
-
-	_DIAGASSERT(xprt != NULL);
-
-	sock = xprt->xp_fd;
-
-	if (dolock)
-		rwlock_wrlock(&svc_fd_lock);
-	if ((sock < FD_SETSIZE) && (__svc_xports[sock] == xprt)) {
-		__svc_xports[sock] = NULL;
-		FD_CLR(sock, get_fdset());
-		if (sock >= *get_fdsetmax()) {
-			for ((*get_fdsetmax())--; *get_fdsetmax() >= 0;
-			    (*get_fdsetmax())--)
-				if (__svc_xports[*get_fdsetmax()])
-					break;
-		}
-	}
-	if (dolock)
-		rwlock_unlock(&svc_fd_lock);
-}
-
-/*
- * Add a service program to the callout list.
- * The dispatch routine will be called when a rpc request for this
- * program number comes in.
- */
-bool_t
-svc_reg(SVCXPRT *xprt, const rpcprog_t prog, const rpcvers_t vers,
-	void (*dispatch)(struct svc_req *, SVCXPRT *),
-	const struct netconfig *nconf)
-{
-	bool_t dummy;
-	struct svc_callout *prev;
-	struct svc_callout *s;
-	struct netconfig *tnconf;
-	char *netid = NULL;
-	int flag = 0;
-
-	_DIAGASSERT(xprt != NULL);
-	/* XXX: dispatch may be NULL ??? */
-
-/* VARIABLES PROTECTED BY svc_lock: s, prev, svc_head */
-
-	if (xprt->xp_netid) {
-		netid = strdup(xprt->xp_netid);
-		flag = 1;
-	} else if (nconf && nconf->nc_netid) {
-		netid = strdup(nconf->nc_netid);
-		flag = 1;
-	} else if ((tnconf = __rpcgettp(xprt->xp_fd)) != NULL) {
-		netid = strdup(tnconf->nc_netid);
-		flag = 1;
-		freenetconfigent(tnconf);
-	} /* must have been created with svc_raw_create */
-	if ((netid == NULL) && (flag == 1)) {
-		return (FALSE);
-	}
-
-	rwlock_wrlock(&svc_lock);
-	if ((s = svc_find(prog, vers, &prev, netid)) != NULL) {
-		if (netid)
-			free(netid);
-		if (s->sc_dispatch == dispatch)
-			goto rpcb_it; /* he is registering another xptr */
-		rwlock_unlock(&svc_lock);
-		return (FALSE);
-	}
-	s = mem_alloc(sizeof (struct svc_callout));
-	if (s == NULL) {
-		if (netid)
-			free(netid);
-		rwlock_unlock(&svc_lock);
-		return (FALSE);
-	}
-
-	if ((xprt->xp_netid == NULL) && (flag == 1) && netid)
-		if ((((SVCXPRT *) xprt)->xp_netid = strdup(netid)) == NULL) {
-			warn("svc_reg");
-			mem_free(s, sizeof(struct svc_callout));
-			rwlock_unlock(&svc_lock);
-			return FALSE;
-		}
-
-	s->sc_prog = prog;
-	s->sc_vers = vers;
-	s->sc_dispatch = dispatch;
-	s->sc_netid = netid;
-	s->sc_next = svc_head;
-	svc_head = s;
-
-rpcb_it:
-	rwlock_unlock(&svc_lock);
-	/* now register the information with the local binder service */
-	if (nconf) {
-		dummy = rpcb_set(prog, vers, __UNCONST(nconf),
-		&((SVCXPRT *) xprt)->xp_ltaddr);
-		return (dummy);
-	}
-	return (TRUE);
-}
-
-/*
- * Remove a service program from the callout list.
- */
-void
-svc_unreg(const rpcprog_t prog, const rpcvers_t vers)
-{
-	struct svc_callout *prev;
-	struct svc_callout *s;
-
-	/* unregister the information anyway */
-	(void) rpcb_unset(prog, vers, NULL);
-	rwlock_wrlock(&svc_lock);
-	while ((s = svc_find(prog, vers, &prev, NULL)) != NULL) {
-		if (prev == NULL) {
-			svc_head = s->sc_next;
-		} else {
-			prev->sc_next = s->sc_next;
-		}
-		s->sc_next = NULL;
-		if (s->sc_netid)
-			mem_free(s->sc_netid, sizeof (s->sc_netid) + 1);
-		mem_free(s, sizeof (struct svc_callout));
-	}
-	rwlock_unlock(&svc_lock);
-}
-
-/* ********************** CALLOUT list related stuff ************* */
-
-#ifdef PORTMAP
-/*
- * Add a service program to the callout list.
- * The dispatch routine will be called when a rpc request for this
- * program number comes in.
- */
-bool_t
-svc_register(SVCXPRT *xprt, u_long prog, u_long vers,
-	void (*dispatch)(struct svc_req *, SVCXPRT *), int protocol)
-{
-	struct svc_callout *prev;
-	struct svc_callout *s;
-
-	_DIAGASSERT(xprt != NULL);
-	_DIAGASSERT(dispatch != NULL);
-
-	if ((s = svc_find((rpcprog_t)prog, (rpcvers_t)vers, &prev, NULL)) !=
-	    NULL) {
-		if (s->sc_dispatch == dispatch)
-			goto pmap_it;  /* he is registering another xptr */
-		return (FALSE);
-	}
-	s = mem_alloc(sizeof(struct svc_callout));
-	if (s == NULL) {
-		return (FALSE);
-	}
-	s->sc_prog = (rpcprog_t)prog;
-	s->sc_vers = (rpcvers_t)vers;
-	s->sc_dispatch = dispatch;
-	s->sc_next = svc_head;
-	svc_head = s;
-pmap_it:
-	/* now register the information with the local binder service */
-	if (protocol) {
-		return (pmap_set(prog, vers, protocol, xprt->xp_port));
-	}
-	return (TRUE);
-}
-
-/*
- * Remove a service program from the callout list.
- */
-void
-svc_unregister(u_long prog, u_long vers)
-{
-	struct svc_callout *prev;
-	struct svc_callout *s;
-
-	if ((s = svc_find((rpcprog_t)prog, (rpcvers_t)vers, &prev, NULL)) ==
-	    NULL)
-		return;
-	if (prev == NULL) {
-		svc_head = s->sc_next;
-	} else {
-		prev->sc_next = s->sc_next;
-	}
-	s->sc_next = NULL;
-	mem_free(s, sizeof(struct svc_callout));
-	/* now unregister the information with the local binder service */
-	(void)pmap_unset(prog, vers);
-}
-#endif /* PORTMAP */
-
-/*
- * Search the callout list for a program number, return the callout
- * struct.
- */
-static struct svc_callout *
-svc_find(rpcprog_t prog, rpcvers_t vers, struct svc_callout **prev, char *netid)
-{
-	struct svc_callout *s, *p;
-
-	_DIAGASSERT(prev != NULL);
-	/* netid is handled below */
-
-	p = NULL;
-	for (s = svc_head; s != NULL; s = s->sc_next) {
-		if (((s->sc_prog == prog) && (s->sc_vers == vers)) &&
-		    ((netid == NULL) || (s->sc_netid == NULL) ||
-		    (strcmp(netid, s->sc_netid) == 0)))
-			break;
-		p = s;
-	}
-	*prev = p;
-	return (s);
-}
-
-/* ******************* REPLY GENERATION ROUTINES  ************ */
-
-/*
- * Send a reply to an rpc request
- */
-bool_t
-svc_sendreply(SVCXPRT *xprt, xdrproc_t xdr_results, const char *xdr_location)
-{
-	struct rpc_msg rply; 
-
-	_DIAGASSERT(xprt != NULL);
-
-	rply.rm_direction = REPLY;  
-	rply.rm_reply.rp_stat = MSG_ACCEPTED; 
-	rply.acpted_rply.ar_verf = xprt->xp_verf; 
-	rply.acpted_rply.ar_stat = SUCCESS;
-	rply.acpted_rply.ar_results.where = xdr_location;
-	rply.acpted_rply.ar_results.proc = xdr_results;
-	return (SVC_REPLY(xprt, &rply)); 
-}
-
-/*
- * No procedure error reply
- */
-void
-svcerr_noproc(SVCXPRT *xprt)
-{
-	struct rpc_msg rply;
-
-	_DIAGASSERT(xprt != NULL);
-
-	rply.rm_direction = REPLY;
-	rply.rm_reply.rp_stat = MSG_ACCEPTED;
-	rply.acpted_rply.ar_verf = xprt->xp_verf;
-	rply.acpted_rply.ar_stat = PROC_UNAVAIL;
-	SVC_REPLY(xprt, &rply);
-}
-
-/*
- * Can't decode args error reply
- */
-void
-svcerr_decode(SVCXPRT *xprt)
-{
-	struct rpc_msg rply; 
-
-	_DIAGASSERT(xprt != NULL);
-
-	rply.rm_direction = REPLY; 
-	rply.rm_reply.rp_stat = MSG_ACCEPTED; 
-	rply.acpted_rply.ar_verf = xprt->xp_verf;
-	rply.acpted_rply.ar_stat = GARBAGE_ARGS;
-	SVC_REPLY(xprt, &rply); 
-}
-
-/*
- * Some system error
- */
-void
-svcerr_systemerr(SVCXPRT *xprt)
-{
-	struct rpc_msg rply; 
-
-	_DIAGASSERT(xprt != NULL);
-
-	rply.rm_direction = REPLY; 
-	rply.rm_reply.rp_stat = MSG_ACCEPTED; 
-	rply.acpted_rply.ar_verf = xprt->xp_verf;
-	rply.acpted_rply.ar_stat = SYSTEM_ERR;
-	SVC_REPLY(xprt, &rply); 
-}
-
-#if 0
-/*
- * Tell RPC package to not complain about version errors to the client.	 This
- * is useful when revving broadcast protocols that sit on a fixed address.
- * There is really one (or should be only one) example of this kind of
- * protocol: the portmapper (or rpc binder).
- */
-void
-__svc_versquiet_on(SVCXPRT *xprt)
-{
-	u_long	tmp;
-
-	_DIAGASSERT(xprt != NULL);
-
-	tmp = ((u_long) xprt->xp_p3) | SVC_VERSQUIET;
-	xprt->xp_p3 = (caddr_t) tmp;
-}
-
-void
-__svc_versquiet_off(SVCXPRT *xprt)
-{
-	u_long	tmp;
-
-	_DIAGASSERT(xprt != NULL);
-
-	tmp = ((u_long) xprt->xp_p3) & ~SVC_VERSQUIET;
-	xprt->xp_p3 = (caddr_t) tmp;
-}
-
-void
-svc_versquiet(SVCXPRT *xprt)
-{
-	__svc_versquiet_on(xprt);
-}
-
-int
-__svc_versquiet_get(SVCXPRT *xprt)
-{
-
-	_DIAGASSERT(xprt != NULL);
-
-	return ((int) xprt->xp_p3) & SVC_VERSQUIET;
-}
-#endif
-
-/*
- * Authentication error reply
- */
-void
-svcerr_auth(SVCXPRT *xprt, enum auth_stat why)
-{
-	struct rpc_msg rply;
-
-	_DIAGASSERT(xprt != NULL);
-
-	rply.rm_direction = REPLY;
-	rply.rm_reply.rp_stat = MSG_DENIED;
-	rply.rjcted_rply.rj_stat = AUTH_ERROR;
-	rply.rjcted_rply.rj_why = why;
-	SVC_REPLY(xprt, &rply);
-}
-
-/*
- * Auth too weak error reply
- */
-void
-svcerr_weakauth(SVCXPRT *xprt)
-{
-
-	_DIAGASSERT(xprt != NULL);
-
-	svcerr_auth(xprt, AUTH_TOOWEAK);
-}
-
-/*
- * Program unavailable error reply
- */
-void 
-svcerr_noprog(SVCXPRT *xprt)
-{
-	struct rpc_msg rply;  
-
-	_DIAGASSERT(xprt != NULL);
-
-	rply.rm_direction = REPLY;   
-	rply.rm_reply.rp_stat = MSG_ACCEPTED;  
-	rply.acpted_rply.ar_verf = xprt->xp_verf;  
-	rply.acpted_rply.ar_stat = PROG_UNAVAIL;
-	SVC_REPLY(xprt, &rply);
-}
-
-/*
- * Program version mismatch error reply
- */
-void  
-svcerr_progvers(SVCXPRT *xprt, rpcvers_t low_vers, rpcvers_t high_vers)
-{
-	struct rpc_msg rply;
-
-	_DIAGASSERT(xprt != NULL);
-
-	rply.rm_direction = REPLY;
-	rply.rm_reply.rp_stat = MSG_ACCEPTED;
-	rply.acpted_rply.ar_verf = xprt->xp_verf;
-	rply.acpted_rply.ar_stat = PROG_MISMATCH;
-	rply.acpted_rply.ar_vers.low = (u_int32_t)low_vers;
-	rply.acpted_rply.ar_vers.high = (u_int32_t)high_vers;
-	SVC_REPLY(xprt, &rply);
-}
-
-/* ******************* SERVER INPUT STUFF ******************* */
-
-/*
- * Get server side input from some transport.
- *
- * Statement of authentication parameters management:
- * This function owns and manages all authentication parameters, specifically
- * the "raw" parameters (msg.rm_call.cb_cred and msg.rm_call.cb_verf) and
- * the "cooked" credentials (rqst->rq_clntcred).
- * However, this function does not know the structure of the cooked
- * credentials, so it make the following assumptions: 
- *   a) the structure is contiguous (no pointers), and
- *   b) the cred structure size does not exceed RQCRED_SIZE bytes. 
- * In all events, all three parameters are freed upon exit from this routine.
- * The storage is trivially management on the call stack in user land, but
- * is mallocated in kernel land.
- */
-
-void
-svc_getreq(int rdfds)
-{
-	fd_set readfds;
-
-	FD_ZERO(&readfds);
-	readfds.fds_bits[0] = (unsigned int)rdfds;
-	svc_getreqset(&readfds);
-}
-
-void
-svc_getreqset(fd_set *readfds)
-{
-	uint32_t mask, *maskp;
-	int sock, bit, fd;
-
-	_DIAGASSERT(readfds != NULL);
-
-	maskp = readfds->fds_bits;
-	for (sock = 0; sock < FD_SETSIZE; sock += NFDBITS) {
-	    for (mask = *maskp++; (bit = ffs((int)mask)) != 0;
-		mask ^= (1 << (bit - 1))) {
-		/* sock has input waiting */
-		fd = sock + bit - 1;
-		svc_getreq_common(fd);
-	    }
-	}
-}
-
-void
-svc_getreq_common(int fd)
-{
-	SVCXPRT *xprt;
-	struct svc_req r;
-	struct rpc_msg msg;
-	int prog_found;
-	rpcvers_t low_vers;
-	rpcvers_t high_vers;
-	enum xprt_stat stat;
-	char cred_area[2*MAX_AUTH_BYTES + RQCRED_SIZE];
-
-	msg.rm_call.cb_cred.oa_base = cred_area;
-	msg.rm_call.cb_verf.oa_base = &(cred_area[MAX_AUTH_BYTES]);
-	r.rq_clntcred = &(cred_area[2*MAX_AUTH_BYTES]);
-
-	rwlock_rdlock(&svc_fd_lock);
-	xprt = __svc_xports[fd];
-	rwlock_unlock(&svc_fd_lock);
-	if (xprt == NULL)
-		/* But do we control sock? */
-		return;
-	/* now receive msgs from xprtprt (support batch calls) */
-	do {
-		if (SVC_RECV(xprt, &msg)) {
-
-			/* now find the exported program and call it */
-			struct svc_callout *s;
-			enum auth_stat why;
-
-			r.rq_xprt = xprt;
-			r.rq_prog = msg.rm_call.cb_prog;
-			r.rq_vers = msg.rm_call.cb_vers;
-			r.rq_proc = msg.rm_call.cb_proc;
-			r.rq_cred = msg.rm_call.cb_cred;
-			/* first authenticate the message */
-			if ((why = _authenticate(&r, &msg)) != AUTH_OK) {
-				svcerr_auth(xprt, why);
-				goto call_done;
-			}
-			/* now match message with a registered service*/
-			prog_found = FALSE;
-			low_vers = (rpcvers_t) -1L;
-			high_vers = (rpcvers_t) 0L;
-			for (s = svc_head; s != NULL; s = s->sc_next) {
-				if (s->sc_prog == r.rq_prog) {
-					if (s->sc_vers == r.rq_vers) {
-						(*s->sc_dispatch)(&r, xprt);
-						goto call_done;
-					}  /* found correct version */
-					prog_found = TRUE;
-					if (s->sc_vers < low_vers)
-						low_vers = s->sc_vers;
-					if (s->sc_vers > high_vers)
-						high_vers = s->sc_vers;
-				}   /* found correct program */
-			}
-			/*
-			 * if we got here, the program or version
-			 * is not served ...
-			 */
-			if (prog_found)
-				svcerr_progvers(xprt, low_vers, high_vers);
-			else
-				 svcerr_noprog(xprt);
-			/* Fall through to ... */
-		}
-		/*
-		 * Check if the xprt has been disconnected in a
-		 * recursive call in the service dispatch routine.
-		 * If so, then break.
-		 */
-		rwlock_rdlock(&svc_fd_lock);
-		if (xprt != __svc_xports[fd]) {
-			rwlock_unlock(&svc_fd_lock);
-			break;
-		}
-		rwlock_unlock(&svc_fd_lock);
-call_done:
-		if ((stat = SVC_STAT(xprt)) == XPRT_DIED){
-			SVC_DESTROY(xprt);
-			break;
-		}
-	} while (stat == XPRT_MOREREQS);
-}
-
-
-void
-svc_getreq_poll(struct pollfd *pfdp, int pollretval)
-{
-	int i;
-	int fds_found;
-
-	_DIAGASSERT(pfdp != NULL);
-
-	for (i = fds_found = 0; fds_found < pollretval; i++) {
-		struct pollfd *p = &pfdp[i];
-
-		if (p->revents) {
-			/* fd has input waiting */
-			fds_found++;
-			/*
-			 *	We assume that this function is only called
-			 *	via someone select()ing from svc_fdset or
-			 *	pollts()ing from svc_pollset[].  Thus it's safe
-			 *	to handle the POLLNVAL event by simply turning
-			 *	the corresponding bit off in svc_fdset.  The
-			 *	svc_pollset[] array is derived from svc_fdset
-			 *	and so will also be updated eventually.
-			 *
-			 *	XXX Should we do an xprt_unregister() instead?
-			 */
-			if (p->revents & POLLNVAL) {
-				rwlock_wrlock(&svc_fd_lock);
-				FD_CLR(p->fd, get_fdset());
-				rwlock_unlock(&svc_fd_lock);
-			} else
-				svc_getreq_common(p->fd);
-		}
-	}
-}
-
-bool_t
-rpc_control(int what, void *arg)
-{
-	int val;
-
-	switch (what) {
-	case RPC_SVC_CONNMAXREC_SET:
-		val = *(int *)arg;
-		if (val <= 0)
-			return FALSE;
-		__svc_maxrec = val;
-		return TRUE;
-	case RPC_SVC_CONNMAXREC_GET:
-		*(int *)arg = __svc_maxrec;
-		return TRUE;
-	default:
-		break;
-	}
-	return FALSE;
-}
diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c
deleted file mode 100644
index d8fb3ee78..000000000
--- a/lib/libc/rpc/svc_auth.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*	$NetBSD: svc_auth.c,v 1.17 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #ident	"@(#)svc_auth.c	1.16	94/04/24 SMI" */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro";
-#else
-__RCSID("$NetBSD: svc_auth.c,v 1.17 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * svc_auth.c, Server-side rpc authenticator interface.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <rpc/rpc.h>
-#include <assert.h>
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(svc_auth_reg,_svc_auth_reg)
-#endif
-
-/*
- * svcauthsw is the bdevsw of server side authentication.
- *
- * Server side authenticators are called from authenticate by
- * using the client auth struct flavor field to index into svcauthsw.
- * The server auth flavors must implement a routine that looks
- * like:
- *
- *	enum auth_stat
- *	flavorx_auth(rqst, msg)
- *		struct svc_req *rqst;
- *		struct rpc_msg *msg;
- *
- */
-
-/* declarations to allow servers to specify new authentication flavors */
-struct authsvc {
-	int	flavor;
-	enum	auth_stat (*handler)(struct svc_req *, struct rpc_msg *);
-	struct	authsvc	  *next;
-};
-static struct authsvc *Auths = NULL;
-
-/*
- * The call rpc message, msg has been obtained from the wire.  The msg contains
- * the raw form of credentials and verifiers.  authenticate returns AUTH_OK
- * if the msg is successfully authenticated.  If AUTH_OK then the routine also
- * does the following things:
- * set rqst->rq_xprt->verf to the appropriate response verifier;
- * sets rqst->rq_client_cred to the "cooked" form of the credentials.
- *
- * NB: rqst->rq_cxprt->verf must be pre-alloctaed;
- * its length is set appropriately.
- *
- * The caller still owns and is responsible for msg->u.cmb.cred and
- * msg->u.cmb.verf.  The authentication system retains ownership of
- * rqst->rq_client_cred, the cooked credentials.
- *
- * There is an assumption that any flavour less than AUTH_NULL is
- * invalid.
- */
-enum auth_stat
-_authenticate(struct svc_req *rqst, struct rpc_msg *msg)
-{
-	int cred_flavor;
-	struct authsvc *asp;
-	enum auth_stat dummy;
-#ifdef _REENTRANT
-	extern mutex_t authsvc_lock;
-#endif
-
-	_DIAGASSERT(rqst != NULL);
-	_DIAGASSERT(msg != NULL);
-
-/* VARIABLES PROTECTED BY authsvc_lock: asp, Auths */
-
-	rqst->rq_cred = msg->rm_call.cb_cred;
-	rqst->rq_xprt->xp_verf.oa_flavor = _null_auth.oa_flavor;
-	rqst->rq_xprt->xp_verf.oa_length = 0;
-	cred_flavor = rqst->rq_cred.oa_flavor;
-	switch (cred_flavor) {
-	case AUTH_NULL:
-		dummy = _svcauth_null(rqst, msg);
-		return (dummy);
-	case AUTH_SYS:
-		dummy = _svcauth_unix(rqst, msg);
-		return (dummy);
-	case AUTH_SHORT:
-		dummy = _svcauth_short(rqst, msg);
-		return (dummy);
-#if 0
-	case AUTH_DES:
-		dummy = __svcauth_des(rqst, msg);
-		return (dummy);
-#endif
-	default:
-		break;
-	}
-
-	/* flavor doesn't match any of the builtin types, so try new ones */
-	mutex_lock(&authsvc_lock);
-	for (asp = Auths; asp; asp = asp->next) {
-		if (asp->flavor == cred_flavor) {
-			enum auth_stat as;
-
-			as = (*asp->handler)(rqst, msg);
-			mutex_unlock(&authsvc_lock);
-			return (as);
-		}
-	}
-	mutex_unlock(&authsvc_lock);
-
-	return (AUTH_REJECTEDCRED);
-}
-
-/*ARGSUSED*/
-enum auth_stat
-_svcauth_null(struct svc_req *rqst, struct rpc_msg *msg)
-{
-	return (AUTH_OK);
-}
-
-/*
- *  Allow the rpc service to register new authentication types that it is
- *  prepared to handle.  When an authentication flavor is registered,
- *  the flavor is checked against already registered values.  If not
- *  registered, then a new Auths entry is added on the list.
- *
- *  There is no provision to delete a registration once registered.
- *
- *  This routine returns:
- *	 0 if registration successful
- *	 1 if flavor already registered
- *	-1 if can't register (errno set)
- */
-
-int
-svc_auth_reg(
-	int cred_flavor,
-	enum auth_stat (*handler)(struct svc_req *, struct rpc_msg *))
-{
-	struct authsvc *asp;
-#ifdef _REENTRANT
-	extern mutex_t authsvc_lock;
-#endif
-
-	switch (cred_flavor) {
-	    case AUTH_NULL:
-	    case AUTH_SYS:
-	    case AUTH_SHORT:
-#if 0
-	    case AUTH_DES:
-#endif
-		/* already registered */
-		return (1);
-
-	    default:
-		mutex_lock(&authsvc_lock);
-		for (asp = Auths; asp; asp = asp->next) {
-			if (asp->flavor == cred_flavor) {
-				/* already registered */
-				mutex_unlock(&authsvc_lock);
-				return (1);
-			}
-		}
-
-		/* this is a new one, so go ahead and register it */
-		asp = mem_alloc(sizeof (*asp));
-		if (asp == NULL) {
-			mutex_unlock(&authsvc_lock);
-			return (-1);
-		}
-		asp->flavor = cred_flavor;
-		asp->handler = handler;
-		asp->next = Auths;
-		Auths = asp;
-		mutex_unlock(&authsvc_lock);
-		break;
-	}
-	return (0);
-}
diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c
deleted file mode 100644
index eecd87c9c..000000000
--- a/lib/libc/rpc/svc_auth_unix.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*	$NetBSD: svc_auth_unix.c,v 1.21 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)svc_auth_unix.c	2.3 88/08/01 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: svc_auth_unix.c,v 1.21 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * svc_auth_unix.c
- * Handles UNIX flavor authentication parameters on the service side of rpc.
- * There are two svc auth implementations here: AUTH_UNIX and AUTH_SHORT.
- * _svcauth_unix does full blown unix style uid,gid+gids auth,
- * _svcauth_short uses a shorthand auth to index into a cache of longhand auths.
- * Note: the shorthand has been gutted for efficiency.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-
-/*
- * Unix longhand authenticator
- */
-enum auth_stat
-_svcauth_unix(struct svc_req *rqst, struct rpc_msg *msg)
-{
-	enum auth_stat stat;
-	XDR xdrs;
-	struct authunix_parms *aup;
-	int32_t *buf;
-	struct area {
-		struct authunix_parms area_aup;
-		char area_machname[MAX_MACHINE_NAME+1];
-		int area_gids[NGRPS];
-	} *area;
-	u_int auth_len;
-	size_t str_len, gid_len, i;
-
-	_DIAGASSERT(rqst != NULL);
-	_DIAGASSERT(msg != NULL);
-
-	area = (struct area *) rqst->rq_clntcred;
-	aup = &area->area_aup;
-	aup->aup_machname = area->area_machname;
-	aup->aup_gids = area->area_gids;
-	auth_len = (u_int)msg->rm_call.cb_cred.oa_length;
-	xdrmem_create(&xdrs, msg->rm_call.cb_cred.oa_base, auth_len,XDR_DECODE);
-	buf = XDR_INLINE(&xdrs, auth_len);
-	if (buf != NULL) {
-		aup->aup_time = IXDR_GET_INT32(buf);
-		str_len = (size_t)IXDR_GET_U_INT32(buf);
-		if (str_len > MAX_MACHINE_NAME) {
-			stat = AUTH_BADCRED;
-			goto done;
-		}
-		memmove(aup->aup_machname, buf, str_len);
-		aup->aup_machname[str_len] = 0;
-		str_len = RNDUP(str_len);
-		buf += str_len / sizeof (int32_t);
-		aup->aup_uid = (int)IXDR_GET_INT32(buf);
-		aup->aup_gid = (int)IXDR_GET_INT32(buf);
-		gid_len = (size_t)IXDR_GET_U_INT32(buf);
-		if (gid_len > NGRPS) {
-			stat = AUTH_BADCRED;
-			goto done;
-		}
-		_DIAGASSERT(__type_fit(u_int, gid_len));
-		aup->aup_len = (u_int)gid_len;
-		for (i = 0; i < gid_len; i++) {
-			aup->aup_gids[i] = (int)IXDR_GET_INT32(buf);
-		}
-		/*
-		 * five is the smallest unix credentials structure -
-		 * timestamp, hostname len (0), uid, gid, and gids len (0).
-		 */
-		if ((5 + gid_len) * BYTES_PER_XDR_UNIT + str_len > auth_len) {
-			(void) printf("bad auth_len gid %ld str %ld auth %u\n",
-			    (long)gid_len, (long)str_len, auth_len);
-			stat = AUTH_BADCRED;
-			goto done;
-		}
-	} else if (! xdr_authunix_parms(&xdrs, aup)) {
-		xdrs.x_op = XDR_FREE;
-		(void)xdr_authunix_parms(&xdrs, aup);
-		stat = AUTH_BADCRED;
-		goto done;
-	}
-	rqst->rq_xprt->xp_verf.oa_flavor = AUTH_NULL;
-	rqst->rq_xprt->xp_verf.oa_length = 0;
-	stat = AUTH_OK;
-done:
-	XDR_DESTROY(&xdrs);
-	return (stat);
-}
-
-
-/*
- * Shorthand unix authenticator
- * Looks up longhand in a cache.
- */
-/*ARGSUSED*/
-enum auth_stat 
-_svcauth_short(struct svc_req *rqst, struct rpc_msg *msg)
-{
-	return (AUTH_REJECTEDCRED);
-}
diff --git a/lib/libc/rpc/svc_dg.c b/lib/libc/rpc/svc_dg.c
deleted file mode 100644
index 7adc83ed8..000000000
--- a/lib/libc/rpc/svc_dg.c
+++ /dev/null
@@ -1,633 +0,0 @@
-/*	$NetBSD: svc_dg.c,v 1.17 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- */
-
-/* #ident	"@(#)svc_dg.c	1.17	94/04/24 SMI" */
-
-
-/*
- * svc_dg.c, Server side for connectionless RPC.
- *
- * Does some caching in the hopes of achieving execute-at-most-once semantics.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: svc_dg.c,v 1.17 2013/03/11 20:19:29 tron Exp $");
-#endif
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <rpc/rpc.h>
-#include <assert.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef RPC_CACHE_DEBUG
-#include <netconfig.h>
-#include <netdir.h>
-#endif
-#include <err.h>
-
-#include "svc_fdset.h"
-#include "rpc_internal.h"
-#include "svc_dg.h"
-
-#define	su_data(xprt)	((struct svc_dg_data *)(xprt->xp_p2))
-#define	rpc_buffer(xprt) ((xprt)->xp_p1)
-
-#ifdef __weak_alias
-__weak_alias(svc_dg_create,_svc_dg_create)
-#endif
-
-#ifndef MAX
-#define	MAX(a, b)	(((a) > (b)) ? (a) : (b))
-#endif
-
-static void svc_dg_ops(SVCXPRT *);
-static enum xprt_stat svc_dg_stat(SVCXPRT *);
-static bool_t svc_dg_recv(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_dg_reply(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_dg_getargs(SVCXPRT *, xdrproc_t, caddr_t);
-static bool_t svc_dg_freeargs(SVCXPRT *, xdrproc_t, caddr_t);
-static void svc_dg_destroy(SVCXPRT *);
-static bool_t svc_dg_control(SVCXPRT *, const u_int, void *);
-static int cache_get(SVCXPRT *, struct rpc_msg *, char **, size_t *);
-static void cache_set(SVCXPRT *, size_t);
-
-/*
- * Usage:
- *	xprt = svc_dg_create(sock, sendsize, recvsize);
- * Does other connectionless specific initializations.
- * Once *xprt is initialized, it is registered.
- * see (svc.h, xprt_register). If recvsize or sendsize are 0 suitable
- * system defaults are chosen.
- * The routines returns NULL if a problem occurred.
- */
-static const char svc_dg_str[] = "svc_dg_create: %s";
-static const char svc_dg_err1[] = "could not get transport information";
-static const char svc_dg_err2[] = " transport does not support data transfer";
-static const char __no_mem_str[] = "out of memory";
-
-SVCXPRT *
-svc_dg_create(int fd, u_int sendsize, u_int recvsize)
-{
-	SVCXPRT *xprt;
-	struct svc_dg_data *su = NULL;
-	struct __rpc_sockinfo si;
-	struct sockaddr_storage ss;
-	socklen_t slen;
-
-	if (!__rpc_fd2sockinfo(fd, &si)) {
-		warnx(svc_dg_str, svc_dg_err1);
-		return (NULL);
-	}
-	/*
-	 * Find the receive and the send size
-	 */
-	sendsize = __rpc_get_t_size(si.si_af, si.si_proto, (int)sendsize);
-	recvsize = __rpc_get_t_size(si.si_af, si.si_proto, (int)recvsize);
-	if ((sendsize == 0) || (recvsize == 0)) {
-		warnx(svc_dg_str, svc_dg_err2);
-		return (NULL);
-	}
-
-	xprt = mem_alloc(sizeof (SVCXPRT));
-	if (xprt == NULL)
-		goto outofmem;
-	memset(xprt, 0, sizeof (SVCXPRT));
-
-	su = mem_alloc(sizeof (*su));
-	if (su == NULL)
-		goto outofmem;
-	su->su_iosz = ((MAX(sendsize, recvsize) + 3) / 4) * 4;
-	if ((rpc_buffer(xprt) = malloc(su->su_iosz)) == NULL)
-		goto outofmem;
-	_DIAGASSERT(__type_fit(u_int, su->su_iosz));
-	xdrmem_create(&(su->su_xdrs), rpc_buffer(xprt), (u_int)su->su_iosz,
-		XDR_DECODE);
-	su->su_cache = NULL;
-	xprt->xp_fd = fd;
-	xprt->xp_p2 = (caddr_t)(void *)su;
-	xprt->xp_verf.oa_base = su->su_verfbody;
-	svc_dg_ops(xprt);
-	xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage);
-
-	slen = sizeof ss;
-	if (getsockname(fd, (struct sockaddr *)(void *)&ss, &slen) < 0)
-		goto freedata;
-	xprt->xp_ltaddr.buf = mem_alloc(sizeof (struct sockaddr_storage));
-	xprt->xp_ltaddr.maxlen = sizeof (struct sockaddr_storage);
-	xprt->xp_ltaddr.len = slen;
-	memcpy(xprt->xp_ltaddr.buf, &ss, slen);
-
-	if (!xprt_register(xprt))
-		goto freedata;
-	return (xprt);
-
-outofmem:
-	(void) warnx(svc_dg_str, __no_mem_str);
-freedata:
-	if (xprt) {
-		if (su)
-			(void) mem_free(su, sizeof (*su));
-		(void) mem_free(xprt, sizeof (SVCXPRT));
-	}
-	return (NULL);
-}
-
-/*ARGSUSED*/
-static enum xprt_stat
-svc_dg_stat(SVCXPRT *xprt)
-{
-	return (XPRT_IDLE);
-}
-
-static bool_t
-svc_dg_recv(SVCXPRT *xprt, struct rpc_msg *msg)
-{
-	struct svc_dg_data *su;
-	XDR *xdrs;
-	char *reply;
-	struct sockaddr_storage ss;
-	socklen_t alen;
-	size_t replylen;
-	ssize_t rlen;
-
-	_DIAGASSERT(xprt != NULL);
-	_DIAGASSERT(msg != NULL);
-
-	su = su_data(xprt);
-	xdrs = &(su->su_xdrs);
-
-again:
-	alen = sizeof (struct sockaddr_storage);
-	rlen = recvfrom(xprt->xp_fd, rpc_buffer(xprt), su->su_iosz, 0,
-	    (struct sockaddr *)(void *)&ss, &alen);
-	if (rlen == -1 && errno == EINTR)
-		goto again;
-	if (rlen == -1 || (rlen < (ssize_t)(4 * sizeof (u_int32_t))))
-		return (FALSE);
-	if (xprt->xp_rtaddr.len < alen) {
-		if (xprt->xp_rtaddr.len != 0)
-			mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.len);
-		xprt->xp_rtaddr.buf = mem_alloc(alen);
-		xprt->xp_rtaddr.len = alen;
-	}
-	memcpy(xprt->xp_rtaddr.buf, &ss, alen);
-#ifdef PORTMAP
-	if (ss.ss_family == AF_INET) {
-		xprt->xp_raddr = *(struct sockaddr_in *)xprt->xp_rtaddr.buf;
-		xprt->xp_addrlen = sizeof (struct sockaddr_in);
-	}
-#endif
-	xdrs->x_op = XDR_DECODE;
-	XDR_SETPOS(xdrs, 0);
-	if (! xdr_callmsg(xdrs, msg)) {
-		return (FALSE);
-	}
-	su->su_xid = msg->rm_xid;
-	if (su->su_cache != NULL) {
-		if (cache_get(xprt, msg, &reply, &replylen)) {
-			(void)sendto(xprt->xp_fd, reply, replylen, 0,
-			    (struct sockaddr *)(void *)&ss, alen);
-			return (FALSE);
-		}
-	}
-	return (TRUE);
-}
-
-static bool_t
-svc_dg_reply(SVCXPRT *xprt, struct rpc_msg *msg)
-{
-	struct svc_dg_data *su;
-	XDR *xdrs;
-	bool_t stat = FALSE;
-	size_t slen;
-
-	_DIAGASSERT(xprt != NULL);
-	_DIAGASSERT(msg != NULL);
-
-	su = su_data(xprt);
-	xdrs = &(su->su_xdrs);
-
-	xdrs->x_op = XDR_ENCODE;
-	XDR_SETPOS(xdrs, 0);
-	msg->rm_xid = su->su_xid;
-	if (xdr_replymsg(xdrs, msg)) {
-		slen = XDR_GETPOS(xdrs);
-		if (sendto(xprt->xp_fd, rpc_buffer(xprt), slen, 0,
-		    (struct sockaddr *)xprt->xp_rtaddr.buf,
-		    (socklen_t)xprt->xp_rtaddr.len) == (ssize_t) slen) {
-			stat = TRUE;
-			if (su->su_cache)
-				cache_set(xprt, slen);
-		}
-	}
-	return (stat);
-}
-
-static bool_t
-svc_dg_getargs(SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr)
-{
-	return (*xdr_args)(&(su_data(xprt)->su_xdrs), args_ptr);
-}
-
-static bool_t
-svc_dg_freeargs(SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr)
-{
-	XDR *xdrs;
-
-	_DIAGASSERT(xprt != NULL);
-
-	xdrs = &(su_data(xprt)->su_xdrs);
-	xdrs->x_op = XDR_FREE;
-	return (*xdr_args)(xdrs, args_ptr);
-}
-
-static void
-svc_dg_destroy(SVCXPRT *xprt)
-{
-	struct svc_dg_data *su;
-
-	_DIAGASSERT(xprt != NULL);
-
-	su = su_data(xprt);
-
-	xprt_unregister(xprt);
-	if (xprt->xp_fd != -1)
-		(void)close(xprt->xp_fd);
-	XDR_DESTROY(&(su->su_xdrs));
-	(void) mem_free(rpc_buffer(xprt), su->su_iosz);
-	(void) mem_free(su, sizeof (*su));
-	if (xprt->xp_rtaddr.buf)
-		(void) mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen);
-	if (xprt->xp_ltaddr.buf)
-		(void) mem_free(xprt->xp_ltaddr.buf, xprt->xp_ltaddr.maxlen);
-	if (xprt->xp_tp)
-		(void) free(xprt->xp_tp);
-	(void) mem_free(xprt, sizeof (SVCXPRT));
-}
-
-static bool_t
-/*ARGSUSED*/
-svc_dg_control(SVCXPRT *xprt, const u_int rq, void *in)
-{
-	return (FALSE);
-}
-
-static void
-svc_dg_ops(SVCXPRT *xprt)
-{
-	static struct xp_ops ops;
-	static struct xp_ops2 ops2;
-#ifdef _REENTRANT
-	extern mutex_t ops_lock;
-#endif
-
-	_DIAGASSERT(xprt != NULL);
-
-/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	mutex_lock(&ops_lock);
-	if (ops.xp_recv == NULL) {
-		ops.xp_recv = svc_dg_recv;
-		ops.xp_stat = svc_dg_stat;
-		ops.xp_getargs = svc_dg_getargs;
-		ops.xp_reply = svc_dg_reply;
-		ops.xp_freeargs = svc_dg_freeargs;
-		ops.xp_destroy = svc_dg_destroy;
-		ops2.xp_control = svc_dg_control;
-	}
-	xprt->xp_ops = &ops;
-	xprt->xp_ops2 = &ops2;
-	mutex_unlock(&ops_lock);
-}
-
-/*  The CACHING COMPONENT */
-
-/*
- * Could have been a separate file, but some part of it depends upon the
- * private structure of the client handle.
- *
- * Fifo cache for cl server
- * Copies pointers to reply buffers into fifo cache
- * Buffers are sent again if retransmissions are detected.
- */
-
-#define	SPARSENESS 4	/* 75% sparse */
-
-#define	ALLOC(type, size)	\
-	mem_alloc((sizeof (type) * (size)))
-
-#define	MEMZERO(addr, type, size)	 \
-	(void) memset((void *) (addr), 0, sizeof (type) * (int) (size))
-
-#define	FREE(addr, type, size)	\
-	mem_free((addr), (sizeof (type) * (size)))
-
-/*
- * An entry in the cache
- */
-typedef struct cache_node *cache_ptr;
-struct cache_node {
-	/*
-	 * Index into cache is xid, proc, vers, prog and address
-	 */
-	u_int32_t cache_xid;
-	rpcproc_t cache_proc;
-	rpcvers_t cache_vers;
-	rpcprog_t cache_prog;
-	struct netbuf cache_addr;
-	/*
-	 * The cached reply and length
-	 */
-	char *cache_reply;
-	size_t cache_replylen;
-	/*
-	 * Next node on the list, if there is a collision
-	 */
-	cache_ptr cache_next;
-};
-
-/*
- * The entire cache
- */
-struct cl_cache {
-	u_int uc_size;		/* size of cache */
-	cache_ptr *uc_entries;	/* hash table of entries in cache */
-	cache_ptr *uc_fifo;	/* fifo list of entries in cache */
-	u_int uc_nextvictim;	/* points to next victim in fifo list */
-	rpcprog_t uc_prog;	/* saved program number */
-	rpcvers_t uc_vers;	/* saved version number */
-	rpcproc_t uc_proc;	/* saved procedure number */
-};
-
-
-/*
- * the hashing function
- */
-#define	CACHE_LOC(transp, xid)	\
-	(xid % (SPARSENESS * ((struct cl_cache *) \
-		su_data(transp)->su_cache)->uc_size))
-
-#ifdef _REENTRANT
-extern mutex_t	dupreq_lock;
-#endif
-
-/*
- * Enable use of the cache. Returns 1 on success, 0 on failure.
- * Note: there is no disable.
- */
-static const char cache_enable_str[] = "svc_enablecache: %s %s";
-static const char alloc_err[] = "could not allocate cache ";
-static const char enable_err[] = "cache already enabled";
-
-int
-svc_dg_enablecache(SVCXPRT *transp, u_int size)
-{
-	struct svc_dg_data *su;
-	struct cl_cache *uc;
-
-	_DIAGASSERT(transp != NULL);
-
-	su = su_data(transp);
-
-	mutex_lock(&dupreq_lock);
-	if (su->su_cache != NULL) {
-		(void) warnx(cache_enable_str, enable_err, " ");
-		mutex_unlock(&dupreq_lock);
-		return (0);
-	}
-	uc = ALLOC(struct cl_cache, 1);
-	if (uc == NULL) {
-		warnx(cache_enable_str, alloc_err, " ");
-		mutex_unlock(&dupreq_lock);
-		return (0);
-	}
-	uc->uc_size = size;
-	uc->uc_nextvictim = 0;
-	uc->uc_entries = ALLOC(cache_ptr, size * SPARSENESS);
-	if (uc->uc_entries == NULL) {
-		warnx(cache_enable_str, alloc_err, "data");
-		FREE(uc, struct cl_cache, 1);
-		mutex_unlock(&dupreq_lock);
-		return (0);
-	}
-	MEMZERO(uc->uc_entries, cache_ptr, size * SPARSENESS);
-	uc->uc_fifo = ALLOC(cache_ptr, size);
-	if (uc->uc_fifo == NULL) {
-		warnx(cache_enable_str, alloc_err, "fifo");
-		FREE(uc->uc_entries, cache_ptr, size * SPARSENESS);
-		FREE(uc, struct cl_cache, 1);
-		mutex_unlock(&dupreq_lock);
-		return (0);
-	}
-	MEMZERO(uc->uc_fifo, cache_ptr, size);
-	su->su_cache = (char *)(void *)uc;
-	mutex_unlock(&dupreq_lock);
-	return (1);
-}
-
-/*
- * Set an entry in the cache.  It assumes that the uc entry is set from
- * the earlier call to cache_get() for the same procedure.  This will always
- * happen because cache_get() is calle by svc_dg_recv and cache_set() is called
- * by svc_dg_reply().  All this hoopla because the right RPC parameters are
- * not available at svc_dg_reply time.
- */
-
-static const char cache_set_str[] = "cache_set: %s";
-static const char cache_set_err1[] = "victim not found";
-static const char cache_set_err2[] = "victim alloc failed";
-static const char cache_set_err3[] = "could not allocate new rpc buffer";
-
-static void
-cache_set(SVCXPRT *xprt, size_t replylen)
-{
-	cache_ptr victim;
-	cache_ptr *vicp;
-	struct svc_dg_data *su;
-	struct cl_cache *uc;
-	u_int loc;
-	char *newbuf;
-#ifdef RPC_CACHE_DEBUG
-	struct netconfig *nconf;
-	char *uaddr;
-#endif
-
-	_DIAGASSERT(xprt != NULL);
-
-	su = su_data(xprt);
-	uc = (struct cl_cache *) su->su_cache;
-
-	mutex_lock(&dupreq_lock);
-	/*
-	 * Find space for the new entry, either by
-	 * reusing an old entry, or by mallocing a new one
-	 */
-	victim = uc->uc_fifo[uc->uc_nextvictim];
-	if (victim != NULL) {
-		loc = CACHE_LOC(xprt, victim->cache_xid);
-		for (vicp = &uc->uc_entries[loc];
-			*vicp != NULL && *vicp != victim;
-			vicp = &(*vicp)->cache_next)
-			;
-		if (*vicp == NULL) {
-			warnx(cache_set_str, cache_set_err1);
-			mutex_unlock(&dupreq_lock);
-			return;
-		}
-		*vicp = victim->cache_next;	/* remove from cache */
-		newbuf = victim->cache_reply;
-	} else {
-		victim = ALLOC(struct cache_node, 1);
-		if (victim == NULL) {
-			warnx(cache_set_str, cache_set_err2);
-			mutex_unlock(&dupreq_lock);
-			return;
-		}
-		newbuf = mem_alloc(su->su_iosz);
-		if (newbuf == NULL) {
-			warnx(cache_set_str, cache_set_err3);
-			FREE(victim, struct cache_node, 1);
-			mutex_unlock(&dupreq_lock);
-			return;
-		}
-	}
-
-	/*
-	 * Store it away
-	 */
-#ifdef RPC_CACHE_DEBUG
-	if (nconf = getnetconfigent(xprt->xp_netid)) {
-		uaddr = taddr2uaddr(nconf, &xprt->xp_rtaddr);
-		freenetconfigent(nconf);
-		printf(
-	"cache set for xid= %x prog=%d vers=%d proc=%d for rmtaddr=%s\n",
-			su->su_xid, uc->uc_prog, uc->uc_vers,
-			uc->uc_proc, uaddr);
-		free(uaddr);
-	}
-#endif
-	victim->cache_replylen = replylen;
-	victim->cache_reply = rpc_buffer(xprt);
-	rpc_buffer(xprt) = newbuf;
-	_DIAGASSERT(__type_fit(u_int, su->su_iosz));
-	xdrmem_create(&(su->su_xdrs), rpc_buffer(xprt), (u_int)su->su_iosz,
-	    XDR_ENCODE);
-	victim->cache_xid = su->su_xid;
-	victim->cache_proc = uc->uc_proc;
-	victim->cache_vers = uc->uc_vers;
-	victim->cache_prog = uc->uc_prog;
-	victim->cache_addr = xprt->xp_rtaddr;
-	victim->cache_addr.buf = ALLOC(char, xprt->xp_rtaddr.len);
-	(void) memcpy(victim->cache_addr.buf, xprt->xp_rtaddr.buf,
-	    (size_t)xprt->xp_rtaddr.len);
-	loc = CACHE_LOC(xprt, victim->cache_xid);
-	victim->cache_next = uc->uc_entries[loc];
-	uc->uc_entries[loc] = victim;
-	uc->uc_fifo[uc->uc_nextvictim++] = victim;
-	uc->uc_nextvictim %= uc->uc_size;
-	mutex_unlock(&dupreq_lock);
-}
-
-/*
- * Try to get an entry from the cache
- * return 1 if found, 0 if not found and set the stage for cache_set()
- */
-static int
-cache_get(SVCXPRT *xprt, struct rpc_msg *msg, char **replyp, size_t *replylenp)
-{
-	u_int loc;
-	cache_ptr ent;
-	struct svc_dg_data *su;
-	struct cl_cache *uc;
-#ifdef RPC_CACHE_DEBUG
-	struct netconfig *nconf;
-	char *uaddr;
-#endif
-
-	_DIAGASSERT(xprt != NULL);
-	_DIAGASSERT(msg != NULL);
-	_DIAGASSERT(replyp != NULL);
-	_DIAGASSERT(replylenp != NULL);
-
-	su = su_data(xprt);
-	uc = (struct cl_cache *) su->su_cache;
-
-	mutex_lock(&dupreq_lock);
-	loc = CACHE_LOC(xprt, su->su_xid);
-	for (ent = uc->uc_entries[loc]; ent != NULL; ent = ent->cache_next) {
-		if (ent->cache_xid == su->su_xid &&
-			ent->cache_proc == msg->rm_call.cb_proc &&
-			ent->cache_vers == msg->rm_call.cb_vers &&
-			ent->cache_prog == msg->rm_call.cb_prog &&
-			ent->cache_addr.len == xprt->xp_rtaddr.len &&
-			(memcmp(ent->cache_addr.buf, xprt->xp_rtaddr.buf,
-				xprt->xp_rtaddr.len) == 0)) {
-#ifdef RPC_CACHE_DEBUG
-			if (nconf = getnetconfigent(xprt->xp_netid)) {
-				uaddr = taddr2uaddr(nconf, &xprt->xp_rtaddr);
-				freenetconfigent(nconf);
-				printf(
-	"cache entry found for xid=%x prog=%d vers=%d proc=%d for rmtaddr=%s\n",
-					su->su_xid, msg->rm_call.cb_prog,
-					msg->rm_call.cb_vers,
-					msg->rm_call.cb_proc, uaddr);
-				free(uaddr);
-			}
-#endif
-			*replyp = ent->cache_reply;
-			*replylenp = ent->cache_replylen;
-			mutex_unlock(&dupreq_lock);
-			return (1);
-		}
-	}
-	/*
-	 * Failed to find entry
-	 * Remember a few things so we can do a set later
-	 */
-	uc->uc_proc = msg->rm_call.cb_proc;
-	uc->uc_vers = msg->rm_call.cb_vers;
-	uc->uc_prog = msg->rm_call.cb_prog;
-	mutex_unlock(&dupreq_lock);
-	return (0);
-}
diff --git a/lib/libc/rpc/svc_dg.h b/lib/libc/rpc/svc_dg.h
deleted file mode 100644
index 659d006a8..000000000
--- a/lib/libc/rpc/svc_dg.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: svc_dg.h,v 1.2 2013/03/11 20:19:29 tron Exp $	*/
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * XXX - this file exists only so that the rpcbind code can pull it in.
- * This should go away. It should only be include by svc_dg.c and
- * rpcb_svc_com.c in the rpcbind code.
- */
-
-/*
- * kept in xprt->xp_p2
- */
-struct svc_dg_data {
-	/* XXX: optbuf should be the first field, used by ti_opts.c code */
-	size_t		su_iosz;		/* size of send.recv buffer */
-	u_int32_t	su_xid;			/* transaction id */
-	XDR		su_xdrs;			/* XDR handle */
-	char		su_verfbody[MAX_AUTH_BYTES];	/* verifier body */
-	void		*su_cache;		/* cached data, NULL if none */
-};
-
-#define __rpcb_get_dg_xidp(x)	(&((struct svc_dg_data *)(x)->xp_p2)->su_xid)
diff --git a/lib/libc/rpc/svc_fdset.c b/lib/libc/rpc/svc_fdset.c
deleted file mode 100644
index 08206d6d5..000000000
--- a/lib/libc/rpc/svc_fdset.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: svc_fdset.c,v 1.1 2013/03/05 19:55:23 christos Exp $	*/
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: svc_fdset.c,v 1.1 2013/03/05 19:55:23 christos Exp $");
-
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/select.h>
-
-#include "svc_fdset.h"
-
-static pthread_key_t fdsetkey;
-static pthread_key_t fdmaxkey;
-static fd_set thefdset;
-static int thefdmax;
-
-void
-init_fdsets(void)
-{
-
-	pthread_key_create(&fdsetkey, NULL);
-	pthread_key_create(&fdmaxkey, NULL);
-}
-
-void
-alloc_fdset(void)
-{
-	fd_set *fdsetti;
-	int *fdmax;
-
-	fdsetti = malloc(sizeof(*fdsetti));
-	memset(fdsetti, 0, sizeof(*fdsetti));
-	pthread_setspecific(fdsetkey, fdsetti);
-
-	fdmax = malloc(sizeof(*fdmax));
-	memset(fdmax, 0, sizeof(*fdmax));
-	pthread_setspecific(fdmaxkey, fdmax);
-}
-
-fd_set *
-get_fdset(void)
-{
-	fd_set *rv;
-
-	rv = pthread_getspecific(fdsetkey);
-	if (rv)
-		return rv;
-	else
-		return &thefdset;
-}
-
-int *
-get_fdsetmax(void)
-{
-	int *rv;
-
-	rv = pthread_getspecific(fdmaxkey);
-	if (rv)
-		return rv;
-	else
-		return &thefdmax;
-}
diff --git a/lib/libc/rpc/svc_fdset.h b/lib/libc/rpc/svc_fdset.h
deleted file mode 100644
index 1a4fbc8ce..000000000
--- a/lib/libc/rpc/svc_fdset.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*	$NetBSD: svc_fdset.h,v 1.1 2013/03/05 19:55:23 christos Exp $	*/
-
-#ifndef _LIBC
-
-void init_fdsets(void);
-void alloc_fdset(void);
-fd_set *get_fdset(void);
-int *get_fdsetmax(void);
-
-# ifdef RUMP_RPC
-#  include <rump/rump.h>
-#  include <rump/rump_syscalls.h>
-#  undef	close
-#  define	close(a)		rump_sys_close(a)
-#  undef	fcntl
-#  define	fcntl(a, b, c)		rump_sys_fcntl(a, b, c)
-#  undef	read
-#  define	read(a, b, c)		rump_sys_read(a, b, c)
-#  undef	write
-#  define	write(a, b, c)		rump_sys_write(a, b, c)
-#  undef	pollts
-#  define	pollts(a, b, c, d)	rump_sys_pollts(a, b, c, d)
-#  undef	select
-#  define	select(a, b, c, d, e)	rump_sys_select(a, b, c, d, e)
-# endif
-
-#else
-# define	get_fdset()	(&svc_fdset)
-# define	get_fdsetmax()	(&svc_maxfd)
-#endif
diff --git a/lib/libc/rpc/svc_generic.c b/lib/libc/rpc/svc_generic.c
deleted file mode 100644
index 6e3dbaff7..000000000
--- a/lib/libc/rpc/svc_generic.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*	$NetBSD: svc_generic.c,v 1.17 2014/05/29 12:35:45 christos Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- */
-
-/* #ident	"@(#)svc_generic.c	1.19	94/04/24 SMI" */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro";
-#else
-__RCSID("$NetBSD: svc_generic.c,v 1.17 2014/05/29 12:35:45 christos Exp $");
-#endif
-#endif
-
-/*
- * svc_generic.c, Server side for RPC.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <rpc/rpc.h>
-#include <rpc/nettype.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <err.h>
-
-#include "svc_fdset.h"
-#include "rpc_internal.h"
-
-#ifdef __weak_alias
-__weak_alias(svc_create,_svc_create)
-__weak_alias(svc_tp_create,_svc_tp_create)
-__weak_alias(svc_tli_create,_svc_tli_create)
-#endif
-
-extern int __svc_vc_setflag(SVCXPRT *, int);
-
-/*
- * The highest level interface for server creation.
- * It tries for all the nettokens in that particular class of token
- * and returns the number of handles it can create and/or find.
- *
- * It creates a link list of all the handles it could create.
- * If svc_create() is called multiple times, it uses the handle
- * created earlier instead of creating a new handle every time.
- */
-int
-svc_create(
-	void (*dispatch)(struct svc_req *, SVCXPRT *),
-	rpcprog_t prognum,		/* Program number */
-	rpcvers_t versnum,		/* Version number */
-	const char *nettype)		/* Networktype token */
-{
-	struct xlist {
-		SVCXPRT *xprt;		/* Server handle */
-		struct xlist *next;	/* Next item */
-	} *l;
-	static struct xlist *xprtlist;	/* A link list of all the handles */
-	int num = 0;
-	SVCXPRT *xprt;
-	struct netconfig *nconf;
-	void *handle;
-#ifdef _REENTRANT
-	extern mutex_t xprtlist_lock;
-#endif
-
-/* VARIABLES PROTECTED BY xprtlist_lock: xprtlist */
-
-	if ((handle = __rpc_setconf(nettype)) == NULL) {
-		warnx("%s: unknown protocol %s", __func__, nettype);
-		return (0);
-	}
-	while ((nconf = __rpc_getconf(handle)) != NULL) {
-		mutex_lock(&xprtlist_lock);
-		for (l = xprtlist; l; l = l->next) {
-			if (strcmp(l->xprt->xp_netid, nconf->nc_netid) == 0) {
-				/* Found an old one, use it */
-				(void) rpcb_unset(prognum, versnum, nconf);
-				if (svc_reg(l->xprt, prognum, versnum,
-					dispatch, nconf) == FALSE)
-					warnx("%s: could not register prog %u "
-					    "vers %u on %s", __func__,
-					    (unsigned)prognum,
-					    (unsigned)versnum, nconf->nc_netid);
-				else
-					num++;
-				break;
-			}
-		}
-		if (l == NULL) {
-			/* It was not found. Now create a new one */
-			xprt = svc_tp_create(dispatch, prognum, versnum, nconf);
-			if (xprt) {
-				l = malloc(sizeof(*l));
-				if (l == NULL) {
-					warn("%s: out of memory", __func__);
-					mutex_unlock(&xprtlist_lock);
-					return (0);
-				}
-				l->xprt = xprt;
-				l->next = xprtlist;
-				xprtlist = l;
-				num++;
-			}
-		}
-		mutex_unlock(&xprtlist_lock);
-	}
-	__rpc_endconf(handle);
-	/*
-	 * In case of num == 0; the error messages are generated by the
-	 * underlying layers; and hence not needed here.
-	 */
-	return (num);
-}
-
-/*
- * The high level interface to svc_tli_create().
- * It tries to create a server for "nconf" and registers the service
- * with the rpcbind. It calls svc_tli_create();
- */
-SVCXPRT *
-svc_tp_create(
-	void (*dispatch)(struct svc_req *, SVCXPRT *),
-	rpcprog_t prognum,		/* Program number */
-	rpcvers_t versnum,		/* Version number */
-	const struct netconfig *nconf) /* Netconfig structure for the network */
-{
-	SVCXPRT *xprt;
-
-	if (nconf == NULL) {
-		warnx("%s: invalid netconfig structure for prog %u vers %u",
-		    __func__, (unsigned)prognum, (unsigned)versnum);
-		return (NULL);
-	}
-	xprt = svc_tli_create(RPC_ANYFD, nconf, NULL, 0, 0);
-	if (xprt == NULL) {
-		return (NULL);
-	}
-	(void) rpcb_unset(prognum, versnum, __UNCONST(nconf));
-	if (svc_reg(xprt, prognum, versnum, dispatch, nconf) == FALSE) {
-		warnx("%s: Could not register prog %u vers %u on %s",
-		    __func__, (unsigned)prognum, (unsigned)versnum,
-		    nconf->nc_netid);
-		SVC_DESTROY(xprt);
-		return (NULL);
-	}
-	return (xprt);
-}
-
-/*
- * If fd is RPC_ANYFD, then it opens a fd for the given transport
- * provider (nconf cannot be NULL then). If the t_state is T_UNBND and
- * bindaddr is NON-NULL, it performs a t_bind using the bindaddr. For
- * NULL bindadr and Connection oriented transports, the value of qlen
- * is set to 8.
- *
- * If sendsz or recvsz are zero, their default values are chosen.
- */
-SVCXPRT *
-svc_tli_create(
-	int fd,				/* Connection end point */
-	const struct netconfig *nconf,	/* Netconfig struct for nettoken */
-	const struct t_bind *bindaddr,	/* Local bind address */
-	u_int sendsz,			/* Max sendsize */
-	u_int recvsz)			/* Max recvsize */
-{
-	SVCXPRT *xprt = NULL;		/* service handle */
-	bool_t madefd = FALSE;		/* whether fd opened here  */
-	struct __rpc_sockinfo si;
-	struct sockaddr_storage ss;
-	socklen_t slen;
-
-	if (fd == RPC_ANYFD) {
-		if (nconf == NULL) {
-			warnx("%s: invalid netconfig", __func__);
-			return (NULL);
-		}
-		fd = __rpc_nconf2fd(nconf);
-		if (fd == -1) {
-			warnx("%s: could not open connection for %s", __func__,
-			    nconf->nc_netid);
-			return (NULL);
-		}
-		__rpc_nconf2sockinfo(nconf, &si);
-		madefd = TRUE;
-	} else {
-		/*
-		 * It is an open descriptor. Get the transport info.
-		 */
-		if (!__rpc_fd2sockinfo(fd, &si)) {
-			warnx("%s: could not get transport information",
-			    __func__);
-			return (NULL);
-		}
-	}
-
-	/*
-	 * If the fd is unbound, try to bind it.
-	 */
-	if (madefd || !__rpc_sockisbound(fd)) {
-		if (bindaddr == NULL) {
-			if (bindresvport(fd, NULL) < 0) {
-				memset(&ss, 0, sizeof ss);
-				ss.ss_family = si.si_af;
-				ss.ss_len = si.si_alen;
-				if (bind(fd, (struct sockaddr *)(void *)&ss,
-				    (socklen_t)si.si_alen) < 0) {
-					warn( "%s: could not bind to anonymous "
-					    "port", __func__);
-					goto freedata;
-				}
-			}
-			if (si.si_socktype != SOCK_DGRAM &&
-			    listen(fd, SOMAXCONN) == -1) {
-				warnx("%s: could not listen at anonymous port",
-				    __func__);
-				goto freedata;
-			}
-		} else {
-			if (bind(fd,
-			    (struct sockaddr *)bindaddr->addr.buf,
-			    (socklen_t)si.si_alen) < 0) {
-				warnx("%s: could not bind to requested address",
-				    __func__);
-				goto freedata;
-			}
-			if (si.si_socktype != SOCK_DGRAM &&
-			    listen(fd, (int)bindaddr->qlen) == -1) {
-				warnx("%s: could not listen at requested "
-				    "address", __func__);
-				goto freedata;
-			}
-		}
-	}
-	/*
-	 * call transport specific function.
-	 */
-	switch (si.si_socktype) {
-	case SOCK_STREAM:
-		slen = sizeof ss;
-		if (getpeername(fd, (struct sockaddr *)(void *)&ss, &slen)
-		    == 0) {
-			/* accepted socket */
-			xprt = svc_fd_create(fd, sendsz, recvsz);
-		} else
-			xprt = svc_vc_create(fd, sendsz, recvsz);
-		if (!nconf || !xprt)
-			break;
-#if 0
-		/* XXX fvdl */
-		if (strcmp(nconf->nc_protofmly, "inet") == 0 ||
-		    strcmp(nconf->nc_protofmly, "inet6") == 0)
-			(void) __svc_vc_setflag(xprt, TRUE);
-#endif
-		break;
-	case SOCK_DGRAM:
-		xprt = svc_dg_create(fd, sendsz, recvsz);
-		break;
-	default:
-		warnx("%s: bad service type %u", __func__, si.si_socktype);
-		goto freedata;
-	}
-
-	if (xprt == NULL)
-		/*
-		 * The error messages here are spitted out by the lower layers:
-		 * svc_vc_create(), svc_fd_create() and svc_dg_create().
-		 */
-		goto freedata;
-
-	/* Fill in type of service */
-	xprt->xp_type = __rpc_socktype2seman(si.si_socktype);
-
-	if (nconf) {
-		xprt->xp_netid = strdup(nconf->nc_netid);
-		xprt->xp_tp = strdup(nconf->nc_device);
-		if (xprt->xp_netid == NULL || xprt->xp_tp == NULL) {
-			svc_destroy(xprt);
-			return NULL;
-		}
-	}
-	return (xprt);
-
-freedata:
-	if (madefd)
-		(void) close(fd);
-	return (NULL);
-}
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
deleted file mode 100644
index f1b2640ee..000000000
--- a/lib/libc/rpc/svc_raw.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/*	$NetBSD: svc_raw.c,v 1.24 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #ident	"@(#)svc_raw.c	1.16	94/04/24 SMI" */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)svc_raw.c 1.25 89/01/31 Copyr 1984 Sun Micro";
-#else
-__RCSID("$NetBSD: svc_raw.c,v 1.24 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * svc_raw.c,   This a toy for simple testing and timing.
- * Interface to create an rpc client and server in the same UNIX process.
- * This lets us similate rpc and get rpc (round trip) overhead, without
- * any interference from the kernel.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <rpc/rpc.h>
-#include <sys/types.h>
-#include <rpc/raw.h>
-#include <assert.h>
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(svc_raw_create,_svc_raw_create)
-#endif
-
-#ifndef UDPMSGSIZE
-#define	UDPMSGSIZE 8800
-#endif
-
-/*
- * This is the "network" that we will be moving data over
- */
-static struct svc_raw_private {
-	char	*raw_buf;	/* should be shared with the cl handle */
-	SVCXPRT	server;
-	XDR	xdr_stream;
-	char	verf_body[MAX_AUTH_BYTES];
-} *svc_raw_private;
-
-#ifdef _REENTRANT
-extern mutex_t	svcraw_lock;
-#endif
-
-static enum xprt_stat svc_raw_stat(SVCXPRT *);
-static bool_t svc_raw_recv(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_raw_reply(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_raw_getargs(SVCXPRT *, xdrproc_t, caddr_t);
-static bool_t svc_raw_freeargs(SVCXPRT *, xdrproc_t, caddr_t);
-static void svc_raw_destroy(SVCXPRT *);
-static void svc_raw_ops(SVCXPRT *);
-static bool_t svc_raw_control(SVCXPRT *, const u_int, void *);
-
-char *__rpc_rawcombuf = NULL;
-
-SVCXPRT *
-svc_raw_create(void)
-{
-	struct svc_raw_private *srp;
-/* VARIABLES PROTECTED BY svcraw_lock: svc_raw_private, srp */
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		srp = calloc(1, sizeof(*srp));
-		if (srp == NULL)
-			goto out;
-		if (__rpc_rawcombuf == NULL)
-			__rpc_rawcombuf = malloc(UDPMSGSIZE);
-		if (__rpc_rawcombuf == NULL)
-			goto out;
-		srp->raw_buf = __rpc_rawcombuf; /* Share it with the client */
-		svc_raw_private = srp;
-	}
-	srp->server.xp_fd = FD_SETSIZE;
-	srp->server.xp_port = 0;
-	srp->server.xp_p3 = NULL;
-	svc_raw_ops(&srp->server);
-	srp->server.xp_verf.oa_base = srp->verf_body;
-	xdrmem_create(&srp->xdr_stream, srp->raw_buf, UDPMSGSIZE, XDR_DECODE);
-	if (!xprt_register(&srp->server))
-		goto out;
-	mutex_unlock(&svcraw_lock);
-	return (&srp->server);
-out:
-	if (srp != NULL)
-		free(srp);
-	mutex_unlock(&svcraw_lock);
-	return (NULL);
-}
-
-/*ARGSUSED*/
-static enum xprt_stat
-svc_raw_stat(SVCXPRT *xprt) /* args needed to satisfy ANSI-C typechecking */
-{
-	return (XPRT_IDLE);
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_recv(SVCXPRT *xprt, struct rpc_msg *msg)
-{
-	struct svc_raw_private *srp;
-	XDR *xdrs;
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		mutex_unlock(&svcraw_lock);
-		return (FALSE);
-	}
-	mutex_unlock(&svcraw_lock);
-
-	xdrs = &srp->xdr_stream;
-	xdrs->x_op = XDR_DECODE;
-	(void) XDR_SETPOS(xdrs, 0);
-	if (! xdr_callmsg(xdrs, msg)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_reply(SVCXPRT *xprt, struct rpc_msg *msg)
-{
-	struct svc_raw_private *srp;
-	XDR *xdrs;
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		mutex_unlock(&svcraw_lock);
-		return (FALSE);
-	}
-	mutex_unlock(&svcraw_lock);
-
-	xdrs = &srp->xdr_stream;
-	xdrs->x_op = XDR_ENCODE;
-	(void) XDR_SETPOS(xdrs, 0);
-	if (! xdr_replymsg(xdrs, msg)) {
-		return (FALSE);
-	}
-	(void) XDR_GETPOS(xdrs);  /* called just for overhead */
-	return (TRUE);
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_getargs(SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr)
-{
-	struct svc_raw_private *srp;
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		mutex_unlock(&svcraw_lock);
-		return (FALSE);
-	}
-	mutex_unlock(&svcraw_lock);
-	return (*xdr_args)(&srp->xdr_stream, args_ptr);
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_freeargs(SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr)
-{
-	struct svc_raw_private *srp;
-	XDR *xdrs;
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		mutex_unlock(&svcraw_lock);
-		return (FALSE);
-	}
-	mutex_unlock(&svcraw_lock);
-
-	xdrs = &srp->xdr_stream;
-	xdrs->x_op = XDR_FREE;
-	return (*xdr_args)(xdrs, args_ptr);
-}
-
-/*ARGSUSED*/
-static void
-svc_raw_destroy(SVCXPRT *xprt)
-{
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_control(SVCXPRT *xprt, const u_int rq, void *in)
-{
-	return (FALSE);
-}
-
-static void
-svc_raw_ops(SVCXPRT *xprt)
-{
-	static struct xp_ops ops;
-	static struct xp_ops2 ops2;
-#ifdef _REENTRANT
-	extern mutex_t ops_lock;
-#endif
-
-	_DIAGASSERT(xprt != NULL);
-
-/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	mutex_lock(&ops_lock);
-	if (ops.xp_recv == NULL) {
-		ops.xp_recv = svc_raw_recv;
-		ops.xp_stat = svc_raw_stat;
-		ops.xp_getargs = svc_raw_getargs;
-		ops.xp_reply = svc_raw_reply;
-		ops.xp_freeargs = svc_raw_freeargs;
-		ops.xp_destroy = svc_raw_destroy;
-		ops2.xp_control = svc_raw_control;
-	}
-	xprt->xp_ops = &ops;
-	xprt->xp_ops2 = &ops2;
-	mutex_unlock(&ops_lock);
-}
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
deleted file mode 100644
index eb99fd948..000000000
--- a/lib/libc/rpc/svc_run.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*	$NetBSD: svc_run.c,v 1.22 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)svc_run.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: svc_run.c,v 1.22 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * This is the rpc server side idle loop
- * Wait for input, call server program.
- */
-#include "namespace.h"
-#include "reentrant.h"
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-
-#include "svc_fdset.h"
-#include "rpc_internal.h"
-
-#ifdef __weak_alias
-__weak_alias(svc_run,_svc_run)
-__weak_alias(svc_exit,_svc_exit)
-#endif
-
-void
-svc_run(void)
-{
-	fd_set readfds, cleanfds;
-	struct timeval timeout;
-	int maxfd;
-#ifndef RUMP_RPC		
-	int probs = 0;
-#endif
-#ifdef _REENTRANT
-	extern rwlock_t svc_fd_lock;
-#endif
-
-	timeout.tv_sec = 30;
-	timeout.tv_usec = 0;
-
-	for (;;) {
-		rwlock_rdlock(&svc_fd_lock);
-		readfds = *get_fdset();
-		cleanfds = *get_fdset();
-		maxfd = *get_fdsetmax();
-		rwlock_unlock(&svc_fd_lock);
-		switch (select(maxfd + 1, &readfds, NULL, NULL, &timeout)) {
-		case -1:
-#ifndef RUMP_RPC		
-			if ((errno == EINTR || errno == EBADF) && probs < 100) {
-				probs++;
-				continue;
-			}
-#endif
-			if (errno == EINTR) {
-				continue;
-			}
-			warn("%s: select failed", __func__);
-			return;
-		case 0:
-			__svc_clean_idle(&cleanfds, 30, FALSE);
-			continue;
-		default:
-			svc_getreqset(&readfds);
-#ifndef RUMP_RPC
-			probs = 0;
-#endif
-		}
-	}
-}
-
-/*
- *      This function causes svc_run() to exit by telling it that it has no
- *      more work to do.
- */
-void
-svc_exit(void)
-{
-#ifdef _REENTRANT
-	extern rwlock_t svc_fd_lock;
-#endif
-
-	rwlock_wrlock(&svc_fd_lock);
-	FD_ZERO(get_fdset());
-	rwlock_unlock(&svc_fd_lock);
-}
diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c
deleted file mode 100644
index b010921ef..000000000
--- a/lib/libc/rpc/svc_simple.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/*	$NetBSD: svc_simple.c,v 1.33 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #pragma ident	"@(#)svc_simple.c	1.18	94/04/24 SMI" */
-
-/*
- * svc_simple.c
- * Simplified front end to rpc.
- */
-
-/*
- * This interface creates a virtual listener for all the services
- * started thru rpc_reg(). It listens on the same endpoint for
- * all the services and then executes the corresponding service
- * for the given prognum and procnum.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: svc_simple.c,v 1.33 2013/03/11 20:19:29 tron Exp $");
-#endif
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <rpc/rpc.h>
-#include <rpc/nettype.h>
-#include <assert.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "rpc_internal.h"
-
-#ifdef __weak_alias
-__weak_alias(rpc_reg,_rpc_reg)
-#endif
-
-static void universal(struct svc_req *, SVCXPRT *);
-
-static struct proglst {
-	char *(*p_progname)(char *);
-	rpcprog_t p_prognum;
-	rpcvers_t p_versnum;
-	rpcproc_t p_procnum;
-	SVCXPRT *p_transp;
-	char *p_netid;
-	char *p_xdrbuf;
-	int p_recvsz;
-	xdrproc_t p_inproc, p_outproc;
-	struct proglst *p_nxt;
-} *proglst;
-
-static const char __reg_err1[] = "can't find appropriate transport";
-static const char __reg_err2[] = "can't get protocol info";
-static const char __reg_err3[] = "unsupported transport size";
-static const char __no_mem_str[] = "out of memory";
-
-/*
- * For simplified, easy to use kind of rpc interfaces.
- * nettype indicates the type of transport on which the service will be
- * listening. Used for conservation of the system resource. Only one
- * handle is created for all the services (actually one of each netid)
- * and same xdrbuf is used for same netid. The size of the arguments
- * is also limited by the recvsize for that transport, even if it is
- * a COTS transport. This may be wrong, but for cases like these, they
- * should not use the simplified interfaces like this.
- */
-
-int
-rpc_reg(
-	rpcprog_t prognum,		/* program number */
-	rpcvers_t versnum,		/* version number */
-	rpcproc_t procnum,		/* procedure number */
-	char *(*progname)(char *),	/* Server routine */
-	xdrproc_t inproc,		/* in XDR procedure */
-	xdrproc_t outproc,		/* out XDR procedure */
-	char *nettype)			/* nettype */
-{
-	struct netconfig *nconf;
-	int done = FALSE;
-	void *handle;
-#ifdef _REENTRANT
-	extern mutex_t proglst_lock;
-#endif
-
-	if (procnum == NULLPROC) {
-		warnx("%s: can't reassign procedure number %u", __func__,
-		    NULLPROC);
-		return (-1);
-	}
-
-	if (nettype == NULL)
-		nettype = __UNCONST("netpath");	/* The default behavior */
-	if ((handle = __rpc_setconf(nettype)) == NULL) {
-		warnx("%s: %s", __func__, __reg_err1);
-		return (-1);
-	}
-/* VARIABLES PROTECTED BY proglst_lock: proglst */
-	mutex_lock(&proglst_lock);
-	while ((nconf = __rpc_getconf(handle)) != NULL) {
-		struct proglst *pl;
-		SVCXPRT *svcxprt;
-		int madenow;
-		u_int recvsz;
-		char *xdrbuf;
-		char *netid;
-
-		madenow = FALSE;
-		svcxprt = NULL;
-		recvsz = 0;
-		xdrbuf = NULL;
-		netid = NULL;
-		for (pl = proglst; pl; pl = pl->p_nxt)
-			if (strcmp(pl->p_netid, nconf->nc_netid) == 0) {
-				svcxprt = pl->p_transp;
-				xdrbuf = pl->p_xdrbuf;
-				recvsz = pl->p_recvsz;
-				netid = pl->p_netid;
-				break;
-			}
-
-		if (svcxprt == NULL) {
-			struct __rpc_sockinfo si;
-
-			svcxprt = svc_tli_create(RPC_ANYFD, nconf, NULL, 0, 0);
-			if (svcxprt == NULL)
-				continue;
-			if (!__rpc_fd2sockinfo(svcxprt->xp_fd, &si)) {
-				warnx("%s: %s", __func__, __reg_err2);
-				SVC_DESTROY(svcxprt);
-				continue;
-			}
-			recvsz = __rpc_get_t_size(si.si_af, si.si_proto, 0);
-			if (recvsz == 0) {
-				warnx("%s: %s", __func__, __reg_err3);
-				SVC_DESTROY(svcxprt);
-				continue;
-			}
-			if (((xdrbuf = mem_alloc((size_t)recvsz)) == NULL) ||
-				((netid = strdup(nconf->nc_netid)) == NULL)) {
-				warnx("%s: %s", __func__, __no_mem_str);
-				if (xdrbuf != NULL)
-					free(xdrbuf);
-				if (netid != NULL)
-					free(netid);
-				SVC_DESTROY(svcxprt);
-				break;
-			}
-			madenow = TRUE;
-		}
-		/*
-		 * Check if this (program, version, netid) had already been
-		 * registered.  The check may save a few RPC calls to rpcbind
-		 */
-		for (pl = proglst; pl; pl = pl->p_nxt)
-			if ((pl->p_prognum == prognum) &&
-				(pl->p_versnum == versnum) &&
-				(strcmp(pl->p_netid, netid) == 0))
-				break;
-		if (pl == NULL) { /* Not yet */
-			(void) rpcb_unset(prognum, versnum, nconf);
-		} else {
-			/* so that svc_reg does not call rpcb_set() */
-			nconf = NULL;
-		}
-
-		if (!svc_reg(svcxprt, prognum, versnum, universal, nconf)) {
-			warnx("%s: couldn't register prog %u vers %u for %s",
-			    __func__, (unsigned)prognum,
-			    (unsigned)versnum, netid);
-			if (madenow) {
-				SVC_DESTROY(svcxprt);
-				free(xdrbuf);
-				free(netid);
-			}
-			continue;
-		}
-
-		pl = malloc(sizeof(*pl));
-		if (pl == NULL) {
-			warn("%s: %s", __func__, __no_mem_str);
-			if (madenow) {
-				SVC_DESTROY(svcxprt);
-				free(xdrbuf);
-				free(netid);
-			}
-			break;
-		}
-		pl->p_progname = progname;
-		pl->p_prognum = prognum;
-		pl->p_versnum = versnum;
-		pl->p_procnum = procnum;
-		pl->p_inproc = inproc;
-		pl->p_outproc = outproc;
-		pl->p_transp = svcxprt;
-		pl->p_xdrbuf = xdrbuf;
-		pl->p_recvsz = recvsz;
-		pl->p_netid = netid;
-		pl->p_nxt = proglst;
-		proglst = pl;
-		done = TRUE;
-	}
-	__rpc_endconf(handle);
-	mutex_unlock(&proglst_lock);
-
-	if (done == FALSE) {
-		warnx("%s: can't find suitable transport for %s",
-		    __func__, nettype);
-		return (-1);
-	}
-	return (0);
-}
-
-/*
- * The universal handler for the services registered using registerrpc.
- * It handles both the connectionless and the connection oriented cases.
- */
-
-static void
-universal(struct svc_req *rqstp, SVCXPRT *transp)
-{
-	rpcprog_t prog;
-	rpcvers_t vers;
-	rpcproc_t proc;
-	char *outdata;
-	char *xdrbuf;
-	struct proglst *pl;
-#ifdef _REENTRANT
-	extern mutex_t proglst_lock;
-#endif
-
-	_DIAGASSERT(rqstp != NULL);
-	_DIAGASSERT(transp != NULL);
-
-	/*
-	 * enforce "procnum 0 is echo" convention
-	 */
-	if (rqstp->rq_proc == NULLPROC) {
-		if (svc_sendreply(transp, (xdrproc_t) xdr_void, NULL) ==
-		    FALSE) {
-			warnx("%s: svc_sendreply failed", __func__);
-		}
-		return;
-	}
-	prog = rqstp->rq_prog;
-	vers = rqstp->rq_vers;
-	proc = rqstp->rq_proc;
-	mutex_lock(&proglst_lock);
-	for (pl = proglst; pl; pl = pl->p_nxt)
-		if (pl->p_prognum == prog && pl->p_procnum == proc &&
-			pl->p_versnum == vers &&
-			(strcmp(pl->p_netid, transp->xp_netid) == 0)) {
-			/* decode arguments into a CLEAN buffer */
-			xdrbuf = pl->p_xdrbuf;
-			/* Zero the arguments: reqd ! */
-			(void) memset(xdrbuf, 0, (size_t)pl->p_recvsz);
-			/*
-			 * Assuming that sizeof (xdrbuf) would be enough
-			 * for the arguments; if not then the program
-			 * may bomb. BEWARE!
-			 */
-			if (!svc_getargs(transp, pl->p_inproc, xdrbuf)) {
-				svcerr_decode(transp);
-				mutex_unlock(&proglst_lock);
-				return;
-			}
-			outdata = (*(pl->p_progname))(xdrbuf);
-			if (outdata == NULL &&
-				pl->p_outproc != (xdrproc_t) xdr_void){
-				/* there was an error */
-				mutex_unlock(&proglst_lock);
-				return;
-			}
-			if (!svc_sendreply(transp, pl->p_outproc, outdata)) {
-				warnx("%s: trouble replying to prog %u vers %u",
-				    __func__, (unsigned)prog, (unsigned)vers);
-				mutex_unlock(&proglst_lock);
-				return;
-			}
-			/* free the decoded arguments */
-			(void) svc_freeargs(transp, pl->p_inproc, xdrbuf);
-			mutex_unlock(&proglst_lock);
-			return;
-		}
-	mutex_unlock(&proglst_lock);
-	/* This should never happen */
-	warnx("%s: never registered prog %u vers %u", __func__,
-	    (unsigned)prog, (unsigned)vers);
-	return;
-}
diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c
deleted file mode 100644
index f045ab585..000000000
--- a/lib/libc/rpc/svc_vc.c
+++ /dev/null
@@ -1,803 +0,0 @@
-/*	$NetBSD: svc_vc.c,v 1.30 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)svc_tcp.c	2.2 88/08/01 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: svc_vc.c,v 1.30 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * svc_vc.c, Server side for Connection Oriented based RPC. 
- *
- * Actually implements two flavors of transporter -
- * a tcp rendezvouser (a listner and connection establisher)
- * and a record/tcp stream.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/poll.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-
-#include "svc_fdset.h"
-#include "rpc_internal.h"
-
-#ifdef __weak_alias
-__weak_alias(svc_fd_create,_svc_fd_create)
-__weak_alias(svc_vc_create,_svc_vc_create)
-#endif
-
-#ifdef _REENTRANT
-extern rwlock_t svc_fd_lock;
-#endif
-
-static SVCXPRT *makefd_xprt(int, u_int, u_int);
-static bool_t rendezvous_request(SVCXPRT *, struct rpc_msg *);
-static enum xprt_stat rendezvous_stat(SVCXPRT *);
-static void svc_vc_destroy(SVCXPRT *);
-static void __svc_vc_dodestroy(SVCXPRT *);
-static int read_vc(caddr_t, caddr_t, int);
-static int write_vc(caddr_t, caddr_t, int);
-static enum xprt_stat svc_vc_stat(SVCXPRT *);
-static bool_t svc_vc_recv(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_vc_getargs(SVCXPRT *, xdrproc_t, caddr_t);
-static bool_t svc_vc_freeargs(SVCXPRT *, xdrproc_t, caddr_t);
-static bool_t svc_vc_reply(SVCXPRT *, struct rpc_msg *);
-static void svc_vc_rendezvous_ops(SVCXPRT *);
-static void svc_vc_ops(SVCXPRT *);
-static bool_t svc_vc_control(SVCXPRT *, const u_int, void *);
-static bool_t svc_vc_rendezvous_control(SVCXPRT *, const u_int, void *);
-
-struct cf_rendezvous { /* kept in xprt->xp_p1 for rendezvouser */
-	u_int sendsize;
-	u_int recvsize;
-	int maxrec;
-};
-
-struct cf_conn {  /* kept in xprt->xp_p1 for actual connection */
-	enum xprt_stat strm_stat;
-	u_int32_t x_id;
-	XDR xdrs;
-	char verf_body[MAX_AUTH_BYTES];
-	u_int sendsize;
-	u_int recvsize;
-	int maxrec;
-	bool_t nonblock;
-	struct timeval last_recv_time;
-};
-
-/*
- * Usage:
- *	xprt = svc_vc_create(sock, send_buf_size, recv_buf_size);
- *
- * Creates, registers, and returns a (rpc) tcp based transporter.
- * Once *xprt is initialized, it is registered as a transporter
- * see (svc.h, xprt_register).  This routine returns
- * a NULL if a problem occurred.
- *
- * The filedescriptor passed in is expected to refer to a bound, but
- * not yet connected socket.
- *
- * Since streams do buffered io similar to stdio, the caller can specify
- * how big the send and receive buffers are via the second and third parms;
- * 0 => use the system default.
- */
-SVCXPRT *
-svc_vc_create(int fd, u_int sendsize, u_int recvsize)
-{
-	SVCXPRT *xprt;
-	struct cf_rendezvous *r = NULL;
-	struct __rpc_sockinfo si;
-	struct sockaddr_storage sslocal;
-	socklen_t slen;
-	int one = 1;
-
-	if (!__rpc_fd2sockinfo(fd, &si))
-		return NULL;
-
-	r = mem_alloc(sizeof(*r));
-	if (r == NULL) {
-		warn("%s: out of memory", __func__);
-		return NULL;
-	}
-	r->sendsize = __rpc_get_t_size(si.si_af, si.si_proto, (int)sendsize);
-	r->recvsize = __rpc_get_t_size(si.si_af, si.si_proto, (int)recvsize);
-	r->maxrec = __svc_maxrec;
-	xprt = mem_alloc(sizeof(SVCXPRT));
-	if (xprt == NULL) {
-		warn("%s: out of memory", __func__);
-		goto cleanup_svc_vc_create;
-	}
-	xprt->xp_tp = NULL;
-	xprt->xp_p1 = (caddr_t)(void *)r;
-	xprt->xp_p2 = NULL;
-	xprt->xp_p3 = NULL;
-	xprt->xp_verf = _null_auth;
-	svc_vc_rendezvous_ops(xprt);
-	xprt->xp_port = (u_short)-1;	/* It is the rendezvouser */
-	xprt->xp_fd = fd;
-
-	slen = sizeof (struct sockaddr_storage);
-	if (getsockname(fd, (struct sockaddr *)(void *)&sslocal, &slen) < 0) {
-		warn("%s: could not retrieve local addr", __func__);
-		goto cleanup_svc_vc_create;
-	}
-
-	/*
-	 * We want to be able to check credentials on local sockets.
-	 */
-	if (sslocal.ss_family == AF_LOCAL)
-		if (setsockopt(fd, 0, LOCAL_CREDS, &one, (socklen_t)sizeof one)
-		    == -1)
-			goto cleanup_svc_vc_create;
-
-	xprt->xp_ltaddr.maxlen = xprt->xp_ltaddr.len = sslocal.ss_len;
-	xprt->xp_ltaddr.buf = mem_alloc((size_t)sslocal.ss_len);
-	if (xprt->xp_ltaddr.buf == NULL) {
-		warn("%s: out of memory", __func__);
-		goto cleanup_svc_vc_create;
-	}
-	memcpy(xprt->xp_ltaddr.buf, &sslocal, (size_t)sslocal.ss_len);
-
-	xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage);
-	if (!xprt_register(xprt))
-		goto cleanup_svc_vc_create;
-	return xprt;
-cleanup_svc_vc_create:
-	if (xprt)
-		mem_free(xprt, sizeof(*xprt));
-	if (r != NULL)
-		mem_free(r, sizeof(*r));
-	return NULL;
-}
-
-/*
- * Like svtcp_create(), except the routine takes any *open* UNIX file
- * descriptor as its first input.
- */
-SVCXPRT *
-svc_fd_create(int fd, u_int sendsize, u_int recvsize)
-{
-	struct sockaddr_storage ss;
-	socklen_t slen;
-	SVCXPRT *ret;
-
-	_DIAGASSERT(fd != -1);
-
-	ret = makefd_xprt(fd, sendsize, recvsize);
-	if (ret == NULL)
-		return NULL;
-
-	slen = sizeof (struct sockaddr_storage);
-	if (getsockname(fd, (struct sockaddr *)(void *)&ss, &slen) < 0) {
-		warn("%s: could not retrieve local addr", __func__);
-		goto freedata;
-	}
-	ret->xp_ltaddr.maxlen = ret->xp_ltaddr.len = ss.ss_len;
-	ret->xp_ltaddr.buf = mem_alloc((size_t)ss.ss_len);
-	if (ret->xp_ltaddr.buf == NULL) {
-		warn("%s: out of memory", __func__);
-		goto freedata;
-	}
-	memcpy(ret->xp_ltaddr.buf, &ss, (size_t)ss.ss_len);
-
-	slen = sizeof (struct sockaddr_storage);
-	if (getpeername(fd, (struct sockaddr *)(void *)&ss, &slen) < 0) {
-		warn("%s: could not retrieve remote addr", __func__);
-		goto freedata;
-	}
-	ret->xp_rtaddr.maxlen = ret->xp_rtaddr.len = ss.ss_len;
-	ret->xp_rtaddr.buf = mem_alloc((size_t)ss.ss_len);
-	if (ret->xp_rtaddr.buf == NULL) {
-		warn("%s: out of memory", __func__);
-		goto freedata;
-	}
-	memcpy(ret->xp_rtaddr.buf, &ss, (size_t)ss.ss_len);
-#ifdef PORTMAP
-	if (ss.ss_family == AF_INET) {
-		ret->xp_raddr = *(struct sockaddr_in *)ret->xp_rtaddr.buf;
-		ret->xp_addrlen = sizeof (struct sockaddr_in);
-	}
-#endif
-
-	return ret;
-
-freedata:
-	if (ret->xp_ltaddr.buf != NULL)
-		mem_free(ret->xp_ltaddr.buf, rep->xp_ltaddr.maxlen);
-
-	return NULL;
-}
-
-static SVCXPRT *
-makefd_xprt(int fd, u_int sendsize, u_int recvsize)
-{
-	SVCXPRT *xprt;
-	struct cf_conn *cd;
-	const char *netid;
-	struct __rpc_sockinfo si;
- 
-	_DIAGASSERT(fd != -1);
-
-	xprt = mem_alloc(sizeof(SVCXPRT));
-	if (xprt == NULL)
-		goto outofmem;
-	memset(xprt, 0, sizeof *xprt);
-	cd = mem_alloc(sizeof(struct cf_conn));
-	if (cd == NULL)
-		goto outofmem;
-	cd->strm_stat = XPRT_IDLE;
-	xdrrec_create(&(cd->xdrs), sendsize, recvsize,
-	    (caddr_t)(void *)xprt, read_vc, write_vc);
-	xprt->xp_p1 = (caddr_t)(void *)cd;
-	xprt->xp_verf.oa_base = cd->verf_body;
-	svc_vc_ops(xprt);  /* truely deals with calls */
-	xprt->xp_port = 0;  /* this is a connection, not a rendezvouser */
-	xprt->xp_fd = fd;
-	if (__rpc_fd2sockinfo(fd, &si) && __rpc_sockinfo2netid(&si, &netid))
-		if ((xprt->xp_netid = strdup(netid)) == NULL)
-			goto outofmem;
-
-	if (!xprt_register(xprt))
-		goto out;
-	return xprt;
-
-outofmem:
-	warn("svc_tcp: makefd_xprt");
-out:
-	if (xprt)
-		mem_free(xprt, sizeof(SVCXPRT));
-	return NULL;
-}
-
-/*ARGSUSED*/
-static bool_t
-rendezvous_request(SVCXPRT *xprt, struct rpc_msg *msg)
-{
-	int sock, flags;
-	struct cf_rendezvous *r;
-	struct cf_conn *cd;
-	struct sockaddr_storage addr;
-	socklen_t len;
-	struct __rpc_sockinfo si;
-	SVCXPRT *newxprt;
-	fd_set cleanfds;
-
-	_DIAGASSERT(xprt != NULL);
-	_DIAGASSERT(msg != NULL);
-
-	r = (struct cf_rendezvous *)xprt->xp_p1;
-again:
-	len = sizeof addr;
-	if ((sock = accept(xprt->xp_fd, (struct sockaddr *)(void *)&addr,
-	    &len)) < 0) {
-		if (errno == EINTR)
-			goto again;
-		/*
-		 * Clean out the most idle file descriptor when we're
-		 * running out.
-		 */
-		if (errno == EMFILE || errno == ENFILE) {
-			cleanfds = *get_fdset();
-			if (__svc_clean_idle(&cleanfds, 0, FALSE))
-				goto again;
-		}
-		return FALSE;
-	}
-	/*
-	 * make a new transporter (re-uses xprt)
-	 */
-	newxprt = makefd_xprt(sock, r->sendsize, r->recvsize);
-	if (newxprt == NULL)
-		goto out;
-	newxprt->xp_rtaddr.buf = mem_alloc(len);
-	if (newxprt->xp_rtaddr.buf == NULL)
-		goto out;
-	memcpy(newxprt->xp_rtaddr.buf, &addr, len);
-	newxprt->xp_rtaddr.len = len;
-#ifdef PORTMAP
-	if (addr.ss_family == AF_INET) {
-		newxprt->xp_raddr = *(struct sockaddr_in *)newxprt->xp_rtaddr.buf;
-		newxprt->xp_addrlen = sizeof (struct sockaddr_in);
-	}
-#endif
-	if (__rpc_fd2sockinfo(sock, &si))
-		__rpc_setnodelay(sock, &si);
-
-	cd = (struct cf_conn *)newxprt->xp_p1;
-
-	cd->recvsize = r->recvsize;
-	cd->sendsize = r->sendsize;
-	cd->maxrec = r->maxrec;
-
-	if (cd->maxrec != 0) {
-		flags = fcntl(sock, F_GETFL, 0);
-		if (flags  == -1)
-			goto out;
-		if (fcntl(sock, F_SETFL, flags | O_NONBLOCK) == -1)
-			goto out;
-		if (cd->recvsize > (u_int)cd->maxrec)
-			cd->recvsize = cd->maxrec;
-		cd->nonblock = TRUE;
-		__xdrrec_setnonblock(&cd->xdrs, cd->maxrec);
-	} else
-		cd->nonblock = FALSE;
-
-	(void)gettimeofday(&cd->last_recv_time, NULL);
-
-	return FALSE; /* there is never an rpc msg to be processed */
-out:
-	(void)close(sock);
-	return FALSE; /* there was an error */
-}
-
-/*ARGSUSED*/
-static enum xprt_stat
-rendezvous_stat(SVCXPRT *xprt)
-{
-
-	return XPRT_IDLE;
-}
-
-static void
-svc_vc_destroy(SVCXPRT *xprt)
-{
-	_DIAGASSERT(xprt != NULL);
-
-	xprt_unregister(xprt);
-	__svc_vc_dodestroy(xprt);
-}
-
-static void
-__svc_vc_dodestroy(SVCXPRT *xprt)
-{
-	struct cf_conn *cd;
-	struct cf_rendezvous *r;
-
-	cd = (struct cf_conn *)xprt->xp_p1;
-
-	if (xprt->xp_fd != RPC_ANYFD)
-		(void)close(xprt->xp_fd);
-	if (xprt->xp_port != 0) {
-		/* a rendezvouser socket */
-		r = (struct cf_rendezvous *)xprt->xp_p1;
-		mem_free(r, sizeof (struct cf_rendezvous));
-		xprt->xp_port = 0;
-	} else {
-		/* an actual connection socket */
-		XDR_DESTROY(&(cd->xdrs));
-		mem_free(cd, sizeof(struct cf_conn));
-	}
-	if (xprt->xp_rtaddr.buf)
-		mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen);
-	if (xprt->xp_ltaddr.buf)
-		mem_free(xprt->xp_ltaddr.buf, xprt->xp_ltaddr.maxlen);
-	if (xprt->xp_tp)
-		free(xprt->xp_tp);
-	if (xprt->xp_netid)
-		free(xprt->xp_netid);
-	mem_free(xprt, sizeof(SVCXPRT));
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_vc_control(SVCXPRT *xprt, const u_int rq, void *in)
-{
-	return FALSE;
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_vc_rendezvous_control(SVCXPRT *xprt, const u_int rq, void *in)
-{
-	struct cf_rendezvous *cfp;
-
-	cfp = (struct cf_rendezvous *)xprt->xp_p1;
-	if (cfp == NULL)
-		return FALSE;
-	switch (rq) {
-		case SVCGET_CONNMAXREC:
-			*(int *)in = cfp->maxrec;
-			break;
-		case SVCSET_CONNMAXREC:
-			cfp->maxrec = *(int *)in;
-			break;
-		default:
-			return FALSE;
-	}
-	return TRUE;
-}
-
-/*
- * reads data from the tcp connection.
- * any error is fatal and the connection is closed.
- * (And a read of zero bytes is a half closed stream => error.)
- * All read operations timeout after 35 seconds.  A timeout is
- * fatal for the connection.
- */
-static int
-read_vc(caddr_t xprtp, caddr_t buf, int len)
-{
-	SVCXPRT *xprt;
-	int sock;
-	struct pollfd pollfd;
-	struct sockaddr *sa;
-	struct msghdr msg;
-	struct cmsghdr *cmp;
-	void *crmsg = NULL;
-	struct sockcred *sc;
-	socklen_t crmsgsize;
-	struct cf_conn *cfp;
-	static const struct timespec ts = { 35, 0 };
-
-	xprt = (SVCXPRT *)(void *)xprtp;
-	_DIAGASSERT(xprt != NULL);
-
-	sock = xprt->xp_fd;
-
-	sa = (struct sockaddr *)xprt->xp_rtaddr.buf;
-	if (sa->sa_family == AF_LOCAL && xprt->xp_p2 == NULL) {
-		memset(&msg, 0, sizeof msg);
-		crmsgsize = CMSG_SPACE(SOCKCREDSIZE(NGROUPS));
-		crmsg = malloc(crmsgsize);
-		if (crmsg == NULL)
-			goto fatal_err;
-		memset(crmsg, 0, crmsgsize);
-
-		msg.msg_control = crmsg;
-		msg.msg_controllen = crmsgsize;
-
-		if (recvmsg(sock, &msg, 0) < 0)
-			goto fatal_err;
-
-		if (msg.msg_controllen == 0 ||
-		    (msg.msg_flags & MSG_CTRUNC) != 0)
-			goto fatal_err;
-
-		cmp = CMSG_FIRSTHDR(&msg);
-		if (cmp->cmsg_level != SOL_SOCKET ||
-		    cmp->cmsg_type != SCM_CREDS)
-			goto fatal_err;
-
-		sc = (struct sockcred *)(void *)CMSG_DATA(cmp);
-
-		xprt->xp_p2 = mem_alloc(SOCKCREDSIZE(sc->sc_ngroups));
-		if (xprt->xp_p2 == NULL)
-			goto fatal_err;
-
-		memcpy(xprt->xp_p2, sc, SOCKCREDSIZE(sc->sc_ngroups));
-		free(crmsg);
-		crmsg = NULL;
-	}
-
-	cfp = (struct cf_conn *)xprt->xp_p1;
-
-	if (cfp->nonblock) {
-		len = (int)read(sock, buf, (size_t)len);
-		if (len < 0) {
-			if (errno == EAGAIN)
-				len = 0;
-			else
-				goto fatal_err;
-		}
-		if (len != 0)
-			gettimeofday(&cfp->last_recv_time, NULL);
-		return len;
-	}
-
-	do {
-		pollfd.fd = sock;
-		pollfd.events = POLLIN;
-		switch (pollts(&pollfd, 1, &ts, NULL)) {
-		case -1:
-			if (errno == EINTR) {
-				continue;
-			}
-			/*FALLTHROUGH*/
-		case 0:
-			goto fatal_err;
-
-		default:
-			break;
-		}
-	} while ((pollfd.revents & POLLIN) == 0);
-
-	if ((len = (int)read(sock, buf, (size_t)len)) > 0) {
-		gettimeofday(&cfp->last_recv_time, NULL);
-		return len;
-	}
-
-fatal_err:
-	if (crmsg != NULL)
-		free(crmsg);
-	((struct cf_conn *)(xprt->xp_p1))->strm_stat = XPRT_DIED;
-	return -1;
-}
-
-/*
- * writes data to the tcp connection.
- * Any error is fatal and the connection is closed.
- */
-static int
-write_vc(caddr_t xprtp, caddr_t buf, int len)
-{
-	SVCXPRT *xprt;
-	int i, cnt;
-	struct cf_conn *cd;
-	struct timeval tv0, tv1;
-
-	xprt = (SVCXPRT *)(void *)xprtp;
-	_DIAGASSERT(xprt != NULL);
-
-	cd = (struct cf_conn *)xprt->xp_p1;
-
-	if (cd->nonblock)
-		gettimeofday(&tv0, NULL);
-
-	for (cnt = len; cnt > 0; cnt -= i, buf += i) {
-		if ((i = (int)write(xprt->xp_fd, buf, (size_t)cnt)) < 0) {
-			if (errno != EAGAIN || !cd->nonblock) {
-				cd->strm_stat = XPRT_DIED;
-				return -1;
-			}
-			if (cd->nonblock) {
-				/*
-				 * For non-blocking connections, do not
-				 * take more than 2 seconds writing the
-				 * data out.
-				 *
-				 * XXX 2 is an arbitrary amount.
-				 */
-				gettimeofday(&tv1, NULL);
-				if (tv1.tv_sec - tv0.tv_sec >= 2) {
-					cd->strm_stat = XPRT_DIED;
-					return -1;
-				}
-			}
-			i = 0;
-		}
-	}
-	return len;
-}
-
-static enum xprt_stat
-svc_vc_stat(SVCXPRT *xprt)
-{
-	struct cf_conn *cd;
-
-	_DIAGASSERT(xprt != NULL);
-
-	cd = (struct cf_conn *)(xprt->xp_p1);
-
-	if (cd->strm_stat == XPRT_DIED)
-		return XPRT_DIED;
-	if (! xdrrec_eof(&(cd->xdrs)))
-		return XPRT_MOREREQS;
-	return XPRT_IDLE;
-}
-
-static bool_t
-svc_vc_recv(SVCXPRT *xprt, struct rpc_msg *msg)
-{
-	struct cf_conn *cd;
-	XDR *xdrs;
-
-	_DIAGASSERT(xprt != NULL);
-	_DIAGASSERT(msg != NULL);
-
-	cd = (struct cf_conn *)(xprt->xp_p1);
-	xdrs = &(cd->xdrs);
-
-	if (cd->nonblock) {
-		if (!__xdrrec_getrec(xdrs, &cd->strm_stat, TRUE))
-			return FALSE;
-	}
-
-	xdrs->x_op = XDR_DECODE;
-	(void)xdrrec_skiprecord(xdrs);
-
-	if (xdr_callmsg(xdrs, msg)) {
-		cd->x_id = msg->rm_xid;
-		return TRUE;
-	}
-	cd->strm_stat = XPRT_DIED;
-	return FALSE;
-}
-
-static bool_t
-svc_vc_getargs(SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr)
-{
-
-	_DIAGASSERT(xprt != NULL);
-	/* args_ptr may be NULL */
-
-	return (*xdr_args)(&(((struct cf_conn *)(xprt->xp_p1))->xdrs),
-	    args_ptr);
-}
-
-static bool_t
-svc_vc_freeargs(SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr)
-{
-	XDR *xdrs;
-
-	_DIAGASSERT(xprt != NULL);
-	/* args_ptr may be NULL */
-
-	xdrs = &(((struct cf_conn *)(xprt->xp_p1))->xdrs);
-
-	xdrs->x_op = XDR_FREE;
-	return (*xdr_args)(xdrs, args_ptr);
-}
-
-static bool_t
-svc_vc_reply(SVCXPRT *xprt, struct rpc_msg *msg)
-{
-	struct cf_conn *cd;
-	XDR *xdrs;
-	bool_t rstat;
-
-	_DIAGASSERT(xprt != NULL);
-	_DIAGASSERT(msg != NULL);
-
-	cd = (struct cf_conn *)(xprt->xp_p1);
-	xdrs = &(cd->xdrs);
-
-	xdrs->x_op = XDR_ENCODE;
-	msg->rm_xid = cd->x_id;
-	rstat = xdr_replymsg(xdrs, msg);
-	(void)xdrrec_endofrecord(xdrs, TRUE);
-	return rstat;
-}
-
-static void
-svc_vc_ops(SVCXPRT *xprt)
-{
-	static struct xp_ops ops;
-	static struct xp_ops2 ops2;
-#ifdef _REENTRANT
-	extern mutex_t ops_lock;
-#endif
-
-/* VARIABLES PROTECTED BY ops_lock: ops, ops2 */
-
-	mutex_lock(&ops_lock);
-	if (ops.xp_recv == NULL) {
-		ops.xp_recv = svc_vc_recv;
-		ops.xp_stat = svc_vc_stat;
-		ops.xp_getargs = svc_vc_getargs;
-		ops.xp_reply = svc_vc_reply;
-		ops.xp_freeargs = svc_vc_freeargs;
-		ops.xp_destroy = svc_vc_destroy;
-		ops2.xp_control = svc_vc_control;
-	}
-	xprt->xp_ops = &ops;
-	xprt->xp_ops2 = &ops2;
-	mutex_unlock(&ops_lock);
-}
-
-static void
-svc_vc_rendezvous_ops(SVCXPRT *xprt)
-{
-	static struct xp_ops ops;
-	static struct xp_ops2 ops2;
-#ifdef _REENTRANT
-	extern mutex_t ops_lock;
-#endif
-	mutex_lock(&ops_lock);
-	if (ops.xp_recv == NULL) {
-		ops.xp_recv = rendezvous_request;
-		ops.xp_stat = rendezvous_stat;
-		ops.xp_getargs =
-		    (bool_t (*)(SVCXPRT *, xdrproc_t, caddr_t))abort;
-		ops.xp_reply =
-		    (bool_t (*)(SVCXPRT *, struct rpc_msg *))abort;
-		ops.xp_freeargs =
-		    (bool_t (*)(SVCXPRT *, xdrproc_t, caddr_t))abort;
-		ops.xp_destroy = svc_vc_destroy;
-		ops2.xp_control = svc_vc_rendezvous_control;
-	}
-	xprt->xp_ops = &ops;
-	xprt->xp_ops2 = &ops2;
-	mutex_unlock(&ops_lock);
-}
-
-/*
- * Destroy xprts that have not have had any activity in 'timeout' seconds.
- * If 'cleanblock' is true, blocking connections (the default) are also
- * cleaned. If timeout is 0, the least active connection is picked.
- */
-bool_t
-__svc_clean_idle(fd_set *fds, int timeout, bool_t cleanblock)
-{
-	int i, ncleaned;
-	SVCXPRT *xprt, *least_active;
-	struct timeval tv, tdiff, tmax;
-	struct cf_conn *cd;
-
-	gettimeofday(&tv, NULL);
-	tmax.tv_sec = tmax.tv_usec = 0;
-	least_active = NULL;
-	rwlock_wrlock(&svc_fd_lock);
-	for (i = ncleaned = 0; i <= svc_maxfd; i++) {
-		if (FD_ISSET(i, fds)) {
-			xprt = __svc_xports[i];
-			if (xprt == NULL || xprt->xp_ops == NULL ||
-			    xprt->xp_ops->xp_recv != svc_vc_recv)
-				continue;
-			cd = (struct cf_conn *)xprt->xp_p1;
-			if (!cleanblock && !cd->nonblock)
-				continue;
-			if (timeout == 0) {
-				timersub(&tv, &cd->last_recv_time, &tdiff);
-				if (timercmp(&tdiff, &tmax, >)) {
-					tmax = tdiff;
-					least_active = xprt;
-				}
-				continue;
-			}
-			if (tv.tv_sec - cd->last_recv_time.tv_sec > timeout) {
-				__xprt_unregister_unlocked(xprt);
-				__svc_vc_dodestroy(xprt);
-				ncleaned++;
-			}
-		}
-	}
-	if (timeout == 0 && least_active != NULL) {
-		__xprt_unregister_unlocked(least_active);
-		__svc_vc_dodestroy(least_active);
-		ncleaned++;
-	}
-	rwlock_unlock(&svc_fd_lock);
-	return ncleaned > 0 ? TRUE : FALSE;
-}
diff --git a/lib/libc/rpc/xdr.3 b/lib/libc/rpc/xdr.3
deleted file mode 100644
index 99c822d34..000000000
--- a/lib/libc/rpc/xdr.3
+++ /dev/null
@@ -1,522 +0,0 @@
-.\"	@(#)xdr.3n	2.2 88/08/03 4.0 RPCSRC; from 1.16 88/03/14 SMI
-.\"	$NetBSD: xdr.3,v 1.14 2011/07/08 19:28:22 wiz Exp $
-.\"
-.Dd July 4, 2011
-.Dt XDR 3
-.Os
-.Sh NAME
-.Nm xdr ,
-.Nm xdr_array ,
-.Nm xdr_bool ,
-.Nm xdr_bytes ,
-.Nm xdr_char ,
-.Nm xdr_destroy ,
-.Nm xdr_double ,
-.Nm xdr_enum ,
-.Nm xdr_float ,
-.Nm xdr_free ,
-.Nm xdr_getpos ,
-.Nm xdr_hyper ,
-.Nm xdr_inline ,
-.Nm xdr_int ,
-.Nm xdr_long ,
-.Nm xdr_longlong_t ,
-.Nm xdrmem_create ,
-.Nm xdr_opaque ,
-.Nm xdr_pointer ,
-.Nm xdrrec_create ,
-.Nm xdrrec_endofrecord ,
-.Nm xdrrec_eof ,
-.Nm xdrrec_skiprecord ,
-.Nm xdr_reference ,
-.Nm xdr_setpos ,
-.Nm xdr_short ,
-.Nm xdr_sizeof ,
-.Nm xdrstdio_create ,
-.Nm xdr_string ,
-.Nm xdr_u_char ,
-.Nm xdr_u_hyper ,
-.Nm xdr_u_long ,
-.Nm xdr_u_longlong_t ,
-.Nm xdr_u_short ,
-.Nm xdr_union ,
-.Nm xdr_vector ,
-.Nm xdr_void ,
-.Nm xdr_wrapstring
-.Nd library routines for external data representation
-.Sh SYNOPSIS
-.Ft int
-.Fn xdr_array "XDR *xdrs" "char **arrp" "u_int *sizep" "u_int maxsize" \
-"u_int elsize" "xdrproc_t elproc"
-.Ft int
-.Fn xdr_bool "XDR *xdrs" "bool_t *bp"
-.Ft int
-.Fn xdr_bytes "XDR *xdrs" "char **sp" "u_int *sizep" "u_int maxsize"
-.Ft int
-.Fn xdr_char "XDR *xdrs" "char *cp"
-.Ft void
-.Fn xdr_destroy "XDR *xdrs"
-.Ft int
-.Fn xdr_double "XDR *xdrs" "double *dp"
-.Ft int
-.Fn xdr_enum "XDR *xdrs" "enum_t *ep"
-.Ft int
-.Fn xdr_float "XDR *xdrs" "float *fp"
-.Ft void
-.Fn xdr_free "xdrproc_t proc" "char *objp"
-.Ft u_int
-.Fn xdr_getpos "XDR *xdrs"
-.Ft int
-.Fn xdr_hyper "XDR *xdrs" "longlong_t *llp"
-.Ft long *
-.Fn xdr_inline "XDR *xdrs" "int len"
-.Ft int
-.Fn xdr_int "XDR *xdrs" "int *ip"
-.Ft int
-.Fn xdr_long "XDR *xdrs" "long *lp"
-.Ft int
-.Fn xdr_longlong_t "XDR *xdrs" "longlong_t *llp"
-.Ft void
-.Fn xdrmem_create "XDR *xdrs" "char *addr" "u_int size" \
-"enum xdr_op op"
-.Ft int
-.Fn xdr_opaque "XDR *xdrs" "char *cp" "u_int cnt"
-.Ft int
-.Fn xdr_pointer "XDR *xdrs" "char **objpp" "u_int objsize" \
-"xdrproc_t xdrobj"
-.Ft void
-.Fn xdrrec_create "XDR *xdrs" "u_int sendsize" "u_int recvsize" \
-"char *handle" "int (*readit)()" "int (*writeit)()"
-.Ft int
-.Fn xdrrec_endofrecord "XDR *xdrs" "int sendnow"
-.Ft int
-.Fn xdrrec_eof "XDR *xdrs"
-.Ft int
-.Fn xdrrec_skiprecord "XDR *xdrs"
-.Ft int
-.Fn xdr_reference "XDR *xdrs" "char **pp" "u_int size" \
-"xdrproc_t proc"
-.Ft int
-.Fn xdr_setpos "XDR *xdrs" "u_int pos"
-.Ft int
-.Fn xdr_short "XDR *xdrs" "short *sp"
-.Ft nsigned long
-.Fn xdr_sizeof "xdrproc_t func" "void *data"
-.Ft void
-.Fn xdrstdio_create "XDR *xdrs" "FILE *file" "enum xdr_op op"
-.Ft int
-.Fn xdr_string "XDR *xdrs" "char **sp" "u_int maxsize"
-.Ft int
-.Fn xdr_u_char "XDR *xdrs" "unsigned char *ucp"
-.Ft int
-.Fn xdr_u_hyper "XDR *xdrs" "u_longlong_t *ullp"
-.Ft int
-.Fn xdr_u_int "XDR *xdrs" "unsigned *up"
-.Ft int
-.Fn xdr_u_long "XDR *xdrs" "unsigned long *ulp"
-.Ft int
-.Fn xdr_u_longlong_t "XDR *xdrs" "u_longlong_t *ullp"
-.Ft int
-.Fn xdr_u_short "XDR *xdrs" "unsigned short *usp"
-.Ft int
-.Fn xdr_union "XDR *xdrs" "int *dscmp" "char *unp" \
-"struct xdr_discrim *choices" "bool_t (*defaultarm)(\|)"
-.Ft int
-.Fn xdr_vector "XDR *xdrs" "char *arrp" "u_int size" \
-"u_int elsize" "xdrproc_t elproc"
-.Ft int
-.Fn xdr_void "void"
-.Ft int
-.Fn xdr_wrapstring "XDR *xdrs" "char **sp"
-.Sh DESCRIPTION
-These routines allow C programmers to describe
-arbitrary data structures in a machine-independent fashion.
-Data for remote procedure calls are transmitted using these
-routines.
-.Bl -tag -width xxx
-.It Fn xdr_array
-A filter primitive that translates between variable-length
-arrays and their corresponding external representations.
-The parameter
-.Fa arrp
-is the address of the pointer to the array, while
-.Fa sizep
-is the address of the element count of the array;
-this element count cannot exceed
-.Fa maxsize .
-The parameter
-.Fa elsize
-is the
-.Em sizeof
-each of the array's elements, and
-.Fa elproc
-is an XDR filter that translates between the array elements' C form,
-and their external representation.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_bool
-A filter primitive that translates between booleans (C integers)
-and their external representations.
-When encoding data, this filter produces values of either one or
-zero.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_bytes
-A filter primitive that translates between counted byte
-strings and their external representations.
-The parameter
-.Fa sp
-is the address of the string pointer.
-The length of the string is located at address
-.Fa sizep ;
-strings cannot be longer than
-.Fa maxsize .
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_char
-A filter primitive that translates between C characters
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-Note: encoded characters are not packed, and occupy 4 bytes each.
-For arrays of characters, it is worthwhile to consider
-.Fn xdr_bytes ,
-.Fn xdr_opaque
-or
-.Fn xdr_string .
-.It Fn xdr_destroy
-A macro that invokes the destroy routine associated with the XDR
-stream,
-.Fa xdrs .
-Destruction usually involves freeing private data structures
-associated with the stream.
-Using
-.Fa xdrs
-after invoking
-.Fn xdr_destroy
-is undefined.
-.It Fn xdr_double
-A filter primitive that translates between C double precision numbers
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_enum
-A filter primitive that translates between C enums (actually integers)
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_float
-A filter primitive that translates between C floats
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_free
-Generic freeing routine.
-The first argument is the XDR routine for the object being freed.
-The second argument is a pointer to the object itself.
-Note: the pointer passed to this routine is
-.Em not
-freed, but what it points to
-.Em is
-freed (recursively).
-.It Fn xdr_getpos
-A macro that invokes the get-position routine associated with the XDR
-stream,
-.Fa xdrs .
-The routine returns an unsigned integer, which indicates the position
-of the XDR byte stream.
-A desirable feature of XDR streams is that simple arithmetic works
-with this number, although the XDR stream instances need not guarantee
-this.
-.It Fn xdr_hyper
-A filter primitive that translates between ANSI C long long integers
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_inline
-A macro that invokes the in-line routine associated with the XDR
-stream,
-.Fa xdrs .
-The routine returns a pointer
-to a contiguous piece of the stream's buffer;
-.Fa len
-is the byte length of the desired buffer.
-Note: pointer is cast to
-.Vt "long *" .
-.Pp
-Warning:
-.Fn xdr_inline
-may return
-.Dv NULL
-if it cannot allocate a contiguous piece of a buffer.
-Therefore the behavior may vary among stream instances;
-it exists for the sake of efficiency.
-.It Fn xdr_int
-A filter primitive that translates between C integers
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_long
-A filter primitive that translates between C long integers
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_longlong_t
-A filter primitive that translates between ANSI C long long integers
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdrmem_create
-This routine initializes the XDR stream object pointed to by
-.Fa xdrs .
-The stream's data is written to, or read from,
-a chunk of memory at location
-.Fa addr
-whose length is no more than
-.Fa size
-bytes long.
-The
-.Fa op
-determines the direction of the XDR stream (either
-.Dv XDR_ENCODE ,
-.Dv XDR_DECODE ,
-or
-.Dv XDR_FREE ) .
-.It Fn xdr_opaque
-A filter primitive that translates between fixed size opaque data
-and its external representation.
-The parameter
-.Fa cp
-is the address of the opaque object, and
-.Fa cnt
-is its size in bytes.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_pointer
-Like
-.Fn xdr_reference
-except that it serializes
-.Dv NULL
-pointers, whereas
-.Fn xdr_reference
-does not.
-Thus,
-.Fn xdr_pointer
-can represent recursive data structures, such as binary trees or
-linked lists.
-.It Fn xdrrec_create
-This routine initializes the XDR stream object pointed to by
-.Fa xdrs .
-The stream's data is written to a buffer of size
-.Fa sendsize ;
-a value of zero indicates the system should use a suitable default.
-The stream's data is read from a buffer of size
-.Fa recvsize ;
-it too can be set to a suitable default by passing a zero value.
-When a stream's output buffer is full,
-.Fa writeit
-is called.
-Similarly, when a stream's input buffer is empty,
-.Fa readit
-is called.
-The behavior of these two routines is similar to the system calls
-.Xr read 2
-and
-.Xr write 2 ,
-except that
-.Fa handle
-is passed to the former routines as the first parameter.
-Note: the XDR stream's
-.Fa op
-field must be set by the caller.
-.Pp
-Warning: this XDR stream implements an intermediate record stream.
-Therefore there are additional bytes in the stream
-to provide record boundary information.
-.It Fn xdrrec_endofrecord
-This routine can be invoked only on streams created by
-.Fn xdrrec_create .
-The data in the output buffer is marked as a completed record,
-and the output buffer is optionally written out if
-.Fa sendnow
-is non-zero.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdrrec_eof
-This routine can be invoked only on streams created by
-.Fn xdrrec_create .
-After consuming the rest of the current record in the stream,
-this routine returns one if the stream has no more input,
-zero otherwise.
-.It Fn xdrrec_skiprecord
-This routine can be invoked only on streams created by
-.Fn xdrrec_create .
-It tells the XDR implementation that the rest of the current record
-in the stream's input buffer should be discarded.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_reference
-A primitive that provides pointer chasing within structures.
-The parameter
-.Fa pp
-is the address of the pointer;
-.Fa size
-is the
-.Em sizeof
-the structure that
-.Fa *pp
-points to; and
-.Fa proc
-is an XDR procedure that filters the structure
-between its C form and its external representation.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-Warning: this routine does not understand
-.Dv NULL
-pointers.
-Use
-.Fn xdr_pointer
-instead.
-.It Fn xdr_setpos
-A macro that invokes the set position routine associated with the XDR
-stream
-.Fa xdrs .
-The parameter
-.Fa pos
-is a position value obtained from
-.Fn xdr_getpos .
-This routine returns one if the XDR stream could be repositioned,
-and zero otherwise.
-.Pp
-Warning: it is difficult to reposition some types of XDR streams, so
-this routine may fail with one type of stream and succeed with
-another.
-.It Fn xdr_short
-A filter primitive that translates between C short integers
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_sizeof
-This routine returns the amount of memory required to encode
-.Fa data
-using filter
-.Fa func .
-.It Fn xdrstdio_create
-This routine initializes the XDR stream object pointed to by
-.Fa xdrs .
-The XDR stream data is written to, or read from, the Standard I/O
-stream
-.Fa file .
-The parameter
-.Fa op
-determines the direction of the XDR stream (either
-.Dv XDR_ENCODE ,
-.Dv XDR_DECODE ,
-or
-.Dv XDR_FREE ) .
-.Pp
-Warning: the destroy routine associated with such XDR streams calls
-.Xr fflush 3
-on the file stream, but never
-.Xr fclose 3 .
-.It Fn xdr_string
-A filter primitive that translates between C strings and
-their corresponding external representations.
-Strings cannot be longer than
-.Fa maxsize .
-Note:
-.Fa sp
-is the address of the string's pointer.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_u_char
-A filter primitive that translates between unsigned C characters
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_u_hyper
-A filter primitive that translates between unsigned ANSI C long long
-integers and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_u_int
-A filter primitive that translates between C unsigned integers
- and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_u_long
-A filter primitive that translates between C unsigned long integers
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_u_longlong_t
-A filter primitive that translates between unsigned ANSI C long long
-integers and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_u_short
-A filter primitive that translates between C unsigned short integers
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_union
-A filter primitive that translates between a discriminated C union
-and its corresponding external representation.
-It first translates the discriminant of the union located at
-.Fa dscmp .
-This discriminant is always an enum_t.
-Next the union located at
-.Fa unp
-is translated.
-The parameter
-.Fa choices
-is a pointer to an array of
-.Fn xdr_discrim
-structures.
-Each structure contains an ordered pair of
-.Fa [ value ,
-.Fa proc ] .
-If the union's discriminant is equal to the associated
-.Fa value ,
-then the
-.Fa proc
-is called to translate the union.
-The end of the
-.Fn xdr_discrim
-structure array is denoted by a routine of value
-.Dv NULL .
-If the discriminant is not found in the
-.Fa choices
-array, then the
-.Fa defaultarm
-procedure is called (if it is not
-.Dv NULL ) .
-Returns one if it succeeds, zero otherwise.
-.It Fn xdr_vector
-A filter primitive that translates between fixed-length
-arrays and their corresponding external representations.
-The parameter
-.Fa arrp
-is the address of the pointer to the array, while
-.Fa size
-is the element count of the array.
-The parameter
-.Fa elsize
-is the
-.Em sizeof
-each of the array's elements, and
-.Fa elproc
-is an XDR filter that translates between the array elements' C form,
-and their external representation.
-This routine returns one if it succeeds, zero otherwise.
-.It Fn xdr_void
-This routine always returns one.
-It may be passed to RPC routines that require a function parameter,
-where nothing is to be done.
-.It Fn xdr_wrapstring
-A primitive that calls
-.Fn xdr_string "xdrs" "sp" "MAXUN.UNSIGNED" ;
-where
-.Dv MAXUN.UNSIGNED
-is the maximum value of an unsigned integer.
-.Fn xdr_wrapstring
-is handy because the RPC package passes a maximum of two XDR
-routines as parameters, and
-.Fn xdr_string ,
-one of the most frequently used primitives, requires three.
-Returns one if it succeeds, zero otherwise.
-.El
-.Sh SEE ALSO
-.Xr rpc 3
-.Pp
-The following manuals:
-.Rs
-.%B "eXternal Data Representation Standard: Protocol Specification"
-.Re
-.Rs
-.%B "eXternal Data Representation: Sun Technical Notes"
-.Re
-.Rs
-.%A Sun Microsystems, Inc., USC-ISI
-.%T "XDR: External Data Representation Standard"
-.%R "RFC 1014, USC-ISI"
-.%V 1014
-.Re
diff --git a/lib/libc/rpc/xdr.c b/lib/libc/rpc/xdr.c
deleted file mode 100644
index eb46fc491..000000000
--- a/lib/libc/rpc/xdr.c
+++ /dev/null
@@ -1,952 +0,0 @@
-/*	$NetBSD: xdr.c,v 1.33 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)xdr.c 1.35 87/08/12";
-static char *sccsid = "@(#)xdr.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: xdr.c,v 1.33 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * xdr.c, Generic XDR routines implementation.
- *
- * Copyright (C) 1986, Sun Microsystems, Inc.
- *
- * These are the "generic" xdr routines used to serialize and de-serialize
- * most common data items.  See xdr.h for more info on the interface to
- * xdr.
- */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-
-#ifdef __weak_alias
-__weak_alias(xdr_bool,_xdr_bool)
-__weak_alias(xdr_bytes,_xdr_bytes)
-__weak_alias(xdr_char,_xdr_char)
-__weak_alias(xdr_enum,_xdr_enum)
-__weak_alias(xdr_free,_xdr_free)
-__weak_alias(xdr_hyper,_xdr_hyper)
-__weak_alias(xdr_int,_xdr_int)
-__weak_alias(xdr_int16_t,_xdr_int16_t)
-__weak_alias(xdr_int32_t,_xdr_int32_t)
-__weak_alias(xdr_int64_t,_xdr_int64_t)
-__weak_alias(xdr_long,_xdr_long)
-__weak_alias(xdr_longlong_t,_xdr_longlong_t)
-__weak_alias(xdr_netobj,_xdr_netobj)
-__weak_alias(xdr_opaque,_xdr_opaque)
-__weak_alias(xdr_short,_xdr_short)
-__weak_alias(xdr_string,_xdr_string)
-__weak_alias(xdr_u_char,_xdr_u_char)
-__weak_alias(xdr_u_hyper,_xdr_u_hyper)
-__weak_alias(xdr_u_int,_xdr_u_int)
-__weak_alias(xdr_u_int16_t,_xdr_u_int16_t)
-__weak_alias(xdr_u_int32_t,_xdr_u_int32_t)
-__weak_alias(xdr_u_int64_t,_xdr_u_int64_t)
-__weak_alias(xdr_u_long,_xdr_u_long)
-__weak_alias(xdr_u_longlong_t,_xdr_u_longlong_t)
-__weak_alias(xdr_u_short,_xdr_u_short)
-__weak_alias(xdr_union,_xdr_union)
-__weak_alias(xdr_void,_xdr_void)
-__weak_alias(xdr_wrapstring,_xdr_wrapstring)
-#endif
-
-/*
- * constants specific to the xdr "protocol"
- */
-#define XDR_FALSE	((long) 0)
-#define XDR_TRUE	((long) 1)
-#define LASTUNSIGNED	((u_int) 0-1)
-
-/*
- * for unit alignment
- */
-static const char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 };
-
-/*
- * Free a data structure using XDR
- * Not a filter, but a convenient utility nonetheless
- */
-void
-xdr_free(xdrproc_t proc, char *objp)
-{
-	XDR x;
-	
-	x.x_op = XDR_FREE;
-	(*proc)(&x, objp);
-}
-
-/*
- * XDR nothing
- */
-bool_t
-xdr_void(void) {
-
-	return (TRUE);
-}
-
-
-/*
- * XDR integers
- */
-bool_t
-xdr_int(XDR *xdrs, int *ip)
-{
-	long l;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(ip != NULL);
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (long) *ip;
-		return (XDR_PUTLONG(xdrs, &l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &l)) {
-			return (FALSE);
-		}
-		*ip = (int) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned integers
- */
-bool_t
-xdr_u_int(XDR *xdrs, u_int *up)
-{
-	u_long l;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(up != NULL);
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (u_long) *up;
-		return (XDR_PUTLONG(xdrs, (long *)&l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, (long *)&l)) {
-			return (FALSE);
-		}
-		*up = (u_int) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR long integers
- * same as xdr_u_long - open coded to save a proc call!
- */
-bool_t
-xdr_long(XDR *xdrs, long *lp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(lp != NULL);
-
-	switch (xdrs->x_op) {
-	case XDR_ENCODE:
-		return (XDR_PUTLONG(xdrs, lp));
-	case XDR_DECODE:
-		return (XDR_GETLONG(xdrs, lp));
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned long integers
- * same as xdr_long - open coded to save a proc call!
- */
-bool_t
-xdr_u_long(XDR *xdrs, u_long *ulp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(ulp != NULL);
-
-	switch (xdrs->x_op) {
-	case XDR_ENCODE:
-		return (XDR_PUTLONG(xdrs, (long *)ulp));
-	case XDR_DECODE:
-		return (XDR_GETLONG(xdrs, (long *)ulp));
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR 32-bit integers
- * same as xdr_u_int32_t - open coded to save a proc call!
- */
-bool_t
-xdr_int32_t(XDR *xdrs, int32_t *int32_p)
-{
-	long l;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(int32_p != NULL);
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (long) *int32_p;
-		return (XDR_PUTLONG(xdrs, &l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &l)) {
-			return (FALSE);
-		}
-		*int32_p = (int32_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned 32-bit integers
- * same as xdr_int32_t - open coded to save a proc call!
- */
-bool_t
-xdr_u_int32_t(XDR *xdrs, u_int32_t *u_int32_p)
-{
-	u_long l;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(u_int32_p != NULL);
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (u_long) *u_int32_p;
-		return (XDR_PUTLONG(xdrs, (long *)&l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, (long *)&l)) {
-			return (FALSE);
-		}
-		*u_int32_p = (u_int32_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR short integers
- */
-bool_t
-xdr_short(XDR *xdrs, short *sp)
-{
-	long l;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(sp != NULL);
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (long) *sp;
-		return (XDR_PUTLONG(xdrs, &l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &l)) {
-			return (FALSE);
-		}
-		*sp = (short) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned short integers
- */
-bool_t
-xdr_u_short(XDR *xdrs, u_short *usp)
-{
-	u_long l;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(usp != NULL);
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (u_long) *usp;
-		return (XDR_PUTLONG(xdrs, (long *)&l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, (long *)&l)) {
-			return (FALSE);
-		}
-		*usp = (u_short) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR 16-bit integers
- */
-bool_t
-xdr_int16_t(XDR *xdrs, int16_t *int16_p)
-{
-	long l;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(int16_p != NULL);
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (long) *int16_p;
-		return (XDR_PUTLONG(xdrs, &l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &l)) {
-			return (FALSE);
-		}
-		*int16_p = (int16_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned 16-bit integers
- */
-bool_t
-xdr_u_int16_t(XDR *xdrs, u_int16_t *u_int16_p)
-{
-	u_long l;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(u_int16_p != NULL);
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (u_long) *u_int16_p;
-		return (XDR_PUTLONG(xdrs, (long *)&l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, (long *)&l)) {
-			return (FALSE);
-		}
-		*u_int16_p = (u_int16_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR a char
- */
-bool_t
-xdr_char(XDR *xdrs, char *cp)
-{
-	int i;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(cp != NULL);
-
-	i = (*cp);
-	if (!xdr_int(xdrs, &i)) {
-		return (FALSE);
-	}
-	*cp = i;
-	return (TRUE);
-}
-
-/*
- * XDR an unsigned char
- */
-bool_t
-xdr_u_char(XDR *xdrs, u_char *cp)
-{
-	u_int u;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(cp != NULL);
-
-	u = (*cp);
-	if (!xdr_u_int(xdrs, &u)) {
-		return (FALSE);
-	}
-	*cp = u;
-	return (TRUE);
-}
-
-/*
- * XDR booleans
- */
-bool_t
-xdr_bool(XDR *xdrs, bool_t *bp)
-{
-	long lb;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(bp != NULL);
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		lb = *bp ? XDR_TRUE : XDR_FALSE;
-		return (XDR_PUTLONG(xdrs, &lb));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &lb)) {
-			return (FALSE);
-		}
-		*bp = (lb == XDR_FALSE) ? FALSE : TRUE;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR enumerations
- */
-bool_t
-xdr_enum(XDR *xdrs, enum_t *ep)
-{
-	long l;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(ep != NULL);
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (long) *ep;
-		return (XDR_PUTLONG(xdrs, &l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &l)) {
-			return (FALSE);
-		}
-		*ep = (enum_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR opaque data
- * Allows the specification of a fixed size sequence of opaque bytes.
- * cp points to the opaque object and cnt gives the byte length.
- */
-bool_t
-xdr_opaque(XDR *xdrs, caddr_t cp, u_int cnt)
-{
-	u_int rndup;
-	static int crud[BYTES_PER_XDR_UNIT];
-
-	_DIAGASSERT(xdrs != NULL);
-		/*
-		 * if no data we are done
-		 */
-	if (cnt == 0)
-		return (TRUE);
-	_DIAGASSERT(cp != NULL);
-
-	/*
-	 * round byte count to full xdr units
-	 */
-	rndup = cnt % BYTES_PER_XDR_UNIT;
-	if (rndup > 0)
-		rndup = BYTES_PER_XDR_UNIT - rndup;
-
-	if (xdrs->x_op == XDR_DECODE) {
-		if (!XDR_GETBYTES(xdrs, cp, cnt)) {
-			return (FALSE);
-		}
-		if (rndup == 0)
-			return (TRUE);
-		return (XDR_GETBYTES(xdrs, (caddr_t)(void *)crud, rndup));
-	}
-
-	if (xdrs->x_op == XDR_ENCODE) {
-		if (!XDR_PUTBYTES(xdrs, cp, cnt)) {
-			return (FALSE);
-		}
-		if (rndup == 0)
-			return (TRUE);
-		return (XDR_PUTBYTES(xdrs, xdr_zero, rndup));
-	}
-
-	if (xdrs->x_op == XDR_FREE) {
-		return (TRUE);
-	}
-
-	return (FALSE);
-}
-
-/*
- * XDR counted bytes
- * *cpp is a pointer to the bytes, *sizep is the count.
- * If *cpp is NULL maxsize bytes are allocated
- */
-bool_t
-xdr_bytes(XDR *xdrs, char **cpp, u_int *sizep, u_int maxsize)
-{
-	char *sp;  		/* sp is the actual string pointer */
-	u_int nodesize;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(cpp != NULL);
-	_DIAGASSERT(sizep != NULL);
-
-	sp = *cpp;
-
-	/*
-	 * first deal with the length since xdr bytes are counted
-	 */
-	if (! xdr_u_int(xdrs, sizep)) {
-		return (FALSE);
-	}
-	nodesize = *sizep;
-	if ((nodesize > maxsize) && (xdrs->x_op != XDR_FREE)) {
-		return (FALSE);
-	}
-
-	/*
-	 * now deal with the actual bytes
-	 */
-	switch (xdrs->x_op) {
-
-	case XDR_DECODE:
-		if (nodesize == 0) {
-			return (TRUE);
-		}
-		if (sp == NULL) {
-			*cpp = sp = mem_alloc(nodesize);
-		}
-		if (sp == NULL) {
-			warn("%s: out of memory", __func__);
-			return (FALSE);
-		}
-		/* FALLTHROUGH */
-
-	case XDR_ENCODE:
-		return (xdr_opaque(xdrs, sp, nodesize));
-
-	case XDR_FREE:
-		if (sp != NULL) {
-			mem_free(sp, nodesize);
-			*cpp = NULL;
-		}
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * Implemented here due to commonality of the object.
- */
-bool_t
-xdr_netobj(XDR *xdrs, struct netobj *np)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(np != NULL);
-
-	return (xdr_bytes(xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ));
-}
-
-/*
- * XDR a descriminated union
- * Support routine for discriminated unions.
- * You create an array of xdrdiscrim structures, terminated with
- * an entry with a null procedure pointer.  The routine gets
- * the discriminant value and then searches the array of xdrdiscrims
- * looking for that value.  It calls the procedure given in the xdrdiscrim
- * to handle the discriminant.  If there is no specific routine a default
- * routine may be called.
- * If there is no specific or default routine an error is returned.
- */
-bool_t
-xdr_union(
-	XDR *xdrs,
-	enum_t *dscmp,		/* enum to decide which arm to work on */
-	char *unp,		/* the union itself */
-	const struct xdr_discrim *choices, /* [value, xdr proc] for each arm */
-	xdrproc_t dfault	/* default xdr routine */
-)
-{
-	enum_t dscm;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(dscmp != NULL);
-	_DIAGASSERT(unp != NULL);
-	_DIAGASSERT(choices != NULL);
-	/* dfault may be NULL */
-
-	/*
-	 * we deal with the discriminator;  it's an enum
-	 */
-	if (! xdr_enum(xdrs, dscmp)) {
-		return (FALSE);
-	}
-	dscm = *dscmp;
-
-	/*
-	 * search choices for a value that matches the discriminator.
-	 * if we find one, execute the xdr routine for that value.
-	 */
-	for (; choices->proc != NULL_xdrproc_t; choices++) {
-		if (choices->value == dscm)
-			return ((*(choices->proc))(xdrs, unp));
-	}
-
-	/*
-	 * no match - execute the default xdr routine if there is one
-	 */
-	return ((dfault == NULL_xdrproc_t) ? FALSE :
-	    (*dfault)(xdrs, unp));
-}
-
-
-/*
- * Non-portable xdr primitives.
- * Care should be taken when moving these routines to new architectures.
- */
-
-
-/*
- * XDR null terminated ASCII strings
- * xdr_string deals with "C strings" - arrays of bytes that are
- * terminated by a NULL character.  The parameter cpp references a
- * pointer to storage; If the pointer is null, then the necessary
- * storage is allocated.  The last parameter is the max allowed length
- * of the string as specified by a protocol.
- */
-bool_t
-xdr_string(XDR *xdrs, char **cpp, u_int maxsize)
-{
-	char *sp;  		/* sp is the actual string pointer */
-	u_int size = 0;		/* XXX: GCC */
-	u_int nodesize;
-	size_t len;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(cpp != NULL);
-
-	sp = *cpp;
-
-	/*
-	 * first deal with the length since xdr strings are counted-strings
-	 */
-	switch (xdrs->x_op) {
-	case XDR_FREE:
-		if (sp == NULL) {
-			return(TRUE);	/* already free */
-		}
-		/* FALLTHROUGH */
-	case XDR_ENCODE:
-		len = strlen(sp);
-		_DIAGASSERT(__type_fit(u_int, len));
-		size = (u_int)len;
-		break;
-	case XDR_DECODE:
-		break;
-	}
-	if (! xdr_u_int(xdrs, &size)) {
-		return (FALSE);
-	}
-	if (size > maxsize) {
-		return (FALSE);
-	}
-	nodesize = size + 1;
-
-	/*
-	 * now deal with the actual bytes
-	 */
-	switch (xdrs->x_op) {
-
-	case XDR_DECODE:
-		if (nodesize == 0) {
-			return (TRUE);
-		}
-		if (sp == NULL)
-			*cpp = sp = mem_alloc(nodesize);
-		if (sp == NULL) {
-			warn("%s: out of memory", __func__);
-			return (FALSE);
-		}
-		sp[size] = 0;
-		/* FALLTHROUGH */
-
-	case XDR_ENCODE:
-		return (xdr_opaque(xdrs, sp, size));
-
-	case XDR_FREE:
-		mem_free(sp, nodesize);
-		*cpp = NULL;
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/* 
- * Wrapper for xdr_string that can be called directly from 
- * routines like clnt_call
- */
-bool_t
-xdr_wrapstring(XDR *xdrs, char **cpp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(cpp != NULL);
-
-	return xdr_string(xdrs, cpp, LASTUNSIGNED);
-}
-
-/*
- * NOTE: xdr_hyper(), xdr_u_hyper(), xdr_longlong_t(), and xdr_u_longlong_t()
- * are in the "non-portable" section because they require that a `long long'
- * be a 64-bit type.
- *
- *	--thorpej@NetBSD.org, November 30, 1999
- */
-
-/*
- * XDR 64-bit integers
- */
-bool_t
-xdr_int64_t(XDR *xdrs, int64_t *llp)
-{
-	u_long ul[2];
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(llp != NULL);
-
-	switch (xdrs->x_op) {
-	case XDR_ENCODE:
-		ul[0] = (u_long)(((uint64_t)*llp >> 32) &
-		    (uint64_t)0xffffffffULL);
-		ul[1] = (u_long)(((uint64_t)*llp) &
-		    (uint64_t)0xffffffffULL);
-		if (XDR_PUTLONG(xdrs, (long *)&ul[0]) == FALSE)
-			return (FALSE);
-		return (XDR_PUTLONG(xdrs, (long *)&ul[1]));
-	case XDR_DECODE:
-		if (XDR_GETLONG(xdrs, (long *)&ul[0]) == FALSE)
-			return (FALSE);
-		if (XDR_GETLONG(xdrs, (long *)&ul[1]) == FALSE)
-			return (FALSE);
-		*llp = (int64_t)
-		    (((u_int64_t)ul[0] << 32) | ((u_int64_t)ul[1]));
-		return (TRUE);
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR unsigned 64-bit integers
- */
-bool_t
-xdr_u_int64_t(XDR *xdrs, u_int64_t *ullp)
-{
-	u_long ul[2];
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(ullp != NULL);
-
-	switch (xdrs->x_op) {
-	case XDR_ENCODE:
-		ul[0] = (u_long)(*ullp >> 32) & 0xffffffffUL;
-		ul[1] = (u_long)(*ullp) & 0xffffffffUL;
-		if (XDR_PUTLONG(xdrs, (long *)&ul[0]) == FALSE)
-			return (FALSE);
-		return (XDR_PUTLONG(xdrs, (long *)&ul[1]));
-	case XDR_DECODE:
-		if (XDR_GETLONG(xdrs, (long *)&ul[0]) == FALSE)
-			return (FALSE);
-		if (XDR_GETLONG(xdrs, (long *)&ul[1]) == FALSE)
-			return (FALSE);
-		*ullp = (u_int64_t)
-		    (((u_int64_t)ul[0] << 32) | ((u_int64_t)ul[1]));
-		return (TRUE);
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR hypers
- */
-bool_t
-xdr_hyper(XDR *xdrs, longlong_t *llp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(llp != NULL);
-
-	/*
-	 * Don't bother open-coding this; it's a fair amount of code.  Just
-	 * call xdr_int64_t().
-	 */
-	return (xdr_int64_t(xdrs, (int64_t *)llp));
-}
-
-
-/*
- * XDR unsigned hypers
- */
-bool_t
-xdr_u_hyper(XDR *xdrs, u_longlong_t *ullp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(ullp != NULL);
-
-	/*
-	 * Don't bother open-coding this; it's a fair amount of code.  Just
-	 * call xdr_u_int64_t().
-	 */
-	return (xdr_u_int64_t(xdrs, (u_int64_t *)ullp));
-}
-
-
-/*
- * XDR longlong_t's
- */
-bool_t
-xdr_longlong_t(XDR *xdrs, longlong_t *llp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(llp != NULL);
-
-	/*
-	 * Don't bother open-coding this; it's a fair amount of code.  Just
-	 * call xdr_int64_t().
-	 */
-	return (xdr_int64_t(xdrs, (int64_t *)llp));
-}
-
-
-/*
- * XDR u_longlong_t's
- */
-bool_t
-xdr_u_longlong_t(XDR *xdrs, u_longlong_t *ullp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(ullp != NULL);
-
-	/*
-	 * Don't bother open-coding this; it's a fair amount of code.  Just
-	 * call xdr_u_int64_t().
-	 */
-	return (xdr_u_int64_t(xdrs, (u_int64_t *)ullp));
-}
diff --git a/lib/libc/rpc/xdr_array.c b/lib/libc/rpc/xdr_array.c
deleted file mode 100644
index 643e6e65a..000000000
--- a/lib/libc/rpc/xdr_array.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*	$NetBSD: xdr_array.c,v 1.19 2013/03/11 20:19:29 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_array.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: xdr_array.c,v 1.19 2013/03/11 20:19:29 tron Exp $");
-#endif
-#endif
-
-/*
- * xdr_array.c, Generic XDR routines implementation.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * These are the "non-trivial" xdr primitives used to serialize and de-serialize
- * arrays.  See xdr.h for more info on the interface to xdr.
- */
-
-#include "namespace.h"
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-
-#ifdef __weak_alias
-__weak_alias(xdr_array,_xdr_array)
-__weak_alias(xdr_vector,_xdr_vector)
-#endif
-
-/*
- * XDR an array of arbitrary elements
- * *addrp is a pointer to the array, *sizep is the number of elements.
- * If addrp is NULL (*sizep * elsize) bytes are allocated.
- * elsize is the size (in bytes) of each element, and elproc is the
- * xdr procedure to call to handle each element of the array.
- */
-bool_t
-xdr_array(XDR *xdrs, caddr_t *addrp, u_int *sizep, u_int maxsize, u_int elsize,
-    xdrproc_t elproc)
-{
-	u_int i;
-	caddr_t target = *addrp;
-	u_int c;  /* the actual element count */
-	bool_t stat = TRUE;
-	u_int nodesize;
-
-	/* like strings, arrays are really counted arrays */
-	if (!xdr_u_int(xdrs, sizep))
-		return (FALSE);
-
-	c = *sizep;
-	if ((c > maxsize || UINT_MAX/elsize < c) &&
-	    (xdrs->x_op != XDR_FREE))
-		return (FALSE);
-	nodesize = c * elsize;
-
-	/*
-	 * if we are deserializing, we may need to allocate an array.
-	 * We also save time by checking for a null array if we are freeing.
-	 */
-	if (target == NULL)
-		switch (xdrs->x_op) {
-		case XDR_DECODE:
-			if (c == 0)
-				return (TRUE);
-			*addrp = target = mem_alloc(nodesize);
-			if (target == NULL) {
-				warn("%s: out of memory", __func__);
-				return (FALSE);
-			}
-			memset(target, 0, nodesize);
-			break;
-
-		case XDR_FREE:
-			return (TRUE);
-
-		case XDR_ENCODE:
-			break;
-	}
-	
-	/*
-	 * now we xdr each element of array
-	 */
-	for (i = 0; (i < c) && stat; i++) {
-		stat = (*elproc)(xdrs, target);
-		target += elsize;
-	}
-
-	/*
-	 * the array may need freeing
-	 */
-	if (xdrs->x_op == XDR_FREE) {
-		mem_free(*addrp, nodesize);
-		*addrp = NULL;
-	}
-	return (stat);
-}
-
-/*
- * xdr_vector():
- *
- * XDR a fixed length array. Unlike variable-length arrays,
- * the storage of fixed length arrays is static and unfreeable.
- * > basep: base of the array
- * > size: size of the array
- * > elemsize: size of each element
- * > xdr_elem: routine to XDR each element
- */
-bool_t
-xdr_vector(XDR *xdrs, char *basep, u_int nelem, u_int elemsize,
-    xdrproc_t xdr_elem)
-{
-	u_int i;
-	char *elptr;
-
-	elptr = basep;
-	for (i = 0; i < nelem; i++) {
-		if (!(*xdr_elem)(xdrs, elptr)) {
-			return(FALSE);
-		}
-		elptr += elemsize;
-	}
-	return(TRUE);	
-}
diff --git a/lib/libc/rpc/xdr_float.c b/lib/libc/rpc/xdr_float.c
deleted file mode 100644
index 4310237bc..000000000
--- a/lib/libc/rpc/xdr_float.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/*	$NetBSD: xdr_float.c,v 1.40 2014/08/24 17:07:00 matt Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_float.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: xdr_float.c,v 1.40 2014/08/24 17:07:00 matt Exp $");
-#endif
-#endif
-
-/*
- * xdr_float.c, Generic XDR routines implementation.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * These are the "floating point" xdr routines used to (de)serialize
- * most common data items.  See xdr.h for more info on the interface to
- * xdr.
- */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <stdio.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-
-#ifdef __weak_alias
-__weak_alias(xdr_double,_xdr_double)
-__weak_alias(xdr_float,_xdr_float)
-#endif
-
-/*
- * NB: Not portable.
- * This routine works on machines with IEEE754 FP and Vaxen.
- */
-
-#if !defined(__vax__)
-#include <machine/endian.h>
-#define IEEEFP
-#endif
-
-#if defined(__vax__)
-
-/* What IEEE single precision floating point looks like on a Vax */
-struct	ieee_single {
-	unsigned int	mantissa: 23;
-	unsigned int	exp     : 8;
-	unsigned int	sign    : 1;
-};
-
-/* Vax single precision floating point */
-struct	vax_single {
-	unsigned int	mantissa1 : 7;
-	unsigned int	exp       : 8;
-	unsigned int	sign      : 1;
-	unsigned int	mantissa2 : 16;
-};
-
-#define VAX_SNG_BIAS	0x81
-#define IEEE_SNG_BIAS	0x7f
-
-static struct sgl_limits {
-	struct vax_single s;
-	struct ieee_single ieee;
-} sgl_limits[2] = {
-	{{ 0x7f, 0xff, 0x0, 0xffff },	/* Max Vax */
-	{ 0x0, 0xff, 0x0 }},		/* Max IEEE */
-	{{ 0x0, 0x0, 0x0, 0x0 },	/* Min Vax */
-	{ 0x0, 0x0, 0x0 }}		/* Min IEEE */
-};
-#endif /* vax */
-
-bool_t
-xdr_float(XDR *xdrs, float *fp)
-{
-#ifndef IEEEFP
-	struct ieee_single is;
-	struct vax_single vs, *vsp;
-	struct sgl_limits *lim;
-	size_t i;
-#endif
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-#ifdef IEEEFP
-		return (XDR_PUTINT32(xdrs, (int32_t *)(void *)fp));
-#else
-		vs = *((struct vax_single *)(void *)fp);
-		for (i = 0, lim = sgl_limits;
-			i < sizeof(sgl_limits)/sizeof(struct sgl_limits);
-			i++, lim++) {
-			if ((vs.mantissa2 == lim->s.mantissa2) &&
-				(vs.exp == lim->s.exp) &&
-				(vs.mantissa1 == lim->s.mantissa1)) {
-				is = lim->ieee;
-				goto shipit;
-			}
-		}
-		is.exp = vs.exp - VAX_SNG_BIAS + IEEE_SNG_BIAS;
-		is.mantissa = (vs.mantissa1 << 16) | vs.mantissa2;
-	shipit:
-		is.sign = vs.sign;
-		return (XDR_PUTINT32(xdrs, (int32_t *)(void *)&is));
-#endif
-
-	case XDR_DECODE:
-#ifdef IEEEFP
-		return (XDR_GETINT32(xdrs, (int32_t *)(void *)fp));
-#else
-		vsp = (struct vax_single *)(void *)fp;
-		if (!XDR_GETINT32(xdrs, (int32_t *)(void *)&is))
-			return (FALSE);
-		for (i = 0, lim = sgl_limits;
-			i < sizeof(sgl_limits)/sizeof(struct sgl_limits);
-			i++, lim++) {
-			if ((is.exp == lim->ieee.exp) &&
-				(is.mantissa == lim->ieee.mantissa)) {
-				*vsp = lim->s;
-				goto doneit;
-			}
-		}
-		vsp->exp = is.exp - IEEE_SNG_BIAS + VAX_SNG_BIAS;
-		vsp->mantissa2 = is.mantissa;
-		vsp->mantissa1 = ((unsigned int)is.mantissa >> 16);
-	doneit:
-		vsp->sign = is.sign;
-		return (TRUE);
-#endif
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-#if defined(__vax__)
-/* What IEEE double precision floating point looks like on a Vax */
-struct	ieee_double {
-	unsigned int	mantissa1 : 20;
-	unsigned int	exp       : 11;
-	unsigned int	sign      : 1;
-	unsigned int	mantissa2 : 32;
-};
-
-/* Vax double precision floating point */
-struct  vax_double {
-	unsigned int	mantissa1 : 7;
-	unsigned int	exp       : 8;
-	unsigned int	sign      : 1;
-	unsigned int	mantissa2 : 16;
-	unsigned int	mantissa3 : 16;
-	unsigned int	mantissa4 : 16;
-};
-
-#define VAX_DBL_BIAS	0x81
-#define IEEE_DBL_BIAS	0x3ff
-#define MASK(nbits)	((1 << nbits) - 1)
-
-static struct dbl_limits {
-	struct	vax_double d;
-	struct	ieee_double ieee;
-} dbl_limits[2] = {
-	{{ 0x7f, 0xff, 0x0, 0xffff, 0xffff, 0xffff },	/* Max Vax */
-	{ 0x0, 0x7ff, 0x0, 0x0 }},			/* Max IEEE */
-	{{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0},		/* Min Vax */
-	{ 0x0, 0x0, 0x0, 0x0 }}				/* Min IEEE */
-};
-
-#endif /* vax */
-
-
-bool_t
-xdr_double(XDR *xdrs, double *dp)
-{
-#ifdef IEEEFP
-	int32_t *i32p;
-	bool_t rv;
-#else
-	int32_t *lp;
-	struct	ieee_double id;
-	struct	vax_double vd;
-	struct dbl_limits *lim;
-	size_t i;
-#endif
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-#ifdef IEEEFP
-		i32p = (int32_t *)(void *)dp;
-#if (BYTE_ORDER == BIG_ENDIAN) || \
-    (defined(__arm__) && !defined(__VFP_FP__))
-		rv = XDR_PUTINT32(xdrs, i32p);
-		if (!rv)
-			return (rv);
-		rv = XDR_PUTINT32(xdrs, i32p+1);
-#else
-		rv = XDR_PUTINT32(xdrs, i32p+1);
-		if (!rv)
-			return (rv);
-		rv = XDR_PUTINT32(xdrs, i32p);
-#endif
-		return (rv);
-#else
-		vd = *((struct vax_double *)(void *)dp);
-		for (i = 0, lim = dbl_limits;
-			i < sizeof(dbl_limits)/sizeof(struct dbl_limits);
-			i++, lim++) {
-			if ((vd.mantissa4 == lim->d.mantissa4) &&
-				(vd.mantissa3 == lim->d.mantissa3) &&
-				(vd.mantissa2 == lim->d.mantissa2) &&
-				(vd.mantissa1 == lim->d.mantissa1) &&
-				(vd.exp == lim->d.exp)) {
-				id = lim->ieee;
-				goto shipit;
-			}
-		}
-		id.exp = vd.exp - VAX_DBL_BIAS + IEEE_DBL_BIAS;
-		id.mantissa1 = (vd.mantissa1 << 13) |
-			    ((unsigned int)vd.mantissa2 >> 3);
-		id.mantissa2 = ((vd.mantissa2 & MASK(3)) << 29) |
-				(vd.mantissa3 << 13) |
-				(((unsigned int)vd.mantissa4 >> 3) & MASK(13));
-	shipit:
-		id.sign = vd.sign;
-		lp = (int32_t *)(void *)&id;
-		return (XDR_PUTINT32(xdrs, lp++) && XDR_PUTINT32(xdrs, lp));
-#endif
-
-	case XDR_DECODE:
-#ifdef IEEEFP
-		i32p = (int32_t *)(void *)dp;
-#if BYTE_ORDER == BIG_ENDIAN || \
-    (defined(__arm__) && !defined(__VFP_FP__))
-		rv = XDR_GETINT32(xdrs, i32p);
-		if (!rv)
-			return (rv);
-		rv = XDR_GETINT32(xdrs, i32p+1);
-#else
-		rv = XDR_GETINT32(xdrs, i32p+1);
-		if (!rv)
-			return (rv);
-		rv = XDR_GETINT32(xdrs, i32p);
-#endif
-		return (rv);
-#else
-		lp = (int32_t *)(void *)&id;
-		if (!XDR_GETINT32(xdrs, lp++) || !XDR_GETINT32(xdrs, lp))
-			return (FALSE);
-		for (i = 0, lim = dbl_limits;
-			i < sizeof(dbl_limits)/sizeof(struct dbl_limits);
-			i++, lim++) {
-			if ((id.mantissa2 == lim->ieee.mantissa2) &&
-				(id.mantissa1 == lim->ieee.mantissa1) &&
-				(id.exp == lim->ieee.exp)) {
-				vd = lim->d;
-				goto doneit;
-			}
-		}
-		vd.exp = id.exp - IEEE_DBL_BIAS + VAX_DBL_BIAS;
-		vd.mantissa1 = ((unsigned int)id.mantissa1 >> 13);
-		vd.mantissa2 = ((id.mantissa1 & MASK(13)) << 3) |
-				((unsigned int)id.mantissa2 >> 29);
-		vd.mantissa3 = ((unsigned int)id.mantissa2 >> 13);
-		vd.mantissa4 = (id.mantissa2 << 3);
-	doneit:
-		vd.sign = id.sign;
-		*dp = *((double *)(void *)&vd);
-		return (TRUE);
-#endif
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
diff --git a/lib/libc/rpc/xdr_mem.c b/lib/libc/rpc/xdr_mem.c
deleted file mode 100644
index 05d77c34a..000000000
--- a/lib/libc/rpc/xdr_mem.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*	$NetBSD: xdr_mem.c,v 1.19 2013/03/11 20:19:30 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_mem.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: xdr_mem.c,v 1.19 2013/03/11 20:19:30 tron Exp $");
-#endif
-#endif
-
-/*
- * xdr_mem.h, XDR implementation using memory buffers.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * If you have some data to be interpreted as external data representation
- * or to be converted to external data representation in a memory buffer,
- * then this is the package for you.
- *
- */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-
-#ifdef __weak_alias
-__weak_alias(xdrmem_create,_xdrmem_create)
-#endif
-
-static void xdrmem_destroy(XDR *);
-static bool_t xdrmem_getlong_aligned(XDR *, long *);
-static bool_t xdrmem_putlong_aligned(XDR *, const long *);
-static bool_t xdrmem_getlong_unaligned(XDR *, long *);
-static bool_t xdrmem_putlong_unaligned(XDR *, const long *);
-static bool_t xdrmem_getbytes(XDR *, char *, u_int);
-static bool_t xdrmem_putbytes(XDR *, const char *, u_int);
-/* XXX: w/64-bit pointers, u_int not enough! */
-static u_int xdrmem_getpos(XDR *);
-static bool_t xdrmem_setpos(XDR *, u_int);
-static int32_t *xdrmem_inline_aligned(XDR *, u_int);
-static int32_t *xdrmem_inline_unaligned(XDR *, u_int);
-
-static const struct	xdr_ops xdrmem_ops_aligned = {
-	xdrmem_getlong_aligned,
-	xdrmem_putlong_aligned,
-	xdrmem_getbytes,
-	xdrmem_putbytes,
-	xdrmem_getpos,
-	xdrmem_setpos,
-	xdrmem_inline_aligned,
-	xdrmem_destroy,
-	NULL,	/* xdrmem_control */
-};
-
-static const struct	xdr_ops xdrmem_ops_unaligned = {
-	xdrmem_getlong_unaligned,
-	xdrmem_putlong_unaligned,
-	xdrmem_getbytes,
-	xdrmem_putbytes,
-	xdrmem_getpos,
-	xdrmem_setpos,
-	xdrmem_inline_unaligned,
-	xdrmem_destroy,
-	NULL,	/* xdrmem_control */
-};
-
-/*
- * The procedure xdrmem_create initializes a stream descriptor for a
- * memory buffer.  
- */
-void
-xdrmem_create(XDR *xdrs, char *addr, u_int size, enum xdr_op op)
-{
-
-	xdrs->x_op = op;
-	xdrs->x_ops = ((unsigned long)addr & (sizeof(int32_t) - 1))
-	    ? &xdrmem_ops_unaligned : &xdrmem_ops_aligned;
-	xdrs->x_private = xdrs->x_base = addr;
-	xdrs->x_handy = size;
-}
-
-/*ARGSUSED*/
-static void
-xdrmem_destroy(XDR *xdrs)
-{
-
-}
-
-static bool_t
-xdrmem_getlong_aligned(XDR *xdrs, long *lp)
-{
-
-	if (xdrs->x_handy < sizeof(int32_t))
-		return (FALSE);
-	xdrs->x_handy -= sizeof(int32_t);
-	*lp = ntohl(*(u_int32_t *)xdrs->x_private);
-	xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_putlong_aligned(XDR *xdrs, const long *lp)
-{
-
-	if (xdrs->x_handy < sizeof(int32_t))
-		return (FALSE);
-	xdrs->x_handy -= sizeof(int32_t);
-	*(u_int32_t *)xdrs->x_private = htonl((u_int32_t)*lp);
-	xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_getlong_unaligned(XDR *xdrs, long *lp)
-{
-	u_int32_t l;
-
-	if (xdrs->x_handy < sizeof(int32_t))
-		return (FALSE);
-	xdrs->x_handy -= sizeof(int32_t);
-	memmove(&l, xdrs->x_private, sizeof(int32_t));
-	*lp = ntohl(l);
-	xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_putlong_unaligned(XDR *xdrs, const long *lp)
-{
-	u_int32_t l;
-
-	if (xdrs->x_handy < sizeof(int32_t))
-		return (FALSE);
-	xdrs->x_handy -= sizeof(int32_t);
-	l = htonl((u_int32_t)*lp);
-	memmove(xdrs->x_private, &l, sizeof(int32_t));
-	xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_getbytes(XDR *xdrs, char *addr, u_int len)
-{
-
-	if (xdrs->x_handy < len)
-		return (FALSE);
-	xdrs->x_handy -= len;
-	memmove(addr, xdrs->x_private, len);
-	xdrs->x_private = (char *)xdrs->x_private + len;
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_putbytes(XDR *xdrs, const char *addr, u_int len)
-{
-
-	if (xdrs->x_handy < len)
-		return (FALSE);
-	xdrs->x_handy -= len;
-	memmove(xdrs->x_private, addr, len);
-	xdrs->x_private = (char *)xdrs->x_private + len;
-	return (TRUE);
-}
-
-static u_int
-xdrmem_getpos(XDR *xdrs)
-{
-
-	/* XXX w/64-bit pointers, u_int not enough! */
-	return (u_int)((u_long)xdrs->x_private - (u_long)xdrs->x_base);
-}
-
-static bool_t
-xdrmem_setpos(XDR *xdrs, u_int pos)
-{
-	char *newaddr = xdrs->x_base + pos;
-	char *lastaddr = (char *)xdrs->x_private + xdrs->x_handy;
-
-	if ((long)newaddr > (long)lastaddr)
-		return (FALSE);
-	xdrs->x_private = newaddr;
-	xdrs->x_handy = (int)((long)lastaddr - (long)newaddr);
-	return (TRUE);
-}
-
-static int32_t *
-xdrmem_inline_aligned(XDR *xdrs, u_int len)
-{
-	int32_t *buf = 0;
-
-	if (xdrs->x_handy >= len) {
-		xdrs->x_handy -= len;
-		buf = (int32_t *)xdrs->x_private;
-		xdrs->x_private = (char *)xdrs->x_private + len;
-	}
-	return (buf);
-}
-
-/* ARGSUSED */
-static int32_t *
-xdrmem_inline_unaligned(XDR *xdrs, u_int len)
-{
-
-	return (0);
-}
diff --git a/lib/libc/rpc/xdr_rec.c b/lib/libc/rpc/xdr_rec.c
deleted file mode 100644
index 5436f5931..000000000
--- a/lib/libc/rpc/xdr_rec.c
+++ /dev/null
@@ -1,777 +0,0 @@
-/*	$NetBSD: xdr_rec.c,v 1.36 2015/03/26 11:31:57 justin Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint) 
-#if 0
-static char *sccsid = "@(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_rec.c	2.2 88/08/01 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: xdr_rec.c,v 1.36 2015/03/26 11:31:57 justin Exp $");
-#endif
-#endif
-
-/*
- * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"
- * layer above tcp (for rpc's use).
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * These routines interface XDRSTREAMS to a tcp/ip connection.
- * There is a record marking layer between the xdr stream
- * and the tcp transport level.  A record is composed on one or more
- * record fragments.  A record fragment is a thirty-two bit header followed
- * by n bytes of data, where n is contained in the header.  The header
- * is represented as a htonl(u_long).  Thegh order bit encodes
- * whether or not the fragment is the last fragment of the record
- * (1 => fragment is last, 0 => more fragments to follow. 
- * The other 31 bits encode the byte length of the fragment.
- */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-
-#include <assert.h>
-#include <err.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/svc.h>
-#include <rpc/clnt.h>
-
-#include "rpc_internal.h"
-
-#ifdef __weak_alias
-__weak_alias(xdrrec_create,_xdrrec_create)
-__weak_alias(xdrrec_endofrecord,_xdrrec_endofrecord)
-__weak_alias(xdrrec_eof,_xdrrec_eof)
-__weak_alias(xdrrec_skiprecord,_xdrrec_skiprecord)
-#endif
-
-static bool_t	xdrrec_getlong(XDR *, long *);
-static bool_t	xdrrec_putlong(XDR *, const long *);
-static bool_t	xdrrec_getbytes(XDR *, char *, u_int);
-
-static bool_t	xdrrec_putbytes(XDR *, const char *, u_int);
-static u_int	xdrrec_getpos(XDR *);
-static bool_t	xdrrec_setpos(XDR *, u_int);
-static int32_t *xdrrec_inline(XDR *, u_int);
-static void	xdrrec_destroy(XDR *);
-
-static const struct  xdr_ops xdrrec_ops = {
-	xdrrec_getlong,
-	xdrrec_putlong,
-	xdrrec_getbytes,
-	xdrrec_putbytes,
-	xdrrec_getpos,
-	xdrrec_setpos,
-	xdrrec_inline,
-	xdrrec_destroy,
-	NULL, /* xdrrec_control */
-};
-
-/*
- * A record is composed of one or more record fragments.
- * A record fragment is a four-byte header followed by zero to
- * 2**32-1 bytes.  The header is treated as a long unsigned and is
- * encode/decoded to the network via htonl/ntohl.  The low order 31 bits
- * are a byte count of the fragment.  The highest order bit is a boolean:
- * 1 => this fragment is the last fragment of the record,
- * 0 => this fragment is followed by more fragment(s).
- *
- * The fragment/record machinery is not general;  it is constructed to
- * meet the needs of xdr and rpc based on tcp.
- */
-
-#define LAST_FRAG ((uint32_t)(1 << 31))
-
-typedef struct rec_strm {
-	char *tcp_handle;
-	/*
-	 * out-goung bits
-	 */
-	int (*writeit)(char *, char *, int);
-	char *out_base;	/* output buffer (points to frag header) */
-	char *out_finger;	/* next output position */
-	char *out_boundry;	/* data cannot up to this address */
-	uint32_t *frag_header;	/* beginning of curren fragment */
-	bool_t frag_sent;	/* true if buffer sent in middle of record */
-	/*
-	 * in-coming bits
-	 */
-	int (*readit)(char *, char *, int);
-	u_long in_size;	/* fixed size of the input buffer */
-	char *in_base;
-	char *in_finger;	/* location of next byte to be had */
-	char *in_boundry;	/* can read up to this location */
-	long fbtbc;		/* fragment bytes to be consumed */
-	bool_t last_frag;
-	u_int sendsize;
-	u_int recvsize;
-
-	bool_t nonblock;
-	bool_t in_haveheader;
-	uint32_t in_header;
-	char *in_hdrp;
-	int in_hdrlen;
-	int in_reclen;
-	int in_received;
-	int in_maxrec;
-} RECSTREAM;
-
-static u_int	fix_buf_size(u_int);
-static bool_t	flush_out(RECSTREAM *, bool_t);
-static bool_t	fill_input_buf(RECSTREAM *);
-static bool_t	get_input_bytes(RECSTREAM *, char *, u_int);
-static bool_t	set_input_fragment(RECSTREAM *);
-static bool_t	skip_input_bytes(RECSTREAM *, long);
-static bool_t	realloc_stream(RECSTREAM *, int);
-
-
-/*
- * Create an xdr handle for xdrrec
- * xdrrec_create fills in xdrs.  Sendsize and recvsize are
- * send and recv buffer sizes (0 => use default).
- * tcp_handle is an opaque handle that is passed as the first parameter to
- * the procedures readit and writeit.  Readit and writeit are read and
- * write respectively.   They are like the system
- * calls expect that they take an opaque handle rather than an fd.
- */
-void
-xdrrec_create(
-	XDR *xdrs,
-	u_int sendsize,
-	u_int recvsize,
-	char *tcp_handle,
-	/* like read, but pass it a tcp_handle, not sock */
-	int (*readit)(char *, char *, int),
-	/* like write, but pass it a tcp_handle, not sock */
-	int (*writeit)(char *, char *, int))
-{
-	RECSTREAM *rstrm = mem_alloc(sizeof(RECSTREAM));
-
-	if (rstrm == NULL) {
-		warn("%s: out of memory", __func__);
-		/* 
-		 *  This is bad.  Should rework xdrrec_create to 
-		 *  return a handle, and in this case return NULL
-		 */
-		return;
-	}
-
-	rstrm->sendsize = sendsize = fix_buf_size(sendsize);
-	rstrm->out_base = malloc(rstrm->sendsize);
-	if (rstrm->out_base == NULL) {
-		warn("%s: out of memory", __func__);
-		mem_free(rstrm, sizeof(RECSTREAM));
-		return;
-	}
-
-	rstrm->recvsize = recvsize = fix_buf_size(recvsize);
-	rstrm->in_base = malloc(recvsize);
-	if (rstrm->in_base == NULL) {
-		warn("%s: out of memory", __func__);
-		mem_free(rstrm->out_base, sendsize);
-		mem_free(rstrm, sizeof(RECSTREAM));
-		return;
-	}
-	/*
-	 * now the rest ...
-	 */
-	xdrs->x_ops = &xdrrec_ops;
-	xdrs->x_private = rstrm;
-	rstrm->tcp_handle = tcp_handle;
-	rstrm->readit = readit;
-	rstrm->writeit = writeit;
-	rstrm->out_finger = rstrm->out_boundry = rstrm->out_base;
-	rstrm->frag_header = (uint32_t *)(void *)rstrm->out_base;
-	rstrm->out_finger += sizeof(uint32_t);
-	rstrm->out_boundry += sendsize;
-	rstrm->frag_sent = FALSE;
-	rstrm->in_size = recvsize;
-	rstrm->in_boundry = rstrm->in_base;
-	rstrm->in_finger = (rstrm->in_boundry += recvsize);
-	rstrm->fbtbc = 0;
-	rstrm->last_frag = TRUE;
-	rstrm->in_haveheader = FALSE;
-	rstrm->in_hdrlen = 0;
-	rstrm->in_hdrp = (char *)(void *)&rstrm->in_header;
-	rstrm->nonblock = FALSE;
-	rstrm->in_reclen = 0;
-	rstrm->in_received = 0;
-}
-
-
-/*
- * The reoutines defined below are the xdr ops which will go into the
- * xdr handle filled in by xdrrec_create.
- */
-
-static bool_t
-xdrrec_getlong(XDR *xdrs, long *lp)
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	int32_t *buflp = (int32_t *)(void *)(rstrm->in_finger);
-	int32_t mylong;
-
-	/* first try the inline, fast case */
-	if ((rstrm->fbtbc >= (long)sizeof(int32_t)) &&
-		(((uintptr_t)rstrm->in_boundry - (uintptr_t)buflp) >= sizeof(int32_t))) {
-		*lp = (long)ntohl((uint32_t)(*buflp));
-		rstrm->fbtbc -= sizeof(int32_t);
-		rstrm->in_finger += sizeof(int32_t);
-	} else {
-		if (! xdrrec_getbytes(xdrs, (char *)(void *)&mylong,
-		    (u_int)sizeof(int32_t)))
-			return (FALSE);
-		*lp = (long)ntohl((uint32_t)mylong);
-	}
-	return (TRUE);
-}
-
-static bool_t
-xdrrec_putlong(XDR *xdrs, const long *lp)
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	int32_t *dest_lp = ((int32_t *)(void *)(rstrm->out_finger));
-
-	if ((rstrm->out_finger += sizeof(int32_t)) > rstrm->out_boundry) {
-		/*
-		 * this case should almost never happen so the code is
-		 * inefficient
-		 */
-		rstrm->out_finger -= sizeof(int32_t);
-		rstrm->frag_sent = TRUE;
-		if (! flush_out(rstrm, FALSE))
-			return (FALSE);
-		dest_lp = ((int32_t *)(void *)(rstrm->out_finger));
-		rstrm->out_finger += sizeof(int32_t);
-	}
-	*dest_lp = (int32_t)htonl((uint32_t)(*lp));
-	return (TRUE);
-}
-
-static bool_t  /* must manage buffers, fragments, and records */
-xdrrec_getbytes(XDR *xdrs, char *addr, u_int len)
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	u_int current;
-
-	while (len > 0) {
-		current = (u_int)rstrm->fbtbc;
-		if (current == 0) {
-			if (rstrm->last_frag)
-				return (FALSE);
-			if (! set_input_fragment(rstrm))
-				return (FALSE);
-			continue;
-		}
-		current = (len < current) ? len : current;
-		if (! get_input_bytes(rstrm, addr, current))
-			return (FALSE);
-		addr += current; 
-		rstrm->fbtbc -= current;
-		len -= current;
-	}
-	return (TRUE);
-}
-
-static bool_t
-xdrrec_putbytes(XDR *xdrs, const char *addr, u_int len)
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	size_t current;
-
-	while (len > 0) {
-		current = (size_t)((u_long)rstrm->out_boundry -
-		    (u_long)rstrm->out_finger);
-		current = (len < current) ? len : current;
-		memmove(rstrm->out_finger, addr, current);
-		rstrm->out_finger += current;
-		addr += current;
-		_DIAGASSERT(__type_fit(u_int, current));
-		len -= (u_int)current;
-		if (rstrm->out_finger == rstrm->out_boundry) {
-			rstrm->frag_sent = TRUE;
-			if (! flush_out(rstrm, FALSE))
-				return (FALSE);
-		}
-	}
-	return (TRUE);
-}
-
-static u_int
-xdrrec_getpos(XDR *xdrs)
-{
-	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-	off_t pos;
-
-	pos = lseek((int)(u_long)rstrm->tcp_handle, (off_t)0, 1);
-	if (pos != -1)
-		switch (xdrs->x_op) {
-
-		case XDR_ENCODE:
-			pos += rstrm->out_finger - rstrm->out_base;
-			break;
-
-		case XDR_DECODE:
-			pos -= rstrm->in_boundry - rstrm->in_finger;
-			break;
-
-		default:
-			pos = (off_t) -1;
-			break;
-		}
-	return ((u_int) pos);
-}
-
-static bool_t
-xdrrec_setpos(XDR *xdrs, u_int pos)
-{
-	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-	u_int currpos = xdrrec_getpos(xdrs);
-	int delta = currpos - pos;
-	char *newpos;
-
-	if ((int)currpos != -1)
-		switch (xdrs->x_op) {
-
-		case XDR_ENCODE:
-			newpos = rstrm->out_finger - delta;
-			if ((newpos > (char *)(void *)(rstrm->frag_header)) &&
-				(newpos < rstrm->out_boundry)) {
-				rstrm->out_finger = newpos;
-				return (TRUE);
-			}
-			break;
-
-		case XDR_DECODE:
-			newpos = rstrm->in_finger - delta;
-			if ((delta < (int)(rstrm->fbtbc)) &&
-				(newpos <= rstrm->in_boundry) &&
-				(newpos >= rstrm->in_base)) {
-				rstrm->in_finger = newpos;
-				rstrm->fbtbc -= delta;
-				return (TRUE);
-			}
-			break;
-
-		case XDR_FREE:
-			break;
-		}
-	return (FALSE);
-}
-
-static int32_t *
-xdrrec_inline(XDR *xdrs, u_int len)
-{
-	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-	int32_t *buf = NULL;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		if ((rstrm->out_finger + len) <= rstrm->out_boundry) {
-			buf = (int32_t *)(void *)rstrm->out_finger;
-			rstrm->out_finger += len;
-		}
-		break;
-
-	case XDR_DECODE:
-		if ((len <= (u_int)rstrm->fbtbc) &&
-			((rstrm->in_finger + len) <= rstrm->in_boundry)) {
-			buf = (int32_t *)(void *)rstrm->in_finger;
-			rstrm->fbtbc -= len;
-			rstrm->in_finger += len;
-		}
-		break;
-
-	case XDR_FREE:
-		break;
-	}
-	return (buf);
-}
-
-static void
-xdrrec_destroy(XDR *xdrs)
-{
-	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-
-	mem_free(rstrm->out_base, rstrm->sendsize);
-	mem_free(rstrm->in_base, rstrm->recvsize);
-	mem_free(rstrm, sizeof(RECSTREAM));
-}
-
-
-/*
- * Exported routines to manage xdr records
- */
-
-/*
- * Before reading (deserializing from the stream, one should always call
- * this procedure to guarantee proper record alignment.
- */
-bool_t
-xdrrec_skiprecord(XDR *xdrs)
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	enum xprt_stat xstat;
-
-	if (rstrm->nonblock) {
-		if (__xdrrec_getrec(xdrs, &xstat, FALSE)) {
-			rstrm->fbtbc = 0;
-			return TRUE;
-		}
-		if (rstrm->in_finger == rstrm->in_boundry &&
-		    xstat == XPRT_MOREREQS) {
-			rstrm->fbtbc = 0;
-			return TRUE;
-		}
-		return FALSE;
-	}
-	while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
-		if (! skip_input_bytes(rstrm, rstrm->fbtbc))
-			return (FALSE);
-		rstrm->fbtbc = 0;
-		if ((! rstrm->last_frag) && (! set_input_fragment(rstrm)))
-			return (FALSE);
-	}
-	rstrm->last_frag = FALSE;
-	return (TRUE);
-}
-
-/*
- * Look ahead fuction.
- * Returns TRUE iff there is no more input in the buffer 
- * after consuming the rest of the current record.
- */
-bool_t
-xdrrec_eof(XDR *xdrs)
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-
-	while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
-		if (!skip_input_bytes(rstrm, rstrm->fbtbc))
-			return (TRUE);
-		rstrm->fbtbc = 0;
-		if ((!rstrm->last_frag) && (!set_input_fragment(rstrm)))
-			return (TRUE);
-	}
-	if (rstrm->in_finger == rstrm->in_boundry)
-		return (TRUE);
-	return (FALSE);
-}
-
-/*
- * The client must tell the package when an end-of-record has occurred.
- * The second paraemters tells whether the record should be flushed to the
- * (output) tcp stream.  (This let's the package support batched or
- * pipelined procedure calls.)  TRUE => immmediate flush to tcp connection.
- */
-bool_t
-xdrrec_endofrecord(XDR *xdrs, int sendnow)
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	u_long len;  /* fragment length */
-
-	if (sendnow || rstrm->frag_sent ||
-		((u_long)rstrm->out_finger + sizeof(uint32_t) >=
-		(u_long)rstrm->out_boundry)) {
-		rstrm->frag_sent = FALSE;
-		return (flush_out(rstrm, TRUE));
-	}
-	len = (u_long)(rstrm->out_finger) - (u_long)(rstrm->frag_header) -
-	   sizeof(uint32_t);
-	*(rstrm->frag_header) = htonl((uint32_t)len | LAST_FRAG);
-	rstrm->frag_header = (uint32_t *)(void *)rstrm->out_finger;
-	rstrm->out_finger += sizeof(uint32_t);
-	return (TRUE);
-}
-
-/*
- * Fill the stream buffer with a record for a non-blocking connection.
- * Return true if a record is available in the buffer, false if not.
- */
-bool_t
-__xdrrec_getrec(XDR *xdrs, enum xprt_stat *statp, bool_t expectdata)
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	ssize_t n;
-	int fraglen;
-
-	if (!rstrm->in_haveheader) {
-		n = rstrm->readit(rstrm->tcp_handle, rstrm->in_hdrp,
-		    (int)sizeof (rstrm->in_header) - rstrm->in_hdrlen);
-		if (n == 0) {
-			*statp = expectdata ? XPRT_DIED : XPRT_IDLE;
-			return FALSE;
-		}
-		if (n < 0) {
-			*statp = XPRT_DIED;
-			return FALSE;
-		}
-		rstrm->in_hdrp += n;
-		_DIAGASSERT(__type_fit(int, n));
-		rstrm->in_hdrlen += (int)n;
-		if (rstrm->in_hdrlen < (int)sizeof(rstrm->in_header)) {
-			*statp = XPRT_MOREREQS;
-			return FALSE;
-		}
-		rstrm->in_header = ntohl(rstrm->in_header);
-		fraglen = (int)(rstrm->in_header & ~LAST_FRAG);
-		if (fraglen == 0 || fraglen > rstrm->in_maxrec ||
-		    (rstrm->in_reclen + fraglen) > rstrm->in_maxrec) {
-			*statp = XPRT_DIED;
-			return FALSE;
-		}
-		rstrm->in_reclen += fraglen;
-		if ((u_int)rstrm->in_reclen > rstrm->recvsize) {
-			if (!realloc_stream(rstrm, rstrm->in_reclen)) {
-				*statp = XPRT_DIED;
-				return FALSE;
-			}
-		}
-		if (rstrm->in_header & LAST_FRAG) {
-			rstrm->in_header &= ~LAST_FRAG;
-			rstrm->last_frag = TRUE;
-		}
-	}
-
-	n =  rstrm->readit(rstrm->tcp_handle,
-	    rstrm->in_base + rstrm->in_received,
-	    (rstrm->in_reclen - rstrm->in_received));
-
-	if (n < 0) {
-		*statp = XPRT_DIED;
-		return FALSE;
-	}
-
-	if (n == 0) {
-		*statp = expectdata ? XPRT_DIED : XPRT_IDLE;
-		return FALSE;
-	}
-
-	_DIAGASSERT(__type_fit(int, n));
-	rstrm->in_received += (int)n;
-
-	if (rstrm->in_received == rstrm->in_reclen) {
-		rstrm->in_haveheader = FALSE;
-		rstrm->in_hdrp = (char *)(void *)&rstrm->in_header;
-		rstrm->in_hdrlen = 0;
-		if (rstrm->last_frag) {
-			rstrm->fbtbc = rstrm->in_reclen;
-			rstrm->in_boundry = rstrm->in_base + rstrm->in_reclen;
-			rstrm->in_finger = rstrm->in_base;
-			rstrm->in_reclen = rstrm->in_received = 0;
-			*statp = XPRT_MOREREQS;
-			return TRUE;
-		}
-	}
-
-	*statp = XPRT_MOREREQS;
-	return FALSE;
-}
-
-bool_t
-__xdrrec_setnonblock(XDR *xdrs, int maxrec)
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-
-	rstrm->nonblock = TRUE;
-	if (maxrec == 0)
-		maxrec = rstrm->recvsize;
-	rstrm->in_maxrec = maxrec;
-	return TRUE;
-}
-
-
-/*
- * Internal useful routines
- */
-static bool_t
-flush_out(RECSTREAM *rstrm, bool_t eor)
-{
-	uint32_t eormask = (eor == TRUE) ? LAST_FRAG : 0;
-	uint32_t len = (uint32_t)((u_long)(rstrm->out_finger) - 
-		(u_long)(rstrm->frag_header) - sizeof(uint32_t));
-
-	*(rstrm->frag_header) = htonl(len | eormask);
-	len = (uint32_t)((u_long)(rstrm->out_finger) - 
-	    (u_long)(rstrm->out_base));
-	if ((*(rstrm->writeit))(rstrm->tcp_handle, rstrm->out_base, (int)len)
-		!= (int)len)
-		return (FALSE);
-	rstrm->frag_header = (uint32_t *)(void *)rstrm->out_base;
-	rstrm->out_finger = (char *)rstrm->out_base + sizeof(uint32_t);
-	return (TRUE);
-}
-
-static bool_t  /* knows nothing about records!  Only about input buffers */
-fill_input_buf(RECSTREAM *rstrm)
-{
-	char *where;
-	uint32_t i;
-	int len;
-
-	if (rstrm->nonblock)
-		return FALSE;
-	where = rstrm->in_base;
-	i = (uint32_t)((u_long)rstrm->in_boundry % BYTES_PER_XDR_UNIT);
-	where += i;
-	len = (uint32_t)(rstrm->in_size - i);
-	if ((len = (*(rstrm->readit))(rstrm->tcp_handle, where, len)) == -1)
-		return (FALSE);
-	rstrm->in_finger = where;
-	where += len;
-	rstrm->in_boundry = where;
-	return (TRUE);
-}
-
-static bool_t  /* knows nothing about records!  Only about input buffers */
-get_input_bytes(RECSTREAM *rstrm, char *addr, u_int len)
-{
-	u_int current;
-
-	if (rstrm->nonblock) {
-		if (len > ((uintptr_t)rstrm->in_boundry - (uintptr_t)rstrm->in_finger))
-			return FALSE;
-		memcpy(addr, rstrm->in_finger, len);
-		rstrm->in_finger += len;
-		return TRUE;
-	}
-
-	while (len > 0) {
-		uintptr_t d = ((uintptr_t)rstrm->in_boundry -
-		    (uintptr_t)rstrm->in_finger);
-		_DIAGASSERT(__type_fit(u_int, d));
-		current = (u_int)d;
-		if (current == 0) {
-			if (! fill_input_buf(rstrm))
-				return (FALSE);
-			continue;
-		}
-		current = (len < current) ? len : current;
-		memmove(addr, rstrm->in_finger, current);
-		rstrm->in_finger += current;
-		addr += current;
-		len -= current;
-	}
-	return (TRUE);
-}
-
-static bool_t  /* next two bytes of the input stream are treated as a header */
-set_input_fragment(RECSTREAM *rstrm)
-{
-	uint32_t header;
-
-	if (rstrm->nonblock)
-		return FALSE;
-	if (! get_input_bytes(rstrm, (char *)(void *)&header,
-	    (u_int)sizeof(header)))
-		return (FALSE);
-	header = ntohl(header);
-	rstrm->last_frag = ((header & LAST_FRAG) == 0) ? FALSE : TRUE;
-	/*
-	 * Sanity check. Try not to accept wildly incorrect
-	 * record sizes. Unfortunately, the only record size
-	 * we can positively identify as being 'wildly incorrect'
-	 * is zero. Ridiculously large record sizes may look wrong,
-	 * but we don't have any way to be certain that they aren't
-	 * what the client actually intended to send us.
-	 */
-	if (header == 0)
-		return(FALSE);
-	rstrm->fbtbc = header & (~LAST_FRAG);
-	return (TRUE);
-}
-
-static bool_t  /* consumes input bytes; knows nothing about records! */
-skip_input_bytes(RECSTREAM *rstrm, long cnt)
-{
-	uint32_t current;
-
-	while (cnt > 0) {
-		current = (uint32_t)((long)rstrm->in_boundry - 
-		    (long)rstrm->in_finger);
-		if (current == 0) {
-			if (! fill_input_buf(rstrm))
-				return (FALSE);
-			continue;
-		}
-		current = ((uint32_t)cnt < current) ? (uint32_t)cnt : current;
-		rstrm->in_finger += current;
-		cnt -= current;
-	}
-	return (TRUE);
-}
-
-static u_int
-fix_buf_size(u_int s)
-{
-
-	if (s < 100)
-		s = 4000;
-	return (RNDUP(s));
-}
-
-/*
- * Reallocate the input buffer for a non-block stream.
- */
-static bool_t
-realloc_stream(RECSTREAM *rstrm, int size)
-{
-	ptrdiff_t diff;
-	char *buf;
-
-	if ((u_int)size > rstrm->recvsize) {
-		buf = realloc(rstrm->in_base, (size_t)size);
-		if (buf == NULL)
-			return FALSE;
-		diff = buf - rstrm->in_base;
-		rstrm->in_finger += diff;
-		rstrm->in_base = buf;
-		rstrm->in_boundry = buf + size;
-		rstrm->recvsize = size;
-		rstrm->in_size = size;
-	}
-
-	return TRUE;
-}
diff --git a/lib/libc/rpc/xdr_reference.c b/lib/libc/rpc/xdr_reference.c
deleted file mode 100644
index a126d95fc..000000000
--- a/lib/libc/rpc/xdr_reference.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*	$NetBSD: xdr_reference.c,v 1.18 2013/03/11 20:19:30 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint) 
-#if 0
-static char *sccsid = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
-static char *sccsid = "@(#)xdr_reference.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: xdr_reference.c,v 1.18 2013/03/11 20:19:30 tron Exp $");
-#endif
-#endif
-
-/*
- * xdr_reference.c, Generic XDR routines implementation.
- *
- * Copyright (C) 1987, Sun Microsystems, Inc.
- *
- * These are the "non-trivial" xdr primitives used to serialize and de-serialize
- * "pointers".  See xdr.h for more info on the interface to xdr.
- */
-
-#include "namespace.h"
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-
-#ifdef __weak_alias
-__weak_alias(xdr_pointer,_xdr_pointer)
-__weak_alias(xdr_reference,_xdr_reference)
-#endif
-
-/*
- * XDR an indirect pointer
- * xdr_reference is for recursively translating a structure that is
- * referenced by a pointer inside the structure that is currently being
- * translated.  pp references a pointer to storage. If *pp is null
- * the  necessary storage is allocated.
- * size is the sizeof the referneced structure.
- * proc is the routine to handle the referenced structure.
- */
-bool_t
-xdr_reference(XDR *xdrs, caddr_t *pp, u_int size, xdrproc_t proc)
-{
-	caddr_t loc = *pp;
-	bool_t stat;
-
-	if (loc == NULL)
-		switch (xdrs->x_op) {
-		case XDR_FREE:
-			return (TRUE);
-
-		case XDR_DECODE:
-			*pp = loc = mem_alloc(size);
-			if (loc == NULL) {
-				warn("%s: out of memory", __func__);
-				return (FALSE);
-			}
-			memset(loc, 0, size);
-			break;
-
-		case XDR_ENCODE:
-			break;
-		}
-
-	stat = (*proc)(xdrs, loc);
-
-	if (xdrs->x_op == XDR_FREE) {
-		mem_free(loc, size);
-		*pp = NULL;
-	}
-	return (stat);
-}
-
-
-/*
- * xdr_pointer():
- *
- * XDR a pointer to a possibly recursive data structure. This
- * differs with xdr_reference in that it can serialize/deserialiaze
- * trees correctly.
- *
- *  What's sent is actually a union:
- *
- *  union object_pointer switch (boolean b) {
- *  case TRUE: object_data data;
- *  case FALSE: void nothing;
- *  }
- *
- * > objpp: Pointer to the pointer to the object.
- * > obj_size: size of the object.
- * > xdr_obj: routine to XDR an object.
- *
- */
-bool_t
-xdr_pointer(XDR *xdrs, char **objpp, u_int obj_size, xdrproc_t xdr_obj)
-{
-
-	bool_t more_data;
-
-	more_data = (*objpp != NULL);
-	if (! xdr_bool(xdrs,&more_data)) {
-		return (FALSE);
-	}
-	if (! more_data) {
-		*objpp = NULL;
-		return (TRUE);
-	}
-	return (xdr_reference(xdrs,objpp,obj_size,xdr_obj));
-}
diff --git a/lib/libc/rpc/xdr_sizeof.c b/lib/libc/rpc/xdr_sizeof.c
deleted file mode 100644
index 8b6e331e6..000000000
--- a/lib/libc/rpc/xdr_sizeof.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * xdr_sizeof.c
- *
- * Copyright 1990 Sun Microsystems, Inc.
- *
- * General purpose routine to see how much space something will use
- * when serialized using XDR.
- */
-
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_sizeof.c,v 1.5.38.1 2010/12/21 17:10:29 kensmith Exp $");
-#else
-__RCSID("$NetBSD: xdr_sizeof.c,v 1.5 2013/03/11 20:19:30 tron Exp $");
-#endif
-
-#include "namespace.h"
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <sys/types.h>
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(xdr_sizeof,_xdr_sizeof)
-#endif 
-
-static bool_t x_putlong(XDR *, const long *);
-static bool_t x_putbytes(XDR *, const char *, u_int);
-static u_int x_getpostn(XDR *);
-static bool_t x_setpostn(XDR *, u_int);
-static int32_t *x_inline(XDR *, u_int);
-static int harmless(void);
-static void x_destroy(XDR *);
-
-/* ARGSUSED */
-static bool_t
-x_putlong(XDR *xdrs, const long *longp)
-{
-	xdrs->x_handy += BYTES_PER_XDR_UNIT;
-	return (TRUE);
-}
-
-/* ARGSUSED */
-static bool_t
-x_putbytes(XDR *xdrs, const char *bp, u_int len)
-{
-	xdrs->x_handy += len;
-	return (TRUE);
-}
-
-static u_int
-x_getpostn(XDR *xdrs)
-{
-	return (xdrs->x_handy);
-}
-
-/* ARGSUSED */
-static bool_t
-x_setpostn(XDR *xdrs, u_int pos)
-{
-	/* This is not allowed */
-	return (FALSE);
-}
-
-static int32_t *
-x_inline(XDR *xdrs, u_int len)
-{
-	if (len == 0) {
-		return (NULL);
-	}
-	if (xdrs->x_op != XDR_ENCODE) {
-		return (NULL);
-	}
-	if (len < (u_int)(uintptr_t)xdrs->x_base) {
-		/* x_private was already allocated */
-		xdrs->x_handy += len;
-		return ((int32_t *) xdrs->x_private);
-	} else {
-		/* Free the earlier space and allocate new area */
-		if (xdrs->x_private)
-			free(xdrs->x_private);
-		if ((xdrs->x_private = malloc(len)) == NULL) {
-			xdrs->x_base = 0;
-			return (NULL);
-		}
-		xdrs->x_base = (caddr_t)(uintptr_t)len;
-		xdrs->x_handy += len;
-		return ((int32_t *) xdrs->x_private);
-	}
-}
-
-static int
-harmless(void)
-{
-	/* Always return FALSE/NULL, as the case may be */
-	return (0);
-}
-
-static void
-x_destroy(XDR *xdrs)
-{
-	xdrs->x_handy = 0;
-	xdrs->x_base = 0;
-	if (xdrs->x_private) {
-		free(xdrs->x_private);
-		xdrs->x_private = NULL;
-	}
-	return;
-}
-
-unsigned long
-xdr_sizeof(xdrproc_t func, void *data)
-{
-	XDR x;
-	struct xdr_ops ops;
-	bool_t stat;
-	/* to stop ANSI-C compiler from complaining */
-	typedef  bool_t (* dummyfunc1)(XDR *, long *);
-	typedef  bool_t (* dummyfunc2)(XDR *, caddr_t, u_int);
-
-	ops.x_putlong = x_putlong;
-	ops.x_putbytes = x_putbytes;
-	ops.x_inline = x_inline;
-	ops.x_getpostn = x_getpostn;
-	ops.x_setpostn = x_setpostn;
-	ops.x_destroy = x_destroy;
-
-	/* the other harmless ones */
-	ops.x_getlong =  (dummyfunc1) harmless;
-	ops.x_getbytes = (dummyfunc2) harmless;
-
-	x.x_op = XDR_ENCODE;
-	x.x_ops = &ops;
-	x.x_handy = 0;
-	x.x_private = (caddr_t) NULL;
-	x.x_base = (caddr_t) 0;
-
-	stat = func(&x, data);
-	if (x.x_private)
-		free(x.x_private);
-	return (stat == TRUE ? (unsigned) x.x_handy: 0);
-}
diff --git a/lib/libc/rpc/xdr_stdio.c b/lib/libc/rpc/xdr_stdio.c
deleted file mode 100644
index 540532765..000000000
--- a/lib/libc/rpc/xdr_stdio.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*	$NetBSD: xdr_stdio.c,v 1.19 2013/03/11 20:19:30 tron Exp $	*/
-
-/*
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *     * Neither the name of the "Oracle America, Inc." nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)xdr_stdio.c 1.16 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_stdio.c	2.1 88/07/29 4.0 RPCSRC";
-#else
-__RCSID("$NetBSD: xdr_stdio.c,v 1.19 2013/03/11 20:19:30 tron Exp $");
-#endif
-#endif
-
-/*
- * xdr_stdio.c, XDR implementation on standard i/o file.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * This set of routines implements a XDR on a stdio stream.
- * XDR_ENCODE serializes onto the stream, XDR_DECODE de-serializes
- * from the stream.
- */
-
-#include "namespace.h"
-
-#include <stdio.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-
-#ifdef __weak_alias
-__weak_alias(xdrstdio_create,_xdrstdio_create)
-#endif
-
-static void xdrstdio_destroy(XDR *);
-static bool_t xdrstdio_getlong(XDR *, long *);
-static bool_t xdrstdio_putlong(XDR *, const long *);
-static bool_t xdrstdio_getbytes(XDR *, char *, u_int);
-static bool_t xdrstdio_putbytes(XDR *, const char *, u_int);
-static u_int xdrstdio_getpos(XDR *);
-static bool_t xdrstdio_setpos(XDR *, u_int);
-static int32_t *xdrstdio_inline(XDR *, u_int);
-
-/*
- * Ops vector for stdio type XDR
- */
-static const struct xdr_ops	xdrstdio_ops = {
-	xdrstdio_getlong,	/* deseraialize a long int */
-	xdrstdio_putlong,	/* seraialize a long int */
-	xdrstdio_getbytes,	/* deserialize counted bytes */
-	xdrstdio_putbytes,	/* serialize counted bytes */
-	xdrstdio_getpos,	/* get offset in the stream */
-	xdrstdio_setpos,	/* set offset in the stream */
-	xdrstdio_inline,	/* prime stream for inline macros */
-	xdrstdio_destroy,	/* destroy stream */
-	NULL,			/* xdrstdio_control */
-};
-
-/*
- * Initialize a stdio xdr stream.
- * Sets the xdr stream handle xdrs for use on the stream file.
- * Operation flag is set to op.
- */
-void
-xdrstdio_create(XDR *xdrs, FILE *file, enum xdr_op op)
-{
-
-	xdrs->x_op = op;
-	xdrs->x_ops = &xdrstdio_ops;
-	xdrs->x_private = file;
-	xdrs->x_handy = 0;
-	xdrs->x_base = 0;
-}
-
-/*
- * Destroy a stdio xdr stream.
- * Cleans up the xdr stream handle xdrs previously set up by xdrstdio_create.
- */
-static void
-xdrstdio_destroy(XDR *xdrs)
-{
-	(void)fflush((FILE *)xdrs->x_private);
-		/* XXX: should we close the file ?? */
-}
-
-static bool_t
-xdrstdio_getlong(XDR *xdrs, long *lp)
-{
-	u_int32_t temp;
-
-	if (fread(&temp, sizeof(int32_t), 1, (FILE *)xdrs->x_private) != 1)
-		return (FALSE);
-	*lp = (long)ntohl(temp);
-	return (TRUE);
-}
-
-static bool_t
-xdrstdio_putlong(XDR *xdrs, const long *lp)
-{
-	int32_t mycopy = htonl((u_int32_t)*lp);
-
-	if (fwrite(&mycopy, sizeof(int32_t), 1, (FILE *)xdrs->x_private) != 1)
-		return (FALSE);
-	return (TRUE);
-}
-
-static bool_t
-xdrstdio_getbytes(XDR *xdrs, char *addr, u_int len)
-{
-
-	if ((len != 0) && (fread(addr, (size_t)len, 1, (FILE *)xdrs->x_private) != 1))
-		return (FALSE);
-	return (TRUE);
-}
-
-static bool_t
-xdrstdio_putbytes(XDR *xdrs, const char *addr, u_int len)
-{
-
-	if ((len != 0) && (fwrite(addr, (size_t)len, 1,
-	    (FILE *)xdrs->x_private) != 1))
-		return (FALSE);
-	return (TRUE);
-}
-
-static u_int
-xdrstdio_getpos(XDR *xdrs)
-{
-
-	return ((u_int) ftell((FILE *)xdrs->x_private));
-}
-
-static bool_t
-xdrstdio_setpos(XDR *xdrs, u_int pos)
-{ 
-
-	return ((fseek((FILE *)xdrs->x_private, (long)pos, 0) < 0) ?
-		FALSE : TRUE);
-}
-
-/* ARGSUSED */
-static int32_t *
-xdrstdio_inline(XDR *xdrs, u_int len)
-{
-
-	/*
-	 * Must do some work to implement this: must insure
-	 * enough data in the underlying stdio buffer,
-	 * that the buffer is aligned so that we can indirect through a
-	 * long *, and stuff this pointer in xdrs->x_buf.  Doing
-	 * a fread or fwrite to a scratch buffer would defeat
-	 * most of the gains to be had here and require storage
-	 * management on this buffer, so we don't do this.
-	 */
-	return (NULL);
-}
diff --git a/lib/libc/shlib_version b/lib/libc/shlib_version
deleted file mode 100644
index d54a29fff..000000000
--- a/lib/libc/shlib_version
+++ /dev/null
@@ -1,45 +0,0 @@
-#	$NetBSD: shlib_version,v 1.258 2015/01/16 18:45:01 christos Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-# things we wish to do on next major version bump:
-# - remove code under BUILD_LEGACY
-# - remove BCS code in citrus and replace it with use of the C locale
-# - libc/net/rcmd.c: make __ivaliduser() and __ivaliduser_sa() static
-# - libc/net: resolver update to BIND8/9?
-# - md2, md4, md5, rmd160 & sha1 functions should take the same arguments AFAP
-# - Crypto hashes have name overlap with libcrypto, rename them
-# - libc/gen/assert.c: __{diag,}assert13() -> __{diag,}assert()
-# - lib/libc/net/iso_addr.c: remove
-# - libc/gen/times.c: remove; __times13() -> times()
-# - libc/gen/timezone.c: remove; __timezone13 -> timezone
-# - libc/net/getaddrinfo.c, netdb.h: remove __ai_pad0
-# - libc/gen/utmpx.c, utmpx.h: remove lastlogxname, __getlastlogx13 -> getlastlogx
-# - libc/gen/utmpx.c, utmpx.h: add expansion space to struct lastlogx
-# - infinity{,f,l}.c, math.h: __infinity -> __huge_val
-# - libc/gen/is{inf,nan}d_ieee754.c: remove is{inf,nan} aliases
-# - libc/arch/vax/gen/is{inf,nan}.c: remove
-# - libc/db/hash/ndbm.c: remove; __ndbm13 -> ndbm
-# - libc/net/getnet{ent,namadr}.c, netdb.h: remove __n_pad0
-# - libc/stdio: make _file an int, hide struct FILE, stdin, stdout, stderr impls
-# - libc/stdio: make fileno() not a macro
-# - libc/stdio: make stdio macro users depend on some library symbol
-# - remove frexp, ldexp, modf: they belong to libm.
-# - make sure we can support thread local [on arm don't use r9 for example,
-#   consider other risc architectures: mips, powerpc, sparc, etc]
-# - rename __libc_mutex_lock and similar back to pthread_mutex_lock.
-#   the functions are used by third party code without prototypes.
-#   for example in assembler code.
-# - kill sigcontext: never request version 0 or 1 signal trampoline.
-#   always request version 2 trampoline. (on vax, 3).
-# - remove gets(); it is finally dead in c11.
-#   (note: maybe it still needs to be kept in a compat lib; but not in libc)
-# - make __cerror (spelled CERROR) hidden again
-# - remove ruserok() and friends to libcompat (or entirely)
-# - remove alloca fallback and expect compiler to provide a builtin version.
-# - switch to DT_INIT_ARRAY on all platforms
-# - consolidate ownership with crt0.o and avoid common symbols
-# - redo stdin/stdout/stderr to not require copy relocations
-# - move gethostbyname to a compat library
-# - remove arc4random(3) API
-major=12
-minor=197
diff --git a/lib/libc/softfloat/Makefile.inc b/lib/libc/softfloat/Makefile.inc
deleted file mode 100644
index 4a041cda3..000000000
--- a/lib/libc/softfloat/Makefile.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.20 2015/04/08 13:16:37 martin Exp $
-
-SOFTFLOAT_BITS?=64
-.if defined(__MINIX)
-.PATH:		${ARCHDIR}/softfloat \
-		${LIBCDIR}/softfloat/bits${SOFTFLOAT_BITS} ${LIBCDIR}/softfloat
-.else
-.PATH:		${ARCHDIR}/softfloat \
-		${.CURDIR}/softfloat/bits${SOFTFLOAT_BITS} ${.CURDIR}/softfloat
-.endif # defined(__MINIX)
-
-.if defined(__MINIX)
-CPPFLAGS+=	-I${ARCHDIR}/softfloat -I${LIBCDIR}/softfloat
-.else
-CPPFLAGS+=	-I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat
-.endif # defined(__MINIX)
-CPPFLAGS+=	-DSOFTFLOAT_FOR_GCC
-
-SRCS.softfloat= softfloat.c
-
-SRCS.softfloat+=fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c \
-		fpgetsticky.c fpsetsticky.c
-
-.if !empty(LIBC_MACHINE_ARCH:Mearm*)
-SRCS.softfloat+=__aeabi_dcmpeq.c __aeabi_fcmpeq.c
-SRCS.softfloat+=__aeabi_dcmpge.c __aeabi_fcmpge.c
-SRCS.softfloat+=__aeabi_dcmpgt.c __aeabi_fcmpgt.c
-SRCS.softfloat+=__aeabi_dcmple.c __aeabi_fcmple.c
-SRCS.softfloat+=__aeabi_dcmplt.c __aeabi_fcmplt.c
-SRCS.softfloat+=__aeabi_dcmpun.c __aeabi_fcmpun.c
-.else
-SRCS.softfloat+=eqsf2.c nesf2.c gtsf2.c gesf2.c ltsf2.c lesf2.c negsf2.c \
-		eqdf2.c nedf2.c gtdf2.c gedf2.c ltdf2.c ledf2.c negdf2.c \
-		eqtf2.c netf2.c gttf2.c getf2.c lttf2.c letf2.c negtf2.c \
-		nexf2.c gtxf2.c gexf2.c negxf2.c \
-		unordsf2.c unorddf2.c unordtf2.c
-.endif
-
-SRCS+=		${SRCS.softfloat}
-
-# XXX
-.if defined(HAVE_GCC)
-. if (${LIBC_MACHINE_CPU} == "arm") && (${HAVE_GCC} == "45")
-# See doc/HACKS for more information.
-COPTS.softfloat.c+=	-Wno-enum-compare
-COPTS.softfloat.c+=	${${ACTIVE_CXX} == "gcc":? -fno-tree-vrp :}
-.elif (${LIBC_MACHINE_CPU} == "mips" || \
-     ${LIBC_MACHINE_CPU} == "sh3")
-COPTS.softfloat.c+=	-Wno-enum-compare
-. endif
-.endif
diff --git a/lib/libc/softfloat/bits32/softfloat-macros b/lib/libc/softfloat/bits32/softfloat-macros
deleted file mode 100644
index 59e6e76fe..000000000
--- a/lib/libc/softfloat/bits32/softfloat-macros
+++ /dev/null
@@ -1,648 +0,0 @@
-
-/*
-===============================================================================
-
-This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Shifts `a' right by the number of bits given in `count'.  If any nonzero
-bits are shifted off, they are ``jammed'' into the least significant bit of
-the result by setting the least significant bit to 1.  The value of `count'
-can be arbitrarily large; in particular, if `count' is greater than 32, the
-result will be either 0 or 1, depending on whether `a' is zero or nonzero.
-The result is stored in the location pointed to by `zPtr'.
--------------------------------------------------------------------------------
-*/
-INLINE void shift32RightJamming( bits32 a, int16 count, bits32 *zPtr )
-{
-    bits32 z;
-
-    if ( count == 0 ) {
-        z = a;
-    }
-    else if ( count < 32 ) {
-        z = ( a>>count ) | ( ( a<<( ( - count ) & 31 ) ) != 0 );
-    }
-    else {
-        z = ( a != 0 );
-    }
-    *zPtr = z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 64-bit value formed by concatenating `a0' and `a1' right by the
-number of bits given in `count'.  Any bits shifted off are lost.  The value
-of `count' can be arbitrarily large; in particular, if `count' is greater
-than 64, the result will be 0.  The result is broken into two 32-bit pieces
-which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift64Right(
-     bits32 a0, bits32 a1, int16 count, bits32 *z0Ptr, bits32 *z1Ptr )
-{
-    bits32 z0, z1;
-    int8 negCount = ( - count ) & 31;
-
-    if ( count == 0 ) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if ( count < 32 ) {
-        z1 = ( a0<<negCount ) | ( a1>>count );
-        z0 = a0>>count;
-    }
-    else {
-        z1 = ( count < 64 ) ? ( a0>>( count & 31 ) ) : 0;
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 64-bit value formed by concatenating `a0' and `a1' right by the
-number of bits given in `count'.  If any nonzero bits are shifted off, they
-are ``jammed'' into the least significant bit of the result by setting the
-least significant bit to 1.  The value of `count' can be arbitrarily large;
-in particular, if `count' is greater than 64, the result will be either 0
-or 1, depending on whether the concatenation of `a0' and `a1' is zero or
-nonzero.  The result is broken into two 32-bit pieces which are stored at
-the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift64RightJamming(
-     bits32 a0, bits32 a1, int16 count, bits32 *z0Ptr, bits32 *z1Ptr )
-{
-    bits32 z0, z1;
-    int8 negCount = ( - count ) & 31;
-
-    if ( count == 0 ) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if ( count < 32 ) {
-        z1 = ( a0<<negCount ) | ( a1>>count ) | ( ( a1<<negCount ) != 0 );
-        z0 = a0>>count;
-    }
-    else {
-        if ( count == 32 ) {
-            z1 = a0 | ( a1 != 0 );
-        }
-        else if ( count < 64 ) {
-            z1 = ( a0>>( count & 31 ) ) | ( ( ( a0<<negCount ) | a1 ) != 0 );
-        }
-        else {
-            z1 = ( ( a0 | a1 ) != 0 );
-        }
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 96-bit value formed by concatenating `a0', `a1', and `a2' right
-by 32 _plus_ the number of bits given in `count'.  The shifted result is
-at most 64 nonzero bits; these are broken into two 32-bit pieces which are
-stored at the locations pointed to by `z0Ptr' and `z1Ptr'.  The bits shifted
-off form a third 32-bit result as follows:  The _last_ bit shifted off is
-the most-significant bit of the extra result, and the other 31 bits of the
-extra result are all zero if and only if _all_but_the_last_ bits shifted off
-were all zero.  This extra result is stored in the location pointed to by
-`z2Ptr'.  The value of `count' can be arbitrarily large.
-    (This routine makes more sense if `a0', `a1', and `a2' are considered
-to form a fixed-point value with binary point between `a1' and `a2'.  This
-fixed-point value is shifted right by the number of bits given in `count',
-and the integer part of the result is returned at the locations pointed to
-by `z0Ptr' and `z1Ptr'.  The fractional part of the result may be slightly
-corrupted as described above, and is returned at the location pointed to by
-`z2Ptr'.)
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift64ExtraRightJamming(
-     bits32 a0,
-     bits32 a1,
-     bits32 a2,
-     int16 count,
-     bits32 *z0Ptr,
-     bits32 *z1Ptr,
-     bits32 *z2Ptr
- )
-{
-    bits32 z0, z1, z2;
-    int8 negCount = ( - count ) & 31;
-
-    if ( count == 0 ) {
-        z2 = a2;
-        z1 = a1;
-        z0 = a0;
-    }
-    else {
-        if ( count < 32 ) {
-            z2 = a1<<negCount;
-            z1 = ( a0<<negCount ) | ( a1>>count );
-            z0 = a0>>count;
-        }
-        else {
-            if ( count == 32 ) {
-                z2 = a1;
-                z1 = a0;
-            }
-            else {
-                a2 |= a1;
-                if ( count < 64 ) {
-                    z2 = a0<<negCount;
-                    z1 = a0>>( count & 31 );
-                }
-                else {
-                    z2 = ( count == 64 ) ? a0 : ( a0 != 0 );
-                    z1 = 0;
-                }
-            }
-            z0 = 0;
-        }
-        z2 |= ( a2 != 0 );
-    }
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 64-bit value formed by concatenating `a0' and `a1' left by the
-number of bits given in `count'.  Any bits shifted off are lost.  The value
-of `count' must be less than 32.  The result is broken into two 32-bit
-pieces which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shortShift64Left(
-     bits32 a0, bits32 a1, int16 count, bits32 *z0Ptr, bits32 *z1Ptr )
-{
-
-    *z1Ptr = a1<<count;
-    *z0Ptr =
-        ( count == 0 ) ? a0 : ( a0<<count ) | ( a1>>( ( - count ) & 31 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 96-bit value formed by concatenating `a0', `a1', and `a2' left
-by the number of bits given in `count'.  Any bits shifted off are lost.
-The value of `count' must be less than 32.  The result is broken into three
-32-bit pieces which are stored at the locations pointed to by `z0Ptr',
-`z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shortShift96Left(
-     bits32 a0,
-     bits32 a1,
-     bits32 a2,
-     int16 count,
-     bits32 *z0Ptr,
-     bits32 *z1Ptr,
-     bits32 *z2Ptr
- )
-{
-    bits32 z0, z1, z2;
-    int8 negCount;
-
-    z2 = a2<<count;
-    z1 = a1<<count;
-    z0 = a0<<count;
-    if ( 0 < count ) {
-        negCount = ( ( - count ) & 31 );
-        z1 |= a2>>negCount;
-        z0 |= a1>>negCount;
-    }
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Adds the 64-bit value formed by concatenating `a0' and `a1' to the 64-bit
-value formed by concatenating `b0' and `b1'.  Addition is modulo 2^64, so
-any carry out is lost.  The result is broken into two 32-bit pieces which
-are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- add64(
-     bits32 a0, bits32 a1, bits32 b0, bits32 b1, bits32 *z0Ptr, bits32 *z1Ptr )
-{
-    bits32 z1;
-
-    z1 = a1 + b1;
-    *z1Ptr = z1;
-    *z0Ptr = a0 + b0 + ( z1 < a1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Adds the 96-bit value formed by concatenating `a0', `a1', and `a2' to the
-96-bit value formed by concatenating `b0', `b1', and `b2'.  Addition is
-modulo 2^96, so any carry out is lost.  The result is broken into three
-32-bit pieces which are stored at the locations pointed to by `z0Ptr',
-`z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- add96(
-     bits32 a0,
-     bits32 a1,
-     bits32 a2,
-     bits32 b0,
-     bits32 b1,
-     bits32 b2,
-     bits32 *z0Ptr,
-     bits32 *z1Ptr,
-     bits32 *z2Ptr
- )
-{
-    bits32 z0, z1, z2;
-    int8 carry0, carry1;
-
-    z2 = a2 + b2;
-    carry1 = ( z2 < a2 );
-    z1 = a1 + b1;
-    carry0 = ( z1 < a1 );
-    z0 = a0 + b0;
-    z1 += carry1;
-    z0 += ( z1 < (bits32)carry1 );
-    z0 += carry0;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Subtracts the 64-bit value formed by concatenating `b0' and `b1' from the
-64-bit value formed by concatenating `a0' and `a1'.  Subtraction is modulo
-2^64, so any borrow out (carry out) is lost.  The result is broken into two
-32-bit pieces which are stored at the locations pointed to by `z0Ptr' and
-`z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- sub64(
-     bits32 a0, bits32 a1, bits32 b0, bits32 b1, bits32 *z0Ptr, bits32 *z1Ptr )
-{
-
-    *z1Ptr = a1 - b1;
-    *z0Ptr = a0 - b0 - ( a1 < b1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Subtracts the 96-bit value formed by concatenating `b0', `b1', and `b2' from
-the 96-bit value formed by concatenating `a0', `a1', and `a2'.  Subtraction
-is modulo 2^96, so any borrow out (carry out) is lost.  The result is broken
-into three 32-bit pieces which are stored at the locations pointed to by
-`z0Ptr', `z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- sub96(
-     bits32 a0,
-     bits32 a1,
-     bits32 a2,
-     bits32 b0,
-     bits32 b1,
-     bits32 b2,
-     bits32 *z0Ptr,
-     bits32 *z1Ptr,
-     bits32 *z2Ptr
- )
-{
-    bits32 z0, z1, z2;
-    int8 borrow0, borrow1;
-
-    z2 = a2 - b2;
-    borrow1 = ( a2 < b2 );
-    z1 = a1 - b1;
-    borrow0 = ( a1 < b1 );
-    z0 = a0 - b0;
-    z0 -= ( z1 < (bits32)borrow1 );
-    z1 -= borrow1;
-    z0 -= borrow0;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies `a' by `b' to obtain a 64-bit product.  The product is broken
-into two 32-bit pieces which are stored at the locations pointed to by
-`z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void mul32To64( bits32 a, bits32 b, bits32 *z0Ptr, bits32 *z1Ptr )
-{
-    bits16 aHigh, aLow, bHigh, bLow;
-    bits32 z0, zMiddleA, zMiddleB, z1;
-
-    aLow = a;
-    aHigh = a>>16;
-    bLow = b;
-    bHigh = b>>16;
-    z1 = ( (bits32) aLow ) * bLow;
-    zMiddleA = ( (bits32) aLow ) * bHigh;
-    zMiddleB = ( (bits32) aHigh ) * bLow;
-    z0 = ( (bits32) aHigh ) * bHigh;
-    zMiddleA += zMiddleB;
-    z0 += ( ( (bits32) ( zMiddleA < zMiddleB ) )<<16 ) + ( zMiddleA>>16 );
-    zMiddleA <<= 16;
-    z1 += zMiddleA;
-    z0 += ( z1 < zMiddleA );
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies the 64-bit value formed by concatenating `a0' and `a1' by `b'
-to obtain a 96-bit product.  The product is broken into three 32-bit pieces
-which are stored at the locations pointed to by `z0Ptr', `z1Ptr', and
-`z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- mul64By32To96(
-     bits32 a0,
-     bits32 a1,
-     bits32 b,
-     bits32 *z0Ptr,
-     bits32 *z1Ptr,
-     bits32 *z2Ptr
- )
-{
-    bits32 z0, z1, z2, more1;
-
-    mul32To64( a1, b, &z1, &z2 );
-    mul32To64( a0, b, &z0, &more1 );
-    add64( z0, more1, 0, z1, &z0, &z1 );
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies the 64-bit value formed by concatenating `a0' and `a1' to the
-64-bit value formed by concatenating `b0' and `b1' to obtain a 128-bit
-product.  The product is broken into four 32-bit pieces which are stored at
-the locations pointed to by `z0Ptr', `z1Ptr', `z2Ptr', and `z3Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- mul64To128(
-     bits32 a0,
-     bits32 a1,
-     bits32 b0,
-     bits32 b1,
-     bits32 *z0Ptr,
-     bits32 *z1Ptr,
-     bits32 *z2Ptr,
-     bits32 *z3Ptr
- )
-{
-    bits32 z0, z1, z2, z3;
-    bits32 more1, more2;
-
-    mul32To64( a1, b1, &z2, &z3 );
-    mul32To64( a1, b0, &z1, &more2 );
-    add64( z1, more2, 0, z2, &z1, &z2 );
-    mul32To64( a0, b0, &z0, &more1 );
-    add64( z0, more1, 0, z1, &z0, &z1 );
-    mul32To64( a0, b1, &more1, &more2 );
-    add64( more1, more2, 0, z2, &more1, &z2 );
-    add64( z0, z1, 0, more1, &z0, &z1 );
-    *z3Ptr = z3;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns an approximation to the 32-bit integer quotient obtained by dividing
-`b' into the 64-bit value formed by concatenating `a0' and `a1'.  The
-divisor `b' must be at least 2^31.  If q is the exact quotient truncated
-toward zero, the approximation returned lies between q and q + 2 inclusive.
-If the exact quotient q is larger than 32 bits, the maximum positive 32-bit
-unsigned integer is returned.
--------------------------------------------------------------------------------
-*/
-static bits32 estimateDiv64To32( bits32 a0, bits32 a1, bits32 b )
-{
-    bits32 b0, b1;
-    bits32 rem0, rem1, term0, term1;
-    bits32 z;
-
-    if ( b <= a0 ) return 0xFFFFFFFF;
-    b0 = b>>16;
-    z = ( b0<<16 <= a0 ) ? 0xFFFF0000 : ( a0 / b0 )<<16;
-    mul32To64( b, z, &term0, &term1 );
-    sub64( a0, a1, term0, term1, &rem0, &rem1 );
-    while ( ( (sbits32) rem0 ) < 0 ) {
-        z -= 0x10000;
-        b1 = b<<16;
-        add64( rem0, rem1, b0, b1, &rem0, &rem1 );
-    }
-    rem0 = ( rem0<<16 ) | ( rem1>>16 );
-    z |= ( b0<<16 <= rem0 ) ? 0xFFFF : rem0 / b0;
-    return z;
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns an approximation to the square root of the 32-bit significand given
-by `a'.  Considered as an integer, `a' must be at least 2^31.  If bit 0 of
-`aExp' (the least significant bit) is 1, the integer returned approximates
-2^31*sqrt(`a'/2^31), where `a' is considered an integer.  If bit 0 of `aExp'
-is 0, the integer returned approximates 2^31*sqrt(`a'/2^30).  In either
-case, the approximation returned lies strictly within +/-2 of the exact
-value.
--------------------------------------------------------------------------------
-*/
-static bits32 estimateSqrt32( int16 aExp, bits32 a )
-{
-    static const bits16 sqrtOddAdjustments[] = {
-        0x0004, 0x0022, 0x005D, 0x00B1, 0x011D, 0x019F, 0x0236, 0x02E0,
-        0x039C, 0x0468, 0x0545, 0x0631, 0x072B, 0x0832, 0x0946, 0x0A67
-    };
-    static const bits16 sqrtEvenAdjustments[] = {
-        0x0A2D, 0x08AF, 0x075A, 0x0629, 0x051A, 0x0429, 0x0356, 0x029E,
-        0x0200, 0x0179, 0x0109, 0x00AF, 0x0068, 0x0034, 0x0012, 0x0002
-    };
-    int8 index;
-    bits32 z;
-
-    index = ( a>>27 ) & 15;
-    if ( aExp & 1 ) {
-        z = 0x4000 + ( a>>17 ) - sqrtOddAdjustments[ index ];
-        z = ( ( a / z )<<14 ) + ( z<<15 );
-        a >>= 1;
-    }
-    else {
-        z = 0x8000 + ( a>>17 ) - sqrtEvenAdjustments[ index ];
-        z = a / z + z;
-        z = ( 0x20000 <= z ) ? 0xFFFF8000 : ( z<<15 );
-        if ( z <= a ) return (bits32) ( ( (sbits32) a )>>1 );
-    }
-    return ( ( estimateDiv64To32( a, 0, z ) )>>1 ) + ( z>>1 );
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the number of leading 0 bits before the most-significant 1 bit of
-`a'.  If `a' is zero, 32 is returned.
--------------------------------------------------------------------------------
-*/
-static int8 countLeadingZeros32( bits32 a )
-{
-    static const int8 countLeadingZerosHigh[] = {
-        8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
-        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-        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,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    int8 shiftCount;
-
-    shiftCount = 0;
-    if ( a < 0x10000 ) {
-        shiftCount += 16;
-        a <<= 16;
-    }
-    if ( a < 0x1000000 ) {
-        shiftCount += 8;
-        a <<= 8;
-    }
-    shiftCount += countLeadingZerosHigh[ a>>24 ];
-    return shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 64-bit value formed by concatenating `a0' and `a1' is
-equal to the 64-bit value formed by concatenating `b0' and `b1'.  Otherwise,
-returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag eq64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
-{
-
-    return ( a0 == b0 ) && ( a1 == b1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 64-bit value formed by concatenating `a0' and `a1' is less
-than or equal to the 64-bit value formed by concatenating `b0' and `b1'.
-Otherwise, returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag le64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
-{
-
-    return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 <= b1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 64-bit value formed by concatenating `a0' and `a1' is less
-than the 64-bit value formed by concatenating `b0' and `b1'.  Otherwise,
-returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag lt64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
-{
-
-    return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 < b1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 64-bit value formed by concatenating `a0' and `a1' is not
-equal to the 64-bit value formed by concatenating `b0' and `b1'.  Otherwise,
-returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag ne64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
-{
-
-    return ( a0 != b0 ) || ( a1 != b1 );
-
-}
-
diff --git a/lib/libc/softfloat/bits32/softfloat.c b/lib/libc/softfloat/bits32/softfloat.c
deleted file mode 100644
index a3527e0d2..000000000
--- a/lib/libc/softfloat/bits32/softfloat.c
+++ /dev/null
@@ -1,2355 +0,0 @@
-/* $NetBSD: softfloat.c,v 1.3 2013/01/10 08:16:11 matt Exp $ */
-
-/*
- * This version hacked for use with gcc -msoft-float by bjh21.
- * (Mostly a case of #ifdefing out things GCC doesn't need or provides
- *  itself).
- */
-
-/*
- * Things you may want to define:
- *
- * SOFTFLOAT_FOR_GCC - build only those functions necessary for GCC (with
- *   -msoft-float) to work.  Include "softfloat-for-gcc.h" to get them
- *   properly renamed.
- */
-
-/*
- * This differs from the standard bits32/softfloat.c in that float64
- * is defined to be a 64-bit integer rather than a structure.  The
- * structure is float64s, with translation between the two going via
- * float64u.
- */
-
-/*
-===============================================================================
-
-This C source file is part of the SoftFloat IEC/IEEE Floating-Point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: softfloat.c,v 1.3 2013/01/10 08:16:11 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-
-#include "milieu.h"
-#include "softfloat.h"
-
-/*
- * Conversions between floats as stored in memory and floats as
- * SoftFloat uses them
- */
-#ifndef FLOAT64_DEMANGLE
-#define FLOAT64_DEMANGLE(a)	(a)
-#endif
-#ifndef FLOAT64_MANGLE
-#define FLOAT64_MANGLE(a)	(a)
-#endif
-
-/*
--------------------------------------------------------------------------------
-Floating-point rounding mode and exception flags.
--------------------------------------------------------------------------------
-*/
-#ifndef set_float_rounding_mode
-fp_rnd float_rounding_mode = float_round_nearest_even;
-fp_except float_exception_flags = 0;
-#endif
-#ifndef set_float_exception_inexact_flag
-#define set_float_exception_inexact_flag() \
-	((void)(float_exception_flags |= float_flag_inexact))
-#endif
-
-/*
--------------------------------------------------------------------------------
-Primitive arithmetic functions, including multi-word arithmetic, and
-division and square root approximations.  (Can be specialized to target if
-desired.)
--------------------------------------------------------------------------------
-*/
-#include "softfloat-macros"
-
-/*
--------------------------------------------------------------------------------
-Functions and definitions to determine:  (1) whether tininess for underflow
-is detected before or after rounding by default, (2) what (if anything)
-happens when exceptions are raised, (3) how signaling NaNs are distinguished
-from quiet NaNs, (4) the default generated quiet NaNs, and (4) how NaNs
-are propagated from function inputs to output.  These details are target-
-specific.
--------------------------------------------------------------------------------
-*/
-#include "softfloat-specialize"
-
-/*
--------------------------------------------------------------------------------
-Returns the fraction bits of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits32 extractFloat32Frac( float32 a )
-{
-
-    return a & 0x007FFFFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE int16 extractFloat32Exp( float32 a )
-{
-
-    return ( a>>23 ) & 0xFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloat32Sign( float32 a )
-{
-
-    return a>>31;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal single-precision floating-point value represented
-by the denormalized significand `aSig'.  The normalized exponent and
-significand are stored at the locations pointed to by `zExpPtr' and
-`zSigPtr', respectively.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloat32Subnormal( bits32 aSig, int16 *zExpPtr, bits32 *zSigPtr )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros32( aSig ) - 8;
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', exponent `zExp', and significand `zSig' into a
-single-precision floating-point value, returning the result.  After being
-shifted into the proper positions, the three fields are simply added
-together to form the result.  This means that any integer portion of `zSig'
-will be added into the exponent.  Since a properly normalized significand
-will have an integer portion equal to 1, the `zExp' input should be 1 less
-than the desired result exponent whenever `zSig' is a complete, normalized
-significand.
--------------------------------------------------------------------------------
-*/
-INLINE float32 packFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-
-    return ( ( (bits32) zSign )<<31 ) + ( ( (bits32) zExp )<<23 ) + zSig;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper single-precision floating-
-point value corresponding to the abstract input.  Ordinarily, the abstract
-value is simply rounded and packed into the single-precision format, with
-the inexact exception raised if the abstract input cannot be represented
-exactly.  However, if the abstract value is too large, the overflow and
-inexact exceptions are raised and an infinity or maximal finite value is
-returned.  If the abstract value is too small, the input value is rounded to
-a subnormal number, and the underflow and inexact exceptions are raised if
-the abstract input cannot be represented exactly as a subnormal single-
-precision floating-point number.
-    The input significand `zSig' has its binary point between bits 30
-and 29, which is 7 bits to the left of the usual location.  This shifted
-significand must be normalized or smaller.  If `zSig' is not normalized,
-`zExp' must be 0; in that case, the result returned is a subnormal number,
-and it must not require rounding.  In the usual case that `zSig' is
-normalized, `zExp' must be 1 less than the ``true'' floating-point exponent.
-The handling of underflow and overflow follows the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 roundAndPackFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-    int8 roundingMode;
-    flag roundNearestEven;
-    int8 roundIncrement, roundBits;
-    flag isTiny;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = roundingMode == float_round_nearest_even;
-    roundIncrement = 0x40;
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            roundIncrement = 0;
-        }
-        else {
-            roundIncrement = 0x7F;
-            if ( zSign ) {
-                if ( roundingMode == float_round_up ) roundIncrement = 0;
-            }
-            else {
-                if ( roundingMode == float_round_down ) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = zSig & 0x7F;
-    if ( 0xFD <= (bits16) zExp ) {
-        if (    ( 0xFD < zExp )
-             || (    ( zExp == 0xFD )
-                  && ( (sbits32) ( zSig + roundIncrement ) < 0 ) )
-           ) {
-            float_raise( float_flag_overflow | float_flag_inexact );
-            return packFloat32( zSign, 0xFF, 0 ) - ( roundIncrement == 0 );
-        }
-        if ( zExp < 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < -1 )
-                || ( zSig + roundIncrement < (uint32)0x80000000 );
-            shift32RightJamming( zSig, - zExp, &zSig );
-            zExp = 0;
-            roundBits = zSig & 0x7F;
-            if ( isTiny && roundBits ) float_raise( float_flag_underflow );
-        }
-    }
-    if ( roundBits ) set_float_exception_inexact_flag();
-    zSig = ( zSig + roundIncrement )>>7;
-    zSig &= ~ ( ( ( roundBits ^ 0x40 ) == 0 ) & roundNearestEven );
-    if ( zSig == 0 ) zExp = 0;
-    return packFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper single-precision floating-
-point value corresponding to the abstract input.  This routine is just like
-`roundAndPackFloat32' except that `zSig' does not have to be normalized.
-Bit 31 of `zSig' must be zero, and `zExp' must be 1 less than the ``true''
-floating-point exponent.
--------------------------------------------------------------------------------
-*/
-static float32
- normalizeRoundAndPackFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros32( zSig ) - 1;
-    return roundAndPackFloat32( zSign, zExp - shiftCount, zSig<<shiftCount );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the least-significant 32 fraction bits of the double-precision
-floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits32 extractFloat64Frac1( float64 a )
-{
-
-    return (bits32)(FLOAT64_DEMANGLE(a) & LIT64(0x00000000FFFFFFFF));
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the most-significant 20 fraction bits of the double-precision
-floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits32 extractFloat64Frac0( float64 a )
-{
-
-    return (bits32)((FLOAT64_DEMANGLE(a) >> 32) & 0x000FFFFF);
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the double-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE int16 extractFloat64Exp( float64 a )
-{
-
-    return (int16)((FLOAT64_DEMANGLE(a) >> 52) & 0x7FF);
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the double-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloat64Sign( float64 a )
-{
-
-    return (flag)(FLOAT64_DEMANGLE(a) >> 63);
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal double-precision floating-point value represented
-by the denormalized significand formed by the concatenation of `aSig0' and
-`aSig1'.  The normalized exponent is stored at the location pointed to by
-`zExpPtr'.  The most significant 21 bits of the normalized significand are
-stored at the location pointed to by `zSig0Ptr', and the least significant
-32 bits of the normalized significand are stored at the location pointed to
-by `zSig1Ptr'.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloat64Subnormal(
-     bits32 aSig0,
-     bits32 aSig1,
-     int16 *zExpPtr,
-     bits32 *zSig0Ptr,
-     bits32 *zSig1Ptr
- )
-{
-    int8 shiftCount;
-
-    if ( aSig0 == 0 ) {
-        shiftCount = countLeadingZeros32( aSig1 ) - 11;
-        if ( shiftCount < 0 ) {
-            *zSig0Ptr = aSig1>>( - shiftCount );
-            *zSig1Ptr = aSig1<<( shiftCount & 31 );
-        }
-        else {
-            *zSig0Ptr = aSig1<<shiftCount;
-            *zSig1Ptr = 0;
-        }
-        *zExpPtr = - shiftCount - 31;
-    }
-    else {
-        shiftCount = countLeadingZeros32( aSig0 ) - 11;
-        shortShift64Left( aSig0, aSig1, shiftCount, zSig0Ptr, zSig1Ptr );
-        *zExpPtr = 1 - shiftCount;
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', the exponent `zExp', and the significand formed by
-the concatenation of `zSig0' and `zSig1' into a double-precision floating-
-point value, returning the result.  After being shifted into the proper
-positions, the three fields `zSign', `zExp', and `zSig0' are simply added
-together to form the most significant 32 bits of the result.  This means
-that any integer portion of `zSig0' will be added into the exponent.  Since
-a properly normalized significand will have an integer portion equal to 1,
-the `zExp' input should be 1 less than the desired result exponent whenever
-`zSig0' and `zSig1' concatenated form a complete, normalized significand.
--------------------------------------------------------------------------------
-*/
-INLINE float64
- packFloat64( flag zSign, int16 zExp, bits32 zSig0, bits32 zSig1 )
-{
-
-    return FLOAT64_MANGLE( ( ( (bits64) zSign )<<63 ) +
-			   ( ( (bits64) zExp )<<52 ) + 
-			   ( ( (bits64) zSig0 )<<32 ) + zSig1 );
-
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and extended significand formed by the concatenation of `zSig0', `zSig1',
-and `zSig2', and returns the proper double-precision floating-point value
-corresponding to the abstract input.  Ordinarily, the abstract value is
-simply rounded and packed into the double-precision format, with the inexact
-exception raised if the abstract input cannot be represented exactly.
-However, if the abstract value is too large, the overflow and inexact
-exceptions are raised and an infinity or maximal finite value is returned.
-If the abstract value is too small, the input value is rounded to a
-subnormal number, and the underflow and inexact exceptions are raised if the
-abstract input cannot be represented exactly as a subnormal double-precision
-floating-point number.
-    The input significand must be normalized or smaller.  If the input
-significand is not normalized, `zExp' must be 0; in that case, the result
-returned is a subnormal number, and it must not require rounding.  In the
-usual case that the input significand is normalized, `zExp' must be 1 less
-than the ``true'' floating-point exponent.  The handling of underflow and
-overflow follows the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64
- roundAndPackFloat64(
-     flag zSign, int16 zExp, bits32 zSig0, bits32 zSig1, bits32 zSig2 )
-{
-    int8 roundingMode;
-    flag roundNearestEven, increment, isTiny;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    increment = ( (sbits32) zSig2 < 0 );
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            increment = 0;
-        }
-        else {
-            if ( zSign ) {
-                increment = ( roundingMode == float_round_down ) && zSig2;
-            }
-            else {
-                increment = ( roundingMode == float_round_up ) && zSig2;
-            }
-        }
-    }
-    if ( 0x7FD <= (bits16) zExp ) {
-        if (    ( 0x7FD < zExp )
-             || (    ( zExp == 0x7FD )
-                  && eq64( 0x001FFFFF, 0xFFFFFFFF, zSig0, zSig1 )
-                  && increment
-                )
-           ) {
-            float_raise( float_flag_overflow | float_flag_inexact );
-            if (    ( roundingMode == float_round_to_zero )
-                 || ( zSign && ( roundingMode == float_round_up ) )
-                 || ( ! zSign && ( roundingMode == float_round_down ) )
-               ) {
-                return packFloat64( zSign, 0x7FE, 0x000FFFFF, 0xFFFFFFFF );
-            }
-            return packFloat64( zSign, 0x7FF, 0, 0 );
-        }
-        if ( zExp < 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < -1 )
-                || ! increment
-                || lt64( zSig0, zSig1, 0x001FFFFF, 0xFFFFFFFF );
-            shift64ExtraRightJamming(
-                zSig0, zSig1, zSig2, - zExp, &zSig0, &zSig1, &zSig2 );
-            zExp = 0;
-            if ( isTiny && zSig2 ) float_raise( float_flag_underflow );
-            if ( roundNearestEven ) {
-                increment = ( (sbits32) zSig2 < 0 );
-            }
-            else {
-                if ( zSign ) {
-                    increment = ( roundingMode == float_round_down ) && zSig2;
-                }
-                else {
-                    increment = ( roundingMode == float_round_up ) && zSig2;
-                }
-            }
-        }
-    }
-    if ( zSig2 ) set_float_exception_inexact_flag();
-    if ( increment ) {
-        add64( zSig0, zSig1, 0, 1, &zSig0, &zSig1 );
-        zSig1 &= ~ ( ( zSig2 + zSig2 == 0 ) & roundNearestEven );
-    }
-    else {
-        if ( ( zSig0 | zSig1 ) == 0 ) zExp = 0;
-    }
-    return packFloat64( zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand formed by the concatenation of `zSig0' and `zSig1', and
-returns the proper double-precision floating-point value corresponding
-to the abstract input.  This routine is just like `roundAndPackFloat64'
-except that the input significand has fewer bits and does not have to be
-normalized.  In all cases, `zExp' must be 1 less than the ``true'' floating-
-point exponent.
--------------------------------------------------------------------------------
-*/
-static float64
- normalizeRoundAndPackFloat64(
-     flag zSign, int16 zExp, bits32 zSig0, bits32 zSig1 )
-{
-    int8 shiftCount;
-    bits32 zSig2;
-
-    if ( zSig0 == 0 ) {
-        zSig0 = zSig1;
-        zSig1 = 0;
-        zExp -= 32;
-    }
-    shiftCount = countLeadingZeros32( zSig0 ) - 11;
-    if ( 0 <= shiftCount ) {
-        zSig2 = 0;
-        shortShift64Left( zSig0, zSig1, shiftCount, &zSig0, &zSig1 );
-    }
-    else {
-        shift64ExtraRightJamming(
-            zSig0, zSig1, 0, - shiftCount, &zSig0, &zSig1, &zSig2 );
-    }
-    zExp -= shiftCount;
-    return roundAndPackFloat64( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a' to
-the single-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int32 a )
-{
-    flag zSign;
-
-    if ( a == 0 ) return 0;
-    if ( a == (sbits32) 0x80000000 ) return packFloat32( 1, 0x9E, 0 );
-    zSign = ( a < 0 );
-    return normalizeRoundAndPackFloat32(zSign, 0x9C, (uint32)(zSign ? - a : a));
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a' to
-the double-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 int32_to_float64( int32 a )
-{
-    flag zSign;
-    bits32 absA;
-    int8 shiftCount;
-    bits32 zSig0, zSig1;
-
-    if ( a == 0 ) return packFloat64( 0, 0, 0, 0 );
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros32( absA ) - 11;
-    if ( 0 <= shiftCount ) {
-        zSig0 = absA<<shiftCount;
-        zSig1 = 0;
-    }
-    else {
-        shift64Right( absA, 0, - shiftCount, &zSig0, &zSig1 );
-    }
-    return packFloat64( zSign, 0x412 - shiftCount, zSig0, zSig1 );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 float32_to_int32( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig, aSigExtra;
-    int32 z;
-    int8 roundingMode;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    shiftCount = aExp - 0x96;
-    if ( 0 <= shiftCount ) {
-        if ( 0x9E <= aExp ) {
-            if ( a != 0xCF000000 ) {
-                float_raise( float_flag_invalid );
-                if ( ! aSign || ( ( aExp == 0xFF ) && aSig ) ) {
-                    return 0x7FFFFFFF;
-                }
-            }
-            return (sbits32) 0x80000000;
-        }
-        z = ( aSig | 0x00800000 )<<shiftCount;
-        if ( aSign ) z = - z;
-    }
-    else {
-        if ( aExp < 0x7E ) {
-            aSigExtra = aExp | aSig;
-            z = 0;
-        }
-        else {
-            aSig |= 0x00800000;
-            aSigExtra = aSig<<( shiftCount & 31 );
-            z = aSig>>( - shiftCount );
-        }
-        if ( aSigExtra ) set_float_exception_inexact_flag();
-        roundingMode = float_rounding_mode;
-        if ( roundingMode == float_round_nearest_even ) {
-            if ( (sbits32) aSigExtra < 0 ) {
-                ++z;
-                if ( (bits32) ( aSigExtra<<1 ) == 0 ) z &= ~1;
-            }
-            if ( aSign ) z = - z;
-        }
-        else {
-            aSigExtra = ( aSigExtra != 0 );
-            if ( aSign ) {
-                z += ( roundingMode == float_round_down ) & aSigExtra;
-                z = - z;
-            }
-            else {
-                z += ( roundingMode == float_round_up ) & aSigExtra;
-            }
-        }
-    }
-    return z;
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.
-If `a' is a NaN, the largest positive integer is returned.  Otherwise, if
-the conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int32 float32_to_int32_round_to_zero( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig;
-    int32 z;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    shiftCount = aExp - 0x9E;
-    if ( 0 <= shiftCount ) {
-        if ( a != 0xCF000000 ) {
-            float_raise( float_flag_invalid );
-            if ( ! aSign || ( ( aExp == 0xFF ) && aSig ) ) return 0x7FFFFFFF;
-        }
-        return (sbits32) 0x80000000;
-    }
-    else if ( aExp <= 0x7E ) {
-        if ( aExp | aSig ) set_float_exception_inexact_flag();
-        return 0;
-    }
-    aSig = ( aSig | 0x00800000 )<<8;
-    z = aSig>>( - shiftCount );
-    if ( (bits32) ( aSig<<( shiftCount & 31 ) ) ) {
-        set_float_exception_inexact_flag();
-    }
-    if ( aSign ) z = - z;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the double-precision floating-point format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float32_to_float64( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 aSig, zSig0, zSig1;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return commonNaNToFloat64( float32ToCommonNaN( a ) );
-        return packFloat64( aSign, 0x7FF, 0, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat64( aSign, 0, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-        --aExp;
-    }
-    shift64Right( aSig, 0, 3, &zSig0, &zSig1 );
-    return packFloat64( aSign, aExp + 0x380, zSig0, zSig1 );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Rounds the single-precision floating-point value `a' to an integer,
-and returns the result as a single-precision floating-point value.  The
-operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    float32 z;
-
-    aExp = extractFloat32Exp( a );
-    if ( 0x96 <= aExp ) {
-        if ( ( aExp == 0xFF ) && extractFloat32Frac( a ) ) {
-            return propagateFloat32NaN( a, a );
-        }
-        return a;
-    }
-    if ( aExp <= 0x7E ) {
-        if ( (bits32) ( a<<1 ) == 0 ) return a;
-        set_float_exception_inexact_flag();
-        aSign = extractFloat32Sign( a );
-        switch ( float_rounding_mode ) {
-         case float_round_nearest_even:
-            if ( ( aExp == 0x7E ) && extractFloat32Frac( a ) ) {
-                return packFloat32( aSign, 0x7F, 0 );
-            }
-            break;
-	 case float_round_to_zero:
-	    break;
-         case float_round_down:
-            return aSign ? 0xBF800000 : 0;
-         case float_round_up:
-            return aSign ? 0x80000000 : 0x3F800000;
-        }
-        return packFloat32( aSign, 0, 0 );
-    }
-    lastBitMask = 1;
-    lastBitMask <<= 0x96 - aExp;
-    roundBitsMask = lastBitMask - 1;
-    z = a;
-    roundingMode = float_rounding_mode;
-    if ( roundingMode == float_round_nearest_even ) {
-        z += lastBitMask>>1;
-        if ( ( z & roundBitsMask ) == 0 ) z &= ~ lastBitMask;
-    }
-    else if ( roundingMode != float_round_to_zero ) {
-        if ( extractFloat32Sign( z ) ^ ( roundingMode == float_round_up ) ) {
-            z += roundBitsMask;
-        }
-    }
-    z &= ~ roundBitsMask;
-    if ( z != a ) set_float_exception_inexact_flag();
-    return z;
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the single-precision
-floating-point values `a' and `b'.  If `zSign' is 1, the sum is negated
-before being returned.  `zSign' is ignored if the result is a NaN.
-The addition is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 addFloat32Sigs( float32 a, float32 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 6;
-    bSig <<= 6;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0xFF ) {
-            if ( aSig ) return propagateFloat32NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) {
-            --expDiff;
-        }
-        else {
-            bSig |= 0x20000000;
-        }
-        shift32RightJamming( bSig, expDiff, &bSig );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0xFF ) {
-            if ( bSig ) return propagateFloat32NaN( a, b );
-            return packFloat32( zSign, 0xFF, 0 );
-        }
-        if ( aExp == 0 ) {
-            ++expDiff;
-        }
-        else {
-            aSig |= 0x20000000;
-        }
-        shift32RightJamming( aSig, - expDiff, &aSig );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0xFF ) {
-            if ( aSig | bSig ) return propagateFloat32NaN( a, b );
-            return a;
-        }
-        if ( aExp == 0 ) return packFloat32( zSign, 0, ( aSig + bSig )>>6 );
-        zSig = 0x40000000 + aSig + bSig;
-        zExp = aExp;
-        goto roundAndPack;
-    }
-    aSig |= 0x20000000;
-    zSig = ( aSig + bSig )<<1;
-    --zExp;
-    if ( (sbits32) zSig < 0 ) {
-        zSig = aSig + bSig;
-        ++zExp;
-    }
- roundAndPack:
-    return roundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the single-
-precision floating-point values `a' and `b'.  If `zSign' is 1, the
-difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 subFloat32Sigs( float32 a, float32 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 7;
-    bSig <<= 7;
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0xFF ) {
-        if ( aSig | bSig ) return propagateFloat32NaN( a, b );
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    if ( bSig < aSig ) goto aBigger;
-    if ( aSig < bSig ) goto bBigger;
-    return packFloat32( float_rounding_mode == float_round_down, 0, 0 );
- bExpBigger:
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return packFloat32( zSign ^ 1, 0xFF, 0 );
-    }
-    if ( aExp == 0 ) {
-        ++expDiff;
-    }
-    else {
-        aSig |= 0x40000000;
-    }
-    shift32RightJamming( aSig, - expDiff, &aSig );
-    bSig |= 0x40000000;
- bBigger:
-    zSig = bSig - aSig;
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        --expDiff;
-    }
-    else {
-        bSig |= 0x40000000;
-    }
-    shift32RightJamming( bSig, expDiff, &bSig );
-    aSig |= 0x40000000;
- aBigger:
-    zSig = aSig - bSig;
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the single-precision floating-point values `a'
-and `b'.  The operation is performed according to the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_add( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign == bSign ) {
-        return addFloat32Sigs( a, b, aSign );
-    }
-    else {
-        return subFloat32Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the single-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_sub( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign == bSign ) {
-        return subFloat32Sigs( a, b, aSign );
-    }
-    else {
-        return addFloat32Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the single-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_mul( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig0, zSig1;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0xFF ) {
-        if ( aSig || ( ( bExp == 0xFF ) && bSig ) ) {
-            return propagateFloat32NaN( a, b );
-        }
-        if ( ( bExp | bSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        if ( ( aExp | aSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    zExp = aExp + bExp - 0x7F;
-    aSig = ( aSig | 0x00800000 )<<7;
-    bSig = ( bSig | 0x00800000 )<<8;
-    mul32To64( aSig, bSig, &zSig0, &zSig1 );
-    zSig0 |= ( zSig1 != 0 );
-    if ( 0 <= (sbits32) ( zSig0<<1 ) ) {
-        zSig0 <<= 1;
-        --zExp;
-    }
-    return roundAndPackFloat32( zSign, zExp, zSig0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the single-precision floating-point value `a'
-by the corresponding value `b'.  The operation is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_div( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig, rem0, rem1, term0, term1;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, b );
-        if ( bExp == 0xFF ) {
-            if ( bSig ) return propagateFloat32NaN( a, b );
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return packFloat32( zSign, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            if ( ( aExp | aSig ) == 0 ) {
-                float_raise( float_flag_invalid );
-                return float32_default_nan;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloat32( zSign, 0xFF, 0 );
-        }
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = aExp - bExp + 0x7D;
-    aSig = ( aSig | 0x00800000 )<<7;
-    bSig = ( bSig | 0x00800000 )<<8;
-    if ( bSig <= ( aSig + aSig ) ) {
-        aSig >>= 1;
-        ++zExp;
-    }
-    zSig = estimateDiv64To32( aSig, 0, bSig );
-    if ( ( zSig & 0x3F ) <= 2 ) {
-        mul32To64( bSig, zSig, &term0, &term1 );
-        sub64( aSig, 0, term0, term1, &rem0, &rem1 );
-        while ( (sbits32) rem0 < 0 ) {
-            --zSig;
-            add64( rem0, rem1, 0, bSig, &rem0, &rem1 );
-        }
-        zSig |= ( rem1 != 0 );
-    }
-    return roundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the single-precision floating-point value `a'
-with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_rem( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, expDiff;
-    bits32 aSig, bSig, q, allZero, alternateASig;
-    sbits32 sigMean;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    if ( aExp == 0xFF ) {
-        if ( aSig || ( ( bExp == 0xFF ) && bSig ) ) {
-            return propagateFloat32NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return a;
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    expDiff = aExp - bExp;
-    aSig = ( aSig | 0x00800000 )<<8;
-    bSig = ( bSig | 0x00800000 )<<8;
-    if ( expDiff < 0 ) {
-        if ( expDiff < -1 ) return a;
-        aSig >>= 1;
-    }
-    q = ( bSig <= aSig );
-    if ( q ) aSig -= bSig;
-    expDiff -= 32;
-    while ( 0 < expDiff ) {
-        q = estimateDiv64To32( aSig, 0, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        aSig = - ( ( bSig>>2 ) * q );
-        expDiff -= 30;
-    }
-    expDiff += 32;
-    if ( 0 < expDiff ) {
-        q = estimateDiv64To32( aSig, 0, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        q >>= 32 - expDiff;
-        bSig >>= 2;
-        aSig = ( ( aSig>>1 )<<( expDiff - 1 ) ) - bSig * q;
-    }
-    else {
-        aSig >>= 2;
-        bSig >>= 2;
-    }
-    do {
-        alternateASig = aSig;
-        ++q;
-        aSig -= bSig;
-    } while ( 0 <= (sbits32) aSig );
-    sigMean = aSig + alternateASig;
-    if ( ( sigMean < 0 ) || ( ( sigMean == 0 ) && ( q & 1 ) ) ) {
-        aSig = alternateASig;
-    }
-    zSign = ( (sbits32) aSig < 0 );
-    if ( zSign ) aSig = - aSig;
-    return normalizeRoundAndPackFloat32( aSign ^ zSign, bExp, aSig );
-
-}
-#endif
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns the square root of the single-precision floating-point value `a'.
-The operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_sqrt( float32 a )
-{
-    flag aSign;
-    int16 aExp, zExp;
-    bits32 aSig, zSig, rem0, rem1, term0, term1;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, 0 );
-        if ( ! aSign ) return a;
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig ) == 0 ) return a;
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return 0;
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = ( ( aExp - 0x7F )>>1 ) + 0x7E;
-    aSig = ( aSig | 0x00800000 )<<8;
-    zSig = estimateSqrt32( aExp, aSig ) + 2;
-    if ( ( zSig & 0x7F ) <= 5 ) {
-        if ( zSig < 2 ) {
-            zSig = 0x7FFFFFFF;
-            goto roundAndPack;
-        }
-        else {
-            aSig >>= aExp & 1;
-            mul32To64( zSig, zSig, &term0, &term1 );
-            sub64( aSig, 0, term0, term1, &rem0, &rem1 );
-            while ( (sbits32) rem0 < 0 ) {
-                --zSig;
-                shortShift64Left( 0, zSig, 1, &term0, &term1 );
-                term1 |= 1;
-                add64( rem0, rem1, term0, term1, &rem0, &rem1 );
-            }
-            zSig |= ( ( rem0 | rem1 ) != 0 );
-        }
-    }
-    shift32RightJamming( zSig, 1, &zSig );
- roundAndPack:
-    return roundAndPackFloat32( 0, zExp, zSig );
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_eq( float32 a, float32 b )
-{
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return ( a == b ) || ( (bits32) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than
-or equal to the corresponding value `b', and 0 otherwise.  The comparison
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_le( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits32) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_lt( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits32) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The invalid exception is
-raised if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_eq_signaling( float32 a, float32 b )
-{
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return ( a == b ) || ( (bits32) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than or
-equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs do not
-cause an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_le_quiet( float32 a, float32 b )
-{
-    flag aSign, bSign;
-    int16 aExp, bExp;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits32) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause an
-exception.  Otherwise, the comparison is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_lt_quiet( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits32) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 float64_to_int32( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig0, aSig1, absZ, aSigExtra;
-    int32 z;
-    int8 roundingMode;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    shiftCount = aExp - 0x413;
-    if ( 0 <= shiftCount ) {
-        if ( 0x41E < aExp ) {
-            if ( ( aExp == 0x7FF ) && ( aSig0 | aSig1 ) ) aSign = 0;
-            goto invalid;
-        }
-        shortShift64Left(
-            aSig0 | 0x00100000, aSig1, shiftCount, &absZ, &aSigExtra );
-        if ( 0x80000000 < absZ ) goto invalid;
-    }
-    else {
-        aSig1 = ( aSig1 != 0 );
-        if ( aExp < 0x3FE ) {
-            aSigExtra = aExp | aSig0 | aSig1;
-            absZ = 0;
-        }
-        else {
-            aSig0 |= 0x00100000;
-            aSigExtra = ( aSig0<<( shiftCount & 31 ) ) | aSig1;
-            absZ = aSig0>>( - shiftCount );
-        }
-    }
-    roundingMode = float_rounding_mode;
-    if ( roundingMode == float_round_nearest_even ) {
-        if ( (sbits32) aSigExtra < 0 ) {
-            ++absZ;
-            if ( (bits32) ( aSigExtra<<1 ) == 0 ) absZ &= ~1;
-        }
-        z = aSign ? - absZ : absZ;
-    }
-    else {
-        aSigExtra = ( aSigExtra != 0 );
-        if ( aSign ) {
-            z = - (   absZ
-                    + ( ( roundingMode == float_round_down ) & aSigExtra ) );
-        }
-        else {
-            z = absZ + ( ( roundingMode == float_round_up ) & aSigExtra );
-        }
-    }
-    if ( ( aSign ^ ( z < 0 ) ) && z ) {
- invalid:
-        float_raise( float_flag_invalid );
-        return aSign ? (sbits32) 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( aSigExtra ) set_float_exception_inexact_flag();
-    return z;
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.
-If `a' is a NaN, the largest positive integer is returned.  Otherwise, if
-the conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int32 float64_to_int32_round_to_zero( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig0, aSig1, absZ, aSigExtra;
-    int32 z;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    shiftCount = aExp - 0x413;
-    if ( 0 <= shiftCount ) {
-        if ( 0x41E < aExp ) {
-            if ( ( aExp == 0x7FF ) && ( aSig0 | aSig1 ) ) aSign = 0;
-            goto invalid;
-        }
-        shortShift64Left(
-            aSig0 | 0x00100000, aSig1, shiftCount, &absZ, &aSigExtra );
-    }
-    else {
-        if ( aExp < 0x3FF ) {
-            if ( aExp | aSig0 | aSig1 ) {
-                set_float_exception_inexact_flag();
-            }
-            return 0;
-        }
-        aSig0 |= 0x00100000;
-        aSigExtra = ( aSig0<<( shiftCount & 31 ) ) | aSig1;
-        absZ = aSig0>>( - shiftCount );
-    }
-    z = aSign ? - absZ : absZ;
-    if ( ( aSign ^ ( z < 0 ) ) && z ) {
- invalid:
-        float_raise( float_flag_invalid );
-        return aSign ? (sbits32) 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( aSigExtra ) set_float_exception_inexact_flag();
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the single-precision floating-point format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float64_to_float32( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 aSig0, aSig1, zSig;
-    bits32 allZero;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig0 | aSig1 ) {
-            return commonNaNToFloat32( float64ToCommonNaN( a ) );
-        }
-        return packFloat32( aSign, 0xFF, 0 );
-    }
-    shift64RightJamming( aSig0, aSig1, 22, &allZero, &zSig );
-    if ( aExp ) zSig |= 0x40000000;
-    return roundAndPackFloat32( aSign, aExp - 0x381, zSig );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Rounds the double-precision floating-point value `a' to an integer,
-and returns the result as a double-precision floating-point value.  The
-operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    float64 z;
-
-    aExp = extractFloat64Exp( a );
-    if ( 0x413 <= aExp ) {
-        if ( 0x433 <= aExp ) {
-            if (    ( aExp == 0x7FF )
-                 && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) ) ) {
-                return propagateFloat64NaN( a, a );
-            }
-            return a;
-        }
-        lastBitMask = 1;
-        lastBitMask = ( lastBitMask<<( 0x432 - aExp ) )<<1;
-        roundBitsMask = lastBitMask - 1;
-        z = a;
-        roundingMode = float_rounding_mode;
-        if ( roundingMode == float_round_nearest_even ) {
-            if ( lastBitMask ) {
-                add64( z.high, z.low, 0, lastBitMask>>1, &z.high, &z.low );
-                if ( ( z.low & roundBitsMask ) == 0 ) z.low &= ~ lastBitMask;
-            }
-            else {
-                if ( (sbits32) z.low < 0 ) {
-                    ++z.high;
-                    if ( (bits32) ( z.low<<1 ) == 0 ) z.high &= ~1;
-                }
-            }
-        }
-        else if ( roundingMode != float_round_to_zero ) {
-            if (   extractFloat64Sign( z )
-                 ^ ( roundingMode == float_round_up ) ) {
-                add64( z.high, z.low, 0, roundBitsMask, &z.high, &z.low );
-            }
-        }
-        z.low &= ~ roundBitsMask;
-    }
-    else {
-        if ( aExp <= 0x3FE ) {
-            if ( ( ( (bits32) ( a.high<<1 ) ) | a.low ) == 0 ) return a;
-            set_float_exception_inexact_flag();
-            aSign = extractFloat64Sign( a );
-            switch ( float_rounding_mode ) {
-             case float_round_nearest_even:
-                if (    ( aExp == 0x3FE )
-                     && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) )
-                   ) {
-                    return packFloat64( aSign, 0x3FF, 0, 0 );
-                }
-                break;
-             case float_round_down:
-                return
-                      aSign ? packFloat64( 1, 0x3FF, 0, 0 )
-                    : packFloat64( 0, 0, 0, 0 );
-             case float_round_up:
-                return
-                      aSign ? packFloat64( 1, 0, 0, 0 )
-                    : packFloat64( 0, 0x3FF, 0, 0 );
-            }
-            return packFloat64( aSign, 0, 0, 0 );
-        }
-        lastBitMask = 1;
-        lastBitMask <<= 0x413 - aExp;
-        roundBitsMask = lastBitMask - 1;
-        z.low = 0;
-        z.high = a.high;
-        roundingMode = float_rounding_mode;
-        if ( roundingMode == float_round_nearest_even ) {
-            z.high += lastBitMask>>1;
-            if ( ( ( z.high & roundBitsMask ) | a.low ) == 0 ) {
-                z.high &= ~ lastBitMask;
-            }
-        }
-        else if ( roundingMode != float_round_to_zero ) {
-            if (   extractFloat64Sign( z )
-                 ^ ( roundingMode == float_round_up ) ) {
-                z.high |= ( a.low != 0 );
-                z.high += roundBitsMask;
-            }
-        }
-        z.high &= ~ roundBitsMask;
-    }
-    if ( ( z.low != a.low ) || ( z.high != a.high ) ) {
-        set_float_exception_inexact_flag();
-    }
-    return z;
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the double-precision
-floating-point values `a' and `b'.  If `zSign' is 1, the sum is negated
-before being returned.  `zSign' is ignored if the result is a NaN.
-The addition is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64 addFloat64Sigs( float64 a, float64 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits32 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2;
-    int16 expDiff;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    bSig1 = extractFloat64Frac1( b );
-    bSig0 = extractFloat64Frac0( b );
-    bExp = extractFloat64Exp( b );
-    expDiff = aExp - bExp;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0x7FF ) {
-            if ( aSig0 | aSig1 ) return propagateFloat64NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) {
-            --expDiff;
-        }
-        else {
-            bSig0 |= 0x00100000;
-        }
-        shift64ExtraRightJamming(
-            bSig0, bSig1, 0, expDiff, &bSig0, &bSig1, &zSig2 );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0x7FF ) {
-            if ( bSig0 | bSig1 ) return propagateFloat64NaN( a, b );
-            return packFloat64( zSign, 0x7FF, 0, 0 );
-        }
-        if ( aExp == 0 ) {
-            ++expDiff;
-        }
-        else {
-            aSig0 |= 0x00100000;
-        }
-        shift64ExtraRightJamming(
-            aSig0, aSig1, 0, - expDiff, &aSig0, &aSig1, &zSig2 );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0x7FF ) {
-            if ( aSig0 | aSig1 | bSig0 | bSig1 ) {
-                return propagateFloat64NaN( a, b );
-            }
-            return a;
-        }
-        add64( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1 );
-        if ( aExp == 0 ) return packFloat64( zSign, 0, zSig0, zSig1 );
-        zSig2 = 0;
-        zSig0 |= 0x00200000;
-        zExp = aExp;
-        goto shiftRight1;
-    }
-    aSig0 |= 0x00100000;
-    add64( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1 );
-    --zExp;
-    if ( zSig0 < 0x00200000 ) goto roundAndPack;
-    ++zExp;
- shiftRight1:
-    shift64ExtraRightJamming( zSig0, zSig1, zSig2, 1, &zSig0, &zSig1, &zSig2 );
- roundAndPack:
-    return roundAndPackFloat64( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the double-
-precision floating-point values `a' and `b'.  If `zSign' is 1, the
-difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64 subFloat64Sigs( float64 a, float64 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits32 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1;
-    int16 expDiff;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    bSig1 = extractFloat64Frac1( b );
-    bSig0 = extractFloat64Frac0( b );
-    bExp = extractFloat64Exp( b );
-    expDiff = aExp - bExp;
-    shortShift64Left( aSig0, aSig1, 10, &aSig0, &aSig1 );
-    shortShift64Left( bSig0, bSig1, 10, &bSig0, &bSig1 );
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0x7FF ) {
-        if ( aSig0 | aSig1 | bSig0 | bSig1 ) {
-            return propagateFloat64NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    if ( bSig0 < aSig0 ) goto aBigger;
-    if ( aSig0 < bSig0 ) goto bBigger;
-    if ( bSig1 < aSig1 ) goto aBigger;
-    if ( aSig1 < bSig1 ) goto bBigger;
-    return packFloat64( float_rounding_mode == float_round_down, 0, 0, 0 );
- bExpBigger:
-    if ( bExp == 0x7FF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat64NaN( a, b );
-        return packFloat64( zSign ^ 1, 0x7FF, 0, 0 );
-    }
-    if ( aExp == 0 ) {
-        ++expDiff;
-    }
-    else {
-        aSig0 |= 0x40000000;
-    }
-    shift64RightJamming( aSig0, aSig1, - expDiff, &aSig0, &aSig1 );
-    bSig0 |= 0x40000000;
- bBigger:
-    sub64( bSig0, bSig1, aSig0, aSig1, &zSig0, &zSig1 );
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0x7FF ) {
-        if ( aSig0 | aSig1 ) return propagateFloat64NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        --expDiff;
-    }
-    else {
-        bSig0 |= 0x40000000;
-    }
-    shift64RightJamming( bSig0, bSig1, expDiff, &bSig0, &bSig1 );
-    aSig0 |= 0x40000000;
- aBigger:
-    sub64( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1 );
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat64( zSign, zExp - 10, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the double-precision floating-point values `a'
-and `b'.  The operation is performed according to the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_add( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign == bSign ) {
-        return addFloat64Sigs( a, b, aSign );
-    }
-    else {
-        return subFloat64Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the double-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_sub( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign == bSign ) {
-        return subFloat64Sigs( a, b, aSign );
-    }
-    else {
-        return addFloat64Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the double-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_mul( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits32 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2, zSig3;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig1 = extractFloat64Frac1( b );
-    bSig0 = extractFloat64Frac0( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FF ) {
-        if (    ( aSig0 | aSig1 )
-             || ( ( bExp == 0x7FF ) && ( bSig0 | bSig1 ) ) ) {
-            return propagateFloat64NaN( a, b );
-        }
-        if ( ( bExp | bSig0 | bSig1 ) == 0 ) goto invalid;
-        return packFloat64( zSign, 0x7FF, 0, 0 );
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat64NaN( a, b );
-        if ( ( aExp | aSig0 | aSig1 ) == 0 ) {
- invalid:
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        return packFloat64( zSign, 0x7FF, 0, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return packFloat64( zSign, 0, 0, 0 );
-        normalizeFloat64Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    if ( bExp == 0 ) {
-        if ( ( bSig0 | bSig1 ) == 0 ) return packFloat64( zSign, 0, 0, 0 );
-        normalizeFloat64Subnormal( bSig0, bSig1, &bExp, &bSig0, &bSig1 );
-    }
-    zExp = aExp + bExp - 0x400;
-    aSig0 |= 0x00100000;
-    shortShift64Left( bSig0, bSig1, 12, &bSig0, &bSig1 );
-    mul64To128( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1, &zSig2, &zSig3 );
-    add64( zSig0, zSig1, aSig0, aSig1, &zSig0, &zSig1 );
-    zSig2 |= ( zSig3 != 0 );
-    if ( 0x00200000 <= zSig0 ) {
-        shift64ExtraRightJamming(
-            zSig0, zSig1, zSig2, 1, &zSig0, &zSig1, &zSig2 );
-        ++zExp;
-    }
-    return roundAndPackFloat64( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the double-precision floating-point value `a'
-by the corresponding value `b'.  The operation is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_div( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits32 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2;
-    bits32 rem0, rem1, rem2, rem3, term0, term1, term2, term3;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig1 = extractFloat64Frac1( b );
-    bSig0 = extractFloat64Frac0( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FF ) {
-        if ( aSig0 | aSig1 ) return propagateFloat64NaN( a, b );
-        if ( bExp == 0x7FF ) {
-            if ( bSig0 | bSig1 ) return propagateFloat64NaN( a, b );
-            goto invalid;
-        }
-        return packFloat64( zSign, 0x7FF, 0, 0 );
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat64NaN( a, b );
-        return packFloat64( zSign, 0, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( ( bSig0 | bSig1 ) == 0 ) {
-            if ( ( aExp | aSig0 | aSig1 ) == 0 ) {
- invalid:
-                float_raise( float_flag_invalid );
-                return float64_default_nan;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloat64( zSign, 0x7FF, 0, 0 );
-        }
-        normalizeFloat64Subnormal( bSig0, bSig1, &bExp, &bSig0, &bSig1 );
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return packFloat64( zSign, 0, 0, 0 );
-        normalizeFloat64Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    zExp = aExp - bExp + 0x3FD;
-    shortShift64Left( aSig0 | 0x00100000, aSig1, 11, &aSig0, &aSig1 );
-    shortShift64Left( bSig0 | 0x00100000, bSig1, 11, &bSig0, &bSig1 );
-    if ( le64( bSig0, bSig1, aSig0, aSig1 ) ) {
-        shift64Right( aSig0, aSig1, 1, &aSig0, &aSig1 );
-        ++zExp;
-    }
-    zSig0 = estimateDiv64To32( aSig0, aSig1, bSig0 );
-    mul64By32To96( bSig0, bSig1, zSig0, &term0, &term1, &term2 );
-    sub96( aSig0, aSig1, 0, term0, term1, term2, &rem0, &rem1, &rem2 );
-    while ( (sbits32) rem0 < 0 ) {
-        --zSig0;
-        add96( rem0, rem1, rem2, 0, bSig0, bSig1, &rem0, &rem1, &rem2 );
-    }
-    zSig1 = estimateDiv64To32( rem1, rem2, bSig0 );
-    if ( ( zSig1 & 0x3FF ) <= 4 ) {
-        mul64By32To96( bSig0, bSig1, zSig1, &term1, &term2, &term3 );
-        sub96( rem1, rem2, 0, term1, term2, term3, &rem1, &rem2, &rem3 );
-        while ( (sbits32) rem1 < 0 ) {
-            --zSig1;
-            add96( rem1, rem2, rem3, 0, bSig0, bSig1, &rem1, &rem2, &rem3 );
-        }
-        zSig1 |= ( ( rem1 | rem2 | rem3 ) != 0 );
-    }
-    shift64ExtraRightJamming( zSig0, zSig1, 0, 11, &zSig0, &zSig1, &zSig2 );
-    return roundAndPackFloat64( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the double-precision floating-point value `a'
-with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_rem( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, expDiff;
-    bits32 aSig0, aSig1, bSig0, bSig1, q, term0, term1, term2;
-    bits32 allZero, alternateASig0, alternateASig1, sigMean1;
-    sbits32 sigMean0;
-    float64 z;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig1 = extractFloat64Frac1( b );
-    bSig0 = extractFloat64Frac0( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    if ( aExp == 0x7FF ) {
-        if (    ( aSig0 | aSig1 )
-             || ( ( bExp == 0x7FF ) && ( bSig0 | bSig1 ) ) ) {
-            return propagateFloat64NaN( a, b );
-        }
-        goto invalid;
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat64NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( ( bSig0 | bSig1 ) == 0 ) {
- invalid:
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        normalizeFloat64Subnormal( bSig0, bSig1, &bExp, &bSig0, &bSig1 );
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return a;
-        normalizeFloat64Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    expDiff = aExp - bExp;
-    if ( expDiff < -1 ) return a;
-    shortShift64Left(
-        aSig0 | 0x00100000, aSig1, 11 - ( expDiff < 0 ), &aSig0, &aSig1 );
-    shortShift64Left( bSig0 | 0x00100000, bSig1, 11, &bSig0, &bSig1 );
-    q = le64( bSig0, bSig1, aSig0, aSig1 );
-    if ( q ) sub64( aSig0, aSig1, bSig0, bSig1, &aSig0, &aSig1 );
-    expDiff -= 32;
-    while ( 0 < expDiff ) {
-        q = estimateDiv64To32( aSig0, aSig1, bSig0 );
-        q = ( 4 < q ) ? q - 4 : 0;
-        mul64By32To96( bSig0, bSig1, q, &term0, &term1, &term2 );
-        shortShift96Left( term0, term1, term2, 29, &term1, &term2, &allZero );
-        shortShift64Left( aSig0, aSig1, 29, &aSig0, &allZero );
-        sub64( aSig0, 0, term1, term2, &aSig0, &aSig1 );
-        expDiff -= 29;
-    }
-    if ( -32 < expDiff ) {
-        q = estimateDiv64To32( aSig0, aSig1, bSig0 );
-        q = ( 4 < q ) ? q - 4 : 0;
-        q >>= - expDiff;
-        shift64Right( bSig0, bSig1, 8, &bSig0, &bSig1 );
-        expDiff += 24;
-        if ( expDiff < 0 ) {
-            shift64Right( aSig0, aSig1, - expDiff, &aSig0, &aSig1 );
-        }
-        else {
-            shortShift64Left( aSig0, aSig1, expDiff, &aSig0, &aSig1 );
-        }
-        mul64By32To96( bSig0, bSig1, q, &term0, &term1, &term2 );
-        sub64( aSig0, aSig1, term1, term2, &aSig0, &aSig1 );
-    }
-    else {
-        shift64Right( aSig0, aSig1, 8, &aSig0, &aSig1 );
-        shift64Right( bSig0, bSig1, 8, &bSig0, &bSig1 );
-    }
-    do {
-        alternateASig0 = aSig0;
-        alternateASig1 = aSig1;
-        ++q;
-        sub64( aSig0, aSig1, bSig0, bSig1, &aSig0, &aSig1 );
-    } while ( 0 <= (sbits32) aSig0 );
-    add64(
-        aSig0, aSig1, alternateASig0, alternateASig1, &sigMean0, &sigMean1 );
-    if (    ( sigMean0 < 0 )
-         || ( ( ( sigMean0 | sigMean1 ) == 0 ) && ( q & 1 ) ) ) {
-        aSig0 = alternateASig0;
-        aSig1 = alternateASig1;
-    }
-    zSign = ( (sbits32) aSig0 < 0 );
-    if ( zSign ) sub64( 0, 0, aSig0, aSig1, &aSig0, &aSig1 );
-    return
-        normalizeRoundAndPackFloat64( aSign ^ zSign, bExp - 4, aSig0, aSig1 );
-
-}
-#endif
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns the square root of the double-precision floating-point value `a'.
-The operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_sqrt( float64 a )
-{
-    flag aSign;
-    int16 aExp, zExp;
-    bits32 aSig0, aSig1, zSig0, zSig1, zSig2, doubleZSig0;
-    bits32 rem0, rem1, rem2, rem3, term0, term1, term2, term3;
-    float64 z;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig0 | aSig1 ) return propagateFloat64NaN( a, a );
-        if ( ! aSign ) return a;
-        goto invalid;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig0 | aSig1 ) == 0 ) return a;
- invalid:
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return packFloat64( 0, 0, 0, 0 );
-        normalizeFloat64Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    zExp = ( ( aExp - 0x3FF )>>1 ) + 0x3FE;
-    aSig0 |= 0x00100000;
-    shortShift64Left( aSig0, aSig1, 11, &term0, &term1 );
-    zSig0 = ( estimateSqrt32( aExp, term0 )>>1 ) + 1;
-    if ( zSig0 == 0 ) zSig0 = 0x7FFFFFFF;
-    doubleZSig0 = zSig0 + zSig0;
-    shortShift64Left( aSig0, aSig1, 9 - ( aExp & 1 ), &aSig0, &aSig1 );
-    mul32To64( zSig0, zSig0, &term0, &term1 );
-    sub64( aSig0, aSig1, term0, term1, &rem0, &rem1 );
-    while ( (sbits32) rem0 < 0 ) {
-        --zSig0;
-        doubleZSig0 -= 2;
-        add64( rem0, rem1, 0, doubleZSig0 | 1, &rem0, &rem1 );
-    }
-    zSig1 = estimateDiv64To32( rem1, 0, doubleZSig0 );
-    if ( ( zSig1 & 0x1FF ) <= 5 ) {
-        if ( zSig1 == 0 ) zSig1 = 1;
-        mul32To64( doubleZSig0, zSig1, &term1, &term2 );
-        sub64( rem1, 0, term1, term2, &rem1, &rem2 );
-        mul32To64( zSig1, zSig1, &term2, &term3 );
-        sub96( rem1, rem2, 0, 0, term2, term3, &rem1, &rem2, &rem3 );
-        while ( (sbits32) rem1 < 0 ) {
-            --zSig1;
-            shortShift64Left( 0, zSig1, 1, &term2, &term3 );
-            term3 |= 1;
-            term2 |= doubleZSig0;
-            add96( rem1, rem2, rem3, 0, term2, term3, &rem1, &rem2, &rem3 );
-        }
-        zSig1 |= ( ( rem1 | rem2 | rem3 ) != 0 );
-    }
-    shift64ExtraRightJamming( zSig0, zSig1, 0, 10, &zSig0, &zSig1, &zSig2 );
-    return roundAndPackFloat64( 0, zExp, zSig0, zSig1, zSig2 );
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_eq( float64 a, float64 b )
-{
-
-    if (    (    ( extractFloat64Exp( a ) == 0x7FF )
-              && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) ) )
-         || (    ( extractFloat64Exp( b ) == 0x7FF )
-              && ( extractFloat64Frac0( b ) | extractFloat64Frac1( b ) ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return ( a == b ) ||
-	( (bits64) ( ( FLOAT64_DEMANGLE(a) | FLOAT64_DEMANGLE(b) )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than
-or equal to the corresponding value `b', and 0 otherwise.  The comparison
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_le( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat64Exp( a ) == 0x7FF )
-              && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) ) )
-         || (    ( extractFloat64Exp( b ) == 0x7FF )
-              && ( extractFloat64Frac0( b ) | extractFloat64Frac1( b ) ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign )
-	return aSign ||
-	    ( (bits64) ( ( FLOAT64_DEMANGLE(a) | FLOAT64_DEMANGLE(b) )<<1 ) ==
-	      0 );
-    return ( a == b ) ||
-	( aSign ^ ( FLOAT64_DEMANGLE(a) < FLOAT64_DEMANGLE(b) ) );
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_lt( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat64Exp( a ) == 0x7FF )
-              && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) ) )
-         || (    ( extractFloat64Exp( b ) == 0x7FF )
-              && ( extractFloat64Frac0( b ) | extractFloat64Frac1( b ) ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign )
-	return aSign &&
-	    ( (bits64) ( ( FLOAT64_DEMANGLE(a) | FLOAT64_DEMANGLE(b) )<<1 ) !=
-	      0 );
-    return ( a != b ) &&
-	( aSign ^ ( FLOAT64_DEMANGLE(a) < FLOAT64_DEMANGLE(b) ) );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The invalid exception is
-raised if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_eq_signaling( float64 a, float64 b )
-{
-
-    if (    (    ( extractFloat64Exp( a ) == 0x7FF )
-              && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) ) )
-         || (    ( extractFloat64Exp( b ) == 0x7FF )
-              && ( extractFloat64Frac0( b ) | extractFloat64Frac1( b ) ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return ( a == b ) || ( (bits64) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than or
-equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs do not
-cause an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_le_quiet( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat64Exp( a ) == 0x7FF )
-              && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) ) )
-         || (    ( extractFloat64Exp( b ) == 0x7FF )
-              && ( extractFloat64Frac0( b ) | extractFloat64Frac1( b ) ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits64) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause an
-exception.  Otherwise, the comparison is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_lt_quiet( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat64Exp( a ) == 0x7FF )
-              && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) ) )
-         || (    ( extractFloat64Exp( b ) == 0x7FF )
-              && ( extractFloat64Frac0( b ) | extractFloat64Frac1( b ) ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits64) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-
-#endif
diff --git a/lib/libc/softfloat/bits64/softfloat-macros b/lib/libc/softfloat/bits64/softfloat-macros
deleted file mode 100644
index 21a26f7f7..000000000
--- a/lib/libc/softfloat/bits64/softfloat-macros
+++ /dev/null
@@ -1,745 +0,0 @@
-/* $NetBSD: softfloat-macros,v 1.3 2012/03/21 02:32:26 christos Exp $ */
-
-/*
-===============================================================================
-
-This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Shifts `a' right by the number of bits given in `count'.  If any nonzero
-bits are shifted off, they are ``jammed'' into the least significant bit of
-the result by setting the least significant bit to 1.  The value of `count'
-can be arbitrarily large; in particular, if `count' is greater than 32, the
-result will be either 0 or 1, depending on whether `a' is zero or nonzero.
-The result is stored in the location pointed to by `zPtr'.
--------------------------------------------------------------------------------
-*/
-INLINE void shift32RightJamming( bits32 a, int16 count, bits32 *zPtr )
-{
-    bits32 z;
-
-    if ( count == 0 ) {
-        z = a;
-    }
-    else if ( count < 32 ) {
-        z = ( a>>count ) | ( ( a<<( ( - count ) & 31 ) ) != 0 );
-    }
-    else {
-        z = ( a != 0 );
-    }
-    *zPtr = z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts `a' right by the number of bits given in `count'.  If any nonzero
-bits are shifted off, they are ``jammed'' into the least significant bit of
-the result by setting the least significant bit to 1.  The value of `count'
-can be arbitrarily large; in particular, if `count' is greater than 64, the
-result will be either 0 or 1, depending on whether `a' is zero or nonzero.
-The result is stored in the location pointed to by `zPtr'.
--------------------------------------------------------------------------------
-*/
-INLINE void shift64RightJamming( bits64 a, int16 count, bits64 *zPtr )
-{
-    bits64 z;
-
-    if ( count == 0 ) {
-        z = a;
-    }
-    else if ( count < 64 ) {
-        z = ( a>>count ) | ( ( a<<( ( - count ) & 63 ) ) != 0 );
-    }
-    else {
-        z = ( a != 0 );
-    }
-    *zPtr = z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 128-bit value formed by concatenating `a0' and `a1' right by 64
-_plus_ the number of bits given in `count'.  The shifted result is at most
-64 nonzero bits; this is stored at the location pointed to by `z0Ptr'.  The
-bits shifted off form a second 64-bit result as follows:  The _last_ bit
-shifted off is the most-significant bit of the extra result, and the other
-63 bits of the extra result are all zero if and only if _all_but_the_last_
-bits shifted off were all zero.  This extra result is stored in the location
-pointed to by `z1Ptr'.  The value of `count' can be arbitrarily large.
-    (This routine makes more sense if `a0' and `a1' are considered to form a
-fixed-point value with binary point between `a0' and `a1'.  This fixed-point
-value is shifted right by the number of bits given in `count', and the
-integer part of the result is returned at the location pointed to by
-`z0Ptr'.  The fractional part of the result may be slightly corrupted as
-described above, and is returned at the location pointed to by `z1Ptr'.)
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift64ExtraRightJamming(
-     bits64 a0, bits64 a1, int16 count, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits64 z0, z1;
-    int8 negCount = ( - count ) & 63;
-
-    if ( count == 0 ) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if ( count < 64 ) {
-        z1 = ( a0<<negCount ) | ( a1 != 0 );
-        z0 = a0>>count;
-    }
-    else {
-        if ( count == 64 ) {
-            z1 = a0 | ( a1 != 0 );
-        }
-        else {
-            z1 = ( ( a0 | a1 ) != 0 );
-        }
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 128-bit value formed by concatenating `a0' and `a1' right by the
-number of bits given in `count'.  Any bits shifted off are lost.  The value
-of `count' can be arbitrarily large; in particular, if `count' is greater
-than 128, the result will be 0.  The result is broken into two 64-bit pieces
-which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift128Right(
-     bits64 a0, bits64 a1, int16 count, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits64 z0, z1;
-    int8 negCount = ( - count ) & 63;
-
-    if ( count == 0 ) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if ( count < 64 ) {
-        z1 = ( a0<<negCount ) | ( a1>>count );
-        z0 = a0>>count;
-    }
-    else {
-        z1 = ( count < 64 ) ? ( a0>>( count & 63 ) ) : 0;
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 128-bit value formed by concatenating `a0' and `a1' right by the
-number of bits given in `count'.  If any nonzero bits are shifted off, they
-are ``jammed'' into the least significant bit of the result by setting the
-least significant bit to 1.  The value of `count' can be arbitrarily large;
-in particular, if `count' is greater than 128, the result will be either
-0 or 1, depending on whether the concatenation of `a0' and `a1' is zero or
-nonzero.  The result is broken into two 64-bit pieces which are stored at
-the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift128RightJamming(
-     bits64 a0, bits64 a1, int16 count, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits64 z0, z1;
-    int8 negCount = ( - count ) & 63;
-
-    if ( count == 0 ) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if ( count < 64 ) {
-        z1 = ( a0<<negCount ) | ( a1>>count ) | ( ( a1<<negCount ) != 0 );
-        z0 = a0>>count;
-    }
-    else {
-        if ( count == 64 ) {
-            z1 = a0 | ( a1 != 0 );
-        }
-        else if ( count < 128 ) {
-            z1 = ( a0>>( count & 63 ) ) | ( ( ( a0<<negCount ) | a1 ) != 0 );
-        }
-        else {
-            z1 = ( ( a0 | a1 ) != 0 );
-        }
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 192-bit value formed by concatenating `a0', `a1', and `a2' right
-by 64 _plus_ the number of bits given in `count'.  The shifted result is
-at most 128 nonzero bits; these are broken into two 64-bit pieces which are
-stored at the locations pointed to by `z0Ptr' and `z1Ptr'.  The bits shifted
-off form a third 64-bit result as follows:  The _last_ bit shifted off is
-the most-significant bit of the extra result, and the other 63 bits of the
-extra result are all zero if and only if _all_but_the_last_ bits shifted off
-were all zero.  This extra result is stored in the location pointed to by
-`z2Ptr'.  The value of `count' can be arbitrarily large.
-    (This routine makes more sense if `a0', `a1', and `a2' are considered
-to form a fixed-point value with binary point between `a1' and `a2'.  This
-fixed-point value is shifted right by the number of bits given in `count',
-and the integer part of the result is returned at the locations pointed to
-by `z0Ptr' and `z1Ptr'.  The fractional part of the result may be slightly
-corrupted as described above, and is returned at the location pointed to by
-`z2Ptr'.)
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift128ExtraRightJamming(
-     bits64 a0,
-     bits64 a1,
-     bits64 a2,
-     int16 count,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2;
-    int8 negCount = ( - count ) & 63;
-
-    if ( count == 0 ) {
-        z2 = a2;
-        z1 = a1;
-        z0 = a0;
-    }
-    else {
-        if ( count < 64 ) {
-            z2 = a1<<negCount;
-            z1 = ( a0<<negCount ) | ( a1>>count );
-            z0 = a0>>count;
-        }
-        else {
-            if ( count == 64 ) {
-                z2 = a1;
-                z1 = a0;
-            }
-            else {
-                a2 |= a1;
-                if ( count < 128 ) {
-                    z2 = a0<<negCount;
-                    z1 = a0>>( count & 63 );
-                }
-                else {
-                    z2 = ( count == 128 ) ? a0 : ( a0 != 0 );
-                    z1 = 0;
-                }
-            }
-            z0 = 0;
-        }
-        z2 |= ( a2 != 0 );
-    }
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 128-bit value formed by concatenating `a0' and `a1' left by the
-number of bits given in `count'.  Any bits shifted off are lost.  The value
-of `count' must be less than 64.  The result is broken into two 64-bit
-pieces which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shortShift128Left(
-     bits64 a0, bits64 a1, int16 count, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-
-    *z1Ptr = a1<<count;
-    *z0Ptr =
-        ( count == 0 ) ? a0 : ( a0<<count ) | ( a1>>( ( - count ) & 63 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 192-bit value formed by concatenating `a0', `a1', and `a2' left
-by the number of bits given in `count'.  Any bits shifted off are lost.
-The value of `count' must be less than 64.  The result is broken into three
-64-bit pieces which are stored at the locations pointed to by `z0Ptr',
-`z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shortShift192Left(
-     bits64 a0,
-     bits64 a1,
-     bits64 a2,
-     int16 count,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2;
-    int8 negCount;
-
-    z2 = a2<<count;
-    z1 = a1<<count;
-    z0 = a0<<count;
-    if ( 0 < count ) {
-        negCount = ( ( - count ) & 63 );
-        z1 |= a2>>negCount;
-        z0 |= a1>>negCount;
-    }
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Adds the 128-bit value formed by concatenating `a0' and `a1' to the 128-bit
-value formed by concatenating `b0' and `b1'.  Addition is modulo 2^128, so
-any carry out is lost.  The result is broken into two 64-bit pieces which
-are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- add128(
-     bits64 a0, bits64 a1, bits64 b0, bits64 b1, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits64 z1;
-
-    z1 = a1 + b1;
-    *z1Ptr = z1;
-    *z0Ptr = a0 + b0 + ( z1 < a1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Adds the 192-bit value formed by concatenating `a0', `a1', and `a2' to the
-192-bit value formed by concatenating `b0', `b1', and `b2'.  Addition is
-modulo 2^192, so any carry out is lost.  The result is broken into three
-64-bit pieces which are stored at the locations pointed to by `z0Ptr',
-`z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- add192(
-     bits64 a0,
-     bits64 a1,
-     bits64 a2,
-     bits64 b0,
-     bits64 b1,
-     bits64 b2,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2;
-    int8 carry0, carry1;
-
-    z2 = a2 + b2;
-    carry1 = ( z2 < a2 );
-    z1 = a1 + b1;
-    carry0 = ( z1 < a1 );
-    z0 = a0 + b0;
-    z1 += carry1;
-    z0 += ( z1 < (bits64)carry1 );
-    z0 += carry0;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Subtracts the 128-bit value formed by concatenating `b0' and `b1' from the
-128-bit value formed by concatenating `a0' and `a1'.  Subtraction is modulo
-2^128, so any borrow out (carry out) is lost.  The result is broken into two
-64-bit pieces which are stored at the locations pointed to by `z0Ptr' and
-`z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- sub128(
-     bits64 a0, bits64 a1, bits64 b0, bits64 b1, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-
-    *z1Ptr = a1 - b1;
-    *z0Ptr = a0 - b0 - ( a1 < b1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Subtracts the 192-bit value formed by concatenating `b0', `b1', and `b2'
-from the 192-bit value formed by concatenating `a0', `a1', and `a2'.
-Subtraction is modulo 2^192, so any borrow out (carry out) is lost.  The
-result is broken into three 64-bit pieces which are stored at the locations
-pointed to by `z0Ptr', `z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- sub192(
-     bits64 a0,
-     bits64 a1,
-     bits64 a2,
-     bits64 b0,
-     bits64 b1,
-     bits64 b2,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2;
-    int8 borrow0, borrow1;
-
-    z2 = a2 - b2;
-    borrow1 = ( a2 < b2 );
-    z1 = a1 - b1;
-    borrow0 = ( a1 < b1 );
-    z0 = a0 - b0;
-    z0 -= ( z1 < (bits64)borrow1 );
-    z1 -= borrow1;
-    z0 -= borrow0;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies `a' by `b' to obtain a 128-bit product.  The product is broken
-into two 64-bit pieces which are stored at the locations pointed to by
-`z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void mul64To128( bits64 a, bits64 b, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits32 aHigh, aLow, bHigh, bLow;
-    bits64 z0, zMiddleA, zMiddleB, z1;
-
-    aLow = (bits32)a;
-    aHigh = (bits32)(a>>32);
-    bLow = (bits32)b;
-    bHigh = (bits32)(b>>32);
-    z1 = ( (bits64) aLow ) * bLow;
-    zMiddleA = ( (bits64) aLow ) * bHigh;
-    zMiddleB = ( (bits64) aHigh ) * bLow;
-    z0 = ( (bits64) aHigh ) * bHigh;
-    zMiddleA += zMiddleB;
-    z0 += ( ( (bits64) ( zMiddleA < zMiddleB ) )<<32 ) + ( zMiddleA>>32 );
-    zMiddleA <<= 32;
-    z1 += zMiddleA;
-    z0 += ( z1 < zMiddleA );
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies the 128-bit value formed by concatenating `a0' and `a1' by
-`b' to obtain a 192-bit product.  The product is broken into three 64-bit
-pieces which are stored at the locations pointed to by `z0Ptr', `z1Ptr', and
-`z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- mul128By64To192(
-     bits64 a0,
-     bits64 a1,
-     bits64 b,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2, more1;
-
-    mul64To128( a1, b, &z1, &z2 );
-    mul64To128( a0, b, &z0, &more1 );
-    add128( z0, more1, 0, z1, &z0, &z1 );
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies the 128-bit value formed by concatenating `a0' and `a1' to the
-128-bit value formed by concatenating `b0' and `b1' to obtain a 256-bit
-product.  The product is broken into four 64-bit pieces which are stored at
-the locations pointed to by `z0Ptr', `z1Ptr', `z2Ptr', and `z3Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- mul128To256(
-     bits64 a0,
-     bits64 a1,
-     bits64 b0,
-     bits64 b1,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr,
-     bits64 *z3Ptr
- )
-{
-    bits64 z0, z1, z2, z3;
-    bits64 more1, more2;
-
-    mul64To128( a1, b1, &z2, &z3 );
-    mul64To128( a1, b0, &z1, &more2 );
-    add128( z1, more2, 0, z2, &z1, &z2 );
-    mul64To128( a0, b0, &z0, &more1 );
-    add128( z0, more1, 0, z1, &z0, &z1 );
-    mul64To128( a0, b1, &more1, &more2 );
-    add128( more1, more2, 0, z2, &more1, &z2 );
-    add128( z0, z1, 0, more1, &z0, &z1 );
-    *z3Ptr = z3;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns an approximation to the 64-bit integer quotient obtained by dividing
-`b' into the 128-bit value formed by concatenating `a0' and `a1'.  The
-divisor `b' must be at least 2^63.  If q is the exact quotient truncated
-toward zero, the approximation returned lies between q and q + 2 inclusive.
-If the exact quotient q is larger than 64 bits, the maximum positive 64-bit
-unsigned integer is returned.
--------------------------------------------------------------------------------
-*/
-static bits64 estimateDiv128To64( bits64 a0, bits64 a1, bits64 b )
-{
-    bits64 b0, b1;
-    bits64 rem0, rem1, term0, term1;
-    bits64 z;
-
-    if ( b <= a0 ) return LIT64( 0xFFFFFFFFFFFFFFFF );
-    b0 = b>>32;
-    z = ( b0<<32 <= a0 ) ? LIT64( 0xFFFFFFFF00000000 ) : ( a0 / b0 )<<32;
-    mul64To128( b, z, &term0, &term1 );
-    sub128( a0, a1, term0, term1, &rem0, &rem1 );
-    while ( ( (sbits64) rem0 ) < 0 ) {
-        z -= LIT64( 0x100000000 );
-        b1 = b<<32;
-        add128( rem0, rem1, b0, b1, &rem0, &rem1 );
-    }
-    rem0 = ( rem0<<32 ) | ( rem1>>32 );
-    z |= ( b0<<32 <= rem0 ) ? 0xFFFFFFFF : rem0 / b0;
-    return z;
-
-}
-
-#if !defined(SOFTFLOAT_FOR_GCC) || defined(FLOATX80) || defined(FLOAT128)
-/*
--------------------------------------------------------------------------------
-Returns an approximation to the square root of the 32-bit significand given
-by `a'.  Considered as an integer, `a' must be at least 2^31.  If bit 0 of
-`aExp' (the least significant bit) is 1, the integer returned approximates
-2^31*sqrt(`a'/2^31), where `a' is considered an integer.  If bit 0 of `aExp'
-is 0, the integer returned approximates 2^31*sqrt(`a'/2^30).  In either
-case, the approximation returned lies strictly within +/-2 of the exact
-value.
--------------------------------------------------------------------------------
-*/
-static bits32 estimateSqrt32( int16 aExp, bits32 a )
-{
-    static const bits16 sqrtOddAdjustments[] = {
-        0x0004, 0x0022, 0x005D, 0x00B1, 0x011D, 0x019F, 0x0236, 0x02E0,
-        0x039C, 0x0468, 0x0545, 0x0631, 0x072B, 0x0832, 0x0946, 0x0A67
-    };
-    static const bits16 sqrtEvenAdjustments[] = {
-        0x0A2D, 0x08AF, 0x075A, 0x0629, 0x051A, 0x0429, 0x0356, 0x029E,
-        0x0200, 0x0179, 0x0109, 0x00AF, 0x0068, 0x0034, 0x0012, 0x0002
-    };
-    int8 idx;
-    bits32 z;
-
-    idx = ( a>>27 ) & 15;
-    if ( aExp & 1 ) {
-        z = 0x4000 + ( a>>17 ) - sqrtOddAdjustments[ idx ];
-        z = ( ( a / z )<<14 ) + ( z<<15 );
-        a >>= 1;
-    }
-    else {
-        z = 0x8000 + ( a>>17 ) - sqrtEvenAdjustments[ idx ];
-        z = a / z + z;
-        z = ( 0x20000 <= z ) ? 0xFFFF8000 : ( z<<15 );
-        if ( z <= a ) return (bits32) ( ( (bits32) a )>>1 );
-    }
-    return ( (bits32) ( ( ( (bits64) a )<<31 ) / z ) ) + ( z>>1 );
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the number of leading 0 bits before the most-significant 1 bit of
-`a'.  If `a' is zero, 32 is returned.
--------------------------------------------------------------------------------
-*/
-static int8 countLeadingZeros32( bits32 a )
-{
-    static const int8 countLeadingZerosHigh[] = {
-        8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
-        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-        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,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    int8 shiftCount;
-
-    shiftCount = 0;
-    if ( a < 0x10000 ) {
-        shiftCount += 16;
-        a <<= 16;
-    }
-    if ( a < 0x1000000 ) {
-        shiftCount += 8;
-        a <<= 8;
-    }
-    shiftCount += countLeadingZerosHigh[ a>>24 ];
-    return shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the number of leading 0 bits before the most-significant 1 bit of
-`a'.  If `a' is zero, 64 is returned.
--------------------------------------------------------------------------------
-*/
-static int8 countLeadingZeros64( bits64 a )
-{
-    int8 shiftCount;
-
-    shiftCount = 0;
-    if ( a < ( (bits64) 1 )<<32 ) {
-        shiftCount += 32;
-    }
-    else {
-        a >>= 32;
-    }
-    shiftCount += (int8)countLeadingZeros32( (bits32)a );
-    return shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 128-bit value formed by concatenating `a0' and `a1'
-is equal to the 128-bit value formed by concatenating `b0' and `b1'.
-Otherwise, returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag eq128( bits64 a0, bits64 a1, bits64 b0, bits64 b1 )
-{
-
-    return ( a0 == b0 ) && ( a1 == b1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 128-bit value formed by concatenating `a0' and `a1' is less
-than or equal to the 128-bit value formed by concatenating `b0' and `b1'.
-Otherwise, returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag le128( bits64 a0, bits64 a1, bits64 b0, bits64 b1 )
-{
-
-    return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 <= b1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 128-bit value formed by concatenating `a0' and `a1' is less
-than the 128-bit value formed by concatenating `b0' and `b1'.  Otherwise,
-returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag lt128( bits64 a0, bits64 a1, bits64 b0, bits64 b1 )
-{
-
-    return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 < b1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 128-bit value formed by concatenating `a0' and `a1' is
-not equal to the 128-bit value formed by concatenating `b0' and `b1'.
-Otherwise, returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag ne128( bits64 a0, bits64 a1, bits64 b0, bits64 b1 )
-{
-
-    return ( a0 != b0 ) || ( a1 != b1 );
-
-}
-
diff --git a/lib/libc/softfloat/bits64/softfloat.c b/lib/libc/softfloat/bits64/softfloat.c
deleted file mode 100644
index aed0c6ab1..000000000
--- a/lib/libc/softfloat/bits64/softfloat.c
+++ /dev/null
@@ -1,5602 +0,0 @@
-/* $NetBSD: softfloat.c,v 1.13 2013/11/22 17:04:24 martin Exp $ */
-
-/*
- * This version hacked for use with gcc -msoft-float by bjh21.
- * (Mostly a case of #ifdefing out things GCC doesn't need or provides
- *  itself).
- */
-
-/*
- * Things you may want to define:
- *
- * SOFTFLOAT_FOR_GCC - build only those functions necessary for GCC (with
- *   -msoft-float) to work.  Include "softfloat-for-gcc.h" to get them
- *   properly renamed.
- */
-
-/*
-===============================================================================
-
-This C source file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: softfloat.c,v 1.13 2013/11/22 17:04:24 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-
-#include "milieu.h"
-#include "softfloat.h"
-
-/*
- * Conversions between floats as stored in memory and floats as
- * SoftFloat uses them
- */
-#ifndef FLOAT64_DEMANGLE
-#define FLOAT64_DEMANGLE(a)	(a)
-#endif
-#ifndef FLOAT64_MANGLE
-#define FLOAT64_MANGLE(a)	(a)
-#endif
-
-/*
--------------------------------------------------------------------------------
-Floating-point rounding mode, extended double-precision rounding precision,
-and exception flags.
--------------------------------------------------------------------------------
-*/
-#ifndef set_float_rounding_mode
-fp_rnd float_rounding_mode = float_round_nearest_even;
-fp_except float_exception_flags = 0;
-#endif
-#ifndef set_float_exception_inexact_flag
-#define	set_float_exception_inexact_flag() \
-	((void)(float_exception_flags |= float_flag_inexact))
-#endif
-#ifdef FLOATX80
-int8 floatx80_rounding_precision = 80;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Primitive arithmetic functions, including multi-word arithmetic, and
-division and square root approximations.  (Can be specialized to target if
-desired.)
--------------------------------------------------------------------------------
-*/
-#include "softfloat-macros"
-
-/*
--------------------------------------------------------------------------------
-Functions and definitions to determine:  (1) whether tininess for underflow
-is detected before or after rounding by default, (2) what (if anything)
-happens when exceptions are raised, (3) how signaling NaNs are distinguished
-from quiet NaNs, (4) the default generated quiet NaNs, and (5) how NaNs
-are propagated from function inputs to output.  These details are target-
-specific.
--------------------------------------------------------------------------------
-*/
-#include "softfloat-specialize"
-
-#if !defined(SOFTFLOAT_FOR_GCC) || defined(FLOATX80) || defined(FLOAT128)
-/*
--------------------------------------------------------------------------------
-Takes a 64-bit fixed-point value `absZ' with binary point between bits 6
-and 7, and returns the properly rounded 32-bit integer corresponding to the
-input.  If `zSign' is 1, the input is negated before being converted to an
-integer.  Bit 63 of `absZ' must be zero.  Ordinarily, the fixed-point input
-is simply rounded to an integer, with the inexact exception raised if the
-input cannot be represented exactly as an integer.  However, if the fixed-
-point input is too large, the invalid exception is raised and the largest
-positive or negative integer is returned.
--------------------------------------------------------------------------------
-*/
-static int32 roundAndPackInt32( flag zSign, bits64 absZ )
-{
-    int8 roundingMode;
-    flag roundNearestEven;
-    int8 roundIncrement, roundBits;
-    int32 z;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    roundIncrement = 0x40;
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            roundIncrement = 0;
-        }
-        else {
-            roundIncrement = 0x7F;
-            if ( zSign ) {
-                if ( roundingMode == float_round_up ) roundIncrement = 0;
-            }
-            else {
-                if ( roundingMode == float_round_down ) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = (int8)(absZ & 0x7F);
-    absZ = ( absZ + roundIncrement )>>7;
-    absZ &= ~ ( ( ( roundBits ^ 0x40 ) == 0 ) & roundNearestEven );
-    z = (int32)absZ;
-    if ( zSign ) z = - z;
-    if ( ( absZ>>32 ) || ( z && ( ( z < 0 ) ^ zSign ) ) ) {
-        float_raise( float_flag_invalid );
-        return zSign ? (sbits32) 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( roundBits ) set_float_exception_inexact_flag();
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes the 128-bit fixed-point value formed by concatenating `absZ0' and
-`absZ1', with binary point between bits 63 and 64 (between the input words),
-and returns the properly rounded 64-bit integer corresponding to the input.
-If `zSign' is 1, the input is negated before being converted to an integer.
-Ordinarily, the fixed-point input is simply rounded to an integer, with
-the inexact exception raised if the input cannot be represented exactly as
-an integer.  However, if the fixed-point input is too large, the invalid
-exception is raised and the largest positive or negative integer is
-returned.
--------------------------------------------------------------------------------
-*/
-static int64 roundAndPackInt64( flag zSign, bits64 absZ0, bits64 absZ1 )
-{
-    int8 roundingMode;
-    flag roundNearestEven, increment;
-    int64 z;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    increment = ( (sbits64) absZ1 < 0 );
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            increment = 0;
-        }
-        else {
-            if ( zSign ) {
-                increment = ( roundingMode == float_round_down ) && absZ1;
-            }
-            else {
-                increment = ( roundingMode == float_round_up ) && absZ1;
-            }
-        }
-    }
-    if ( increment ) {
-        ++absZ0;
-        if ( absZ0 == 0 ) goto overflow;
-        absZ0 &= ~ ( ( (bits64) ( absZ1<<1 ) == 0 ) & roundNearestEven );
-    }
-    z = absZ0;
-    if ( zSign ) z = - z;
-    if ( z && ( ( z < 0 ) ^ zSign ) ) {
- overflow:
-        float_raise( float_flag_invalid );
-        return
-              zSign ? (sbits64) LIT64( 0x8000000000000000 )
-            : LIT64( 0x7FFFFFFFFFFFFFFF );
-    }
-    if ( absZ1 ) set_float_exception_inexact_flag();
-    return z;
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the fraction bits of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits32 extractFloat32Frac( float32 a )
-{
-
-    return a & 0x007FFFFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE int16 extractFloat32Exp( float32 a )
-{
-
-    return ( a>>23 ) & 0xFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloat32Sign( float32 a )
-{
-
-    return a>>31;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal single-precision floating-point value represented
-by the denormalized significand `aSig'.  The normalized exponent and
-significand are stored at the locations pointed to by `zExpPtr' and
-`zSigPtr', respectively.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloat32Subnormal( bits32 aSig, int16 *zExpPtr, bits32 *zSigPtr )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros32( aSig ) - 8;
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', exponent `zExp', and significand `zSig' into a
-single-precision floating-point value, returning the result.  After being
-shifted into the proper positions, the three fields are simply added
-together to form the result.  This means that any integer portion of `zSig'
-will be added into the exponent.  Since a properly normalized significand
-will have an integer portion equal to 1, the `zExp' input should be 1 less
-than the desired result exponent whenever `zSig' is a complete, normalized
-significand.
--------------------------------------------------------------------------------
-*/
-INLINE float32 packFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-
-    return ( ( (bits32) zSign )<<31 ) + ( ( (bits32) zExp )<<23 ) + zSig;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper single-precision floating-
-point value corresponding to the abstract input.  Ordinarily, the abstract
-value is simply rounded and packed into the single-precision format, with
-the inexact exception raised if the abstract input cannot be represented
-exactly.  However, if the abstract value is too large, the overflow and
-inexact exceptions are raised and an infinity or maximal finite value is
-returned.  If the abstract value is too small, the input value is rounded to
-a subnormal number, and the underflow and inexact exceptions are raised if
-the abstract input cannot be represented exactly as a subnormal single-
-precision floating-point number.
-    The input significand `zSig' has its binary point between bits 30
-and 29, which is 7 bits to the left of the usual location.  This shifted
-significand must be normalized or smaller.  If `zSig' is not normalized,
-`zExp' must be 0; in that case, the result returned is a subnormal number,
-and it must not require rounding.  In the usual case that `zSig' is
-normalized, `zExp' must be 1 less than the ``true'' floating-point exponent.
-The handling of underflow and overflow follows the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 roundAndPackFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-    int8 roundingMode;
-    flag roundNearestEven;
-    int8 roundIncrement, roundBits;
-    flag isTiny;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    roundIncrement = 0x40;
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            roundIncrement = 0;
-        }
-        else {
-            roundIncrement = 0x7F;
-            if ( zSign ) {
-                if ( roundingMode == float_round_up ) roundIncrement = 0;
-            }
-            else {
-                if ( roundingMode == float_round_down ) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = zSig & 0x7F;
-    if ( 0xFD <= (bits16) zExp ) {
-        if (    ( 0xFD < zExp )
-             || (    ( zExp == 0xFD )
-                  && ( (sbits32) ( zSig + roundIncrement ) < 0 ) )
-           ) {
-            float_raise( float_flag_overflow | float_flag_inexact );
-            return packFloat32( zSign, 0xFF, 0 ) - ( roundIncrement == 0 );
-        }
-        if ( zExp < 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < -1 )
-                || ( zSig + roundIncrement < 0x80000000U );
-            shift32RightJamming( zSig, - zExp, &zSig );
-            zExp = 0;
-            roundBits = zSig & 0x7F;
-            if ( isTiny && roundBits ) float_raise( float_flag_underflow );
-        }
-    }
-    if ( roundBits ) set_float_exception_inexact_flag();
-    zSig = ( zSig + roundIncrement )>>7;
-    zSig &= ~ ( ( ( roundBits ^ 0x40 ) == 0 ) & roundNearestEven );
-    if ( zSig == 0 ) zExp = 0;
-    return packFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper single-precision floating-
-point value corresponding to the abstract input.  This routine is just like
-`roundAndPackFloat32' except that `zSig' does not have to be normalized.
-Bit 31 of `zSig' must be zero, and `zExp' must be 1 less than the ``true''
-floating-point exponent.
--------------------------------------------------------------------------------
-*/
-static float32
- normalizeRoundAndPackFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros32( zSig ) - 1;
-    return roundAndPackFloat32( zSign, zExp - shiftCount, zSig<<shiftCount );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the fraction bits of the double-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits64 extractFloat64Frac( float64 a )
-{
-
-    return FLOAT64_DEMANGLE(a) & LIT64( 0x000FFFFFFFFFFFFF );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the double-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE int16 extractFloat64Exp( float64 a )
-{
-
-    return (int16)((FLOAT64_DEMANGLE(a) >> 52) & 0x7FF);
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the double-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloat64Sign( float64 a )
-{
-
-    return (flag)(FLOAT64_DEMANGLE(a) >> 63);
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal double-precision floating-point value represented
-by the denormalized significand `aSig'.  The normalized exponent and
-significand are stored at the locations pointed to by `zExpPtr' and
-`zSigPtr', respectively.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloat64Subnormal( bits64 aSig, int16 *zExpPtr, bits64 *zSigPtr )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros64( aSig ) - 11;
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', exponent `zExp', and significand `zSig' into a
-double-precision floating-point value, returning the result.  After being
-shifted into the proper positions, the three fields are simply added
-together to form the result.  This means that any integer portion of `zSig'
-will be added into the exponent.  Since a properly normalized significand
-will have an integer portion equal to 1, the `zExp' input should be 1 less
-than the desired result exponent whenever `zSig' is a complete, normalized
-significand.
--------------------------------------------------------------------------------
-*/
-INLINE float64 packFloat64( flag zSign, int16 zExp, bits64 zSig )
-{
-
-    return FLOAT64_MANGLE( ( ( (bits64) zSign )<<63 ) +
-			   ( ( (bits64) zExp )<<52 ) + zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper double-precision floating-
-point value corresponding to the abstract input.  Ordinarily, the abstract
-value is simply rounded and packed into the double-precision format, with
-the inexact exception raised if the abstract input cannot be represented
-exactly.  However, if the abstract value is too large, the overflow and
-inexact exceptions are raised and an infinity or maximal finite value is
-returned.  If the abstract value is too small, the input value is rounded to
-a subnormal number, and the underflow and inexact exceptions are raised if
-the abstract input cannot be represented exactly as a subnormal double-
-precision floating-point number.
-    The input significand `zSig' has its binary point between bits 62
-and 61, which is 10 bits to the left of the usual location.  This shifted
-significand must be normalized or smaller.  If `zSig' is not normalized,
-`zExp' must be 0; in that case, the result returned is a subnormal number,
-and it must not require rounding.  In the usual case that `zSig' is
-normalized, `zExp' must be 1 less than the ``true'' floating-point exponent.
-The handling of underflow and overflow follows the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64 roundAndPackFloat64( flag zSign, int16 zExp, bits64 zSig )
-{
-    int8 roundingMode;
-    flag roundNearestEven;
-    int16 roundIncrement, roundBits;
-    flag isTiny;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    roundIncrement = 0x200;
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            roundIncrement = 0;
-        }
-        else {
-            roundIncrement = 0x3FF;
-            if ( zSign ) {
-                if ( roundingMode == float_round_up ) roundIncrement = 0;
-            }
-            else {
-                if ( roundingMode == float_round_down ) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = (int16)(zSig & 0x3FF);
-    if ( 0x7FD <= (bits16) zExp ) {
-        if (    ( 0x7FD < zExp )
-             || (    ( zExp == 0x7FD )
-                  && ( (sbits64) ( zSig + roundIncrement ) < 0 ) )
-           ) {
-            float_raise( float_flag_overflow | float_flag_inexact );
-            return FLOAT64_MANGLE(
-		FLOAT64_DEMANGLE(packFloat64( zSign, 0x7FF, 0 )) -
-		( roundIncrement == 0 ));
-        }
-        if ( zExp < 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < -1 )
-                || ( zSig + roundIncrement < (bits64)LIT64( 0x8000000000000000 ) );
-            shift64RightJamming( zSig, - zExp, &zSig );
-            zExp = 0;
-            roundBits = (int16)(zSig & 0x3FF);
-            if ( isTiny && roundBits ) float_raise( float_flag_underflow );
-        }
-    }
-    if ( roundBits ) set_float_exception_inexact_flag();
-    zSig = ( zSig + roundIncrement )>>10;
-    zSig &= ~ ( ( ( roundBits ^ 0x200 ) == 0 ) & roundNearestEven );
-    if ( zSig == 0 ) zExp = 0;
-    return packFloat64( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper double-precision floating-
-point value corresponding to the abstract input.  This routine is just like
-`roundAndPackFloat64' except that `zSig' does not have to be normalized.
-Bit 63 of `zSig' must be zero, and `zExp' must be 1 less than the ``true''
-floating-point exponent.
--------------------------------------------------------------------------------
-*/
-static float64
- normalizeRoundAndPackFloat64( flag zSign, int16 zExp, bits64 zSig )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros64( zSig ) - 1;
-    return roundAndPackFloat64( zSign, zExp - shiftCount, zSig<<shiftCount );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the fraction bits of the extended double-precision floating-point
-value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits64 extractFloatx80Frac( floatx80 a )
-{
-
-    return a.low;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the extended double-precision floating-point
-value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE int32 extractFloatx80Exp( floatx80 a )
-{
-
-    return a.high & 0x7FFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the extended double-precision floating-point value
-`a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloatx80Sign( floatx80 a )
-{
-
-    return a.high>>15;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal extended double-precision floating-point value
-represented by the denormalized significand `aSig'.  The normalized exponent
-and significand are stored at the locations pointed to by `zExpPtr' and
-`zSigPtr', respectively.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloatx80Subnormal( bits64 aSig, int32 *zExpPtr, bits64 *zSigPtr )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros64( aSig );
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', exponent `zExp', and significand `zSig' into an
-extended double-precision floating-point value, returning the result.
--------------------------------------------------------------------------------
-*/
-INLINE floatx80 packFloatx80( flag zSign, int32 zExp, bits64 zSig )
-{
-    floatx80 z;
-
-    z.low = zSig;
-    z.high = ( ( (bits16) zSign )<<15 ) + zExp;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and extended significand formed by the concatenation of `zSig0' and `zSig1',
-and returns the proper extended double-precision floating-point value
-corresponding to the abstract input.  Ordinarily, the abstract value is
-rounded and packed into the extended double-precision format, with the
-inexact exception raised if the abstract input cannot be represented
-exactly.  However, if the abstract value is too large, the overflow and
-inexact exceptions are raised and an infinity or maximal finite value is
-returned.  If the abstract value is too small, the input value is rounded to
-a subnormal number, and the underflow and inexact exceptions are raised if
-the abstract input cannot be represented exactly as a subnormal extended
-double-precision floating-point number.
-    If `roundingPrecision' is 32 or 64, the result is rounded to the same
-number of bits as single or double precision, respectively.  Otherwise, the
-result is rounded to the full precision of the extended double-precision
-format.
-    The input significand must be normalized or smaller.  If the input
-significand is not normalized, `zExp' must be 0; in that case, the result
-returned is a subnormal number, and it must not require rounding.  The
-handling of underflow and overflow follows the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static floatx80
- roundAndPackFloatx80(
-     int8 roundingPrecision, flag zSign, int32 zExp, bits64 zSig0, bits64 zSig1
- )
-{
-    int8 roundingMode;
-    flag roundNearestEven, increment, isTiny;
-    int64 roundIncrement, roundMask, roundBits;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    if ( roundingPrecision == 80 ) goto precision80;
-    if ( roundingPrecision == 64 ) {
-        roundIncrement = LIT64( 0x0000000000000400 );
-        roundMask = LIT64( 0x00000000000007FF );
-    }
-    else if ( roundingPrecision == 32 ) {
-        roundIncrement = LIT64( 0x0000008000000000 );
-        roundMask = LIT64( 0x000000FFFFFFFFFF );
-    }
-    else {
-        goto precision80;
-    }
-    zSig0 |= ( zSig1 != 0 );
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            roundIncrement = 0;
-        }
-        else {
-            roundIncrement = roundMask;
-            if ( zSign ) {
-                if ( roundingMode == float_round_up ) roundIncrement = 0;
-            }
-            else {
-                if ( roundingMode == float_round_down ) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = zSig0 & roundMask;
-    if ( 0x7FFD <= (bits32) ( zExp - 1 ) ) {
-        if (    ( 0x7FFE < zExp )
-             || ( ( zExp == 0x7FFE ) && ( zSig0 + roundIncrement < zSig0 ) )
-           ) {
-            goto overflow;
-        }
-        if ( zExp <= 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < 0 )
-                || ( zSig0 <= zSig0 + roundIncrement );
-            shift64RightJamming( zSig0, 1 - zExp, &zSig0 );
-            zExp = 0;
-            roundBits = zSig0 & roundMask;
-            if ( isTiny && roundBits ) float_raise( float_flag_underflow );
-            if ( roundBits ) set_float_exception_inexact_flag();
-            zSig0 += roundIncrement;
-            if ( (sbits64) zSig0 < 0 ) zExp = 1;
-            roundIncrement = roundMask + 1;
-            if ( roundNearestEven && ( roundBits<<1 == roundIncrement ) ) {
-                roundMask |= roundIncrement;
-            }
-            zSig0 &= ~ roundMask;
-            return packFloatx80( zSign, zExp, zSig0 );
-        }
-    }
-    if ( roundBits ) set_float_exception_inexact_flag();
-    zSig0 += roundIncrement;
-    if ( zSig0 < roundIncrement ) {
-        ++zExp;
-        zSig0 = LIT64( 0x8000000000000000 );
-    }
-    roundIncrement = roundMask + 1;
-    if ( roundNearestEven && ( roundBits<<1 == roundIncrement ) ) {
-        roundMask |= roundIncrement;
-    }
-    zSig0 &= ~ roundMask;
-    if ( zSig0 == 0 ) zExp = 0;
-    return packFloatx80( zSign, zExp, zSig0 );
- precision80:
-    increment = ( (sbits64) zSig1 < 0 );
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            increment = 0;
-        }
-        else {
-            if ( zSign ) {
-                increment = ( roundingMode == float_round_down ) && zSig1;
-            }
-            else {
-                increment = ( roundingMode == float_round_up ) && zSig1;
-            }
-        }
-    }
-    if ( 0x7FFD <= (bits32) ( zExp - 1 ) ) {
-        if (    ( 0x7FFE < zExp )
-             || (    ( zExp == 0x7FFE )
-                  && ( zSig0 == LIT64( 0xFFFFFFFFFFFFFFFF ) )
-                  && increment
-                )
-           ) {
-            roundMask = 0;
- overflow:
-            float_raise( float_flag_overflow | float_flag_inexact );
-            if (    ( roundingMode == float_round_to_zero )
-                 || ( zSign && ( roundingMode == float_round_up ) )
-                 || ( ! zSign && ( roundingMode == float_round_down ) )
-               ) {
-                return packFloatx80( zSign, 0x7FFE, ~ roundMask );
-            }
-            return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-        }
-        if ( zExp <= 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < 0 )
-                || ! increment
-                || ( zSig0 < LIT64( 0xFFFFFFFFFFFFFFFF ) );
-            shift64ExtraRightJamming( zSig0, zSig1, 1 - zExp, &zSig0, &zSig1 );
-            zExp = 0;
-            if ( isTiny && zSig1 ) float_raise( float_flag_underflow );
-            if ( zSig1 ) set_float_exception_inexact_flag();
-            if ( roundNearestEven ) {
-                increment = ( (sbits64) zSig1 < 0 );
-            }
-            else {
-                if ( zSign ) {
-                    increment = ( roundingMode == float_round_down ) && zSig1;
-                }
-                else {
-                    increment = ( roundingMode == float_round_up ) && zSig1;
-                }
-            }
-            if ( increment ) {
-                ++zSig0;
-                zSig0 &=
-                    ~ ( ( (bits64) ( zSig1<<1 ) == 0 ) & roundNearestEven );
-                if ( (sbits64) zSig0 < 0 ) zExp = 1;
-            }
-            return packFloatx80( zSign, zExp, zSig0 );
-        }
-    }
-    if ( zSig1 ) set_float_exception_inexact_flag();
-    if ( increment ) {
-        ++zSig0;
-        if ( zSig0 == 0 ) {
-            ++zExp;
-            zSig0 = LIT64( 0x8000000000000000 );
-        }
-        else {
-            zSig0 &= ~ ( ( (bits64) ( zSig1<<1 ) == 0 ) & roundNearestEven );
-        }
-    }
-    else {
-        if ( zSig0 == 0 ) zExp = 0;
-    }
-    return packFloatx80( zSign, zExp, zSig0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent
-`zExp', and significand formed by the concatenation of `zSig0' and `zSig1',
-and returns the proper extended double-precision floating-point value
-corresponding to the abstract input.  This routine is just like
-`roundAndPackFloatx80' except that the input significand does not have to be
-normalized.
--------------------------------------------------------------------------------
-*/
-static floatx80
- normalizeRoundAndPackFloatx80(
-     int8 roundingPrecision, flag zSign, int32 zExp, bits64 zSig0, bits64 zSig1
- )
-{
-    int8 shiftCount;
-
-    if ( zSig0 == 0 ) {
-        zSig0 = zSig1;
-        zSig1 = 0;
-        zExp -= 64;
-    }
-    shiftCount = countLeadingZeros64( zSig0 );
-    shortShift128Left( zSig0, zSig1, shiftCount, &zSig0, &zSig1 );
-    zExp -= shiftCount;
-    return
-        roundAndPackFloatx80( roundingPrecision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Returns the least-significant 64 fraction bits of the quadruple-precision
-floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits64 extractFloat128Frac1( float128 a )
-{
-
-    return a.low;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the most-significant 48 fraction bits of the quadruple-precision
-floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits64 extractFloat128Frac0( float128 a )
-{
-
-    return a.high & LIT64( 0x0000FFFFFFFFFFFF );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the quadruple-precision floating-point value
-`a'.
--------------------------------------------------------------------------------
-*/
-INLINE int32 extractFloat128Exp( float128 a )
-{
-
-    return (int32)((a.high >> 48) & 0x7FFF);
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the quadruple-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloat128Sign( float128 a )
-{
-
-    return (flag)(a.high >> 63);
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal quadruple-precision floating-point value
-represented by the denormalized significand formed by the concatenation of
-`aSig0' and `aSig1'.  The normalized exponent is stored at the location
-pointed to by `zExpPtr'.  The most significant 49 bits of the normalized
-significand are stored at the location pointed to by `zSig0Ptr', and the
-least significant 64 bits of the normalized significand are stored at the
-location pointed to by `zSig1Ptr'.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloat128Subnormal(
-     bits64 aSig0,
-     bits64 aSig1,
-     int32 *zExpPtr,
-     bits64 *zSig0Ptr,
-     bits64 *zSig1Ptr
- )
-{
-    int8 shiftCount;
-
-    if ( aSig0 == 0 ) {
-        shiftCount = countLeadingZeros64( aSig1 ) - 15;
-        if ( shiftCount < 0 ) {
-            *zSig0Ptr = aSig1>>( - shiftCount );
-            *zSig1Ptr = aSig1<<( shiftCount & 63 );
-        }
-        else {
-            *zSig0Ptr = aSig1<<shiftCount;
-            *zSig1Ptr = 0;
-        }
-        *zExpPtr = - shiftCount - 63;
-    }
-    else {
-        shiftCount = countLeadingZeros64( aSig0 ) - 15;
-        shortShift128Left( aSig0, aSig1, shiftCount, zSig0Ptr, zSig1Ptr );
-        *zExpPtr = 1 - shiftCount;
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', the exponent `zExp', and the significand formed
-by the concatenation of `zSig0' and `zSig1' into a quadruple-precision
-floating-point value, returning the result.  After being shifted into the
-proper positions, the three fields `zSign', `zExp', and `zSig0' are simply
-added together to form the most significant 32 bits of the result.  This
-means that any integer portion of `zSig0' will be added into the exponent.
-Since a properly normalized significand will have an integer portion equal
-to 1, the `zExp' input should be 1 less than the desired result exponent
-whenever `zSig0' and `zSig1' concatenated form a complete, normalized
-significand.
--------------------------------------------------------------------------------
-*/
-INLINE float128
- packFloat128( flag zSign, int32 zExp, bits64 zSig0, bits64 zSig1 )
-{
-    float128 z;
-
-    z.low = zSig1;
-    z.high = ( ( (bits64) zSign )<<63 ) + ( ( (bits64) zExp )<<48 ) + zSig0;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and extended significand formed by the concatenation of `zSig0', `zSig1',
-and `zSig2', and returns the proper quadruple-precision floating-point value
-corresponding to the abstract input.  Ordinarily, the abstract value is
-simply rounded and packed into the quadruple-precision format, with the
-inexact exception raised if the abstract input cannot be represented
-exactly.  However, if the abstract value is too large, the overflow and
-inexact exceptions are raised and an infinity or maximal finite value is
-returned.  If the abstract value is too small, the input value is rounded to
-a subnormal number, and the underflow and inexact exceptions are raised if
-the abstract input cannot be represented exactly as a subnormal quadruple-
-precision floating-point number.
-    The input significand must be normalized or smaller.  If the input
-significand is not normalized, `zExp' must be 0; in that case, the result
-returned is a subnormal number, and it must not require rounding.  In the
-usual case that the input significand is normalized, `zExp' must be 1 less
-than the ``true'' floating-point exponent.  The handling of underflow and
-overflow follows the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float128
- roundAndPackFloat128(
-     flag zSign, int32 zExp, bits64 zSig0, bits64 zSig1, bits64 zSig2 )
-{
-    int8 roundingMode;
-    flag roundNearestEven, increment, isTiny;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    increment = ( (sbits64) zSig2 < 0 );
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            increment = 0;
-        }
-        else {
-            if ( zSign ) {
-                increment = ( roundingMode == float_round_down ) && zSig2;
-            }
-            else {
-                increment = ( roundingMode == float_round_up ) && zSig2;
-            }
-        }
-    }
-    if ( 0x7FFD <= (bits32) zExp ) {
-        if (    ( 0x7FFD < zExp )
-             || (    ( zExp == 0x7FFD )
-                  && eq128(
-                         LIT64( 0x0001FFFFFFFFFFFF ),
-                         LIT64( 0xFFFFFFFFFFFFFFFF ),
-                         zSig0,
-                         zSig1
-                     )
-                  && increment
-                )
-           ) {
-            float_raise( float_flag_overflow | float_flag_inexact );
-            if (    ( roundingMode == float_round_to_zero )
-                 || ( zSign && ( roundingMode == float_round_up ) )
-                 || ( ! zSign && ( roundingMode == float_round_down ) )
-               ) {
-                return
-                    packFloat128(
-                        zSign,
-                        0x7FFE,
-                        LIT64( 0x0000FFFFFFFFFFFF ),
-                        LIT64( 0xFFFFFFFFFFFFFFFF )
-                    );
-            }
-            return packFloat128( zSign, 0x7FFF, 0, 0 );
-        }
-        if ( zExp < 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < -1 )
-                || ! increment
-                || lt128(
-                       zSig0,
-                       zSig1,
-                       LIT64( 0x0001FFFFFFFFFFFF ),
-                       LIT64( 0xFFFFFFFFFFFFFFFF )
-                   );
-            shift128ExtraRightJamming(
-                zSig0, zSig1, zSig2, - zExp, &zSig0, &zSig1, &zSig2 );
-            zExp = 0;
-            if ( isTiny && zSig2 ) float_raise( float_flag_underflow );
-            if ( roundNearestEven ) {
-                increment = ( (sbits64) zSig2 < 0 );
-            }
-            else {
-                if ( zSign ) {
-                    increment = ( roundingMode == float_round_down ) && zSig2;
-                }
-                else {
-                    increment = ( roundingMode == float_round_up ) && zSig2;
-                }
-            }
-        }
-    }
-    if ( zSig2 ) set_float_exception_inexact_flag();
-    if ( increment ) {
-        add128( zSig0, zSig1, 0, 1, &zSig0, &zSig1 );
-        zSig1 &= ~ ( ( zSig2 + zSig2 == 0 ) & roundNearestEven );
-    }
-    else {
-        if ( ( zSig0 | zSig1 ) == 0 ) zExp = 0;
-    }
-    return packFloat128( zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand formed by the concatenation of `zSig0' and `zSig1', and
-returns the proper quadruple-precision floating-point value corresponding
-to the abstract input.  This routine is just like `roundAndPackFloat128'
-except that the input significand has fewer bits and does not have to be
-normalized.  In all cases, `zExp' must be 1 less than the ``true'' floating-
-point exponent.
--------------------------------------------------------------------------------
-*/
-static float128
- normalizeRoundAndPackFloat128(
-     flag zSign, int32 zExp, bits64 zSig0, bits64 zSig1 )
-{
-    int8 shiftCount;
-    bits64 zSig2;
-
-    if ( zSig0 == 0 ) {
-        zSig0 = zSig1;
-        zSig1 = 0;
-        zExp -= 64;
-    }
-    shiftCount = countLeadingZeros64( zSig0 ) - 15;
-    if ( 0 <= shiftCount ) {
-        zSig2 = 0;
-        shortShift128Left( zSig0, zSig1, shiftCount, &zSig0, &zSig1 );
-    }
-    else {
-        shift128ExtraRightJamming(
-            zSig0, zSig1, 0, - shiftCount, &zSig0, &zSig1, &zSig2 );
-    }
-    zExp -= shiftCount;
-    return roundAndPackFloat128( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a'
-to the single-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int32 a )
-{
-    flag zSign;
-
-    if ( a == 0 ) return 0;
-    if ( a == (sbits32) 0x80000000 ) return packFloat32( 1, 0x9E, 0 );
-    zSign = ( a < 0 );
-    return normalizeRoundAndPackFloat32(zSign, 0x9C, (uint32)(zSign ? - a : a));
-
-}
-
-float32 uint32_to_float32( uint32 a )
-{
-    if ( a == 0 ) return 0;
-    if ( a & (bits32) 0x80000000 )
-	return normalizeRoundAndPackFloat32( 0, 0x9D, a >> 1 );
-    return normalizeRoundAndPackFloat32( 0, 0x9C, a );
-}
-
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a'
-to the double-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 int32_to_float64( int32 a )
-{
-    flag zSign;
-    uint32 absA;
-    int8 shiftCount;
-    bits64 zSig;
-
-    if ( a == 0 ) return 0;
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros32( absA ) + 21;
-    zSig = absA;
-    return packFloat64( zSign, 0x432 - shiftCount, zSig<<shiftCount );
-
-}
-
-float64 uint32_to_float64( uint32 a )
-{
-    int8 shiftCount;
-    bits64 zSig = a;
-
-    if ( a == 0 ) return 0;
-    shiftCount = countLeadingZeros32( a ) + 21;
-    return packFloat64( 0, 0x432 - shiftCount, zSig<<shiftCount );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a'
-to the extended double-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 int32_to_floatx80( int32 a )
-{
-    flag zSign;
-    uint32 absA;
-    int8 shiftCount;
-    bits64 zSig;
-
-    if ( a == 0 ) return packFloatx80( 0, 0, 0 );
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros32( absA ) + 32;
-    zSig = absA;
-    return packFloatx80( zSign, 0x403E - shiftCount, zSig<<shiftCount );
-
-}
-
-floatx80 uint32_to_floatx80( uint32 a )
-{
-    int8 shiftCount;
-    bits64 zSig = a;
-
-    if ( a == 0 ) return packFloatx80( 0, 0, 0 );
-    shiftCount = countLeadingZeros32( a ) + 32;
-    return packFloatx80( 0, 0x403E - shiftCount, zSig<<shiftCount );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a' to
-the quadruple-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 int32_to_float128( int32 a )
-{
-    flag zSign;
-    uint32 absA;
-    int8 shiftCount;
-    bits64 zSig0;
-
-    if ( a == 0 ) return packFloat128( 0, 0, 0, 0 );
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros32( absA ) + 17;
-    zSig0 = absA;
-    return packFloat128( zSign, 0x402E - shiftCount, zSig0<<shiftCount, 0 );
-
-}
-
-float128 uint32_to_float128( uint32 a )
-{
-    int8 shiftCount;
-    bits64 zSig0 = a;
-
-    if ( a == 0 ) return packFloat128( 0, 0, 0, 0 );
-    shiftCount = countLeadingZeros32( a ) + 17;
-    return packFloat128( 0, 0x402E - shiftCount, zSig0<<shiftCount, 0 );
-
-}
-
-#endif
-
-#ifndef SOFTFLOAT_FOR_GCC /* __floatdi?f is in libgcc2.c */
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 64-bit two's complement integer `a'
-to the single-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 int64_to_float32( int64 a )
-{
-    flag zSign;
-    uint64 absA;
-    int8 shiftCount;
-
-    if ( a == 0 ) return 0;
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros64( absA ) - 40;
-    if ( 0 <= shiftCount ) {
-        return packFloat32( zSign, 0x95 - shiftCount, absA<<shiftCount );
-    }
-    else {
-        shiftCount += 7;
-        if ( shiftCount < 0 ) {
-            shift64RightJamming( absA, - shiftCount, &absA );
-        }
-        else {
-            absA <<= shiftCount;
-        }
-        return roundAndPackFloat32( zSign, 0x9C - shiftCount, absA );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 64-bit two's complement integer `a'
-to the double-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 int64_to_float64( int64 a )
-{
-    flag zSign;
-
-    if ( a == 0 ) return 0;
-    if ( a == (sbits64) LIT64( 0x8000000000000000 ) ) {
-        return packFloat64( 1, 0x43E, 0 );
-    }
-    zSign = ( a < 0 );
-    return normalizeRoundAndPackFloat64( zSign, 0x43C, zSign ? - a : a );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 64-bit two's complement integer `a'
-to the extended double-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 int64_to_floatx80( int64 a )
-{
-    flag zSign;
-    uint64 absA;
-    int8 shiftCount;
-
-    if ( a == 0 ) return packFloatx80( 0, 0, 0 );
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros64( absA );
-    return packFloatx80( zSign, 0x403E - shiftCount, absA<<shiftCount );
-
-}
-
-#endif
-
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 64-bit two's complement integer `a' to
-the quadruple-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 int64_to_float128( int64 a )
-{
-    flag zSign;
-    uint64 absA;
-    int8 shiftCount;
-    int32 zExp;
-    bits64 zSig0, zSig1;
-
-    if ( a == 0 ) return packFloat128( 0, 0, 0, 0 );
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros64( absA ) + 49;
-    zExp = 0x406E - shiftCount;
-    if ( 64 <= shiftCount ) {
-        zSig1 = 0;
-        zSig0 = absA;
-        shiftCount -= 64;
-    }
-    else {
-        zSig1 = absA;
-        zSig0 = 0;
-    }
-    shortShift128Left( zSig0, zSig1, shiftCount, &zSig0, &zSig1 );
-    return packFloat128( zSign, zExp, zSig0, zSig1 );
-
-}
-
-#endif
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 float32_to_int32( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig;
-    bits64 aSig64;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( ( aExp == 0xFF ) && aSig ) aSign = 0;
-    if ( aExp ) aSig |= 0x00800000;
-    shiftCount = 0xAF - aExp;
-    aSig64 = aSig;
-    aSig64 <<= 32;
-    if ( 0 < shiftCount ) shift64RightJamming( aSig64, shiftCount, &aSig64 );
-    return roundAndPackInt32( aSign, aSig64 );
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.
-If `a' is a NaN, the largest positive integer is returned.  Otherwise, if
-the conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int32 float32_to_int32_round_to_zero( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig;
-    int32 z;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    shiftCount = aExp - 0x9E;
-    if ( 0 <= shiftCount ) {
-        if ( a != 0xCF000000 ) {
-            float_raise( float_flag_invalid );
-            if ( ! aSign || ( ( aExp == 0xFF ) && aSig ) ) return 0x7FFFFFFF;
-        }
-        return (sbits32) 0x80000000;
-    }
-    else if ( aExp <= 0x7E ) {
-        if ( aExp | aSig ) set_float_exception_inexact_flag();
-        return 0;
-    }
-    aSig = ( aSig | 0x00800000 )<<8;
-    z = aSig>>( - shiftCount );
-    if ( (bits32) ( aSig<<( shiftCount & 31 ) ) ) {
-        set_float_exception_inexact_flag();
-    }
-    if ( aSign ) z = - z;
-    return z;
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC /* __fix?fdi provided by libgcc2.c */
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 64-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int64 float32_to_int64( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig;
-    bits64 aSig64, aSigExtra;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    shiftCount = 0xBE - aExp;
-    if ( shiftCount < 0 ) {
-        float_raise( float_flag_invalid );
-        if ( ! aSign || ( ( aExp == 0xFF ) && aSig ) ) {
-            return LIT64( 0x7FFFFFFFFFFFFFFF );
-        }
-        return (sbits64) LIT64( 0x8000000000000000 );
-    }
-    if ( aExp ) aSig |= 0x00800000;
-    aSig64 = aSig;
-    aSig64 <<= 40;
-    shift64ExtraRightJamming( aSig64, 0, shiftCount, &aSig64, &aSigExtra );
-    return roundAndPackInt64( aSign, aSig64, aSigExtra );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 64-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.  If
-`a' is a NaN, the largest positive integer is returned.  Otherwise, if the
-conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int64 float32_to_int64_round_to_zero( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig;
-    bits64 aSig64;
-    int64 z;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    shiftCount = aExp - 0xBE;
-    if ( 0 <= shiftCount ) {
-        if ( a != 0xDF000000 ) {
-            float_raise( float_flag_invalid );
-            if ( ! aSign || ( ( aExp == 0xFF ) && aSig ) ) {
-                return LIT64( 0x7FFFFFFFFFFFFFFF );
-            }
-        }
-        return (sbits64) LIT64( 0x8000000000000000 );
-    }
-    else if ( aExp <= 0x7E ) {
-        if ( aExp | aSig ) set_float_exception_inexact_flag();
-        return 0;
-    }
-    aSig64 = aSig | 0x00800000;
-    aSig64 <<= 40;
-    z = aSig64>>( - shiftCount );
-    if ( (bits64) ( aSig64<<( shiftCount & 63 ) ) ) {
-        set_float_exception_inexact_flag();
-    }
-    if ( aSign ) z = - z;
-    return z;
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the double-precision floating-point format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float32_to_float64( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 aSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return commonNaNToFloat64( float32ToCommonNaN( a ) );
-        return packFloat64( aSign, 0x7FF, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat64( aSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-        --aExp;
-    }
-    return packFloat64( aSign, aExp + 0x380, ( (bits64) aSig )<<29 );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the extended double-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 float32_to_floatx80( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 aSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return commonNaNToFloatx80( float32ToCommonNaN( a ) );
-        return packFloatx80( aSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloatx80( aSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    aSig |= 0x00800000;
-    return packFloatx80( aSign, aExp + 0x3F80, ( (bits64) aSig )<<40 );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the double-precision floating-point format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float32_to_float128( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 aSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return commonNaNToFloat128( float32ToCommonNaN( a ) );
-        return packFloat128( aSign, 0x7FFF, 0, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat128( aSign, 0, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-        --aExp;
-    }
-    return packFloat128( aSign, aExp + 0x3F80, ( (bits64) aSig )<<25, 0 );
-
-}
-
-#endif
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Rounds the single-precision floating-point value `a' to an integer, and
-returns the result as a single-precision floating-point value.  The
-operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    float32 z;
-
-    aExp = extractFloat32Exp( a );
-    if ( 0x96 <= aExp ) {
-        if ( ( aExp == 0xFF ) && extractFloat32Frac( a ) ) {
-            return propagateFloat32NaN( a, a );
-        }
-        return a;
-    }
-    if ( aExp <= 0x7E ) {
-        if ( (bits32) ( a<<1 ) == 0 ) return a;
-        set_float_exception_inexact_flag();
-        aSign = extractFloat32Sign( a );
-        switch ( float_rounding_mode ) {
-         case float_round_nearest_even:
-            if ( ( aExp == 0x7E ) && extractFloat32Frac( a ) ) {
-                return packFloat32( aSign, 0x7F, 0 );
-            }
-            break;
-	 case float_round_to_zero:
-	    break;
-         case float_round_down:
-            return aSign ? 0xBF800000 : 0;
-         case float_round_up:
-            return aSign ? 0x80000000 : 0x3F800000;
-        }
-        return packFloat32( aSign, 0, 0 );
-    }
-    lastBitMask = 1;
-    lastBitMask <<= 0x96 - aExp;
-    roundBitsMask = lastBitMask - 1;
-    z = a;
-    roundingMode = float_rounding_mode;
-    if ( roundingMode == float_round_nearest_even ) {
-        z += lastBitMask>>1;
-        if ( ( z & roundBitsMask ) == 0 ) z &= ~ lastBitMask;
-    }
-    else if ( roundingMode != float_round_to_zero ) {
-        if ( extractFloat32Sign( z ) ^ ( roundingMode == float_round_up ) ) {
-            z += roundBitsMask;
-        }
-    }
-    z &= ~ roundBitsMask;
-    if ( z != a ) set_float_exception_inexact_flag();
-    return z;
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the single-precision
-floating-point values `a' and `b'.  If `zSign' is 1, the sum is negated
-before being returned.  `zSign' is ignored if the result is a NaN.
-The addition is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 addFloat32Sigs( float32 a, float32 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 6;
-    bSig <<= 6;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0xFF ) {
-            if ( aSig ) return propagateFloat32NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) {
-            --expDiff;
-        }
-        else {
-            bSig |= 0x20000000;
-        }
-        shift32RightJamming( bSig, expDiff, &bSig );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0xFF ) {
-            if ( bSig ) return propagateFloat32NaN( a, b );
-            return packFloat32( zSign, 0xFF, 0 );
-        }
-        if ( aExp == 0 ) {
-            ++expDiff;
-        }
-        else {
-            aSig |= 0x20000000;
-        }
-        shift32RightJamming( aSig, - expDiff, &aSig );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0xFF ) {
-            if ( aSig | bSig ) return propagateFloat32NaN( a, b );
-            return a;
-        }
-        if ( aExp == 0 ) return packFloat32( zSign, 0, ( aSig + bSig )>>6 );
-        zSig = 0x40000000 + aSig + bSig;
-        zExp = aExp;
-        goto roundAndPack;
-    }
-    aSig |= 0x20000000;
-    zSig = ( aSig + bSig )<<1;
-    --zExp;
-    if ( (sbits32) zSig < 0 ) {
-        zSig = aSig + bSig;
-        ++zExp;
-    }
- roundAndPack:
-    return roundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the single-
-precision floating-point values `a' and `b'.  If `zSign' is 1, the
-difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 subFloat32Sigs( float32 a, float32 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 7;
-    bSig <<= 7;
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0xFF ) {
-        if ( aSig | bSig ) return propagateFloat32NaN( a, b );
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    if ( bSig < aSig ) goto aBigger;
-    if ( aSig < bSig ) goto bBigger;
-    return packFloat32( float_rounding_mode == float_round_down, 0, 0 );
- bExpBigger:
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return packFloat32( zSign ^ 1, 0xFF, 0 );
-    }
-    if ( aExp == 0 ) {
-        ++expDiff;
-    }
-    else {
-        aSig |= 0x40000000;
-    }
-    shift32RightJamming( aSig, - expDiff, &aSig );
-    bSig |= 0x40000000;
- bBigger:
-    zSig = bSig - aSig;
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        --expDiff;
-    }
-    else {
-        bSig |= 0x40000000;
-    }
-    shift32RightJamming( bSig, expDiff, &bSig );
-    aSig |= 0x40000000;
- aBigger:
-    zSig = aSig - bSig;
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the single-precision floating-point values `a'
-and `b'.  The operation is performed according to the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_add( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign == bSign ) {
-        return addFloat32Sigs( a, b, aSign );
-    }
-    else {
-        return subFloat32Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the single-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_sub( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign == bSign ) {
-        return subFloat32Sigs( a, b, aSign );
-    }
-    else {
-        return addFloat32Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the single-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_mul( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig;
-    bits64 zSig64;
-    bits32 zSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0xFF ) {
-        if ( aSig || ( ( bExp == 0xFF ) && bSig ) ) {
-            return propagateFloat32NaN( a, b );
-        }
-        if ( ( bExp | bSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        if ( ( aExp | aSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    zExp = aExp + bExp - 0x7F;
-    aSig = ( aSig | 0x00800000 )<<7;
-    bSig = ( bSig | 0x00800000 )<<8;
-    shift64RightJamming( ( (bits64) aSig ) * bSig, 32, &zSig64 );
-    zSig = (bits32)zSig64;
-    if ( 0 <= (sbits32) ( zSig<<1 ) ) {
-        zSig <<= 1;
-        --zExp;
-    }
-    return roundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the single-precision floating-point value `a'
-by the corresponding value `b'.  The operation is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_div( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, b );
-        if ( bExp == 0xFF ) {
-            if ( bSig ) return propagateFloat32NaN( a, b );
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return packFloat32( zSign, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            if ( ( aExp | aSig ) == 0 ) {
-                float_raise( float_flag_invalid );
-                return float32_default_nan;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloat32( zSign, 0xFF, 0 );
-        }
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = aExp - bExp + 0x7D;
-    aSig = ( aSig | 0x00800000 )<<7;
-    bSig = ( bSig | 0x00800000 )<<8;
-    if ( bSig <= ( aSig + aSig ) ) {
-        aSig >>= 1;
-        ++zExp;
-    }
-    zSig = (bits32)((((bits64) aSig) << 32) / bSig);
-    if ( ( zSig & 0x3F ) == 0 ) {
-        zSig |= ( (bits64) bSig * zSig != ( (bits64) aSig )<<32 );
-    }
-    return roundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the single-precision floating-point value `a'
-with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_rem( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, expDiff;
-    bits32 aSig, bSig;
-    bits32 q;
-    bits64 aSig64, bSig64, q64;
-    bits32 alternateASig;
-    sbits32 sigMean;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    if ( aExp == 0xFF ) {
-        if ( aSig || ( ( bExp == 0xFF ) && bSig ) ) {
-            return propagateFloat32NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return a;
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    expDiff = aExp - bExp;
-    aSig |= 0x00800000;
-    bSig |= 0x00800000;
-    if ( expDiff < 32 ) {
-        aSig <<= 8;
-        bSig <<= 8;
-        if ( expDiff < 0 ) {
-            if ( expDiff < -1 ) return a;
-            aSig >>= 1;
-        }
-        q = ( bSig <= aSig );
-        if ( q ) aSig -= bSig;
-        if ( 0 < expDiff ) {
-            q = ( ( (bits64) aSig )<<32 ) / bSig;
-            q >>= 32 - expDiff;
-            bSig >>= 2;
-            aSig = ( ( aSig>>1 )<<( expDiff - 1 ) ) - bSig * q;
-        }
-        else {
-            aSig >>= 2;
-            bSig >>= 2;
-        }
-    }
-    else {
-        if ( bSig <= aSig ) aSig -= bSig;
-        aSig64 = ( (bits64) aSig )<<40;
-        bSig64 = ( (bits64) bSig )<<40;
-        expDiff -= 64;
-        while ( 0 < expDiff ) {
-            q64 = estimateDiv128To64( aSig64, 0, bSig64 );
-            q64 = ( 2 < q64 ) ? q64 - 2 : 0;
-            aSig64 = - ( ( bSig * q64 )<<38 );
-            expDiff -= 62;
-        }
-        expDiff += 64;
-        q64 = estimateDiv128To64( aSig64, 0, bSig64 );
-        q64 = ( 2 < q64 ) ? q64 - 2 : 0;
-        q = q64>>( 64 - expDiff );
-        bSig <<= 6;
-        aSig = ( ( aSig64>>33 )<<( expDiff - 1 ) ) - bSig * q;
-    }
-    do {
-        alternateASig = aSig;
-        ++q;
-        aSig -= bSig;
-    } while ( 0 <= (sbits32) aSig );
-    sigMean = aSig + alternateASig;
-    if ( ( sigMean < 0 ) || ( ( sigMean == 0 ) && ( q & 1 ) ) ) {
-        aSig = alternateASig;
-    }
-    zSign = ( (sbits32) aSig < 0 );
-    if ( zSign ) aSig = - aSig;
-    return normalizeRoundAndPackFloat32( aSign ^ zSign, bExp, aSig );
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns the square root of the single-precision floating-point value `a'.
-The operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_sqrt( float32 a )
-{
-    flag aSign;
-    int16 aExp, zExp;
-    bits32 aSig, zSig;
-    bits64 rem, term;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, 0 );
-        if ( ! aSign ) return a;
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig ) == 0 ) return a;
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return 0;
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = ( ( aExp - 0x7F )>>1 ) + 0x7E;
-    aSig = ( aSig | 0x00800000 )<<8;
-    zSig = estimateSqrt32( aExp, aSig ) + 2;
-    if ( ( zSig & 0x7F ) <= 5 ) {
-        if ( zSig < 2 ) {
-            zSig = 0x7FFFFFFF;
-            goto roundAndPack;
-        }
-        aSig >>= aExp & 1;
-        term = ( (bits64) zSig ) * zSig;
-        rem = ( ( (bits64) aSig )<<32 ) - term;
-        while ( (sbits64) rem < 0 ) {
-            --zSig;
-            rem += ( ( (bits64) zSig )<<1 ) | 1;
-        }
-        zSig |= ( rem != 0 );
-    }
-    shift32RightJamming( zSig, 1, &zSig );
- roundAndPack:
-    return roundAndPackFloat32( 0, zExp, zSig );
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_eq( float32 a, float32 b )
-{
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return ( a == b ) || ( (bits32) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than
-or equal to the corresponding value `b', and 0 otherwise.  The comparison
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_le( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits32) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_lt( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits32) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The invalid exception is
-raised if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_eq_signaling( float32 a, float32 b )
-{
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return ( a == b ) || ( (bits32) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than or
-equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs do not
-cause an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_le_quiet( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits32) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause an
-exception.  Otherwise, the comparison is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_lt_quiet( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits32) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 float64_to_int32( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits64 aSig;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( ( aExp == 0x7FF ) && aSig ) aSign = 0;
-    if ( aExp ) aSig |= LIT64( 0x0010000000000000 );
-    shiftCount = 0x42C - aExp;
-    if ( 0 < shiftCount ) shift64RightJamming( aSig, shiftCount, &aSig );
-    return roundAndPackInt32( aSign, aSig );
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.
-If `a' is a NaN, the largest positive integer is returned.  Otherwise, if
-the conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int32 float64_to_int32_round_to_zero( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits64 aSig, savedASig;
-    int32 z;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( 0x41E < aExp ) {
-        if ( ( aExp == 0x7FF ) && aSig ) aSign = 0;
-        goto invalid;
-    }
-    else if ( aExp < 0x3FF ) {
-        if ( aExp || aSig ) set_float_exception_inexact_flag();
-        return 0;
-    }
-    aSig |= LIT64( 0x0010000000000000 );
-    shiftCount = 0x433 - aExp;
-    savedASig = aSig;
-    aSig >>= shiftCount;
-    z = (int32)aSig;
-    if ( aSign ) z = - z;
-    if ( ( z < 0 ) ^ aSign ) {
- invalid:
-        float_raise( float_flag_invalid );
-        return aSign ? (sbits32) 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( ( aSig<<shiftCount ) != savedASig ) {
-        set_float_exception_inexact_flag();
-    }
-    return z;
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 64-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int64 float64_to_int64( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits64 aSig, aSigExtra;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp ) aSig |= LIT64( 0x0010000000000000 );
-    shiftCount = 0x433 - aExp;
-    if ( shiftCount <= 0 ) {
-        if ( 0x43E < aExp ) {
-            float_raise( float_flag_invalid );
-            if (    ! aSign
-                 || (    ( aExp == 0x7FF )
-                      && ( aSig != LIT64( 0x0010000000000000 ) ) )
-               ) {
-                return LIT64( 0x7FFFFFFFFFFFFFFF );
-            }
-            return (sbits64) LIT64( 0x8000000000000000 );
-        }
-        aSigExtra = 0;
-        aSig <<= - shiftCount;
-    }
-    else {
-        shift64ExtraRightJamming( aSig, 0, shiftCount, &aSig, &aSigExtra );
-    }
-    return roundAndPackInt64( aSign, aSig, aSigExtra );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 64-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.
-If `a' is a NaN, the largest positive integer is returned.  Otherwise, if
-the conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int64 float64_to_int64_round_to_zero( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits64 aSig;
-    int64 z;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp ) aSig |= LIT64( 0x0010000000000000 );
-    shiftCount = aExp - 0x433;
-    if ( 0 <= shiftCount ) {
-        if ( 0x43E <= aExp ) {
-            if ( a != LIT64( 0xC3E0000000000000 ) ) {
-                float_raise( float_flag_invalid );
-                if (    ! aSign
-                     || (    ( aExp == 0x7FF )
-                          && ( aSig != LIT64( 0x0010000000000000 ) ) )
-                   ) {
-                    return LIT64( 0x7FFFFFFFFFFFFFFF );
-                }
-            }
-            return (sbits64) LIT64( 0x8000000000000000 );
-        }
-        z = aSig<<shiftCount;
-    }
-    else {
-        if ( aExp < 0x3FE ) {
-            if ( aExp | aSig ) set_float_exception_inexact_flag();
-            return 0;
-        }
-        z = aSig>>( - shiftCount );
-        if ( (bits64) ( aSig<<( shiftCount & 63 ) ) ) {
-            set_float_exception_inexact_flag();
-        }
-    }
-    if ( aSign ) z = - z;
-    return z;
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the single-precision floating-point format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float64_to_float32( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits64 aSig;
-    bits32 zSig;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return commonNaNToFloat32( float64ToCommonNaN( a ) );
-        return packFloat32( aSign, 0xFF, 0 );
-    }
-    shift64RightJamming( aSig, 22, &aSig );
-    zSig = (bits32)aSig;
-    if ( aExp || zSig ) {
-        zSig |= 0x40000000;
-        aExp -= 0x381;
-    }
-    return roundAndPackFloat32( aSign, aExp, zSig );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the extended double-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 float64_to_floatx80( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits64 aSig;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return commonNaNToFloatx80( float64ToCommonNaN( a ) );
-        return packFloatx80( aSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloatx80( aSign, 0, 0 );
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    return
-        packFloatx80(
-            aSign, aExp + 0x3C00, ( aSig | LIT64( 0x0010000000000000 ) )<<11 );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the quadruple-precision floating-point format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float64_to_float128( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits64 aSig, zSig0, zSig1;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return commonNaNToFloat128( float64ToCommonNaN( a ) );
-        return packFloat128( aSign, 0x7FFF, 0, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat128( aSign, 0, 0, 0 );
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-        --aExp;
-    }
-    shift128Right( aSig, 0, 4, &zSig0, &zSig1 );
-    return packFloat128( aSign, aExp + 0x3C00, zSig0, zSig1 );
-
-}
-
-#endif
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Rounds the double-precision floating-point value `a' to an integer, and
-returns the result as a double-precision floating-point value.  The
-operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits64 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    float64 z;
-
-    aExp = extractFloat64Exp( a );
-    if ( 0x433 <= aExp ) {
-        if ( ( aExp == 0x7FF ) && extractFloat64Frac( a ) ) {
-            return propagateFloat64NaN( a, a );
-        }
-        return a;
-    }
-    if ( aExp < 0x3FF ) {
-        if ( (bits64) ( a<<1 ) == 0 ) return a;
-        set_float_exception_inexact_flag();
-        aSign = extractFloat64Sign( a );
-        switch ( float_rounding_mode ) {
-         case float_round_nearest_even:
-            if ( ( aExp == 0x3FE ) && extractFloat64Frac( a ) ) {
-                return packFloat64( aSign, 0x3FF, 0 );
-            }
-            break;
-	 case float_round_to_zero:
-	    break;
-         case float_round_down:
-            return aSign ? LIT64( 0xBFF0000000000000 ) : 0;
-         case float_round_up:
-            return
-            aSign ? LIT64( 0x8000000000000000 ) : LIT64( 0x3FF0000000000000 );
-        }
-        return packFloat64( aSign, 0, 0 );
-    }
-    lastBitMask = 1;
-    lastBitMask <<= 0x433 - aExp;
-    roundBitsMask = lastBitMask - 1;
-    z = a;
-    roundingMode = float_rounding_mode;
-    if ( roundingMode == float_round_nearest_even ) {
-        z += lastBitMask>>1;
-        if ( ( z & roundBitsMask ) == 0 ) z &= ~ lastBitMask;
-    }
-    else if ( roundingMode != float_round_to_zero ) {
-        if ( extractFloat64Sign( z ) ^ ( roundingMode == float_round_up ) ) {
-            z += roundBitsMask;
-        }
-    }
-    z &= ~ roundBitsMask;
-    if ( z != a ) set_float_exception_inexact_flag();
-    return z;
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the double-precision
-floating-point values `a' and `b'.  If `zSign' is 1, the sum is negated
-before being returned.  `zSign' is ignored if the result is a NaN.
-The addition is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64 addFloat64Sigs( float64 a, float64 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 9;
-    bSig <<= 9;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0x7FF ) {
-            if ( aSig ) return propagateFloat64NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) {
-            --expDiff;
-        }
-        else {
-            bSig |= LIT64( 0x2000000000000000 );
-        }
-        shift64RightJamming( bSig, expDiff, &bSig );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0x7FF ) {
-            if ( bSig ) return propagateFloat64NaN( a, b );
-            return packFloat64( zSign, 0x7FF, 0 );
-        }
-        if ( aExp == 0 ) {
-            ++expDiff;
-        }
-        else {
-            aSig |= LIT64( 0x2000000000000000 );
-        }
-        shift64RightJamming( aSig, - expDiff, &aSig );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0x7FF ) {
-            if ( aSig | bSig ) return propagateFloat64NaN( a, b );
-            return a;
-        }
-        if ( aExp == 0 ) return packFloat64( zSign, 0, ( aSig + bSig )>>9 );
-        zSig = LIT64( 0x4000000000000000 ) + aSig + bSig;
-        zExp = aExp;
-        goto roundAndPack;
-    }
-    aSig |= LIT64( 0x2000000000000000 );
-    zSig = ( aSig + bSig )<<1;
-    --zExp;
-    if ( (sbits64) zSig < 0 ) {
-        zSig = aSig + bSig;
-        ++zExp;
-    }
- roundAndPack:
-    return roundAndPackFloat64( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the double-
-precision floating-point values `a' and `b'.  If `zSign' is 1, the
-difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64 subFloat64Sigs( float64 a, float64 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 10;
-    bSig <<= 10;
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0x7FF ) {
-        if ( aSig | bSig ) return propagateFloat64NaN( a, b );
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    if ( bSig < aSig ) goto aBigger;
-    if ( aSig < bSig ) goto bBigger;
-    return packFloat64( float_rounding_mode == float_round_down, 0, 0 );
- bExpBigger:
-    if ( bExp == 0x7FF ) {
-        if ( bSig ) return propagateFloat64NaN( a, b );
-        return packFloat64( zSign ^ 1, 0x7FF, 0 );
-    }
-    if ( aExp == 0 ) {
-        ++expDiff;
-    }
-    else {
-        aSig |= LIT64( 0x4000000000000000 );
-    }
-    shift64RightJamming( aSig, - expDiff, &aSig );
-    bSig |= LIT64( 0x4000000000000000 );
- bBigger:
-    zSig = bSig - aSig;
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return propagateFloat64NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        --expDiff;
-    }
-    else {
-        bSig |= LIT64( 0x4000000000000000 );
-    }
-    shift64RightJamming( bSig, expDiff, &bSig );
-    aSig |= LIT64( 0x4000000000000000 );
- aBigger:
-    zSig = aSig - bSig;
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat64( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the double-precision floating-point values `a'
-and `b'.  The operation is performed according to the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_add( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign == bSign ) {
-        return addFloat64Sigs( a, b, aSign );
-    }
-    else {
-        return subFloat64Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the double-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_sub( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign == bSign ) {
-        return subFloat64Sigs( a, b, aSign );
-    }
-    else {
-        return addFloat64Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the double-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_mul( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FF ) {
-        if ( aSig || ( ( bExp == 0x7FF ) && bSig ) ) {
-            return propagateFloat64NaN( a, b );
-        }
-        if ( ( bExp | bSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        return packFloat64( zSign, 0x7FF, 0 );
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig ) return propagateFloat64NaN( a, b );
-        if ( ( aExp | aSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        return packFloat64( zSign, 0x7FF, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat64( zSign, 0, 0 );
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) return packFloat64( zSign, 0, 0 );
-        normalizeFloat64Subnormal( bSig, &bExp, &bSig );
-    }
-    zExp = aExp + bExp - 0x3FF;
-    aSig = ( aSig | LIT64( 0x0010000000000000 ) )<<10;
-    bSig = ( bSig | LIT64( 0x0010000000000000 ) )<<11;
-    mul64To128( aSig, bSig, &zSig0, &zSig1 );
-    zSig0 |= ( zSig1 != 0 );
-    if ( 0 <= (sbits64) ( zSig0<<1 ) ) {
-        zSig0 <<= 1;
-        --zExp;
-    }
-    return roundAndPackFloat64( zSign, zExp, zSig0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the double-precision floating-point value `a'
-by the corresponding value `b'.  The operation is performed according to
-the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_div( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig;
-    bits64 rem0, rem1;
-    bits64 term0, term1;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return propagateFloat64NaN( a, b );
-        if ( bExp == 0x7FF ) {
-            if ( bSig ) return propagateFloat64NaN( a, b );
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        return packFloat64( zSign, 0x7FF, 0 );
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig ) return propagateFloat64NaN( a, b );
-        return packFloat64( zSign, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            if ( ( aExp | aSig ) == 0 ) {
-                float_raise( float_flag_invalid );
-                return float64_default_nan;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloat64( zSign, 0x7FF, 0 );
-        }
-        normalizeFloat64Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat64( zSign, 0, 0 );
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = aExp - bExp + 0x3FD;
-    aSig = ( aSig | LIT64( 0x0010000000000000 ) )<<10;
-    bSig = ( bSig | LIT64( 0x0010000000000000 ) )<<11;
-    if ( bSig <= ( aSig + aSig ) ) {
-        aSig >>= 1;
-        ++zExp;
-    }
-    zSig = estimateDiv128To64( aSig, 0, bSig );
-    if ( ( zSig & 0x1FF ) <= 2 ) {
-        mul64To128( bSig, zSig, &term0, &term1 );
-        sub128( aSig, 0, term0, term1, &rem0, &rem1 );
-        while ( (sbits64) rem0 < 0 ) {
-            --zSig;
-            add128( rem0, rem1, 0, bSig, &rem0, &rem1 );
-        }
-        zSig |= ( rem1 != 0 );
-    }
-    return roundAndPackFloat64( zSign, zExp, zSig );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the double-precision floating-point value `a'
-with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_rem( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, expDiff;
-    bits64 aSig, bSig;
-    bits64 q, alternateASig;
-    sbits64 sigMean;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    if ( aExp == 0x7FF ) {
-        if ( aSig || ( ( bExp == 0x7FF ) && bSig ) ) {
-            return propagateFloat64NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig ) return propagateFloat64NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        normalizeFloat64Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return a;
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    expDiff = aExp - bExp;
-    aSig = ( aSig | LIT64( 0x0010000000000000 ) )<<11;
-    bSig = ( bSig | LIT64( 0x0010000000000000 ) )<<11;
-    if ( expDiff < 0 ) {
-        if ( expDiff < -1 ) return a;
-        aSig >>= 1;
-    }
-    q = ( bSig <= aSig );
-    if ( q ) aSig -= bSig;
-    expDiff -= 64;
-    while ( 0 < expDiff ) {
-        q = estimateDiv128To64( aSig, 0, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        aSig = - ( ( bSig>>2 ) * q );
-        expDiff -= 62;
-    }
-    expDiff += 64;
-    if ( 0 < expDiff ) {
-        q = estimateDiv128To64( aSig, 0, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        q >>= 64 - expDiff;
-        bSig >>= 2;
-        aSig = ( ( aSig>>1 )<<( expDiff - 1 ) ) - bSig * q;
-    }
-    else {
-        aSig >>= 2;
-        bSig >>= 2;
-    }
-    do {
-        alternateASig = aSig;
-        ++q;
-        aSig -= bSig;
-    } while ( 0 <= (sbits64) aSig );
-    sigMean = aSig + alternateASig;
-    if ( ( sigMean < 0 ) || ( ( sigMean == 0 ) && ( q & 1 ) ) ) {
-        aSig = alternateASig;
-    }
-    zSign = ( (sbits64) aSig < 0 );
-    if ( zSign ) aSig = - aSig;
-    return normalizeRoundAndPackFloat64( aSign ^ zSign, bExp, aSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the square root of the double-precision floating-point value `a'.
-The operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_sqrt( float64 a )
-{
-    flag aSign;
-    int16 aExp, zExp;
-    bits64 aSig, zSig, doubleZSig;
-    bits64 rem0, rem1, term0, term1;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return propagateFloat64NaN( a, a );
-        if ( ! aSign ) return a;
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig ) == 0 ) return a;
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return 0;
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = ( ( aExp - 0x3FF )>>1 ) + 0x3FE;
-    aSig |= LIT64( 0x0010000000000000 );
-    zSig = estimateSqrt32( aExp, aSig>>21 );
-    aSig <<= 9 - ( aExp & 1 );
-    zSig = estimateDiv128To64( aSig, 0, zSig<<32 ) + ( zSig<<30 );
-    if ( ( zSig & 0x1FF ) <= 5 ) {
-        doubleZSig = zSig<<1;
-        mul64To128( zSig, zSig, &term0, &term1 );
-        sub128( aSig, 0, term0, term1, &rem0, &rem1 );
-        while ( (sbits64) rem0 < 0 ) {
-            --zSig;
-            doubleZSig -= 2;
-            add128( rem0, rem1, zSig>>63, doubleZSig | 1, &rem0, &rem1 );
-        }
-        zSig |= ( ( rem0 | rem1 ) != 0 );
-    }
-    return roundAndPackFloat64( 0, zExp, zSig );
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is equal to the
-corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_eq( float64 a, float64 b )
-{
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return ( a == b ) ||
-	( (bits64) ( ( FLOAT64_DEMANGLE(a) | FLOAT64_DEMANGLE(b) )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than or
-equal to the corresponding value `b', and 0 otherwise.  The comparison is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_le( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign )
-	return aSign ||
-	    ( (bits64) ( ( FLOAT64_DEMANGLE(a) | FLOAT64_DEMANGLE(b) )<<1 ) ==
-	      0 );
-    return ( a == b ) ||
-	( aSign ^ ( FLOAT64_DEMANGLE(a) < FLOAT64_DEMANGLE(b) ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_lt( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign )
-	return aSign &&
-	    ( (bits64) ( ( FLOAT64_DEMANGLE(a) | FLOAT64_DEMANGLE(b) )<<1 ) !=
-	      0 );
-    return ( a != b ) &&
-	( aSign ^ ( FLOAT64_DEMANGLE(a) < FLOAT64_DEMANGLE(b) ) );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is equal to the
-corresponding value `b', and 0 otherwise.  The invalid exception is raised
-if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_eq_signaling( float64 a, float64 b )
-{
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return ( a == b ) || ( (bits64) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than or
-equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs do not
-cause an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_le_quiet( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits64) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause an
-exception.  Otherwise, the comparison is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_lt_quiet( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits64) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-#endif
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the 32-bit two's complement integer format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic---which means in particular that the conversion
-is rounded according to the current rounding mode.  If `a' is a NaN, the
-largest positive integer is returned.  Otherwise, if the conversion
-overflows, the largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 floatx80_to_int32( floatx80 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( ( aExp == 0x7FFF ) && (bits64) ( aSig<<1 ) ) aSign = 0;
-    shiftCount = 0x4037 - aExp;
-    if ( shiftCount <= 0 ) shiftCount = 1;
-    shift64RightJamming( aSig, shiftCount, &aSig );
-    return roundAndPackInt32( aSign, aSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the 32-bit two's complement integer format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic, except that the conversion is always rounded
-toward zero.  If `a' is a NaN, the largest positive integer is returned.
-Otherwise, if the conversion overflows, the largest integer with the same
-sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 floatx80_to_int32_round_to_zero( floatx80 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig, savedASig;
-    int32 z;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( 0x401E < aExp ) {
-        if ( ( aExp == 0x7FFF ) && (bits64) ( aSig<<1 ) ) aSign = 0;
-        goto invalid;
-    }
-    else if ( aExp < 0x3FFF ) {
-        if ( aExp || aSig ) set_float_exception_inexact_flag();
-        return 0;
-    }
-    shiftCount = 0x403E - aExp;
-    savedASig = aSig;
-    aSig >>= shiftCount;
-    z = aSig;
-    if ( aSign ) z = - z;
-    if ( ( z < 0 ) ^ aSign ) {
- invalid:
-        float_raise( float_flag_invalid );
-        return aSign ? (sbits32) 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( ( aSig<<shiftCount ) != savedASig ) {
-        set_float_exception_inexact_flag();
-    }
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the 64-bit two's complement integer format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic---which means in particular that the conversion
-is rounded according to the current rounding mode.  If `a' is a NaN,
-the largest positive integer is returned.  Otherwise, if the conversion
-overflows, the largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int64 floatx80_to_int64( floatx80 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig, aSigExtra;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    shiftCount = 0x403E - aExp;
-    if ( shiftCount <= 0 ) {
-        if ( shiftCount ) {
-            float_raise( float_flag_invalid );
-            if (    ! aSign
-                 || (    ( aExp == 0x7FFF )
-                      && ( aSig != LIT64( 0x8000000000000000 ) ) )
-               ) {
-                return LIT64( 0x7FFFFFFFFFFFFFFF );
-            }
-            return (sbits64) LIT64( 0x8000000000000000 );
-        }
-        aSigExtra = 0;
-    }
-    else {
-        shift64ExtraRightJamming( aSig, 0, shiftCount, &aSig, &aSigExtra );
-    }
-    return roundAndPackInt64( aSign, aSig, aSigExtra );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the 64-bit two's complement integer format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic, except that the conversion is always rounded
-toward zero.  If `a' is a NaN, the largest positive integer is returned.
-Otherwise, if the conversion overflows, the largest integer with the same
-sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int64 floatx80_to_int64_round_to_zero( floatx80 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig;
-    int64 z;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    shiftCount = aExp - 0x403E;
-    if ( 0 <= shiftCount ) {
-        aSig &= LIT64( 0x7FFFFFFFFFFFFFFF );
-        if ( ( a.high != 0xC03E ) || aSig ) {
-            float_raise( float_flag_invalid );
-            if ( ! aSign || ( ( aExp == 0x7FFF ) && aSig ) ) {
-                return LIT64( 0x7FFFFFFFFFFFFFFF );
-            }
-        }
-        return (sbits64) LIT64( 0x8000000000000000 );
-    }
-    else if ( aExp < 0x3FFF ) {
-        if ( aExp | aSig ) set_float_exception_inexact_flag();
-        return 0;
-    }
-    z = aSig>>( - shiftCount );
-    if ( (bits64) ( aSig<<( shiftCount & 63 ) ) ) {
-        set_float_exception_inexact_flag();
-    }
-    if ( aSign ) z = - z;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the single-precision floating-point format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 floatx80_to_float32( floatx80 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 aSig;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig<<1 ) ) {
-            return commonNaNToFloat32( floatx80ToCommonNaN( a ) );
-        }
-        return packFloat32( aSign, 0xFF, 0 );
-    }
-    shift64RightJamming( aSig, 33, &aSig );
-    if ( aExp || aSig ) aExp -= 0x3F81;
-    return roundAndPackFloat32( aSign, aExp, aSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the double-precision floating-point format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 floatx80_to_float64( floatx80 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 aSig, zSig;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig<<1 ) ) {
-            return commonNaNToFloat64( floatx80ToCommonNaN( a ) );
-        }
-        return packFloat64( aSign, 0x7FF, 0 );
-    }
-    shift64RightJamming( aSig, 1, &zSig );
-    if ( aExp || aSig ) aExp -= 0x3C01;
-    return roundAndPackFloat64( aSign, aExp, zSig );
-
-}
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the quadruple-precision floating-point format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 floatx80_to_float128( floatx80 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits64 aSig, zSig0, zSig1;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( ( aExp == 0x7FFF ) && (bits64) ( aSig<<1 ) ) {
-        return commonNaNToFloat128( floatx80ToCommonNaN( a ) );
-    }
-    shift128Right( aSig<<1, 0, 16, &zSig0, &zSig1 );
-    return packFloat128( aSign, aExp, zSig0, zSig1 );
-
-}
-
-#endif
-
-/*
--------------------------------------------------------------------------------
-Rounds the extended double-precision floating-point value `a' to an integer,
-and returns the result as an extended quadruple-precision floating-point
-value.  The operation is performed according to the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    floatx80 z;
-
-    aExp = extractFloatx80Exp( a );
-    if ( 0x403E <= aExp ) {
-        if ( ( aExp == 0x7FFF ) && (bits64) ( extractFloatx80Frac( a )<<1 ) ) {
-            return propagateFloatx80NaN( a, a );
-        }
-        return a;
-    }
-    if ( aExp < 0x3FFF ) {
-        if (    ( aExp == 0 )
-             && ( (bits64) ( extractFloatx80Frac( a )<<1 ) == 0 ) ) {
-            return a;
-        }
-        set_float_exception_inexact_flag();
-        aSign = extractFloatx80Sign( a );
-        switch ( float_rounding_mode ) {
-         case float_round_nearest_even:
-            if ( ( aExp == 0x3FFE ) && (bits64) ( extractFloatx80Frac( a )<<1 )
-               ) {
-                return
-                    packFloatx80( aSign, 0x3FFF, LIT64( 0x8000000000000000 ) );
-            }
-            break;
-	 case float_round_to_zero:
-	    break;
-         case float_round_down:
-            return
-                  aSign ?
-                      packFloatx80( 1, 0x3FFF, LIT64( 0x8000000000000000 ) )
-                : packFloatx80( 0, 0, 0 );
-         case float_round_up:
-            return
-                  aSign ? packFloatx80( 1, 0, 0 )
-                : packFloatx80( 0, 0x3FFF, LIT64( 0x8000000000000000 ) );
-        }
-        return packFloatx80( aSign, 0, 0 );
-    }
-    lastBitMask = 1;
-    lastBitMask <<= 0x403E - aExp;
-    roundBitsMask = lastBitMask - 1;
-    z = a;
-    roundingMode = float_rounding_mode;
-    if ( roundingMode == float_round_nearest_even ) {
-        z.low += lastBitMask>>1;
-        if ( ( z.low & roundBitsMask ) == 0 ) z.low &= ~ lastBitMask;
-    }
-    else if ( roundingMode != float_round_to_zero ) {
-        if ( extractFloatx80Sign( z ) ^ ( roundingMode == float_round_up ) ) {
-            z.low += roundBitsMask;
-        }
-    }
-    z.low &= ~ roundBitsMask;
-    if ( z.low == 0 ) {
-        ++z.high;
-        z.low = LIT64( 0x8000000000000000 );
-    }
-    if ( z.low != a.low ) set_float_exception_inexact_flag();
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the extended double-
-precision floating-point values `a' and `b'.  If `zSign' is 1, the sum is
-negated before being returned.  `zSign' is ignored if the result is a NaN.
-The addition is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static floatx80 addFloatx80Sigs( floatx80 a, floatx80 b, flag zSign )
-{
-    int32 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-    int32 expDiff;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    expDiff = aExp - bExp;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0x7FFF ) {
-            if ( (bits64) ( aSig<<1 ) ) return propagateFloatx80NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) --expDiff;
-        shift64ExtraRightJamming( bSig, 0, expDiff, &bSig, &zSig1 );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0x7FFF ) {
-            if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-            return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-        }
-        if ( aExp == 0 ) ++expDiff;
-        shift64ExtraRightJamming( aSig, 0, - expDiff, &aSig, &zSig1 );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0x7FFF ) {
-            if ( (bits64) ( ( aSig | bSig )<<1 ) ) {
-                return propagateFloatx80NaN( a, b );
-            }
-            return a;
-        }
-        zSig1 = 0;
-        zSig0 = aSig + bSig;
-        if ( aExp == 0 ) {
-            normalizeFloatx80Subnormal( zSig0, &zExp, &zSig0 );
-            goto roundAndPack;
-        }
-        zExp = aExp;
-        goto shiftRight1;
-    }
-    zSig0 = aSig + bSig;
-    if ( (sbits64) zSig0 < 0 ) goto roundAndPack;
- shiftRight1:
-    shift64ExtraRightJamming( zSig0, zSig1, 1, &zSig0, &zSig1 );
-    zSig0 |= LIT64( 0x8000000000000000 );
-    ++zExp;
- roundAndPack:
-    return
-        roundAndPackFloatx80(
-            floatx80_rounding_precision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the extended
-double-precision floating-point values `a' and `b'.  If `zSign' is 1, the
-difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static floatx80 subFloatx80Sigs( floatx80 a, floatx80 b, flag zSign )
-{
-    int32 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-    int32 expDiff;
-    floatx80 z;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    expDiff = aExp - bExp;
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( ( aSig | bSig )<<1 ) ) {
-            return propagateFloatx80NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        z.low = floatx80_default_nan_low;
-        z.high = floatx80_default_nan_high;
-        return z;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    zSig1 = 0;
-    if ( bSig < aSig ) goto aBigger;
-    if ( aSig < bSig ) goto bBigger;
-    return packFloatx80( float_rounding_mode == float_round_down, 0, 0 );
- bExpBigger:
-    if ( bExp == 0x7FFF ) {
-        if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        return packFloatx80( zSign ^ 1, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( aExp == 0 ) ++expDiff;
-    shift128RightJamming( aSig, 0, - expDiff, &aSig, &zSig1 );
- bBigger:
-    sub128( bSig, 0, aSig, zSig1, &zSig0, &zSig1 );
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) --expDiff;
-    shift128RightJamming( bSig, 0, expDiff, &bSig, &zSig1 );
- aBigger:
-    sub128( aSig, 0, bSig, zSig1, &zSig0, &zSig1 );
-    zExp = aExp;
- normalizeRoundAndPack:
-    return
-        normalizeRoundAndPackFloatx80(
-            floatx80_rounding_precision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the extended double-precision floating-point
-values `a' and `b'.  The operation is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_add( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign == bSign ) {
-        return addFloatx80Sigs( a, b, aSign );
-    }
-    else {
-        return subFloatx80Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the extended double-precision floating-
-point values `a' and `b'.  The operation is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_sub( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign == bSign ) {
-        return subFloatx80Sigs( a, b, aSign );
-    }
-    else {
-        return addFloatx80Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the extended double-precision floating-
-point values `a' and `b'.  The operation is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_mul( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign, zSign;
-    int32 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-    floatx80 z;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    bSign = extractFloatx80Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FFF ) {
-        if (    (bits64) ( aSig<<1 )
-             || ( ( bExp == 0x7FFF ) && (bits64) ( bSig<<1 ) ) ) {
-            return propagateFloatx80NaN( a, b );
-        }
-        if ( ( bExp | bSig ) == 0 ) goto invalid;
-        return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        if ( ( aExp | aSig ) == 0 ) {
- invalid:
-            float_raise( float_flag_invalid );
-            z.low = floatx80_default_nan_low;
-            z.high = floatx80_default_nan_high;
-            return z;
-        }
-        return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloatx80( zSign, 0, 0 );
-        normalizeFloatx80Subnormal( aSig, &aExp, &aSig );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) return packFloatx80( zSign, 0, 0 );
-        normalizeFloatx80Subnormal( bSig, &bExp, &bSig );
-    }
-    zExp = aExp + bExp - 0x3FFE;
-    mul64To128( aSig, bSig, &zSig0, &zSig1 );
-    if ( 0 < (sbits64) zSig0 ) {
-        shortShift128Left( zSig0, zSig1, 1, &zSig0, &zSig1 );
-        --zExp;
-    }
-    return
-        roundAndPackFloatx80(
-            floatx80_rounding_precision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the extended double-precision floating-point
-value `a' by the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_div( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign, zSign;
-    int32 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-    bits64 rem0, rem1, rem2, term0, term1, term2;
-    floatx80 z;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    bSign = extractFloatx80Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        if ( bExp == 0x7FFF ) {
-            if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-            goto invalid;
-        }
-        return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        return packFloatx80( zSign, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            if ( ( aExp | aSig ) == 0 ) {
- invalid:
-                float_raise( float_flag_invalid );
-                z.low = floatx80_default_nan_low;
-                z.high = floatx80_default_nan_high;
-                return z;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-        }
-        normalizeFloatx80Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloatx80( zSign, 0, 0 );
-        normalizeFloatx80Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = aExp - bExp + 0x3FFE;
-    rem1 = 0;
-    if ( bSig <= aSig ) {
-        shift128Right( aSig, 0, 1, &aSig, &rem1 );
-        ++zExp;
-    }
-    zSig0 = estimateDiv128To64( aSig, rem1, bSig );
-    mul64To128( bSig, zSig0, &term0, &term1 );
-    sub128( aSig, rem1, term0, term1, &rem0, &rem1 );
-    while ( (sbits64) rem0 < 0 ) {
-        --zSig0;
-        add128( rem0, rem1, 0, bSig, &rem0, &rem1 );
-    }
-    zSig1 = estimateDiv128To64( rem1, 0, bSig );
-    if ( (bits64) ( zSig1<<1 ) <= 8 ) {
-        mul64To128( bSig, zSig1, &term1, &term2 );
-        sub128( rem1, 0, term1, term2, &rem1, &rem2 );
-        while ( (sbits64) rem1 < 0 ) {
-            --zSig1;
-            add128( rem1, rem2, 0, bSig, &rem1, &rem2 );
-        }
-        zSig1 |= ( ( rem1 | rem2 ) != 0 );
-    }
-    return
-        roundAndPackFloatx80(
-            floatx80_rounding_precision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the extended double-precision floating-point value
-`a' with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_rem( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign, zSign;
-    int32 aExp, bExp, expDiff;
-    bits64 aSig0, aSig1, bSig;
-    bits64 q, term0, term1, alternateASig0, alternateASig1;
-    floatx80 z;
-
-    aSig0 = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    bSign = extractFloatx80Sign( b );
-    if ( aExp == 0x7FFF ) {
-        if (    (bits64) ( aSig0<<1 )
-             || ( ( bExp == 0x7FFF ) && (bits64) ( bSig<<1 ) ) ) {
-            return propagateFloatx80NaN( a, b );
-        }
-        goto invalid;
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
- invalid:
-            float_raise( float_flag_invalid );
-            z.low = floatx80_default_nan_low;
-            z.high = floatx80_default_nan_high;
-            return z;
-        }
-        normalizeFloatx80Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( (bits64) ( aSig0<<1 ) == 0 ) return a;
-        normalizeFloatx80Subnormal( aSig0, &aExp, &aSig0 );
-    }
-    bSig |= LIT64( 0x8000000000000000 );
-    zSign = aSign;
-    expDiff = aExp - bExp;
-    aSig1 = 0;
-    if ( expDiff < 0 ) {
-        if ( expDiff < -1 ) return a;
-        shift128Right( aSig0, 0, 1, &aSig0, &aSig1 );
-        expDiff = 0;
-    }
-    q = ( bSig <= aSig0 );
-    if ( q ) aSig0 -= bSig;
-    expDiff -= 64;
-    while ( 0 < expDiff ) {
-        q = estimateDiv128To64( aSig0, aSig1, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        mul64To128( bSig, q, &term0, &term1 );
-        sub128( aSig0, aSig1, term0, term1, &aSig0, &aSig1 );
-        shortShift128Left( aSig0, aSig1, 62, &aSig0, &aSig1 );
-        expDiff -= 62;
-    }
-    expDiff += 64;
-    if ( 0 < expDiff ) {
-        q = estimateDiv128To64( aSig0, aSig1, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        q >>= 64 - expDiff;
-        mul64To128( bSig, q<<( 64 - expDiff ), &term0, &term1 );
-        sub128( aSig0, aSig1, term0, term1, &aSig0, &aSig1 );
-        shortShift128Left( 0, bSig, 64 - expDiff, &term0, &term1 );
-        while ( le128( term0, term1, aSig0, aSig1 ) ) {
-            ++q;
-            sub128( aSig0, aSig1, term0, term1, &aSig0, &aSig1 );
-        }
-    }
-    else {
-        term1 = 0;
-        term0 = bSig;
-    }
-    sub128( term0, term1, aSig0, aSig1, &alternateASig0, &alternateASig1 );
-    if (    lt128( alternateASig0, alternateASig1, aSig0, aSig1 )
-         || (    eq128( alternateASig0, alternateASig1, aSig0, aSig1 )
-              && ( q & 1 ) )
-       ) {
-        aSig0 = alternateASig0;
-        aSig1 = alternateASig1;
-        zSign = ! zSign;
-    }
-    return
-        normalizeRoundAndPackFloatx80(
-            80, zSign, bExp + expDiff, aSig0, aSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the square root of the extended double-precision floating-point
-value `a'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_sqrt( floatx80 a )
-{
-    flag aSign;
-    int32 aExp, zExp;
-    bits64 aSig0, aSig1, zSig0, zSig1, doubleZSig0;
-    bits64 rem0, rem1, rem2, rem3, term0, term1, term2, term3;
-    floatx80 z;
-
-    aSig0 = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig0<<1 ) ) return propagateFloatx80NaN( a, a );
-        if ( ! aSign ) return a;
-        goto invalid;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig0 ) == 0 ) return a;
- invalid:
-        float_raise( float_flag_invalid );
-        z.low = floatx80_default_nan_low;
-        z.high = floatx80_default_nan_high;
-        return z;
-    }
-    if ( aExp == 0 ) {
-        if ( aSig0 == 0 ) return packFloatx80( 0, 0, 0 );
-        normalizeFloatx80Subnormal( aSig0, &aExp, &aSig0 );
-    }
-    zExp = ( ( aExp - 0x3FFF )>>1 ) + 0x3FFF;
-    zSig0 = estimateSqrt32( aExp, aSig0>>32 );
-    shift128Right( aSig0, 0, 2 + ( aExp & 1 ), &aSig0, &aSig1 );
-    zSig0 = estimateDiv128To64( aSig0, aSig1, zSig0<<32 ) + ( zSig0<<30 );
-    doubleZSig0 = zSig0<<1;
-    mul64To128( zSig0, zSig0, &term0, &term1 );
-    sub128( aSig0, aSig1, term0, term1, &rem0, &rem1 );
-    while ( (sbits64) rem0 < 0 ) {
-        --zSig0;
-        doubleZSig0 -= 2;
-        add128( rem0, rem1, zSig0>>63, doubleZSig0 | 1, &rem0, &rem1 );
-    }
-    zSig1 = estimateDiv128To64( rem1, 0, doubleZSig0 );
-    if ( ( zSig1 & LIT64( 0x3FFFFFFFFFFFFFFF ) ) <= 5 ) {
-        if ( zSig1 == 0 ) zSig1 = 1;
-        mul64To128( doubleZSig0, zSig1, &term1, &term2 );
-        sub128( rem1, 0, term1, term2, &rem1, &rem2 );
-        mul64To128( zSig1, zSig1, &term2, &term3 );
-        sub192( rem1, rem2, 0, 0, term2, term3, &rem1, &rem2, &rem3 );
-        while ( (sbits64) rem1 < 0 ) {
-            --zSig1;
-            shortShift128Left( 0, zSig1, 1, &term2, &term3 );
-            term3 |= 1;
-            term2 |= doubleZSig0;
-            add192( rem1, rem2, rem3, 0, term2, term3, &rem1, &rem2, &rem3 );
-        }
-        zSig1 |= ( ( rem1 | rem2 | rem3 ) != 0 );
-    }
-    shortShift128Left( 0, zSig1, 1, &zSig0, &zSig1 );
-    zSig0 |= doubleZSig0;
-    return
-        roundAndPackFloatx80(
-            floatx80_rounding_precision, 0, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is
-equal to the corresponding value `b', and 0 otherwise.  The comparison is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_eq( floatx80 a, floatx80 b )
-{
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        if (    floatx80_is_signaling_nan( a )
-             || floatx80_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return
-           ( a.low == b.low )
-        && (    ( a.high == b.high )
-             || (    ( a.low == 0 )
-                  && ( (bits16) ( ( a.high | b.high )<<1 ) == 0 ) )
-           );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is
-less than or equal to the corresponding value `b', and 0 otherwise.  The
-comparison is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_le( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            || (    ( ( (bits16) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 == 0 );
-    }
-    return
-          aSign ? le128( b.high, b.low, a.high, a.low )
-        : le128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is
-less than the corresponding value `b', and 0 otherwise.  The comparison
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_lt( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            && (    ( ( (bits16) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 != 0 );
-    }
-    return
-          aSign ? lt128( b.high, b.low, a.high, a.low )
-        : lt128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is equal
-to the corresponding value `b', and 0 otherwise.  The invalid exception is
-raised if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_eq_signaling( floatx80 a, floatx80 b )
-{
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return
-           ( a.low == b.low )
-        && (    ( a.high == b.high )
-             || (    ( a.low == 0 )
-                  && ( (bits16) ( ( a.high | b.high )<<1 ) == 0 ) )
-           );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is less
-than or equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs
-do not cause an exception.  Otherwise, the comparison is performed according
-to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_le_quiet( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        if (    floatx80_is_signaling_nan( a )
-             || floatx80_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            || (    ( ( (bits16) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 == 0 );
-    }
-    return
-          aSign ? le128( b.high, b.low, a.high, a.low )
-        : le128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is less
-than the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause
-an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_lt_quiet( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        if (    floatx80_is_signaling_nan( a )
-             || floatx80_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            && (    ( ( (bits16) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 != 0 );
-    }
-    return
-          aSign ? lt128( b.high, b.low, a.high, a.low )
-        : lt128( a.high, a.low, b.high, b.low );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point
-value `a' to the 32-bit two's complement integer format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 float128_to_int32( float128 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig0, aSig1;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( ( aExp == 0x7FFF ) && ( aSig0 | aSig1 ) ) aSign = 0;
-    if ( aExp ) aSig0 |= LIT64( 0x0001000000000000 );
-    aSig0 |= ( aSig1 != 0 );
-    shiftCount = 0x4028 - aExp;
-    if ( 0 < shiftCount ) shift64RightJamming( aSig0, shiftCount, &aSig0 );
-    return roundAndPackInt32( aSign, aSig0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point
-value `a' to the 32-bit two's complement integer format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.  If
-`a' is a NaN, the largest positive integer is returned.  Otherwise, if the
-conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int32 float128_to_int32_round_to_zero( float128 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig0, aSig1, savedASig;
-    int32 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    aSig0 |= ( aSig1 != 0 );
-    if ( 0x401E < aExp ) {
-        if ( ( aExp == 0x7FFF ) && aSig0 ) aSign = 0;
-        goto invalid;
-    }
-    else if ( aExp < 0x3FFF ) {
-        if ( aExp || aSig0 ) set_float_exception_inexact_flag();
-        return 0;
-    }
-    aSig0 |= LIT64( 0x0001000000000000 );
-    shiftCount = 0x402F - aExp;
-    savedASig = aSig0;
-    aSig0 >>= shiftCount;
-    z = (int32)aSig0;
-    if ( aSign ) z = - z;
-    if ( ( z < 0 ) ^ aSign ) {
- invalid:
-        float_raise( float_flag_invalid );
-        return aSign ? (sbits32) 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( ( aSig0<<shiftCount ) != savedASig ) {
-        set_float_exception_inexact_flag();
-    }
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point
-value `a' to the 64-bit two's complement integer format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int64 float128_to_int64( float128 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig0, aSig1;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( aExp ) aSig0 |= LIT64( 0x0001000000000000 );
-    shiftCount = 0x402F - aExp;
-    if ( shiftCount <= 0 ) {
-        if ( 0x403E < aExp ) {
-            float_raise( float_flag_invalid );
-            if (    ! aSign
-                 || (    ( aExp == 0x7FFF )
-                      && ( aSig1 || ( aSig0 != LIT64( 0x0001000000000000 ) ) )
-                    )
-               ) {
-                return LIT64( 0x7FFFFFFFFFFFFFFF );
-            }
-            return (sbits64) LIT64( 0x8000000000000000 );
-        }
-        shortShift128Left( aSig0, aSig1, - shiftCount, &aSig0, &aSig1 );
-    }
-    else {
-        shift64ExtraRightJamming( aSig0, aSig1, shiftCount, &aSig0, &aSig1 );
-    }
-    return roundAndPackInt64( aSign, aSig0, aSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point
-value `a' to the 64-bit two's complement integer format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.
-If `a' is a NaN, the largest positive integer is returned.  Otherwise, if
-the conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int64 float128_to_int64_round_to_zero( float128 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig0, aSig1;
-    int64 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( aExp ) aSig0 |= LIT64( 0x0001000000000000 );
-    shiftCount = aExp - 0x402F;
-    if ( 0 < shiftCount ) {
-        if ( 0x403E <= aExp ) {
-            aSig0 &= LIT64( 0x0000FFFFFFFFFFFF );
-            if (    ( a.high == LIT64( 0xC03E000000000000 ) )
-                 && ( aSig1 < LIT64( 0x0002000000000000 ) ) ) {
-                if ( aSig1 ) set_float_exception_inexact_flag();
-            }
-            else {
-                float_raise( float_flag_invalid );
-                if ( ! aSign || ( ( aExp == 0x7FFF ) && ( aSig0 | aSig1 ) ) ) {
-                    return LIT64( 0x7FFFFFFFFFFFFFFF );
-                }
-            }
-            return (sbits64) LIT64( 0x8000000000000000 );
-        }
-        z = ( aSig0<<shiftCount ) | ( aSig1>>( ( - shiftCount ) & 63 ) );
-        if ( (bits64) ( aSig1<<shiftCount ) ) {
-            set_float_exception_inexact_flag();
-        }
-    }
-    else {
-        if ( aExp < 0x3FFF ) {
-            if ( aExp | aSig0 | aSig1 ) {
-                set_float_exception_inexact_flag();
-            }
-            return 0;
-        }
-        z = aSig0>>( - shiftCount );
-        if (    aSig1
-             || ( shiftCount && (bits64) ( aSig0<<( shiftCount & 63 ) ) ) ) {
-            set_float_exception_inexact_flag();
-        }
-    }
-    if ( aSign ) z = - z;
-    return z;
-
-}
-
-#if (defined(SOFTFLOATSPARC64_FOR_GCC) || defined(SOFTFLOAT_FOR_GCC)) \
-    && defined(SOFTFLOAT_NEED_FIXUNS)
-/*
- * just like above - but do not care for overflow of signed results
- */
-uint64 float128_to_uint64_round_to_zero( float128 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig0, aSig1;
-    uint64 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( aExp ) aSig0 |= LIT64( 0x0001000000000000 );
-    shiftCount = aExp - 0x402F;
-    if ( 0 < shiftCount ) {
-        if ( 0x403F <= aExp ) {
-            aSig0 &= LIT64( 0x0000FFFFFFFFFFFF );
-            if (    ( a.high == LIT64( 0xC03E000000000000 ) )
-                 && ( aSig1 < LIT64( 0x0002000000000000 ) ) ) {
-                if ( aSig1 ) set_float_exception_inexact_flag();
-            }
-            else {
-                float_raise( float_flag_invalid );
-            }
-            return LIT64( 0xFFFFFFFFFFFFFFFF );
-        }
-        z = ( aSig0<<shiftCount ) | ( aSig1>>( ( - shiftCount ) & 63 ) );
-        if ( (bits64) ( aSig1<<shiftCount ) ) {
-            set_float_exception_inexact_flag();
-        }
-    }
-    else {
-        if ( aExp < 0x3FFF ) {
-            if ( aExp | aSig0 | aSig1 ) {
-                set_float_exception_inexact_flag();
-            }
-            return 0;
-        }
-        z = aSig0>>( - shiftCount );
-        if (aSig1 || ( shiftCount && (bits64) ( aSig0<<( shiftCount & 63 ) ) ) ) {
-            set_float_exception_inexact_flag();
-        }
-    }
-    if ( aSign ) z = - z;
-    return z;
-
-}
-#endif /* (SOFTFLOATSPARC64_FOR_GCC || SOFTFLOAT_FOR_GCC) && SOFTFLOAT_NEED_FIXUNS */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point
-value `a' to the single-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float128_to_float32( float128 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 aSig0, aSig1;
-    bits32 zSig;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( aSig0 | aSig1 ) {
-            return commonNaNToFloat32( float128ToCommonNaN( a ) );
-        }
-        return packFloat32( aSign, 0xFF, 0 );
-    }
-    aSig0 |= ( aSig1 != 0 );
-    shift64RightJamming( aSig0, 18, &aSig0 );
-    zSig = (bits32)aSig0;
-    if ( aExp || zSig ) {
-        zSig |= 0x40000000;
-        aExp -= 0x3F81;
-    }
-    return roundAndPackFloat32( aSign, aExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point
-value `a' to the double-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float128_to_float64( float128 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 aSig0, aSig1;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( aSig0 | aSig1 ) {
-            return commonNaNToFloat64( float128ToCommonNaN( a ) );
-        }
-        return packFloat64( aSign, 0x7FF, 0 );
-    }
-    shortShift128Left( aSig0, aSig1, 14, &aSig0, &aSig1 );
-    aSig0 |= ( aSig1 != 0 );
-    if ( aExp || aSig0 ) {
-        aSig0 |= LIT64( 0x4000000000000000 );
-        aExp -= 0x3C01;
-    }
-    return roundAndPackFloat64( aSign, aExp, aSig0 );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point
-value `a' to the extended double-precision floating-point format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 float128_to_floatx80( float128 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 aSig0, aSig1;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( aSig0 | aSig1 ) {
-            return commonNaNToFloatx80( float128ToCommonNaN( a ) );
-        }
-        return packFloatx80( aSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return packFloatx80( aSign, 0, 0 );
-        normalizeFloat128Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    else {
-        aSig0 |= LIT64( 0x0001000000000000 );
-    }
-    shortShift128Left( aSig0, aSig1, 15, &aSig0, &aSig1 );
-    return roundAndPackFloatx80( 80, aSign, aExp, aSig0, aSig1 );
-
-}
-
-#endif
-
-/*
--------------------------------------------------------------------------------
-Rounds the quadruple-precision floating-point value `a' to an integer, and
-returns the result as a quadruple-precision floating-point value.  The
-operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    float128 z;
-
-    aExp = extractFloat128Exp( a );
-    if ( 0x402F <= aExp ) {
-        if ( 0x406F <= aExp ) {
-            if (    ( aExp == 0x7FFF )
-                 && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) )
-               ) {
-                return propagateFloat128NaN( a, a );
-            }
-            return a;
-        }
-        lastBitMask = 1;
-        lastBitMask = ( lastBitMask<<( 0x406E - aExp ) )<<1;
-        roundBitsMask = lastBitMask - 1;
-        z = a;
-        roundingMode = float_rounding_mode;
-        if ( roundingMode == float_round_nearest_even ) {
-            if ( lastBitMask ) {
-                add128( z.high, z.low, 0, lastBitMask>>1, &z.high, &z.low );
-                if ( ( z.low & roundBitsMask ) == 0 ) z.low &= ~ lastBitMask;
-            }
-            else {
-                if ( (sbits64) z.low < 0 ) {
-                    ++z.high;
-                    if ( (bits64) ( z.low<<1 ) == 0 ) z.high &= ~1;
-                }
-            }
-        }
-        else if ( roundingMode != float_round_to_zero ) {
-            if (   extractFloat128Sign( z )
-                 ^ ( roundingMode == float_round_up ) ) {
-                add128( z.high, z.low, 0, roundBitsMask, &z.high, &z.low );
-            }
-        }
-        z.low &= ~ roundBitsMask;
-    }
-    else {
-        if ( aExp < 0x3FFF ) {
-            if ( ( ( (bits64) ( a.high<<1 ) ) | a.low ) == 0 ) return a;
-            set_float_exception_inexact_flag();
-            aSign = extractFloat128Sign( a );
-            switch ( float_rounding_mode ) {
-             case float_round_nearest_even:
-                if (    ( aExp == 0x3FFE )
-                     && (   extractFloat128Frac0( a )
-                          | extractFloat128Frac1( a ) )
-                   ) {
-                    return packFloat128( aSign, 0x3FFF, 0, 0 );
-                }
-                break;
-	     case float_round_to_zero:
-		break;
-             case float_round_down:
-                return
-                      aSign ? packFloat128( 1, 0x3FFF, 0, 0 )
-                    : packFloat128( 0, 0, 0, 0 );
-             case float_round_up:
-                return
-                      aSign ? packFloat128( 1, 0, 0, 0 )
-                    : packFloat128( 0, 0x3FFF, 0, 0 );
-            }
-            return packFloat128( aSign, 0, 0, 0 );
-        }
-        lastBitMask = 1;
-        lastBitMask <<= 0x402F - aExp;
-        roundBitsMask = lastBitMask - 1;
-        z.low = 0;
-        z.high = a.high;
-        roundingMode = float_rounding_mode;
-        if ( roundingMode == float_round_nearest_even ) {
-            z.high += lastBitMask>>1;
-            if ( ( ( z.high & roundBitsMask ) | a.low ) == 0 ) {
-                z.high &= ~ lastBitMask;
-            }
-        }
-        else if ( roundingMode != float_round_to_zero ) {
-            if (   extractFloat128Sign( z )
-                 ^ ( roundingMode == float_round_up ) ) {
-                z.high |= ( a.low != 0 );
-                z.high += roundBitsMask;
-            }
-        }
-        z.high &= ~ roundBitsMask;
-    }
-    if ( ( z.low != a.low ) || ( z.high != a.high ) ) {
-        set_float_exception_inexact_flag();
-    }
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the quadruple-precision
-floating-point values `a' and `b'.  If `zSign' is 1, the sum is negated
-before being returned.  `zSign' is ignored if the result is a NaN.
-The addition is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float128 addFloat128Sigs( float128 a, float128 b, flag zSign )
-{
-    int32 aExp, bExp, zExp;
-    bits64 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2;
-    int32 expDiff;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    bSig1 = extractFloat128Frac1( b );
-    bSig0 = extractFloat128Frac0( b );
-    bExp = extractFloat128Exp( b );
-    expDiff = aExp - bExp;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0x7FFF ) {
-            if ( aSig0 | aSig1 ) return propagateFloat128NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) {
-            --expDiff;
-        }
-        else {
-            bSig0 |= LIT64( 0x0001000000000000 );
-        }
-        shift128ExtraRightJamming(
-            bSig0, bSig1, 0, expDiff, &bSig0, &bSig1, &zSig2 );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0x7FFF ) {
-            if ( bSig0 | bSig1 ) return propagateFloat128NaN( a, b );
-            return packFloat128( zSign, 0x7FFF, 0, 0 );
-        }
-        if ( aExp == 0 ) {
-            ++expDiff;
-        }
-        else {
-            aSig0 |= LIT64( 0x0001000000000000 );
-        }
-        shift128ExtraRightJamming(
-            aSig0, aSig1, 0, - expDiff, &aSig0, &aSig1, &zSig2 );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0x7FFF ) {
-            if ( aSig0 | aSig1 | bSig0 | bSig1 ) {
-                return propagateFloat128NaN( a, b );
-            }
-            return a;
-        }
-        add128( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1 );
-        if ( aExp == 0 ) return packFloat128( zSign, 0, zSig0, zSig1 );
-        zSig2 = 0;
-        zSig0 |= LIT64( 0x0002000000000000 );
-        zExp = aExp;
-        goto shiftRight1;
-    }
-    aSig0 |= LIT64( 0x0001000000000000 );
-    add128( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1 );
-    --zExp;
-    if ( zSig0 < LIT64( 0x0002000000000000 ) ) goto roundAndPack;
-    ++zExp;
- shiftRight1:
-    shift128ExtraRightJamming(
-        zSig0, zSig1, zSig2, 1, &zSig0, &zSig1, &zSig2 );
- roundAndPack:
-    return roundAndPackFloat128( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the quadruple-
-precision floating-point values `a' and `b'.  If `zSign' is 1, the
-difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float128 subFloat128Sigs( float128 a, float128 b, flag zSign )
-{
-    int32 aExp, bExp, zExp;
-    bits64 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1;
-    int32 expDiff;
-    float128 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    bSig1 = extractFloat128Frac1( b );
-    bSig0 = extractFloat128Frac0( b );
-    bExp = extractFloat128Exp( b );
-    expDiff = aExp - bExp;
-    shortShift128Left( aSig0, aSig1, 14, &aSig0, &aSig1 );
-    shortShift128Left( bSig0, bSig1, 14, &bSig0, &bSig1 );
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0x7FFF ) {
-        if ( aSig0 | aSig1 | bSig0 | bSig1 ) {
-            return propagateFloat128NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        z.low = float128_default_nan_low;
-        z.high = float128_default_nan_high;
-        return z;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    if ( bSig0 < aSig0 ) goto aBigger;
-    if ( aSig0 < bSig0 ) goto bBigger;
-    if ( bSig1 < aSig1 ) goto aBigger;
-    if ( aSig1 < bSig1 ) goto bBigger;
-    return packFloat128( float_rounding_mode == float_round_down, 0, 0, 0 );
- bExpBigger:
-    if ( bExp == 0x7FFF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat128NaN( a, b );
-        return packFloat128( zSign ^ 1, 0x7FFF, 0, 0 );
-    }
-    if ( aExp == 0 ) {
-        ++expDiff;
-    }
-    else {
-        aSig0 |= LIT64( 0x4000000000000000 );
-    }
-    shift128RightJamming( aSig0, aSig1, - expDiff, &aSig0, &aSig1 );
-    bSig0 |= LIT64( 0x4000000000000000 );
- bBigger:
-    sub128( bSig0, bSig1, aSig0, aSig1, &zSig0, &zSig1 );
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0x7FFF ) {
-        if ( aSig0 | aSig1 ) return propagateFloat128NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        --expDiff;
-    }
-    else {
-        bSig0 |= LIT64( 0x4000000000000000 );
-    }
-    shift128RightJamming( bSig0, bSig1, expDiff, &bSig0, &bSig1 );
-    aSig0 |= LIT64( 0x4000000000000000 );
- aBigger:
-    sub128( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1 );
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat128( zSign, zExp - 14, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the quadruple-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float128_add( float128 a, float128 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat128Sign( a );
-    bSign = extractFloat128Sign( b );
-    if ( aSign == bSign ) {
-        return addFloat128Sigs( a, b, aSign );
-    }
-    else {
-        return subFloat128Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the quadruple-precision floating-point
-values `a' and `b'.  The operation is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float128_sub( float128 a, float128 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat128Sign( a );
-    bSign = extractFloat128Sign( b );
-    if ( aSign == bSign ) {
-        return subFloat128Sigs( a, b, aSign );
-    }
-    else {
-        return addFloat128Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the quadruple-precision floating-point
-values `a' and `b'.  The operation is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float128_mul( float128 a, float128 b )
-{
-    flag aSign, bSign, zSign;
-    int32 aExp, bExp, zExp;
-    bits64 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2, zSig3;
-    float128 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    bSig1 = extractFloat128Frac1( b );
-    bSig0 = extractFloat128Frac0( b );
-    bExp = extractFloat128Exp( b );
-    bSign = extractFloat128Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FFF ) {
-        if (    ( aSig0 | aSig1 )
-             || ( ( bExp == 0x7FFF ) && ( bSig0 | bSig1 ) ) ) {
-            return propagateFloat128NaN( a, b );
-        }
-        if ( ( bExp | bSig0 | bSig1 ) == 0 ) goto invalid;
-        return packFloat128( zSign, 0x7FFF, 0, 0 );
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat128NaN( a, b );
-        if ( ( aExp | aSig0 | aSig1 ) == 0 ) {
- invalid:
-            float_raise( float_flag_invalid );
-            z.low = float128_default_nan_low;
-            z.high = float128_default_nan_high;
-            return z;
-        }
-        return packFloat128( zSign, 0x7FFF, 0, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return packFloat128( zSign, 0, 0, 0 );
-        normalizeFloat128Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    if ( bExp == 0 ) {
-        if ( ( bSig0 | bSig1 ) == 0 ) return packFloat128( zSign, 0, 0, 0 );
-        normalizeFloat128Subnormal( bSig0, bSig1, &bExp, &bSig0, &bSig1 );
-    }
-    zExp = aExp + bExp - 0x4000;
-    aSig0 |= LIT64( 0x0001000000000000 );
-    shortShift128Left( bSig0, bSig1, 16, &bSig0, &bSig1 );
-    mul128To256( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1, &zSig2, &zSig3 );
-    add128( zSig0, zSig1, aSig0, aSig1, &zSig0, &zSig1 );
-    zSig2 |= ( zSig3 != 0 );
-    if ( LIT64( 0x0002000000000000 ) <= zSig0 ) {
-        shift128ExtraRightJamming(
-            zSig0, zSig1, zSig2, 1, &zSig0, &zSig1, &zSig2 );
-        ++zExp;
-    }
-    return roundAndPackFloat128( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the quadruple-precision floating-point value
-`a' by the corresponding value `b'.  The operation is performed according to
-the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float128_div( float128 a, float128 b )
-{
-    flag aSign, bSign, zSign;
-    int32 aExp, bExp, zExp;
-    bits64 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2;
-    bits64 rem0, rem1, rem2, rem3, term0, term1, term2, term3;
-    float128 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    bSig1 = extractFloat128Frac1( b );
-    bSig0 = extractFloat128Frac0( b );
-    bExp = extractFloat128Exp( b );
-    bSign = extractFloat128Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FFF ) {
-        if ( aSig0 | aSig1 ) return propagateFloat128NaN( a, b );
-        if ( bExp == 0x7FFF ) {
-            if ( bSig0 | bSig1 ) return propagateFloat128NaN( a, b );
-            goto invalid;
-        }
-        return packFloat128( zSign, 0x7FFF, 0, 0 );
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat128NaN( a, b );
-        return packFloat128( zSign, 0, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( ( bSig0 | bSig1 ) == 0 ) {
-            if ( ( aExp | aSig0 | aSig1 ) == 0 ) {
- invalid:
-                float_raise( float_flag_invalid );
-                z.low = float128_default_nan_low;
-                z.high = float128_default_nan_high;
-                return z;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloat128( zSign, 0x7FFF, 0, 0 );
-        }
-        normalizeFloat128Subnormal( bSig0, bSig1, &bExp, &bSig0, &bSig1 );
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return packFloat128( zSign, 0, 0, 0 );
-        normalizeFloat128Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    zExp = aExp - bExp + 0x3FFD;
-    shortShift128Left(
-        aSig0 | LIT64( 0x0001000000000000 ), aSig1, 15, &aSig0, &aSig1 );
-    shortShift128Left(
-        bSig0 | LIT64( 0x0001000000000000 ), bSig1, 15, &bSig0, &bSig1 );
-    if ( le128( bSig0, bSig1, aSig0, aSig1 ) ) {
-        shift128Right( aSig0, aSig1, 1, &aSig0, &aSig1 );
-        ++zExp;
-    }
-    zSig0 = estimateDiv128To64( aSig0, aSig1, bSig0 );
-    mul128By64To192( bSig0, bSig1, zSig0, &term0, &term1, &term2 );
-    sub192( aSig0, aSig1, 0, term0, term1, term2, &rem0, &rem1, &rem2 );
-    while ( (sbits64) rem0 < 0 ) {
-        --zSig0;
-        add192( rem0, rem1, rem2, 0, bSig0, bSig1, &rem0, &rem1, &rem2 );
-    }
-    zSig1 = estimateDiv128To64( rem1, rem2, bSig0 );
-    if ( ( zSig1 & 0x3FFF ) <= 4 ) {
-        mul128By64To192( bSig0, bSig1, zSig1, &term1, &term2, &term3 );
-        sub192( rem1, rem2, 0, term1, term2, term3, &rem1, &rem2, &rem3 );
-        while ( (sbits64) rem1 < 0 ) {
-            --zSig1;
-            add192( rem1, rem2, rem3, 0, bSig0, bSig1, &rem1, &rem2, &rem3 );
-        }
-        zSig1 |= ( ( rem1 | rem2 | rem3 ) != 0 );
-    }
-    shift128ExtraRightJamming( zSig0, zSig1, 0, 15, &zSig0, &zSig1, &zSig2 );
-    return roundAndPackFloat128( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the quadruple-precision floating-point value `a'
-with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float128_rem( float128 a, float128 b )
-{
-    flag aSign, zSign;
-    int32 aExp, bExp, expDiff;
-    bits64 aSig0, aSig1, bSig0, bSig1, q, term0, term1, term2;
-    bits64 allZero, alternateASig0, alternateASig1, sigMean1;
-    sbits64 sigMean0;
-    float128 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    bSig1 = extractFloat128Frac1( b );
-    bSig0 = extractFloat128Frac0( b );
-    bExp = extractFloat128Exp( b );
-    if ( aExp == 0x7FFF ) {
-        if (    ( aSig0 | aSig1 )
-             || ( ( bExp == 0x7FFF ) && ( bSig0 | bSig1 ) ) ) {
-            return propagateFloat128NaN( a, b );
-        }
-        goto invalid;
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat128NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( ( bSig0 | bSig1 ) == 0 ) {
- invalid:
-            float_raise( float_flag_invalid );
-            z.low = float128_default_nan_low;
-            z.high = float128_default_nan_high;
-            return z;
-        }
-        normalizeFloat128Subnormal( bSig0, bSig1, &bExp, &bSig0, &bSig1 );
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return a;
-        normalizeFloat128Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    expDiff = aExp - bExp;
-    if ( expDiff < -1 ) return a;
-    shortShift128Left(
-        aSig0 | LIT64( 0x0001000000000000 ),
-        aSig1,
-        15 - ( expDiff < 0 ),
-        &aSig0,
-        &aSig1
-    );
-    shortShift128Left(
-        bSig0 | LIT64( 0x0001000000000000 ), bSig1, 15, &bSig0, &bSig1 );
-    q = le128( bSig0, bSig1, aSig0, aSig1 );
-    if ( q ) sub128( aSig0, aSig1, bSig0, bSig1, &aSig0, &aSig1 );
-    expDiff -= 64;
-    while ( 0 < expDiff ) {
-        q = estimateDiv128To64( aSig0, aSig1, bSig0 );
-        q = ( 4 < q ) ? q - 4 : 0;
-        mul128By64To192( bSig0, bSig1, q, &term0, &term1, &term2 );
-        shortShift192Left( term0, term1, term2, 61, &term1, &term2, &allZero );
-        shortShift128Left( aSig0, aSig1, 61, &aSig0, &allZero );
-        sub128( aSig0, 0, term1, term2, &aSig0, &aSig1 );
-        expDiff -= 61;
-    }
-    if ( -64 < expDiff ) {
-        q = estimateDiv128To64( aSig0, aSig1, bSig0 );
-        q = ( 4 < q ) ? q - 4 : 0;
-        q >>= - expDiff;
-        shift128Right( bSig0, bSig1, 12, &bSig0, &bSig1 );
-        expDiff += 52;
-        if ( expDiff < 0 ) {
-            shift128Right( aSig0, aSig1, - expDiff, &aSig0, &aSig1 );
-        }
-        else {
-            shortShift128Left( aSig0, aSig1, expDiff, &aSig0, &aSig1 );
-        }
-        mul128By64To192( bSig0, bSig1, q, &term0, &term1, &term2 );
-        sub128( aSig0, aSig1, term1, term2, &aSig0, &aSig1 );
-    }
-    else {
-        shift128Right( aSig0, aSig1, 12, &aSig0, &aSig1 );
-        shift128Right( bSig0, bSig1, 12, &bSig0, &bSig1 );
-    }
-    do {
-        alternateASig0 = aSig0;
-        alternateASig1 = aSig1;
-        ++q;
-        sub128( aSig0, aSig1, bSig0, bSig1, &aSig0, &aSig1 );
-    } while ( 0 <= (sbits64) aSig0 );
-    add128(
-        aSig0, aSig1, alternateASig0, alternateASig1, (bits64 *)&sigMean0, &sigMean1 );
-    if (    ( sigMean0 < 0 )
-         || ( ( ( sigMean0 | sigMean1 ) == 0 ) && ( q & 1 ) ) ) {
-        aSig0 = alternateASig0;
-        aSig1 = alternateASig1;
-    }
-    zSign = ( (sbits64) aSig0 < 0 );
-    if ( zSign ) sub128( 0, 0, aSig0, aSig1, &aSig0, &aSig1 );
-    return
-        normalizeRoundAndPackFloat128( aSign ^ zSign, bExp - 4, aSig0, aSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the square root of the quadruple-precision floating-point value `a'.
-The operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float128_sqrt( float128 a )
-{
-    flag aSign;
-    int32 aExp, zExp;
-    bits64 aSig0, aSig1, zSig0, zSig1, zSig2, doubleZSig0;
-    bits64 rem0, rem1, rem2, rem3, term0, term1, term2, term3;
-    float128 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( aSig0 | aSig1 ) return propagateFloat128NaN( a, a );
-        if ( ! aSign ) return a;
-        goto invalid;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig0 | aSig1 ) == 0 ) return a;
- invalid:
-        float_raise( float_flag_invalid );
-        z.low = float128_default_nan_low;
-        z.high = float128_default_nan_high;
-        return z;
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return packFloat128( 0, 0, 0, 0 );
-        normalizeFloat128Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    zExp = (int32) ( (aExp - 0x3FFF) >> 1) + 0x3FFE;
-    aSig0 |= LIT64( 0x0001000000000000 );
-    zSig0 = estimateSqrt32((int16)aExp, (bits32)(aSig0>>17));
-    shortShift128Left( aSig0, aSig1, 13 - ( aExp & 1 ), &aSig0, &aSig1 );
-    zSig0 = estimateDiv128To64( aSig0, aSig1, zSig0<<32 ) + ( zSig0<<30 );
-    doubleZSig0 = zSig0<<1;
-    mul64To128( zSig0, zSig0, &term0, &term1 );
-    sub128( aSig0, aSig1, term0, term1, &rem0, &rem1 );
-    while ( (sbits64) rem0 < 0 ) {
-        --zSig0;
-        doubleZSig0 -= 2;
-        add128( rem0, rem1, zSig0>>63, doubleZSig0 | 1, &rem0, &rem1 );
-    }
-    zSig1 = estimateDiv128To64( rem1, 0, doubleZSig0 );
-    if ( ( zSig1 & 0x1FFF ) <= 5 ) {
-        if ( zSig1 == 0 ) zSig1 = 1;
-        mul64To128( doubleZSig0, zSig1, &term1, &term2 );
-        sub128( rem1, 0, term1, term2, &rem1, &rem2 );
-        mul64To128( zSig1, zSig1, &term2, &term3 );
-        sub192( rem1, rem2, 0, 0, term2, term3, &rem1, &rem2, &rem3 );
-        while ( (sbits64) rem1 < 0 ) {
-            --zSig1;
-            shortShift128Left( 0, zSig1, 1, &term2, &term3 );
-            term3 |= 1;
-            term2 |= doubleZSig0;
-            add192( rem1, rem2, rem3, 0, term2, term3, &rem1, &rem2, &rem3 );
-        }
-        zSig1 |= ( ( rem1 | rem2 | rem3 ) != 0 );
-    }
-    shift128ExtraRightJamming( zSig0, zSig1, 0, 14, &zSig0, &zSig1, &zSig2 );
-    return roundAndPackFloat128( 0, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float128_eq( float128 a, float128 b )
-{
-
-    if (    (    ( extractFloat128Exp( a ) == 0x7FFF )
-              && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) ) )
-         || (    ( extractFloat128Exp( b ) == 0x7FFF )
-              && ( extractFloat128Frac0( b ) | extractFloat128Frac1( b ) ) )
-       ) {
-        if (    float128_is_signaling_nan( a )
-             || float128_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return
-           ( a.low == b.low )
-        && (    ( a.high == b.high )
-             || (    ( a.low == 0 )
-                  && ( (bits64) ( ( a.high | b.high )<<1 ) == 0 ) )
-           );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is less than
-or equal to the corresponding value `b', and 0 otherwise.  The comparison
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float128_le( float128 a, float128 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat128Exp( a ) == 0x7FFF )
-              && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) ) )
-         || (    ( extractFloat128Exp( b ) == 0x7FFF )
-              && ( extractFloat128Frac0( b ) | extractFloat128Frac1( b ) ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat128Sign( a );
-    bSign = extractFloat128Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            || (    ( ( (bits64) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 == 0 );
-    }
-    return
-          aSign ? le128( b.high, b.low, a.high, a.low )
-        : le128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float128_lt( float128 a, float128 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat128Exp( a ) == 0x7FFF )
-              && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) ) )
-         || (    ( extractFloat128Exp( b ) == 0x7FFF )
-              && ( extractFloat128Frac0( b ) | extractFloat128Frac1( b ) ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat128Sign( a );
-    bSign = extractFloat128Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            && (    ( ( (bits64) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 != 0 );
-    }
-    return
-          aSign ? lt128( b.high, b.low, a.high, a.low )
-        : lt128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The invalid exception is
-raised if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float128_eq_signaling( float128 a, float128 b )
-{
-
-    if (    (    ( extractFloat128Exp( a ) == 0x7FFF )
-              && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) ) )
-         || (    ( extractFloat128Exp( b ) == 0x7FFF )
-              && ( extractFloat128Frac0( b ) | extractFloat128Frac1( b ) ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return
-           ( a.low == b.low )
-        && (    ( a.high == b.high )
-             || (    ( a.low == 0 )
-                  && ( (bits64) ( ( a.high | b.high )<<1 ) == 0 ) )
-           );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is less than
-or equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs do not
-cause an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float128_le_quiet( float128 a, float128 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat128Exp( a ) == 0x7FFF )
-              && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) ) )
-         || (    ( extractFloat128Exp( b ) == 0x7FFF )
-              && ( extractFloat128Frac0( b ) | extractFloat128Frac1( b ) ) )
-       ) {
-        if (    float128_is_signaling_nan( a )
-             || float128_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat128Sign( a );
-    bSign = extractFloat128Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            || (    ( ( (bits64) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 == 0 );
-    }
-    return
-          aSign ? le128( b.high, b.low, a.high, a.low )
-        : le128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause an
-exception.  Otherwise, the comparison is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float128_lt_quiet( float128 a, float128 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat128Exp( a ) == 0x7FFF )
-              && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) ) )
-         || (    ( extractFloat128Exp( b ) == 0x7FFF )
-              && ( extractFloat128Frac0( b ) | extractFloat128Frac1( b ) ) )
-       ) {
-        if (    float128_is_signaling_nan( a )
-             || float128_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat128Sign( a );
-    bSign = extractFloat128Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            && (    ( ( (bits64) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 != 0 );
-    }
-    return
-          aSign ? lt128( b.high, b.low, a.high, a.low )
-        : lt128( a.high, a.low, b.high, b.low );
-
-}
-
-#endif
-
-
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
-
-/*
- * These two routines are not part of the original softfloat distribution.
- *
- * They are based on the corresponding conversions to integer but return
- * unsigned numbers instead since these functions are required by GCC.
- *
- * Added by Mark Brinicombe <mark@NetBSD.org>	27/09/97
- *
- * float64 version overhauled for SoftFloat 2a [bjh21 2000-07-15]
- */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 32-bit unsigned integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic, except that the conversion is always rounded toward zero.  If
-`a' is a NaN, the largest positive integer is returned.  If the conversion
-overflows, the largest integer positive is returned.
--------------------------------------------------------------------------------
-*/
-uint32 float64_to_uint32_round_to_zero( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits64 aSig, savedASig;
-    uint32 z;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-
-    if (aSign) {
-        float_raise( float_flag_invalid );
-    	return(0);
-    }
-
-    if ( 0x41E < aExp ) {
-        float_raise( float_flag_invalid );
-        return 0xffffffff;
-    }
-    else if ( aExp < 0x3FF ) {
-        if ( aExp || aSig ) set_float_exception_inexact_flag();
-        return 0;
-    }
-    aSig |= LIT64( 0x0010000000000000 );
-    shiftCount = 0x433 - aExp;
-    savedASig = aSig;
-    aSig >>= shiftCount;
-    z = (uint32)aSig;
-    if ( ( aSig<<shiftCount ) != savedASig ) {
-        set_float_exception_inexact_flag();
-    }
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 32-bit unsigned integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic, except that the conversion is always rounded toward zero.  If
-`a' is a NaN, the largest positive integer is returned.  If the conversion
-overflows, the largest positive integer is returned.
--------------------------------------------------------------------------------
-*/
-uint32 float32_to_uint32_round_to_zero( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig;
-    uint32 z;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    shiftCount = aExp - 0x9E;
-
-    if (aSign) {
-        float_raise( float_flag_invalid );
-    	return(0);
-    }
-    if ( 0 < shiftCount ) {
-        float_raise( float_flag_invalid );
-        return 0xFFFFFFFF;
-    }
-    else if ( aExp <= 0x7E ) {
-        if ( aExp | aSig ) set_float_exception_inexact_flag();
-        return 0;
-    }
-    aSig = ( aSig | 0x800000 )<<8;
-    z = aSig>>( - shiftCount );
-    if ( aSig<<( shiftCount & 31 ) ) {
-        set_float_exception_inexact_flag();
-    }
-    return z;
-
-}
-
-#endif
diff --git a/lib/libc/softfloat/eqdf2.c b/lib/libc/softfloat/eqdf2.c
deleted file mode 100644
index 47e4b67af..000000000
--- a/lib/libc/softfloat/eqdf2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: eqdf2.c,v 1.1 2000/06/06 08:15:02 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: eqdf2.c,v 1.1 2000/06/06 08:15:02 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-flag __eqdf2(float64, float64);
-
-flag
-__eqdf2(float64 a, float64 b)
-{
-
-#if defined(__minix) && defined(__arm__)
-	return float64_eq(a, b);
-#else
-	/* libgcc1.c says !(a == b) */
-	return !float64_eq(a, b);
-#endif /* defined(__minix) */
-}
diff --git a/lib/libc/softfloat/eqsf2.c b/lib/libc/softfloat/eqsf2.c
deleted file mode 100644
index ed4354782..000000000
--- a/lib/libc/softfloat/eqsf2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: eqsf2.c,v 1.1 2000/06/06 08:15:03 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: eqsf2.c,v 1.1 2000/06/06 08:15:03 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-flag __eqsf2(float32, float32);
-
-flag
-__eqsf2(float32 a, float32 b)
-{
-
-#if defined(__minix) && defined(__arm__)
-	return !!float32_eq(a, b);
-#else
-	/* libgcc1.c says !(a == b) */
-	return !float32_eq(a, b);
-#endif /* defined(__minix) */
-}
diff --git a/lib/libc/softfloat/eqtf2.c b/lib/libc/softfloat/eqtf2.c
deleted file mode 100644
index 8184e8c4b..000000000
--- a/lib/libc/softfloat/eqtf2.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* $NetBSD: eqtf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
-
-/*
- * Written by Matt Thomas, 2011.  This file is in the Public Domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: eqtf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#ifdef FLOAT128
-flag __eqtf2(float128, float128);
-
-flag
-__eqtf2(float128 a, float128 b)
-{
-
-	/* libgcc1.c says !(a == b) */
-	return !float128_eq(a, b);
-}
-#endif /* FLOAT128 */
diff --git a/lib/libc/softfloat/fpgetmask.c b/lib/libc/softfloat/fpgetmask.c
deleted file mode 100644
index 5430e969e..000000000
--- a/lib/libc/softfloat/fpgetmask.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* $NetBSD: fpgetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-#include "milieu.h"
-#include "softfloat.h"
-
-#ifdef __weak_alias
-__weak_alias(fpgetmask,_fpgetmask)
-#endif
-
-fp_except
-fpgetmask(void)
-{
-
-	return float_exception_mask;
-}
diff --git a/lib/libc/softfloat/fpgetround.c b/lib/libc/softfloat/fpgetround.c
deleted file mode 100644
index 4f428ab4a..000000000
--- a/lib/libc/softfloat/fpgetround.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* $NetBSD: fpgetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-#include "milieu.h"
-#include "softfloat.h"
-
-#ifdef __weak_alias
-__weak_alias(fpgetround,_fpgetround)
-#endif
-
-fp_rnd
-fpgetround(void)
-{
-
-	return float_rounding_mode;
-}
diff --git a/lib/libc/softfloat/fpgetsticky.c b/lib/libc/softfloat/fpgetsticky.c
deleted file mode 100644
index 67cfe658b..000000000
--- a/lib/libc/softfloat/fpgetsticky.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* $NetBSD: fpgetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-#include "milieu.h"
-#include "softfloat.h"
-
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-fp_except
-fpgetsticky(void)
-{
-
-	return float_exception_flags;
-}
diff --git a/lib/libc/softfloat/fpsetmask.c b/lib/libc/softfloat/fpsetmask.c
deleted file mode 100644
index a47f0b915..000000000
--- a/lib/libc/softfloat/fpsetmask.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $NetBSD: fpsetmask.c,v 1.5 2013/01/10 08:16:10 matt Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetmask.c,v 1.5 2013/01/10 08:16:10 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-#include "milieu.h"
-#include "softfloat.h"
-
-#ifdef __weak_alias
-__weak_alias(fpsetmask,_fpsetmask)
-#endif
-
-fp_except
-fpsetmask(fp_except mask)
-{
-#ifdef set_float_exception_mask
-	return set_float_exception_mask(mask);
-#else
-	const fp_except old = float_exception_mask;
-	float_exception_mask = mask;
-	return old;
-#endif
-}
diff --git a/lib/libc/softfloat/fpsetround.c b/lib/libc/softfloat/fpsetround.c
deleted file mode 100644
index eb45697dc..000000000
--- a/lib/libc/softfloat/fpsetround.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $NetBSD: fpsetround.c,v 1.4 2013/01/10 08:16:10 matt Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.4 2013/01/10 08:16:10 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-#include "milieu.h"
-#include "softfloat.h"
-
-#ifdef __weak_alias
-__weak_alias(fpsetround,_fpsetround)
-#endif
-
-fp_rnd
-fpsetround(fp_rnd rnd_dir)
-{
-#ifdef set_float_rounding_mode
-	return set_float_rounding_mode(rnd_dir);
-#else
-	const fp_rnd old = float_rounding_mode;
-	float_rounding_mode = rnd_dir;
-	return old;
-#endif
-}
diff --git a/lib/libc/softfloat/fpsetsticky.c b/lib/libc/softfloat/fpsetsticky.c
deleted file mode 100644
index 3b8be456f..000000000
--- a/lib/libc/softfloat/fpsetsticky.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $NetBSD: fpsetsticky.c,v 1.4 2013/01/10 08:16:10 matt Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetsticky.c,v 1.4 2013/01/10 08:16:10 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-#include "milieu.h"
-#include "softfloat.h"
-
-#ifdef __weak_alias
-__weak_alias(fpsetsticky,_fpsetsticky)
-#endif
-
-fp_except
-fpsetsticky(fp_except except)
-{
-#ifdef set_float_exception_flags
-	return set_float_exception_flags(except, 1);
-#else
-	const fp_except old = float_exception_flags;
-	float_exception_flags = except;
-	return old;
-#endif
-}
diff --git a/lib/libc/softfloat/gedf2.c b/lib/libc/softfloat/gedf2.c
deleted file mode 100644
index a1a1f134c..000000000
--- a/lib/libc/softfloat/gedf2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: gedf2.c,v 1.1 2000/06/06 08:15:05 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: gedf2.c,v 1.1 2000/06/06 08:15:05 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-flag __gedf2(float64, float64);
-
-flag
-__gedf2(float64 a, float64 b)
-{
-
-#if defined(__minix) && defined(__arm__)
-	return float64_le(b, a);
-#else
-	/* libgcc1.c says (a >= b) - 1 */
-	return float64_le(b, a) - 1;
-#endif /* defined(__minix) */
-}
diff --git a/lib/libc/softfloat/gesf2.c b/lib/libc/softfloat/gesf2.c
deleted file mode 100644
index cf59a09e9..000000000
--- a/lib/libc/softfloat/gesf2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: gesf2.c,v 1.1 2000/06/06 08:15:05 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: gesf2.c,v 1.1 2000/06/06 08:15:05 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-flag __gesf2(float32, float32);
-
-flag
-__gesf2(float32 a, float32 b)
-{
-
-#if defined(__minix) && defined(__arm__)
-	return float32_le(b, a);
-#else
-	/* libgcc1.c says (a >= b) - 1 */
-	return float32_le(b, a) - 1;
-#endif /* defined(__minix) */
-}
diff --git a/lib/libc/softfloat/getf2.c b/lib/libc/softfloat/getf2.c
deleted file mode 100644
index c97708ad7..000000000
--- a/lib/libc/softfloat/getf2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: getf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
-
-/*
- * Written by Matt Thomas, 2011.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef FLOAT128
-
-flag __getf2(float128, float128);
-
-flag
-__getf2(float128 a, float128 b)
-{
-
-	/* libgcc1.c says (a >= b) - 1 */
-	return float128_le(b, a) - 1;
-}
-
-#endif /* FLOAT128 */
diff --git a/lib/libc/softfloat/gexf2.c b/lib/libc/softfloat/gexf2.c
deleted file mode 100644
index 98404d520..000000000
--- a/lib/libc/softfloat/gexf2.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $NetBSD: gexf2.c,v 1.2 2004/09/27 10:16:24 he Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: gexf2.c,v 1.2 2004/09/27 10:16:24 he Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef FLOATX80
-
-flag __gexf2(floatx80, floatx80);
-
-flag
-__gexf2(floatx80 a, floatx80 b)
-{
-
-	/* libgcc1.c says (a >= b) - 1 */
-	return floatx80_le(b, a) - 1;
-}
-#endif /* FLOATX80 */
diff --git a/lib/libc/softfloat/gtdf2.c b/lib/libc/softfloat/gtdf2.c
deleted file mode 100644
index c9ba39352..000000000
--- a/lib/libc/softfloat/gtdf2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $NetBSD: gtdf2.c,v 1.1 2000/06/06 08:15:05 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: gtdf2.c,v 1.1 2000/06/06 08:15:05 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-flag __gtdf2(float64, float64);
-
-flag
-__gtdf2(float64 a, float64 b)
-{
-
-	/* libgcc1.c says a > b */
-	return float64_lt(b, a);
-}
diff --git a/lib/libc/softfloat/gtsf2.c b/lib/libc/softfloat/gtsf2.c
deleted file mode 100644
index 77258750a..000000000
--- a/lib/libc/softfloat/gtsf2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $NetBSD: gtsf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: gtsf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-flag __gtsf2(float32, float32);
-
-flag
-__gtsf2(float32 a, float32 b)
-{
-
-	/* libgcc1.c says a > b */
-	return float32_lt(b, a);
-}
diff --git a/lib/libc/softfloat/gttf2.c b/lib/libc/softfloat/gttf2.c
deleted file mode 100644
index 8ef472c81..000000000
--- a/lib/libc/softfloat/gttf2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: gttf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
-
-/*
- * Written by Matt Thomas, 2011.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: gttf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef FLOAT128
-
-flag __gttf2(float128, float128);
-
-flag
-__gttf2(float128 a, float128 b)
-{
-
-	/* libgcc1.c says a > b */
-	return float128_lt(b, a);
-}
-
-#endif /* FLOAT128 */
diff --git a/lib/libc/softfloat/gtxf2.c b/lib/libc/softfloat/gtxf2.c
deleted file mode 100644
index 20c8de1e9..000000000
--- a/lib/libc/softfloat/gtxf2.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $NetBSD: gtxf2.c,v 1.2 2004/09/27 10:16:24 he Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: gtxf2.c,v 1.2 2004/09/27 10:16:24 he Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef FLOATX80
-
-flag __gtxf2(floatx80, floatx80);
-
-flag
-__gtxf2(floatx80 a, floatx80 b)
-{
-
-	/* libgcc1.c says a > b */
-	return floatx80_lt(b, a);
-}
-#endif /* FLOATX80 */
diff --git a/lib/libc/softfloat/ledf2.c b/lib/libc/softfloat/ledf2.c
deleted file mode 100644
index 5ae03155d..000000000
--- a/lib/libc/softfloat/ledf2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: ledf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ledf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-flag __ledf2(float64, float64);
-
-flag
-__ledf2(float64 a, float64 b)
-{
-
-#if defined(__minix) && defined(__arm__)
-	return float64_le(a, b);
-#else
-	/* libgcc1.c says 1 - (a <= b) */
-	return 1 - float64_le(a, b);
-#endif /* defined(__minix) */
-}
diff --git a/lib/libc/softfloat/lesf2.c b/lib/libc/softfloat/lesf2.c
deleted file mode 100644
index c578929a4..000000000
--- a/lib/libc/softfloat/lesf2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: lesf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: lesf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-flag __lesf2(float32, float32);
-
-flag
-__lesf2(float32 a, float32 b)
-{
-
-#if defined(__minix) && defined(__arm__)
-	return float32_le(a, b);
-#else
-	/* libgcc1.c says 1 - (a <= b) */
-	return 1 - float32_le(a, b);
-#endif /* defined(__minix) */
-}
diff --git a/lib/libc/softfloat/letf2.c b/lib/libc/softfloat/letf2.c
deleted file mode 100644
index 20b1e1edb..000000000
--- a/lib/libc/softfloat/letf2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: letf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
-
-/*
- * Written by Matt Thomas, 2011.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: letf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef FLOAT128
-
-flag __letf2(float128, float128);
-
-flag
-__letf2(float128 a, float128 b)
-{
-
-	/* libgcc1.c says 1 - (a <= b) */
-	return 1 - float128_le(a, b);
-}
-
-#endif /* FLOAT128 */
diff --git a/lib/libc/softfloat/ltdf2.c b/lib/libc/softfloat/ltdf2.c
deleted file mode 100644
index 9ab849f06..000000000
--- a/lib/libc/softfloat/ltdf2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $NetBSD: ltdf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ltdf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-flag __ltdf2(float64, float64);
-
-flag
-__ltdf2(float64 a, float64 b)
-{
-
-	/* libgcc1.c says -(a < b) */
-	return -float64_lt(a, b);
-}
diff --git a/lib/libc/softfloat/ltsf2.c b/lib/libc/softfloat/ltsf2.c
deleted file mode 100644
index 1bd736d9b..000000000
--- a/lib/libc/softfloat/ltsf2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $NetBSD: ltsf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ltsf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-flag __ltsf2(float32, float32);
-
-flag
-__ltsf2(float32 a, float32 b)
-{
-
-	/* libgcc1.c says -(a < b) */
-	return -float32_lt(a, b);
-}
diff --git a/lib/libc/softfloat/lttf2.c b/lib/libc/softfloat/lttf2.c
deleted file mode 100644
index f4b927335..000000000
--- a/lib/libc/softfloat/lttf2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: lttf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
-
-/*
- * Written by Matt Thomas, 2011.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: lttf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef FLOAT128
-
-flag __lttf2(float128, float128);
-
-flag
-__lttf2(float128 a, float128 b)
-{
-
-	/* libgcc1.c says -(a < b) */
-	return -float128_lt(a, b);
-}
-
-#endif /* FLOAT128 */
diff --git a/lib/libc/softfloat/nedf2.c b/lib/libc/softfloat/nedf2.c
deleted file mode 100644
index 09735c71b..000000000
--- a/lib/libc/softfloat/nedf2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $NetBSD: nedf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nedf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-flag __nedf2(float64, float64);
-
-flag
-__nedf2(float64 a, float64 b)
-{
-
-	/* libgcc1.c says a != b */
-	return !float64_eq(a, b);
-}
diff --git a/lib/libc/softfloat/negdf2.c b/lib/libc/softfloat/negdf2.c
deleted file mode 100644
index fb55bb209..000000000
--- a/lib/libc/softfloat/negdf2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $NetBSD: negdf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: negdf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-float64 __negdf2(float64);
-
-float64
-__negdf2(float64 a)
-{
-
-	/* libgcc1.c says -a */
-	return a ^ FLOAT64_MANGLE(0x8000000000000000ULL);
-}
diff --git a/lib/libc/softfloat/negsf2.c b/lib/libc/softfloat/negsf2.c
deleted file mode 100644
index b2f2e679a..000000000
--- a/lib/libc/softfloat/negsf2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $NetBSD: negsf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: negsf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-float32 __negsf2(float32);
-
-float32
-__negsf2(float32 a)
-{
-
-	/* libgcc1.c says INTIFY(-a) */
-	return a ^ 0x80000000;
-}
diff --git a/lib/libc/softfloat/negtf2.c b/lib/libc/softfloat/negtf2.c
deleted file mode 100644
index 16268bdcb..000000000
--- a/lib/libc/softfloat/negtf2.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $NetBSD: negtf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
-
-/*
- * Written by Matt Thomas, 2011.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: negtf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef FLOAT128
-
-float128 __negtf2(float128);
-
-float128
-__negtf2(float128 a)
-{
-
-	/* libgcc1.c says -a */
-	a.high ^= FLOAT64_MANGLE(0x8000000000000000ULL);
-	return a;
-}
-
-#endif /* FLOAT128 */
diff --git a/lib/libc/softfloat/negxf2.c b/lib/libc/softfloat/negxf2.c
deleted file mode 100644
index e8eb7b999..000000000
--- a/lib/libc/softfloat/negxf2.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $NetBSD: negxf2.c,v 1.2 2004/09/27 10:16:24 he Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: negxf2.c,v 1.2 2004/09/27 10:16:24 he Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef FLOATX80
-
-floatx80 __negxf2(floatx80);
-
-floatx80
-__negxf2(floatx80 a)
-{
-
-	/* libgcc1.c says -a */
-	return __mulxf3(a,__floatsixf(-1));
-}
-#endif /* FLOATX80 */
diff --git a/lib/libc/softfloat/nesf2.c b/lib/libc/softfloat/nesf2.c
deleted file mode 100644
index 97d7e736f..000000000
--- a/lib/libc/softfloat/nesf2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $NetBSD: nesf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nesf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-flag __nesf2(float32, float32);
-
-flag
-__nesf2(float32 a, float32 b)
-{
-
-	/* libgcc1.c says a != b */
-	return !float32_eq(a, b);
-}
diff --git a/lib/libc/softfloat/netf2.c b/lib/libc/softfloat/netf2.c
deleted file mode 100644
index 5481d79a3..000000000
--- a/lib/libc/softfloat/netf2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: netf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
-
-/*
- * Written by Matt Thomas, 2011.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: netf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef FLOAT128
-
-flag __netf2(float128, float128);
-
-flag
-__netf2(float128 a, float128 b)
-{
-
-	/* libgcc1.c says a != b */
-	return !float128_eq(a, b);
-}
-
-#endif /* FLOAT128 */
diff --git a/lib/libc/softfloat/nexf2.c b/lib/libc/softfloat/nexf2.c
deleted file mode 100644
index ee8d86f04..000000000
--- a/lib/libc/softfloat/nexf2.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $NetBSD: nexf2.c,v 1.2 2004/09/27 10:16:24 he Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nexf2.c,v 1.2 2004/09/27 10:16:24 he Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef FLOATX80
-
-flag __nexf2(floatx80, floatx80);
-
-flag
-__nexf2(floatx80 a, floatx80 b)
-{
-
-	/* libgcc1.c says a != b */
-	return !floatx80_eq(a, b);
-}
-#endif /* FLOATX80 */
diff --git a/lib/libc/softfloat/softfloat-for-gcc.h b/lib/libc/softfloat/softfloat-for-gcc.h
deleted file mode 100644
index 29937c1ba..000000000
--- a/lib/libc/softfloat/softfloat-for-gcc.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/* $NetBSD: softfloat-for-gcc.h,v 1.12 2013/08/01 23:21:19 matt Exp $ */
-
-/*
- * Move private identifiers with external linkage into implementation
- * namespace.  -- Klaus Klein <kleink@NetBSD.org>, May 5, 1999
- */
-#define float_exception_flags	_softfloat_float_exception_flags
-#define float_exception_mask	_softfloat_float_exception_mask
-#define float_rounding_mode	_softfloat_float_rounding_mode
-#define float_raise		_softfloat_float_raise
-
-/* The following batch are called by GCC through wrappers */
-#define float32_eq		_softfloat_float32_eq
-#define float32_le		_softfloat_float32_le
-#define float32_lt		_softfloat_float32_lt
-#define float64_eq		_softfloat_float64_eq
-#define float64_le		_softfloat_float64_le
-#define float64_lt		_softfloat_float64_lt
-#define float128_eq		_softfloat_float128_eq
-#define float128_le		_softfloat_float128_le
-#define float128_lt		_softfloat_float128_lt
-
-/*
- * Macros to define functions with the GCC expected names
- */
-
-#define float32_add			__addsf3
-#define float64_add			__adddf3
-#define floatx80_add			__addxf3
-#define float128_add			__addtf3
-
-#define float32_sub			__subsf3
-#define float64_sub			__subdf3
-#define floatx80_sub			__subxf3
-#define float128_sub			__subtf3
-
-#define float32_mul			__mulsf3
-#define float64_mul			__muldf3
-#define floatx80_mul			__mulxf3
-#define float128_mul			__multf3
-
-#define float32_div			__divsf3
-#define float64_div			__divdf3
-#define floatx80_div			__divxf3
-#define float128_div			__divtf3
-
-#if 0
-#define float32_neg			__negsf2
-#define float64_neg			__negdf2
-#define floatx80_neg			__negxf2
-#define float128_neg			__negtf2
-#endif
-
-#define int32_to_float32		__floatsisf
-#define int32_to_float64		__floatsidf
-#define int32_to_floatx80		__floatsixf
-#define int32_to_float128		__floatsitf
-
-#define int64_to_float32		__floatdisf
-#define int64_to_float64		__floatdidf
-#define int64_to_floatx80		__floatdixf
-#define int64_to_float128		__floatditf
-
-#define int128_to_float32		__floattisf
-#define int128_to_float64		__floattidf
-#define int128_to_floatx80		__floattixf
-#define int128_to_float128		__floattitf
-
-#define uint32_to_float32		__floatunsisf
-#define uint32_to_float64		__floatunsidf
-#define uint32_to_floatx80		__floatunsixf
-#define uint32_to_float128		__floatunsitf
-
-#define uint64_to_float32		__floatundisf
-#define uint64_to_float64		__floatundidf
-#define uint64_to_floatx80		__floatundixf
-#define uint64_to_float128		__floatunditf
-
-#define uint128_to_float32		__floatuntisf
-#define uint128_to_float64		__floatuntidf
-#define uint128_to_floatx80		__floatuntixf
-#define uint128_to_float128		__floatuntitf
-
-#define float32_to_int32_round_to_zero	__fixsfsi
-#define float64_to_int32_round_to_zero	__fixdfsi
-#define floatx80_to_int32_round_to_zero __fixxfsi
-#define float128_to_int32_round_to_zero __fixtfsi
-
-#define float32_to_int64_round_to_zero	__fixsfdi
-#define float64_to_int64_round_to_zero	__fixdfdi
-#define floatx80_to_int64_round_to_zero	__fixxfdi
-#define float128_to_int64_round_to_zero	__fixtfdi
-
-#define float32_to_int128_round_to_zero __fixsfti
-#define float64_to_int128_round_to_zero __fixdfti
-#define floatx80_to_int128_round_to_zero __fixxfti
-#define float128_to_int128_round_to_zero __fixtfti
-
-#define float32_to_uint32_round_to_zero	__fixunssfsi
-#define float64_to_uint32_round_to_zero	__fixunsdfsi
-#define floatx80_to_uint32_round_to_zero	__fixunsxfsi
-#define float128_to_uint32_round_to_zero	__fixunstfsi
-
-#define float32_to_uint64_round_to_zero	__fixunssfdi
-#define float64_to_uint64_round_to_zero	__fixunsdfdi
-#define floatx80_to_uint64_round_to_zero	__fixunsxfdi
-#define float128_to_uint64_round_to_zero	__fixunstfdi
-
-#define float32_to_uint128_round_to_zero	__fixunssfti
-#define float64_to_uint128_round_to_zero	__fixunsdfti
-#define floatx80_to_uint128_round_to_zero	__fixunsxfti
-#define float128_to_uint128_round_to_zero	__fixunstfti
-
-#define float32_to_float64		__extendsfdf2
-#define float32_to_floatx80		__extendsfxf2
-#define float32_to_float128		__extendsftf2
-#define float64_to_floatx80		__extenddfxf2
-#define float64_to_float128		__extenddftf2
-
-#define float128_to_float64		__trunctfdf2
-#define floatx80_to_float64		__truncxfdf2
-#define float128_to_float32		__trunctfsf2
-#define floatx80_to_float32		__truncxfsf2
-#define float64_to_float32		__truncdfsf2
-
-#if 0
-#define float32_cmp			__cmpsf2
-#define float32_unord			__unordsf2
-#define float32_eq			__eqsf2
-#define float32_ne			__nesf2
-#define float32_ge			__gesf2
-#define float32_lt			__ltsf2
-#define float32_le			__lesf2
-#define float32_gt			__gtsf2
-#endif
-
-#if 0
-#define float64_cmp			__cmpdf2
-#define float64_unord			__unorddf2
-#define float64_eq			__eqdf2
-#define float64_ne			__nedf2
-#define float64_ge			__gedf2
-#define float64_lt			__ltdf2
-#define float64_le			__ledf2
-#define float64_gt			__gtdf2
-#endif
-
-/* XXX not in libgcc */
-#if 1
-#define floatx80_cmp			__cmpxf2
-#define floatx80_unord			__unordxf2
-#define floatx80_eq			__eqxf2
-#define floatx80_ne			__nexf2
-#define floatx80_ge			__gexf2
-#define floatx80_lt			__ltxf2
-#define floatx80_le			__lexf2
-#define floatx80_gt			__gtxf2
-#endif
-
-#if 0
-#define float128_cmp			__cmptf2
-#define float128_unord			__unordtf2
-#define float128_eq			__eqtf2
-#define float128_ne			__netf2
-#define float128_ge			__getf2
-#define float128_lt			__lttf2
-#define float128_le			__letf2
-#define float128_gt			__gttf2
-#endif
-
-#ifdef __ARM_EABI__
-#ifdef __ARM_PCS_VFP
-#include <arm/aeabi.h>
-#endif
-#define __addsf3			__aeabi_fadd
-#define __adddf3			__aeabi_dadd
-
-#define __subsf3			__aeabi_fsub
-#define __subdf3			__aeabi_dsub
-
-#define __mulsf3			__aeabi_fmul
-#define __muldf3			__aeabi_dmul
-
-#define __divsf3			__aeabi_fdiv
-#define __divdf3			__aeabi_ddiv
-
-#define __floatsisf			__aeabi_i2f
-#define __floatsidf			__aeabi_i2d
-
-#define __floatdisf			__aeabi_l2f
-#define __floatdidf			__aeabi_l2d
-
-#define __floatunsisf			__aeabi_ui2f
-#define __floatunsidf			__aeabi_ui2d
-
-#define __floatundisf			__aeabi_ul2f
-#define __floatundidf			__aeabi_ul2d
-
-#define __fixsfsi			__aeabi_f2iz
-#define __fixdfsi			__aeabi_d2iz
-
-#define __fixsfdi			__aeabi_f2lz
-#define __fixdfdi			__aeabi_d2lz
-
-#define __fixunssfsi			__aeabi_f2uiz
-#define __fixunsdfsi			__aeabi_d2uiz
-
-#define __fixunssfdi			__aeabi_f2ulz
-#define __fixunsdfdi			__aeabi_d2ulz
-
-#define __extendsfdf2			__aeabi_f2d
-#define __truncdfsf2			__aeabi_d2f
-
-#endif /* __ARM_EABI__ */
diff --git a/lib/libc/softfloat/softfloat-history.txt b/lib/libc/softfloat/softfloat-history.txt
deleted file mode 100644
index 14fe06687..000000000
--- a/lib/libc/softfloat/softfloat-history.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: softfloat-history.txt,v 1.1 2000/06/06 08:15:08 bjh21 Exp $
-
-History of Major Changes to SoftFloat, up to Release 2a
-
-John R. Hauser
-1998 December 16
-
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Release 2a (1998 December)
-
--- Added functions to convert between 64-bit integers (int64) and all
-   supported floating-point formats.
-
--- Fixed a bug in all 64-bit-version square root functions except
-   `float32_sqrt' that caused the result sometimes to be off by 1 unit in
-   the last place (1 ulp) from what it should be.  (Bug discovered by Paul
-   Donahue.)
-
--- Improved the makefiles.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Release 2 (1997 June)
-
--- Created the 64-bit (bits64) version, adding the floatx80 and float128
-   formats.
-
--- Changed the source directory structure, splitting the sources into a
-   `bits32' and a `bits64' version.  Renamed `environment.h' to `milieu.h'
-   (to avoid confusion with environment variables).
-
--- Fixed a small error that caused `float64_round_to_int' often to round the
-   wrong way in nearest/even mode when the operand was between 2^20 and 2^21
-   and halfway between two integers.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Release 1a (1996 July)
-
--- Corrected a mistake that caused borderline underflow cases not to raise
-   the underflow flag when they should have.  (Problem reported by Doug
-   Priest.)
-
--- Added the `float_detect_tininess' variable to control whether tininess is
-   detected before or after rounding.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Release 1 (1996 July)
-
--- Original release.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
diff --git a/lib/libc/softfloat/softfloat-source.txt b/lib/libc/softfloat/softfloat-source.txt
deleted file mode 100644
index 49de2e021..000000000
--- a/lib/libc/softfloat/softfloat-source.txt
+++ /dev/null
@@ -1,383 +0,0 @@
-$NetBSD: softfloat-source.txt,v 1.2 2006/11/24 19:46:58 christos Exp $
-
-SoftFloat Release 2a Source Documentation
-
-John R. Hauser
-1998 December 14
-
-
--------------------------------------------------------------------------------
-Introduction
-
-SoftFloat is a software implementation of floating-point that conforms to
-the IEC/IEEE Standard for Binary Floating-Point Arithmetic.  SoftFloat can
-support four floating-point formats:  single precision, double precision,
-extended double precision, and quadruple precision.  All operations required
-by the IEEE Standard are implemented, except for conversions to and from
-decimal.  SoftFloat is distributed in the form of C source code, so a
-C compiler is needed to compile the code.  Support for the extended double-
-precision and quadruple-precision formats is dependent on the C compiler
-implementing a 64-bit integer type.
-
-This document gives information needed for compiling and/or porting
-SoftFloat.
-
-The source code for SoftFloat is intended to be relatively machine-
-independent and should be compilable using any ISO/ANSI C compiler.  At the
-time of this writing, SoftFloat has been successfully compiled with the GNU
-C Compiler (`gcc') for several platforms.
-
-
--------------------------------------------------------------------------------
-Limitations
-
-SoftFloat as written requires an ISO/ANSI-style C compiler.  No attempt has
-been made to accommodate compilers that are not ISO-conformant.  Older ``K&R-
-style'' compilers are not adequate for compiling SoftFloat.  All testing I
-have done so far has been with the GNU C Compiler.  Compilation with other
-compilers should be possible but has not been tested.
-
-The SoftFloat sources assume that source code file names can be longer than
-8 characters.  In order to compile under an MS-DOS-type system, many of the
-source files will need to be renamed, and the source and makefiles edited
-appropriately.  Once compiled, the SoftFloat binary does not depend on the
-existence of long file names.
-
-The underlying machine is assumed to be binary with a word size that is a
-power of 2.  Bytes are 8 bits.  Support for the extended double-precision
-and quadruple-precision formats depends on the C compiler implementing
-a 64-bit integer type.  If the largest integer type supported by the
-C compiler is 32 bits, SoftFloat is limited to the single- and double-
-precision formats.
-
-
--------------------------------------------------------------------------------
-Contents
-
-    Introduction
-    Limitations
-    Contents
-    Legal Notice
-    SoftFloat Source Directory Structure
-    SoftFloat Source Files
-        processors/*.h
-        softfloat/bits*/*/softfloat.h
-        softfloat/bits*/*/milieu.h
-        softfloat/bits*/*/softfloat-specialize
-        softfloat/bits*/softfloat-macros
-        softfloat/bits*/softfloat.c
-    Steps to Creating a `softfloat.o'
-    Making `softfloat.o' a Library
-    Testing SoftFloat
-    Timing SoftFloat
-    Compiler Options and Efficiency
-    Processor-Specific Optimization of `softfloat.c' Using `softfloat-macros'
-    Contact Information
-
-
-
--------------------------------------------------------------------------------
-Legal Notice
-
-SoftFloat was written by John R. Hauser.  This work was made possible in
-part by the International Computer Science Institute, located at Suite 600,
-1947 Center Street, Berkeley, California 94704.  Funding was partially
-provided by the National Science Foundation under grant MIP-9311980.  The
-original version of this code was written as part of a project to build
-a fixed-point vector processor in collaboration with the University of
-California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-
--------------------------------------------------------------------------------
-SoftFloat Source Directory Structure
-
-Because SoftFloat is targeted to multiple platforms, its source code
-is slightly scattered between target-specific and target-independent
-directories and files.  The directory structure is as follows:
-
-    processors
-    softfloat
-        bits64
-            templates
-            386-Win32-gcc
-            SPARC-Solaris-gcc
-        bits32
-            templates
-            386-Win32-gcc
-            SPARC-Solaris-gcc
-
-The two topmost directories and their contents are:
-
-    softfloat    - Most of the source code needed for SoftFloat.
-    processors   - Target-specific header files that are not specific to
-                       SoftFloat.
-
-The `softfloat' directory is further split into two parts:
-
-    bits64       - SoftFloat implementation using 64-bit integers.
-    bits32       - SoftFloat implementation using only 32-bit integers.
-
-Within these directories are subdirectories for each of the targeted
-platforms.  The SoftFloat source code is distributed with targets
-`386-Win32-gcc' and `SPARC-Solaris-gcc' (and perhaps others) already
-prepared for both the 32-bit and 64-bit implementations.  Source files that
-are not within these target-specific subdirectories are intended to be
-target-independent.
-
-The naming convention used for the target-specific directories is
-`<processor>-<executable-type>-<compiler>'.  The names of the supplied
-target directories should be interpreted as follows:
-
-  <processor>:
-    386          - Intel 386-compatible processor.
-    SPARC        - SPARC processor (as used by Sun machines).
-  <executable-type>:
-    Win32        - Microsoft Win32 executable.
-    Solaris      - Sun Solaris executable.
-  <compiler>:
-    gcc          - GNU C Compiler.
-
-You do not need to maintain this convention if you do not want to.
-
-Alongside the supplied target-specific directories is a `templates'
-directory containing a set of ``generic'' target-specific source files.  A
-new target directory can be created by copying the `templates' directory and
-editing the files inside.  (Complete instructions for porting SoftFloat to a
-new target are in the section _Steps_to_Creating_a_`softfloat.o'_.)  Note
-that the `templates' directory will not work as a target directory without
-some editing.  To avoid confusion, it would be wise to refrain from editing
-the files inside `templates' directly.
-
-
--------------------------------------------------------------------------------
-SoftFloat Source Files
-
-The purpose of each source file is described below.  In the following,
-the `*' symbol is used in place of the name of a specific target, such as
-`386-Win32-gcc' or `SPARC-Solaris-gcc', or in place of some other text, as
-in `bits*' for either `bits32' or `bits64'.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-processors/*.h
-
-The target-specific `processors' header file defines integer types
-of various sizes, and also defines certain C preprocessor macros that
-characterize the target.  The two examples supplied are `386-gcc.h' and
-`SPARC-gcc.h'.  The naming convention used for processor header files is
-`<processor>-<compiler>.h'.
-
-If 64-bit integers are supported by the compiler, the macro name `BITS64'
-should be defined here along with the corresponding 64-bit integer
-types.  In addition, the function-like macro `LIT64' must be defined for
-constructing 64-bit integer literals (constants).  The `LIT64' macro is used
-consistently in the SoftFloat code to annotate 64-bit literals.
-
-If `BITS64' is not defined, only the 32-bit version of SoftFloat can be
-compiled.  If `BITS64' _is_ defined, either can be compiled.
-
-If an inlining attribute (such as an `inline' keyword) is provided by the
-compiler, the macro `INLINE' should be defined to the appropriate keyword.
-If not, `INLINE' can be set to the keyword `static'.  The `INLINE' macro
-appears in the SoftFloat source code before every function that should
-be inlined by the compiler.  SoftFloat depends on inlining to obtain
-good speed.  Even if inlining cannot be forced with a language keyword,
-the compiler may still be able to perform inlining on its own as an
-optimization.  If a command-line option is needed to convince the compiler
-to perform this optimization, this should be assured in the makefile.  (See
-the section _Compiler_Options_and_Efficiency_ below.)
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-softfloat/bits*/*/softfloat.h
-
-The target-specific `softfloat.h' header file defines the SoftFloat
-interface as seen by clients.
-
-Unlike the actual function definitions in `softfloat.c', the declarations
-in `softfloat.h' do not use any of the types defined by the `processors'
-header file.  This is done so that clients will not have to include the
-`processors' header file in order to use SoftFloat.  Nevertheless, the
-target-specific declarations in `softfloat.h' must match what `softfloat.c'
-expects.  For example, if `int32' is defined as `int' in the `processors'
-header file, then in `softfloat.h' the output of `float32_to_int32' should
-be stated as `int', although in `softfloat.c' it is given in target-
-independent form as `int32'.
-
-For the `bits64' implementation of SoftFloat, the macro names `FLOATX80' and
-`FLOAT128' must be defined in order for the extended double-precision and
-quadruple-precision formats to be enabled in the code.  Conversely, either
-or both of the extended formats can be disabled by simply removing the
-`#define' of the respective macro.  When an extended format is not enabled,
-none of the functions that either input or output the format are defined,
-and no space is taken up in `softfloat.o' by such functions.  There is no
-provision for disabling the usual single- and double-precision formats.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-softfloat/bits*/*/milieu.h
-
-The target-specific `milieu.h' header file provides declarations that are
-needed to compile SoftFloat.  In addition, deviations from ISO/ANSI C by
-the compiler (such as names not properly declared in system header files)
-are corrected in this header if possible.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-softfloat/bits*/*/softfloat-specialize
-
-This target-specific C source fragment defines:
-
--- whether tininess for underflow is detected before or after rounding by
-       default;
--- what (if anything) special happens when exceptions are raised;
--- how signaling NaNs are distinguished from quiet NaNs;
--- the default generated quiet NaNs; and
--- how NaNs are propagated from function inputs to output.
-
-These details are not decided by the IEC/IEEE Standard.  This fragment is
-included verbatim within `softfloat.c' when SoftFloat is compiled.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-softfloat/bits*/softfloat-macros
-
-This target-independent C source fragment defines a number of arithmetic
-functions used as primitives within the `softfloat.c' source.  Most of the
-functions defined here are intended to be inlined for efficiency.  This
-fragment is included verbatim within `softfloat.c' when SoftFloat is
-compiled.
-
-Target-specific variations on this file are possible.  See the section
-_Processor-Specific_Optimization_of_`softfloat.c'_Using_`softfloat-macros'_
-below.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-softfloat/bits*/softfloat.c
-
-The target-independent `softfloat.c' source file contains the body of the
-SoftFloat implementation.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-The inclusion of the files above within each other (using `#include') can be
-shown graphically as follows:
-
-    softfloat/bits*/softfloat.c
-        softfloat/bits*/*/milieu.h
-            processors/*.h
-        softfloat/bits*/*/softfloat.h
-        softfloat/bits*/*/softfloat-specialize
-        softfloat/bits*/softfloat-macros
-
-Note in particular that `softfloat.c' does not include the `processors'
-header file directly.  Rather, `softfloat.c' includes the target-specific
-`milieu.h' header file, which in turn includes the processor header file.
-
-
--------------------------------------------------------------------------------
-Steps to Creating a `softfloat.o'
-
-Porting and/or compiling SoftFloat involves the following steps:
-
-1. If one does not already exist, create an appropriate `.h' file in the
-   `processors' directory.
-
-2. If `BITS64' is defined in the `processors' header file, choose whether
-   to compile the 32-bit or 64-bit implementation of SoftFloat.  If
-   `BITS64' is not defined, your only choice is the 32-bit implementation.
-   The remaining steps occur within either the `bits32' or `bits64'
-   subdirectories.
-
-3. If one does not already exist, create an appropriate target-specific
-   subdirectory by copying the given `templates' directory.
-
-4. In the target-specific subdirectory, edit the files `softfloat-specialize'
-   and `softfloat.h' to define the desired exception handling functions
-   and mode control values.  In the `softfloat.h' header file, ensure also
-   that all declarations give the proper target-specific type (such as
-   `int' or `long') corresponding to the target-independent type used in
-   `softfloat.c' (such as `int32').  None of the type names declared in the
-   `processors' header file should appear in `softfloat.h'.
-
-5. In the target-specific subdirectory, edit the files `milieu.h' and
-   `Makefile' to reflect the current environment.
-
-6. In the target-specific subdirectory, execute `make'.
-
-For the targets that are supplied, if the expected compiler is available
-(usually `gcc'), it should only be necessary to execute `make' in the
-target-specific subdirectory.
-
-
--------------------------------------------------------------------------------
-Making `softfloat.o' a Library
-
-SoftFloat is not made into a software library by the supplied makefile.
-If desired, `softfloat.o' can easily be put into its own library (in Unix,
-`softfloat.a') using the usual system tool (in Unix, `ar').
-
-
--------------------------------------------------------------------------------
-Testing SoftFloat
-
-SoftFloat can be tested using the `testsoftfloat' program by the same
-author.  The `testsoftfloat' program is part of the TestFloat package
-available at the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/
-TestFloat.html'.
-
-
--------------------------------------------------------------------------------
-Timing SoftFloat
-
-A program called `timesoftfloat' for timing the SoftFloat functions is
-included with the SoftFloat source code.  Compiling `timesoftfloat' should
-pose no difficulties once `softfloat.o' exists.  The supplied makefile
-will create a `timesoftfloat' executable by default after generating
-`softfloat.o'.  See `timesoftfloat.txt' for documentation about using
-`timesoftfloat'.
-
-
--------------------------------------------------------------------------------
-Compiler Options and Efficiency
-
-In order to get good speed with SoftFloat, it is important that the compiler
-inline the routines that have been marked `INLINE' in the code.  Even if
-inlining cannot be forced by an appropriate definition of the `INLINE'
-macro, the compiler may still be able to perform inlining on its own as
-an optimization.  In that case, the makefile should be edited to give the
-compiler whatever option is required to cause it to inline small functions.
-
-The ability of the processor to do fast shifts has been assumed.  Efficiency
-will not be as good on processors for which this is not the case (such as
-the original Motorola 68000 or Intel 8086 processors).
-
-
--------------------------------------------------------------------------------
-Processor-Specific Optimization of `softfloat.c' Using `softfloat-macros'
-
-The `softfloat-macros' source fragment defines arithmetic functions used
-as primitives by `softfloat.c'.  This file has been written in a target-
-independent form.  For a given target, it may be possible to improve on
-these functions using target-specific and/or non-ISO-C features (such
-as `asm' statements).  For example, one of the ``macro'' functions takes
-two word-size integers and returns their full product in two words.
-This operation can be done directly in hardware on many processors; but
-because it is not available through standard C, the function defined in
-`softfloat-macros' uses four multiplies to achieve the same result.
-
-To address these shortcomings, a customized version of `softfloat-macros'
-can be created in any of the target-specific subdirectories.  A simple
-modification to the target's makefile should be sufficient to ensure that
-the custom version is used instead of the generic one.
-
-
--------------------------------------------------------------------------------
-Contact Information
-
-At the time of this writing, the most up-to-date information about
-SoftFloat and the latest release can be found at the Web page `http://
-HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/SoftFloat.html'.
-
-
diff --git a/lib/libc/softfloat/softfloat-specialize b/lib/libc/softfloat/softfloat-specialize
deleted file mode 100644
index f721ddbce..000000000
--- a/lib/libc/softfloat/softfloat-specialize
+++ /dev/null
@@ -1,532 +0,0 @@
-/*	$NetBSD: softfloat-specialize,v 1.9 2014/08/10 05:57:31 matt Exp $	*/
-
-/* This is a derivative work. */
-
-/*
-===============================================================================
-
-This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-#include <signal.h>
-#include <string.h>
-#include <unistd.h>
-
-/*
--------------------------------------------------------------------------------
-Underflow tininess-detection mode, statically initialized to default value.
-(The declaration in `softfloat.h' must match the `int8' type here.)
--------------------------------------------------------------------------------
-*/
-#ifdef SOFTFLOAT_FOR_GCC
-static
-#endif
-int8 float_detect_tininess = float_tininess_after_rounding;
-
-/*
--------------------------------------------------------------------------------
-Raises the exceptions specified by `flags'.  Floating-point traps can be
-defined here if desired.  It is currently not possible for such a trap to
-substitute a result value.  If traps are not implemented, this routine
-should be simply `float_exception_flags |= flags;'.
--------------------------------------------------------------------------------
-*/
-#ifdef SOFTFLOAT_FOR_GCC
-#ifndef set_float_exception_mask
-#define float_exception_mask	_softfloat_float_exception_mask
-#endif
-#endif
-#ifndef set_float_exception_mask
-fp_except float_exception_mask = 0;
-#endif
-void
-float_raise( fp_except flags )
-{
-    siginfo_t info;
-    fp_except mask = float_exception_mask;
-
-#ifdef set_float_exception_mask
-    flags |= set_float_exception_flags(flags, 0);
-#else
-    float_exception_flags |= flags;
-    flags = float_exception_flags;
-#endif
-
-    flags &= mask;
-    if ( flags ) {
-	memset(&info, 0, sizeof info);
-	info.si_signo = SIGFPE;
-	info.si_pid = getpid();
-	info.si_uid = geteuid();
-	if (flags & float_flag_underflow)
-	    info.si_code = FPE_FLTUND;
-	else if (flags & float_flag_overflow)
-	    info.si_code = FPE_FLTOVF;
-	else if (flags & float_flag_divbyzero)
-	    info.si_code = FPE_FLTDIV;
-	else if (flags & float_flag_invalid)
-	    info.si_code = FPE_FLTINV;
-	else if (flags & float_flag_inexact)
-	    info.si_code = FPE_FLTRES;
-#if !defined(__minix)
-/* LSC FIXME: This kind of remove any interest to the function. We should
-               be using the minix equivalent, or do something appropriate. */
-	sigqueueinfo(getpid(), &info);
-#endif /* !defined(__minix) */
-    }
-}
-#undef float_exception_mask
-
-/*
--------------------------------------------------------------------------------
-Internal canonical NaN format.
--------------------------------------------------------------------------------
-*/
-typedef struct {
-    flag sign;
-    bits64 high, low;
-} commonNaNT;
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated single-precision NaN.
--------------------------------------------------------------------------------
-*/
-#define float32_default_nan 0xFFFFFFFF
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is a NaN;
-otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-#ifdef SOFTFLOAT_FOR_GCC
-static
-#endif
-flag float32_is_nan( float32 a )
-{
-
-    return ( (bits32)0xFF000000 < (bits32) ( a<<1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is a signaling
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-#if defined(SOFTFLOAT_FOR_GCC) \
-    && !defined(SOFTFLOATAARCH64_FOR_GCC) \
-    && !defined(SOFTFLOATSPARC64_FOR_GCC) \
-    && !defined(SOFTFLOATM68K_FOR_GCC)
-static
-#endif
-flag float32_is_signaling_nan( float32 a )
-{
-
-    return ( ( ( a>>22 ) & 0x1FF ) == 0x1FE ) && ( a & 0x003FFFFF );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point NaN
-`a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT float32ToCommonNaN( float32 a )
-{
-    commonNaNT z;
-
-    if ( float32_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a>>31;
-    z.low = 0;
-    z.high = ( (bits64) a )<<41;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the single-
-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static float32 commonNaNToFloat32( commonNaNT a )
-{
-
-    return ( ( (bits32) a.sign )<<31 ) | 0x7FC00000 | (bits32)( a.high>>41 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two single-precision floating-point values `a' and `b', one of which
-is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
-signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static float32 propagateFloat32NaN( float32 a, float32 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float32_is_nan( a );
-    aIsSignalingNaN = float32_is_signaling_nan( a );
-    bIsNaN = float32_is_nan( b );
-    bIsSignalingNaN = float32_is_signaling_nan( b );
-    a |= 0x00400000;
-    b |= 0x00400000;
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated double-precision NaN.
--------------------------------------------------------------------------------
-*/
-#define float64_default_nan LIT64( 0xFFFFFFFFFFFFFFFF )
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is a NaN;
-otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-#ifdef SOFTFLOAT_FOR_GCC
-static
-#endif
-flag float64_is_nan( float64 a )
-{
-
-    return ( (bits64)LIT64( 0xFFE0000000000000 ) <
-	     (bits64) ( FLOAT64_DEMANGLE(a)<<1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is a signaling
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-#if defined(SOFTFLOAT_FOR_GCC) \
-    && !defined(SOFTFLOATAARCH64_FOR_GCC) \
-    && !defined(SOFTFLOATSPARC64_FOR_GCC) \
-    && !defined(SOFTFLOATM68K_FOR_GCC)
-static
-#endif
-flag float64_is_signaling_nan( float64 a )
-{
-
-    return
-           ( ( ( FLOAT64_DEMANGLE(a)>>51 ) & 0xFFF ) == 0xFFE )
-        && ( FLOAT64_DEMANGLE(a) & LIT64( 0x0007FFFFFFFFFFFF ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point NaN
-`a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT float64ToCommonNaN( float64 a )
-{
-    commonNaNT z;
-
-    if ( float64_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = (flag)(FLOAT64_DEMANGLE(a)>>63);
-    z.low = 0;
-    z.high = FLOAT64_DEMANGLE(a)<<12;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the double-
-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static float64 commonNaNToFloat64( commonNaNT a )
-{
-
-    return FLOAT64_MANGLE(
-	( ( (bits64) a.sign )<<63 )
-        | LIT64( 0x7FF8000000000000 )
-        | ( a.high>>12 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two double-precision floating-point values `a' and `b', one of which
-is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
-signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static float64 propagateFloat64NaN( float64 a, float64 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float64_is_nan( a );
-    aIsSignalingNaN = float64_is_signaling_nan( a );
-    bIsNaN = float64_is_nan( b );
-    bIsSignalingNaN = float64_is_signaling_nan( b );
-    a |= FLOAT64_MANGLE(LIT64( 0x0008000000000000 ));
-    b |= FLOAT64_MANGLE(LIT64( 0x0008000000000000 ));
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated extended double-precision NaN.  The
-`high' and `low' values hold the most- and least-significant bits,
-respectively.
--------------------------------------------------------------------------------
-*/
-#define floatx80_default_nan_high 0xFFFF
-#define floatx80_default_nan_low  LIT64( 0xFFFFFFFFFFFFFFFF )
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is a
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag floatx80_is_nan( floatx80 a )
-{
-
-    return ( ( a.high & 0x7FFF ) == 0x7FFF ) && (bits64) ( a.low<<1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is a
-signaling NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag floatx80_is_signaling_nan( floatx80 a )
-{
-    bits64 aLow;
-
-    aLow = a.low & ~ LIT64( 0x4000000000000000 );
-    return
-           ( ( a.high & 0x7FFF ) == 0x7FFF )
-        && (bits64) ( aLow<<1 )
-        && ( a.low == aLow );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point NaN `a' to the canonical NaN format.  If `a' is a signaling NaN, the
-invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT floatx80ToCommonNaN( floatx80 a )
-{
-    commonNaNT z;
-
-    if ( floatx80_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a.high>>15;
-    z.low = 0;
-    z.high = a.low<<1;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the extended
-double-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static floatx80 commonNaNToFloatx80( commonNaNT a )
-{
-    floatx80 z;
-
-    z.low = LIT64( 0xC000000000000000 ) | ( a.high>>1 );
-    z.high = ( ( (bits16) a.sign )<<15 ) | 0x7FFF;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two extended double-precision floating-point values `a' and `b', one
-of which is a NaN, and returns the appropriate NaN result.  If either `a' or
-`b' is a signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static floatx80 propagateFloatx80NaN( floatx80 a, floatx80 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = floatx80_is_nan( a );
-    aIsSignalingNaN = floatx80_is_signaling_nan( a );
-    bIsNaN = floatx80_is_nan( b );
-    bIsSignalingNaN = floatx80_is_signaling_nan( b );
-    a.low |= LIT64( 0xC000000000000000 );
-    b.low |= LIT64( 0xC000000000000000 );
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated quadruple-precision NaN.  The `high' and
-`low' values hold the most- and least-significant bits, respectively.
--------------------------------------------------------------------------------
-*/
-#define float128_default_nan_high LIT64( 0xFFFFFFFFFFFFFFFF )
-#define float128_default_nan_low  LIT64( 0xFFFFFFFFFFFFFFFF )
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is a NaN;
-otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float128_is_nan( float128 a )
-{
-
-    return
-           ( (bits64)LIT64( 0xFFFE000000000000 ) <= (bits64) ( a.high<<1 ) )
-        && ( a.low || ( a.high & LIT64( 0x0000FFFFFFFFFFFF ) ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is a
-signaling NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float128_is_signaling_nan( float128 a )
-{
-
-    return
-           ( ( ( a.high>>47 ) & 0xFFFF ) == 0xFFFE )
-        && ( a.low || ( a.high & LIT64( 0x00007FFFFFFFFFFF ) ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point NaN
-`a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT float128ToCommonNaN( float128 a )
-{
-    commonNaNT z;
-
-    if ( float128_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = (flag)(a.high>>63);
-    shortShift128Left( a.high, a.low, 16, &z.high, &z.low );
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the quadruple-
-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static float128 commonNaNToFloat128( commonNaNT a )
-{
-    float128 z;
-
-    shift128Right( a.high, a.low, 16, &z.high, &z.low );
-    z.high |= ( ( (bits64) a.sign )<<63 ) | LIT64( 0x7FFF800000000000 );
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two quadruple-precision floating-point values `a' and `b', one of
-which is a NaN, and returns the appropriate NaN result.  If either `a' or
-`b' is a signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static float128 propagateFloat128NaN( float128 a, float128 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float128_is_nan( a );
-    aIsSignalingNaN = float128_is_signaling_nan( a );
-    bIsNaN = float128_is_nan( b );
-    bIsSignalingNaN = float128_is_signaling_nan( b );
-    a.high |= LIT64( 0x0000800000000000 );
-    b.high |= LIT64( 0x0000800000000000 );
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-#endif
-
diff --git a/lib/libc/softfloat/softfloat.txt b/lib/libc/softfloat/softfloat.txt
deleted file mode 100644
index a3ad43e20..000000000
--- a/lib/libc/softfloat/softfloat.txt
+++ /dev/null
@@ -1,372 +0,0 @@
-$NetBSD: softfloat.txt,v 1.2 2006/11/24 19:46:58 christos Exp $
-
-SoftFloat Release 2a General Documentation
-
-John R. Hauser
-1998 December 13
-
-
--------------------------------------------------------------------------------
-Introduction
-
-SoftFloat is a software implementation of floating-point that conforms to
-the IEC/IEEE Standard for Binary Floating-Point Arithmetic.  As many as four
-formats are supported:  single precision, double precision, extended double
-precision, and quadruple precision.  All operations required by the standard
-are implemented, except for conversions to and from decimal.
-
-This document gives information about the types defined and the routines
-implemented by SoftFloat.  It does not attempt to define or explain the
-IEC/IEEE Floating-Point Standard.  Details about the standard are available
-elsewhere.
-
-
--------------------------------------------------------------------------------
-Limitations
-
-SoftFloat is written in C and is designed to work with other C code.  The
-SoftFloat header files assume an ISO/ANSI-style C compiler.  No attempt
-has been made to accommodate compilers that are not ISO-conformant.  In
-particular, the distributed header files will not be acceptable to any
-compiler that does not recognize function prototypes.
-
-Support for the extended double-precision and quadruple-precision formats
-depends on a C compiler that implements 64-bit integer arithmetic.  If the
-largest integer format supported by the C compiler is 32 bits, SoftFloat is
-limited to only single and double precisions.  When that is the case, all
-references in this document to the extended double precision, quadruple
-precision, and 64-bit integers should be ignored.
-
-
--------------------------------------------------------------------------------
-Contents
-
-    Introduction
-    Limitations
-    Contents
-    Legal Notice
-    Types and Functions
-    Rounding Modes
-    Extended Double-Precision Rounding Precision
-    Exceptions and Exception Flags
-    Function Details
-        Conversion Functions
-        Standard Arithmetic Functions
-        Remainder Functions
-        Round-to-Integer Functions
-        Comparison Functions
-        Signaling NaN Test Functions
-        Raise-Exception Function
-    Contact Information
-
-
-
--------------------------------------------------------------------------------
-Legal Notice
-
-SoftFloat was written by John R. Hauser.  This work was made possible in
-part by the International Computer Science Institute, located at Suite 600,
-1947 Center Street, Berkeley, California 94704.  Funding was partially
-provided by the National Science Foundation under grant MIP-9311980.  The
-original version of this code was written as part of a project to build
-a fixed-point vector processor in collaboration with the University of
-California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-
--------------------------------------------------------------------------------
-Types and Functions
-
-When 64-bit integers are supported by the compiler, the `softfloat.h' header
-file defines four types:  `float32' (single precision), `float64' (double
-precision), `floatx80' (extended double precision), and `float128'
-(quadruple precision).  The `float32' and `float64' types are defined in
-terms of 32-bit and 64-bit integer types, respectively, while the `float128'
-type is defined as a structure of two 64-bit integers, taking into account
-the byte order of the particular machine being used.  The `floatx80' type
-is defined as a structure containing one 16-bit and one 64-bit integer, with
-the machine's byte order again determining the order of the `high' and `low'
-fields.
-
-When 64-bit integers are _not_ supported by the compiler, the `softfloat.h'
-header file defines only two types:  `float32' and `float64'.  Because
-ISO/ANSI C guarantees at least one built-in integer type of 32 bits,
-the `float32' type is identified with an appropriate integer type.  The
-`float64' type is defined as a structure of two 32-bit integers, with the
-machine's byte order determining the order of the fields.
-
-In either case, the types in `softfloat.h' are defined such that if a system
-implements the usual C `float' and `double' types according to the IEC/IEEE
-Standard, then the `float32' and `float64' types should be indistinguishable
-in memory from the native `float' and `double' types.  (On the other hand,
-when `float32' or `float64' values are placed in processor registers by
-the compiler, the type of registers used may differ from those used for the
-native `float' and `double' types.)
-
-SoftFloat implements the following arithmetic operations:
-
--- Conversions among all the floating-point formats, and also between
-   integers (32-bit and 64-bit) and any of the floating-point formats.
-
--- The usual add, subtract, multiply, divide, and square root operations
-   for all floating-point formats.
-
--- For each format, the floating-point remainder operation defined by the
-   IEC/IEEE Standard.
-
--- For each floating-point format, a ``round to integer'' operation that
-   rounds to the nearest integer value in the same format.  (The floating-
-   point formats can hold integer values, of course.)
-
--- Comparisons between two values in the same floating-point format.
-
-The only functions required by the IEC/IEEE Standard that are not provided
-are conversions to and from decimal.
-
-
--------------------------------------------------------------------------------
-Rounding Modes
-
-All four rounding modes prescribed by the IEC/IEEE Standard are implemented
-for all operations that require rounding.  The rounding mode is selected
-by the global variable `float_rounding_mode'.  This variable may be set
-to one of the values `float_round_nearest_even', `float_round_to_zero',
-`float_round_down', or `float_round_up'.  The rounding mode is initialized
-to nearest/even.
-
-
--------------------------------------------------------------------------------
-Extended Double-Precision Rounding Precision
-
-For extended double precision (`floatx80') only, the rounding precision
-of the standard arithmetic operations is controlled by the global variable
-`floatx80_rounding_precision'.  The operations affected are:
-
-   floatx80_add   floatx80_sub   floatx80_mul   floatx80_div   floatx80_sqrt
-
-When `floatx80_rounding_precision' is set to its default value of 80, these
-operations are rounded (as usual) to the full precision of the extended
-double-precision format.  Setting `floatx80_rounding_precision' to 32
-or to 64 causes the operations listed to be rounded to reduced precision
-equivalent to single precision (`float32') or to double precision
-(`float64'), respectively.  When rounding to reduced precision, additional
-bits in the result significand beyond the rounding point are set to zero.
-The consequences of setting `floatx80_rounding_precision' to a value other
-than 32, 64, or 80 is not specified.  Operations other than the ones listed
-above are not affected by `floatx80_rounding_precision'.
-
-
--------------------------------------------------------------------------------
-Exceptions and Exception Flags
-
-All five exception flags required by the IEC/IEEE Standard are
-implemented.  Each flag is stored as a unique bit in the global variable
-`float_exception_flags'.  The positions of the exception flag bits within
-this variable are determined by the bit masks `float_flag_inexact',
-`float_flag_underflow', `float_flag_overflow', `float_flag_divbyzero', and
-`float_flag_invalid'.  The exception flags variable is initialized to all 0,
-meaning no exceptions.
-
-An individual exception flag can be cleared with the statement
-
-    float_exception_flags &= ~ float_flag_<exception>;
-
-where `<exception>' is the appropriate name.  To raise a floating-point
-exception, the SoftFloat function `float_raise' should be used (see below).
-
-In the terminology of the IEC/IEEE Standard, SoftFloat can detect tininess
-for underflow either before or after rounding.  The choice is made by
-the global variable `float_detect_tininess', which can be set to either
-`float_tininess_before_rounding' or `float_tininess_after_rounding'.
-Detecting tininess after rounding is better because it results in fewer
-spurious underflow signals.  The other option is provided for compatibility
-with some systems.  Like most systems, SoftFloat always detects loss of
-accuracy for underflow as an inexact result.
-
-
--------------------------------------------------------------------------------
-Function Details
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Conversion Functions
-
-All conversions among the floating-point formats are supported, as are all
-conversions between a floating-point format and 32-bit and 64-bit signed
-integers.  The complete set of conversion functions is:
-
-   int32_to_float32      int64_to_float32
-   int32_to_float64      int64_to_float32
-   int32_to_floatx80     int64_to_floatx80
-   int32_to_float128     int64_to_float128
-
-   float32_to_int32      float32_to_int64
-   float32_to_int32      float64_to_int64
-   floatx80_to_int32     floatx80_to_int64
-   float128_to_int32     float128_to_int64
-
-   float32_to_float64    float32_to_floatx80   float32_to_float128
-   float64_to_float32    float64_to_floatx80   float64_to_float128
-   floatx80_to_float32   floatx80_to_float64   floatx80_to_float128
-   float128_to_float32   float128_to_float64   float128_to_floatx80
-
-Each conversion function takes one operand of the appropriate type and
-returns one result.  Conversions from a smaller to a larger floating-point
-format are always exact and so require no rounding.  Conversions from 32-bit
-integers to double precision and larger formats are also exact, and likewise
-for conversions from 64-bit integers to extended double and quadruple
-precisions.
-
-Conversions from floating-point to integer raise the invalid exception if
-the source value cannot be rounded to a representable integer of the desired
-size (32 or 64 bits).  If the floating-point operand is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as the operand is returned.
-
-On conversions to integer, if the floating-point operand is not already an
-integer value, the operand is rounded according to the current rounding
-mode as specified by `float_rounding_mode'.  Because C (and perhaps other
-languages) require that conversions to integers be rounded toward zero, the
-following functions are provided for improved speed and convenience:
-
-   float32_to_int32_round_to_zero    float32_to_int64_round_to_zero
-   float64_to_int32_round_to_zero    float64_to_int64_round_to_zero
-   floatx80_to_int32_round_to_zero   floatx80_to_int64_round_to_zero
-   float128_to_int32_round_to_zero   float128_to_int64_round_to_zero
-
-These variant functions ignore `float_rounding_mode' and always round toward
-zero.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Standard Arithmetic Functions
-
-The following standard arithmetic functions are provided:
-
-   float32_add    float32_sub    float32_mul    float32_div    float32_sqrt
-   float64_add    float64_sub    float64_mul    float64_div    float64_sqrt
-   floatx80_add   floatx80_sub   floatx80_mul   floatx80_div   floatx80_sqrt
-   float128_add   float128_sub   float128_mul   float128_div   float128_sqrt
-
-Each function takes two operands, except for `sqrt' which takes only one.
-The operands and result are all of the same type.
-
-Rounding of the extended double-precision (`floatx80') functions is affected
-by the `floatx80_rounding_precision' variable, as explained above in the
-section _Extended_Double-Precision_Rounding_Precision_.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Remainder Functions
-
-For each format, SoftFloat implements the remainder function according to
-the IEC/IEEE Standard.  The remainder functions are:
-
-   float32_rem
-   float64_rem
-   floatx80_rem
-   float128_rem
-
-Each remainder function takes two operands.  The operands and result are all
-of the same type.  Given operands x and y, the remainder functions return
-the value x - n*y, where n is the integer closest to x/y.  If x/y is exactly
-halfway between two integers, n is the even integer closest to x/y.  The
-remainder functions are always exact and so require no rounding.
-
-Depending on the relative magnitudes of the operands, the remainder
-functions can take considerably longer to execute than the other SoftFloat
-functions.  This is inherent in the remainder operation itself and is not a
-flaw in the SoftFloat implementation.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Round-to-Integer Functions
-
-For each format, SoftFloat implements the round-to-integer function
-specified by the IEC/IEEE Standard.  The functions are:
-
-   float32_round_to_int
-   float64_round_to_int
-   floatx80_round_to_int
-   float128_round_to_int
-
-Each function takes a single floating-point operand and returns a result of
-the same type.  (Note that the result is not an integer type.)  The operand
-is rounded to an exact integer according to the current rounding mode, and
-the resulting integer value is returned in the same floating-point format.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Comparison Functions
-
-The following floating-point comparison functions are provided:
-
-   float32_eq    float32_le    float32_lt
-   float64_eq    float64_le    float64_lt
-   floatx80_eq   floatx80_le   floatx80_lt
-   float128_eq   float128_le   float128_lt
-
-Each function takes two operands of the same type and returns a 1 or 0
-representing either _true_ or _false_.  The abbreviation `eq' stands for
-``equal'' (=); `le' stands for ``less than or equal'' (<=); and `lt' stands
-for ``less than'' (<).
-
-The standard greater-than (>), greater-than-or-equal (>=), and not-equal
-(!=) functions are easily obtained using the functions provided.  The
-not-equal function is just the logical complement of the equal function.
-The greater-than-or-equal function is identical to the less-than-or-equal
-function with the operands reversed; and the greater-than function can be
-obtained from the less-than function in the same way.
-
-The IEC/IEEE Standard specifies that the less-than-or-equal and less-than
-functions raise the invalid exception if either input is any kind of NaN.
-The equal functions, on the other hand, are defined not to raise the invalid
-exception on quiet NaNs.  For completeness, SoftFloat provides the following
-additional functions:
-
-   float32_eq_signaling    float32_le_quiet    float32_lt_quiet
-   float64_eq_signaling    float64_le_quiet    float64_lt_quiet
-   floatx80_eq_signaling   floatx80_le_quiet   floatx80_lt_quiet
-   float128_eq_signaling   float128_le_quiet   float128_lt_quiet
-
-The `signaling' equal functions are identical to the standard functions
-except that the invalid exception is raised for any NaN input.  Likewise,
-the `quiet' comparison functions are identical to their counterparts except
-that the invalid exception is not raised for quiet NaNs.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Signaling NaN Test Functions
-
-The following functions test whether a floating-point value is a signaling
-NaN:
-
-   float32_is_signaling_nan
-   float64_is_signaling_nan
-   floatx80_is_signaling_nan
-   float128_is_signaling_nan
-
-The functions take one operand and return 1 if the operand is a signaling
-NaN and 0 otherwise.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Raise-Exception Function
-
-SoftFloat provides a function for raising floating-point exceptions:
-
-    float_raise
-
-The function takes a mask indicating the set of exceptions to raise.  No
-result is returned.  In addition to setting the specified exception flags,
-this function may cause a trap or abort appropriate for the current system.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
--------------------------------------------------------------------------------
-Contact Information
-
-At the time of this writing, the most up-to-date information about
-SoftFloat and the latest release can be found at the Web page `http://
-HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/SoftFloat.html'.
-
-
diff --git a/lib/libc/softfloat/templates/milieu.h b/lib/libc/softfloat/templates/milieu.h
deleted file mode 100644
index 2fcfa1fa1..000000000
--- a/lib/libc/softfloat/templates/milieu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "../../../processors/!!!processor.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
-
diff --git a/lib/libc/softfloat/templates/softfloat-specialize b/lib/libc/softfloat/templates/softfloat-specialize
deleted file mode 100644
index d8b2500f4..000000000
--- a/lib/libc/softfloat/templates/softfloat-specialize
+++ /dev/null
@@ -1,464 +0,0 @@
-
-/*
-===============================================================================
-
-This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Underflow tininess-detection mode, statically initialized to default value.
-(The declaration in `softfloat.h' must match the `int8' type here.)
--------------------------------------------------------------------------------
-*/
-int8 float_detect_tininess = float_tininess_after_rounding;
-
-/*
--------------------------------------------------------------------------------
-Raises the exceptions specified by `flags'.  Floating-point traps can be
-defined here if desired.  It is currently not possible for such a trap to
-substitute a result value.  If traps are not implemented, this routine
-should be simply `float_exception_flags |= flags;'.
--------------------------------------------------------------------------------
-*/
-void float_raise( int8 flags )
-{
-
-    float_exception_flags |= flags;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Internal canonical NaN format.
--------------------------------------------------------------------------------
-*/
-typedef struct {
-    flag sign;
-    bits64 high, low;
-} commonNaNT;
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated single-precision NaN.
--------------------------------------------------------------------------------
-*/
-#define float32_default_nan 0xFFFFFFFF
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is a NaN;
-otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float32_is_nan( float32 a )
-{
-
-    return ( 0xFF000000 < (bits32) ( a<<1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is a signaling
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float32_is_signaling_nan( float32 a )
-{
-
-    return ( ( ( a>>22 ) & 0x1FF ) == 0x1FE ) && ( a & 0x003FFFFF );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point NaN
-`a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT float32ToCommonNaN( float32 a )
-{
-    commonNaNT z;
-
-    if ( float32_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a>>31;
-    z.low = 0;
-    z.high = ( (bits64) a )<<41;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the single-
-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static float32 commonNaNToFloat32( commonNaNT a )
-{
-
-    return ( ( (bits32) a.sign )<<31 ) | 0x7FC00000 | ( a.high>>41 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two single-precision floating-point values `a' and `b', one of which
-is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
-signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static float32 propagateFloat32NaN( float32 a, float32 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float32_is_nan( a );
-    aIsSignalingNaN = float32_is_signaling_nan( a );
-    bIsNaN = float32_is_nan( b );
-    bIsSignalingNaN = float32_is_signaling_nan( b );
-    a |= 0x00400000;
-    b |= 0x00400000;
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated double-precision NaN.
--------------------------------------------------------------------------------
-*/
-#define float64_default_nan LIT64( 0xFFFFFFFFFFFFFFFF )
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is a NaN;
-otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float64_is_nan( float64 a )
-{
-
-    return ( LIT64( 0xFFE0000000000000 ) < (bits64) ( a<<1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is a signaling
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float64_is_signaling_nan( float64 a )
-{
-
-    return
-           ( ( ( a>>51 ) & 0xFFF ) == 0xFFE )
-        && ( a & LIT64( 0x0007FFFFFFFFFFFF ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point NaN
-`a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT float64ToCommonNaN( float64 a )
-{
-    commonNaNT z;
-
-    if ( float64_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a>>63;
-    z.low = 0;
-    z.high = a<<12;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the double-
-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static float64 commonNaNToFloat64( commonNaNT a )
-{
-
-    return
-          ( ( (bits64) a.sign )<<63 )
-        | LIT64( 0x7FF8000000000000 )
-        | ( a.high>>12 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two double-precision floating-point values `a' and `b', one of which
-is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
-signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static float64 propagateFloat64NaN( float64 a, float64 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float64_is_nan( a );
-    aIsSignalingNaN = float64_is_signaling_nan( a );
-    bIsNaN = float64_is_nan( b );
-    bIsSignalingNaN = float64_is_signaling_nan( b );
-    a |= LIT64( 0x0008000000000000 );
-    b |= LIT64( 0x0008000000000000 );
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated extended double-precision NaN.  The
-`high' and `low' values hold the most- and least-significant bits,
-respectively.
--------------------------------------------------------------------------------
-*/
-#define floatx80_default_nan_high 0xFFFF
-#define floatx80_default_nan_low  LIT64( 0xFFFFFFFFFFFFFFFF )
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is a
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag floatx80_is_nan( floatx80 a )
-{
-
-    return ( ( a.high & 0x7FFF ) == 0x7FFF ) && (bits64) ( a.low<<1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is a
-signaling NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag floatx80_is_signaling_nan( floatx80 a )
-{
-    bits64 aLow;
-
-    aLow = a.low & ~ LIT64( 0x4000000000000000 );
-    return
-           ( ( a.high & 0x7FFF ) == 0x7FFF )
-        && (bits64) ( aLow<<1 )
-        && ( a.low == aLow );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point NaN `a' to the canonical NaN format.  If `a' is a signaling NaN, the
-invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT floatx80ToCommonNaN( floatx80 a )
-{
-    commonNaNT z;
-
-    if ( floatx80_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a.high>>15;
-    z.low = 0;
-    z.high = a.low<<1;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the extended
-double-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static floatx80 commonNaNToFloatx80( commonNaNT a )
-{
-    floatx80 z;
-
-    z.low = LIT64( 0xC000000000000000 ) | ( a.high>>1 );
-    z.high = ( ( (bits16) a.sign )<<15 ) | 0x7FFF;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two extended double-precision floating-point values `a' and `b', one
-of which is a NaN, and returns the appropriate NaN result.  If either `a' or
-`b' is a signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static floatx80 propagateFloatx80NaN( floatx80 a, floatx80 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = floatx80_is_nan( a );
-    aIsSignalingNaN = floatx80_is_signaling_nan( a );
-    bIsNaN = floatx80_is_nan( b );
-    bIsSignalingNaN = floatx80_is_signaling_nan( b );
-    a.low |= LIT64( 0xC000000000000000 );
-    b.low |= LIT64( 0xC000000000000000 );
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated quadruple-precision NaN.  The `high' and
-`low' values hold the most- and least-significant bits, respectively.
--------------------------------------------------------------------------------
-*/
-#define float128_default_nan_high LIT64( 0xFFFFFFFFFFFFFFFF )
-#define float128_default_nan_low  LIT64( 0xFFFFFFFFFFFFFFFF )
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is a NaN;
-otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float128_is_nan( float128 a )
-{
-
-    return
-           ( LIT64( 0xFFFE000000000000 ) <= (bits64) ( a.high<<1 ) )
-        && ( a.low || ( a.high & LIT64( 0x0000FFFFFFFFFFFF ) ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is a
-signaling NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float128_is_signaling_nan( float128 a )
-{
-
-    return
-           ( ( ( a.high>>47 ) & 0xFFFF ) == 0xFFFE )
-        && ( a.low || ( a.high & LIT64( 0x00007FFFFFFFFFFF ) ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point NaN
-`a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT float128ToCommonNaN( float128 a )
-{
-    commonNaNT z;
-
-    if ( float128_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a.high>>63;
-    shortShift128Left( a.high, a.low, 16, &z.high, &z.low );
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the quadruple-
-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static float128 commonNaNToFloat128( commonNaNT a )
-{
-    float128 z;
-
-    shift128Right( a.high, a.low, 16, &z.high, &z.low );
-    z.high |= ( ( (bits64) a.sign )<<63 ) | LIT64( 0x7FFF800000000000 );
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two quadruple-precision floating-point values `a' and `b', one of
-which is a NaN, and returns the appropriate NaN result.  If either `a' or
-`b' is a signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static float128 propagateFloat128NaN( float128 a, float128 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float128_is_nan( a );
-    aIsSignalingNaN = float128_is_signaling_nan( a );
-    bIsNaN = float128_is_nan( b );
-    bIsSignalingNaN = float128_is_signaling_nan( b );
-    a.high |= LIT64( 0x0000800000000000 );
-    b.high |= LIT64( 0x0000800000000000 );
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-#endif
-
diff --git a/lib/libc/softfloat/templates/softfloat.h b/lib/libc/softfloat/templates/softfloat.h
deleted file mode 100644
index 8c0fe1013..000000000
--- a/lib/libc/softfloat/templates/softfloat.h
+++ /dev/null
@@ -1,290 +0,0 @@
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.  The same applies to
-the `FLOAT128' macro and the quadruple-precision format `float128'.
--------------------------------------------------------------------------------
-*/
-#define FLOATX80
-#define FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef !!!bits32 float32;
-typedef !!!bits64 float64;
-#ifdef FLOATX80
-typedef struct {
-    !!!bits16 high;
-    !!!bits64 low;
-} floatx80;
-#endif
-#ifdef FLOAT128
-typedef struct {
-    !!!bits64 high, low;
-} float128;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-extern !!!int8 float_detect_tininess;
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern !!!int8 float_rounding_mode;
-enum {
-    float_round_nearest_even = 0,
-    float_round_to_zero      = 1,
-    float_round_down         = 2,
-    float_round_up           = 3
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-*/
-extern !!!int8 float_exception_flags;
-enum {
-    float_flag_inexact   =  1,
-    float_flag_underflow =  2,
-    float_flag_overflow  =  4,
-    float_flag_divbyzero =  8,
-    float_flag_invalid   = 16
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( !!!int8 );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( !!!int32 );
-float64 int32_to_float64( !!!int32 );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( !!!int32 );
-#endif
-#ifdef FLOAT128
-float128 int32_to_float128( !!!int32 );
-#endif
-float32 int64_to_float32( !!!int64 );
-float64 int64_to_float64( !!!int64 );
-#ifdef FLOATX80
-floatx80 int64_to_floatx80( !!!int64 );
-#endif
-#ifdef FLOAT128
-float128 int64_to_float128( !!!int64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-!!!int32 float32_to_int32( float32 );
-!!!int32 float32_to_int32_round_to_zero( float32 );
-!!!int64 float32_to_int64( float32 );
-!!!int64 float32_to_int64_round_to_zero( float32 );
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-#ifdef FLOAT128
-float128 float32_to_float128( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-!!!flag float32_eq( float32, float32 );
-!!!flag float32_le( float32, float32 );
-!!!flag float32_lt( float32, float32 );
-!!!flag float32_eq_signaling( float32, float32 );
-!!!flag float32_le_quiet( float32, float32 );
-!!!flag float32_lt_quiet( float32, float32 );
-!!!flag float32_is_signaling_nan( float32 );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-!!!int32 float64_to_int32( float64 );
-!!!int32 float64_to_int32_round_to_zero( float64 );
-!!!int64 float64_to_int64( float64 );
-!!!int64 float64_to_int64_round_to_zero( float64 );
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-#ifdef FLOAT128
-float128 float64_to_float128( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-!!!flag float64_eq( float64, float64 );
-!!!flag float64_le( float64, float64 );
-!!!flag float64_lt( float64, float64 );
-!!!flag float64_eq_signaling( float64, float64 );
-!!!flag float64_le_quiet( float64, float64 );
-!!!flag float64_lt_quiet( float64, float64 );
-!!!flag float64_is_signaling_nan( float64 );
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-!!!int32 floatx80_to_int32( floatx80 );
-!!!int32 floatx80_to_int32_round_to_zero( floatx80 );
-!!!int64 floatx80_to_int64( floatx80 );
-!!!int64 floatx80_to_int64_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-#ifdef FLOAT128
-float128 floatx80_to_float128( floatx80 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern !!!int8 floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-!!!flag floatx80_eq( floatx80, floatx80 );
-!!!flag floatx80_le( floatx80, floatx80 );
-!!!flag floatx80_lt( floatx80, floatx80 );
-!!!flag floatx80_eq_signaling( floatx80, floatx80 );
-!!!flag floatx80_le_quiet( floatx80, floatx80 );
-!!!flag floatx80_lt_quiet( floatx80, floatx80 );
-!!!flag floatx80_is_signaling_nan( floatx80 );
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-!!!int32 float128_to_int32( float128 );
-!!!int32 float128_to_int32_round_to_zero( float128 );
-!!!int64 float128_to_int64( float128 );
-!!!int64 float128_to_int64_round_to_zero( float128 );
-float32 float128_to_float32( float128 );
-float64 float128_to_float64( float128 );
-#ifdef FLOATX80
-floatx80 float128_to_floatx80( float128 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision operations.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 );
-float128 float128_add( float128, float128 );
-float128 float128_sub( float128, float128 );
-float128 float128_mul( float128, float128 );
-float128 float128_div( float128, float128 );
-float128 float128_rem( float128, float128 );
-float128 float128_sqrt( float128 );
-!!!flag float128_eq( float128, float128 );
-!!!flag float128_le( float128, float128 );
-!!!flag float128_lt( float128, float128 );
-!!!flag float128_eq_signaling( float128, float128 );
-!!!flag float128_le_quiet( float128, float128 );
-!!!flag float128_lt_quiet( float128, float128 );
-!!!flag float128_is_signaling_nan( float128 );
-
-#endif
-
diff --git a/lib/libc/softfloat/timesoftfloat.c b/lib/libc/softfloat/timesoftfloat.c
deleted file mode 100644
index f7a27f4ae..000000000
--- a/lib/libc/softfloat/timesoftfloat.c
+++ /dev/null
@@ -1,2641 +0,0 @@
-/* $NetBSD: timesoftfloat.c,v 1.1 2000/06/06 08:15:11 bjh21 Exp $ */
-
-/*
-===============================================================================
-
-This C source file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: timesoftfloat.c,v 1.1 2000/06/06 08:15:11 bjh21 Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdio.h>
-#include <time.h>
-#include "milieu.h"
-#include "softfloat.h"
-
-enum {
-    minIterations = 1000
-};
-
-static void fail( const char *message, ... )
-{
-    va_list varArgs;
-
-    fputs( "timesoftfloat: ", stderr );
-    va_start( varArgs, message );
-    vfprintf( stderr, message, varArgs );
-    va_end( varArgs );
-    fputs( ".\n", stderr );
-    exit( EXIT_FAILURE );
-
-}
-
-static char *functionName;
-static char *roundingPrecisionName, *roundingModeName, *tininessModeName;
-
-static void reportTime( int32 count, long clocks )
-{
-
-    printf(
-        "%8.1f kops/s: %s",
-        ( count / ( ( (float) clocks ) / CLOCKS_PER_SEC ) ) / 1000,
-        functionName
-    );
-    if ( roundingModeName ) {
-        if ( roundingPrecisionName ) {
-            fputs( ", precision ", stdout );
-            fputs( roundingPrecisionName, stdout );
-        }
-        fputs( ", rounding ", stdout );
-        fputs( roundingModeName, stdout );
-        if ( tininessModeName ) {
-            fputs( ", tininess ", stdout );
-            fputs( tininessModeName, stdout );
-            fputs( " rounding", stdout );
-        }
-    }
-    fputc( '\n', stdout );
-
-}
-
-enum {
-    numInputs_int32 = 32
-};
-
-static const int32 inputs_int32[ numInputs_int32 ] = {
-    0xFFFFBB79, 0x405CF80F, 0x00000000, 0xFFFFFD04,
-    0xFFF20002, 0x0C8EF795, 0xF00011FF, 0x000006CA,
-    0x00009BFE, 0xFF4862E3, 0x9FFFEFFE, 0xFFFFFFB7,
-    0x0BFF7FFF, 0x0000F37A, 0x0011DFFE, 0x00000006,
-    0xFFF02006, 0xFFFFF7D1, 0x10200003, 0xDE8DF765,
-    0x00003E02, 0x000019E8, 0x0008FFFE, 0xFFFFFB5C,
-    0xFFDF7FFE, 0x07C42FBF, 0x0FFFE3FF, 0x040B9F13,
-    0xBFFFFFF8, 0x0001BF56, 0x000017F6, 0x000A908A
-};
-
-static void time_a_int32_z_float32( float32 function( int32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_int32_z_float64( float64 function( int32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#ifdef FLOATX80
-
-static void time_a_int32_z_floatx80( floatx80 function( int32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-static void time_a_int32_z_float128( float128 function( int32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-enum {
-    numInputs_int64 = 32
-};
-
-static const int64 inputs_int64[ numInputs_int64 ] = {
-    LIT64( 0xFBFFC3FFFFFFFFFF ),
-    LIT64( 0x0000000003C589BC ),
-    LIT64( 0x00000000400013FE ),
-    LIT64( 0x0000000000186171 ),
-    LIT64( 0xFFFFFFFFFFFEFBFA ),
-    LIT64( 0xFFFFFD79E6DFFC73 ),
-    LIT64( 0x0000000010001DFF ),
-    LIT64( 0xDD1A0F0C78513710 ),
-    LIT64( 0xFFFF83FFFFFEFFFE ),
-    LIT64( 0x00756EBD1AD0C1C7 ),
-    LIT64( 0x0003FDFFFFFFFFBE ),
-    LIT64( 0x0007D0FB2C2CA951 ),
-    LIT64( 0x0007FC0007FFFFFE ),
-    LIT64( 0x0000001F942B18BB ),
-    LIT64( 0x0000080101FFFFFE ),
-    LIT64( 0xFFFFFFFFFFFF0978 ),
-    LIT64( 0x000000000008BFFF ),
-    LIT64( 0x0000000006F5AF08 ),
-    LIT64( 0xFFDEFF7FFFFFFFFE ),
-    LIT64( 0x0000000000000003 ),
-    LIT64( 0x3FFFFFFFFF80007D ),
-    LIT64( 0x0000000000000078 ),
-    LIT64( 0xFFF80000007FDFFD ),
-    LIT64( 0x1BBC775B78016AB0 ),
-    LIT64( 0xFFF9001FFFFFFFFE ),
-    LIT64( 0xFFFD4767AB98E43F ),
-    LIT64( 0xFFFFFEFFFE00001E ),
-    LIT64( 0xFFFFFFFFFFF04EFD ),
-    LIT64( 0x07FFFFFFFFFFF7FF ),
-    LIT64( 0xFFFC9EAA38F89050 ),
-    LIT64( 0x00000020FBFFFFFE ),
-    LIT64( 0x0000099AE6455357 )
-};
-
-static void time_a_int64_z_float32( float32 function( int64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_int64_z_float64( float64 function( int64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#ifdef FLOATX80
-
-static void time_a_int64_z_floatx80( floatx80 function( int64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-static void time_a_int64_z_float128( float128 function( int64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-enum {
-    numInputs_float32 = 32
-};
-
-static const float32 inputs_float32[ numInputs_float32 ] = {
-    0x4EFA0000, 0xC1D0B328, 0x80000000, 0x3E69A31E,
-    0xAF803EFF, 0x3F800000, 0x17BF8000, 0xE74A301A,
-    0x4E010003, 0x7EE3C75D, 0xBD803FE0, 0xBFFEFF00,
-    0x7981F800, 0x431FFFFC, 0xC100C000, 0x3D87EFFF,
-    0x4103FEFE, 0xBC000007, 0xBF01F7FF, 0x4E6C6B5C,
-    0xC187FFFE, 0xC58B9F13, 0x4F88007F, 0xDF004007,
-    0xB7FFD7FE, 0x7E8001FB, 0x46EFFBFF, 0x31C10000,
-    0xDB428661, 0x33F89B1F, 0xA3BFEFFF, 0x537BFFBE
-};
-
-static void time_a_float32_z_int32( int32 function( float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_float32_z_int64( int64 function( float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_float32_z_float64( float64 function( float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#ifdef FLOATX80
-
-static void time_a_float32_z_floatx80( floatx80 function( float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-static void time_a_float32_z_float128( float128 function( float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-static void time_az_float32( float32 function( float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_ab_float32_z_flag( flag function( float32, float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function(
-                inputs_float32[ inputNumA ], inputs_float32[ inputNumB ] );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_float32 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-            function(
-                inputs_float32[ inputNumA ], inputs_float32[ inputNumB ] );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_float32 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_abz_float32( float32 function( float32, float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function(
-                inputs_float32[ inputNumA ], inputs_float32[ inputNumB ] );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_float32 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-            function(
-                inputs_float32[ inputNumA ], inputs_float32[ inputNumB ] );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_float32 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static const float32 inputs_float32_pos[ numInputs_float32 ] = {
-    0x4EFA0000, 0x41D0B328, 0x00000000, 0x3E69A31E,
-    0x2F803EFF, 0x3F800000, 0x17BF8000, 0x674A301A,
-    0x4E010003, 0x7EE3C75D, 0x3D803FE0, 0x3FFEFF00,
-    0x7981F800, 0x431FFFFC, 0x4100C000, 0x3D87EFFF,
-    0x4103FEFE, 0x3C000007, 0x3F01F7FF, 0x4E6C6B5C,
-    0x4187FFFE, 0x458B9F13, 0x4F88007F, 0x5F004007,
-    0x37FFD7FE, 0x7E8001FB, 0x46EFFBFF, 0x31C10000,
-    0x5B428661, 0x33F89B1F, 0x23BFEFFF, 0x537BFFBE
-};
-
-static void time_az_float32_pos( float32 function( float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float32_pos[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float32_pos[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-enum {
-    numInputs_float64 = 32
-};
-
-static const float64 inputs_float64[ numInputs_float64 ] = {
-    LIT64( 0x422FFFC008000000 ),
-    LIT64( 0xB7E0000480000000 ),
-    LIT64( 0xF3FD2546120B7935 ),
-    LIT64( 0x3FF0000000000000 ),
-    LIT64( 0xCE07F766F09588D6 ),
-    LIT64( 0x8000000000000000 ),
-    LIT64( 0x3FCE000400000000 ),
-    LIT64( 0x8313B60F0032BED8 ),
-    LIT64( 0xC1EFFFFFC0002000 ),
-    LIT64( 0x3FB3C75D224F2B0F ),
-    LIT64( 0x7FD00000004000FF ),
-    LIT64( 0xA12FFF8000001FFF ),
-    LIT64( 0x3EE0000000FE0000 ),
-    LIT64( 0x0010000080000004 ),
-    LIT64( 0x41CFFFFE00000020 ),
-    LIT64( 0x40303FFFFFFFFFFD ),
-    LIT64( 0x3FD000003FEFFFFF ),
-    LIT64( 0xBFD0000010000000 ),
-    LIT64( 0xB7FC6B5C16CA55CF ),
-    LIT64( 0x413EEB940B9D1301 ),
-    LIT64( 0xC7E00200001FFFFF ),
-    LIT64( 0x47F00021FFFFFFFE ),
-    LIT64( 0xBFFFFFFFF80000FF ),
-    LIT64( 0xC07FFFFFE00FFFFF ),
-    LIT64( 0x001497A63740C5E8 ),
-    LIT64( 0xC4BFFFE0001FFFFF ),
-    LIT64( 0x96FFDFFEFFFFFFFF ),
-    LIT64( 0x403FC000000001FE ),
-    LIT64( 0xFFD00000000001F6 ),
-    LIT64( 0x0640400002000000 ),
-    LIT64( 0x479CEE1E4F789FE0 ),
-    LIT64( 0xC237FFFFFFFFFDFE )
-};
-
-static void time_a_float64_z_int32( int32 function( float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_float64_z_int64( int64 function( float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_float64_z_float32( float32 function( float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#ifdef FLOATX80
-
-static void time_a_float64_z_floatx80( floatx80 function( float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-static void time_a_float64_z_float128( float128 function( float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-static void time_az_float64( float64 function( float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_ab_float64_z_flag( flag function( float64, float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function(
-                inputs_float64[ inputNumA ], inputs_float64[ inputNumB ] );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_float64 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-            function(
-                inputs_float64[ inputNumA ], inputs_float64[ inputNumB ] );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_float64 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_abz_float64( float64 function( float64, float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function(
-                inputs_float64[ inputNumA ], inputs_float64[ inputNumB ] );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_float64 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-            function(
-                inputs_float64[ inputNumA ], inputs_float64[ inputNumB ] );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_float64 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static const float64 inputs_float64_pos[ numInputs_float64 ] = {
-    LIT64( 0x422FFFC008000000 ),
-    LIT64( 0x37E0000480000000 ),
-    LIT64( 0x73FD2546120B7935 ),
-    LIT64( 0x3FF0000000000000 ),
-    LIT64( 0x4E07F766F09588D6 ),
-    LIT64( 0x0000000000000000 ),
-    LIT64( 0x3FCE000400000000 ),
-    LIT64( 0x0313B60F0032BED8 ),
-    LIT64( 0x41EFFFFFC0002000 ),
-    LIT64( 0x3FB3C75D224F2B0F ),
-    LIT64( 0x7FD00000004000FF ),
-    LIT64( 0x212FFF8000001FFF ),
-    LIT64( 0x3EE0000000FE0000 ),
-    LIT64( 0x0010000080000004 ),
-    LIT64( 0x41CFFFFE00000020 ),
-    LIT64( 0x40303FFFFFFFFFFD ),
-    LIT64( 0x3FD000003FEFFFFF ),
-    LIT64( 0x3FD0000010000000 ),
-    LIT64( 0x37FC6B5C16CA55CF ),
-    LIT64( 0x413EEB940B9D1301 ),
-    LIT64( 0x47E00200001FFFFF ),
-    LIT64( 0x47F00021FFFFFFFE ),
-    LIT64( 0x3FFFFFFFF80000FF ),
-    LIT64( 0x407FFFFFE00FFFFF ),
-    LIT64( 0x001497A63740C5E8 ),
-    LIT64( 0x44BFFFE0001FFFFF ),
-    LIT64( 0x16FFDFFEFFFFFFFF ),
-    LIT64( 0x403FC000000001FE ),
-    LIT64( 0x7FD00000000001F6 ),
-    LIT64( 0x0640400002000000 ),
-    LIT64( 0x479CEE1E4F789FE0 ),
-    LIT64( 0x4237FFFFFFFFFDFE )
-};
-
-static void time_az_float64_pos( float64 function( float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float64_pos[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float64_pos[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#ifdef FLOATX80
-
-enum {
-    numInputs_floatx80 = 32
-};
-
-static const struct {
-    bits16 high;
-    bits64 low;
-} inputs_floatx80[ numInputs_floatx80 ] = {
-    { 0xC03F, LIT64( 0xA9BE15A19C1E8B62 ) },
-    { 0x8000, LIT64( 0x0000000000000000 ) },
-    { 0x75A8, LIT64( 0xE59591E4788957A5 ) },
-    { 0xBFFF, LIT64( 0xFFF0000000000040 ) },
-    { 0x0CD8, LIT64( 0xFC000000000007FE ) },
-    { 0x43BA, LIT64( 0x99A4000000000000 ) },
-    { 0x3FFF, LIT64( 0x8000000000000000 ) },
-    { 0x4081, LIT64( 0x94FBF1BCEB5545F0 ) },
-    { 0x403E, LIT64( 0xFFF0000000002000 ) },
-    { 0x3FFE, LIT64( 0xC860E3C75D224F28 ) },
-    { 0x407E, LIT64( 0xFC00000FFFFFFFFE ) },
-    { 0x737A, LIT64( 0x800000007FFDFFFE ) },
-    { 0x4044, LIT64( 0xFFFFFF80000FFFFF ) },
-    { 0xBBFE, LIT64( 0x8000040000001FFE ) },
-    { 0xC002, LIT64( 0xFF80000000000020 ) },
-    { 0xDE8D, LIT64( 0xFFFFFFFFFFE00004 ) },
-    { 0xC004, LIT64( 0x8000000000003FFB ) },
-    { 0x407F, LIT64( 0x800000000003FFFE ) },
-    { 0xC000, LIT64( 0xA459EE6A5C16CA55 ) },
-    { 0x8003, LIT64( 0xC42CBF7399AEEB94 ) },
-    { 0xBF7F, LIT64( 0xF800000000000006 ) },
-    { 0xC07F, LIT64( 0xBF56BE8871F28FEA ) },
-    { 0xC07E, LIT64( 0xFFFF77FFFFFFFFFE ) },
-    { 0xADC9, LIT64( 0x8000000FFFFFFFDE ) },
-    { 0xC001, LIT64( 0xEFF7FFFFFFFFFFFF ) },
-    { 0x4001, LIT64( 0xBE84F30125C497A6 ) },
-    { 0xC06B, LIT64( 0xEFFFFFFFFFFFFFFF ) },
-    { 0x4080, LIT64( 0xFFFFFFFFBFFFFFFF ) },
-    { 0x87E9, LIT64( 0x81FFFFFFFFFFFBFF ) },
-    { 0xA63F, LIT64( 0x801FFFFFFEFFFFFE ) },
-    { 0x403C, LIT64( 0x801FFFFFFFF7FFFF ) },
-    { 0x4018, LIT64( 0x8000000000080003 ) }
-};
-
-static void time_a_floatx80_z_int32( int32 function( floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    floatx80 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNum ].low;
-            a.high = inputs_floatx80[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNum ].low;
-        a.high = inputs_floatx80[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_floatx80_z_int64( int64 function( floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    floatx80 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNum ].low;
-            a.high = inputs_floatx80[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNum ].low;
-        a.high = inputs_floatx80[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_floatx80_z_float32( float32 function( floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    floatx80 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNum ].low;
-            a.high = inputs_floatx80[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNum ].low;
-        a.high = inputs_floatx80[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_floatx80_z_float64( float64 function( floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    floatx80 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNum ].low;
-            a.high = inputs_floatx80[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNum ].low;
-        a.high = inputs_floatx80[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#ifdef FLOAT128
-
-static void time_a_floatx80_z_float128( float128 function( floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    floatx80 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNum ].low;
-            a.high = inputs_floatx80[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNum ].low;
-        a.high = inputs_floatx80[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-static void time_az_floatx80( floatx80 function( floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    floatx80 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNum ].low;
-            a.high = inputs_floatx80[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNum ].low;
-        a.high = inputs_floatx80[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_ab_floatx80_z_flag( flag function( floatx80, floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-    floatx80 a, b;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNumA ].low;
-            a.high = inputs_floatx80[ inputNumA ].high;
-            b.low = inputs_floatx80[ inputNumB ].low;
-            b.high = inputs_floatx80[ inputNumB ].high;
-            function( a, b );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_floatx80 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNumA ].low;
-        a.high = inputs_floatx80[ inputNumA ].high;
-        b.low = inputs_floatx80[ inputNumB ].low;
-        b.high = inputs_floatx80[ inputNumB ].high;
-        function( a, b );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_floatx80 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_abz_floatx80( floatx80 function( floatx80, floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-    floatx80 a, b;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNumA ].low;
-            a.high = inputs_floatx80[ inputNumA ].high;
-            b.low = inputs_floatx80[ inputNumB ].low;
-            b.high = inputs_floatx80[ inputNumB ].high;
-            function( a, b );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_floatx80 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNumA ].low;
-        a.high = inputs_floatx80[ inputNumA ].high;
-        b.low = inputs_floatx80[ inputNumB ].low;
-        b.high = inputs_floatx80[ inputNumB ].high;
-        function( a, b );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_floatx80 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static const struct {
-    bits16 high;
-    bits64 low;
-} inputs_floatx80_pos[ numInputs_floatx80 ] = {
-    { 0x403F, LIT64( 0xA9BE15A19C1E8B62 ) },
-    { 0x0000, LIT64( 0x0000000000000000 ) },
-    { 0x75A8, LIT64( 0xE59591E4788957A5 ) },
-    { 0x3FFF, LIT64( 0xFFF0000000000040 ) },
-    { 0x0CD8, LIT64( 0xFC000000000007FE ) },
-    { 0x43BA, LIT64( 0x99A4000000000000 ) },
-    { 0x3FFF, LIT64( 0x8000000000000000 ) },
-    { 0x4081, LIT64( 0x94FBF1BCEB5545F0 ) },
-    { 0x403E, LIT64( 0xFFF0000000002000 ) },
-    { 0x3FFE, LIT64( 0xC860E3C75D224F28 ) },
-    { 0x407E, LIT64( 0xFC00000FFFFFFFFE ) },
-    { 0x737A, LIT64( 0x800000007FFDFFFE ) },
-    { 0x4044, LIT64( 0xFFFFFF80000FFFFF ) },
-    { 0x3BFE, LIT64( 0x8000040000001FFE ) },
-    { 0x4002, LIT64( 0xFF80000000000020 ) },
-    { 0x5E8D, LIT64( 0xFFFFFFFFFFE00004 ) },
-    { 0x4004, LIT64( 0x8000000000003FFB ) },
-    { 0x407F, LIT64( 0x800000000003FFFE ) },
-    { 0x4000, LIT64( 0xA459EE6A5C16CA55 ) },
-    { 0x0003, LIT64( 0xC42CBF7399AEEB94 ) },
-    { 0x3F7F, LIT64( 0xF800000000000006 ) },
-    { 0x407F, LIT64( 0xBF56BE8871F28FEA ) },
-    { 0x407E, LIT64( 0xFFFF77FFFFFFFFFE ) },
-    { 0x2DC9, LIT64( 0x8000000FFFFFFFDE ) },
-    { 0x4001, LIT64( 0xEFF7FFFFFFFFFFFF ) },
-    { 0x4001, LIT64( 0xBE84F30125C497A6 ) },
-    { 0x406B, LIT64( 0xEFFFFFFFFFFFFFFF ) },
-    { 0x4080, LIT64( 0xFFFFFFFFBFFFFFFF ) },
-    { 0x07E9, LIT64( 0x81FFFFFFFFFFFBFF ) },
-    { 0x263F, LIT64( 0x801FFFFFFEFFFFFE ) },
-    { 0x403C, LIT64( 0x801FFFFFFFF7FFFF ) },
-    { 0x4018, LIT64( 0x8000000000080003 ) }
-};
-
-static void time_az_floatx80_pos( floatx80 function( floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    floatx80 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80_pos[ inputNum ].low;
-            a.high = inputs_floatx80_pos[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80_pos[ inputNum ].low;
-        a.high = inputs_floatx80_pos[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-enum {
-    numInputs_float128 = 32
-};
-
-static const struct {
-    bits64 high, low;
-} inputs_float128[ numInputs_float128 ] = {
-    { LIT64( 0x3FDA200000100000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x3FFF000000000000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x85F14776190C8306 ), LIT64( 0xD8715F4E3D54BB92 ) },
-    { LIT64( 0xF2B00000007FFFFF ), LIT64( 0xFFFFFFFFFFF7FFFF ) },
-    { LIT64( 0x8000000000000000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0xBFFFFFFFFFE00000 ), LIT64( 0x0000008000000000 ) },
-    { LIT64( 0x407F1719CE722F3E ), LIT64( 0xDA6B3FE5FF29425B ) },
-    { LIT64( 0x43FFFF8000000000 ), LIT64( 0x0000000000400000 ) },
-    { LIT64( 0x401E000000000100 ), LIT64( 0x0000000000002000 ) },
-    { LIT64( 0x3FFED71DACDA8E47 ), LIT64( 0x4860E3C75D224F28 ) },
-    { LIT64( 0xBF7ECFC1E90647D1 ), LIT64( 0x7A124FE55623EE44 ) },
-    { LIT64( 0x0DF7007FFFFFFFFF ), LIT64( 0xFFFFFFFFEFFFFFFF ) },
-    { LIT64( 0x3FE5FFEFFFFFFFFF ), LIT64( 0xFFFFFFFFFFFFEFFF ) },
-    { LIT64( 0x403FFFFFFFFFFFFF ), LIT64( 0xFFFFFFFFFFFFFBFE ) },
-    { LIT64( 0xBFFB2FBF7399AFEB ), LIT64( 0xA459EE6A5C16CA55 ) },
-    { LIT64( 0xBDB8FFFFFFFFFFFC ), LIT64( 0x0000000000000400 ) },
-    { LIT64( 0x3FC8FFDFFFFFFFFF ), LIT64( 0xFFFFFFFFF0000000 ) },
-    { LIT64( 0x3FFBFFFFFFDFFFFF ), LIT64( 0xFFF8000000000000 ) },
-    { LIT64( 0x407043C11737BE84 ), LIT64( 0xDDD58212ADC937F4 ) },
-    { LIT64( 0x8001000000000000 ), LIT64( 0x0000001000000001 ) },
-    { LIT64( 0xC036FFFFFFFFFFFF ), LIT64( 0xFE40000000000000 ) },
-    { LIT64( 0x4002FFFFFE000002 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x4000C3FEDE897773 ), LIT64( 0x326AC4FD8EFBE6DC ) },
-    { LIT64( 0xBFFF0000000FFFFF ), LIT64( 0xFFFFFE0000000000 ) },
-    { LIT64( 0x62C3E502146E426D ), LIT64( 0x43F3CAA0DC7DF1A0 ) },
-    { LIT64( 0xB5CBD32E52BB570E ), LIT64( 0xBCC477CB11C6236C ) },
-    { LIT64( 0xE228FFFFFFC00000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x3F80000000000000 ), LIT64( 0x0000000080000008 ) },
-    { LIT64( 0xC1AFFFDFFFFFFFFF ), LIT64( 0xFFFC000000000000 ) },
-    { LIT64( 0xC96F000000000000 ), LIT64( 0x00000001FFFBFFFF ) },
-    { LIT64( 0x3DE09BFE7923A338 ), LIT64( 0xBCC8FBBD7CEC1F4F ) },
-    { LIT64( 0x401CFFFFFFFFFFFF ), LIT64( 0xFFFFFFFEFFFFFF80 ) }
-};
-
-static void time_a_float128_z_int32( int32 function( float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    float128 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNum ].low;
-            a.high = inputs_float128[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNum ].low;
-        a.high = inputs_float128[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_float128_z_int64( int64 function( float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    float128 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNum ].low;
-            a.high = inputs_float128[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNum ].low;
-        a.high = inputs_float128[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_float128_z_float32( float32 function( float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    float128 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNum ].low;
-            a.high = inputs_float128[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNum ].low;
-        a.high = inputs_float128[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_float128_z_float64( float64 function( float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    float128 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNum ].low;
-            a.high = inputs_float128[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNum ].low;
-        a.high = inputs_float128[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#ifdef FLOATX80
-
-static void time_a_float128_z_floatx80( floatx80 function( float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    float128 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNum ].low;
-            a.high = inputs_float128[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNum ].low;
-        a.high = inputs_float128[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-static void time_az_float128( float128 function( float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    float128 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNum ].low;
-            a.high = inputs_float128[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNum ].low;
-        a.high = inputs_float128[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_ab_float128_z_flag( flag function( float128, float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-    float128 a, b;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNumA ].low;
-            a.high = inputs_float128[ inputNumA ].high;
-            b.low = inputs_float128[ inputNumB ].low;
-            b.high = inputs_float128[ inputNumB ].high;
-            function( a, b );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_float128 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNumA ].low;
-        a.high = inputs_float128[ inputNumA ].high;
-        b.low = inputs_float128[ inputNumB ].low;
-        b.high = inputs_float128[ inputNumB ].high;
-        function( a, b );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_float128 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_abz_float128( float128 function( float128, float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-    float128 a, b;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNumA ].low;
-            a.high = inputs_float128[ inputNumA ].high;
-            b.low = inputs_float128[ inputNumB ].low;
-            b.high = inputs_float128[ inputNumB ].high;
-            function( a, b );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_float128 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNumA ].low;
-        a.high = inputs_float128[ inputNumA ].high;
-        b.low = inputs_float128[ inputNumB ].low;
-        b.high = inputs_float128[ inputNumB ].high;
-        function( a, b );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_float128 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static const struct {
-    bits64 high, low;
-} inputs_float128_pos[ numInputs_float128 ] = {
-    { LIT64( 0x3FDA200000100000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x3FFF000000000000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x05F14776190C8306 ), LIT64( 0xD8715F4E3D54BB92 ) },
-    { LIT64( 0x72B00000007FFFFF ), LIT64( 0xFFFFFFFFFFF7FFFF ) },
-    { LIT64( 0x0000000000000000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x3FFFFFFFFFE00000 ), LIT64( 0x0000008000000000 ) },
-    { LIT64( 0x407F1719CE722F3E ), LIT64( 0xDA6B3FE5FF29425B ) },
-    { LIT64( 0x43FFFF8000000000 ), LIT64( 0x0000000000400000 ) },
-    { LIT64( 0x401E000000000100 ), LIT64( 0x0000000000002000 ) },
-    { LIT64( 0x3FFED71DACDA8E47 ), LIT64( 0x4860E3C75D224F28 ) },
-    { LIT64( 0x3F7ECFC1E90647D1 ), LIT64( 0x7A124FE55623EE44 ) },
-    { LIT64( 0x0DF7007FFFFFFFFF ), LIT64( 0xFFFFFFFFEFFFFFFF ) },
-    { LIT64( 0x3FE5FFEFFFFFFFFF ), LIT64( 0xFFFFFFFFFFFFEFFF ) },
-    { LIT64( 0x403FFFFFFFFFFFFF ), LIT64( 0xFFFFFFFFFFFFFBFE ) },
-    { LIT64( 0x3FFB2FBF7399AFEB ), LIT64( 0xA459EE6A5C16CA55 ) },
-    { LIT64( 0x3DB8FFFFFFFFFFFC ), LIT64( 0x0000000000000400 ) },
-    { LIT64( 0x3FC8FFDFFFFFFFFF ), LIT64( 0xFFFFFFFFF0000000 ) },
-    { LIT64( 0x3FFBFFFFFFDFFFFF ), LIT64( 0xFFF8000000000000 ) },
-    { LIT64( 0x407043C11737BE84 ), LIT64( 0xDDD58212ADC937F4 ) },
-    { LIT64( 0x0001000000000000 ), LIT64( 0x0000001000000001 ) },
-    { LIT64( 0x4036FFFFFFFFFFFF ), LIT64( 0xFE40000000000000 ) },
-    { LIT64( 0x4002FFFFFE000002 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x4000C3FEDE897773 ), LIT64( 0x326AC4FD8EFBE6DC ) },
-    { LIT64( 0x3FFF0000000FFFFF ), LIT64( 0xFFFFFE0000000000 ) },
-    { LIT64( 0x62C3E502146E426D ), LIT64( 0x43F3CAA0DC7DF1A0 ) },
-    { LIT64( 0x35CBD32E52BB570E ), LIT64( 0xBCC477CB11C6236C ) },
-    { LIT64( 0x6228FFFFFFC00000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x3F80000000000000 ), LIT64( 0x0000000080000008 ) },
-    { LIT64( 0x41AFFFDFFFFFFFFF ), LIT64( 0xFFFC000000000000 ) },
-    { LIT64( 0x496F000000000000 ), LIT64( 0x00000001FFFBFFFF ) },
-    { LIT64( 0x3DE09BFE7923A338 ), LIT64( 0xBCC8FBBD7CEC1F4F ) },
-    { LIT64( 0x401CFFFFFFFFFFFF ), LIT64( 0xFFFFFFFEFFFFFF80 ) }
-};
-
-static void time_az_float128_pos( float128 function( float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    float128 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128_pos[ inputNum ].low;
-            a.high = inputs_float128_pos[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128_pos[ inputNum ].low;
-        a.high = inputs_float128_pos[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-enum {
-    INT32_TO_FLOAT32 = 1,
-    INT32_TO_FLOAT64,
-#ifdef FLOATX80
-    INT32_TO_FLOATX80,
-#endif
-#ifdef FLOAT128
-    INT32_TO_FLOAT128,
-#endif
-    INT64_TO_FLOAT32,
-    INT64_TO_FLOAT64,
-#ifdef FLOATX80
-    INT64_TO_FLOATX80,
-#endif
-#ifdef FLOAT128
-    INT64_TO_FLOAT128,
-#endif
-    FLOAT32_TO_INT32,
-    FLOAT32_TO_INT32_ROUND_TO_ZERO,
-    FLOAT32_TO_INT64,
-    FLOAT32_TO_INT64_ROUND_TO_ZERO,
-    FLOAT32_TO_FLOAT64,
-#ifdef FLOATX80
-    FLOAT32_TO_FLOATX80,
-#endif
-#ifdef FLOAT128
-    FLOAT32_TO_FLOAT128,
-#endif
-    FLOAT32_ROUND_TO_INT,
-    FLOAT32_ADD,
-    FLOAT32_SUB,
-    FLOAT32_MUL,
-    FLOAT32_DIV,
-    FLOAT32_REM,
-    FLOAT32_SQRT,
-    FLOAT32_EQ,
-    FLOAT32_LE,
-    FLOAT32_LT,
-    FLOAT32_EQ_SIGNALING,
-    FLOAT32_LE_QUIET,
-    FLOAT32_LT_QUIET,
-    FLOAT64_TO_INT32,
-    FLOAT64_TO_INT32_ROUND_TO_ZERO,
-    FLOAT64_TO_INT64,
-    FLOAT64_TO_INT64_ROUND_TO_ZERO,
-    FLOAT64_TO_FLOAT32,
-#ifdef FLOATX80
-    FLOAT64_TO_FLOATX80,
-#endif
-#ifdef FLOAT128
-    FLOAT64_TO_FLOAT128,
-#endif
-    FLOAT64_ROUND_TO_INT,
-    FLOAT64_ADD,
-    FLOAT64_SUB,
-    FLOAT64_MUL,
-    FLOAT64_DIV,
-    FLOAT64_REM,
-    FLOAT64_SQRT,
-    FLOAT64_EQ,
-    FLOAT64_LE,
-    FLOAT64_LT,
-    FLOAT64_EQ_SIGNALING,
-    FLOAT64_LE_QUIET,
-    FLOAT64_LT_QUIET,
-#ifdef FLOATX80
-    FLOATX80_TO_INT32,
-    FLOATX80_TO_INT32_ROUND_TO_ZERO,
-    FLOATX80_TO_INT64,
-    FLOATX80_TO_INT64_ROUND_TO_ZERO,
-    FLOATX80_TO_FLOAT32,
-    FLOATX80_TO_FLOAT64,
-#ifdef FLOAT128
-    FLOATX80_TO_FLOAT128,
-#endif
-    FLOATX80_ROUND_TO_INT,
-    FLOATX80_ADD,
-    FLOATX80_SUB,
-    FLOATX80_MUL,
-    FLOATX80_DIV,
-    FLOATX80_REM,
-    FLOATX80_SQRT,
-    FLOATX80_EQ,
-    FLOATX80_LE,
-    FLOATX80_LT,
-    FLOATX80_EQ_SIGNALING,
-    FLOATX80_LE_QUIET,
-    FLOATX80_LT_QUIET,
-#endif
-#ifdef FLOAT128
-    FLOAT128_TO_INT32,
-    FLOAT128_TO_INT32_ROUND_TO_ZERO,
-    FLOAT128_TO_INT64,
-    FLOAT128_TO_INT64_ROUND_TO_ZERO,
-    FLOAT128_TO_FLOAT32,
-    FLOAT128_TO_FLOAT64,
-#ifdef FLOATX80
-    FLOAT128_TO_FLOATX80,
-#endif
-    FLOAT128_ROUND_TO_INT,
-    FLOAT128_ADD,
-    FLOAT128_SUB,
-    FLOAT128_MUL,
-    FLOAT128_DIV,
-    FLOAT128_REM,
-    FLOAT128_SQRT,
-    FLOAT128_EQ,
-    FLOAT128_LE,
-    FLOAT128_LT,
-    FLOAT128_EQ_SIGNALING,
-    FLOAT128_LE_QUIET,
-    FLOAT128_LT_QUIET,
-#endif
-    NUM_FUNCTIONS
-};
-
-static struct {
-    char *name;
-    int8 numInputs;
-    flag roundingPrecision, roundingMode;
-    flag tininessMode, tininessModeAtReducedPrecision;
-} functions[ NUM_FUNCTIONS ] = {
-    { 0, 0, 0, 0, 0, 0 },
-    { "int32_to_float32",                1, FALSE, TRUE,  FALSE, FALSE },
-    { "int32_to_float64",                1, FALSE, FALSE, FALSE, FALSE },
-#ifdef FLOATX80
-    { "int32_to_floatx80",               1, FALSE, FALSE, FALSE, FALSE },
-#endif
-#ifdef FLOAT128
-    { "int32_to_float128",               1, FALSE, FALSE, FALSE, FALSE },
-#endif
-    { "int64_to_float32",                1, FALSE, TRUE,  FALSE, FALSE },
-    { "int64_to_float64",                1, FALSE, TRUE,  FALSE, FALSE },
-#ifdef FLOATX80
-    { "int64_to_floatx80",               1, FALSE, FALSE, FALSE, FALSE },
-#endif
-#ifdef FLOAT128
-    { "int64_to_float128",               1, FALSE, FALSE, FALSE, FALSE },
-#endif
-    { "float32_to_int32",                1, FALSE, TRUE,  FALSE, FALSE },
-    { "float32_to_int32_round_to_zero",  1, FALSE, FALSE, FALSE, FALSE },
-    { "float32_to_int64",                1, FALSE, TRUE,  FALSE, FALSE },
-    { "float32_to_int64_round_to_zero",  1, FALSE, FALSE, FALSE, FALSE },
-    { "float32_to_float64",              1, FALSE, FALSE, FALSE, FALSE },
-#ifdef FLOATX80
-    { "float32_to_floatx80",             1, FALSE, FALSE, FALSE, FALSE },
-#endif
-#ifdef FLOAT128
-    { "float32_to_float128",             1, FALSE, FALSE, FALSE, FALSE },
-#endif
-    { "float32_round_to_int",            1, FALSE, TRUE,  FALSE, FALSE },
-    { "float32_add",                     2, FALSE, TRUE,  FALSE, FALSE },
-    { "float32_sub",                     2, FALSE, TRUE,  FALSE, FALSE },
-    { "float32_mul",                     2, FALSE, TRUE,  TRUE,  FALSE },
-    { "float32_div",                     2, FALSE, TRUE,  FALSE, FALSE },
-    { "float32_rem",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "float32_sqrt",                    1, FALSE, TRUE,  FALSE, FALSE },
-    { "float32_eq",                      2, FALSE, FALSE, FALSE, FALSE },
-    { "float32_le",                      2, FALSE, FALSE, FALSE, FALSE },
-    { "float32_lt",                      2, FALSE, FALSE, FALSE, FALSE },
-    { "float32_eq_signaling",            2, FALSE, FALSE, FALSE, FALSE },
-    { "float32_le_quiet",                2, FALSE, FALSE, FALSE, FALSE },
-    { "float32_lt_quiet",                2, FALSE, FALSE, FALSE, FALSE },
-    { "float64_to_int32",                1, FALSE, TRUE,  FALSE, FALSE },
-    { "float64_to_int32_round_to_zero",  1, FALSE, FALSE, FALSE, FALSE },
-    { "float64_to_int64",                1, FALSE, TRUE,  FALSE, FALSE },
-    { "float64_to_int64_round_to_zero",  1, FALSE, FALSE, FALSE, FALSE },
-    { "float64_to_float32",              1, FALSE, TRUE,  TRUE,  FALSE },
-#ifdef FLOATX80
-    { "float64_to_floatx80",             1, FALSE, FALSE, FALSE, FALSE },
-#endif
-#ifdef FLOAT128
-    { "float64_to_float128",             1, FALSE, FALSE, FALSE, FALSE },
-#endif
-    { "float64_round_to_int",            1, FALSE, TRUE,  FALSE, FALSE },
-    { "float64_add",                     2, FALSE, TRUE,  FALSE, FALSE },
-    { "float64_sub",                     2, FALSE, TRUE,  FALSE, FALSE },
-    { "float64_mul",                     2, FALSE, TRUE,  TRUE,  FALSE },
-    { "float64_div",                     2, FALSE, TRUE,  FALSE, FALSE },
-    { "float64_rem",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "float64_sqrt",                    1, FALSE, TRUE,  FALSE, FALSE },
-    { "float64_eq",                      2, FALSE, FALSE, FALSE, FALSE },
-    { "float64_le",                      2, FALSE, FALSE, FALSE, FALSE },
-    { "float64_lt",                      2, FALSE, FALSE, FALSE, FALSE },
-    { "float64_eq_signaling",            2, FALSE, FALSE, FALSE, FALSE },
-    { "float64_le_quiet",                2, FALSE, FALSE, FALSE, FALSE },
-    { "float64_lt_quiet",                2, FALSE, FALSE, FALSE, FALSE },
-#ifdef FLOATX80
-    { "floatx80_to_int32",               1, FALSE, TRUE,  FALSE, FALSE },
-    { "floatx80_to_int32_round_to_zero", 1, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_to_int64",               1, FALSE, TRUE,  FALSE, FALSE },
-    { "floatx80_to_int64_round_to_zero", 1, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_to_float32",             1, FALSE, TRUE,  TRUE,  FALSE },
-    { "floatx80_to_float64",             1, FALSE, TRUE,  TRUE,  FALSE },
-#ifdef FLOAT128
-    { "floatx80_to_float128",            1, FALSE, FALSE, FALSE, FALSE },
-#endif
-    { "floatx80_round_to_int",           1, FALSE, TRUE,  FALSE, FALSE },
-    { "floatx80_add",                    2, TRUE,  TRUE,  FALSE, TRUE  },
-    { "floatx80_sub",                    2, TRUE,  TRUE,  FALSE, TRUE  },
-    { "floatx80_mul",                    2, TRUE,  TRUE,  TRUE,  TRUE  },
-    { "floatx80_div",                    2, TRUE,  TRUE,  FALSE, TRUE  },
-    { "floatx80_rem",                    2, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_sqrt",                   1, TRUE,  TRUE,  FALSE, FALSE },
-    { "floatx80_eq",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_le",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_lt",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_eq_signaling",           2, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_le_quiet",               2, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_lt_quiet",               2, FALSE, FALSE, FALSE, FALSE },
-#endif
-#ifdef FLOAT128
-    { "float128_to_int32",               1, FALSE, TRUE,  FALSE, FALSE },
-    { "float128_to_int32_round_to_zero", 1, FALSE, FALSE, FALSE, FALSE },
-    { "float128_to_int64",               1, FALSE, TRUE,  FALSE, FALSE },
-    { "float128_to_int64_round_to_zero", 1, FALSE, FALSE, FALSE, FALSE },
-    { "float128_to_float32",             1, FALSE, TRUE,  TRUE,  FALSE },
-    { "float128_to_float64",             1, FALSE, TRUE,  TRUE,  FALSE },
-#ifdef FLOATX80
-    { "float128_to_floatx80",            1, FALSE, TRUE,  TRUE,  FALSE },
-#endif
-    { "float128_round_to_int",           1, FALSE, TRUE,  FALSE, FALSE },
-    { "float128_add",                    2, FALSE, TRUE,  FALSE, FALSE },
-    { "float128_sub",                    2, FALSE, TRUE,  FALSE, FALSE },
-    { "float128_mul",                    2, FALSE, TRUE,  TRUE,  FALSE },
-    { "float128_div",                    2, FALSE, TRUE,  FALSE, FALSE },
-    { "float128_rem",                    2, FALSE, FALSE, FALSE, FALSE },
-    { "float128_sqrt",                   1, FALSE, TRUE,  FALSE, FALSE },
-    { "float128_eq",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "float128_le",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "float128_lt",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "float128_eq_signaling",           2, FALSE, FALSE, FALSE, FALSE },
-    { "float128_le_quiet",               2, FALSE, FALSE, FALSE, FALSE },
-    { "float128_lt_quiet",               2, FALSE, FALSE, FALSE, FALSE },
-#endif
-};
-
-enum {
-    ROUND_NEAREST_EVEN = 1,
-    ROUND_TO_ZERO,
-    ROUND_DOWN,
-    ROUND_UP,
-    NUM_ROUNDINGMODES
-};
-enum {
-    TININESS_BEFORE_ROUNDING = 1,
-    TININESS_AFTER_ROUNDING,
-    NUM_TININESSMODES
-};
-
-static void
- timeFunctionVariety(
-     uint8 functionCode,
-     int8 roundingPrecision,
-     int8 roundingMode,
-     int8 tininessMode
- )
-{
-    uint8 roundingCode;
-    int8 tininessCode;
-
-    functionName = functions[ functionCode ].name;
-    if ( roundingPrecision == 32 ) {
-        roundingPrecisionName = "32";
-    }
-    else if ( roundingPrecision == 64 ) {
-        roundingPrecisionName = "64";
-    }
-    else if ( roundingPrecision == 80 ) {
-        roundingPrecisionName = "80";
-    }
-    else {
-        roundingPrecisionName = 0;
-    }
-#ifdef FLOATX80
-    floatx80_rounding_precision = roundingPrecision;
-#endif
-    switch ( roundingMode ) {
-     case 0:
-        roundingModeName = 0;
-        roundingCode = float_round_nearest_even;
-        break;
-     case ROUND_NEAREST_EVEN:
-        roundingModeName = "nearest_even";
-        roundingCode = float_round_nearest_even;
-        break;
-     case ROUND_TO_ZERO:
-        roundingModeName = "to_zero";
-        roundingCode = float_round_to_zero;
-        break;
-     case ROUND_DOWN:
-        roundingModeName = "down";
-        roundingCode = float_round_down;
-        break;
-     case ROUND_UP:
-        roundingModeName = "up";
-        roundingCode = float_round_up;
-        break;
-    }
-    float_rounding_mode = roundingCode;
-    switch ( tininessMode ) {
-     case 0:
-        tininessModeName = 0;
-        tininessCode = float_tininess_after_rounding;
-        break;
-     case TININESS_BEFORE_ROUNDING:
-        tininessModeName = "before";
-        tininessCode = float_tininess_before_rounding;
-        break;
-     case TININESS_AFTER_ROUNDING:
-        tininessModeName = "after";
-        tininessCode = float_tininess_after_rounding;
-        break;
-    }
-    float_detect_tininess = tininessCode;
-    switch ( functionCode ) {
-     case INT32_TO_FLOAT32:
-        time_a_int32_z_float32( int32_to_float32 );
-        break;
-     case INT32_TO_FLOAT64:
-        time_a_int32_z_float64( int32_to_float64 );
-        break;
-#ifdef FLOATX80
-     case INT32_TO_FLOATX80:
-        time_a_int32_z_floatx80( int32_to_floatx80 );
-        break;
-#endif
-#ifdef FLOAT128
-     case INT32_TO_FLOAT128:
-        time_a_int32_z_float128( int32_to_float128 );
-        break;
-#endif
-     case INT64_TO_FLOAT32:
-        time_a_int64_z_float32( int64_to_float32 );
-        break;
-     case INT64_TO_FLOAT64:
-        time_a_int64_z_float64( int64_to_float64 );
-        break;
-#ifdef FLOATX80
-     case INT64_TO_FLOATX80:
-        time_a_int64_z_floatx80( int64_to_floatx80 );
-        break;
-#endif
-#ifdef FLOAT128
-     case INT64_TO_FLOAT128:
-        time_a_int64_z_float128( int64_to_float128 );
-        break;
-#endif
-     case FLOAT32_TO_INT32:
-        time_a_float32_z_int32( float32_to_int32 );
-        break;
-     case FLOAT32_TO_INT32_ROUND_TO_ZERO:
-        time_a_float32_z_int32( float32_to_int32_round_to_zero );
-        break;
-     case FLOAT32_TO_INT64:
-        time_a_float32_z_int64( float32_to_int64 );
-        break;
-     case FLOAT32_TO_INT64_ROUND_TO_ZERO:
-        time_a_float32_z_int64( float32_to_int64_round_to_zero );
-        break;
-     case FLOAT32_TO_FLOAT64:
-        time_a_float32_z_float64( float32_to_float64 );
-        break;
-#ifdef FLOATX80
-     case FLOAT32_TO_FLOATX80:
-        time_a_float32_z_floatx80( float32_to_floatx80 );
-        break;
-#endif
-#ifdef FLOAT128
-     case FLOAT32_TO_FLOAT128:
-        time_a_float32_z_float128( float32_to_float128 );
-        break;
-#endif
-     case FLOAT32_ROUND_TO_INT:
-        time_az_float32( float32_round_to_int );
-        break;
-     case FLOAT32_ADD:
-        time_abz_float32( float32_add );
-        break;
-     case FLOAT32_SUB:
-        time_abz_float32( float32_sub );
-        break;
-     case FLOAT32_MUL:
-        time_abz_float32( float32_mul );
-        break;
-     case FLOAT32_DIV:
-        time_abz_float32( float32_div );
-        break;
-     case FLOAT32_REM:
-        time_abz_float32( float32_rem );
-        break;
-     case FLOAT32_SQRT:
-        time_az_float32_pos( float32_sqrt );
-        break;
-     case FLOAT32_EQ:
-        time_ab_float32_z_flag( float32_eq );
-        break;
-     case FLOAT32_LE:
-        time_ab_float32_z_flag( float32_le );
-        break;
-     case FLOAT32_LT:
-        time_ab_float32_z_flag( float32_lt );
-        break;
-     case FLOAT32_EQ_SIGNALING:
-        time_ab_float32_z_flag( float32_eq_signaling );
-        break;
-     case FLOAT32_LE_QUIET:
-        time_ab_float32_z_flag( float32_le_quiet );
-        break;
-     case FLOAT32_LT_QUIET:
-        time_ab_float32_z_flag( float32_lt_quiet );
-        break;
-     case FLOAT64_TO_INT32:
-        time_a_float64_z_int32( float64_to_int32 );
-        break;
-     case FLOAT64_TO_INT32_ROUND_TO_ZERO:
-        time_a_float64_z_int32( float64_to_int32_round_to_zero );
-        break;
-     case FLOAT64_TO_INT64:
-        time_a_float64_z_int64( float64_to_int64 );
-        break;
-     case FLOAT64_TO_INT64_ROUND_TO_ZERO:
-        time_a_float64_z_int64( float64_to_int64_round_to_zero );
-        break;
-     case FLOAT64_TO_FLOAT32:
-        time_a_float64_z_float32( float64_to_float32 );
-        break;
-#ifdef FLOATX80
-     case FLOAT64_TO_FLOATX80:
-        time_a_float64_z_floatx80( float64_to_floatx80 );
-        break;
-#endif
-#ifdef FLOAT128
-     case FLOAT64_TO_FLOAT128:
-        time_a_float64_z_float128( float64_to_float128 );
-        break;
-#endif
-     case FLOAT64_ROUND_TO_INT:
-        time_az_float64( float64_round_to_int );
-        break;
-     case FLOAT64_ADD:
-        time_abz_float64( float64_add );
-        break;
-     case FLOAT64_SUB:
-        time_abz_float64( float64_sub );
-        break;
-     case FLOAT64_MUL:
-        time_abz_float64( float64_mul );
-        break;
-     case FLOAT64_DIV:
-        time_abz_float64( float64_div );
-        break;
-     case FLOAT64_REM:
-        time_abz_float64( float64_rem );
-        break;
-     case FLOAT64_SQRT:
-        time_az_float64_pos( float64_sqrt );
-        break;
-     case FLOAT64_EQ:
-        time_ab_float64_z_flag( float64_eq );
-        break;
-     case FLOAT64_LE:
-        time_ab_float64_z_flag( float64_le );
-        break;
-     case FLOAT64_LT:
-        time_ab_float64_z_flag( float64_lt );
-        break;
-     case FLOAT64_EQ_SIGNALING:
-        time_ab_float64_z_flag( float64_eq_signaling );
-        break;
-     case FLOAT64_LE_QUIET:
-        time_ab_float64_z_flag( float64_le_quiet );
-        break;
-     case FLOAT64_LT_QUIET:
-        time_ab_float64_z_flag( float64_lt_quiet );
-        break;
-#ifdef FLOATX80
-     case FLOATX80_TO_INT32:
-        time_a_floatx80_z_int32( floatx80_to_int32 );
-        break;
-     case FLOATX80_TO_INT32_ROUND_TO_ZERO:
-        time_a_floatx80_z_int32( floatx80_to_int32_round_to_zero );
-        break;
-     case FLOATX80_TO_INT64:
-        time_a_floatx80_z_int64( floatx80_to_int64 );
-        break;
-     case FLOATX80_TO_INT64_ROUND_TO_ZERO:
-        time_a_floatx80_z_int64( floatx80_to_int64_round_to_zero );
-        break;
-     case FLOATX80_TO_FLOAT32:
-        time_a_floatx80_z_float32( floatx80_to_float32 );
-        break;
-     case FLOATX80_TO_FLOAT64:
-        time_a_floatx80_z_float64( floatx80_to_float64 );
-        break;
-#ifdef FLOAT128
-     case FLOATX80_TO_FLOAT128:
-        time_a_floatx80_z_float128( floatx80_to_float128 );
-        break;
-#endif
-     case FLOATX80_ROUND_TO_INT:
-        time_az_floatx80( floatx80_round_to_int );
-        break;
-     case FLOATX80_ADD:
-        time_abz_floatx80( floatx80_add );
-        break;
-     case FLOATX80_SUB:
-        time_abz_floatx80( floatx80_sub );
-        break;
-     case FLOATX80_MUL:
-        time_abz_floatx80( floatx80_mul );
-        break;
-     case FLOATX80_DIV:
-        time_abz_floatx80( floatx80_div );
-        break;
-     case FLOATX80_REM:
-        time_abz_floatx80( floatx80_rem );
-        break;
-     case FLOATX80_SQRT:
-        time_az_floatx80_pos( floatx80_sqrt );
-        break;
-     case FLOATX80_EQ:
-        time_ab_floatx80_z_flag( floatx80_eq );
-        break;
-     case FLOATX80_LE:
-        time_ab_floatx80_z_flag( floatx80_le );
-        break;
-     case FLOATX80_LT:
-        time_ab_floatx80_z_flag( floatx80_lt );
-        break;
-     case FLOATX80_EQ_SIGNALING:
-        time_ab_floatx80_z_flag( floatx80_eq_signaling );
-        break;
-     case FLOATX80_LE_QUIET:
-        time_ab_floatx80_z_flag( floatx80_le_quiet );
-        break;
-     case FLOATX80_LT_QUIET:
-        time_ab_floatx80_z_flag( floatx80_lt_quiet );
-        break;
-#endif
-#ifdef FLOAT128
-     case FLOAT128_TO_INT32:
-        time_a_float128_z_int32( float128_to_int32 );
-        break;
-     case FLOAT128_TO_INT32_ROUND_TO_ZERO:
-        time_a_float128_z_int32( float128_to_int32_round_to_zero );
-        break;
-     case FLOAT128_TO_INT64:
-        time_a_float128_z_int64( float128_to_int64 );
-        break;
-     case FLOAT128_TO_INT64_ROUND_TO_ZERO:
-        time_a_float128_z_int64( float128_to_int64_round_to_zero );
-        break;
-     case FLOAT128_TO_FLOAT32:
-        time_a_float128_z_float32( float128_to_float32 );
-        break;
-     case FLOAT128_TO_FLOAT64:
-        time_a_float128_z_float64( float128_to_float64 );
-        break;
-#ifdef FLOATX80
-     case FLOAT128_TO_FLOATX80:
-        time_a_float128_z_floatx80( float128_to_floatx80 );
-        break;
-#endif
-     case FLOAT128_ROUND_TO_INT:
-        time_az_float128( float128_round_to_int );
-        break;
-     case FLOAT128_ADD:
-        time_abz_float128( float128_add );
-        break;
-     case FLOAT128_SUB:
-        time_abz_float128( float128_sub );
-        break;
-     case FLOAT128_MUL:
-        time_abz_float128( float128_mul );
-        break;
-     case FLOAT128_DIV:
-        time_abz_float128( float128_div );
-        break;
-     case FLOAT128_REM:
-        time_abz_float128( float128_rem );
-        break;
-     case FLOAT128_SQRT:
-        time_az_float128_pos( float128_sqrt );
-        break;
-     case FLOAT128_EQ:
-        time_ab_float128_z_flag( float128_eq );
-        break;
-     case FLOAT128_LE:
-        time_ab_float128_z_flag( float128_le );
-        break;
-     case FLOAT128_LT:
-        time_ab_float128_z_flag( float128_lt );
-        break;
-     case FLOAT128_EQ_SIGNALING:
-        time_ab_float128_z_flag( float128_eq_signaling );
-        break;
-     case FLOAT128_LE_QUIET:
-        time_ab_float128_z_flag( float128_le_quiet );
-        break;
-     case FLOAT128_LT_QUIET:
-        time_ab_float128_z_flag( float128_lt_quiet );
-        break;
-#endif
-    }
-
-}
-
-static void
- timeFunction(
-     uint8 functionCode,
-     int8 roundingPrecisionIn,
-     int8 roundingModeIn,
-     int8 tininessModeIn
- )
-{
-    int8 roundingPrecision, roundingMode, tininessMode;
-
-    roundingPrecision = 32;
-    for (;;) {
-        if ( ! functions[ functionCode ].roundingPrecision ) {
-            roundingPrecision = 0;
-        }
-        else if ( roundingPrecisionIn ) {
-            roundingPrecision = roundingPrecisionIn;
-        }
-        for ( roundingMode = 1;
-              roundingMode < NUM_ROUNDINGMODES;
-              ++roundingMode
-            ) {
-            if ( ! functions[ functionCode ].roundingMode ) {
-                roundingMode = 0;
-            }
-            else if ( roundingModeIn ) {
-                roundingMode = roundingModeIn;
-            }
-            for ( tininessMode = 1;
-                  tininessMode < NUM_TININESSMODES;
-                  ++tininessMode
-                ) {
-                if (    ( roundingPrecision == 32 )
-                     || ( roundingPrecision == 64 ) ) {
-                    if ( ! functions[ functionCode ]
-                               .tininessModeAtReducedPrecision
-                       ) {
-                        tininessMode = 0;
-                    }
-                    else if ( tininessModeIn ) {
-                        tininessMode = tininessModeIn;
-                    }
-                }
-                else {
-                    if ( ! functions[ functionCode ].tininessMode ) {
-                        tininessMode = 0;
-                    }
-                    else if ( tininessModeIn ) {
-                        tininessMode = tininessModeIn;
-                    }
-                }
-                timeFunctionVariety(
-                    functionCode, roundingPrecision, roundingMode, tininessMode
-                );
-                if ( tininessModeIn || ! tininessMode ) break;
-            }
-            if ( roundingModeIn || ! roundingMode ) break;
-        }
-        if ( roundingPrecisionIn || ! roundingPrecision ) break;
-        if ( roundingPrecision == 80 ) {
-            break;
-        }
-        else if ( roundingPrecision == 64 ) {
-            roundingPrecision = 80;
-        }
-        else if ( roundingPrecision == 32 ) {
-            roundingPrecision = 64;
-        }
-    }
-
-}
-
-main( int argc, char **argv )
-{
-    char *argPtr;
-    flag functionArgument;
-    uint8 functionCode;
-    int8 operands, roundingPrecision, roundingMode, tininessMode;
-
-    if ( argc <= 1 ) goto writeHelpMessage;
-    functionArgument = FALSE;
-    functionCode = 0;
-    operands = 0;
-    roundingPrecision = 0;
-    roundingMode = 0;
-    tininessMode = 0;
-    --argc;
-    ++argv;
-    while ( argc && ( argPtr = argv[ 0 ] ) ) {
-        if ( argPtr[ 0 ] == '-' ) ++argPtr;
-        if ( strcmp( argPtr, "help" ) == 0 ) {
- writeHelpMessage:
-            fputs(
-"timesoftfloat [<option>...] <function>\n"
-"  <option>:  (* is default)\n"
-"    -help            --Write this message and exit.\n"
-#ifdef FLOATX80
-"    -precision32     --Only time rounding precision equivalent to float32.\n"
-"    -precision64     --Only time rounding precision equivalent to float64.\n"
-"    -precision80     --Only time maximum rounding precision.\n"
-#endif
-"    -nearesteven     --Only time rounding to nearest/even.\n"
-"    -tozero          --Only time rounding to zero.\n"
-"    -down            --Only time rounding down.\n"
-"    -up              --Only time rounding up.\n"
-"    -tininessbefore  --Only time underflow tininess before rounding.\n"
-"    -tininessafter   --Only time underflow tininess after rounding.\n"
-"  <function>:\n"
-"    int32_to_<float>                 <float>_add   <float>_eq\n"
-"    <float>_to_int32                 <float>_sub   <float>_le\n"
-"    <float>_to_int32_round_to_zero   <float>_mul   <float>_lt\n"
-"    int64_to_<float>                 <float>_div   <float>_eq_signaling\n"
-"    <float>_to_int64                 <float>_rem   <float>_le_quiet\n"
-"    <float>_to_int64_round_to_zero                 <float>_lt_quiet\n"
-"    <float>_to_<float>\n"
-"    <float>_round_to_int\n"
-"    <float>_sqrt\n"
-"    -all1            --All 1-operand functions.\n"
-"    -all2            --All 2-operand functions.\n"
-"    -all             --All functions.\n"
-"  <float>:\n"
-"    float32          --Single precision.\n"
-"    float64          --Double precision.\n"
-#ifdef FLOATX80
-"    floatx80         --Extended double precision.\n"
-#endif
-#ifdef FLOAT128
-"    float128         --Quadruple precision.\n"
-#endif
-                ,
-                stdout
-            );
-            return EXIT_SUCCESS;
-        }
-#ifdef FLOATX80
-        else if ( strcmp( argPtr, "precision32" ) == 0 ) {
-            roundingPrecision = 32;
-        }
-        else if ( strcmp( argPtr, "precision64" ) == 0 ) {
-            roundingPrecision = 64;
-        }
-        else if ( strcmp( argPtr, "precision80" ) == 0 ) {
-            roundingPrecision = 80;
-        }
-#endif
-        else if (    ( strcmp( argPtr, "nearesteven" ) == 0 )
-                  || ( strcmp( argPtr, "nearest_even" ) == 0 ) ) {
-            roundingMode = ROUND_NEAREST_EVEN;
-        }
-        else if (    ( strcmp( argPtr, "tozero" ) == 0 )
-                  || ( strcmp( argPtr, "to_zero" ) == 0 ) ) {
-            roundingMode = ROUND_TO_ZERO;
-        }
-        else if ( strcmp( argPtr, "down" ) == 0 ) {
-            roundingMode = ROUND_DOWN;
-        }
-        else if ( strcmp( argPtr, "up" ) == 0 ) {
-            roundingMode = ROUND_UP;
-        }
-        else if ( strcmp( argPtr, "tininessbefore" ) == 0 ) {
-            tininessMode = TININESS_BEFORE_ROUNDING;
-        }
-        else if ( strcmp( argPtr, "tininessafter" ) == 0 ) {
-            tininessMode = TININESS_AFTER_ROUNDING;
-        }
-        else if ( strcmp( argPtr, "all1" ) == 0 ) {
-            functionArgument = TRUE;
-            functionCode = 0;
-            operands = 1;
-        }
-        else if ( strcmp( argPtr, "all2" ) == 0 ) {
-            functionArgument = TRUE;
-            functionCode = 0;
-            operands = 2;
-        }
-        else if ( strcmp( argPtr, "all" ) == 0 ) {
-            functionArgument = TRUE;
-            functionCode = 0;
-            operands = 0;
-        }
-        else {
-            for ( functionCode = 1;
-                  functionCode < NUM_FUNCTIONS;
-                  ++functionCode 
-                ) {
-                if ( strcmp( argPtr, functions[ functionCode ].name ) == 0 ) {
-                    break;
-                }
-            }
-            if ( functionCode == NUM_FUNCTIONS ) {
-                fail( "Invalid option or function `%s'", argv[ 0 ] );
-            }
-            functionArgument = TRUE;
-        }
-        --argc;
-        ++argv;
-    }
-    if ( ! functionArgument ) fail( "Function argument required" );
-    if ( functionCode ) {
-        timeFunction(
-            functionCode, roundingPrecision, roundingMode, tininessMode );
-    }
-    else if ( operands == 1 ) {
-        for ( functionCode = 1; functionCode < NUM_FUNCTIONS; ++functionCode
-            ) {
-            if ( functions[ functionCode ].numInputs == 1 ) {
-                timeFunction(
-                    functionCode, roundingPrecision, roundingMode, tininessMode
-                );
-            }
-        }
-    }
-    else if ( operands == 2 ) {
-        for ( functionCode = 1; functionCode < NUM_FUNCTIONS; ++functionCode
-            ) {
-            if ( functions[ functionCode ].numInputs == 2 ) {
-                timeFunction(
-                    functionCode, roundingPrecision, roundingMode, tininessMode
-                );
-            }
-        }
-    }
-    else {
-        for ( functionCode = 1; functionCode < NUM_FUNCTIONS; ++functionCode
-            ) {
-            timeFunction(
-                functionCode, roundingPrecision, roundingMode, tininessMode );
-        }
-    }
-    return EXIT_SUCCESS;
-
-}
-
diff --git a/lib/libc/softfloat/timesoftfloat.txt b/lib/libc/softfloat/timesoftfloat.txt
deleted file mode 100644
index c1763f972..000000000
--- a/lib/libc/softfloat/timesoftfloat.txt
+++ /dev/null
@@ -1,149 +0,0 @@
-$NetBSD: timesoftfloat.txt,v 1.1 2000/06/06 08:15:11 bjh21 Exp $
-
-Documentation for the `timesoftfloat' Program of SoftFloat Release 2a
-
-John R. Hauser
-1998 December 14
-
-
--------------------------------------------------------------------------------
-Introduction
-
-The `timesoftfloat' program evaluates the speed of SoftFloat's floating-
-point routines.  Each routine can be evaluated for every relevant rounding
-mode, tininess mode, and/or rounding precision.
-
-
--------------------------------------------------------------------------------
-Contents
-
-    Introduction
-    Contents
-    Legal Notice
-    Executing `timesoftfloat'
-    Options
-        -help
-        -precision32, -precision64, -precision80
-        -nearesteven, -tozero, -down, -up
-        -tininessbefore, -tininessafter
-    Function Sets
-
-
-
--------------------------------------------------------------------------------
-Legal Notice
-
-The `timesoftfloat' program was written by John R. Hauser.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-
--------------------------------------------------------------------------------
-Executing `timesoftfloat'
-
-The `timesoftfloat' program is intended to be invoked from a command line
-interpreter as follows:
-
-    timesoftfloat [<option>...] <function>
-
-Here square brackets ([]) indicate optional items, while angled brackets
-(<>) denote parameters to be filled in.  The `<function>' argument is
-the name of the SoftFloat routine to evaluate, such as `float32_add' or
-`float64_to_int32'.  The allowed options are detailed in the next section,
-_Options_.  If `timesoftfloat' is executed without any arguments, a summary
-of usage is written.  It is also possible to evaluate all machine functions
-in a single invocation as explained in the section _Function_Sets_ later in
-this document.
-
-Ordinarily, a function's speed will be evaulated separately for each of
-the four rounding modes, one after the other.  If the rounding mode is not
-supposed to have any affect on the results of a function--for instance,
-some operations do not require rounding--only the nearest/even rounding mode
-is timed.  In the same way, if a function is affected by the way in which
-underflow tininess is detected, `timesoftfloat' times the function both with
-tininess detected before rounding and after rounding.  For extended double-
-precision operations affected by rounding precision control, `timesoftfloat'
-also times the function for all three rounding precision modes, one after
-the other.  Evaluation of a function can be limited to a single rounding
-mode, a single tininess mode, and/or a single rounding precision with
-appropriate options (see _Options_).
-
-For each function and mode evaluated, `timesoftfloat' reports the speed of
-the function in kops/s, or ``thousands of operations per second''.  This
-unit of measure differs from the traditional MFLOPS (``millions of floating-
-point operations per second'') only in being a factor of 1000 smaller.
-(1000 kops/s is exactly 1 MFLOPS.)  Speeds are reported in thousands instead
-of millions because software floating-point often executes at less than
-1 MFLOPS.
-
-The speeds reported by `timesoftfloat' may be affected somewhat by other
-programs executing at the same time as `timesoftfloat'.
-
-Note that the remainder operations (`float32_rem', `float64_rem',
-`floatx80_rem' and `float128_rem') will be markedly slower than other
-operations, particularly for extended double precision (`floatx80') and
-quadruple precision (`float128').  This is inherent to the remainder
-function itself and is not a failing of the SoftFloat implementation.
-
-
--------------------------------------------------------------------------------
-Options
-
-The `timesoftfloat' program accepts several command options.  If mutually
-contradictory options are given, the last one has priority.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--help
-
-The `-help' option causes a summary of program usage to be written, after
-which the program exits.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--precision32, -precision64, -precision80
-
-For extended double-precision functions affected by rounding precision
-control, the `-precision32' option restricts evaluation to only the cases
-in which rounding precision is equivalent to single precision.  The other
-rounding precision options are not timed.  Likewise, the `-precision64'
-and `-precision80' options fix the rounding precision equivalent to double
-precision or extended double precision, respectively.  These options are
-ignored for functions not affected by rounding precision control.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--nearesteven, -tozero, -down, -up
-
-The `-nearesteven' option restricts evaluation to only the cases in which
-the rounding mode is nearest/even.  The other rounding mode options are not
-timed.  Likewise, `-tozero' forces rounding to zero; `-down' forces rounding
-down; and `-up' forces rounding up.  These options are ignored for functions
-that are exact and thus do not round.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--tininessbefore, -tininessafter
-
-The `-tininessbefore' option restricts evaluation to only the cases
-detecting underflow tininess before rounding.  Tininess after rounding
-is not timed.  Likewise, `-tininessafter' forces underflow tininess to be
-detected after rounding only.  These options are ignored for functions not
-affected by the way in which underflow tininess is detected.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
--------------------------------------------------------------------------------
-Function Sets
-
-Just as `timesoftfloat' can test an operation for all four rounding modes in
-sequence, multiple operations can also be tested with a single invocation.
-Three sets are recognized:  `-all1', `-all2', and `-all'.  The set `-all1'
-comprises all one-operand functions; `-all2' is all two-operand functions;
-and `-all' is all functions.  A function set can be used in place of a
-function name in the command line, as in
-
-    timesoftfloat [<option>...] -all
-
-
diff --git a/lib/libc/softfloat/unorddf2.c b/lib/libc/softfloat/unorddf2.c
deleted file mode 100644
index d4ac29cbb..000000000
--- a/lib/libc/softfloat/unorddf2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: unorddf2.c,v 1.1 2003/05/06 08:58:19 rearnsha Exp $ */
-
-/*
- * Written by Richard Earnshaw, 2003.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: unorddf2.c,v 1.1 2003/05/06 08:58:19 rearnsha Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-flag __unorddf2(float64, float64);
-
-flag
-__unorddf2(float64 a, float64 b)
-{
-	/*
-	 * The comparison is unordered if either input is a NaN.
-	 * Test for this by comparing each operand with itself.
-	 * We must perform both comparisons to correctly check for
-	 * signalling NaNs.
-	 */
-	return 1 ^ (float64_eq(a, a) & float64_eq(b, b));
-}
diff --git a/lib/libc/softfloat/unordsf2.c b/lib/libc/softfloat/unordsf2.c
deleted file mode 100644
index 03a1969dd..000000000
--- a/lib/libc/softfloat/unordsf2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $NetBSD: unordsf2.c,v 1.1 2003/05/06 08:58:20 rearnsha Exp $ */
-
-/*
- * Written by Richard Earnshaw, 2003.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: unordsf2.c,v 1.1 2003/05/06 08:58:20 rearnsha Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-flag __unordsf2(float32, float32);
-
-flag
-__unordsf2(float32 a, float32 b)
-{
-	/*
-	 * The comparison is unordered if either input is a NaN.
-	 * Test for this by comparing each operand with itself.
-	 * We must perform both comparisons to correctly check for
-	 * signalling NaNs.
-	 */
-	return 1 ^ (float32_eq(a, a) & float32_eq(b, b));
-}
diff --git a/lib/libc/softfloat/unordtf2.c b/lib/libc/softfloat/unordtf2.c
deleted file mode 100644
index ec3dda102..000000000
--- a/lib/libc/softfloat/unordtf2.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* $NetBSD: unordtf2.c,v 1.2 2014/01/30 19:11:41 matt Exp $ */
-
-/*
- * Written by Richard Earnshaw, 2003.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: unordtf2.c,v 1.2 2014/01/30 19:11:41 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef FLOAT128
-
-flag __unordtf2(float128, float128);
-
-flag
-__unordtf2(float128 a, float128 b)
-{
-	/*
-	 * The comparison is unordered if either input is a NaN.
-	 * Test for this by comparing each operand with itself.
-	 * We must perform both comparisons to correctly check for
-	 * signalling NaNs.
-	 */
-	return 1 ^ (float128_eq(a, a) & float128_eq(b, b));
-}
-
-#endif /* FLOAT128 */
diff --git a/lib/libc/ssp/Makefile.inc b/lib/libc/ssp/Makefile.inc
deleted file mode 100644
index 2a8a9a5d4..000000000
--- a/lib/libc/ssp/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.5 2014/04/06 19:29:37 christos Exp $
-
-.PATH: ${.CURDIR}/ssp
-
-SSP_SRCS=	gets_chk.c fgets_chk.c memcpy_chk.c memmove_chk.c memset_chk.c \
-		snprintf_chk.c sprintf_chk.c stpcpy_chk.c stpncpy_chk.c \
-		strcat_chk.c strcpy_chk.c strncat_chk.c strncpy_chk.c \
-		vsnprintf_chk.c vsprintf_chk.c
-
-.for i in ${SSP_SRCS}
-SRCS+=${i}
-WARNS.${i}=4
-.endfor
-
-MAN+=	ssp.3 __builtin_object_size.3
diff --git a/lib/libc/ssp/__builtin_object_size.3 b/lib/libc/ssp/__builtin_object_size.3
deleted file mode 100644
index 8645daee4..000000000
--- a/lib/libc/ssp/__builtin_object_size.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\"	$NetBSD: __builtin_object_size.3,v 1.10 2012/07/19 06:44:12 wiz Exp $
-.\"
-.\" Copyright (c) 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"
-.Dd July 18, 2012
-.Dt __BUILTIN_OBJECT_SIZE 3
-.Os
-.Sh NAME
-.Nm __builtin_object_size
-.Nd return the size of the given object
-.Sh SYNOPSIS
-.Ft size_t
-.Fn __builtin_object_size "void *ptr" "int type"
-.Sh DESCRIPTION
-The
-.Fn __builtin_object_size
-function is a
-.Xr gcc 1
-built-in function that returns the size of the
-.Fa ptr
-object if known at compile time and the object does not have any side
-effects.
-.Sh RETURN VALUES
-If the size of the object is not known or it has side effects the
-.Fn __builtin_object_size
-function returns:
-.Bl -tag -width (size_t)\-1 -offset indent
-.It Dv (size_t)\-1
-for
-.Fa type
-.Dv 0
-and
-.Dv 1 .
-.It Dv (size_t)0
-for
-.Fa type
-.Dv 2
-and
-.Dv 3 .
-.El
-.Pp
-If the size of the object is known, then the
-.Fn __builtin_object_size
-function returns the maximum size of all the objects that the compiler
-knows that they can be pointed to by
-.Fa ptr
-when
-.Fa type
-.Dv \*[Am] 2 == 0 ,
-and the minimum size when
-.Fa type
-.Dv \*[Am] 2 != 0 .
-.Sh SEE ALSO
-.Xr gcc 1 ,
-.Xr __builtin_return_address 3 ,
-.Xr attribute 3 ,
-.Xr ssp 3
-.Sh HISTORY
-The
-.Fn __builtin_object_size
-appeared in
-.Tn GCC 4.1 .
-.Sh CAVEATS
-This is a non-standard, compiler-specific extension.
-.Pp
-Note that currently the object size calculation pass is only done at -O1
-or above, meaning that this function always returns \-1 when the optimizer
-is off.
-.Pp
-There are some discussions about always doing the object size pass, but
-the issue is that without the optimization pass data sizes are not going
-to be correct.
-.Pp
-For that reason currently code fortification (size-checked replacement
-functions) is disabled when optimization is off.
diff --git a/lib/libc/ssp/fgets_chk.c b/lib/libc/ssp/fgets_chk.c
deleted file mode 100644
index 377579ff6..000000000
--- a/lib/libc/ssp/fgets_chk.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: fgets_chk.c,v 1.6 2009/02/05 05:41:51 lukem Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: fgets_chk.c,v 1.6 2009/02/05 05:41:51 lukem Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <ssp/stdio.h>
-
-#undef fgets
-
-char *
-__fgets_chk(char * __restrict buf, int len, size_t slen, FILE *fp)
-{
-	if (slen >= (size_t)INT_MAX)
-		return fgets(buf, len, fp);
-
-	if (len >= 0 && (size_t)len > slen)
-		__chk_fail();
-
-	return fgets(buf, len, fp);
-}
diff --git a/lib/libc/ssp/gets_chk.c b/lib/libc/ssp/gets_chk.c
deleted file mode 100644
index 8f5e46f62..000000000
--- a/lib/libc/ssp/gets_chk.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: gets_chk.c,v 1.7 2013/10/04 20:49:16 christos Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: gets_chk.c,v 1.7 2013/10/04 20:49:16 christos Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <ssp/stdio.h>
-
-extern char *__gets(char *);
-#undef gets
-
-char *
-__gets_chk(char * __restrict buf, size_t slen)
-{
-	char *abuf;
-	size_t len;
-
-	if (slen >= (size_t)INT_MAX)
-		return __gets(buf);
-
-	if ((abuf = malloc(slen + 1)) == NULL)
-		return __gets(buf);
-
-	if (fgets(abuf, (int)(slen + 1), stdin) == NULL) {
-		free(abuf);
-		return NULL;
-	}
-
-	len = strlen(abuf);
-	if (len > 0 && abuf[len - 1] == '\n')
-		--len;
-
-	if (len >= slen)
-		__chk_fail();
-
-	(void)memcpy(buf, abuf, len);
-
-	buf[len] = '\0';
-	free(abuf);
-	return buf;
-}
diff --git a/lib/libc/ssp/memcpy_chk.c b/lib/libc/ssp/memcpy_chk.c
deleted file mode 100644
index 63f536dc5..000000000
--- a/lib/libc/ssp/memcpy_chk.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: memcpy_chk.c,v 1.7 2015/05/13 19:57:16 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: memcpy_chk.c,v 1.7 2015/05/13 19:57:16 joerg Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <string.h>
-
-#undef memcpy
-
-void *__memcpy_chk(void * __restrict, const void * __restrict, size_t, size_t);
-
-void *
-__memcpy_chk(void * __restrict dst, const void * __restrict src, size_t len,
-    size_t slen)
-{
-	if (len > slen)
-		__chk_fail();
-
-	if (__ssp_overlap((const char *)src, (const char *)dst, len))
-		__chk_fail();
-
-	return memcpy(dst, src, len);
-}
diff --git a/lib/libc/ssp/memmove_chk.c b/lib/libc/ssp/memmove_chk.c
deleted file mode 100644
index f8f03d778..000000000
--- a/lib/libc/ssp/memmove_chk.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: memmove_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: memmove_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <string.h>
-
-#undef memmove
-
-void *__memmove_chk(void *, void *src, size_t, size_t);
-
-void *
-__memmove_chk(void *dst, void *src, size_t len,
-    size_t slen)
-{
-	if (len > slen)
-		__chk_fail();
-	return memmove(dst, src, len);
-}
diff --git a/lib/libc/ssp/memset_chk.c b/lib/libc/ssp/memset_chk.c
deleted file mode 100644
index 0e303b9eb..000000000
--- a/lib/libc/ssp/memset_chk.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: memset_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: memset_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <string.h>
-
-#undef memset
-
-void *__memset_chk(void * __restrict, int, size_t, size_t);
-
-void *
-__memset_chk(void * __restrict dst, int val, size_t len, size_t slen)
-{
-	if (len > slen)
-		__chk_fail();
-	return memset(dst, val, len);
-}
diff --git a/lib/libc/ssp/snprintf_chk.c b/lib/libc/ssp/snprintf_chk.c
deleted file mode 100644
index cede5a4bd..000000000
--- a/lib/libc/ssp/snprintf_chk.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: snprintf_chk.c,v 1.5 2008/04/28 20:23:00 martin Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: snprintf_chk.c,v 1.5 2008/04/28 20:23:00 martin Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <ssp/stdio.h>
-
-#undef vsnprintf
-
-/*ARGSUSED*/
-int
-__snprintf_chk(char * __restrict buf, size_t len, int flags, size_t slen,
-    const char * __restrict fmt, ...)
-{
-	va_list ap;
-	int rv;
-
-	if (len > slen)
-		__chk_fail();
-
-	va_start(ap, fmt);
-	rv = vsnprintf(buf, len, fmt, ap);
-	va_end(ap);
-
-	return rv;
-}
diff --git a/lib/libc/ssp/sprintf_chk.c b/lib/libc/ssp/sprintf_chk.c
deleted file mode 100644
index 1e924799b..000000000
--- a/lib/libc/ssp/sprintf_chk.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: sprintf_chk.c,v 1.6 2009/02/05 05:40:36 lukem Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: sprintf_chk.c,v 1.6 2009/02/05 05:40:36 lukem Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <stdio.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <ssp/stdio.h>
-
-#undef vsnprintf
-#undef vsprintf
-
-int
-/*ARGSUSED*/
-__sprintf_chk(char * __restrict buf, int flags, size_t slen,
-    const char * __restrict fmt, ...)
-{
-	va_list ap;
-	int rv;
-
-	va_start(ap, fmt);
-	if (slen > (size_t)INT_MAX)
-		rv = vsprintf(buf, fmt, ap);
-	else {
-		if ((rv = vsnprintf(buf, slen, fmt, ap)) >= 0 && (size_t)rv >= slen)
-			__chk_fail();
-	}
-	va_end(ap);
-
-	return rv;
-}
diff --git a/lib/libc/ssp/ssp.3 b/lib/libc/ssp/ssp.3
deleted file mode 100644
index 5680329d6..000000000
--- a/lib/libc/ssp/ssp.3
+++ /dev/null
@@ -1,123 +0,0 @@
-.\"	$NetBSD: ssp.3,v 1.8 2013/11/07 02:01:42 christos Exp $
-.\"
-.\" Copyright (c) 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"
-.Dd November 6, 2013
-.Dt SSP 3
-.Os
-.Sh NAME
-.Nm ssp
-.Nd bounds checked libc functions
-.Sh LIBRARY
-.Lb libssp
-.Sh SYNOPSIS
-.In ssp/stdio.h
-.Ft int
-.Fn sprintf "char *str" "const char *fmt" "..."
-.Ft int
-.Fn vsprintf "char *str" "const char *fmt" "va_list ap"
-.Ft int
-.Fn snprintf "char *str" "size_t len" "const char *fmt" "..."
-.Ft int
-.Fn vsnprintf "char *str" "size_t len" "const char *fmt" "va_list ap"
-.Ft char *
-.Fn gets "char *str"
-.Ft char *
-.Fn fgets "char *str" "int len" "FILE *fp"
-.In ssp/string.h
-.Ft void *
-.Fn memcpy "void *str" "const void *ptr" "size_t len"
-.Ft void *
-.Fn memmove "void *str" "const void *ptr" "size_t len"
-.Ft void *
-.Fn memset "void *str" "int val" "size_t len"
-.Ft char *
-.Fn stpcpy "char *str" "const char *ptr"
-.Ft char *
-.Fn strcpy "char *str" "const char *ptr"
-.Ft char *
-.Fn strcat "char *str" "const char *ptr"
-.Ft char *
-.Fn strncpy "char *str" "const char *ptr" "size_t len"
-.Ft char *
-.Fn strncat "char *str" "const char *ptr" "size_t len"
-.In ssp/strings.h
-.Ft void *
-.Fn bcopy "const void *ptr" "void *str" "size_t len"
-.Ft void *
-.Fn bzero "void *str" "size_t len"
-.In ssp/unistd.h
-.Ft ssize_t
-.Fn read "int fd" "void *str" "size_t len"
-.Ft int
-.Fn readlink "const char * restrict path" "char * restrict str" "size_t len"
-.Ft int
-.Fn getcwd "char *str" "size_t len"
-.Sh DESCRIPTION
-When
-.Dv _FORTIFY_SOURCE
-bounds checking is enabled as described below, the above functions get
-overwritten to use the
-.Xr __builtin_object_size 3
-function to compute the size of
-.Fa str ,
-if known at compile time,
-and perform bounds check on it in order
-to avoid data buffer or stack buffer overflows.
-If an overflow is detected, the routines will call
-.Xr abort 3 .
-.Pp
-To enable these function overrides the following should be added to the
-.Xr gcc 1
-command line:
-.Dq \-I/usr/include/ssp
-to override the standard include files and
-.Dq \-D_FORTIFY_SOURCE=1
-or
-.Dq \-D_FORTIFY_SOURCE=2 .
-.Pp
-If
-.Dv _FORTIFY_SOURCE is set to
-.Dv 1
-the code will compute the maximum possible buffer size for
-.Fa str ,
-and if set to
-.Dv 2
-it will compute the minimum buffer size.
-.Sh SEE ALSO
-.Xr gcc 1 ,
-.Xr __builtin_object_size 3 ,
-.Xr stdio 3 ,
-.Xr string 3 ,
-.Xr security 7
-.Sh HISTORY
-The
-.Nm ssp
-library appeared
-.Nx 4.0 .
diff --git a/lib/libc/ssp/stpcpy_chk.c b/lib/libc/ssp/stpcpy_chk.c
deleted file mode 100644
index ed1d74ad7..000000000
--- a/lib/libc/ssp/stpcpy_chk.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: stpcpy_chk.c,v 1.6 2015/05/09 15:42:21 christos Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: stpcpy_chk.c,v 1.6 2015/05/09 15:42:21 christos Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <string.h>
-
-#undef memcpy
-
-#if !__GNUC_PREREQ__(4, 8)
-char *__stpcpy_chk(char * __restrict, const char * __restrict, size_t);
-#endif
-
-char *
-__stpcpy_chk(char * __restrict dst, const char * __restrict src, size_t slen)
-{
-	size_t len = strlen(src);
-
-	if (len >= slen)
-		__chk_fail();
-
-	if (__ssp_overlap(src, dst, len))
-		__chk_fail();
-
-	(void)memcpy(dst, src, len + 1);
-	return dst + len;
-}
diff --git a/lib/libc/ssp/stpncpy_chk.c b/lib/libc/ssp/stpncpy_chk.c
deleted file mode 100644
index 756626153..000000000
--- a/lib/libc/ssp/stpncpy_chk.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: stpncpy_chk.c,v 1.3 2015/05/09 15:42:21 christos Exp $	*/
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: stpncpy_chk.c,v 1.3 2015/05/09 15:42:21 christos Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <string.h>
-
-#undef stpncpy
-
-#if !__GNUC_PREREQ__(4, 8)
-char *__stpncpy_chk(char * __restrict, const char * __restrict, size_t, size_t);
-#endif
-
-char *
-__stpncpy_chk(char * __restrict dst, const char * __restrict src, size_t len,
-    size_t slen)
-{
-	if (len > slen)
-		__chk_fail();
-
-	if (__ssp_overlap(src, dst, len))
-		__chk_fail();
-
-	return stpncpy(dst, src, len);
-}
diff --git a/lib/libc/ssp/strcat_chk.c b/lib/libc/ssp/strcat_chk.c
deleted file mode 100644
index d57f9559b..000000000
--- a/lib/libc/ssp/strcat_chk.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: strcat_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: strcat_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <string.h>
-
-char *__strcat_chk(char * __restrict, const char * __restrict, size_t);
-
-char *
-__strcat_chk(char * __restrict dst, const char * __restrict src, size_t slen)
-{
-	char *d;
-
-	for (d = dst; *d; d++) {
-		if (slen-- == 0)
-			__chk_fail();
-	}
-
-	while (*src) {
-		if (slen-- == 0)
-			__chk_fail();
-		*d++ = *src++;
-	}
-
-	if (slen-- == 0)
-		__chk_fail();
-
-	*d = '\0';
-	return dst;
-}
diff --git a/lib/libc/ssp/strcpy_chk.c b/lib/libc/ssp/strcpy_chk.c
deleted file mode 100644
index cef160a62..000000000
--- a/lib/libc/ssp/strcpy_chk.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: strcpy_chk.c,v 1.8 2015/05/09 15:42:21 christos Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: strcpy_chk.c,v 1.8 2015/05/09 15:42:21 christos Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <string.h>
-
-#undef memcpy
-
-char *__strcpy_chk(char * __restrict, const char * __restrict, size_t);
-
-char *
-__strcpy_chk(char * __restrict dst, const char * __restrict src, size_t slen)
-{
-	size_t len = strlen(src) + 1;
-
-	if (len > slen)
-		__chk_fail();
-
-	if (__ssp_overlap(src, dst, len))
-		__chk_fail();
-
-	return memcpy(dst, src, len);
-}
diff --git a/lib/libc/ssp/strncat_chk.c b/lib/libc/ssp/strncat_chk.c
deleted file mode 100644
index 5ce5a9ef6..000000000
--- a/lib/libc/ssp/strncat_chk.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*	$NetBSD: strncat_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: strncat_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <string.h>
-#include <stdio.h>
-
-char *__strncat_chk(char * __restrict, const char * __restrict, size_t,
-    size_t);
-
-char *
-__strncat_chk(char * __restrict dst, const char * __restrict src, size_t len,
-    size_t slen)
-{
-	char *d;
-
-	if (len == 0)
-		return dst;
-
-	if (len > slen)
-		__chk_fail();
-
-	for (d = dst; *d; d++) {
-		if (slen-- == 0)
-			__chk_fail();
-	}
-
-	do {
-		if ((*d = *src++) == '\0')
-			break;
-		if (slen-- == 0)
-			__chk_fail();
-		d++;
-	} while (--len != 0);
-
-	if (slen-- == 0)
-		__chk_fail();
-
-	*d = '\0';
-	return dst;
-}
diff --git a/lib/libc/ssp/strncpy_chk.c b/lib/libc/ssp/strncpy_chk.c
deleted file mode 100644
index 591157a25..000000000
--- a/lib/libc/ssp/strncpy_chk.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: strncpy_chk.c,v 1.6 2015/05/09 15:42:21 christos Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: strncpy_chk.c,v 1.6 2015/05/09 15:42:21 christos Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <string.h>
-
-#undef strncpy
-
-char *__strncpy_chk(char * __restrict, const char * __restrict, size_t,
-    size_t);
-
-char *
-__strncpy_chk(char * __restrict dst, const char * __restrict src, size_t len,
-    size_t slen)
-{
-	if (len > slen)
-		__chk_fail();
-
-	if (__ssp_overlap(src, dst, len))
-		__chk_fail();
-
-	return strncpy(dst, src, len);
-}
diff --git a/lib/libc/ssp/vsnprintf_chk.c b/lib/libc/ssp/vsnprintf_chk.c
deleted file mode 100644
index 2b8802908..000000000
--- a/lib/libc/ssp/vsnprintf_chk.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: vsnprintf_chk.c,v 1.5 2008/04/28 20:23:00 martin Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: vsnprintf_chk.c,v 1.5 2008/04/28 20:23:00 martin Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <ssp/stdio.h>
-
-#undef vsnprintf
-
-int
-__vsnprintf_chk(char * __restrict buf, size_t len, int flags, size_t slen,
-    const char * __restrict fmt, va_list ap)
-{
-	if (len > slen)
-		__chk_fail();
-
-	return vsnprintf(buf, len, fmt, ap);
-}
diff --git a/lib/libc/ssp/vsprintf_chk.c b/lib/libc/ssp/vsprintf_chk.c
deleted file mode 100644
index fec8a18c7..000000000
--- a/lib/libc/ssp/vsprintf_chk.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: vsprintf_chk.c,v 1.6 2009/02/05 05:39:38 lukem Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: vsprintf_chk.c,v 1.6 2009/02/05 05:39:38 lukem Exp $");
-
-/*LINTLIBRARY*/
-
-#include <ssp/ssp.h>
-#include <stdio.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <ssp/stdio.h>
-
-#undef vsprintf
-#undef vsnprintf
-
-/*ARGSUSED*/
-int
-__vsprintf_chk(char * __restrict buf, int flags, size_t slen,
-    const char * __restrict fmt, va_list ap)
-{
-	int rv;
-
-	if (slen > (size_t)INT_MAX)
-		rv = vsprintf(buf, fmt, ap);
-	else {
-		if ((rv = vsnprintf(buf, slen, fmt, ap)) >= 0 && (size_t)rv >= slen)
-			__chk_fail();
-	}
-
-	return rv;
-}
diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc
deleted file mode 100644
index e8ffe244b..000000000
--- a/lib/libc/stdio/Makefile.inc
+++ /dev/null
@@ -1,69 +0,0 @@
-#	from: @(#)Makefile.inc	5.7 (Berkeley) 6/27/91
-#	$NetBSD: Makefile.inc,v 1.46 2014/10/13 00:40:36 christos Exp $
-
-# stdio sources
-.PATH: ${.CURDIR}/stdio
-
-CPPFLAGS+=-DWIDE_DOUBLE
-
-SRCS+=	clrerr.c dprintf.c fclose.c fdopen.c feof.c ferror.c \
-	fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetstr.c fgetwc.c \
-	fgetwln.c fgetws.c fileno.c findfp.c flags.c flockfile.c fopen.c \
-	fparseln.c fprintf.c fpurge.c fputc.c fputs.c fputwc.c fputws.c \
-	fread.c freopen.c fscanf.c fseek.c fseeko.c fsetpos.c ftell.c ftello.c \
-	funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwrite.c fwscanf.c \
-	getc.c getchar.c getdelim.c getline.c gettemp.c getw.c getwc.c \
-	getwchar.c makebuf.c mkdtemp.c mkstemp.c mkstemps.c mkostemp.c \
-	mkostemps.c perror.c printf.c putc.c putchar.c puts.c putw.c putwc.c \
-	putwchar.c refill.c remove.c rewind.c \
-	rget.c scanf.c setbuf.c setbuffer.c setvbuf.c snprintf_ss.c \
-	sscanf.c stdio.c swprintf.c swscanf.c tmpfile.c ungetc.c ungetwc.c \
-	vasprintf.c vdprintf.c vfprintf.c vfscanf.c vfwprintf.c vfwscanf.c \
-	vprintf.c vscanf.c vsnprintf.c vsnprintf_ss.c vsscanf.c vswprintf.c \
-	vswscanf.c vwprintf.c vwscanf.c wbuf.c wprintf.c wscanf.c wsetup.c
-SRCS+=	fmemopen.c open_memstream.c open_wmemstream.c
-
-.if !defined(AUDIT)
-SRCS+=	gets.c vsprintf.c tempnam.c tmpnam.c mktemp.c
-.endif
-
-MAN+=	fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \
-	flockfile.3 fmemopen.3 fopen.3 fparseln.3 fputs.3 fputws.3 fread.3 \
-	fseek.3 funopen.3 fwide.3 getc.3 getdelim.3 getwc.3 mktemp.3 printf.3 \
-	putc.3 putwc.3 remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 \
-	ungetc.3 ungetwc.3 wprintf.3 wscanf.3 open_memstream.3
-
-MLINKS+=ferror.3 clearerr.3 ferror.3 feof.3 ferror.3 fileno.3
-MLINKS+=fflush.3 fpurge.3
-MLINKS+=flockfile.3 ftrylockfile.3 flockfile.3 funlockfile.3
-MLINKS+=fgets.3 gets.3
-MLINKS+=fopen.3 fdopen.3 fopen.3 freopen.3
-MLINKS+=fputs.3 puts.3
-MLINKS+=fread.3 fwrite.3
-MLINKS+=fseek.3 fgetpos.3 fseek.3 fseeko.3 fseek.3 fsetpos.3 fseek.3 ftell.3 \
-	fseek.3 ftello.3 fseek.3 rewind.3
-MLINKS+=funopen.3 fropen.3 funopen.3 fwopen.3
-MLINKS+=funopen.3 funopen2.3 funopen.3 fropen2.3 funopen.3 fwopen2.3
-MLINKS+=getc.3 fgetc.3 getc.3 getc_unlocked.3 getc.3 getchar.3 \
-	getc.3 getchar_unlocked.3 getc.3 getw.3
-MLINKS+=getdelim.3 getline.3
-MLINKS+=mktemp.3 mkdtemp.3 mktemp.3 mkstemp.3
-MLINKS+=mktemp.3 mkostemp.3 mktemp.3 mkostemps.3
-MLINKS+=mktemp.3 mkstemps.3
-MLINKS+=printf.3 asprintf.3 printf.3 fprintf.3 printf.3 snprintf.3 \
-	printf.3 sprintf.3 printf.3 vasprintf.3 printf.3 vfprintf.3 \
-	printf.3 vprintf.3 printf.3 vsnprintf.3 printf.3 vsprintf.3 \
-	printf.3 dprintf.3 printf.3 vdprintf.3 printf.3 vsnprintf_ss.3
-MLINKS+=putc.3 fputc.3 putc.3 putc_unlocked.3 putc.3 putchar.3 \
-	putc.3 putchar_unlocked.3 putc.3 putw.3
-MLINKS+=scanf.3 fscanf.3 scanf.3 sscanf.3 scanf.3 vfscanf.3 scanf.3 vscanf.3 \
-	scanf.3 vsscanf.3
-MLINKS+=setbuf.3 setbuffer.3 setbuf.3 setlinebuf.3 setbuf.3 setvbuf.3
-MLINKS+=tmpnam.3 tempnam.3 tmpnam.3 tmpfile.3
-MLINKS+=putwc.3 fputwc.3 putwc.3 putwchar.3
-MLINKS+=getwc.3 fgetwc.3 getwc.3 getwchar.3
-MLINKS+=wprintf.3 fwprintf.3 wprintf.3 swprintf.3
-MLINKS+=wprintf.3 vwprintf.3 wprintf.3 vfwprintf.3 wprintf.3 vswprintf.3
-MLINKS+=wscanf.3 fwscanf.3 wscanf.3 swscanf.3 wscanf.3 vwscanf.3
-MLINKS+=wscanf.3 vswscanf.3 wscanf.3 vfwscanf.3
-MLINKS+=open_memstream.3 open_wmemstream.3
diff --git a/lib/libc/stdio/clrerr.c b/lib/libc/stdio/clrerr.c
deleted file mode 100644
index 2cec89244..000000000
--- a/lib/libc/stdio/clrerr.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: clrerr.c,v 1.11 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)clrerr.c	8.1 (Berkeley) 6/4/93";
-#endif
-__RCSID("$NetBSD: clrerr.c,v 1.11 2012/03/15 18:22:30 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-#undef	clearerr
-
-void
-clearerr(FILE *fp)
-{
-	_DIAGASSERT(fp != NULL);
-
-	FLOCKFILE(fp);
-	__sclearerr(fp);
-	FUNLOCKFILE(fp);
-}
diff --git a/lib/libc/stdio/dprintf.c b/lib/libc/stdio/dprintf.c
deleted file mode 100644
index efbf795a9..000000000
--- a/lib/libc/stdio/dprintf.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*	$NetBSD: dprintf.c,v 1.2 2013/04/19 15:22:25 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: dprintf.c,v 1.2 2013/04/19 15:22:25 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "reentrant.h"
-#include "local.h"
-
-__weak_alias(dprintf_l, _dprintf_l)
-
-int
-dprintf(int fd, const char * __restrict fmt, ...)
-{
-	va_list ap;
-	int ret;
-
-	va_start(ap, fmt);
-	ret = vdprintf(fd, fmt, ap);
-	va_end(ap);
-	return ret;
-}
-
-int
-dprintf_l(int fd, locale_t loc, const char * __restrict fmt, ...)
-{
-	va_list ap;
-	int ret;
-
-	va_start(ap, fmt);
-	ret = vdprintf_l(fd, loc, fmt, ap);
-	va_end(ap);
-	return ret;
-}
diff --git a/lib/libc/stdio/fclose.3 b/lib/libc/stdio/fclose.3
deleted file mode 100644
index a6c889802..000000000
--- a/lib/libc/stdio/fclose.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\"	$NetBSD: fclose.3,v 1.9 2003/08/07 16:43:21 agc Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)fclose.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt FCLOSE 3
-.Os
-.Sh NAME
-.Nm fclose
-.Nd close a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn fclose "FILE *stream"
-.Sh DESCRIPTION
-The
-.Fn fclose
-function
-dissociates the named
-.Fa stream
-from its underlying file or set of functions.
-If the stream was being used for output, any buffered data is written
-first, using
-.Xr fflush 3 .
-.Sh RETURN VALUES
-Upon successful completion 0 is returned.
-Otherwise,
-.Dv EOF
-is returned and the global variable
-.Va errno
-is set to indicate the error.
-In either case no further access to the stream is possible.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa stream
-is not an open stream.
-.El
-.Pp
-The
-.Fn fclose
-function
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr close 2
-or
-.Xr fflush 3 .
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr fflush 3 ,
-.Xr fopen 3 ,
-.Xr setbuf 3
-.Sh STANDARDS
-The
-.Fn fclose
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/stdio/fclose.c b/lib/libc/stdio/fclose.c
deleted file mode 100644
index 49bf491be..000000000
--- a/lib/libc/stdio/fclose.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: fclose.c,v 1.18 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fclose.c	8.1 (Berkeley) 6/4/93";
-#endif
-__RCSID("$NetBSD: fclose.c,v 1.18 2012/03/15 18:22:30 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "reentrant.h"
-#include "local.h"
-
-int
-fclose(FILE *fp)
-{
-	int r;
-
-	_DIAGASSERT(fp != NULL);
-
-	if (fp->_flags == 0) {	/* not open! */
-		errno = EBADF;
-		return EOF;
-	}
-	FLOCKFILE(fp);
-	WCIO_FREE(fp);
-	r = fp->_flags & __SWR ? __sflush(fp) : 0;
-	if (fp->_close != NULL && (*fp->_close)(fp->_cookie) < 0)
-		r = EOF;
-	if (fp->_flags & __SMBF)
-		free((char *)fp->_bf._base);
-	if (HASUB(fp))
-		FREEUB(fp);
-	FREELB(fp);
-	FUNLOCKFILE(fp);
-	fp->_file = -1;
-	fp->_flags = 0;		/* Release this FILE for reuse. */
-	fp->_r = fp->_w = 0;	/* Mess up if reaccessed. */
-	return r;
-}
diff --git a/lib/libc/stdio/fdopen.c b/lib/libc/stdio/fdopen.c
deleted file mode 100644
index e161ffffb..000000000
--- a/lib/libc/stdio/fdopen.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*	$NetBSD: fdopen.c,v 1.16 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fdopen.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fdopen.c,v 1.16 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <limits.h>
-
-#include "reentrant.h"
-#include "local.h"
-
-#ifdef __weak_alias
-__weak_alias(fdopen,_fdopen)
-#endif
-
-FILE *
-fdopen(int fd, const char *mode)
-{
-	FILE *fp;
-	int flags, oflags, fdflags, tmp;
-
-	_DIAGASSERT(fd != -1);
-
-	/*
-	 * File descriptors are a full int, but _file is only a short.
-	 * If we get a valid file descriptor that is greater or equal to
-	 * USHRT_MAX, then the fd will get sign-extended into an
-	 * invalid file descriptor.  Handle this case by failing the
-	 * open. (We treat the short as unsigned, and special-case -1).
-	 */
-	if (fd >= USHRT_MAX) {
-		errno = EMFILE;
-		return NULL;
-	}
-
-	if ((flags = __sflags(mode, &oflags)) == 0)
-		return NULL;
-
-	/* Make sure the mode the user wants is a subset of the actual mode. */
-	if ((fdflags = fcntl(fd, F_GETFL, 0)) < 0)
-		return NULL;
-	tmp = fdflags & O_ACCMODE;
-	if (tmp != O_RDWR && (tmp != (oflags & O_ACCMODE))) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	if (oflags & O_NONBLOCK) {
-		struct stat st;
-		if (fstat(fd, &st) == -1) {
-			return NULL;
-		}
-		if (!S_ISREG(st.st_mode)) {
-			errno = EFTYPE;
-			return NULL;
-		}
-	}
-
-	if ((fp = __sfp()) == NULL)
-		return NULL;
-	fp->_flags = flags;
-	/*
-	 * If opened for appending, but underlying descriptor does not have
-	 * O_APPEND bit set, assert __SAPP so that __swrite() will lseek to
-	 * end before each write.
-	 */
-	if ((oflags & O_APPEND) && !(fdflags & O_APPEND))
-		fp->_flags |= __SAPP;
-	fp->_file = fd;
-	fp->_cookie = fp;
-	fp->_read = __sread;
-	fp->_write = __swrite;
-	fp->_seek = __sseek;
-	fp->_close = __sclose;
-	return fp;
-}
diff --git a/lib/libc/stdio/feof.c b/lib/libc/stdio/feof.c
deleted file mode 100644
index 1d25eae90..000000000
--- a/lib/libc/stdio/feof.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: feof.c,v 1.12 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)feof.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: feof.c,v 1.12 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * A subroutine version of the macro feof.
- */
-#undef feof
-
-int
-feof(FILE *fp)
-{
-	int r;
-
-	_DIAGASSERT(fp != NULL);
-
-	FLOCKFILE(fp);
-	r = __sfeof(fp);
-	FUNLOCKFILE(fp);
-	return r;
-}
diff --git a/lib/libc/stdio/ferror.3 b/lib/libc/stdio/ferror.3
deleted file mode 100644
index 270a76607..000000000
--- a/lib/libc/stdio/ferror.3
+++ /dev/null
@@ -1,121 +0,0 @@
-.\"	$NetBSD: ferror.3,v 1.14 2010/05/08 11:35:14 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)ferror.3	8.2 (Berkeley) 4/19/94
-.\"
-.Dd May 6, 2010
-.Dt FERROR 3
-.Os
-.Sh NAME
-.Nm clearerr ,
-.Nm feof ,
-.Nm ferror ,
-.Nm fileno
-.Nd check and reset stream status
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft void
-.Fn clearerr "FILE *stream"
-.Ft int
-.Fn feof "FILE *stream"
-.Ft int
-.Fn ferror "FILE *stream"
-.Ft int
-.Fn fileno "FILE *stream"
-.Sh DESCRIPTION
-The function
-.Fn clearerr
-clears the end-of-file and error indicators for the stream pointed
-to by
-.Fa stream .
-.Pp
-The function
-.Fn feof
-tests the end-of-file indicator for the stream pointed to by
-.Fa stream ,
-returning non-zero if it is set.
-The end-of-file indicator can only be cleared by the function
-.Fn clearerr .
-.Pp
-The function
-.Fn ferror
-tests the error indicator for the stream pointed to by
-.Fa stream ,
-returning non-zero if it is set.
-The error indicator can only be reset by the
-.Fn clearerr
-function.
-.Pp
-The function
-.Fn fileno
-examines the argument
-.Fa stream
-and returns its integer descriptor.
-.Sh ERRORS
-The functions
-.Fn clearerr ,
-.Fn feof ,
-and
-.Fn ferror
-should neither fail nor set the external variable
-.Va errno .
-However, the function
-.Fn fileno
-may fail and return \-1 in case the argument
-.Fa stream
-is not associated with a valid file descriptor.
-(In this case the
-.Nx
-implementation does not follow the optional
-.Tn POSIX
-recommendation to set the
-.Va errno
-variable to
-.Er EBADF . )
-.Sh SEE ALSO
-.Xr open 2 ,
-.Xr stdio 3
-.Sh STANDARDS
-The functions
-.Fn clearerr ,
-.Fn feof ,
-and
-.Fn ferror
-conform to
-.St -ansiC .
-The function
-.Fn fileno
-conforms to
-.St -p1003.1-90 .
diff --git a/lib/libc/stdio/ferror.c b/lib/libc/stdio/ferror.c
deleted file mode 100644
index 2e4beaef9..000000000
--- a/lib/libc/stdio/ferror.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: ferror.c,v 1.12 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)ferror.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: ferror.c,v 1.12 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * A subroutine version of the macro ferror.
- */
-#undef ferror
-
-int
-ferror(FILE *fp)
-{
-	int r;
-
-	_DIAGASSERT(fp != NULL);
-
-	FLOCKFILE(fp);
-	r = __sferror(fp);
-	FUNLOCKFILE(fp);
-	return r;
-}
diff --git a/lib/libc/stdio/fflush.3 b/lib/libc/stdio/fflush.3
deleted file mode 100644
index 8f852260e..000000000
--- a/lib/libc/stdio/fflush.3
+++ /dev/null
@@ -1,110 +0,0 @@
-.\"	$NetBSD: fflush.3,v 1.12 2003/08/07 16:43:22 agc Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)fflush.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt FFLUSH 3
-.Os
-.Sh NAME
-.Nm fflush ,
-.Nm fpurge
-.Nd flush a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn fflush "FILE *stream"
-.Ft int
-.Fn fpurge "FILE *stream"
-.Sh DESCRIPTION
-The function
-.Fn fflush
-forces a write of all buffered data for the given output or update
-.Fa stream
-via the stream's underlying write function.
-The open status of the stream is unaffected.
-.Pp
-If the
-.Fa stream
-argument is
-.Dv NULL ,
-.Fn fflush
-flushes
-.Em all
-open output streams.
-.Pp
-The function
-.Fn fpurge
-erases any input or output buffered in the given
-.Fa stream .
-For output streams this discards any unwritten output.
-For input streams this discards any input read from the underlying object
-but not yet obtained via
-.Xr getc 3 ;
-this includes any text pushed back via
-.Xr ungetc 3 .
-.Sh RETURN VALUES
-Upon successful completion 0 is returned.
-Otherwise,
-.Dv EOF
-is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa stream
-is not an open stream, or, in the case of
-.Fn fflush ,
-not a stream open for writing.
-.El
-.Pp
-The function
-.Fn fflush
-may also fail and set
-.Va errno
-for any of the errors specified for the routine
-.Xr write 2 .
-.Sh SEE ALSO
-.Xr write 2 ,
-.Xr fclose 3 ,
-.Xr fopen 3 ,
-.Xr setbuf 3
-.Sh STANDARDS
-The
-.Fn fflush
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c
deleted file mode 100644
index c9a317ed8..000000000
--- a/lib/libc/stdio/fflush.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*	$NetBSD: fflush.c,v 1.18 2012/03/27 15:05:42 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fflush.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fflush.c,v 1.18 2012/03/27 15:05:42 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <stddef.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-#ifdef _REENTRANT
-extern rwlock_t __sfp_lock;
-#endif
-
-/* Flush a single file, or (if fp is NULL) all files.  */
-int
-fflush(FILE *fp)
-{
-	int r;
-
-	if (fp == NULL) {
-		rwlock_rdlock(&__sfp_lock);
-		r = _fwalk(__sflush);
-		rwlock_unlock(&__sfp_lock);
-		return r;
-	}
-
-	FLOCKFILE(fp);
-	if ((fp->_flags & (__SWR | __SRW)) == 0) {
-		errno = EBADF;
-		r = EOF;
-	} else {
-		r = __sflush(fp);
-	}
-	FUNLOCKFILE(fp);
-	return r;
-}
-
-int
-__sflush(FILE *fp)
-{
-	unsigned char *p;
-	size_t n;
-	ssize_t t;
-
-	_DIAGASSERT(fp != NULL);
-
-	t = fp->_flags;
-	if ((t & __SWR) == 0)
-		return 0;
-
-	if ((p = fp->_bf._base) == NULL)
-		return 0;
-
-	ptrdiff_t tp = fp->_p - p;
-	_DIAGASSERT(__type_fit(ssize_t, tp));
-	n = (ssize_t)tp;	/* write this much */
-
-	/*
-	 * Set these immediately to avoid problems with longjmp and to allow
-	 * exchange buffering (via setvbuf) in user write function.
-	 */
-	fp->_p = p;
-	fp->_w = t & (__SLBF|__SNBF) ? 0 : fp->_bf._size;
-
-	for (; n > 0; n -= t, p += t) {
-		t = (*fp->_write)(fp->_cookie, (char *)p, n);
-		if (t <= 0) {
-			fp->_flags |= __SERR;
-			return EOF;
-		}
-	}
-	if (fp->_flush)
-		return (*fp->_flush)(fp->_cookie);
-	return 0;
-}
diff --git a/lib/libc/stdio/fgetc.c b/lib/libc/stdio/fgetc.c
deleted file mode 100644
index 20159a25f..000000000
--- a/lib/libc/stdio/fgetc.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: fgetc.c,v 1.12 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fgetc.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fgetc.c,v 1.12 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-int
-fgetc(FILE *fp)
-{
-	int r;
-
-	_DIAGASSERT(fp != NULL);
-
-	FLOCKFILE(fp);
-	r = __sgetc(fp);
-	FUNLOCKFILE(fp);
-	return r;
-}
diff --git a/lib/libc/stdio/fgetln.3 b/lib/libc/stdio/fgetln.3
deleted file mode 100644
index 62b5a9435..000000000
--- a/lib/libc/stdio/fgetln.3
+++ /dev/null
@@ -1,147 +0,0 @@
-.\"	$NetBSD: fgetln.3,v 1.15 2014/06/19 14:27:50 christos Exp $
-.\"
-.\" Copyright (c) 1990, 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. 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.
-.\"
-.\"     @(#)fgetln.3	8.3 (Berkeley) 4/19/94
-.\"
-.Dd June 19, 2014
-.Dt FGETLN 3
-.Os
-.Sh NAME
-.Nm fgetln
-.Nd get a line from a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft char *
-.Fn fgetln "FILE * restrict stream" "size_t * restrict len"
-.Sh DESCRIPTION
-The
-.Fn fgetln
-function
-returns a pointer to the next line from the stream referenced by
-.Fa stream .
-This line is
-.Em not
-a C string as it does not end with a terminating
-.Dv NUL
-character.
-The length of the line, including the final newline,
-is stored in the memory location to which
-.Fa len
-points.
-(Note, however, that if the line is the last
-in a file that does not end in a newline,
-the returned text will not contain a newline.)
-.Sh RETURN VALUES
-Upon successful completion a pointer is returned;
-this pointer becomes invalid after the next
-.Tn I/O
-operation on
-.Fa stream
-(whether successful or not)
-or as soon as the stream is closed.
-Otherwise,
-.Dv NULL
-is returned.
-The
-.Fn fgetln
-function
-does not distinguish between end-of-file and error; the routines
-.Xr feof 3
-and
-.Xr ferror 3
-must be used
-to determine which occurred.
-If an error occurs, the global variable
-.Va errno
-is set to indicate the error.
-The end-of-file condition is remembered, even on a terminal, and all
-subsequent attempts to read will return
-.Dv NULL
-until the condition is
-cleared with
-.Xr clearerr 3 .
-.Pp
-The text to which the returned pointer points may be modified,
-provided that no changes are made beyond the returned size.
-These changes are lost as soon as the pointer becomes invalid.
-.Sh ERRORS
-.Bl -tag -width [EBADF]
-.It Bq Er EBADF
-The argument
-.Fa stream
-is not a stream open for reading.
-.El
-.Pp
-The
-.Fn fgetln
-function
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr fflush 3 ,
-.Xr malloc 3 ,
-.Xr read 2 ,
-.Xr stat 2 ,
-or
-.Xr realloc 3 .
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fgets 3 ,
-.Xr fopen 3 ,
-.Xr putc 3
-.Sh HISTORY
-The
-.Fn fgetln
-function first appeared in
-.Bx 4.4 .
-.Sh CAVEATS
-Since the returned buffer is not a C string (it is not null terminated), a
-common practice is to replace the newline character with
-.Sq \e0 .
-However, if the last line in a file does not contain a newline,
-the returned text won't contain a newline either.
-The following code demonstrates how to deal with this problem by allocating a
-temporary buffer:
-.Bd -literal
-	char *buf, *lbuf;
-	size_t len;
-
-	while ((lbuf = buf = fgetln(fp, &len)) != NULL) {
-		if (len > 0 && buf[len - 1] == '\en')
-			buf[len - 1] = '\e0';
-		else if ((lbuf = strndup(buf, len + 1)) == NULL)
-				err(1, NULL);
-		printf("%s\en", lbuf);
-
-		if (lbuf != buf)
-			free(lbuf);
-	}
-.Ed
diff --git a/lib/libc/stdio/fgetln.c b/lib/libc/stdio/fgetln.c
deleted file mode 100644
index af7c222a7..000000000
--- a/lib/libc/stdio/fgetln.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: fgetln.c,v 1.16 2009/12/02 09:03:13 roy Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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>
-__RCSID("$NetBSD: fgetln.c,v 1.16 2009/12/02 09:03:13 roy Exp $");
-
-#include "namespace.h"
-
-#include <stdio.h>
-
-#include "reentrant.h"
-#include "local.h"
-
-#ifdef __weak_alias
-__weak_alias(fgetln,_fgetln)
-#endif
-
-/*
- * Get an input line.
- * This now uses getdelim(3) for a code reduction.
- * The upside is that strings are now always NULL terminated, but relying
- * on this is non portable - better to use the POSIX getdelim(3) function.
- */
-char *
-fgetln(FILE *fp, size_t *lenp)
-{
-	char *p;
-	
-	FLOCKFILE(fp);
-	p = __fgetstr(fp, lenp, '\n');
-	FUNLOCKFILE(fp);
-	return p;
-}
diff --git a/lib/libc/stdio/fgetpos.c b/lib/libc/stdio/fgetpos.c
deleted file mode 100644
index b4183a0f3..000000000
--- a/lib/libc/stdio/fgetpos.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: fgetpos.c,v 1.12 2012/01/22 18:36:17 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fgetpos.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fgetpos.c,v 1.12 2012/01/22 18:36:17 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-int
-fgetpos(FILE * __restrict fp, fpos_t * __restrict pos)
-{
-	struct wchar_io_data *wcio;
-
-	_DIAGASSERT(fp != NULL);
-	_DIAGASSERT(pos != NULL);
-
-	wcio = WCIO_GET(fp);
-	if (wcio != NULL && wcio->wcio_mode > 0) {
-		if (fp->_write)
-			pos->_mbstate_in  = wcio->wcio_mbstate_in;
-		if (fp->_read)
-			pos->_mbstate_out = wcio->wcio_mbstate_out;
-	}
-	return (pos->_pos = ftello(fp)) == (off_t)-1;
-}
diff --git a/lib/libc/stdio/fgets.3 b/lib/libc/stdio/fgets.3
deleted file mode 100644
index 2c5215268..000000000
--- a/lib/libc/stdio/fgets.3
+++ /dev/null
@@ -1,201 +0,0 @@
-.\"	$NetBSD: fgets.3,v 1.22 2010/05/13 18:38:24 jruoho Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)fgets.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd May 13, 2010
-.Dt FGETS 3
-.Os
-.Sh NAME
-.Nm fgets ,
-.Nm gets
-.Nd get a line from a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft char *
-.Fn fgets "char * restrict str" "int size" "FILE * restrict stream"
-.Ft char *
-.Fn gets "char *str"
-.Sh DESCRIPTION
-The
-.Fn fgets
-function
-reads at most one less than the number of characters specified by
-.Fa size
-from the given
-.Fa stream
-and stores them in the string
-.Fa str .
-Reading stops when a newline character is found,
-at end-of-file or error.
-The newline, if any, is retained, and a
-.Ql \e0
-character is appended to end the string.
-.Pp
-The
-.Fn gets
-function
-is equivalent to
-.Fn fgets
-with an infinite
-.Fa size
-and a
-.Fa stream
-of
-.Em stdin ,
-except that the newline character (if any) is not stored in the string.
-It is the caller's responsibility to ensure that the input line,
-if any, is sufficiently short to fit in the string.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn fgets
-and
-.Fn gets
-return
-a pointer to the string.
-If end-of-file or an error occurs before any characters are read,
-they return
-.Dv NULL .
-The
-.Fn fgets
-and
-.Fn gets
-functions
-do not distinguish between end-of-file and error, and callers must use
-.Xr feof 3
-and
-.Xr ferror 3
-to determine which occurred.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The given
-.Fa stream
-is not a readable stream.
-.El
-.Pp
-The function
-.Fn fgets
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr fflush 3 ,
-.Xr fstat 2 ,
-.Xr read 2 ,
-or
-.Xr malloc 3 .
-.Pp
-The function
-.Fn gets
-may also fail and set
-.Va errno
-for any of the errors specified for the routine
-.Xr getchar 3 .
-.Sh SEE ALSO
-.Xr feof 3 ,
-.Xr ferror 3 ,
-.Xr fgetln 3
-.Sh STANDARDS
-The functions
-.Fn fgets
-and
-.Fn gets
-conform to
-.St -ansiC
-and
-.St -p1003.1-2001 .
-The
-.St -p1003.1-2008
-revision marked
-.Fn gets
-as obsolescent.
-.Sh CAVEATS
-The following bit of code illustrates a case where the programmer assumes a
-string is too long if it does not contain a newline:
-.Bd -literal
-	char buf[1024], *p;
-
-	while (fgets(buf, sizeof(buf), fp) != NULL) {
-		if ((p = strchr(buf, '\en')) == NULL) {
-			fprintf(stderr, "input line too long.\en");
-			exit(1);
-		}
-		*p = '\e0';
-		printf("%s\en", buf);
-	}
-.Ed
-.Pp
-While the error would be true if a line longer than 1023 characters
-were read, it would be false in two other cases:
-.Bl -enum -offset indent
-.It
-If the last line in a file does not contain a newline, the string returned by
-.Fn fgets
-will not contain a newline either.
-Thus
-.Fn strchr
-will return
-.Dv NULL
-and the program will terminate, even if the line was valid.
-.It
-All C string functions, including
-.Fn strchr ,
-correctly assume the end of the string is represented by a null
-.Pq Sq \e0
-character.
-If the first character of a line returned by
-.Fn fgets
-were null,
-.Fn strchr
-would immediately return without considering the rest of the returned text
-which may indeed include a newline.
-.El
-.Pp
-Consider using
-.Xr fgetln 3
-instead when dealing with untrusted input.
-.Sh SECURITY CONSIDERATIONS
-Since it is usually impossible to ensure that the next input line
-is less than some arbitrary length, and because overflowing the
-input buffer is almost invariably a security violation, programs
-should
-.Em NEVER
-use
-.Fn gets .
-The
-.Fn gets
-function
-exists purely to conform to
-.St -ansiC .
diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c
deleted file mode 100644
index de9f10242..000000000
--- a/lib/libc/stdio/fgets.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*	$NetBSD: fgets.c,v 1.28 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fgets.c	8.2 (Berkeley) 12/22/93";
-#else
-__RCSID("$NetBSD: fgets.c,v 1.28 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include "reentrant.h"
-#include "local.h"
-#ifdef _FORTIFY_SOURCE
-#undef fgets
-#endif
-
-/*
- * Read at most n-1 characters from the given file.
- * Stop when a newline has been read, or the count runs out.
- * Return first argument, or NULL if no characters were read.
- */
-char *
-fgets(char *buf, int n, FILE *fp)
-{
-	int len;
-	char *s;
-	unsigned char *p, *t;
-
-	_DIAGASSERT(buf != NULL);
-	_DIAGASSERT(fp != NULL);
-
-	FLOCKFILE(fp);
-	_SET_ORIENTATION(fp, -1);
-	s = buf;
-	n--;			/* leave space for NUL */
-	do {
-		/*
-		 * If the buffer is empty, refill it.
-		 */
-		if (fp->_r <= 0) {
-			if (__srefill(fp)) {
-				/* EOF/error: stop with partial or no line */
-				if (s == buf) {
-					FUNLOCKFILE(fp);
-					return (NULL);
-				}
-				break;
-			}
-		}
-		len = fp->_r;
-		p = fp->_p;
-
-		/*
-		 * Scan through at most n bytes of the current buffer,
-		 * looking for '\n'.  If found, copy up to and including
-		 * newline, and stop.  Otherwise, copy entire chunk
-		 * and loop.
-		 */
-		if (len > n) {
-			if (n < 0) {
-				/*
-				 * Caller's length <= 0
-				 * We can't write into the buffer, so cannot
-				 * return a string, so must return NULL.
-				 * Set errno and __SERR so it is consistent.
-				 * TOG gives no indication of what to do here!
-				 */
-				errno = EINVAL;
-				fp->_flags |= __SERR;
-				FUNLOCKFILE(fp);
-				return NULL;
-			}
-			len = n;
-		}
-		t = memchr(p, '\n', (size_t)len);
-		if (t != NULL) {
-			len = (int)(++t - p);
-			fp->_r -= len;
-			fp->_p = t;
-			(void)memcpy(s, p, (size_t)len);
-			s[len] = 0;
-			FUNLOCKFILE(fp);
-			return buf;
-		}
-		fp->_r -= len;
-		fp->_p += len;
-		(void)memcpy(s, p, (size_t)len);
-		s += len;
-		n -= len;
-	} while (n != 0);
-	*s = 0;
-	FUNLOCKFILE(fp);
-	return buf;
-}
diff --git a/lib/libc/stdio/fgetstr.c b/lib/libc/stdio/fgetstr.c
deleted file mode 100644
index 3512a6f95..000000000
--- a/lib/libc/stdio/fgetstr.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* $NetBSD: fgetstr.c,v 1.11 2010/01/11 20:39:29 joerg Exp $	*/
-
-/*
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Roy Marples.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: fgetstr.c,v 1.11 2010/01/11 20:39:29 joerg Exp $");
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * Get an input line.
- * This now uses getdelim(3) for a code reduction.
- * The upside is that strings are now always NULL terminated, but relying
- * on this is non portable - better to use the POSIX getdelim(3) function.
- */
-char *
-__fgetstr(FILE *__restrict fp, size_t *__restrict lenp, int sep)
-{
-	ssize_t n;
-
-	_DIAGASSERT(fp != NULL);
-	_DIAGASSERT(lenp != NULL);
-
-	n = __getdelim(&_EXT(fp)->_fgetstr_buf, &_EXT(fp)->_fgetstr_len, sep, fp);
-	if (n == -1) {
-		*lenp = 0;
-		if (__sferror(fp) && errno == EOVERFLOW) /* fixup errno */
-			errno = EINVAL;
-		return NULL;
-	}
-	*lenp = n;
-	return _EXT(fp)->_fgetstr_buf;
-}
diff --git a/lib/libc/stdio/fgetwc.c b/lib/libc/stdio/fgetwc.c
deleted file mode 100644
index e330db9fe..000000000
--- a/lib/libc/stdio/fgetwc.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* $NetBSD: fgetwc.c,v 1.13 2012/03/15 18:22:30 christos Exp $ */
-
-/*-
- * Copyright (c)2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Citrus$
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fgetwc.c,v 1.13 2012/03/15 18:22:30 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <wchar.h>
-#include "reentrant.h"
-#include "local.h"
-
-wint_t
-__fgetwc_unlock(FILE *fp)
-{
-	struct wchar_io_data *wcio;
-	wchar_t wc;
-	size_t nr;
-
-	_DIAGASSERT(fp != NULL);
-
-	_SET_ORIENTATION(fp, 1);
-	wcio = WCIO_GET(fp);
-	_DIAGASSERT(wcio != NULL);
-
-	/* if there're ungetwc'ed wchars, use them */
-	if (wcio->wcio_ungetwc_inbuf)
-		return wcio->wcio_ungetwc_buf[--wcio->wcio_ungetwc_inbuf];
-
-	if (fp->_r <= 0) {
-restart:
-		if (__srefill(fp) != 0)
-			return WEOF;
-	}
-	nr = mbrtowc(&wc, (const char *)fp->_p,
-	    (size_t)fp->_r, &wcio->wcio_mbstate_in);
-	if (nr == (size_t)-1) {
-		fp->_flags |= __SERR;
-		return WEOF;
-	} else if (nr == (size_t)-2) {
-		fp->_p += fp->_r;
-		fp->_r = 0;
-		goto restart;
-	}
-	if (wc == L'\0') {
-		while (*fp->_p != '\0') {
-			++fp->_p;
-			--fp->_r;
-		}
-		nr = 1;
-	}
-	fp->_p += nr;
-	_DIAGASSERT(__type_fit(int, fp->_r - nr));
-	fp->_r -= (int)nr;
-
-	return wc;
-}
-
-wint_t
-fgetwc(FILE *fp)
-{
-	wint_t r;
-
-	_DIAGASSERT(fp != NULL);
-
-	FLOCKFILE(fp);
-	r = __fgetwc_unlock(fp);
-	FUNLOCKFILE(fp);
-
-	return r;
-}
-
diff --git a/lib/libc/stdio/fgetwln.3 b/lib/libc/stdio/fgetwln.3
deleted file mode 100644
index a17e5959f..000000000
--- a/lib/libc/stdio/fgetwln.3
+++ /dev/null
@@ -1,121 +0,0 @@
-.\"	$NetBSD: fgetwln.3,v 1.2 2010/12/16 17:42:27 wiz Exp $
-.\" Copyright (c) 1990, 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.
-.\"
-.\"     @(#)fgetln.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: src/lib/libc/stdio/fgetwln.3,v 1.1 2004/07/16 06:06:09 tjr Exp $
-.\"
-.Dd July 16, 2004
-.Dt FGETWLN 3
-.Os
-.Sh NAME
-.Nm fgetwln
-.Nd get a line of wide characters from a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft wchar_t *
-.Fn fgetwln "FILE * restrict stream" "size_t * restrict len"
-.Sh DESCRIPTION
-The
-.Fn fgetwln
-function
-returns a pointer to the next line from the stream referenced by
-.Fa stream .
-This line is
-.Em not
-a standard wide-character string as it does not end with a terminating
-null wide character.
-The length of the line, including the final newline,
-is stored in the memory location to which
-.Fa len
-points.
-(Note, however, that if the line is the last
-in a file that does not end in a newline,
-the returned text will not contain a newline.)
-.Sh RETURN VALUES
-Upon successful completion a pointer is returned;
-this pointer becomes invalid after the next
-.Tn I/O
-operation on
-.Fa stream
-(whether successful or not)
-or as soon as the stream is closed.
-Otherwise,
-.Dv NULL
-is returned.
-The
-.Fn fgetwln
-function
-does not distinguish between end-of-file and error; the routines
-.Xr feof 3
-and
-.Xr ferror 3
-must be used
-to determine which occurred.
-If an error occurs, the global variable
-.Va errno
-is set to indicate the error.
-The end-of-file condition is remembered, even on a terminal, and all
-subsequent attempts to read will return
-.Dv NULL
-until the condition is
-cleared with
-.Xr clearerr 3 .
-.Pp
-The text to which the returned pointer points may be modified,
-provided that no changes are made beyond the returned size.
-These changes are lost as soon as the pointer becomes invalid.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa stream
-is not a stream open for reading.
-.El
-.Pp
-The
-.Fn fgetwln
-function
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr mbrtowc 3 ,
-.Xr realloc 3 ,
-or
-.Xr read 2 .
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fgetln 3 ,
-.Xr fgetws 3 ,
-.Xr fopen 3
diff --git a/lib/libc/stdio/fgetwln.c b/lib/libc/stdio/fgetwln.c
deleted file mode 100644
index 81d4f9459..000000000
--- a/lib/libc/stdio/fgetwln.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*	$NetBSD: fgetwln.c,v 1.5 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwln.c,v 1.2 2004/08/06 17:00:09 tjr Exp $");
-#else
-__RCSID("$NetBSD: fgetwln.c,v 1.5 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "reentrant.h"
-#include "local.h"
-
-#ifdef __weak_alias
-__weak_alias(fgetwln,_fgetwln)
-#endif
-
-/*
- * Expand the line buffer.  Return -1 on error.
-#ifdef notdef
- * The `new size' does not account for a terminating '\0',
- * so we add 1 here.
-#endif
- */
-static int
-__slbexpand(FILE *fp, size_t newsize)
-{
-	void *p;
-
-#ifdef notdef
-	++newsize;
-#endif
-	_DIAGASSERT(fp != NULL);
-
-	if (_EXT(fp)->_fgetstr_len >= newsize)
-		return 0;
-	if ((p = realloc(_EXT(fp)->_fgetstr_buf, newsize)) == NULL)
-		return -1;
-	_EXT(fp)->_fgetstr_buf = p;
-	_EXT(fp)->_fgetstr_len = newsize;
-	return 0;
-}
-
-wchar_t *
-fgetwln(FILE * __restrict fp, size_t *lenp)
-{
-	wint_t wc;
-	size_t len;
-
-	FLOCKFILE(fp);
-	_SET_ORIENTATION(fp, 1);
-
-	len = 0;
-	while ((wc = __fgetwc_unlock(fp)) != WEOF) {
-#define	GROW	512
-		if (len * sizeof(wchar_t) >= _EXT(fp)->_fgetstr_len &&
-		    __slbexpand(fp, (len + GROW) * sizeof(wchar_t)))
-			goto error;
-		*((wchar_t *)(void *)_EXT(fp)->_fgetstr_buf + len++) = wc;
-		if (wc == L'\n')
-			break;
-	}
-	if (len == 0)
-		goto error;
-
-	FUNLOCKFILE(fp);
-	*lenp = len;
-	return (wchar_t *)(void *)_EXT(fp)->_fgetstr_buf;
-
-error:
-	FUNLOCKFILE(fp);
-	*lenp = 0;
-	return NULL;
-}
diff --git a/lib/libc/stdio/fgetws.3 b/lib/libc/stdio/fgetws.3
deleted file mode 100644
index e0cc00001..000000000
--- a/lib/libc/stdio/fgetws.3
+++ /dev/null
@@ -1,122 +0,0 @@
-.\" $NetBSD: fgetws.3,v 1.3 2010/12/16 17:42:27 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)fgets.3	8.1 (Berkeley) 6/4/93
-.\"
-.\" Original version ID:
-.\" FreeBSD: src/lib/libc/stdio/fgets.3,v 1.16 2002/05/31 05:01:17 archie Exp
-.\" FreeBSD: src/lib/libc/stdio/fgetws.3,v 1.2 2002/09/06 11:23:55 tjr Exp
-.\"
-.Dd August 6, 2002
-.Dt FGETWS 3
-.Os
-.Sh NAME
-.Nm fgetws
-.Nd get a line of wide characters from a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft "wchar_t *"
-.Fn fgetws "wchar_t * restrict ws" "int n" "FILE * restrict fp"
-.Sh DESCRIPTION
-The
-.Fn fgetws
-function
-reads at most one less than the number of characters specified by
-.Fa n
-from the given
-.Fa fp
-and stores them in the wide-character string
-.Fa ws .
-Reading stops when a newline character is found,
-at end-of-file or error.
-The newline, if any, is retained.
-If any characters are read and there is no error, a
-.Ql \e0
-character is appended to end the string.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn fgetws
-returns
-.Fa ws .
-If end-of-file occurs before any characters are read,
-.Fn fgetws
-returns
-.Dv NULL
-and the buffer contents remain unchanged.
-If an error occurs,
-.Fn fgetws
-returns
-.Dv NULL
-and the buffer contents are indeterminate.
-The
-.Fn fgetws
-function
-does not distinguish between end-of-file and error, and callers must use
-.Xr feof 3
-and
-.Xr ferror 3
-to determine which occurred.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The given
-.Fa fp
-argument is not a readable stream.
-.It Bq Er EILSEQ
-The data obtained from the input stream does not form a valid
-multibyte character.
-.El
-.Pp
-The function
-.Fn fgetws
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr fflush 3 ,
-.Xr fstat 2 ,
-.Xr read 2 ,
-or
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr feof 3 ,
-.Xr ferror 3 ,
-.Xr fgets 3
-.Sh STANDARDS
-The
-.Fn fgetws
-function
-conforms to
-.St -p1003.1-2001 .
diff --git a/lib/libc/stdio/fgetws.c b/lib/libc/stdio/fgetws.c
deleted file mode 100644
index 60012b786..000000000
--- a/lib/libc/stdio/fgetws.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* $NetBSD: fgetws.c,v 1.3 2012/03/15 18:22:30 christos Exp $ */
-
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Original version ID:
- * FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.4 2002/09/20 13:25:40 tjr Exp
- *
- */
-
-#include <sys/cdefs.h>
-#if defined(LIB_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fgetws.c,v 1.3 2012/03/15 18:22:30 christos Exp $");
-#endif
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <wchar.h>
-#include "reentrant.h"
-#include "local.h"
-
-wchar_t *
-fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
-{
-	wchar_t *wsp;
-	wint_t wc;
-
-	_DIAGASSERT(fp != NULL);
-	_DIAGASSERT(ws != NULL);
-
-	FLOCKFILE(fp);
-	_SET_ORIENTATION(fp, 1);
-
-	if (n <= 0) {
-		errno = EINVAL;
-		goto error;
-	}
-
-	wsp = ws;
-	while (n-- > 1) {
-		wc = __fgetwc_unlock(fp);
-		if (__sferror(fp) != 0)
-			goto error;
-		if (__sfeof(fp) != 0) {
-			if (wsp == ws) {
-				/* EOF/error, no characters read yet. */
-				goto error;
-			}
-			break;
-		}
-		*wsp++ = (wchar_t)wc;
-		if (wc == L'\n') {
-			break;
-		}
-	}
-
-	*wsp++ = L'\0';
-	FUNLOCKFILE(fp);
-
-	return ws;
-
-error:
-	FUNLOCKFILE(fp);
-	return NULL;
-}
diff --git a/lib/libc/stdio/fileext.h b/lib/libc/stdio/fileext.h
deleted file mode 100644
index ce0436bee..000000000
--- a/lib/libc/stdio/fileext.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* $NetBSD: fileext.h,v 1.6 2010/01/11 20:39:29 joerg Exp $ */
-
-/*-
- * Copyright (c)2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Citrus$
- */
-
-/*
- * file extension
- */
-struct __sfileext {
-	struct	__sbuf _ub; /* ungetc buffer */
-	struct wchar_io_data _wcio;	/* wide char i/o status */
-	size_t _fgetstr_len;
-	char *_fgetstr_buf;
-#ifdef _REENTRANT
-	mutex_t	_lock;	/* Lock for FLOCKFILE/FUNLOCKFILE */
-	cond_t _lockcond; /* Condition variable for signalling lock releases */
-	thr_t _lockowner; /* The thread currently holding the lock */
-	int _lockcount; /* Count of recursive locks */
-	int _lockinternal; /* Flag of whether the lock is held inside stdio */
-	int _lockcancelstate; /* Stashed cancellation state on internal lock */
-#endif	
-};
-
-#define _EXT(fp) ((struct __sfileext *)(void *)((fp)->_ext._base))
-#define _UB(fp) _EXT(fp)->_ub
-#ifdef _REENTRANT
-#define _LOCK(fp) (_EXT(fp)->_lock)
-#define _LOCKCOND(fp) (_EXT(fp)->_lockcond)
-#define _LOCKOWNER(fp) (_EXT(fp)->_lockowner)
-#define _LOCKCOUNT(fp) (_EXT(fp)->_lockcount)
-#define _LOCKINTERNAL(fp) (_EXT(fp)->_lockinternal)
-#define _LOCKCANCELSTATE(fp) (_EXT(fp)->_lockcancelstate)
-#define _FILEEXT_SETUP(f, fext) do { \
-	/* LINTED */(f)->_ext._base = (unsigned char *)(fext); \
-	(fext)->_fgetstr_len = 0; \
-	(fext)->_fgetstr_buf = NULL; \
-	mutex_init(&_LOCK(f), NULL); \
-	cond_init(&_LOCKCOND(f), 0, NULL); \
-	_LOCKOWNER(f) = NULL; \
-	_LOCKCOUNT(f) = 0; \
-	_LOCKINTERNAL(f) = 0; \
-	} while (/* CONSTCOND */ 0)
-#else
-#define _FILEEXT_SETUP(f, fext) do { \
-	/* LINTED */(f)->_ext._base = (unsigned char *)(fext); \
-	(fext)->_fgetstr_len = 0; \
-	(fext)->_fgetstr_buf = NULL; \
-	} while (/* CONSTCOND */ 0)
-#endif
diff --git a/lib/libc/stdio/fileno.c b/lib/libc/stdio/fileno.c
deleted file mode 100644
index 0b6e7ba3f..000000000
--- a/lib/libc/stdio/fileno.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: fileno.c,v 1.13 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fileno.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fileno.c,v 1.13 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * A subroutine version of the macro fileno.
- */
-#undef fileno
-int _fileno(FILE *);	/* XXX */
-
-__weak_alias(fileno,_fileno)
-
-int
-_fileno(FILE *fp)
-{
-	int r;
-
-	_DIAGASSERT(fp != NULL);
-
-	FLOCKFILE(fp);
-	r = __sfileno(fp);
-	FUNLOCKFILE(fp);
-	return r;
-}
diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c
deleted file mode 100644
index 08826ea71..000000000
--- a/lib/libc/stdio/findfp.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/*	$NetBSD: findfp.c,v 1.28 2012/03/27 15:05:42 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)findfp.c	8.2 (Berkeley) 1/4/94";
-#else
-__RCSID("$NetBSD: findfp.c,v 1.28 2012/03/27 15:05:42 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include "reentrant.h"
-#include "local.h"
-#include "glue.h"
-
-int	__sdidinit;
-
-#define	NDYNAMIC 10		/* add ten more whenever necessary */
-
-#if !defined(_LIBMINC) && !defined(__kernel__) && defined(__minix)
-
-#define	std(flags, file) { \
-	._p = NULL, \
-	._r = 0, \
-	._w = 0, \
-	._flags = (flags), \
-	._file = (file),  \
-	._bf = { ._base = NULL, ._size = 0 }, \
-	._lbfsize = 0,  \
-	._cookie = __sF + (file), \
-	._close = __sclose, \
-	._read = __sread, \
-	._seek = __sseek, \
-	._write = __swrite, \
-	._ext = { ._base = (void *)(__sFext + (file)), ._size = 0 }, \
-	._up = NULL, \
-        ._ur = 0, \
-	._ubuf = { [0] = '\0', [1] = '\0', [2] = '\0' }, \
-	._nbuf = { [0] = '\0' }, \
-	._flush = NULL, \
-	._lb_unused = { '\0' }, \
-	._blksize = 0, \
-	._offset = (off_t)0, \
-}
-
-#else
-
-#define	std(flags, file) { \
-	._p = NULL, \
-	._r = 0, \
-	._w = 0, \
-	._flags = (flags), \
-	._file = (file),  \
-	._bf = { ._base = NULL, ._size = 0 }, \
-	._lbfsize = 0,  \
-	._cookie = __sF + (file), \
-	._close = NULL, \
-	._read = NULL, \
-	._seek = NULL, \
-	._write = NULL, \
-	._ext = { ._base = (void *)(__sFext + (file)), ._size = 0 }, \
-	._up = NULL, \
-        ._ur = 0, \
-	._ubuf = { [0] = '\0', [1] = '\0', [2] = '\0' }, \
-	._nbuf = { [0] = '\0' }, \
-	._flush = NULL, \
-	._lb_unused = { '\0' }, \
-	._blksize = 0, \
-	._offset = (off_t)0, \
-}
-
-#endif /* !defined(_LIBMINC) && !defined(__kernel__) */
-
-#if !defined(__kernel__) && defined(__minix)
-				/* the usual - (stdin + stdout + stderr) */
-static FILE usual[FOPEN_MAX - 3];
-static struct __sfileext usualext[FOPEN_MAX - 3];
-static struct glue uglue = { 0, FOPEN_MAX - 3, usual };
-#endif /* !defined(__kernel__) && defined(__minix) */
-
-#if defined(_REENTRANT) && !defined(__lint__) /* XXX lint is busted */
-#define	STDEXT { ._lock = MUTEX_INITIALIZER, ._lockcond = COND_INITIALIZER }
-struct __sfileext __sFext[3] = { STDEXT,
-				 STDEXT,
-				 STDEXT};
-#else
-struct __sfileext __sFext[3];
-#endif
-
-FILE __sF[3] = {
-	std(__SRD, STDIN_FILENO),		/* stdin */
-	std(__SWR, STDOUT_FILENO),		/* stdout */
-	std(__SWR|__SNBF, STDERR_FILENO)	/* stderr */
-};
-
-#if !defined(__kernel__) && defined(__minix)
-struct glue __sglue = { &uglue, 3, __sF };
-
-void f_prealloc(void);
-
-#ifdef _REENTRANT
-rwlock_t __sfp_lock = RWLOCK_INITIALIZER;
-#endif
-
-static struct glue *
-moreglue(int n)
-{
-	struct glue *g;
-	FILE *p;
-	struct __sfileext *pext;
-	static FILE empty;
-
-	g = malloc(sizeof(*g) + ALIGNBYTES + n * sizeof(FILE)
-	    + n * sizeof(struct __sfileext));
-	if (g == NULL)
-		return NULL;
-	p = (FILE *)ALIGN((u_long)(g + 1));
-	g->next = NULL;
-	g->niobs = n;
-	g->iobs = p;
-	pext = (void *)(p + n);
-	while (--n >= 0) {
-		*p = empty;
-		_FILEEXT_SETUP(p, pext);
-		p++;
-		pext++;
-	}
-	return g;
-}
-
-void
-__sfpinit(FILE *fp)
-{
-	fp->_flags = 1;		/* reserve this slot; caller sets real flags */
-	fp->_p = NULL;		/* no current pointer */
-	fp->_w = 0;		/* nothing to read or write */
-	fp->_r = 0;
-	fp->_bf._base = NULL;	/* no buffer */
-	fp->_bf._size = 0;
-	fp->_lbfsize = 0;	/* not line buffered */
-	fp->_file = -1;		/* no file */
-/*	fp->_cookie = <any>; */	/* caller sets cookie, _read/_write etc */
-	fp->_flush = NULL;	/* default flush */
-	_UB(fp)._base = NULL;	/* no ungetc buffer */
-	_UB(fp)._size = 0;
-	memset(WCIO_GET(fp), 0, sizeof(struct wchar_io_data));
-}
-
-/*
- * Find a free FILE for fopen et al.
- */
-FILE *
-__sfp(void)
-{
-	FILE *fp;
-	int n;
-	struct glue *g;
-
-	if (!__sdidinit)
-		__sinit();
-
-	rwlock_wrlock(&__sfp_lock);
-	for (g = &__sglue;; g = g->next) {
-		for (fp = g->iobs, n = g->niobs; --n >= 0; fp++)
-			if (fp->_flags == 0)
-				goto found;
-		if (g->next == NULL && (g->next = moreglue(NDYNAMIC)) == NULL)
-			break;
-	}
-	rwlock_unlock(&__sfp_lock);
-	return NULL;
-found:
-	__sfpinit(fp);
-	rwlock_unlock(&__sfp_lock);
-	return fp;
-}
-
-/*
- * XXX.  Force immediate allocation of internal memory.  Not used by stdio,
- * but documented historically for certain applications.  Bad applications.
- */
-void
-f_prealloc(void)
-{
-#if !defined(_LIBMINC) && defined(__minix)
-	struct glue *g;
-	int n;
-
-	n = (int)sysconf(_SC_OPEN_MAX) - FOPEN_MAX + 20; /* 20 for slop. */
-	for (g = &__sglue; (n -= g->niobs) > 0 && g->next; g = g->next)
-		continue;
-	if (n > 0)
-		g->next = moreglue(n);
-#endif /* !defined(_LIBMINC) && defined(__minix) */
-}
-
-/*
- * exit() calls _cleanup() through *__cleanup, set whenever we
- * open or buffer a file.  This chicanery is done so that programs
- * that do not use stdio need not link it all in.
- *
- * The name `_cleanup' is, alas, fairly well known outside stdio.
- */
-void
-_cleanup(void)
-{
-#if !defined(_LIBMINC) && defined(__minix)
-	/* (void) _fwalk(fclose); */
-	(void) fflush(NULL);			/* `cheating' */
-#endif /* !defined(_LIBMINC) && defined(__minix) */
-}
-
-/*
- * __sinit() is called whenever stdio's internal variables must be set up.
- */
-void
-__sinit(void)
-{
-	int i;
-
-	for (i = 0; i < FOPEN_MAX - 3; i++)
-		_FILEEXT_SETUP(&usual[i], &usualext[i]);
-
-	/* make sure we clean up on exit */
-	__cleanup = _cleanup;		/* conservative */
-	__sdidinit = 1;
-}
-#endif /* !defined(__kernel__) && defined(__minix) */
diff --git a/lib/libc/stdio/flags.c b/lib/libc/stdio/flags.c
deleted file mode 100644
index eac46f9a4..000000000
--- a/lib/libc/stdio/flags.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*	$NetBSD: flags.c,v 1.17 2012/11/15 03:50:36 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)flags.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: flags.c,v 1.17 2012/11/15 03:50:36 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <errno.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * Return the (stdio) flags for a given mode.  Store the flags
- * to be passed to an open() syscall through *optr.
- * Return 0 on error.
- */
-int
-__sflags(const char *mode, int *optr)
-{
-	int ret, m, o;
-
-	_DIAGASSERT(mode != NULL);
-
-	switch (*mode++) {
-
-	case 'r':	/* open for reading */
-		ret = __SRD;
-		m = O_RDONLY;
-		o = 0;
-		break;
-
-	case 'w':	/* open for writing */
-		ret = __SWR;
-		m = O_WRONLY;
-		o = O_CREAT | O_TRUNC;
-		break;
-
-	case 'a':	/* open for appending */
-		ret = __SWR;
-		m = O_WRONLY;
-		o = O_CREAT | O_APPEND;
-		break;
-
-	default:	/* illegal mode */
-		errno = EINVAL;
-		return 0;
-	}
-
-	/*
-	 * [rwa]\+ or [rwa]b\+ means read and write 
-	 * f means open only plain files,
-	 * e means set close on exec.
-	 * x means exclusive open.
-	 */
-	for (; *mode; mode++)
-		switch (*mode) {
-		case '+':
-			ret = __SRW;
-			m = O_RDWR;
-			break;
-		case 'f':
-			o |= O_NONBLOCK;
-			break;
-		case 'e':
-			o |= O_CLOEXEC;
-			break;
-		case 'x':
-			o |= O_EXCL;
-			break;
-		case 'b':
-			break;
-		default:	/* We could produce a warning here */
-			break;
-		}
-
-	*optr = m | o;
-	return ret;
-}
diff --git a/lib/libc/stdio/floatio.h b/lib/libc/stdio/floatio.h
deleted file mode 100644
index 6c04cc2e2..000000000
--- a/lib/libc/stdio/floatio.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: floatio.h,v 1.5 2005/05/14 23:51:02 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)floatio.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * Floating point scanf/printf (input/output) definitions.
- */
-
-/* 11-bit exponent (VAX G floating point) is 308 decimal digits */
-#define	MAXEXP		308
-/* 128 bit fraction takes up 39 decimal digits; max reasonable precision */
-#define	MAXFRACT	39
-/*    
- * MAXEXPDIG is the maximum number of decimal digits needed to store a
- * floating point exponent in the largest supported format.  It should
- * be ceil(log10(LDBL_MAX_10_EXP)) or, if hexadecimal floating point 
- * conversions are supported, ceil(log10(LDBL_MAX_EXP)).  But since it
- * is presently never greater than 5 in practice, we fudge it.
- */   
-#define MAXEXPDIG       6
-#if LDBL_MAX_EXP > 999999
-#error "floating point buffers too small"
-#endif 
diff --git a/lib/libc/stdio/flockfile.3 b/lib/libc/stdio/flockfile.3
deleted file mode 100644
index 1a3ef6295..000000000
--- a/lib/libc/stdio/flockfile.3
+++ /dev/null
@@ -1,127 +0,0 @@
-.\"	$NetBSD: flockfile.3,v 1.6 2011/10/15 21:43:19 wiz Exp $
-.\"
-.\" Copyright (c) 2003 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.
-.\"
-.Dd October 15, 2011
-.Dt FLOCKFILE 3
-.Os
-.Sh NAME
-.Nm flockfile ,
-.Nm ftrylockfile ,
-.Nm funlockfile
-.Nd stdio stream locking functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft void
-.Fn flockfile "FILE *file"
-.Ft int
-.Fn ftrylockfile "FILE *file"
-.Ft void
-.Fn funlockfile "FILE *file"
-.Sh DESCRIPTION
-The
-.Fn flockfile ,
-.Fn ftrylockfile ,
-and
-.Fn funlockfile
-functions provide applications with explicit control of locking of
-stdio stream objects.
-They can be used by a thread to execute a sequence of I/O operations
-as a unit, without interference from another thread.
-.Pp
-Locks on stdio streams are recursive, and a lock count is maintained.
-stdio streams are created unlocked, with a lock count of zero.
-After successful acquisition of the lock, its count is incremented
-to one, indicating locked state of the stdio stream.
-Each subsequent relock operation performed by the owner thread
-increments the lock count by one, and each subsequent unlock
-operation performed by the owner thread decrements the lock count by one,
-allowing matching lock and unlock operations to be nested.
-After its lock count is decremented to zero, the stdio stream returns
-to unlocked state, and ownership of the stdio stream is relinquished.
-.Pp
-The
-.Fn flockfile
-function acquires the ownership of
-.Fa file
-for the calling thread.
-If
-.Fa file
-is already owned by another thread, the calling thread is suspended
-until the acquisition is possible (i.e.,
-.Fa file
-is relinquished again and the calling thread is scheduled to acquire it).
-.Pp
-The
-.Fn ftrylockfile
-function acquires the ownership of
-.Fa file
-for the calling thread only if
-.Fa file
-is available.
-.Pp
-The
-.Fn funlockfile
-function relinquishes the ownership of
-.Fa file
-previously granted to the calling thread.
-Only the current owner of
-.Fa file
-may
-.Fn funlockfile
-it.
-.Sh RETURN VALUES
-If successful, the
-.Fn ftrylockfile
-function returns 0.
-Otherwise, it returns non-zero to indicate that the lock cannot be acquired.
-.Sh SEE ALSO
-.Xr flock 2 ,
-.Xr getc_unlocked 3 ,
-.Xr getchar_unlocked 3 ,
-.Xr lockf 3 ,
-.Xr putc_unlocked 3 ,
-.Xr putchar_unlocked 3
-.Sh STANDARDS
-The
-.Fn flockfile ,
-.Fn ftrylockfile
-and
-.Fn funlockfile
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn flockfile
-function first appeared in
-.Fx 2.0 .
-.Sh BUGS
-The design of these interfaces does not allow for addressing the
-problem of priority inversion.
diff --git a/lib/libc/stdio/flockfile.c b/lib/libc/stdio/flockfile.c
deleted file mode 100644
index 5a14731c9..000000000
--- a/lib/libc/stdio/flockfile.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*	$NetBSD: flockfile.c,v 1.11 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nathan J. Williams.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flockfile.c,v 1.11 2012/03/15 18:22:30 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include "reentrant.h"
-#include "local.h"
-
-#ifdef __weak_alias
-__weak_alias(flockfile,_flockfile)
-__weak_alias(ftrylockfile,_ftrylockfile)
-__weak_alias(funlockfile,_funlockfile)
-#endif
-
-#ifdef _REENTRANT
-/*
- * XXX This code makes the assumption that a thr_t (pthread_t) is a 
- * XXX pointer.
- */
-
-void
-flockfile(FILE *fp)
-{
-
-	__flockfile_internal(fp, 0);
-}
-
-int
-ftrylockfile(FILE *fp)
-{
-	int retval;
-
-	if (__isthreaded == 0)
-		return 0;
-
-	retval = 0;
-	mutex_lock(&_LOCK(fp));
-		
-	if (_LOCKOWNER(fp) == thr_self()) {
-		_LOCKCOUNT(fp)++;
-	} else if (_LOCKOWNER(fp) == NULL) {
-		_LOCKOWNER(fp) = thr_self();
-		_LOCKCOUNT(fp) = 1;
-	} else
-		retval = -1;
-
-	mutex_unlock(&_LOCK(fp));
-
-	return retval;
-}
-
-void
-funlockfile(FILE *fp)
-{
-
-	__funlockfile_internal(fp, 0);
-}
-
-void
-__flockfile_internal(FILE *fp, int internal)
-{
-
-	if (__isthreaded == 0)
-		return;
-
-	mutex_lock(&_LOCK(fp));
-	
-	if (_LOCKOWNER(fp) == thr_self()) {
-		_LOCKCOUNT(fp)++;
-		if (internal)
-			_LOCKINTERNAL(fp)++;
-	} else {
-		/* danger! cond_wait() is a cancellation point. */
-		int oldstate;
-		thr_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
-		while (_LOCKOWNER(fp) != NULL)
-			cond_wait(&_LOCKCOND(fp), &_LOCK(fp));
-		thr_setcancelstate(oldstate, NULL);
-		_LOCKOWNER(fp) = thr_self();
-		_LOCKCOUNT(fp) = 1;
-		if (internal)
-			_LOCKINTERNAL(fp) = 1;
-	}
-
-	if (_LOCKINTERNAL(fp) == 1)
-		/* stash cancellation state and disable */
-		thr_setcancelstate(PTHREAD_CANCEL_DISABLE,
-		    &_LOCKCANCELSTATE(fp));
-
-	mutex_unlock(&_LOCK(fp));
-}
- 
-void
-__funlockfile_internal(FILE *fp, int internal)
-{
-
-	if (__isthreaded == 0)
-		return;
-
-	mutex_lock(&_LOCK(fp));
-
-	if (internal) {
-		_LOCKINTERNAL(fp)--;
-		if (_LOCKINTERNAL(fp) == 0)
-			thr_setcancelstate(_LOCKCANCELSTATE(fp), NULL);
-	}
-
-	_LOCKCOUNT(fp)--;
-	if (_LOCKCOUNT(fp) == 0) {
-		_LOCKOWNER(fp) = NULL;
-		cond_signal(&_LOCKCOND(fp));
-	}
-
-	mutex_unlock(&_LOCK(fp));
-}
-
-#else /* _REENTRANT */
-
-void
-flockfile(FILE *fp)
-{
-	/* LINTED deliberate lack of effect */
-	(void)fp;
-
-	return;
-}
-
-int
-ftrylockfile(FILE *fp)
-{
-	/* LINTED deliberate lack of effect */
-	(void)fp;
-
-	return 0;
-}
-
-void
-funlockfile(FILE *fp)
-{
-	/* LINTED deliberate lack of effect */
-	(void)fp;
-
-	return;
-}
-
-#endif /* _REENTRANT */
diff --git a/lib/libc/stdio/fmemopen.3 b/lib/libc/stdio/fmemopen.3
deleted file mode 100644
index b2dff1923..000000000
--- a/lib/libc/stdio/fmemopen.3
+++ /dev/null
@@ -1,194 +0,0 @@
-.\"	$NetBSD: fmemopen.3,v 1.9 2015/09/06 03:10:50 pgoyette Exp $
-.\"
-.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 5, 2015
-.Dt FMEMOPEN 3
-.Os
-.Sh NAME
-.Nm fmemopen
-.Nd open a stream that points to a memory buffer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft FILE *
-.Fn fmemopen "void *restrict buffer" "size_t size" "const char *restrict mode"
-.Sh DESCRIPTION
-The
-.Fn fmemopen
-function
-associates a stream with the given
-.Fa buffer
-and
-.Fa size .
-The
-.Fa buffer
-can be either
-.Dv NULL ,
-or must be of the given
-.Fa size .
-If the
-.Fa buffer
-is
-.Dv NULL ,
-a
-.Fa buffer
-of the given
-.Fa size
-will be dynamically allocated using
-.Xr malloc 3
-and freed when
-.Xr fclose 3
-is called.
-.Pp
-The
-.Fa mode
-argument has the same meaning as in
-.Xr fopen 3 .
-.Pp
-The stream treats the buffer as it would treat a file tracking the current
-position to perform I/O operations.
-For example, in the beginning the stream points to the beginning of the buffer,
-unless
-.Dv a
-was specified in the
-.Fa mode
-argument, and then it points to the first
-.Dv NUL
-byte.
-If a
-.Dv NULL
-.Fa buffer
-was specified, then the stream will always point at the first byte of the
-.Fa buffer .
-.Pp
-The stream also keeps track of the
-.Fa size
-of the
-.Fa buffer .
-The
-.Fa size
-is initialized depending on the mode:
-.Bl -tag -width r/w+
-.It Dv r/r+
-Set to the
-.Fa size
-argument.
-.It Dv w/w+
-Set to
-.Dv 0 .
-.It Dv a/a+
-Set to the first
-.Dv NUL
-byte, or the
-.Fa size
-argument if one is not found.
-.El
-.Pp
-Read or write operations advance the buffer, but not to exceed the given
-.Fa size
-of the
-.Fa buffer .
-Trying to read beyond the
-.Fa size
-of the
-.Fa buffer
-results in
-.Dv EOF
-returned.
-.Dv NUL
-bytes are read normally.
-Trying to write beyond the
-.Fa size
-of the
-.Fa buffer
-has no effect.
-.Pp
-When a stream open for writing is either flushed or closed, a
-.Dv NUL
-byte is written at the current position or at the end of the current
-.Fa size
-as kept internally, if there is room.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn fmemopen
-returns a
-.Dv FILE
-pointer.
-Otherwise,
-.Dv NULL
-is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa size
-was
-.Dv 0 ;
-or the
-.Fa mode
-argument is invalid;
-or the
-.Fa buffer
-argument is
-.Dv NULL
-and the
-.Fa mode
-argument does not specify a
-.Dv + .
-.El
-.Pp
-The
-.Fn fmemopen
-function
-may also fail and set
-.Va errno
-for any of the errors
-specified for the routine
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr fclose 3 ,
-.Xr fflush 3 ,
-.Xr fopen 3 ,
-.Xr malloc 3
-.Sh STANDARDS
-The
-.Fn fmemopen
-function conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn fmemopen
-function first appeared in
-.Nx 6.0 .
diff --git a/lib/libc/stdio/fmemopen.c b/lib/libc/stdio/fmemopen.c
deleted file mode 100644
index 474c798ad..000000000
--- a/lib/libc/stdio/fmemopen.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/* $NetBSD: fmemopen.c,v 1.8 2012/03/29 14:27:33 christos Exp $ */
-
-/*-
- * Copyright (c)2007, 2010 Takehiko NOZAKI,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fmemopen.c,v 1.8 2012/03/29 14:27:33 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "reentrant.h"
-#include "local.h"
-
-struct fmemopen_cookie {
-	char *head, *tail, *cur, *eob;
-};
-
-static ssize_t
-fmemopen_read(void *cookie, void *buf, size_t nbytes)
-{
-	struct fmemopen_cookie *p;
-	char *s, *b = buf;
-
-	_DIAGASSERT(cookie != NULL);
-	_DIAGASSERT(buf != NULL && nbytes > 0);
-
-	p = (struct fmemopen_cookie *)cookie;
-	s = p->cur;
-	do {
-		if (p->cur == p->tail)
-			break;
-		*b++ = *p->cur++;
-	} while (--nbytes > 0);
-
-	return (ssize_t)(p->cur - s);
-}
-
-static ssize_t
-fmemopen_write(void *cookie, const void *buf, size_t nbytes)
-{
-	struct fmemopen_cookie *p;
-	char *s;
-	const char *b = buf;
-
-	_DIAGASSERT(cookie != NULL);
-	_DIAGASSERT(buf != NULL && nbytes > 0);
-
-	p = (struct fmemopen_cookie *)cookie;
-	if (p->cur >= p->tail)
-		return 0;
-	s = p->cur;
-	do {
-		if (p->cur == p->tail - 1) {
-			if (*b == '\0') {
-				*p->cur++ = '\0';
-				goto ok;
-			}
-			break;
-		}
-		*p->cur++ = *b++;
-	} while (--nbytes > 0);
-	*p->cur = '\0';
-ok:
-	if (p->cur > p->eob)
-		p->eob = p->cur;
-
-	return (ssize_t)(p->cur - s);
-}
-
-#ifdef notyet
-static int
-fmemopen_flush(void *cookie)
-{
-	struct fmemopen_cookie *p;
-
-	_DIAGASSERT(cookie != NULL);
-
-	p = (struct fmemopen_cookie *)cookie;
-	if (p->cur >= p->tail)
-		return -1;
-	*p->cur = '\0';
-	return 0;
-}
-#endif
-
-static off_t
-fmemopen_seek(void *cookie, off_t offset, int whence)
-{
-	struct fmemopen_cookie *p;
- 
-	_DIAGASSERT(cookie != NULL);
-
-	p = (struct fmemopen_cookie *)cookie;
-	switch (whence) {
-	case SEEK_SET:
-		break;
-	case SEEK_CUR:
-		offset += p->cur - p->head;
-		break;
-	case SEEK_END:
-		offset += p->eob - p->head;
-		break;
-	default:
-		errno = EINVAL;
-		goto error;
-	}
-	if (offset >= (off_t)0 && offset <= p->tail - p->head) {
-		p->cur = p->head + (ptrdiff_t)offset;
-		return (off_t)(p->cur - p->head);
-	}
-error:
-	return (off_t)-1;
-}
-
-static int
-fmemopen_close0(void *cookie)
-{
-	_DIAGASSERT(cookie != NULL);
-
-	free(cookie);
-
-	return 0;
-}
-
-static int
-fmemopen_close1(void *cookie)
-{
-	struct fmemopen_cookie *p;
-
-	_DIAGASSERT(cookie != NULL);
-
-	p = (struct fmemopen_cookie *)cookie;
-	free(p->head);
-	free(p);
-
-	return 0;
-}
-
-
-FILE *
-fmemopen(void * __restrict buf, size_t size, const char * __restrict mode)
-{
-	int flags, oflags;
-	FILE *fp;
-	struct fmemopen_cookie *cookie;
-
-	if (size < (size_t)1)
-		goto invalid;
-
-	flags = __sflags(mode, &oflags);
-	if (flags == 0)
-		return NULL;
-
-	if ((oflags & O_RDWR) == 0 && buf == NULL)
-		goto invalid;
-
-	fp = __sfp();
-	if (fp == NULL)
-		return NULL;
-	fp->_file = -1;
-
-	cookie = malloc(sizeof(*cookie));
-	if (cookie == NULL)
-		goto release;
-
-	if (buf == NULL) {
-		cookie->head = malloc(size);
-		if (cookie->head == NULL) {
-			free(cookie);
-			goto release;
-		}
-		*cookie->head = '\0';
-		fp->_close = fmemopen_close1;
-	} else {
-		cookie->head = (char *)buf;
-		if (oflags & O_TRUNC)
-			*cookie->head = '\0';
-		fp->_close = fmemopen_close0;
-	}
-
-	cookie->tail = cookie->head + size;
-	cookie->eob  = cookie->head;
-	do {
-		if (*cookie->eob == '\0')
-			break;
-		++cookie->eob;
-	} while (--size > 0);
-
-	cookie->cur = (oflags & O_APPEND) ? cookie->eob : cookie->head;
-
-	fp->_flags  = flags;
-	fp->_write  = (flags & __SRD) ? NULL : fmemopen_write;
-	fp->_read   = (flags & __SWR) ? NULL : fmemopen_read;
-	fp->_seek   = fmemopen_seek;
-#ifdef notyet
-	fp->_flush  = fmemopen_flush;
-#endif
-	fp->_cookie = (void *)cookie;
-
-	return fp;
-
-invalid:
-	errno = EINVAL;
-	return NULL;
-
-release:
-	fp->_flags = 0;
-	return NULL;
-}
diff --git a/lib/libc/stdio/fopen.3 b/lib/libc/stdio/fopen.3
deleted file mode 100644
index 16a172616..000000000
--- a/lib/libc/stdio/fopen.3
+++ /dev/null
@@ -1,304 +0,0 @@
-.\"	$NetBSD: fopen.3,v 1.31 2015/07/15 19:08:43 christos Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)fopen.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd November 14, 2012
-.Dt FOPEN 3
-.Os
-.Sh NAME
-.Nm fopen ,
-.Nm fdopen ,
-.Nm freopen
-.Nd stream open functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft FILE *
-.Fn fopen "const char * restrict path" "const char * restrict mode"
-.Ft FILE *
-.Fn fdopen "int fildes" "const char *mode"
-.Ft FILE *
-.Fn freopen "const char * restrict path" "const char * restrict mode" "FILE * restrict stream"
-.Sh DESCRIPTION
-The
-.Fn fopen
-function
-opens the file whose name is the string pointed to by
-.Fa path
-and associates a stream with it.
-.Pp
-The argument
-.Fa mode
-points to a string beginning with one of the following
-sequences (Additional characters may follow these sequences.):
-.Bl -tag -width 4n
-.It Dq Li a
-Append; open for writing.
-The file is created if it does not exist.
-.It Dq Li a+
-Append; open for reading and writing.
-The file is created if it does not exist.
-.It Dq Li r
-Open for reading.
-.It Dq Li r+
-Open for reading and writing.
-.It Dq Li w
-Open for writing.
-Truncate file to zero length or create file.
-.It Dq Li w+
-Open for reading and writing.
-Truncate file to zero length or create file.
-.El
-.Pp
-Additionally, the
-.Fa mode
-string can also include one of the following letters:
-.Bl -tag -width 4n
-.It Sq b
-The letter
-.Sq b
-may appear either as a last character or as a character between the
-characters in any of the two-character strings described above.
-This is strictly for compatibility with
-.St -ansiC
-and has no effect; the
-.Sq b
-is ignored.
-.It Sq e
-The letter
-.Sq e
-in the mode string sets the close-on-exec flag in the file descriptors of
-the newly opened file files; if the operation fails,
-.Fn fopen
-will fail.
-This is a non
-.St -ansiC
-extension.
-.It Sq f
-The letter
-.Sq f
-in the mode string restricts
-.Fn fopen
-to regular files; if the file opened is not a regular file,
-.Fn fopen
-will fail.
-This is a non
-.St -ansiC
-extension.
-.It Sq x
-The letter
-.Sq x
-in the mode turns on exclusive open mode to the file
-.Pq Dv O_EXCL
-which means that the file will not be created if it already exists.
-.El
-.Pp
-Any created files will have mode
-.Pf \*q Dv S_IRUSR
-\&|
-.Dv S_IWUSR
-\&|
-.Dv S_IRGRP
-\&|
-.Dv S_IWGRP
-\&|
-.Dv S_IROTH
-\&|
-.Dv S_IWOTH Ns \*q
-.Pq Li 0666 ,
-as modified by the process'
-.Xr umask 2
-value.
-.Pp
-Opening a file with append mode causes all subsequent writes to it
-to be forced to the then current end of file, regardless of intervening
-repositioning of the stream.
-.Pp
-The
-.Fn fopen
-and
-.Fn freopen
-functions initially position the stream at the start of the file
-unless the file is opened with append mode,
-in which case the stream is initially positioned at the end of the file.
-.\" PR 6072 claims this paragraph is not correct.
-.\" .Pp
-.\" Reads and writes may be intermixed on read/write streams in any order,
-.\" and do not require an intermediate seek as in previous versions of
-.\" .Em stdio .
-.\" This is not portable to other systems, however;
-.\" .Tn ANSI C
-.\" requires that
-.\" a file positioning function intervene between output and input, unless
-.\" an input operation encounters end-of-file.
-.Pp
-The
-.Fn fdopen
-function associates a stream with the existing file descriptor,
-.Fa fildes .
-The
-.Fa mode
-of the stream must be compatible with the mode of the file descriptor.
-The stream is positioned at the file offset of the file descriptor.
-.Pp
-The
-.Fn freopen
-function
-opens the file whose name is the string pointed to by
-.Fa path
-and associates the stream pointed to by
-.Fa stream
-with it.
-The original stream (if it exists) is closed.
-The
-.Fa mode
-argument is used just as in the
-.Fn fopen
-function.
-The primary use of the
-.Fn freopen
-function
-is to change the file associated with a
-standard text stream
-.Pf ( Em stderr ,
-.Em stdin ,
-or
-.Em stdout ) .
-.Pp
-Input and output against the opened stream will be fully buffered, unless
-it refers to an interactive terminal device, or a different kind of buffering
-is specified in the environment.
-See
-.Xr setvbuf 3
-for additional details.
-.Sh RETURN VALUES
-Upon successful completion
-.Fn fopen ,
-.Fn fdopen
-and
-.Fn freopen
-return a
-.Tn FILE
-pointer.
-Otherwise,
-.Dv NULL
-is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The functions may fail if:
-.Bl -tag -width Er
-.It Bq Er EFTYPE
-The file is not a regular file and the character ``f'' is specified
-in the mode.
-.It Bq Er EINVAL
-The specified
-.Fa mode
-was invalid.
-.El
-.Pp
-The
-.Fn fopen ,
-.Fn fdopen
-and
-.Fn freopen
-functions
-may also fail and set
-.Va errno
-for any of the errors specified for the routine
-.Xr malloc 3 .
-.Pp
-The
-.Fn fopen
-function
-may also fail and set
-.Va errno
-for any of the errors specified for the routine
-.Xr open 2 .
-.Pp
-The
-.Fn fdopen
-function
-may also fail and set
-.Va errno
-for any of the errors specified for the routine
-.Xr fcntl 2 .
-.Pp
-The
-.Fn freopen
-function
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr open 2 ,
-.Xr fclose 3
-and
-.Xr fflush 3 .
-.Sh SEE ALSO
-.Xr open 2 ,
-.Xr fclose 3 ,
-.Xr fileno 3 ,
-.Xr fseek 3 ,
-.Xr funopen 3
-.Sh STANDARDS
-The
-.Fn fopen
-and
-.Fn freopen
-functions conform to
-.St -ansiC .
-All three functions are specified in
-.St -p1003.1-2008 .
-.Sh CAVEATS
-Proper code using
-.Fn fdopen
-with error checking should
-.Xr close 2
-.Fa fildes
-in case of failure, and
-.Xr fclose 3
-the resulting FILE * in case of success.
-.Bd -literal
-	FILE *file;
-	int fd;
-
-	if ((file = fdopen(fd, "r")) != NULL) {
-		/* perform operations on the FILE * */
-		fclose(file);
-	} else {
-		/* failure, report the error */
-		close(fd);
-	}
-.Ed
diff --git a/lib/libc/stdio/fopen.c b/lib/libc/stdio/fopen.c
deleted file mode 100644
index c1792ebd8..000000000
--- a/lib/libc/stdio/fopen.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*	$NetBSD: fopen.c,v 1.15 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fopen.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fopen.c,v 1.15 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#include <limits.h>
-#include "reentrant.h"
-#include "local.h"
-
-FILE *
-fopen(const char *file, const char *mode)
-{
-	FILE *fp;
-	int f;
-	int flags, oflags;
-
-	_DIAGASSERT(file != NULL);
-	if ((flags = __sflags(mode, &oflags)) == 0)
-		return NULL;
-	if ((fp = __sfp()) == NULL)
-		return NULL;
-	if ((f = open(file, oflags, DEFFILEMODE)) < 0)
-		goto release;
-	if (oflags & O_NONBLOCK) {
-		struct stat st;
-		if (fstat(f, &st) == -1) {
-			int sverrno = errno;
-			(void)close(f);
-			errno = sverrno;
-			goto release;
-		}
-		if (!S_ISREG(st.st_mode)) {
-			(void)close(f);
-			errno = EFTYPE;
-			goto release;
-		}
-	}
-	/*
-	 * File descriptors are a full int, but _file is only a short.
-	 * If we get a valid file descriptor that is greater or equal to
-	 * USHRT_MAX, then the fd will get sign-extended into an
-	 * invalid file descriptor.  Handle this case by failing the
-	 * open. (We treat the short as unsigned, and special-case -1).
-	 */
-	if (f >= USHRT_MAX) {
-		errno = EMFILE;
-		goto release;
-	}
-
-	fp->_file = f;
-	fp->_flags = flags;
-	fp->_cookie = fp;
-	fp->_read = __sread;
-	fp->_write = __swrite;
-	fp->_seek = __sseek;
-	fp->_close = __sclose;
-
-	/*
-	 * When opening in append mode, even though we use O_APPEND,
-	 * we need to seek to the end so that ftell() gets the right
-	 * answer.  If the user then alters the seek pointer, or
-	 * the file extends, this will fail, but there is not much
-	 * we can do about this.  (We could set __SAPP and check in
-	 * fseek and ftell.)
-	 */
-	if (oflags & O_APPEND)
-		(void) __sseek((void *)fp, (off_t)0, SEEK_END);
-	return fp;
-release:
-	fp->_flags = 0;			/* release */
-	return NULL;
-}
diff --git a/lib/libc/stdio/fparseln.3 b/lib/libc/stdio/fparseln.3
deleted file mode 100644
index bdbb77e32..000000000
--- a/lib/libc/stdio/fparseln.3
+++ /dev/null
@@ -1,147 +0,0 @@
-.\"	$NetBSD: fparseln.3,v 1.5 2014/01/07 13:34:11 njoly Exp $
-.\"
-.\" Copyright (c) 1997 Christos Zoulas.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list 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.
-.\"
-.Dd November 30, 2002
-.Dt FPARSELN 3
-.Os
-.Sh NAME
-.Nm fparseln
-.Nd return the next logical line from a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft "char *"
-.Fo "fparseln"
-.Fa "FILE *stream" "size_t *len" "size_t *lineno"
-.Fa "const char delim[3]" "int flags"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn fparseln
-function
-returns a pointer to the next logical line from the stream referenced by
-.Fa stream .
-This string is
-.Dv NUL
-terminated and it is dynamically allocated on each invocation.
-It is the responsibility of the caller to free the pointer.
-.Pp
-By default, if a character is escaped, both it and the preceding escape
-character will be present in the returned string.
-Various
-.Fa flags
-alter this behaviour.
-.Pp
-The meaning of the arguments is as follows:
-.Bl -tag -width "lineno"
-.It Fa stream
-The stream to read from.
-.It Fa len
-If not
-.Dv NULL ,
-the length of the string is stored in the memory location to which it
-points.
-.It Fa lineno
-If not
-.Dv NULL ,
-the value of the memory location to which is pointed to, is incremented
-by the number of lines actually read from the file.
-.It Fa delim
-Contains the escape, continuation, and comment characters.
-If a character is
-.Dv NUL
-then processing for that character is disabled.
-If
-.Dv NULL ,
-all characters default to values specified below.
-The contents of
-.Fa delim
-is as follows:
-.Bl -tag -width "delim[0]"
-.It Fa delim[0]
-The escape character, which defaults to
-.Cm \e ,
-is used to remove any special meaning from the next character.
-.It Fa delim[1]
-The continuation character, which defaults to
-.Cm \e ,
-is used to indicate that the next line should be concatenated with the
-current one if this character is the last character on the current line
-and is not escaped.
-.It Fa delim[2]
-The comment character, which defaults to
-.Cm # ,
-if not escaped indicates the beginning of a comment that extends until the
-end of the current line.
-.El
-.It Fa flags
-If non-zero, alter the operation of
-.Fn fparseln .
-The various flags, which may be
-.Em or Ns -ed
-together, are:
-.Bl -tag -width "FPARSELN_UNESCCOMM"
-.It Dv FPARSELN_UNESCCOMM
-Remove escape preceding an escaped comment.
-.It Dv FPARSELN_UNESCCONT
-Remove escape preceding an escaped continuation.
-.It Dv FPARSELN_UNESCESC
-Remove escape preceding an escaped escape.
-.It Dv FPARSELN_UNESCREST
-Remove escape preceding any other character.
-.It Dv FPARSELN_UNESCALL
-All of the above.
-.El
-.El
-.Sh RETURN VALUES
-Upon successful completion a pointer to the parsed line is returned;
-otherwise,
-.Dv NULL
-is returned.
-.Pp
-The
-.Fn fparseln
-function uses internally
-.Xr fgetln 3 ,
-so all error conditions that apply to
-.Xr fgetln 3 ,
-apply to
-.Fn fparseln .
-In addition
-.Fn fparseln
-may set
-.Va errno
-to
-.Bq Er ENOMEM
-and return
-.Dv NULL
-if it runs out of memory.
-.Sh SEE ALSO
-.Xr fgetln 3
-.Sh HISTORY
-The
-.Fn fparseln
-function first appeared in
-.Nx 1.4 .
diff --git a/lib/libc/stdio/fparseln.c b/lib/libc/stdio/fparseln.c
deleted file mode 100644
index 902f6feb4..000000000
--- a/lib/libc/stdio/fparseln.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*	$NetBSD: fparseln.c,v 1.10 2009/10/21 01:07:45 snj Exp $	*/
-
-/*
- * Copyright (c) 1997 Christos Zoulas.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fparseln.c,v 1.10 2009/10/21 01:07:45 snj Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(fparseln,_fparseln)
-#endif
-
-#if ! HAVE_FPARSELN || BROKEN_FPARSELN
-
-#ifndef HAVE_NBTOOL_CONFIG_H
-#include "reentrant.h"
-#include "local.h"
-#else
-#define FLOCKFILE(fp)
-#define FUNLOCKFILE(fp)
-#endif
-
-#if defined(_REENTRANT) && !HAVE_NBTOOL_CONFIG_H
-#define __fgetln(f, l) __fgetstr(f, l, '\n')
-#else
-#define __fgetln(f, l) fgetln(f, l)
-#endif
-
-static int isescaped(const char *, const char *, int);
-
-/* isescaped():
- *	Return true if the character in *p that belongs to a string
- *	that starts in *sp, is escaped by the escape character esc.
- */
-static int
-isescaped(const char *sp, const char *p, int esc)
-{
-	const char     *cp;
-	size_t		ne;
-
-	_DIAGASSERT(sp != NULL);
-	_DIAGASSERT(p != NULL);
-
-	/* No escape character */
-	if (esc == '\0')
-		return 0;
-
-	/* Count the number of escape characters that precede ours */
-	for (ne = 0, cp = p; --cp >= sp && *cp == esc; ne++)
-		continue;
-
-	/* Return true if odd number of escape characters */
-	return (ne & 1) != 0;
-}
-
-
-/* fparseln():
- *	Read a line from a file parsing continuations ending in \
- *	and eliminating trailing newlines, or comments starting with
- *	the comment char.
- */
-char *
-fparseln(FILE *fp, size_t *size, size_t *lineno, const char str[3], int flags)
-{
-	static const char dstr[3] = { '\\', '\\', '#' };
-
-	size_t	s, len;
-	char   *buf;
-	char   *ptr, *cp;
-	int	cnt;
-	char	esc, con, nl, com;
-
-	_DIAGASSERT(fp != NULL);
-
-	len = 0;
-	buf = NULL;
-	cnt = 1;
-
-	if (str == NULL)
-		str = dstr;
-
-	esc = str[0];
-	con = str[1];
-	com = str[2];
-	/*
-	 * XXX: it would be cool to be able to specify the newline character,
-	 * but unfortunately, fgetln does not let us
-	 */
-	nl  = '\n';
-
-	FLOCKFILE(fp);
-
-	while (cnt) {
-		cnt = 0;
-
-		if (lineno)
-			(*lineno)++;
-
-		if ((ptr = __fgetln(fp, &s)) == NULL)
-			break;
-
-		if (s && com) {		/* Check and eliminate comments */
-			for (cp = ptr; cp < ptr + s; cp++)
-				if (*cp == com && !isescaped(ptr, cp, esc)) {
-					s = cp - ptr;
-					cnt = s == 0 && buf == NULL;
-					break;
-				}
-		}
-
-		if (s && nl) { 		/* Check and eliminate newlines */
-			cp = &ptr[s - 1];
-
-			if (*cp == nl)
-				s--;	/* forget newline */
-		}
-
-		if (s && con) {		/* Check and eliminate continuations */
-			cp = &ptr[s - 1];
-
-			if (*cp == con && !isescaped(ptr, cp, esc)) {
-				s--;	/* forget continuation char */
-				cnt = 1;
-			}
-		}
-
-		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) {
-			FUNLOCKFILE(fp);
-			free(buf);
-			return NULL;
-		}
-		buf = cp;
-
-		(void) memcpy(buf + len, ptr, s);
-		len += s;
-		buf[len] = '\0';
-	}
-
-	FUNLOCKFILE(fp);
-
-	if ((flags & FPARSELN_UNESCALL) != 0 && esc && buf != NULL &&
-	    strchr(buf, esc) != NULL) {
-		ptr = cp = buf;
-		while (cp[0] != '\0') {
-			int skipesc;
-
-			while (cp[0] != '\0' && cp[0] != esc)
-				*ptr++ = *cp++;
-			if (cp[0] == '\0' || cp[1] == '\0')
-				break;
-
-			skipesc = 0;
-			if (cp[1] == com)
-				skipesc += (flags & FPARSELN_UNESCCOMM);
-			if (cp[1] == con)
-				skipesc += (flags & FPARSELN_UNESCCONT);
-			if (cp[1] == esc)
-				skipesc += (flags & FPARSELN_UNESCESC);
-			if (cp[1] != com && cp[1] != con && cp[1] != esc)
-				skipesc = (flags & FPARSELN_UNESCREST);
-
-			if (skipesc)
-				cp++;
-			else
-				*ptr++ = *cp++;
-			*ptr++ = *cp++;
-		}
-		*ptr = '\0';
-		len = strlen(buf);
-	}
-
-	if (size)
-		*size = len;
-	return buf;
-}
-
-#ifdef TEST
-
-int main(int, char **);
-
-int
-main(int argc, char **argv)
-{
-	char   *ptr;
-	size_t	size, line;
-
-	line = 0;
-	while ((ptr = fparseln(stdin, &size, &line, NULL,
-	    FPARSELN_UNESCALL)) != NULL)
-		printf("line %d (%d) |%s|\n", line, size, ptr);
-	return 0;
-}
-
-/*
-
-# This is a test
-line 1
-line 2 \
-line 3 # Comment
-line 4 \# Not comment \\\\
-
-# And a comment \
-line 5 \\\
-line 6
-
-*/
-
-#endif /* TEST */
-#endif	/* ! HAVE_FPARSELN || BROKEN_FPARSELN */
diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c
deleted file mode 100644
index 9b00d7d0d..000000000
--- a/lib/libc/stdio/fprintf.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: fprintf.c,v 1.13 2013/04/19 15:22:25 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fprintf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fprintf.c,v 1.13 2013/04/19 15:22:25 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-int
-fprintf(FILE *fp, const char *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	_DIAGASSERT(fp != NULL);
-	_DIAGASSERT(fmt != NULL);
-
-	va_start(ap, fmt);
-	ret = vfprintf(fp, fmt, ap);
-	va_end(ap);
-	return ret;
-}
-
-__weak_alias(fprintf_l, _fprintf_l)
-
-int
-fprintf_l(FILE *fp, locale_t loc, const char *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfprintf_l(fp, loc, fmt, ap);
-	va_end(ap);
-	return ret;
-}
diff --git a/lib/libc/stdio/fpurge.c b/lib/libc/stdio/fpurge.c
deleted file mode 100644
index 87abc3823..000000000
--- a/lib/libc/stdio/fpurge.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: fpurge.c,v 1.14 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fpurge.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fpurge.c,v 1.14 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * fpurge: like fflush, but without writing anything: leave the
- * given FILE's buffer empty.
- */
-int
-fpurge(FILE *fp)
-{
-
-	_DIAGASSERT(fp != NULL);
-
-	if (fp->_flags == 0) {
-		errno = EBADF;
-		return EOF;
-	}
-	FLOCKFILE(fp);
-	if (HASUB(fp))
-		FREEUB(fp);
-	WCIO_FREE(fp);
-	fp->_p = fp->_bf._base;
-	fp->_r = 0;
-	fp->_w = fp->_flags & (__SLBF|__SNBF) ? 0 : fp->_bf._size;
-	FUNLOCKFILE(fp);
-	return 0;
-}
diff --git a/lib/libc/stdio/fputc.c b/lib/libc/stdio/fputc.c
deleted file mode 100644
index e077a5ccd..000000000
--- a/lib/libc/stdio/fputc.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: fputc.c,v 1.13 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fputc.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fputc.c,v 1.13 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-int
-fputc(int c, FILE *fp)
-{
-	int r;
-
-	_DIAGASSERT(fp != NULL);
-
-	FLOCKFILE(fp); 
-	r = __sputc(c, fp);
-	FUNLOCKFILE(fp);
-	return r;
-}
diff --git a/lib/libc/stdio/fputs.3 b/lib/libc/stdio/fputs.3
deleted file mode 100644
index 352579c28..000000000
--- a/lib/libc/stdio/fputs.3
+++ /dev/null
@@ -1,107 +0,0 @@
-.\"	$NetBSD: fputs.3,v 1.11 2003/08/07 16:43:24 agc Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)fputs.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt FPUTS 3
-.Os
-.Sh NAME
-.Nm fputs ,
-.Nm puts
-.Nd output a line to a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn fputs "const char * restrict str" "FILE * restrict stream"
-.Ft int
-.Fn puts "const char *str"
-.Sh DESCRIPTION
-The function
-.Fn fputs
-writes the string pointed to by
-.Fa str
-to the stream pointed to by
-.Fa stream .
-.\" The terminating
-.\" .Dv NUL
-.\" character is not written.
-.Pp
-The function
-.Fn puts
-writes the string
-.Fa str ,
-and a terminating newline character,
-to the stream
-.Em stdout .
-.Sh RETURN VALUES
-The
-.Fn fputs
-function
-returns 0 on success and
-.Dv EOF
-on error;
-.Fn puts
-returns a nonnegative integer on success and
-.Dv EOF
-on error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa stream
-supplied
-is not a writable stream.
-.El
-.Pp
-The functions
-.Fn fputs
-and
-.Fn puts
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr write 2 .
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr putc 3 ,
-.Xr stdio 3
-.Sh STANDARDS
-The functions
-.Fn fputs
-and
-.Fn puts
-conform to
-.St -ansiC .
diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c
deleted file mode 100644
index d8852caf4..000000000
--- a/lib/libc/stdio/fputs.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: fputs.c,v 1.15 2012/03/13 21:13:46 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fputs.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fputs.c,v 1.15 2012/03/13 21:13:46 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include "reentrant.h"
-#include "local.h"
-#include "fvwrite.h"
-
-/*
- * Write the given string to the given file.
- */
-int
-fputs(const char *s, FILE *fp)
-{
-	struct __suio uio;
-	struct __siov iov;
-	int r;
-
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(fp != NULL);
-
-	if (s == NULL)
-		s = "(null)";
-
-	iov.iov_base = __UNCONST(s);
-	uio.uio_resid = iov.iov_len = strlen(s);
-	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1;
-	FLOCKFILE(fp);
-	_SET_ORIENTATION(fp, -1);
-	r = __sfvwrite(fp, &uio);
-	FUNLOCKFILE(fp);
-	return r;
-}
diff --git a/lib/libc/stdio/fputwc.c b/lib/libc/stdio/fputwc.c
deleted file mode 100644
index 02eb8309c..000000000
--- a/lib/libc/stdio/fputwc.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $NetBSD: fputwc.c,v 1.5 2012/03/15 18:22:30 christos Exp $ */
-
-/*-
- * Copyright (c)2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Citrus$
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fputwc.c,v 1.5 2012/03/15 18:22:30 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <wchar.h>
-#include "reentrant.h"
-#include "local.h"
-#include "fvwrite.h"
-
-wint_t
-__fputwc_unlock(wchar_t wc, FILE *fp)
-{
-	struct wchar_io_data *wcio;
-	mbstate_t *st;
-	size_t size;
-	char buf[MB_LEN_MAX];
-	struct __suio uio;
-	struct __siov iov;
-
-	_DIAGASSERT(fp != NULL);
-	
-	/* LINTED we don't play with buf */
-	iov.iov_base = (void *)buf;
-	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1;
-
-	_SET_ORIENTATION(fp, 1);
-	wcio = WCIO_GET(fp);
-	if (wcio == 0) {
-		errno = ENOMEM;
-		return WEOF;
-	}
-
-	wcio->wcio_ungetwc_inbuf = 0;
-	st = &wcio->wcio_mbstate_out;
-
-	size = wcrtomb(buf, wc, st);
-	if (size == (size_t)-1) {
-		errno = EILSEQ;
-		return WEOF;
-	}
-
-	_DIAGASSERT(size != 0);
-
-	uio.uio_resid = iov.iov_len = size;
-	if (__sfvwrite(fp, &uio)) {
-		return WEOF;
-	}
-
-	return (wint_t)wc;
-}
-
-wint_t
-fputwc(wchar_t wc, FILE *fp)
-{
-	wint_t r;
-
-	_DIAGASSERT(fp != NULL);
-
-	FLOCKFILE(fp);
-	r = __fputwc_unlock(wc, fp);
-	FUNLOCKFILE(fp);
-
-	return r;
-}
diff --git a/lib/libc/stdio/fputws.3 b/lib/libc/stdio/fputws.3
deleted file mode 100644
index 858a7af35..000000000
--- a/lib/libc/stdio/fputws.3
+++ /dev/null
@@ -1,89 +0,0 @@
-.\" $NetBSD: fputws.3,v 1.3 2010/12/16 17:42:27 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)fputs.3	8.1 (Berkeley) 6/4/93
-.\"
-.\" Original version ID:
-.\" FreeBSD: src/lib/libc/stdio/fputs.3,v 1.8 2001/10/01 16:08:59 ru Exp
-.\" FreeBSD: src/lib/libc/stdio/fputws.c,v 1.4 2002/09/20 13:25:40 tjr Exp
-.\"
-.Dd August 6, 2002
-.Dt FPUTWS 3
-.Os
-.Sh NAME
-.Nm fputws
-.Nd output a line of wide characters to a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft int
-.Fn fputws "const wchar_t * restrict ws" "FILE * restrict fp"
-.Sh DESCRIPTION
-The
-.Fn fputws
-function writes the wide-character string pointed to by
-.Fa ws
-to the stream pointed to by
-.Fa fp .
-.Sh RETURN VALUES
-The
-.Fn fputws
-function
-returns 0 on success and \-1 on error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fp
-argument supplied
-is not a writable stream.
-.El
-.Pp
-The
-.Fn fputws
-function may also fail and set
-.Va errno
-for any of the errors specified for the routine
-.Xr write 2 .
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fputs 3 ,
-.Xr putwc 3 ,
-.Xr stdio 3
-.Sh STANDARDS
-The
-.Fn fputws
-function conforms to
-.St -p1003.1-2001 .
diff --git a/lib/libc/stdio/fputws.c b/lib/libc/stdio/fputws.c
deleted file mode 100644
index 9f6664b02..000000000
--- a/lib/libc/stdio/fputws.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* $NetBSD: fputws.c,v 1.2 2012/03/15 18:22:30 christos Exp $ */
-
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Original version ID:
- * FreeBSD: src/lib/libc/stdio/fputws.c,v 1.4 2002/09/20 13:25:40 tjr Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fputws.c,v 1.2 2012/03/15 18:22:30 christos Exp $");
-#endif
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <wchar.h>
-#include "reentrant.h"
-#include "local.h"
-
-int
-fputws(const wchar_t * __restrict ws, FILE * __restrict fp)
-{
-	_DIAGASSERT(fp != NULL);
-	_DIAGASSERT(ws != NULL);
-
-	FLOCKFILE(fp);
-	_SET_ORIENTATION(fp, 1);
-
-	while (*ws != '\0') {
-		if (__fputwc_unlock(*ws++, fp) == WEOF) {
-			FUNLOCKFILE(fp);
-			return -1;
-		}
-	}
-
-	FUNLOCKFILE(fp);
-
-	return 0;
-}
diff --git a/lib/libc/stdio/fread.3 b/lib/libc/stdio/fread.3
deleted file mode 100644
index ba68cf71a..000000000
--- a/lib/libc/stdio/fread.3
+++ /dev/null
@@ -1,124 +0,0 @@
-.\"	$NetBSD: fread.3,v 1.15 2011/09/11 04:55:48 jruoho Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)fread.3	8.2 (Berkeley) 3/8/94
-.\"
-.Dd September 11, 2011
-.Dt FREAD 3
-.Os
-.Sh NAME
-.Nm fread ,
-.Nm fwrite
-.Nd binary stream input/output
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft size_t
-.Fn fread "void * restrict ptr" "size_t size" "size_t nmemb" "FILE * restrict stream"
-.Ft size_t
-.Fn fwrite "const void * restrict ptr" "size_t size" "size_t nmemb" "FILE * restrict stream"
-.Sh DESCRIPTION
-The function
-.Fn fread
-reads
-.Fa nmemb
-objects, each
-.Fa size
-bytes long, from the stream pointed to by
-.Fa stream ,
-storing them at the location given by
-.Fa ptr .
-.Pp
-The function
-.Fn fwrite
-writes
-.Fa nmemb
-objects, each
-.Fa size
-bytes long, to the stream pointed to by
-.Fa stream ,
-obtaining them from the location given by
-.Fa ptr .
-.Pp
-Mixing
-.Fn fread
-and
-.Fn fwrite
-calls without setting the file position explicitly using
-.Xr fsetpos 3
-between read and write or write and read operations will lead to unexpected
-results because of buffering the file pointer not being set to the
-expected position after each operation completes.
-This behavior is allowed by ANSI C for efficiency and it will not be changed.
-.Sh RETURN VALUES
-The functions
-.Fn fread
-and
-.Fn fwrite
-advance the file position indicator for the stream
-by the number of bytes read or written.
-They return the number of objects read or written.
-If
-.Fa size
-or
-.Fa nmemb
-is 0, the functions return 0 and the state of
-.Fa stream
-remains unchanged.
-If an error occurs, or the end-of-file is reached,
-the return value is a short object count (or zero).
-.Pp
-The function
-.Fn fread
-does not distinguish between end-of-file and error, and callers
-must use
-.Xr feof 3
-and
-.Xr ferror 3
-to determine which occurred.
-The function
-.Fn fwrite
-returns a value less than
-.Fa nmemb
-only if a write error has occurred.
-.Sh SEE ALSO
-.Xr read 2 ,
-.Xr write 2
-.Sh STANDARDS
-The functions
-.Fn fread
-and
-.Fn fwrite
-conform to
-.St -ansiC .
diff --git a/lib/libc/stdio/fread.c b/lib/libc/stdio/fread.c
deleted file mode 100644
index ef3b5ef11..000000000
--- a/lib/libc/stdio/fread.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*	$NetBSD: fread.c,v 1.22 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fread.c	8.2 (Berkeley) 12/11/93";
-#else
-__RCSID("$NetBSD: fread.c,v 1.22 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include "reentrant.h"
-#include "local.h"
-
-size_t
-fread(void *buf, size_t size, size_t count, FILE *fp)
-{
-	size_t resid;
-	char *p;
-	int r;
-	size_t total;
-
-	_DIAGASSERT(fp != NULL);
-	/*
-	 * The ANSI standard requires a return value of 0 for a count
-	 * or a size of 0.  Whilst ANSI imposes no such requirements on
-	 * fwrite, the SUSv2 does.
-	 */
-	if ((resid = count * size) == 0)
-		return 0;
-
-	_DIAGASSERT(buf != NULL);
-
-	FLOCKFILE(fp);
-	if (fp->_r < 0)
-		fp->_r = 0;
-	total = resid;
-	p = buf;
-	while (resid > (size_t)(r = fp->_r)) {
-		(void)memcpy(p, fp->_p, (size_t)r);
-		fp->_p += r;
-		/* fp->_r = 0 ... done in __srefill */
-		p += r;
-		resid -= r;
-		if (__srefill(fp)) {
-			/* no more input: return partial result */
-			FUNLOCKFILE(fp);
-			return (total - resid) / size;
-		}
-	}
-	(void)memcpy(p, fp->_p, resid);
-
-	_DIAGASSERT(__type_fit(int, fp->_r - resid));
-	fp->_r -= (int)resid;
-	fp->_p += resid;
-	FUNLOCKFILE(fp);
-	return count;
-}
diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c
deleted file mode 100644
index f83f51aad..000000000
--- a/lib/libc/stdio/freopen.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*	$NetBSD: freopen.c,v 1.19 2012/03/27 15:05:42 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)freopen.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: freopen.c,v 1.19 2012/03/27 15:05:42 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <limits.h>
-#include "reentrant.h"
-#include "local.h"
-
-/* 
- * Re-direct an existing, open (probably) file to some other file. 
- * ANSI is written such that the original file gets closed if at
- * all possible, no matter what.
- */
-FILE *
-freopen(const char *file, const char *mode, FILE *fp)
-{
-	int f;
-	int flags, isopen, oflags, sverrno, wantfd;
-
-	_DIAGASSERT(file != NULL);
-	_DIAGASSERT(mode != NULL);
-	_DIAGASSERT(fp != NULL);
-
-	if ((flags = __sflags(mode, &oflags)) == 0) {
-		(void) fclose(fp);
-		return NULL;
-	}
-
-	if (!__sdidinit)
-		__sinit();
-
-	/*
-	 * There are actually programs that depend on being able to "freopen"
-	 * descriptors that weren't originally open.  Keep this from breaking.
-	 * Remember whether the stream was open to begin with, and which file
-	 * descriptor (if any) was associated with it.  If it was attached to
-	 * a descriptor, defer closing it; freopen("/dev/stdin", "r", stdin)
-	 * should work.  This is unnecessary if it was not a Unix file.
-	 */
-	if (fp->_flags == 0) {
-		fp->_flags = __SEOF;	/* hold on to it */
-		isopen = 0;
-		wantfd = -1;
-	} else {
-		/* flush the stream; ANSI doesn't require this. */
-		if (fp->_flags & __SWR)
-			(void)__sflush(fp);
-		/* if close is NULL, closing is a no-op, hence pointless */
-		isopen = fp->_close != NULL;
-		if ((wantfd = __sfileno(fp)) == -1 && isopen) {
-			(void) (*fp->_close)(fp->_cookie);
-			isopen = 0;
-		}
-	}
-
-	/* Get a new descriptor to refer to the new file. */
-	f = open(file, oflags, DEFFILEMODE);
-	if (f < 0 && isopen) {
-		/* If out of fd's close the old one and try again. */
-		if (errno == ENFILE || errno == EMFILE) {
-			(void) (*fp->_close)(fp->_cookie);
-			isopen = 0;
-			f = open(file, oflags, DEFFILEMODE);
-		}
-	}
-	sverrno = errno;
-
-	/*
-	 * Finish closing fp.  Even if the open succeeded above, we cannot
-	 * keep fp->_base: it may be the wrong size.  This loses the effect
-	 * of any setbuffer calls, but stdio has always done this before.
-	 */
-	if (isopen && f != wantfd)
-		(void) (*fp->_close)(fp->_cookie);
-	if (fp->_flags & __SMBF)
-		free((char *)fp->_bf._base);
-	fp->_w = 0;
-	fp->_r = 0;
-	fp->_p = NULL;
-	fp->_bf._base = NULL;
-	fp->_bf._size = 0;
-	fp->_lbfsize = 0;
-	if (HASUB(fp))
-		FREEUB(fp);
-	WCIO_FREE(fp);
-	_UB(fp)._size = 0;
-	FREELB(fp);
-
-	if (f < 0) {			/* did not get it after all */
-		fp->_flags = 0;		/* set it free */
-		errno = sverrno;	/* restore in case _close clobbered */
-		return NULL;
-	}
-
-	if (oflags & O_NONBLOCK) {
-		struct stat st;
-		if (fstat(f, &st) == -1) {
-			sverrno = errno;
-			(void)close(f);
-			errno = sverrno;
-			return NULL;
-		}
-		if (!S_ISREG(st.st_mode)) {
-			(void)close(f);
-			errno = EFTYPE;
-			return NULL;
-		}
-	}
-
-	/*
-	 * If reopening something that was open before on a real file, try
-	 * to maintain the descriptor.  Various C library routines (perror)
-	 * assume stderr is always fd STDERR_FILENO, even if being freopen'd.
-	 */
-	if (wantfd >= 0 && f != wantfd) {
-		if (dup2(f, wantfd) >= 0) {
-			(void) close(f);
-			f = wantfd;
-		}
-	}
-
-	/*
-	 * File descriptors are a full int, but _file is only a short.
-	 * If we get a valid file descriptor that is greater or equal to
-	 * USHRT_MAX, then the fd will get sign-extended into an
-	 * invalid file descriptor.  Handle this case by failing the
-	 * open. (We treat the short as unsigned, and special-case -1).
-	 */
-	if (f >= USHRT_MAX) {
-		(void)close(f);
-		errno = EMFILE;
-		return NULL;
-	}
-
-	fp->_flags = flags;
-	fp->_file = f;
-	fp->_cookie = fp;
-	fp->_read = __sread;
-	fp->_write = __swrite;
-	fp->_seek = __sseek;
-	fp->_close = __sclose;
-
-	/*
-	 * When reopening in append mode, even though we use O_APPEND,
-	 * we need to seek to the end so that ftell() gets the right
-	 * answer.  If the user then alters the seek pointer, or
-	 * the file extends, this will fail, but there is not much
-	 * we can do about this.  (We could set __SAPP and check in
-	 * fseek and ftell.)
-	 */
-	if (oflags & O_APPEND)
-		(void) __sseek((void *)fp, (off_t)0, SEEK_END);
-	return fp;
-}
diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c
deleted file mode 100644
index 5f015793e..000000000
--- a/lib/libc/stdio/fscanf.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*	$NetBSD: fscanf.c,v 1.14 2013/04/19 23:32:17 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fscanf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fscanf.c,v 1.14 2013/04/19 23:32:17 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "reentrant.h"
-#include "local.h"
-
-__weak_alias(fscanf_l, _fscanf_l)
-
-int
-fscanf(FILE *fp, char const *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = __svfscanf(fp, fmt, ap);
-	va_end(ap);
-	return ret;
-}
-
-int
-fscanf_l(FILE *fp, locale_t loc, char const *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = __svfscanf_l(fp, loc, fmt, ap);
-	va_end(ap);
-	return ret;
-}
diff --git a/lib/libc/stdio/fseek.3 b/lib/libc/stdio/fseek.3
deleted file mode 100644
index 2569a17c0..000000000
--- a/lib/libc/stdio/fseek.3
+++ /dev/null
@@ -1,243 +0,0 @@
-.\"	$NetBSD: fseek.3,v 1.27 2012/01/22 19:13:42 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)fseek.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd January 21, 2012
-.Dt FSEEK 3
-.Os
-.Sh NAME
-.Nm fgetpos ,
-.Nm fseek ,
-.Nm fseeko ,
-.Nm fsetpos ,
-.Nm ftell ,
-.Nm ftello ,
-.Nm rewind
-.Nd reposition a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn fseek "FILE *stream" "long int offset" "int whence"
-.Ft int
-.Fn fseeko "FILE *stream" "off_t offset" "int whence"
-.Ft long int
-.Fn ftell "FILE *stream"
-.Ft off_t
-.Fn ftello "FILE *stream"
-.Ft void
-.Fn rewind "FILE *stream"
-.Ft int
-.Fn fgetpos "FILE * restrict stream" "fpos_t * restrict pos"
-.Ft int
-.Fn fsetpos "FILE * restrict stream" "const fpos_t * restrict pos"
-.Sh DESCRIPTION
-The
-.Fn fseek
-function sets the file position indicator for the stream pointed
-to by
-.Fa stream .
-The new position, measured in bytes, is obtained by adding
-.Fa offset
-bytes to the position specified by
-.Fa whence .
-If
-.Fa whence
-is set to
-.Dv SEEK_SET ,
-.Dv SEEK_CUR ,
-or
-.Dv SEEK_END ,
-the offset is relative to the
-start of the file, the current position indicator, or end-of-file,
-respectively.
-A successful call to the
-.Fn fseek
-function clears the end-of-file indicator for the stream and undoes
-any effects of the
-.Xr ungetc 3
-function on the same stream.
-.Pp
-The
-.Fn fseeko
-function is identical to the
-.Fn fseek
-function except that the
-.Fa offset
-argument is of type
-.Fa off_t .
-.Pp
-The
-.Fn ftell
-function
-obtains the current value of the file position indicator for the
-stream pointed to by
-.Fa stream .
-.Pp
-The
-.Fn ftello
-function is identical to the
-.Fn ftell
-function except that the return value is of type
-.Fa off_t .
-.Pp
-The
-.Fn rewind
-function sets the file position indicator for the stream pointed
-to by
-.Fa stream
-to the beginning of the file.
-It is equivalent to:
-.Pp
-.Dl (void)fseek(stream, 0L, SEEK_SET)
-.Pp
-except that the error indicator for the stream is also cleared
-(see
-.Xr clearerr 3 ) .
-.Pp
-In this implementations, an
-.Dq Fa fpos_t
-object is a complex object that represents both the position and the parse
-state of the stream making these routines are the only way to portably
-reposition a text stream.
-The
-.Ar pos
-argument of
-.Fn fsetpos
-must always be initialized by
-a call to
-.Fn fgetpos .
-.Sh RETURN VALUES
-The
-.Fn rewind
-function
-returns no value.
-Upon successful completion,
-.Fn fgetpos ,
-.Fn fseek ,
-.Fn fseeko ,
-and
-.Fn fsetpos
-return 0.
-The functions
-.Fn ftell
-and
-.Fn ftello
-return the current offset.
-Otherwise,
-.Fn fseek ,
-.Fn fseeko ,
-.Fn ftell ,
-and
-.Fn ftello
-return \-1 while
-.Fn fgetpos
-and
-.Fn fsetpos
-return a nonzero value.
-On error all functions the global variable
-.Va errno
-is set to indicate the error.
-Since the
-.Fn rewind
-function does not return an error code, applications need to clear
-.Va errno
-before calling it in order to detect errors.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa stream
-specified
-is not a seekable stream.
-.It Bq Er EINVAL
-The
-.Fa whence
-argument to
-.Fn fseek
-was not
-.Dv SEEK_SET ,
-.Dv SEEK_END ,
-or
-.Dv SEEK_CUR .
-.It Bq Er EOVERFLOW
-For
-.Fn ftell ,
-the current file offset cannot be represented correctly in an object of type
-.Fa long .
-.El
-.Pp
-The function
-.Fn fgetpos ,
-.Fn fseek ,
-.Fn fseeko ,
-.Fn fsetpos ,
-.Fn ftell ,
-.Fn ftello ,
-and
-.Fn rewind
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr fflush 3 ,
-.Xr fstat 2 ,
-.Xr lseek 2 ,
-and
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr lseek 2
-.Sh STANDARDS
-The
-.Fn fgetpos ,
-.Fn fsetpos ,
-.Fn fseek ,
-.Fn ftell ,
-and
-.Fn rewind
-functions
-conform to
-.St -ansiC .
-The
-.Fn fseeko
-and
-.Fn ftello
-functions conform to
-.St -xsh5 .
-.Sh BUGS
-The
-.Fn fgetpos
-and
-.Fn fsetpos
-functions don't store/set shift states of the stream in this implementation.
diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c
deleted file mode 100644
index 04b114964..000000000
--- a/lib/libc/stdio/fseek.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: fseek.c,v 1.24 2014/11/16 20:32:52 christos Exp $	*/
-
-/*-
- * Copyright (c) 2005 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by David Laight.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fseek.c,v 1.24 2014/11/16 20:32:52 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * Seek the given file to the given offset.
- * Zero extend the offset if SEEK_SET to allow access to 4GB files
- */
-int
-fseek(FILE *fp, long l_offset, int whence)
-{
-	off_t offset;
-
-#if 0
-	/* This is a bad idea because makes fseek(fp, -6, SEEK_SET) work... */
-	if (whence == SEEK_SET)
-		offset = (unsigned long)l_offset;
-	else
-#endif
-		offset = l_offset;
-	return fseeko(fp, offset, whence);
-}
diff --git a/lib/libc/stdio/fseeko.c b/lib/libc/stdio/fseeko.c
deleted file mode 100644
index a136e757d..000000000
--- a/lib/libc/stdio/fseeko.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*	$NetBSD: fseeko.c,v 1.13 2014/10/19 11:17:43 justin Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fseeko.c,v 1.13 2014/10/19 11:17:43 justin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "reentrant.h"
-#include "local.h"
-
-#ifdef __weak_alias
-__weak_alias(fseeko, _fseeko)
-#endif
-
-#define	POS_ERR	((off_t)-1)
-
-/*
- * Seek the given file to the given offset.
- * `Whence' must be one of the three SEEK_* macros.
- */
-int
-fseeko(FILE *fp, off_t offset, int whence)
-{
-	off_t (*seekfn)(void *, off_t, int);
-	off_t target, curoff;
-	size_t n;
-	struct stat st;
-	int havepos;
-
-	_DIAGASSERT(fp != NULL);
-
-	/* make sure stdio is set up */
-	if (!__sdidinit)
-		__sinit();
-
-	FLOCKFILE(fp);
-
-	/*
-	 * Have to be able to seek.
-	 */
-	if ((seekfn = fp->_seek) == NULL) {
-		errno = ESPIPE;			/* historic practice */
-		FUNLOCKFILE(fp);
-		return -1;
-	}
-
-	/*
-	 * Change any SEEK_CUR to SEEK_SET, and check `whence' argument.
-	 * After this, whence is either SEEK_SET or SEEK_END.
-	 */
-	switch (whence) {
-
-	case SEEK_CUR:
-		/*
-		 * In order to seek relative to the current stream offset,
-		 * we have to first find the current stream offset a la
-		 * ftell (see ftell for details).
-		 */
-		(void)__sflush(fp); /* may adjust seek offset on append stream */
-		if (fp->_flags & __SOFF)
-			curoff = fp->_offset;
-		else {
-			curoff = (*seekfn)(fp->_cookie, (off_t)0, SEEK_CUR);
-			if (curoff == POS_ERR) {
-				FUNLOCKFILE(fp);
-				return -1;
-			}
-		}
-		if (fp->_flags & __SRD) {
-			curoff -= fp->_r;
-			if (HASUB(fp))
-				curoff -= fp->_ur;
-		} else if (fp->_flags & __SWR && fp->_p != NULL)
-			curoff += fp->_p - fp->_bf._base;
-
-		offset += curoff;
-		if (offset < 0) {
-			errno = EINVAL;
-			FUNLOCKFILE(fp);
-			return -1;
-		}	
-		whence = SEEK_SET;
-		havepos = 1;
-		break;
-
-	case SEEK_SET:
-		if (offset < 0) {
-			errno = EINVAL;
-			FUNLOCKFILE(fp);
-			return -1;
-		}
-	case SEEK_END:
-		curoff = 0;		/* XXX just to keep gcc quiet */
-		havepos = 0;
-		break;
-
-	default:
-		errno = EINVAL;
-		FUNLOCKFILE(fp);
-		return -1;
-	}
-
-	/*
-	 * Can only optimise if:
-	 *	reading (and not reading-and-writing);
-	 *	not unbuffered; and
-	 *	this is a `regular' Unix file (and hence seekfn==__sseek).
-	 * We must check __NBF first, because it is possible to have __NBF
-	 * and __SOPT both set.
-	 */
-	if (fp->_bf._base == NULL)
-		__smakebuf(fp);
-	if (fp->_flags & (__SWR | __SRW | __SNBF | __SNPT))
-		goto dumb;
-	if ((fp->_flags & __SOPT) == 0) {
-		if (seekfn != __sseek ||
-		    __sfileno(fp) == -1 || fstat(__sfileno(fp), &st) ||
-		    !S_ISREG(st.st_mode)) {
-			fp->_flags |= __SNPT;
-			goto dumb;
-		}
-		fp->_blksize = st.st_blksize;
-		fp->_flags |= __SOPT;
-	}
-
-	/*
-	 * We are reading; we can try to optimise.
-	 * Figure out where we are going and where we are now.
-	 */
-	if (whence == SEEK_SET)
-		target = offset;
-	else {
-		if (fstat(__sfileno(fp), &st))
-			goto dumb;
-		target = st.st_size + offset;
-	}
-
-	if (!havepos) {
-		if (fp->_flags & __SOFF)
-			curoff = fp->_offset;
-		else {
-			curoff = (*seekfn)(fp->_cookie, (off_t)0, SEEK_CUR);
-			if (curoff == POS_ERR)
-				goto dumb;
-		}
-		curoff -= fp->_r;
-		if (HASUB(fp))
-			curoff -= fp->_ur;
-	}
-
-	/*
-	 * Compute the number of bytes in the input buffer (pretending
-	 * that any ungetc() input has been discarded).  Adjust current
-	 * offset backwards by this count so that it represents the
-	 * file offset for the first byte in the current input buffer.
-	 */
-	if (HASUB(fp)) {
-		curoff += fp->_r;	/* kill off ungetc */
-		n = fp->_up - fp->_bf._base;
-		curoff -= n;
-		n += fp->_ur;
-	} else {
-		n = fp->_p - fp->_bf._base;
-		curoff -= n;
-		n += fp->_r;
-	}
-
-	/*
-	 * If the target offset is within the current buffer,
-	 * simply adjust the pointers, clear EOF, undo ungetc(),
-	 * and return.  (If the buffer was modified, we have to
-	 * skip this; see fgetln.c.)
-	 */
-	if ((fp->_flags & __SMOD) == 0 &&
-	    target >= curoff && target < curoff + (off_t)n) {
-		int o = (int)(target - curoff);
-
-		fp->_p = fp->_bf._base + o;
-		_DIAGASSERT(__type_fit(int, n - o));
-		fp->_r = (int)(n - o);
-		if (HASUB(fp))
-			FREEUB(fp);
-		fp->_flags &= ~__SEOF;
-		FUNLOCKFILE(fp);
-		return 0;
-	}
-
-	/*
-	 * The place we want to get to is not within the current buffer,
-	 * but we can still be kind to the kernel copyout mechanism.
-	 * By aligning the file offset to a block boundary, we can let
-	 * the kernel use the VM hardware to map pages instead of
-	 * copying bytes laboriously.  Using a block boundary also
-	 * ensures that we only read one block, rather than two.
-	 */
-	curoff = target & ~(fp->_blksize - 1);
-	if ((*seekfn)(fp->_cookie, curoff, SEEK_SET) == POS_ERR)
-		goto dumb;
-	fp->_r = 0;
- 	fp->_p = fp->_bf._base;
-	if (HASUB(fp))
-		FREEUB(fp);
-	fp->_flags &= ~__SEOF;
-	n = (int)(target - curoff);
-	if (n) {
-		if (__srefill(fp) || (size_t)fp->_r < n)
-			goto dumb;
-		fp->_p += n;
-		_DIAGASSERT(__type_fit(int, fp->_r - n));
-		fp->_r -= (int)n;
-	}
-	FUNLOCKFILE(fp);
-	return 0;
-
-	/*
-	 * We get here if we cannot optimise the seek ... just
-	 * do it.  Allow the seek function to change fp->_bf._base.
-	 */
-dumb:
-	if (__sflush(fp) ||
-	    (*seekfn)(fp->_cookie, offset, whence) == POS_ERR) {
-		FUNLOCKFILE(fp);
-		return -1;
-	}
-	/* success: clear EOF indicator and discard ungetc() data */
-	if (HASUB(fp))
-		FREEUB(fp);
-	fp->_p = fp->_bf._base;
-	fp->_r = 0;
-	/* fp->_w = 0; */	/* unnecessary (I think...) */
-	fp->_flags &= ~__SEOF;
-	FUNLOCKFILE(fp);
-	return 0;
-}
diff --git a/lib/libc/stdio/fsetpos.c b/lib/libc/stdio/fsetpos.c
deleted file mode 100644
index f0c1cf438..000000000
--- a/lib/libc/stdio/fsetpos.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: fsetpos.c,v 1.11 2012/01/22 18:36:17 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fsetpos.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fsetpos.c,v 1.11 2012/01/22 18:36:17 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * fsetpos: like fseek.
- */
-int
-fsetpos(FILE * __restrict fp, const fpos_t * __restrict pos)
-{
-	struct wchar_io_data *wcio;
-
-	_DIAGASSERT(fp != NULL);
-	_DIAGASSERT(pos != NULL);
-
-	wcio = WCIO_GET(fp);
-	if (wcio != NULL && wcio->wcio_mode > 0) {
-		if (fp->_write)
-			wcio->wcio_mbstate_in  = pos->_mbstate_in;
-		if (fp->_read)
-			wcio->wcio_mbstate_out = pos->_mbstate_out;
-	}
-	return fseeko(fp, pos->_pos, SEEK_SET) == (off_t)-1;
-}
diff --git a/lib/libc/stdio/ftell.c b/lib/libc/stdio/ftell.c
deleted file mode 100644
index 3e545f938..000000000
--- a/lib/libc/stdio/ftell.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*	$NetBSD: ftell.c,v 1.20 2012/03/27 15:05:42 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)ftell.c	8.2 (Berkeley) 5/4/95";
-#else
-__RCSID("$NetBSD: ftell.c,v 1.20 2012/03/27 15:05:42 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * ftell: return current offset.
- */
-long
-ftell(FILE *fp)
-{
-	off_t pos;
-
-
-	FLOCKFILE(fp);
-
-	if (fp->_seek == NULL) {
-		FUNLOCKFILE(fp);
-		errno = ESPIPE;			/* historic practice */
-		return -1L;
-	}
-
-	/*
-	 * Find offset of underlying I/O object, then
-	 * adjust for buffered bytes.
-	 */
-	(void)__sflush(fp); /* may adjust seek offset on append stream */
-	if (fp->_flags & __SOFF)
-		pos = fp->_offset;
-	else {
-		pos = (*fp->_seek)(fp->_cookie, (off_t)0, SEEK_CUR);
-		if (pos == -1L) {
-			FUNLOCKFILE(fp);
-			return (long)pos;
-		}
-	}
-	if (fp->_flags & __SRD) {
-		/*
-		 * Reading.  Any unread characters (including
-		 * those from ungetc) cause the position to be
-		 * smaller than that in the underlying object.
-		 */
-		pos -= fp->_r;
-		if (HASUB(fp))
-			pos -= fp->_ur;
-	} else if (fp->_flags & __SWR && fp->_p != NULL) {
-		/*
-		 * Writing.  Any buffered characters cause the
-		 * position to be greater than that in the
-		 * underlying object.
-		 */
-		pos += fp->_p - fp->_bf._base;
-	}
-	FUNLOCKFILE(fp);
-
-	if (__long_overflow(pos)) {
-		errno = EOVERFLOW;
-		return -1L;
-	}
-		
-	return (long)pos;
-}
diff --git a/lib/libc/stdio/ftello.c b/lib/libc/stdio/ftello.c
deleted file mode 100644
index 07578098f..000000000
--- a/lib/libc/stdio/ftello.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*	$NetBSD: ftello.c,v 1.7 2012/03/27 15:05:42 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ftello.c,v 1.7 2012/03/27 15:05:42 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-#ifdef __weak_alias
-__weak_alias(ftello, _ftello)
-#endif
-
-/*
- * ftell: return current offset.
- */
-off_t
-ftello(FILE *fp)
-{
-	off_t pos;
-
-
-	FLOCKFILE(fp);
-
-	if (fp->_seek == NULL) {
-		FUNLOCKFILE(fp);
-		errno = ESPIPE;			/* historic practice */
-		return (off_t)-1;
-	}
-
-	/*
-	 * Find offset of underlying I/O object, then
-	 * adjust for buffered bytes.
-	 */
-	(void)__sflush(fp); /* may adjust seek offset on append stream */
-	if (fp->_flags & __SOFF)
-		pos = fp->_offset;
-	else {
-		pos = (*fp->_seek)(fp->_cookie, (off_t)0, SEEK_CUR);
-		if (pos == (off_t)-1) {
-			FUNLOCKFILE(fp);
-			return pos;
-		}
-	}
-	if (fp->_flags & __SRD) {
-		/*
-		 * Reading.  Any unread characters (including
-		 * those from ungetc) cause the position to be
-		 * smaller than that in the underlying object.
-		 */
-		pos -= fp->_r;
-		if (HASUB(fp))
-			pos -= fp->_ur;
-	} else if (fp->_flags & __SWR && fp->_p != NULL) {
-		/*
-		 * Writing.  Any buffered characters cause the
-		 * position to be greater than that in the
-		 * underlying object.
-		 */
-		pos += fp->_p - fp->_bf._base;
-	}
-	FUNLOCKFILE(fp);
-	return pos;
-}
diff --git a/lib/libc/stdio/funopen.3 b/lib/libc/stdio/funopen.3
deleted file mode 100644
index 85f26cb3a..000000000
--- a/lib/libc/stdio/funopen.3
+++ /dev/null
@@ -1,188 +0,0 @@
-.\"	$NetBSD: funopen.3,v 1.23 2015/09/06 01:36:21 dholland Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)funopen.3	8.1 (Berkeley) 6/9/93
-.\"
-.Dd March 16, 2012
-.Dt FUNOPEN 3
-.Os
-.Sh NAME
-.Nm funopen ,
-.Nm funopen2 ,
-.Nm fropen ,
-.Nm fropen2 ,
-.Nm fwopen ,
-.Nm fwopen2
-.Nd open a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft FILE *
-.Fn funopen "void *cookie" "int (*readfn)(void *, char *, int)" "int (*writefn)(void *, const char *, int)" "off_t (*seekfn)(void *, off_t, int)" "int (*closefn)(void *)"
-.Fn funopen2 "void *cookie" "ssize_t (*readfn)(void *, void *, size_t)" "ssize_t (*writefn)(void *, const void *, size_t)" "off_t (*seekfn)(void *, off_t, int)" "int (*flushfn)(void *)" "int (*closefn)(void *)"
-.Ft FILE *
-.Fn fropen "void *cookie" "int (*readfn)(void *, char *, int)"
-.Ft FILE *
-.Fn fropen2 "void *cookie" "ssize_t (*readfn)(void *, void *, size_t)"
-.Ft FILE *
-.Fn fwopen "void *cookie" "int (*writefn)(void *, const char *, int)"
-.Ft FILE *
-.Fn fwopen2 "void *cookie" "ssize_t (*writefn)(void *, const void *, size_t)"
-.Sh DESCRIPTION
-The
-.Fn funopen
-function
-associates a stream with up to four
-.Dq Tn I/O No functions .
-Either
-.Fa readfn
-or
-.Fa writefn
-must be specified;
-the others can be given as an appropriately-typed
-.Dv NULL
-pointer.
-These
-.Tn I/O
-functions will be used to read, write, seek and
-close the new stream.
-.Pp
-The
-.Fn funopen2
-function provides sightly different read and write signatures, which match
-better the corresponding system calls, plus the ability to augment the
-streams default flushing function.
-If a flushing function is provided, then it is called after all data has
-been written to the stream.
-.Pp
-In general, omitting a function means that any attempt to perform the
-associated operation on the resulting stream will fail.
-If the close function is omitted, closing the stream will flush
-any buffered output and then succeed.
-.Pp
-The calling conventions of
-.Fa readfn ,
-.Fa writefn ,
-.Fa seekfn
-and
-.Fa closefn
-must match those, respectively, of
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr lseek 2 ,
-and
-.Xr close 2 ;
-except that they are passed the
-.Fa cookie
-argument specified to
-.Fn funopen
-in place of the traditional file descriptor argument.
-.Pp
-Read and write
-.Tn I/O
-functions are allowed to change the underlying buffer
-on fully buffered or line buffered streams by calling
-.Xr setvbuf 3 .
-They are also not required to completely fill or empty the buffer.
-They are not, however, allowed to change streams from unbuffered to buffered
-or to change the state of the line buffering flag.
-They must also be prepared to have read or write calls occur on buffers other
-than the one most recently specified.
-.Pp
-All user
-.Tn I/O
-functions can report an error by returning \-1.
-Additionally, all of the functions should set the external variable
-.Va errno
-appropriately if an error occurs.
-.Pp
-An error on
-.Fn closefn
-does not keep the stream open.
-.Pp
-As a convenience, the include file
-.In stdio.h
-defines the macros
-.Fn fropen
-and
-.Fn fwopen
-as calls to
-.Fn funopen
-with only a read or write function specified.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn funopen
-returns a
-.Dv FILE
-pointer.
-Otherwise,
-.Dv NULL
-is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fn funopen
-function
-was called without either a read or write function.
-The
-.Fn funopen
-function
-may also fail and set
-.Va errno
-for any of the errors
-specified for the routine
-.Xr malloc 3 .
-.El
-.Sh SEE ALSO
-.Xr fcntl 2 ,
-.Xr open 2 ,
-.Xr fclose 3 ,
-.Xr fmemopen 3 ,
-.Xr fopen 3 ,
-.Xr fseek 3 ,
-.Xr setbuf 3
-.Sh HISTORY
-The
-.Fn funopen
-functions first appeared in
-.Bx 4.4 .
-The
-.Fn funopen2
-functions first appeared in
-.Nx 7.0 .
-.Sh CAVEATS
-All three functions are specific to
-.Nx
-and thus unportable.
diff --git a/lib/libc/stdio/funopen.c b/lib/libc/stdio/funopen.c
deleted file mode 100644
index 268d18e40..000000000
--- a/lib/libc/stdio/funopen.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*	$NetBSD: funopen.c,v 1.14 2012/03/28 15:21:11 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)funopen.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: funopen.c,v 1.14 2012/03/28 15:21:11 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include "reentrant.h"
-#include "local.h"
-
-FILE *
-funopen2(const void *cookie,
-    ssize_t (*readfn)(void *, void *, size_t),
-    ssize_t (*writefn)(void *, const void *, size_t),
-    off_t (*seekfn)(void *, off_t, int),
-    int (*flushfn)(void *),
-    int (*closefn)(void *))
-{
-	FILE *fp;
-	int flags;
-
-	if (readfn == NULL) {
-		if (writefn == NULL) {		/* illegal */
-			errno = EINVAL;
-			return NULL;
-		} else
-			flags = __SWR;		/* write only */
-	} else {
-		if (writefn == NULL)
-			flags = __SRD;		/* read only */
-		else
-			flags = __SRW;		/* read-write */
-	}
-	if ((fp = __sfp()) == NULL)
-		return NULL;
-	fp->_flags = flags;
-	fp->_file = -1;
-	fp->_cookie = __UNCONST(cookie);
-	fp->_read = readfn;
-	fp->_write = writefn;
-	fp->_seek = seekfn;
-	fp->_flush = flushfn;
-	fp->_close = closefn;
-	return fp;
-}
-
-typedef struct {
-	void *cookie;
-	int (*readfn)(void *, char *, int);
-	int (*writefn)(void *, const char *, int);
-	off_t (*seekfn)(void *, off_t, int);
-	int (*closefn)(void *);
-} dookie_t;
-
-static ssize_t
-creadfn(void *dookie, void *buf, size_t len)
-{
-	dookie_t *d = dookie;
-	if (len > INT_MAX)
-		len = INT_MAX;
-	return (*d->readfn)(d->cookie, buf, (int)len);
-}
-
-static ssize_t
-cwritefn(void *dookie, const void *buf, size_t len)
-{
-	dookie_t *d = dookie;
-	ssize_t nr;
-	size_t l = len;
-	const char *b = buf;
-
-	while (l) {
-		size_t nw = l > INT_MAX ? INT_MAX : l;
-		nr = (*d->writefn)(d->cookie, buf, (int)nw);
-		if (nr == -1) {
-			if (len == l)
-				return -1;
-			else
-				return len - l;
-		}
-		b += nr;
-		l -= nr;
-	}
-	return len;
-}
-
-static off_t
-cseekfn(void *dookie, off_t off, int whence)
-{
-	dookie_t *d = dookie;
-	return (*d->seekfn)(d->cookie, off, whence);
-}
-
-static int
-cclosefn(void *dookie)
-{
-	dookie_t *d = dookie;
-	void *c = d->cookie;
-	int (*cf)(void *) = d->closefn;
-	free(dookie);
-	return (*cf)(c);
-}
-
-FILE *
-funopen(const void *cookie,
-    int (*readfn)(void *, char *, int),
-    int (*writefn)(void *, const char *, int),
-    off_t (*seekfn)(void *, off_t, int),
-    int (*closefn)(void *))
-{
-	dookie_t *d;
-	FILE *fp;
-
-	if ((d = malloc(sizeof(*d))) == NULL)
-		return NULL;
-
-	d->cookie = __UNCONST(cookie);
-	d->readfn = readfn;
-	d->writefn = writefn;
-	d->seekfn = seekfn;
-	d->closefn = closefn;
-	fp = funopen2(d,
-	    d->readfn ? creadfn : NULL,
-	    d->writefn ? cwritefn : NULL,
-	    d->seekfn ? cseekfn : NULL,
-	    NULL,
-	    d->closefn ? cclosefn : NULL);
-	if (fp != NULL)
-		return fp;
-	free(d);
-	return NULL;
- }
diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c
deleted file mode 100644
index a2619ac3d..000000000
--- a/lib/libc/stdio/fvwrite.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*	$NetBSD: fvwrite.c,v 1.25 2012/03/27 15:05:42 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fvwrite.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fvwrite.c,v 1.25 2012/03/27 15:05:42 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <stddef.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "reentrant.h"
-#include "local.h"
-#include "fvwrite.h"
-
-/*
- * Write some memory regions.  Return zero on success, EOF on error.
- *
- * This routine is large and unsightly, but most of the ugliness due
- * to the three different kinds of output buffering is handled here.
- */
-int
-__sfvwrite(FILE *fp, struct __suio *uio)
-{
-	size_t len;
-	char *p;
-	struct __siov *iov;
-	int s;
-	ssize_t w;
-	char *nl;
-	size_t nlknown, nldist;
-
-	_DIAGASSERT(fp != NULL);
-	_DIAGASSERT(uio != NULL);
-
-	if ((ssize_t)uio->uio_resid < 0) {
-		errno = EINVAL;
-		return EOF;
-	}
-	if (uio->uio_resid == 0)
-		return 0;
-	/* make sure we can write */
-	if (cantwrite(fp)) {
-		errno = EBADF;
-		return EOF;
-	}
-
-#define	MIN(a, b) ((a) < (b) ? (a) : (b))
-#define	COPY(n)	  (void)memcpy(fp->_p, p, (size_t)(n))
-
-	iov = uio->uio_iov;
-	p = iov->iov_base;
-	len = iov->iov_len;
-	iov++;
-#define GETIOV(extra_work) \
-	while (len == 0) { \
-		extra_work; \
-		p = iov->iov_base; \
-		len = iov->iov_len; \
-		iov++; \
-	}
-	if (fp->_flags & __SNBF) {
-		/*
-		 * Unbuffered: write up to BUFSIZ bytes at a time.
-		 */
-		do {
-			GETIOV(;);
-			w = (*fp->_write)(fp->_cookie, p, MIN(len, BUFSIZ));
-			if (w <= 0)
-				goto err;
-			p += w;
-			len -= w;
-		} while ((uio->uio_resid -= w) != 0);
-	} else if ((fp->_flags & __SLBF) == 0) {
-		/*
-		 * Fully buffered: fill partially full buffer, if any,
-		 * and then flush.  If there is no partial buffer, write
-		 * one _bf._size byte chunk directly (without copying).
-		 *
-		 * String output is a special case: write as many bytes
-		 * as fit, but pretend we wrote everything.  This makes
-		 * snprintf() return the number of bytes needed, rather
-		 * than the number used, and avoids its write function
-		 * (so that the write function can be invalid).
-		 */
-		do {
-			GETIOV(;);
-			if ((fp->_flags & (__SALC | __SSTR)) ==
-			    (__SALC | __SSTR) && (size_t)fp->_w < len) {
-				ptrdiff_t blen = fp->_p - fp->_bf._base;
-				unsigned char *_base;
-				int _size;
-
-				/* Allocate space exponentially. */
-				_size = fp->_bf._size;
-				do {
-					_size = (_size << 1) + 1;
-				} while ((size_t)_size < blen + len);
-				_base = realloc(fp->_bf._base,
-				    (size_t)(_size + 1));
-				if (_base == NULL)
-					goto err;
-				fp->_w += _size - fp->_bf._size;
-				fp->_bf._base = _base;
-				fp->_bf._size = _size;
-				fp->_p = _base + blen;
-			}
-			w = fp->_w;
-			if (fp->_flags & __SSTR) {
-				if (len < (size_t)w)
-					w = len;
-				COPY(w);	/* copy MIN(fp->_w,len), */
-				fp->_w -= (int)w;
-				fp->_p += w;
-				w = len;	/* but pretend copied all */
-			} else if (fp->_p > fp->_bf._base && len > (size_t)w) {
-				/* fill and flush */
-				COPY(w);
-				/* fp->_w -= w; */ /* unneeded */
-				fp->_p += w;
-				if (fflush(fp))
-					goto err;
-			} else if (len >= (size_t)(w = fp->_bf._size)) {
-				/* write directly */
-				w = (*fp->_write)(fp->_cookie, p, (size_t)w);
-				if (w <= 0)
-					goto err;
-			} else {
-				/* fill and done */
-				w = len;
-				COPY(w);
-				fp->_w -= (int)w;
-				fp->_p += w;
-			}
-			p += w;
-			len -= w;
-		} while ((uio->uio_resid -= w) != 0);
-	} else {
-		/*
-		 * Line buffered: like fully buffered, but we
-		 * must check for newlines.  Compute the distance
-		 * to the first newline (including the newline),
-		 * or `infinity' if there is none, then pretend
-		 * that the amount to write is MIN(len,nldist).
-		 */
-		nlknown = 0;
-		nldist = 0;	/* XXX just to keep gcc happy */
-		do {
-			GETIOV(nlknown = 0);
-			if (!nlknown) {
-				nl = memchr(p, '\n', len);
-				nldist = nl ? (size_t)(nl + 1 - p) : len + 1;
-				nlknown = 1;
-			}
-			s = (int)MIN(len, nldist);
-			w = fp->_w + fp->_bf._size;
-			if (fp->_p > fp->_bf._base && s > w) {
-				COPY(w);
-				/* fp->_w -= w; */
-				fp->_p += w;
-				if (fflush(fp))
-					goto err;
-			} else if (s >= (w = fp->_bf._size)) {
-				w = (*fp->_write)(fp->_cookie, p, (size_t)w);
-				if (w <= 0)
-				 	goto err;
-			} else {
-				w = s;
-				COPY(w);
-				fp->_w -= (int)w;
-				fp->_p += w;
-			}
-			if ((nldist -= w) == 0) {
-				/* copied the newline: flush and forget */
-				if (fflush(fp))
-					goto err;
-				nlknown = 0;
-			}
-			p += w;
-			len -= w;
-		} while ((uio->uio_resid -= w) != 0);
-	}
-	return 0;
-
-err:
-	fp->_flags |= __SERR;
-	return EOF;
-}
diff --git a/lib/libc/stdio/fvwrite.h b/lib/libc/stdio/fvwrite.h
deleted file mode 100644
index c3209b11a..000000000
--- a/lib/libc/stdio/fvwrite.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: fvwrite.h,v 1.8 2012/03/13 21:13:46 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)fvwrite.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * I/O descriptors for __sfvwrite().
- */
-struct __siov {
-	void	*iov_base;
-	size_t	iov_len;
-};
-struct __suio {
-	struct	__siov *uio_iov;
-	size_t	uio_iovcnt;
-	size_t	uio_resid;
-};
-
-extern int __sfvwrite(FILE *, struct __suio *);
diff --git a/lib/libc/stdio/fwalk.c b/lib/libc/stdio/fwalk.c
deleted file mode 100644
index d81de36be..000000000
--- a/lib/libc/stdio/fwalk.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: fwalk.c,v 1.12 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fwalk.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fwalk.c,v 1.12 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-#include "glue.h"
-
-int
-_fwalk(int (*function)(FILE *))
-{
-	FILE *fp;
-	int n, ret;
-	struct glue *g;
-
-	_DIAGASSERT(function != NULL);
-
-	ret = 0;
-	for (g = &__sglue; g != NULL; g = g->next)
-		for (fp = g->iobs, n = g->niobs; --n >= 0; fp++)
-			if (fp->_flags != 0)
-				ret |= (*function)(fp);
-	return ret;
-}
diff --git a/lib/libc/stdio/fwide.3 b/lib/libc/stdio/fwide.3
deleted file mode 100644
index 62bc368c1..000000000
--- a/lib/libc/stdio/fwide.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\"	$NetBSD: fwide.3,v 1.6 2003/09/08 17:54:32 wiz Exp $
-.\"
-.\" Copyright (c)2001 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $Citrus: xpg4dl/FreeBSD/lib/libc/stdio/fwide.3,v 1.2 2001/12/07 04:47:08 yamt Exp $
-.\"
-.Dd October 24, 2001
-.Dt FWIDE 3
-.Os
-.Sh NAME
-.Nm fwide
-.Nd get/set orientation of a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft int
-.Fn fwide "FILE *stream" "int mode"
-.Sh DESCRIPTION
-The
-.Fn fwide
-function
-determines the orientation of the stream pointed at by
-.Fa stream .
-.Pp
-If the orientation of
-.Fa stream
-has already been determined,
-.Fn fwide
-leaves it unchanged.
-Otherwise,
-.Fn fwide
-sets the orientation of
-.Fa stream
-according to
-.Fa mode .
-.Pp
-If
-.Fa mode
-is less than zero,
-.Fa stream
-is set to byte-oriented.
-If it is greater than zero,
-.Fa stream
-is set to wide-oriented.
-Otherwise,
-.Fa mode
-is zero, and
-.Fa stream
-is unchanged.
-.Sh RETURN VALUES
-.Fn fwide
-returns a value according to orientation after the call of
-.Fn fwide ;
-a value less than zero if byte-oriented, a value greater than zero
-if wide-oriented, and zero if the stream has no orientation.
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fgetc 3 ,
-.Xr fgetwc 3 ,
-.Xr fopen 3 ,
-.Xr fputc 3 ,
-.Xr fputwc 3 ,
-.Xr freopen 3 ,
-.Xr stdio 3
-.Sh STANDARDS
-The
-.Fn fwide
-function
-conforms to
-.St -isoC-99 .
diff --git a/lib/libc/stdio/fwide.c b/lib/libc/stdio/fwide.c
deleted file mode 100644
index daa6d1d1d..000000000
--- a/lib/libc/stdio/fwide.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* $NetBSD: fwide.c,v 1.3 2005/06/12 05:21:27 lukem Exp $ */
-
-/*-
- * Copyright (c)2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Citrus$
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fwide.c,v 1.3 2005/06/12 05:21:27 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <stdio.h>
-#include <wchar.h>
-#include "reentrant.h"
-#include "local.h"
-
-int
-fwide(FILE *fp, int mode)
-{
-	struct wchar_io_data *wcio;
-
-	_DIAGASSERT(fp != NULL);
-
-	/*
-	 * this implementation use only -1, 0, 1
-	 * for mode value.
-	 * (we don't need to do this, but
-	 *  this can make things simpler.)
-	 */
-	if (mode > 0)
-		mode = 1;
-	else if (mode < 0)
-		mode = -1;
-
-	FLOCKFILE(fp);
-	wcio = WCIO_GET(fp);
-	if (!wcio)
-		return 0; /* XXX */
-
-	if (wcio->wcio_mode == 0 && mode != 0)
-		wcio->wcio_mode = mode;
-	else
-		mode = wcio->wcio_mode;
-	FUNLOCKFILE(fp);
-
-	return mode;
-}
diff --git a/lib/libc/stdio/fwprintf.c b/lib/libc/stdio/fwprintf.c
deleted file mode 100644
index a9d792519..000000000
--- a/lib/libc/stdio/fwprintf.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: fwprintf.c,v 1.3 2013/04/19 15:22:25 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fwprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
-#else
-__RCSID("$NetBSD: fwprintf.c,v 1.3 2013/04/19 15:22:25 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-__weak_alias(fwprintf_l, _fwprintf_l)
-
-int
-fwprintf(FILE * __restrict fp, const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfwprintf(fp, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
-
-int
-fwprintf_l(FILE * __restrict fp, locale_t loc, const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfwprintf_l(fp, loc, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
diff --git a/lib/libc/stdio/fwrite.c b/lib/libc/stdio/fwrite.c
deleted file mode 100644
index 0004eb990..000000000
--- a/lib/libc/stdio/fwrite.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: fwrite.c,v 1.17 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fwrite.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fwrite.c,v 1.17 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-#include "fvwrite.h"
-
-/*
- * Write `count' objects (each size `size') from memory to the given file.
- * Return the number of whole objects written.
- */
-size_t
-fwrite(const void *buf, size_t size, size_t count, FILE *fp)
-{
-	size_t n;
-	struct __suio uio;
-	struct __siov iov;
-
-	_DIAGASSERT(fp != NULL);
-	/*
-	 * SUSv2 requires a return value of 0 for a count or a size of 0.
-	 */
-	if ((n = count * size) == 0)
-		return 0;
-	_DIAGASSERT(buf != NULL);
-
-	iov.iov_base = __UNCONST(buf);
-	uio.uio_resid = iov.iov_len = n;
-	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1;
-
-	/*
-	 * The usual case is success (__sfvwrite returns 0);
-	 * skip the divide if this happens, since divides are
-	 * generally slow and since this occurs whenever size==0.
-	 */
-	FLOCKFILE(fp);
-	if (__sfvwrite(fp, &uio) != 0)
-		count = ((n - uio.uio_resid) / size);
-	FUNLOCKFILE(fp);
-	return count;
-}
diff --git a/lib/libc/stdio/fwscanf.c b/lib/libc/stdio/fwscanf.c
deleted file mode 100644
index 6d3cd9447..000000000
--- a/lib/libc/stdio/fwscanf.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: fwscanf.c,v 1.3 2013/04/19 23:32:17 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fwscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
-#else
-__RCSID("$NetBSD: fwscanf.c,v 1.3 2013/04/19 23:32:17 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-__weak_alias(fwscanf_l, _fwscanf_l)
-
-int
-fwscanf(FILE * __restrict fp, const wchar_t * __restrict fmt, ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vfwscanf(fp, fmt, ap);
-	va_end(ap);
-
-	return r;
-}
-
-int
-fwscanf_l(FILE * __restrict fp, locale_t loc, const wchar_t * __restrict fmt,
-    ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vfwscanf_l(fp, loc, fmt, ap);
-	va_end(ap);
-
-	return r;
-}
diff --git a/lib/libc/stdio/getc.3 b/lib/libc/stdio/getc.3
deleted file mode 100644
index e07074459..000000000
--- a/lib/libc/stdio/getc.3
+++ /dev/null
@@ -1,170 +0,0 @@
-.\"	$NetBSD: getc.3,v 1.12 2003/08/07 16:43:26 agc Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)getc.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 25, 2001
-.Dt GETC 3
-.Os
-.Sh NAME
-.Nm fgetc ,
-.Nm getc ,
-.Nm getchar ,
-.Nm getc_unlocked ,
-.Nm getchar_unlocked ,
-.Nm getw
-.Nd get next character or word from input stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn fgetc "FILE *stream"
-.Ft int
-.Fn getc "FILE *stream"
-.Ft int
-.Fn getchar
-.Ft int
-.Fn getc_unlocked "FILE *stream"
-.Ft int
-.Fn getchar_unlocked
-.Ft int
-.Fn getw "FILE *stream"
-.Sh DESCRIPTION
-The
-.Fn fgetc
-function
-obtains the next input character (if present) from the stream pointed at by
-.Fa stream ,
-or the next character pushed back on the stream via
-.Xr ungetc 3 .
-.Pp
-The
-.Fn getc
-function
-acts essentially identically to
-.Fn fgetc ,
-but is a macro that expands in-line.
-.Pp
-The
-.Fn getchar
-function
-is equivalent to:
-getc with the argument stdin.
-.Pp
-The
-.Fn getc_unlocked
-and
-.Fn getchar_unlocked
-functions provide functionality identical to that of
-.Fn getc
-and
-.Fn getchar ,
-respectively, but do not perform implicit locking of the streams they
-operate on.
-In multi-threaded programs they may be used
-.Em only
-within a scope in which the stream
-has been successfully locked by the calling thread using either
-.Xr flockfile 3
-or
-.Xr ftrylockfile 3 ,
-and may later be released using
-.Xr funlockfile 3 .
-.Pp
-The
-.Fn getw
-function
-obtains the next
-.Em int
-(if present)
-from the stream pointed at by
-.Fa stream .
-.Sh RETURN VALUES
-If successful, these routines return the next requested object
-from the
-.Fa stream .
-If the stream is at end-of-file or a read error occurs,
-the routines return
-.Dv EOF .
-The routines
-.Xr feof 3
-and
-.Xr ferror 3
-must be used to distinguish between end-of-file and error.
-If an error occurs, the global variable
-.Va errno
-is set to indicate the error.
-The end-of-file condition is remembered, even on a terminal, and all
-subsequent attempts to read will return
-.Dv EOF
-until the condition is cleared with
-.Xr clearerr 3 .
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr flockfile 3 ,
-.Xr fopen 3 ,
-.Xr fread 3 ,
-.Xr ftrylockfile 3 ,
-.Xr funlockfile 3 ,
-.Xr putc 3 ,
-.Xr ungetc 3
-.Sh STANDARDS
-The
-.Fn fgetc ,
-.Fn getc
-and
-.Fn getchar
-functions
-conform to
-.St -ansiC .
-The
-.Fn getc_unlocked
-and
-.Fn getchar_unlocked
-functions conform to
-.St -p1003.1-96 .
-.Sh BUGS
-Since
-.Dv EOF
-is a valid integer value,
-.Xr feof 3
-and
-.Xr ferror 3
-must be used to check for failure after calling
-.Fn getw .
-The size and byte order of an
-.Em int
-varies from one machine to another, and
-.Fn getw
-is not recommended for portable applications.
diff --git a/lib/libc/stdio/getc.c b/lib/libc/stdio/getc.c
deleted file mode 100644
index 7a487f332..000000000
--- a/lib/libc/stdio/getc.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: getc.c,v 1.12 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getc.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getc.c,v 1.12 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * A subroutine version of the macro getc.
- */
-#undef getc
-#undef getc_unlocked
-
-int
-getc(FILE *fp)
-{
-	int r;
-
-	_DIAGASSERT(fp != NULL);
-
-	FLOCKFILE(fp);
-	r = __sgetc(fp);
-	FUNLOCKFILE(fp);
-	return r;
-}
-
-int
-getc_unlocked(FILE *fp)
-{
-
-	_DIAGASSERT(fp != NULL);
-
-	return __sgetc(fp);
-}
diff --git a/lib/libc/stdio/getchar.c b/lib/libc/stdio/getchar.c
deleted file mode 100644
index bd692d141..000000000
--- a/lib/libc/stdio/getchar.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: getchar.c,v 1.10 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getchar.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getchar.c,v 1.10 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * A subroutine version of the macro getchar.
- */
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-#undef getchar
-#undef getchar_unlocked
-
-int
-getchar(void)
-{
-	FILE *fp = stdin;
-	int r;
-
-        FLOCKFILE(fp);
-        r = __sgetc(fp);
-        FUNLOCKFILE(fp);
-        return r;
-}
-
-int
-getchar_unlocked(void)
-{
-	return __sgetc(stdin);
-}
diff --git a/lib/libc/stdio/getdelim.3 b/lib/libc/stdio/getdelim.3
deleted file mode 100644
index 12e11069e..000000000
--- a/lib/libc/stdio/getdelim.3
+++ /dev/null
@@ -1,169 +0,0 @@
-.\"     $NetBSD: getdelim.3,v 1.14 2014/09/16 08:52:02 wiz Exp $
-.\"
-.\" Copyright (c) 2009 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Roy Marples.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 15, 2014
-.Dt GETDELIM 3
-.Os
-.Sh NAME
-.Nm getdelim ,
-.Nm getline
-.Nd read a delimited record from a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft ssize_t
-.Fn getdelim "char ** restrict lineptr" "size_t * restrict n" "int delimiter" "FILE * restrict stream"
-.Ft ssize_t
-.Fn getline "char ** restrict lineptr" "size_t * restrict n" "FILE * restrict stream"
-.Sh DESCRIPTION
-The
-.Fn getdelim
-function reads from the
-.Fa stream
-until it encounters a character matching
-.Fa delimiter
-or
-.Dv EOF ,
-storing the input in
-.Fa *lineptr .
-The buffer is
-.Dv NUL Ns No -terminated
-and includes the delimiter, if one was found.
-The
-.Fa delimiter
-character must be representable as an unsigned char.
-.Pp
-If
-.Fa *n
-is non-zero, then
-.Fa *lineptr
-must be pre-allocated to at least
-.Fa *n
-bytes.
-The buffer should be allocated dynamically;
-it must be possible to
-.Xr free 3
-.Fa *lineptr .
-.Fn getdelim
-ensures that
-.Fa *lineptr
-is large enough to hold the input, updating
-.Fa *n
-to reflect the new size.
-.Pp
-The
-.Fn getline
-function is equivalent to
-.Fn getdelim
-with
-.Fa delimiter
-set to the newline character.
-.Sh RETURN VALUES
-The
-.Fn getdelim
-and
-.Fn getline
-functions return the number of characters read, including the delimiter if
-one was found.
-If no characters were read and the stream is at end-of-file, the functions
-return \-1.
-If an error occurs, the functions return \-1 and the global variable
-.Va errno
-is set to indicate the error.
-.Pp
-The functions do not distinguish between end-of-file and error,
-and callers must use
-.Xr feof 3
-and
-.Xr ferror 3
-to determine which occurred.
-.Sh EXAMPLES
-The following code fragment reads lines from a file and writes them to
-standard output.
-.Bd -literal -offset indent
-char *line = NULL;
-size_t linesize = 0;
-ssize_t linelen;
-
-while ((linelen = getline(\*[Am]line, \*[Am]linesize, fp)) != -1)
-	fwrite(line, linelen, 1, stdout);
-
-if (ferror(fp))
-	perror("getline");
-.Ed
-.Sh ERRORS
-.Bl -tag -width [EOVERFLOW]
-.It Bq Er EINVAL
-.Fa lineptr
-or
-.Fa n
-is a
-.Dv NULL
-pointer.
-.It Bq Er EOVERFLOW
-More than SSIZE_MAX characters were read without encountering the delimiter.
-.El
-.Pp
-The
-.Fn getdelim
-and
-.Fn getline
-functions may also fail and set
-.Va errno
-for any of the errors specified in the routines
-.Xr fflush 3 ,
-.Xr malloc 3 ,
-.Xr read 2 ,
-.Xr stat 2 ,
-or
-.Xr realloc 3 .
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fgets 3 ,
-.Xr fopen 3 ,
-.Xr strlen 3
-.Sh STANDARDS
-The
-.Fn getdelim
-and
-.Fn getline
-functions conform to
-.St -p1003.1-2008 .
-.Sh NOTES
-The
-.Fn getdelim
-and
-.Fn getline
-functions can return results that include
-.Dv NUL
-characters, which can cause the apparent length reported by
-.Xr strlen 3
-to be less than the true length reported by the
-return values of the functions.
diff --git a/lib/libc/stdio/getdelim.c b/lib/libc/stdio/getdelim.c
deleted file mode 100644
index acce3764b..000000000
--- a/lib/libc/stdio/getdelim.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* $NetBSD: getdelim.c,v 1.13 2011/07/22 23:12:30 joerg Exp $ */
-
-/*
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Roy Marples.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: getdelim.c,v 1.13 2011/07/22 23:12:30 joerg Exp $");
-
-#include "namespace.h"
-
-#include <sys/param.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "reentrant.h"
-#include "local.h"
-
-#ifdef __weak_alias
-__weak_alias(getdelim, _getdelim)
-#endif
-
-/* Minimum buffer size we create.
- * This should allow config files to fit into our power of 2 buffer growth
- * without the need for a realloc. */
-#define MINBUF	128
-
-ssize_t
-__getdelim(char **__restrict buf, size_t *__restrict buflen,
-    int sep, FILE *__restrict fp)
-{
-	unsigned char *p;
-	size_t len, newlen, off;
-	char *newb;
-
-	_DIAGASSERT(fp != NULL);
-
-	if (buf == NULL || buflen == NULL) {
-		errno = EINVAL;
-		goto error;
-	}
-
-	/* If buf is NULL, we have to assume a size of zero */
-	if (*buf == NULL)
-		*buflen = 0;
-
-	_SET_ORIENTATION(fp, -1);
-	off = 0;
-	do {
-		/* If the input buffer is empty, refill it */
-		if (fp->_r <= 0 && __srefill(fp)) {
-			if (__sferror(fp))
-				goto error;
-			/* No error, so EOF. */
-			break;
-		}
-
-		/* Scan through looking for the separator */
-		p = memchr(fp->_p, sep, (size_t)fp->_r);
-		if (p == NULL)
-			len = fp->_r;
-		else
-			len = (p - fp->_p) + 1;
-
-		newlen = off + len;
-		/* Ensure we can handle it */
-		if (newlen < off || newlen > SSIZE_MAX) {
-			errno = EOVERFLOW;
-			goto error;
-		}
-		newlen++; /* reserve space for the NULL terminator */
-		if (newlen > *buflen) {
-			if (newlen < MINBUF)
-				newlen = MINBUF;
-			if (!powerof2(newlen)) {
-				/* Grow the buffer to the next power of 2 */
-				newlen--;
-				newlen |= newlen >> 1;
-				newlen |= newlen >> 2;
-				newlen |= newlen >> 4;
-				newlen |= newlen >> 8;
-				newlen |= newlen >> 16;
-#if SIZE_T_MAX > 0xffffffffU
-				newlen |= newlen >> 32;
-#endif
-				newlen++;
-			}
-
-			newb = realloc(*buf, newlen);
-			if (newb == NULL)
-				goto error;
-			*buf = newb;
-			*buflen = newlen;
-		}
-
-		(void)memcpy((*buf + off), fp->_p, len);
-		/* Safe, len is never greater than what fp->_r can fit. */
-		fp->_r -= (int)len;
-		fp->_p += (int)len;
-		off += len;
-	} while (p == NULL);
-
-	/* POSIX demands we return -1 on EOF. */
-	if (off == 0) 
-		return -1;
-
-	if (*buf != NULL)
-		*(*buf + off) = '\0';
-	return off;
-
-error:
-	fp->_flags |= __SERR;
-	return -1;
-}
-
-ssize_t
-getdelim(char **__restrict buf, size_t *__restrict buflen,
-    int sep, FILE *__restrict fp)
-{
-	ssize_t n;
-
-	FLOCKFILE(fp);
-	n = __getdelim(buf, buflen, sep, fp);
-	FUNLOCKFILE(fp);
-	return n;
-}
diff --git a/lib/libc/stdio/getline.c b/lib/libc/stdio/getline.c
deleted file mode 100644
index e5d4bab26..000000000
--- a/lib/libc/stdio/getline.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: getline.c,v 1.3 2009/12/02 08:46:33 roy Exp $ */
-
-/*
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Roy Marples.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: getline.c,v 1.3 2009/12/02 08:46:33 roy Exp $");
-
-#include "namespace.h"
-
-#include <stdio.h>
-
-#ifdef __weak_alias
-__weak_alias(getline, _getline)
-#endif
-
-ssize_t
-getline(char **__restrict buf, size_t *__restrict buflen, FILE *__restrict fp)
-{
-	return getdelim(buf, buflen, '\n', fp);
-}
diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c
deleted file mode 100644
index d382745e6..000000000
--- a/lib/libc/stdio/gets.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*	$NetBSD: gets.c,v 1.18 2013/10/04 20:49:16 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)gets.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: gets.c,v 1.18 2013/10/04 20:49:16 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-#ifdef _FORTIFY_SOURCE
-#undef gets
-#endif
-
-__warn_references(gets, "warning: this program uses gets(), which is unsafe.")
-
-char *
-__gets(char *buf)
-{
-	int c;
-	char *s;
-
-	_DIAGASSERT(buf != NULL);
-
-	FLOCKFILE(stdin);
-	for (s = buf; (c = getchar_unlocked()) != '\n'; ) {
-		if (c == EOF) {
-			if (s == buf) {
-				FUNLOCKFILE(stdin);
-				return NULL;
-			} else {
-				break;
-			}
-		} else {
-			*s++ = c;
-		}
-	}
-	*s = 0;
-	FUNLOCKFILE(stdin);
-	return buf;
-}
-
-char *
-gets(char *buf) {
-	return __gets(buf);
-}
diff --git a/lib/libc/stdio/gettemp.c b/lib/libc/stdio/gettemp.c
deleted file mode 100644
index c4dbfb900..000000000
--- a/lib/libc/stdio/gettemp.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*	$NetBSD: gettemp.c,v 1.20 2015/02/05 16:05:20 christos Exp $	*/
-
-/*
- * Copyright (c) 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.
- * 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 "gettemp.h"
-
-#if !HAVE_NBTOOL_CONFIG_H || !HAVE_MKSTEMP || !HAVE_MKDTEMP
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: gettemp.c,v 1.20 2015/02/05 16:05:20 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <fcntl.h>
-#include <string.h>
-
-static const unsigned char padchar[] =
-"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-int
-GETTEMP(char *path, int *doopen, int domkdir, int slen, int oflags)
-{
-	char *start, *trv, *suffp, *carryp;
-	char *pad;
-	struct stat sbuf;
-	int rval;
-	uint32_t r;
-	char carrybuf[MAXPATHLEN];
-
-	_DIAGASSERT(path != NULL);
-	/* doopen may be NULL */
-	if ((doopen != NULL && domkdir) || slen < 0 ||
-	    (oflags & ~(O_APPEND | O_DIRECT | O_SHLOCK | O_EXLOCK | O_SYNC |
-	    O_CLOEXEC)) != 0) {
-		errno = EINVAL;
-		return 0;
-	}
-
-	for (trv = path; *trv != '\0'; ++trv)
-		continue;
-
-	if (trv - path >= MAXPATHLEN) {
-		errno = ENAMETOOLONG;
-		return 0;
-	}
-	trv -= slen;
-	suffp = trv;
-	--trv;
-	if (trv < path || NULL != strchr(suffp, '/')) {
-		errno = EINVAL;
-		return 0;
-	}
-
-	/* Fill space with random characters */
-	while (trv >= path && *trv == 'X') {
-		r = arc4random_uniform((unsigned int)(sizeof(padchar) - 1));
-		*trv-- = padchar[r];
-	}
-	start = trv + 1;
-
-	/* save first combination of random characters */
-	memcpy(carrybuf, start, (size_t)(suffp - start));
-
-	/*
-	 * check the target directory.
-	 */
-	if (doopen != NULL || domkdir) {
-		for (; trv > path; --trv) {
-			if (*trv == '/') {
-				*trv = '\0';
-				rval = stat(path, &sbuf);
-				*trv = '/';
-				if (rval != 0)
-					return 0;
-				if (!S_ISDIR(sbuf.st_mode)) {
-					errno = ENOTDIR;
-					return 0;
-				}
-				break;
-			}
-		}
-	}
-
-	for (;;) {
-		if (doopen) {
-			if ((*doopen = open(path, O_CREAT|O_EXCL|O_RDWR|oflags,
-			    0600)) != -1)
-				return 1;
-			if (errno != EEXIST)
-				return 0;
-		} else if (domkdir) {
-			if (mkdir(path, 0700) != -1)
-				return 1;
-			if (errno != EEXIST)
-				return 0;
-		} else if (lstat(path, &sbuf))
-			return errno == ENOENT;
-
-		/*
-		 * If we have a collision,
-		 * cycle through the space of filenames
-		 */
-		for (trv = start, carryp = carrybuf;;) {
-			/* have we tried all possible permutations? */
-			if (trv == suffp)
-				return 0; /* yes - exit with EEXIST */
-			pad = strchr((const char *)padchar, *trv);
-			if (pad == NULL) {
-				/* this should never happen */
-				errno = EIO;
-				return 0;
-			}
-			/* increment character */
-			*trv = (*++pad == '\0') ? padchar[0] : *pad;
-			/* carry to next position? */
-			if (*trv == *carryp) {
-				/* increment position and loop */
-				++trv;
-				++carryp;
-			} else {
-				/* try with new name */
-				break;
-			}
-		}
-	}
-	/*NOTREACHED*/
-}
-
-#endif /* !HAVE_NBTOOL_CONFIG_H || !HAVE_MKSTEMP || !HAVE_MKDTEMP */
diff --git a/lib/libc/stdio/gettemp.h b/lib/libc/stdio/gettemp.h
deleted file mode 100644
index e89163316..000000000
--- a/lib/libc/stdio/gettemp.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _GETTEMP_H_
-#define _GETTEMP_H_
-
-#include "namespace.h"
-
-#if HAVE_NBTOOL_CONFIG_H
-# include "nbtool_config.h"
-# define	GETTEMP		__nbcompat_gettemp
-#else
-# include <assert.h>
-# include <errno.h>
-# include <stdio.h>
-# include <stdlib.h>
-# include <unistd.h>
-# include "reentrant.h"
-# define	GETTEMP		__gettemp
-#endif
-
-__BEGIN_DECLS
-int     GETTEMP(char *, int *, int, int, int);
-__END_DECLS
-
-#endif /* _GETTEMP_H_ */
diff --git a/lib/libc/stdio/getw.c b/lib/libc/stdio/getw.c
deleted file mode 100644
index 29ef059de..000000000
--- a/lib/libc/stdio/getw.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: getw.c,v 1.10 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getw.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getw.c,v 1.10 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-
-int
-getw(FILE *fp)
-{
-	int x;
-
-	_DIAGASSERT(fp != NULL);
-
-	return fread((void *)&x, sizeof(x), 1, fp) == 1 ? x : EOF;
-}
diff --git a/lib/libc/stdio/getwc.3 b/lib/libc/stdio/getwc.3
deleted file mode 100644
index f8e7dd1f1..000000000
--- a/lib/libc/stdio/getwc.3
+++ /dev/null
@@ -1,114 +0,0 @@
-.\"	$NetBSD: getwc.3,v 1.9 2010/12/16 17:42:27 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)getc.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd May 6, 2010
-.Dt GETWC 3
-.Os
-.Sh NAME
-.Nm fgetwc ,
-.Nm getwc ,
-.Nm getwchar ,
-.Nd get next wide character from input stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft wint_t
-.Fn fgetwc "FILE *stream"
-.Ft wint_t
-.Fn getwc "FILE *stream"
-.Ft wint_t
-.Fn getwchar
-.Sh DESCRIPTION
-The
-.Fn fgetwc
-function
-obtains the next input wide character (if present) from the stream pointed at by
-.Fa stream ,
-or the next character pushed back on the stream via
-.Xr ungetwc 3 .
-.Pp
-The
-.Fn getwc
-function
-acts essentially identically to
-.Fn fgetwc ,
-but is a macro that expands in-line.
-.Pp
-The
-.Fn getwchar
-function
-is equivalent to
-.Fn getwc
-with the argument stdin.
-.Sh RETURN VALUES
-If successful, these routines return the next wide character
-from the
-.Fa stream .
-If the stream is at end-of-file or a read error occurs,
-the routines return
-.Dv WEOF .
-The routines
-.Xr feof 3
-and
-.Xr ferror 3
-must be used to distinguish between end-of-file and error.
-If an error occurs, the global variable
-.Va errno
-is set to indicate the error.
-The end-of-file condition is remembered, even on a terminal, and all
-subsequent attempts to read will return
-.Dv WEOF
-until the condition is cleared with
-.Xr clearerr 3 .
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fopen 3 ,
-.Xr fread 3 ,
-.Xr putwc 3 ,
-.Xr stdio 3 ,
-.Xr ungetwc 3
-.Sh STANDARDS
-The
-.Fn fgetwc ,
-.Fn getwc
-and
-.Fn getwchar
-functions
-conform to
-.St -isoC-99
-and
-.St -p1003.1-2001 .
diff --git a/lib/libc/stdio/getwc.c b/lib/libc/stdio/getwc.c
deleted file mode 100644
index 9557a6ce0..000000000
--- a/lib/libc/stdio/getwc.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $NetBSD: getwc.c,v 1.3 2005/06/12 05:21:27 lukem Exp $ */
-
-/*-
- * Copyright (c)2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Citrus$
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getwc.c,v 1.3 2005/06/12 05:21:27 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdio.h>
-#include <wchar.h>
-
-/*
- * A subroutine version of the macro getwc.
- */
-#undef getwc
-
-wint_t
-getwc(FILE *fp)
-{
-
-	return fgetwc(fp);
-}
diff --git a/lib/libc/stdio/getwchar.c b/lib/libc/stdio/getwchar.c
deleted file mode 100644
index 4ba38b42d..000000000
--- a/lib/libc/stdio/getwchar.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $NetBSD: getwchar.c,v 1.4 2012/03/15 18:22:30 christos Exp $ */
-
-/*-
- * Copyright (c)2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Citrus$
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getwchar.c,v 1.4 2012/03/15 18:22:30 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdio.h>
-#include <wchar.h>
-
-/*
- * A subroutine version of the macro getwchar.
- */
-#undef getwchar
-
-wint_t
-getwchar(void)
-{
-
-	return fgetwc(stdin);
-}
diff --git a/lib/libc/stdio/glue.h b/lib/libc/stdio/glue.h
deleted file mode 100644
index c0c85a57d..000000000
--- a/lib/libc/stdio/glue.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: glue.h,v 1.5 2003/08/07 16:43:27 agc Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)glue.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * The first few FILEs are statically allocated; others are dynamically
- * allocated and linked in via this glue structure.
- */
-struct glue {
-	struct	glue *next;
-	int	niobs;
-	FILE	*iobs;
-};
-
-extern struct glue __sglue;
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
deleted file mode 100644
index 726e86b29..000000000
--- a/lib/libc/stdio/local.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*	$NetBSD: local.h,v 1.38 2014/06/18 17:47:58 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)local.h	8.3 (Berkeley) 7/3/94
- */
-
-#include "wcio.h"
-#include "fileext.h"
-
-#include <limits.h>
-#include <stdarg.h>
-#include <stdbool.h>
-
-/*
- * Information local to this implementation of stdio,
- * in particular, macros and private variables.
- */
-
-extern int	__sflush(FILE *);
-extern FILE	*__sfp(void);
-extern void	__sfpinit(FILE *);
-extern int	__srefill(FILE *);
-extern ssize_t	__sread(void *, void *, size_t);
-extern ssize_t	__swrite(void *, const void *, size_t);
-extern off_t	__sseek(void *, off_t, int);
-extern int	__sclose(void *);
-extern void	__sinit(void);
-extern void	_cleanup(void);
-extern void	(*__cleanup)(void);
-extern void	__smakebuf(FILE *);
-extern int	__swhatbuf(FILE *, size_t *, int *);
-extern int	_fwalk(int (*)(FILE *));
-extern char    *_mktemp(char *);
-extern int	__swsetup(FILE *);
-extern int	__sflags(const char *, int *);
-extern int	__svfscanf(FILE * __restrict, const char * __restrict,
-    va_list) __scanflike(2, 0);
-extern int	__svfscanf_l(FILE * __restrict, locale_t,
-    const char * __restrict, va_list) __scanflike(3, 0);
-extern int	__svfscanf_unlocked_l(FILE * __restrict, locale_t,
-    const char * __restrict, va_list) __scanflike(3, 0);
-extern int	__vfprintf_unlocked_l(FILE * __restrict, locale_t,
-    const char * __restrict, va_list) __printflike(3, 0);
-
-
-extern int	__sdidinit;
-
-extern wint_t	__fgetwc_unlock(FILE *);
-extern wint_t	__fputwc_unlock(wchar_t, FILE *);
-
-extern ssize_t	__getdelim(char **__restrict, size_t *__restrict, int,
-    FILE *__restrict);
-extern char	*__fgetstr(FILE * __restrict, size_t * __restrict, int);
-extern int 	 __vfwprintf_unlocked_l(FILE *, locale_t, const wchar_t *, va_list);
-extern int	 __vfwscanf_unlocked_l(FILE * __restrict, locale_t,
-    const wchar_t * __restrict, va_list);
-
-/*
- * Return true iff the given FILE cannot be written now.
- */
-#define	cantwrite(fp) \
-	((((fp)->_flags & __SWR) == 0 || (fp)->_bf._base == NULL) && \
-	 __swsetup(fp))
-
-/*
- * Test whether the given stdio file has an active ungetc buffer;
- * release such a buffer, without restoring ordinary unread data.
- */
-#define	HASUB(fp) (_UB(fp)._base != NULL)
-#define	FREEUB(fp) { \
-	if (_UB(fp)._base != (fp)->_ubuf) \
-		free((char *)_UB(fp)._base); \
-	_UB(fp)._base = NULL; \
-}
-
-/*
- * test for an fgetln() buffer.
- */
-#define	FREELB(fp) { \
-	free(_EXT(fp)->_fgetstr_buf); \
-	_EXT(fp)->_fgetstr_buf = NULL; \
-	_EXT(fp)->_fgetstr_len = 0; \
-}
-
-extern void __flockfile_internal(FILE *, int);
-extern void __funlockfile_internal(FILE *, int);
-
-extern char *__gets(char *);
-
-/*
- * Detect if the current file position fits in a long int.
- */
-
-static __inline bool
-__long_overflow(off_t pos)
-{
-	return (pos < LONG_MIN) || (pos > LONG_MAX);
-}
diff --git a/lib/libc/stdio/makebuf.c b/lib/libc/stdio/makebuf.c
deleted file mode 100644
index 1eb84a174..000000000
--- a/lib/libc/stdio/makebuf.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*	$NetBSD: makebuf.c,v 1.18 2015/07/15 19:08:43 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)makebuf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: makebuf.c,v 1.18 2015/07/15 19:08:43 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <inttypes.h>
-#include <ctype.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * Override the file buffering based on the environment setting STDBUF%d
- * (for the specific file descriptor) and STDBUF (for all descriptors).
- * the setting is ULB<num> standing for "Unbuffered", "Linebuffered",
- * and Fullybuffered", and <num> is a value from 0 to 1M.
- */
-static int
-__senvbuf(FILE *fp, size_t *size, int *couldbetty)
-{
-	char evb[64], *evp;
-	int flags, e;
-	intmax_t s;
-
-	flags = 0;
-	if (snprintf(evb, sizeof(evb), "STDBUF%d", fp->_file) < 0)
-		return flags;
-
-	if ((evp = getenv(evb)) == NULL && (evp = getenv("STDBUF")) == NULL)
-		return flags;
-
-	switch (*evp) {
-	case 'u':
-	case 'U':
-		evp++;
-		flags |= __SNBF;
-		break;
-	case 'l':
-	case 'L':
-		evp++;
-		flags |= __SLBF;
-		break;
-	case 'f':
-	case 'F':
-		evp++;
-		*couldbetty = 0;
-		break;
-	}
-
-	if (!isdigit((unsigned char)*evp))
-		return flags;
-
-	s = strtoi(evp, NULL, 0, 0, 1024 * 1024, &e);
-	if (e != 0)
-		return flags;
-
-	*size = (size_t)s;
-	if (*size == 0)
-		return __SNBF;
-
-	return flags;
-}
-
-/*
- * Allocate a file buffer, or switch to unbuffered I/O.
- * Per the ANSI C standard, ALL tty devices default to line buffered.
- *
- * As a side effect, we set __SOPT or __SNPT (en/dis-able fseek
- * optimisation) right after the fstat() that finds the buffer size.
- */
-void
-__smakebuf(FILE *fp)
-{
-	void *p;
-	int flags;
-	size_t size;
-	int couldbetty;
-
-	_DIAGASSERT(fp != NULL);
-
-	if (fp->_flags & __SNBF)
-		goto unbuf;
-
-	flags = __swhatbuf(fp, &size, &couldbetty);
-
-	if ((fp->_flags & (__SLBF|__SNBF|__SMBF)) == 0
-	    && fp->_cookie == fp && fp->_file >= 0) {
-		flags |= __senvbuf(fp, &size, &couldbetty);
-		if (flags & __SNBF)
-			goto unbuf;
-	}
-
-	if ((p = malloc(size)) == NULL)
-		goto unbuf;
-
-	__cleanup = _cleanup;
-	flags |= __SMBF;
-	fp->_bf._base = fp->_p = p;
-	_DIAGASSERT(__type_fit(int, size));
-	fp->_bf._size = (int)size;
-	if (couldbetty && isatty(__sfileno(fp)))
-		flags |= __SLBF;
-	fp->_flags |= flags;
-	return;
-unbuf:
-	fp->_flags |= __SNBF;
-	fp->_bf._base = fp->_p = fp->_nbuf;
-	fp->_bf._size = 1;
-}
-
-/*
- * Internal routine to determine `proper' buffering for a file.
- */
-int
-__swhatbuf(FILE *fp, size_t *bufsize, int *couldbetty)
-{
-	struct stat st;
-
-	_DIAGASSERT(fp != NULL);
-	_DIAGASSERT(bufsize != NULL);
-	_DIAGASSERT(couldbetty != NULL);
-
-	if (__sfileno(fp) == -1 || fstat(__sfileno(fp), &st) < 0) {
-		*couldbetty = 0;
-		*bufsize = BUFSIZ;
-		return __SNPT;
-	}
-
-	/* could be a tty iff it is a character device */
-	*couldbetty = S_ISCHR(st.st_mode);
-	if (st.st_blksize == 0) {
-		*bufsize = BUFSIZ;
-		return __SNPT;
-	}
-
-	/*
-	 * Optimise fseek() only if it is a regular file.  (The test for
-	 * __sseek is mainly paranoia.)  It is safe to set _blksize
-	 * unconditionally; it will only be used if __SOPT is also set.
-	 */
-	*bufsize = st.st_blksize;
-	fp->_blksize = st.st_blksize;
-	return (st.st_mode & S_IFMT) == S_IFREG && fp->_seek == __sseek ?
-	    __SOPT : __SNPT;
-}
diff --git a/lib/libc/stdio/mkdtemp.c b/lib/libc/stdio/mkdtemp.c
deleted file mode 100644
index bd330fe69..000000000
--- a/lib/libc/stdio/mkdtemp.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: mkdtemp.c,v 1.12 2014/06/18 17:47:58 christos Exp $	*/
-
-/*
- * Copyright (c) 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.
- * 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 "gettemp.h"
-
-#if !HAVE_NBTOOL_CONFIG_H || !HAVE_MKDTEMP
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: mkdtemp.c,v 1.12 2014/06/18 17:47:58 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-char *
-mkdtemp(char *path)
-{
-	_DIAGASSERT(path != NULL);
-
-	return GETTEMP(path, NULL, 1, 0, 0) ? path : NULL;
-}
-
-#endif /* !HAVE_NBTOOL_CONFIG_H || !HAVE_MKDTEMP */
diff --git a/lib/libc/stdio/mkostemp.c b/lib/libc/stdio/mkostemp.c
deleted file mode 100644
index fd6359f70..000000000
--- a/lib/libc/stdio/mkostemp.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: mkostemp.c,v 1.1 2014/06/18 17:47:58 christos Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include "gettemp.h"
-
-int
-mkostemp(char *path, int oflags)
-{
-	int fd;
-
-	return GETTEMP(path, &fd, 0, 0, oflags) ? fd : -1;
-}
diff --git a/lib/libc/stdio/mkostemps.c b/lib/libc/stdio/mkostemps.c
deleted file mode 100644
index fbb0d1c57..000000000
--- a/lib/libc/stdio/mkostemps.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: mkostemps.c,v 1.1 2014/06/18 17:47:58 christos Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include "gettemp.h"
-
-int
-mkostemps(char *path, int slen, int oflags)
-{
-	int fd;
-
-	return GETTEMP(path, &fd, 0, slen, oflags) ? fd : -1;
-}
diff --git a/lib/libc/stdio/mkstemp.c b/lib/libc/stdio/mkstemp.c
deleted file mode 100644
index ad09553f3..000000000
--- a/lib/libc/stdio/mkstemp.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: mkstemp.c,v 1.12 2014/06/18 17:47:58 christos Exp $	*/
-
-/*
- * Copyright (c) 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.
- * 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 "gettemp.h"
-
-#if !HAVE_NBTOOL_CONFIG_H || !HAVE_MKSTEMP
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: mkstemp.c,v 1.12 2014/06/18 17:47:58 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __weak_alias
-__weak_alias(mkstemp,_mkstemp)
-#endif
-
-int
-mkstemp(char *path)
-{
-	int fd;
-
-	_DIAGASSERT(path != NULL);
-
-	return GETTEMP(path, &fd, 0, 0, 0) ? fd : -1;
-}
-
-#endif /* !HAVE_NBTOOL_CONFIG_H || !HAVE_MKSTEMP */
diff --git a/lib/libc/stdio/mkstemps.c b/lib/libc/stdio/mkstemps.c
deleted file mode 100644
index a351bce55..000000000
--- a/lib/libc/stdio/mkstemps.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: mkstemps.c,v 1.1 2014/06/18 17:47:58 christos Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include "gettemp.h"
-
-int
-mkstemps(char *path, int slen)
-{
-	int fd;
-
-	return GETTEMP(path, &fd, 0, slen, 0) ? fd : -1;
-}
diff --git a/lib/libc/stdio/mktemp.3 b/lib/libc/stdio/mktemp.3
deleted file mode 100644
index 076348a7b..000000000
--- a/lib/libc/stdio/mktemp.3
+++ /dev/null
@@ -1,397 +0,0 @@
-.\"	$NetBSD: mktemp.3,v 1.30 2014/06/19 09:30:33 wiz Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"     @(#)mktemp.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 18, 2014
-.Dt MKTEMP 3
-.Os
-.Sh NAME
-.Nm mktemp ,
-.Nm mkstemp ,
-.Nm mkstemps ,
-.Nm mkostemp ,
-.Nm mkostemps ,
-.Nm mkdtemp
-.Nd make unique temporary file or directory name
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft char *
-.Fn mktemp "char *template"
-.Ft int
-.Fn mkstemp "char *template"
-.Ft int
-.Fn mkostemp "char *template" "int oflags"
-.Ft int
-.Fn mkostemps "char *template" "int suffixlen" "int oflags"
-.Ft char *
-.Fn mkdtemp "char *template"
-.In unistd.h
-.Ft int
-.Fn mkstemps "char *template" "int suffixlen"
-.Sh DESCRIPTION
-The
-.Fn mktemp
-function
-takes the given file name template and overwrites a portion of it
-to create a file name.
-This file name is unique and suitable for use
-by the application.
-The template may be any file name with some number of
-.So Li X
-.Sc Ns s
-appended
-to it, for example
-.Pa /tmp/temp.XXXXXX .
-The trailing
-.So Li X
-.Sc Ns s
-are replaced with the current process number and/or a
-unique letter combination.
-The number of unique file names
-.Fn mktemp
-can return depends on the number of
-.So Li X
-.Sc Ns s
-provided.
-Although the
-.Nx
-implementation of the functions will accept any number of trailing
-.So Li X
-.Sc Ns s ,
-for portability reasons one should use only six.
-Using six
-.So Li X
-.Sc Ns s
-will result in
-.Fn mktemp
-testing roughly 26 ** 6 (308915776) combinations.
-.Pp
-The
-.Fn mkstemp
-function
-makes the same replacement to the template and creates the template file,
-mode 0600, returning a file descriptor opened for reading and writing.
-This avoids the race between testing for a file's existence and opening it
-for use.
-The
-.Fn mkostemp
-function
-is like
-.Fn mkstemp
-but allows specifying additional
-.Xr open 2
-flags (defined in
-.In fcntl.h ) .
-The permitted flags are
-.Dv O_APPEND ,
-.Dv O_DIRECT ,
-.Dv O_SHLOCK ,
-.Dv O_EXLOCK ,
-.Dv O_SYNC
-and
-.Dv O_CLOEXEC .
-.Pp
-The
-.Fn mkstemps
-and
-.Fn mkostemps
-functions act the same as
-.Fn mkstemp
-and
-.Fn mkostemp
-respectively,
-except they permit a suffix to exist in the template.
-The template should be of the form
-.Pa /tmp/tmpXXXXXXsuffix .
-The
-.Fn mkstemps
-and
-.Fn mkostemps
-function
-are told the length of the suffix string.
-.Pp
-The
-.Fn mkdtemp
-function
-is similar to
-.Fn mkstemp ,
-but it creates a mode 0700 directory instead and returns the path.
-.Pp
-Please note that the permissions of the file or directory being created are
-subject to the restrictions imposed by the
-.Xr umask 2
-system call.
-It may thus happen that the created file is unreadable and/or unwritable.
-.Sh RETURN VALUES
-The
-.Fn mktemp
-and
-.Fn mkdtemp
-functions
-return a pointer to the template on success and
-.Dv NULL
-on failure.
-The
-.Fn mkstemp ,
-.Fn mkostemp ,
-.Fn mkstemps
-and
-.Fn mkostemps
-functions
-returns \-1 if no suitable file could be created.
-If either call fails an error code is placed in the global variable
-.Va errno .
-.Sh EXAMPLES
-Quite often a programmer will want to replace a use of
-.Fn mktemp
-with
-.Fn mkstemp ,
-usually to avoid the problems described above.
-Doing this correctly requires a good understanding of the code in question.
-.Pp
-For instance, code of this form:
-.Bd -literal -offset indent
-char sfn[15] = "";
-FILE *sfp;
-
-strlcpy(sfn, "/tmp/ed.XXXXXX", sizeof sfn);
-if (mktemp(sfn) == NULL || (sfp = fopen(sfn, "w+")) == NULL) {
-        fprintf(stderr, "%s: %s\en", sfn, strerror(errno));
-        return (NULL);
-}
-return (sfp);
-.Ed
-.Pp
-should be rewritten like this:
-.Bd -literal -offset indent
-char sfn[15] = "";
-FILE *sfp;
-int fd = -1;
-
-strlcpy(sfn, "/tmp/ed.XXXXXX", sizeof sfn);
-if ((fd = mkstemp(sfn)) == -1 ||
-    (sfp = fdopen(fd, "w+")) == NULL) {
-        if (fd != -1) {
-                unlink(sfn);
-                close(fd);
-        }
-        fprintf(stderr, "%s: %s\en", sfn, strerror(errno));
-        return (NULL);
-}
-return (sfp);
-.Ed
-.Pp
-Often one will find code which uses
-.Fn mktemp
-very early on, perhaps to globally initialize the template nicely, but the
-code which calls
-.Xr open 2
-or
-.Xr fopen 3
-on that filename will occur much later.
-(In almost all cases, the use of
-.Xr fopen 3
-will mean that the flags
-.Dv O_CREAT
-|
-.Dv O_EXCL
-are not given to
-.Xr open 2 ,
-and thus a symbolic link race becomes possible, hence making
-necessary the use of
-.Xr fdopen 3
-as seen above).
-Furthermore, one must be careful about code which opens, closes, and then
-re-opens the file in question.
-Finally, one must ensure that upon error the temporary file is
-removed correctly.
-.Pp
-There are also cases where modifying the code to use
-.Fn mktemp ,
-in concert with
-.Xr open 2
-using the flags
-.Dv O_CREAT
-|
-.Dv O_EXCL ,
-is better, as long as the code retries a new template if
-.Xr open 2
-fails with an
-.Va errno
-of
-.Er EEXIST .
-.Sh ERRORS
-The
-.Fn mkstemp ,
-.Fn mkostemp ,
-.Fn mkstemps ,
-.Fn mkostemps
-and
-.Fn mkdtemp
-functions
-may set
-.Va errno
-to one of the following values:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-The pathname portion of the template is not an existing directory.
-.El
-.Pp
-The
-.Fn mktemp ,
-.Fn mkstemp
-and
-.Fn mkdtemp
-functions
-may also set
-.Va errno
-to any value specified by the
-.Xr stat 2
-function.
-.Pp
-The
-.Fn mkstemp
-function
-may also set
-.Va errno
-to any value specified by the
-.Xr open 2
-function.
-.Pp
-The
-.Fn mkdtemp
-function
-may also set
-.Va errno
-to any value specified by the
-.Xr mkdir 2
-function.
-.Sh SEE ALSO
-.Xr chmod 2 ,
-.Xr getpid 2 ,
-.Xr open 2 ,
-.Xr stat 2 ,
-.Xr umask 2
-.Sh STANDARDS
-The
-.Fn mktemp
-conforms to
-.St -p1003.1-2001 .
-It was however removed from the specification in the
-.St -p1003.1-2008
-revision.
-The
-.Fn mkstemp
-and
-.Fn mkdtemp
-functions conform to
-.St -p1003.1-2004
-and
-.St -p1003.1-2008 ,
-respectively.
-.Sh HISTORY
-A
-.Fn mktemp
-function appeared in
-.At v7 .
-.Pp
-The
-.Fn mkstemp
-function appeared in
-.Bx 4.4 .
-.Pp
-The
-.Fn mkdtemp
-function appeared in
-.Nx 1.4 .
-The
-.Fn mkstemps
-function first appeared in
-.Ox 2.4 ,
-and later in
-.Fx 3.4
-and
-.Nx 7.0 .
-The
-.Fn mkostemp
-and
-.Fn mkostemps
-functions appeared in
-.Fx 10.0
-and
-.Nx 7.0 .
-.Sh BUGS
-For
-.Fn mktemp
-there is an obvious race between file name selection and file
-creation and deletion: the program is typically written to call
-.Xr tmpnam 3 ,
-.Xr tempnam 3 ,
-or
-.Fn mktemp .
-Subsequently, the program calls
-.Xr open 2
-or
-.Xr fopen 3
-and erroneously opens a file (or symbolic link, fifo or other
-device) that the attacker has created in the expected file location.
-Hence
-.Fn mkstemp
-is recommended, since it atomically creates the file.
-An attacker can guess the filenames produced by
-.Fn mktemp .
-Whenever it is possible,
-.Fn mkstemp
-or
-.Fn mkdtemp
-should be used instead.
-.Pp
-For this reason,
-.Xr ld 1
-will output a warning message whenever it links code that uses
-.Fn mktemp .
-.Pp
-The
-.Fn mkdtemp
-function is nonstandard and should not be used if portability is required.
-.Sh SECURITY CONSIDERATIONS
-The use of
-.Fn mktemp
-should generally be avoided, as a hostile process can exploit a race
-condition in the time between the generation of a temporary filename by
-.Fn mktemp
-and the invoker's use of the temporary name.
-A link-time warning will be issued advising the use of
-.Fn mkstemp
-or
-.Fn mkdtemp
-instead.
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
deleted file mode 100644
index ae7222f35..000000000
--- a/lib/libc/stdio/mktemp.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: mktemp.c,v 1.21 2014/06/18 17:47:58 christos Exp $	*/
-
-/*
- * Copyright (c) 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.
- * 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 "gettemp.h"
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: mktemp.c,v 1.21 2014/06/18 17:47:58 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "local.h"
-
-char *
-_mktemp(char *path)
-{
-
-	_DIAGASSERT(path != NULL);
-
-	return GETTEMP(path, NULL, 0, 0, 0) ? path : NULL;
-}
-
-__warn_references(mktemp,
-    "warning: mktemp() possibly used unsafely, use mkstemp() or mkdtemp()")
-
-char *
-mktemp(char *path)
-{
-
-	_DIAGASSERT(path != NULL);
-
-	return GETTEMP(path, NULL, 0, 0, 0) ? path : NULL;
-}
diff --git a/lib/libc/stdio/open_memstream.3 b/lib/libc/stdio/open_memstream.3
deleted file mode 100644
index 9f60dd813..000000000
--- a/lib/libc/stdio/open_memstream.3
+++ /dev/null
@@ -1,155 +0,0 @@
-.\"	$NetBSD: open_memstream.3,v 1.3 2014/10/26 14:19:28 christos Exp $
-.\" Copyright (c) 2013 Advanced Computing Technologies LLC
-.\" Written by: John H. Baldwin <jhb@FreeBSD.org>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: head/lib/libc/stdio/open_memstream.3 247415 2013-02-27 20:09:25Z joel $
-.\"
-.Dd October 12, 2014
-.Dt OPEN_MEMSTREAM 3
-.Os
-.Sh NAME
-.Nm open_memstream ,
-.Nm open_wmemstream
-.Nd dynamic memory buffer stream open functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft FILE *
-.Fn open_memstream "char **bufp" "size_t *sizep"
-.In wchar.h
-.Ft FILE *
-.Fn open_wmemstream "wchar_t **bufp" "size_t *sizep"
-.Sh DESCRIPTION
-The
-.Fn open_memstream
-and
-.Fn open_wmemstream
-functions create a write-only, seekable stream backed by a dynamically
-allocated memory buffer.
-The
-.Fn open_memstream
-function creates a byte-oriented stream,
-while the
-.Fn open_wmemstream
-function creates a wide-oriented stream.
-.Pp
-Each stream maintains a current position and size.
-Initially,
-the position and size are set to zero.
-Each write begins at the current position and advances it the number of
-successfully written bytes for
-.Fn open_memstream
-or wide characters for
-.Fn open_wmemstream .
-If a write moves the current position beyond the length of the buffer,
-the length of the buffer is extended and a null character is appended to the
-buffer.
-.Pp
-A stream's buffer always contains a null character at the end of the buffer
-that is not included in the current length.
-.Pp
-If a stream's current position is moved beyond the current length via a
-seek operation and a write is performed,
-the characters between the current length and the current position are filled
-with null characters before the write is performed.
-.Pp
-After a successful call to
-.Xr fclose 3
-or
-.Xr fflush 3 ,
-the pointer referenced by
-.Fa bufp
-will contain the start of the memory buffer and the variable referenced by
-.Fa sizep
-will contain the smaller of the current position and the current buffer length.
-.Pp
-After a successful call to
-.Xr fflush 3 ,
-the pointer referenced by
-.Fa bufp
-and the variable referenced by
-.Fa sizep
-are only valid until the next write operation or a call to
-.Xr fclose 3 .
-.Pp
-Once a stream is closed,
-the allocated buffer referenced by
-.Fa bufp
-should be released via a call to
-.Xr free 3
-when it is no longer needed.
-.Sh IMPLEMENTATION NOTES
-Internally all I/O streams are effectively byte-oriented,
-so using wide-oriented operations to write to a stream opened via
-.Fn open_wmemstream
-results in wide characters being expanded to a stream of multibyte characters
-in stdio's internal buffers.
-These multibyte characters are then converted back to wide characters when
-written into the stream.
-As a result,
-the wide-oriented streams maintain an internal multibyte character conversion
-state that is cleared on any seek opertion that changes the current position.
-This should have no effect as long as wide-oriented output operations are used
-on a wide-oriented stream.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn open_memstream
-and
-.Fn open_wmemstream
-return a
-.Tn FILE
-pointer.
-Otherwise,
-.Dv NULL
-is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa bufp
-or
-.Fa sizep
-argument was
-.Dv NULL .
-.It Bq Er ENOMEM
-Memory for the stream or buffer could not be allocated.
-.El
-.Sh SEE ALSO
-.Xr fclose 3 ,
-.Xr fflush 3 ,
-.Xr fopen 3 ,
-.Xr free 3 ,
-.Xr fseek 3 ,
-.Xr stdio 3
-.Sh STANDARDS
-The
-.Fn open_memstream
-and
-.Fn open_wmemstream
-functions conform to
-.St -p1003.1-2008 .
diff --git a/lib/libc/stdio/open_memstream.c b/lib/libc/stdio/open_memstream.c
deleted file mode 100644
index 9772467a3..000000000
--- a/lib/libc/stdio/open_memstream.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*	$NetBSD: open_memstream.c,v 1.1 2014/10/13 00:40:36 christos Exp $	*/
-
-/*-
- * Copyright (c) 2013 Advanced Computing Technologies LLC
- * Written by: John H. Baldwin <jhb@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: head/lib/libc/stdio/open_memstream.c 247411 2013-02-27 19:50:46Z jhb $");
-#endif
-__RCSID("$NetBSD: open_memstream.c,v 1.1 2014/10/13 00:40:36 christos Exp $");
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-
-#define	OFF_MAX	LLONG_MAX
-
-struct memstream {
-	char **bufp;
-	size_t *sizep;
-	size_t len;
-	size_t offset;
-};
-
-static int
-memstream_grow(struct memstream *ms, off_t newoff)
-{
-	char *buf;
-	size_t newsize;
-
-	if (newoff < 0 || newoff >= SSIZE_MAX)
-		newsize = SSIZE_MAX - 1;
-	else
-		newsize = newoff;
-	if (newsize > ms->len) {
-		buf = realloc(*ms->bufp, newsize + 1);
-		if (buf != NULL) {
-#ifdef DEBUG
-			fprintf(stderr, "MS: %p growing from %zd to %zd\n",
-			    ms, ms->len, newsize);
-#endif
-			memset(buf + ms->len + 1, 0, newsize - ms->len);
-			*ms->bufp = buf;
-			ms->len = newsize;
-			return (1);
-		}
-		return (0);
-	}
-	return (1);
-}
-
-static void
-memstream_update(struct memstream *ms)
-{
-
-	*ms->sizep = ms->len < ms->offset ? ms->len : ms->offset;
-}
-
-static ssize_t
-memstream_write(void *cookie, const void *buf, size_t len)
-{
-	struct memstream *ms;
-	size_t tocopy;
-	off_t more;
-
-	ms = cookie;
-	more = ms->offset;
-	more += len;
-	if (!memstream_grow(ms, more))
-		return (-1);
-	tocopy = ms->len - ms->offset;
-	if (len < tocopy)
-		tocopy = len;
-	memcpy(*ms->bufp + ms->offset, buf, tocopy);
-	ms->offset += tocopy;
-	memstream_update(ms);
-#ifdef DEBUG
-	fprintf(stderr, "MS: write(%p, %zu) = %zu\n", ms, len, tocopy);
-#endif
-	return (ssize_t)tocopy;
-}
-
-static off_t
-memstream_seek(void *cookie, off_t pos, int whence)
-{
-	struct memstream *ms;
-#ifdef DEBUG
-	size_t old;
-#endif
-
-	ms = cookie;
-#ifdef DEBUG
-	old = ms->offset;
-#endif
-	switch (whence) {
-	case SEEK_SET:
-		/* _fseeko() checks for negative offsets. */
-		assert(pos >= 0);
-		ms->offset = pos;
-		break;
-	case SEEK_CUR:
-		/* This is only called by _ftello(). */
-		assert(pos == 0);
-		break;
-	case SEEK_END:
-		if (pos < 0) {
-			if (pos + (ssize_t)ms->len < 0) {
-#ifdef DEBUG
-				fprintf(stderr,
-				    "MS: bad SEEK_END: pos %jd, len %zu\n",
-				    (intmax_t)pos, ms->len);
-#endif
-				errno = EINVAL;
-				return (-1);
-			}
-		} else {
-			if (OFF_MAX - (ssize_t)ms->len < pos) {
-#ifdef DEBUG
-				fprintf(stderr,
-				    "MS: bad SEEK_END: pos %jd, len %zu\n",
-				    (intmax_t)pos, ms->len);
-#endif
-				errno = EOVERFLOW;
-				return (-1);
-			}
-		}
-		ms->offset = ms->len + pos;
-		break;
-	}
-	memstream_update(ms);
-#ifdef DEBUG
-	fprintf(stderr, "MS: seek(%p, %jd, %d) %zu -> %zu\n", ms,
-	    (intmax_t)pos, whence, old, ms->offset);
-#endif
-	return (ms->offset);
-}
-
-static int
-memstream_close(void *cookie)
-{
-
-	free(cookie);
-	return (0);
-}
-
-FILE *
-open_memstream(char **bufp, size_t *sizep)
-{
-	struct memstream *ms;
-	int save_errno;
-	FILE *fp;
-
-	if (bufp == NULL || sizep == NULL) {
-		errno = EINVAL;
-		return (NULL);
-	}
-	*bufp = calloc(1, 1);
-	if (*bufp == NULL)
-		return (NULL);
-	ms = malloc(sizeof(*ms));
-	if (ms == NULL) {
-		save_errno = errno;
-		free(*bufp);
-		*bufp = NULL;
-		errno = save_errno;
-		return (NULL);
-	}
-	ms->bufp = bufp;
-	ms->sizep = sizep;
-	ms->len = 0;
-	ms->offset = 0;
-	memstream_update(ms);
-	fp = funopen2(ms, NULL, memstream_write, memstream_seek,
-	    NULL, memstream_close);
-	if (fp == NULL) {
-		save_errno = errno;
-		free(ms);
-		free(*bufp);
-		*bufp = NULL;
-		errno = save_errno;
-		return (NULL);
-	}
-	fwide(fp, -1);
-	return (fp);
-}
diff --git a/lib/libc/stdio/open_wmemstream.c b/lib/libc/stdio/open_wmemstream.c
deleted file mode 100644
index 76669245c..000000000
--- a/lib/libc/stdio/open_wmemstream.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*	$NetBSD: open_wmemstream.c,v 1.1 2014/10/13 00:40:36 christos Exp $	*/
-
-/*-
- * Copyright (c) 2013 Advanced Computing Technologies LLC
- * Written by: John H. Baldwin <jhb@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: head/lib/libc/stdio/open_wmemstream.c 247411 2013-02-27 19:50:46Z jhb $");
-#endif
-__RCSID("$NetBSD: open_wmemstream.c,v 1.1 2014/10/13 00:40:36 christos Exp $");
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-
-#define	OFF_MAX LLONG_MAX
-
-struct wmemstream {
-	wchar_t **bufp;
-	size_t *sizep;
-	size_t len;
-	size_t offset;
-	mbstate_t mbstate;
-};
-
-static int
-wmemstream_grow(struct wmemstream *ms, size_t newoff)
-{
-	wchar_t *buf;
-	size_t newsize;
-
-	if (newoff >= (off_t)(SSIZE_MAX / sizeof(wchar_t)))
-		newsize = SSIZE_MAX / sizeof(wchar_t) - 1;
-	else
-		newsize = newoff;
-	if (newsize > ms->len) {
-		buf = realloc(*ms->bufp, (newsize + 1) * sizeof(wchar_t));
-		if (buf != NULL) {
-#ifdef DEBUG
-			fprintf(stderr, "WMS: %p growing from %zu to %zu\n",
-			    ms, ms->len, newsize);
-#endif
-			wmemset(buf + ms->len + 1, 0, newsize - ms->len);
-			*ms->bufp = buf;
-			ms->len = newsize;
-			return (1);
-		}
-		return (0);
-	}
-	return (1);
-}
-
-static void
-wmemstream_update(struct wmemstream *ms)
-{
-
-	*ms->sizep = ms->len < ms->offset ? ms->len : ms->offset;
-}
-
-/*
- * Based on a starting multibyte state and an input buffer, determine
- * how many wchar_t's would be output.  This doesn't use mbsnrtowcs()
- * so that it can handle embedded null characters.
- */
-static ssize_t
-wbuflen(const mbstate_t *state, const char *buf, size_t len)
-{
-	mbstate_t lenstate;
-	size_t charlen, count;
-
-	count = 0;
-	lenstate = *state;
-	while (len > 0) {
-		charlen = mbrlen(buf, len, &lenstate);
-		if (charlen == (size_t)-1)
-			return (-1);
-		if (charlen == (size_t)-2)
-			break;
-		if (charlen == 0)
-			/* XXX: Not sure how else to handle this. */
-			charlen = 1;
-		len -= charlen;
-		buf += charlen;
-		count++;
-	}
-	return (count);
-}
-
-static ssize_t
-wmemstream_write(void *cookie, const void *buf, size_t len)
-{
-	struct wmemstream *ms;
-	ssize_t consumed, wlen;
-	size_t charlen;
-
-	ms = cookie;
-	wlen = wbuflen(&ms->mbstate, buf, len);
-	if (wlen < 0) {
-		errno = EILSEQ;
-		return (-1);
-	}
-	if (!wmemstream_grow(ms, ms->offset + wlen))
-		return (-1);
-
-	/*
-	 * This copies characters one at a time rather than using
-	 * mbsnrtowcs() so it can properly handle embedded null
-	 * characters.
-	 */
-	consumed = 0;
-	while (len > 0 && ms->offset < ms->len) {
-		charlen = mbrtowc(*ms->bufp + ms->offset, buf, len,
-		    &ms->mbstate);
-		if (charlen == (size_t)-1) {
-			if (consumed == 0) {
-				errno = EILSEQ;
-				return (-1);
-			}
-			/* Treat it as a successful short write. */
-			break;
-		}
-		if (charlen == 0)
-			/* XXX: Not sure how else to handle this. */
-			charlen = 1;
-		if (charlen == (size_t)-2) {
-			consumed += len;
-			len = 0;
-		} else {
-			consumed += charlen;
-			buf = (const char *)buf + charlen;
-			len -= charlen;
-			ms->offset++;
-		}
-	}
-	wmemstream_update(ms);
-#ifdef DEBUG
-	fprintf(stderr, "WMS: write(%p, %zu) = %zd\n", ms, len, consumed);
-#endif
-	return (consumed);
-}
-
-static off_t
-wmemstream_seek(void *cookie, off_t pos, int whence)
-{
-	struct wmemstream *ms;
-	size_t old;
-
-	ms = cookie;
-	old = ms->offset;
-	switch (whence) {
-	case SEEK_SET:
-		/* _fseeko() checks for negative offsets. */
-		assert(pos >= 0);
-		ms->offset = pos;
-		break;
-	case SEEK_CUR:
-		/* This is only called by _ftello(). */
-		assert(pos == 0);
-		break;
-	case SEEK_END:
-		if (pos < 0) {
-			if (pos + (ssize_t)ms->len < 0) {
-#ifdef DEBUG
-				fprintf(stderr,
-				    "WMS: bad SEEK_END: pos %jd, len %zd\n",
-				    (intmax_t)pos, ms->len);
-#endif
-				errno = EINVAL;
-				return (-1);
-			}
-		} else {
-			if (OFF_MAX - ms->len < (size_t)pos) {
-#ifdef DEBUG
-				fprintf(stderr,
-				    "WMS: bad SEEK_END: pos %jd, len %zd\n",
-				    (intmax_t)pos, ms->len);
-#endif
-				errno = EOVERFLOW;
-				return (-1);
-			}
-		}
-		ms->offset = ms->len + pos;
-		break;
-	}
-	/* Reset the multibyte state if a seek changes the position. */
-	if (ms->offset != old)
-		memset(&ms->mbstate, 0, sizeof(ms->mbstate));
-	wmemstream_update(ms);
-#ifdef DEBUG
-	fprintf(stderr, "WMS: seek(%p, %jd, %d) %jd -> %jd\n", ms,
-	    (intmax_t)pos, whence, (intmax_t)old, (intmax_t)ms->offset);
-#endif
-	return (ms->offset);
-}
-
-static int
-wmemstream_close(void *cookie)
-{
-
-	free(cookie);
-	return (0);
-}
-
-FILE *
-open_wmemstream(wchar_t **bufp, size_t *sizep)
-{
-	struct wmemstream *ms;
-	int save_errno;
-	FILE *fp;
-
-	if (bufp == NULL || sizep == NULL) {
-		errno = EINVAL;
-		return (NULL);
-	}
-	*bufp = calloc(1, sizeof(wchar_t));
-	if (*bufp == NULL)
-		return (NULL);
-	ms = malloc(sizeof(*ms));
-	if (ms == NULL) {
-		save_errno = errno;
-		free(*bufp);
-		*bufp = NULL;
-		errno = save_errno;
-		return (NULL);
-	}
-	ms->bufp = bufp;
-	ms->sizep = sizep;
-	ms->len = 0;
-	ms->offset = 0;
-	memset(&ms->mbstate, 0, sizeof(mbstate_t));
-	wmemstream_update(ms);
-	fp = funopen2(ms, NULL, wmemstream_write, wmemstream_seek,
-	    NULL, wmemstream_close);
-	if (fp == NULL) {
-		save_errno = errno;
-		free(ms);
-		free(*bufp);
-		*bufp = NULL;
-		errno = save_errno;
-		return (NULL);
-	}
-	fwide(fp, 1);
-	return (fp);
-}
diff --git a/lib/libc/stdio/perror.c b/lib/libc/stdio/perror.c
deleted file mode 100644
index de38e884f..000000000
--- a/lib/libc/stdio/perror.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: perror.c,v 1.24 2006/01/26 11:13:42 kleink 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)perror.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: perror.c,v 1.24 2006/01/26 11:13:42 kleink Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include "extern.h"
-
-/*
- * Since perror() is not allowed to change the contents of strerror()'s
- * static buffer, both functions supply their own buffers to strerror_r().
- */
-
-void
-perror(const char *s)
-{
-	const char *separator;
-	char buf[NL_TEXTMAX];
-
-	if (s == NULL)
-		s = "";
-	if (*s == '\0')
-		separator = "";
-	else
-		separator = ": ";
-
-	(void)strerror_r(errno, buf, sizeof(buf));
-	(void)fprintf(stderr, "%s%s%s\n", s, separator, buf);
-}
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
deleted file mode 100644
index a3b709b07..000000000
--- a/lib/libc/stdio/printf.3
+++ /dev/null
@@ -1,1015 +0,0 @@
-.\"	$NetBSD: printf.3,v 1.64 2014/09/29 14:58:33 christos Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd September 29, 2014
-.Dt PRINTF 3
-.Os
-.Sh NAME
-.Nm printf ,
-.Nm fprintf ,
-.Nm dprintf
-.Nm sprintf ,
-.Nm snprintf ,
-.Nm snprintf_ss ,
-.Nm asprintf ,
-.Nm vprintf ,
-.Nm vfprintf ,
-.Nm vsprintf ,
-.Nm vdprintf ,
-.Nm vsnprintf ,
-.Nm vsnprintf_ss ,
-.Nm vasprintf
-.Nd formatted output conversion
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn printf "const char * restrict format" ...
-.Ft int
-.Fn fprintf "FILE * restrict stream" "const char * restrict format" ...
-.Ft int
-.Fn dprintf "int fd" "const char * restrict format" ...
-.Ft int
-.Fn sprintf "char * restrict str" "const char * restrict format" ...
-.Ft int
-.Fn snprintf "char * restrict str" "size_t size" "const char * restrict format" ...
-.Ft int
-.Fn snprintf_ss "char * restrict str" "size_t size" "const char * restrict format" ...
-.Ft int
-.Fn asprintf "char ** restrict ret" "const char * restrict format" ...
-.In stdarg.h
-.Ft int
-.Fn vprintf "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vfprintf "FILE * restrict stream" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vsprintf "char * restrict str" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vdprintf "int fd" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vsnprintf "char * restrict str" "size_t size" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vsnprintf_ss "char * restrict str" "size_t size" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vasprintf "char ** restrict ret" "const char * restrict format" "va_list ap"
-.Sh DESCRIPTION
-The
-.Fn printf
-family of functions produces output according to a
-.Fa format
-as described below.
-The
-.Fn printf
-and
-.Fn vprintf
-functions
-write output to
-.Em stdout ,
-the standard output stream;
-.Fn fprintf
-and
-.Fn vfprintf
-write output to the given output
-.Fa stream ;
-.Fn dprintf
-and
-.Fn vdprintf
-write output to the given file descriptor
-.Fa fd ;
-.Fn sprintf ,
-.Fn snprintf ,
-.Fn snprintf_ss ,
-.Fn vsprintf ,
-.Fn vsnprintf ,
-and
-.Fn vsnprintf_ss
-write to the character string
-.Fa str ;
-and
-.Fn asprintf
-and
-.Fn vasprintf
-write to a dynamically allocated string that is stored in
-.Fa ret .
-.Pp
-These functions write the output under the control of a
-.Fa format
-string that specifies how subsequent arguments
-(or arguments accessed via the variable-length argument facilities of
-.Xr stdarg 3 )
-are converted for output.
-.Pp
-.Fn snprintf_ss
-and
-.Fn vsnprintf_ss
-are signal-safe standalone versions that do not handle
-floating point formats, positional arguments, and wide characters.
-.Pp
-.Fn asprintf
-and
-.Fn vasprintf
-return a pointer to a buffer sufficiently large to hold the
-string in the
-.Fa ret
-argument.
-This pointer should be passed to
-.Xr free 3
-to release the allocated storage when it is no longer needed.
-If sufficient space cannot be allocated, these functions
-will return \-1 and set
-.Fa ret
-to be a
-.Dv NULL
-pointer.
-Please note that these functions are not standardized, and not all
-implementations can be assumed to set the
-.Fa ret
-argument to
-.Dv NULL
-on error.
-It is more portable to check for a return value of \-1 instead.
-.Pp
-.Fn snprintf ,
-.Fn vsnprintf ,
-and
-.Fn vsnprintf_ss
-will write at most
-.Fa size Ns \-1
-of the characters printed into the output string
-(the
-.Fa size Ns 'th
-character then gets the terminating
-.Ql \e0 ) ;
-if the return value is greater than or equal to the
-.Fa size
-argument, the string was too short
-and some of the printed characters were discarded.
-If
-.Fa size
-is zero, nothing is written and
-.Fa str
-may be a
-.Dv NULL
-pointer.
-.Pp
-.Fn sprintf
-and
-.Fn vsprintf
-effectively assume an infinite
-.Fa size .
-.Pp
-The format string is composed of zero or more directives:
-ordinary
-.\" multibyte
-characters (not
-.Cm % ) ,
-which are copied unchanged to the output stream;
-and conversion specifications, each of which results
-in fetching zero or more subsequent arguments.
-Each conversion specification is introduced by
-the character
-.Cm % .
-The arguments must correspond properly (after type promotion)
-with the conversion specifier.
-After the
-.Cm % ,
-the following appear in sequence:
-.Bl -bullet
-.It
-An optional field, consisting of a decimal digit string followed by a
-.Cm $ ,
-specifying the next argument to access.
-If this field is not provided, the argument following the last
-argument accessed will be used.
-Arguments are numbered starting at
-.Cm 1 .
-If unaccessed arguments in the format string are interspersed with ones that
-are accessed the results will be indeterminate.
-.It
-Zero or more of the following flags:
-.Bl -tag -width ".So \  Sc (space)"
-.It Sq Cm #
-The value should be converted to an
-.Dq alternate form .
-For
-.Cm c ,
-.Cm d ,
-.Cm i ,
-.Cm n ,
-.Cm p ,
-.Cm s ,
-and
-.Cm u
-conversions, this option has no effect.
-For
-.Cm o
-conversions, the precision of the number is increased to force the first
-character of the output string to a zero (except if a zero value is printed
-with an explicit precision of zero).
-For
-.Cm x
-and
-.Cm X
-conversions, a non-zero result has the string
-.Ql 0x
-(or
-.Ql 0X
-for
-.Cm X
-conversions) prepended to it.
-For
-.Cm a ,
-.Cm A ,
-.Cm e ,
-.Cm E ,
-.Cm f ,
-.Cm F ,
-.Cm g ,
-and
-.Cm G
-conversions, the result will always contain a decimal point, even if no
-digits follow it (normally, a decimal point appears in the results of
-those conversions only if a digit follows).
-For
-.Cm g
-and
-.Cm G
-conversions, trailing zeros are not removed from the result as they
-would otherwise be.
-.It So Cm 0 Sc (zero)
-Zero padding.
-For all conversions except
-.Cm n ,
-the converted value is padded on the left with zeros rather than blanks.
-If a precision is given with a numeric conversion
-.Pf ( Cm d ,
-.Cm i ,
-.Cm o ,
-.Cm u ,
-.Cm i ,
-.Cm x ,
-and
-.Cm X ) ,
-the
-.Cm 0
-flag is ignored.
-.It Sq Cm \-
-A negative field width flag;
-the converted value is to be left adjusted on the field boundary.
-Except for
-.Cm n
-conversions, the converted value is padded on the right with blanks,
-rather than on the left with blanks or zeros.
-A
-.Sq Cm \-
-overrides a
-.Sq Cm \&0
-if both are given.
-.It So "\ " Sc (space)
-A blank should be left before a positive number
-produced by a signed conversion
-.Pf ( Cm a ,
-.Cm A
-.Cm d ,
-.Cm e ,
-.Cm E ,
-.Cm f ,
-.Cm F ,
-.Cm g ,
-.Cm G ,
-or
-.Cm i ) .
-.It Sq Cm +
-A sign must always be placed before a
-number produced by a signed conversion.
-A
-.Sq Cm +
-overrides a space if both are used.
-.It Sq Cm '
-Decimal conversions
-.Cm ( d , u ,
-or
-.Cm i )
-or the integral portion of a floating point conversion
-.Cm ( f
-or
-.Cm F )
-should be grouped and separated by thousands using
-the non-monetary separator returned by
-.Xr localeconv 3 .
-.El
-.It
-An optional decimal digit string specifying a minimum field width.
-If the converted value has fewer characters than the field width, it will
-be padded with spaces on the left (or right, if the left-adjustment
-flag has been given) to fill out the field width.
-.It
-An optional precision, in the form of a period
-.Sq Cm \&.
-followed by an optional digit string.
-If the digit string is omitted, the precision is taken as zero.
-This gives the minimum number of digits to appear for
-.Cm d ,
-.Cm i ,
-.Cm o ,
-.Cm u ,
-.Cm x ,
-and
-.Cm X
-conversions, the number of digits to appear after the decimal-point for
-.Cm a ,
-.Cm A ,
-.Cm e ,
-.Cm E ,
-.Cm f ,
-and
-.Cm F
-conversions, the maximum number of significant digits for
-.Cm g
-and
-.Cm G
-conversions, or the maximum number of characters to be printed from a
-string for
-.Cm s
-conversions.
-.It
-An optional length modifier, that specifies the size of the argument.
-The following length modifiers are valid for the
-.Cm d , i , n , o , u , x ,
-or
-.Cm X
-conversion:
-.Bl -column ".Cm q Em (deprecated)" ".Vt signed char" ".Vt unsigned long long" ".Vt long long *"
-.It Sy Modifier Ta Cm d , i Ta Cm o , u , x , X Ta Cm n
-.It Cm hh Ta Vt "signed char" Ta Vt "unsigned char" Ta Vt "signed char *"
-.It Cm h Ta Vt short Ta Vt "unsigned short" Ta Vt "short *"
-.It Cm l No (ell) Ta Vt long Ta Vt "unsigned long" Ta Vt "long *"
-.It Cm ll No (ell ell) Ta Vt "long long" Ta Vt "unsigned long long" Ta Vt "long long *"
-.It Cm j Ta Vt intmax_t Ta Vt uintmax_t Ta Vt "intmax_t *"
-.It Cm t Ta Vt ptrdiff_t Ta (see note) Ta Vt "ptrdiff_t *"
-.It Cm z Ta (see note) Ta Vt size_t Ta (see note)
-.It Cm q Em (deprecated) Ta Vt quad_t Ta Vt u_quad_t Ta Vt "quad_t *"
-.El
-.Pp
-Note:
-the
-.Cm t
-modifier, when applied to a
-.Cm o , u , x ,
-or
-.Cm X
-conversion, indicates that the argument is of an unsigned type
-equivalent in size to a
-.Vt ptrdiff_t .
-The
-.Cm z
-modifier, when applied to a
-.Cm d
-or
-.Cm i
-conversion, indicates that the argument is of a signed type equivalent in
-size to a
-.Vt size_t .
-Similarly, when applied to an
-.Cm n
-conversion, it indicates that the argument is a pointer to a signed type
-equivalent in size to a
-.Vt size_t .
-.Pp
-Note:
-if the standard integer types described in
-.Xr stdint 3
-are used, it is recommended that the predefined format string specifier
-macros are used when possible.
-These are further described in
-.Xr inttypes 3 .
-.Pp
-The following length modifier is valid for the
-.Cm a ,
-.Cm A ,
-.Cm e ,
-.Cm E ,
-.Cm f ,
-.Cm F ,
-.Cm g ,
-or
-.Cm G
-conversion:
-.Bl -column ".Sy Modifier" ".Cm a , A , e , E , f , F , g , G"
-.It Sy Modifier Ta Cm a , A , e , E , f , F , g , G
-.It Cm l No (ell) Ta Vt double
-(ignored, same behavior as without it)
-.It Cm L Ta Vt "long double"
-.El
-.Pp
-The following length modifier is valid for the
-.Cm c
-or
-.Cm s
-conversion:
-.Bl -column ".Sy Modifier" ".Vt wint_t" ".Vt wchar_t *"
-.It Sy Modifier Ta Cm c Ta Cm s
-.It Cm l No (ell) Ta Vt wint_t Ta Vt "wchar_t *"
-.El
-.It
-A character that specifies the type of conversion to be applied.
-.El
-.Pp
-A field width or precision, or both, may be indicated by
-an asterisk
-.Ql *
-or an asterisk followed by one or more decimal digits and a
-.Ql $
-instead of a
-digit string.
-In this case, an
-.Vt int
-argument supplies the field width or precision.
-A negative field width is treated as a left adjustment flag followed by a
-positive field width; a negative precision is treated as though it were
-missing.
-If a single format directive mixes positional
-.Pq Li nn$
-and non-positional arguments, the results are undefined.
-.Pp
-The conversion specifiers and their meanings are:
-.Bl -tag -width ".Cm diouxX"
-.It Cm diouxX
-The
-.Vt int
-(or appropriate variant) argument is converted to signed decimal
-.Pf ( Cm d
-and
-.Cm i ) ,
-unsigned octal
-.Pq Cm o ,
-unsigned decimal
-.Pq Cm u ,
-or unsigned hexadecimal
-.Pf ( Cm x
-and
-.Cm X )
-notation.
-The letters
-.Dq Li abcdef
-are used for
-.Cm x
-conversions; the letters
-.Dq Li ABCDEF
-are used for
-.Cm X
-conversions.
-The precision, if any, gives the minimum number of digits that must
-appear; if the converted value requires fewer digits, it is padded on
-the left with zeros.
-.It Cm DOU
-The
-.Vt long int
-argument is converted to signed decimal, unsigned octal, or unsigned
-decimal, as if the format had been
-.Cm ld ,
-.Cm lo ,
-or
-.Cm lu
-respectively.
-These conversion characters are deprecated, and will eventually disappear.
-.It Cm eE
-The
-.Vt double
-argument is rounded and converted in the style
-.Sm off
-.Oo \- Oc Ar d Li \&. Ar ddd Li e \*[Pm] Ar dd
-.Sm on
-where there is one digit before the
-decimal-point character
-and the number of digits after it is equal to the precision;
-if the precision is missing,
-it is taken as 6; if the precision is
-zero, no decimal-point character appears.
-An
-.Cm E
-conversion uses the letter
-.Ql E
-(rather than
-.Ql e )
-to introduce the exponent.
-The exponent always contains at least two digits; if the value is zero,
-the exponent is 00.
-.Pp
-For
-.Cm a ,
-.Cm A ,
-.Cm e ,
-.Cm E ,
-.Cm f ,
-.Cm F ,
-.Cm g ,
-and
-.Cm G
-conversions, positive and negative infinity are represented as
-.Li inf
-and
-.Li -inf
-respectively when using the lowercase conversion character, and
-.Li INF
-and
-.Li -INF
-respectively when using the uppercase conversion character.
-Similarly, NaN is represented as
-.Li nan
-when using the lowercase conversion, and
-.Li NAN
-when using the uppercase conversion.
-.It Cm fF
-The
-.Vt double
-argument is rounded and converted to decimal notation in the style
-.Sm off
-.Oo \- Oc Ar ddd Li \&. Ar ddd ,
-.Sm on
-where the number of digits after the decimal-point character
-is equal to the precision specification.
-If the precision is missing, it is taken as 6; if the precision is
-explicitly zero, no decimal-point character appears.
-If a decimal point appears, at least one digit appears before it.
-.It Cm gG
-The
-.Vt double
-argument is converted in style
-.Cm f
-or
-.Cm e
-(or in style
-.Cm F
-or
-.Cm E
-for
-.Cm G
-conversions).
-The precision specifies the number of significant digits.
-If the precision is missing, 6 digits are given; if the precision is zero,
-it is treated as 1.
-Style
-.Cm e
-is used if the exponent from its conversion is less than \-4 or greater than
-or equal to the precision.
-Trailing zeros are removed from the fractional part of the result; a
-decimal point appears only if it is followed by at least one digit.
-.It Cm aA
-The
-.Vt double
-argument is rounded and converted to hexadecimal notation in the style
-.Sm off
-.Oo \- Oc Li 0x Ar h Li \&. Ar hhhp Oo \*[Pm] Oc Ar d ,
-.Sm on
-where the number of digits after the hexadecimal-point character
-is equal to the precision specification.
-If the precision is missing, it is taken as enough to represent
-the floating-point number exactly, and no rounding occurs.
-If the precision is zero, no hexadecimal-point character appears.
-The
-.Cm p
-is a literal character
-.Ql p ,
-and the exponent consists of a positive or negative sign
-followed by a decimal number representing an exponent of 2.
-The
-.Cm A
-conversion uses the prefix
-.Dq Li 0X
-(rather than
-.Dq Li 0x ) ,
-the letters
-.Dq Li ABCDEF
-(rather than
-.Dq Li abcdef )
-to represent the hex digits, and the letter
-.Ql P
-(rather than
-.Ql p )
-to separate the mantissa and exponent.
-.Pp
-Note that there may be multiple valid ways to represent floating-point
-numbers in this hexadecimal format.
-For example,
-.Li 0x3.24p+0 , 0x6.48p-1
-and
-.Li 0xc.9p-2
-are all equivalent.
-The format chosen depends on the internal representation of the
-number, but the implementation guarantees that the length of the
-mantissa will be minimized.
-Zeroes are always represented with a mantissa of 0 (preceded by a
-.Ql -
-if appropriate) and an exponent of
-.Li +0 .
-.It Cm C
-Treated as
-.Cm c
-with the
-.Cm l
-(ell) modifier.
-.It Cm c
-The
-.Vt int
-argument is converted to an
-.Vt "unsigned char" ,
-and the resulting character is written.
-.Pp
-If the
-.Cm l
-(ell) modifier is used, the
-.Vt wint_t
-argument shall be converted to a
-.Vt wchar_t ,
-and the (potentially multi-byte) sequence representing the
-single wide character is written, including any shift sequences.
-If a shift sequence is used, the shift state is also restored
-to the original state after the character.
-.It Cm S
-Treated as
-.Cm s
-with the
-.Cm l
-(ell) modifier.
-.It Cm s
-The
-.Vt "char *"
-argument is expected to be a pointer to an array of character type (pointer
-to a string).
-Characters from the array are written up to (but not including)
-a terminating
-.Dv NUL
-character;
-if a precision is specified, no more than the number specified are
-written.
-If a precision is given, no null character
-need be present; if the precision is not specified, or is greater than
-the size of the array, the array must contain a terminating
-.Dv NUL
-character.
-.Pp
-If the
-.Cm l
-(ell) modifier is used, the
-.Vt "wchar_t *"
-argument is expected to be a pointer to an array of wide characters
-(pointer to a wide string).
-For each wide character in the string, the (potentially multi-byte)
-sequence representing the
-wide character is written, including any shift sequences.
-If any shift sequence is used, the shift state is also restored
-to the original state after the string.
-Wide characters from the array are written up to (but not including)
-a terminating wide
-.Dv NUL
-character;
-if a precision is specified, no more than the number of bytes specified are
-written (including shift sequences).
-Partial characters are never written.
-If a precision is given, no null character
-need be present; if the precision is not specified, or is greater than
-the number of bytes required to render the multibyte representation of
-the string, the array must contain a terminating wide
-.Dv NUL
-character.
-.It Cm p
-The
-.Vt "void *"
-pointer argument is printed in hexadecimal (as if by
-.Ql %#x
-or
-.Ql %#lx ) .
-.It Cm n
-The number of characters written so far is stored into the
-integer indicated by the
-.Vt "int *"
-(or variant) pointer argument.
-No argument is converted.
-.It Cm %
-A
-.Ql %
-is written.
-No argument is converted.
-The complete conversion specification is
-.Ql %% .
-.El
-.Pp
-The decimal point
-character is defined in the program's locale (category
-.Dv LC_NUMERIC ) .
-.Pp
-In no case does a non-existent or small field width cause truncation of
-a numeric field; if the result of a conversion is wider than the field
-width, the
-field is expanded to contain the conversion result.
-.Sh RETURN VALUES
-These functions return
-the number of characters printed, or that would be printed if there
-was adequate space in case of
-.Fn snprintf ,
-.Fn vsnprintf ,
-and
-.Fn vsnprintf_ss
-(not including the trailing
-.Ql \e0
-used to end output to strings).
-If an output error was encountered, these functions shall return a
-negative value.
-.Sh EXAMPLES
-To print a date and time in the form
-.Dq Li "Sunday, July 3, 10:02" ,
-where
-.Fa weekday
-and
-.Fa month
-are pointers to strings:
-.Bd -literal -offset indent
-#include \*[Lt]stdio.h\*[Gt]
-fprintf(stdout, "%s, %s %d, %.2d:%.2d\en",
-	weekday, month, day, hour, min);
-.Ed
-.Pp
-To print \*(Pi
-to five decimal places:
-.Bd -literal -offset indent
-#include \*[Lt]math.h\*[Gt]
-#include \*[Lt]stdio.h\*[Gt]
-fprintf(stdout, "pi = %.5f\en", 4 * atan(1.0));
-.Ed
-.Pp
-To allocate a 128 byte string and print into it:
-.Bd -literal -offset indent
-#include \*[Lt]stdio.h\*[Gt]
-#include \*[Lt]stdlib.h\*[Gt]
-#include \*[Lt]stdarg.h\*[Gt]
-char *newfmt(const char *fmt, ...)
-{
-	char *p;
-	va_list ap;
-	if ((p = malloc(128)) == NULL)
-		return (NULL);
-	va_start(ap, fmt);
-	(void) vsnprintf(p, 128, fmt, ap);
-	va_end(ap);
-	return (p);
-}
-.Ed
-.Sh ERRORS
-In addition to the errors documented for the
-.Xr write 2
-system call, the
-.Fn printf
-family of functions may fail if:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-An invalid wide-character code was encountered.
-.It Bq Er ENOMEM
-Insufficient storage space is available.
-.It Bq Er EOVERFLOW
-The
-.Fa size
-argument exceeds
-.Dv INT_MAX ,
-or the return value would be too large to be represented by an
-.Vt int .
-.El
-.Sh SEE ALSO
-.Xr printf 1 ,
-.Xr fmtcheck 3 ,
-.Xr scanf 3 ,
-.Xr setlocale 3 ,
-.Xr wprintf 3 ,
-.Xr printf 9
-.Sh STANDARDS
-Subject to the caveats noted in the
-.Sx BUGS
-section below, the
-.Fn fprintf ,
-.Fn printf ,
-.Fn sprintf ,
-.Fn vprintf ,
-.Fn vfprintf ,
-and
-.Fn vsprintf
-functions
-conform to
-.St -ansiC
-and
-.St -isoC-99 .
-With the same reservation, the
-.Fn snprintf
-and
-.Fn vsnprintf
-functions conform to
-.St -isoC-99 .
-.Sh HISTORY
-The functions
-.Fn snprintf
-and
-.Fn vsnprintf
-first appeared in
-.Bx 4.4 .
-The functions
-.Fn asprintf
-and
-.Fn vasprintf
-are modeled on the ones that first appeared in the GNU C library.
-The function
-.Fn vsnprintf_ss
-is non-standard and appeared in
-.Nx 4.0 .
-The functions
-.Fn dprintf
-and
-.Fn vdprintf
-are parts of
-.St -p1003.1-2008
-and appeared in
-.Nx 6.0 .
-.Sh CAVEATS
-Because
-.Fn sprintf
-and
-.Fn vsprintf
-assume an infinitely long string, callers must be careful not to
-overflow the actual space; this is often impossible to assure.
-For safety, programmers should use the
-.Fn snprintf
-and
-.Fn asprintf
-family of interfaces instead.
-Unfortunately, the
-.Fn snprintf
-interfaces are not available on older
-systems and the
-.Fn asprintf
-interfaces are not yet portable.
-.Pp
-It is important never to pass a string with user-supplied data as a
-format without using
-.Ql %s .
-An attacker can put format specifiers in the string to mangle your stack,
-leading to a possible security hole.
-This holds true even if you have built the string
-.Dq by hand
-using a function like
-.Fn snprintf ,
-as the resulting string may still contain user-supplied conversion specifiers
-for later interpolation by
-.Fn printf .
-.Pp
-Be sure to use the proper secure idiom:
-.Bd -literal -offset indent
-snprintf(buffer, sizeof(buffer), "%s", string);
-.Ed
-.Pp
-There is no way for
-.Fn printf
-to know the size of each argument passed.
-If you use positional arguments you must ensure that all parameters, up to the
-last positionally specified parameter, are used in the format string.
-This allows for the format string to be parsed for this information.
-Failure to do this will mean your code is non-portable and liable to fail.
-.Pp
-In this implementation, passing a
-.Dv NULL
-.Vt char *
-argument to the
-.Cm %s
-format specifier will output
-.Em "(null)"
-instead of crashing.
-Programs that depend on this behavior are non-portable and may crash
-on other systems or in the future.
-.Sh BUGS
-The conversion formats
-.Cm \&%D ,
-.Cm \&%O ,
-and
-.Cm \&%U
-are not standard and are provided only for backward compatibility.
-The effect of padding the
-.Cm %p
-format with zeros (either by the
-.Sq Cm 0
-flag or by specifying a precision), and the benign effect (i.e. none)
-of the
-.Sq Cm #
-flag on
-.Cm %n
-and
-.Cm %p
-conversions, as well as other nonsensical combinations such as
-.Cm %Ld ,
-are not standard; such combinations should be avoided.
-.Pp
-The
-.Nm
-family of functions do not correctly handle multibyte characters in the
-.Fa format
-argument.
-.Sh SECURITY CONSIDERATIONS
-The
-.Fn sprintf
-and
-.Fn vsprintf
-functions are easily misused in a manner which enables malicious users
-to arbitrarily change a running program's functionality through
-a buffer overflow attack.
-Because
-.Fn sprintf
-and
-.Fn vsprintf
-assume an infinitely long string,
-callers must be careful not to overflow the actual space;
-this is often hard to assure.
-For safety, programmers should use the
-.Fn snprintf
-interface instead.
-For example:
-.Bd -literal
-void
-foo(const char *arbitrary_string, const char *and_another)
-{
-	char onstack[8];
-
-#ifdef BAD
-	/*
-	 * This first sprintf is bad behavior.  Do not use sprintf!
-	 */
-	sprintf(onstack, "%s, %s", arbitrary_string, and_another);
-#else
-	/*
-	 * The following two lines demonstrate better use of
-	 * snprintf().
-	 */
-	snprintf(onstack, sizeof(onstack), "%s, %s", arbitrary_string,
-	    and_another);
-#endif
-}
-.Ed
-.Pp
-The
-.Fn printf
-and
-.Fn sprintf
-family of functions are also easily misused in a manner
-allowing malicious users to arbitrarily change a running program's
-functionality by either causing the program
-to print potentially sensitive data
-.Dq "left on the stack" ,
-or causing it to generate a memory fault or bus error
-by dereferencing an invalid pointer.
-.Pp
-.Cm %n
-can be used to write arbitrary data to potentially carefully-selected
-addresses.
-Programmers are therefore strongly advised to never pass untrusted strings
-as the
-.Fa format
-argument, as an attacker can put format specifiers in the string
-to mangle your stack,
-leading to a possible security hole.
-This holds true even if the string was built using a function like
-.Fn snprintf ,
-as the resulting string may still contain user-supplied conversion specifiers
-for later interpolation by
-.Fn printf .
-.Pp
-Always use the proper secure idiom:
-.Pp
-.Dl "snprintf(buffer, sizeof(buffer), \*q%s\*q, string);"
diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c
deleted file mode 100644
index e2ae98551..000000000
--- a/lib/libc/stdio/printf.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: printf.c,v 1.13 2013/04/19 15:22:25 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)printf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: printf.c,v 1.13 2013/04/19 15:22:25 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-__weak_alias(printf_l, _printf_l)
-
-int
-printf(char const *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfprintf(stdout, fmt, ap);
-	va_end(ap);
-	return ret;
-}
-
-int
-printf_l(locale_t loc, char const *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfprintf_l(stdout, loc, fmt, ap);
-	va_end(ap);
-	return ret;
-}
diff --git a/lib/libc/stdio/putc.3 b/lib/libc/stdio/putc.3
deleted file mode 100644
index e7d3dae58..000000000
--- a/lib/libc/stdio/putc.3
+++ /dev/null
@@ -1,170 +0,0 @@
-.\"	$NetBSD: putc.3,v 1.12 2010/05/06 09:01:34 jruoho Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)putc.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd May 6, 2010
-.Dt PUTC 3
-.Os
-.Sh NAME
-.Nm fputc ,
-.Nm putc ,
-.Nm putchar ,
-.Nm putc_unlocked ,
-.Nm putchar_unlocked ,
-.Nm putw
-.Nd output a character or word to a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn fputc "int c" "FILE *stream"
-.Ft int
-.Fn putc "int c" "FILE *stream"
-.Ft int
-.Fn putchar "int c"
-.Ft int
-.Fn putc_unlocked "int c" "FILE *stream"
-.Ft int
-.Fn putchar_unlocked "int c"
-.Ft int
-.Fn putw "int w" "FILE *stream"
-.Sh DESCRIPTION
-The
-.Fn fputc
-function
-writes the character
-.Fa c
-(converted to an ``unsigned char'')
-to the output stream pointed to by
-.Fa stream .
-.Pp
-.Fn putc
-acts essentially identically to
-.Fn fputc ,
-but is a macro that expands in-line.
-It may evaluate
-.Fa stream
-more than once, so arguments given to
-.Fn putc
-should not be expressions with potential side effects.
-.Pp
-.Fn putchar
-is identical to
-.Fn putc
-with an output stream of
-.Em stdout .
-.Pp
-The
-.Fn putc_unlocked
-and
-.Fn putchar_unlocked
-functions provide functionality identical to that of
-.Fn putc
-and
-.Fn putchar ,
-respectively, but do not perform implicit locking of the streams they
-operate on.
-In multi-threaded programs they may be used
-.Em only
-within a scope in which the stream
-has been successfully locked by the calling thread using either
-.Xr flockfile 3
-or
-.Xr ftrylockfile 3 ,
-and may later be released using
-.Xr funlockfile 3 .
-.Pp
-The
-.Fn putw
-function
-writes the specified
-.Em int
-to the named output
-.Fa stream .
-.Sh RETURN VALUES
-The functions,
-.Fn fputc ,
-.Fn putc
-and
-.Fn putchar
-return the character written.
-If an error occurs, the value
-.Dv EOF
-is returned.
-The
-.Fn putw
-function
-returns 0 on success;
-.Dv EOF
-is returned if
-a write error occurs,
-or if an attempt is made to write a read-only stream.
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fopen 3 ,
-.Xr getc 3 ,
-.Xr stdio 3
-.Sh STANDARDS
-The functions
-.Fn fputc ,
-.Fn putc ,
-and
-.Fn putchar ,
-conform to
-.St -ansiC .
-The functions
-.Fn putc_unlocked
-and
-.Fn putchar_unlocked
-conform to
-.St -p1003.1-96 .
-.Sh HISTORY
-The functions
-.Fn putc ,
-.Fn putchar ,
-and
-.Fn putw
-first appeared in
-.At v6 .
-The function
-.Fn fputc
-appeared in
-.At v7 .
-.Sh BUGS
-The size and byte order of an
-.Em int
-varies from one machine to another, and
-.Fn putw
-is not recommended for portable applications.
diff --git a/lib/libc/stdio/putc.c b/lib/libc/stdio/putc.c
deleted file mode 100644
index 858c76ce2..000000000
--- a/lib/libc/stdio/putc.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: putc.c,v 1.12 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)putc.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: putc.c,v 1.12 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * A subroutine version of the macro putc.
- */
-#undef putc
-#undef putc_unlocked
-
-int
-putc(int c, FILE *fp)
-{
-	int r;
-
-	_DIAGASSERT(fp != NULL);
-
-	FLOCKFILE(fp);
-	r = __sputc(c, fp);
-	FUNLOCKFILE(fp);
-	return r;
-}
-
-int
-putc_unlocked(int c, FILE *fp)
-{
-
-	_DIAGASSERT(fp != NULL);
-
-	return __sputc(c, fp);
-}
diff --git a/lib/libc/stdio/putchar.c b/lib/libc/stdio/putchar.c
deleted file mode 100644
index 86aa6bf30..000000000
--- a/lib/libc/stdio/putchar.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: putchar.c,v 1.10 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)putchar.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: putchar.c,v 1.10 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-#undef putchar
-#undef putchar_unlocked
-
-/*
- * A subroutine version of the macro putchar
- */
-int
-putchar(int c)
-{
-	FILE *fp = stdout;
-        int r;
-
-	FLOCKFILE(fp);
-	r = __sputc(c, fp);
-	FUNLOCKFILE(fp);
-	return r;
-}
-
-int
-putchar_unlocked(int c)
-{
-	return __sputc(c, stdout);
-}
diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c
deleted file mode 100644
index 0ffa7d1cd..000000000
--- a/lib/libc/stdio/puts.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*	$NetBSD: puts.c,v 1.16 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)puts.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: puts.c,v 1.16 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include "fvwrite.h"
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * Write the given string to stdout, appending a newline.
- */
-int
-puts(char const *s)
-{
-	size_t c;
-	struct __suio uio;
-	struct __siov iov[2];
-	int r;
-
-	_DIAGASSERT(s != NULL);
-
-	if (s == NULL)
-		s = "(null)";
-
-	c = strlen(s);
-
-	iov[0].iov_base = __UNCONST(s);
-	iov[0].iov_len = c;
-	iov[1].iov_base = __UNCONST("\n");
-	iov[1].iov_len = 1;
-	uio.uio_resid = c + 1;
-	uio.uio_iov = &iov[0];
-	uio.uio_iovcnt = 2;
-	FLOCKFILE(stdout);
-	r = __sfvwrite(stdout, &uio);
-	FUNLOCKFILE(stdout);
-	return r ? EOF : '\n';
-}
diff --git a/lib/libc/stdio/putw.c b/lib/libc/stdio/putw.c
deleted file mode 100644
index 3ebd0302e..000000000
--- a/lib/libc/stdio/putw.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: putw.c,v 1.12 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)putw.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: putw.c,v 1.12 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "fvwrite.h"
-#include "reentrant.h"
-#include "local.h"
-
-int
-putw(int w, FILE *fp)
-{
-	struct __suio uio;
-	struct __siov iov;
-	int r;
-
-	_DIAGASSERT(fp != NULL);
-
-	iov.iov_base = &w;
-	iov.iov_len = uio.uio_resid = sizeof(w);
-	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1;
-	FLOCKFILE(fp);
-	r = __sfvwrite(fp, &uio);
-	FUNLOCKFILE(fp);
-	return r;
-}
diff --git a/lib/libc/stdio/putwc.3 b/lib/libc/stdio/putwc.3
deleted file mode 100644
index 7cde41302..000000000
--- a/lib/libc/stdio/putwc.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\"	$NetBSD: putwc.3,v 1.9 2010/12/16 17:42:27 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)putc.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd October 20, 2001
-.Dt PUTWC 3
-.Os
-.Sh NAME
-.Nm fputwc ,
-.Nm putwc ,
-.Nm putwchar ,
-.Nd output a wide character to a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft wint_t
-.Fn fputwc "wchar_t wc" "FILE *stream"
-.Ft wint_t
-.Fn putwc "wchar_t wc" "FILE *stream"
-.Ft wint_t
-.Fn putwchar "wchar_t wc"
-.Sh DESCRIPTION
-The
-.Fn fputwc
-function
-writes the wide character
-.Fa wc
-to the output stream pointed to by
-.Fa stream .
-.Pp
-.Fn putwc
-acts essentially identically to
-.Fn fputwc ,
-but is a macro that expands in-line.
-It may evaluate
-.Fa stream
-more than once, so arguments given to
-.Fn putwc
-should not be expressions with potential side effects.
-.Pp
-.Fn putwchar
-is identical to
-.Fn putwc
-with an output stream of
-.Em stdout .
-.Sh RETURN VALUES
-The functions
-.Fn fputwc ,
-.Fn putwc ,
-and
-.Fn putwchar
-return the wide character written.
-If an error occurs, the value
-.Dv WEOF
-is returned.
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fopen 3 ,
-.Xr getwc 3 ,
-.Xr stdio 3
-.Sh STANDARDS
-The functions
-.Fn fputwc ,
-.Fn putwc ,
-and
-.Fn putwchar ,
-conform to
-.St -isoC-99 .
diff --git a/lib/libc/stdio/putwc.c b/lib/libc/stdio/putwc.c
deleted file mode 100644
index 1d46145b6..000000000
--- a/lib/libc/stdio/putwc.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $NetBSD: putwc.c,v 1.4 2005/06/12 05:21:27 lukem Exp $ */
-
-/*-
- * Copyright (c)2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Citrus$
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: putwc.c,v 1.4 2005/06/12 05:21:27 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdio.h>
-#include <wchar.h>
-
-/*
- * A subroutine version of the macro putwc.
- */
-#undef putwc
-
-wint_t
-putwc(wchar_t wc, FILE *fp)
-{
-
-	return fputwc(wc, fp);
-}
diff --git a/lib/libc/stdio/putwchar.c b/lib/libc/stdio/putwchar.c
deleted file mode 100644
index ec09ee161..000000000
--- a/lib/libc/stdio/putwchar.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $NetBSD: putwchar.c,v 1.4 2005/06/12 05:21:27 lukem Exp $ */
-
-/*-
- * Copyright (c)2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Citrus$
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: putwchar.c,v 1.4 2005/06/12 05:21:27 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdio.h>
-#include <wchar.h>
-
-/*
- * A subroutine version of the macro putwchar.
- */
-#undef putwchar
-
-wint_t
-putwchar(wchar_t wc)
-{
-
-	return fputwc(wc, stdout);
-}
diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c
deleted file mode 100644
index 7988e7407..000000000
--- a/lib/libc/stdio/refill.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*	$NetBSD: refill.c,v 1.16 2012/03/27 15:05:42 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)refill.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: refill.c,v 1.16 2012/03/27 15:05:42 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "reentrant.h"
-#include "local.h"
-
-#ifdef _REENTRANT
-extern rwlock_t __sfp_lock;
-#endif
-
-static int
-lflush(FILE *fp)
-{
-
-	_DIAGASSERT(fp != NULL);
-
-	if ((fp->_flags & (__SLBF|__SWR)) == (__SLBF|__SWR))
-		return __sflush(fp);
-	return 0;
-}
-
-/*
- * Refill a stdio buffer.
- * Return EOF on eof or error, 0 otherwise.
- */
-int
-__srefill(FILE *fp)
-{
-
-	_DIAGASSERT(fp != NULL);
-
-	/* make sure stdio is set up */
-	if (!__sdidinit)
-		__sinit();
-
-	fp->_r = 0;		/* largely a convenience for callers */
-
-	/* SysV does not make this test; take it out for compatibility */
-	if (fp->_flags & __SEOF)
-		return EOF;
-
-	/* if not already reading, have to be reading and writing */
-	if ((fp->_flags & __SRD) == 0) {
-		if ((fp->_flags & __SRW) == 0) {
-			errno = EBADF;
-			fp->_flags |= __SERR;
-			return EOF;
-		}
-		/* switch to reading */
-		if (fp->_flags & __SWR) {
-			if (__sflush(fp))
-				return EOF;
-			fp->_flags &= ~__SWR;
-			fp->_w = 0;
-			fp->_lbfsize = 0;
-		}
-		fp->_flags |= __SRD;
-	} else {
-		/*
-		 * We were reading.  If there is an ungetc buffer,
-		 * we must have been reading from that.  Drop it,
-		 * restoring the previous buffer (if any).  If there
-		 * is anything in that buffer, return.
-		 */
-		if (HASUB(fp)) {
-			FREEUB(fp);
-			if ((fp->_r = fp->_ur) != 0) {
-				fp->_p = fp->_up;
-				return 0;
-			}
-		}
-	}
-
-	if (fp->_bf._base == NULL)
-		__smakebuf(fp);
-
-	/*
-	 * Before reading from a line buffered or unbuffered file,
-	 * flush all line buffered output files, per the ANSI C
-	 * standard.
-	 */
-	if (fp->_flags & (__SLBF|__SNBF)) {
-		rwlock_rdlock(&__sfp_lock);
-		(void) _fwalk(lflush);
-		rwlock_unlock(&__sfp_lock);
-	}
-	fp->_p = fp->_bf._base;
-	fp->_r = (int)(*fp->_read)(fp->_cookie, (char *)fp->_p,
-	    (size_t)fp->_bf._size);
-	fp->_flags &= ~__SMOD;	/* buffer contents are again pristine */
-	if (fp->_r <= 0) {
-		if (fp->_r == 0)
-			fp->_flags |= __SEOF;
-		else {
-			fp->_r = 0;
-			fp->_flags |= __SERR;
-		}
-		return EOF;
-	}
-	return 0;
-}
diff --git a/lib/libc/stdio/remove.3 b/lib/libc/stdio/remove.3
deleted file mode 100644
index 17895c349..000000000
--- a/lib/libc/stdio/remove.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\"	$NetBSD: remove.3,v 1.12 2003/08/07 16:43:30 agc Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)remove.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt REMOVE 3
-.Os
-.Sh NAME
-.Nm remove
-.Nd remove directory entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn remove "const char *path"
-.Sh DESCRIPTION
-The
-.Fn remove
-function removes the file or directory specified by
-.Fa path .
-.Pp
-If
-.Fa path
-specifies a directory,
-.Fn remove "path"
-is the equivalent of
-.Fn rmdir "path" .
-Otherwise, it is the equivalent of
-.Fn unlink "path" .
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn remove
-returns 0.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn remove
-function
-may fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr rmdir 2
-or
-.Xr unlink 2 .
-.Sh SEE ALSO
-.Xr rmdir 2 ,
-.Xr unlink 2 ,
-.Xr symlink 7
-.Sh STANDARDS
-The
-.Fn remove
-function conforms to
-.St -ansiC .
diff --git a/lib/libc/stdio/remove.c b/lib/libc/stdio/remove.c
deleted file mode 100644
index 2573b0eaa..000000000
--- a/lib/libc/stdio/remove.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: remove.c,v 1.14 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)remove.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: remove.c,v 1.14 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-
-int
-remove(const char *file)
-{
-	struct stat sb;
-
-	_DIAGASSERT(file != NULL);
-
-	if (lstat(file, &sb) < 0)
-		return -1;
-
-	/*
-	 * The file system may prohibit using unlink(2) on directories,
-	 * so always use rmdir(2) in that case.
-	 */
-	if (S_ISDIR(sb.st_mode))
-		return rmdir(file);
-	else
-		return unlink(file);
-}
diff --git a/lib/libc/stdio/rewind.c b/lib/libc/stdio/rewind.c
deleted file mode 100644
index 3d1f09d35..000000000
--- a/lib/libc/stdio/rewind.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: rewind.c,v 1.14 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)rewind.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: rewind.c,v 1.14 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-void
-rewind(FILE *fp)
-{
-
-	_DIAGASSERT(fp != NULL);
-
-	FLOCKFILE(fp);
-	(void) fseek(fp, 0L, SEEK_SET);
-	__sclearerr(fp);
-	FUNLOCKFILE(fp);
-}
diff --git a/lib/libc/stdio/rget.c b/lib/libc/stdio/rget.c
deleted file mode 100644
index 3e2cd60cc..000000000
--- a/lib/libc/stdio/rget.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: rget.c,v 1.13 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)rget.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: rget.c,v 1.13 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * Handle getc() when the buffer ran out:
- * Refill, then return the first character
- * in the newly-filled buffer.
- */
-int
-__srget(FILE *fp)
-{
-
-	_DIAGASSERT(fp != NULL);
-
-	_SET_ORIENTATION(fp, -1);
-	if (__srefill(fp) == 0) {
-		fp->_r--;
-		return *fp->_p++;
-	}
-	return EOF;
-}
diff --git a/lib/libc/stdio/scanf.3 b/lib/libc/stdio/scanf.3
deleted file mode 100644
index 2da89991e..000000000
--- a/lib/libc/stdio/scanf.3
+++ /dev/null
@@ -1,478 +0,0 @@
-.\"	$NetBSD: scanf.3,v 1.27 2010/05/14 03:04:32 joerg Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)scanf.3	8.2 (Berkeley) 12/11/93
-.\"
-.Dd March 21, 2010
-.Dt SCANF 3
-.Os
-.Sh NAME
-.Nm scanf ,
-.Nm fscanf ,
-.Nm sscanf ,
-.Nm vscanf ,
-.Nm vsscanf ,
-.Nm vfscanf
-.Nd input format conversion
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn scanf "const char * restrict format" ...
-.Ft int
-.Fn fscanf "FILE * restrict stream" "const char * restrict format" ...
-.Ft int
-.Fn sscanf "const char * restrict str" "const char * restrict format" ...
-.In stdarg.h
-.Ft int
-.Fn vscanf "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vsscanf "const char * restrict str" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vfscanf "FILE * restrict stream" "const char * restrict format" "va_list ap"
-.Sh DESCRIPTION
-The
-.Fn scanf
-family of functions scans input according to a
-.Fa format
-as described below.
-This format may contain
-.Em conversion specifiers ;
-the results from such conversions, if any,
-are stored through the
-.Em pointer
-arguments.
-.Pp
-The
-.Fn scanf
-function
-reads input from the standard input stream
-.Em stdin ,
-.Fn fscanf
-reads input from the stream pointer
-.Fa stream ,
-and
-.Fn sscanf
-reads its input from the character string pointed to by
-.Fa str .
-The
-.Fn vfscanf
-function
-is analogous to
-.Xr vfprintf 3
-and reads input from the stream pointer
-.Fa stream
-using a variable argument list of pointers (see
-.Xr stdarg 3 ) .
-The
-.Fn vscanf
-function scans a variable argument list from the standard input and
-the
-.Fn vsscanf
-function scans it from a string;
-these are analogous to
-the
-.Fn vprintf
-and
-.Fn vsprintf
-functions respectively.
-.Pp
-Each successive
-.Em pointer
-argument must correspond properly with
-each successive conversion specifier
-(but see `suppression' below).
-All conversions are introduced by the
-.Cm %
-(percent sign) character.
-The
-.Fa format
-string
-may also contain other characters.
-White space (such as blanks, tabs, or newlines) in the
-.Fa format
-string match any amount of white space, including none, in the input.
-Everything else
-matches only itself.
-Scanning stops
-when an input character does not match such a format character.
-Scanning also stops
-when an input conversion cannot be made (see below).
-.Sh CONVERSIONS
-Following the
-.Cm %
-character introducing a conversion
-there may be a number of
-.Em flag
-characters, as follows:
-.Bl -tag -width indent
-.It Cm *
-Suppresses assignment.
-The conversion that follows occurs as usual, but no pointer is used;
-the result of the conversion is simply discarded.
-.It Cm h
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Em short int
-(rather than
-.Em int ) .
-.It Cm hh
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Em char
-(rather than
-.Em int ) .
-.It Cm j
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to an
-.Em intmax_t
-(rather than
-.Em int ) .
-.It Cm l
-Indicates either that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Em long int
-(rather than
-.Em int ) ,
-or that the conversion will be one of
-.Cm efg
-and the next pointer is a pointer to
-.Em double
-(rather than
-.Em float ) .
-.It Cm ll
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Em long long int
-(rather than
-.Em int ) .
-.It Cm q
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Em quad_t
-(rather than
-.Em int ) .
-.It Cm t
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Em ptrdiff_t
-(rather than
-.Em int ) .
-.It Cm z
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Em size_t
-(rather than
-.Em int ) .
-.It Cm L
-Indicates that the conversion will be
-.Cm efg
-and the next pointer is a pointer to
-.Em long double .
-.El
-.Pp
-In addition to these flags,
-there may be an optional maximum field width,
-expressed as a decimal integer,
-between the
-.Cm %
-and the conversion.
-If no width is given,
-a default of `infinity' is used (with one exception, below);
-otherwise at most this many characters are scanned
-in processing the conversion.
-Before conversion begins,
-most conversions skip white space;
-this white space is not counted against the field width.
-.Pp
-The following conversions are available:
-.Bl -tag -width XXXX
-.It Cm %
-Matches a literal `%'.
-That is, `%\&%' in the format string
-matches a single input `%' character.
-No conversion is done, and assignment does not occur.
-.It Cm d
-Matches an optionally signed decimal integer;
-the next pointer must be a pointer to
-.Em int .
-.It Cm D
-Equivalent to
-.Cm ld ;
-this exists only for backwards compatibility.
-.It Cm i
-Matches an optionally signed integer;
-the next pointer must be a pointer to
-.Em int .
-The integer is read in base 16 if it begins
-with
-.Ql 0x
-or
-.Ql 0X ,
-in base 8 if it begins with
-.Ql 0 ,
-and in base 10 otherwise.
-Only characters that correspond to the base are used.
-.It Cm o
-Matches an octal integer;
-the next pointer must be a pointer to
-.Em unsigned int .
-.It Cm O
-Equivalent to
-.Cm lo ;
-this exists for backwards compatibility.
-.It Cm u
-Matches an optionally signed decimal integer;
-the next pointer must be a pointer to
-.Em unsigned int .
-.It Cm x
-Matches an optionally signed hexadecimal integer;
-the next pointer must be a pointer to
-.Em unsigned int .
-.It Cm X
-Equivalent to
-.Cm x .
-.It Cm f
-Matches an optionally signed floating-point number;
-the next pointer must be a pointer to
-.Em float .
-.It Cm e
-Equivalent to
-.Cm f .
-.It Cm g
-Equivalent to
-.Cm f .
-.It Cm E
-Equivalent to
-.Cm f .
-.It Cm G
-Equivalent to
-.Cm f .
-.It Cm s
-Matches a sequence of non-white-space characters;
-the next pointer must be a pointer to
-.Em char ,
-and the array must be large enough to accept all the sequence and the
-terminating
-.Dv NUL
-character.
-The input string stops at white space
-or at the maximum field width, whichever occurs first.
-.It Cm c
-Matches a sequence of
-.Em width
-count
-characters (default 1);
-the next pointer must be a pointer to
-.Em char ,
-and there must be enough room for all the characters
-(no terminating
-.Dv NUL
-is added).
-The usual skip of leading white space is suppressed.
-To skip white space first, use an explicit space in the format.
-.It Cm \&[
-Matches a nonempty sequence of characters from the specified set
-of accepted characters;
-the next pointer must be a pointer to
-.Em char ,
-and there must be enough room for all the characters in the string,
-plus a terminating
-.Dv NUL
-character.
-The usual skip of leading white space is suppressed.
-The string is to be made up of characters in
-(or not in)
-a particular set;
-the set is defined by the characters between the open bracket
-.Cm \&[
-character
-and a close bracket
-.Cm \&]
-character.
-The set
-.Em excludes
-those characters
-if the first character after the open bracket is a circumflex
-.Cm ^ .
-To include a close bracket in the set,
-make it the first character after the open bracket
-or the circumflex;
-any other position will end the set.
-The hyphen character
-.Cm -
-is also special;
-when placed between two other characters,
-it adds all intervening characters to the set.
-To include a hyphen,
-make it the last character before the final close bracket.
-For instance,
-.Ql [^]0-9-]
-means the set `everything except close bracket, zero through nine,
-and hyphen'.
-The string ends with the appearance of a character not in the
-(or, with a circumflex, in) set
-or when the field width runs out.
-.It Cm p
-Matches a pointer value (as printed by
-.Ql %p
-in
-.Xr printf 3 ) ;
-the next pointer must be a pointer to
-.Em void .
-.It Cm n
-Nothing is expected;
-instead, the number of characters consumed thus far from the input
-is stored through the next pointer,
-which must be a pointer to
-.Em int .
-This is
-.Em not
-a conversion, although it can be suppressed with the
-.Cm *
-flag.
-.El
-.Pp
-For backwards compatibility,
-other conversion characters (except
-.Ql \e0 )
-are taken as if they were
-.Ql %d
-or, if uppercase,
-.Ql %ld ,
-and a `conversion' of
-.Ql %\e0
-causes an immediate return of
-.Dv EOF .
-.Pp
-The format string specifier macros described in
-.Xr inttypes 3
-should be used for the standard
-.Dq C99
-fixed-size integers documented in
-.Xr stdint 3 .
-.Sh RETURN VALUES
-These
-functions
-return
-the number of input items assigned, which can be fewer than provided
-for, or even zero, in the event of a matching failure.
-Zero
-indicates that, while there was input available,
-no conversions were assigned;
-typically this is due to an invalid input character,
-such as an alphabetic character for a
-.Ql %d
-conversion.
-The value
-.Dv EOF
-is returned if an input failure occurs before any conversion such as an
-end-of-file occurs.
-If an error or end-of-file occurs after conversion has begun,
-the number of conversions which were successfully completed is returned.
-.Sh SEE ALSO
-.Xr getc 3 ,
-.Xr inttypes 3 ,
-.Xr printf 3 ,
-.Xr strtod 3 ,
-.Xr strtol 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The functions
-.Fn fscanf ,
-.Fn scanf ,
-and
-.Fn sscanf
-conform to
-.St -isoC-90 .
-The
-.Cm %j ,
-.Cm %t
-and
-.Cm %z
-conversion format modifiers
-conform to
-.St -isoC-99 .
-The
-.Fn vfscanf ,
-.Fn vscanf
-and
-.Fn vsscanf
-functions conform to
-.St -isoC-99 .
-.Sh HISTORY
-The functions
-.Fn vscanf ,
-.Fn vsscanf
-and
-.Fn vfscanf
-appeared in
-.Bx 4.4
-or even
-.Bx 4.3 .
-.Sh NOTES
-All of the backwards compatibility formats will be removed in the future.
-.Sh BUGS
-Numerical strings are truncated to 512 characters; for example,
-.Cm %f
-and
-.Cm %d
-are implicitly
-.Cm %512f
-and
-.Cm %512d .
diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c
deleted file mode 100644
index b2f7d9a53..000000000
--- a/lib/libc/stdio/scanf.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: scanf.c,v 1.14 2013/04/19 23:32:17 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)scanf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: scanf.c,v 1.14 2013/04/19 23:32:17 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "reentrant.h"
-#include "local.h"
-
-__weak_alias(scanf_l, _scanf_l)
-
-int
-scanf(char const *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	_DIAGASSERT(fmt != NULL);
-
-	va_start(ap, fmt);
-	ret = __svfscanf(stdin, fmt, ap);
-	va_end(ap);
-	return ret;
-}
-
-int
-scanf_l(locale_t loc, char const *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	_DIAGASSERT(fmt != NULL);
-
-	va_start(ap, fmt);
-	ret = __svfscanf_l(stdin, loc, fmt, ap);
-	va_end(ap);
-	return ret;
-}
diff --git a/lib/libc/stdio/setbuf.3 b/lib/libc/stdio/setbuf.3
deleted file mode 100644
index 8d1990ece..000000000
--- a/lib/libc/stdio/setbuf.3
+++ /dev/null
@@ -1,223 +0,0 @@
-.\"	$NetBSD: setbuf.3,v 1.14 2015/07/15 19:08:43 christos Exp $
-.\"
-.\" Copyright (c) 1980, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)setbuf.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt SETBUF 3
-.Os
-.Sh NAME
-.Nm setbuf ,
-.Nm setbuffer ,
-.Nm setlinebuf ,
-.Nm setvbuf
-.Nd stream buffering operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft void
-.Fn setbuf "FILE * restrict stream" "char * restrict buf"
-.Ft void
-.Fn setbuffer "FILE *stream" "char *buf" "size_t size"
-.Ft int
-.Fn setlinebuf "FILE *stream"
-.Ft int
-.Fn setvbuf "FILE * restrict stream" "char * restrict buf" "int mode" "size_t size"
-.Sh DESCRIPTION
-The three types of buffering available are unbuffered, block buffered,
-and line buffered.
-When an output stream is unbuffered, information appears on the
-destination file or terminal as soon as written;
-when it is block buffered many characters are saved up and written as a block;
-when it is line buffered characters are saved up until a newline is
-output or input is read from any stream attached to a terminal device
-(typically stdin).
-.Pp
-The default buffer settings can be overwritten per descriptor
-.Dv ( STDBUFn )
-where
-.Dv n
-is the numeric value of the file descriptor represented by the stream, or
-for all descriptors
-.Dv ( STDBUF ) .
-The environment variable value is a letter followed by an optional numeric
-value indicating the size of the buffer.
-Valid sizes range from 0B to 1MB.
-Valid letters are:
-.Bl -tag -width X -indent
-.It Dv Li U
-Unbuffered.
-.It Dv Li L
-Line-buffered.
-.It Dv Li F
-Fully-buffered.
-.El
-.Pp
-The function
-.Xr fflush 3
-may be used to force the block out early.
-(See
-.Xr fclose 3 . )
-.Pp
-Normally all files are block buffered.
-When the first
-.Tn I/O
-operation occurs on a file,
-.Xr malloc 3
-is called,
-and an optimally-sized buffer is obtained.
-If a stream refers to a terminal
-(as
-.Em stdout
-normally does) it is line buffered.
-The standard error stream
-.Em stderr
-is initially unbuffered.
-.Pp
-The
-.Fn setvbuf
-function
-may be used to alter the buffering behavior of a stream.
-The
-.Fa mode
-parameter must be one of the following three macros:
-.Bl -tag -width _IOFBF -offset indent
-.It Dv _IONBF
-unbuffered
-.It Dv _IOLBF
-line buffered
-.It Dv _IOFBF
-fully buffered
-.El
-.Pp
-The
-.Fa size
-parameter may be given as zero
-to obtain deferred optimal-size buffer allocation as usual.
-If it is not zero,
-then except for unbuffered files, the
-.Fa buf
-argument should point to a buffer at least
-.Fa size
-bytes long;
-this buffer will be used instead of the current buffer.
-(If the
-.Fa size
-argument
-is not zero but
-.Fa buf
-is
-.Dv NULL ,
-a buffer of the given size will be allocated immediately,
-and released on close.
-This is an extension to ANSI C;
-portable code should use a size of 0 with any
-.Dv NULL
-buffer.)
-.Pp
-The
-.Fn setvbuf
-function may be used at any time,
-but may have peculiar side effects
-(such as discarding input or flushing output)
-if the stream is ``active''.
-Portable applications should call it only once on any given stream,
-and before any
-.Tn I/O
-is performed.
-.Pp
-The other three calls are, in effect, simply aliases for calls to
-.Fn setvbuf .
-Except for the lack of a return value, the
-.Fn setbuf
-function is exactly equivalent to the call
-.Pp
-.Dl "setvbuf(stream, buf, buf ? _IOFBF : _IONBF, BUFSIZ);"
-.Pp
-The
-.Fn setbuffer
-function
-is the same, except that the size of the buffer is up to the caller,
-rather than being determined by the default
-.Dv BUFSIZ .
-The
-.Fn setlinebuf
-function
-is exactly equivalent to the call:
-.Pp
-.Dl "setvbuf(stream, (char *)NULL, _IOLBF, 0);"
-.Sh RETURN VALUES
-The
-.Fn setvbuf
-function returns 0 on success, or
-.Dv EOF
-if the request cannot be honored
-(note that the stream is still functional in this case).
-.Pp
-The
-.Fn setlinebuf
-function returns what the equivalent
-.Fn setvbuf
-would have returned.
-.Sh SEE ALSO
-.Xr fclose 3 ,
-.Xr fopen 3 ,
-.Xr fread 3 ,
-.Xr malloc 3 ,
-.Xr printf 3 ,
-.Xr puts 3
-.Sh STANDARDS
-The
-.Fn setbuf
-and
-.Fn setvbuf
-functions
-conform to
-.St -ansiC .
-.Sh BUGS
-The
-.Fn setbuffer
-and
-.Fn setlinebuf
-functions are not portable to versions of
-.Bx
-before
-.Bx 4.2 .
-On
-.Bx 4.2
-and
-.Bx 4.3
-systems,
-.Fn setbuf
-always uses a suboptimal buffer size and should be avoided.
diff --git a/lib/libc/stdio/setbuf.c b/lib/libc/stdio/setbuf.c
deleted file mode 100644
index e2ce106f0..000000000
--- a/lib/libc/stdio/setbuf.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: setbuf.c,v 1.10 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)setbuf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: setbuf.c,v 1.10 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-void
-setbuf(FILE *fp, char *buf)
-{
-
-	_DIAGASSERT(fp != NULL);
-	/* buf may be NULL */
-
-	(void)setvbuf(fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
-}
diff --git a/lib/libc/stdio/setbuffer.c b/lib/libc/stdio/setbuffer.c
deleted file mode 100644
index eb10c9a00..000000000
--- a/lib/libc/stdio/setbuffer.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: setbuffer.c,v 1.13 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)setbuffer.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: setbuffer.c,v 1.13 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-
-void
-setbuffer(FILE *fp, char *buf, int size)
-{
-
-	_DIAGASSERT(fp != NULL);
-	/* buf may be NULL */
-
-	(void)setvbuf(fp, buf, buf ? _IOFBF : _IONBF, (size_t)size);
-}
-
-/*
- * set line buffering
- */
-int
-setlinebuf(FILE *fp)
-{
-
-	_DIAGASSERT(fp != NULL);
-
-	return setvbuf(fp, NULL, _IOLBF, (size_t)0);
-}
diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c
deleted file mode 100644
index 4fe57722a..000000000
--- a/lib/libc/stdio/setvbuf.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*	$NetBSD: setvbuf.c,v 1.19 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)setvbuf.c	8.2 (Berkeley) 11/16/93";
-#else
-__RCSID("$NetBSD: setvbuf.c,v 1.19 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * Set one of the three kinds of buffering, optionally including
- * a buffer.
- */
-int
-setvbuf(FILE *fp, char *buf, int mode, size_t size)
-{
-	int ret, flags;
-	size_t iosize;
-	int ttyflag;
-
-	_DIAGASSERT(fp != NULL);
-	/* buf may be NULL */
-
-	/*
-	 * Verify arguments.  The `int' limit on `size' is due to this
-	 * particular implementation.  Note, buf and size are ignored
-	 * when setting _IONBF.
-	 */
-	if (mode != _IONBF)
-		if ((mode != _IOFBF && mode != _IOLBF) || (int)size < 0)
-			return -1;
-
-	FLOCKFILE(fp);
-	/*
-	 * Write current buffer, if any.  Discard unread input (including
-	 * ungetc data), cancel line buffering, and free old buffer if
-	 * malloc()ed.  We also clear any eof condition, as if this were
-	 * a seek.
-	 */
-	ret = 0;
-	(void)__sflush(fp);
-	if (HASUB(fp))
-		FREEUB(fp);
-	WCIO_FREE(fp);
-	fp->_r = fp->_lbfsize = 0;
-	flags = fp->_flags;
-	if (flags & __SMBF)
-		free((void *)fp->_bf._base);
-	flags &= ~(__SLBF | __SNBF | __SMBF | __SOPT | __SNPT | __SEOF);
-
-	/* If setting unbuffered mode, skip all the hard work. */
-	if (mode == _IONBF)
-		goto nbf;
-
-	/*
-	 * Find optimal I/O size for seek optimization.  This also returns
-	 * a `tty flag' to suggest that we check isatty(fd), but we do not
-	 * care since our caller told us how to buffer.
-	 */
-	flags |= __swhatbuf(fp, &iosize, &ttyflag);
-	if (size == 0) {
-		buf = NULL;	/* force local allocation */
-		size = iosize;
-	}
-
-	/* Allocate buffer if needed. */
-	if (buf == NULL) {
-		if ((buf = malloc(size)) == NULL) {
-			/*
-			 * Unable to honor user's request.  We will return
-			 * failure, but try again with file system size.
-			 */
-			ret = -1;
-			if (size != iosize) {
-				size = iosize;
-				buf = malloc(size);
-			}
-		}
-		if (buf == NULL) {
-			/* No luck; switch to unbuffered I/O. */
-nbf:
-			fp->_flags = flags | __SNBF;
-			fp->_w = 0;
-			fp->_bf._base = fp->_p = fp->_nbuf;
-			fp->_bf._size = 1;
-			FUNLOCKFILE(fp);
-			return ret;
-		}
-		flags |= __SMBF;
-	}
-
-	/*
-	 * Kill any seek optimization if the buffer is not the
-	 * right size.
-	 *
-	 * SHOULD WE ALLOW MULTIPLES HERE (i.e., ok iff (size % iosize) == 0)?
-	 */
-	if (size != iosize)
-		flags |= __SNPT;
-
-	/*
-	 * Fix up the FILE fields, and set __cleanup for output flush on
-	 * exit (since we are buffered in some way).
-	 */
-	if (mode == _IOLBF)
-		flags |= __SLBF;
-	fp->_flags = flags;
-	fp->_bf._base = fp->_p = (unsigned char *)buf;
-	_DIAGASSERT(__type_fit(int, size));
-	fp->_bf._size = (int)size;
-	/* fp->_lbfsize is still 0 */
-	if (flags & __SWR) {
-		/*
-		 * Begin or continue writing: see __swsetup().  Note
-		 * that __SNBF is impossible (it was handled earlier).
-		 */
-		if (flags & __SLBF) {
-			fp->_w = 0;
-			fp->_lbfsize = -fp->_bf._size;
-		} else {
-			_DIAGASSERT(__type_fit(int, size));
-			fp->_w = (int)size;
-		}
-	} else {
-		/* begin/continue reading, or stay in intermediate state */
-		fp->_w = 0;
-	}
-	__cleanup = _cleanup;
-
-	FUNLOCKFILE(fp);
-	return ret;
-}
diff --git a/lib/libc/stdio/snprintf_ss.c b/lib/libc/stdio/snprintf_ss.c
deleted file mode 100644
index 32d004b36..000000000
--- a/lib/libc/stdio/snprintf_ss.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: snprintf_ss.c,v 1.4 2007/02/02 23:00:28 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)snprintf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: snprintf_ss.c,v 1.4 2007/02/02 23:00:28 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "reentrant.h"
-#include "extern.h"
-#include "local.h"
-
-#ifdef __weak_alias
-__weak_alias(snprintf_ss,_snprintf_ss)
-#endif
-
-int
-snprintf_ss(char *str, size_t n, char const *fmt, ...)
-{
-	va_list ap;
-	int ret;
-
-	va_start(ap, fmt);
-	ret = vsnprintf_ss(str, n, fmt, ap);
-	va_end(ap);
-	return ret;
-}
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
deleted file mode 100644
index 6a995c342..000000000
--- a/lib/libc/stdio/sscanf.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: sscanf.c,v 1.21 2013/04/19 23:32:17 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)sscanf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: sscanf.c,v 1.21 2013/04/19 23:32:17 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "reentrant.h"
-#include "local.h"
-
-__weak_alias(sscanf_l, _sscanf_l)
-
-int
-sscanf(const char *str, char const *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	_DIAGASSERT(fmt != NULL);
-
-	va_start(ap, fmt);
-	ret = vsscanf(str, fmt, ap);
-	va_end(ap);
-	return ret;
-}
-
-int
-sscanf_l(const char *str, locale_t loc, char const *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	_DIAGASSERT(fmt != NULL);
-
-	va_start(ap, fmt);
-	ret = vsscanf_l(str, loc, fmt, ap);
-	va_end(ap);
-	return ret;
-}
diff --git a/lib/libc/stdio/stdio.3 b/lib/libc/stdio/stdio.3
deleted file mode 100644
index 7caa622e6..000000000
--- a/lib/libc/stdio/stdio.3
+++ /dev/null
@@ -1,349 +0,0 @@
-.\"	$NetBSD: stdio.3,v 1.26 2015/09/06 04:20:50 mrg Exp $
-.\"
-.\" Copyright (c) 1990, 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. 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.
-.\"
-.\"     @(#)stdio.3	8.7 (Berkeley) 4/19/94
-.\"
-.Dd September 6, 2015
-.Dt STDIO 3
-.Os
-.Sh NAME
-.Nm stdio
-.Nd standard input/output library functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Vt FILE *stdin;
-.Vt FILE *stdout;
-.Vt FILE *stderr;
-.Sh DESCRIPTION
-The standard
-.Tn I/O
-library provides a simple and efficient buffered stream
-.Tn I/O
-interface.
-Input and output is mapped into logical data streams
-and the physical
-.Tn I/O
-characteristics are concealed.
-.Pp
-A stream is associated with an external file (which may be a physical
-device) by
-.Em opening
-a file, which may involve creating a new file.
-Creating an existing file causes its former contents to be discarded.
-If a file can support positioning requests (such as a disk file, as opposed
-to a terminal) then a
-.Em file position indicator
-associated with the stream is positioned at the start of the file (byte
-zero), unless the file is opened with append mode.
-If append mode
-is used, the position indicator will be placed the end-of-file.
-The position indicator is maintained by subsequent reads, writes
-and positioning requests.
-All input occurs as if the characters
-were read by successive calls to the
-.Xr fgetc 3
-function; all output takes place as if all characters were
-read by successive calls to the
-.Xr fputc 3
-function.
-.Pp
-A file is disassociated from a stream by
-.Em closing
-the file.
-Output streams are flushed (any unwritten buffer contents are transferred
-to the host environment) before the stream is disassociated from the file.
-The value of a pointer to a
-.Dv FILE
-object is indeterminate after a file is closed (garbage).
-.Pp
-A file may be subsequently reopened, by the same or another program
-execution, and its contents reclaimed or modified (if it can be repositioned
-at the start).
-If the main function returns to its original caller, or the
-.Xr exit 3
-function is called, all open files are closed (hence all output
-streams are flushed) before program termination.
-Other methods of program termination, such as
-.Xr abort 3
-do not bother about closing files properly.
-.Pp
-This implementation needs and makes
-no distinction between
-.Dq text
-and
-.Dq binary
-streams.
-In effect, all streams are binary.
-No translation is performed and no extra padding appears on any stream.
-.Pp
-At program startup, three streams are predefined and need not be
-opened explicitly:
-.Bl -enum -offset indent
-.It
-.Em standard input
-for reading conventional input,
-.It
-.Em standard output
-for writing conventional output, and
-.It
-.Em standard error
-for writing diagnostic output.
-.El
-.Pp
-These streams are abbreviated
-.Em stdin ,
-.Em stdout ,
-and
-.Em stderr .
-.Pp
-Initially, the standard error stream
-is unbuffered; the standard input and output streams are
-fully buffered if and only if the streams do not refer to
-an interactive or
-.Dq terminal
-device, as determined by the
-.Xr isatty 3
-function.
-In fact,
-.Em all
-freshly-opened streams that refer to terminal devices
-default to line buffering, and
-pending output to such streams is written automatically
-whenever an such an input stream is read.
-Note that this applies only to
-.Dq "true reads" ;
-if the read request can be satisfied by existing buffered data,
-no automatic flush will occur.
-In these cases,
-or when a large amount of computation is done after printing
-part of a line on an output terminal, it is necessary to
-.Xr fflush 3
-the standard output before going off and computing so that the output
-will appear.
-Alternatively, these defaults may be modified via the
-.Xr setvbuf 3
-function.
-.Sh IMPLEMENTATION NOTES
-In multi-threaded applications, operations on streams perform implicit
-locking, except for the
-.Fn getc_unlocked ,
-.Fn getchar_unlocked ,
-.Fn putc_unlocked ,
-and
-.Fn putchar_unlocked
-functions.
-Explicit control of stream locking is available through the
-.Fn flockfile ,
-.Fn ftrylockfile ,
-and
-.Fn funlockfile
-functions .
-.Pp
-The following are defined as macros; these names may not be re-used
-without first removing their current definitions with
-.Dv #undef :
-.Dv BUFSIZ ,
-.Dv EOF ,
-.Dv FILENAME_MAX ,
-.Dv FOPEN_MAX ,
-.Dv L_cuserid ,
-.Dv L_ctermid ,
-.Dv L_tmpnam ,
-.Dv NULL ,
-.Dv SEEK_END ,
-.Dv SEEK_SET ,
-.Dv SEE_CUR ,
-.Dv TMP_MAX ,
-.Fn clearerr ,
-.Fn feof ,
-.Fn ferror ,
-.Fn fileno ,
-.Fn freopen ,
-.Fn fwopen ,
-.Fn getc ,
-.Fn getc_unlocked ,
-.Fn getchar ,
-.Fn getchar_unlocked ,
-.Fn putc ,
-.Fn putc_unlocked ,
-.Fn putchar ,
-.Fn putchar_unlocked ,
-.Dv stderr ,
-.Dv stdin ,
-.Dv stdout .
-.Pp
-Function versions of the macro functions
-.Fn feof ,
-.Fn ferror ,
-.Fn clearerr ,
-.Fn fileno ,
-.Fn getc ,
-.Fn getc_unlocked ,
-.Fn getchar ,
-.Fn getchar_unlocked ,
-.Fn putc ,
-.Fn putc_unlocked ,
-.Fn putchar ,
-and
-.Fn putchar_unlocked
-exist and will be used if the macros definitions are explicitly removed.
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr open 2 ,
-.Xr read 2 ,
-.Xr write 2
-.Sh STANDARDS
-The
-.Nm
-library conforms to
-.St -ansiC .
-.Sh LIST OF FUNCTIONS
-.Bl -column "putchar_unlocked" "Description"
-.It Sy Function	Description
-.It asprintf	formatted output conversion with allocation
-.It asprintf_l	formatted output conversion with allocation
-.It clearerr	check and reset stream status
-.It dprintf	formatted output conversion
-.It dprintf_l	formatted output conversion
-.It fclose	close a stream
-.It fdopen	stream open functions
-.It feof	check and reset stream status
-.It ferror	check and reset stream status
-.It fflush	flush a stream
-.It fgetc	get next character or word from input stream
-.It fgetln	get a line from a stream
-.It fgetpos	reposition a stream
-.It fgets	get a line from a stream
-.It fgetwc	get next wide character from input stream
-.It fileno	check and reset stream status
-.It flockfile	lock a stream
-.It fmemopen	open a stream that points to a memory buffer
-.It fopen	stream open functions
-.It fprintf	formatted output conversion
-.It fprintf_l	formatted output conversion
-.It fpurge	flush a stream
-.It fputc	output a character or word to a stream
-.It fputs	output a line to a stream
-.It fputwc	output a wide character to a stream
-.It fread	binary stream input/output
-.It freopen	stream open functions
-.It fropen	open a stream
-.It fscanf	input format conversion
-.It fscanf_l	input format conversion
-.It fseek	reposition a stream
-.It fseeko	reposition a stream
-.It fsetpos	reposition a stream
-.It ftell	reposition a stream
-.It ftello	reposition a stream
-.It ftrylockfile	lock a stream (non-blocking)
-.It funlockfile	unlock a stream
-.It funopen	open a stream
-.It funopen2	open a stream, with flush support
-.It fwide	set/get orientation of a stream
-.It fwopen	open a stream
-.It fwrite	binary stream input/output
-.It getc	get next character or word from input stream
-.It getc_unlocked	get next character or word from input stream
-.It             Ta (no implicit locking)
-.It getchar	get next character or word from input stream
-.It getchar_unlocked	get next character or word from input stream
-.It             Ta (no implicit locking)
-.It getdelim	get a delimited record from a stream
-.It getline	get a line from a stream
-.It gets	get a line from a stream
-.It getw	get next character or word from input stream
-.It getwc	get next wide character from input stream
-.It getwchar	get next wide character from input stream
-.It mkstemp	create unique temporary file
-.It mktemp	create unique temporary file
-.It open_memstream	open memory as a stream
-.It popen	open a program as a stream
-.It popenve	open a program as a stream
-.It pclose	close an opened program stream
-.It perror	system error messages
-.It printf	formatted output conversion
-.It printf_l	formatted output conversion
-.It putc	output a character or word to a stream
-.It putc_unlocked	output a character or word to a stream
-.It             Ta (no implicit locking)
-.It putchar	output a character or word to a stream
-.It putchar_unlocked	output a character or word to a stream
-.It             Ta (no implicit locking)
-.It puts	output a line to a stream
-.It putw	output a character or word to a stream
-.It putwc	output a wide character to a stream
-.It putwchar	output a wide character to a stream
-.It remove	remove directory entry
-.It rewind	reposition a stream
-.It scanf	input format conversion
-.It scanf_l	input format conversion
-.It setbuf	stream buffering operations
-.It setbuffer	stream buffering operations
-.It setlinebuf	stream buffering operations
-.It setvbuf	stream buffering operations
-.It snprintf	formatted output conversion
-.It snprintf_l	formatted output conversion
-.It sprintf	formatted output conversion
-.It sscanf	input format conversion
-.It sscanf_l	input format conversion
-.It strerror	system error messages
-.It sys_errlist	system error messages
-.It sys_nerr	system error messages
-.It tempnam	temporary file routines
-.It tmpfile	temporary file routines
-.It tmpnam	temporary file routines
-.It ungetc	un-get character from input stream
-.It ungetwc	un-get wide character from input stream
-.It vasprintf	formatted output conversion with allocation
-.It vasprintf_l	formatted output conversion with allocation
-.It vdprintf	formatted output conversion
-.It vdprintf_l	formatted output conversion
-.It vfprintf	formatted output conversion
-.It vfprintf_l	formatted output conversion
-.It vfscanf	input format conversion
-.It vfscanf_l	input format conversion
-.It vprintf	formatted output conversion
-.It vprintf_l	formatted output conversion
-.It vscanf	input format conversion
-.It vscanf_l	input format conversion
-.It vsnprintf	formatted output conversion
-.It vsnprintf_l	formatted output conversion
-.It vsprintf	formatted output conversion
-.It vsprintf_l	formatted output conversion
-.It vsscanf	input format conversion
-.It vsscanf_l	input format conversion
-.El
-.Sh BUGS
-The standard buffered functions do not interact well with certain other
-library and system functions, especially
-.Xr vfork 2
-and
-.Xr abort 3 .
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c
deleted file mode 100644
index 540d662c2..000000000
--- a/lib/libc/stdio/stdio.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*	$NetBSD: stdio.c,v 1.22 2013/05/19 17:07:04 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)stdio.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: stdio.c,v 1.22 2013/05/19 17:07:04 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * Small standard I/O/seek/close functions.
- * These maintain the `known seek offset' for seek optimisation.
- */
-ssize_t
-__sread(void *cookie, void *buf, size_t n)
-{
-	FILE *fp = cookie;
-	ssize_t ret;
-	
-	_DIAGASSERT(cookie != NULL);
-	_DIAGASSERT(cookie == fp->_cookie);
-	_DIAGASSERT(buf != NULL);
-
-	ret = read(__sfileno(fp), buf, n);
-	/* if the read succeeded, update the current offset */
-	if (ret >= 0)
-		fp->_offset += ret;
-	else
-		fp->_flags &= ~__SOFF;	/* paranoia */
-
-	return ret;
-}
-
-ssize_t
-__swrite(void *cookie, const void *buf, size_t n)
-{
-	FILE *fp = cookie;
-
-	_DIAGASSERT(cookie != NULL);
-	_DIAGASSERT(cookie == fp->_cookie);
-	_DIAGASSERT(buf != NULL);
-
-	if (fp->_flags & __SAPP)
-		if (lseek(__sfileno(fp), (off_t)0, SEEK_END) == (off_t)-1) {
-			if (errno == ESPIPE)            /* if unseekable, OK, */
-				fp->_flags &= ~__SAPP;  /* all writes append. */
-			else
-				return -1;
-		}
-	fp->_flags &= ~__SOFF;	/* in case FAPPEND mode is set */
-	return write(__sfileno(fp), buf, n);
-}
-
-off_t
-__sseek(void *cookie, off_t offset, int whence)
-{
-	FILE *fp = cookie;
-	off_t ret;
-
-	_DIAGASSERT(cookie != NULL);
-	_DIAGASSERT(cookie == fp->_cookie);
-	
-	ret = lseek(__sfileno(fp), offset, whence);
-	if (ret == (off_t)-1L)
-		fp->_flags &= ~__SOFF;
-	else {
-		fp->_flags |= __SOFF;
-		fp->_offset = ret;
-	}
-	return ret;
-}
-
-int
-__sclose(void *cookie)
-{
-	FILE *fp = cookie;
-
-	_DIAGASSERT(cookie != NULL);
-	_DIAGASSERT(cookie == fp->_cookie);
-
-	return close(__sfileno(fp));
-}
diff --git a/lib/libc/stdio/swprintf.c b/lib/libc/stdio/swprintf.c
deleted file mode 100644
index fead7801d..000000000
--- a/lib/libc/stdio/swprintf.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: swprintf.c,v 1.3 2013/04/19 15:22:25 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/stdio/swprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
-#else
-__RCSID("$NetBSD: swprintf.c,v 1.3 2013/04/19 15:22:25 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-__weak_alias(swprintf_l, _swprintf_l)
-
-int
-swprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vswprintf(s, n, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
-
-int
-swprintf_l(wchar_t * __restrict s, size_t n, locale_t loc,
-    const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vswprintf_l(s, n, loc, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
diff --git a/lib/libc/stdio/swscanf.c b/lib/libc/stdio/swscanf.c
deleted file mode 100644
index e020c2275..000000000
--- a/lib/libc/stdio/swscanf.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: swscanf.c,v 1.3 2013/04/19 23:32:17 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/stdio/swscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
-#else
-__RCSID("$NetBSD: swscanf.c,v 1.3 2013/04/19 23:32:17 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-__weak_alias(swscanf_l, _swscanf_l)
-
-int
-swscanf(const wchar_t * __restrict str, const wchar_t * __restrict fmt, ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vswscanf(str, fmt, ap);
-	va_end(ap);
-
-	return r;
-}
-
-int
-swscanf_l(const wchar_t * __restrict str, locale_t loc,
-    const wchar_t * __restrict fmt, ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vswscanf_l(str, loc, fmt, ap);
-	va_end(ap);
-
-	return r;
-}
diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c
deleted file mode 100644
index 2a55a5c2b..000000000
--- a/lib/libc/stdio/tempnam.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*	$NetBSD: tempnam.c,v 1.22 2012/03/15 18:22:30 christos 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)tempnam.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: tempnam.c,v 1.22 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <paths.h>
-#include "reentrant.h"
-#include "local.h"
-
-__warn_references(tempnam,
-    "warning: tempnam() possibly used unsafely, use mkstemp() or mkdtemp()")
-
-static const char *
-trailsl(const char *f)
-{
-	const char *s = f;
-	while (*s)
-		s++;
-	return (f != s && s[-1] == '/') ? "" : "/";
-}
-
-static char *
-gentemp(char *name, size_t len, const char *tmp, const char  *pfx)
-{
-	(void)snprintf(name, len, "%s%s%sXXXXXXXXXX", tmp, trailsl(tmp), pfx);
-	return _mktemp(name);
-}
-
-char *
-tempnam(const char *dir, const char *pfx)
-{
-	int sverrno;
-	char *name, *f;
-	const char *tmp;
-
-	if (!(name = malloc((size_t)MAXPATHLEN)))
-		return NULL;
-
-	if (!pfx)
-		pfx = "tmp.";
-
-	if ((tmp = getenv("TMPDIR")) != NULL &&
-	    (f = gentemp(name, (size_t)MAXPATHLEN, tmp, pfx)) != NULL)
-		return f;
-
-	if (dir != NULL &&
-	    (f = gentemp(name, (size_t)MAXPATHLEN, dir, pfx)) != NULL)
-		return f;
-
-	if ((f = gentemp(name, (size_t)MAXPATHLEN, P_tmpdir, pfx)) != NULL)
-		return f;
-
-	if ((f = gentemp(name, (size_t)MAXPATHLEN, _PATH_TMP, pfx)) != NULL)
-		return f;
-
-	sverrno = errno;
-	free(name);
-	errno = sverrno;
-	return NULL;
-}
diff --git a/lib/libc/stdio/tmpfile.c b/lib/libc/stdio/tmpfile.c
deleted file mode 100644
index a62e8f288..000000000
--- a/lib/libc/stdio/tmpfile.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: tmpfile.c,v 1.12 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)tmpfile.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: tmpfile.c,v 1.12 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <paths.h>
-
-FILE *
-tmpfile(void)
-{
-	sigset_t set, oset;
-	FILE *fp;
-	int fd, sverrno;
-#define	TRAILER	"tmp.XXXXXXXXXX"
-	char buf[sizeof(_PATH_TMP) + sizeof(TRAILER)];
-
-	(void)memcpy(buf, _PATH_TMP, sizeof(_PATH_TMP) - 1);
-	(void)memcpy(buf + sizeof(_PATH_TMP) - 1, TRAILER, sizeof(TRAILER));
-
-	sigfillset(&set);
-	(void)sigprocmask(SIG_BLOCK, &set, &oset);
-
-	fd = mkstemp(buf);
-	if (fd != -1)
-		(void)unlink(buf);
-
-	(void)sigprocmask(SIG_SETMASK, &oset, NULL);
-
-	if (fd == -1)
-		return NULL;
-
-	if ((fp = fdopen(fd, "w+")) == NULL) {
-		sverrno = errno;
-		(void)close(fd);
-		errno = sverrno;
-		return NULL;
-	}
-	return fp;
-}
diff --git a/lib/libc/stdio/tmpnam.3 b/lib/libc/stdio/tmpnam.3
deleted file mode 100644
index 3ece3f990..000000000
--- a/lib/libc/stdio/tmpnam.3
+++ /dev/null
@@ -1,261 +0,0 @@
-.\"	$NetBSD: tmpnam.3,v 1.17 2010/04/30 04:55:10 jruoho Exp $
-.\"
-.\" Copyright (c) 1988, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)tmpnam.3	8.2 (Berkeley) 11/17/93
-.\"
-.Dd April 30, 2010
-.Dt TMPFILE 3
-.Os
-.Sh NAME
-.Nm tempnam ,
-.Nm tmpfile ,
-.Nm tmpnam
-.Nd temporary file routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft FILE *
-.Fn tmpfile void
-.Ft char *
-.Fn tmpnam "char *str"
-.Ft char *
-.Fn tempnam "const char *tmpdir" "const char *prefix"
-.Sh DESCRIPTION
-The
-.Fn tmpfile
-function
-returns a pointer to a stream associated with a file descriptor returned
-by the routine
-.Xr mkstemp 3 .
-The created file is unlinked before
-.Fn tmpfile
-returns, causing the file to be automatically deleted when the last
-reference to it is closed.
-The file is opened with the access value
-.Ql w+ .
-.Pp
-The
-.Fn tmpnam
-function
-returns a pointer to a file name, in the
-.Dv P_tmpdir
-directory, which
-did not reference an existing file at some indeterminate point in the
-past.
-.Dv P_tmpdir
-is defined in the include file
-.In stdio.h .
-If the argument
-.Fa s
-is
-.Pf non- Dv NULL ,
-the file name is copied to the buffer it references.
-Otherwise, the file name is copied to a static buffer.
-In either case,
-.Fn tmpnam
-returns a pointer to the file name.
-.Pp
-The buffer referenced by
-.Fa s
-is expected to be at least
-.Dv L_tmpnam
-bytes in length.
-.Dv L_tmpnam
-is defined in the include file
-.In stdio.h .
-.Pp
-The
-.Fn tempnam
-function
-is similar to
-.Fn tmpnam ,
-but provides the ability to specify the directory which will
-contain the temporary file and the file name prefix.
-.Pp
-The environment variable
-.Ev TMPDIR
-(if set), the argument
-.Fa tmpdir
-(if
-.Pf non- Dv NULL ) ,
-the directory
-.Dv P_tmpdir ,
-and the directory
-.Pa /tmp
-are tried, in the listed order, as directories in which to store the
-temporary file.
-.Pp
-The argument
-.Fa prefix ,
-if
-.Pf non- Dv NULL ,
-is used to specify a file name prefix, which will be the
-first part of the created file name.
-.Fn tempnam
-allocates memory in which to store the file name; the returned pointer
-may be used as a subsequent argument to
-.Xr free 3 .
-.Sh RETURN VALUES
-The
-.Fn tmpfile
-function
-returns a pointer to an open file stream on success, and a
-.Dv NULL
-pointer
-on error.
-.Pp
-The
-.Fn tmpnam
-and
-.Fn tempnam
-functions
-return a pointer to a file name on success, and a
-.Dv NULL
-pointer
-on error.
-.Sh ERRORS
-The
-.Fn tmpfile
-function
-may fail and set the global variable
-.Va errno
-for any of the errors specified for the library functions
-.Xr fdopen 3
-or
-.Xr mkstemp 3 .
-.Pp
-The
-.Fn tmpnam
-function
-may fail and set
-.Va errno
-for any of the errors specified for the library function
-.Xr mktemp 3 .
-.Pp
-The
-.Fn tempnam
-function
-may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr malloc 3
-or
-.Xr mktemp 3 .
-.Sh SEE ALSO
-.Xr mkstemp 3 ,
-.Xr mktemp 3
-.Sh STANDARDS
-The
-.Fn tmpfile
-and
-.Fn tmpnam
-functions
-conform to
-.St -ansiC .
-All described functions also conform to
-.St -p1003.1-2001 ,
-albeit the
-.Fn tempnam
-and
-.Fn tmpnam
-functions have been marked as obsolete in the
-.St -p1003.1-2008
-revision.
-.Sh BUGS
-These interfaces are provided for
-.At V
-and
-.Tn ANSI
-compatibility only.
-The
-.Xr mkstemp 3
-interface is strongly preferred.
-.Sh SECURITY CONSIDERATIONS
-There are four important problems with these interfaces (as well as
-with the historic
-.Xr mktemp 3
-interface).
-First, there is an obvious race between file name selection and file
-creation and deletion: the program is typically written to call
-.Fn tmpnam ,
-.Fn tempnam ,
-or
-.Xr mktemp 3 .
-Subsequently, the program calls
-.Xr open 2
-or
-.Xr fopen 3
-and erroneously opens a file (or symbolic link, or fifo or other
-device) that the attacker has placed in the expected file location.
-Hence
-.Xr mkstemp 3
-is recommended, since it atomically creates the file.
-.Pp
-Second, most historic implementations provide only a limited number
-of possible temporary file names (usually 26) before file names will
-start being recycled.
-Third, the
-.At V
-implementations of these functions (and of
-.Xr mktemp 3 )
-use the
-.Xr access 2
-system call to determine whether or not the temporary file may be created.
-This has obvious ramifications for setuid or setgid programs, complicating
-the portable use of these interfaces in such programs.
-Finally, there is no specification of the permissions with which the
-temporary files are created.
-.Pp
-This implementation of
-.Fn tmpfile
-does not have these flaws,
-and that of
-.Fn tmpnam
-and
-.Fn tempnam
-only have the first limitation, but portable software
-cannot depend on that.
-In particular, the
-.Fn tmpfile
-interface should not be used in software expected to be used on other systems
-if there is any possibility that the user does not wish the temporary file to
-be publicly readable and writable.
-.Pp
-A link-time warning will be issued if
-.Fn tmpnam
-or
-.Fn tempnam
-is used, and advises the use of
-.Fn mkstemp
-instead.
diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c
deleted file mode 100644
index 9bb7858ea..000000000
--- a/lib/libc/stdio/tmpnam.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: tmpnam.c,v 1.15 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)tmpnam.c	8.3 (Berkeley) 3/28/94";
-#else
-__RCSID("$NetBSD: tmpnam.c,v 1.15 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
-#include "reentrant.h"
-#include "local.h"
-
-__warn_references(tmpnam,
-    "warning: tmpnam() possibly used unsafely, use mkstemp() or mkdtemp()")
-
-char *
-tmpnam(char *s)
-{
-	static u_long tmpcount;
-	static char buf[L_tmpnam];
-
-	if (s == NULL)
-		s = buf;
-	(void)snprintf(s, L_tmpnam, "%stmp.%lu.XXXXXXXXXX", P_tmpdir, tmpcount);
-	++tmpcount;
-	return _mktemp(s);
-}
diff --git a/lib/libc/stdio/ungetc.3 b/lib/libc/stdio/ungetc.3
deleted file mode 100644
index a9fe94cf9..000000000
--- a/lib/libc/stdio/ungetc.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\"	$NetBSD: ungetc.3,v 1.10 2010/04/30 05:56:14 jruoho Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)ungetc.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 30, 2010
-.Dt UNGETC 3
-.Os
-.Sh NAME
-.Nm ungetc
-.Nd un-get character from input stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn ungetc "int c" "FILE *stream"
-.Sh DESCRIPTION
-The
-.Fn ungetc
-function pushes the character
-.Fa c
-(converted to an unsigned char)
-back onto the input stream pointed to by
-.Fa stream .
-The pushed-backed characters will be returned by subsequent reads on the
-stream (in reverse order).
-A successful intervening call, using the same stream, to one of the file
-positioning functions
-.Po
-.Xr fseek 3 ,
-.Xr fsetpos 3 ,
-or
-.Xr rewind 3
-.Pc
-will discard the pushed back characters.
-.Pp
-One character of push-back is guaranteed,
-but as long as there is
-sufficient memory, an effectively infinite amount of pushback is allowed.
-.Pp
-If a character is successfully pushed-back,
-the end-of-file indicator for the stream is cleared.
-.Sh RETURN VALUES
-The
-.Fn ungetc
-function
-returns
-the character pushed-back after the conversion, or
-.Dv EOF
-if the operation fails.
-If the value of the argument
-.Fa c
-character equals
-.Dv EOF ,
-the operation will fail and the stream will remain unchanged.
-.Sh SEE ALSO
-.Xr fseek 3 ,
-.Xr getc 3 ,
-.Xr setvbuf 3
-.Sh STANDARDS
-The
-.Fn ungetc
-function conforms to
-.St -ansiC
-and
-.St -p1003.1-2001 .
-.Sh HISTORY
-An
-.Fn ungetc
-function appeared in
-.At v7 .
diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c
deleted file mode 100644
index c7a2f7629..000000000
--- a/lib/libc/stdio/ungetc.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*	$NetBSD: ungetc.c,v 1.17 2012/03/15 18:22:30 christos Exp $	*/
-
-/*-
- * Copyright c 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)ungetc.c	8.2 (Berkeley) 11/3/93";
-#else
-__RCSID("$NetBSD: ungetc.c,v 1.17 2012/03/15 18:22:30 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * Expand the ungetc buffer `in place'.  That is, adjust fp->_p when
- * the buffer moves, so that it points the same distance from the end,
- * and move the bytes in the buffer around as necessary so that they
- * are all at the end (stack-style).
- */
-static int
-__submore(FILE *fp)
-{
-	int i;
-	unsigned char *p;
-
-	_DIAGASSERT(fp != NULL);
-
-	if (_UB(fp)._base == fp->_ubuf) {
-		/*
-		 * Get a new buffer (rather than expanding the old one).
-		 */
-		if ((p = malloc((size_t)BUFSIZ)) == NULL)
-			return EOF;
-		_UB(fp)._base = p;
-		_UB(fp)._size = BUFSIZ;
-		p += BUFSIZ - sizeof(fp->_ubuf);
-		for (i = sizeof(fp->_ubuf); --i >= 0;)
-			p[i] = fp->_ubuf[i];
-		fp->_p = p;
-		return 0;
-	}
-	i = _UB(fp)._size;
-	p = realloc(_UB(fp)._base, (size_t)(i << 1));
-	if (p == NULL)
-		return EOF;
-	/* no overlap (hence can use memcpy) because we doubled the size */
-	(void)memcpy((p + i), p, (size_t)i);
-	fp->_p = p + i;
-	_UB(fp)._base = p;
-	_UB(fp)._size = i << 1;
-	return 0;
-}
-
-int
-ungetc(int c, FILE *fp)
-{
-
-	_DIAGASSERT(fp != NULL);
-
-	if (c == EOF)
-		return EOF;
-	if (!__sdidinit)
-		__sinit();
-	FLOCKFILE(fp);
-	_SET_ORIENTATION(fp, -1);
-	if ((fp->_flags & __SRD) == 0) {
-		/*
-		 * Not already reading: no good unless reading-and-writing.
-		 * Otherwise, flush any current write stuff.
-		 */
-		if ((fp->_flags & __SRW) == 0) {
-			FUNLOCKFILE(fp);
-			return EOF;
-		}
-		if (fp->_flags & __SWR) {
-			if (__sflush(fp)) {
-				FUNLOCKFILE(fp);
-				return EOF;
-			}
-			fp->_flags &= ~__SWR;
-			fp->_w = 0;
-			fp->_lbfsize = 0;
-		}
-		fp->_flags |= __SRD;
-	}
-	c = (unsigned char)c;
-
-	/*
-	 * If we are in the middle of ungetc'ing, just continue.
-	 * This may require expanding the current ungetc buffer.
-	 */
-	if (HASUB(fp)) {
-		if (fp->_r >= _UB(fp)._size && __submore(fp)) {
-			FUNLOCKFILE(fp);
-			return EOF;
-		}
-		*--fp->_p = c;
-		fp->_r++;
-		FUNLOCKFILE(fp);
-		return c;
-	}
-	fp->_flags &= ~__SEOF;
-
-	/*
-	 * If we can handle this by simply backing up, do so,
-	 * but never replace the original character.
-	 * (This makes sscanf() work when scanning `const' data.)
-	 */
-	if (fp->_bf._base != NULL && fp->_p > fp->_bf._base &&
-	    fp->_p[-1] == c) {
-		fp->_p--;
-		fp->_r++;
-		FUNLOCKFILE(fp);
-		return c;
-	}
-
-	/*
-	 * Create an ungetc buffer.
-	 * Initially, we will use the `reserve' buffer.
-	 */
-	fp->_ur = fp->_r;
-	fp->_up = fp->_p;
-	_UB(fp)._base = fp->_ubuf;
-	_UB(fp)._size = sizeof(fp->_ubuf);
-	fp->_ubuf[sizeof(fp->_ubuf) - 1] = c;
-	fp->_p = &fp->_ubuf[sizeof(fp->_ubuf) - 1];
-	fp->_r = 1;
-	FUNLOCKFILE(fp);
-	return c;
-}
diff --git a/lib/libc/stdio/ungetwc.3 b/lib/libc/stdio/ungetwc.3
deleted file mode 100644
index 03c6fb817..000000000
--- a/lib/libc/stdio/ungetwc.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\"	$NetBSD: ungetwc.3,v 1.8 2010/12/16 17:42:27 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)ungetc.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd October 24, 2001
-.Dt UNGETWC 3
-.Os
-.Sh NAME
-.Nm ungetwc
-.Nd un-get wide character from input stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft wint_t
-.Fn ungetwc "wint_t wc" "FILE *stream"
-.Sh DESCRIPTION
-The
-.Fn ungetwc
-function pushes the wide character
-.Fa wc
-(converted to an wchar_t)
-back onto the input stream pointed to by
-.Fa stream .
-The pushed-backed wide characters will be returned by subsequent reads on the
-stream (in reverse order).
-A successful intervening call, using the same stream, to one of the file
-positioning functions
-.Xr fseek 3 ,
-.Xr fsetpos 3 ,
-or
-.Xr rewind 3
-will discard the pushed back wide characters.
-.Pp
-One wide character of push-back is guaranteed,
-but as long as there is
-sufficient memory, an effectively infinite amount of pushback is allowed.
-.Pp
-If a character is successfully pushed-back,
-the end-of-file indicator for the stream is cleared.
-.Sh RETURN VALUES
-The
-.Fn ungetwc
-function
-returns
-the wide character pushed-back after the conversion, or
-.Dv WEOF
-if the operation fails.
-If the value of the argument
-.Fa c
-character equals
-.Dv WEOF ,
-the operation will fail and the stream will remain unchanged.
-.Sh SEE ALSO
-.Xr fseek 3 ,
-.Xr getwc 3
-.Sh STANDARDS
-The
-.Fn ungetwc
-function conforms to
-.St -isoC-99 .
-.Sh BUGS
-The current implementation uses a fixed sized ungetwc-buffer.
diff --git a/lib/libc/stdio/ungetwc.c b/lib/libc/stdio/ungetwc.c
deleted file mode 100644
index 982beaeae..000000000
--- a/lib/libc/stdio/ungetwc.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* $NetBSD: ungetwc.c,v 1.3 2005/06/12 05:21:27 lukem Exp $ */
-
-/*-
- * Copyright (c)2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Citrus$
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ungetwc.c,v 1.3 2005/06/12 05:21:27 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <wchar.h>
-#include "reentrant.h"
-#include "local.h"
-
-wint_t
-ungetwc(wint_t wc, FILE *fp)
-{
-	struct wchar_io_data *wcio;
-
-	_DIAGASSERT(fp);
-
-	if (wc == WEOF)
-		return WEOF;
-
-	FLOCKFILE(fp);
-	_SET_ORIENTATION(fp, 1);
-	/*
-	 * XXX since we have no way to transform a wchar string to
-	 * a char string in reverse order, we can't use ungetc.
-	 */
-	/* XXX should we flush ungetc buffer? */
-
-	wcio = WCIO_GET(fp);
-	if (wcio == 0) {
-		FUNLOCKFILE(fp);
-		errno = ENOMEM; /* XXX */
-		return WEOF;
-	}
-
-	if (wcio->wcio_ungetwc_inbuf >= WCIO_UNGETWC_BUFSIZE) {
-		FUNLOCKFILE(fp);
-		return WEOF;
-	}
-
-	wcio->wcio_ungetwc_buf[wcio->wcio_ungetwc_inbuf++] = wc;
-	__sclearerr(fp);
-	FUNLOCKFILE(fp);
-
-	return wc;
-}
diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c
deleted file mode 100644
index 9cf6070b2..000000000
--- a/lib/libc/stdio/vasprintf.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*	$NetBSD: vasprintf.c,v 1.17 2013/05/19 21:45:00 christos Exp $	*/
-
-/*
- * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vasprintf.c,v 1.17 2013/05/19 21:45:00 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "reentrant.h"
-#include "setlocale_local.h"
-#include "local.h"
-
-__weak_alias(asprintf, _asprintf)
-__weak_alias(asprintf_l, _asprintf_l)
-__weak_alias(vasprintf, _vasprintf)
-__weak_alias(vasprintf_l, _vasprintf_l)
-
-int
-vasprintf_l(char **str, locale_t loc, const char *fmt, va_list ap)
-{
-	int ret;
-	FILE f;
-	struct __sfileext fext;
-	unsigned char *_base;
-
-	_DIAGASSERT(str != NULL);
-	_DIAGASSERT(fmt != NULL);
-
-	_FILEEXT_SETUP(&f, &fext);
-	f._file = -1;
-	f._flags = __SWR | __SSTR | __SALC;
-	f._bf._base = f._p = malloc(128);
-	if (f._bf._base == NULL)
-		goto err;
-	f._bf._size = f._w = 127;		/* Leave room for the NUL */
-	ret = __vfprintf_unlocked_l(&f, loc, fmt, ap);
-	if (ret == -1)
-		goto err;
-	*f._p = '\0';
-	_base = realloc(f._bf._base, (size_t)(ret + 1));
-	if (_base == NULL)
-		goto err;
-	*str = (char *)_base;
-	return ret;
-
-err:
-	if (f._bf._base)
-		free(f._bf._base);
-	*str = NULL;
-	errno = ENOMEM;
-	return -1;
-}
-
-int
-vasprintf(char **str, const char *fmt, va_list ap)
-{
-	return vasprintf_l(str, _current_locale(), fmt, ap);
-}
-
-int
-asprintf_l(char **str, locale_t loc, char const *fmt, ...)
-{
-	va_list ap;
-	int ret;
-
-	va_start(ap, fmt);
-	ret = vasprintf_l(str, loc, fmt, ap);
-	va_end(ap);
-	return ret;
-}
-
-int
-asprintf(char **str, char const *fmt, ...)
-{
-	va_list ap;
-	int ret;
-
-	va_start(ap, fmt);
-	ret = vasprintf(str, fmt, ap);
-	va_end(ap);
-	return ret;
-}
diff --git a/lib/libc/stdio/vdprintf.c b/lib/libc/stdio/vdprintf.c
deleted file mode 100644
index ae72054e4..000000000
--- a/lib/libc/stdio/vdprintf.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*	$NetBSD: vdprintf.c,v 1.4 2013/05/17 12:55:57 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vdprintf.c,v 1.4 2013/05/17 12:55:57 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <locale.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <limits.h>
-
-#include "reentrant.h"
-#include "setlocale_local.h"
-#include "local.h"
-
-#ifdef __weak_alias
-__weak_alias(vdprintf,_vdprintf)
-__weak_alias(vdprintf_l,_vdprintf_l)
-#endif
-
-int
-vdprintf_l(int fd, locale_t loc, const char * __restrict fmt, va_list ap)
-{
-	FILE f;
-	struct __sfileext fext;
-	unsigned char buf[BUFSIZ];
-	int ret, fdflags, tmp;
-
-	_DIAGASSERT(fd != -1);
-
-	/*
-	 * File descriptors are a full int, but _file is only a short.
-	 * If we get a valid file descriptor that is greater or equal to
-	 * USHRT_MAX, then the fd will get sign-extended into an
-	 * invalid file descriptor.  Handle this case by failing the
-	 * open. (We treat the short as unsigned, and special-case -1).
-	 */
-	if (fd >= USHRT_MAX) {
-		errno = EMFILE;
-		return EOF;
-	}
-
-	if ((fdflags = fcntl(fd, F_GETFL, 0)) == -1)
-		return EOF;
-
-	tmp = fdflags & O_ACCMODE;
-	if (tmp != O_RDWR && tmp != O_WRONLY) {
-		errno = EINVAL;
-		return EOF;
-	}
-
-	if (fdflags & O_NONBLOCK) {
-		struct stat st;
-		if (fstat(fd, &st) == -1)
-			return -1;
-		if (!S_ISREG(st.st_mode)) {
-			errno = EFTYPE;
-			return EOF;
-		}
-	}
-
-	_FILEEXT_SETUP(&f, &fext);
-	__sfpinit(&f);
-	f._p = buf;
-	f._w = sizeof(buf);
-	f._flags = __SWR;
-	f._file = fd;
-	f._bf._base = buf;
-	f._bf._size = sizeof(buf);
-	f._cookie = &f;
-	f._read = NULL;
-	f._write = __swrite;
-	f._seek = NULL;
-	f._close = NULL;
-
-	if ((ret = vfprintf_l(&f, loc, fmt, ap)) < 0)
-		return ret;
-
-	return fflush(&f) ? EOF : ret;
-}
-
-int
-vdprintf(int fd, const char * __restrict fmt, va_list ap)
-{
-	return vdprintf_l(fd, _current_locale(), fmt, ap);
-}
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
deleted file mode 100644
index ebe110ff6..000000000
--- a/lib/libc/stdio/vfprintf.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define NARROW
-#include "vfwprintf.c"
-
-
-__weak_alias(vfprintf_l, _vfprintf_l)
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
deleted file mode 100644
index b6dce7bac..000000000
--- a/lib/libc/stdio/vfscanf.c
+++ /dev/null
@@ -1,1110 +0,0 @@
-/*	$NetBSD: vfscanf.c,v 1.45 2013/05/17 12:55:57 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)vfscanf.c	8.1 (Berkeley) 6/4/93";
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.41 2007/01/09 00:28:07 imp Exp $");
-#else
-__RCSID("$NetBSD: vfscanf.c,v 1.45 2013/05/17 12:55:57 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <ctype.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "reentrant.h"
-#include "local.h"
-
-#include <locale.h>
-#include "setlocale_local.h"
-
-/*
- * Provide an external name for vfscanf.  Note, we don't use the normal
- * namespace.h method; stdio routines explicitly use the internal name
- * __svfscanf.
- */
-#ifdef __weak_alias
-__weak_alias(vfscanf,__svfscanf)
-__weak_alias(vfscanf_l,__svfscanf_l)
-#endif
-
-#define	BUF		513	/* Maximum length of numeric string. */
-
-/*
- * Flags used during conversion.
- */
-#define	LONG		0x0001	/* l: long or double */
-#define	LONGDBL		0x0002	/* L: long double */
-#define	SHORT		0x0004	/* h: short */
-#define	SUPPRESS	0x0008	/* *: suppress assignment */
-#define	POINTER		0x0010	/* p: void * (as hex) */
-#define	NOSKIP		0x0020	/* [ or c: do not skip blanks */
-#define	LONGLONG	0x0400	/* ll: long long (+ deprecated q: quad) */
-#define	INTMAXT		0x0800	/* j: intmax_t */
-#define	PTRDIFFT	0x1000	/* t: ptrdiff_t */
-#define	SIZET		0x2000	/* z: size_t */
-#define	SHORTSHORT	0x4000	/* hh: char */
-#define	UNSIGNED	0x8000	/* %[oupxX] conversions */
-
-/*
- * The following are used in integral conversions only:
- * SIGNOK, NDIGITS, PFXOK, and NZDIGITS
- */
-#define	SIGNOK		0x00040	/* +/- is (still) legal */
-#define	NDIGITS		0x00080	/* no digits detected */
-#define	PFXOK		0x00100	/* 0x prefix is (still) legal */
-#define	NZDIGITS	0x00200	/* no zero digits detected */
-#define	HAVESIGN	0x10000	/* sign detected */
-
-/*
- * Conversion types.
- */
-#define	CT_CHAR		0	/* %c conversion */
-#define	CT_CCL		1	/* %[...] conversion */
-#define	CT_STRING	2	/* %s conversion */
-#define	CT_INT		3	/* %[dioupxX] conversion */
-#define	CT_FLOAT	4	/* %[efgEFG] conversion */
-
-static const u_char *__sccl(char *, const u_char *, locale_t);
-#ifndef NO_FLOATING_POINT
-static size_t parsefloat(FILE *, char *, char *, locale_t);
-#endif
-
-int __scanfdebug = 0;
-
-#define __collate_load_error /*CONSTCOND*/0
-static int
-__collate_range_cmp(int c1, int c2, locale_t loc)
-{
-	static char s1[2], s2[2];
-
-	s1[0] = c1;
-	s2[0] = c2;
-	return strcoll_l(s1, s2, loc);
-}
-
-
-/*
- * __svfscanf - MT-safe version
- */
-int
-__svfscanf(FILE *fp, char const *fmt0, va_list ap)
-{
-	return __svfscanf_l(fp, _current_locale(), fmt0, ap);
-}
-
-int
-__svfscanf_l(FILE *fp, locale_t loc, char const *fmt0, va_list ap)
-{
-	int ret;
-
-	FLOCKFILE(fp);
-	ret = __svfscanf_unlocked_l(fp, loc, fmt0, ap);
-	FUNLOCKFILE(fp);
-	return ret;
-}
-
-#define SCANF_SKIP_SPACE() \
-do { \
-	while ((fp->_r > 0 || __srefill(fp) == 0) && isspace_l(*fp->_p, loc)) \
-		nread++, fp->_r--, fp->_p++; \
-} while (/*CONSTCOND*/ 0)
-
-/*
- * __svfscanf_unlocked - non-MT-safe version of __svfscanf
- */
-int
-__svfscanf_unlocked_l(FILE *fp, locale_t loc, const char *fmt0, va_list ap)
-{
-	const u_char *fmt = (const u_char *)fmt0;
-	int c;			/* character from format, or conversion */
-	size_t width;		/* field width, or 0 */
-	char *p;		/* points into all kinds of strings */
-	size_t n;		/* handy size_t */
-	int flags;		/* flags as defined above */
-	char *p0;		/* saves original value of p when necessary */
-	int nassigned;		/* number of fields assigned */
-	int nconversions;	/* number of conversions */
-	size_t nread;		/* number of characters consumed from fp */
-	int base;		/* base argument to conversion function */
-	char ccltab[256];	/* character class table for %[...] */
-	char buf[BUF];		/* buffer for numeric and mb conversions */
-	wchar_t *wcp;		/* handy wide-character pointer */
-	size_t nconv;		/* length of multibyte sequence converted */
-	static const mbstate_t initial;
-	mbstate_t mbs;
-
-	/* `basefix' is used to avoid `if' tests in the integer scanner */
-	static const short basefix[17] =
-		{ 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
-
-	_DIAGASSERT(fp != NULL);
-	_DIAGASSERT(fmt0 != NULL);
-
-	_SET_ORIENTATION(fp, -1);
-
-	nassigned = 0;
-	nconversions = 0;
-	nread = 0;
-	base = 0;
-	for (;;) {
-		c = (unsigned char)*fmt++;
-		if (c == 0)
-			return nassigned;
-		if (isspace_l(c, loc)) {
-			while ((fp->_r > 0 || __srefill(fp) == 0) &&
-			    isspace_l(*fp->_p, loc))
-				nread++, fp->_r--, fp->_p++;
-			continue;
-		}
-		if (c != '%')
-			goto literal;
-		width = 0;
-		flags = 0;
-		/*
-		 * switch on the format.  continue if done;
-		 * break once format type is derived.
-		 */
-again:		c = *fmt++;
-		switch (c) {
-		case '%':
-			SCANF_SKIP_SPACE();
-literal:
-			if (fp->_r <= 0 && __srefill(fp))
-				goto input_failure;
-			if (*fp->_p != c)
-				goto match_failure;
-			fp->_r--, fp->_p++;
-			nread++;
-			continue;
-
-		case '*':
-			flags |= SUPPRESS;
-			goto again;
-		case 'j':
-			flags |= INTMAXT;
-			goto again;
-		case 'l':
-			if (flags & LONG) {
-				flags &= ~LONG;
-				flags |= LONGLONG;
-			} else
-				flags |= LONG;
-			goto again;
-		case 'q':
-			flags |= LONGLONG;	/* not quite */
-			goto again;
-		case 't':
-			flags |= PTRDIFFT;
-			goto again;
-		case 'z':
-			flags |= SIZET;
-			goto again;
-		case 'L':
-			flags |= LONGDBL;
-			goto again;
-		case 'h':
-			if (flags & SHORT) {
-				flags &= ~SHORT;
-				flags |= SHORTSHORT;
-			} else
-				flags |= SHORT;
-			goto again;
-
-		case '0': case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			width = width * 10 + c - '0';
-			goto again;
-
-		/*
-		 * Conversions.
-		 */
-		case 'd':
-			c = CT_INT;
-			base = 10;
-			break;
-
-		case 'i':
-			c = CT_INT;
-			base = 0;
-			break;
-
-		case 'o':
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 8;
-			break;
-
-		case 'u':
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 10;
-			break;
-
-		case 'X':
-		case 'x':
-			flags |= PFXOK;	/* enable 0x prefixing */
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 16;
-			break;
-
-#ifndef NO_FLOATING_POINT
-		case 'A': case 'E': case 'F': case 'G':
-		case 'a': case 'e': case 'f': case 'g':
-			c = CT_FLOAT;
-			break;
-#endif
-
-		case 'S':
-			flags |= LONG;
-			/* FALLTHROUGH */
-		case 's':
-			c = CT_STRING;
-			break;
-
-		case '[':
-			fmt = __sccl(ccltab, fmt, loc);
-			flags |= NOSKIP;
-			c = CT_CCL;
-			break;
-
-		case 'C':
-			flags |= LONG;
-			/* FALLTHROUGH */
-		case 'c':
-			flags |= NOSKIP;
-			c = CT_CHAR;
-			break;
-
-		case 'p':	/* pointer format is like hex */
-			flags |= POINTER | PFXOK;
-			c = CT_INT;		/* assumes sizeof(uintmax_t) */
-			flags |= UNSIGNED;	/*      >= sizeof(uintptr_t) */
-			base = 16;
-			break;
-
-		case 'n':
-			nconversions++;
-			if (flags & SUPPRESS)	/* ??? */
-				continue;
-			if (flags & SHORTSHORT)
-				*va_arg(ap, char *) = (char)nread;
-			else if (flags & SHORT)
-				*va_arg(ap, short *) = (short)nread;
-			else if (flags & LONG)
-				*va_arg(ap, long *) = nread;
-			else if (flags & LONGLONG)
-				*va_arg(ap, long long *) = nread;
-			else if (flags & INTMAXT)
-				*va_arg(ap, intmax_t *) = nread;
-			else if (flags & SIZET)
-				*va_arg(ap, size_t *) = nread;
-			else if (flags & PTRDIFFT)
-				*va_arg(ap, ptrdiff_t *) = nread;
-			else
-				*va_arg(ap, int *) = (int)nread;
-			continue;
-
-		default:
-			goto match_failure;
-
-		/*
-		 * Disgusting backwards compatibility hack.	XXX
-		 */
-		case '\0':	/* compat */
-			return EOF;
-		}
-
-		/*
-		 * We have a conversion that requires input.
-		 */
-		if (fp->_r <= 0 && __srefill(fp))
-			goto input_failure;
-
-		/*
-		 * Consume leading white space, except for formats
-		 * that suppress this.
-		 */
-		if ((flags & NOSKIP) == 0) {
-			while (isspace_l(*fp->_p, loc)) {
-				nread++;
-				if (--fp->_r > 0)
-					fp->_p++;
-				else if (__srefill(fp))
-					goto input_failure;
-			}
-			/*
-			 * Note that there is at least one character in
-			 * the buffer, so conversions that do not set NOSKIP
-			 * ca no longer result in an input failure.
-			 */
-		}
-
-		/*
-		 * Do the conversion.
-		 */
-		switch (c) {
-
-		case CT_CHAR:
-			/* scan arbitrary characters (sets NOSKIP) */
-			if (width == 0)
-				width = 1;
-			if (flags & LONG) {
-				if ((flags & SUPPRESS) == 0)
-					wcp = va_arg(ap, wchar_t *);
-				else
-					wcp = NULL;
-				n = 0;
-				while (width != 0) {
-					if (n == MB_CUR_MAX_L(loc)) {
-						fp->_flags |= __SERR;
-						goto input_failure;
-					}
-					buf[n++] = *fp->_p;
-					fp->_p++;
-					fp->_r--;
-					mbs = initial;
-					nconv = mbrtowc_l(wcp, buf, n, &mbs,
-					    loc);
-					if (nconv == (size_t)-1) {
-						fp->_flags |= __SERR;
-						goto input_failure;
-					}
-					if (nconv == 0 && !(flags & SUPPRESS))
-						*wcp = L'\0';
-					if (nconv != (size_t)-2) {
-						nread += n;
-						width--;
-						if (!(flags & SUPPRESS))
-							wcp++;
-						n = 0;
-					}
-					if (fp->_r <= 0 && __srefill(fp)) {
-						if (n != 0) {
-							fp->_flags |= __SERR;
-							goto input_failure;
-						}
-						break;
-					}
-				}
-				if (!(flags & SUPPRESS))
-					nassigned++;
-			} else if (flags & SUPPRESS) {
-				size_t sum = 0;
-				for (;;) {
-					if ((n = fp->_r) < width) {
-						sum += n;
-						width -= n;
-						fp->_p += n;
-						if (__srefill(fp)) {
-							if (sum == 0)
-							    goto input_failure;
-							break;
-						}
-					} else {
-						sum += width;
-						_DIAGASSERT(__type_fit(int,
-						    fp->_r - width));
-						fp->_r -= (int)width;
-						fp->_p += width;
-						break;
-					}
-				}
-				nread += sum;
-			} else {
-				size_t r = fread(va_arg(ap, char *), 1,
-				    width, fp);
-
-				if (r == 0)
-					goto input_failure;
-				nread += r;
-				nassigned++;
-			}
-			nconversions++;
-			break;
-
-		case CT_CCL:
-			/* scan a (nonempty) character class (sets NOSKIP) */
-			if (width == 0)
-				width = (size_t)~0;	/* `infinity' */
-			/* take only those things in the class */
-			if (flags & LONG) {
-				wchar_t twc;
-				int nchars;
-
-				if ((flags & SUPPRESS) == 0)
-					wcp = va_arg(ap, wchar_t *);
-				else
-					wcp = &twc;
-				n = 0;
-				nchars = 0;
-				while (width != 0) {
-					if (n == MB_CUR_MAX_L(loc)) {
-						fp->_flags |= __SERR;
-						goto input_failure;
-					}
-					buf[n++] = *fp->_p;
-					fp->_p++;
-					fp->_r--;
-					mbs = initial;
-					nconv = mbrtowc_l(wcp, buf, n, &mbs,
-					    loc);
-					if (nconv == (size_t)-1) {
-						fp->_flags |= __SERR;
-						goto input_failure;
-					}
-					if (nconv == 0)
-						*wcp = L'\0';
-					if (nconv != (size_t)-2) {
-						if (wctob_l(*wcp, loc) != EOF &&
-						    !ccltab[wctob_l(*wcp, loc)]) {
-							while (n != 0) {
-								n--;
-								(void)ungetc(buf[n],
-								    fp);
-							}
-							break;
-						}
-						nread += n;
-						width--;
-						if (!(flags & SUPPRESS))
-							wcp++;
-						nchars++;
-						n = 0;
-					}
-					if (fp->_r <= 0 && __srefill(fp)) {
-						if (n != 0) {
-							fp->_flags |= __SERR;
-							goto input_failure;
-						}
-						break;
-					}
-				}
-				if (n != 0) {
-					fp->_flags |= __SERR;
-					goto input_failure;
-				}
-				n = nchars;
-				if (n == 0)
-					goto match_failure;
-				if (!(flags & SUPPRESS)) {
-					*wcp = L'\0';
-					nassigned++;
-				}
-			} else if (flags & SUPPRESS) {
-				n = 0;
-				while (ccltab[*fp->_p]) {
-					n++, fp->_r--, fp->_p++;
-					if (--width == 0)
-						break;
-					if (fp->_r <= 0 && __srefill(fp)) {
-						if (n == 0)
-							goto input_failure;
-						break;
-					}
-				}
-				if (n == 0)
-					goto match_failure;
-			} else {
-				p0 = p = va_arg(ap, char *);
-				while (ccltab[*fp->_p]) {
-					fp->_r--;
-					*p++ = *fp->_p++;
-					if (--width == 0)
-						break;
-					if (fp->_r <= 0 && __srefill(fp)) {
-						if (p == p0)
-							goto input_failure;
-						break;
-					}
-				}
-				n = p - p0;
-				if (n == 0)
-					goto match_failure;
-				*p = 0;
-				nassigned++;
-			}
-			nread += n;
-			nconversions++;
-			break;
-
-		case CT_STRING:
-			/* like CCL, but zero-length string OK, & no NOSKIP */
-			if (width == 0)
-				width = (size_t)~0;
-			if (flags & LONG) {
-				wchar_t twc;
-
-				if ((flags & SUPPRESS) == 0)
-					wcp = va_arg(ap, wchar_t *);
-				else
-					wcp = &twc;
-				n = 0;
-				while (!isspace_l(*fp->_p, loc) && width != 0) {
-					if (n == MB_CUR_MAX_L(loc)) {
-						fp->_flags |= __SERR;
-						goto input_failure;
-					}
-					buf[n++] = *fp->_p;
-					fp->_p++;
-					fp->_r--;
-					mbs = initial;
-					nconv = mbrtowc_l(wcp, buf, n, &mbs,
-					    loc);
-					if (nconv == (size_t)-1) {
-						fp->_flags |= __SERR;
-						goto input_failure;
-					}
-					if (nconv == 0)
-						*wcp = L'\0';
-					if (nconv != (size_t)-2) {
-						if (iswspace_l(*wcp, loc)) {
-							while (n != 0) {
-								n--;
-								(void)ungetc(buf[n],
-								    fp);
-							}
-							break;
-						}
-						nread += n;
-						width--;
-						if (!(flags & SUPPRESS))
-							wcp++;
-						n = 0;
-					}
-					if (fp->_r <= 0 && __srefill(fp)) {
-						if (n != 0) {
-							fp->_flags |= __SERR;
-							goto input_failure;
-						}
-						break;
-					}
-				}
-				if (!(flags & SUPPRESS)) {
-					*wcp = L'\0';
-					nassigned++;
-				}
-			} else if (flags & SUPPRESS) {
-				n = 0;
-				while (!isspace_l(*fp->_p, loc)) {
-					n++, fp->_r--, fp->_p++;
-					if (--width == 0)
-						break;
-					if (fp->_r <= 0 && __srefill(fp))
-						break;
-				}
-				nread += n;
-			} else {
-				p0 = p = va_arg(ap, char *);
-				while (!isspace_l(*fp->_p, loc)) {
-					fp->_r--;
-					*p++ = *fp->_p++;
-					if (--width == 0)
-						break;
-					if (fp->_r <= 0 && __srefill(fp))
-						break;
-				}
-				*p = 0;
-				nread += p - p0;
-				nassigned++;
-			}
-			nconversions++;
-			continue;
-
-		case CT_INT:
-			/* scan an integer as if by the conversion function */
-#ifdef hardway
-			if (width == 0 || width > sizeof(buf) - 1)
-				width = sizeof(buf) - 1;
-#else
-			/* size_t is unsigned, hence this optimisation */
-			if (--width > sizeof(buf) - 2)
-				width = sizeof(buf) - 2;
-			width++;
-#endif
-			flags |= SIGNOK | NDIGITS | NZDIGITS;
-			for (p = buf; width; width--) {
-				c = *fp->_p;
-				/*
-				 * Switch on the character; `goto ok'
-				 * if we accept it as a part of number.
-				 */
-				switch (c) {
-
-				/*
-				 * The digit 0 is always legal, but is
-				 * special.  For %i conversions, if no
-				 * digits (zero or nonzero) have been
-				 * scanned (only signs), we will have
-				 * base==0.  In that case, we should set
-				 * it to 8 and enable 0x prefixing.
-				 * Also, if we have not scanned zero digits
-				 * before this, do not turn off prefixing
-				 * (someone else will turn it off if we
-				 * have scanned any nonzero digits).
-				 */
-				case '0':
-					if (base == 0) {
-						base = 8;
-						flags |= PFXOK;
-					}
-					if (flags & NZDIGITS)
-					    flags &= ~(SIGNOK|NZDIGITS|NDIGITS);
-					else
-					    flags &= ~(SIGNOK|PFXOK|NDIGITS);
-					goto ok;
-
-				/* 1 through 7 always legal */
-				case '1': case '2': case '3':
-				case '4': case '5': case '6': case '7':
-					base = basefix[base];
-					flags &= ~(SIGNOK | PFXOK | NDIGITS);
-					goto ok;
-
-				/* digits 8 and 9 ok iff decimal or hex */
-				case '8': case '9':
-					base = basefix[base];
-					if (base <= 8)
-						break;	/* not legal here */
-					flags &= ~(SIGNOK | PFXOK | NDIGITS);
-					goto ok;
-
-				/* letters ok iff hex */
-				case 'A': case 'B': case 'C':
-				case 'D': case 'E': case 'F':
-				case 'a': case 'b': case 'c':
-				case 'd': case 'e': case 'f':
-					/* no need to fix base here */
-					if (base <= 10)
-						break;	/* not legal here */
-					flags &= ~(SIGNOK | PFXOK | NDIGITS);
-					goto ok;
-
-				/* sign ok only as first character */
-				case '+': case '-':
-					if (flags & SIGNOK) {
-						flags &= ~SIGNOK;
-						flags |= HAVESIGN;
-						goto ok;
-					}
-					break;
-					
-				/*
-				 * x ok iff flag still set & 2nd char (or
-				 * 3rd char if we have a sign).
-				 */
-				case 'x': case 'X':
-					if (flags & PFXOK && p ==
-					    buf + 1 + !!(flags & HAVESIGN)) {
-						base = 16;	/* if %i */
-						flags &= ~PFXOK;
-						goto ok;
-					}
-					break;
-				}
-
-				/*
-				 * If we got here, c is not a legal character
-				 * for a number.  Stop accumulating digits.
-				 */
-				break;
-		ok:
-				/*
-				 * c is legal: store it and look at the next.
-				 */
-				*p++ = c;
-				if (--fp->_r > 0)
-					fp->_p++;
-				else if (__srefill(fp))
-					break;		/* EOF */
-			}
-			/*
-			 * If we had only a sign, it is no good; push
-			 * back the sign.  If the number ends in `x',
-			 * it was [sign] '0' 'x', so push back the x
-			 * and treat it as [sign] '0'.
-			 */
-			if (flags & NDIGITS) {
-				if (p > buf)
-					(void)ungetc(*(u_char *)--p, fp);
-				goto match_failure;
-			}
-			c = ((u_char *)p)[-1];
-			if (c == 'x' || c == 'X') {
-				--p;
-				(void)ungetc(c, fp);
-			}
-			if ((flags & SUPPRESS) == 0) {
-				uintmax_t res;
-
-				*p = 0;
-				if ((flags & UNSIGNED) == 0)
-				    res = strtoimax_l(buf, (char **)NULL, base,
-				        loc);
-				else
-				    res = strtoumax_l(buf, (char **)NULL, base,
-				        loc);
-				if (flags & POINTER)
-					*va_arg(ap, void **) =
-							(void *)(uintptr_t)res;
-				else if (flags & SHORTSHORT)
-					*va_arg(ap, char *) = (char)res;
-				else if (flags & SHORT)
-					*va_arg(ap, short *) = (short)res;
-				else if (flags & LONG)
-					*va_arg(ap, long *) = (long)res;
-				else if (flags & LONGLONG)
-					*va_arg(ap, long long *) = res;
-				else if (flags & INTMAXT)
-					*va_arg(ap, intmax_t *) = res;
-				else if (flags & PTRDIFFT)
-					*va_arg(ap, ptrdiff_t *) =
-					    (ptrdiff_t)res;
-				else if (flags & SIZET)
-					*va_arg(ap, size_t *) = (size_t)res;
-				else
-					*va_arg(ap, int *) = (int)res;
-				nassigned++;
-			}
-			nread += p - buf;
-			nconversions++;
-			break;
-
-#ifndef NO_FLOATING_POINT
-		case CT_FLOAT:
-			/* scan a floating point number as if by strtod */
-			if (width == 0 || width > sizeof(buf) - 1)
-				width = sizeof(buf) - 1;
-			if ((width = parsefloat(fp, buf, buf + width, loc)) == 0)
-				goto match_failure;
-			if ((flags & SUPPRESS) == 0) {
-				if (flags & LONGDBL) {
-					long double res = strtold_l(buf, &p,
-					    loc);
-					*va_arg(ap, long double *) = res;
-				} else if (flags & LONG) {
-					double res = strtod_l(buf, &p, loc);
-					*va_arg(ap, double *) = res;
-				} else {
-					float res = strtof_l(buf, &p, loc);
-					*va_arg(ap, float *) = res;
-				}
-				if (__scanfdebug && (size_t)(p - buf) != width)
-					abort();
-				nassigned++;
-			}
-			nread += width;
-			nconversions++;
-			break;
-#endif /* !NO_FLOATING_POINT */
-		}
-	}
-input_failure:
-	return nconversions != 0 ? nassigned : EOF;
-match_failure:
-	return nassigned;
-}
-
-/*
- * Fill in the given table from the scanset at the given format
- * (just after `[').  Return a pointer to the character past the
- * closing `]'.  The table has a 1 wherever characters should be
- * considered part of the scanset.
- */
-static const u_char *
-__sccl(char *tab, const u_char *fmt, locale_t loc)
-{
-	int c, n, v, i;
-
-	_DIAGASSERT(tab != NULL);
-	_DIAGASSERT(fmt != NULL);
-	/* first `clear' the whole table */
-	c = *fmt++;		/* first char hat => negated scanset */
-	if (c == '^') {
-		v = 1;		/* default => accept */
-		c = *fmt++;	/* get new first char */
-	} else
-		v = 0;		/* default => reject */
-
-	/* XXX: Will not work if sizeof(tab*) > sizeof(char) */
-	(void)memset(tab, v, 256);
-
-	if (c == 0)
-		return fmt - 1;/* format ended before closing ] */
-
-	/*
-	 * Now set the entries corresponding to the actual scanset
-	 * to the opposite of the above.
-	 *
-	 * The first character may be ']' (or '-') without being special;
-	 * the last character may be '-'.
-	 */
-	v = 1 - v;
-	for (;;) {
-		tab[c] = v;		/* take character c */
-doswitch:
-		n = *fmt++;		/* and examine the next */
-		switch (n) {
-
-		case 0:			/* format ended too soon */
-			return fmt - 1;
-
-		case '-':
-			/*
-			 * A scanset of the form
-			 *	[01+-]
-			 * is defined as `the digit 0, the digit 1,
-			 * the character +, the character -', but
-			 * the effect of a scanset such as
-			 *	[a-zA-Z0-9]
-			 * is implementation defined.  The V7 Unix
-			 * scanf treats `a-z' as `the letters a through
-			 * z', but treats `a-a' as `the letter a, the
-			 * character -, and the letter a'.
-			 *
-			 * For compatibility, the `-' is not considerd
-			 * to define a range if the character following
-			 * it is either a close bracket (required by ANSI)
-			 * or is not numerically greater than the character
-			 * we just stored in the table (c).
-			 */
-			n = *fmt;
-			if (n == ']' || (__collate_load_error ? n < c :
-			    __collate_range_cmp(n, c, loc) < 0)) {
-				c = '-';
-				break;	/* resume the for(;;) */
-			}
-			fmt++;
-			/* fill in the range */
-			if (__collate_load_error) {
-				do
-					tab[++c] = v;
-				while (c < n);
-			} else {
-				for (i = 0; i < 256; i ++)
-					if (__collate_range_cmp(c, i, loc) < 0 &&
-					    __collate_range_cmp(i, n, loc) <= 0)
-						tab[i] = v;
-			}
-#if 1	/* XXX another disgusting compatibility hack */
-			c = n;
-			/*
-			 * Alas, the V7 Unix scanf also treats formats
-			 * such as [a-c-e] as `the letters a through e'.
-			 * This too is permitted by the standard....
-			 */
-			goto doswitch;
-#else
-			c = *fmt++;
-			if (c == 0)
-				return fmt - 1;
-			if (c == ']')
-				return fmt;
-#endif
-
-		case ']':		/* end of scanset */
-			return fmt;
-
-		default:		/* just another character */
-			c = n;
-			break;
-		}
-	}
-	/* NOTREACHED */
-}
-
-#ifndef NO_FLOATING_POINT
-static size_t
-parsefloat(FILE *fp, char *buf, char *end, locale_t loc)
-{
-	char *commit, *p;
-	int infnanpos = 0;
-	enum {
-		S_START, S_GOTSIGN, S_INF, S_NAN, S_MAYBEHEX,
-		S_DIGITS, S_FRAC, S_EXP, S_EXPDIGITS
-	} state = S_START;
-	unsigned char c;
-	char decpt = *localeconv_l(loc)->decimal_point;
-	_Bool gotmantdig = 0, ishex = 0;
-
-	/*
-	 * We set commit = p whenever the string we have read so far
-	 * constitutes a valid representation of a floating point
-	 * number by itself.  At some point, the parse will complete
-	 * or fail, and we will ungetc() back to the last commit point.
-	 * To ensure that the file offset gets updated properly, it is
-	 * always necessary to read at least one character that doesn't
-	 * match; thus, we can't short-circuit "infinity" or "nan(...)".
-	 */
-	commit = buf - 1;
-	for (p = buf; p < end; ) {
-		c = *fp->_p;
-reswitch:
-		switch (state) {
-		case S_START:
-			state = S_GOTSIGN;
-			if (c == '-' || c == '+')
-				break;
-			else
-				goto reswitch;
-		case S_GOTSIGN:
-			switch (c) {
-			case '0':
-				state = S_MAYBEHEX;
-				commit = p;
-				break;
-			case 'I':
-			case 'i':
-				state = S_INF;
-				break;
-			case 'N':
-			case 'n':
-				state = S_NAN;
-				break;
-			default:
-				state = S_DIGITS;
-				goto reswitch;
-			}
-			break;
-		case S_INF:
-			if (infnanpos > 6 ||
-			    (c != "nfinity"[infnanpos] &&
-			     c != "NFINITY"[infnanpos]))
-				goto parsedone;
-			if (infnanpos == 1 || infnanpos == 6)
-				commit = p;	/* inf or infinity */
-			infnanpos++;
-			break;
-		case S_NAN:
-			switch (infnanpos) {
-			case -1:	/* XXX kludge to deal with nan(...) */
-				goto parsedone;
-			case 0:
-				if (c != 'A' && c != 'a')
-					goto parsedone;
-				break;
-			case 1:
-				if (c != 'N' && c != 'n')
-					goto parsedone;
-				else
-					commit = p;
-				break;
-			case 2:
-				if (c != '(')
-					goto parsedone;
-				break;
-			default:
-				if (c == ')') {
-					commit = p;
-					infnanpos = -2;
-				} else if (!isalnum_l(c, loc) && c != '_')
-					goto parsedone;
-				break;
-			}
-			infnanpos++;
-			break;
-		case S_MAYBEHEX:
-			state = S_DIGITS;
-			if (c == 'X' || c == 'x') {
-				ishex = 1;
-				break;
-			} else {	/* we saw a '0', but no 'x' */
-				gotmantdig = 1;
-				goto reswitch;
-			}
-		case S_DIGITS:
-			if ((ishex && isxdigit_l(c, loc)) || isdigit_l(c, loc))
-				gotmantdig = 1;
-			else {
-				state = S_FRAC;
-				if (c != decpt)
-					goto reswitch;
-			}
-			if (gotmantdig)
-				commit = p;
-			break;
-		case S_FRAC:
-			if (((c == 'E' || c == 'e') && !ishex) ||
-			    ((c == 'P' || c == 'p') && ishex)) {
-				if (!gotmantdig)
-					goto parsedone;
-				else
-					state = S_EXP;
-			} else if ((ishex && isxdigit_l(c, loc)) || isdigit_l(c, loc)) {
-				commit = p;
-				gotmantdig = 1;
-			} else
-				goto parsedone;
-			break;
-		case S_EXP:
-			state = S_EXPDIGITS;
-			if (c == '-' || c == '+')
-				break;
-			else
-				goto reswitch;
-		case S_EXPDIGITS:
-			if (isdigit_l(c, loc))
-				commit = p;
-			else
-				goto parsedone;
-			break;
-		default:
-			abort();
-		}
-		*p++ = c;
-		if (--fp->_r > 0)
-			fp->_p++;
-		else if (__srefill(fp))
-			break;	/* EOF */
-	}
-
-parsedone:
-	while (commit < --p)
-		(void)ungetc(*(u_char *)p, fp);
-	*++commit = '\0';
-	return commit - buf;
-}
-#endif
diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c
deleted file mode 100644
index 46132e322..000000000
--- a/lib/libc/stdio/vfwprintf.c
+++ /dev/null
@@ -1,2084 +0,0 @@
-/*	$NetBSD: vfwprintf.c,v 1.34 2014/01/20 14:11:03 yamt Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)vfprintf.c	8.1 (Berkeley) 6/4/93";
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $");
-#else
-__RCSID("$NetBSD: vfwprintf.c,v 1.34 2014/01/20 14:11:03 yamt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Actual {w,}printf innards.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "reentrant.h"
-#include "setlocale_local.h"
-#include "local.h"
-#include "extern.h"
-#include "fvwrite.h"
-
-#ifndef NARROW
-#define MCHAR_T		char
-#define CHAR_T		wchar_t
-#define STRLEN(a)	wcslen(a)
-#define MEMCHR(a, b, c)	wmemchr(a, b, c)
-#define SCONV(a, b, loc)	__mbsconv(a, b, loc)
-#define STRCONST(a)	L ## a
-#define WDECL(a, b)	a ## w ## b
-#define END_OF_FILE	WEOF
-#define MULTI		0
-#else
-#define MCHAR_T		wchar_t
-#define CHAR_T		char
-#define STRLEN(a)	strlen(a)
-#define MEMCHR(a, b, c)	memchr(a, b, c)
-#define SCONV(a, b, loc)	__wcsconv(a, b, loc)
-#define STRCONST(a)	a
-#define WDECL(a, b)	a ## b
-#define END_OF_FILE	EOF
-#define MULTI		LONGINT
-#endif
-
-union arg {
-	int	intarg;
-	u_int	uintarg;
-	long	longarg;
-	u_long	ulongarg;
-	long long longlongarg;
-	unsigned long long ulonglongarg;
-	ptrdiff_t ptrdiffarg;
-	ssize_t ssizearg;
-	size_t	sizearg;
-	intmax_t intmaxarg;
-	uintmax_t uintmaxarg;
-	void	*pvoidarg;
-	char	*pchararg;
-	signed char *pschararg;
-	short	*pshortarg;
-	int	*pintarg;
-	long	*plongarg;
-	long long *plonglongarg;
-	ptrdiff_t *pptrdiffarg;
-	size_t	*psizearg;
-	intmax_t *pintmaxarg;
-#ifndef NO_FLOATING_POINT
-	double	doublearg;
-	long double longdoublearg;
-#endif
-	wint_t	wintarg;
-	wchar_t	*pwchararg;
-};
-
-/*
- * Type ids for argument type table.
- */
-enum typeid {
-	T_UNUSED = 0, TP_SHORT, T_INT, T_U_INT, TP_INT,
-	T_LONG, T_U_LONG, TP_LONG, T_LLONG, T_U_LLONG, TP_LLONG,
-	T_PTRDIFFT, TP_PTRDIFFT, T_SSIZET, T_SIZET, TP_SIZET,
-	T_INTMAXT, T_UINTMAXT, TP_INTMAXT, TP_VOID, TP_CHAR, TP_SCHAR,
-	T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
-};
-
-#ifdef NARROW
-__printflike(3, 0)
-#endif
-static int	__sbprintf(FILE *, locale_t, const CHAR_T *, va_list);
-
-static CHAR_T	*__ujtoa(uintmax_t, CHAR_T *, int, int, const char *, int,
-		    char, const char *);
-static CHAR_T	*__ultoa(u_long, CHAR_T *, int, int, const char *, int,
-		    char, const char *);
-#ifndef NARROW
-static CHAR_T	*__mbsconv(char *, int, locale_t);
-static wint_t	__xfputwc(CHAR_T, FILE *, locale_t);
-#else
-static char	*__wcsconv(wchar_t *, int, locale_t);
-static int	__sprint(FILE *, struct __suio *);
-#endif
-static int	__find_arguments(const CHAR_T *, va_list, union arg **);
-static int	__grow_type_table(size_t, enum typeid **, size_t *);
-
-/*
- * Helper function for `fprintf to unbuffered unix file': creates a
- * temporary buffer.  We only work on write-only files; this avoids
- * worries about ungetc buffers and so forth.
- */
-static int
-__sbprintf(FILE *fp, locale_t loc, const CHAR_T *fmt, va_list ap)
-{
-	int ret;
-	FILE fake;
-	struct __sfileext fakeext;
-	unsigned char buf[BUFSIZ];
-
-	_DIAGASSERT(fp != NULL);
-	_DIAGASSERT(fmt != NULL);
-
-	_FILEEXT_SETUP(&fake, &fakeext);
-	memset(WCIO_GET(&fake), 0, sizeof(struct wchar_io_data));
-
-	/* copy the important variables */
-	fake._flags = fp->_flags & ~__SNBF;
-	fake._file = fp->_file;
-	fake._cookie = fp->_cookie;
-	fake._write = fp->_write;
-	fake._flush = fp->_flush;
-
-	/* set up the buffer */
-	fake._bf._base = fake._p = buf;
-	fake._bf._size = fake._w = sizeof(buf);
-	fake._lbfsize = 0;	/* not actually used, but Just In Case */
-
-	/* do the work, then copy any error status */
-	ret = WDECL(__vf,printf_unlocked_l)(&fake, loc, fmt, ap);
-	if (ret >= 0 && fflush(&fake))
-		ret = END_OF_FILE;
-	if (fake._flags & __SERR)
-		fp->_flags |= __SERR;
-	return ret;
-}
-
-#ifndef NARROW
-/*
- * Like __fputwc, but handles fake string (__SSTR) files properly.
- * File must already be locked.
- */
-static wint_t
-__xfputwc(wchar_t wc, FILE *fp, locale_t loc)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	char buf[MB_LEN_MAX];
-	struct __suio uio;
-	struct __siov iov;
-	size_t len;
-
-	if ((fp->_flags & __SSTR) == 0)
-		return __fputwc_unlock(wc, fp);
-
-	mbs = initial;
-	if ((len = wcrtomb_l(buf, wc, &mbs, loc)) == (size_t)-1) {
-		fp->_flags |= __SERR;
-		return END_OF_FILE;
-	}
-	uio.uio_iov = &iov;
-	uio.uio_resid = len;
-	uio.uio_iovcnt = 1;
-	iov.iov_base = buf;
-	iov.iov_len = len;
-	return __sfvwrite(fp, &uio) != EOF ? (wint_t)wc : END_OF_FILE;
-}
-#else
-/*
- * Flush out all the vectors defined by the given uio,
- * then reset it so that it can be reused.
- */
-static int
-__sprint(FILE *fp, struct __suio *uio)
-{
-	int err;
-
-	_DIAGASSERT(fp != NULL);
-	_DIAGASSERT(uio != NULL);
-
-	if (uio->uio_resid == 0) {
-		uio->uio_iovcnt = 0;
-		return 0;
-	}
-	err = __sfvwrite(fp, uio);
-	uio->uio_resid = 0;
-	uio->uio_iovcnt = 0;
-	return err;
-}
-#endif
-
-/*
- * Macros for converting digits to letters and vice versa
- */
-#define	to_digit(c)	((c) - '0')
-#define is_digit(c)	((unsigned)to_digit(c) <= 9)
-#define	to_char(n)	(CHAR_T)((n) + '0')
-
-/*
- * Convert an unsigned long to ASCII for printf purposes, returning
- * a pointer to the first character of the string representation.
- * Octal numbers can be forced to have a leading zero; hex numbers
- * use the given digits.
- */
-static CHAR_T *
-__ultoa(u_long val, CHAR_T *endp, int base, int octzero, const char *xdigs,
-    int needgrp, char thousep, const char *grp)
-{
-	CHAR_T *cp = endp;
-	long sval;
-	int ndig;
-
-	/*
-	 * Handle the three cases separately, in the hope of getting
-	 * better/faster code.
-	 */
-	switch (base) {
-	case 10:
-		if (val < 10) {	/* many numbers are 1 digit */
-			*--cp = to_char(val);
-			return cp;
-		}
-		ndig = 0;
-		/*
-		 * On many machines, unsigned arithmetic is harder than
-		 * signed arithmetic, so we do at most one unsigned mod and
-		 * divide; this is sufficient to reduce the range of
-		 * the incoming value to where signed arithmetic works.
-		 */
-		if (val > LONG_MAX) {
-			*--cp = to_char(val % 10);
-			ndig++;
-			sval = val / 10;
-		} else
-			sval = val;
-		do {
-			*--cp = to_char(sval % 10);
-			ndig++;
-			/*
-			 * If (*grp == CHAR_MAX) then no more grouping
-			 * should be performed.
-			 */
-			if (needgrp && ndig == *grp
-			    && (unsigned char)*grp != (unsigned char)CHAR_MAX
-			    && sval > 9) {
-				*--cp = thousep;
-				ndig = 0;
-				/*
-				 * If (*(grp+1) == '\0') then we have to
-				 * use *grp character (last grouping rule)
-				 * for all next cases
-				 */
-				if (*(grp+1) != '\0')
-					grp++;
-			}
-			sval /= 10;
-		} while (sval != 0);
-		break;
-
-	case 8:
-		do {
-			*--cp = to_char(val & 7);
-			val >>= 3;
-		} while (val);
-		if (octzero && *cp != '0')
-			*--cp = '0';
-		break;
-
-	case 16:
-		do {
-			*--cp = xdigs[(size_t)val & 15];
-			val >>= 4;
-		} while (val);
-		break;
-
-	default:			/* oops */
-		abort();
-	}
-	return cp;
-}
-
-/* Identical to __ultoa, but for intmax_t. */
-static CHAR_T *
-__ujtoa(uintmax_t val, CHAR_T *endp, int base, int octzero,
-    const char *xdigs, int needgrp, char thousep, const char *grp)
-{
-	CHAR_T *cp = endp;
-	intmax_t sval;
-	int ndig;
-
-	/* quick test for small values; __ultoa is typically much faster */
-	/* (perhaps instead we should run until small, then call __ultoa?) */
-	if (val <= ULONG_MAX)
-		return __ultoa((u_long)val, endp, base, octzero, xdigs,
-		    needgrp, thousep, grp);
-	switch (base) {
-	case 10:
-		if (val < 10) {
-			*--cp = to_char(val % 10);
-			return cp;
-		}
-		ndig = 0;
-		if (val > INTMAX_MAX) {
-			*--cp = to_char(val % 10);
-			ndig++;
-			sval = val / 10;
-		} else
-			sval = val;
-		do {
-			*--cp = to_char(sval % 10);
-			ndig++;
-			/*
-			 * If (*grp == CHAR_MAX) then no more grouping
-			 * should be performed.
-			 */
-			if (needgrp
-			    && (unsigned char)*grp != (unsigned char)CHAR_MAX
-			    && ndig == *grp
-			    && sval > 9) {
-				*--cp = thousep;
-				ndig = 0;
-				/*
-				 * If (*(grp+1) == '\0') then we have to
-				 * use *grp character (last grouping rule)
-				 * for all next cases
-				 */
-				if (*(grp+1) != '\0')
-					grp++;
-			}
-			sval /= 10;
-		} while (sval != 0);
-		break;
-
-	case 8:
-		do {
-			*--cp = to_char(val & 7);
-			val >>= 3;
-		} while (val);
-		if (octzero && *cp != '0')
-			*--cp = '0';
-		break;
-
-	case 16:
-		do {
-			*--cp = xdigs[(size_t)val & 15];
-			val >>= 4;
-		} while (val);
-		break;
-
-	default:
-		abort();
-	}
-	return cp;
-}
-
-#ifndef NARROW
-/*
- * Convert a multibyte character string argument for the %s format to a wide
- * string representation. ``prec'' specifies the maximum number of bytes
- * to output. If ``prec'' is greater than or equal to zero, we can't assume
- * that the multibyte char. string ends in a null character.
- */
-static wchar_t *
-__mbsconv(char *mbsarg, int prec, locale_t loc)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	wchar_t *convbuf, *wcp;
-	const char *p;
-	size_t insize, nchars, nconv;
-
-	if (mbsarg == NULL)
-		return NULL;
-
-	/*
-	 * Supplied argument is a multibyte string; convert it to wide
-	 * characters first.
-	 */
-	if (prec >= 0) {
-		/*
-		 * String is not guaranteed to be NUL-terminated. Find the
-		 * number of characters to print.
-		 */
-		p = mbsarg;
-		insize = nchars = nconv = 0;
-		mbs = initial;
-		while (nchars != (size_t)prec) {
-			nconv = mbrlen_l(p, MB_CUR_MAX_L(loc), &mbs, loc);
-			if (nconv == 0 || nconv == (size_t)-1 ||
-			    nconv == (size_t)-2)
-				break;
-			p += nconv;
-			nchars++;
-			insize += nconv;
-		}
-		if (nconv == (size_t)-1 || nconv == (size_t)-2)
-			return NULL;
-	} else
-		insize = strlen(mbsarg);
-
-	/*
-	 * Allocate buffer for the result and perform the conversion,
-	 * converting at most `size' bytes of the input multibyte string to
-	 * wide characters for printing.
-	 */
-	convbuf = malloc((insize + 1) * sizeof(*convbuf));
-	if (convbuf == NULL)
-		return NULL;
-	wcp = convbuf;
-	p = mbsarg;
-	mbs = initial;
-	nconv = 0;
-	while (insize != 0) {
-		nconv = mbrtowc_l(wcp, p, insize, &mbs, loc);
-		if (nconv == 0 || nconv == (size_t)-1 || nconv == (size_t)-2)
-			break;
-		wcp++;
-		p += nconv;
-		insize -= nconv;
-	}
-	if (nconv == (size_t)-1 || nconv == (size_t)-2) {
-		free(convbuf);
-		return NULL;
-	}
-	*wcp = L'\0';
-
-	return convbuf;
-}
-#else
-/*
- * Convert a wide-character string argument for the %ls format to a multibyte
- * string representation. If not -1, prec specifies the maximum number of
- * bytes to output, and also means that we can't assume that the wide-char.
- * string ends is null-terminated.
- */
-static char *
-__wcsconv(wchar_t *wcsarg, int prec, locale_t loc)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	char buf[MB_LEN_MAX];
-	wchar_t *p;
-	char *convbuf;
-	size_t clen, nbytes;
-
-	/* Allocate space for the maximum number of bytes we could output. */
-	if (prec < 0) {
-		p = wcsarg;
-		mbs = initial;
-		nbytes = wcsrtombs_l(NULL, (void *)&p, 0, &mbs, loc);
-		if (nbytes == (size_t)-1)
-			return NULL;
-	} else {
-		/*
-		 * Optimisation: if the output precision is small enough,
-		 * just allocate enough memory for the maximum instead of
-		 * scanning the string.
-		 */
-		if (prec < 128)
-			nbytes = prec;
-		else {
-			nbytes = 0;
-			p = wcsarg;
-			mbs = initial;
-			for (;;) {
-				clen = wcrtomb_l(buf, *p++, &mbs, loc);
-				if (clen == 0 || clen == (size_t)-1 ||
-				    nbytes + clen > (size_t)prec)
-					break;
-				nbytes += clen;
-			}
-		}
-	}
-	if ((convbuf = malloc(nbytes + 1)) == NULL)
-		return NULL;
-
-	/* Fill the output buffer. */
-	p = wcsarg;
-	mbs = initial;
-	if ((nbytes = wcsrtombs_l(convbuf, (void *)&p,
-	    nbytes, &mbs, loc)) == (size_t)-1) {
-		free(convbuf);
-		return NULL;
-	}
-	convbuf[nbytes] = '\0';
-	return convbuf;
-}
-#endif
-
-/*
- * MT-safe version
- */
-int
-WDECL(vf,printf)(FILE * __restrict fp, const CHAR_T * __restrict fmt0, va_list ap)
-{
-	int ret;
-
-	FLOCKFILE(fp);
-	ret = WDECL(__vf,printf_unlocked_l)(fp, _current_locale(), fmt0, ap);
-	FUNLOCKFILE(fp);
-	return ret;
-}
-
-int
-WDECL(vf,printf_l)(FILE * __restrict fp, locale_t loc, const CHAR_T * __restrict fmt0,
-    va_list ap)
-{
-	int ret;
-
-	FLOCKFILE(fp);
-	ret = WDECL(__vf,printf_unlocked_l)(fp, loc, fmt0, ap);
-	FUNLOCKFILE(fp);
-	return ret;
-}
-
-#ifndef NO_FLOATING_POINT
-
-#include <float.h>
-#include <math.h>
-#include "floatio.h"
-
-#define	DEFPREC		6
-
-static int exponent(CHAR_T *, int, int);
-#ifndef WIDE_DOUBLE
-static char *cvt(double, int, int, char *, int *, int, int *);
-#endif
-
-#endif /* !NO_FLOATING_POINT */
-
-/*
- * The size of the buffer we use as scratch space for integer
- * conversions, among other things.  Technically, we would need the
- * most space for base 10 conversions with thousands' grouping
- * characters between each pair of digits.  100 bytes is a
- * conservative overestimate even for a 128-bit uintmax_t.
- */
-#define	BUF	100
-
-#define STATIC_ARG_TBL_SIZE 8           /* Size of static argument table. */
-
-/*
- * Flags used during conversion.
- */
-#define	ALT		0x001		/* alternate form */
-#define	LADJUST		0x004		/* left adjustment */
-#define	LONGDBL		0x008		/* long double */
-#define	LONGINT		0x010		/* long integer */
-#define	LLONGINT	0x020		/* long long integer */
-#define	SHORTINT	0x040		/* short integer */
-#define	ZEROPAD		0x080		/* zero (as opposed to blank) pad */
-#define	FPT		0x100		/* Floating point number */
-#define	GROUPING	0x200		/* use grouping ("'" flag) */
-					/* C99 additional size modifiers: */
-#define	SIZET		0x400		/* size_t */
-#define	PTRDIFFT	0x800		/* ptrdiff_t */
-#define	INTMAXT		0x1000		/* intmax_t */
-#define	CHARINT		0x2000		/* print char using int format */
-
-/*
- * Non-MT-safe version
- */
-int
-WDECL(__vf,printf_unlocked_l)(FILE *fp, locale_t loc, const CHAR_T *fmt0, va_list ap)
-{
-	CHAR_T *fmt;		/* format string */
-	int ch;			/* character from fmt */
-	int n, n2;		/* handy integer (short term usage) */
-	CHAR_T *cp;		/* handy char pointer (short term usage) */
-	int flags;		/* flags as above */
-	int ret;		/* return value accumulator */
-	int width;		/* width from format (%8d), or 0 */
-	int prec;		/* precision from format; <0 for N/A */
-	CHAR_T sign;		/* sign prefix (' ', '+', '-', or \0) */
-	char thousands_sep;	/* locale specific thousands separator */
-	const char *grouping;	/* locale specific numeric grouping rules */
-#ifndef NO_FLOATING_POINT
-	/*
-	 * We can decompose the printed representation of floating
-	 * point numbers into several parts, some of which may be empty:
-	 *
-	 * [+|-| ] [0x|0X] MMM . NNN [e|E|p|P] [+|-] ZZ
-	 *    A       B     ---C---      D       E   F
-	 *
-	 * A:	'sign' holds this value if present; '\0' otherwise
-	 * B:	ox[1] holds the 'x' or 'X'; '\0' if not hexadecimal
-	 * C:	cp points to the string MMMNNN.  Leading and trailing
-	 *	zeros are not in the string and must be added.
-	 * D:	expchar holds this character; '\0' if no exponent, e.g. %f
-	 * F:	at least two digits for decimal, at least one digit for hex
-	 */
-	char *decimal_point;	/* locale specific decimal point */
-#ifdef WIDE_DOUBLE
-	int signflag;		/* true if float is negative */
-	union {			/* floating point arguments %[aAeEfFgG] */
-		double dbl;
-		long double ldbl;
-	} fparg;
-	char *dtoaend;		/* pointer to end of converted digits */
-#else
-	double _double;		/* double precision arguments %[eEfgG] */
-	char softsign;		/* temporary negative sign for floats */
-#endif
-	char *dtoaresult;	/* buffer allocated by dtoa */
-	int expt;		/* integer value of exponent */
-	char expchar;		/* exponent character: [eEpP\0] */
-	int expsize;		/* character count for expstr */
-	int lead;		/* sig figs before decimal or group sep */
-	int ndig;		/* actual number of digits returned by dtoa */
-	CHAR_T expstr[MAXEXPDIG+2];	/* buffer for exponent string: e+ZZZ */
-	int nseps;		/* number of group separators with ' */
-	int nrepeats;		/* number of repeats of the last group */
-#endif
-	u_long	ulval;		/* integer arguments %[diouxX] */
-	uintmax_t ujval;	/* %j, %ll, %q, %t, %z integers */
-	int base;		/* base for [diouxX] conversion */
-	int dprec;		/* a copy of prec if [diouxX], 0 otherwise */
-	int realsz;		/* field size expanded by dprec, sign, etc */
-	int size;		/* size of converted field or string */
-	int prsize;             /* max size of printed field */
-	const char *xdigs;	/* digits for %[xX] conversion */
-#ifdef NARROW
-#define NIOV 8
-	struct __siov *iovp;	/* for PRINT macro */
-	struct __suio uio;	/* output information: summary */
-	struct __siov iov[NIOV];/* ... and individual io vectors */
-#else
-	int n3;
-#endif
-	CHAR_T buf[BUF];	/* buffer with space for digits of uintmax_t */
-	CHAR_T ox[2];		/* space for 0x hex-prefix */
-	union arg *argtable;	/* args, built due to positional arg */
-	union arg statargtable [STATIC_ARG_TBL_SIZE];
-	int nextarg;		/* 1-based argument index */
-	va_list orgap;		/* original argument pointer */
-	CHAR_T *convbuf;	/* multibyte to wide conversion result */
-
-	/*
-	 * Choose PADSIZE to trade efficiency vs. size.  If larger printf
-	 * fields occur frequently, increase PADSIZE and make the initialisers
-	 * below longer.
-	 */
-#define	PADSIZE	16		/* pad chunk size */
-	static CHAR_T blanks[PADSIZE] =
-	 {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
-	static CHAR_T zeroes[PADSIZE] =
-	 {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
-
-	static const char xdigs_lower[16] = "0123456789abcdef";
-	static const char xdigs_upper[16] = "0123456789ABCDEF";
-
-	/*
-	 * BEWARE, these `goto error' on error, PRINT uses `n2' and
-	 * PAD uses `n'.
-	 */
-#ifndef NARROW
-#define	PRINT(ptr, len)	do {			\
-	for (n3 = 0; n3 < (len); n3++)		\
-		if (__xfputwc((ptr)[n3], fp, loc) == END_OF_FILE) { \
-			fp->_flags |= __SERR;	\
-			goto error;		\
-		}				\
-} while (/*CONSTCOND*/0)
-#define FLUSH()
-#else
-#define	PRINT(ptr, len) do { \
-	iovp->iov_base = __UNCONST(ptr); \
-	iovp->iov_len = (len); \
-	uio.uio_resid += (len); \
-	iovp++; \
-	if (++uio.uio_iovcnt >= NIOV) { \
-		if (__sprint(fp, &uio)) \
-			goto error; \
-		iovp = iov; \
-	} \
-} while (/*CONSTCOND*/0)
-#define	FLUSH() do { \
-	if (uio.uio_resid && __sprint(fp, &uio)) \
-		goto error; \
-	uio.uio_iovcnt = 0; \
-	iovp = iov; \
-} while (/*CONSTCOND*/0)
-#endif /* NARROW */
-
-#define	PAD(howmany, with)	do {		\
-	if ((n = (howmany)) > 0) {		\
-		while (n > PADSIZE) {		\
-			PRINT(with, PADSIZE);	\
-			n -= PADSIZE;		\
-		}				\
-		PRINT(with, n);			\
-	}					\
-} while (/*CONSTCOND*/0)
-#define	PRINTANDPAD(p, ep, len, with) do {	\
-	ptrdiff_t td = (ep) - (p);		\
-	_DIAGASSERT(__type_fit(int, td));	\
-	n2 = (int)td;       			\
-	if (n2 > (len))				\
-		n2 = (len);			\
-	if (n2 > 0)				\
-		PRINT((p), n2);			\
-	PAD((len) - (n2 > 0 ? n2 : 0), (with));	\
-} while(/*CONSTCOND*/0)
-
-	/*
-	 * Get the argument indexed by nextarg.   If the argument table is
-	 * built, use it to get the argument.  If its not, get the next
-	 * argument (and arguments must be gotten sequentially).
-	 */
-#define GETARG(type) \
-	((/*CONSTCOND*/argtable != NULL) ? *((type*)(void*)(&argtable[nextarg++])) : \
-	    (nextarg++, va_arg(ap, type)))
-
-	/*
-	 * To extend shorts properly, we need both signed and unsigned
-	 * argument extraction methods.
-	 */
-#define	SARG() \
-	(flags&LONGINT ? GETARG(long) : \
-	    flags&SHORTINT ? (long)(short)GETARG(int) : \
-	    flags&CHARINT ? (long)(signed char)GETARG(int) : \
-	    (long)GETARG(int))
-#define	UARG() \
-	(flags&LONGINT ? GETARG(u_long) : \
-	    flags&SHORTINT ? (u_long)(u_short)GETARG(int) : \
-	    flags&CHARINT ? (u_long)(u_char)GETARG(int) : \
-	    (u_long)GETARG(u_int))
-#define	INTMAX_SIZE	(INTMAXT|SIZET|PTRDIFFT|LLONGINT)
-#define SJARG() \
-	(flags&INTMAXT ? GETARG(intmax_t) : \
-	    flags&SIZET ? (intmax_t)GETARG(ssize_t) : \
-	    flags&PTRDIFFT ? (intmax_t)GETARG(ptrdiff_t) : \
-	    (intmax_t)GETARG(long long))
-#define	UJARG() \
-	(flags&INTMAXT ? GETARG(uintmax_t) : \
-	    flags&SIZET ? (uintmax_t)GETARG(size_t) : \
-	    flags&PTRDIFFT ? (uintmax_t)GETARG(ptrdiff_t) : \
-	    (uintmax_t)GETARG(unsigned long long))
-
-	/*
-	 * Get * arguments, including the form *nn$.  Preserve the nextarg
-	 * that the argument can be gotten once the type is determined.
-	 */
-#define GETASTER(val) \
-	n2 = 0; \
-	cp = fmt; \
-	while (is_digit(*cp)) { \
-		n2 = 10 * n2 + to_digit(*cp); \
-		cp++; \
-	} \
-	if (*cp == '$') { \
-		int hold = nextarg; \
-		if (argtable == NULL) { \
-			argtable = statargtable; \
-			if (__find_arguments(fmt0, orgap, &argtable) == -1) \
-				goto oomem; \
-		} \
-		nextarg = n2; \
-		val = GETARG (int); \
-		nextarg = hold; \
-		fmt = ++cp; \
-	} else { \
-		val = GETARG (int); \
-	}
-
-	_DIAGASSERT(fp != NULL);
-	_DIAGASSERT(fmt0 != NULL);
-
-	_SET_ORIENTATION(fp, -1);
-
-	thousands_sep = '\0';
-	grouping = NULL;
-#ifndef NO_FLOATING_POINT
-	decimal_point = localeconv_l(loc)->decimal_point;
-	expsize = 0;		/* XXXGCC -Wuninitialized [sh3,m68000] */
-	ndig = -1;	/* XXX gcc */
-#endif
-	convbuf = NULL;
-	/* sorry, f{w,}printf(read_only_file, L"") returns {W,}EOF, not 0 */
-	if (cantwrite(fp)) {
-		errno = EBADF;
-		return END_OF_FILE;
-	}
-
-	/* optimise fprintf(stderr) (and other unbuffered Unix files) */
-	if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
-	    __sfileno(fp) != -1)
-		return __sbprintf(fp, loc, fmt0, ap);
-
-	fmt = (CHAR_T *)__UNCONST(fmt0);
-	argtable = NULL;
-	nextarg = 1;
-	va_copy(orgap, ap);
-#ifdef NARROW
-	uio.uio_iov = iovp = iov;
-	uio.uio_resid = 0;
-	uio.uio_iovcnt = 0;
-#endif
-	ret = 0;
-
-	/*
-	 * Scan the format for conversions (`%' character).
-	 */
-	for (;;) {
-		const CHAR_T *result;
-
-		for (cp = fmt; (ch = *fmt) != '\0' && ch != '%'; fmt++)
-			continue;
-		_DIAGASSERT(__type_fit(int, fmt - cp));
-		if ((n = (int)(fmt - cp)) != 0) {
-			if ((unsigned)ret + n > INT_MAX) {
-				ret = END_OF_FILE;
-				goto error;
-			}
-			PRINT(cp, n);
-			ret += n;
-		}
-		if (ch == '\0')
-			goto done;
-		fmt++;		/* skip over '%' */
-
-		flags = 0;
-		dprec = 0;
-		width = 0;
-		prec = -1;
-		sign = '\0';
-		ox[1] = '\0';
-#ifndef NO_FLOATING_POINT
-		expchar = '\0';
-		lead = 0;
-		nseps = nrepeats = 0;
-#endif
-		ulval = 0;
-		ujval = 0;
-		xdigs = NULL;
-
-rflag:		ch = *fmt++;
-reswitch:	switch (ch) {
-		case ' ':
-			/*-
-			 * ``If the space and + flags both appear, the space
-			 * flag will be ignored.''
-			 *	-- ANSI X3J11
-			 */
-			if (!sign)
-				sign = ' ';
-			goto rflag;
-		case '#':
-			flags |= ALT;
-			goto rflag;
-		case '*':
-			/*-
-			 * ``A negative field width argument is taken as a
-			 * - flag followed by a positive field width.''
-			 *	-- ANSI X3J11
-			 * They don't exclude field widths read from args.
-			 */
-			GETASTER (width);
-			if (width >= 0)
-				goto rflag;
-			width = -width;
-			/* FALLTHROUGH */
-		case '-':
-			flags |= LADJUST;
-			goto rflag;
-		case '+':
-			sign = '+';
-			goto rflag;
-		case '\'':
-			flags |= GROUPING;
-			thousands_sep = *(localeconv_l(loc)->thousands_sep);
-			grouping = localeconv_l(loc)->grouping;
-			/* If the locale doesn't define the above, use sane
-			 * defaults - otherwise silly things happen! */
-			if (thousands_sep == 0)
-				thousands_sep = ',';
-			if (!grouping || !*grouping)
-				grouping = "\3";
-			goto rflag;
-		case '.':
-			if ((ch = *fmt++) == '*') {
-				GETASTER (prec);
-				goto rflag;
-			}
-			prec = 0;
-			while (is_digit(ch)) {
-				prec = 10 * prec + to_digit(ch);
-				ch = *fmt++;
-			}
-			goto reswitch;
-		case '0':
-			/*-
-			 * ``Note that 0 is taken as a flag, not as the
-			 * beginning of a field width.''
-			 *	-- ANSI X3J11
-			 */
-			flags |= ZEROPAD;
-			goto rflag;
-		case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			n = 0;
-			do {
-				n = 10 * n + to_digit(ch);
-				ch = *fmt++;
-			} while (is_digit(ch));
-			if (ch == '$') {
-				nextarg = n;
-				if (argtable == NULL) {
-					argtable = statargtable;
-					if (__find_arguments(fmt0, orgap,
-					    &argtable) == -1)
-						goto oomem;
-				}
-				goto rflag;
-			}
-			width = n;
-			goto reswitch;
-#ifndef NO_FLOATING_POINT
-		case 'L':
-			flags |= LONGDBL;
-			goto rflag;
-#endif
-		case 'h':
-			if (flags & SHORTINT) {
-				flags &= ~SHORTINT;
-				flags |= CHARINT;
-			} else
-				flags |= SHORTINT;
-			goto rflag;
-		case 'j':
-			flags |= INTMAXT;
-			goto rflag;
-		case 'l':
-			if (flags & LONGINT) {
-				flags &= ~LONGINT;
-				flags |= LLONGINT;
-			} else
-				flags |= LONGINT;
-			goto rflag;
-		case 'q':
-			flags |= LLONGINT;	/* not necessarily */
-			goto rflag;
-		case 't':
-			flags |= PTRDIFFT;
-			goto rflag;
-		case 'z':
-			flags |= SIZET;
-			goto rflag;
-		case 'C':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'c':
-#ifdef NARROW
-			if (flags & LONGINT) {
-				static const mbstate_t initial;
-				mbstate_t mbs;
-				size_t mbseqlen;
-
-				mbs = initial;
-				mbseqlen = wcrtomb_l(buf,
-				    (wchar_t)GETARG(wint_t), &mbs, loc);
-				if (mbseqlen == (size_t)-1) {
-					fp->_flags |= __SERR;
-					goto error;
-				}
-				size = (int)mbseqlen;
-			} else {
-				*buf = GETARG(int);
-				size = 1;
-			}
-#else
-			if (flags & LONGINT)
-				*buf = (wchar_t)GETARG(wint_t);
-			else
-				*buf = (wchar_t)btowc_l(GETARG(int), loc);
-			size = 1;
-#endif
-			result = buf;
-			sign = '\0';
-			break;
-		case 'D':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'd':
-		case 'i':
-			if (flags & INTMAX_SIZE) {
-				ujval = SJARG();
-				if ((intmax_t)ujval < 0) {
-					ujval = -ujval;
-					sign = '-';
-				}
-			} else {
-				ulval = SARG();
-				if ((long)ulval < 0) {
-					ulval = -ulval;
-					sign = '-';
-				}
-			}
-			base = 10;
-			goto number;
-#ifndef NO_FLOATING_POINT
-#ifdef WIDE_DOUBLE
-		case 'a':
-		case 'A':
-			if (ch == 'a') {
-				ox[1] = 'x';
-				xdigs = xdigs_lower;
-				expchar = 'p';
-			} else {
-				ox[1] = 'X';
-				xdigs = xdigs_upper;
-				expchar = 'P';
-			}
-			if (prec >= 0)
-				prec++;
-			if (flags & LONGDBL) {
-				fparg.ldbl = GETARG(long double);
-				dtoaresult =
-				    __hldtoa(fparg.ldbl, xdigs, prec,
-				        &expt, &signflag, &dtoaend);
-			} else {
-				fparg.dbl = GETARG(double);
-				dtoaresult =
-				    __hdtoa(fparg.dbl, xdigs, prec,
-				        &expt, &signflag, &dtoaend);
-			}
-			if (dtoaresult == NULL)
-				goto oomem;
-			
-			if (prec < 0) {
-				_DIAGASSERT(__type_fit(int,
-				    dtoaend - dtoaresult));
-				prec = (int)(dtoaend - dtoaresult);
-			}
-			if (expt == INT_MAX)
-				ox[1] = '\0';
-			_DIAGASSERT(__type_fit(int, dtoaend - dtoaresult));
-			ndig = (int)(dtoaend - dtoaresult);
-			if (convbuf != NULL)
-				free(convbuf);
-#ifndef NARROW
-			result = convbuf = __mbsconv(dtoaresult, -1, loc);
-#else
-			/*XXX inefficient*/
-			result = convbuf = strdup(dtoaresult);
-#endif
-			if (result == NULL)
-				goto oomem;
-			__freedtoa(dtoaresult);
-			goto fp_common;
-		case 'e':
-		case 'E':
-			expchar = ch;
-			if (prec < 0)	/* account for digit before decpt */
-				prec = DEFPREC + 1;
-			else
-				prec++;
-			goto fp_begin;
-		case 'f':
-		case 'F':
-			expchar = '\0';
-			goto fp_begin;
-		case 'g':
-		case 'G':
-			expchar = ch - ('g' - 'e');
-			if (prec == 0)
-				prec = 1;
-fp_begin:
-			if (prec < 0)
-				prec = DEFPREC;
-			if (flags & LONGDBL) {
-				fparg.ldbl = GETARG(long double);
-				dtoaresult =
-				    __ldtoa(&fparg.ldbl, expchar ? 2 : 3, prec,
-				    &expt, &signflag, &dtoaend);
-			} else {
-				fparg.dbl = GETARG(double);
-				dtoaresult =
-				    __dtoa(fparg.dbl, expchar ? 2 : 3, prec,
-				    &expt, &signflag, &dtoaend);
-				if (expt == 9999)
-					expt = INT_MAX;
-			}
-			if (dtoaresult == NULL)
-				goto oomem;
-			_DIAGASSERT(__type_fit(int, dtoaend - dtoaresult));
-			ndig = (int)(dtoaend - dtoaresult);
-			if (convbuf != NULL)
-				free(convbuf);
-#ifndef NARROW
-			result = convbuf = __mbsconv(dtoaresult, -1, loc);
-#else
-			/*XXX inefficient*/
-			result = convbuf = strdup(dtoaresult);
-#endif
-			if (result == NULL)
-				goto oomem;
-			__freedtoa(dtoaresult);
-fp_common:
-			if (signflag)
-				sign = '-';
-			if (expt == INT_MAX) {	/* inf or nan */
-				if (*result == 'N') {
-					result = (ch >= 'a') ? STRCONST("nan") :
-					    STRCONST("NAN");
-					sign = '\0';
-				} else
-					result = (ch >= 'a') ? STRCONST("inf") :
-					    STRCONST("INF");
-				size = 3;
-				flags &= ~ZEROPAD;
-				break;
-			}
-#else
-		case 'e':
-		case 'E':
-		case 'f':
-		case 'F':
-		case 'g':
-		case 'G':
-			if (prec == -1) {
-				prec = DEFPREC;
-			} else if ((ch == 'g' || ch == 'G') && prec == 0) {
-				prec = 1;
-			}
-
-			if (flags & LONGDBL) {
-				_double = (double) GETARG(long double);
-			} else {
-				_double = GETARG(double);
-			}
-
-			/* do this before tricky precision changes */
-			if (isinf(_double)) {
-				if (_double < 0)
-					sign = '-';
-				if (ch == 'E' || ch == 'F' || ch == 'G')
-					result = STRCONST("INF");
-				else
-					result = STRCONST("inf");
-				size = 3;
-				flags &= ~ZEROPAD;
-				break;
-			}
-			if (isnan(_double)) {
-				if (ch == 'E' || ch == 'F' || ch == 'G')
-					result = STRCONST("NAN");
-				else
-					result = STRCONST("nan");
-				size = 3;
-				flags &= ~ZEROPAD;
-				break;
-			}
-
-			flags |= FPT;
-			dtoaresult = cvt(_double, prec, flags, &softsign,
-			    &expt, ch, &ndig);
-			if (dtoaresult == NULL)
-				goto oomem;
-			if (convbuf != NULL)
-				free(convbuf);
-#ifndef NARROW
-			result = convbuf = __mbsconv(dtoaresult, -1, loc);
-#else
-			/*XXX inefficient*/
-			result = convbuf = strdup(dtoaresult);
-#endif
-			if (result == NULL)
-				goto oomem;
-			__freedtoa(dtoaresult);
-			if (softsign)
-				sign = '-';
-#endif
-			flags |= FPT;
-			if (ch == 'g' || ch == 'G') {
-				if (expt > -4 && expt <= prec) {
-					/* Make %[gG] smell like %[fF] */
-					expchar = '\0';
-					if (flags & ALT)
-						prec -= expt;
-					else
-						prec = ndig - expt;
-					if (prec < 0)
-						prec = 0;
-				} else {
-					/*
-					 * Make %[gG] smell like %[eE], but
-					 * trim trailing zeroes if no # flag.
-					 */
-					if (!(flags & ALT))
-						prec = ndig;
-				}
-			}
-			if (expchar) {
-				expsize = exponent(expstr, expt - 1, expchar);
-				size = expsize + prec;
-				if (prec > 1 || flags & ALT)
-					++size;
-			} else {
-				/* space for digits before decimal point */
-				if (expt > 0)
-					size = expt;
-				else	/* "0" */
-					size = 1;
-				/* space for decimal pt and following digits */
-				if (prec || flags & ALT)
-					size += prec + 1;
-				if (grouping && expt > 0) {
-					/* space for thousands' grouping */
-					nseps = nrepeats = 0;
-					lead = expt;
-					while ((unsigned char)*grouping
-					    != (unsigned char)CHAR_MAX) {
-						if (lead <= *grouping)
-							break;
-						lead -= *grouping;
-						if (*(grouping+1)) {
-							nseps++;
-							grouping++;
-						} else
-							nrepeats++;
-					}
-					size += nseps + nrepeats;
-				} else
-					lead = expt;
-			}
-			break;
-#endif /* !NO_FLOATING_POINT */
-		case 'n':
-			/*
-			 * Assignment-like behavior is specified if the
-			 * value overflows or is otherwise unrepresentable.
-			 * C99 says to use `signed char' for %hhn conversions.
-			 */
-			if (flags & LLONGINT)
-				*GETARG(long long *) = ret;
-			else if (flags & SIZET)
-				*GETARG(ssize_t *) = (ssize_t)ret;
-			else if (flags & PTRDIFFT)
-				*GETARG(ptrdiff_t *) = ret;
-			else if (flags & INTMAXT)
-				*GETARG(intmax_t *) = ret;
-			else if (flags & LONGINT)
-				*GETARG(long *) = ret;
-			else if (flags & SHORTINT)
-				*GETARG(short *) = ret;
-			else if (flags & CHARINT)
-				*GETARG(signed char *) = ret;
-			else
-				*GETARG(int *) = ret;
-			continue;	/* no output */
-		case 'O':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'o':
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 8;
-			goto nosign;
-		case 'p':
-			/*-
-			 * ``The argument shall be a pointer to void.  The
-			 * value of the pointer is converted to a sequence
-			 * of printable characters, in an implementation-
-			 * defined manner.''
-			 *	-- ANSI X3J11
-			 */
-			ujval = (uintmax_t)(uintptr_t)GETARG(void *);
-			base = 16;
-			xdigs = xdigs_lower;
-			flags = flags | INTMAXT;
-			ox[1] = 'x';
-			goto nosign;
-		case 'S':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 's':
-			if ((flags & LONGINT) != MULTI) {
-				if ((result = GETARG(CHAR_T *)) == NULL)
-					result = STRCONST("(null)");
-			} else {
-				MCHAR_T *mc;
-
-				if (convbuf != NULL)
-					free(convbuf);
-				if ((mc = GETARG(MCHAR_T *)) == NULL)
-					result = STRCONST("(null)");
-				else {
-					convbuf = SCONV(mc, prec, loc);
-					if (convbuf == NULL) {
-						fp->_flags |= __SERR;
-						goto error;
-					}
-					result = convbuf;
-				}
-			}
-
-			if (prec >= 0) {
-				/*
-				 * can't use STRLEN; can only look for the
-				 * NUL in the first `prec' characters, and
-				 * STRLEN() will go further.
-				 */
-				CHAR_T *p = MEMCHR(result, 0, (size_t)prec);
-
-				if (p != NULL) {
-					_DIAGASSERT(__type_fit(int,
-					    p - result));
-					size = (int)(p - result);
-					if (size > prec)
-						size = prec;
-				} else
-					size = prec;
-			} else {
-				size_t rlen = STRLEN(result);
-				_DIAGASSERT(__type_fit(int, rlen));
-				size = (int)rlen;
-			}
-			sign = '\0';
-			break;
-		case 'U':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'u':
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 10;
-			goto nosign;
-		case 'X':
-			xdigs = xdigs_upper;
-			goto hex;
-		case 'x':
-			xdigs = xdigs_lower;
-hex:
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 16;
-			/* leading 0x/X only if non-zero */
-			if (flags & ALT &&
-			    (flags & INTMAX_SIZE ? ujval != 0 : ulval != 0))
-				ox[1] = ch;
-
-			flags &= ~GROUPING;
-			/* unsigned conversions */
-nosign:			sign = '\0';
-			/*-
-			 * ``... diouXx conversions ... if a precision is
-			 * specified, the 0 flag will be ignored.''
-			 *	-- ANSI X3J11
-			 */
-number:			if ((dprec = prec) >= 0)
-				flags &= ~ZEROPAD;
-
-			/*-
-			 * ``The result of converting a zero value with an
-			 * explicit precision of zero is no characters.''
-			 *	-- ANSI X3J11
-			 *
-			 * ``The C Standard is clear enough as is.  The call
-			 * printf("%#.0o", 0) should print 0.''
-			 *	-- Defect Report #151
-			 */
-			result = cp = buf + BUF;
-			if (flags & INTMAX_SIZE) {
-				if (ujval != 0 || prec != 0 ||
-				    (flags & ALT && base == 8))
-					result = __ujtoa(ujval, cp, base,
-					    flags & ALT, xdigs,
-					    flags & GROUPING, thousands_sep,
-					    grouping);
-			} else {
-				if (ulval != 0 || prec != 0 ||
-				    (flags & ALT && base == 8))
-					result = __ultoa(ulval, cp, base,
-					    flags & ALT, xdigs,
-					    flags & GROUPING, thousands_sep,
-					    grouping);
-			}
-			_DIAGASSERT(__type_fit(int, buf + BUF - result));
-			size = (int)(buf + BUF - result);
-			if (size > BUF)	/* should never happen */
-				abort();
-			break;
-		default:	/* "%?" prints ?, unless ? is NUL */
-			if (ch == '\0')
-				goto done;
-			/* pretend it was %c with argument ch */
-			*buf = ch;
-			result = buf;
-			size = 1;
-			sign = '\0';
-			break;
-		}
-
-		/*
-		 * All reasonable formats wind up here.  At this point, `result'
-		 * points to a string which (if not flags&LADJUST) should be
-		 * padded out to `width' places.  If flags&ZEROPAD, it should
-		 * first be prefixed by any sign or other prefix; otherwise,
-		 * it should be blank padded before the prefix is emitted.
-		 * After any left-hand padding and prefixing, emit zeroes
-		 * required by a decimal [diouxX] precision, then print the
-		 * string proper, then emit zeroes required by any leftover
-		 * floating precision; finally, if LADJUST, pad with blanks.
-		 *
-		 * Compute actual size, so we know how much to pad.
-		 * size excludes decimal prec; realsz includes it.
-		 */
-		realsz = dprec > size ? dprec : size;
-		if (sign)
-			realsz++;
-		if (ox[1])
-			realsz += 2;
-
-		prsize = width > realsz ? width : realsz;
-		if ((unsigned)ret + prsize > INT_MAX) {
-			ret = END_OF_FILE;
-			goto error;
-		}
-
-		/* right-adjusting blank padding */
-		if ((flags & (LADJUST|ZEROPAD)) == 0)
-			PAD(width - realsz, blanks);
-
-		/* prefix */
-		if (sign)
-			PRINT(&sign, 1);
-
-		if (ox[1]) {	/* ox[1] is either x, X, or \0 */
-			ox[0] = '0';
-			PRINT(ox, 2);
-		}
-
-		/* right-adjusting zero padding */
-		if ((flags & (LADJUST|ZEROPAD)) == ZEROPAD)
-			PAD(width - realsz, zeroes);
-
-		/* leading zeroes from decimal precision */
-		PAD(dprec - size, zeroes);
-
-		/* the string or number proper */
-#ifndef NO_FLOATING_POINT
-		if ((flags & FPT) == 0) {
-			PRINT(result, size);
-		} else {	/* glue together f_p fragments */
-			if (!expchar) {	/* %[fF] or sufficiently short %[gG] */
-				if (expt <= 0) {
-					PRINT(zeroes, 1);
-					if (prec || flags & ALT)
-						PRINT(decimal_point, 1);
-					PAD(-expt, zeroes);
-					/* already handled initial 0's */
-					prec += expt;
-				} else {
-					PRINTANDPAD(result, convbuf + ndig,
-					    lead, zeroes);
-					result += lead;
-					if (grouping) {
-						while (nseps>0 || nrepeats>0) {
-							if (nrepeats > 0)
-								nrepeats--;
-							else {
-								grouping--;
-								nseps--;
-							}
-							PRINT(&thousands_sep,
-							    1);
-							PRINTANDPAD(result,
-							    convbuf + ndig,
-							    *grouping, zeroes);
-							result += *grouping;
-						}
-						if (result > convbuf + ndig)
-							result = convbuf + ndig;
-					}
-					if (prec || flags & ALT) {
-						buf[0] = *decimal_point;
-						PRINT(buf, 1);
-					}
-				}
-				PRINTANDPAD(result, convbuf + ndig, prec,
-				    zeroes);
-			} else {	/* %[eE] or sufficiently long %[gG] */
-				if (prec > 1 || flags & ALT) {
-					buf[0] = *result++;
-					buf[1] = *decimal_point;
-					PRINT(buf, 2);
-					PRINT(result, ndig-1);
-					PAD(prec - ndig, zeroes);
-				} else	/* XeYYY */
-					PRINT(result, 1);
-				PRINT(expstr, expsize);
-			}
-		}
-#else
-		PRINT(result, size);
-#endif
-		/* left-adjusting padding (always blank) */
-		if (flags & LADJUST)
-			PAD(width - realsz, blanks);
-
-		/* finally, adjust ret */
-		ret += prsize;
-		FLUSH();
-	}
-done:
-	FLUSH();
-error:
-	va_end(orgap);
-	if (convbuf != NULL)
-		free(convbuf);
-	if (__sferror(fp))
-		ret = END_OF_FILE;
-	if ((argtable != NULL) && (argtable != statargtable))
-		free (argtable);
-	return ret;
-	/* NOTREACHED */
-oomem:
-	errno = ENOMEM;
-	ret = END_OF_FILE;
-	goto error;
-}
-
-/*
- * Find all arguments when a positional parameter is encountered.  Returns a
- * table, indexed by argument number, of pointers to each arguments.  The
- * initial argument table should be an array of STATIC_ARG_TBL_SIZE entries.
- * It will be replaces with a malloc-ed one if it overflows.
- */ 
-static int
-__find_arguments(const CHAR_T *fmt0, va_list ap, union arg **argtable)
-{
-	CHAR_T *fmt;		/* format string */
-	int ch;			/* character from fmt */
-	size_t n, n2;		/* handy index (short term usage) */
-	CHAR_T *cp;		/* handy char pointer (short term usage) */
-	int flags;		/* flags as above */
-	enum typeid *typetable; /* table of types */
-	enum typeid stattypetable [STATIC_ARG_TBL_SIZE];
-	size_t tablesize;	/* current size of type table */
-	size_t tablemax;	/* largest used index in table */
-	size_t nextarg;		/* 1-based argument index */
-	size_t nitems;		/* number of items we picked from the stack */
-
-	/*
-	 * Add an argument type to the table, expanding if necessary.
-	 * Check for overflow.
-	 */
-#define ADDTYPE(type) \
-	do { \
-		if (nextarg > SIZE_MAX / sizeof(**argtable)) { \
-			if (typetable != stattypetable) \
-				free(typetable); \
-			return -1; \
-		} \
-		if (nextarg >= tablesize) \
-			if (__grow_type_table(nextarg, &typetable, \
-			    &tablesize) == -1) \
-				return -1; \
-		if (nextarg > tablemax) \
-			tablemax = nextarg; \
-		typetable[nextarg++] = type; \
-		nitems++; \
-	} while (/*CONSTCOND*/0)
-
-#define	ADDSARG() \
-	do { \
-		if (flags & INTMAXT)  \
-			ADDTYPE(T_INTMAXT); \
-		else if (flags & SIZET)  \
-			ADDTYPE(T_SSIZET); \
-		else if (flags & PTRDIFFT) \
-			ADDTYPE(T_PTRDIFFT); \
-		else if (flags & LLONGINT) \
-			ADDTYPE(T_LLONG); \
-		else if (flags & LONGINT) \
-			ADDTYPE(T_LONG); \
-		else \
-			ADDTYPE(T_INT); \
-	} while (/*CONSTCOND*/0)
-
-#define	ADDUARG() \
-	do { \
-		if (flags & INTMAXT)  \
-			ADDTYPE(T_UINTMAXT); \
-		else if (flags & SIZET)  \
-			ADDTYPE(T_SIZET); \
-		else if (flags & PTRDIFFT) \
-			ADDTYPE(T_PTRDIFFT); \
-		else if (flags & LLONGINT) \
-			ADDTYPE(T_U_LLONG); \
-		else if (flags & LONGINT) \
-			ADDTYPE(T_U_LONG); \
-		else \
-			ADDTYPE(T_U_INT); \
-	} while (/*CONSTCOND*/0)
-	/*
-	 * Add * arguments to the type array.
-	 */
-#define ADDASTER() \
-	n2 = 0; \
-	cp = fmt; \
-	while (is_digit(*cp)) { \
-		n2 = 10 * n2 + to_digit(*cp); \
-		cp++; \
-	} \
-	if (*cp == '$') { \
-		size_t hold = nextarg; \
-		nextarg = n2; \
-		ADDTYPE(T_INT); \
-		nextarg = hold; \
-		fmt = ++cp; \
-	} else { \
-		ADDTYPE(T_INT); \
-	}
-	fmt = (CHAR_T *)__UNCONST(fmt0);
-	memset(stattypetable, 0, sizeof(stattypetable));
-	typetable = stattypetable;
-	tablesize = STATIC_ARG_TBL_SIZE;
-	tablemax = 0; 
-	nextarg = 1;
-	nitems = 1;
-
-	/*
-	 * Scan the format for conversions (`%' character).
-	 */
-	for (;;) {
-		for (cp = fmt; (ch = *fmt) != '\0' && ch != '%'; fmt++)
-			/* void */;
-		if (ch == '\0')
-			goto done;
-		fmt++;		/* skip over '%' */
-
-		flags = 0;
-
-rflag:		ch = *fmt++;
-reswitch:	switch (ch) {
-		case ' ':
-		case '#':
-			goto rflag;
-		case '*':
-			ADDASTER ();
-			goto rflag;
-		case '-':
-		case '+':
-		case '\'':
-			goto rflag;
-		case '.':
-			if ((ch = *fmt++) == '*') {
-				ADDASTER ();
-				goto rflag;
-			}
-			while (is_digit(ch)) {
-				ch = *fmt++;
-			}
-			goto reswitch;
-		case '0':
-			goto rflag;
-		case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			n = 0;
-			do {
-				n = 10 * n + to_digit(ch);
-				ch = *fmt++;
-			} while (is_digit(ch));
-			if (ch == '$') {
-				nextarg = n;
-				goto rflag;
-			}
-			goto reswitch;
-#ifndef NO_FLOATING_POINT
-		case 'L':
-			flags |= LONGDBL;
-			goto rflag;
-#endif
-		case 'h':
-			if (flags & SHORTINT) {
-				flags &= ~SHORTINT;
-				flags |= CHARINT;
-			} else
-				flags |= SHORTINT;
-			goto rflag;
-		case 'j':
-			flags |= INTMAXT;
-			goto rflag;
-		case 'l':
-			if (flags & LONGINT) {
-				flags &= ~LONGINT;
-				flags |= LLONGINT;
-			} else
-				flags |= LONGINT;
-			goto rflag;
-		case 'q':
-			flags |= LLONGINT;	/* not necessarily */
-			goto rflag;
-		case 't':
-			flags |= PTRDIFFT;
-			goto rflag;
-		case 'z':
-			flags |= SIZET;
-			goto rflag;
-		case 'C':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'c':
-			if (flags & LONGINT)
-				ADDTYPE(T_WINT);
-			else
-				ADDTYPE(T_INT);
-			break;
-		case 'D':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'd':
-		case 'i':
-			ADDSARG();
-			break;
-#ifndef NO_FLOATING_POINT
-		case 'a':
-		case 'A':
-		case 'e':
-		case 'E':
-		case 'f':
-		case 'g':
-		case 'G':
-			if (flags & LONGDBL)
-				ADDTYPE(T_LONG_DOUBLE);
-			else
-				ADDTYPE(T_DOUBLE);
-			break;
-#endif /* !NO_FLOATING_POINT */
-		case 'n':
-			if (flags & INTMAXT)
-				ADDTYPE(TP_INTMAXT);
-			else if (flags & PTRDIFFT)
-				ADDTYPE(TP_PTRDIFFT);
-			else if (flags & SIZET)
-				ADDTYPE(TP_SIZET);
-			else if (flags & LLONGINT)
-				ADDTYPE(TP_LLONG);
-			else if (flags & LONGINT)
-				ADDTYPE(TP_LONG);
-			else if (flags & SHORTINT)
-				ADDTYPE(TP_SHORT);
-			else if (flags & CHARINT)
-				ADDTYPE(TP_SCHAR);
-			else
-				ADDTYPE(TP_INT);
-			continue;	/* no output */
-		case 'O':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'o':
-			ADDUARG();
-			break;
-		case 'p':
-			ADDTYPE(TP_VOID);
-			break;
-		case 'S':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 's':
-			if (flags & LONGINT)
-				ADDTYPE(TP_WCHAR);
-			else
-				ADDTYPE(TP_CHAR);
-			break;
-		case 'U':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'u':
-		case 'X':
-		case 'x':
-			ADDUARG();
-			break;
-		default:	/* "%?" prints ?, unless ? is NUL */
-			if (ch == '\0')
-				goto done;
-			break;
-		}
-	}
-done:
-	/*
-	 * nitems contains the number of arguments we picked from the stack.
-	 * If tablemax is larger, this means that some positional argument,
-	 * tried to pick an argument the number of arguments possibly supplied.
-	 * Since positional arguments are typically used to swap the order of
-	 * the printf arguments and not to pick random arguments from strange
-	 * positions in the stack, we assume that if the positional argument
-	 * is trying to pick beyond the end of arguments, then this is wrong.
-	 * Alternatively we could find a way to figure out when va_arg() runs
-	 * out, but how to do that?
-	 */
-	if (nitems < tablemax) {
-		if (typetable != stattypetable)
-			free(typetable);
-		return -1;
-	}
-	/*
-	 * Build the argument table.
-	 */
-	if (tablemax >= STATIC_ARG_TBL_SIZE) {
-		*argtable = malloc(sizeof(**argtable) * (tablemax + 1));
-		if (*argtable == NULL) {
-			free(typetable);
-			return -1;
-		}
-	}
-
-	(*argtable) [0].intarg = 0;
-	for (n = 1; n <= tablemax; n++) {
-		switch (typetable [n]) {
-		    case T_UNUSED: /* whoops! */
-			(*argtable) [n].intarg = va_arg (ap, int);
-			break;
-		    case TP_SCHAR:
-			(*argtable) [n].pschararg = va_arg (ap, signed char *);
-			break;
-		    case TP_SHORT:
-			(*argtable) [n].pshortarg = va_arg (ap, short *);
-			break;
-		    case T_INT:
-			(*argtable) [n].intarg = va_arg (ap, int);
-			break;
-		    case T_U_INT:
-			(*argtable) [n].uintarg = va_arg (ap, unsigned int);
-			break;
-		    case TP_INT:
-			(*argtable) [n].pintarg = va_arg (ap, int *);
-			break;
-		    case T_LONG:
-			(*argtable) [n].longarg = va_arg (ap, long);
-			break;
-		    case T_U_LONG:
-			(*argtable) [n].ulongarg = va_arg (ap, unsigned long);
-			break;
-		    case TP_LONG:
-			(*argtable) [n].plongarg = va_arg (ap, long *);
-			break;
-		    case T_LLONG:
-			(*argtable) [n].longlongarg = va_arg (ap, long long);
-			break;
-		    case T_U_LLONG:
-			(*argtable) [n].ulonglongarg = va_arg (ap, unsigned long long);
-			break;
-		    case TP_LLONG:
-			(*argtable) [n].plonglongarg = va_arg (ap, long long *);
-			break;
-		    case T_PTRDIFFT:
-			(*argtable) [n].ptrdiffarg = va_arg (ap, ptrdiff_t);
-			break;
-		    case TP_PTRDIFFT:
-			(*argtable) [n].pptrdiffarg = va_arg (ap, ptrdiff_t *);
-			break;
-		    case T_SSIZET:
-			(*argtable) [n].ssizearg = va_arg (ap, ssize_t);
-			break;
-		    case T_SIZET:
-			(*argtable) [n].sizearg = va_arg (ap, size_t);
-			break;
-		    case TP_SIZET:
-			(*argtable) [n].psizearg = va_arg (ap, size_t *);
-			break;
-		    case T_INTMAXT:
-			(*argtable) [n].intmaxarg = va_arg (ap, intmax_t);
-			break;
-		    case T_UINTMAXT:
-			(*argtable) [n].uintmaxarg = va_arg (ap, uintmax_t);
-			break;
-		    case TP_INTMAXT:
-			(*argtable) [n].pintmaxarg = va_arg (ap, intmax_t *);
-			break;
-		    case T_DOUBLE:
-#ifndef NO_FLOATING_POINT
-			(*argtable) [n].doublearg = va_arg (ap, double);
-#endif
-			break;
-		    case T_LONG_DOUBLE:
-#ifndef NO_FLOATING_POINT
-			(*argtable) [n].longdoublearg = va_arg (ap, long double);
-#endif
-			break;
-		    case TP_CHAR:
-			(*argtable) [n].pchararg = va_arg (ap, char *);
-			break;
-		    case TP_VOID:
-			(*argtable) [n].pvoidarg = va_arg (ap, void *);
-			break;
-		    case T_WINT:
-			(*argtable) [n].wintarg = va_arg (ap, wint_t);
-			break;
-		    case TP_WCHAR:
-			(*argtable) [n].pwchararg = va_arg (ap, wchar_t *);
-			break;
-		}
-	}
-
-	if (typetable != stattypetable)
-		free (typetable);
-	return 0;
-}
-
-/*
- * Increase the size of the type table.
- */
-static int
-__grow_type_table (size_t nextarg, enum typeid **typetable, size_t *tablesize)
-{
-	enum typeid *const oldtable = *typetable;
-	const size_t oldsize = *tablesize;
-	enum typeid *newtable;
-	size_t newsize = oldsize * 2;
-
-	if (newsize < nextarg + 1)
-		newsize = nextarg + 1;
-	if (oldsize == STATIC_ARG_TBL_SIZE) {
-		if ((newtable = malloc(newsize * sizeof(*newtable))) == NULL)
-			return -1;
-		memcpy(newtable, oldtable, oldsize * sizeof(*newtable));
-	} else {
-		newtable = realloc(oldtable, newsize * sizeof(*newtable));
-		if (newtable == NULL) {
-			free(oldtable);
-			return -1;
-		}
-	}
-	memset(&newtable[oldsize], 0, (newsize - oldsize) * sizeof(*newtable));
-
-	*typetable = newtable;
-	*tablesize = newsize;
-	return 0;
-}
-
-
-#ifndef NO_FLOATING_POINT
-#ifndef WIDE_DOUBLE
-static char *
-cvt(double value, int ndigits, int flags, char *sign, int *decpt, int ch,
-    int *length)
-{
-	int mode, dsgn;
-	char *digits, *bp, *rve;
-
-	_DIAGASSERT(decpt != NULL);
-	_DIAGASSERT(length != NULL);
-	_DIAGASSERT(sign != NULL);
-
-	if (ch == 'f') {
-		mode = 3;		/* ndigits after the decimal point */
-	} else {
-		/* To obtain ndigits after the decimal point for the 'e' 
-		 * and 'E' formats, round to ndigits + 1 significant 
-		 * figures.
-		 */
-		if (ch == 'e' || ch == 'E') {
-			ndigits++;
-		}
-		mode = 2;		/* ndigits significant digits */
-	}
-
-	digits = __dtoa(value, mode, ndigits, decpt, &dsgn, &rve);
-	if (digits == NULL)
-		return NULL;
-	if (dsgn) {
-		value = -value;
-		*sign = '-';
-	} else
-		*sign = '\000';
-	if ((ch != 'g' && ch != 'G') || flags & ALT) {	/* Print trailing zeros */
-		bp = digits + ndigits;
-		if (ch == 'f') {
-			if (*digits == '0' && value)
-				*decpt = -ndigits + 1;
-			bp += *decpt;
-		}
-		if (value == 0)	/* kludge for __dtoa irregularity */
-			rve = bp;
-		while (rve < bp)
-			*rve++ = '0';
-	}
-	*length = rve - digits;
-	return digits;
-}
-#endif
-
-static int
-exponent(CHAR_T *p0, int expo, int fmtch)
-{
-	CHAR_T *p, *t;
-	CHAR_T expbuf[MAXEXPDIG];
-
-	p = p0;
-	*p++ = fmtch;
-	if (expo < 0) {
-		expo = -expo;
-		*p++ = '-';
-	}
-	else
-		*p++ = '+';
-	t = expbuf + MAXEXPDIG;
-	if (expo > 9) {
-		do {
-			*--t = to_char(expo % 10);
-		} while ((expo /= 10) > 9);
-		*--t = to_char(expo);
-		for (; t < expbuf + MAXEXPDIG; *p++ = *t++);
-	}
-	else {
-		/*
-		 * Exponents for decimal floating point conversions
-		 * (%[eEgG]) must be at least two characters long,
-		 * whereas exponents for hexadecimal conversions can
-		 * be only one character long.
-		 */
-		if (fmtch == 'e' || fmtch == 'E')
-			*p++ = '0';
-		*p++ = to_char(expo);
-	}
-	_DIAGASSERT(__type_fit(int, p - p0));
-	return (int)(p - p0);
-}
-#endif /* !NO_FLOATING_POINT */
diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c
deleted file mode 100644
index 8afcc2e78..000000000
--- a/lib/libc/stdio/vfwscanf.c
+++ /dev/null
@@ -1,916 +0,0 @@
-/*	$NetBSD: vfwscanf.c,v 1.12 2014/06/12 22:21:20 justin Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)ftell.c	8.2 (Berkeley) 5/4/95";
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwscanf.c,v 1.12 2004/05/02 20:13:29 obrien Exp $");
-#else
-__RCSID("$NetBSD: vfwscanf.c,v 1.12 2014/06/12 22:21:20 justin Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <ctype.h>
-#include <inttypes.h>
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <string.h>
-#include <limits.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "reentrant.h"
-#include "local.h"
-
-#include <locale.h>
-#include "setlocale_local.h"
-
-#define	BUF		513	/* Maximum length of numeric string. */
-
-/*
- * Flags used during conversion.
- */
-#define	LONG		0x01	/* l: long or double */
-#define	LONGDBL		0x02	/* L: long double */
-#define	SHORT		0x04	/* h: short */
-#define	SUPPRESS	0x08	/* *: suppress assignment */
-#define	POINTER		0x10	/* p: void * (as hex) */
-#define	NOSKIP		0x20	/* [ or c: do not skip blanks */
-#define	LONGLONG	0x400	/* ll: quad_t (+ deprecated q: quad) */
-#define	INTMAXT		0x800	/* j: intmax_t */
-#define	PTRDIFFT	0x1000	/* t: ptrdiff_t */
-#define	SIZET		0x2000	/* z: size_t */
-#define	SHORTSHORT	0x4000	/* hh: char */
-#define	UNSIGNED	0x8000	/* %[oupxX] conversions */
-
-/*
- * The following are used in integral conversions only:
- * SIGNOK, NDIGITS, PFXOK, and NZDIGITS
- */
-#define	SIGNOK		0x40	/* +/- is (still) legal */
-#define	NDIGITS		0x80	/* no digits detected */
-#define	PFXOK		0x100	/* 0x prefix is (still) legal */
-#define	NZDIGITS	0x200	/* no zero digits detected */
-#define	HAVESIGN	0x10000	/* sign detected */
-
-/*
- * Conversion types.
- */
-#define	CT_CHAR		0	/* %c conversion */
-#define	CT_CCL		1	/* %[...] conversion */
-#define	CT_STRING	2	/* %s conversion */
-#define	CT_INT		3	/* %[dioupxX] conversion */
-#define	CT_FLOAT	4	/* %[efgEFG] conversion */
-
-#ifndef NO_FLOATING_POINT
-static int parsefloat(FILE *, wchar_t *, wchar_t *, locale_t);
-#endif
-
-#define	INCCL(_c)	\
-	(cclcompl ? (wmemchr(ccls, (_c), (size_t)(ccle - ccls)) == NULL) : \
-	(wmemchr(ccls, (_c), (size_t)(ccle - ccls)) != NULL))
-
-/*
- * MT-safe version.
- */
-int
-vfwscanf(FILE * __restrict fp, const wchar_t * __restrict fmt, va_list ap)
-{
-	return vfwscanf_l(fp, _current_locale(), fmt, ap);
-}
-
-int
-vfwscanf_l(FILE * __restrict fp, locale_t loc, const wchar_t * __restrict fmt,
-    va_list ap)
-{
-	int ret;
-
-	FLOCKFILE(fp);
-	_SET_ORIENTATION(fp, 1);
-	ret = __vfwscanf_unlocked_l(fp, loc, fmt, ap);
-	FUNLOCKFILE(fp);
-	return ret;
-}
-
-#define SCANF_SKIP_SPACE() \
-do { \
-	wint_t tc; \
- \
-	while ((tc = __fgetwc_unlock(fp)) != WEOF && iswspace_l(tc, loc)) \
-		continue; \
-	if (tc != WEOF) \
-		ungetwc(tc, fp); \
-} while (/*CONSTCOND*/ 0)
-
-/*
- * Non-MT-safe version.
- */
-int
-__vfwscanf_unlocked_l(FILE * __restrict fp, locale_t loc,
-    const wchar_t * __restrict fmt, va_list ap)
-{
-	wint_t c;		/* character from format, or conversion */
-	size_t width;		/* field width, or 0 */
-	wchar_t *p;		/* points into all kinds of strings */
-	int n;			/* handy integer */
-	int flags;		/* flags as defined above */
-	wchar_t *p0;		/* saves original value of p when necessary */
-	int nassigned;		/* number of fields assigned */
-	int nconversions;	/* number of conversions */
-	size_t nread;		/* number of characters consumed from fp */
-	int base;		/* base argument to conversion function */
-	wchar_t buf[BUF];	/* buffer for numeric conversions */
-	const wchar_t *ccls;	/* character class start */
-	const wchar_t *ccle;	/* character class end */
-	int cclcompl;		/* ccl is complemented? */
-	wint_t wi;		/* handy wint_t */
-	char *mbp;		/* multibyte string pointer for %c %s %[ */
-	size_t nconv;		/* number of bytes in mb. conversion */
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	char mbbuf[MB_LEN_MAX];	/* temporary mb. character buffer */
-	/* `basefix' is used to avoid `if' tests in the integer scanner */
-	static short basefix[17] =
-		{ 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
-
-	nassigned = 0;
-	nconversions = 0;
-	nread = 0;
-	ccls = ccle = NULL;
-	base = 0;
-	cclcompl = 0;
-	mbp = NULL;
-	p = NULL; /* XXXgcc */
-	for (;;) {
-		c = *fmt++;
-		if (c == 0)
-			return nassigned;
-		if (iswspace_l(c, loc)) {
-			while ((c = __fgetwc_unlock(fp)) != WEOF &&
-			    iswspace_l(c, loc))
-				;
-			if (c != WEOF)
-				ungetwc(c, fp);
-			continue;
-		}
-		if (c != '%')
-			goto literal;
-		width = 0;
-		flags = 0;
-		/*
-		 * switch on the format.  continue if done;
-		 * break once format type is derived.
-		 */
-again:		c = *fmt++;
-		switch (c) {
-		case '%':
-			SCANF_SKIP_SPACE();
-literal:
-			if ((wi = __fgetwc_unlock(fp)) == WEOF)
-				goto input_failure;
-			if (wi != c) {
-				ungetwc(wi, fp);
-				goto input_failure;
-			}
-			nread++;
-			continue;
-
-		case '*':
-			flags |= SUPPRESS;
-			goto again;
-		case 'j':
-			flags |= INTMAXT;
-			goto again;
-		case 'l':
-			if (flags & LONG) {
-				flags &= ~LONG;
-				flags |= LONGLONG;
-			} else
-				flags |= LONG;
-			goto again;
-		case 'q':
-			flags |= LONGLONG;	/* not quite */
-			goto again;
-		case 't':
-			flags |= PTRDIFFT;
-			goto again;
-		case 'z':
-			flags |= SIZET;
-			goto again;
-		case 'L':
-			flags |= LONGDBL;
-			goto again;
-		case 'h':
-			if (flags & SHORT) {
-				flags &= ~SHORT;
-				flags |= SHORTSHORT;
-			} else
-				flags |= SHORT;
-			goto again;
-
-		case '0': case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			width = width * 10 + c - '0';
-			goto again;
-
-		/*
-		 * Conversions.
-		 */
-		case 'd':
-			c = CT_INT;
-			base = 10;
-			break;
-
-		case 'i':
-			c = CT_INT;
-			base = 0;
-			break;
-
-		case 'o':
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 8;
-			break;
-
-		case 'u':
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 10;
-			break;
-
-		case 'X':
-		case 'x':
-			flags |= PFXOK;	/* enable 0x prefixing */
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 16;
-			break;
-
-#ifndef NO_FLOATING_POINT
-		case 'A': case 'E': case 'F': case 'G':
-		case 'a': case 'e': case 'f': case 'g':
-			c = CT_FLOAT;
-			break;
-#endif
-
-		case 'S':
-			flags |= LONG;
-			/* FALLTHROUGH */
-		case 's':
-			c = CT_STRING;
-			break;
-
-		case '[':
-			ccls = fmt;
-			if (*fmt == '^') {
-				cclcompl = 1;
-				fmt++;
-			} else
-				cclcompl = 0;
-			if (*fmt == ']')
-				fmt++;
-			while (*fmt != '\0' && *fmt != ']')
-				fmt++;
-			ccle = fmt;
-			fmt++;
-			flags |= NOSKIP;
-			c = CT_CCL;
-			break;
-
-		case 'C':
-			flags |= LONG;
-			/* FALLTHROUGH */
-		case 'c':
-			flags |= NOSKIP;
-			c = CT_CHAR;
-			break;
-
-		case 'p':	/* pointer format is like hex */
-			flags |= POINTER | PFXOK;
-			c = CT_INT;		/* assumes sizeof(uintmax_t) */
-			flags |= UNSIGNED;	/*      >= sizeof(uintptr_t) */
-			base = 16;
-			break;
-
-		case 'n':
-			nconversions++;
-			if (flags & SUPPRESS)	/* ??? */
-				continue;
-			if (flags & SHORTSHORT)
-				*va_arg(ap, char *) = (char)nread;
-			else if (flags & SHORT)
-				*va_arg(ap, short *) = (short)nread;
-			else if (flags & LONG)
-				*va_arg(ap, long *) = nread;
-			else if (flags & LONGLONG)
-				*va_arg(ap, quad_t *) = nread;
-			else if (flags & INTMAXT)
-				*va_arg(ap, intmax_t *) = nread;
-			else if (flags & SIZET)
-				*va_arg(ap, size_t *) = nread;
-			else if (flags & PTRDIFFT)
-				*va_arg(ap, ptrdiff_t *) = nread;
-			else
-				*va_arg(ap, int *) = (int)nread;
-			continue;
-
-		default:
-			goto match_failure;
-
-		/*
-		 * Disgusting backwards compatibility hack.	XXX
-		 */
-		case '\0':	/* compat */
-			return EOF;
-		}
-
-		/*
-		 * Consume leading white space, except for formats
-		 * that suppress this.
-		 */
-		if ((flags & NOSKIP) == 0) {
-			while ((wi = __fgetwc_unlock(fp)) != WEOF &&
-			       iswspace_l(wi, loc))
-				nread++;
-			if (wi == WEOF)
-				goto input_failure;
-			ungetwc(wi, fp);
-		}
-
-		/*
-		 * Do the conversion.
-		 */
-		switch (c) {
-
-		case CT_CHAR:
-			/* scan arbitrary characters (sets NOSKIP) */
-			if (width == 0)
-				width = 1;
-			if (flags & LONG) {
-				if (!(flags & SUPPRESS))
-					p = va_arg(ap, wchar_t *);
-				n = 0;
-				while (width-- != 0 &&
-				    (wi = __fgetwc_unlock(fp)) != WEOF) {
-					if (!(flags & SUPPRESS))
-						*p++ = (wchar_t)wi;
-					n++;
-				}
-				if (n == 0)
-					goto input_failure;
-				nread += n;
-				if (!(flags & SUPPRESS))
-					nassigned++;
-			} else {
-				if (!(flags & SUPPRESS))
-					mbp = va_arg(ap, char *);
-				n = 0;
-				mbs = initial;
-				while (width != 0 &&
-				    (wi = __fgetwc_unlock(fp)) != WEOF) {
-					if (width >= MB_CUR_MAX_L(loc) &&
-					    !(flags & SUPPRESS)) {
-						nconv = wcrtomb_l(mbp, wi,
-						    &mbs, loc);
-						if (nconv == (size_t)-1)
-							goto input_failure;
-					} else {
-						nconv = wcrtomb_l(mbbuf, wi,
-						    &mbs, loc);
-						if (nconv == (size_t)-1)
-							goto input_failure;
-						if (nconv > width) {
-							ungetwc(wi, fp);
-							break;
-						}
-						if (!(flags & SUPPRESS))
-							memcpy(mbp, mbbuf,
-							    nconv);
-					}
-					if (!(flags & SUPPRESS))
-						mbp += nconv;
-					width -= nconv;
-					n++;
-				}
-				if (n == 0)
-					goto input_failure;
-				nread += n;
-				if (!(flags & SUPPRESS))
-					nassigned++;
-			}
-			nconversions++;
-			break;
-
-		case CT_CCL:
-			/* scan a (nonempty) character class (sets NOSKIP) */
-			if (width == 0)
-				width = (size_t)~0;	/* `infinity' */
-			/* take only those things in the class */
-			if ((flags & SUPPRESS) && (flags & LONG)) {
-				n = 0;
-				while ((wi = __fgetwc_unlock(fp)) != WEOF &&
-				    width-- != 0 && INCCL(wi))
-					n++;
-				if (wi != WEOF)
-					ungetwc(wi, fp);
-				if (n == 0)
-					goto match_failure;
-			} else if (flags & LONG) {
-				p0 = p = va_arg(ap, wchar_t *);
-				while ((wi = __fgetwc_unlock(fp)) != WEOF &&
-				    width-- != 0 && INCCL(wi))
-					*p++ = (wchar_t)wi;
-				if (wi != WEOF)
-					ungetwc(wi, fp);
-				_DIAGASSERT(__type_fit(int, p - p0));
-				n = (int)(p - p0);
-				if (n == 0)
-					goto match_failure;
-				*p = 0;
-				nassigned++;
-			} else {
-				if (!(flags & SUPPRESS))
-					mbp = va_arg(ap, char *);
-				n = 0;
-				mbs = initial;
-				while ((wi = __fgetwc_unlock(fp)) != WEOF &&
-				    width != 0 && INCCL(wi)) {
-					if (width >= MB_CUR_MAX_L(loc) &&
-					   !(flags & SUPPRESS)) {
-						nconv = wcrtomb_l(mbp, wi,
-						    &mbs, loc);
-						if (nconv == (size_t)-1)
-							goto input_failure;
-					} else {
-						nconv = wcrtomb_l(mbbuf, wi,
-						    &mbs, loc);
-						if (nconv == (size_t)-1)
-							goto input_failure;
-						if (nconv > width)
-							break;
-						if (!(flags & SUPPRESS))
-							memcpy(mbp, mbbuf,
-							    nconv);
-					}
-					if (!(flags & SUPPRESS))
-						mbp += nconv;
-					width -= nconv;
-					n++;
-				}
-				if (wi != WEOF)
-					ungetwc(wi, fp);
-				if (!(flags & SUPPRESS)) {
-					*mbp = 0;
-					nassigned++;
-				}
-			}
-			nread += n;
-			nconversions++;
-			break;
-
-		case CT_STRING:
-			/* like CCL, but zero-length string OK, & no NOSKIP */
-			if (width == 0)
-				width = (size_t)~0;
-			if ((flags & SUPPRESS) && (flags & LONG)) {
-				while ((wi = __fgetwc_unlock(fp)) != WEOF &&
-				    width-- != 0 &&
-				    !iswspace_l(wi, loc))
-					nread++;
-				if (wi != WEOF)
-					ungetwc(wi, fp);
-			} else if (flags & LONG) {
-				p0 = p = va_arg(ap, wchar_t *);
-				while ((wi = __fgetwc_unlock(fp)) != WEOF &&
-				    width-- != 0 &&
-				    !iswspace_l(wi, loc)) {
-					*p++ = (wchar_t)wi;
-					nread++;
-				}
-				if (wi != WEOF)
-					ungetwc(wi, fp);
-				*p = '\0';
-				nassigned++;
-			} else {
-				if (!(flags & SUPPRESS))
-					mbp = va_arg(ap, char *);
-				mbs = initial;
-				while ((wi = __fgetwc_unlock(fp)) != WEOF &&
-				    width != 0 &&
-				    !iswspace_l(wi, loc)) {
-					if (width >= MB_CUR_MAX_L(loc) &&
-					    !(flags & SUPPRESS)) {
-						nconv = wcrtomb_l(mbp, wi,
-						    &mbs, loc);
-						if (nconv == (size_t)-1)
-							goto input_failure;
-					} else {
-						nconv = wcrtomb_l(mbbuf, wi,
-						    &mbs, loc);
-						if (nconv == (size_t)-1)
-							goto input_failure;
-						if (nconv > width)
-							break;
-						if (!(flags & SUPPRESS))
-							memcpy(mbp, mbbuf,
-							    nconv);
-					}
-					if (!(flags & SUPPRESS))
-						mbp += nconv;
-					width -= nconv;
-					nread++;
-				}
-				if (wi != WEOF)
-					ungetwc(wi, fp);
-				if (!(flags & SUPPRESS)) {
-					*mbp = 0;
-					nassigned++;
-				}
-			}
-			nconversions++;
-			continue;
-
-		case CT_INT:
-			/* scan an integer as if by the conversion function */
-			if (width == 0 || width > sizeof(buf) /
-			    sizeof(*buf) - 1)
-				width = sizeof(buf) / sizeof(*buf) - 1;
-			flags |= SIGNOK | NDIGITS | NZDIGITS;
-			for (p = buf; width; width--) {
-				c = __fgetwc_unlock(fp);
-				/*
-				 * Switch on the character; `goto ok'
-				 * if we accept it as a part of number.
-				 */
-				switch (c) {
-
-				/*
-				 * The digit 0 is always legal, but is
-				 * special.  For %i conversions, if no
-				 * digits (zero or nonzero) have been
-				 * scanned (only signs), we will have
-				 * base==0.  In that case, we should set
-				 * it to 8 and enable 0x prefixing.
-				 * Also, if we have not scanned zero digits
-				 * before this, do not turn off prefixing
-				 * (someone else will turn it off if we
-				 * have scanned any nonzero digits).
-				 */
-				case '0':
-					if (base == 0) {
-						base = 8;
-						flags |= PFXOK;
-					}
-					if (flags & NZDIGITS)
-					    flags &= ~(SIGNOK|NZDIGITS|NDIGITS);
-					else
-					    flags &= ~(SIGNOK|PFXOK|NDIGITS);
-					goto ok;
-
-				/* 1 through 7 always legal */
-				case '1': case '2': case '3':
-				case '4': case '5': case '6': case '7':
-					base = basefix[base];
-					flags &= ~(SIGNOK | PFXOK | NDIGITS);
-					goto ok;
-
-				/* digits 8 and 9 ok iff decimal or hex */
-				case '8': case '9':
-					base = basefix[base];
-					if (base <= 8)
-						break;	/* not legal here */
-					flags &= ~(SIGNOK | PFXOK | NDIGITS);
-					goto ok;
-
-				/* letters ok iff hex */
-				case 'A': case 'B': case 'C':
-				case 'D': case 'E': case 'F':
-				case 'a': case 'b': case 'c':
-				case 'd': case 'e': case 'f':
-					/* no need to fix base here */
-					if (base <= 10)
-						break;	/* not legal here */
-					flags &= ~(SIGNOK | PFXOK | NDIGITS);
-					goto ok;
-
-				/* sign ok only as first character */
-				case '+': case '-':
-					if (flags & SIGNOK) {
-						flags &= ~SIGNOK;
-						flags |= HAVESIGN;
-						goto ok;
-					}
-					break;
-					
-				/*
-				 * x ok iff flag still set & 2nd char (or
-				 * 3rd char if we have a sign).
-				 */
-				case 'x': case 'X':
-					if (flags & PFXOK && p ==
-					    buf + 1 + !!(flags & HAVESIGN)) {
-						base = 16;	/* if %i */
-						flags &= ~PFXOK;
-						goto ok;
-					}
-					break;
-				}
-
-				/*
-				 * If we got here, c is not a legal character
-				 * for a number.  Stop accumulating digits.
-				 */
-				if (c != WEOF)
-					ungetwc(c, fp);
-				break;
-		ok:
-				/*
-				 * c is legal: store it and look at the next.
-				 */
-				*p++ = (wchar_t)c;
-			}
-			/*
-			 * If we had only a sign, it is no good; push
-			 * back the sign.  If the number ends in `x',
-			 * it was [sign] '0' 'x', so push back the x
-			 * and treat it as [sign] '0'.
-			 */
-			if (flags & NDIGITS) {
-				if (p > buf)
-					ungetwc(*--p, fp);
-				goto match_failure;
-			}
-			c = p[-1];
-			if (c == 'x' || c == 'X') {
-				--p;
-				ungetwc(c, fp);
-			}
-			if ((flags & SUPPRESS) == 0) {
-				uintmax_t res;
-
-				*p = 0;
-				if ((flags & UNSIGNED) == 0)
-				    res = wcstoimax_l(buf, NULL, base, loc);
-				else
-				    res = wcstoumax_l(buf, NULL, base, loc);
-				if (flags & POINTER)
-					*va_arg(ap, void **) =
-							(void *)(uintptr_t)res;
-				else if (flags & SHORTSHORT)
-					*va_arg(ap, char *) = (char)res;
-				else if (flags & SHORT)
-					*va_arg(ap, short *) = (short)res;
-				else if (flags & LONG)
-					*va_arg(ap, long *) = (long)res;
-				else if (flags & LONGLONG)
-					*va_arg(ap, quad_t *) = res;
-				else if (flags & INTMAXT)
-					*va_arg(ap, intmax_t *) = res;
-				else if (flags & PTRDIFFT)
-					*va_arg(ap, ptrdiff_t *) = (ptrdiff_t)res;
-				else if (flags & SIZET)
-					*va_arg(ap, size_t *) = (size_t)res;
-				else
-					*va_arg(ap, int *) = (int)res;
-				nassigned++;
-			}
-			_DIAGASSERT(__type_fit(int, p - buf));
-			nread += (int)(p - buf);
-			nconversions++;
-			break;
-
-#ifndef NO_FLOATING_POINT
-		case CT_FLOAT:
-			/* scan a floating point number as if by strtod */
-			if (width == 0 || width > sizeof(buf) /
-			    sizeof(*buf) - 1)
-				width = sizeof(buf) / sizeof(*buf) - 1;
-			if ((width = parsefloat(fp, buf, buf + width, loc)) == 0)
-				goto match_failure;
-			if ((flags & SUPPRESS) == 0) {
-				if (flags & LONGDBL) {
-					long double res = wcstold_l(buf, &p,
-					    loc);
-					*va_arg(ap, long double *) = res;
-				} else
-				if (flags & LONG) {
-					double res = wcstod_l(buf, &p, loc);
-					*va_arg(ap, double *) = res;
-				} else {
-					float res = wcstof_l(buf, &p, loc);
-					*va_arg(ap, float *) = res;
-				}
-#ifdef DEBUG
-				if (p - buf != (ptrdiff_t)width)
-					abort();
-#endif
-				nassigned++;
-			}
-			nread += width;
-			nconversions++;
-			break;
-#endif /* !NO_FLOATING_POINT */
-		}
-	}
-input_failure:
-	return nconversions != 0 ? nassigned : EOF;
-match_failure:
-	return nassigned;
-}
-
-#ifndef NO_FLOATING_POINT
-static int
-parsefloat(FILE *fp, wchar_t *buf, wchar_t *end, locale_t loc)
-{
-	wchar_t *commit, *p;
-	int infnanpos = 0;
-	enum {
-		S_START, S_GOTSIGN, S_INF, S_NAN, S_MAYBEHEX,
-		S_DIGITS, S_FRAC, S_EXP, S_EXPDIGITS
-	} state = S_START;
-	wchar_t c;
-	wchar_t decpt = (wchar_t)(unsigned char)*localeconv_l(loc)->decimal_point;
-	int gotmantdig = 0, ishex = 0;
-
-	/*
-	 * We set commit = p whenever the string we have read so far
-	 * constitutes a valid representation of a floating point
-	 * number by itself.  At some point, the parse will complete
-	 * or fail, and we will ungetc() back to the last commit point.
-	 * To ensure that the file offset gets updated properly, it is
-	 * always necessary to read at least one character that doesn't
-	 * match; thus, we can't short-circuit "infinity" or "nan(...)".
-	 */
-	commit = buf - 1;
-	c = WEOF;
-	for (p = buf; p < end; ) {
-		if ((c = __fgetwc_unlock(fp)) == WEOF)
-			break;
-reswitch:
-		switch (state) {
-		case S_START:
-			state = S_GOTSIGN;
-			if (c == '-' || c == '+')
-				break;
-			else
-				goto reswitch;
-		case S_GOTSIGN:
-			switch (c) {
-			case '0':
-				state = S_MAYBEHEX;
-				commit = p;
-				break;
-			case 'I':
-			case 'i':
-				state = S_INF;
-				break;
-			case 'N':
-			case 'n':
-				state = S_NAN;
-				break;
-			default:
-				state = S_DIGITS;
-				goto reswitch;
-			}
-			break;
-		case S_INF:
-			if (infnanpos > 6 ||
-			    (c != "nfinity"[infnanpos] &&
-			     c != "NFINITY"[infnanpos]))
-				goto parsedone;
-			if (infnanpos == 1 || infnanpos == 6)
-				commit = p;	/* inf or infinity */
-			infnanpos++;
-			break;
-		case S_NAN:
-			switch (infnanpos) {
-			case -1:	/* XXX kludge to deal with nan(...) */
-				goto parsedone;
-			case 0:
-				if (c != 'A' && c != 'a')
-					goto parsedone;
-				break;
-			case 1:
-				if (c != 'N' && c != 'n')
-					goto parsedone;
-				else
-					commit = p;
-				break;
-			case 2:
-				if (c != '(')
-					goto parsedone;
-				break;
-			default:
-				if (c == ')') {
-					commit = p;
-					infnanpos = -2;
-				} else if (!iswalnum_l(c, loc) && c != '_')
-					goto parsedone;
-				break;
-			}
-			infnanpos++;
-			break;
-		case S_MAYBEHEX:
-			state = S_DIGITS;
-			if (c == 'X' || c == 'x') {
-				ishex = 1;
-				break;
-			} else {	/* we saw a '0', but no 'x' */
-				gotmantdig = 1;
-				goto reswitch;
-			}
-		case S_DIGITS:
-			if ((ishex && iswxdigit_l(c, loc)) ||
-			    iswdigit_l(c, loc))
-				gotmantdig = 1;
-			else {
-				state = S_FRAC;
-				if (c != decpt)
-					goto reswitch;
-			}
-			if (gotmantdig)
-				commit = p;
-			break;
-		case S_FRAC:
-			if (((c == 'E' || c == 'e') && !ishex) ||
-			    ((c == 'P' || c == 'p') && ishex)) {
-				if (!gotmantdig)
-					goto parsedone;
-				else
-					state = S_EXP;
-			} else if ((ishex && iswxdigit_l(c, loc)) ||
-			    iswdigit_l(c, loc)) {
-				commit = p;
-				gotmantdig = 1;
-			} else
-				goto parsedone;
-			break;
-		case S_EXP:
-			state = S_EXPDIGITS;
-			if (c == '-' || c == '+')
-				break;
-			else
-				goto reswitch;
-		case S_EXPDIGITS:
-			if (iswdigit_l(c, loc))
-				commit = p;
-			else
-				goto parsedone;
-			break;
-		default:
-			abort();
-		}
-		*p++ = c;
-		c = WEOF;
-	}
-
-parsedone:
-	if (c != WEOF)
-		ungetwc(c, fp);
-	while (commit < --p)
-		ungetwc(*p, fp);
-	*++commit = '\0';
-	_DIAGASSERT(__type_fit(int, commit - buf));
-	return (int)(commit - buf);
-}
-#endif
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
deleted file mode 100644
index ccc789b42..000000000
--- a/lib/libc/stdio/vprintf.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: vprintf.c,v 1.13 2013/04/19 15:22:25 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)vprintf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: vprintf.c,v 1.13 2013/04/19 15:22:25 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-__weak_alias(vprintf_l, _vprintf_l)
-
-int
-vprintf(const char *fmt, va_list ap)
-{
-
-	_DIAGASSERT(fmt != NULL);
-
-	return vfprintf(stdout, fmt, ap);
-}
-
-int
-vprintf_l(locale_t loc, const char *fmt, va_list ap)
-{
-
-	return vfprintf_l(stdout, loc, fmt, ap);
-}
diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c
deleted file mode 100644
index ac293fabb..000000000
--- a/lib/libc/stdio/vscanf.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: vscanf.c,v 1.15 2013/04/19 23:32:17 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Donn Seeley at 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)vscanf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: vscanf.c,v 1.15 2013/04/19 23:32:17 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-
-#include "reentrant.h"
-#include "local.h"
-
-__weak_alias(vscanf_l, _vscanf_l)
-
-int
-vscanf(const char *fmt, va_list ap)
-{
-
-	_DIAGASSERT(fmt != NULL);
-
-	return __svfscanf(stdin, fmt, ap);
-}
-
-int
-vscanf_l(locale_t loc, const char *fmt, va_list ap)
-{
-
-	_DIAGASSERT(fmt != NULL);
-
-	return __svfscanf_l(stdin, loc, fmt, ap);
-}
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
deleted file mode 100644
index 0eea2b5ac..000000000
--- a/lib/libc/stdio/vsnprintf.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*	$NetBSD: vsnprintf.c,v 1.28 2014/09/29 14:58:33 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)vsnprintf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: vsnprintf.c,v 1.28 2014/09/29 14:58:33 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <locale.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "setlocale_local.h"
-#include "local.h"
-
-#if defined(_FORTIFY_SOURCE) && !defined(__lint__)
-#undef vsnprintf
-#define vsnprintf _vsnprintf
-#undef snprintf
-#define snprintf _snprintf
-#endif
-
-#ifdef __weak_alias
-__weak_alias(vsnprintf,_vsnprintf)
-__weak_alias(vsnprintf_l,_vsnprintf_l)
-__weak_alias(snprintf,_snprintf)
-__weak_alias(snprintf_l,_snprintf_l)
-#endif
-
-int
-vsnprintf_l(char *str, size_t n, locale_t loc, const char *fmt, va_list ap)
-{
-	int ret;
-	FILE f;
-	struct __sfileext fext;
-	unsigned char dummy[1];
-
-	_DIAGASSERT(n == 0 || str != NULL);
-	_DIAGASSERT(fmt != NULL);
-
-	if (n > INT_MAX) {
-		errno = EOVERFLOW;
-		return -1;
-	}
-
-	_FILEEXT_SETUP(&f, &fext);
-	f._file = -1;
-	f._flags = __SWR | __SSTR;
-	if (n == 0) {
-		f._bf._base = f._p = dummy;
-		f._bf._size = f._w = 0;
-	} else {
-		f._bf._base = f._p = (unsigned char *)str;
-		_DIAGASSERT(__type_fit(int, n - 1));
-		f._bf._size = f._w = (int)(n - 1);
-	}
-	ret = __vfprintf_unlocked_l(&f, loc, fmt, ap);
-	*f._p = 0;
-	return ret;
-}
-
-int
-vsnprintf(char *str, size_t n, const char *fmt, va_list ap)
-{
-	return vsnprintf_l(str, n, _current_locale(), fmt, ap);
-}
-
-int
-snprintf(char *str, size_t n, const char *fmt, ...)
-{
-	va_list ap;
-	int ret;
-
-	va_start(ap, fmt);
-	ret = vsnprintf(str, n, fmt, ap);
-	va_end(ap);
-	return ret;
-}
-
-int
-snprintf_l(char *str, size_t n, locale_t loc, const char *fmt, ...)
-{
-	va_list ap;
-	int ret;
-
-	va_start(ap, fmt);
-	ret = vsnprintf_l(str, n, loc, fmt, ap);
-	va_end(ap);
-	return ret;
-}
diff --git a/lib/libc/stdio/vsnprintf_ss.c b/lib/libc/stdio/vsnprintf_ss.c
deleted file mode 100644
index 2be9a6277..000000000
--- a/lib/libc/stdio/vsnprintf_ss.c
+++ /dev/null
@@ -1,506 +0,0 @@
-/*	$NetBSD: vsnprintf_ss.c,v 1.13 2014/09/29 14:58:33 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)vsnprintf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: vsnprintf_ss.c,v 1.13 2014/09/29 14:58:33 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <inttypes.h>
-#include <assert.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <string.h>
-#include "reentrant.h"
-#include "extern.h"
-#include "local.h"
-
-#ifdef __weak_alias
-__weak_alias(vsnprintf_ss,_vsnprintf_ss)
-#endif
-
-/*
- * vsnprintf_ss: scaled down version of printf(3).
- *
- * this version based on vfprintf() from libc which was derived from
- * software contributed to Berkeley by Chris Torek.
- *
- */
-
-/*
- * macros for converting digits to letters and vice versa
- */
-#define	to_digit(c)	((c) - '0')
-#define is_digit(c)	((unsigned)to_digit(c) <= 9)
-#define	to_char(n)	(char)((n) + '0')
-
-/*
- * flags used during conversion.
- */
-#define	ALT		0x001		/* alternate form */
-#define	HEXPREFIX	0x002		/* add 0x or 0X prefix */
-#define	LADJUST		0x004		/* left adjustment */
-#define	LONGDBL		0x008		/* long double; unimplemented */
-#define	LONGINT		0x010		/* long integer */
-#define	QUADINT		0x020		/* quad integer */
-#define	SHORTINT	0x040		/* short integer */
-#define	MAXINT		0x080		/* intmax_t */
-#define	PTRINT		0x100		/* intptr_t */
-#define	SIZEINT		0x200		/* size_t */
-#define	ZEROPAD		0x400		/* zero (as opposed to blank) pad */
-#define FPT		0x800		/* Floating point number */
-
-	/*
-	 * To extend shorts properly, we need both signed and unsigned
-	 * argument extraction methods.
-	 */
-#define	SARG() \
-	(flags&MAXINT ? va_arg(ap, intmax_t) : \
-	    flags&PTRINT ? va_arg(ap, intptr_t) : \
-	    flags&SIZEINT ? va_arg(ap, ssize_t) : /* XXX */ \
-	    flags&QUADINT ? va_arg(ap, quad_t) : \
-	    flags&LONGINT ? va_arg(ap, long) : \
-	    flags&SHORTINT ? (long)(short)va_arg(ap, int) : \
-	    (long)va_arg(ap, int))
-#define	UARG() \
-	(flags&MAXINT ? va_arg(ap, uintmax_t) : \
-	    flags&PTRINT ? va_arg(ap, uintptr_t) : \
-	    flags&SIZEINT ? va_arg(ap, size_t) : \
-	    flags&QUADINT ? va_arg(ap, u_quad_t) : \
-	    flags&LONGINT ? va_arg(ap, u_long) : \
-	    flags&SHORTINT ? (u_long)(u_short)va_arg(ap, int) : \
-	    (u_long)va_arg(ap, u_int))
-
-#define PUTCHAR(C) do {					\
-	if (sbuf < tailp)				\
-		*sbuf++ = (C);				\
-} while (/*CONSTCOND*/0)
-
-int
-vsnprintf_ss(char *sbuf, size_t slen, const char *fmt0, va_list ap)
-{
-	const char *fmt;	/* format string */
-	int ch;			/* character from fmt */
-	int n;			/* handy integer (short term usage) */
-	char *cp;		/* handy char pointer (short term usage) */
-	int flags;		/* flags as above */
-	int ret;		/* return value accumulator */
-	int width;		/* width from format (%8d), or 0 */
-	int prec;		/* precision from format (%.3d), or -1 */
-	char sign;		/* sign prefix (' ', '+', '-', or \0) */
-
-	u_quad_t _uquad;	/* integer arguments %[diouxX] */
-	enum { OCT, DEC, HEX } base;/* base for [diouxX] conversion */
-	int dprec;		/* a copy of prec if [diouxX], 0 otherwise */
-	int realsz;		/* field size expanded by dprec */
-	int size;		/* size of converted field or string */
-	const char *xdigs;	/* digits for [xX] conversion */
-	char bf[128]; 		/* space for %c, %[diouxX] */
-	char *tailp;		/* tail pointer for snprintf */
-	size_t len;
-
-	static const char xdigs_lower[16] = "0123456789abcdef";
-	static const char xdigs_upper[16] = "0123456789ABCDEF";
-
-	_DIAGASSERT(slen == 0 || sbuf != NULL);
-	_DIAGASSERT(fmt0 != NULL);
-
-	if (slen > INT_MAX) {
-		errno = EOVERFLOW;
-		return -1;
-	}
-
-	tailp = sbuf + slen;
-
-	cp = NULL;	/* XXX: shutup gcc */
-	size = 0;	/* XXX: shutup gcc */
-
-	fmt = fmt0;
-	ret = 0;
-
-	xdigs = NULL;		/* XXX: shut up gcc warning */
-
-	/*
-	 * Scan the format for conversions (`%' character).
-	 */
-	for (;;) {
-		while (*fmt != '%' && *fmt) {
-			ret++;
-			PUTCHAR(*fmt);
-			fmt++;
-		}
-		if (*fmt == 0)
-			goto done;
-
-		fmt++;		/* skip over '%' */
-
-		flags = 0;
-		dprec = 0;
-		width = 0;
-		prec = -1;
-		sign = '\0';
-
-rflag:		ch = *fmt++;
-reswitch:	switch (ch) {
-		case ' ':
-			/*
-			 * ``If the space and + flags both appear, the space
-			 * flag will be ignored.''
-			 *	-- ANSI X3J11
-			 */
-			if (!sign)
-				sign = ' ';
-			goto rflag;
-		case '#':
-			flags |= ALT;
-			goto rflag;
-		case '*':
-			/*
-			 * ``A negative field width argument is taken as a
-			 * - flag followed by a positive field width.''
-			 *	-- ANSI X3J11
-			 * They don't exclude field widths read from args.
-			 */
-			if ((width = va_arg(ap, int)) >= 0)
-				goto rflag;
-			width = -width;
-			/* FALLTHROUGH */
-		case '-':
-			flags |= LADJUST;
-			goto rflag;
-		case '+':
-			sign = '+';
-			goto rflag;
-		case '.':
-			if ((ch = *fmt++) == '*') {
-				n = va_arg(ap, int);
-				prec = n < 0 ? -1 : n;
-				goto rflag;
-			}
-			n = 0;
-			while (is_digit(ch)) {
-				n = 10 * n + to_digit(ch);
-				ch = *fmt++;
-			}
-			prec = n < 0 ? -1 : n;
-			goto reswitch;
-		case '0':
-			/*
-			 * ``Note that 0 is taken as a flag, not as the
-			 * beginning of a field width.''
-			 *	-- ANSI X3J11
-			 */
-			flags |= ZEROPAD;
-			goto rflag;
-		case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			n = 0;
-			do {
-				n = 10 * n + to_digit(ch);
-				ch = *fmt++;
-			} while (is_digit(ch));
-			width = n;
-			goto reswitch;
-		case 'h':
-			flags |= SHORTINT;
-			goto rflag;
-		case 'j':
-			flags |= MAXINT;
-			goto rflag;
-		case 'l':
-			if (*fmt == 'l') {
-				fmt++;
-				flags |= QUADINT;
-			} else {
-				flags |= LONGINT;
-			}
-			goto rflag;
-		case 'q':
-			flags |= QUADINT;
-			goto rflag;
-		case 't':
-			flags |= PTRINT;
-			goto rflag;
-		case 'z':
-			flags |= SIZEINT;
-			goto rflag;
-		case 'c':
-			*(cp = bf) = va_arg(ap, int);
-			size = 1;
-			sign = '\0';
-			break;
-		case 'D':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'd':
-		case 'i':
-			_uquad = SARG();
-			if ((quad_t)_uquad < 0) {
-				_uquad = -_uquad;
-				sign = '-';
-			}
-			base = DEC;
-			goto number;
-		case 'n':
-			if (flags & MAXINT)
-				*va_arg(ap, intmax_t *) = ret;
-			else if (flags & PTRINT)
-				*va_arg(ap, intptr_t *) = ret;
-			else if (flags & SIZEINT)
-				*va_arg(ap, ssize_t *) = ret;
-			else if (flags & QUADINT)
-				*va_arg(ap, quad_t *) = ret;
-			else if (flags & LONGINT)
-				*va_arg(ap, long *) = ret;
-			else if (flags & SHORTINT)
-				*va_arg(ap, short *) = ret;
-			else
-				*va_arg(ap, int *) = ret;
-			continue;	/* no output */
-		case 'O':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'o':
-			_uquad = UARG();
-			base = OCT;
-			goto nosign;
-		case 'p':
-			/*
-			 * ``The argument shall be a pointer to void.  The
-			 * value of the pointer is converted to a sequence
-			 * of printable characters, in an implementation-
-			 * defined manner.''
-			 *	-- ANSI X3J11
-			 */
-			/* NOSTRICT */
-			_uquad = (u_long)va_arg(ap, void *);
-			base = HEX;
-			xdigs = xdigs_lower;
-			flags |= HEXPREFIX;
-			ch = 'x';
-			goto nosign;
-		case 's':
-			if ((cp = va_arg(ap, char *)) == NULL)
-				/*XXXUNCONST*/
-				cp = __UNCONST("(null)");
-			if (prec >= 0) {
-				/*
-				 * can't use strlen; can only look for the
-				 * NUL in the first `prec' characters, and
-				 * strlen() will go further.
-				 */
-				char *p = memchr(cp, 0, (size_t)prec);
-
-				if (p != NULL) {
-					_DIAGASSERT(__type_fit(int, p - cp));
-					size = (int)(p - cp);
-					if (size > prec)
-						size = prec;
-				} else
-					size = prec;
-			} else {
-				len = strlen(cp);
-				_DIAGASSERT(__type_fit(int, len));
-				size = (int)len;
-			}
-			sign = '\0';
-			break;
-		case 'U':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'u':
-			_uquad = UARG();
-			base = DEC;
-			goto nosign;
-		case 'X':
-			xdigs = xdigs_upper;
-			goto hex;
-		case 'x':
-			xdigs = xdigs_lower;
-hex:			_uquad = UARG();
-			base = HEX;
-			/* leading 0x/X only if non-zero */
-			if (flags & ALT && _uquad != 0)
-				flags |= HEXPREFIX;
-
-			/* unsigned conversions */
-nosign:			sign = '\0';
-			/*
-			 * ``... diouXx conversions ... if a precision is
-			 * specified, the 0 flag will be ignored.''
-			 *	-- ANSI X3J11
-			 */
-number:			if ((dprec = prec) >= 0)
-				flags &= ~ZEROPAD;
-
-			/*
-			 * ``The result of converting a zero value with an
-			 * explicit precision of zero is no characters.''
-			 *	-- ANSI X3J11
-			 */
-			cp = bf + sizeof(bf);
-			if (_uquad != 0 || prec != 0) {
-				/*
-				 * Unsigned mod is hard, and unsigned mod
-				 * by a constant is easier than that by
-				 * a variable; hence this switch.
-				 */
-				switch (base) {
-				case OCT:
-					do {
-						*--cp = to_char(_uquad & 7);
-						_uquad >>= 3;
-					} while (_uquad);
-					/* handle octal leading 0 */
-					if (flags & ALT && *cp != '0')
-						*--cp = '0';
-					break;
-
-				case DEC:
-					/* many numbers are 1 digit */
-					while (_uquad >= 10) {
-						*--cp = to_char(_uquad % 10);
-						_uquad /= 10;
-					}
-					*--cp = to_char(_uquad);
-					break;
-
-				case HEX:
-					do {
-						*--cp = xdigs[(size_t)_uquad & 15];
-						_uquad >>= 4;
-					} while (_uquad);
-					break;
-
-				default:
-					/*XXXUNCONST*/
-					cp = __UNCONST("bug bad base");
-					len = strlen(cp);
-					_DIAGASSERT(__type_fit(int, len));
-					size = (int)len;
-					goto skipsize;
-				}
-			}
-			_DIAGASSERT(__type_fit(int, bf + sizeof(bf) - cp));
-			size = (int)(bf + sizeof(bf) - cp);
-		skipsize:
-			break;
-		default:	/* "%?" prints ?, unless ? is NUL */
-			if (ch == '\0')
-				goto done;
-			/* pretend it was %c with argument ch */
-			cp = bf;
-			*cp = ch;
-			size = 1;
-			sign = '\0';
-			break;
-		}
-
-		/*
-		 * All reasonable formats wind up here.  At this point, `cp'
-		 * points to a string which (if not flags&LADJUST) should be
-		 * padded out to `width' places.  If flags&ZEROPAD, it should
-		 * first be prefixed by any sign or other prefix; otherwise,
-		 * it should be blank padded before the prefix is emitted.
-		 * After any left-hand padding and prefixing, emit zeroes
-		 * required by a decimal [diouxX] precision, then print the
-		 * string proper, then emit zeroes required by any leftover
-		 * floating precision; finally, if LADJUST, pad with blanks.
-		 *
-		 * Compute actual size, so we know how much to pad.
-		 * size excludes decimal prec; realsz includes it.
-		 */
-		realsz = dprec > size ? dprec : size;
-		if (sign)
-			realsz++;
-		else if (flags & HEXPREFIX)
-			realsz+= 2;
-
-		/* adjust ret */
-		ret += width > realsz ? width : realsz;
-
-		/* right-adjusting blank padding */
-		if ((flags & (LADJUST|ZEROPAD)) == 0) {
-			n = width - realsz;
-			while (n-- > 0)
-				PUTCHAR(' ');
-		}
-
-		/* prefix */
-		if (sign) {
-			PUTCHAR(sign);
-		} else if (flags & HEXPREFIX) {
-			PUTCHAR('0');
-			PUTCHAR(ch);
-		}
-
-		/* right-adjusting zero padding */
-		if ((flags & (LADJUST|ZEROPAD)) == ZEROPAD) {
-			n = width - realsz;
-			while (n-- > 0)
-				PUTCHAR('0');
-		}
-
-		/* leading zeroes from decimal precision */
-		n = dprec - size;
-		while (n-- > 0)
-			PUTCHAR('0');
-
-		/* the string or number proper */
-		while (size--)
-			PUTCHAR(*cp++);
-		/* left-adjusting padding (always blank) */
-		if (flags & LADJUST) {
-			n = width - realsz;
-			while (n-- > 0)
-				PUTCHAR(' ');
-		}
-	}
-
-done:
-	if (sbuf == tailp)
-		sbuf[-1] = '\0';
-	else
-		*sbuf = '\0';
-	return ret;
-	/* NOTREACHED */
-}
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
deleted file mode 100644
index d0ffe2c9b..000000000
--- a/lib/libc/stdio/vsprintf.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*	$NetBSD: vsprintf.c,v 1.19 2013/05/17 12:55:57 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)vsprintf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: vsprintf.c,v 1.19 2013/05/17 12:55:57 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdio.h>
-
-#include "reentrant.h"
-#include "setlocale_local.h"
-#include "local.h"
-
-#ifdef _FORTIFY_SOURCE
-#undef vsprintf
-#undef sprintf
-#endif
-
-__weak_alias(sprintf_l, _sprintf_l)
-__weak_alias(vsprintf_l, _vsprintf_l)
-
-int
-vsprintf_l(char *str, locale_t loc, const char *fmt, va_list ap)
-{
-	int ret;
-	FILE f;
-	struct __sfileext fext;
-
-	_DIAGASSERT(str != NULL);
-	_DIAGASSERT(fmt != NULL);
-
-	_FILEEXT_SETUP(&f, &fext);
-	f._file = -1;
-	f._flags = __SWR | __SSTR;
-	f._bf._base = f._p = (unsigned char *)str;
-	f._bf._size = f._w = INT_MAX;
-	ret = __vfprintf_unlocked_l(&f, loc, fmt, ap);
-	*f._p = 0;
-	return ret;
-}
-
-int
-vsprintf(char *str, const char *fmt, va_list ap)
-{
-	return vsprintf_l(str, _current_locale(), fmt, ap);
-}
-
-int
-sprintf_l(char *str, locale_t loc, char const *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vsprintf_l(str, loc, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
-
-int
-sprintf(char *str, char const *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vsprintf(str, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
deleted file mode 100644
index 8df72b338..000000000
--- a/lib/libc/stdio/vsscanf.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$NetBSD: vsscanf.c,v 1.21 2013/05/17 12:55:57 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Donn Seeley at 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)vsscanf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: vsscanf.c,v 1.21 2013/05/17 12:55:57 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <locale.h>
-#include <stdio.h>
-#include <string.h>
-#include "reentrant.h"
-#include "setlocale_local.h"
-#include "local.h"
-
-__weak_alias(vsscanf_l, _vsscanf_l)
-
-/* ARGSUSED */
-static ssize_t
-eofread(void *cookie, void *buf, size_t len)
-{
-	return 0;
-}
-
-int
-vsscanf_l(const char *str, locale_t loc, const char *fmt, va_list ap)
-{
-	FILE f;
-	struct __sfileext fext;
-	size_t len;
-
-	_DIAGASSERT(str != NULL);
-	_DIAGASSERT(fmt != NULL);
-
-	_FILEEXT_SETUP(&f, &fext);
-	f._flags = __SRD;
-	f._bf._base = f._p = __UNCONST(str);
-	len = strlen(str);
-	_DIAGASSERT(__type_fit(int, len));
-	f._bf._size = f._r = (int)len;
-	f._read = eofread;
-	_UB(&f)._base = NULL;
-	return __svfscanf_unlocked_l(&f, loc, fmt, ap);
-}
-
-int
-vsscanf(const char *str, const char *fmt, va_list ap)
-{
-	return vsscanf_l(str, _current_locale(), fmt, ap);
-}
diff --git a/lib/libc/stdio/vswprintf.c b/lib/libc/stdio/vswprintf.c
deleted file mode 100644
index 41505b20f..000000000
--- a/lib/libc/stdio/vswprintf.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*	$NetBSD: vswprintf.c,v 1.6 2013/05/19 21:45:00 christos Exp $	*/
-
-/*
- * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vswprintf.c,v 1.6 2005/02/21 19:41:44 fjoe Exp $");
-#else
-__RCSID("$NetBSD: vswprintf.c,v 1.6 2013/05/19 21:45:00 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <errno.h>
-#include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <stdarg.h>
-
-#include "reentrant.h"
-#include "setlocale_local.h"
-#include "local.h"
-
-__weak_alias(vswprintf_l, _vswprintf_l)
-
-int
-vswprintf_l(wchar_t * __restrict s, size_t n, locale_t loc,
-    const wchar_t * __restrict fmt, va_list ap)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	FILE f;
-	char *mbp;
-	int ret, sverrno;
-	size_t nwc;
-	struct __sfileext fext;
-
-	if (n == 0) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	_FILEEXT_SETUP(&f, &fext);
-	f._file = -1;
-	f._flags = __SWR | __SSTR | __SALC;
-	f._bf._base = f._p = malloc(128);
-	if (f._bf._base == NULL) {
-		errno = ENOMEM;
-		return -1;
-	}
-	f._bf._size = f._w = 127;		/* Leave room for the NUL */
-	ret = __vfwprintf_unlocked_l(&f, loc, fmt, ap);
-	if (ret < 0) {
-		sverrno = errno;
-		free(f._bf._base);
-		errno = sverrno;
-		return -1;
-	}
-	*f._p = '\0';
-	mbp = (char *)f._bf._base;
-	/*
-	 * XXX Undo the conversion from wide characters to multibyte that
-	 * fputwc() did in __vfwprintf().
-	 */
-	mbs = initial;
-	nwc = mbsrtowcs_l(s, (void *)&mbp, n, &mbs, loc);
-	free(f._bf._base);
-	if (nwc == (size_t)-1) {
-		errno = EILSEQ;
-		return -1;
-	}
-	if (nwc == n) {
-		s[n - 1] = L'\0';
-		errno = EOVERFLOW;
-		return -1;
-	}
-
-	return ret;
-}
-
-int
-vswprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt,
-    va_list ap)
-{
-	return vswprintf_l(s, n, _current_locale(), fmt, ap);
-}
diff --git a/lib/libc/stdio/vswscanf.c b/lib/libc/stdio/vswscanf.c
deleted file mode 100644
index 7305ef716..000000000
--- a/lib/libc/stdio/vswscanf.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*	$NetBSD: vswscanf.c,v 1.12 2013/05/17 12:55:57 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Donn Seeley at 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)vsscanf.c	8.1 (Berkeley) 6/4/93";
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vswscanf.c,v 1.3 2004/04/07 09:55:05 tjr Exp $");
-#else
-__RCSID("$NetBSD: vswscanf.c,v 1.12 2013/05/17 12:55:57 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "reentrant.h"
-#include "setlocale_local.h"
-#include "local.h"
-
-__weak_alias(vswscanf_l, _vswscanf_l)
-
-static ssize_t
-/*ARGSUSED*/
-eofread(void *cookie, void *buf, size_t len)
-{
-
-	return 0;
-}
-
-int
-vswscanf_l(const wchar_t * __restrict str, locale_t loc,
-    const wchar_t * __restrict fmt, va_list ap)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	FILE f;
-	char *mbstr;
-	size_t mlen;
-	int r;
-	const wchar_t *rstr = str;
-	struct __sfileext fext;
-
-	/*
-	 * XXX Convert the wide character string to multibyte, which
-	 * __vfwscanf() will convert back to wide characters.
-	 */
-	mbstr = malloc(wcslen(str) * MB_CUR_MAX_L(loc) + 1);
-	if (mbstr == NULL)
-		return EOF;
-	mbs = initial;
-	if ((mlen = wcsrtombs_l(mbstr, &rstr, SIZE_T_MAX, &mbs, loc))
-	    == (size_t)-1) {
-		free(mbstr);
-		return EOF;
-	}
-	_FILEEXT_SETUP(&f, &fext);
-	(void)memset(WCIO_GET(&f), 0, sizeof(struct wchar_io_data));
-	f._file = -1;
-	f._flags = __SRD;
-	f._bf._base = f._p = (unsigned char *)mbstr;
-	_DIAGASSERT(__type_fit(int, mlen));
-	f._bf._size = f._r = (int)mlen;
-	f._read = eofread;
-	_UB(&f)._base = NULL;
-	r = __vfwscanf_unlocked_l(&f, loc, fmt, ap);
-	free(mbstr);
-
-	return r;
-}
-
-int
-vswscanf(const wchar_t * __restrict str, const wchar_t * __restrict fmt,
-    va_list ap)
-{
-	return vswscanf_l(str, _current_locale(), fmt, ap);
-}
diff --git a/lib/libc/stdio/vwprintf.c b/lib/libc/stdio/vwprintf.c
deleted file mode 100644
index b5412711a..000000000
--- a/lib/libc/stdio/vwprintf.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: vwprintf.c,v 1.3 2013/04/19 15:22:25 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vwprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
-#else
-__RCSID("$NetBSD: vwprintf.c,v 1.3 2013/04/19 15:22:25 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-__weak_alias(vwprintf_l, _vwprintf_l)
-
-int
-vwprintf_l(locale_t loc, const wchar_t * __restrict fmt, va_list ap)
-{
-	return vfwprintf_l(stdout, loc, fmt, ap);
-}
-
-int
-vwprintf(const wchar_t * __restrict fmt, va_list ap)
-{
-
-	return vfwprintf(stdout, fmt, ap);
-}
diff --git a/lib/libc/stdio/vwscanf.c b/lib/libc/stdio/vwscanf.c
deleted file mode 100644
index b28e3fc1f..000000000
--- a/lib/libc/stdio/vwscanf.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: vwscanf.c,v 1.3 2013/04/19 23:32:17 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vwscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
-#else
-__RCSID("$NetBSD: vwscanf.c,v 1.3 2013/04/19 23:32:17 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-__weak_alias(vwscanf_l, _vwscanf_l)
-
-int
-vwscanf(const wchar_t * __restrict fmt, va_list ap)
-{
-
-	return vfwscanf(stdin, fmt, ap);
-}
-
-int
-vwscanf_l(locale_t loc, const wchar_t * __restrict fmt, va_list ap)
-{
-
-	return vfwscanf_l(stdin, loc, fmt, ap);
-}
diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c
deleted file mode 100644
index 52456a25d..000000000
--- a/lib/libc/stdio/wbuf.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*	$NetBSD: wbuf.c,v 1.15 2012/03/15 18:22:31 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)wbuf.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: wbuf.c,v 1.15 2012/03/15 18:22:31 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * Write the given character into the (probably full) buffer for
- * the given file.  Flush the buffer out if it is or becomes full,
- * or if c=='\n' and the file is line buffered.
- */
-int
-__swbuf(int c, FILE *fp)
-{
-	int n;
-
-	_DIAGASSERT(fp != NULL);
-
-	_SET_ORIENTATION(fp, -1);
-
-	/*
-	 * In case we cannot write, or longjmp takes us out early,
-	 * make sure _w is 0 (if fully- or un-buffered) or -_bf._size
-	 * (if line buffered) so that we will get called again.
-	 * If we did not do this, a sufficient number of putc()
-	 * calls might wrap _w from negative to positive.
-	 */
-	fp->_w = fp->_lbfsize;
-	if (cantwrite(fp)) {
-		errno = EBADF;
-		return EOF;
-	}
-	c = (unsigned char)c;
-
-	/*
-	 * If it is completely full, flush it out.  Then, in any case,
-	 * stuff c into the buffer.  If this causes the buffer to fill
-	 * completely, or if c is '\n' and the file is line buffered,
-	 * flush it (perhaps a second time).  The second flush will always
-	 * happen on unbuffered streams, where _bf._size==1; fflush()
-	 * guarantees that putc() will always call wbuf() by setting _w
-	 * to 0, so we need not do anything else.
-	 */
-	_DIAGASSERT(__type_fit(int, fp->_p - fp->_bf._base));
-	n = (int)(fp->_p - fp->_bf._base);
-	if (n >= fp->_bf._size) {
-		if (fflush(fp))
-			return EOF;
-		n = 0;
-	}
-	fp->_w--;
-	*fp->_p++ = c;
-	if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n'))
-		if (fflush(fp))
-			return EOF;
-	return c;
-}
diff --git a/lib/libc/stdio/wcio.h b/lib/libc/stdio/wcio.h
deleted file mode 100644
index 7fb7711df..000000000
--- a/lib/libc/stdio/wcio.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $NetBSD: wcio.h,v 1.3 2003/01/18 11:30:00 thorpej Exp $ */
-
-/*-
- * Copyright (c)2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Citrus$
- */
-
-#ifndef _WCIO_H_
-#define _WCIO_H_
-
-#include <wchar.h> /* for mbstate_t and wchar_t */
-
-/* minimal requirement of SUSv2 */
-#define WCIO_UNGETWC_BUFSIZE 1
-
-struct wchar_io_data {
-	mbstate_t wcio_mbstate_in;
-	mbstate_t wcio_mbstate_out;
-
-	wchar_t wcio_ungetwc_buf[WCIO_UNGETWC_BUFSIZE];
-	size_t wcio_ungetwc_inbuf;
-
-	int wcio_mode; /* orientation */
-};
-
-#define _SET_ORIENTATION(fp, mode) \
-do {\
-	struct wchar_io_data *_wcio = WCIO_GET(fp);\
-	if (_wcio && _wcio->wcio_mode == 0)\
-		_wcio->wcio_mode = (mode);\
-} while (/*CONSTCOND*/0)
-
-/*
- * WCIO_FREE should be called by fclose
- */
-#define WCIO_GET(fp) (&(_EXT(fp)->_wcio))
-#define WCIO_FREE(fp) \
-do {\
-	_EXT(fp)->_wcio.wcio_mode = 0;\
-	WCIO_FREEUB(fp);\
-} while (/*CONSTCOND*/0)
-#define WCIO_FREEUB(fp) \
-do {\
-	_EXT(fp)->_wcio.wcio_ungetwc_inbuf = 0;\
-} while (/*CONSTCOND*/0)
-
-#endif /*_WCIO_H_*/
diff --git a/lib/libc/stdio/wprintf.3 b/lib/libc/stdio/wprintf.3
deleted file mode 100644
index 4213c38bf..000000000
--- a/lib/libc/stdio/wprintf.3
+++ /dev/null
@@ -1,618 +0,0 @@
-.\" $NetBSD: wprintf.3,v 1.8 2010/12/16 17:42:27 wiz Exp $
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
-.\" FreeBSD: src/lib/libc/stdio/printf.3,v 1.47 2002/09/06 11:23:55 tjr Exp
-.\" $FreeBSD: src/lib/libc/stdio/wprintf.3,v 1.5 2003/07/05 07:55:34 tjr Exp $
-.\"
-.Dd April 30, 2010
-.Dt WPRINTF 3
-.Os
-.Sh NAME
-.Nm wprintf , fwprintf , swprintf ,
-.Nm vwprintf , vfwprintf , vswprintf
-.Nd formatted wide character output conversion
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft int
-.Fn fwprintf "FILE * restrict stream" "const wchar_t * restrict format" ...
-.Ft int
-.Fn swprintf "wchar_t * restrict ws" "size_t n" "const wchar_t * restrict format" ...
-.Ft int
-.Fn wprintf "const wchar_t * restrict format" ...
-.In stdarg.h
-.Ft int
-.Fn vfwprintf "FILE * restrict stream" "const wchar_t * restrict" "va_list ap"
-.Ft int
-.Fn vswprintf "wchar_t * restrict ws" "size_t n" "const wchar_t *restrict format" "va_list ap"
-.Ft int
-.Fn vwprintf "const wchar_t * restrict format" "va_list ap"
-.Sh DESCRIPTION
-The
-.Fn wprintf
-family of functions produces output according to a
-.Fa format
-as described below.
-The
-.Fn wprintf
-and
-.Fn vwprintf
-functions
-write output to
-.Dv stdout ,
-the standard output stream;
-.Fn fwprintf
-and
-.Fn vfwprintf
-write output to the given output
-.Fa stream ;
-.Fn swprintf
-and
-.Fn vswprintf
-write to the wide-character string
-.Fa ws .
-.Pp
-These functions write the output under the control of a
-.Fa format
-string that specifies how subsequent arguments
-(or arguments accessed via the variable-length argument facilities of
-.Xr stdarg 3 )
-are converted for output.
-.Pp
-The
-.Fn swprintf
-and
-.Fn vswprintf
-functions will fail if
-.Fa n
-or more wide characters were requested to be written,
-.Pp
-The format string is composed of zero or more directives:
-ordinary
-characters (not
-.Cm % ) ,
-which are copied unchanged to the output stream;
-and conversion specifications, each of which results
-in fetching zero or more subsequent arguments.
-Each conversion specification is introduced by
-the
-.Cm %
-character.
-The arguments must correspond properly (after type promotion)
-with the conversion specifier.
-After the
-.Cm % ,
-the following appear in sequence:
-.Bl -bullet
-.It
-An optional field, consisting of a decimal digit string followed by a
-.Cm $ ,
-specifying the next argument to access.
-If this field is not provided, the argument following the last
-argument accessed will be used.
-Arguments are numbered starting at
-.Cm 1 .
-If unaccessed arguments in the format string are interspersed with ones that
-are accessed the results will be indeterminate.
-.It
-Zero or more of the following flags:
-.Bl -tag -width ".So \  Sc (space)"
-.It Sq Cm #
-The value should be converted to an
-.Dq alternate form .
-For
-.Cm c , d , i , n , p , s ,
-and
-.Cm u
-conversions, this option has no effect.
-For
-.Cm o
-conversions, the precision of the number is increased to force the first
-character of the output string to a zero (except if a zero value is printed
-with an explicit precision of zero).
-For
-.Cm x
-and
-.Cm X
-conversions, a non-zero result has the string
-.Ql 0x
-(or
-.Ql 0X
-for
-.Cm X
-conversions) prepended to it.
-For
-.Cm a , A , e , E , f , F , g ,
-and
-.Cm G
-conversions, the result will always contain a decimal point, even if no
-digits follow it (normally, a decimal point appears in the results of
-those conversions only if a digit follows).
-For
-.Cm g
-and
-.Cm G
-conversions, trailing zeros are not removed from the result as they
-would otherwise be.
-.It So Cm 0 Sc (zero)
-Zero padding.
-For all conversions except
-.Cm n ,
-the converted value is padded on the left with zeros rather than blanks.
-If a precision is given with a numeric conversion
-.Cm ( d , i , o , u , i , x ,
-and
-.Cm X ) ,
-the
-.Cm 0
-flag is ignored.
-.It Sq Cm \-
-A negative field width flag;
-the converted value is to be left adjusted on the field boundary.
-Except for
-.Cm n
-conversions, the converted value is padded on the right with blanks,
-rather than on the left with blanks or zeros.
-A
-.Cm \-
-overrides a
-.Cm 0
-if both are given.
-.It So "\ " Sc (space)
-A blank should be left before a positive number
-produced by a signed conversion
-.Cm ( a , A , d , e , E , f , F , g , G ,
-or
-.Cm i ) .
-.It Sq Cm +
-A sign must always be placed before a
-number produced by a signed conversion.
-A
-.Cm +
-overrides a space if both are used.
-.It Sq Cm '
-Decimal conversions
-.Cm ( d , u ,
-or
-.Cm i )
-or the integral portion of a floating point conversion
-.Cm ( f
-or
-.Cm F )
-should be grouped and separated by thousands using
-the non-monetary separator returned by
-.Xr localeconv 3 .
-.El
-.It
-An optional decimal digit string specifying a minimum field width.
-If the converted value has fewer characters than the field width, it will
-be padded with spaces on the left (or right, if the left-adjustment
-flag has been given) to fill out
-the field width.
-.It
-An optional precision, in the form of a period
-.Cm \&.
-followed by an
-optional digit string.
-If the digit string is omitted, the precision is taken as zero.
-This gives the minimum number of digits to appear for
-.Cm d , i , o , u , x ,
-and
-.Cm X
-conversions, the number of digits to appear after the decimal-point for
-.Cm a , A , e , E , f ,
-and
-.Cm F
-conversions, the maximum number of significant digits for
-.Cm g
-and
-.Cm G
-conversions, or the maximum number of characters to be printed from a
-string for
-.Cm s
-conversions.
-.It
-An optional length modifier, that specifies the size of the argument.
-The following length modifiers are valid for the
-.Cm d , i , n , o , u , x ,
-or
-.Cm X
-conversion:
-.Bl -column ".Cm q Em (deprecated)" ".Vt signed char" ".Vt unsigned long long" ".Vt long long *"
-.It Sy Modifier Ta Cm d , i Ta Cm o , u , x , X Ta Cm n
-.It Cm hh Ta Vt "signed char" Ta Vt "unsigned char" Ta Vt "signed char *"
-.It Cm h Ta Vt short Ta Vt "unsigned short" Ta Vt "short *"
-.It Cm l No (ell) Ta Vt long Ta Vt "unsigned long" Ta Vt "long *"
-.It Cm ll No (ell ell) Ta Vt "long long" Ta Vt "unsigned long long" Ta Vt "long long *"
-.It Cm j Ta Vt intmax_t Ta Vt uintmax_t Ta Vt "intmax_t *"
-.It Cm t Ta Vt ptrdiff_t Ta (see note) Ta Vt "ptrdiff_t *"
-.It Cm z Ta (see note) Ta Vt size_t Ta (see note)
-.It Cm q Em (deprecated) Ta Vt quad_t Ta Vt u_quad_t Ta Vt "quad_t *"
-.El
-.Pp
-Note:
-the
-.Cm t
-modifier, when applied to a
-.Cm o , u , x ,
-or
-.Cm X
-conversion, indicates that the argument is of an unsigned type
-equivalent in size to a
-.Vt ptrdiff_t .
-The
-.Cm z
-modifier, when applied to a
-.Cm d
-or
-.Cm i
-conversion, indicates that the argument is of a signed type equivalent in
-size to a
-.Vt size_t .
-Similarly, when applied to an
-.Cm n
-conversion, it indicates that the argument is a pointer to a signed type
-equivalent in size to a
-.Vt size_t .
-.Pp
-The following length modifier is valid for the
-.Cm a , A , e , E , f , F , g ,
-or
-.Cm G
-conversion:
-.Bl -column ".Sy Modifier" ".Cm a , A , e , E , f , F , g , G"
-.It Sy Modifier Ta Cm a , A , e , E , f , F , g , G
-.It Cm L Ta Vt "long double"
-.El
-.Pp
-The following length modifier is valid for the
-.Cm c
-or
-.Cm s
-conversion:
-.Bl -column ".Sy Modifier" ".Vt wint_t" ".Vt wchar_t *"
-.It Sy Modifier Ta Cm c Ta Cm s
-.It Cm l No (ell) Ta Vt wint_t Ta Vt "wchar_t *"
-.El
-.It
-A character that specifies the type of conversion to be applied.
-.El
-.Pp
-A field width or precision, or both, may be indicated by
-an asterisk
-.Ql *
-or an asterisk followed by one or more decimal digits and a
-.Ql $
-instead of a
-digit string.
-In this case, an
-.Vt int
-argument supplies the field width or precision.
-A negative field width is treated as a left adjustment flag followed by a
-positive field width; a negative precision is treated as though it were
-missing.
-If a single format directive mixes positional
-.Pq Li nn$
-and non-positional arguments, the results are undefined.
-.Pp
-The conversion specifiers and their meanings are:
-.Bl -tag -width ".Cm diouxX"
-.It Cm diouxX
-The
-.Vt int
-(or appropriate variant) argument is converted to signed decimal
-.Cm ( d
-and
-.Cm i ) ,
-unsigned octal
-.Pq Cm o ,
-unsigned decimal
-.Pq Cm u ,
-or unsigned hexadecimal
-.Cm ( x
-and
-.Cm X )
-notation.
-The letters
-.Dq Li abcdef
-are used for
-.Cm x
-conversions; the letters
-.Dq Li ABCDEF
-are used for
-.Cm X
-conversions.
-The precision, if any, gives the minimum number of digits that must
-appear; if the converted value requires fewer digits, it is padded on
-the left with zeros.
-.It Cm DOU
-The
-.Vt "long int"
-argument is converted to signed decimal, unsigned octal, or unsigned
-decimal, as if the format had been
-.Cm ld , lo ,
-or
-.Cm lu
-respectively.
-These conversion characters are deprecated, and will eventually disappear.
-.It Cm eE
-The
-.Vt double
-argument is rounded and converted in the style
-.Sm off
-.Oo \- Oc Ar d Li \&. Ar ddd Li e \*[Pm] Ar dd
-.Sm on
-where there is one digit before the
-decimal-point character
-and the number of digits after it is equal to the precision;
-if the precision is missing,
-it is taken as 6; if the precision is
-zero, no decimal-point character appears.
-An
-.Cm E
-conversion uses the letter
-.Ql E
-(rather than
-.Ql e )
-to introduce the exponent.
-The exponent always contains at least two digits; if the value is zero,
-the exponent is 00.
-.Pp
-For
-.Cm a , A , e , E , f , F , g ,
-and
-.Cm G
-conversions, positive and negative infinity are represented as
-.Li inf
-and
-.Li -inf
-respectively when using the lowercase conversion character, and
-.Li INF
-and
-.Li -INF
-respectively when using the uppercase conversion character.
-Similarly, NaN is represented as
-.Li nan
-when using the lowercase conversion, and
-.Li NAN
-when using the uppercase conversion.
-.It Cm fF
-The
-.Vt double
-argument is rounded and converted to decimal notation in the style
-.Sm off
-.Oo \- Oc Ar ddd Li \&. Ar ddd ,
-.Sm on
-where the number of digits after the decimal-point character
-is equal to the precision specification.
-If the precision is missing, it is taken as 6; if the precision is
-explicitly zero, no decimal-point character appears.
-If a decimal point appears, at least one digit appears before it.
-.It Cm gG
-The
-.Vt double
-argument is converted in style
-.Cm f
-or
-.Cm e
-(or
-.Cm F
-or
-.Cm E
-for
-.Cm G
-conversions).
-The precision specifies the number of significant digits.
-If the precision is missing, 6 digits are given; if the precision is zero,
-it is treated as 1.
-Style
-.Cm e
-is used if the exponent from its conversion is less than \-4 or greater than
-or equal to the precision.
-Trailing zeros are removed from the fractional part of the result; a
-decimal point appears only if it is followed by at least one digit.
-.It Cm aA
-The
-.Vt double
-argument is converted to hexadecimal notation in the style
-.Sm off
-.Oo \- Oc Li 0x Ar h Li \&. Ar hhhp Oo \*[Pm] Oc Ar d ,
-.Sm on
-where the number of digits after the hexadecimal-point character
-is equal to the precision specification.
-If the precision is missing, it is taken as enough to exactly
-represent the floating-point number; if the precision is
-explicitly zero, no hexadecimal-point character appears.
-This is an exact conversion of the mantissa+exponent internal
-floating point representation; the
-.Sm off
-.Oo \- Oc Li 0x Ar h Li \&. Ar hhh
-.Sm on
-portion represents exactly the mantissa; only denormalized
-mantissas have a zero value to the left of the hexadecimal
-point.
-The
-.Cm p
-is a literal character
-.Ql p ;
-the exponent is preceded by a positive or negative sign
-and is represented in decimal, using only enough characters
-to represent the exponent.
-The
-.Cm A
-conversion uses the prefix
-.Dq Li 0X
-(rather than
-.Dq Li 0x ) ,
-the letters
-.Dq Li ABCDEF
-(rather than
-.Dq Li abcdef )
-to represent the hex digits, and the letter
-.Ql P
-(rather than
-.Ql p )
-to separate the mantissa and exponent.
-.It Cm C
-Treated as
-.Cm c
-with the
-.Cm l
-(ell) modifier.
-.It Cm c
-The
-.Vt int
-argument is converted to an
-.Vt "unsigned char" ,
-then to a
-.Vt wchar_t
-as if by
-.Xr btowc 3 ,
-and the resulting character is written.
-.Pp
-If the
-.Cm l
-(ell) modifier is used, the
-.Vt wint_t
-argument is converted to a
-.Vt wchar_t
-and written.
-.It Cm S
-Treated as
-.Cm s
-with the
-.Cm l
-(ell) modifier.
-.It Cm s
-The
-.Vt "char *"
-argument is expected to be a pointer to an array of character type (pointer
-to a string) containing a multibyte sequence.
-Characters from the array are converted to wide characters and written up to
-(but not including)
-a terminating
-.Dv NUL
-character;
-if a precision is specified, no more than the number specified are
-written.
-If a precision is given, no null character
-need be present; if the precision is not specified, or is greater than
-the size of the array, the array must contain a terminating
-.Dv NUL
-character.
-.Pp
-If the
-.Cm l
-(ell) modifier is used, the
-.Vt "wchar_t *"
-argument is expected to be a pointer to an array of wide characters
-(pointer to a wide string).
-Each wide character in the string
-is written.
-Wide characters from the array are written up to (but not including)
-a terminating wide
-.Dv NUL
-character;
-if a precision is specified, no more than the number specified are
-written (including shift sequences).
-If a precision is given, no null character
-need be present; if the precision is not specified, or is greater than
-the number of characters in
-the string, the array must contain a terminating wide
-.Dv NUL
-character.
-.It Cm p
-The
-.Vt "void *"
-pointer argument is printed in hexadecimal (as if by
-.Ql %#x
-or
-.Ql %#lx ) .
-.It Cm n
-The number of characters written so far is stored into the
-integer indicated by the
-.Vt "int *"
-(or variant) pointer argument.
-No argument is converted.
-.It Cm %
-A
-.Ql %
-is written.
-No argument is converted.
-The complete conversion specification
-is
-.Ql %% .
-.El
-.Pp
-The decimal point
-character is defined in the program's locale (category
-.Dv LC_NUMERIC ) .
-.Pp
-In no case does a non-existent or small field width cause truncation of
-a numeric field; if the result of a conversion is wider than the field
-width, the
-field is expanded to contain the conversion result.
-.Sh RETURN VALUES
-These functions return the number of characters printed
-(not including the trailing
-.Ql \e0
-used to end output to strings).
-.Sh SEE ALSO
-.Xr btowc 3 ,
-.Xr fputws 3 ,
-.Xr printf 3 ,
-.Xr putwc 3 ,
-.Xr setlocale 3 ,
-.Xr wcsrtombs 3 ,
-.Xr wscanf 3
-.Sh STANDARDS
-The
-.Fn wprintf ,
-.Fn fwprintf ,
-.Fn swprintf ,
-.Fn vwprintf ,
-.Fn vfwprintf
-and
-.Fn vswprintf
-functions
-conform to
-.St -isoC-99 .
-.Sh SECURITY CONSIDERATIONS
-Subject to the caveats noted in the
-.Xr printf 3 .
diff --git a/lib/libc/stdio/wprintf.c b/lib/libc/stdio/wprintf.c
deleted file mode 100644
index cedb90b8c..000000000
--- a/lib/libc/stdio/wprintf.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: wprintf.c,v 1.3 2013/04/19 15:22:25 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/stdio/wprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
-#else
-__RCSID("$NetBSD: wprintf.c,v 1.3 2013/04/19 15:22:25 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-__weak_alias(wprintf_l, _wprintf_l)
-
-int
-wprintf(const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfwprintf(stdout, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
-
-int
-wprintf_l(locale_t loc, const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfwprintf_l(stdout, loc, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
diff --git a/lib/libc/stdio/wscanf.3 b/lib/libc/stdio/wscanf.3
deleted file mode 100644
index 9b53ef810..000000000
--- a/lib/libc/stdio/wscanf.3
+++ /dev/null
@@ -1,484 +0,0 @@
-.\" $NetBSD: wscanf.3,v 1.3 2010/12/16 17:42:27 wiz Exp $
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)scanf.3	8.2 (Berkeley) 12/11/93
-.\" FreeBSD: src/lib/libc/stdio/scanf.3,v 1.24 2003/06/28 09:03:25 das Exp
-.\" $FreeBSD: src/lib/libc/stdio/wscanf.3,v 1.6 2003/07/05 07:47:55 tjr Exp $
-.\"
-.Dd July 5, 2003
-.Dt WSCANF 3
-.Os
-.Sh NAME
-.Nm wscanf ,
-.Nm fwscanf ,
-.Nm swscanf ,
-.Nm vwscanf ,
-.Nm vswscanf ,
-.Nm vfwscanf
-.Nd wide character input format conversion
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft int
-.Fn wscanf "const wchar_t * restrict format" ...
-.Ft int
-.Fn fwscanf "FILE * restrict stream" "const wchar_t * restrict format" ...
-.Ft int
-.Fn swscanf "const wchar_t * restrict str" "const wchar_t * restrict format" ...
-.In stdarg.h
-.Ft int
-.Fn vwscanf "const wchar_t * restrict format" "va_list ap"
-.Ft int
-.Fn vswscanf "const wchar_t * restrict str" "const wchar_t * restrict format" "va_list ap"
-.Ft int
-.Fn vfwscanf "FILE * restrict stream" "const wchar_t * restrict format" "va_list ap"
-.Sh DESCRIPTION
-The
-.Fn wscanf
-family of functions scans input according to a
-.Fa format
-as described below.
-This format may contain
-.Em conversion specifiers ;
-the results from such conversions, if any,
-are stored through the
-.Em pointer
-arguments.
-The
-.Fn wscanf
-function
-reads input from the standard input stream
-.Dv stdin ,
-.Fn fwscanf
-reads input from the stream pointer
-.Fa stream ,
-and
-.Fn swscanf
-reads its input from the wide-character string pointed to by
-.Fa str .
-The
-.Fn vfwscanf
-function
-is analogous to
-.Xr vfwprintf 3
-and reads input from the stream pointer
-.Fa stream
-using a variable argument list of pointers (see
-.Xr stdarg 3 ) .
-The
-.Fn vwscanf
-function scans a variable argument list from the standard input and
-the
-.Fn vswscanf
-function scans it from a wide-character string;
-these are analogous to
-the
-.Fn vwprintf
-and
-.Fn vswprintf
-functions respectively.
-Each successive
-.Em pointer
-argument must correspond properly with
-each successive conversion specifier
-(but see the
-.Cm *
-conversion below).
-All conversions are introduced by the
-.Cm %
-(percent sign) character.
-The
-.Fa format
-string
-may also contain other characters.
-White space (such as blanks, tabs, or newlines) in the
-.Fa format
-string match any amount of white space, including none, in the input.
-Everything else
-matches only itself.
-Scanning stops
-when an input character does not match such a format character.
-Scanning also stops
-when an input conversion cannot be made (see below).
-.Sh CONVERSIONS
-Following the
-.Cm %
-character introducing a conversion
-there may be a number of
-.Em flag
-characters, as follows:
-.Bl -tag -width ".Cm l No (ell)"
-.It Cm *
-Suppresses assignment.
-The conversion that follows occurs as usual, but no pointer is used;
-the result of the conversion is simply discarded.
-.It Cm hh
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt char
-(rather than
-.Vt int ) .
-.It Cm h
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt "short int"
-(rather than
-.Vt int ) .
-.It Cm l No (ell)
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt "long int"
-(rather than
-.Vt int ) ,
-that the conversion will be one of
-.Cm a , e , f ,
-or
-.Cm g
-and the next pointer is a pointer to
-.Vt double
-(rather than
-.Vt float ) ,
-or that the conversion will be one of
-.Cm c
-or
-.Cm s
-and the next pointer is a pointer to an array of
-.Vt wchar_t
-(rather than
-.Vt char ) .
-.It Cm ll No (ell ell)
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt "long long int"
-(rather than
-.Vt int ) .
-.It Cm L
-Indicates that the conversion will be one of
-.Cm a , e , f ,
-or
-.Cm g
-and the next pointer is a pointer to
-.Vt "long double" .
-.It Cm j
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt intmax_t
-(rather than
-.Vt int ) .
-.It Cm t
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt ptrdiff_t
-(rather than
-.Vt int ) .
-.It Cm z
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt size_t
-(rather than
-.Vt int ) .
-.It Cm q
-(deprecated.)
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt "long long int"
-(rather than
-.Vt int ) .
-.El
-.Pp
-In addition to these flags,
-there may be an optional maximum field width,
-expressed as a decimal integer,
-between the
-.Cm %
-and the conversion.
-If no width is given,
-a default of
-.Dq infinity
-is used (with one exception, below);
-otherwise at most this many characters are scanned
-in processing the conversion.
-Before conversion begins,
-most conversions skip white space;
-this white space is not counted against the field width.
-.Pp
-The following conversions are available:
-.Bl -tag -width XXXX
-.It Cm %
-Matches a literal
-.Ql % .
-That is,
-.Dq Li %%
-in the format string
-matches a single input
-.Ql %
-character.
-No conversion is done, and assignment does not occur.
-.It Cm d
-Matches an optionally signed decimal integer;
-the next pointer must be a pointer to
-.Vt int .
-.It Cm i
-Matches an optionally signed integer;
-the next pointer must be a pointer to
-.Vt int .
-The integer is read in base 16 if it begins
-with
-.Ql 0x
-or
-.Ql 0X ,
-in base 8 if it begins with
-.Ql 0 ,
-and in base 10 otherwise.
-Only characters that correspond to the base are used.
-.It Cm o
-Matches an octal integer;
-the next pointer must be a pointer to
-.Vt "unsigned int" .
-.It Cm u
-Matches an optionally signed decimal integer;
-the next pointer must be a pointer to
-.Vt "unsigned int" .
-.It Cm x , X
-Matches an optionally signed hexadecimal integer;
-the next pointer must be a pointer to
-.Vt "unsigned int" .
-.It Cm a , A , e , E , f , F , g , G
-Matches a floating-point number in the style of
-.Xr wcstod 3 .
-The next pointer must be a pointer to
-.Vt float
-(unless
-.Cm l
-or
-.Cm L
-is specified.)
-.It Cm s
-Matches a sequence of non-white-space wide characters;
-the next pointer must be a pointer to
-.Vt char ,
-and the array must be large enough to accept the multibyte representation
-of all the sequence and the
-terminating
-.Dv NUL
-character.
-The input string stops at white space
-or at the maximum field width, whichever occurs first.
-.Pp
-If an
-.Cm l
-qualifier is present, the next pointer must be a pointer to
-.Vt wchar_t ,
-into which the input will be placed.
-.It Cm S
-The same as
-.Cm ls .
-.It Cm c
-Matches a sequence of
-.Em width
-count
-wide characters (default 1);
-the next pointer must be a pointer to
-.Vt char ,
-and there must be enough room for the multibyte representation
-of all the characters
-(no terminating
-.Dv NUL
-is added).
-The usual skip of leading white space is suppressed.
-To skip white space first, use an explicit space in the format.
-.Pp
-If an
-.Cm l
-qualifier is present, the next pointer must be a pointer to
-.Vt wchar_t ,
-into which the input will be placed.
-.It Cm C
-The same as
-.Cm lc .
-.It Cm \&[
-Matches a nonempty sequence of characters from the specified set
-of accepted characters;
-the next pointer must be a pointer to
-.Vt char ,
-and there must be enough room for the multibyte representation of
-all the characters in the string,
-plus a terminating
-.Dv NUL
-character.
-The usual skip of leading white space is suppressed.
-The string is to be made up of characters in
-(or not in)
-a particular set;
-the set is defined by the characters between the open bracket
-.Cm \&[
-character
-and a close bracket
-.Cm \&]
-character.
-The set
-.Em excludes
-those characters
-if the first character after the open bracket is a circumflex
-.Cm ^ .
-To include a close bracket in the set,
-make it the first character after the open bracket
-or the circumflex;
-any other position will end the set.
-To include a hyphen in the set,
-make it the last character before the final close bracket;
-some implementations of
-.Fn wscanf
-use
-.Dq Li A-Z
-to represent the range of characters between
-.Ql A
-and
-.Ql Z .
-The string ends with the appearance of a character not in the
-(or, with a circumflex, in) set
-or when the field width runs out.
-.Pp
-If an
-.Cm l
-qualifier is present, the next pointer must be a pointer to
-.Vt wchar_t ,
-into which the input will be placed.
-.It Cm p
-Matches a pointer value (as printed by
-.Ql %p
-in
-.Xr wprintf 3 ) ;
-the next pointer must be a pointer to
-.Vt void .
-.It Cm n
-Nothing is expected;
-instead, the number of characters consumed thus far from the input
-is stored through the next pointer,
-which must be a pointer to
-.Vt int .
-This is
-.Em not
-a conversion, although it can be suppressed with the
-.Cm *
-flag.
-.El
-.Pp
-The decimal point
-character is defined in the program's locale (category
-.Dv LC_NUMERIC ) .
-.Pp
-For backwards compatibility, a
-.Dq conversion
-of
-.Ql %\e0
-causes an immediate return of
-.Dv EOF .
-.Sh RETURN VALUES
-These
-functions
-return
-the number of input items assigned, which can be fewer than provided
-for, or even zero, in the event of a matching failure.
-Zero
-indicates that, while there was input available,
-no conversions were assigned;
-typically this is due to an invalid input character,
-such as an alphabetic character for a
-.Ql %d
-conversion.
-The value
-.Dv EOF
-is returned if an input failure occurs before any conversion such as an
-end-of-file occurs.
-If an error or end-of-file occurs after conversion
-has begun,
-the number of conversions which were successfully completed is returned.
-.Sh SEE ALSO
-.Xr fgetwc 3 ,
-.Xr scanf 3 ,
-.Xr wcrtomb 3 ,
-.Xr wcstod 3 ,
-.Xr wcstol 3 ,
-.Xr wcstoul 3 ,
-.Xr wprintf 3
-.Sh STANDARDS
-The
-.Fn fwscanf ,
-.Fn wscanf ,
-.Fn swscanf ,
-.Fn vfwscanf ,
-.Fn vwscanf
-and
-.Fn vswscanf
-functions
-conform to
-.St -isoC-99 .
-.Sh BUGS
-In addition to the bugs documented in
-.Xr scanf 3 ,
-.Fn wscanf
-does not support the
-.Dq Li A-Z
-notation for specifying character ranges with the character
-class conversion
-.Pq Sq Cm %[ .
diff --git a/lib/libc/stdio/wscanf.c b/lib/libc/stdio/wscanf.c
deleted file mode 100644
index c19df80dc..000000000
--- a/lib/libc/stdio/wscanf.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: wscanf.c,v 1.3 2013/04/19 23:32:17 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/stdio/wscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
-#else
-__RCSID("$NetBSD: wscanf.c,v 1.3 2013/04/19 23:32:17 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-__weak_alias(wscanf_l, _wscanf_l)
-
-int
-wscanf(const wchar_t * __restrict fmt, ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vfwscanf(stdin, fmt, ap);
-	va_end(ap);
-
-	return r;
-}
-
-int
-wscanf_l(locale_t loc, const wchar_t * __restrict fmt, ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vfwscanf_l(stdin, loc, fmt, ap);
-	va_end(ap);
-
-	return r;
-}
diff --git a/lib/libc/stdio/wsetup.c b/lib/libc/stdio/wsetup.c
deleted file mode 100644
index da1f3713d..000000000
--- a/lib/libc/stdio/wsetup.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*	$NetBSD: wsetup.c,v 1.12 2012/03/15 18:22:31 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)wsetup.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: wsetup.c,v 1.12 2012/03/15 18:22:31 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "reentrant.h"
-#include "local.h"
-
-/*
- * Various output routines call wsetup to be sure it is safe to write,
- * because either _flags does not include __SWR, or _buf is NULL.
- * _wsetup returns 0 if OK to write, nonzero otherwise.
- */
-int
-__swsetup(FILE *fp)
-{
-
-	_DIAGASSERT(fp != NULL);
-
-	/* make sure stdio is set up */
-	if (!__sdidinit)
-		__sinit();
-
-	/*
-	 * If we are not writing, we had better be reading and writing.
-	 */
-	if ((fp->_flags & __SWR) == 0) {
-		if ((fp->_flags & __SRW) == 0)
-			return EOF;
-		if (fp->_flags & __SRD) {
-			/* clobber any ungetc data */
-			if (HASUB(fp))
-				FREEUB(fp);
-			fp->_flags &= ~(__SRD|__SEOF);
-			fp->_r = 0;
-			fp->_p = fp->_bf._base;
-		}
-		fp->_flags |= __SWR;
-	}
-
-	/*
-	 * Make a buffer if necessary, then set _w.
-	 */
-	if (fp->_bf._base == NULL)
-		__smakebuf(fp);
-	if (fp->_flags & __SLBF) {
-		/*
-		 * It is line buffered, so make _lbfsize be -_bufsize
-		 * for the putc() macro.  We will change _lbfsize back
-		 * to 0 whenever we turn off __SWR.
-		 */
-		fp->_w = 0;
-		fp->_lbfsize = -fp->_bf._size;
-	} else
-		fp->_w = fp->_flags & __SNBF ? 0 : fp->_bf._size;
-	return 0;
-}
diff --git a/lib/libc/stdlib/Lint_abs.c b/lib/libc/stdlib/Lint_abs.c
deleted file mode 100644
index 47f4b0eff..000000000
--- a/lib/libc/stdlib/Lint_abs.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: Lint_abs.c,v 1.2 2000/06/14 06:49:07 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <stdlib.h>
-
-/*ARGSUSED*/
-int
-abs(j)
-	int j;
-{
-	return (0);
-}
diff --git a/lib/libc/stdlib/Lint_div.c b/lib/libc/stdlib/Lint_div.c
deleted file mode 100644
index 38c8bbd19..000000000
--- a/lib/libc/stdlib/Lint_div.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_div.c,v 1.2 2000/06/14 06:49:07 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <stdlib.h>
-
-/*ARGSUSED*/
-div_t
-div(num, denom)
-	int num, denom;
-{
-	div_t rv = { 0 };
-	return (rv);
-}
diff --git a/lib/libc/stdlib/Lint_imaxabs.c b/lib/libc/stdlib/Lint_imaxabs.c
deleted file mode 100644
index 2dfc790d8..000000000
--- a/lib/libc/stdlib/Lint_imaxabs.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: Lint_imaxabs.c,v 1.1 2008/08/04 21:29:27 matt Exp $	*/
-
-/*
- * This file placed in the public domain.
- * Matt Thomas, August 4, 2008.
- */
-
-#include <inttypes.h>
-
-/* ARGSUSED */
-intmax_t
-imaxabs(intmax_t j)
-{
-	return (0);
-}
diff --git a/lib/libc/stdlib/Lint_labs.c b/lib/libc/stdlib/Lint_labs.c
deleted file mode 100644
index c8f96cf63..000000000
--- a/lib/libc/stdlib/Lint_labs.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: Lint_labs.c,v 1.2 2000/06/14 06:49:07 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <stdlib.h>
-
-/*ARGSUSED*/
-long
-labs(j)
-	long j;
-{
-	return (0);
-}
diff --git a/lib/libc/stdlib/Lint_ldiv.c b/lib/libc/stdlib/Lint_ldiv.c
deleted file mode 100644
index 8899a15e4..000000000
--- a/lib/libc/stdlib/Lint_ldiv.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_ldiv.c,v 1.2 2000/06/14 06:49:07 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <stdlib.h>
-
-/*ARGSUSED*/
-ldiv_t
-ldiv(num, denom)
-	long num, denom;
-{
-	ldiv_t rv = { 0 };
-	return (rv);
-}
diff --git a/lib/libc/stdlib/Lint_llabs.c b/lib/libc/stdlib/Lint_llabs.c
deleted file mode 100644
index 7297875a2..000000000
--- a/lib/libc/stdlib/Lint_llabs.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	$NetBSD: Lint_llabs.c,v 1.2 2000/03/07 20:02:00 kleink Exp $	*/
-
-/*
- * This file placed in the public domain.
- * Klaus Klein, March 6, 2000.
- */
-
-#include <stdlib.h>
-
-/* ARGSUSED */ /* LONGLONG */
-long long int
-llabs(j)
-	long long int j;
-{
-	return (0);
-}
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
deleted file mode 100644
index 1c585f2fb..000000000
--- a/lib/libc/stdlib/Makefile.inc
+++ /dev/null
@@ -1,98 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.90 2015/05/01 14:17:56 christos Exp $
-#	from: @(#)Makefile.inc	8.3 (Berkeley) 2/4/95
-
-# stdlib sources
-.PATH: ${ARCHDIR}/stdlib ${.CURDIR}/stdlib
-
-SRCS+=	_env.c _rand48.c \
-	a64l.c abort.c atexit.c atof.c atoi.c atol.c atoll.c \
-	bsearch.c drand48.c exit.c \
-	getenv.c getopt.c getopt_long.c getsubopt.c \
-	hcreate.c heapsort.c imaxdiv.c insque.c jrand48.c l64a.c lldiv.c \
-	lcong48.c lrand48.c lsearch.c merge.c mi_vector_hash.c mrand48.c \
-	nrand48.c putenv.c qabs.c qdiv.c qsort.c posix_openpt.c pty.c \
-	quick_exit.c radixsort.c rand.c rand_r.c random.c remque.c \
-	reallocarr.c reallocarray.c seed48.c setenv.c srand48.c strsuftoll.c \
-	strtoi.c strtou.c strtonum.c \
-	strtoimax.c strtol.c strtoll.c strtoq.c strtoul.c strtoull.c \
-	strtoumax.c strtouq.c system.c tdelete.c tfind.c tsearch.c twalk.c \
-	unsetenv.c strfmon.c
-
-# These are often replaced by MD .S versions
-SRCS+=	abs.c labs.c llabs.c imaxabs.c
-SRCS+=	div.c ldiv.c imaxdiv.c
-
-# This might be replaced by erand48.c
-SRCS+= erand48_ieee754.c
-
-.if ${RUMPRUN} != "yes"
-.if (${USE_JEMALLOC} != "no")
-SRCS+=	jemalloc.c
-.else
-SRCS+=	malloc.c
-.endif
-.endif
-
-.if defined(__MINIX)
-.include "${NETBSDSRCDIR}/minix/lib/libc/Makefile.inc"
-.endif # defined(__MINIX)
-
-CPPFLAGS.strtol.c+=	-I${LIBCDIR}/../../common/lib/libc/stdlib
-CPPFLAGS.strtoq.c+=	-I${LIBCDIR}/../../common/lib/libc/stdlib
-CPPFLAGS.strtouq.c+=	-I${LIBCDIR}/../../common/lib/libc/stdlib
-
-.include "${ARCHDIR}/stdlib/Makefile.inc"
-
-MAN+=	a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 atoll.3 \
-	at_quick_exit.3 \
-	bsearch.3 \
-	div.3 \
-	exit.3 \
-	getenv.3 getopt.3 getopt_long.3 getsubopt.3 grantpt.3 \
-	hcreate.3 \
-	insque.3 \
-	jemalloc.3 \
-	lsearch.3 \
-	malloc.3 memory.3 mi_vector_hash.3 \
-	posix_memalign.3 posix_openpt.3 ptsname.3 \
-	qabs.3 qdiv.3 quick_exit.3 qsort.3 \
-	radixsort.3 rand48.3 rand.3 random.3 reallocarr.3 reallocarray.3 \
-	strfmon.3 strsuftoll.3 strtod.3 strtoi.3 strtol.3 strtou.3 strtoul.3 \
-	strtonum.3 system.3 \
-	tsearch.3 \
-	unlockpt.3
-
-MLINKS+=a64l.3 l64a.3
-MLINKS+=a64l.3 l64a_r.3
-MLINKS+=abs.3 labs.3 \
-	abs.3 llabs.3 \
-	abs.3 imaxabs.3
-MLINKS+=div.3 ldiv.3 \
-	div.3 lldiv.3 \
-	div.3 imaxdiv.3
-MLINKS+=getenv.3 setenv.3 getenv.3 unsetenv.3 getenv.3 putenv.3
-MLINKS+=getenv.3 getenv_r.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+=hcreate.3 hdestroy1.3 hcreate.3 hdestroy1_r.3
-MLINKS+=insque.3 remque.3
-MLINKS+=lsearch.3 lfind.3
-MLINKS+=malloc.3 calloc.3 malloc.3 realloc.3 malloc.3 free.3
-MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3
-MLINKS+=ptsname.3 ptsname_r.3
-MLINKS+=rand.3 rand_r.3
-MLINKS+=rand.3 srand.3
-MLINKS+=rand48.3 drand48.3 rand48.3 erand48.3 rand48.3 lrand48.3
-MLINKS+=rand48.3 mrand48.3 rand48.3 nrand48.3 rand48.3 jrand48.3
-MLINKS+=rand48.3 srand48.3 rand48.3 seed48.3 rand48.3 lcong48.3
-MLINKS+=random.3 initstate.3 random.3 setstate.3 random.3 srandom.3
-MLINKS+=radixsort.3 sradixsort.3
-MLINKS+=strsuftoll.3 strsuftollx.3
-MLINKS+=strtod.3 strtof.3 strtod.3 strtold.3
-MLINKS+=strtol.3 strtoimax.3
-MLINKS+=strtol.3 strtoll.3
-MLINKS+=strtol.3 strtoq.3
-MLINKS+=strtoul.3 strtoull.3
-MLINKS+=strtoul.3 strtoumax.3
-MLINKS+=strtoul.3 strtouq.3
-MLINKS+=tsearch.3 tfind.3 tsearch.3 twalk.3 tsearch.3 tdelete.3
diff --git a/lib/libc/stdlib/_env.c b/lib/libc/stdlib/_env.c
deleted file mode 100644
index c7f32e46d..000000000
--- a/lib/libc/stdlib/_env.c
+++ /dev/null
@@ -1,406 +0,0 @@
-/*	$NetBSD: _env.c,v 1.9 2015/01/20 18:31:25 christos Exp $ */
-
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matthias Scheler.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _env.c,v 1.9 2015/01/20 18:31:25 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/rbtree.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-
-#include "env.h"
-#include "local.h"
-
-/*
- * Red-Black tree node for tracking memory used by environment variables.
- * The tree is sorted by the address of the nodes themselves.
- */
-typedef struct {
-	rb_node_t	rb_node;
-	size_t		length;
-	uint8_t		marker;
-	char		data[];
-} env_node_t;
-
-/* Compare functions for above tree. */
-static signed int env_tree_compare_nodes(void *, const void *, const void *);
-static signed int env_tree_compare_key(void *, const void *, const void *);
-
-/* Operations for above tree. */
-static const rb_tree_ops_t env_tree_ops = {
-	.rbto_compare_nodes = env_tree_compare_nodes,
-	.rbto_compare_key = env_tree_compare_key,
-	.rbto_node_offset = offsetof(env_node_t, rb_node),
-	.rbto_context = NULL
-};
-
-/* The single instance of above tree. */
-static rb_tree_t	env_tree;
-
-/* The allocated environment. */
-static char	**allocated_environ;
-static size_t	allocated_environ_size;
-
-#define	ENV_ARRAY_SIZE_MIN	16
-
-/* The lock protecting access to the environment. */
-#ifdef _REENTRANT
-static rwlock_t env_lock = RWLOCK_INITIALIZER;
-#endif
-
-/* Compatibility function. */
-char *__findenv(const char *name, int *offsetp);
-
-__warn_references(__findenv,
-    "warning: __findenv is an internal obsolete function.")
-
-/* Our initialization function. */
-void __libc_env_init(void);
-
-char **environ;
-
-/*ARGSUSED*/
-static signed int
-env_tree_compare_nodes(void *ctx, const void *node_a, const void *node_b)
-{
-	uintptr_t addr_a, addr_b;
-
-	addr_a = (uintptr_t)node_a;
-	addr_b = (uintptr_t)node_b;
-
-	if (addr_a < addr_b)
-		return -1;
-
-	if (addr_a > addr_b)
-		return 1;
-
-	return 0;
-}
-
-static signed int
-env_tree_compare_key(void *ctx, const void *node, const void *key)
-{
-	return env_tree_compare_nodes(ctx, node,
-	    (const uint8_t *)key - offsetof(env_node_t, data));
-}
-
-/*
- * Determine the of the name in an environment string. Return 0 if the
- * name is not valid.
- */
-size_t
-__envvarnamelen(const char *str, bool withequal)
-{
-	size_t l_name;
-
-	if (str == NULL)
-		return 0;
-
-	l_name = strcspn(str, "=");
-	if (l_name == 0)
-		return 0;
-
-	if (withequal) {
-		if (str[l_name] != '=')
-			return 0;
-	} else {
-		if (str[l_name] == '=')
-			return 0;
-	}
-
-	return l_name;
-}
-
-/*
- * Free memory occupied by environment variable if possible. This function
- * must be called with the environment write locked.
- */
-void
-__freeenvvar(char *envvar)
-{
-	env_node_t *node;
-
-	_DIAGASSERT(envvar != NULL);
-	node = rb_tree_find_node(&env_tree, envvar);
-	if (node != NULL) {
-		rb_tree_remove_node(&env_tree, node);
-		free(node);
-	}
-}
-
-/*
- * Allocate memory for an environment variable. This function must be called
- * with the environment write locked.
- */
-char *
-__allocenvvar(size_t length)
-{
-	env_node_t *node;
-
-	node = malloc(sizeof(*node) + length);
-	if (node != NULL) {
-		node->length = length;
-		node->marker = 0;
-		rb_tree_insert_node(&env_tree, node);
-		return node->data;
-	} else {
-		return NULL;
-	}
-}
-
-/*
- * Check whether an environment variable is writable. This function must be
- * called with the environment write locked as the caller will probably
- * overwrite the environment variable afterwards.
- */
-bool
-__canoverwriteenvvar(char *envvar, size_t length)
-{
-	env_node_t *node;
-
-	_DIAGASSERT(envvar != NULL);
-
-	node = rb_tree_find_node(&env_tree, envvar);
-	return (node != NULL && length <= node->length);
-}
-
-/* Free all allocated environment variables that are no longer used. */
-static void
-__scrubenv(void)
-{
-	static uint8_t marker = 0;
-	size_t num_entries;
-	env_node_t *node, *next;
-
-	while (++marker == 0);
-
-	/* Mark all nodes which are currently used. */
-	for (num_entries = 0; environ[num_entries] != NULL; num_entries++) {
-		node = rb_tree_find_node(&env_tree, environ[num_entries]);
-		if (node != NULL)
-			node->marker = marker;
-	}
-
-	/* Free all nodes which are currently not used. */
-	for (node = RB_TREE_MIN(&env_tree); node != NULL; node = next) {
-		next = rb_tree_iterate(&env_tree, node, RB_DIR_RIGHT);
-
-		if (node->marker != marker) {
-			rb_tree_remove_node(&env_tree, node);
-			free(node);
-		}
-	}
-
-	/* Deal with the environment array itself. */
-	if (environ == allocated_environ) {
-		/* Clear out spurious entries in the environment. */
-		(void)memset(&environ[num_entries + 1], 0,
-		    (allocated_environ_size - num_entries - 1) *
-		    sizeof(*environ));
-	} else {
-		/*
-		 * The environment array was not allocated by "libc".
-		 * Free our array if we allocated one.
-		 */
-		free(allocated_environ);
-		allocated_environ = NULL;
-		allocated_environ_size = 0;
-	}
-}
-
-/*
- * Get a (new) slot in the environment. This function must be called with
- * the environment write locked.
- */
-ssize_t
-__getenvslot(const char *name, size_t l_name, bool allocate)
-{
-	size_t new_size, num_entries, required_size;
-	char **new_environ;
-
-	/* Search for an existing environment variable of the given name. */
-	num_entries = 0;
-	while (environ[num_entries] != NULL) {
-		if (strncmp(environ[num_entries], name, l_name) == 0 &&
-		    environ[num_entries][l_name] == '=') {
-			/* We found a match. */
-			return num_entries;
-		}
-		num_entries ++;
-	}
-
-	/* No match found, return if we don't want to allocate a new slot. */
-	if (!allocate)
-		return -1;
-
-	/* Does the environ need scrubbing? */
-	if (environ != allocated_environ && allocated_environ != NULL)
-		__scrubenv();
-
-	/* Create a new slot in the environment. */
-	required_size = num_entries + 1;
-	if (environ == allocated_environ &&
-	    required_size < allocated_environ_size) {
-		/* Does the environment need scrubbing? */
-		if (required_size < allocated_environ_size &&
-		    allocated_environ[required_size] != NULL) {
-			__scrubenv();
-		}
-
-		/* Return a free slot. */
-		return num_entries;
-	}
-
-	/* Determine size of a new environment array. */
-	new_size = ENV_ARRAY_SIZE_MIN;
-	while (new_size <= required_size)
-		new_size <<= 1;
-
-	/* Allocate a new environment array. */
-	if (environ == allocated_environ) {
-		new_environ = realloc(environ,
-		    new_size * sizeof(*new_environ));
-		if (new_environ == NULL)
-			return -1;
-	} else {
-		free(allocated_environ);
-		allocated_environ = NULL;
-		allocated_environ_size = 0;
-
-		new_environ = malloc(new_size * sizeof(*new_environ));
-		if (new_environ == NULL)
-			return -1;
-		(void)memcpy(new_environ, environ,
-		    num_entries * sizeof(*new_environ));
-	}
-
-	/* Clear remaining entries. */
-	(void)memset(&new_environ[num_entries], 0,
-	    (new_size - num_entries) * sizeof(*new_environ));
-
-	/* Use the new environment array. */
-	environ = allocated_environ = new_environ;
-	allocated_environ_size = new_size;
-
-	/* Return a free slot. */
-	return num_entries;
-}
-
-/* Find a string in the environment. */
-char *
-__findenvvar(const char *name, size_t l_name)
-{
-	ssize_t offset;
-
-	offset = __getenvslot(name, l_name, false);
-	return (offset != -1) ? environ[offset] + l_name + 1 : NULL;
-}
-
-/* Compatibility interface, do *not* call this function. */
-char *
-__findenv(const char *name, int *offsetp)
-{
-	size_t l_name;
-	ssize_t offset;
-
-	l_name = __envvarnamelen(name, false);
-	if (l_name == 0)
-		return NULL;
-
-	offset = __getenvslot(name, l_name, false);
-	if (offset < 0 || offset > INT_MAX)
-		return NULL;
-
-	*offsetp = (int)offset;
-	return environ[offset] + l_name + 1;
-}
-
-#ifdef _REENTRANT
-
-/* Lock the environment for read. */
-bool
-__readlockenv(void)
-{
-	int error;
-
-	error = rwlock_rdlock(&env_lock);
-	if (error == 0)
-		return true;
-
-	errno = error;
-	return false;
-}
-
-/* Lock the environment for write. */
-bool
-__writelockenv(void)
-{
-	int error;
-
-	error = rwlock_wrlock(&env_lock);
-	if (error == 0)
-		return true;
-
-	errno = error;
-	return false;
-}
-
-/* Unlock the environment for write. */
-bool
-__unlockenv(void)
-{
-	int error;
-
-	error = rwlock_unlock(&env_lock);
-	if (error == 0)
-		return true;
-
-	errno = error;
-	return false;
-}
-
-#endif
-
-/* Initialize environment memory RB tree. */
-void __section(".text.startup")
-__libc_env_init(void)
-{
-	rb_tree_init(&env_tree, &env_tree_ops);
-}
diff --git a/lib/libc/stdlib/_rand48.c b/lib/libc/stdlib/_rand48.c
deleted file mode 100644
index 0468026dc..000000000
--- a/lib/libc/stdlib/_rand48.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: _rand48.c,v 1.7 2005/06/12 05:21:27 lukem Exp $	*/
-
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _rand48.c,v 1.7 2005/06/12 05:21:27 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-
-#include "rand48.h"
-
-unsigned short __rand48_seed[3] = {
-	RAND48_SEED_0,
-	RAND48_SEED_1,
-	RAND48_SEED_2
-};
-unsigned short __rand48_mult[3] = {
-	RAND48_MULT_0,
-	RAND48_MULT_1,
-	RAND48_MULT_2
-};
-unsigned short __rand48_add = RAND48_ADD;
-
-void
-__dorand48(unsigned short xseed[3])
-{
-	unsigned long accu;
-	unsigned short temp[2];
-
-	_DIAGASSERT(xseed != NULL);
-
-	accu = (unsigned long) __rand48_mult[0] * (unsigned long) xseed[0] +
-	 (unsigned long) __rand48_add;
-	temp[0] = (unsigned short) accu;	/* lower 16 bits */
-	accu >>= sizeof(unsigned short) * 8;
-	accu += (unsigned long) __rand48_mult[0] * (unsigned long) xseed[1] +
-	 (unsigned long) __rand48_mult[1] * (unsigned long) xseed[0];
-	temp[1] = (unsigned short) accu;	/* middle 16 bits */
-	accu >>= sizeof(unsigned short) * 8;
-	accu += __rand48_mult[0] * xseed[2] + __rand48_mult[1] * xseed[1] + __rand48_mult[2] * xseed[0];
-	xseed[0] = temp[0];
-	xseed[1] = temp[1];
-	xseed[2] = (unsigned short) accu;
-}
diff --git a/lib/libc/stdlib/a64l.3 b/lib/libc/stdlib/a64l.3
deleted file mode 100644
index 7f0080279..000000000
--- a/lib/libc/stdlib/a64l.3
+++ /dev/null
@@ -1,133 +0,0 @@
-.\" $NetBSD: a64l.3,v 1.10 2010/05/06 18:55:34 jruoho Exp $
-.\"
-.\" Copyright (c) 1998, 1999 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.
-.\"
-.Dd May 6, 2010
-.Dt A64L 3
-.Os
-.Sh NAME
-.Nm a64l ,
-.Nm l64a ,
-.Nm l64a_r
-.Nd "convert between a long integer and a base-64 ASCII string"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft long
-.Fn a64l "const char *s"
-.Ft char *
-.Fn l64a "long int l"
-.Ft int
-.Fn l64a_r "long int l" "char *buffer" "int buflen"
-.Sh DESCRIPTION
-The
-.Fn a64l
-and
-.Fn l64a
-functions convert between a long integer and its base-64 ASCII string
-representation.
-.Pp
-The characters used to represent ``digits'' are
-`.' for 0,
-`/' for 1,
-`0' - `9' for 2 - 11,
-`A' - `Z' for 12 - 37, and
-`a' - `z' for 38 - 63.
-.Pp
-.Fn a64l
-takes a pointer to a NUL-terminated base-64 ASCII string
-representation,
-.Fa s ,
-and returns the corresponding long integer value.
-.Pp
-.Fn l64a
-takes a long integer value,
-.Fa l ,
-and returns a pointer to the corresponding NUL-terminated base-64
-ASCII string representation.
-.Pp
-.Fn l64a_r
-performs a conversion identical to that of
-.Fn l64a
-and stores the resulting representation in the memory area pointed to by
-.Fa buffer ,
-consuming at most
-.Fa buflen
-characters including the terminating NUL character.
-.Sh RETURN VALUES
-On successful completion,
-.Fn a64l
-returns the long integer value corresponding to the input string.
-If the string pointed to by
-.Fa s
-is an empty string,
-.Fn a64l
-returns a value of 0L.
-.Pp
-.Fn l64a
-returns a pointer to the base-64 ASCII string representation corresponding to
-the input value.
-If
-.Fa l
-is 0L,
-.Fn l64a
-returns a pointer to an empty string.
-.Pp
-On successful completion,
-.Fn l64a_r
-returns 0; if
-.Fa buffer
-is of insufficient length, -1 is returned.
-.Sh SEE ALSO
-.Xr strtol 3
-.Sh STANDARDS
-The
-.Fn a64l
-and
-.Fn l64a
-functions conform to
-.St -xpg4.2
-and
-.St -p1003.1-2004 .
-The
-.Fn l64a_r
-function conforms to
-.St -svid4 ,
-Multithreading Extension.
-.Sh BUGS
-The
-.Fn l64a
-function is not reentrant.
-The value returned by it points into a static buffer area;
-subsequent calls to
-.Fn la64a
-may overwrite this buffer.
-In multi-threaded applications,
-.Fn l64a_r
-should be used instead.
diff --git a/lib/libc/stdlib/a64l.c b/lib/libc/stdlib/a64l.c
deleted file mode 100644
index d7d004212..000000000
--- a/lib/libc/stdlib/a64l.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: a64l.c,v 1.10 2012/06/08 11:15:26 abs Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(a64l,_a64l)
-#endif
-
-long
-a64l(const char *s)
-{
-	long value, digit, shift;
-	int i;
-
-	_DIAGASSERT(s != NULL);
-
-	value = 0;
-	shift = 0;
-	for (i = 0; *s && i < 6; i++, s++) {
-		if (*s <= '/')
-			digit = *s - '.';
-		else if (*s <= '9')
-			digit = *s - '0' + 2;
-		else if (*s <= 'Z')
-			digit = *s - 'A' + 12;
-		else
-			digit = *s - 'a' + 38; 
-
-		value |= digit << shift;
-		shift += 6;
-	}
-
-	return (long) value;
-}
diff --git a/lib/libc/stdlib/abort.3 b/lib/libc/stdlib/abort.3
deleted file mode 100644
index c75aeb6ce..000000000
--- a/lib/libc/stdlib/abort.3
+++ /dev/null
@@ -1,73 +0,0 @@
-.\"	$NetBSD: abort.3,v 1.13 2012/06/12 21:16:17 jdf Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)abort.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd August 11, 2002
-.Dt ABORT 3
-.Os
-.Sh NAME
-.Nm abort
-.Nd cause abnormal program termination
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn abort void
-.Sh DESCRIPTION
-The
-.Fn abort
-function causes abnormal program termination to occur, unless the
-signal
-.Dv SIGABRT
-is being caught and the signal handler does not return.
-.Pp
-Calling the
-.Fn abort
-function results in temporary files being removed.
-Any open streams are flushed and closed.
-.Sh RETURN VALUES
-The
-.Fn abort
-function
-never returns.
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr exit 3
-.Sh STANDARDS
-The
-.Fn abort
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/stdlib/abort.c b/lib/libc/stdlib/abort.c
deleted file mode 100644
index c15a59041..000000000
--- a/lib/libc/stdlib/abort.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*	$NetBSD: abort.c,v 1.15 2012/06/08 11:15:26 abs Exp $	*/
-
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)abort.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: abort.c,v 1.15 2012/06/08 11:15:26 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#if !defined(__minix) || !defined(_LIBMINC)
-extern void (*__cleanup)(void);
-static int aborting = 0;
-
-void
-abort(void)
-{
-	sigset_t mask;
-
-	sigfillset(&mask);
-	/*
-	 * don't block SIGABRT to give any handler a chance; we ignore
-	 * any errors -- X311J doesn't allow abort to return anyway.
-	 */
-	sigdelset(&mask, SIGABRT);
-	(void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
-
-	/* 
-	 * POSIX.1 requires that stdio buffers be flushed on abort.
-	 * We ensure the cleanup routines are only called once in
-	 * case the user calls abort() in a SIGABRT handler.
-	 */
-	if (!aborting) {
-		aborting = 1;
-
-		if (__cleanup)
-			(*__cleanup)();
-	}
-
-	(void)raise(SIGABRT);
-
-	/*
-	 * if SIGABRT ignored, or caught and the handler returns, do
-	 * it again, only harder.
-	 */
-	(void)signal(SIGABRT, SIG_DFL);
-	(void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
-	(void)raise(SIGABRT);
-	_exit(1);
-}
-
-#else /* defined(__minix) && defined(_LIBMINC) */
-void
-abort(void)
-{
-
-	/* We cannot use signals from system services. */
-	exit(1);
-}
-#endif /* defined(__minix) && defined(_LIBMINC) */
diff --git a/lib/libc/stdlib/abs.3 b/lib/libc/stdlib/abs.3
deleted file mode 100644
index e3cb9e124..000000000
--- a/lib/libc/stdlib/abs.3
+++ /dev/null
@@ -1,73 +0,0 @@
-.\"	$NetBSD: abs.3,v 1.14 2011/04/13 06:56:50 jruoho Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)abs.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 13, 2011
-.Dt ABS 3
-.Os
-.Sh NAME
-.Nm abs ,
-.Nm labs ,
-.Nm llabs ,
-.Nm imaxabs
-.Nd functions for integer absolute value
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn abs "int x"
-.Ft long int
-.Fn labs "long int x"
-.Ft long long int
-.Fn llabs "long long int x"
-.In inttypes.h
-.Ft intmax_t
-.Fn imaxabs "intmax_t x"
-.Sh DESCRIPTION
-These functions return the absolute value of the integer
-.Fa x .
-The listed functions differ only with respect
-to the type of the return value and
-.Fa x .
-.Sh SEE ALSO
-.Xr cabs 3 ,
-.Xr fabs 3 ,
-.Xr floor 3 ,
-.Xr math 3
-.Sh STANDARDS
-The described functions conform to
-.St -isoC-99 .
-.Sh BUGS
-The absolute value of the most negative integer remains negative.
diff --git a/lib/libc/stdlib/abs.c b/lib/libc/stdlib/abs.c
deleted file mode 100644
index 2b5333c30..000000000
--- a/lib/libc/stdlib/abs.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: abs.c,v 1.8 2012/06/08 11:15:26 abs Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)abs.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: abs.c,v 1.8 2012/06/08 11:15:26 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdlib.h>
-
-int
-abs(int j)
-{
-	return(j < 0 ? -j : j);
-}
diff --git a/lib/libc/stdlib/alloca.3 b/lib/libc/stdlib/alloca.3
deleted file mode 100644
index 1e6802502..000000000
--- a/lib/libc/stdlib/alloca.3
+++ /dev/null
@@ -1,120 +0,0 @@
-.\"	$NetBSD: alloca.3,v 1.16 2012/10/24 22:56:27 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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: @(#)alloca.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd October 24, 2012
-.Dt ALLOCA 3
-.Os
-.Sh NAME
-.Nm alloca
-.Nd memory allocator
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void *
-.Fn alloca "size_t size"
-.Sh DESCRIPTION
-The
-.Fn alloca
-function
-allocates
-.Fa size
-bytes of space in the stack frame of the caller.
-This temporary space is automatically freed on
-return.
-.Sh RETURN VALUES
-The
-.Fn alloca
-function returns a pointer to the beginning of the allocated space.
-If the allocation failed, a
-.Dv NULL
-pointer is returned.
-.Sh SEE ALSO
-.Xr cc 1 ,
-.Xr brk 2 ,
-.Xr calloc 3 ,
-.Xr getpagesize 3 ,
-.Xr malloc 3 ,
-.Xr realloc 3 ,
-.Xr security 7
-.Sh CAVEATS
-Few limitations can be mentioned:
-.Bl -bullet
-.It
-The
-.Fn alloca
-function is not part of any C standard and its use is not portable.
-.It
-The
-.Fn alloca
-function should be supplied by the compiler because the compiler is allowed to
-make assumptions about the stack and frame pointers.
-The libc
-.Fn alloca
-implementation cannot account for those assumptions.
-While there is a
-machine dependent implementation of
-.Fn alloca
-in libc, its use is discouraged and in most cases it will not work.
-Using this implementation will produce linker warnings.
-.It
-The
-.Fn alloca
-function is unsafe because it cannot ensure that the pointer
-returned points to a valid and usable block of memory.
-The allocation made may exceed the bounds of the stack, or even go
-further into other objects in memory, and
-.Fn alloca
-cannot determine such an error.
-For that all
-.Fn alloca
-allocations should be bounded and limited to a small size.
-.It
-Since
-.Fn alloca
-modifies the stack at runtime and the stack usage of each function frame
-cannot be predicted, it makes many compiler security features
-(such as
-.Xr cc 1
-.Fl fstack-protector )
-useless for the calling function.
-See
-.Xr security 7
-for a discussion.
-.El
-.\" .Sh HISTORY
-.\" The
-.\" .Fn alloca
-.\" function appeared in
-.\" .Bx ?? .
-.\" The function appeared in 32v, pwb and pwb.2 and in 3bsd 4bsd
-.\" The first man page (or link to a man page that I can find at the
-.\" moment is 4.3...
diff --git a/lib/libc/stdlib/at_quick_exit.3 b/lib/libc/stdlib/at_quick_exit.3
deleted file mode 100644
index 5ac0b7ae2..000000000
--- a/lib/libc/stdlib/at_quick_exit.3
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"	$NetBSD: at_quick_exit.3,v 1.2 2013/04/26 19:37:18 wiz Exp $
-.\"  Copyright (c) 2011 David Chisnall
-.\"  All rights reserved.
-.\"
-.\"  Redistribution and use in source and binary forms, with or without
-.\"  modification, are permitted provided that the following conditions
-.\"  are met:
-.\"  1. Redistributions of source code must retain the above copyright
-.\"     notice, this list of conditions and the following disclaimer.
-.\"  2. Redistributions in binary form must reproduce the above copyright
-.\"     notice, this list of conditions and the following disclaimer in the
-.\"     documentation and/or other materials provided with the distribution.
-.\"
-.\"  THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\"  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\"  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\"  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\"  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\"  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\"  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\"  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\"  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\"  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\"  SUCH DAMAGE.
-.\"
-.\"  $FreeBSD: src/lib/libc/stdlib/at_quick_exit.3,v 1.5 2012/11/17 01:49:41 svnexp Exp $
-.\"
-.Dd April 26, 2013
-.Dt AT_QUICK_EXIT 3
-.Os
-.Sh NAME
-.Nm at_quick_exit
-.Nd registers a cleanup function to run on quick exit
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn at_quick_exit "void (*func)(void)"
-.Sh DESCRIPTION
-The
-.Fn at_quick_exit
-function registers a cleanup function to be called when the program exits as a
-result of calling
-.Xr quick_exit 3 .
-The cleanup functions are called in the reverse order and will not be called if
-the program exits by calling
-.Xr exit 3 ,
-.Xr _Exit 2 ,
-or
-.Xr abort 3 .
-.Sh RETURN VALUES
-The
-.Fn at_quick_exit
-function returns the value 0 if successful and a non-zero value on failure.
-.Sh SEE ALSO
-.Xr exit 3 ,
-.Xr quick_exit 3
-.Sh STANDARDS
-The
-.Fn at_quick_exit
-function conforms to
-.St -isoC-2011 .
diff --git a/lib/libc/stdlib/atexit.3 b/lib/libc/stdlib/atexit.3
deleted file mode 100644
index 64fcdc638..000000000
--- a/lib/libc/stdlib/atexit.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"	$NetBSD: atexit.3,v 1.11 2013/04/26 19:37:04 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)atexit.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt ATEXIT 3
-.Os
-.Sh NAME
-.Nm atexit
-.Nd register a function to be called on exit
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn atexit "void (*function)(void)"
-.Sh DESCRIPTION
-The
-.Fn atexit
-function
-registers the given
-.Ar function
-to be called at program exit, whether via
-.Xr exit 3
-or via return from the program's
-.Em main .
-Functions so registered are called in reverse order;
-no arguments are passed.
-At least 32 functions can always be registered,
-and more are allowed as long as sufficient memory can be allocated.
-.Sh RETURN VALUES
-.Rv -std atexit
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-No memory was available to add the function to the list.
-The existing list of functions is unmodified.
-.El
-.Sh SEE ALSO
-.Xr at_quick_exit 3 ,
-.Xr exit 3 ,
-.Xr quick_exit 3
-.Sh STANDARDS
-The
-.Fn atexit
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/stdlib/atexit.c b/lib/libc/stdlib/atexit.c
deleted file mode 100644
index 3636f1cee..000000000
--- a/lib/libc/stdlib/atexit.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*	$NetBSD: atexit.c,v 1.29 2015/04/19 18:15:26 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: atexit.c,v 1.29 2015/04/19 18:15:26 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "reentrant.h"
-
-#include <assert.h>
-#include <stdlib.h>
-
-#include "atexit.h"
-
-struct atexit_handler {
-	struct atexit_handler *ah_next;
-	union {
-		void (*fun_atexit)(void);
-		void (*fun_cxa_atexit)(void *);
-	} ah_fun;
-#define	ah_atexit	ah_fun.fun_atexit
-#define	ah_cxa_atexit	ah_fun.fun_cxa_atexit
-
-	void *ah_arg;	/* argument for cxa_atexit handlers */
-	void *ah_dso;	/* home DSO for cxa_atexit handlers */
-};
-
-/*
- * There must be at least 32 to guarantee ANSI conformance, plus
- * 3 additional ones for the benefit of the startup code, which
- * may use them to register the dynamic loader's cleanup routine,
- * the profiling cleanup routine, and the global destructor routine.
- */
-#define	NSTATIC_HANDLERS	(32 + 3)
-static struct atexit_handler atexit_handler0[NSTATIC_HANDLERS];
-
-#define	STATIC_HANDLER_P(ah)						\
-	(ah >= &atexit_handler0[0] && ah < &atexit_handler0[NSTATIC_HANDLERS])
-
-/*
- * Stack of atexit handlers.  Handlers must be called in the opposite
- * order they were registered.
- */
-static struct atexit_handler *atexit_handler_stack;
-
-#ifdef _REENTRANT
-/* ..and a mutex to protect it all. */
-mutex_t __atexit_mutex;
-#endif /* _REENTRANT */
-
-void	__libc_atexit_init(void) __attribute__ ((visibility("hidden")));
-
-/*
- * Allocate an atexit handler descriptor.  If "dso" is NULL, it indicates
- * a normal atexit handler, which must be allocated from the static pool,
- * if possible. cxa_atexit handlers are never allocated from the static
- * pool.
- *
- * __atexit_mutex must be held.
- */
-static struct atexit_handler *
-atexit_handler_alloc(void *dso)
-{
-	struct atexit_handler *ah;
-	int i;
-
-	if (dso == NULL) {
-		for (i = 0; i < NSTATIC_HANDLERS; i++) {
-			ah = &atexit_handler0[i];
-			if (ah->ah_atexit == NULL && ah->ah_next == NULL) {
-				/* Slot is free. */
-				return (ah);
-			}
-		}
-	}
-
-	/*
-	 * Either no static slot was free, or this is a cxa_atexit
-	 * handler.  Allocate a new one.  We keep the __atexit_mutex
-	 * held to prevent handlers from being run while we (potentially)
-	 * block in malloc().
-	 */
-	ah = malloc(sizeof(*ah));
-	return (ah);
-}
-
-/*
- * Initialize __atexit_mutex with the PTHREAD_MUTEX_RECURSIVE attribute.
- * Note that __cxa_finalize may generate calls to __cxa_atexit.
- */
-void __section(".text.startup")
-__libc_atexit_init(void)
-{
-#ifdef _REENTRANT
-	mutexattr_t atexit_mutex_attr;
-	mutexattr_init(&atexit_mutex_attr);
-	mutexattr_settype(&atexit_mutex_attr, PTHREAD_MUTEX_RECURSIVE);
-	mutex_init(&__atexit_mutex, &atexit_mutex_attr);
-#endif
-}
-
-/*
- * Register an atexit routine.  This is suitable either for a cxa_atexit
- * or normal atexit type handler.  The __cxa_atexit() name and arguments
- * are specified by the C++ ABI.  See:
- *
- *	http://www.codesourcery.com/cxx-abi/abi.html#dso-dtor
- */
-#if defined(__ARM_EABI__) && !defined(lint)
-int
-__aeabi_atexit(void *arg, void (*func)(void *), void *dso);
-
-int
-__aeabi_atexit(void *arg, void (*func)(void *), void *dso)
-{
-	return __cxa_atexit(func, arg, dso);
-}
-#endif
-
-int
-__cxa_atexit(void (*func)(void *), void *arg, void *dso)
-{
-	struct atexit_handler *ah;
-
-	_DIAGASSERT(func != NULL);
-
-	mutex_lock(&__atexit_mutex);
-
-	ah = atexit_handler_alloc(dso);
-	if (ah == NULL) {
-		mutex_unlock(&__atexit_mutex);
-		return (-1);
-	}
-
-	ah->ah_cxa_atexit = func;
-	ah->ah_arg = arg;
-	ah->ah_dso = dso;
-
-	ah->ah_next = atexit_handler_stack;
-	atexit_handler_stack = ah;
-
-	mutex_unlock(&__atexit_mutex);
-	return (0);
-}
-
-/*
- * Run the list of atexit handlers.  If dso is NULL, run all of them,
- * otherwise run only those matching the specified dso.
- *
- * Note that we can be recursively invoked; rtld cleanup is via an
- * atexit handler, and rtld cleanup invokes _fini() for DSOs, which
- * in turn invokes __cxa_finalize() for the DSO.
- */
-void
-__cxa_finalize(void *dso)
-{
-	static u_int call_depth;
-	struct atexit_handler *ah, *dead_handlers = NULL, **prevp;
-	void (*cxa_func)(void *);
-	void (*atexit_func)(void);
-
-	mutex_lock(&__atexit_mutex);
-	call_depth++;
-
-	/*
-	 * If we are at call depth 1 (which is usually the "do everything"
-	 * call from exit(3)), we go ahead and remove elements from the
-	 * list as we call them.  This will prevent any nested calls from
-	 * having to traverse elements we've already processed.  If we are
-	 * at call depth > 1, we simply mark elements we process as unused.
-	 * When the depth 1 caller sees those, it will simply unlink them
-	 * for us.
-	 */
-again:
-	for (prevp = &atexit_handler_stack; (ah = (*prevp)) != NULL;) {
-		if (dso == NULL || dso == ah->ah_dso || ah->ah_atexit == NULL) {
-			if (ah->ah_atexit != NULL) {
-				void *p = atexit_handler_stack;
-				if (ah->ah_dso != NULL) {
-					cxa_func = ah->ah_cxa_atexit;
-					ah->ah_cxa_atexit = NULL;
-					(*cxa_func)(ah->ah_arg);
-				} else {
-					atexit_func = ah->ah_atexit;
-					ah->ah_atexit = NULL;
-					(*atexit_func)();
-				}
-				/* Restart if new atexit handler was added. */
-				if (p != atexit_handler_stack)
-					goto again;
-			}
-
-			if (call_depth == 1) {
-				*prevp = ah->ah_next;
-				if (STATIC_HANDLER_P(ah))
-					ah->ah_next = NULL;
-				else {
-					ah->ah_next = dead_handlers;
-					dead_handlers = ah;
-				}
-			} else
-				prevp = &ah->ah_next;
-		} else
-			prevp = &ah->ah_next;
-	}
-	call_depth--;
-	mutex_unlock(&__atexit_mutex);
-
-	if (call_depth > 0)
-		return;
-
-	/*
-	 * Now free any dead handlers.  Do this even if we're about to
-	 * exit, in case a leak-detecting malloc is being used.
-	 */
-	while ((ah = dead_handlers) != NULL) {
-		dead_handlers = ah->ah_next;
-		free(ah);
-	}
-}
-
-/*
- * Register a function to be performed at exit.
- */
-int
-atexit(void (*func)(void))
-{
-
-	return (__cxa_atexit((void (*)(void *))func, NULL, NULL));
-}
diff --git a/lib/libc/stdlib/atexit.h b/lib/libc/stdlib/atexit.h
deleted file mode 100644
index 7aae85a2c..000000000
--- a/lib/libc/stdlib/atexit.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*	$NetBSD: atexit.h,v 1.11 2008/04/28 20:23:00 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-int	__cxa_atexit(void (*)(void *), void *, void *);
-void	__cxa_finalize(void *);
diff --git a/lib/libc/stdlib/atof.3 b/lib/libc/stdlib/atof.3
deleted file mode 100644
index 1d620f739..000000000
--- a/lib/libc/stdlib/atof.3
+++ /dev/null
@@ -1,73 +0,0 @@
-.\"	$NetBSD: atof.3,v 1.9 2003/08/07 16:43:38 agc Exp $
-.\"
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)atof.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt ATOF 3
-.Os
-.Sh NAME
-.Nm atof
-.Nd convert
-.Tn ASCII
-string to double
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft double
-.Fn atof "const char *nptr"
-.Sh DESCRIPTION
-The
-.Fn atof
-function converts the initial portion of the string pointed to by
-.Ar nptr
-to
-.Ar double
-representation.
-.Pp
-It is equivalent to:
-.Bd -literal -offset indent
-strtod(nptr, (char **)NULL);
-.Ed
-.Sh SEE ALSO
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr strtod 3 ,
-.Xr strtol 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The
-.Fn atof
-function conforms to
-.St -ansiC .
diff --git a/lib/libc/stdlib/atof.c b/lib/libc/stdlib/atof.c
deleted file mode 100644
index ae143b6fa..000000000
--- a/lib/libc/stdlib/atof.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: atof.c,v 1.13 2012/06/25 22:32:45 abs 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)atof.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: atof.c,v 1.13 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <stdlib.h>
-
-double
-atof(const char *ascii)
-{
-	_DIAGASSERT(ascii != NULL);
-
-	return (strtod(ascii, NULL));
-}
diff --git a/lib/libc/stdlib/atoi.3 b/lib/libc/stdlib/atoi.3
deleted file mode 100644
index f3aab7e7a..000000000
--- a/lib/libc/stdlib/atoi.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"	$NetBSD: atoi.3,v 1.10 2003/08/07 16:43:38 agc Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)atoi.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt ATOI 3
-.Os
-.Sh NAME
-.Nm atoi
-.Nd convert
-.Tn ASCII
-string to integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn atoi "const char *nptr"
-.Sh DESCRIPTION
-The
-.Fn atoi
-function converts the initial portion of the string pointed to by
-.Em nptr
-to
-.Em integer
-representation.
-.Pp
-It is equivalent to:
-.Bd -literal -offset indent
-(int)strtol(nptr, (char **)NULL, 10);
-.Ed
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atol 3 ,
-.Xr strtod 3 ,
-.Xr strtol 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The
-.Fn atoi
-function conforms to
-.St -ansiC .
-.Sh CAVEATS
-.Nm
-does no overflow checking, handles unsigned numbers poorly,
-and handles strings containing trailing extra characters
-(like
-.Dq 123abc )
-poorly.
-Careful use of
-.Xr strtol 3
-and
-.Xr strtoul 3
-can alleviate these problems.
diff --git a/lib/libc/stdlib/atoi.c b/lib/libc/stdlib/atoi.c
deleted file mode 100644
index bf70b67ca..000000000
--- a/lib/libc/stdlib/atoi.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: atoi.c,v 1.12 2012/06/25 22:32:45 abs 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)atoi.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: atoi.c,v 1.12 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <stdlib.h>
-
-int
-atoi(const char *str)
-{
-	_DIAGASSERT(str != NULL);
-
-	return((int)strtol(str, (char **)NULL, 10));
-}
diff --git a/lib/libc/stdlib/atol.3 b/lib/libc/stdlib/atol.3
deleted file mode 100644
index 1206adec0..000000000
--- a/lib/libc/stdlib/atol.3
+++ /dev/null
@@ -1,74 +0,0 @@
-.\"	$NetBSD: atol.3,v 1.8 2003/08/07 16:43:38 agc Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)atol.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt ATOL 3
-.Os
-.Sh NAME
-.Nm atol
-.Nd convert
-.Tn ASCII
-string to long integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft long
-.Fn atol "const char *nptr"
-.Sh DESCRIPTION
-The
-.Fn atol
-function converts the initial portion of the string pointed to by
-.Ar nptr
-to
-.Em long integer
-representation.
-.Pp
-It is equivalent to:
-.Bd -literal -offset indent
-strtol(nptr, (char **)NULL, 10);
-.Ed
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atoi 3 ,
-.Xr strtod 3 ,
-.Xr strtol 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The
-.Fn atol
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/stdlib/atol.c b/lib/libc/stdlib/atol.c
deleted file mode 100644
index 92d4b8ee0..000000000
--- a/lib/libc/stdlib/atol.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: atol.c,v 1.11 2012/06/25 22:32:45 abs 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)atol.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: atol.c,v 1.11 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <stdlib.h>
-
-long
-atol(const char *str)
-{
-	_DIAGASSERT(str != NULL);
-
-	return(strtol(str, (char **)NULL, 10));
-}
diff --git a/lib/libc/stdlib/atoll.3 b/lib/libc/stdlib/atoll.3
deleted file mode 100644
index 0bdcd6019..000000000
--- a/lib/libc/stdlib/atoll.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\"	$NetBSD: atoll.3,v 1.6 2003/09/08 17:54:33 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)atol.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd March 6, 2000
-.Dt ATOLL 3
-.Os
-.Sh NAME
-.Nm atoll
-.Nd convert
-.Tn ASCII
-string to long long integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft long long int
-.Fn atoll "const char *nptr"
-.Sh DESCRIPTION
-The
-.Fn atoll
-function converts the initial portion of the string pointed to by
-.Ar nptr
-to
-.Em long long integer
-representation.
-.Pp
-It is equivalent to:
-.Bd -literal -offset indent
-strtoll(nptr, (char **)NULL, 10);
-.Ed
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr strtod 3 ,
-.Xr strtol 3 ,
-.Xr strtoll 3 ,
-.Xr strtoul 3 ,
-.Xr strtoull 3
-.Sh STANDARDS
-The
-.Fn atoll
-function
-conforms to
-.St -isoC-99 .
diff --git a/lib/libc/stdlib/atoll.c b/lib/libc/stdlib/atoll.c
deleted file mode 100644
index 2f2a7528d..000000000
--- a/lib/libc/stdlib/atoll.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: atoll.c,v 1.6 2012/06/25 22:32:45 abs 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.
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "from: @(#)atol.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: atoll.c,v 1.6 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef _LIBC
-#include "namespace.h"
-#endif
-
-#include <stdlib.h>
-
-#ifdef _LIBC
-#ifdef __weak_alias
-__weak_alias(atoll, _atoll)
-#endif
-#endif
-
-#if !HAVE_ATOLL
-/* LONGLONG */
-long long int
-atoll(const char *str)
-{
-	return (strtoll(str, (char **)NULL, 10));
-}
-#endif
diff --git a/lib/libc/stdlib/bsearch.3 b/lib/libc/stdlib/bsearch.3
deleted file mode 100644
index 5653e9d12..000000000
--- a/lib/libc/stdlib/bsearch.3
+++ /dev/null
@@ -1,90 +0,0 @@
-.\"	$NetBSD: bsearch.3,v 1.10 2003/08/07 16:43:38 agc Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)bsearch.3	8.3 (Berkeley) 4/19/94
-.\"
-.Dd April 19, 1994
-.Dt BSEARCH 3
-.Os
-.Sh NAME
-.Nm bsearch
-.Nd binary search of a sorted table
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void *
-.Fn bsearch "const void *key" "const void *base" "size_t nmemb" "size_t size" "int (*compar) (const void *, const void *)"
-.Sh DESCRIPTION
-The
-.Fn bsearch
-function searches an array of
-.Fa nmemb
-objects, the initial member of which is
-pointed to by
-.Fa base ,
-for a member that matches the object pointed to by
-.Fa key .
-The size of each member of the array is specified by
-.Fa size .
-.Pp
-The contents of the array should be in ascending sorted order according
-to the comparison function referenced by
-.Fa compar .
-The
-.Fa compar
-routine
-is expected to have
-two arguments which point to the
-.Fa key
-object and to an array member, in that order, and should return an integer
-less than, equal to, or greater than zero if the
-.Fa key
-object is found, respectively, to be less than, to match, or be
-greater than the array member.
-.Sh RETURN VALUES
-The
-.Fn bsearch
-function returns a pointer to a matching member of the array, or a null
-pointer if no match is found.
-If two members compare as equal, which member is matched is unspecified.
-.Sh SEE ALSO
-.Xr db 3 ,
-.Xr lsearch 3 ,
-.Xr qsort 3 ,
-.Xr tsearch 3
-.Sh STANDARDS
-The
-.Fn bsearch
-function conforms to
-.St -ansiC .
diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c
deleted file mode 100644
index 2b0e0d86f..000000000
--- a/lib/libc/stdlib/bsearch.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: bsearch.c,v 1.15 2012/03/04 20:01:45 christos Exp $	*/
-
-/*
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bsearch.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: bsearch.c,v 1.15 2012/03/04 20:01:45 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/*
- * Perform a binary search.
- *
- * The code below is a bit sneaky.  After a comparison fails, we
- * divide the work in half by moving either left or right. If lim
- * is odd, moving left simply involves halving lim: e.g., when lim
- * is 5 we look at item 2, so we change lim to 2 so that we will
- * look at items 0 & 1.  If lim is even, the same applies.  If lim
- * is odd, moving right again involes halving lim, this time moving
- * the base up one item past p: e.g., when lim is 5 we change base
- * to item 3 and make lim 2 so that we will look at items 3 and 4.
- * If lim is even, however, we have to shrink it by one before
- * halving: e.g., when lim is 4, we still looked at item 2, so we
- * have to make lim 3, then halve, obtaining 1, so that we will only
- * look at item 3.
- */
-void *
-bsearch(const void *key, const void *base0, size_t nmemb, size_t size,
-    int (*compar)(const void *, const void *))
-{
-	const char *base = base0;
-	size_t lim;
-	int cmp;
-	const void *p;
-
-	_DIAGASSERT(key != NULL);
-	_DIAGASSERT(base0 != NULL || nmemb == 0);
-	_DIAGASSERT(compar != NULL);
-
-	for (lim = nmemb; lim != 0; lim >>= 1) {
-		p = base + (lim >> 1) * size;
-		cmp = (*compar)(key, p);
-		if (cmp == 0)
-			return __UNCONST(p);
-		if (cmp > 0) {	/* key > p: move right */
-			base = (const char *)p + size;
-			lim--;
-		}		/* else move left */
-	}
-	return (NULL);
-}
diff --git a/lib/libc/stdlib/div.3 b/lib/libc/stdlib/div.3
deleted file mode 100644
index 0e38edec2..000000000
--- a/lib/libc/stdlib/div.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\"	$NetBSD: div.3,v 1.14 2011/05/03 09:36:24 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)div.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 13, 2011
-.Dt DIV 3
-.Os
-.Sh NAME
-.Nm div ,
-.Nm ldiv ,
-.Nm lldiv ,
-.Nm imaxdiv
-.Nd quotient and remainder from division
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft div_t
-.Fn div "int num" "int denom"
-.Ft ldiv_t
-.Fn ldiv "long int num" "long int denom"
-.Ft lldiv_t
-.Fn lldiv "long long int num" "long long int denom"
-.In inttypes.h
-.Ft imaxdiv_t
-.Fn imaxdiv "intmax_t num" "intmax_t denom"
-.Sh DESCRIPTION
-These functions compute the value of
-.Fa num / denom
-and return the quotient and remainder in a specific divison structure.
-The functions differ only with respect to the type of the return value and
-the parameters.
-.Pp
-The returned structure always contains two members named
-.Vt quot
-and
-.Vt rem ,
-denoting the quotient and the remainder.
-The type of these correspond with the underlying type of the function.
-.Sh EXAMPLES
-The following example demonstrate the basic usage of the functions.
-.Bd -literal -offset indent
-div_t d;
-
-int a = 4321;
-int b = 1234;
-
-d = div(a, b);
-
-(void)printf("%d %d\en", d.quot, d.rem);
-.Ed
-.Sh SEE ALSO
-.Xr fast_divide32 3 ,
-.Xr math 3 ,
-.Xr qdiv 3
-.Sh STANDARDS
-All described functions conform to
-.St -isoC-99 .
diff --git a/lib/libc/stdlib/div.c b/lib/libc/stdlib/div.c
deleted file mode 100644
index f3bd32f26..000000000
--- a/lib/libc/stdlib/div.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*	$NetBSD: div.c,v 1.8 2012/06/25 22:32:45 abs Exp $	*/
-
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)div.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: div.c,v 1.8 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdlib.h>		/* div_t */
-
-div_t
-div(int num, int denom)
-{
-	div_t r;
-
-	r.quot = num / denom;
-	r.rem = num % denom;
-	/*
-	 * The ANSI standard says that |r.quot| <= |n/d|, where
-	 * n/d is to be computed in infinite precision.  In other
-	 * words, we should always truncate the quotient towards
-	 * 0, never -infinity.
-	 *
-	 * Machine division and remainer may work either way when
-	 * one or both of n or d is negative.  If only one is
-	 * negative and r.quot has been truncated towards -inf,
-	 * r.rem will have the same sign as denom and the opposite
-	 * sign of num; if both are negative and r.quot has been
-	 * truncated towards -inf, r.rem will be positive (will
-	 * have the opposite sign of num).  These are considered
-	 * `wrong'.
-	 *
-	 * If both are num and denom are positive, r will always
-	 * be positive.
-	 *
-	 * This all boils down to:
-	 *	if num >= 0, but r.rem < 0, we got the wrong answer.
-	 * In that case, to get the right answer, add 1 to r.quot and
-	 * subtract denom from r.rem.
-	 */
-	if (num >= 0 && r.rem < 0) {
-		r.quot++;
-		r.rem -= denom;
-	}
-	return (r);
-}
diff --git a/lib/libc/stdlib/drand48.c b/lib/libc/stdlib/drand48.c
deleted file mode 100644
index 6fba607a3..000000000
--- a/lib/libc/stdlib/drand48.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*	$NetBSD: drand48.c,v 1.6 2005/06/12 05:21:28 lukem Exp $	*/
-
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: drand48.c,v 1.6 2005/06/12 05:21:28 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "rand48.h"
-
-#ifdef __weak_alias
-__weak_alias(drand48,_drand48)
-#endif
-
-double
-drand48(void)
-{
-	return erand48(__rand48_seed);
-}
diff --git a/lib/libc/stdlib/erand48.c b/lib/libc/stdlib/erand48.c
deleted file mode 100644
index f1d8b4de0..000000000
--- a/lib/libc/stdlib/erand48.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: erand48.c,v 1.9 2006/03/22 20:52:16 drochner Exp $	*/
-
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: erand48.c,v 1.9 2006/03/22 20:52:16 drochner Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <math.h>
-
-#include "rand48.h"
-
-#ifdef __weak_alias
-__weak_alias(erand48,_erand48)
-#endif
-
-double
-erand48(unsigned short xseed[3])
-{
-
-	_DIAGASSERT(xseed != NULL);
-
-	__dorand48(xseed);
-	return ldexp((double) xseed[0], -48) +
-	       ldexp((double) xseed[1], -32) +
-	       ldexp((double) xseed[2], -16);
-}
diff --git a/lib/libc/stdlib/erand48_ieee754.c b/lib/libc/stdlib/erand48_ieee754.c
deleted file mode 100644
index d2dee477b..000000000
--- a/lib/libc/stdlib/erand48_ieee754.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: erand48_ieee754.c,v 1.2 2006/03/31 11:42:31 drochner Exp $	*/
-
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: erand48_ieee754.c,v 1.2 2006/03/31 11:42:31 drochner Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <machine/ieee.h>
-
-#include "rand48.h"
-
-#ifdef __weak_alias
-__weak_alias(erand48,_erand48)
-#endif
-
-double
-erand48(unsigned short xseed[3])
-{
-	union ieee_double_u u;
-
-	_DIAGASSERT(xseed != NULL);
-
-	__dorand48(xseed);
-	u.dblu_dbl.dbl_sign = 0;
-	u.dblu_dbl.dbl_exp = DBL_EXP_BIAS; /* so we get [1,2) */
-	u.dblu_dbl.dbl_frach = ((unsigned int)xseed[2] << 4)
-				| ((unsigned int)xseed[1] >> 12);
-	u.dblu_dbl.dbl_fracl = (((unsigned int)xseed[1] & 0x0fff) << 20)
-				| ((unsigned int)xseed[0] << 4);
-	return (u.dblu_d - 1);
-}
diff --git a/lib/libc/stdlib/exit.3 b/lib/libc/stdlib/exit.3
deleted file mode 100644
index 67ab8195d..000000000
--- a/lib/libc/stdlib/exit.3
+++ /dev/null
@@ -1,111 +0,0 @@
-.\" $NetBSD: exit.3,v 1.16 2013/04/26 18:29:55 christos Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)exit.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd January 2, 2012
-.Dt EXIT 3
-.Os
-.Sh NAME
-.Nm exit
-.Nd perform normal program termination
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn exit "int status"
-.Sh DESCRIPTION
-.Fn exit
-terminates a process.
-The
-.Fa status
-values
-.Dv EXIT_SUCCESS
-and
-.Dv EXIT_FAILURE
-can be used to indicate successful and unsuccessful
-termination, respectively.
-.Pp
-Before termination it performs the following functions in the
-order listed:
-.Bl -enum -offset indent
-.It
-Call the functions registered with the
-.Xr atexit 3
-function, in the reverse order of their registration.
-.It
-Flush all open output streams.
-.It
-Close all open streams.
-.It
-Unlink all files created with the
-.Xr tmpfile 3
-function.
-.El
-.Pp
-Following this,
-.Fn exit
-calls
-.Xr _exit 2 .
-.Sh RESTRICTIONS
-Standard C guarantees only that the values zero,
-.Dv EXIT_SUCCESS ,
-and
-.Dv EXIT_FAILURE
-produce meaningful results.
-POSIX extends this to guarantee that the
-least significant 8 bits of
-.Fa status
-are preserved and returned to the parent via
-.Xr wait 2 .
-Values outside the supported range 0-255 are bitwise-truncated; therefore,
-negative values should not be used.
-.Sh RETURN VALUES
-The
-.Fn exit
-function
-never returns.
-.Sh SEE ALSO
-.Xr _exit 2 ,
-.Xr at_quick_exit 3 ,
-.Xr atexit 3 ,
-.Xr intro 3 ,
-.Xr quick_exit 3 ,
-.Xr tmpfile 3
-.Sh STANDARDS
-The
-.Fn exit
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/stdlib/exit.c b/lib/libc/stdlib/exit.c
deleted file mode 100644
index 67e6adf1b..000000000
--- a/lib/libc/stdlib/exit.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: exit.c,v 1.15 2011/05/18 19:36:36 dsl Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)exit.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: exit.c,v 1.15 2011/05/18 19:36:36 dsl Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdlib.h>
-#include <unistd.h>
-#ifdef _LIBC
-#include "reentrant.h"
-#include "atexit.h"
-#endif
-
-void (*__cleanup)(void);
-
-/*
- * Exit, flushing stdio buffers if necessary.
- */
-void
-exit(int status)
-{
-
-#ifdef _LIBC
-	__cxa_finalize(NULL);
-#endif
-	if (__cleanup)
-		(*__cleanup)();
-	_exit(status);
-}
diff --git a/lib/libc/stdlib/getenv.3 b/lib/libc/stdlib/getenv.3
deleted file mode 100644
index 930df4176..000000000
--- a/lib/libc/stdlib/getenv.3
+++ /dev/null
@@ -1,227 +0,0 @@
-.\"	$NetBSD: getenv.3,v 1.25 2010/10/26 22:34:33 wiz Exp $
-.\"
-.\" Copyright (c) 1988, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)getenv.3	8.2 (Berkeley) 12/11/93
-.\"
-.Dd October 25, 2010
-.Dt GETENV 3
-.Os
-.Sh NAME
-.Nm getenv ,
-.Nm getenv_r ,
-.Nm putenv ,
-.Nm setenv ,
-.Nm unsetenv
-.Nd environment variable functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft char *
-.Fn getenv "const char *name"
-.Ft int
-.Fn getenv_r "const char *name" "char *buf" "size_t len"
-.Ft int
-.Fn setenv "const char *name" "const char *value" "int overwrite"
-.Ft int
-.Fn putenv "char *string"
-.Ft int
-.Fn unsetenv "const char *name"
-.Sh DESCRIPTION
-These functions set, unset and fetch environment variables from the
-host
-.Em environment list .
-For compatibility with differing environment conventions,
-the
-.Fn getenv
-or
-.Fn getenv_r
-given argument
-.Ar name
-may be appended with an equal sign
-.Dq Li \&= .
-.Pp
-The
-.Fn getenv
-function obtains the current value of the environment variable
-.Ar name .
-If the variable
-.Ar name
-is not in the current environment, a
-.Dv NULL
-pointer is returned.
-.Pp
-The
-.Fn getenv_r
-function obtains the current value of the environment variable
-.Fa name
-and copies it to
-.Fa buf .
-If
-.Fa name
-is not in the current environment, or the string length of the value of
-.Fa name
-is longer than
-.Fa len
-characters, then \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Pp
-The
-.Fn setenv
-function inserts or resets the environment variable
-.Ar name
-in the current environment list.
-If the variable
-.Ar name
-does not exist in the list,
-it is inserted with the given
-.Ar value .
-If the variable does exist, the argument
-.Ar overwrite
-is tested; if
-.Ar overwrite is
-zero, the
-variable is not reset, otherwise it is reset
-to the given
-.Ar value .
-.Pp
-The
-.Fn putenv
-function takes an argument of the form
-.Dq name=value
-and it will set the environment variable
-.Dq name
-equal to
-.Dq value
-by altering an existing entry, or creating a new one if an existing
-one does not exist.
-The actual string argument passed to
-.Fn putenv
-will become part of the environment.
-If one changes the string, the environment will also change.
-.Pp
-The
-.Fn unsetenv
-function
-deletes all instances of the variable name pointed to by
-.Fa name
-from the list.
-.Sh RETURN VALUES
-The functions
-.Fn getenv_r ,
-.Fn setenv ,
-.Fn putenv ,
-and
-.Fn unsetenv
-return zero if successful; otherwise the global variable
-.Va errno
-is set to indicate the error and a
-\-1 is returned.
-.Pp
-If
-.Fn getenv
-is successful, the string returned should be considered read-only.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa name
-argument to
-.Fn setenv
-or
-.Fn unsetenv
-is a null pointer, points to an empty string, or points to a string
-containing an
-.Dq Li \&=
-character.
-The
-.Fa value
-argument to
-.Fn setenv
-is a null pointer.
-The
-.Fa string
-argument to
-.Fn putenv
-is a null pointer, or points to a string that either starts with a
-.Dq Li \&=
-character or does not contain one at all.
-.It Bq Er ENOMEM
-The function
-.Fn setenv
-or
-.Fn putenv
-failed because they were unable to allocate memory for the environment.
-.El
-.Pp
-The function
-.Fn getenv_r
-can return the following errors:
-.Bl -tag -width Er
-.It Bq Er ENOENT
-The variable
-.Fa name
-was not found in the environment.
-.It Bq Er ERANGE
-The value of the named variable is too long to fit in the supplied buffer.
-.El
-.Sh SEE ALSO
-.Xr csh 1 ,
-.Xr sh 1 ,
-.Xr execve 2 ,
-.Xr environ 7
-.Sh STANDARDS
-The
-.Fn getenv
-function conforms to
-.St -ansiC .
-The
-.Fn putenv
-function conforms to
-.St -xpg4 .
-The
-.Fn unsetenv
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The functions
-.Fn setenv
-and
-.Fn unsetenv
-appeared in
-.At v7 .
-The
-.Fn putenv
-function appeared in
-.Bx 4.3 Reno .
diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
deleted file mode 100644
index 4d352c880..000000000
--- a/lib/libc/stdlib/getenv.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*	$NetBSD: getenv.c,v 1.36 2015/01/20 18:31:25 christos Exp $	*/
-
-/*
- * Copyright (c) 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getenv.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getenv.c,v 1.36 2015/01/20 18:31:25 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "env.h"
-#include "local.h"
-
-__weak_alias(getenv_r, _getenv_r)
-
-/*
- * getenv --
- *	Returns ptr to value associated with name, if any, else NULL.
- *	XXX: we cannot use getenv_r to implement this, because getenv()
- *	cannot use a shared buffer, because if it did, subsequent calls
- *	to getenv would trash previous results.
- */
-char *
-getenv(const char *name)
-{
-	size_t l_name;
-	char *result;
-
-	_DIAGASSERT(name != NULL);
-
-	l_name = __envvarnamelen(name, false);
-	if (l_name == 0)
-		return NULL;
-
-	result = NULL;
-	if (__readlockenv()) {
-		result = __findenvvar(name, l_name);
-		(void)__unlockenv();
-	}
-	
-	return result;
-}
-
-int
-getenv_r(const char *name, char *buf, size_t len)
-{
-	size_t l_name;
-	int rv;
-
-	_DIAGASSERT(name != NULL);
-
-	l_name = __envvarnamelen(name, false);
-	if (l_name == 0) {
-		errno = ENOENT;
-		return -1;
-	}
-
-	rv = -1;
-	if (__readlockenv()) {
-		const char *value;
-
-		value = __findenvvar(name, l_name);
-		if (value != NULL) {
-			if (strlcpy(buf, value, len) < len) {
-				rv = 0;
-			} else {
-				errno = ERANGE;
-			}
-		} else {
-			errno = ENOENT;
-		}
-		(void)__unlockenv();
-	}
-	
-	return rv;
-}
diff --git a/lib/libc/stdlib/getopt.3 b/lib/libc/stdlib/getopt.3
deleted file mode 100644
index facef2c1d..000000000
--- a/lib/libc/stdlib/getopt.3
+++ /dev/null
@@ -1,310 +0,0 @@
-.\"	$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.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)getopt.3	8.5 (Berkeley) 4/27/95
-.\"
-.Dd June 5, 2014
-.Dt GETOPT 3
-.Os
-.Sh NAME
-.Nm getopt
-.Nd get option character from command line argument list
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Vt extern char *optarg;
-.Vt extern int   optind;
-.Vt extern int   optopt;
-.Vt extern int   opterr;
-.Vt extern int   optreset;
-.Ft int
-.Fn getopt "int argc" "char * const argv[]" "const char *optstring"
-.Sh DESCRIPTION
-The
-.Fn getopt
-function incrementally parses a command line argument list
-.Fa argv
-and returns the next
-.Em known
-option character.
-An option character is
-.Em known
-if it has been specified in the string of accepted option characters,
-.Fa optstring .
-.Pp
-The option string
-.Fa optstring
-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
-.Nx
-extension.
-For example, an option string
-.Qq x
-recognizes an option
-.Dq Fl x ,
-and an option string
-.Qq x:
-recognizes an option and argument
-.Dq Fl x Ar argument .
-It does not matter to
-.Fn getopt
-if a following argument has leading whitespace.
-.Pp
-On return from
-.Fn getopt ,
-.Va optarg
-points to an option argument, if it is anticipated,
-and the variable
-.Va optind
-contains the index to the next
-.Fa argv
-argument for a subsequent call
-to
-.Fn getopt .
-The variable
-.Va optopt
-saves the last
-.Em known
-option character returned by
-.Fn getopt .
-.Pp
-The variables
-.Va opterr
-and
-.Va optind
-are both initialized to 1.
-The
-.Va optind
-variable may be set to another value before a set of calls to
-.Fn getopt
-in order to skip over more or less argv entries.
-.Pp
-In order to use
-.Fn getopt
-to evaluate multiple sets of arguments, or to evaluate a single set of
-arguments multiple times,
-the variable
-.Va optreset
-must be set to 1 before the second and each additional set of calls to
-.Fn getopt ,
-and the variable
-.Va optind
-must be reinitialized.
-.Pp
-The
-.Fn getopt
-function returns \-1 when the argument list is exhausted.
-The interpretation of options in the argument list may be cancelled
-by the option
-.Dq --
-(double dash) which causes
-.Fn getopt
-to signal the end of argument processing and return \-1.
-When all options have been processed (i.e., up to the first non-option
-argument),
-.Fn getopt
-returns \-1.
-.Sh RETURN VALUES
-The
-.Fn getopt
-function returns the next known option character in
-.Fa optstring .
-If
-.Fn getopt
-encounters a character not found in
-.Fa optstring
-or if it detects a missing option argument,
-it returns
-.Sq \&?
-(question mark).
-If
-.Fa optstring
-has a leading
-.Sq \&:
-then a missing option argument causes
-.Sq \&:
-to be returned instead of
-.Sq \&? .
-In either case, the variable
-.Va optopt
-is set to the character that caused the error.
-The
-.Fn getopt
-function returns \-1 when the argument list is exhausted.
-.Sh EXAMPLES
-.Bd -literal -compact
-extern char *optarg;
-extern int optind;
-int bflag, ch, fd;
-
-bflag = 0;
-while ((ch = getopt(argc, argv, "bf:")) != -1) {
-	switch (ch) {
-	case 'b':
-		bflag = 1;
-		break;
-	case 'f':
-		if ((fd = open(optarg, O_RDONLY, 0)) \*[Lt] 0) {
-			(void)fprintf(stderr,
-			    "myname: %s: %s\en", optarg, strerror(errno));
-			exit(1);
-		}
-		break;
-	case '?':
-	default:
-		usage();
-	}
-}
-argc -= optind;
-argv += optind;
-.Ed
-.Sh DIAGNOSTICS
-If the
-.Fn getopt
-function encounters a character not found in the string
-.Fa optstring
-or detects
-a missing option argument it writes an error message to
-.Em stderr
-and returns
-.Sq \&? .
-Setting
-.Va opterr
-to a zero will disable these error messages.
-If
-.Fa optstring
-has a leading
-.Sq \&:
-then a missing option argument causes a
-.Sq \&:
-to be returned in addition to suppressing any error messages.
-.Pp
-Option arguments are allowed to begin with
-.Sq - ;
-this is reasonable but reduces the amount of error checking possible.
-.Sh SEE ALSO
-.Xr getopt 1 ,
-.Xr getopt_long 3 ,
-.Xr getsubopt 3
-.Sh STANDARDS
-The
-.Va optreset
-variable was added to make it possible to call the
-.Fn getopt
-function multiple times.
-This is an extension to the
-.St -p1003.2
-specification.
-.Sh HISTORY
-The
-.Fn getopt
-function appeared in
-.Bx 4.3 .
-.Sh BUGS
-The
-.Fn getopt
-function was once specified to return
-.Dv EOF
-instead of \-1.
-This was changed by
-.St -p1003.2-92
-to decouple
-.Fn getopt
-from
-.In stdio.h .
-.Pp
-A single dash
-.Pq Sq -
-may be specified as a character in
-.Fa optstring ,
-however it should
-.Em never
-have an argument associated with it.
-This allows
-.Fn getopt
-to be used with programs that expect
-.Sq -
-as an option flag.
-This practice is wrong, and should not be used in any current development.
-It is provided for backward compatibility
-.Em only .
-Care should be taken not to use
-.Sq -
-as the first character in
-.Fa optstring
-to avoid a semantic conflict with
-.Tn GNU
-.Fn getopt ,
-which assigns different meaning to an
-.Fa optstring
-that begins with a
-.Sq - .
-By default, a single dash causes
-.Fn getopt
-to return \-1.
-.Pp
-It is also possible to handle digits as option letters.
-This allows
-.Fn getopt
-to be used with programs that expect a number
-.Pq Dq Li \-3
-as an option.
-This practice is wrong, and should not be used in any current development.
-It is provided for backward compatibility
-.Em only .
-The following code fragment works in most cases.
-.Bd -literal -offset indent
-int ch;
-long length;
-char *p;
-
-while ((ch = getopt(argc, argv, "0123456789")) != -1) {
-	switch (ch) {
-	case '0': case '1': case '2': case '3': case '4':
-	case '5': case '6': case '7': case '8': case '9':
-		p = argv[optind - 1];
-		if (p[0] == '-' \*[Am]\*[Am] p[1] == ch \*[Am]\*[Am] !p[2])
-			length = ch - '0';
-		else
-			length = strtol(argv[optind] + 1, NULL, 10);
-		break;
-	}
-}
-.Ed
diff --git a/lib/libc/stdlib/getopt.c b/lib/libc/stdlib/getopt.c
deleted file mode 100644
index 2049132bc..000000000
--- a/lib/libc/stdlib/getopt.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*	$NetBSD: getopt.c,v 1.29 2014/06/05 22:00:22 christos Exp $	*/
-
-/*
- * Copyright (c) 1987, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: getopt.c,v 1.29 2014/06/05 22:00:22 christos Exp $");
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(getopt,_getopt)
-#endif
-
-int	opterr = 1,		/* if error message should be printed */
-	optind = 1,		/* index into parent argv vector */
-	optopt,			/* character checked for validity */
-	optreset;		/* reset getopt */
-char	*optarg;		/* argument associated with option */
-
-#define	BADCH	(int)'?'
-#define	BADARG	(int)':'
-#define	EMSG	""
-
-/*
- * getopt --
- *	Parse argc/argv argument vector.
- */
-int
-getopt(int nargc, char * const nargv[], const char *ostr)
-{
-	static const char *place = EMSG;	/* option letter processing */
-	char *oli;				/* option letter list index */
-
-	_DIAGASSERT(nargv != NULL);
-	_DIAGASSERT(ostr != NULL);
-
-	if (optreset || *place == 0) {		/* update scanning pointer */
-		optreset = 0;
-		place = nargv[optind];
-		if (optind >= nargc || *place++ != '-') {
-			/* Argument is absent or is not an option */
-			place = EMSG;
-			return (-1);
-		}
-		optopt = *place++;
-		if (optopt == '-' && *place == 0) {
-			/* "--" => end of options */
-			++optind;
-			place = EMSG;
-			return (-1);
-		}
-		if (optopt == 0) {
-			/* Solitary '-', treat as a '-' option
-			   if the program (eg su) is looking for it. */
-			place = EMSG;
-			if (strchr(ostr, '-') == NULL)
-				return -1;
-			optopt = '-';
-		}
-	} else
-		optopt = *place++;
-
-	/* See if option letter is one the caller wanted... */
-	if (optopt == ':' || (oli = strchr(ostr, optopt)) == NULL) {
-		if (*place == 0)
-			++optind;
-		if (opterr && *ostr != ':')
-			(void)fprintf(stderr,
-			    "%s: unknown option -- %c\n", getprogname(),
-			    optopt);
-		return (BADCH);
-	}
-
-	/* Does this option need an argument? */
-	if (oli[1] != ':') {
-		/* don't need argument */
-		optarg = NULL;
-		if (*place == 0)
-			++optind;
-	} else {
-		/* Option-argument is either the rest of this argument or the
-		   entire next argument. */
-		if (*place)
-			optarg = __UNCONST(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 {
-			/* option-argument absent */
-			place = EMSG;
-			if (*ostr == ':')
-				return (BADARG);
-			if (opterr)
-				(void)fprintf(stderr,
-				    "%s: option requires an argument -- %c\n",
-				    getprogname(), optopt);
-			return (BADCH);
-		}
-		place = EMSG;
-		++optind;
-	}
-	return (optopt);			/* return option letter */
-}
diff --git a/lib/libc/stdlib/getopt_long.3 b/lib/libc/stdlib/getopt_long.3
deleted file mode 100644
index 6d0363170..000000000
--- a/lib/libc/stdlib/getopt_long.3
+++ /dev/null
@@ -1,310 +0,0 @@
-.\"	$NetBSD: getopt_long.3,v 1.18 2007/07/02 17:56:17 ginsbach Exp $
-.\"
-.\" Copyright (c) 1988, 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. 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.
-.\"
-.\"     @(#)getopt.3	8.5 (Berkeley) 4/27/95
-.\"
-.Dd July 2, 2007
-.Dt GETOPT_LONG 3
-.Os
-.Sh NAME
-.Nm getopt_long
-.Nd get long options from command line argument list
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In getopt.h
-.Ft int
-.Fn getopt_long "int argc" "char * const *argv" "const char *optstring" "struct option *long_options" "int *index"
-.Sh DESCRIPTION
-The
-.Fn getopt_long
-function is similar to
-.Xr getopt 3
-but it accepts options in two forms: words and characters.
-The
-.Fn getopt_long
-function provides a superset of the functionality of
-.Xr getopt 3 .
-.Fn getopt_long
-can be used in two ways.
-In the first way, every long option understood by the program has a
-corresponding short option, and the option structure is only used to
-translate from long options to short options.
-When used in this fashion,
-.Fn getopt_long
-behaves identically to
-.Xr getopt 3 .
-This is a good way to add long option processing to an existing program
-with the minimum of rewriting.
-.Pp
-In the second mechanism, a long option sets a flag in the
-.Fa option
-structure passed, or will store a pointer to the command line argument
-in the
-.Fa option
-structure passed to it for options that take arguments.
-Additionally, the long option's argument may be specified as a single
-argument with an equal sign, e.g.
-.Bd -literal
-myprogram --myoption=somevalue
-.Ed
-.Pp
-When a long option is processed the call to
-.Fn getopt_long
-will return 0.
-For this reason, long option processing without
-shortcuts is not backwards compatible with
-.Xr getopt 3 .
-.Pp
-It is possible to combine these methods, providing for long options
-processing with short option equivalents for some options.
-Less frequently used options would be processed as long options only.
-.Pp
-Abbreviated long option names are accepted when
-.Fn getopt_long
-processes long options if the abbreviation is unique.
-An exact match is always preferred for a defined long option.
-.Pp
-The
-.Fn getopt_long
-call requires a structure to be initialized describing the long options.
-The structure is:
-.Bd -literal
-struct option {
-	char *name;
-	int has_arg;
-	int *flag;
-	int val;
-};
-.Ed
-.Pp
-The
-.Fa name
-field should contain the option name without the leading double dash.
-.Pp
-The
-.Fa has_arg
-field should be one of:
-.Bl -tag -width "optional_argument"
-.It Li no_argument
-no argument to the option is expect.
-.It Li required_argument
-an argument to the option is required.
-.It Li optional_argument
-an argument to the option may be presented.
-.El
-.Pp
-If
-.Fa flag
-is not
-.Dv NULL ,
-then the integer pointed to by it will be set to the value in the
-.Fa val
-field.
-If the
-.Fa flag
-field is
-.Dv NULL ,
-then the
-.Fa val
-field will be returned.
-Setting
-.Fa flag
-to
-.Dv NULL
-and setting
-.Fa val
-to the corresponding short option will make this function act just
-like
-.Xr getopt 3 .
-.Pp
-If the
-.Fa index
-field is not
-.Dv NULL ,
-the integer it points to will be set to the index of the long option
-in the
-.Fa long_options
-array.
-.Pp
-The last element of the
-.Fa long_options
-array has to be filled with zeroes (see
-.Sx EXAMPLES
-section).
-.Sh EXAMPLES
-.Bd -literal -compact
-extern char *optarg;
-extern int optind;
-int bflag, ch, fd;
-int daggerset;
-
-/* options descriptor */
-static struct option longopts[] = {
-	{ "buffy",	no_argument,		0, 		'b' },
-	{ "fluoride",	required_argument,	0, 	       	'f' },
-	{ "daggerset",	no_argument,		\*[Am]daggerset,	1 },
-	{ NULL,		0,			NULL, 		0 }
-};
-
-bflag = 0;
-while ((ch = getopt_long(argc, argv, "bf:", longopts, NULL)) != -1)
-	switch (ch) {
-	case 'b':
-		bflag = 1;
-		break;
-	case 'f':
-		if ((fd = open(optarg, O_RDONLY, 0)) \*[Lt] 0) {
-			(void)fprintf(stderr,
-			    "myname: %s: %s\en", optarg, strerror(errno));
-			exit(1);
-		}
-		break;
-	case 0:
-		if(daggerset) {
-			fprintf(stderr,"Buffy will use her dagger to "
-				       "apply fluoride to dracula's teeth\en");
-		}
-		break;
-	case '?':
-	default:
-		usage();
-}
-argc -= optind;
-argv += optind;
-.Ed
-.Sh IMPLEMENTATION DIFFERENCES
-This section describes differences to the GNU implementation
-found in glibc-2.1.3:
-.Bl -tag -width "xxx"
-.It Li o
-handling of - as first char of option string in presence of
-environment variable POSIXLY_CORRECT:
-.Bl -tag -width "NetBSD"
-.It Li GNU
-ignores POSIXLY_CORRECT and returns non-options as
-arguments to option '\e1'.
-.It Li NetBSD
-honors POSIXLY_CORRECT and stops at the first non-option.
-.El
-.It Li o
-handling of :: in options string in presence of POSIXLY_CORRECT:
-.Bl -tag -width "NetBSD"
-.It Li Both
-GNU and NetBSD ignore POSIXLY_CORRECT here and take :: to
-mean the preceding option takes an optional argument.
-.El
-.It Li o
-return value in case of missing argument if first character
-(after + or -) in option string is not ':':
-.Bl -tag -width "NetBSD"
-.It Li GNU
-returns '?'
-.It NetBSD
-returns ':' (since NetBSD's getopt does).
-.El
-.It Li o
-handling of --a in getopt:
-.Bl -tag -width "NetBSD"
-.It Li GNU
-parses this as option '-', option 'a'.
-.It Li NetBSD
-parses this as '--', and returns \-1 (ignoring the a).
-(Because the original getopt does.)
-.El
-.It Li o
-setting of optopt for long options with flag !=
-.Dv NULL :
-.Bl -tag -width "NetBSD"
-.It Li GNU
-sets optopt to val.
-.It Li NetBSD
-sets optopt to 0 (since val would never be returned).
-.El
-.It Li o
-handling of -W with W; in option string in getopt (not getopt_long):
-.Bl -tag -width "NetBSD"
-.It Li GNU
-causes a segfault.
-.It Li NetBSD
-returns \-1, with optind pointing past the argument of -W
-(as if `-W arg' were `--arg', and thus '--' had been found).
-.\" How should we treat W; in the option string when called via
-.\" getopt?  Ignore the ';' or treat it as a ':'? Issue a warning?
-.El
-.It Li o
-setting of optarg for long options without an argument that are
-invoked via -W (W; in option string):
-.Bl -tag -width "NetBSD"
-.It Li GNU
-sets optarg to the option name (the argument of -W).
-.It Li NetBSD
-sets optarg to
-.Dv NULL
-(the argument of the long option).
-.El
-.It Li o
-handling of -W with an argument that is not (a prefix to) a known
-long option (W; in option string):
-.Bl -tag -width "NetBSD"
-.It Li GNU
-returns -W with optarg set to the unknown option.
-.It Li NetBSD
-treats this as an error (unknown option) and returns '?' with
-optopt set to 0 and optarg set to
-.Dv NULL
-(as GNU's man page documents).
-.El
-.It Li o
-The error messages are different.
-.It Li o
-NetBSD does not permute the argument vector at the same points in
-the calling sequence as GNU does.
-The aspects normally used by the caller
-(ordering after \-1 is returned, value of optind relative
-to current positions) are the same, though.
-(We do fewer variable swaps.)
-.El
-.Sh SEE ALSO
-.Xr getopt 3
-.Sh HISTORY
-The
-.Fn getopt_long
-function first appeared in GNU libiberty.
-The first
-.Nx
-implementation appeared in 1.5.
-.Sh BUGS
-The implementation can completely replace
-.Xr getopt 3 ,
-but right now we are using separate code.
-.Pp
-The
-.Fa argv
-argument is not really const.
diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c
deleted file mode 100644
index 532046425..000000000
--- a/lib/libc/stdlib/getopt_long.c
+++ /dev/null
@@ -1,479 +0,0 @@
-/*	$NetBSD: getopt_long.c,v 1.27 2015/09/01 19:39:57 kamil Exp $	*/
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dieter Baron and Thomas Klausner.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (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 HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: getopt_long.c,v 1.27 2015/09/01 19:39:57 kamil Exp $");
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#if HAVE_NBTOOL_CONFIG_H
-#include "compat_getopt.h"
-#else
-#include <getopt.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-
-#if HAVE_NBTOOL_CONFIG_H && !HAVE_GETOPT_LONG && !HAVE_DECL_OPTIND
-#define REPLACE_GETOPT
-#endif
-
-#ifdef REPLACE_GETOPT
-#ifdef __weak_alias
-__weak_alias(getopt,_getopt)
-#endif
-int	opterr = 1;		/* if error message should be printed */
-int	optind = 1;		/* index into parent argv vector */
-int	optopt = '?';		/* character checked for validity */
-int	optreset;		/* reset getopt */
-char    *optarg;		/* argument associated with option */
-#elif HAVE_NBTOOL_CONFIG_H && !HAVE_DECL_OPTRESET
-static int optreset;
-#endif
-
-#ifdef __weak_alias
-__weak_alias(getopt_long,_getopt_long)
-#endif
-
-#define IGNORE_FIRST	(*options == '-' || *options == '+')
-#define PRINT_ERROR	((opterr) && ((*options != ':') \
-				      || (IGNORE_FIRST && options[1] != ':')))
-#define IS_POSIXLY_CORRECT (getenv("POSIXLY_CORRECT") != NULL)
-#define PERMUTE         (!IS_POSIXLY_CORRECT && !IGNORE_FIRST)
-/* XXX: GNU ignores PC if *options == '-' */
-#define IN_ORDER        (!IS_POSIXLY_CORRECT && *options == '-')
-
-/* return values */
-#define	BADCH	(int)'?'
-#define	BADARG		((IGNORE_FIRST && options[1] == ':') \
-			 || (*options == ':') ? (int)':' : (int)'?')
-#define INORDER (int)1
-
-#define	EMSG	""
-
-static int getopt_internal(int, char **, const char *);
-static int gcd(int, int);
-static void permute_args(int, int, int, char **);
-
-static const char *place = EMSG; /* option letter processing */
-
-/* XXX: set optreset to 1 rather than these two */
-static int nonopt_start = -1; /* first non option argument (for permute) */
-static int nonopt_end = -1;   /* first option after non options (for permute) */
-
-/* Error messages */
-static const char recargchar[] = "option requires an argument -- %c";
-static const char recargstring[] = "option requires an argument -- %s";
-static const char ambig[] = "ambiguous option -- %.*s";
-static const char noarg[] = "option doesn't take an argument -- %.*s";
-static const char illoptchar[] = "unknown option -- %c";
-static const char illoptstring[] = "unknown option -- %s";
-
-
-/*
- * Compute the greatest common divisor of a and b.
- */
-static int
-gcd(int a, int b)
-{
-	int c;
-
-	c = a % b;
-	while (c != 0) {
-		a = b;
-		b = c;
-		c = a % b;
-	}
-	   
-	return b;
-}
-
-/*
- * Exchange the block from nonopt_start to nonopt_end with the block
- * from nonopt_end to opt_end (keeping the same order of arguments
- * in each block).
- */
-static void
-permute_args(int panonopt_start, int panonopt_end, int opt_end, char **nargv)
-{
-	int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
-	char *swap;
-
-	_DIAGASSERT(nargv != NULL);
-
-	/*
-	 * compute lengths of blocks and number and size of cycles
-	 */
-	nnonopts = panonopt_end - panonopt_start;
-	nopts = opt_end - panonopt_end;
-	ncycle = gcd(nnonopts, nopts);
-	cyclelen = (opt_end - panonopt_start) / ncycle;
-
-	for (i = 0; i < ncycle; i++) {
-		cstart = panonopt_end+i;
-		pos = cstart;
-		for (j = 0; j < cyclelen; j++) {
-			if (pos >= panonopt_end)
-				pos -= nnonopts;
-			else
-				pos += nopts;
-			swap = nargv[pos];
-			nargv[pos] = nargv[cstart];
-			nargv[cstart] = swap;
-		}
-	}
-}
-
-/*
- * getopt_internal --
- *	Parse argc/argv argument vector.  Called by user level routines.
- *  Returns -2 if -- is found (can be long option or end of options marker).
- */
-static int
-getopt_internal(int nargc, char **nargv, const char *options)
-{
-	char *oli;				/* option letter list index */
-	int optchar;
-
-	_DIAGASSERT(nargv != NULL);
-	_DIAGASSERT(options != NULL);
-
-	optarg = NULL;
-
-	/*
-	 * XXX Some programs (like rsyncd) expect to be able to
-	 * XXX re-initialize optind to 0 and have getopt_long(3)
-	 * XXX properly function again.  Work around this braindamage.
-	 */
-	if (optind == 0)
-		optind = 1;
-
-	if (optreset)
-		nonopt_start = nonopt_end = -1;
-start:
-	if (optreset || !*place) {		/* update scanning pointer */
-		optreset = 0;
-		if (optind >= nargc) {          /* end of argument vector */
-			place = EMSG;
-			if (nonopt_end != -1) {
-				/* do permutation, if we have to */
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				optind -= nonopt_end - nonopt_start;
-			}
-			else if (nonopt_start != -1) {
-				/*
-				 * If we skipped non-options, set optind
-				 * to the first of them.
-				 */
-				optind = nonopt_start;
-			}
-			nonopt_start = nonopt_end = -1;
-			return -1;
-		}
-		if ((*(place = nargv[optind]) != '-')
-		    || (place[1] == '\0')) {    /* found non-option */
-			place = EMSG;
-			if (IN_ORDER) {
-				/*
-				 * GNU extension: 
-				 * return non-option as argument to option 1
-				 */
-				optarg = nargv[optind++];
-				return INORDER;
-			}
-			if (!PERMUTE) {
-				/*
-				 * if no permutation wanted, stop parsing
-				 * at first non-option
-				 */
-				return -1;
-			}
-			/* do permutation */
-			if (nonopt_start == -1)
-				nonopt_start = optind;
-			else if (nonopt_end != -1) {
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				nonopt_start = optind -
-				    (nonopt_end - nonopt_start);
-				nonopt_end = -1;
-			}
-			optind++;
-			/* process next argument */
-			goto start;
-		}
-		if (nonopt_start != -1 && nonopt_end == -1)
-			nonopt_end = optind;
-		if (place[1] && *++place == '-') {	/* found "--" */
-			place++;
-			return -2;
-		}
-	}
-	if ((optchar = (int)*place++) == (int)':' ||
-	    (oli = strchr(options + (IGNORE_FIRST ? 1 : 0), optchar)) == NULL) {
-		/* option letter unknown or ':' */
-		if (!*place)
-			++optind;
-		if (PRINT_ERROR)
-			warnx(illoptchar, optchar);
-		optopt = optchar;
-		return BADCH;
-	}
-	if (optchar == 'W' && oli[1] == ';') {		/* -W long-option */
-		/* XXX: what if no long options provided (called by getopt)? */
-		if (*place) 
-			return -2;
-
-		if (++optind >= nargc) {	/* no arg */
-			place = EMSG;
-			if (PRINT_ERROR)
-				warnx(recargchar, optchar);
-			optopt = optchar;
-			return BADARG;
-		} else				/* white space */
-			place = nargv[optind];
-		/*
-		 * Handle -W arg the same as --arg (which causes getopt to
-		 * stop parsing).
-		 */
-		return -2;
-	}
-	if (*++oli != ':') {			/* doesn't take argument */
-		if (!*place)
-			++optind;
-	} else {				/* takes (optional) argument */
-		optarg = NULL;
-		if (*place)			/* no white space */
-			optarg = __UNCONST(place);
-		/* XXX: disable test for :: if PC? (GNU doesn't) */
-		else if (oli[1] != ':') {	/* arg not optional */
-			if (++optind >= nargc) {	/* no arg */
-				place = EMSG;
-				if (PRINT_ERROR)
-					warnx(recargchar, optchar);
-				optopt = optchar;
-				return BADARG;
-			} else
-				optarg = nargv[optind];
-		}
-		place = EMSG;
-		++optind;
-	}
-	/* dump back option letter */
-	return optchar;
-}
-
-#ifdef REPLACE_GETOPT
-/*
- * getopt --
- *	Parse argc/argv argument vector.
- *
- * [eventually this will replace the real getopt]
- */
-int
-getopt(int nargc, char * const *nargv, const char *options)
-{
-	int retval;
-
-	_DIAGASSERT(nargv != NULL);
-	_DIAGASSERT(options != NULL);
-
-	retval = getopt_internal(nargc, __UNCONST(nargv), options);
-	if (retval == -2) {
-		++optind;
-		/*
-		 * We found an option (--), so if we skipped non-options,
-		 * we have to permute.
-		 */
-		if (nonopt_end != -1) {
-			permute_args(nonopt_start, nonopt_end, optind,
-				       __UNCONST(nargv));
-			optind -= nonopt_end - nonopt_start;
-		}
-		nonopt_start = nonopt_end = -1;
-		retval = -1;
-	}
-	return retval;
-}
-#endif
-
-/*
- * getopt_long --
- *	Parse argc/argv argument vector.
- */
-int
-getopt_long(int nargc, char * const *nargv, const char *options,
-    const struct option *long_options, int *idx)
-{
-	int retval;
-
-#define IDENTICAL_INTERPRETATION(_x, _y)				\
-	(long_options[(_x)].has_arg == long_options[(_y)].has_arg &&	\
-	 long_options[(_x)].flag == long_options[(_y)].flag &&		\
-	 long_options[(_x)].val == long_options[(_y)].val)
-
-	_DIAGASSERT(nargv != NULL);
-	_DIAGASSERT(options != NULL);
-	_DIAGASSERT(long_options != NULL);
-	/* idx may be NULL */
-
-	retval = getopt_internal(nargc, __UNCONST(nargv), options);
-	if (retval == -2) {
-		char *current_argv, *has_equal;
-		size_t current_argv_len;
-		int i, ambiguous, match;
-
-		current_argv = __UNCONST(place);
-		match = -1;
-		ambiguous = 0;
-
-		optind++;
-		place = EMSG;
-
-		if (*current_argv == '\0') {		/* found "--" */
-			/*
-			 * We found an option (--), so if we skipped
-			 * non-options, we have to permute.
-			 */
-			if (nonopt_end != -1) {
-				permute_args(nonopt_start, nonopt_end,
-				    optind, __UNCONST(nargv));
-				optind -= nonopt_end - nonopt_start;
-			}
-			nonopt_start = nonopt_end = -1;
-			return -1;
-		}
-		if ((has_equal = strchr(current_argv, '=')) != NULL) {
-			/* argument found (--option=arg) */
-			current_argv_len = has_equal - current_argv;
-			has_equal++;
-		} else
-			current_argv_len = strlen(current_argv);
-	    
-		for (i = 0; long_options[i].name; i++) {
-			/* find matching long option */
-			if (strncmp(current_argv, long_options[i].name,
-			    current_argv_len))
-				continue;
-
-			if (strlen(long_options[i].name) ==
-			    (unsigned)current_argv_len) {
-				/* exact match */
-				match = i;
-				ambiguous = 0;
-				break;
-			}
-			if (match == -1)		/* partial match */
-				match = i;
-			else if (!IDENTICAL_INTERPRETATION(i, match))
-				ambiguous = 1;
-		}
-		if (ambiguous) {
-			/* ambiguous abbreviation */
-			if (PRINT_ERROR)
-				warnx(ambig, (int)current_argv_len,
-				     current_argv);
-			optopt = 0;
-			return BADCH;
-		}
-		if (match != -1) {			/* option found */
-		        if (long_options[match].has_arg == no_argument
-			    && has_equal) {
-				if (PRINT_ERROR)
-					warnx(noarg, (int)current_argv_len,
-					     current_argv);
-				/*
-				 * XXX: GNU sets optopt to val regardless of
-				 * flag
-				 */
-				if (long_options[match].flag == NULL)
-					optopt = long_options[match].val;
-				else
-					optopt = 0;
-				return BADARG;
-			}
-			if (long_options[match].has_arg == required_argument ||
-			    long_options[match].has_arg == optional_argument) {
-				if (has_equal)
-					optarg = has_equal;
-				else if (long_options[match].has_arg ==
-				    required_argument) {
-					/*
-					 * optional argument doesn't use
-					 * next nargv
-					 */
-					optarg = nargv[optind++];
-				}
-			}
-			if ((long_options[match].has_arg == required_argument)
-			    && (optarg == NULL)) {
-				/*
-				 * Missing argument; leading ':'
-				 * indicates no error should be generated
-				 */
-				if (PRINT_ERROR)
-					warnx(recargstring, current_argv);
-				/*
-				 * XXX: GNU sets optopt to val regardless
-				 * of flag
-				 */
-				if (long_options[match].flag == NULL)
-					optopt = long_options[match].val;
-				else
-					optopt = 0;
-				--optind;
-				return BADARG;
-			}
-		} else {			/* unknown option */
-			if (PRINT_ERROR)
-				warnx(illoptstring, current_argv);
-			optopt = 0;
-			return BADCH;
-		}
-		if (long_options[match].flag) {
-			*long_options[match].flag = long_options[match].val;
-			retval = 0;
-		} else 
-			retval = long_options[match].val;
-		if (idx)
-			*idx = match;
-	}
-	return retval;
-#undef IDENTICAL_INTERPRETATION
-}
diff --git a/lib/libc/stdlib/getsubopt.3 b/lib/libc/stdlib/getsubopt.3
deleted file mode 100644
index 9a791cb2c..000000000
--- a/lib/libc/stdlib/getsubopt.3
+++ /dev/null
@@ -1,148 +0,0 @@
-.\"	$NetBSD: getsubopt.3,v 1.14 2009/11/17 15:02:08 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 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. 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.
-.\"
-.\"     @(#)getsubopt.3	8.1 (Berkeley) 6/9/93
-.\"
-.Dd November 17, 2009
-.Dt GETSUBOPT 3
-.Os
-.Sh NAME
-.Nm getsubopt
-.Nd get sub options from an argument
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Vt extern char *suboptarg
-.Ft int
-.Fn getsubopt "char **optionp" "char * const *tokens" "char **valuep"
-.Sh DESCRIPTION
-The
-.Fn getsubopt
-function
-parses a string containing tokens delimited by one or more tab, space or
-comma
-.Pq Ql \&,
-characters.
-It is intended for use in parsing groups of option arguments provided
-as part of a utility command line.
-.Pp
-The argument
-.Fa optionp
-is a pointer to a pointer to the string.
-The argument
-.Fa tokens
-is a pointer to a
-.Dv NULL Ns -terminated
-array of pointers to strings.
-.Pp
-The
-.Fn getsubopt
-function
-returns the zero-based offset of the pointer in the
-.Fa tokens
-array referencing a string which matches the first token
-in the string, or \-1 if the string contains no tokens or
-.Fa tokens
-does not contain a matching string.
-.Pp
-If the token is of the form ``name=value'', the location referenced by
-.Fa valuep
-will be set to point to the start of the ``value'' portion of the token.
-.Pp
-On return from
-.Fn getsubopt ,
-.Fa optionp
-will be set to point to the start of the next token in the string,
-or the null at the end of the string if no more tokens are present.
-The external variable
-.Fa suboptarg
-will be set to point to the start of the current token, or
-.Dv NULL
-if no
-tokens were present.
-The argument
-.Fa valuep
-will be set to point to the ``value'' portion of the token, or
-.Dv NULL
-if no ``value'' portion was present.
-.Sh EXAMPLES
-.Bd -literal -compact
-char *tokens[] = {
-	#define	ONE	0
-		"one",
-	#define	TWO	1
-		"two",
-	NULL
-};
-
-\&...
-
-extern char *optarg, *suboptarg;
-char *options, *value;
-
-while ((ch = getopt(argc, argv, "ab:")) != \-1) {
-	switch(ch) {
-	case 'a':
-		/* process ``a'' option */
-		break;
-	case 'b':
-		options = optarg;
-		while (*options) {
-			switch(getsubopt(\*[Am]options, tokens, \*[Am]value)) {
-			case ONE:
-				/* process ``one'' sub option */
-				break;
-			case TWO:
-				/* process ``two'' sub option */
-				if (!value)
-					error("no value for two");
-				i = atoi(value);
-				break;
-			case \-1:
-				if (suboptarg)
-					error("unknown sub option %s",
-					  suboptarg);
-				else
-					error("missing sub option");
-				break;
-		}
-		break;
-	}
-.Ed
-.Sh SEE ALSO
-.Xr getopt 3 ,
-.Xr strsep 3
-.Sh HISTORY
-The
-.Fn getsubopt
-function first appeared in
-.Bx 4.4 ,
-and is included in
-.St -p1003.1-2008 .
diff --git a/lib/libc/stdlib/getsubopt.c b/lib/libc/stdlib/getsubopt.c
deleted file mode 100644
index d8481b1cd..000000000
--- a/lib/libc/stdlib/getsubopt.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*	$NetBSD: getsubopt.c,v 1.9 2012/06/25 22:32:45 abs Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)getsubopt.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: getsubopt.c,v 1.9 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(getsubopt,_getsubopt)
-#endif
-
-/*
- * The SVID interface to getsubopt provides no way of figuring out which
- * part of the suboptions list wasn't matched.  This makes error messages
- * tricky...  The extern variable suboptarg is a pointer to the token
- * which didn't match.
- */
-char *suboptarg;
-
-int
-getsubopt(char **optionp, char * const *tokens, char **valuep)
-{
-	int cnt;
-	char *p;
-
-	_DIAGASSERT(tokens != NULL);
-	_DIAGASSERT(valuep != NULL);
-	/* optionp is tested below */
-
-	suboptarg = *valuep = NULL;
-
-	if (!optionp || !*optionp)
-		return(-1);
-
-	/* skip leading white-space, commas */
-	for (p = *optionp; *p && (*p == ',' || *p == ' ' || *p == '\t'); ++p);
-
-	if (!*p) {
-		*optionp = p;
-		return(-1);
-	}
-
-	/* save the start of the token, and skip the rest of the token. */
-	for (suboptarg = p;
-	    *++p && *p != ',' && *p != '=' && *p != ' ' && *p != '\t';);
-
-	if (*p) {
-		/*
-		 * If there's an equals sign, set the value pointer, and
-		 * skip over the value part of the token.  Terminate the
-		 * token.
-		 */
-		if (*p == '=') {
-			*p = '\0';
-			for (*valuep = ++p;
-			    *p && *p != ',' && *p != ' ' && *p != '\t'; ++p);
-			if (*p) 
-				*p++ = '\0';
-		} else
-			*p++ = '\0';
-		/* Skip any whitespace or commas after this token. */
-		for (; *p && (*p == ',' || *p == ' ' || *p == '\t'); ++p);
-	}
-
-	/* set optionp for next round. */
-	*optionp = p;
-
-	for (cnt = 0; *tokens; ++tokens, ++cnt)
-		if (!strcmp(suboptarg, *tokens))
-			return(cnt);
-	return(-1);
-}
diff --git a/lib/libc/stdlib/grantpt.3 b/lib/libc/stdlib/grantpt.3
deleted file mode 100644
index 6da0e9067..000000000
--- a/lib/libc/stdlib/grantpt.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\" $NetBSD: grantpt.3,v 1.4 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2004 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 25, 2004
-.Dt GRANTPT 3
-.Os
-.Sh NAME
-.Nm grantpt
-.Nd grant access to a slave pseudo-terminal device
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn grantpt "int fildes"
-.Sh DESCRIPTION
-The
-.Fn grantpt
-function changes the mode and ownership of the slave pseudo-terminal device
-that corresponds to the master pseudo-terminal device associated with
-.Fa fildes
-to be owned by the real user id of the calling process, group id of
-.Dv tty .
-The permissions are set to readable and writable by owner, and writable by
-group.
-If the slave pseudo-terminal device was being accessed by other file
-descriptors at the time, all such access will be revoked.
-.Sh RETURN VALUES
-If successful,
-.Fn grantpt
-returns 0; otherwise a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn grantpt
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCESS
-the corresponding pseudo-terminal device could not be accessed.
-.It Bq Er EBADF
-.Fa fildes
-is not a valid descriptor.
-.It Bq Er EINVAL
-.Fa fildes
-is not associated with a master pseudo-terminal device.
-.El
-.Sh NOTES
-Setting the group to
-.Dv tty
-and revoking accesses by other file descriptors are
-.Nx
-extensions.
-Calling
-.Fn grantpt
-is equivalent to:
-.Bd -literal
-	ioctl(fildes, TIOCGRANTPT, 0);
-.Ed
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr posix_openpt 3 ,
-.Xr ptsname 3 ,
-.Xr unlockpt 3
-.Sh STANDARDS
-The
-.Fn grantpt
-function conforms to
-.St -p1003.1-2001 .
-Its first release was in
-.St -xpg4.2 .
diff --git a/lib/libc/stdlib/hcreate.3 b/lib/libc/stdlib/hcreate.3
deleted file mode 100644
index 129a282b6..000000000
--- a/lib/libc/stdlib/hcreate.3
+++ /dev/null
@@ -1,333 +0,0 @@
-.\" 	$NetBSD: hcreate.3,v 1.13 2014/07/20 20:17:21 christos Exp $
-.\"
-.\" Copyright (c) 1999 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.
-.\"
-.Dd July 20, 2014
-.Dt HCREATE 3
-.Os
-.Sh NAME
-.Nm hcreate ,
-.Nm hcreate_r ,
-.Nm hdestroy ,
-.Nm hdestroy1 ,
-.Nm hdestroy_r ,
-.Nm hdestroy1_r ,
-.Nm hsearch ,
-.Nm hsearch_r
-.Nd manage hash search table
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.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"
-.Ft void
-.Fn hdestroy1 "void (*freekey)(void *)" "void (*freedata)(void *)"
-.Ft void
-.Fn hdestroy_r "struct hsearch_data *table"
-.Ft void
-.Fn hdestroy1_r "struct hsearch_data *table" "void (*freekey)(void *)" "void (*freedata)(void *)"
-.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 hdestroy1 ,
-.Fn hdestroy1_r
-.Fn hsearch ,
-and
-.Fn hsearch_r
-functions manage hash search tables.
-.Pp
-The
-.Fn hcreate
-function allocates and initializes the table.
-The
-.Fa nel
-argument specifies an estimate of the maximum number of entries to be held
-by the table.
-Unless further memory allocation fails, supplying an insufficient
-.Fa nel
-value will not result in functional harm, although a performance degradation
-may occur.
-Initialization using the
-.Fn hcreate
-function is mandatory prior to any access operations using
-.Fn hsearch .
-.Pp
-The
-.Fn hdestroy
-function destroys a table previously created using
-.Fn hcreate .
-After a call to
-.Fn hdestroy ,
-the data can no longer be accessed.
-.Pp
-The
-.Fn hsearch
-function is used to search to the hash table.
-It returns a pointer into the
-hash table indicating the address of an item.
-The
-.Fa item
-argument is of type
-.Vt ENTRY ,
-defined in the
-.In search.h
-header.
-This is a structure type that contains two pointers:
-.Pp
-.Bl -tag -compact -offset indent -width "void *data "
-.It Fa char *key
-comparison key
-.It Fa void *data
-pointer to data associated with
-.Fa key
-.El
-.Pp
-The key comparison function used by
-.Fn hsearch
-is
-.Xr strcmp 3 .
-.Pp
-The
-.Fa action
-argument is of type
-.Vt ACTION ,
-an enumeration type which defines the following values:
-.Bl -tag -offset indent -width ENTERXX
-.It Dv ENTER
-Insert
-.Fa item
-into the hash table.
-If an existing item with the same key is found, it is not replaced.
-Note that the
-.Fa key
-and
-.Fa data
-elements of
-.Fa item
-are used directly by the new table entry.
-The storage for the
-key must not be modified during the lifetime of the hash table.
-.It Dv FIND
-Search the hash table without inserting
-.Fa item .
-.El
-.Pp
-The traditional
-.Fn hdestroy
-and
-.Fn hdestroy_r
-functions don't
-.Xr free 3
-the data associated with the
-.Fa key
-and
-.Fa value
-of each entry, because they did not allocate them.
-Since there is no
-.Dq iterator
-function provided, the
-.Fn hdestroy1
-and
-.Fn hdestroy1_r
-allow controlling how the
-.Fa key
-or
-.Fa value
-will be freed using the
-provided functions in the
-.Fa freekey
-and
-.Fa freedata
-arguments.
-If they are
-.Dv NULL ,
-then
-.Fa key
-and
-.Fa value
-are not freed.
-.Pp
-The
-.Fn hcreate_r ,
-.Fn hdestroy_r ,
-.Fn hdestroy1_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
-If successful, the
-.Fn hcreate
-and
-.Fn hcreate_r
-functions return a non-zero value.
-Otherwise, a value of
-.Dv 0
-is returned and
-.Va errno
-is set to indicate the error.
-.Pp
-The
-.Fn hdestroy
-and
-.Fn hdestroy_r
-functions return no value.
-.Pp
-If successful, the
-.Fn hsearch
-function returns a pointer to hash table entry matching
-the provided key.
-If the action is
-.Dv FIND
-and the item was not found, or if the action is
-.Dv ENTER
-and the insertion failed,
-.Dv NULL
-is returned and
-.Va errno
-is set to indicate the error.
-If the action is
-.Dv ENTER
-and an entry already existed in the table matching the given
-key, the existing entry is returned and is not replaced.
-.Pp
-The
-.Fn hsearch_r
-function returns
-.Dv 1
-unless the table is full, when it returns
-.Dv 0 .
-If
-.Fn hsearch
-returns
-.Dv 0
-or the element is not found,
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn hcreate ,
-.Fn hcreate_r ,
-.Fn hsearch
-and
-.Fn hsearch_r
-functions will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-Insufficient memory is available.
-.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 free 3 ,
-.Xr lsearch 3 ,
-.Xr malloc 3 ,
-.Xr strcmp 3
-.Sh STANDARDS
-The
-.Fn hcreate ,
-.Fn hdestroy
-and
-.Fn hsearch
-functions conform to
-.St -xpg4.2 .
-.Sh HISTORY
-The
-.Fn hcreate ,
-.Fn hdestroy
-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.
-The
-.Fn hdestroy1
-and
-.Fn hdestroy1_r
-are
-.Nx
-extensions.
-.Sh CAVEATS
-At least the following limitations can be mentioned:
-.Bl -bullet
-.It
-The original,
-.Pf non- Tn GNU
-interface permits the use of only one hash table at a time.
-.It
-Individual hash table entries can be added, but not deleted.
-.It
-There is no iterator to scan for all entries in the table.
-.El
diff --git a/lib/libc/stdlib/hcreate.c b/lib/libc/stdlib/hcreate.c
deleted file mode 100644
index cab145d13..000000000
--- a/lib/libc/stdlib/hcreate.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/* $NetBSD: hcreate.c,v 1.10 2014/07/20 20:17:21 christos Exp $ */
-
-/*
- * Copyright (c) 2001 Christopher G. Demetriou
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-/*
- * hcreate() / hsearch() / hdestroy()
- *
- * SysV/XPG4 hash table functions.
- *
- * Implementation done based on NetBSD manual page and Solaris manual page,
- * plus my own personal experience about how they're supposed to work.
- *
- * I tried to look at Knuth (as cited by the Solaris manual page), but
- * nobody had a copy in the office, so...
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: hcreate.c,v 1.10 2014/07/20 20:17:21 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if !defined(lint)
-__COPYRIGHT("@(#) Copyright (c) 2001\
- Christopher G. Demetriou.  All rights reserved.");
-#endif /* not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <search.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/queue.h>
-
-/*
- * DO NOT MAKE THIS STRUCTURE LARGER THAN 32 BYTES (4 ptrs on 64-bit
- * ptr machine) without adjusting MAX_BUCKETS_LG2 below.
- */
-struct internal_entry {
-	SLIST_ENTRY(internal_entry) link;
-	ENTRY ent;
-};
-SLIST_HEAD(internal_head, internal_entry);
-
-#define	MIN_BUCKETS_LG2	4
-#define	MIN_BUCKETS	(1 << MIN_BUCKETS_LG2)
-
-/*
- * max * sizeof internal_entry must fit into size_t.
- * assumes internal_entry is <= 32 (2^5) bytes.
- */
-#define	MAX_BUCKETS_LG2	(sizeof (size_t) * 8 - 1 - 5)
-#define	MAX_BUCKETS	((size_t)1 << MAX_BUCKETS_LG2)
-
-/* Default hash function, from db/hash/hash_func.c */
-extern u_int32_t (*__default_hash)(const void *, size_t);
-
-static struct hsearch_data htable;
-
-int
-hcreate(size_t nel)
-{
-	_DIAGASSERT(htable.table == NULL);
-
-	/* Make sure this isn't called when a table already exists. */
-	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)
-		nel = MIN_BUCKETS;
-
-	/* If it's too large, cap it. */
-	if (nel > MAX_BUCKETS)
-		nel = MAX_BUCKETS;
-
-	/* If it's is not a power of two in size, round up. */
-	if ((nel & (nel - 1)) != 0) {
-		for (p2 = 0; nel != 0; p2++)
-			nel >>= 1;
-		_DIAGASSERT(p2 <= MAX_BUCKETS_LG2);
-		nel = 1 << p2;
-	}
-	
-	/* Allocate the table. */
-	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 < nel; idx++)
-		SLIST_INIT(&table[idx]);
-
-	return 1;
-}
-
-void
-hdestroy1(void (*freekey)(void *), void (*freedata)(void *))
-{
-	_DIAGASSERT(htable.table != NULL);
-	hdestroy1_r(&htable, freekey, freedata);
-}
-
-void
-hdestroy(void)
-{
-	hdestroy1(NULL, NULL);
-}
-
-void
-hdestroy1_r(struct hsearch_data *head, void (*freekey)(void *),
-    void (*freedata)(void *))
-{
-	struct internal_entry *ie;
-	size_t idx;
-	void *p;
-	struct internal_head *table;
-
-	if (head == NULL)
-		return;
-
-	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);
-			if (freekey)
-				(*freekey)(ie->ent.key);
-			if (freedata)
-				(*freedata)(ie->ent.data);
-			free(ie);
-		}
-	}
-	free(table);
-}
-
-void
-hdestroy_r(struct hsearch_data *head)
-{
-	hdestroy1_r(head, NULL, NULL);
-}
-
-ENTRY *
-hsearch(ENTRY item, ACTION action)
-{
-	ENTRY *ep;
-	_DIAGASSERT(htable.table != NULL);
-	(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;
-
-	_DIAGASSERT(item.key != NULL);
-	_DIAGASSERT(action == ENTER || action == FIND);
-
-	p = head->table;
-	table = p;
-
-	len = strlen(item.key);
-	hashval = (*__default_hash)(item.key, len);
-
-	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) {
-		*itemp = &ie->ent;
-		return 1;
-	} else if (action == FIND) {
-		*itemp = NULL;
-		errno = ESRCH;
-		return 1;
-	}
-
-	ie = malloc(sizeof *ie);
-	if (ie == NULL)
-		return 0;
-	ie->ent.key = item.key;
-	ie->ent.data = item.data;
-
-	SLIST_INSERT_HEAD(chain, ie, link);
-	*itemp = &ie->ent;
-	head->filled++;
-	return 1;
-}
diff --git a/lib/libc/stdlib/imaxabs.c b/lib/libc/stdlib/imaxabs.c
deleted file mode 100644
index f7fe28c9b..000000000
--- a/lib/libc/stdlib/imaxabs.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: imaxabs.c,v 1.1 2008/08/04 21:29:27 matt Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if !defined(lint)
-__RCSID("$NetBSD: imaxabs.c,v 1.1 2008/08/04 21:29:27 matt Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <inttypes.h>
-
-#ifdef __weak_alias
-__weak_alias(imaxabs, _imaxabs)
-#endif
-
-intmax_t
-imaxabs(intmax_t i)
-{
-	return i < 0 ? -i : i;
-}
diff --git a/lib/libc/stdlib/imaxdiv.c b/lib/libc/stdlib/imaxdiv.c
deleted file mode 100644
index f9e1dc1d1..000000000
--- a/lib/libc/stdlib/imaxdiv.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: imaxdiv.c,v 1.1 2008/08/04 21:29:27 matt Exp $	*/
-
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  Aimax rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the foimaxowing conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the foimaxowing disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the foimaxowing disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "from: @(#)ldiv.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: imaxdiv.c,v 1.1 2008/08/04 21:29:27 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <inttypes.h>		/* imaxdiv_t */
-
-#ifdef __weak_alias
-__weak_alias(imaxdiv, _imaxdiv)
-#endif
-
-/* LONGLONG */
-imaxdiv_t
-imaxdiv(intmax_t num, intmax_t denom)
-{
-	imaxdiv_t r;
-
-	/* see div.c for comments */
-
-	r.quot = num / denom;
-	r.rem = num % denom;
-	if (num >= 0 && r.rem < 0) {
-		r.quot++;
-		r.rem -= denom;
-	}
-	return (r);
-}
diff --git a/lib/libc/stdlib/insque.3 b/lib/libc/stdlib/insque.3
deleted file mode 100644
index fdb86b7d8..000000000
--- a/lib/libc/stdlib/insque.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\" Copyright (c) 1993 John Brezak
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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 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: insque.3,v 1.5 2010/04/30 10:24:02 jruoho Exp $
-.\"
-.Dd April 30, 2010
-.Dt INSQUE 3
-.Os
-.Sh NAME
-.Nm insque ,
-.Nm remque
-.Nd insert/remove element from a queue
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In search.h
-.Ft void
-.Fn insque "void *elem" "void *pred"
-.Ft void
-.Fn remque "void *elem"
-.Sh DESCRIPTION
-.Fn insque
-and
-.Fn remque
-manipulate queues built from doubly linked lists.
-The queue can be either circular or linear.
-The functions expect their
-arguments to point to a structure whose first and second members are
-pointers to the next and previous element, respectively.
-The
-.Fn insque
-function also allows the
-.Fa pred
-argument to be a
-.Dv NULL
-pointer for the initialization of a new linear list's
-head element.
-.Sh STANDARDS
-The
-.Fn insque
-and
-.Fn remque
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn insque
-and
-.Fn remque
-are derived from the
-.Sq insque
-and
-.Sq remque
-instructions on the
-.Tn VAX .
-They first appeared in
-.Bx 4.2 .
diff --git a/lib/libc/stdlib/insque.c b/lib/libc/stdlib/insque.c
deleted file mode 100644
index 09020ae2a..000000000
--- a/lib/libc/stdlib/insque.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 1993 John Brezak
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must 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 be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: insque.c,v 1.3 2012/06/25 22:32:45 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <search.h>
-
-struct qelem {
-        struct qelem *q_forw;
-        struct qelem *q_back;
-};
-
-void
-insque(void *entry, void *pred)
-{
-	struct qelem *e = (struct qelem *) entry;
-	struct qelem *p = (struct qelem *) pred;
-
-	_DIAGASSERT(e != 0);
-
-	e->q_back = p;
-	if (p) {
-		e->q_forw = p->q_forw;
-		if (p->q_forw)
-			p->q_forw->q_back = e;
-		p->q_forw = e;
-	} else
-		e->q_forw = 0;
-}
diff --git a/lib/libc/stdlib/jemalloc.3 b/lib/libc/stdlib/jemalloc.3
deleted file mode 100644
index 73c12d638..000000000
--- a/lib/libc/stdlib/jemalloc.3
+++ /dev/null
@@ -1,388 +0,0 @@
-.\" $NetBSD $
-.\"
-.\" Copyright (c) 1980, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)malloc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.73 2007/06/15 22:32:33 jasone Exp $
-.\"
-.Dd June 21, 2011
-.Dt JEMALLOC 3
-.Os
-.Sh NAME
-.Nm jemalloc
-.Nd the default system allocator
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.Ft const char *
-.Va _malloc_options ;
-.Sh DESCRIPTION
-The
-.Nm
-is a general-purpose concurrent
-.Xr malloc 3
-implementation specifically designed to be scalable
-on modern multi-processor systems.
-It is the default user space system allocator in
-.Nx .
-.Pp
-When the first call is made to one of the memory allocation
-routines such as
-.Fn malloc
-or
-.Fn realloc ,
-various flags that affect the workings of the allocator are set or reset.
-These are described below.
-.Pp
-The
-.Dq name
-of the file referenced by the symbolic link named
-.Pa /etc/malloc.conf ,
-the value of the environment variable
-.Ev MALLOC_OPTIONS ,
-and the string pointed to by the global variable
-.Va _malloc_options
-will be interpreted, in that order, character by character as flags.
-.Pp
-Most flags are single letters.
-Uppercase letters indicate that the behavior is set, or on,
-and lowercase letters mean that the behavior is not set, or off.
-The following options are available.
-.Bl -tag -width "A   " -offset 3n
-.It Em A
-All warnings (except for the warning about unknown
-flags being set) become fatal.
-The process will call
-.Xr abort 3
-in these cases.
-.It Em H
-Use
-.Xr madvise 2
-when pages within a chunk are no longer in use, but the chunk as a whole cannot
-yet be deallocated.
-This is primarily of use when swapping is a real possibility, due to the high
-overhead of the
-.Fn madvise
-system call.
-.It Em J
-Each byte of new memory allocated by
-.Fn malloc ,
-.Fn realloc
-will be initialized to 0xa5.
-All memory returned by
-.Fn free ,
-.Fn realloc
-will be initialized to 0x5a.
-This is intended for debugging and will impact performance negatively.
-.It Em K
-Increase/decrease the virtual memory chunk size by a factor of two.
-The default chunk size is 1 MB.
-This option can be specified multiple times.
-.It Em N
-Increase/decrease the number of arenas by a factor of two.
-The default number of arenas is four times the number of CPUs, or one if there
-is a single CPU.
-This option can be specified multiple times.
-.It Em P
-Various statistics are printed at program exit via an
-.Xr atexit 3
-function.
-This has the potential to cause deadlock for a multi-threaded process that exits
-while one or more threads are executing in the memory allocation functions.
-Therefore, this option should only be used with care; it is primarily intended
-as a performance tuning aid during application development.
-.It Em Q
-Increase/decrease the size of the allocation quantum by a factor of two.
-The default quantum is the minimum allowed by the architecture (typically 8 or
-16 bytes).
-This option can be specified multiple times.
-.It Em S
-Increase/decrease the size of the maximum size class that is a multiple of the
-quantum by a factor of two.
-Above this size, power-of-two spacing is used for size classes.
-The default value is 512 bytes.
-This option can be specified multiple times.
-.It Em U
-Generate
-.Dq utrace
-entries for
-.Xr ktrace 1 ,
-for all operations.
-Consult the source for details on this option.
-.It Em V
-Attempting to allocate zero bytes will return a
-.Dv NULL
-pointer instead of a valid pointer.
-(The default behavior is to make a minimal allocation and return a
-pointer to it.)
-This option is provided for System V compatibility.
-This option is incompatible with the
-.Em X
-option.
-.It Em X
-Rather than return failure for any allocation function,
-display a diagnostic message on
-.Dv stderr
-and cause the program to drop
-core (using
-.Xr abort 3 ) .
-This option should be set at compile time by including the following in
-the source code:
-.Bd -literal -offset indent
-_malloc_options = "X";
-.Ed
-.Pp
-.It Em Z
-Each byte of new memory allocated by
-.Fn malloc ,
-.Fn realloc
-will be initialized to 0.
-Note that this initialization only happens once for each byte, so
-.Fn realloc
-does not zero memory that was previously allocated.
-This is intended for debugging and will impact performance negatively.
-.El
-.Pp
-Extra care should be taken when enabling
-any of the options in production environments.
-The
-.Em A ,
-.Em J ,
-and
-.Em Z
-options are intended for testing and debugging.
-An application which changes its behavior when these options are used
-is flawed.
-.Sh IMPLEMENTATION NOTES
-The
-.Nm
-allocator uses multiple arenas in order to reduce lock
-contention for threaded programs on multi-processor systems.
-This works well with regard to threading scalability, but incurs some costs.
-There is a small fixed per-arena overhead, and additionally, arenas manage
-memory completely independently of each other, which means a small fixed
-increase in overall memory fragmentation.
-These overheads are not generally an issue,
-given the number of arenas normally used.
-Note that using substantially more arenas than the default is not likely to
-improve performance, mainly due to reduced cache performance.
-However, it may make sense to reduce the number of arenas if an application
-does not make much use of the allocation functions.
-.Pp
-Memory is conceptually broken into equal-sized chunks,
-where the chunk size is a power of two that is greater than the page size.
-Chunks are always aligned to multiples of the chunk size.
-This alignment makes it possible to find
-metadata for user objects very quickly.
-.Pp
-User objects are broken into three categories according to size:
-.Bl -enum -offset 3n
-.It
-Small objects are smaller than one page.
-.It
-Large objects are smaller than the chunk size.
-.It
-Huge objects are a multiple of the chunk size.
-.El
-.Pp
-Small and large objects are managed by arenas; huge objects are managed
-separately in a single data structure that is shared by all threads.
-Huge objects are used by applications infrequently enough that this single
-data structure is not a scalability issue.
-.Pp
-Each chunk that is managed by an arena tracks its contents in a page map as
-runs of contiguous pages (unused, backing a set of small objects, or backing
-one large object).
-The combination of chunk alignment and chunk page maps makes it possible to
-determine all metadata regarding small and large allocations in constant time.
-.Pp
-Small objects are managed in groups by page runs.
-Each run maintains a bitmap that tracks which regions are in use.
-Allocation requests can be grouped as follows.
-.Pp
-.Bl -bullet -offset 3n
-.It
-Allocation requests that are no more than half the quantum (see the
-.Em Q
-option) are rounded up to the nearest power of two (typically 2, 4, or 8).
-.It
-Allocation requests that are more than half the quantum, but no more than the
-maximum quantum-multiple size class (see the
-.Em S
-option) are rounded up to the nearest multiple of the quantum.
-.It
-Allocation requests that are larger than the maximum quantum-multiple size
-class, but no larger than one half of a page, are rounded up to the nearest
-power of two.
-.It
-Allocation requests that are larger than half of a page, but small enough to
-fit in an arena-managed chunk (see the
-.Em K
-option), are rounded up to the nearest run size.
-.It
-Allocation requests that are too large to fit in an arena-managed chunk are
-rounded up to the nearest multiple of the chunk size.
-.El
-.Pp
-Allocations are packed tightly together, which can be an issue for
-multi-threaded applications.
-If you need to assure that allocations do not suffer from cache line sharing,
-round your allocation requests up to the nearest multiple of the cache line
-size.
-.Sh DEBUGGING
-The first thing to do is to set the
-.Em A
-option.
-This option forces a coredump (if possible) at the first sign of trouble,
-rather than the normal policy of trying to continue if at all possible.
-.Pp
-It is probably also a good idea to recompile the program with suitable
-options and symbols for debugger support.
-.Pp
-If the program starts to give unusual results, coredump or generally behave
-differently without emitting any of the messages mentioned in the next
-section, it is likely because it depends on the storage being filled with
-zero bytes.
-Try running it with the
-.Em Z
-option set;
-if that improves the situation, this diagnosis has been confirmed.
-If the program still misbehaves,
-the likely problem is accessing memory outside the allocated area.
-.Pp
-Alternatively, if the symptoms are not easy to reproduce, setting the
-.Em J
-option may help provoke the problem.
-In truly difficult cases, the
-.Em U
-option, if supported by the kernel, can provide a detailed trace of
-all calls made to these functions.
-.Pp
-Unfortunately,
-.Nm
-does not provide much detail about the problems it detects;
-the performance impact for storing such information would be prohibitive.
-There are a number of allocator implementations available on the Internet
-which focus on detecting and pinpointing problems by trading performance for
-extra sanity checks and detailed diagnostics.
-.Sh ENVIRONMENT
-The following environment variables affect the execution of the allocation
-functions:
-.Bl -tag -width ".Ev MALLOC_OPTIONS"
-.It Ev MALLOC_OPTIONS
-If the environment variable
-.Ev MALLOC_OPTIONS
-is set, the characters it contains will be interpreted as flags to the
-allocation functions.
-.El
-.Sh EXAMPLES
-To dump core whenever a problem occurs:
-.Pp
-.Bd -literal -offset indent
-ln -s 'A' /etc/malloc.conf
-.Ed
-.Pp
-To specify in the source that a program does no return value checking
-on calls to these functions:
-.Bd -literal -offset indent
-_malloc_options = "X";
-.Ed
-.Sh DIAGNOSTICS
-If any of the memory allocation/deallocation functions detect an error or
-warning condition, a message will be printed to file descriptor
-.Dv STDERR_FILENO .
-Errors will result in the process dumping core.
-If the
-.Em A
-option is set, all warnings are treated as errors.
-.Pp
-.\"
-.\" XXX: The _malloc_message should be documented
-.\"	 better in order to be worth mentioning.
-.\"
-The
-.Va _malloc_message
-variable allows the programmer to override the function which emits
-the text strings forming the errors and warnings if for some reason
-the
-.Dv stderr
-file descriptor is not suitable for this.
-Please note that doing anything which tries to allocate memory in
-this function is likely to result in a crash or deadlock.
-.Pp
-All messages are prefixed by
-.Dq Ao Ar progname Ac Ns Li \&: Pq malloc .
-.Sh SEE ALSO
-.Xr emalloc 3 ,
-.Xr malloc 3 ,
-.Xr memory 3 ,
-.Xr memoryallocators 9
-.\"
-.\" XXX: Add more references that could be worth reading.
-.\"
-.Rs
-.%A Jason Evans
-.%T "A Scalable Concurrent malloc(3) Implementation for FreeBSD"
-.%D April 16, 2006
-.%O BSDCan 2006
-.%U http://people.freebsd.org/~jasone/jemalloc/bsdcan2006/jemalloc.pdf
-.Re
-.Rs
-.%A Poul-Henning Kamp
-.%T "Malloc(3) revisited"
-.%I USENIX Association
-.%B Proceedings of the FREENIX Track: 1998 USENIX Annual Technical Conference
-.%D June 15-19, 1998
-.%U http://www.usenix.org/publications/library/proceedings/usenix98/freenix/kamp.pdf
-.Re
-.Rs
-.%A Paul R. Wilson
-.%A Mark S. Johnstone
-.%A Michael Neely
-.%A David Boles
-.%T "Dynamic Storage Allocation: A Survey and Critical Review"
-.%D 1995
-.%I University of Texas at Austin
-.%U ftp://ftp.cs.utexas.edu/pub/garbage/allocsrv.ps
-.Re
-.Sh HISTORY
-The
-.Nm
-allocator became the default system allocator first in
-.Fx 7.0
-and then in
-.Nx 5.0 .
-In both systems it replaced the older so-called
-.Dq phkmalloc
-implementation.
-.Sh AUTHORS
-.An Jason Evans Aq Mt jasone@canonware.com
diff --git a/lib/libc/stdlib/jemalloc.c b/lib/libc/stdlib/jemalloc.c
deleted file mode 100644
index 32819f752..000000000
--- a/lib/libc/stdlib/jemalloc.c
+++ /dev/null
@@ -1,4016 +0,0 @@
-/*	$NetBSD: jemalloc.c,v 1.38 2015/07/26 17:21:55 martin Exp $	*/
-
-/*-
- * Copyright (C) 2006,2007 Jason Evans <jasone@FreeBSD.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *******************************************************************************
- *
- * This allocator implementation is designed to provide scalable performance
- * for multi-threaded programs on multi-processor systems.  The following
- * features are included for this purpose:
- *
- *   + Multiple arenas are used if there are multiple CPUs, which reduces lock
- *     contention and cache sloshing.
- *
- *   + Cache line sharing between arenas is avoided for internal data
- *     structures.
- *
- *   + Memory is managed in chunks and runs (chunks can be split into runs),
- *     rather than as individual pages.  This provides a constant-time
- *     mechanism for associating allocations with particular arenas.
- *
- * Allocation requests are rounded up to the nearest size class, and no record
- * of the original request size is maintained.  Allocations are broken into
- * categories according to size class.  Assuming runtime defaults, 4 kB pages
- * and a 16 byte quantum, the size classes in each category are as follows:
- *
- *   |=====================================|
- *   | Category | Subcategory    |    Size |
- *   |=====================================|
- *   | Small    | Tiny           |       2 |
- *   |          |                |       4 |
- *   |          |                |       8 |
- *   |          |----------------+---------|
- *   |          | Quantum-spaced |      16 |
- *   |          |                |      32 |
- *   |          |                |      48 |
- *   |          |                |     ... |
- *   |          |                |     480 |
- *   |          |                |     496 |
- *   |          |                |     512 |
- *   |          |----------------+---------|
- *   |          | Sub-page       |    1 kB |
- *   |          |                |    2 kB |
- *   |=====================================|
- *   | Large                     |    4 kB |
- *   |                           |    8 kB |
- *   |                           |   12 kB |
- *   |                           |     ... |
- *   |                           | 1012 kB |
- *   |                           | 1016 kB |
- *   |                           | 1020 kB |
- *   |=====================================|
- *   | Huge                      |    1 MB |
- *   |                           |    2 MB |
- *   |                           |    3 MB |
- *   |                           |     ... |
- *   |=====================================|
- *
- * A different mechanism is used for each category:
- *
- *   Small : Each size class is segregated into its own set of runs.  Each run
- *           maintains a bitmap of which regions are free/allocated.
- *
- *   Large : Each allocation is backed by a dedicated run.  Metadata are stored
- *           in the associated arena chunk header maps.
- *
- *   Huge : Each allocation is backed by a dedicated contiguous set of chunks.
- *          Metadata are stored in a separate red-black tree.
- *
- *******************************************************************************
- */
-
-/* LINTLIBRARY */
-
-#ifdef __minix
-#  define xutrace(a, b)		utrace("malloc", (a), (b))
-#  define __DECONST(x, y)	((x)__UNCONST(y))
-#  define NO_TLS
-#else
-#  define xutrace(a, b)		utrace((a), (b))
-#endif /* __minix */
-
-/*
- * MALLOC_PRODUCTION disables assertions and statistics gathering.  It also
- * defaults the A and J runtime options to off.  These settings are appropriate
- * for production systems.
- */
-#define MALLOC_PRODUCTION
-
-#ifndef MALLOC_PRODUCTION
-#  define MALLOC_DEBUG
-#endif
-
-#include <sys/cdefs.h>
-/* __FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $"); */ 
-__RCSID("$NetBSD: jemalloc.c,v 1.38 2015/07/26 17:21:55 martin Exp $");
-
-#ifdef __FreeBSD__
-#include "libc_private.h"
-#ifdef MALLOC_DEBUG
-#  define _LOCK_DEBUG
-#endif
-#include "spinlock.h"
-#endif
-#include "namespace.h"
-#include <sys/mman.h>
-#include <sys/param.h>
-#ifdef __FreeBSD__
-#include <sys/stddef.h>
-#endif
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <sys/tree.h>
-#include <sys/uio.h>
-#include <sys/ktrace.h> /* Must come after several other sys/ includes. */
-
-#ifdef __FreeBSD__
-#include <machine/atomic.h>
-#include <machine/cpufunc.h>
-#endif
-#include <machine/vmparam.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <pthread.h>
-#include <sched.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <unistd.h>
-
-#ifdef __minix
-#  include <reentrant.h>
-#  include "extern.h"
-
-#define STRERROR_R(a, b, c)	__strerror_r(a, b, c);
-/*
- * A non localized version of strerror, that avoids bringing in
- * stdio and the locale code. All the malloc messages are in English
- * so why bother?
- */
-static int
-__strerror_r(int e, char *s, size_t l)
-{
-	int rval;
-	size_t slen;
-
-	if (e >= 0 && e < sys_nerr) {
-		slen = strlcpy(s, sys_errlist[e], l);
-		rval = 0;
-	} else {
-		slen = snprintf_ss(s, l, "Unknown error %u", e);
-		rval = EINVAL;
-	}
-	return slen >= l ? ERANGE : rval;
-}
-#endif /* __minix */
-
-#ifdef __FreeBSD__
-#define STRERROR_R(a, b, c)	strerror_r(a, b, c);
-#include "un-namespace.h"
-#endif
-
-/* MALLOC_STATS enables statistics calculation. */
-#ifndef MALLOC_PRODUCTION
-#  define MALLOC_STATS
-#endif
-
-#ifdef MALLOC_DEBUG
-#  ifdef NDEBUG
-#    undef NDEBUG
-#  endif
-#else
-#  ifndef NDEBUG
-#    define NDEBUG
-#  endif
-#endif
-#include <assert.h>
-
-#ifdef MALLOC_DEBUG
-   /* Disable inlining to make debugging easier. */
-#  define inline
-#endif
-
-/* Size of stack-allocated buffer passed to strerror_r(). */
-#define	STRERROR_BUF		64
-
-/* Minimum alignment of allocations is 2^QUANTUM_2POW_MIN bytes. */
-
-/*
- * If you touch the TINY_MIN_2POW definition for any architecture, please
- * make sure to adjust the corresponding definition for JEMALLOC_TINY_MIN_2POW
- * in the gcc 4.8 tree in dist/gcc/tree-ssa-ccp.c and verify that a native
- * gcc is still buildable!
- */
-
-#ifdef __i386__
-#  define QUANTUM_2POW_MIN	4
-#  define SIZEOF_PTR_2POW	2
-#  define USE_BRK
-#endif
-#ifdef __ia64__
-#  define QUANTUM_2POW_MIN	4
-#  define SIZEOF_PTR_2POW	3
-#endif
-#ifdef __aarch64__
-#  define QUANTUM_2POW_MIN	4
-#  define SIZEOF_PTR_2POW	3
-#  define NO_TLS
-#endif
-#ifdef __alpha__
-#  define QUANTUM_2POW_MIN	4
-#  define SIZEOF_PTR_2POW	3
-#  define TINY_MIN_2POW		3
-#  define NO_TLS
-#endif
-#ifdef __sparc64__
-#  define QUANTUM_2POW_MIN	4
-#  define SIZEOF_PTR_2POW	3
-#  define TINY_MIN_2POW		3
-#  define NO_TLS
-#endif
-#ifdef __amd64__
-#  define QUANTUM_2POW_MIN	4
-#  define SIZEOF_PTR_2POW	3
-#  define TINY_MIN_2POW		3
-#endif
-#ifdef __arm__
-#  define QUANTUM_2POW_MIN	3
-#  define SIZEOF_PTR_2POW	2
-#  define USE_BRK
-#  ifdef __ARM_EABI__
-#    define TINY_MIN_2POW	3
-#  endif
-#  define NO_TLS
-#endif
-#ifdef __powerpc__
-#  define QUANTUM_2POW_MIN	4
-#  define SIZEOF_PTR_2POW	2
-#  define USE_BRK
-#  define TINY_MIN_2POW		3
-#endif
-#if defined(__sparc__) && !defined(__sparc64__)
-#  define QUANTUM_2POW_MIN	4
-#  define SIZEOF_PTR_2POW	2
-#  define USE_BRK
-#endif
-#ifdef __or1k__
-#  define QUANTUM_2POW_MIN	4
-#  define SIZEOF_PTR_2POW	2
-#  define USE_BRK
-#endif
-#ifdef __vax__
-#  define QUANTUM_2POW_MIN	4
-#  define SIZEOF_PTR_2POW	2
-#  define USE_BRK
-#endif
-#ifdef __sh__
-#  define QUANTUM_2POW_MIN	4
-#  define SIZEOF_PTR_2POW	2
-#  define USE_BRK
-#endif
-#ifdef __m68k__
-#  define QUANTUM_2POW_MIN	4
-#  define SIZEOF_PTR_2POW	2
-#  define USE_BRK
-#endif
-#if defined(__mips__) || defined(__riscv__)
-# ifdef _LP64
-#  define SIZEOF_PTR_2POW	3
-#  define TINY_MIN_2POW		3
-# else
-#  define SIZEOF_PTR_2POW	2
-# endif
-# define QUANTUM_2POW_MIN	4
-# define USE_BRK
-#endif
-#ifdef __hppa__                                                                                                                                         
-#  define QUANTUM_2POW_MIN     4                                                                                                                        
-#  define SIZEOF_PTR_2POW      2                                                                                                                        
-#  define USE_BRK                                                                                                                                       
-#endif           
-
-#define	SIZEOF_PTR		(1 << SIZEOF_PTR_2POW)
-
-/* sizeof(int) == (1 << SIZEOF_INT_2POW). */
-#ifndef SIZEOF_INT_2POW
-#  define SIZEOF_INT_2POW	2
-#endif
-
-/*
- * Size and alignment of memory chunks that are allocated by the OS's virtual
- * memory system.
- */
-#define	CHUNK_2POW_DEFAULT	20
-
-/*
- * Maximum size of L1 cache line.  This is used to avoid cache line aliasing,
- * so over-estimates are okay (up to a point), but under-estimates will
- * negatively affect performance.
- */
-#define	CACHELINE_2POW		6
-#define	CACHELINE		((size_t)(1 << CACHELINE_2POW))
-
-/* Smallest size class to support. */
-#ifndef TINY_MIN_2POW
-#define	TINY_MIN_2POW		2
-#endif
-
-/*
- * Maximum size class that is a multiple of the quantum, but not (necessarily)
- * a power of 2.  Above this size, allocations are rounded up to the nearest
- * power of 2.
- */
-#define	SMALL_MAX_2POW_DEFAULT	9
-#define	SMALL_MAX_DEFAULT	(1 << SMALL_MAX_2POW_DEFAULT)
-
-/*
- * RUN_MAX_OVRHD indicates maximum desired run header overhead.  Runs are sized
- * as small as possible such that this setting is still honored, without
- * violating other constraints.  The goal is to make runs as small as possible
- * without exceeding a per run external fragmentation threshold.
- *
- * We use binary fixed point math for overhead computations, where the binary
- * point is implicitly RUN_BFP bits to the left.
- *
- * Note that it is possible to set RUN_MAX_OVRHD low enough that it cannot be
- * honored for some/all object sizes, since there is one bit of header overhead
- * per object (plus a constant).  This constraint is relaxed (ignored) for runs
- * that are so small that the per-region overhead is greater than:
- *
- *   (RUN_MAX_OVRHD / (reg_size << (3+RUN_BFP))
- */
-#define RUN_BFP			12
-/*                              \/   Implicit binary fixed point. */
-#define RUN_MAX_OVRHD		0x0000003dU
-#define RUN_MAX_OVRHD_RELAX	0x00001800U
-
-/* Put a cap on small object run size.  This overrides RUN_MAX_OVRHD. */
-#define RUN_MAX_SMALL_2POW	15
-#define RUN_MAX_SMALL		(1 << RUN_MAX_SMALL_2POW)
-
-/******************************************************************************/
-
-#ifdef __FreeBSD__
-/*
- * Mutexes based on spinlocks.  We can't use normal pthread mutexes, because
- * they require malloc()ed memory.
- */
-typedef struct {
-	spinlock_t	lock;
-} malloc_mutex_t;
-
-/* Set to true once the allocator has been initialized. */
-static bool malloc_initialized = false;
-
-/* Used to avoid initialization races. */
-static malloc_mutex_t init_lock = {_SPINLOCK_INITIALIZER};
-#else
-#define	malloc_mutex_t	mutex_t
-
-/* Set to true once the allocator has been initialized. */
-static bool malloc_initialized = false;
-
-#ifdef _REENTRANT
-/* Used to avoid initialization races. */
-static mutex_t init_lock = MUTEX_INITIALIZER;
-#endif
-#endif
-
-/******************************************************************************/
-/*
- * Statistics data structures.
- */
-
-#ifdef MALLOC_STATS
-
-typedef struct malloc_bin_stats_s malloc_bin_stats_t;
-struct malloc_bin_stats_s {
-	/*
-	 * Number of allocation requests that corresponded to the size of this
-	 * bin.
-	 */
-	uint64_t	nrequests;
-
-	/* Total number of runs created for this bin's size class. */
-	uint64_t	nruns;
-
-	/*
-	 * Total number of runs reused by extracting them from the runs tree for
-	 * this bin's size class.
-	 */
-	uint64_t	reruns;
-
-	/* High-water mark for this bin. */
-	unsigned long	highruns;
-
-	/* Current number of runs in this bin. */
-	unsigned long	curruns;
-};
-
-typedef struct arena_stats_s arena_stats_t;
-struct arena_stats_s {
-	/* Number of bytes currently mapped. */
-	size_t		mapped;
-
-	/* Per-size-category statistics. */
-	size_t		allocated_small;
-	uint64_t	nmalloc_small;
-	uint64_t	ndalloc_small;
-
-	size_t		allocated_large;
-	uint64_t	nmalloc_large;
-	uint64_t	ndalloc_large;
-};
-
-typedef struct chunk_stats_s chunk_stats_t;
-struct chunk_stats_s {
-	/* Number of chunks that were allocated. */
-	uint64_t	nchunks;
-
-	/* High-water mark for number of chunks allocated. */
-	unsigned long	highchunks;
-
-	/*
-	 * Current number of chunks allocated.  This value isn't maintained for
-	 * any other purpose, so keep track of it in order to be able to set
-	 * highchunks.
-	 */
-	unsigned long	curchunks;
-};
-
-#endif /* #ifdef MALLOC_STATS */
-
-/******************************************************************************/
-/*
- * Chunk data structures.
- */
-
-/* Tree of chunks. */
-typedef struct chunk_node_s chunk_node_t;
-struct chunk_node_s {
-	/* Linkage for the chunk tree. */
-	RB_ENTRY(chunk_node_s) link;
-
-	/*
-	 * Pointer to the chunk that this tree node is responsible for.  In some
-	 * (but certainly not all) cases, this data structure is placed at the
-	 * beginning of the corresponding chunk, so this field may point to this
-	 * node.
-	 */
-	void	*chunk;
-
-	/* Total chunk size. */
-	size_t	size;
-};
-typedef struct chunk_tree_s chunk_tree_t;
-RB_HEAD(chunk_tree_s, chunk_node_s);
-
-/******************************************************************************/
-/*
- * Arena data structures.
- */
-
-typedef struct arena_s arena_t;
-typedef struct arena_bin_s arena_bin_t;
-
-typedef struct arena_chunk_map_s arena_chunk_map_t;
-struct arena_chunk_map_s {
-	/* Number of pages in run. */
-	uint32_t	npages;
-	/*
-	 * Position within run.  For a free run, this is POS_FREE for the first
-	 * and last pages.  The POS_FREE special value makes it possible to
-	 * quickly coalesce free runs.
-	 *
-	 * This is the limiting factor for chunksize; there can be at most 2^31
-	 * pages in a run.
-	 */
-#define POS_FREE ((uint32_t)0xffffffffU)
-	uint32_t	pos;
-};
-
-/* Arena chunk header. */
-typedef struct arena_chunk_s arena_chunk_t;
-struct arena_chunk_s {
-	/* Arena that owns the chunk. */
-	arena_t *arena;
-
-	/* Linkage for the arena's chunk tree. */
-	RB_ENTRY(arena_chunk_s) link;
-
-	/*
-	 * Number of pages in use.  This is maintained in order to make
-	 * detection of empty chunks fast.
-	 */
-	uint32_t pages_used;
-
-	/*
-	 * Every time a free run larger than this value is created/coalesced,
-	 * this value is increased.  The only way that the value decreases is if
-	 * arena_run_alloc() fails to find a free run as large as advertised by
-	 * this value.
-	 */
-	uint32_t max_frun_npages;
-
-	/*
-	 * Every time a free run that starts at an earlier page than this value
-	 * is created/coalesced, this value is decreased.  It is reset in a
-	 * similar fashion to max_frun_npages.
-	 */
-	uint32_t min_frun_ind;
-
-	/*
-	 * Map of pages within chunk that keeps track of free/large/small.  For
-	 * free runs, only the map entries for the first and last pages are
-	 * kept up to date, so that free runs can be quickly coalesced.
-	 */
-	arena_chunk_map_t map[1]; /* Dynamically sized. */
-};
-typedef struct arena_chunk_tree_s arena_chunk_tree_t;
-RB_HEAD(arena_chunk_tree_s, arena_chunk_s);
-
-typedef struct arena_run_s arena_run_t;
-struct arena_run_s {
-	/* Linkage for run trees. */
-	RB_ENTRY(arena_run_s) link;
-
-#ifdef MALLOC_DEBUG
-	uint32_t	magic;
-#  define ARENA_RUN_MAGIC 0x384adf93
-#endif
-
-	/* Bin this run is associated with. */
-	arena_bin_t	*bin;
-
-	/* Index of first element that might have a free region. */
-	unsigned	regs_minelm;
-
-	/* Number of free regions in run. */
-	unsigned	nfree;
-
-	/* Bitmask of in-use regions (0: in use, 1: free). */
-	unsigned	regs_mask[1]; /* Dynamically sized. */
-};
-typedef struct arena_run_tree_s arena_run_tree_t;
-RB_HEAD(arena_run_tree_s, arena_run_s);
-
-struct arena_bin_s {
-	/*
-	 * Current run being used to service allocations of this bin's size
-	 * class.
-	 */
-	arena_run_t	*runcur;
-
-	/*
-	 * Tree of non-full runs.  This tree is used when looking for an
-	 * existing run when runcur is no longer usable.  We choose the
-	 * non-full run that is lowest in memory; this policy tends to keep
-	 * objects packed well, and it can also help reduce the number of
-	 * almost-empty chunks.
-	 */
-	arena_run_tree_t runs;
-
-	/* Size of regions in a run for this bin's size class. */
-	size_t		reg_size;
-
-	/* Total size of a run for this bin's size class. */
-	size_t		run_size;
-
-	/* Total number of regions in a run for this bin's size class. */
-	uint32_t	nregs;
-
-	/* Number of elements in a run's regs_mask for this bin's size class. */
-	uint32_t	regs_mask_nelms;
-
-	/* Offset of first region in a run for this bin's size class. */
-	uint32_t	reg0_offset;
-
-#ifdef MALLOC_STATS
-	/* Bin statistics. */
-	malloc_bin_stats_t stats;
-#endif
-};
-
-struct arena_s {
-#ifdef MALLOC_DEBUG
-	uint32_t		magic;
-#  define ARENA_MAGIC 0x947d3d24
-#endif
-
-	/* All operations on this arena require that mtx be locked. */
-	malloc_mutex_t		mtx;
-
-#ifdef MALLOC_STATS
-	arena_stats_t		stats;
-#endif
-
-	/*
-	 * Tree of chunks this arena manages.
-	 */
-	arena_chunk_tree_t	chunks;
-
-	/*
-	 * In order to avoid rapid chunk allocation/deallocation when an arena
-	 * oscillates right on the cusp of needing a new chunk, cache the most
-	 * recently freed chunk.  This caching is disabled by opt_hint.
-	 *
-	 * There is one spare chunk per arena, rather than one spare total, in
-	 * order to avoid interactions between multiple threads that could make
-	 * a single spare inadequate.
-	 */
-	arena_chunk_t *spare;
-
-	/*
-	 * bins is used to store rings of free regions of the following sizes,
-	 * assuming a 16-byte quantum, 4kB pagesize, and default MALLOC_OPTIONS.
-	 *
-	 *   bins[i] | size |
-	 *   --------+------+
-	 *        0  |    2 |
-	 *        1  |    4 |
-	 *        2  |    8 |
-	 *   --------+------+
-	 *        3  |   16 |
-	 *        4  |   32 |
-	 *        5  |   48 |
-	 *        6  |   64 |
-	 *           :      :
-	 *           :      :
-	 *       33  |  496 |
-	 *       34  |  512 |
-	 *   --------+------+
-	 *       35  | 1024 |
-	 *       36  | 2048 |
-	 *   --------+------+
-	 */
-	arena_bin_t		bins[1]; /* Dynamically sized. */
-};
-
-/******************************************************************************/
-/*
- * Data.
- */
-
-/* Number of CPUs. */
-static unsigned		ncpus;
-
-/* VM page size. */
-static size_t		pagesize;
-static size_t		pagesize_mask;
-static int		pagesize_2pow;
-
-/* Various bin-related settings. */
-static size_t		bin_maxclass; /* Max size class for bins. */
-static unsigned		ntbins; /* Number of (2^n)-spaced tiny bins. */
-static unsigned		nqbins; /* Number of quantum-spaced bins. */
-static unsigned		nsbins; /* Number of (2^n)-spaced sub-page bins. */
-static size_t		small_min;
-static size_t		small_max;
-
-/* Various quantum-related settings. */
-static size_t		quantum;
-static size_t		quantum_mask; /* (quantum - 1). */
-
-/* Various chunk-related settings. */
-static size_t		chunksize;
-static size_t		chunksize_mask; /* (chunksize - 1). */
-static int		chunksize_2pow;
-static unsigned		chunk_npages;
-static unsigned		arena_chunk_header_npages;
-static size_t		arena_maxclass; /* Max size class for arenas. */
-
-/********/
-/*
- * Chunks.
- */
-
-#ifdef _REENTRANT
-/* Protects chunk-related data structures. */
-static malloc_mutex_t	chunks_mtx;
-#endif
-
-/* Tree of chunks that are stand-alone huge allocations. */
-static chunk_tree_t	huge;
-
-#ifdef USE_BRK
-/*
- * Try to use brk for chunk-size allocations, due to address space constraints.
- */
-/*
- * Protects sbrk() calls.  This must be separate from chunks_mtx, since
- * base_pages_alloc() also uses sbrk(), but cannot lock chunks_mtx (doing so
- * could cause recursive lock acquisition).
- */
-static malloc_mutex_t	brk_mtx;
-/* Result of first sbrk(0) call. */
-static void		*brk_base;
-/* Current end of brk, or ((void *)-1) if brk is exhausted. */
-static void		*brk_prev;
-/* Current upper limit on brk addresses. */
-static void		*brk_max;
-#endif
-
-#ifdef MALLOC_STATS
-/* Huge allocation statistics. */
-static uint64_t		huge_nmalloc;
-static uint64_t		huge_ndalloc;
-static uint64_t		huge_nralloc;
-static size_t		huge_allocated;
-#endif
-
-/*
- * Tree of chunks that were previously allocated.  This is used when allocating
- * chunks, in an attempt to re-use address space.
- */
-static chunk_tree_t	old_chunks;
-
-/****************************/
-/*
- * base (internal allocation).
- */
-
-/*
- * Current pages that are being used for internal memory allocations.  These
- * pages are carved up in cacheline-size quanta, so that there is no chance of
- * false cache line sharing.
- */
-static void		*base_pages;
-static void		*base_next_addr;
-static void		*base_past_addr; /* Addr immediately past base_pages. */
-static chunk_node_t	*base_chunk_nodes; /* LIFO cache of chunk nodes. */
-#ifdef _REENTRANT
-static malloc_mutex_t	base_mtx;
-#endif
-#ifdef MALLOC_STATS
-static size_t		base_mapped;
-#endif
-
-/********/
-/*
- * Arenas.
- */
-
-/*
- * Arenas that are used to service external requests.  Not all elements of the
- * arenas array are necessarily used; arenas are created lazily as needed.
- */
-static arena_t		**arenas;
-static unsigned		narenas;
-static unsigned		next_arena;
-#ifdef _REENTRANT
-static malloc_mutex_t	arenas_mtx; /* Protects arenas initialization. */
-#endif
-
-/*
- * Map of pthread_self() --> arenas[???], used for selecting an arena to use
- * for allocations.
- */
-#ifndef NO_TLS
-static __thread arena_t	**arenas_map;
-#else
-static arena_t	**arenas_map;
-#endif
-
-#if !defined(NO_TLS) || !defined(_REENTRANT)
-# define	get_arenas_map()	(arenas_map)
-# define	set_arenas_map(x)	(arenas_map = x)
-#else
-
-static thread_key_t arenas_map_key = -1;
-
-static inline arena_t **
-get_arenas_map(void)
-{
-	if (!__isthreaded)
-		return arenas_map;
-
-	if (arenas_map_key == -1) {
-		(void)thr_keycreate(&arenas_map_key, NULL);
-		if (arenas_map != NULL) {
-			thr_setspecific(arenas_map_key, arenas_map);
-			arenas_map = NULL;
-		}
-	}
-
-	return thr_getspecific(arenas_map_key);
-}
-
-static __inline void
-set_arenas_map(arena_t **a)
-{
-	if (!__isthreaded) {
-		arenas_map = a;
-		return;
-	}
-
-	if (arenas_map_key == -1) {
-		(void)thr_keycreate(&arenas_map_key, NULL);
-		if (arenas_map != NULL) {
-			_DIAGASSERT(arenas_map == a);
-			arenas_map = NULL;
-		}
-	}
-
-	thr_setspecific(arenas_map_key, a);
-}
-#endif
-
-#ifdef MALLOC_STATS
-/* Chunk statistics. */
-static chunk_stats_t	stats_chunks;
-#endif
-
-/*******************************/
-/*
- * Runtime configuration options.
- */
-const char	*_malloc_options;
-
-#ifndef MALLOC_PRODUCTION
-static bool	opt_abort = true;
-static bool	opt_junk = true;
-#else
-static bool	opt_abort = false;
-static bool	opt_junk = false;
-#endif
-static bool	opt_hint = false;
-static bool	opt_print_stats = false;
-static int	opt_quantum_2pow = QUANTUM_2POW_MIN;
-static int	opt_small_max_2pow = SMALL_MAX_2POW_DEFAULT;
-static int	opt_chunk_2pow = CHUNK_2POW_DEFAULT;
-static bool	opt_utrace = false;
-static bool	opt_sysv = false;
-static bool	opt_xmalloc = false;
-static bool	opt_zero = false;
-static int32_t	opt_narenas_lshift = 0;
-
-typedef struct {
-	void	*p;
-	size_t	s;
-	void	*r;
-} malloc_utrace_t;
-
-#define	UTRACE(a, b, c)							\
-	if (opt_utrace) {						\
-		malloc_utrace_t ut;					\
-		ut.p = a;						\
-		ut.s = b;						\
-		ut.r = c;						\
-		xutrace(&ut, sizeof(ut));				\
-	}
-
-/******************************************************************************/
-/*
- * Begin function prototypes for non-inline static functions.
- */
-
-static void	wrtmessage(const char *p1, const char *p2, const char *p3,
-		const char *p4);
-#ifdef MALLOC_STATS
-static void	malloc_printf(const char *format, ...);
-#endif
-static char	*size_t2s(size_t x, char *s);
-static bool	base_pages_alloc(size_t minsize);
-static void	*base_alloc(size_t size);
-static chunk_node_t *base_chunk_node_alloc(void);
-static void	base_chunk_node_dealloc(chunk_node_t *node);
-#ifdef MALLOC_STATS
-static void	stats_print(arena_t *arena);
-#endif
-static void	*pages_map(void *addr, size_t size);
-static void	*pages_map_align(void *addr, size_t size, int align);
-static void	pages_unmap(void *addr, size_t size);
-static void	*chunk_alloc(size_t size);
-static void	chunk_dealloc(void *chunk, size_t size);
-static void	arena_run_split(arena_t *arena, arena_run_t *run, size_t size);
-static arena_chunk_t *arena_chunk_alloc(arena_t *arena);
-static void	arena_chunk_dealloc(arena_t *arena, arena_chunk_t *chunk);
-static arena_run_t *arena_run_alloc(arena_t *arena, size_t size);
-static void	arena_run_dalloc(arena_t *arena, arena_run_t *run, size_t size);
-static arena_run_t *arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin);
-static void *arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin);
-static size_t arena_bin_run_size_calc(arena_bin_t *bin, size_t min_run_size);
-static void	*arena_malloc(arena_t *arena, size_t size);
-static void	*arena_palloc(arena_t *arena, size_t alignment, size_t size,
-    size_t alloc_size);
-static size_t	arena_salloc(const void *ptr);
-static void	*arena_ralloc(void *ptr, size_t size, size_t oldsize);
-static void	arena_dalloc(arena_t *arena, arena_chunk_t *chunk, void *ptr);
-static bool	arena_new(arena_t *arena);
-static arena_t	*arenas_extend(unsigned ind);
-static void	*huge_malloc(size_t size);
-static void	*huge_palloc(size_t alignment, size_t size);
-static void	*huge_ralloc(void *ptr, size_t size, size_t oldsize);
-static void	huge_dalloc(void *ptr);
-static void	*imalloc(size_t size);
-static void	*ipalloc(size_t alignment, size_t size);
-static void	*icalloc(size_t size);
-static size_t	isalloc(const void *ptr);
-static void	*iralloc(void *ptr, size_t size);
-static void	idalloc(void *ptr);
-static void	malloc_print_stats(void);
-static bool	malloc_init_hard(void);
-
-/*
- * End function prototypes.
- */
-/******************************************************************************/
-/*
- * Begin mutex.
- */
-
-#ifdef __minix
-#define	malloc_mutex_init(m)	mutex_init(m, NULL)
-#define	malloc_mutex_lock(m)	mutex_lock(m)
-#define	malloc_mutex_unlock(m)	mutex_unlock(m)
-#else  /* __minix */
-static inline void
-malloc_mutex_init(malloc_mutex_t *a_mutex)
-{
-	static const spinlock_t lock = _SPINLOCK_INITIALIZER;
-
-	a_mutex->lock = lock;
-}
-
-static inline void
-malloc_mutex_lock(malloc_mutex_t *a_mutex)
-{
-
-	if (__isthreaded)
-		_SPINLOCK(&a_mutex->lock);
-}
-
-static inline void
-malloc_mutex_unlock(malloc_mutex_t *a_mutex)
-{
-
-	if (__isthreaded)
-		_SPINUNLOCK(&a_mutex->lock);
-}
-#endif /* __minix */
-
-/*
- * End mutex.
- */
-/******************************************************************************/
-/*
- * Begin Utility functions/macros.
- */
-
-/* Return the chunk address for allocation address a. */
-#define	CHUNK_ADDR2BASE(a)						\
-	((void *)((uintptr_t)(a) & ~chunksize_mask))
-
-/* Return the chunk offset of address a. */
-#define	CHUNK_ADDR2OFFSET(a)						\
-	((size_t)((uintptr_t)(a) & chunksize_mask))
-
-/* Return the smallest chunk multiple that is >= s. */
-#define	CHUNK_CEILING(s)						\
-	(((s) + chunksize_mask) & ~chunksize_mask)
-
-/* Return the smallest cacheline multiple that is >= s. */
-#define	CACHELINE_CEILING(s)						\
-	(((s) + (CACHELINE - 1)) & ~(CACHELINE - 1))
-
-/* Return the smallest quantum multiple that is >= a. */
-#define	QUANTUM_CEILING(a)						\
-	(((a) + quantum_mask) & ~quantum_mask)
-
-/* Return the smallest pagesize multiple that is >= s. */
-#define	PAGE_CEILING(s)							\
-	(((s) + pagesize_mask) & ~pagesize_mask)
-
-/* Compute the smallest power of 2 that is >= x. */
-static inline size_t
-pow2_ceil(size_t x)
-{
-
-	x--;
-	x |= x >> 1;
-	x |= x >> 2;
-	x |= x >> 4;
-	x |= x >> 8;
-	x |= x >> 16;
-#if (SIZEOF_PTR == 8)
-	x |= x >> 32;
-#endif
-	x++;
-	return (x);
-}
-
-static void
-wrtmessage(const char *p1, const char *p2, const char *p3, const char *p4)
-{
-
-	write(STDERR_FILENO, p1, strlen(p1));
-	write(STDERR_FILENO, p2, strlen(p2));
-	write(STDERR_FILENO, p3, strlen(p3));
-	write(STDERR_FILENO, p4, strlen(p4));
-}
-
-void	(*_malloc_message)(const char *p1, const char *p2, const char *p3,
-	    const char *p4) = wrtmessage;
-
-#ifdef MALLOC_STATS
-/*
- * Print to stderr in such a way as to (hopefully) avoid memory allocation.
- */
-static void
-malloc_printf(const char *format, ...)
-{
-	char buf[4096];
-	va_list ap;
-
-	va_start(ap, format);
-	vsnprintf(buf, sizeof(buf), format, ap);
-	va_end(ap);
-	_malloc_message(buf, "", "", "");
-}
-#endif
-
-/*
- * We don't want to depend on vsnprintf() for production builds, since that can
- * cause unnecessary bloat for static binaries.  size_t2s() provides minimal
- * integer printing functionality, so that malloc_printf() use can be limited to
- * MALLOC_STATS code.
- */
-#define UMAX2S_BUFSIZE	21
-static char *
-size_t2s(size_t x, char *s)
-{
-	unsigned i;
-
-	/* Make sure UMAX2S_BUFSIZE is large enough. */
-	/* LINTED */
-	assert(sizeof(size_t) <= 8);
-
-	i = UMAX2S_BUFSIZE - 1;
-	s[i] = '\0';
-	do {
-		i--;
-		s[i] = "0123456789"[(int)x % 10];
-		x /= (uintmax_t)10LL;
-	} while (x > 0);
-
-	return (&s[i]);
-}
-
-/******************************************************************************/
-
-static bool
-base_pages_alloc(size_t minsize)
-{
-	size_t csize = 0;
-
-#ifdef USE_BRK
-	/*
-	 * Do special brk allocation here, since base allocations don't need to
-	 * be chunk-aligned.
-	 */
-	if (brk_prev != (void *)-1) {
-		void *brk_cur;
-		intptr_t incr;
-
-		if (minsize != 0)
-			csize = CHUNK_CEILING(minsize);
-
-		malloc_mutex_lock(&brk_mtx);
-		do {
-			/* Get the current end of brk. */
-			brk_cur = sbrk(0);
-
-			/*
-			 * Calculate how much padding is necessary to
-			 * chunk-align the end of brk.  Don't worry about
-			 * brk_cur not being chunk-aligned though.
-			 */
-			incr = (intptr_t)chunksize
-			    - (intptr_t)CHUNK_ADDR2OFFSET(brk_cur);
-			assert(incr >= 0);
-			if ((size_t)incr < minsize)
-				incr += csize;
-
-			brk_prev = sbrk(incr);
-			if (brk_prev == brk_cur) {
-				/* Success. */
-				malloc_mutex_unlock(&brk_mtx);
-				base_pages = brk_cur;
-				base_next_addr = base_pages;
-				base_past_addr = (void *)((uintptr_t)base_pages
-				    + incr);
-#ifdef MALLOC_STATS
-				base_mapped += incr;
-#endif
-				return (false);
-			}
-		} while (brk_prev != (void *)-1);
-		malloc_mutex_unlock(&brk_mtx);
-	}
-	if (minsize == 0) {
-		/*
-		 * Failure during initialization doesn't matter, so avoid
-		 * falling through to the mmap-based page mapping code.
-		 */
-		return (true);
-	}
-#endif
-	assert(minsize != 0);
-	csize = PAGE_CEILING(minsize);
-	base_pages = pages_map(NULL, csize);
-	if (base_pages == NULL)
-		return (true);
-	base_next_addr = base_pages;
-	base_past_addr = (void *)((uintptr_t)base_pages + csize);
-#ifdef MALLOC_STATS
-	base_mapped += csize;
-#endif
-	return (false);
-}
-
-static void *
-base_alloc(size_t size)
-{
-	void *ret;
-	size_t csize;
-
-	/* Round size up to nearest multiple of the cacheline size. */
-	csize = CACHELINE_CEILING(size);
-
-	malloc_mutex_lock(&base_mtx);
-
-	/* Make sure there's enough space for the allocation. */
-	if ((uintptr_t)base_next_addr + csize > (uintptr_t)base_past_addr) {
-		if (base_pages_alloc(csize)) {
-			ret = NULL;
-			goto RETURN;
-		}
-	}
-
-	/* Allocate. */
-	ret = base_next_addr;
-	base_next_addr = (void *)((uintptr_t)base_next_addr + csize);
-
-RETURN:
-	malloc_mutex_unlock(&base_mtx);
-	return (ret);
-}
-
-static chunk_node_t *
-base_chunk_node_alloc(void)
-{
-	chunk_node_t *ret;
-
-	malloc_mutex_lock(&base_mtx);
-	if (base_chunk_nodes != NULL) {
-		ret = base_chunk_nodes;
-		/* LINTED */
-		base_chunk_nodes = *(chunk_node_t **)ret;
-		malloc_mutex_unlock(&base_mtx);
-	} else {
-		malloc_mutex_unlock(&base_mtx);
-		ret = (chunk_node_t *)base_alloc(sizeof(chunk_node_t));
-	}
-
-	return (ret);
-}
-
-static void
-base_chunk_node_dealloc(chunk_node_t *node)
-{
-
-	malloc_mutex_lock(&base_mtx);
-	/* LINTED */
-	*(chunk_node_t **)node = base_chunk_nodes;
-	base_chunk_nodes = node;
-	malloc_mutex_unlock(&base_mtx);
-}
-
-/******************************************************************************/
-
-#ifdef MALLOC_STATS
-static void
-stats_print(arena_t *arena)
-{
-	unsigned i;
-	int gap_start;
-
-	malloc_printf(
-	    "          allocated/mapped            nmalloc      ndalloc\n");
-
-	malloc_printf("small: %12zu %-12s %12llu %12llu\n",
-	    arena->stats.allocated_small, "", arena->stats.nmalloc_small,
-	    arena->stats.ndalloc_small);
-	malloc_printf("large: %12zu %-12s %12llu %12llu\n",
-	    arena->stats.allocated_large, "", arena->stats.nmalloc_large,
-	    arena->stats.ndalloc_large);
-	malloc_printf("total: %12zu/%-12zu %12llu %12llu\n",
-	    arena->stats.allocated_small + arena->stats.allocated_large,
-	    arena->stats.mapped,
-	    arena->stats.nmalloc_small + arena->stats.nmalloc_large,
-	    arena->stats.ndalloc_small + arena->stats.ndalloc_large);
-
-	malloc_printf("bins:     bin   size regs pgs  requests   newruns"
-	    "    reruns maxruns curruns\n");
-	for (i = 0, gap_start = -1; i < ntbins + nqbins + nsbins; i++) {
-		if (arena->bins[i].stats.nrequests == 0) {
-			if (gap_start == -1)
-				gap_start = i;
-		} else {
-			if (gap_start != -1) {
-				if (i > gap_start + 1) {
-					/* Gap of more than one size class. */
-					malloc_printf("[%u..%u]\n",
-					    gap_start, i - 1);
-				} else {
-					/* Gap of one size class. */
-					malloc_printf("[%u]\n", gap_start);
-				}
-				gap_start = -1;
-			}
-			malloc_printf(
-			    "%13u %1s %4u %4u %3u %9llu %9llu"
-			    " %9llu %7lu %7lu\n",
-			    i,
-			    i < ntbins ? "T" : i < ntbins + nqbins ? "Q" : "S",
-			    arena->bins[i].reg_size,
-			    arena->bins[i].nregs,
-			    arena->bins[i].run_size >> pagesize_2pow,
-			    arena->bins[i].stats.nrequests,
-			    arena->bins[i].stats.nruns,
-			    arena->bins[i].stats.reruns,
-			    arena->bins[i].stats.highruns,
-			    arena->bins[i].stats.curruns);
-		}
-	}
-	if (gap_start != -1) {
-		if (i > gap_start + 1) {
-			/* Gap of more than one size class. */
-			malloc_printf("[%u..%u]\n", gap_start, i - 1);
-		} else {
-			/* Gap of one size class. */
-			malloc_printf("[%u]\n", gap_start);
-		}
-	}
-}
-#endif
-
-/*
- * End Utility functions/macros.
- */
-/******************************************************************************/
-/*
- * Begin chunk management functions.
- */
-
-#ifndef lint
-static inline int
-chunk_comp(chunk_node_t *a, chunk_node_t *b)
-{
-
-	assert(a != NULL);
-	assert(b != NULL);
-
-	if ((uintptr_t)a->chunk < (uintptr_t)b->chunk)
-		return (-1);
-	else if (a->chunk == b->chunk)
-		return (0);
-	else
-		return (1);
-}
-
-/* Generate red-black tree code for chunks. */
-RB_GENERATE_STATIC(chunk_tree_s, chunk_node_s, link, chunk_comp);
-#endif
-
-static void *
-pages_map_align(void *addr, size_t size, int align)
-{
-	void *ret;
-
-	/*
-	 * We don't use MAP_FIXED here, because it can cause the *replacement*
-	 * of existing mappings, and we only want to create new mappings.
-	 */
-	ret = mmap(addr, size, PROT_READ | PROT_WRITE,
-	    MAP_PRIVATE | MAP_ANON | MAP_ALIGNED(align), -1, 0);
-	assert(ret != NULL);
-
-	if (ret == MAP_FAILED)
-		ret = NULL;
-	else if (addr != NULL && ret != addr) {
-		/*
-		 * We succeeded in mapping memory, but not in the right place.
-		 */
-		if (munmap(ret, size) == -1) {
-			char buf[STRERROR_BUF];
-
-			STRERROR_R(errno, buf, sizeof(buf));
-			_malloc_message(getprogname(),
-			    ": (malloc) Error in munmap(): ", buf, "\n");
-			if (opt_abort)
-				abort();
-		}
-		ret = NULL;
-	}
-
-	assert(ret == NULL || (addr == NULL && ret != addr)
-	    || (addr != NULL && ret == addr));
-	return (ret);
-}
-
-static void *
-pages_map(void *addr, size_t size)
-{
-
-	return pages_map_align(addr, size, 0);
-}
-
-static void
-pages_unmap(void *addr, size_t size)
-{
-
-	if (munmap(addr, size) == -1) {
-		char buf[STRERROR_BUF];
-
-		STRERROR_R(errno, buf, sizeof(buf));
-		_malloc_message(getprogname(),
-		    ": (malloc) Error in munmap(): ", buf, "\n");
-		if (opt_abort)
-			abort();
-	}
-}
-
-static void *
-chunk_alloc(size_t size)
-{
-	void *ret, *chunk;
-	chunk_node_t *tchunk, *delchunk;
-
-	assert(size != 0);
-	assert((size & chunksize_mask) == 0);
-
-	malloc_mutex_lock(&chunks_mtx);
-
-	if (size == chunksize) {
-		/*
-		 * Check for address ranges that were previously chunks and try
-		 * to use them.
-		 */
-
-		/* LINTED */
-		tchunk = RB_MIN(chunk_tree_s, &old_chunks);
-		while (tchunk != NULL) {
-			/* Found an address range.  Try to recycle it. */
-
-			chunk = tchunk->chunk;
-			delchunk = tchunk;
-			/* LINTED */
-			tchunk = RB_NEXT(chunk_tree_s, &old_chunks, delchunk);
-
-			/* Remove delchunk from the tree. */
-			/* LINTED */
-			RB_REMOVE(chunk_tree_s, &old_chunks, delchunk);
-			base_chunk_node_dealloc(delchunk);
-
-#ifdef USE_BRK
-			if ((uintptr_t)chunk >= (uintptr_t)brk_base
-			    && (uintptr_t)chunk < (uintptr_t)brk_max) {
-				/* Re-use a previously freed brk chunk. */
-				ret = chunk;
-				goto RETURN;
-			}
-#endif
-			if ((ret = pages_map(chunk, size)) != NULL) {
-				/* Success. */
-				goto RETURN;
-			}
-		}
-	}
-
-	/*
-	 * Try to over-allocate, but allow the OS to place the allocation
-	 * anywhere.  Beware of size_t wrap-around.
-	 */
-	if (size + chunksize > size) {
-		if ((ret = pages_map_align(NULL, size, chunksize_2pow))
-		    != NULL) {
-			goto RETURN;
-		}
-	}
-
-#ifdef USE_BRK
-	/*
-	 * Try to create allocations in brk, in order to make full use of
-	 * limited address space.
-	 */
-	if (brk_prev != (void *)-1) {
-		void *brk_cur;
-		intptr_t incr;
-
-		/*
-		 * The loop is necessary to recover from races with other
-		 * threads that are using brk for something other than malloc.
-		 */
-		malloc_mutex_lock(&brk_mtx);
-		do {
-			/* Get the current end of brk. */
-			brk_cur = sbrk(0);
-
-			/*
-			 * Calculate how much padding is necessary to
-			 * chunk-align the end of brk.
-			 */
-			incr = (intptr_t)size
-			    - (intptr_t)CHUNK_ADDR2OFFSET(brk_cur);
-			if (incr == (intptr_t)size) {
-				ret = brk_cur;
-			} else {
-				ret = (void *)((intptr_t)brk_cur + incr);
-				incr += size;
-			}
-
-			brk_prev = sbrk(incr);
-			if (brk_prev == brk_cur) {
-				/* Success. */
-				malloc_mutex_unlock(&brk_mtx);
-				brk_max = (void *)((intptr_t)ret + size);
-				goto RETURN;
-			}
-		} while (brk_prev != (void *)-1);
-		malloc_mutex_unlock(&brk_mtx);
-	}
-#endif
-
-	/* All strategies for allocation failed. */
-	ret = NULL;
-RETURN:
-	if (ret != NULL) {
-		chunk_node_t key;
-		/*
-		 * Clean out any entries in old_chunks that overlap with the
-		 * memory we just allocated.
-		 */
-		key.chunk = ret;
-		/* LINTED */
-		tchunk = RB_NFIND(chunk_tree_s, &old_chunks, &key);
-		while (tchunk != NULL
-		    && (uintptr_t)tchunk->chunk >= (uintptr_t)ret
-		    && (uintptr_t)tchunk->chunk < (uintptr_t)ret + size) {
-			delchunk = tchunk;
-			/* LINTED */
-			tchunk = RB_NEXT(chunk_tree_s, &old_chunks, delchunk);
-			/* LINTED */
-			RB_REMOVE(chunk_tree_s, &old_chunks, delchunk);
-			base_chunk_node_dealloc(delchunk);
-		}
-
-	}
-#ifdef MALLOC_STATS
-	if (ret != NULL) {
-		stats_chunks.nchunks += (size / chunksize);
-		stats_chunks.curchunks += (size / chunksize);
-	}
-	if (stats_chunks.curchunks > stats_chunks.highchunks)
-		stats_chunks.highchunks = stats_chunks.curchunks;
-#endif
-	malloc_mutex_unlock(&chunks_mtx);
-
-	assert(CHUNK_ADDR2BASE(ret) == ret);
-	return (ret);
-}
-
-static void
-chunk_dealloc(void *chunk, size_t size)
-{
-	chunk_node_t *node;
-
-	assert(chunk != NULL);
-	assert(CHUNK_ADDR2BASE(chunk) == chunk);
-	assert(size != 0);
-	assert((size & chunksize_mask) == 0);
-
-	malloc_mutex_lock(&chunks_mtx);
-
-#ifdef USE_BRK
-	if ((uintptr_t)chunk >= (uintptr_t)brk_base
-	    && (uintptr_t)chunk < (uintptr_t)brk_max) {
-		void *brk_cur;
-
-		malloc_mutex_lock(&brk_mtx);
-		/* Get the current end of brk. */
-		brk_cur = sbrk(0);
-
-		/*
-		 * Try to shrink the data segment if this chunk is at the end
-		 * of the data segment.  The sbrk() call here is subject to a
-		 * race condition with threads that use brk(2) or sbrk(2)
-		 * directly, but the alternative would be to leak memory for
-		 * the sake of poorly designed multi-threaded programs.
-		 */
-		if (brk_cur == brk_max
-		    && (void *)((uintptr_t)chunk + size) == brk_max
-		    && sbrk(-(intptr_t)size) == brk_max) {
-			malloc_mutex_unlock(&brk_mtx);
-			if (brk_prev == brk_max) {
-				/* Success. */
-				brk_prev = (void *)((intptr_t)brk_max
-				    - (intptr_t)size);
-				brk_max = brk_prev;
-			}
-		} else {
-			size_t offset;
-
-			malloc_mutex_unlock(&brk_mtx);
-			madvise(chunk, size, MADV_FREE);
-
-			/*
-			 * Iteratively create records of each chunk-sized
-			 * memory region that 'chunk' is comprised of, so that
-			 * the address range can be recycled if memory usage
-			 * increases later on.
-			 */
-			for (offset = 0; offset < size; offset += chunksize) {
-				node = base_chunk_node_alloc();
-				if (node == NULL)
-					break;
-
-				node->chunk = (void *)((uintptr_t)chunk
-				    + (uintptr_t)offset);
-				node->size = chunksize;
-				/* LINTED */
-				RB_INSERT(chunk_tree_s, &old_chunks, node);
-			}
-		}
-	} else {
-#endif
-		pages_unmap(chunk, size);
-
-		/*
-		 * Make a record of the chunk's address, so that the address
-		 * range can be recycled if memory usage increases later on.
-		 * Don't bother to create entries if (size > chunksize), since
-		 * doing so could cause scalability issues for truly gargantuan
-		 * objects (many gigabytes or larger).
-		 */
-		if (size == chunksize) {
-			node = base_chunk_node_alloc();
-			if (node != NULL) {
-				node->chunk = (void *)(uintptr_t)chunk;
-				node->size = chunksize;
-				/* LINTED */
-				RB_INSERT(chunk_tree_s, &old_chunks, node);
-			}
-		}
-#ifdef USE_BRK
-	}
-#endif
-
-#ifdef MALLOC_STATS
-	stats_chunks.curchunks -= (size / chunksize);
-#endif
-	malloc_mutex_unlock(&chunks_mtx);
-}
-
-/*
- * End chunk management functions.
- */
-/******************************************************************************/
-/*
- * Begin arena.
- */
-
-/*
- * Choose an arena based on a per-thread and (optimistically) per-CPU value.
- *
- * We maintain at least one block of arenas.  Usually there are more.
- * The blocks are $ncpu arenas in size.  Whole blocks are 'hashed'
- * amongst threads.  To accomplish this, next_arena advances only in
- * ncpu steps.
- */
-static __noinline arena_t *
-choose_arena_hard(void)
-{
-	unsigned i, curcpu;
-	arena_t **map;
-
-	/* Initialize the current block of arenas and advance to next. */
-	malloc_mutex_lock(&arenas_mtx);
-	assert(next_arena % ncpus == 0);
-	assert(narenas % ncpus == 0);
-	map = &arenas[next_arena];
-	set_arenas_map(map);
-	for (i = 0; i < ncpus; i++) {
-		if (arenas[next_arena] == NULL)
-			arenas_extend(next_arena);
-		next_arena = (next_arena + 1) % narenas;
-	}
-	malloc_mutex_unlock(&arenas_mtx);
-
-	/*
-	 * If we were unable to allocate an arena above, then default to
-	 * the first arena, which is always present.
-	 */
-	curcpu = thr_curcpu();
-	if (map[curcpu] != NULL)
-		return map[curcpu];
-	return arenas[0];
-}
-
-static inline arena_t *
-choose_arena(void)
-{
-	unsigned curcpu;
-	arena_t **map;
-
-	map = get_arenas_map();
-	curcpu = thr_curcpu();
-	if (__predict_true(map != NULL && map[curcpu] != NULL))
-		return map[curcpu];
-
-        return choose_arena_hard();
-}
-
-#ifndef lint
-static inline int
-arena_chunk_comp(arena_chunk_t *a, arena_chunk_t *b)
-{
-
-	assert(a != NULL);
-	assert(b != NULL);
-
-	if ((uintptr_t)a < (uintptr_t)b)
-		return (-1);
-	else if (a == b)
-		return (0);
-	else
-		return (1);
-}
-
-/* Generate red-black tree code for arena chunks. */
-RB_GENERATE_STATIC(arena_chunk_tree_s, arena_chunk_s, link, arena_chunk_comp);
-#endif
-
-#ifndef lint
-static inline int
-arena_run_comp(arena_run_t *a, arena_run_t *b)
-{
-
-	assert(a != NULL);
-	assert(b != NULL);
-
-	if ((uintptr_t)a < (uintptr_t)b)
-		return (-1);
-	else if (a == b)
-		return (0);
-	else
-		return (1);
-}
-
-/* Generate red-black tree code for arena runs. */
-RB_GENERATE_STATIC(arena_run_tree_s, arena_run_s, link, arena_run_comp);
-#endif
-
-static inline void *
-arena_run_reg_alloc(arena_run_t *run, arena_bin_t *bin)
-{
-	void *ret;
-	unsigned i, mask, bit, regind;
-
-	assert(run->magic == ARENA_RUN_MAGIC);
-	assert(run->regs_minelm < bin->regs_mask_nelms);
-
-	/*
-	 * Move the first check outside the loop, so that run->regs_minelm can
-	 * be updated unconditionally, without the possibility of updating it
-	 * multiple times.
-	 */
-	i = run->regs_minelm;
-	mask = run->regs_mask[i];
-	if (mask != 0) {
-		/* Usable allocation found. */
-		bit = ffs((int)mask) - 1;
-
-		regind = ((i << (SIZEOF_INT_2POW + 3)) + bit);
-		ret = (void *)(((uintptr_t)run) + bin->reg0_offset
-		    + (bin->reg_size * regind));
-
-		/* Clear bit. */
-		mask ^= (1 << bit);
-		run->regs_mask[i] = mask;
-
-		return (ret);
-	}
-
-	for (i++; i < bin->regs_mask_nelms; i++) {
-		mask = run->regs_mask[i];
-		if (mask != 0) {
-			/* Usable allocation found. */
-			bit = ffs((int)mask) - 1;
-
-			regind = ((i << (SIZEOF_INT_2POW + 3)) + bit);
-			ret = (void *)(((uintptr_t)run) + bin->reg0_offset
-			    + (bin->reg_size * regind));
-
-			/* Clear bit. */
-			mask ^= (1 << bit);
-			run->regs_mask[i] = mask;
-
-			/*
-			 * Make a note that nothing before this element
-			 * contains a free region.
-			 */
-			run->regs_minelm = i; /* Low payoff: + (mask == 0); */
-
-			return (ret);
-		}
-	}
-	/* Not reached. */
-	/* LINTED */
-	assert(0);
-	return (NULL);
-}
-
-static inline void
-arena_run_reg_dalloc(arena_run_t *run, arena_bin_t *bin, void *ptr, size_t size)
-{
-	/*
-	 * To divide by a number D that is not a power of two we multiply
-	 * by (2^21 / D) and then right shift by 21 positions.
-	 *
-	 *   X / D
-	 *
-	 * becomes
-	 *
-	 *   (X * size_invs[(D >> QUANTUM_2POW_MIN) - 3]) >> SIZE_INV_SHIFT
-	 */
-#define SIZE_INV_SHIFT 21
-#define SIZE_INV(s) (((1 << SIZE_INV_SHIFT) / (s << QUANTUM_2POW_MIN)) + 1)
-	static const unsigned size_invs[] = {
-	    SIZE_INV(3),
-	    SIZE_INV(4), SIZE_INV(5), SIZE_INV(6), SIZE_INV(7),
-	    SIZE_INV(8), SIZE_INV(9), SIZE_INV(10), SIZE_INV(11),
-	    SIZE_INV(12),SIZE_INV(13), SIZE_INV(14), SIZE_INV(15),
-	    SIZE_INV(16),SIZE_INV(17), SIZE_INV(18), SIZE_INV(19),
-	    SIZE_INV(20),SIZE_INV(21), SIZE_INV(22), SIZE_INV(23),
-	    SIZE_INV(24),SIZE_INV(25), SIZE_INV(26), SIZE_INV(27),
-	    SIZE_INV(28),SIZE_INV(29), SIZE_INV(30), SIZE_INV(31)
-#if (QUANTUM_2POW_MIN < 4)
-	    ,
-	    SIZE_INV(32), SIZE_INV(33), SIZE_INV(34), SIZE_INV(35),
-	    SIZE_INV(36), SIZE_INV(37), SIZE_INV(38), SIZE_INV(39),
-	    SIZE_INV(40), SIZE_INV(41), SIZE_INV(42), SIZE_INV(43),
-	    SIZE_INV(44), SIZE_INV(45), SIZE_INV(46), SIZE_INV(47),
-	    SIZE_INV(48), SIZE_INV(49), SIZE_INV(50), SIZE_INV(51),
-	    SIZE_INV(52), SIZE_INV(53), SIZE_INV(54), SIZE_INV(55),
-	    SIZE_INV(56), SIZE_INV(57), SIZE_INV(58), SIZE_INV(59),
-	    SIZE_INV(60), SIZE_INV(61), SIZE_INV(62), SIZE_INV(63)
-#endif
-	};
-	unsigned diff, regind, elm, bit;
-
-	/* LINTED */
-	assert(run->magic == ARENA_RUN_MAGIC);
-	assert(((sizeof(size_invs)) / sizeof(unsigned)) + 3
-	    >= (SMALL_MAX_DEFAULT >> QUANTUM_2POW_MIN));
-
-	/*
-	 * Avoid doing division with a variable divisor if possible.  Using
-	 * actual division here can reduce allocator throughput by over 20%!
-	 */
-	diff = (unsigned)((uintptr_t)ptr - (uintptr_t)run - bin->reg0_offset);
-	if ((size & (size - 1)) == 0) {
-		/*
-		 * log2_table allows fast division of a power of two in the
-		 * [1..128] range.
-		 *
-		 * (x / divisor) becomes (x >> log2_table[divisor - 1]).
-		 */
-		static const unsigned char log2_table[] = {
-		    0, 1, 0, 2, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 4,
-		    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 6,
-		    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7
-		};
-
-		if (size <= 128)
-			regind = (diff >> log2_table[size - 1]);
-		else if (size <= 32768)
-			regind = diff >> (8 + log2_table[(size >> 8) - 1]);
-		else {
-			/*
-			 * The page size is too large for us to use the lookup
-			 * table.  Use real division.
-			 */
-			regind = (unsigned)(diff / size);
-		}
-	} else if (size <= ((sizeof(size_invs) / sizeof(unsigned))
-	    << QUANTUM_2POW_MIN) + 2) {
-		regind = size_invs[(size >> QUANTUM_2POW_MIN) - 3] * diff;
-		regind >>= SIZE_INV_SHIFT;
-	} else {
-		/*
-		 * size_invs isn't large enough to handle this size class, so
-		 * calculate regind using actual division.  This only happens
-		 * if the user increases small_max via the 'S' runtime
-		 * configuration option.
-		 */
-		regind = (unsigned)(diff / size);
-	};
-	assert(diff == regind * size);
-	assert(regind < bin->nregs);
-
-	elm = regind >> (SIZEOF_INT_2POW + 3);
-	if (elm < run->regs_minelm)
-		run->regs_minelm = elm;
-	bit = regind - (elm << (SIZEOF_INT_2POW + 3));
-	assert((run->regs_mask[elm] & (1 << bit)) == 0);
-	run->regs_mask[elm] |= (1 << bit);
-#undef SIZE_INV
-#undef SIZE_INV_SHIFT
-}
-
-static void
-arena_run_split(arena_t *arena, arena_run_t *run, size_t size)
-{
-	arena_chunk_t *chunk;
-	unsigned run_ind, map_offset, total_pages, need_pages, rem_pages;
-	unsigned i;
-
-	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run);
-	run_ind = (unsigned)(((uintptr_t)run - (uintptr_t)chunk)
-	    >> pagesize_2pow);
-	total_pages = chunk->map[run_ind].npages;
-	need_pages = (unsigned)(size >> pagesize_2pow);
-	assert(need_pages <= total_pages);
-	rem_pages = total_pages - need_pages;
-
-	/* Split enough pages from the front of run to fit allocation size. */
-	map_offset = run_ind;
-	for (i = 0; i < need_pages; i++) {
-		chunk->map[map_offset + i].npages = need_pages;
-		chunk->map[map_offset + i].pos = i;
-	}
-
-	/* Keep track of trailing unused pages for later use. */
-	if (rem_pages > 0) {
-		/* Update map for trailing pages. */
-		map_offset += need_pages;
-		chunk->map[map_offset].npages = rem_pages;
-		chunk->map[map_offset].pos = POS_FREE;
-		chunk->map[map_offset + rem_pages - 1].npages = rem_pages;
-		chunk->map[map_offset + rem_pages - 1].pos = POS_FREE;
-	}
-
-	chunk->pages_used += need_pages;
-}
-
-static arena_chunk_t *
-arena_chunk_alloc(arena_t *arena)
-{
-	arena_chunk_t *chunk;
-
-	if (arena->spare != NULL) {
-		chunk = arena->spare;
-		arena->spare = NULL;
-
-		/* LINTED */
-		RB_INSERT(arena_chunk_tree_s, &arena->chunks, chunk);
-	} else {
-		chunk = (arena_chunk_t *)chunk_alloc(chunksize);
-		if (chunk == NULL)
-			return (NULL);
-#ifdef MALLOC_STATS
-		arena->stats.mapped += chunksize;
-#endif
-
-		chunk->arena = arena;
-
-		/* LINTED */
-		RB_INSERT(arena_chunk_tree_s, &arena->chunks, chunk);
-
-		/*
-		 * Claim that no pages are in use, since the header is merely
-		 * overhead.
-		 */
-		chunk->pages_used = 0;
-
-		chunk->max_frun_npages = chunk_npages -
-		    arena_chunk_header_npages;
-		chunk->min_frun_ind = arena_chunk_header_npages;
-
-		/*
-		 * Initialize enough of the map to support one maximal free run.
-		 */
-		chunk->map[arena_chunk_header_npages].npages = chunk_npages -
-		    arena_chunk_header_npages;
-		chunk->map[arena_chunk_header_npages].pos = POS_FREE;
-		chunk->map[chunk_npages - 1].npages = chunk_npages -
-		    arena_chunk_header_npages;
-		chunk->map[chunk_npages - 1].pos = POS_FREE;
-	}
-
-	return (chunk);
-}
-
-static void
-arena_chunk_dealloc(arena_t *arena, arena_chunk_t *chunk)
-{
-
-	/*
-	 * Remove chunk from the chunk tree, regardless of whether this chunk
-	 * will be cached, so that the arena does not use it.
-	 */
-	/* LINTED */
-	RB_REMOVE(arena_chunk_tree_s, &chunk->arena->chunks, chunk);
-
-	if (opt_hint == false) {
-		if (arena->spare != NULL) {
-			chunk_dealloc((void *)arena->spare, chunksize);
-#ifdef MALLOC_STATS
-			arena->stats.mapped -= chunksize;
-#endif
-		}
-		arena->spare = chunk;
-	} else {
-		assert(arena->spare == NULL);
-		chunk_dealloc((void *)chunk, chunksize);
-#ifdef MALLOC_STATS
-		arena->stats.mapped -= chunksize;
-#endif
-	}
-}
-
-static arena_run_t *
-arena_run_alloc(arena_t *arena, size_t size)
-{
-	arena_chunk_t *chunk;
-	arena_run_t *run;
-	unsigned need_npages, limit_pages, compl_need_npages;
-
-	assert(size <= (chunksize - (arena_chunk_header_npages <<
-	    pagesize_2pow)));
-	assert((size & pagesize_mask) == 0);
-
-	/*
-	 * Search through arena's chunks in address order for a free run that is
-	 * large enough.  Look for the first fit.
-	 */
-	need_npages = (unsigned)(size >> pagesize_2pow);
-	limit_pages = chunk_npages - arena_chunk_header_npages;
-	compl_need_npages = limit_pages - need_npages;
-	/* LINTED */
-	RB_FOREACH(chunk, arena_chunk_tree_s, &arena->chunks) {
-		/*
-		 * Avoid searching this chunk if there are not enough
-		 * contiguous free pages for there to possibly be a large
-		 * enough free run.
-		 */
-		if (chunk->pages_used <= compl_need_npages &&
-		    need_npages <= chunk->max_frun_npages) {
-			arena_chunk_map_t *mapelm;
-			unsigned i;
-			unsigned max_frun_npages = 0;
-			unsigned min_frun_ind = chunk_npages;
-
-			assert(chunk->min_frun_ind >=
-			    arena_chunk_header_npages);
-			for (i = chunk->min_frun_ind; i < chunk_npages;) {
-				mapelm = &chunk->map[i];
-				if (mapelm->pos == POS_FREE) {
-					if (mapelm->npages >= need_npages) {
-						run = (arena_run_t *)
-						    ((uintptr_t)chunk + (i <<
-						    pagesize_2pow));
-						/* Update page map. */
-						arena_run_split(arena, run,
-						    size);
-						return (run);
-					}
-					if (mapelm->npages >
-					    max_frun_npages) {
-						max_frun_npages =
-						    mapelm->npages;
-					}
-					if (i < min_frun_ind) {
-						min_frun_ind = i;
-						if (i < chunk->min_frun_ind)
-							chunk->min_frun_ind = i;
-					}
-				}
-				i += mapelm->npages;
-			}
-			/*
-			 * Search failure.  Reset cached chunk->max_frun_npages.
-			 * chunk->min_frun_ind was already reset above (if
-			 * necessary).
-			 */
-			chunk->max_frun_npages = max_frun_npages;
-		}
-	}
-
-	/*
-	 * No usable runs.  Create a new chunk from which to allocate the run.
-	 */
-	chunk = arena_chunk_alloc(arena);
-	if (chunk == NULL)
-		return (NULL);
-	run = (arena_run_t *)((uintptr_t)chunk + (arena_chunk_header_npages <<
-	    pagesize_2pow));
-	/* Update page map. */
-	arena_run_split(arena, run, size);
-	return (run);
-}
-
-static void
-arena_run_dalloc(arena_t *arena, arena_run_t *run, size_t size)
-{
-	arena_chunk_t *chunk;
-	unsigned run_ind, run_pages;
-
-	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run);
-
-	run_ind = (unsigned)(((uintptr_t)run - (uintptr_t)chunk)
-	    >> pagesize_2pow);
-	assert(run_ind >= arena_chunk_header_npages);
-	assert(run_ind < (chunksize >> pagesize_2pow));
-	run_pages = (unsigned)(size >> pagesize_2pow);
-	assert(run_pages == chunk->map[run_ind].npages);
-
-	/* Subtract pages from count of pages used in chunk. */
-	chunk->pages_used -= run_pages;
-
-	/* Mark run as deallocated. */
-	assert(chunk->map[run_ind].npages == run_pages);
-	chunk->map[run_ind].pos = POS_FREE;
-	assert(chunk->map[run_ind + run_pages - 1].npages == run_pages);
-	chunk->map[run_ind + run_pages - 1].pos = POS_FREE;
-
-	/*
-	 * Tell the kernel that we don't need the data in this run, but only if
-	 * requested via runtime configuration.
-	 */
-	if (opt_hint)
-		madvise(run, size, MADV_FREE);
-
-	/* Try to coalesce with neighboring runs. */
-	if (run_ind > arena_chunk_header_npages &&
-	    chunk->map[run_ind - 1].pos == POS_FREE) {
-		unsigned prev_npages;
-
-		/* Coalesce with previous run. */
-		prev_npages = chunk->map[run_ind - 1].npages;
-		run_ind -= prev_npages;
-		assert(chunk->map[run_ind].npages == prev_npages);
-		assert(chunk->map[run_ind].pos == POS_FREE);
-		run_pages += prev_npages;
-
-		chunk->map[run_ind].npages = run_pages;
-		assert(chunk->map[run_ind].pos == POS_FREE);
-		chunk->map[run_ind + run_pages - 1].npages = run_pages;
-		assert(chunk->map[run_ind + run_pages - 1].pos == POS_FREE);
-	}
-
-	if (run_ind + run_pages < chunk_npages &&
-	    chunk->map[run_ind + run_pages].pos == POS_FREE) {
-		unsigned next_npages;
-
-		/* Coalesce with next run. */
-		next_npages = chunk->map[run_ind + run_pages].npages;
-		run_pages += next_npages;
-		assert(chunk->map[run_ind + run_pages - 1].npages ==
-		    next_npages);
-		assert(chunk->map[run_ind + run_pages - 1].pos == POS_FREE);
-
-		chunk->map[run_ind].npages = run_pages;
-		chunk->map[run_ind].pos = POS_FREE;
-		chunk->map[run_ind + run_pages - 1].npages = run_pages;
-		assert(chunk->map[run_ind + run_pages - 1].pos == POS_FREE);
-	}
-
-	if (chunk->map[run_ind].npages > chunk->max_frun_npages)
-		chunk->max_frun_npages = chunk->map[run_ind].npages;
-	if (run_ind < chunk->min_frun_ind)
-		chunk->min_frun_ind = run_ind;
-
-	/* Deallocate chunk if it is now completely unused. */
-	if (chunk->pages_used == 0)
-		arena_chunk_dealloc(arena, chunk);
-}
-
-static arena_run_t *
-arena_bin_nonfull_run_get(arena_t *arena, arena_bin_t *bin)
-{
-	arena_run_t *run;
-	unsigned i, remainder;
-
-	/* Look for a usable run. */
-	/* LINTED */
-	if ((run = RB_MIN(arena_run_tree_s, &bin->runs)) != NULL) {
-		/* run is guaranteed to have available space. */
-		/* LINTED */
-		RB_REMOVE(arena_run_tree_s, &bin->runs, run);
-#ifdef MALLOC_STATS
-		bin->stats.reruns++;
-#endif
-		return (run);
-	}
-	/* No existing runs have any space available. */
-
-	/* Allocate a new run. */
-	run = arena_run_alloc(arena, bin->run_size);
-	if (run == NULL)
-		return (NULL);
-
-	/* Initialize run internals. */
-	run->bin = bin;
-
-	for (i = 0; i < bin->regs_mask_nelms; i++)
-		run->regs_mask[i] = UINT_MAX;
-	remainder = bin->nregs & ((1 << (SIZEOF_INT_2POW + 3)) - 1);
-	if (remainder != 0) {
-		/* The last element has spare bits that need to be unset. */
-		run->regs_mask[i] = (UINT_MAX >> ((1 << (SIZEOF_INT_2POW + 3))
-		    - remainder));
-	}
-
-	run->regs_minelm = 0;
-
-	run->nfree = bin->nregs;
-#ifdef MALLOC_DEBUG
-	run->magic = ARENA_RUN_MAGIC;
-#endif
-
-#ifdef MALLOC_STATS
-	bin->stats.nruns++;
-	bin->stats.curruns++;
-	if (bin->stats.curruns > bin->stats.highruns)
-		bin->stats.highruns = bin->stats.curruns;
-#endif
-	return (run);
-}
-
-/* bin->runcur must have space available before this function is called. */
-static inline void *
-arena_bin_malloc_easy(arena_t *arena, arena_bin_t *bin, arena_run_t *run)
-{
-	void *ret;
-
-	assert(run->magic == ARENA_RUN_MAGIC);
-	assert(run->nfree > 0);
-
-	ret = arena_run_reg_alloc(run, bin);
-	assert(ret != NULL);
-	run->nfree--;
-
-	return (ret);
-}
-
-/* Re-fill bin->runcur, then call arena_bin_malloc_easy(). */
-static void *
-arena_bin_malloc_hard(arena_t *arena, arena_bin_t *bin)
-{
-
-	bin->runcur = arena_bin_nonfull_run_get(arena, bin);
-	if (bin->runcur == NULL)
-		return (NULL);
-	assert(bin->runcur->magic == ARENA_RUN_MAGIC);
-	assert(bin->runcur->nfree > 0);
-
-	return (arena_bin_malloc_easy(arena, bin, bin->runcur));
-}
-
-/*
- * Calculate bin->run_size such that it meets the following constraints:
- *
- *   *) bin->run_size >= min_run_size
- *   *) bin->run_size <= arena_maxclass
- *   *) bin->run_size <= RUN_MAX_SMALL
- *   *) run header overhead <= RUN_MAX_OVRHD (or header overhead relaxed).
- *
- * bin->nregs, bin->regs_mask_nelms, and bin->reg0_offset are
- * also calculated here, since these settings are all interdependent.
- */
-static size_t
-arena_bin_run_size_calc(arena_bin_t *bin, size_t min_run_size)
-{
-	size_t try_run_size, good_run_size;
-	unsigned good_nregs, good_mask_nelms, good_reg0_offset;
-	unsigned try_nregs, try_mask_nelms, try_reg0_offset;
-
-	assert(min_run_size >= pagesize);
-	assert(min_run_size <= arena_maxclass);
-	assert(min_run_size <= RUN_MAX_SMALL);
-
-	/*
-	 * Calculate known-valid settings before entering the run_size
-	 * expansion loop, so that the first part of the loop always copies
-	 * valid settings.
-	 *
-	 * The do..while loop iteratively reduces the number of regions until
-	 * the run header and the regions no longer overlap.  A closed formula
-	 * would be quite messy, since there is an interdependency between the
-	 * header's mask length and the number of regions.
-	 */
-	try_run_size = min_run_size;
-	try_nregs = (unsigned)(((try_run_size - sizeof(arena_run_t)) /
-	    bin->reg_size) + 1); /* Counter-act try_nregs-- in loop. */
-	do {
-		try_nregs--;
-		try_mask_nelms = (try_nregs >> (SIZEOF_INT_2POW + 3)) +
-		    ((try_nregs & ((1 << (SIZEOF_INT_2POW + 3)) - 1)) ? 1 : 0);
-		try_reg0_offset = (unsigned)(try_run_size -
-		    (try_nregs * bin->reg_size));
-	} while (sizeof(arena_run_t) + (sizeof(unsigned) * (try_mask_nelms - 1))
-	    > try_reg0_offset);
-
-	/* run_size expansion loop. */
-	do {
-		/*
-		 * Copy valid settings before trying more aggressive settings.
-		 */
-		good_run_size = try_run_size;
-		good_nregs = try_nregs;
-		good_mask_nelms = try_mask_nelms;
-		good_reg0_offset = try_reg0_offset;
-
-		/* Try more aggressive settings. */
-		try_run_size += pagesize;
-		try_nregs = (unsigned)(((try_run_size - sizeof(arena_run_t)) /
-		    bin->reg_size) + 1); /* Counter-act try_nregs-- in loop. */
-		do {
-			try_nregs--;
-			try_mask_nelms = (try_nregs >> (SIZEOF_INT_2POW + 3)) +
-			    ((try_nregs & ((1 << (SIZEOF_INT_2POW + 3)) - 1)) ?
-			    1 : 0);
-			try_reg0_offset = (unsigned)(try_run_size - (try_nregs *
-			    bin->reg_size));
-		} while (sizeof(arena_run_t) + (sizeof(unsigned) *
-		    (try_mask_nelms - 1)) > try_reg0_offset);
-	} while (try_run_size <= arena_maxclass && try_run_size <= RUN_MAX_SMALL
-	    && RUN_MAX_OVRHD * (bin->reg_size << 3) > RUN_MAX_OVRHD_RELAX
-	    && (try_reg0_offset << RUN_BFP) > RUN_MAX_OVRHD * try_run_size);
-
-	assert(sizeof(arena_run_t) + (sizeof(unsigned) * (good_mask_nelms - 1))
-	    <= good_reg0_offset);
-	assert((good_mask_nelms << (SIZEOF_INT_2POW + 3)) >= good_nregs);
-
-	/* Copy final settings. */
-	bin->run_size = good_run_size;
-	bin->nregs = good_nregs;
-	bin->regs_mask_nelms = good_mask_nelms;
-	bin->reg0_offset = good_reg0_offset;
-
-	return (good_run_size);
-}
-
-static void *
-arena_malloc(arena_t *arena, size_t size)
-{
-	void *ret;
-
-	assert(arena != NULL);
-	assert(arena->magic == ARENA_MAGIC);
-	assert(size != 0);
-	assert(QUANTUM_CEILING(size) <= arena_maxclass);
-
-	if (size <= bin_maxclass) {
-		arena_bin_t *bin;
-		arena_run_t *run;
-
-		/* Small allocation. */
-
-		if (size < small_min) {
-			/* Tiny. */
-			size = pow2_ceil(size);
-			bin = &arena->bins[ffs((int)(size >> (TINY_MIN_2POW +
-			    1)))];
-#if (!defined(NDEBUG) || defined(MALLOC_STATS))
-			/*
-			 * Bin calculation is always correct, but we may need
-			 * to fix size for the purposes of assertions and/or
-			 * stats accuracy.
-			 */
-			if (size < (1 << TINY_MIN_2POW))
-				size = (1 << TINY_MIN_2POW);
-#endif
-		} else if (size <= small_max) {
-			/* Quantum-spaced. */
-			size = QUANTUM_CEILING(size);
-			bin = &arena->bins[ntbins + (size >> opt_quantum_2pow)
-			    - 1];
-		} else {
-			/* Sub-page. */
-			size = pow2_ceil(size);
-			bin = &arena->bins[ntbins + nqbins
-			    + (ffs((int)(size >> opt_small_max_2pow)) - 2)];
-		}
-		assert(size == bin->reg_size);
-
-		malloc_mutex_lock(&arena->mtx);
-		if ((run = bin->runcur) != NULL && run->nfree > 0)
-			ret = arena_bin_malloc_easy(arena, bin, run);
-		else
-			ret = arena_bin_malloc_hard(arena, bin);
-
-		if (ret == NULL) {
-			malloc_mutex_unlock(&arena->mtx);
-			return (NULL);
-		}
-
-#ifdef MALLOC_STATS
-		bin->stats.nrequests++;
-		arena->stats.nmalloc_small++;
-		arena->stats.allocated_small += size;
-#endif
-	} else {
-		/* Large allocation. */
-		size = PAGE_CEILING(size);
-		malloc_mutex_lock(&arena->mtx);
-		ret = (void *)arena_run_alloc(arena, size);
-		if (ret == NULL) {
-			malloc_mutex_unlock(&arena->mtx);
-			return (NULL);
-		}
-#ifdef MALLOC_STATS
-		arena->stats.nmalloc_large++;
-		arena->stats.allocated_large += size;
-#endif
-	}
-
-	malloc_mutex_unlock(&arena->mtx);
-
-	if (opt_junk)
-		memset(ret, 0xa5, size);
-	else if (opt_zero)
-		memset(ret, 0, size);
-	return (ret);
-}
-
-static inline void
-arena_palloc_trim(arena_t *arena, arena_chunk_t *chunk, unsigned pageind,
-    unsigned npages)
-{
-	unsigned i;
-
-	assert(npages > 0);
-
-	/*
-	 * Modifiy the map such that arena_run_dalloc() sees the run as
-	 * separately allocated.
-	 */
-	for (i = 0; i < npages; i++) {
-		chunk->map[pageind + i].npages = npages;
-		chunk->map[pageind + i].pos = i;
-	}
-	arena_run_dalloc(arena, (arena_run_t *)((uintptr_t)chunk + (pageind <<
-	    pagesize_2pow)), npages << pagesize_2pow);
-}
-
-/* Only handles large allocations that require more than page alignment. */
-static void *
-arena_palloc(arena_t *arena, size_t alignment, size_t size, size_t alloc_size)
-{
-	void *ret;
-	size_t offset;
-	arena_chunk_t *chunk;
-	unsigned pageind, i, npages;
-
-	assert((size & pagesize_mask) == 0);
-	assert((alignment & pagesize_mask) == 0);
-
-	npages = (unsigned)(size >> pagesize_2pow);
-
-	malloc_mutex_lock(&arena->mtx);
-	ret = (void *)arena_run_alloc(arena, alloc_size);
-	if (ret == NULL) {
-		malloc_mutex_unlock(&arena->mtx);
-		return (NULL);
-	}
-
-	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ret);
-
-	offset = (uintptr_t)ret & (alignment - 1);
-	assert((offset & pagesize_mask) == 0);
-	assert(offset < alloc_size);
-	if (offset == 0) {
-		pageind = (unsigned)(((uintptr_t)ret - (uintptr_t)chunk) >>
-		    pagesize_2pow);
-
-		/* Update the map for the run to be kept. */
-		for (i = 0; i < npages; i++) {
-			chunk->map[pageind + i].npages = npages;
-			assert(chunk->map[pageind + i].pos == i);
-		}
-
-		/* Trim trailing space. */
-		arena_palloc_trim(arena, chunk, pageind + npages,
-		    (unsigned)((alloc_size - size) >> pagesize_2pow));
-	} else {
-		size_t leadsize, trailsize;
-
-		leadsize = alignment - offset;
-		ret = (void *)((uintptr_t)ret + leadsize);
-		pageind = (unsigned)(((uintptr_t)ret - (uintptr_t)chunk) >>
-		    pagesize_2pow);
-
-		/* Update the map for the run to be kept. */
-		for (i = 0; i < npages; i++) {
-			chunk->map[pageind + i].npages = npages;
-			chunk->map[pageind + i].pos = i;
-		}
-
-		/* Trim leading space. */
-		arena_palloc_trim(arena, chunk,
-		    (unsigned)(pageind - (leadsize >> pagesize_2pow)),
-		    (unsigned)(leadsize >> pagesize_2pow));
-
-		trailsize = alloc_size - leadsize - size;
-		if (trailsize != 0) {
-			/* Trim trailing space. */
-			assert(trailsize < alloc_size);
-			arena_palloc_trim(arena, chunk, pageind + npages,
-			    (unsigned)(trailsize >> pagesize_2pow));
-		}
-	}
-
-#ifdef MALLOC_STATS
-	arena->stats.nmalloc_large++;
-	arena->stats.allocated_large += size;
-#endif
-	malloc_mutex_unlock(&arena->mtx);
-
-	if (opt_junk)
-		memset(ret, 0xa5, size);
-	else if (opt_zero)
-		memset(ret, 0, size);
-	return (ret);
-}
-
-/* Return the size of the allocation pointed to by ptr. */
-static size_t
-arena_salloc(const void *ptr)
-{
-	size_t ret;
-	arena_chunk_t *chunk;
-	arena_chunk_map_t *mapelm;
-	unsigned pageind;
-
-	assert(ptr != NULL);
-	assert(CHUNK_ADDR2BASE(ptr) != ptr);
-
-	/*
-	 * No arena data structures that we query here can change in a way that
-	 * affects this function, so we don't need to lock.
-	 */
-	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
-	pageind = (unsigned)(((uintptr_t)ptr - (uintptr_t)chunk) >>
-	    pagesize_2pow);
-	mapelm = &chunk->map[pageind];
-	if (mapelm->pos != 0 || ptr != (char *)((uintptr_t)chunk) + (pageind <<
-	    pagesize_2pow)) {
-		arena_run_t *run;
-
-		pageind -= mapelm->pos;
-
-		run = (arena_run_t *)((uintptr_t)chunk + (pageind <<
-		    pagesize_2pow));
-		assert(run->magic == ARENA_RUN_MAGIC);
-		ret = run->bin->reg_size;
-	} else
-		ret = mapelm->npages << pagesize_2pow;
-
-	return (ret);
-}
-
-static void *
-arena_ralloc(void *ptr, size_t size, size_t oldsize)
-{
-	void *ret;
-
-	/* Avoid moving the allocation if the size class would not change. */
-	if (size < small_min) {
-		if (oldsize < small_min &&
-		    ffs((int)(pow2_ceil(size) >> (TINY_MIN_2POW + 1)))
-		    == ffs((int)(pow2_ceil(oldsize) >> (TINY_MIN_2POW + 1))))
-			goto IN_PLACE;
-	} else if (size <= small_max) {
-		if (oldsize >= small_min && oldsize <= small_max &&
-		    (QUANTUM_CEILING(size) >> opt_quantum_2pow)
-		    == (QUANTUM_CEILING(oldsize) >> opt_quantum_2pow))
-			goto IN_PLACE;
-	} else {
-		/*
-		 * We make no attempt to resize runs here, though it would be
-		 * possible to do so.
-		 */
-		if (oldsize > small_max && PAGE_CEILING(size) == oldsize)
-			goto IN_PLACE;
-	}
-
-	/*
-	 * If we get here, then size and oldsize are different enough that we
-	 * need to use a different size class.  In that case, fall back to
-	 * allocating new space and copying.
-	 */
-	ret = arena_malloc(choose_arena(), size);
-	if (ret == NULL)
-		return (NULL);
-
-	/* Junk/zero-filling were already done by arena_malloc(). */
-	if (size < oldsize)
-		memcpy(ret, ptr, size);
-	else
-		memcpy(ret, ptr, oldsize);
-	idalloc(ptr);
-	return (ret);
-IN_PLACE:
-	if (opt_junk && size < oldsize)
-		memset((void *)((uintptr_t)ptr + size), 0x5a, oldsize - size);
-	else if (opt_zero && size > oldsize)
-		memset((void *)((uintptr_t)ptr + oldsize), 0, size - oldsize);
-	return (ptr);
-}
-
-static void
-arena_dalloc(arena_t *arena, arena_chunk_t *chunk, void *ptr)
-{
-	unsigned pageind;
-	arena_chunk_map_t *mapelm;
-	size_t size;
-
-	assert(arena != NULL);
-	assert(arena->magic == ARENA_MAGIC);
-	assert(chunk->arena == arena);
-	assert(ptr != NULL);
-	assert(CHUNK_ADDR2BASE(ptr) != ptr);
-
-	pageind = (unsigned)(((uintptr_t)ptr - (uintptr_t)chunk) >>
-	    pagesize_2pow);
-	mapelm = &chunk->map[pageind];
-	if (mapelm->pos != 0 || ptr != (char *)((uintptr_t)chunk) + (pageind <<
-	    pagesize_2pow)) {
-		arena_run_t *run;
-		arena_bin_t *bin;
-
-		/* Small allocation. */
-
-		pageind -= mapelm->pos;
-
-		run = (arena_run_t *)((uintptr_t)chunk + (pageind <<
-		    pagesize_2pow));
-		assert(run->magic == ARENA_RUN_MAGIC);
-		bin = run->bin;
-		size = bin->reg_size;
-
-		if (opt_junk)
-			memset(ptr, 0x5a, size);
-
-		malloc_mutex_lock(&arena->mtx);
-		arena_run_reg_dalloc(run, bin, ptr, size);
-		run->nfree++;
-
-		if (run->nfree == bin->nregs) {
-			/* Deallocate run. */
-			if (run == bin->runcur)
-				bin->runcur = NULL;
-			else if (bin->nregs != 1) {
-				/*
-				 * This block's conditional is necessary because
-				 * if the run only contains one region, then it
-				 * never gets inserted into the non-full runs
-				 * tree.
-				 */
-				/* LINTED */
-				RB_REMOVE(arena_run_tree_s, &bin->runs, run);
-			}
-#ifdef MALLOC_DEBUG
-			run->magic = 0;
-#endif
-			arena_run_dalloc(arena, run, bin->run_size);
-#ifdef MALLOC_STATS
-			bin->stats.curruns--;
-#endif
-		} else if (run->nfree == 1 && run != bin->runcur) {
-			/*
-			 * Make sure that bin->runcur always refers to the
-			 * lowest non-full run, if one exists.
-			 */
-			if (bin->runcur == NULL)
-				bin->runcur = run;
-			else if ((uintptr_t)run < (uintptr_t)bin->runcur) {
-				/* Switch runcur. */
-				if (bin->runcur->nfree > 0) {
-					/* Insert runcur. */
-					/* LINTED */
-					RB_INSERT(arena_run_tree_s, &bin->runs,
-					    bin->runcur);
-				}
-				bin->runcur = run;
-			} else {
-				/* LINTED */
-				RB_INSERT(arena_run_tree_s, &bin->runs, run);
-			}
-		}
-#ifdef MALLOC_STATS
-		arena->stats.allocated_small -= size;
-		arena->stats.ndalloc_small++;
-#endif
-	} else {
-		/* Large allocation. */
-
-		size = mapelm->npages << pagesize_2pow;
-		assert((((uintptr_t)ptr) & pagesize_mask) == 0);
-
-		if (opt_junk)
-			memset(ptr, 0x5a, size);
-
-		malloc_mutex_lock(&arena->mtx);
-		arena_run_dalloc(arena, (arena_run_t *)ptr, size);
-#ifdef MALLOC_STATS
-		arena->stats.allocated_large -= size;
-		arena->stats.ndalloc_large++;
-#endif
-	}
-
-	malloc_mutex_unlock(&arena->mtx);
-}
-
-static bool
-arena_new(arena_t *arena)
-{
-	unsigned i;
-	arena_bin_t *bin;
-	size_t prev_run_size;
-
-	malloc_mutex_init(&arena->mtx);
-
-#ifdef MALLOC_STATS
-	memset(&arena->stats, 0, sizeof(arena_stats_t));
-#endif
-
-	/* Initialize chunks. */
-	RB_INIT(&arena->chunks);
-	arena->spare = NULL;
-
-	/* Initialize bins. */
-	prev_run_size = pagesize;
-
-	/* (2^n)-spaced tiny bins. */
-	for (i = 0; i < ntbins; i++) {
-		bin = &arena->bins[i];
-		bin->runcur = NULL;
-		RB_INIT(&bin->runs);
-
-		bin->reg_size = (1 << (TINY_MIN_2POW + i));
-		prev_run_size = arena_bin_run_size_calc(bin, prev_run_size);
-
-#ifdef MALLOC_STATS
-		memset(&bin->stats, 0, sizeof(malloc_bin_stats_t));
-#endif
-	}
-
-	/* Quantum-spaced bins. */
-	for (; i < ntbins + nqbins; i++) {
-		bin = &arena->bins[i];
-		bin->runcur = NULL;
-		RB_INIT(&bin->runs);
-
-		bin->reg_size = quantum * (i - ntbins + 1);
-/*
-		pow2_size = pow2_ceil(quantum * (i - ntbins + 1));
-*/
-		prev_run_size = arena_bin_run_size_calc(bin, prev_run_size);
-
-#ifdef MALLOC_STATS
-		memset(&bin->stats, 0, sizeof(malloc_bin_stats_t));
-#endif
-	}
-
-	/* (2^n)-spaced sub-page bins. */
-	for (; i < ntbins + nqbins + nsbins; i++) {
-		bin = &arena->bins[i];
-		bin->runcur = NULL;
-		RB_INIT(&bin->runs);
-
-		bin->reg_size = (small_max << (i - (ntbins + nqbins) + 1));
-
-		prev_run_size = arena_bin_run_size_calc(bin, prev_run_size);
-
-#ifdef MALLOC_STATS
-		memset(&bin->stats, 0, sizeof(malloc_bin_stats_t));
-#endif
-	}
-
-#ifdef MALLOC_DEBUG
-	arena->magic = ARENA_MAGIC;
-#endif
-
-	return (false);
-}
-
-/* Create a new arena and insert it into the arenas array at index ind. */
-static arena_t *
-arenas_extend(unsigned ind)
-{
-	arena_t *ret;
-
-	/* Allocate enough space for trailing bins. */
-	ret = (arena_t *)base_alloc(sizeof(arena_t)
-	    + (sizeof(arena_bin_t) * (ntbins + nqbins + nsbins - 1)));
-	if (ret != NULL && arena_new(ret) == false) {
-		arenas[ind] = ret;
-		return (ret);
-	}
-	/* Only reached if there is an OOM error. */
-
-	/*
-	 * OOM here is quite inconvenient to propagate, since dealing with it
-	 * would require a check for failure in the fast path.  Instead, punt
-	 * by using arenas[0].  In practice, this is an extremely unlikely
-	 * failure.
-	 */
-	_malloc_message(getprogname(),
-	    ": (malloc) Error initializing arena\n", "", "");
-	if (opt_abort)
-		abort();
-
-	return (arenas[0]);
-}
-
-/*
- * End arena.
- */
-/******************************************************************************/
-/*
- * Begin general internal functions.
- */
-
-static void *
-huge_malloc(size_t size)
-{
-	void *ret;
-	size_t csize;
-	chunk_node_t *node;
-
-	/* Allocate one or more contiguous chunks for this request. */
-
-	csize = CHUNK_CEILING(size);
-	if (csize == 0) {
-		/* size is large enough to cause size_t wrap-around. */
-		return (NULL);
-	}
-
-	/* Allocate a chunk node with which to track the chunk. */
-	node = base_chunk_node_alloc();
-	if (node == NULL)
-		return (NULL);
-
-	ret = chunk_alloc(csize);
-	if (ret == NULL) {
-		base_chunk_node_dealloc(node);
-		return (NULL);
-	}
-
-	/* Insert node into huge. */
-	node->chunk = ret;
-	node->size = csize;
-
-	malloc_mutex_lock(&chunks_mtx);
-	RB_INSERT(chunk_tree_s, &huge, node);
-#ifdef MALLOC_STATS
-	huge_nmalloc++;
-	huge_allocated += csize;
-#endif
-	malloc_mutex_unlock(&chunks_mtx);
-
-	if (opt_junk)
-		memset(ret, 0xa5, csize);
-	else if (opt_zero)
-		memset(ret, 0, csize);
-
-	return (ret);
-}
-
-/* Only handles large allocations that require more than chunk alignment. */
-static void *
-huge_palloc(size_t alignment, size_t size)
-{
-	void *ret;
-	size_t alloc_size, chunk_size, offset;
-	chunk_node_t *node;
-
-	/*
-	 * This allocation requires alignment that is even larger than chunk
-	 * alignment.  This means that huge_malloc() isn't good enough.
-	 *
-	 * Allocate almost twice as many chunks as are demanded by the size or
-	 * alignment, in order to assure the alignment can be achieved, then
-	 * unmap leading and trailing chunks.
-	 */
-	assert(alignment >= chunksize);
-
-	chunk_size = CHUNK_CEILING(size);
-
-	if (size >= alignment)
-		alloc_size = chunk_size + alignment - chunksize;
-	else
-		alloc_size = (alignment << 1) - chunksize;
-
-	/* Allocate a chunk node with which to track the chunk. */
-	node = base_chunk_node_alloc();
-	if (node == NULL)
-		return (NULL);
-
-	ret = chunk_alloc(alloc_size);
-	if (ret == NULL) {
-		base_chunk_node_dealloc(node);
-		return (NULL);
-	}
-
-	offset = (uintptr_t)ret & (alignment - 1);
-	assert((offset & chunksize_mask) == 0);
-	assert(offset < alloc_size);
-	if (offset == 0) {
-		/* Trim trailing space. */
-		chunk_dealloc((void *)((uintptr_t)ret + chunk_size), alloc_size
-		    - chunk_size);
-	} else {
-		size_t trailsize;
-
-		/* Trim leading space. */
-		chunk_dealloc(ret, alignment - offset);
-
-		ret = (void *)((uintptr_t)ret + (alignment - offset));
-
-		trailsize = alloc_size - (alignment - offset) - chunk_size;
-		if (trailsize != 0) {
-		    /* Trim trailing space. */
-		    assert(trailsize < alloc_size);
-		    chunk_dealloc((void *)((uintptr_t)ret + chunk_size),
-			trailsize);
-		}
-	}
-
-	/* Insert node into huge. */
-	node->chunk = ret;
-	node->size = chunk_size;
-
-	malloc_mutex_lock(&chunks_mtx);
-	RB_INSERT(chunk_tree_s, &huge, node);
-#ifdef MALLOC_STATS
-	huge_nmalloc++;
-	huge_allocated += chunk_size;
-#endif
-	malloc_mutex_unlock(&chunks_mtx);
-
-	if (opt_junk)
-		memset(ret, 0xa5, chunk_size);
-	else if (opt_zero)
-		memset(ret, 0, chunk_size);
-
-	return (ret);
-}
-
-static void *
-huge_ralloc(void *ptr, size_t size, size_t oldsize)
-{
-	void *ret;
-
-	/* Avoid moving the allocation if the size class would not change. */
-	if (oldsize > arena_maxclass &&
-	    CHUNK_CEILING(size) == CHUNK_CEILING(oldsize)) {
-		if (opt_junk && size < oldsize) {
-			memset((void *)((uintptr_t)ptr + size), 0x5a, oldsize
-			    - size);
-		} else if (opt_zero && size > oldsize) {
-			memset((void *)((uintptr_t)ptr + oldsize), 0, size
-			    - oldsize);
-		}
-		return (ptr);
-	}
-
-	if (CHUNK_ADDR2BASE(ptr) == ptr
-#ifdef USE_BRK
-	    && ((uintptr_t)ptr < (uintptr_t)brk_base
-	    || (uintptr_t)ptr >= (uintptr_t)brk_max)
-#endif
-	    ) {
-		chunk_node_t *node, key;
-		void *newptr;
-		size_t oldcsize;
-		size_t newcsize;
-
-		newcsize = CHUNK_CEILING(size);
-		oldcsize = CHUNK_CEILING(oldsize);
-		assert(oldcsize != newcsize);
-		if (newcsize == 0) {
-			/* size_t wrap-around */
-			return (NULL);
-		}
-
-		/*
-		 * Remove the old region from the tree now.  If mremap()
-		 * returns the region to the system, other thread may
-		 * map it for same huge allocation and insert it to the
-		 * tree before we acquire the mutex lock again.
-		 */
-		malloc_mutex_lock(&chunks_mtx);
-		key.chunk = __DECONST(void *, ptr);
-		/* LINTED */
-		node = RB_FIND(chunk_tree_s, &huge, &key);
-		assert(node != NULL);
-		assert(node->chunk == ptr);
-		assert(node->size == oldcsize);
-		RB_REMOVE(chunk_tree_s, &huge, node);
-		malloc_mutex_unlock(&chunks_mtx);
-
-		newptr = mremap(ptr, oldcsize, NULL, newcsize,
-		    MAP_ALIGNED(chunksize_2pow));
-		if (newptr == MAP_FAILED) {
-			/* We still own the old region. */
-			malloc_mutex_lock(&chunks_mtx);
-			RB_INSERT(chunk_tree_s, &huge, node);
-			malloc_mutex_unlock(&chunks_mtx);
-		} else {
-			assert(CHUNK_ADDR2BASE(newptr) == newptr);
-
-			/* Insert new or resized old region. */
-			malloc_mutex_lock(&chunks_mtx);
-			node->size = newcsize;
-			node->chunk = newptr;
-			RB_INSERT(chunk_tree_s, &huge, node);
-#ifdef MALLOC_STATS
-			huge_nralloc++;
-			huge_allocated += newcsize - oldcsize;
-			if (newcsize > oldcsize) {
-				stats_chunks.curchunks +=
-				    (newcsize - oldcsize) / chunksize;
-				if (stats_chunks.curchunks >
-				    stats_chunks.highchunks)
-					stats_chunks.highchunks =
-					    stats_chunks.curchunks;
-			} else {
-				stats_chunks.curchunks -=
-				    (oldcsize - newcsize) / chunksize;
-			}
-#endif
-			malloc_mutex_unlock(&chunks_mtx);
-
-			if (opt_junk && size < oldsize) {
-				memset((void *)((uintptr_t)newptr + size), 0x5a,
-				    newcsize - size);
-			} else if (opt_zero && size > oldsize) {
-				memset((void *)((uintptr_t)newptr + oldsize), 0,
-				    size - oldsize);
-			}
-			return (newptr);
-		}
-	}
-
-	/*
-	 * If we get here, then size and oldsize are different enough that we
-	 * need to use a different size class.  In that case, fall back to
-	 * allocating new space and copying.
-	 */
-	ret = huge_malloc(size);
-	if (ret == NULL)
-		return (NULL);
-
-	if (CHUNK_ADDR2BASE(ptr) == ptr) {
-		/* The old allocation is a chunk. */
-		if (size < oldsize)
-			memcpy(ret, ptr, size);
-		else
-			memcpy(ret, ptr, oldsize);
-	} else {
-		/* The old allocation is a region. */
-		assert(oldsize < size);
-		memcpy(ret, ptr, oldsize);
-	}
-	idalloc(ptr);
-	return (ret);
-}
-
-static void
-huge_dalloc(void *ptr)
-{
-	chunk_node_t key;
-	chunk_node_t *node;
-
-	malloc_mutex_lock(&chunks_mtx);
-
-	/* Extract from tree of huge allocations. */
-	key.chunk = ptr;
-	/* LINTED */
-	node = RB_FIND(chunk_tree_s, &huge, &key);
-	assert(node != NULL);
-	assert(node->chunk == ptr);
-	/* LINTED */
-	RB_REMOVE(chunk_tree_s, &huge, node);
-
-#ifdef MALLOC_STATS
-	huge_ndalloc++;
-	huge_allocated -= node->size;
-#endif
-
-	malloc_mutex_unlock(&chunks_mtx);
-
-	/* Unmap chunk. */
-#ifdef USE_BRK
-	if (opt_junk)
-		memset(node->chunk, 0x5a, node->size);
-#endif
-	chunk_dealloc(node->chunk, node->size);
-
-	base_chunk_node_dealloc(node);
-}
-
-static void *
-imalloc(size_t size)
-{
-	void *ret;
-
-	assert(size != 0);
-
-	if (size <= arena_maxclass)
-		ret = arena_malloc(choose_arena(), size);
-	else
-		ret = huge_malloc(size);
-
-	return (ret);
-}
-
-static void *
-ipalloc(size_t alignment, size_t size)
-{
-	void *ret;
-	size_t ceil_size;
-
-	/*
-	 * Round size up to the nearest multiple of alignment.
-	 *
-	 * This done, we can take advantage of the fact that for each small
-	 * size class, every object is aligned at the smallest power of two
-	 * that is non-zero in the base two representation of the size.  For
-	 * example:
-	 *
-	 *   Size |   Base 2 | Minimum alignment
-	 *   -----+----------+------------------
-	 *     96 |  1100000 |  32
-	 *    144 | 10100000 |  32
-	 *    192 | 11000000 |  64
-	 *
-	 * Depending on runtime settings, it is possible that arena_malloc()
-	 * will further round up to a power of two, but that never causes
-	 * correctness issues.
-	 */
-	ceil_size = (size + (alignment - 1)) & (-alignment);
-	/*
-	 * (ceil_size < size) protects against the combination of maximal
-	 * alignment and size greater than maximal alignment.
-	 */
-	if (ceil_size < size) {
-		/* size_t overflow. */
-		return (NULL);
-	}
-
-	if (ceil_size <= pagesize || (alignment <= pagesize
-	    && ceil_size <= arena_maxclass))
-		ret = arena_malloc(choose_arena(), ceil_size);
-	else {
-		size_t run_size;
-
-		/*
-		 * We can't achieve sub-page alignment, so round up alignment
-		 * permanently; it makes later calculations simpler.
-		 */
-		alignment = PAGE_CEILING(alignment);
-		ceil_size = PAGE_CEILING(size);
-		/*
-		 * (ceil_size < size) protects against very large sizes within
-		 * pagesize of SIZE_T_MAX.
-		 *
-		 * (ceil_size + alignment < ceil_size) protects against the
-		 * combination of maximal alignment and ceil_size large enough
-		 * to cause overflow.  This is similar to the first overflow
-		 * check above, but it needs to be repeated due to the new
-		 * ceil_size value, which may now be *equal* to maximal
-		 * alignment, whereas before we only detected overflow if the
-		 * original size was *greater* than maximal alignment.
-		 */
-		if (ceil_size < size || ceil_size + alignment < ceil_size) {
-			/* size_t overflow. */
-			return (NULL);
-		}
-
-		/*
-		 * Calculate the size of the over-size run that arena_palloc()
-		 * would need to allocate in order to guarantee the alignment.
-		 */
-		if (ceil_size >= alignment)
-			run_size = ceil_size + alignment - pagesize;
-		else {
-			/*
-			 * It is possible that (alignment << 1) will cause
-			 * overflow, but it doesn't matter because we also
-			 * subtract pagesize, which in the case of overflow
-			 * leaves us with a very large run_size.  That causes
-			 * the first conditional below to fail, which means
-			 * that the bogus run_size value never gets used for
-			 * anything important.
-			 */
-			run_size = (alignment << 1) - pagesize;
-		}
-
-		if (run_size <= arena_maxclass) {
-			ret = arena_palloc(choose_arena(), alignment, ceil_size,
-			    run_size);
-		} else if (alignment <= chunksize)
-			ret = huge_malloc(ceil_size);
-		else
-			ret = huge_palloc(alignment, ceil_size);
-	}
-
-	assert(((uintptr_t)ret & (alignment - 1)) == 0);
-	return (ret);
-}
-
-static void *
-icalloc(size_t size)
-{
-	void *ret;
-
-	if (size <= arena_maxclass) {
-		ret = arena_malloc(choose_arena(), size);
-		if (ret == NULL)
-			return (NULL);
-		memset(ret, 0, size);
-	} else {
-		/*
-		 * The virtual memory system provides zero-filled pages, so
-		 * there is no need to do so manually, unless opt_junk is
-		 * enabled, in which case huge_malloc() fills huge allocations
-		 * with junk.
-		 */
-		ret = huge_malloc(size);
-		if (ret == NULL)
-			return (NULL);
-
-		if (opt_junk)
-			memset(ret, 0, size);
-#ifdef USE_BRK
-		else if ((uintptr_t)ret >= (uintptr_t)brk_base
-		    && (uintptr_t)ret < (uintptr_t)brk_max) {
-			/*
-			 * This may be a re-used brk chunk.  Therefore, zero
-			 * the memory.
-			 */
-			memset(ret, 0, size);
-		}
-#endif
-	}
-
-	return (ret);
-}
-
-static size_t
-isalloc(const void *ptr)
-{
-	size_t ret;
-	arena_chunk_t *chunk;
-
-	assert(ptr != NULL);
-
-	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
-	if (chunk != ptr) {
-		/* Region. */
-		assert(chunk->arena->magic == ARENA_MAGIC);
-
-		ret = arena_salloc(ptr);
-	} else {
-		chunk_node_t *node, key;
-
-		/* Chunk (huge allocation). */
-
-		malloc_mutex_lock(&chunks_mtx);
-
-		/* Extract from tree of huge allocations. */
-		key.chunk = __DECONST(void *, ptr);
-		/* LINTED */
-		node = RB_FIND(chunk_tree_s, &huge, &key);
-		assert(node != NULL);
-
-		ret = node->size;
-
-		malloc_mutex_unlock(&chunks_mtx);
-	}
-
-	return (ret);
-}
-
-static void *
-iralloc(void *ptr, size_t size)
-{
-	void *ret;
-	size_t oldsize;
-
-	assert(ptr != NULL);
-	assert(size != 0);
-
-	oldsize = isalloc(ptr);
-
-	if (size <= arena_maxclass)
-		ret = arena_ralloc(ptr, size, oldsize);
-	else
-		ret = huge_ralloc(ptr, size, oldsize);
-
-	return (ret);
-}
-
-static void
-idalloc(void *ptr)
-{
-	arena_chunk_t *chunk;
-
-	assert(ptr != NULL);
-
-	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
-	if (chunk != ptr) {
-		/* Region. */
-		arena_dalloc(chunk->arena, chunk, ptr);
-	} else
-		huge_dalloc(ptr);
-}
-
-static void
-malloc_print_stats(void)
-{
-
-	if (opt_print_stats) {
-		char s[UMAX2S_BUFSIZE];
-		_malloc_message("___ Begin malloc statistics ___\n", "", "",
-		    "");
-		_malloc_message("Assertions ",
-#ifdef NDEBUG
-		    "disabled",
-#else
-		    "enabled",
-#endif
-		    "\n", "");
-		_malloc_message("Boolean MALLOC_OPTIONS: ",
-		    opt_abort ? "A" : "a",
-		    opt_junk ? "J" : "j",
-		    opt_hint ? "H" : "h");
-		_malloc_message(opt_utrace ? "PU" : "Pu",
-		    opt_sysv ? "V" : "v",
-		    opt_xmalloc ? "X" : "x",
-		    opt_zero ? "Z\n" : "z\n");
-
-		_malloc_message("CPUs: ", size_t2s(ncpus, s), "\n", "");
-		_malloc_message("Max arenas: ", size_t2s(narenas, s), "\n", "");
-		_malloc_message("Pointer size: ", size_t2s(sizeof(void *), s),
-		    "\n", "");
-		_malloc_message("Quantum size: ", size_t2s(quantum, s), "\n", "");
-		_malloc_message("Max small size: ", size_t2s(small_max, s), "\n",
-		    "");
-
-		_malloc_message("Chunk size: ", size_t2s(chunksize, s), "", "");
-		_malloc_message(" (2^", size_t2s((size_t)opt_chunk_2pow, s),
-		    ")\n", "");
-
-#ifdef MALLOC_STATS
-		{
-			size_t allocated, mapped;
-			unsigned i;
-			arena_t *arena;
-
-			/* Calculate and print allocated/mapped stats. */
-
-			/* arenas. */
-			for (i = 0, allocated = 0; i < narenas; i++) {
-				if (arenas[i] != NULL) {
-					malloc_mutex_lock(&arenas[i]->mtx);
-					allocated +=
-					    arenas[i]->stats.allocated_small;
-					allocated +=
-					    arenas[i]->stats.allocated_large;
-					malloc_mutex_unlock(&arenas[i]->mtx);
-				}
-			}
-
-			/* huge/base. */
-			malloc_mutex_lock(&chunks_mtx);
-			allocated += huge_allocated;
-			mapped = stats_chunks.curchunks * chunksize;
-			malloc_mutex_unlock(&chunks_mtx);
-
-			malloc_mutex_lock(&base_mtx);
-			mapped += base_mapped;
-			malloc_mutex_unlock(&base_mtx);
-
-			malloc_printf("Allocated: %zu, mapped: %zu\n",
-			    allocated, mapped);
-
-			/* Print chunk stats. */
-			{
-				chunk_stats_t chunks_stats;
-
-				malloc_mutex_lock(&chunks_mtx);
-				chunks_stats = stats_chunks;
-				malloc_mutex_unlock(&chunks_mtx);
-
-				malloc_printf("chunks: nchunks   "
-				    "highchunks    curchunks\n");
-				malloc_printf("  %13llu%13lu%13lu\n",
-				    chunks_stats.nchunks,
-				    chunks_stats.highchunks,
-				    chunks_stats.curchunks);
-			}
-
-			/* Print chunk stats. */
-			malloc_printf(
-			    "huge: nmalloc      ndalloc      "
-			    "nralloc    allocated\n");
-			malloc_printf(" %12llu %12llu %12llu %12zu\n",
-			    huge_nmalloc, huge_ndalloc, huge_nralloc,
-			    huge_allocated);
-
-			/* Print stats for each arena. */
-			for (i = 0; i < narenas; i++) {
-				arena = arenas[i];
-				if (arena != NULL) {
-					malloc_printf(
-					    "\narenas[%u] @ %p\n", i, arena);
-					malloc_mutex_lock(&arena->mtx);
-					stats_print(arena);
-					malloc_mutex_unlock(&arena->mtx);
-				}
-			}
-		}
-#endif /* #ifdef MALLOC_STATS */
-		_malloc_message("--- End malloc statistics ---\n", "", "", "");
-	}
-}
-
-/*
- * FreeBSD's pthreads implementation calls malloc(3), so the malloc
- * implementation has to take pains to avoid infinite recursion during
- * initialization.
- */
-static inline bool
-malloc_init(void)
-{
-
-	if (malloc_initialized == false)
-		return (malloc_init_hard());
-
-	return (false);
-}
-
-static bool
-malloc_init_hard(void)
-{
-	unsigned i, j;
-	ssize_t linklen;
-	char buf[PATH_MAX + 1];
-	const char *opts = "";
-	int serrno;
-
-	malloc_mutex_lock(&init_lock);
-	if (malloc_initialized) {
-		/*
-		 * Another thread initialized the allocator before this one
-		 * acquired init_lock.
-		 */
-		malloc_mutex_unlock(&init_lock);
-		return (false);
-	}
-
-	serrno = errno;
-	/* Get number of CPUs. */
-	{
-		int mib[2];
-		size_t len;
-
-		mib[0] = CTL_HW;
-		mib[1] = HW_NCPU;
-		len = sizeof(ncpus);
-		if (sysctl(mib, 2, &ncpus, &len, (void *) 0, 0) == -1) {
-			/* Error. */
-			ncpus = 1;
-		}
-	}
-
-	/* Get page size. */
-	{
-		long result;
-
-		result = sysconf(_SC_PAGESIZE);
-		assert(result != -1);
-		pagesize = (unsigned) result;
-
-		/*
-		 * We assume that pagesize is a power of 2 when calculating
-		 * pagesize_mask and pagesize_2pow.
-		 */
-		assert(((result - 1) & result) == 0);
-		pagesize_mask = result - 1;
-		pagesize_2pow = ffs((int)result) - 1;
-	}
-
-	for (i = 0; i < 3; i++) {
-		/* Get runtime configuration. */
-		switch (i) {
-		case 0:
-			if ((linklen = readlink("/etc/malloc.conf", buf,
-						sizeof(buf) - 1)) != -1) {
-				/*
-				 * Use the contents of the "/etc/malloc.conf"
-				 * symbolic link's name.
-				 */
-				buf[linklen] = '\0';
-				opts = buf;
-			} else {
-				/* No configuration specified. */
-				buf[0] = '\0';
-				opts = buf;
-			}
-			break;
-		case 1:
-			if ((opts = getenv("MALLOC_OPTIONS")) != NULL &&
-			    issetugid() == 0) {
-				/*
-				 * Do nothing; opts is already initialized to
-				 * the value of the MALLOC_OPTIONS environment
-				 * variable.
-				 */
-			} else {
-				/* No configuration specified. */
-				buf[0] = '\0';
-				opts = buf;
-			}
-			break;
-		case 2:
-			if (_malloc_options != NULL) {
-			    /*
-			     * Use options that were compiled into the program.
-			     */
-			    opts = _malloc_options;
-			} else {
-				/* No configuration specified. */
-				buf[0] = '\0';
-				opts = buf;
-			}
-			break;
-		default:
-			/* NOTREACHED */
-			/* LINTED */
-			assert(false);
-		}
-
-		for (j = 0; opts[j] != '\0'; j++) {
-			switch (opts[j]) {
-			case 'a':
-				opt_abort = false;
-				break;
-			case 'A':
-				opt_abort = true;
-				break;
-			case 'h':
-				opt_hint = false;
-				break;
-			case 'H':
-				opt_hint = true;
-				break;
-			case 'j':
-				opt_junk = false;
-				break;
-			case 'J':
-				opt_junk = true;
-				break;
-			case 'k':
-				/*
-				 * Chunks always require at least one header
-				 * page, so chunks can never be smaller than
-				 * two pages.
-				 */
-				if (opt_chunk_2pow > pagesize_2pow + 1)
-					opt_chunk_2pow--;
-				break;
-			case 'K':
-				if (opt_chunk_2pow + 1 <
-				    (int)(sizeof(size_t) << 3))
-					opt_chunk_2pow++;
-				break;
-			case 'n':
-				opt_narenas_lshift--;
-				break;
-			case 'N':
-				opt_narenas_lshift++;
-				break;
-			case 'p':
-				opt_print_stats = false;
-				break;
-			case 'P':
-				opt_print_stats = true;
-				break;
-			case 'q':
-				if (opt_quantum_2pow > QUANTUM_2POW_MIN)
-					opt_quantum_2pow--;
-				break;
-			case 'Q':
-				if (opt_quantum_2pow < pagesize_2pow - 1)
-					opt_quantum_2pow++;
-				break;
-			case 's':
-				if (opt_small_max_2pow > QUANTUM_2POW_MIN)
-					opt_small_max_2pow--;
-				break;
-			case 'S':
-				if (opt_small_max_2pow < pagesize_2pow - 1)
-					opt_small_max_2pow++;
-				break;
-			case 'u':
-				opt_utrace = false;
-				break;
-			case 'U':
-				opt_utrace = true;
-				break;
-			case 'v':
-				opt_sysv = false;
-				break;
-			case 'V':
-				opt_sysv = true;
-				break;
-			case 'x':
-				opt_xmalloc = false;
-				break;
-			case 'X':
-				opt_xmalloc = true;
-				break;
-			case 'z':
-				opt_zero = false;
-				break;
-			case 'Z':
-				opt_zero = true;
-				break;
-			default: {
-				char cbuf[2];
-				
-				cbuf[0] = opts[j];
-				cbuf[1] = '\0';
-				_malloc_message(getprogname(),
-				    ": (malloc) Unsupported character in "
-				    "malloc options: '", cbuf, "'\n");
-			}
-			}
-		}
-	}
-	errno = serrno;
-
-	/* Take care to call atexit() only once. */
-	if (opt_print_stats) {
-		/* Print statistics at exit. */
-		atexit(malloc_print_stats);
-	}
-
-	/* Set variables according to the value of opt_small_max_2pow. */
-	if (opt_small_max_2pow < opt_quantum_2pow)
-		opt_small_max_2pow = opt_quantum_2pow;
-	small_max = (1 << opt_small_max_2pow);
-
-	/* Set bin-related variables. */
-	bin_maxclass = (pagesize >> 1);
-	assert(opt_quantum_2pow >= TINY_MIN_2POW);
-	ntbins = (unsigned)(opt_quantum_2pow - TINY_MIN_2POW);
-	assert(ntbins <= opt_quantum_2pow);
-	nqbins = (unsigned)(small_max >> opt_quantum_2pow);
-	nsbins = (unsigned)(pagesize_2pow - opt_small_max_2pow - 1);
-
-	/* Set variables according to the value of opt_quantum_2pow. */
-	quantum = (1 << opt_quantum_2pow);
-	quantum_mask = quantum - 1;
-	if (ntbins > 0)
-		small_min = (quantum >> 1) + 1;
-	else
-		small_min = 1;
-	assert(small_min <= quantum);
-
-	/* Set variables according to the value of opt_chunk_2pow. */
-	chunksize = (1LU << opt_chunk_2pow);
-	chunksize_mask = chunksize - 1;
-	chunksize_2pow = (unsigned)opt_chunk_2pow;
-	chunk_npages = (unsigned)(chunksize >> pagesize_2pow);
-	{
-		unsigned header_size;
-
-		header_size = (unsigned)(sizeof(arena_chunk_t) +
-		    (sizeof(arena_chunk_map_t) * (chunk_npages - 1)));
-		arena_chunk_header_npages = (header_size >> pagesize_2pow);
-		if ((header_size & pagesize_mask) != 0)
-			arena_chunk_header_npages++;
-	}
-	arena_maxclass = chunksize - (arena_chunk_header_npages <<
-	    pagesize_2pow);
-
-	UTRACE(0, 0, 0);
-
-#ifdef MALLOC_STATS
-	memset(&stats_chunks, 0, sizeof(chunk_stats_t));
-#endif
-
-	/* Various sanity checks that regard configuration. */
-	assert(quantum >= sizeof(void *));
-	assert(quantum <= pagesize);
-	assert(chunksize >= pagesize);
-	assert(quantum * 4 <= chunksize);
-
-	/* Initialize chunks data. */
-	malloc_mutex_init(&chunks_mtx);
-	RB_INIT(&huge);
-#ifdef USE_BRK
-	malloc_mutex_init(&brk_mtx);
-	brk_base = sbrk(0);
-	brk_prev = brk_base;
-	brk_max = brk_base;
-#endif
-#ifdef MALLOC_STATS
-	huge_nmalloc = 0;
-	huge_ndalloc = 0;
-	huge_nralloc = 0;
-	huge_allocated = 0;
-#endif
-	RB_INIT(&old_chunks);
-
-	/* Initialize base allocation data structures. */
-#ifdef MALLOC_STATS
-	base_mapped = 0;
-#endif
-#ifdef USE_BRK
-	/*
-	 * Allocate a base chunk here, since it doesn't actually have to be
-	 * chunk-aligned.  Doing this before allocating any other chunks allows
-	 * the use of space that would otherwise be wasted.
-	 */
-	base_pages_alloc(0);
-#endif
-	base_chunk_nodes = NULL;
-	malloc_mutex_init(&base_mtx);
-
-	if (ncpus > 1) {
-		/*
-		 * For SMP systems, create four times as many arenas as there
-		 * are CPUs by default.
-		 */
-		opt_narenas_lshift += 2;
-	}
-
-	/* Determine how many arenas to use. */
-	narenas = ncpus;
-	if (opt_narenas_lshift > 0) {
-		if ((narenas << opt_narenas_lshift) > narenas)
-			narenas <<= opt_narenas_lshift;
-		/*
-		 * Make sure not to exceed the limits of what base_malloc()
-		 * can handle.
-		 */
-		if (narenas * sizeof(arena_t *) > chunksize)
-			narenas = (unsigned)(chunksize / sizeof(arena_t *));
-	} else if (opt_narenas_lshift < 0) {
-		if ((narenas << opt_narenas_lshift) < narenas)
-			narenas <<= opt_narenas_lshift;
-		/* Make sure there is at least one arena. */
-		if (narenas == 0)
-			narenas = 1;
-	}
-
-	next_arena = 0;
-
-	/* Allocate and initialize arenas. */
-	arenas = (arena_t **)base_alloc(sizeof(arena_t *) * narenas);
-	if (arenas == NULL) {
-		malloc_mutex_unlock(&init_lock);
-		return (true);
-	}
-	/*
-	 * Zero the array.  In practice, this should always be pre-zeroed,
-	 * since it was just mmap()ed, but let's be sure.
-	 */
-	memset(arenas, 0, sizeof(arena_t *) * narenas);
-
-	/*
-	 * Initialize one arena here.  The rest are lazily created in
-	 * arena_choose_hard().
-	 */
-	arenas_extend(0);
-	if (arenas[0] == NULL) {
-		malloc_mutex_unlock(&init_lock);
-		return (true);
-	}
-
-	malloc_mutex_init(&arenas_mtx);
-
-	malloc_initialized = true;
-	malloc_mutex_unlock(&init_lock);
-	return (false);
-}
-
-/*
- * End general internal functions.
- */
-/******************************************************************************/
-/*
- * Begin malloc(3)-compatible functions.
- */
-
-void *
-malloc(size_t size)
-{
-	void *ret;
-
-	if (malloc_init()) {
-		ret = NULL;
-		goto RETURN;
-	}
-
-	if (size == 0) {
-		if (opt_sysv == false)
-			size = 1;
-		else {
-			ret = NULL;
-			goto RETURN;
-		}
-	}
-
-	ret = imalloc(size);
-
-RETURN:
-	if (ret == NULL) {
-		if (opt_xmalloc) {
-			_malloc_message(getprogname(),
-			    ": (malloc) Error in malloc(): out of memory\n", "",
-			    "");
-			abort();
-		}
-		errno = ENOMEM;
-	}
-
-	UTRACE(0, size, ret);
-	return (ret);
-}
-
-int
-posix_memalign(void **memptr, size_t alignment, size_t size)
-{
-	int ret;
-	void *result;
-
-	if (malloc_init())
-		result = NULL;
-	else {
-		/* Make sure that alignment is a large enough power of 2. */
-		if (((alignment - 1) & alignment) != 0
-		    || alignment < sizeof(void *)) {
-			if (opt_xmalloc) {
-				_malloc_message(getprogname(),
-				    ": (malloc) Error in posix_memalign(): "
-				    "invalid alignment\n", "", "");
-				abort();
-			}
-			result = NULL;
-			ret = EINVAL;
-			goto RETURN;
-		}
-
-		result = ipalloc(alignment, size);
-	}
-
-	if (result == NULL) {
-		if (opt_xmalloc) {
-			_malloc_message(getprogname(),
-			": (malloc) Error in posix_memalign(): out of memory\n",
-			"", "");
-			abort();
-		}
-		ret = ENOMEM;
-		goto RETURN;
-	}
-
-	*memptr = result;
-	ret = 0;
-
-RETURN:
-	UTRACE(0, size, result);
-	return (ret);
-}
-
-void *
-calloc(size_t num, size_t size)
-{
-	void *ret;
-	size_t num_size;
-
-	if (malloc_init()) {
-		num_size = 0;
-		ret = NULL;
-		goto RETURN;
-	}
-
-	num_size = num * size;
-	if (num_size == 0) {
-		if ((opt_sysv == false) && ((num == 0) || (size == 0)))
-			num_size = 1;
-		else {
-			ret = NULL;
-			goto RETURN;
-		}
-	/*
-	 * Try to avoid division here.  We know that it isn't possible to
-	 * overflow during multiplication if neither operand uses any of the
-	 * most significant half of the bits in a size_t.
-	 */
-	} else if ((unsigned long long)((num | size) &
-	   ((unsigned long long)SIZE_T_MAX << (sizeof(size_t) << 2))) &&
-	   (num_size / size != num)) {
-		/* size_t overflow. */
-		ret = NULL;
-		goto RETURN;
-	}
-
-	ret = icalloc(num_size);
-
-RETURN:
-	if (ret == NULL) {
-		if (opt_xmalloc) {
-			_malloc_message(getprogname(),
-			    ": (malloc) Error in calloc(): out of memory\n", "",
-			    "");
-			abort();
-		}
-		errno = ENOMEM;
-	}
-
-	UTRACE(0, num_size, ret);
-	return (ret);
-}
-
-void *
-realloc(void *ptr, size_t size)
-{
-	void *ret;
-
-	if (size == 0) {
-		if (opt_sysv == false)
-			size = 1;
-		else {
-			if (ptr != NULL)
-				idalloc(ptr);
-			ret = NULL;
-			goto RETURN;
-		}
-	}
-
-	if (ptr != NULL) {
-		assert(malloc_initialized);
-
-		ret = iralloc(ptr, size);
-
-		if (ret == NULL) {
-			if (opt_xmalloc) {
-				_malloc_message(getprogname(),
-				    ": (malloc) Error in realloc(): out of "
-				    "memory\n", "", "");
-				abort();
-			}
-			errno = ENOMEM;
-		}
-	} else {
-		if (malloc_init())
-			ret = NULL;
-		else
-			ret = imalloc(size);
-
-		if (ret == NULL) {
-			if (opt_xmalloc) {
-				_malloc_message(getprogname(),
-				    ": (malloc) Error in realloc(): out of "
-				    "memory\n", "", "");
-				abort();
-			}
-			errno = ENOMEM;
-		}
-	}
-
-RETURN:
-	UTRACE(ptr, size, ret);
-	return (ret);
-}
-
-void
-free(void *ptr)
-{
-
-	UTRACE(ptr, 0, 0);
-	if (ptr != NULL) {
-		assert(malloc_initialized);
-
-		idalloc(ptr);
-	}
-}
-
-/*
- * End malloc(3)-compatible functions.
- */
-/******************************************************************************/
-/*
- * Begin non-standard functions.
- */
-#ifndef __minix
-size_t
-malloc_usable_size(const void *ptr)
-{
-
-	assert(ptr != NULL);
-
-	return (isalloc(ptr));
-}
-#endif
-
-/*
- * End non-standard functions.
- */
-/******************************************************************************/
-/*
- * Begin library-private functions, used by threading libraries for protection
- * of malloc during fork().  These functions are only called if the program is
- * running in threaded mode, so there is no need to check whether the program
- * is threaded here.
- */
-
-void
-_malloc_prefork(void)
-{
-	unsigned i;
-
-	/* Acquire all mutexes in a safe order. */
-
-	malloc_mutex_lock(&arenas_mtx);
-	for (i = 0; i < narenas; i++) {
-		if (arenas[i] != NULL)
-			malloc_mutex_lock(&arenas[i]->mtx);
-	}
-
-	malloc_mutex_lock(&base_mtx);
-
-	malloc_mutex_lock(&chunks_mtx);
-}
-
-void
-_malloc_postfork(void)
-{
-	unsigned i;
-
-	/* Release all mutexes, now that fork() has completed. */
-
-	malloc_mutex_unlock(&chunks_mtx);
-
-	malloc_mutex_unlock(&base_mtx);
-
-	for (i = 0; i < narenas; i++) {
-		if (arenas[i] != NULL)
-			malloc_mutex_unlock(&arenas[i]->mtx);
-	}
-	malloc_mutex_unlock(&arenas_mtx);
-}
-
-/*
- * End library-private functions.
- */
-/******************************************************************************/
diff --git a/lib/libc/stdlib/jrand48.c b/lib/libc/stdlib/jrand48.c
deleted file mode 100644
index 079dbd30c..000000000
--- a/lib/libc/stdlib/jrand48.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*	$NetBSD: jrand48.c,v 1.9 2013/10/22 08:08:51 matt Exp $	*/
-
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: jrand48.c,v 1.9 2013/10/22 08:08:51 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-
-#include "rand48.h"
-
-#ifdef __weak_alias
-__weak_alias(jrand48,_jrand48)
-#endif
-
-long
-jrand48(unsigned short xseed[3])
-{
-
-	_DIAGASSERT(xseed != NULL);
-
-	__dorand48(xseed);
-	return (int16_t)xseed[2] * 65536 + xseed[1];
-}
diff --git a/lib/libc/stdlib/l64a.c b/lib/libc/stdlib/l64a.c
deleted file mode 100644
index bc78ab1ea..000000000
--- a/lib/libc/stdlib/l64a.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: l64a.c,v 1.14 2012/03/13 21:13:48 christos Exp $	*/
-
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: l64a.c,v 1.14 2012/03/13 21:13:48 christos Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(l64a,_l64a)
-__weak_alias(l64a_r,_l64a_r)
-#endif
-
-char *
-l64a(long value)
-{
-	static char buf[8];
-
-	(void)l64a_r(value, buf, (int)sizeof (buf));
-	return buf;
-}
-
-int
-l64a_r(long value, char *buffer, int buflen)
-{
-	char *s = buffer;
-	int digit;
-	unsigned long v = value;
-
-	_DIAGASSERT(buffer != NULL);
-
-	if (value == 0UL) 
-		goto out;
-
-	for (; v != 0 && buflen > 1; s++, buflen--) {
-		digit = (int)(v & 0x3f);
-
-		if (digit < 2) 
-			*s = digit + '.';
-		else if (digit < 12)
-			*s = digit + '0' - 2;
-		else if (digit < 38)
-			*s = digit + 'A' - 12;
-		else
-			*s = digit + 'a' - 38;
-		v >>= 6;
-	}
-
-out:
-	*s = '\0';
-
-	return (v == 0UL ? 0 : -1);
-}
diff --git a/lib/libc/stdlib/labs.c b/lib/libc/stdlib/labs.c
deleted file mode 100644
index 72e2cce97..000000000
--- a/lib/libc/stdlib/labs.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: labs.c,v 1.8 2012/06/25 22:32:45 abs Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)labs.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: labs.c,v 1.8 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdlib.h>
-
-long
-labs(long j)
-{
-	return(j < 0 ? -j : j);
-}
diff --git a/lib/libc/stdlib/lcong48.c b/lib/libc/stdlib/lcong48.c
deleted file mode 100644
index 42ce9790f..000000000
--- a/lib/libc/stdlib/lcong48.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$NetBSD: lcong48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $	*/
-
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: lcong48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-
-#include "rand48.h"
-
-#ifdef __weak_alias
-__weak_alias(lcong48,_lcong48)
-#endif
-
-void
-lcong48(unsigned short p[7])
-{
-	_DIAGASSERT(p != NULL);
-
-	__rand48_seed[0] = p[0];
-	__rand48_seed[1] = p[1];
-	__rand48_seed[2] = p[2];
-	__rand48_mult[0] = p[3];
-	__rand48_mult[1] = p[4];
-	__rand48_mult[2] = p[5];
-	__rand48_add = p[6];
-}
diff --git a/lib/libc/stdlib/ldiv.c b/lib/libc/stdlib/ldiv.c
deleted file mode 100644
index 507c831bf..000000000
--- a/lib/libc/stdlib/ldiv.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: ldiv.c,v 1.8 2012/06/25 22:32:45 abs Exp $	*/
-
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)ldiv.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: ldiv.c,v 1.8 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdlib.h>		/* ldiv_t */
-
-ldiv_t
-ldiv(long num, long denom)
-{
-	ldiv_t r;
-
-	/* see div.c for comments */
-
-	r.quot = num / denom;
-	r.rem = num % denom;
-	if (num >= 0 && r.rem < 0) {
-		r.quot++;
-		r.rem -= denom;
-	}
-	return (r);
-}
diff --git a/lib/libc/stdlib/llabs.c b/lib/libc/stdlib/llabs.c
deleted file mode 100644
index 089281471..000000000
--- a/lib/libc/stdlib/llabs.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: llabs.c,v 1.4 2012/06/25 22:32:45 abs Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "from: @(#)labs.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: llabs.c,v 1.4 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(llabs, _llabs)
-#endif
-
-/* LONGLONG */
-long long int
-llabs(long long int j)
-{
-	return (j < 0 ? -j : j);
-}
diff --git a/lib/libc/stdlib/lldiv.c b/lib/libc/stdlib/lldiv.c
deleted file mode 100644
index 47104b378..000000000
--- a/lib/libc/stdlib/lldiv.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: lldiv.c,v 1.4 2012/06/25 22:32:45 abs Exp $	*/
-
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "from: @(#)ldiv.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: lldiv.c,v 1.4 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <stdlib.h>		/* lldiv_t */
-
-#ifdef __weak_alias
-__weak_alias(lldiv, _lldiv)
-#endif
-
-/* LONGLONG */
-lldiv_t
-lldiv(long long int num, long long int denom)
-{
-	lldiv_t r;
-
-	/* see div.c for comments */
-
-	r.quot = num / denom;
-	r.rem = num % denom;
-	if (num >= 0 && r.rem < 0) {
-		r.quot++;
-		r.rem -= denom;
-	}
-	return (r);
-}
diff --git a/lib/libc/stdlib/local.h b/lib/libc/stdlib/local.h
deleted file mode 100644
index 285a9b448..000000000
--- a/lib/libc/stdlib/local.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: local.h,v 1.6 2010/11/14 18:11:43 tron Exp $	*/
-
-/*
- * Copyright (c) 1997 Christos Zoulas.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-/* Environment handling. */
-
-#include <sys/types.h>
-#include <stdbool.h>
-
-extern size_t __envvarnamelen(const char *str, bool withequal);
-
-extern void __freeenvvar(char *envvar);
-extern char *__allocenvvar(size_t length);
-extern bool __canoverwriteenvvar(char *envvar, size_t length);
diff --git a/lib/libc/stdlib/lrand48.c b/lib/libc/stdlib/lrand48.c
deleted file mode 100644
index 11e64855b..000000000
--- a/lib/libc/stdlib/lrand48.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*	$NetBSD: lrand48.c,v 1.9 2013/10/22 08:08:51 matt Exp $	*/
-
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: lrand48.c,v 1.9 2013/10/22 08:08:51 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "rand48.h"
-
-#ifdef __weak_alias
-__weak_alias(lrand48,_lrand48)
-#endif
-
-long
-lrand48(void)
-{
-	__dorand48(__rand48_seed);
-	return __rand48_seed[2] * 32768 + (__rand48_seed[1] >> 1);
-}
diff --git a/lib/libc/stdlib/lsearch.3 b/lib/libc/stdlib/lsearch.3
deleted file mode 100644
index d34a5a8d0..000000000
--- a/lib/libc/stdlib/lsearch.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\" Copyright (c) 1989, 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. 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: @(#)lsearch.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: lsearch.3,v 1.3 2005/07/12 08:28:42 wiz Exp $
-.\"
-.Dd July 6, 2005
-.Dt LSEARCH 3
-.Os
-.Sh NAME
-.Nm lsearch ,
-.Nm lfind
-.Nd linear searching routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In search.h
-.Ft void *
-.Fn lsearch "const void *key" "void *base" "size_t *nelp" "size_t width" "int (*compar)(const void *, const void *)"
-.Ft void *
-.Fn lfind "const void *key" "const void *base" "size_t *nelp" "size_t width" "int (*compar)(const void *, const void *)"
-.Sh DESCRIPTION
-The functions
-.Fn lsearch ,
-and
-.Fn lfind
-provide basic linear searching functionality.
-.Pp
-.Fa base
-is the pointer to the beginning of an array.
-The argument
-.Fa nelp
-is the current number of elements in the array, where each element
-is
-.Fa width
-bytes long.
-The
-.Fa compar
-argument points to a function which compares its two arguments and returns
-zero if they are matching, and non-zero otherwise.
-.Pp
-The
-.Fn lsearch
-and
-.Fn lfind
-functions
-return a pointer into the array referenced by
-.Fa base
-where
-.Fa key
-is located.
-If
-.Fa key
-does not exist,
-.Fn lfind
-will return a null pointer and
-.Fn lsearch
-will add it to the array.
-When an element is added to the array by
-.Fn lsearch
-the location referenced by the argument
-.Fa nelp
-is incremented by one.
-.Sh SEE ALSO
-.Xr bsearch 3 ,
-.Xr db 3
-.Sh STANDARDS
-The
-.Fn lsearch
-and
-.Fn lfind
-functions conform to
-.St -p1003.1-2001 .
diff --git a/lib/libc/stdlib/lsearch.c b/lib/libc/stdlib/lsearch.c
deleted file mode 100644
index e17130b63..000000000
--- a/lib/libc/stdlib/lsearch.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Roger L. Snyder.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)lsearch.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: lsearch.c,v 1.7 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <search.h>
-
-typedef int (*cmp_fn_t)(const void *, const void *);
-static void *linear_base(const void *, void *, size_t *, size_t,
-			     cmp_fn_t, int);
-
-void *
-lsearch(const void *key, void *base, size_t *nelp, size_t width,
-    cmp_fn_t compar)
-{
-
-	_DIAGASSERT(key != NULL);
-	_DIAGASSERT(base != NULL);
-	_DIAGASSERT(compar != NULL);
-
-	return(linear_base(key, base, nelp, width, compar, 1));
-}
-
-void *
-lfind(const void *key, const void *base, size_t *nelp, size_t width,
-    cmp_fn_t compar)
-{
-
-	_DIAGASSERT(key != NULL);
-	_DIAGASSERT(base != NULL);
-	_DIAGASSERT(compar != NULL);
-
-	return(linear_base(key, __UNCONST(base), nelp, width, compar, 0));
-}
-
-static void *
-linear_base(const void *key, void *base, size_t *nelp, size_t width,
-	cmp_fn_t compar, int add_flag)
-{
-	char *element, *end;
-
-	_DIAGASSERT(key != NULL);
-	_DIAGASSERT(base != NULL);
-	_DIAGASSERT(compar != NULL);
-
-	end = (char *)base + *nelp * width;
-	for (element = (char *)base; element < end; element += width)
-		if (!compar(element, key))		/* key found */
-			return element;
-
-	if (!add_flag)					/* key not found */
-		return(NULL);
-
-	/*
-	 * The UNIX System User's Manual, 1986 edition claims that
-	 * a NULL pointer is returned by lsearch with errno set
-	 * appropriately, if there is not enough room in the table
-	 * to add a new item.  This can't be done as none of these
-	 * routines have any method of determining the size of the
-	 * table.  This comment isn't in the 1986-87 System V
-	 * manual.
-	 */
-	++*nelp;
-	memcpy(end, key, width);
-	return end;
-}
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
deleted file mode 100644
index 3a98d55b5..000000000
--- a/lib/libc/stdlib/malloc.3
+++ /dev/null
@@ -1,311 +0,0 @@
-.\" $NetBSD: malloc.3,v 1.44 2015/07/26 22:32:03 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)malloc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.73 2007/06/15 22:32:33 jasone Exp $
-.\"
-.Dd July 26, 2015
-.Dt MALLOC 3
-.Os
-.Sh NAME
-.Nm malloc , calloc , realloc , free
-.Nd general purpose memory allocation functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void *
-.Fn malloc "size_t size"
-.Ft void *
-.Fn calloc "size_t number" "size_t size"
-.Ft void *
-.Fn realloc "void *ptr" "size_t size"
-.Ft void
-.Fn free "void *ptr"
-.Sh DESCRIPTION
-The
-.Fn malloc
-function allocates
-.Fa size
-bytes of uninitialized memory.
-The allocated space is suitably aligned (after possible pointer coercion)
-for storage of any type of object.
-.Pp
-The
-.Fn calloc
-function allocates space for
-.Fa number
-objects,
-each
-.Fa size
-bytes in length.
-The result is identical to calling
-.Fn malloc
-with an argument of
-.Dq "number * size" ,
-with the exception that the allocated memory is explicitly initialized
-to zero bytes.
-.Pp
-The
-.Fn realloc
-function changes the size of the previously allocated memory referenced by
-.Fa ptr
-to
-.Fa size
-bytes.
-The contents of the memory are unchanged up to the lesser of the new and
-old sizes.
-If the new size is larger,
-the value of the newly allocated portion of the memory is undefined.
-Upon success, the memory referenced by
-.Fa ptr
-is freed and a pointer to the newly allocated memory is returned.
-.Pp
-Note that
-.Fn realloc
-may move the memory allocation, resulting in a different return value than
-.Fa ptr .
-If
-.Fa ptr
-is
-.Dv NULL ,
-the
-.Fn realloc
-function behaves identically to
-.Fn malloc
-for the specified size.
-.Pp
-The
-.Fn free
-function causes the allocated memory referenced by
-.Fa ptr
-to be made available for future allocations.
-If
-.Fa ptr
-is
-.Dv NULL ,
-no action occurs.
-.Sh RETURN VALUES
-The
-.Fn malloc
-and
-.Fn calloc
-functions return a pointer to the allocated memory if successful; otherwise
-a
-.Dv NULL
-pointer is returned and
-.Va errno
-is set to
-.Er ENOMEM .
-.Pp
-The
-.Fn realloc
-function returns a pointer, possibly identical to
-.Fa ptr ,
-to the allocated memory
-if successful; otherwise a
-.Dv NULL
-pointer is returned, and
-.Va errno
-is set to
-.Er ENOMEM
-if the error was the result of an allocation failure.
-The
-.Fn realloc
-function always leaves the original buffer intact
-when an error occurs.
-.Pp
-The
-.Fn free
-function returns no value.
-.Sh EXAMPLES
-When using
-.Fn malloc ,
-be careful to avoid the following idiom:
-.Bd -literal -offset indent
-if ((p = malloc(number * size)) == NULL)
-	err(EXIT_FAILURE, "malloc");
-.Ed
-.Pp
-The multiplication may lead to an integer overflow.
-To avoid this,
-.Xr reallocarr 3
-is recommended.
-.Pp
-If
-.Fn malloc
-must be used, be sure to test for overflow:
-.Bd -literal -offset indent
-if (size && number > SIZE_MAX / size) {
-	errno = EOVERFLOW;
-	err(EXIT_FAILURE, "allocation");
-}
-.Ed
-.Pp
-The above test is not sufficient in all cases.
-For example, multiplying ints requires a different set of checks:
-.Bd -literal -offset indent
-int num, size;
-\&.\&.\&.
-
-/* Avoid invalid requests */
-if (size < 0 || num < 0)
-	errc(1, EOVERFLOW, "overflow");
-
-/* Check for signed int overflow */
-if (size && num > INT_MAX / size)
-	errc(1, EOVERFLOW, "overflow");
-
-if ((p = malloc(size * num)) == NULL)
-	err(1, "malloc");
-.Ed
-.Pp
-Assuming the implementation checks for integer overflow as
-.Nx
-does, it is much easier to use
-.Fn calloc
-or
-.Xr reallocarr 3 .
-.Pp
-The above examples could be simplified to:
-.Bd -literal -offset indent
-ptr = NULL;
-if ((e = reallocarr(&ptr, num, size)))
-	errx(1, "reallocarr", strerror(e));
-.Ed
-.Bd -literal -offset indent
-or at the cost of initialization:
-if ((p = calloc(num, size)) == NULL)
-	err(1, "calloc");
-.Ed
-.Pp
-When using
-.Fn realloc ,
-one must be careful to avoid the following idiom:
-.Bd -literal -offset indent
-nsize += 50;
-
-if ((p = realloc(p, nsize)) == NULL)
-	return NULL;
-.Ed
-.Pp
-Do not adjust the variable describing how much memory has been allocated
-until it is known that the allocation has been successful.
-This can cause aberrant program behavior if the incorrect size value is used.
-In most cases, the above example will also leak memory.
-As stated earlier, a return value of
-.Dv NULL
-indicates that the old object still remains allocated.
-Better code looks like this:
-.Bd -literal -offset indent
-newsize = size + 50;
-
-if ((p2 = realloc(p, newsize)) == NULL) {
-
-	if (p != NULL)
-		free(p);
-
-	p = NULL;
-	return NULL;
-}
-
-p = p2;
-size = newsize;
-.Ed
-.Sh SEE ALSO
-.\" .Xr limits 1 ,
-.Xr madvise 2 ,
-.Xr mmap 2 ,
-.Xr sbrk 2 ,
-.Xr alloca 3 ,
-.Xr atexit 3 ,
-.Xr getpagesize 3 ,
-.Xr memory 3 ,
-.Xr posix_memalign 3 ,
-.Xr reallocarr 3
-.Pp
-For the implementation details, see
-.Xr jemalloc 3 .
-.Sh STANDARDS
-The
-.Fn malloc ,
-.Fn calloc ,
-.Fn realloc
-and
-.Fn free
-functions conform to
-.St -isoC .
-.Sh HISTORY
-A
-.Fn free
-internal kernel function and a predecessor to
-.Fn malloc ,
-.Fn alloc ,
-first appeared in
-.At v1 .
-The C Library functions
-.Fn alloc
-and
-.Fn free
-appeared in
-.At v6 .
-The functions
-.Fn malloc ,
-.Fn calloc ,
-and
-.Fn realloc
-first appeared in
-.At v7 .
-.Pp
-A new implementation by Chris Kingsley was introduced in
-.Bx 4.2 ,
-followed by a complete rewrite by Poul-Henning Kamp
-.Dq ( phk's malloc
-or
-.Dq new malloc )
-which appeared in
-.Fx 2.2
-and was included in
-.Nx 1.5
-and
-.Ox 2.0 .
-These implementations were all
-.Xr sbrk 2
-based.
-.Pp
-The
-.Xr jemalloc 3
-allocator became the default system allocator first in
-.Fx 7.0
-and then in
-.Nx 5.0 .
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
deleted file mode 100644
index f2a96d63b..000000000
--- a/lib/libc/stdlib/malloc.c
+++ /dev/null
@@ -1,1335 +0,0 @@
-/*	$NetBSD: malloc.c,v 1.56 2014/09/18 13:58:20 christos Exp $	*/
-
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * From FreeBSD: malloc.c,v 1.91 2006/01/12 07:28:20 jasone
- *
- */
-
-#if defined(__minix)
-#include "extern.h"
-#ifdef _LIBSYS
-#include <minix/sysutil.h>
-#include <machine/param.h>
-#include <machine/vmparam.h>
-#define MALLOC_NO_SYSCALLS
-#define wrtwarning(w) printf("libminc malloc warning: %s\n", w)
-#define wrterror(w) panic("libminc malloc error: %s\n", w)
-#endif
-#endif /* defined(__minix) */
-
-/*
- * Defining MALLOC_EXTRA_SANITY will enable extra checks which are related
- * to internal conditions and consistency in malloc.c. This has a
- * noticeable runtime performance hit, and generally will not do you
- * any good unless you fiddle with the internals of malloc or want
- * to catch random pointer corruption as early as possible.
- */
-#ifndef MALLOC_EXTRA_SANITY
-#undef MALLOC_EXTRA_SANITY
-#endif
-
-/*
- * What to use for Junk.  This is the byte value we use to fill with
- * when the 'J' option is enabled.
- */
-#define SOME_JUNK	0xd0		/* as in "Duh" :-) */
-
-/*
- * The basic parameters you can tweak.
- *
- * malloc_minsize	minimum size of an allocation in bytes.
- *			If this is too small it's too much work
- *			to manage them.  This is also the smallest
- *			unit of alignment used for the storage
- *			returned by malloc/realloc.
- *
- */
-
-#include "namespace.h"
-#if defined(__FreeBSD__)
-#   if defined(__i386__)
-#       define malloc_minsize		16U
-#   endif
-#   if defined(__ia64__)
-#	define malloc_pageshift		13U
-#	define malloc_minsize		16U
-#   endif
-#   if defined(__alpha__)
-#       define malloc_pageshift		13U
-#       define malloc_minsize		16U
-#   endif
-#   if defined(__sparc64__)
-#       define malloc_pageshift		13U
-#       define malloc_minsize		16U
-#   endif
-#   if defined(__amd64__)
-#       define malloc_pageshift		12U
-#       define malloc_minsize		16U
-#   endif
-#   if defined(__arm__)
-#       define malloc_pageshift         12U
-#       define malloc_minsize           16U
-#   endif
-#   define HAS_UTRACE
-#   define UTRACE_LABEL
-
-#include <sys/cdefs.h>
-void utrace(struct ut *, int);
-
-    /*
-     * Make malloc/free/realloc thread-safe in libc for use with
-     * kernel threads.
-     */
-#   include "libc_private.h"
-#   include "spinlock.h"
-    static spinlock_t thread_lock	= _SPINLOCK_INITIALIZER;
-#   define _MALLOC_LOCK()		if (__isthreaded) _SPINLOCK(&thread_lock);
-#   define _MALLOC_UNLOCK()		if (__isthreaded) _SPINUNLOCK(&thread_lock);
-#endif /* __FreeBSD__ */
-
-#if defined(__minix)
-/* #undef these things so that malloc uses the non-internal symbols.
- * This is necessary for VM to be able to define its own versions, and
- * use this malloc.
- */
-#undef mmap
-#undef munmap
-#endif /* defined(__minix) */
-
-#include <sys/types.h>
-#ifdef __minix /* MINIX-specific tracing and locking */
-#define malloc_minsize 16U
-#define HAS_UTRACE
-#define UTRACE_LABEL "malloc",
-#include <sys/cdefs.h>
-#include "extern.h"
-#if defined(LIBC_SCCS) && !defined(lint)
-    __RCSID("$NetBSD: malloc.c,v 1.56 2014/09/18 13:58:20 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-    int utrace(const char *, void *, size_t);
-
-#include <reentrant.h>
-    extern int __isthreaded;
-    static mutex_t thread_lock = MUTEX_INITIALIZER;
-#define _MALLOC_LOCK()                                                     \
-      if (__isthreaded)                                                        \
-        mutex_lock(&thread_lock);
-#define _MALLOC_UNLOCK()                                                   \
-      if (__isthreaded)                                                        \
-        mutex_unlock(&thread_lock);
-#endif /* __minix */
-
-#if defined(__sparc__) && defined(sun)
-#define malloc_minsize 16U
-#define MAP_ANON (0)
-    static int fdzero;
-#   define MMAP_FD	fdzero
-#   define INIT_MMAP() \
-	{ if ((fdzero = open(_PATH_DEVZERO, O_RDWR | O_CLOEXEC, 0000)) == -1) \
-	    wrterror("open of /dev/zero"); }
-#endif /* __sparc__ */
-
-/* Insert your combination here... */
-#if defined(__FOOCPU__) && defined(__BAROS__)
-#   define malloc_minsize		16U
-#endif /* __FOOCPU__ && __BAROS__ */
-
-#ifndef ZEROSIZEPTR
-#define ZEROSIZEPTR	((void *)(uintptr_t)(1UL << (malloc_pageshift - 1)))
-#endif
-
-/*
- * No user serviceable parts behind this point.
- */
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-/*
- * This structure describes a page worth of chunks.
- */
-
-struct pginfo {
-    struct pginfo	*next;	/* next on the free list */
-    void		*page;	/* Pointer to the page */
-    u_short		size;	/* size of this page's chunks */
-    u_short		shift;	/* How far to shift for this size chunks */
-    u_short		free;	/* How many free chunks */
-    u_short		total;	/* How many chunk */
-    u_int		bits[1]; /* Which chunks are free */
-};
-
-/*
- * This structure describes a number of free pages.
- */
-
-struct pgfree {
-    struct pgfree	*next;	/* next run of free pages */
-    struct pgfree	*prev;	/* prev run of free pages */
-    void		*page;	/* pointer to free pages */
-    void		*end;	/* pointer to end of free pages */
-    size_t		size;	/* number of bytes free */
-};
-
-/*
- * How many bits per u_int in the bitmap.
- * Change only if not 8 bits/byte
- */
-#define	MALLOC_BITS	((int)(8*sizeof(u_int)))
-
-/*
- * Magic values to put in the page_directory
- */
-#define MALLOC_NOT_MINE	((struct pginfo*) 0)
-#define MALLOC_FREE 	((struct pginfo*) 1)
-#define MALLOC_FIRST	((struct pginfo*) 2)
-#define MALLOC_FOLLOW	((struct pginfo*) 3)
-#define MALLOC_MAGIC	((struct pginfo*) 4)
-
-/*
- * Page size related parameters, computed at run-time.
- */
-static size_t malloc_pagesize;
-static size_t malloc_pageshift;
-static size_t malloc_pagemask;
-
-#ifndef malloc_minsize
-#define malloc_minsize			16U
-#endif
-
-#ifndef malloc_maxsize
-#define malloc_maxsize			((malloc_pagesize)>>1)
-#endif
-
-#define pageround(foo) (((foo) + (malloc_pagemask))&(~(malloc_pagemask)))
-#define ptr2idx(foo) \
-    (((size_t)(uintptr_t)(foo) >> malloc_pageshift)-malloc_origo)
-
-#ifndef _MALLOC_LOCK
-#define _MALLOC_LOCK()
-#endif
-
-#ifndef _MALLOC_UNLOCK
-#define _MALLOC_UNLOCK()
-#endif
-
-#ifndef MMAP_FD
-#define MMAP_FD (-1)
-#endif
-
-#ifndef INIT_MMAP
-#define INIT_MMAP()
-#endif
-
-#if !defined(__minix)
-#ifndef MADV_FREE
-#define MADV_FREE MADV_DONTNEED
-#endif
-#else
-#undef MADV_FREE
-#endif /* !defined(__minix) */
-
-/* Number of free pages we cache */
-static size_t malloc_cache = 16;
-
-/* The offset from pagenumber to index into the page directory */
-static size_t malloc_origo;
-
-/* The last index in the page directory we care about */
-static size_t last_idx;
-
-/* Pointer to page directory. Allocated "as if with" malloc */
-static struct	pginfo **page_dir;
-
-/* How many slots in the page directory */
-static size_t	malloc_ninfo;
-
-/* Free pages line up here */
-static struct pgfree free_list;
-
-/* Abort(), user doesn't handle problems.  */
-static int malloc_abort;
-
-/* Are we trying to die ?  */
-static int suicide;
-
-/* always realloc ?  */
-static int malloc_realloc;
-
-/* pass the kernel a hint on free pages ?  */
-#if defined(MADV_FREE)
-static int malloc_hint = 0;
-#endif
-
-/* xmalloc behaviour ?  */
-static int malloc_xmalloc;
-
-/* sysv behaviour for malloc(0) ?  */
-static int malloc_sysv;
-
-/* zero fill ?  */
-static int malloc_zero;
-
-/* junk fill ?  */
-static int malloc_junk;
-
-#ifdef HAS_UTRACE
-
-/* utrace ?  */
-static int malloc_utrace;
-
-struct ut { void *p; size_t s; void *r; };
-
-#define UTRACE(a, b, c) \
-	if (malloc_utrace) {			\
-		struct ut u;			\
-		u.p=a; u.s = b; u.r=c;		\
-		utrace(UTRACE_LABEL (void *) &u, sizeof u);	\
-	}
-#else /* !HAS_UTRACE */
-#define UTRACE(a,b,c)
-#endif /* HAS_UTRACE */
-
-/* my last break. */
-static void *malloc_brk;
-
-/* one location cache for free-list holders */
-static struct pgfree *px;
-
-/* compile-time options */
-const char *_malloc_options;
-
-/* Name of the current public function */
-static const char *malloc_func;
-
-/* Macro for mmap */
-#define MMAP(size) \
-	mmap(NULL, (size), PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, \
-	    MMAP_FD, (off_t)0);
-
-/*
- * Necessary function declarations
- */
-static int extend_pgdir(size_t idx);
-static void *imalloc(size_t size);
-static void ifree(void *ptr);
-static void *irealloc(void *ptr, size_t size);
-
-#ifndef MALLOC_NO_SYSCALLS
-static void
-wrtmessage(const char *p1, const char *p2, const char *p3, const char *p4)
-{
-
-    write(STDERR_FILENO, p1, strlen(p1));
-    write(STDERR_FILENO, p2, strlen(p2));
-    write(STDERR_FILENO, p3, strlen(p3));
-    write(STDERR_FILENO, p4, strlen(p4));
-}
-
-void (*_malloc_message)(const char *p1, const char *p2, const char *p3,
-	    const char *p4) = wrtmessage;
-static void
-wrterror(const char *p)
-{
-
-    suicide = 1;
-    _malloc_message(getprogname(), malloc_func, " error: ", p);
-    abort();
-}
-
-static void
-wrtwarning(const char *p)
-{
-
-    /*
-     * Sensitive processes, somewhat arbitrarily defined here as setuid,
-     * setgid, root and wheel cannot afford to have malloc mistakes.
-     */
-    if (malloc_abort || issetugid() || getuid() == 0 || getgid() == 0)
-	wrterror(p);
-}
-#endif
-
-/*
- * Allocate a number of pages from the OS
- */
-static void *
-map_pages(size_t pages)
-{
-    caddr_t result, rresult, tail;
-    intptr_t bytes = pages << malloc_pageshift;
-
-    if (bytes < 0 || (size_t)bytes < pages) {
-	errno = ENOMEM;
-	return NULL;
-    }
-
-    if ((result = sbrk(bytes)) == (void *)-1)
-	return NULL;
-
-    /*
-     * Round to a page, in case sbrk(2) did not do this for us
-     */
-    rresult = (caddr_t)pageround((size_t)(uintptr_t)result);
-    if (result < rresult) {
-	/* make sure we have enough space to fit bytes */
-	if (sbrk((intptr_t)(rresult - result)) == (void *) -1) {
-	    /* we failed, put everything back */
-	    if (brk(result)) {
-		wrterror("brk(2) failed [internal error]\n");
-	    }
-	}
-    }
-    tail = rresult + (size_t)bytes;
-
-    last_idx = ptr2idx(tail) - 1;
-    malloc_brk = tail;
-
-    if ((last_idx+1) >= malloc_ninfo && !extend_pgdir(last_idx)) {
-	malloc_brk = result;
-	last_idx = ptr2idx(malloc_brk) - 1;
-	/* Put back break point since we failed. */
-	if (brk(malloc_brk))
-	    wrterror("brk(2) failed [internal error]\n");
-	return 0;
-    }
-
-    return rresult;
-}
-
-/*
- * Extend page directory
- */
-static int
-extend_pgdir(size_t idx)
-{
-    struct  pginfo **new, **old;
-    size_t newlen, oldlen;
-
-    /* check for overflow */
-    if ((((~(1UL << ((sizeof(size_t) * NBBY) - 1)) / sizeof(*page_dir)) + 1)
-	+ (malloc_pagesize / sizeof *page_dir)) < idx) {
-	errno = ENOMEM;
-	return 0;
-    }
-
-    /* Make it this many pages */
-    newlen = pageround(idx * sizeof *page_dir) + malloc_pagesize;
-
-    /* remember the old mapping size */
-    oldlen = malloc_ninfo * sizeof *page_dir;
-
-    /*
-     * NOTE: we allocate new pages and copy the directory rather than tempt
-     * fate by trying to "grow" the region.. There is nothing to prevent
-     * us from accidentally re-mapping space that's been allocated by our caller
-     * via dlopen() or other mmap().
-     *
-     * The copy problem is not too bad, as there is 4K of page index per
-     * 4MB of malloc arena.
-     *
-     * We can totally avoid the copy if we open a file descriptor to associate
-     * the anon mappings with.  Then, when we remap the pages at the new
-     * address, the old pages will be "magically" remapped..  But this means
-     * keeping open a "secret" file descriptor.....
-     */
-
-    /* Get new pages */
-    new = MMAP(newlen);
-    if (new == MAP_FAILED)
-	return 0;
-
-    /* Copy the old stuff */
-    memcpy(new, page_dir, oldlen);
-
-    /* register the new size */
-    malloc_ninfo = newlen / sizeof *page_dir;
-
-    /* swap the pointers */
-    old = page_dir;
-    page_dir = new;
-
-    /* Now free the old stuff */
-    munmap(old, oldlen);
-    return 1;
-}
-
-/*
- * Initialize the world
- */
-static void
-malloc_init(void)
-{
-#ifndef MALLOC_NO_SYSCALLS
-    const char *p;
-    char b[64];
-    size_t i;
-    ssize_t j;
-#endif
-    int serrno = errno;
-#ifndef MALLOC_NO_SYSCALLS
-
-    /*
-     * Compute page-size related variables.
-     */
-    malloc_pagesize = (size_t)sysconf(_SC_PAGESIZE);
-#else
-    malloc_pagesize = PAGE_SIZE;
-#endif
-    malloc_pagemask = malloc_pagesize - 1;
-    for (malloc_pageshift = 0;
-	 (1UL << malloc_pageshift) != malloc_pagesize;
-	 malloc_pageshift++)
-	/* nothing */ ;
-
-    INIT_MMAP();
-
-#ifdef MALLOC_EXTRA_SANITY
-    malloc_junk = 1;
-#endif /* MALLOC_EXTRA_SANITY */
-
-#ifndef MALLOC_NO_SYSCALLS
-    for (i = 0; i < 3; i++) {
-	if (i == 0) {
-	    j = readlink("/etc/malloc.conf", b, sizeof b - 1);
-	    if (j == -1)
-		continue;
-	    b[j] = '\0';
-	    p = b;
-	} else if (i == 1 && issetugid() == 0) {
-	    p = getenv("MALLOC_OPTIONS");
-	} else if (i == 1) {
-	    continue;
-	} else {
-	    p = _malloc_options;
-	}
-	for (; p != NULL && *p != '\0'; p++) {
-	    switch (*p) {
-		case '>': malloc_cache   <<= 1; break;
-		case '<': malloc_cache   >>= 1; break;
-		case 'a': malloc_abort   = 0; break;
-		case 'A': malloc_abort   = 1; break;
-#if !defined(__minix)
-		case 'h': malloc_hint    = 0; break;
-		case 'H': malloc_hint    = 1; break;
-#endif /* !defined(__minix) */
-		case 'r': malloc_realloc = 0; break;
-		case 'R': malloc_realloc = 1; break;
-		case 'j': malloc_junk    = 0; break;
-		case 'J': malloc_junk    = 1; break;
-#ifdef HAS_UTRACE
-		case 'u': malloc_utrace  = 0; break;
-		case 'U': malloc_utrace  = 1; break;
-#endif
-		case 'v': malloc_sysv    = 0; break;
-		case 'V': malloc_sysv    = 1; break;
-		case 'x': malloc_xmalloc = 0; break;
-		case 'X': malloc_xmalloc = 1; break;
-		case 'z': malloc_zero    = 0; break;
-		case 'Z': malloc_zero    = 1; break;
-		default:
-		    _malloc_message(getprogname(), malloc_func,
-			 " warning: ", "unknown char in MALLOC_OPTIONS\n");
-		    break;
-	    }
-	}
-    }
-#endif
-
-    UTRACE(0, 0, 0);
-
-    /*
-     * We want junk in the entire allocation, and zero only in the part
-     * the user asked for.
-     */
-    if (malloc_zero)
-	malloc_junk = 1;
-
-    /* Allocate one page for the page directory */
-    page_dir = MMAP(malloc_pagesize);
-
-    if (page_dir == MAP_FAILED)
-	wrterror("mmap(2) failed, check limits.\n");
-
-    /*
-     * We need a maximum of malloc_pageshift buckets, steal these from the
-     * front of the page_directory;
-     */
-    malloc_origo = pageround((size_t)(uintptr_t)sbrk((intptr_t)0))
-	>> malloc_pageshift;
-    malloc_origo -= malloc_pageshift;
-
-    malloc_ninfo = malloc_pagesize / sizeof *page_dir;
-
-    /* Recalculate the cache size in bytes, and make sure it's nonzero */
-
-    if (!malloc_cache)
-	malloc_cache++;
-
-    malloc_cache <<= malloc_pageshift;
-
-    /*
-     * This is a nice hack from Kaleb Keithly (kaleb@x.org).
-     * We can sbrk(2) further back when we keep this on a low address.
-     */
-    px = imalloc(sizeof *px);
-
-    errno = serrno;
-}
-
-/*
- * Allocate a number of complete pages
- */
-static void *
-malloc_pages(size_t size)
-{
-    void *p, *delay_free = NULL;
-    size_t i;
-    struct pgfree *pf;
-    size_t idx;
-
-    idx = pageround(size);
-    if (idx < size) {
-	errno = ENOMEM;
-	return NULL;
-    } else
-	size = idx;
-
-    p = NULL;
-
-    /* Look for free pages before asking for more */
-    for(pf = free_list.next; pf; pf = pf->next) {
-
-#ifdef MALLOC_EXTRA_SANITY
-	if (pf->size & malloc_pagemask)
-	    wrterror("(ES): junk length entry on free_list.\n");
-	if (!pf->size)
-	    wrterror("(ES): zero length entry on free_list.\n");
-	if (pf->page == pf->end)
-	    wrterror("(ES): zero entry on free_list.\n");
-	if (pf->page > pf->end)
-	    wrterror("(ES): sick entry on free_list.\n");
-	if ((void*)pf->page >= (void*)sbrk(0))
-	    wrterror("(ES): entry on free_list past brk.\n");
-	if (page_dir[ptr2idx(pf->page)] != MALLOC_FREE)
-	    wrterror("(ES): non-free first page on free-list.\n");
-	if (page_dir[ptr2idx(pf->end)-1] != MALLOC_FREE)
-	    wrterror("(ES): non-free last page on free-list.\n");
-#endif /* MALLOC_EXTRA_SANITY */
-
-	if (pf->size < size)
-	    continue;
-
-	if (pf->size == size) {
-	    p = pf->page;
-	    if (pf->next != NULL)
-		    pf->next->prev = pf->prev;
-	    pf->prev->next = pf->next;
-	    delay_free = pf;
-	    break;
-	} 
-
-	p = pf->page;
-	pf->page = (char *)pf->page + size;
-	pf->size -= size;
-	break;
-    }
-
-#ifdef MALLOC_EXTRA_SANITY
-    if (p != NULL && page_dir[ptr2idx(p)] != MALLOC_FREE)
-	wrterror("(ES): allocated non-free page on free-list.\n");
-#endif /* MALLOC_EXTRA_SANITY */
-
-    size >>= malloc_pageshift;
-
-    /* Map new pages */
-    if (p == NULL)
-	p = map_pages(size);
-
-    if (p != NULL) {
-
-	idx = ptr2idx(p);
-	page_dir[idx] = MALLOC_FIRST;
-	for (i=1;i<size;i++)
-	    page_dir[idx+i] = MALLOC_FOLLOW;
-
-	if (malloc_junk)
-	    memset(p, SOME_JUNK, size << malloc_pageshift);
-    }
-
-    if (delay_free) {
-	if (px == NULL)
-	    px = delay_free;
-	else
-	    ifree(delay_free);
-    }
-
-    return p;
-}
-
-/*
- * Allocate a page of fragments
- */
-
-static inline int
-malloc_make_chunks(int bits)
-{
-    struct  pginfo *bp;
-    void *pp;
-    int i, k;
-    long l;
-
-    /* Allocate a new bucket */
-    pp = malloc_pages(malloc_pagesize);
-    if (pp == NULL)
-	return 0;
-
-    /* Find length of admin structure */
-    l = (long)offsetof(struct pginfo, bits[0]);
-    l += (long)sizeof bp->bits[0] *
-	(((malloc_pagesize >> bits)+MALLOC_BITS-1) / MALLOC_BITS);
-
-    /* Don't waste more than two chunks on this */
-    if ((1<<(bits)) <= l+l) {
-	bp = (struct  pginfo *)pp;
-    } else {
-	bp = imalloc((size_t)l);
-	if (bp == NULL) {
-	    ifree(pp);
-	    return 0;
-	}
-    }
-
-    bp->size = (1<<bits);
-    bp->shift = bits;
-    bp->total = bp->free = (u_short)(malloc_pagesize >> bits);
-    bp->page = pp;
-
-    /* set all valid bits in the bitmap */
-    k = bp->total;
-    i = 0;
-
-    /* Do a bunch at a time */
-    for(;k-i >= MALLOC_BITS; i += MALLOC_BITS)
-	bp->bits[i / MALLOC_BITS] = ~0U;
-
-    for(; i < k; i++)
-        bp->bits[i/MALLOC_BITS] |= 1<<(i%MALLOC_BITS);
-
-    if (bp == bp->page) {
-	/* Mark the ones we stole for ourselves */
-	for(i = 0; l > 0; i++) {
-	    bp->bits[i / MALLOC_BITS] &= ~(1 << (i % MALLOC_BITS));
-	    bp->free--;
-	    bp->total--;
-	    l -= (long)(1 << bits);
-	}
-    }
-
-    /* MALLOC_LOCK */
-
-    page_dir[ptr2idx(pp)] = bp;
-
-    bp->next = page_dir[bits];
-    page_dir[bits] = bp;
-
-    /* MALLOC_UNLOCK */
-
-    return 1;
-}
-
-/*
- * Allocate a fragment
- */
-static void *
-malloc_bytes(size_t size)
-{
-    size_t i;
-    int j;
-    u_int u;
-    struct  pginfo *bp;
-    size_t k;
-    u_int *lp;
-
-    /* Don't bother with anything less than this */
-    if (size < malloc_minsize)
-	size = malloc_minsize;
-
-
-    /* Find the right bucket */
-    j = 1;
-    i = size-1;
-    while (i >>= 1)
-	j++;
-
-    /* If it's empty, make a page more of that size chunks */
-    if (page_dir[j] == NULL && !malloc_make_chunks(j))
-	return NULL;
-
-    bp = page_dir[j];
-
-    /* Find first word of bitmap which isn't empty */
-    for (lp = bp->bits; !*lp; lp++)
-	;
-
-    /* Find that bit, and tweak it */
-    u = 1;
-    k = 0;
-    while (!(*lp & u)) {
-	u += u;
-	k++;
-    }
-    *lp ^= u;
-
-    /* If there are no more free, remove from free-list */
-    if (!--bp->free) {
-	page_dir[j] = bp->next;
-	bp->next = NULL;
-    }
-
-    /* Adjust to the real offset of that chunk */
-    k += (lp-bp->bits)*MALLOC_BITS;
-    k <<= bp->shift;
-
-    if (malloc_junk)
-	memset((u_char*)bp->page + k, SOME_JUNK, (size_t)bp->size);
-
-    return (u_char *)bp->page + k;
-}
-
-/*
- * Allocate a piece of memory
- */
-static void *
-imalloc(size_t size)
-{
-    void *result;
-
-    if (suicide)
-	abort();
-
-    if ((size + malloc_pagesize) < size)	/* Check for overflow */
-	result = NULL;
-#ifndef __minix
-    else if ((size + malloc_pagesize) >= (uintptr_t)page_dir)
-	result = NULL;
-#endif /* !__minix */
-    else if (size <= malloc_maxsize)
-	result = malloc_bytes(size);
-    else
-	result = malloc_pages(size);
-
-    if (malloc_abort && result == NULL)
-	wrterror("allocation failed.\n");
-
-    if (malloc_zero && result != NULL)
-	memset(result, 0, size);
-
-    return result;
-}
-
-/*
- * Change the size of an allocation.
- */
-static void *
-irealloc(void *ptr, size_t size)
-{
-    void *p;
-    size_t osize, idx;
-    struct pginfo **mp;
-    size_t i;
-
-    if (suicide)
-	abort();
-
-    idx = ptr2idx(ptr);
-
-    if (idx < malloc_pageshift) {
-	wrtwarning("junk pointer, too low to make sense.\n");
-	return 0;
-    }
-
-    if (idx > last_idx) {
-	wrtwarning("junk pointer, too high to make sense.\n");
-	return 0;
-    }
-
-    mp = &page_dir[idx];
-
-    if (*mp == MALLOC_FIRST) {			/* Page allocation */
-
-	/* Check the pointer */
-	if ((size_t)(uintptr_t)ptr & malloc_pagemask) {
-	    wrtwarning("modified (page-) pointer.\n");
-	    return NULL;
-	}
-
-	/* Find the size in bytes */
-	for (osize = malloc_pagesize; *++mp == MALLOC_FOLLOW;)
-	    osize += malloc_pagesize;
-
-        if (!malloc_realloc && 			/* unless we have to, */
-	  size <= osize && 			/* .. or are too small, */
-	  size > (osize - malloc_pagesize)) {	/* .. or can free a page, */
-	    if (malloc_junk)
-		memset((u_char *)ptr + size, SOME_JUNK, osize-size);
-	    return ptr;				/* don't do anything. */
-	}
-
-    } else if (*mp >= MALLOC_MAGIC) {		/* Chunk allocation */
-
-	/* Check the pointer for sane values */
-	if (((size_t)(uintptr_t)ptr & ((*mp)->size-1))) {
-	    wrtwarning("modified (chunk-) pointer.\n");
-	    return NULL;
-	}
-
-	/* Find the chunk index in the page */
-	i = ((size_t)(uintptr_t)ptr & malloc_pagemask) >> (*mp)->shift;
-
-	/* Verify that it isn't a free chunk already */
-        if ((*mp)->bits[i/MALLOC_BITS] & (1UL << (i % MALLOC_BITS))) {
-	    wrtwarning("chunk is already free.\n");
-	    return NULL;
-	}
-
-	osize = (*mp)->size;
-
-	if (!malloc_realloc &&		/* Unless we have to, */
-	  size <= osize && 		/* ..or are too small, */
-	  (size > osize / 2 ||	 	/* ..or could use a smaller size, */
-	  osize == malloc_minsize)) {	/* ..(if there is one) */
-	    if (malloc_junk)
-		memset((u_char *)ptr + size, SOME_JUNK, osize-size);
-	    return ptr;			/* ..Don't do anything */
-	}
-
-    } else {
-	wrtwarning("pointer to wrong page.\n");
-	return NULL;
-    }
-
-    p = imalloc(size);
-
-    if (p != NULL) {
-	/* copy the lesser of the two sizes, and free the old one */
-	if (!size || !osize)
-	    ;
-	else if (osize < size)
-	    memcpy(p, ptr, osize);
-	else
-	    memcpy(p, ptr, size);
-	ifree(ptr);
-    } 
-    return p;
-}
-
-/*
- * Free a sequence of pages
- */
-
-static inline void
-free_pages(void *ptr, size_t idx, struct pginfo *info)
-{
-    size_t i;
-    struct pgfree *pf, *pt=NULL;
-    size_t l;
-    void *tail;
-
-    if (info == MALLOC_FREE) {
-	wrtwarning("page is already free.\n");
-	return;
-    }
-
-    if (info != MALLOC_FIRST) {
-	wrtwarning("pointer to wrong page.\n");
-	return;
-    }
-
-    if ((size_t)(uintptr_t)ptr & malloc_pagemask) {
-	wrtwarning("modified (page-) pointer.\n");
-	return;
-    }
-
-    /* Count how many pages and mark them free at the same time */
-    page_dir[idx] = MALLOC_FREE;
-    for (i = 1; page_dir[idx+i] == MALLOC_FOLLOW; i++)
-	page_dir[idx + i] = MALLOC_FREE;
-
-    l = i << malloc_pageshift;
-
-    if (malloc_junk)
-	memset(ptr, SOME_JUNK, l);
-
-#if !defined(__minix)
-    if (malloc_hint)
-	madvise(ptr, l, MADV_FREE);
-#endif /* !defined(__minix) */
-
-    tail = (char *)ptr+l;
-
-    /* add to free-list */
-    if (px == NULL)
-	px = imalloc(sizeof *px);	/* This cannot fail... */
-    px->page = ptr;
-    px->end =  tail;
-    px->size = l;
-    if (free_list.next == NULL) {
-
-	/* Nothing on free list, put this at head */
-	px->next = free_list.next;
-	px->prev = &free_list;
-	free_list.next = px;
-	pf = px;
-	px = NULL;
-
-    } else {
-
-	/* Find the right spot, leave pf pointing to the modified entry. */
-	tail = (char *)ptr+l;
-
-	for(pf = free_list.next; pf->end < ptr && pf->next != NULL;
-	    pf = pf->next)
-	    ; /* Race ahead here */
-
-	if (pf->page > tail) {
-	    /* Insert before entry */
-	    px->next = pf;
-	    px->prev = pf->prev;
-	    pf->prev = px;
-	    px->prev->next = px;
-	    pf = px;
-	    px = NULL;
-	} else if (pf->end == ptr ) {
-	    /* Append to the previous entry */
-	    pf->end = (char *)pf->end + l;
-	    pf->size += l;
-	    if (pf->next != NULL && pf->end == pf->next->page ) {
-		/* And collapse the next too. */
-		pt = pf->next;
-		pf->end = pt->end;
-		pf->size += pt->size;
-		pf->next = pt->next;
-		if (pf->next != NULL)
-		    pf->next->prev = pf;
-	    }
-	} else if (pf->page == tail) {
-	    /* Prepend to entry */
-	    pf->size += l;
-	    pf->page = ptr;
-	} else if (pf->next == NULL) {
-	    /* Append at tail of chain */
-	    px->next = NULL;
-	    px->prev = pf;
-	    pf->next = px;
-	    pf = px;
-	    px = NULL;
-	} else {
-	    wrterror("freelist is destroyed.\n");
-	}
-    }
-    
-    /* Return something to OS ? */
-    if (pf->next == NULL &&			/* If we're the last one, */
-      pf->size > malloc_cache &&		/* ..and the cache is full, */
-      pf->end == malloc_brk &&			/* ..and none behind us, */
-      malloc_brk == sbrk((intptr_t)0)) {	/* ..and it's OK to do... */
-
-	/*
-	 * Keep the cache intact.  Notice that the '>' above guarantees that
-	 * the pf will always have at least one page afterwards.
-	 */
-	pf->end = (char *)pf->page + malloc_cache;
-	pf->size = malloc_cache;
-
-	brk(pf->end);
-	malloc_brk = pf->end;
-
-	idx = ptr2idx(pf->end);
-
-	for(i=idx;i <= last_idx;)
-	    page_dir[i++] = MALLOC_NOT_MINE;
-
-	last_idx = idx - 1;
-
-	/* XXX: We could realloc/shrink the pagedir here I guess. */
-    }
-    if (pt != NULL)
-	ifree(pt);
-}
-
-/*
- * Free a chunk, and possibly the page it's on, if the page becomes empty.
- */
-
-static inline void
-free_bytes(void *ptr, size_t idx, struct pginfo *info)
-{
-    size_t i;
-    struct pginfo **mp;
-    void *vp;
-
-    /* Find the chunk number on the page */
-    i = ((size_t)(uintptr_t)ptr & malloc_pagemask) >> info->shift;
-
-    if (((size_t)(uintptr_t)ptr & (info->size-1))) {
-	wrtwarning("modified (chunk-) pointer.\n");
-	return;
-    }
-
-    if (info->bits[i/MALLOC_BITS] & (1UL << (i % MALLOC_BITS))) {
-	wrtwarning("chunk is already free.\n");
-	return;
-    }
-
-    if (malloc_junk)
-	memset(ptr, SOME_JUNK, (size_t)info->size);
-
-    info->bits[i/MALLOC_BITS] |= (u_int)(1UL << (i % MALLOC_BITS));
-    info->free++;
-
-    mp = page_dir + info->shift;
-
-    if (info->free == 1) {
-
-	/* Page became non-full */
-
-	mp = page_dir + info->shift;
-	/* Insert in address order */
-	while (*mp && (*mp)->next && (*mp)->next->page < info->page)
-	    mp = &(*mp)->next;
-	info->next = *mp;
-	*mp = info;
-	return;
-    }
-
-    if (info->free != info->total)
-	return;
-
-    /* Find & remove this page in the queue */
-    while (*mp != info) {
-	mp = &((*mp)->next);
-#ifdef MALLOC_EXTRA_SANITY
-	if (!*mp)
-		wrterror("(ES): Not on queue.\n");
-#endif /* MALLOC_EXTRA_SANITY */
-    }
-    *mp = info->next;
-
-    /* Free the page & the info structure if need be */
-    page_dir[idx] = MALLOC_FIRST;
-    vp = info->page;		/* Order is important ! */
-    if(vp != (void*)info) 
-	ifree(info);
-    ifree(vp);
-}
-
-static void
-ifree(void *ptr)
-{
-    struct pginfo *info;
-    size_t idx;
-
-    /* This is legal */
-    if (ptr == NULL)
-	return;
-
-    /* If we're already sinking, don't make matters any worse. */
-    if (suicide)
-	return;
-
-    idx = ptr2idx(ptr);
-
-    if (idx < malloc_pageshift) {
-	wrtwarning("junk pointer, too low to make sense.\n");
-	return;
-    }
-
-    if (idx > last_idx) {
-	wrtwarning("junk pointer, too high to make sense.\n");
-	return;
-    }
-
-    info = page_dir[idx];
-
-    if (info < MALLOC_MAGIC)
-        free_pages(ptr, idx, info);
-    else
-	free_bytes(ptr, idx, info);
-    return;
-}
-
-static int malloc_active; /* Recursion flag for public interface. */
-static unsigned malloc_started; /* Set when initialization has been done */
-
-static void *
-pubrealloc(void *ptr, size_t size, const char *func)
-{
-    void *r;
-    int err = 0;
-
-    /*
-     * If a thread is inside our code with a functional lock held, and then
-     * catches a signal which calls us again, we would get a deadlock if the
-     * lock is not of a recursive type.
-     */
-    _MALLOC_LOCK();
-    malloc_func = func;
-    if (malloc_active > 0) {
-	if (malloc_active == 1) {
-	    wrtwarning("recursive call\n");
-	    malloc_active = 2;
-	}
-        _MALLOC_UNLOCK();
-	errno = EINVAL;
-	return (NULL);
-    } 
-    malloc_active = 1;
-
-    if (!malloc_started) {
-        if (ptr != NULL) {
-	    wrtwarning("malloc() has never been called\n");
-	    malloc_active = 0;
-            _MALLOC_UNLOCK();
-	    errno = EINVAL;
-	    return (NULL);
-	}
-	malloc_init();
-	malloc_started = 1;
-    }
-   
-    if (ptr == ZEROSIZEPTR)
-	ptr = NULL;
-    if (malloc_sysv && !size) {
-	if (ptr != NULL)
-	    ifree(ptr);
-	r = NULL;
-    } else if (!size) {
-	if (ptr != NULL)
-	    ifree(ptr);
-	r = ZEROSIZEPTR;
-    } else if (ptr == NULL) {
-	r = imalloc(size);
-	err = (r == NULL);
-    } else {
-        r = irealloc(ptr, size);
-	err = (r == NULL);
-    }
-    UTRACE(ptr, size, r);
-    malloc_active = 0;
-    _MALLOC_UNLOCK();
-    if (malloc_xmalloc && err)
-	wrterror("out of memory\n");
-    if (err)
-	errno = ENOMEM;
-    return (r);
-}
-
-/*
- * These are the public exported interface routines.
- */
-
-void *
-malloc(size_t size)
-{
-
-    return pubrealloc(NULL, size, " in malloc():");
-}
-
-int
-posix_memalign(void **memptr, size_t alignment, size_t size)
-{
-    int err;
-    void *result;
-
-    if (!malloc_started) {
-	    malloc_init();
-	    malloc_started = 1;
-    }
-    /* Make sure that alignment is a large enough power of 2. */
-    if (((alignment - 1) & alignment) != 0 || alignment < sizeof(void *) ||
-	alignment > malloc_pagesize)
-	    return EINVAL;
-
-    /* 
-     * (size | alignment) is enough to assure the requested alignment, since
-     * the allocator always allocates power-of-two blocks.
-     */
-    err = errno; /* Protect errno against changes in pubrealloc(). */
-    result = pubrealloc(NULL, (size | alignment), " in posix_memalign()");
-    errno = err;
-
-    if (result == NULL)
-	return ENOMEM;
-
-    *memptr = result;
-    return 0;
-}
-
-void *
-calloc(size_t num, size_t size)
-{
-    void *ret;
-
-    if (size != 0 && (num * size) / size != num) {
-	/* size_t overflow. */
-	errno = ENOMEM;
-	return (NULL);
-    }
-
-    ret = pubrealloc(NULL, num * size, " in calloc():");
-
-    if (ret != NULL)
-	memset(ret, 0, num * size);
-
-    return ret;
-}
-
-void
-free(void *ptr)
-{
-
-    pubrealloc(ptr, 0, " in free():");
-}
-
-void *
-realloc(void *ptr, size_t size)
-{
-
-    return pubrealloc(ptr, size, " in realloc():");
-}
-
-/*
- * Begin library-private functions, used by threading libraries for protection
- * of malloc during fork().  These functions are only called if the program is
- * running in threaded mode, so there is no need to check whether the program
- * is threaded here.
- */
-
-void
-_malloc_prefork(void)
-{
-
-	_MALLOC_LOCK();
-}
-
-void
-_malloc_postfork(void)
-{
-
-	_MALLOC_UNLOCK();
-}
diff --git a/lib/libc/stdlib/memory.3 b/lib/libc/stdlib/memory.3
deleted file mode 100644
index 563073060..000000000
--- a/lib/libc/stdlib/memory.3
+++ /dev/null
@@ -1,72 +0,0 @@
-.\"	$NetBSD: memory.3,v 1.11 2011/09/11 10:05:23 jruoho Exp $
-.\"
-.\" 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. 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: @(#)memory.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd September 11, 2011
-.Dt MEMORY 3
-.Os
-.Sh NAME
-.Nm malloc ,
-.Nm free ,
-.Nm realloc ,
-.Nm calloc ,
-.Nm alloca
-.Nd general memory allocation operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void *
-.Fn malloc "size_t size"
-.Ft void
-.Fn free "void *ptr"
-.Ft void *
-.Fn realloc "void *ptr" "size_t size"
-.Ft void *
-.Fn calloc "size_t nelem" "size_t elsize"
-.Ft void *
-.Fn alloca "size_t size"
-.Sh DESCRIPTION
-These functions allocate and free memory for the calling process.
-They are described in the
-individual manual pages.
-The memory allocators used in the kernel are described in
-.Xr memoryallocators 9 .
-.Sh SEE ALSO
-.Xr alloca 3 ,
-.Xr calloc 3 ,
-.Xr free 3 ,
-.Xr malloc 3 ,
-.Xr realloc 3
-.Sh STANDARDS
-These functions, with the exception of
-.Fn alloca
-conform to
-.St -ansiC .
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
deleted file mode 100644
index 22c3292db..000000000
--- a/lib/libc/stdlib/merge.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/*	$NetBSD: merge.c,v 1.14 2012/03/13 21:13:48 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Peter McIlroy.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "from: @(#)merge.c	8.2 (Berkeley) 2/14/94";
-#else
-__RCSID("$NetBSD: merge.c,v 1.14 2012/03/13 21:13:48 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Hybrid exponential search/linear search merge sort with hybrid
- * natural/pairwise first pass.  Requires about .3% more comparisons
- * for random data than LSMS with pairwise first pass alone.
- * It works for objects as small as two bytes.
- */
-
-#define NATURAL
-#define THRESHOLD 16	/* Best choice for natural merge cut-off. */
-
-/* #define NATURAL to get hybrid natural merge.
- * (The default is pairwise merging.)
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(mergesort,_mergesort)
-#endif
-
-static void setup(u_char *, u_char *, size_t, size_t,
-    int (*)(const void *, const void *));
-static void insertionsort(u_char *, size_t, size_t,
-    int (*)(const void *, const void *));
-
-#define ISIZE sizeof(int)
-#define PSIZE sizeof(u_char *)
-#define ICOPY_LIST(src, dst, last)				\
-	do							\
-	*(int*)(void *)dst = *(int*)(void *)src,		\
-		src += ISIZE, dst += ISIZE;			\
-	while(src < last)
-#define ICOPY_ELT(src, dst, i)					\
-	do							\
-	*(int*)(void *)dst = *(int*)(void *)src,		\
-	src += ISIZE, dst += ISIZE;				\
-	while (i -= ISIZE)
-
-#define CCOPY_LIST(src, dst, last)		\
-	do					\
-		*dst++ = *src++;		\
-	while (src < last)
-#define CCOPY_ELT(src, dst, i)			\
-	do					\
-		*dst++ = *src++;		\
-	while (i -= 1)
-		
-/*
- * Find the next possible pointer head.  (Trickery for forcing an array
- * to do double duty as a linked list when objects do not align with word
- * boundaries.
- */
-/* Assumption: PSIZE is a power of 2. */
-#define EVAL(p) ((u_char **)(void *)					\
-    ((u_char *)0 +							\
-    (((u_char *)(void *)(p) + PSIZE - 1 - (u_char *) 0) & ~(PSIZE - 1))))
-
-/*
- * Arguments are as for qsort.
- */
-int
-mergesort(void *base, size_t nmemb, size_t size,
-    int (*cmp)(const void *, const void *))
-{
-	size_t i;
-	int sense;
-	int big, iflag;
-	u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
-	u_char *list2, *list1, *p2, *p, *last, **p1;
-
-	_DIAGASSERT(base != NULL);
-	_DIAGASSERT(cmp != NULL);
-
-	if (size < PSIZE / 2) {		/* Pointers must fit into 2 * size. */
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/*
-	 * XXX
-	 * Stupid subtraction for the Cray.
-	 */
-	iflag = 0;
-	if (!(size % ISIZE) && !(((char *)base - (char *)0) % ISIZE))
-		iflag = 1;
-
-	if ((list2 = malloc(nmemb * size + PSIZE)) == NULL)
-		return (-1);
-
-	list1 = base;
-	setup(list1, list2, nmemb, size, cmp);
-	last = list2 + nmemb * size;
-	i = big = 0;
-	while (*EVAL(list2) != last) {
-	    l2 = list1;
-	    p1 = EVAL(list1);
-	    for (tp2 = p2 = list2; p2 != last; p1 = EVAL(l2)) {
-	    	p2 = *EVAL(p2);
-	    	f1 = l2;
-	    	f2 = l1 = list1 + (p2 - list2);
-	    	if (p2 != last)
-	    		p2 = *EVAL(p2);
-	    	l2 = list1 + (p2 - list2);
-	    	while (f1 < l1 && f2 < l2) {
-	    		if ((*cmp)(f1, f2) <= 0) {
-	    			q = f2;
-	    			b = f1, t = l1;
-	    			sense = -1;
-	    		} else {
-	    			q = f1;
-	    			b = f2, t = l2;
-	    			sense = 0;
-	    		}
-	    		if (!big) {	/* here i = 0 */
-#if 0
-LINEAR:
-#endif
-				while ((b += size) < t && cmp(q, b) >sense)
-	    				if (++i == 6) {
-	    					big = 1;
-	    					goto EXPONENTIAL;
-	    				}
-	    		} else {
-EXPONENTIAL:	    		for (i = size; ; i <<= 1)
-	    				if ((p = (b + i)) >= t) {
-	    					if ((p = t - size) > b &&
-						    (*cmp)(q, p) <= sense)
-	    						t = p;
-	    					else
-	    						b = p;
-	    					break;
-	    				} else if ((*cmp)(q, p) <= sense) {
-	    					t = p;
-	    					if (i == size)
-	    						big = 0; 
-	    					goto FASTCASE;
-	    				} else
-	    					b = p;
-#if 0
-SLOWCASE:
-#endif
-				while (t > b+size) {
-	    				i = (((t - b) / size) >> 1) * size;
-	    				if ((*cmp)(q, p = b + i) <= sense)
-	    					t = p;
-	    				else
-	    					b = p;
-	    			}
-	    			goto COPY;
-FASTCASE:	    		while (i > size)
-	    				if ((*cmp)(q,
-	    					p = b +
-						    (i = (unsigned int) i >> 1)) <= sense)
-	    					t = p;
-	    				else
-	    					b = p;
-COPY:	    			b = t;
-	    		}
-	    		i = size;
-	    		if (q == f1) {
-	    			if (iflag) {
-	    				ICOPY_LIST(f2, tp2, b);
-	    				ICOPY_ELT(f1, tp2, i);
-	    			} else {
-	    				CCOPY_LIST(f2, tp2, b);
-	    				CCOPY_ELT(f1, tp2, i);
-	    			}
-	    		} else {
-	    			if (iflag) {
-	    				ICOPY_LIST(f1, tp2, b);
-	    				ICOPY_ELT(f2, tp2, i);
-	    			} else {
-	    				CCOPY_LIST(f1, tp2, b);
-	    				CCOPY_ELT(f2, tp2, i);
-	    			}
-	    		}
-	    	}
-	    	if (f2 < l2) {
-	    		if (iflag)
-	    			ICOPY_LIST(f2, tp2, l2);
-	    		else
-	    			CCOPY_LIST(f2, tp2, l2);
-	    	} else if (f1 < l1) {
-	    		if (iflag)
-	    			ICOPY_LIST(f1, tp2, l1);
-	    		else
-	    			CCOPY_LIST(f1, tp2, l1);
-	    	}
-	    	*p1 = l2;
-	    }
-	    tp2 = list1;	/* swap list1, list2 */
-	    list1 = list2;
-	    list2 = tp2;
-	    last = list2 + nmemb*size;
-	}
-	if (base == list2) {
-		memmove(list2, list1, nmemb*size);
-		list2 = list1;
-	}
-	free(list2);
-	return (0);
-}
-
-#define	swap(a, b) {					\
-		s = b;					\
-		i = size;				\
-		do {					\
-			tmp = *a; *a++ = *s; *s++ = tmp; \
-		} while (--i);				\
-		a -= size;				\
-	}
-#define reverse(bot, top) {				\
-	s = top;					\
-	do {						\
-		i = size;				\
-		do {					\
-			tmp = *bot; *bot++ = *s; *s++ = tmp; \
-		} while (--i);				\
-		s -= size2;				\
-	} while(bot < s);				\
-}
-
-/*
- * Optional hybrid natural/pairwise first pass.  Eats up list1 in runs of
- * increasing order, list2 in a corresponding linked list.  Checks for runs
- * when THRESHOLD/2 pairs compare with same sense.  (Only used when NATURAL
- * is defined.  Otherwise simple pairwise merging is used.)
- */
-
-/* XXX: shouldn't this function be static? - lukem 990810 */
-void
-setup(u_char *list1, u_char *list2, size_t n, size_t size,
-    int (*cmp)(const void *, const void *))
-{
-	int length, tmp, sense;
-	u_char *f1, *f2, *s, *l2, *last, *p2;
-	size_t size2, i;
-
-	_DIAGASSERT(cmp != NULL);
-	_DIAGASSERT(list1 != NULL);
-	_DIAGASSERT(list2 != NULL);
-
-	size2 = size*2;
-	if (n <= 5) {
-		insertionsort(list1, n, size, cmp);
-		*EVAL(list2) = list2 + n*size;
-		return;
-	}
-	/*
-	 * Avoid running pointers out of bounds; limit n to evens
-	 * for simplicity.
-	 */
-	i = 4 + (n & 1);
-	insertionsort(list1 + (n - i) * size, i, size, cmp);
-	last = list1 + size * (n - i);
-	*EVAL(list2 + (last - list1)) = list2 + n * size;
-
-#ifdef NATURAL
-	p2 = list2;
-	f1 = list1;
-	sense = (cmp(f1, f1 + size) > 0);
-	for (; f1 < last; sense = !sense) {
-		length = 2;
-					/* Find pairs with same sense. */
-		for (f2 = f1 + size2; f2 < last; f2 += size2) {
-			if ((cmp(f2, f2+ size) > 0) != sense)
-				break;
-			length += 2;
-		}
-		if (length < THRESHOLD) {		/* Pairwise merge */
-			do {
-				p2 = *EVAL(p2) = f1 + size2 - list1 + list2;
-				if (sense > 0)
-					swap (f1, f1 + size);
-			} while ((f1 += size2) < f2);
-		} else {				/* Natural merge */
-			l2 = f2;
-			for (f2 = f1 + size2; f2 < l2; f2 += size2) {
-				if ((cmp(f2-size, f2) > 0) != sense) {
-					p2 = *EVAL(p2) = f2 - list1 + list2;
-					if (sense > 0)
-						reverse(f1, f2 - size);
-					f1 = f2;
-				}
-			}
-			if (sense > 0)
-				reverse(f1, f2 - size);
-			f1 = f2;
-			if (f2 < last || cmp(f2 - size, f2) > 0)
-				p2 = *EVAL(p2) = f2 - list1 + list2;
-			else
-				p2 = *EVAL(p2) = list2 + n*size;
-		}
-	}
-#else		/* pairwise merge only. */
-	for (f1 = list1, p2 = list2; f1 < last; f1 += size2) {
-		p2 = *EVAL(p2) = p2 + size2;
-		if (cmp (f1, f1 + size) > 0)
-			swap(f1, f1 + size);
-	}
-#endif /* NATURAL */
-}
-
-/*
- * This is to avoid out-of-bounds addresses in sorting the
- * last 4 elements.
- */
-static void
-insertionsort(u_char *a, size_t n, size_t size,
-    int (*cmp)(const void *, const void *))
-{
-	u_char *ai, *s, *t, *u, tmp;
-	size_t i;
-
-	_DIAGASSERT(a != NULL);
-	_DIAGASSERT(cmp != NULL);
-
-	for (ai = a+size; --n >= 1; ai += size)
-		for (t = ai; t > a; t -= size) {
-			u = t - size;
-			if (cmp(u, t) <= 0)
-				break;
-			swap(u, t);
-		}
-}
diff --git a/lib/libc/stdlib/mi_vector_hash.3 b/lib/libc/stdlib/mi_vector_hash.3
deleted file mode 100644
index 6827e6124..000000000
--- a/lib/libc/stdlib/mi_vector_hash.3
+++ /dev/null
@@ -1,65 +0,0 @@
-.\"	$NetBSD: mi_vector_hash.3,v 1.2 2009/07/21 12:40:52 joerg Exp $
-.\"
-.\" Copyright (c) 2009 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Joerg Sonnenberger.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd July 13, 2009
-.Dt MI_VECTOR_HASH 3
-.Os
-.Sh NAME
-.Nm mi_vector_hash
-.Nd fast 32bit hash functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn mi_vector_hash "const void * restrict key" "size_t len" \
-    "uint32_t seed" "uint32_t hashes[3]"
-.Sh DESCRIPTION
-The
-.Nm
-function computes three 32-bit hash values of the memory area starting at
-.Fa key
-with length
-.Fa len .
-.Pp
-The output is identical on all architectures and only depends on
-.Fa key
-and
-.Fa seed .
-.Sh IMPLEMENTATION NOTES
-An optimised code path is used if
-.Fa key
-is aligned on a 32-bit boundary.
-.Sh HISTORY
-The
-.Nm
-function appeared in
-.Nx 6.0 .
-.Sh AUTHORS
-The hash function has been created by Bob Jenkins.
diff --git a/lib/libc/stdlib/mrand48.c b/lib/libc/stdlib/mrand48.c
deleted file mode 100644
index e51352acd..000000000
--- a/lib/libc/stdlib/mrand48.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*	$NetBSD: mrand48.c,v 1.8 2013/10/22 08:08:51 matt Exp $	*/
-
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: mrand48.c,v 1.8 2013/10/22 08:08:51 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "rand48.h"
-
-#ifdef __weak_alias
-__weak_alias(mrand48,_mrand48)
-#endif
-
-long
-mrand48(void)
-{
-	__dorand48(__rand48_seed);
-	return (int16_t)__rand48_seed[2] * 65536 + __rand48_seed[1];
-}
diff --git a/lib/libc/stdlib/nrand48.c b/lib/libc/stdlib/nrand48.c
deleted file mode 100644
index 98beccac6..000000000
--- a/lib/libc/stdlib/nrand48.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: nrand48.c,v 1.10 2013/10/22 08:08:51 matt Exp $	*/
-
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nrand48.c,v 1.10 2013/10/22 08:08:51 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-
-#include "rand48.h"
-
-#ifdef __weak_alias
-__weak_alias(nrand48,_nrand48)
-#endif
-
-long
-nrand48(unsigned short xseed[3])
-{
-	_DIAGASSERT(xseed != NULL);
-
-	__dorand48(xseed);
-	return xseed[2] * 32768 + (xseed[1] >> 1);
-}
diff --git a/lib/libc/stdlib/posix_memalign.3 b/lib/libc/stdlib/posix_memalign.3
deleted file mode 100644
index 2d066f8ca..000000000
--- a/lib/libc/stdlib/posix_memalign.3
+++ /dev/null
@@ -1,91 +0,0 @@
-.\"	$NetBSD: posix_memalign.3,v 1.1 2007/11/19 14:48:43 ad Exp $
-.\"
-.\" Copyright (C) 2006 Jason Evans <jasone@FreeBSD.org>.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
-.\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
-.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-.\" BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-.\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" FreeBSD: src/lib/libc/stdlib/posix_memalign.3,v 1.3 2007/03/28 04:32:51 jasone Exp
-.\"
-.Dd November 19, 2007
-.Dt POSIX_MEMALIGN 3
-.Os
-.Sh NAME
-.Nm posix_memalign
-.Nd aligned memory allocation
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn posix_memalign "void **ptr" "size_t alignment" "size_t size"
-.Sh DESCRIPTION
-The
-.Fn posix_memalign
-function allocates
-.Fa size
-bytes of memory such that the allocation's base address is an even multiple of
-.Fa alignment ,
-and returns the allocation in the value pointed to by
-.Fa ptr .
-.Pp
-The requested
-.Fa alignment
-must be a power of 2 at least as large as
-.Fn sizeof "void *" .
-.Pp
-Memory that is allocated via
-.Fn posix_memalign
-can be used as an argument in subsequent calls to
-.Xr realloc 3
-and
-.Xr free 3 .
-.Sh RETURN VALUES
-The
-.Fn posix_memalign
-function returns the value 0 if successful; otherwise it returns an error value.
-.Sh ERRORS
-The
-.Fn posix_memalign
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa alignment
-parameter is not a power of 2 at least as large as
-.Fn sizeof "void *" .
-.It Bq Er ENOMEM
-Memory allocation error.
-.El
-.Sh SEE ALSO
-.Xr free 3 ,
-.Xr malloc 3 ,
-.Xr realloc 3 ,
-.Xr valloc 3
-.Sh STANDARDS
-The
-.Fn posix_memalign
-function conforms to
-.St -p1003.1-2001 .
diff --git a/lib/libc/stdlib/posix_openpt.3 b/lib/libc/stdlib/posix_openpt.3
deleted file mode 100644
index 12d976e82..000000000
--- a/lib/libc/stdlib/posix_openpt.3
+++ /dev/null
@@ -1,82 +0,0 @@
-.\" $NetBSD: posix_openpt.3,v 1.6 2011/05/05 07:36:44 wiz Exp $
-.\"
-.\" Copyright (c) 2004 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 25, 2004
-.Dt POSIX_OPENPT 3
-.Os
-.Sh NAME
-.Nm posix_openpt
-.Nd open a pseudo-terminal device
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.In fcntl.h
-.Ft int
-.Fn posix_openpt "int oflag"
-.Sh DESCRIPTION
-The
-.Fn posix_openpt
-function searches for an unused master pseudo-terminal device,
-opens it, and returns a file descriptor associated with the now
-used pseudo-terminal device.
-The
-.Fa oflag
-argument has the same meaning as in the
-.Xr open 2
-call.
-.Sh RETURN VALUES
-If successful,
-.Fn posix_openpt
-returns a non-negative integer, which corresponds to a file descriptor
-pointing to the master pseudo-terminal device.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr open 2 ,
-.Xr grantpt 3 ,
-.Xr ptsname 3 ,
-.Xr unlockpt 3
-.Sh RATIONALE
-The standards committee did not want to directly expose the cloning device,
-thus decided to wrap the functionality in this function.
-The equivalent code would be:
-.Bd -literal
-	int
-	posix_openpt(int oflag) {
-		return open("/dev/ptmx", oflag);
-	}
-.Ed
-.Sh STANDARDS
-The
-.Fn posix_openpt
-function conforms to
-.St -p1003.1-2001 .
diff --git a/lib/libc/stdlib/posix_openpt.c b/lib/libc/stdlib/posix_openpt.c
deleted file mode 100644
index f4e2cfa75..000000000
--- a/lib/libc/stdlib/posix_openpt.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: posix_openpt.c,v 1.2 2008/04/28 20:23:00 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: posix_openpt.c,v 1.2 2008/04/28 20:23:00 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <fcntl.h>
-#include <stdlib.h>
-
-int
-posix_openpt(int oflag)
-{
-
-	return open("/dev/ptmx", oflag);
-}
diff --git a/lib/libc/stdlib/ptsname.3 b/lib/libc/stdlib/ptsname.3
deleted file mode 100644
index 8c41c83dd..000000000
--- a/lib/libc/stdlib/ptsname.3
+++ /dev/null
@@ -1,168 +0,0 @@
-.\" $NetBSD: ptsname.3,v 1.9 2014/01/10 09:43:15 wiz Exp $
-.\"
-.\" Copyright (c) 2004 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 7, 2014
-.Dt PTSNAME 3
-.Os
-.Sh NAME
-.Nm ptsname ,
-.Nm ptsname_r
-.Nd get the pathname of the slave pseudo-terminal device
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft char *
-.Fn ptsname "int masterfd"
-.Ft char *
-.Fn ptsname_r "int masterfd" "char *buf" "size_t buflen"
-.Sh DESCRIPTION
-The
-.Fn ptsname
-function returns the pathname of the slave pseudo-terminal device
-that corresponds to the master pseudo-terminal device associated with
-.Fa masterfd .
-The
-.Fn ptsname
-function is not reentrant or thread-safe.
-.Pp
-The
-.Fn ptsname_r
-function
-places the pathname of the slave pseudo-terminal device that corresponds
-to the master pseudo-terminal device associated with
-.Fa masterfd
-int the
-.Fa buf
-argument copying up to
-.Fa buflen
-characters.
-The
-.Fa buf
-is always
-.Dv NUL
-terminated.
-.Sh RETURN VALUES
-If successful,
-.Fn ptsname
-returns a pointer to a nul-terminated string containing the pathname
-of the slave pseudo-terminal device.
-If an error occurs
-.Fn ptsname
-will return
-.Dv NULL
-and
-.Va errno
-is set to indicate the error.
-.Pp
-If successful,
-.Fn ptsname_r
-places a nul-terminated string containing the pathname
-of the slave pseudo-terminal device
-in
-.Fa buf
-and returns
-.Dv 0 .
-If an error occurs
-.Fn ptsname_r
-will return
-an error number number indicating what went wrong.
-.Sh ERRORS
-The
-.Fn ptsname
-and
-.Fn ptsname_r
-functions will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCESS
-the corresponding pseudo-terminal device could not be accessed.
-.It Bq Er EBADF
-.Fa masterfd
-is not a valid descriptor.
-.It Bq Er EINVAL
-.Fa masterfd
-is not associated with a master pseudo-terminal device.
-.El
-.Pp
-In addition the
-.Fn ptsname_r
-function
-will return:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-the
-.Fa buf
-argument is
-.Dv NULL .
-.It Bq Er ERANGE
-the name of the pseudo-terminal is longer than
-.Fa bufsiz
-characters plus the terminating
-.Dv NUL .
-.El
-.Sh NOTES
-The error returns of
-.Fn ptsname
-are a
-.Nx
-extension.
-The
-.Fn ptsname
-function is equivalent to:
-.Bd -literal
-	struct ptmget pm;
-	return ioctl(masterfd, TIOCPTSNAME, \*[Am]pm) == -1 ? NULL : pm.sn;
-.Ed
-.Pp
-Both the
-.Fn ptsname
-and
-.Fn ptsname_r
-functions will also return the name of the slave pseudo-terminal if a file
-descriptor to the slave pseudo-terminal is passed to
-.Fa masterfd .
-.Pp
-This is a convenient extension because it allows one to use the file descriptor
-obtained by
-.Xr open 2
-.Pa /dev/tty
-to obtain the name of the pseudo-terminal for the current process.
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr open 2 ,
-.Xr grantpt 3 ,
-.Xr posix_openpt 3 ,
-.Xr unlockpt 3
-.Sh STANDARDS
-The
-.Fn ptsname
-function conforms to
-.St -p1003.1-2001 .
-Its first release was in
-.St -xpg4.2 .
diff --git a/lib/libc/stdlib/pty.c b/lib/libc/stdlib/pty.c
deleted file mode 100644
index 643e4a21e..000000000
--- a/lib/libc/stdlib/pty.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*	$NetBSD: pty.c,v 1.4 2014/01/08 02:17:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pty.c,v 1.4 2014/01/08 02:17:30 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-
-int
-grantpt(int fildes)
-{
-
-	return ioctl(fildes, TIOCGRANTPT, 0);
-}
-
-int
-/*ARGSUSED*/
-unlockpt(int fildes)
-{
-
-	return 0;
-}
-
-char *
-ptsname(int fildes)
-{
-	static struct ptmget pm;
-
-	if (ioctl(fildes, TIOCPTSNAME, &pm) == -1)
-		return NULL;
-
-	return pm.sn;
-}
-
-int
-ptsname_r(int fildes, char *buf, size_t buflen) {
-	struct ptmget pm;
-
-	if (buf == NULL)
-		return EINVAL;
-	if (ioctl(fildes, TIOCPTSNAME, &pm) == -1)
-		return errno;
-	if (strlcpy(buf, pm.sn, buflen) > buflen)
-		return ERANGE;
-	return 0;
-}
diff --git a/lib/libc/stdlib/putenv.c b/lib/libc/stdlib/putenv.c
deleted file mode 100644
index 4a7f32319..000000000
--- a/lib/libc/stdlib/putenv.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: putenv.c,v 1.21 2015/01/20 18:31:25 christos 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)putenv.c	8.2 (Berkeley) 3/27/94";
-#else
-__RCSID("$NetBSD: putenv.c,v 1.21 2015/01/20 18:31:25 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "env.h"
-#include "local.h"
-
-int
-putenv(char *str)
-{
-	size_t l_name;
-	int rv;
-
-	_DIAGASSERT(str != NULL);
-
-	l_name = __envvarnamelen(str, true);
-	if (l_name == 0) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	rv = -1;
-	if (__writelockenv()) {
-		ssize_t offset;
-
-		offset = __getenvslot(str, l_name, true);
-		if (offset != -1) {
-			if (environ[offset] != NULL)
-				__freeenvvar(environ[offset]);
-			environ[offset] = str;
-
-			rv = 0;
-		}
-
-		(void)__unlockenv();
-	}
-
-	return rv;
-}
diff --git a/lib/libc/stdlib/qabs.3 b/lib/libc/stdlib/qabs.3
deleted file mode 100644
index 95306af23..000000000
--- a/lib/libc/stdlib/qabs.3
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"	$NetBSD: qabs.3,v 1.9 2008/08/04 21:29:27 matt Exp $
-.\"
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)labs.3	5.3 (Berkeley) 6/29/91
-.\"
-.Dd June 29, 1991
-.Dt QABS 3
-.Os
-.Sh NAME
-.Nm qabs
-.Nd return the absolute value of a quad integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft quad_t
-.Fn qabs "quad_t j"
-.Sh DESCRIPTION
-The
-.Fn qabs
-function
-returns the absolute value of the quad integer
-.Ar j .
-.Sh SEE ALSO
-.Xr abs 3 ,
-.Xr cabs 3 ,
-.Xr floor 3 ,
-.Xr imaxabs 3 ,
-.Xr labs 3 ,
-.Xr llabs 3 ,
-.Xr math 3
-.Sh BUGS
-The absolute value of the most negative integer remains negative.
diff --git a/lib/libc/stdlib/qabs.c b/lib/libc/stdlib/qabs.c
deleted file mode 100644
index 1a2af10f8..000000000
--- a/lib/libc/stdlib/qabs.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: qabs.c,v 1.7 2012/06/25 22:32:45 abs Exp $	*/
-
-/*-
- * 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "from: @(#)labs.c	5.2 (Berkeley) 5/17/90";
-#else
-__RCSID("$NetBSD: qabs.c,v 1.7 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(qabs,_qabs)
-#endif
-
-quad_t
-qabs(quad_t j)
-{
-	return(j < 0 ? -j : j);
-}
diff --git a/lib/libc/stdlib/qdiv.3 b/lib/libc/stdlib/qdiv.3
deleted file mode 100644
index 0d3083725..000000000
--- a/lib/libc/stdlib/qdiv.3
+++ /dev/null
@@ -1,67 +0,0 @@
-.\"	$NetBSD: qdiv.3,v 1.9 2008/08/04 21:29:27 matt Exp $
-.\"
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)qdiv.3	5.3 (Berkeley) 6/29/91
-.\"
-.Dd June 29, 1991
-.Dt QDIV 3
-.Os
-.Sh NAME
-.Nm qdiv
-.Nd return quotient and remainder from division
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft qdiv_t
-.Fn qdiv "quad_t num" "quad_t denom"
-.Sh DESCRIPTION
-The
-.Fn qdiv
-function
-computes the value
-.Ar num/denom
-and returns the quotient and remainder in a structure named
-.Ar qdiv_t
-that contains two
-.Em quad integer
-members named
-.Ar quot
-and
-.Ar rem .
-.Sh SEE ALSO
-.Xr div 3 ,
-.Xr imaxdiv 3 ,
-.Xr ldiv 3 ,
-.Xr lldiv 3 ,
-.Xr math 3
diff --git a/lib/libc/stdlib/qdiv.c b/lib/libc/stdlib/qdiv.c
deleted file mode 100644
index ff61db8f0..000000000
--- a/lib/libc/stdlib/qdiv.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: qdiv.c,v 1.7 2012/06/25 22:32:45 abs Exp $	*/
-
-/*
- * Copyright (c) 1990 Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "from: @(#)ldiv.c	5.2 (Berkeley) 4/16/91";
-#else
-__RCSID("$NetBSD: qdiv.c,v 1.7 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <stdlib.h>		/* qdiv_t */
-
-#ifdef __weak_alias
-__weak_alias(qdiv,_qdiv)
-#endif
-
-qdiv_t
-qdiv(quad_t num, quad_t denom)
-{
-	qdiv_t r;
-
-	/* see div.c for comments */
-
-	r.quot = num / denom;
-	r.rem = num % denom;
-	if (num >= 0 && r.rem < 0) {
-		r.quot++;
-		r.rem -= denom;
-	}
-	return (r);
-}
diff --git a/lib/libc/stdlib/qsort.3 b/lib/libc/stdlib/qsort.3
deleted file mode 100644
index 868c06726..000000000
--- a/lib/libc/stdlib/qsort.3
+++ /dev/null
@@ -1,238 +0,0 @@
-.\"	$NetBSD: qsort.3,v 1.14 2014/09/19 16:02:58 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)qsort.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt QSORT 3
-.Os
-.Sh NAME
-.Nm qsort ,
-.Nm heapsort ,
-.Nm mergesort
-.Nd sort functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn qsort "void *base" "size_t nmemb" "size_t size" "int (*compar)(const void *, const void *)"
-.Ft int
-.Fn heapsort "void *base" "size_t nmemb" "size_t size" "int (*compar)(const void *, const void *)"
-.Ft int
-.Fn mergesort "void *base" "size_t nmemb" "size_t size" "int (*compar)(const void *, const void *)"
-.Sh DESCRIPTION
-The
-.Fn qsort
-function is a modified partition-exchange sort, or quicksort.
-The
-.Fn heapsort
-function is a modified selection sort.
-The
-.Fn mergesort
-function is a modified merge sort with exponential search
-intended for sorting data with pre-existing order.
-.Pp
-The
-.Fn qsort
-and
-.Fn heapsort
-functions sort an array of
-.Fa nmemb
-objects, the initial member of which is pointed to by
-.Fa base .
-The size of each object is specified by
-.Fa size .
-.Fn mergesort
-behaves similarly, but
-.Em requires
-that
-.Fa size
-be greater than
-.Dq "sizeof(void *) / 2" .
-.Pp
-The contents of the array
-.Fa base
-are sorted in ascending order according to
-a comparison function pointed to by
-.Fa compar ,
-which requires two arguments pointing to the objects being
-compared.
-.Pp
-The comparison function must return an integer less than, equal to, or
-greater than zero if the first argument is considered to be respectively
-less than, equal to, or greater than the second.
-.Pp
-The functions
-.Fn qsort
-and
-.Fn heapsort
-are
-.Em not
-stable, that is, if two members compare as equal, their order in
-the sorted array is undefined.
-The function
-.Fn mergesort
-is stable.
-.Pp
-The
-.Fn qsort
-function is an implementation of C.A.R. Hoare's ``quicksort'' algorithm,
-a variant of partition-exchange sorting; in particular, see D.E. Knuth's
-Algorithm Q.
-.Fn qsort
-takes O N lg N average time.
-This implementation uses median selection to avoid its
-O N**2 worst-case behavior.
-.Pp
-The
-.Fn heapsort
-function is an implementation of J.W.J. William's ``heapsort'' algorithm,
-a variant of selection sorting; in particular, see D.E. Knuth's Algorithm H.
-.Fn heapsort
-takes O N lg N worst-case time.
-Its
-.Em only
-advantage over
-.Fn qsort
-is that it uses almost no additional memory; while
-.Fn qsort
-does not allocate memory, it is implemented using recursion.
-.Pp
-The function
-.Fn mergesort
-requires additional memory of size
-.Fa nmemb *
-.Fa size
-bytes; it should be used only when space is not at a premium.
-.Fn mergesort
-is optimized for data with pre-existing order; its worst case
-time is O N lg N; its best case is O N.
-.Pp
-Normally,
-.Fn qsort
-is faster than
-.Fn mergesort
-is faster than
-.Fn heapsort .
-Memory availability and pre-existing order in the data can make this
-untrue.
-.Sh RETURN VALUES
-The
-.Fn qsort
-function
-returns no value.
-.Pp
-Upon successful completion,
-.Fn heapsort
-and
-.Fn mergesort
-return 0.
-Otherwise, they return \-1 and the global variable
-.Va errno
-is set to indicate the error.
-.Sh COMPATIBILITY
-Previous versions of
-.Fn qsort
-did not permit the comparison routine itself to call
-.Fn qsort .
-This is no longer true.
-.Sh ERRORS
-The
-.Fn heapsort
-function succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa size
-argument is zero, or,
-the
-.Fa size
-argument to
-.Fn mergesort
-is less than
-.Dq "sizeof(void *) / 2" .
-.It Bq Er ENOMEM
-.Fn heapsort
-or
-.Fn mergesort
-were unable to allocate memory.
-.El
-.Sh SEE ALSO
-.Xr sort 1 ,
-.Xr radixsort 3
-.Rs
-.%A Hoare, C.A.R.
-.%D 1962
-.%T "Quicksort"
-.%J "The Computer Journal"
-.%V 5:1
-.%P pp. 10-15
-.Re
-.Rs
-.%A Williams, J.W.J
-.%D 1964
-.%T "Heapsort"
-.%J "Communications of the ACM"
-.%V 7:1
-.%P pp. 347-348
-.Re
-.Rs
-.%A Knuth, D.E.
-.%D 1968
-.%B "The Art of Computer Programming"
-.%V Vol. 3
-.%T "Sorting and Searching"
-.%P pp. 114-123, 145-149
-.Re
-.Rs
-.%A McIlroy, P.M.
-.%D 1993
-.%T "Optimistic Sorting and Information Theoretic Complexity"
-.%J "Proceedings of the Fourth Annual ACM-SIAM Symposium on Discrete Algorithms"
-.%P pp. 467-474
-.Re
-.Rs
-.%A Bentley, J.L. and McIlroy, M.D.
-.%D 1993
-.%T "Engineering a Sort Function"
-.%J "Software-Practice and Experience"
-.%V Vol. 23
-.%P pp. 1249-1265
-.Re
-.Sh STANDARDS
-The
-.Fn qsort
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
deleted file mode 100644
index 91b359c29..000000000
--- a/lib/libc/stdlib/qsort.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*	$NetBSD: qsort.c,v 1.22 2012/05/26 21:47:05 christos Exp $	*/
-
-/*-
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)qsort.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: qsort.c,v 1.22 2012/05/26 21:47:05 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-
-static inline char	*med3(char *, char *, char *,
-    int (*)(const void *, const void *));
-static inline void	 swapfunc(char *, char *, size_t, int);
-
-#define min(a, b)	(a) < (b) ? a : b
-
-/*
- * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
- */
-#define swapcode(TYPE, parmi, parmj, n) { 		\
-	size_t i = (n) / sizeof (TYPE); 		\
-	TYPE *pi = (TYPE *)(void *)(parmi); 		\
-	TYPE *pj = (TYPE *)(void *)(parmj); 		\
-	do { 						\
-		TYPE	t = *pi;			\
-		*pi++ = *pj;				\
-		*pj++ = t;				\
-        } while (--i > 0);				\
-}
-
-#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
-	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-
-static inline void
-swapfunc(char *a, char *b, size_t n, int swaptype)
-{
-
-	if (swaptype <= 1) 
-		swapcode(long, a, b, n)
-	else
-		swapcode(char, a, b, n)
-}
-
-#define swap(a, b)						\
-	if (swaptype == 0) {					\
-		long t = *(long *)(void *)(a);			\
-		*(long *)(void *)(a) = *(long *)(void *)(b);	\
-		*(long *)(void *)(b) = t;			\
-	} else							\
-		swapfunc(a, b, es, swaptype)
-
-#define vecswap(a, b, n) if ((n) > 0) swapfunc((a), (b), (size_t)(n), swaptype)
-
-static inline char *
-med3(char *a, char *b, char *c,
-    int (*cmp)(const void *, const void *))
-{
-
-	return cmp(a, b) < 0 ?
-	       (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
-              :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
-}
-
-void
-qsort(void *a, size_t n, size_t es,
-    int (*cmp)(const void *, const void *))
-{
-	char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
-	size_t d, r;
-	int swaptype, cmp_result;
-
-	_DIAGASSERT(a != NULL || n == 0 || es == 0);
-	_DIAGASSERT(cmp != NULL);
-
-loop:	SWAPINIT(a, es);
-	if (n < 7) {
-		for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
-			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
-			     pl -= es)
-				swap(pl, pl - es);
-		return;
-	}
-	pm = (char *) a + (n / 2) * es;
-	if (n > 7) {
-		pl = (char *) a;
-		pn = (char *) a + (n - 1) * es;
-		if (n > 40) {
-			d = (n / 8) * es;
-			pl = med3(pl, pl + d, pl + 2 * d, cmp);
-			pm = med3(pm - d, pm, pm + d, cmp);
-			pn = med3(pn - 2 * d, pn - d, pn, cmp);
-		}
-		pm = med3(pl, pm, pn, cmp);
-	}
-	swap(a, pm);
-	pa = pb = (char *) a + es;
-
-	pc = pd = (char *) a + (n - 1) * es;
-	for (;;) {
-		while (pb <= pc && (cmp_result = cmp(pb, a)) <= 0) {
-			if (cmp_result == 0) {
-				swap(pa, pb);
-				pa += es;
-			}
-			pb += es;
-		}
-		while (pb <= pc && (cmp_result = cmp(pc, a)) >= 0) {
-			if (cmp_result == 0) {
-				swap(pc, pd);
-				pd -= es;
-			}
-			pc -= es;
-		}
-		if (pb > pc)
-			break;
-		swap(pb, pc);
-		pb += es;
-		pc -= es;
-	}
-
-	pn = (char *) a + n * es;
-	r = min(pa - (char *) a, pb - pa);
-	vecswap(a, pb - r, r);
-	r = min((size_t)(pd - pc), pn - pd - es);
-	vecswap(pb, pn - r, r);
-	if ((r = pb - pa) > es)
-		qsort(a, r / es, es, cmp);
-	if ((r = pd - pc) > es) { 
-		/* Iterate rather than recurse to save stack space */
-		a = pn - r;
-		n = r / es;
-		goto loop;
-	}
-/*		qsort(pn - r, r / es, es, cmp);*/
-}
diff --git a/lib/libc/stdlib/quick_exit.3 b/lib/libc/stdlib/quick_exit.3
deleted file mode 100644
index 4e6e79758..000000000
--- a/lib/libc/stdlib/quick_exit.3
+++ /dev/null
@@ -1,68 +0,0 @@
-.\"	$NetBSD: quick_exit.3,v 1.3 2015/07/26 17:03:06 christos Exp $
-.\"  Copyright (c) 2011 David Chisnall
-.\"  All rights reserved.
-.\"
-.\"  Redistribution and use in source and binary forms, with or without
-.\"  modification, are permitted provided that the following conditions
-.\"  are met:
-.\"  1. Redistributions of source code must retain the above copyright
-.\"     notice, this list of conditions and the following disclaimer.
-.\"  2. Redistributions in binary form must reproduce the above copyright
-.\"     notice, this list of conditions and the following disclaimer in the
-.\"     documentation and/or other materials provided with the distribution.
-.\"
-.\"  THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\"  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\"  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\"  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\"  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\"  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\"  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\"  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\"  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\"  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\"  SUCH DAMAGE.
-.\"
-.\"  $FreeBSD: src/lib/libc/stdlib/quick_exit.3,v 1.4 2012/11/17 01:49:41 svnexp Exp $
-.\"
-.Dd July 26, 2015
-.Dt QUICK_EXIT 3
-.Os
-.Sh NAME
-.Nm quick_exit
-.Nd exits a program quickly, running minimal cleanup
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft _Noreturn void
-.Fn quick_exit "int status"
-.Sh DESCRIPTION
-The
-.Fn quick_exit
-function exits the program quickly calling any cleanup functions registered
-with
-.Xr at_quick_exit 3
-but not any C++ destructors or cleanup code registered with
-.Xr atexit 3 .
-.Pp
-The
-.Fa status
-values
-.Dv EXIT_SUCCESS
-and
-.Dv EXIT_FAILURE
-can be used to indicate successful and unsuccessful
-termination, respectively.
-.Sh RETURN VALUES
-The
-.Fn quick_exit
-function does not return.
-.Sh SEE ALSO
-.Xr at_quick_exit 3 ,
-.Xr exit 3
-.Sh STANDARDS
-The
-.Fn quick_exit
-function conforms to
-.St -isoC-2011 .
diff --git a/lib/libc/stdlib/quick_exit.c b/lib/libc/stdlib/quick_exit.c
deleted file mode 100644
index 7f823da73..000000000
--- a/lib/libc/stdlib/quick_exit.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*	$NetBSD: quick_exit.c,v 1.1 2013/04/26 18:29:55 christos Exp $	*/
-
-/*-
- * Copyright (c) 2011 David Chisnall
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/stdlib/quick_exit.c,v 1.4 2012/11/17 01:49:41 svnexp Exp $
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: quick_exit.c,v 1.1 2013/04/26 18:29:55 christos Exp $");
-
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <stdlib.h>
-
-/**
- * Linked list of quick exit handlers.  This is simpler than the atexit()
- * version, because it is not required to support C++ destructors or
- * DSO-specific cleanups.
- */
-struct quick_exit_handler {
-	struct quick_exit_handler *next;
-	void (*cleanup)(void);
-};
-
-/**
- * Lock protecting the handlers list.
- */
-#ifdef _REENTRANT
-extern mutex_t __atexit_mutex;
-#endif
-
-/**
- * Stack of cleanup handlers.  These will be invoked in reverse order when 
- */
-static struct quick_exit_handler *handlers;
-
-int
-at_quick_exit(void (*func)(void))
-{
-	struct quick_exit_handler *h;
-	
-	h = malloc(sizeof(*h));
-
-	if (NULL == h)
-		return 1;
-	h->cleanup = func;
-#ifdef _REENTRANT
-	mutex_lock(&__atexit_mutex);
-#endif
-	h->next = handlers;
-	handlers = h;
-#ifdef _REENTRANT
-	mutex_unlock(&__atexit_mutex);
-#endif
-	return 0;
-}
-
-void
-quick_exit(int status)
-{
-	struct quick_exit_handler *h;
-
-	/*
-	 * XXX: The C++ spec requires us to call std::terminate if there is an
-	 * exception here.
-	 */
-	for (h = handlers; NULL != h; h = h->next)
-		(*h->cleanup)();
-	_Exit(status);
-}
diff --git a/lib/libc/stdlib/radixsort.3 b/lib/libc/stdlib/radixsort.3
deleted file mode 100644
index 109466aba..000000000
--- a/lib/libc/stdlib/radixsort.3
+++ /dev/null
@@ -1,167 +0,0 @@
-.\"	$NetBSD: radixsort.3,v 1.13 2003/08/07 16:43:43 agc Exp $
-.\"
-.\" Copyright (c) 1990, 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. 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: @(#)radixsort.3	8.2 (Berkeley) 1/27/94
-.\"
-.Dd January 27, 1994
-.Dt RADIXSORT 3
-.Os
-.Sh NAME
-.Nm radixsort ,
-.Nm sradixsort
-.Nd radix sort
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In limits.h
-.In stdlib.h
-.Ft int
-.Fn radixsort "const u_char **base" "int nmemb" "u_char *table" "u_int endbyte"
-.Ft int
-.Fn sradixsort "const u_char **base" "int nmemb" "u_char *table" "u_int endbyte"
-.Sh DESCRIPTION
-The
-.Fn radixsort
-and
-.Fn sradixsort
-functions
-are implementations of radix sort.
-.Pp
-These functions sort an
-.Fa nmemb
-element array of pointers to byte strings, with
-the initial member of which is referenced by
-.Fa base .
-The byte strings may contain any values.
-End of strings is denoted
-by character which has same weight as user specified value
-.Fa endbyte .
-.Fa endbyte
-has to be between 0 and 255.
-.Pp
-Applications may specify a sort order by providing the
-.Fa table
-argument.
-If
-.Pf non- Dv NULL ,
-.Fa table
-must reference an array of
-.Dv UCHAR_MAX
-+ 1 bytes which contains the sort
-weight of each possible byte value.
-The end-of-string byte must have a sort weight of 0 or 255
-(for sorting in reverse order).
-More than one byte may have the same sort weight.
-The
-.Fa table
-argument
-is useful for applications which wish to sort different characters
-equally, for example, providing a table with the same weights
-for A-Z as for a-z will result in a case-insensitive sort.
-If
-.Fa table
-is NULL, the contents of the array are sorted in ascending order
-according to the
-.Tn ASCII
-order of the byte strings they reference and
-.Fa endbyte
-has a sorting weight of 0.
-.Pp
-The
-.Fn sradixsort
-function is stable, that is, if two elements compare as equal, their
-order in the sorted array is unchanged.
-The
-.Fn sradixsort
-function uses additional memory sufficient to hold
-.Fa nmemb
-pointers.
-.Pp
-The
-.Fn radixsort
-function is not stable, but uses no additional memory.
-.Pp
-These functions are variants of most-significant-byte radix sorting; in
-particular, see D.E. Knuth's Algorithm R and section 5.2.5, exercise 10.
-They take linear time relative to the number of bytes in the strings.
-.Sh RETURN VALUES
-Upon successful completion 0 is returned.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of the
-.Fa endbyte
-element of
-.Fa table
-is not 0 or 255.
-.El
-.Pp
-Additionally, the
-.Fn sradixsort
-function
-may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr sort 1 ,
-.Xr qsort 3
-.Pp
-.Rs
-.%A Knuth, D.E.
-.%D 1968
-.%B "The Art of Computer Programming"
-.%T "Sorting and Searching"
-.%V Vol. 3
-.%P pp. 170-178
-.Re
-.Rs
-.%A Paige, R.
-.%D 1987
-.%T "Three Partition Refinement Algorithms"
-.%J "SIAM J. Comput."
-.%V Vol. 16
-.%N No. 6
-.Re
-.Rs
-.%A McIlroy, P.
-.%D 1993
-.%B "Engineering Radix Sort"
-.%T "Computing Systems"
-.%V Vol. 6:1
-.%P pp. 5-27
-.Re
-.Sh HISTORY
-The
-.Fn radixsort
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c
deleted file mode 100644
index e8435f5f2..000000000
--- a/lib/libc/stdlib/radixsort.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*	$NetBSD: radixsort.c,v 1.19 2009/09/05 08:53:06 dsl Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Peter McIlroy and by Dan Bernstein at New York University, 
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)radixsort.c	8.2 (Berkeley) 4/28/95";
-#else
-__RCSID("$NetBSD: radixsort.c,v 1.19 2009/09/05 08:53:06 dsl Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Radixsort routines.
- * 
- * Program r_sort_a() is unstable but uses O(logN) extra memory for a stack.
- * Use radixsort(a, n, trace, endchar) for this case.
- * 
- * For stable sorting (using N extra pointers) use sradixsort(), which calls
- * r_sort_b().
- * 
- * For a description of this code, see D. McIlroy, P. McIlroy, K. Bostic,
- * "Engineering Radix Sort".
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(radixsort,_radixsort)
-__weak_alias(sradixsort,_sradixsort)
-#endif
-
-typedef struct {
-	const u_char **sa;
-	int sn, si;
-} stack;
-
-static inline void simplesort(const u_char **, int, int, const u_char *, u_int);
-static void r_sort_a(const u_char **, int, int, const u_char *, u_int);
-static void r_sort_b(const u_char **,
-	    const u_char **, int, int, const u_char *, u_int);
-
-#define	THRESHOLD	20		/* Divert to simplesort(). */
-#define	SIZE		512		/* Default stack size. */
-
-#define SETUP {								\
-	if (tab == NULL) {						\
-		tr = tr0;						\
-		for (c = 0; c < endch; c++)				\
-			tr0[c] = c + 1;					\
-		tr0[c] = 0;						\
-		for (c++; c < 256; c++)					\
-			tr0[c] = c;					\
-		endch = 0;						\
-	} else {							\
-		endch = tab[endch];					\
-		tr = tab;						\
-		if (endch != 0 && endch != 255) {			\
-			errno = EINVAL;					\
-			return (-1);					\
-		}							\
-	}								\
-}
-
-int
-radixsort(const u_char **a, int n, const u_char *tab, u_int endch)
-{
-	const u_char *tr;
-	u_int c;
-	u_char tr0[256];
-
-	_DIAGASSERT(a != NULL);
-
-	SETUP;
-	r_sort_a(a, n, 0, tr, endch);
-	return (0);
-}
-
-int
-sradixsort(const u_char **a, int n, const u_char *tab, u_int endch)
-{
-	const u_char *tr, **ta;
-	u_int c;
-	u_char tr0[256];
-
-	_DIAGASSERT(a != NULL);
-	if (a == NULL) {
-		errno = EFAULT;
-		return (-1);
-	}
-
-	SETUP;
-	if (n < THRESHOLD)
-		simplesort(a, n, 0, tr, endch);
-	else {
-		if ((ta = malloc(n * sizeof(a))) == NULL)
-			return (-1);
-		r_sort_b(a, ta, n, 0, tr, endch);
-		free(ta);
-	}
-	return (0);
-}
-
-#define empty(s)	(s >= sp)
-#define pop(a, n, i)	a = (--sp)->sa, n = sp->sn, i = sp->si
-#define push(a, n, i)	sp->sa = a, sp->sn = n, (sp++)->si = i
-#define swap(a, b, t)	t = a, a = b, b = t
-
-/* Unstable, in-place sort. */
-static void
-r_sort_a(const u_char **a, int n, int i, const u_char *tr, u_int endch)
-{
-	static u_int count[256], nc, bmin;
-	u_int c;
-	const u_char **ak, *r;
-	stack s[SIZE], *sp, *sp0, *sp1, temp;
-	u_int *cp, bigc;
-	const u_char **an, *t, **aj, **top[256];
-
-	_DIAGASSERT(a != NULL);
-	_DIAGASSERT(tr != NULL);
-
-	/* Set up stack. */
-	sp = s;
-	push(a, n, i);
-	while (!empty(s)) {
-		pop(a, n, i);
-		if (n < THRESHOLD) {
-			simplesort(a, n, i, tr, endch);
-			continue;
-		}
-		an = a + n;
-
-		/* Make character histogram. */
-		if (nc == 0) {
-			bmin = 255;	/* First occupied bin, excluding eos. */
-			for (ak = a; ak < an;) {
-				c = tr[(*ak++)[i]];
-				if (++count[c] == 1 && c != endch) {
-					if (c < bmin)
-						bmin = c;
-					nc++;
-				}
-			}
-			if (sp + nc > s + SIZE) {	/* Get more stack. */
-				r_sort_a(a, n, i, tr, endch);
-				continue;
-			}
-		}
-
-		/*
-		 * Set top[]; push incompletely sorted bins onto stack.
-		 * top[] = pointers to last out-of-place element in bins.
-		 * count[] = counts of elements in bins.
-		 * Before permuting: top[c-1] + count[c] = top[c];
-		 * during deal: top[c] counts down to top[c-1].
-		 */
-		sp0 = sp1 = sp;		/* Stack position of biggest bin. */
-		bigc = 2;		/* Size of biggest bin. */
-		if (endch == 0)		/* Special case: set top[eos]. */
-			top[0] = ak = a + count[0];
-		else {
-			ak = a;
-			top[255] = an;
-		}
-		for (cp = count + bmin; nc > 0; cp++) {
-			while (*cp == 0)	/* Find next non-empty pile. */
-				cp++;
-			if (*cp > 1) {
-				if (*cp > bigc) {
-					bigc = *cp;
-					sp1 = sp;
-				}
-				push(ak, *cp, i+1);
-			}
-			top[cp-count] = ak += *cp;
-			nc--;
-		}
-		swap(*sp0, *sp1, temp);	/* Play it safe -- biggest bin last. */
-
-		/*
-		 * Permute misplacements home.  Already home: everything
-		 * before aj, and in bin[c], items from top[c] on.
-		 * Inner loop:
-		 *	r = next element to put in place;
-		 *	ak = top[r[i]] = location to put the next element.
-		 *	aj = bottom of 1st disordered bin.
-		 * Outer loop:
-		 *	Once the 1st disordered bin is done, ie. aj >= ak,
-		 *	aj<-aj + count[c] connects the bins in a linked list;
-		 *	reset count[c].
-		 */
-		for (aj = a; aj < an;  *aj = r, aj += count[c], count[c] = 0)
-			for (r = *aj;  aj < (ak = --top[c = tr[r[i]]]);)
-				swap(*ak, r, t);
-	}
-}
-
-/* Stable sort, requiring additional memory. */
-static void
-r_sort_b(const u_char **a, const u_char **ta, int n, int i, const u_char *tr,
-    u_int endch)
-{
-	static u_int count[256], nc, bmin;
-	u_int c;
-	const u_char **ak, **ai;
-	stack s[512], *sp, *sp0, *sp1, temp;
-	const u_char **top[256];
-	u_int *cp, bigc;
-
-	_DIAGASSERT(a != NULL);
-	_DIAGASSERT(ta != NULL);
-	_DIAGASSERT(tr != NULL);
-
-	sp = s;
-	push(a, n, i);
-	while (!empty(s)) {
-		pop(a, n, i);
-		if (n < THRESHOLD) {
-			simplesort(a, n, i, tr, endch);
-			continue;
-		}
-
-		if (nc == 0) {
-			bmin = 255;
-			for (ak = a + n; --ak >= a;) {
-				c = tr[(*ak)[i]];
-				if (++count[c] == 1 && c != endch) {
-					if (c < bmin)
-						bmin = c;
-					nc++;
-				}
-			}
-			if (sp + nc > s + SIZE) {
-				r_sort_b(a, ta, n, i, tr, endch);
-				continue;
-			}
-		}
-
-		sp0 = sp1 = sp;
-		bigc = 2;
-		if (endch == 0) {
-			top[0] = ak = a + count[0];
-			count[0] = 0;
-		} else {
-			ak = a;
-			top[255] = a + n;
-			count[255] = 0;
-		}
-		for (cp = count + bmin; nc > 0; cp++) {
-			while (*cp == 0)
-				cp++;
-			if ((c = *cp) > 1) {
-				if (c > bigc) {
-					bigc = c;
-					sp1 = sp;
-				}
-				push(ak, c, i+1);
-			}
-			top[cp-count] = ak += c;
-			*cp = 0;			/* Reset count[]. */
-			nc--;
-		}
-		swap(*sp0, *sp1, temp);
-
-		for (ak = ta + n, ai = a+n; ak > ta;)	/* Copy to temp. */
-			*--ak = *--ai;
-		for (ak = ta+n; --ak >= ta;)		/* Deal to piles. */
-			*--top[tr[(*ak)[i]]] = *ak;
-	}
-}
-
-/* insertion sort */
-static inline void
-simplesort(const u_char **a, int n, int b, const u_char *tr, u_int endch)
-{
-	u_char ch;
-	const u_char  **ak, **ai, *s, *t;
-
-	_DIAGASSERT(a != NULL);
-	_DIAGASSERT(tr != NULL);
-
-	for (ak = a+1; --n >= 1; ak++)
-		for (ai = ak; ai > a; ai--) {
-			for (s = ai[0] + b, t = ai[-1] + b;
-			    (ch = tr[*s]) != endch; s++, t++)
-				if (ch != tr[*t])
-					break;
-			if (ch >= tr[*t])
-				break;
-			swap(ai[0], ai[-1], s);
-		}
-}
diff --git a/lib/libc/stdlib/rand.3 b/lib/libc/stdlib/rand.3
deleted file mode 100644
index 85f042360..000000000
--- a/lib/libc/stdlib/rand.3
+++ /dev/null
@@ -1,100 +0,0 @@
-.\"	$NetBSD: rand.3,v 1.12 2010/03/22 19:30:54 joerg Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)rand.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt RAND 3
-.Os
-.Sh NAME
-.Nm rand ,
-.Nm srand ,
-.Nm rand_r
-.Nd bad random number generator
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn srand "unsigned int seed"
-.Ft int
-.Fn rand void
-.Ft int
-.Fn rand_r "unsigned int *seed"
-.Sh DESCRIPTION
-.Bf -symbolic
-These interfaces are obsoleted by
-.Xr random 3 .
-.Ef
-.Pp
-The
-.Fn rand
-function computes a sequence of pseudo-random integers in the range
-of 0 to
-.Dv RAND_MAX
-(as defined by the header file
-.In stdlib.h ) .
-.Pp
-The
-.Fn srand
-function sets its argument as the seed for a new sequence of
-pseudo-random numbers to be returned by
-.Fn rand .
-These sequences are repeatable by calling
-.Fn srand
-with the same seed value.
-.Pp
-If no seed value is provided, the
-.Fn rand
-function is automatically seeded with a value of 1.
-.Pp
-The
-.Fn rand_r
-function is a reentrant interface to
-.Fn rand ;
-the seed has to be supplied and is maintained by the caller.
-.Sh SEE ALSO
-.Xr random 3 ,
-.Xr rnd 4
-.Sh STANDARDS
-The
-.Fn rand
-and
-.Fn srand
-functions
-conform to
-.St -ansiC .
-The
-.Fn rand_r
-function conforms to
-.St -p1003.1c-95 .
diff --git a/lib/libc/stdlib/rand.c b/lib/libc/stdlib/rand.c
deleted file mode 100644
index 4909d1434..000000000
--- a/lib/libc/stdlib/rand.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: rand.c,v 1.12 2012/06/25 22:32:45 abs Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)rand.c	8.1 (Berkeley) 6/14/93";
-#else
-__RCSID("$NetBSD: rand.c,v 1.12 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <stdlib.h>
-
-static u_long next = 1;
-
-int
-rand(void)
-{
-	/* LINTED integer overflow */
-	return (int)((next = next * 1103515245 + 12345) % ((u_long)RAND_MAX + 1));
-}
-
-void
-srand(u_int seed)
-{
-	next = seed;
-}
diff --git a/lib/libc/stdlib/rand48.3 b/lib/libc/stdlib/rand48.3
deleted file mode 100644
index b9939ece5..000000000
--- a/lib/libc/stdlib/rand48.3
+++ /dev/null
@@ -1,163 +0,0 @@
-.\"	$NetBSD: rand48.3,v 1.11 2006/03/31 11:43:54 drochner Exp $
-.\"
-.\" Copyright (c) 1993 Martin Birgmeier
-.\" All rights reserved.
-.\"
-.\" You may redistribute unmodified or modified versions of this source
-.\" code provided that the above copyright notice and this and the
-.\" following conditions are retained.
-.\"
-.\" This software is provided ``as is'', and comes with no warranties
-.\" of any kind. I shall in no event be liable for anything that happens
-.\" to anyone/anything when using this software.
-.\"
-.Dd October 8, 1993
-.Dt RAND48 3
-.Os
-.Sh NAME
-.Nm drand48 ,
-.Nm erand48 ,
-.Nm lrand48 ,
-.Nm nrand48 ,
-.Nm mrand48 ,
-.Nm jrand48 ,
-.Nm srand48 ,
-.Nm seed48 ,
-.Nm lcong48
-.Nd pseudo-random number generators and initialization routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft double
-.Fn drand48 void
-.Ft double
-.Fn erand48 "unsigned short xseed[3]"
-.Ft long
-.Fn lrand48 void
-.Ft long
-.Fn nrand48 "unsigned short xseed[3]"
-.Ft long
-.Fn mrand48 void
-.Ft long
-.Fn jrand48 "unsigned short xseed[3]"
-.Ft void
-.Fn srand48 "long seed"
-.Ft "unsigned short *"
-.Fn seed48 "unsigned short xseed[3]"
-.Ft void
-.Fn lcong48 "unsigned short p[7]"
-.Sh DESCRIPTION
-The
-.Fn rand48
-family of functions generates pseudo-random numbers using a linear
-congruential algorithm working on integers 48 bits in size.
-The particular formula employed is
-r(n+1) = (a * r(n) + c) mod m
-where the default values are
-for the multiplicand a = 0x5deece66d = 25214903917 and
-the addend c = 0xb = 11.
-The modulus is always fixed at m = 2 ** 48.
-r(n) is called the seed of the random number generator.
-.Pp
-For all the six generator routines described next, the first
-computational step is to perform a single iteration of the algorithm.
-.Pp
-.Fn drand48
-and
-.Fn erand48
-return values of type double.
-The full 48 bits of r(n+1) are loaded into the mantissa of the
-returned value, with the exponent set such that the values produced
-lie in the interval [0.0, 1.0).
-.Pp
-.Fn lrand48
-and
-.Fn nrand48
-return values of type long in the range [0, 2**31-1].
-The high-order (31) bits of r(n+1) are loaded into the lower bits
-of the returned value, with the topmost (sign) bit set to zero.
-.Pp
-.Fn mrand48
-and
-.Fn jrand48
-return values of type long in the range [-2**31, 2**31-1].
-The high-order (32) bits of r(n+1) are loaded into the returned value.
-.Pp
-.Fn drand48 ,
-.Fn lrand48 ,
-and
-.Fn mrand48
-use an internal buffer to store r(n).
-For these functions
-the initial value of r(0) = 0x1234abcd330e = 20017429951246.
-.Pp
-On the other hand,
-.Fn erand48 ,
-.Fn nrand48 ,
-and
-.Fn jrand48
-use a user-supplied buffer to store the seed r(n), which consists
-of an array of 3 shorts, where the zeroth member holds the least
-significant bits.
-.Pp
-All functions share the same multiplicand and addend.
-.Pp
-.Fn srand48
-is used to initialize the internal buffer r(n) of
-.Fn drand48 ,
-.Fn lrand48 ,
-and
-.Fn mrand48
-such that the 32 bits of the seed value are copied into the upper 32 bits
-of r(n), with the lower 16 bits of r(n) arbitrarily being set to 0x330e.
-Additionally, the constant multiplicand and addend of the algorithm are
-reset to the default values given above.
-.Pp
-.Fn seed48
-also initializes the internal buffer r(n) of
-.Fn drand48 ,
-.Fn lrand48 ,
-and
-.Fn mrand48 ,
-but here all 48 bits of the seed can be specified in an array of 3 shorts,
-where the zeroth member specifies the lowest bits.
-Again, the constant multiplicand and addend of the algorithm are
-reset to the default values given above.
-.Fn seed48
-returns a pointer to an array of 3 shorts which contains the old seed.
-This array is statically allocated, thus its contents are lost after
-each new call to
-.Fn seed48 .
-.Pp
-Finally,
-.Fn lcong48
-allows full control over the multiplicand and addend used in
-.Fn drand48 ,
-.Fn erand48 ,
-.Fn lrand48 ,
-.Fn nrand48 ,
-.Fn mrand48 ,
-and
-.Fn jrand48 ,
-and the seed used in
-.Fn drand48 ,
-.Fn lrand48 ,
-and
-.Fn mrand48 .
-An array of 7 shorts is passed as parameter; the first three shorts are
-used to initialize the seed; the second three are used to initialize the
-multiplicand; and the last short is used to initialize the addend.
-It is thus not possible to use values greater than 0xffff as the addend.
-.Pp
-Note that all three methods of seeding the random number generator
-always also set the multiplicand and addend for any of the six
-generator calls.
-.Pp
-For a more powerful random number generator, see
-.Xr random 3 .
-.Sh SEE ALSO
-.Xr rand 3 ,
-.Xr random 3
-.Sh AUTHORS
-Martin Birgmeier
diff --git a/lib/libc/stdlib/rand48.h b/lib/libc/stdlib/rand48.h
deleted file mode 100644
index 1ad8b0d21..000000000
--- a/lib/libc/stdlib/rand48.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*	$NetBSD: rand48.h,v 1.6 2011/05/18 19:36:36 dsl Exp $	*/
-
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#ifndef _RAND48_H_
-#define _RAND48_H_
-
-#include <stdlib.h>
-
-extern void		__dorand48(unsigned short[3]);
-extern unsigned short	__rand48_seed[3];
-extern unsigned short	__rand48_mult[3];
-extern unsigned short	__rand48_add;
-
-#define	RAND48_SEED_0	(0x330e)
-#define	RAND48_SEED_1	(0xabcd)
-#define	RAND48_SEED_2	(0x1234)
-#define	RAND48_MULT_0	(0xe66d)
-#define	RAND48_MULT_1	(0xdeec)
-#define	RAND48_MULT_2	(0x0005)
-#define	RAND48_ADD	(0x000b)
-
-#endif /* _RAND48_H_ */
diff --git a/lib/libc/stdlib/rand_r.c b/lib/libc/stdlib/rand_r.c
deleted file mode 100644
index 272b2bdcd..000000000
--- a/lib/libc/stdlib/rand_r.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: rand_r.c,v 1.6 2012/06/25 22:32:45 abs Exp $	*/
-
-/*-
- * 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "from: @(#)rand.c	5.6 (Berkeley) 6/24/91";
-#else
-__RCSID("$NetBSD: rand_r.c,v 1.6 2012/06/25 22:32:45 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-
-int
-rand_r(unsigned int *seed)
-{
-	_DIAGASSERT(seed != NULL);
-
-	return ((*seed = *seed * 1103515245 + 12345) & RAND_MAX);
-}
diff --git a/lib/libc/stdlib/random.3 b/lib/libc/stdlib/random.3
deleted file mode 100644
index cf35ca44e..000000000
--- a/lib/libc/stdlib/random.3
+++ /dev/null
@@ -1,191 +0,0 @@
-.\"	$NetBSD: random.3,v 1.21 2014/06/12 18:46:12 christos Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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: @(#)random.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 12, 2014
-.Dt RANDOM 3
-.Os
-.Sh NAME
-.Nm random ,
-.Nm srandom ,
-.Nm initstate ,
-.Nm setstate
-.Nd better random number generator; routines for changing generators
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft long
-.Fn random void
-.Ft void
-.Fn srandom "unsigned int seed"
-.Ft char *
-.Fn initstate "unsigned int seed" "char *state" "size_t n"
-.Ft char *
-.Fn setstate "char *state"
-.Sh DESCRIPTION
-The
-.Fn random
-function
-uses a non-linear additive feedback random number generator employing a
-default table of size 31 long integers to return successive pseudo-random
-numbers in the range from 0 to
-.if t 2\u\s731\s10\d\(mi1.
-.if n (2**31)\(mi1.
-The period of this random number generator is very large, approximately
-.if t 16\(mu(2\u\s731\s10\d\(mi1).
-.if n 16*((2**31)\(mi1).
-The maximum value
-.Dv RANDOM_MAX
-is defined in
-.In stdlib.h .
-.Pp
-The
-.Fn random
-and
-.Fn srandom
-have (almost) the same calling sequence and initialization properties as
-.Xr rand 3
-and
-.Xr srand 3 .
-The difference is that
-.Xr rand 3
-produces a much less random sequence \(em in fact, the low dozen bits
-generated by
-.Xr rand 3
-go through a cyclic pattern.
-All the bits generated by
-.Fn random
-are usable.
-For example,
-.Sq Li random()\*[Am]01
-will produce a random binary value.
-.Pp
-Like
-.Xr rand 3 ,
-.Fn random
-will by default produce a sequence of numbers that can be duplicated
-by calling
-.Fn srandom
-with
-.Ql 1
-as the seed.
-.Pp
-The
-.Fn initstate
-routine allows a state array, passed in as an argument, to be initialized
-for future use.
-The size of the state array (in bytes) is used by
-.Fn initstate
-to decide how sophisticated a random number generator it should use \(em the
-more state, the better the random numbers will be.
-(Current "optimal" values for the amount of state information are
-8, 32, 64, 128, and 256 bytes; other amounts will be rounded down to
-the nearest known amount.
-Using less than 8 bytes will cause an error).
-The seed for the initialization (which specifies a starting point for
-the random number sequence, and provides for restarting at the same
-point) is also an argument.
-The state array passed to
-.Fn initstate
-must be aligned to a 32-bit boundary.
-This can be achieved by using
-a suitably-sized array of ints, and casting the array to char * when
-passing it to
-.Fn initstate .
-The
-.Fn initstate
-function
-returns a pointer to the previous state information array.
-.Pp
-Once a state has been initialized, the
-.Fn setstate
-routine provides for rapid switching between states.
-The
-.Fn setstate
-function
-returns a pointer to the previous state array; its
-argument state array is used for further random number generation
-until the next call to
-.Fn initstate
-or
-.Fn setstate .
-.Pp
-Once a state array has been initialized, it may be restarted at a
-different point either by calling
-.Fn initstate
-(with the desired seed, the state array, and its size) or by calling
-both
-.Fn setstate
-(with the state array) and
-.Fn srandom
-(with the desired seed).
-The advantage of calling both
-.Fn setstate
-and
-.Fn srandom
-is that the size of the state array does not have to be remembered after
-it is initialized.
-.Pp
-With 256 bytes of state information, the period of the random number
-generator is greater than
-.if t 2\u\s769\s10\d,
-.if n 2**69
-which should be sufficient for most purposes.
-.Sh DIAGNOSTICS
-If
-.Fn initstate
-is called with less than 8 bytes of state information, or if
-.Fn setstate
-detects that the state information has been garbled, error
-messages are printed on the standard error output.
-.Sh SEE ALSO
-.Xr rand 3 ,
-.Xr srand 3 ,
-.Xr rnd 4 ,
-.Xr rnd 9
-.Sh STANDARDS
-The
-.Fn random ,
-.Fn srandom ,
-.Fn initstate
-and
-.Fn setstate
-functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-These
-functions appeared in
-.Bx 4.2 .
-.Sh AUTHORS
-.An Earl T. Cohen
-.Sh BUGS
-About 2/3 the speed of
-.Xr rand 3 .
diff --git a/lib/libc/stdlib/reallocarr.3 b/lib/libc/stdlib/reallocarr.3
deleted file mode 100644
index a780c2a4b..000000000
--- a/lib/libc/stdlib/reallocarr.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"	$NetBSD: reallocarr.3,v 1.4 2015/07/28 17:13:34 kamil Exp $
-.\"
-.\" Copyright (c) 2015 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-.\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-.\" FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
-.\" COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
-.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.Dd February 19, 2015
-.Dt REALLOCARR 3
-.Os
-.Sh NAME
-.Nm reallocarr
-.Nd reallocate array
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fo reallocarr
-.Fa "void *ptr"
-.Fa "size_t number"
-.Fa "size_t size"
-.Fc
-.Sh DESCRIPTION
-The
-.Nm
-function reallocates the memory in
-.Fa *ptr .
-.Sh RETURN VALUES
-On successful completion,
-.Fn
-returns 0 and updates
-.Fa *ptr .
-Otherwise, an error code (see
-.Xr errno 2 )
-is returned and
-.Fa *ptr
-and the referenced memory is unmodified.
-.Sh EXAMPLES
-The following uses
-.Fn reallocarr
-to initialize an array of INITSIZE integers, then
-resizes it to NEWSIZE elements:
-.Bd -literal -offset indent
-int *data = NULL;
-int ret = 0;
-
-ret = reallocarr(&data, INITSIZE, sizeof(*data));
-if (ret)
-    errc(1, ret, "reallocarr failed");
-
-ret = reallocarr(&data, NEWSIZE, sizeof(*data));
-if (ret)
-    errc(1, ret, "reallocarr failed on resize");
-.Ed
-.Sh SEE ALSO
-.Xr calloc 3
-.Sh HISTORY
-.Nm
-first appeared in
-.Nx 7.0 .
-.Ox
-introduced the
-.Xr reallocarray 3
-function for the same purpose, but the interface makes it difficult
-to correctly handle zero-sized allocations.
diff --git a/lib/libc/stdlib/reallocarr.c b/lib/libc/stdlib/reallocarr.c
deleted file mode 100644
index 6ffe8114e..000000000
--- a/lib/libc/stdlib/reallocarr.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $NetBSD: reallocarr.c,v 1.5 2015/08/20 22:27:49 kamil Exp $ */
-
-/*-
- * Copyright (c) 2015 Joerg Sonnenberger <joerg@NetBSD.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: reallocarr.c,v 1.5 2015/08/20 22:27:49 kamil Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-/* Old POSIX has SIZE_MAX in limits.h */
-#include <limits.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _LIBC
-#ifdef __weak_alias
-__weak_alias(reallocarr, _reallocarr)
-#endif
-#endif
-
-#define SQRT_SIZE_MAX (((size_t)1) << (sizeof(size_t) * CHAR_BIT / 2))
-
-#if !HAVE_REALLOCARR
-int
-reallocarr(void *ptr, size_t number, size_t size)
-{
-	int saved_errno, result;
-	void *optr;
-	void *nptr;
-
-	saved_errno = errno;
-	memcpy(&optr, ptr, sizeof(ptr));
-	if (number == 0 || size == 0) {
-		free(optr);
-		nptr = NULL;
-		memcpy(ptr, &nptr, sizeof(ptr));
-		errno = saved_errno;
-		return 0;
-	}
-
-	/*
-	 * Try to avoid division here.
-	 *
-	 * It isn't possible to overflow during multiplication if neither
-	 * operand uses any of the most significant half of the bits.
-	 */
-	if (__predict_false((number|size) >= SQRT_SIZE_MAX &&
-	                    number > SIZE_MAX / size)) {
-		errno = saved_errno;
-		return EOVERFLOW;
-	}
-
-	nptr = realloc(optr, number * size);
-	if (__predict_false(nptr == NULL)) {
-		result = errno;
-	} else {
-		result = 0;
-		memcpy(ptr, &nptr, sizeof(ptr));
-	}
-	errno = saved_errno;
-	return result;
-}
-#endif
diff --git a/lib/libc/stdlib/reallocarray.3 b/lib/libc/stdlib/reallocarray.3
deleted file mode 100644
index a95e23fed..000000000
--- a/lib/libc/stdlib/reallocarray.3
+++ /dev/null
@@ -1,130 +0,0 @@
-.\" $NetBSD: reallocarray.3,v 1.4 2015/07/26 02:29:44 kamil Exp $
-.\"
-.\" Copyright (c) 2015 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-.\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-.\" FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
-.\" COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
-.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd February 5, 2015
-.Dt REALLOCARRAY 3
-.Os
-.Sh NAME
-.Nm reallocarray
-.Nd reallocate memory for an array of elements checking for overflow
-.Sh SYNOPSIS
-.Vt #define _OPENBSD_SOURCE
-.In stdlib.h
-.Ft void *
-.Fo reallocarray
-.Fa "void *ptr"
-.Fa "size_t nmemb"
-.Fa "size_t size"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn reallocarray
-function reallocates the pointer
-.Fa ptr
-to a size appropriate to handle an allocation of
-.Fa nmemb
-elements in an array where each of the array elements is
-.Fa size
-bytes using
-.Xr realloc 3
-and making sure that overflow does not happen in the multiplication of
-.Dq "nmemb * size" .
-.Pp
-This function is provided for source compatibility with
-.Ox
-and
-its use is discouraged in preference to
-.Xr reallocarr 3 .
-.Sh RETURN VALUES
-The
-.Fn reallocarray
-function will return
-.Dv NULL
-if there was overflow or if
-.Xr realloc 3
-failed setting
-.Va errno
-to
-.Dv EOVERFLOW
-or preserving the value from
-.Xr realloc 3 .
-.Sh SEE ALSO
-.Xr malloc 3 ,
-.Xr realloc 3 ,
-.Xr reallocarr 3
-.Sh STANDARDS
-.Fn reallocarray
-is an
-.Ox
-extension.
-.Sh HISTORY
-The
-.Fn reallocarray
-function first appeared in
-.Ox 5.6 .
-.Fn reallocarray
-was redesigned in
-.Nx 8
-as
-.Fn reallocarr 3 .
-For compatibility reasons it's available since
-.Nx 8
-in the
-.Vt _OPENBSD_SOURCE
-namespace.
-.Sh CAVEATS
-The
-.Fn reallocarray
-function was designed to facilitate safe,
-robust programming and overcome the shortcomings of the
-.Xr malloc 3
-and
-.Xr realloc 3
-functions by centralizing the overflow check in the multiplication of
-.Fa nmemb
-and
-.Fa size .
-.Pp
-There are still portability issues (it does not solve
-the
-.Dv 0
-sized allocation return ambiguity in the C standard: does
-.Fn reallocarray
-return
-.Dv NULL
-or a unique pointer to memory that cannot be accessed? Does a
-.Dv NULL
-mean that an error occurred, and can someone check
-.Dv errno
-in that case to find out what happened?).
-.Pp
-For this reason
-.Nx
-decided to go with an alternative implementation, and created
-.Xr reallocarr 3 .
diff --git a/lib/libc/stdlib/reallocarray.c b/lib/libc/stdlib/reallocarray.c
deleted file mode 100644
index 710655bf6..000000000
--- a/lib/libc/stdlib/reallocarray.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: reallocarray.c,v 1.5 2015/07/26 02:22:33 kamil Exp $	*/
-/*	$OpenBSD: reallocarray.c,v 1.1 2014/05/08 21:43:49 deraadt Exp $	*/
-
-/*-
- * Copyright (c) 2015 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: reallocarray.c,v 1.5 2015/07/26 02:22:33 kamil Exp $");
-
-#define _OPENBSD_SOURCE
-#include <errno.h>
-#include <stdlib.h>
-
-void *
-reallocarray(void *optr, size_t nmemb, size_t size)
-{
-	if (nmemb == 0 || size == 0)
-		return realloc(optr, 0);
-
-	int e = reallocarr(&optr, nmemb, size);
-
-	if (e == 0)
-		return optr;
-	errno = e;
-	return NULL;
-}
diff --git a/lib/libc/stdlib/remque.c b/lib/libc/stdlib/remque.c
deleted file mode 100644
index 6060ad84b..000000000
--- a/lib/libc/stdlib/remque.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (c) 1993 John Brezak
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must 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 be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: remque.c,v 1.3 2012/06/25 22:32:45 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <search.h>
-
-struct qelem {
-        struct qelem *q_forw;
-        struct qelem *q_back;
-};
-
-void
-remque(void *element)
-{
-	struct qelem *e = (struct qelem *) element;
-
-	_DIAGASSERT(e != 0);
-
-	if (e->q_forw)
-		e->q_forw->q_back = e->q_back;
-	if (e->q_back)
-		e->q_back->q_forw = e->q_forw;
-}
diff --git a/lib/libc/stdlib/seed48.c b/lib/libc/stdlib/seed48.c
deleted file mode 100644
index 36c05701c..000000000
--- a/lib/libc/stdlib/seed48.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: seed48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $	*/
-
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: seed48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-
-#include "rand48.h"
-
-#ifdef __weak_alias
-__weak_alias(seed48,_seed48)
-#endif
-
-unsigned short *
-seed48(unsigned short xseed[3])
-{
-	static unsigned short sseed[3];
-
-	_DIAGASSERT(xseed != NULL);
-
-	sseed[0] = __rand48_seed[0];
-	sseed[1] = __rand48_seed[1];
-	sseed[2] = __rand48_seed[2];
-	__rand48_seed[0] = xseed[0];
-	__rand48_seed[1] = xseed[1];
-	__rand48_seed[2] = xseed[2];
-	__rand48_mult[0] = RAND48_MULT_0;
-	__rand48_mult[1] = RAND48_MULT_1;
-	__rand48_mult[2] = RAND48_MULT_2;
-	__rand48_add = RAND48_ADD;
-	return sseed;
-}
diff --git a/lib/libc/stdlib/setenv.c b/lib/libc/stdlib/setenv.c
deleted file mode 100644
index cf6c1b5a5..000000000
--- a/lib/libc/stdlib/setenv.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*	$NetBSD: setenv.c,v 1.44 2015/01/20 18:31:25 christos Exp $	*/
-
-/*
- * Copyright (c) 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)setenv.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: setenv.c,v 1.44 2015/01/20 18:31:25 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "env.h"
-#include "local.h"
-
-#ifdef __weak_alias
-__weak_alias(setenv,_setenv)
-#endif
-
-/*
- * setenv --
- *	Set the value of the environmental variable "name" to be
- *	"value".  If rewrite is set, replace any current value.
- */
-int
-setenv(const char *name, const char *value, int rewrite)
-{
-	size_t l_name, l_value, length;
-	ssize_t offset;
-	char *envvar;
-
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(value != NULL);
-
-	l_name = __envvarnamelen(name, false);
-	if (l_name == 0 || value == NULL) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	if (!__writelockenv())
-		return -1;
-
-	/* Find slot in the enviroment. */
-	offset = __getenvslot(name, l_name, true);
-	if (offset == -1)
-		goto bad;
-
-	l_value = strlen(value);
-	length = l_name + l_value + 2;
-
-	/* Handle overwriting a current environt variable. */
-	envvar = environ[offset];
-	if (envvar != NULL) {
-		if (!rewrite)
-			goto good;
-		/*
-		 * Check whether the buffer was allocated via setenv(3) and
-		 * whether there is enough space. If so simply overwrite the
-		 * existing value.
-		 */
-		if (__canoverwriteenvvar(envvar, length)) {
-			envvar += l_name + 1;
-			goto copy;
-		}
-	}
-
-	/* Allocate memory for name + `=' + value + NUL. */
-	if ((envvar = __allocenvvar(length)) == NULL)
-		goto bad;
-
-	if (environ[offset] != NULL)
-		__freeenvvar(environ[offset]);
-
-	environ[offset] = envvar;
-
-	(void)memcpy(envvar, name, l_name);
-
-	envvar += l_name;
-	*envvar++ = '=';
-
-copy:
-	(void)memcpy(envvar, value, l_value + 1);
-
-good:
-	(void)__unlockenv();
-	return 0;
-
-bad:
-	(void)__unlockenv();
-	return -1;
-}
diff --git a/lib/libc/stdlib/srand48.c b/lib/libc/stdlib/srand48.c
deleted file mode 100644
index a9673fe1b..000000000
--- a/lib/libc/stdlib/srand48.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: srand48.c,v 1.7 2005/06/12 05:21:28 lukem Exp $	*/
-
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: srand48.c,v 1.7 2005/06/12 05:21:28 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include "rand48.h"
-
-#ifdef __weak_alias
-__weak_alias(srand48,_srand48)
-#endif
-
-void
-srand48(long seed)
-{
-	__rand48_seed[0] = RAND48_SEED_0;
-	__rand48_seed[1] = (unsigned short) seed;
-	__rand48_seed[2] = (unsigned short) ((unsigned long)seed >> 16);
-	__rand48_mult[0] = RAND48_MULT_0;
-	__rand48_mult[1] = RAND48_MULT_1;
-	__rand48_mult[2] = RAND48_MULT_2;
-	__rand48_add = RAND48_ADD;
-}
diff --git a/lib/libc/stdlib/strfmon.3 b/lib/libc/stdlib/strfmon.3
deleted file mode 100644
index ae41ae6be..000000000
--- a/lib/libc/stdlib/strfmon.3
+++ /dev/null
@@ -1,169 +0,0 @@
-.\"	$NetBSD: strfmon.3,v 1.5 2014/03/18 18:20:37 riastradh Exp $
-.\"
-.\" Copyright (c) 2001 Jeroen Ruigrok van der Werven <asmodai@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 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: FreeBSD: Id: strfmon.3,v 1.7 2003/01/06 06:21:25 tjr Exp
-.\"
-.Dd October 12, 2002
-.Dt STRFMON 3
-.Os
-.Sh NAME
-.Nm strfmon
-.Nd convert monetary value to string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In monetary.h
-.Ft ssize_t
-.Fn strfmon "char * restrict s" "size_t maxsize" "const char * restrict format" "..."
-.Sh DESCRIPTION
-The
-.Fn strfmon
-function places characters into the array pointed to by
-.Fa s
-as controlled by the string pointed to by
-.Fa format .
-No more than
-.Fa maxsize
-bytes are placed into the array.
-.Pp
-The format string is composed of zero or more directives:
-ordinary characters (not
-.Cm % ) ,
-which are copied unchanged to the output stream; and conversion
-specifications, each of which results in fetching zero or more subsequent
-arguments.
-Each conversion specification is introduced by the
-.Cm %
-character.
-After the
-.Cm % ,
-the following appear in sequence:
-.Bl -bullet
-.It
-Zero or more of the following flags:
-.Bl -tag -width "XXX"
-.It Cm = Ns Ar f
-A
-.Sq Cm =
-character followed by another character
-.Ar f
-which is used as the numeric fill character.
-.It Cm ^
-Do not use grouping characters, regardless of the current locale default.
-.It Cm +
-Represent positive values by prefixing them with a positive sign,
-and negative values by prefixing them with a negative sign.
-This is the default.
-.It Cm \&(
-Enclose negative values in parentheses.
-.It Cm \&!
-Do not include a currency symbol in the output.
-.It Cm \-
-Left justify the result.
-Only valid when a field width is specified.
-.El
-.It
-An optional minimum field width as a decimal number.
-By default, there is no minimum width.
-.It
-A
-.Sq Cm #
-sign followed by a decimal number specifying the maximum
-expected number of digits after the radix character.
-.It
-A
-.Sq Cm \&.
-character followed by a decimal number specifying the number
-of digits after the radix character.
-.It
-One of the following conversion specifiers:
-.Bl -tag -width "XXX"
-.It Cm i
-The
-.Vt double
-argument is formatted as an international monetary amount.
-.It Cm n
-The
-.Vt double
-argument is formatted as a national monetary amount.
-.It Cm %
-A
-.Sq Li %
-character is written.
-.El
-.El
-.Sh RETURN VALUES
-If the total number of resulting bytes including the terminating
-.Dv NULL
-byte is not more than
-.Fa maxsize ,
-.Fn strfmon
-returns the number of bytes placed into the array pointed to by
-.Fa s ,
-not including the terminating
-.Dv NULL
-byte.
-Otherwise, \-1 is returned,
-the contents of the array are indeterminate,
-and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn strfmon
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er E2BIG
-Conversion stopped due to lack of space in the buffer.
-.It Bq Er EINVAL
-The format string is invalid.
-.It Bq Er ENOMEM
-Not enough memory for temporary buffers.
-.El
-.Sh SEE ALSO
-.Xr localeconv 3
-.Sh STANDARDS
-The
-.Fn strfmon
-function
-conforms to
-.St -p1003.1-2001 .
-.Sh AUTHORS
-.An -nosplit
-The
-.Fn strfmon
-function was implemented by
-.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
-.Pp
-This manual page was written by
-.An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org
-based on the standard's text.
-.Sh BUGS
-The
-.Fn strfmon
-function does not correctly handle multibyte characters in the
-.Fa format
-argument.
diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c
deleted file mode 100644
index 0adf1bc05..000000000
--- a/lib/libc/stdlib/strfmon.c
+++ /dev/null
@@ -1,629 +0,0 @@
-/*	$NetBSD: strfmon.c,v 1.10 2012/03/21 14:19:15 christos Exp $	*/
-
-/*-
- * Copyright (c) 2001 Alexey Zelkin <phantom@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>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.14 2003/03/20 08:18:55 ache Exp $");
-#else
-__RCSID("$NetBSD: strfmon.c,v 1.10 2012/03/21 14:19:15 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __minix /* MINIX uses namespace wrappers */
-#include "namespace.h"
-#include <monetary.h>
-#endif /* __minix */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stddef.h>
-
-/* internal flags */
-#define	NEED_GROUPING		0x01	/* print digits grouped (default) */
-#define	SIGN_POSN_USED		0x02	/* '+' or '(' usage flag */
-#define	LOCALE_POSN		0x04	/* use locale defined +/- (default) */
-#define	PARENTH_POSN		0x08	/* enclose negative amount in () */
-#define	SUPRESS_CURR_SYMBOL	0x10	/* supress the currency from output */
-#define	LEFT_JUSTIFY		0x20	/* left justify */
-#define	USE_INTL_CURRENCY	0x40	/* use international currency symbol */
-#define IS_NEGATIVE		0x80	/* is argument value negative ? */
-
-#ifndef NBCHAR_MAX
-#define NBCHAR_MAX ((unsigned char)CHAR_MAX)
-#endif
-
-/* internal macros */
-#define PRINT(CH) do {						\
-	if (dst >= s + maxsize) 				\
-		goto e2big_error;				\
-	*dst++ = CH;						\
-} while (/* CONSTCOND */ 0)
-
-#define PRINTS(STR) do {					\
-	const char *tmps = STR;					\
-	while (*tmps != '\0')					\
-		PRINT(*tmps++);					\
-} while (/* CONSTCOND */ 0)
-
-#define GET_NUMBER(VAR)	do {					\
-	VAR = 0;						\
-	while (isdigit((unsigned char)*fmt)) {			\
-		VAR *= 10;					\
-		VAR += *fmt - '0';				\
-		if (VAR > 0x00ffffff)				\
-			goto e2big_error;			\
-		fmt++;						\
-	}							\
-} while (/* CONSTCOND */ 0)
-
-#define GRPCPY(howmany) do {					\
-	int i = howmany;					\
-	while (i-- > 0) {					\
-		avalue_size--;					\
-		*--bufend = *(avalue+avalue_size+padded);	\
-	}							\
-} while (/* CONSTCOND */ 0)
-
-#define GRPSEP do {						\
-	*--bufend = thousands_sep;				\
-	groups++;						\
-} while (/* CONSTCOND */ 0)
-
-static void __setup_vars(int, char *, char *, char *, const char **);
-static int __calc_left_pad(int, char *);
-static char *__format_grouped_double(double, int *, int, int, int);
-
-ssize_t
-strfmon(char * __restrict s, size_t maxsize, const char * __restrict format,
-    ...)
-{
-	va_list		ap;
-	char 		*dst;		/* output destination pointer */
-	const char 	*fmt;		/* current format poistion pointer */
-	struct lconv 	*lc;		/* pointer to lconv structure */
-	char		*asciivalue;	/* formatted double pointer */
-
-	int		flags;		/* formatting options */
-	int		pad_char;	/* padding character */
-	int		pad_size;	/* pad size */
-	int		width;		/* field width */
-	int		left_prec;	/* left precision */
-	int		right_prec;	/* right precision */
-	double		value;		/* just value */
-	char		space_char = ' '; /* space after currency */
-
-	char		cs_precedes,	/* values gathered from struct lconv */
-			sep_by_space,
-			sign_posn,
-			*currency_symbol;
-	const char	*signstr;
-
-	char		*tmpptr;	/* temporary vars */
-	int		sverrno;
-
-        va_start(ap, format);
-
-	lc = localeconv();
-	dst = s;
-	fmt = format;
-	asciivalue = NULL;
-	currency_symbol = NULL;
-	pad_size = 0;
-
-	while (*fmt) {
-		/* pass nonformating characters AS IS */
-		if (*fmt != '%')
-			goto literal;
-
-		/* '%' found ! */
-
-		/* "%%" mean just '%' */
-		if (*(fmt+1) == '%') {
-			fmt++;
-	literal:
-			PRINT(*fmt++);
-			continue;
-		}
-
-		/* set up initial values */
-		flags = (NEED_GROUPING|LOCALE_POSN);
-		pad_char = ' ';		/* padding character is "space" */
-		left_prec = -1;		/* no left precision specified */
-		right_prec = -1;	/* no right precision specified */
-		width = -1;		/* no width specified */
-		value = 0;		/* we have no value to print now */
-
-		/* Flags */
-		while (/* CONSTCOND */ 1) {
-			switch (*++fmt) {
-				case '=':	/* fill character */
-					pad_char = *++fmt;
-					if (pad_char == '\0')
-						goto format_error;
-					continue;
-				case '^':	/* not group currency  */
-					flags &= ~(NEED_GROUPING);
-					continue;
-				case '+':	/* use locale defined signs */
-					if (flags & SIGN_POSN_USED)
-						goto format_error;
-					flags |= (SIGN_POSN_USED|LOCALE_POSN);
-					continue;
-				case '(':	/* enclose negatives with () */
-					if (flags & SIGN_POSN_USED)
-						goto format_error;
-					flags |= (SIGN_POSN_USED|PARENTH_POSN);
-					continue;
-				case '!':	/* suppress currency symbol */
-					flags |= SUPRESS_CURR_SYMBOL;
-					continue;
-				case '-':	/* alignment (left)  */
-					flags |= LEFT_JUSTIFY;
-					continue;
-				default:
-					break;
-			}
-			break;
-		}
-
-		/* field Width */
-		if (isdigit((unsigned char)*fmt)) {
-			ptrdiff_t d = dst - s;
-			GET_NUMBER(width);
-			/* Do we have enough space to put number with
-			 * required width ?
-			 */
-
-			if ((size_t)(d + width) >= maxsize)
-				goto e2big_error;
-		}
-
-		/* Left precision */
-		if (*fmt == '#') {
-			if (!isdigit((unsigned char)*++fmt))
-				goto format_error;
-			GET_NUMBER(left_prec);
-		}
-
-		/* Right precision */
-		if (*fmt == '.') {
-			if (!isdigit((unsigned char)*++fmt))
-				goto format_error;
-			GET_NUMBER(right_prec);
-		}
-
-		/* Conversion Characters */
-		switch (*fmt++) {
-			case 'i':	/* use internaltion currency format */
-				flags |= USE_INTL_CURRENCY;
-				break;
-			case 'n':	/* use national currency format */
-				flags &= ~(USE_INTL_CURRENCY);
-				break;
-			default:	/* required character is missing or
-					   premature EOS */
-				goto format_error;
-		}
-
-		if (currency_symbol)
-			free(currency_symbol);
-		if (flags & USE_INTL_CURRENCY) {
-			currency_symbol = strdup(lc->int_curr_symbol);
-			if (currency_symbol != NULL)
-				space_char = *(currency_symbol+3);
-		} else
-			currency_symbol = strdup(lc->currency_symbol);
-
-		if (currency_symbol == NULL)
-			goto end_error;			/* ENOMEM. */
-
-		/* value itself */
-		value = va_arg(ap, double);
-
-		/* detect sign */
-		if (value < 0) {
-			flags |= IS_NEGATIVE;
-			value = -value;
-		}
-
-		/* fill left_prec with amount of padding chars */
-		if (left_prec >= 0) {
-			pad_size = __calc_left_pad((flags ^ IS_NEGATIVE),
-							currency_symbol) -
-				   __calc_left_pad(flags, currency_symbol);
-			if (pad_size < 0)
-				pad_size = 0;
-		}
-
-		asciivalue = __format_grouped_double(value, &flags,
-				left_prec, right_prec, pad_char);
-		if (asciivalue == NULL)
-			goto end_error;		/* errno already set     */
-						/* to ENOMEM by malloc() */
-
-		/* set some variables for later use */
-		__setup_vars(flags, &cs_precedes, &sep_by_space,
-				&sign_posn, &signstr);
-
-		/*
-		 * Description of some LC_MONETARY's values:
-		 *
-		 * p_cs_precedes & n_cs_precedes
-		 *
-		 * = 1 - $currency_symbol precedes the value
-		 *       for a monetary quantity with a non-negative value
-		 * = 0 - symbol succeeds the value
-		 *
-		 * p_sep_by_space & n_sep_by_space
-                 *
-		 * = 0 - no space separates $currency_symbol
-		 *       from the value for a monetary quantity with a
-		 *	 non-negative value
-		 * = 1 - space separates the symbol from the value
-		 * = 2 - space separates the symbol and the sign string,
-		 *       if adjacent.
-                 *
-		 * p_sign_posn & n_sign_posn
-                 *
-		 * = 0 - parentheses enclose the quantity and the
-		 *	 $currency_symbol
-		 * = 1 - the sign string precedes the quantity and the 
-		 *       $currency_symbol
-		 * = 2 - the sign string succeeds the quantity and the 
-		 *       $currency_symbol
-		 * = 3 - the sign string precedes the $currency_symbol
-		 * = 4 - the sign string succeeds the $currency_symbol
-                 *
-		 */
-
-		tmpptr = dst;
-
-		while (pad_size-- > 0)
-			PRINT(' ');
-
-		if (sign_posn == 0 && (flags & IS_NEGATIVE))
-			PRINT('(');
-
-		if (cs_precedes == 1) {
-			if (sign_posn == 1 || sign_posn == 3) {
-				PRINTS(signstr);
-				if (sep_by_space == 2)		/* XXX: ? */
-					PRINT(' ');
-			}
-
-			if (!(flags & SUPRESS_CURR_SYMBOL)) {
-				PRINTS(currency_symbol);
-
-				if (sign_posn == 4) {
-					if (sep_by_space == 2)
-						PRINT(space_char);
-					PRINTS(signstr);
-					if (sep_by_space == 1)
-						PRINT(' ');
-				} else if (sep_by_space == 1)
-					PRINT(space_char);
-			}
-		} else if (sign_posn == 1)
-			PRINTS(signstr);
-
-		PRINTS(asciivalue);
-
-		if (cs_precedes == 0) {
-			if (sign_posn == 3) {
-				if (sep_by_space == 1)
-					PRINT(' ');
-				PRINTS(signstr);
-			}
-
-			if (!(flags & SUPRESS_CURR_SYMBOL)) {
-				if ((sign_posn == 3 && sep_by_space == 2)
-				    || (sep_by_space == 1
-				    && (sign_posn == 0
-				    || sign_posn == 1
-				    || sign_posn == 2
-				    || sign_posn == 4)))
-					PRINT(space_char);
-				PRINTS(currency_symbol); /* XXX: len */
-				if (sign_posn == 4) {
-					if (sep_by_space == 2)
-						PRINT(' ');
-					PRINTS(signstr);
-				}
-			}
-		}
-
-		if (sign_posn == 2) {
-			if (sep_by_space == 2)
-				PRINT(' ');
-			PRINTS(signstr);
-		}
-
-		if (sign_posn == 0 && (flags & IS_NEGATIVE))
-			PRINT(')');
-
-		if (dst - tmpptr < width) {
-			if (flags & LEFT_JUSTIFY) {
-				while (dst - tmpptr < width)
-					PRINT(' ');
-			} else {
-				_DIAGASSERT(__type_fit(int, dst - tmpptr));
-				pad_size = dst - tmpptr;
-				memmove(tmpptr + width-pad_size, tmpptr,
-				    (size_t) pad_size);
-				memset(tmpptr, ' ', (size_t) width-pad_size);
-				dst += width-pad_size;
-			}
-		}
-	}
-
-	PRINT('\0');
-	va_end(ap);
-	free(asciivalue);
-	free(currency_symbol);
-	return (dst - s - 1);	/* return size of put data except trailing '\0' */
-
-e2big_error:
-	errno = E2BIG;
-	goto end_error;
-
-format_error:
-	errno = EINVAL;
-
-end_error:
-	sverrno = errno;
-	if (asciivalue != NULL)
-		free(asciivalue);
-	if (currency_symbol != NULL)
-		free(currency_symbol);
-	errno = sverrno;
-	va_end(ap);
-	return (-1);
-}
-
-static void
-__setup_vars(int flags, char *cs_precedes, char *sep_by_space,
-		char *sign_posn, const char **signstr) {
-	struct lconv *lc = localeconv();
-
-	if ((flags & IS_NEGATIVE) && (flags & USE_INTL_CURRENCY)) {
-		*cs_precedes = lc->int_n_cs_precedes;
-		*sep_by_space = lc->int_n_sep_by_space;
-		*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->int_n_sign_posn;
-		*signstr = (lc->negative_sign == '\0') ? "-"
-		    : lc->negative_sign;
-	} else if (flags & USE_INTL_CURRENCY) {
-		*cs_precedes = lc->int_p_cs_precedes;
-		*sep_by_space = lc->int_p_sep_by_space;
-		*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->int_p_sign_posn;
-		*signstr = lc->positive_sign;
-	} else if (flags & IS_NEGATIVE) {
-		*cs_precedes = lc->n_cs_precedes;
-		*sep_by_space = lc->n_sep_by_space;
-		*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->n_sign_posn;
-		*signstr = (lc->negative_sign == '\0') ? "-"
-		    : lc->negative_sign;
-	} else {
-		*cs_precedes = lc->p_cs_precedes;
-		*sep_by_space = lc->p_sep_by_space;
-		*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->p_sign_posn;
-		*signstr = lc->positive_sign;
-	}
-
-	/* Set defult values for unspecified information. */
-	if (*cs_precedes != 0)
-		*cs_precedes = 1;
-	if ((unsigned char)*sep_by_space == NBCHAR_MAX)
-		*sep_by_space = 0;
-	if ((unsigned char)*sign_posn == NBCHAR_MAX)
-		*sign_posn = 0;
-}
-
-static int
-__calc_left_pad(int flags, char *cur_symb) {
-
-	char cs_precedes, sep_by_space, sign_posn;
-	const char *signstr;
-	size_t left_chars = 0;
-
-	__setup_vars(flags, &cs_precedes, &sep_by_space, &sign_posn, &signstr);
-
-	if (cs_precedes != 0) {
-		left_chars += strlen(cur_symb);
-		if (sep_by_space != 0)
-			left_chars++;
-	}
-
-	switch (sign_posn) {
-		case 1:
-			left_chars += strlen(signstr);
-			break;
-		case 3:
-		case 4:
-			if (cs_precedes != 0)
-				left_chars += strlen(signstr);
-	}
-	_DIAGASSERT(__type_fit(int, left_chars));
-	return (int)left_chars;
-}
-
-static int
-get_groups(int size, char *grouping) {
-
-	int	chars = 0;
-
-	if ((unsigned char)*grouping == NBCHAR_MAX || *grouping <= 0)	/* no grouping ? */
-		return (0);
-
-	while (size > (int)*grouping) {
-		chars++;
-		size -= (int)*grouping++;
-		/* no more grouping ? */
-		if ((unsigned char)*grouping == NBCHAR_MAX)
-			break;
-		/* rest grouping with same value ? */
-		if (*grouping == 0) {
-			chars += (size - 1) / *(grouping - 1);
-			break;
-		}
-	}
-	return (chars);
-}
-
-/* convert double to ASCII */
-static char *
-__format_grouped_double(double value, int *flags,
-			int left_prec, int right_prec, int pad_char) {
-
-	char		*rslt;
-	char		*avalue;
-	int		avalue_size;
-
-	size_t		bufsize;
-	char		*bufend;
-
-	int		padded;
-
-	struct lconv	*lc = localeconv();
-	char		*grouping;
-	char		decimal_point;
-	char		thousands_sep;
-
-	int groups = 0;
-
-	grouping = lc->mon_grouping;
-	decimal_point = *lc->mon_decimal_point;
-	if (decimal_point == '\0')
-		decimal_point = *lc->decimal_point;
-	thousands_sep = *lc->mon_thousands_sep;
-	if (thousands_sep == '\0')
-		thousands_sep = *lc->thousands_sep;
-
-	/* fill left_prec with default value */
-	if (left_prec == -1)
-		left_prec = 0;
-
-	/* fill right_prec with default value */
-	if (right_prec == -1) {
-                if (*flags & USE_INTL_CURRENCY)
-                        right_prec = lc->int_frac_digits;
-                else
-                        right_prec = lc->frac_digits;
-
-		if (right_prec == CHAR_MAX)	/* POSIX locale ? */
-			right_prec = 2;
-	}
-
-	if (*flags & NEED_GROUPING)
-		left_prec += get_groups(left_prec, grouping);
-
-	/* convert to string */
-	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 = avalue_size * 2 + 1;
-	rslt = malloc(bufsize);
-	if (rslt == NULL) {
-		free(avalue);
-		return (NULL);
-	}
-	memset(rslt, 0, bufsize);
-	bufend = rslt + bufsize - 1;	/* reserve space for trailing '\0' */
-
-	/* skip spaces at beggining */
-	padded = 0;
-	while (avalue[padded] == ' ') {
-		padded++;
-		avalue_size--;
-	}
-
-	if (right_prec > 0) {
-		bufend -= right_prec;
-		memcpy(bufend, avalue + avalue_size+padded-right_prec,
-		    (size_t) right_prec);
-		*--bufend = decimal_point;
-		avalue_size -= (right_prec + 1);
-	}
-
-        /* XXX: Why not use %' instead? */
-	if ((*flags & NEED_GROUPING) &&
-	    thousands_sep != '\0' &&	/* XXX: need investigation */
-	    (unsigned char)*grouping != NBCHAR_MAX &&
-	    *grouping > 0) {
-		while (avalue_size > (int)*grouping) {
-			GRPCPY(*grouping);
-			GRPSEP;
-			grouping++;
-
-			/* no more grouping ? */
-			if ((unsigned char)*grouping == NBCHAR_MAX)
-				break;
-
-			/* rest grouping with same value ? */
-			if (*grouping == 0) {
-				grouping--;
-				while (avalue_size > *grouping) {
-					GRPCPY(*grouping);
-					GRPSEP;
-				}
-			}
-		}
-		if (avalue_size != 0)
-			GRPCPY(avalue_size);
-		padded -= groups;
-
-	} else {
-		bufend -= avalue_size;
-		memcpy(bufend, avalue+padded, (size_t) avalue_size);
-		if (right_prec == 0)
-			padded--;	/* decrease assumed $decimal_point */
-	}
-
-	/* do padding with pad_char */
-	if (padded > 0) {
-		bufend -= padded;
-		memset(bufend, pad_char, (size_t) padded);
-	}
-
-	bufsize = bufsize - (bufend - rslt) + 1;
-	memmove(rslt, bufend, bufsize);
-	free(avalue);
-	return (rslt);
-}
diff --git a/lib/libc/stdlib/strsuftoll.3 b/lib/libc/stdlib/strsuftoll.3
deleted file mode 100644
index ffaca3e85..000000000
--- a/lib/libc/stdlib/strsuftoll.3
+++ /dev/null
@@ -1,150 +0,0 @@
-.\"	$NetBSD: strsuftoll.3,v 1.11 2010/12/14 13:00:34 jruoho Exp $
-.\"
-.\" Copyright (c) 2002,2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Luke Mewburn.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd December 14, 2010
-.Dt STRSUFTOLL 3
-.Os
-.Sh NAME
-.Nm strsuftoll ,
-.Nm strsuftollx
-.Nd "convert a string to a long long, with suffix parsing"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft long long
-.Fn strsuftoll "const char *desc" "const char *val" "long long min" "long long max"
-.Ft long long
-.Fn strsuftollx "const char *desc" "const char *val" "long long min" "long long max" "char *errbuf" "size_t errbuflen"
-.Sh DESCRIPTION
-The functions
-.Fn strsuftoll
-and
-.Fn strsuftollx
-convert
-.Fa val
-into a number of type
-.Vt long long ,
-checking that the result is not smaller than
-.Fa min
-or larger than
-.Fa max .
-Two or more decimal numbers may be separated by an
-.Dq x
-to indicate a product.
-.Pp
-Each decimal number may have one of the following optional suffixes:
-.Pp
-.Bl -tag -width 3n -offset indent -compact
-.It Em b
-Block; multiply by 512
-.It Em k
-Kibi; multiply by 1024 (1 KiB)
-.It Em m
-Mebi; multiply by 1048576 (1 MiB)
-.It Em g
-Gibi; multiply by 1073741824 (1 GiB)
-.It Em t
-Tebi; multiply by 1099511627776 (1 TiB)
-.It Em w
-Word; multiply by the number of bytes in an integer
-.El
-.Pp
-In the case of an error (range overflow or an invalid number),
-.Fn strsuftollx
-places an error message into
-.Fa errbuf
-(which is
-.Fa errbuflen
-bytes long) and returns 0,
-and
-.Fn strsuftoll
-displays that error and terminates the process.
-The parameter
-.Fa desc
-is used to construct
-.Fa errbuf .
-.Pp
-Neither
-.Fa desc
-nor
-.Fa val
-may be
-.Dv NULL .
-.Sh RETURN VALUES
-The functions
-.Fn strsuftoll
-and
-.Fn strsuftollx
-return either the result of the conversion,
-unless the value overflows or is not a number;
-in the latter case,
-.Fn strsuftoll
-displays an error message and terminates the process with exit code
-.Dv EXIT_FAILURE ,
-and
-.Fn strsuftollx
-returns with 0 and
-.Fa errbuf
-contains a non-empty error message.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ERANGE
-The given string was out of range; the value converted has been clamped.
-.El
-.Sh SEE ALSO
-.Xr errx 3 ,
-.Xr strtoll 3 ,
-.Xr orders 7
-.Sh BUGS
-At least few limitations should be mentioned:
-.Bl -bullet
-.It
-Both functions ignore the current locale.
-.It
-Neither
-.Fn strsuftoll
-nor
-.Fn strsuftollx
-fail gracefully in case of invalid,
-.Dv NULL ,
-pointers.
-.It
-Arguably the return type should be
-.Vt intmax_t
-instead of
-.Vt long long .
-.It
-The
-.Fn strsuftollx
-function is prone to buffer overflows if used incorrectly.
-Arguably only
-.Fn strsuftoll
-should be exposed to a caller.
-.El
diff --git a/lib/libc/stdlib/strsuftoll.c b/lib/libc/stdlib/strsuftoll.c
deleted file mode 100644
index 80fc52fc9..000000000
--- a/lib/libc/stdlib/strsuftoll.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*	$NetBSD: strsuftoll.c,v 1.9 2011/10/22 22:08:47 christos Exp $	*/
-/*-
- * Copyright (c) 2001-2002,2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Keith Muller of the University of California, San Diego and Lance
- * Visser of Convex Computer Corporation.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strsuftoll.c,v 1.9 2011/10/22 22:08:47 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef _LIBC
-#include "namespace.h"
-#endif
-
-#if !HAVE_STRSUFTOLL
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <err.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _LIBC
-# ifdef __weak_alias
-__weak_alias(strsuftoll, _strsuftoll)
-__weak_alias(strsuftollx, _strsuftollx)
-# endif
-#endif /* LIBC */
-
-/*
- * Convert an expression of the following forms to a (u)int64_t.
- * 	1) A positive decimal number.
- *	2) A positive decimal number followed by a b (mult by 512).
- *	3) A positive decimal number followed by a k (mult by 1024).
- *	4) A positive decimal number followed by a m (mult by 1048576).
- *	5) A positive decimal number followed by a g (mult by 1073741824).
- *	6) A positive decimal number followed by a t (mult by 1099511627776).
- *	7) A positive decimal number followed by a w (mult by sizeof int)
- *	8) Two or more positive decimal numbers (with/without k,b or w).
- *	   separated by x (also * for backwards compatibility), specifying
- *	   the product of the indicated values.
- * Returns the result upon successful conversion, or exits with an
- * appropriate error.
- * 
- */
-/* LONGLONG */
-long long
-strsuftoll(const char *desc, const char *val,
-    long long min, long long max)
-{
-	long long result;
-	char	errbuf[100];
-
-	result = strsuftollx(desc, val, min, max, errbuf, sizeof(errbuf));
-	if (*errbuf != '\0')
-		errx(EXIT_FAILURE, "%s", errbuf);
-	return result;
-}
-
-/*
- * As strsuftoll(), but returns the error message into the provided buffer
- * rather than exiting with it.
- */
-/* LONGLONG */
-static long long
-__strsuftollx(const char *desc, const char *val,
-    long long min, long long max, char *ebuf, size_t ebuflen, size_t depth)
-{
-	long long num, t;
-	char	*expr;
-
-	_DIAGASSERT(desc != NULL);
-	_DIAGASSERT(val != NULL);
-	_DIAGASSERT(ebuf != NULL);
-
-	if (depth > 16) {
-		snprintf(ebuf, ebuflen, "%s: Recursion limit exceeded", desc);
-		return 0;
-	}
-
-	while (isspace((unsigned char)*val))	/* Skip leading space */
-		val++;
-
-	errno = 0;
-	num = strtoll(val, &expr, 10);
-	if (errno == ERANGE)
-		goto erange;			/* Overflow */
-
-	if (expr == val)			/* No digits */
-		goto badnum;
-
-	switch (*expr) {
-	case 'b':
-		t = num;
-		num *= 512;			/* 1 block */
-		if (t > num)
-			goto erange;
-		++expr;
-		break;
-	case 'k':
-		t = num;
-		num *= 1024;			/* 1 kibibyte */
-		if (t > num)
-			goto erange;
-		++expr;
-		break;
-	case 'm':
-		t = num;
-		num *= 1048576;			/* 1 mebibyte */
-		if (t > num)
-			goto erange;
-		++expr;
-		break;
-	case 'g':
-		t = num;
-		num *= 1073741824;		/* 1 gibibyte */
-		if (t > num)
-			goto erange;
-		++expr;
-		break;
-	case 't':
-		t = num;
-		num *= 1099511627776LL;		/* 1 tebibyte */
-		if (t > num)
-			goto erange;
-		++expr;
-		break;
-	case 'w':
-		t = num;
-		num *= sizeof(int);		/* 1 word */
-		if (t > num)
-			goto erange;
-		++expr;
-		break;
-	}
-
-	switch (*expr) {
-	case '\0':
-		break;
-	case '*':				/* Backward compatible */
-	case 'x':
-		t = num;
-		num *= __strsuftollx(desc, expr + 1, min, max, ebuf, ebuflen,
-			depth + 1);
-		if (*ebuf != '\0')
-			return 0;
-		if (t > num) {
- erange:	 	
-			errno = ERANGE;
-			snprintf(ebuf, ebuflen, "%s: %s", desc, strerror(errno));
-			return 0;
-		}
-		break;
-	default:
- badnum:
-		snprintf(ebuf, ebuflen, "%s `%s': illegal number", desc, val);
-		return 0;
-	}
-	if (num < min) {
-		/* LONGLONG */
-		snprintf(ebuf, ebuflen, "%s %lld is less than %lld.",
-		    desc, (long long)num, (long long)min);
-		return 0;
-	}
-	if (num > max) {
-		/* LONGLONG */
-		snprintf(ebuf, ebuflen, "%s %lld is greater than %lld.",
-		    desc, (long long)num, (long long)max);
-		return 0;
-	}
-	*ebuf = '\0';
-	return num;
-}
-
-long long
-strsuftollx(const char *desc, const char *val,
-    long long min, long long max, char *ebuf, size_t ebuflen)
-{
-	return __strsuftollx(desc, val, min, max, ebuf, ebuflen, 0);
-}
-#endif /* !HAVE_STRSUFTOLL */
diff --git a/lib/libc/stdlib/strtod.3 b/lib/libc/stdlib/strtod.3
deleted file mode 100644
index c20bb4f84..000000000
--- a/lib/libc/stdlib/strtod.3
+++ /dev/null
@@ -1,198 +0,0 @@
-.\"	$NetBSD: strtod.3,v 1.20 2007/10/24 13:42:10 reed Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strtod.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd March 12, 2006
-.Dt STRTOD 3
-.Os
-.Sh NAME
-.Nm strtod ,
-.Nm strtof ,
-.Nm strtold
-.Nd convert
-.Tn ASCII
-string to double, float, or long double
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft double
-.Fn strtod "const char * restrict nptr" "char ** restrict endptr"
-.Ft float
-.Fn strtof "const char * restrict nptr" "char ** restrict endptr"
-.Ft long double
-.Fn strtold "const char * restrict nptr" "char ** restrict endptr"
-.Sh DESCRIPTION
-The
-.Fn strtod
-function converts the initial portion of the string
-pointed to by
-.Fa nptr
-to
-.Em double
-representation.
-.Pp
-The
-.Fn strtof
-function converts the initial portion of the string
-pointed to by
-.Fa nptr
-to
-.Em float
-representation.
-.Pp
-The
-.Fn strtold
-function converts the initial portion of the string
-pointed to by
-.Fa nptr
-to
-.Em long double
-representation.
-.Pp
-The expected form of the string is an optional plus
-.Pq Sq +
-or minus sign
-.Pq Sq \-
-followed by one of the following:
-.Bl -dash
-.It
-a sequence of digits optionally containing
-a decimal-point character, optionally followed by an exponent.
-An exponent consists of an
-.Sq E
-or
-.Sq e ,
-followed by an optional plus
-or minus sign, followed by a sequence of digits.
-.It
-one of
-.Li INF
-or
-.Li INFINITY ,
-ignoring case.
-.It
-one of
-.Li NAN
-or
-.Li NAN(n-char-sequence-opt) ,
-ignoring case.
-This implementation currently does not interpret such a sequence.
-.El
-.Pp
-Leading white-space characters in the string (as defined by the
-.Xr isspace 3
-function) are skipped.
-.Sh RETURN VALUES
-The
-.Fn strtod ,
-.Fn strtof ,
-and
-.Fn strtold
-functions return the converted value, if any.
-.Pp
-A character sequence
-.Li INF
-or
-.Li INFINITY
-is converted to \*(If,
-if supported, else to the largest finite floating-point number representable
-on the machine (i.e.,
-.Tn VAX ) .
-.Pp
-A character sequence
-.Li NAN
-or
-.Li NAN(n-char-sequence-opt)
-is converted to a quiet \*(Na, if supported, else remains unrecognized (i.e.,
-.Tn VAX ) .
-.Pp
-If
-.Fa endptr
-is not
-.Dv NULL ,
-a pointer to the character after the last character used
-in the conversion is stored in the location referenced by
-.Fa endptr .
-.Pp
-If no conversion is performed, zero is returned and the value of
-.Fa nptr
-is stored in the location referenced by
-.Fa endptr .
-.Pp
-If the correct value would cause overflow, plus or minus
-.Dv HUGE_VAL ,
-.Dv HUGE_VALF ,
-or
-.Dv HUGE_VALL
-is returned (according to the return type and sign of the value), and
-.Dv ERANGE
-is stored in
-.Va errno .
-If the correct value would cause underflow, zero is
-returned and
-.Dv ERANGE
-is stored in
-.Va errno .
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ERANGE
-Overflow or underflow occurred.
-.El
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr math 3 ,
-.Xr strtol 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The
-.Fn strtod
-function
-conforms to
-.St -ansiC .
-The
-.Fn strtof
-and
-.Fn strtold
-functions conform to
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn strtof
-and
-.Fn strtold
-functions appeared in
-.Nx 4.0 .
diff --git a/lib/libc/stdlib/strtoi.3 b/lib/libc/stdlib/strtoi.3
deleted file mode 100644
index 56d0a195c..000000000
--- a/lib/libc/stdlib/strtoi.3
+++ /dev/null
@@ -1,222 +0,0 @@
-.\"	$NetBSD: strtoi.3,v 1.3 2015/07/11 15:50:56 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strtol.3	8.1 (Berkeley) 6/4/93
-.\"
-.\" Created by Kamil Rytarowski, based on ID:
-.\" NetBSD: strtol.3,v 1.31 2015/03/11 09:57:35 wiz Exp
-.\"
-.Dd April 30, 2015
-.Dt STRTOI 3
-.Os
-.Sh NAME
-.Nm strtoi
-.Nd convert string value to an intmax_t integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In inttypes.h
-.Ft intmax_t
-.Fo strtoi
-.Fa "const char * restrict nptr"
-.Fa "char ** restrict endptr"
-.Fa "int base"
-.Fa "intmax_t lo"
-.Fa "intmax_t hi"
-.Fa "int *rstatus"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn strtoi
-function
-converts the string in
-.Fa nptr
-to an
-.Ft intmax_t
-value.
-The
-.Fn strtoi
-function uses internally
-.Xr strtoimax 3
-and ensures that the result is always in the range [
-.Fa lo ..
-.Fa hi
-].
-In adddition it always places
-.Dv 0
-on success or a conversion status in the
-.Fa rstatus
-argument, avoiding the
-.Dv errno
-gymnastics the other functions require.
-The
-.Fa rstatus
-argument can be
-.Dv NULL
-if conversion status is to be ignored.
-.Pp
-The string may begin with an arbitrary amount of white space
-(as determined by
-.Xr isspace 3 )
-followed by a single optional
-.Ql +
-or
-.Ql -
-sign.
-If
-.Fa base
-is zero or 16,
-the string may then include a
-.Ql 0x
-prefix,
-and the number will be read in base 16; otherwise, a zero
-.Fa base
-is taken as 10 (decimal) unless the next character is
-.Ql 0 ,
-in which case it is taken as 8 (octal).
-.Pp
-The remainder of the string is converted to a
-.Em intmax_t
-value in the obvious manner,
-stopping at the first character which is not a valid digit
-in the given base.
-(In bases above 10, the letter
-.Ql A
-in either upper or lower case
-represents 10,
-.Ql B
-represents 11, and so forth, with
-.Ql Z
-representing 35.)
-.Pp
-If
-.Fa endptr
-is non-nil,
-.Fn strtoi
-stores the address of the first invalid character in
-.Fa *endptr .
-If there were no digits at all, however,
-.Fn strtoi
-stores the original value of
-.Fa nptr
-in
-.Fa *endptr .
-(Thus, if
-.Fa *nptr
-is not
-.Ql \e0
-but
-.Fa **endptr
-is
-.Ql \e0
-on return, the entire string was valid.)
-.Sh RETURN VALUES
-The
-.Fn strtoi
-function
-always returns the closest value in the range specified by
-the
-.Fa lo
-and
-.Fa hi
-arguments.
-.Pp
-The
-.Va errno
-value is guaranteed to be left unchanged.
-.Pp
-Errors are stored as the conversion status in the
-.Fa rstatus
-argument.
-.Sh EXAMPLES
-The following example will always return a number in
-.Dv [1..99]
-range no matter what the input is, and warn if the conversion failed.
-.Bd -literal -offset indent
-int e;
-intmax_t lval = strtoi(buf, NULL, 0, 1, 99, &e);
-if (e)
-	warnc(e, "conversion of `%s' to a number failed, using %jd",
-	    buf, lval);
-.Ed
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ECANCELED
-The string did not contain any characters that were converted.
-.It Bq Er EINVAL
-The
-.Ar base
-is not between 2 and 36 and does not contain the special value 0.
-.It Bq Er ENOTSUP
-The string contained non-numeric characters that did not get converted.
-In this case,
-.Fa endptr
-points to the first unconverted character.
-.It Bq Er ERANGE
-The given string was out of range; the value converted has been clamped;
-or the range given was invalid, i.e.
-.Fa lo
-\*[Gt]
-.Fa hi .
-.El
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr atoll 3 ,
-.Xr strtod 3 ,
-.Xr strtoimax 3 ,
-.Xr strtol 3 ,
-.Xr strtoll 3 ,
-.Xr strtou 3 ,
-.Xr strtoul 3 ,
-.Xr strtoull 3 ,
-.Xr strtoumax 3
-.Sh STANDARDS
-The
-.Fn strtoi
-function is a
-.Nx
-extension.
-.Sh HISTORY
-The
-.Fn strtoi
-function first appeared in
-.Nx 7 .
-.Ox
-introduced the
-.Fn strtonum 3
-function for the same purpose, but the interface makes it impossible to
-properly differentiate illegal returns.
-.Sh BUGS
-Ignores the current locale.
diff --git a/lib/libc/stdlib/strtol.3 b/lib/libc/stdlib/strtol.3
deleted file mode 100644
index bf1b94543..000000000
--- a/lib/libc/stdlib/strtol.3
+++ /dev/null
@@ -1,299 +0,0 @@
-.\"	$NetBSD: strtol.3,v 1.32 2015/05/01 14:17:56 christos Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strtol.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 30, 2015
-.Dt STRTOL 3
-.Os
-.Sh NAME
-.Nm strtol ,
-.Nm strtoll ,
-.Nm strtoimax ,
-.Nm strtoq
-.Nd convert string value to a long, long long, intmax_t or quad_t integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.In limits.h
-.Ft long int
-.Fn strtol "const char * restrict nptr" "char ** restrict endptr" "int base"
-.Ft long long int
-.Fn strtoll "const char * restrict nptr" "char ** restrict endptr" "int base"
-.Pp
-.In inttypes.h
-.Ft intmax_t
-.Fn strtoimax "const char * restrict nptr" "char ** restrict endptr" "int base"
-.Pp
-.In sys/types.h
-.In stdlib.h
-.In limits.h
-.Ft quad_t
-.Fn strtoq "const char * restrict nptr" "char ** restrict endptr" "int base"
-.Sh DESCRIPTION
-The
-.Fn strtol
-function
-converts the string in
-.Fa nptr
-to a
-.Ft long int
-value.
-The
-.Fn strtoll
-function
-converts the string in
-.Fa nptr
-to a
-.Ft long long int
-value.
-The
-.Fn strtoimax
-function
-converts the string in
-.Fa nptr
-to an
-.Ft intmax_t
-value.
-The
-.Fn strtoq
-function
-converts the string in
-.Fa nptr
-to a
-.Ft quad_t
-value.
-.Pp
-The conversion is done according to the given
-.Fa base ,
-which must be between 2 and 36 inclusive,
-or be the special value 0.
-.Pp
-The string may begin with an arbitrary amount of white space
-(as determined by
-.Xr isspace 3 )
-followed by a single optional
-.Ql +
-or
-.Ql -
-sign.
-If
-.Fa base
-is zero or 16,
-the string may then include a
-.Ql 0x
-prefix,
-and the number will be read in base 16; otherwise, a zero
-.Fa base
-is taken as 10 (decimal) unless the next character is
-.Ql 0 ,
-in which case it is taken as 8 (octal).
-.Pp
-The remainder of the string is converted to an appropriate value
-in the obvious manner,
-stopping at the first character which is not a valid digit in the given base.
-(In bases above 10, the letter
-.Ql A
-in either upper or lower case
-represents 10,
-.Ql B
-represents 11, and so forth, with
-.Ql Z
-representing 35.)
-.Pp
-If
-.Fa endptr
-is non-nil, the functions store the address of the first invalid character in
-.Fa *endptr .
-If there were no digits at all, however,
-the functions store the original value of
-.Fa nptr
-in
-.Fa *endptr .
-(Thus, if
-.Fa *nptr
-is not
-.Ql \e0
-but
-.Fa **endptr
-is
-.Ql \e0
-on return, the entire string was valid.)
-.Sh RETURN VALUES
-The
-.Fn strtol
-function
-returns the result of the conversion,
-unless the value would underflow or overflow.
-If an underflow occurs,
-.Fn strtol
-returns
-.Dv LONG_MIN ,
-.Fn strtoll
-returns
-.Dv LLONG_MIN ,
-and
-.Fn strtoimax
-returns
-.Dv INTMAX_MIN .
-If an overflow occurs,
-.Fn strtol
-returns
-.Dv LONG_MAX ,
-.Fn strtoll
-returns
-.Dv LLONG_MAX ,
-and
-.Fn strtoimax
-returns
-.Dv INTMAX_MAX .
-In these cases,
-.Va errno
-is set to
-.Er ERANGE .
-If the
-.Fa base
-argument is not supported then
-.Va errno
-is set to
-.Er EINVAL
-and the functions return 0.
-.Pp
-If no error occurs,
-.Va errno
-is left unchanged.
-This behavior (which is unlike most library functions) is guaranteed
-by the pertinent standards.
-.Sh EXAMPLES
-Because the return value of
-.Fn strtol
-cannot be used unambiguously to detect an error,
-.Va errno
-is left unchanged after a successful call.
-To ensure that a string is a valid number (i.e., in range and containing no
-trailing characters), clear
-.Va errno
-beforehand explicitly, then check it afterwards:
-.Bd -literal -offset indent
-char *ep;
-long lval;
-
-\&...
-
-errno = 0;
-lval = strtol(buf, \*[Am]ep, 10);
-if (buf[0] == '\e0' || *ep != '\e0')
-	goto not_a_number;
-if (errno == ERANGE \*[Am]\*[Am] (lval == LONG_MAX || lval == LONG_MIN))
-	goto out_of_range;
-.Ed
-.Pp
-This example will accept
-.Dq 12
-but not
-.Dq 12foo
-or
-.Dq 12\en .
-If trailing whitespace is acceptable, further checks must be done on
-.Va *ep ;
-alternately, use
-.Xr sscanf 3 .
-.Pp
-If
-.Fn strtol
-is being used instead of
-.Xr atoi 3 ,
-error checking is further complicated because the desired return value is an
-.Li int
-rather than a
-.Li long ;
-however, on some architectures integers and long integers are the same size.
-Thus the following is necessary:
-.Bd -literal -offset indent
-char *ep;
-int ival;
-long lval;
-
-\&...
-
-errno = 0;
-lval = strtol(buf, \*[Am]ep, 10);
-if (buf[0] == '\e0' || *ep != '\e0')
-	goto not_a_number;
-if ((errno == ERANGE \*[Am]\*[Am] (lval == LONG_MAX || lval == LONG_MIN)) ||
-    (lval \*[Gt] INT_MAX || lval \*[Lt] INT_MIN))
-	goto out_of_range;
-ival = lval;
-.Ed
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Ar base
-is not between 2 and 36 and does not contain the special value 0.
-.It Bq Er ERANGE
-The given string was out of range; the value converted has been clamped.
-.El
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr atoll 3 ,
-.Xr strtod 3 ,
-.Xr strtou 3 ,
-.Xr strtoul 3 ,
-.Xr strtoull 3 ,
-.Xr strtoumax 3
-.Sh STANDARDS
-The
-.Fn strtol
-function
-conforms to
-.St -ansiC .
-The
-.Fn strtoll
-and
-.Fn strtoimax
-functions conform to
-.St -isoC-99 .
-.Pp
-The
-.Fn strtoq
-function is a
-.Bx
-legacy function equivalent to
-.Fn strtoll
-and should not be used in a new code.
-.Sh BUGS
-Ignores the current locale.
diff --git a/lib/libc/stdlib/strtol.c b/lib/libc/stdlib/strtol.c
deleted file mode 100644
index 9c68c4bb8..000000000
--- a/lib/libc/stdlib/strtol.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: strtol.c,v 1.18 2008/08/20 12:42:26 joerg Exp $ */
-
-/*-
- * Copyright (c) 2005 The DragonFly Project.  All rights reserved.
- * Copyright (c) 2003 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: strtol.c,v 1.18 2008/08/20 12:42:26 joerg Exp $");
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define	_FUNCNAME	strtol
-#define	__INT		long
-#define	__INT_MIN	LONG_MIN
-#define	__INT_MAX	LONG_MAX
-
-#include "_strtol.h"
diff --git a/lib/libc/stdlib/strtonum.3 b/lib/libc/stdlib/strtonum.3
deleted file mode 100644
index e109cd21c..000000000
--- a/lib/libc/stdlib/strtonum.3
+++ /dev/null
@@ -1,188 +0,0 @@
-.\" $NetBSD: strtonum.3,v 1.2 2015/01/19 11:47:41 wiz Exp $
-.\" $OpenBSD: strtonum.3,v 1.17 2013/08/14 06:32:28 jmc Exp $
-.\"
-.\" Copyright (c) 2004 Ted Unangst
-.\"
-.\" 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.
-.\"
-.Dd January 18, 2015
-.Dt STRTONUM 3
-.Os
-.Sh NAME
-.Nm strtonum
-.Nd reliably convert string value to an integer
-.Sh SYNOPSIS
-.Vt #define _OPENBSD_SOURCE
-.In stdlib.h
-.Ft long long
-.Fo strtonum
-.Fa "const char *nptr"
-.Fa "long long minval"
-.Fa "long long maxval"
-.Fa "const char **errstr"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn strtonum
-function converts the string in
-.Fa nptr
-to a
-.Li long long
-value.
-.Pp
-The string may begin with an arbitrary amount of whitespace
-(as determined by
-.Xr isspace 3 )
-followed by a single optional
-.Ql +
-or
-.Ql -
-sign.
-.Pp
-The remainder of the string is converted to a
-.Li long long
-value according to base 10.
-.Pp
-The value obtained is then checked against the provided
-.Fa minval
-and
-.Fa maxval
-bounds.
-If
-.Fa errstr
-is non-null,
-.Fn strtonum
-stores an error string in
-.Fa *errstr
-indicating the failure.
-.Sh RETURN VALUES
-The
-.Fn strtonum
-function returns the result of the conversion,
-unless the value would exceed the provided bounds or is invalid.
-On error, 0 is returned,
-.Va errno
-is set, and
-.Fa errstr
-will point to an error message.
-.Fa *errstr
-will be set to
-.Dv NULL
-on success;
-this fact can be used to differentiate
-a successful return of 0 from an error.
-.Sh EXAMPLES
-Using
-.Fn strtonum
-correctly is meant to be simpler than the alternative functions.
-.Bd -literal -offset indent
-int iterations;
-const char *errstr;
-
-iterations = strtonum(optarg, 1, 64, &errstr);
-if (errstr)
-	errx(1, "number of iterations is %s: %s", errstr, optarg);
-.Ed
-.Pp
-The above example will guarantee that the value of iterations is between
-1 and 64 (inclusive).
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The given string did not consist solely of digit characters; or
-.Ar minval
-was larger than
-.Ar maxval .
-.It Bq Er ERANGE
-The given string was out of range.
-.El
-.Pp
-If an error occurs,
-.Fa errstr
-will be set to one of the following strings:
-.Pp
-.Bl -tag -width "too largeXX" -compact
-.It Qq too large
-The result was larger than the provided maximum value.
-.It Qq too small
-The result was smaller than the provided minimum value.
-.It Qq invalid
-The string did not consist solely of digit characters.
-.El
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr atoll 3 ,
-.Xr sscanf 3 ,
-.Xr strtod 3 ,
-.Xr strtoi 3 ,
-.Xr strtol 3 ,
-.Xr strtoll 3 ,
-.Xr strtou 3 ,
-.Xr strtoul 3 ,
-.Xr strtoull 3
-.Sh STANDARDS
-.Fn strtonum
-is an
-.Ox
-extension.
-.Sh HISTORY
-The
-.Fn strtonum
-function first appeared in
-.Ox 3.6 .
-.Fn strtonum
-was redesigned in
-.Nx 8
-as
-.Fn strtoi 3
-and
-.Fn strtou 3 .
-For compatibility reasons it's available since
-.Nx 8
-in the
-.Vt _OPENBSD_SOURCE
-namespace.
-.Sh CAVEATS
-The
-.Fn strtonum
-function was designed to facilitate safe,
-robust programming and overcome the shortcomings of the
-.Xr atoi 3
-and
-.Xr strtol 3
-family of interfaces, however there are problems with the
-.Fn strtonum
-API:
-.Bl -dash
-.It
-will return 0 on failure; 0 might not be in range, so that necessitates
-an error check even if you want to avoid it
-.It
-does not differentiate 'illegal' returns, so we can't tell the
-difference between partial and no conversions
-.It
-returns english strings
-.It
-can't set the base, or find where the conversion ended
-.It
-hardcodes long long integer type
-.El
-To overcome the shortcomings of
-.Fn strtonum
-.Nx
-provides
-.Fn strtou 3
-and
-.Fn strtoi 3 .
diff --git a/lib/libc/stdlib/strtonum.c b/lib/libc/stdlib/strtonum.c
deleted file mode 100644
index b7b7fe907..000000000
--- a/lib/libc/stdlib/strtonum.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: strtonum.c,v 1.4 2015/03/10 12:57:56 christos Exp $	*/
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: strtonum.c,v 1.4 2015/03/10 12:57:56 christos Exp $");
-
-#define _OPENBSD_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <inttypes.h>
-
-long long
-strtonum(const char *nptr, long long minval, long long maxval,
-         const char **errstr)
-{
-	int e;
-	long long rv;
-	const char *resp;
-
-	if (errstr == NULL)
-		errstr = &resp;
-
-	rv = (long long)strtoi(nptr, NULL, 10, minval, maxval, &e);
-
-	if (e == 0) {
-		*errstr = NULL;
-		return rv;
-	}
-
-	if (e == ERANGE)
-		*errstr = (rv == maxval ? "too large" : "too small");
-	else
-		*errstr = "invalid";
-
-	return 0;
-}
diff --git a/lib/libc/stdlib/strtoq.c b/lib/libc/stdlib/strtoq.c
deleted file mode 100644
index 9121837d5..000000000
--- a/lib/libc/stdlib/strtoq.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $NetBSD: strtoq.c,v 1.19 2008/08/20 12:42:26 joerg Exp $ */
-
-/*-
- * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: strtoq.c,v 1.19 2008/08/20 12:42:26 joerg Exp $");
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define	_FUNCNAME	strtoq
-#define	__INT		quad_t
-#define	__INT_MIN	QUAD_MIN
-#define	__INT_MAX	QUAD_MAX
-
-#include "_strtol.h"
diff --git a/lib/libc/stdlib/strtou.3 b/lib/libc/stdlib/strtou.3
deleted file mode 100644
index bde9365f9..000000000
--- a/lib/libc/stdlib/strtou.3
+++ /dev/null
@@ -1,222 +0,0 @@
-.\"	$NetBSD: strtou.3,v 1.3 2015/07/11 15:51:33 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strtoul.3	8.1 (Berkeley) 6/4/93
-.\"
-.\" Created by Kamil Rytarowski, based on ID:
-.\" NetBSD: strtoul.3,v 1.29 2015/03/10 13:00:58 christos Exp
-.\"
-.Dd April 30, 2015
-.Dt STRTOU 3
-.Os
-.Sh NAME
-.Nm strtou
-.Nd convert a string to an uintmax_t integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In inttypes.h
-.Ft uintmax_t
-.Fo strtou
-.Fa "const char * restrict nptr"
-.Fa "char ** restrict endptr"
-.Fa "int base"
-.Fa "uintmax_t lo"
-.Fa "uintmax_t hi"
-.Fa "int *rstatus"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn strtou
-function converts the string in
-.Fa nptr
-to an
-.Ft uintmax_t
-value.
-The
-.Fn strtou
-function uses internally
-.Xr strtoumax 3
-and ensures that the result is always in the range [
-.Fa lo ..
-.Fa hi
-].
-In adddition it always places
-.Dv 0
-on success or a conversion status in the
-.Fa rstatus
-argument, avoiding the
-.Dv errno
-gymnastics the other functions require.
-The
-.Fa rstatus
-argument can be
-.Dv NULL
-if conversion status is to be ignored.
-.Pp
-The string may begin with an arbitrary amount of white space
-(as determined by
-.Xr isspace 3 )
-followed by a single optional
-.Ql +
-or
-.Ql -
-sign.
-If
-.Fa base
-is zero or 16,
-the string may then include a
-.Ql 0x
-prefix,
-and the number will be read in base 16; otherwise, a zero
-.Fa base
-is taken as 10 (decimal) unless the next character is
-.Ql 0 ,
-in which case it is taken as 8 (octal).
-.Pp
-The remainder of the string is converted to an
-.Em uintmax_t
-value in the obvious manner,
-stopping at the end of the string
-or at the first character that does not produce a valid digit
-in the given base.
-(In bases above 10, the letter
-.Ql A
-in either upper or lower case
-represents 10,
-.Ql B
-represents 11, and so forth, with
-.Ql Z
-representing 35.)
-.Pp
-If
-.Fa endptr
-is non-nil,
-.Fn strtou
-stores the address of the first invalid character in
-.Fa *endptr .
-If there were no digits at all, however,
-.Fn strtou
-stores the original value of
-.Fa nptr
-in
-.Fa *endptr .
-(Thus, if
-.Fa *nptr
-is not
-.Ql \e0
-but
-.Fa **endptr
-is
-.Ql \e0
-on return, the entire string was valid.)
-.Sh RETURN VALUES
-The
-.Fn strtou
-function
-always returns the closest value in the range specified by
-the
-.Fa lo
-and
-.Fa hi
-arguments.
-.Pp
-The
-.Va errno
-value is guaranteed to be left unchanged.
-.Pp
-Errors are stored as the conversion status in the
-.Fa rstatus
-argument.
-.Sh EXAMPLES
-The following example will always return a number in
-.Dv [1..99]
-range no matter what the input is, and warn if the conversion failed.
-.Bd -literal -offset indent
-int e;
-uintmax_t lval = strtou(buf, NULL, 0, 1, 99, &e);
-if (e)
-	warnc(e, "conversion of `%s' to a number failed, using %ju",
-	    buf, lval);
-.Ed
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ECANCELED
-The string did not contain any characters that were converted.
-.It Bq Er EINVAL
-The
-.Ar base
-is not between 2 and 36 and does not contain the special value 0.
-.It Bq Er ENOTSUP
-The string contained non-numeric characters that did not get converted.
-In this case,
-.Fa endptr
-points to the first unconverted character.
-.It Bq Er ERANGE
-The given string was out of range; the value converted has been clamped; or
-the range given was invalid, i.e.
-.Fa lo
-\*[Gt]
-.Fa hi .
-.El
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr atoll 3 ,
-.Xr strtod 3 ,
-.Xr strtoi 3 ,
-.Xr strtoimax 3 ,
-.Xr strtol 3 ,
-.Xr strtoll 3 ,
-.Xr strtoul 3 ,
-.Xr strtoull 3 ,
-.Xr strtoumax 3
-.Sh STANDARDS
-The
-.Fn strtou
-function is a
-.Nx
-extension.
-.Sh HISTORY
-The
-.Fn strtou
-function first appeared in
-.Nx 7 .
-.Ox
-introduced the
-.Fn strtonum 3
-function for the same purpose, but the interface makes it impossible to
-properly differentiate illegal returns.
-.Sh BUGS
-Ignores the current locale.
diff --git a/lib/libc/stdlib/strtoul.3 b/lib/libc/stdlib/strtoul.3
deleted file mode 100644
index 6725cba4a..000000000
--- a/lib/libc/stdlib/strtoul.3
+++ /dev/null
@@ -1,275 +0,0 @@
-.\"	$NetBSD: strtoul.3,v 1.31 2015/05/03 12:29:28 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strtoul.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 30, 2015
-.Dt STRTOUL 3
-.Os
-.Sh NAME
-.Nm strtoul ,
-.Nm strtoull ,
-.Nm strtoumax ,
-.Nm strtouq
-.Nd convert a string to an unsigned long, unsigned long long, uintmax_t or uquad_t integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.In limits.h
-.Ft unsigned long int
-.Fn strtoul "const char * restrict nptr" "char ** restrict endptr" "int base"
-.Ft unsigned long long int
-.Fn strtoull "const char * restrict nptr" "char ** restrict endptr" "int base"
-.Pp
-.In inttypes.h
-.Ft uintmax_t
-.Fn strtoumax "const char * restrict nptr" "char ** restrict endptr" "int base"
-.Pp
-.In sys/types.h
-.In stdlib.h
-.In limits.h
-.Ft u_quad_t
-.Fn strtouq "const char * restrict nptr" "char ** restrict endptr" "int base"
-.Sh DESCRIPTION
-The
-.Fn strtoul
-function
-converts the string in
-.Fa nptr
-to an
-.Ft unsigned long int
-value.
-The
-.Fn strtoull
-function
-converts the string in
-.Fa nptr
-to an
-.Ft unsigned long long int
-value.
-The
-.Fn strtoumax
-function
-converts the string in
-.Fa nptr
-to an
-.Ft uintmax_t
-value.
-The
-.Fn strtouq
-function
-converts the string in
-.Fa nptr
-to a
-.Ft u_quad_t
-value.
-.Pp
-The conversion is done according to the given
-.Fa base ,
-which must be between 2 and 36 inclusive,
-or be the special value 0.
-.Pp
-The string may begin with an arbitrary amount of white space
-(as determined by
-.Xr isspace 3 )
-followed by a single optional
-.Ql +
-or
-.Ql -
-sign.
-If
-.Fa base
-is zero or 16,
-the string may then include a
-.Ql 0x
-prefix,
-and the number will be read in base 16; otherwise, a zero
-.Fa base
-is taken as 10 (decimal) unless the next character is
-.Ql 0 ,
-in which case it is taken as 8 (octal).
-.Pp
-The remainder of the string is converted to an appropriate
-value in the obvious manner,
-stopping at the end of the string
-or at the first character that does not produce a valid digit
-in the given base.
-(In bases above 10, the letter
-.Ql A
-in either upper or lower case
-represents 10,
-.Ql B
-represents 11, and so forth, with
-.Ql Z
-representing 35.)
-.Pp
-If
-.Fa endptr
-is non-nil, the functions store the address of the first invalid character in
-.Fa *endptr .
-If there were no digits at all, however,
-the functions store the original value of
-.Fa nptr
-in
-.Fa *endptr .
-(Thus, if
-.Fa *nptr
-is not
-.Ql \e0
-but
-.Fa **endptr
-is
-.Ql \e0
-on return, the entire string was valid.)
-.Sh RETURN VALUES
-The
-.Fn strtoul
-function
-returns either the result of the conversion
-or, if there was a leading minus sign,
-the negation of the result of the conversion,
-unless the original (non-negated) value would overflow;
-in the latter case,
-.Fn strtoul
-returns
-.Dv ULONG_MAX ,
-.Fn strtoull
-returns
-.Dv ULLONG_MAX ,
-.Fn strtoumax
-returns
-.Dv UINTMAX_MAX ,
-.Fn strtouq
-returns
-.Dv UQUAD_MAX ,
-and the global variable
-.Va errno
-is set to
-.Er ERANGE .
-.Pp
-There is no way to determine if
-.Fn strtoul
-has processed a negative number (and returned an unsigned value) short of
-examining the string in
-.Fa nptr
-directly.
-If the
-.Fa base
-argument is not supported then
-.Va errno
-is set to
-.Er EINVAL
-and the functions return 0.
-.Pp
-If no error occurs,
-.Va errno
-is left unchanged.
-This behavior (which is unlike most library functions) is guaranteed
-by the pertinent standards.
-.Sh EXAMPLES
-Because the return value of
-.Fn strtoul
-cannot be used unambiguously to detect an error,
-.Va errno
-is left unchanged after a successful call.
-To ensure that a string is a valid number (i.e., in range and containing no
-trailing characters), clear
-.Va errno
-beforehand explicitly, then check it afterwards:
-.Bd -literal -offset indent
-char *ep;
-unsigned long ulval;
-
-\&...
-
-errno = 0;
-ulval = strtoul(buf, \*[Am]ep, 10);
-if (buf[0] == '\e0' || *ep != '\e0')
-	goto not_a_number;
-if (errno == ERANGE \*[Am]\*[Am] ulval == ULONG_MAX)
-	goto out_of_range;
-.Ed
-.Pp
-This example will accept
-.Dq 12
-but not
-.Dq 12foo
-or
-.Dq 12\en .
-If trailing whitespace is acceptable, further checks must be done on
-.Va *ep ;
-alternately, use
-.Xr sscanf 3 .
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Ar base
-is not between 2 and 36 and does not contain the special value 0.
-.It Bq Er ERANGE
-The given string was out of range; the value converted has been clamped.
-.El
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr atoll 3 ,
-.Xr strtod 3 ,
-.Xr strtoi 3 ,
-.Xr strtoimax 3 ,
-.Xr strtol 3 ,
-.Xr strtoll 3 ,
-.Xr strtou 3
-.Sh STANDARDS
-The
-.Fn strtoul
-function
-conforms to
-.St -ansiC .
-The
-.Fn strtoull
-and
-.Fn strtoumax
-functions conform to
-.St -isoC-99 .
-.Pp
-The
-.Fn strtouq
-function is a
-.Bx
-legacy function equivalent to
-.Fn strtoull
-and should not be used in a new code.
-.Sh BUGS
-Ignores the current locale.
diff --git a/lib/libc/stdlib/strtouq.c b/lib/libc/stdlib/strtouq.c
deleted file mode 100644
index 58894b5b4..000000000
--- a/lib/libc/stdlib/strtouq.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $NetBSD: strtouq.c,v 1.20 2008/08/26 12:21:24 drochner Exp $ */
-
-/*-
- * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: strtouq.c,v 1.20 2008/08/26 12:21:24 drochner Exp $");
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define	_FUNCNAME	strtouq
-#define	__UINT		u_quad_t
-#define	__UINT_MAX	UQUAD_MAX
-
-#include "_strtoul.h"
diff --git a/lib/libc/stdlib/system.3 b/lib/libc/stdlib/system.3
deleted file mode 100644
index 8721e0853..000000000
--- a/lib/libc/stdlib/system.3
+++ /dev/null
@@ -1,108 +0,0 @@
-.\"	$NetBSD: system.3,v 1.17 2008/08/27 06:45:02 christos Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)system.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd August 2, 2007
-.Dt SYSTEM 3
-.Os
-.Sh NAME
-.Nm system
-.Nd pass a command to the shell
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn system "const char *string"
-.Sh DESCRIPTION
-The
-.Fn system
-function
-hands the argument
-.Fa string
-to the command interpreter
-.Xr sh 1 .
-The calling process waits for the shell to finish executing the command,
-ignoring
-.Dv SIGINT
-and
-.Dv SIGQUIT ,
-and blocking
-.Dv SIGCHLD .
-.Pp
-If
-.Fa string
-is a
-.Dv NULL
-pointer,
-.Fn system
-will return non-zero, if the command interpreter is available, or zero if none
-is available.
-Otherwise,
-.Fn system
-returns the termination status of the shell in the format specified by
-.Xr waitpid 2 .
-.Sh RETURN VALUES
-If a child process cannot be created, or the termination status of
-the shell cannot be obtained,
-.Fn system
-returns -1 and sets
-.Va errno
-to indicate the error.
-If execution of the shell fails,
-.Fn system
-returns the termination status for a program that terminates with a call of
-.Fn exit 127 .
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr execve 2 ,
-.Xr waitpid 2 ,
-.Xr popen 3 ,
-.Xr shquote 3
-.Sh STANDARDS
-The
-.Fn system
-function
-conforms to
-.St -ansiC
-and
-.St -p1003.2-92 .
-.Sh CAVEATS
-Never supply the
-.Fn system
-function with a command containing any part of an unsanitized user-supplied
-string.
-Shell meta-characters present will be honored by the
-.Xr sh 1
-command interpreter.
diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c
deleted file mode 100644
index 0d5056a0b..000000000
--- a/lib/libc/stdlib/system.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*	$NetBSD: system.c,v 1.25 2015/01/20 18:31:25 christos 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)system.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: system.c,v 1.25 2015/01/20 18:31:25 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <paths.h>
-
-#include "env.h"
-
-int
-system(const char *command)
-{
-	pid_t pid;
-	struct sigaction intsa, quitsa, sa;
-	sigset_t nmask, omask;
-	int pstat;
-	const char *argp[] = {"sh", "-c", NULL, NULL};
-	argp[2] = command;
-
-	/*
-	 * ISO/IEC 9899:1999 in 7.20.4.6 describes this special case.
-	 * We need to check availability of a command interpreter.
-	 */
-	if (command == NULL) {
-		if (access(_PATH_BSHELL, X_OK) == 0)
-			return 1;
-		return 0;
-	}
-
-	sa.sa_handler = SIG_IGN;
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = 0;
-
-	if (sigaction(SIGINT, &sa, &intsa) == -1)
-		return -1;
-	if (sigaction(SIGQUIT, &sa, &quitsa) == -1) {
-		sigaction(SIGINT, &intsa, NULL);
-		return -1;
-	}
-
-	sigemptyset(&nmask);
-	sigaddset(&nmask, SIGCHLD);
-	if (sigprocmask(SIG_BLOCK, &nmask, &omask) == -1) {
-		sigaction(SIGINT, &intsa, NULL);
-		sigaction(SIGQUIT, &quitsa, NULL);
-		return -1;
-	}
-
-	(void)__readlockenv();
-	switch(pid = vfork()) {
-	case -1:			/* error */
-		(void)__unlockenv();
-		sigaction(SIGINT, &intsa, NULL);
-		sigaction(SIGQUIT, &quitsa, NULL);
-		(void)sigprocmask(SIG_SETMASK, &omask, NULL);
-		return -1;
-	case 0:				/* child */
-		sigaction(SIGINT, &intsa, NULL);
-		sigaction(SIGQUIT, &quitsa, NULL);
-		(void)sigprocmask(SIG_SETMASK, &omask, NULL);
-		execve(_PATH_BSHELL, __UNCONST(argp), environ);
-		_exit(127);
-	}
-	(void)__unlockenv();
-
-	while (waitpid(pid, &pstat, 0) == -1) {
-		if (errno != EINTR) {
-			pstat = -1;
-			break;
-		}
-	}
-
-	sigaction(SIGINT, &intsa, NULL);
-	sigaction(SIGQUIT, &quitsa, NULL);
-	(void)sigprocmask(SIG_SETMASK, &omask, NULL);
-
-	return (pstat);
-}
diff --git a/lib/libc/stdlib/tdelete.c b/lib/libc/stdlib/tdelete.c
deleted file mode 100644
index 84017dc0e..000000000
--- a/lib/libc/stdlib/tdelete.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: tdelete.c,v 1.6 2012/06/25 22:32:45 abs Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tdelete.c,v 1.6 2012/06/25 22:32:45 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#define _SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>
-
-
-/* find a node with key "vkey" in tree "vrootp" */
-void *
-tdelete(const void *vkey, void **vrootp,
-    int (*compar)(const void *, const void *))
-{
-	node_t **rootp = (node_t **)vrootp;
-	node_t *p, *q, *r;
-	int  cmp;
-
-	_DIAGASSERT(vkey != NULL);
-	_DIAGASSERT(compar != NULL);
-
-	if (rootp == NULL || (p = *rootp) == NULL)
-		return NULL;
-
-	while ((cmp = (*compar)(vkey, (*rootp)->key)) != 0) {
-		p = *rootp;
-		rootp = (cmp < 0) ?
-		    &(*rootp)->llink :		/* follow llink branch */
-		    &(*rootp)->rlink;		/* follow rlink branch */
-		if (*rootp == NULL)
-			return NULL;		/* key not found */
-	}
-	r = (*rootp)->rlink;			/* D1: */
-	if ((q = (*rootp)->llink) == NULL)	/* Left NULL? */
-		q = r;
-	else if (r != NULL) {			/* Right link is NULL? */
-		if (r->llink == NULL) {		/* D2: Find successor */
-			r->llink = q;
-			q = r;
-		} else {			/* D3: Find NULL link */
-			for (q = r->llink; q->llink != NULL; q = r->llink)
-				r = q;
-			r->llink = q->rlink;
-			q->llink = (*rootp)->llink;
-			q->rlink = (*rootp)->rlink;
-		}
-	}
-	if (p != *rootp)
-		free(*rootp);			/* D4: Free node */
-	*rootp = q;				/* link parent to new node */
-	return p;
-}
diff --git a/lib/libc/stdlib/tfind.c b/lib/libc/stdlib/tfind.c
deleted file mode 100644
index fd3f362a7..000000000
--- a/lib/libc/stdlib/tfind.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: tfind.c,v 1.7 2012/06/25 22:32:45 abs Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tfind.c,v 1.7 2012/06/25 22:32:45 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#define _SEARCH_PRIVATE
-#include <stdlib.h>
-#include <search.h>
-
-/* find a node by key "vkey" in tree "vrootp", or return 0 */
-void *
-tfind(const void *vkey, void * const *vrootp,
-    int (*compar)(const void *, const void *))
-{
-	node_t * const *rootp = (node_t * const*)vrootp;
-
-	_DIAGASSERT(vkey != NULL);
-	_DIAGASSERT(compar != NULL);
-
-	if (rootp == NULL)
-		return NULL;
-
-	while (*rootp != NULL) {		/* T1: */
-		int r;
-
-		if ((r = (*compar)(vkey, (*rootp)->key)) == 0)	/* T2: */
-			return *rootp;		/* key found */
-		rootp = (r < 0) ?
-		    &(*rootp)->llink :		/* T3: follow left branch */
-		    &(*rootp)->rlink;		/* T4: follow right branch */
-	}
-	return NULL;
-}
diff --git a/lib/libc/stdlib/tsearch.3 b/lib/libc/stdlib/tsearch.3
deleted file mode 100644
index 5567f4b00..000000000
--- a/lib/libc/stdlib/tsearch.3
+++ /dev/null
@@ -1,141 +0,0 @@
-.\" $NetBSD: tsearch.3,v 1.12 2010/04/30 10:09:23 jruoho Exp $
-.\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-.\" 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.
-.\"
-.\"	OpenBSD: tsearch.3,v 1.2 1998/06/21 22:13:49 millert Exp
-.\"
-.Dd April 30, 2010
-.Dt TSEARCH 3
-.Os
-.Sh NAME
-.Nm tsearch, tfind, tdelete, twalk
-.Nd manipulate binary search trees
-.Sh SYNOPSIS
-.In search.h
-.Ft void *
-.Fn tdelete "const void * restrict key" "void ** restrict rootp" "int (*compar) (const void *, const void *)"
-.Ft void *
-.Fn tfind "const void *key" "const void * const *rootp" "int (*compar) (const void *, const void *)"
-.Ft void *
-.Fn tsearch "const void *key" "void **rootp" "int (*compar) (const void *, const void *)"
-.Ft void
-.Fn twalk "const void *root" "void (*action) (const void *, VISIT, int)"
-.Sh DESCRIPTION
-The
-.Fn tdelete ,
-.Fn tfind ,
-.Fn tsearch ,
-and
-.Fn twalk
-functions manage binary search trees based on algorithms T and D
-from Knuth (6.2.2).
-The comparison function passed in by
-the user has the same style of return values as
-.Xr strcmp 3 .
-.Pp
-.Fn tfind
-searches for the datum matched by the argument
-.Fa key
-in the binary tree rooted at
-.Fa rootp ,
-returning a pointer to the datum if it is found and NULL
-if it is not.
-.Pp
-.Fn tsearch
-is identical to
-.Fn tfind
-except that if no match is found,
-.Fa key
-is inserted into the tree and a pointer to it is returned.
-If
-.Fa rootp
-points to a NULL value a new binary search tree is created.
-.Pp
-.Fn tdelete
-deletes a node from the specified binary search tree and returns
-a pointer to the parent of the node to be deleted.
-It takes the same arguments as
-.Fn tfind
-and
-.Fn tsearch .
-If the node to be deleted is the root of the binary search tree,
-.Fa rootp
-will be adjusted.
-.Pp
-.Fn twalk
-walks the binary search tree rooted in
-.Va root
-and calls the function
-.Fa action
-on each node.
-.Fa Action
-is called with three arguments: a pointer to the current node,
-a value from the enum
-.Sy "typedef enum { preorder, postorder, endorder, leaf } VISIT;"
-specifying the traversal type, and a node level (where level
-zero is the root of the tree).
-.Sh RETURN VALUES
-The
-.Fn tsearch
-function returns NULL if allocation of a new node fails (usually
-due to a lack of free memory).
-.Pp
-.Fn tfind ,
-.Fn tsearch ,
-and
-.Fn tdelete
-return NULL if
-.Fa rootp
-is NULL or the datum cannot be found.
-.Pp
-The
-.Fn twalk
-function returns no value.
-.Sh SEE ALSO
-.Xr bsearch 3 ,
-.Xr hsearch 3 ,
-.Xr lsearch 3
-.Sh STANDARDS
-These functions conform to
-.St -p1003.1-2001 .
-.Sh CAVEATS
-The
-.St -p1003.1-2001
-standard does not specify what value should be returned when deleting
-the root node.
-Since implementations vary, user of
-.Fn tdelete
-should not rely on any specific behaviour.
-The
-.St -p1003.1-2008
-revision tried to clarify the issue with the following wording:
-.Do
-the
-.Fn tdelete
-function shall return a pointer to the parent of the deleted node,
-or an unspecified non-NULL pointer if the deleted node was the root node, or a
-.Dv NULL
-pointer if the node is not found
-.Dc .
diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c
deleted file mode 100644
index af2fe9c22..000000000
--- a/lib/libc/stdlib/tsearch.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$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
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tsearch.c,v 1.7 2012/06/25 22:32:45 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#define _SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>
-
-/* find or insert datum into search tree */
-void *
-tsearch(const void *vkey, void **vrootp,
-    int (*compar)(const void *, const void *))
-{
-	node_t *q;
-	node_t **rootp = (node_t **)vrootp;
-
-	_DIAGASSERT(vkey != NULL);
-	_DIAGASSERT(compar != NULL);
-
-	if (rootp == NULL)
-		return NULL;
-
-	while (*rootp != NULL) {	/* Knuth's T1: */
-		int r;
-
-		if ((r = (*compar)(vkey, (*rootp)->key)) == 0)	/* T2: */
-			return *rootp;		/* we found it! */
-
-		rootp = (r < 0) ?
-		    &(*rootp)->llink :		/* T3: follow left branch */
-		    &(*rootp)->rlink;		/* T4: follow right branch */
-	}
-
-	q = malloc(sizeof(node_t));		/* T5: key not found */
-	if (q != 0) {				/* make new node */
-		*rootp = q;			/* link new node to old */
-		q->key = __UNCONST(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
deleted file mode 100644
index 0e239a18e..000000000
--- a/lib/libc/stdlib/twalk.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$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
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: twalk.c,v 1.4 2012/03/20 16:38:45 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#define _SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>
-
-typedef void (*cmp_fn_t)(const void *, VISIT, int);
-
-/* Walk the nodes of a tree */
-static void
-trecurse(const node_t *root,	/* Root of the tree to be walked */
-	cmp_fn_t action, int level)
-{
-	_DIAGASSERT(root != NULL);
-	_DIAGASSERT(action != NULL);
-
-	if (root->llink == NULL && root->rlink == NULL)
-		(*action)(root, leaf, level);
-	else {
-		(*action)(root, preorder, level);
-		if (root->llink != NULL)
-			trecurse(root->llink, action, level + 1);
-		(*action)(root, postorder, level);
-		if (root->rlink != NULL)
-			trecurse(root->rlink, action, level + 1);
-		(*action)(root, endorder, level);
-	}
-}
-
-/* Walk the nodes of a tree */
-void
-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/stdlib/unlockpt.3 b/lib/libc/stdlib/unlockpt.3
deleted file mode 100644
index 7c8de5333..000000000
--- a/lib/libc/stdlib/unlockpt.3
+++ /dev/null
@@ -1,86 +0,0 @@
-.\" $NetBSD: unlockpt.3,v 1.4 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2004 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 25, 2004
-.Dt UNLOCKPT 3
-.Os
-.Sh NAME
-.Nm unlockpt
-.Nd unlock the slave pseudo-terminal device
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn unlockpt "int fildes"
-.Sh DESCRIPTION
-The
-.Fn unlockpt
-unlocks access to the pseudo-terminal device corresponding to the
-master pseudo-terminal device associated with
-.Fa fildes .
-Conforming applications must call this function before opening the
-slave pseudo-terminal device.
-.Sh RETURN VALUES
-If successful,
-.Fn unlockpt
-returns 0; otherwise a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn unlockpt
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCESS
-the corresponding pseudo-terminal device could not be accessed.
-.It Bq Er EBADF
-.Fa fildes
-is not a valid descriptor.
-.It Bq Er EINVAL
-.Fa fildes
-is not associated with a master pseudo-terminal device.
-.El
-.Sh NOTES
-In
-.Nx
-.Fn unlockpt
-does nothing.
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr grantpt 3 ,
-.Xr posix_openpt 3 ,
-.Xr ptsname 3
-.Sh STANDARDS
-The
-.Fn unlockpt
-function conforms to
-.St -p1003.1-2001 .
-Its first release was in
-.St -xpg4.2 .
diff --git a/lib/libc/stdlib/unsetenv.c b/lib/libc/stdlib/unsetenv.c
deleted file mode 100644
index e1f79db83..000000000
--- a/lib/libc/stdlib/unsetenv.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*	$NetBSD: unsetenv.c,v 1.11 2015/01/20 18:31:25 christos Exp $	*/
-
-/*
- * Copyright (c) 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "from: @(#)setenv.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: unsetenv.c,v 1.11 2015/01/20 18:31:25 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <bitstring.h>
-
-#include "env.h"
-#include "local.h"
-
-/*
- * unsetenv(name) --
- *	Delete environmental variable "name".
- */
-int
-unsetenv(const char *name)
-{
-	size_t l_name;
-	ssize_t r_offset, w_offset;
-
-	_DIAGASSERT(name != NULL);
-
-	l_name = __envvarnamelen(name, false);
-	if (l_name == 0) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	if (!__writelockenv())
-		return -1;
-
-	/* Search for the given name in the environment. */
-	r_offset = __getenvslot(name, l_name, false);
-	if (r_offset == -1) {
-		/* Not found. */
-		(void)__unlockenv();
-		return 0;
-	}
-	__freeenvvar(environ[r_offset]);
-
-	/*
-	 * Remove all matches from the environment and free the associated
-	 * memory if possible.
-	 */
-	w_offset = r_offset;
-	while (environ[++r_offset] != NULL) {
-		if (strncmp(environ[r_offset], name, l_name) != 0 ||
-		    environ[r_offset][l_name] != '=') {
-			/* Not a match, keep this entry. */
-			environ[w_offset++] = environ[r_offset];
-		} else {
-			/* We found another match. */
-			__freeenvvar(environ[r_offset]);
-		}
-	}
-
-	/* Clear out remaining stale entries in the environment vector. */
-	do {
-		environ[w_offset++] = NULL;
-	} while (w_offset < r_offset);
-
-	(void)__unlockenv();
-	return 0;
-}
diff --git a/lib/libc/string/Lint_bcmp.c b/lib/libc/string/Lint_bcmp.c
deleted file mode 100644
index d378c9d1d..000000000
--- a/lib/libc/string/Lint_bcmp.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_bcmp.c,v 1.2 2000/06/14 06:49:07 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-int
-bcmp(b1, b2, len)
-	const void *b1, *b2;
-	size_t len;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_bcopy.c b/lib/libc/string/Lint_bcopy.c
deleted file mode 100644
index 475f97fdd..000000000
--- a/lib/libc/string/Lint_bcopy.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_bcopy.c,v 1.2 2000/06/14 06:49:07 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-void
-bcopy(src, dst, len)
-	const void *src;
-	void *dst;
-	size_t len;
-{
-}
diff --git a/lib/libc/string/Lint_bzero.c b/lib/libc/string/Lint_bzero.c
deleted file mode 100644
index 86dfea3fd..000000000
--- a/lib/libc/string/Lint_bzero.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: Lint_bzero.c,v 1.2 2000/06/14 06:49:07 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-void
-bzero(src, len)
-	void *src;
-	size_t len;
-{
-}
diff --git a/lib/libc/string/Lint_ffs.c b/lib/libc/string/Lint_ffs.c
deleted file mode 100644
index c3d28f676..000000000
--- a/lib/libc/string/Lint_ffs.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* $NetBSD: Lint_ffs.c,v 1.3 2009/08/05 16:08:00 joerg Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <strings.h>
-
-/*ARGSUSED*/
-int
-ffs(int value)
-{
-	return(0);
-}
diff --git a/lib/libc/string/Lint_index.c b/lib/libc/string/Lint_index.c
deleted file mode 100644
index a6aeef34b..000000000
--- a/lib/libc/string/Lint_index.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_index.c,v 1.2 2000/06/14 06:49:07 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-char *
-index(src, c)
-	const char *src;
-	int c;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_memccpy.c b/lib/libc/string/Lint_memccpy.c
deleted file mode 100644
index a79c87565..000000000
--- a/lib/libc/string/Lint_memccpy.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*	$NetBSD: Lint_memccpy.c,v 1.1 1997/12/07 00:24:58 matthias Exp $	*/
-
-/*
- * This file placed in the public domain.
- * Matthias Pfaller, December 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-void *
-memccpy(dst, src, c, n)
-	void *dst;
-	const void *src;
-	int c;
-	size_t n;
-{
-	return(0);
-}
diff --git a/lib/libc/string/Lint_memchr.c b/lib/libc/string/Lint_memchr.c
deleted file mode 100644
index 574ff0929..000000000
--- a/lib/libc/string/Lint_memchr.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: Lint_memchr.c,v 1.2 2000/06/14 06:49:07 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-void *
-memchr(b, c, len)
-	const void *b;
-	int c;
-	size_t len;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_memcmp.c b/lib/libc/string/Lint_memcmp.c
deleted file mode 100644
index a1fd275e1..000000000
--- a/lib/libc/string/Lint_memcmp.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_memcmp.c,v 1.2 2000/06/14 06:49:08 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-int
-memcmp(b1, b2, len)
-	const void *b1, *b2;
-	size_t len;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_memcpy.c b/lib/libc/string/Lint_memcpy.c
deleted file mode 100644
index 2aead93b4..000000000
--- a/lib/libc/string/Lint_memcpy.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: Lint_memcpy.c,v 1.2 2000/06/14 06:49:08 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-void *
-memcpy(dst, src, len)
-	void *dst;
-	const void *src;
-	size_t len;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_memmove.c b/lib/libc/string/Lint_memmove.c
deleted file mode 100644
index 822a296d8..000000000
--- a/lib/libc/string/Lint_memmove.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: Lint_memmove.c,v 1.2 2000/06/14 06:49:08 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-void *
-memmove(dst, src, len)
-	void *dst;
-	const void *src;
-	size_t len;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_memset.c b/lib/libc/string/Lint_memset.c
deleted file mode 100644
index f79b9dbcd..000000000
--- a/lib/libc/string/Lint_memset.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: Lint_memset.c,v 1.2 2000/06/14 06:49:08 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-void *
-memset(b, c, len)
-	void *b;
-	int c;
-	size_t len;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_rindex.c b/lib/libc/string/Lint_rindex.c
deleted file mode 100644
index c96b4d512..000000000
--- a/lib/libc/string/Lint_rindex.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_rindex.c,v 1.2 2000/06/14 06:49:08 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-char *
-rindex(src, c)
-	const char *src;
-	int c;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_strcat.c b/lib/libc/string/Lint_strcat.c
deleted file mode 100644
index 279a35dc5..000000000
--- a/lib/libc/string/Lint_strcat.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_strcat.c,v 1.2 2000/06/14 06:49:08 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-char *
-strcat(s, append)
-	char *s;
-	const char *append;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_strchr.c b/lib/libc/string/Lint_strchr.c
deleted file mode 100644
index de541f3d9..000000000
--- a/lib/libc/string/Lint_strchr.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_strchr.c,v 1.2 2000/06/14 06:49:09 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-char *
-strchr(src, c)
-	const char *src;
-	int c;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_strcmp.c b/lib/libc/string/Lint_strcmp.c
deleted file mode 100644
index cd6babdf2..000000000
--- a/lib/libc/string/Lint_strcmp.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: Lint_strcmp.c,v 1.2 2000/06/14 06:49:09 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-int
-strcmp(s1, s2)
-	const char *s1, *s2;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_strcpy.c b/lib/libc/string/Lint_strcpy.c
deleted file mode 100644
index 550ccde40..000000000
--- a/lib/libc/string/Lint_strcpy.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_strcpy.c,v 1.2 2000/06/14 06:49:09 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-char *
-strcpy(dst, src)
-	char *dst;
-	const char *src;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_strlen.c b/lib/libc/string/Lint_strlen.c
deleted file mode 100644
index 63f51ce6c..000000000
--- a/lib/libc/string/Lint_strlen.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: Lint_strlen.c,v 1.2 2000/06/14 06:49:10 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-size_t
-strlen(s)
-	const char *s;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_strncat.c b/lib/libc/string/Lint_strncat.c
deleted file mode 100644
index f0181a3bc..000000000
--- a/lib/libc/string/Lint_strncat.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*	$NetBSD: Lint_strncat.c,v 1.1 1997/12/07 00:24:58 matthias Exp $	*/
-
-/*
- * This file placed in the public domain.
- * Matthias Pfaller, December 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-char *
-strncat(dst, src, n)
-	char *dst;
-	const char *src;
-	size_t n;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_strncmp.c b/lib/libc/string/Lint_strncmp.c
deleted file mode 100644
index 645f49c57..000000000
--- a/lib/libc/string/Lint_strncmp.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_strncmp.c,v 1.2 2000/06/14 06:49:10 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-int
-strncmp(s1, s2, len)
-	const char *s1, *s2;
-	size_t len;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_strncpy.c b/lib/libc/string/Lint_strncpy.c
deleted file mode 100644
index 6966f6f94..000000000
--- a/lib/libc/string/Lint_strncpy.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*	$NetBSD: Lint_strncpy.c,v 1.1 1997/12/07 00:24:58 matthias Exp $	*/
-
-/*
- * This file placed in the public domain.
- * Matthias Pfaller, December 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-char *
-strncpy(dst, src, n)
-	char *dst;
-	const char *src;
-	size_t n;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_strrchr.c b/lib/libc/string/Lint_strrchr.c
deleted file mode 100644
index fb64549f6..000000000
--- a/lib/libc/string/Lint_strrchr.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: Lint_strrchr.c,v 1.2 2000/06/14 06:49:10 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-char *
-strrchr(src, c)
-	const char *src;
-	int c;
-{
-	return (0);
-}
diff --git a/lib/libc/string/Lint_swab.c b/lib/libc/string/Lint_swab.c
deleted file mode 100644
index 64986c60d..000000000
--- a/lib/libc/string/Lint_swab.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $NetBSD: Lint_swab.c,v 1.3 2010/07/05 00:45:19 christos Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <string.h>
-
-/*ARGSUSED*/
-void
-swab(const void *src, void *dst, ssize_t len)
-{
-}
diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
deleted file mode 100644
index 61bbeb105..000000000
--- a/lib/libc/string/Makefile.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-#	from: @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$NetBSD: Makefile.inc,v 1.80 2014/09/24 18:16:37 christos Exp $
-
-# string sources
-.PATH: ${ARCHDIR}/string ${.CURDIR}/string
-
-# NB: if a .S version of any of these is added in the arch/*/Makefile
-# then the relevant .c file is automatically removed
-# Also adding the .c name to NO_SRCS will have the same effect
-
-SRCS+=	bm.c stpcpy.c stpncpy.c \
-	strcasecmp.c strncasecmp.c strcasestr.c strcoll.c strdup.c \
-	strerror.c strlcat.c strlcpy.c strnlen.c \
-	strmode.c strsignal.c strtok.c \
-	strtok_r.c strxfrm.c __strsignal.c strerror_r.c strndup.c \
-	stresep.c memrchr.c
-
-SRCS+=	bcmp.c bcopy.c bzero.c ffs.c memchr.c memcmp.c memset.c
-SRCS+=	strcat.c strcmp.c strcpy.c strcspn.c strlen.c
-SRCS+=	strncat.c strncmp.c strncpy.c strpbrk.c strsep.c
-SRCS+=	strspn.c strstr.c swab.c strnstr.c
-SRCS+=	explicit_memset.c consttime_memequal.c
-
-SRCS+=	memccpy.c memcpy.c memmem.c memmove.c
-SRCS+=	strchr.c strrchr.c
-SRCS+=	popcount32.c popcount64.c
-
-# wide char
-SRCS+=	wcscat.c wcschr.c wcscmp.c wcscpy.c wcscspn.c wcslcat.c wcslcpy.c \
-	wcslen.c wcsncat.c wcscasecmp.c wcsdup.c wcsncasecmp.c \
-	wcsncmp.c wcsncpy.c wcspbrk.c wcsrchr.c wcsspn.c wcsstr.c wcstok.c \
-	wcswcs.c wmemchr.c wmemcmp.c wmemcpy.c wmemmove.c wmemset.c
-CPPFLAGS.wcscmp.c+=	-I${LIBCDIR}/locale
-CPPFLAGS.wcsncmp.c+=	-I${LIBCDIR}/locale
-CPPFLAGS.wmemcmp.c+=	-I${LIBCDIR}/locale
-
-.include "${ARCHDIR}/string/Makefile.inc"
-
-MAN+=	bm.3 bcmp.3 bcopy.3 bstring.3 bzero.3 consttime_memequal.3 \
-	explicit_memset.3 ffs.3 index.3 \
-	memccpy.3 memchr.3 memcmp.3 memcpy.3 memmem.3 memmove.3	memset.3 \
-	popcount.3 \
-	rindex.3 strcasecmp.3 strcat.3 strchr.3 strcmp.3 strcoll.3 \
-	strcpy.3 strcspn.3 strdup.3 strerror.3 string.3 strings.3 strlcpy.3 \
-	strlen.3 strmode.3 strpbrk.3 strrchr.3 strsep.3 \
-	strsignal.3 strspn.3 strstr.3 strtok.3 strxfrm.3 \
-	swab.3 wcstok.3 wcswidth.3 wmemchr.3 wcsdup.3 wcscasecmp.3
-
-MLINKS+=bm.3 bm_comp.3 bm.3 bm_exec.3 bm.3 bm_free.3
-MLINKS+=popcount.3 popcountl.3
-MLINKS+=popcount.3 popcountll.3
-MLINKS+=popcount.3 popcount32.3
-MLINKS+=popcount.3 popcount64.3
-MLINKS+=strcasecmp.3 strncasecmp.3
-MLINKS+=strcat.3 strncat.3
-MLINKS+=strcmp.3 strncmp.3
-MLINKS+=strcpy.3 strncpy.3 strcpy.3 stpcpy.3 strcpy.3 stpncpy.3
-MLINKS+=strlcpy.3 strlcat.3
-MLINKS+=strlen.3 strnlen.3
-MLINKS+=strstr.3 strcasestr.3
-MLINKS+=strstr.3 strnstr.3
-MLINKS+=memchr.3 memrchr.3
-MLINKS+=strtok.3 strtok_r.3
-MLINKS+=strerror.3 strerror_r.3 strerror.3 perror.3 \
-	strerror.3 sys_errlist.3 strerror.3 sys_nerr.3
-MLINKS+=strdup.3 strndup.3
-MLINKS+=strsep.3 stresep.3
-MLINKS+=wmemchr.3 wmemcmp.3 wmemchr.3 wmemcpy.3 \
-	wmemchr.3 wmemmove.3 wmemchr.3 wmemset.3 \
-	wmemchr.3 wcscat.3 wmemchr.3 wcschr.3 \
-	wmemchr.3 wcscmp.3 wmemchr.3 wcscpy.3 \
-	wmemchr.3 wcscspn.3 wmemchr.3 wcslcat.3 \
-	wmemchr.3 wcslcpy.3 wmemchr.3 wcslen.3 \
-	wmemchr.3 wcsncat.3 wmemchr.3 wcsncmp.3 \
-	wmemchr.3 wcsncpy.3 wmemchr.3 wcspbrk.3 \
-	wmemchr.3 wcsrchr.3 wmemchr.3 wcsspn.3 \
-	wmemchr.3 wcsstr.3 wmemchr.3 wcswcs.3
-MLINKS+=wcscasecmp.3 wcsncasecmp.3
diff --git a/lib/libc/string/__strsignal.c b/lib/libc/string/__strsignal.c
deleted file mode 100644
index 3d874667b..000000000
--- a/lib/libc/string/__strsignal.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*	$NetBSD: __strsignal.c,v 1.25 2012/03/20 17:44:18 matt Exp $	*/
-
-/*
- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)strerror.c	5.6 (Berkeley) 5/4/91";
-#else
-__RCSID("$NetBSD: __strsignal.c,v 1.25 2012/03/20 17:44:18 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#ifdef NLS
-#include <limits.h>
-#include <nl_types.h>
-#endif
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include "extern.h"
-#include <signal.h>
-#ifndef SIGRTMIN	/* XXX: Until we remove the #ifdef _KERNEL */
-#define SIGRTMIN	33
-#define SIGRTMAX	63
-#endif
-
-/* ARGSUSED */
-const char *
-__strsignal(int num, char *buf, size_t buflen)
-{
-#define	UPREFIX	"Unknown signal: %u"
-#define RPREFIX "Real time signal %u"
-	unsigned int signum;
-
-#ifdef NLS
-	nl_catd catd ;
-	catd = catopen("libc", NL_CAT_LOCALE);
-#endif
-
-	_DIAGASSERT(buf != NULL);
-
-	signum = num;				/* convert to unsigned */
-	if (signum < (unsigned int) sys_nsig) {
-#ifdef NLS
-		(void)strlcpy(buf, catgets(catd, 2, (int)signum,
-		    sys_siglist[signum]), buflen); 
-#else
-		return((char *)sys_siglist[signum]);
-#endif
-	} else if (signum >= SIGRTMIN && signum <= SIGRTMAX) {
-#ifdef NLS
-		(void)snprintf(buf, buflen, 
-	            catgets(catd, 2, SIGRTMIN, RPREFIX), signum);
-#else
-		(void)snprintf(buf, buflen, RPREFIX, signum);
-#endif
-	} else {
-#ifdef NLS
-		(void)snprintf(buf, buflen, 
-	            catgets(catd, 1, 0xffff, UPREFIX), signum);
-#else
-		(void)snprintf(buf, buflen, UPREFIX, signum);
-#endif
-	}
-
-#ifdef NLS
-	catclose(catd);
-#endif
-
-	return buf;
-}
diff --git a/lib/libc/string/bcmp.3 b/lib/libc/string/bcmp.3
deleted file mode 100644
index c78c2571a..000000000
--- a/lib/libc/string/bcmp.3
+++ /dev/null
@@ -1,90 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)bcmp.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: bcmp.3,v 1.14 2012/05/05 21:24:19 dholland Exp $
-.\"
-.Dd May 5, 2012
-.Dt BCMP 3
-.Os
-.Sh NAME
-.Nm bcmp
-.Nd compare byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft int
-.Fn bcmp "const void *b1" "const void *b2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn bcmp
-function
-compares byte string
-.Fa b1
-against byte string
-.Fa b2 ,
-returning zero if they are identical, non-zero otherwise.
-Both strings are assumed to be
-.Fa len
-bytes long.
-Zero-length strings are always identical.
-.Pp
-The strings may overlap.
-.Pp
-This function is obsolete.
-The equivalent function
-.Xr memcmp 3
-should be used instead.
-.Sh SEE ALSO
-.Xr memcmp 3 ,
-.Xr strcasecmp 3 ,
-.Xr strcmp 3 ,
-.Xr strcoll 3 ,
-.Xr strxfrm 3
-.Sh STANDARDS
-The
-.Fn bcmp
-function conforms to
-.St -p1003.1-2001 .
-The
-.St -p1003.1-2004
-revision marked it as legacy and recommended the use of
-.Xr memcmp 3
-instead.
-The
-.St -p1003.1-2008
-revision removed
-.Fn bcmp
-from the specification.
-.Sh HISTORY
-A
-.Fn bcmp
-function first appeared in
-.Bx 4.2 .
diff --git a/lib/libc/string/bcopy.3 b/lib/libc/string/bcopy.3
deleted file mode 100644
index d806a0079..000000000
--- a/lib/libc/string/bcopy.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)bcopy.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: bcopy.3,v 1.15 2015/06/20 04:18:00 dholland Exp $
-.\"
-.Dd May 5, 2012
-.Dt BCOPY 3
-.Os
-.Sh NAME
-.Nm bcopy
-.Nd copy byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft void
-.Fn bcopy "const void *src" "void *dst" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn bcopy
-function
-copies
-.Fa len
-bytes from string
-.Fa src
-to string
-.Fa dst .
-The two strings may overlap.
-If
-.Fa len
-is zero, no bytes are copied.
-.Pp
-This function is obsolete.
-The functions
-.Xr memcpy 3
-and/or
-.Xr memmove 3
-should be used instead.
-Note that
-.Fn bcopy
-takes its
-.Fa src
-and
-.Fa dst
-arguments in the opposite order from these.
-.Sh SEE ALSO
-.Xr memccpy 3 ,
-.Xr memcpy 3 ,
-.Xr memmove 3 ,
-.Xr strcpy 3 ,
-.Xr strncpy 3
-.Sh STANDARDS
-The
-.Fn bcopy
-function conforms to
-.St -p1003.1-2001 .
-The
-.St -p1003.1-2004
-revision marked it as legacy; the
-.St -p1003.1-2008
-revision removed it from the specification.
-.Sh HISTORY
-A
-.Fn bcopy
-function appeared in
-.Bx 4.2 .
diff --git a/lib/libc/string/bm.3 b/lib/libc/string/bm.3
deleted file mode 100644
index d5d3c8f07..000000000
--- a/lib/libc/string/bm.3
+++ /dev/null
@@ -1,114 +0,0 @@
-.\" $NetBSD: bm.3,v 1.8 2006/10/16 08:48:45 wiz Exp $
-.\"
-.\" Copyright (c) 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Andrew Hume of AT&T Bell Laboratories.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"	from: @(#)bm.3	8.4 (Berkeley) 6/21/94
-.\"
-.Dd April 8, 2001
-.Dt BM 3
-.Os
-.Sh NAME
-.Nm bm_comp ,
-.Nm bm_exec ,
-.Nm bm_free
-.Nd Boyer-Moore string search
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In bm.h
-.Ft bm_pat *
-.Fn bm_comp "u_char *pattern" "size_t patlen" "u_char freq[256]"
-.Ft u_char *
-.Fn bm_exec "bm_pat *pdesc" "u_char *text" "size_t len"
-.Ft void
-.Fn bm_free "bm_pat *pdesc"
-.Sh DESCRIPTION
-These routines implement an efficient mechanism to find an
-occurrence of a byte string within another byte string.
-.Pp
-.Fn bm_comp
-evaluates the
-.Fa patlen
-bytes starting at
-.Fa pattern ,
-and returns a pointer to a structure describing them.
-The bytes referenced by
-.Fa pattern
-may be of any value.
-.Pp
-The search takes advantage of the frequency distribution of the
-bytes in the text to be searched.
-If specified,
-.Fa freq
-should be an array of 256 values,
-with higher values indicating that the corresponding character occurs
-more frequently.
-(A less than optimal frequency distribution can only result in less
-than optimal performance, not incorrect results.)
-If
-.Fa freq
-is
-.Dv NULL ,
-a system default table is used.
-.Pp
-.Fn bm_exec
-returns a pointer to the leftmost occurrence of the string given to
-.Fn bm_comp
-within
-.Fa text ,
-or
-.Dv NULL
-if none occurs.
-The number of bytes in
-.Fa text
-must be specified by
-.Fa len .
-.Pp
-Space allocated for the returned description is discarded
-by calling
-.Fn bm_free
-with the returned description as an argument.
-.Pp
-The asymptotic speed of
-.Fn bm_exec
-is O(len/patlen).
-.Sh SEE ALSO
-.Xr regexp 3 ,
-.Xr strstr 3
-.Rs
-.%A Hume and Sunday
-.%D November 1991
-.%J "Software Practice and Experience"
-.%P pp. 1221-48
-.%T "Fast String Searching"
-.%V Vol. 21, 11
-.Re
diff --git a/lib/libc/string/bm.c b/lib/libc/string/bm.c
deleted file mode 100644
index 5e678e6b9..000000000
--- a/lib/libc/string/bm.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*	$NetBSD: bm.c,v 1.13 2014/06/23 10:43:25 shm Exp $	*/
-
-/*-
- * Copyright (c) 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Andrew Hume of AT&T Bell Laboratories.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bm.c	8.7 (Berkeley) 6/21/94";
-#else
-__RCSID("$NetBSD: bm.c,v 1.13 2014/06/23 10:43:25 shm Exp $");
-#endif
-#endif /* LIBC_SCCS && not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <assert.h>
-#include <bm.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(bm_comp,_bm_comp)
-__weak_alias(bm_exec,_bm_exec)
-__weak_alias(bm_free,_bm_free)
-#endif
-
-/* 
- * XXX
- * The default frequency table starts at 99 and counts down.  The default
- * table should probably be oriented toward text, and will necessarily be
- * locale specific.  This one is for English.  It was derived from the
- * OSF/1 and 4.4BSD formatted and unformatted manual pages, and about 100Mb
- * of email and random text.  Change it if you can find something better.
- */
-static u_char const freq_def[256] = {
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0, 77, 90,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	99, 28, 42, 27, 16, 14, 20, 51,
-	66, 65, 59, 24, 75, 76, 84, 56,
-	72, 74, 64, 55, 54, 47, 41, 37,
-	44, 61, 70, 43, 23, 53, 49, 22,
-	33, 58, 40, 46, 45, 57, 60, 26,
-	30, 63, 21, 12, 32, 50, 38, 39,
-	34, 11, 48, 67, 62, 35, 15, 29,
-	71, 18,  9, 17, 25, 13, 10, 52,
-	36, 95, 78, 86, 87, 98, 82, 80,
-	88, 94, 19, 68, 89, 83, 93, 96,
-	81,  7, 91, 92, 97, 85, 69, 73,
-	31, 79,  8,  5,  4,  6,  3,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,
-};
-
-bm_pat *
-bm_comp(u_char const *pb, size_t len, u_char const *freq)
-{
-	u_char const *pe, *p;
-	size_t *d, r;
-	int j;
-	int sv_errno;
-	bm_pat *pat;
-
-	_DIAGASSERT(pb != NULL);
-	/* freq may be NULL */
-
-	if (len == 0) {
-		errno = EINVAL;
-		return (NULL);
-	}
-	if ((pat = malloc(sizeof(*pat))) == NULL)
-		return (NULL);
-	pat->pat = NULL;
-	pat->delta = NULL;
-
-	pat->patlen = len;			/* copy pattern */
-	if ((pat->pat = malloc(pat->patlen)) == NULL)
-		goto mem;
-	memcpy(pat->pat, pb, pat->patlen);
-						/* get skip delta */
-	if ((pat->delta = malloc(256 * sizeof(*d))) == NULL)
-		goto mem;
-	for (j = 0, d = pat->delta; j < 256; j++)
-		d[j] = pat->patlen;
-	for (pe = pb + pat->patlen - 1; pb <= pe; pb++)
-		d[*pb] = pe - pb;
-
-	if (freq == NULL)			/* default freq table */
-		freq = freq_def;
-	r = 0;					/* get guard */
-	for (pb = pat->pat, pe = pb + pat->patlen - 1; pb < pe; pb++)
-		if (freq[*pb] < freq[pat->pat[r]])
-			r = pb - pat->pat;
-	pat->rarec = pat->pat[r];
-	pat->rareoff = r - (pat->patlen - 1);
-
-						/* get md2 shift */
-	for (pe = pat->pat + pat->patlen - 1, p = pe - 1; p >= pat->pat; p--)
-		if (*p == *pe)
-			break;
-
-	/* *p is first leftward reoccurrence of *pe */
-	pat->md2 = pe - p;
-	return (pat);
-
-mem:	sv_errno = errno;
-	bm_free(pat);
-	errno = sv_errno;
-	return (NULL);
-}
-
-void
-bm_free(bm_pat *pat)
-{
-
-	_DIAGASSERT(pat != NULL);
-
-	free(pat->pat);
-	free(pat->delta);
-	free(pat);
-}
-
-u_char *
-bm_exec(bm_pat *pat, u_char *base, size_t n)
-{
-	u_char *e, *ep, *p, *q, *s;
-	size_t *d0, k, md2, n1, ro;
-	int rc;
-
-	_DIAGASSERT(pat != NULL);
-	_DIAGASSERT(base != NULL);
-
-	if (n == 0)
-		return (NULL);
-
-	d0 = pat->delta;
-	n1 = pat->patlen - 1;
-	md2 = pat->md2;
-	ro = pat->rareoff;
-	rc = pat->rarec;
-	ep = pat->pat + pat->patlen - 1;
-	s = base + (pat->patlen - 1);
-
-	/* fast loop up to n - 3 * patlen */
-	e = base + n - 3 * pat->patlen;
-	while (s < e) {
-		k = d0[*s];		/* ufast skip loop */
-		while (k && s < e) {
-			k = d0[*(s += k)];
-			k = d0[*(s += k)];
-		}
-		if (s >= e)
-			break;
-		if (s[ro] != rc)	/* guard test */
-			goto mismatch1;
-					/* fwd match */
-		for (p = pat->pat, q = s - n1; p < ep;)
-			if (*q++ != *p++)
-				goto mismatch1;
-		return (s - n1);
-
-mismatch1:	s += md2;		/* md2 shift */
-	}
-
-	/* slow loop up to end */
-	e = base + n;
-	while (s < e) {
-		s += d0[*s];		/* step */
-		if (s >= e)
-			break;
-		if (s[ro] != rc)	/* guard test */
-			goto mismatch2;
-					/* fwd match */
-		for (p = pat->pat, q = s - n1; p <= ep;)
-			if (*q++ != *p++)
-				goto mismatch2;
-		return (s - n1);
-
-mismatch2:	s += md2;		/* md2 shift */
-	}
-
-	return (NULL);
-}
diff --git a/lib/libc/string/bstring.3 b/lib/libc/string/bstring.3
deleted file mode 100644
index b85ef8f84..000000000
--- a/lib/libc/string/bstring.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)bstring.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: bstring.3,v 1.11 2007/02/17 09:04:57 wiz Exp $
-.\"
-.Dd February 9, 2007
-.Dt BSTRING 3
-.Os
-.Sh NAME
-.Nm memccpy ,
-.Nm memchr ,
-.Nm memcmp ,
-.Nm memcpy ,
-.Nm memmem ,
-.Nm memmove ,
-.Nm memset
-.Nd byte string operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memchr "const void *b" "int c" "size_t len"
-.Ft int
-.Fn memcmp "const void *b1" "const void *b2" "size_t len"
-.Ft void *
-.Fn memccpy "void *dst" "const void *src" "int c" "size_t len"
-.Ft void *
-.Fn memcpy "void *dst" "const void *src" "size_t len"
-.Ft void *
-.Fn memmem "const void *block" "size_t blen" "const void *pat" "size_t plen"
-.Ft void *
-.Fn memmove "void *dst" "const void *src" "size_t len"
-.Ft void *
-.Fn memset "void *b" "int c" "size_t len"
-.Sh DESCRIPTION
-These functions operate on variable length strings of bytes.
-They do not check for terminating nul bytes as the routines
-listed in
-.Xr string 3
-do.
-.Pp
-See the specific manual pages for more information.
-.Sh SEE ALSO
-.Xr memccpy 3 ,
-.Xr memchr 3 ,
-.Xr memcmp 3 ,
-.Xr memcpy 3 ,
-.Xr memmem 3 ,
-.Xr memmove 3 ,
-.Xr memset 3
-.Sh STANDARDS
-The functions
-.Fn memchr ,
-.Fn memcmp ,
-.Fn memcpy ,
-.Fn memmove ,
-and
-.Fn memset
-conform to
-.St -ansiC .
-.Sh HISTORY
-The function
-.Fn memccpy
-appeared in
-.Bx 4.3 .
diff --git a/lib/libc/string/bzero.3 b/lib/libc/string/bzero.3
deleted file mode 100644
index b47d5b883..000000000
--- a/lib/libc/string/bzero.3
+++ /dev/null
@@ -1,82 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)bzero.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: bzero.3,v 1.13 2010/04/29 06:54:26 jruoho Exp $
-.\"
-.Dd April 29, 2010
-.Dt BZERO 3
-.Os
-.Sh NAME
-.Nm bzero
-.Nd write zeroes to a byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft void
-.Fn bzero "void *b" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn bzero
-function
-writes
-.Fa len
-zero bytes to the string
-.Fa b .
-If
-.Fa len
-is zero,
-.Fn bzero
-does nothing.
-.Sh SEE ALSO
-.Xr memset 3 ,
-.Xr swab 3
-.Sh STANDARDS
-The
-.Fn bzero
-function conforms to
-.St -p1003.1-2001 .
-The
-.St -p1003.1-2004
-revision marked it as legacy and recommended the use of
-.Xr memset 3
-instead.
-The
-.St -p1003.1-2008
-revision removed
-.Fn bzero
-from the specification.
-.Sh HISTORY
-A
-.Fn bzero
-function
-appeared in
-.Bx 4.3 .
diff --git a/lib/libc/string/consttime_memequal.3 b/lib/libc/string/consttime_memequal.3
deleted file mode 100644
index 6af5a101b..000000000
--- a/lib/libc/string/consttime_memequal.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\"	$NetBSD: consttime_memequal.3,v 1.5 2015/03/23 07:41:16 apb Exp $
-.\"
-.\" Copyright (c) 2013 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This documentation is derived from text contributed to The NetBSD
-.\" Foundation by Taylor R. 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd March 23, 2015
-.Dt CONSTTIME_MEMEQUAL 3
-.Os
-.Sh NAME
-.Nm consttime_memequal
-.Nd compare byte strings for equality without timing leaks
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft int
-.Fn consttime_memequal "void *b1" "void *b2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn consttime_memequal
-function compares
-.Fa len
-bytes of memory at
-.Fa b1
-and
-.Fa b2
-for equality, returning 0 if they are distinct and 1 if they are
-identical.
-.Pp
-The time taken by
-.Fn consttime_memequal
-depends on
-.Fa len ,
-but not on the data at
-.Fa b1
-or
-.Fa b2 .
-Thus,
-.Fn consttime_memequal
-is appropriate for comparing cryptographic secrets, hashes, message
-authentication codes, etc., without leaking information about them
-through a timing side channel.
-In crypto literature,
-.Fn consttime_memequal
-is said to take
-.Sq constant time ,
-meaning time that does not vary depending on the data it processes.
-.Pp
-Note that unlike
-.Xr memcmp 3 ,
-.Fn consttime_memequal
-does not return a lexicographic ordering on the data at
-.Fa b1
-and
-.Fa b2 ;
-it tells only whether they are equal.
-.Nx
-does not provide a
-.Fn consttime_memcmp
-function, because all known use cases that require
-.Sq constant time
-memory comparison also require only comparison for equality,
-not lexicographic ordering.
-.Sh SEE ALSO
-.Xr explicit_memset 3 ,
-.Xr memcmp 3
-.Sh HISTORY
-The
-.Fn consttime_memequal
-function appeared in
-.Nx 7.0 .
diff --git a/lib/libc/string/explicit_memset.3 b/lib/libc/string/explicit_memset.3
deleted file mode 100644
index 21a81b84b..000000000
--- a/lib/libc/string/explicit_memset.3
+++ /dev/null
@@ -1,82 +0,0 @@
-.\"	$NetBSD: explicit_memset.3,v 1.2 2013/08/28 15:46:23 riastradh Exp $
-.\"
-.\" Copyright (c) 2013 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This documentation is derived from text contributed to The NetBSD
-.\" Foundation by Taylor R. 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd August 28, 2013
-.Dt EXPLICIT_MEMSET 3
-.Os
-.Sh NAME
-.Nm explicit_memset
-.Nd guarantee writing a byte to a byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn explicit_memset "void *b" "int c" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn explicit_memset
-function writes
-.Fa len
-bytes of value
-.Fa c
-(converted to an unsigned char) to the string
-.Fa b .
-It is guaranteed not to be optimized away by the compiler even if
-.Fa b
-is no longer used and is about to be freed or go out of scope.
-.Sh RETURN VALUES
-The
-.Fn explicit_memset
-function returns the original value of
-.Fa b .
-.Sh EXAMPLES
-Create a buffer on the stack for a secret key, use it, and then zero it
-in memory before throwing it away.
-.Bd -literal -offset indent
-void
-f(void)
-{
-	uint8_t key[32];
-
-	crypto_random(key, sizeof(key));
-	do_crypto_stuff(key, sizeof(key));
-	\&...
-
-	explicit_memset(key, 0, sizeof(key));
-}
-.Ed
-.Sh SEE ALSO
-.Xr consttime_memequal 3 ,
-.Xr memset 3
-.Sh HISTORY
-The
-.Fn explicit_memset
-function appeared in
-.Nx 7.0 .
diff --git a/lib/libc/string/ffs.3 b/lib/libc/string/ffs.3
deleted file mode 100644
index 5d6bcc538..000000000
--- a/lib/libc/string/ffs.3
+++ /dev/null
@@ -1,74 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)ffs.3	8.2 (Berkeley) 4/19/94
-.\"	$NetBSD: ffs.3,v 1.13 2010/04/28 07:47:09 jruoho Exp $
-.\"
-.Dd April 28, 2010
-.Dt FFS 3
-.Os
-.Sh NAME
-.Nm ffs
-.Nd find first bit set in a bit string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft int
-.Fn ffs "int value"
-.Sh DESCRIPTION
-The
-.Fn ffs
-function finds the first bit set in
-.Fa value
-and returns the index of that bit.
-Bits are numbered starting from 1, starting at the right-most
-bit.
-A return value of 0 means that the argument was zero.
-.Sh SEE ALSO
-.Xr bitstring 3 ,
-.Xr ffs32 3 ,
-.Xr popcount 3
-.Sh STANDARDS
-The
-.Fn ffs
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn ffs
-function appeared in
-.Bx 4.3 .
-The prototype for it existed previously in the
-.In string.h
-header before it was moved to
-.In strings.h
-for
-.Tn POSIX
-compliance.
diff --git a/lib/libc/string/index.3 b/lib/libc/string/index.3
deleted file mode 100644
index a1a0f41e3..000000000
--- a/lib/libc/string/index.3
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)index.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: index.3,v 1.15 2012/05/05 21:18:43 dholland Exp $
-.\"
-.Dd May 5, 2012
-.Dt INDEX 3
-.Os
-.Sh NAME
-.Nm index
-.Nd locate character in string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft char *
-.Fn index "const char *s" "int c"
-.Sh DESCRIPTION
-The
-.Fn index
-function
-locates the first character matching
-.Fa c
-(converted to a
-.Em char )
-in the nul-terminated string
-.Fa s .
-.Pp
-This function is obsolete.
-The equivalent function
-.Xr strchr 3
-should be used instead.
-.Sh RETURN VALUES
-A pointer to the character is returned if it is found; otherwise
-.Dv NULL
-is returned.
-If
-.Fa c
-is '\e0',
-.Fn index
-locates the terminating '\e0'.
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr rindex 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3
-.Sh STANDARDS
-The
-.Fn index
-function conforms to
-.St -p1003.1-2001 .
-The
-.St -p1003.1-2004
-revision marked it as legacy and recommended the use of
-.Xr strchr 3
-instead.
-The
-.St -p1003.1-2008
-revision removed
-.Fn index
-from the specification.
-.Sh HISTORY
-An
-.Fn index
-function appeared in
-.At v6 .
diff --git a/lib/libc/string/index.c b/lib/libc/string/index.c
deleted file mode 100644
index 6258e6b77..000000000
--- a/lib/libc/string/index.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: index.c,v 1.15 2005/12/20 19:31:50 christos Exp $	*/
-#define INDEX
-#include "strchr.c"
diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3
deleted file mode 100644
index 9f6b54e08..000000000
--- a/lib/libc/string/memccpy.3
+++ /dev/null
@@ -1,72 +0,0 @@
-.\" Copyright (c) 1990, 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. 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: @(#)memccpy.3	8.1 (Berkeley) 6/9/93
-.\"	$NetBSD: memccpy.3,v 1.10 2006/10/16 08:48:45 wiz Exp $
-.\"
-.Dd June 9, 1993
-.Dt MEMCCPY 3
-.Os
-.Sh NAME
-.Nm memccpy
-.Nd copy string until character found
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memccpy "void *dst" "const void *src" "int c" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memccpy
-function
-copies bytes from string
-.Fa src
-to string
-.Fa dst .
-If the character
-.Fa c
-(as converted to an unsigned char) occurs in the string
-.Fa src ,
-the copy stops and a pointer to the byte after the copy of
-.Fa c
-in the string
-.Fa dst
-is returned.
-Otherwise,
-.Fa len
-bytes are copied, and a null pointer is returned.
-.Sh SEE ALSO
-.Xr bcopy 3 ,
-.Xr memcpy 3 ,
-.Xr memmove 3 ,
-.Xr strcpy 3
-.Sh HISTORY
-The
-.Fn memccpy
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c
deleted file mode 100644
index c08624161..000000000
--- a/lib/libc/string/memccpy.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: memccpy.c,v 1.13 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)memccpy.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: memccpy.c,v 1.13 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <string.h>
-
-void *
-memccpy(void *t, const void *f, int c, size_t n)
-{
-
-	_DIAGASSERT(t != 0);
-	_DIAGASSERT(f != 0);
-
-	if (n) {
-		unsigned char *tp = t;
-		const unsigned char *fp = f;
-		unsigned char uc = c;
-		do {
-			if ((*tp++ = *fp++) == uc)
-				return (tp);
-		} while (--n != 0);
-	}
-	return (0);
-}
diff --git a/lib/libc/string/memchr.3 b/lib/libc/string/memchr.3
deleted file mode 100644
index cb3b96804..000000000
--- a/lib/libc/string/memchr.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)memchr.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: memchr.3,v 1.11 2009/04/10 23:24:35 wiz Exp $
-.\"
-.Dd April 10, 2009
-.Dt MEMCHR 3
-.Os
-.Sh NAME
-.Nm memchr ,
-.Nm memrchr
-.Nd locate byte in byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memchr "const void *b" "int c" "size_t len"
-.Ft void *
-.Fn memrchr "const void *b" "int c" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memchr
-function
-locates the first occurrence of
-.Fa c
-(converted to an unsigned char)
-in string
-.Fa b .
-The
-.Fn memrchr
-function
-locates the last occurrence of
-.Fa c
-(converted to an unsigned char)
-in string
-.Fa b .
-.Sh RETURN VALUES
-The
-.Fn memchr
-and
-.Fn memrchr
-functions
-return a pointer to the byte located, or
-.Dv NULL
-if no such byte exists within
-.Fa len
-bytes.
-.Sh SEE ALSO
-.Xr index 3 ,
-.Xr rindex 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3
-.Sh STANDARDS
-The
-.Fn memchr
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/string/memcmp.3 b/lib/libc/string/memcmp.3
deleted file mode 100644
index fec697f72..000000000
--- a/lib/libc/string/memcmp.3
+++ /dev/null
@@ -1,91 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)memcmp.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: memcmp.3,v 1.11 2013/06/24 04:21:20 riastradh Exp $
-.\"
-.Dd June 23, 2013
-.Dt MEMCMP 3
-.Os
-.Sh NAME
-.Nm memcmp
-.Nd compare byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft int
-.Fn memcmp "const void *b1" "const void *b2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memcmp
-function
-compares byte string
-.Fa b1
-against byte string
-.Fa b2 .
-Both strings are assumed to be
-.Fa len
-bytes long.
-.Sh RETURN VALUES
-The
-.Fn memcmp
-function
-returns zero if the two strings are identical,
-otherwise returns the difference between the first two differing bytes
-(treated as unsigned char values, so that
-.Sq Li \e200
-is greater than
-.Sq Li \&\e0 ,
-for example).
-Zero-length strings are always identical.
-.Pp
-Do not use
-.Fn memcmp
-to compare cryptographic secrets, because the time it takes varies
-depending on how many bytes are the same, and thus leaks information
-about the two strings by a timing side channel.
-To compare secrets, hashes, message authentication codes, etc., use
-.Xr consttime_memequal 3
-instead.
-.Sh SEE ALSO
-.Xr bcmp 3 ,
-.Xr consttime_memequal 3 ,
-.Xr strcasecmp 3 ,
-.Xr strcmp 3 ,
-.Xr strcoll 3 ,
-.Xr strxfrm 3
-.Sh STANDARDS
-The
-.Fn memcmp
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/string/memcpy.3 b/lib/libc/string/memcpy.3
deleted file mode 100644
index b432e32d4..000000000
--- a/lib/libc/string/memcpy.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)memcpy.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: memcpy.3,v 1.13 2003/09/08 17:54:33 wiz Exp $
-.\"
-.Dd June 4, 1993
-.Dt MEMCPY 3
-.Os
-.Sh NAME
-.Nm memcpy
-.Nd copy byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memcpy "void * restrict dst" "const void * restrict src" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memcpy
-function
-copies
-.Fa len
-bytes from string
-.Fa src
-to string
-.Fa dst .
-The arguments must not overlap -- behavior if the arguments overlap is
-undefined.
-To copy byte strings that overlap, use
-.Xr memmove 3 .
-.Sh RETURN VALUES
-The
-.Fn memcpy
-function
-returns the original value of
-.Fa dst .
-.Sh SEE ALSO
-.Xr bcopy 3 ,
-.Xr memccpy 3 ,
-.Xr memmove 3 ,
-.Xr strcpy 3
-.Sh STANDARDS
-The
-.Fn memcpy
-function
-conforms to
-.St -isoC-99 .
diff --git a/lib/libc/string/memmem.3 b/lib/libc/string/memmem.3
deleted file mode 100644
index 4a0387f64..000000000
--- a/lib/libc/string/memmem.3
+++ /dev/null
@@ -1,84 +0,0 @@
-.\"	$NetBSD: memmem.3,v 1.3 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2005 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Perry E. Metzger of Metzger, Dowdeswell & Co. LLC.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd March 12, 2005
-.Dt MEMMEM 3
-.Os
-.Sh NAME
-.Nm memmem
-.Nd locate substring in byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memmem "const void *block" "size_t blen" "const void *pat" "size_t plen"
-.Sh DESCRIPTION
-The
-.Fn memmem
-function locates the first occurrence of the binary string
-.Fa pat
-of size
-.Fa plen
-bytes in the byte string
-.Fa block
-of size
-.Fa blen
-bytes.
-.Sh RETURN VALUES
-The
-.Fn memmem
-function returns a pointer to the substring located, or
-.Dv NULL
-if no such substring exists within
-.Fa block .
-.Pp
-If
-.Fa plen
-is zero,
-.Fa block
-is returned, i.e. a zero length
-.Fa pat
-is deemed to match the start of the string, as with
-.Xr strstr 3 .
-.Sh SEE ALSO
-.Xr bm 3 ,
-.Xr memchr 3 ,
-.Xr strchr 3 ,
-.Xr strstr 3
-.Sh STANDARDS
-The
-.Fn memmem
-function is not currently standardized.
-However, it is meant to be API compatible with functions in
-.Fx
-and Linux.
-.Sh HISTORY
-.Fn memmem
-first appeared in the Free Software Foundation's glibc library.
diff --git a/lib/libc/string/memmem.c b/lib/libc/string/memmem.c
deleted file mode 100644
index ce49b1711..000000000
--- a/lib/libc/string/memmem.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*	$NetBSD: memmem.c,v 1.2 2008/04/28 20:23:00 martin Exp $	*/
-
-/*-
- * Copyright (c) 2005 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Perry E. Metzger of Metzger, Dowdeswell & Co. LLC.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: memmem.c,v 1.2 2008/04/28 20:23:00 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <assert.h>
-#include <string.h>
-#else
-#include <lib/libkern/libkern.h>
-#define _DIAGASSERT(x)	(void)0
-#define	NULL		((void *)0)
-#endif
-
-void *
-memmem(const void *block, size_t blen, const void *pat, size_t plen)
-{
-	const unsigned char *bp, *pp, *endp;
-
-	_DIAGASSERT(block != NULL);
-	_DIAGASSERT(pat != NULL);
-
-	/*
-	 * Following the precedent in ststr(3) and glibc, a zero
-	 * length pattern matches the start of block.
-	 */
-	if (plen == 0)
-		return __UNCONST(block);
-
-	if (blen < plen)
-		return NULL;
-
-	bp = block;
-	pp = pat;
-	endp = bp + (blen - plen) + 1;
-
-	/*
-	 * As a cheezy optimization, check that the first chars are
-	 * the same before calling memcmp. Really we should use bm(3)
-	 * to speed this up if blen is large enough.
-	 */
-	while (bp < endp) {
-		if ((*bp == *pp) && (memcmp(bp, pp, plen) == 0))
-			return __UNCONST(bp);
-		bp++;
-	}
-
-	return NULL;
-}
diff --git a/lib/libc/string/memmove.3 b/lib/libc/string/memmove.3
deleted file mode 100644
index 3c6099808..000000000
--- a/lib/libc/string/memmove.3
+++ /dev/null
@@ -1,74 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)memmove.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: memmove.3,v 1.8 2003/08/07 16:43:48 agc Exp $
-.\"
-.Dd June 4, 1993
-.Dt MEMMOVE 3
-.Os
-.Sh NAME
-.Nm memmove
-.Nd copy byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memmove "void *dst" "const void *src" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memmove
-function
-copies
-.Fa len
-bytes from string
-.Fa src
-to string
-.Fa dst .
-The two strings may overlap;
-the copy is always done in a non-destructive manner.
-.Sh RETURN VALUES
-The
-.Fn memmove
-function returns the original value of
-.Fa dst .
-.Sh SEE ALSO
-.Xr bcopy 3 ,
-.Xr memccpy 3 ,
-.Xr memcpy 3 ,
-.Xr strcpy 3
-.Sh STANDARDS
-The
-.Fn memmove
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/string/memrchr.c b/lib/libc/string/memrchr.c
deleted file mode 100644
index 92ef3289f..000000000
--- a/lib/libc/string/memrchr.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: memrchr.c,v 1.2 2009/04/11 21:42:16 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: memrchr.c,v 1.2 2009/04/11 21:42:16 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <string.h>
-
-void *
-memrchr(const void *s, int c, size_t n)
-{
-	_DIAGASSERT(s != NULL);
-
-	if (n != 0) {
-		const unsigned char *p = (const unsigned char *)s + n;
-		const unsigned char cmp = c;
-
-		do {
-			if (*--p == cmp)
-				return __UNCONST(p);
-		} while (--n != 0);
-	}
-	return NULL;
-}
diff --git a/lib/libc/string/memset.3 b/lib/libc/string/memset.3
deleted file mode 100644
index 5e86b8dc1..000000000
--- a/lib/libc/string/memset.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)memset.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: memset.3,v 1.12 2013/06/24 07:56:49 wiz Exp $
-.\"
-.Dd June 23, 2013
-.Dt MEMSET 3
-.Os
-.Sh NAME
-.Nm memset
-.Nd write a byte to byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memset "void *b" "int c" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memset
-function
-writes
-.Fa len
-bytes of value
-.Fa c
-(converted to an unsigned char) to the string
-.Fa b .
-.Sh RETURN VALUES
-The
-.Fn memset
-function
-returns the original value of
-.Fa b .
-.Pp
-Note that the compiler may optimize away a call to
-.Fn memset
-if it can prove that the string will not be used by the program again,
-for example if it is allocated on the stack and about to out of scope.
-If you want to guarantee that zeros are written to memory, for example
-to sanitize a buffer holding a cryptographic secret, use
-.Xr explicit_memset 3 .
-.Sh SEE ALSO
-.Xr bzero 3 ,
-.Xr explicit_memset 3 ,
-.Xr swab 3
-.Sh STANDARDS
-The
-.Fn memset
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/string/popcount.3 b/lib/libc/string/popcount.3
deleted file mode 100644
index fae5916bb..000000000
--- a/lib/libc/string/popcount.3
+++ /dev/null
@@ -1,71 +0,0 @@
-.\"	$NetBSD: popcount.3,v 1.5 2011/08/22 01:36:04 dholland Exp $
-.\"
-.\" Copyright (c) 2009 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Joerg Sonnenberger.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd August 22, 2011
-.Dt POPCOUNT 3
-.Os
-.Sh NAME
-.Nm popcount ,
-.Nm popcountl ,
-.Nm popcountll ,
-.Nm popcount32 ,
-.Nm popcount64
-.Nd count number of bits set in a bit string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft unsigned int
-.Fn popcount "unsigned int value"
-.Ft unsigned int
-.Fn popcountl "unsigned long value"
-.Ft unsigned int
-.Fn popcountll "unsigned long long value"
-.In stdint.h
-.Ft unsigned int
-.Fn popcount32 "uint32_t value"
-.Ft unsigned int
-.Fn popcount64 "uint64_t value"
-.Sh DESCRIPTION
-The
-.Nm
-functions returns the number of bits set in
-.Fa value .
-.Sh SEE ALSO
-.Xr ffs 3
-.Sh HISTORY
-The
-.Fn popcount ,
-.Fn popcountl ,
-.Fn popcountll ,
-.Fn popcount32 ,
-and
-.Fn popcount64
-functions appeared in
-.Nx 6.0 .
diff --git a/lib/libc/string/rindex.3 b/lib/libc/string/rindex.3
deleted file mode 100644
index 0b9b33f65..000000000
--- a/lib/libc/string/rindex.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)rindex.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: rindex.3,v 1.14 2012/05/05 21:18:43 dholland Exp $
-.\"
-.Dd May 5, 2012
-.Dt RINDEX 3
-.Os
-.Sh NAME
-.Nm rindex
-.Nd locate character in string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft char *
-.Fn rindex "const char *s" "int c"
-.Sh DESCRIPTION
-The
-.Fn rindex
-function
-locates the last character
-matching
-.Fa c
-(converted to a
-.Em char )
-in the nul-terminated string
-.Fa s .
-.Pp
-This function is obsolete.
-The equivalent function
-.Xr strrchr 3
-should be used instead.
-.Sh RETURN VALUES
-A pointer to the character is returned if it is found; otherwise
-.Dv NULL
-is returned.
-If
-.Fa c
-is
-.Ql \e0 ,
-.Fn rindex
-locates the terminating
-.Ql \e0 .
-.Sh SEE ALSO
-.Xr index 3 ,
-.Xr memchr 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3
-.Sh STANDARDS
-The
-.Fn rindex
-function conforms to
-.St -p1003.1-2001 .
-The
-.St -p1003.1-2004
-revision marked it as legacy and recommended the use of
-.Xr strrchr 3
-instead.
-The
-.St -p1003.1-2008
-revision removed
-.Fn rindex
-from the specification.
-.Sh HISTORY
-A
-.Fn rindex
-function appeared in
-.At v6 .
diff --git a/lib/libc/string/rindex.c b/lib/libc/string/rindex.c
deleted file mode 100644
index 1976d7304..000000000
--- a/lib/libc/string/rindex.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: rindex.c,v 1.15 2005/12/20 19:31:50 christos Exp $	*/
-#define RINDEX
-#include "strrchr.c"
diff --git a/lib/libc/string/stpcpy.c b/lib/libc/string/stpcpy.c
deleted file mode 100644
index 2b2d4075b..000000000
--- a/lib/libc/string/stpcpy.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: stpcpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $	*/
-
-/*
- * Copyright (c) 1999
- *	David E. O'Brien
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strcpy.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: stpcpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-/* FreeBSD: src/lib/libc/string/stpcpy.c,v 1.2 2009/02/28 06:05:37 das Exp */
-
-#include <string.h>
-
-#ifdef _FORTIFY_SOURCE
-#undef stpcpy
-#endif
-
-char *
-stpcpy(char * __restrict to, const char * __restrict from)
-{
-
-	for (; (*to = *from); ++from, ++to);
-	return(to);
-}
diff --git a/lib/libc/string/stpncpy.c b/lib/libc/string/stpncpy.c
deleted file mode 100644
index 9e3a4a147..000000000
--- a/lib/libc/string/stpncpy.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: stpncpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $	*/
-
-/*-
- * Copyright (c) 2009 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 <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: stpncpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $");
-#endif /* LIBC_SCCS and not lint */
-/* FreeBSD: src/lib/libc/string/stpncpy.c,v 1.1 2009/02/28 06:00:58 das Exp */
-
-#include <string.h>
-
-#ifdef _FORTIFY_SOURCE
-#undef stpncpy
-#endif
-
-char *
-stpncpy(char * __restrict dst, const char * __restrict src, size_t n)
-{
-
-	for (; n--; dst++, src++) {
-		if (!(*dst = *src)) {
-			char *ret = dst;
-			while (n--)
-				*++dst = '\0';
-			return (ret);
-		}
-	}
-	return (dst);
-}
diff --git a/lib/libc/string/strcasecmp.3 b/lib/libc/string/strcasecmp.3
deleted file mode 100644
index c38b2b523..000000000
--- a/lib/libc/string/strcasecmp.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strcasecmp.3	8.1 (Berkeley) 6/9/93
-.\"	$NetBSD: strcasecmp.3,v 1.17 2006/10/16 08:48:45 wiz Exp $
-.\"
-.Dd June 9, 1993
-.Dt STRCASECMP 3
-.Os
-.Sh NAME
-.Nm strcasecmp ,
-.Nm strncasecmp
-.Nd compare strings, ignoring case
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft int
-.Fn strcasecmp "const char *s1" "const char *s2"
-.Ft int
-.Fn strncasecmp "const char *s1" "const char *s2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn strcasecmp
-and
-.Fn strncasecmp
-functions
-compare the nul-terminated strings
-.Fa s1
-and
-.Fa s2
-and return an integer greater than, equal to, or less than 0,
-according to whether
-.Fa s1
-is lexicographically greater than, equal to, or less than
-.Fa s2
-after translation of each corresponding character to lower-case.
-The strings themselves are not modified.
-The comparison is done using unsigned characters, so that
-.Sq Li \e200
-is greater than
-.Ql \e0 .
-.Pp
-The
-.Fn strncasecmp
-compares at most
-.Fa len
-characters.
-.Sh SEE ALSO
-.Xr bcmp 3 ,
-.Xr memcmp 3 ,
-.Xr strcmp 3 ,
-.Xr strcoll 3 ,
-.Xr strxfrm 3
-.Sh HISTORY
-The
-.Fn strcasecmp
-and
-.Fn strncasecmp
-functions first appeared in
-.Bx 4.4 .
-.Sh NOTES
-If
-.Fa len
-is zero
-.Fn strncasecmp
-returns always 0.
diff --git a/lib/libc/string/strcasestr.c b/lib/libc/string/strcasestr.c
deleted file mode 100644
index f8a944453..000000000
--- a/lib/libc/string/strcasestr.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: strcasestr.c,v 1.3 2005/11/29 03:12:00 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strcasestr.c,v 1.3 2005/11/29 03:12:00 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <assert.h>
-#include <ctype.h>
-#include <string.h>
-
-/*
- * Find the first occurrence of find in s, ignore case.
- */
-char *
-strcasestr(const char *s, const char *find)
-{
-	char c, sc;
-	size_t len;
-
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(find != NULL);
-
-	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 __UNCONST(s);
-}
diff --git a/lib/libc/string/strcat.3 b/lib/libc/string/strcat.3
deleted file mode 100644
index 046b2ee70..000000000
--- a/lib/libc/string/strcat.3
+++ /dev/null
@@ -1,138 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strcat.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: strcat.3,v 1.16 2006/10/16 08:48:45 wiz Exp $
-.\"
-.Dd August 11, 2002
-.Dt STRCAT 3
-.Os
-.Sh NAME
-.Nm strcat ,
-.Nm strncat
-.Nd concatenate strings
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strcat "char * restrict s" "const char * restrict append"
-.Ft char *
-.Fn strncat "char * restrict s" "const char * restrict append" "size_t count"
-.Sh DESCRIPTION
-The
-.Fn strcat
-and
-.Fn strncat
-functions
-append a copy of the nul-terminated string
-.Fa append
-to the end of the nul-terminated string
-.Fa s ,
-then add a terminating
-.Ql \e0 .
-The string
-.Fa s
-must have sufficient space to hold the result.
-.Pp
-The
-.Fn strncat
-function
-appends not more than
-.Fa count
-characters where space for the terminating
-.Ql \e0
-should not be included in
-.Fa count .
-.Sh RETURN VALUES
-The
-.Fn strcat
-and
-.Fn strncat
-functions
-return the pointer
-.Fa s .
-.Sh EXAMPLES
-The following appends
-.Dq Li abc
-to
-.Dq Li chararray :
-.Bd -literal -offset indent
-char *letters = "abcdefghi";
-
-(void)strncat(chararray, letters, 3);
-.Ed
-.Pp
-The following example shows how to use
-.Fn strncat
-safely in conjunction with
-.Xr strncpy 3 .
-.Bd -literal -offset indent
-char buf[BUFSIZ];
-char *input, *suffix;
-
-(void)strncpy(buf, input, sizeof(buf) - 1);
-buf[sizeof(buf) - 1] = '\e0';
-(void)strncat(buf, suffix, sizeof(buf) - 1 - strlen(buf));
-.Ed
-.Pp
-The above will copy as many characters from
-.Dq Li input
-to
-.Dq Li buf
-as will fit.
-It then appends as many characters from suffix as will fit (or none
-if there is no space).
-For operations like this, the
-.Xr strlcpy 3
-and
-.Xr strlcat 3
-functions are a better choice, as shown below.
-.Bd -literal -offset indent
-(void)strlcpy(buf, input, sizeof(buf));
-(void)strlcat(buf, suffix, sizeof(buf));
-.Ed
-.Sh SEE ALSO
-.Xr bcopy 3 ,
-.Xr memccpy 3 ,
-.Xr memcpy 3 ,
-.Xr memmove 3 ,
-.Xr strcpy 3 ,
-.Xr strlcat 3 ,
-.Xr strlcpy 3
-.Sh STANDARDS
-The
-.Fn strcat
-and
-.Fn strncat
-functions
-conform to
-.St -isoC-99 .
diff --git a/lib/libc/string/strchr.3 b/lib/libc/string/strchr.3
deleted file mode 100644
index 0ebf60d37..000000000
--- a/lib/libc/string/strchr.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strchr.3	8.2 (Berkeley) 4/19/94
-.\"	$NetBSD: strchr.3,v 1.11 2003/08/07 16:43:49 agc Exp $
-.\"
-.Dd August 11, 2002
-.Dt STRCHR 3
-.Os
-.Sh NAME
-.Nm strchr
-.Nd locate character in string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strchr "const char *s" "int c"
-.Sh DESCRIPTION
-The
-.Fn strchr
-function locates the first occurrence of
-.Ar c
-in the string pointed to by
-.Ar s .
-The terminating
-.Dv NUL
-character is considered part of the string.
-If
-.Fa c
-is
-.Ql \e0 ,
-.Fn strchr
-locates the terminating
-.Ql \e0 .
-.Sh RETURN VALUES
-The function
-.Fn strchr
-returns a pointer to the located character, or
-.Dv NULL
-if the character does not appear in the string.
-.Sh EXAMPLES
-After the following call to
-.Fn strchr ,
-.Va p
-will point to the string
-.Qq oobar :
-.Bd -literal -offset indent
-char *p;
-char *s = "foobar";
-
-p = strchr(s, 'o');
-.Ed
-.Sh SEE ALSO
-.Xr index 3 ,
-.Xr memchr 3 ,
-.Xr rindex 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3
-.Sh STANDARDS
-The
-.Fn strchr
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/string/strcmp.3 b/lib/libc/string/strcmp.3
deleted file mode 100644
index bcafe26ca..000000000
--- a/lib/libc/string/strcmp.3
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strcmp.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: strcmp.3,v 1.13 2006/10/16 08:48:45 wiz Exp $
-.\"
-.Dd June 4, 1993
-.Dt STRCMP 3
-.Os
-.Sh NAME
-.Nm strcmp ,
-.Nm strncmp
-.Nd compare strings
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft int
-.Fn strcmp "const char *s1" "const char *s2"
-.Ft int
-.Fn strncmp "const char *s1" "const char *s2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn strcmp
-and
-.Fn strncmp
-functions
-lexicographically compare the nul-terminated strings
-.Fa s1
-and
-.Fa s2 .
-.Sh RETURN VALUES
-The
-.Fn strcmp
-and
-.Fn strncmp
-return an integer greater than, equal to, or less than 0, according
-to whether the string
-.Fa s1
-is greater than, equal to, or less than the string
-.Fa s2 .
-The comparison is done using unsigned characters, so that
-.Ql \e200
-is greater than
-.Ql \e0 .
-.Pp
-The
-.Fn strncmp
-compares not more than
-.Fa len
-characters.
-.Sh SEE ALSO
-.Xr bcmp 3 ,
-.Xr memcmp 3 ,
-.Xr strcasecmp 3 ,
-.Xr strcoll 3 ,
-.Xr strxfrm 3
-.Sh STANDARDS
-The
-.Fn strcmp
-and
-.Fn strncmp
-functions
-conform to
-.St -ansiC .
-.Sh NOTES
-If
-.Fa len
-is zero
-.Fn strncmp
-returns always 0.
diff --git a/lib/libc/string/strcoll.3 b/lib/libc/string/strcoll.3
deleted file mode 100644
index 79cfb138e..000000000
--- a/lib/libc/string/strcoll.3
+++ /dev/null
@@ -1,73 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strcoll.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: strcoll.3,v 1.10 2006/10/16 08:48:45 wiz Exp $
-.\"
-.Dd June 4, 1993
-.Dt STRCOLL 3
-.Os
-.Sh NAME
-.Nm strcoll
-.Nd compare strings according to current collation
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft int
-.Fn strcoll "const char *s1" "const char *s2"
-.Sh DESCRIPTION
-The
-.Fn strcoll
-function
-lexicographically compares the nul-terminated strings
-.Fa s1
-and
-.Fa s2
-according to the current locale collation
-and returns an integer greater than, equal to, or less than 0,
-according to whether
-.Fa s1
-is greater than, equal to, or less than
-.Fa s2 .
-.Sh SEE ALSO
-.Xr bcmp 3 ,
-.Xr memcmp 3 ,
-.Xr setlocale 3 ,
-.Xr strcasecmp 3 ,
-.Xr strcmp 3 ,
-.Xr strxfrm 3
-.Sh STANDARDS
-The
-.Fn strcoll
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c
deleted file mode 100644
index bcd26e3c1..000000000
--- a/lib/libc/string/strcoll.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: strcoll.c,v 1.12 2013/05/17 12:55:57 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strcoll.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: strcoll.c,v 1.12 2013/05/17 12:55:57 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <locale.h>
-#include <string.h>
-#include "setlocale_local.h"
-
-__weak_alias(strcoll_l, _strcoll_l)
-
-/*
- * Compare strings according to LC_COLLATE category of current locale.
- */
-int
-strcoll(const char *s1, const char *s2)
-{
-
-	return strcoll_l(s1, s2, _current_locale());
-}
-
-int
-strcoll_l(const char *s1, const char *s2, locale_t loc)
-{
-	_DIAGASSERT(s1 != NULL);
-	_DIAGASSERT(s2 != NULL);
-
-	/* LC_COLLATE is unimplemented, hence always "C" */
-	/* LINTED */ (void)loc;
-	return (strcmp(s1, s2));
-}
diff --git a/lib/libc/string/strcpy.3 b/lib/libc/string/strcpy.3
deleted file mode 100644
index 31aac3faf..000000000
--- a/lib/libc/string/strcpy.3
+++ /dev/null
@@ -1,226 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strcpy.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: strcpy.3,v 1.23 2015/04/01 20:18:17 riastradh Exp $
-.\"
-.Dd April 1, 2015
-.Dt STRCPY 3
-.Os
-.Sh NAME
-.Nm stpcpy ,
-.Nm stpncpy ,
-.Nm strcpy ,
-.Nm strncpy
-.Nd copy strings
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn stpcpy "char * restrict dst" "const char * restrict src"
-.Ft char *
-.Fn stpncpy "char * restrict dst" "const char * restrict src" "size_t len"
-.Ft char *
-.Fn strcpy "char * restrict dst" "const char * restrict src"
-.Ft char *
-.Fn strncpy "char * restrict dst" "const char * restrict src" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn stpcpy
-and
-.Fn strcpy
-functions
-copy the string
-.Fa src
-to
-.Fa dst
-(including the terminating
-.Ql \e0
-character).
-.Pp
-The
-.Fn stpncpy
-and
-.Fn strncpy
-functions copy at most
-.Fa len
-characters from
-.Fa src
-into
-.Fa dst .
-If
-.Fa src
-is less than
-.Fa len
-characters long,
-the remainder of
-.Fa dst
-is filled with
-.Ql \e0
-characters.
-Otherwise,
-.Fa dst
-is
-.Em not
-terminated.
-.Pp
-The strings
-.Fa src
-and
-.Fa dst
-may not overlap.
-.Sh RETURN VALUES
-The
-.Fn strcpy
-and
-.Fn strncpy
-functions
-return
-.Fa dst .
-The
-.Fn stpcpy
-and
-.Fn stpncpy
-functions return a pointer to the terminating
-.Ql \e0
-character of
-.Fa dst .
-If
-.Fn stpncpy
-does not terminate
-.Fa dst
-with a
-.Dv NUL
-character, it instead returns a pointer to
-.Li dst[len]
-(which does not necessarily refer to a valid memory location.)
-.Sh EXAMPLES
-The following sets
-.Va chararray
-to
-.Dq Li abc\e0\e0\e0 :
-.Bd -literal -offset indent
-char chararray[6];
-
-(void)strncpy(chararray, "abc", sizeof(chararray));
-.Ed
-.Pp
-The following sets
-.Va chararray
-to
-.Dq Li abcdef :
-.Bd -literal -offset indent
-char chararray[6];
-
-(void)strncpy(chararray, "abcdefgh", sizeof(chararray));
-.Ed
-.Pp
-Note that it does
-.Em not
-.Dv NUL Ns No -terminate
-.Va chararray
-because the length of the source string is greater than or equal
-to the length parameter.
-.Fn strncpy
-.Em only
-.Dv NUL Ns No -terminates
-the destination string when the length of the source
-string is less than the length parameter.
-.Pp
-The following copies as many characters from
-.Va input
-to
-.Va buf
-as will fit and
-.Dv NUL Ns No -terminates
-the result.
-Because
-.Fn strncpy
-does
-.Em not
-guarantee to
-.Dv NUL Ns No -terminate
-the string itself, this must be done explicitly.
-.Bd -literal -offset indent
-char buf[1024];
-
-(void)strncpy(buf, input, sizeof(buf) - 1);
-buf[sizeof(buf) - 1] = '\e0';
-.Ed
-.Pp
-This could be better and more simply achieved using
-.Xr strlcpy 3 ,
-as shown in the following example:
-.Bd -literal -offset indent
-(void)strlcpy(buf, input, sizeof(buf));
-.Ed
-.Pp
-Note that because
-.Xr strlcpy 3
-is not defined in any standards, it should
-only be used when portability is not a concern.
-.Sh SEE ALSO
-.Xr bcopy 3 ,
-.Xr memccpy 3 ,
-.Xr memcpy 3 ,
-.Xr memmove 3 ,
-.Xr strlcpy 3 ,
-.Xr wcscpy 3
-.Sh STANDARDS
-The
-.Fn strcpy
-and
-.Fn strncpy
-functions
-conform to
-.St -isoC-99 .
-The
-.Fn stpcpy
-and
-.Fn stpncpy
-functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn stpcpy
-and
-.Fn stpncpy
-functions first appeared in
-.Nx 6.0 .
-.Sh SECURITY CONSIDERATIONS
-The
-.Fn strcpy
-and
-.Fn stpcpy
-functions are easily misused in a manner which enables malicious users
-to arbitrarily change a running program's functionality through a
-buffer overflow attack.
diff --git a/lib/libc/string/strcspn.3 b/lib/libc/string/strcspn.3
deleted file mode 100644
index 3f5301509..000000000
--- a/lib/libc/string/strcspn.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strcspn.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: strcspn.3,v 1.10 2006/10/16 08:48:45 wiz Exp $
-.\"
-.Dd August 11, 2002
-.Dt STRCSPN 3
-.Os
-.Sh NAME
-.Nm strcspn
-.Nd span the complement of a string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft size_t
-.Fn strcspn "const char *s" "const char *charset"
-.Sh DESCRIPTION
-The
-.Fn strcspn
-function
-spans the initial part of the nul-terminated string
-.Fa s
-as long as the characters from
-.Fa s
-do not occur in string
-.Fa charset
-(it
-spans the
-.Em complement
-of
-.Fa charset ) .
-.Sh RETURN VALUES
-The
-.Fn strcspn
-function
-returns the number of characters spanned.
-.Sh EXAMPLES
-The following call to
-.Fn strcspn
-will return 3, since the first three characters of string
-.Fa s
-do not occur in string
-.Fa charset :
-.Bd -literal -offset indent
-char *s = "foobar";
-char *charset = "bar";
-size_t span;
-
-span = strcspn(s, charset);
-.Ed
-.Sh SEE ALSO
-.Xr index 3 ,
-.Xr memchr 3 ,
-.Xr rindex 3 ,
-.Xr strchr 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3
-.Sh STANDARDS
-The
-.Fn strcspn
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/string/strdup.3 b/lib/libc/string/strdup.3
deleted file mode 100644
index baab9a6e7..000000000
--- a/lib/libc/string/strdup.3
+++ /dev/null
@@ -1,109 +0,0 @@
-.\" Copyright (c) 1990, 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. 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: @(#)strdup.3	8.1 (Berkeley) 6/9/93
-.\"	$NetBSD: strdup.3,v 1.18 2009/01/29 10:15:39 wiz Exp $
-.\"
-.Dd January 28, 2009
-.Dt STRDUP 3
-.Os
-.Sh NAME
-.Nm strdup ,
-.Nm strndup
-.Nd save a copy of a string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strdup "const char *str"
-.Ft char *
-.Fn strndup "const char *str" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn strdup
-function
-allocates sufficient memory for a copy
-of the string
-.Fa str ,
-does the copy, and returns a pointer to it.
-The pointer may subsequently be used as an
-argument to the function
-.Xr free 3 .
-.Pp
-If insufficient memory is available,
-.Dv NULL
-is returned.
-.Pp
-The
-.Fn strndup
-function copies at most
-.Fa len
-characters from the string
-.Fa str
-always
-.Dv NUL
-terminating the copied string.
-.Sh EXAMPLES
-The following will point
-.Va p
-to an allocated area of memory containing the nul-terminated string
-.Qq foobar :
-.Bd -literal -offset indent
-char *p;
-
-if ((p = strdup("foobar")) == NULL) {
-	fprintf(stderr, "Out of memory.\en");
-	exit(1);
-}
-.Ed
-.Sh ERRORS
-The
-.Fn strdup
-function may fail and set the external variable
-.Va errno
-for any of the errors specified for the library function
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr free 3 ,
-.Xr malloc 3 ,
-.Xr strcpy 3 ,
-.Xr strlen 3
-.Sh STANDARDS
-The
-.Fn strdup
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn strdup
-function first appeared in
-.Bx 4.4 .
-The
-.Fn strndup
-function was added in
-.Nx 4.0 .
diff --git a/lib/libc/string/strdup.c b/lib/libc/string/strdup.c
deleted file mode 100644
index d07d876ad..000000000
--- a/lib/libc/string/strdup.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: strdup.c,v 1.14 2012/06/25 22:32:46 abs 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strdup.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: strdup.c,v 1.14 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(strdup,_strdup)
-#endif
-
-char *
-strdup(const char *str)
-{
-	size_t len;
-	char *copy;
-
-	_DIAGASSERT(str != NULL);
-
-	len = strlen(str) + 1;
-	if (!(copy = malloc(len)))
-		return (NULL);
-	memcpy(copy, str, len);
-	return (copy);
-}
diff --git a/lib/libc/string/strerror.3 b/lib/libc/string/strerror.3
deleted file mode 100644
index a3d4aaf18..000000000
--- a/lib/libc/string/strerror.3
+++ /dev/null
@@ -1,199 +0,0 @@
-.\" $NetBSD: strerror.3,v 1.18 2015/05/09 19:01:53 dholland Exp $
-.\"
-.\" Copyright (c) 1980, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)strerror.3	8.1 (Berkeley) 6/9/93
-.Dd May 9, 2015
-.Dt STRERROR 3
-.Os
-.Sh NAME
-.Nm perror ,
-.Nm strerror ,
-.Nm strerror_r ,
-.Nm sys_errlist ,
-.Nm sys_nerr
-.Nd system error messages
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft void
-.Fn perror "const char *string"
-.In errno.h
-.Vt extern const char * const sys_errlist[] ;
-.Vt extern const int sys_nerr ;
-.In string.h
-.Ft "char *"
-.Fn strerror "int errnum"
-.Ft int
-.Fn strerror_r "int errnum" "char *strerrbuf" "size_t buflen"
-.Sh DESCRIPTION
-The
-.Fn strerror ,
-.Fn strerror_r ,
-and
-.Fn perror
-functions look up the language-dependent error message
-string corresponding to an error number.
-.Pp
-The
-.Fn strerror
-function accepts an error number argument
-.Fa errnum
-and returns a pointer to the corresponding
-message string.
-.Pp
-The
-.Fn strerror_r
-function renders the same result into
-.Fa strerrbuf
-for a maximum of
-.Fa buflen
-characters and returns 0 upon success.
-.Pp
-The
-.Fn perror
-function finds the error message corresponding to the current
-value of the global variable
-.Va errno
-.Pq Xr intro 2
-and writes it, followed by a newline, to the
-standard error file descriptor.
-If the argument
-.Fa string
-is
-.Pf non- Dv NULL
-and does not point to the nul character,
-this string is prepended to the message
-string and separated from it by
-a colon and space
-.Pq Dq Li ":\ " ;
-otherwise, only the error message string is printed.
-Note that in most cases the
-.Xr err 3
-and
-.Xr warn 3
-family of functions is preferable to
-.Fn perror ;
-they are more flexible and also print the program name.
-.Pp
-If the error number is not recognized, these functions pass an error message
-string containing
-.Dq Li "Unknown error:\ "
-followed by the error number in decimal.
-To warn about this,
-.Fn strerror
-sets
-.Dv errno
-to
-.Er EINVAL ,
-and
-.Fn strerror_r
-returns
-.Er EINVAL .
-Error numbers recognized by this implementation fall in
-the range 0 \*[Lt]
-.Fa errnum
-\*[Lt]
-.Fa sys_nerr .
-.Pp
-If insufficient storage is provided in
-.Fa strerrbuf
-(as specified in
-.Fa buflen )
-to contain the error string,
-.Fn strerror_r
-returns
-.Er ERANGE
-and
-.Fa strerrbuf
-will contain an error message that has been truncated and
-.Dv NUL
-terminated to fit the length specified by
-.Fa buflen .
-.Pp
-The message strings can be accessed directly using the external
-array
-.Va sys_errlist .
-The external value
-.Va sys_nerr
-contains a count of the messages in
-.Va sys_errlist .
-The use of these variables is deprecated;
-.Fn strerror
-or
-.Fn strerror_r
-should be used instead.
-.Sh SEE ALSO
-.Xr intro 2 ,
-.Xr err 3 ,
-.Xr psignal 3 ,
-.Xr warn 3
-.Sh STANDARDS
-The
-.Fn perror
-and
-.Fn strerror
-functions conform to
-.St -isoC-99 .
-The
-.Fn strerror_r
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn perror
-function first appeared in
-.At v4 .
-The
-.Fn strerror
-function first appeared in
-.Bx 4.3 Reno .
-The
-.Fn strerror_r
-function first appeared in
-.Nx 4.0 .
-.Sh BUGS
-For unknown error numbers, the
-.Fn strerror
-function will return its result in a static buffer which
-may be overwritten by subsequent calls.
-.Pp
-The return type for
-.Fn strerror
-is missing a type-qualifier; it should actually be
-.Vt const char * .
-.Pp
-Programs that use the deprecated
-.Va sys_errlist
-variable often fail to compile because they declare it
-inconsistently.
diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c
deleted file mode 100644
index a8789bd70..000000000
--- a/lib/libc/string/strerror.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*	$NetBSD: strerror.c,v 1.17 2015/01/20 18:31:25 christos Exp $	*/
-
-/*
- * Copyright (c) 1988 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>
-__RCSID("$NetBSD: strerror.c,v 1.17 2015/01/20 18:31:25 christos Exp $");
-
-#define __SETLOCALE_SOURCE__
-
-#include "namespace.h"
-#include <errno.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "extern.h"
-#ifdef _REENTRANT
-#include "reentrant.h"
-#endif
-#include "setlocale_local.h"
-
-__weak_alias(strerror_l, _strerror_l)
-
-__aconst char *
-strerror(int num)
-{
-
-	return strerror_l(num, _current_locale());
-}
-
-#ifdef _REENTRANT
-static thread_key_t strerror_key;
-static once_t strerror_once = ONCE_INITIALIZER;
-
-static void
-strerror_setup(void)
-{
-
-	thr_keycreate(&strerror_key, free);
-}
-#endif
-
-__aconst char *
-strerror_l(int num, locale_t loc)
-{
-	int error;
-#ifdef _REENTRANT
-	char *buf;
-
-	thr_once(&strerror_once, strerror_setup);
-	buf = thr_getspecific(strerror_key);
-	if (buf == NULL) {
-		buf = malloc(NL_TEXTMAX);
-		if (buf == NULL) {
-			static char fallback_buf[NL_TEXTMAX];
-			buf = fallback_buf;
-		}
-		thr_setspecific(strerror_key, buf);
-	}
-#else
-	static char buf[NL_TEXTMAX];
-#endif
-
-	error = _strerror_lr(num, buf, NL_TEXTMAX, loc);
-	if (error)
-		errno = error;
-	return buf;
-}
diff --git a/lib/libc/string/strerror_r.c b/lib/libc/string/strerror_r.c
deleted file mode 100644
index 948b06aee..000000000
--- a/lib/libc/string/strerror_r.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*	$NetBSD: strerror_r.c,v 1.3 2013/08/19 13:03:12 joerg Exp $	*/
-
-/*
- * Copyright (c) 1988 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>
-__RCSID("$NetBSD: strerror_r.c,v 1.3 2013/08/19 13:03:12 joerg Exp $");
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#ifdef NLS
-#include <limits.h>
-#include <nl_types.h>
-#define __SETLOCALE_SOURCE__
-#include <locale.h>
-#include "setlocale_local.h"
-#endif
-
-#include "extern.h"
-
-__weak_alias(strerror_r, _strerror_r)
-
-int
-_strerror_lr(int num, char *buf, size_t buflen, locale_t loc)
-{
-#define	UPREFIX	"Unknown error: %u"
-	unsigned int errnum = num;
-	int retval = 0;
-	size_t slen;
-#ifdef NLS
-	int saved_errno = errno;
-	nl_catd catd;
-	catd = catopen_l("libc", NL_CAT_LOCALE, loc);
-#endif
-	_DIAGASSERT(buf != NULL);
-
-	if (errnum < (unsigned int) sys_nerr) {
-#ifdef NLS
-		slen = strlcpy(buf, catgets(catd, 1, (int)errnum,
-		    sys_errlist[errnum]), buflen); 
-#else
-		slen = strlcpy(buf, sys_errlist[errnum], buflen); 
-#endif
-	} else {
-#ifdef NLS
-		slen = snprintf_l(buf, buflen, loc,
-		    catgets(catd, 1, 0xffff, UPREFIX), errnum);
-#else
-		slen = snprintf(buf, buflen, UPREFIX, errnum);
-#endif
-		retval = EINVAL;
-	}
-
-	if (slen >= buflen)
-		retval = ERANGE;
-
-#ifdef NLS
-	catclose(catd);
-	errno = saved_errno;
-#endif
-
-	return retval;
-}
-
-int
-strerror_r(int num, char *buf, size_t buflen)
-{
-#ifdef NLS
-	return _strerror_lr(num, buf, buflen, _current_locale());
-#else
-	return _strerror_lr(num, buf, buflen, NULL);
-#endif
-}
diff --git a/lib/libc/string/stresep.c b/lib/libc/string/stresep.c
deleted file mode 100644
index 34946d440..000000000
--- a/lib/libc/string/stresep.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*	$NetBSD: stresep.c,v 1.2 2007/12/06 22:07:07 seb Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strsep.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: stresep.c,v 1.2 2007/12/06 22:07:07 seb Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(stresep,_stresep)
-#endif
-
-/*
- * Get next token from string *stringp, where tokens are possibly-empty
- * strings separated by characters from delim. If esc is not NUL, then
- * the characters followed by esc are ignored and are not taken into account
- * when splitting the string.
- *
- * Writes NULs into the string at *stringp to end tokens.
- * delim need not remain constant from call to call.
- * On return, *stringp points past the last NUL written (if there might
- * be further tokens), or is NULL (if there are definitely no more tokens).
- *
- * If *stringp is NULL, stresep returns NULL.
- */
-char *
-stresep(char **stringp, const char *delim, int esc)
-{
-	char *s;
-	const char *spanp;
-	int c, sc;
-	char *tok;
-
-	_DIAGASSERT(stringp != NULL);
-	_DIAGASSERT(delim != NULL);
-
-	if ((s = *stringp) == NULL)
-		return NULL;
-	for (tok = s;;) {
-		c = *s++;
-		while (esc != '\0' && c == esc) {
-			(void)strcpy(s - 1, s);
-			c = *s++;
-		}
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = 0;
-				*stringp = s;
-				return tok;
-			}
-		} while (sc != 0);
-	}
-}
diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3
deleted file mode 100644
index a05a76e5c..000000000
--- a/lib/libc/string/string.3
+++ /dev/null
@@ -1,200 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)string.3	8.2 (Berkeley) 12/11/93
-.\"	$NetBSD: string.3,v 1.16 2009/05/01 17:27:01 perry Exp $
-.\"
-.Dd May 1, 2009
-.Dt STRING 3
-.Os
-.Sh NAME
-.Nm stpcpy ,
-.Nm stpncpy ,
-.Nm strcat ,
-.Nm strlcat ,
-.Nm strncat ,
-.Nm strchr ,
-.Nm strrchr ,
-.Nm strcmp ,
-.Nm strncmp ,
-.Nm strcasecmp ,
-.Nm strncasecmp ,
-.Nm strcoll ,
-.Nm strcpy ,
-.Nm strlcpy ,
-.Nm strncpy ,
-.Nm strerror ,
-.Nm strerror_r ,
-.Nm strlen ,
-.Nm strnlen ,
-.Nm strpbrk ,
-.Nm strsep ,
-.Nm stresep ,
-.Nm strspn ,
-.Nm strcspn ,
-.Nm strdup ,
-.Nm strndup ,
-.Nm strstr ,
-.Nm strcasestr ,
-.Nm strtok ,
-.Nm strtok_r ,
-.Nm strxfrm
-.Nd string specific functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn stpcpy "char *dst" "const char *src"
-.Ft char *
-.Fn stpncpy "char *dst" "const char *src" "size_t count"
-.Ft char *
-.Fn strcat "char *s" "const char * append"
-.Ft size_t
-.Fn strlcat "char *dst" "const char *src" "size_t size"
-.Ft char *
-.Fn strncat "char *s" "const char *append" "size_t count"
-.Ft char *
-.Fn strchr "const char *s" "int c"
-.Ft char *
-.Fn strrchr "const char *s" "int c"
-.Ft int
-.Fn strcmp "const char *s1" "const char *s2"
-.Ft int
-.Fn strncmp "const char *s1" "const char *s2" "size_t count"
-.Ft int
-.Fn strcasecmp "const char *s1" "const char *s2"
-.Ft int
-.Fn strncasecmp "const char *s1" "const char *s2" "size_t count"
-.Ft int
-.Fn strcoll "const char *s1" "const char *s2"
-.Ft char *
-.Fn strcpy "char *dst" "const char *src"
-.Ft size_t
-.Fn strlcpy "char *dst" "const char *src" "size_t size"
-.Ft char *
-.Fn strncpy "char *dst" "const char *src" "size_t count"
-.Ft char *
-.Fn strerror "int errno"
-.Ft int
-.Fn strerror_r "int errnum" "char *strerrbuf" "size_t buflen"
-.Ft size_t
-.Fn strlen "const char *s"
-.Ft size_t
-.Fn strnlen "const char *s" "size_t count"
-.Ft char *
-.Fn strpbrk "const char *s" "const char *charset"
-.Ft char *
-.Fn strsep "char **stringp" "const char *delim"
-.Ft char *
-.Fn stresep "char **stringp" "const char *delim" "int escape"
-.Ft size_t
-.Fn strspn "const char *s" "const char *charset"
-.Ft size_t
-.Fn strcspn "const char *s" "const char *charset"
-.Ft char *
-.Fn strdup "const char *str"
-.Ft char *
-.Fn strndup "const char *str" "size_t len"
-.Ft char *
-.Fn strstr "const char *big" "const char *little"
-.Ft char *
-.Fn strcasestr "const char *big" "const char *little"
-.Ft char *
-.Fn strtok "char *s" "const char *delim"
-.Ft char *
-.Fn strtok_r "char *s" "const char *delim" "char **lasts"
-.Ft size_t
-.Fn strxfrm "char *dst" "const char *src" "size_t n"
-.Sh DESCRIPTION
-The string
-functions manipulate strings terminated by a
-nul byte.
-.Pp
-See the specific manual pages for more information.
-For manipulating variable length generic objects as byte
-strings (without the nul byte check), see
-.Xr bstring 3 .
-.Pp
-Except as noted in their specific manual pages,
-the string functions do not test the destination
-for size limitations.
-.Sh SEE ALSO
-.Xr bstring 3 ,
-.Xr strcat 3 ,
-.Xr strchr 3 ,
-.Xr strcmp 3 ,
-.Xr strcoll 3 ,
-.Xr strcpy 3 ,
-.Xr strcspn 3 ,
-.Xr strdup 3 ,
-.Xr strerror 3 ,
-.Xr strings 3 ,
-.Xr strlcat 3 ,
-.Xr strlen 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3 ,
-.Xr strxfrm 3
-.Sh STANDARDS
-The
-.Fn strcat ,
-.Fn strncat ,
-.Fn strchr ,
-.Fn strrchr ,
-.Fn strcmp ,
-.Fn strncmp ,
-.Fn strcpy ,
-.Fn strncpy ,
-.Fn strcoll ,
-.Fn strerror ,
-.Fn strlen ,
-.Fn strpbrk ,
-.Fn strsep ,
-.Fn strspn ,
-.Fn strcspn ,
-.Fn strstr ,
-.Fn strtok ,
-and
-.Fn strxfrm
-functions conform to
-.St -ansiC .
-.Pp
-The
-.Fn strtok_r
-function conforms to
-.St -p1003.1c-95 .
-.Pp
-The
-.Fn strerror_r
-function conform to
-.St -p1003.1-2001 .
diff --git a/lib/libc/string/strings.3 b/lib/libc/string/strings.3
deleted file mode 100644
index 8ce6b9836..000000000
--- a/lib/libc/string/strings.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\" $NetBSD: strings.3,v 1.1 2007/02/17 09:32:58 wiz Exp $
-.\"
-.\" Copyright (c) 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Thomas Klausner.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd February 17, 2007
-.Dt STRINGS 3
-.Os
-.Sh NAME
-.Nm bcmp ,
-.Nm bcopy ,
-.Nm bzero ,
-.Nm ffs ,
-.Nm index ,
-.Nm rindex ,
-.Nm strcasecmp ,
-.Nm strncasecmp
-.Nd string operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft int
-.Fn bcmp "const void *b1" "const void *b2" "size_t len"
-.Ft void
-.Fn bcopy "const void *src" "void *dst" "size_t len"
-.Ft void
-.Fn bzero "void *b" "size_t len"
-.Ft int
-.Fn ffs "int value"
-.Ft char *
-.Fn index "const char *s" "int c"
-.Ft char *
-.Fn rindex "const char *s" "int c"
-.Ft int
-.Fn strcasecmp "const char *s1" "const char *s2"
-.Ft int
-.Fn strncasecmp "const char *s1" "const char *s2" "size_t len"
-.Sh DESCRIPTION
-These functions all live in the
-.Pa strings.h
-header file.
-Except for
-.Fn ffs ,
-they operate on strings.
-.Fn index ,
-.Fn rindex ,
-and
-.Fn strcasecmp
-need nul-terminated strings.
-.Pp
-See the specific manual pages for more information.
-.Pp
-See
-.Xr string 3
-for string functions that follow
-.St -ansiC
-or
-.St -isoC-99 ,
-.Xr bstring 3
-for functions that operate on strings that are not nul-terminated, and
-.Xr bitstring 3
-for bit-string manipulation macros.
-.Sh SEE ALSO
-.Xr bcmp 3 ,
-.Xr bcopy 3 ,
-.Xr bitstring 3 ,
-.Xr bstring 3 ,
-.Xr bzero 3 ,
-.Xr ffs 3 ,
-.Xr index 3 ,
-.Xr rindex 3 ,
-.Xr strcasecmp 3 ,
-.Xr string 3
diff --git a/lib/libc/string/strlcpy.3 b/lib/libc/string/strlcpy.3
deleted file mode 100644
index c4794596e..000000000
--- a/lib/libc/string/strlcpy.3
+++ /dev/null
@@ -1,212 +0,0 @@
-.\"	$NetBSD: strlcpy.3,v 1.13 2010/04/14 13:07:51 wiz Exp $
-.\" from OpenBSD: strlcpy.3,v 1.11 2000/11/16 23:27:41 angelos Exp
-.\"
-.\" Copyright (c) 1998, 2000 Todd C. Miller <Todd.Miller@courtesan.com>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-.\" 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.
-.\"
-.Dd March 1, 2001
-.Dt STRLCPY 3
-.Os
-.Sh NAME
-.Nm strlcpy ,
-.Nm strlcat
-.Nd size-bounded string copying and concatenation
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft size_t
-.Fn strlcpy "char *dst" "const char *src" "size_t size"
-.Ft size_t
-.Fn strlcat "char *dst" "const char *src" "size_t size"
-.Sh DESCRIPTION
-The
-.Fn strlcpy
-and
-.Fn strlcat
-functions copy and concatenate strings respectively.
-They are designed
-to be safer, more consistent, and less error prone replacements for
-.Xr strncpy 3
-and
-.Xr strncat 3 .
-Unlike those functions,
-.Fn strlcpy
-and
-.Fn strlcat
-take the full size of the buffer (not just the length) and guarantee to
-NUL-terminate the result (as long as
-.Fa size
-is larger than 0 or, in the case of
-.Fn strlcat ,
-as long as there is at least one byte free in
-.Fa dst ) .
-Note that you should include a byte for the NUL in
-.Fa size .
-Also note that
-.Fn strlcpy
-and
-.Fn strlcat
-only operate on true
-.Dq C
-strings.
-This means that for
-.Fn strlcpy
-.Fa src
-must be NUL-terminated and for
-.Fn strlcat
-both
-.Fa src
-and
-.Fa dst
-must be NUL-terminated.
-.Pp
-The
-.Fn strlcpy
-function copies up to
-.Fa size
-- 1 characters from the NUL-terminated string
-.Fa src
-to
-.Fa dst ,
-NUL-terminating the result.
-.Pp
-The
-.Fn strlcat
-function appends the NUL-terminated string
-.Fa src
-to the end of
-.Fa dst .
-It will append at most
-.Fa size
-- strlen(dst) - 1 bytes, NUL-terminating the result.
-.Sh RETURN VALUES
-The
-.Fn strlcpy
-and
-.Fn strlcat
-functions return the total length of the string they tried to create.
-For
-.Fn strlcpy
-that means the length of
-.Fa src .
-For
-.Fn strlcat
-that means the initial length of
-.Fa dst
-plus
-the length of
-.Fa src .
-While this may seem somewhat confusing it was done to make
-truncation detection simple.
-.Pp
-Note however, that if
-.Fn strlcat
-traverses
-.Fa size
-characters without finding a NUL, the length of the string is considered
-to be
-.Fa size
-and the destination string will not be NUL-terminated (since there was
-no space for the NUL).
-This keeps
-.Fn strlcat
-from running off the end of a string.
-In practice this should not happen (as it means that either
-.Fa size
-is incorrect or that
-.Fa dst
-is not a proper
-.Dq C
-string).
-The check exists to prevent potential security problems in incorrect code.
-.Sh EXAMPLES
-The following code fragment illustrates the simple case:
-.Bd -literal -offset indent
-char *s, *p, buf[BUFSIZ];
-
-\&...
-
-(void)strlcpy(buf, s, sizeof(buf));
-(void)strlcat(buf, p, sizeof(buf));
-.Ed
-.Pp
-To detect truncation, perhaps while building a pathname, something
-like the following might be used:
-.Bd -literal -offset indent
-char *dir, *file, pname[MAXPATHLEN];
-
-\&...
-
-if (strlcpy(pname, dir, sizeof(pname)) \*[Ge] sizeof(pname))
-	goto toolong;
-if (strlcat(pname, file, sizeof(pname)) \*[Ge] sizeof(pname))
-	goto toolong;
-.Ed
-.Pp
-Since we know how many characters we copied the first time, we can
-speed things up a bit by using a copy instead of an append:
-.Bd -literal -offset indent
-char *dir, *file, pname[MAXPATHLEN];
-size_t n;
-
-\&...
-
-n = strlcpy(pname, dir, sizeof(pname));
-if (n \*[Ge] sizeof(pname))
-	goto toolong;
-if (strlcpy(pname + n, file, sizeof(pname) - n) \*[Ge] sizeof(pname) - n)
-	goto toolong;
-.Ed
-.Pp
-However, one may question the validity of such optimizations, as they
-defeat the whole purpose of
-.Fn strlcpy
-and
-.Fn strlcat .
-.Sh SEE ALSO
-.Xr snprintf 3 ,
-.Xr strncat 3 ,
-.Xr strncpy 3
-.Rs
-.%A Todd C. Miller
-.%A Theo de Raadt
-.%T strlcpy and strlcat -- Consistent, Safe, String Copy and Concatenation
-.%I USENIX Association
-.%B Proceedings of the FREENIX Track: 1999 USENIX Annual Technical Conference
-.%D June 6-11, 1999
-.%U http://www.usenix.org/publications/library/proceedings/usenix99/full_papers/millert/millert.pdf
-.Re
-.Sh HISTORY
-The
-.Fn strlcpy
-and
-.Fn strlcat
-functions first appeared in
-.Ox 2.4 ,
-then in
-.Nx 1.4.3
-and
-.Fx 3.3 .
diff --git a/lib/libc/string/strlen.3 b/lib/libc/string/strlen.3
deleted file mode 100644
index d460f9d36..000000000
--- a/lib/libc/string/strlen.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strlen.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: strlen.3,v 1.9 2009/05/01 17:27:01 perry Exp $
-.\"
-.Dd May 1, 2009
-.Dt STRLEN 3
-.Os
-.Sh NAME
-.Nm strlen ,
-.Nm strnlen
-.Nd find length of string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft size_t
-.Fn strlen "const char *s"
-.Ft size_t
-.Fn strnlen "const char *s" "size_t maxlen"
-.Sh DESCRIPTION
-The
-.Fn strlen
-function
-computes the length of the string
-.Fa s .
-.Pp
-The
-.Fn strnlen
-function attempts to compute the length of
-.Fa s ,
-but never scans beyond the first
-.Fa maxlen
-bytes of
-.Fa s .
-.Sh RETURN VALUES
-The
-.Fn strlen
-function
-returns
-the number of characters that precede the
-terminating
-.Dv NUL
-character.
-.Pp
-The
-.Fn strnlen
-function returns either the same result as
-.Fn strlen
-or
-.Fa maxlen ,
-whichever is smaller.
-.Sh SEE ALSO
-.Xr string 3 ,
-.Xr wcslen 3 ,
-.Xr wcswidth 3
-.Sh STANDARDS
-The
-.Fn strlen
-function
-conforms to
-.St -isoC .
-The
-.Fn strnlen
-function conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc/string/strmode.3 b/lib/libc/string/strmode.3
deleted file mode 100644
index 899800926..000000000
--- a/lib/libc/string/strmode.3
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" Copyright (c) 1990, 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. 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: @(#)strmode.3	8.3 (Berkeley) 7/28/94
-.\"	$NetBSD: strmode.3,v 1.17 2006/10/16 08:48:45 wiz Exp $
-.\"
-.Dd July 28, 1994
-.Dt STRMODE 3
-.Os
-.Sh NAME
-.Nm strmode
-.Nd convert inode status information into a symbolic string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft void
-.Fn strmode "mode_t mode" "char *bp"
-.Sh DESCRIPTION
-The
-.Fn strmode
-function
-converts a file
-.Fa mode
-(the type and permission information associated with an inode, see
-.Xr stat 2 )
-into a symbolic string which is stored in the location referenced by
-.Fa bp .
-This stored string is eleven characters in length plus a trailing nul byte.
-.Pp
-The first character is the inode type, and will be one of the following:
-.Pp
-.Bl -tag -width flag -offset indent -compact
-.It \-
-regular file
-.It a
-regular file in archive state 1
-.It A
-regular file in archive state 2
-.It b
-block special
-.It c
-character special
-.It d
-directory
-.It l
-symbolic link
-.It p
-fifo
-.It s
-socket
-.It w
-whiteout
-.It ?
-unknown inode type
-.El
-.Pp
-The next nine characters encode three sets of permissions, in three
-characters each.
-The first three characters are the permissions for the owner of the
-file, the second three for the group the file belongs to, and the
-third for the ``other'', or default, set of users.
-.Pp
-Permission checking is done as specifically as possible.
-If read permission is denied to the owner of a file in the first set
-of permissions, the owner of the file will not be able to read the file.
-This is true even if the owner is in the file's group and the group
-permissions allow reading or the ``other'' permissions allow reading.
-.Pp
-If the first character of the three character set is an ``r'', the file is
-readable for that set of users; if a dash ``\-'', it is not readable.
-.Pp
-If the second character of the three character set is a ``w'', the file is
-writable for that set of users; if a dash ``\-'', it is not writable.
-.Pp
-The third character is the first of the following characters that apply:
-.Bl -tag -width xxxx
-.It S
-If the character is part of the owner permissions and the file is not
-executable or the directory is not searchable by the owner, and the
-set-user-id bit is set.
-.It S
-If the character is part of the group permissions and the file is not
-executable or the directory is not searchable by the group, and the
-set-group-id bit is set.
-.It T
-If the character is part of the other permissions and the file is not
-executable or the directory is not searchable by others, and the ``sticky''
-.Pq Dv S_ISVTX
-bit is set.
-.It s
-If the character is part of the owner permissions and the file is
-executable or the directory searchable by the owner, and the set-user-id
-bit is set.
-.It s
-If the character is part of the group permissions and the file is
-executable or the directory searchable by the group, and the set-group-id
-bit is set.
-.It t
-If the character is part of the other permissions and the file is
-executable or the directory searchable by others, and the ``sticky''
-.Pq Dv S_ISVTX
-bit is set.
-.It x
-The file is executable or the directory is searchable.
-.It \-
-None of the above apply.
-.El
-.Pp
-The last character is a plus sign ``+'' if there are any alternative
-or additional access control methods associated with the inode, otherwise
-it will be a space.
-.Pp
-Archive state 1 and archive state 2 represent file system dependent
-archive state for a file.
-Most file systems do not retain file archive
-state, and so will not report files in either archive state.
-msdosfs will report a file in archive state 1 if it has been
-archived more recently than modified.
-Hierarchical storage systems may have multiple archive states for a
-file and may define archive states 1 and 2 as appropriate.
-.Sh SEE ALSO
-.Xr chmod 1 ,
-.Xr find 1 ,
-.Xr stat 2 ,
-.Xr getmode 3 ,
-.Xr setmode 3
-.Sh HISTORY
-The
-.Fn strmode
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c
deleted file mode 100644
index e7335c862..000000000
--- a/lib/libc/string/strmode.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*	$NetBSD: strmode.c,v 1.19 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * 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. 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strmode.c	8.3 (Berkeley) 8/15/94";
-#else
-__RCSID("$NetBSD: strmode.c,v 1.19 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <unistd.h>
-
-#if !HAVE_STRMODE
-void
-strmode(mode_t mode, char *p)
-{
-
-	_DIAGASSERT(p != NULL);
-
-	 /* print type */
-	switch (mode & S_IFMT) {
-	case S_IFDIR:			/* directory */
-		*p++ = 'd';
-		break;
-	case S_IFCHR:			/* character special */
-		*p++ = 'c';
-		break;
-	case S_IFBLK:			/* block special */
-		*p++ = 'b';
-		break;
-	case S_IFREG:			/* regular */
-#ifdef S_ARCH2
-		if ((mode & S_ARCH2) != 0) {
-			*p++ = 'A';
-		} else if ((mode & S_ARCH1) != 0) {
-			*p++ = 'a';
-		} else {
-#endif
-			*p++ = '-';
-#ifdef S_ARCH2
-		}
-#endif
-		break;
-	case S_IFLNK:			/* symbolic link */
-		*p++ = 'l';
-		break;
-#ifdef S_IFSOCK
-	case S_IFSOCK:			/* socket */
-		*p++ = 's';
-		break;
-#endif
-#ifdef S_IFIFO
-	case S_IFIFO:			/* fifo */
-		*p++ = 'p';
-		break;
-#endif
-#ifdef S_IFWHT
-	case S_IFWHT:			/* whiteout */
-		*p++ = 'w';
-		break;
-#endif
-#ifdef S_IFDOOR
-	case S_IFDOOR:			/* door */
-		*p++ = 'D';
-		break;
-#endif
-	default:			/* unknown */
-		*p++ = '?';
-		break;
-	}
-	/* usr */
-	if (mode & S_IRUSR)
-		*p++ = 'r';
-	else
-		*p++ = '-';
-	if (mode & S_IWUSR)
-		*p++ = 'w';
-	else
-		*p++ = '-';
-	switch (mode & (S_IXUSR | S_ISUID)) {
-	case 0:
-		*p++ = '-';
-		break;
-	case S_IXUSR:
-		*p++ = 'x';
-		break;
-	case S_ISUID:
-		*p++ = 'S';
-		break;
-	case S_IXUSR | S_ISUID:
-		*p++ = 's';
-		break;
-	}
-	/* group */
-	if (mode & S_IRGRP)
-		*p++ = 'r';
-	else
-		*p++ = '-';
-	if (mode & S_IWGRP)
-		*p++ = 'w';
-	else
-		*p++ = '-';
-	switch (mode & (S_IXGRP | S_ISGID)) {
-	case 0:
-		*p++ = '-';
-		break;
-	case S_IXGRP:
-		*p++ = 'x';
-		break;
-	case S_ISGID:
-		*p++ = 'S';
-		break;
-	case S_IXGRP | S_ISGID:
-		*p++ = 's';
-		break;
-	}
-	/* other */
-	if (mode & S_IROTH)
-		*p++ = 'r';
-	else
-		*p++ = '-';
-	if (mode & S_IWOTH)
-		*p++ = 'w';
-	else
-		*p++ = '-';
-	switch (mode & (S_IXOTH | S_ISVTX)) {
-	case 0:
-		*p++ = '-';
-		break;
-	case S_IXOTH:
-		*p++ = 'x';
-		break;
-	case S_ISVTX:
-		*p++ = 'T';
-		break;
-	case S_IXOTH | S_ISVTX:
-		*p++ = 't';
-		break;
-	}
-	*p++ = ' ';		/* will be a '+' if ACL's implemented */
-	*p = '\0';
-}
-#endif /* !HAVE_STRMODE */
diff --git a/lib/libc/string/strndup.c b/lib/libc/string/strndup.c
deleted file mode 100644
index 28dd39c2b..000000000
--- a/lib/libc/string/strndup.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: strndup.c,v 1.4 2007/07/03 12:11:09 nakayama 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.
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strdup.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: strndup.c,v 1.4 2007/07/03 12:11:09 nakayama Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(strndup,_strndup)
-#endif
-
-#if !HAVE_STRNDUP
-char *
-strndup(const char *str, size_t n)
-{
-	size_t len;
-	char *copy;
-
-	_DIAGASSERT(str != NULL);
-
-	for (len = 0; len < n && str[len]; len++)
-		continue;
-
-	if (!(copy = malloc(len + 1)))
-		return (NULL);
-	memcpy(copy, str, len);
-	copy[len] = '\0';
-	return (copy);
-}
-#endif /* !HAVE_STRNDUP */
diff --git a/lib/libc/string/strnstr.c b/lib/libc/string/strnstr.c
deleted file mode 100644
index 8bbb0a7d4..000000000
--- a/lib/libc/string/strnstr.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: strnstr.c,v 1.1 2014/09/24 22:21:33 christos Exp $	*/
-
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: strnstr.c,v 1.1 2014/09/24 22:21:33 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-/* FreeBSD: head/lib/libc/string/strnstr.c 251069 2013-05-28 20:57:40Z emaste */
-
-#include <string.h>
-
-/*
- * Find the first occurrence of find in s, where the search is limited to the
- * first slen characters of s.
- */
-char *
-strnstr(const char *s, const char *find, size_t slen)
-{
-	char c, sc;
-	size_t len;
-
-	if ((c = *find++) != '\0') {
-		len = strlen(find);
-		do {
-			do {
-				if (slen-- < 1 || (sc = *s++) == '\0')
-					return NULL;
-			} while (sc != c);
-			if (len > slen)
-				return NULL;
-		} while (strncmp(s, find, len) != 0);
-		s--;
-	}
-	return __UNCONST(s);
-}
diff --git a/lib/libc/string/strpbrk.3 b/lib/libc/string/strpbrk.3
deleted file mode 100644
index f0886706a..000000000
--- a/lib/libc/string/strpbrk.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strpbrk.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: strpbrk.3,v 1.9 2006/10/16 08:48:45 wiz Exp $
-.\"
-.Dd June 4, 1993
-.Dt STRPBRK 3
-.Os
-.Sh NAME
-.Nm strpbrk
-.Nd locate multiple characters in string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strpbrk "const char *s" "const char *charset"
-.Sh DESCRIPTION
-The
-.Fn strpbrk
-function
-locates in the nul-terminated string
-.Fa s
-the first occurrence of any character in the string
-.Fa charset
-and returns a pointer to this character.
-If no characters from
-.Fa charset
-occur anywhere in
-.Fa s
-.Fn strpbrk
-returns
-.Dv NULL .
-.Sh SEE ALSO
-.Xr index 3 ,
-.Xr memchr 3 ,
-.Xr rindex 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3
-.Sh STANDARDS
-The
-.Fn strpbrk
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/string/strrchr.3 b/lib/libc/string/strrchr.3
deleted file mode 100644
index 9e46f9e8e..000000000
--- a/lib/libc/string/strrchr.3
+++ /dev/null
@@ -1,100 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strrchr.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: strrchr.3,v 1.10 2006/10/16 08:48:45 wiz Exp $
-.\"
-.Dd August 11, 2002
-.Dt STRRCHR 3
-.Os
-.Sh NAME
-.Nm strrchr
-.Nd locate character in string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strrchr "const char *s" "int c"
-.Sh DESCRIPTION
-The
-.Fn strrchr
-function
-locates the last occurrence of
-.Fa c
-(converted to a char)
-in the string
-.Fa s .
-If
-.Fa c
-is
-.Ql \e0 ,
-.Fn strrchr
-locates the terminating
-.Ql \e0 .
-.Sh RETURN VALUES
-The
-.Fn strrchr
-function
-returns a pointer to the character,
-or a null pointer if
-.Fa c
-does not occur anywhere in
-.Fa s .
-.Sh EXAMPLES
-After the following call to
-.Fn strrchr ,
-.Va p
-will point to the string
-.Qq obar :
-.Bd -literal -offset indent
-char *p;
-char *s = "foobar";
-
-p = strrchr(s, 'o');
-.Ed
-.Sh SEE ALSO
-.Xr index 3 ,
-.Xr memchr 3 ,
-.Xr rindex 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3
-.Sh STANDARDS
-The
-.Fn strrchr
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/string/strsep.3 b/lib/libc/string/strsep.3
deleted file mode 100644
index 6589283e6..000000000
--- a/lib/libc/string/strsep.3
+++ /dev/null
@@ -1,120 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strsep.3	8.1 (Berkeley) 6/9/93
-.\"	$NetBSD: strsep.3,v 1.19 2006/10/16 08:48:45 wiz Exp $
-.\"
-.Dd August 12, 2006
-.Dt STRSEP 3
-.Os
-.Sh NAME
-.Nm strsep ,
-.Nm stresep
-.Nd separate strings
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strsep "char **stringp" "const char *delim"
-.Ft char *
-.Fn stresep "char **stringp" "const char *delim" "int escape"
-.Sh DESCRIPTION
-The
-.Fn strsep
-function locates, in the nul-terminated string referenced by
-.Fa *stringp ,
-the first occurrence of any character in the string
-.Fa delim
-(or the terminating
-.Ql \e0
-character) and replaces it with a
-.Ql \e0 .
-The location of the next character after the delimiter character
-(or
-.Dv NULL ,
-if the end of the string was reached) is stored in
-.Fa *stringp .
-The original value of
-.Fa *stringp
-is returned.
-.Pp
-An
-.Dq empty
-field, i.e., one caused by two adjacent delimiter characters,
-can be detected by comparing the location referenced by the pointer returned
-by
-.Fn strsep
-to
-.Ql \e0 .
-.Pp
-If
-.Fa *stringp
-is initially
-.Dv NULL ,
-.Fn strsep
-returns
-.Dv NULL .
-The
-.Fn stresep
-function also takes an escape character that allows quoting the delimiter
-character so that it can be part of the source string.
-.Sh EXAMPLES
-The following uses
-.Fn strsep
-to parse a string, containing tokens delimited by white space, into an
-argument vector:
-.Bd -literal -offset indent
-char **ap, *argv[10], *inputstring;
-
-for (ap = argv; ap \*[Lt] \*[Am]argv[9] \*[Am]\*[Am]
-    (*ap = strsep(\*[Am]inputstring, " \et")) != NULL;) {
-	if (**ap != '\e0')
-		ap++;
-}
-.Ed
-.Sh HISTORY
-The
-.Fn strsep
-function
-is intended as a replacement for the
-.Fn strtok
-function.
-While the
-.Fn strtok
-function should be preferred for portability reasons (it conforms to
-.St -ansiC )
-it is unable to handle empty fields, i.e., detect fields delimited by
-two adjacent delimiter characters, or to be used for more than a single
-string at a time.
-The
-.Fn strsep
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/string/strsignal.3 b/lib/libc/string/strsignal.3
deleted file mode 100644
index 9d5daa4ad..000000000
--- a/lib/libc/string/strsignal.3
+++ /dev/null
@@ -1,64 +0,0 @@
-.\" Copyright (c) 1980, 1991 Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strerror.3	6.9 (Berkeley) 6/29/91
-.\"	$NetBSD: strsignal.3,v 1.10 2009/07/22 19:48:27 kleink Exp $
-.\"
-.Dd July 22, 2009
-.Dt STRSIGNAL 3
-.Os
-.Sh NAME
-.Nm strsignal
-.Nd get signal description string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strsignal "int sig"
-.Sh DESCRIPTION
-The
-.Fn strsignal
-function returns a pointer to the language-dependent string describing
-a signal.
-.Pp
-The array pointed to is not to be modified by the program, but may be
-overwritten by subsequent calls to
-.Fn strsignal .
-.Sh SEE ALSO
-.Xr intro 2 ,
-.Xr psignal 3 ,
-.Xr setlocale 3
-.\" .Sh STANDARDS
-.\" The
-.\" .Fn strsignal
-.\" function conforms to
-.\" .St -p1003.1-2008 .
diff --git a/lib/libc/string/strsignal.c b/lib/libc/string/strsignal.c
deleted file mode 100644
index 1bc7b9f0a..000000000
--- a/lib/libc/string/strsignal.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: strsignal.c,v 1.15 2012/06/25 22:32:46 abs Exp $	*/
-
-/*
- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)strerror.c	5.6 (Berkeley) 5/4/91";
-#else
-__RCSID("$NetBSD: strsignal.c,v 1.15 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <string.h>
-#include <limits.h>
-#include "extern.h"
-
-#ifdef __weak_alias
-__weak_alias(strsignal,_strsignal)
-#endif
-
-__aconst char *
-strsignal(int sig)
-{
-	static char buf[NL_TEXTMAX];
-
-	return __UNCONST(__strsignal(sig, buf, NL_TEXTMAX));
-}
diff --git a/lib/libc/string/strspn.3 b/lib/libc/string/strspn.3
deleted file mode 100644
index 09382393e..000000000
--- a/lib/libc/string/strspn.3
+++ /dev/null
@@ -1,92 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strspn.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: strspn.3,v 1.11 2006/10/16 08:48:45 wiz Exp $
-.\"
-.Dd August 11, 2002
-.Dt STRSPN 3
-.Os
-.Sh NAME
-.Nm strspn
-.Nd span a string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft size_t
-.Fn strspn "const char *s" "const char *charset"
-.Sh DESCRIPTION
-The
-.Fn strspn
-function
-spans the initial part of the nul-terminated string
-.Fa s
-as long as the characters from
-.Fa s
-occur in string
-.Fa charset .
-.Sh RETURN VALUES
-The
-.Fn strspn
-function
-returns the number of characters spanned.
-.Sh EXAMPLES
-The following call to
-.Fn strspn
-will return 3, since the first three characters of string
-.Fa s
-are part of string
-.Fa charset :
-.Bd -literal -offset indent
-char *s = "foobar";
-char *charset = "of";
-size_t span;
-
-span = strspn(s, charset);
-.Ed
-.Sh SEE ALSO
-.Xr index 3 ,
-.Xr memchr 3 ,
-.Xr rindex 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3
-.Sh STANDARDS
-The
-.Fn strspn
-function
-conforms to
-.St -ansiC .
diff --git a/lib/libc/string/strstr.3 b/lib/libc/string/strstr.3
deleted file mode 100644
index 85e0369ad..000000000
--- a/lib/libc/string/strstr.3
+++ /dev/null
@@ -1,134 +0,0 @@
-.\" Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strstr.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: strstr.3,v 1.12 2014/09/24 18:43:21 wiz Exp $
-.\"
-.Dd September 24, 2014
-.Dt STRSTR 3
-.Os
-.Sh NAME
-.Nm strstr , strcasestr , strnstr
-.Nd locate a substring in a string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strstr "const char *big" "const char *little"
-.Ft char *
-.Fn strcasestr "const char *big" "const char *little"
-.Ft char *
-.Fn strnstr "const char *big" "const char *little" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn strstr
-function
-locates the first occurrence of the nul-terminated string
-.Fa little
-in the nul-terminated string
-.Fa big .
-.Pp
-The
-.Fn strcasestr
-function is similar to
-.Fn strstr ,
-but ignores the case of both strings.
-The
-.Fn strnstr
-function
-locates the first occurrence of the NUL-terminated string
-.Fa little
-in the string
-.Fa big ,
-where not more than
-.Fa len
-characters are searched.
-Characters that appear after a
-.Ql \e0
-character are not searched.
-Since the
-.Fn strnstr
-function is a
-.Nx
-specific API, it should only be used when portability is not a concern.
-.Sh RETURN VALUES
-If
-.Fa little
-is an empty string,
-.Fa big
-is returned;
-if
-.Fa little
-occurs nowhere in
-.Fa big ,
-.Dv NULL
-is returned;
-otherwise a pointer to the first character of the first occurrence of
-.Fa little
-is returned.
-.Sh EXAMPLES
-The following sets the pointer
-.Va ptr
-to the
-.Qq Li Bar Baz
-portion of
-.Va largestring :
-.Bd -literal -offset indent
-const char *largestring = "Foo Bar Baz";
-const char *smallstring = "Bar";
-char *ptr;
-
-ptr = strstr(largestring, smallstring);
-.Ed
-.Sh SEE ALSO
-.Xr index 3 ,
-.Xr memchr 3 ,
-.Xr rindex 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strtok 3
-.Sh STANDARDS
-The
-.Fn strstr
-function
-conforms to
-.St -isoC .
-.Sh HISTORY
-The
-.Fn strnstr
-function originated in
-.Fx .
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
deleted file mode 100644
index c6f5f6b58..000000000
--- a/lib/libc/string/strtok.3
+++ /dev/null
@@ -1,162 +0,0 @@
-.\" Copyright (c) 1988, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strtok.3	8.2 (Berkeley) 2/3/94
-.\"	$NetBSD: strtok.3,v 1.23 2008/08/29 05:48:40 dholland Exp $
-.\"
-.Dd August 11, 2002
-.Dt STRTOK 3
-.Os
-.Sh NAME
-.Nm strtok, strtok_r
-.Nd string tokens
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strtok "char * restrict str" "const char * restrict sep"
-.Ft char *
-.Fn strtok_r "char *str" "const char *sep" "char **lasts"
-.Sh DESCRIPTION
-The
-.Fn strtok
-function
-is used to isolate sequential tokens in a nul-terminated string,
-.Fa str .
-These tokens are separated in the string by at least one of the
-characters in
-.Fa sep .
-The first time that
-.Fn strtok
-is called,
-.Fa str
-should be specified; subsequent calls, wishing to obtain further tokens
-from the same string, should pass a null pointer instead.
-The separator string,
-.Fa sep ,
-must be supplied each time, and may change between calls.
-.Pp
-The
-.Fn strtok
-function
-returns a pointer to the beginning of each subsequent token in the string,
-after replacing the separator character itself with a
-.Dv NUL
-character.
-Separator characters at the beginning of the string or at the
-continuation point are skipped so that zero length tokens
-are not returned.
-When no more tokens remain, a null pointer is returned.
-.Pp
-The
-.Fn strtok_r
-function implements the functionality of
-.Fn strtok
-but is passed an additional argument,
-.Fa lasts ,
-which points to a user-provided pointer which is used by
-.Fn strtok_r
-to store state which needs to be kept between calls to scan the same string;
-unlike
-.Fn strtok ,
-it is not necessary to limit tokenizing to a single string at a time
-when using
-.Fn strtok_r .
-.Sh EXAMPLES
-The following will construct an array of pointers to each individual word in
-the string
-.Va s :
-.Bd -literal -offset indent
-#define MAXTOKENS	128
-
-char s[512], *p, *tokens[MAXTOKENS];
-char *last;
-int i = 0;
-
-snprintf(s, sizeof(s), "cat dog horse cow");
-
-for ((p = strtok_r(s, " ", &last)); p;
-    (p = strtok_r(NULL, " ", &last)), i++) {
-	if (i < MAXTOKENS - 1)
-		tokens[i] = p;
-}
-tokens[i] = NULL;
-.Ed
-.Pp
-That is,
-.Li tokens[0]
-will point to
-.Qq cat ,
-.Li tokens[1]
-will point to
-.Qq dog ,
-.Li tokens[2]
-will point to
-.Qq horse ,
-and
-.Li tokens[3]
-will point to
-.Qq cow .
-.Sh SEE ALSO
-.Xr index 3 ,
-.Xr memchr 3 ,
-.Xr rindex 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3
-.Sh STANDARDS
-The
-.Fn strtok
-function
-conforms to
-.St -ansiC .
-The
-.Fn strtok_r
-function conforms to
-.St -p1003.1c-95 .
-.Sh BUGS
-The System V
-.Fn strtok ,
-if handed a string containing only delimiter characters,
-will not alter the next starting point, so that a call to
-.Fn strtok
-with a different (or empty) delimiter string
-may return a
-.Pf non- Dv NULL
-value.
-Since this implementation always alters the next starting point,
-such a sequence of calls would always return
-.Dv NULL .
diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c
deleted file mode 100644
index 4fc621468..000000000
--- a/lib/libc/string/strtok.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: strtok.c,v 1.12 2004/10/27 19:12:31 dsl 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strtok.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: strtok.c,v 1.12 2004/10/27 19:12:31 dsl Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <namespace.h>
-#include <string.h>
-
-char *
-strtok(char *s, const char *delim)
-{
-	static char *lasts;
-
-	return strtok_r(s, delim, &lasts);
-}
diff --git a/lib/libc/string/strtok_r.c b/lib/libc/string/strtok_r.c
deleted file mode 100644
index 9ed168b5c..000000000
--- a/lib/libc/string/strtok_r.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*	$NetBSD: strtok_r.c,v 1.10 2012/06/25 22:32:46 abs Exp $	*/
-
-/*
- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)strtok.c	5.8 (Berkeley) 2/24/91";
-#else
-__RCSID("$NetBSD: strtok_r.c,v 1.10 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <string.h>
-
-#ifdef __weak_alias
-__weak_alias(strtok_r,_strtok_r)
-#endif
-
-char *
-strtok_r(char *s, const char *delim, char **lasts)
-{
-	const char *spanp;
-	int c, sc;
-	char *tok;
-
-	/* s may be NULL */
-	_DIAGASSERT(delim != NULL);
-	_DIAGASSERT(lasts != NULL);
-
-	if (s == NULL && (s = *lasts) == NULL)
-		return (NULL);
-
-	/*
-	 * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
-	 */
-cont:
-	c = *s++;
-	for (spanp = delim; (sc = *spanp++) != 0;) {
-		if (c == sc)
-			goto cont;
-	}
-
-	if (c == 0) {		/* no non-delimiter characters */
-		*lasts = NULL;
-		return (NULL);
-	}
-	tok = s - 1;
-
-	/*
-	 * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
-	 * Note that delim must have one NUL; we stop if we see that, too.
-	 */
-	for (;;) {
-		c = *s++;
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = 0;
-				*lasts = s;
-				return (tok);
-			}
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc/string/strxfrm.3 b/lib/libc/string/strxfrm.3
deleted file mode 100644
index fcec9a9d8..000000000
--- a/lib/libc/string/strxfrm.3
+++ /dev/null
@@ -1,78 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strxfrm.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: strxfrm.3,v 1.11 2007/02/18 00:46:47 wiz Exp $
-.\"
-.Dd February 18, 2007
-.Dt STRXFRM 3
-.Os
-.Sh NAME
-.Nm strxfrm
-.Nd transform a string under locale
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft size_t
-.Fn strxfrm "char * restrict dst" "const char * restrict src" "size_t n"
-.Sh DESCRIPTION
-The idea of
-.Fn strxfrm
-is to
-.Dq un-localize
-a string: the function transforms
-.Ar src ,
-storing the result in
-.Ar dst ,
-such that
-.Xr strcmp 3
-on transformed strings returns what
-.Xr strcoll 3
-on the original untransformed strings would return.
-.Sh SEE ALSO
-.Xr bcmp 3 ,
-.Xr memcmp 3 ,
-.\" .Xr setlocale 3 ,
-.Xr strcasecmp 3 ,
-.Xr strcmp 3 ,
-.Xr strcoll 3
-.Sh STANDARDS
-The
-.Fn strxfrm
-function
-conforms to
-.St -ansiC .
-.Sh BUGS
-Since locales are not fully implemented on
-.Nx ,
-.Fn strxfrm
-just returns a copy of the original string.
diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c
deleted file mode 100644
index a9eb61329..000000000
--- a/lib/libc/string/strxfrm.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: strxfrm.c,v 1.14 2013/05/17 12:55:57 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strxfrm.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: strxfrm.c,v 1.14 2013/05/17 12:55:57 joerg Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <locale.h>
-#include <string.h>
-#include "setlocale_local.h"
-
-__weak_alias(strxfrm_l, _strxfrm_l)
-
-/*
- * Transform src, storing the result in dst, such that
- * strcmp() on transformed strings returns what strcoll()
- * on the original untransformed strings would return.
- */
-size_t
-strxfrm_l(char *dst, const char *src, size_t n, locale_t loc)
-{
-	size_t srclen, copysize;
-
-	_DIAGASSERT(src != NULL);
-
-	/* XXX: LC_COLLATE should be implemented. */
-	/* LINTED */(void)loc;
-
-	/*
-	 * Since locales are unimplemented, this is just a copy.
-	 */
-	srclen = strlen(src);
-	if (n != 0) {
-		_DIAGASSERT(dst != NULL);
-		copysize = srclen < n ? srclen : n - 1;
-		(void)memcpy(dst, src, copysize);
-		dst[copysize] = 0;
-	}
-	return (srclen);
-}
-
-size_t
-strxfrm(char *dst, const char *src, size_t n)
-{
-	return strxfrm_l(dst, src, n, _current_locale());
-}
diff --git a/lib/libc/string/swab.3 b/lib/libc/string/swab.3
deleted file mode 100644
index 7c91e6b87..000000000
--- a/lib/libc/string/swab.3
+++ /dev/null
@@ -1,92 +0,0 @@
-.\" Copyright (c) 1990, 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. 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: @(#)swab.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: swab.3,v 1.15 2010/04/30 03:52:13 jruoho Exp $
-.\"
-.Dd April 30, 2010
-.Dt SWAB 3
-.Os
-.Sh NAME
-.Nm swab
-.Nd swap adjacent bytes
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft void
-.Fn swab "const void * restrict src" "void * restrict dst" "ssize_t len"
-.Sh DESCRIPTION
-The function
-.Fn swab
-copies
-.Fa len
-bytes from the location referenced by
-.Fa src
-to the location referenced by
-.Fa dst ,
-swapping adjacent bytes.
-.Pp
-If
-.Fa len
-is negative or zero,
-.Fn swab
-does nothing.
-If
-.Fa len
-is odd,
-.Fn swab
-copies
-.Fa len - 1
-bytes and the disposition of the last byte is unspecified.
-.Sh SEE ALSO
-.Xr bzero 3 ,
-.Xr memset 3
-.Sh STANDARDS
-The
-.Fn swab
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-A
-.Fn swab
-function appeared in
-.At v7 .
-It was originally documented to be
-.Dq useful for carrying binary data between PDP11's and other machines .
-.Pp
-In
-.Nx 6.0
-the type of
-.Fa len
-was changed from
-.Vt size_t
-to
-.Vt ssize_t
-for
-.Tn POSIX
-compliance.
diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c
deleted file mode 100644
index 392b1868e..000000000
--- a/lib/libc/string/swab.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*	$NetBSD: swab.c,v 1.18 2011/01/04 17:14:07 martin Exp $	*/
-
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Jeffrey Mogul.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)swab.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: swab.c,v 1.18 2011/01/04 17:14:07 martin Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <unistd.h>
-
-void
-swab(const void * __restrict from, void * __restrict to, ssize_t len)
-{
-	char temp;
-	const char *fp;
-	char *tp;
-
-	if (len <= 1)
-		return;
-
-	_DIAGASSERT(from != NULL);
-	_DIAGASSERT(to != NULL);
-
-	len /= 2;
-	fp = (const char *)from;
-	tp = (char *)to;
-#define	STEP	temp = *fp++,*tp++ = *fp++,*tp++ = temp
-
-	if (__predict_false(len == 1)) {
-		STEP;
-		return;
-	}
-
-	/* round to multiple of 8 */
-	while ((--len % 8) != 0)
-		STEP;
-	len /= 8;
-	if (len == 0)
-		return;
-	while (len-- != 0) {
-		STEP; STEP; STEP; STEP;
-		STEP; STEP; STEP; STEP;
-	}
-}
diff --git a/lib/libc/string/wcscasecmp.3 b/lib/libc/string/wcscasecmp.3
deleted file mode 100644
index ae7ed4261..000000000
--- a/lib/libc/string/wcscasecmp.3
+++ /dev/null
@@ -1,86 +0,0 @@
-.\"	$NetBSD: wcscasecmp.3,v 1.3 2010/12/16 17:42:28 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)wcscasecmp.3	8.1 (Berkeley) 6/9/93
-.\"
-.Dd August 26, 2006
-.Dt WCSCASECMP 3
-.Os
-.Sh NAME
-.Nm wcscasecmp ,
-.Nm wcsncasecmp
-.Nd compare wide-character strings, ignoring case
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft int
-.Fn wcscasecmp "const wchar_t *s1" "const wchar_t *s2"
-.Ft int
-.Fn wcsncasecmp "const wchar_t *s1" "const wchar_t *s2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn wcscasecmp
-and
-.Fn wcsncasecmp
-functions
-compare the nul-terminated strings
-.Fa s1
-and
-.Fa s2
-and return an integer greater than, equal to, or less than 0,
-according to whether
-.Fa s1
-is lexicographically greater than, equal to, or less than
-.Fa s2
-after translation of each corresponding character to lower-case.
-The strings themselves are not modified.
-.Pp
-The
-.Fn wcsncasecmp
-compares at most
-.Fa len
-characters.
-.Sh SEE ALSO
-.Xr wcscmp 3
-.Sh HISTORY
-The
-.Fn wcscasecmp
-and
-.Fn wcsncasecmp
-functions first appeared in
-.Nx 4.0 .
-.Sh NOTES
-If
-.Fa len
-is zero,
-.Fn wcsncasecmp
-returns always 0.
diff --git a/lib/libc/string/wcscasecmp.c b/lib/libc/string/wcscasecmp.c
deleted file mode 100644
index 9c0069d82..000000000
--- a/lib/libc/string/wcscasecmp.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: wcscasecmp.c,v 1.4 2013/05/17 12:55:57 joerg Exp $	*/
-
-/*
- * Copyright (C) 2006 Aleksey Cheusov
- *
- * This material is provided "as is", with absolutely no warranty expressed
- * or implied. Any use is at your own risk.
- *
- * Permission to use or copy this software for any purpose is hereby granted 
- * without fee. Permission to modify the code and to distribute modified
- * code is also granted without any restrictions.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint) 
-__RCSID("$NetBSD: wcscasecmp.c,v 1.4 2013/05/17 12:55:57 joerg Exp $"); 
-#endif /* LIBC_SCCS and not lint */ 
-
-#include "namespace.h"
-#include <assert.h>
-#include <wchar.h>
-#include <wctype.h>
-#include <locale.h>
-#include "setlocale_local.h"
-
-__weak_alias(wcscasecmp,_wcscasecmp)
-__weak_alias(wcscasecmp_l,_wcscasecmp_l)
-
-int
-wcscasecmp_l(const wchar_t *s1, const wchar_t *s2, locale_t loc)
-{
-	int lc1  = 0;
-	int lc2  = 0;
-	int diff = 0;
-
-	_DIAGASSERT(s1);
-	_DIAGASSERT(s2);
-
-	for (;;) {
-		lc1 = towlower_l(*s1, loc);
-		lc2 = towlower_l(*s2, loc);
-
-		diff = lc1 - lc2;
-		if (diff)
-			return diff;
-
-		if (!lc1)
-			return 0;
-
-		++s1;
-		++s2;
-	}
-}
-
-int
-wcscasecmp(const wchar_t *s1, const wchar_t *s2)
-{
-	return wcscasecmp_l(s1, s2, _current_locale());
-}
diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c
deleted file mode 100644
index 61ad4ea3c..000000000
--- a/lib/libc/string/wcscat.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: wcscat.c,v 1.3 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcscat.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcscat.c,v 1.3 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <wchar.h>
-
-wchar_t *
-wcscat(wchar_t *s1, const wchar_t *s2)
-{
-	wchar_t *p;
-	wchar_t *q;
-	const wchar_t *r;
-
-	_DIAGASSERT(s1 != NULL);
-	_DIAGASSERT(s2 != NULL);
-
-	p = s1;
-	while (*p)
-		p++;
-	q = p;
-	r = s2;
-	while (*r)
-		*q++ = *r++;
-	*q = '\0';
-	return s1;
-}
diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c
deleted file mode 100644
index 9808ae3ff..000000000
--- a/lib/libc/string/wcschr.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: wcschr.c,v 1.4 2005/06/04 20:09:56 dsl Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcschr.c,v 1.2 2000/12/21 05:07:25 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcschr.c,v 1.4 2005/06/04 20:09:56 dsl Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <wchar.h>
-
-wchar_t *
-wcschr(const wchar_t *p, wchar_t c)
-{
-	_DIAGASSERT(p != NULL);
-
-	for (;; ++p) {
-		if (*p == c) {
-			/* LINTED interface specification */
-			return __UNCONST(p);
-		}
-		if (!*p)
-			return NULL;
-	}
-	/*NOTREACHED*/
-}
diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c
deleted file mode 100644
index 5cd31b065..000000000
--- a/lib/libc/string/wcscmp.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: wcscmp.c,v 1.9 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strcmp.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: wcscmp.c,v 1.9 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <wchar.h>
-#include "runetype_local.h"
-
-/*
- * Compare strings.
- */
-int
-wcscmp(const wchar_t *s1, const wchar_t *s2)
-{
-
-	_DIAGASSERT(s1 != NULL);
-	_DIAGASSERT(s2 != NULL);
-
-	while (*s1 == *s2++)
-		if (*s1++ == 0)
-			return (0);
-	/* XXX assumes wchar_t = int */
-	return (*(const __nbrune_t *)s1 - *(const __nbrune_t *)--s2);
-}
diff --git a/lib/libc/string/wcscpy.c b/lib/libc/string/wcscpy.c
deleted file mode 100644
index 292554da9..000000000
--- a/lib/libc/string/wcscpy.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: wcscpy.c,v 1.4 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcscpy.c,v 1.2 2000/12/21 04:51:09 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcscpy.c,v 1.4 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <wchar.h>
-
-wchar_t *
-wcscpy(wchar_t *s1, const wchar_t *s2)
-{
-	wchar_t *p;
-
-	_DIAGASSERT(s1 != NULL);
-	_DIAGASSERT(s2 != NULL);
-
-	for (p = s1; (*p = *s2) != L'\0'; ++p, ++s2);
-
-	return s1;
-}
diff --git a/lib/libc/string/wcscspn.c b/lib/libc/string/wcscspn.c
deleted file mode 100644
index bac9c23a5..000000000
--- a/lib/libc/string/wcscspn.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: wcscspn.c,v 1.4 2011/11/24 18:44:25 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1999 Citrus Project,
- * Copyright (c) 2011 Joerg Sonnenberger,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcscspn.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: wcscspn.c,v 1.4 2011/11/24 18:44:25 joerg Exp $");
-
-#include <assert.h>
-#include <inttypes.h>
-#include <string.h>
-#include <wchar.h>
-
-#include "wcscspn_bloom.h"
-
-size_t
-wcscspn(const wchar_t *s, const wchar_t *set)
-{
-	size_t bloom[BLOOM_ARRAY_SIZE];
-	const wchar_t *p;
-	const wchar_t *q;
-
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(set != NULL);
-
-	if (set[0] == '\0')
-		return wcslen(s);
-	if (set[1] == '\0') {
-		for (p = s; *p; ++p)
-			if (*p == set[0])
-				break;
-		return p - s;
-	}
-
-	wcsspn_bloom_init(bloom, set);
-
-	for (p = s; *p; ++p) {
-		if (!wcsspn_in_bloom(bloom, *p))
-			continue;
-
-		q = set;
-		do {
-			if (*p == *q)
-				goto done;
-		} while (*++q);
-	}
-
-done:
-	return (p - s);
-}
diff --git a/lib/libc/string/wcscspn_bloom.h b/lib/libc/string/wcscspn_bloom.h
deleted file mode 100644
index dc7d16e67..000000000
--- a/lib/libc/string/wcscspn_bloom.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*	$NetBSD: wcscspn_bloom.h,v 1.4 2011/11/25 17:48:22 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2011 Joerg Sonnenberger,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Bloom filter for fast test if a given character is part of the reject set.
- * The test may have false positives, but doesn't have false negatives.
- * The first hash function is designed to be very fast to evaluate.
- * It is collision free if the input is part of the same European language
- * and shouldn't be too bad even other input.  The second hash function
- * tries to provide a much better mixing, but involves the slower
- * multiplication.
- */
-
-#include <limits.h>
-
-#define	BLOOM_SIZE		64
-#define	BLOOM_ARRAY_SIZE	(BLOOM_SIZE / sizeof(size_t))
-#define	BLOOM_BITS		(BLOOM_SIZE * CHAR_BIT)
-#define	BLOOM_DIV		(sizeof(size_t) * CHAR_BIT)
-
-static inline size_t
-wcscspn_bloom1(size_t x)
-{
-	return x % BLOOM_BITS;
-}
-
-static inline size_t
-wcscspn_bloom2(size_t x)
-{
-	return (size_t)((uint32_t)(x * 2654435761U) /
-	    (0x100000000ULL / BLOOM_BITS));
-}
-
-static inline void
-wcsspn_bloom_init(size_t *bloom, const wchar_t *charset)
-{
-	size_t val;
-
-	memset(bloom, 0, BLOOM_SIZE);
-	do {
-		val = wcscspn_bloom1((size_t)*charset);
-		bloom[val / BLOOM_DIV] |= (size_t)1 << (val % BLOOM_DIV);
-		val = wcscspn_bloom2((size_t)*charset);
-		bloom[val / BLOOM_DIV] |= (size_t)1 << (val % BLOOM_DIV);
-	}
-	while (*++charset);
-}
-
-static inline int
-wcsspn_in_bloom(const size_t *bloom, wchar_t ch)
-{
-	size_t val;
-
-	val = wcscspn_bloom1((size_t)ch);
-	if (bloom[val / BLOOM_DIV] & ((size_t)1 << (val % BLOOM_DIV)))
-		return 1;
-	val = wcscspn_bloom2((size_t)ch);
-	if (bloom[val / BLOOM_DIV] & ((size_t)1 << (val % BLOOM_DIV)))
-		return 1;
-	return 0;
-}
diff --git a/lib/libc/string/wcsdup.3 b/lib/libc/string/wcsdup.3
deleted file mode 100644
index ccefae441..000000000
--- a/lib/libc/string/wcsdup.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\"	$NetBSD: wcsdup.3,v 1.4 2012/12/28 13:53:12 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 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. 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: @(#)strdup.3	8.1 (Berkeley) 6/9/93
-.\"
-.Dd August 25, 2006
-.Dt WCSDUP 3
-.Os
-.Sh NAME
-.Nm wcsdup
-.Nd save a copy of a wide string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wcsdup "const wchar_t *str"
-.Sh DESCRIPTION
-The
-.Fn wcsdup
-function
-allocates sufficient memory for a copy
-of the wide-character string
-.Fa str ,
-does the copy, and returns a pointer to it.
-The pointer may subsequently be used as an
-argument to the function
-.Xr free 3 .
-.Pp
-If insufficient memory is available,
-.Dv NULL
-is returned.
-.Sh EXAMPLES
-The following will point
-.Va p
-to an allocated area of memory containing the nul-terminated string
-.Qq foobar :
-.Bd -literal -offset indent
-wchar_t *p;
-
-if (p = wcsdup(L"foobar"), p == NULL) {
-	fprintf(stderr, "Out of memory.\en");
-	exit(1);
-}
-.Ed
-.Sh ERRORS
-The
-.Fn wcsdup
-function may fail and set the external variable
-.Va errno
-for any of the errors specified for the library function
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr free 3 ,
-.Xr malloc 3 ,
-.Xr strdup 3
-.Sh HISTORY
-The
-.Fn wcsdup
-function first appeared in
-.Nx 4.0 .
diff --git a/lib/libc/string/wcsdup.c b/lib/libc/string/wcsdup.c
deleted file mode 100644
index 000ea6a75..000000000
--- a/lib/libc/string/wcsdup.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: wcsdup.c,v 1.3 2008/05/26 13:17:48 haad Exp $	*/
-
-/*
- * Copyright (C) 2006 Aleksey Cheusov
- *
- * This material is provided "as is", with absolutely no warranty expressed
- * or implied. Any use is at your own risk.
- *
- * Permission to use or copy this software for any purpose is hereby granted 
- * without fee. Permission to modify the code and to distribute modified
- * code is also granted without any restrictions.
- */
-
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint) 
-__RCSID("$NetBSD: wcsdup.c,v 1.3 2008/05/26 13:17:48 haad Exp $"); 
-#endif /* LIBC_SCCS and not lint */ 
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <assert.h>
-#include <wchar.h>
-
-__weak_alias(wcsdup,_wcsdup)
-
-wchar_t *
-wcsdup(const wchar_t *str)
-{
-	wchar_t *copy;
-	size_t len;
-
-	_DIAGASSERT(str != NULL);
-
-	len = wcslen(str) + 1;
-	copy = malloc(len * sizeof (wchar_t));
-
-	if (!copy)
-		return NULL;
-
-	return wmemcpy(copy, str, len);
-}
diff --git a/lib/libc/string/wcslcat.c b/lib/libc/string/wcslcat.c
deleted file mode 100644
index a62a9c17a..000000000
--- a/lib/libc/string/wcslcat.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: wcslcat.c,v 1.3 2012/06/25 22:32:46 abs Exp $	*/
-/*	from OpenBSD: strlcat.c,v 1.3 2000/11/24 11:10:02 itojun Exp 	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcslcat.c,v 1.3 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <wchar.h>
-
-/*
- * Appends src to string dst of size siz (unlike wcsncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns wcslen(initial dst) + wcslen(src); if retval >= siz,
- * truncation occurred.
- */
-size_t
-wcslcat(wchar_t *dst, const wchar_t *src, size_t siz)
-{
-	wchar_t *d = dst;
-	const wchar_t *s = src;
-	size_t n = siz;
-	size_t dlen;
-
-	_DIAGASSERT(dst != NULL);
-	_DIAGASSERT(src != NULL);
-
-	/* Find the end of dst and adjust bytes left but don't go past end */
-	while (*d != '\0' && n-- != 0)
-		d++;
-	dlen = d - dst;
-	n = siz - dlen;
-
-	if (n == 0)
-		return(dlen + wcslen(s));
-	while (*s != '\0') {
-		if (n != 1) {
-			*d++ = *s;
-			n--;
-		}
-		s++;
-	}
-	*d = '\0';
-
-	return(dlen + (s - src));	/* count does not include NUL */
-}
diff --git a/lib/libc/string/wcslcpy.c b/lib/libc/string/wcslcpy.c
deleted file mode 100644
index 9421ad824..000000000
--- a/lib/libc/string/wcslcpy.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: wcslcpy.c,v 1.3 2012/06/25 22:32:46 abs Exp $	*/
-/*	from OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp 	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcslcpy.c,v 1.3 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <assert.h>
-#include <wchar.h>
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns wcslen(src); if retval >= siz, truncation occurred.
- */
-size_t
-wcslcpy(wchar_t *dst, const wchar_t *src, size_t siz)
-{
-	wchar_t *d = dst;
-	const wchar_t *s = src;
-	size_t n = siz;
-
-	_DIAGASSERT(dst != NULL);
-	_DIAGASSERT(src != NULL);
-
-	/* Copy as many bytes as will fit */
-	if (n != 0 && --n != 0) {
-		do {
-			if ((*d++ = *s++) == 0)
-				break;
-		} while (--n != 0);
-	}
-
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
-		while (*s++)
-			;
-	}
-
-	return(s - src - 1);	/* count does not include NUL */
-}
diff --git a/lib/libc/string/wcslen.c b/lib/libc/string/wcslen.c
deleted file mode 100644
index 703d6ec41..000000000
--- a/lib/libc/string/wcslen.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: wcslen.c,v 1.3 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcslen.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcslen.c,v 1.3 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <wchar.h>
-
-size_t
-wcslen(const wchar_t *s)
-{
-	const wchar_t *p;
-
-	_DIAGASSERT(s != NULL);
-
-	p = s;
-	while (*p)
-		p++;
-
-	return p - s;
-}
diff --git a/lib/libc/string/wcsncasecmp.c b/lib/libc/string/wcsncasecmp.c
deleted file mode 100644
index 7500e511e..000000000
--- a/lib/libc/string/wcsncasecmp.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: wcsncasecmp.c,v 1.4 2013/05/17 12:55:57 joerg Exp $	*/
-
-/*
- * Copyright (C) 2006 Aleksey Cheusov
- *
- * This material is provided "as is", with absolutely no warranty expressed
- * or implied. Any use is at your own risk.
- *
- * Permission to use or copy this software for any purpose is hereby granted 
- * without fee. Permission to modify the code and to distribute modified
- * code is also granted without any restrictions.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint) 
-__RCSID("$NetBSD: wcsncasecmp.c,v 1.4 2013/05/17 12:55:57 joerg Exp $"); 
-#endif /* LIBC_SCCS and not lint */ 
-
-#include "namespace.h"
-#include <assert.h>
-#include <wchar.h>
-#include <wctype.h>
-#include <locale.h>
-#include "setlocale_local.h"
-
-__weak_alias(wcsncasecmp,_wcsncasecmp)
-__weak_alias(wcsncasecmp_l,_wcsncasecmp_l)
-
-int
-wcsncasecmp_l(const wchar_t *s1, const wchar_t *s2, size_t n, locale_t loc)
-{
-	int lc1  = 0;
-	int lc2  = 0;
-	int diff = 0;
-
-	_DIAGASSERT(s1);
-	_DIAGASSERT(s2);
-
-	while (n--) {
-		lc1 = towlower_l(*s1, loc);
-		lc2 = towlower_l(*s2, loc);
-
-		diff = lc1 - lc2;
-		if (diff)
-			return diff;
-
-		if (!lc1)
-			return 0;
-
-		++s1;
-		++s2;
-	}
-
-	return 0;
-}
-
-int
-wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n)
-{
-	return wcsncasecmp_l(s1, s2, n, _current_locale());
-}
diff --git a/lib/libc/string/wcsncat.c b/lib/libc/string/wcsncat.c
deleted file mode 100644
index e76421f32..000000000
--- a/lib/libc/string/wcsncat.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: wcsncat.c,v 1.3 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcsncat.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcsncat.c,v 1.3 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <wchar.h>
-
-wchar_t *
-wcsncat(wchar_t *s1, const wchar_t *s2, size_t n)
-{
-	wchar_t *p;
-	wchar_t *q;
-	const wchar_t *r;
-
-	_DIAGASSERT(s1 != NULL);
-	_DIAGASSERT(s2 != NULL);
-
-	p = s1;
-	while (*p)
-		p++;
-	q = p;
-	r = s2;
-	while (*r && n) {
-		*q++ = *r++;
-		n--;
-	}
-	*q = '\0';
-	return s1;
-}
diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c
deleted file mode 100644
index 9703ddaaf..000000000
--- a/lib/libc/string/wcsncmp.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: wcsncmp.c,v 1.9 2012/06/25 22:32:46 abs Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)strncmp.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: wcsncmp.c,v 1.9 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <wchar.h>
-#include "runetype_local.h"
-
-int
-wcsncmp(const wchar_t *s1, const wchar_t *s2, size_t n)
-{
-
-	_DIAGASSERT(s1 != NULL);
-	_DIAGASSERT(s2 != NULL);
-
-	if (n == 0)
-		return (0);
-	do {
-		if (*s1 != *s2++) {
-			/* XXX assumes wchar_t = int */
-			return (*(const __nbrune_t *)s1 -
-			    *(const __nbrune_t *)--s2);
-		}
-		if (*s1++ == 0)
-			break;
-	} while (--n != 0);
-	return (0);
-}
diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c
deleted file mode 100644
index 586f805f2..000000000
--- a/lib/libc/string/wcsncpy.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: wcsncpy.c,v 1.4 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcsncpy.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcsncpy.c,v 1.4 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <wchar.h>
-
-wchar_t *
-wcsncpy(wchar_t *s1, const wchar_t *s2, size_t n)
-{
-	wchar_t *p;
-
-	_DIAGASSERT(s1 != NULL);
-	_DIAGASSERT(s2 != NULL);
-
-	p = s1;
-	while (n && *s2) {
-		*p++ = *s2++;
-		n--;
-	}
-	while (n) {
-		*p++ = L'\0';
-		n--;
-	}
-
-	return s1;
-}
diff --git a/lib/libc/string/wcspbrk.c b/lib/libc/string/wcspbrk.c
deleted file mode 100644
index c2894c22e..000000000
--- a/lib/libc/string/wcspbrk.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: wcspbrk.c,v 1.5 2011/11/24 18:44:25 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1999 Citrus Project,
- * Copyright (c) 2011 Joerg Sonnenberger,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcspbrk.c,v 1.2 2000/12/21 05:07:25 itojun Exp
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: wcspbrk.c,v 1.5 2011/11/24 18:44:25 joerg Exp $");
-
-#include <assert.h>
-#include <inttypes.h>
-#include <string.h>
-#include <wchar.h>
-
-#include "wcscspn_bloom.h"
-
-wchar_t *
-wcspbrk(const wchar_t *s, const wchar_t *set)
-{
-	size_t bloom[BLOOM_ARRAY_SIZE];
-	const wchar_t *p;
-	const wchar_t *q;
-
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(set != NULL);
-
-	if (set[0] == '\0')
-		return NULL;
-	if (set[1] == '\0')
-		return wcschr(s, set[0]);
-
-	wcsspn_bloom_init(bloom, set);
-
-	for (p = s; *p; ++p) {
-		if (!wcsspn_in_bloom(bloom, *p))
-			continue;
-
-		q = set;
-		do {
-			if (*p == *q)
-				return __UNCONST(p);
-		} while (*++q);
-	}
-	return NULL;
-}
diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c
deleted file mode 100644
index 65fca34c4..000000000
--- a/lib/libc/string/wcsrchr.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: wcsrchr.c,v 1.4 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcsrchr.c,v 1.2 2000/12/21 05:07:25 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcsrchr.c,v 1.4 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <wchar.h>
-
-wchar_t *
-wcsrchr(const wchar_t *s, wchar_t c)
-{
-	const wchar_t *p;
-
-	_DIAGASSERT(s != NULL);
-
-	p = s;
-	while (*p)
-		p++;
-	while (s <= p) {
-		if (*p == c)
-			return __UNCONST(p);
-		p--;
-	}
-	return NULL;
-}
diff --git a/lib/libc/string/wcsspn.c b/lib/libc/string/wcsspn.c
deleted file mode 100644
index cb33ec53a..000000000
--- a/lib/libc/string/wcsspn.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: wcsspn.c,v 1.4 2011/11/21 15:02:48 joerg Exp $	*/
-
-/*-
- * Copyright (c)1999,2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Citrus: xpg4dl/FreeBSD/lib/libc/string/wcsspn.c,v 1.3 2001/09/21 16:06:43 yamt Exp $
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: wcsspn.c,v 1.4 2011/11/21 15:02:48 joerg Exp $");
-
-#include <assert.h>
-#include <wchar.h>
-
-size_t
-wcsspn(const wchar_t *s, const wchar_t *set)
-{
-	const wchar_t *p;
-	const wchar_t *q;
-
-	_DIAGASSERT(s != NULL);
-	_DIAGASSERT(set != NULL);
-
-	for (p = s; *p; ++p) {
-		for (q = set; *q; ++q) {
-			if (*p == *q)
-				break;
-		}
-		if (!*q)
-			break;
-	}
-
-	return (p - s);
-}
diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c
deleted file mode 100644
index 99ae107ff..000000000
--- a/lib/libc/string/wcsstr.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: wcsstr.c,v 1.5 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcsstr.c,v 1.2 2000/12/21 05:07:25 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcsstr.c,v 1.5 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <wchar.h>
-
-wchar_t *
-#ifdef WCSWCS
-wcswcs(const wchar_t *big, const wchar_t *little)
-#else
-wcsstr(const wchar_t *big, const wchar_t *little)
-#endif
-{
-	const wchar_t *p;
-	const wchar_t *q;
-	const wchar_t *r;
-
-	_DIAGASSERT(big != NULL);
-	_DIAGASSERT(little != NULL);
-
-	if (!*little)
-		return __UNCONST(big);
-	if (wcslen(big) < wcslen(little))
-		return NULL;
-
-	p = big;
-	q = little;
-	while (*p) {
-		q = little;
-		r = p;
-		while (*q) {
-			if (*r != *q)
-				break;
-			q++;
-			r++;
-		}
-		if (!*q)
-			return __UNCONST(p);
-		p++;
-	}
-	return NULL;
-}
diff --git a/lib/libc/string/wcstok.3 b/lib/libc/string/wcstok.3
deleted file mode 100644
index a181afefd..000000000
--- a/lib/libc/string/wcstok.3
+++ /dev/null
@@ -1,135 +0,0 @@
-.\" $NetBSD: wcstok.3,v 1.6 2010/12/16 17:42:28 wiz Exp $
-.\"
-.\" Copyright (c) 1998 Softweyr LLC.  All rights reserved.
-.\"
-.\" strtok_r, from Berkeley strtok
-.\" Oct 13, 1998 by Wes Peters <wes@softweyr.com>
-.\"
-.\" Copyright (c) 1988, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notices, this list of conditions and the following disclaimer.
-.\"
-.\" 2. Redistributions in binary form must reproduce the above
-.\"    copyright notices, 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 Softweyr LLC, the
-.\"      University of California, Berkeley, and its contributors.
-.\"
-.\" 4. Neither the name of Softweyr LLC, 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 SOFTWEYR LLC, 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 SOFTWEYR LLC, 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.
-.\"
-.\" Original version ID:
-.\" FreeBSD: src/lib/libc/string/wcstok.3,v 1.4 2002/10/15 09:49:54 tjr Exp
-.\"
-.Dd October 3, 2002
-.Dt WCSTOK 3
-.Os
-.Sh NAME
-.Nm wcstok
-.Nd split wide-character string into tokens
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wcstok "wchar_t * restrict str" "const wchar_t * restrict sep" "wchar_t ** restrict last"
-.Sh DESCRIPTION
-The
-.Fn wcstok
-function
-is used to isolate sequential tokens in a nul-terminated wide-character
-string,
-.Fa str .
-These tokens are separated in the string by at least one of the
-characters in
-.Fa sep .
-The first time that
-.Fn wcstok
-is called,
-.Fa str
-should be specified; subsequent calls, wishing to obtain further tokens
-from the same string, should pass a null pointer instead.
-The separator string,
-.Fa sep ,
-must be supplied each time, and may change between calls.
-The context pointer
-.Fa last
-must be provided on each call.
-.Pp
-The
-.Fn wcstok
-function is the wide-character counterpart of the
-.Fn strtok_r
-function.
-.Sh RETURN VALUES
-The
-.Fn wcstok
-function
-returns a pointer to the beginning of each subsequent token in the string,
-after replacing the token itself with a nul wide character (L'\e0').
-When no more tokens remain, a null pointer is returned.
-.Sh EXAMPLES
-The following code fragment splits a wide-character string on
-.Tn ASCII
-space, tab and newline characters and writes the tokens to
-standard output:
-.Bd -literal -offset indent
-const wchar_t *seps = L" \et\en";
-wchar_t *last, *tok, text[] = L" \enone\ettwo\et\etthree  \en";
-
-for (tok = wcstok(text, seps, &last); tok != NULL;
-    tok = wcstok(NULL, seps, &last))
-	wprintf(L"%ls\en", tok);
-.Ed
-.Sh SEE ALSO
-.Xr strtok 3 ,
-.Xr wcschr 3 ,
-.Xr wcscspn 3 ,
-.Xr wcspbrk 3 ,
-.Xr wcsrchr 3 ,
-.Xr wcsspn 3
-.Sh STANDARDS
-The
-.Fn wcstok
-function
-conforms to
-.St -isoC-99 .
-.Pp
-Some early implementations of
-.Fn wcstok
-omit the context pointer argument,
-.Fa last ,
-and maintain state across calls in a static variable like
-.Xr strtok 3
-does.
diff --git a/lib/libc/string/wcstok.c b/lib/libc/string/wcstok.c
deleted file mode 100644
index 7580e677f..000000000
--- a/lib/libc/string/wcstok.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* $NetBSD: wcstok.c,v 1.4 2012/06/25 22:32:46 abs Exp $ */
-
-/*-
- * Copyright (c) 1998 Softweyr LLC.  All rights reserved.
- *
- * strtok_r, from Berkeley strtok
- * Oct 13, 1998 by Wes Peters <wes@softweyr.com>
- *
- * 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
- *    notices, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notices, 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 Softweyr LLC, 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 SOFTWEYR LLC, 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 SOFTWEYR LLC, 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.
- *
- * Original version ID:
- * FreeBSD: src/lib/libc/string/wcstok.c,v 1.1 2002/09/07 08:16:57 tjr Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcstok.c,v 1.4 2012/06/25 22:32:46 abs Exp $");
-#endif
-
-#include <assert.h>
-#include <wchar.h>
-
-wchar_t *
-wcstok(wchar_t * __restrict s, const wchar_t * __restrict delim,
-    wchar_t ** __restrict last)
-{
-	const wchar_t *spanp;
-	wchar_t c, sc;
-	wchar_t *tok;
-
-	/* s may be NULL */
-	_DIAGASSERT(delim != NULL);
-	_DIAGASSERT(last != NULL);
-
-	if (s == NULL && (s = *last) == NULL)
-		return (NULL);
-
-	/*
-	 * Skip (span) leading delimiters (s += wcsspn(s, delim), sort of).
-	 */
-cont:
-	c = *s++;
-	for (spanp = delim; (sc = *spanp++) != L'\0';) {
-		if (c == sc)
-			goto cont;
-	}
-
-	if (c == L'\0') {	/* no non-delimiter characters */
-		*last = NULL;
-		return (NULL);
-	}
-	tok = s - 1;
-
-	/*
-	 * Scan token (scan for delimiters: s += wcscspn(s, delim), sort of).
-	 * Note that delim must have one NUL; we stop if we see that, too.
-	 */
-	for (;;) {
-		c = *s++;
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == L'\0')
-					s = NULL;
-				else
-					s[-1] = L'\0';
-				*last = s;
-				return (tok);
-			}
-		} while (sc != L'\0');
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc/string/wcswcs.c b/lib/libc/string/wcswcs.c
deleted file mode 100644
index a22cf3f94..000000000
--- a/lib/libc/string/wcswcs.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: wcswcs.c,v 1.1 2003/03/05 20:18:17 tshiozak Exp $ */
-
-#define WCSWCS
-#include "wcsstr.c"
diff --git a/lib/libc/string/wcswidth.3 b/lib/libc/string/wcswidth.3
deleted file mode 100644
index b7a89a9ff..000000000
--- a/lib/libc/string/wcswidth.3
+++ /dev/null
@@ -1,64 +0,0 @@
-.\" $NetBSD: wcswidth.3,v 1.2 2006/10/16 08:48:45 wiz Exp $
-.\" FreeBSD: src/lib/libc/string/wcswidth.3,v 1.2 2002/12/09 14:04:05 ru Exp
-.\"
-.\" Copyright (c) 2002 Tim J. Robbins
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"
-.Dd August 20, 2002
-.Dt WCSWIDTH 3
-.Os
-.Sh NAME
-.Nm wcswidth
-.Nd "number of column positions in wide-character string"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft int
-.Fn wcswidth "const wchar_t *pwcs" "size_t n"
-.Sh DESCRIPTION
-The
-.Fn wcswidth
-function determines the number of column positions required for the first
-.Fa n
-characters of
-.Fa pwcs ,
-or until a nul wide character (L'\e0') is encountered.
-.Sh RETURN VALUES
-The
-.Fn wcswidth
-function returns 0 if
-.Fa pwcs
-is an empty string (L""),
-\-1 if a non-printing wide character is encountered,
-otherwise it returns the number of column positions occupied.
-.Sh SEE ALSO
-.Xr iswprint 3 ,
-.Xr wcwidth 3
-.Sh STANDARDS
-The
-.Fn wcswidth
-function conforms to
-.St -p1003.1-2001 .
diff --git a/lib/libc/string/wmemchr.3 b/lib/libc/string/wmemchr.3
deleted file mode 100644
index 0954f0062..000000000
--- a/lib/libc/string/wmemchr.3
+++ /dev/null
@@ -1,162 +0,0 @@
-.\"	$NetBSD: wmemchr.3,v 1.15 2010/12/16 17:42:28 wiz Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strcpy.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd May 1, 2009
-.Dt WMEMCHR 3
-.Os
-.Sh NAME
-.Nm wmemchr ,
-.Nm wmemcmp ,
-.Nm wmemcpy ,
-.Nm wmemmove ,
-.Nm wmemset ,
-.Nm wcscat ,
-.Nm wcschr ,
-.Nm wcscmp ,
-.Nm wcscpy ,
-.Nm wcscspn ,
-.Nm wcslcat ,
-.Nm wcslcpy ,
-.Nm wcslen ,
-.Nm wcsncat ,
-.Nm wcsncmp ,
-.Nm wcsncpy ,
-.Nm wcspbrk ,
-.Nm wcsrchr ,
-.Nm wcsspn ,
-.Nm wcsstr
-.Nm wcswcs
-.Nd wide-character string manipulation operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wmemchr "const wchar_t *s" "wchar_t c" "size_t n"
-.Ft int
-.Fn wmemcmp "const wchar_t *s1" "const wchar_t *s2" "size_t n"
-.Ft wchar_t *
-.Fn wmemcpy "wchar_t * restrict s1" "const wchar_t * restrict s2" "size_t n"
-.Ft wchar_t *
-.Fn wmemmove "wchar_t *s1" "const wchar_t *s2" "size_t n"
-.Ft wchar_t *
-.Fn wmemset "wchar_t *s" "wchar_t c" "size_t n"
-.Ft wchar_t *
-.Fn wcscat "wchar_t * restrict s1" "const wchar_t * restrict s2"
-.Ft wchar_t *
-.Fn wcschr "const wchar_t *s" "wchar_t c"
-.Ft int
-.Fn wcscmp "const wchar_t *s1" "const wchar_t *s2"
-.Ft wchar_t *
-.Fn wcscpy "wchar_t * restrict s1" "const wchar_t * restrict s2"
-.Ft size_t
-.Fn wcscspn "const wchar_t *s1" "const wchar_t *s2"
-.Ft size_t
-.Fn wcslcat "wchar_t *s1" "const wchar_t *s2" "size_t n"
-.Ft size_t
-.Fn wcslcpy "wchar_t *s1" "const wchar_t *s2" "size_t n"
-.Ft size_t
-.Fn wcslen "const wchar_t *s"
-.Ft wchar_t *
-.Fn wcsncat "wchar_t * restrict s1" "const wchar_t * restrict s2" "size_t n"
-.Ft int
-.Fn wcsncmp "const wchar_t *s1" "const wchar_t * s2" "size_t n"
-.Ft wchar_t *
-.Fn wcsncpy "wchar_t * restrict s1" "const wchar_t * restrict s2" "size_t n"
-.Ft wchar_t *
-.Fn wcspbrk "const wchar_t *s1" "const wchar_t *s2"
-.Ft wchar_t *
-.Fn wcsrchr "const wchar_t *s" "wchar_t c"
-.Ft size_t
-.Fn wcsspn "const wchar_t *s1" "const wchar_t *s2"
-.Ft wchar_t *
-.Fn wcsstr "const wchar_t *s1" "const wchar_t *s2"
-.Ft wchar_t *
-.Fn wcswcs "const wchar_t *s1" "const wchar_t *s2"
-.Sh DESCRIPTION
-These functions implement string manipulation operations over wide-character
-strings.
-For a detailed description, refer to the documents for the respective
-single-byte counterpart, such as
-.Xr memchr 3 .
-The
-.Fn wcswcs
-function is not a part of
-.St -isoC
-and
-.St -isoC-amd1 ,
-the
-.Fn wcsstr
-function is strongly recommended to be used.
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr memcmp 3 ,
-.Xr memcpy 3 ,
-.Xr memmove 3 ,
-.Xr memset 3 ,
-.Xr stpcpy 3 ,
-.Xr stpncpy 3 ,
-.Xr strcasecmp 3 ,
-.Xr strcat 3 ,
-.Xr strchr 3 ,
-.Xr strcmp 3 ,
-.Xr strcpy 3 ,
-.Xr strcspn 3 ,
-.Xr strdup 3 ,
-.Xr strlcat 3 ,
-.Xr strlcpy 3 ,
-.Xr strlen 3 ,
-.Xr strncat 3 ,
-.Xr strncmp 3 ,
-.Xr strncpy 3 ,
-.Xr strnlen 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3
-.Sh STANDARDS
-These functions conform to
-.St -isoC-99
-and were first introduced in
-.St -isoC-amd1 ,
-with the exception of
-.Fn wcslcat
-and
-.Fn wcslcpy ,
-which are extensions.
-The
-.Fn wcswcs
-function conforms to
-.St -xpg4.2 .
diff --git a/lib/libc/string/wmemchr.c b/lib/libc/string/wmemchr.c
deleted file mode 100644
index 72735a7cd..000000000
--- a/lib/libc/string/wmemchr.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: wmemchr.c,v 1.4 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wmemchr.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemchr.c,v 1.4 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <wchar.h>
-
-wchar_t	*
-wmemchr(const wchar_t *s, wchar_t c, size_t n)
-{
-	size_t i;
-
-	_DIAGASSERT(s != NULL);
-
-	for (i = 0; i < n; i++) {
-		if (*s == c)
-			return __UNCONST(s);
-		s++;
-	}
-	return NULL;
-}
diff --git a/lib/libc/string/wmemcmp.c b/lib/libc/string/wmemcmp.c
deleted file mode 100644
index f0055a556..000000000
--- a/lib/libc/string/wmemcmp.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: wmemcmp.c,v 1.7 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wmemcmp.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemcmp.c,v 1.7 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <wchar.h>
-#include "runetype_local.h"
-
-int
-wmemcmp(const wchar_t *s1, const wchar_t *s2, size_t n)
-{
-	size_t i;
-
-	_DIAGASSERT(s1 != NULL);
-	_DIAGASSERT(s2 != NULL);
-
-	for (i = 0; i < n; i++) {
-		if (*s1 != *s2) {
-			/* wchar might be unsigned */
-			return *(const __nbrune_t *)s1 >
-			       *(const __nbrune_t *)s2 ? 1 : -1;
-		}
-		s1++;
-		s2++;
-	}
-	return 0;
-}
diff --git a/lib/libc/string/wmemcpy.c b/lib/libc/string/wmemcpy.c
deleted file mode 100644
index b648fb886..000000000
--- a/lib/libc/string/wmemcpy.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: wmemcpy.c,v 1.3 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wmemcpy.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemcpy.c,v 1.3 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <string.h>
-#include <wchar.h>
-
-wchar_t *
-wmemcpy(wchar_t *d, const wchar_t *s, size_t n)
-{
-
-	_DIAGASSERT(d != NULL);
-	_DIAGASSERT(s != NULL);
-
-	return (wchar_t *)memcpy(d, s, n * sizeof(wchar_t));
-}
diff --git a/lib/libc/string/wmemmove.c b/lib/libc/string/wmemmove.c
deleted file mode 100644
index e05746769..000000000
--- a/lib/libc/string/wmemmove.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: wmemmove.c,v 1.3 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wmemmove.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemmove.c,v 1.3 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <string.h>
-#include <wchar.h>
-
-wchar_t *
-wmemmove(wchar_t *d, const wchar_t *s, size_t n)
-{
-
-	_DIAGASSERT(d != NULL);
-	_DIAGASSERT(s != NULL);
-
-	return (wchar_t *)memmove(d, s, n * sizeof(wchar_t));
-}
diff --git a/lib/libc/string/wmemset.c b/lib/libc/string/wmemset.c
deleted file mode 100644
index 597da33ad..000000000
--- a/lib/libc/string/wmemset.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: wmemset.c,v 1.3 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wmemset.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemset.c,v 1.3 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <assert.h>
-#include <wchar.h>
-
-wchar_t	*
-wmemset(wchar_t *s, wchar_t c, size_t n)
-{
-	size_t i;
-	wchar_t *p;
-
-	_DIAGASSERT(s != NULL);
-
-	p = (wchar_t *)s;
-	for (i = 0; i < n; i++) {
-		*p = c;
-		p++;
-	}
-	return s;
-}
diff --git a/lib/libc/sys/Lint___clone.c b/lib/libc/sys/Lint___clone.c
deleted file mode 100644
index 3c718d4ac..000000000
--- a/lib/libc/sys/Lint___clone.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* $NetBSD: Lint___clone.c,v 1.2 2003/01/18 11:32:58 thorpej Exp $ */
-
-/*
- * This file placed in the public domain.
- * Jason R. Thorpe, July 16, 2001.
- */
-
-#include <sched.h>
-
-/*ARGSUSED*/
-pid_t
-__clone(int (*func)(void *), void *stack, int flags, void *arg)
-{
-	return (0);
-}
diff --git a/lib/libc/sys/Lint___sigaction14.c b/lib/libc/sys/Lint___sigaction14.c
deleted file mode 100644
index d21386964..000000000
--- a/lib/libc/sys/Lint___sigaction14.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $NetBSD: Lint___sigaction14.c,v 1.1 2009/04/10 23:14:58 christos Exp $ */
-
-#include <signal.h>
-
-/*ARGSUSED*/
-int
-__sigaction14(int sig, const struct sigaction *nact, struct sigaction *oact)
-{
-	return 0;
-}
diff --git a/lib/libc/sys/Lint___syscall.c b/lib/libc/sys/Lint___syscall.c
deleted file mode 100644
index e27ec699e..000000000
--- a/lib/libc/sys/Lint___syscall.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: Lint___syscall.c,v 1.3 2003/01/18 11:32:58 thorpej Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <stdarg.h>
-#include <unistd.h>
-
-/*ARGSUSED*/
-quad_t
-__syscall(quad_t arg1, ...)
-{
-	return (0);
-}
diff --git a/lib/libc/sys/Lint___vfork14.c b/lib/libc/sys/Lint___vfork14.c
deleted file mode 100644
index c3eb792c6..000000000
--- a/lib/libc/sys/Lint___vfork14.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* $NetBSD: Lint___vfork14.c,v 1.3 2012/06/24 15:26:03 christos Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <unistd.h>
-
-/*ARGSUSED*/
-pid_t
-__vfork14(void)
-{
-	return (0);
-}
diff --git a/lib/libc/sys/Lint_brk.c b/lib/libc/sys/Lint_brk.c
deleted file mode 100644
index 19ae69383..000000000
--- a/lib/libc/sys/Lint_brk.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: Lint_brk.c,v 1.3 2000/06/14 06:49:10 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <unistd.h>
-
-/*ARGSUSED*/
-int
-brk(addr)
-	void *addr;
-{
-	return (0);
-}
diff --git a/lib/libc/sys/Lint_clone.c b/lib/libc/sys/Lint_clone.c
deleted file mode 100644
index b4fd98cda..000000000
--- a/lib/libc/sys/Lint_clone.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* $NetBSD: Lint_clone.c,v 1.2 2003/01/18 11:32:58 thorpej Exp $ */
-
-/*
- * This file placed in the public domain.
- * Jason R. Thorpe, July 16, 2001.
- */
-
-#include <sched.h>
-
-/*ARGSUSED*/
-pid_t
-clone(int (*func)(void *), void *stack, int flags, void *arg)
-{
-	return (0);
-}
diff --git a/lib/libc/sys/Lint_exect.c b/lib/libc/sys/Lint_exect.c
deleted file mode 100644
index 799107a44..000000000
--- a/lib/libc/sys/Lint_exect.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: Lint_exect.c,v 1.2 2000/06/14 06:49:10 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <unistd.h>
-
-/*ARGSUSED*/
-int
-exect(path, argv, envp)
-	const char *path;
-	char * const * argv;
-	char * const * envp;
-{
-	return (0);
-}
diff --git a/lib/libc/sys/Lint_getcontext.c b/lib/libc/sys/Lint_getcontext.c
deleted file mode 100644
index a4fc67cf2..000000000
--- a/lib/libc/sys/Lint_getcontext.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*	$NetBSD: Lint_getcontext.c,v 1.2 2003/01/18 11:32:58 thorpej Exp $	*/
-
-/*
- * This file placed in the public domain.
- * Klaus Klein, January 26, 1999.
- */
-
-#include <ucontext.h>
-
-/*ARGSUSED*/
-int
-getcontext(ucp)
-	ucontext_t *ucp;
-{
-
-	return (0);
-}
diff --git a/lib/libc/sys/Lint_pipe.c b/lib/libc/sys/Lint_pipe.c
deleted file mode 100644
index a86db166f..000000000
--- a/lib/libc/sys/Lint_pipe.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: Lint_pipe.c,v 1.2 2000/06/14 06:49:10 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <unistd.h>
-
-/*ARGSUSED*/
-int
-pipe(filedes)
-	int filedes[2];
-{
-	return (0);
-}
diff --git a/lib/libc/sys/Lint_ptrace.c b/lib/libc/sys/Lint_ptrace.c
deleted file mode 100644
index 47232ddf4..000000000
--- a/lib/libc/sys/Lint_ptrace.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: Lint_ptrace.c,v 1.2 2000/06/14 06:49:10 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <unistd.h>
-
-/*ARGSUSED*/
-int
-ptrace(request, pid, addr, data)
-	int request;
-	pid_t pid;
-	caddr_t addr;
-	int data;
-{
-	return (0);
-}
diff --git a/lib/libc/sys/Lint_sbrk.c b/lib/libc/sys/Lint_sbrk.c
deleted file mode 100644
index e8275a6aa..000000000
--- a/lib/libc/sys/Lint_sbrk.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: Lint_sbrk.c,v 1.3 2000/06/14 06:49:10 cgd Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <unistd.h>
-
-/*ARGSUSED*/
-void *
-sbrk(incr)
-	intptr_t incr;
-{
-	return (0);
-}
diff --git a/lib/libc/sys/Lint_syscall.c b/lib/libc/sys/Lint_syscall.c
deleted file mode 100644
index b3ed785dd..000000000
--- a/lib/libc/sys/Lint_syscall.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: Lint_syscall.c,v 1.4 2003/01/18 11:32:58 thorpej Exp $ */
-
-/*
- * This file placed in the public domain.
- * Chris Demetriou, November 5, 1997.
- */
-
-#include <stdarg.h>
-#include <unistd.h>
-
-/*ARGSUSED*/
-int
-syscall(int arg1, ...)
-{
-	return (0);
-}
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
deleted file mode 100644
index 97af9bdc9..000000000
--- a/lib/libc/sys/Makefile.inc
+++ /dev/null
@@ -1,389 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.227 2015/01/31 23:10:56 christos Exp $
-#	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
-
-.if defined(__MINIX)
-.PATH: ${.CURDIR}/sys
-.else
-# sys sources
-.PATH: ${ARCHDIR}/sys ${.CURDIR}/sys
-
-# other sources shared with the kernel, used in syscalls
-SRCS+=	cpuset.c
-# glue to offer userland wrappers for some syscalls
-SRCS+=	posix_fadvise.c posix_madvise.c sched.c sigqueue.c sigtimedwait.c \
-	sigwait.c sigwaitinfo.c statvfs.c swapon.c semctl.c 
-
-.if ${RUMPRUN} != "yes"
-# modules with non-default implementations on at least one architecture:
-SRCS+=	__clone.S __vfork14.S brk.S exect.S fork.S pipe.S \
-	getcontext.S \
-	ptrace.S sbrk.S shmat.S \
-	syscall.S __syscall.S __clone.S cerror.S
-
-_LSRC+=	Lint___clone.c Lint___vfork14.c Lint_brk.c Lint_clone.c \
-	Lint_getcontext.c Lint_exect.c Lint_pipe.c Lint_ptrace.c \
-	Lint_sbrk.c Lint___sigaction14.c Lint_syscall.c Lint___syscall.c \
-	LintSysNormal.c LintSysNoerr.c LintSysPseudoNoerr.c
-
-.if ${MKLINT} != "no"
-LSRCS+=		${_LSRC}
-DPSRCS+=	${_LSRC:MLintSys*.c}
-CLEANFILES+=	${_LSRC:MLintSys*.c}
-.endif
-
-# glue to provide compatibility between GCC 1.X and 2.X and for compat
-# with old syscall interfaces.
-GLUE+= fdiscard.c ftruncate.c lseek.c mmap.c \
-	pread.c preadv.c pwrite.c pwritev.c truncate.c ntp_adjtime.c \
-	mknodat.c
-GLUENOERR+= posix_fallocate.c
-GLUE50+= adjtime.c clock_settime.c settimeofday.c
-
-# 'glue' files might .c or .S depending on the architecture
-.for glue in ${GLUE}
-. if exists(${glue:.c=.S})
-# Build the ASM glue file
-SRCS+=${glue:.c=.S}
-. else
-.  if exists(__${glue:.c=.S})
-SRCS+=__${glue:.c=.S} ${glue}
-.  else
-# Build the C glue file
-SRCS+= ${glue}
-# and an asm entry for __<syscall>
-ASM_GLUE+= tmp_${glue:.c=.S}
-.  endif
-. endif
-.endfor
-
-# 'glue' files might .c or .S depending on the architecture
-.for glue in ${GLUENOERR}
-. if exists(${glue:.c=.S})
-# Build the ASM glue file
-SRCS+=${glue:.c=.S}
-. else
-.  if exists(__${glue:.c=.S})
-SRCS+=__${glue:.c=.S} ${glue}
-.  else
-# Build the C glue file
-SRCS+= ${glue}
-# and an asm entry for __<syscall>
-ASM_GLUENOERR+= tmp_${glue:.c=.S}
-.  endif
-. endif
-.endfor
-
-# 'glue' files might .c or .S depending on the architecture
-.for glue in ${GLUE50}
-. if exists(${glue:.c=.S})
-# Build the ASM glue file
-SRCS+=${glue:.c=.S}
-. else
-.  if exists(__${glue:.c=}50.S)
-SRCS+=__${glue:.c=}50.S ${glue}
-.  else
-# Build the C glue file
-SRCS+= ${glue}
-# and an asm entry for __<syscall>
-ASM_GLUE+= tmp___${glue:.c=}50.S
-.  endif
-. endif
-.endfor
-
-# modules with default implementations on all architectures:
-ASM=	access.S acct.S \
-	bind.S \
-	chdir.S chflags.S chmod.S chown.S chroot.S clock_nanosleep.S \
-		__clock_getres50.S __clock_gettime50.S \
-	dup.S dup2.S dup3.S \
-	extattrctl.S \
-		extattr_delete_fd.S extattr_delete_file.S \
-		extattr_delete_link.S extattr_get_fd.S extattr_get_file.S \
-		extattr_get_link.S extattr_list_fd.S extattr_list_file.S \
-		extattr_list_link.S extattr_set_fd.S extattr_set_file.S \
-		extattr_set_link.S \
-	setxattr.S getxattr.S listxattr.S removexattr.S \
-		lsetxattr.S lgetxattr.S llistxattr.S lremovexattr.S \
-		fsetxattr.S fgetxattr.S flistxattr.S fremovexattr.S \
-	faccessat.S fchdir.S fchflags.S fchmod.S fchmodat.S fchown.S \
-		fchownat.S fchroot.S fexecve.S __fhopen40.S __fhstat50.S \
-		__fhstatvfs140.S fktrace.S flock.S fpathconf.S __fstat50.S \
-		fstatvfs1.S fstatat.S  __futimes50.S futimens.S \
-	__getcwd.S __getdents30.S __getfh30.S getvfsstat.S getgroups.S\
-		__getitimer50.S __getlogin.S getpeername.S getpgid.S getpgrp.S \
-		getpriority.S getrlimit.S __getrusage50.S getsid.S \
-		getsockname.S getsockopt.S __gettimeofday50.S \
-	ioctl.S \
-	kqueue.S kqueue1.S ktrace.S \
-		_ksem_close.S _ksem_destroy.S _ksem_getvalue.S _ksem_init.S \
-		_ksem_post.S _ksem_timedwait.S _ksem_trywait.S _ksem_unlink.S \
-		_ksem_wait.S _ksem_open.S \
-	lchflags.S lchmod.S lchown.S lfs_bmapv.S lfs_markv.S lfs_segclean.S \
-		__lfs_segwait50.S link.S linkat.S listen.S __lstat50.S \
-		__lutimes50.S _lwp_create.S _lwp_exit.S _lwp_kill.S \
-		___lwp_park60.S _lwp_self.S _lwp_wait.S _lwp_unpark.S \
-		_lwp_unpark_all.S _lwp_suspend.S _lwp_continue.S \
-		_lwp_wakeup.S _lwp_detach.S _lwp_setprivate.S \
-		_lwp_setname.S _lwp_getname.S _lwp_ctl.S \
-	madvise.S mincore.S minherit.S mkdir.S mkdirat.S mkfifo.S mkfifoat.S \
-		__mknod50.S mlock.S mlockall.S modctl.S __mount50.S \
-		mprotect.S __msgctl50.S msgget.S munlock.S munlockall.S \
-		munmap.S \
-	nfssvc.S __ntp_gettime50.S \
-	openat.S \
-	paccept.S pathconf.S pipe2.S pmc_get_info.S pmc_control.S \
-		__posix_chown.S __posix_fchown.S __posix_lchown.S \
-		__posix_rename.S profil.S \
-	__quotactl.S \
-	rasctl.S readlinkat.S reboot.S recvfrom.S recvmmsg.S recvmsg.S rename.S \
-		renameat.S revoke.S rmdir.S \
-	semconfig.S semget.S semop.S \
-		sendmmsg.S sendmsg.S sendto.S setegid.S seteuid.S \
-		setgid.S setgroups.S __setitimer50.S __setlogin.S setpgid.S \
-		setpriority.S \
-		setregid.S setreuid.S setrlimit.S setsid.S setsockopt.S \
-		setuid.S __shmctl50.S shmdt.S shmget.S shutdown.S \
-		sigqueueinfo.S \
-		__sigaltstack14.S __sigpending14.S __sigaction_sigtramp.S \
-		____sigtimedwait50.S __socket30.S socketpair.S __stat50.S \
-		statvfs1.S swapctl.S symlink.S symlinkat.S __sysctl.S \
-	timer_create.S timer_delete.S __timer_gettime50.S timer_getoverrun.S \
-		____semctl50.S __timer_settime50.S \
-	umask.S undelete.S unlink.S unlinkat.S unmount.S __utimes50.S \
-		utimensat.S utrace.S uuidgen.S vadvise.S
-
-# sa compat syscalls
-SAASM+=	sa_register.S sa_stacks.S sa_enable.S sa_setconcurrency.S sa_yield.S \
-		sa_preempt.S
-
-# modules with potentially non default implementations
-ASM_MD=	_lwp_getprivate.S mremap.S 
-
-.for f in ${ASM_MD}
-. if !exists(${f})
-   ASM+=	tmp_${f}
-. else
-   SRCS+=	${f}
-. endif
-.endfor
-
-WEAKASM= accept.S __aio_suspend50.S close.S connect.S execve.S \
-	fcntl.S fdatasync.S fsync.S \
-	fsync_range.S __kevent50.S \
-	kill.S mq_receive.S mq_send.S __mq_timedreceive50.S __mq_timedsend50.S \
-	msgrcv.S msgsnd.S __msync13.S  __nanosleep50.S open.S poll.S \
-	__pollts50.S __pselect50.S read.S readlink.S \
-	readv.S _sched_setparam.S _sched_getparam.S _sched_setaffinity.S \
-	_sched_getaffinity.S sched_yield.S \
-	__select50.S setcontext.S __sigprocmask14.S __sigsuspend14.S sysarch.S \
-	__wait450.S write.S writev.S
-
-NOERR=	getegid.S geteuid.S getgid.S getpid.S getppid.S getuid.S \
-	issetugid.S posix_spawn.S sync.S __posix_fadvise50.S
-
-PSEUDONOERR=	_exit.S
-
-_GENFILES=	${ASM} ${WEAKASM} ${NOERR} ${PSEUDONOERR} \
-	${ASM_GLUE} ${ASM_GLUENOERR}
-
-SRCS+=		${_GENFILES}
-CLEANFILES+=	${_GENFILES}
-
-ASMDEPS=	${.CURDIR}/sys/Makefile.inc ${ARCHDIR}/SYS.h \
-		${DESTDIR}/usr/include/sys/syscall.h
-
-_LINTASM=	${ASM:Nsa_*.S} ${WEAKASM:Nsa_*.S}
-.endif # RUMPRUN != yes
-
-${ASM}: ${ASMDEPS}
-	${_MKTARGET_CREATE}
-	printf '#include "SYS.h"\nRSYSCALL(${.PREFIX:S/tmp_//})\n' >${.TARGET}
-
-${ASM_GLUE}: ${ASMDEPS}
-	${_MKTARGET_CREATE}
-	printf '#include "SYS.h"\nPSEUDO(${.PREFIX:S/tmp_/__/},${.PREFIX:S/tmp_//})\n' >${.TARGET}
-
-${ASM_GLUENOERR}: ${ASMDEPS}
-	${_MKTARGET_CREATE}
-	printf '#include "SYS.h"\nPSEUDO_NOERROR(${.PREFIX:S/tmp_/__/},${.PREFIX:S/tmp_//})\n' >${.TARGET}
-
-${WEAKASM}: ${ASMDEPS}
-	${_MKTARGET_CREATE}
-	printf '#include "SYS.h"\nWSYSCALL(${.PREFIX},_sys_${.PREFIX})\nWEAK_ALIAS(_${.PREFIX},_sys_${.PREFIX})\n' >${.TARGET}
-
-${SAASM}: ${ASMDEPS}
-	${_MKTARGET_CREATE}
-	printf '#include "SYS.h"\n_SYSCALL(${.PREFIX:S/tmp_//},${.PREFIX:S/tmp_//:S/sa_/compat_60_sa_/})\n' >${.TARGET}
-
-${NOERR}: ${ASMDEPS}
-	${_MKTARGET_CREATE}
-	printf '#include "SYS.h"\nRSYSCALL_NOERROR(${.PREFIX})\n' >${.TARGET}
-
-${PSEUDONOERR}: ${ASMDEPS}
-	${_MKTARGET_CREATE}
-	printf '#include "SYS.h"\nPSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/_//})\n' >${.TARGET}
-	# add an _Exit alias to _exit
-	printf 'STRONG_ALIAS(${.PREFIX:S/e/E/},${.PREFIX})\n' >>${.TARGET}
-
-LintSysNormal.c: ${LIBCDIR}/sys/makelintstub \
-    ${DESTDIR}/usr/include/sys/syscall.h ${_LINTASM}
-	${_MKTARGET_CREATE}
-	CPP=${CPP:Q} ${HOST_SH} ${LIBCDIR}/sys/makelintstub -o ${.TARGET} \
-	    -s ${DESTDIR}/usr/include/sys/syscall.h ${_LINTASM:S/tmp_//}
-
-LintSysNoerr.c: ${LIBCDIR}/sys/makelintstub \
-    ${DESTDIR}/usr/include/sys/syscall.h
-	${_MKTARGET_CREATE}
-	CPP=${CPP:Q} ${HOST_SH} ${LIBCDIR}/sys/makelintstub -o ${.TARGET} -n \
-	    -s ${DESTDIR}/usr/include/sys/syscall.h ${NOERR}
-
-LintSysPseudoNoerr.c: ${LIBCDIR}/sys/makelintstub \
-    ${DESTDIR}/usr/include/sys/syscall.h
-	${_MKTARGET_CREATE}
-	CPP=${CPP:Q} ${HOST_SH} ${LIBCDIR}/sys/makelintstub -o ${.TARGET} -p \
-	    -s ${DESTDIR}/usr/include/sys/syscall.h ${PSEUDONOERR}
-.endif # !defined(__MINIX)
-
-.if !defined(__MINIX)
-MAN+=	accept.2 access.2 acct.2 adjtime.2 bind.2 brk.2 chdir.2 \
-	chflags.2 chmod.2 chown.2 chroot.2 clock_settime.2 clone.2 close.2 \
-	connect.2 dup.2 execve.2 _exit.2 extattr_get_file.2 \
-	fcntl.2 fdatasync.2 fdiscard.2 fhopen.2 \
-	flock.2 fork.2 fsync.2 getcontext.2 getdents.2 \
-	getfh.2 getvfsstat.2 getgid.2 getgroups.2 \
-	getitimer.2 getlogin.2 getpeername.2 getpgrp.2 getpid.2 \
-	getpriority.2 getrlimit.2 getrusage.2 getsid.2 getsockname.2 \
-	getsockopt.2 gettimeofday.2 getuid.2 intro.2 ioctl.2 issetugid.2 \
-	kill.2 kqueue.2 ktrace.2 \
-	lfs_bmapv.2 lfs_markv.2 lfs_segclean.2 lfs_segwait.2 \
-	link.2 listen.2 lseek.2 \
-	_lwp_create.2 _lwp_ctl.2 _lwp_detach.2 _lwp_exit.2 \
-	_lwp_self.2 _lwp_setname.2 \
-	_lwp_suspend.2 _lwp_wakeup.2 _lwp_wait.2 _lwp_kill.2 \
-	_lwp_getname.2 _lwp_getprivate.2 \
-	_lwp_park.2 _lwp_unpark.2 _lwp_unpark_all.2 \
-	mkdir.2 mkfifo.2 mknod.2 \
-	madvise.2 mincore.2 minherit.2 mlock.2 mlockall.2 mmap.2 modctl.2 \
-	mount.2 \
-	mprotect.2 mremap.2 msgctl.2 msgget.2 msgrcv.2 msgsnd.2 msync.2 \
-	munmap.2 nanosleep.2 nfssvc.2 ntp_adjtime.2 open.2 pathconf.2 pipe.2 
-.else
-MAN+=	adjtime.2 clock_settime.2 getvfsstat.2 pipe.2 getrusage.2 reboot.2
-.endif # !defined(__MINIX)
-.if !defined(__MINIX)
-MAN+=	pmc_control.2 poll.2 posix_fadvise.2 \
-	profil.2 ptrace.2 __quotactl.2 \
-	rasctl.2 read.2 readlink.2 \
-	reboot.2 recv.2 rename.2 revoke.2 rmdir.2 \
-	select.2 semctl.2 \
-	semget.2 semop.2 send.2 setgroups.2 setpgid.2 setregid.2 \
-	setreuid.2 setsid.2 setuid.2 shmat.2 shmctl.2 shmget.2 \
-	shutdown.2 sigaction.2 sigaltstack.2 sigpending.2 \
-	sigprocmask.2 sigqueue.2 sigstack.2 sigsuspend.2 sigtimedwait.2 \
-	socket.2 \
-	socketpair.2 stat.2 statvfs.2 swapctl.2 swapon.3 symlink.2 \
-	sync.2 sysarch.2 syscall.2 timer_create.2 timer_delete.2 \
-	timer_settime.2 truncate.2 umask.2 undelete.2 \
-	unlink.2 utimes.2 utrace.2 uuidgen.2 vfork.2 wait.2 write.2
-
-MLINKS+=_exit.2 _Exit.2
-MLINKS+=brk.2 sbrk.2
-MLINKS+=clone.2 __clone.2
-MLINKS+=dup.2 dup2.2
-MLINKS+=dup.2 dup3.2
-MLINKS+=chdir.2 fchdir.2
-MLINKS+=chflags.2 fchflags.2 chflags.2 lchflags.2
-MLINKS+=chmod.2 fchmod.2 chmod.2 lchmod.2
-MLINKS+=chown.2 fchown.2 chown.2 lchown.2
-MLINKS+=chroot.2 fchroot.2
-.else
-MLINKS+=clock_settime.2 clock_gettime.2
-MLINKS+=clock_settime.2 clock_getres.2
-.endif # !defined(__MINIX)
-.if !defined(__MINIX)
-MLINKS+=extattr_get_file.2 extattr_set_file.2 \
-	extattr_get_file.2 extattr_delete_file.2 \
-	extattr_get_file.2 extattr_list_file.2 \
-	extattr_get_file.2 extattr_get_fd.2 \
-	extattr_get_file.2 extattr_set_fd.2 \
-	extattr_get_file.2 extattr_delete_fd.2 \
-	extattr_get_file.2 extattr_list_fd.2 \
-	extattr_get_file.2 extattr_get_link.2 \
-	extattr_get_file.2 extattr_set_link.2 \
-	extattr_get_file.2 extattr_delete_link.2 \
-	extattr_get_file.2 extattr_list_link.2
-MLINKS+=access.2 faccessat.2
-MLINKS+=chmod.2 fchmodat.2
-MLINKS+=chown.2 fchownat.2
-MLINKS+=fdiscard.2 posix_fallocate.2 
-MLINKS+=fhopen.2 fhstat.2 fhopen.2 fhstatvfs.2 fhopen.2 fhstatvfs1.2
-MLINKS+=stat.2 fstatat.2
-MLINKS+=fsync.2 fsync_range.2
-MLINKS+=getcontext.2 setcontext.2
-MLINKS+=getgid.2 getegid.2
-MLINKS+=getitimer.2 setitimer.2
-MLINKS+=getlogin.2 setlogin.2
-MLINKS+=getlogin.2 getlogin_r.2
-MLINKS+=getpgrp.2 getpgid.2
-MLINKS+=getpid.2 getppid.2
-MLINKS+=getpriority.2 setpriority.2
-MLINKS+=getrlimit.2 setrlimit.2
-MLINKS+=getsockopt.2 setsockopt.2
-MLINKS+=gettimeofday.2 settimeofday.2
-MLINKS+=getuid.2 geteuid.2
-MLINKS+=intro.2 errno.2
-MLINKS+=kqueue.2 kevent.2
-MLINKS+=ktrace.2 fktrace.2
-MLINKS+=lseek.2 seek.2
-MLINKS+=link.2 linkat.2
-MLINKS+=_lwp_suspend.2 _lwp_continue.2
-MLINKS+=_lwp_getprivate.2 _lwp_setprivate.2
-MLINKS+=madvise.2 posix_madvise.2
-MLINKS+=mlock.2 munlock.2
-MLINKS+=mlockall.2 munlockall.2
-MLINKS+=mkdir.2 mkdirat.2
-MLINKS+=mkfifo.2 mkfifoat.2
-MLINKS+=mknod.2 mknodat.2
-MLINKS+=mount.2 unmount.2
-MLINKS+=open.2 openat.2
-MLINKS+=ntp_adjtime.2 ntp_gettime.2
-MLINKS+=pathconf.2 fpathconf.2
-MLINKS+=pmc_control.2 pmc_get_info.2
-MLINKS+=poll.2 pollts.2
-MLINKS+=read.2 readv.2 read.2 pread.2 read.2 preadv.2
-MLINKS+=readlink.2 readlinkat.2
-MLINKS+=recv.2 recvfrom.2 recv.2 recvmsg.2 recv.2 recvmmsg.2
-MLINKS+=rename.2 renameat.2
-MLINKS+=select.2 pselect.2
-MLINKS+=send.2 sendmsg.2 send.2 sendto.2 send.2 sendmmsg.2
-MLINKS+=setpgid.2 setpgrp.2
-MLINKS+=setuid.2 setegid.2 setuid.2 seteuid.2 setuid.2 setgid.2
-MLINKS+=shmat.2 shmdt.2
-MLINKS+=symlink.2 symlinkat.2
-MLINKS+=timer_settime.2 timer_gettime.2 timer_settime.2 timer_getoverrun.2
-MLINKS+=sigqueue.2 sigqueueinfo.2
-MLINKS+=sigtimedwait.2 sigwaitinfo.2
-MLINKS+=sigtimedwait.2 sigwait.2
-MLINKS+=stat.2 fstat.2 stat.2 lstat.2
-MLINKS+=statvfs.2 fstatvfs.2
-MLINKS+=statvfs.2 statvfs1.2
-MLINKS+=statvfs.2 fstatvfs1.2
-MLINKS+=syscall.2 __syscall.2
-MLINKS+=truncate.2 ftruncate.2
-MLINKS+=unlink.2 unlinkat.2
-MLINKS+=utimes.2 futimes.2 utimes.2 lutimes.2
-MLINKS+=utimes.2 utimens.2 utimes.2 futimens.2 utimes.2 lutimens.2
-MLINKS+=utimes.2 utimensat.2
-MLINKS+=wait.2 wait3.2 wait.2 wait4.2 wait.2 waitpid.2
-MLINKS+=write.2 writev.2 write.2 pwrite.2 write.2 pwritev.2
-.else
-MLINKS+=pipe.2 pipe2.2
-MAN+=	statvfs.2
-MLINKS+=statvfs.2 fstatvfs.2
-MLINKS+=statvfs.2 statvfs1.2
-MLINKS+=statvfs.2 fstatvfs1.2
-.endif # !defined(__MINIX)
-.if !defined(__MINIX)
-MLINKS+=accept.2 paccept.2
-MLINKS+=nanosleep.2 clock_nanosleep.2
-.endif # !defined(__MINIX)
diff --git a/lib/libc/sys/__quotactl.2 b/lib/libc/sys/__quotactl.2
deleted file mode 100644
index 006cb82ba..000000000
--- a/lib/libc/sys/__quotactl.2
+++ /dev/null
@@ -1,355 +0,0 @@
-.\"	$NetBSD: __quotactl.2,v 1.3 2012/02/13 19:50:15 dholland Exp $
-.\"
-.\" Copyright (c) 1983, 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Robert Elz at The University of Melbourne.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"	@(#)quotactl.2	8.2 (Berkeley) 3/10/95
-.\"
-.Dd February 11, 2012
-.Dt __QUOTACTL 2
-.Os
-.Sh NAME
-.Nm __quotactl
-.Nd manipulate file system quotas
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/quota.h
-.In sys/quotactl.h
-.Ft int
-.Fn __quotactl "const char *path" "struct quotactl_args *args"
-.Sh DESCRIPTION
-The
-.Fn __quotactl
-call manipulates file system quotas.
-This is an internal interface and is documented for reference purposes
-only.
-All application and utility code should use the
-.Xr libquota 3
-interface.
-.Pp
-The
-.Fn __quotactl
-function performs one of several quota-related operations on the file
-system named by
-.Fa path .
-The operation and arguments to that operation are passed in the
-.Fa args
-argument.
-The operation is stored in the
-.Fa qc_op
-member of
-.Fa args .
-The arguments are placed in a union such that the first and second
-arguments of the operation
-.Dv QUOTACTL_EXAMPLE
-are found as the members
-.Fa u.example.qc_arg1
-and
-.Fa u.example.qc_arg2 .
-The descriptions below will refer to the operations as functions of
-the form
-.Fn QUOTACTL_EXAMPLE "int arg1" "int arg2"
-and elide the encoding of these arguments into the
-.Fa args
-structure.
-Explicit mention of the
-.Fa path
-argument is also omitted.
-.Pp
-There are fourteen quota control operations.
-These are:
-.Bl -tag -width abcdef
-.\" ************************************************************
-.It Fn QUOTACTL_STAT "struct quotastat *info"
-Information about the quota implementation on the selected volume is
-returned in
-.Fa info .
-The
-.Dv quotastat
-structure contains the following members:
-.Bl -tag -width qs_restrictions
-.It qs_implname
-A human-readable string describing the underlying implementation of
-quotas.
-This is suitable for display to users
-.Pq and system administrators
-but should not be interpreted by software.
-See
-.Xr quota_getimplname 3 .
-.It qs_numidtypes
-The number of ID types supported by this implementation.
-See
-.Xr quota_getnumidtypes 3 .
-.It qs_numobjtypes
-The number of object types supported by this implementation.
-See
-.Xr quota_getnumobjtypes 3 .
-.It qs_restrictions
-Flags identifying specific semantic limitations of the implementation.
-See
-.Xr quota_getrestrictions 3 .
-.El
-.\" ************************************************************
-.It Fn QUOTACTL_IDTYPESTAT "int idtype" "struct quotaidtypestat *info"
-Information about a particular ID type on the selected volume is
-returned in
-.Fa info .
-The
-.Dv quotaidtypestat
-structure contains the following members:
-.Bl -tag -width qs_restrictions
-.It qis_name
-The name of the ID type.
-See
-.Xr quota_idtype_getname 3 .
-.El
-.\" ************************************************************
-.It Fn QUOTACTL_OBJYPESTAT "int objtype" "struct quotaobjtypestat *info"
-Information about a particular object type on the selected volume is
-returned in
-.Fa info .
-The
-.Dv quotaobjtypestat
-structure contains the following members:
-.Bl -tag -width qs_restrictions
-.It qos_name
-The name of the object type.
-See
-.Xr quota_objtype_getname 3 .
-.It qos_isbytes
-A flag that is nonzero if the object type is something measured in
-bytes.
-See
-.Xr quota_objtype_isbytes 3 .
-.El
-.\" ************************************************************
-.It Fn QUOTACTL_GET "const struct quotakey *key" "struct quotaval *val"
-Return in
-.Fa val
-the quota information selected by
-.Fa key .
-See
-.Xr quota_get 3 .
-.\" ************************************************************
-.It Fn QUOTACTL_PUT "const struct quotakey *key" "const struct quotaval *val"
-The quota information selected by
-.Fa key
-is updated to the values provided in
-.Fa val .
-Note that the current usage information, which is file system
-meta-data, cannot be updated via this interface.
-If the usage information is incorrect a tool such as
-.Xr fsck 8
-or
-.Xr quotacheck 8
-with file-system-specific knowledge must be used to repair the
-on-disk information.
-See
-.Xr quota_put 3 .
-.\" ************************************************************
-.It Fn QUOTACTL_DELETE "const struct quotakey *key"
-The quota information selected by
-.Fa key
-is removed.
-See
-.Xr quota_delete 3 .
-.\" ************************************************************
-.It Fn QUOTACTL_CURSOROPEN "struct quotakcursor *cursor"
-A cursor for iterating the quota information is created.
-The
-.Dv quotakcursor
-structure is a semi-opaque type holding the iteration state used by
-the quota implementation.
-The caller is responsible for allocating and maintaining storage for
-the cursor.
-Every cursor that is opened should be closed.
-It is not specified whether a cursor remains valid if
-.Xr memcpy 3
-is used to move it to a different location in user memory.
-It is not specified whether or how a cursor may be duplicated.
-Passing an uninitialized, corrupted, or closed cursor to operations
-other than
-.Fn QUOTACTL_CURSOROPEN
-will produce unspecified behavior.
-As per general standards for system calls such actions must not
-produce undefined or materially adverse behavior in the kernel;
-however, the effect on a user process may be arbitrary.
-The
-.Xr libquota 3
-interface wraps the system call level quota cursors in a friendlier
-interface.
-See
-.Xr quota_opencursor 3 .
-.\" ************************************************************
-.It Fn QUOTACTL_CURSORCLOSE "struct quotakcursor *cursor"
-The cursor passed in is closed.
-See
-.Xr quotacursor_close 3 .
-.\" ************************************************************
-.It Fn QUOTACTL_CURSORSKIPIDTYPE "struct quotakcursor *cursor" "int idtype"
-This operation provides a hint that iteration can skip over a
-particular ID type.
-The implementation is not obliged to honor the hint.
-See
-.Xr quotacursor_skipidtype 3 .
-.\" ************************************************************
-.It Fn QUOTACTL_CURSORGET "struct quotakcursor *cursor" "struct quotakey *keys" "struct quotaval *vals" "unsigned maxnum" "unsigned *ret"
-This operation retrieves data at the current cursor position and
-advances it.
-Up to
-.Fa maxnum
-quota records are retrieved and stored into the arrays named by
-.Fa keys
-and
-.Fa vals .
-The number of records retrieved is stored into the variable pointed to
-by
-.Fa ret .
-See
-.Xr quotacursor_get 3
-and
-.Xr quotacursor_getn 3 .
-.\" ************************************************************
-.It Fn QUOTACTL_CURSORATEND "struct quotakcursor *cursor" "int *ret"
-This operation generates a nonzero value if the cursor has reached the
-end of the available quota information and zero otherwise.
-The generated value is stored into the variable pointed to by
-.Fa ret .
-See
-.Xr quotacursor_atend 3 .
-.\" ************************************************************
-.It Fn QUOTACTL_CURSORREWIND "struct quotakcursor *cursor"
-This operation updates the cursor state so that further calls to
-.Fn QUOTACTL_CURSORGET
-will begin again at the start of the iteration.
-See
-.Xr quotacursor_rewind 3 .
-.\" ************************************************************
-.It Fn QUOTACTL_QUOTAON "int idtype" "const char *quotafile"
-This operation is accepted only by old-style
-.Pq Dq quota1
-quota implementations.
-Quotas for the ID type named by
-.Fa idtype
-are switched on, and the file
-.Fa quotafile
-is used to hold the quota information.
-This operation can also be used when quotas are already switched on
-to change the file used to hold the quota information.
-Note however that as the current usage information in the file must be
-consistent with the current state of the file system, in general it is
-not safe to call
-.Fn QUOTACTL_QUOTAON
-except in single-user mode.
-See
-.Xr quotaon 8
-for more information.
-Normally
-quotaon 8
-is run during the boot sequence after
-quotacheck 8 .
-Also see
-.Xr quota_quotaon 3 .
-.\" ************************************************************
-.It Fn QUOTACTL_QUOTAOFF "int idtype"
-This operation is accepted only by old-style
-.Pq Dq quota1
-quota implementations.
-Quotas for the ID type named by
-.Fa idtype
-are switched off.
-Once quotas are switched off the file system behaves as if no quotas
-are present.
-Normally
-quotaoff 8
-is run during the shutdown sequence.
-Also see
-.Xr quota_quotaoff 3 .
-.\" ************************************************************
-.El
-.Sh RETURN VALUES
-On success,
-.Fn __quotactl
-returns 0.
-Otherwise the value \-1 is returned and an error code reflecting the
-reason for the failure is placed in
-.Va errno .
-.Sh ERRORS
-.Fn __quotactl
-failures include:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-A pointer points outside the process's allocated address space.
-.It Bq Er EINVAL
-The operation code was out of range; or
-a requested ID or object type was out of range; or
-a corrupted or invalid cursor was passed in.
-.It Bq Er ENODEV
-The requested action was inappropriate for
-.Pq or not supported by
-the selected volume.
-.It Bq Er ENOENT
-No quota information exists for the requested key.
-.It Bq Er ENOMEM
-Memory could not be allocated within the kernel.
-.It Bq Er ENXIO
-The target file system type is capable of supporting quotas, but
-quotas are not enabled on the selected volume.
-.It Bq Er EOPNOTSUPP
-The target file system does not support quotas.
-.El
-.Sh SEE ALSO
-.Xr quota 1 ,
-.Xr libquota 3 ,
-.Xr fstab 5 ,
-.Xr edquota 8 ,
-.Xr quotacheck 8 ,
-.Xr quotaon 8 ,
-.Xr quotarestore 8 ,
-.Xr repquota 8
-.Sh HISTORY
-The original
-.Fn quotactl
-function call appeared in
-.Bx 4.3 Reno .
-The current
-.Fn __quotactl
-interface appeared in
-.Nx 6.0 .
-.Sh BUGS
-As of this writing the error returns that occur in practice are not
-always completely consistent with the intent documented above.
-.Pp
-There should be some way to integrate this call with the resource
-limit interface provided by
-.Xr setrlimit 2
-and
-.Xr getrlimit 2 .
diff --git a/lib/libc/sys/_exit.2 b/lib/libc/sys/_exit.2
deleted file mode 100644
index 42b95bb26..000000000
--- a/lib/libc/sys/_exit.2
+++ /dev/null
@@ -1,123 +0,0 @@
-.\"	$NetBSD: _exit.2,v 1.18 2003/09/08 17:54:34 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"     @(#)_exit.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 23, 2002
-.Dt EXIT 2
-.Os
-.Sh NAME
-.Nm _Exit, _exit
-.Nd terminate the calling process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn _Exit "int status"
-.In unistd.h
-.Ft void
-.Fn _exit "int status"
-.Sh DESCRIPTION
-The
-.Fn _Exit
-and
-.Fn _exit
-functions are equivalent.
-They each terminate a process with the following consequences:
-.Bl -bullet
-.It
-All of the descriptors open in the calling process are closed.
-This may entail delays, for example, waiting for output to drain;
-a process in this state may not be killed, as it is already dying.
-.It
-If the parent process of the calling process has an outstanding
-.Xr wait 2
-call
-or catches the
-.Dv SIGCHLD
-signal,
-it is notified of the calling process's termination and
-the
-.Em status
-is set as defined by
-.Xr wait 2 .
-.It
-The parent process-ID of all of the calling process's existing child
-processes are set to 1; the initialization process
-(see the DEFINITIONS section of
-.Xr intro 2 )
-inherits each of these processes.
-.It
-If the termination of the process causes any process group
-to become orphaned (usually because the parents of all members
-of the group have now exited; see
-.Dq orphaned process group
-in
-.Xr intro 2 ) ,
-and if any member of the orphaned group is stopped,
-the
-.Dv SIGHUP
-signal and the
-.Dv SIGCONT
-signal are sent to all members of the newly-orphaned process group.
-.It
-If the process is a controlling process (see
-.Xr intro 2 ) ,
-the
-.Dv SIGHUP
-signal is sent to the foreground process group of the controlling terminal,
-and all current access to the controlling terminal is revoked.
-.El
-.Pp
-Most C programs call the library routine
-.Xr exit 3 ,
-which flushes buffers, closes streams, unlinks temporary files, etc.,
-before
-calling
-.Fn _exit .
-.Sh RETURN VALUES
-.Fn _Exit
-and
-.Fn _exit
-can never return.
-.Sh SEE ALSO
-.Xr fork 2 ,
-.Xr sigaction 2 ,
-.Xr wait 2 ,
-.Xr exit 3
-.Sh STANDARDS
-The
-.Fn _exit
-function conforms to
-.St -p1003.1-90 .
-The
-.Fn _Exit
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libc/sys/_lwp_create.2 b/lib/libc/sys/_lwp_create.2
deleted file mode 100644
index d1c79fd34..000000000
--- a/lib/libc/sys/_lwp_create.2
+++ /dev/null
@@ -1,107 +0,0 @@
-.\"	$NetBSD: _lwp_create.2,v 1.5 2012/05/21 14:15:16 martin Exp $
-.\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of Wasabi Systems, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 13, 2003
-.Dt _LWP_CREATE 2
-.Os
-.Sh NAME
-.Nm _lwp_create
-.Nd create a new light-weight process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In lwp.h
-.Ft int
-.Fn _lwp_create "ucontext_t *context" "unsigned long flags" "lwpid_t *new_lwp"
-.Sh DESCRIPTION
-.Fn _lwp_create
-causes creation of a new light-weight process, or LWP, and adds it to the
-current process.
-The
-.Fa context
-argument specifies the initial execution context for the new LWP including
-signal mask, stack, and machine registers.
-If this context specifies invalid register values (for example priviledge
-escalation by setting machine dependend bits forbidden for user processes),
-or does not specify cpu register values (uc_flags does not have the
-_UC_CPU bit set), the call will fail and errno will be set to EINVAL.
-.Pp
-The following flags affect the creation of the new LWP:
-.Bl -tag -width LWP_SUSPENDED
-.It LWP_DETACHED
-The LWP is created detached.
-The resources associated with a detached LWP will be automatically
-reclaimed by the system when the LWP exits.
-Otherwise, a terminated LWP's resources will not be reclaimed until
-its status is reported to another LWP via
-.Xr _lwp_wait 2 .
-.It LWP_SUSPENDED
-The LWP is created suspended, and will not begin execution until
-it is resumed by another LWP via
-.Xr _lwp_continue 2 .
-.\" __LWP_ASLWP is not yet implemented by the NetBSD kernel.
-.El
-.Pp
-The LWP ID of the new LWP is stored in the location pointed to by
-.Fa new_lwp .
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn _lwp_create
-returns a value of 0.
-Otherwise, a value of -1 is returned and errno is set to one of the values
-documented below.
-.Sh ERRORS
-.Fn _lwp_create
-will fail and no LWP will be created if:
-.Bl -tag -width [EAGAIN]
-.It Bq Er EAGAIN
-The system-imposed limit on the total
-number of LWPs under execution would be exceeded.
-This limit is configuration-dependent.
-.It Bq Er ENOMEM
-There is insufficient swap space for the new LWP.
-.It Bq Er EFAULT
-The address pointed to by
-.Fa context
-or
-.Fa new_lwp
-is outside the process's allocated address space.
-.It Bq Er EINVAL
-The ucontext_t passed is invalid.
-.El
-.Sh SEE ALSO
-.Xr _lwp_continue 2 ,
-.Xr _lwp_exit 2 ,
-.Xr _lwp_wait 2 ,
-.Xr _lwp_makecontext 3
-.Sh HISTORY
-The
-.Fn _lwp_create
-system call first appeared in
-.Nx 2.0 .
diff --git a/lib/libc/sys/_lwp_ctl.2 b/lib/libc/sys/_lwp_ctl.2
deleted file mode 100644
index f1ef6e993..000000000
--- a/lib/libc/sys/_lwp_ctl.2
+++ /dev/null
@@ -1,103 +0,0 @@
-.\"     $NetBSD: _lwp_ctl.2,v 1.5 2012/04/13 15:14:58 yamt Exp $
-.\"
-.\" Copyright (c)2007 YAMAMOTO Takashi,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" ------------------------------------------------------------
-.Dd April 13, 2012
-.Dt _LWP_CTL 2
-.Os
-.Sh NAME
-.Nm _lwp_ctl
-.Nd prepare per-LWP communication area between kernel and userland
-.\" ------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ------------------------------------------------------------
-.Sh SYNOPSIS
-.In sys/lwpctl.h
-.In lwp.h
-.Ft int
-.Fn _lwp_ctl "int features" "struct lwpctl **address"
-.\" ------------------------------------------------------------
-.Sh DESCRIPTION
-.Fn _lwp_ctl
-prepares per-LWP communication area for the calling LWP,
-and maps it into the calling process' address space.
-It takes the following arguments.
-.Bl -tag -width features
-.It Fa features
-The bitwise-OR of the following flags.
-.Bl -tag -width LWPCTL_FEATURE_CURCPU
-.It Dv LWPCTL_FEATURE_CURCPU
-Request
-.Vt lc_curcpu .
-.It Dv LWPCTL_FEATURE_PCTR
-Request
-.Vt lc_pctr .
-.El
-.It Fa address
-The address to store a pointer to
-.Vt lwpctl
-structure for the calling LWP.
-.El
-.Pp
-The per-LWP communication area is described by an
-.Vt lwpctl
-structure.
-It has following members, depending on
-.Fa features .
-.Bl -tag -width int_lc_curcpu
-.It Vt int lc_curcpu
-The integral identifier of the CPU on which the LWP is running,
-or
-.Dv LWPCTL_CPU_NONE
-when the LWP is not running on any CPU.
-It's updated by the kernel and should be considered as read-only for
-userland.
-It's available only if requested with the
-.Dv LWPCTL_FEATURE_CURCPU
-flag.
-.It Vt int lc_pctr
-The integer which is incremented on every context switches to the LWP.
-It can be used to detect preemption of the LWP.
-(thus its name "preemption counter".)
-It's updated by the kernel and should be considered as read-only for
-userland.
-It's available only if requested with the
-.Dv LWPCTL_FEATURE_PCTR
-flag.
-.El
-.\" ------------------------------------------------------------
-.Sh RETURN VALUES
-.Fn _lwp_ctl
-returns 0 on success.
-Otherwise, \-1 is returned and
-.Va errno
-is set to indicate the error.
-.\" ------------------------------------------------------------
-.\".Sh ERRORS
-.\" ------------------------------------------------------------
-.Sh SEE ALSO
-.Xr errno 2
diff --git a/lib/libc/sys/_lwp_detach.2 b/lib/libc/sys/_lwp_detach.2
deleted file mode 100644
index 6c9f01ff9..000000000
--- a/lib/libc/sys/_lwp_detach.2
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"	$NetBSD: _lwp_detach.2,v 1.4 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of Wasabi Systems, Inc, and by Andrew Doran.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 20, 2007
-.Dt _LWP_DETACH 2
-.Os
-.Sh NAME
-.Nm _lwp_detach
-.Nd detach a light-weight process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In lwp.h
-.Ft int
-.Fn _lwp_detach "lwpid_t lwp"
-.Sh DESCRIPTION
-.Fn _lwp_detach
-causes a light-weight process to become detached, having the same
-effect as if the LWP was created with the
-.Dv LWP_DETACHED
-flag.
-.Pp
-The resources associated with a detached LWP will be automatically
-reclaimed by the system when the LWP exits.
-Conversely, an attached LWP's resources will not be reclaimed until
-its status is reported to another LWP via
-.Xr _lwp_wait 2 .
-.Sh RETURN VALUES
-A 0 value indicates that the call succeeded.
-A \-1 return value indicates an error occurred and
-.Va errno
-is set to indicate the reason.
-.Sh ERRORS
-.Bl -tag -width [EINVAL]
-.It Bq Er EINVAL
-The LWP is already detached.
-.It Bq Er ESRCH
-No LWP can be found in the current process corresponding to that
-specified by
-.Fa lwp .
-.El
-.Sh SEE ALSO
-.Xr _lwp_create 2 ,
-.Xr _lwp_wait 2
-.Sh HISTORY
-The
-.Fn _lwp_detach
-system call first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/sys/_lwp_exit.2 b/lib/libc/sys/_lwp_exit.2
deleted file mode 100644
index 08f78c174..000000000
--- a/lib/libc/sys/_lwp_exit.2
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"	$NetBSD: _lwp_exit.2,v 1.5 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of Wasabi Systems, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 13, 2003
-.Dt _LWP_EXIT 2
-.Os
-.Sh NAME
-.Nm _lwp_exit
-.Nd terminate the calling light-weight process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In lwp.h
-.Ft void
-.Fn _lwp_exit void
-.Sh DESCRIPTION
-.Fn _lwp_exit
-terminates the calling LWP.
-If it is the last LWP in the process, the process exits with a status of 0.
-If the LWP was not created in a detached state, then the system will not
-reclaim its LWP ID until its status is reported to another LWP in the process
-via
-.Xr _lwp_wait 2 .
-.Sh RETURN VALUES
-.Fn _lwp_exit
-can never return.
-.Sh SEE ALSO
-.Xr _exit 2 ,
-.Xr _lwp_create 2 ,
-.Xr _lwp_wait 2
-.Sh HISTORY
-The
-.Fn _lwp_exit
-system call first appeared in
-.Nx 2.0 .
diff --git a/lib/libc/sys/_lwp_getname.2 b/lib/libc/sys/_lwp_getname.2
deleted file mode 100644
index 486af3ec0..000000000
--- a/lib/libc/sys/_lwp_getname.2
+++ /dev/null
@@ -1,71 +0,0 @@
-.\"     $NetBSD: _lwp_getname.2,v 1.2 2009/05/18 14:49:35 wiz Exp $
-.\"
-.\" Copyright (c)2007 YAMAMOTO Takashi,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" ------------------------------------------------------------
-.Dd December 15, 2007
-.Dt _LWP_GETNAME 2
-.Os
-.Sh NAME
-.Nm _lwp_getname
-.Nd get descriptive name of an LWP
-.\" ------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ------------------------------------------------------------
-.Sh SYNOPSIS
-.In lwp.h
-.Ft int
-.Fn _lwp_getname "lwpid_t target" "char *name" "size_t len"
-.\" ------------------------------------------------------------
-.Sh DESCRIPTION
-.Fn _lwp_getname
-gets the descriptive name of the LWP.
-It takes the following arguments.
-.Bl -tag -width target
-.It Fa target
-The LWP whose descriptive name will be obtained.
-.It Fa name
-The buffer to be filled with the descriptive name of the LWP.
-.It Fa len
-The size of the buffer
-.Fa name
-in bytes.
-.El
-.\" ------------------------------------------------------------
-.Sh RETURN VALUES
-.Fn _lwp_getname
-returns 0 on success.
-Otherwise, \-1 is returned and
-.Va errno
-is set to indicate the error.
-.\" ------------------------------------------------------------
-.\".Sh ERRORS
-.\" ------------------------------------------------------------
-.Sh SEE ALSO
-.Xr ps 1 ,
-.Xr top 1 ,
-.Xr _lwp_setname 2 ,
-.Xr errno 2
diff --git a/lib/libc/sys/_lwp_getprivate.2 b/lib/libc/sys/_lwp_getprivate.2
deleted file mode 100644
index d3e6d22fc..000000000
--- a/lib/libc/sys/_lwp_getprivate.2
+++ /dev/null
@@ -1,89 +0,0 @@
-.\"	$NetBSD: _lwp_getprivate.2,v 1.6 2013/10/05 09:18:56 njoly Exp $
-.\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of Wasabi Systems, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 7, 2013
-.Dt _LWP_GETPRIVATE 2
-.Os
-.Sh NAME
-.Nm _lwp_getprivate ,
-.Nm _lwp_setprivate
-.Nd get and set light-weight process private data
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In lwp.h
-.Ft void *
-.Fn _lwp_getprivate void
-.Ft void
-.Fn _lwp_setprivate "void *ptr"
-.Sh DESCRIPTION
-.Fn _lwp_setprivate
-stores the pointer to private data
-.Fa ptr
-in a location private to the LWP.
-.Pp
-.Fn _lwp_getprivate
-returns the pointer to private data for the LWP.
-.Pp
-Some platforms provide alternative ways quicker than
-.Fn _lwp_getprivate
-to use the pointer.
-.Bl -tag -width amd64
-.It alpha
-The pointer can be retrieved by call_pal PAL_rdunique.
-.It amd64
-The base address of
-.Dv %fs
-register is set to the pointer so that the private data can be
-accessed using the selector.
-.It i386
-The base address of
-.Dv %gs
-register is set to the pointer so that the private data can be
-accessed using the selector.
-.It sparc
-.Dv %g7
-register is set to the pointer.
-.El
-.Sh ERRORS
-The
-.Fn _lwp_getprivate
-and
-.Fn _lwp_setprivate
-functions are always successful, and no return value is reserved to indicate
-an error.
-.Sh SEE ALSO
-.Xr _lwp_makecontext 3
-.Sh HISTORY
-The
-.Fn _lwp_getprivate
-and
-.Fn _lwp_setprivate
-system calls first appeared in
-.Nx 2.0 .
diff --git a/lib/libc/sys/_lwp_kill.2 b/lib/libc/sys/_lwp_kill.2
deleted file mode 100644
index 8b7544528..000000000
--- a/lib/libc/sys/_lwp_kill.2
+++ /dev/null
@@ -1,87 +0,0 @@
-.\"	$NetBSD: _lwp_kill.2,v 1.4 2009/06/24 22:19:14 zafer Exp $
-.\"
-.\" Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of Wasabi Systems, Inc, and by Andrew Doran.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 20, 2007
-.Dt _LWP_KILL 2
-.Os
-.Sh NAME
-.Nm _lwp_kill
-.Nd send a signal to a light-weight process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In lwp.h
-.Ft int
-.Fn _lwp_kill "lwpid_t lwp" "int sig"
-.Sh DESCRIPTION
-.Fn _lwp_kill
-sends the signal specified by
-.Fa sig
-to the light-weight process specified by
-.Fa lwp .
-If the
-.Fa sig
-argument is given as 0 (zero),
-.Nm
-will test for the existence of the target LWP, but will take no further
-action.
-.Pp
-Job control signals and uncatchable signals can not be directed to a specific
-LWP: if posted with
-.Nm ,
-they will affect all LWPs in the process.
-.Pp
-Signals will be posted successfully to suspended LWPs, but will not be
-handled further until the LWP has been continued.
-.Sh RETURN VALUES
-A 0 value indicates that the call succeeded.
-A \-1 return value indicates an error occurred and
-.Va errno
-is set to indicate the reason.
-.Sh ERRORS
-.Bl -tag -width [EINVAL]
-.It Bq Er EINVAL
-.Fa sig
-is not a valid signal number.
-.It Bq Er ESRCH
-No LWP can be found in the current process corresponding to that
-specified by
-.Fa lwp .
-.El
-.Sh SEE ALSO
-.Xr _lwp_continue 2 ,
-.Xr _lwp_suspend 2 ,
-.Xr kill 2 ,
-.Xr sigaction 2 ,
-.Xr signal 7
-.Sh HISTORY
-The
-.Fn _lwp_kill
-system call first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/sys/_lwp_park.2 b/lib/libc/sys/_lwp_park.2
deleted file mode 100644
index f67fc2c2f..000000000
--- a/lib/libc/sys/_lwp_park.2
+++ /dev/null
@@ -1,162 +0,0 @@
-.\"	$NetBSD: _lwp_park.2,v 1.9 2014/01/31 21:11:05 wiz Exp $
-.\"
-.\" Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of Wasabi Systems, Inc, and by Andrew Doran.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd March 28, 2013
-.Dt _LWP_PARK 2
-.Os
-.Sh NAME
-.Nm _lwp_park
-.Nd wait interruptably in the kernel
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In lwp.h
-.Ft int
-.Fn _lwp_park "clockid_t clock_id" "int flags" "const struct timespec *ts" "lwpid_t unpark" "const void *hint" "const void *unparkhint"
-.Sh DESCRIPTION
-.Fn _lwp_park
-can be used to synchronize access to resources among multiple light-weight
-processes.
-It causes the calling LWP to wait interruptably in the kernel, until one
-of the following conditions is met:
-.Bl -bullet
-.It
-The
-.Fa ts
-argument is
-.Pf non- Dv NULL ,
-and the time it specifies has passed.
-The
-.Fa ts
-time can be an relative interval to wait if the
-.Ar flags
-argument does not contain
-.Dv TIMER_ABSTIME
-or it can be an absolute time compared to
-.Dv CLOCK_REALTIME
-or
-.Dv CLOCK_MONOTONIC
-depending on the value
-of the
-.Ar clock_id
-argument.
-.It
-The LWP receives a directed signal posted using
-.Fn _lwp_kill ,
-or is elected to handle a signal on behalf of its containing process.
-.It
-The LWP is awoken by another LWP in the same process that has made
-a call to
-.Fn _lwp_wakeup .
-.It
-The LWP is awoken by another LWP in the same process that has made
-a call to
-.Fn _lwp_unpark
-or
-.Fn _lwp_unpark_all .
-.El
-.Pp
-The preferred method to awaken an LWP sleeping as a result of a call
-to
-.Fn _lwp_park
-is to make a call to
-.Fn _lwp_unpark ,
-or
-.Fn _lwp_unpark_all .
-The
-.Fn _lwp_wakeup
-system call is a more general facility, and requires more resources
-to execute.
-.Pp
-The optional
-.Fa hint
-argument specifies the address of object upon which the LWP is
-synchronizing.
-When the
-.Fa hint
-value is matched between calls to
-.Fn _lwp_park
-and
-.Fn _lwp_unpark
-or
-.Fn _lwp_unpark_all ,
-it may reduce the time necessary for the system to resume execution
-of waiting LWPs.
-.Pp
-The
-.Fa unpark
-and
-.Fa unparkhint
-arguments can be used to fold a park operation and unpark operation into a
-single system call.
-If
-.Fa unpark
-is non-zero, the system will behave as if the following call had been made
-before the calling thread begins to wait:
-.Bd -literal
-	_lwp_unpark(unpark, unparkhint);
-.Ed
-.Sh RETURN VALUES
-.Fn _lwp_park
-may return a value of 0.
-Otherwise, \-1 is returned and
-.Va errno
-is set to provide more information.
-.Sh ERRORS
-.Bl -tag -width [EINVAL]
-.It Bq Er EALREADY
-A request was made to wake the LWP before it began to wait in
-the kernel.
-.It Bq Er EINTR
-The LWP has been awoken by a signal or by a call to one of the
-following functions:
-.Fn _lwp_unpark ,
-.Fn _lwp_unpark_all ,
-.Fn _lwp_wakeup .
-.It Bq Er EINVAL
-The time value specified by
-.Fa ts
-is invalid.
-.It Bq Er ESRCH
-No LWP can be found in the current process corresponding to
-.Fa unpark .
-.It Bq Er ETIMEDOUT
-The UTC time specified by
-.Fa ts
-has passed.
-.El
-.Sh SEE ALSO
-.Xr _lwp_unpark 2 ,
-.Xr _lwp_unpark_all 2 ,
-.Xr _lwp_wakeup 2
-.Sh HISTORY
-The
-.Fn _lwp_park
-system call first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/sys/_lwp_self.2 b/lib/libc/sys/_lwp_self.2
deleted file mode 100644
index fe43b90d6..000000000
--- a/lib/libc/sys/_lwp_self.2
+++ /dev/null
@@ -1,56 +0,0 @@
-.\"	$NetBSD: _lwp_self.2,v 1.4 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of Wasabi Systems, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 13, 2003
-.Dt _LWP_SELF 2
-.Os
-.Sh NAME
-.Nm _lwp_self
-.Nd get light-weight process identification
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In lwp.h
-.Ft lwpid_t
-.Fn _lwp_self void
-.Sh DESCRIPTION
-.Fn _lwp_self
-returns the LWP ID of the calling LWP.
-.Sh ERRORS
-The
-.Fn _lwp_self
-function is always successful, and no return value is reserved to indicate
-an error.
-.Sh SEE ALSO
-.Xr _lwp_create 2
-.Sh HISTORY
-The
-.Fn _lwp_self
-system call first appeared in
-.Nx 2.0 .
diff --git a/lib/libc/sys/_lwp_setname.2 b/lib/libc/sys/_lwp_setname.2
deleted file mode 100644
index 969e6f149..000000000
--- a/lib/libc/sys/_lwp_setname.2
+++ /dev/null
@@ -1,71 +0,0 @@
-.\"     $NetBSD: _lwp_setname.2,v 1.2 2009/05/18 14:50:03 wiz Exp $
-.\"
-.\" Copyright (c)2007 YAMAMOTO Takashi,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" ------------------------------------------------------------
-.Dd December 15, 2007
-.Dt _LWP_SETNAME 2
-.Os
-.Sh NAME
-.Nm _lwp_setname
-.Nd set descriptive name of an LWP
-.\" ------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ------------------------------------------------------------
-.Sh SYNOPSIS
-.In lwp.h
-.Ft int
-.Fn _lwp_setname "lwpid_t target" "const char *name"
-.\" ------------------------------------------------------------
-.Sh DESCRIPTION
-.Fn _lwp_setname
-sets the descriptive name of the LWP.
-It takes the following arguments.
-.Bl -tag -width target
-.It Fa target
-The LWP whose descriptive name will be set.
-.It Fa name
-The string to be used as the descriptive name of the LWP.
-.El
-.Pp
-The name is used by
-.Xr top 1
-when showing LWPs, for example.
-.\" ------------------------------------------------------------
-.Sh RETURN VALUES
-.Fn _lwp_setname
-returns 0 on success.
-Otherwise, \-1 is returned and
-.Va errno
-is set to indicate the error.
-.\" ------------------------------------------------------------
-.\".Sh ERRORS
-.\" ------------------------------------------------------------
-.Sh SEE ALSO
-.Xr ps 1 ,
-.Xr top 1 ,
-.Xr _lwp_getname 2 ,
-.Xr errno 2
diff --git a/lib/libc/sys/_lwp_suspend.2 b/lib/libc/sys/_lwp_suspend.2
deleted file mode 100644
index 0f28e5c16..000000000
--- a/lib/libc/sys/_lwp_suspend.2
+++ /dev/null
@@ -1,94 +0,0 @@
-.\"	$NetBSD: _lwp_suspend.2,v 1.4 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of Wasabi Systems, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 13, 2003
-.Dt _LWP_SUSPEND 2
-.Os
-.Sh NAME
-.Nm _lwp_suspend ,
-.Nm _lwp_continue
-.Nd suspend or continue a light-weight process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In lwp.h
-.Ft int
-.Fn _lwp_suspend "lwpid_t lwp"
-.Ft int
-.Fn _lwp_continue "lwpid_t lwp"
-.Sh DESCRIPTION
-.Fn _lwp_suspend
-suspends execution of the LWP specified by
-.Fa lwp .
-Once an LWP is suspended, subsequent calls to
-.Fn _lwp_suspend
-have no effect.
-The only way to resume execution of a suspended LWP is via
-.Fn _lwp_continue .
-.Pp
-.Fn _lwp_continue
-resumes execution of the LWP specified by
-.Fa lwp .
-Once an LWP is resumed, subsequent calls to
-.Fn _lwp_continue
-have no effect.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn _lwp_suspend
-and
-.Fn _lwp_continue
-return a value of 0.
-Otherwise, an error code is returned to indicate the error.
-.Sh ERRORS
-.Fn _lwp_suspend
-and
-.Fn _lwp_continue
-will fail if:
-.Bl -tag -width [EDEADLK]
-.It Bq Er ESRCH
-No LWP can be found in the current process corresponding to that
-specified by
-.Fa lwp .
-.El
-.Pp
-.Fn _lwp_suspend
-will fail if:
-.Bl -tag -width [EDEADLK]
-.It Bq Er EDEADLK
-The LWP specified by
-.Fa lwp
-is the only LWP in the process.
-.El
-.Sh SEE ALSO
-.Xr _lwp_create 2
-.Sh HISTORY
-The
-.Fn _lwp_create
-system call first appeared in
-.Nx 2.0 .
diff --git a/lib/libc/sys/_lwp_unpark.2 b/lib/libc/sys/_lwp_unpark.2
deleted file mode 100644
index 840da0c5a..000000000
--- a/lib/libc/sys/_lwp_unpark.2
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"	$NetBSD: _lwp_unpark.2,v 1.4 2010/11/02 20:49:47 skrll Exp $
-.\"
-.\" Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of Wasabi Systems, Inc, and by Andrew Doran.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 20, 2007
-.Dt _LWP_UNPARK 2
-.Os
-.Sh NAME
-.Nm _lwp_unpark
-.Nd resume execution of a waiting LWP
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In lwp.h
-.Ft int
-.Fn _lwp_unpark "lwpid_t lwp" "const void *hint"
-.Sh DESCRIPTION
-.Fn _lwp_unpark
-resumes execution of the light-weight process
-.Fa lwp .
-.Pp
-The target LWP is assumed to be waiting in the kernel as a result of a
-call to
-.Fn _lwp_park .
-If the target LWP is not currently waiting, it will return immediately
-upon the next call to
-.Fn _lwp_park .
-.Pp
-See
-.Xr _lwp_park 2
-for a description of the
-.Fa hint
-argument.
-.Sh RETURN VALUES
-A 0 value indicates that the call succeeded.
-A \-1 return value indicates an error occurred and
-.Va errno
-is set to indicate the reason.
-.Sh ERRORS
-.Bl -tag -width [EINVAL]
-.It Bq Er ESRCH
-No LWP can be found in the current process corresponding to that
-specified by
-.Fa lwp .
-.El
-.Sh SEE ALSO
-.Xr _lwp_park 2 ,
-.Xr _lwp_unpark_all 2 ,
-.Xr _lwp_wakeup 2
-.Sh HISTORY
-The
-.Fn _lwp_unpark
-system call first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/sys/_lwp_unpark_all.2 b/lib/libc/sys/_lwp_unpark_all.2
deleted file mode 100644
index d08508f8a..000000000
--- a/lib/libc/sys/_lwp_unpark_all.2
+++ /dev/null
@@ -1,99 +0,0 @@
-.\"	$NetBSD: _lwp_unpark_all.2,v 1.7 2014/04/08 13:02:14 pooka Exp $
-.\"
-.\" Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of Wasabi Systems, Inc, and by Andrew Doran.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd February 10, 2007
-.Dt _LWP_UNPARK_ALL 2
-.Os
-.Sh NAME
-.Nm _lwp_unpark_all
-.Nd resume execution of a waiting LWP
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In lwp.h
-.Ft ssize_t
-.Fn _lwp_unpark_all "const lwpid_t *targets" "size_t ntargets" "const void *hint"
-.Sh DESCRIPTION
-.Fn _lwp_unpark_all
-resumes execution of one or more light-weight processes listed in
-the array pointed to by
-.Fa targets .
-.Pp
-The target LWPs are assumed to be waiting in the kernel as a result of
-calls to
-.Fn _lwp_park .
-If any of the target LWPs are not currently waiting, those LWPs will return
-immediately upon the next call to
-.Fn _lwp_park .
-.Pp
-The value pointed to by
-.Fa ntargets
-specifies the size of the array pointed to by
-.Fa targets .
-If the
-.Fa targets
-argument is given as
-.Dv NULL ,
-the maximum size of the array (expressed
-as the number of entries) is returned.
-.Pp
-See
-.Xr _lwp_park 2
-for a description of the
-.Fa hint
-argument.
-.Sh RETURN VALUES
-If the maximum size of the
-.Fa targets
-array is not being queried, a return of 0 indicates that the call succeeded.
-A \-1 return value indicates an error occurred and
-.Va errno
-is set to indicate the reason.
-.Sh ERRORS
-.Bl -tag -width [EINVAL]
-.It Bq Er EFAULT
-The value specified for
-.Fa targets
-is invalid.
-.It Bq Er EINVAL
-The value specified for
-.Fa ntargets
-is out of range.
-.It Bq Er ENOMEM
-Insufficient resources are available to complete the operation.
-.El
-.Sh SEE ALSO
-.Xr _lwp_park 2 ,
-.Xr _lwp_unpark 2 ,
-.Xr _lwp_wakeup 2
-.Sh HISTORY
-The
-.Fn _lwp_unpark_all
-system call first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/sys/_lwp_wait.2 b/lib/libc/sys/_lwp_wait.2
deleted file mode 100644
index 44d96bad0..000000000
--- a/lib/libc/sys/_lwp_wait.2
+++ /dev/null
@@ -1,93 +0,0 @@
-.\"	$NetBSD: _lwp_wait.2,v 1.4 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of Wasabi Systems, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 13, 2003
-.Dt _LWP_WAIT 2
-.Os
-.Sh NAME
-.Nm _lwp_wait
-.Nd wait for light-weight process termination
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In lwp.h
-.Ft int
-.Fn _lwp_wait "lwpid_t wlwp" "lwpid_t *rlwp"
-.Sh DESCRIPTION
-.Fn _lwp_wait
-suspends execution of the calling LWP until the LWP specified by
-.Fa wlwp
-terminates.
-The specified LWP must not be detached.
-If
-.Fa wlwp
-is 0, then
-.Fn _lwp_wait
-waits for any undetached LWP in the current process.
-.Pp
-If
-.Fa rlwp
-is not
-.Dv NULL ,
-then it points to the location where the LWP ID of
-the exited LWP is stored.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn _lwp_wait
-returns a value of 0.
-Otherwise, an error code is returned to indicate the error.
-.Sh ERRORS
-.Fn _lwp_wait
-will fail if:
-.Bl -tag -width [EDEADLK]
-.It Bq Er ESRCH
-No undetached LWP can be found in the current process corresponding to that
-specified by
-.Fa wlwp .
-.It Bq Er EDEADLK
-The calling LWP is the only LWP in the process.
-.It Bq Er EDEADLK
-The LWP ID specified by
-.Fa wlwp
-is the LWP ID of the calling LWP.
-.It Bq Er EINTR
-.Fn _lwp_wait
-was interrupted by a caught signal, or the signal did not
-have the
-.Dv SA_RESTART
-flag set.
-.El
-.Sh SEE ALSO
-.Xr _lwp_create 2 ,
-.Xr _lwp_exit 2
-.Sh HISTORY
-The
-.Fn _lwp_wait
-system call first appeared in
-.Nx 2.0 .
diff --git a/lib/libc/sys/_lwp_wakeup.2 b/lib/libc/sys/_lwp_wakeup.2
deleted file mode 100644
index c30c77eae..000000000
--- a/lib/libc/sys/_lwp_wakeup.2
+++ /dev/null
@@ -1,73 +0,0 @@
-.\"	$NetBSD: _lwp_wakeup.2,v 1.5 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of Wasabi Systems, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 13, 2003
-.Dt _LWP_WAKEUP 2
-.Os
-.Sh NAME
-.Nm _lwp_wakeup
-.Nd make a blocked light-weight process runnable
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In lwp.h
-.Ft int
-.Fn _lwp_wakeup "lwpid_t lwp"
-.Sh DESCRIPTION
-.Fn _lwp_wakeup
-makes a blocked LWP runnable.  The blocked LWP must be in
-.Dv LSSLEEP
-state.
-Unblocking the LWP does not guarantee that it will make progress; it
-may block again as soon as it resumes execution in the kernel.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn _lwp_wakeup
-returns a value of 0.
-Otherwise, an error code is returned to indicate the error.
-.Sh ERRORS
-.Fn _lwp_wakeup
-will fail if:
-.Bl -tag -width [ENODEV]
-.It Bq Er ESRCH
-No LWP can be found in the current process corresponding to that
-specified by
-.Fa lwp .
-.It Bq Er ENODEV
-The specified LWP is not in
-.Dv LSSLEEP
-state.
-.It Bq Er EBUSY
-The specified LWP is blocked in an uninterruptible sleep.
-.El
-.Sh HISTORY
-The
-.Fn _lwp_wakeup
-system call first appeared in
-.Nx 2.0 .
diff --git a/lib/libc/sys/accept.2 b/lib/libc/sys/accept.2
deleted file mode 100644
index 6edcac86b..000000000
--- a/lib/libc/sys/accept.2
+++ /dev/null
@@ -1,238 +0,0 @@
-.\"	$NetBSD: accept.2,v 1.31 2013/08/02 20:13:09 wiz Exp $
-.\"
-.\" Copyright (c) 1983, 1990, 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. 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.
-.\"
-.\"     @(#)accept.2	8.2 (Berkeley) 12/11/93
-.\"
-.Dd March 19, 2012
-.Dt ACCEPT 2
-.Os
-.Sh NAME
-.Nm accept ,
-.Nm paccept
-.Nd accept a connection on a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft int
-.Fn accept "int s" "struct sockaddr * restrict addr" "socklen_t * restrict addrlen"
-.Ft int
-.Fn paccept "int s" "struct sockaddr * restrict addr" "socklen_t * restrict addrlen" "const sigset_t * restrict sigmask" "int flags"
-.Sh DESCRIPTION
-The argument
-.Fa s
-is a socket that has been created with
-.Xr socket 2 ,
-bound to an address with
-.Xr bind 2 ,
-and is listening for connections after a
-.Xr listen 2 .
-The
-.Fn accept
-argument
-extracts the first connection request on the queue of pending
-connections, creates a new socket with the same properties of
-.Fa s
-and allocates a new file descriptor
-for the socket.
-If no pending connections are
-present on the queue, and the socket is not marked
-as non-blocking,
-.Fn accept
-blocks the caller until a connection is present.
-If the socket is marked non-blocking and no pending
-connections are present on the queue,
-.Fn accept
-returns an error as described below.
-The accepted socket
-may not be used
-to accept more connections.
-The original socket
-.Fa s
-remains open.
-.Pp
-The argument
-.Fa addr
-is a result parameter that is filled in with
-the address of the connecting entity,
-as known to the communications layer.
-The exact format of the
-.Fa addr
-parameter is determined by the domain in which the communication
-is occurring.
-The
-.Fa addrlen
-is a value-result parameter; it should initially contain the
-amount of space pointed to by
-.Fa addr ;
-on return it will contain the actual length (in bytes) of the
-address returned.
-This call
-is used with connection-based socket types, currently with
-.Dv SOCK_STREAM .
-.Pp
-It is possible to
-.Xr select 2
-or
-.Xr poll 2
-a socket for the purposes of doing an
-.Fn accept
-by selecting or polling it for read.
-.Pp
-For certain protocols which require an explicit confirmation,
-such as
-.Tn ISO
-or
-.Tn DATAKIT ,
-.Fn accept
-can be thought of
-as merely dequeuing the next connection
-request and not implying confirmation.
-Confirmation can be implied by a normal read or write on the new
-file descriptor, and rejection can be implied by closing the
-new socket.
-.Pp
-One can obtain user connection request data without confirming
-the connection by issuing a
-.Xr recvmsg 2
-call with an
-.Fa msg_iovlen
-of 0 and a non-zero
-.Fa msg_controllen ,
-or by issuing a
-.Xr getsockopt 2
-request.
-Similarly, one can provide user connection rejection information
-by issuing a
-.Xr sendmsg 2
-call with providing only the control information,
-or by calling
-.Xr setsockopt 2 .
-.Pp
-The
-.Fn paccept
-function behaves exactly like
-.Fn accept ,
-but it also allows to set the following
-.Fa flags
-on the returned file descriptor:
-.Bl -tag -width SOCK_NOSIGPIPEXX -offset indent
-.It Dv SOCK_CLOEXEC
-Set the close on exec property.
-.It Dv SOCK_NONBLOCK
-Sets non-blocking I/O.
-.It Dv SOCK_NOSIGPIPE
-Return
-.Er EPIPE
-instead of raising
-.Dv SIGPIPE .
-.El
-.Pp
-It can also temporarily replace the signal mask of the calling thread if
-.Fa sigmask
-is a
-.Pf non- Dv NULL
-pointer, then the
-.Fn paccept
-function shall replace the signal mask of the caller by the set of
-signals pointed to by
-.Fa sigmask
-before waiting for a connection, and shall restore the signal mask
-of the calling thread before returning.
-.Sh RETURN VALUES
-The
-.Fn accept
-and
-.Fn paccept
-calls return \-1 on error.
-If they succeed, they return a non-negative
-integer that is a descriptor for the accepted socket.
-.Sh COMPATIBILITY
-The
-.Fn accept
-implementation makes the new file descriptor inherit file flags
-(like
-.Dv O_NONBLOCK )
-from the listening socket.
-It's a traditional behaviour for BSD derivative systems.
-On the other hand, there are implementations which don't do so.
-Linux is an example of such implementations.
-Portable programs should not rely on either of the behaviours.
-.Sh ERRORS
-The
-.Fn accept
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The socket is marked non-blocking and no connections
-are present to be accepted.
-.It Bq Er EBADF
-The descriptor is invalid.
-.It Bq Er ECONNABORTED
-A connection has been aborted.
-.It Bq Er EFAULT
-The
-.Fa addr
-parameter is not in a writable part of the
-user address space.
-.It Bq Er EINTR
-The
-.Fn accept
-call has been interrupted by a signal.
-.It Bq Er EINVAL
-The socket has not been set up to accept connections (using
-.Xr bind 2
-and
-.Xr listen 2 ) .
-.It Bq Er EMFILE
-The per-process descriptor table is full.
-.It Bq Er ENFILE
-The system file table is full.
-.It Bq Er ENOTSOCK
-The descriptor references a file, not a socket.
-.It Bq Er EOPNOTSUPP
-The referenced socket is not of type
-.Dv SOCK_STREAM .
-.El
-.Sh SEE ALSO
-.Xr bind 2 ,
-.Xr connect 2 ,
-.Xr listen 2 ,
-.Xr poll 2 ,
-.Xr select 2 ,
-.Xr socket 2
-.Sh HISTORY
-The
-.Fn accept
-function appeared in
-.Bx 4.2 .
-The
-.Fn paccept
-function is inspired from Linux and appeared in
-.Nx 6.0 .
diff --git a/lib/libc/sys/access.2 b/lib/libc/sys/access.2
deleted file mode 100644
index 90012928e..000000000
--- a/lib/libc/sys/access.2
+++ /dev/null
@@ -1,291 +0,0 @@
-.\"	$NetBSD: access.2,v 1.32 2013/01/13 08:15:02 dholland Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)access.2	8.2 (Berkeley) 4/1/94
-.\"
-.Dd January 12, 2013
-.Dt ACCESS 2
-.Os
-.Sh NAME
-.Nm access ,
-.Nm faccessat
-.Nd check access permissions of a file or pathname
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn access "const char *path" "int mode"
-.In fcntl.h
-.Ft int
-.Fn faccessat "int fd" "const char *path" "int mode" "int flags"
-.Sh DESCRIPTION
-The
-.Fn access
-function checks the accessibility of the
-file named by
-.Fa path .
-The
-.Fn faccessat
-function checks the accessibility of the file named by
-.Fa path
-using
-.Fa fd
-as the starting point for relative pathnames.
-If
-.Fa fd
-is
-.Dv AT_FDCWD
-the current directory is used.
-Calling
-.Fn access
-is equivalent to calling
-.Fn faccessat
-with
-.Fa fd
-set to
-.Dv AT_FDCWD
-and
-.Fa flags
-set to 0.
-.Pp
-The form of access to check is specified by the bitwise or of the
-following values for
-.Fa mode :
-.Bl -tag -width W_OK
-.It Dv R_OK
-Check for read permission.
-.It Dv W_OK
-Check for write permission.
-.It Dv X_OK
-Check for execute/search permission.
-.It Dv F_OK
-Check only for existence.
-.El
-.Pp
-All components of the pathname
-.Fa path
-are checked for access permissions as well.
-.Pp
-.\" Maybe this paragraph should be removed...
-The owner of a file has permission checked with respect to the
-.Dq owner
-read, write, and execute mode bits, members of the file's group
-other than the owner have permission checked with respect to the
-.Dq group
-mode bits, and all others have permissions checked with respect to
-the
-.Dq other
-mode bits.
-.Pp
-The file descriptor
-.Fa fd
-must name a directory.
-Search permission is required on this directory.
-.\"    (These alternatives await a decision about the semantics of O_SEARCH)
-.\" Search permission is required on this directory, except if
-.\" .Fa fd
-.\" was opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" The directory referred to by
-.\" .Fa fd
-.\" must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" The directory referred to by
-.\" .Fa fd
-.\" must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag or must be searchable by the current process at the time the
-.\" call is made.
-.Pp
-The
-.Fa flags
-argument to
-.Fn faccessat
-can specify the following optional behavior:
-.Bl -tag -width AT_SYMLINK_NOFOLLOW
-.It AT_EACCESS
-Use the effective user and group IDs instead of the real user and
-group IDs for checking permission.
-See discussion below.
-.It AT_SYMLINK_NOFOLLOW
-Do not follow a symbolic link encountered as the last component in
-.Fa path .
-.El
-.Pp
-For
-.Fn access ,
-and
-.Fn faccessat
-when the
-.Dv AT_EACCESS
-flag is not passed, the real user ID and the real group ID are used
-for checking permission in place of the effective user ID and
-effective group ID.
-This affects only set-user-ID and set-group-ID programs, which should
-not use these functions.
-(For other programs, the real and effective IDs are the same.)
-.Pp
-For processes running with super-user privileges, these functions may
-return success for read and write checks regardless of whether read
-and write permission bits are actually set.
-This reflects the fact that the super-user may read and write all
-files regardless of permission settings.
-However, even for the super-user, an execute check using
-.Dv X_OK
-will succeed only if the target object has at least one of its
-execute permission bits set.
-.\" XXX: Is this true of search permission and directories? (I believe so.)
-(This does not guarantee that the target object can necessarily be
-successfully executed.
-See
-.Xr execve 2 . )
-.Sh RETURN VALUES
-The
-.Fn access
-and
-.Fn faccessat
-functions succeed and return 0 if, at some point in the recent past,
-the target object named by
-.Fa path
-existed and its permission settings allowed the requested access as
-described above.
-If the requested access would not have been granted, the object did
-not exist, or the path lookup failed, the value \-1 is returned
-and the value of
-.Va errno
-is set to reflect what went wrong.
-.Sh ERRORS
-These functions fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for
-.Fa fd ,
-or for the current directory, or for a directory in the prefix of
-.Fa path ;
-or the permission bits on the target file system object do not permit
-the requested access.
-.It Bq Er EBADF
-The file descriptor
-.Fa fd
-is not open and is not
-.Dv AT_FDCWD .
-.\"    (possibly -- future)
-.\" or was not opened for searching with
-.\" .Dv O_SEARCH .
-.It Bq Er EFAULT
-.Fa path
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-The
-.Fa mode
-or
-.Fa flags
-argument contained an invalid value.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er ENOTDIR
-The file descriptor
-.Fa fd
-does not name a directory, or a component of the path prefix is not a
-directory.
-.It Bq Er EROFS
-Write access is requested for a file on a read-only file system.
-.It Bq Er ETXTBSY
-Write access is requested for a pure procedure (shared text)
-file presently being executed.
-.El
-.Sh SEE ALSO
-.Xr chmod 2 ,
-.Xr execve 2 ,
-.Xr stat 2 ,
-.Xr secure_path 3
-.Sh STANDARDS
-The
-.Fn access
-function conforms to
-.St -p1003.1-90 .
-.Fn faccessat
-function conforms to
-.St -p1003.1-2008 .
-.\" This paragraph could be moved to the end of DESCRIPTION if people
-.\" don't like having it here.
-.Pp
-Note that
-.Fn faccessat
-violates the historic convention that system calls whose names begin
-with `f' operate on file handles rather than paths.
-There is no equivalent to
-.Fn access
-for checking access properties of an already-opened file.
-.Sh SECURITY CONSIDERATIONS
-Because the results of these calls reflect the state of the file
-system at the time they ran, and the file system can potentially be
-modified between that time and the time the caller attempts to act on
-the results, they should
-.Em never
-be used for security enforcement.
-.Pp
-Privileged programs that need to restrict their actions to files or
-directories properly accessible to unprivileged users
-.Em must
-do this by assuming or restoring an unprivileged state (see
-.Xr seteuid 2 )
-when performing the pertinent actions.
-Checking in advance (with
-.Fn access
-or any other method) and performing such actions while privileged
-introduces a race condition that in most cases is easily exploitable
-by even a naive adversary.
-.Pp
-Even for non-privileged programs, the opportunity for the world to
-change after the call runs makes
-.Fn access
-and
-.Fn faccessat
-not very useful.
-In general only
-.Dv F_OK
-should be used, and that sparingly.
-The other checks may occasionally be useful for user interface or
-diagnostic purposes.
diff --git a/lib/libc/sys/acct.2 b/lib/libc/sys/acct.2
deleted file mode 100644
index 4e7f1bf68..000000000
--- a/lib/libc/sys/acct.2
+++ /dev/null
@@ -1,131 +0,0 @@
-.\"	$NetBSD: acct.2,v 1.19 2010/05/31 12:16:20 njoly Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)acct.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt ACCT 2
-.Os
-.Sh NAME
-.Nm acct
-.Nd enable or disable process accounting
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn acct "const char *file"
-.Sh DESCRIPTION
-The
-.Fn acct
-call enables or disables the collection of system accounting records.
-If
-.Fa file
-is
-.Dv NULL ,
-accounting is disabled.
-If
-.Fa file
-is an existing, NUL-terminated, pathname, record collection is enabled,
-and for every process initiated which terminates under normal
-conditions an accounting record is appended to
-.Fa file .
-Abnormal conditions of termination are reboots or other fatal system problems.
-Records for processes which never terminate can not be
-produced by
-.Fn acct .
-.Pp
-For more information on the record structure used by
-.Fn acct ,
-see
-.Pa /usr/include/sys/acct.h
-and
-.Xr acct 5 .
-.Pp
-This call is permitted only to the super-user.
-.Sh NOTES
-Accounting is automatically disabled when the file system the
-accounting file resides on runs out of space; it is enabled when
-space once again becomes available.
-For this purpose,
-.Fn acct
-creates a kernel thread called
-.Dq acctwatch .
-.Sh RETURN VALUES
-On success, zero is returned.
-Otherwise, \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn acct
-will fail if one of the following is true:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix,
-or the path name is not a regular file.
-.It Bq Er EFAULT
-.Fa file
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er EPERM
-The caller is not the super-user.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.El
-.Pp
-Also,
-.Fn acct
-fails if failed to create kernel thread described above.
-See
-.Xr fork 2
-for
-.Va errno
-value.
-.Sh SEE ALSO
-.Xr fork 2 ,
-.Xr acct 5 ,
-.Xr sa 8
-.Sh HISTORY
-An
-.Fn acct
-function call appeared in
-.At v7 .
diff --git a/lib/libc/sys/adjtime.2 b/lib/libc/sys/adjtime.2
deleted file mode 100644
index 10537172e..000000000
--- a/lib/libc/sys/adjtime.2
+++ /dev/null
@@ -1,122 +0,0 @@
-.\"	$NetBSD: adjtime.2,v 1.20 2004/05/13 10:20:57 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)adjtime.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt ADJTIME 2
-.Os
-.Sh NAME
-.Nm adjtime
-.Nd "correct the time to allow synchronization of the system clock"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/time.h
-.Ft int
-.Fn adjtime "const struct timeval *delta" "struct timeval *olddelta"
-.Sh DESCRIPTION
-.Fn adjtime
-makes small adjustments to the system time, as returned by
-.Xr gettimeofday 2 ,
-advancing or retarding it
-by the time specified by the timeval
-.Fa delta .
-If
-.Fa delta
-is negative, the clock is
-slowed down by incrementing it more slowly than normal until
-the correction is complete.
-If
-.Fa delta
-is positive, a larger increment than normal
-is used.
-The skew used to perform the correction is generally a fraction of one percent.
-Thus, the time is always
-a monotonically increasing function.
-A time correction from an earlier call to
-.Fn adjtime
-may not be finished when
-.Fn adjtime
-is called again.
-If
-.Fa olddelta
-is non-nil,
-the structure pointed to will contain, upon return, the
-number of microseconds still to be corrected
-from the earlier call.
-.Pp
-This call may be used by time servers that synchronize the clocks
-of computers in a local area network.
-Such time servers would slow down the clocks of some machines
-and speed up the clocks of others to bring them to the average network time.
-.Pp
-If the calling user is not the super user, then the
-.Fn adjtime
-function in the standard C library will try to use the
-.Xr clockctl 4
-device if present, thus making possible for non privileged users to
-adjust the system time.
-If
-.Xr clockctl 4
-is not present or not accessible, then
-.Fn adjtime
-reverts to the
-.Fn adjtime
-system call, which is restricted to the super user.
-.Sh RETURN VALUES
-A return value of 0 indicates that the call succeeded.
-A return value of \-1 indicates that an error occurred, and in this
-case an error code is stored in the global variable
-.Va errno .
-.Sh ERRORS
-.Fn adjtime
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-An argument points outside the process's allocated address space.
-.It Bq Er EPERM
-The process's effective user ID is not that of the super user.
-.El
-.Sh SEE ALSO
-.Xr date 1 ,
-.Xr gettimeofday 2 ,
-.Xr clockctl 4 ,
-.Xr timed 8 ,
-.Xr timedc 8
-.Rs
-.%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD"
-.%A R. Gusella
-.%A S. Zatti
-.Re
-.Sh HISTORY
-The
-.Fn adjtime
-function call appeared in
-.Bx 4.3 .
diff --git a/lib/libc/sys/adjtime.c b/lib/libc/sys/adjtime.c
deleted file mode 100644
index 1f96c7306..000000000
--- a/lib/libc/sys/adjtime.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*	$NetBSD: adjtime.c,v 1.12 2011/10/15 23:00:02 christos Exp $ */
-
-/*
- * Copyright (c) 2001 The NetBSD Foundation, Inc.      
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Emmanuel Dreyfus.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: adjtime.c,v 1.12 2011/10/15 23:00:02 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <unistd.h>
-#include <time.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/syscall.h>
-
-#include <sys/clockctl.h>
- 
-extern int __clockctl_fd;
-
-int ____adjtime50(const struct timeval *, struct timeval *);
-
-int
-adjtime(const struct timeval *delta, struct timeval *olddelta)
-{
-	struct clockctl_adjtime args;
-	int rv;
-
-	/*
-	 * we always attempt the syscall first and switch to 
-	 * clockctl if that fails with EPERM
-	 */
-	if (__clockctl_fd == -1) {
-		rv = ____adjtime50(delta, olddelta);
-	
-		/*
-		 * try via clockctl if the call fails with EPERM
-		 */
-		if (rv != -1 || errno != EPERM)
-			return rv;
-
-		/*
-		 * If this fails, it means that we are not root
-		 * and we cannot open clockctl. This is a failure.
-		 */
-		__clockctl_fd = open(_PATH_CLOCKCTL, O_WRONLY | O_CLOEXEC, 0);
-		if (__clockctl_fd == -1) {
-			/* original error was EPERM - don't leak open errors */
-			errno = EPERM;
-			return -1;
-		}
-	}
-
-	/* 
-	 * If __clockctl_fd >=0, clockctl has already been open
-	 * and used, so we carry on using it.
-	 */
-	args.delta = delta;
-	args.olddelta = olddelta;
-	return ioctl(__clockctl_fd, CLOCKCTL_ADJTIME, &args);
-}
diff --git a/lib/libc/sys/bind.2 b/lib/libc/sys/bind.2
deleted file mode 100644
index fa3ca6731..000000000
--- a/lib/libc/sys/bind.2
+++ /dev/null
@@ -1,186 +0,0 @@
-.\"	$NetBSD: bind.2,v 1.29 2015/04/05 20:41:05 wiz Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\"
-.\"     @(#)bind.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 5, 2015
-.Dt BIND 2
-.Os
-.Sh NAME
-.Nm bind
-.Nd bind a name to a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft int
-.Fn bind "int s" "const struct sockaddr *name" "socklen_t namelen"
-.Sh DESCRIPTION
-.Fn bind
-assigns a name to an unnamed socket.
-When a socket is created
-with
-.Xr socket 2
-it exists in a name space (address family)
-but has no name assigned.
-.Fn bind
-requests that
-.Fa name
-be assigned to the socket.
-.Fa namelen
-indicates the amount of space pointed to by
-.Fa name ,
-in bytes.
-.Sh NOTES
-Binding a name in the
-.Ux
-domain creates a socket in the file
-system that must be deleted by the caller when it is no longer
-needed (using
-.Xr unlink 2 ) .
-.Pp
-The rules used in name binding vary between communication domains.
-Consult the manual entries in section 4 for detailed information.
-.Sh RETURN VALUES
-If the bind is successful, a 0 value is returned.
-A return value of \-1 indicates an error, which is
-further specified in the global
-.Va errno .
-.Sh ERRORS
-The
-.Fn bind
-call will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The requested address is protected, and the current user
-has inadequate permission to access it.
-.It Bq Er EADDRINUSE
-The specified address is already in use.
-.It Bq Er EADDRNOTAVAIL
-The specified address is not available from the local machine.
-.It Bq Er EAFNOSUPPORT
-Addresses in the specified address family cannot be used with this socket.
-.It Bq Er EBADF
-.Fa s
-is not a valid descriptor.
-.It Bq Er EFAULT
-The
-.Fa name
-parameter is not in a valid part of the user
-address space.
-.It Bq Er EINVAL
-The socket is already bound to an address; or
-the family of the socket and that requested in
-.Fa name-\*[Gt]sa_family
-are not equivalent.
-.It Bq Er ENOTSOCK
-.Fa s
-is not a socket.
-.El
-.Pp
-The following errors are specific to binding names in the
-.Ux
-domain.
-.Bl -tag -width Er
-.It Bq Er EIO
-An I/O error occurred while making the directory entry or allocating the inode.
-.It Bq Er EISDIR
-An empty pathname was specified.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-A prefix component of the path name does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er EROFS
-The name would reside on a read-only file system.
-.El
-.Sh SEE ALSO
-.Xr connect 2 ,
-.Xr getsockname 2 ,
-.Xr listen 2 ,
-.Xr socket 2
-.Sh HISTORY
-The
-.Fn bind
-function call appeared in
-.Bx 4.2 .
-.Sh SECURITY CONSIDERATIONS
-.Fn bind
-was changed in
-.Nx 1.4
-to prevent the binding of a socket to the same port as an existing
-socket when all of the following is true:
-.Bl -bullet -compact -offset indent
-.It
-either of the existing or new addresses is
-.Li INADDR_ANY ,
-.It
-the uid of the new socket is not root, and
-the uids of the creators of the sockets are different,
-.It
-the address is not a multicast address, and
-.It
-both sockets are not bound to
-.Li INADDR_ANY
-with
-.Li SO_REUSEPORT
-set.
-.El
-.Pp
-This prevents an attack where a user could bind to a port with
-the host's IP address (after setting
-.Li SO_REUSEADDR )
-and
-.Sq steal
-packets destined for a server that bound to the
-same port with
-.Li INADDR_ANY .
-.Pp
-.Fn bind
-was changed in
-.Nx 4.0
-to honor the user's umask when binding sockets in the local domain.
-This was done to match the behavior of other operating systems,
-including
-.Fx ,
-.Ox ,
-and
-Linux, and to improve compatibility with some third-party software.
-Please note that this behavior
-.Em is not portable .
-If you must bind a local socket in a portable and secure way, you need
-to make a directory with tight permissions and then create the socket
-inside it.
diff --git a/lib/libc/sys/brk.2 b/lib/libc/sys/brk.2
deleted file mode 100644
index f117e6ad9..000000000
--- a/lib/libc/sys/brk.2
+++ /dev/null
@@ -1,174 +0,0 @@
-.\"	$NetBSD: brk.2,v 1.32 2004/05/13 10:20:57 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)brk.2	8.4 (Berkeley) 5/1/95
-.\"
-.Dd July 12, 1999
-.Dt BRK 2
-.Os
-.Sh NAME
-.Nm brk ,
-.Nm sbrk
-.Nd change data segment size
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn brk "void *addr"
-.Ft void *
-.Fn sbrk "intptr_t incr"
-.Sh DESCRIPTION
-.Bf -symbolic
-The brk and sbrk functions are legacy interfaces from before the
-advent of modern virtual memory management.
-.Ef
-.Pp
-The
-.Fn brk
-and
-.Fn sbrk
-functions are used to change the amount of memory allocated in a
-process's data segment.
-They do this by moving the location of the
-.Dq break .
-The break is the first address after the end of the process's
-uninitialized data segment (also known as the
-.Dq BSS ) .
-.Pp
-While the actual process data segment size maintained by the kernel will only
-grow or shrink in page sizes, these functions allow setting the break
-to unaligned values (i.e. it may point to any address inside the last
-page of the data segment).
-.Pp
-The
-.Fn brk
-function sets the break to
-.Fa addr .
-.Pp
-The
-.Fn sbrk
-function raises the break by at least
-.Fa incr
-bytes, thus allocating at least
-.Fa incr
-bytes of new memory in the data segment.
-If
-.Fa incr
-is negative,
-the break is lowered by
-.Fa incr
-bytes.
-.Pp
-.Fn sbrk
-returns the prior address of the break.
-The current value of the program break may be determined by calling
-.Fn sbrk 0 .
-(See also
-.Xr end 3 ) .
-.Pp
-The
-.Xr getrlimit 2
-system call may be used to determine
-the maximum permissible size of the
-.Em data
-segment;
-it will not be possible to set the break
-beyond the
-.Dv RLIMIT_DATA
-.Em rlim_max
-value returned from a call to
-.Xr getrlimit 2 ,
-e.g.
-.Dq etext + rlim.rlim_max .
-(see
-.Xr end 3
-for the definition of
-.Em etext ) .
-.Sh RETURN VALUES
-.Fn brk
-returns 0 if successful;
-otherwise \-1 with
-.Va errno
-set to indicate why the allocation failed.
-.Pp
-The
-.Fn sbrk
-function returns the prior break value if successful;
-otherwise ((void *)\-1) is returned and
-.Va errno
-is set to indicate why the allocation failed.
-.Sh ERRORS
-.Fn brk
-or
-.Fn sbrk
-will fail and no additional memory will be allocated if
-one of the following are true:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-The limit, as set by
-.Xr setrlimit 2 ,
-was exceeded.
-.It Bq Er ENOMEM
-The maximum possible size of a data segment (compiled into the
-system) was exceeded.
-.It Bq Er ENOMEM
-Insufficient space existed in the swap area
-to support the expansion.
-.El
-.Sh SEE ALSO
-.Xr execve 2 ,
-.Xr getrlimit 2 ,
-.Xr mmap 2 ,
-.Xr end 3 ,
-.Xr free 3 ,
-.Xr malloc 3 ,
-.Xr sysconf 3
-.Sh HISTORY
-A
-.Fn brk
-function call appeared in
-.At v7 .
-.Sh BUGS
-Note that
-mixing
-.Fn brk
-and
-.Fn sbrk
-with
-.Xr malloc 3 ,
-.Xr free 3 ,
-and similar functions may result in non-portable program
-behavior.
-Caution is advised.
-.Pp
-Setting the break may fail due to a temporary lack of swap space.
-It is not possible to distinguish this from a failure caused by
-exceeding the maximum size of the data segment without consulting
-.Xr getrlimit 2 .
diff --git a/lib/libc/sys/chdir.2 b/lib/libc/sys/chdir.2
deleted file mode 100644
index e83cd289c..000000000
--- a/lib/libc/sys/chdir.2
+++ /dev/null
@@ -1,137 +0,0 @@
-.\"	$NetBSD: chdir.2,v 1.22 2013/02/05 13:36:59 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)chdir.2	8.2 (Berkeley) 12/11/93
-.\"
-.Dd February 5, 2013
-.Dt CHDIR 2
-.Os
-.Sh NAME
-.Nm chdir ,
-.Nm fchdir
-.Nd change current working directory
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn chdir "const char *path"
-.Ft int
-.Fn fchdir "int fd"
-.Sh DESCRIPTION
-The
-.Fa path
-argument points to the pathname of a directory.
-The
-.Fn chdir
-function
-causes the named directory
-to become the current working directory, that is,
-the starting point for path searches of pathnames not beginning with
-a slash,
-.Ql / .
-.Pp
-The
-.Fn fchdir
-function
-causes the directory referenced by
-.Fa fd
-to become the current working directory,
-the starting point for path searches of pathnames not beginning with
-a slash,
-.Ql / .
-.Pp
-In order for a directory to become the current directory,
-a process must have execute (search) access to the directory.
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate
-the error.
-.Sh ERRORS
-.Fn chdir
-will fail and the current working directory will be unchanged if
-one or more of the following are true:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for any component of
-the path name.
-.It Bq Er EFAULT
-.Fa path
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named directory does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.El
-.Pp
-.Fn fchdir
-will fail and the current working directory will be unchanged if
-one or more of the following are true:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for the directory referenced by the
-file descriptor.
-.It Bq Er EBADF
-The argument
-.Fa fd
-is not a valid file descriptor.
-.It Bq Er ENOTDIR
-The file descriptor does not reference a directory.
-.It Bq Er EPERM
-The argument
-.Fa fd
-references a directory which is not at or below the current process's
-root directory.
-.El
-.Sh SEE ALSO
-.Xr chroot 2 ,
-.Xr getcwd 3
-.Sh STANDARDS
-The
-.Fn chdir
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn fchdir
-function call
-appeared in
-.Bx 4.2 .
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
deleted file mode 100644
index b045d6ea0..000000000
--- a/lib/libc/sys/chflags.2
+++ /dev/null
@@ -1,186 +0,0 @@
-.\"	$NetBSD: chflags.2,v 1.28 2013/06/08 06:05:03 kardel Exp $
-.\"
-.\" Copyright (c) 1989, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	@(#)chflags.2	8.3 (Berkeley) 5/2/95
-.\"
-.Dd August 6, 2011
-.Dt CHFLAGS 2
-.Os
-.Sh NAME
-.Nm chflags ,
-.Nm lchflags ,
-.Nm fchflags
-.Nd set file flags
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/stat.h
-.In unistd.h
-.Ft int
-.Fn chflags "const char *path"  "u_long flags"
-.Ft int
-.Fn lchflags "const char *path"  "u_long flags"
-.Ft int
-.Fn fchflags "int fd" "u_long flags"
-.Sh DESCRIPTION
-The file whose name
-is given by
-.Fa path
-or referenced by the descriptor
-.Fa fd
-has its flags changed to
-.Fa flags .
-For
-.Fn lchflags ,
-symbolic links are not traversed and thus their modes may be changed with
-this call.
-.Pp
-The flags specified are formed by
-.Em or Ns 'ing
-the following values:
-.Pp
-.Bl -tag -width "SF_IMMUTABLE" -compact -offset indent
-.It Dv UF_NODUMP
-Do not dump the file.
-.It Dv UF_IMMUTABLE
-The file may not be changed.
-.It Dv UF_APPEND
-The file may only be appended to.
-.It Dv UF_OPAQUE
-The file (if a directory) is opaque for union mounts.
-.It Dv SF_ARCHIVED
-The file is archived.
-.It Dv SF_IMMUTABLE
-The file may not be changed.
-.It Dv SF_APPEND
-The file may only be appended to.
-.El
-.Pp
-The
-.Dv UF_NODUMP ,
-.Dv UF_IMMUTABLE ,
-.Dv UF_APPEND ,
-and
-.Dv UF_OPAQUE
-flags may be set or unset by either the owner of a file or the super-user,
-except on block and character devices, where only the super-user may set
-or unset them.
-.Pp
-The
-.Dv SF_ARCHIVED ,
-.Dv SF_IMMUTABLE ,
-and
-.Dv SF_APPEND
-flags may only be set or unset by the super-user.
-These flags may be set at any time, but normally may only be unset when
-the system is in single-user mode.
-(See
-.Xr init 8
-for details.)
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn chflags
-will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EPERM
-The effective user ID does not match the owner of the file and
-the effective user ID is not the super-user, or
-the effective user ID is not the super-user and one or more of the
-super-user-only flags for the named file would be changed.
-.It Bq Er EOPNOTSUPP
-The named file resides on a file system that does not support file
-flags.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.It Bq Er EFAULT
-.Fa path
-points outside the process's allocated address space.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.El
-.Pp
-.Fn fchflags
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The descriptor is not valid.
-.It Bq Er EINVAL
-.Fa fd
-refers to a socket, not to a file.
-.It Bq Er EPERM
-The effective user ID does not match the owner of the file and
-the effective user ID is not the super-user, or
-the effective user ID is not the super-user and one or more of the
-super-user-only flags for the file would be changed.
-.It Bq Er EOPNOTSUPP
-The file resides on a file system that does not support file flags.
-.It Bq Er EROFS
-The file resides on a read-only file system.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr chflags 1 ,
-.Xr stat 2 ,
-.Xr stat_flags 3 ,
-.Xr init 8 ,
-.Xr mount_union 8
-.Sh HISTORY
-The
-.Fn chflags
-and
-.Fn fchflags
-functions first appeared in
-.Bx 4.4 .
-The
-.Fn lchflags
-function first appeared in
-.Nx 1.5 .
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
deleted file mode 100644
index fb9c469e1..000000000
--- a/lib/libc/sys/chmod.2
+++ /dev/null
@@ -1,298 +0,0 @@
-.\"	$NetBSD: chmod.2,v 1.47 2013/10/15 11:43:21 njoly Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)chmod.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd July 29, 2013
-.Dt CHMOD 2
-.Os
-.Sh NAME
-.Nm chmod ,
-.Nm lchmod ,
-.Nm fchmod ,
-.Nm fchmodat
-.Nd change mode of file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/stat.h
-.Ft int
-.Fn chmod "const char *path" "mode_t mode"
-.Ft int
-.Fn lchmod "const char *path" "mode_t mode"
-.Ft int
-.Fn fchmod "int fd" "mode_t mode"
-.In sys/stat.h
-.In fcntl.h
-.Ft int
-.Fn fchmodat "int fd" "const char *path" "mode_t mode" "int flag"
-.Sh DESCRIPTION
-The function
-.Fn chmod
-sets the file permission bits
-of the file
-specified by the pathname
-.Fa path
-to
-.Fa mode .
-.Fn fchmod
-sets the permission bits of the specified
-file descriptor
-.Fa fd .
-.Fn lchmod
-is like
-.Fn chmod
-except in the case where the named file is a symbolic link,
-in which case
-.Fn lchmod
-sets the permission bits of the link,
-while
-.Fn chmod
-sets the bits of the file the link references.
-.Pp
-.Fn fchmodat
-works the same way as
-.Fn chmod
-(or
-.Fn lchmod
-if
-.Dv AT_SYMLINK_NOFOLLOW
-is set in
-.Fa flag )
-except if
-.Fa path
-is relative.
-In that case, it is looked up from a directory whose file
-descriptor was passed as
-.Fa fd .
-Search permission is required on this directory.
-.\"    (These alternatives await a decision about the semantics of O_SEARCH)
-.\" Search permission is required on this directory
-.\" except if
-.\" .Fa fd
-.\" was opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" This file descriptor must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.Fa fd
-except if that file descriptor was opened with the
-.Dv O_SEARCH
-flag.
-.Fa fd
-can be set to
-.Dv AT_FDCWD
-in order to specify the current directory.
-.Pp
-.Fn chmod
-verifies that the process owner (user) either owns
-the file specified by
-.Fa path
-(or
-.Fa fd ) ,
-or
-is the super-user.
-A mode is created from
-.Em or'd
-permission bit masks
-defined in
-.In sys/stat.h :
-.Bd -literal -offset indent -compact
-#define S_IRWXU 0000700    /* RWX mask for owner */
-#define S_IRUSR 0000400    /* R for owner */
-#define S_IWUSR 0000200    /* W for owner */
-#define S_IXUSR 0000100    /* X for owner */
-
-#define S_IRWXG 0000070    /* RWX mask for group */
-#define S_IRGRP 0000040    /* R for group */
-#define S_IWGRP 0000020    /* W for group */
-#define S_IXGRP 0000010    /* X for group */
-
-#define S_IRWXO 0000007    /* RWX mask for other */
-#define S_IROTH 0000004    /* R for other */
-#define S_IWOTH 0000002    /* W for other */
-#define S_IXOTH 0000001    /* X for other */
-
-#define S_ISUID 0004000    /* set user id on execution */
-#define S_ISGID 0002000    /* set group id on execution */
-#define S_ISVTX 0001000    /* sticky bit */
-.Ed
-.Pp
-The mode
-.Dv ISVTX
-(the
-.Sq sticky bit )
-can be set on regular files, but has no effect.
-For historical reasons this can be done only by the super-user.
-.Pp
-If mode
-.Dv ISVTX
-(the
-.Sq sticky bit )
-is set on a directory,
-an unprivileged user may not delete or rename
-files of other users in that directory.
-The sticky bit may be set by any user on a directory which the user
-owns or has appropriate permissions.
-.Pp
-For more information about the history and properties of the sticky bit, see
-.Xr sticky 7 .
-.Pp
-Changing the owner of a file
-turns off the set-user-id and set-group-id bits;
-writing to a file
-turns off the set-user-id and set-group-id bits
-unless the user is the super-user.
-This makes the system somewhat more secure
-by protecting set-user-id (set-group-id) files
-from remaining set-user-id (set-group-id) if they are modified,
-at the expense of a degree of compatibility.
-.Sh RETURN VALUES
-.Rv -std chmod lchmod fchmod fchmodat
-.Sh ERRORS
-.Fn chmod ,
-.Fn lchmod
-and
-.Fn fchmodat
-will fail and the file mode will be unchanged if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EFAULT
-.Fa path
-points outside the process's allocated address space.
-.It Bq Er EFTYPE
-The effective user ID is not the super-user, the
-.Fa mode
-includes the sticky bit
-.Pq Dv S_ISVTX ,
-and
-.Fa path
-does not refer to a directory.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er EPERM
-The effective user ID does not match the owner of the file and
-the effective user ID is not the super-user; or
-the mode includes the setgid bit
-.Pq Dv S_ISGID
-but the file's group is neither the effective group ID nor is it in the
-group access list.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.El
-.Pp
-In addition,
-.Fn fchmodat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa path
-does not specify an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for reading or searching.
-.It Bq Er ENOTDIR
-.Fa path
-is not an absolute path and
-.Fa fd
-is a file descriptor associated with a non-directory file.
-.El
-.Pp
-.Fn fchmod
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The descriptor is not valid.
-.It Bq Er EFTYPE
-The effective user ID is not the super-user, the
-.Fa mode
-includes the sticky bit
-.Pq Dv S_ISVTX ,
-and
-.Fa fd
-does not refer to a directory.
-.It Bq Er EINVAL
-.Fa fd
-refers to a socket, not to a file.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er EPERM
-The effective user ID does not match the owner of the file and
-the effective user ID is not the super-user; or
-the mode includes the setgid bit
-.Pq Dv S_ISGID
-but the file's group is neither the effective group ID nor is it in the
-group access list.
-.It Bq Er EROFS
-The file resides on a read-only file system.
-.El
-.Sh SEE ALSO
-.Xr chmod 1 ,
-.Xr chflags 2 ,
-.Xr chown 2 ,
-.Xr open 2 ,
-.Xr stat 2 ,
-.Xr getmode 3 ,
-.Xr setmode 3 ,
-.Xr sticky 7 ,
-.Xr symlink 7
-.Sh STANDARDS
-The
-.Fn chmod
-function conforms to
-.St -p1003.1-90 .
-.Fn fchmodat
-function conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn fchmod
-function call
-appeared in
-.Bx 4.2 .
-The
-.Fn lchmod
-function call appeared in
-.Nx 1.3 .
diff --git a/lib/libc/sys/chown.2 b/lib/libc/sys/chown.2
deleted file mode 100644
index 91d829bc9..000000000
--- a/lib/libc/sys/chown.2
+++ /dev/null
@@ -1,269 +0,0 @@
-.\"	$NetBSD: chown.2,v 1.36 2013/07/30 12:38:16 njoly Exp $
-.\"
-.\" Copyright (c) 1980, 1991, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)chown.2	8.4 (Berkeley) 4/19/94
-.\"
-.Dd July 30, 2013
-.Dt CHOWN 2
-.Os
-.Sh NAME
-.Nm chown ,
-.Nm lchown ,
-.Nm fchown ,
-.Nm fchownat
-.Nd change owner and group of a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn chown "const char *path" "uid_t owner" "gid_t group"
-.Ft int
-.Fn lchown "const char *path" "uid_t owner" "gid_t group"
-.Ft int
-.Fn fchown "int fd" "uid_t owner" "gid_t group"
-.In fcntl.h
-.Ft int
-.Fn fchownat "int fd" "const char *path" "uid_t owner" "gid_t group" "int flag"
-.Sh DESCRIPTION
-The owner ID and group ID of the file
-named by
-.Fa path
-or referenced by
-.Fa fd
-is changed as specified by the arguments
-.Fa owner
-and
-.Fa group .
-The owner of a file may change the
-.Fa group
-to a group of which
-he or she is a member,
-but the change
-.Fa owner
-capability is restricted to the super-user.
-.Pp
-When called to change the owner of a file,
-.Fn chown ,
-.Fn lchown
-and
-.Fn fchown
-clear the set-user-id
-.Dv ( S_ISUID )
-bit on the file.
-When a called to change the group of a file,
-.Fn chown ,
-.Fn lchown
-and
-.Fn fchown
-clear the set-group-id
-.Dv ( S_ISGID )
-bit on the file.
-These actions are taken to prevent accidental or mischievous creation of
-set-user-id and set-group-id programs.
-.Pp
-.Fn lchown
-is like
-.Fn chown
-except in the case where the named file is a symbolic link,
-in which case
-.Fn lchown
-changes the owner and group of the link,
-while
-.Fn chown
-changes the owner and group of the file the link references.
-.Pp
-.Fn fchown
-is particularly useful when used in conjunction
-with the file locking primitives (see
-.Xr flock 2 ) .
-.Pp
-.Fn fchownat
-works the same way as
-.Fn chown
-(or
-.Fn lchown
-if
-.Dv AT_SYMLINK_NOFOLLOW
-is set in
-.Fa flag )
-except if
-.Fa path
-is relative.
-In that case, it is looked up from a directory whose file
-descriptor was passed as
-.Fa fd .
-Search permission is required on this directory.
-.\"    (These alternatives await a decision about the semantics of O_SEARCH)
-.\" Search permission is required on this directory
-.\" except if
-.\" .Fa fd
-.\" was opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" This file descriptor must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.Fa fd
-can be set to
-.Dv AT_FDCWD
-in order to specify the current directory.
-.Pp
-One of the owner or group id's
-may be left unchanged by specifying it as (uid_t)\-1 or (gid_t)\-1 respectively.
-.Sh RETURN VALUES
-.Rv -std chown lchown fchown fchownat
-.Sh ERRORS
-.Fn chown ,
-.Fn lchown
-and
-.Fn fchownat
-will fail and the file will be unchanged if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EFAULT
-.Fa path
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er EPERM
-The effective user ID is not the super-user.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.El
-.Pp
-In addition,
-.Fn fchownat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa path
-does not specify an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for reading or searching.
-.It Bq Er ENOTDIR
-.Fa path
-is not an absolute path and
-.Fa fd
-is a file descriptor associated with a non-directory file.
-.El
-.Pp
-.Fn fchown
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa fd
-does not refer to a valid descriptor.
-.It Bq Er EINVAL
-.Fa fd
-refers to a socket, not a file.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er EPERM
-The effective user ID is not the super-user.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.El
-.Sh SEE ALSO
-.Xr chgrp 1 ,
-.Xr chmod 2 ,
-.Xr flock 2 ,
-.Xr symlink 7 ,
-.Xr chown 8
-.Sh STANDARDS
-The
-.Fn chown
-function deviates from the semantics defined in
-.St -p1003.1-90 ,
-which specifies that, unless the caller is the super-user, both the
-set-user-id and set-group-id bits on a file shall be cleared, regardless
-of the file attribute changed.
-The
-.Fn lchown
-and
-.Fn fchown
-functions, as defined by
-.St -xpg4.2 ,
-provide the same semantics.
-.Fn fchownat
-conforms to
-.St -p1003.1-2008 .
-.Pp
-To retain conformance to these standards, compatibility interfaces
-are provided by the
-.Lb libposix
-as follows:
-.Bl -bullet -compact
-.It
-The
-.Fn chown
-function conforms to
-.St -p1003.1-90
-and
-.St -xpg4.2 .
-.It
-The
-.Fn lchown
-and
-.Fn fchown
-functions conform to
-.St -xpg4.2 .
-.El
-.Sh HISTORY
-The
-.Fn fchown
-function call appeared in
-.Bx 4.2 .
-.Pp
-The
-.Fn chown
-and
-.Fn fchown
-functions were changed to follow symbolic links in
-.Bx 4.4 .
-The
-.Fn lchown
-function call appeared in
-.Nx 1.3 .
diff --git a/lib/libc/sys/chroot.2 b/lib/libc/sys/chroot.2
deleted file mode 100644
index 069a0479e..000000000
--- a/lib/libc/sys/chroot.2
+++ /dev/null
@@ -1,152 +0,0 @@
-.\"	$NetBSD: chroot.2,v 1.23 2010/05/31 12:16:20 njoly Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)chroot.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 18, 2001
-.Dt CHROOT 2
-.Os
-.Sh NAME
-.Nm chroot
-.Nd change root directory
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn chroot "const char *dirname"
-.Ft int
-.Fn fchroot "int fd"
-.Sh DESCRIPTION
-.Fa dirname
-is the address of the pathname of a directory, terminated by an ASCII NUL.
-.Fn chroot
-causes
-.Fa dirname
-to become the root directory,
-that is, the starting point for path searches of pathnames
-beginning with
-.Ql / .
-.Pp
-In order for a directory to become the root directory
-a process must have execute (search) access for that directory.
-.Pp
-If the current working directory is not at or under the new root
-directory, it is silently set to the new root directory.
-It should be noted that, on most other systems,
-.Fn chroot
-has no effect on the process's current directory.
-.Pp
-This call is restricted to the super-user.
-.Pp
-The
-.Fn fchroot
-function performs the same operation on an open directory file
-known by the file descriptor
-.Fa fd .
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate an error.
-.Sh ERRORS
-.Fn chroot
-will fail and the root directory will be unchanged if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path name is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named directory does not exist.
-.It Bq Er EACCES
-Search permission is denied for any component of the path name.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EFAULT
-.Fa dirname
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er EPERM
-The effective user ID of the calling process is not the super-user.
-.El
-.Pp
-.Fn fchroot
-will fail and the root directory will be unchanged if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for the directory referenced
-by the file descriptor.
-.It Bq Er EBADF
-The argument
-.Fa fd
-is not a valid file descriptor.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er ENOTDIR
-The argument
-.Fa fd
-does not reference a directory.
-.It Bq Er EPERM
-The effective user ID of the calling process is not the super-user.
-.El
-.Sh SEE ALSO
-.Xr chdir 2
-.Sh STANDARDS
-The
-.Fn chroot
-function conforms to
-.St -xsh5 ,
-with the restriction that the calling process' working directory must be at
-or under the new root directory.
-Otherwise, the working directory is silently set to the new root directory;
-this is an extension to the standard.
-.Pp
-.Fn chroot
-was declared a legacy interface, and subsequently removed in
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn chroot
-function call appeared in
-.Bx 4.2 .
-Working directory handling was changed in
-.Nx 1.4
-to prevent one way a process could use a second
-.Fn chroot
-call to a different directory to "escape" from the restricted subtree.
-The
-.Fn fchroot
-function appeared in
-.Nx 1.4 .
diff --git a/lib/libc/sys/clock_settime.2 b/lib/libc/sys/clock_settime.2
deleted file mode 100644
index d6f58f252..000000000
--- a/lib/libc/sys/clock_settime.2
+++ /dev/null
@@ -1,201 +0,0 @@
-.\" $NetBSD: clock_settime.2,v 1.22 2014/03/28 15:35:55 wiz Exp $
-.\"
-.\" Copyright (c) 1999 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.
-.\"
-.Dd February 11, 1999
-.Dt CLOCK_SETTIME 2
-.Os
-.Sh NAME
-.Nm clock_settime ,
-.Nm clock_gettime ,
-.Nm clock_getres
-.Nd clock and timer functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft int
-.Fn clock_settime "clockid_t clock_id" "const struct timespec *tp"
-.Ft int
-.Fn clock_gettime "clockid_t clock_id" "struct timespec *tp"
-.Ft int
-.Fn clock_getres "clockid_t clock_id" "struct timespec *res"
-.Sh DESCRIPTION
-The
-.Fn clock_settime
-function sets the clock identified by
-.Fa clock_id
-to the absolute time specified by
-.Fa tp .
-If the time specified by
-.Fa tp
-is not a multiple of the resolution of the clock,
-.Fa tp
-is truncated to a multiple of the resolution.
-.Pp
-The
-.Fn clock_gettime
-function stores the time of the clock identified by
-.Fa clock_id
-into the location specified by
-.Fa tp .
-.Pp
-The
-.Fn clock_getres
-function stores the resolution of the clock identified by
-.Fa clock_id
-into the location specified by
-.Fa res ,
-unless
-.Fa res
-is
-.Dv NULL .
-.Pp
-A
-.Fa clock_id
-of
-.Dv CLOCK_REALTIME
-identifies the realtime clock for the system.
-For this clock, the values specified by
-.Fn clock_settime
-and obtained by
-.Fn clock_gettime
-represent the amount of time (in seconds and nanoseconds)
-since 00:00 Universal Coordinated Time, January 1, 1970.
-.Pp
-A
-.Fa clock_id
-of
-.Dv CLOCK_MONOTONIC
-identifies a clock that increases at a steady rate (monotonically).
-This clock
-is not affected by calls to
-.Xr adjtime 2
-and
-.Xr settimeofday 2
-and will
-fail with an
-.Er EINVAL
-error if it's the clock specified in a call to
-.Fn clock_settime .
-The origin of the clock is unspecified.
-.Pp
-A
-.Fa clock_id
-of
-.Dv CLOCK_VIRTUAL
-identifies a clock that increments only when the CPU is running in
-user mode on behalf of the calling process.
-.Pp
-A
-.Fa clock_id
-of
-.Dv CLOCK_PROF
-identifies a clock that increments when the CPU is running in user
-or kernel mode on behalf of the calling process.
-.Pp
-If the calling user is not the super-user, then the
-.Fn clock_settime
-function in the standard C library will try to use the
-.Xr clockctl 4
-device if present, thus making possible for non privileged users to
-set the system time.
-If
-.Xr clockctl 4
-is not present or not accessible, then
-.Fn clock_settime
-reverts to the
-.Fn clock_settime
-system call, which is restricted to the super user.
-.Sh RETURN VALUES
-A value of 0 is returned on success.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn clock_settime ,
-.Fn clock_gettime
-and
-.Fn clock_getres
-functions will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa clock_id
-argument does not specify a known clock.
-.It Bq Er ENOSYS
-The function is not supported by this implementation.
-.El
-.Pp
-The
-.Fn clock_settime
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa tp
-argument is outside the range for the specified clock,
-.Fa clock_id ;
-or the
-.Fa tp
-argument specified a nanosecond value less than zero of greater than or equal
-1000 million;
-or the
-.Fa clock_id
-argument is a clock that can not be adjusted.
-.It Bq Er EPERM
-The
-calling process does not have the appropriate privilege to set the specified
-clock,
-.Fa clock_id .
-.El
-.Pp
-The
-.Fn clock_gettime
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa tp
-argument specifies an address that is not a valid part of the process address
-space.
-.El
-.Sh SEE ALSO
-.Xr ctime 3 ,
-.Xr time 3 ,
-.\" .Xr timer_gettime 3 ,
-.Xr clockctl 4
-.Sh STANDARDS
-The
-.Fn clock_settime ,
-.Fn clock_gettime
-and
-.Fn clock_getres
-functions conform to
-.St -p1003.1b-93 .
diff --git a/lib/libc/sys/clock_settime.c b/lib/libc/sys/clock_settime.c
deleted file mode 100644
index a1770d7bb..000000000
--- a/lib/libc/sys/clock_settime.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*	$NetBSD: clock_settime.c,v 1.12 2011/10/15 23:00:02 christos Exp $ */
-
-/*
- * Copyright (c) 2001 The NetBSD Foundation, Inc.      
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Emmanuel Dreyfus.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: clock_settime.c,v 1.12 2011/10/15 23:00:02 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/syscall.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <sys/clockctl.h>
- 
-extern int __clockctl_fd;
-
-int ____clock_settime50(clockid_t, const struct timespec *);
-
-int
-clock_settime(clockid_t clock_id, const struct timespec *tp)
-{
-	struct clockctl_clock_settime args;
-	int rv;
-
-	/*
-	 * always try the syscall first and attempt to switch to
-	 * clockctl if that fails.
-	 */
-	if (__clockctl_fd == -1) {
-		rv = ____clock_settime50(clock_id, tp);
-	
-		/*
-		 * return unless we failed with EPERM
-		 */
-		if (rv != -1 || errno != EPERM)
-			return rv;
-
-		/*
-		 * If this fails, it means that we are not root
-		 * and we cannot open clockctl. This is a failure.
-		 */
-		__clockctl_fd = open(_PATH_CLOCKCTL, O_WRONLY | O_CLOEXEC, 0);
-		if (__clockctl_fd == -1) {
-			/* original error was EPERM - don't leak open errors */
-			errno = EPERM;
-			return -1;
-		}
-	}
-
-	/* 
-	 * If __clockctl_fd >=0, clockctl has already been open
-	 * and used, so we carry on using it.
-	 */
-	args.clock_id = clock_id;
-	args.tp = tp;
-	return ioctl(__clockctl_fd, CLOCKCTL_CLOCK_SETTIME, &args);
-}
diff --git a/lib/libc/sys/clone.2 b/lib/libc/sys/clone.2
deleted file mode 100644
index dbdaf5aad..000000000
--- a/lib/libc/sys/clone.2
+++ /dev/null
@@ -1,205 +0,0 @@
-.\"	$NetBSD: clone.2,v 1.13 2012/01/29 11:44:54 wiz Exp $
-.\"
-.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 4, 2010
-.Dt CLONE 2
-.Os
-.Sh NAME
-.Nm clone ,
-.Nm __clone
-.Nd spawn new process with options
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sched.h
-.Ft pid_t
-.Fn clone "int (*func)(void *arg)" "void *stack" "int flags" "void *arg"
-.Ft pid_t
-.Fn __clone "int (*func)(void *arg)" "void *stack" "int flags" "void *arg"
-.Sh DESCRIPTION
-The
-.Nm
-system call (and associated library support code) creates a new process
-in a way that allows the caller to specify several options for the new
-process creation.
-.Pp
-Unlike
-.Xr fork 2
-or
-.Xr vfork 2 ,
-in which the child process returns to the call site,
-.Nm
-causes the child process to begin execution at the function specified
-by
-.Ar func .
-The argument
-.Ar arg
-is passed to the entry point, as a means for the parent to provide
-context to the child.
-The stack pointer for the child process will be set to
-.Ar stack .
-Note that the
-.Nm
-interface requires that the application know the stack direction
-for the architecture, and that the caller initialize the
-.Ar stack
-argument as appropriate for the stack direction.
-.Pp
-The
-.Ar flags
-argument specifies several options that control how the child process
-is created.
-The lower 8 bits of
-.Ar flags
-specify the signal that is to be sent to the parent when the child
-exits.
-The following flags may also be specified by bitwise-or'ing
-them with the signal value:
-.Bl -tag -width "CLONE_SIGHAND" -offset 2n
-.It Dv CLONE_VM
-Share the virtual address space with the parent.
-The address space is shared in the same way as
-.Xr vfork 2 .
-.It Dv CLONE_FS
-Share the
-.Dq file system information
-with the parent.
-This include the current working directory and file creation mask.
-.It Dv CLONE_FILES
-Share the file descriptor table with the parent.
-.It Dv CLONE_SIGHAND
-Share the signal handler set with the parent.
-Note that the signal mask
-is never shared between the parent and the child, even if
-.Dv CLONE_SIGHAND
-is set.
-.It Dv CLONE_VFORK
-Preserve the synchronization semantics of
-.Xr vfork 2 ;
-the parent blocks until the child exits.
-.El
-.Pp
-The
-.Nm
-call returns the pid of the child in the parent's context.
-The child is provided no return value, since it begins execution at
-a different address.
-.Pp
-If the child process's entry point returns, the value it returns
-is passed to
-.Xr _exit 2 ,
-and the child process exits.
-Note that if the child process wants to exit directly, it should use
-.Xr _exit 2 ,
-and not
-.Xr exit 3 ,
-since
-.Xr exit 3
-will flush and close standard I/O channels, and thereby corrupt the
-parent process's standard I/O data structures (even with
-.Xr fork 2
-it is wrong to call
-.Xr exit 3
-since buffered data would then be flushed twice).
-.Pp
-Note that
-.Nm
-is not intended to be used for new native
-.Nx
-applications.
-It is provided as a means to port software
-originally written for the Linux operating system to
-.Nx .
-.Sh RETURN VALUES
-Same as for
-.Xr fork 2 .
-.Sh ERRORS
-Same as for
-.Xr fork 2 .
-.Sh SEE ALSO
-.Xr chdir 2 ,
-.Xr chroot 2 ,
-.Xr fork 2 ,
-.Xr sigaction 2 ,
-.Xr sigprocmask 2 ,
-.Xr umask 2 ,
-.Xr vfork 2 ,
-.Xr wait 2
-.Sh HISTORY
-The
-.Fn clone
-function call appeared in
-.Nx 1.6 .
-It is compatible with the Linux function call of the same name
-with respect to the described options.
-.Sh BUGS
-The
-.Nx
-implementation of
-.Fn clone
-does not implement the following
-.Ar flags
-that are present in the Linux implementation:
-.Pp
-.Bl -bullet -offset indent -compact
-.It
-.Dv CLONE_CHILD_CLEARTID
-.It
-.Dv CLONE_CHILD_SETTID
-.It
-.Dv CLONE_IO
-.It
-.Dv CLONE_NEWIPC
-.It
-.Dv CLONE_NEWNET
-.It
-.Dv CLONE_NEWNS
-.It
-.Dv CLONE_NEWPID
-.It
-.Dv CLONE_NEWUTS
-.It
-.Dv CLONE_PARENT
-.It
-.Dv CLONE_PARENT_SETTID
-.It
-.Dv CLONE_PID
-.It
-.Dv CLONE_PTRACE
-.It
-.Dv CLONE_SETTLS
-.It
-.Dv CLONE_STOPPED
-.It
-.Dv CLONE_SYSVSEM
-.It
-.Dv CLONE_THREAD
-.It
-.Dv CLONE_UNTRACED
-.El
diff --git a/lib/libc/sys/close.2 b/lib/libc/sys/close.2
deleted file mode 100644
index 6f89c576b..000000000
--- a/lib/libc/sys/close.2
+++ /dev/null
@@ -1,132 +0,0 @@
-.\"	$NetBSD: close.2,v 1.17 2004/06/01 16:14:10 kleink Exp $
-.\"
-.\" Copyright (c) 1980, 1991, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)close.2	8.2 (Berkeley) 4/19/94
-.\"
-.Dd April 19, 1994
-.Dt CLOSE 2
-.Os
-.Sh NAME
-.Nm close
-.Nd delete a descriptor
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn close "int d"
-.Sh DESCRIPTION
-The
-.Fn close
-system call deletes a descriptor from the per-process object
-reference table.
-If this is the last reference to the underlying object, the
-object will be deactivated.
-For example, on the last close of a file the current
-.Em seek
-pointer associated with the file is lost; on the last close of a
-.Xr socket 2
-associated naming information and queued data are discarded; on
-the last close of a file holding an advisory lock the lock is
-released (see
-.Xr flock 2 ) .
-.Pp
-When a process exits, all associated descriptors are freed, but
-since there is a limit on active descriptors per processes, the
-.Fn close
-system call
-is useful when a large quantity of file descriptors are being handled.
-.Pp
-When a process calls
-.Xr fork 2 ,
-all descriptors for the new child process reference the same
-objects as they did in the parent before the
-.Fn fork .
-If a new process is then to be run using
-.Xr execve 2 ,
-the process would normally inherit these descriptors.
-Most of the descriptors can be rearranged with
-.Xr dup2 2
-or deleted with
-.Fn close
-before the
-.Fn execve
-is attempted, but if some of these descriptors will still be needed if the
-.Fn execve
-fails, it is necessary to arrange for them to be closed only if the
-.Fn execve
-succeeds.
-For this reason, the system call
-.Bl -item -offset indent
-.It
-.Fn fcntl d F_SETFD 1 ;
-.El
-.Pp
-is provided,
-which arranges that a descriptor
-.Dq Fa d
-will be closed after a successful
-.Fn execve ;
-the system call
-.Bl -item -offset indent
-.It
-.Fn fcntl d F_SETFD 0 ;
-.El
-.Pp
-restores the default, which is to not close descriptor
-.Dq Fa d .
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn close
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa d
-is not an active descriptor.
-.It Bq Er EINTR
-An interrupt was received.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr execve 2 ,
-.Xr fcntl 2 ,
-.Xr flock 2 ,
-.Xr open 2 ,
-.Xr pipe 2 ,
-.Xr socket 2 ,
-.Xr socketpair 2
-.Sh STANDARDS
-The
-.Fn close
-function conforms to
-.St -p1003.1-90 .
diff --git a/lib/libc/sys/connect.2 b/lib/libc/sys/connect.2
deleted file mode 100644
index f2d283c38..000000000
--- a/lib/libc/sys/connect.2
+++ /dev/null
@@ -1,178 +0,0 @@
-.\"	$NetBSD: connect.2,v 1.28 2010/05/31 12:16:20 njoly Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\"
-.\"     @(#)connect.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd May 18, 2004
-.Dt CONNECT 2
-.Os
-.Sh NAME
-.Nm connect
-.Nd initiate a connection on a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft int
-.Fn connect "int s" "const struct sockaddr *name" "socklen_t namelen"
-.Sh DESCRIPTION
-The parameter
-.Fa s
-is a socket.
-If it is of type
-.Dv SOCK_DGRAM ,
-this call specifies the peer with which the socket is to be associated;
-this address is that to which datagrams are to be sent,
-and the only address from which datagrams are to be received.
-If the socket is of type
-.Dv SOCK_STREAM ,
-this call attempts to make a connection to
-another socket.
-The other socket is specified by
-.Fa name ,
-which is an address in the communications space of the socket.
-.Fa namelen
-indicates the amount of space pointed to by
-.Fa name ,
-in bytes.
-Each communications space interprets the
-.Fa name
-parameter in its own way.
-Generally, stream sockets may successfully
-.Fn connect
-only once; datagram sockets may use
-.Fn connect
-multiple times to change their association.
-Datagram sockets may dissolve the association
-by connecting to an invalid address, such as a null address.
-.Pp
-If a
-.Fn connect
-call is interrupted by a signal, it will return with errno set to
-.Er EINTR
-and the connection attempt will proceed as if the socket was non-blocking.
-Subsequent calls to
-.Fn connect
-will set errno to
-.Er EALREADY .
-.Sh RETURN VALUES
-If the connection or binding succeeds, 0 is returned.
-Otherwise a \-1 is returned, and a more specific error
-code is stored in
-.Va errno .
-.Sh ERRORS
-The
-.Fn connect
-call fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-.Fa s
-is a descriptor for a file, not a socket.
-.It Bq Er EADDRNOTAVAIL
-The specified address is not available on this machine.
-.It Bq Er EAFNOSUPPORT
-Addresses in the specified address family cannot be used with this socket.
-.It Bq Er EISCONN
-The socket is already connected.
-.It Bq Er ETIMEDOUT
-Connection establishment timed out without establishing a connection.
-.It Bq Er ECONNREFUSED
-The attempt to connect was forcefully rejected.
-.It Bq Er ENETUNREACH
-The network isn't reachable from this host.
-.It Bq Er EADDRINUSE
-The address is already in use.
-.It Bq Er EFAULT
-The
-.Fa name
-parameter specifies an area outside
-the process address space.
-.It Bq Er EINPROGRESS
-The socket is non-blocking and the connection cannot be completed immediately.
-It is possible to
-.Xr select 2
-or
-.Xr poll 2
-for completion by selecting or polling the socket for writing.
-The success or failure of the connect operation may be determined by using
-.Xr getsockopt 2
-to read the socket error status with the
-.Dv SO_ERROR
-option at the
-.Dv SOL_SOCKET
-level.
-The returned socket error status is zero on success, or one of the
-error codes listed here on failure.
-.It Bq Er EALREADY
-Either the socket is non-blocking mode or a previous call to
-.Fn connect
-was interrupted by a signal, and the connection attempt has not yet
-been completed.
-.It Bq Er EINTR
-The connection attempt was interrupted by a signal.
-.El
-.Pp
-The following errors are specific to connecting names in the
-.Ux
-domain.
-These errors may not apply in future versions of the
-.Ux
-IPC domain.
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named socket does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix, or
-write access to the named socket is denied.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr getsockname 2 ,
-.Xr getsockopt 2 ,
-.Xr poll 2 ,
-.Xr select 2 ,
-.Xr socket 2
-.Sh HISTORY
-The
-.Fn connect
-function call appeared in
-.Bx 4.2 .
diff --git a/lib/libc/sys/dup.2 b/lib/libc/sys/dup.2
deleted file mode 100644
index fcc8651e4..000000000
--- a/lib/libc/sys/dup.2
+++ /dev/null
@@ -1,243 +0,0 @@
-.\"	$NetBSD: dup.2,v 1.30 2013/12/25 02:49:52 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)dup.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd December 24, 2013
-.Dt DUP 2
-.Os
-.Sh NAME
-.Nm dup ,
-.Nm dup2 ,
-.Nm dup3
-.Nd duplicate an existing file descriptor
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn dup "int oldfd"
-.Ft int
-.Fn dup2 "int oldfd" "int newfd"
-.Ft int
-.Fn dup3 "int oldfd" "int newfd" "int flags"
-.Sh DESCRIPTION
-The
-.Fn dup
-family of calls duplicates an existing file descriptor
-.Fa oldfd .
-A new file descriptor is produced; it is a new reference to the same
-underlying system object.
-The object in question does not distinguish between the descriptors
-referencing it in any way.
-Thus for files,
-.Xr read 2 ,
-.Xr write 2
-and
-.Xr lseek 2
-calls all move a single shared seek position.
-Similarly, all object modes, settings, properties, and behavior other
-than the close-on-exec flag are shared between references.
-This includes the setting of append mode, non-blocking I/O actions,
-asynchronous I/O operations in progress, socket options, and so forth.
-The close-on-exec flag, however, is a property of the descriptor
-rather than the object and can be set independently for each
-reference.
-.Pp
-To get an independent handle with its own seek position and settings,
-an additional
-.Xr open 2
-call must be issued.
-(This is not generally possible for pipes and sockets.)
-.Pp
-The
-.Nm dup
-call chooses the new descriptor: it is the lowest-numbered descriptor
-not currently in use.
-The
-.Nm dup2
-and
-.Nm dup3
-calls allow the caller to choose the new descriptor by passing
-.Fa newfd ,
-which must be within the range of valid descriptors.
-If
-.Fa newfd
-is the same as
-.Fa oldfd ,
-the call has no effect.
-Otherwise, if
-.Fa newfd
-is already in use, it is closed as if
-.Xr close 2
-had been called.
-.Pp
-File descriptors are small non-negative integers that index into the
-per-process file table.
-Values 0, 1, and 2 have the special property that they are treated as
-standard input, standard output, and standard error respectively.
-(The constants
-.Dv STDIN_FILENO ,
-.Dv STDOUT_FILENO ,
-and
-.Dv STDERR_FILENO
-are provided as symbolic forms for these values.)
-The maximum value for a file descriptor is one less than the file
-table size.
-The file table size can be interrogated with
-.Xr getdtablesize 3
-and can to some extent be adjusted with
-.Xr setrlimit 2 .
-.Pp
-The
-.Fn dup3
-call includs an additional
-.Fa flags
-argument supporting a subset of the
-.Xr open 2
-flags:
-.Bl -tag -width O_NOSIGPIPE -offset indent
-.It Dv O_CLOEXEC
-Set the close-on-exec flag on
-.Fa newfd .
-.It Dv O_NONBLOCK
-Sets non-blocking I/O.
-.It Dv O_NOSIGPIPE
-For pipes and sockets, do not raise
-.Dv SIGPIPE
-when a write is made to a broken pipe.
-Instead, the write will fail with
-.Er EPIPE .
-.El
-As described above, only the close-on-exec flag is
-per-file-descriptor, so passing any of the other
-.Fa flags
-will affect
-both
-.Fa oldfd
-and
-.Fa newfd .
-These settings are, however, applied atomically along with the rest of
-the
-.Fn dup3
-operation.
-.Pp
-In the case of
-.Fn dup
-and
-.Fn dup2
-the close-on-exec flag on the new file descriptor is always left
-unset and all the modes and settings of the underlying object are left
-unchanged.
-.Pp
-Functionality similar to
-.Fn dup
-with slightly different semantics is also available via
-.Xr fcntl 2 .
-.Sh RETURN VALUES
-These calls return the new file descriptor value.
-In the case of
-.Fn dup2
-and
-.Fn dup3
-this is always the same as
-.Fa newfd .
-If an error occurs, the value \-1 is returned and
-.Va errno
-is set to indicate what happened.
-.Sh EXAMPLES
-A common use for these functions is to set up a pipe as the standard
-input or standard output of a subprocess.
-That is done approximately as follows (error handling omitted for
-clarity):
-.Bd -literal -offset indent
-#include \*[Lt]unistd.h\*[Gt]
-
-int fds[2];
-pid_t pid;
-
-pipe(fds);
-pid = fork();
-if (pid == 0) {
-	/* child; use read end of pipe to stdin */
-	dup2(fds[0], STDIN_FILENO);
-	close(fds[0]);
-	close(fds[1]);
-	execv("/some/program", args);
-}
-/* parent process; return write end of pipe */
-close(fds[0]);
-return fds[1];
-.Ed
-.Sh ERRORS
-These functions fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa oldfd
-is not a valid active descriptor, or for
-.Fn dup2
-and
-.Fn dup3 ,
-.Fa newfd
-is not in the range of valid file descriptors.
-.It Bq Er EINVAL
-.Fa flags
-contained an invalid value.
-Only
-.Fn dup3
-can generate this error.
-.It Bq Er EMFILE
-Too many descriptors are active.
-Only
-.Fn dup
-can generate this error.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr close 2 ,
-.Xr fcntl 2 ,
-.Xr getrlimit 2 ,
-.Xr open 2 ,
-.Xr pipe 2 ,
-.Xr setrlimit 2 ,
-.Xr socket 2 ,
-.Xr socketpair 2 ,
-.Xr getdtablesize 3
-.Sh STANDARDS
-The
-.Fn dup
-and
-.Fn dup2
-functions conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn dup3
-function originated in Linux and appeared in
-.Nx 6.0 .
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
deleted file mode 100644
index 0b390f58b..000000000
--- a/lib/libc/sys/execve.2
+++ /dev/null
@@ -1,293 +0,0 @@
-.\"	$NetBSD: execve.2,v 1.40 2010/05/31 12:16:20 njoly Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)execve.2	8.5 (Berkeley) 6/1/94
-.\"
-.Dd February 24, 2008
-.Dt EXECVE 2
-.Os
-.Sh NAME
-.Nm execve
-.Nd execute a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn execve "const char *path" "char *const argv[]" "char *const envp[]"
-.Sh DESCRIPTION
-.Fn execve
-transforms the calling process into a new process.
-The new process is constructed from an ordinary file,
-whose name is pointed to by
-.Fa path ,
-called the
-.Em new process file .
-This file is either an executable object file,
-or a file of data for an interpreter.
-An executable object file consists of an identifying header,
-followed by pages of data representing the initial program (text)
-and initialized data pages.
-Additional pages may be specified
-by the header to be initialized with zero data;  see
-.Xr a.out 5 .
-.Pp
-An interpreter file begins with a line of the form:
-.Pp
-.Bd -filled -offset indent -compact
-.Sy \&#!
-.Em interpreter
-.Bq Em arg
-.Ed
-.Pp
-When an interpreter file is
-.Fn execve Ns d
-the system runs the specified
-.Em interpreter .
-If the optional
-.Em arg
-is specified, it becomes the first argument to the
-.Em interpreter ,
-and the name of the originally
-.Fn execve Ns d
-file becomes the second argument;
-otherwise, the name of the originally
-.Fn execve Ns d
-file becomes the first argument.
-The original arguments are shifted over to become the subsequent arguments.
-The zeroth argument, normally the name of the
-.Fn execve Ns d
-file, is left unchanged.
-The interpreter named by
-.Em interpreter
-must not itself be an interpreter file.
-(See
-.Xr script 7
-for a detailed discussion of interpreter file execution.)
-.Pp
-The argument
-.Fa argv
-is a pointer to a null-terminated array of
-character pointers to null-terminated character strings.
-These strings construct the argument list to be made available to the new
-process.
-By custom, the first element should be
-the name of the executed program (for example, the last component of
-.Fa path ) .
-.Pp
-The argument
-.Fa envp
-is also a pointer to a null-terminated array of
-character pointers to null-terminated strings.
-A pointer to this array is normally stored in the global variable
-.Va environ .
-These strings pass information to the
-new process that is not directly an argument to the command (see
-.Xr environ 7 ) .
-.Pp
-File descriptors open in the calling process image remain open in
-the new process image, except for those for which the close-on-exec
-flag is set (see
-.Xr close 2
-and
-.Xr fcntl 2 ) .
-Descriptors that remain open are unaffected by
-.Fn execve .
-.Pp
-In the case of a new setuid or setgid executable being executed, if
-file descriptors 0, 1, or 2 (representing stdin, stdout, and stderr)
-are currently unallocated, these descriptors will be opened to point to
-some system file like
-.Pa /dev/null .
-The intent is to ensure these descriptors are not unallocated, since
-many libraries make assumptions about the use of these 3 file descriptors.
-.Pp
-Signals set to be ignored in the calling process are set to be ignored in
-the new process.
-Signals which are set to be caught in the calling process image
-are set to default action in the new process image.
-Blocked signals remain blocked regardless of changes to the signal action.
-The signal stack is reset to be undefined (see
-.Xr sigaction 2
-for more information).
-.Pp
-If the set-user-ID mode bit of the new process image file is set
-(see
-.Xr chmod 2 ) ,
-the effective user ID of the new process image is set to the owner ID
-of the new process image file.
-If the set-group-ID mode bit of the new process image file is set,
-the effective group ID of the new process image is set to the group ID
-of the new process image file.
-(The effective group ID is the first element of the group list.)
-The real user ID, real group ID and
-other group IDs of the new process image remain the same as the calling
-process image.
-After any set-user-ID and set-group-ID processing,
-the effective user ID is recorded as the saved set-user-ID,
-and the effective group ID is recorded as the saved set-group-ID.
-These values may be used in changing the effective IDs later (see
-.Xr setuid 2 ) .
-.Pp
-The new process also inherits the following attributes from
-the calling process:
-.Pp
-.Bl -column parent_process_ID -offset indent -compact
-.It process ID Ta see Xr getpid 2
-.It parent process ID Ta see Xr getppid 2
-.It process group ID Ta see Xr getpgrp 2
-.It access groups Ta see Xr getgroups 2
-.It working directory Ta see Xr chdir 2
-.It root directory Ta see Xr chroot 2
-.It control terminal Ta see Xr termios 4
-.It resource usages Ta see Xr getrusage 2
-.It interval timers Ta see Xr getitimer 2
-.It resource limits Ta see Xr getrlimit 2
-.It file mode mask Ta see Xr umask 2
-.It signal mask Ta see Xr sigaction 2 ,
-.Xr sigprocmask 2
-.El
-.Pp
-When a program is executed as a result of an
-.Fn execve
-call, it is entered as follows:
-.Bd -literal -offset indent
-main(argc, argv, envp)
-int argc;
-char **argv, **envp;
-.Ed
-.Pp
-where
-.Fa argc
-is the number of elements in
-.Fa argv
-(the
-.Dq arg count )
-and
-.Fa argv
-points to the array of character pointers
-to the arguments themselves.
-.Sh RETURN VALUES
-As the
-.Fn execve
-function overlays the current process image
-with a new process image the successful call
-has no process to return to.
-If
-.Fn execve
-does return to the calling process an error has occurred; the
-return value will be \-1 and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn execve
-will fail and return to the calling process if:
-.Bl -tag -width Er
-.It Bq Er E2BIG
-The number of bytes in the new process's argument list
-is larger than the system-imposed limit.
-The limit in the system as released is 262144 bytes
-.Dv ( NCARGS
-in
-.Ao Pa sys/param.h Ac ) .
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix,
-the new process file is not an ordinary file,
-its file mode denies execute permission, or
-it is on a filesystem mounted with execution
-disabled
-.Dv ( MNT_NOEXEC
-in
-.Ao Pa sys/mount.h Ac ) .
-.It Bq Er EAGAIN
-A
-.Xr setuid 7
-process has exceeded the current resource limit for the number of
-processes it is allowed to run concurrently.
-.It Bq Er EFAULT
-The new process file is not as long as indicated by
-the size values in its header; or
-.Fa path ,
-.Fa argv ,
-or
-.Fa envp
-point to an illegal address.
-.It Bq Er EIO
-An I/O error occurred while reading from the file system.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The new process file does not exist, or
-the new process file is a script starting with
-.Li #!
-and the script interpreter does not exist.
-.It Bq Er ENOEXEC
-The new process file has the appropriate access
-permission, but has an invalid magic number in its header.
-.It Bq Er ENOMEM
-The new process requires more virtual memory than
-is allowed by the imposed maximum
-.Pq Xr getrlimit 2 .
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ETXTBSY
-The new process file is a pure procedure (shared text)
-file that is currently open for writing or reading by some process.
-.El
-.Sh SEE ALSO
-.Xr _exit 2 ,
-.Xr fork 2 ,
-.Xr execl 3 ,
-.Xr environ 7 ,
-.Xr script 7
-.Sh STANDARDS
-The
-.Fn execve
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn execve
-function call first appeared in
-.At v7 .
-.Sh BUGS
-If a program is
-.Em setuid
-to a non-super-user, but is executed when
-the real
-.Em uid
-is
-.Dq root ,
-then the program has some of the powers of a super-user as well.
diff --git a/lib/libc/sys/extattr_get_file.2 b/lib/libc/sys/extattr_get_file.2
deleted file mode 100644
index 7c053d395..000000000
--- a/lib/libc/sys/extattr_get_file.2
+++ /dev/null
@@ -1,266 +0,0 @@
-.\"	$NetBSD: extattr_get_file.2,v 1.6 2014/11/11 08:10:02 njoly Exp $
-.\"
-.\" Copyright (c) 2001 Dima Dorfman <dima@unixfreak.org>
-.\" Copyright (c) 2003 Robert Watson <rwatson@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: src/lib/libc/sys/extattr_get_file.2,v 1.14 2004/07/05 17:12:52 ru Exp
-.\"
-.Dd August 3, 2011
-.Dt EXTATTR_GET_FILE 2
-.Os
-.Sh NAME
-.Nm extattr_get_fd ,
-.Nm extattr_set_fd ,
-.Nm extattr_delete_fd ,
-.Nm extattr_list_fd ,
-.Nm extattr_get_file ,
-.Nm extattr_set_file ,
-.Nm extattr_delete_file ,
-.Nm extattr_list_file ,
-.Nm extattr_get_link ,
-.Nm extattr_set_link ,
-.Nm extattr_delete_link ,
-.Nm extattr_list_link
-.Nd system calls to manipulate VFS extended attributes
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/extattr.h
-.Ft ssize_t
-.Fn extattr_get_fd "int fd" "int attrnamespace" "const char *attrname" "void *data" "size_t nbytes"
-.Ft int
-.Fn extattr_set_fd "int fd" "int attrnamespace" "const char *attrname" "const void *data" "size_t nbytes"
-.Ft int
-.Fn extattr_delete_fd "int fd" "int attrnamespace" "const char *attrname"
-.Ft ssize_t
-.Fn extattr_list_fd "int fd" "int attrnamespace" "void *data" "size_t nbytes"
-.Ft ssize_t
-.Fn extattr_get_file "const char *path" "int attrnamespace" "const char *attrname" "void *data" "size_t nbytes"
-.Ft int
-.Fn extattr_set_file "const char *path" "int attrnamespace" "const char *attrname" "const void *data" "size_t nbytes"
-.Ft int
-.Fn extattr_delete_file "const char *path" "int attrnamespace" "const char *attrname"
-.Ft ssize_t
-.Fn extattr_list_file "const char *path" "int attrnamespace" "void *data" "size_t nbytes"
-.Ft ssize_t
-.Fn extattr_get_link "const char *path" "int attrnamespace" "const char *attrname" "void *data" "size_t nbytes"
-.Ft int
-.Fn extattr_set_link "const char *path" "int attrnamespace" "const char *attrname" "const void *data" "size_t nbytes"
-.Ft int
-.Fn extattr_delete_link "const char *path" "int attrnamespace" "const char *attrname"
-.Ft ssize_t
-.Fn extattr_list_link "const char *path" "int attrnamespace" "void *data" "size_t nbytes"
-.Sh DESCRIPTION
-Named extended attributes are meta-data associated with vnodes
-representing files and directories.
-They exist as
-.Qq Li name=value
-pairs within a set of namespaces.
-.Pp
-The
-.Fn extattr_get_file
-system call retrieves the value of the specified extended attribute into
-a buffer pointed to by
-.Fa data
-of size
-.Fa nbytes .
-The
-.Fn extattr_set_file
-system call sets the value of the specified extended attribute to the data
-described by
-.Fa data .
-The
-.Fn extattr_delete_file
-system call deletes the extended attribute specified.
-The
-.Fn extattr_list_file
-returns a list of attributes present in the requested namespace.
-Each list entry consists of a single byte containing the length
-of the attribute name, followed by the attribute name.
-The attribute name is not terminated by ASCII 0 (nul).
-The
-.Fn extattr_get_file
-and
-.Fn extattr_list_file
-calls consume the
-.Fa data
-and
-.Fa nbytes
-arguments in the style of
-.Xr read 2 ;
-.Fn extattr_set_file
-consumes these arguments in the style of
-.Xr write 2 .
-.Pp
-If
-.Fa data
-is
-.Dv NULL
-in a call to
-.Fn extattr_get_file
-then the size of defined extended attribute data will be returned, rather
-than the quantity read, permitting applications to test the size of the
-data without performing a read.
-.Pp
-The
-.Fn extattr_delete_link ,
-.Fn extattr_get_link ,
-and
-.Fn extattr_set_link
-system calls behave in the same way as their _file counterparts, except that
-they do not follow symlinks.
-.Pp
-The
-.Fn extattr_get_fd ,
-.Fn extattr_set_fd ,
-and
-.Fn extattr_delete_fd
-calls are identical to their
-.Qq Li _file
-counterparts except for the first argument.
-The
-.Qq Li _fd
-functions take a file descriptor, while the
-.Qq Li _file
-functions take a path.
-Both arguments describe a file associated with the extended attribute
-that should be manipulated.
-.Pp
-The following arguments are common to all the system calls described here:
-.Bl -tag -width attrnamespace
-.It Fa attrnamespace
-the namespace in which the extended attribute resides; see
-.Xr extattr 9
-.It Fa attrname
-the name of the extended attribute
-.El
-.Pp
-Named extended attribute semantics vary by file system implementing the call.
-Not all operations may be supported for a particular attribute.
-Additionally, the format of the data in
-.Fa data
-is attribute-specific.
-.Pp
-For more information on named extended attributes, please see
-.Xr extattr 9 .
-.Sh RETURN VALUES
-If successful, the
-.Fn extattr_get_file
-and
-.Fn extattr_set_file
-calls return the number of bytes
-that were read or written from the
-.Fa data ,
-respectively, or if
-.Fa data
-was
-.Dv NULL ,
-then
-.Fn extattr_get_file
-returns the number of bytes available to read.
-If any of the calls are unsuccessful, the value \-1 is returned
-and the global variable
-.Va errno
-is set to indicate the error.
-.Pp
-.Rv -std extattr_delete_file
-.Sh ERRORS
-The following errors may be returned by the system calls themselves.
-Additionally, the file system implementing the call may return any
-other errors it desires.
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa attrnamespace
-and
-.Fa attrname
-arguments,
-or the memory range defined by
-.Fa data
-and
-.Fa nbytes
-point outside the process's allocated address space.
-.It Bq Er ENAMETOOLONG
-The attribute name was longer than
-.Dv EXTATTR_MAXNAMELEN .
-.El
-.Pp
-The
-.Fn extattr_get_fd ,
-.Fn extattr_set_fd ,
-and
-.Fn extattr_delete_fd
-system calls may also fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The file descriptor referenced by
-.Fa fd
-was invalid.
-.El
-.Pp
-Additionally, the
-.Fn extattr_get_file ,
-.Fn extattr_set_file ,
-and
-.Fn extattr_delete_file
-calls may also fail due to the following errors:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters,
-or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-A component of the path name that must exist does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.\" XXX are any missing?
-.El
-.Sh SEE ALSO
-.Xr getextattr 1 ,
-.Xr extattr 3 ,
-.Xr extattr 9
-.Sh HISTORY
-Extended attribute support was developed as part of the
-.Tn TrustedBSD
-Project, and introduced in
-.Fx 5.0
-and
-.Nx 3.0 .
-It was developed to support security extensions requiring additional labels
-to be associated with each file or directory.
-.Sh CAVEATS
-This interface is under active development, and as such is subject to
-change as applications are adapted to use it.
-Developers are discouraged from relying on its stability.
-.Pp
-Note that previous versions of this man page incorrectly stated that
-.Fn extattr_list_file
-returned a list of attribute names separated by ASCII 0 (nul).
diff --git a/lib/libc/sys/fcntl.2 b/lib/libc/sys/fcntl.2
deleted file mode 100644
index 6903477e6..000000000
--- a/lib/libc/sys/fcntl.2
+++ /dev/null
@@ -1,527 +0,0 @@
-.\"	$NetBSD: fcntl.2,v 1.41 2013/12/28 20:03:22 dholland Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\"
-.\"     @(#)fcntl.2	8.2 (Berkeley) 1/12/94
-.\"
-.Dd January 23, 2012
-.Dt FCNTL 2
-.Os
-.Sh NAME
-.Nm fcntl
-.Nd file descriptor control
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fcntl.h
-.Ft int
-.Fn fcntl "int fd" "int cmd" "..."
-.Sh DESCRIPTION
-.Fn fcntl
-provides for control over descriptors.
-The argument
-.Fa fd
-is a descriptor to be operated on by
-.Fa cmd
-as described below.
-The third parameter is called
-.Fa arg
-and is technically a pointer to void, but it is
-interpreted as an int by some commands and ignored by others.
-.Pp
-Commands are:
-.Bl -tag -width F_DUPFD_CLOEXEC
-.It Dv F_DUPFD
-Return a new descriptor as follows:
-.Pp
-.Bl -bullet -compact -offset 4n
-.It
-Lowest numbered available descriptor greater than or equal to
-.Fa arg ,
-which is interpreted as an int.
-.It
-Same object references as the original descriptor.
-.It
-New descriptor shares the same file offset if the object
-was a file.
-.It
-Same access mode (read, write or read/write).
-.It
-Same file status flags (i.e., both file descriptors
-share the same file status flags).
-.It
-The close-on-exec flag associated with the new file descriptor
-is cleared to remain open across
-.Xr execve 2
-system calls.
-.El
-.It Dv F_DUPFD_CLOEXEC
-Same as
-.Dv F_DUPFD ,
-but sets the close-on-exec property on the file descriptor created.
-.It Dv F_GETFD
-Get the close-on-exec flag associated with the file descriptor
-.Fa fd
-as
-.Dv FD_CLOEXEC .
-If the returned value ANDed with
-.Dv FD_CLOEXEC
-is 0,
-the file will remain open across
-.Fn exec ,
-otherwise the file will be closed upon execution of
-.Fn exec
-.Fa ( arg
-is ignored).
-.It Dv F_SETFD
-Set the close-on-exec flag associated with
-.Fa fd
-to
-.Fa arg ,
-where
-.Fa arg
-is either 0 or
-.Dv FD_CLOEXEC ,
-as described above.
-.It Dv F_GETFL
-Get descriptor status flags, as described below
-.Fa ( arg
-is ignored).
-.It Dv F_SETFL
-Set descriptor status flags to
-.Fa arg ,
-which is interpreted as an int.
-.It Dv F_GETOWN
-Get the process ID or process group
-currently receiving
-.Dv SIGIO
-and
-.Dv SIGURG
-signals; process groups are returned
-as negative values
-.Fa ( arg
-is ignored).
-.It Dv F_SETOWN
-Set the process or process group
-to receive
-.Dv SIGIO
-and
-.Dv SIGURG
-signals;
-process groups are specified by supplying
-.Fa arg
-as negative, otherwise
-.Fa arg
-is interpreted as a process ID.
-The argument
-.Fa arg
-is interpreted as an int.
-.It Dv F_CLOSEM
-Close all file descriptors greater than or equal to
-.Ar fd .
-.It Dv F_MAXFD
-Return the maximum file descriptor number currently open by the process.
-.It Dv F_GETNOSIGPIPE
-Return if the
-.Dv O_NOSIGPIPE
-flag is set in the file descriptor.
-.It Dv F_SETNOSIGPIPE
-Set or clear the
-.Dv O_NOSIGPIPE
-in the file descriptor.
-.El
-.Pp
-The set of valid flags for the
-.Dv F_GETFL
-and
-.Dv F_SETFL
-flags are as follows:
-.Dv O_APPEND ,
-.Dv O_ASYNC ,
-.Dv O_SYNC ,
-.Dv O_NONBLOCK ,
-.Dv O_DSYNC ,
-.Dv O_RSYNC ,
-.Dv O_ALT_IO ,
-.Dv O_DIRECT ,
-.Dv O_NOSIGPIPE .
-These flags are described in
-.Xr open 2 .
-.Pp
-Several commands are available for doing advisory file locking;
-they all operate on the following structure:
-.Bd -literal
-struct flock {
-	off_t	l_start;	/* starting offset */
-	off_t	l_len;		/* len = 0 means until end of file */
-	pid_t	l_pid;		/* lock owner */
-	short	l_type;		/* lock type: read/write, etc. */
-	short	l_whence;	/* type of l_start */
-};
-.Ed
-.Pp
-The commands available for advisory record locking are as follows:
-.Bl -tag -width F_SETLKWX
-.It Dv F_GETLK
-Get the first lock that blocks the lock description pointed to by the
-third argument,
-.Fa arg ,
-taken as a pointer to a
-.Fa "struct flock"
-(see above).
-The information retrieved overwrites the information passed to
-.Nm
-in the
-.Fa flock
-structure.
-If no lock is found that would prevent this lock from being created,
-the structure is left unchanged by this function call except for the
-lock type
-.Fa l_type ,
-which is set to
-.Dv F_UNLCK .
-.It Dv F_SETLK
-Set or clear a file segment lock according to the lock description
-pointed to by the third argument,
-.Fa arg ,
-taken as a pointer to a
-.Fa "struct flock"
-(see above).
-As specified by the value of
-.Fa l_type ,
-.Dv F_SETLK
-is used to establish shared (or read) locks
-.Pq Dv F_RDLCK
-or exclusive (or write) locks,
-.Pq Dv F_WRLCK ,
-as well as remove either type of lock
-.Pq Dv F_UNLCK .
-If a shared or exclusive lock cannot be set,
-.Nm
-returns immediately with
-.Er EAGAIN .
-.It Dv F_SETLKW
-This command is the same as
-.Dv F_SETLK
-except that if a shared or exclusive lock is blocked by other locks,
-the process waits until the request can be satisfied.
-If a signal that is to be caught is received while
-.Nm
-is waiting for a region, the
-.Nm
-will be interrupted if the signal handler has not specified the
-.Dv SA_RESTART
-(see
-.Xr sigaction 2 ) .
-.El
-.Pp
-When a shared lock has been set on a segment of a file,
-other processes can set shared locks on that segment
-or a portion of it.
-A shared lock prevents any other process from setting an exclusive
-lock on any portion of the protected area.
-A request for a shared lock fails if the file descriptor was not
-opened with read access.
-.Pp
-An exclusive lock prevents any other process from setting a shared lock or
-an exclusive lock on any portion of the protected area.
-A request for an exclusive lock fails if the file was not
-opened with write access.
-.Pp
-The value of
-.Fa l_whence
-is
-.Dv SEEK_SET ,
-.Dv SEEK_CUR ,
-or
-.Dv SEEK_END
-to indicate that the relative offset,
-.Fa l_start
-bytes, will be measured from the start of the file,
-current position, or end of the file, respectively.
-The value of
-.Fa l_len
-is the number of consecutive bytes to be locked.
-If
-.Fa l_len
-is negative, the result is undefined.
-The
-.Fa l_pid
-field is only used with
-.Dv F_GETLK
-to return the process ID of the process holding a blocking lock.
-After a successful
-.Dv F_GETLK
-request, the value of
-.Fa l_whence
-is
-.Dv SEEK_SET .
-.Pp
-Locks may start and extend beyond the current end of a file,
-but may not start or extend before the beginning of the file.
-A lock is set to extend to the largest possible value of the
-file offset for that file if
-.Fa l_len
-is set to zero.
-If
-.Fa l_whence
-and
-.Fa l_start
-point to the beginning of the file, and
-.Fa l_len
-is zero, the entire file is locked.
-If an application wishes only to do entire file locking, the
-.Xr flock 2
-system call is much more efficient.
-.Pp
-There is at most one type of lock set for each byte in the file.
-Before a successful return from an
-.Dv F_SETLK
-or an
-.Dv F_SETLKW
-request when the calling process has previously existing locks
-on bytes in the region specified by the request,
-the previous lock type for each byte in the specified
-region is replaced by the new lock type.
-As specified above under the descriptions
-of shared locks and exclusive locks, an
-.Dv F_SETLK
-or an
-.Dv F_SETLKW
-request fails or blocks respectively when another process has existing
-locks on bytes in the specified region and the type of any of those
-locks conflicts with the type specified in the request.
-.Sh RETURN VALUES
-Upon successful completion, the value returned depends on
-.Fa cmd
-as follows:
-.Bl -tag -width F_GETOWNX -offset indent
-.It Dv F_DUPFD
-A new file descriptor.
-.It Dv F_GETFD
-Value of flag (only the low-order bit is defined).
-.It Dv F_GETFL
-Value of flags.
-.It Dv F_GETOWN
-Value of file descriptor owner.
-.It Dv F_MAXFD
-Value of the highest file descriptor open by the process.
-.It other
-Value other than \-1.
-.El
-.Pp
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh COMPATIBILITY
-This interface follows the completely stupid semantics of
-.At V
-and
-.St -p1003.1-88
-that require that all locks associated with a file for a given process are
-removed when \fIany\fP file descriptor for that file is closed by that process.
-This semantic means that applications must be aware of any files that
-a subroutine library may access.
-For example if an application for updating the password file locks the
-password file database while making the update, and then calls
-.Xr getpwnam 3
-to retrieve a record,
-the lock will be lost because
-.Xr getpwnam 3
-opens, reads, and closes the password database.
-The database close will release all locks that the process has
-associated with the database, even if the library routine never
-requested a lock on the database.
-.Pp
-Another minor semantic problem with this interface is that
-locks are not inherited by a child process created using the
-.Xr fork 2
-function.
-The
-.Xr flock 2
-interface has much more rational last close semantics and
-allows locks to be inherited by child processes.
-Calling
-.Xr flock 2
-is recommended for applications that want to ensure the integrity
-of their locks when using library routines or wish to pass locks
-to their children.
-Note that
-.Xr flock 2
-and
-.Nm
-locks may be safely used concurrently.
-.Pp
-All locks associated with a file for a given process are
-removed when the process terminates.
-.Pp
-A potential for deadlock occurs if a process controlling a locked region
-is put to sleep by attempting to lock the locked region of another process.
-This implementation detects that sleeping until a locked region is unlocked
-would cause a deadlock and fails with an
-.Er EDEADLK
-error.
-.Sh ERRORS
-.Fn fcntl
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The argument
-.Fa arg
-is
-.Dv F_SETLK ,
-the type of lock
-.Pq Fa l_type
-is a shared lock
-.Pq Dv F_RDLCK
-or exclusive lock
-.Pq Dv F_WRLCK ,
-and the segment of a file to be locked is already
-exclusive-locked by another process;
-or the type is an exclusive lock and some portion of the
-segment of a file to be locked is already shared-locked or
-exclusive-locked by another process.
-.It Bq Er EBADF
-.Fa fildes
-is not a valid open file descriptor.
-.Pp
-The argument
-.Fa cmd
-is
-.Dv F_SETLK
-or
-.Dv F_SETLKW ,
-the type of lock
-.Pq Fa l_type
-is a shared lock
-.Pq Dv F_RDLCK ,
-and
-.Fa fildes
-is not a valid file descriptor open for reading.
-.Pp
-The argument
-.Fa cmd
-is
-.Dv F_SETLK
-or
-.Dv F_SETLKW ,
-the type of lock
-.Pq Fa l_type
-is an exclusive lock
-.Pq Dv F_WRLCK ,
-and
-.Fa fildes
-is not a valid file descriptor open for writing.
-.It Bq Er EDEADLK
-The argument
-.Fa cmd
-is
-.Dv F_SETLKW ,
-and a deadlock condition was detected.
-.It Bq Er EINTR
-The argument
-.Fa cmd
-is
-.Dv F_SETLKW ,
-and the function was interrupted by a signal.
-.It Bq Er EINVAL
-The argument
-.Fa cmd
-is invalid.
-.Pp
-The argument
-.Fa cmd
-is
-.Dv F_DUPFD
-and
-.Fa arg
-is negative or greater than the maximum allowable number
-(see
-.Xr getdtablesize 3 ) .
-.Pp
-The argument
-.Fa cmd
-is
-.Dv F_GETLK ,
-.Dv F_SETLK ,
-or
-.Dv F_SETLKW
-and the data to which
-.Fa arg
-points is not valid, or
-.Fa fildes
-refers to a file that does not support locking.
-.It Bq Er EMFILE
-The argument
-.Fa cmd
-is
-.Dv F_DUPFD
-and the maximum number of file descriptors permitted for the
-process are already in use,
-or no file descriptors greater than or equal to
-.Fa arg
-are available.
-.It Bq Er ENFILE
-.Fa cmd
-is
-.Dv F_DUPFD
-and system-wide the maximum allowed number of file descriptors are
-currently open.
-.It Bq Er ENOLCK
-The argument
-.Fa cmd
-is
-.Dv F_SETLK
-or
-.Dv F_SETLKW ,
-and satisfying the lock or unlock request would result in the
-number of locked regions in the system exceeding a system-imposed limit.
-.It Bq Er ESRCH
-.Fa cmd
-is
-.Dv F_SETOWN
-and
-the process ID given as argument is not in use.
-.El
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr execve 2 ,
-.Xr flock 2 ,
-.Xr open 2 ,
-.Xr sigaction 2 ,
-.Xr getdtablesize 3
-.Sh STANDARDS
-The
-.Fn fcntl
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn fcntl
-function call appeared in
-.Bx 4.2 .
diff --git a/lib/libc/sys/fdatasync.2 b/lib/libc/sys/fdatasync.2
deleted file mode 100644
index 3f12119f0..000000000
--- a/lib/libc/sys/fdatasync.2
+++ /dev/null
@@ -1,96 +0,0 @@
-.\"	$NetBSD: fdatasync.2,v 1.16 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 1998 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.
-.\"
-.Dd October 25, 2003
-.Dt FDATASYNC 2
-.Os
-.Sh NAME
-.Nm fdatasync
-.Nd synchronize the data of a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn fdatasync "int fd"
-.Sh DESCRIPTION
-The
-.Fn fdatasync
-function forces all modified data associated with the file descriptor
-.Fa fd
-to be flushed to stable storage.
-.Pp
-The functionality is as described for
-.Xr fsync 2 ,
-with the exception that file status information need not be synchronized,
-which may result in a performance gain, compared to
-.Xr fsync 2 .
-This behaviour is commonly known as
-.Bf -symbolic
-synchronized I/O data integrity completion.
-.Ef
-.Sh RETURN VALUES
-A value of 0 is returned on success.
-Otherwise, a value \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn fdatasync
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid file descriptor open for writing.
-.It Bq Er EINVAL
-This implementation does not support synchronized I/O for this file.
-.It Bq Er ENOSYS
-The
-.Fn fdatasync
-function is not supported by this implementation.
-.El
-.Pp
-In the event that any of the I/O operations to be performed fail,
-.Fn fdatasync
-returns the error conditions defined for
-.Xr read 2
-and
-.Xr write 2 ,
-and outstanding I/O operations are not guaranteed to have been completed.
-.Sh SEE ALSO
-.Xr fsync 2 ,
-.Xr open 2 ,
-.Xr read 2 ,
-.Xr write 2
-.Sh STANDARDS
-The
-.Fn fdatasync
-function conforms to
-.St -p1003.1b-93 .
diff --git a/lib/libc/sys/fdiscard.2 b/lib/libc/sys/fdiscard.2
deleted file mode 100644
index f87df7128..000000000
--- a/lib/libc/sys/fdiscard.2
+++ /dev/null
@@ -1,172 +0,0 @@
-.\"	$NetBSD: fdiscard.2,v 1.3 2015/02/01 15:24:15 christos Exp $
-.\"
-.\" Copyright (c) 2014 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by David A. Holland.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd February 1, 2015
-.Dt FDISCARD 2
-.Os
-.Sh NAME
-.Nm posix_fallocate ,
-.Nm fdiscard
-.Nd allocate or discard backing store for files
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn posix_fallocate "int fd" "off_t pos" "off_t length"
-.Ft int
-.Fn fdiscard "int fd" "off_t pos" "off_t length"
-.Sh DESCRIPTION
-The
-.Fn posix_fallocate
-call allocates backing store for the file referenced by
-.Fa fd
-in the region starting at
-.Fa pos
-bytes from the start of the file and continuing for
-.Fa length
-bytes more.
-If the region extends past the current end of file, the file size is
-increased to cover the region.
-.Pp
-The
-.Fn fdiscard
-call discards backing store for the file referenced by
-.Fa fd
-in the region starting at
-.Fa pos
-bytes from the start of the file and continuing for
-.Fa length
-bytes more.
-The file size is not affected.
-.Pp
-Both calls operate on the basis of file system blocks, so
-.Fn posix_fallocate
-may allocate more physical space than requested and
-.Fn fdiscard
-may discard less physical space than requested.
-.Pp
-When
-.Fn posix_fallocate
-is applied to an unallocated region in a regular file (a
-.Dq hole ) ,
-the hole is filled and the visible contents are unaffected; both holes
-and newly allocated regions read as all zeros.
-If
-.Fn posix_fallocate
-is applied to an already-allocated region in a regular file,
-it has no effect.
-.Pp
-When
-.Fn fdiscard
-is applied to a regular file, a hole is created and any data in the
-affected region is thrown away.
-Subsequent reads of the region return zeros.
-.Pp
-If
-.Fn fdiscard
-is applied to a device, and the device supports an underlying discard
-operation, that operation is invoked.
-For example, ATA flash devices and solid-state disks support an
-operation called TRIM that discards blocks at the device level.
-The behavior of blocks discarded at this level is
-implementation-defined; as devices vary, specific behavior should not
-be relied upon.
-Subsequent reads of the same block may return zeros; such reads may
-also, however, continue to return the previously written data, or
-return other data, or return indeterminate garbage; or may switch
-between any of these behaviors at unpredictable points later on.
-.Pp
-For both calls, the file
-.Fa fd
-must be open for writing and may not be a directory or socket.
-.Sh RESTRICTIONS
-Because there is no way for
-.Fn posix_fallocate
-to report a partial failure, errors may require some or all of the
-work it has already done to be unwound, which may be expensive.
-It is recommended to set the file length first with
-.Xr ftruncate 2
-and only then allocate space within the file using
-.Fn posix_fallocate .
-.Pp
-Depending on the implementation, even a failing call to
-.Fn posix_fallocate
-may allocate some space to the target file.
-Such a call will not, however, change the file size.
-.Pp
-Furthermore, in some implementations, the space reservations created
-by
-.Fn posix_fallocate
-may not be persistent after a crash or reboot if the space reserved
-has not yet been written to.
-.Sh RETURN VALUES
-If successful, the
-.Fn posix_fallocate
-function will return zero.
-Otherwise an error number will be returned, without setting
-.Va errno .
-.Pp
-If successful, the
-.Fn fdiscard
-function will return zero.
-Otherwise the value \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The file handle
-.Fa fd
-is invalid or not open for writing.
-.It Bq Er EDQUOT
-Allocating the requested blocks would exceed the user's quota.
-.It Bq Er EINVAL
-The position and/or length values are negative.
-.It Bq Er EIO
-A hardware-level I/O error occurred.
-.It Bq Er EISDIR
-The selected file is a directory.
-.It Bq Er ENOSPC
-There was no space in the file system to complete the operation.
-.El
-.Sh SEE ALSO
-.Xr ftruncate 2
-.Sh HISTORY
-The
-.Fn posix_fallocate
-and
-.Fn fdiscard
-function calls appeared in
-.Nx 7.0 .
-Similar functions appeared previously in Linux.
-The
-.Fn posix_fallocate
-function is expected to conform to
-.St -p1003.1-2004 .
diff --git a/lib/libc/sys/fdiscard.c b/lib/libc/sys/fdiscard.c
deleted file mode 100644
index ff1892b9c..000000000
--- a/lib/libc/sys/fdiscard.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: fdiscard.c,v 1.1 2014/09/25 15:08:29 manu Exp $ */
-
-/*
- * Copyright (c) 2014 The NetBSD Foundation, Inc.      
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Emmanuel Dreyfus.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fdiscard.c,v 1.1 2014/09/25 15:08:29 manu Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-int __fdiscard(int, int, off_t, off_t);
-
-/*
- * 64-bit offset padding required for gcc 1.x
- */
-int
-fdiscard(int fd, off_t off, off_t len)
-{
-	return __fdiscard(fd, 0, off, len);
-}
diff --git a/lib/libc/sys/fhopen.2 b/lib/libc/sys/fhopen.2
deleted file mode 100644
index 1a71377a0..000000000
--- a/lib/libc/sys/fhopen.2
+++ /dev/null
@@ -1,152 +0,0 @@
-.\"	$NetBSD: fhopen.2,v 1.17 2009/08/05 23:15:52 wiz Exp $
-.\"
-.\" Copyright (c) 1999 National Aeronautics & Space Administration
-.\" All rights reserved.
-.\"
-.\" This software was written by William Studenmund 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.
-.\" 3. Neither the name of the National Aeronautics & Space Administration
-.\"    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 NATIONAL AERONAUTICS & SPACE ADMINISTRATION
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ADMINISTRATION OR CONTRIB-
-.\" UTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-.\" OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"/
-.Dd August 5, 2009
-.Dt FHOPEN 2
-.Os
-.Sh NAME
-.Nm fhopen ,
-.Nm fhstat ,
-.Nm fhstatvfs
-.Nd access file via file handle
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/mount.h
-.Ft int
-.Fn fhopen "const void *fhp" "size_t fh_size" "int flags"
-.In sys/stat.h
-.Ft int
-.Fn fhstat "const void *fhp" "size_t fh_size" "struct stat *sb"
-.In sys/statvfs.h
-.Ft int
-.Fn fhstatvfs "const void *fhp" "size_t fh_size" "struct statvfs *buf"
-.Ft int
-.Fn fhstatvfs1 "const void *fhp" "size_t fh_size" "struct statvfs *buf" "int flags"
-.Sh DESCRIPTION
-These functions provide a means to access a file given the opaque file handle
-.Fa fhp
-and the size
-.Fa fh_size
-of the opaque object as returned by
-.Xr getfh 2 .
-As this method bypasses directory access restrictions, these calls are
-restricted to the superuser.
-.Pp
-.Fn fhopen
-opens the file referenced by
-.Fa fhp
-for reading and/or writing as specified by the argument
-.Fa flags
-and returns the file descriptor to the calling process.
-The
-.Fa flags
-are specified by
-.Em or Ns 'ing
-together the flags used for the
-.Xr open 2
-call.
-All said flags are valid except for
-.Dv O_CREAT .
-.Pp
-.Fn fhstat ,
-.Fn fhstatvfs ,
-and
-.Fn fhstatvfs1
-provide the functionality of the
-.Xr fstat 2 ,
-.Xr fstatvfs 2 ,
-and
-.Xr fstatvfs1 2
-calls except that they return information for the file referred to by
-.Fa fhp
-rather than an open file.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn fhopen
-returns the file descriptor for the opened file, while
-.Fn fhstat ,
-.Fn fhstatvfs ,
-and
-.Fn fhstatvfs1
-return 0.
-Otherwise, \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-In addition to the errors returned by
-.Xr open 2 ,
-.Xr fstat 2 ,
-.Xr fstatvfs 2 ,
-and
-.Xr fstatvfs1 2 ,
-respectively,
-.Fn fhopen ,
-.Fn fhstat ,
-.Fn fhstatvfs ,
-and
-.Fn fhstatvfs1
-will return
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Calling
-.Fn fhopen
-with
-.Dv O_CREAT
-set or invalid
-.Fa fh_size .
-.It Bq Er ESTALE
-The file handle
-.Fa fhp
-is no longer valid.
-.El
-.Sh SEE ALSO
-.Xr fstat 2 ,
-.Xr fstatvfs 2 ,
-.Xr fstatvfs1 2 ,
-.Xr getfh 2 ,
-.Xr open 2
-.Sh HISTORY
-The
-.Fn fhopen ,
-and
-.Fn fhstat
-functions first appeared in
-.Nx 1.5 .
-The
-.Fn fhstatvfs
-function replaced
-.Fn fhstatfs
-in
-.Nx 3.0 .
diff --git a/lib/libc/sys/flock.2 b/lib/libc/sys/flock.2
deleted file mode 100644
index 3d47e7dac..000000000
--- a/lib/libc/sys/flock.2
+++ /dev/null
@@ -1,157 +0,0 @@
-.\"	$NetBSD: flock.2,v 1.22 2011/10/15 21:35:50 rmind Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)flock.2	8.2 (Berkeley) 12/11/93
-.\"
-.Dd October 15, 2011
-.Dt FLOCK 2
-.Os
-.Sh NAME
-.Nm flock
-.Nd "apply or remove an advisory lock on an open file"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fcntl.h
-.Fd #define	LOCK_SH	1	/* shared lock */
-.Fd #define	LOCK_EX	2	/* exclusive lock */
-.Fd #define	LOCK_NB	4	/* don't block when locking */
-.Fd #define	LOCK_UN	8	/* unlock */
-.Ft int
-.Fn flock "int fd" "int operation"
-.Sh DESCRIPTION
-.Fn flock
-applies or removes an
-.Em advisory
-lock on the file associated with the file descriptor
-.Fa fd .
-A lock is applied by specifying an
-.Fa operation
-parameter that is one of
-.Dv LOCK_SH
-or
-.Dv LOCK_EX
-with the optional addition of
-.Dv LOCK_NB .
-To unlock
-an existing lock
-.Dv operation
-should be
-.Dv LOCK_UN .
-.Pp
-Advisory locks allow cooperating processes to perform
-consistent operations on files, but do not guarantee
-consistency (i.e., processes may still access files
-without using advisory locks possibly resulting in
-inconsistencies).
-.Pp
-The locking mechanism allows two types of locks:
-.Em shared
-locks and
-.Em exclusive
-locks.
-At any time multiple shared locks may be applied to a file,
-but at no time are multiple exclusive, or both shared and exclusive,
-locks allowed simultaneously on a file.
-.Pp
-A shared lock may be
-.Em upgraded
-to an exclusive lock, and vice versa, simply by specifying
-the appropriate lock type; this results in the previous
-lock being released and the new lock applied (possibly
-after other processes have gained and released the lock).
-.Pp
-Requesting a lock on an object that is already locked
-normally causes the caller to be blocked until the lock may be
-acquired.
-If
-.Dv LOCK_NB
-is included in
-.Fa operation ,
-then this will not happen; instead the call will fail and
-the error
-.Er EAGAIN
-will be returned.
-.Sh NOTES
-Locks are on files, not file descriptors.
-That is, file descriptors duplicated through
-.Xr dup 2
-or
-.Xr fork 2
-do not result in multiple instances of a lock, but rather multiple
-references to a single lock.
-If a process holding a lock on a file
-forks and the child explicitly unlocks the file, the parent will
-lose its lock.
-.Pp
-Processes blocked awaiting a lock may be awakened by signals.
-.Sh RETURN VALUES
-Zero is returned if the operation was successful;
-on an error a \-1 is returned and an error code is left in
-the global location
-.Va errno .
-.Sh ERRORS
-The
-.Fn flock
-call fails if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The file is locked and the
-.Dv LOCK_NB
-option was specified.
-.It Bq Er EBADF
-The argument
-.Fa fd
-is an invalid descriptor.
-.It Bq Er EINVAL
-The argument
-.Fa operation
-does not include exactly one of
-.Dv LOCK_EX ,
-.Dv LOCK_SH ,
-or
-.Dv LOCK_UN .
-.It Bq Er EOPNOTSUPP
-The argument
-.Fa fd
-refers to an object other than a file.
-.El
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr dup 2 ,
-.Xr execve 2 ,
-.Xr fork 2 ,
-.Xr open 2 ,
-.Xr flockfile 3 ,
-.Xr lockf 3
-.Sh HISTORY
-The
-.Fn flock
-function call appeared in
-.Bx 4.2 .
diff --git a/lib/libc/sys/fork.2 b/lib/libc/sys/fork.2
deleted file mode 100644
index 64eb1ad87..000000000
--- a/lib/libc/sys/fork.2
+++ /dev/null
@@ -1,138 +0,0 @@
-.\"	$NetBSD: fork.2,v 1.22 2004/06/25 15:29:25 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"	@(#)fork.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 10, 2004
-.Dt FORK 2
-.Os
-.Sh NAME
-.Nm fork
-.Nd create a new process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft pid_t
-.Fn fork void
-.Sh DESCRIPTION
-.Fn fork
-causes creation of a new process.
-The new process (child process) is an exact copy of the
-calling process (parent process) except for the following:
-.Bl -bullet -offset indent
-.It
-The child process has a unique process ID.
-.It
-The child process has a different parent
-process ID (i.e., the process ID of the parent process).
-.It
-The child process has its own copy of the parent's descriptors.
-These descriptors reference the same underlying objects, so that,
-for instance, file pointers in file objects are shared between
-the child and the parent, so that an
-.Xr lseek 2
-on a descriptor in the child process can affect a subsequent
-.Xr read 2
-or
-.Xr write 2
-by the parent.
-This descriptor copying is also used by the shell to
-establish standard input and output for newly created processes
-as well as to set up pipes.
-.It
-The child process' resource utilizations
-are set to 0; see
-.Xr setrlimit 2 .
-.El
-.Pp
-In general, the child process should call
-.Xr _exit 2
-rather than
-.Xr exit 3 .
-Otherwise, any stdio buffers that exist both in the parent and child
-will be flushed twice.
-Similarly,
-.Xr _exit 2
-should be used to prevent
-.Xr atexit 3
-routines from being called twice (once in the parent and once in the child).
-.Pp
-In case of a threaded program, only the thread calling
-.Fn fork
-is still running in the child processes.
-.Pp
-Child processes of a threaded program have additional restrictions,
-a child must only call functions that are async-signal-safe.
-Very few functions are asynchronously safe and applications should
-make sure they call
-.Xr exec 3
-as soon as possible.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn fork
-returns a value
-of 0 to the child process and returns the process ID of the child
-process to the parent process.
-Otherwise, a value of \-1 is returned to the parent process, no
-child process is created, and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn fork
-will fail and no child process will be created if:
-.Bl -tag -width [EAGAIN]
-.It Bq Er EAGAIN
-The system-imposed limit on the total
-number of processes under execution would be exceeded.
-This limit is configuration-dependent.
-.It Bq Er EAGAIN
-The limit
-.Dv RLIMIT_NPROC
-on the total number of
-processes under execution by this user id would be exceeded.
-.It Bq Er ENOMEM
-There is insufficient swap space for the new process.
-.El
-.Sh SEE ALSO
-.Xr execve 2 ,
-.Xr setrlimit 2 ,
-.Xr vfork 2 ,
-.Xr wait 2 ,
-.Xr pthread_atfork 3
-.Sh STANDARDS
-The
-.Fn fork
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-A
-.Fn fork
-system call appeared in
-.At v6 .
diff --git a/lib/libc/sys/fsync.2 b/lib/libc/sys/fsync.2
deleted file mode 100644
index 22c5fe25a..000000000
--- a/lib/libc/sys/fsync.2
+++ /dev/null
@@ -1,191 +0,0 @@
-.\"	$NetBSD: fsync.2,v 1.18 2013/09/22 10:02:05 apb Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\"
-.\"     @(#)fsync.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd September 22, 2013
-.Dt FSYNC 2
-.Os
-.Sh NAME
-.Nm fsync ,
-.Nm fsync_range
-.Nd "synchronize a file's in-core state with that on disk"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn fsync "int fd"
-.Ft int
-.Fn fsync_range "int fd" "int how" "off_t start" "off_t length"
-.Sh DESCRIPTION
-.Fn fsync
-causes all modified data and attributes of
-.Fa fd
-to be written to a permanent storage device.
-This normally results in all in-core modified copies
-of buffers for the associated file to be written to a disk.
-.Pp
-.Fn fsync_range
-is similar, but provides control over the region of the file
-to be synchronized, and the method of synchronization.
-.Pp
-These functions should be used by programs that require a file to be
-in a known state, for example, in building a simple transaction
-facility.
-.Pp
-Note that writing the data to a permanent storage device
-does not necessarily write the data to permanent storage media
-within that device;
-for example, after writing data to a disk device, the data might
-reside in a cache within the device, but not yet on
-more permanent storage within the device.
-Neither
-.Fn fsync
-nor the default behavior of
-.Fn fsync_range
-(without the
-.Dv FDISKSYNC
-flag)
-will flush disk caches,
-because they assume that storage devices are able to ensure that
-completed writes are transferred to media some time between the
-write and a power failure or system crash.
-.Pp
-.Fn fsync_range
-causes all modified data starting at
-.Fa start
-for length
-.Fa length
-of
-.Fa fd
-to be written to a permanent storage device.
-If the
-.Fa length
-parameter is zero,
-.Fn fsync_range
-will synchronize all of the file data.
-.Pp
-.Fn fsync_range
-takes a
-.Fa how
-parameter which contains one or more of the following flags:
-.Bl -tag -width FDATASYNC -offset indent
-.It Dv FDATASYNC
-Synchronize the file data and sufficient meta-data to retrieve the
-data for the specified range.
-This is equivalent to
-.Xr fdatasync 2
-on the specified range.
-.It Dv FFILESYNC
-Synchronize all modified file data and meta-data for the specified range.
-This is equivalent to
-.Xr fsync 2
-on the specified range.
-.It Dv FDISKSYNC
-Request the destination device to ensure that the relevant data
-and meta-data is flushed from any cache to permanent storage media.
-In the present implementation, the entire cache on the affected device will
-be flushed, and this may have a significant impact on performance.
-.El
-.Pp
-The
-.Dv FDATASYNC
-and
-.Dv FFILESYNC
-flags are mutually exclusive.
-Either of those flags may be combined with the
-.Dv FDISKSYNC
-flag.
-.Pp
-Note that
-.Fn fsync_range
-requires that the file
-.Fa fd
-must be open for writing, whereas
-.Fn fsync
-does not.
-.Sh RETURN VALUES
-A 0 value is returned on success.
-A \-1 value indicates an error.
-.Sh ERRORS
-.Fn fsync
-or
-.Fn fsync_range
-fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa fd
-is not a valid descriptor.
-.It Bq Er EINVAL
-.Fa fd
-refers to a socket, not to a file.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.El
-.Pp
-Additionally,
-.Fn fsync_range
-fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa fd
-is not open for writing.
-.It Bq Er EINVAL
-.Fa start
-+
-.Fa length
-is less than
-.Fa start .
-.El
-.Sh NOTES
-For optimal efficiency, the
-.Fn fsync_range
-call requires that the file system containing the file referenced by
-.Fa fd
-support partial synchronization of file data.
-For file systems which do
-not support partial synchronization, the entire file will be synchronized
-and the call will be the equivalent of calling
-.Fn fsync .
-.Sh SEE ALSO
-.Xr fdatasync 2 ,
-.Xr sync 2 ,
-.Xr sync 8
-.Sh HISTORY
-The
-.Fn fsync
-function call appeared in
-.Bx 4.2 .
-.Pp
-The
-.Fn fsync_range
-function call first appeared in
-.Nx 2.0
-and is modeled after the function available in AIX.
diff --git a/lib/libc/sys/ftruncate.c b/lib/libc/sys/ftruncate.c
deleted file mode 100644
index 5b23d8331..000000000
--- a/lib/libc/sys/ftruncate.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: ftruncate.c,v 1.14 2012/03/20 16:26:12 matt Exp $	*/
-
-/*
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)ftruncate.c	8.1 (Berkeley) 6/17/93";
-#else
-__RCSID("$NetBSD: ftruncate.c,v 1.14 2012/03/20 16:26:12 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(ftruncate,_ftruncate)
-#endif
-
-int __ftruncate(int, int, off_t);
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-int
-ftruncate(int fd, off_t length)
-{
-
-	return __ftruncate(fd, 0, length);
-}
diff --git a/lib/libc/sys/getcontext.2 b/lib/libc/sys/getcontext.2
deleted file mode 100644
index ac3f638d4..000000000
--- a/lib/libc/sys/getcontext.2
+++ /dev/null
@@ -1,152 +0,0 @@
-.\"	$NetBSD: getcontext.2,v 1.7 2010/04/29 06:07:35 jruoho Exp $
-.\"
-.\" Copyright (c) 1999 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.
-.\"
-.Dd April 28, 2010
-.Dt GETCONTEXT 2
-.Os
-.Sh NAME
-.Nm getcontext ,
-.Nm setcontext
-.Nd get and set current user context
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ucontext.h
-.Ft int
-.Fn getcontext "ucontext_t *ucp"
-.Ft int
-.Fn setcontext "const ucontext_t *ucp"
-.Sh DESCRIPTION
-The
-.Fn getcontext
-function initializes the object pointed to by
-.Fa ucp
-to the current user context of the calling thread.
-The user context defines a thread's execution environment and includes
-the contents of its machine registers,
-its signal mask,
-and its current execution stack.
-.Pp
-The
-.Fn setcontext
-function restores the user context defined in the object pointed to by
-.Fa ucp
-as most recently initialized by a previous call to either
-.Fn getcontext
-or
-.Xr makecontext 3 .
-.\" TODO: signal handler
-If successful, execution of the program resumes as defined in the
-.Fa ucp
-argument, and
-.Fn setcontext
-will not return.
-If
-.Fa ucp
-was initialized by the
-.Fn getcontext
-function, program execution continues as if the corresponding invocation of
-.Fn getcontext
-had just returned (successfully).
-If
-.Fa ucp
-was initialized by the
-.Xr makecontext 3
-function, program execution continues with the function (and function
-arguments) passed to
-.Xr makecontext 3 .
-.Sh RETURN VALUES
-On successful completion,
-.Fn getcontext
-returns 0 and
-.Fn setcontext
-does not return.
-Otherwise a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn getcontext
-and
-.Fn setcontext
-functions will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa ucp
-argument points to an invalid address.
-.El
-.Pp
-The
-.Fn setcontext
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The contents of the datum pointed to by
-.Fa ucp
-are invalid.
-.El
-.Sh SEE ALSO
-.Xr sigprocmask 2 ,
-.Xr longjmp 3 ,
-.Xr makecontext 3 ,
-.Xr setjmp 3 ,
-.Xr swapcontext 3
-.Sh STANDARDS
-The
-.Fn getcontext
-and
-.Fn setcontext
-functions conform to
-.St -xsh5
-and
-.St -p1003.1-2001 .
-The
-.Va errno
-indications are an extension to the standard.
-.Pp
-The
-.St -p1003.1-2004
-revision marked the functions
-.Fn getcontext
-and
-.Fn setcontext
-as obsolete, citing portability issues and recommending the use of
-.Tn POSIX
-threads instead.
-The
-.St -p1003.1-2008
-revision removed the functions from the specification.
-.Sh HISTORY
-The
-.Fn getcontext
-and
-.Fn setcontext
-functions first appeared in
-.At V.4 .
diff --git a/lib/libc/sys/getdents.2 b/lib/libc/sys/getdents.2
deleted file mode 100644
index 4bd01ceb6..000000000
--- a/lib/libc/sys/getdents.2
+++ /dev/null
@@ -1,132 +0,0 @@
-.\"	$NetBSD: getdents.2,v 1.23 2011/07/20 17:51:25 njoly Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"	@(#)getdirentries.2	8.1 (Berkeley) 6/9/93
-.\"
-.Dd June 4, 2010
-.Dt GETDENTS 2
-.Os
-.Sh NAME
-.Nm getdents
-.Nd "get directory entries in a filesystem independent format"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In dirent.h
-.Ft int
-.Fn getdents "int fd" "char *buf" "size_t nbytes"
-.Sh DESCRIPTION
-.Fn getdents
-reads directory entries from the directory
-referenced by the file descriptor
-.Fa fd
-into the buffer pointed to by
-.Fa buf ,
-in a filesystem independent format.
-Up to
-.Fa nbytes
-of data will be transferred.
-.Fa nbytes
-must be greater than or equal to the
-block size associated with the file,
-see
-.Xr stat 2 .
-Some filesystems may not support
-.Fn getdents
-with buffers smaller than this size.
-.Pp
-The data in the buffer is a series of
-.Em dirent
-structures:
-.Bd -literal -offset indent
-struct dirent {
-	ino_t	 d_fileno;		/* file number of entry */
-	uint16_t d_reclen;		/* length of this record */
-	uint16_t d_namlen;		/* length of d_name */
-	uint8_t  d_type;		/* file type, see below */
-	char	 d_name[MAXNAMELEN + 1];
-};
-.Ed
-.Pp
-The structure is described in
-.Xr dirent 3 .
-.Pp
-Entries may be separated by extra space.
-The
-.Fa d_reclen
-entry may be used as an offset from the start of a
-.Fa dirent
-structure to the next structure, if any.
-.Pp
-The actual number of bytes transferred is returned.
-The current position pointer associated with
-.Fa fd
-is set to point to the next block of entries.
-The pointer may not advance by the number of bytes returned by
-.Fn getdents .
-A value of zero is returned when
-the end of the directory has been reached.
-.Pp
-The current position pointer may be set and retrieved by
-.Xr lseek 2 .
-The current position pointer should only be set to a value returned by
-.Xr lseek 2 ,
-or zero.
-.Sh RETURN VALUES
-If successful, the number of bytes actually transferred is returned.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn getdents
-will fail if:
-.Bl -tag -width "[EINVAL]"
-.It Bq Er EBADF
-.Fa fd
-is not a valid file descriptor open for reading.
-.It Bq Er EFAULT
-.Fa buf
-points outside the allocated address space.
-.It Bq Er EINVAL
-A directory was being read on NFS, but it was modified on the server while
-it was being read.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr lseek 2 ,
-.Xr open 2 ,
-.Xr dirent 3
-.Sh HISTORY
-The
-.Fn getdents
-function first appeared in
-.Nx 1.3 .
diff --git a/lib/libc/sys/getfh.2 b/lib/libc/sys/getfh.2
deleted file mode 100644
index 4076739bb..000000000
--- a/lib/libc/sys/getfh.2
+++ /dev/null
@@ -1,122 +0,0 @@
-.\"	$NetBSD: getfh.2,v 1.21 2006/10/30 18:53:42 mjf Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"	@(#)getfh.2	8.1 (Berkeley) 6/9/93
-.\"
-.Dd October 30, 2006
-.Dt GETFH 2
-.Os
-.Sh NAME
-.Nm getfh
-.Nd get file handle
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/mount.h
-.Ft int
-.Fn getfh "const char *path" "void *fhp" "size_t *fh_size"
-.Sh DESCRIPTION
-.Fn getfh
-returns a file handle for the specified file or directory
-in the file handle pointed to by
-.Fa fhp .
-The variable pointed to by
-.Fa fh_size
-has to be initialized to the memory allocated for the variable sized file
-handle.
-On return the value will be replaced by the actual size
-needed (which will vary depending on the file system the path is on).
-This system call is restricted to the superuser.
-To query the necessary size for the filehandle, a
-.Dv NULL
-pointer may
-be passed as
-.Fa fhp ,
-and the value pointed to by
-.Fa fh_size
-should be initialized to zero.
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn getfh
-fails if one or more of the following are true:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix of
-.Fa path
-is not a directory.
-.It Bq Er ENAMETOOLONG
-The length of a component of
-.Fa path
-exceeds
-.Brq Dv NAME_MAX
-characters, or the length of
-.Fa path
-exceeds
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The file referred to by
-.Fa path
-does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix of
-.Fa path .
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating
-.Fa path .
-.It Bq Er EFAULT
-.Fa fhp
-points to an invalid address.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.It Bq Er E2BIG
-The memory allocated for the file handle is too small.
-The size needed has been written to the variable pointed to by
-.Fa fh_size .
-.It Bq Er ENOMEM
-The kernel failed to allocate temporary memory to create a filehandle of the
-requested size.
-.El
-.Sh SEE ALSO
-.Xr fhstat 2 ,
-.Xr fhstatvfs 2 ,
-.Xr fhstatvfs1 2
-.Sh HISTORY
-The
-.Fn getfh
-function
-first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/sys/getgid.2 b/lib/libc/sys/getgid.2
deleted file mode 100644
index fe0b92659..000000000
--- a/lib/libc/sys/getgid.2
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"	$NetBSD: getgid.2,v 1.19 2010/04/03 15:13:43 jruoho Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)getgid.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 3, 2010
-.Dt GETGID 2
-.Os
-.Sh NAME
-.Nm getgid ,
-.Nm getegid
-.Nd get group process identification
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft gid_t
-.Fn getgid void
-.Ft gid_t
-.Fn getegid void
-.Sh DESCRIPTION
-The
-.Fn getgid
-function returns the real group ID of the calling process,
-.Fn getegid
-returns the effective group ID of the calling process.
-.Pp
-The real group ID is specified at login time.
-.Pp
-The real group ID is the group of the user who invoked the program.
-As the effective group ID gives the process additional permissions
-during the execution of
-.Dq Em set-group-ID
-mode processes,
-.Fn getgid
-is used to determine the real-group-id of the calling process.
-.Sh ERRORS
-The
-.Fn getgid
-and
-.Fn getegid
-functions are always successful, and no return value is reserved to
-indicate an error.
-.Sh SEE ALSO
-.Xr getuid 2 ,
-.Xr setgid 2 ,
-.Xr setgroups 2 ,
-.Xr setregid 2
-.Sh STANDARDS
-.Fn getgid
-and
-.Fn getegid
-conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn getgid
-function appeared in
-.At v4 .
diff --git a/lib/libc/sys/getgroups.2 b/lib/libc/sys/getgroups.2
deleted file mode 100644
index 6fb3d3ec0..000000000
--- a/lib/libc/sys/getgroups.2
+++ /dev/null
@@ -1,103 +0,0 @@
-.\"	$NetBSD: getgroups.2,v 1.23 2013/07/14 14:29:09 njoly Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)getgroups.2	8.2 (Berkeley) 4/16/94
-.\"
-.Dd October 7, 2006
-.Dt GETGROUPS 2
-.Os
-.Sh NAME
-.Nm getgroups
-.Nd get group access list
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn getgroups "int gidsetlen" "gid_t *gidset"
-.Sh DESCRIPTION
-.Fn getgroups
-gets the current group access list of the current user process
-and stores it in the array
-.Fa gidset .
-The parameter
-.Fa gidsetlen
-indicates the number of entries that may be placed in
-.Fa gidset .
-.Fn getgroups
-returns the actual number of groups returned in
-.Fa gidset .
-No more than
-.Brq Dv NGROUPS_MAX
-will ever
-be returned.
-If
-.Fa gidsetlen
-is 0,
-.Fn getgroups
-returns the number of groups without modifying the
-.Fa gidset
-array.
-.Pp
-This system call only returns the secondary groups.
-.Sh RETURN VALUES
-A successful call returns the number of groups in the group set.
-A value of \-1 indicates that an error occurred, and the error
-code is stored in the global variable
-.Va errno .
-.Sh ERRORS
-The possible errors for
-.Fn getgroups
-are:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The argument
-.Fa gidsetlen
-is non-zero and is smaller than the number of groups in the group set.
-.It Bq Er EFAULT
-The argument
-.Fa gidset
-specifies
-an invalid address.
-.El
-.Sh SEE ALSO
-.Xr getegid 2 ,
-.Xr getgid 2 ,
-.Xr setgroups 2 ,
-.Xr initgroups 3
-.Sh STANDARDS
-The
-.Fn getgroups
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn getgroups
-function call appeared in
-.Bx 4.2 .
diff --git a/lib/libc/sys/getitimer.2 b/lib/libc/sys/getitimer.2
deleted file mode 100644
index 66c73415c..000000000
--- a/lib/libc/sys/getitimer.2
+++ /dev/null
@@ -1,199 +0,0 @@
-.\"	$NetBSD: getitimer.2,v 1.28 2011/10/27 16:10:37 christos Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)getitimer.2	8.3 (Berkeley) 5/16/95
-.\"
-.Dd October 27, 2011
-.Dt GETITIMER 2
-.Os
-.Sh NAME
-.Nm getitimer ,
-.Nm setitimer
-.Nd get/set value of interval timer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/time.h
-.Ft int
-.Fn getitimer "int which" "struct itimerval *value"
-.Ft int
-.Fn setitimer "int which" "const struct itimerval * restrict value" "struct itimerval * restrict ovalue"
-.Sh DESCRIPTION
-The system provides each process with three interval timers,
-defined in
-.Ao Pa sys/time.h Ac .
-The
-.Fn getitimer
-call returns the current value for the timer specified in
-.Fa which
-in the structure at
-.Fa value .
-The
-.Fn setitimer
-call sets a timer to the specified
-.Fa value ,
-returning the previous value of the timer if
-.Fa ovalue
-is not
-.Dv NULL .
-.Pp
-A timer value is defined by the
-.Fa itimerval
-structure:
-.Bd -literal -offset indent
-struct itimerval {
-	struct	timeval it_interval;	/* timer interval */
-	struct	timeval it_value;	/* current value */
-};
-.Ed
-.Pp
-If
-.Fa it_value
-is non-zero, it indicates the time to the next timer expiration.
-If
-.Fa it_interval
-is non-zero, it specifies a value to be used in reloading
-.Fa it_value
-when the timer expires.
-Setting
-.Fa it_value
-to 0 disables a timer.
-Setting
-.Fa it_interval
-to 0 causes a timer to be disabled after its next expiration (assuming
-.Fa it_value
-is non-zero).
-.Pp
-The
-.Fa which
-parameter specifies the type of the timer:
-.Bl -tag -width "ITIMER_MONOTONIC " -offset indent
-.It Dv ITIMER_REAL
-timer decrements in real time.
-This timer is affected by
-.Xr adjtime 2
-and
-.Xr settimeofday 2 .
-A
-.Dv SIGALRM
-signal is
-delivered when this timer expires.
-.It Dv ITIMER_VIRTUAL
-timer decrements in process virtual time.
-It runs only when the process is executing.
-A
-.Dv SIGVTALRM
-signal
-is delivered when it expires.
-.It Dv ITIMER_PROF
-timer decrements both in process virtual time and
-when the system is running on behalf of the process.
-It is designed to be used by interpreters in statistically profiling
-the execution of interpreted programs.
-Each time the
-.Dv ITIMER_PROF
-timer expires, the
-.Dv SIGPROF
-signal is
-delivered.
-Because this signal may interrupt in-progress
-system calls, programs using this timer must be prepared to
-restart interrupted system calls.
-.It Dv ITIMER_MONOTONIC
-timer decrements in monotonic time.
-This timer is not affected by
-.Xr adjtime 2
-and
-.Xr settimeofday 2 .
-A
-.Dv SIGALRM
-signal is
-delivered when this timer expires.
-.El
-Note that:
-.Bl -bullet -offset indent
-.It
-Time values smaller than the resolution of the
-system clock are rounded up to this resolution
-(typically 10 milliseconds).
-.It
-The interaction between
-.Fn setitimer
-and
-.Xr alarm 3
-or
-.Xr sleep 3
-is unspecified by the specification.
-.El
-.Sh RETURN VALUES
-If the calls succeed, a value of 0 is returned.
-If an error occurs, the value \-1 is returned, and a more precise error
-code is placed in the global variable
-.Va errno .
-.Sh ERRORS
-Both functions may fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa value
-parameter specified a bad address.
-.It Bq Er EINVAL
-The
-.Fa which
-parameter was not a known timer type, or the
-.Fa value
-parameter specified a time that was too large
-to be handled.
-.El
-.Sh SEE ALSO
-.Xr gettimeofday 2 ,
-.Xr select 2 ,
-.Xr sigaction 2 ,
-.Xr itimerval 3 ,
-.Xr timeradd 3
-.Sh STANDARDS
-The functions conform to
-.St -p1003.1-2001 .
-The later
-.St -p1003.1-2008
-revision however marked both as obsolescent,
-recommending the use of
-.Xr timer_gettime 2
-and
-.Xr timer_settime 2
-instead.
-.Sh HISTORY
-The
-.Fn getitimer
-function call appeared in
-.Bx 4.2 .
-The
-.Dv ITIMER_MONOTONIC
-functionality appeared in
-.Nx 6.0 .
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
deleted file mode 100644
index 316c294f4..000000000
--- a/lib/libc/sys/getlogin.2
+++ /dev/null
@@ -1,208 +0,0 @@
-.\"	$NetBSD: getlogin.2,v 1.22 2009/01/11 02:46:30 christos Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"	@(#)getlogin.2	8.1 (Berkeley) 6/9/93
-.\"
-.Dd January 6, 2009
-.Dt GETLOGIN 2
-.Os
-.Sh NAME
-.Nm getlogin ,
-.Nm getlogin_r ,
-.Nm setlogin
-.Nd get/set login name
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft char *
-.Fn getlogin void
-.Ft int
-.Fn getlogin_r "char *name" "size_t len"
-.Ft int
-.Fn setlogin "const char *name"
-.Sh DESCRIPTION
-The
-.Fn getlogin
-routine
-returns the login name of the user associated with the current session,
-as previously set by
-.Fn setlogin .
-The name is normally associated with a login shell
-at the time a session is created,
-and is inherited by all processes descended from the login shell.
-(This is true even if some of those processes assume another user ID,
-for example when
-.Xr su 1
-is used.)
-.Pp
-The
-.Fn getlogin_r
-function
-provides the same service as
-.Fn getlogin ,
-however the caller must provide the buffer
-.Fa name
-with length
-.Fa len
-bytes
-to hold the result.
-The buffer should be at least
-.Dv MAXLOGNAME
-bytes in length.
-.Pp
-.Fn setlogin
-sets the login name of the user associated with the current session to
-.Fa name .
-This call is restricted to the super-user, and
-is normally used only when a new session is being created on behalf
-of the named user
-(for example, at login time, or when a remote shell is invoked).
-.Pp
-.Em NOTE :
-There is only one login name per session.
-.Pp
-It is
-.Em CRITICALLY
-important to ensure that
-.Fn setlogin
-is only ever called after the process has taken adequate steps to ensure
-that it is detached from its parent's session.
-The
-.Em ONLY
-way to do this is via the
-.Fn setsid
-function.
-The
-.Fn daemon
-function calls
-.Fn setsid
-which is an ideal way of detaching from a controlling terminal and
-forking into the background.
-.Pp
-In particular, neither
-.Fn ioctl ttyfd TIOCNOTTY ...
-nor
-.Fn setpgid ...
-is sufficient to create a new session.
-.Pp
-Once a parent process has called
-.Fn setsid ,
-it is acceptable for some child of that process to then call
-.Fn setlogin ,
-even though it is not the session leader.
-Beware, however, that
-.Em ALL
-processes in the session will change their login name at the same time,
-even the parent.
-.Pp
-This is different from traditional
-.Ux
-privilege inheritance and as such can be counter-intuitive.
-.Pp
-Since the
-.Fn setlogin
-routine is restricted to the super-user, it is assumed that (like
-all other privileged programs) the programmer has taken adequate
-precautions to prevent security violations.
-.Sh RETURN VALUES
-If a call to
-.Fn getlogin
-succeeds, it returns a pointer to a null-terminated string in a static buffer.
-If the name has not been set, it returns
-.Dv NULL .
-.Pp
-If a call to
-.Fn setlogin
-succeeds, a value of 0 is returned.
-If
-.Fn setlogin
-fails, a value of \-1 is returned and an error code is
-placed in the global location
-.Va errno .
-.Pp
-The
-.Fn getlogin_r
-function
-returns zero if successful, or the error number upon failure.
-.Sh ERRORS
-The following errors may be returned by these calls:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa name
-parameter gave an
-invalid address.
-.It Bq Er EINVAL
-The
-.Fa name
-parameter
-pointed to a string that was too long.
-Login names are limited to
-.Dv MAXLOGNAME
-(from
-.Ao Pa sys/param.h Ac )
-characters, currently 16.
-.It Bq Er EPERM
-The caller tried to set the login name and was not the super-user.
-.It Bq Er ERANGE
-The size of the buffer is smaller than the result to be returned.
-.El
-.Sh SEE ALSO
-.Xr setsid 2
-.Sh STANDARDS
-The
-.Fn getlogin
-and
-.Fn getlogin_r
-functions conform to
-.St -p1003.1-96 .
-.Sh HISTORY
-The
-.Fn getlogin
-function first appeared in
-.Bx 4.4 .
-.Sh BUGS
-Login names are limited in length by
-.Fn setlogin .
-However, lower limits are placed on login names elsewhere in the system
-.Pf ( Dv UT_NAMESIZE
-in
-.Ao Pa utmp.h Ac ) .
-.Pp
-In earlier versions of the system,
-.Fn getlogin
-failed unless the process was associated with a login terminal.
-The current implementation (using
-.Fn setlogin )
-allows getlogin to succeed even when the process has no controlling terminal.
-In earlier versions of the system, the value returned by
-.Fn getlogin
-could not be trusted without checking the user ID.
-Portable programs should probably still make this check.
diff --git a/lib/libc/sys/getpeername.2 b/lib/libc/sys/getpeername.2
deleted file mode 100644
index 2dbbd16b1..000000000
--- a/lib/libc/sys/getpeername.2
+++ /dev/null
@@ -1,137 +0,0 @@
-.\"	$NetBSD: getpeername.2,v 1.21 2011/06/03 08:07:48 wiz Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)getpeername.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 3, 2011
-.Dt GETPEERNAME 2
-.Os
-.Sh NAME
-.Nm getpeername
-.Nd get name of connected peer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft int
-.Fn getpeername \
-"int s" "struct sockaddr * restrict name" "socklen_t * restrict namelen"
-.Sh DESCRIPTION
-The
-.Fn getpeername
-function returns the name of the peer connected to the socket
-.Fa s .
-One common use occurs when a process inherits an open socket, such as
-TCP servers forked from
-.Xr inetd 8 .
-In this scenario,
-.Fn getpeername
-is used to determine the connecting client's IP address.
-.Pp
-The function takes three parameters:
-.Bl -tag -width namelen -offset indent
-.It Fa s
-contains the file descriptor of the socket whose peer should be looked up.
-.It Fa name
-points to a
-.Li sockaddr
-structure that will hold the address information for the connected peer.
-Normal use requires one to use a structure
-specific to the protocol family in use, such as
-.Li sockaddr_in
-(IPv4) or
-.Li sockaddr_in6
-(IPv6), cast to a (struct sockaddr *).
-.Pp
-For greater portability, especially with the newer protocol families, the new
-.Li struct sockaddr_storage
-should be used.
-.Li sockaddr_storage
-is large enough to hold any of the other sockaddr_* variants.
-On return, it can be cast to the correct sockaddr type,
-based on the protocol family contained in its ss_family field.
-.It Fa namelen
-indicates the amount of space pointed to by
-.Fa name ,
-in bytes.
-.El
-.Pp
-If address information for the local end of the socket is required, the
-.Xr getsockname 2
-function should be used instead.
-.Pp
-If
-.Fa name
-does not point to enough space to hold the entire socket address, the
-result will be truncated to
-.Fa namelen
-bytes.
-.Sh RETURN VALUES
-If the call succeeds, a 0 is returned and
-.Fa namelen
-is set to the actual size of the socket address returned in
-.Fa name .
-Otherwise,
-.Va errno
-is set and a value of \-1 is returned.
-.Sh ERRORS
-The call succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er EFAULT
-The
-.Fa name
-parameter points to memory not in a valid part of the
-process address space.
-.It Bq Er ENOBUFS
-Insufficient resources were available in the system
-to perform the operation.
-.It Bq Er ENOTCONN
-The socket is not connected.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is a file, not a socket.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr bind 2 ,
-.Xr getsockname 2 ,
-.Xr socket 2
-.Sh STANDARDS
-The function conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn getpeername
-function call appeared in
-.Bx 4.2 .
diff --git a/lib/libc/sys/getpgrp.2 b/lib/libc/sys/getpgrp.2
deleted file mode 100644
index 78588c297..000000000
--- a/lib/libc/sys/getpgrp.2
+++ /dev/null
@@ -1,129 +0,0 @@
-.\"	$NetBSD: getpgrp.2,v 1.24 2014/09/19 16:02:58 wiz Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)getpgrp.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd August 11, 2002
-.Dt GETPGRP 2
-.Os
-.Sh NAME
-.Nm getpgrp ,
-.Nm getpgid
-.Nd get process group
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft pid_t
-.Fn getpgrp "void"
-.Ft pid_t
-.Fn getpgid "pid_t pid"
-.Sh DESCRIPTION
-The process group of the current process is returned by
-.Fn getpgrp .
-The process group of the
-.Fa pid
-process is returned by
-.Fn getpgid .
-.Pp
-Process groups are used for distribution of signals, and
-by terminals to arbitrate requests for their input: processes
-that have the same process group as the terminal are foreground
-and may read, while others will block with a signal if they attempt
-to read.
-.Pp
-This call is thus used by programs such as
-.Xr csh 1
-to create
-process groups
-in implementing job control.
-The
-.Fn tcgetpgrp
-and
-.Fn tcsetpgrp
-calls
-are used to get/set the process group of the control terminal.
-.Sh COMPATIBILITY
-This version of
-.Fn getpgrp
-differs from past Berkeley versions by not taking a
-.Fa "pid_t pid"
-argument.
-This incompatibility is required by
-.St -p1003.1-90 .
-.Pp
-From the
-.St -p1003.1-90
-Rationale:
-.Lp
-.Bx 4.3
-provides a
-.Fn getpgrp
-function that returns the process group ID for a specified process.
-Although this function is used to support job control, all known
-job-control shells always specify the calling process with this
-function.
-Thus, the simpler System V
-.Fn getpgrp
-suffices, and the added complexity of the
-.Bx 4.3
-.Fn getpgrp
-has been omitted from POSIX.1.
-The old functionality is available from the
-.Fn getpgid
-function.
-.Sh ERRORS
-.Fn getpgrp
-always succeeds, however
-.Fn getpgid
-will succeed unless:
-.Bl -tag -width Er
-.It Bq Er ESRCH
-if there is no process with a process ID equal to
-.Fa pid .
-.El
-.Sh SEE ALSO
-.Xr setpgid 2 ,
-.Xr termios 4
-.Sh STANDARDS
-The
-.Fn getpgrp
-function conforms to
-.St -p1003.1-88 .
-.Sh HISTORY
-The
-.Fn getpgrp
-function call appeared in
-.Bx 4.0 .
-The
-.Fn getpgid
-function call is derived from its usage in
-.At V.4 ,
-and first appeared in
-.Nx 1.3 .
diff --git a/lib/libc/sys/getpid.2 b/lib/libc/sys/getpid.2
deleted file mode 100644
index 9373a85d4..000000000
--- a/lib/libc/sys/getpid.2
+++ /dev/null
@@ -1,77 +0,0 @@
-.\"	$NetBSD: getpid.2,v 1.17 2010/04/03 15:13:43 jruoho Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)getpid.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 3, 2010
-.Dt GETPID 2
-.Os
-.Sh NAME
-.Nm getpid ,
-.Nm getppid
-.Nd get parent or calling process identification
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft pid_t
-.Fn getpid void
-.Ft pid_t
-.Fn getppid void
-.Sh DESCRIPTION
-.Fn getpid
-returns
-the process ID of
-the calling process.
-The ID is guaranteed to be unique and is
-useful for constructing temporary file names.
-.Pp
-.Fn getppid
-returns the process ID of the parent
-of the calling process.
-.Sh ERRORS
-The
-.Fn getpid
-and
-.Fn getppid
-functions are always successful, and no return value is reserved to
-indicate an error.
-.Sh SEE ALSO
-.Xr gethostid 3
-.Sh STANDARDS
-.Fn getpid
-and
-.Fn getppid
-conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn getpid
-function appeared in
-.At v5 .
diff --git a/lib/libc/sys/getpriority.2 b/lib/libc/sys/getpriority.2
deleted file mode 100644
index ff8326f3a..000000000
--- a/lib/libc/sys/getpriority.2
+++ /dev/null
@@ -1,153 +0,0 @@
-.\"	$NetBSD: getpriority.2,v 1.20 2012/04/13 16:32:15 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)getpriority.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 13, 2012
-.Dt GETPRIORITY 2
-.Os
-.Sh NAME
-.Nm getpriority ,
-.Nm setpriority
-.Nd get/set program scheduling priority
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/resource.h
-.Ft int
-.Fn getpriority "int which" "id_t who"
-.Ft int
-.Fn setpriority "int which" "id_t who" "int prio"
-.Sh DESCRIPTION
-The scheduling
-priority of the process, process group, or user, as indicated by
-.Fa which
-and
-.Fa who
-is obtained with the
-.Fn getpriority
-call and set with the
-.Fn setpriority
-call.
-.Pp
-The priority is maintained in a per-process basis and
-affects scheduling of LWPs which belong to the process and use the
-.Dv SCHED_OTHER
-scheduling class.
-.Pp
-.Fa which
-is one of
-.Dv PRIO_PROCESS ,
-.Dv PRIO_PGRP ,
-or
-.Dv PRIO_USER ,
-and
-.Fa who
-is interpreted relative to
-.Fa which
-(a process identifier for
-.Dv PRIO_PROCESS ,
-process group
-identifier for
-.Dv PRIO_PGRP ,
-and a user ID for
-.Dv PRIO_USER ) .
-A zero value of
-.Fa who
-denotes the current process, process group, or user.
-.Fa prio
-is a value in the range -20 to 20.
-The default priority is 0;
-numerically lower priority values cause more favorable scheduling.
-A value of 19 or 20
-will schedule a process only when nothing at priority \*(Le 0 is runnable.
-.Pp
-The
-.Fn getpriority
-call returns the highest priority (lowest numerical value)
-enjoyed by any of the specified processes.
-The
-.Fn setpriority
-call sets the priorities of all of the specified processes
-to the specified value.
-Only the super-user may lower priority values.
-.Sh RETURN VALUES
-Since
-.Fn getpriority
-can legitimately return the value \-1, it is necessary
-to clear the external variable
-.Va errno
-prior to the
-call, then check it afterward to determine
-if a \-1 is an error or a legitimate value.
-The
-.Fn setpriority
-call returns 0 if there is no error, or
-\-1 if there is.
-.Sh ERRORS
-.Fn getpriority
-and
-.Fn setpriority
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-.Fa which
-was not one of
-.Dv PRIO_PROCESS ,
-.Dv PRIO_PGRP ,
-or
-.Dv PRIO_USER .
-.It Bq Er ESRCH
-No process was located using the
-.Fa which
-and
-.Fa who
-values specified.
-.El
-.Pp
-In addition to the errors indicated above,
-.Fn setpriority
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-A non super-user attempted to lower a process priority value.
-.It Bq Er EPERM
-A process was located, but neither its effective nor real user
-ID matched the effective user ID of the caller.
-.El
-.Sh SEE ALSO
-.Xr nice 1 ,
-.Xr fork 2 ,
-.Xr sched 3 ,
-.Xr renice 8
-.Sh HISTORY
-The
-.Fn getpriority
-function call appeared in
-.Bx 4.2 .
diff --git a/lib/libc/sys/getrlimit.2 b/lib/libc/sys/getrlimit.2
deleted file mode 100644
index c3cbffdb2..000000000
--- a/lib/libc/sys/getrlimit.2
+++ /dev/null
@@ -1,241 +0,0 @@
-.\"	$NetBSD: getrlimit.2,v 1.36 2012/06/09 02:36:25 christos Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)getrlimit.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 8, 2012
-.Dt GETRLIMIT 2
-.Os
-.Sh NAME
-.Nm getrlimit ,
-.Nm setrlimit
-.Nd control maximum system resource consumption
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/resource.h
-.Ft int
-.Fn getrlimit "int resource" "struct rlimit *rlp"
-.Ft int
-.Fn setrlimit "int resource" "const struct rlimit *rlp"
-.Sh DESCRIPTION
-Limits on the consumption of system resources by the current process
-and each process it creates may be obtained with the
-.Fn getrlimit
-call, and set with the
-.Fn setrlimit
-call.
-Resources of an arbitrary process can be obtained/changed using
-.Xr sysctl 3 .
-.Pp
-The
-.Fa resource
-parameter is one of the following:
-.Bl -tag -width RLIMIT_FSIZEAA
-.It Li RLIMIT_AS
-The maximum amount (in bytes) of virtual memory the process is allowed to map.
-.It Li RLIMIT_CORE
-The largest size (in bytes)
-.Pa core
-file that may be created.
-.It Li RLIMIT_CPU
-The maximum amount of CPU time (in seconds) to be used by
-each process.
-.It Li RLIMIT_DATA
-The maximum size (in bytes) of the data segment for a process;
-this defines how far a program may extend its break with the
-.Xr sbrk 2
-system call.
-.It Li RLIMIT_FSIZE
-The largest size (in bytes) file that may be created.
-.It Li RLIMIT_MEMLOCK
-The maximum size (in bytes) which a process may lock into memory
-using the
-.Xr mlock 2
-function.
-.It Li RLIMIT_NOFILE
-The maximum number of open files for this process.
-.It Li RLIMIT_NPROC
-The maximum number of simultaneous processes for this user id.
-.It Li RLIMIT_NTHR
-The maximum number of simultaneous threads (Lightweight Processes) for this
-user id.
-Kernel threads and the first thread of each process are not counted against
-this limit.
-.It Li RLIMIT_RSS
-The maximum size (in bytes) to which a process's resident set size may
-grow.
-This imposes a limit on the amount of physical memory to be given to
-a process; if memory is tight, the system will prefer to take memory
-from processes that are exceeding their declared resident set size.
-.It Li RLIMIT_SBSIZE
-The maximum size (in bytes) of the socket buffers
-set by the
-.Xr setsockopt 2
-.Dv SO_RCVBUF
-and
-.Dv SO_SNDBUF
-options.
-.It Li RLIMIT_STACK
-The maximum size (in bytes) of the stack segment for a process;
-this defines how far a program's stack segment may be extended.
-Stack extension is performed automatically by the system.
-.El
-.Pp
-A resource limit is specified as a soft limit and a hard limit.
-When a soft limit is exceeded a process may receive a signal (for example,
-if the CPU time or file size is exceeded), but it will be allowed to
-continue execution until it reaches the hard limit (or modifies
-its resource limit).
-The
-.Em rlimit
-structure is used to specify the hard and soft limits on a resource,
-.Bd -literal -offset indent
-struct rlimit {
-	rlim_t	rlim_cur;	/* current (soft) limit */
-	rlim_t	rlim_max;	/* hard limit */
-};
-.Ed
-.Pp
-Only the super-user may raise the maximum limits.
-Other users may only alter
-.Fa rlim_cur
-within the range from 0 to
-.Fa rlim_max
-or (irreversibly) lower
-.Fa rlim_max .
-.Pp
-An
-.Dq infinite
-value for a limit is defined as
-.Dv RLIM_INFINITY .
-.Pp
-Because this information is stored in the per-process information,
-this system call must be executed directly by the shell if it
-is to affect all future processes created by the shell.
-Thus, shells provide built-in commands to change the limits
-.Ic ( limit
-for
-.Xr csh 1 ,
-or
-.Ic ulimit
-for
-.Xr sh 1 ) .
-.Pp
-The system refuses to extend the data or stack space when the limits
-would be exceeded in the normal way: a
-.Xr brk 2
-call fails if the data space limit is reached.
-When the stack limit is reached, the process receives
-a segmentation fault
-.Pq Dv SIGSEGV ;
-if this signal is not
-caught by a handler using the signal stack, this signal
-will kill the process.
-.Pp
-A file I/O operation that would create a file larger that the process'
-soft limit will cause the write to fail and a signal
-.Dv SIGXFSZ
-to be
-generated; this normally terminates the process, but may be caught.
-When the soft CPU time limit is exceeded, a signal
-.Dv SIGXCPU
-is sent to the
-offending process.
-.Sh RETURN VALUES
-A 0 return value indicates that the call succeeded, changing
-or returning the resource limit.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn getrlimit
-and
-.Fn setrlimit
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The address specified for
-.Fa rlp
-is invalid.
-.It Bq Er EINVAL
-Specified
-.Fa resource
-was invalid; or, in the
-.Fn setrlimit
-call, the specified
-.Fa rlim_cur
-exceeds the specified
-.Fa rlim_max .
-.It Bq Er EPERM
-The limit specified to
-.Fn setrlimit
-would have
-raised the maximum limit value, and the caller is not the super-user.
-.El
-.Pp
-The
-.Fn setrlimit
-function may fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The limit specified to
-.Fn setrlimit
-cannot be lowered, because current usage is already higher than the limit.
-.El
-.Sh SEE ALSO
-.Xr csh 1 ,
-.Xr sh 1 ,
-.Xr mlock 2 ,
-.Xr setsockopt 2 ,
-.Xr sigaction 2 ,
-.Xr sigaltstack 2 ,
-.Xr libquota 3 ,
-.Xr sysctl 3
-.\" Sh STANDARDS
-.\" With exception of
-.\" .Li RLIMIT_AS
-.\" (which is not currently supported), the
-.\" .Fn getrlimit
-.\" and
-.\" .Fn setrlimit
-.\" functions conform to
-.\" .St -susv2 .
-.Sh HISTORY
-The
-.Fn getrlimit
-function call appeared in
-.Bx 4.2 .
-.Sh BUGS
-The resource limit
-.Dv RLIMIT_RSS
-is not implemented in
-.Xr uvm 9
-which means that process memory size limits are not enforced.
diff --git a/lib/libc/sys/getrusage.2 b/lib/libc/sys/getrusage.2
deleted file mode 100644
index 26ea98286..000000000
--- a/lib/libc/sys/getrusage.2
+++ /dev/null
@@ -1,164 +0,0 @@
-.\"	$NetBSD: getrusage.2,v 1.18 2004/05/13 10:20:58 wiz Exp $
-.\"
-.\" Copyright (c) 1985, 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. 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.
-.\"
-.\"     @(#)getrusage.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt GETRUSAGE 2
-.Os
-.Sh NAME
-.Nm getrusage
-.Nd get information about resource utilization
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/resource.h
-.Fd #define	RUSAGE_SELF	 0
-.Fd #define	RUSAGE_CHILDREN	\-1
-.Ft int
-.Fn getrusage "int who" "struct rusage *rusage"
-.Sh DESCRIPTION
-.Fn getrusage
-returns information describing the resources used by the current
-process, or all its terminated child processes.
-The
-.Fa who
-parameter is either
-.Dv RUSAGE_SELF
-or
-.Dv RUSAGE_CHILDREN .
-The buffer to which
-.Fa rusage
-points will be filled in with
-the following structure:
-.Bd -literal
-struct rusage {
-        struct timeval ru_utime; /* user time used */
-        struct timeval ru_stime; /* system time used */
-        long ru_maxrss;          /* max resident set size */
-        long ru_ixrss;           /* integral shared text memory size */
-        long ru_idrss;           /* integral unshared data size */
-        long ru_isrss;           /* integral unshared stack size */
-        long ru_minflt;          /* page reclaims */
-        long ru_majflt;          /* page faults */
-        long ru_nswap;           /* swaps */
-        long ru_inblock;         /* block input operations */
-        long ru_oublock;         /* block output operations */
-        long ru_msgsnd;          /* messages sent */
-        long ru_msgrcv;          /* messages received */
-        long ru_nsignals;        /* signals received */
-        long ru_nvcsw;           /* voluntary context switches */
-        long ru_nivcsw;          /* involuntary context switches */
-};
-.Ed
-.Pp
-The fields are interpreted as follows:
-.Bl -tag -width ru_minfltaa
-.It Fa ru_utime
-the total amount of time spent executing in user mode.
-.It Fa ru_stime
-the total amount of time spent in the system executing on behalf
-of the process(es).
-.It Fa ru_maxrss
-the maximum resident set size used (in kilobytes).
-.It Fa ru_ixrss
-an \*(lqintegral\*(rq value indicating the amount of memory used
-by the text segment
-that was also shared among other processes.
-This value is expressed
-in units of kilobytes * ticks-of-execution.
-.It Fa ru_idrss
-an integral value of the amount of unshared memory residing in the
-data segment of a process (expressed in units of
-kilobytes * ticks-of-execution).
-.It Fa ru_isrss
-an integral value of the amount of unshared memory residing in the
-stack segment of a process (expressed in units of
-kilobytes * ticks-of-execution).
-.It Fa ru_minflt
-the number of page faults serviced without any I/O activity; here
-I/O activity is avoided by \*(lqreclaiming\*(rq a page frame from
-the list of pages awaiting reallocation.
-.It Fa ru_majflt
-the number of page faults serviced that required I/O activity.
-.It Fa ru_nswap
-the number of times a process was \*(lqswapped\*(rq out of main
-memory.
-.It Fa ru_inblock
-the number of times the file system had to perform input.
-.It Fa ru_oublock
-the number of times the file system had to perform output.
-.It Fa ru_msgsnd
-the number of IPC messages sent.
-.It Fa ru_msgrcv
-the number of IPC messages received.
-.It Fa ru_nsignals
-the number of signals delivered.
-.It Fa ru_nvcsw
-the number of times a context switch resulted due to a process
-voluntarily giving up the processor before its time slice was
-completed (usually to await availability of a resource).
-.It Fa ru_nivcsw
-the number of times a context switch resulted due to a higher
-priority process becoming runnable or because the current process
-exceeded its time slice.
-.El
-.Sh NOTES
-The numbers
-.Fa ru_inblock
-and
-.Fa ru_oublock
-account only for real
-I/O; data supplied by the caching mechanism is charged only
-to the first process to read or write the data.
-.Sh ERRORS
-.Fn getrusage
-returns \-1 on error.
-The possible errors are:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa who
-parameter is not a valid value.
-.It Bq Er EFAULT
-The address specified by the
-.Fa rusage
-parameter is not in a valid part of the process address space.
-.El
-.Sh SEE ALSO
-.Xr gettimeofday 2 ,
-.Xr wait 2
-.Sh HISTORY
-The
-.Fn getrusage
-function call appeared in
-.Bx 4.2 .
-.Sh BUGS
-There is no way to obtain information about a child process
-that has not yet terminated.
diff --git a/lib/libc/sys/getsid.2 b/lib/libc/sys/getsid.2
deleted file mode 100644
index 62b612fb7..000000000
--- a/lib/libc/sys/getsid.2
+++ /dev/null
@@ -1,73 +0,0 @@
-.\"	$NetBSD: getsid.2,v 1.11 2011/04/04 08:00:53 jruoho Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)getpgrp.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 4, 2011
-.Dt GETSID 2
-.Os
-.Sh NAME
-.Nm getsid
-.Nd get session ID
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft pid_t
-.Fn getsid "pid_t pid"
-.Sh DESCRIPTION
-The
-.Fn getsid
-function returns the session ID of the process specified by
-.Ar pid .
-If
-.Ar pid
-is 0, the session ID of the calling process is returned.
-The session ID is defined as the process group ID of the
-process that is the session leader.
-.Sh ERRORS
-If an error occurs,
-.Fn getsid
-returns \-1 and the global variable
-.Va errno
-is set to indicate the error, as follows:
-.Bl -tag -width Er
-.It Bq Er ESRCH
-No process can be found corresponding to that specified by
-.Ar pid .
-.El
-.Sh SEE ALSO
-.Xr getpgid 2 ,
-.Xr setsid 2 ,
-.Xr termios 4
-.Sh STANDARDS
-The
-.Fn getsid
-function conforms to
-.St -xpg4.2 .
diff --git a/lib/libc/sys/getsockname.2 b/lib/libc/sys/getsockname.2
deleted file mode 100644
index 4443e9526..000000000
--- a/lib/libc/sys/getsockname.2
+++ /dev/null
@@ -1,157 +0,0 @@
-.\"	$NetBSD: getsockname.2,v 1.24 2012/07/09 21:22:21 jdf Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)getsockname.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd July 9, 2012
-.Dt GETSOCKNAME 2
-.Os
-.Sh NAME
-.Nm getsockname
-.Nd get socket name
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft int
-.Fn getsockname "int s" "struct sockaddr * restrict name" "socklen_t * restrict namelen"
-.Sh DESCRIPTION
-.Fn getsockname
-returns the locally bound address information for a specified socket.
-.Pp
-Common uses of this function are as follows:
-.Bl -bullet
-.It
-When
-.Xr bind 2
-is called with a port number of 0 (indicating the kernel should pick
-an ephemeral port)
-.Fn getsockname
-is used to retrieve the kernel-assigned port number.
-.It
-When a process calls
-.Xr bind 2
-on a wildcard IP address,
-.Fn getsockname
-is used to retrieve the local IP address for the connection.
-.It
-When a function wishes to know the address family of a socket,
-.Fn getsockname
-can be used.
-.El
-.Pp
-.Fn getsockname
-takes three parameters:
-.Pp
-.Fa s ,
-Contains the file descriptor for the socket to be looked up.
-.Pp
-.Fa name
-points to a
-.Li sockaddr
-structure which will hold the resulting address information.
-Normal use requires one to use a structure
-specific to the protocol family in use, such as
-.Li sockaddr_in
-(IPv4) or
-.Li sockaddr_in6
-(IPv6), cast to a (struct sockaddr *).
-.Pp
-For greater portability (such as newer protocol families) the new
-structure sockaddr_storage exists.
-.Li sockaddr_storage
-is large enough to hold any of the other sockaddr_* variants.
-On return, it should be cast to the correct sockaddr type,
-according to the current protocol family.
-.Pp
-.Fa namelen
-indicates the amount of space pointed to by
-.Fa name ,
-in bytes.
-Upon return,
-.Fa namelen
-is set to the actual size of the returned address information.
-.Pp
-If the address of the destination socket for a given socket connection is
-needed, the
-.Xr getpeername 2
-function should be used instead.
-.Pp
-If
-.Fa name
-does not point to enough space to hold the entire socket address, the
-result will be truncated to
-.Fa namelen
-bytes.
-.Sh RETURN VALUES
-On success,
-.Fn getsockname
-returns a 0, and
-.Fa namelen
-is set to the actual size of the socket address returned in
-.Fa name .
-Otherwise,
-.Va errno
-is set, and a value of \-1 is returned.
-.Sh ERRORS
-The call succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is a file, not a socket.
-.It Bq Er EINVAL
-The socket has been shut down.
-.It Bq Er ENOBUFS
-Insufficient resources were available in the system to perform the operation.
-.It Bq Er ENOTCONN
-The socket is not connected.
-.It Bq Er EFAULT
-The
-.Fa name
-parameter points to memory not in a valid part of the process address space.
-.El
-.Sh SEE ALSO
-.Xr bind 2 ,
-.Xr socket 2
-.Sh HISTORY
-The
-.Fn getsockname
-function call appeared in
-.Bx 4.2 .
-.Sh BUGS
-Names bound to sockets in the
-.Ux
-domain are inaccessible;
-.Fn getsockname
-returns a zero length name.
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
deleted file mode 100644
index 9dc123c27..000000000
--- a/lib/libc/sys/getsockopt.2
+++ /dev/null
@@ -1,448 +0,0 @@
-.\"	$NetBSD: getsockopt.2,v 1.35 2012/01/25 00:28:35 christos Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)getsockopt.2	8.4 (Berkeley) 5/2/95
-.\"
-.Dd January 23, 2012
-.Dt GETSOCKOPT 2
-.Os
-.Sh NAME
-.Nm getsockopt ,
-.Nm setsockopt
-.Nd get and set options on sockets
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft int
-.Fn getsockopt "int s" "int level" "int optname" "void * restrict optval" "socklen_t * restrict optlen"
-.Ft int
-.Fn setsockopt "int s" "int level" "int optname" "const void *optval" "socklen_t optlen"
-.Sh DESCRIPTION
-.Fn getsockopt
-and
-.Fn setsockopt
-manipulate the
-.Em options
-associated with a socket.
-Options may exist at multiple
-protocol levels; they are always present at the uppermost
-.Dq socket
-level.
-.Pp
-When manipulating socket options the level at which the
-option resides and the name of the option must be specified.
-To manipulate options at the socket level,
-.Fa level
-is specified as
-.Dv SOL_SOCKET .
-To manipulate options at any
-other level the protocol number of the appropriate protocol
-controlling the option is supplied.
-For example, to indicate that an option is to be interpreted by the
-.Tn TCP
-protocol,
-.Fa level
-should be set to the protocol number of
-.Tn TCP ;
-see
-.Xr getprotoent 3 .
-.Pp
-The parameters
-.Fa optval
-and
-.Fa optlen
-are used to access option values for
-.Fn setsockopt .
-For
-.Fn getsockopt
-they identify a buffer in which the value for the
-requested option(s) are to be returned.
-For
-.Fn getsockopt ,
-.Fa optlen
-is a value-result parameter, initially containing the
-size of the buffer pointed to by
-.Fa optval ,
-and modified on return to indicate the actual size of
-the value returned.
-If no option value is to be supplied or returned,
-.Fa optval
-may be
-.Dv NULL .
-.Pp
-.Fa optname
-and any specified options are passed uninterpreted to the appropriate
-protocol module for interpretation.
-The include file
-.Ao Pa sys/socket.h Ac
-contains definitions for
-socket level options, described below.
-Options at other protocol levels vary in format and
-name; consult the appropriate entries in
-section
-4 of the manual, including:
-.Xr clnp 4 ,
-.Xr faith 4 ,
-.Xr icmp6 4 ,
-.Xr ip 4 ,
-.Xr ip6 4 ,
-.Xr ipsec 4 ,
-.Xr multicast 4 ,
-.Xr pim 4 ,
-.Xr route 4 ,
-.Xr tcp 4 ,
-.Xr tp 4 ,
-and
-.Xr unix 4 .
-.Pp
-Most socket-level options use an
-.Fa int
-parameter for
-.Fa optval .
-For
-.Fn setsockopt ,
-the parameter should be non-zero to enable a boolean option,
-or zero if the option is to be disabled.
-.Dv SO_LINGER
-uses a
-.Fa struct linger
-parameter, defined in
-.Ao Pa sys/socket.h Ac ,
-which specifies the desired state of the option and the
-linger interval (see below).
-.Dv SO_SNDTIMEO
-and
-.Dv SO_RCVTIMEO
-use a
-.Fa struct timeval
-parameter, defined in
-.Ao Pa sys/time.h Ac .
-.Pp
-The following options are recognized at the socket level.
-Except as noted, each may be examined with
-.Fn getsockopt
-and set with
-.Fn setsockopt .
-.Bl -column SO_ACCEPTFILTER data -offset indent
-.It Dv SO_DEBUG Ta "enables recording of debugging information"
-.It Dv SO_REUSEADDR Ta "enables local address reuse"
-.It Dv SO_REUSEPORT Ta "enables duplicate address and port bindings"
-.It Dv SO_KEEPALIVE Ta "enables keep connections alive"
-.It Dv SO_DONTROUTE Ta "enables routing bypass for outgoing messages"
-.It Dv SO_LINGER  Ta "linger on close if data present"
-.It Dv SO_BROADCAST Ta "enables permission to transmit broadcast messages"
-.It Dv SO_OOBINLINE Ta "enables reception of out-of-band data in band"
-.It Dv SO_SNDBUF Ta "set buffer size for output"
-.It Dv SO_RCVBUF Ta "set buffer size for input"
-.It Dv SO_SNDLOWAT Ta "set minimum count for output"
-.It Dv SO_RCVLOWAT Ta "set minimum count for input"
-.It Dv SO_SNDTIMEO Ta "set timeout value for output"
-.It Dv SO_RCVTIMEO Ta "set timeout value for input"
-.It Dv SO_TIMESTAMP Ta "enables reception of a timestamp with datagrams"
-.It Dv SO_ACCEPTFILTER Ta "set accept filter on listening socket"
-.It Dv SO_NOSIGPIPE Ta
-controls generation of
-.Dv SIGPIPE
-for the socket
-.It Dv SO_TYPE Ta "get the type of the socket (get only)"
-.It Dv SO_ERROR Ta "get and clear error on the socket (get only)"
-.El
-.Pp
-.Dv SO_DEBUG
-enables debugging in the underlying protocol modules.
-.Dv SO_REUSEADDR
-indicates that the rules used in validating addresses supplied
-in a
-.Xr bind 2
-call should allow reuse of local addresses.
-.Dv SO_REUSEPORT
-allows completely duplicate bindings by multiple processes
-if they all set
-.Dv SO_REUSEPORT
-before binding the port.
-This option permits multiple instances of a program to each
-receive UDP/IP multicast or broadcast datagrams destined for the bound port.
-.Dv SO_KEEPALIVE
-enables the
-periodic transmission of messages on a connected socket.
-Should the connected party fail to respond to these messages, the connection
-is considered broken and processes using the socket are notified via a
-.Dv SIGPIPE
-signal when attempting to send data.
-.Dv SO_DONTROUTE
-indicates that outgoing messages should
-bypass the standard routing facilities.
-Instead, messages are directed to the appropriate network interface
-according to the network portion of the destination address.
-.Pp
-.Dv SO_LINGER
-controls the action taken when unsent messages
-are queued on socket and a
-.Xr close 2
-is performed.
-If the socket promises reliable delivery of data and
-.Dv SO_LINGER
-is set, the system will block the process on the
-.Xr close 2
-attempt until it is able to transmit the data or until it decides it
-is unable to deliver the information (a timeout period, measured in
-seconds, termed the linger interval, is specified in the
-.Fn setsockopt
-call when
-.Dv SO_LINGER
-is requested).
-If
-.Dv SO_LINGER
-is disabled and a
-.Xr close 2
-is issued, the system will process the close in a manner that allows
-the process to continue as quickly as possible.
-.Pp
-The option
-.Dv SO_BROADCAST
-requests permission to send broadcast datagrams
-on the socket.
-Broadcast was a privileged operation in earlier versions of the system.
-With protocols that support out-of-band data, the
-.Dv SO_OOBINLINE
-option
-requests that out-of-band data be placed in the normal data input queue
-as received; it will then be accessible with
-.Xr recv 2
-or
-.Xr read 2
-calls without the
-.Dv MSG_OOB
-flag.
-Some protocols always behave as if this option is set.
-.Dv SO_SNDBUF
-and
-.Dv SO_RCVBUF
-are options to adjust the normal
-buffer sizes allocated for output and input buffers, respectively.
-The buffer size may be increased for high-volume connections,
-or may be decreased to limit the possible backlog of incoming data.
-The system places an absolute limit on these values.
-.Pp
-.Dv SO_SNDLOWAT
-is an option to set the minimum count for output operations.
-Most output operations process all of the data supplied
-by the call, delivering data to the protocol for transmission
-and blocking as necessary for flow control.
-Nonblocking output operations will process as much data as permitted
-subject to flow control without blocking, but will process no data
-if flow control does not allow the smaller of the low water mark value
-or the entire request to be processed.
-A
-.Xr select 2
-or
-.Xr poll 2
-operation testing the ability to write to a socket will return true
-only if the low water mark amount could be processed.
-The default value for
-.Dv SO_SNDLOWAT
-is set to a convenient size for network efficiency, often 1024.
-.Dv SO_RCVLOWAT
-is an option to set the minimum count for input operations.
-In general, receive calls will block until any (non-zero) amount of data
-is received, then return with the smaller of the amount available or the amount
-requested.
-The default value for
-.Dv SO_RCVLOWAT
-is 1.
-If
-.Dv SO_RCVLOWAT
-is set to a larger value, blocking receive calls normally
-wait until they have received the smaller of the low water mark value
-or the requested amount.
-Receive calls may still return less than the low water mark if an error
-occurs, a signal is caught, or the type of data next in the receive queue
-is different than that returned.
-.Pp
-.Dv SO_SNDTIMEO
-is an option to set a timeout value for output operations.
-It accepts a
-.Fa struct timeval
-parameter with the number of seconds and microseconds
-used to limit waits for output operations to complete.
-If a send operation has blocked for this much time,
-it returns with a partial count
-or with the error
-.Er EAGAIN
-if no data were sent.
-In the current implementation, this timer is restarted each time additional
-data are delivered to the protocol,
-implying that the limit applies to output portions ranging in size
-from the low water mark to the high water mark for output.
-.Dv SO_RCVTIMEO
-is an option to set a timeout value for input operations.
-It accepts a
-.Fa struct timeval
-parameter with the number of seconds and microseconds
-used to limit waits for input operations to complete.
-In the current implementation, this timer is restarted each time additional
-data are received by the protocol,
-and thus the limit is in effect an inactivity timer.
-If a receive operation has been blocked for this much time without
-receiving additional data, it returns with a short count
-or with the error
-.Er EAGAIN
-if no data were received.
-.Pp
-If the
-.Dv SO_TIMESTAMP
-option is enabled on a
-.Dv SOCK_DGRAM
-socket, the
-.Xr recvmsg 2
-call will return a timestamp corresponding to when the datagram was
-received.
-The msg_control field in the msghdr structure points to a buffer
-that contains a cmsghdr structure followed by a struct timeval.
-The cmsghdr fields have the following values:
-.Bd -literal
-cmsg_len = sizeof(struct timeval)
-cmsg_level = SOL_SOCKET
-cmsg_type = SCM_TIMESTAMP
-.Ed
-.Pp
-.Dv SO_ACCEPTFILTER
-places an
-.Xr accept_filter 9
-on the socket, which will filter incoming connections on a listening
-socket before being presented for
-.Xr accept 2 .
-The
-.Fn setsockopt
-system call will fail if the socket already has a filter set, and
-.Xr listen 2
-must be called on the socket before trying to install a filter.
-The
-.Fa optval
-argument
-should point to a
-.Fa struct accept_filter_arg
-that will select and configure the
-.Xr accept_filter 9 ,
-defined as follows:
-.Bd -literal
-struct  accept_filter_arg {
-        char    af_name[16];
-        char    af_arg[256-16];
-};
-.Ed
-.Lp
-The
-.Fa af_name
-argument should be filled with the name of the accept filter
-that the application wishes to place on the listening socket.
-The optional argument
-.Fa af_arg
-can be passed to the accept filter specified by
-.Fa af_name
-to provide additional configuration options at attach time.
-Passing in an
-.Fa optval
-of
-.Dv NULL
-will remove the filter.
-.Pp
-Finally,
-.Dv SO_TYPE
-and
-.Dv SO_ERROR
-are options used only with
-.Fn getsockopt .
-.Dv SO_TYPE
-returns the type of the socket, such as
-.Dv SOCK_STREAM ;
-it is useful for servers that inherit sockets on startup.
-.Dv SO_ERROR
-returns any pending error on the socket and clears
-the error status.
-It may be used to check for asynchronous errors on connected
-datagram sockets or for other asynchronous errors.
-.Sh RETURN VALUES
-A 0 is returned if the call succeeds, \-1 if it fails.
-.Sh ERRORS
-The call succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er EFAULT
-The address pointed to by
-.Fa optval
-is not in a valid part of the process address space.
-For
-.Fn getsockopt ,
-this error may also be returned if
-.Fa optlen
-is not in a valid part of the process address space.
-.It Bq Er EINVAL
-The socket
-.Fa s
-was not suitable for installing an
-.Xr accept_filter 9 .
-.It Bq Er ENOPROTOOPT
-The option is unknown at the level indicated.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is a file, not a socket.
-.El
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr poll 2 ,
-.Xr select 2 ,
-.Xr socket 2 ,
-.Xr getprotoent 3 ,
-.Xr clnp 4 ,
-.Xr faith 4 ,
-.Xr icmp6 4 ,
-.Xr ip 4 ,
-.Xr ip6 4 ,
-.Xr ipsec 4 ,
-.Xr multicast 4 ,
-.Xr pim 4 ,
-.Xr route 4 ,
-.Xr tcp 4 ,
-.Xr tp 4 ,
-.Xr unix 4 ,
-.Xr protocols 5 ,
-.Xr accept_filter 9
-.Sh HISTORY
-The
-.Fn getsockopt
-system call appeared in
-.Bx 4.2 .
-.Sh BUGS
-Several of the socket options should be handled at lower levels of the system.
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
deleted file mode 100644
index 4cb857c07..000000000
--- a/lib/libc/sys/gettimeofday.2
+++ /dev/null
@@ -1,155 +0,0 @@
-.\"	$NetBSD: gettimeofday.2,v 1.27 2010/05/18 07:14:18 jruoho Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)gettimeofday.2	8.2 (Berkeley) 5/26/95
-.\"
-.Dd May 18, 2010
-.Dt GETTIMEOFDAY 2
-.Os
-.Sh NAME
-.Nm gettimeofday ,
-.Nm settimeofday
-.Nd get/set date and time
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/time.h
-.Ft int
-.Fn gettimeofday "struct timeval * restrict tp" "void * restrict tzp"
-.Ft int
-.Fn settimeofday "const struct timeval * restrict tp" "const void * restrict tzp"
-.Sh DESCRIPTION
-.Bf -symbolic
-Note: time zone information is no longer provided by this interface.
-See
-.Xr localtime 3
-for information on how to retrieve it.
-.Ef
-.Pp
-The system's notion of the current UTC time is obtained with the
-.Fn gettimeofday
-call, and set with the
-.Fn settimeofday
-call.
-The time is expressed in seconds and microseconds
-since midnight (0 hour), January 1, 1970.
-The resolution of the system clock is hardware dependent,
-and the time may be updated continuously or in
-.Dq ticks .
-.Pp
-If
-.Fa tp
-is NULL, the time will not be returned or set.
-Despite being declared
-.Fa void * ,
-the objects pointed to by
-.Fa tzp
-shall be of type
-.Fa struct timezone .
-.Pp
-The structures pointed to by
-.Fa tp
-and
-.Fa tzp
-are defined in
-.In sys/time.h .
-The first one is described in
-.Xr timeval 3
-and the latter legacy structure is defined as:
-.Bd -literal -offset indent
-struct timezone {
-	int	tz_minuteswest; /* of Greenwich */
-	int	tz_dsttime;	/* type of dst correction to apply */
-};
-.Ed
-.Pp
-The
-.Fa timezone
-structure is provided only for source compatibility.
-It is ignored by
-.Fn settimeofday ,
-and
-.Fn gettimeofday
-will always return zeroes.
-.Pp
-If the calling user is not the super-user, then the
-.Fn settimeofday
-function in the standard C library will try to use the
-.Xr clockctl 4
-device if present, thus making possible for non privileged users to
-set the system time.
-If
-.Xr clockctl 4
-is not present or not accessible, then
-.Fn settimeofday
-reverts to the
-.Fn settimeofday
-system call, which is restricted to the super user.
-.\" XXX uncomment when/if this is put into place!
-.\" If the system is running in secure mode (see
-.\" .Xr init 8 ),
-.\" the time may only be advanced.
-.\" This limitation is imposed to prevent a malicious super user
-.\" from setting arbitrary time stamps on files.
-.\" The system time can still be adjusted backwards using the
-.\" .Xr adjtime 2
-.\" system call even when the system is secure.
-.Sh RETURN VALUES
-A return value 0 indicates that the call succeeded.
-A return value \-1 indicates an error occurred, and in this
-case an error code is stored into the global variable
-.Va errno .
-.Sh ERRORS
-The following error codes may be set in
-.Va errno :
-.Bl -tag -width Er
-.It Bq Er EFAULT
-An argument address referenced invalid memory.
-.It Bq Er EPERM
-A user other than the super user attempted to set the time, or the specified
-time was less than the current time, which was not permitted at the current
-security level.
-.El
-.Sh SEE ALSO
-.Xr date 1 ,
-.Xr adjtime 2 ,
-.Xr ctime 3 ,
-.Xr localtime 3 ,
-.Xr clockctl 4 ,
-.Xr timed 8
-.Sh HISTORY
-The
-.Fn gettimeofday
-function call appeared in
-.Bx 4.2 .
-The
-.Fa tzp
-argument was deprecated in
-.Bx 4.4
-(and many other systems).
diff --git a/lib/libc/sys/getuid.2 b/lib/libc/sys/getuid.2
deleted file mode 100644
index f514fa15e..000000000
--- a/lib/libc/sys/getuid.2
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"	$NetBSD: getuid.2,v 1.17 2010/04/05 07:44:28 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)getuid.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 3, 2010
-.Dt GETUID 2
-.Os
-.Sh NAME
-.Nm getuid ,
-.Nm geteuid
-.Nd get user identification
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft uid_t
-.Fn getuid void
-.Ft uid_t
-.Fn geteuid void
-.Sh DESCRIPTION
-The
-.Fn getuid
-function returns the real user ID of the calling process.
-The
-.Fn geteuid
-function
-returns the effective user ID of the calling process.
-.Pp
-The real user ID is that of the user who has invoked the program.
-As the effective user ID
-gives the process additional permissions during
-execution of
-.Dq Em set-user-ID
-mode processes,
-.Fn getuid
-is used to determine the real-user-id of the calling process.
-.Sh ERRORS
-The
-.Fn getuid
-and
-.Fn geteuid
-functions are always successful, and no return value is reserved to
-indicate an error.
-.Sh SEE ALSO
-.Xr getgid 2 ,
-.Xr setreuid 2
-.Sh STANDARDS
-The
-.Fn geteuid
-and
-.Fn getuid
-functions conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn getuid
-function appeared in
-.At v4 .
diff --git a/lib/libc/sys/getvfsstat.2 b/lib/libc/sys/getvfsstat.2
deleted file mode 100644
index ed4939899..000000000
--- a/lib/libc/sys/getvfsstat.2
+++ /dev/null
@@ -1,114 +0,0 @@
-.\"	$NetBSD: getvfsstat.2,v 1.3 2006/05/19 17:59:28 tsutsui Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"	@(#)getvfsstat.2	8.3 (Berkeley) 5/25/95
-.\"
-.Dd May 19, 2006
-.Dt GETVFSSTAT 2
-.Os
-.Sh NAME
-.Nm getvfsstat
-.Nd get list of all mounted file systems
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/statvfs.h
-.Ft int
-.Fn getvfsstat "struct statvfs *buf" "size_t bufsize" "int flags"
-.Sh DESCRIPTION
-.Fn getvfsstat
-returns information about all mounted file systems.
-.Fa buf
-is a pointer to an array of
-.Nm statvfs
-structures defined in
-.Xr statvfs 5 .
-.Pp
-The buffer is filled with an array of
-.Fa statvfs
-structures, one for each mounted file system
-up to the size specified by
-.Fa bufsize .
-.Pp
-If
-.Fa buf
-is given as
-.Dv NULL ,
-.Fn getvfsstat
-returns just the number of mounted file systems.
-.Pp
-Normally
-.Fa flags
-should be specified as
-.Dv ST_WAIT .
-If
-.Fa flags
-is set to
-.Dv ST_NOWAIT ,
-.Fn getvfsstat
-will return the information it has available without requesting
-an update from each file system.
-Thus, some of the information will be out of date, but
-.Fn getvfsstat
-will not block waiting for information from a file system that is
-unable to respond.
-.Sh RETURN VALUES
-Upon successful completion, the number of
-.Fa statvfs
-structures is returned.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn getvfsstat
-fails if one or more of the following are true:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-.Fa buf
-points to an invalid address.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr statvfs 2 ,
-.Xr getmntinfo 3 ,
-.Xr fstab 5 ,
-.Xr mount 8
-.Sh HISTORY
-The
-.Fn getvfsstat
-function first appeared in
-.Nx 3.0
-to replace
-.Fn getfsstat
-which appeared in
-.Bx 4.4 .
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
deleted file mode 100644
index cec875069..000000000
--- a/lib/libc/sys/intro.2
+++ /dev/null
@@ -1,837 +0,0 @@
-.\"	$NetBSD: intro.2,v 1.57 2015/04/22 13:59:54 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 1983, 1986, 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. 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.
-.\"
-.\"     @(#)intro.2	8.5 (Berkeley) 2/27/95
-.\"
-.Dd April 21, 2015
-.Dt INTRO 2
-.Os
-.Sh NAME
-.Nm intro ,
-.Nm errno
-.Nd introduction to system calls and error numbers
-.Sh SYNOPSIS
-.In errno.h
-.Sh DESCRIPTION
-This section provides an overview of the system calls,
-their error returns, and other common definitions and concepts.
-.\".Pp
-.\".Sy System call restart
-.\".Pp
-.\"<more later...>
-.Sh DIAGNOSTICS
-Nearly all of the system calls provide an error number in the external
-variable
-.Va errno .
-.Va errno
-is implemented as a macro which expands to a modifiable lvalue of type
-.Fa int .
-.Pp
-When a system call detects an error,
-it returns an integer value
-indicating failure (usually \-1)
-and sets the variable
-.Va errno
-accordingly.
-(This allows interpretation of the failure on receiving
-a \-1 and to take action accordingly.)
-Successful calls never set
-.Va errno ;
-once set, it remains until another error occurs.
-It should only be examined after an error has been reported, because
-otherwise a leftover value from some previous error may be found
-instead.
-.Po
-Many library functions that are not system calls also set
-.Va errno
-on return, in the same fashion.
-In these cases a nonzero value may be left in
-.Va errno
-even upon successful return if some internal action failed.
-.Pc
-.Pp
-The manual page for each system call will list some of the common
-errno codes that system call can return, but that should not be
-considered an exhaustive list, i.e.
-a properly written program should be able to gracefully recover from
-any error that a system call might return.
-Documenting all the error codes that a system call can return in
-a more specification-like manner would take more resources than
-this project has available.
-.Pp
-Note also that a number of system calls overload the meanings of these
-error numbers, and that in these cases the meanings must be
-interpreted according to the type and circumstances of the call.
-.Pp
-The following is a complete list of the errors and their
-names as given in
-.In errno.h .
-.Bl -hang -width Ds
-.It Er 0 Em "Error 0" .
-Not used.
-.It Er 1 EPERM Em "Operation not permitted" .
-An attempt was made to perform an operation limited to processes
-with appropriate privileges or to the owner of a file or other
-resources.
-.It Er 2 ENOENT Em "No such file or directory" .
-A component of a specified pathname did not exist, or the
-pathname was an empty string.
-.It Er 3 ESRCH Em "No such process" .
-No process could be found corresponding to that specified by the given
-process ID.
-.It Er 4 EINTR Em "Interrupted function call" .
-An asynchronous signal (such as
-.Dv SIGINT
-or
-.Dv SIGQUIT )
-was caught by the process during the execution of an interruptible
-function.
-If the signal handler performs a normal return, the
-interrupted function call will seem to have returned the error condition.
-.It Er 5 EIO Em "Input/output error" .
-Some physical input or output error occurred.
-This error will not be reported until a subsequent operation on the same file
-descriptor and may be lost (over written) by any subsequent errors.
-.It Er 6 ENXIO Em "Device not configured" .
-Input or output on a special file referred to a device that did not
-exist, or
-made a request beyond the limits of the device.
-This error may also occur when, for example,
-a tape drive is not online or no disk pack is
-loaded on a drive.
-.It Er 7 E2BIG Em "Arg list too long" .
-The number of bytes used for the argument and environment
-list of the new process exceeded the current limit of
-.if t 2\u\s-218\s+2\d
-.if n 2**18
-bytes
-.Pf ( Dv ARG_MAX
-in
-.In sys/syslimits.h ) .
-.It Er 8 ENOEXEC Em "Exec format error" .
-A request was made to execute a file
-that, although it has the appropriate permissions,
-was not in the format required for an
-executable file.
-.It Er 9 EBADF Em "Bad file descriptor" .
-A file descriptor argument was out of range, referred to no open file,
-had been revoked by
-.Xr revoke 2 ,
-or a
-.Xr read 2
-(or
-.Xr write 2 )
-request was made to a file that was
-only open for writing (or reading).
-.It Er 10 ECHILD Em "\&No child processes" .
-A
-.Xr wait 2
-or
-.Xr waitpid 2
-function was executed by a process that had no existing or unwaited-for
-child processes.
-.It Er 11 EDEADLK Em "Resource deadlock avoided" .
-An attempt was made to lock a system resource that
-would have resulted in a deadlock situation.
-.It Er 12 ENOMEM Em "Cannot allocate memory" .
-The new process image required more memory than was allowed by the hardware
-or by system-imposed memory management constraints.
-A lack of swap space is normally temporary; however,
-a lack of core is not.
-Soft limits may be increased to their corresponding hard limits.
-.It Er 13 EACCES Em "Permission denied" .
-An attempt was made to access a file in a way forbidden
-by its file access permissions.
-.It Er 14 EFAULT Em "Bad address" .
-The system detected an invalid address in attempting to
-use an argument of a call.
-The reliable detection of this error cannot be guaranteed and when not detected
-may result in the generation of a signal, indicating an address violation,
-which is sent to the process.
-.It Er 15 ENOTBLK Em "Block device required" .
-A block device operation was attempted on a non-block device or file.
-.It Er 16 EBUSY Em "Resource busy" .
-An attempt to use a system resource which was in use at the time
-in a manner which would have conflicted with the request.
-.It Er 17 EEXIST Em "File exists" .
-An existing file was mentioned in an inappropriate context,
-for instance, as the new link name in a
-.Xr link 2
-function.
-.It Er 18 EXDEV Em "Improper link" .
-A hard link to a file on another file system
-was attempted.
-.It Er 19 ENODEV Em "Operation not supported by device" .
-An attempt was made to apply an inappropriate
-function to a device,
-for example,
-trying to read a write-only device such as a printer.
-.It Er 20 ENOTDIR Em "Not a directory" .
-A component of the specified pathname existed, but it was
-not a directory, when a directory was expected.
-.It Er 21 EISDIR Em "Is a directory" .
-An attempt was made to open a directory with write mode specified.
-.It Er 22 EINVAL Em "Invalid argument" .
-Some invalid argument was supplied.
-(For example, specifying an undefined signal to a
-.Xr signal 3
-or
-.Xr kill 2
-function).
-.It Er 23 ENFILE Em "Too many open files in system" .
-Maximum number of file descriptors allowable on the system
-has been reached and a requests for an open cannot be satisfied
-until at least one has been closed.
-.It Er 24 EMFILE Em "Too many open files" .
-\*[Lt]As released, the limit on the number of
-open files per process is 64.\*[Gt]
-The
-.Xr getrlimit 2
-call with the
-.Ar RLIMIT_NOFILE
-resource will obtain the current limit.
-.It Er 25 ENOTTY Em "Inappropriate ioctl for device" .
-A control function (see
-.Xr ioctl 2 )
-was attempted for a file or
-special device for which the operation was inappropriate.
-.It Er 26 ETXTBSY Em "Text file busy" .
-The new process was a pure procedure (shared text) file
-which was open for writing by another process, or
-while the pure procedure file was being executed an
-.Xr open 2
-call requested write access.
-.It Er 27 EFBIG Em "File too large" .
-The size of a file exceeded the maximum.
-(The system-wide maximum file size is
-.if t 2\u\s-263\s+2\d
-.if n 2**63
-bytes.
-Each file system may impose a lower limit for files contained within it).
-.It Er 28 ENOSPC Em "Device out of space" .
-A
-.Xr write 2
-to an ordinary file, the creation of a
-directory or symbolic link, or the creation of a directory
-entry failed because no more disk blocks were available
-on the file system, or the allocation of an inode for a newly
-created file failed because no more inodes were available
-on the file system.
-.It Er 29 ESPIPE Em "Illegal seek" .
-An
-.Xr lseek 2
-function was issued on a socket, pipe or
-.Tn FIFO .
-.It Er 30 EROFS Em "Read-only file system" .
-An attempt was made to modify a file or directory
-was made
-on a file system that was read-only at the time.
-.It Er 31 EMLINK Em "Too many links" .
-The number of hard links to a single file has exceeded the maximum.
-(The system-wide maximum number of hard links is 32767.
-Each file system may impose a lower limit for files contained within it).
-.It Er 32 EPIPE Em "Broken pipe" .
-A write on a pipe, socket or
-.Tn FIFO
-for which there is no process
-to read the data.
-.It Er 33 EDOM Em "Numerical argument out of domain" .
-A numerical input argument was outside the defined domain of the mathematical
-function.
-.It Er 34 ERANGE Em "Result too large or too small" .
-The result of the function is too large or too small to be represented
-in the available space.
-.It Er 35 EAGAIN Em "Resource temporarily unavailable" .
-This is a temporary condition and later calls to the
-same routine may complete normally.
-In this implementation this is the same as
-.Er EWOULDBLOCK ,
-but
-.Er EAGAIN
-is the preferred name.
-.It Er 36 EINPROGRESS Em "Operation now in progress" .
-An operation that takes a long time to complete (such as
-a
-.Xr connect 2 )
-was attempted on a non-blocking object (see
-.Xr fcntl 2 ) .
-.It Er 37 EALREADY Em "Operation already in progress" .
-An operation was attempted on a non-blocking object that already
-had an operation in progress.
-.It Er 38 ENOTSOCK Em "Socket operation on non-socket" .
-Self-explanatory.
-.It Er 39 EDESTADDRREQ Em "Destination address required" .
-A required address was omitted from an operation on a socket.
-.It Er 40 EMSGSIZE Em "Message too long" .
-A message sent on a socket was larger than the internal message buffer
-or some other network limit.
-.It Er 41 EPROTOTYPE Em "Protocol wrong type for socket" .
-A protocol was specified that does not support the semantics of the
-socket type requested.
-For example, you cannot use the
-.Tn ARPA
-Internet
-.Tn UDP
-protocol with type
-.Dv SOCK_STREAM .
-.It Er 42 ENOPROTOOPT Em "Protocol option not available" .
-A bad option or level was specified in a
-.Xr getsockopt 2
-or
-.Xr setsockopt 2
-call.
-.It Er 43 EPROTONOSUPPORT Em "Protocol not supported" .
-The protocol has not been configured into the
-system or no implementation for it exists.
-.It Er 44 ESOCKTNOSUPPORT Em "Socket type not supported" .
-The support for the socket type has not been configured into the
-system or no implementation for it exists.
-.It Er 45 EOPNOTSUPP Em "Operation not supported" .
-The attempted operation is not supported for the type of object referenced.
-Usually this occurs when a file descriptor refers to a file or socket
-that cannot support this operation,
-for example, trying to
-.Em accept
-a connection on a datagram socket.
-.It Er 46 EPFNOSUPPORT Em "Protocol family not supported" .
-The protocol family has not been configured into the
-system or no implementation for it exists.
-.It Er 47 EAFNOSUPPORT Em "Address family not supported by protocol family" .
-An address incompatible with the requested protocol was used.
-For example, you shouldn't necessarily expect to be able to use
-.Tn NS
-addresses with
-.Tn ARPA
-Internet protocols.
-.It Er 48 EADDRINUSE Em "Address already in use" .
-Only one usage of each address is normally permitted.
-.It Er 49 EADDRNOTAVAIL Em "Cannot assign requested address" .
-Normally results from an attempt to create a socket with an
-address not on this machine.
-.It Er 50 ENETDOWN Em "Network is down" .
-A socket operation encountered a dead network.
-.It Er 51 ENETUNREACH Em "Network is unreachable" .
-A socket operation was attempted to an unreachable network.
-.It Er 52 ENETRESET Em "Network dropped connection on reset" .
-The host you were connected to crashed and rebooted.
-.It Er 53 ECONNABORTED Em "Software caused connection abort" .
-A connection abort was caused internal to your host machine.
-.It Er 54 ECONNRESET Em "Connection reset by peer" .
-A connection was forcibly closed by a peer.
-This normally results from a loss of the connection on the remote
-socket due to a timeout or a reboot.
-.It Er 55 ENOBUFS Em "\&No buffer space available" .
-An operation on a socket or pipe was not performed because
-the system lacked sufficient buffer space or because a queue was full.
-.It Er 56 EISCONN Em "Socket is already connected" .
-A
-.Xr connect 2
-request was made on an already connected socket; or,
-a
-.Xr sendto 2
-or
-.Xr sendmsg 2
-request on a connected socket specified a destination
-when already connected.
-.It Er 57 ENOTCONN Em "Socket is not connected" .
-An request to send or receive data was disallowed because
-the socket was not connected and (when sending on a datagram socket)
-no address was supplied.
-.It Er 58 ESHUTDOWN Em "Cannot send after socket shutdown" .
-A request to send data was disallowed because the socket
-had already been shut down with a previous
-.Xr shutdown 2
-call.
-.It Er 59 ETOOMANYREFS Em "Too many references: can't splice" .
-The resource is used up to capacity.
-.It Er 60 ETIMEDOUT Em "Operation timed out" .
-A
-.Xr connect 2
-or
-.Xr send 2
-request failed because the connected party did not
-properly respond after a period of time.
-(The timeout period is dependent on the communication protocol).
-.It Er 61 ECONNREFUSED Em "Connection refused" .
-No connection could be made because the target machine actively
-refused it.
-This usually results from trying to connect
-to a service that is inactive on the foreign host.
-.It Er 62 ELOOP Em "Too many levels of symbolic links" .
-A path name lookup involved more than 32
-.Pq Dv MAXSYMLINKS
-symbolic links.
-.It Er 63 ENAMETOOLONG Em "File name too long" .
-A component of a path name exceeded 255
-.Pq Dv MAXNAMELEN
-characters, or an entire
-path name exceeded 1023
-.Pq Dv MAXPATHLEN Ns \-1
-characters.
-.It Er 64 EHOSTDOWN Em "Host is down" .
-A socket operation failed because the destination host was down.
-.It Er 65 EHOSTUNREACH Em "No route to host" .
-A socket operation was attempted to an unreachable host.
-.It Er 66 ENOTEMPTY Em "Directory not empty" .
-A directory with entries other than
-.Ql \&.
-and
-.Ql \&..
-was supplied to a remove directory or rename call.
-.It Er 67 EPROCLIM Em "Too many processes" .
-.It Er 68 EUSERS Em "Too many users" .
-The quota system ran out of table entries.
-.It Er 69 EDQUOT Em "Disc quota exceeded" .
-A
-.Xr write 2
-to an ordinary file, the creation of a
-directory or symbolic link, or the creation of a directory
-entry failed because the user's quota of disk blocks was
-exhausted, or the allocation of an inode for a newly
-created file failed because the user's quota of inodes
-was exhausted.
-.It Er 70 ESTALE Em "Stale NFS file handle" .
-An attempt was made to access an open file (on an
-.Tn NFS
-filesystem)
-which is now unavailable as referenced by the file descriptor.
-This may indicate the file was deleted on the
-.Tn NFS
-server or some other catastrophic event occurred.
-.It Er 71 EREMOTE Em "Too many levels of remote in path" .
-.Tn NFS
-version 3 RPC return code 71.
-.It Er 72 EBADRPC Em "RPC struct is bad" .
-Exchange of
-.Tn RPC
-information was unsuccessful.
-.It Er 73 ERPCMISMATCH Em "RPC version wrong" .
-The version of
-.Tn RPC
-on the remote peer is not compatible with
-the local version.
-.It Er 74 EPROGUNAVAIL Em "RPC prog. not avail" .
-The requested program is not registered on the remote host.
-.It Er 75 EPROGMISMATCH Em "Program version wrong" .
-The requested version of the program is not available
-on the remote host
-.Pq Tn RPC .
-.It Er 76 EPROCUNAVAIL Em "Bad procedure for program" .
-An
-.Tn RPC
-call was attempted for a procedure which doesn't exist
-in the remote program.
-.It Er 77 ENOLCK Em "No locks available" .
-A system-imposed limit on the number of simultaneous file
-locks was reached.
-.It Er 78 ENOSYS Em "Function not implemented" .
-Attempted a system call that is not available on this
-system.
-.It Er 79 EFTYPE Em "Inappropriate file type or format" .
-Attempted a file operation on a file of a type for which it was invalid.
-.It Er 80 EAUTH Em "Authentication error" .
-Attempted to use an invalid authentication ticket to mount an
-.Tn NFS
-filesystem.
-.It Er 81 ENEEDAUTH Em "Need authenticator" .
-An authentication ticket must be obtained before the given
-.Tn NFS
-filesystem may be mounted.
-.It Er 82 EIDRM Em "Identifier removed" .
-An IPC identifier was removed while the current process was waiting on it.
-.It Er 83 ENOMSG Em "No message of the desired type" .
-An IPC message queue does not contain a message of the desired type,
-or a message catalog does not contain the requested message.
-.It Er 84 EOVERFLOW Em "Value too large to be stored in data type" .
-A numerical result of the function was too large to be stored in the
-caller-provided space.
-.It Er 85 EILSEQ Em "Illegal byte sequence" .
-A wide character/multibyte character encoding error occurred.
-.It Er 86 ENOTSUP Em "Not supported" .
-An attempt was made to set or change a parameter to an unsupported
-value.
-.It Er 87 ECANCELED Em "Operation canceled" .
-The requested operation was canceled.
-.It Er 88 EBADMSG Em "Bad or corrupt message" .
-A message in the specified message catalog did not satisfy implementation
-defined criteria, or a STREAMS operation encountered an invalid message or
-a file descriptor at the STREAM head.
-.It Er 89 ENODATA Em "No message available" .
-No message is available on the STREAM head read queue
-.It Er 90 ENOSR Em "No STREAM resources" .
-Buffers could not be allocated due to insufficient STREAMs memory resources.
-.It Er 91 ENOSTR Em "Not a STREAM" .
-A STREAM is not associated with the specified file descriptor.
-.It Er 92 ETIME Em "STREAM ioctl timeout" .
-The timer set for a STREAMS
-.Xr ioctl 2
-operation has expired.
-.It Er 93 ENOATTR Em "Attribute not found" .
-The specified extended attribute does not exist.
-.It Er 94 EMULTIHOP Em "Multihop attempted" .
-Components of path require hopping to multiple remote machines and the
-file system does not allow it.
-It occurs when users try to access remote resources which are not directly
-accessible.
-.It Er 95 ENOLINK Em "Link has been severed" .
-Occurs when the link (virtual circuit) connecting to a remote machine is gone.
-.It Er 96 EPROTO Em "Protocol error" .
-Some protocol error occurred.
-This error is device-specific, but is generally not related to a hardware
-failure.
-.El
-.Sh DEFINITIONS
-.Bl -tag -width Ds
-.It Process ID
-Each active process in the system is uniquely identified by a non-negative
-integer called a process ID.
-The range of this ID is from 0 to 30000.
-.It Parent process ID
-A new process is created by a currently active process; (see
-.Xr fork 2 ) .
-The parent process ID of a process is initially the process ID of its creator.
-If the creating process exits,
-the parent process ID of each child is set to the ID of a system process,
-.Xr init 8 .
-.It Process Group
-Each active process is a member of a process group that is identified by
-a non-negative integer called the process group ID.
-This is the process ID of the group leader.
-This grouping permits the signaling of related processes (see
-.Xr termios 4 )
-and the job control mechanisms of
-.Xr csh 1 .
-.It Session
-A session is a set of one or more process groups.
-A session is created by a successful call to
-.Xr setsid 2 ,
-which causes the caller to become the only member of the only process
-group in the new session.
-.It Session leader
-A process that has created a new session by a successful call to
-.Xr setsid 2 ,
-is known as a session leader.
-Only a session leader may acquire a terminal as its controlling terminal (see
-.Xr termios 4 ) .
-.It Controlling process
-A session leader with a controlling terminal is a controlling process.
-.It Controlling terminal
-A terminal that is associated with a session is known as the controlling
-terminal for that session and its members.
-.It "Terminal Process Group ID"
-A terminal may be acquired by a session leader as its controlling terminal.
-Once a terminal is associated with a session, any of the process groups
-within the session may be placed into the foreground by setting
-the terminal process group ID to the ID of the process group.
-This facility is used
-to arbitrate between multiple jobs contending for the same terminal.
-(See
-.Xr csh 1
-and
-.Xr tty 4
-for more information on job control.)
-.It "Orphaned Process Group"
-A process group is considered to be
-.Em orphaned
-if it is not under the control of a job control shell.
-More precisely, a process group is orphaned
-when none of its members has a parent process that is in the same session
-as the group,
-but is in a different process group.
-Note that when a process exits, the parent process for its children
-is changed to be
-.Xr init 8 ,
-which is in a separate session.
-Not all members of an orphaned process group are necessarily orphaned
-processes (those whose creating process has exited).
-The process group of a session leader is orphaned by definition.
-.It "Real User ID and Real Group ID"
-Each user on the system is identified by a positive integer
-termed the real user ID.
-.Pp
-Each user is also a member of one or more groups.
-One of these groups is distinguished from others and
-used in implementing accounting facilities.
-The positive integer corresponding to this distinguished group is
-termed the real group ID.
-.Pp
-All processes have a real user ID and real group ID.
-These are initialized from the equivalent attributes
-of the process that created it.
-.It "Effective User Id, Effective Group Id, and Group Access List"
-Access to system resources is governed by two values:
-the effective user ID, and the group access list.
-The first member of the group access list is also known as the
-effective group ID.
-(In POSIX.1, the group access list is known as the set of supplementary
-group IDs, and it is unspecified whether the effective group ID is
-a member of the list.)
-.Pp
-The effective user ID and effective group ID are initially the
-process's real user ID and real group ID respectively.
-Either may be modified through execution of a set-user-ID or
-set-group-ID file (possibly by one of its ancestors) (see
-.Xr execve 2 ) .
-By convention, the effective group ID (the first member of the group access
-list) is duplicated, so that the execution of a set-group-ID program
-does not result in the loss of the original (real) group ID.
-.Pp
-The group access list is a set of group IDs
-used only in determining resource accessibility.
-Access checks are performed as described below in
-.Qq File Access Permissions .
-.It "Saved Set User ID and Saved Set Group ID"
-When a process executes a new file, the effective user ID is set
-to the owner of the file if the file is set-user-ID, and the effective
-group ID (first element of the group access list) is set to the group
-of the file if the file is set-group-ID.
-The effective user ID of the process is then recorded as the saved set-user-ID,
-and the effective group ID of the process is recorded as the saved set-group-ID.
-These values may be used to regain those values as the effective user
-or group ID after reverting to the real ID (see
-.Xr setuid 2 ) .
-(In POSIX.1, the saved set-user-ID and saved set-group-ID are optional,
-and are used in setuid and setgid, but this does not work as desired
-for the super-user.)
-.It Super-user
-A process is recognized as a
-.Em super-user
-process and is granted special privileges if its effective user ID is 0.
-.It Special Processes
-The processes with process IDs of 0 and 1 are special.
-Process 0 is the scheduler.
-Process 1 is the initialization process
-.Xr init 8 ,
-and is the ancestor (parent) of every other process in the system.
-It is used to control the process structure.
-The kernel will allocate other kernel threads to handle certain
-periodic tasks or device related tasks, such as:
-.Bl -tag -width pagedaemon
-.It Sy acctwatch
-System accounting disk watcher, see
-.Xr acct 2 ,
-.Xr acct 5 .
-.It Sy aiodoned
-Asynchronous I/O done handler, see
-.Xr uvm 9 .
-.It Sy atabusX
-ATA bus handler, see
-.Xr ata 4 .
-.It Sy cardslotX
-CardBus slot watcher thread, see
-.Xr cardslot 4 .
-.It Sy cryptoret
-The software crypto daemon.
-.It Sy fssbsX
-File system snapshot thread, see
-.Xr fss 4 .
-.It Sy ioflush
-The in-kernel periodic flush the buffer cache to disk task,
-which replaces the old
-.Sy update
-program.
-.It Sy nfsio , nfskqpoll
-NFS handing daemons.
-.It Sy lfs_writer
-Log filesystem writer.
-.It Sy pagedaemon
-The page daemon.
-.It Sy raidX , raidioX , raid_parity , raid_recon , raid_reconip , raid_copyback
-Raid framework related threads, see
-.Xr raid 4 .
-.It Sy scsibusX
-SCSI bus handler, see
-.Xr scsi 4 .
-.It Sy smbiodX , smbkq
-SMBFS handling daemon, see
-.Xr netsmb 4 .
-.It Sy swdmover
-The software data mover I/O thread, see
-.Xr dmoverio 4 .
-.It Sy sysmon
-The systems monitoring framework daemon.
-.It Sy usbX , usbtask
-USB bus handler, see
-.Xr usb 4 .
-.El
-.Pp
-There are more machine-dependent kernel threads allocated by
-different drivers.
-See the specific driver manual pages for more information.
-.It Descriptor
-An integer assigned by the system when a file is referenced
-by
-.Xr open 2
-or
-.Xr dup 2 ,
-or when a socket is created by
-.Xr pipe 2 ,
-.Xr socket 2 ,
-or
-.Xr socketpair 2 ,
-which uniquely identifies an access path to that file or socket from
-a given process or any of its children.
-.It File Name
-Names consisting of up to 255
-.Pq Dv MAXNAMELEN
-characters may be used to name
-an ordinary file, special file, or directory.
-.Pp
-These characters may be selected from the set of all
-.Tn ASCII
-character
-excluding 0 (NUL) and the
-.Tn ASCII
-code for
-.Ql \&/
-(slash).
-(The parity bit, bit 7, must be 0).
-.Pp
-Note that it is generally unwise to use
-.Ql \&* ,
-.Ql \&? ,
-.Ql \&[
-or
-.Ql \&]
-as part of
-file names because of the special meaning attached to these characters
-by the shell.
-.It Pathname
-A path name is a
-.Tn NUL Ns -terminated
-character string starting with an
-optional slash
-.Ql \&/ ,
-followed by zero or more directory names separated
-by slashes, optionally followed by a file name.
-The total length of a path name must be less than 1024
-.Pq Dv MAXPATHLEN
-characters.
-.Pp
-If a path name begins with a slash, the path search begins at the
-.Em root
-directory.
-Otherwise, the search begins from the current working directory.
-A slash by itself names the root directory.
-An empty string is not a valid pathname.
-.It Directory
-A directory is a special type of file that contains entries
-that are references to other files.
-Directory entries are called links.
-By convention, a directory contains at least two links,
-.Ql \&.
-and
-.Ql \&.. ,
-referred to as
-.Em dot
-and
-.Em dot-dot
-respectively.
-Dot refers to the directory itself and dot-dot refers to its parent directory.
-.It "Root Directory and Current Working Directory"
-Each process has associated with it a concept of a root directory
-and a current working directory for the purpose of resolving path
-name searches.
-A process's root directory need not be the root
-directory of the root file system.
-.It File Access Permissions
-Every file in the file system has a set of access permissions.
-These permissions are used in determining whether a process
-may perform a requested operation on the file (such as opening
-a file for writing).
-Access permissions are established at the time a file is created.
-They may be changed at some later time through the
-.Xr chmod 2
-call.
-.Pp
-File access is broken down according to whether a file may be: read,
-written, or executed.
-Directory files use the execute permission to control if the
-directory may be searched.
-.Pp
-File access permissions are interpreted by the system as
-they apply to three different classes of users: the owner
-of the file, those users in the file's group, anyone else.
-Every file has an independent set of access permissions for
-each of these classes.
-When an access check is made, the system decides if permission should be
-granted by checking the access information applicable to the caller.
-.Pp
-Read, write, and execute/search permissions on
-a file are granted to a process if:
-.Pp
-The process's effective user ID is that of the super-user.
-(Note: even the super-user cannot execute a non-executable file).
-.Pp
-The process's effective user ID matches the user ID of the owner
-of the file and the owner permissions allow the access.
-.Pp
-The process's effective user ID does not match the user ID of the
-owner of the file, and either the process's effective
-group ID matches the group ID
-of the file, or the group ID of the file is in
-the process's group access list,
-and the group permissions allow the access.
-.Pp
-Neither the effective user ID nor effective group ID
-and group access list of the process
-match the corresponding user ID and group ID of the file,
-but the permissions for ``other users'' allow access.
-.Pp
-Otherwise, permission is denied.
-.It Sockets and Address Families
-A socket is an endpoint for communication between processes.
-Each socket has queues for sending and receiving data.
-.Pp
-Sockets are typed according to their communications properties.
-These properties include whether messages sent and received
-at a socket require the name of the partner, whether communication
-is reliable, the format used in naming message recipients, etc.
-.Pp
-Each instance of the system supports some
-collection of socket types; consult
-.Xr socket 2
-for more information about the types available and
-their properties.
-.Pp
-Each instance of the system supports some number of sets of
-communications protocols.
-Each protocol set supports addresses of a certain format.
-An Address Family is the set of addresses for a specific group of protocols.
-Each socket has an address
-chosen from the address family in which the socket was created.
-.El
-.Sh SEE ALSO
-.Xr intro 3 ,
-.Xr perror 3
-.Sh HISTORY
-An
-.Nm intro
-manual page appeared in
-.At v6 .
diff --git a/lib/libc/sys/ioctl.2 b/lib/libc/sys/ioctl.2
deleted file mode 100644
index 5c801e124..000000000
--- a/lib/libc/sys/ioctl.2
+++ /dev/null
@@ -1,220 +0,0 @@
-.\"	$NetBSD: ioctl.2,v 1.23 2010/12/19 22:19:27 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)ioctl.2	8.2 (Berkeley) 12/11/93
-.\"
-.Dd December 19, 2010
-.Dt IOCTL 2
-.Os
-.Sh NAME
-.Nm ioctl
-.Nd control device
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/ioctl.h
-.Ft int
-.Fn ioctl "int d" "unsigned long request" "..."
-.Sh DESCRIPTION
-The
-.Fn ioctl
-function manipulates the underlying device parameters of special files.
-In particular, many operating
-characteristics of character special files (e.g. terminals)
-may be controlled with
-.Fn ioctl
-requests.
-The argument
-.Fa d
-must be an open file descriptor.
-.Pp
-An
-.Fn ioctl
-.Fa request
-has encoded in it whether the argument is an
-.Dq in ,
-.Dq out ,
-or
-.Dq inout
-parameter, and the size of the first variadic argument
-in bytes.
-Note that there can be only one variadic argument but cannot be represented as
-a
-.Ft "void *"
-argument in the prototype because this would require a cast to pass integral
-types without warnings.
-Macros and defines used in specifying an
-.Fn ioctl
-.Fa request
-are located in the header
-.In sys/ioctl.h .
-.Sh GENERIC IOCTLS
-Some ioctls are applicable to any file descriptor.
-These include:
-.Bl -tag -width "xxxxxx"
-.It Dv FIOCLEX
-Set close-on-exec flag.
-The file will be closed when
-.Xr exec 3
-is invoked
-(This is equivalent to
-.Fn fcntl
-.Dv F_SETFD
-.Dv FD_CLOEXEC
-and the
-.Fn fcntl
-form should be preferred).
-.It Dv FIONCLEX
-Clear close-on-exec flag.
-The file will remain open across
-.Xr exec 3
-(This is equivalent to
-.Fn fcntl
-.Dv F_SETFD
-.Dv 0
-and the
-.Fn fcntl
-form should be preferred).
-.El
-.Pp
-Some generic ioctls are not implemented for all types of file
-descriptors.
-These include:
-.Bl -tag -width "xxxxxx"
-.It Dv FIONREAD "int"
-Get the number of bytes that are immediately available for reading.
-.It Dv FIONWRITE "int"
-Get the number of bytes in the descriptor's send queue.
-These bytes are data which has been written to the descriptor but
-which are being held by the kernel for further processing.
-The nature of the required processing depends on the underlying device.
-For tty devices, these bytes are typically queued for delivery
-to the tty hardware.
-For TCP sockets, these bytes have not yet been acknowledged by the
-other side of the connection.
-For files, this operation always returns zero as files do not have
-send queues.
-.It Dv FIONSPACE "int"
-Get the free space in the descriptor's send queue.
-This value is the size of the send queue minus the number of bytes
-being held in the queue.
-Note: while this value represents the number of bytes that may be
-added to the queue, other resource limitations may cause a write
-not larger than the send queue's space to be blocked.
-One such limitation would be a lack of network buffers for a write
-to a network connection.
-.It Dv FIONBIO "int"
-Set non-blocking I/O mode if the argument is non-zero.
-In non-blocking mode,
-.Xr read 2
-or
-.Xr write 2
-calls return
-.Dv \-1
-and set
-.Va errno
-to
-.Er EAGAIN
-immediately when no data is available
-(This is equivalent to
-.Fn fcntl
-.Dv F_SETFL
-.Dv O_NONBLOCK
-and the
-.Fn fcntl
-form should be preferred).
-.It Dv FIOASYNC "int"
-Set asynchronous I/O mode if the argument is non-zero
-(This is equivalent to
-.Fn fcntl
-.Dv F_SETFL
-.Dv O_ASYNC
-and the
-.Fn fcntl
-form should be preferred).
-In asynchronous mode, the process or process group specified by
-.Dv FIOSETOWN
-will start receiving
-.Dv SIGIO
-signals when data is available.
-The
-.Dv SIGIO
-signal will be delivered when data is available on the file
-descriptor.
-.It Dv FIOSETOWN, FIOGETOWN "int"
-Set/get the process or the process group (if negative) that should receive
-.Dv SIGIO
-signals when data is available
-(This is equivalent to
-.Fn fcntl
-.Dv F_SETOWN
-.Ft pid_t
-and the
-.Ft fcntl
-form should be preferred).
-.El
-.Sh RETURN VALUES
-If an error has occurred, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn ioctl
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa d
-is not a valid descriptor.
-.It Bq Er EFAULT
-.Fa argp
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-.Fa request
-or
-.Fa argp
-is not valid.
-.It Bq Er ENOTTY
-.Fa d
-is not associated with a character
-special device; or
-the specified request does not apply to the kind
-of object that the descriptor
-.Fa d
-references.
-.El
-.Sh SEE ALSO
-.Xr mt 1 ,
-.Xr execve 2 ,
-.Xr fcntl 2 ,
-.Xr intro 4 ,
-.Xr tty 4
-.Sh HISTORY
-An
-.Fn ioctl
-function call appeared in
-.At v7 .
diff --git a/lib/libc/sys/issetugid.2 b/lib/libc/sys/issetugid.2
deleted file mode 100644
index 4857d2239..000000000
--- a/lib/libc/sys/issetugid.2
+++ /dev/null
@@ -1,101 +0,0 @@
-.\"	$NetBSD: issetugid.2,v 1.12 2012/04/21 12:27:27 roy Exp $
-.\"	OpenBSD: issetugid.2,v 1.7 1997/02/18 00:16:09 deraadt Exp
-.\" FreeBSD: src/lib/libc/sys/issetugid.2,v 1.5.2.2 1999/09/18 16:18:59 phantom Exp
-.\"
-.\" Copyright (c) 1980, 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. 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: src/lib/libc/sys/issetugid.2,v 1.5.2.2 1999/09/18 16:18:59 phantom Exp
-.\"
-.Dd April 5, 2012
-.Dt ISSETUGID 2
-.Os
-.Sh NAME
-.Nm issetugid
-.Nd is current process tainted by uid or gid changes
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn issetugid void
-.Sh DESCRIPTION
-The
-.Fn issetugid
-function returns 1 if the process environment or memory address space
-is considered
-.Dq tainted ,
-and returns 0 otherwise.
-.Pp
-A process is tainted if it was created as a result of an
-.Xr execve 2
-system call which had either of the setuid or setgid bits set (and extra
-privileges were given as a result) or if it has changed any of its real,
-effective or saved user or group ID's since it began execution.
-.Pp
-This system call exists so that library routines (e.g., libc)
-can reliably determine if it is safe to use information
-that was obtained from the user, in particular the results from
-.Xr getenv 3
-should be viewed with suspicion if it is used to control operation.
-.Pp
-A
-.Dq tainted
-status is inherited by child processes as a result of the
-.Xr fork 2
-system call (or other library code that calls fork, such as
-.Xr popen 3 ) .
-.Pp
-It is assumed that a program that clears all privileges as it prepares
-to execute another will also reset the environment, hence the
-.Dq tainted
-status will not be passed on.
-This is important for programs such as
-.Xr su 1
-which begin setuid but need to be able to create an untainted process.
-.Sh ERRORS
-The
-.Fn issetugid
-function is always successful, and no return value is reserved to
-indicate an error.
-.Sh SEE ALSO
-.Xr execve 2 ,
-.Xr fork 2 ,
-.Xr setegid 2 ,
-.Xr seteuid 2 ,
-.Xr setgid 2 ,
-.Xr setregid 2 ,
-.Xr setreuid 2 ,
-.Xr setuid 2
-.Sh HISTORY
-A
-.Fn issetugid
-function call first appeared in
-.Ox 2.0
-and was also implemented in
-.Fx 3.0 .
-.Fx
-implementation was imported in
-.Nx 1.5 .
diff --git a/lib/libc/sys/kill.2 b/lib/libc/sys/kill.2
deleted file mode 100644
index 02edc2253..000000000
--- a/lib/libc/sys/kill.2
+++ /dev/null
@@ -1,138 +0,0 @@
-.\"	$NetBSD: kill.2,v 1.23 2014/07/15 17:39:21 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)kill.2	8.3 (Berkeley) 4/19/94
-.\"
-.Dd July 9, 2014
-.Dt KILL 2
-.Os
-.Sh NAME
-.Nm kill
-.Nd send signal to a process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn kill "pid_t pid" "int sig"
-.Sh DESCRIPTION
-The
-.Fn kill
-function sends the signal given by
-.Fa sig
-to
-.Fa pid ,
-a
-process or a group of processes.
-.Fa sig
-may be one of the signals specified in
-.Xr sigaction 2
-or it may be 0, in which case
-error checking is performed but no
-signal is actually sent.
-This can be used to check the validity of
-.Fa pid .
-.Pp
-For a process to have permission to send a signal to a process designated
-by
-.Fa pid ,
-the real or effective user ID of the receiving process must match
-that of the sending process or the user must have appropriate privileges
-(such as given by a set-user-ID program or the user is the super-user).
-A single exception is the signal SIGCONT, which may always be sent
-to any descendant of the current process.
-.Bl -tag -width Ds
-.It \&If Fa pid No \&is greater than zero :
-.Fa sig
-is sent to the process whose ID is equal to
-.Fa pid .
-.It \&If Fa pid No \&is zero :
-.Fa sig
-is sent to all processes whose process group ID is equal
-to the process group ID of the sender, and for which the
-process has permission;
-this is a variant of
-.Xr killpg 3 .
-.It \&If Fa pid No \&is \-1 :
-If the user has super-user privileges,
-the signal is sent to all processes excluding
-system processes and the process sending the signal.
-If the user is not the super user, the signal is sent to all processes
-with the same uid as the user excluding the process sending the signal.
-No error is returned if any process could be signaled.
-.El
-.Pp
-For compatibility with System V,
-if the process number is negative but not \-1,
-the signal is sent to all processes whose process group ID
-is equal to the absolute value of the process number.
-This is a variant of
-.Xr killpg 3 .
-.Pp
-If
-.Fa sig
-is equal to
-.Dv 0 ,
-then no signal is sent to the process ID or process group ID, but error
-checking is performed.
-This can be used to check if the process ID or process group ID exist.
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn kill
-will fail and no signal will be sent if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-.Fa sig
-is not a valid signal number.
-.It Bq Er EPERM
-The sending process is not the super-user and its effective
-user id does not match the effective user-id of the receiving process.
-When signaling a process group, this error is returned if any members
-of the group could not be signaled.
-.It Bq Er ESRCH
-No process can be found corresponding to that specified by
-.Fa pid ;
-or the process id was given as 0
-but the sending process does not have a process group.
-.El
-.Sh SEE ALSO
-.Xr getpgrp 2 ,
-.Xr getpid 2 ,
-.Xr sigaction 2 ,
-.Xr killpg 3 ,
-.Xr signal 7
-.Sh STANDARDS
-The
-.Fn kill
-function is expected to conform to
-.St -p1003.1-90 .
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
deleted file mode 100644
index 880339e1b..000000000
--- a/lib/libc/sys/kqueue.2
+++ /dev/null
@@ -1,649 +0,0 @@
-.\"	$NetBSD: kqueue.2,v 1.34 2015/03/02 19:24:19 christos Exp $
-.\"
-.\" Copyright (c) 2000 Jonathan Lemon
-.\" All rights reserved.
-.\"
-.\" Copyright (c) 2001, 2002, 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" Portions of this documentation is derived from text contributed by
-.\" Luke Mewburn.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.22 2001/06/27 19:55:57 dd Exp $
-.\"
-.Dd March 2, 2015
-.Dt KQUEUE 2
-.Os
-.Sh NAME
-.Nm kqueue ,
-.Nm kqueue1 ,
-.Nm kevent
-.Nd kernel event notification mechanism
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/event.h
-.In sys/time.h
-.Ft int
-.Fn kqueue "void"
-.Ft int
-.Fn kqueue1 "int flags"
-.Ft int
-.Fn kevent "int kq" "const struct kevent *changelist" "size_t nchanges" "struct kevent *eventlist" "size_t nevents" "const struct timespec *timeout"
-.Fn EV_SET "\*[Am]kev" ident filter flags fflags data udata
-.Sh DESCRIPTION
-.Fn kqueue
-provides a generic method of notifying the user when an event
-happens or a condition holds, based on the results of small
-pieces of kernel code termed filters.
-A kevent is identified by the (ident, filter) pair; there may only
-be one unique kevent per kqueue.
-.Pp
-The filter is executed upon the initial registration of a kevent
-in order to detect whether a preexisting condition is present, and is also
-executed whenever an event is passed to the filter for evaluation.
-If the filter determines that the condition should be reported,
-then the kevent is placed on the kqueue for the user to retrieve.
-.Pp
-The filter is also run when the user attempts to retrieve the kevent
-from the kqueue.
-If the filter indicates that the condition that triggered
-the event no longer holds, the kevent is removed from the kqueue and
-is not returned.
-.Pp
-Multiple events which trigger the filter do not result in multiple
-kevents being placed on the kqueue; instead, the filter will aggregate
-the events into a single struct kevent.
-Calling
-.Fn close
-on a file descriptor will remove any kevents that reference the descriptor.
-.Pp
-.Fn kqueue
-creates a new kernel event queue and returns a descriptor.
-.Pp
-The
-.Fn kqueue1
-also allows to set the following
-.Fa flags
-on the returned file descriptor:
-.Bl -column O_NONBLOCK -offset indent
-.It Dv O_CLOEXEC
-Set the close on exec property.
-.It Dv O_NONBLOCK
-Sets non-blocking I/O.
-.It Dv O_NOSIGPIPE
-Return
-.Er EPIPE
-instead of raising
-.Dv SIGPIPE .
-.El
-The queue is not inherited by a child created with
-.Xr fork 2 .
-.\" However, if
-.\" .Xr rfork 2
-.\" is called without the
-.\" .Dv RFFDG
-.\" flag, then the descriptor table is shared,
-.\" which will allow sharing of the kqueue between two processes.
-.Pp
-.Fn kevent
-is used to register events with the queue, and return any pending
-events to the user.
-.Fa changelist
-is a pointer to an array of
-.Va kevent
-structures, as defined in
-.In sys/event.h .
-All changes contained in the
-.Fa changelist
-are applied before any pending events are read from the queue.
-.Fa nchanges
-gives the size of
-.Fa changelist .
-.Fa eventlist
-is a pointer to an array of kevent structures.
-.Fa nevents
-determines the size of
-.Fa eventlist .
-If
-.Fa timeout
-is a
-.No non- Ns Dv NULL
-pointer, it specifies a maximum interval to wait
-for an event, which will be interpreted as a struct timespec.
-If
-.Fa timeout
-is a
-.Dv NULL
-pointer,
-.Fn kevent
-waits indefinitely.
-To effect a poll, the
-.Fa timeout
-argument should be
-.No non- Ns Dv NULL ,
-pointing to a zero-valued
-.Va timespec
-structure.
-The same array may be used for the
-.Fa changelist
-and
-.Fa eventlist .
-.Pp
-.Fn EV_SET
-is a macro which is provided for ease of initializing a
-kevent structure.
-.Pp
-The
-.Va kevent
-structure is defined as:
-.Bd -literal
-struct kevent {
-	uintptr_t ident;	/* identifier for this event */
-	uint32_t  filter;	/* filter for event */
-	uint32_t  flags;	/* action flags for kqueue */
-	uint32_t  fflags;	/* filter flag value */
-	int64_t   data;		/* filter data value */
-	intptr_t  udata;	/* opaque user data identifier */
-};
-.Ed
-.Pp
-The fields of
-.Fa struct kevent
-are:
-.Bl -tag -width XXXfilter -offset indent
-.It ident
-Value used to identify this event.
-The exact interpretation is determined by the attached filter,
-but often is a file descriptor.
-.It filter
-Identifies the kernel filter used to process this event.
-There are pre-defined system filters (which are described below), and
-other filters may be added by kernel subsystems as necessary.
-.It flags
-Actions to perform on the event.
-.It fflags
-Filter-specific flags.
-.It data
-Filter-specific data value.
-.It udata
-Opaque user-defined value passed through the kernel unchanged.
-.El
-.Pp
-The
-.Va flags
-field can contain the following values:
-.Bl -tag -width XXXEV_ONESHOT -offset indent
-.It EV_ADD
-Adds the event to the kqueue.
-Re-adding an existing event will modify the parameters of the original
-event, and not result in a duplicate entry.
-Adding an event automatically enables it,
-unless overridden by the EV_DISABLE flag.
-.It EV_ENABLE
-Permit
-.Fn kevent
-to return the event if it is triggered.
-.It EV_DISABLE
-Disable the event so
-.Fn kevent
-will not return it.
-The filter itself is not disabled.
-.It EV_DELETE
-Removes the event from the kqueue.
-Events which are attached to file descriptors are automatically deleted
-on the last close of the descriptor.
-.It EV_ONESHOT
-Causes the event to return only the first occurrence of the filter
-being triggered.
-After the user retrieves the event from the kqueue, it is deleted.
-.It EV_CLEAR
-After the event is retrieved by the user, its state is reset.
-This is useful for filters which report state transitions
-instead of the current state.
-Note that some filters may automatically set this flag internally.
-.It EV_EOF
-Filters may set this flag to indicate filter-specific EOF condition.
-.It EV_ERROR
-See
-.Sx RETURN VALUES
-below.
-.El
-.Ss Filters
-Filters are identified by a number.
-There are two types of filters; pre-defined filters which
-are described below, and third-party filters that may be added with
-.Xr kfilter_register 9
-by kernel sub-systems, third-party device drivers, or loadable
-kernel modules.
-.Pp
-As a third-party filter is referenced by a well-known name instead
-of a statically assigned number, two
-.Xr ioctl 2 Ns s
-are supported on the file descriptor returned by
-.Fn kqueue
-to map a filter name to a filter number, and vice-versa (passing
-arguments in a structure described below):
-.Bl -tag -width KFILTER_BYFILTER -offset indent
-.It KFILTER_BYFILTER
-Map
-.Va filter
-to
-.Va name ,
-which is of size
-.Va len .
-.It KFILTER_BYNAME
-Map
-.Va name
-to
-.Va filter .
-.Va len
-is ignored.
-.El
-.Pp
-The following structure is used to pass arguments in and out of the
-.Xr ioctl 2 :
-.Bd -literal -offset indent
-struct kfilter_mapping {
-	char	 *name;		/* name to lookup or return */
-	size_t	 len;		/* length of name */
-	uint32_t filter;	/* filter to lookup or return */
-};
-.Ed
-.Pp
-Arguments may be passed to and from the filter via the
-.Va fflags
-and
-.Va data
-fields in the kevent structure.
-.Pp
-The predefined system filters are:
-.Bl -tag -width EVFILT_SIGNAL
-.It EVFILT_READ
-Takes a descriptor as the identifier, and returns whenever
-there is data available to read.
-The behavior of the filter is slightly different depending
-on the descriptor type.
-.Pp
-.Bl -tag -width 2n
-.It Sockets
-Sockets which have previously been passed to
-.Fn listen
-return when there is an incoming connection pending.
-.Va data
-contains the size of the listen backlog (i.e., the number of
-connections ready to be accepted with
-.Xr accept 2 . )
-.Pp
-Other socket descriptors return when there is data to be read,
-subject to the
-.Dv SO_RCVLOWAT
-value of the socket buffer.
-This may be overridden with a per-filter low water mark at the
-time the filter is added by setting the
-NOTE_LOWAT
-flag in
-.Va fflags ,
-and specifying the new low water mark in
-.Va data .
-On return,
-.Va data
-contains the number of bytes in the socket buffer.
-.Pp
-If the read direction of the socket has shutdown, then the filter
-also sets EV_EOF in
-.Va flags ,
-and returns the socket error (if any) in
-.Va fflags .
-It is possible for EOF to be returned (indicating the connection is gone)
-while there is still data pending in the socket buffer.
-.It Vnodes
-Returns when the file pointer is not at the end of file.
-.Va data
-contains the offset from current position to end of file,
-and may be negative.
-.It "Fifos, Pipes"
-Returns when there is data to read;
-.Va data
-contains the number of bytes available.
-.Pp
-When the last writer disconnects, the filter will set EV_EOF in
-.Va flags .
-This may be cleared by passing in EV_CLEAR, at which point the
-filter will resume waiting for data to become available before
-returning.
-.El
-.It EVFILT_WRITE
-Takes a descriptor as the identifier, and returns whenever
-it is possible to write to the descriptor.
-For sockets, pipes, fifos, and ttys,
-.Va data
-will contain the amount of space remaining in the write buffer.
-The filter will set EV_EOF when the reader disconnects, and for
-the fifo case, this may be cleared by use of EV_CLEAR.
-Note that this filter is not supported for vnodes.
-.Pp
-For sockets, the low water mark and socket error handling is
-identical to the EVFILT_READ case.
-.It EVFILT_AIO
-This is not implemented in
-.Nx .
-.ig
-The sigevent portion of the AIO request is filled in, with
-.Va sigev_notify_kqueue
-containing the descriptor of the kqueue that the event should
-be attached to,
-.Va sigev_value
-containing the udata value, and
-.Va sigev_notify
-set to SIGEV_EVENT.
-When the aio_* function is called, the event will be registered
-with the specified kqueue, and the
-.Va ident
-argument set to the
-.Fa struct aiocb
-returned by the aio_* function.
-The filter returns under the same conditions as aio_error.
-.Pp
-Alternatively, a kevent structure may be initialized, with
-.Va ident
-containing the descriptor of the kqueue, and the
-address of the kevent structure placed in the
-.Va aio_lio_opcode
-field of the AIO request.
-However, this approach will not work on
-architectures with 64-bit pointers, and should be considered deprecated.
-..
-.It EVFILT_VNODE
-Takes a file descriptor as the identifier and the events to watch for in
-.Va fflags ,
-and returns when one or more of the requested events occurs on the descriptor.
-The events to monitor are:
-.Bl -tag -width XXNOTE_RENAME
-.It NOTE_DELETE
-.Fn unlink
-was called on the file referenced by the descriptor.
-.It NOTE_WRITE
-A write occurred on the file referenced by the descriptor.
-.It NOTE_EXTEND
-The file referenced by the descriptor was extended.
-.It NOTE_ATTRIB
-The file referenced by the descriptor had its attributes changed.
-.It NOTE_LINK
-The link count on the file changed.
-.It NOTE_RENAME
-The file referenced by the descriptor was renamed.
-.It NOTE_REVOKE
-Access to the file was revoked via
-.Xr revoke 2
-or the underlying fileystem was unmounted.
-.El
-.Pp
-On return,
-.Va fflags
-contains the events which triggered the filter.
-.It EVFILT_PROC
-Takes the process ID to monitor as the identifier and the events to watch for
-in
-.Va fflags ,
-and returns when the process performs one or more of the requested events.
-If a process can normally see another process, it can attach an event to it.
-The events to monitor are:
-.Bl -tag -width XXNOTE_TRACKERR
-.It NOTE_EXIT
-The process has exited.
-The exit code of the process is stored in
-.Va data .
-.It NOTE_FORK
-The process has called
-.Fn fork .
-.It NOTE_EXEC
-The process has executed a new process via
-.Xr execve 2
-or similar call.
-.It NOTE_TRACK
-Follow a process across
-.Fn fork
-calls.
-The parent process will return with NOTE_TRACK set in the
-.Va fflags
-field, while the child process will return with NOTE_CHILD set in
-.Va fflags
-and the parent PID in
-.Va data .
-.It NOTE_TRACKERR
-This flag is returned if the system was unable to attach an event to
-the child process, usually due to resource limitations.
-.El
-.Pp
-On return,
-.Va fflags
-contains the events which triggered the filter.
-.It EVFILT_SIGNAL
-Takes the signal number to monitor as the identifier and returns
-when the given signal is delivered to the current process.
-This coexists with the
-.Fn signal
-and
-.Fn sigaction
-facilities, and has a lower precedence.
-The filter will record
-all attempts to deliver a signal to a process, even if the signal has
-been marked as SIG_IGN.
-Event notification happens after normal signal delivery processing.
-.Va data
-returns the number of times the signal has occurred since the last call to
-.Fn kevent .
-This filter automatically sets the EV_CLEAR flag internally.
-.It EVFILT_TIMER
-Establishes an arbitrary timer identified by
-.Va ident .
-When adding a timer,
-.Va data
-specifies the timeout period in milliseconds.
-The timer will be periodic unless EV_ONESHOT is specified.
-On return,
-.Va data
-contains the number of times the timeout has expired since the last call to
-.Fn kevent .
-This filter automatically sets the EV_CLEAR flag internally.
-.El
-.Sh RETURN VALUES
-.Fn kqueue
-creates a new kernel event queue and returns a file descriptor.
-If there was an error creating the kernel event queue, a value of \-1 is
-returned and errno set.
-.Pp
-.Fn kevent
-returns the number of events placed in the
-.Fa eventlist ,
-up to the value given by
-.Fa nevents .
-If an error occurs while processing an element of the
-.Fa changelist
-and there is enough room in the
-.Fa eventlist ,
-then the event will be placed in the
-.Fa eventlist
-with
-.Dv EV_ERROR
-set in
-.Va flags
-and the system error in
-.Va data .
-Otherwise,
-.Dv \-1
-will be returned, and
-.Dv errno
-will be set to indicate the error condition.
-If the time limit expires, then
-.Fn kevent
-returns 0.
-.Sh EXAMPLES
-The following example program monitors a file (provided to it as the first
-argument) and prints information about some common events it receives
-notifications for:
-.Bd -literal -offset indent
-#include \*[Lt]sys/types.h\*[Gt]
-#include \*[Lt]sys/event.h\*[Gt]
-#include \*[Lt]sys/time.h\*[Gt]
-#include \*[Lt]stdio.h\*[Gt]
-#include \*[Lt]unistd.h\*[Gt]
-#include \*[Lt]stdlib.h\*[Gt]
-#include \*[Lt]fcntl.h\*[Gt]
-#include \*[Lt]err.h\*[Gt]
-
-int
-main(int argc, char *argv[])
-{
-        int fd, kq, nev;
-        struct kevent ev;
-        static const struct timespec tout = { 1, 0 };
-
-        if ((fd = open(argv[1], O_RDONLY)) == -1)
-                err(1, "Cannot open `%s'", argv[1]);
-
-        if ((kq = kqueue()) == -1)
-                err(1, "Cannot create kqueue");
-
-        EV_SET(\*[Am]ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
-            NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_LINK|
-            NOTE_RENAME|NOTE_REVOKE, 0, 0);
-        if (kevent(kq, \*[Am]ev, 1, NULL, 0, \*[Am]tout) == -1)
-                err(1, "kevent");
-        for (;;) {
-                nev = kevent(kq, NULL, 0, \*[Am]ev, 1, \*[Am]tout);
-                if (nev == -1)
-                        err(1, "kevent");
-                if (nev == 0)
-                        continue;
-                if (ev.fflags \*[Am] NOTE_DELETE) {
-                        printf("deleted ");
-                        ev.fflags \*[Am]= ~NOTE_DELETE;
-                }
-                if (ev.fflags \*[Am] NOTE_WRITE) {
-                        printf("written ");
-                        ev.fflags \*[Am]= ~NOTE_WRITE;
-                }
-                if (ev.fflags \*[Am] NOTE_EXTEND) {
-                        printf("extended ");
-                        ev.fflags \*[Am]= ~NOTE_EXTEND;
-                }
-                if (ev.fflags \*[Am] NOTE_ATTRIB) {
-                        printf("chmod/chown/utimes ");
-                        ev.fflags \*[Am]= ~NOTE_ATTRIB;
-                }
-                if (ev.fflags \*[Am] NOTE_LINK) {
-                        printf("hardlinked ");
-                        ev.fflags \*[Am]= ~NOTE_LINK;
-                }
-                if (ev.fflags \*[Am] NOTE_RENAME) {
-                        printf("renamed ");
-                        ev.fflags \*[Am]= ~NOTE_RENAME;
-                }
-                if (ev.fflags \*[Am] NOTE_REVOKE) {
-                        printf("revoked ");
-                        ev.fflags \*[Am]= ~NOTE_REVOKE;
-                }
-                printf("\\n");
-                if (ev.fflags)
-                        warnx("unknown event 0x%x\\n", ev.fflags);
-        }
-}
-.Ed
-.Sh ERRORS
-The
-.Fn kqueue
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EMFILE
-The per-process descriptor table is full.
-.It Bq Er ENFILE
-The system file table is full.
-.It Bq Er ENOMEM
-The kernel failed to allocate enough memory for the kernel queue.
-.El
-.Pp
-The
-.Fn kevent
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The process does not have permission to register a filter.
-.It Bq Er EBADF
-The specified descriptor is invalid.
-.It Bq Er EFAULT
-There was an error reading or writing the
-.Va kevent
-structure.
-.It Bq Er EINTR
-A signal was delivered before the timeout expired and before any
-events were placed on the kqueue for return.
-.It Bq Er EINVAL
-The specified time limit or filter is invalid.
-.It Bq Er ENOENT
-The event could not be found to be modified or deleted.
-.It Bq Er ENOMEM
-No memory was available to register the event.
-.It Bq Er EOPNOTSUPP
-This type of file descriptor is not supported for
-.Fn kevent
-operations.
-.It Bq Er ESRCH
-The specified process to attach to does not exist.
-.El
-.Sh SEE ALSO
-.\" .Xr aio_error 2 ,
-.\" .Xr aio_read 2 ,
-.\" .Xr aio_return 2 ,
-.Xr ioctl 2 ,
-.Xr poll 2 ,
-.Xr read 2 ,
-.Xr select 2 ,
-.Xr sigaction 2 ,
-.Xr write 2 ,
-.Xr signal 3 ,
-.Xr kfilter_register 9 ,
-.Xr knote 9
-.Rs
-.%A Jonathan Lemon
-.%T "Kqueue: A Generic and Scalable Event Notification Facility"
-.%I USENIX Association
-.%B Proceedings of the FREENIX Track: 2001 USENIX Annual Technical Conference
-.%D June 25-30, 2001
-.%U http://www.usenix.org/event/usenix01/freenix01/full_papers/lemon/lemon.pdf
-.Re
-.Sh HISTORY
-The
-.Fn kqueue
-and
-.Fn kevent
-functions first appeared in
-.Fx 4.1 ,
-and then in
-.Nx 2.0 .
-The
-.Fn kqueue1
-function first appeared in
-.Nx 6.0 .
diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2
deleted file mode 100644
index b44815ba5..000000000
--- a/lib/libc/sys/ktrace.2
+++ /dev/null
@@ -1,177 +0,0 @@
-.\"	$NetBSD: ktrace.2,v 1.18 2014/11/11 08:10:02 njoly Exp $
-.\"
-.\" 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.
-.\"
-.\"     @(#)ktrace.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt KTRACE 2
-.Os
-.Sh NAME
-.Nm ktrace
-.Nd process tracing
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/uio.h
-.In sys/ktrace.h
-.Ft int
-.Fn ktrace "const char *tracefile" "int ops" "int trpoints" "pid_t pid"
-.Ft int
-.Fn fktrace "int fd" "int ops" "int trpoints" "pid_t pid"
-.Sh DESCRIPTION
-The
-.Fn ktrace
-function enables or disables tracing of one or more processes.
-Users may only trace their own processes.
-Only the super-user can trace setuid or setgid programs.
-.Pp
-The
-.Ar tracefile
-gives the pathname of the file to be used for tracing.
-The file must exist and be writable by the calling process.
-All trace records are always appended to the file,
-so the file must be truncated to zero length to discard
-previous trace data.
-If tracing points are being disabled (see KTROP_CLEAR below),
-.Ar tracefile
-may be NULL.
-If using
-.Fn fktrace
-then instead of passing a filename as
-.Ar tracefile ,
-a file descriptor is passed as
-.Ar fd
-and behaviour is otherwise the same.
-.Pp
-The
-.Nm ops
-parameter specifies the requested ktrace operation.
-The defined operations are:
-.Bl -column KTRFLAG_DESCENDXXX -offset indent
-.It KTROP_SET	Enable trace points specified in Ar trpoints .
-.It KTROP_CLEAR	Disable trace points specified in Ar trpoints .
-.It KTROP_CLEARFILE	Stop all tracing.
-.It KTRFLAG_DESCEND	The tracing change should apply to the
-specified process and all its current children.
-.El
-.Pp
-The
-.Nm trpoints
-parameter specifies the trace points of interest.
-The defined trace points are:
-.Bl -column KTRFAC_SYSCALLXXX -offset indent
-.It KTRFAC_SYSCALL	Trace system calls.
-.It KTRFAC_SYSRET	Trace return values from system calls.
-.It KTRFAC_NAMEI	Trace name lookup operations.
-.It KTRFAC_GENIO	Trace all I/O (note that this option can
-generate much output).
-.It KTRFAC_PSIG	Trace posted signals.
-.It KTRFAC_CSW	Trace context switch points.
-.It KTRFAC_EMUL	Trace emulation changes.
-.It KTRFAC_INHERIT	Inherit tracing to future children.
-.El
-.Pp
-Each tracing event outputs a record composed of a generic header
-followed by a trace point specific structure.
-The generic header is:
-.Bd -literal
-struct ktr_header {
-	int	ktr_len;		/* length of buf */
-	short	ktr_type;		/* trace record type */
-	pid_t	ktr_pid;		/* process id */
-	char	ktr_comm[MAXCOMLEN+1];	/* command name */
-	struct	timeval ktr_time;	/* timestamp */
-	caddr_t	ktr_buf;
-};
-.Ed
-.Pp
-The
-.Nm ktr_len
-field specifies the length of the
-.Nm ktr_type
-data that follows this header.
-The
-.Nm ktr_pid
-and
-.Nm ktr_comm
-fields specify the process and command generating the record.
-The
-.Nm ktr_time
-field gives the time (with microsecond resolution)
-that the record was generated.
-The
-.Nm ktr_buf
-is an internal kernel pointer and is not useful.
-.Pp
-The generic header is followed by
-.Nm ktr_len
-bytes of a
-.Nm ktr_type
-record.
-The type specific records are defined in the
-.Pa \*[Lt]sys/ktrace.h\*[Gt]
-include file.
-.Sh RETURN VALUES
-On successful completion a value of 0 is returned.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to show the error.
-.Sh ERRORS
-.Fn ktrace
-will fail if:
-.Bl -tag -width ENAMETOOLONGAA
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er EINVAL
-The pathname contains a character with the high-order bit set.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters,
-or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named tracefile does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr kdump 1 ,
-.Xr ktrace 1
-.Sh HISTORY
-A
-.Nm ktrace
-function call first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/sys/lfs_bmapv.2 b/lib/libc/sys/lfs_bmapv.2
deleted file mode 100644
index 70bfdd3e1..000000000
--- a/lib/libc/sys/lfs_bmapv.2
+++ /dev/null
@@ -1,105 +0,0 @@
-.\"	$NetBSD: lfs_bmapv.2,v 1.10 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Konrad Schroder.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 23, 2000
-.Dt LFS_BMAPV 2
-.Os
-.Sh NAME
-.Nm lfs_bmapv
-.Nd retrieve disk addresses for arrays of blocks
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In ufs/lfs/lfs.h
-.Ft int
-.Fn lfs_bmapv "fsid_t *fsidp" "BLOCK_INFO *blkiov" "int blkcnt"
-.Sh DESCRIPTION
-.Fn lfs_bmapv
-fills in the bi_daddr field for every block listed in the block array
-.Fa blkiov
-with the disk address corresponding to the logical block
-.Fa bi_lbn
-of the file with inode
-.Fa bi_inode .
-If
-.Fa bi_lbn
-is LFS_UNUSED_LBN, the disk location of the inode block containing the
-file's inode will be returned in
-.Fa bi_daddr
-instead.
-.Pp
-The
-.Fa fsidp
-argument contains the id of the file system to which the inodes and
-blocks belong.
-The
-.Fa blkiov
-argument is an array of BLOCK_INFO structures (see below).
-The
-.Fa blkcnt
-argument determines the size of the
-.Fa blkiov
-array.
-.Bd -literal
-typedef struct block_info {
-    ino_t       bi_inode;     /* inode # */
-    ufs_daddr_t bi_lbn;       /* logical block w/in file */
-    ufs_daddr_t bi_daddr;     /* disk address of block */
-    time_t      bi_segcreate; /* origin segment create time */
-    int         bi_version;   /* file version number */
-    void       *bi_bp;        /* data buffer */
-    int         bi_size;      /* size of the block (if fragment) */
-} BLOCK_INFO;
-.Ed
-.Sh RETURN VALUES
-.Fn lfs_bmapv
-returns 0 on success, or \-1 on error.
-.Sh ERRORS
-An error return from
-.Fn lfs_bmapv
-indicates:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-.Fa fsidp
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-.Fa *fsidp
-does not specify a valid file system.
-.El
-.Sh SEE ALSO
-.Xr lfs_markv 2 ,
-.Xr lfs_segclean 2 ,
-.Xr lfs_segwait 2 ,
-.Xr lfs_cleanerd 8
-.Sh HISTORY
-The
-.Fn lfs_bmapv
-function call appeared in
-.Bx 4.4 .
diff --git a/lib/libc/sys/lfs_markv.2 b/lib/libc/sys/lfs_markv.2
deleted file mode 100644
index 24854a8b7..000000000
--- a/lib/libc/sys/lfs_markv.2
+++ /dev/null
@@ -1,129 +0,0 @@
-.\"	$NetBSD: lfs_markv.2,v 1.11 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Konrad Schroder.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 23, 2000
-.Dt LFS_MARKV 2
-.Os
-.Sh NAME
-.Nm lfs_markv
-.Nd rewrite disk blocks to new disk locations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In ufs/lfs/lfs.h
-.Ft int
-.Fn lfs_markv "fsid_t *fsidp" "BLOCK_INFO *blkiov" "int blkcnt"
-.Sh DESCRIPTION
-.Fn lfs_markv
-rewrites the blocks specified in
-.Fa blkiov
-to new disk locations, for the purposes of grouping them next to one
-another, or to move them out of a segment to clean it.
-All fields of the BLOCK_INFO structure must be filled in, except for
-.Fa bi_segcreate .
-If
-.Fa bi_daddr
-is not the correct current address for logical block
-.Fa bi_lbn
-of the file with inode number
-.Fa bi_inode ,
-or if the file's version number does not match
-.Fa bi_version ,
-the block will not be written to disk, but no error will be returned.
-.Pp
-The
-.Fa fsidp
-argument contains the id of the filesystem to which the inodes and
-blocks belong.
-The
-.Fa bi_bp
-field contains
-.Fa bi_size
-bytes of data to be written into the appropriate block.
-If
-.Fa bi_lbn
-is specified as LFS_UNUSED_LBN, the inode itself will be rewritten.
-.Pp
-The
-.Fa blkiov
-argument is an array of BLOCK_INFO structures (see below).
-The
-.Fa blkcnt
-argument determines the size of the
-.Fa blkiov
-array.
-.Bd -literal
-typedef struct block_info {
-    ino_t       bi_inode;     /* inode # */
-    ufs_daddr_t bi_lbn;       /* logical block w/in file */
-    ufs_daddr_t bi_daddr;     /* disk address of block */
-    time_t      bi_segcreate; /* origin segment create time */
-    int         bi_version;   /* file version number */
-    void       *bi_bp;        /* data buffer */
-    int         bi_size;      /* size of the block (if fragment) */
-} BLOCK_INFO;
-.Ed
-.Sh RETURN VALUES
-.Fn lfs_markv
-returns 0 on success, or \-1 on error.
-.Sh ERRORS
-An error return from
-.Fn lfs_markv
-indicates:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-.Fa fsidp
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-.Fa *fsidp
-does not specify a valid filesystem.
-.It Bq Er EBUSY
-One or more of the inodes whose blocks were to be written was locked,
-and its blocks were not rewritten.
-.El
-.Sh SEE ALSO
-.Xr lfs_segclean 2 ,
-.Xr lfs_segwait 2 ,
-.Xr lfs_cleanerd 8
-.Sh HISTORY
-The
-.Fn lfs_markv
-function call appeared in
-.Bx 4.4 .
-.Sh BUGS
-The functionality of
-.Fn lfs_markv
-does not really belong in user space.
-Among other things it could be used to work around the
-SF_IMMUTABLE
-and
-SF_APPEND
-file flags (see
-.Xr chflags 2 ) .
diff --git a/lib/libc/sys/lfs_segclean.2 b/lib/libc/sys/lfs_segclean.2
deleted file mode 100644
index 4864c2e69..000000000
--- a/lib/libc/sys/lfs_segclean.2
+++ /dev/null
@@ -1,76 +0,0 @@
-.\"	$NetBSD: lfs_segclean.2,v 1.8 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Konrad Schroder.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 23, 2000
-.Dt LFS_SEGCLEAN 2
-.Os
-.Sh NAME
-.Nm lfs_segclean
-.Nd mark a segment clean
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.Ft int
-.Fn lfs_segclean "fsid_t *fsidp" "u_long segment"
-.Sh DESCRIPTION
-.Fn lfs_segclean
-marks segment number
-.Fa segment
-in LFS filesystem
-.Fa *fsidp
-"clean" or available for writing.
-.Sh RETURN VALUES
-.Fn lfs_segclean
-returns 0 on success, or \-1 on error.
-.Sh ERRORS
-An error return from
-.Fn lfs_segclean
-indicates:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-.Fa fsidp
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-.Fa *fsidp
-does not specify a valid filesystem.
-.It Bq Er EBUSY
-.Fa segment
-is marked SU_ACTIVE, meaning that it does not yet belong to a valid checkpoint.
-.El
-.Sh SEE ALSO
-.Xr lfs_bmapv 2 ,
-.Xr lfs_markv 2 ,
-.Xr lfs_segwait 2 ,
-.Xr lfs_cleanerd 8
-.Sh HISTORY
-The
-.Fn lfs_segclean
-function call appeared in
-.Bx 4.4 .
diff --git a/lib/libc/sys/lfs_segwait.2 b/lib/libc/sys/lfs_segwait.2
deleted file mode 100644
index e476d121c..000000000
--- a/lib/libc/sys/lfs_segwait.2
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"	$NetBSD: lfs_segwait.2,v 1.8 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Konrad Schroder.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 23, 2000
-.Dt LFS_SEGWAIT 2
-.Os
-.Sh NAME
-.Nm lfs_segwait
-.Nd wait until a segment is written
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.Ft int
-.Fn lfs_segwait "fsid_t *fsidp" "struct timeval *tv"
-.Sh DESCRIPTION
-.Fn lfs_segwait
-blocks until a new segment is acquired for writing by the filesystem
-specified by
-.Fa *fsidp
-or if
-.Fa *fsidp
-is \-1, until a segment is acquired for writing by any LFS filesystem.
-.Pp
-If
-.Fa timeout
-is non-zero,
-.Fn lfs_segwait
-will return after
-.Fa timeout
-milliseconds regardless of whether a new segment has been designated for
-writing or not.
-.Sh RETURN VALUES
-.Fn lfs_segwait
-returns 0 if a new segment was acquired; 1 if it timed out; or \-1 on error.
-.Sh ERRORS
-An error return from
-.Fn lfs_segwait
-indicates:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-.Fa fsidp
-points outside the process's allocated address space.
-.It Bq Er EINTR
-A signal was delivered before the time limit expired and
-before a new segment was designated for writing.
-.It Bq Er EINVAL
-The specified time limit is negative.
-.El
-.Sh SEE ALSO
-.Xr lfs_bmapv 2 ,
-.Xr lfs_markv 2 ,
-.Xr lfs_segclean 2 ,
-.Xr lfs_cleanerd 8
-.Sh HISTORY
-The
-.Fn lfs_segwait
-function call appeared in
-.Bx 4.4 .
diff --git a/lib/libc/sys/link.2 b/lib/libc/sys/link.2
deleted file mode 100644
index a66a805b1..000000000
--- a/lib/libc/sys/link.2
+++ /dev/null
@@ -1,242 +0,0 @@
-.\"	$NetBSD: link.2,v 1.32 2013/07/28 18:40:40 njoly Exp $
-.\"
-.\" Copyright (c) 1980, 1991, 1993, 2011
-.\"	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.
-.\"
-.\"     @(#)link.2	8.3 (Berkeley) 1/12/94
-.\"
-.Dd July 28, 2013
-.Dt LINK 2
-.Os
-.Sh NAME
-.Nm link
-.Nd make a hard file link
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn link "const char *name1" "const char *name2"
-.In fcntl.h
-.Ft int
-.Fn linkat "int fd1" "const char *name1" "int fd2" "const char *name2" "int flags"
-.Sh DESCRIPTION
-The
-.Fn link
-function call
-atomically creates the specified directory entry (hard link)
-.Fa name2
-with the attributes of the underlying object pointed at by
-.Fa name1 .
-If the link is successful: the link count of the underlying object
-is incremented;
-.Fa name1
-and
-.Fa name2
-share equal access and rights
-to the
-underlying object.
-.Pp
-If
-.Fa name1
-is removed, the file
-.Fa name2
-is not deleted and the link count of the
-underlying object is
-decremented.
-.Pp
-.Fa name1
-must exist for the hard link to
-succeed and
-both
-.Fa name1
-and
-.Fa name2
-must be in the same file system.
-.Fa name1
-may not be a directory unless the caller is the super-user
-and the file system containing it supports linking to directories.
-.Pp
-.Fn linkat
-works the same way as
-.Fn link
-except if
-.Fa name1
-(resp.
-.Fa name2 )
-is relative.
-In that case, it is looked up from a directory whose file
-descriptor was passed as
-.Fa fd1
-(resp.
-.Fa fd2 ) .
-Search permission is required on the directories named by
-.Fa fd1
-and
-.Fa fd2 .
-.\"    (These alternatives await a decision about the semantics of O_SEARCH)
-.\" Search permission is required on the directories named by
-.\" .Fa fd1
-.\" and
-.\" .Fa fd2
-.\" unless they were opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" The directories named by
-.\" .Fa fd1
-.\" and
-.\" .Fa fd2
-.\" must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.Fa fd1
-or
-.Fa fd2
-can be set to
-.Dv AT_FDCWD
-in order to specify the current directory.
-.Pp
-When operating on a symlink,
-.Fn link
-resolves the symlink and creates a hard link on the target.
-.Fn linkat
-will do the same if
-.Dv AT_SYMLINK_FOLLOW
-is set in
-.Fa flags ,
-but it will link on the symlink itself if the flag is clear.
-.Sh RETURN VALUES
-.Rv -std link linkat
-.Sh ERRORS
-.Fn link
-and
-.Fn linkat
-will fail and no link will be created if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-A component of either path prefix denies search permission, or
-the requested link requires writing in a directory with a mode
-that denies write permission.
-.It Bq Er EDQUOT
-The directory in which the entry for the new link
-is being placed cannot be extended because the
-user's quota of disk blocks on the file system
-containing the directory has been exhausted.
-.It Bq Er EEXIST
-The link named by
-.Fa name2
-does exist.
-.It Bq Er EFAULT
-One of the pathnames specified
-is outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to
-the file system to make the directory entry.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating one of the pathnames.
-.It Bq Er EMLINK
-The link count of the file named by
-.Fa name1
-would exceed
-.Brq Dv LINK_MAX .
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-A component of either path prefix does not exist, or the file named
-by
-.Fa name1
-does not exist.
-.It Bq Er ENOSPC
-The directory in which the entry for the new link is being placed
-cannot be extended because there is no space left on the file
-system containing the directory.
-.It Bq Er ENOTDIR
-A component of either path prefix is not a directory.
-.It Bq Er EOPNOTSUPP
-The file system containing the file named by
-.Fa name1
-does not support links.
-.It Bq Er EPERM
-The file named by
-.Fa name1
-is a directory and the effective
-user ID is not super-user,
-or the file system containing the file does not permit the use of
-.Fn link
-on a directory.
-.It Bq Er EROFS
-The requested link requires writing in a directory on a read-only file
-system.
-.It Bq Er EXDEV
-The link named by
-.Fa name2
-and the file named by
-.Fa name1
-are on different file systems.
-.El
-.Pp
-In addition,
-.Fn linkat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa name1
-or
-.Fa name2
-does not specify an absolute path and
-.Fa fd1
-or
-.Fa fd2 ,
-respectively, is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for reading or searching.
-.It Bq Er ENOTDIR
-.Fa name1
-or
-.Fa name2
-is not an absolute path and
-.Fa fd1
-or
-.Fa fd2 ,
-respectively, is a file descriptor associated with a non-directory file.
-.El
-.Sh SEE ALSO
-.Xr symlink 2 ,
-.Xr unlink 2
-.Sh STANDARDS
-The
-.Fn link
-function conforms to
-.St -p1003.1-90 .
-.Fn linkat
-conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc/sys/listen.2 b/lib/libc/sys/listen.2
deleted file mode 100644
index 3fe0ea64c..000000000
--- a/lib/libc/sys/listen.2
+++ /dev/null
@@ -1,101 +0,0 @@
-.\"	$NetBSD: listen.2,v 1.16 2004/05/13 10:20:58 wiz Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)listen.2	8.2 (Berkeley) 12/11/93
-.\"
-.Dd December 11, 1993
-.Dt LISTEN 2
-.Os
-.Sh NAME
-.Nm listen
-.Nd listen for connections on a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft int
-.Fn listen "int s" "int backlog"
-.Sh DESCRIPTION
-To accept connections, a socket
-is first created with
-.Xr socket 2 ,
-a willingness to accept incoming connections and
-a queue limit for incoming connections are specified with
-.Fn listen ,
-and then the connections are
-accepted with
-.Xr accept 2 .
-The
-.Fn listen
-call applies only to sockets of type
-.Dv SOCK_STREAM
-or
-.Dv SOCK_SEQPACKET .
-.Pp
-The
-.Fa backlog
-parameter defines the maximum length the queue of
-pending connections may grow to.
-If a connection
-request arrives with the queue full the client may
-receive an error with an indication of
-.Er ECONNREFUSED ,
-or, if the underlying protocol supports retransmission,
-the request may be ignored so that retries may succeed.
-.Sh RETURN VALUES
-A 0 return value indicates success; \-1 indicates an error.
-.Sh ERRORS
-.Fn listen
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.It Bq Er EOPNOTSUPP
-The socket is not of a type that supports the operation
-.Fn listen .
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr connect 2 ,
-.Xr socket 2
-.Sh HISTORY
-The
-.Fn listen
-function call appeared in
-.Bx 4.2 .
-.Sh BUGS
-The
-.Fa backlog
-is currently limited (silently) to 128.
diff --git a/lib/libc/sys/lseek.2 b/lib/libc/sys/lseek.2
deleted file mode 100644
index bb5866658..000000000
--- a/lib/libc/sys/lseek.2
+++ /dev/null
@@ -1,148 +0,0 @@
-.\"	$NetBSD: lseek.2,v 1.24 2010/04/05 07:53:47 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)lseek.2	8.3 (Berkeley) 4/19/94
-.\"
-.Dd April 3, 2010
-.Dt LSEEK 2
-.Os
-.Sh NAME
-.Nm lseek ,
-.Nm seek
-.Nd reposition read/write file offset
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft off_t
-.Fn lseek "int fildes" "off_t offset" "int whence"
-.Sh DESCRIPTION
-The
-.Fn lseek
-function repositions the offset of the file descriptor
-.Fa fildes
-to the
-argument
-.Fa offset
-according to the directive
-.Fa whence .
-The argument
-.Fa fildes
-must be an open
-file descriptor.
-.Fn lseek
-repositions the file pointer
-.Fa fildes
-as follows:
-.Bl -item -offset indent
-.It
-If
-.Fa whence
-is
-.Dv SEEK_SET ,
-the offset is set to
-.Fa offset
-bytes.
-.It
-If
-.Fa whence
-is
-.Dv SEEK_CUR ,
-the offset is set to its current location plus
-.Fa offset
-bytes.
-.It
-If
-.Fa whence
-is
-.Dv SEEK_END ,
-the offset is set to the size of the
-file plus
-.Fa offset
-bytes.
-.El
-.Pp
-The
-.Fn lseek
-function allows the file offset to be set beyond the end
-of the existing end-of-file of the file.
-If data is later written
-at this point, subsequent reads of the data in the gap return
-bytes of zeros (until data is actually written into the gap).
-.Pp
-Some devices are incapable of seeking.
-The value of the pointer associated with such a device is undefined.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn lseek
-returns the resulting offset location as measured in bytes from the
-beginning of the file.
-Otherwise,
-a value of \-1 is returned and
-.Va errno
-is set to indicate
-the error.
-.Sh ERRORS
-.Fn lseek
-will fail and the file pointer will remain unchanged if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa fildes
-is not an open file descriptor.
-.It Bq Er EINVAL
-.Fa whence
-is not a proper value, or the resulting file offset would be invalid.
-.It Bq Er ESPIPE
-.Fa fildes
-is associated with a pipe, socket, or FIFO.
-.El
-.Sh SEE ALSO
-.Xr dup 2 ,
-.Xr open 2
-.Sh STANDARDS
-The
-.Fn lseek
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-A
-.Fn seek
-function appeared in
-.At v2 ,
-later renamed into
-.Fn lseek
-for
-.Dq long seek
-due to a larger
-.Fa offset
-argument type.
-.Sh BUGS
-This document's use of
-.Fa whence
-is incorrect English, but is maintained for historical reasons.
diff --git a/lib/libc/sys/lseek.c b/lib/libc/sys/lseek.c
deleted file mode 100644
index 0b97e45d1..000000000
--- a/lib/libc/sys/lseek.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: lseek.c,v 1.11 2012/03/20 16:26:12 matt Exp $	*/
-
-/*
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)lseek.c	8.1 (Berkeley) 6/17/93";
-#else
-__RCSID("$NetBSD: lseek.c,v 1.11 2012/03/20 16:26:12 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(lseek,_lseek)
-#endif
-
-off_t __lseek(int, int, off_t, int);
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-off_t
-lseek(int fd, off_t offset, int whence)
-{
-
-	return __lseek(fd, 0, offset, whence);
-}
diff --git a/lib/libc/sys/madvise.2 b/lib/libc/sys/madvise.2
deleted file mode 100644
index 183b41a1f..000000000
--- a/lib/libc/sys/madvise.2
+++ /dev/null
@@ -1,133 +0,0 @@
-.\"	$NetBSD: madvise.2,v 1.28 2014/07/19 19:26:47 dholland Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)madvise.2	8.1 (Berkeley) 6/9/93
-.\"
-.Dd March 29, 2011
-.Dt MADVISE 2
-.Os
-.Sh NAME
-.Nm madvise
-.Nd give advice about use of memory
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn madvise "void *addr" "size_t len" "int behav"
-.Ft int
-.Fn posix_madvise "void *addr" "size_t len" "int advice"
-.Sh DESCRIPTION
-The
-.Fn madvise
-system call
-allows a process that has knowledge of its memory behavior
-to describe it to the system.
-The
-.Fn posix_madvise
-interface is identical and is provided for standards conformance.
-.Pp
-The known behaviors are:
-.Bl -tag -width MADV_SEQUENTIAL
-.It Dv MADV_NORMAL
-Tells the system to revert to the default paging
-behavior.
-.It Dv MADV_RANDOM
-Is a hint that pages will be accessed randomly, and prefetching
-is likely not advantageous.
-.It Dv MADV_SEQUENTIAL
-Is a hint that pages will be accessed sequentially, from the lower address to
-higher address.
-It might cause the VM system to depress the priority of
-pages immediately preceding a given page when it is faulted in.
-.It Dv MADV_WILLNEED
-Is a hint that pages will be accessed in the near future.
-It might cause the VM system to make pages that are in a given virtual
-address range to temporarily have higher priority, and if they are in
-memory, decrease the likelihood of them being freed.
-It might immediately map the pages that are already in memory into the
-process, thereby eliminating unnecessary overhead of going through
-the entire process of faulting the pages in.
-It might or might not fault pages in from backing store.
-.It Dv MADV_DONTNEED
-Is a hint that pages will not be accessed in the near future.
-It might allow the VM system to decrease the in-memory priority
-of pages in the specified range.
-.It Dv MADV_FREE
-Gives the VM system the freedom to free pages,
-and tells the system that information in the specified page range
-is no longer important.
-.El
-.Pp
-Portable programs that call the
-.Fn posix_madvise
-interface should use the aliases
-.Dv POSIX_MADV_NORMAL , POSIX_MADV_SEQUENTIAL ,
-.Dv POSIX_MADV_RANDOM , POSIX_MADV_WILLNEED ,
-and
-.Dv POSIX_MADV_DONTNEED
-rather than the flags described above.
-.Sh RETURN VALUES
-Upon successful completion,
-a value of 0 is returned.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn madvise
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Invalid parameters were provided.
-.El
-.Sh SEE ALSO
-.Xr mincore 2 ,
-.Xr mprotect 2 ,
-.Xr msync 2 ,
-.Xr munmap 2 ,
-.Xr posix_fadvise 2
-.Sh STANDARDS
-The
-.Fn posix_madvise
-system call is expected to conform to the
-.St -p1003.1-2001
-standard.
-.Sh HISTORY
-The
-.Nm madvise
-system call first appeared in
-.Bx 4.4 ,
-but until
-.Nx 1.5
-it did not perform any of the requests on, or change any behavior of the
-address range given.
-The
-.Fn posix_madvise
-call was added in
-.Nx 5.0 .
diff --git a/lib/libc/sys/makelintstub b/lib/libc/sys/makelintstub
deleted file mode 100755
index 84b02d0e8..000000000
--- a/lib/libc/sys/makelintstub
+++ /dev/null
@@ -1,244 +0,0 @@
-#!/bin/sh -
-# $NetBSD: makelintstub,v 1.25 2012/02/12 01:46:05 martin Exp $
-#
-# Copyright (c) 1996, 1997 Christopher G. Demetriou
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#          This product includes software developed for the
-#          NetBSD Project.  See http://www.NetBSD.org/ for
-#          information about NetBSD.
-# 4. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
-
-usage()
-{
-
-cat << _EOF 1>&2
-Usage: $PROG [-n|-p] [-o filename] [-s syscall.h] object ...
-	-n		Create SYSCALL_NOERROR.
-	-p		Create PSEUDO_NOERROR.
-			(also removes leading "_" on syscall name).
-	-o filename	Output to filename.
-	-s syscall.h	Header to #include instead of <sys/syscall.h>.
-
-	The CPP environment variable must be set
-	to the path to the C preprocessor.
-_EOF
-	exit 1
-}
-
-header()
-{
-
-	cat <<- __EOF__
-	/*
-	 * THIS IS AN AUTOMATICALLY GENERATED FILE.  DO NOT EDIT.
-	 */
-
-	#include <sys/param.h>
-	#include <sys/aio.h>
-	#include <sys/time.h>
-	#include <sys/mount.h>
-	#include <sys/stat.h>
-	#include <ufs/ufs/dinode.h>
-	#include <ufs/lfs/lfs.h>
-	#include <sys/resource.h>
-	#include <sys/poll.h>
-	#include <sys/uio.h>
-	#include <sys/ipc.h>
-	#include <sys/lwpctl.h>
-	#include <sys/mqueue.h>
-	#include <sys/msg.h>
-	#include <sys/sem.h>
-	#include <sys/shm.h>
-	#include <sys/spawn.h>
-	#include <sys/sched.h>
-	#include <sys/timex.h>
-	#include <sys/socket.h>
-	#include <sys/event.h>
-	#include <sys/uuid.h>
-	#include <sys/quotactl.h>
-	#ifdef __STDC__
-	#include <stdarg.h>
-	#else
-	#include <varargs.h>
-	#endif
-
-	__EOF__
-}
-
-syscall_stub()
-{
-
-	syscalldump="$1"
-	syscallname="$2"
-	funcname="$3"
-
-    	arglist="$(
-    	sed -e 'ta
-		:a
-		s,^/\* syscall: \"'"$syscallname"'\" ,,
-	        tb
-		d
-		:b
-		s, \*/$,,' $syscalldump
-	)"
-
-	eval set -f -- "$arglist"
-
-	if [ $# -lt 3 ]; then
-		echo syscall $syscallname not found! 1>&2
-		exit 1
-	fi
-
-	shift			# kill "ret:"
-	returntype=$1; shift
-	shift			# kill "args:"
-
-	cat <<- __EOF__
-	/*ARGSUSED*/
-	$returntype
-	__EOF__
-
-	# do ANSI C function header
-	echo	"#ifdef __STDC__"
-
-	echo "$funcname("
-	first=true; i=1
-	for arg; do
-		if $first; then
-			first=false
-		else
-			echo ", "
-		fi
-		case "$arg" in
-		"...") echo "...";;
-		*) echo "$arg arg$i"; i=$(($i + 1));;
-		esac
-	done
-	if $first; then
-		echo "void"
-	fi
-	echo	")"
-
-	# do K&R C function header
-	echo	"#else"
-
-	echo "$funcname("
-	first=true; i=1
-	for arg; do
-		if $first; then
-			first=false
-		else
-			echo ", "
-		fi
-		case "$arg" in
-		"...") echo "va_alist";;
-		*) echo "arg$i"; i=$(($i + 1));;
-		esac
-	done
-	echo	")"
-	i=1
-	for arg; do
-		case "$arg" in
-		"...") echo "	va_dcl";;
-		*) echo "	$arg arg$i;"; i=$(($i + 1));;
-		esac
-	done
-
-	# do function body
-	echo	"#endif"
-
-	echo	"{"
-	if [ "$returntype" != "void" ]; then
-		echo "        return (($returntype)0);"
-	fi
-	echo	"}"
-}
-
-trailer()
-{
-
-	cat <<- __EOF__
-	/* END */
-	__EOF__
-}
-
-
-pflag=false
-nflag=false
-oarg=""
-syscallhdr=/usr/include/sys/syscall.h
-syscalldump=/tmp/makelintstub.$$
-PROG="$(basename "$0")"
-
-if [ -z "${CPP}" ]; then
-	usage
-fi
-
-while getopts no:ps: i
-do
-	case "$i" in
-	n)	nflag=true;;
-	o)	oarg=$OPTARG;;
-	p)	pflag=true;;
-	s)	syscallhdr=$OPTARG;;
-	*)	usage;;
-	esac
-done
-
-shift $(expr $OPTIND - 1)
-
-if $pflag && $nflag
-then
-	echo "$PROG: -n flag and -p flag may not be used together" 1>&2
-	usage
-fi
-
-if [ -n "$oarg" ]; then
-	exec > $oarg
-fi
-
-trap "rm -f $syscalldump" 0 1 2 3 15
-
-header
-
-echo "#include \"$syscallhdr\"" | ${CPP} -D_LIBC -C > $syscalldump
-
-for syscall; do
-	fnname=${syscall%.S}
-	if $pflag; then
-		scname=${fnname#_}
-	else
-		scname=$fnname
-	fi
-	syscall_stub $syscalldump $scname $fnname
-	echo ""
-done
-
-trailer
-
-exit 0
diff --git a/lib/libc/sys/mincore.2 b/lib/libc/sys/mincore.2
deleted file mode 100644
index 8d252af52..000000000
--- a/lib/libc/sys/mincore.2
+++ /dev/null
@@ -1,99 +0,0 @@
-.\"	$NetBSD: mincore.2,v 1.19 2004/05/13 10:20:58 wiz Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)mincore.2	8.1 (Berkeley) 6/9/93
-.\"
-.Dd June 6, 1999
-.Dt MINCORE 2
-.Os
-.Sh NAME
-.Nm mincore
-.Nd determine residency of memory pages
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn mincore "void *addr" "size_t len" "char *vec"
-.Sh DESCRIPTION
-The
-.Fn mincore
-system call
-allows a process to obtain information about whether pages are
-core resident.
-The status of the memory range is returned in the character-per-page array
-.Ar vec .
-If the page is resident, the least significant bit of the corresponding
-character in
-.Ar vec
-will be set.
-Other bits are reserved for additional information
-which future implementations may return.
-.Pp
-Note that the status of each page may change between the call to
-.Fn mincore
-and the return of the page status information.
-In order to guarantee
-that pages will remain in core, the address range must be locked with
-.Xr mlock 2 .
-.Sh RETURN VALUES
-.Fn mincore
-returns 0 on success, or \-1 on failure and sets the variable
-.Va errno
-to indicate the error.
-.Sh ERRORS
-The
-.Fn mincore
-call will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-.Ar vec
-points to an illegal address.
-.It Bq Er EINVAL
-.Ar addr
-is not a multiple of the system page size.
-.It Bq Er EINVAL
-.Ar len
-is equal to 0.
-.It Bq Er ENOMEM
-The address range specified is invalid for the calling process,
-or one or more of the pages specified in the range are not mapped.
-.El
-.Sh SEE ALSO
-.Xr madvise 2 ,
-.Xr mlock 2 ,
-.Xr mprotect 2 ,
-.Xr msync 2 ,
-.Xr munmap 2 ,
-.Xr sysconf 3
-.Sh HISTORY
-The
-.Fn mincore
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/sys/minherit.2 b/lib/libc/sys/minherit.2
deleted file mode 100644
index fa89a6455..000000000
--- a/lib/libc/sys/minherit.2
+++ /dev/null
@@ -1,110 +0,0 @@
-.\"	$NetBSD: minherit.2,v 1.20 2014/08/05 15:01:03 riastradh Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)minherit.2	8.1 (Berkeley) 6/9/93
-.\"
-.Dd August 5, 2014
-.Dt MINHERIT 2
-.Os
-.Sh NAME
-.Nm minherit
-.Nd control the inheritance of pages
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn minherit "void *addr" "size_t len" "int inherit"
-.Sh DESCRIPTION
-The
-.Fn minherit
-system call changes the specified range of virtual addresses to have
-the inheritance characteristic
-.Fa inherit ,
-which determines how
-.Xr fork 2
-will map the region in the child process.
-The supported inheritance characteristics are:
-.Bl -tag -offset abcd -width MAP_INHERIT_DEFAULT
-.It MAP_INHERIT_COPY
-The child is given a private copy of the region: writes from parent or
-child are not seen by the other.
-.It MAP_INHERIT_NONE
-The region is unmapped in the child.
-.It MAP_INHERIT_SHARE
-The child is shares the region with the parent: writes from parent and
-child are seen by both.
-.It MAP_INHERIT_ZERO
-The region is mapped in the child to anonymous pages filled with
-zeros.
-.El
-.Pp
-Normally, the parent's virtual address space is copied for the child
-as if with
-.Dv MAP_INHERIT_COPY ,
-for which the alias
-.Dv MAP_INHERIT_DEFAULT
-is provided.
-Regions in the parent mapped using
-.Xr mmap 2
-with the
-.Dv MAP_SHARED
-flag are by default shared with the child as if with
-.Dv MAP_INHERIT_SHARED .
-.Pp
-Not all implementations will guarantee that the inheritance characteristic
-can be set on a page basis;
-the granularity of changes may be as large as an entire region.
-.Sh RETURN VALUES
-.Rv -std minherit
-.Sh ERRORS
-.Fn minherit
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-An invalid region or invalid parameters were specified.
-.El
-.Sh SEE ALSO
-.Xr fork 2 ,
-.Xr madvise 2 ,
-.Xr mincore 2 ,
-.Xr mmap 2 ,
-.Xr mprotect 2 ,
-.Xr msync 2 ,
-.Xr munmap 2
-.Sh HISTORY
-The
-.Fn minherit
-function first appeared in
-.Ox .
-.Sh BUGS
-If a particular port does not support page-granularity
-inheritance, there's no way to figure out how large a region is
-actually affected by
-.Fn minherit .
diff --git a/lib/libc/sys/mkdir.2 b/lib/libc/sys/mkdir.2
deleted file mode 100644
index 3fea55016..000000000
--- a/lib/libc/sys/mkdir.2
+++ /dev/null
@@ -1,161 +0,0 @@
-.\"	$NetBSD: mkdir.2,v 1.29 2013/10/15 11:43:21 njoly Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)mkdir.2	8.2 (Berkeley) 12/11/93
-.\"
-.Dd July 28, 2013
-.Dt MKDIR 2
-.Os
-.Sh NAME
-.Nm mkdir ,
-.Nm mkdirat
-.Nd make a directory file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/stat.h
-.Ft int
-.Fn mkdir "const char *path" "mode_t mode"
-.In sys/stat.h
-.In fcntl.h
-.Ft int
-.Fn mkdirat "int fd" "const char *path" "mode_t mode"
-.Sh DESCRIPTION
-The directory
-.Fa path
-is created with the access permissions specified by
-.Fa mode
-and restricted by the
-.Xr umask 2
-of the calling process.
-.Pp
-.Fn mkdirat
-works the same way as
-.Fn mkdir
-except if
-.Fa path
-is relative.
-In that case, it is looked up from a directory whose file
-descriptor was passed as
-.Fa fd .
-Search permission is required this directory.
-.\"    (These alternatives await a decision about the semantics of O_SEARCH)
-.\" Search permission is required on this directory
-.\" except if
-.\" .Fa fd
-.\" was opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" This file descriptor must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.Fa fd
-can be set to
-.Dv AT_FDCWD
-in order to specify the current directory.
-.Pp
-The directory's owner ID is set to the process's effective user ID.
-The directory's group ID is set to that of the parent directory in
-which it is created.
-.Sh RETURN VALUES
-.Rv -std mkdir mkdirat
-.Sh ERRORS
-Both
-.Fn mkdir
-and
-.Fn mkdirat
-will fail and no directory will be created if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EDQUOT
-The new directory cannot be created because the user's
-quota of disk blocks on the file system that will
-contain the directory has been exhausted.
-Or, the user's quota of inodes on the file system on
-which the directory is being created has been exhausted.
-.It Bq Er EEXIST
-The named file exists.
-.It Bq Er EFAULT
-.Fa path
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while making the directory entry or allocating the inode;
-or an I/O error occurred while reading from or writing to the file system.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-A component of the path prefix does not exist.
-.It Bq Er ENOSPC
-The new directory cannot be created because there is no space left
-on the file system that will contain the directory.
-Or, there are no free inodes on the file system on which the
-directory is being created.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.El
-.Pp
-In addition,
-.Fn mkdirat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa path
-does not specify an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for reading or searching.
-.It Bq Er ENOTDIR
-.Fa path
-is not an absolute path and
-.Fa fd
-is a file descriptor associated with a non-directory file.
-.El
-.Sh SEE ALSO
-.Xr chmod 2 ,
-.Xr stat 2 ,
-.Xr umask 2
-.Sh STANDARDS
-The
-.Fn mkdir
-function conforms to
-.St -p1003.1-90 .
-.Fn mkdirat
-conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc/sys/mkfifo.2 b/lib/libc/sys/mkfifo.2
deleted file mode 100644
index 22c95ea76..000000000
--- a/lib/libc/sys/mkfifo.2
+++ /dev/null
@@ -1,170 +0,0 @@
-.\"	$NetBSD: mkfifo.2,v 1.27 2013/10/15 11:43:21 njoly Exp $
-.\"
-.\" Copyright (c) 1990, 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. 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.
-.\"
-.\"	@(#)mkfifo.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd July 29, 2013
-.Dt MKFIFO 2
-.Os
-.Sh NAME
-.Nm mkfifo ,
-.Nm mkfifoat
-.Nd make a fifo file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/stat.h
-.Ft int
-.Fn mkfifo "const char *path" "mode_t mode"
-.In sys/stat.h
-.In fcntl.h
-.Ft int
-.Fn mkfifoat "int fd" "const char *path" "mode_t mode"
-.Sh DESCRIPTION
-.Fn mkfifo
-creates a new fifo file with name
-.Fa path .
-The access permissions are
-specified by
-.Fa mode
-and restricted by the
-.Xr umask 2
-of the calling process.
-.Pp
-.Fn mkfifoat
-works the same way as
-.Fn mkfifo
-except if
-.Fa path
-is relative.
-In that case, it is looked up from a directory whose file
-descriptor was passed as
-.Fa fd .
-Search permission is required on this directory.
-.\"    (These alternatives await a decision about the semantics of O_SEARCH)
-.\" Search permission is required on this directory
-.\" except if
-.\" .Fa fd
-.\" was opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" This file descriptor must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.Fa fd
-can be set to
-.Dv AT_FDCWD
-in order to specify the current directory.
-.Pp
-The fifo's owner ID is set to the process's effective user ID.
-The fifo's group ID is set to that of the parent directory in
-which it is created.
-.Sh RETURN VALUES
-.Rv -std mkfifo mkfifoat
-.Sh ERRORS
-.Fn mkfifo
-and
-.Fn mkfifoat
-will fail and no fifo will be created if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EDQUOT
-The directory in which the entry for the new fifo
-is being placed cannot be extended because the
-user's quota of disk blocks on the file system
-containing the directory has been exhausted.
-Or, the user's quota of inodes on the file system on
-which the fifo is being created has been exhausted.
-.It Bq Er EEXIST
-The named file exists.
-.It Bq Er EFAULT
-.Fa path
-points outside the process's allocated address space.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while making the directory entry or allocating the inode.
-Or, an
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-A component of the path prefix does not exist.
-.It Bq Er ENOSPC
-The directory in which the entry for the new fifo is being placed
-cannot be extended because there is no space left on the file
-system containing the directory.
-Or, there are no free inodes on the file system on which the
-fifo is being created.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er EOPNOTSUPP
-The kernel has not been configured to support fifo's.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.El
-.Pp
-In addition,
-.Fn mkfifoat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa path
-does not specify an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for reading or searching.
-.It Bq Er ENOTDIR
-.Fa path
-is not an absolute path and
-.Fa fd
-is a file descriptor associated with a non-directory file.
-.El
-.Sh SEE ALSO
-.Xr chmod 2 ,
-.Xr stat 2 ,
-.Xr umask 2
-.Sh STANDARDS
-The
-.Nm mkfifo
-function call conforms to
-.St -p1003.1-90 .
-.Fn mkfifoat
-conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc/sys/mknod.2 b/lib/libc/sys/mknod.2
deleted file mode 100644
index 98b46f274..000000000
--- a/lib/libc/sys/mknod.2
+++ /dev/null
@@ -1,179 +0,0 @@
-.\"	$NetBSD: mknod.2,v 1.28 2013/10/15 11:43:21 njoly Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)mknod.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd July 29, 2013
-.Dt MKNOD 2
-.Os
-.Sh NAME
-.Nm mknod ,
-.Nm mknodat
-.Nd make a special file node
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/stat.h
-.Ft int
-.Fn mknod "const char *path" "mode_t mode" "dev_t dev"
-.In sys/stat.h
-.In fcntl.h
-.Ft int
-.Fn mknodat "int fd" "const char *path" "mode_t mode" "dev_t dev"
-.Sh DESCRIPTION
-The device special file
-.Fa path
-is created with the major and minor
-device numbers specified by
-.Fa dev .
-The access permissions of
-.Fa path
-are extracted from
-.Fa mode ,
-modified by the
-.Xr umask 2
-of the parent process.
-.Pp
-.Fn mknodat
-works the same way as
-.Fn mknod
-except if
-.Fa path
-is relative.
-In that case, it is looked up from a directory whose file
-descriptor was passed as
-.Fa fd .
-Search permission is required on this directory.
-.\"    (These alternatives await a decision about the semantics of O_SEARCH)
-.\" Search permission is required on this directory
-.\" except if
-.\" .Fa fd
-.\" was opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" This file descriptor must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.Fa fd
-can be set to
-.Dv AT_FDCWD
-in order to specify the current directory.
-.Pp
-.Fn mknod
-requires super-user privileges.
-.Sh RETURN VALUES
-.Rv -std mknod mknodat
-.Sh ERRORS
-.Fn mknod
-and
-.Fn mknodat
-will fail and the file will be not created if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EDQUOT
-The directory in which the entry for the new node
-is being placed cannot be extended because the
-user's quota of disk blocks on the file system
-containing the directory has been exhausted; or
-the user's quota of inodes on the file system on
-which the node is being created has been exhausted.
-.It Bq Er EEXIST
-The named file exists.
-.It Bq Er EFAULT
-.Fa path
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-The supplied
-.Fa mode
-or
-.Fa dev
-is invalid.
-.It Bq Er EIO
-An I/O error occurred while making the directory entry or allocating the inode.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-A component of the path prefix does not exist.
-.It Bq Er ENOSPC
-The directory in which the entry for the new node is being placed
-cannot be extended because there is no space left on the file
-system containing the directory; or
-there are no free inodes on the file system on which the
-node is being created.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er EPERM
-The process's effective user ID is not super-user.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.El
-.Pp
-In addition,
-.Fn mknodat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa path
-does not specify an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for reading or searching.
-.It Bq Er ENOTDIR
-.Fa path
-is not an absolute path and
-.Fa fd
-is a file descriptor associated with a non-directory file.
-.El
-.Sh SEE ALSO
-.Xr chmod 2 ,
-.Xr mkfifo 2 ,
-.Xr stat 2 ,
-.Xr umask 2
-.Sh STANDARDS
-The
-.Fn mknod
-function conforms to
-.St -p1003.1-90 .
-.Fn mknodat
-conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-A
-.Fn mknod
-function call appeared in
-.At v6 .
diff --git a/lib/libc/sys/mknodat.c b/lib/libc/sys/mknodat.c
deleted file mode 100644
index 235c80196..000000000
--- a/lib/libc/sys/mknodat.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: mknodat.c,v 1.1 2013/10/17 18:01:11 njoly Exp $ */
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nicolas Joly <njoly@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-int __mknodat(int, const char *, mode_t, int, dev_t);
-
-int
-mknodat(int fd, const char *path, mode_t mode, dev_t dev)
-{
-	return __mknodat(fd, path, mode, 0, dev);
-}
diff --git a/lib/libc/sys/mlock.2 b/lib/libc/sys/mlock.2
deleted file mode 100644
index f41e7c9da..000000000
--- a/lib/libc/sys/mlock.2
+++ /dev/null
@@ -1,167 +0,0 @@
-.\"	$NetBSD: mlock.2,v 1.22 2015/02/08 14:10:28 wiz Exp $
-.\"
-.\" 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.
-.\"
-.\"	@(#)mlock.2	8.2 (Berkeley) 12/11/93
-.\"
-.Dd February 8, 2015
-.Dt MLOCK 2
-.Os
-.Sh NAME
-.Nm mlock ,
-.Nm munlock
-.Nd lock (unlock) physical pages in memory
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn mlock "void *addr" "size_t len"
-.Ft int
-.Fn munlock "void *addr" "size_t len"
-.Sh DESCRIPTION
-The
-.Nm mlock
-system call
-locks into memory the physical pages associated with the virtual address
-range starting at
-.Fa addr
-for
-.Fa len
-bytes.
-The
-.Nm munlock
-call unlocks pages previously locked by one or more
-.Nm mlock
-calls.
-The entire range of memory must be allocated.
-.Pp
-After an
-.Nm mlock
-call, the indicated pages will cause neither a non-resident page
-nor address-translation fault until they are unlocked.
-They may still cause protection-violation faults or TLB-miss faults on
-architectures with software-managed TLBs.
-The physical pages remain in memory until all locked mappings for the pages
-are removed.
-Multiple processes may have the same physical pages locked via their own
-virtual address mappings.
-A single process may likewise have pages multiply-locked via different virtual
-mappings of the same pages or via nested
-.Nm mlock
-calls on the same address range.
-Unlocking is performed explicitly by
-.Nm munlock
-or implicitly by a call to
-.Nm munmap
-which deallocates the unmapped address range.
-Locked mappings are not inherited by the child process after a
-.Xr fork 2 .
-.Pp
-Since physical memory is a potentially scarce resource, processes are
-limited in how much they can lock down.
-A single process can
-.Nm mlock
-the minimum of
-a system-wide ``wired pages'' limit and
-the per-process
-.Li RLIMIT_MEMLOCK
-resource limit.
-.Pp
-Portable code should ensure that the
-.Fa addr
-and
-.Fa len
-parameters are aligned to a multiple of the page size, even though the
-.Nx
-implementation will round as necessary.
-.Sh RETURN VALUES
-A return value of 0 indicates that the call
-succeeded and all pages in the range have either been locked or unlocked.
-A return value of \-1 indicates an error occurred and the locked
-status of all pages in the range remains unchanged.
-In this case, the global location
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn mlock
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-Locking the indicated range would exceed either the system or per-process
-limit for locked memory.
-.It Bq Er EINVAL
-The address or length given is not page aligned and the implementation does
-not round.
-.It Bq Er ENOMEM
-Some portion of the indicated address range is not allocated.
-There was an error faulting/mapping a page.
-.It Bq Er EPERM
-.Fn mlock
-was called by non-root on an architecture where locked page accounting
-is not implemented.
-.Pp
-.El
-.Fn munlock
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The address or length given is not page aligned and the implementation does
-not round.
-.It Bq Er ENOMEM
-Some portion of the indicated address range is not allocated.
-Some portion of the indicated address range is not locked.
-.El
-.Sh SEE ALSO
-.Xr fork 2 ,
-.Xr mincore 2 ,
-.Xr mmap 2 ,
-.Xr munmap 2 ,
-.Xr setrlimit 2 ,
-.Xr getpagesize 3
-.Sh STANDARDS
-The
-.Fn mlock
-and
-.Fn munlock
-functions conform to
-.St -p1003.1b-93 .
-.Sh HISTORY
-The
-.Fn mlock
-and
-.Fn munlock
-functions first appeared in
-.Bx 4.4 .
-.Sh BUGS
-The per-process resource limit is a limit on the amount of virtual
-memory locked, while the system-wide limit is for the number of locked
-physical pages.
-Hence a process with two distinct locked mappings of the same physical page
-counts as 2 pages against the per-process limit and as only a single page
-in the system limit.
diff --git a/lib/libc/sys/mlockall.2 b/lib/libc/sys/mlockall.2
deleted file mode 100644
index f27838e77..000000000
--- a/lib/libc/sys/mlockall.2
+++ /dev/null
@@ -1,131 +0,0 @@
-.\"	$NetBSD: mlockall.2,v 1.13 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
-.\" NASA Ames Research Center.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd June 12, 1999
-.Dt MLOCKALL 2
-.Os
-.Sh NAME
-.Nm mlockall ,
-.Nm munlockall
-.Nd lock (unlock) the address space of a process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn mlockall "int flags"
-.Ft int
-.Fn munlockall "void"
-.Sh DESCRIPTION
-The
-.Nm mlockall
-system call locks into memory the physical pages associated with the
-address space of a process until the address space is unlocked, the
-process exits, or execs another program image.
-.Pp
-The following flags affect the behavior of
-.Nm mlockall :
-.Bl -tag -width MCL_CURRENT
-.It Dv MCL_CURRENT
-Lock all pages currently mapped into the process's address space.
-.It Dv MCL_FUTURE
-Lock all pages mapped into the process's address space in the future,
-at the time the mapping is established.
-Note that this may cause future mappings to fail if those mappings
-cause resource limits to be exceeded.
-.El
-.Pp
-Since physical memory is a potentially scarce resource, processes are
-limited in how much they can lock down.
-A single process can lock the minimum of a system-wide
-.Dq wired pages
-limit and the per-process
-.Li RLIMIT_MEMLOCK
-resource limit.
-.Pp
-The
-.Nm munlockall
-call unlocks any locked memory regions in the process address space.
-Any regions mapped after an
-.Nm munlockall
-call will not be locked.
-.Sh RETURN VALUES
-A return value of 0 indicates that the call
-succeeded and all pages in the range have either been locked or unlocked.
-A return value of \-1 indicates an error occurred and the locked
-status of all pages in the range remains unchanged.
-In this case, the global location
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn mlockall
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Ar flags
-argument is zero, or includes unimplemented flags.
-.It Bq Er ENOMEM
-Locking the indicated range would exceed either the system or per-process
-limit for locked memory.
-.It Bq Er EAGAIN
-Some or all of the memory mapped into the process's address space
-could not be locked when the call was made.
-.It Bq Er EPERM
-The calling process does not have the appropriate privilege to perform
-the requested operation.
-.El
-.Sh SEE ALSO
-.Xr mincore 2 ,
-.Xr mlock 2 ,
-.Xr mmap 2 ,
-.Xr munmap 2 ,
-.Xr setrlimit 2
-.Sh STANDARDS
-The
-.Fn mlockall
-and
-.Fn munlockall
-functions conform to
-.St -p1003.1b-93 .
-.Sh HISTORY
-The
-.Fn mlockall
-and
-.Fn munlockall
-functions first appeared in
-.Nx 1.5 .
-.Sh BUGS
-The per-process resource limit is a limit on the amount of virtual
-memory locked, while the system-wide limit is for the number of locked
-physical pages.
-Hence a process with two distinct locked mappings of the same physical page
-counts as 2 pages against the per-process limit and as only a single page
-in the system limit.
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
deleted file mode 100644
index 1c10966f7..000000000
--- a/lib/libc/sys/mmap.2
+++ /dev/null
@@ -1,307 +0,0 @@
-.\"	$NetBSD: mmap.2,v 1.48 2015/02/27 16:18:00 christos Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
-.\"
-.Dd February 27, 2015
-.Dt MMAP 2
-.Os
-.Sh NAME
-.Nm mmap
-.Nd map files or devices into memory
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft void *
-.Fn mmap "void *addr" "size_t len" "int prot" "int flags" "int fd" "off_t offset"
-.Sh DESCRIPTION
-The
-.Nm mmap
-function causes the pages starting at
-.Fa addr
-and continuing for at most
-.Fa len
-bytes to be mapped from the object described by
-.Fa fd ,
-starting at byte offset
-.Fa offset .
-If
-.Fa len
-is not a multiple of the pagesize, the mapped region may extend past the
-specified range.
-Any such extension beyond the end of the mapped object will be zero-filled.
-.Pp
-If
-.Fa addr
-is non-zero, it is used as a hint to the system.
-(As a convenience to the system, the actual address of the region may differ
-from the address supplied.)
-If
-.Fa addr
-is zero, an address will be selected by the system.
-The actual starting address of the region is returned.
-A successful
-.Fa mmap
-deletes any previous mapping in the allocated address range.
-.Pp
-The protections (region accessibility) are specified in the
-.Fa prot
-argument by
-.Em OR Ns 'ing
-the following values:
-.Pp
-.Bl -tag -width PROT_WRITEXX -offset indent
-.It Dv PROT_EXEC
-Pages may be executed.
-.It Dv PROT_READ
-Pages may be read.
-.It Dv PROT_WRITE
-Pages may be written.
-.It Dv PROT_NONE
-Pages may not be accessed.
-.El
-.Pp
-.Bf -symbolic
-Note that, due to hardware limitations, on some platforms
-.Dv PROT_WRITE
-may imply
-.Dv PROT_READ ,
-and
-.Dv PROT_READ
-may imply
-.Dv PROT_EXEC .
-Portable programs should not rely on these flags being separately
-enforceable.
-.Ef
-.Pp
-The
-.Fa flags
-parameter specifies the type of the mapped object, mapping options and
-whether modifications made to the mapped copy of the page are private
-to the process or are to be shared with other references.
-Note that either
-.Dv MAP_SHARED
-or
-.Dv MAP_PRIVATE
-must be specified.
-Sharing, mapping type and options are specified in the
-.Fa flags
-argument by
-.Em OR Ns 'ing
-the following values:
-.Pp
-.Bl -tag -width MAP_HASSEMAPHOREXX -offset indent
-.It Dv MAP_ALIGNED(n)
-Request that the allocation be aligned to the given boundary.
-The parameter
-.Ar n
-should be the base 2 logarithm of the desired alignment (e.g., to
-request alignment to 16K, use 14 as the value for n).
-The alignment must be equal to or greater than the platform's page
-size as returned by
-.Xr sysconf 3
-with the
-.Dv _SC_PAGESIZE
-request.
-.It Dv MAP_ANON
-Map anonymous memory not associated with any specific file.
-The file descriptor is not used for creating
-.Dv MAP_ANON
-regions, and must be specified as \-1.
-The mapped memory will be zero filled.
-.It Dv MAP_FILE
-Mapped from a regular file or character-special device memory.
-Read accesses beyond the end of of the file or device but less
-than the current page size will be zero-filled.
-Write accesses beyond the end of the file or device but less
-than the current page size will not affect the file or device.
-References beyond the end of file that are beyond the current
-page size will result in the delivery of
-.Dv SIGBUS
-signal.
-.It Dv MAP_FIXED
-Do not permit the system to select a different address than the one
-specified.
-If the specified address cannot be used,
-.Nm mmap
-will fail.
-If MAP_FIXED is specified,
-.Fa addr
-must be a multiple of the pagesize.
-Use of this option is discouraged.
-.It Dv MAP_HASSEMAPHORE
-Notify the kernel that the region may contain semaphores and that special
-handling may be necessary.
-.It Dv MAP_INHERIT
-Permit regions to be inherited across
-.Xr execve 2
-system calls.
-.It Dv MAP_TRYFIXED
-Attempt to use the address
-.Fa addr
-even if it falls within the normally protected process data or
-text segment memory regions.
-If the requested region of memory
-is actually present in the memory map, a different address will
-be selected as if
-.Dv MAP_TRYFIXED
-had not been specified.
-If
-.Fa addr
-is
-.Fa NULL ,
-this flag is ignored and the system will select a mapping address.
-.It Dv MAP_WIRED
-Lock the mapped region into memory as with
-.Xr mlock 2 .
-.It Dv MAP_PRIVATE
-Modifications made by this process are private, however modifications made by
-other processes using
-.Dv MAP_SHARED
-will be seen.
-.It Dv MAP_SHARED
-Modifications are shared.
-.El
-.Pp
-The
-.Xr close 2
-function does not unmap pages, see
-.Xr munmap 2
-for further information.
-.Pp
-The current design does not allow a process to specify the location of
-swap space.
-In the future we may define an additional mapping type,
-.Dv MAP_SWAP ,
-in which
-the file descriptor argument specifies a file or device to which swapping
-should be done.
-.Pp
-If
-.Dv MAP_FIXED
-is not specified, the system will attempt to place the mapping in an
-unused portion of the address space chosen to minimize possible
-collision between mapped regions and the heap.
-.Sh RETURN VALUES
-Upon successful completion,
-.Nm mmap
-returns a pointer to the mapped region.
-Otherwise, a value of
-.Dv MAP_FAILED
-is returned and
-.Va errno
-is set to indicate the error.
-The symbol
-.Dv MAP_FAILED
-is defined in the header
-.Ao Pa sys/mman.h Ac .
-No successful return from
-.Fn mmap
-will return the value
-.Dv MAP_FAILED .
-.Sh ERRORS
-.Fn mmap
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The flag
-.Dv PROT_READ
-was specified as part of the
-.Fa prot
-parameter and
-.Fa fd
-was not open for reading.
-The flags
-.Dv MAP_SHARED
-and
-.Dv PROT_WRITE
-were specified as part of the
-.Fa flags
-and
-.Fa prot
-parameters and
-.Fa fd
-was not open for writing.
-.It Bq Er EBADF
-.Fa fd
-is not a valid open file descriptor.
-.It Bq Er EINVAL
-.\"One of
-.\".Dv MAP_ANON
-.\"or
-.\".Dv MAP_FILE
-.\"was not specified as part of the
-.\".Fa flags
-.\"parameter.
-.Dv MAP_FIXED
-was specified and the
-.Fa addr
-parameter was not page aligned or was outside of the
-valid address range for a process.
-.Dv MAP_ANON was specified and
-.Fa fd
-was not \-1.
-.It Bq Er ENODEV
-.Fa fd
-did not reference a regular or character special file.
-.It Bq Er ENOMEM
-.Dv MAP_FIXED
-was specified and the
-.Fa addr
-parameter wasn't available.
-.Dv MAP_ANON
-was specified and insufficient memory was available.
-.It Bq Er EOVERFLOW
-.Fa fd
-references a regular file and the value of
-.Fa offset
-plus
-.Fa len
-would exceed the offset maximum established in its open file description.
-.El
-.Sh SEE ALSO
-.Xr madvise 2 ,
-.Xr mincore 2 ,
-.Xr mlock 2 ,
-.Xr mprotect 2 ,
-.Xr msync 2 ,
-.Xr munmap 2 ,
-.Xr getpagesize 3 ,
-.Xr sysconf 3
-.Sh STANDARDS
-The
-.Fn mmap
-function conforms to
-.St -p1003.1b-93 .
-.Sh HISTORY
-The
-.Fn mmap
-interface was first designed in
-.Bx 4.2 .
diff --git a/lib/libc/sys/mmap.c b/lib/libc/sys/mmap.c
deleted file mode 100644
index a7dfc36b5..000000000
--- a/lib/libc/sys/mmap.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: mmap.c,v 1.15 2012/03/20 16:26:12 matt Exp $	*/
-
-/*
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)mmap.c	8.1 (Berkeley) 6/17/93";
-#else
-__RCSID("$NetBSD: mmap.c,v 1.15 2012/03/20 16:26:12 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(mmap,_mmap)
-#endif
-
-void *__mmap(void *, size_t, int, int, int, int, off_t);
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-void *
-mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
-
-	return __mmap(addr, len, prot, flags, fd, 0, offset);
-}
diff --git a/lib/libc/sys/modctl.2 b/lib/libc/sys/modctl.2
deleted file mode 100644
index 7d44cccc1..000000000
--- a/lib/libc/sys/modctl.2
+++ /dev/null
@@ -1,305 +0,0 @@
-.\"	$NetBSD: modctl.2,v 1.11 2015/05/09 08:10:01 pgoyette Exp $
-.\"
-.\" Copyright (c) 2009 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 9, 2015
-.Dt MODCTL 2
-.Os
-.Sh NAME
-.Nm modctl
-.Nd module control
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/module.h
-.Ft int
-.Fn modctl "int operation" "void *argp"
-.Sh DESCRIPTION
-.Fn modctl
-provides control over loaded kernel modules.
-The argument
-.Fa operation
-is one of
-.Dv MODCTL_LOAD ,
-.Dv MODCTL_UNLOAD ,
-.Dv MODCTL_STAT ,
-or
-.Dv MODCTL_EXISTS .
-The argument
-.Fa argp
-depends on the
-.Fa operation
-to be performed.
-.Pp
-Operations are:
-.Bl -tag -width MODCTL_UNLOAD
-.It Dv MODCTL_LOAD
-Load a module.
-The
-.Fa argp
-argument should be a pointer to a
-.Em modctl_load_t
-structure, described below.
-.It Dv MODCTL_UNLOAD
-Unload a module.
-In this case,
-.Fa argp
-should be a string containing the name of the module to be unloaded.
-.It Dv MODCTL_STAT
-Return a list of loaded modules.
-In this case, the
-.Fa argp
-argument should be a
-.Em struct iovec
-pointing to a suitable block of memory.
-The kernel will fill this block with an array of
-.Em modstat_t
-structures, one per loaded module.
-If the block is not large enough, the data returned will be truncated
-to fit.
-The kernel will then update the
-.Fa iov_len
-member of the
-.Em iovec
-to reflect the size of the complete report, regardless of whether this
-is larger or smaller than the size passed in.
-.It Dv MODCTL_EXISTS
-Test to see if the kernel was compiled with
-.Dq options MODULAR
-and whether or
-not modules may be loaded at the moment.
-In this case,
-.Fa argp
-should be an integer.
-It should be
-.Dq 0
-to test if a user can load a module via
-.Dv MODCTL_LOAD ,
-or it should be
-.Dq 1
-to test if the system can autoload modules.
-Note that this
-test does not consider the sysctl
-.Li kern.module.autoload .
-.El
-.Ss Data Types
-The
-.Em modctl_load_t
-structure used with
-.Dv MODCTL_LOAD
-contains the following elements, which should be filled in by the caller:
-.Bl -tag -width aaaaaaaa
-.It Fa "const char *ml_filename"
-The name/path of the module to load.
-.It Fa "int ml_flags"
-Zero or more of the following flag values:
-.Bl -tag -compact -width "MODCTL_LOAD_FORCE"
-.It Dv MODCTL_NO_PROP
-Don't load
-.Ao module Ac Ns Pa .plist .
-.It Dv MODCTL_LOAD_FORCE
-Ignore kernel version mismatch.
-.El
-.It Fa "const char *ml_props"
-Externalized proplib dictionary to pass to module.
-.It Fa "size_t ml_propslen"
-Size of the dictionary blob.
-.Fa ml_props
-may be
-.Dv NULL
-in which case
-.Fa ml_propslen
-must be
-.Dv 0 .
-An upper limit of 4096 bytes is imposed on the value of ml_propslen.
-Attempting to load a proplib dictionary larger than this size will return
-.Er ENOMEM .
-.El
-.Pp
-The
-.Em modstat_t
-structure used with
-.Dv MODCTL_STAT
-contains the following elements, which are filled in by the kernel:
-.Bl -tag -width aaaaaaaa
-.It Fa "char ms_name[MAXMODNAME]"
-The name of the module.
-.It Fa "char ms_required[MAXMODNAME * MAXMODDEPS]"
-The list of modules required by this module
-as a comma-delimited list of module names.
-.It Fa "modsrc_t ms_source"
-One of the following enumerated constants:
-.Bl -tag -compact -width "MODULE_SOURCE_FILESYS"
-.It Dv MODULE_SOURCE_KERNEL
-The module is compiled into the kernel.
-.It Dv MODULE_SOURCE_BOOT
-The module was provided by the bootstrap loader.
-.It Dv MODULE_SOURCE_FILESYS
-The module was loaded from the file system.
-.El
-.It Fa "modclass_t ms_class"
-One of the following enumerated constants:
-.Bl -tag -compact -width "MODULE_SOURCE_FILESYS"
-.It Dv MODULE_CLASS_SECMODEL
-Security model.
-.It Dv MODULE_CLASS_VFS
-File system.
-.It Dv MODULE_CLASS_DRIVER
-Device driver.
-.It Dv MODULE_CLASS_EXEC
-Executable file format.
-.It Dv MODULE_CLASS_MISC
-Miscellaneous.
-.It Dv MODULE_CLASS_ANY
-Any module class.
-.\" XXX: is MODULE_CLASS_ANY ever returned by this interface?
-.El
-.It Fa "uint64_t ms_addr"
-The load address within the kernel.
-.It Fa "u_int ms_size"
-Loaded size of the module.
-.It Fa "u_int ms_refcnt"
-Current number of live references to this module.
-.El
-.Sh RETURN VALUES
-Upon successful completion, the value returned is 0.
-.Pp
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn modctl
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBUSY
-The argument
-.Fa operation
-is
-.Dv MODCTL_UNLOAD
-and the module is in use or the module is compiled into the kernel.
-.It Bq Er EDEADLK
-The argument
-.Fa operation
-is
-.Dv MODCTL_LOAD
-and there is a circular dependency in the module's dependency chain.
-.It Bq Er EEXIST
-The argument
-.Fa operation
-is
-.Dv MODCTL_LOAD
-and the module is already loaded.
-.It Bq Er EFAULT
-A bad address was given for
-.Fa argp .
-.It Bq Er EFBIG
-The argument
-.Fa operation
-is
-.Dv MODCTL_LOAD ,
-the specified module resides in the file system, and the module's default
-proplib file was too large.
-.It Bq Er EINVAL
-The argument
-.Fa operation
-is invalid.
-.Pp
-The argument
-.Fa operation
-is
-.Dv MODCTL_LOAD
-and ml_props is not
-.Dv NULL
-and
-.Dq ml_propslen
-is
-.Dv 0 ,
-or
-ml_props is
-.Dv NULL
-and
-.Dq ml_propslen
-is not
-.Dv 0 .
-The kernel is unable to internalize the plist.
-Or, there is a problem with the module or \*[Lt]module\*[Gt].plist.
-.It Bq Er EMLINK
-The argument
-.Fa operation
-is
-.Dv MODCTL_LOAD
-and the module has too many dependencies.
-.It Bq Er ENAMETOOLONG
-A module name/path is too long.
-.It Bq Er ENOENT
-The argument
-.Fa operation
-is
-.Dv MODCTL_LOAD
-and the module or a dependency can't be found.
-The argument
-.Fa operation
-is
-.Dv MODCTL_UNLOAD
-and no module by the name of
-.Fa argp
-is loaded.
-.It Bq Er ENOEXEC
-The argument
-.Fa operation
-is
-.Dv MODCTL_LOAD
-and the module is not a valid object for the system.
-Most likely, one or more undefined symbols could not be resolved by the
-in-kernel linker.
-.It Bq Er ENOMEM
-There was not enough memory to perform the
-.Fa operation .
-.It Bq Er EPERM
-Not allowed to perform the
-.Fa operation .
-.It Bq Er EPROGMISMATCH
-The argument
-.Fa operation
-is
-.Dv MODCTL_LOAD ,
-the
-.Fa ml_flags
-field in the
-.Em modctl_load_t
-structure does not include
-.Dv MODCTL_LOAD_FORCE ,
-and the requested module does not match the current kernel's version
-information.
-.El
-.Sh SEE ALSO
-.Xr module 7 ,
-.Xr sysctl 7 ,
-.Xr module 9
-.Sh HISTORY
-The
-.Fn modctl
-function call first appeared in
-.Nx 5.0 .
diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
deleted file mode 100644
index 815124ebc..000000000
--- a/lib/libc/sys/mount.2
+++ /dev/null
@@ -1,442 +0,0 @@
-.\"	$NetBSD: mount.2,v 1.49 2011/11/18 21:04:21 christos Exp $
-.\"
-.\" Copyright (c) 1980, 1989, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)mount.2	8.3 (Berkeley) 5/24/95
-.\"
-.Dd November 18, 2011
-.Dt MOUNT 2
-.Os
-.Sh NAME
-.Nm mount ,
-.Nm unmount
-.Nd mount or dismount a file system
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/mount.h
-.Ft int
-.Fn mount "const char *type" "const char *dir" "int flags" "void *data" "size_t data_len"
-.Ft int
-.Fn unmount "const char *dir" "int flags"
-.Sh DESCRIPTION
-The
-.Fn mount
-function grafts
-a file system object onto the system file tree
-at the point
-.Ar dir .
-The argument
-.Ar data
-describes the file system object to be mounted, and is
-.Ar data_len
-bytes long.
-The argument
-.Ar type
-tells the kernel how to interpret
-.Ar data
-(See
-.Ar type
-below).
-The contents of the file system
-become available through the new mount point
-.Ar dir .
-Any files in
-.Ar dir
-at the time
-of a successful mount are swept under the carpet so to speak, and
-are unavailable until the file system is unmounted.
-.Pp
-The following
-.Ar flags
-may be specified to
-suppress default semantics which affect file system access.
-.Bl -tag -width MNT_SYNCHRONOUS
-.It Dv MNT_RDONLY
-The file system should be treated as read-only;
-even the super-user may not write on it.
-.It Dv MNT_UNION
-Union with underlying filesystem instead of obscuring it.
-.It Dv MNT_HIDDEN
-Cause the
-.Xr df 1
-program, and perhaps others, to, by default,
-exclude this filesystem from its output.
-.It Dv MNT_NOEXEC
-Do not allow files to be executed from the file system.
-.It Dv MNT_NOSUID
-Do not honor setuid or setgid bits on files when executing them.
-.It Dv MNT_NODEV
-Do not interpret special files on the file system.
-.It Dv MNT_NOCOREDUMP
-Do not allow programs to dump core files on the file system.
-.It Dv MNT_NOATIME
-Never update access time in the file system.
-.It Dv MNT_RELATIME
-Update access time on write and change.
-This helps programs that verify that the file has been read after written
-to work.
-.It Dv MNT_NODEVMTIME
-Never update modification time of device files.
-.It Dv MNT_SYMPERM
-Recognize the permission of symbolic link when reading or traversing.
-.It Dv MNT_SYNCHRONOUS
-All I/O to the file system should be done synchronously.
-This will slow I/O performance considerably, but
-enhances overall filesystem reliability.
-.It Dv MNT_ASYNC
-All I/O to the file system should be done asynchronously.
-This vastly improves I/O throughput,
-but at a cost of making the filesystem likely to be
-completely unrecoverable should the system crash while
-unwritten data is pending in kernel buffers.
-.It Dv MNT_LOG
-Use a filesystem journal.
-.Dv MNT_LOG
-causes a journal (or log) to be created in the
-filesystem, creating a record of meta-data writes to be
-performed, allowing the actual writes to be deferred.
-This improves performance in most cases.
-.It MNT_EXTATTR
-Enable extended attributes, if the filesystem supports them and
-does not enable them by default.
-Currently this is only the case for UFS1.
-.El
-.Pp
-The
-.Dv MNT_UPDATE ,
-.Dv MNT_RELOAD ,
-and
-.Dv MNT_GETARGS
-flags indicate that the mount command is being applied
-to an already mounted file system.
-The
-.Dv MNT_UPDATE
-flag allows the mount flags to be changed without requiring
-that the file system be unmounted and remounted.
-A conversion from read-write to read-only will fail if any files
-are currently open for writing on the filesystem, unless the
-.Dv MNT_FORCE
-flag is also applied.
-Some file systems may not allow all flags to be changed.
-For example,
-some file systems will not allow a change from read-write to read-only.
-The
-.Dv MNT_RELOAD
-flag causes kernel filesystem data to be reloaded from
-the filesystem device.
-It is only permitted on filesystems mounted read-only.
-Its purpose is to notify the system that the filesystem
-data has been modified by some external process.
-The
-.Dv MNT_GETARGS
-flag does not alter any of the mounted filesystem's properties,
-but returns the filesystem-specific arguments for the currently mounted
-filesystem.
-.Pp
-The
-.Fa type
-argument defines the type of the file system.
-The types of file systems known to the system are defined in
-.In sys/mount.h ,
-and those supported by the current running kernel obtained
-using
-.Xr sysctl 8
-to obtain the node
-.\" .Bd -literal -offset indent
-vfs.generic.fstypes.
-.\" XXX from lite-2:
-.\" The types of filesystems known to the system can be obtained with
-.\" .Xr sysctl 8
-.\" by using the command:
-.\" .Bd -literal -offset indent
-.\" sysctl vfs
-.\" .Ed
-.\" .Pp
-.Fa data
-is a pointer to a structure that contains the type
-specific arguments to mount.
-Some of the currently supported types of file systems and
-their type specific data are:
-.Pp
-.Dv MOUNT_FFS
-.Bd -literal -offset indent -compact
-struct ufs_args {
-      char      *fspec;             /* block special file to mount */
-};
-.Ed
-.Pp
-.Dv MOUNT_NFS
-.Bd -literal -offset indent -compact
-struct nfs_args {
-      int             version;      /* args structure version */
-      struct sockaddr *addr;        /* file server address */
-      int             addrlen;      /* length of address */
-      int             sotype;       /* Socket type */
-      int             proto;        /* and Protocol */
-      u_char          *fh;          /* File handle to be mounted */
-      int             fhsize;       /* Size, in bytes, of fh */
-      int             flags;        /* flags */
-      int             wsize;        /* write size in bytes */
-      int             rsize;        /* read size in bytes */
-      int             readdirsize;  /* readdir size in bytes */
-      int             timeo;        /* initial timeout in .1 secs */
-      int             retrans;      /* times to retry send */
-      int             maxgrouplist; /* Max. size of group list */
-      int             readahead;    /* # of blocks to readahead */
-      int             leaseterm;    /* Term (sec) of lease */
-      int             deadthresh;   /* Retrans threshold */
-      char            *hostname;    /* server's name */
-};
-.Ed
-.Pp
-.Dv MOUNT_MFS
-.Bd -literal -offset indent -compact
-struct mfs_args {
-      char	*fspec;             /* name to export for statfs */
-      struct	export_args30 pad;  /* unused */
-      caddr_t	base;               /* base of file system in mem */
-      u_long	size;               /* size of file system */
-};
-.Ed
-.\" XXX from lite-2:
-.\" The format for these argument structures is described in the
-.\" manual page for each filesystem.
-.\" By convention filesystem manual pages are named
-.\" by prefixing ``mount_'' to the name of the filesystem as returned by
-.\" .Xr sysctl 8 .
-.\" Thus the
-.\" .Nm NFS
-.\" filesystem is described by the
-.\" .Xr mount_nfs 8
-.\" manual page.
-.Pp
-The
-.Fn unmount
-function call disassociates the file system from the specified
-mount point
-.Fa dir .
-.Pp
-The
-.Fa flags
-argument may specify
-.Dv MNT_FORCE
-to specify that the file system should be forcibly unmounted even if files are
-still active.
-Active special devices continue to work,
-but any further accesses to any other active files result in errors
-even if the file system is later remounted.
-.Sh RETURN VALUES
-.Fn mount
-returns the value 0 if the mount was successful,
-the number of bytes written to
-.Ar data
-for
-.Dv MNT_GETARGS ,
-otherwise \-1 is returned and the variable
-.Va errno
-is set to indicate the error.
-.Pp
-.Fn unmount
-returns the value 0 if the unmount succeeded; otherwise \-1 is returned
-and the variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn mount
-will fail when one of the following occurs:
-.Bl -tag -width Er
-.It Bq Er EBUSY
-Another process currently holds a reference to
-.Fa dir ,
-or for an update from read-write to read-only
-there are files on the filesystem open for writes.
-.It Bq Er EFAULT
-.Fa dir
-points outside the process's allocated address space.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating a pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-A component of
-.Fa dir
-does not exist.
-.It Bq Er ENOTDIR
-A component of
-.Ar name
-is not a directory,
-or a path prefix of
-.Ar special
-is not a directory.
-.It Bq Er EPERM
-The caller is not the super-user,
-and ordinary user mounts are not permitted or
-this particular request violates the rules.
-.El
-.Pp
-The following errors can occur for a
-.Em ufs
-file system mount:
-.Bl -tag -width Er
-.It Bq Er EBUSY
-.Ar Fspec
-is already mounted.
-.It Bq Er EFAULT
-.Ar Fspec
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-The super block for the file system had a bad magic
-number or an out of range block size.
-.It Bq Er EIO
-An I/O error occurred while reading the super block or
-cylinder group information.
-.It Bq Er EMFILE
-No space remains in the mount table.
-.It Bq Er ENODEV
-A component of ufs_args
-.Ar fspec
-does not exist.
-.It Bq Er ENOMEM
-Not enough memory was available to read the cylinder
-group information for the file system.
-.It Bq Er ENOTBLK
-.Ar Fspec
-is not a block device.
-.It Bq Er ENXIO
-The major device number of
-.Ar fspec
-is out of range (this indicates no device driver exists
-for the associated hardware).
-.El
-.Pp
-The following errors can occur for a
-.Em nfs
-file system mount:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-Some part of the information described by nfs_args
-points outside the process's allocated address space.
-.It Bq Er ETIMEDOUT
-.Em Nfs
-timed out trying to contact the server.
-.El
-.Pp
-The following errors can occur for a
-.Em mfs
-file system mount:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-.Em Name
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-The super block for the file system had a bad magic
-number or an out of range block size.
-.It Bq Er EIO
-A paging error occurred while reading the super block or
-cylinder group information.
-.It Bq Er EMFILE
-No space remains in the mount table.
-.It Bq Er ENOMEM
-Not enough memory was available to read the cylinder
-group information for the file system.
-.El
-.Pp
-.Fn unmount
-may fail with one of the following errors:
-.Bl -tag -width Er
-.It Bq Er EBUSY
-A process is holding a reference to a file located
-on the file system.
-.It Bq Er EFAULT
-.Fa dir
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-The requested directory is not in the mount table.
-.It Bq Er EIO
-An I/O error occurred while writing cached file system information.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOTDIR
-A component of the path is not a directory.
-.It Bq Er EPERM
-The caller is not the super-user.
-.El
-.Pp
-A
-.Em ufs
-or
-.Em mfs
-mount can also fail if the maximum number of file systems are currently
-mounted.
-.Sh SEE ALSO
-.Xr df 1 ,
-.Xr getvfsstat 2 ,
-.Xr nfssvc 2 ,
-.Xr getmntinfo 3 ,
-.Xr symlink 7 ,
-.Xr mount 8 ,
-.Xr sysctl 8 ,
-.Xr umount 8
-.Sh HISTORY
-The
-.Fn mount
-and
-.Fn umount
-(now
-.Fn unmount )
-function calls were all present in
-.At v6 .
-.Pp
-Prior to
-.Nx 4.0
-the
-.Nm
-call was used to export NFS filesystems.
-This is now done through
-.Fn nfssvc .
-.Pp
-The
-.Dv data_len
-argument was added for
-.Nx 5.0 .
-.Sh BUGS
-Some of the error codes need translation to more obvious messages.
-.Pp
-Far more filesystems are supported than those those listed.
diff --git a/lib/libc/sys/mprotect.2 b/lib/libc/sys/mprotect.2
deleted file mode 100644
index bbf6adc0e..000000000
--- a/lib/libc/sys/mprotect.2
+++ /dev/null
@@ -1,98 +0,0 @@
-.\"	$NetBSD: mprotect.2,v 1.24 2011/04/03 06:54:30 jruoho Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)mprotect.2	8.1 (Berkeley) 6/9/93
-.\"
-.Dd April 3, 2011
-.Dt MPROTECT 2
-.Os
-.Sh NAME
-.Nm mprotect
-.Nd control the protection of pages
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn mprotect "void *addr" "size_t len" "int prot"
-.Sh DESCRIPTION
-The
-.Fn mprotect
-system call
-changes the specified pages to have protection
-.Fa prot .
-Not all implementations will guarantee protection on a page basis;
-the granularity of protection changes may be as large as an entire region.
-.Pp
-The protections (region accessibility) are specified in the
-.Fa prot
-argument by
-.Tn OR Ns 'ing
-the following values:
-.Pp
-.Bl -tag -width MAP_FIXEDX -offset indent
-.It Dv PROT_EXEC
-Pages may be executed.
-.It Dv PROT_READ
-Pages may be read.
-.It Dv PROT_WRITE
-Pages may be written.
-.It Dv PROT_NONE
-No permissions.
-.El
-.Sh RETURN VALUES
-Upon successful completion,
-a value of 0 is returned.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EACCES
-A memory protection violation occurred, or the
-.Dv PROT_EXEC
-flag was attempted on pages which belong to a filesystem mounted with the
-.Dv NOEXEC
-flag.
-.It Bq Er EINVAL
-An invalid memory range, or invalid parameters were provided.
-.It Bq Er ENOMEM
-A resource shortage occurred while internally calling
-.Xr uvm_map_protect 9 .
-.El
-.Sh SEE ALSO
-.Xr madvise 2 ,
-.Xr mincore 2 ,
-.Xr msync 2 ,
-.Xr munmap 2
-.Sh HISTORY
-The
-.Fn mprotect
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/sys/mremap.2 b/lib/libc/sys/mremap.2
deleted file mode 100644
index bbd2b0c84..000000000
--- a/lib/libc/sys/mremap.2
+++ /dev/null
@@ -1,109 +0,0 @@
-.\"	$NetBSD: mremap.2,v 1.4 2011/04/28 12:00:55 wiz Exp $
-.\"
-.\" Copyright (c) 2007 Thomas Klausner and Joerg Sonnenberger
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this 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.
-.\"
-.\" ------------------------------------------------------------
-.Dd February 14, 2008
-.Dt MREMAP 2
-.Os
-.Sh NAME
-.Nm mremap
-.Nd re-map a virtual memory address
-.\" ------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft void *
-.Fn mremap "void *oldp" "size_t oldsize" "void *newp" "size_t newsize" \
-"int flags"
-.\" ------------------------------------------------------------
-.Sh DESCRIPTION
-The
-.Fn mremap
-function resizes the mapped range (see
-.Xr mmap 2 )
-starting at
-.Ar oldp
-and having size
-.Ar oldsize
-to
-.Ar newsize .
-The following arguments can be
-.Dv OR Ap ed
-together in the
-.Ar flags
-argument:
-.Bl -tag -width XXMAPXALIGNEDXnXX
-.It Dv MAP_ALIGNED Ns Pq Ar n
-The allocation should be aligned to the given boundary, i.e. ensure
-that the lowest
-.Ar n
-bits of the address are zero.
-The parameter
-.Ar n
-should be the base 2 logarithm of the desired alignment (e.g., to
-request alignment to 16K, use 14 as the value for n).
-The alignment must be equal to or greater than the platform's page
-size as returned by
-.Xr sysconf 3
-with the
-.Dv _SC_PAGESIZE
-request.
-.It Dv MAP_FIXED
-.Ar newp
-is tried and
-.Fn mremap
-fails if that address can't be used as new base address for the range.
-Otherwise,
-.Ar oldp
-and
-.Ar newp
-are used as hints for the position, factoring in the given alignment.
-.El
-.Sh RETURN VALUES
-.Fn mremap
-returns the new address or
-.Dv MAP_FAILED ,
-if the remap failed.
-.Sh COMPATIBILITY
-The semantics of
-.Fn mremap
-differ from the one provided by glibc on Linux in that the
-.Ar newp
-argument was added and a different set of
-.Ar flags
-are implemented.
-.Sh SEE ALSO
-.Xr mmap 2 ,
-.Xr munmap 2
-.Sh HISTORY
-The
-.Fn mremap
-system call appeared in
-.Nx 5.0 .
-It was based on the code that supports
-.Fn mremap
-compatibility for Linux binaries.
diff --git a/lib/libc/sys/msgctl.2 b/lib/libc/sys/msgctl.2
deleted file mode 100644
index 5c56888f9..000000000
--- a/lib/libc/sys/msgctl.2
+++ /dev/null
@@ -1,199 +0,0 @@
-.\"	$NetBSD: msgctl.2,v 1.15 2010/03/22 19:30:55 joerg Exp $
-.\"
-.\" Copyright (c) 1995 Frank van der Linden
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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 Frank van der Linden
-.\" 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.
-.\"
-.Dd August 25, 1999
-.Dt MSGCTL 2
-.Os
-.Sh NAME
-.Nm msgctl
-.Nd message control operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/msg.h
-.Ft int
-.Fn msgctl "int msqid" "int cmd" "struct msqid_ds *buf"
-.Sh DESCRIPTION
-The
-.Fn msgctl
-system call performs control operations on the message queue specified
-by
-.Fa msqid .
-.Pp
-Each message queue has a
-.Sy msqid_ds
-structure associated with it which contains the following members:
-.Bd -literal
-    struct ipc_perm msg_perm; /* msg queue permission bits */
-    msgqnum_t msg_qnum;       /* # of msgs in the queue */
-    msglen_t  msg_qbytes;     /* max # of bytes on the queue */
-    pid_t     msg_lspid;      /* pid of last msgsnd() */
-    pid_t     msg_lrpid;      /* pid of last msgrcv() */
-    time_t    msg_stime;      /* time of last msgsnd() */
-    time_t    msg_rtime;      /* time of last msgrcv() */
-    time_t    msg_ctime;      /* time of last msgctl() */
-.Ed
-.Pp
-The
-.Sy ipc_perm
-structure used inside the
-.Sy msgid_ds
-structure is defined in
-.In sys/ipc.h
-and contains the following members:
-.Bd -literal
-    uid_t cuid;  /* creator user id */
-    gid_t cgid;  /* creator group id */
-    uid_t uid;   /* user id */
-    gid_t gid;   /* group id */
-    mode_t mode; /* permission (lower 9 bits) */
-.Ed
-.Pp
-The operation to be performed by
-.Fn msgctl
-is specified in
-.Fa cmd
-and is one of:
-.Bl -tag -width IPC_RMIDX
-.It Dv IPC_STAT
-Gather information about the message queue and place it in the
-structure pointed to by
-.Fa buf .
-.It Dv IPC_SET
-Set the value of the
-.Va msg_perm.uid ,
-.Va msg_perm.gid ,
-.Va msg_perm.mode
-and
-.Va msg_qbytes
-fields in the structure associated with
-.Fa msqid .
-The values are taken from the corresponding fields in the structure
-pointed to by
-.Fa buf .
-This operation can only be executed by the super-user, or a process that
-has an effective user id equal to either
-.Va msg_perm.cuid
-or
-.Va msg_perm.uid
-in the data structure associated with the message queue.
-The value of
-.Va msg_qbytes
-can only be increased by the super-user.
-Values for
-.Va msg_qbytes
-that exceed the system limit
-.Pf ( Dv MSGMNB
-from
-.In sys/msg.h )
-are silently truncated to that limit.
-.It Dv IPC_RMID
-Remove the message queue specified by
-.Fa msqid
-and destroy the data associated with it.
-Only the super-user or a process with an effective uid equal to the
-.Va msg_perm.cuid
-or
-.Va msg_perm.uid
-values in the data structure associated with the queue can do this.
-.El
-.Pp
-The permission to read from or write to a message queue (see
-.Xr msgsnd 2
-and
-.Xr msgrcv 2 )
-is determined by the
-.Va msg_perm.mode
-field in the same way as is done with files (see
-.Xr chmod 2 ) ,
-but the effective uid can match either the
-.Va msg_perm.cuid
-field or the
-.Va msg_perm.uid
-field, and the
-effective gid can match either
-.Va msg_perm.cgid
-or
-.Va msg_perm.gid .
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn msgctl
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EPERM
-.Fa cmd
-is equal to
-.Dv IPC_SET
-or
-.Dv IPC_RMID
-and the caller is not the super-user, nor does
-the effective uid match either the
-.Va msg_perm.uid
-or
-.Va msg_perm.cuid
-fields of the data structure associated with the message queue.
-.Pp
-An attempt was made to increase the value of
-.Va msg_qbytes
-through
-.Dv IPC_SET ,
-but the caller is not the super-user.
-.It Bq Er EACCES
-.Fa cmd
-is
-.Dv IPC_STAT
-and the caller has no read permission for this message queue.
-.It Bq Er EINVAL
-.Fa msqid
-is not a valid message queue identifier.
-.Pp
-.Fa cmd
-is not a valid command.
-.It Bq Er EFAULT
-.Fa buf
-specifies an invalid address.
-.El
-.Sh SEE ALSO
-.Xr msgget 2 ,
-.Xr msgrcv 2 ,
-.Xr msgsnd 2
-.Sh STANDARDS
-The
-.Nm
-system call conforms to
-.St -xsh5 .
-.Sh HISTORY
-Message queues appeared in the first release of
-.At V .
diff --git a/lib/libc/sys/msgget.2 b/lib/libc/sys/msgget.2
deleted file mode 100644
index e711b3c8e..000000000
--- a/lib/libc/sys/msgget.2
+++ /dev/null
@@ -1,151 +0,0 @@
-.\"	$NetBSD: msgget.2,v 1.14 2004/05/13 10:20:58 wiz Exp $
-.\"
-.\" Copyright (c) 1995 Frank van der Linden
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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 Frank van der Linden
-.\" 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.
-.\"
-.Dd May 13, 2004
-.Dt MSGGET 2
-.Os
-.Sh NAME
-.Nm msgget
-.Nd get message queue identifier
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/msg.h
-.Ft int
-.Fn msgget "key_t key" "int msgflg"
-.Sh DESCRIPTION
-The
-.Fn msgget
-system call returns the message queue identifier associated with
-.Fa key .
-A message queue identifier is a unique integer greater than zero.
-.Pp
-A message queue is created if either
-.Fa key
-is equal to
-.Dv IPC_PRIVATE ,
-or
-.Fa key
-does not have a message queue identifier associated with it and the
-.Dv IPC_CREAT
-bit is set in
-.Fa msgflg .
-If both the
-.Dv IPC_CREAT
-bit and the
-.Dv IPC_EXCL
-bit are set in
-.Fa msgflg ,
-and
-.Fa key
-has a message queue identifier associated with it already,
-the operation will fail.
-.Pp
-If a new message queue is created, the data structure associated with it (the
-.Va msqid_ds
-structure, see
-.Xr msgctl 2 )
-is initialized as follows:
-.Bl -bullet
-.It
-.Va msg_perm.cuid
-and
-.Va msg_perm.uid
-are set to the effective uid of the calling process.
-.It
-.Va msg_perm.gid
-and
-.Va msg_perm.cgid
-are set to the effective gid of the calling process.
-.It
-.Va msg_perm.mode
-is set to the lower 9 bits of
-.Fa msgflg .
-.It
-.Va msg_qnum ,
-.Va msg_lspid ,
-.Va msg_lrpid ,
-.Va msg_rtime ,
-and
-.Va msg_stime
-are set to 0.
-.It
-.Va msg_qbytes
-is set to the system wide maximum value for the number of bytes in a queue
-.Pq Dv MSGMNB .
-.It
-.Va msg_ctime
-is set to the current time.
-.El
-.Sh RETURN VALUES
-Upon successful completion a positive message queue identifier is returned.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EACCES
-A message queue is already associated with
-.Fa key
-and the caller has no permission to access it.
-.It Bq Er EEXIST
-Both
-.Dv IPC_CREAT
-and
-.Dv IPC_EXCL
-are set in
-.Fa msgflg ,
-and a message queue is already associated with
-.Fa key .
-.It Bq Er ENOSPC
-A new message queue could not be created because the system limit for
-the number of message queues has been reached.
-.It Bq Er ENOENT
-.Dv IPC_CREAT
-is not set in
-.Fa msgflg
-and no message queue associated with
-.Fa key
-was found.
-.El
-.Sh SEE ALSO
-.Xr msgctl 2 ,
-.Xr msgrcv 2 ,
-.Xr msgsnd 2 ,
-.Xr ftok 3
-.Sh STANDARDS
-The
-.Nm
-system call conforms to
-.St -xsh5 .
-.Sh HISTORY
-Message queues appeared in the first release of
-.At V .
diff --git a/lib/libc/sys/msgrcv.2 b/lib/libc/sys/msgrcv.2
deleted file mode 100644
index d5da41f8b..000000000
--- a/lib/libc/sys/msgrcv.2
+++ /dev/null
@@ -1,220 +0,0 @@
-.\"	$NetBSD: msgrcv.2,v 1.22 2013/07/24 11:54:04 skrll Exp $
-.\"
-.\" Copyright (c) 1995 Frank van der Linden
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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 Frank van der Linden
-.\" 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.
-.\"
-.Dd July 24, 2013
-.Dt MSGRCV 2
-.Os
-.Sh NAME
-.Nm msgrcv
-.Nd receive a message from a message queue
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/msg.h
-.Ft ssize_t
-.Fn msgrcv "int msqid" "void *msgp" "size_t msgsz" "long msgtyp" "int msgflg"
-.Sh DESCRIPTION
-The
-.Fn msgrcv
-function receives a message from the message queue specified in
-.Fa msqid ,
-and places it into the user-defined structure pointed to by
-.Fa msgp .
-This structure must contain a first field of type
-.Sy long
-that will indicate the user-defined type of the message.
-The remaining fields will contain the contents of the message.
-The following is an example of what this user-defined structure might
-look like:
-.Bd -literal
-struct mymsg {
-    long mtype;    /* message type */
-    char mtext[1]; /* body of message */
-};
-.Ed
-.Pp
-.Va mtype
-is an integer greater than 0 that can be used to select messages.
-.Va mtext
-is an array of bytes, with size up to the system limit
-.Dv MSGMAX .
-.Pp
-The value of
-.Fa msgtyp
-has one of the following meanings:
-.Bl -bullet
-.It
-.Fa msgtyp
-is greater than 0.
-The first message of type
-.Fa msgtyp
-will be received.
-.It
-.Fa msgtyp
-is equal to 0.
-The first message on the queue will be received.
-.It
-.Fa msgtyp
-is less than 0.
-The first message of the lowest message type that is
-less than or equal to the absolute value of
-.Fa msgtyp
-will be received.
-.El
-.Pp
-The argument
-.Fa msgsz
-specifies the size in bytes of
-.Va mtext .
-If the received message has a length greater than
-.Fa msgsz
-it will be silently truncated if the
-.Dv MSG_NOERROR
-flag is set in
-.Fa msgflg ,
-otherwise an error will be returned.
-.Pp
-If no matching message is present on the message queue specified by
-.Fa msqid ,
-the behaviour of
-.Fn msgrcv
-depends on whether the
-.Dv IPC_NOWAIT
-flag is set in
-.Fa msgflg
-or not.
-If
-.Dv IPC_NOWAIT
-is set, then
-.Fn msgrcv
-will immediately return a value of \-1 and set
-.Va errno
-to
-.Er EAGAIN .
-If
-.Dv IPC_NOWAIT
-is not set, the calling process will block until:
-.Bl -bullet
-.It
-A message of the requested type becomes available on the message queue.
-.It
-The message queue is removed, in which case \-1 will be returned and
-.Va errno
-set to
-.Er EIDRM .
-.It
-A signal is received and caught.
-\-1 is returned and
-.Va errno
-is set to
-.Er EINTR .
-.El
-.Pp
-If a message is successfully received, the data structure associated with
-.Fa msqid
-is updated as follows:
-.Bl -bullet
-.It
-.Va msg_lrpid
-is set to the pid of the caller.
-.It
-.Va msg_lrtime
-is set to the current time.
-.It
-.Va msg_qnum
-is decremented by 1.
-.El
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn msgrcv
-returns the number of bytes received and placed into the
-.Va mtext
-field of the structure pointed to by
-.Fa msgp .
-Otherwise, \-1 is returned, and
-.Va errno
-set to indicate the error.
-.Sh ERRORS
-.Fn msgrcv
-will fail if:
-.Bl -tag -width Er
-.It Bq Er E2BIG
-A matching message was received, but its size was greater than
-.Fa msgsz
-and the
-.Dv MSG_NOERROR
-flag was not set in
-.Fa msgflg .
-.It Bq Er EACCES
-The calling process does not have read access to the message queue.
-.It Bq Er EAGAIN
-There is no message of the requested type available on the message queue,
-and
-.Dv IPC_NOWAIT
-is set in
-.Fa msgflg .
-.It Bq Er EFAULT
-.Fa msgp
-points to an invalid address.
-.It Bq Er EIDRM
-The message queue identifier
-.Fa msqid
-is removed from the system.
-.It Bq Er EINTR
-The system call was interrupted by the delivery of a signal.
-.It Bq Er EINVAL
-.Fa msqid
-is not a valid message queue identifier
-.Pp
-The message queue was removed while
-.Fn msgrcv
-was waiting for a message of the requested type to become available in it.
-.Pp
-.Fa msgsz
-is greater than
-.Dv SSIZE_MAX .
-.It Bq Er ENOMSG
-The queue does not contain a message of the desired type and
-.Dv IPC_NOWAIT
-is set.
-.El
-.Sh SEE ALSO
-.Xr msgctl 2 ,
-.Xr msgget 2 ,
-.Xr msgsnd 2
-.Sh STANDARDS
-The
-.Nm
-system call conforms to
-.St -xsh5 .
-.Sh HISTORY
-Message queues appeared in the first release of
-.At V .
diff --git a/lib/libc/sys/msgsnd.2 b/lib/libc/sys/msgsnd.2
deleted file mode 100644
index 3a2283b34..000000000
--- a/lib/libc/sys/msgsnd.2
+++ /dev/null
@@ -1,183 +0,0 @@
-.\"	$NetBSD: msgsnd.2,v 1.20 2013/07/24 11:54:04 skrll Exp $
-.\"
-.\" Copyright (c) 1995 Frank van der Linden
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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 Frank van der Linden
-.\" 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.
-.\"
-.Dd July 24, 2013
-.Dt MSGSND 2
-.Os
-.Sh NAME
-.Nm msgsnd
-.Nd send a message to a message queue
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/msg.h
-.Ft int
-.Fn msgsnd "int msqid" "const void *msgp" "size_t msgsz" "int msgflg"
-.Sh DESCRIPTION
-The
-.Fn msgsnd
-function sends a message from the message queue specified in
-.Fa msqid .
-The
-.Fa msgp
-argument is a pointer to a user-defined structure containing the message.
-This structure must contain a first field of type
-.Vt long
-that will indicate the user-defined type of the message.
-The remaining fields will contain the contents of the message.
-The following is an example of what this user-defined
-structure might look like:
-.Bd -literal -offset indent
-struct mymsg {
-    long mtype;    /* message type */
-    char mtext[1]; /* body of message */
-};
-.Ed
-.Pp
-The
-.Va mtype
-field is an integer greater than 0 that can
-be used for selecting messages (see
-.Xr msgrcv 2 ) .
-The
-.Va mtext
-field is an array of bytes of length
-.Fa msgsz ,
-with size up to the system limit
-.Dv MSGMAX .
-.Pp
-If the number of bytes already on the message queue plus
-.Fa msgsz
-is greater than the maximum number of bytes in the message queue
-.Pf ( Va msg_qbytes ,
-see
-.Xr msgctl 2 ) ,
-or if the number of messages on all queues system-wide is already equal to
-the system limit,
-.Fa msgflg
-determines the action of
-.Fn msgsnd .
-If
-.Fa msgflg
-has
-.Dv IPC_NOWAIT
-mask set in it, the call will return immediately.
-If
-.Fa msgflg
-does not have
-.Dv IPC_NOWAIT
-set in it, the call will block until:
-.Bl -bullet -offset indent
-.It
-The condition which caused the call to block no longer exists.
-The message was sent.
-.It
-The message queue is removed, in which case \-1 will be returned and
-.Va errno
-set to
-.Er EINVAL .
-.It
-The caller catches a signal.
-The call returns with
-.Va errno
-set to
-.Er EINTR .
-.El
-.Pp
-After a successful call, the data structure associated with the message
-queue is updated in the following way:
-.Bl -bullet -offset indent
-.It
-.Va msg_qnum
-is incremented by 1.
-.It
-.Va msg_lspid
-is set to the pid of the calling process.
-.It
-.Va msg_stime
-is set to the current time.
-.El
-.Sh RETURN VALUES
-Upon successful completion, 0 is returned.
-Otherwise, \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn msgsnd
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The calling process does not have write access to the message queue.
-.It Bq Er EAGAIN
-There was no space for this message either on the queue or in the whole
-system, and
-.Dv IPC_NOWAIT
-was set in
-.Fa msgflg .
-.It Bq Er EFAULT
-.Fa msgp
-points to an invalid address.
-.It Bq Er EINTR
-The system call was interrupted by the delivery of a signal.
-.It Bq Er EINVAL
-The
-.Fa msqid
-argument is not a valid message queue identifier,
-or the value of
-.Fa mtype
-is less than 1.
-.Pp
-The message queue was removed while
-.Fn msgsnd
-was waiting for a resource to become available in order to deliver the
-message.
-.Pp
-The
-.Fa msgsz
-argument is greater than
-.Va msg_qbytes
-or
-.Dv SSIZE_MAX .
-.El
-.Sh SEE ALSO
-.Xr msgctl 2 ,
-.Xr msgget 2 ,
-.Xr msgrcv 2
-.Sh STANDARDS
-The
-.Nm
-system call conforms to
-.St -xsh5
-and
-.St -p1003.1-2001 .
-.Sh HISTORY
-Message queues appeared in the first release of
-.At V .
diff --git a/lib/libc/sys/msync.2 b/lib/libc/sys/msync.2
deleted file mode 100644
index f0700160c..000000000
--- a/lib/libc/sys/msync.2
+++ /dev/null
@@ -1,132 +0,0 @@
-.\"	$NetBSD: msync.2,v 1.25 2014/05/09 17:25:11 njoly Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)msync.2	8.2 (Berkeley) 6/21/94
-.\"
-.Dd May 9, 2014
-.Dt MSYNC 2
-.Os
-.Sh NAME
-.Nm msync
-.Nd synchronize a mapped region
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn msync "void *addr" "size_t len" "int flags"
-.Sh DESCRIPTION
-The
-.Fn msync
-system call writes all pages with shared modifications
-in the specified
-region of the process's address space back to permanent
-storage, and, if requested, invalidates cached data mapped
-in the region.
-If
-.Fa len
-is 0, all modified pages within the region containing
-.Fa addr
-will be flushed;
-if
-.Fa len
-is non-zero, only modified pages containing
-.Fa addr
-and
-.Fa len
-succeeding locations will be flushed.
-Any required synchronization of memory caches
-will also take place at this time.
-Filesystem operations on a file that is mapped for shared modifications
-are unpredictable except after an
-.Fn msync .
-.Pp
-The
-.Fa flags
-argument is formed by
-.Em or Ns 'ing
-the following values
-.Pp
-.Bl -column -offset indent -compact MS_INVALIDATE
-.It Dv MS_ASYNC Ta Perform asynchronous writes.
-.It Dv MS_SYNC Ta Perform synchronous writes.
-.It Dv MS_INVALIDATE Ta Invalidate cached data after writing.
-.El
-.Sh RETURN VALUES
-Upon successful completion,
-a value of 0 is returned.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The following errors may be reported:
-.Bl -tag -width Er
-.It Bq Er EBUSY
-The
-.Dv MS_INVALIDATE
-flag was specified and a portion of the specified region
-was locked with
-.Xr mlock 2 .
-.It Bq Er EINVAL
-The specified
-.Fa flags
-argument was invalid.
-.It Bq Er EINVAL
-The
-.Fa addr
-parameter was not page aligned.
-.It Bq Er EINVAL
-The
-.Fa addr
-parameter did not specify an address part of a mapped region.
-.It Bq Er EIO
-An I/O error occurred while writing to the file system.
-.It Bq Er ENOMEM
-Addresses in the specified region are outside the range allowed
-for the address space of the process, or specify one or more pages
-which are unmapped.
-.El
-.Sh SEE ALSO
-.Xr mlock 2 ,
-.Xr mmap 2 ,
-.Xr munlock 2
-.Sh STANDARDS
-The
-.Fn msync
-function conforms to
-.St -p1003.1b-93
-.Sh HISTORY
-The
-.Fn msync
-function first appeared in
-.Bx 4.4 .
-It was modified to conform to
-.St -p1003.1b-93
-in
-.Nx 1.3 .
diff --git a/lib/libc/sys/munmap.2 b/lib/libc/sys/munmap.2
deleted file mode 100644
index f0263cc24..000000000
--- a/lib/libc/sys/munmap.2
+++ /dev/null
@@ -1,86 +0,0 @@
-.\"	$NetBSD: munmap.2,v 1.21 2014/05/30 16:11:01 njoly Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)munmap.2	8.3 (Berkeley) 5/27/94
-.\"
-.Dd May 27, 1994
-.Dt MUNMAP 2
-.Os
-.Sh NAME
-.Nm munmap
-.Nd remove a mapping
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn munmap "void *addr" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn munmap
-system call
-deletes the mappings for the specified address range,
-and causes further references to addresses within the range
-to generate invalid memory references.
-.Sh RETURN VALUES
-Upon successful completion,
-.Nm munmap
-returns zero.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn munmap
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa addr
-parameter was not page aligned, or
-some part of the region being unmapped is outside the
-valid address range for a process.
-.El
-.Sh SEE ALSO
-.Xr madvise 2 ,
-.Xr mincore 2 ,
-.Xr mlock 2 ,
-.Xr mmap 2 ,
-.Xr mprotect 2 ,
-.Xr msync 2 ,
-.Xr getpagesize 3
-.Sh STANDARDS
-The
-.Fn munmap
-function conforms to
-.St -p1003.1b-93 .
-.Sh HISTORY
-The
-.Fn munmap
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/sys/nanosleep.2 b/lib/libc/sys/nanosleep.2
deleted file mode 100644
index 7bbfbf74c..000000000
--- a/lib/libc/sys/nanosleep.2
+++ /dev/null
@@ -1,184 +0,0 @@
-.\"	$NetBSD: nanosleep.2,v 1.17 2015/10/02 19:52:49 christos Exp $
-.\"
-.\" Copyright (c) 1986, 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. 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.
-.\"
-.\"     @(#)sleep.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd October 2, 2015
-.Dt NANOSLEEP 2
-.Os
-.Sh NAME
-.Nm nanosleep
-.Nd high resolution sleep
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft int
-.Fn clock_nanosleep "clockid_t clock_id" "int flags" "const struct timespec *rqtp" "struct timespec *rmtp"
-.Ft int
-.Fn nanosleep "const struct timespec *rqtp" "struct timespec *rmtp"
-.Sh DESCRIPTION
-If the
-.Dv TIMER_ABSTIME
-flag is not set in the
-.Fa flags
-argument, then
-.Fn clock_nanosleep
-suspends execution of the calling thread until either the number of
-seconds and nanoseconds specified in the
-.Fa rqtp
-argument have elapsed using the clock in the
-.Fa clock_id
-argument, or a signal is delivered to the calling process and its
-action is to invoke a signal catching function or to terminate the
-process.
-.Pp
-If the
-.Dv TIMER_ABSTIME
-flag is set in the
-.Fa flags
-argument, then
-.Fn clock_nanosleep
-suspends execution of the calling thread until either the value
-of the clock specified in the
-.Fa clock_id
-argument reaches the value of the
-.Fa rqtp
-argument in seconds and nanoseconds,
-or a signal is delivered to the calling process and its
-action is to invoke a signal catching function or to terminate the
-process.
-.Pp
-The suspension time may be longer than requested due to the
-scheduling of other activity by the system.
-.Pp
-The
-.Fn nanosleep
-function behaves like
-.Fn clock_nanosleep
-with the
-.Fa clock_id
-argument equal to
-.Dv CLOCK_MONOTONIC
-and the
-.Fa flags
-argument having
-.Dv TIMER_ABSTIME
-not set.
-.Pp
-The
-.Em struct timespec
-is described in
-.Xr timespec 3 .
-The
-.Fa clock_id
-specified is the time source.
-.Sh RETURN VALUES
-If the
-.Fn clock_nanosleep
-or the
-.Fn nanosleep
-functions return because the requested time has elapsed, the value
-returned will be zero.
-.Pp
-If the
-.Fn clock_nanosleep
-or the
-.Fn nanosleep
-functions return due to the delivery of a signal, then
-.Fn clock_nanosleep
-will return directly the error number, and
-.Fn nanosleep
-will return \-1, and the global variable
-.Va errno
-will be set to indicate the interruption.
-If
-.Fa rmtp
-is
-.Pf non- Dv NULL ,
-the timespec structure it references is updated to contain the
-unslept amount (the request time minus the time actually slept).
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn nanosleep
-function shall return \-1 and set
-.Va errno
-to the corresponding value, and the
-.Fn clock_nanosleep
-function shall return the errnor number directly.
-.Bl -tag -width Er
-.It Bq Er EFAULT
-Either
-.Fa rqtp
-or
-.Fa rmtp
-points to memory that is not a valid part of the process
-address space.
-.It Bq Er EINTR
-.Nm
-was interrupted by the delivery of a signal.
-.It Bq Er EINVAL
-.Fa rqtp
-specified a nanosecond value less than zero or greater than 1000 million.
-.It Bq Er ENOSYS
-.Nm
-is not supported by this implementation.
-.It Bq Er ENOTSUP
-for
-.Fn clock_nanosleep ,
-the clock specified in the
-.Fa clock_id
-argument is not supported.
-.El
-.Sh SEE ALSO
-.Xr sleep 3 ,
-.Xr timespec 3
-.Sh STANDARDS
-The
-.Fn nanosleep
-function conforms to
-.St -p1003.1b-93 .
-The
-.Fn clock_nanosleep
-function conforms to
-.St -p1003.1j-2000 .
-.Sh BUGS
-The
-.Nx
-kernel is not tickless, so the maximum sleep resolution is determined
-by the value of
-.Dv HZ
-which is by default
-.Dv 100
-in most architectures.
-This means that a request to sleep for less than
-.Dv 10ms
-(1 /
-.Dv HZ
-seconds), is rounded up to that.
diff --git a/lib/libc/sys/nfssvc.2 b/lib/libc/sys/nfssvc.2
deleted file mode 100644
index 5f27a5f2f..000000000
--- a/lib/libc/sys/nfssvc.2
+++ /dev/null
@@ -1,195 +0,0 @@
-.\"	$NetBSD: nfssvc.2,v 1.24 2009/03/10 21:00:47 joerg Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"	@(#)nfssvc.2	8.1 (Berkeley) 6/9/93
-.\"
-.Dd December 30, 2006
-.Dt NFSSVC 2
-.Os
-.Sh NAME
-.Nm nfssvc
-.Nd NFS services
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.In nfs/nfs.h
-.Ft int
-.Fn nfssvc "int flags" "void *argstructp"
-.Sh DESCRIPTION
-The
-.Fn nfssvc
-function is used by the NFS daemons to pass information into and out
-of the kernel and also to enter the kernel as a server daemon.
-The
-.Fa flags
-argument consists of several bits that show what action is to be taken
-once in the kernel and the
-.Fa argstructp
-points to one of three structures depending on which bits are set in
-flags.
-.Ss Calls used by Xr nfsd 8
-On the server side,
-.Fn nfssvc
-is called with the flag
-.Dv NFSSVC_NFSD
-and a pointer to a
-.Bd -literal
-struct nfsd_srvargs {
-	struct nfsd	*nsd_nfsd;	/* Pointer to in kernel nfsd struct */
-	uid_t		nsd_uid;	/* Effective uid mapped to cred */
-	u_long		nsd_haddr;	/* Ip address of client */
-	struct ucred	nsd_cr;		/* Cred. uid maps to */
-	int		nsd_authlen;	/* Length of auth string (ret) */
-	char		*nsd_authstr;	/* Auth string (ret) */
-};
-.Ed
-.Pp
-to enter the kernel as an
-.Xr nfsd 8
-daemon.
-Whenever an
-.Xr nfsd 8
-daemon receives a Kerberos authentication ticket, it will return from
-.Fn nfssvc
-with errno set to
-.Er ENEEDAUTH .
-The
-.Xr nfsd 8
-will attempt to authenticate the ticket and generate a set of credentials
-on the server for the
-.Dq user id
-specified in the field nsd_uid.
-This is done by first authenticating the Kerberos ticket and then mapping
-the Kerberos principal to a local name and getting a set of credentials for
-that user via
-.Xr getpwnam 3
-and
-.Xr getgrouplist 3 .
-If successful, the
-.Xr nfsd 8
-will call
-.Fn nfssvc
-with the
-.Dv NFSSVC_NFSD
-and
-.Dv NFSSVC_AUTHIN
-flags set to pass the credential mapping in nsd_cr into the
-kernel to be cached on the server socket for that client.
-If the authentication failed,
-.Xr nfsd 8
-calls
-.Fn nfssvc
-with the flags
-.Dv NFSSVC_NFSD
-and
-.Dv NFSSVC_AUTHINFAIL
-to denote an authentication failure.
-.Pp
-The master
-.Xr nfsd 8
-server daemon calls
-.Fn nfssvc
-with the flag
-.Dv NFSSVC_ADDSOCK
-and a pointer to a
-.Bd -literal
-struct nfsd_args {
-	int	sock;		/* Socket to serve */
-	caddr_t	name;		/* Client address for connection based sockets */
-	int	namelen;	/* Length of name */
-};
-.Ed
-.Pp
-to pass a server side
-.Tn NFS
-socket into the kernel for servicing by the
-.Xr nfsd 8
-daemons.
-.Ss Calls used by Xr mountd 8
-The
-.Xr mountd 8
-server daemon calls
-.Fn nfssvc
-with the flag
-.Dv NFSSVC_SETEXPORTSLIST
-and a pointer to a
-.Ft struct mountd_exports_list
-object to atomically change the exports lists of a specific file system.
-This structure has the following fields:
-.Bl -tag -width ".Vt const char *mel_path"
-.It Vt const char *mel_path
-Path to the file system that will have its exports list replaced by the
-one described in the other fields.
-.It Vt size_t mel_nexports
-Number of valid entries in the
-.Vt mel_export
-field.
-If zero, the exports list will be cleared for the given file system.
-.It Vt struct export_args mel_export[AF_MAX]
-Set of exports to be used for the given file system.
-.El
-.Sh RETURN VALUES
-Usually
-.Nm
-does not return unless the server
-is terminated by a signal when a value of 0 is returned.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to specify the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ENEEDAUTH
-This special error value is really used for authentication support,
-particularly Kerberos, as explained above.
-.It Bq Er EPERM
-The caller is not the super-user.
-.El
-.Sh SEE ALSO
-.Xr mount_nfs 8 ,
-.Xr nfsd 8
-.Sh HISTORY
-The
-.Nm
-function first appeared in
-.Bx 4.4 .
-.Sh BUGS
-The
-.Nm
-system call is designed specifically for the
-.Tn NFS
-support daemons and as such is specific to their requirements.
-It should really return values to indicate the need for authentication
-support, since
-.Er ENEEDAUTH
-is not really an error.
-Several fields of the argument structures are assumed to be valid and
-sometimes to be unchanged from a previous call, such that
-.Nm
-must be used with extreme care.
diff --git a/lib/libc/sys/ntp_adjtime.2 b/lib/libc/sys/ntp_adjtime.2
deleted file mode 100644
index b473d3663..000000000
--- a/lib/libc/sys/ntp_adjtime.2
+++ /dev/null
@@ -1,307 +0,0 @@
-.\"	$NetBSD: ntp_adjtime.2,v 1.10 2009/05/18 09:28:51 wiz Exp $
-.\"
-.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Thomas Klausner.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd October 22, 2007
-.Dt NTP_ADJTIME 2
-.Os
-.Sh NAME
-.Nm ntp_adjtime ,
-.Nm ntp_gettime
-.Nd Network Time Protocol (NTP) daemon interface system calls
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/time.h
-.In sys/timex.h
-.Ft int
-.Fn ntp_adjtime "struct timex *"
-.Ft int
-.Fn ntp_gettime "struct ntptimeval *"
-.Sh DESCRIPTION
-The two system calls
-.Fn ntp_adjtime
-and
-.Fn ntp_gettime
-are the kernel interface to the Network Time Protocol (NTP) daemon
-.Xr ntpd 8 .
-.Pp
-The
-.Fn ntp_adjtime
-function is used by the NTP daemon to adjust the system clock to an
-externally derived time.
-The time offset and related variables which are set by
-.Fn ntp_adjtime
-are used by
-.Xr hardclock 9
-to adjust the phase and frequency of the phase- or frequency-lock loop
-(PLL resp. FLL) which controls the system clock.
-.Pp
-The
-.Fn ntp_gettime
-function provides the time, maximum error (sync distance) and
-estimated error (dispersion) to client user application programs.
-.Pp
-In the following, all variables that refer PPS are only relevant if
-the
-.Em PPS_SYNC
-option (see
-.Xr options 4 )
-is enabled in the kernel.
-.Pp
-.Fn ntp_adjtime
-has as argument a
-.Va struct timex *
-of the following form:
-.Bd -literal
-struct timex {
-	unsigned int modes;	/* clock mode bits (wo) */
-	long offset;		/* time offset (us) (rw) */
-	long freq;		/* frequency offset (scaled ppm) (rw) */
-	long maxerror;		/* maximum error (us) (rw) */
-	long esterror;		/* estimated error (us) (rw) */
-	int status;		/* clock status bits (rw) */
-	long constant;		/* pll time constant (rw) */
-	long precision;		/* clock precision (us) (ro) */
-	long tolerance;		/* clock frequency tolerance (scaled
-				 * ppm) (ro) */
-	/*
-	 * The following read-only structure members are implemented
-	 * only if the PPS signal discipline is configured in the
-	 * kernel.
-	 */
-	long ppsfreq;		/* pps frequency (scaled ppm) (ro) */
-	long jitter;		/* pps jitter (us) (ro) */
-	int shift;		/* interval duration (s) (shift) (ro) */
-	long stabil;		/* pps stability (scaled ppm) (ro) */
-	long jitcnt;		/* jitter limit exceeded (ro) */
-	long calcnt;		/* calibration intervals (ro) */
-	long errcnt;		/* calibration errors (ro) */
-	long stbcnt;		/* stability limit exceeded (ro) */
-};
-.Ed
-.Pp
-The members of this struct have the following meanings when used as
-argument for
-.Fn ntp_adjtime :
-.Bl -tag -width tolerance -compact
-.It Fa modes
-Defines what settings should be changed with the current
-.Fn ntp_adjtime
-call (write-only).
-Bitwise OR of the following:
-.Bl -tag -width MOD_TIMECONST -compact -offset indent
-.It MOD_OFFSET
-set time offset
-.It MOD_FREQUENCY
-set frequency offset
-.It MOD_MAXERROR
-set maximum time error
-.It MOD_ESTERROR
-set estimated time error
-.It MOD_STATUS
-set clock status bits
-.It MOD_TIMECONST
-set PLL time constant
-.It MOD_CLKA
-set clock A
-.It MOD_CLKB
-set clock B
-.El
-.It Fa offset
-Time offset (in microseconds), used by the PLL/FLL to adjust the
-system time in small increments (read-write).
-.It Fa freq
-Frequency offset (scaled ppm) (read-write).
-.It Fa maxerror
-Maximum error (in microseconds).
-Initialized by an
-.Fn ntp_adjtime
-call, and increased by the kernel once each second to reflect the maximum
-error bound growth (read-write).
-.It Fa esterror
-Estimated error (in microseconds).
-Set and read by
-.Fn ntp_adjtime ,
-but unused by the kernel (read-write).
-.It Fa status
-System clock status bits (read-write).
-Bitwise OR of the following:
-.Bl -tag -width STA_PPSJITTER -compact -offset indent
-.It STA_PLL
-Enable PLL updates (read-write).
-.It STA_PPSFREQ
-Enable PPS freq discipline (read-write).
-.It STA_PPSTIME
-Enable PPS time discipline (read-write).
-.It STA_FLL
-Select frequency-lock mode (read-write).
-.It STA_INS
-Insert leap (read-write).
-.It STA_DEL
-Delete leap (read-write).
-.It STA_UNSYNC
-Clock unsynchronized (read-write).
-.It STA_FREQHOLD
-Hold frequency (read-write).
-.It STA_PPSSIGNAL
-PPS signal present (read-only).
-.It STA_PPSJITTER
-PPS signal jitter exceeded (read-only).
-.It STA_PPSWANDER
-PPS signal wander exceeded (read-only).
-.It STA_PPSERROR
-PPS signal calibration error (read-only).
-.It STA_CLOCKERR
-Clock hardware fault (read-only).
-.El
-.It Fa constant
-PLL time constant, determines the bandwidth, or
-.Dq stiffness ,
-of the PLL (read-write).
-.It Fa precision
-Clock precision (in microseconds).
-In most cases the same as the kernel tick variable (see
-.Xr hz 9 ) .
-If a precision clock counter or external time-keeping signal is available,
-it could be much lower (and depend on the state of the signal)
-(read-only).
-.It Fa tolerance
-Maximum frequency error, or tolerance of the CPU clock oscillator (scaled
-ppm).
-Ordinarily a property of the architecture, but could change under
-the influence of external time-keeping signals (read-only).
-.It Fa ppsfreq
-PPS frequency offset produced by the frequency median filter (scaled
-ppm) (read-only).
-.It Fa jitter
-PPS jitter measured by the time median filter in microseconds
-(read-only).
-.It Fa shift
-Logarithm to base 2 of the interval duration in seconds (PPS,
-read-only).
-.It Fa stabil
-PPS stability (scaled ppm); dispersion (wander) measured by the
-frequency median filter (read-only).
-.It Fa jitcnt
-Number of seconds that have been discarded because the jitter measured
-by the time median filter exceeded the limit
-.Em MAXTIME
-(PPS, read-only).
-.It Fa calcnt
-Count of calibration intervals (PPS, read-only).
-.It Fa errcnt
-Number of calibration intervals that have been discarded because the
-wander exceeded the limit
-.Em MAXFREQ
-or where the calibration interval jitter exceeded two ticks (PPS,
-read-only).
-.It Fa stbcnt
-Number of calibration intervals that have been discarded because the
-frequency wander exceeded the limit
-.Em MAXFREQ Ns /4
-(PPS, read-only).
-.El
-After the
-.Fn ntp_adjtime
-call, the
-.Va struct timex *
-structure contains the current values of the corresponding variables.
-.Pp
-.Fn ntp_gettime
-has as argument a
-.Va struct ntptimeval *
-with the following members:
-.Bd -literal
-struct ntptimeval {
-	struct timespec time;	/* current time (ro) */
-	long maxerror;		/* maximum error (us) (ro) */
-	long esterror;		/* estimated error (us) (ro) */
-	/* the following are placeholders for now */
-	long tai;		/* TAI offset */
-	int time_state;		/* time status */
-};
-.Ed
-.Pp
-These have the following meaning:
-.Bl -tag -width tolerance -compact
-.It Fa time
-Current time (read-only).
-.It Fa maxerror
-Maximum error in microseconds (read-only).
-.It Fa esterror
-Estimated error in microseconds (read-only).
-.El
-.Sh RETURN VALUES
-.Fn ntp_adjtime
-and
-.Fn ntp_gettime
-return the current state of the clock on success, or any of the errors
-of
-.Xr copyin 9
-and
-.Xr copyout 9 .
-.Fn ntp_adjtime
-may additionally return
-.Er EPERM
-if the user calling
-.Fn ntp_adjtime
-does not have sufficient permissions.
-.Pp
-Possible states of the clock are:
-.Bl -tag -width TIME_ERROR -compact -offset indent
-.It TIME_OK
-Everything okay, no leap second warning.
-.It TIME_INS
-.Dq insert leap second
-warning.
-.It TIME_DEL
-.Dq delete leap second
-warning.
-.It TIME_OOP
-Leap second in progress.
-.It TIME_WAIT
-Leap second has occurred.
-.It TIME_ERROR
-Clock not synchronized.
-.El
-.Sh SEE ALSO
-.Xr options 4 ,
-.Xr ntpd 8 ,
-.Xr hardclock 9 ,
-.Xr hz 9
-.Rs
-.%A J. Mogul
-.%A D. Mills
-.%A J. Brittenson
-.%A J. Stone
-.%A U. Windl
-.%T Pulse-Per-Second API for UNIX-like Operating Systems
-.%R RFC 2783
-.%D March 2000
-.Re
diff --git a/lib/libc/sys/ntp_adjtime.c b/lib/libc/sys/ntp_adjtime.c
deleted file mode 100644
index efe0ddb86..000000000
--- a/lib/libc/sys/ntp_adjtime.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*	$NetBSD: ntp_adjtime.c,v 1.13 2012/03/20 16:26:12 matt Exp $ */
-
-/*
- * Copyright (c) 2001 The NetBSD Foundation, Inc.      
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Emmanuel Dreyfus.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ntp_adjtime.c,v 1.13 2012/03/20 16:26:12 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/timex.h>
-#include <sys/ioctl.h>
-#include <sys/syscall.h>
-
-#include <sys/clockctl.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(ntp_adjtime,_ntp_adjtime)
-#endif
-
-extern int __clockctl_fd;
-
-int __ntp_adjtime(struct timex *);
-
-int
-ntp_adjtime(struct timex *tp)
-{
-	struct clockctl_ntp_adjtime args;
-	int error;
-	int rv;
-
-	/*
-	 * we always attempt to use the syscall unless we had to
-	 * use the clockctl device before
-	 *
-	 * ntp_adjtime() is callable for mortals if tp->modes == 0 !
-	 */
-	if (__clockctl_fd == -1) {
-		rv = __ntp_adjtime(tp);
-	
-		/*
-		 * if we fail with EPERM we try the clockctl device
-		 */
-		if (rv != -1 || errno != EPERM)
-			return rv;
-
-		/*
-		 * If this fails, it means that we are not root
-		 * and we cannot open clockctl. This is a true
-		 * failure.
-		 */
-		__clockctl_fd = open(_PATH_CLOCKCTL, O_WRONLY | O_CLOEXEC, 0);
-		if (__clockctl_fd == -1) {
-			/* original error was EPERM - don't leak open errors */
-			errno = EPERM;
-			return -1;
-		}
-	}
-
-	/*
-	 * If __clockctl_fd >=0, clockctl has already been open
-	 * and used, so we carry on using it.
-	 */
-	args.tp = tp;
-	error = ioctl(__clockctl_fd, CLOCKCTL_NTP_ADJTIME, &args);
-
-	/*
-	 * There is no way to get retval set through ioctl(), hence we
-	 * have to handle it here, using args.retval
-	 */
-	if (error == 0) {
-		rv = (int)args.retval;
-		return rv;
-	}
-
-	return error;
-}
diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2
deleted file mode 100644
index 579c57fdd..000000000
--- a/lib/libc/sys/open.2
+++ /dev/null
@@ -1,482 +0,0 @@
-.\"	$NetBSD: open.2,v 1.56 2013/07/29 18:37:16 njoly Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)open.2	8.2 (Berkeley) 11/16/93
-.\"
-.Dd July 29, 2013
-.Dt OPEN 2
-.Os
-.Sh NAME
-.Nm open ,
-.Nm openat
-.Nd open or create a file for reading or writing
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fcntl.h
-.Ft int
-.Fn open "const char *path" "int flags" "..."
-.Ft int
-.Fn openat "int fd" "const char *path" "int flags" "..."
-.Sh DESCRIPTION
-The file name specified by
-.Fa path
-is opened
-for reading and/or writing as specified by the
-argument
-.Fa flags
-and the file descriptor returned to the calling process.
-.Pp
-.Fn openat
-works the same way as
-.Fn open
-except if
-.Fa path
-is relative.
-In that case, it is looked up from a directory whose file
-descriptor was passed as
-.Fa fd .
-Search permission is required on this directory.
-.\"    (These alternatives await a decision about the semantics of O_SEARCH)
-.\" Search permission is required on this directory
-.\" except if
-.\" .Fa fd
-.\" was opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" This file descriptor must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.Fa fd
-can be set to
-.Dv AT_FDCWD
-in order to specify the current directory.
-.Pp
-The
-.Fa flags
-are specified by
-.Em or Ns 'ing
-the values listed below.
-Applications must specify exactly one of the first three values
-(file access methods):
-.Bl -tag -offset indent -width O_DIRECTORY
-.It Dv O_RDONLY
-Open for reading only.
-.It Dv O_WRONLY
-Open for writing only.
-.It Dv O_RDWR
-Open for reading and writing.
-.El
-.Pp
-Any combination of the following may be used:
-.Bl -tag -offset indent -width O_DIRECTORY
-.It Dv O_NONBLOCK
-Do not block on open or for data to become available.
-.It Dv O_APPEND
-Append to the file on each write.
-.It Dv O_CREAT
-Create the file if it does not exist.
-The third argument of type
-.Ft mode_t
-is used to compute the mode bits of the file as described in
-.Xr chmod 2
-and modified by the process' umask value (see
-.Xr umask 2 ) .
-.It Dv O_TRUNC
-Truncate size to 0.
-.It Dv O_EXCL
-Error if
-.Dv O_CREAT
-and the file already exists.
-.It Dv O_SHLOCK
-Atomically obtain a shared lock.
-.It Dv O_EXLOCK
-Atomically obtain an exclusive lock.
-.It Dv O_NOFOLLOW
-If last path element is a symlink, don't follow it.
-This option is provided for compatibility with other operating
-systems, but its security value is questionable.
-.It Dv O_CLOEXEC
-Set the
-.Xr close 2
-on
-.Xr exec 3
-flag.
-.It Dv O_NOSIGPIPE
-Return
-.Er EPIPE
-instead of raising
-.Dv SIGPIPE .
-.It Dv O_DSYNC
-If set, write operations will be performed according to synchronized
-I/O data integrity completion:
-each write will wait for the file data to be committed to stable
-storage.
-.It Dv O_SYNC
-If set, write operations will be performed according to synchronized
-I/O file integrity completion:
-each write will wait for both the file data and file status to be
-committed to stable storage.
-.It Dv O_RSYNC
-If set, read operations will complete at the same level of
-integrity which is in effect for write operations:
-if specified together with
-.Dv O_SYNC ,
-each read will wait for the file status to be committed to stable
-storage.
-.Pp
-Combining
-.Dv O_RSYNC
-with
-.Dv O_DSYNC
-only, or specifying it without any other synchronized I/O integrity
-completion flag set, has no further effect.
-.It Dv O_ALT_IO
-Alternate I/O semantics will be used for read and write operations
-on the file descriptor.
-Alternate semantics are defined by the underlying layers and will not
-have any alternate effect in most cases.
-.It Dv O_NOCTTY
-If the file is a terminal device, the opened device is not
-made the controlling terminal for the session.
-This flag has no effect on
-.Nx ,
-since the system defaults to the abovementioned behaviour.
-The flag is present only for standards conformance.
-.It Dv O_DIRECT
-If set on a regular file, data I/O operations will not buffer the data
-being transferred in the kernel's cache, but rather transfer the data
-directly between user memory and the underlying device driver if possible.
-This flag is advisory; the request may be performed in the normal
-buffered fashion if certain conditions are not met, e.g. if the request
-is not sufficiently aligned or if the file is mapped.
-.Pp
-To meet the alignment requirements for direct I/O, the file offset,
-the length of the I/O and the address of the buffer in memory must all
-be multiples of
-.Dv DEV_BSIZE
-(512 bytes).
-If the I/O request is made
-using an interface that supports scatter/gather via struct iovec, each
-element of the request must meet the above alignment constraints.
-.It Dv O_DIRECTORY
-Fail if the file is not a directory.
-.It Dv O_ASYNC
-Enable the
-.Dv SIGIO
-signal to be sent to the process group
-when I/O is possible, e.g.,
-upon availability of data to be read.
-.\"    (This block awaits a decision about the semantics of O_SEARCH)
-.\" .It Dv O_SEARCH
-.\" If opening a directory, search permission checks will not be performed on
-.\" subsequent usage of the file descriptor for looking up relative paths by
-.\" .Xr faccessat 2 ,
-.\" .Xr fchmodat 2 ,
-.\" .Xr fchownat 2 ,
-.\" .Xr fstatat 2 ,
-.\" .Xr linkat 2 ,
-.\" .Xr mkdirat 2 ,
-.\" .Xr mkfifoat 2 ,
-.\" .Xr mknodat 2 ,
-.\" .Xr openat 2 ,
-.\" .Xr readlinkat 2 ,
-.\" .Xr symlinkat 2 ,
-.\" .Xr unlinkat 2 ,
-.\" and
-.\" .Xr utimensat 2 .
-.El
-.Pp
-Opening a file with
-.Dv O_APPEND
-set causes each write on the file
-to be appended to the end.
-If
-.Dv O_TRUNC
-is specified and the
-file exists, the file is truncated to zero length.
-.Pp
-If
-.Dv O_EXCL
-is set with
-.Dv O_CREAT
-and the file already
-exists,
-.Fn open
-returns an error.
-This may be used to implement a simple exclusive access locking mechanism.
-If
-.Dv O_EXCL
-is set and the last component of the pathname is
-a symbolic link,
-.Fn open
-will fail even if the symbolic
-link points to a non-existent name.
-.Pp
-If the
-.Dv O_NONBLOCK
-flag is specified, do not wait for the device or file to be ready or
-available.
-If the
-.Fn open
-call would result
-in the process being blocked for some reason (e.g., waiting for
-carrier on a dialup line),
-.Fn open
-returns immediately.
-This flag also has the effect of making all subsequent I/O on the open file non-blocking.
-.Pp
-When opening a file, a lock with
-.Xr flock 2
-semantics can be obtained by setting
-.Dv O_SHLOCK
-for a shared lock, or
-.Dv O_EXLOCK
-for an exclusive lock.
-If creating a file with
-.Dv O_CREAT ,
-the request for the lock will never fail
-(provided that the underlying filesystem supports locking).
-.Pp
-If
-.Fn open
-is successful, the file pointer used to mark the current position within
-the file is set to the beginning of the file.
-.Pp
-When a new file is created it is given the group of the directory
-which contains it.
-.Pp
-The new descriptor is set to remain open across
-.Xr execve 2
-system calls; see
-.Xr close 2
-and
-.Xr fcntl 2 .
-.Pp
-The system imposes a limit on the number of file descriptors
-open simultaneously by one process.
-Calling
-.Xr getdtablesize 3
-returns the current system limit.
-.Sh RETURN VALUES
-If successful,
-.Fn open
-and
-.Fn openat
-returns a non-negative integer, termed a file descriptor.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The named file is opened unless:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix,
-the required permissions (for reading and/or writing)
-are denied for the given flags, or
-.Dv O_CREAT
-is specified,
-the file does not exist,
-and the directory in which it is to be created
-does not permit writing.
-.It Bq Er EDQUOT
-.Dv O_CREAT
-is specified,
-the file does not exist,
-and the directory in which the entry for the new file
-is being placed cannot be extended because the
-user's quota of disk blocks on the file system
-containing the directory has been exhausted; or
-.Dv O_CREAT
-is specified,
-the file does not exist,
-and the user's quota of inodes on the file system on
-which the file is being created has been exhausted.
-.It Bq Er EEXIST
-.Dv O_CREAT
-and
-.Dv O_EXCL
-were specified and the file exists.
-.It Bq Er EFAULT
-.Fa path
-points outside the process's allocated address space.
-.It Bq Er EFTYPE
-.Dv O_NOFOLLOW
-was specified, but the last path component is a symlink.
-.Em Note :
-.St -p1003.1-2008
-specifies returning
-.Bq Er ELOOP
-for this case.
-.It Bq Er EINTR
-The
-.Fn open
-operation was interrupted by a signal.
-.It Bq Er EIO
-An I/O error occurred while making the directory entry or
-allocating the inode for
-.Dv O_CREAT .
-.It Bq Er EISDIR
-The named file is a directory, and the arguments specify
-it is to be opened for writing.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EMFILE
-The process has already reached its limit for open file descriptors.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENFILE
-The system file table is full.
-.It Bq Er ENOENT
-.Dv O_CREAT
-is not set and the named file does not exist, or
-a component of the path name that must exist does not exist.
-.It Bq Er ENOSPC
-.Dv O_CREAT
-is specified,
-the file does not exist,
-and the directory in which the entry for the new file is being placed
-cannot be extended because there is no space left on the file
-system containing the directory; or
-.Dv O_CREAT
-is specified,
-the file does not exist,
-and there are no free inodes on the file system on which the
-file is being created.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory; or
-.Dv O_DIRECTORY
-is specified and the last path component is not a directory.
-.It Bq Er ENXIO
-The named file is a character special or block
-special file, and the device associated with this special file
-does not exist, or
-the named file is a
-.Tn FIFO ,
-.Dv O_NONBLOCK
-and
-.Dv O_WRONLY
-is set and no process has the file open for reading.
-.It Bq Er EOPNOTSUPP
-.Dv O_SHLOCK
-or
-.Dv O_EXLOCK
-is specified but the underlying filesystem does not support locking; or
-an attempt was made to open a socket (not currently implemented).
-.It Bq Er EPERM
-The file's flags (see
-.Xr chflags 2 )
-don't allow the file to be opened.
-.It Bq Er EROFS
-The named file resides on a read-only file system,
-and the file is to be modified.
-.It Bq Er ETXTBSY
-The file is a pure procedure (shared text) file that is being
-executed and the
-.Fn open
-call requests write access.
-.El
-.Pp
-In addition,
-.Fn openat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa path
-does not specify an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for reading or searching.
-.It Bq Er ENOTDIR
-.Fa path
-is not an absolute path and
-.Fa fd
-is a file descriptor associated with a non-directory file.
-.El
-.Sh SEE ALSO
-.Xr chmod 2 ,
-.Xr close 2 ,
-.Xr dup 2 ,
-.Xr faccessat 2 ,
-.Xr fchmodat 2 ,
-.Xr fchownat 2 ,
-.Xr fstatat 2 ,
-.Xr linkat 2 ,
-.Xr lseek 2 ,
-.Xr mkdirat 2 ,
-.Xr mkfifoat 2 ,
-.Xr mknodat 2 ,
-.Xr read 2 ,
-.Xr readlinkat 2 ,
-.Xr symlinkat 2 ,
-.Xr umask 2 ,
-.Xr unlinkat 2 ,
-.Xr utimensat 2 ,
-.Xr write 2 ,
-.Xr getdtablesize 3
-.Sh STANDARDS
-The
-.Fn open
-function conforms to
-.St -p1003.1-90 .
-.Fn openat
-conforms to
-.St -p1003.1-2008 .
-.Pp
-The
-.Fa flags
-values
-.Dv O_DSYNC ,
-.Dv O_SYNC
-and
-.Dv O_RSYNC
-are extensions defined in
-.St -p1003.1b-93 .
-.\"    (This block awaits a decision about the semantics of O_SEARCH)
-.\" .Dv O_SEARCH
-.\" is defined in
-.\" .St -p1003.1-2008 .
-.Pp
-The
-.Dv O_SHLOCK
-and
-.Dv O_EXLOCK
-flags are non-standard extensions and should not be used if portability
-is of concern.
-.Sh HISTORY
-An
-.Fn open
-function call appeared in
-.At v2 .
diff --git a/lib/libc/sys/pathconf.2 b/lib/libc/sys/pathconf.2
deleted file mode 100644
index c123f75b7..000000000
--- a/lib/libc/sys/pathconf.2
+++ /dev/null
@@ -1,192 +0,0 @@
-.\"	$NetBSD: pathconf.2,v 1.28 2014/06/09 09:15:48 njoly Exp $
-.\"
-.\" 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.
-.\"
-.\"	@(#)pathconf.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd July 26, 2010
-.Dt PATHCONF 2
-.Os
-.Sh NAME
-.Nm pathconf ,
-.Nm fpathconf
-.Nd get configurable pathname variables
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft long
-.Fn pathconf "const char *path" "int name"
-.Ft long
-.Fn fpathconf "int fd" "int name"
-.Sh DESCRIPTION
-The
-.Fn pathconf
-and
-.Fn fpathconf
-functions provide a method for applications to determine the current
-value of a configurable system limit or option variable associated
-with a pathname or file descriptor.
-.Pp
-For
-.Nm pathconf ,
-the
-.Fa path
-argument is the name of a file or directory.
-For
-.Nm fpathconf ,
-the
-.Fa fd
-argument is an open file descriptor.
-The
-.Fa name
-argument specifies the system variable to be queried.
-Symbolic constants for each name value are found in the
-.In unistd.h
-header.
-.Pp
-The available values are as follows:
-.Bl -tag -width "123456"
-.It Li _PC_LINK_MAX
-The maximum file link count.
-.It Li _PC_MAX_CANON
-The maximum number of bytes in terminal canonical input line.
-.It Li _PC_MAX_INPUT
-The minimum maximum number of bytes for which space is available in
-a terminal input queue.
-.It Li _PC_NAME_MAX
-The maximum number of bytes in a filename,
-not including a terminating null character.
-.It Li _PC_PATH_MAX
-The maximum number of bytes in a pathname,
-including the terminating null character.
-.It Li _PC_PIPE_BUF
-The maximum number of bytes which will be written atomically to a pipe.
-.It Li _PC_CHOWN_RESTRICTED
-Return 1 if appropriate privileges are required for the
-.Xr chown 2
-system call, otherwise 0.
-.It Li _PC_NO_TRUNC
-Return 0 if filenames longer than
-.Brq Dv NAME_MAX
-are silently truncated, or non-zero if an error is generated when
-.Brq Dv NAME_MAX
-is exceeded.
-.It Li _PC_VDISABLE
-Returns the terminal character disabling value.
-.It Li _PC_SYNC_IO
-Returns 1 if synchronized I/O is supported, otherwise 0.
-.It Li _PC_FILESIZEBITS
-If the maximum size file that could ever exist on the mounted file system is
-.Dv maxsize ,
-then the returned value is 2 plus the floor of the base 2 logarithm of
-.Dv maxsize .
-.It Li _PC_SYMLINK_MAX
-The maximum number of bytes in a symbolic link.
-.It Li _PC_2_SYMLINKS
-When referring to a directory the system supports the creation of symbolic
-links within that directory; for nondirectory files, the meaning of
-.Dv {_PC_2_SYMLINKS}
-is undefined.
-.El
-.Sh RETURN VALUES
-If the call to
-.Nm pathconf
-or
-.Nm fpathconf
-is not successful, \-1 is returned and
-.Va errno
-is set appropriately.
-Otherwise, if the variable is associated with functionality that does
-not have a limit in the system, \-1 is returned and
-.Va errno
-is not modified.
-Otherwise, the current variable value is returned.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Nm pathconf
-and
-.Nm fpathconf
-functions shall return \-1 and set
-.Va errno
-to the corresponding value.
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of the
-.Fa name
-argument is invalid, or
-the implementation does not support an association of the variable
-name with the associated file.
-.El
-.Pp
-.Fn pathconf
-will fail if:
-.Bl -tag -width ENAMETOOLONGAA
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.El
-.Pp
-.Fn fpathconf
-will fail if:
-.Bl -tag -width [EFAULT]
-.It Bq Er EBADF
-.Fa fd
-is not a valid open file descriptor.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr sysctl 3
-.Sh STANDARDS
-The
-.Fn pathconf
-and
-.Fn fpathconf
-functions conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Nm pathconf
-and
-.Nm fpathconf
-functions first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/sys/pipe.2 b/lib/libc/sys/pipe.2
deleted file mode 100644
index db1ba5513..000000000
--- a/lib/libc/sys/pipe.2
+++ /dev/null
@@ -1,160 +0,0 @@
-.\"	$NetBSD: pipe.2,v 1.30 2014/02/22 17:26:41 dholland Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)pipe.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd January 23, 2012
-.Dt PIPE 2
-.Os
-.Sh NAME
-.Nm pipe
-.Nd create descriptor pair for interprocess communication
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn pipe "int fildes[2]"
-.In unistd.h
-.In fcntl.h
-.Ft int
-.Fn pipe2 "int fildes[2]" "int flags"
-.Sh DESCRIPTION
-The
-.Fn pipe
-function
-creates a
-.Em pipe ,
-which is an object allowing
-unidirectional data flow,
-and allocates a pair of file descriptors.
-The first descriptor connects to the
-.Em read end
-of the pipe,
-and the second connects to the
-.Em write end  ,
-so that data written to
-.Fa fildes[1]
-appears on (i.e., can be read from)
-.Fa fildes[0] .
-This allows the output of one program to be
-sent
-to another program:
-the source's standard output is set up to be
-the write end of the pipe,
-and the sink's standard input is set up to be
-the read end of the pipe.
-The pipe itself persists until all its associated descriptors are
-closed.
-.Pp
-A pipe whose read or write end has been closed is considered
-.Em widowed .
-Writing on such a pipe causes the writing process to receive
-a
-.Dv SIGPIPE
-signal.
-Widowing a pipe is the only way to deliver end-of-file to a reader:
-after the reader consumes any buffered data, reading a widowed pipe
-returns a zero count.
-.Pp
-The
-.Fn pipe2
-function
-behaves exactly like
-.Fn pipe
-only it allows extra
-.Fa flags
-to be set on the returned file descriptor.
-The following flags are valid:
-.Bl -tag -width O_NONBLOCK -offset indent
-.It Dv O_CLOEXEC
-Set the
-.Dq close-on-exec
-property.
-.It Dv O_NONBLOCK
-Sets non-blocking I/O.
-.It Dv O_NOSIGPIPE
-Return
-.Er EPIPE
-instead of raising
-.Dv SIGPIPE .
-.El
-.Sh RETURN VALUES
-On successful creation of the pipe, zero is returned.
-Otherwise, a value of \-1 is returned and the variable
-.Va errno
-set to indicate the
-error.
-.Sh ERRORS
-The
-.Fn pipe
-and
-.Fn pipe2
-calls will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa fildes
-buffer is in an invalid area of the process's address space.
-The reliable detection of this error cannot be guaranteed; when not
-detected, a signal may be delivered to the process, indicating an
-address violation.
-.It Bq Er EMFILE
-Too many descriptors are active.
-.It Bq Er ENFILE
-The system file table is full.
-.El
-.Pp
-.Fn pipe2
-will also fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-.Fa flags
-contains an invalid value.
-.El
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr fork 2 ,
-.Xr read 2 ,
-.Xr socketpair 2 ,
-.Xr write 2
-.Sh STANDARDS
-The
-.Fn pipe
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-A
-.Fn pipe
-function call appeared in
-.At v6 .
-The
-.Fn pipe2
-function is inspired from Linux and appeared in
-.Nx 6.0 .
diff --git a/lib/libc/sys/pmc_control.2 b/lib/libc/sys/pmc_control.2
deleted file mode 100644
index 352e789e1..000000000
--- a/lib/libc/sys/pmc_control.2
+++ /dev/null
@@ -1,236 +0,0 @@
-.\" $NetBSD: pmc_control.2,v 1.7 2005/10/31 11:34:16 wiz Exp $
-.\"
-.\" Copyright (c) 2002 Wasabi Systems, Inc.
-.\" All rights reserved.
-.\"
-.\" Written by Allen Briggs for Wasabi Systems, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed for the NetBSD Project by
-.\"      Wasabi Systems, Inc.
-.\" 4. The name of Wasabi Systems, Inc. may not be used to endorse
-.\"    or promote products derived from this software without specific prior
-.\"    written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd October 27, 2005
-.Dt PMC_CONTROL 2
-.Os
-.Sh NAME
-.Nm pmc_control ,
-.Nm pmc_get_info
-.Nd Hardware Performance Monitoring Interface
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/pmc.h
-.Ft int
-.Fn pmc_control "int ctr" "int op" "void *argp"
-.Ft int
-.Fn pmc_get_info "int ctr" "int op" "void *argp"
-.Sh DESCRIPTION
-.Fn pmc_get_info
-returns the number of counters in the system or information on a specified
-counter
-.Fa ctr .
-The possible values for
-.Fa op
-are:
-.Bl -tag -width width
-.It Dv PMC_INFO_NCOUNTERS
-When querying the number of counters in the system,
-.Fa ctr
-is ignored and
-.Fa argp
-is of type
-.Ft int * .
-Upon return, the integer pointed to by
-.Fa argp
-will contain the number of counters that are available in the system.
-.It Dv PMC_INFO_CPUCTR_TYPE
-When querying the type of a counter in the system,
-.Fa ctr
-refers to the counter being queried, and
-.Fa argp
-is of type
-.Ft int * .
-Upon return, the integer pointed to by
-.Fa argp
-will contain the implementation-dependent type of the specified counter.
-.Pp
-If
-.Fa ctr
-is \-1, the integer pointed to by
-.Fa argp
-will contain the machine-dependent type
-describing the CPU or counter configuration.
-.It Dv PMC_INFO_COUNTER_VALUE
-When querying the value of a counter in the system,
-.Fa ctr
-refers to the counter being queried, and
-.Fa argp
-is of type
-.Ft uint64_t * .
-Upon return, the 64-bit integer pointed to by
-.Fa argp
-will contain the value of the specified counter.
-.It Dv PMC_INFO_ACCUMULATED_COUNTER_VALUE
-When querying the value of a counter in the system,
-.Fa ctr
-refers to the counter being queried, and
-.Fa argp
-is of type
-.Ft uint64_t * .
-Upon return, the 64-bit integer pointed to by
-.Fa argp
-will contain the sum of the accumulated values of specified counter in
-all exited subprocesses of the current process.
-.El
-.Pp
-.Fn pmc_control
-manipulates the specified counter
-.Fa ctr
-in one of several fashions.
-The
-.Fa op
-parameter determines the action taken by the kernel and also the interpretation of the
-.Fa argp
-parameter.
-The possible values for
-.Fa op
-are:
-.Bl -tag -width width
-.It Dv PMC_OP_START
-Starts the specified
-.Fa ctr
-running.
-It must be preceded by a call with
-.Dv PMC_OP_CONFIGURE .
-.Fa argp
-is ignored in this case and may be
-.Dv NULL .
-.It Dv PMC_OP_STOP
-Stops the specified
-.Fa ctr
-from running.
-.Fa argp
-is ignored in this case and may be
-.Dv NULL .
-.It Dv PMC_OP_CONFIGURE
-Configures the specified
-.Fa ctr
-prior to running.
-.Fa argp
-is a pointer to a
-.Ft struct pmc_counter_cfg .
-.Bd -literal
-	struct pmc_counter_cfg {
-		pmc_evid_t	event_id;
-		pmc_ctr_t	reset_value;
-		uint32_t	flags;
-	};
-.Ed
-.Bl -tag -width width
-.It Dv event_id
-is the event ID to be counted.
-.It Dv reset_value
-is a value to which the counter should be reset on overflow (if supported
-by the implementation).
-This is most useful when profiling (see
-.Dv PMC_OP_PROFSTART ,
-below).
-This value is defined to be the number of counter ticks before
-the next overflow.
-So, to get a profiling tick on every hundredth data cache miss, set the
-.Dv event_id
-to the proper value for
-.Dq dcache-miss
-and set
-.Dv reset_value
-to 100.
-.It Dv flags
-Currently unused.
-.El
-.It Dv PMC_OP_PROFSTART
-Configures the specified
-.Fa ctr
-for use in profiling.
-.Fa argp
-is a pointer to a
-.Ft struct pmc_counter_cfg
-as in
-.Dv PMC_OP_CONFIGURE ,
-above.
-This request allocates a kernel counter, which will fail if any
-process is using the requested counter.
-Not all implementations or counters may support this option.
-.It Dv PMC_OP_PROFSTOP
-Stops the specified
-.Fa ctr
-from being used for profiling.
-.Fa argp
-is ignored in this case and may be
-.Dv NULL .
-.El
-.Sh RETURN VALUES
-A return value of 0 indicates that the call succeeded.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-Among the possible error codes from
-.Fn pmc_control
-and
-.Fn pmc_get_info
-are
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The address specified for the
-.Fa argp
-is invalid.
-.It Bq Er ENXIO
-Specified counter is not yet configured.
-.It Bq Er EINPROGRESS
-.Dv PMC_OP_START
-was passed for a counter that is already running.
-.It Bq Er EINVAL
-Specified counter was invalid.
-.It Bq Er EBUSY
-If the requested counter is already in use--either by the current process
-or by the kernel.
-.It Bq Er ENODEV
-If and only if the specified counter event is not valid for the specified
-counter when configuring a counter or starting profiling.
-.It Bq Er ENOMEM
-If the kernel is unable to allocate memory.
-.El
-.Sh SEE ALSO
-.Xr pmc 1 ,
-.Xr pmc 9
-.Sh HISTORY
-The
-.Fn pmc_control
-and
-.Fn pmc_get_info
-system calls appeared in
-.Nx 2.0 .
diff --git a/lib/libc/sys/poll.2 b/lib/libc/sys/poll.2
deleted file mode 100644
index bfc3ccff2..000000000
--- a/lib/libc/sys/poll.2
+++ /dev/null
@@ -1,246 +0,0 @@
-.\"	$NetBSD: poll.2,v 1.28 2010/03/22 19:30:55 joerg Exp $
-.\"
-.\" Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Charles M. Hannum.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 8, 2006
-.Dt POLL 2
-.Os
-.Sh NAME
-.Nm poll, pollts
-.Nd synchronous I/O multiplexing
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In poll.h
-.Ft int
-.Fn poll "struct pollfd *fds" "nfds_t nfds" "int timeout"
-.In poll.h
-.In signal.h
-.In time.h
-.Ft int
-.Fn pollts "struct pollfd * restrict fds" "nfds_t nfds" "const struct timespec * restrict ts" "const sigset_t * restrict sigmask"
-.Sh DESCRIPTION
-.Fn poll
-and
-.Fn pollts
-examine a set of file descriptors to see if some of them are ready for
-I/O.
-The
-.Fa fds
-argument is a pointer to an array of pollfd structures as defined in
-.In poll.h
-(shown below).
-The
-.Fa nfds
-argument determines the size of the
-.Fa fds
-array.
-.Bd -literal
-struct pollfd {
-    int    fd;       /* file descriptor */
-    short  events;   /* events to look for */
-    short  revents;  /* events returned */
-};
-.Ed
-.Pp
-The fields of
-.Fa struct pollfd
-are as follows:
-.Bl -tag -width XXXrevents
-.It fd
-File descriptor to poll.
-If the value in
-.Em fd
-is negative, the file descriptor is ignored and
-.Em revents
-is set to 0.
-.It events
-Events to poll for.
-(See below.)
-.It revents
-Events which may occur.
-(See below.)
-.El
-.Pp
-The event bitmasks in
-.Fa events
-and
-.Fa revents
-have the following bits:
-.Bl -tag -width XXXPOLLWRNORM
-.It POLLIN
-Data other than high priority data may be read without blocking.
-.It POLLRDNORM
-Normal data may be read without blocking.
-.It POLLRDBAND
-Data with a non-zero priority may be read without blocking.
-.It POLLPRI
-High priority data may be read without blocking.
-.It POLLOUT
-Normal data may be written without blocking.
-.It POLLWRNORM
-Equivalent to
-POLLOUT.
-.It POLLWRBAND
-Data with a non-zero priority may be written without blocking.
-.It POLLERR
-An exceptional condition has occurred on the device or socket.
-This flag is always checked, even if not present in the
-.Fa events
-bitmask.
-.It POLLHUP
-The device or socket has been disconnected.
-This flag is always
-checked, even if not present in the
-.Fa events
-bitmask.
-Note that
-POLLHUP
-and
-POLLOUT
-should never be present in the
-.Fa revents
-bitmask at the same time.
-If the remote end of a socket is closed,
-.Fn poll
-returns a
-POLLIN
-event, rather than a
-POLLHUP.
-.It POLLNVAL
-The file descriptor is not open.
-This flag is always checked, even
-if not present in the
-.Fa events
-bitmask.
-.El
-.Pp
-If
-.Fa timeout
-is neither zero nor INFTIM (\-1), it specifies a maximum interval to
-wait for any file descriptor to become ready, in milliseconds.
-If
-.Fa timeout
-is INFTIM (\-1), the poll blocks indefinitely.
-If
-.Fa timeout
-is zero, then
-.Fn poll
-will return without blocking.
-.Pp
-If
-.Fa ts
-is a non-null pointer, it references a timespec structure which specifies a
-maximum interval to wait for any file descriptor to become ready.
-If
-.Fa ts
-is a null pointer,
-.Fn pollts
-blocks indefinitely.
-If
-.Fa ts
-is a non-null pointer, referencing a zero-valued timespec structure, then
-.Fn pollts
-will return without blocking.
-.Pp
-If
-.Fa sigmask
-is a non-null pointer, then the
-.Fn pollts
-function shall replace the signal mask of the caller by the set of
-signals pointed to by
-.Fa sigmask
-before examining the descriptors, and shall restore the signal mask
-of the caller before returning.
-.Sh RETURN VALUES
-.Fn poll
-returns the number of descriptors that are ready for I/O, or \-1 if an
-error occurred.
-If the time limit expires,
-.Fn poll
-returns 0.
-If
-.Fn poll
-returns with an error,
-including one due to an interrupted call,
-the
-.Fa fds
-array will be unmodified.
-.Sh COMPATIBILITY
-This implementation differs from the historical one in that a given
-file descriptor may not cause
-.Fn poll
-to return with an error.
-In cases where this would have happened in the historical implementation
-(e.g. trying to poll a
-.Xr revoke 2 Ns d
-descriptor), this implementation instead copies the
-.Fa events
-bitmask to the
-.Fa revents
-bitmask.
-Attempting to perform I/O on this descriptor will then return an error.
-This behaviour is believed to be more useful.
-.Sh ERRORS
-An error return from
-.Fn poll
-indicates:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-.Fa fds
-points outside the process's allocated address space.
-.It Bq Er EINTR
-A signal was delivered before the time limit expired and
-before any of the selected events occurred.
-.It Bq Er EINVAL
-The specified time limit is negative.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr connect 2 ,
-.Xr read 2 ,
-.Xr recv 2 ,
-.Xr select 2 ,
-.Xr send 2 ,
-.Xr write 2
-.Sh HISTORY
-The
-.Fn poll
-function appeared in
-.At V.3 .
-The
-.Fn pollts
-function first appeared in
-.Nx 3.0 .
-.Sh BUGS
-The distinction between some of the fields in the
-.Fa events
-and
-.Fa revents
-bitmasks is really not useful without STREAMS.
-The fields are defined for compatibility with existing software.
diff --git a/lib/libc/sys/posix_fadvise.2 b/lib/libc/sys/posix_fadvise.2
deleted file mode 100644
index b09b61a05..000000000
--- a/lib/libc/sys/posix_fadvise.2
+++ /dev/null
@@ -1,102 +0,0 @@
-.\"	$NetBSD: posix_fadvise.2,v 1.5 2013/02/04 20:03:11 wiz Exp $
-.\"
-.\" Copyright (c)2006,2009 YAMAMOTO Takashi,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" ------------------------------------------------------------
-.Dd February 4, 2013
-.Dt POSIX_FADVISE 2
-.Os
-.Sh NAME
-.Nm posix_fadvise
-.Nd hint at the future access pattern of a file
-.\" ------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ------------------------------------------------------------
-.Sh SYNOPSIS
-.In fcntl.h
-.Ft int
-.Fn posix_fadvise "int fd" "off_t offset" "off_t size" "int hint"
-.\" ------------------------------------------------------------
-.Sh DESCRIPTION
-.Fn posix_fadvise
-hints at the application's access pattern to the file and range
-given by
-the file descriptor,
-.Fa fd ,
-and
-.Fa offset
-and
-.Fa size .
-If
-.Fa size
-is zero, it means to the end of file.
-.Pp
-.Fa hint
-should be one of the followings.
-.Pp
-.Bl -tag -offset indent -width POSIX_FADV_SEQUENTIAL -compact
-.It POSIX_FADV_NORMAL
-No hint.
-(default)
-.It POSIX_FADV_RANDOM
-Random access.
-.It POSIX_FADV_SEQUENTIAL
-Sequential access.
-(from lower offset to higher offset.)
-.It POSIX_FADV_WILLNEED
-Will be accessed.
-.It POSIX_FADV_DONTNEED
-Will not be accessed.
-.It POSIX_FADV_NOREUSE
-Will be accessed just once.
-.El
-.Pp
-Calling
-.Fn posix_fadvise
-doesn't alter the semantics of the operations,
-it is only a matter of performance.
-.\" ------------------------------------------------------------
-.Sh RETURN VALUES
-On success,
-.Fn posix_fadvise
-returns 0.
-Otherwise, it returns an error number.
-.\" ------------------------------------------------------------
-.Sh SEE ALSO
-.Xr errno 2 ,
-.Xr madvise 2
-.\" ------------------------------------------------------------
-.Sh BUGS
-For
-.Dv POSIX_FADV_NORMAL ,
-.Dv POSIX_FADV_RANDOM ,
-and
-.Dv POSIX_FADV_SEQUENTIAL ,
-the current implementation ignores
-.Fa offset
-and
-.Fa size ,
-and applies the hint to the whole file.
diff --git a/lib/libc/sys/posix_fadvise.c b/lib/libc/sys/posix_fadvise.c
deleted file mode 100644
index d27ed1551..000000000
--- a/lib/libc/sys/posix_fadvise.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $NetBSD: posix_fadvise.c,v 1.2 2008/04/28 20:23:00 martin Exp $ */
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Martin Husemann <martin@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/fcntl.h>
-
-int __posix_fadvise50(int fd, int pad, off_t offset, off_t size, int hint);
-
-int
-posix_fadvise(int fd, off_t offset, off_t size, int hint)
-{
-	return __posix_fadvise50(fd, 0, offset, size, hint);
-}
diff --git a/lib/libc/sys/posix_fallocate.c b/lib/libc/sys/posix_fallocate.c
deleted file mode 100644
index ee8b079d5..000000000
--- a/lib/libc/sys/posix_fallocate.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: posix_fallocate.c,v 1.1 2014/09/25 15:08:29 manu Exp $ */
-
-/*
- * Copyright (c) 2014 The NetBSD Foundation, Inc.      
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Emmanuel Dreyfus.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: posix_fallocate.c,v 1.1 2014/09/25 15:08:29 manu Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-int __posix_fallocate(int, int, off_t, off_t);
-
-/*
- * 64-bit offset padding required for gcc 1.x
- */
-int
-posix_fallocate(int fd, off_t off, off_t len)
-{
-	return __posix_fallocate(fd, 0, off, len);
-}
diff --git a/lib/libc/sys/posix_madvise.c b/lib/libc/sys/posix_madvise.c
deleted file mode 100644
index c16ba6ed6..000000000
--- a/lib/libc/sys/posix_madvise.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$NetBSD: posix_madvise.c,v 1.1 2008/04/22 10:42:16 rmind Exp $	*/
-
-/*
- * Copyright (c) 2008, Mindaugas Rasiukevicius <rmind at NetBSD org>
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/mman.h>
-
-int
-posix_madvise(void *addr, size_t len, int advice)
-{
-
-	return madvise(addr, len, advice);
-}
diff --git a/lib/libc/sys/pread.c b/lib/libc/sys/pread.c
deleted file mode 100644
index d8352f4f5..000000000
--- a/lib/libc/sys/pread.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: pread.c,v 1.9 2007/11/22 21:11:31 dsl Exp $	*/
-
-/*
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pread.c,v 1.9 2007/11/22 21:11:31 dsl Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(pread,_sys_pread)
-__weak_alias(_pread,_sys_pread)
-#endif
-#ifdef __lint__
-#define _sys_pread pread
-#endif
-
-ssize_t	 _sys_pread(int, void *, size_t, off_t);
-ssize_t	 __pread(int, void *, size_t, int, off_t);
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-ssize_t
-_sys_pread(int fd, void *buf, size_t nbyte, off_t offset)
-{
-
-	return __pread(fd, buf, nbyte, 0, offset);
-}
diff --git a/lib/libc/sys/preadv.c b/lib/libc/sys/preadv.c
deleted file mode 100644
index dbe8a010d..000000000
--- a/lib/libc/sys/preadv.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: preadv.c,v 1.7 2012/03/20 16:26:12 matt Exp $	*/
-
-/*
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: preadv.c,v 1.7 2012/03/20 16:26:12 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/uio.h>
-#include <unistd.h>
-
-ssize_t __preadv(int, const struct iovec *, int, int, off_t);
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-ssize_t
-preadv(int fd, const struct iovec *iovp, int iovcnt, off_t offset)
-{
-
-	return __preadv(fd, iovp, iovcnt, 0, offset);
-}
diff --git a/lib/libc/sys/profil.2 b/lib/libc/sys/profil.2
deleted file mode 100644
index e628d174c..000000000
--- a/lib/libc/sys/profil.2
+++ /dev/null
@@ -1,132 +0,0 @@
-.\"	$NetBSD: profil.2,v 1.13 2003/08/07 16:44:04 agc Exp $
-.\"
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley of BSDI.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"	@(#)profil.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt PROFIL 2
-.Os
-.Sh NAME
-.Nm profil
-.Nd control process profiling
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn profil "char *samples" "size_t size" "u_long offset" "u_int scale"
-.Sh DESCRIPTION
-The
-.Fn profil
-function enables or disables
-program counter profiling of the current process.
-If profiling is enabled,
-then at every clock tick,
-the kernel updates an appropriate count in the
-.Fa samples
-buffer.
-.Pp
-The buffer
-.Fa samples
-contains
-.Fa size
-bytes and is divided into
-a series of 16-bit bins.
-Each bin counts the number of times the program counter
-was in a particular address range in the process
-when a clock tick occurred while profiling was enabled.
-For a given program counter address,
-the number of the corresponding bin is given
-by the relation:
-.Bd -literal -offset indent
-[(pc - offset) / 2] * scale / 65536
-.Ed
-.Pp
-The
-.Fa offset
-parameter is the lowest address at which
-the kernel takes program counter samples.
-The
-.Fa scale
-parameter ranges from 1 to 65536 and
-can be used to change the span of the bins.
-A scale of 65536 maps each bin to 2 bytes of address range;
-a scale of 32768 gives 4 bytes, 16384 gives 8 bytes and so on.
-Intermediate values provide approximate intermediate ranges.
-A
-.Fa scale
-value of 0 disables profiling.
-.Sh RETURN VALUES
-If the
-.Fa scale
-value is nonzero and the buffer
-.Fa samples
-contains an illegal address,
-.Fn profil
-returns \-1,
-profiling is terminated and
-.Va errno
-is set appropriately.
-Otherwise
-.Fn profil
-returns 0.
-.Sh FILES
-.Bl -tag -width /usr/lib/gcrt0.o -compact
-.It Pa /usr/lib/gcrt0.o
-profiling C run-time startup file
-.It Pa gmon.out
-conventional name for profiling output file.
-This may be different if the PROFDIR environment variable is set.
-.El
-.Sh ERRORS
-The following error may be reported:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The buffer
-.Fa samples
-contains an invalid address.
-.El
-.Sh SEE ALSO
-.Xr gprof 1 ,
-.Xr moncontrol 3
-.\" .Sh HISTORY
-.\" wish I knew...  probably v7.
-.Sh BUGS
-This routine should be named
-.Fn profile .
-.Pp
-The
-.Fa samples
-argument should really be a vector of type
-.Fa "unsigned short" .
-.Pp
-The format of the gmon.out file is undocumented.
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
deleted file mode 100644
index fe3fb8d63..000000000
--- a/lib/libc/sys/ptrace.2
+++ /dev/null
@@ -1,607 +0,0 @@
-.\"	$NetBSD: ptrace.2,v 1.37 2015/07/02 03:50:21 christos Exp $
-.\"
-.\" This file is in the public domain.
-.Dd July 1, 2015
-.Dt PTRACE 2
-.Os
-.Sh NAME
-.Nm ptrace
-.Nd process tracing and debugging
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ptrace.h
-.Ft int
-.Fn ptrace "int request" "pid_t pid" "void *addr" "int data"
-.Sh DESCRIPTION
-.Fn ptrace
-provides tracing and debugging facilities.
-It allows one process (the
-.Em tracing
-process) to control another (the
-.Em traced
-process).
-Most of the time, the traced process runs normally, but when
-it receives a signal
-.Po
-see
-.Xr sigaction 2
-.Pc ,
-it stops.
-The tracing process is expected to notice this via
-.Xr wait 2
-or the delivery of a
-.Dv SIGCHLD
-signal, examine the state of the stopped process, and cause it to
-terminate or continue as appropriate.
-.Fn ptrace
-is the mechanism by which all this happens.
-.Pp
-The
-.Fa request
-argument specifies what operation is being performed; the meaning of
-the rest of the arguments depends on the operation, but except for one
-special case noted below, all
-.Fn ptrace
-calls are made by the tracing process, and the
-.Fa pid
-argument specifies the process ID of the traced process.
-.Fa request
-can be:
-.Bl -tag -width 12n
-.It Dv PT_TRACE_ME
-This request is the only one used by the traced process; it declares
-that the process expects to be traced by its parent.
-All the other arguments are ignored.
-(If the parent process does not expect to trace
-the child, it will probably be rather confused by the results; once the
-traced process stops, it cannot be made to continue except via
-.Fn ptrace . )
-When a process has used this request and calls
-.Xr execve 2
-or any of the routines built on it
-.Po
-such as
-.Xr execv 3
-.Pc ,
-it will stop before executing the first instruction of the new image.
-Also, any setuid or setgid bits on the executable being executed will
-be ignored.
-.It Dv PT_READ_I , Dv PT_READ_D
-These requests read a single
-.Li int
-of data from the traced process' address space.
-Traditionally,
-.Fn ptrace
-has allowed for machines with distinct address spaces for instruction
-and data, which is why there are two requests: conceptually,
-.Dv PT_READ_I
-reads from the instruction space and
-.Dv PT_READ_D
-reads from the data space.
-In the current
-.Nx
-implementation, these
-two requests are completely identical.
-The
-.Fa addr
-argument specifies the address (in the traced process' virtual address
-space) at which the read is to be done.
-This address does not have to meet any alignment constraints.
-The value read is returned as the return value from
-.Eo \&
-.Fn ptrace
-.Ec .
-.It Dv PT_WRITE_I , Dv PT_WRITE_D
-These requests parallel
-.Dv PT_READ_I
-and
-.Dv PT_READ_D ,
-except that they write rather than read.
-The
-.Fa data
-argument supplies the value to be written.
-.\" .It Dv PT_READ_U
-.\" This request reads an
-.\" .Li int
-.\" from the traced process' user structure.
-.\" The
-.\" .Fa addr
-.\" argument specifies the location of the int relative to the base of the
-.\" user structure; it will usually be an integer value cast to
-.\" .Li void *
-.\" either explicitly or via the presence of a prototype for
-.\" .Eo \&
-.\" .Fn ptrace
-.\" .Ec .
-.\" Unlike
-.\" .Dv PT_READ_I
-.\" and
-.\" .Dv PT_READ_D ,
-.\" .Fa addr
-.\" must be aligned on an
-.\" .Li int
-.\" boundary.
-.\" The value read is returned as the return value from
-.\" .Eo \&
-.\" .Fn ptrace
-.\" .Ec .
-.\" .It Dv PT_WRITE_U
-.\" This request writes an
-.\" .Li int
-.\" into the traced process' user structure.
-.\" .Fa addr
-.\" specifies the offset, just as for
-.\" .Dv PT_READ_U ,
-.\" and
-.\" .Fa data
-.\" specifies the value to be written, just as for
-.\" .Dv PT_WRITE_I
-.\" and
-.\" .Dv PT_WRITE_D .
-.It Dv PT_CONTINUE
-The traced process continues execution.
-.Fa addr
-is an address specifying the place where execution is to be resumed (a
-new value for the program counter), or
-.Li (void *)1
-to indicate that execution is to pick up where it left off.
-.Fa data
-provides a signal number to be delivered to the traced process as it
-resumes execution, or 0 if no signal is to be sent.
-If a negative value is supplied, that is the negative of the LWP
-ID of the thread to be resumed, and only that thread executes.
-.It Dv PT_KILL
-The traced process terminates, as if
-.Dv PT_CONTINUE
-had been used with
-.Dv SIGKILL
-given as the signal to be delivered.
-.It Dv PT_ATTACH
-This request allows a process to gain control of an otherwise unrelated
-process and begin tracing it.
-It does not need any cooperation from the to-be-traced process.
-In this case,
-.Fa pid
-specifies the process ID of the to-be-traced process, and the other two
-arguments are ignored.
-This request requires that the target process
-must have the same real UID as the tracing process, and that it must
-not be executing a setuid or setgid executable.
-(If the tracing process is running as root,
-these restrictions do not apply.)
-The tracing process will see the newly-traced process stop and may then
-control it as if it had been traced all along.
-.Pp
-Three other restrictions apply to all tracing processes, even those
-running as root.
-First, no process may trace a system process.
-Second, no process may trace the process running
-.Xr init 8 .
-Third, if a process has its root directory set with
-.Xr chroot 2 ,
-it may not trace another process unless that process's root directory
-is at or below the tracing process's root.
-.It Dv PT_DETACH
-This request is like PT_CONTINUE, except that after it
-succeeds, the traced process is no longer traced and continues
-execution normally.
-.It Dv PT_IO
-This request is a more general interface that can be used instead of
-.Dv PT_READ_D ,
-.Dv PT_WRITE_D ,
-.Dv PT_READ_I ,
-and
-.Dv PT_WRITE_I .
-The I/O request is encoded in a
-.Dq Li "struct ptrace_io_desc"
-defined as:
-.Bd -literal -offset indent
-struct ptrace_io_desc {
-	int	piod_op;
-	void	*piod_offs;
-	void	*piod_addr;
-	size_t	piod_len;
-};
-.Ed
-.Pp
-where
-.Fa piod_offs
-is the offset within the traced process where the I/O operation should
-take place,
-.Fa piod_addr
-is the buffer in the tracing process, and
-.Fa piod_len
-is the length of the I/O request.
-The
-.Fa piod_op
-field specifies which type of I/O operation to perform.
-Possible values are:
-.Pp
-.Bl -tag -width 18n -offset indent -compact
-.It Dv PIOD_READ_D
-.It Dv PIOD_WRITE_D
-.It Dv PIOD_READ_I
-.It Dv PIOD_WRITE_I
-.It Dv PIOD_READ_AUXV
-.El
-.Pp
-See the description of
-.Dv PT_READ_I
-for the difference between I and D spaces.
-The
-.Dv PIOD_READ_AUXV
-operation can be used to read from the ELF auxiliary vector.
-A pointer to the I/O descriptor is passed in the
-.Fa addr
-argument to
-.Fn ptrace .
-On return, the
-.Fa piod_len
-field in the I/O descriptor will be updated with the actual number of
-bytes transferred.
-If the requested I/O could not be successfully performed,
-.Fn ptrace
-will return
-.Li \-1
-and set
-.Va errno .
-.It Dv PT_DUMPCORE
-Makes the process specified in the
-.Fa pid
-pid generate a core dump.
-The
-.Fa addr
-argument should contain the name of the core file to be generated
-and the
-.Fa data
-argument should contain the length of the core filename.
-This
-.Nm
-call currently does not stop the child process so it can generate
-inconsistent data.
-.It Dv PT_LWPINFO
-Returns information about a thread from the list of threads for the
-process specified in the
-.Fa pid
-argument.
-The
-.Fa addr
-argument should contain a
-.Dq Li "struct ptrace_lwpinfo"
-defined as:
-.Bd -literal -offset indent
-struct ptrace_lwpinfo {
-	lwpid_t pl_lwpid;
-	int pl_event;
-};
-.Ed
-.Pp
-where
-.Fa pl_lwpid
-contains a thread LWP ID.
-Information is returned for the thread following the one with the
-specified ID in the process thread list, or for the first thread
-if
-.Fa pl_lwpid
-is 0.
-Upon return
-.Fa pl_lwpid
-contains the LWP ID of the thread that was found, or 0 if there is
-no thread after the one whose LWP ID was supplied in the call.
-.Fa pl_event
-contains the event that stopped the thread.
-Possible values are:
-.Pp
-.Bl -tag -width 30n -offset indent -compact
-.It Dv PL_EVENT_NONE
-.It Dv PL_EVENT_SIGNAL
-.El
-.Pp
-The
-.Fa data
-argument should contain
-.Dq Li "sizeof(struct ptrace_lwpinfo)" .
-.It Dv PT_SYSCALL
-Stops a process before and after executing each system call.
-.It Dv PT_SYSCALLEMU
-Intercept and ignore a system call before it has been executed, for use with
-.Dv PT_SYSCALL .
-.El
-.Pp
-Additionally, the following requests exist but are
-not available on all machine architectures.
-The file
-.In machine/ptrace.h
-lists which requests exist on a given machine.
-.Bl -tag -width 12n
-.It Dv PT_STEP
-Execution continues as in request PT_CONTINUE; however
-as soon as possible after execution of at least one
-instruction, execution stops again.
-If the
-.Fa data
-argument is greater than 0, it contains the LWP ID of the thread to be
-stepped, and any other threads are continued.
-If the
-.Fa data
-argument is less than zero, it contains the negative of the LWP ID of
-the thread to be stepped, and only that thread executes.
-.It Dv PT_GETREGS
-This request reads the traced process' machine registers into the
-.Dq Li "struct reg"
-(defined in
-.In machine/reg.h )
-pointed to by
-.Fa addr .
-The
-.Fa data
-argument contains the LWP ID of the thread whose registers are to
-be read.
-If zero is supplied, the first thread of the process is read.
-.It Dv PT_SETREGS
-This request is the converse of
-.Dv PT_GETREGS ;
-it loads the traced process' machine registers from the
-.Dq Li "struct reg"
-(defined in
-.In machine/reg.h )
-pointed to by
-.Fa addr .
-The
-.Fa data
-argument contains the LWP ID of the thread whose registers are to
-be written.
-If zero is supplied, the first thread of the process is written.
-.It Dv PT_GETFPREGS
-This request reads the traced process' floating-point registers into
-the
-.Dq Li "struct fpreg"
-(defined in
-.In machine/reg.h )
-pointed to by
-.Fa addr .
-The
-.Fa data
-argument contains the LWP ID of the thread whose registers are to
-be read.
-If zero is supplied, the first thread of the process is read.
-.It Dv PT_SETFPREGS
-This request is the converse of
-.Dv PT_GETFPREGS ;
-it loads the traced process' floating-point registers from the
-.Dq Li "struct fpreg"
-(defined in
-.In machine/reg.h )
-pointed to by
-.Fa addr .
-The
-.Fa data
-argument contains the LWP ID of the thread whose registers are to
-be written.
-If zero is supplied, the first thread of the process is written.
-.\" .It Dv PT_SYSCALL
-.\" This request is like
-.\" .Dv PT_CONTINUE
-.\" except that the process will stop next time it executes any system
-.\" call.
-.\" Information about the system call can be examined with
-.\" .Dv PT_READ_U
-.\" and potentially modified with
-.\" .Dv PT_WRITE_U
-.\" through the
-.\" .Li u_kproc.kp_proc.p_md
-.\" element of the user structure (see below).
-.\" If the process is continued
-.\" with another
-.\" .Dv PT_SYSCALL
-.\" request, it will stop again on exit from the syscall, at which point
-.\" the return values can be examined and potentially changed.
-.\" The
-.\" .Li u_kproc.kp_proc.p_md
-.\" element is of type
-.\" .Dq Li "struct mdproc" ,
-.\" which should be declared by including
-.\" .In sys/param.h ,
-.\" .In sys/user.h ,
-.\" and
-.\" .In machine/proc.h ,
-.\" and contains the following fields (among others):
-.\" .Bl -item -compact -offset indent
-.\" .It
-.\" .Li syscall_num
-.\" .It
-.\" .Li syscall_nargs
-.\" .It
-.\" .Li syscall_args[8]
-.\" .It
-.\" .Li syscall_err
-.\" .It
-.\" .Li syscall_rv[2]
-.\" .El
-.\" When a process stops on entry to a syscall,
-.\" .Li syscall_num
-.\" holds the number of the syscall,
-.\" .Li syscall_nargs
-.\" holds the number of arguments it expects, and
-.\" .Li syscall_args
-.\" holds the arguments themselves.
-.\" (Only the first
-.\" .Li syscall_nargs
-.\" elements of
-.\" .Li syscall_args
-.\" are guaranteed to be useful.)
-.\" When a process stops on exit from a syscall,
-.\" .Li syscall_num
-.\" is
-.\" .Eo \&
-.\" .Li \-1
-.\" .Ec ,
-.\" .Li syscall_err
-.\" holds the error number
-.\" .Po
-.\" see
-.\" .Xr errno 2
-.\" .Pc ,
-.\" or 0 if no error occurred, and
-.\" .Li syscall_rv
-.\" holds the return values.
-.\" (If the syscall returns only one value, only
-.\" .Li syscall_rv[0]
-.\" is useful.)
-.\" The tracing process can modify any of these with
-.\" .Dv PT_WRITE_U ;
-.\" only some modifications are useful.
-.\" .Pp
-.\" On entry to a syscall,
-.\" .Li syscall_num
-.\" can be changed, and the syscall actually performed will correspond to
-.\" the new number (it is the responsibility of the tracing process to fill
-.\" in
-.\" .Li syscall_args
-.\" appropriately for the new call, but there is no need to modify
-.\" .Eo \&
-.\" .Li syscall_nargs
-.\" .Ec ).
-.\" If the new syscall number is 0, no syscall is actually performed;
-.\" instead,
-.\" .Li syscall_err
-.\" and
-.\" .Li syscall_rv
-.\" are passed back to the traced process directly (and therefore should be
-.\" filled in).
-.\" If the syscall number is otherwise out of range, a dummy
-.\" syscall which simply produces an
-.\" .Er ENOSYS
-.\" error is effectively performed.
-.\" .Pp
-.\" On exit from a syscall, only
-.\" .Li syscall_err
-.\" and
-.\" .Li syscall_rv
-.\" can usefully be changed; they are set to the values returned by the
-.\" syscall and will be passed back to the traced process by the normal
-.\" syscall return mechanism.
-.It Dv PT_DUMPCORE
-Cause the traced process to dump core.
-If the
-.Fa addr
-argument is not
-.Dv NULL
-it is taken to be the pathname of the core file to be generated and the
-.Fa data
-argument should contain the length of the pathname.
-The pathname may contain
-.Dv %
-patterns that are expanded as described in
-.Xr sysctl 8 .
-If the
-.Fa data
-argument is
-.Dv NULL ,
-the default core file path generation rules are followed.
-.El
-.Sh ERRORS
-Some requests can cause
-.Fn ptrace
-to return
-.Li \-1
-as a non-error value; to disambiguate,
-.Va errno
-can be set to 0 before the call and checked afterwards.
-The possible errors are:
-.Bl -tag -width "[EINVAL]"
-.It Bq Er EAGAIN
-Process is currently exec'ing and cannot be traced.
-.It Bq Er EBUSY
-.Bl -bullet -compact
-.It
-.Dv PT_ATTACH
-was attempted on a process that was already being traced.
-.It
-A request attempted to manipulate a process that was being traced by
-some process other than the one making the request.
-.It
-A request (other than
-.Dv PT_ATTACH )
-specified a process that wasn't stopped.
-.El
-.It Bq Er EINVAL
-.Bl -bullet -compact
-.It
-A process attempted to use
-.Dv PT_ATTACH
-on itself.
-.It
-The
-.Fa request
-was not a legal request on this machine architecture.
-.\" .It
-.\" The
-.\" .Fa addr
-.\" to
-.\" .Dv PT_READ_U
-.\" or
-.\" .Dv PT_WRITE_U
-.\" was not
-.\" .Li int Ns \&-aligned.
-.It
-The signal number (in
-.Fa data )
-to
-.Dv PT_CONTINUE
-.\" or
-.\" .Dv PT_SYSCALL
-was neither 0 nor a legal signal number.
-.It
-.Dv PT_GETREGS ,
-.Dv PT_SETREGS ,
-.Dv PT_GETFPREGS ,
-or
-.Dv PT_SETFPREGS
-was attempted on a process with no valid register set.
-(This is normally true only of system processes.)
-.El
-.It Bq Er EPERM
-.Bl -bullet -compact
-.It
-A request (other than
-.Dv PT_ATTACH )
-attempted to manipulate a process that wasn't being traced at all.
-.It
-An attempt was made to use
-.Dv PT_ATTACH
-on a process in violation of the requirements listed under
-.Dv PT_ATTACH
-above.
-.El
-.It Bq Er ESRCH
-No process having the specified process ID exists.
-.El
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr signal 7
-.Sh BUGS
-On the SPARC, the PC is set to the provided PC value for
-.Dv PT_CONTINUE
-and similar calls,
-but the NPC is set willy-nilly to 4 greater than the PC value.
-Using
-.Dv PT_GETREGS
-and
-.Dv PT_SETREGS
-to modify the PC, passing
-.Li (void *)1
-to
-.Eo \&
-.Fn ptrace
-.Ec ,
-should be able to sidestep this.
-.\" .Pp
-.\" When using
-.\" .Dv PT_SYSCALL ,
-.\" there is no easy way to tell whether the traced process stopped because
-.\" it made a syscall or because a signal was sent at a moment that it just
-.\" happened to have valid-looking garbage in its
-.\" .Dq Li "struct mdproc" .
diff --git a/lib/libc/sys/pwrite.c b/lib/libc/sys/pwrite.c
deleted file mode 100644
index 2a7b23342..000000000
--- a/lib/libc/sys/pwrite.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: pwrite.c,v 1.9 2007/11/22 21:11:32 dsl Exp $	*/
-
-/*
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pwrite.c,v 1.9 2007/11/22 21:11:32 dsl Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(pwrite,_sys_pwrite)
-__weak_alias(_pwrite,_sys_pwrite)
-#endif
-#ifdef __lint__
-#define _sys_pwrite pwrite
-#endif
-
-ssize_t	 _sys_pwrite(int, const void *, size_t, off_t);
-ssize_t	 __pwrite(int, const void *, size_t, int, off_t);
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-ssize_t
-_sys_pwrite(int fd, const void *buf, size_t nbyte, off_t offset)
-{
-
-	return __pwrite(fd, buf, nbyte, 0, offset);
-}
diff --git a/lib/libc/sys/pwritev.c b/lib/libc/sys/pwritev.c
deleted file mode 100644
index fd627be0a..000000000
--- a/lib/libc/sys/pwritev.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: pwritev.c,v 1.7 2012/03/20 16:26:12 matt Exp $	*/
-
-/*
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pwritev.c,v 1.7 2012/03/20 16:26:12 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/uio.h>
-#include <unistd.h>
-
-ssize_t __pwritev(int, const struct iovec *, int, int, off_t);
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-ssize_t
-pwritev(int fd, const struct iovec *iovp, int iovcnt, off_t offset)
-{
-
-	return __pwritev(fd, iovp, iovcnt, 0, offset);
-}
diff --git a/lib/libc/sys/rasctl.2 b/lib/libc/sys/rasctl.2
deleted file mode 100644
index 1d1b7e84d..000000000
--- a/lib/libc/sys/rasctl.2
+++ /dev/null
@@ -1,212 +0,0 @@
-.\"     $NetBSD: rasctl.2,v 1.13 2008/04/29 21:06:28 scw Exp $
-.\"
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Gregory McGarry.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd April 29, 2008
-.Dt RASCTL 2
-.Os
-.Sh NAME
-.Nm rasctl
-.Nd restartable atomic sequences
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ras.h
-.Ft int
-.Fn rasctl "void *addr" "size_t len" "int op"
-.Sh DESCRIPTION
-Restartable atomic sequences are code sequences which are guaranteed
-to execute without preemption.
-This property is assured by the kernel
-by re-executing a preempted sequence from the start.
-This functionality enables applications to build atomic sequences which,
-when executed to completion, will have executed atomically.
-Restartable atomic sequences are intended to be used on systems that
-do not have hardware support for low-overhead atomic primitives.
-.Pp
-The
-.Nm
-function manipulates a process's set of restartable atomic sequences.
-If a restartable atomic sequence is registered and the process is
-preempted within the range
-.Fa addr
-and
-.Fa addr Ns + Ns Fa len ,
-then the process is resumed at
-.Fa addr .
-.Pp
-As the process execution can be rolled-back, the code in the sequence
-should have no side effects other than a final store at
-.Fa addr Ns + Ns Fa len Ns \-1 .
-The kernel does not guarantee that the sequences are successfully
-restartable.
-It assumes that the application knows what it is doing.
-Restartable atomic sequences should adhere to the following guidelines:
-.Pp
-.Bl -bullet -compact
-.It
-have a single entry point and a single exit point;
-.It
-not execute emulated instructions; and
-.It
-not invoke any functions or system calls.
-.El
-.Pp
-Restartable atomic sequences are inherited from the parent by the
-child during the
-.Xr fork 2
-operation.
-Restartable atomic sequences for a process are removed during
-.Xr exec 3 .
-.Pp
-The operations that can be applied to a restartable atomic sequence
-are specified by the
-.Fa op
-argument.
-Possible operations are:
-.Pp
-.Bl -tag -compact -width RAS_PURGE_ALLXXX
-.It Dv RAS_INSTALL
-Install this sequence.
-.It Dv RAS_PURGE
-Remove the specified registered sequence for this process.
-.It Dv RAS_PURGE_ALL
-Remove all registered sequences for this process.
-.El
-.Pp
-The
-.Dv RAS_PURGE
-and
-.Dv RAS_PURGE_ALL
-operations should be considered to have
-undefined behaviour if there are any other runnable threads in the
-address space which might be executing within the restartable atomic
-sequence(s) at the time of the purge.
-The caller must be responsible for ensuring that there is some form of
-coordination with other threads to prevent unexpected behaviour.
-.Pp
-To preserve the atomicity of sequences, the kernel attempts to protect
-the sequences from alteration by the
-.Xr ptrace 2
-facility.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn rasctl
-returns zero.
-Otherwise, \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Nm
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Invalid input was supplied, such as an invalid operation, an invalid
-address, or an invalid length.
-A process may have a finite number of
-atomic sequences that is defined at compile time.
-.It Bq Er EOPNOTSUPP
-Restartable atomic sequences are not supported by the kernel.
-.It Bq Er ESRCH
-Restartable atomic sequence not registered.
-.El
-.Sh SEE ALSO
-.Xr ptrace 2
-.\" .Xr lock 9
-.Sh HISTORY
-The
-.Nm
-functionality first appeared in
-.Nx 2.0
-based on a similar interface that appeared in Mach 2.5.
-.Sh CAVEATS
-Modern compilers reorder instruction sequences to optimize speed.
-The start address and size of a
-.Nm RAS
-need to be protected against this.
-One level of protection is created by compiler dependent instructions,
-abstracted from user level code via the following macros:
-.Bl -tag -width RAS_START(name)
-.It Dv RAS_DECL(name)
-Declares the start and end labels used internally by the
-other macros to mark a
-.Nm RAS .
-The name uniquely identifies the
-.Nm RAS .
-.It Dv RAS_START(name)
-Marks the start of the code.
-Each restart returns to the instruction following this macro.
-.It Dv RAS_END(name)
-Marks the end of the restartable code.
-.It Dv RAS_ADDR(name)
-Returns the start address of a
-.Nm RAS
-and is used to create the first argument to
-.Nm .
-.It Dv RAS_SIZE(name)
-Returns the size of a
-.Nm RAS
-and is used as second argument to
-.Nm .
-.El
-Recent versions of
-.Xr gcc 1
-require the
-.Fl fno-reorder-blocks
-flag to prevent blocks of code wrapped with
-.Dv RAS_START Ns / Ns Dv RAS_END
-being moved outside these labels.
-However, be aware that this may not always be sufficient to prevent
-.Xr gcc 1
-from generating non-restartable code within the
-.Nm RAS
-due to register clobbers.
-It is, therefore, strongly recommended that restartable atomic sequences
-are coded in assembly.
-.Nm RAS
-blocks within assembly code can be specified by using the following macros:
-.Bl -tag -width RAS_START_ASM_HIDDEN(name)
-.It Dv RAS_START_ASM(name)
-Similar to
-.Nm RAS_START
-but for use in assembly source code.
-.It Dv RAS_END_ASM(name)
-Similar to
-.Nm RAS_END
-but for use in assembly source code.
-.It Dv RAS_START_ASM_HIDDEN(name)
-Similar to
-.Nm RAS_START_ASM
-except that the symbol will not be placed in the dynamic symbol table.
-.It Dv RAS_END_ASM_HIDDEN(name)
-Similar to
-.Nm RAS_END_ASM
-except that the symbol will not be placed in the dynamic symbol table.
-.El
diff --git a/lib/libc/sys/read.2 b/lib/libc/sys/read.2
deleted file mode 100644
index 3461005eb..000000000
--- a/lib/libc/sys/read.2
+++ /dev/null
@@ -1,273 +0,0 @@
-.\"	$NetBSD: read.2,v 1.35 2013/07/14 14:29:09 njoly Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)read.2	8.4 (Berkeley) 2/26/94
-.\"
-.Dd December 12, 2011
-.Dt READ 2
-.Os
-.Sh NAME
-.Nm read ,
-.Nm readv ,
-.Nm pread ,
-.Nm preadv
-.Nd read input
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft ssize_t
-.Fn read "int d" "void *buf" "size_t nbytes"
-.Ft ssize_t
-.Fn pread "int d" "void *buf" "size_t nbytes" "off_t offset"
-.In sys/uio.h
-.Ft ssize_t
-.Fn readv "int d" "const struct iovec *iov" "int iovcnt"
-.Ft ssize_t
-.Fn preadv "int d" "const struct iovec *iov" "int iovcnt" "off_t offset"
-.Sh DESCRIPTION
-.Fn read
-attempts to read
-.Fa nbytes
-of data from the object referenced by the descriptor
-.Fa d
-into the buffer pointed to by
-.Fa buf .
-.Fn readv
-performs the same action, but scatters the input data
-into the
-.Fa iovcnt
-buffers specified by the members of the
-.Fa iov
-array: iov[0], iov[1], ..., iov[iovcnt\|\-\|1].
-.Fn pread
-and
-.Fn preadv
-perform the same functions, but read from the specified position in
-the file without modifying the file pointer.
-.Pp
-For
-.Fn readv
-and
-.Fn preadv ,
-the
-.Fa iovec
-structure is defined as:
-.Pp
-.Bd -literal -offset indent -compact
-struct iovec {
-	void *iov_base;
-	size_t iov_len;
-};
-.Ed
-.Pp
-Each
-.Fa iovec
-entry specifies the base address and length of an area
-in memory where data should be placed.
-.Fn readv
-will always fill an area completely before proceeding
-to the next.
-.Pp
-On objects capable of seeking, the
-.Fn read
-starts at a position
-given by the file pointer associated with
-.Fa d
-(see
-.Xr lseek 2 ) .
-Upon return from
-.Fn read ,
-the file pointer is incremented by the number of bytes actually read.
-.Pp
-Objects that are not capable of seeking always read from the current
-position.
-The value of the file pointer associated with such an object is undefined.
-.Pp
-Upon successful completion,
-.Fn read ,
-.Fn readv ,
-.Fn pread ,
-and
-.Fn preadv
-return the number of bytes actually read and placed in the buffer.
-The system guarantees to read the number of bytes requested if
-the descriptor references a normal file that has that many bytes left
-before the end-of-file, but in no other case.
-.Sh RETURN VALUES
-If successful, the
-number of bytes actually read is returned.
-Upon reading end-of-file, zero is returned.
-Otherwise, a \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn read ,
-.Fn readv ,
-.Fn pread ,
-and
-.Fn preadv
-will succeed unless:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The file was marked for non-blocking I/O,
-and no data were ready to be read.
-.It Bq Er EBADF
-.Fa d
-is not a valid file or socket descriptor open for reading.
-.It Bq Er EFAULT
-.Fa buf
-points outside the allocated address space.
-.It Bq Er EINTR
-A read from a slow device
-(i.e. one that might block for an arbitrary amount of time)
-was interrupted by the delivery of a signal
-before any data arrived.
-See
-.Xr sigaction 2
-for more information on the interaction between signals and system
-calls.
-.It Bq Er EINVAL
-The file pointer associated with
-.Fa d
-was negative; or
-the total length of the I/O is more than can be expressed by the ssize_t
-return value.
-.It Bq Er EIO
-An I/O error occurred while reading from the file system.
-.It Bq Er EISDIR
-.Fa d
-refers to a directory and the implementation does not allow the directory
-to be read using
-.Fn read
-or
-.Fn pread .
-The
-.Fn readdir
-function should be used instead.
-.El
-.Pp
-In addition,
-.Fn readv
-and
-.Fn preadv
-may return one of the following errors:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-Part of the
-.Fa iov
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-.Fa iovcnt
-was less than or equal to 0, or greater than
-.Brq Dv IOV_MAX ;
-or one of the
-.Fa iov_len
-values in the
-.Fa iov
-array was negative; or
-the sum of the
-.Fa iov_len
-values in the
-.Fa iov
-array overflowed a 32-bit integer.
-.El
-.Pp
-The
-.Fn pread
-and
-.Fn preadv
-calls may also return the following errors:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The specified file offset is invalid.
-.It Bq Er ESPIPE
-The file descriptor is associated with a pipe, socket, or FIFO.
-.El
-.Sh SEE ALSO
-.Xr dup 2 ,
-.Xr fcntl 2 ,
-.Xr open 2 ,
-.Xr pipe 2 ,
-.Xr poll 2 ,
-.Xr select 2 ,
-.Xr sigaction 2 ,
-.Xr socket 2 ,
-.Xr socketpair 2
-.Sh STANDARDS
-The
-.Fn read
-function conforms to
-.St -p1003.1-90 .
-The
-.Fn readv
-and
-.Fn pread
-functions conform to
-.St -xpg4.2 .
-.Sh HISTORY
-The
-.Fn preadv
-function call
-appeared in
-.Nx 1.4 .
-The
-.Fn pread
-function call
-appeared in
-.At V.4 .
-The
-.Fn readv
-function call
-appeared in
-.Bx 4.2 .
-The
-.Fn read
-function call appeared in
-.At v2 .
-.Sh CAVEATS
-Error checks should explicitly test for \-1.
-Code such as
-.Bd -literal
-	while ((nr = read(fd, buf, sizeof(buf))) \*[Gt] 0)
-.Ed
-.Pp
-is not maximally portable, as some platforms allow for
-.Va nbytes
-to range between
-.Dv SSIZE_MAX
-and
-.Dv SIZE_MAX
-\- 2, in which case the return value of an error-free
-.Fn read
-may appear as a negative number distinct from \-1.
-Proper loops should use
-.Bd -literal
-	while ((nr = read(fd, buf, sizeof(buf))) != -1 \*[Am]\*[Am] nr != 0)
-.Ed
diff --git a/lib/libc/sys/readlink.2 b/lib/libc/sys/readlink.2
deleted file mode 100644
index 8f68ea087..000000000
--- a/lib/libc/sys/readlink.2
+++ /dev/null
@@ -1,177 +0,0 @@
-.\"	$NetBSD: readlink.2,v 1.32 2013/07/29 11:49:31 wiz Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)readlink.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd July 28, 2013
-.Dt READLINK 2
-.Os
-.Sh NAME
-.Nm readlink ,
-.Nm readlinkat
-.Nd read value of a symbolic link
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft ssize_t
-.Fn readlink "const char * restrict path" "char * restrict buf" "size_t bufsiz"
-.Ft ssize_t
-.Fn readlinkat "int fd" "const char * restrict path" "char * restrict buf"\
- "size_t bufsiz"
-.Sh DESCRIPTION
-.Fn readlink
-places the contents of the symbolic link
-.Fa path
-in the buffer
-.Fa buf ,
-which has size
-.Fa bufsiz .
-.Fn readlink
-does not append a
-.Dv NUL
-character to
-.Fa buf .
-.Pp
-.Fn readlinkat
-works the same way as
-.Fn readlink
-except if
-.Fa path
-is relative.
-In that case, it is looked up from a directory whose file
-descriptor was passed as
-.Fa fd .
-Search permission is required on this directory.
-.\"    (These alternatives await a decision about the semantics of O_SEARCH)
-.\" Search permission is required on this directory
-.\" except if
-.\" .Fa fd
-.\" was opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" This file descriptor must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.Fa fd
-can be set to
-.Dv AT_FDCWD
-in order to specify the current directory.
-.Sh RETURN VALUES
-The call returns the count of characters placed in the buffer
-if it succeeds, or a \-1 if an error occurs, placing the error
-code in the global variable
-.Va errno .
-.Sh EXAMPLES
-A typical use is illustrated in the following piece of code
-which reads the contents of a symbolic link named
-.Pa /symbolic/link
-and stores them as null-terminated string:
-.Bd -literal -offset indent
-#include \*[Lt]limits.h\*[Gt]
-#include \*[Lt]unistd.h\*[Gt]
-
-char buf[PATH_MAX];
-ssize_t len;
-
-if ((len = readlink("/symbolic/link", buf, sizeof(buf)-1)) == -1)
-	error handling;
-buf[len] = '\e0';
-.Ed
-.Sh ERRORS
-.Fn readlink
-and
-.Fn readlinkat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EFAULT
-.Fa buf
-extends outside the process's allocated address space.
-.It Bq Er EINVAL
-The named file is not a symbolic link.
-.It Bq Er EIO
-An I/O error occurred while reading from the file system.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.El
-.Pp
-In addition,
-.Fn readlinkat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa path
-does not specify an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for reading or searching.
-.It Bq Er ENOTDIR
-.Fa path
-is not an absolute path and
-.Fa fd
-is a file descriptor associated with a non-directory file.
-.El
-.Sh SEE ALSO
-.Xr lstat 2 ,
-.Xr stat 2 ,
-.Xr symlink 2 ,
-.Xr symlink 7
-.Sh STANDARDS
-The
-.Fn readlink
-function conforms to
-.St -p1003.1-2001 .
-.Fn readlinkat
-conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn readlink
-function appeared in
-.Bx 4.2 .
-The type returned was changed from
-.Ft int
-to
-.Ft ssize_t
-in
-.Nx 2.1 .
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
deleted file mode 100644
index a748635f0..000000000
--- a/lib/libc/sys/reboot.2
+++ /dev/null
@@ -1,185 +0,0 @@
-.\"	$NetBSD: reboot.2,v 1.29 2010/03/22 19:30:55 joerg Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)reboot.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd September 4, 2009
-.Dt REBOOT 2
-.Os
-.Sh NAME
-.Nm reboot
-.Nd reboot system or halt processor
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.In sys/reboot.h
-.Ft int
-.Fn reboot "int howto" "char *bootstr"
-.Sh DESCRIPTION
-.Fn reboot
-reboots the system.
-Only the super-user may reboot a machine on demand.
-However, a reboot is invoked
-automatically in the event of unrecoverable system failures.
-.Pp
-.Fa howto
-is a mask of options; the system call interface allows the following
-options, defined in the include file
-.In sys/reboot.h ,
-to be passed
-to the new kernel or the new bootstrap and init programs.
-In addition to the options described below, other options
-described in
-.Xr boothowto 9
-may be set, but such options may be ignored by the system.
-.Pp
-Options can be combined together by OR'ing them, eg.
-.Dv RB_DUMP |
-.Dv RB_NOSYNC
-would be interpreted as
-.Dq dump kernel memory before rebooting and don't sync the disks .
-.Bl -column RB_INITNAMEA 0x0000
-.It Dv RB_AUTOBOOT Ta Li 0x0000 Ta
-The default, causing the system to reboot in its usual fashion.
-.It Dv RB_ASKNAME Ta Li 0x0001 Ta
-Interpreted by the bootstrap program itself, causing it to
-prompt on the console as to what file should be booted.
-Normally, the system is booted from the file
-.Dq Em xx Ns No (0,0)netbsd ,
-where
-.Em xx
-is the default disk name,
-without prompting for the file name.
-.\" Obsolete!
-.\" .It Dv RB_DFLTROOT Ta Li 0x0020 Ta
-.\" Use the compiled in root device.
-.\" Normally, the system uses the device from which it was booted
-.\" as the root device if possible.
-.\" (The default behavior is dependent on the ability of the bootstrap program
-.\" to determine the drive from which it was loaded, which is not possible
-.\" on all systems.)
-.It Dv RB_DUMP Ta Li 0x0100 Ta
-Dump kernel memory before rebooting; see
-.Xr savecore 8
-for more information.
-.It Dv RB_HALT Ta Li 0x0008 Ta
-the processor is simply halted; no reboot takes place.
-This option should be used with caution.
-.It Dv RB_POWERDOWN Ta Li 0x0808 Ta
-This option is always used in conjunction with
-.Dv RB_HALT ,
-and if the system hardware supports the function, the system will be
-powered off, otherwise it has no effect.
-.It Dv RB_INITNAME Ta Li 0x0010 Ta
-An option allowing the specification of an init program (see
-.Xr init 8 )
-other than
-.Pa /sbin/init
-to be run when the system reboots.
-This switch is not currently available.
-.It Dv RB_KDB Ta Li 0x0040 Ta
-Load the symbol table and enable a built-in debugger in the system.
-This option will have no useful function if the kernel is not configured
-for debugging.
-Several other options have different meaning if combined
-with this option, although their use may not be possible
-via the
-.Fn reboot
-call.
-See
-.Xr ddb 4
-for more information.
-.It Dv RB_NOSYNC Ta Li 0x0004 Ta
-Normally, the disks are sync'd (see
-.Xr sync 8 )
-before the processor is halted or rebooted.
-This option may be useful if file system changes have been made manually
-or if the processor is on fire.
-.It Dv RB_RDONLY Ta Li 0x0080 Ta
-Initially mount the root file system read-only.
-This is currently the default, and this option has been deprecated.
-.It Dv RB_SINGLE Ta Li 0x0002 Ta
-Normally, the reboot procedure involves an automatic disk consistency
-check and then multi-user operations.
-.Dv RB_SINGLE
-prevents this, booting the system with a single-user shell
-on the console.
-.Dv RB_SINGLE
-is actually interpreted by the
-.Xr init 8
-program in the newly booted system.
-.Pp
-When no options are given (i.e.,
-.Dv RB_AUTOBOOT
-is used), the system is
-rebooted from file ``netbsd'' in the root file system of unit 0
-of a disk chosen in a processor specific way.
-An automatic consistency check of the disks is normally performed
-(see
-.Xr fsck 8 ) .
-.It Dv RB_STRING Ta Li 0x0400 Ta
-.Fa bootstr
-is a string passed to the firmware on the machine, if possible, if this
-option is set.
-Currently this is only implemented on the sparc and the sun3 ports.
-.It Dv RB_USERCONF Ta Li 0x1000 Ta
-Initially invoke the
-.Xr userconf 4
-facility when the system starts up again, if it has been compiled into
-the kernel that is loaded.
-.El
-.Sh RETURN VALUES
-If successful, this call never returns.
-Otherwise, a \-1 is returned and an error is returned in the global
-variable
-.Va errno .
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EPERM
-The caller is not the super-user.
-.El
-.Sh SEE ALSO
-.Xr ddb 4 ,
-.Xr crash 8 ,
-.Xr halt 8 ,
-.Xr init 8 ,
-.Xr reboot 8 ,
-.Xr savecore 8 ,
-.Xr boothowto 9
-.Sh HISTORY
-The
-.Fn reboot
-function call appeared in
-.Bx 4.0 .
-.Pp
-The
-.Dv RB_DFLTROOT
-option is now
-.Em obsolete .
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
deleted file mode 100644
index 35ab5e900..000000000
--- a/lib/libc/sys/recv.2
+++ /dev/null
@@ -1,365 +0,0 @@
-.\"	$NetBSD: recv.2,v 1.36 2013/07/14 14:29:09 njoly Exp $
-.\"
-.\" Copyright (c) 1983, 1990, 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. 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.
-.\"
-.\"     @(#)recv.2	8.3 (Berkeley) 2/21/94
-.\"
-.Dd June 22, 2012
-.Dt RECV 2
-.Os
-.Sh NAME
-.Nm recv ,
-.Nm recvfrom ,
-.Nm recvmsg ,
-.Nm recvmmsg
-.Nd receive a message from a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft ssize_t
-.Fn recv "int s" "void *buf" "size_t len" "int flags"
-.Ft ssize_t
-.Fn recvfrom "int s" "void * restrict buf" "size_t len" "int flags" "struct sockaddr * restrict from" "socklen_t * restrict fromlen"
-.Ft ssize_t
-.Fn recvmsg "int s" "struct msghdr *msg" "int flags"
-.Ft int
-.Fn recvmmsg "int s" "struct mmsghdr *mmsg" "unsigned int vlen" "unsigned int flags" "struct timespec *timeout"
-.Sh DESCRIPTION
-.Fn recvfrom ,
-.Fn recvmsg
-and
-.Fn recvmmsg
-are used to receive messages from a socket,
-and may be used to receive data on a socket whether or not
-it is connection-oriented.
-.Pp
-If
-.Fa from
-is non-nil, and the socket is not connection-oriented,
-the source address of the message is filled in.
-.Fa fromlen
-is a value-result parameter, initialized to the size of
-the buffer associated with
-.Fa from ,
-and modified on return to indicate the actual size of the
-address stored there.
-.Pp
-The
-.Fn recvmmsg
-call be used to receive multiple messages in the same call using an array of
-.Fa mmsghdr
-elements with the following form, as defined in
-.Ao Pa sys/socket.h Ac :
-.Pp
-.Bd -literal
-struct mmsghdr {
-	struct msghdr	msg_hdr;	/* the message to be sent */
-	unsigned int	msg_len;	/* number of bytes received */
-};
-.Ed
-.Pp
-The
-.Fa msg_len
-member contains the number of bytes received for each
-.Fa msg_hdr
-member.
-The array has
-.Fa vlen
-elements, which is limited to
-.Dv 1024 .
-If there is an error, a number fewer than
-.Fa vlen
-may be returned, and the error may be retrieved using
-.Xr getsockopt 2
-with
-.Dv SO_ERROR .
-If the flag
-.Dv MSG_WAITFORONE
-is set in
-.Fa flags
-then the
-.Fn recvmmsg
-call will wait for one message, and set
-.Dv MSG_DONTWAIT
-for the rest.
-If the
-.Fa timeout
-parameter is not
-.Dv NULL ,
-then
-.Fn recvmmsg
-will return if that time is exceeded.
-.Pp
-The
-.Fn recv
-call is normally used only on a
-.Em connected
-socket (see
-.Xr connect 2 )
-and is identical to
-.Fn recvfrom
-with a nil
-.Fa from
-parameter.
-As it is redundant, it may not be supported in future releases.
-.Pp
-.Fn recv ,
-.Fn recvfrom
-and
-.Fn recvmsg
-routines return the length of the message on successful
-completion.
-.Fn recvmmsg
-returns the number of messages received.
-If a message is too long to fit in the supplied buffer,
-excess bytes may be discarded depending on the type of socket
-the message is received from (see
-.Xr socket 2 ) .
-.Pp
-If no messages are available at the socket, the
-receive call waits for a message to arrive, unless
-the socket is nonblocking (see
-.Xr fcntl 2 )
-in which case the value
-\-1 is returned and the external variable
-.Va errno
-set to
-.Er EAGAIN .
-If no data is available and the remote peer was shut down,
-0 is returned.
-The receive calls normally return any data available,
-up to the requested amount,
-rather than waiting for receipt of the full amount requested;
-this behavior is affected by the socket-level options
-.Dv SO_RCVLOWAT
-and
-.Dv SO_RCVTIMEO
-described in
-.Xr getsockopt 2 .
-.Pp
-The
-.Xr select 2
-or
-.Xr poll 2
-call may be used to determine when more data arrive.
-.Pp
-The
-.Fa flags
-argument to a recv call is formed by
-.Em or Ap ing
-one or more of the values:
-.Bl -column MSG_CMSG_CLOEXEC -offset indent
-.It Dv MSG_CMSG_CLOEXEC Ta set the close on exec property for passed file descriptors
-.It Dv MSG_OOB Ta process out-of-band data
-.It Dv MSG_PEEK Ta peek at incoming message
-.It Dv MSG_WAITALL Ta wait for full request or error
-.El
-The
-.Dv MSG_OOB
-flag requests receipt of out-of-band data
-that would not be received in the normal data stream.
-Some protocols place expedited data at the head of the normal
-data queue, and thus this flag cannot be used with such protocols.
-The
-.Dv MSG_PEEK
-flag causes the receive operation to return data
-from the beginning of the receive queue without removing that
-data from the queue.
-Thus, a subsequent receive call will return the same data.
-The
-.Dv MSG_WAITALL
-flag requests that the operation block until
-the full request is satisfied.
-However, the call may still return less data than requested
-if a signal is caught, an error or disconnect occurs,
-or the next data to be received is of a different type than that returned.
-.Pp
-The
-.Fn recvmsg
-call uses a
-.Fa msghdr
-structure to minimize the number of directly supplied parameters.
-This structure has the following form, as defined in
-.Ao Pa sys/socket.h Ac :
-.Pp
-.Bd -literal
-struct msghdr {
-	void		*msg_name;	/* optional address */
-	socklen_t	msg_namelen;	/* size of address */
-	struct iovec	*msg_iov;	/* scatter/gather array */
-	int		msg_iovlen;	/* # elements in msg_iov */
-	void		*msg_control;	/* ancillary data, see below */
-	socklen_t	msg_controllen; /* ancillary data buffer len */
-	int		msg_flags;	/* flags on received message */
-};
-.Ed
-.Pp
-Here
-.Fa msg_name
-and
-.Fa msg_namelen
-specify the source address if the socket is unconnected;
-.Fa msg_name
-may be given as a null pointer if no names are desired or required.
-If the socket is connected,
-.Fa msg_name
-and
-.Fa msg_namelen
-are ignored.
-.Fa msg_iov
-and
-.Fa msg_iovlen
-describe scatter gather locations, as discussed in
-.Xr read 2 .
-.Fa msg_control ,
-which has length
-.Fa msg_controllen ,
-points to a buffer for other protocol control related messages
-or other miscellaneous ancillary data.
-The messages are of the form:
-.Bd -literal
-struct cmsghdr {
-	socklen_t	cmsg_len;	/* data byte count, including hdr */
-	int		cmsg_level;	/* originating protocol */
-	int		cmsg_type;	/* protocol-specific type */
-/* followed by
-	u_char		cmsg_data[]; */
-};
-.Ed
-As an example, one could use this to learn of changes in the data-stream
-in XNS/SPP, or in ISO, to obtain user-connection-request data by requesting
-a recvmsg with no data buffer provided immediately after an
-.Fn accept
-call.
-.Pp
-Open file descriptors are now passed as ancillary data for
-.Dv AF_LOCAL
-domain sockets, with
-.Fa cmsg_level
-set to
-.Dv SOL_SOCKET
-and
-.Fa cmsg_type
-set to
-.Dv SCM_RIGHTS .
-.Pp
-The
-.Fa msg_flags
-field is set on return according to the message received.
-.Dv MSG_EOR
-indicates end-of-record;
-the data returned completed a record (generally used with sockets of type
-.Dv SOCK_SEQPACKET ) .
-.Dv MSG_TRUNC
-indicates that
-the trailing portion of a datagram was discarded because the datagram
-was larger than the buffer supplied.
-.Dv MSG_CTRUNC
-indicates that some
-control data were discarded due to lack of space in the buffer
-for ancillary data.
-.Dv MSG_OOB
-is returned to indicate that expedited or out-of-band data were received.
-.Sh RETURN VALUES
-The
-.Fn recv ,
-.Fn recvfrom
-and
-.Fn recvmsg
-calls return the number of bytes received, or \-1
-if an error occurred.
-For connected sockets whose remote peer was shut down,
-0 is returned when no more data is available.
-The
-.Fn recvmmsg
-calls return the number of messages received, or \-1
-if an error occurred.
-.Sh ERRORS
-The calls fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The socket is marked non-blocking, and the receive operation
-would block, or
-a receive timeout had been set,
-and the timeout expired before data were received.
-.It Bq Er EBADF
-The argument
-.Fa s
-is an invalid descriptor.
-.It Bq Er EFAULT
-The receive buffer pointer(s) point outside the process's
-address space.
-.It Bq Er EINTR
-The receive was interrupted by delivery of a signal before
-any data were available.
-.It Bq Er EINVAL
-The total length of the I/O is more than can be expressed by the ssize_t
-return value.
-.It Bq Er ENOTCONN
-The socket is associated with a connection-oriented protocol
-and has not been connected (see
-.Xr connect 2
-and
-.Xr accept 2 ) .
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-does not refer to a socket.
-.El
-.Pp
-.Fn recvmsg
-will also fail if:
-.Bl -tag -width Er
-.It Bq Er EMSGSIZE
-The
-.Fa msg_iovlen
-member of the
-.Fa msg
-structure is less than or equal to 0
-or is greater than
-.Brq Dv IOV_MAX .
-.El
-.Sh SEE ALSO
-.Xr fcntl 2 ,
-.Xr getsockopt 2 ,
-.Xr poll 2 ,
-.Xr read 2 ,
-.Xr select 2 ,
-.Xr socket 2
-.Sh HISTORY
-The
-.Fn recv
-function call appeared in
-.Bx 4.2 .
-The
-.Fn recvmmsg
-function call appeared in
-.Tn Linux 2.6.32
-and
-.Nx 7.0 .
diff --git a/lib/libc/sys/rename.2 b/lib/libc/sys/rename.2
deleted file mode 100644
index 51f48f8bb..000000000
--- a/lib/libc/sys/rename.2
+++ /dev/null
@@ -1,314 +0,0 @@
-.\"	$NetBSD: rename.2,v 1.33 2015/01/27 10:11:20 wiz Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)rename.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd July 28, 2013
-.Dt RENAME 2
-.Os
-.Sh NAME
-.Nm rename ,
-.Nm renameat
-.Nd change the name of a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn rename "const char *from" "const char *to"
-.In unistd.h
-.Ft int
-.Fn renameat "int fromfd" "const char *from" "int tofd" "const char *to"
-.Sh DESCRIPTION
-.Fn rename
-causes the link named
-.Fa from
-to be renamed as
-.Fa to .
-If
-.Fa to
-exists, it is first removed.
-Both
-.Fa from
-and
-.Fa to
-must be of the same type (that is, both directories or both
-non-directories), and must reside on the same file system.
-.Pp
-.Fn rename
-guarantees that an instance of
-.Fa to
-will always exist, even if the system should crash in
-the middle of the operation.
-.Pp
-If the final component of
-.Fa from
-is a symbolic link,
-the symbolic link is renamed,
-not the file or directory to which it points.
-.Pp
-If both
-.Fa from
-and
-.Fa to
-are pathnames of the same existing file in the file system's name space,
-.Fn rename
-returns successfully and performs no other action.
-.Pp
-.Fn renameat
-works the same way as
-.Fn rename
-except if
-.Fa from
-(resp.
-.Fa to )
-is relative.
-In that case, it is looked up from a directory whose file
-descriptor was passed as
-.Fa fromfd
-(resp.
-.Fa tofd ) .
-Search permission is required on the directories named by
-.Fa fromfd
-and
-.Fa tofd .
-.\"    (These alternatives await a decision about the semantics of O_SEARCH)
-.\" Search permission is required on the directories named by
-.\" .Fa fromfd
-.\" and
-.\" .Fa tofd
-.\" unless they were opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" The directories named by
-.\" .Fa fromfd
-.\" and
-.\" .Fa tofd
-.\" must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.Fa fromfd
-or
-.Fa tofd
-can be set to
-.Dv AT_FDCWD
-in order to specify the current directory.
-.Sh RETURN VALUES
-.Rv -std rename renameat
-.Sh ERRORS
-.Fn rename
-and
-.Fn renameat
-will fail and neither of the argument files will be
-affected if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-A component of either path prefix denies search permission, or
-the requested link requires writing in a directory with a mode
-that denies write permission.
-.It Bq Er EBUSY
-.Fa from
-or
-.Fa to
-is the mount point for a mounted file system.
-.It Bq Er EDQUOT
-The directory in which the entry for the new name
-is being placed cannot be extended because the
-user's quota of disk blocks on the file system
-containing the directory has been exhausted.
-.It Bq Er EFAULT
-.Fa from
-or
-.Fa to
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-.Fa from
-is a parent directory of
-.Fa to ,
-or an attempt is made to rename
-.Ql \&.
-or
-.Ql \&.. .
-.It Bq Er EIO
-An I/O error occurred while making or updating a directory entry.
-.It Bq Er EISDIR
-.Fa to
-is a directory, but
-.Fa from
-is not a directory.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating either pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-A component of the
-.Fa from
-path does not exist,
-or a path prefix of
-.Fa to
-does not exist.
-.It Bq Er ENOSPC
-The directory in which the entry for the new name is being placed
-cannot be extended because there is no space left on the file
-system containing the directory.
-.It Bq Er ENOTDIR
-A component of either path prefix is not a directory, or
-.Fa from
-is a directory, but
-.Fa to
-is not a directory.
-.It Bq Er ENOTEMPTY
-.Fa to
-is a directory and is not empty.
-.It Bq Er EPERM
-The directory containing
-.Fa from
-is marked sticky,
-and neither the containing directory nor
-.Fa from
-are owned by the effective user ID.
-Or the
-.Fa to
-file exists,
-the directory containing
-.Fa to
-is marked sticky,
-and neither the containing directory nor
-.Fa to
-are owned by the effective user ID.
-.It Bq Er EROFS
-The requested link requires writing in a directory on a read-only file
-system.
-.It Bq Er EXDEV
-The link named by
-.Fa to
-and the file named by
-.Fa from
-are on different logical devices (file systems).
-Note that this error code will not be returned if the implementation
-permits cross-device links.
-.El
-.Pp
-In addition,
-.Fn renameat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa from
-or
-.Fa to
-does not specify an absolute path and
-.Fa fromfd
-or
-.Fa tofd ,
-respectively, is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for reading or searching.
-.It Bq Er ENOTDIR
-.Fa from
-or
-.Fa to
-is not an absolute path and
-.Fa fromfd
-or
-.Fa tofd ,
-respectively, is a file descriptor associated with a non-directory file.
-.El
-.Sh SEE ALSO
-.Xr open 2 ,
-.Xr symlink 7
-.Sh STANDARDS
-The
-.Fn rename
-function deviates from the semantics defined in
-.St -p1003.1-90 ,
-which specifies that if both
-.Fa from
-and
-.Fa to
-.Em link
-to the same existing file,
-.Fn rename
-shall return successfully and performs no further action, whereas this
-implementation will remove the file specified by
-.Fa from
-unless both
-.Fa from
-and
-.Fa to
-are pathnames of the same file in the file system's name space.
-.Pp
-To retain conformance, a compatibility interface is provided by the
-.Lb libposix
-which is also be brought into scope if any of the
-.Dv _POSIX_SOURCE ,
-.Dv _POSIX_C_SOURCE
-or
-.Dv _XOPEN_SOURCE
-preprocessor symbols are defined at compile-time:
-the
-.Fn rename
-function conforms to
-.St -p1003.1-90
-and
-.St -xpg4.2 .
-.Fn renameat
-conforms to
-.St -p1003.1-2008 .
-.Sh BUGS
-The system can deadlock if a loop in the file system graph is present.
-This loop takes the form of an entry in directory
-.Ql Pa a ,
-say
-.Ql Pa a/foo ,
-being a hard link to directory
-.Ql Pa b ,
-and an entry in
-directory
-.Ql Pa b ,
-say
-.Ql Pa b/bar ,
-being a hard link
-to directory
-.Ql Pa a .
-When such a loop exists and two separate processes attempt to
-perform
-.Ql rename a/foo b/bar
-and
-.Ql rename b/bar a/foo ,
-respectively,
-the system may deadlock attempting to lock
-both directories for modification.
-Hard links to directories should be
-replaced by symbolic links by the system administrator.
diff --git a/lib/libc/sys/revoke.2 b/lib/libc/sys/revoke.2
deleted file mode 100644
index 8a2b9a1e2..000000000
--- a/lib/libc/sys/revoke.2
+++ /dev/null
@@ -1,112 +0,0 @@
-.\"	$NetBSD: revoke.2,v 1.16 2014/11/11 08:10:02 njoly Exp $
-.\"
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Berkeley Software Design, 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.
-.\"
-.\"     @(#)revoke.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd July 3, 2011
-.Dt REVOKE 2
-.Os
-.Sh NAME
-.Nm revoke
-.Nd revoke file access
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn revoke "const char *path"
-.Sh DESCRIPTION
-The
-.Fn revoke
-function invalidates all current open file descriptors in the system
-for the file named by
-.Fa path .
-Subsequent operations on any such descriptors
-fail, with the exceptions that a
-.Xr read 2
-from a character device file which has been revoked
-returns a count of zero (end of file),
-and a
-.Xr close 2
-call will succeed.
-If the file is a special file for a device which is open,
-the device close function
-is called as if all open references to the file had been closed.
-.Pp
-Access to a file may be revoked only by its owner or the super user.
-.Pp
-The
-.Fn revoke
-function is normally used to prepare a terminal device for a new login session,
-preventing any access by a previous user of the terminal.
-.Sh RETURN VALUES
-A 0 value indicates that the call succeeded.
-A \-1 return value indicates an error occurred and
-.Va errno
-is set to indicate the reason.
-.Sh ERRORS
-Access to the named file is revoked unless one of the following:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EFAULT
-.Fa path
-points outside the process's allocated address space.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters,
-or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file or a component of the path name does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er EPERM
-The caller is neither the owner of the file nor the super user.
-.El
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr dup 2 ,
-.Xr fcntl 2 ,
-.Xr flock 2 ,
-.Xr fstat 2 ,
-.Xr read 2 ,
-.Xr write 2
-.Sh HISTORY
-The
-.Fn revoke
-function was introduced in
-.Bx 4.3 Reno .
diff --git a/lib/libc/sys/rmdir.2 b/lib/libc/sys/rmdir.2
deleted file mode 100644
index f483f1c38..000000000
--- a/lib/libc/sys/rmdir.2
+++ /dev/null
@@ -1,112 +0,0 @@
-.\"	$NetBSD: rmdir.2,v 1.22 2014/10/11 12:06:58 njoly Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)rmdir.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd October 11, 2014
-.Dt RMDIR 2
-.Os
-.Sh NAME
-.Nm rmdir
-.Nd remove a directory file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn rmdir "const char *path"
-.Sh DESCRIPTION
-.Fn rmdir
-removes a directory file
-whose name is given by
-.Fa path .
-The directory must not have any entries other
-than
-.Ql \&.
-and
-.Ql \&.. .
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The named file is removed unless:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix, or
-write permission is denied on the directory containing the link
-to be removed.
-.It Bq Er EBUSY
-The directory to be removed is the mount point
-for a mounted file system.
-.It Bq Er EFAULT
-.Fa path
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-The last component of the path is
-.Ql \&. .
-.It Bq Er EIO
-An I/O error occurred while deleting the directory entry
-or deallocating the inode.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named directory does not exist.
-.It Bq Er ENOTDIR
-A component of the path is not a directory.
-.It Bq Er ENOTEMPTY
-The named directory contains files other than
-.Ql \&.
-and
-.Ql \&..
-in it.
-.It Bq Er EPERM
-The directory containing the directory to be removed is marked sticky,
-and neither the containing directory nor the directory to be removed
-are owned by the effective user ID.
-.It Bq Er EROFS
-The directory entry to be removed resides on a read-only file system.
-.El
-.Sh SEE ALSO
-.Xr mkdir 2 ,
-.Xr unlink 2
-.Sh STANDARDS
-The
-.Fn rmdir
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn rmdir
-function call appeared in
-.Bx 4.2 .
diff --git a/lib/libc/sys/sa_enable.2 b/lib/libc/sys/sa_enable.2
deleted file mode 100644
index c125d7174..000000000
--- a/lib/libc/sys/sa_enable.2
+++ /dev/null
@@ -1,67 +0,0 @@
-.\"     $NetBSD: sa_enable.2,v 1.4 2004/03/14 23:05:09 yamt Exp $
-.\"
-.\" Copyright (c)2004 YAMAMOTO Takashi,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" ------------------------------------------------------------
-.Dd March 14, 2004
-.Dt SA_ENABLE 2
-.Os
-.Sh NAME
-.Nm sa_enable
-.Nd enable scheduler activation
-.\" ------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ------------------------------------------------------------
-.Sh SYNOPSIS
-.In sa.h
-.Ft int
-.Fn sa_enable
-.\" ------------------------------------------------------------
-.Sh DESCRIPTION
-.Fn sa_enable
-is used to enable scheduler activation.
-.Pp
-An upcall handler and upcall stacks should be registered with
-.Fn sa_register
-and
-.Fn sa_stacks
-beforehand.
-.\" ------------------------------------------------------------
-.Sh RETURN VALUES
-On success,
-.Fn sa_enable
-will not return to userland in the normal way.
-It returns into the upcall hander with an
-.Dv SA_UPCALL_NEWPROC
-upcall.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.\" ------------------------------------------------------------
-.Sh SEE ALSO
-.Xr sa_register 2 ,
-.Xr sa_stacks 2 ,
-.Xr pthread 3
diff --git a/lib/libc/sys/sa_register.2 b/lib/libc/sys/sa_register.2
deleted file mode 100644
index e66767d52..000000000
--- a/lib/libc/sys/sa_register.2
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"     $NetBSD: sa_register.2,v 1.2 2004/03/14 10:19:59 snj Exp $
-.\"
-.\" Copyright (c)2004 YAMAMOTO Takashi,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" ------------------------------------------------------------
-.Dd March 14, 2004
-.Dt SA_REGISTER 2
-.Os
-.Sh NAME
-.Nm sa_register
-.Nd register a scheduler activation upcall handler
-.\" ------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ------------------------------------------------------------
-.Sh SYNOPSIS
-.In sa.h
-.Ft int
-.Fn sa_register \
-    "sa_upcall_t new" \
-    "sa_upcall_t *old" \
-    "int flags" \
-    "ssize_t stackinfo_offset"
-.\" ------------------------------------------------------------
-.Sh DESCRIPTION
-.Nm
-is used to prepare scheduler activation.
-It registers the upcall handler specified by
-.Fa new .
-If
-.Fa old
-isn't
-.Dv NULL ,
-the previous handler will be returned to the location pointed by it.
-If
-.Dv SA_FLAG_STACKINFO
-is specified in
-.Fa flags ,
-.Fa stackinfo_offset
-is used to locate per upcall stack memory areas shared between
-userland and kernel.
-.Fa stackinfo_offset
-is a byte offset from the corresponding upcall stack.
-.\" ------------------------------------------------------------
-.Sh RETURN VALUES
-.Fn sa_register
-returns zero on success.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.\" ------------------------------------------------------------
-.Sh SEE ALSO
-.Xr pthread 3
diff --git a/lib/libc/sys/sa_setconcurrency.2 b/lib/libc/sys/sa_setconcurrency.2
deleted file mode 100644
index e2b007faa..000000000
--- a/lib/libc/sys/sa_setconcurrency.2
+++ /dev/null
@@ -1,70 +0,0 @@
-.\"     $NetBSD: sa_setconcurrency.2,v 1.4 2005/09/05 21:57:35 yamt Exp $
-.\"
-.\" Copyright (c)2004 YAMAMOTO Takashi,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" ------------------------------------------------------------
-.Dd September 6, 2005
-.Dt SA_CONCURRENCY 2
-.Os
-.Sh NAME
-.Nm sa_setconcurrency
-.Nd increase the number of virtual processors
-.\" ------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ------------------------------------------------------------
-.Sh SYNOPSIS
-.In sa.h
-.Ft int
-.Fn sa_setconcurrency \
-    "int concurrency"
-.\" ------------------------------------------------------------
-.Sh DESCRIPTION
-.Fn sa_setconcurrency
-is used to increase the number of scheduler activation virtual processors
-used by the process.
-.Fn sa_setconcurrency
-increases the number of virtual processors, i.e., execution concurrency,
-up to
-.Fa concurrency .
-However,
-.Fn sa_setconcurrency
-won't try to allocate more virtual processors than there are physical
-processors on the system.
-.Pp
-Scheduler activation should be enabled by
-.Fn sa_enable
-beforehand.
-.\" ------------------------------------------------------------
-.Sh RETURN VALUES
-On success,
-.Fn sa_setconcurrency
-returns the number of newly added virtual processors.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.\" ------------------------------------------------------------
-.Sh SEE ALSO
-.Xr pthread 3
diff --git a/lib/libc/sys/sa_stacks.2 b/lib/libc/sys/sa_stacks.2
deleted file mode 100644
index 61ca0e3e6..000000000
--- a/lib/libc/sys/sa_stacks.2
+++ /dev/null
@@ -1,68 +0,0 @@
-.\"     $NetBSD: sa_stacks.2,v 1.6 2004/12/12 05:56:45 snj Exp $
-.\"
-.\" Copyright (c)2004 YAMAMOTO Takashi,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" ------------------------------------------------------------
-.Dd December 12, 2004
-.Dt SA_STACKS 2
-.Os
-.Sh NAME
-.Nm sa_stacks
-.Nd register scheduler activation upcall stacks
-.\" ------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ------------------------------------------------------------
-.Sh SYNOPSIS
-.In sa.h
-.Ft int
-.Fn sa_stacks \
-    "int num" \
-    "stack_t *stacks"
-.\" ------------------------------------------------------------
-.Sh DESCRIPTION
-.Fn sa_stacks
-is used to register scheduler activation upcall stacks.
-.Fa stacks
-is an array of
-.Fa num
-of
-.Vt stack_t .
-.Pp
-An upcall handler should be registered by
-.Fn sa_register
-beforehand.
-.\" ------------------------------------------------------------
-.Sh RETURN VALUES
-On success,
-.Fn sa_stacks
-returns the number of stacks registered.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.\" ------------------------------------------------------------
-.Sh SEE ALSO
-.Xr sa_register 2 ,
-.Xr pthread 3
diff --git a/lib/libc/sys/sa_yield.2 b/lib/libc/sys/sa_yield.2
deleted file mode 100644
index 4e8f80b75..000000000
--- a/lib/libc/sys/sa_yield.2
+++ /dev/null
@@ -1,64 +0,0 @@
-.\"     $NetBSD: sa_yield.2,v 1.4 2004/05/09 11:28:58 yamt Exp $
-.\"
-.\" Copyright (c)2004 YAMAMOTO Takashi,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" ------------------------------------------------------------
-.Dd May 9, 2004
-.Dt SA_YIELD 2
-.Os
-.Sh NAME
-.Nm sa_yield
-.Nd idle a virtual processor
-.\" ------------------------------------------------------------
-.Sh LIBRARY
-.Lb libc
-.\" ------------------------------------------------------------
-.Sh SYNOPSIS
-.In sa.h
-.Ft int
-.Fn sa_yield
-.\" ------------------------------------------------------------
-.Sh DESCRIPTION
-.Fn sa_yield
-is used to idle a virtual processor on which the calling thread is running.
-It's typically used when the process's userland scheduler has no userland
-thread to run.
-.Pp
-Scheduler activation should be enabled by
-.Fn sa_enable
-beforehand.
-.\" ------------------------------------------------------------
-.Sh RETURN VALUES
-On success,
-.Fn sa_yield
-will not return to userland in the normal way.
-It returns into an upcall hander with an upcall.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.\" ------------------------------------------------------------
-.Sh SEE ALSO
-.Xr sa_enable 2 ,
-.Xr pthread 3
diff --git a/lib/libc/sys/sched.c b/lib/libc/sys/sched.c
deleted file mode 100644
index 51553b35b..000000000
--- a/lib/libc/sys/sched.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*	$NetBSD: sched.c,v 1.4 2012/03/18 02:04:39 christos Exp $	*/
-
-/*
- * Copyright (c) 2008, Mindaugas Rasiukevicius <rmind at NetBSD org>
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: sched.c,v 1.4 2012/03/18 02:04:39 christos Exp $");
-
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sched.h>
-#include <signal.h>
-#include <sys/param.h>
-#include <sys/types.h>
-
-/* All LWPs in the process */
-#define	P_ALL_LWPS		0
-
-/*
- * Scheduling parameters.
- */
-
-int
-sched_setparam(pid_t pid, const struct sched_param *param)
-{
-	struct sched_param sp;
-
-	memset(&sp, 0, sizeof(struct sched_param));
-	sp.sched_priority = param->sched_priority;
-	return _sched_setparam(pid, P_ALL_LWPS, SCHED_NONE, &sp);
-}
-
-int
-sched_getparam(pid_t pid, struct sched_param *param)
-{
-
-	return _sched_getparam(pid, P_ALL_LWPS, NULL, param);
-}
-
-int
-sched_setscheduler(pid_t pid, int policy, const struct sched_param *param)
-{
-	struct sched_param sp;
-	int ret, old_policy;
-
-	ret = _sched_getparam(pid, P_ALL_LWPS, &old_policy, &sp);
-	if (ret < 0)
-		return ret;
-
-	memset(&sp, 0, sizeof(struct sched_param));
-	sp.sched_priority = param->sched_priority;
-	ret = _sched_setparam(pid, P_ALL_LWPS, policy, &sp);
-	if (ret < 0)
-		return ret;
-
-	return old_policy;
-}
-
-int
-sched_getscheduler(pid_t pid)
-{
-	struct sched_param sp;
-	int ret, policy;
-
-	ret = _sched_getparam(pid, P_ALL_LWPS, &policy, &sp);
-	if (ret < 0)
-		return ret;
-
-	return policy;
-}
-
-/*
- * Scheduling priorities.
- */
-
-int
-sched_get_priority_max(int policy)
-{
-
-	if (policy < SCHED_OTHER || policy > SCHED_RR) {
-		errno = EINVAL;
-		return -1;
-	}
-	return (int)sysconf(_SC_SCHED_PRI_MAX);
-}
-
-int
-sched_get_priority_min(int policy)
-{
-
-	if (policy < SCHED_OTHER || policy > SCHED_RR) {
-		errno = EINVAL;
-		return -1;
-	}
-	return (int)sysconf(_SC_SCHED_PRI_MIN);
-}
-
-int
-/*ARGSUSED*/
-sched_rr_get_interval(pid_t pid, struct timespec *interval)
-{
-
-	if (pid && kill(pid, 0) == -1)
-		return -1;
-	interval->tv_sec = 0;
-	interval->tv_nsec = sysconf(_SC_SCHED_RT_TS) * 1000;
-	return 0;
-}
-
-/*
- * Process affinity.
- */
-
-int
-sched_getaffinity_np(pid_t pid, size_t size, cpuset_t *cpuset)
-{
-
-	return _sched_getaffinity(pid, P_ALL_LWPS, size, cpuset);
-}
-
-int
-sched_setaffinity_np(pid_t pid, size_t size, cpuset_t *cpuset)
-{
-
-	return _sched_setaffinity(pid, P_ALL_LWPS, size, cpuset);
-}
diff --git a/lib/libc/sys/select.2 b/lib/libc/sys/select.2
deleted file mode 100644
index 9b7b282f2..000000000
--- a/lib/libc/sys/select.2
+++ /dev/null
@@ -1,353 +0,0 @@
-.\"	$NetBSD: select.2,v 1.41 2013/11/28 03:45:31 khorben Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)select.2	8.2 (Berkeley) 3/25/94
-.\"
-.Dd November 28, 2013
-.Dt SELECT 2
-.Os
-.Sh NAME
-.Nm select ,
-.Nm pselect
-.Nd synchronous I/O multiplexing
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/select.h
-.Ft int
-.Fn select "int nfds" "fd_set * restrict readfds" "fd_set * restrict writefds" "fd_set * restrict exceptfds" "struct timeval * restrict timeout"
-.Ft int
-.Fn pselect "int nfds" "fd_set * restrict readfds" "fd_set * restrict writefds" "fd_set * restrict exceptfds" "const struct timespec *restrict timeout" "const sigset_t * restrict sigmask"
-.Fn FD_SET "int fd" "fd_set *fdset"
-.Fn FD_CLR "int fd" "fd_set *fdset"
-.Fn FD_ISSET "int fd" "fd_set *fdset"
-.Fn FD_ZERO "fd_set *fdset"
-.Sh DESCRIPTION
-.Fn select
-and
-.Fn pselect
-examine the I/O descriptor sets whose addresses are passed in
-.Fa readfds ,
-.Fa writefds ,
-and
-.Fa exceptfds
-to see if some of their descriptors
-are ready for reading, are ready for writing, or have an exceptional
-condition pending, respectively.
-The first
-.Fa nfds
-descriptors are checked in each set;
-i.e., the descriptors from 0 through
-.Fa nfds Ns No \-1
-in the descriptor sets are examined.
-This means that
-.Fa nfds
-must be set to the highest file descriptor of the three sets, plus one.
-On return,
-.Fn select
-and
-.Fn pselect
-replace the given descriptor sets
-with subsets consisting of those descriptors that are ready
-for the requested operation.
-.Fn select
-and
-.Fn pselect
-return the total number of ready descriptors in all the sets.
-.Pp
-The descriptor sets are stored as bit fields in arrays of integers.
-The following macros are provided for manipulating such descriptor sets:
-.Fn FD_ZERO fdset
-initializes a descriptor set pointed to by
-.Fa fdset
-to the null set.
-.Fn FD_SET fd fdset
-includes a particular descriptor
-.Fa fd
-in
-.Fa fdset .
-.Fn FD_CLR fd fdset
-removes
-.Fa fd
-from
-.Fa fdset .
-.Fn FD_ISSET fd fdset
-is non-zero if
-.Fa fd
-is a member of
-.Fa fdset ,
-zero otherwise.
-The behavior of these macros is undefined if
-a descriptor value is less than zero or greater than or equal to
-.Dv FD_SETSIZE ,
-which is normally at least equal
-to the maximum number of descriptors supported by the system.
-.Pp
-If
-.Fa timeout
-is a non-null pointer, it specifies a maximum interval to wait for the
-selection to complete.
-If
-.Fa timeout
-is a null pointer, the select blocks indefinitely.
-To poll without blocking, the
-.Fa timeout
-argument should be non-null, pointing to a zero-valued timeval or timespec
-structure, as appropriate.
-.Fa timeout
-is not changed by
-.Fn select ,
-and may be reused on subsequent calls; however, it is good style to
-re-initialize it before each invocation of
-.Fn select .
-.Pp
-If
-.Fa sigmask
-is a non-null pointer, then the
-.Fn pselect
-function shall replace the signal mask of the caller by the set of
-signals pointed to by
-.Fa sigmask
-before examining the descriptors, and shall restore the signal mask
-of the calling thread before returning.
-.Pp
-Any of
-.Fa readfds ,
-.Fa writefds ,
-and
-.Fa exceptfds
-may be given as null pointers if no descriptors are of interest.
-.Sh NOTES
-It is recommended to use the
-.Xr poll 2
-interface instead, which tends to be more portable and efficient.
-.Sh RETURN VALUES
-.Fn select
-returns the number of ready descriptors that are contained in
-the descriptor sets,
-or \-1 if an error occurred.
-If the time limit expires,
-.Fn select
-returns 0.
-If
-.Fn select
-returns with an error,
-including one due to an interrupted call,
-the descriptor sets will be unmodified.
-.Sh EXAMPLES
-.Bd -literal
-#include \*[Lt]stdio.h\*[Gt]
-#include \*[Lt]stdlib.h\*[Gt]
-#include \*[Lt]unistd.h\*[Gt]
-#include \*[Lt]string.h\*[Gt]
-#include \*[Lt]err.h\*[Gt]
-#include \*[Lt]errno.h\*[Gt]
-#include \*[Lt]sys/types.h\*[Gt]
-#include \*[Lt]sys/time.h\*[Gt]
-
-int
-main(int argc, char **argv)
-{
-	fd_set read_set;
-	struct timeval timeout;
-	int ret, fd, i;
-
-	/* file descriptor 1 is stdout */
-	fd = 1;
-
-	/* Wait for ten seconds. */
-	timeout.tv_sec = 10;
-	timeout.tv_usec = 0;
-
-	/* Initialize the read set to null */
-	FD_ZERO(\*[Am]read_set);
-
-	/* Add file descriptor 1 to read_set */
-	FD_SET(fd, \*[Am]read_set);
-
-	/*
-	 * Check if data is ready to be read on
-	 * file descriptor 1, give up after 10 seconds.
-	 */
-	ret = select(fd + 1, \*[Am]read_set, NULL, NULL, \*[Am]timeout);
-
-	/*
-	 * Returned value is the number of file
-	 * descriptors ready for I/O, or -1 on error.
-	 */
-	switch (ret) {
-	case \-1:
-		err(EXIT_FAILURE, "select() failed");
-		break;
-
-	case 0:
-		printf("Timeout, no data received.\en");
-		break;
-
-	default:
-		printf("Data received on %d file descriptor(s)\en", ret);
-
-		/*
-		 * select(2) hands back a file descriptor set where
-		 * only descriptors ready for I/O are set. These can
-		 * be tested using FD_ISSET
-		 */
-		for (i = 0; i \*[Lt]= fd; i++) {
-			if (FD_ISSET(i, \*[Am]read_set)) {
-				printf("Data on file descriptor %d\en", i);
-				/* Remove the file descriptor from the set */
-				FD_CLR(fd, \*[Am]read_set);
-			}
-		}
-		break;
-	}
-
-	return 0;
-}
-.Ed
-.Sh ERRORS
-An error return from
-.Fn select
-indicates:
-.Bl -tag -width Er
-.It Bq Er EBADF
-One of the descriptor sets specified an invalid descriptor.
-.It Bq Er EFAULT
-One or more of
-.Fa readfds ,
-.Fa writefds ,
-or
-.Fa exceptfds
-points outside the process's allocated address space.
-.It Bq Er EINTR
-A signal was delivered before the time limit expired and
-before any of the selected events occurred.
-.It Bq Er EINVAL
-The specified time limit is invalid.
-One of its components is negative or too large.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr connect 2 ,
-.Xr gettimeofday 2 ,
-.Xr poll 2 ,
-.Xr read 2 ,
-.Xr recv 2 ,
-.Xr send 2 ,
-.Xr write 2 ,
-.Xr getdtablesize 3
-.Sh HISTORY
-The
-.Fn select
-function call appeared in
-.Bx 4.2 .
-.Sh BUGS
-Although the provision of
-.Xr getdtablesize 3
-was intended to allow user programs to be written independent
-of the kernel limit on the number of open files, the dimension
-of a sufficiently large bit field for select remains a problem.
-The default bit size of
-.Ft fd_set
-is based on the symbol
-.Dv FD_SETSIZE
-(currently 256),
-but that is somewhat smaller than the current kernel limit
-to the number of open files.
-However, in order to accommodate programs which might potentially
-use a larger number of open files with select, it is possible
-to increase this size within a program by providing
-a larger definition of
-.Dv FD_SETSIZE
-before the inclusion of
-.In sys/types.h .
-The kernel will cope, and the userland libraries provided with the
-system are also ready for large numbers of file descriptors.
-.Pp
-Note:
-.Xr rpc 3
-library uses
-.Ft fd_set
-with the default
-.Dv FD_SETSIZE
-as part of its ABI.
-Therefore, programs that use
-.Xr rpc 3
-routines cannot change
-.Dv FD_SETSIZE .
-.Pp
-Alternatively, to be really safe, it is possible to allocate
-.Ft fd_set
-bit-arrays dynamically.
-The idea is to permit a program to work properly even if it is
-.Xr execve 2 Ns 'd
-with 4000 file descriptors pre-allocated.
-The following illustrates the technique which is used by
-userland libraries:
-.Pp
-.Bd -literal -offset indent -compact
-	fd_set *fdsr;
-	int max = fd;
-
-	fdsr = (fd_set *)calloc(howmany(max+1, NFDBITS),
-	    sizeof(fd_mask));
-	if (fdsr == NULL) {
-		...
-		return (-1);
-	}
-	FD_SET(fd, fdsr);
-	n = select(max+1, fdsr, NULL, NULL, \*[Am]tv);
-	...
-	free(fdsr);
-.Ed
-.Pp
-.Fn select
-should probably have been designed to return the time remaining from the
-original timeout, if any, by modifying the time value in place.
-Even though some systems stupidly act in this different way, it is
-unlikely this semantic will ever be commonly implemented, as the
-change causes massive source code compatibility problems.
-Furthermore, recent new standards have dictated the current behaviour.
-In general, due to the existence of those
-non-conforming systems, it is unwise to assume that the timeout
-value will be unmodified by the
-.Fn select
-call, and the caller should reinitialize it on each invocation.
-Calculating the delta is easily done by calling
-.Xr gettimeofday 2
-before and after the call to
-.Fn select ,
-and using
-.Fn timersub
-(as described in
-.Xr getitimer 2 ) .
-.Pp
-Internally to the kernel,
-.Fn select
-works poorly if multiple processes wait on the same file descriptor.
diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2
deleted file mode 100644
index 99ad0e7b9..000000000
--- a/lib/libc/sys/semctl.2
+++ /dev/null
@@ -1,244 +0,0 @@
-.\"	$NetBSD: semctl.2,v 1.20 2010/03/22 19:30:55 joerg Exp $
-.\"
-.\" Copyright (c) 1995 Frank van der Linden
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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 Frank van der Linden
-.\" 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.
-.\"
-.Dd August 25, 1999
-.Dt SEMCTL 2
-.Os
-.Sh NAME
-.Nm semctl
-.Nd semaphore control operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/sem.h
-.Ft int
-.Fn semctl "int semid" "int semnum" "int cmd" "..."
-.Sh DESCRIPTION
-The
-.Fn semctl
-system call provides a number of control operations on the semaphore specified
-by
-.Fa semnum
-and
-.Fa semid .
-The operation to be performed is specified in
-.Fa cmd
-(see below).
-The fourth argument is optional and depends upon the operation requested.
-If required, it is a union of the following fields:
-.Bd -literal
-    int     val;            /* value for SETVAL */
-    struct  semid_ds *buf;  /* buffer for IPC_{STAT,SET} */
-    u_short *array;         /* array for GETALL \*[Am] SETALL */
-.Ed
-.Pp
-The
-.Sy semid_ds
-structure used in the
-.Dv IPC_SET
-and
-.Dv IPC_STAT
-commands is defined in
-.In sys/sem.h
-and contains the following members:
-.Bd -literal
-    struct ipc_perm sem_perm; /* operation permissions */
-    unsigned short sem_nsems; /* number of sems in set */
-    time_t sem_otime;         /* last operation time */
-    time_t sem_ctime;         /* last change time */
-.Ed
-.Pp
-The
-.Sy ipc_perm
-structure used inside the
-.Sy semid_ds
-structure is defined in
-.In sys/ipc.h
-and contains the following members:
-.Bd -literal
-    uid_t cuid;  /* creator user id */
-    gid_t cgid;  /* creator group id */
-    uid_t uid;	 /* user id */
-    gid_t gid;	 /* group id */
-    mode_t mode; /* permission (lower 9 bits) */
-.Ed
-.Pp
-.Fn semctl
-provides the following operations:
-.Bl -tag -width IPC_RMIDX
-.It Dv GETVAL
-Return the value of the semaphore.
-.It Dv SETVAL
-Set the value of the semaphore to
-.Fa arg.val ,
-where
-.Fa arg
-is the fourth argument to
-.Fn semctl .
-.It Dv GETPID
-Return the pid of the last process that did an operation on this semaphore.
-.It Dv GETNCNT
-Return the number of processes waiting to acquire the semaphore.
-.It Dv GETZCNT
-Return the number of processes waiting for the value of the semaphore to
-reach 0.
-.It Dv GETALL
-Return the values of all the semaphores associated with
-.Fa semid .
-.It Dv SETALL
-Set the values of all the semaphores that are associated with the semaphore
-identifier
-.Fa semid
-to the corresponding values in
-.Fa arg.array ,
-where
-.Fa arg
-is the fourth argument to
-.Fn semctl .
-.It Dv IPC_STAT
-Gather information about a semaphore and place the information in the
-structure pointed to by
-.Fa arg.buf ,
-where
-.Fa arg
-is the fourth argument to
-.Fn semctl .
-.It Dv IPC_SET
-Set the value of the
-.Va sem_perm.uid ,
-.Va sem_perm.gid
-and
-.Va sem_perm.mode
-fields in the structure associated with the semaphore.
-The values are taken from the corresponding fields in the structure
-pointed to by
-.Fa arg.buf ,
-there
-.Fa arg
-is the fourth argument to
-.Fn semctl .
-This operation can only be executed by the super-user, or a process that
-has an effective user id equal to either
-.Va sem_perm.cuid
-or
-.Va sem_perm.uid
-in the data structure associated with the semaphore.
-.It Dv IPC_RMID
-Remove the semaphores associated with
-.Fa semid
-from the system and destroy the data structures associated with it.
-Only the super-user or a process with an effective uid equal to the
-.Va sem_perm.cuid
-or
-.Va sem_perm.uid
-values in the data structure associated with the semaphore can do this.
-.El
-.Pp
-The permission to read or change a semaphore (see
-.Xr semop 2 )
-is determined by the
-.Va sem_perm.mode
-field in the same way as is
-done with files (see
-.Xr chmod 2 ) ,
-but the effective uid can match either the
-.Va sem_perm.cuid
-field or the
-.Va sem_perm.uid
-field, and the
-effective gid can match either
-.Va sem_perm.cgid
-or
-.Va sem_perm.gid .
-.Sh RETURN VALUES
-For the
-.Dv GETVAL ,
-.Dv GETPID ,
-.Dv GETNCNT ,
-and
-.Dv GETZCNT
-operations,
-.Fn semctl
-returns one of the values described above if successful.
-All other operations will make
-.Fn semctl
-return 0 if no errors occur.
-Otherwise \-1 is returned and
-.Va errno
-set to reflect the error.
-.Sh ERRORS
-.Fn semctl
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The caller has no operation permission for this semaphore.
-.It Bq Er EFAULT
-.Fa arg.buf
-or
-.Fa arg.array
-specifies an invalid address.
-.It Bq Er EINVAL
-.Fa semid
-is not a valid message semaphore identifier.
-.Pp
-.Va cmd
-is not a valid command.
-.It Bq Er EPERM
-.Fa cmd
-is equal to
-.Dv IPC_SET
-or
-.Dv IPC_RMID
-and the caller is not the super-user, nor does
-the effective uid match either the
-.Va sem_perm.uid
-or
-.Va sem_perm.cuid
-fields of the data structure associated with the semaphore.
-.It Bq Er ERANGE
-.Fa cmd
-is equal to
-.Dv SETVAL
-or
-.Dv SETALL
-and the value to be set is greater than the system semaphore maximum value.
-.El
-.Sh SEE ALSO
-.Xr semget 2 ,
-.Xr semop 2
-.Sh STANDARDS
-The
-.Nm
-system call conforms to
-.St -xsh5 .
-.Sh HISTORY
-Semaphores appeared in the first release of
-.At V .
diff --git a/lib/libc/sys/semctl.c b/lib/libc/sys/semctl.c
deleted file mode 100644
index 0134edad8..000000000
--- a/lib/libc/sys/semctl.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: semctl.c,v 1.18 2015/01/29 20:44:38 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: semctl.c,v 1.18 2015/01/29 20:44:38 joerg Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <stdarg.h>
-#ifdef __lint__
-#include <string.h>
-#endif
-
-/* The kernel version [... == union semun *] */
-int ____semctl50(int, int, int, ...);
-
-int
-semctl(int semid, int semnum, int cmd, ...)
-{
-	va_list ap;
-	union __semun semun;
-
-	va_start(ap, cmd);
-	switch (cmd) {
-	case IPC_SET:
-	case IPC_STAT:
-	case GETALL:
-	case SETVAL:
-	case SETALL:
-#ifdef __lint__
-		memcpy(&semun, &ap, sizeof(semun));
-#else
-		semun = va_arg(ap, union __semun);
-#endif
-	}
-	va_end(ap);
-	return ____semctl50(semid, semnum, cmd, &semun);
-}
diff --git a/lib/libc/sys/semget.2 b/lib/libc/sys/semget.2
deleted file mode 100644
index e51548f17..000000000
--- a/lib/libc/sys/semget.2
+++ /dev/null
@@ -1,158 +0,0 @@
-.\"	$NetBSD: semget.2,v 1.18 2006/10/08 08:22:34 rillig Exp $
-.\"
-.\" Copyright (c) 1995 Frank van der Linden
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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 Frank van der Linden
-.\" 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.
-.\"
-.Dd May 13, 2004
-.Dt SEMGET 2
-.Os
-.Sh NAME
-.Nm semget
-.Nd get set of semaphores
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/sem.h
-.Ft int
-.Fn semget "key_t key" "int nsems" "int semflg"
-.Sh DESCRIPTION
-The
-.Fn semget
-system call returns the semaphore identifier associated with
-.Fa key .
-.Pp
-A new set containing
-.Fa nsems
-semaphores is created if either
-.Fa key
-is equal to
-.Dv IPC_PRIVATE ,
-or
-.Fa key
-does not have a semaphore set associated with it and the
-.Dv IPC_CREAT
-bit is set in
-.Fa semflg .
-If both the
-.Dv IPC_CREAT
-bit and the
-.Dv IPC_EXCL
-bit are set in
-.Fa semflg ,
-and
-.Fa key
-has a semaphore set associated with it already,
-the operation will fail.
-.Pp
-If a new set of semaphores is created, the data structure associated with it
-(the
-.Va semid_ds
-structure, see
-.Xr semctl 2 )
-is initialized as follows:
-.Bl -bullet
-.It
-.Va sem_perm.cuid
-and
-.Va sem_perm.uid
-are set to the effective uid of the calling process.
-.It
-.Va sem_perm.gid
-and
-.Va sem_perm.cgid
-are set to the effective gid of the calling process.
-.It
-.Va sem_perm.mode
-is set to the lower 9 bits of
-.Fa semflg .
-.It
-.Va sem_nsems
-is set to the value of
-.Fa nsems .
-.It
-.Va sem_ctime
-is set to the current time.
-.It
-.Va sem_otime
-is set to 0.
-.El
-.Sh RETURN VALUES
-.Fn semget
-returns a non-negative semaphore identifier if successful.
-Otherwise, \-1 is returned and
-.Va errno
-is set to reflect the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EACCES
-The caller has no permission to access a semaphore set already associated with
-.Fa key .
-.It Bq Er EEXIST
-Both
-.Dv IPC_CREAT
-and
-.Dv IPC_EXCL
-are set in
-.Fa semflg ,
-and a semaphore set is already associated with
-.Fa key .
-.It Bq Er EINVAL
-.Va nsems
-is less than 0 or greater than the system limit for the number in a semaphore
-set.
-.Pp
-A semaphore set associated with
-.Fa key
-exists, but has fewer semaphores than the number specified in
-.Fa nsems .
-.It Bq Er ENOSPC
-A new set of semaphores could not be created because the system limit
-for the number of semaphores or the number of semaphore sets has been
-reached.
-.It Bq Er ENOENT
-.Dv IPC_CREAT
-is not set in
-.Fa semflg
-and no semaphore set associated with
-.Fa key
-was found.
-.El
-.Sh SEE ALSO
-.Xr ipcs 1 ,
-.Xr semctl 2 ,
-.Xr semop 2 ,
-.Xr ftok 3
-.Sh STANDARDS
-The
-.Nm
-system call conforms to
-.St -xsh5 .
-.Sh HISTORY
-Semaphores appeared in the first release of
-.At V .
diff --git a/lib/libc/sys/semop.2 b/lib/libc/sys/semop.2
deleted file mode 100644
index d23278927..000000000
--- a/lib/libc/sys/semop.2
+++ /dev/null
@@ -1,170 +0,0 @@
-.\"	$NetBSD: semop.2,v 1.17 2010/03/22 19:30:55 joerg Exp $
-.\"
-.\" Copyright (c) 1995 Frank van der Linden
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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 Frank van der Linden
-.\" 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.
-.\"
-.Dd November 3, 2005
-.Dt SEMOP 2
-.Os
-.Sh NAME
-.Nm semop
-.Nd semaphore operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/sem.h
-.Ft int
-.Fn semop "int semid" "struct sembuf *sops" "size_t nsops"
-.Sh DESCRIPTION
-.Fn semop
-provides a number of atomic operations on a set of semaphores.
-The semaphore set is specified by
-.Fa semid ,
-.Fa sops
-is an array of semaphore operations, and
-.Fa nsops
-is the number of operations in this array.
-The
-.Va sembuf
-structures in the array contain the following members:
-.Bd -literal
-    unsigned short sem_num; /* semaphore # */
-    short          sem_op;  /* semaphore operation */
-    short          sem_flg; /* operation flags */
-.Ed
-.Pp
-Each operation (specified in
-.Va sem_op )
-is applied to semaphore number
-.Va sem_num
-in the set of semaphores specified by
-.Fa semid .
-The value of
-.Va sem_op
-determines the action taken in the following way:
-.Bl -bullet
-.It
-.Va sem_op
-is less than 0.
-The current process is blocked until the value of the
-semaphore is greater than or equal to the absolute value of
-.Va sem_op .
-The absolute value of
-.Va sem_op
-is then subtracted from the value of the semaphore, and the calling
-process continues.
-Negative values of
-.Va sem_op
-are thus used to enter critical regions.
-.It
-.Va sem_op
-is greater than 0.
-Its value is added to the value of the specified semaphore.
-This is used to leave critical regions.
-.It
-.Va sem_op
-is equal to 0.
-The calling process is blocked until the value of the
-specified semaphore reaches 0.
-.El
-.Pp
-The behaviour of each operation is influenced by the flags set in
-.Va sem_flg
-in the following way:
-.Bl -tag -width IPC_NOWAITX
-.It Dv IPC_NOWAIT
-In the case where the calling process would normally block, waiting
-for a semaphore to reach a certain value,
-.Dv IPC_NOWAIT
-makes the
-call return immediately, returning a value of \-1 and setting
-.Va errno
-to
-.Er EAGAIN .
-.It SEM_UNDO
-Keep track of the changes that this call makes to the value of a semaphore,
-so that they can be undone when the calling process terminates.
-This is useful to prevent other processes waiting on a semaphore to block
-forever, should the process that has the semaphore locked terminate in a
-critical section.
-.El
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn semop
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-There is no semaphore associated with
-.Fa semid .
-.It Bq Er EIDRM
-The semaphore set was removed while the process was waiting for one of
-its semaphores to reach a certain value.
-.It Bq Er EACCES
-The calling process has no permission to access the specified semaphore set.
-.It Bq Er E2BIG
-The value of
-.Fa nsops
-is too big.
-The maximum is defined as
-.Dv MAX_SOPS
-in
-.In sys/sem.h .
-.It Bq Er EFBIG
-.Va sem_num
-in one of the sem_buf structures is less than 0, or greater than the actual
-number of semaphores in the set specified by
-.Fa semid .
-.It Bq Er ENOSPC
-.Dv SEM_UNDO
-was requested, and there is not enough space left in the kernel to
-store the undo information.
-.It Bq Er EAGAIN
-The requested operation can not immediately be performed, and
-.Dv IPC_NOWAIT
-was set in
-.Va sem_flg .
-.It Bq Er EFAULT
-.Fa sops
-points to an illegal address.
-.El
-.Sh SEE ALSO
-.Xr semctl 2 ,
-.Xr semget 2
-.Sh STANDARDS
-The
-.Nm
-system call conforms to
-.St -xsh5 .
-.Sh HISTORY
-Semaphores appeared in the first release of
-.At V .
diff --git a/lib/libc/sys/send.2 b/lib/libc/sys/send.2
deleted file mode 100644
index 99143c595..000000000
--- a/lib/libc/sys/send.2
+++ /dev/null
@@ -1,277 +0,0 @@
-.\"	$NetBSD: send.2,v 1.31 2013/07/14 14:29:09 njoly Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)send.2	8.2 (Berkeley) 2/21/94
-.\"
-.Dd June 22, 2012
-.Dt SEND 2
-.Os
-.Sh NAME
-.Nm send ,
-.Nm sendto ,
-.Nm sendmsg ,
-.Nm sendmmsg
-.Nd send a message from a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft ssize_t
-.Fn send "int s" "const void *msg" "size_t len" "int flags"
-.Ft ssize_t
-.Fn sendto "int s" "const void *msg" "size_t len" "int flags" "const struct sockaddr *to" "socklen_t tolen"
-.Ft ssize_t
-.Fn sendmsg "int s" "const struct msghdr *msg" "int flags"
-.Ft int
-.Fn sendmmsg "int s" "struct mmsghdr *mmsg" "unsigned int vlen" "unsigned int flags"
-.Sh DESCRIPTION
-.Fn send ,
-.Fn sendto ,
-.Fn sendmsg ,
-and
-.Fn sendmmsg
-are used to transmit a message to another socket.
-.Fn send
-may be used only when the socket is in a
-.Em connected
-state, while
-.Fn sendto ,
-.Fn sendmsg
-and
-.Fn sendmmsg
-may be used at any time.
-.Pp
-The
-.Fn sendmmsg
-call be used to send multiple messages in the same call using an array of
-.Fa mmsghdr
-elements with the following form, as defined in
-.Ao Pa sys/socket.h Ac :
-.Pp
-.Bd -literal
-struct mmsghdr {
-	struct msghdr	msg_hdr;	/* the message to be sent */
-	unsigned int	msg_len;	/* number of bytes transmitted */
-};
-.Ed
-.Pp
-The
-.Fa msg_len
-member contains the number of bytes sent for each
-.Fa msg_hdr
-member.
-The array has
-.Fa vlen
-elements, which is limited to
-.Dv 1024 .
-If there is an error, a number fewer than
-.Fa vlen
-may be returned, and the error may be retrieved using
-.Xr getsockopt 2
-with
-.Dv SO_ERROR .
-.Pp
-The address of the target is given by
-.Fa to
-with
-.Fa tolen
-specifying its size.
-The length of the message is given by
-.Fa len .
-If the message is too long to pass atomically through the
-underlying protocol, the error
-.Er EMSGSIZE
-is returned, and
-the message is not transmitted.
-.Pp
-No indication of failure to deliver is implicit in a
-.Fn send .
-Locally detected errors are indicated by a return value of \-1.
-.Pp
-If no messages space is available at the socket to hold
-the message to be transmitted, then
-.Fn send
-normally blocks, unless the socket has been placed in
-non-blocking I/O mode.
-The
-.Xr select 2
-or
-.Xr poll 2
-call may be used to determine when it is possible to
-send more data.
-Unfortunately this does not work when the interface queue which is used to
-send the message is full, and the call returns
-.Er ENOBUFS .
-.Pp
-The
-.Fa flags
-parameter may include one or more of the following:
-.Bd -literal
-#define	MSG_OOB		0x0001 /* process out-of-band data */
-#define	MSG_PEEK	0x0002 /* peek at incoming message */
-#define	MSG_DONTROUTE	0x0004 /* bypass routing, use direct interface */
-#define	MSG_EOR		0x0008 /* data completes record */
-#define	MSG_NOSIGNAL	0x0400 /* do not generate SIGPIPE on EOF */
-.Ed
-.Pp
-The flag
-.Dv MSG_OOB
-is used to send
-.Dq out-of-band
-data on sockets that support this notion (e.g.
-.Dv SOCK_STREAM ) ;
-the underlying protocol must also support
-.Dq out-of-band
-data.
-.Dv MSG_EOR
-is used to indicate a record mark for protocols which support the
-concept.
-.\" .Dv MSG_EOF
-.\" requests that the sender side of a socket be shut down, and that an
-.\" appropriate indication be sent at the end of the specified data;
-.\" this flag is only implemented for
-.\" .Dv SOCK_STREAM
-.\" sockets in the
-.\" .Dv PF_INET
-.\" protocol family, and is used to implement Transaction
-.\" .Tn TCP
-.\" (see
-.\" .Xr ttcp 4 ) .
-.Dv MSG_DONTROUTE
-is usually used only by diagnostic or routing programs.
-.Pp
-See
-.Xr recv 2
-for a description of the
-.Fa msghdr
-structure.
-.Dv MSG_NOSIGNAL
-is used to prevent
-.Dv SIGPIPE
-generation when writing a socket that
-may be closed.
-.Sh RETURN VALUES
-The
-.Fn send ,
-.Fn sendto ,
-and
-.Fn sendmsg
-calls return the number of characters sent, or \-1
-if an error occurred.
-The
-.Fn sendmmsg
-call returns the number of messages sent, or \-1
-if an error occured.
-.Sh ERRORS
-.Fn send ,
-.Fn sendto ,
-.Fn sendmsg ,
-and
-.Fn sendmmsg
-fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The SO_BROADCAST option is not set on the socket, and a broadcast address
-was given as the destination.
-.It Bq Er EAFNOSUPPORT
-Addresses in the specified address family cannot be used with this socket.
-.It Bq Er EAGAIN|EWOULDBLOCK
-The socket is marked non-blocking and the requested operation
-would block.
-.It Bq Er EBADF
-An invalid descriptor was specified.
-.It Bq Er EDSTADDRREQ
-In a non-connected socket a destination address has not been specified.
-.It Bq Er EFAULT
-An invalid user space address was specified for a parameter.
-.It Bq Er EHOSTDOWN
-The destination is a host on the local subnet and does not respond to
-.Xr arp 4 .
-.It Bq Er EHOSTUNREACH
-The destination for the message is unreachable.
-.It Bq Er EINVAL
-The total length of the I/O is more than can be expressed by the ssize_t
-return value.
-.It Bq Er EMSGSIZE
-The socket requires that message be sent atomically,
-and the size of the message to be sent made this impossible.
-.It Bq Er ENOBUFS
-The system was unable to allocate an internal buffer.
-The operation may succeed when buffers become available.
-.Pp
-An alternative reason: the output queue for a network interface was full.
-This generally indicates that the interface has stopped sending,
-but may be caused by transient congestion.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.It Bq Er EPIPE
-In a connected socket the connection has been broken.
-.El
-.Pp
-.Fn sendto
-will also fail if:
-.Bl -tag -width Er
-.It Bq Er EISCONN
-A destination address was specified and the socket is already connected.
-.El
-.Pp
-.Fn sendmsg
-and
-.Fn sendmmsg
-will also fail if:
-.Bl -tag -width Er
-.It Bq Er EMSGSIZE
-The
-.Fa msg_iovlen
-member of the
-.Fa msg
-structure is less than or equal to 0
-or is greater than
-.Brq Dv IOV_MAX .
-.El
-.Sh SEE ALSO
-.Xr fcntl 2 ,
-.Xr getsockopt 2 ,
-.Xr recv 2 ,
-.Xr select 2 ,
-.Xr socket 2 ,
-.Xr write 2
-.Sh HISTORY
-The
-.Fn send
-function call appeared in
-.Bx 4.2 .
-The
-.Fn sendmmsg
-function call appeared in
-.Tn Linux 3.0
-and
-.Nx 7.0 .
diff --git a/lib/libc/sys/setgroups.2 b/lib/libc/sys/setgroups.2
deleted file mode 100644
index e49b54ca7..000000000
--- a/lib/libc/sys/setgroups.2
+++ /dev/null
@@ -1,91 +0,0 @@
-.\"	$NetBSD: setgroups.2,v 1.19 2013/07/14 14:29:09 njoly Exp $
-.\"
-.\" Copyright (c) 1983, 1991, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)setgroups.2	8.2 (Berkeley) 4/16/94
-.\"
-.Dd October 7, 2006
-.Dt SETGROUPS 2
-.Os
-.Sh NAME
-.Nm setgroups
-.Nd set group access list
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In unistd.h
-.Ft int
-.Fn setgroups "int ngroups" "const gid_t *gidset"
-.Sh DESCRIPTION
-.Fn setgroups
-sets the group access list of the current user process
-according to the array
-.Fa gidset .
-The parameter
-.Fa ngroups
-indicates the number of entries in the array and must be no
-more than
-.Brq Dv NGROUPS_MAX .
-.Pp
-Only the super-user may set new groups.
-.Pp
-This system call affects only secondary groups.
-.Sh RETURN VALUES
-A 0 value is returned on success, \-1 on error, with
-an error code stored in
-.Va errno .
-.Sh ERRORS
-The
-.Fn setgroups
-call will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of
-.Fa ngroups
-is greater than
-.Brq Dv NGROUPS_MAX .
-.It Bq Er EPERM
-The caller is not the super-user.
-.It Bq Er EFAULT
-The address specified for
-.Fa gidset
-is outside the process
-address space.
-.El
-.Sh SEE ALSO
-.Xr getgroups 2 ,
-.Xr setegid 2 ,
-.Xr setgid 2 ,
-.Xr setregid 2 ,
-.Xr initgroups 3
-.Sh HISTORY
-The
-.Fn setgroups
-function call appeared in
-.Bx 4.2 .
diff --git a/lib/libc/sys/setpgid.2 b/lib/libc/sys/setpgid.2
deleted file mode 100644
index c56d87fa4..000000000
--- a/lib/libc/sys/setpgid.2
+++ /dev/null
@@ -1,107 +0,0 @@
-.\"	$NetBSD: setpgid.2,v 1.23 2014/09/19 16:02:58 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)setpgid.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd December 18, 2003
-.Dt SETPGID 2
-.Os
-.Sh NAME
-.Nm setpgid ,
-.Nm setpgrp
-.Nd set process group
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn setpgid "pid_t pid" "pid_t pgrp"
-.Ft int
-.Fn setpgrp "pid_t pid" "pid_t pgrp"
-.Sh DESCRIPTION
-.Fn setpgid
-sets the process group of the specified process
-.Ar pid
-to the specified
-.Ar pgrp .
-If
-.Ar pid
-is zero, then the call applies to the current process.
-If
-.Ar pgrp
-is zero, then the process id of the process specified by
-.Ar pid
-is used instead.
-.Pp
-If the invoker is not the super-user, then the affected process
-must have the same effective user-id as the invoker or be a descendant
-of the invoking process.
-.Sh RETURN VALUES
-.Fn setpgid
-returns 0 when the operation was successful.
-If the request failed, \-1 is returned and the global variable
-.Va errno
-indicates the reason.
-.Sh COMPATIBILITY
-.Fn setpgrp
-is identical to
-.Fn setpgid ,
-and is retained for calling convention compatibility with historical
-versions of
-.Bx .
-.Sh ERRORS
-.Fn setpgid
-will fail and the process group will not be altered if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The value of the
-.Fa pid
-argument matches the process ID of a child process of the calling process,
-and the child process has successfully executed one of the exec functions.
-.It Bq Er EINVAL
-The value of the
-.Fa pgrp
-argument is less than zero.
-.It Bq Er EPERM
-The effective user ID of the requested process is different
-from that of the caller and the process is not a descendant
-of the calling process.
-.It Bq Er ESRCH
-The value of the
-.Fa pid
-argument does not match the process ID of the calling process or of a
-child process of the calling process.
-.El
-.Sh SEE ALSO
-.Xr getpgrp 2
-.Sh STANDARDS
-The
-.Fn setpgid
-function conforms to
-.St -p1003.1-90 .
diff --git a/lib/libc/sys/setregid.2 b/lib/libc/sys/setregid.2
deleted file mode 100644
index fdaf9dcdd..000000000
--- a/lib/libc/sys/setregid.2
+++ /dev/null
@@ -1,141 +0,0 @@
-.\"	$NetBSD: setregid.2,v 1.23 2008/05/02 18:11:05 martin Exp $
-.\"
-.\" Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Charles M. Hannum.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (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) 1983, 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     from: @(#)setregid.2	6.4 (Berkeley) 3/10/91
-.\"
-.Dd January 5, 2001
-.Dt SETREGID 2
-.Os
-.Sh NAME
-.Nm setregid
-.Nd set real and effective group ID's
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn setregid "gid_t rgid" "gid_t egid"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by the saved ID functionality in
-.Xr setgid 2
-and
-.Xr setegid 2 .
-.Ef
-.Pp
-The real and effective group ID's of the
-current process are set according to the arguments.
-If the real group ID is changed, the saved group ID is changed to the
-new value of the effective group ID.
-.Pp
-If
-.Fa rgid
-or
-.Fa egid
-is \-1, the current gid is filled in by the system.
-Unprivileged users may change the real group
-ID to the effective group ID, and may change the effective group ID to the
-real group ID or the saved group ID; only the super-user may
-make other changes.
-.Pp
-The
-.Fn setregid
-function has been used to swap the real and effective group
-IDs in set-group-ID programs to temporarily relinquish the set-group-ID
-value.
-This purpose is now better served by the use of the
-.Fn setegid
-function (see
-.Xr setgid 2 ) .
-.Pp
-When setting the real and effective group IDs to the same value, this
-function is equivalent to the
-.Fn setgid
-function.
-When setting only the effective group ID, this function is equivalent to
-the
-.Fn setegid
-function.
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EPERM
-The current process is not the super-user and a change
-other than changing the effective group-id to the real group-id
-was specified.
-.El
-.Sh SEE ALSO
-.Xr getgid 2 ,
-.Xr setegid 2 ,
-.Xr setgid 2 ,
-.Xr setuid 2
-.Sh HISTORY
-The
-.Fn setregid
-function call appeared in
-.Bx 4.2 .
-An incompatible version was implemented in
-.Bx 4.4 .
-It was reimplemented in
-.Nx 1.2
-in a way compatible with
-.Bx 4.3 ,
-SunOS and Linux, but should not be used in new code.
diff --git a/lib/libc/sys/setreuid.2 b/lib/libc/sys/setreuid.2
deleted file mode 100644
index ea998c7df..000000000
--- a/lib/libc/sys/setreuid.2
+++ /dev/null
@@ -1,141 +0,0 @@
-.\"	$NetBSD: setreuid.2,v 1.23 2008/05/02 18:11:05 martin Exp $
-.\"
-.\" Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Charles M. Hannum.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (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) 1980, 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     from: @(#)setreuid.2	6.4 (Berkeley) 3/10/91
-.\"
-.Dd January 5, 2001
-.Dt SETREUID 2
-.Os
-.Sh NAME
-.Nm setreuid
-.Nd set real and effective user ID's
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn setreuid "uid_t ruid" "uid_t euid"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by the saved ID functionality in
-.Xr setuid 2
-and
-.Xr seteuid 2 .
-.Ef
-.Pp
-The real and effective user ID's of the
-current process are set according to the arguments.
-If the real user ID is changed, the saved user ID is changed to the new
-value of the effective user ID.
-.Pp
-If
-.Fa ruid
-or
-.Fa euid
-is \-1, the current uid is filled in by the system.
-Unprivileged users may change the real user
-ID to the effective user ID, and may change the effective user ID to the
-real user ID or the saved user ID; only the super-user may
-make other changes.
-.Pp
-The
-.Fn setreuid
-function has been used to swap the real and effective user
-IDs in set-user-ID programs to temporarily relinquish the set-user-ID
-value.
-This purpose is now better served by the use of the
-.Fn seteuid
-function (see
-.Xr setuid 2 ) .
-.Pp
-When setting the real and effective user IDs to the same value, this
-function is equivalent to the
-.Fn setuid
-function.
-When setting only the effective user ID, this function is equivalent to
-the
-.Fn seteuid
-function.
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EPERM
-The current process is not the super-user and a change
-other than changing the effective user-id to the real user-id
-was specified.
-.El
-.Sh SEE ALSO
-.Xr getuid 2 ,
-.Xr seteuid 2 ,
-.Xr setgid 2 ,
-.Xr setuid 2
-.Sh HISTORY
-The
-.Fn setreuid
-function call appeared in
-.Bx 4.2 .
-An incompatible version was implemented in
-.Bx 4.4 .
-It was reimplemented in
-.Nx 1.2
-in a way compatible with
-.Bx 4.3 ,
-SunOS and Linux, but should not be used in new code.
diff --git a/lib/libc/sys/setsid.2 b/lib/libc/sys/setsid.2
deleted file mode 100644
index 0e7394191..000000000
--- a/lib/libc/sys/setsid.2
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"	$NetBSD: setsid.2,v 1.15 2011/04/04 08:00:53 jruoho Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)setsid.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 4, 2011
-.Dt SETSID 2
-.Os
-.Sh NAME
-.Nm setsid
-.Nd create session and set process group ID
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft pid_t
-.Fn setsid "void"
-.Sh DESCRIPTION
-The
-.Fn setsid
-function creates a new session.
-The calling process is the session leader of the new session, is the
-process group leader of a new process group and has no controlling
-terminal.
-The calling process is the only process in either the session or the
-process group.
-.Pp
-Upon successful completion, the
-.Fn setsid
-function returns the value of the process group ID of the new process
-group, which is the same as the process ID of the calling process.
-.Sh ERRORS
-If an error occurs,
-.Fn setsid
-returns \-1 and the global variable
-.Va errno
-is set to indicate the error, as follows:
-.Bl -tag -width Er
-.It Bq Er EPERM
-The calling process is already a process group leader, or the process
-group ID of a process other than the calling process matches the process
-ID of the calling process.
-.El
-.Sh SEE ALSO
-.Xr getsid 2 ,
-.Xr setpgid 2 ,
-.Xr tcgetpgrp 3 ,
-.Xr tcsetpgrp 3
-.Sh STANDARDS
-The
-.Fn setsid
-function conforms to
-.St -p1003.1-90 .
diff --git a/lib/libc/sys/settimeofday.c b/lib/libc/sys/settimeofday.c
deleted file mode 100644
index 2bc29b43d..000000000
--- a/lib/libc/sys/settimeofday.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*	$NetBSD: settimeofday.c,v 1.14 2011/10/15 23:00:02 christos Exp $ */
-
-/*
- * Copyright (c) 2001 The NetBSD Foundation, Inc.      
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Emmanuel Dreyfus.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: settimeofday.c,v 1.14 2011/10/15 23:00:02 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/syscall.h>
-
-#include <sys/clockctl.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
- 
-int __clockctl_fd = -1;
-
-int ____settimeofday50(const struct timeval *, const void *);
-
-int
-settimeofday(const struct timeval *tv, const void *tzp)
-{
-	struct clockctl_settimeofday args;
-	int rv;
-
-	/*
-	 * try syscal first and attempt to switch to clockctl
-	 * if that fails with EPERM
-	 */
-	if (__clockctl_fd == -1) {
-		rv = ____settimeofday50(tv, tzp);
-	
-		/*
-		 * switch to clockctl if we fail with EPERM, this
-		 * may be cause by an attempt to set the time backwards
-		 * but we should leave the access permission checking
-		 * entirely to the kernel
-		 */
-		if (rv != -1 || errno != EPERM)
-			return rv;
-
-		__clockctl_fd = open(_PATH_CLOCKCTL, O_WRONLY | O_CLOEXEC, 0);
-		if (__clockctl_fd == -1) {
-			/* original error was EPERM - don't leak open errors */
-			errno = EPERM;
-			return -1;
-		}
-	}
-
-	/* 
-	 * If __clockctl_fd >=0, clockctl has already been open
-	 * and used, so we carry on using it.
-	 */
-	args.tv = tv;
-	args.tzp = tzp;
-	return ioctl(__clockctl_fd, CLOCKCTL_SETTIMEOFDAY, &args);
-}
diff --git a/lib/libc/sys/setuid.2 b/lib/libc/sys/setuid.2
deleted file mode 100644
index 7c1532dc5..000000000
--- a/lib/libc/sys/setuid.2
+++ /dev/null
@@ -1,135 +0,0 @@
-.\"	$NetBSD: setuid.2,v 1.22 2010/04/05 07:44:28 wiz Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)setuid.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 3, 2010
-.Dt SETUID 2
-.Os
-.Sh NAME
-.Nm setuid ,
-.Nm seteuid ,
-.Nm setgid ,
-.Nm setegid
-.Nd set user and group ID
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn setuid "uid_t uid"
-.Ft int
-.Fn seteuid "uid_t euid"
-.Ft int
-.Fn setgid "gid_t gid"
-.Ft int
-.Fn setegid "gid_t egid"
-.Sh DESCRIPTION
-The
-.Fn setuid
-function
-sets the real and effective
-user IDs and the saved set-user-ID of the current process
-to the specified value.
-The
-.Fn setuid
-function is permitted if the specified ID is equal to the real user ID
-of the process, or if the effective user ID is that of the super user.
-.Pp
-The
-.Fn setgid
-function
-sets the real and effective
-group IDs and the saved set-group-ID of the current process
-to the specified value.
-The
-.Fn setgid
-function is permitted if the specified ID is equal to the real group ID
-of the process, or if the effective user ID is that of the super user.
-Supplementary group IDs remain unchanged.
-.Pp
-The
-.Fn seteuid
-function
-.Pq Fn setegid
-sets the effective user ID (group ID) of the
-current process.
-The effective user ID may be set to the value
-of the real user ID or the saved set-user-ID (see
-.Xr intro 2
-and
-.Xr execve 2 ) ;
-in this way, the effective user ID of a set-user-ID executable
-may be toggled by switching to the real user ID, then re-enabled
-by reverting to the set-user-ID value.
-Similarly, the effective group ID may be set to the value
-of the real group ID or the saved set-group-ID.
-.Sh RETURN VALUES
-Upon success, these functions return 0;
-otherwise \-1 is returned.
-.Pp
-If the user is not the super user, or the uid
-specified is not the real, effective ID, or saved ID,
-these functions return \-1.
-.Sh SEE ALSO
-.Xr getgid 2 ,
-.Xr getgroups 2 ,
-.Xr getuid 2
-.Sh STANDARDS
-The
-.Fn setuid
-and
-.Fn setgid
-functions are compliant with the
-.St -p1003.1-90
-specification with
-.Li _POSIX_SAVED_IDS
-not defined.
-We do not implement the
-.Li _POSIX_SAVED_IDS
-option as specified in the standard
-because this would make it impossible for a set-user-ID executable owned
-by a user other than the super-user to permanently revoke its privileges.
-.Pp
-The
-.Fn seteuid
-and
-.Fn setegid
-functions are compliant with
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn setuid
-and
-.Fn setgid
-functions appeared in
-.At v2
-and
-.At v4 ,
-respectively.
diff --git a/lib/libc/sys/shmat.2 b/lib/libc/sys/shmat.2
deleted file mode 100644
index f5a967640..000000000
--- a/lib/libc/sys/shmat.2
+++ /dev/null
@@ -1,140 +0,0 @@
-.\"	$NetBSD: shmat.2,v 1.18 2010/03/22 19:30:55 joerg Exp $
-.\"
-.\" Copyright (c) 1995 Frank van der Linden
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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 Frank van der Linden
-.\" 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.
-.\"
-.Dd June 17, 2002
-.Dt SHMAT 2
-.Os
-.Sh NAME
-.Nm shmat ,
-.Nm shmdt
-.Nd map/unmap shared memory
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/shm.h
-.Ft void *
-.Fn shmat "int shmid" "const void *shmaddr" "int shmflg"
-.Ft int
-.Fn shmdt "const void *shmaddr"
-.Sh DESCRIPTION
-.Fn shmat
-maps the shared memory segment associated with the shared memory identifier
-.Fa shmid
-into the address space of the calling process.
-The address at which the segment is mapped is determined by the
-.Fa shmaddr
-parameter.
-If it is equal to 0, the system will pick an address itself.
-Otherwise, an attempt is made to map the shared memory segment at the
-address
-.Fa shmaddr
-specifies.
-If
-.Dv SHM_RND
-is set in
-.Fa shmflg ,
-the system will round the address down to a multiple of
-.Dv SHMLBA
-bytes
-.Pf ( Dv SHMLBA
-is defined in
-.In sys/shm.h ) .
-.Pp
-A shared memory segment can be mapped read-only by specifying the
-.Dv SHM_RDONLY
-flag in
-.Fa shmflg .
-.Pp
-.Fn shmdt
-unmaps the shared memory segment that is currently mapped at
-.Fa shmaddr
-from the calling process' address space.
-.Fa shmaddr
-must be a value returned by a prior
-.Fn shmat
-call.
-A shared memory segment will remain in existence until it is
-removed by a call to
-.Xr shmctl 2
-with the
-.Dv IPC_RMID
-command.
-.Sh RETURN VALUES
-.Fn shmat
-returns the address at which the shared memory segment has been mapped into
-the calling process' address space when successful,
-.Fn shmdt
-returns 0 on successful completion.
-Otherwise, a value of \-1 is returned, and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn shmat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The calling process has no permission to access this shared memory segment.
-.It Bq Er ENOMEM
-There is not enough available data space for the calling process to
-map the shared memory segment.
-.It Bq Er EINVAL
-.Fa shmid
-is not a valid shared memory identifier.
-.Pp
-.Fa shmaddr
-specifies an illegal address.
-.It Bq Er EMFILE
-The number of shared memory segments has reached the system-wide limit.
-.El
-.Pp
-.Fn shmdt
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-.Fa shmaddr
-is not the start address of a mapped shared memory segment.
-.El
-.Sh SEE ALSO
-.Xr ipcrm 1 ,
-.Xr ipcs 1 ,
-.Xr mmap 2 ,
-.Xr shmctl 2 ,
-.Xr shmget 2
-.Sh STANDARDS
-The
-.Nm shmat
-and
-.Nm shmdt
-system calls conform to
-.St -xsh5 .
-.Sh HISTORY
-Shared memory segments appeared in the first release of
-.At V .
diff --git a/lib/libc/sys/shmctl.2 b/lib/libc/sys/shmctl.2
deleted file mode 100644
index 2f0b68a19..000000000
--- a/lib/libc/sys/shmctl.2
+++ /dev/null
@@ -1,209 +0,0 @@
-.\"	$NetBSD: shmctl.2,v 1.21 2010/03/22 19:30:55 joerg Exp $
-.\"
-.\" Copyright (c) 1995 Frank van der Linden
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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 Frank van der Linden
-.\" 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.
-.\"
-.Dd November 25, 2006
-.Dt SHMCTL 2
-.Os
-.Sh NAME
-.Nm shmctl
-.Nd shared memory control operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/shm.h
-.Ft int
-.Fn shmctl "int shmid" "int cmd" "struct shmid_ds *buf"
-.Sh DESCRIPTION
-The
-.Fn shmctl
-system call performs control operations on the shared memory segment
-specified by
-.Fa shmid .
-.Pp
-Each shared memory segment has a
-.Sy shmid_ds
-structure associated with it which contains the following members:
-.Bd -literal
-    struct ipc_perm shm_perm;   /* operation permissions */
-    size_t          shm_segsz;  /* size of segment in bytes */
-    pid_t           shm_lpid;   /* pid of last shm op */
-    pid_t           shm_cpid;   /* pid of creator */
-    shmatt_t        shm_nattch; /* # of current attaches */
-    time_t          shm_atime;  /* last shmat() time */
-    time_t          shm_dtime;  /* last shmdt() time */
-    time_t          shm_ctime;  /* last change by shmctl() */
-.Ed
-.Pp
-The
-.Sy ipc_perm
-structure used inside the
-.Sy shmid_ds
-structure is defined in
-.In sys/ipc.h
-and contains the following members:
-.Bd -literal
-    uid_t cuid;  /* creator user id */
-    gid_t cgid;  /* creator group id */
-    uid_t uid;	 /* user id */
-    gid_t gid;	 /* group id */
-    mode_t mode; /* permission (lower 9 bits) */
-.Ed
-.Pp
-The operation to be performed by
-.Fn shmctl
-is specified in
-.Fa cmd
-and is one of:
-.Bl -tag -width IPC_RMIDX
-.It Dv IPC_STAT
-Gather information about the shared memory segment and place it in the
-structure pointed to by
-.Fa buf .
-.It Dv IPC_SET
-Set the value of the
-.Va shm_perm.uid ,
-.Va shm_perm.gid
-and
-.Va shm_perm.mode
-fields in the structure associated with
-.Fa shmid .
-The values are taken from the corresponding fields in the structure
-pointed to by
-.Fa buf .
-This operation can only be executed by the super-user, or a process that
-has an effective user id equal to either
-.Va shm_perm.cuid
-or
-.Va shm_perm.uid
-in the data structure associated with the shared memory segment.
-.It Dv IPC_RMID
-Remove the shared memory segment specified by
-.Fa shmid
-and destroy the data associated with it.
-Only the super-user or a process with an effective uid equal to the
-.Va shm_perm.cuid
-or
-.Va shm_perm.uid
-values in the data structure associated with the segment can do this.
-.It Dv SHM_LOCK
-Lock the shared memory segment specified by
-.Fa shmid
-in memory.
-This operation can only be executed by the super-user.
-.It Dv SHM_UNLOCK
-Unlock the shared memory segment specified by
-.Fa shmid .
-This operation can only be executed by the super-user.
-.El
-.Pp
-The read and write permissions on a shared memory identifier
-are determined by the
-.Va shm_perm.mode
-field in the same way as is
-done with files (see
-.Xr chmod 2 ) ,
-but the effective uid can match either the
-.Va shm_perm.cuid
-field or the
-.Va shm_perm.uid
-field, and the
-effective gid can match either
-.Va shm_perm.cgid
-or
-.Va shm_perm.gid .
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn shmctl
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The command is
-.Dv IPC_STAT
-and the caller has no read permission for this shared memory segment.
-.It Bq Er EFAULT
-.Fa buf
-specifies an invalid address.
-.It Bq Er EINVAL
-.Fa shmid
-is not a valid shared memory segment identifier.
-.Pp
-.Va cmd
-is not a valid command.
-.It Bq Er ENOMEM
-The
-.Fa cmd
-is equal to
-.Dv SHM_LOCK
-and there is not enough physical memory.
-.It Bq Er EPERM
-.Fa cmd
-is equal to
-.Dv IPC_SET
-or
-.Dv IPC_RMID
-and the caller is not the super-user, nor does
-the effective uid match either the
-.Va shm_perm.uid
-or
-.Va shm_perm.cuid
-fields of the data structure associated with the shared memory segment.
-.Pp
-An attempt was made to increase the value of
-.Va shm_qbytes
-through
-.Dv IPC_SET
-but the caller is not the super-user.
-.Pp
-The
-.Fa cmd
-is equal to
-.Dv SHM_LOCK
-or
-.Dv SHM_UNLOCK
-and the caller is not the super-user.
-.El
-.Sh SEE ALSO
-.Xr ipcrm 1 ,
-.Xr ipcs 1 ,
-.Xr shmat 2 ,
-.Xr shmget 2
-.Sh STANDARDS
-The
-.Nm
-system call conforms to
-.St -xsh5 .
-.Sh HISTORY
-Shared memory segments appeared in the first release of
-.At V .
diff --git a/lib/libc/sys/shmget.2 b/lib/libc/sys/shmget.2
deleted file mode 100644
index 1f8ef34ce..000000000
--- a/lib/libc/sys/shmget.2
+++ /dev/null
@@ -1,174 +0,0 @@
-.\"	$NetBSD: shmget.2,v 1.22 2008/10/27 16:49:10 wiz Exp $
-.\"
-.\" Copyright (c) 1995 Frank van der Linden
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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 Frank van der Linden
-.\" 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.
-.\"
-.Dd October 27, 2008
-.Dt SHMGET 2
-.Os
-.Sh NAME
-.Nm shmget
-.Nd get shared memory segment
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/shm.h
-.Ft int
-.Fn shmget "key_t key" "size_t size" "int shmflg"
-.Sh DESCRIPTION
-.Fn shmget
-returns the shared memory identifier associated with the key
-.Fa key .
-.Pp
-A shared memory segment is created if either
-.Fa key
-is equal to
-.Dv IPC_PRIVATE ,
-or
-.Fa key
-does not have a shared memory segment identifier associated with it, and the
-.Dv IPC_CREAT
-bit is set in
-.Fa shmflg .
-If both the
-.Dv IPC_CREAT
-bit and the
-.Dv IPC_EXCL
-bit are set in
-.Fa shmflg ,
-and
-.Fa key
-has a shared memory segment identifier associated with it already,
-the operation will fail.
-.Pp
-If a new shared memory segment is created, the data structure
-associated with it (the
-.Va shmid_ds
-structure, see
-.Xr shmctl 2 )
-is initialized as follows:
-.Bl -bullet
-.It
-.Va shm_perm.cuid
-and
-.Va shm_perm.uid
-are set to the effective uid of the calling process.
-.It
-.Va shm_perm.gid
-and
-.Va shm_perm.cgid
-are set to the effective gid of the calling process.
-.It
-.Va shm_perm.mode
-is set to the lower 9 bits of
-.Fa shmflg .
-.It
-.Va shm_lpid ,
-.Va shm_nattch ,
-.Va shm_atime ,
-and
-.Va shm_dtime
-are set to 0.
-.It
-.Va shm_ctime
-is set to the current time.
-.It
-.Va shm_segsz
-is set to the value of
-.Fa size .
-.El
-.Sh RETURN VALUES
-Upon successful completion a positive shared memory segment identifier
-is returned.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EACCES
-A shared memory segment is already associated with
-.Fa key
-and the caller has no permission to access it.
-.It Bq Er EEXIST
-Both
-.Dv IPC_CREAT
-and
-.Dv IPC_EXCL
-are set in
-.Fa shmflg ,
-and a shared memory segment is already associated with
-.Fa key .
-.It Bq Er EINVAL
-No shared memory segment is to be created, and a shared memory segment
-exists for
-.Fa key ,
-but the size of the segment associated with it is less
-than
-.Fa size ,
-which is non-zero.
-.Pp
-A shared memory segment
-.Em is
-to be created, and
-.Fa size
-is less than the system imposed minimum, or greater than the system
-imposed maximum (refer to the
-.Li kern.ipc
-values in
-.Xr sysctl 7 ) .
-.It Bq Er ENOENT
-.Dv IPC_CREAT
-is not set in
-.Fa shmflg
-and no shared memory segment associated with
-.Fa key
-was found.
-.It Bq Er ENOMEM
-There is not enough memory left to create a shared memory segment of the
-requested size.
-.It Bq Er ENOSPC
-A new shared memory identifier could not be created because the system limit
-for the number of shared memory identifiers has been reached.
-.El
-.Sh SEE ALSO
-.Xr ipcrm 1 ,
-.Xr ipcs 1 ,
-.Xr mmap 2 ,
-.Xr shmat 2 ,
-.Xr shmctl 2 ,
-.Xr ftok 3 ,
-.Xr sysctl 7
-.Sh STANDARDS
-The
-.Nm
-system call conforms to
-.St -xsh5 .
-.Sh HISTORY
-Shared memory segments appeared in the first release of
-.At V .
diff --git a/lib/libc/sys/shutdown.2 b/lib/libc/sys/shutdown.2
deleted file mode 100644
index 3e3896219..000000000
--- a/lib/libc/sys/shutdown.2
+++ /dev/null
@@ -1,93 +0,0 @@
-.\"	$NetBSD: shutdown.2,v 1.17 2004/05/13 10:20:58 wiz Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)shutdown.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd August 18, 2002
-.Dt SHUTDOWN 2
-.Os
-.Sh NAME
-.Nm shutdown
-.Nd shut down part of a full-duplex connection
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft int
-.Fn shutdown "int s" "int how"
-.Sh DESCRIPTION
-The
-.Fn shutdown
-call causes all or part of a full-duplex connection on
-the socket associated with
-.Fa s
-to be shut down.
-The
-.Fa how
-argument specifies which part of the connection will be shut down.
-Permissible values are:
-.Bl -tag -width SHUT_RDWRXX -offset indent
-.It SHUT_RD
-further receives will be disallowed.
-.It SHUT_WR
-further sends will be disallowed.
-.It SHUT_RDWR
-further sends and receives will be disallowed.
-.El
-.Sh RETURN VALUES
-A 0 is returned if the call succeeds, \-1 if it fails.
-.Sh ERRORS
-The call succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa s
-is not a valid descriptor.
-.It Bq Er EINVAL
-The
-.Fa how
-argument is invalid.
-.It Bq Er ENOTCONN
-The specified socket is not connected.
-.It Bq Er ENOTSOCK
-.Fa s
-is a file, not a socket.
-.El
-.Sh SEE ALSO
-.Xr connect 2 ,
-.Xr socket 2
-.Sh HISTORY
-The
-.Fn shutdown
-function call appeared in
-.Bx 4.2 .
-The
-.Fa how
-arguments used to be simply 0, 1, and 2, but now have named values
-as specified by
-.St -xpg4 .
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
deleted file mode 100644
index fb94c93df..000000000
--- a/lib/libc/sys/sigaction.2
+++ /dev/null
@@ -1,361 +0,0 @@
-.\"	$NetBSD: sigaction.2,v 1.45 2014/01/04 15:54:27 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"	@(#)sigaction.2	8.2 (Berkeley) 4/3/94
-.\"
-.Dd June 3, 2006
-.Dt SIGACTION 2
-.Os
-.Sh NAME
-.Nm sigaction
-.Nd software signal facilities
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigaction "int sig" "const struct sigaction * restrict act" "struct sigaction * restrict oact"
-.Sh DESCRIPTION
-The system defines a set of signals that may be delivered to a process.
-Signal delivery resembles the occurrence of a hardware interrupt:
-the signal is blocked from further occurrence, the current process
-context is saved, and a new one is built.
-A process may specify a
-.Em handler
-to which a signal is delivered, or specify that a signal is to be
-.Em ignored .
-A process may also specify that a default action is to be taken
-by the system when a signal occurs.
-A signal may also be
-.Em blocked ,
-in which case its delivery is postponed until it is
-.Em unblocked .
-The action to be taken on delivery is determined at the time of delivery.
-Normally, signal handlers execute on the current stack of the process.
-This may be changed, on a per-handler basis, so that signals are
-taken on a special
-.Em "signal stack" .
-.Pp
-Signal routines execute with the signal that caused their
-invocation
-.Em blocked ,
-but other signals may yet occur.
-A global
-.Em "signal mask"
-defines the set of signals currently blocked from delivery
-to a process.
-The signal mask for a process is initialized from that of its parent
-(normally empty).
-It may be changed with a
-.Xr sigprocmask 2
-call, or when a signal is delivered to the process.
-Signal masks are represented using the
-.Em sigset_t
-type; the
-.Xr sigsetops 3
-interface is used to modify such data.
-.Pp
-When a signal
-condition arises for a process, the signal is added to a set of
-signals pending for the process.
-If the signal is not currently
-.Em blocked
-by the process then it is delivered to the process.
-Signals may be delivered any time a process enters the operating system
-(e.g., during a system call, page fault or trap, or clock interrupt).
-If multiple signals are ready to be delivered at the same time,
-any signals that could be caused by traps are delivered first.
-Additional signals may be processed at the same time, with each
-appearing to interrupt the handlers for the previous signals
-before their first instructions.
-The set of pending signals is returned by the
-.Xr sigpending 2
-function.
-When a caught signal
-is delivered, the current state of the process is saved,
-a new signal mask is calculated (as described below),
-and the signal handler is invoked.
-The call to the handler is arranged so that if the signal handling
-routine returns normally the process will resume execution in the
-context from before the signal's delivery.
-If the process wishes to resume in a different context, then it
-must arrange to restore the previous context itself.
-.Pp
-.Em "struct sigaction"
-includes the following members:
-.Bd -literal -offset indent
-void 	  (*sa_sigaction)(int sig, siginfo_t *info, void *ctx);
-void      (*sa_handler)(int sig);
-sigset_t  sa_mask;
-int       sa_flags;
-.Ed
-.Pp
-When a signal is delivered to a process a new signal mask is
-installed for the duration of the process' signal handler
-(or until a
-.Xr sigprocmask 2
-call is made).
-This mask is formed by taking the union of the current signal mask,
-the signal to be delivered, and
-the signal mask associated with the handler to be invoked,
-.Em sa_mask .
-.Pp
-.Fn sigaction
-assigns an action for a specific signal.
-If
-.Fa act
-is non-zero, it
-specifies an action
-.Pf ( Dv SIG_DFL ,
-.Dv SIG_IGN ,
-or a handler routine) and mask
-to be used when delivering the specified signal.
-If
-.Fa oact
-is non-zero, the previous handling information for the signal
-is returned to the user.
-.Pp
-Once a signal handler is installed, it remains installed
-until another
-.Fn sigaction
-call is made, or an
-.Xr execve 2
-is performed.
-A signal-specific default action may be reset by
-setting
-.Fa sa_handler
-to
-.Dv SIG_DFL .
-The defaults are process termination, possibly with core dump;
-no action; stopping the process; or continuing the process.
-See the signal list below for each signal's default action.
-If
-.Fa sa_handler
-is set to
-.Dv SIG_DFL ,
-the default action for the signal is to discard the signal,
-and if a signal is pending,
-the pending signal is discarded even if the signal is masked.
-If
-.Fa sa_handler
-is set to
-.Dv SIG_IGN ,
-current and pending instances
-of the signal are ignored and discarded.
-.Pp
-Options may be specified by setting
-.Em sa_flags .
-.Bl -tag -width SA_NOKERNINFO
-.It Dv SA_NODEFER
-If set, then the signal that caused the handler to be executed is not added
-to the list of block signals.
-Please note that
-.Fa sa_mask
-takes precedence over
-.Dv SA_NODEFER ,
-so that if the specified signal is blocked in
-.Fa sa_mask ,
-then
-.Dv SA_NODEFER
-will have no effect.
-.It Dv SA_NOCLDSTOP
-If set when installing a catching function
-for the
-.Dv SIGCHLD
-signal,
-the
-.Dv SIGCHLD
-signal will be generated only when a child process exits,
-not when a child process stops.
-.It Dv SA_NOCLDWAIT
-If set, the system will not create a zombie when the child exits,
-but the child process will be automatically waited for.
-The same effect can be achieved by setting the signal handler for
-.Dv SIGCHLD
-to
-.Dv SIG_IGN .
-.It Dv SA_ONSTACK
-If set, the system will deliver the signal to the process on a
-.Em "signal stack" ,
-specified with
-.Xr sigaltstack 2 .
-.It Dv SA_RESETHAND
-If set, the default action will be reinstated when the signal
-is first posted.
-.It Dv SA_RESTART
-Normally, if a signal is caught during the system calls listed below,
-the call may be forced to terminate
-with the error
-.Er EINTR ,
-the call may return with a data transfer shorter than requested,
-or the call may be restarted.
-Restarting of pending calls is requested
-by setting the
-.Dv SA_RESTART
-bit in
-.Ar sa_flags .
-The affected system calls include
-.Xr open 2 ,
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr sendto 2 ,
-.Xr recvfrom 2 ,
-.Xr sendmsg 2
-and
-.Xr recvmsg 2
-on a communications channel or a slow device (such as a terminal,
-but not a regular file)
-and during a
-.Xr wait 2
-or
-.Xr ioctl 2 .
-However, calls that have already committed are not restarted,
-but instead return a partial success (for example, a short read count).
-.Pp
-After a
-.Xr fork 2
-or
-.Xr vfork 2
-all signals, the signal mask, the signal stack,
-and the restart/interrupt flags are inherited by the child.
-.Pp
-The
-.Xr execve 2
-system call reinstates the default
-action for all signals which were caught and
-resets all signals to be caught on the user stack.
-Ignored signals remain ignored;
-the signal mask remains the same;
-signals that restart pending system calls continue to do so.
-.Pp
-See
-.Xr signal 7
-for comprehensive list of supported signals.
-.It Dv SA_SIGINFO
-If set, the signal handler function will receive additional information
-about the caught signal.
-An alternative handler that gets passed additional arguments will
-be called which is named
-.Fa sa_sigaction .
-The
-.Ar sig
-argument of this handler contains the signal number that was caught.
-The
-.Ar info
-argument contains additional signal specific information which
-is listed in
-.Xr siginfo 2 .
-The
-.Ar ctx
-argument
-is a pointer to the
-.Xr ucontext 2
-context where the signal handler will return to.
-.It Dv SA_NOKERNINFO
-This flag is relevant only to
-.Dv SIGINFO ,
-and turns off printing kernel messages on the tty.
-It is similar to the
-.Dv NOKERNINFO
-flag in
-.Xr termios 4 .
-.El
-.Pp
-Only functions that are async-signal-safe can safely be used in signal
-handlers; see
-.Xr signal 7
-for a complete list.
-.Sh NOTES
-The mask specified in
-.Fa act
-is not allowed to block
-.Dv SIGKILL
-or
-.Dv SIGSTOP .
-This is enforced silently by the system.
-.Sh RETURN VALUES
-A 0 value indicates that the call succeeded.
-A \-1 return value indicates an error occurred and
-.Va errno
-is set to indicate the reason.
-.Sh ERRORS
-.Fn sigaction
-will fail and no new signal handler will be installed if one
-of the following occurs:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-Either
-.Fa act
-or
-.Fa oact
-points to memory that is not a valid part of the process
-address space.
-.It Bq Er EINVAL
-.Fa sig
-is not a valid signal number;
-or an attempt is made to ignore or supply a handler for
-.Dv SIGKILL
-or
-.Dv SIGSTOP ;
-or the
-.Em sa_flags
-word contains bits other than
-.Dv SA_NOCLDSTOP ,
-.Dv SA_NOCLDWAIT ,
-.Dv SA_NODEFER ,
-.Dv SA_ONSTACK ,
-.Dv SA_RESETHAND ,
-.Dv SA_RESTART ,
-and
-.Dv SA_SIGINFO .
-.El
-.Sh SEE ALSO
-.Xr kill 1 ,
-.Xr kill 2 ,
-.Xr ptrace 2 ,
-.Xr sigaltstack 2 ,
-.Xr siginfo 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsuspend 2 ,
-.Xr setjmp 3 ,
-.Xr sigsetops 3 ,
-.Xr tty 4 ,
-.Xr signal 7
-.Sh STANDARDS
-The
-.Fn sigaction
-function conforms to
-.St -p1003.1-90 .
-The
-.Dv SA_ONSTACK
-and
-.Dv SA_RESTART
-flags are Berkeley extensions, available on most
-.Bx Ns \-derived
-systems.
diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libc/sys/sigaltstack.2
deleted file mode 100644
index 2976718e5..000000000
--- a/lib/libc/sys/sigaltstack.2
+++ /dev/null
@@ -1,169 +0,0 @@
-.\"	$NetBSD: sigaltstack.2,v 1.24 2014/09/27 12:11:13 njoly Exp $
-.\"
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)sigaltstack.2	8.2 (Berkeley) 5/1/95
-.\"
-.Dd March 2, 2012
-.Dt SIGALTSTACK 2
-.Os
-.Sh NAME
-.Nm sigaltstack
-.Nd set and/or get signal stack context
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Bd -literal
-typedef struct sigaltstack {
-	void   *ss_sp;
-	size_t	ss_size;
-	int     ss_flags;
-} stack_t;
-.Ed
-.Pp
-.Ft int
-.Fn sigaltstack "const stack_t * restrict ss" "stack_t * restrict oss"
-.Sh DESCRIPTION
-.Fn sigaltstack
-allows users to define an alternative stack on which signals
-are to be processed.
-If
-.Fa ss
-is non-zero,
-it specifies a pointer to and the size of a
-.Em "signal stack"
-on which to deliver signals,
-and tells the system if the process is currently executing
-on that stack.
-When a signal's action indicates its handler
-should execute on the signal stack (specified with a
-.Xr sigaction 2
-call), the system checks to see
-if the process is currently executing on that stack.
-If the process is not currently executing on the signal stack,
-the system arranges a switch to the signal stack for the
-duration of the signal handler's execution.
-.Pp
-If
-.Dv SS_DISABLE
-is set in
-.Fa ss_flags ,
-.Fa ss_sp
-and
-.Fa ss_size
-are ignored and the signal stack will be disabled.
-Trying to disable an active stack will cause
-.Nm
-to return \-1 with
-.Va errno
-set to
-.Er EINVAL .
-A disabled stack will cause all signals to be
-taken on the regular user stack.
-If the stack is later re-enabled then all signals that were specified
-to be processed on an alternative stack will resume doing so.
-.Pp
-If
-.Fa oss
-is non-zero, the current signal stack state is returned.
-The
-.Fa ss_flags
-field will contain the value
-.Dv SS_ONSTACK
-if the process is currently on a signal stack and
-.Dv SS_DISABLE
-if the signal stack is currently disabled.
-.Sh NOTES
-The value
-.Dv SIGSTKSZ
-is defined to be the number of bytes/chars that would be used to cover
-the usual case when allocating an alternative stack area.
-The following code fragment is typically used to allocate an alternative stack.
-.Bd -literal -offset indent
-if ((sigstk.ss_sp = malloc(SIGSTKSZ)) == NULL)
-	/* error return */
-sigstk.ss_size = SIGSTKSZ;
-sigstk.ss_flags = 0;
-if (sigaltstack(\*[Am]sigstk,0) \*[Lt] 0)
-	perror("sigaltstack");
-.Ed
-.Pp
-An alternative approach is provided for programs with signal handlers
-that require a specific amount of stack space other than the default size.
-The value
-.Dv MINSIGSTKSZ
-is defined to be the number of bytes/chars that is required by
-the operating system to implement the alternative stack feature.
-In computing an alternative stack size,
-programs should add
-.Dv MINSIGSTKSZ
-to their stack requirements to allow for the operating system overhead.
-.Pp
-Signal stacks are automatically adjusted for the direction of stack
-growth and alignment requirements.
-Signal stacks may or may not be protected by the hardware and
-are not ``grown'' automatically as is done for the normal stack.
-If the stack overflows and this space is not protected
-unpredictable results may occur.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-.Fn sigaltstack
-will fail and the signal stack context will remain unchanged
-if one of the following occurs.
-.Bl -tag -width Er
-.It Bq Er EFAULT
-Either
-.Fa ss
-or
-.Fa oss
-points to memory that is not a valid part of the process
-address space.
-.It Bq Er EINVAL
-An attempt was made to disable an active stack.
-.It Bq Er ENOMEM
-Size of alternative stack area is less than
-.Dv MINSIGSTKSZ .
-.El
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr setjmp 3 ,
-.Xr signal 7
-.Sh STANDARDS
-The
-.Fn sigaltstack
-function conforms to
-.St -xpg4.2 .
-.Sh HISTORY
-The predecessor to
-.Nm sigaltstack ,
-the
-.Fn sigstack
-system call, appeared in
-.Bx 4.2 .
diff --git a/lib/libc/sys/sigpending.2 b/lib/libc/sys/sigpending.2
deleted file mode 100644
index e3e627aa9..000000000
--- a/lib/libc/sys/sigpending.2
+++ /dev/null
@@ -1,77 +0,0 @@
-.\"	$NetBSD: sigpending.2,v 1.15 2008/10/24 15:40:21 wiz Exp $
-.\"
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Berkeley Software Design, 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.
-.\"
-.\"	@(#)sigpending.2	8.3 (Berkeley) 1/12/94
-.\"
-.Dd October 24, 2008
-.Dt SIGPENDING 2
-.Os
-.Sh NAME
-.Nm sigpending
-.Nd get pending signals
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigpending "sigset_t *set"
-.Sh DESCRIPTION
-The
-.Nm sigpending
-function returns a mask of the signals pending for delivery
-to the calling process in the location indicated by
-.Fa set .
-Signals may be pending because they are currently masked,
-or they are in transition before delivery (although the latter case is not
-normally detectable).
-.Sh RETURN VALUES
-A 0 value indicates that the call succeeded.
-A \-1 return value indicates an error occurred and
-.Va errno
-is set to indicate the reason.
-.Sh ERRORS
-.Fn sigpending
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-.Fa set
-specifies an invalid address.
-.El
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr sigprocmask 2 ,
-.Xr signal 7
-.Sh STANDARDS
-The
-.Nm sigpending
-function conforms to
-.St -p1003.1-90 .
diff --git a/lib/libc/sys/sigprocmask.2 b/lib/libc/sys/sigprocmask.2
deleted file mode 100644
index 0504d5106..000000000
--- a/lib/libc/sys/sigprocmask.2
+++ /dev/null
@@ -1,121 +0,0 @@
-.\"	$NetBSD: sigprocmask.2,v 1.22 2006/01/07 20:11:30 kleink Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"	@(#)sigprocmask.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt SIGPROCMASK 2
-.Os
-.Sh NAME
-.Nm sigprocmask
-.Nd manipulate current signal mask
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigprocmask "int how" "const sigset_t * restrict set" "sigset_t * restrict oset"
-.Sh DESCRIPTION
-The
-.Fn sigprocmask
-function examines and/or changes the current signal mask (those signals
-that are blocked from delivery).
-Signals are blocked if they are members of the current signal mask set.
-.Pp
-If
-.Fa set
-is not null, the action of
-.Fn sigprocmask
-depends on the value of the parameter
-.Fa how .
-The signal mask is changed as a function of the specified
-.Fa set
-and the current mask.
-The function is specified by
-.Fa how
-using one of the following values:
-.Bl -tag -width SIG_UNBLOCK
-.It Dv SIG_BLOCK
-The new mask is the union of the current mask and the specified
-.Fa set .
-.It Dv SIG_UNBLOCK
-The new mask is the intersection of the current mask
-and the complement of the specified
-.Fa set .
-.It Dv SIG_SETMASK
-The current mask is replaced by the specified
-.Fa set .
-.El
-.Pp
-If
-.Fa oset
-is not null, it is set to
-the previous value of the signal mask.
-.Pp
-When
-.Fa set
-is null,
-the value of
-.Ar how
-is insignificant and the mask remains unset
-providing a way to examine the signal mask without modification.
-.Pp
-The system
-quietly disallows
-.Dv SIGKILL
-or
-.Dv SIGSTOP
-to be blocked.
-.Sh RETURN VALUES
-A 0 value indicates that the call succeeded.
-A \-1 return value indicates an error occurred and
-.Va errno
-is set to indicate the reason.
-.Sh ERRORS
-The
-.Fn sigprocmask
-call will fail and the signal mask will be unchanged if one
-of the following occurs:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-.Fa how
-has a value other than those listed here.
-.El
-.Sh SEE ALSO
-.Xr kill 2 ,
-.Xr sigaction 2 ,
-.Xr sigsuspend 2 ,
-.Xr pthread_sigmask 3 ,
-.Xr sigsetops 3 ,
-.Xr signal 7
-.Sh STANDARDS
-The
-.Fn sigprocmask
-function conforms to
-.St -p1003.1-90 .
diff --git a/lib/libc/sys/sigqueue.2 b/lib/libc/sys/sigqueue.2
deleted file mode 100644
index 87fb6f37e..000000000
--- a/lib/libc/sys/sigqueue.2
+++ /dev/null
@@ -1,157 +0,0 @@
-.\" $NetBSD: sigqueue.2,v 1.3 2013/02/14 09:31:48 wiz Exp $
-.\" 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(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: src/lib/libc/sys/sigqueue.2,v 1.8 2006/09/17 21:27:34 ru Exp $
-.\"
-.Dd January 9, 2011
-.Dt SIGQUEUE 2
-.Os
-.Sh NAME
-.Nm sigqueue
-.Nd queue a signal to a process (REALTIME)
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigqueue "pid_t pid" "int signo" "const union sigval value"
-.Ft int
-.Fn sigqueueinfo "pid_t pid" "const siginfo_t *info"
-.Sh DESCRIPTION
-The
-.Fn sigqueue
-system call causes the signal specified by
-.Fa signo
-to be sent with the value specified by
-.Fa value
-to the process specified by
-.Fa pid .
-If
-.Fa signo
-is zero (the null signal), error checking is performed but
-no signal is actually sent.
-The null signal can be used to check the
-validity of PID.
-.Pp
-The conditions required for a process to have permission to queue a
-signal to another process are the same as for the
-.Xr kill 2
-system call.
-The
-.Fn sigqueue
-system call queues a signal to a single process specified by the
-.Fa pid
-argument.
-.Pp
-The
-.Fn sigqueue
-system call is implemented using
-.Fn sigqueueinfo
-and passing the appropriate information in the
-.Fa info
-argument.
-.Pp
-The
-.Fn sigqueue
-system call returns immediately.
-If the resources were
-available to queue the signal, the signal will be queued and sent to
-the receiving process.
-.Pp
-If the value of
-.Fa pid
-causes
-.Fa signo
-to be generated for the sending process, and if
-.Fa signo
-is not blocked for the calling thread and if no other thread has
-.Fa signo
-unblocked or is waiting in a
-.Fn sigwait
-system call for
-.Fa signo ,
-either
-.Fa signo
-or at least the pending, unblocked signal will be delivered to the
-calling thread before
-.Fn sigqueue
-returns.
-Should any multiple pending signals in the range
-.Dv SIGRTMIN
-to
-.Dv SIGRTMAX
-be selected for delivery, it is the lowest numbered
-one.
-The selection order between realtime and non-realtime signals, or
-between multiple pending non-realtime signals, is unspecified.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn sigqueue
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-No resources are available to queue the signal.
-The process has already queued
-.Brq Dv SIGQUEUE_MAX
-signals that are still pending at the receiver(s),
-or a system-wide resource limit has been exceeded.
-.It Bq Er EINVAL
-The value of the
-.Fa signo
-argument is an invalid or unsupported signal number.
-.It Bq Er EPERM
-The process does not have the appropriate privilege to send the signal
-to the receiving process.
-.It Bq Er ESRCH
-The process
-.Fa pid
-does not exist.
-.El
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr siginfo 2 ,
-.Xr sigpending 2 ,
-.Xr sigsuspend 2 ,
-.Xr sigtimedwait 2 ,
-.Xr sigwait 2 ,
-.Xr sigwaitinfo 2 ,
-.Xr pause 3 ,
-.Xr pthread_sigmask 3
-.Sh STANDARDS
-The
-.Fn sigqueue
-system call conforms to
-.St -p1003.1-2004 .
-.Sh HISTORY
-Support for
-.Tn POSIX
-realtime signal queue first appeared in
-.Nx 6.0 .
diff --git a/lib/libc/sys/sigqueue.c b/lib/libc/sys/sigqueue.c
deleted file mode 100644
index 2bf09ad4b..000000000
--- a/lib/libc/sys/sigqueue.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* $NetBSD: sigqueue.c,v 1.2 2011/01/10 16:42:36 christos Exp $ */
-
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sigqueue.c,v 1.2 2011/01/10 16:42:36 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <string.h>
-#include <signal.h>
-#include <unistd.h>
-
-/*
- * This is wrapper around sigqueueinfo(2), providing a sigqueue()
- * implementation for userland.
- */
-int
-sigqueue(pid_t pid, int signo, const union sigval value)
-{
-	siginfo_t info;
-
-	(void)memset(&info, 0, sizeof(info));
-
-	info.si_signo = signo;
-	info.si_code = SI_QUEUE;
-	info.si_pid = getpid();
-	info.si_uid = geteuid();
-	info.si_value = value;
-
-	return sigqueueinfo(pid, &info);
-}
diff --git a/lib/libc/sys/sigstack.2 b/lib/libc/sys/sigstack.2
deleted file mode 100644
index d227f567f..000000000
--- a/lib/libc/sys/sigstack.2
+++ /dev/null
@@ -1,54 +0,0 @@
-.\"	$NetBSD: sigstack.2,v 1.12 2003/08/07 16:44:09 agc Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\" 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.
-.\"
-.\"     @(#)sigstack.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt SIGSTACK 2
-.Os
-.Sh NAME
-.Nm sigstack
-.Nd set and/or get signal stack context
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigstack "const struct sigstack *" "struct sigstack *"
-.Sh DESCRIPTION
-The
-.Fn sigstack
-function has been deprecated in favor of the interface described in
-.Xr sigaltstack 2 .
-.Sh SEE ALSO
-.Xr sigaltstack 2 ,
-.Xr signal 7
-.Sh HISTORY
-The
-.Nm
-function call appeared in
-.Bx 4.2 .
diff --git a/lib/libc/sys/sigsuspend.2 b/lib/libc/sys/sigsuspend.2
deleted file mode 100644
index d462342e9..000000000
--- a/lib/libc/sys/sigsuspend.2
+++ /dev/null
@@ -1,80 +0,0 @@
-.\"	$NetBSD: sigsuspend.2,v 1.17 2004/05/13 10:20:58 wiz Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"	@(#)sigsuspend.2	8.2 (Berkeley) 5/16/95
-.\"
-.Dd May 16, 1995
-.Dt SIGSUSPEND 2
-.Os
-.Sh NAME
-.Nm sigsuspend
-.Nd atomically release blocked signals and wait for interrupt
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigsuspend "const sigset_t *sigmask"
-.Sh DESCRIPTION
-.Fn sigsuspend
-temporarily changes the blocked signal mask to the set to which
-.Fa sigmask
-points,
-and then waits for a signal to arrive;
-on return the previous set of masked signals is restored.
-The signal mask set
-is usually empty to indicate that all
-signals are to be unblocked for the duration of the call.
-.Pp
-In normal usage, a signal is blocked using
-.Xr sigprocmask 2
-to begin a critical section, variables modified on the occurrence
-of the signal are examined to determine that there is no work
-to be done, and the process pauses awaiting work by using
-.Fn sigsuspend
-with the previous mask returned by
-.Xr sigprocmask 2 .
-.Sh RETURN VALUES
-The
-.Fn sigsuspend
-function
-always terminates by being interrupted, returning \-1 with
-.Va errno
-set to
-.Er EINTR .
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsetops 3 ,
-.Xr signal 7
-.Sh STANDARDS
-The
-.Nm sigsuspend
-function call conforms to
-.St -p1003.1-90 .
diff --git a/lib/libc/sys/sigtimedwait.2 b/lib/libc/sys/sigtimedwait.2
deleted file mode 100644
index 80962bd6d..000000000
--- a/lib/libc/sys/sigtimedwait.2
+++ /dev/null
@@ -1,154 +0,0 @@
-.\" $NetBSD: sigtimedwait.2,v 1.8 2012/04/02 22:06:47 agc Exp $
-.\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jaromir Dolecek.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd April 2, 2012
-.Dt SIGTIMEDWAIT 2
-.Os
-.Sh NAME
-.Nm sigtimedwait ,
-.Nm sigwaitinfo ,
-.Nm sigwait
-.Nd wait for queued signals
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigtimedwait "const sigset_t * restrict set" "siginfo_t * restrict info" "const struct timespec * restrict timeout"
-.Ft int
-.Fn sigwaitinfo "const sigset_t * restrict set" "siginfo_t * restrict info"
-.Ft int
-.Fn sigwait "const sigset_t * restrict set" "int * restrict sig"
-.Sh DESCRIPTION
-.Fn sigwaitinfo
-and
-.Fn sigwait
-return the first pending signal from the set specified by
-.Fa set .
-Should multiple signals from
-.Fa set
-be pending, the lowest numbered one is returned.
-The selection order between realtime and non-realtime signals is unspecified.
-If there is no signal from
-.Ar set
-pending at the time of the call, the calling thread
-is suspended until one of the specified signals is generated.
-.Pp
-.Fn sigtimedwait
-is exactly equal to
-.Fn sigwaitinfo ,
-except
-.Fa timeout
-specifies the maximum time interval for which the calling thread will
-be suspended.
-If
-.Fa timeout
-is zero (tv_sec == tv_nsec == 0),
-.Fn sigtimedwait
-only checks the currently pending signals and returns immediately.
-If
-.Dv NULL
-is used for
-.Fa timeout ,
-.Fn sigtimedwait
-behaves exactly like
-.Fn sigwaitinfo
-in all regards.
-.Pp
-If several threads are waiting for a given signal, exactly one of them
-returns from the signal wait when the signal is generated.
-.Pp
-Behaviour of these functions is unspecified if any of the signals in
-.Fa set
-are unblocked at the time these functions are called.
-.Sh RETURN VALUES
-Upon successful completion of
-.Fn sigtimedwait
-or
-.Fn sigwaitinfo
-.Fa info
-is updated with signal information, and the function returns the signal number.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-indicates the error.
-Upon successful completion of
-.Fn sigwait
-.Fa sig
-is updated with the signal number, and the function returns 0.
-Otherwise, a non-zero error code is returned.
-.Sh ERRORS
-.Fn sigwaitinfo
-and
-.Fn sigwait
-always succeed.
-.Pp
-.Fn sigtimedwait
-will fail and the
-.Fa info
-pointer will remain unchanged if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-No signal specified in
-.Fa set
-was generated in the specified
-.Fa timeout .
-.El
-.Pp
-.Fn sigtimedwait
-may also fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The specified
-.Fa timeout
-was invalid.
-.El
-.Pp
-This error is only checked if no signal from
-.Fa set
-is pending and it would be necessary to wait.
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr sigprocmask 2 ,
-.Xr signal 7
-.Sh STANDARDS
-The functions
-.Fn sigtimedwait ,
-.Fn sigwaitinfo ,
-and
-.Fn sigwait
-conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn sigtimedwait ,
-.Fn sigwaitinfo ,
-and
-.Fn sigwait
-functions appeared in
-.Nx 2.0 .
diff --git a/lib/libc/sys/sigtimedwait.c b/lib/libc/sys/sigtimedwait.c
deleted file mode 100644
index 00b46cce2..000000000
--- a/lib/libc/sys/sigtimedwait.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $NetBSD: sigtimedwait.c,v 1.3 2009/01/11 02:46:30 christos Exp $ */
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jaromir Dolecek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sigtimedwait.c,v 1.3 2009/01/11 02:46:30 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include <signal.h>
-#include <time.h>
-
-/*
- * Copy timeout to local variable and call the syscall.
- */
-int
-sigtimedwait(const sigset_t * __restrict set, siginfo_t * __restrict info,
-    const struct timespec * __restrict timeout)
-{
-	struct timespec ts;
-
-	if (timeout) {
-		ts = *timeout;
-		return __sigtimedwait(set, info, &ts);
-	} else
-		return __sigtimedwait(set, info, NULL);
-}
diff --git a/lib/libc/sys/sigwait.c b/lib/libc/sys/sigwait.c
deleted file mode 100644
index 10902ba74..000000000
--- a/lib/libc/sys/sigwait.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* $NetBSD: sigwait.c,v 1.5 2012/03/20 16:26:12 matt Exp $ */
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jaromir Dolecek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sigwait.c,v 1.5 2012/03/20 16:26:12 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include <signal.h>
-#include <errno.h>
-
-#ifdef __weak_alias
-__weak_alias(sigwait,_sigwait)
-#endif
-
-int	_sigwait(const sigset_t * __restrict, int * __restrict);
-
-/*
- * This is wrapper around sigtimedwait(2), providing sigwait()
- * implementation for userland.
- */
-int
-_sigwait(const sigset_t * __restrict set, int * __restrict signum)
-{
-	int saved_errno, new_errno, sig;
-	
-	saved_errno = errno;
-	sig = __sigtimedwait(set, NULL, NULL);
-	new_errno = errno;
-	errno = saved_errno;
-	if (sig < 0)
-		return (new_errno);
-	*signum = sig;
-	return (0);
-}
diff --git a/lib/libc/sys/sigwaitinfo.c b/lib/libc/sys/sigwaitinfo.c
deleted file mode 100644
index 6ab27a274..000000000
--- a/lib/libc/sys/sigwaitinfo.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $NetBSD: sigwaitinfo.c,v 1.3 2012/03/20 16:26:12 matt Exp $ */
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jaromir Dolecek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sigwaitinfo.c,v 1.3 2012/03/20 16:26:12 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include <signal.h>
-
-#ifdef __weak_alias
-__weak_alias(sigwaitinfo,_sigwaitinfo)
-#endif
-
-int	_sigwaitinfo(const sigset_t * __restrict, siginfo_t * __restrict info);
-
-/*
- * This is wrapper around sigtimedwait(2), providing sigwaitinfo()
- * implementation for userland.
- */
-int
-_sigwaitinfo(const sigset_t * __restrict set, siginfo_t * __restrict info)
-{
-	return (sigtimedwait(set, info, NULL));
-}
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
deleted file mode 100644
index 6912d0659..000000000
--- a/lib/libc/sys/socket.2
+++ /dev/null
@@ -1,293 +0,0 @@
-.\"	$NetBSD: socket.2,v 1.41 2013/03/01 18:25:16 joerg Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)socket.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd February 5, 2013
-.Dt SOCKET 2
-.Os
-.Sh NAME
-.Nm socket
-.Nd create an endpoint for communication
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft int
-.Fn socket "int domain" "int type" "int protocol"
-.Sh DESCRIPTION
-.Fn socket
-creates an endpoint for communication and returns a descriptor.
-.Pp
-The
-.Fa domain
-parameter specifies a communications domain within which
-communication will take place; this selects the protocol family
-which should be used.
-These families are defined in the include file
-.Ao Pa sys/socket.h Ac .
-The currently understood formats are:
-.Pp
-.Bd -literal -offset indent -compact
-PF_LOCAL	local (previously UNIX) domain protocols
-PF_INET		ARPA Internet protocols
-PF_INET6	IPv6 (Internet Protocol version 6) protocols
-PF_NS		Xerox Network Systems protocols
-PF_APPLETALK	AppleTalk protocols
-PF_BLUETOOTH	Bluetooth protocols
-.Ed
-.Pp
-The socket has the indicated
-.Fa type ,
-which specifies the semantics of communication.
-Currently defined types are:
-.Pp
-.Bd -literal -offset indent -compact
-SOCK_STREAM
-SOCK_DGRAM
-SOCK_RAW
-SOCK_SEQPACKET
-SOCK_RDM
-.Ed
-.Pp
-The following flags can be or'ed to the type to condition the returned
-file descriptor:
-The following flags are valid:
-.Bl -column SOCK_NONBLOCK -offset indent
-.It Dv SOCK_CLOEXEC
-Set the close on exec property.
-.It Dv SOCK_NONBLOCK
-Sets non-blocking I/O.
-.It Dv SOCK_NOSIGPIPE
-Return
-.Er EPIPE
-instead of raising
-.Dv SIGPIPE .
-.El
-.Pp
-A
-.Dv SOCK_STREAM
-type provides sequenced, reliable,
-two-way connection based byte streams.
-An out-of-band data transmission mechanism may be supported.
-A
-.Dv SOCK_DGRAM
-socket supports
-datagrams (connectionless, unreliable messages of
-a fixed (typically small) maximum length).
-A
-.Dv SOCK_SEQPACKET
-socket may provide a sequenced, reliable,
-two-way connection-based data transmission path for datagrams
-of fixed maximum length; a consumer may be required to read
-an entire packet with each read system call.
-This facility is protocol specific, and presently implemented
-only for
-.Dv PF_NS .
-.Dv SOCK_RAW
-sockets provide access to internal network protocols and interfaces.
-The types
-.Dv SOCK_RAW ,
-which is available only to the super-user, and
-.Dv SOCK_RDM ,
-which is planned,
-but not yet implemented, are not described here.
-.Pp
-The
-.Fa protocol
-specifies a particular protocol to be used with the socket.
-Normally only a single protocol exists to support a particular
-socket type within a given protocol family.
-However, it is possible that many protocols may exist, in which case
-a particular protocol must be specified in this manner.
-The protocol number to use is
-particular to the \*(lqcommunication domain\*(rq in which communication
-is to take place; see
-.Xr protocols 5 .
-.Pp
-Sockets of type
-.Dv SOCK_STREAM
-are full-duplex byte streams.
-A stream socket must be in a
-.Em connected
-state before any data may be sent or received
-on it.
-A connection to another socket is created with a
-.Xr connect 2
-call.
-Once connected, data may be transferred using
-.Xr read 2
-and
-.Xr write 2
-calls or some variant of the
-.Xr send 2
-and
-.Xr recv 2
-calls.
-When a session has been completed a
-.Xr close 2
-may be performed.
-Out-of-band data may also be transmitted as described in
-.Xr send 2
-and received as described in
-.Xr recv 2 .
-.Pp
-The communications protocols used to implement a
-.Dv SOCK_STREAM
-ensure that data
-is not lost or duplicated.
-If a piece of data for which the
-peer protocol has buffer space cannot be successfully transmitted
-within a reasonable length of time, then
-the connection is considered broken and calls
-will indicate an error with
-\-1 returns and with
-.Er ETIMEDOUT
-as the specific code
-in the global variable
-.Va errno .
-The protocols optionally keep sockets
-.Dq warm
-by forcing transmissions
-roughly every minute in the absence of other activity.
-An error is then indicated if no response can be
-elicited on an otherwise
-idle connection for an extended period (e.g., 5 minutes).
-A
-.Dv SIGPIPE
-signal is raised if a process sends
-on a broken stream; this causes naive processes,
-which do not handle the signal, to exit.
-.Pp
-.Dv SOCK_SEQPACKET
-sockets employ the same system calls
-as
-.Dv SOCK_STREAM
-sockets.
-The only difference is that
-.Xr read 2
-calls will return only the amount of data requested,
-and any remaining in the arriving packet will be discarded.
-.Pp
-.Dv SOCK_DGRAM
-and
-.Dv SOCK_RAW
-sockets allow sending of datagrams to correspondents
-named in
-.Xr send 2
-calls.
-Datagrams are generally received with
-.Xr recvfrom 2 ,
-which returns the next datagram with its return address.
-.Pp
-An
-.Xr fcntl 2
-call can be used to specify a process group to receive
-a
-.Dv SIGURG
-signal when the out-of-band data arrives.
-It may also enable non-blocking I/O
-and asynchronous notification of I/O events
-via
-.Dv SIGIO .
-.Pp
-The operation of sockets is controlled by socket level
-.Em options .
-These options are defined in the file
-.Ao Pa sys/socket.h Ac .
-The
-.Xr setsockopt 2
-and
-.Xr getsockopt 2
-system calls are used to set and get options, respectively.
-.Sh RETURN VALUES
-A \-1 is returned if an error occurs, otherwise the return
-value is a descriptor referencing the socket.
-.Sh ERRORS
-The
-.Fn socket
-call fails if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Permission to create a socket of the specified type and/or protocol
-is denied.
-.It Bq Er EAFNOSUPPORT
-The address family (domain) is not supported or
-the specified domain is not supported by this protocol family.
-.It Bq Er EMFILE
-The per-process descriptor table is full.
-.It Bq Er ENFILE
-The system file table is full.
-.It Bq Er ENOBUFS
-Insufficient buffer space is available.
-The socket cannot be created until sufficient resources are freed.
-.It Bq Er EPROTONOSUPPORT
-The protocol family is not supported or
-the specified protocol is not supported within this domain.
-.It Bq Er EPROTOTYPE
-The socket type is not supported by the protocol.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr bind 2 ,
-.Xr connect 2 ,
-.Xr getsockname 2 ,
-.Xr getsockopt 2 ,
-.Xr ioctl 2 ,
-.Xr listen 2 ,
-.Xr poll 2 ,
-.Xr read 2 ,
-.Xr recv 2 ,
-.Xr select 2 ,
-.Xr send 2 ,
-.Xr setsockopt 2 ,
-.Xr shutdown 2 ,
-.Xr socketpair 2 ,
-.Xr write 2 ,
-.Xr getprotoent 3
-.Rs
-.%T "An Introductory 4.4BSD Interprocess Communication Tutorial"
-.%A Stuart Sechrest
-.Re
-.Pq see Pa /usr/share/doc/psd/20.ipctut
-.Rs
-.%T "Advanced 4.4BSD IPC Tutorial"
-.%A Samuel J. Leffler
-.%A Robert S. Fabry
-.%A William N. Joy
-.%A Phil Lapsley
-.%A Steve Miller
-.%A Chris Torek
-.Re
-.Pq see Pa /usr/share/doc/psd/21.ipc
-.Sh HISTORY
-The
-.Fn socket
-function call appeared in
-.Bx 4.2 .
diff --git a/lib/libc/sys/socketpair.2 b/lib/libc/sys/socketpair.2
deleted file mode 100644
index 27dee9529..000000000
--- a/lib/libc/sys/socketpair.2
+++ /dev/null
@@ -1,101 +0,0 @@
-.\"	$NetBSD: socketpair.2,v 1.23 2011/06/27 08:21:08 wiz Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)socketpair.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 24, 2011
-.Dt SOCKETPAIR 2
-.Os
-.Sh NAME
-.Nm socketpair
-.Nd create a pair of connected sockets
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft int
-.Fn socketpair "int d" "int type" "int protocol" "int *sv"
-.Sh DESCRIPTION
-The
-.Fn socketpair
-call creates an unnamed pair of connected sockets in
-the specified domain
-.Fa d ,
-of the specified
-.Fa type ,
-and using the optionally specified
-.Fa protocol .
-The descriptors used in referencing the new sockets
-are returned in
-.Fa sv[0]
-and
-.Fa sv[1] .
-The two sockets are indistinguishable.
-.Pp
-The
-.Fa type
-and
-.Fa protocol
-argument values are described in
-.Xr socket 2 .
-.Sh RETURN VALUES
-A 0 is returned if the call succeeds, \-1 if it fails.
-.Sh ERRORS
-The call succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EAFNOSUPPORT
-The specified address family is not supported on this machine.
-.It Bq Er EFAULT
-The address
-.Fa sv
-does not specify a valid part of the
-process address space.
-.It Bq Er EMFILE
-Too many descriptors are in use by this process.
-.It Bq Er ENFILE
-The system file table is full.
-.It Bq Er EOPNOTSUPP
-The specified protocol does not support creation of socket pairs.
-.It Bq Er EPROTONOSUPPORT
-The specified protocol is not supported on this machine.
-.El
-.Sh SEE ALSO
-.Xr pipe 2 ,
-.Xr read 2 ,
-.Xr socket 2 ,
-.Xr write 2
-.Sh HISTORY
-The
-.Fn socketpair
-function call appeared in
-.Bx 4.2 .
-.Sh BUGS
-This call is currently implemented only for the
-.Dv PF_LOCAL
-domain.
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
deleted file mode 100644
index 06087dd5a..000000000
--- a/lib/libc/sys/stat.2
+++ /dev/null
@@ -1,420 +0,0 @@
-.\"	$NetBSD: stat.2,v 1.57 2014/04/10 17:11:15 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 1991, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)stat.2	8.4 (Berkeley) 5/1/95
-.\"
-.Dd April 10, 2014
-.Dt STAT 2
-.Os
-.Sh NAME
-.Nm stat ,
-.Nm lstat ,
-.Nm fstat ,
-.Nm fstatat ,
-.Nd get file status
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/stat.h
-.Ft int
-.Fn stat "const char *path" "struct stat *sb"
-.Ft int
-.Fn lstat "const char *path" "struct stat *sb"
-.Ft int
-.Fn fstat "int fd" "struct stat *sb"
-.In sys/stat.h
-.In fcntl.h
-.Ft int
-.Fn fstatat "int fd" "const char *path" "struct stat *sb" "int flag"
-.Sh DESCRIPTION
-The
-.Fn stat
-function obtains information about the file pointed to by
-.Fa path .
-Read, write or execute
-permission of the named file is not required, but all directories
-listed in the path name leading to the file must be searchable.
-.Pp
-The function
-.Fn lstat
-is like
-.Fn stat
-except in the case where the named file is a symbolic link,
-in which case
-.Fn lstat
-returns information about the link,
-while
-.Fn stat
-returns information about the file the link references.
-The
-.Fn fstat
-function obtains the same information about an open file
-known by the file descriptor
-.Fa fd .
-.Pp
-.Fn fstatat
-works the same way as
-.Fn stat
-(or
-.Fn lstat
-if
-.Dv AT_SYMLINK_NOFOLLOW
-is set in
-.Fa flag )
-except if
-.Fa path
-is relative.
-In that case, it is looked up from a directory whose file
-descriptor was passed as
-.Fa fd .
-Search permission is required on this directory.
-.\"    (These alternatives await a decision about the semantics of O_SEARCH)
-.\" Search permission is required on this directory
-.\" except if
-.\" .Fa fd
-.\" was opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" This file descriptor must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.Fa fd
-can be set to
-.Dv AT_FDCWD
-in order to specify the current directory.
-.Pp
-The
-.Fa sb
-argument is a pointer to a
-.Fa stat
-structure
-as defined by
-.In sys/stat.h
-and into which information is placed concerning the file.
-.Ss The Standard Structure
-The following standards-compliant fields are defined in the structure:
-.Bl -column -offset indent \
-"nlink_t " "st_nlink " "Description"
-.It Sy Type Ta Sy Entry Ta Sy Description
-.It Vt dev_t Ta st_dev Ta device ID containing the file
-.It Vt ino_t Ta st_ino Ta serial number of the file (inode number)
-.It Vt mode_t Ta st_mode Ta mode of the file
-.It Vt nlink_t Ta st_nlink Ta number of hard links to the file
-.It Vt uid_t Ta st_uid Ta user ID of the owner
-.It Vt gid_t Ta st_gid Ta group ID of the owner
-.It Vt dev_t Ta st_rdev Ta device type (character or block special)
-.It Vt off_t Ta st_size Ta size of the file in bytes
-.It Vt time_t Ta st_atime Ta time of last access
-.It Vt time_t Ta st_mtime Ta time of last data modification
-.It Vt time_t Ta st_ctime Ta  time of last file status change
-.It Vt blksize_t Ta st_blksize Ta preferred I/O block size (fs-specific)
-.It Vt blkcnt_t Ta st_blocks Ta blocks allocated for the file
-.El
-.Pp
-These are specified in the
-.St -p1003.1-2004
-standard.
-The
-.Va st_ino
-and
-.Va st_dev
-fields taken together uniquely identify the file within the system.
-Most of the types are defined in
-.Xr types 3 .
-.Pp
-The time-related fields are:
-.Bl -tag -width st_blksize -offset indent
-.It Va st_atime
-Time when file data was last accessed.
-Changed by the
-.Xr mknod 2 ,
-.Xr utimes 2 ,
-and
-.Xr read 2
-system calls.
-.It Va st_mtime
-Time when file data was last modified.
-Changed by the
-.Xr mknod 2 ,
-.Xr utimes 2 ,
-and
-.Xr write 2
-system calls.
-.It Va st_ctime
-Time when file status was last changed (file metadata modification).
-Changed by the
-.Xr chflags 2 ,
-.Xr chmod 2 ,
-.Xr chown 2 ,
-.Xr link 2 ,
-.Xr mknod 2 ,
-.Xr rename 2 ,
-.Xr unlink 2 ,
-.Xr utimes 2 ,
-and
-.Xr write 2
-system calls.
-.El
-.Pp
-The size-related fields of the
-.Fa struct stat
-are as follows:
-.Bl -tag -width st_blksize -offset indent
-.It Va st_size
-The size of the file in bytes.
-The meaning of the size reported for a directory is file system
-dependent.
-Some file systems (e.g. FFS) return the total size used for the
-directory metadata, possibly including free slots; others (notably
-ZFS) return the number of entries in the directory.
-Some may also return other things or always report zero.
-.It Va st_blksize
-The optimal I/O block size for the file.
-.It Va st_blocks
-The actual number of blocks allocated for the file in 512-byte units.
-As short symbolic links are stored in the inode, this number may
-be zero.
-.El
-.Pp
-The status information word
-.Fa st_mode
-contains bits that define the access mode (see
-.Xr chmod 2 )
-and the type (see
-.Xr dirent 3 )
-of the file.
-The following macros can be used to test
-whether a file is of the specified type.
-The value
-.Fa m
-supplied to the macros is the value of
-.Va st_mode .
-.Bl -tag -width "S_ISSOCK(m)" -offset indent
-.It Fn S_ISBLK "m"
-Test for a block special file.
-.It Fn S_ISCHR "m"
-Test for a character special file.
-.It Fn S_ISDIR "m"
-Test for a directory.
-.It Fn S_ISFIFO "m"
-Test for a pipe or FIFO special file.
-.It Fn S_ISREG "m"
-Test for a regular file.
-.It Fn S_ISLNK "m"
-Test for a symbolic link.
-.It Fn S_ISSOCK "m"
-Test for a socket.
-.El
-.Pp
-The macros evaluate to a non-zero value if the test
-is true or to the value 0 if the test is false.
-.Ss NetBSD Extensions
-The following additional
-.Nx
-specific fields are present:
-.Bl -column -offset indent \
-"uint32_t" "st_birthtimensec" "Description"
-.It Sy Type Ta Sy Entry Ta Sy Description
-.It Vt long Ta st_atimensec Ta last access (nanoseconds)
-.It Vt long Ta st_mtimensec Ta last modification (nanoseconds)
-.It Vt long Ta st_ctimensec Ta last status change (nanoseconds)
-.It Vt time_t Ta st_birthtime Ta time of inode creation
-.It Vt long Ta st_birthtimensec Ta inode creation (nanoseconds)
-.It Vt uint32_t Ta st_flags Ta user defined flags for the file
-.It Vt uint32_t Ta st_gen Ta file generation number
-.\"
-.\" XXX: What is this?
-.\"
-.It Vt uint32_t Ta st_spare[2] Ta implementation detail
-.El
-.Pp
-However, if
-_NETBSD_SOURCE
-is furthermore defined, instead of the above,
-the following are present in the structure:
-.Bl -column -offset indent \
-"struct timespec " "st_birthtimensec" "Description"
-.It Sy Type Ta Sy Entry Ta Sy Description
-.It Vt struct timespec Ta st_atimespec Ta time of last access
-.It Vt struct timespec Ta st_mtimespec Ta time of last modification
-.It Vt struct timespec Ta st_birthtimespec Ta time of creation
-.It Vt uint32_t Ta st_flags Ta user defined flags
-.It Vt uint32_t Ta st_gen Ta file generation number
-.\"
-.\" XXX: What is this?
-.\"
-.It Vt uint32_t Ta st_spare[2] Ta implementation detail
-.El
-.Pp
-In this case the following macros are provided for convenience:
-.Bd -literal -offset indent
-#if defined(_NETBSD_SOURCE)
-  #define st_atime                st_atimespec.tv_sec
-  #define st_atimensec            st_atimespec.tv_nsec
-  #define st_mtime                st_mtimespec.tv_sec
-  #define st_mtimensec            st_mtimespec.tv_nsec
-  #define st_ctime                st_ctimespec.tv_sec
-  #define st_ctimensec            st_ctimespec.tv_nsec
-  #define st_birthtime            st_birthtimespec.tv_sec
-  #define st_birthtimensec        st_birthtimespec.tv_nsec
-#endif
-.Ed
-.Pp
-The status information word
-.Fa st_flags
-has the following bits:
-.Bl -column -offset indent \
-"struct timespec " "st_birthtimensec"
-.It Sy Constant Ta Sy Description
-.It Dv UF_NODUMP Ta do not dump a file
-.It Dv UF_IMMUTABLE Ta file may not be changed
-.It Dv UF_APPEND Ta writes to file may only append
-.It Dv UF_OPAQUE Ta directory is opaque wrt. union
-.It Dv SF_ARCHIVED Ta file is archived
-.It Dv SF_IMMUTABLE Ta file may not be changed
-.It Dv SF_APPEND Ta writes to file may only append
-.El
-.Pp
-For a description of the flags, see
-.Xr chflags 2 .
-.Sh RETURN VALUES
-.Rv -std stat lstat fstat fstatat
-.Sh COMPATIBILITY
-Previous versions of the system used different types for the
-.Li st_dev ,
-.Li st_uid ,
-.Li st_gid ,
-.Li st_rdev ,
-.Li st_size ,
-.Li st_blksize
-and
-.Li st_blocks
-fields.
-.Sh ERRORS
-.Fn stat ,
-.Fn lstat
-and
-.Fn fstatat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EBADF
-A badly formed vnode was encountered.
-This can happen if a file system information node is incorrect.
-.It Bq Er EFAULT
-.Fa sb
-or
-.Fa path
-points to an invalid address.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENXIO
-The named file is a character special or block
-special file, and the device associated with this special file
-does not exist.
-.El
-.Pp
-In addition,
-.Fn fstatat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa path
-does not specify an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for reading or searching.
-.It Bq Er ENOTDIR
-.Fa path
-is not an absolute path and
-.Fa fd
-is a file descriptor associated with a non-directory file.
-.El
-.Pp
-.Fn fstat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa fd
-is not a valid open file descriptor.
-.It Bq Er EFAULT
-.Fa sb
-points to an invalid address.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr chflags 2 ,
-.Xr chmod 2 ,
-.Xr chown 2 ,
-.Xr utimes 2 ,
-.Xr dirent 3 ,
-.Xr types 3 ,
-.Xr symlink 7
-.Sh STANDARDS
-.Fn stat ,
-.Fn lstat ,
-and
-.Fn fstat
-conform to
-.St -p1003.1-2004 .
-.Fn fstatat
-conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-A
-.Fn stat
-function call appeared in
-.At v2 .
-A
-.Fn lstat
-function call appeared in
-.Bx 4.2 .
-.Sh BUGS
-Applying
-.Fn fstat
-to a socket (and thus to a pipe)
-returns a zero'd buffer,
-except for the blocksize field,
-and a unique device and file serial number.
diff --git a/lib/libc/sys/statvfs.2 b/lib/libc/sys/statvfs.2
deleted file mode 100644
index d0aa61b88..000000000
--- a/lib/libc/sys/statvfs.2
+++ /dev/null
@@ -1,178 +0,0 @@
-.\"	$NetBSD: statvfs.2,v 1.5 2010/05/31 12:16:20 njoly Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"	@(#)statfs.2	8.5 (Berkeley) 5/24/95
-.\"
-.Dd April 14, 2004
-.Dt STATVFS 2
-.Os
-.Sh NAME
-.Nm statvfs ,
-.Nm statvfs1 ,
-.Nm fstatvfs ,
-.Nm fstatvfs1
-.Nd get file system statistics
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/statvfs.h
-.Ft int
-.Fn statvfs "const char *path" "struct statvfs *buf"
-.Ft int
-.Fn statvfs1 "const char *path" "struct statvfs *buf" "int flags"
-.Ft int
-.Fn fstatvfs "int fd" "struct statvfs *buf"
-.Ft int
-.Fn fstatvfs1 "int fd" "struct statvfs *buf" "int flags"
-.Sh DESCRIPTION
-.Fn statvfs
-and
-.Fn statvfs1
-return information about a mounted file system.
-.Fa path
-is the path name of any file within the mounted file system.
-.Fa buf
-is a pointer to a
-.Nm statvfs
-structure defined in
-.Xr statvfs 5 .
-.Pp
-.Fn fstatvfs
-and
-.Fn fstatvfs1
-return the same information about an open file referenced by descriptor
-.Fa fd .
-.Pp
-The
-.Fn statvfs1
-and
-.Fn fstatvfs1
-functions allow an extra
-.Fa flags
-argument which can be
-.Dv ST_WAIT
-and
-.Dv ST_NOWAIT .
-When
-.Dv ST_NOWAIT
-is specified, then only cached statistics are returned.
-This can result in significant savings on non-local filesystems, where
-gathering statistics involves a network communication.
-.Pp
-The
-.Fn statvfs
-and
-.Fn fstatvfs
-calls are equivalent to the respective
-.Fn statvfs1
-and
-.Fn fstatvfs1
-calls with
-.Dv ST_WAIT
-specified as the
-.Fa flags
-argument.
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn statvfs
-and
-.Fn statvfs1
-fail if one or more of the following are true:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix of
-.Fa path
-is not a directory.
-.It Bq Er ENAMETOOLONG
-The length of a component of
-.Fa path
-exceeds
-.Brq Dv NAME_MAX
-characters, or the length of
-.Fa path
-exceeds
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The file referred to by
-.Fa path
-does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix of
-.Fa path .
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating
-.Fa path .
-.It Bq Er EFAULT
-.Fa buf
-or
-.Fa path
-points to an invalid address.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.El
-.Pp
-.Fn fstatvfs
-and
-.Fn fstatvfs1
-fail if one or more of the following are true:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa fd
-is not a valid open file descriptor.
-.It Bq Er EFAULT
-.Fa buf
-points to an invalid address.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr statvfs 5
-.Sh HISTORY
-The
-.Fn statvfs ,
-.Fn statvfs1 ,
-.Fn fstatvfs ,
-and
-.Fn fstatvfs1
-functions first appeared in
-.Nx 3.0
-to replace
-the
-.Fn statfs
-family of functions which first appeared in
-.Bx 4.4 .
diff --git a/lib/libc/sys/statvfs.c b/lib/libc/sys/statvfs.c
deleted file mode 100644
index 669bcae93..000000000
--- a/lib/libc/sys/statvfs.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: statvfs.c,v 1.6 2008/04/28 20:23:00 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: statvfs.c,v 1.6 2008/04/28 20:23:00 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/statvfs.h>
-
-#ifdef __weak_alias
-__weak_alias(statvfs,_statvfs)
-__weak_alias(fstatvfs,_fstatvfs)
-#endif
-
-int
-statvfs(const char *file, struct statvfs *st)
-{
-	return statvfs1(file, st, ST_WAIT);
-}
-
-int
-fstatvfs(int f, struct statvfs *st)
-{
-	return fstatvfs1(f, st, ST_WAIT);
-}
-
-int	__fhstatvfs140(const void *fhp, size_t fh_size, struct statvfs *buf,
-	int flags);
-int	__fhstatvfs40(const void *fh, size_t fh_size, struct statvfs *st);
-
-int
-__fhstatvfs40(const void *fh, size_t fh_size, struct statvfs *st)
-{
-	return __fhstatvfs140(fh, fh_size, st, ST_WAIT);
-}
diff --git a/lib/libc/sys/swapctl.2 b/lib/libc/sys/swapctl.2
deleted file mode 100644
index a817ab00c..000000000
--- a/lib/libc/sys/swapctl.2
+++ /dev/null
@@ -1,284 +0,0 @@
-.\"	$NetBSD: swapctl.2,v 1.39 2014/11/02 11:28:03 njoly Exp $
-.\"
-.\" Copyright (c) 1997 Matthew R. Green
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list 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.
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.Dd May 17, 2010
-.Dt SWAPCTL 2
-.Os
-.Sh NAME
-.Nm swapctl
-.Nd modify swap configuration
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.In sys/swap.h
-.Ft int
-.Fn swapctl "int cmd" "void *arg" "int misc"
-.Sh DESCRIPTION
-The
-.Nm
-function is used to add and delete swap devices, and modify their
-configuration.
-.Pp
-The
-.Fa cmd
-parameter specifies the operation to be performed.
-The
-.Fa arg
-and
-.Fa misc
-parameters have different meanings, depending on the
-.Fa cmd
-parameter.
-.Bl -enum -offset indent
-.It
-If
-.Fa cmd
-is
-.Dv SWAP_NSWAP ,
-the current number of swap devices in the system is returned.
-The
-.Fa arg
-and
-.Fa misc
-parameters are ignored.
-.It
-If
-.Fa cmd
-is
-.Dv SWAP_STATS ,
-the current statistics for swap devices are returned in the
-.Fa arg
-parameter.
-No more than
-.Fa misc
-swap devices are returned.
-The
-.Fa arg
-parameter should point to an array of at least
-.Fa misc
-struct swapent structures:
-.Bd -literal
-struct swapent {
-	dev_t	se_dev;			/* device id */
-	int	se_flags;		/* entry flags */
-	int	se_nblks;		/* total blocks */
-	int	se_inuse;		/* blocks in use */
-	int	se_priority;		/* priority */
-	char	se_path[PATH_MAX+1];	/* path to entry */
-};
-.Ed
-.Pp
-The flags are defined as
-.Bd -literal
-	SWF_INUSE       in use: we have swapped here
-	SWF_ENABLE      enabled: we can swap here
-	SWF_BUSY        busy: I/O happening here
-	SWF_FAKE        fake: still being built
-.Ed
-.It
-If
-.Fa cmd
-is
-.Dv SWAP_ON ,
-the
-.Fa arg
-parameter is used as a pathname of a file to enable swapping to.
-The
-.Fa misc
-parameter is used to set the priority of this swap device.
-.It
-If
-.Fa cmd
-is
-.Dv SWAP_OFF ,
-the
-.Fa arg
-parameter is used as the pathname of a file to disable swapping from.
-The
-.Fa misc
-parameter is ignored.
-.It
-If
-.Fa cmd
-is
-.Dv SWAP_CTL ,
-the
-.Fa arg
-and
-.Fa misc
-parameters have the same function as for the
-.Dv SWAP_ON
-case, except that they change the priority of a currently enabled swap device.
-.It
-If
-.Fa cmd
-is
-.Dv SWAP_DUMPDEV ,
-the
-.Fa arg
-parameter is used as the pathname of a device to use as the dump device,
-should the system panic.
-.It
-If
-.Fa cmd
-is
-.Dv SWAP_GETDUMPDEV ,
-the
-.Fa arg
-parameter points to a dev_t, which is filled in by the current dump device.
-.El
-.Pp
-When swapping is enabled on a block device, the first portion of the disk is
-left unused to prevent any disklabel present from being overwritten.
-This space is allocated from the swap device when the
-.Dv SWAP_ON
-command is used.
-.Pp
-The priority of a swap device can be used to fill faster swap devices before
-slower ones.
-A priority of 0 is the highest, with larger numbers having lower priority.
-For a fuller discussion on swap priority, see the
-.Sx SWAP PRIORITY
-section in
-.Xr swapctl 8 .
-.Sh RETURN VALUES
-If the
-.Fa cmd
-parameter is
-.Dv SWAP_NSWAP
-or
-.Dv SWAP_STATS ,
-.Fn swapctl
-returns the number of swap devices, if successful.
-The
-.Dv SWAP_NSWAP
-command is always successful.
-Otherwise it returns 0 on success and \-1
-on failure, setting the global variable
-.Va errno
-to indicate the error.
-.Sh ERRORS
-.Fn swapctl
-succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EBUSY
-The device specified by
-.Fa arg
-has already been made available for swapping.
-.It Bq Er EFAULT
-.Fa arg
-points outside the process' allocated address space.
-.It Bq Er EINVAL
-The device configured by
-.Fa arg
-has no associated size, or the
-.Fa cmd
-was unknown.
-.It Bq Er EIO
-An I/O error occurred while opening the swap device.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named device does not exist.
-For the
-.Dv SWAP_CTL
-command, the named device is not currently enabled for swapping.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENXIO
-The major device number of
-.Fa arg
-is out of range (this indicates no device driver exists
-for the associated hardware); or
-the block device specified by
-.Fa arg
-is not marked as a swap partition in the disklabel.
-.It Bq Er EPERM
-The caller is not the super-user.
-.El
-.Sh SEE ALSO
-.Xr swapctl 8
-.Sh HISTORY
-The
-.Fn swapctl
-function call appeared in
-.Nx 1.3 .
-The
-.Fa se_path
-member was added to
-.Va struct swapent
-in
-.Nx 1.4 ,
-when the header file was also moved from
-.In vm/vm_swap.h
-to its current location in
-.In sys/swap.h .
-.Sh AUTHORS
-.An -nosplit
-The current swap system was designed and implemented by
-.An Matthew Green Aq Mt mrg@eterna.com.au ,
-with help from
-.An Paul Kranenburg Aq Mt pk@NetBSD.org
-and
-.An Leo Weppelman Aq Mt leo@NetBSD.org ,
-and insights from
-.An Jason R. Thorpe Aq Mt thorpej@NetBSD.org .
diff --git a/lib/libc/sys/swapon.3 b/lib/libc/sys/swapon.3
deleted file mode 100644
index 38ac7ed27..000000000
--- a/lib/libc/sys/swapon.3
+++ /dev/null
@@ -1,121 +0,0 @@
-.\"	$NetBSD: swapon.3,v 1.16 2010/05/31 12:16:20 njoly Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)swapon.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt SWAPON 3
-.Os
-.Sh NAME
-.Nm swapon
-.Nd add a swap device for interleaved paging/swapping
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn swapon "const char *special"
-.Sh DESCRIPTION
-.Bf -symbolic
-.\" This interface is available from the compatibility library, libcompat and
-This interface is provided for compatibility only and
-has been obsoleted by
-.Xr swapctl 2 .
-.Ef
-.Pp
-.Fn swapon
-makes the block device
-.Fa special
-available to the system for
-allocation for paging and swapping.
-The names of potentially available devices are known to the system
-and defined at system configuration time.
-The size of the swap area on
-.Fa special
-is calculated at the time the device is first made available
-for swapping.
-.Sh RETURN VALUES
-If an error has occurred, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn swapon
-succeeds unless:
-.Bl -tag -width ENAMETOOLONG
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named device does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EPERM
-The caller is not the super-user.
-.It Bq Er ENOTBLK
-.Fa special
-is not a block device.
-.It Bq Er EBUSY
-The device specified by
-.Fa special
-has already
-been made available for swapping
-.It Bq Er EINVAL
-The device configured by
-.Fa special
-was not
-configured into the system as a swap device.
-.It Bq Er ENXIO
-The major device number of
-.Fa special
-is out of range (this indicates no device driver exists
-for the associated hardware).
-.It Bq Er EIO
-An I/O error occurred while opening the swap device.
-.It Bq Er EFAULT
-.Fa special
-points outside the process's allocated address space.
-.El
-.Sh SEE ALSO
-.Xr swapctl 2 ,
-.Xr swapctl 8 ,
-.Xr swapon 8
-.Sh HISTORY
-The
-.Fn swapon
-function call appeared in
-.Bx 4.0
-and was removed
-.Nx 1.3
-.Sh BUGS
-This call will be upgraded in future versions of the system.
diff --git a/lib/libc/sys/swapon.c b/lib/libc/sys/swapon.c
deleted file mode 100644
index be6622d8f..000000000
--- a/lib/libc/sys/swapon.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$NetBSD: swapon.c,v 1.11 2012/06/25 22:32:46 abs Exp $	*/
-
-/*
- * Copyright (c) 1997 Matthew R. Green
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: swapon.c,v 1.11 2012/06/25 22:32:46 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/swap.h>
-#include <unistd.h>
-
-int
-swapon(const char *name)
-{
-
-	return (swapctl(SWAP_ON, __UNCONST(name), 0));
-}
diff --git a/lib/libc/sys/symlink.2 b/lib/libc/sys/symlink.2
deleted file mode 100644
index ae24d3276..000000000
--- a/lib/libc/sys/symlink.2
+++ /dev/null
@@ -1,190 +0,0 @@
-.\"	$NetBSD: symlink.2,v 1.26 2013/07/29 11:40:04 njoly Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)symlink.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd July 29, 2013
-.Dt SYMLINK 2
-.Os
-.Sh NAME
-.Nm symlink ,
-.Nm symlinkat
-.Nd make symbolic link to a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn symlink "const char *name1" "const char *name2"
-.Ft int
-.Fn symlinkat "const char *name1" "int fd" "const char *name2"
-.Sh DESCRIPTION
-A symbolic link
-.Fa name2
-is created to
-.Fa name1
-.Pf ( Fa name2
-is the name of the
-file created,
-.Fa name1
-is the string
-used in creating the symbolic link).
-Either name may be an arbitrary path name; the files need neither
-to be on the same file system nor to exist.
-.Pp
-.Fn symlinkat
-works the same way as
-.Fn symlink
-except if
-.Fa path2
-is relative.
-In that case, it is looked up from a directory whose file
-descriptor was passed as
-.Fa fd .
-Search permission is required on this directory.
-.\"    (These alternatives await a decision about the semantics of O_SEARCH)
-.\" Search permission is required on this directory
-.\" except if
-.\" .Fa fd
-.\" was opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" This file descriptor must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.Fa fd
-can be set to
-.Dv AT_FDCWD
-in order to specify the current directory.
-.Sh RETURN VALUES
-.Rv -std symlink symlinkat
-.Sh ERRORS
-.Fn symlink
-and
-.Fn symlinkat
-will fail and no link will be created if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-A component of the
-.Fa name2
-path prefix denies search permission.
-.It Bq Er EDQUOT
-The directory in which the entry for the new symbolic link
-is being placed cannot be extended because the
-user's quota of disk blocks on the file system
-containing the directory has been exhausted.
-Or, the new symbolic link cannot be created because the user's
-quota of disk blocks on the file system that will
-contain the symbolic link has been exhausted.
-Or, the user's quota of inodes on the file system on
-which the symbolic link is being created has been exhausted.
-.It Bq Er EEXIST
-.Fa name2
-already exists.
-.It Bq Er EFAULT
-.Fa name1
-or
-.Fa name2
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while making the directory entry for
-.Fa name2 ,
-or allocating the inode for
-.Fa name2 ,
-or writing out the link contents of
-.Fa name2 .
-Or, an I/O error occurred while making the directory entry or allocating the inode.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-A component of the
-.Fa name2
-path does not exist.
-.It Bq Er ENOSPC
-The directory in which the entry for the new symbolic link is being placed
-cannot be extended because there is no space left on the file
-system containing the directory.
-Or, the new symbolic link cannot be created because there
-there is no space left on the file
-system that will contain the symbolic link.
-Or, there are no free inodes on the file system on which the
-symbolic link is being created.
-.It Bq Er ENOTDIR
-A component of the
-.Fa name2
-prefix is not a directory.
-.It Bq Er EROFS
-The file
-.Fa name2
-would reside on a read-only file system.
-.El
-.Pp
-In addition,
-.Fn symlinkat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa name2
-does not specify an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for reading or searching.
-.It Bq Er ENOTDIR
-.Fa name2
-is not an absolute path and
-.Fa fd
-is a file descriptor associated with a non-directory file.
-.El
-.Sh SEE ALSO
-.Xr ln 1 ,
-.Xr link 2 ,
-.Xr readlink 2 ,
-.Xr unlink 2 ,
-.Xr symlink 7
-.Sh STANDARDS
-The
-.Fn symlink
-function conforms to
-.St -p1003.1-90 .
-.Fn symlinkat
-conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn symlink
-function call appeared in
-.Bx 4.2 .
diff --git a/lib/libc/sys/sync.2 b/lib/libc/sys/sync.2
deleted file mode 100644
index c45a65a07..000000000
--- a/lib/libc/sys/sync.2
+++ /dev/null
@@ -1,102 +0,0 @@
-.\"	$NetBSD: sync.2,v 1.17 2009/03/25 06:46:21 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)sync.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd March 25, 2009
-.Dt SYNC 2
-.Os
-.Sh NAME
-.Nm sync
-.Nd "synchronize disk block in-core status with that on disk"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft void
-.Fn sync void
-.Sh DESCRIPTION
-The
-.Fn sync
-function forces a write of dirty (modified) buffers
-in the block buffer cache out
-to disk.
-The kernel keeps this information in core to reduce
-the number of disk I/O transfers required by the system.
-As information in the cache is lost after a system crash,
-kernel thread
-.Nm ioflush
-ensures that dirty buffers are synced to disk
-eventually.
-By default, a dirty buffer is synced after 30 seconds,
-but some filesystems exploit
-.Nm ioflush
-features to sync directory data and metadata faster
-(after 15 and 10 seconds, respectively).
-.Pp
-The function
-.Xr fsync 2
-may be used to synchronize individual file descriptor
-attributes.
-.Sh CAUTIONS
-Many modern disks contain write-back caches.
-In theory
-.Fn sync
-flushes these.
-In practice there are many possible ways for this mechanism to go
-astray.
-It is prudent (where possible) to allow a few seconds after syncing
-for everything to settle before e.g. turning off the power.
-.Pp
-It may also be desirable to use
-.Xr dkctl 8
-or
-.Xr scsictl 8
-to disable the write-back cache entirely.
-.Sh SEE ALSO
-.Xr fsync 2 ,
-.Xr dkctl 8 ,
-.Xr scsictl 8 ,
-.Xr sync 8
-.Sh HISTORY
-A
-.Fn sync
-function call appeared in
-.At v6 .
-.Pp
-Historically,
-.Fn sync
-would schedule buffers for writing but not actually wait for the
-writes to finish.
-It was necessary to issue a second or sometimes a third call to ensure
-that all buffers had in fact been written out.
-In
-.Nx ,
-.Fn sync
-does not return until all buffers have been written.
diff --git a/lib/libc/sys/sysarch.2 b/lib/libc/sys/sysarch.2
deleted file mode 100644
index ae07014cd..000000000
--- a/lib/libc/sys/sysarch.2
+++ /dev/null
@@ -1,70 +0,0 @@
-.\"	$NetBSD: sysarch.2,v 1.15 2003/08/07 16:44:10 agc Exp $
-.\"
-.\" Copyright (c) 1980, 1991 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.
-.\"
-.\"     from: @(#)syscall.2	6.3 (Berkeley) 3/10/91
-.\"
-.Dd October 11, 1993
-.Dt SYSARCH 2
-.Os
-.Sh NAME
-.Nm sysarch
-.Nd architecture-dependent system call
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In machine/sysarch.h
-.Ft int
-.Fn sysarch "int number" "void *args"
-.Sh DESCRIPTION
-.Fn sysarch
-performs the architecture-dependent function
-specified by
-.Fa number
-with the arguments specified by the
-.Fa args
-pointer.
-.Fa args
-is a pointer to a structure defining the actual arguments of the function.
-Symbolic constants and argument structures for the architecture-dependent
-functions can be found in the header file
-.Ao Pa machine/sysarch.h Ac .
-.Pp
-The
-.Fn sysarch
-system call should never be called directly by user programs.
-Instead, they should access its functions using the architecture-dependent
-library.
-.Sh RETURN VALUES
-See the manual pages for specific architecture-dependent function calls
-for information about their return values.
-.Sh HISTORY
-The
-.Fn sysarch
-function call appeared in
-.Nx 1.0 .
diff --git a/lib/libc/sys/syscall.2 b/lib/libc/sys/syscall.2
deleted file mode 100644
index 056c4068e..000000000
--- a/lib/libc/sys/syscall.2
+++ /dev/null
@@ -1,99 +0,0 @@
-.\"	$NetBSD: syscall.2,v 1.18 2009/08/07 19:34:46 dsl Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)syscall.2	8.1 (Berkeley) 6/16/93
-.\"
-.Dd August 7, 2009
-.Dt SYSCALL 2
-.Os
-.Sh NAME
-.Nm syscall ,
-.Nm __syscall
-.Nd indirect system call
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/syscall.h
-.In unistd.h
-.Ft int
-.Fn syscall "int number" "..."
-.Ft quad_t
-.Fn __syscall "quad_t number" "..."
-.Sh DESCRIPTION
-.Fn syscall
-performs the system call whose assembly language
-interface has the specified
-.Fa number
-with the specified arguments.
-Symbolic constants for system calls can be found in the header file
-.Ao Pa sys/syscall.h Ac .
-The
-.Nm __syscall
-form should be used when one or more of the parameters is a
-64-bit argument to ensure that argument alignment is correct.
-.Pp
-This system call is useful for testing new system calls that
-do not have entries in the C library.
-It should not be used in normal applications.
-.Sh RETURN VALUES
-The return values are defined by the system call being invoked.
-In general, a 0 return value indicates success.
-A \-1 return value indicates an error,
-and an error code is stored in
-.Va errno .
-.Sh HISTORY
-The
-.Fn syscall
-function call appeared in
-.Bx 4.0 .
-.Sh BUGS
-There is no way to simulate system calls that have multiple return values
-such as
-.Xr pipe 2 .
-.Pp
-Since architectures return 32 bit and 64 bit results in different registers,
-it may be impossible to portably convert the result of
-.Fn __syscall
-to a 32bit value.
-For instance sparc returns 32 bit values in %o0 and 64 bit values in %o0:%o1
-(with %o0 containing the most significant part) so a 32 bit right shift
-of the result is needed to get a correct 32 bit result.
-.Pp
-Many architectures mask off the unwanted high bits of the syscall number,
-rather than returning an error.
-.Pp
-Due to ABI implementation differences in passing struct or union
-type arguments to system calls between different processors, all
-system calls pass instead pointers to such structs or unions, even
-when the documentation of the system call mentions otherwise.
-The conversion between passing structs and unions is handled normally
-via userland stubs.
-The correct arguments for the kernel entry
-points for each system call can be found in the header file
-.Ao Pa sys/syscallargs.h Ac
diff --git a/lib/libc/sys/timer_create.2 b/lib/libc/sys/timer_create.2
deleted file mode 100644
index 14da6743c..000000000
--- a/lib/libc/sys/timer_create.2
+++ /dev/null
@@ -1,120 +0,0 @@
-.\"	$NetBSD: timer_create.2,v 1.12 2012/11/06 21:16:21 uwe Exp $
-.\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 19, 2010
-.Dt TIMER_CREATE 2
-.Os
-.Sh NAME
-.Nm timer_create
-.Nd create a per-process timer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.In signal.h
-.Ft int
-.Fn timer_create "clockid_t clockid" "struct sigevent * restrict evp" "timer_t * restrict timerid"
-.Sh DESCRIPTION
-The
-.Fn timer_create
-function creates a per-process timer using the clock specified in the
-.Ar clockid
-argument.
-If it succeeds, the
-.Fn timer_create
-function fills in the
-.Ar timerid
-argument with an id associated with the timer created that can be used by
-other timer related calls.
-The
-.Ar clockid
-must be a valid clock id as defined in
-.In time.h .
-The timer is created in a disarmed state.
-.Pp
-An optional
-.Pq non- Ns Dv NULL
-.Em struct sigevent
-argument can be specified by the
-.Ar evp
-argument.
-If the
-.Ar evp
-argument is
-.Dv NULL ,
-then
-.Fa evp-\*[Gt]sigev_notify
-defaults to
-.Dv SIGEV_SIGNAL
-and
-.Fa evp-\*[Gt]sigev_value
-is set to
-.Ar timerid .
-Refer to
-.Xr sigevent 3
-for more details.
-.Sh NOTES
-Timers are not inherited after a
-.Xr fork 2
-and are disarmed and deleted by an
-.Xr exec 3 .
-.Sh RETURN VALUES
-If successful, the
-.Fn timer_create
-function returns 0, and fills in the
-.Ar timerid
-argument with the id of the new timer that was created.
-Otherwise, it returns \-1, and sets
-.Dv errno
-to indicate the error.
-.Sh ERRORS
-The
-.Fn timer_create
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The system is out of resources to satisfy this request, or the process has
-created all the timers it is allowed.
-.It Bq Er EINVAL
-The argument
-.Ar clockid
-is not a valid clock id.
-.El
-.Sh SEE ALSO
-.Xr clock_getres 2 ,
-.Xr clock_gettime 2 ,
-.Xr clock_settime 2 ,
-.Xr timer_delete 2 ,
-.Xr timer_getoverrun 2 ,
-.Xr timer_gettime 2 ,
-.Xr timer_settime 2 ,
-.Xr sigevent 3
-.Sh STANDARDS
-.St -p1003.1b-93 ,
-.St -p1003.1i-95
diff --git a/lib/libc/sys/timer_delete.2 b/lib/libc/sys/timer_delete.2
deleted file mode 100644
index faf5cc100..000000000
--- a/lib/libc/sys/timer_delete.2
+++ /dev/null
@@ -1,78 +0,0 @@
-.\"	$NetBSD: timer_delete.2,v 1.5 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 13, 2003
-.Dt TIMER_DELETE 2
-.Os
-.Sh NAME
-.Nm timer_delete
-.Nd delete a per-process timer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft int
-.Fn timer_delete "timer_t timerid"
-.Sh DESCRIPTION
-The
-.Fn timer_delete
-functions deletes the timer specified in the
-.Ar timerid
-argument.
-The
-.Ar timerid
-argument must point to valid timer id, created by
-.Xr timer_create 2 .
-If the deletion is successful, the timer is disarmed and deleted.
-Pending notification events (signals) may or may not be delivered.
-.Sh RETURN VALUES
-If successful, the
-.Fn timer_delete
-functions returns 0.
-Otherwise, it returns \-1, and sets
-.Dv errno
-to indicate error.
-.Sh ERRORS
-The
-.Fn timer_delete
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The argument
-.Ar timerid
-is not a valid timer id.
-.El
-.Sh SEE ALSO
-.Xr timer_create 2 ,
-.Xr timer_getoverrun 2 ,
-.Xr timer_gettime 2 ,
-.Xr timer_settime 2
-.Sh STANDARDS
-.St -p1003.1b-93 ,
-.St -p1003.1i-95
diff --git a/lib/libc/sys/timer_settime.2 b/lib/libc/sys/timer_settime.2
deleted file mode 100644
index 75b109e7c..000000000
--- a/lib/libc/sys/timer_settime.2
+++ /dev/null
@@ -1,172 +0,0 @@
-.\"	$NetBSD: timer_settime.2,v 1.9 2012/11/06 23:25:44 wiz Exp $
-.\"
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 17, 2010
-.Dt TIMER_SETTIME 2
-.Os
-.Sh NAME
-.Nm timer_settime ,
-.Nm timer_gettime ,
-.Nm timer_getoverrun
-.Nd process timer manipulation
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft int
-.Fn timer_settime "timer_t timerid" "int flags" "const struct itimerspec * restrict tim" "struct itimerspec * restrict otim"
-.Ft int
-.Fn timer_gettime "timer_t timerid" "struct itimerspec *tim"
-.Ft int
-.Fn timer_getoverrun "timer_t timerid"
-.Sh DESCRIPTION
-The
-.Fn timer_settime
-sets the next expiration time of the timer with ID
-.Ar timerid
-to the
-.Fa it_value
-(see
-.Xr itimerspec 3 )
-specified in the
-.Ar tim
-argument.
-If the value is 0, the timer is disarmed.
-If the argument
-.Ar otim
-is not
-.Dv NULL
-the old timer settings are returned.
-.Pp
-If the
-.Ar flags
-argument is set to
-.Dv TIMER_RELTIME
-then the expiration time is set to the value in nanoseconds specified
-in the
-.Ar tim
-argument from the time the call to
-.Fn timer_settime
-was made.
-If the
-.Ar flags
-argument is set to
-.Dv TIMER_ABSTIME
-then the expiration time is set to be equal to the difference between the
-clock associated with this timer, and the value specified in the
-.Ar tim
-argument.
-If that time has already passed, then the call succeeds, and the
-expiration notification occurs.
-.Pp
-If the
-.Fa it_interval
-of the
-.Ar tim
-argument is non-zero, then the timer reloads upon expiration.
-.Pp
-The
-.Fn timer_gettime
-function returns the current settings of the timer
-specified by the
-.Ar timerid
-argument in the
-.Ar tim
-argument.
-.Pp
-Only one notification event (signal) can be pending for a given timer
-and process.
-If a timer expires while the signal is still queued for delivery, then
-the overrun counter for that timer is increased.
-The counter can store values up to
-.Dv DELAYTIMER_MAX .
-When the signal is finally delivered to the process, then the
-.Fn timer_getoverrun
-function can be used to retrieve the overrun counter for the timer
-specified in the
-.Ar timerid
-argument.
-.Sh NOTES
-Expiration time values are always rounded up to the resolution of the timer,
-so a notification will never be sent before the requested time.
-Values returned in the
-.Ar otim
-argument of
-.Fn timer_settime
-or in the
-.Ar tim
-argument of
-.Fn timer_gettime
-are subject to the above rounding effect and might not exactly match the
-requested values by the user.
-.Sh RETURN VALUES
-If successful, the
-.Fn timer_gettime
-and
-.Fn timer_settime
-functions return 0, and the
-.Fn timer_getoverrun
-function returns the expiration overrun count for the specified timer.
-Otherwise, the functions return \-1, and set
-.Dv errno
-to indicate the error.
-.Sh ERRORS
-The
-.Fn timer_gettime ,
-.Fn timer_getoverrun ,
-and
-.Fn timer_settime
-functions will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The argument
-.Ar timerid
-does not correspond to a valid timer id as returned by
-.Fn timer_create
-or that timer id has been deleted by
-.Fn timer_delete .
-.El
-.Pp
-The
-.Fn timer_settime
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-A nanosecond field in the
-.Ar tim
-structure specified a value less than zero or greater than or equal to 10e9.
-.El
-.Sh SEE ALSO
-.Xr clock_gettime 2 ,
-.Xr timer_create 2 ,
-.Xr timer_delete 2
-.Sh STANDARDS
-.St -p1003.1b-93 ,
-.St -p1003.1i-95
-.\"  LocalWords:  gettime settime
diff --git a/lib/libc/sys/truncate.2 b/lib/libc/sys/truncate.2
deleted file mode 100644
index 0f0b04c9c..000000000
--- a/lib/libc/sys/truncate.2
+++ /dev/null
@@ -1,154 +0,0 @@
-.\"	$NetBSD: truncate.2,v 1.30 2014/07/25 08:44:54 wiz Exp $
-.\"
-.\" Copyright (c) 1983, 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. 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.
-.\"
-.\"     @(#)truncate.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd July 23, 2014
-.Dt TRUNCATE 2
-.Os
-.Sh NAME
-.Nm truncate ,
-.Nm ftruncate
-.Nd truncate a file to a specified length
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn truncate "const char *path" "off_t length"
-.Ft int
-.Fn ftruncate "int fd" "off_t length"
-.Sh DESCRIPTION
-.Fn truncate
-causes the file named by
-.Fa path
-or referenced by
-.Fa fd
-to have a size of
-.Fa length
-bytes.
-If the file previously was larger than this size, the extra data is discarded.
-If it was previously shorter than
-.Fa length ,
-its size is increased to the specified value and
-the extended area appears as if it were zero-filled.
-.Pp
-With
-.Fn ftruncate ,
-the file must be open for writing; for
-.Fn truncate ,
-the process must have write permissions for the file.
-.Sh RETURN VALUES
-A value of 0 is returned if the call succeeds.
-If the call fails a \-1 is returned, and the global variable
-.Va errno
-specifies the error.
-.Sh ERRORS
-Error return codes common to
-.Fn truncate
-and
-.Fn ftruncate
-are:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa length
-argument was less than 0.
-.It Bq Er EIO
-An I/O error occurred updating the inode.
-.It Bq Er EISDIR
-The named file is a directory.
-.It Bq Er ENOSPC
-There was no space in the filesystem to complete the operation.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.It Bq Er ETXTBSY
-The file is a pure procedure (shared text) file that is being executed.
-.El
-.Pp
-Error codes specific to
-.Fn truncate
-are:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix, or
-the named file is not writable by the user.
-.It Bq Er EFAULT
-.Fa path
-points outside the process's allocated address space.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.El
-.Pp
-Error codes specific to
-.Fn ftruncate
-are:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-is not a valid descriptor.
-.It Bq Er EINVAL
-The
-.Fa fd
-references a socket, not a file, or
-the
-.Fa fd
-is not open for writing.
-.El
-.Sh SEE ALSO
-.Xr fdiscard 2 ,
-.Xr open 2
-.Sh STANDARDS
-Use of
-.Fn truncate
-to extend a file is an
-.St -p1003.1-2004
-extension, and is thus not portable.
-Files can be extended in a portable way seeking (using
-.Xr lseek 2 )
-to the required size and writing a single character with
-.Xr write 2 .
-.Sh HISTORY
-The
-.Fn truncate
-and
-.Fn ftruncate
-function calls appeared in
-.Bx 4.2 .
diff --git a/lib/libc/sys/truncate.c b/lib/libc/sys/truncate.c
deleted file mode 100644
index 63e4550ae..000000000
--- a/lib/libc/sys/truncate.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: truncate.c,v 1.13 2012/03/20 16:26:12 matt Exp $	*/
-
-/*
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)truncate.c	8.1 (Berkeley) 6/17/93";
-#else
-__RCSID("$NetBSD: truncate.c,v 1.13 2012/03/20 16:26:12 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-int __truncate(const char *, int, off_t);
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-int
-truncate(const char *path, off_t length)
-{
-
-	return __truncate(path, 0, length);
-}
diff --git a/lib/libc/sys/umask.2 b/lib/libc/sys/umask.2
deleted file mode 100644
index afb66fd9a..000000000
--- a/lib/libc/sys/umask.2
+++ /dev/null
@@ -1,84 +0,0 @@
-.\"	$NetBSD: umask.2,v 1.16 2003/08/07 16:44:10 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)umask.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt UMASK 2
-.Os
-.Sh NAME
-.Nm umask
-.Nd set file creation mode mask
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/stat.h
-.Ft mode_t
-.Fn umask "mode_t numask"
-.Sh DESCRIPTION
-The
-.Fn umask
-routine sets the process's file mode creation mask to
-.Fa numask
-and returns the previous value of the mask.
-The 9 low-order access permission bits of
-.Fa numask
-are used by system calls, including
-.Xr open 2 ,
-.Xr mkdir 2 ,
-.Xr mkfifo 2
-and
-.Xr mknod 2
-to turn off corresponding bits
-requested in file mode.
-(See
-.Xr chmod 2 ) .
-This clearing allows each user to restrict the default access
-to his files.
-.Pp
-The default mask value is S_IWGRP|S_IWOTH (022, write access for the
-owner only).
-Child processes inherit the mask of the calling process.
-.Sh RETURN VALUES
-The previous value of the file mode mask is returned by the call.
-.Sh ERRORS
-The
-.Fn umask
-function is always successful.
-.Sh SEE ALSO
-.Xr chmod 2 ,
-.Xr mkdir 2 ,
-.Xr mkfifo 2 ,
-.Xr mknod 2 ,
-.Xr open 2
-.Sh STANDARDS
-The
-.Fn umask
-function conforms to
-.St -p1003.1-90 .
diff --git a/lib/libc/sys/undelete.2 b/lib/libc/sys/undelete.2
deleted file mode 100644
index beab99d1d..000000000
--- a/lib/libc/sys/undelete.2
+++ /dev/null
@@ -1,132 +0,0 @@
-.\"	$NetBSD: undelete.2,v 1.16 2014/11/11 08:10:02 njoly Exp $
-.\"
-.\" Copyright (c) 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" Copyright (c) 1994
-.\"	Jan-Simon Pendry
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)undelete.2	8.4 (Berkeley) 10/18/94
-.\"
-.Dd November 28, 2008
-.Dt UNDELETE 2
-.Os
-.Sh NAME
-.Nm undelete
-.Nd remove whiteout
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn undelete "const char *path"
-.Sh DESCRIPTION
-Currently
-.Nm
-works only when the named object
-is a whiteout in a union filesystem.
-The system call removes the whiteout causing
-any objects in a lower layer of the
-union stack to become visible once more.
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn undelete
-succeeds unless:
-.Bl -tag -width ENAMETOOLONGAA
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix, or
-write permission is denied on the directory containing the name
-to be undeleted.
-.It Bq Er EEXIST
-The path does not reference a whiteout.
-.It Bq Er EFAULT
-.Fa path
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-The pathname contains a character with the high-order bit set.
-.It Bq Er EIO
-An I/O error occurred while updating the directory entry.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters,
-or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named whiteout does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er EPERM
-The directory containing the name is marked sticky,
-and the containing directory is not owned by the effective user ID.
-.It Bq Er EROFS
-The name resides on a read-only file system.
-.El
-.Sh SEE ALSO
-.Xr unlink 2 ,
-.Xr mount_union 8
-.Sh HISTORY
-An
-.Nm undelete
-function call first appeared in
-.Bx 4.4 -Lite .
diff --git a/lib/libc/sys/unlink.2 b/lib/libc/sys/unlink.2
deleted file mode 100644
index e2b1f644d..000000000
--- a/lib/libc/sys/unlink.2
+++ /dev/null
@@ -1,191 +0,0 @@
-.\"	$NetBSD: unlink.2,v 1.28 2013/07/28 13:53:04 njoly Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)unlink.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd July 28, 2013
-.Dt UNLINK 2
-.Os
-.Sh NAME
-.Nm unlink ,
-.Nm unlinkat ,
-.Nd remove directory entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn unlink "const char *path"
-.In fcntl.h
-.Ft int
-.Fn unlinkat "int fd" "const char *path" "int flag"
-.Sh DESCRIPTION
-The
-.Fn unlink
-function
-removes the link named by
-.Fa path
-from its directory and decrements the link count of the
-file which was referenced by the link.
-If that decrement reduces the link count of the file
-to zero,
-and no process has the file open, then
-all resources associated with the file are reclaimed.
-If one or more process have the file open when the last link is removed,
-the link is removed, but the removal of the file is delayed until
-all references to it have been closed.
-.Pp
-.Fn unlinkat
-works the same way as
-.Fn unlink
-except if
-.Fa path
-is relative.
-In that case, it is looked up from a directory whose file
-descriptor was passed as
-.Fa fd .
-Search permission is required on this directory.
-.\"    (These alternatives await a decision about the semantics of O_SEARCH)
-.\" Search permission is required on this directory
-.\" except if
-.\" .Fa fd
-.\" was opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" This file descriptor must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.Fa fd
-can be set to
-.Dv AT_FDCWD
-in order to specify the current directory.
-.Pp
-.Fn unlinkat
-will remove directories just like
-.Fn rmdir
-provided
-.Dv AT_REMOVEDIR
-is set in
-.Fa flag .
-.Sh RETURN VALUES
-.Rv -std unlink unlinkat
-.Sh ERRORS
-The
-.Fn unlink
-and
-.Fn unlinkat
-succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix, or
-write permission is denied on the directory containing the link
-to be removed.
-.It Bq Er EBUSY
-The entry to be unlinked is the mount point for a
-mounted file system.
-.It Bq Er EFAULT
-.Fa path
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while deleting the directory entry
-or deallocating the inode.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er EPERM
-The named file is a directory and the effective user ID
-of the process is not the super-user, the file system
-containing the file does not permit the use of
-.Fn unlink
-on a directory,
-or the directory containing the file is marked sticky,
-and neither the containing directory nor the file to be removed
-are owned by the effective user ID.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.El
-.Pp
-In addition,
-.Fn unlinkat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa path
-does not specify an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for reading or searching.
-.It Bq Er ENOTDIR
-.Fa path
-is not an absolute path and
-.Fa fd
-is a file descriptor associated with a non-directory file; or
-.Fa flag
-has
-.Dv AT_REMOVEDIR
-set and
-.Fa path
-does not name a directory.
-.It Bq Er ENOTEMPTY
-.Fa flag
-has
-.Dv AT_REMOVEDIR
-set and
-.Fa path
-is a directory that is not empty.
-.El
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr link 2 ,
-.Xr rmdir 2 ,
-.Xr symlink 7
-.Sh STANDARDS
-The
-.Fn unlink
-function conforms to
-.St -p1003.1-90 .
-.Fn unlinkat
-conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-An
-.Fn unlink
-function call appeared in
-.At v2 .
diff --git a/lib/libc/sys/utimes.2 b/lib/libc/sys/utimes.2
deleted file mode 100644
index af2189987..000000000
--- a/lib/libc/sys/utimes.2
+++ /dev/null
@@ -1,306 +0,0 @@
-.\"	$NetBSD: utimes.2,v 1.40 2013/10/05 21:24:36 ast Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)utimes.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd September 14, 2013
-.Dt UTIMES 2
-.Os
-.Sh NAME
-.Nm utimes ,
-.Nm lutimes ,
-.Nm futimes ,
-.Nm utimens ,
-.Nm lutimens ,
-.Nm futimens ,
-.Nm utimensat
-.Nd set file access and modification times
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/time.h
-.Ft int
-.Fn utimes "const char *path" "const struct timeval times[2]"
-.Ft int
-.Fn lutimes "const char *path" "const struct timeval times[2]"
-.Ft int
-.Fn futimes "int fd" "const struct timeval times[2]"
-.In sys/stat.h
-.Ft int
-.Fn utimens "const char *path" "const struct timespec times[2]"
-.Ft int
-.Fn lutimens "const char *path" "const struct timespec times[2]"
-.Ft int
-.Fn futimens "int fd" "const struct timespec times[2]"
-.In sys/stat.h
-.In fcntl.h
-.Ft int
-.Fn utimensat "int fd" "const char *path" "const struct timespec times[2]" \
- "int flag"
-.Sh DESCRIPTION
-The access and modification times of the file named by
-.Fa path
-or referenced by
-.Fa fd
-are changed as specified by the argument
-.Fa times .
-.Pp
-If
-.Fa times
-is
-.Dv NULL ,
-the access and modification times are set to the current time.
-The caller must be the owner of the file, have permission to
-write the file, or be the super-user.
-.Pp
-If
-.Fa times
-is
-.Pf non- Dv NULL ,
-it is assumed to point to an array of two timeval structures.
-The access time is set to the value of the first element, and the
-modification time is set to the value of the second element.
-For file systems that support file birth (creation) times (such as
-UFS2), the birth time will be set to the value of the second element
-if the second element is older than the currently set birth time.
-To set both a birth time and a modification time, two calls are
-required; the first to set the birth time and the second to set
-the (presumably newer) modification time.
-Ideally a new system call will be added that allows the setting of
-all three times at once.
-The caller must be the owner of the file or be the super-user.
-.Pp
-In either case, the inode-change-time of the file is set to the current
-time.
-.Pp
-.Fn lutimes
-is like
-.Fn utimes
-except in the case where the named file is a symbolic link,
-in which case
-.Fn lutimes
-changes the access and modification times of the link,
-while
-.Fn utimes
-changes the times of the file the link references.
-.Pp
-.Fn utimens ,
-.Fn lutimens ,
-and
-.Fn futimens
-are like
-.Fn utimes ,
-.Fn lutimes ,
-and
-.Fn futimes
-respectively except that time is specified with nanosecond instead of
-microsecond precision.
-.Pp
-.Fn utimensat
-works the same way as
-.Fn utimens
-except if
-.Fa path
-is relative.
-In that case, it is looked up from a directory whose file
-descriptor was passed as
-.Fa fd .
-Search permission is required on this directory.
-.\"    (These alternatives await a decision about the semantics of O_SEARCH)
-.\" Search permission is required on this directory
-.\" except if
-.\" .Fa fd
-.\" was opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.\"    - or -
-.\" This file descriptor must have been opened with the
-.\" .Dv O_SEARCH
-.\" flag.
-.Fa fd
-can be set to
-.Dv AT_FDCWD
-in order to specify the current directory.
-.Pp
-When it operates on a symbolic link,
-.Fn utimensat
-will change the target's time unless
-.Dv AT_SYMLINK_NOFOLLOW
-is set in
-.Fa flag .
-In that later case, the symbolic link's dates are changed.
-.Pp
-The nanosecond fields for
-.Fn utimens ,
-.Fn lutimens ,
-.Fn futimens ,
-and
-.Fn utimensat
-can be set to the special value
-.Dv UTIME_NOW
-to set the current time, or to
-.Dv UTIME_OMIT
-to let the time unchanged (this allows changing access time but not
-modification time, and vice-versa).
-.Sh RETURN VALUES
-.Rv -std utimes lutimes futimes utimens lutimens futimens utimensat
-.Sh ERRORS
-.Fn utimes ,
-.Fn lutimes ,
-.Fn utimens ,
-.Fn lutimens ,
-and
-.Fn utimensat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix;
-or 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
-.Fa path
-or
-.Fa times
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading or writing the affected inode.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters, or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.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,
-.Fn utimensat
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa path
-does not specify an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for reading or searching.
-.It Bq Er ENOTDIR
-.Fa path
-is not an absolute path and
-.Fa fd
-is a file descriptor associated with a non-directory file.
-.El
-.Pp
-.Fn futimes
-and
-.Fn futimens
-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 EBADF
-.Fa fd
-does not refer to a valid descriptor.
-.It Bq Er EFAULT
-.Fa times
-points outside the process's allocated address space.
-.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
-.Sh SEE ALSO
-.Xr stat 2 ,
-.Xr utime 3 ,
-.Xr symlink 7
-.Sh STANDARDS
-The
-.Fn utimes
-function conforms to
-.St -p1003.1-2001 .
-It was however marked as legacy in the
-.St -p1003.1-2004
-revision.
-.Fn futimens
-and
-.Fn utimensat
-functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn utimes
-function call appeared in
-.Bx 4.2 .
-The
-.Fn futimes
-function call appeared in
-.Nx 1.2 .
-The
-.Fn lutimes
-function call appeared in
-.Nx 1.3 .
-Birthtime setting support was added in
-.Nx 5.0 .
-.Fn futimens
-and
-.Fn utimensat
-functions calls appeared in
-.Nx 6.0 .
diff --git a/lib/libc/sys/utrace.2 b/lib/libc/sys/utrace.2
deleted file mode 100644
index 73936a7f0..000000000
--- a/lib/libc/sys/utrace.2
+++ /dev/null
@@ -1,92 +0,0 @@
-.\"	$NetBSD: utrace.2,v 1.13 2008/05/02 18:38:32 martin Exp $
-.\"
-.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Gregory McGarry <g.mcgarry@ieee.org>.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd December 28, 2000
-.Dt UTRACE 2
-.Os
-.Sh NAME
-.Nm utrace
-.Nd insert user record in ktrace log
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/param.h
-.In sys/time.h
-.In sys/uio.h
-.In sys/ktrace.h
-.Ft int
-.Fn utrace "const char *label" "void *addr" "size_t len"
-.Sh DESCRIPTION
-Adds a record to the process trace with information supplied by user.
-The record is identified by
-.Fa label
-and contains
-.Fa len
-bytes from memory pointed to by
-.Fa addr .
-This call only has an effect if the calling process is being traced.
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ENOSYS
-Currently running kernel was compiled without
-.Xr ktrace 2
-support (option KTRACE).
-.It Bq Er EINVAL
-Specified data length
-.Fa len
-was bigger than
-.Dv KTR_USER_MAXLEN .
-.El
-.Sh SEE ALSO
-.Xr kdump 1 ,
-.Xr ktrace 1 ,
-.Xr ktruss 1 ,
-.Xr fktrace 2 ,
-.Xr ktrace 2 ,
-.Xr options 4
-.Sh HISTORY
-The
-.Fn utrace
-system call first appeared in
-.Fx 2.2 .
-It was added to
-.Nx
-in
-.Nx 1.6 .
-The
-.Fa label
-argument is a
-.Nx
-extension.
diff --git a/lib/libc/sys/uuidgen.2 b/lib/libc/sys/uuidgen.2
deleted file mode 100644
index f1c6a60be..000000000
--- a/lib/libc/sys/uuidgen.2
+++ /dev/null
@@ -1,147 +0,0 @@
-.\" $NetBSD: uuidgen.2,v 1.4 2005/01/30 18:13:04 jwise Exp $
-.\" $FreeBSD: src/lib/libc/sys/uuidgen.2,v 1.7 2003/06/27 13:41:29 yar Exp $
-.\" 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: src/lib/libc/sys/uuidgen.2,v 1.7 2003/06/27 13:41:29 yar Exp $
-.\"
-.Dd May 26, 2002
-.Dt UUIDGEN 2
-.Os
-.Sh NAME
-.Nm uuidgen
-.Nd generate universally unique identifiers
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/uuid.h
-.Ft int
-.Fn uuidgen "struct uuid *store" "int count"
-.Sh DESCRIPTION
-The
-.Fn uuidgen
-system call generates
-.Fa count
-universally unique identifiers (UUIDs) and writes them to the buffer
-pointed to by
-.Fa store .
-The identifiers are generated according to the syntax and semantics of the
-DCE version 1 variant of universally unique identifiers.
-See below for a more in-depth description of the identifiers.
-When no IEEE 802
-address is available for the node field, a random multi-cast address is
-generated for each invocation of the system call.
-According to the algorithm of generating time-based UUIDs, this will also
-force a new random clock sequence, thereby increasing the likelihood for
-the identifier to be unique.
-.Pp
-When multiple identifiers are to be generated, the
-.Fn uuidgen
-system call will generate a set of identifiers that is dense in such a way
-that there is no identifier that is larger than the smallest identifier in the
-set and smaller than the largest identifier in the set and that is not already
-in the set.
-.Pp
-Universally unique identifiers, also known as globally unique identifiers
-(GUIDs), have a binary representation of 128-bits.
-The grouping and meaning of these bits is described by the following
-structure and its description of the fields that follow it:
-.Bd -literal
-struct uuid {
-	uint32_t	time_low;
-	uint16_t	time_mid;
-	uint16_t	time_hi_and_version;
-	uint8_t		clock_seq_hi_and_reserved;
-	uint8_t		clock_seq_low;
-	uint8_t		node[_UUID_NODE_LEN];
-};
-.Ed
-.Bl -tag -width ".Va clock_seq_hi_and_reserved"
-.It Va time_low
-The least significant 32 bits of a 60-bit timestamp.
-This field is stored in the native byte-order.
-.It Va time_mid
-The least significant 16 bits of the most significant 28 bits of the 60-bit
-timestamp.
-This field is stored in the native byte-order.
-.It Va time_hi_and_version
-The most significant 12 bits of the 60-bit timestamp multiplexed with a 4-bit
-version number.
-The version number is stored in the most significant 4 bits of the 16-bit
-field.
-This field is stored in the native byte-order.
-.It Va clock_seq_hi_and_reserved
-The most significant 6 bits of a 14-bit sequence number multiplexed with a
-2-bit variant value.
-Note that the width of the variant value is determined by the variant itself.
-Identifiers generated by the
-.Fn uuidgen
-system call have variant value 10b.
-the variant value is stored in the most significant bits of the field.
-.It Va clock_seq_low
-The least significant 8 bits of a 14-bit sequence number.
-.It Va node
-The 6-byte IEEE 802 (MAC) address of one of the interfaces of the node.
-If no such interface exists, a random multi-cast address is used instead.
-.El
-.Pp
-The binary representation is sensitive to byte ordering.
-Any multi-byte field is to be stored in the local or native byte-order and
-identifiers must be converted when transmitted to hosts that do not agree
-on the byte-order.
-The specification does not however document what this means in concrete
-terms and is otherwise beyond the scope of this system call.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn uuidgen
-system call can fail with:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The buffer pointed to by
-.Fa store
-could not be written to for any or all identifiers.
-.It Bq Er EINVAL
-The
-.Fa count
-argument is less than 1 or larger than the hard upper limit of 2048.
-.El
-.Sh SEE ALSO
-.Xr uuidgen 1 ,
-.Xr uuid 3
-.Sh STANDARDS
-The identifiers are represented and generated in conformance with the DCE 1.1
-RPC specification.
-The
-.Fn uuidgen
-system call is itself not part of the specification.
-.Sh HISTORY
-The
-.Fn uuidgen
-system call first appeared in
-.Fx 5.0
-and was subsequently added to
-.Nx 2.0 .
diff --git a/lib/libc/sys/vfork.2 b/lib/libc/sys/vfork.2
deleted file mode 100644
index a1deef007..000000000
--- a/lib/libc/sys/vfork.2
+++ /dev/null
@@ -1,138 +0,0 @@
-.\"	$NetBSD: vfork.2,v 1.27 2014/07/18 16:02:50 dholland Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)vfork.2	8.1 (Berkeley) 6/4/93
-.\"
-.Dd July 18, 2014
-.Dt VFORK 2
-.Os
-.Sh NAME
-.Nm vfork
-.Nd spawn new process in a virtual memory efficient way
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft pid_t
-.Fn vfork void
-.Sh DESCRIPTION
-The
-.Nm
-system call creates a new process that does not have a new
-virtual address space, but rather shares address space with the
-parent, thus avoiding potentially expensive copy-on-write operations
-normally associated with creating a new process.
-It is useful when the purpose of
-.Xr fork 2
-would have been to create a new system context for an
-.Xr execve 2 .
-The
-.Nm
-system call differs from
-.Xr fork 2
-in that the child borrows the parent's memory and thread of
-control until a call to
-.Xr execve 2
-or an exit (either by a call to
-.Xr _exit 2
-or abnormally).
-The parent process is suspended while the child is using its resources.
-.Pp
-The
-.Nm
-system call returns 0 in the child's context and (later) the pid
-of the child in the parent's context.
-.Pp
-The
-.Nm
-system call can normally be used just like
-.Xr fork 2 .
-It does not work, however, to return while running in the child's context
-from the procedure that called
-.Fn vfork
-since the eventual return from
-.Fn vfork
-would then return to a no longer existing stack frame.
-Be careful, also, to call
-.Xr _exit 2
-rather than
-.Xr exit 3
-if you can't
-.Xr execve 2 ,
-since
-.Xr exit 3
-will flush and close standard I/O channels, and thereby mess up the
-standard I/O data structures
-in the parent process.
-(Even with
-.Xr fork 2
-it is wrong to call
-.Xr exit 3
-since buffered data would then be flushed twice.)
-.Sh RETURN VALUES
-Same as for
-.Xr fork 2 .
-.Sh ERRORS
-Same as for
-.Xr fork 2 .
-.Sh SEE ALSO
-.Xr execve 2 ,
-.Xr fork 2 ,
-.Xr sigaction 2 ,
-.Xr wait 2
-.Sh HISTORY
-The
-.Fn vfork
-function call appeared in
-.Bx 3.0 .
-In
-.Bx 4.4 ,
-the semantics were changed to only suspend the parent and not share
-the address space.
-The original semantics were reintroduced in
-.Nx 1.4 .
-.Sh BUGS
-Portable applications should not depend on the memory sharing
-semantics of
-.Fn vfork
-as implementations exist that implement
-.Fn vfork
-as plain
-.Xr fork 2 .
-.Pp
-To avoid a possible deadlock situation, processes that are children
-in the middle of a
-.Fn vfork
-are never sent
-.Dv SIGTTOU
-or
-.Dv SIGTTIN
-signals; rather, output or
-.Xr ioctl 2
-calls are allowed and input attempts result in an end-of-file indication.
diff --git a/lib/libc/sys/wait.2 b/lib/libc/sys/wait.2
deleted file mode 100644
index 08c47b1a1..000000000
--- a/lib/libc/sys/wait.2
+++ /dev/null
@@ -1,335 +0,0 @@
-.\"	$NetBSD: wait.2,v 1.27 2010/04/03 15:43:46 jruoho Exp $
-.\"
-.\" Copyright (c) 1980, 1991, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)wait.2	8.2 (Berkeley) 4/19/94
-.\"
-.Dd April 3, 2010
-.Dt WAIT 2
-.Os
-.Sh NAME
-.Nm wait ,
-.Nm waitpid ,
-.Nm wait4 ,
-.Nm wait3
-.Nd wait for process termination
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/wait.h
-.Ft pid_t
-.Fn wait "int *status"
-.Ft pid_t
-.Fn waitpid "pid_t wpid" "int *status" "int options"
-.In sys/resource.h
-.Ft pid_t
-.Fn wait3 "int *status" "int options" "struct rusage *rusage"
-.Ft pid_t
-.Fn wait4 "pid_t wpid" "int *status" "int options" "struct rusage *rusage"
-.Sh DESCRIPTION
-The
-.Fn wait
-function suspends execution of its calling process until
-.Fa status
-information is available for a terminated child process,
-or a signal is received.
-On return from a successful
-.Fn wait
-call,
-the
-.Fa status
-area contains termination information about the process that exited
-as defined below.
-.Pp
-The
-.Fn wait4
-call provides a more general interface for programs
-that need to wait for certain child processes,
-that need resource utilization statistics accumulated by child processes,
-or that require options.
-The other wait functions are implemented using
-.Fn wait4 .
-.Pp
-The
-.Fa wpid
-parameter specifies the set of child processes for which to wait.
-If
-.Fa wpid
-is \-1, the call waits for any child process.
-If
-.Fa wpid
-is 0,
-the call waits for any child process in the process group of the caller.
-If
-.Fa wpid
-is greater than zero, the call waits for the process with process id
-.Fa wpid .
-If
-.Fa wpid
-is less than \-1, the call waits for any process whose process group id
-equals the absolute value of
-.Fa wpid .
-.Pp
-The
-.Fa status
-parameter is defined below.
-.Pp
-The
-.Fa options
-parameter contains the bitwise OR of any of the following options:
-.Bl -tag -width WUNTRACED
-.It Dv WNOHANG
-This option is used to indicate that the call should not block if
-there are no processes that wish to report status.
-.It Dv WUNTRACED
-If this option is set, children of the current process that are stopped
-due to a
-.Dv SIGTTIN , SIGTTOU , SIGTSTP ,
-or
-.Dv SIGSTOP
-signal also have their status reported.
-.It Dv WALTSIG
-If this option is specified, the call will wait only for processes that
-are configured to post a signal other than
-.Dv SIGCHLD
-when they exit.
-If
-.Dv WALTSIG
-is not specified, the call will wait only for processes that
-are configured to post
-.Dv SIGCHLD .
-.It Dv __WCLONE
-This is an alias for
-.Dv WALTSIG .
-It is provided for compatibility with the Linux
-.Xr clone 2
-API.
-.It Dv WALLSIG
-If this option is specified, the call will wait for all children regardless
-of what exit signal they post.
-.It Dv __WALL
-This is an alias for
-.Dv WALLSIG .
-It is provided for compatibility with the Linux
-.Xr clone 2
-API .
-.El
-.Pp
-If
-.Fa rusage
-is non-zero, a summary of the resources used by the terminated
-process and all its
-children is returned (this information is currently not available
-for stopped processes).
-.Pp
-When the
-.Dv WNOHANG
-option is specified and no processes
-wish to report status,
-.Fn wait4
-returns a
-process id
-of 0.
-.Pp
-The
-.Fn waitpid
-call is identical to
-.Fn wait4
-with an
-.Fa rusage
-value of zero.
-The older
-.Fn wait3
-call is the same as
-.Fn wait4
-with a
-.Fa wpid
-value of \-1.
-.Pp
-The following macros may be used to test the manner of exit of the process.
-Note that these macros expect the
-.Fa status
-value itself, not a pointer to the
-.Fa status
-value.
-One of the first three macros will evaluate to a non-zero (true) value:
-.Bl -tag -width Ds
-.It Fn WIFEXITED status
-True if the process terminated normally by a call to
-.Xr _exit 2
-or
-.Xr exit 3 .
-.It Fn WIFSIGNALED status
-True if the process terminated due to receipt of a signal.
-.It Fn WIFSTOPPED status
-True if the process has not terminated, but has stopped and can be restarted.
-This macro can be true only if the wait call specified the
-.Dv WUNTRACED
-option
-or if the child process is being traced (see
-.Xr ptrace 2 ) .
-.El
-.Pp
-Depending on the values of those macros, the following macros
-produce the remaining status information about the child process:
-.Bl -tag -width Ds
-.It Fn WEXITSTATUS status
-If
-.Fn WIFEXITED status
-is true, evaluates to the low-order 8 bits
-of the argument passed to
-.Xr _exit 2
-or
-.Xr exit 3
-by the child.
-.It Fn WTERMSIG status
-If
-.Fn WIFSIGNALED status
-is true, evaluates to the number of the signal
-that caused the termination of the process.
-.It Fn WCOREDUMP status
-If
-.Fn WIFSIGNALED status
-is true, evaluates as true if the termination
-of the process was accompanied by the creation of a core file
-containing an image of the process when the signal was received.
-.It Fn WSTOPSIG status
-If
-.Fn WIFSTOPPED status
-is true, evaluates to the number of the signal
-that caused the process to stop.
-.El
-.Sh NOTES
-See
-.Xr sigaction 2
-for a list of termination signals.
-A status of 0 indicates normal termination.
-.Pp
-If a parent process terminates without
-waiting for all of its child processes to terminate,
-the remaining child processes are assigned the parent
-process 1 ID (the init process ID).
-.Pp
-If a signal is caught while any of the
-.Fn wait
-calls is pending,
-the call may be interrupted or restarted when the signal-catching routine
-returns,
-depending on the options in effect for the signal;
-see
-.Xr intro 2 ,
-System call restart.
-.Sh RETURN VALUES
-If
-.Fn wait
-returns due to a stopped
-or terminated child process, the process ID of the child
-is returned to the calling process.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Pp
-If
-.Fn wait4 ,
-.Fn wait3
-or
-.Fn waitpid
-returns due to a stopped
-or terminated child process, the process ID of the child
-is returned to the calling process.
-If there are no children not previously awaited,
-\-1 is returned with
-.Va errno
-set to
-.Bq Er ECHILD .
-Otherwise, if
-.Dv WNOHANG
-is specified and there are
-no stopped or exited children, 0 is returned.
-If an error is detected or a caught signal aborts the call,
-a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn wait
-will fail and return immediately if:
-.Bl -tag -width Er
-.It Bq Er ECHILD
-The calling process has no existing unwaited-for child processes.
-.It Bq Er EFAULT
-The
-.Fa status
-or
-.Fa rusage
-arguments point to an illegal address.
-(May not be detected before exit of a child process.)
-.It Bq Er EINTR
-The call was interrupted by a caught signal,
-or the signal did not have the
-.Dv SA_RESTART
-flag set.
-.El
-.Pp
-In addition,
-.Fn wait3 ,
-.Fn wait4 ,
-and
-.Fn waitpid
-will fail and return immediately if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-An invalid value was specified for
-.Fa options .
-.El
-.Sh SEE ALSO
-.Xr _exit 2 ,
-.Xr sigaction 2
-.Sh STANDARDS
-The
-.Fn wait
-and
-.Fn waitpid
-functions conform to
-.St -p1003.1-90 ;
-the
-.Fn wait3
-function conforms to
-.St -xpg4 ;
-.Fn wait4
-is an extension.
-The
-.Fn WCOREDUMP
-macro
-and the ability to restart a pending
-.Fn wait
-call are extensions to the POSIX interface.
-.Sh HISTORY
-A
-.Fn wait
-function call appeared in
-.At v2 .
diff --git a/lib/libc/sys/write.2 b/lib/libc/sys/write.2
deleted file mode 100644
index 227b8c2b8..000000000
--- a/lib/libc/sys/write.2
+++ /dev/null
@@ -1,287 +0,0 @@
-.\"	$NetBSD: write.2,v 1.33 2013/07/14 14:29:09 njoly Exp $
-.\"
-.\" Copyright (c) 1980, 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. 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.
-.\"
-.\"     @(#)write.2	8.5 (Berkeley) 4/2/94
-.\"
-.Dd April 3, 2010
-.Dt WRITE 2
-.Os
-.Sh NAME
-.Nm write ,
-.Nm writev ,
-.Nm pwrite ,
-.Nm pwritev
-.Nd write output
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft ssize_t
-.Fn write "int d" "const void *buf" "size_t nbytes"
-.Ft ssize_t
-.Fn pwrite "int d" "const void *buf" "size_t nbytes" "off_t offset"
-.In sys/uio.h
-.Ft ssize_t
-.Fn writev "int d" "const struct iovec *iov" "int iovcnt"
-.Ft ssize_t
-.Fn pwritev "int d" "const struct iovec *iov" "int iovcnt" "off_t offset"
-.Sh DESCRIPTION
-.Fn write
-attempts to write
-.Fa nbytes
-of data to the object referenced by the descriptor
-.Fa d
-from the buffer pointed to by
-.Fa buf .
-.Fn writev
-performs the same action, but gathers the output data
-from the
-.Fa iovcnt
-buffers specified by the members of the
-.Fa iov
-array: iov[0], iov[1], ..., iov[iovcnt\|-\|1].
-.Fn pwrite
-and
-.Fn pwritev
-perform the same functions, but write to the specified position in
-the file without modifying the file pointer.
-.Pp
-For
-.Fn writev
-and
-.Fn pwritev ,
-the
-.Fa iovec
-structure is defined as:
-.Pp
-.Bd -literal -offset indent -compact
-struct iovec {
-	void *iov_base;
-	size_t iov_len;
-};
-.Ed
-.Pp
-Each
-.Fa iovec
-entry specifies the base address and length of an area
-in memory from which data should be written.
-.Fn writev
-and
-.Fn pwritev
-will always write a complete area before proceeding
-to the next.
-.Pp
-On objects capable of seeking, the
-.Fn write
-starts at a position
-given by the pointer associated with
-.Fa d
-(see
-.Xr lseek 2 ) .
-Upon return from
-.Fn write ,
-the pointer is incremented by the number of bytes which were written.
-.Pp
-Objects that are not capable of seeking always write from the current
-position.
-The value of the pointer associated with such an object
-is undefined.
-.Pp
-If the real user is not the super-user, then
-.Fn write
-clears the set-user-id bit on a file.
-This prevents penetration of system security
-by a user who
-.Dq captures
-a writable set-user-id file
-owned by the super-user.
-.Pp
-If
-.Fn write
-succeeds it will update the st_ctime and st_mtime fields of the file's
-meta-data (see
-.Xr stat 2 ) .
-.Pp
-When using non-blocking I/O on objects such as sockets that are subject
-to flow control,
-.Fn write
-and
-.Fn writev
-may write fewer bytes than requested;
-the return value must be noted,
-and the remainder of the operation should be retried when possible.
-.Sh RETURN VALUES
-Upon successful completion the number of bytes which were written
-is returned.
-Otherwise a \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn write ,
-.Fn writev ,
-.Fn pwrite ,
-and
-.Fn pwritev
-will fail and the file pointer will remain unchanged if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The file was marked for non-blocking I/O,
-and no data could be written immediately.
-.It Bq Er EBADF
-.Fa d
-is not a valid descriptor open for writing.
-.It Bq Er EDQUOT
-The user's quota of disk blocks on the file system
-containing the file has been exhausted.
-.It Bq Er EFAULT
-Part of
-.Fa iov
-or data to be written to the file
-points outside the process's allocated address space.
-.It Bq Er EFBIG
-An attempt was made to write a file that exceeds the process's
-file size limit or the maximum file size.
-.It Bq Er EINTR
-A signal was received before any data could be written to a slow
-device.
-See
-.Xr sigaction 2
-for more information on the interaction between signals and system
-calls.
-.It Bq Er EINVAL
-The pointer associated with
-.Fa d
-was negative; or
-the total length of the I/O is more than can be expressed by the ssize_t
-return value.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er ENOSPC
-There is no free space remaining on the file system
-containing the file.
-.It Bq Er EPIPE
-An attempt is made to write to a pipe that is not open
-for reading by any process; or
-an attempt is made to write to a socket of type
-.Dv SOCK_STREAM
-that is not connected to a peer socket.
-.El
-.Pp
-In addition,
-.Fn writev
-and
-.Fn pwritev
-may return one of the following errors:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-.Fa iovcnt
-was less than or equal to 0, or greater than
-.Brq Dv IOV_MAX ;
-or one of the
-.Fa iov_len
-values in the
-.Fa iov
-array was negative; or
-the sum of the
-.Fa iov_len
-values in the
-.Fa iov
-array overflowed a 32-bit integer.
-.El
-.Pp
-The
-.Fn pwrite
-and
-.Fn pwritev
-calls may also return the following errors:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The specified file offset is invalid.
-.It Bq Er ESPIPE
-The file descriptor is associated with a pipe, socket, or FIFO.
-.El
-.Sh SEE ALSO
-.Xr fcntl 2 ,
-.Xr lseek 2 ,
-.Xr open 2 ,
-.Xr pipe 2 ,
-.Xr poll 2 ,
-.Xr select 2 ,
-.Xr sigaction 2
-.Sh STANDARDS
-The
-.Fn write
-function is expected to conform to
-.St -p1003.1-88 .
-The
-.Fn writev
-and
-.Fn pwrite
-functions conform to
-.St -xpg4.2 .
-.Sh HISTORY
-The
-.Fn pwritev
-function call
-appeared in
-.Nx 1.4 .
-The
-.Fn pwrite
-function call
-appeared in
-.At V.4 .
-The
-.Fn writev
-function call
-appeared in
-.Bx 4.2 .
-The
-.Fn write
-function call appeared in
-.At v2 .
-.Sh CAVEATS
-Error checks should explicitly test for \-1.
-Code such as
-.Bd -literal
-	while ((nr = write(fd, buf, sizeof(buf))) \*[Gt] 0)
-.Ed
-.Pp
-is not maximally portable, as some platforms allow for
-.Va nbytes
-to range between
-.Dv SSIZE_MAX
-and
-.Dv SIZE_MAX
-\- 2, in which case the return value of an error-free
-.Fn write
-may appear as a negative number distinct from \-1.
-Proper loops should use
-.Bd -literal
-	while ((nr = write(fd, buf, sizeof(buf))) != -1 \*[Am]\*[Am] nr != 0)
-.Ed
diff --git a/lib/libc/termios/Makefile.inc b/lib/libc/termios/Makefile.inc
deleted file mode 100644
index 1a287dc08..000000000
--- a/lib/libc/termios/Makefile.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 1998/02/14 20:20:44 kleink Exp $
-
-.PATH:	${.CURDIR}/termios
-
-# Not supported by Minix: tcgetsid.c
-SRCS+=	cfgetispeed.c cfgetospeed.c cfmakeraw.c cfsetispeed.c cfsetospeed.c \
-	cfsetspeed.c tcdrain.c tcflow.c tcflush.c tcgetattr.c tcgetpgrp.c \
-	tcsendbreak.c tcsetattr.c tcsetpgrp.c
-
-MAN+=	tcgetpgrp.3 tcgetsid.3 tcsendbreak.3 tcsetattr.3 tcsetpgrp.3
-
-MLINKS+=tcsendbreak.3 tcdrain.3 tcsendbreak.3 tcflow.3 \
-	tcsendbreak.3 tcflush.3
-MLINKS+=tcsetattr.3 tcgetattr.3 tcsetattr.3 cfgetispeed.3 \
-	tcsetattr.3 cfgetospeed.3 tcsetattr.3 cfmakeraw.3 \
-	tcsetattr.3 cfsetispeed.3 tcsetattr.3 cfsetospeed.3 \
-	tcsetattr.3 cfsetspeed.3
diff --git a/lib/libc/termios/cfgetispeed.c b/lib/libc/termios/cfgetispeed.c
deleted file mode 100644
index 65e74ac7f..000000000
--- a/lib/libc/termios/cfgetispeed.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: cfgetispeed.c,v 1.8 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: cfgetispeed.c,v 1.8 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <termios.h>
-
-#ifdef __weak_alias
-__weak_alias(cfgetispeed,_cfgetispeed)
-#endif
-
-speed_t
-cfgetispeed(const struct termios *t)
-{
-
-	_DIAGASSERT(t != NULL);
-
-	return (t->c_ispeed);
-}
diff --git a/lib/libc/termios/cfgetospeed.c b/lib/libc/termios/cfgetospeed.c
deleted file mode 100644
index fe6cd23f6..000000000
--- a/lib/libc/termios/cfgetospeed.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: cfgetospeed.c,v 1.8 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: cfgetospeed.c,v 1.8 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <termios.h>
-
-#ifdef __weak_alias
-__weak_alias(cfgetospeed,_cfgetospeed)
-#endif
-
-speed_t
-cfgetospeed(const struct termios *t)
-{
-
-	_DIAGASSERT(t != NULL);
-
-	return (t->c_ospeed);
-}
diff --git a/lib/libc/termios/cfmakeraw.c b/lib/libc/termios/cfmakeraw.c
deleted file mode 100644
index ac70e6cca..000000000
--- a/lib/libc/termios/cfmakeraw.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: cfmakeraw.c,v 1.10 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: cfmakeraw.c,v 1.10 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <termios.h>
-
-#ifdef __weak_alias
-__weak_alias(cfmakeraw,_cfmakeraw)
-#endif
-
-/*
- * Make a pre-existing termios structure into "raw" mode: character-at-a-time
- * mode with no characters interpreted, 8-bit data path.
- */
-void
-cfmakeraw(struct termios *t)
-{
-
-	_DIAGASSERT(t != NULL);
-
-	t->c_iflag &= ~(IMAXBEL|IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
-	t->c_oflag &= ~OPOST;
-	t->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
-	t->c_cflag &= ~(CSIZE|PARENB);
-	t->c_cflag |= CS8;
-	/* XXX set MIN/TIME */
-}
diff --git a/lib/libc/termios/cfsetispeed.c b/lib/libc/termios/cfsetispeed.c
deleted file mode 100644
index 44ff18449..000000000
--- a/lib/libc/termios/cfsetispeed.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: cfsetispeed.c,v 1.8 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: cfsetispeed.c,v 1.8 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <termios.h>
-
-#ifdef __weak_alias
-__weak_alias(cfsetispeed,_cfsetispeed)
-#endif
-
-int
-cfsetispeed(struct termios *t, speed_t speed)
-{
-
-	_DIAGASSERT(t != NULL);
-
-	t->c_ispeed = speed;
-	return (0);
-}
diff --git a/lib/libc/termios/cfsetospeed.c b/lib/libc/termios/cfsetospeed.c
deleted file mode 100644
index a61042fac..000000000
--- a/lib/libc/termios/cfsetospeed.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: cfsetospeed.c,v 1.8 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: cfsetospeed.c,v 1.8 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <termios.h>
-
-#ifdef __weak_alias
-__weak_alias(cfsetospeed,_cfsetospeed)
-#endif
-
-int
-cfsetospeed(struct termios *t, speed_t speed)
-{
-
-	_DIAGASSERT(t != NULL);
-
-	t->c_ospeed = speed;
-	return (0);
-}
diff --git a/lib/libc/termios/cfsetspeed.c b/lib/libc/termios/cfsetspeed.c
deleted file mode 100644
index 85a030acb..000000000
--- a/lib/libc/termios/cfsetspeed.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: cfsetspeed.c,v 1.8 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: cfsetspeed.c,v 1.8 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <termios.h>
-
-#ifdef __weak_alias
-__weak_alias(cfsetspeed,_cfsetspeed)
-#endif
-
-int
-cfsetspeed(struct termios *t, speed_t speed)
-{
-
-	_DIAGASSERT(t != NULL);
-
-	t->c_ispeed = t->c_ospeed = speed;
-	return (0);
-}
diff --git a/lib/libc/termios/tcdrain.c b/lib/libc/termios/tcdrain.c
deleted file mode 100644
index 6782e0a86..000000000
--- a/lib/libc/termios/tcdrain.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: tcdrain.c,v 1.9 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: tcdrain.c,v 1.9 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/ioctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <termios.h>
-
-#ifdef __weak_alias
-__weak_alias(tcdrain,_tcdrain)
-#endif
-
-int
-tcdrain(int fd)
-{
-
-	_DIAGASSERT(fd != -1);
-
-	return (ioctl(fd, TIOCDRAIN, 0));
-}
diff --git a/lib/libc/termios/tcflow.c b/lib/libc/termios/tcflow.c
deleted file mode 100644
index 5ca0ef39e..000000000
--- a/lib/libc/termios/tcflow.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: tcflow.c,v 1.9 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: tcflow.c,v 1.9 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/ioctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <termios.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(tcflow,_tcflow)
-#endif
-
-int
-tcflow(int fd, int action)
-{
-	struct termios term;
-	u_char c;
-
-	_DIAGASSERT(fd != -1);
-
-	switch (action) {
-	case TCOOFF:
-		return (ioctl(fd, TIOCSTOP, 0));
-	case TCOON:
-		return (ioctl(fd, TIOCSTART, 0));
-	case TCION:
-	case TCIOFF:
-		if (tcgetattr(fd, &term) == -1)
-			return (-1);
-		c = term.c_cc[action == TCIOFF ? VSTOP : VSTART];
-		if (c != _POSIX_VDISABLE && write(fd, &c, sizeof(c)) == -1)
-			return (-1);
-		return (0);
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc/termios/tcflush.c b/lib/libc/termios/tcflush.c
deleted file mode 100644
index fd1384014..000000000
--- a/lib/libc/termios/tcflush.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: tcflush.c,v 1.10 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: tcflush.c,v 1.10 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/ioctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <termios.h>
-
-#ifdef __weak_alias
-__weak_alias(tcflush,_tcflush)
-#endif
-
-int
-tcflush(int fd, int which)
-{
-	int com;
-
-	_DIAGASSERT(fd != -1);
-
-	switch (which) {
-	case TCIFLUSH:
-		com = FREAD;
-		break;
-	case TCOFLUSH:
-		com = FWRITE;
-		break;
-	case TCIOFLUSH:
-		com = FREAD | FWRITE;
-		break;
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-	return (ioctl(fd, TIOCFLUSH, &com));
-}
diff --git a/lib/libc/termios/tcgetattr.c b/lib/libc/termios/tcgetattr.c
deleted file mode 100644
index b0218365b..000000000
--- a/lib/libc/termios/tcgetattr.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: tcgetattr.c,v 1.10 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: tcgetattr.c,v 1.10 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/ioctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <termios.h>
-
-#ifdef __weak_alias
-__weak_alias(tcgetattr,_tcgetattr)
-#endif
-
-int
-tcgetattr(int fd, struct termios *t)
-{
-
-	_DIAGASSERT(t != NULL);
-
-	return (ioctl(fd, TIOCGETA, t));
-}
diff --git a/lib/libc/termios/tcgetpgrp.3 b/lib/libc/termios/tcgetpgrp.3
deleted file mode 100644
index c3f44f83b..000000000
--- a/lib/libc/termios/tcgetpgrp.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\"	$NetBSD: tcgetpgrp.3,v 1.11 2003/08/07 16:44:13 agc Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)tcgetpgrp.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt TCGETPGRP 3
-.Os
-.Sh NAME
-.Nm tcgetpgrp
-.Nd get foreground process group ID
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft pid_t
-.Fn tcgetpgrp "int fd"
-.Sh DESCRIPTION
-The
-.Nm tcgetpgrp
-function returns the value of the process group ID of the foreground
-process group associated with the terminal device.
-If there is no foreground process group,
-.Nm tcgetpgrp
-returns an invalid process ID.
-.Sh ERRORS
-If an error occurs,
-.Nm tcgetpgrp
-returns -1 and the global variable
-.Va errno
-is set to indicate the error, as follows:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid file descriptor.
-.It Bq Er ENOTTY
-The calling process does not have a controlling terminal or the
-underlying terminal device represented by
-.Fa fd
-is not the controlling terminal.
-.El
-.Sh SEE ALSO
-.Xr setpgid 2 ,
-.Xr setsid 2 ,
-.Xr tcsetpgrp 3
-.Sh STANDARDS
-The
-.Nm tcgetpgrp
-function conforms to
-.St -p1003.1-90 .
diff --git a/lib/libc/termios/tcgetpgrp.c b/lib/libc/termios/tcgetpgrp.c
deleted file mode 100644
index e977ab562..000000000
--- a/lib/libc/termios/tcgetpgrp.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: tcgetpgrp.c,v 1.10 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: tcgetpgrp.c,v 1.10 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <termios.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(tcgetpgrp,_tcgetpgrp)
-#endif
-
-pid_t
-tcgetpgrp(int fd)
-{
-	int s;
-
-	_DIAGASSERT(fd != -1);
-
-	if (ioctl(fd, TIOCGPGRP, &s) < 0)
-		return ((pid_t)-1);
-
-	if (s == (pid_t)-1)
-		/* SVID requires a number > 1 that isn't a valid PGID... */
-		s = (uint)(pid_t)~0u >> 1;
-	return ((pid_t)s);
-}
diff --git a/lib/libc/termios/tcgetsid.3 b/lib/libc/termios/tcgetsid.3
deleted file mode 100644
index b494c8992..000000000
--- a/lib/libc/termios/tcgetsid.3
+++ /dev/null
@@ -1,76 +0,0 @@
-.\"	$NetBSD: tcgetsid.3,v 1.5 2003/08/07 16:44:13 agc Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)tcgetpgrp.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd February 13, 1998
-.Dt TCGETSID 3
-.Os
-.Sh NAME
-.Nm tcgetsid
-.Nd get session ID associated with a controlling terminal
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In unistd.h
-.Ft pid_t
-.Fn tcgetsid "int fd"
-.Sh DESCRIPTION
-The
-.Nm tcgetsid
-function returns the value of the session ID associated with the specified
-controlling terminal device.
-The session ID is defined as the process group ID of the session leader.
-.Sh ERRORS
-If an error occurs,
-.Nm tcgetsid
-returns -1 and the global variable
-.Va errno
-is set to indicate the error, as follows:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid file descriptor.
-.It Bq Er ENOTTY
-The calling process does not have a controlling terminal or the
-underlying terminal device represented by
-.Fa fd
-is not the controlling terminal.
-.El
-.Sh SEE ALSO
-.Xr getsid 2 ,
-.Xr setsid 2 ,
-.Xr tcgetpgrp 3
-.Sh STANDARDS
-The
-.Nm tcgetsid
-function conforms to
-.St -xpg4.2 .
diff --git a/lib/libc/termios/tcgetsid.c b/lib/libc/termios/tcgetsid.c
deleted file mode 100644
index 53b3c4d02..000000000
--- a/lib/libc/termios/tcgetsid.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: tcgetsid.c,v 1.7 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: tcgetsid.c,v 1.7 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <termios.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(tcgetsid,_tcgetsid)
-#endif
-
-pid_t
-tcgetsid(int fd)
-{
-	int s;
-
-	_DIAGASSERT(fd != -1);
-
-	if (ioctl(fd, TIOCGSID, &s) < 0)
-		return ((pid_t)-1);
-
-	return ((pid_t)s);
-}
diff --git a/lib/libc/termios/tcsendbreak.3 b/lib/libc/termios/tcsendbreak.3
deleted file mode 100644
index 27e765832..000000000
--- a/lib/libc/termios/tcsendbreak.3
+++ /dev/null
@@ -1,154 +0,0 @@
-.\"	$NetBSD: tcsendbreak.3,v 1.9 2003/08/07 16:44:13 agc Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)tcsendbreak.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt TCSENDBREAK 3
-.Os
-.Sh NAME
-.Nm tcsendbreak ,
-.Nm tcdrain ,
-.Nm tcflush ,
-.Nm tcflow
-.Nd line control functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In termios.h
-.Ft int
-.Fn tcdrain "int fd"
-.Ft int
-.Fn tcflow "int fd" "int action"
-.Ft int
-.Fn tcflush "int fd" "int action"
-.Ft int
-.Fn tcsendbreak "int fd" "int len"
-.Sh DESCRIPTION
-The
-.Nm tcdrain
-function waits until all output written to the terminal referenced by
-.Fa fd
-has been transmitted to the terminal.
-.Pp
-The
-.Nm tcflow
-function suspends transmission of data to or the reception of data from
-the terminal referenced by
-.Fa fd
-depending on the value of
-.Fa action .
-The value of
-.Fa action
-must be one of the following:
-.Bl -tag -width "TCIOFF"
-.It Fa TCOOFF
-Suspend output.
-.It Fa TCOON
-Restart suspended output.
-.It Fa TCIOFF
-Transmit a STOP character, which is intended to cause the terminal to stop
-transmitting data to the system.
-(See the description of IXOFF in the
-.Ql Input Modes
-section of
-.Xr termios 4 ) .
-.It Fa TCION
-Transmit a START character, which is intended to cause the terminal to start
-transmitting data to the system.
-(See the description of IXOFF in the
-.Ql Input Modes
-section of
-.Xr termios 4 ) .
-.El
-.Pp
-The
-.Nm tcflush
-function discards any data written to the terminal referenced by
-.Fa fd
-which has not been transmitted to the terminal, or any data received
-from the terminal but not yet read, depending on the value of
-.Fa action .
-The value of
-.Fa action
-must be one of the following:
-.Bl -tag -width "TCIOFLUSH"
-.It Fa TCIFLUSH
-Flush data received but not read.
-.It Fa TCOFLUSH
-Flush data written but not transmitted.
-.It Fa TCIOFLUSH
-Flush both data received but not read and data written but not transmitted.
-.El
-.Pp
-The
-.Nm tcsendbreak
-function transmits a continuous stream of zero-valued bits for four-tenths
-of a second to the terminal referenced by
-.Fa fd .
-The
-.Fa len
-parameter is ignored in this implementation.
-.Sh RETURN VALUES
-Upon successful completion, all of these functions return a value of zero.
-.Sh ERRORS
-If any error occurs, a value of -1 is returned and the global variable
-.Va errno
-is set to indicate the error, as follows:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid file descriptor.
-.It Bq Er EINVAL
-The
-.Fa action
-argument is not a proper value.
-.It Bq Er ENOTTY
-The file associated with
-.Fa fd
-is not a terminal.
-.It Bq Er EINTR
-A signal interrupted the
-.Nm tcdrain
-function.
-.El
-.Sh SEE ALSO
-.Xr tcsetattr 3 ,
-.Xr termios 4
-.Sh STANDARDS
-The
-.Nm tcsendbreak ,
-.Nm tcdrain ,
-.Nm tcflush
-and
-.Nm tcflow
-functions are expected to be compliant with the
-.St -p1003.1-88
-specification.
diff --git a/lib/libc/termios/tcsendbreak.c b/lib/libc/termios/tcsendbreak.c
deleted file mode 100644
index ecccc4c42..000000000
--- a/lib/libc/termios/tcsendbreak.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: tcsendbreak.c,v 1.10 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: tcsendbreak.c,v 1.10 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <termios.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(tcsendbreak,_tcsendbreak)
-#endif
-
-/*ARGSUSED*/
-int
-tcsendbreak(int fd, int len)
-{
-	static const struct timespec sleepytime = { 0, 400000000 };
-
-	_DIAGASSERT(fd != -1);
-
-	if (ioctl(fd, TIOCSBRK, 0) == -1)
-		return (-1);
-	(void)nanosleep(&sleepytime, NULL);
-	if (ioctl(fd, TIOCCBRK, 0) == -1)
-		return (-1);
-	return (0);
-}
diff --git a/lib/libc/termios/tcsetattr.3 b/lib/libc/termios/tcsetattr.3
deleted file mode 100644
index b5a31231b..000000000
--- a/lib/libc/termios/tcsetattr.3
+++ /dev/null
@@ -1,331 +0,0 @@
-.\"	$NetBSD: tcsetattr.3,v 1.13 2010/03/22 19:30:55 joerg Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)tcsetattr.3	8.3 (Berkeley) 1/2/94
-.\"
-.Dd May 1, 2004
-.Dt TCSETATTR 3
-.Os
-.Sh NAME
-.Nm cfgetispeed ,
-.Nm cfsetispeed ,
-.Nm cfgetospeed ,
-.Nm cfsetospeed ,
-.Nm cfsetspeed ,
-.Nm cfmakeraw ,
-.Nm tcgetattr ,
-.Nm tcsetattr
-.Nd manipulating the termios structure
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In termios.h
-.Ft speed_t
-.Fn cfgetispeed "const struct termios *t"
-.Ft int
-.Fn cfsetispeed "struct termios *t" "speed_t speed"
-.Ft speed_t
-.Fn cfgetospeed "const struct termios *t"
-.Ft int
-.Fn cfsetospeed "struct termios *t" "speed_t speed"
-.Ft int
-.Fn cfsetspeed "struct termios *t" "speed_t speed"
-.Ft void
-.Fn cfmakeraw "struct termios *t"
-.Ft int
-.Fn tcgetattr "int fd" "struct termios *t"
-.Ft int
-.Fn tcsetattr "int fd" "int action" "const struct termios *t"
-.Sh DESCRIPTION
-The
-.Nm cfmakeraw ,
-.Nm tcgetattr
-and
-.Nm tcsetattr
-functions are provided for getting and setting the termios structure.
-.Pp
-The
-.Nm cfgetispeed ,
-.Nm cfsetispeed ,
-.Nm cfgetospeed ,
-.Nm cfsetospeed
-and
-.Nm cfsetspeed
-functions are provided for getting and setting the baud rate values in
-the termios structure.
-The effects of the functions on the terminal as described below
-do not become effective, nor are all errors detected, until the
-.Nm tcsetattr
-function is called.
-Certain values for baud rates set in the termios structure and passed to
-.Nm tcsetattr
-have special meanings.
-These are discussed in the portion of the manual page that describes the
-.Nm tcsetattr
-function.
-.Sh GETTING AND SETTING THE BAUD RATE
-The input and output baud rates are found in the termios structure.
-The unsigned integer
-.Li speed_t
-is typdef'd in the include file
-.In termios.h .
-The value of the integer corresponds directly to the baud rate being
-represented, however, the following symbolic values are defined.
-.Bd -literal
-#define B0	0
-#define B50	50
-#define B75	75
-#define B110	110
-#define B134	134
-#define B150	150
-#define B200	200
-#define B300	300
-#define B600	600
-#define B1200	1200
-#define	B1800	1800
-#define B2400	2400
-#define B4800	4800
-#define B9600	9600
-#define B19200	19200
-#define B38400	38400
-#ifndef _POSIX_SOURCE
-#define EXTA	19200
-#define EXTB	38400
-#endif  /*_POSIX_SOURCE */
-.Ed
-.Pp
-The
-.Nm cfgetispeed
-function returns the input baud rate in the termios structure referenced by
-.Fa tp .
-.Pp
-The
-.Nm cfsetispeed
-function sets the input baud rate in the termios structure referenced by
-.Fa tp
-to
-.Fa speed .
-.Pp
-The
-.Nm cfgetospeed
-function returns the output baud rate in the termios structure referenced by
-.Fa tp .
-.Pp
-The
-.Nm cfsetospeed
-function sets the output baud rate in the termios structure referenced by
-.Fa tp
-to
-.Fa speed .
-.Pp
-The
-.Nm cfsetspeed
-function sets both the input and output baud rate in the termios structure
-referenced by
-.Fa tp
-to
-.Fa speed .
-.Pp
-Upon successful completion, the functions
-.Nm cfsetispeed ,
-.Nm cfsetospeed ,
-and
-.Nm cfsetspeed
-return a value of 0.
-Otherwise, a value of -1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh GETTING AND SETTING THE TERMIOS STATE
-This section describes the functions that are used to control the general
-terminal interface.
-Unless otherwise noted for a specific command, these functions are restricted
-from use by background processes.
-Attempts to perform these operations shall cause the process group to be sent
-a SIGTTOU signal.
-If the calling process is blocking or ignoring SIGTTOU signals, the process
-is allowed to perform the operation and the SIGTTOU signal is not sent.
-.Pp
-In all the functions, although
-.Fa fd
-is an open file descriptor, the functions affect the underlying terminal
-file, not just the open file description associated with the particular
-file descriptor.
-.Pp
-The
-.Nm cfmakeraw
-function sets the flags stored in the termios structure (initialized by
-.Nm tcgetattr )
-to a state disabling all input and output processing, giving a
-.Dq raw I/O path .
-It should be noted that there is no function to reverse this effect.
-This is because there are a variety of processing options that could be
-re-enabled and the correct method is for an application to snapshot the
-current terminal state using the function
-.Nm tcgetattr ,
-setting raw mode with
-.Nm cfmakeraw
-and the subsequent
-.Nm tcsetattr ,
-and then using another
-.Nm tcsetattr
-with the saved state to revert to the previous terminal state.
-.Pp
-The
-.Nm tcgetattr
-function copies the parameters associated with the terminal referenced
-by
-.Fa fd
-to the termios structure referenced by
-.Fa tp .
-This function is allowed from a background process, however, the terminal
-attributes may be subsequently changed by a foreground process.
-.Pp
-The
-.Nm tcsetattr
-function sets the parameters associated with the terminal from the
-termios structure referenced by
-.Fa tp .
-The
-.Fa action
-field is created by
-.Em or Ns 'ing
-the following values, as specified in the include file
-.In termios.h .
-.Bl -tag -width "TCSADRAIN"
-.It Fa TCSANOW
-The change occurs immediately.
-.It Fa TCSADRAIN
-The change occurs after all output written to
-.Fa fd
-has been transmitted to the terminal.
-This value of
-.Fa action
-should be used when changing parameters that affect output.
-.It Fa TCSAFLUSH
-The change occurs after all output written to
-.Fa fd
-has been transmitted to the terminal.
-Additionally, any input that has been received but not read is discarded.
-.It Fa TCSASOFT
-If this value is
-.Em or Ns 'ed
-into the
-.Fa action
-value, the values of the
-.Em c_cflag ,
-.Em c_ispeed ,
-and
-.Em c_ospeed
-fields are ignored.
-.El
-.Pp
-The 0 baud rate is used to terminate the connection.
-If 0 is specified as the output speed to the function
-.Nm tcsetattr ,
-modem control will no longer be asserted on the terminal, disconnecting
-the terminal.
-.Pp
-If zero is specified as the input speed to the function
-.Nm tcsetattr ,
-the input baud rate will be set to the same value as that specified by
-the output baud rate.
-.Sh RETURN VALUES
-If
-.Nm tcsetattr
-is unable to make any of the requested changes, it returns -1 and
-sets errno.
-Otherwise, it makes all of the requested changes it can.
-If the specified input and output baud rates differ and are a combination
-that is not supported, neither baud rate is changed.
-.Pp
-Upon successful completion, the functions
-.Nm tcgetattr
-and
-.Nm tcsetattr
-return a value of 0.
-Otherwise, they
-return -1 and the global variable
-.Va errno
-is set to indicate the error, as follows:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument to
-.Nm tcgetattr
-or
-.Nm tcsetattr
-was not a valid file descriptor.
-.It Bq Er EINTR
-The
-.Nm tcsetattr
-function was interrupted by a signal.
-.It Bq Er EINVAL
-The
-.Fa action
-argument to the
-.Nm tcsetattr
-function was not valid, or an attempt was made to change an attribute
-represented in the termios structure to an unsupported value.
-.It Bq Er ENOTTY
-The file associated with the
-.Fa fd
-argument to
-.Nm tcgetattr
-or
-.Nm tcsetattr
-is not a terminal.
-.El
-.Sh SEE ALSO
-.Xr tcsendbreak 3 ,
-.Xr termios 4
-.Sh STANDARDS
-The
-.Nm cfgetispeed ,
-.Nm cfsetispeed ,
-.Nm cfgetospeed ,
-.Nm cfsetospeed ,
-.Nm tcgetattr
-and
-.Nm tcsetattr
-functions are expected to be compliant with the
-.St -p1003.1-88
-specification.
-The
-.Nm cfmakeraw
-and
-.Nm cfsetspeed
-functions,
-as well as the
-.Li TCSASOFT
-option to the
-.Nm tcsetattr
-function are extensions to the
-.St -p1003.1-88
-specification.
diff --git a/lib/libc/termios/tcsetattr.c b/lib/libc/termios/tcsetattr.c
deleted file mode 100644
index bbc734e11..000000000
--- a/lib/libc/termios/tcsetattr.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: tcsetattr.c,v 1.9 2012/06/25 22:32:46 abs Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: tcsetattr.c,v 1.9 2012/06/25 22:32:46 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/ioctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <termios.h>
-
-#ifdef __weak_alias
-__weak_alias(tcsetattr,_tcsetattr)
-#endif
-
-int
-tcsetattr(int fd, int opt, const struct termios *t)
-{
-	struct termios localterm;
-
-	_DIAGASSERT(fd != -1);
-	_DIAGASSERT(t != NULL);
-
-	if (opt & TCSASOFT) {
-		localterm = *t;
-		localterm.c_cflag |= CIGNORE;
-		t = &localterm;
-	}
-	switch (opt & ~TCSASOFT) {
-	case TCSANOW:
-		return (ioctl(fd, TIOCSETA, t));
-	case TCSADRAIN:
-		return (ioctl(fd, TIOCSETAW, t));
-	case TCSAFLUSH:
-		return (ioctl(fd, TIOCSETAF, t));
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-}
diff --git a/lib/libc/termios/tcsetpgrp.3 b/lib/libc/termios/tcsetpgrp.3
deleted file mode 100644
index b0db4e0cb..000000000
--- a/lib/libc/termios/tcsetpgrp.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\"	$NetBSD: tcsetpgrp.3,v 1.10 2003/08/07 16:44:14 agc Exp $
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)tcsetpgrp.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt TCSETPGRP 3
-.Os
-.Sh NAME
-.Nm tcsetpgrp
-.Nd set foreground process group ID
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn tcsetpgrp "int fd" "pid_t pgrp_id"
-.Sh DESCRIPTION
-If the process has a controlling terminal, the
-.Nm tcsetpgrp
-function sets the foreground process group ID associated with the
-terminal device to
-.Fa pgrp_id .
-The terminal device associated with
-.Fa fd
-must be the controlling terminal of the calling process and the
-controlling terminal must be currently associated with the session
-of the calling process.
-The value of
-.Fa pgrp_id
-must be the same as the process group ID of a process in the same
-session as the calling process.
-.Pp
-Upon successful completion,
-.Nm tcsetpgrp
-returns a value of zero.
-.Sh ERRORS
-If an error occurs,
-.Nm tcgetpgrp
-returns -1 and the global variable
-.Va errno
-is set to indicate the error, as follows:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid file descriptor.
-.It Bq Er EINVAL
-An invalid value of
-.Fa pgrp_id
-was specified.
-.It Bq Er ENOTTY
-The calling process does not have a controlling terminal, or the file
-represented by
-.Fa fd
-is not the controlling terminal, or the controlling terminal is no
-longer associated with the session of the calling process.
-.It Bq Er EPERM
-The
-.Fa pgrp_id
-argument does not match the process group ID of a process in the same
-session as the calling process.
-.El
-.Sh SEE ALSO
-.Xr setpgid 2 ,
-.Xr setsid 2 ,
-.Xr tcgetpgrp 3
-.Sh STANDARDS
-The
-.Nm tcsetpgprp
-function conforms to
-.St -p1003.1-90 .
diff --git a/lib/libc/termios/tcsetpgrp.c b/lib/libc/termios/tcsetpgrp.c
deleted file mode 100644
index 8ce1d6962..000000000
--- a/lib/libc/termios/tcsetpgrp.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: tcsetpgrp.c,v 1.9 2003/08/07 16:44:14 agc Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#else
-__RCSID("$NetBSD: tcsetpgrp.c,v 1.9 2003/08/07 16:44:14 agc Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <termios.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(tcsetpgrp,_tcsetpgrp)
-#endif
-
-int
-tcsetpgrp(int fd, pid_t pgrp)
-{
-	int s;
-
-	_DIAGASSERT(fd != -1);
-
-	s = pgrp;
-	return (ioctl(fd, TIOCSPGRP, &s));
-}
diff --git a/lib/libc/thread-stub/Makefile.inc b/lib/libc/thread-stub/Makefile.inc
deleted file mode 100644
index e540a836f..000000000
--- a/lib/libc/thread-stub/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 2013/04/05 20:15:42 christos Exp $
-
-.include <bsd.own.mk>
-
-# Our sources
-.PATH: ${.CURDIR}/thread-stub
-
-SRCS+=	__isthreaded.c thread-stub.c thread-stub-init.c
diff --git a/lib/libc/thread-stub/__isthreaded.c b/lib/libc/thread-stub/__isthreaded.c
deleted file mode 100644
index 50c1b6f4e..000000000
--- a/lib/libc/thread-stub/__isthreaded.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: __isthreaded.c,v 1.3 2009/12/01 01:33:25 explorer Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Michael Graff.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __isthreaded.c,v 1.3 2009/12/01 01:33:25 explorer Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-int __isthreaded = 0;
diff --git a/lib/libc/thread-stub/thread-stub-init.c b/lib/libc/thread-stub/thread-stub-init.c
deleted file mode 100644
index 8ea3b3f52..000000000
--- a/lib/libc/thread-stub/thread-stub-init.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: thread-stub-init.c,v 1.2 2013/08/19 22:14:37 matt Exp $	*/
-
-/*-
- * Copyright (c) 2003, 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: thread-stub-init.c,v 1.2 2013/08/19 22:14:37 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef _REENTRANT
-#define __LIBC_THREAD_STUBS
-#include "reentrant.h"
-#include <signal.h>
-
-/* libpthread init */
-
-__weak_alias(__libc_thr_init,__libc_thr_init_stub)
-
-void __section(".text.startup")
-__libc_thr_init_stub(void)
-{
-
-	/* nothing, may be overridden by libpthread */
-}
-
-#define DIE()   (void)raise(SIGABRT)
-
-__weak_alias(__libc_thr_errno,__libc_thr_errno_stub)
-int *
-__libc_thr_errno_stub(void)
-{
-	DIE();
-
-	return (NULL);
-}
-#endif /* _REENTRANT */
diff --git a/lib/libc/thread-stub/thread-stub.c b/lib/libc/thread-stub/thread-stub.c
deleted file mode 100644
index 43c5f296c..000000000
--- a/lib/libc/thread-stub/thread-stub.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/*	$NetBSD: thread-stub.c,v 1.27 2013/05/28 17:29:41 christos Exp $	*/
-
-/*-
- * Copyright (c) 2003, 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: thread-stub.c,v 1.27 2013/05/28 17:29:41 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Stubs for thread operations, for use when threads are not used by
- * the application.  See "reentrant.h" for details.
- */
-
-#ifdef _REENTRANT
-
-#define	__LIBC_THREAD_STUBS
-
-#define pthread_join	__libc_pthread_join
-#define pthread_detach	__libc_pthread_detach
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-extern int __isthreaded;
-
-#define	DIE()	(void)raise(SIGABRT)
-
-#define	CHECK_NOT_THREADED_ALWAYS()	\
-do {					\
-	if (__isthreaded)		\
-		DIE();			\
-} while (/*CONSTCOND*/0)
-
-#if 1
-#define	CHECK_NOT_THREADED()	CHECK_NOT_THREADED_ALWAYS()
-#else
-#define	CHECK_NOT_THREADED()	/* nothing */
-#endif
-
-__weak_alias(pthread_join, __libc_pthread_join)
-__weak_alias(pthread_detach, __libc_pthread_detach)
-
-int
-pthread_join(pthread_t thread, void **valptr)
-{
-
-	if (thread == pthread_self())
-		return EDEADLK;
-	return ESRCH;
-}
-
-int
-pthread_detach(pthread_t thread)
-{
-
-	if (thread == pthread_self())
-		return 0;
-	return ESRCH;
-}
-
-/* mutexes */
-
-int __libc_mutex_catchall_stub(mutex_t *);
-
-__weak_alias(__libc_mutex_init,__libc_mutex_init_stub)
-__weak_alias(__libc_mutex_lock,__libc_mutex_catchall_stub)
-__weak_alias(__libc_mutex_trylock,__libc_mutex_catchall_stub)
-__weak_alias(__libc_mutex_unlock,__libc_mutex_catchall_stub)
-__weak_alias(__libc_mutex_destroy,__libc_mutex_catchall_stub)
-
-__strong_alias(__libc_mutex_lock_stub,__libc_mutex_catchall_stub)
-__strong_alias(__libc_mutex_trylock_stub,__libc_mutex_catchall_stub)
-__strong_alias(__libc_mutex_unlock_stub,__libc_mutex_catchall_stub)
-__strong_alias(__libc_mutex_destroy_stub,__libc_mutex_catchall_stub)
-
-int __libc_mutexattr_catchall_stub(mutexattr_t *);
-
-__weak_alias(__libc_mutexattr_init,__libc_mutexattr_catchall_stub)
-__weak_alias(__libc_mutexattr_destroy,__libc_mutexattr_catchall_stub)
-__weak_alias(__libc_mutexattr_settype,__libc_mutexattr_settype_stub)
-
-__strong_alias(__libc_mutexattr_init_stub,__libc_mutexattr_catchall_stub)
-__strong_alias(__libc_mutexattr_destroy_stub,__libc_mutexattr_catchall_stub)
-
-int
-__libc_mutex_init_stub(mutex_t *m, const mutexattr_t *a)
-{
-	/* LINTED deliberate lack of effect */
-	(void)m;
-	/* LINTED deliberate lack of effect */
-	(void)a;
-
-	CHECK_NOT_THREADED();
-
-	return (0);
-}
-
-int
-__libc_mutex_catchall_stub(mutex_t *m)
-{
-	/* LINTED deliberate lack of effect */
-	(void)m;
-
-	CHECK_NOT_THREADED();
-
-	return (0);
-}
-
-int
-__libc_mutexattr_settype_stub(mutexattr_t *ma, int type)
-{
-	/* LINTED deliberate lack of effect */
-	(void)ma;
-	/* LINTED deliberate lack of effect */
-	(void)type;
-
-	return (0);
-}
-
-int
-__libc_mutexattr_catchall_stub(mutexattr_t *ma)
-{
-	/* LINTED deliberate lack of effect */
-	(void)ma;
-
-	CHECK_NOT_THREADED();
-
-	return (0);
-}
-
-/* condition variables */
-
-int __libc_cond_catchall_stub(cond_t *);
-
-__weak_alias(__libc_cond_init,__libc_cond_init_stub)
-__weak_alias(__libc_cond_signal,__libc_cond_catchall_stub)
-__weak_alias(__libc_cond_broadcast,__libc_cond_catchall_stub)
-__weak_alias(__libc_cond_wait,__libc_cond_catchall_stub)
-__weak_alias(__libc_cond_timedwait,__libc_cond_timedwait_stub)
-__weak_alias(__libc_cond_destroy,__libc_cond_catchall_stub)
-
-__strong_alias(__libc_cond_signal_stub,__libc_cond_catchall_stub)
-__strong_alias(__libc_cond_broadcast_stub,__libc_cond_catchall_stub)
-__strong_alias(__libc_cond_destroy_stub,__libc_cond_catchall_stub)
-
-int
-__libc_cond_init_stub(cond_t *c, const condattr_t *a)
-{
-	/* LINTED deliberate lack of effect */
-	(void)c;
-	/* LINTED deliberate lack of effect */
-	(void)a;
-
-	CHECK_NOT_THREADED();
-
-	return (0);
-}
-
-int
-__libc_cond_wait_stub(cond_t *c, mutex_t *m)
-{
-	/* LINTED deliberate lack of effect */
-	(void)c;
-	/* LINTED deliberate lack of effect */
-	(void)m;
-
-	CHECK_NOT_THREADED();
-
-	return (0);
-}
-
-int
-__libc_cond_timedwait_stub(cond_t *c, mutex_t *m, const struct timespec *t)
-{
-	/* LINTED deliberate lack of effect */
-	(void)c;
-	/* LINTED deliberate lack of effect */
-	(void)m;
-	/* LINTED deliberate lack of effect */
-	(void)t;
-
-	CHECK_NOT_THREADED();
-
-	return (0);
-}
-
-int
-__libc_cond_catchall_stub(cond_t *c)
-{
-	/* LINTED deliberate lack of effect */
-	(void)c;
-
-	CHECK_NOT_THREADED();
-
-	return (0);
-}
-
-
-/* read-write locks */
-
-int __libc_rwlock_catchall_stub(rwlock_t *);
-
-__weak_alias(__libc_rwlock_init,__libc_rwlock_init_stub)
-__weak_alias(__libc_rwlock_rdlock,__libc_rwlock_catchall_stub)
-__weak_alias(__libc_rwlock_wrlock,__libc_rwlock_catchall_stub)
-__weak_alias(__libc_rwlock_tryrdlock,__libc_rwlock_catchall_stub)
-__weak_alias(__libc_rwlock_trywrlock,__libc_rwlock_catchall_stub)
-__weak_alias(__libc_rwlock_unlock,__libc_rwlock_catchall_stub)
-__weak_alias(__libc_rwlock_destroy,__libc_rwlock_catchall_stub)
-
-__strong_alias(__libc_rwlock_rdlock_stub,__libc_rwlock_catchall_stub)
-__strong_alias(__libc_rwlock_wrlock_stub,__libc_rwlock_catchall_stub)
-__strong_alias(__libc_rwlock_tryrdlock_stub,__libc_rwlock_catchall_stub)
-__strong_alias(__libc_rwlock_trywrlock_stub,__libc_rwlock_catchall_stub)
-__strong_alias(__libc_rwlock_unlock_stub,__libc_rwlock_catchall_stub)
-__strong_alias(__libc_rwlock_destroy_stub,__libc_rwlock_catchall_stub)
-
-
-int
-__libc_rwlock_init_stub(rwlock_t *l, const rwlockattr_t *a)
-{
-	/* LINTED deliberate lack of effect */
-	(void)l;
-	/* LINTED deliberate lack of effect */
-	(void)a;
-
-	CHECK_NOT_THREADED();
-
-	return (0);
-}
-
-int
-__libc_rwlock_catchall_stub(rwlock_t *l)
-{
-	/* LINTED deliberate lack of effect */
-	(void)l;
-
-	CHECK_NOT_THREADED();
-
-	return (0);
-}
-
-
-/*
- * thread-specific data; we need to actually provide a simple TSD
- * implementation, since some thread-safe libraries want to use it.
- */
-
-#define	TSD_KEYS_MAX	64
-
-static struct {
-	void *tsd_val;
-	void (*tsd_dtor)(void *);
-	int tsd_inuse;
-} __libc_tsd[TSD_KEYS_MAX];
-static int __libc_tsd_nextkey;
-
-__weak_alias(__libc_thr_keycreate,__libc_thr_keycreate_stub)
-__weak_alias(__libc_thr_setspecific,__libc_thr_setspecific_stub)
-__weak_alias(__libc_thr_getspecific,__libc_thr_getspecific_stub)
-__weak_alias(__libc_thr_keydelete,__libc_thr_keydelete_stub)
-
-int
-__libc_thr_keycreate_stub(thread_key_t *k, void (*d)(void *))
-{
-	int i;
-
-	for (i = __libc_tsd_nextkey; i < TSD_KEYS_MAX; i++) {
-		if (__libc_tsd[i].tsd_inuse == 0)
-			goto out;
-	}
-
-	for (i = 0; i < __libc_tsd_nextkey; i++) {
-		if (__libc_tsd[i].tsd_inuse == 0)
-			goto out;
-	}
-
-	return (EAGAIN);
-
- out:
-	/*
-	 * XXX We don't actually do anything with the destructor.  We
-	 * XXX probably should.
-	 */
-	__libc_tsd[i].tsd_inuse = 1;
-	__libc_tsd_nextkey = (i + i) % TSD_KEYS_MAX;
-	__libc_tsd[i].tsd_dtor = d;
-	*k = i;
-
-	return (0);
-}
-
-int
-__libc_thr_setspecific_stub(thread_key_t k, const void *v)
-{
-
-	__libc_tsd[k].tsd_val = __UNCONST(v);
-
-	return (0);
-}
-
-void *
-__libc_thr_getspecific_stub(thread_key_t k)
-{
-
-	return (__libc_tsd[k].tsd_val);
-}
-
-int
-__libc_thr_keydelete_stub(thread_key_t k)
-{
-
-	/*
-	 * XXX Do not recycle key; see big comment in libpthread.
-	 */
-
-	__libc_tsd[k].tsd_dtor = NULL;
-
-	return (0);
-}
-
-
-/* misc. */
-
-__weak_alias(__libc_thr_once,__libc_thr_once_stub)
-__weak_alias(__libc_thr_sigsetmask,__libc_thr_sigsetmask_stub)
-__weak_alias(__libc_thr_self,__libc_thr_self_stub)
-__weak_alias(__libc_thr_yield,__libc_thr_yield_stub)
-__weak_alias(__libc_thr_create,__libc_thr_create_stub)
-__weak_alias(__libc_thr_exit,__libc_thr_exit_stub)
-__weak_alias(__libc_thr_setcancelstate,__libc_thr_setcancelstate_stub)
-__weak_alias(__libc_thr_equal,__libc_thr_equal_stub)
-__weak_alias(__libc_thr_curcpu,__libc_thr_curcpu_stub)
-
-
-int
-__libc_thr_once_stub(once_t *o, void (*r)(void))
-{
-
-	/* XXX Knowledge of libpthread types. */
-
-	if (o->pto_done == 0) {
-		(*r)();
-		o->pto_done = 1;
-	}
-
-	return (0);
-}
-
-int
-__libc_thr_sigsetmask_stub(int h, const sigset_t *s, sigset_t *o)
-{
-
-	CHECK_NOT_THREADED();
-
-	return sigprocmask(h, s, o);
-}
-
-thr_t
-__libc_thr_self_stub(void)
-{
-
-	return ((thr_t) -1);
-}
-
-int
-__libc_thr_yield_stub(void)
-{
-
-	/* Nothing to do. */
-	return (0);
-}
-
-int
-__libc_thr_create_stub(thr_t *tp, const thrattr_t *ta,
-    void *(*f)(void *), void *a)
-{
-	/* LINTED deliberate lack of effect */
-	(void)tp;
-	/* LINTED deliberate lack of effect */
-	(void)ta;
-	/* LINTED deliberate lack of effect */
-	(void)f;
-	/* LINTED deliberate lack of effect */
-	(void)a;
-
-	DIE();
-
-	return (EOPNOTSUPP);
-}
-
-__dead void
-__libc_thr_exit_stub(void *v)
-{
-	/* LINTED deliberate lack of effect */
-	(void)v;
-	exit(0);
-}
-
-int
-__libc_thr_setcancelstate_stub(int new, int *old)
-{
-	/* LINTED deliberate lack of effect */
-	(void)new;
-
-	/* LINTED deliberate lack of effect */
-	(void)old;
-
-	CHECK_NOT_THREADED();
-
-	return (0);
-}
-
-int
-__libc_thr_equal_stub(pthread_t t1, pthread_t t2)
-{
-
-	/* assert that t1=t2=pthread_self() */
-	return (t1 == t2);
-}
-
-unsigned int
-__libc_thr_curcpu_stub(void)
-{
-
-	return (0);
-}
-
-#endif /* _REENTRANT */
diff --git a/lib/libc/time/Makefile b/lib/libc/time/Makefile
deleted file mode 100644
index 1d0a66fe0..000000000
--- a/lib/libc/time/Makefile
+++ /dev/null
@@ -1,666 +0,0 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# Package name for the code distribution.
-PACKAGE=	tzcode
-
-# Version numbers of the code and data distributions.
-VERSION=	2015g
-
-# Email address for bug reports.
-BUGEMAIL=	tz@iana.org
-
-# Change the line below for your time zone (after finding the zone you want in
-# the time zone files, or adding it to a time zone file).
-# Alternately, if you discover you've got the wrong time zone, you can just
-#	zic -l rightzone
-# to correct things.
-# Use the command
-#	make zonenames
-# to get a list of the values you can use for LOCALTIME.
-
-LOCALTIME=	GMT
-
-# If you want something other than Eastern United States time as a template
-# for handling POSIX-style time zone environment variables,
-# change the line below (after finding the zone you want in the
-# time zone files, or adding it to a time zone file).
-# (When a POSIX-style environment variable is handled, the rules in the
-# template file are used to determine "spring forward" and "fall back" days and
-# times; the environment variable itself specifies UT offsets of standard and
-# summer time.)
-# Alternately, if you discover you've got the wrong time zone, you can just
-#	zic -p rightzone
-# to correct things.
-# Use the command
-#	make zonenames
-# to get a list of the values you can use for POSIXRULES.
-# If you want POSIX compatibility, use "America/New_York".
-
-POSIXRULES=	America/New_York
-
-# Also see TZDEFRULESTRING below, which takes effect only
-# if the time zone files cannot be accessed.
-
-# Everything gets put in subdirectories of. . .
-
-TOPDIR=		/usr/local
-
-# "Compiled" time zone information is placed in the "TZDIR" directory
-# (and subdirectories).
-# Use an absolute path name for TZDIR unless you're just testing the software.
-
-TZDIR_BASENAME=	zoneinfo
-TZDIR=		$(TOPDIR)/etc/$(TZDIR_BASENAME)
-
-# Types to try, as an alternative to time_t.  int64_t should be first.
-TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
-
-# The "tzselect", "zic", and "zdump" commands get installed in. . .
-
-ETCDIR=		$(TOPDIR)/etc
-
-# If you "make INSTALL", the "date" command gets installed in. . .
-
-BINDIR=		$(TOPDIR)/bin
-
-# Manual pages go in subdirectories of. . .
-
-MANDIR=		$(TOPDIR)/man
-
-# Library functions are put in an archive in LIBDIR.
-
-LIBDIR=		$(TOPDIR)/lib
-
-# If you always want time values interpreted as "seconds since the epoch
-# (not counting leap seconds)", use
-#	REDO=		posix_only
-# below.  If you always want right time values interpreted as "seconds since
-# the epoch" (counting leap seconds)", use
-#	REDO=		right_only
-# below.  If you want both sets of data available, with leap seconds not
-# counted normally, use
-#	REDO=		posix_right
-# below.  If you want both sets of data available, with leap seconds counted
-# normally, use
-#	REDO=		right_posix
-# below.  If you want just POSIX-compatible time values, but with
-# out-of-scope and often-wrong data from the file 'backzone', use
-#	REDO=		posix_packrat
-# POSIX mandates that leap seconds not be counted; for compatibility with it,
-# use "posix_only", "posix_right", or "posix_packrat".
-
-REDO=		posix_right
-
-# Since "." may not be in PATH...
-
-YEARISTYPE=	./yearistype
-
-# Non-default libraries needed to link.
-# Add -lintl if you want to use 'gettext' on Solaris.
-LDLIBS=
-
-# Add the following to the end of the "CFLAGS=" line as needed.
-#  -DBIG_BANG=-9999999LL if the Big Bang occurred at time -9999999 (see zic.c)
-#  -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS)
-#  -DHAVE_GETTEXT=1 if 'gettext' works (GNU, Linux, Solaris); also see LDLIBS
-#  -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares
-#	ctime_r and asctime_r incompatibly with the POSIX standard (Solaris 8).
-#  -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h"
-#  -DHAVE_LINK=0 if your system lacks a link function
-#  -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function
-#  -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz
-#	This defaults to 1 if a working localtime_rz seems to be available.
-#	localtime_rz can make zdump significantly faster, but is nonstandard.
-#  -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with "stdint.h"
-#  -DHAVE_STRFTIME_L=1 if <time.h> declares locale_t and strftime_l
-#	This defaults to 0 if _POSIX_VERSION < 200809, 1 otherwise.
-#  -DHAVE_STRDUP=0 if your system lacks the strdup function
-#  -DHAVE_SYMLINK=0 if your system lacks the symlink function
-#  -DHAVE_SYS_STAT_H=0 if your compiler lacks a "sys/stat.h"
-#  -DHAVE_SYS_WAIT_H=0 if your compiler lacks a "sys/wait.h"
-#  -DHAVE_TZSET=0 if your system lacks a tzset function
-#  -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?)
-#  -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1
-#	if you do not want run time warnings about formats that may cause
-#	year 2000 grief
-#  -Dssize_t=long on ancient hosts that lack ssize_t
-#  -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires;
-#	not needed by the main-program tz code, which is single-threaded.
-#	Append other compiler flags as needed, e.g., -pthread on GNU/Linux.
-#  -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t
-#  -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz"
-#  -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory;
-#	the default is system-supplied, typically "/usr/lib/locale"
-#  -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified
-#  -DUNINIT_TRAP=1 if reading uninitialized storage can cause problems
-#	other than simply getting garbage data
-#  -DUSE_LTZ=0 to build zdump with the system time zone library
-#	Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
-#  -DNO_ERROR_IN_DST_GAP=1
-#	if you want mktime() not to return an error in the DST gap.
-#  -DZIC_MAX_ABBR_LEN_WO_WARN=3
-#	(or some other number) to set the maximum time zone abbreviation length
-#	that zic will accept without a warning (the default is 6)
-#  $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking
-GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \
-	-Wall -Wextra \
-	-Wbad-function-cast -Wcast-align -Wdate-time \
-	-Wdeclaration-after-statement \
-	-Wdouble-promotion \
-	-Wformat=2 -Winit-self -Wjump-misses-init \
-	-Wlogical-op -Wmissing-prototypes -Wnested-externs \
-	-Wold-style-definition -Woverlength-strings -Wpointer-arith \
-	-Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \
-	-Wsuggest-attribute=format -Wsuggest-attribute=noreturn \
-	-Wsuggest-attribute=pure -Wtrampolines \
-	-Wunused -Wwrite-strings \
-	-Wno-address -Wno-format-nonliteral -Wno-sign-compare \
-	-Wno-type-limits -Wno-unused-parameter
-#
-# If you want to use System V compatibility code, add
-#	-DUSG_COMPAT
-# to the end of the "CFLAGS=" line.  This arrange for "timezone" and "daylight"
-# variables to be kept up-to-date by the time conversion functions.  Neither
-# "timezone" nor "daylight" is described in X3J11's work.
-#
-# If your system has a "GMT offset" field in its "struct tm"s
-# (or if you decide to add such a field in your system's "time.h" file),
-# add the name to a define such as
-#	-DTM_GMTOFF=tm_gmtoff
-# to the end of the "CFLAGS=" line.  If not defined, the code attempts to
-# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this.
-# Similarly, if your system has a "zone abbreviation" field, define
-#	-DTM_ZONE=tm_zone
-# and define NO_TM_ZONE to suppress any guessing.  These two fields are not
-# required by POSIX, but are widely available on GNU/Linux and BSD systems.
-#
-# If you want functions that were inspired by early versions of X3J11's work,
-# add
-#	-DSTD_INSPIRED
-# to the end of the "CFLAGS=" line.  This arranges for the functions
-# "tzsetwall", "offtime", "timelocal", "timegm", "timeoff",
-# "posix2time", and "time2posix" to be added to the time conversion library.
-# "tzsetwall" is like "tzset" except that it arranges for local wall clock
-# time (rather than the time specified in the TZ environment variable)
-# to be used.
-# "offtime" is like "gmtime" except that it accepts a second (long) argument
-# that gives an offset to add to the time_t when converting it.
-# "timelocal" is equivalent to "mktime".
-# "timegm" is like "timelocal" except that it turns a struct tm into
-# a time_t using UT (rather than local time as "timelocal" does).
-# "timeoff" is like "timegm" except that it accepts a second (long) argument
-# that gives an offset to use when converting to a time_t.
-# "posix2time" and "time2posix" are described in an included manual page.
-# X3J11's work does not describe any of these functions.
-# Sun has provided "tzsetwall", "timelocal", and "timegm" in SunOS 4.0.
-# These functions may well disappear in future releases of the time
-# conversion package.
-#
-# If you don't want functions that were inspired by NetBSD, add
-#	-DNETBSD_INSPIRED=0
-# to the end of the "CFLAGS=" line.  Otherwise, the functions
-# "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the
-# time library, and if STD_INSPIRED is also defined the functions
-# "posix2time_z" and "time2posix_z" are added as well.
-# The functions ending in "_z" (or "_rz") are like their unsuffixed
-# (or suffixed-by-"_r") counterparts, except with an extra first
-# argument of opaque type timezone_t that specifies the time zone.
-# "tzalloc" allocates a timezone_t value, and "tzfree" frees it.
-#
-# If you want to allocate state structures in localtime, add
-#	-DALL_STATE
-# to the end of the "CFLAGS=" line.  Storage is obtained by calling malloc.
-#
-# If you want an "altzone" variable (a la System V Release 3.1), add
-#	-DALTZONE
-# to the end of the "CFLAGS=" line.
-# This variable is not described in X3J11's work.
-#
-# NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put
-# out by the National Institute of Standards and Technology
-# which claims to test C and Posix conformance.  If you want to pass PCTS, add
-#	-DPCTS
-# to the end of the "CFLAGS=" line.
-#
-# If you want strict compliance with XPG4 as of 1994-04-09, add
-#	-DXPG4_1994_04_09
-# to the end of the "CFLAGS=" line.  This causes "strftime" to always return
-# 53 as a week number (rather than 52 or 53) for those days in January that
-# before the first Monday in January when a "%V" format is used and January 1
-# falls on a Friday, Saturday, or Sunday.
-
-CFLAGS=
-
-# Linker flags.  Default to $(LFLAGS) for backwards compatibility
-# to tzcode2012h and earlier.
-
-LDFLAGS=	$(LFLAGS)
-
-zic=		./zic
-ZIC=		$(zic) $(ZFLAGS)
-
-ZFLAGS=
-
-# The name of a Posix-compliant 'awk' on your system.
-AWK=		awk
-
-# The full path name of a Posix-compliant shell, preferably one that supports
-# the Korn shell's 'select' statement as an extension.
-# These days, Bash is the most popular.
-# It should be OK to set this to /bin/sh, on platforms where /bin/sh
-# lacks 'select' or doesn't completely conform to Posix, but /bin/bash
-# is typically nicer if it works.
-KSHELL=		/bin/bash
-
-# The path where SGML DTDs are kept and the catalog file(s) to use when
-# validating.  The default is appropriate for Ubuntu 13.10.
-SGML_TOPDIR= /usr
-SGML_DTDDIR= $(SGML_TOPDIR)/share/xml/w3c-sgml-lib/schema/dtd
-SGML_SEARCH_PATH= $(SGML_DTDDIR)/REC-html401-19991224
-SGML_CATALOG_FILES= \
-  $(SGML_TOPDIR)/share/doc/w3-recs/html/www.w3.org/TR/1999/REC-html401-19991224/HTML4.cat
-
-# The name, arguments and environment of a program to validate your web pages.
-# See <http://www.jclark.com/sp/> for a validator, and
-# <http://validator.w3.org/source/> for a validation library.
-VALIDATE = nsgmls
-VALIDATE_FLAGS = -s -B -wall -wno-unused-param
-VALIDATE_ENV = \
-  SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
-  SGML_SEARCH_PATH=$(SGML_SEARCH_PATH) \
-  SP_CHARSET_FIXED=YES \
-  SP_ENCODING=UTF-8
-
-# This expensive test requires USE_LTZ.
-# To suppress it, define this macro to be empty.
-CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives
-
-# SAFE_CHAR is a regular expression that matches a safe character.
-# Some parts of this distribution are limited to safe characters;
-# others can use any UTF-8 character.
-# For now, the safe characters are a safe subset of ASCII.
-# The caller must set the shell variable 'sharp' to the character '#',
-# since Makefile macros cannot contain '#'.
-# TAB_CHAR is a single tab character, in single quotes.
-TAB_CHAR=	'	'
-SAFE_CHARSET1=	$(TAB_CHAR)' !\"'$$sharp'$$%&'\''()*+,./0123456789:;<=>?@'
-SAFE_CHARSET2=	'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`'
-SAFE_CHARSET3=	'abcdefghijklmnopqrstuvwxyz{|}~'
-SAFE_CHARSET=	$(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3)
-SAFE_CHAR=	'[]'$(SAFE_CHARSET)'-]'
-
-# OK_CHAR matches any character allowed in the distributed files.
-# This is the same as SAFE_CHAR, except that multibyte letters are
-# also allowed so that commentary can contain people's names and quote
-# non-English sources.  For non-letters the sources are limited to
-# ASCII renderings for the convenience of maintainers whose text editors
-# mishandle UTF-8 by default (e.g., XEmacs 21.4.22).
-OK_CHAR=	'[][:alpha:]'$(SAFE_CHARSET)'-]'
-
-# SAFE_LINE matches a line of safe characters.
-# SAFE_SHARP_LINE is similar, except any OK character can follow '#';
-# this is so that comments can contain non-ASCII characters.
-# OK_LINE matches a line of OK characters.
-SAFE_LINE=	'^'$(SAFE_CHAR)'*$$'
-SAFE_SHARP_LINE='^'$(SAFE_CHAR)'*('$$sharp$(OK_CHAR)'*)?$$'
-OK_LINE=	'^'$(OK_CHAR)'*$$'
-
-# Flags to give 'tar' when making a distribution.
-# Try to use flags appropriate for GNU tar.
-GNUTARFLAGS=	--numeric-owner --owner=0 --group=0 --mode=go+u,go-w
-TARFLAGS=	`if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \
-		 then echo $(GNUTARFLAGS); \
-		 else :; \
-		 fi`
-
-# Flags to give 'gzip' when making a distribution.
-GZIPFLAGS=	-9 ${GZIP_N_FLAG}
-
-###############################################################################
-
-#MAKE=		make
-
-cc=		cc
-CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
-
-AR=		ar
-
-# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib.
-RANLIB=		:
-
-TZCOBJS=	zic.o
-TZDOBJS=	zdump.o localtime.o asctime.o
-DATEOBJS=	date.o localtime.o strftime.o asctime.o
-LIBSRCS=	localtime.c asctime.c difftime.c
-LIBOBJS=	localtime.o asctime.o difftime.o
-HEADERS=	tzfile.h private.h
-NONLIBSRCS=	zic.c zdump.c
-NEWUCBSRCS=	date.c strftime.c
-SOURCES=	$(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \
-			tzselect.ksh workman.sh
-MANS=		newctime.3 newstrftime.3 newtzset.3 time2posix.3 \
-			tzfile.5 tzselect.8 zic.8 zdump.8
-MANTXTS=	newctime.3.txt newstrftime.3.txt newtzset.3.txt \
-			time2posix.3.txt \
-			tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
-			date.1.txt
-COMMON=		CONTRIBUTING Makefile NEWS README Theory
-WEB_PAGES=	tz-art.htm tz-link.htm
-DOCS=		$(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
-PRIMARY_YDATA=	africa antarctica asia australasia \
-		europe northamerica southamerica
-YDATA=		$(PRIMARY_YDATA) pacificnew etcetera backward
-NDATA=		systemv factory
-TDATA=		$(YDATA) $(NDATA)
-ZONETABLES=	zone1970.tab zone.tab
-TABDATA=	iso3166.tab leapseconds $(ZONETABLES)
-LEAP_DEPS=	leapseconds.awk leap-seconds.list
-DATA=		$(YDATA) $(NDATA) backzone $(TABDATA) \
-			leap-seconds.list yearistype.sh
-AWK_SCRIPTS=	checklinks.awk checktab.awk leapseconds.awk
-MISC=		$(AWK_SCRIPTS) zoneinfo2tdf.pl
-ENCHILADA=	$(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC)
-
-# And for the benefit of csh users on systems that assume the user
-# shell should be used to handle commands in Makefiles. . .
-
-SHELL=		/bin/sh
-
-all:		tzselect zic zdump libtz.a $(TABDATA)
-
-ALL:		all date $(ENCHILADA)
-
-install:	all $(DATA) $(REDO) $(MANS)
-		mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
-			$(DESTDIR)$(LIBDIR) \
-			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
-			$(DESTDIR)$(MANDIR)/man8
-		$(ZIC) -y $(YEARISTYPE) \
-			-d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
-		cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
-		cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
-		cp libtz.a $(DESTDIR)$(LIBDIR)/.
-		$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
-		cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
-		cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
-		cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
-
-INSTALL:	ALL install date.1
-		mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
-		cp date $(DESTDIR)$(BINDIR)/.
-		cp -f date.1 $(DESTDIR)$(MANDIR)/man1/.
-
-version.h:
-		(echo 'static char const PKGVERSION[]="($(PACKAGE)) ";' && \
-		 echo 'static char const TZVERSION[]="$(VERSION)";' && \
-		 echo 'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";') >$@
-
-zdump:		$(TZDOBJS)
-		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS)
-
-zic:		$(TZCOBJS) yearistype
-		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS)
-
-yearistype:	yearistype.sh
-		cp yearistype.sh yearistype
-		chmod +x yearistype
-
-leapseconds:	$(LEAP_DEPS)
-		$(AWK) -f leapseconds.awk leap-seconds.list >$@
-
-posix_only:	zic $(TDATA)
-		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \
-			-L /dev/null $(TDATA)
-
-right_only:	zic leapseconds $(TDATA)
-		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \
-			-L leapseconds $(TDATA)
-
-# In earlier versions of this makefile, the other two directories were
-# subdirectories of $(TZDIR).  However, this led to configuration errors.
-# For example, with posix_right under the earlier scheme,
-# TZ='right/Australia/Adelaide' got you localtime with leap seconds,
-# but gmtime without leap seconds, which led to problems with applications
-# like sendmail that subtract gmtime from localtime.
-# Therefore, the other two directories are now siblings of $(TZDIR).
-# You must replace all of $(TZDIR) to switch from not using leap seconds
-# to using them, or vice versa.
-right_posix:	right_only leapseconds
-		rm -fr $(DESTDIR)$(TZDIR)-leaps
-		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
-		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
-			-L leapseconds $(TDATA)
-		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-			-L /dev/null $(TDATA)
-
-posix_right:	posix_only leapseconds
-		rm -fr $(DESTDIR)$(TZDIR)-posix
-		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
-		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-			-L /dev/null $(TDATA)
-		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
-			-L leapseconds $(TDATA)
-
-posix_packrat:	posix_only backzone
-		$(AWK) '/^Rule/' $(TDATA) | \
-		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \
-			-L /dev/null - backzone
-
-zones:		$(REDO)
-
-libtz.a:	$(LIBOBJS)
-		$(AR) ru $@ $(LIBOBJS)
-		$(RANLIB) $@
-
-date:		$(DATEOBJS)
-		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS)
-
-tzselect:	tzselect.ksh
-		sed \
-			-e 's|#!/bin/bash|#!$(KSHELL)|g' \
-			-e 's|AWK=[^}]*|AWK=$(AWK)|g' \
-			-e 's|\(PKGVERSION\)=.*|\1='\''($(PACKAGE)) '\''|' \
-			-e 's|\(REPORT_BUGS_TO\)=.*|\1=$(BUGEMAIL)|' \
-			-e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \
-			-e 's|\(TZVERSION\)=.*|\1=$(VERSION)|' \
-			<$? >$@
-		chmod +x $@
-
-check:		check_character_set check_white_space check_links check_sorted \
-		  check_tables check_web
-
-check_character_set: $(ENCHILADA)
-		LC_ALL=en_US.utf8 && export LC_ALL && \
-		sharp='#' && \
-		! grep -Env $(SAFE_LINE) Makefile $(MANS) date.1 $(MANTXTS) \
-			$(MISC) $(SOURCES) $(WEB_PAGES) && \
-		! grep -Env $(SAFE_SHARP_LINE) $(TDATA) backzone \
-			leapseconds yearistype.sh zone.tab && \
-		! grep -Env $(OK_LINE) $(ENCHILADA)
-
-check_white_space: $(ENCHILADA)
-		! grep -En ' '$(TAB_CHAR)"|$$(printf '[\f\r\v]')" $(ENCHILADA)
-		! grep -n '[[:space:]]$$' $(ENCHILADA)
-
-CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; }
-
-check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab
-		$(AWK) '/^Link/ {print $$3}' backward | LC_ALL=C sort -cu
-		$(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu
-		$(AWK) '/^[^#]/ {print $$1}' iso3166.tab | LC_ALL=C sort -cu
-		$(AWK) '/^[^#]/ {print $$1}' zone.tab | LC_ALL=C sort -c
-		$(AWK) '/^[^#]/ {print substr($$0, 1, 2)}' zone1970.tab | \
-		  LC_ALL=C sort -c
-		$(AWK) '/^[^#]/ $(CHECK_CC_LIST)' zone1970.tab | \
-		  LC_ALL=C sort -cu
-
-check_links:	checklinks.awk $(TDATA)
-		$(AWK) -f checklinks.awk $(TDATA)
-
-check_tables:	checktab.awk $(PRIMARY_YDATA) $(ZONETABLES)
-		for tab in $(ZONETABLES); do \
-		  $(AWK) -f checktab.awk -v zone_table=$$tab $(PRIMARY_YDATA) \
-		    || exit; \
-		done
-
-check_web:	$(WEB_PAGES)
-		$(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) $(WEB_PAGES)
-
-clean_misc:
-		rm -f core *.o *.out \
-		  date tzselect version.h zdump zic yearistype libtz.a
-clean:		clean_misc
-		rm -fr tzpublic
-
-maintainer-clean: clean
-		@echo 'This command is intended for maintainers to use; it'
-		@echo 'deletes files that may need special tools to rebuild.'
-		rm -f leapseconds $(MANTXTS) *.asc *.tar.gz
-
-names:
-		@echo $(ENCHILADA)
-
-public:		check check_public $(CHECK_TIME_T_ALTERNATIVES) \
-		tarballs signatures
-
-date.1.txt:	date.1
-newctime.3.txt:	newctime.3
-newstrftime.3.txt: newstrftime.3
-newtzset.3.txt:	newtzset.3
-time2posix.3.txt: time2posix.3
-tzfile.5.txt:	tzfile.5
-tzselect.8.txt:	tzselect.8
-zdump.8.txt:	zdump.8
-zic.8.txt:	zic.8
-
-$(MANTXTS):	workman.sh
-		LC_ALL=C sh workman.sh `expr $@ : '\(.*\)\.txt$$'` >$@
-
-# Set the time stamps to those of the git repository, if available,
-# and if the files have not changed since then.
-# This uses GNU 'touch' syntax 'touch -d@N FILE',
-# where N is the number of seconds since 1970.
-# If git or GNU 'touch' is absent, don't bother to sync with git timestamps.
-# Also, set the timestamp of each prebuilt file like 'leapseconds'
-# to be the maximum of the files it depends on.
-set-timestamps.out: $(ENCHILADA)
-		rm -f $@
-		if files=`git ls-files $(ENCHILADA)` && \
-		   touch -md @1 test.out; then \
-		  rm -f test.out && \
-		  for file in $$files; do \
-		    if git diff --quiet $$file; then \
-		      time=`git log -1 --format='tformat:%ct' $$file` && \
-		      touch -cmd @$$time $$file; \
-		    else \
-		      echo >&2 "$$file: warning: does not match repository"; \
-		    fi || exit; \
-		  done; \
-		fi
-		touch -cmr `ls -t $(LEAP_DEPS) | sed 1q` leapseconds
-		for file in `ls $(MANTXTS) | sed 's/\.txt$$//'`; do \
-		  touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \
-		    exit; \
-		done
-		touch $@
-
-# The zics below ensure that each data file can stand on its own.
-# We also do an all-files run to catch links to links.
-
-check_public:
-		$(MAKE) maintainer-clean
-		$(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL
-		mkdir tzpublic
-		for i in $(TDATA) ; do \
-		  $(zic) -v -d tzpublic $$i 2>&1 || exit; \
-		done
-		$(zic) -v -d tzpublic $(TDATA)
-		rm -fr tzpublic
-
-# Check that the code works under various alternative
-# implementations of time_t.
-check_time_t_alternatives:
-		if diff -q Makefile Makefile 2>/dev/null; then \
-		  quiet_option='-q'; \
-		else \
-		  quiet_option=''; \
-		fi && \
-		zones=`$(AWK) '/^[^#]/ { print $$3 }' <zone1970.tab` && \
-		for type in $(TIME_T_ALTERNATIVES); do \
-		  mkdir -p tzpublic/$$type && \
-		  $(MAKE) clean_misc && \
-		  $(MAKE) TOPDIR=`pwd`/tzpublic/$$type \
-		    CFLAGS='$(CFLAGS) -Dtime_tz='"'$$type'" \
-		    REDO='$(REDO)' \
-		    install && \
-		  diff $$quiet_option -r \
-		    tzpublic/int64_t/etc/zoneinfo \
-		    tzpublic/$$type/etc/zoneinfo && \
-		  case $$type in \
-		  int32_t) range=-2147483648,2147483647;; \
-		  uint32_t) range=0,4294967296;; \
-		  int64_t) continue;; \
-		  *u*) range=0,10000000000;; \
-		  *) range=-10000000000,10000000000;; \
-		  esac && \
-		  echo checking $$type zones ... && \
-		  tzpublic/int64_t/etc/zdump -V -t $$range $$zones \
-		      >tzpublic/int64_t.out && \
-		  tzpublic/$$type/etc/zdump -V -t $$range $$zones \
-		      >tzpublic/$$type.out && \
-		  diff -u tzpublic/int64_t.out tzpublic/$$type.out \
-		    || exit; \
-		done
-		rm -fr tzpublic
-
-tarballs:	tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz
-
-tzcode$(VERSION).tar.gz: set-timestamps.out
-		LC_ALL=C && export LC_ALL && \
-		tar $(TARFLAGS) -cf - \
-		    $(COMMON) $(DOCS) $(SOURCES) | \
-		  ${TOOL_GZIP} $(GZIPFLAGS) > $@
-
-tzdata$(VERSION).tar.gz: set-timestamps.out
-		LC_ALL=C && export LC_ALL && \
-		tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) | \
-		  ${TOOL_GZIP} $(GZIPFLAGS) > $@
-
-signatures:	tzcode$(VERSION).tar.gz.asc tzdata$(VERSION).tar.gz.asc
-
-tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz
-		gpg --armor --detach-sign $?
-
-tzdata$(VERSION).tar.gz.asc: tzdata$(VERSION).tar.gz
-		gpg --armor --detach-sign $?
-
-typecheck:
-		$(MAKE) clean
-		for i in "long long" unsigned; \
-		do \
-			$(MAKE) CFLAGS="-DTYPECHECK -D__time_t_defined -D_TIME_T \"-Dtime_t=$$i\"" ; \
-			./zdump -v Europe/Rome ; \
-			$(MAKE) clean ; \
-		done
-
-zonenames:	$(TDATA)
-		@$(AWK) '/^Zone/ { print $$2 } /^Link/ { print $$3 }' $(TDATA)
-
-asctime.o:	private.h tzfile.h
-date.o:		private.h
-difftime.o:	private.h
-localtime.o:	private.h tzfile.h
-strftime.o:	private.h tzfile.h
-zdump.o:	version.h
-zic.o:		private.h tzfile.h version.h
-
-.KEEP_STATE:
-
-.PHONY: ALL INSTALL all
-.PHONY: check check_character_set check_links
-.PHONY: check_public check_sorted check_tables
-.PHONY: check_time_t_alternatives check_web check_white_space clean clean_misc
-.PHONY: install maintainer-clean names posix_packrat posix_only posix_right
-.PHONY: public right_only right_posix signatures tarballs typecheck
-.PHONY: zonenames zones
diff --git a/lib/libc/time/Makefile.inc b/lib/libc/time/Makefile.inc
deleted file mode 100644
index c98822018..000000000
--- a/lib/libc/time/Makefile.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.21 2014/10/08 05:44:03 msaitoh Exp $
-
-.PATH: ${.CURDIR}/time
-
-SRCS+=	asctime.c difftime.c localtime.c getdate.c strftime.c strptime.c
-MAN+=	ctime.3 getdate.3 offtime.3 strftime.3 strptime.3		\
-	time2posix.3 tzfile.5 tzset.3
-CPPFLAGS+=-DALL_STATE -DUSG_COMPAT
-
-MLINKS+=ctime.3 ctime_r.3	\
-	ctime.3 asctime.3	\
-	ctime.3 asctime_r.3	\
-	ctime.3 ctime_rz.3	\
-	ctime.3 difftime.3	\
-	ctime.3 gmtime.3	\
-	ctime.3 gmtime_r.3	\
-	ctime.3 localtime.3	\
-	ctime.3 localtime_r.3	\
-	ctime.3 localtime_rz.3	\
-	ctime.3 mktime.3	\
-	ctime.3 mktime_z.3	\
-	getdate.3 getdate_err.3	\
-	offtime.3 offtime_r.3	\
-	offtime.3 timegm.3	\
-	offtime.3 timelocal.3	\
-	offtime.3 timeoff.3	\
-	strftime.3 strftime_z.3 \
-	time2posix.3 posix2time.3 \
-	time2posix.3 posix2time_z.3 \
-	time2posix.3 time2posix_z.3 \
-	tzset.3 tzgetname.3	\
-	tzset.3 daylight.3	\
-	tzset.3 tzalloc.3	\
-	tzset.3 tzfree.3	\
-	tzset.3 tzsetwall.3	
-
-COPTS.strftime.c = -Wno-format-nonliteral
diff --git a/lib/libc/time/NEWS b/lib/libc/time/NEWS
deleted file mode 100644
index 00d07cbb2..000000000
--- a/lib/libc/time/NEWS
+++ /dev/null
@@ -1,3295 +0,0 @@
-News for the tz database
-
-Release 2015g - 2015-10-01 00:39:51 -0700
-
-  Changes affecting future time stamps
-
-    Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.
-    (Thanks to Fatih.)
-
-    Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.
-    (Thanks to Alexander Krivenyshev.)
-
-    Fiji's 2016 fall-back transition is scheduled for January 17, not 24.
-    (Thanks to Ken Rylander.)
-
-    Fort Nelson, British Columbia will not fall back on 2015-11-01.  It has
-    effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
-    New zone America/Fort_Nelson.  (Thanks to Matt Johnson.)
-
-  Changes affecting past time stamps
-
-    Norfolk observed DST from 1974-10-27 02:00 to 1975-03-02 02:00.
-
-  Changes affecting code
-
-    localtime no longer mishandles America/Anchorage after 2037.
-    (Thanks to Bradley White for reporting the bug.)
-
-    The localtime module allows the variables 'timezone', 'daylight',
-    and 'altzone' to be in common storage shared with other modules,
-    and declares them in case the system <time.h> does not.
-    (Problems reported by Kees Dekker.)
-
-    On platforms with tm_zone, strftime.c now assumes it is not NULL.
-    This simplifies the code and is consistent with zdump.c.
-    (Problem reported by Christos Zoulas.)
-
-  Changes affecting documentation
-
-   The tzfile man page now documents that transition times denote the
-   starts (not the ends) of the corresponding time periods.
-   (Ambiguity reported by Bill Seymour.)
-
-
-Release 2015f - 2015-08-10 18:06:56 -0700
-
-  Changes affecting future time stamps
-
-    North Korea switches to +0830 on 2015-08-15.  (Thanks to Steffen Thorsen.)
-    The abbreviation remains "KST".  (Thanks to Robert Elz.)
-
-    Uruguay no longer observes DST.  (Thanks to Steffen Thorsen
-    and Pablo Camargo.)
-
-  Changes affecting past and future time stamps
-
-    Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC.
-    (Thanks to Roman Tudos.)
-
-  Changes affecting data format and code
-
-    zic's '-y YEARISTYPE' option is no longer documented.  The TYPE
-    field of a Rule line should now be '-'; the old values 'even',
-    'odd', 'uspres', 'nonpres', 'nonuspres' were already undocumented.
-    Although the implementation has not changed, these features do not
-    work in the default installation, they are not used in the data,
-    and they are now considered obsolescent.
-
-    zic now checks that two rules don't take effect at the same time.
-    (Thanks to Jon Skeet and Arthur David Olson.)  Constraints on
-    simultaneity are now documented.
-
-    The two characters '%z' in a zone format now stand for the UTC
-    offset, e.g., '-07' for seven hours behind UTC and '+0530' for
-    five hours and thirty minutes ahead.  This better supports time
-    zone abbreviations conforming to POSIX.1-2001 and later.
-
-  Changes affecting installed data files
-
-    Comments for America/Halifax and America/Glace_Bay have been improved.
-    (Thanks to Brian Inglis.)
-
-    Data entries have been simplified for Atlantic/Canary, Europe/Simferopol,
-    Europe/Sofia, and Europe/Tallinn.  This yields slightly smaller
-    installed data files for Europe/Simferopol and Europe/Tallinn.
-    It does not affect timestamps.  (Thanks to Howard Hinnant.)
-
-  Changes affecting code
-
-    zdump and zic no longer warn about valid time zone abbreviations
-    like '-05'.
-
-    Some Visual Studio 2013 warnings have been suppressed.
-    (Thanks to Kees Dekker.)
-
-    'date' no longer sets the time of day and its -a, -d, -n and -t
-    options have been removed.  Long obsolescent, the implementation
-    of these features had porting problems.  Builders no longer need
-    to configure HAVE_ADJTIME, HAVE_SETTIMEOFDAY, or HAVE_UTMPX_H.
-    (Thanks to Kees Dekker for pointing out the problem.)
-
-  Changes affecting documentation
-
-    The Theory file mentions naming issues earlier, as these seem to be
-    poorly publicized (thanks to Gilmore Davidson for reporting the problem).
-
-    tz-link.htm mentions Time Zone Database Parser (thanks to Howard Hinnant).
-
-    Mention that Herbert Samuel introduced the term "Summer Time".
-
-
-Release 2015e - 2015-06-13 10:56:02 -0700
-
-  Changes affecting future time stamps
-
-    Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
-    not 06-13 and 07-18 as we had guessed.  (Thanks to Milamber.)
-
-    Assume Cayman Islands will observe DST starting next year, using US rules.
-    Although it isn't guaranteed, it is the most likely.
-
-  Changes affecting data format
-
-    The file 'iso3166.tab' now uses UTF-8, so that its entries can better
-    spell the names of Åland Islands, Côte d'Ivoire, and Réunion.
-
-  Changes affecting code
-
-    When displaying data, tzselect converts it to the current locale's
-    encoding if the iconv command works.  (Problem reported by random832.)
-
-    tzselect no longer mishandles Dominica, fixing a bug introduced
-    in Release 2014f.  (Problem reported by Owen Leibman.)
-
-    zic -l no longer fails when compiled with -DTZDEFAULT=\"/etc/localtime\".
-    This fixes a bug introduced in Release 2014f.
-    (Problem reported by Leonardo Chiquitto.)
-
-
-Release 2015d - 2015-04-24 08:09:46 -0700
-
-  Changes affecting future time stamps
-
-    Egypt will not observe DST in 2015 and will consider canceling it
-    permanently.  For now, assume no DST indefinitely.
-    (Thanks to Ahmed Nazmy and Tim Parenti.)
-
-  Changes affecting past time stamps
-
-    America/Whitehorse switched from UTC-9 to UTC-8 on 1967-05-28, not
-    1966-07-01.  Also, Yukon's time zone history is documented better.
-    (Thanks to Brian Inglis and Dennis Ferguson.)
-
-  Change affecting past and future time zone abbreviations
-
-    The abbreviations for Hawaii-Aleutian standard and daylight times
-    have been changed from HAST/HADT to HST/HDT, as per US Government
-    Printing Office style.  This affects only America/Adak since 1983,
-    as America/Honolulu was already using the new style.
-
-  Changes affecting code
-
-   zic has some minor performance improvements.
-
-
-Release 2015c - 2015-04-11 08:55:55 -0700
-
-  Changes affecting future time stamps
-
-    Egypt's spring-forward transition is at 24:00 on April's last Thursday,
-    not 00:00 on April's last Friday.  2015's transition will therefore be on
-    Thursday, April 30 at 24:00, not Friday, April 24 at 00:00.  Similar fixes
-    apply to 2026, 2037, 2043, etc.  (Thanks to Steffen Thorsen.)
-
-  Changes affecting past time stamps
-
-    The following changes affect some pre-1991 Chile-related time stamps
-    in America/Santiago, Antarctica/Palmer, and Pacific/Easter.
-
-      The 1910 transition was January 10, not January 1.
-
-      The 1918 transition was September 10, not September 1.
-
-      The UTC-4 time observed from 1932 to 1942 is now considered to be
-      standard time, not year-round DST.
-
-      Santiago observed DST (UTC-3) from 1946-07-15 through 1946-08-31,
-      then reverted to standard time, then switched its time zone to
-      UTC-5 on 1947-04-01.
-
-      Assume transitions before 1968 were at 00:00, since we have no data
-      saying otherwise.
-
-      The spring 1988 transition was 1988-10-09, not 1988-10-02.
-      The fall 1990 transition was 1990-03-11, not 1990-03-18.
-
-      Assume no UTC offset change for Pacific/Easter on 1890-01-01,
-      and omit all transitions on Pacific/Easter from 1942 through 1946
-      since we have no data suggesting that they existed.
-
-    One more zone has been turned into a link, as it differed
-    from an existing zone only for older time stamps.  As usual,
-    this change affects UTC offsets in pre-1970 time stamps only.
-    The zone's old contents have been moved to the 'backzone' file.
-    The affected zone is America/Montreal.
-
-  Changes affecting commentary
-
-    Mention the TZUpdater tool.
-
-    Mention "The Time Now".  (Thanks to Brandon Ramsey.)
-
-
-Release 2015b - 2015-03-19 23:28:11 -0700
-
-  Changes affecting future time stamps
-
-    Mongolia will start observing DST again this year, from the last
-    Saturday in March at 02:00 to the last Saturday in September at 00:00.
-    (Thanks to Ganbold Tsagaankhuu.)
-
-    Palestine will start DST on March 28, not March 27.  Also,
-    correct the fall 2014 transition from September 26 to October 24.
-    Adjust future predictions accordingly.  (Thanks to Steffen Thorsen.)
-
-  Changes affecting past time stamps
-
-    The 1982 zone shift in Pacific/Easter has been corrected, fixing a 2015a
-    regression.  (Thanks to Stuart Bishop for reporting the problem.)
-
-    Some more zones have been turned into links, when they differed
-    from existing zones only for older time stamps.  As usual,
-    these changes affect UTC offsets in pre-1970 time stamps only.
-    Their old contents have been moved to the 'backzone' file.
-    The affected zones are: America/Antigua, America/Cayman,
-    Pacific/Midway, and Pacific/Saipan.
-
-  Changes affecting time zone abbreviations
-
-    Correct the 1992-2010 DST abbreviation in Volgograd from "MSK" to "MSD".
-    (Thanks to Hank W.)
-
-  Changes affecting code
-
-    Fix integer overflow bug in reference 'mktime' implementation.
-    (Problem reported by Jörg Richter.)
-
-    Allow -Dtime_tz=time_t compilations, and allow -Dtime_tz=... libraries
-    to be used in the same executable as standard-library time_t functions.
-    (Problems reported by Bradley White.)
-
-  Changes affecting commentary
-
-    Cite the recent Mexican decree changing Quintana Roo's time zone.
-    (Thanks to Carlos Raúl Perasso.)
-
-    Likewise for the recent Chilean decree.  (Thanks to Eduardo Romero Urra.)
-
-    Update info about Mars time.
-
-
-Release 2015a - 2015-01-29 22:35:20 -0800
-
-  Changes affecting future time stamps
-
-    The Mexican state of Quintana Roo, represented by America/Cancun,
-    will shift from Central Time with DST to Eastern Time without DST
-    on 2015-02-01 at 02:00.  (Thanks to Steffen Thorsen and Gwillim Law.)
-
-    Chile will not change clocks in April or thereafter; its new standard time
-    will be its old daylight saving time.  This affects America/Santiago,
-    Pacific/Easter, and Antarctica/Palmer.  (Thanks to Juan Correa.)
-
-    New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49.
-    (Thanks to Tim Parenti.)
-
-  Changes affecting past time stamps
-
-    Iceland observed DST in 1919 and 1921, and its 1939 fallback
-    transition was Oct. 29, not Nov. 29.  Remove incorrect data from
-    Shanks about time in Iceland between 1837 and 1908.
-
-    Some more zones have been turned into links, when they differed
-    from existing zones only for older time stamps.  As usual,
-    these changes affect UTC offsets in pre-1970 time stamps only.
-    Their old contents have been moved to the 'backzone' file.
-    The affected zones are: Asia/Aden, Asia/Bahrain, Asia/Kuwait,
-    and Asia/Muscat.
-
-  Changes affecting code
-
-    tzalloc now scrubs time zone abbreviations compatibly with the way
-    that tzset always has, by replacing invalid bytes with '_' and by
-    shortening too-long abbreviations.
-
-    tzselect ports to POSIX awk implementations, no longer mishandles
-    POSIX TZ settings when GNU awk is used, and reports POSIX TZ
-    settings to the user.  (Thanks to Stefan Kuhn.)
-
-  Changes affecting build procedure
-
-    'make check' now checks for links to links in the data.
-    One such link (for Africa/Asmera) has been fixed.
-    (Thanks to Stephen Colebourne for pointing out the problem.)
-
-  Changes affecting commentary
-
-    The leapseconds file commentary now mentions the expiration date.
-    (Problem reported by Martin Burnicki.)
-
-    Update Mexican Library of Congress URL.
-
-
-Release 2014j - 2014-11-10 17:37:11 -0800
-
-  Changes affecting current and future time stamps
-
-    Turks & Caicos' switch from US eastern time to UTC-4 year-round
-    did not occur on 2014-11-02 at 02:00.  It's currently scheduled
-    for 2015-11-01 at 02:00.  (Thanks to Chris Walton.)
-
-  Changes affecting past time stamps
-
-    Many pre-1989 time stamps have been corrected for Asia/Seoul and
-    Asia/Pyongyang, based on sources for the Korean-language Wikipedia
-    entry for time in Korea.  (Thanks to Sanghyuk Jung.)  Also, no
-    longer guess that Pyongyang mimicked Seoul time after World War II,
-    as this is politically implausible.
-
-    Some more zones have been turned into links, when they differed
-    from existing zones only for older time stamps.  As usual,
-    these changes affect UTC offsets in pre-1970 time stamps only.
-    Their old contents have been moved to the 'backzone' file.
-    The affected zones are: Africa/Addis_Ababa, Africa/Asmara,
-    Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala,
-    Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and
-    Indian/Mayotte.
-
-  Changes affecting commentary
-
-    The commentary is less enthusiastic about Shanks as a source,
-    and is more careful to distinguish UT from UTC.
-
-
-Release 2014i - 2014-10-21 22:04:57 -0700
-
-  Changes affecting future time stamps
-
-    Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00.
-    (Thanks to Ken Rylander for the heads-up.)  Guess that future
-    years will use a similar pattern.
-
-    A new Zone Pacific/Bougainville, for the part of Papua New Guinea
-    that plans to switch from UTC+10 to UTC+11 on 2014-12-28 at 02:00.
-    (Thanks to Kiley Walbom for the heads-up.)
-
-  Changes affecting time zone abbreviations
-
-    Since Belarus is not changing its clocks even though Moscow is,
-    the time zone abbreviation in Europe/Minsk is changing from FET
-    to its more-traditional value MSK on 2014-10-26 at 01:00.
-    (Thanks to Alexander Bokovoy for the heads-up about Belarus.)
-
-    The new abbreviation IDT stands for the pre-1976 use of UT+8 in
-    Indochina, to distinguish it better from ICT (UT+7).
-
-  Changes affecting past time stamps
-
-    Many time stamps have been corrected for Asia/Ho_Chi_Minh before 1976
-    (thanks to Trần Ng�c Quân for an indirect pointer to Trần Tiến Bình's
-    authoritative book).  Asia/Ho_Chi_Minh has been added to
-    zone1970.tab, to give tzselect users in Vietnam two choices,
-    since north and south Vietnam disagreed after our 1970 cutoff.
-
-    Asia/Phnom_Penh and Asia/Vientiane have been turned into links, as
-    they differed from existing zones only for older time stamps.  As
-    usual, these changes affect pre-1970 time stamps only.  Their old
-    contents have been moved to the 'backzone' file.
-
-  Changes affecting code
-
-    The time-related library functions now set errno on failure, and
-    some crashes in the new tzalloc-related library functions have
-    been fixed.  (Thanks to Christos Zoulas for reporting most of
-    these problems and for suggesting fixes.)
-
-    If USG_COMPAT is defined and the requested time stamp is standard time,
-    the tz library's localtime and mktime functions now set the extern
-    variable timezone to a value appropriate for that time stamp; and
-    similarly for ALTZONE, daylight saving time, and the altzone variable.
-    This change is a companion to the tzname change in 2014h, and is
-    designed to make timezone and altzone more compatible with tzname.
-
-    The tz library's functions now set errno to EOVERFLOW if they fail
-    because the result cannot be represented.  ctime and ctime_r now
-    return NULL and set errno when a time stamp is out of range, rather
-    than having undefined behavior.
-
-    Some bugs associated with the new 2014g functions have been fixed.
-    This includes a bug that largely incapacitated the new functions
-    time2posix_z and posix2time_z.  (Thanks to Christos Zoulas.)
-    It also includes some uses of uninitialized variables after tzalloc.
-    The new code uses the standard type 'ssize_t', which the Makefile
-    now gives porting advice about.
-
-  Changes affecting commentary
-
-    Updated URLs for NRC Canada (thanks to Matt Johnson and Brian Inglis).
-
-
-Release 2014h - 2014-09-25 18:59:03 -0700
-
-  Changes affecting past time stamps
-
-    America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28.
-
-    Shanks says Asia/Novokuznetsk switched from LMT (not "NMT") on 1924-05-01,
-    not 1920-01-06.  The old entry was based on a misinterpretation of Shanks.
-
-    Some more zones have been turned into links, when they differed
-    from existing zones only for older time stamps.  As usual,
-    these changes affect UTC offsets in pre-1970 time stamps only.
-    Their old contents have been moved to the 'backzone' file.
-    The affected zones are: Africa/Blantyre, Africa/Bujumbura,
-    Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi,
-    Africa/Lusaka, Africa/Maseru, and Africa/Mbabane.
-
-  Changes affecting code
-
-    zdump -V and -v now output gmtoff= values on all platforms,
-    not merely on platforms defining TM_GMTOFF.
-
-    The tz library's localtime and mktime functions now set tzname to a value
-    appropriate for the requested time stamp, and zdump now uses this
-    on platforms not defining TM_ZONE, fixing a 2014g regression.
-    (Thanks to Tim Parenti for reporting the problem.)
-
-    The tz library no longer sets tzname if localtime or mktime fails.
-
-    zdump -c no longer mishandles transitions near year boundaries.
-    (Thanks to Tim Parenti for reporting the problem.)
-
-    An access to uninitalized data has been fixed.
-    (Thanks to Jörg Richter for reporting the problem.)
-
-    When THREAD_SAFE is defined, the code ports to the C11 memory model.
-    A memory leak has been fixed if ALL_STATE and THREAD_SAFE are defined
-    and two threads race to initialize data used by gmtime-like functions.
-    (Thanks to Andy Heninger for reporting the problems.)
-
-  Changes affecting build procedure
-
-    'make check' now checks better for properly-sorted data.
-
-  Changes affecting documentation and commentary
-
-    zdump's gmtoff=N output is now documented, and its isdst=D output
-    is now documented to possibly output D values other than 0 or 1.
-
-    zdump -c's treatment of years is now documented to use the
-    Gregorian calendar and Universal Time without leap seconds,
-    and its behavior at cutoff boundaries is now documented better.
-    (Thanks to Arthur David Olson and Tim Parenti for reporting the problems.)
-
-    Programs are now documented to use the proleptic Gregorian calendar.
-    (Thanks to Alan Barrett for the suggestion.)
-
-    Fractional-second GMT offsets have been documented for civil time
-    in 19th-century Chennai, Jakarta, and New York.
-
-
-Release 2014g - 2014-08-28 12:31:23 -0700
-
-  Changes affecting future time stamps
-
-    Turks & Caicos is switching from US eastern time to UTC-4 year-round,
-    modeled as a switch from EST/EDT to AST on 2014-11-02 at 02:00.
-    [As noted in 2014j, this switch was later delayed.]
-
-  Changes affecting past time stamps
-
-    Time in Russia or the USSR before 1926 or so has been corrected by
-    a few seconds in the following zones: Asia/Irkutsk,
-    Asia/Krasnoyarsk, Asia/Omsk, Asia/Samarkand, Asia/Tbilisi,
-    Asia/Vladivostok, Asia/Yakutsk, Europe/Riga, Europe/Samara.  For
-    Asia/Yekaterinburg the correction is a few minutes.  (Thanks to
-    Vladimir Karpinsky.)
-
-    The Portuguese decree of 1911-05-26 took effect on 1912-01-01.
-    This affects 1911 time stamps in Africa/Bissau, Africa/Luanda,
-    Atlantic/Azores, and Atlantic/Madeira.  Also, Lisbon's pre-1912
-    GMT offset was -0:36:45 (rounded from -0:36:44.68), not -0:36:32.
-    (Thanks to Stephen Colebourne for pointing to the decree.)
-
-    Asia/Dhaka ended DST on 2009-12-31 at 24:00, not 23:59.
-
-    A new file 'backzone' contains data which may appeal to
-    connoisseurs of old time stamps, although it is out of scope for
-    the tz database, is often poorly sourced, and contains some data
-    that is known to be incorrect.  The new file is not recommended
-    for ordinary use and its entries are not installed by default.
-    (Thanks to Lester Caine for the high-quality Jersey, Guernsey, and
-    Isle of Man entries.)
-
-    Some more zones have been turned into links, when they differed
-    from existing zones only for older time stamps.  As usual,
-    these changes affect UTC offsets in pre-1970 time stamps only.
-    Their old contents have been moved to the 'backzone' file.
-    The affected zones are: Africa/Bangui, Africa/Brazzaville,
-    Africa/Douala, Africa/Kinshasa, Africa/Libreville, Africa/Luanda,
-    Africa/Malabo, Africa/Niamey, and Africa/Porto-Novo.
-
-  Changes affecting code
-
-    Unless NETBSD_INSPIRED is defined to 0, the tz library now
-    supplies functions for creating and using objects that represent
-    time zones. The new functions are tzalloc, tzfree, localtime_rz,
-    mktime_z, and (if STD_INSPIRED is also defined) posix2time_z and
-    time2posix_z.  They are intended for performance: for example,
-    localtime_rz (unlike localtime_r) is trivially thread-safe without
-    locking.  (Thanks to Christos Zoulas for proposing NetBSD-inspired
-    functions, and to Alan Barrett and Jonathan Lennox for helping to
-    debug the change.)
-
-    zdump now builds with the tz library unless USE_LTZ is defined to 0,
-    This lets zdump use tz features even if the system library lacks them.
-    To build zdump with the system library, use 'make CFLAGS=-DUSE_LTZ=0
-    TZDOBJS=zdump.o CHECK_TIME_T_ALTERNATIVES='.
-
-    zdump now uses localtime_rz if available, as it's significantly faster,
-    and it can help zdump better diagnose invalid time zone names.
-    Define HAVE_LOCALTIME_RZ to 0 to suppress this.  HAVE_LOCALTIME_RZ
-    defaults to 1 if NETBSD_INSPIRED && USE_LTZ.  When localtime_rz is
-    not available, zdump now uses localtime_r and tzset if available,
-    as this is a bit cleaner and faster than plain localtime.  Compile
-    with -DHAVE_LOCALTIME_R=0 and/or -DHAVE_TZSET=0 if your system
-    lacks these two functions.
-
-    If THREAD_SAFE is defined to 1, the tz library is now thread-safe.
-    Although not needed for tz's own applications, which are single-threaded,
-    this supports POSIX better if the tz library is used in multithreaded apps.
-
-    Some crashes have been fixed when zdump or the tz library is given
-    invalid or outlandish input.
-
-    The tz library no longer mishandles leap seconds on platforms with
-    unsigned time_t in time zones that lack ordinary transitions after 1970.
-
-    The tz code now attempts to infer TM_GMTOFF and TM_ZONE if not
-    already defined, to make it easier to configure on common platforms.
-    Define NO_TM_GMTOFF and NO_TM_ZONE to suppress this.
-
-    Unless the new macro UNINIT_TRAP is defined to 1, the tz code now
-    assumes that reading uninitialized memory yields garbage values
-    but does not cause other problems such as traps.
-
-    If TM_GMTOFF is defined and UNINIT_TRAP is 0, mktime is now
-    more likely to guess right for ambiguous time stamps near
-    transitions where tm_isdst does not change.
-
-    If HAVE_STRFTIME_L is defined to 1, the tz library now defines
-    strftime_l for compatibility with recent versions of POSIX.
-    Only the C locale is supported, though.  HAVE_STRFTIME_L defaults
-    to 1 on recent POSIX versions, and to 0 otherwise.
-
-    tzselect -c now uses a hybrid distance measure that works better
-    in Africa.  (Thanks to Alan Barrett for noting the problem.)
-
-    The C source code now ports to NetBSD when GCC_DEBUG_FLAGS is used,
-    or when time_tz is defined.
-
-    When HAVE_UTMPX_H is set the 'date' command now builds on systems
-    whose <utmpx.h> file does not define WTMPX_FILE, and when setting
-    the date it updates the wtmpx file if _PATH_WTMPX is defined.
-    This affects GNU/Linux and similar systems.
-
-    For easier maintenance later, some C code has been simplified,
-    some lint has been removed, and the code has been tweaked so that
-    plain 'make' is more likely to work.
-
-    The C type 'bool' is now used for boolean values, instead of 'int'.
-
-    The long-obsolete LOCALE_HOME code has been removed.
-
-    The long-obsolete 'gtime' function has been removed.
-
-  Changes affecting build procedure
-
-    'zdump' no longer links in ialloc.o, as it's not needed.
-
-    'make check_time_t_alternatives' no longer assumes GNU diff.
-
-  Changes affecting distribution tarballs
-
-    The files checktab.awk and zoneinfo2tdf.pl are now distributed in
-    the tzdata tarball instead of the tzcode tarball, since they help
-    maintain the data.  The NEWS and Theory files are now also
-    distributed in the tzdata tarball, as they're relevant for data.
-    (Thanks to Alan Barrett for pointing this out.)  Also, the
-    leapseconds.awk file is no longer distributed in the tzcode
-    tarball, since it belongs in the tzdata tarball (where 2014f
-    inadvertently also distributed it).
-
-  Changes affecting documentation and commentary
-
-    A new file CONTRIBUTING is distributed.  (Thanks to Tim Parenti for
-    suggesting a CONTRIBUTING file, and to Tony Finch and Walter Harms
-    for debugging it.)
-
-    The man pages have been updated to use function prototypes,
-    to document thread-safe variants like localtime_r, and to document
-    the NetBSD-inspired functions tzalloc, tzfree, localtime_rz, and
-    mktime_z.
-
-    The fields in Link lines have been renamed to be more descriptive
-    and more like the parameters of 'ln'.  LINK-FROM has become TARGET,
-    and LINK-TO has become LINK-NAME.
-
-    tz-link.htm mentions the IETF's tzdist working group; Windows
-    Runtime etc. (thanks to Matt Johnson); and HP-UX's tztab.
-
-    Some broken URLs have been fixed in the commentary.  (Thanks to
-    Lester Caine.)
-
-    Commentary about Philippines DST has been updated, and commentary
-    on pre-1970 time in India has been added.
-
-
-Release 2014f - 2014-08-05 17:42:36 -0700
-
-  Changes affecting future time stamps
-
-    Russia will subtract an hour from most of its time zones on 2014-10-26
-    at 02:00 local time.  (Thanks to Alexander Krivenyshev.)
-    There are a few exceptions: Magadan Oblast (Asia/Magadan) and Zabaykalsky
-    Krai are subtracting two hours; conversely, Chukotka Autonomous Okrug
-    (Asia/Anadyr), Kamchatka Krai (Asia/Kamchatka), Kemerovo Oblast
-    (Asia/Novokuznetsk), and the Samara Oblast and the Udmurt Republic
-    (Europe/Samara) are not changing their clocks.  The changed zones are
-    Europe/Kaliningrad, Europe/Moscow, Europe/Simferopol, Europe/Volgograd,
-    Asia/Yekaterinburg, Asia/Omsk, Asia/Novosibirsk, Asia/Krasnoyarsk,
-    Asia/Irkutsk, Asia/Yakutsk, Asia/Vladivostok, Asia/Khandyga,
-    Asia/Sakhalin, and Asia/Ust-Nera; Asia/Magadan will have two hours
-    subtracted; and Asia/Novokuznetsk's time zone abbreviation is affected,
-    but not its UTC offset.  Two zones are added: Asia/Chita (split
-    from Asia/Yakutsk, and also with two hours subtracted) and
-    Asia/Srednekolymsk (split from Asia/Magadan, but with only one hour
-    subtracted).  (Thanks to Tim Parenti for much of the above.)
-
-  Changes affecting time zone abbreviations
-
-    Australian eastern time zone abbreviations are now AEST/AEDT not EST,
-    and similarly for the other Australian zones.  That is, for eastern
-    standard and daylight saving time the abbreviations are AEST and AEDT
-    instead of the former EST for both; similarly, ACST/ACDT, ACWST/ACWDT,
-    and AWST/AWDT are now used instead of the former CST, CWST, and WST.
-    This change does not affect UTC offsets, only time zone abbreviations.
-    (Thanks to Rich Tibbett and many others.)
-
-    Asia/Novokuznetsk shifts from NOVT to KRAT (remaining on UTC+7)
-    effective 2014-10-26 at 02:00 local time.
-
-    The time zone abbreviation for Xinjiang Time (observed in Ürümqi)
-    has been changed from URUT to XJT.  (Thanks to Luther Ma.)
-
-    Prefer MSK/MSD for Moscow time in Russia, even in other cities.
-    Similarly, prefer EET/EEST for eastern European time in Russia.
-
-    Change time zone abbreviations in (western) Samoa to use "ST" and
-    "DT" suffixes, as this is more likely to match common practice.
-    Prefix "W" to (western) Samoa time when its standard-time offset
-    disagrees with that of American Samoa.
-
-    America/Metlakatla now uses PST, not MeST, to abbreviate its time zone.
-
-    Time zone abbreviations have been updated for Japan's two time
-    zones used 1896-1937.  JWST now stands for Western Standard
-    Time, and JCST for Central Standard Time (formerly this was CJT).
-    These abbreviations are now used for time in Korea, Taiwan,
-    and Sakhalin while controlled by Japan.
-
-  Changes affecting past time stamps
-
-    China's five zones have been simplified to two, since the post-1970
-    differences in the other three seem to have been imaginary.  The
-    zones Asia/Harbin, Asia/Chongqing, and Asia/Kashgar have been
-    removed; backwards-compatibility links still work, albeit with
-    different behaviors for time stamps before May 1980.  Asia/Urumqi's
-    1980 transition to UTC+8 has been removed, so that it is now at
-    UTC+6 and not UTC+8.  (Thanks to Luther Ma and to Alois Treindl;
-    Treindl sent helpful translations of two papers by Guo Qingsheng.)
-
-    Some zones have been turned into links, when they differed from existing
-    zones only for older UTC offsets where data entries were likely invented.
-    These changes affect UTC offsets in pre-1970 time stamps only.  This is
-    similar to the change in release 2013e, except this time for western
-    Africa.  The affected zones are: Africa/Bamako, Africa/Banjul,
-    Africa/Conakry, Africa/Dakar, Africa/Freetown, Africa/Lome,
-    Africa/Nouakchott, Africa/Ouagadougou, Africa/Sao_Tome, and
-    Atlantic/St_Helena.  This also affects the backwards-compatibility
-    link Africa/Timbuktu.  (Thanks to Alan Barrett, Stephen Colebourne,
-    Tim Parenti, and David Patte for reporting problems in earlier
-    versions of this change.)
-
-    Asia/Shanghai's pre-standard-time UT offset has been changed from
-    8:05:57 to 8:05:43, the location of Xujiahui Observatory.  Its
-    transition to standard time has been changed from 1928 to 1901.
-
-    Asia/Taipei switched to JWST on 1896-01-01, then to JST on 1937-10-01,
-    then to CST on 1945-09-21 at 01:00, and did not observe DST in 1945.
-    In 1946 it observed DST from 05-15 through 09-30; in 1947
-    from 04-15 through 10-31; and in 1979 from 07-01 through 09-30.
-    (Thanks to Yu-Cheng Chuang.)
-
-    Asia/Riyadh's transition to standard time is now 1947-03-14, not 1950.
-
-    Europe/Helsinki's 1942 fall-back transition was 10-04 at 01:00, not
-    10-03 at 00:00.  (Thanks to Konstantin Hyppönen.)
-
-    Pacific/Pago_Pago has been changed from UTC-11:30 to UTC-11 for the period
-    from 1911 to 1950.
-
-    Pacific/Chatham has been changed to New Zealand standard time plus
-    45 minutes for the period before 1957, reflecting a 1956 remark in
-    the New Zealand parliament.
-
-    Europe/Budapest has several pre-1946 corrections: in 1918 the transition
-    out of DST was on 09-16, not 09-29; in 1919 it was on 11-24, not 09-15; in
-    1945 it was on 11-01, not 11-03; in 1941 the transition to DST was 04-08
-    not 04-06 at 02:00; and there was no DST in 1920.
-
-    Africa/Accra is now assumed to have observed DST from 1920 through 1935.
-
-    Time in Russia before 1927 or so has been corrected by a few seconds in
-    the following zones: Europe/Moscow, Asia/Irkutsk, Asia/Tbilisi,
-    Asia/Tashkent, Asia/Vladivostok, Asia/Yekaterinburg, Europe/Helsinki, and
-    Europe/Riga.  Also, Moscow's location has been changed to its Kilometer 0
-    point.  (Thanks to Vladimir Karpinsky for the Moscow changes.)
-
-  Changes affecting data format
-
-    A new file 'zone1970.tab' supersedes 'zone.tab' in the installed data.
-    The new file's extended format allows multiple country codes per zone.
-    The older file is still installed but is deprecated; its format is
-    not changing and it will still be distributed for a while, but new
-    applications should use the new file.
-
-    The new file format simplifies maintenance of obscure locations.
-    To test this, it adds coverage for the Crozet Islands and the
-    Scattered Islands.  (Thanks to Tobias Conradi and Antoine Leca.)
-
-    The file 'iso3166.tab' is planned to switch from ASCII to UTF-8.
-    It is still ASCII now, but commentary about the switch has been added.
-    The new file 'zone1970.tab' already uses UTF-8.
-
-  Changes affecting code
-
-    'localtime', 'mktime', etc. now use much less stack space if ALL_STATE
-    is defined.  (Thanks to Elliott Hughes for reporting the problem.)
-
-    'zic' no longer mishandles input when ignoring case in locales that
-    are not compatible with English, e.g., unibyte Turkish locales when
-    compiled with HAVE_GETTEXT.
-
-    Error diagnostics of 'zic' and 'yearistype' have been reworded so that
-    they no longer use ASCII '-' as if it were a dash.
-
-    'zic' now rejects output file names that contain '.' or '..' components.
-    (Thanks to Tim Parenti for reporting the problem.)
-
-    'zic -v' now warns about output file names that do not follow
-    POSIX rules, or that contain a digit or '.'.  (Thanks to Arthur
-    David Olson for starting the ball rolling on this.)
-
-    Some lint has been removed when using GCC_DEBUG_FLAGS with GCC 4.9.0.
-
-  Changes affecting build procedure
-
-    'zic' no longer links in localtime.o and asctime.o, as they're not needed.
-    (Thanks to John Cochran.)
-
-  Changes affecting documentation and commentary
-
-    The 'Theory' file documents legacy names, the longstanding
-    exceptions to the POSIX-inspired file name rules.
-
-    The 'zic' documentation clarifies the role of time types when
-    interpreting dates.  (Thanks to Arthur David Olson.)
-
-    Documentation and commentary now prefer UTF-8 to US-ASCII,
-    allowing the use of proper accents in foreign words and names.
-    Code and data have not changed because of this.  (Thanks to
-    Garrett Wollman, Ian Abbott, and Guy Harris for helping to debug
-    this.)
-
-    Non-HTML documentation and commentary now use plain-text URLs instead of
-    HTML insertions, and are more consistent about bracketing URLs when they
-    are not already surrounded by white space.  (Thanks to suggestions by
-    Steffen Nurpmeso.)
-
-    There is new commentary about Xujiahui Observatory, the five time-zone
-    project in China from 1918 to 1949, timekeeping in Japanese-occupied
-    Shanghai, and Tibet Time in the 1950s.  The sharp-eyed can spot the
-    warlord Jin Shuren in the data.
-
-    Commentary about the coverage of each Russian zone has been standardized.
-    (Thanks to Tim Parenti).
-
-    There is new commentary about contemporary timekeeping in Ethiopia.
-
-    Obsolete comments about a 2007 proposal for DST in Kuwait has been removed.
-
-    There is new commentary about time in Poland in 1919.
-
-    Proper credit has been given to DST inventor George Vernon Hudson.
-
-    Commentary about time in Metlakatla, AK and Resolute, NU has been
-    improved, with a new source for the former.
-
-    In zone.tab, Pacific/Easter no longer mentions Salas y Gómez, as it
-    is uninhabited.
-
-    Commentary about permanent Antarctic bases has been updated.
-
-    Several typos have been corrected.  (Thanks to Tim Parenti for
-    contributing some of these fixes.)
-
-    tz-link.htm now mentions the JavaScript libraries Moment Timezone,
-    TimezoneJS.Date, Walltime-js, and Timezone.  (Thanks to a heads-up
-    from Matt Johnson.)  Also, it mentions the Go 'latlong' package.
-    (Thanks to a heads-up from Dirkjan Ochtman.)
-
-    The files usno1988, usno1989, usno1989a, usno1995, usno1997, and usno1998
-    have been removed.  These obsolescent US Naval Observatory entries were no
-    longer helpful for maintenance.  (Thanks to Tim Parenti for the suggestion.)
-
-
-Release 2014e - 2014-06-12 21:53:52 -0700
-
-  Changes affecting near-future time stamps
-
-    Egypt's 2014 Ramadan-based transitions are June 26 and July 31 at 24:00.
-    (Thanks to Imed Chihi.)  Guess that from 2015 on Egypt will temporarily
-    switch to standard time at 24:00 the last Thursday before Ramadan, and
-    back to DST at 00:00 the first Friday after Ramadan.
-
-    Similarly, Morocco's are June 28 at 03:00 and August 2 at 02:00.  (Thanks
-    to Milamber Space Network.)  Guess that from 2015 on Morocco will
-    temporarily switch to standard time at 03:00 the last Saturday before
-    Ramadan, and back to DST at 02:00 the first Saturday after Ramadan.
-
-  Changes affecting past time stamps
-
-    The abbreviation "MSM" (Moscow Midsummer Time) is now used instead of
-    "MSD" for Moscow's double daylight time in summer 1921.  Also, a typo
-    "VLASST" has been repaired to be "VLAST" for Vladivostok summer time
-    in 1991.  (Thanks to Hank W. for reporting the problems.)
-
-  Changes affecting commentary
-
-    tz-link.htm now cites RFC 7265 for jCal, mentions PTP and the
-    draft CalDAV extension, updates URLs for TSP, TZInfo, IATA, and
-    removes stale pointers to World Time Explorer and WORLDTIME.
-
-
-Release 2014d - 2014-05-27 21:34:40 -0700
-
-  Changes affecting code
-
-    zic no longer generates files containing time stamps before the Big Bang.
-    This works around GNOME bug 730332
-    <https://bugzilla.gnome.org/show_bug.cgi?id=730332>.
-    (Thanks to Leonardo Chiquitto for reporting the bug, and to
-    Arthur David Olson and James Cloos for suggesting improvements to the fix.)
-
-  Changes affecting documentation
-
-    tz-link.htm now mentions GNOME.
-
-
-Release 2014c - 2014-05-13 07:44:13 -0700
-
-  Changes affecting near-future time stamps
-
-    Egypt observes DST starting 2014-05-15 at 24:00.
-    (Thanks to Ahmad El-Dardiry and Gunther Vermier.)
-    Details have not been announced, except that DST will not be observed
-    during Ramadan.  Guess that DST will stop during the same Ramadan dates as
-    Morocco, and that Egypt's future spring and fall transitions will be the
-    same as 2010 when it last observed DST, namely April's last Friday at
-    00:00 to September's last Thursday at 23:00 standard time.  Also, guess
-    that Ramadan transitions will be at 00:00 standard time.
-
-  Changes affecting code
-
-    zic now generates transitions for minimum time values, eliminating guesswork
-    when handling low-valued time stamps.  (Thanks to Arthur David Olson.)
-
-    Port to Cygwin sans glibc.  (Thanks to Arthur David Olson.)
-
-  Changes affecting commentary and documentation
-
-    Remove now-confusing comment about Jordan.  (Thanks to Oleksii Nochovnyi.)
-
-
-Release 2014b - 2014-03-24 21:28:50 -0700
-
-  Changes affecting near-future time stamps
-
-    Crimea switches to Moscow time on 2014-03-30 at 02:00 local time.
-    (Thanks to Alexander Krivenyshev.)  Move its zone.tab entry from UA to RU.
-
-    New entry for Troll station, Antarctica.  (Thanks to Paul-Inge Flakstad and
-    Bengt-Inge Larsson.)  This is currently an approximation; a better version
-    will require the zic and localtime fixes mentioned below, and the plan is
-    to wait for a while until at least the zic fixes propagate.
-
-  Changes affecting code
-
-    'zic' and 'localtime' no longer reject locations needing four transitions
-    per year for the foreseeable future.  (Thanks to Andrew Main (Zefram).)
-    Also, 'zic' avoids some unlikely failures due to integer overflow.
-
-  Changes affecting build procedure
-
-    'make check' now detects Rule lines defined but never used.
-    The NZAQ rules, an instance of this problem, have been removed.
-
-  Changes affecting commentary and documentation
-
-    Fix Tuesday/Thursday typo in description of time in Israel.
-    (Thanks to Bert Katz via Pavel Kharitonov and Mike Frysinger.)
-
-    Microsoft Windows 8.1 doesn't support tz database names.  (Thanks
-    to Donald MacQueen.)  Instead, the Microsoft Windows Store app
-    library supports them.
-
-    Add comments about Johnston Island time in the 1960s.
-    (Thanks to Lyle McElhaney.)
-
-    Morocco's 2014 DST start will be as predicted.
-    (Thanks to Sebastien Willemijns.)
-
-
-Release 2014a - 2014-03-07 23:30:29 -0800
-
-  Changes affecting near-future time stamps
-
-    Turkey begins DST on 2014-03-31, not 03-30.  (Thanks to Faruk Pasin for
-    the heads-up, and to Tim Parenti for simplifying the update.)
-
-  Changes affecting past time stamps
-
-    Fiji ended DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00.
-    (Thanks to Steffen Thorsen.)
-
-    Ukraine switched from Moscow to Eastern European time on 1990-07-01
-    (not 1992-01-01), and observed DST during the entire next winter.
-    (Thanks to Vladimir in Moscow via Alois Treindl.)
-
-    In 1988 Israel observed DST from 04-10 to 09-04, not 04-09 to 09-03.
-    (Thanks to Avigdor Finkelstein.)
-
-  Changes affecting code
-
-    A uninitialized-storage bug in 'localtime' has been fixed.
-    (Thanks to Logan Chien.)
-
-  Changes affecting the build procedure
-
-    The settings for 'make check_web' now default to Ubuntu 13.10.
-
-  Changes affecting commentary and documentation
-
-    The boundary of the US Pacific time zone is given more accurately.
-    (Thanks to Alan Mintz.)
-
-    Chile's 2014 DST will be as predicted.  (Thanks to José Miguel Garrido.)
-
-    Paraguay's 2014 DST will be as predicted.  (Thanks to Carlos Raúl Perasso.)
-
-    Better descriptions of countries with same time zone history as
-    Trinidad and Tobago since 1970.  (Thanks to Alan Barrett for suggestion.)
-
-    Several changes affect tz-link.htm, the main web page.
-
-      Mention Time.is (thanks to Even Scharning) and WX-now (thanks to
-      David Braverman).
-
-      Mention xCal (Internet RFC 6321) and jCal.
-
-      Microsoft has some support for tz database names.
-
-      CLDR data formats include both XML and JSON.
-
-      Mention Maggiolo's map of solar vs standard time.
-      (Thanks to Arthur David Olson.)
-
-      Mention TZ4Net.  (Thanks to Matt Johnson.)
-
-      Mention the timezone-olson Haskell package.
-
-      Mention zeitverschiebung.net.  (Thanks to Martin Jäger.)
-
-      Remove moribund links to daylight-savings-time.info and to
-      Simple Timer + Clocks.
-
-      Update two links.  (Thanks to Oscar van Vlijmen.)
-
-      Fix some formatting glitches, e.g., remove random newlines from
-      abbr elements' title attributes.
-
-
-Release 2013i - 2013-12-17 07:25:23 -0800
-
-  Changes affecting near-future time stamps:
-
-    Jordan switches back to standard time at 00:00 on December 20, 2013.
-    The 2006-2011 transition schedule is planned to resume in 2014.
-    (Thanks to Steffen Thorsen.)
-
-  Changes affecting past time stamps:
-
-    In 2004, Cuba began DST on March 28, not April 4.
-    (Thanks to Steffen Thorsen.)
-
-  Changes affecting code
-
-    The compile-time flag NOSOLAR has been removed, as nowadays the
-    benefit of slightly shrinking runtime table size is outweighed by the
-    cost of disallowing potential future updates that exceed old limits.
-
-  Changes affecting documentation and commentary
-
-    The files solar87, solar88, and solar89 are no longer distributed.
-    They were a negative experiment - that is, a demonstration that
-    tz data can represent solar time only with some difficulty and error.
-    Their presence in the distribution caused confusion, as Riyadh
-    civil time was generally not solar time in those years.
-
-    tz-link.htm now mentions Noda Time.  (Thanks to Matt Johnson.)
-
-
-Release 2013h - 2013-10-25 15:32:32 -0700
-
-  Changes affecting current and future time stamps:
-
-    Libya has switched its time zone back to UTC+2 without DST,
-    instead of UTC+1 with DST.  (Thanks to Even Scharning.)
-
-    Western Sahara (Africa/El_Aaiun) uses Morocco's DST rules.
-    (Thanks to Gwillim Law.)
-
-  Changes affecting future time stamps:
-
-    Acre and (we guess) western Amazonas will switch from UTC-4 to UTC-5
-    on 2013-11-10.  This affects America/Rio_Branco and America/Eirunepe.
-    (Thanks to Steffen Thorsen.)
-
-    Add entries for DST transitions in Morocco in the year 2038.
-    This avoids some year-2038 glitches introduced in 2013g.
-    (Thanks to Yoshito Umaoka for reporting the problem.)
-
-  Changes affecting API
-
-    The 'tzselect' command no longer requires the 'select' command,
-    and should now work with /bin/sh on more platforms.  It also works
-    around a bug in BusyBox awk before version 1.21.0.  (Thanks to
-    Patrick 'P. J.' McDermott and Alan Barrett.)
-
-  Changes affecting code
-
-    Fix localtime overflow bugs with 32-bit unsigned time_t.
-
-    zdump no longer assumes sscanf returns maximal values on overflow.
-
-  Changes affecting the build procedure
-
-    The builder can specify which programs to use, if any, instead of
-    'ar' and 'ranlib', and libtz.a is now built locally before being
-    installed.  (Thanks to Michael Forney.)
-
-    A dependency typo in the 'zdump' rule has been fixed.
-    (Thanks to Andrew Paprocki.)
-
-    The Makefile has been simplified by assuming that 'mkdir -p' and 'cp -f'
-    work as specified by POSIX.2-1992 or later; this is portable nowadays.
-
-    'make clean' no longer removes 'leapseconds', since it's
-    host-independent and is part of the distribution.
-
-    The unused makefile macros TZCSRCS, TZDSRCS, DATESRCS have been removed.
-
-  Changes affecting documentation and commentary
-
-    tz-link.htm now mentions TC TIMEZONE's draft time zone service protocol
-    (thanks to Mike Douglass) and TimezoneJS.Date (thanks to Jim Fehrle).
-
-    Update URLs in tz-link page.  Add URLs for Microsoft Windows, since
-    8.1 introduces tz support.  Remove URLs for Tru64 and UnixWare (no
-    longer maintained) and for old advisories.  SOFA now does C.
-
-Release 2013g - 2013-09-30 21:08:26 -0700
-
-  Changes affecting current and near-future time stamps
-
-    Morocco now observes DST from the last Sunday in March to the last
-    Sunday in October, not April to September respectively.  (Thanks
-    to Steffen Thorsen.)
-
-  Changes affecting 'zic'
-
-    'zic' now runs on platforms that lack both hard links and symlinks.
-    (Thanks to Theo Veenker for reporting the problem, for MinGW.)
-    Also, fix some bugs on platforms that lack hard links but have symlinks.
-
-    'zic -v' again warns that Asia/Tehran has no POSIX environment variable
-    to predict the far future, fixing a bug introduced in 2013e.
-
-  Changes affecting the build procedure
-
-    The 'leapseconds' file is again put into the tzdata tarball.
-    Also, 'leapseconds.awk', so tzdata is self-contained.  (Thanks to
-    Matt Burgess and Ian Abbott.)  The timestamps of these and other
-    dependent files in tarballs are adjusted more consistently.
-
-  Changes affecting documentation and commentary
-
-    The README file is now part of the data tarball as well as the code.
-    It now states that files are public domain unless otherwise specified.
-    (Thanks to Andrew Main (Zefram) for asking for clarifications.)
-    Its details about the 1989 release moved to a place of honor near
-    the end of NEWS.
-
-
-Release 2013f - 2013-09-24 23:37:36 -0700
-
-  Changes affecting near-future time stamps
-
-    Tocantins will very likely not observe DST starting this spring.
-    (Thanks to Steffen Thorsen.)
-
-    Jordan will likely stay at UTC+3 indefinitely, and will not fall
-    back this fall.
-
-    Palestine will fall back at 00:00, not 01:00.  (Thanks to Steffen Thorsen.)
-
-  Changes affecting API
-
-    The types of the global variables 'timezone' and 'altzone' (if present)
-    have been changed back to 'long'.  This is required for 'timezone'
-    by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
-    These variables were originally 'long' in the tz code, but were
-    mistakenly changed to 'time_t' in 1987; nobody reported the
-    incompatibility until now.  The difference matters on x32, where
-    'long' is 32 bits and 'time_t' is 64.  (Thanks to Elliott Hughes.)
-
-  Changes affecting the build procedure
-
-    Avoid long strings in leapseconds.awk to work around a mawk bug.
-    (Thanks to Cyril Baurand.)
-
-  Changes affecting documentation and commentary
-
-    New file 'NEWS' that contains release notes like this one.
-
-    Paraguay's law does not specify DST transition time; 00:00 is customary.
-    (Thanks to Waldemar Villamayor-Venialbo.)
-
-    Minor capitalization fixes.
-
-  Changes affecting version-control only
-
-    The experimental GitHub repository now contains annotated and
-    signed tags for recent releases, e.g., '2013e' for Release 2013e.
-    Releases are tagged starting with 2012e; earlier releases were
-    done differently, and tags would either not have a simple name or
-    not exactly match what was released.
-
-    'make set-timestamps' is now simpler and a bit more portable.
-
-
-Release 2013e - 2013-09-19 23:50:04 -0700
-
-  Changes affecting near-future time stamps
-
-    This year Fiji will start DST on October 27, not October 20.
-    (Thanks to David Wheeler for the heads-up.)  For now, guess that
-    Fiji will continue to spring forward the Sunday before the fourth
-    Monday in October.
-
-  Changes affecting current and future time zone abbreviations
-
-    Use WIB/WITA/WIT rather than WIT/CIT/EIT for alphabetic Indonesian
-    time zone abbreviations since 1932.  (Thanks to George Ziegler,
-    Priyadi Iman Nurcahyo, Zakaria, Jason Grimes, Martin Pitt, and
-    Benny Lin.)  This affects Asia/Dili, Asia/Jakarta, Asia/Jayapura,
-    Asia/Makassar, and Asia/Pontianak.
-
-    Use ART (UTC-3, standard time), rather than WARST (also UTC-3, but
-    daylight saving time) for San Luis, Argentina since 2009.
-
-  Changes affecting Godthåb time stamps after 2037 if version mismatch
-
-    Allow POSIX-like TZ strings where the transition time's hour can
-    range from -167 through 167, instead of the POSIX-required 0
-    through 24.  E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
-    new Fiji rules.  This is a more-compact way to represent
-    far-future time stamps for America/Godthab, America/Santiago,
-    Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
-    Pacific/Easter, and Pacific/Fiji.  Other zones are unaffected by
-    this change.  (Derived from a suggestion by Arthur David Olson.)
-
-    Allow POSIX-like TZ strings where daylight saving time is in
-    effect all year.  E.g., TZ='WART4WARST,J1/0,J365/25' for Western
-    Argentina Summer Time all year.  This supports a more-compact way
-    to represent the 2013d data for America/Argentina/San_Luis.
-    Because of the change for San Luis noted above this change does not
-    affect the current data.  (Thanks to Andrew Main (Zefram) for
-    suggestions that improved this change.)
-
-    Where these two TZ changes take effect, there is a minor extension
-    to the tz file format in that it allows new values for the
-    embedded TZ-format string, and the tz file format version number
-    has therefore been increased from 2 to 3 as a precaution.
-    Version-2-based client code should continue to work as before for
-    all time stamps before 2038.  Existing version-2-based client code
-    (tzcode, GNU/Linux, Solaris) has been tested on version-3-format
-    files, and typically works in practice even for time stamps after
-    2037; the only known exception is America/Godthab.
-
-  Changes affecting time stamps before 1970
-
-    Pacific/Johnston is now a link to Pacific/Honolulu.  This corrects
-    some errors before 1947.
-
-    Some zones have been turned into links, when they differ from existing
-    zones only in older data entries that were likely invented or that
-    differ only in LMT or transitions from LMT.  These changes affect
-    only time stamps before 1943.  The affected zones are:
-    Africa/Juba, America/Anguilla, America/Aruba, America/Dominica,
-    America/Grenada, America/Guadeloupe, America/Marigot,
-    America/Montserrat, America/St_Barthelemy, America/St_Kitts,
-    America/St_Lucia, America/St_Thomas, America/St_Vincent,
-    America/Tortola, and Europe/Vaduz.  (Thanks to Alois Treindl for
-    confirming that the old Europe/Vaduz zone was wrong and the new
-    link is better for WWII-era times.)
-
-    Change Kingston Mean Time from -5:07:12 to -5:07:11.  This affects
-    America/Cayman, America/Jamaica and America/Grand_Turk time stamps
-    from 1890 to 1912.
-
-    Change the UT offset of Bern Mean Time from 0:29:44 to 0:29:46.
-    This affects Europe/Zurich time stamps from 1853 to 1894.  (Thanks
-    to Alois Treindl).
-
-    Change the date of the circa-1850 Zurich transition from 1849-09-12
-    to 1853-07-16, overriding Shanks with data from Messerli about
-    postal and telegraph time in Switzerland.
-
-  Changes affecting time zone abbreviations before 1970
-
-    For Asia/Jakarta, use BMT (not JMT) for mean time from 1923 to 1932,
-    as Jakarta was called Batavia back then.
-
-  Changes affecting API
-
-    The 'zic' command now outputs a dummy transition when far-future
-    data can't be summarized using a TZ string, and uses a 402-year
-    window rather than a 400-year window.  For the current data, this
-    affects only the Asia/Tehran file.  It does not affect any of the
-    time stamps that this file represents, so zdump outputs the same
-    information as before.  (Thanks to Andrew Main (Zefram).)
-
-    The 'date' command has a new '-r' option, which lets you specify
-    the integer time to display, a la FreeBSD.
-
-    The 'tzselect' command has two new options '-c' and '-n', which lets you
-    select a zone based on latitude and longitude.
-
-    The 'zic' command's '-v' option now warns about constructs that
-    require the new version-3 binary file format.  (Thanks to Arthur
-    David Olson for the suggestion.)
-
-    Support for floating-point time_t has been removed.
-    It was always dicey, and POSIX no longer requires it.
-    (Thanks to Eric Blake for suggesting to the POSIX committee to
-    remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
-    Heninger, Arthur David Olson, and Alois Treindl, for reporting
-    bugs and elucidating some of the corners of the old floating-point
-    implementation.)
-
-    The signatures of 'offtime', 'timeoff', and 'gtime' have been
-    changed back to the old practice of using 'long' to represent UT
-    offsets.  This had been inadvertently and mistakenly changed to
-    'int_fast32_t'.  (Thanks to Christos Zoulas.)
-
-    The code avoids undefined behavior on integer overflow in some
-    more places, including gmtime, localtime, mktime and zdump.
-
-  Changes affecting the zdump utility
-
-    zdump now outputs "UT" when referring to Universal Time, not "UTC".
-    "UTC" does not make sense for time stamps that predate the introduction
-    of UTC, whereas "UT", a more-generic term, does.  (Thanks to Steve Allen
-    for clarifying UT vs UTC.)
-
-  Data changes affecting behavior of tzselect and similar programs
-
-    Country code BQ is now called the more-common name "Caribbean Netherlands"
-    rather than the more-official "Bonaire, St Eustatius & Saba".
-
-    Remove from zone.tab the names America/Montreal, America/Shiprock,
-    and Antarctica/South_Pole, as they are equivalent to existing
-    same-country-code zones for post-1970 time stamps.  The data entries for
-    these names are unchanged, so the names continue to work as before.
-
-  Changes affecting code internals
-
-    zic -c now runs way faster on 64-bit hosts when given large numbers.
-
-    zic now uses vfprintf to avoid allocating and freeing some memory.
-
-    tzselect now computes the list of continents from the data,
-    rather than have it hard-coded.
-
-    Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
-
-  Changes affecting the build procedure
-
-    The 'leapseconds' file is now generated automatically from a
-    new file 'leap-seconds.list', which is a copy of
-    <ftp://time.nist.gov/pub/leap-seconds.list>.
-    A new source file 'leapseconds.awk' implements this.
-    The goal is simplification of the future maintenance of 'leapseconds'.
-
-    When building the 'posix' or 'right' subdirectories, if the
-    subdirectory would be a copy of the default subdirectory, it is
-    now made a symbolic link if that is supported.  This saves about
-    2 MB of file system space.
-
-    The links America/Shiprock and Antarctica/South_Pole have been
-    moved to the 'backward' file.  This affects only nondefault builds
-    that omit 'backward'.
-
-  Changes affecting version-control only
-
-    .gitignore now ignores 'date'.
-
-  Changes affecting documentation and commentary
-
-    Changes to the 'tzfile' man page
-
-      It now mentions that the binary file format may be extended in
-      future versions by appending data.
-
-      It now refers to the 'zdump' and 'zic' man pages.
-
-    Changes to the 'zic' man page
-
-      It lists conditions that elicit a warning with '-v'.
-
-      It says that the behavior is unspecified when duplicate names
-      are given, or if the source of one link is the target of another.
-
-      Its examples are updated to match the latest data.
-
-      The definition of white space has been clarified slightly.
-      (Thanks to Michael Deckers.)
-
-    Changes to the 'Theory' file
-
-      There is a new section about the accuracy of the tz database,
-      describing the many ways that errors can creep in, and
-      explaining why so many of the pre-1970 time stamps are wrong or
-      misleading (thanks to Steve Allen, Lester Caine, and Garrett
-      Wollman for discussions that contributed to this).
-
-      The 'Theory' file describes LMT better (this follows a
-      suggestion by Guy Harris).
-
-      It refers to the 2013 edition of POSIX rather than the 2004 edition.
-
-      It's mentioned that excluding 'backward' should not affect the
-      other data, and it suggests at least one zone.tab name per
-      inhabited country (thanks to Stephen Colebourne).
-
-      Some longstanding restrictions on names are documented, e.g.,
-      'America/New_York' precludes 'America/New_York/Bronx'.
-
-      It gives more reasons for the 1970 cutoff.
-
-      It now mentions which time_t variants are supported, such as
-      signed integer time_t.  (Thanks to Paul Goyette for reporting
-      typos in an experimental version of this change.)
-
-      (Thanks to Philip Newton for correcting typos in these changes.)
-
-    Documentation and commentary is more careful to distinguish UT in
-    general from UTC in particular.  (Thanks to Steve Allen.)
-
-    Add a better source for the Zurich 1894 transition.
-    (Thanks to Pierre-Yves Berger.)
-
-    Update shapefile citations in tz-link.htm.  (Thanks to Guy Harris.)
-
-
-Release 2013d - 2013-07-05 07:38:01 -0700
-
-  Changes affecting future time stamps:
-
-    Morocco's midsummer transitions this year are July 7 and August 10,
-    not July 9 and August 8.  (Thanks to Andrew Paprocki.)
-
-    Israel now falls back on the last Sunday of October.
-    (Thanks to Ephraim Silverberg.)
-
-  Changes affecting past time stamps:
-
-    Specify Jerusalem's location more precisely; this changes the pre-1880
-    times by 2 s.
-
-  Changing affecting metadata only:
-
-    Fix typos in the entries for country codes BQ and SX.
-
-  Changes affecting code:
-
-    Rework the code to fix a bug with handling Australia/Macquarie on
-    32-bit hosts (thanks to Arthur David Olson).
-
-    Port to platforms like NetBSD, where time_t can be wider than long.
-
-    Add support for testing time_t types other than the system's.
-    Run 'make check_time_t_alternatives' to try this out.
-    Currently, the tests fail for unsigned time_t;
-    this should get fixed at some point.
-
-  Changes affecting documentation and commentary:
-
-    Deemphasize the significance of national borders.
-
-    Update the zdump man page.
-
-    Remove obsolete NOID comment (thanks to Denis Excoffier).
-
-    Update several URLs and comments in the web pages.
-
-    Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler).
-
-    Update URL for CLDR Zone->Tzid table (thanks to Yoshito Umaoka).
-
-
-Release 2013c - 2013-04-19 16:17:40 -0700
-
-  Changes affecting current and future time stamps:
-
-    Palestine observed DST starting March 29, 2013.  (Thanks to
-    Steffen Thorsen.)  From 2013 on, Gaza and Hebron both observe DST,
-    with the predicted rules being the last Thursday in March at 24:00
-    to the first Friday on or after September 21 at 01:00.
-
-    Assume that the recent change to Paraguay's DST rules is permanent,
-    by moving the end of DST to the 4th Sunday in March every year.
-    (Thanks to Carlos Raúl Perasso.)
-
-  Changes affecting past time stamps:
-
-    Fix some historical data for Palestine to agree with that of
-    timeanddate.com, as follows:
-
-	  The spring 2008 change in Gaza and Hebron was on 00:00 Mar 28, not
-	  00:00 Apr 1.
-
-	  The fall 2009 change in Gaza and Hebron on Sep 4 was at 01:00, not
-	  02:00.
-
-	  The spring 2010 change in Hebron was 00:00 Mar 26, not 00:01 Mar 27.
-
-	  The spring 2011 change in Gaza was 00:01 Apr 1, not 12:01 Apr 2.
-
-	  The spring 2011 change in Hebron on Apr 1 was at 00:01, not 12:01.
-
-	  The fall 2011 change in Hebron on Sep 30 was at 00:00, not 03:00.
-
-    Fix times of habitation for Macquarie to agree with the Tasmania
-    Parks & Wildlife Service history, which indicates that permanent
-    habitation was 1899-1919 and 1948 on.
-
-  Changing affecting metadata only:
-
-    Macquarie Island is politically part of Australia, not Antarctica.
-    (Thanks to Tobias Conradi.)
-
-    Sort Macquarie more-consistently with other parts of Australia.
-    (Thanks to Tim Parenti.)
-
-
-Release 2013b - 2013-03-10 22:33:40 -0700
-
-  Changes affecting current and future time stamps:
-
-    Haiti uses US daylight-saving rules this year, and presumably future years.
-    This changes time stamps starting today.  (Thanks to Steffen Thorsen.)
-
-    Paraguay will end DST on March 24 this year.
-    (Thanks to Steffen Thorsen.)  For now, assume it's just this year.
-
-    Morocco does not observe DST during Ramadan;
-    try to predict Ramadan in Morocco as best we can.
-    (Thanks to Erik Homoet for the heads-up.)
-
-  Changes affecting commentary:
-
-    Update URLs in tz-link page.  Add URLs for webOS, BB10, iOS.
-    Update URL for Solaris.  Mention Internet RFC 6557.
-    Update Internet RFCs 2445->5545, 2822->5322.
-    Switch from FTP to HTTP for Internet RFCs.
-
-
-Release 2013a - 2013-02-27 09:20:35 -0800
-
-  Change affecting binary data format:
-
-    The zone offset at the end of version-2-format zone files is now
-    allowed to be 24:00, as per POSIX.1-2008.  (Thanks to Arthur David Olson.)
-
-  Changes affecting current and future time stamps:
-
-    Chile's 2013 rules, and we guess rules for 2014 and later, will be
-    the same as 2012, namely Apr Sun>=23 03:00 UTC to Sep Sun>=2 04:00 UTC.
-    (Thanks to Steffen Thorsen and Robert Elz.)
-
-    New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen.
-    (Thanks to Tobias Conradi and Arthur David Olson.)
-
-  Many changes affect historical time stamps before 1940.
-  These were deduced from: Milne J. Civil time. Geogr J. 1899
-  Feb;13(2):173-94 <http://www.jstor.org/stable/1774359>.
-
-  Changes affecting the code:
-
-    Fix zic bug that mishandled Egypt's 2010 changes (this also affected
-    the data).  (Thanks to Arthur David Olson.)
-
-    Fix localtime bug when time_t is unsigned and data files were generated
-    by a signed time_t system.  (Thanks to Doug Bailey for reporting and
-    to Arthur David Olson for fixing.)
-
-    Allow the email address for bug reports to be set by the packager.
-    The default is tz@iana.org, as before.  (Thanks to Joseph S. Myers.)
-
-    Update HTML checking to be compatible with Ubuntu 12.10.
-
-    Check that files are a safe subset of ASCII.  At some point we may
-    relax this requirement to a safe subset of UTF-8.  Without the
-    check, some non-UTF-8 encodings were leaking into the distribution.
-
-  Commentary changes:
-
-    Restore a comment about copyright notices that was inadvertently deleted.
-    (Thanks to Arthur David Olson.)
-
-    Improve the commentary about which districts observe what times
-    in Russia.  (Thanks to Oscar van Vlijmen and Arthur David Olson).
-
-    Add web page links to tz.js.
-
-    Add "Run by the Monkeys" to tz-art.  (Thanks to Arthur David Olson.)
-
-
-Release 2012j - 2012-11-12 18:34:49 -0800
-
-  Libya moved to CET this weekend, but with DST planned next year.
-  (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.)
-
-  Signatures now have the extension .asc, not .sign, as that's more
-  standard.  (Thanks to Phil Pennock.)
-
-  The output of 'zdump --version', and of 'zic --version', now
-  uses a format that is more typical for --version.
-  (Thanks to Joseph S. Myers.)
-
-  The output of 'tzselect --help', 'zdump --help', and 'zic --help'
-  now uses tz@iana.org rather than the old elsie address.
-
-  zic -v now complains about abbreviations that are less than 3
-  or more than 6 characters, as per Posix.  Formerly, it checked
-  for abbreviations that were more than 3.
-
-  'make public' no longer puts its temporary directory under /tmp,
-  and uses the just-built zic rather than the system zic.
-
-  Various fixes to documentation and commentary.
-
-
-Release 2012i - 2012-11-03 12:57:09 -0700
-
-  Cuba switches from DST tomorrow at 01:00.  (Thanks to Steffen Thorsen.)
-
-  Linker flags can now be specified via LDFLAGS.
-  AWK now defaults to 'awk', not 'nawk'.
-  The shell in tzselect now defaults to /bin/bash, but this can
-  be overridden by specifying KSHELL.
-  The main web page now mentions the unofficial GitHub repository.
-  (Thanks to Mike Frysinger.)
-
-  Tarball signatures can now be built by running 'make signatures'.
-  There are also new makefile rules 'tarballs', 'check_public', and
-  separate makefile rules for each tarball and signature file.
-  A few makefile rules are now more portable to strict POSIX.
-
-  The main web page now lists the canonical IANA URL.
-
-
-Release 2012h - 2012-10-26 22:49:10 -0700
-
-  Bahia no longer has DST.  (Thanks to Kelley Cook.)
-
-  Tocantins has DST.  (Thanks to Rodrigo Severo.)
-
-  Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)
-
-  Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)
-
-  Web page updates.
-
-  More C modernization, except that at Arthur David Olson's suggestion
-  the instances of 'register' were kept.
-
-
-Release 2012g - 2012-10-17 20:59:45 -0700
-
-  Samoa fall 2012 and later.  (Thanks to Nicholas Pereira and Robert Elz.)
-
-  Palestine fall 2012.  (Thanks to Steffen Thorsen.)
-
-  Assume C89.
-
-  To attack the version-number problem, this release ships the file
-  'Makefile' (which contains the release number) in both the tzcode and
-  the tzdata tarballs.  The two Makefiles are identical, and should be
-  identical in any matching pair of tarballs, so it shouldn't matter
-  which order you extract the tarballs.  Perhaps we can come up with a
-  better version-number scheme at some point; this scheme does have the
-  virtue of not adding more files.
-
-
-Release 2012f - 2012-09-12 23:17:03 -0700
-
-  * australasia (Pacific/Fiji): Fiji DST is October 21 through January
-    20 this year.  (Thanks to Steffen Thorsen.)
-
-
-Release 2012e - 2012-08-02 20:44:55 -0700
-
-  * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14.
-    (Thanks to Steffen Thorsen.)
-
-  * Use a single version number for both code and data.
-
-  * .gitignore: New file.
-
-  * Remove trailing white space.
-
-
-Release code2012c-data2012d - 2012-07-19 16:35:33 -0700
-
-  Changes for Morocco's time stamps, which take effect in a couple of
-  hours, along with infrastructure changes to accommodate how the tz
-  code and data are released on IANA.
-
-
-Release data2012c - 2012-03-27 12:17:25 -0400
-
-  africa
-	Summer time changes for Morocco (to start late April 2012)
-
-  asia
-	Changes for 2012 for Gaza & the West Bank (Hebron) and Syria
-
-  northamerica
-	Haiti following US/Canada rules for 2012 (and we're assuming,
-	for now anyway, for the future).
-
-
-Release 2012b - 2012-03-02 12:29:15 +0700
-
-  There is just one change to tzcode2012b (compared with 2012a):
-  the Makefile that was accidentally included with 2012a has been
-  replaced with the version that should have been there, which is
-  identical with the previous version (from tzcode2011i).
-
-  There are just two changes in tzdata2012b compared with 2012a.
-
-  Most significantly, summer time in Cuba has been delayed 3 weeks
-  (now starts April 1 rather than March 11).   Since Mar 11 (the old start
-  date, as listed in 2012a) is just a little over a week away, this
-  change is urgent.
-
-  Less importantly, an excess tab in one of the changes in zone.tab
-  in 2012a has been removed.
-
-
-Release 2012a - 2012-03-01 18:28:10 +0700
-
-  The changes in tzcode2012a (compared to the previous version, 2011i)
-  are entirely to the README and tz-art.htm and tz-link.htm files, if
-  none of those concern you, you can ignore the code update.  The changes
-  reflect the changed addresses for the mailing list and the code and
-  data distribution points & methods (and a link to DateTime::TimeZone::Tzfile
-  has been added to tz-link.htm).
-
-  In tzdata2012a (compared to the previous release, which was 2011n)
-  the major changes are:
-	Chile 2011/2012 and 2012/2013 summer time date adjustments.
-	Falkland Islands onto permanent summer time (we're assuming for the
-		foreseeable future, though 2012 is all we're fairly certain of.)
-	Armenia has abolished Summer Time.
-	Tokelau jumped the International Date Line back last December
-		(just the same as their near neighbour, Samoa).
-	America/Creston is a new zone for a small area of British Columbia
-	There will be a leapsecond 2012-06-30 23:59:60 UTC.
-
-  Other minor changes are:
-	Corrections to 1918 Canadian summer time end dates.
-	Updated URL for UK time zone history (in comments)
-	A few typos in Le Corre's list of free French place names (comments)
-
-
-Release data2011n - 2011-10-30 14:57:54 +0700
-
-  There are three changes of note - most urgently, Cuba (America/Havana)
-  has extended summer time by two weeks, now to end on Nov 13, rather than
-  the (already past) Oct 30.   Second, the Pridnestrovian Moldavian Republic
-  (Europe/Tiraspol) decided not to split from the rest of Moldova after
-  all, and consequently that zone has been removed (again) and reinstated
-  in the "backward" file as a link to Europe/Chisinau.   And third, the
-  end date for Fiji's summer time this summer was moved forward from the
-  earlier planned Feb 26, to Jan 22.
-
-  Apart from that, Moldova (MD) returns to a single entry in zone.tab
-  (and the incorrect syntax that was in the 2011m version of that file
-  is so fixed - it would have been fixed in a different way had this
-  change not happened - that's the "missing" sccs version id).
-
-
-Release data2011m - 2011-10-24 21:42:16 +0700
-
-  In particular, the typos in comments in the data (2011-11-17 should have
-  been 2011-10-17 as Alan Barrett noted, and spelling of Tiraspol that
-  Tim Parenti noted) have been fixed, and the change for Ukraine has been
-  made in all 4 Ukrainian zones, rather than just Kiev (again, thanks to
-  Tim Parenti, and also Denys Gavrysh)
-
-  In addition, I added Europe/Tiraspol to zone.tab.
-
-  This time, all the files have new version numbers...  (including the files
-  otherwise unchanged in 2011m that were changed in 2011l but didn't get new
-  version numbers there...)
-
-
-Release data2011l - 2011-10-10 11:15:43 +0700
-
-  There are just 2 changes that cause different generated tzdata files from
-  zic, to Asia/Hebron and Pacific/Fiji - the possible change for Bahia, Brazil
-  is included, but commented out.  Compared with the diff I sent out last week,
-  this version also includes attributions for the sources for the changes
-  (in much the same format as ado used, but the html tags have not been
-  checked, verified, or used in any way at all, so if there are errors there,
-  please let me know.)
-
-
-Release data2011k - 2011-09-20 17:54:03 -0400
-
-  [not summarized]
-
-
-Release data2011j - 2011-09-12 09:22:49 -0400
-
-  (contemporary changes for Samoa; past changes for Kenya, Uganda, and
-  Tanzania); there are also two spelling corrections to comments in
-  the australasia file (with thanks to Christos Zoulas).
-
-
-Release 2011i - 2011-08-29 05:56:32 -0400
-
-  [not summarized]
-
-
-Release data2011h - 2011-06-15 18:41:48 -0400
-
-  Russia and Curaçao changes
-
-
-Release 2011g - 2011-04-25 09:07:22 -0400
-
-  update the rules for Egypt to reflect its abandonment of DST this year
-
-
-Release 2011f - 2011-04-06 17:14:53 -0400
-
-  [not summarized]
-
-
-Release 2011e - 2011-03-31 16:04:38 -0400
-
-  Morocco, Chile, and tz-link changes
-
-
-Release 2011d - 2011-03-14 09:18:01 -0400
-
-  changes that impact present-day time stamps in Cuba, Samoa, and Turkey
-
-
-Release 2011c - 2011-03-07 09:30:09 -0500
-
-  These do affect current time stamps in Chile and Annette Island, Canada.
-
-
-Release 2011b - 2011-02-07 08:44:50 -0500
-
-  [not summarized]
-
-
-Release 2011a - 2011-01-24 10:30:16 -0500
-
-  [not summarized]
-
-
-Release data2010o - 2010-11-01 09:18:23 -0400
-
-  change to the end of DST in Fiji in 2011
-
-
-Release 2010n - 2010-10-25 08:19:17 -0400
-
-  [not summarized]
-
-
-Release 2010m - 2010-09-27 09:24:48 -0400
-
-  Hong Kong, Vostok, and zic.c changes
-
-
-Release 2010l - 2010-08-16 06:57:25 -0400
-
-  [not summarized]
-
-
-Release 2010k - 2010-07-26 10:42:27 -0400
-
-  [not summarized]
-
-
-Release 2010j - 2010-05-10 09:07:48 -0400
-
-  changes for Bahía de Banderas and for version naming
-
-
-Release data2010i - 2010-04-16 18:50:45 -0400
-
-  the end of DST in Morocco on 2010-08-08
-
-
-Release data2010h - 2010-04-05 09:58:56 -0400
-
-  [not summarized]
-
-
-Release data2010g - 2010-03-24 11:14:53 -0400
-
-  [not summarized]
-
-
-Release 2010f - 2010-03-22 09:45:46 -0400
-
-  [not summarized]
-
-
-Release data2010e - 2010-03-08 14:24:27 -0500
-
-  corrects the Dhaka bug found by Danvin Ruangchan
-
-
-Release data2010d - 2010-03-06 07:26:01 -0500
-
-  [not summarized]
-
-
-Release 2010c - 2010-03-01 09:20:58 -0500
-
-  changes including KRE's suggestion for earlier initialization of
-  "goahead" and "goback" structure elements
-
-
-Release code2010a - 2010-02-16 10:40:04 -0500
-
-  [not summarized]
-
-
-Release data2010b - 2010-01-20 12:37:01 -0500
-
-  Mexico changes
-
-
-Release data2010a - 2010-01-18 08:30:04 -0500
-
-  changes to Dhaka
-
-
-Release data2009u - 2009-12-26 08:32:28 -0500
-
-  changes to DST in Bangladesh
-
-
-Release 2009t - 2009-12-21 13:24:27 -0500
-
-  [not summarized]
-
-
-Release data2009s - 2009-11-14 10:26:32 -0500
-
-  (cosmetic) Antarctica change and the DST-in-Fiji-in-2009-and-2010 change
-
-
-Release 2009r - 2009-11-09 10:10:31 -0500
-
-  "antarctica" and "tz-link.htm" changes
-
-
-Release 2009q - 2009-11-02 09:12:40 -0500
-
-  with two corrections as reported by Eric Muller and Philip Newton
-
-
-Release data2009p - 2009-10-23 15:05:27 -0400
-
-  Argentina (including San Luis) changes (with the correction from
-  Mariano Absatz)
-
-
-Release data2009o - 2009-10-14 16:49:38 -0400
-
-  Samoa (commentary only), Pakistan, and Bangladesh changes
-
-
-Release data2009n - 2009-09-22 15:13:38 -0400
-
-  added commentary for Argentina and a change to the end of DST in
-  2009 in Pakistan
-
-
-Release data2009m - 2009-09-03 10:23:43 -0400
-
-  Samoa and Palestine changes
-
-
-Release data2009l - 2009-08-14 09:13:07 -0400
-
-  Samoa (comments only) and Egypt
-
-
-Release 2009k - 2009-07-20 09:46:08 -0400
-
-  [not summarized]
-
-
-Release data2009j - 2009-06-15 06:43:59 -0400
-
-  Bangladesh change (with a short turnaround since the DST change is
-  impending)
-
-
-Release 2009i - 2009-06-08 09:21:22 -0400
-
-  updating for DST in Bangladesh this year
-
-
-Release 2009h - 2009-05-26 09:19:14 -0400
-
-  [not summarized]
-
-
-Release data2009g - 2009-04-20 16:34:07 -0400
-
-  Cairo
-
-
-Release data2009f - 2009-04-10 11:00:52 -0400
-
-  correct DST in Pakistan
-
-
-Release 2009e - 2009-04-06 09:08:11 -0400
-
-  [not summarized]
-
-
-Release 2009d - 2009-03-23 09:38:12 -0400
-
-  Morocco, Tunisia, Argentina, and American Astronomical Society changes
-
-
-Release data2009c - 2009-03-16 09:47:51 -0400
-
-  change to the start of Cuban DST
-
-
-Release 2009b - 2009-02-09 11:15:22 -0500
-
-  [not summarized]
-
-
-Release 2009a - 2009-01-21 10:09:39 -0500
-
-  [not summarized]
-
-
-Release data2008i - 2008-10-21 12:10:25 -0400
-
-  southamerica and zone.tab files, with Argentina DST rule changes and
-  United States zone reordering and recommenting
-
-
-Release 2008h - 2008-10-13 07:33:56 -0400
-
-  [not summarized]
-
-
-Release 2008g - 2008-10-06 09:03:18 -0400
-
-  Fix a broken HTML anchor and update Brazil's DST transitions;
-  there's also a slight reordering of information in tz-art.htm.
-
-
-Release data2008f - 2008-09-09 22:33:26 -0400
-
-  [not summarized]
-
-
-Release 2008e - 2008-07-28 14:11:17 -0400
-
-  changes by Arthur David Olson and Jesper Nørgaard Welen
-
-
-Release data2008d - 2008-07-07 09:51:38 -0400
-
-  changes by Arthur David Olson, Paul Eggert, and Rodrigo Severo
-
-
-Release data2008c - 2008-05-19 17:48:03 -0400
-
-  Pakistan, Morocco, and Mongolia
-
-
-Release data2008b - 2008-03-24 08:30:59 -0400
-
-  including renaming Asia/Calcutta to Asia/Kolkata, with a backward
-  link provided
-
-
-Release 2008a - 2008-03-08 05:42:16 -0500
-
-  [not summarized]
-
-
-Release 2007k - 2007-12-31 10:25:22 -0500
-
-  most importantly, changes to the "southamerica" file based on
-  Argentina's readoption of daylight saving time
-
-
-Release 2007j - 2007-12-03 09:51:01 -0500
-
-  1. eliminate the "P" (parameter) macro;
-
-  2. the "noncontroversial" changes circulated on the time zone
-  mailing list (less the changes to "logwtmp.c");
-
-  3. eliminate "too many transition" errors when "min" is used in time
-  zone rules;
-
-  4. changes by Paul Eggert (including updated information for Venezuela).
-
-
-Release data2007i - 2007-10-30 10:28:11 -0400
-
-  changes for Cuba and Syria
-
-
-Release 2007h - 2007-10-01 10:05:51 -0400
-
-  changes by Paul Eggert, as well as an updated link to the ICU
-  project in tz-link.htm
-
-
-Release 2007g - 2007-08-20 10:47:59 -0400
-
-  changes by Paul Eggert
-
-  The "leapseconds" file has been updated to incorporate the most
-  recent International Earth Rotation and Reference Systems Service
-  (IERS) bulletin.
-
-  There's an addition to tz-art.htm regarding the television show "Medium".
-
-
-Release 2007f - 2007-05-07 10:46:46 -0400
-
-  changes by Paul Eggert (including Haiti, Turks and Caicos, and New
-  Zealand)
-
-  changes to zic.c to allow hour values greater than 24 (along with
-  Paul's improved time value overflow checking)
-
-
-Release 2007e - 2007-04-02 10:11:52 -0400
-
-  Syria and Honduras changes by Paul Eggert
-
-  zic.c variable renaming changes by Arthur David Olson
-
-
-Release 2007d - 2007-03-20 08:48:30 -0400
-
-  changes by Paul Eggert
-
-  the elimination of white space at the ends of lines
-
-
-Release 2007c - 2007-02-26 09:09:37 -0500
-
-  changes by Paul Eggert
-
-
-Release 2007b - 2007-02-12 09:34:20 -0500
-
-  Paul Eggert's proposed change to the quotation handling logic in zic.c.
-
-  changes to the commentary in "leapseconds" reflecting the IERS
-  announcement that there is to be no positive leap second at the end
-  of June 2007.
-
-
-Release 2007a - 2007-01-08 12:28:29 -0500
-
-  changes by Paul Eggert
-
-  Derick Rethan's Asmara change
-
-  Oscar van Vlijmen's Easter Island local mean time change
-
-  symbolic link changes
-
-
-Release 2006p - 2006-11-27 08:54:27 -0500
-
-  changes by Paul Eggert
-
-
-Release 2006o - 2006-11-06 09:18:07 -0500
-
-  changes by Paul Eggert
-
-
-Release 2006n - 2006-10-10 11:32:06 -0400
-
-  changes by Paul Eggert
-
-
-Release 2006m - 2006-10-02 15:32:35 -0400
-
-  changes for Uruguay, Palestine, and Egypt by Paul Eggert
-
-  (minimalist) changes to zic.8 to clarify "until" information
-
-
-Release data2006l - 2006-09-18 12:58:11 -0400
-
-  Paul's best-effort work on this coming weekend's Egypt time change
-
-
-Release 2006k - 2006-08-28 12:19:09 -0400
-
-  changes by Paul Eggert
-
-
-Release 2006j - 2006-08-21 09:56:32 -0400
-
-  changes by Paul Eggert
-
-
-Release code2006i - 2006-08-07 12:30:55 -0400
-
-  localtime.c fixes
-
-  Ken Pizzini's conversion script
-
-
-Release code2006h - 2006-07-24 09:19:37 -0400
-
-  adds public domain notices to four files
-
-  includes a fix for transition times being off by a second
-
-  adds a new recording to the "arts" file (information courtesy Colin Bowern)
-
-
-Release 2006g - 2006-05-08 17:18:09 -0400
-
-  northamerica changes by Paul Eggert
-
-
-Release 2006f - 2006-05-01 11:46:00 -0400
-
-  a missing version number problem is fixed (with thanks to Bradley
-  White for catching the problem)
-
-
-Release 2006d - 2006-04-17 14:33:43 -0400
-
-  changes by Paul Eggert
-
-  added new items to tz-arts.htm that were found by Paul
-
-
-Release 2006c - 2006-04-03 10:09:32 -0400
-
-  two sets of data changes by Paul Eggert
-
-  a fencepost error fix in zic.c
-
-  changes to zic.c and the "europe" file to minimize differences
-  between output produced by the old 32-bit zic and the new 64-bit
-  version
-
-
-Release 2006b - 2006-02-20 10:08:18 -0500
-  [tz32code2006b + tz64code2006b + tzdata2006b]
-
-  64-bit code
-
-  All SCCS IDs were bumped to "8.1" for this release.
-
-
-Release 2006a - 2006-01-30 08:59:31 -0500
-
-  changes by Paul Eggert (in particular, Indiana time zone moves)
-
-  an addition to the zic manual page to describe how special-case
-  transitions are handled
-
-
-Release 2005r - 2005-12-27 09:27:13 -0500
-
-  Canadian changes by Paul Eggert
-
-  They also add "<pre>" directives to time zone data files and reflect
-  changes to warning message logic in "zdump.c" (but with calls to
-  "gettext" kept unbundled at the suggestion of Ken Pizzini).
-
-
-Release 2005q - 2005-12-13 09:17:09 -0500
-
-  Nothing earth-shaking here:
-	1.  Electronic mail addresses have been removed.
-	2.  Casts of the return value of exit have been removed.
-	3.  Casts of the argument of is.* macros have been added.
-	4.  Indentation in one section of zic.c has been fixed.
-	5.  References to dead URLs in the data files have been dealt with.
-
-
-Release 2005p - 2005-12-05 10:30:53 -0500
-
-  "systemv", "tz-link.htm", and "zdump.c" changes
-  (less the casts of arguments to the is* macros)
-
-
-Release 2005o - 2005-11-28 10:55:26 -0500
-
-  Georgia, Cuba, Nicaragua, and Jordan changes by Paul Eggert
-
-  zdump.c lint fixes by Arthur David Olson
-
-
-Release 2005n - 2005-10-03 09:44:09 -0400
-
-  changes by Paul Eggert (both the Uruguay changes and the Kyrgyzstan
-  et al. changes)
-
-
-Release 2005m - 2005-08-29 12:15:40 -0400
-
-  changes by Paul Eggert (with a small tweak to the tz-art change)
-
-  a declaration of an unused variable has been removed from zdump.c
-
-
-Release 2005l - 2005-08-22 12:06:39 -0400
-
-  changes by Paul Eggert
-
-  overflow/underflow checks by Arthur David Olson, minus changes to
-  the "Theory" file about the pending addition of 64-bit data (I grow
-  less confident of the changes being accepted with each passing day,
-  and the changes no longer increase the data files nine-fold--there's
-  less than a doubling in size by my local Sun's reckoning)
-
-
-Release 2005k - 2005-07-14 14:14:24 -0400
-
-  The "leapseconds" file has been edited to reflect the recently
-  announced leap second at the end of 2005.
-
-  I've also deleted electronic mail addresses from the files as an
-  anti-spam measure.
-
-
-Release 2005j - 2005-06-13 14:34:13 -0400
-
-  These reflect changes to limit the length of time zone abbreviations
-  and the characters used in those abbreviations.
-
-  There are also changes to handle POSIX-style "quoted" time zone
-  environment variables.
-
-  The changes were circulated on the time zone mailing list; the only
-  change since then was the removal of a couple of minimum-length of
-  abbreviation checks.
-
-
-Release data2005i - 2005-04-21 15:04:16 -0400
-
-  changes (most importantly to Nicaragua and Haiti) by Paul Eggert
-
-
-Release 2005h - 2005-04-04 11:24:47 -0400
-
-  changes by Paul Eggert
-
-  minor changes to Makefile and zdump.c to produce more useful output
-  when doing a "make typecheck"
-
-
-Release 2005g - 2005-03-14 10:11:21 -0500
-
-  changes by Paul Eggert (a change to current DST rules in Uruguay and
-  an update to a link to time zone software)
-
-
-Release 2005f - 2005-03-01 08:45:32 -0500
-
-  data and documentation changes by Paul Eggert
-
-
-Release 2005e - 2005-02-10 15:59:44 -0500
-
-  [not summarized]
-
-
-Release code2005d - 2005-01-31 09:21:47 -0500
-
-  make zic complain about links to links if the -v flag is used
-
-  have "make public" do more code checking
-
-  add an include to "localtime.c" for the benefit of gcc systems
-
-
-Release 2005c - 2005-01-17 18:36:29 -0500
-
-  get better results when mktime runs on a system where time_t is double
-
-  changes to the data files (most importantly to Paraguay)
-
-
-Release 2005b - 2005-01-10 09:19:54 -0500
-
-  Get localtime and gmtime working on systems with exotic time_t types.
-
-  Update the leap second commentary in the "leapseconds" file.
-
-
-Release 2005a - 2005-01-01 13:13:44 -0500
-
-  [not summarized]
-
-
-Release code2004i - 2004-12-14 13:42:58 -0500
-
-  Deal with systems where time_t is unsigned.
-
-
-Release code2004h - 2004-12-07 11:40:18 -0500
-
-  64-bit-time_t changes
-
-
-Release 2004g - 2004-11-02 09:06:01 -0500
-
-  update to Cuba (taking effect this weekend)
-
-  other changes by Paul Eggert
-
-  correction of the spelling of Oslo
-
-  changed versions of difftime.c and private.h
-
-
-Release code2004f - 2004-10-21 10:25:22 -0400
-
-  Cope with wide-ranging tm_year values.
-
-
-Release 2004e - 2004-10-11 14:47:21 -0400
-
-  Brazil/Argentina/Israel changes by Paul Eggert
-
-  changes to tz-link.htm by Paul
-
-  one small fix to Makefile
-
-
-Release 2004d - 2004-09-22 08:27:29 -0400
-
-  Avoid overflow problems when TM_YEAR_BASE is added to an integer.
-
-
-Release 2004c - 2004-08-11 12:06:26 -0400
-
-  asctime-related changes
-
-  (variants of) some of the documentation changes suggested by Paul Eggert
-
-
-Release 2004b - 2004-07-19 14:33:35 -0400
-
-  data changes by Paul Eggert - most importantly, updates for Argentina
-
-
-Release 2004a - 2004-05-27 12:00:47 -0400
-
-  changes by Paul Eggert
-
-  Handle DST transitions that occur at the end of a month in some
-  years but at the start of the following month in other years.
-
-  Add a copy of the correspondence that's the basis for claims about
-  DST in the Navajo Nation.
-
-
-Release 2003e - 2003-12-15 09:36:47 -0500
-
-  changes by Arthur David Olson (primarily code changes)
-
-  changes by Paul Eggert (primarily data changes)
-
-  minor changes to "Makefile" and "northamerica" (in the latter case,
-  optimization of the "Toronto" rules)
-
-
-Release 2003d - 2003-10-06 09:34:44 -0400
-
-  changes by Paul Eggert
-
-
-Release 2003c - 2003-09-16 10:47:05 -0400
-
-  Fix bad returns in zic.c's inleap function.
-  Thanks to Bradley White for catching the problem!
-
-
-Release 2003b - 2003-09-16 07:13:44 -0400
-
-  Add a "--version" option (and documentation) to the zic and zdump commands.
-
-  changes to overflow/underflow checking in zic
-
-  a localtime typo fix.
-
-  Update the leapseconds and tz-art.htm files.
-
-
-Release 2003a - 2003-03-24 09:30:54 -0500
-
-  changes by Paul Eggert
-
-  a few additions and modifications to the tz-art.htm file
-
-
-Release 2002d - 2002-10-15 13:12:42 -0400
-
-  changes by Paul Eggert, less the "Britain (UK)" change in iso3166.tab
-
-  There's also a new time zone quote in "tz-art.htm".
-
-
-Release 2002c - 2002-04-04 11:55:20 -0500
-
-  changes by Paul Eggert
-
-  Change zic.c to avoid creating symlinks to files that don't exist.
-
-
-Release 2002b - 2002-01-28 12:56:03 -0500
-
-  [These change notes are for Release 2002a, which was corrupted.
-  2002b was a corrected version of 2002a.]
-
-  changes by Paul Eggert
-
-  Update the "leapseconds" file to note that there'll be no leap
-  second at the end of June, 2002.
-
-  Change "zic.c" to deal with a problem in handling the "Asia/Bishkek" zone.
-
-  Change to "difftime.c" to avoid sizeof problems.
-
-
-Release 2001d - 2001-10-09 13:31:32 -0400
-
-  changes by Paul Eggert
-
-
-Release 2001c - 2001-06-05 13:59:55 -0400
-
-  changes by Paul Eggert and Andrew Brown
-
-
-Release 2001b - 2001-04-05 16:44:38 -0400
-
-  changes by Paul Eggert (modulo jnorgard's typo fix)
-
-  tz-art.htm has been HTMLified.
-
-
-Release 2001a - 2001-03-13 12:57:44 -0500
-
-  changes by Paul Eggert
-
-  An addition to the "leapseconds" file: comments with the text of the
-  latest IERS leap second notice.
-
-  Trailing white space has been removed from data file lines, and
-  repeated spaces in "Rule Jordan" lines in the "asia" file have been
-  converted to tabs.
-
-
-Release 2000h - 2000-12-14 15:33:38 -0500
-
-  changes by Paul Eggert
-
-  one typo fix in the "art" file
-
-  With providence, this is the last update of the millennium.
-
-
-Release 2000g - 2000-10-10 11:35:22 -0400
-
-  changes by Paul Eggert
-
-  correction of John Mackin's name submitted by Robert Elz
-
-  Garry Shandling's Daylight Saving Time joke (!?!) from the recent
-  Emmy Awards broadcast.
-
-
-Release 2000f - 2000-08-10 09:31:58 -0400
-
-  changes by Paul Eggert
-
-  Added information in "tz-art.htm" on a Seinfeld reference to DST.
-
-  Error checking and messages in the "yearistype" script have been
-  improved.
-
-
-Release 2000e - 2000-07-31 09:27:54 -0400
-
-  data changes by Paul Eggert
-
-  a change to the default value of the defined constant HAVE_STRERROR
-
-  the addition of a Dave Barry quote on DST to the tz-arts file
-
-
-Release 2000d - 2000-04-20 15:43:04 -0400
-
-  changes to the documentation and code of strftime for C99 conformance
-
-  a bug fix for date.c
-
-  These are based on (though modified from) changes by Paul Eggert.
-
-
-Release 2000c - 2000-03-04 10:31:43 -0500
-
-  changes by Paul Eggert
-
-
-Release 2000b - 2000-02-21 12:16:29 -0500
-
-  changes by Paul Eggert and Joseph Myers
-
-  modest tweaks to the tz-art.htm and tz-link.htm files
-
-
-Release 2000a - 2000-01-18 09:21:26 -0500
-
-  changes by Paul Eggert
-
-  The two hypertext documents have also been renamed.
-
-
-Release code1999i-data1999j - 1999-11-15 18:43:22 -0500
-
-  Paul Eggert's changes
-
-  additions to the "zic" manual page and the "Arts.htm" file
-
-
-Release code1999h-data1999i - 1999-11-08 14:55:21 -0500
-
-  [not summarized]
-
-
-Release data1999h - 1999-10-07 03:50:29 -0400
-
-  changes by Paul Eggert to "europe" (most importantly, fixing
-  Lithuania and Estonia)
-
-
-Release 1999g - 1999-09-28 11:06:18 -0400
-
-  data changes by Paul Eggert (most importantly, the change for
-  Lebanon that buys correctness for this coming Sunday)
-
-  The "code" file contains changes to "Makefile" and "checktab.awk" to
-  allow better checking of time zone files before they are published.
-
-
-Release 1999f - 1999-09-23 09:48:14 -0400
-
-  changes by Arthur David Olson and Paul Eggert
-
-
-Release 1999e - 1999-08-17 15:20:54 -0400
-
-  changes circulated by Paul Eggert, although the change to handling
-  of DST-specifying time zone names has been commented out for now
-  (search for "XXX" in "localtime.c" for details).  These files also
-  do not make any changes to the start of DST in Brazil.
-
-  In addition to Paul's changes, there are updates to "Arts.htm" and
-  cleanups of URLs.
-
-
-Release 1999d - 1999-03-30 11:31:07 -0500
-
-  changes by Paul Eggert
-
-  The Makefile's "make public" rule has also been changed to do a test
-  compile of each individual time zone data file (which should help
-  avoid problems such as the one we had with Nicosia).
-
-
-Release 1999c - 1999-03-25 09:47:47 -0500
-
-  changes by Paul Eggert, most importantly the change for Chile.
-
-
-Release 1999b - 1999-02-01 17:51:44 -0500
-
-  changes by Paul Eggert
-
-  code changes (suggested by Mani Varadarajan, mani at be.com) for
-  correct handling of symbolic links when building using a relative directory
-
-  code changes to generate correct messages for failed links
-
-  updates to the URLs in Arts.htm
-
-
-Release 1999a - 1999-01-19 16:20:29 -0500
-
-  error message internationalizations and corrections in zic.c and
-  zdump.c (as suggested by Vladimir Michl, vladimir.michl at upol.cz,
-  to whom thanks!)
-
-
-Release code1998h-data1998i - 1998-10-01 09:56:10 -0400
-
-  changes for Brazil, Chile, and Germany
-
-  support for use of "24:00" in the input files for the time zone compiler
-
-
-Release code1998g-data1998h - 1998-09-24 10:50:28 -0400
-
-  changes by Paul Eggert
-
-  correction to a define in the "private.h" file
-
-
-Release data1998g - 1998-08-11 03:28:35 -0000
-  [tzdata1998g.tar.gz is missing!]
-
-  Lithuanian change provided by mgedmin at pub.osf.it
-
-  Move creation of the GMT link with Etc/GMT to "etcetera" (from
-  "backward") to ensure that the GMT file is created even where folks
-  don't want the "backward" links (as suggested by Paul Eggert).
-
-
-Release data1998f - 1998-07-20 13:50:00 -0000
-  [tzdata1998f.tar.gz is missing!]
-
-  Update the "leapseconds" file to include the newly-announced
-  insertion at the end of 1998.
-
-
-Release code1998f - 1998-06-01 10:18:31 -0400
-
-  addition to localtime.c by Guy Harris
-
-
-Release 1998e - 1998-05-28 09:56:26 -0400
-
-  The Makefile is changed to produce zoneinfo-posix rather than
-  zoneinfo/posix, and to produce zoneinfo-leaps rather than
-  zoneinfo/right.
-
-  data changes by Paul Eggert
-
-  changes from Guy Harris to provide asctime_r and ctime_r
-
-  A usno1998 file (substantially identical to usno1997) has been added.
-
-
-Release 1998d - 1998-05-14 11:58:34 -0400
-
-  changes to comments (in particular, elimination of references to CIA maps).
-  "Arts.htm", "WWW.htm", "asia", and "australasia" are the only places
-  where changes occur.
-
-
-Release 1998c - 1998-02-28 12:32:26 -0500
-
-  changes by Paul Eggert (save the "French correction," on which I'll
-  wait for the dust to settle)
-
-  symlink changes
-
-  changes and additions to Arts.htm
-
-
-Release 1998b - 1998-01-17 14:31:51 -0500
-
-  URL cleanups and additions
-
-
-Release 1998a - 1998-01-13 12:37:35 -0500
-
-  changes by Paul Eggert
-
-
-Release code1997i-data1997k - 1997-12-29 09:53:41 -0500
-
-  changes by Paul Eggert, with minor modifications from Arthur David
-  Olson to make the files more browser friendly
-
-
-Release code1997h-data1997j - 1997-12-18 17:47:35 -0500
-
-  minor changes to put "TZif" at the start of each time zone information file
-
-  a rule has also been added to the Makefile so you can
-	make zones
-  to just recompile the zone information files (rather than doing a
-  full "make install" with its other effects).
-
-
-Release data1997i - 1997-10-07 08:45:38 -0400
-
-  changes to Africa by Paul Eggert
-
-
-Release code1997g-data1997h - 1997-09-04 16:56:54 -0400
-
-  corrections for Uruguay (and other locations)
-
-  Arthur David Olson's simple-minded fix allowing mktime to both
-  correctly handle leap seconds and correctly handle tm_sec values
-  upon which arithmetic has been performed.
-
-
-Release code1997f-data1997g - 1997-07-19 13:15:02 -0400
-
-  Paul Eggert's updates
-
-  a small change to a function prototype;
-
-  "Music" has been renamed "Arts.htm", HTMLified, and augmented to
-  include information on Around the World in Eighty Days.
-
-
-Release code1997e-data1997f - 1997-05-03 18:52:34 -0400
-
-  fixes to zic's error handling
-
-  changes inspired by the item circulated on Slovenia
-
-  The description of Web resources has been HTMLified for browsing
-  convenience.
-
-  A new piece of tz-related music has been added to the "Music" file.
-
-
-Release code1997d-data1997e - 1997-03-29 12:48:52 -0500
-
-  Paul Eggert's latest suggestions
-
-
-Release code1997c-data1997d - 1997-03-07 20:37:54 -0500
-
-  changes to "zic.c" to correct performance of the "-s" option
-
-  a new file "usno1997"
-
-
-Release data1997c - 1997-03-04 09:58:18 -0500
-
-  changes in Israel
-
-
-Release 1997b - 1997-02-27 18:34:19 -0500
-
-  The data file incorporates the 1997 leap second.
-
-  The code file incorporates Arthur David Olson's take on the
-  zic/multiprocessor/directory-creation situation.
-
-
-Release 1997a - 1997-01-21 09:11:10 -0500
-
-  Paul Eggert's Antarctica (and other changes)
-
-  Arthur David Olson finessed the "getopt" issue by checking against
-  both -1 and EOF (regardless of POSIX, SunOS 4.1.1's manual says -1
-  is returned while SunOS 5.5's manual says EOF is returned).
-
-
-Release code1996o-data1996n - 1996-12-27 21:42:05 -0500
-
-  Paul Eggert's latest changes
-
-
-Release code1996n - 1996-12-16 09:42:02 -0500
-
-  link snapping fix from Bruce Evans (via Garrett Wollman)
-
-
-Release data1996m - 1996-11-24 02:37:34 -0000
-  [tzdata1996m.tar.gz is missing!]
-
-  Paul Eggert's batch of changes
-
-
-Release code1996m-data1996l - 1996-11-05 14:00:12 -0500
-
-  No functional changes here; the files have simply been changed to
-  make more use of ISO style dates in comments. The names of the above
-  files now include the year in full.
-
-
-Release code96l - 1996-09-08 17:12:20 -0400
-
-  tzcode96k was missing a couple of pieces.
-
-
-Release 96k - 1996-09-08 16:06:22 -0400
-
-  the latest round of changes from Paul Eggert
-
-  the recent Year 2000 material
-
-
-Release code96j - 1996-07-30 13:18:53 -0400
-
-  Set sp->typecnt as suggested by Timothy Patrick Murphy.
-
-
-Release code96i - 1996-07-27 20:11:35 -0400
-
-  Paul's suggested patch for strftime %V week numbers
-
-
-Release data96i - 1996-07-01 18:13:04 -0400
-
-  "northamerica" and "europe" changes by Paul Eggert
-
-
-Release code96h - 1996-06-05 08:02:21 -0400
-
-  fix for handling transitions specified in Universal Time
-
-  Some "public domain" notices have also been added.
-
-
-Release code96g - 1996-05-16 14:00:26 -0400
-
-  fix for the simultaneous-DST-and-zone-change challenge
-
-
-Release data96h - 1996-05-09 17:40:51 -0400
-
-  changes by Paul Eggert
-
-
-Release code96f-data96g - 1996-05-03 03:09:59 -0000
-  [tzcode96f.tar.gz + tzdata96g.tar.gz are both missing!]
-
-  The changes get us some of the way to fixing the problems noted in Paul
-  Eggert's letter yesterday (in addition to a few others).  The approach
-  has been to make zic a bit smarter about figuring out what time zone
-  abbreviations apply just after the time specified in the "UNTIL" part
-  of a zone line.  Putting the smarts in zic means avoiding having
-  transition times show up in both "Zone" lines and "Rule" lines, which
-  in turn avoids multiple transition time entries in time zone files.
-  (This also makes the zic input files such as "europe" a bit shorter and
-  should ease maintenance.)
-
-
-Release data96f - 1996-04-19 19:20:03 -0000
-  [tzdata96f.tar.gz is missing!]
-
-  The only changes are to the "northamerica" file; the time zone
-  abbreviation for Denver is corrected to MST (and MDT), and the
-  comments for Mexico have been updated.
-
-
-Release data96e - 1996-03-19 17:37:26 -0500
-
-  Proposals by Paul Eggert, in particular the Portugal change that
-  comes into play at the end of this month.
-
-
-Release data96d - 1996-03-18 20:49:39 -0500
-
-  [not summarized]
-
-
-Release code96e - 1996-02-29 15:43:27 -0000
-  [tzcode96e.tar.gz is missing!]
-
-  internationalization changes and the fix to the documentation for strftime
-
-
-Release code96d-data96c - 1996-02-12 11:05:27 -0500
-
-  The "code" file simply updates Bob Kridle's electronic address.
-
-  The "data" file updates rules for Mexico.
-
-
-Release data96b - 1996-01-27 15:44:42 -0500
-
-  Kiribati change
-
-
-Release code96c - 1996-01-16 16:58:15 -0500
-
-  leap-year streamlining and binary-search changes
-
-  fix to newctime.3
-
-
-Release code96b - 1996-01-10 20:42:39 -0500
-
-  fixes and enhancements from Paul Eggert, including code that
-  emulates the behavior of recent versions of the SunOS "date"
-  command.
-
-
-Release 96a - 1996-01-06 09:08:24 -0500
-
-  Israel updates
-
-  fixes to strftime.c for correct ISO 8601 week number generation,
-  plus support for two new formats ('G' and 'g') to give ISO 8601 year
-  numbers (which are not necessarily the same as calendar year numbers)
-
-
-Release code95i-data95m - 1995-12-21 12:46:47 -0500
-
-  The latest revisions from Paul Eggert are included, the usno1995
-  file has been updated, and a new file ("WWW") covering useful URLs
-  has been added.
-
-
-Release code95h-data95l - 1995-12-19 18:10:12 -0500
-
-  A simplification of a macro definition, a change to data for Sudan,
-  and (for last minute shoppers) notes in the "Music" file on the CD
-  "Old Man Time".
-
-
-Release code95g-data95k - 1995-10-30 10:32:47 -0500
-
-  (slightly reformatted) 8-bit-clean proposed patch
-
-  minor patch: US/Eastern -> America/New_York
-
-  snapshot of the USNO's latest data ("usno1995")
-
-  some other minor cleanups
-
-
-Release code95f-data95j - 1995-10-28 21:01:34 -0000
-  [tzcode95f.tar.gz + tzdata95j.tar.gz are both missing!]
-
-  European cleanups
-
-  support for 64-bit time_t's
-
-  optimization in localtime.c
-
-
-Release code95e - 1995-10-13 13:23:57 -0400
-
-  the mktime change to scan from future to past when trying to find time zone
-  offsets
-
-
-Release data95i - 1995-09-26 10:43:26 -0400
-
-  For Canada/Central, guess that the Sun customer's "one week too
-  early" was just a approximation, and the true error is one month
-  too early.  This is consistent with the rest of Canada.
-
-
-Release data95h - 1995-09-21 11:26:48 -0400
-
-  latest changes from Paul Eggert
-
-
-Release code95d - 1995-09-14 11:14:45 -0400
-
-  the addition of a "Music" file, which documents four recorded
-  versions of the tune "Save That Time".
-
-
-Release data95g - 1995-09-01 17:21:36 -0400
-
-  "yearistype" correction
-
-
-Release data95f - 1995-08-28 20:46:56 -0400
-
-  Paul Eggert's change to the australasia file
-
-
-Release data95e - 1995-07-08 18:02:34 -0400
-
-  The only change is a leap second at the end of this year.
-  Thanks to Bradley White for forwarding news on the leap second.
-
-
-Release data95d - 1995-07-03 13:26:22 -0400
-
-  Paul Eggert's changes
-
-
-Release data95c - 1995-07-02 19:19:28 -0400
-
-  changes to "asia", "backward", "europe", and "southamerica"
-  (read: northamericacentrics need not apply)
-
-
-Release code95c - 1995-03-13 14:00:46 -0500
-
-  one-line fix for sign extension problems in detzcode
-
-
-Release 95b - 1995-03-04 11:22:38 -0500
-
-  Minor changes in both:
-
-  The "code" file contains a workaround for the lack of "unistd.h" in
-  Microsoft C++ version 7.
-
-  The "data" file contains a fixed "Link" for America/Shiprock.
-
-
-Release 94h - 1994-12-10 12:51:14 -0500
-
-  The files:
-
-  *	incorporate the changes to "zdump" and "date" to make changes to
-	the "TZ" environment variable permanent;
-
-  *	incorporate the table changes by Paul Eggert;
-
-  *	include (and document) support for universal time specifications in
-	data files - but do not (yet) include use of this feature in the
-	data files.
-
-  Think of this as "TZ Classic" - the software has been set up not to break if
-  universal time shows up in its input, and data entries have been
-  left as is so as not to break existing implementations.
-
-
-Release data94f - 1994-08-20 12:56:09 -0400
-
-  (with thanks!) the latest data updates from Paul Eggert
-
-
-Release data94e - 1994-06-04 13:13:53 -0400
-
-  [not summarized]
-
-
-Release code94g - 1994-05-05 12:14:07 -0400
-
-  fix missing "optind.c" and a reference to it in the Makefile
-
-
-Release code94f - 1994-05-05 13:00:33 -0000
-  [tzcode94f.tar.gz is missing!]
-
-  changes to avoid overflow in difftime, as well as changes to cope
-  with the 52/53 challenge in strftime
-
-
-Release code94e - 1994-03-30 23:32:59 -0500
-
-  change for the benefit of PCTS
-
-
-Release 94d - 1994-02-24 15:42:25 -0500
-
-  Avoid clashes with POSIX semantics for zones such as GMT+4.
-
-  Some other very minor housekeeping is also present.
-
-
-Release code94c - 1994-02-10 08:52:40 -0500
-
-  Fix bug where mkdirs was broken unless you compile with
-  -fwritable-strings (which is generally losing to do).
-
-
-Release 94b - 1994-02-07 10:04:33 -0500
-
-  work by Paul Eggert who notes:
-
-  I found another book of time zone histories by E W Whitman; it's not
-  as extensive as Shanks but has a few goodies of its own.  I used it
-  to update the tables.  I also fixed some more as a result of
-  correspondence with Adam David and Peter Ilieve, and move some stray
-  links from 'europe' to 'backward'.  I corrected some scanning errors
-  in usno1989.
-
-  As far as the code goes, I fixed zic to allow years in the range
-  INT_MIN to INT_MAX; this fixed a few boundary conditions around 1900.
-  And I cleaned up the zic documentation a little bit.
-
-
-Release data94a - 1994-02-03 08:58:54 -0500
-
-  It simply incorporates the recently announced leap second into the
-  "leapseconds" file.
-
-
-Release 93g - 1993-11-22 17:28:27 -0500
-
-  Paul Eggert has provided a good deal of historic information (based
-  on Shanks), and there are some code changes to deal with the buglets
-  that crawled out in dealing with the new information.
-
-
-Release 93f - 1993-10-15 12:27:46 -0400
-
-  Paul Eggert's changes
-
-
-Release 93e - 1993-09-05 21:21:44 -0400
-
-  This has updated data for Israel, England, and Kwajalein.  There's
-  also an update to "zdump" to cope with Kwajalein's 24-hour jump.
-  Thanks to Paul Eggert and Peter Ilieve for the changes.
-
-
-Release 93d - 1993-06-17 23:34:17 -0400
-
-  new fix and new data on Israel
-
-
-Release 93c - 1993-06-06 19:31:55 -0400
-
-  [not summarized]
-
-
-Release 93b - 1993-02-02 14:53:58 -0500
-
-  updated "leapseconds" file
-
-
-Release 93 - 1993-01-08 07:01:06 -0500
-
-  At kre's suggestion, the package has been split in two - a code piece
-  (which also includes documentation) that's only of use to folks who
-  want to recompile things and a data piece useful to anyone who can
-  run "zic".
-
-  The new version has a few changes to the data files, a few
-  portability changes, and an off-by-one fix (with thanks to
-  Tom Karzes at deshaw.com for providing a description and a
-  solution).
-
-
-Release 92c - 1992-11-21 17:35:36 -0000
-  [tz92c.tar.Z is missing!]
-
-  The fallout from the latest round of DST transitions.
-
-  There are changes for Portugal, Saskatchewan, and "Pacific-New";
-  there's also a change to "zic.c" that makes it portable to more systems.
-
-
-Release 92 - 1992-04-25 18:17:03 -0000
-  [tz92.tar.Z is missing!]
-
-  By popular demand (well, at any rate, following a request by kre at munnari)
-
-
-The 1989 update of the time zone package featured:
-
-  *	POSIXization (including interpretation of POSIX-style TZ environment
-	variables, provided by Guy Harris),
-  *	ANSIfication (including versions of "mktime" and "difftime"),
-  *	SVIDulation (an "altzone" variable)
-  *	MACHination (the "gtime" function)
-  *	corrections to some time zone data (including corrections to the rules
-	for Great Britain and New Zealand)
-  *	reference data from the United States Naval Observatory for folks who
-	want to do additional time zones
-  *	and the 1989 data for Saudi Arabia.
-
-  (Since this code will be treated as "part of the implementation" in some
-  places and as "part of the application" in others, there's no good way to
-  name functions, such as timegm, that are not part of the proposed ANSI C
-  standard; such functions have kept their old, underscore-free names in this
-  update.)
-
-  And the "dysize" function has disappeared; it was present to allow
-  compilation of the "date" command on old BSD systems, and a version of "date"
-  is now provided in the package.  The "date" command is not created when you
-  "make all" since it may lack options provided by the version distributed with
-  your operating system, or may not interact with the system in the same way
-  the native version does.
-
-  Since POSIX frowns on correct leap second handling, the default behavior of
-  the "zic" command (in the absence of a "-L" option) has been changed to omit
-  leap second information from its output files.
-
-
------
-Notes
-
-This file contains copies of the part of each release announcement
-that talks about the changes in that release.  The text has been
-adapted and reformatted for the purposes of this file.
-
-Typically a release R consists of a pair of tarball files,
-tzcodeR.tar.gz and tzdataR.tar.gz.  However, some releases (e.g.,
-code2010a, data2012c) consist of just one or the other tarball, and a
-few (e.g., code2012c-data2012d) have tarballs with mixed version
-numbers.
-
-Release time stamps are taken from the release's commit (for newer,
-git releases), from the newest file in the tarball (for older
-releases, where this info is available) or from the email announcing
-the release (if all else fails; these are marked with a time zone of
--0000 and an "is missing!" comment).
-
-Earlier versions of the code and data were not announced on the tz
-list and are not summarized here.
-
-This file is in the public domain.
-
-Local Variables:
-coding: utf-8
-End:
diff --git a/lib/libc/time/README b/lib/libc/time/README
deleted file mode 100644
index 06ef1d919..000000000
--- a/lib/libc/time/README
+++ /dev/null
@@ -1,61 +0,0 @@
-README for the tz distribution
-
-"What time is it?" -- Richard Deacon as The King
-"Any time you want it to be." -- Frank Baxter as The Scientist
-					(from the Bell System film "About Time")
-
-The Time Zone Database (often called tz or zoneinfo) contains code and
-data that represent the history of local time for many representative
-locations around the globe.  It is updated periodically to reflect
-changes made by political bodies to time zone boundaries, UTC offsets,
-and daylight-saving rules.
-
-Unless otherwise specified, all files in the tz code and data are in
-the public domain, so clarified as of 2009-05-17 by Arthur David Olson.
-The few exceptions are code derived from BSD, which uses the BSD license.
-
-Here is a recipe for acquiring, building, installing, and testing the
-tz distribution on a GNU/Linux or similar host.
-
-	mkdir tz
-	cd tz
-	wget --retr-symlinks 'ftp://ftp.iana.org/tz/tz*-latest.tar.gz'
-	gzip -dc tzcode-latest.tar.gz | tar -xf -
-	gzip -dc tzdata-latest.tar.gz | tar -xf -
-
-Be sure to read the comments in "Makefile" and make any changes needed
-to make things right for your system, especially if you are using some
-platform other than GNU/Linux.  Then run the following commands,
-substituting your desired installation directory for "$HOME/tzdir":
-
-	make TOPDIR=$HOME/tzdir install
-	$HOME/tzdir/etc/zdump -v America/Los_Angeles
-
-Historical local time information has been included here to:
-
-*	provide a compendium of data about the history of civil time
-	that is useful even if not 100% accurate;
-
-*	give an idea of the variety of local time rules that have
-	existed in the past and thus an idea of the variety that may be
-	expected in the future;
-
-*	provide a test of the generality of the local time rule description
-	system.
-
-The information in the time zone data files is by no means authoritative;
-fixes and enhancements are welcome.  Please see the file CONTRIBUTING
-for details.
-
-Thanks to these Time Zone Caballeros who've made major contributions to the
-time conversion package: Keith Bostic; Bob Devine; Paul Eggert; Robert Elz;
-Guy Harris; Mark Horton; John Mackin; and Bradley White.  Thanks also to
-Michael Bloom, Art Neilson, Stephen Prince, John Sovereign, and Frank Wales
-for testing work, and to Gwillim Law for checking local mean time data.
-Thanks in particular to Arthur David Olson, the project's founder and first
-maintainer, to whom the time zone community owes the greatest debt of all.
-None of them are responsible for remaining errors.
-
-Look in <ftp://ftp.iana.org/tz/releases/> for updated versions of these files.
-
-Please send comments or information to tz@iana.org.
diff --git a/lib/libc/time/Theory b/lib/libc/time/Theory
deleted file mode 100644
index 96cba5172..000000000
--- a/lib/libc/time/Theory
+++ /dev/null
@@ -1,790 +0,0 @@
-Theory and pragmatics of the tz code and data
-
-
------ Outline -----
-
-	Scope of the tz database
-	Names of time zone rules
-	Time zone abbreviations
-	Accuracy of the tz database
-	Time and date functions
-	Calendrical issues
-	Time and time zones on Mars
-
-
------ Scope of the tz database -----
-
-The tz database attempts to record the history and predicted future of
-all computer-based clocks that track civil time.  To represent this
-data, the world is partitioned into regions whose clocks all agree
-about time stamps that occur after the somewhat-arbitrary cutoff point
-of the POSIX Epoch (1970-01-01 00:00:00 UTC).  For each such region,
-the database records all known clock transitions, and labels the region
-with a notable location.  Although 1970 is a somewhat-arbitrary
-cutoff, there are significant challenges to moving the cutoff earlier
-even by a decade or two, due to the wide variety of local practices
-before computer timekeeping became prevalent.
-
-Clock transitions before 1970 are recorded for each such location,
-because most systems support time stamps before 1970 and could
-misbehave if data entries were omitted for pre-1970 transitions.
-However, the database is not designed for and does not suffice for
-applications requiring accurate handling of all past times everywhere,
-as it would take far too much effort and guesswork to record all
-details of pre-1970 civil timekeeping.
-
-As described below, reference source code for using the tz database is
-also available.  The tz code is upwards compatible with POSIX, an
-international standard for UNIX-like systems.  As of this writing, the
-current edition of POSIX is:
-
-  The Open Group Base Specifications Issue 7
-  IEEE Std 1003.1, 2013 Edition
-  <http://pubs.opengroup.org/onlinepubs/9699919799/>
-
-
-
------ Names of time zone rules -----
-
-Each of the database's time zone rules has a unique name.
-Inexperienced users are not expected to select these names unaided.
-Distributors should provide documentation and/or a simple selection
-interface that explains the names; for one example, see the 'tzselect'
-program in the tz code.  The Unicode Common Locale Data Repository
-<http://cldr.unicode.org/> contains data that may be useful for other
-selection interfaces.
-
-The time zone rule naming conventions attempt to strike a balance
-among the following goals:
-
- * Uniquely identify every region where clocks have agreed since 1970.
-   This is essential for the intended use: static clocks keeping local
-   civil time.
-
- * Indicate to experts where that region is.
-
- * Be robust in the presence of political changes.  For example, names
-   of countries are ordinarily not used, to avoid incompatibilities
-   when countries change their name (e.g. Zaire->Congo) or when
-   locations change countries (e.g. Hong Kong from UK colony to
-   China).
-
- * Be portable to a wide variety of implementations.
-
- * Use a consistent naming conventions over the entire world.
-
-Names normally have the form AREA/LOCATION, where AREA is the name
-of a continent or ocean, and LOCATION is the name of a specific
-location within that region.  North and South America share the same
-area, 'America'.  Typical names are 'Africa/Cairo', 'America/New_York',
-and 'Pacific/Honolulu'.
-
-Here are the general rules used for choosing location names,
-in decreasing order of importance:
-
-	Use only valid POSIX file name components (i.e., the parts of
-		names other than '/').  Do not use the file name
-		components '.' and '..'.  Within a file name component,
-		use only ASCII letters, '.', '-' and '_'.  Do not use
-		digits, as that might create an ambiguity with POSIX
-		TZ strings.  A file name component must not exceed 14
-		characters or start with '-'.  E.g., prefer 'Brunei'
-		to 'Bandar_Seri_Begawan'.  Exceptions: see the discussion
-		of legacy names below.
-	A name must not be empty, or contain '//', or start or end with '/'.
-	Do not use names that differ only in case.  Although the reference
-		implementation is case-sensitive, some other implementations
-		are not, and they would mishandle names differing only in case.
-	If one name A is an initial prefix of another name AB (ignoring case),
-		then B must not start with '/', as a regular file cannot have
-		the same name as a directory in POSIX.  For example,
-		'America/New_York' precludes 'America/New_York/Bronx'.
-	Uninhabited regions like the North Pole and Bouvet Island
-		do not need locations, since local time is not defined there.
-	There should typically be at least one name for each ISO 3166-1
-		officially assigned two-letter code for an inhabited country
-		or territory.
-	If all the clocks in a region have agreed since 1970,
-		don't bother to include more than one location
-		even if subregions' clocks disagreed before 1970.
-		Otherwise these tables would become annoyingly large.
-	If a name is ambiguous, use a less ambiguous alternative;
-		e.g. many cities are named San José and Georgetown, so
-		prefer 'Costa_Rica' to 'San_Jose' and 'Guyana' to 'Georgetown'.
-	Keep locations compact.  Use cities or small islands, not countries
-		or regions, so that any future time zone changes do not split
-		locations into different time zones.  E.g. prefer 'Paris'
-		to 'France', since France has had multiple time zones.
-	Use mainstream English spelling, e.g. prefer 'Rome' to 'Roma', and
-		prefer 'Athens' to the Greek 'Αθήνα' or the Romanized 'Athína'.
-		The POSIX file name restrictions encourage this rule.
-	Use the most populous among locations in a zone,
-		e.g. prefer 'Shanghai' to 'Beijing'.  Among locations with
-		similar populations, pick the best-known location,
-		e.g. prefer 'Rome' to 'Milan'.
-	Use the singular form, e.g. prefer 'Canary' to 'Canaries'.
-	Omit common suffixes like '_Islands' and '_City', unless that
-		would lead to ambiguity.  E.g. prefer 'Cayman' to
-		'Cayman_Islands' and 'Guatemala' to 'Guatemala_City',
-		but prefer 'Mexico_City' to 'Mexico' because the country
-		of Mexico has several time zones.
-	Use '_' to represent a space.
-	Omit '.' from abbreviations in names, e.g. prefer 'St_Helena'
-		to 'St._Helena'.
-	Do not change established names if they only marginally
-		violate the above rules.  For example, don't change
-		the existing name 'Rome' to 'Milan' merely because
-		Milan's population has grown to be somewhat greater
-		than Rome's.
-	If a name is changed, put its old spelling in the 'backward' file.
-		This means old spellings will continue to work.
-
-The file 'zone1970.tab' lists geographical locations used to name time
-zone rules.  It is intended to be an exhaustive list of names for
-geographic regions as described above; this is a subset of the names
-in the data.  Although a 'zone1970.tab' location's longitude
-corresponds to its LMT offset with one hour for every 15 degrees east
-longitude, this relationship is not exact.
-
-Older versions of this package used a different naming scheme,
-and these older names are still supported.
-See the file 'backward' for most of these older names
-(e.g., 'US/Eastern' instead of 'America/New_York').
-The other old-fashioned names still supported are
-'WET', 'CET', 'MET', and 'EET' (see the file 'europe').
-
-Older versions of this package defined legacy names that are
-incompatible with the first rule of location names, but which are
-still supported.  These legacy names are mostly defined in the file
-'etcetera'.  Also, the file 'backward' defines the legacy names
-'GMT0', 'GMT-0', 'GMT+0' and 'Canada/East-Saskatchewan', and the file
-'northamerica' defines the legacy names 'EST5EDT', 'CST6CDT',
-'MST7MDT', and 'PST8PDT'.
-
-Excluding 'backward' should not affect the other data.  If
-'backward' is excluded, excluding 'etcetera' should not affect the
-remaining data.
-
-
------ Time zone abbreviations -----
-
-When this package is installed, it generates time zone abbreviations
-like 'EST' to be compatible with human tradition and POSIX.
-Here are the general rules used for choosing time zone abbreviations,
-in decreasing order of importance:
-
-	Use abbreviations that consist of three or more ASCII letters.
-		Previous editions of this database also used characters like
-		' ' and '?', but these characters have a special meaning to
-		the shell and cause commands like
-			set `date`
-		to have unexpected effects.
-		Previous editions of this rule required upper-case letters,
-		but the Congressman who introduced Chamorro Standard Time
-		preferred "ChST", so the rule has been relaxed.
-
-		This rule guarantees that all abbreviations could have
-		been specified by a POSIX TZ string.  POSIX
-		requires at least three characters for an
-		abbreviation.  POSIX through 2000 says that an abbreviation
-		cannot start with ':', and cannot contain ',', '-',
-		'+', NUL, or a digit.  POSIX from 2001 on changes this
-		rule to say that an abbreviation can contain only '-', '+',
-		and alphanumeric characters from the portable character set
-		in the current locale.  To be portable to both sets of
-		rules, an abbreviation must therefore use only ASCII
-		letters.
-
-	Use abbreviations that are in common use among English-speakers,
-		e.g. 'EST' for Eastern Standard Time in North America.
-		We assume that applications translate them to other languages
-		as part of the normal localization process; for example,
-		a French application might translate 'EST' to 'HNE'.
-
-	For zones whose times are taken from a city's longitude, use the
-		traditional xMT notation, e.g. 'PMT' for Paris Mean Time.
-		The only name like this in current use is 'GMT'.
-
-	Use 'LMT' for local mean time of locations before the introduction
-		of standard time; see "Scope of the tz database".
-
-	If there is no common English abbreviation, use numeric offsets like
-		-05 and +0830 that are generated by zic's %z notation.
-
-    [The remaining guidelines predate the introduction of %z.
-    They are problematic as they mean tz data entries invent
-    notation rather than record it.  These guidelines are now
-    deprecated and the plan is to gradually move to %z for
-    inhabited locations and to "-00" for uninhabited locations.]
-
-	If there is no common English abbreviation, abbreviate the English
-		translation of the usual phrase used by native speakers.
-		If this is not available or is a phrase mentioning the country
-		(e.g. "Cape Verde Time"), then:
-
-		When a country is identified with a single or principal zone,
-			append 'T' to the country's ISO	code, e.g. 'CVT' for
-			Cape Verde Time.  For summer time append 'ST';
-			for double summer time append 'DST'; etc.
-		Otherwise, take the first three letters of an English place
-			name identifying each zone and append 'T', 'ST', etc.
-			as before; e.g. 'VLAST' for VLAdivostok Summer Time.
-
-	Use UT (with time zone abbreviation 'zzz') for locations while
-		uninhabited.  The 'zzz' mnemonic is that these locations are,
-		in some sense, asleep.
-
-Application writers should note that these abbreviations are ambiguous
-in practice: e.g. 'CST' has a different meaning in China than
-it does in the United States.  In new applications, it's often better
-to use numeric UT offsets like '-0600' instead of time zone
-abbreviations like 'CST'; this avoids the ambiguity.
-
-
------ Accuracy of the tz database -----
-
-The tz database is not authoritative, and it surely has errors.
-Corrections are welcome and encouraged; see the file CONTRIBUTING.
-Users requiring authoritative data should consult national standards
-bodies and the references cited in the database's comments.
-
-Errors in the tz database arise from many sources:
-
- * The tz database predicts future time stamps, and current predictions
-   will be incorrect after future governments change the rules.
-   For example, if today someone schedules a meeting for 13:00 next
-   October 1, Casablanca time, and tomorrow Morocco changes its
-   daylight saving rules, software can mess up after the rule change
-   if it blithely relies on conversions made before the change.
-
- * The pre-1970 entries in this database cover only a tiny sliver of how
-   clocks actually behaved; the vast majority of the necessary
-   information was lost or never recorded.  Thousands more zones would
-   be needed if the tz database's scope were extended to cover even
-   just the known or guessed history of standard time; for example,
-   the current single entry for France would need to split into dozens
-   of entries, perhaps hundreds.
-
- * Most of the pre-1970 data entries come from unreliable sources, often
-   astrology books that lack citations and whose compilers evidently
-   invented entries when the true facts were unknown, without
-   reporting which entries were known and which were invented.
-   These books often contradict each other or give implausible entries,
-   and on the rare occasions when they are checked they are
-   typically found to be incorrect.
-
- * For the UK the tz database relies on years of first-class work done by
-   Joseph Myers and others; see <http://www.polyomino.org.uk/british-time/>.
-   Other countries are not done nearly as well.
-
- * Sometimes, different people in the same city would maintain clocks
-   that differed significantly.  Railway time was used by railroad
-   companies (which did not always agree with each other),
-   church-clock time was used for birth certificates, etc.
-   Often this was merely common practice, but sometimes it was set by law.
-   For example, from 1891 to 1911 the UT offset in France was legally
-   0:09:21 outside train stations and 0:04:21 inside.
-
- * Although a named location in the tz database stands for the
-   containing region, its pre-1970 data entries are often accurate for
-   only a small subset of that region.  For example, Europe/London
-   stands for the United Kingdom, but its pre-1847 times are valid
-   only for locations that have London's exact meridian, and its 1847
-   transition to GMT is known to be valid only for the L&NW and the
-   Caledonian railways.
-
- * The tz database does not record the earliest time for which a zone's
-   data entries are thereafter valid for every location in the region.
-   For example, Europe/London is valid for all locations in its
-   region after GMT was made the standard time, but the date of
-   standardization (1880-08-02) is not in the tz database, other than
-   in commentary.  For many zones the earliest time of validity is
-   unknown.
-
- * The tz database does not record a region's boundaries, and in many
-   cases the boundaries are not known.  For example, the zone
-   America/Kentucky/Louisville represents a region around the city of
-   Louisville, the boundaries of which are unclear.
-
- * Changes that are modeled as instantaneous transitions in the tz
-   database were often spread out over hours, days, or even decades.
-
- * Even if the time is specified by law, locations sometimes
-   deliberately flout the law.
-
- * Early timekeeping practices, even assuming perfect clocks, were
-   often not specified to the accuracy that the tz database requires.
-
- * Sometimes historical timekeeping was specified more precisely
-   than what the tz database can handle.  For example, from 1909 to
-   1937 Netherlands clocks were legally UT+00:19:32.13, but the tz
-   database cannot represent the fractional second.
-
- * Even when all the timestamp transitions recorded by the tz database
-   are correct, the tz rules that generate them may not faithfully
-   reflect the historical rules.  For example, from 1922 until World
-   War II the UK moved clocks forward the day following the third
-   Saturday in April unless that was Easter, in which case it moved
-   clocks forward the previous Sunday.  Because the tz database has no
-   way to specify Easter, these exceptional years are entered as
-   separate tz Rule lines, even though the legal rules did not change.
-
- * The tz database models pre-standard time using the proleptic Gregorian
-   calendar and local mean time (LMT), but many people used other
-   calendars and other timescales.  For example, the Roman Empire used
-   the Julian calendar, and had 12 varying-length daytime hours with a
-   non-hour-based system at night.
-
- * Early clocks were less reliable, and data entries do not represent
-   this unreliability.
-
- * As for leap seconds, civil time was not based on atomic time before
-   1972, and we don't know the history of earth's rotation accurately
-   enough to map SI seconds to historical solar time to more than
-   about one-hour accuracy.  See: Morrison LV, Stephenson FR.
-   Historical values of the Earth's clock error Delta T and the
-   calculation of eclipses. J Hist Astron. 2004;35:327-36
-   <http://adsabs.harvard.edu/full/2004JHA....35..327M>;
-   Historical values of the Earth's clock error. J Hist Astron. 2005;36:339
-   <http://adsabs.harvard.edu/full/2005JHA....36..339M>.
-
- * The relationship between POSIX time (that is, UTC but ignoring leap
-   seconds) and UTC is not agreed upon after 1972.  Although the POSIX
-   clock officially stops during an inserted leap second, at least one
-   proposed standard has it jumping back a second instead; and in
-   practice POSIX clocks more typically either progress glacially during
-   a leap second, or are slightly slowed while near a leap second.
-
- * The tz database does not represent how uncertain its information is.
-   Ideally it would contain information about when data entries are
-   incomplete or dicey.  Partial temporal knowledge is a field of
-   active research, though, and it's not clear how to apply it here.
-
-In short, many, perhaps most, of the tz database's pre-1970 and future
-time stamps are either wrong or misleading.  Any attempt to pass the
-tz database off as the definition of time should be unacceptable to
-anybody who cares about the facts.  In particular, the tz database's
-LMT offsets should not be considered meaningful, and should not prompt
-creation of zones merely because two locations differ in LMT or
-transitioned to standard time at different dates.
-
-
------ Time and date functions -----
-
-The tz code contains time and date functions that are upwards
-compatible with those of POSIX.
-
-POSIX has the following properties and limitations.
-
-*	In POSIX, time display in a process is controlled by the
-	environment variable TZ.  Unfortunately, the POSIX TZ string takes
-	a form that is hard to describe and is error-prone in practice.
-	Also, POSIX TZ strings can't deal with other (for example, Israeli)
-	daylight saving time rules, or situations where more than two
-	time zone abbreviations are used in an area.
-
-	The POSIX TZ string takes the following form:
-
-		stdoffset[dst[offset][,date[/time],date[/time]]]
-
-	where:
-
-	std and dst
-		are 3 or more characters specifying the standard
-		and daylight saving time (DST) zone names.
-		Starting with POSIX.1-2001, std and dst may also be
-		in a quoted form like "<UTC+10>"; this allows
-		"+" and "-" in the names.
-	offset
-		is of the form '[+-]hh:[mm[:ss]]' and specifies the
-		offset west of UT.  'hh' may be a single digit; 0<=hh<=24.
-		The default DST offset is one hour ahead of standard time.
-	date[/time],date[/time]
-		specifies the beginning and end of DST.  If this is absent,
-		the system supplies its own rules for DST, and these can
-		differ from year to year; typically US DST rules are used.
-	time
-		takes the form 'hh:[mm[:ss]]' and defaults to 02:00.
-		This is the same format as the offset, except that a
-		leading '+' or '-' is not allowed.
-	date
-		takes one of the following forms:
-		Jn (1<=n<=365)
-			origin-1 day number not counting February 29
-		n (0<=n<=365)
-			origin-0 day number counting February 29 if present
-		Mm.n.d (0[Sunday]<=d<=6[Saturday], 1<=n<=5, 1<=m<=12)
-			for the dth day of week n of month m of the year,
-			where week 1 is the first week in which day d appears,
-			and '5' stands for the last week in which day d appears
-			(which may be either the 4th or 5th week).
-			Typically, this is the only useful form;
-			the n and Jn forms are rarely used.
-
-	Here is an example POSIX TZ string, for US Pacific time using rules
-	appropriate from 1987 through 2006:
-
-		TZ='PST8PDT,M4.1.0/02:00,M10.5.0/02:00'
-
-	This POSIX TZ string is hard to remember, and mishandles time stamps
-	before 1987 and after 2006.  With this package you can use this
-	instead:
-
-		TZ='America/Los_Angeles'
-
-*	POSIX does not define the exact meaning of TZ values like "EST5EDT".
-	Typically the current US DST rules are used to interpret such values,
-	but this means that the US DST rules are compiled into each program
-	that does time conversion.  This means that when US time conversion
-	rules change (as in the United States in 1987), all programs that
-	do time conversion must be recompiled to ensure proper results.
-
-*	In POSIX, there's no tamper-proof way for a process to learn the
-	system's best idea of local wall clock.  (This is important for
-	applications that an administrator wants used only at certain times -
-	without regard to whether the user has fiddled the "TZ" environment
-	variable.  While an administrator can "do everything in UTC" to get
-	around the problem, doing so is inconvenient and precludes handling
-	daylight saving time shifts - as might be required to limit phone
-	calls to off-peak hours.)
-
-*	POSIX requires that systems ignore leap seconds.
-
-*	The tz code attempts to support all the time_t implementations
-	allowed by POSIX.  The time_t type represents a nonnegative count of
-	seconds since 1970-01-01 00:00:00 UTC, ignoring leap seconds.
-	In practice, time_t is usually a signed 64- or 32-bit integer; 32-bit
-	signed time_t values stop working after 2038-01-19 03:14:07 UTC, so
-	new implementations these days typically use a signed 64-bit integer.
-	Unsigned 32-bit integers are used on one or two platforms,
-	and 36-bit and 40-bit integers are also used occasionally.
-	Although earlier POSIX versions allowed time_t to be a
-	floating-point type, this was not supported by any practical
-	systems, and POSIX.1-2013 and the tz code both require time_t
-	to be an integer type.
-
-These are the extensions that have been made to the POSIX functions:
-
-*	The "TZ" environment variable is used in generating the name of a file
-	from which time zone information is read (or is interpreted a la
-	POSIX); "TZ" is no longer constrained to be a three-letter time zone
-	name followed by a number of hours and an optional three-letter
-	daylight time zone name.  The daylight saving time rules to be used
-	for a particular time zone are encoded in the time zone file;
-	the format of the file allows U.S., Australian, and other rules to be
-	encoded, and allows for situations where more than two time zone
-	abbreviations are used.
-
-	It was recognized that allowing the "TZ" environment variable to
-	take on values such as "America/New_York" might cause "old" programs
-	(that expect "TZ" to have a certain form) to operate incorrectly;
-	consideration was given to using some other environment variable
-	(for example, "TIMEZONE") to hold the string used to generate the
-	time zone information file name.  In the end, however, it was decided
-	to continue using "TZ": it is widely used for time zone purposes;
-	separately maintaining both "TZ" and "TIMEZONE" seemed a nuisance;
-	and systems where "new" forms of "TZ" might cause problems can simply
-	use TZ values such as "EST5EDT" which can be used both by
-	"new" programs (a la POSIX) and "old" programs (as zone names and
-	offsets).
-
-*	To handle places where more than two time zone abbreviations are used,
-	the functions "localtime" and "gmtime" set tzname[tmp->tm_isdst]
-	(where "tmp" is the value the function returns) to the time zone
-	abbreviation to be used.  This differs from POSIX, where the elements
-	of tzname are only changed as a result of calls to tzset.
-
-*	Since the "TZ" environment variable can now be used to control time
-	conversion, the "daylight" and "timezone" variables are no longer
-	needed.  (These variables are defined and set by "tzset"; however, their
-	values will not be used by "localtime.")
-
-*	The "localtime" function has been set up to deliver correct results
-	for near-minimum or near-maximum time_t values.  (A comment in the
-	source code tells how to get compatibly wrong results).
-
-*	A function "tzsetwall" has been added to arrange for the system's
-	best approximation to local wall clock time to be delivered by
-	subsequent calls to "localtime."  Source code for portable
-	applications that "must" run on local wall clock time should call
-	"tzsetwall();" if such code is moved to "old" systems that don't
-	provide tzsetwall, you won't be able to generate an executable program.
-	(These time zone functions also arrange for local wall clock time to be
-	used if tzset is called - directly or indirectly - and there's no "TZ"
-	environment variable; portable applications should not, however, rely
-	on this behavior since it's not the way SVR2 systems behave.)
-
-*	Negative time_t values are supported, on systems where time_t is signed.
-
-*	These functions can account for leap seconds, thanks to Bradley White.
-
-Points of interest to folks with other systems:
-
-*	This package is already part of many POSIX-compliant hosts,
-	including BSD, HP, Linux, Network Appliance, SCO, SGI, and Sun.
-	On such hosts, the primary use of this package
-	is to update obsolete time zone rule tables.
-	To do this, you may need to compile the time zone compiler
-	'zic' supplied with this package instead of using the system 'zic',
-	since the format of zic's input changed slightly in late 1994,
-	and many vendors still do not support the new input format.
-
-*	The UNIX Version 7 "timezone" function is not present in this package;
-	it's impossible to reliably map timezone's arguments (a "minutes west
-	of GMT" value and a "daylight saving time in effect" flag) to a
-	time zone abbreviation, and we refuse to guess.
-	Programs that in the past used the timezone function may now examine
-	tzname[localtime(&clock)->tm_isdst] to learn the correct time
-	zone abbreviation to use.  Alternatively, use
-	localtime(&clock)->tm_zone if this has been enabled.
-
-*	The 4.2BSD gettimeofday function is not used in this package.
-	This formerly let users obtain the current UTC offset and DST flag,
-	but this functionality was removed in later versions of BSD.
-
-*	In SVR2, time conversion fails for near-minimum or near-maximum
-	time_t values when doing conversions for places that don't use UT.
-	This package takes care to do these conversions correctly.
-
-The functions that are conditionally compiled if STD_INSPIRED is defined
-should, at this point, be looked on primarily as food for thought.  They are
-not in any sense "standard compatible" - some are not, in fact, specified in
-*any* standard.  They do, however, represent responses of various authors to
-standardization proposals.
-
-Other time conversion proposals, in particular the one developed by folks at
-Hewlett Packard, offer a wider selection of functions that provide capabilities
-beyond those provided here.  The absence of such functions from this package
-is not meant to discourage the development, standardization, or use of such
-functions.  Rather, their absence reflects the decision to make this package
-contain valid extensions to POSIX, to ensure its broad acceptability.  If
-more powerful time conversion functions can be standardized, so much the
-better.
-
-
------ Calendrical issues -----
-
-Calendrical issues are a bit out of scope for a time zone database,
-but they indicate the sort of problems that we would run into if we
-extended the time zone database further into the past.  An excellent
-resource in this area is Nachum Dershowitz and Edward M. Reingold,
-Calendrical Calculations: Third Edition, Cambridge University Press (2008)
-<http://emr.cs.iit.edu/home/reingold/calendar-book/third-edition/>.
-Other information and sources are given below.  They sometimes disagree.
-
-
-France
-
-Gregorian calendar adopted 1582-12-20.
-French Revolutionary calendar used 1793-11-24 through 1805-12-31,
-and (in Paris only) 1871-05-06 through 1871-05-23.
-
-
-Russia
-
-From Chris Carrier (1996-12-02):
-On 1929-10-01 the Soviet Union instituted an "Eternal Calendar"
-with 30-day months plus 5 holidays, with a 5-day week.
-On 1931-12-01 it changed to a 6-day week; in 1934 it reverted to the
-Gregorian calendar while retaining the 6-day week; on 1940-06-27 it
-reverted to the 7-day week.  With the 6-day week the usual days
-off were the 6th, 12th, 18th, 24th and 30th of the month.
-(Source: Evitiar Zerubavel, _The Seven Day Circle_)
-
-
-Mark Brader reported a similar story in "The Book of Calendars", edited
-by Frank Parise (1982, Facts on File, ISBN 0-8719-6467-8), page 377.  But:
-
-From: Petteri Sulonen (via Usenet)
-Date: 14 Jan 1999 00:00:00 GMT
-...
-
-If your source is correct, how come documents between 1929 and 1940 were
-still dated using the conventional, Gregorian calendar?
-
-I can post a scan of a document dated December 1, 1934, signed by
-Yenukidze, the secretary, on behalf of Kalinin, the President of the
-Executive Committee of the Supreme Soviet, if you like.
-
-
-
-Sweden (and Finland)
-
-From: Mark Brader
-Subject: Re: Gregorian reform - a part of locale?
-<news:1996Jul6.012937.29190@sq.com>
-Date: 1996-07-06
-
-In 1700, Denmark made the transition from Julian to Gregorian.  Sweden
-decided to *start* a transition in 1700 as well, but rather than have one of
-those unsightly calendar gaps :-), they simply decreed that the next leap
-year after 1696 would be in 1744 - putting the whole country on a calendar
-different from both Julian and Gregorian for a period of 40 years.
-
-However, in 1704 something went wrong and the plan was not carried through;
-they did, after all, have a leap year that year.  And one in 1708.  In 1712
-they gave it up and went back to Julian, putting 30 days in February that
-year!...
-
-Then in 1753, Sweden made the transition to Gregorian in the usual manner,
-getting there only 13 years behind the original schedule.
-
-(A previous posting of this story was challenged, and Swedish readers
-produced the following references to support it: "Tideräkning och historia"
-by Natanael Beckman (1924) and "Tid, en bok om tideräkning och
-kalenderväsen" by Lars-Olof Lodén (1968).
-
-
-Grotefend's data
-
-From: "Michael Palmer" [with one obvious typo fixed]
-Subject: Re: Gregorian Calendar (was Re: Another FHC related question
-Newsgroups: soc.genealogy.german
-Date: Tue, 9 Feb 1999 02:32:48 -800
-...
-
-The following is a(n incomplete) listing, arranged chronologically, of
-European states, with the date they converted from the Julian to the
-Gregorian calendar:
-
-04/15 Oct 1582 - Italy (with exceptions), Spain, Portugal, Poland (Roman
-                 Catholics and Danzig only)
-09/20 Dec 1582 - France, Lorraine
-
-21 Dec 1582/
-   01 Jan 1583 - Holland, Brabant, Flanders, Hennegau
-10/21 Feb 1583 - bishopric of Liege (Lüttich)
-13/24 Feb 1583 - bishopric of Augsburg
-04/15 Oct 1583 - electorate of Trier
-05/16 Oct 1583 - Bavaria, bishoprics of Freising, Eichstedt, Regensburg,
-                 Salzburg, Brixen
-13/24 Oct 1583 - Austrian Oberelsaß and Breisgau
-20/31 Oct 1583 - bishopric of Basel
-02/13 Nov 1583 - duchy of Jülich-Berg
-02/13 Nov 1583 - electorate and city of Köln
-04/15 Nov 1583 - bishopric of Würzburg
-11/22 Nov 1583 - electorate of Mainz
-16/27 Nov 1583 - bishopric of Strassburg and the margraviate of Baden
-17/28 Nov 1583 - bishopric of Münster and duchy of Cleve
-14/25 Dec 1583 - Steiermark
-
-06/17 Jan 1584 - Austria and Bohemia
-11/22 Jan 1584 - Lucerne, Uri, Schwyz, Zug, Freiburg, Solothurn
-12/23 Jan 1584 - Silesia and the Lausitz
-22 Jan/
-   02 Feb 1584 - Hungary (legally on 21 Oct 1587)
-      Jun 1584 - Unterwalden
-01/12 Jul 1584 - duchy of Westfalen
-
-16/27 Jun 1585 - bishopric of Paderborn
-
-14/25 Dec 1590 - Transylvania
-
-22 Aug/
-   02 Sep 1612 - duchy of Prussia
-
-13/24 Dec 1614 - Pfalz-Neuburg
-
-          1617 - duchy of Kurland (reverted to the Julian calendar in
-                 1796)
-
-          1624 - bishopric of Osnabrück
-
-          1630 - bishopric of Minden
-
-15/26 Mar 1631 - bishopric of Hildesheim
-
-          1655 - Kanton Wallis
-
-05/16 Feb 1682 - city of Strassburg
-
-18 Feb/
-   01 Mar 1700 - Protestant Germany (including Swedish possessions in
-                 Germany), Denmark, Norway
-30 Jun/
-   12 Jul 1700 - Gelderland, Zutphen
-10 Nov/
-   12 Dec 1700 - Utrecht, Overijssel
-
-31 Dec 1700/
-   12 Jan 1701 - Friesland, Groningen, Zürich, Bern, Basel, Geneva,
-                 Turgau, and Schaffhausen
-
-          1724 - Glarus, Appenzell, and the city of St. Gallen
-
-01 Jan 1750    - Pisa and Florence
-
-02/14 Sep 1752 - Great Britain
-
-17 Feb/
-   01 Mar 1753 - Sweden
-
-1760-1812      - Graubünden
-
-The Russian empire (including Finland and the Baltic states) did not
-convert to the Gregorian calendar until the Soviet revolution of 1917.
-
-Source: H. Grotefend, _Taschenbuch der Zeitrechnung des deutschen
-Mittelalters und der Neuzeit_, herausgegeben von Dr. O. Grotefend
-(Hannover: Hahnsche Buchhandlung, 1941), pp. 26-28.
-
-
------ Time and time zones on Mars -----
-
-Some people's work schedules use Mars time.  Jet Propulsion Laboratory
-(JPL) coordinators have kept Mars time on and off at least since 1997
-for the Mars Pathfinder mission.  Some of their family members have
-also adapted to Mars time.  Dozens of special Mars watches were built
-for JPL workers who kept Mars time during the Mars Exploration
-Rovers mission (2004).  These timepieces look like normal Seikos and
-Citizens but use Mars seconds rather than terrestrial seconds.
-
-A Mars solar day is called a "sol" and has a mean period equal to
-about 24 hours 39 minutes 35.244 seconds in terrestrial time.  It is
-divided into a conventional 24-hour clock, so each Mars second equals
-about 1.02749125 terrestrial seconds.
-
-The prime meridian of Mars goes through the center of the crater
-Airy-0, named in honor of the British astronomer who built the
-Greenwich telescope that defines Earth's prime meridian.  Mean solar
-time on the Mars prime meridian is called Mars Coordinated Time (MTC).
-
-Each landed mission on Mars has adopted a different reference for
-solar time keeping, so there is no real standard for Mars time zones.
-For example, the Mars Exploration Rover project (2004) defined two
-time zones "Local Solar Time A" and "Local Solar Time B" for its two
-missions, each zone designed so that its time equals local true solar
-time at approximately the middle of the nominal mission.  Such a "time
-zone" is not particularly suited for any application other than the
-mission itself.
-
-Many calendars have been proposed for Mars, but none have achieved
-wide acceptance.  Astronomers often use Mars Sol Date (MSD) which is a
-sequential count of Mars solar days elapsed since about 1873-12-29
-12:00 GMT.
-
-The tz database does not currently support Mars time, but it is
-documented here in the hopes that support will be added eventually.
-
-Sources:
-
-Michael Allison and Robert Schmunk,
-"Technical Notes on Mars Solar Time as Adopted by the Mars24 Sunclock"
-<http://www.giss.nasa.gov/tools/mars24/help/notes.html> (2012-08-08).
-
-Jia-Rui Chong, "Workdays Fit for a Martian", Los Angeles Times
-<http://articles.latimes.com/2004/jan/14/science/sci-marstime14>
-(2004-01-14), pp A1, A20-A21.
-
-Tom Chmielewski, "Jet Lag Is Worse on Mars", The Atlantic (2015-02-26)
-<http://www.theatlantic.com/technology/archive/2015/02/jet-lag-is-worse-on-mars/386033/>
-
------
-
-This file is in the public domain, so clarified as of 2009-05-17 by
-Arthur David Olson.
-
------
-Local Variables:
-coding: utf-8
-End:
diff --git a/lib/libc/time/asctime.c b/lib/libc/time/asctime.c
deleted file mode 100644
index 49d60c4c5..000000000
--- a/lib/libc/time/asctime.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*	$NetBSD: asctime.c,v 1.20 2014/10/23 18:45:58 christos Exp $	*/
-
-/*
-** This file is in the public domain, so clarified as of
-** 1996-06-05 by Arthur David Olson.
-*/
-
-/*
-** Avoid the temptation to punt entirely to strftime;
-** the output of strftime is supposed to be locale specific
-** whereas the output of asctime is supposed to be constant.
-*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char	elsieid[] = "@(#)asctime.c	8.5";
-#else
-__RCSID("$NetBSD: asctime.c,v 1.20 2014/10/23 18:45:58 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*LINTLIBRARY*/
-
-#include "namespace.h"
-#include "private.h"
-#include "tzfile.h"
-
-#ifdef __weak_alias
-__weak_alias(asctime_r,_asctime_r)
-#endif
-
-/*
-** Some systems only handle "%.2d"; others only handle "%02d";
-** "%02.2d" makes (most) everybody happy.
-** At least some versions of gcc warn about the %02.2d;
-** we conditionalize below to avoid the warning.
-*/
-/*
-** All years associated with 32-bit time_t values are exactly four digits long;
-** some years associated with 64-bit time_t values are not.
-** Vintage programs are coded for years that are always four digits long
-** and may assume that the newline always lands in the same place.
-** For years that are less than four digits, we pad the output with
-** leading zeroes to get the newline in the traditional place.
-** The -4 ensures that we get four characters of output even if
-** we call a strftime variant that produces fewer characters for some years.
-** The ISO C 1999 and POSIX 1003.1-2004 standards prohibit padding the year,
-** but many implementations pad anyway; most likely the standards are buggy.
-*/
-#ifdef __GNUC__
-#define ASCTIME_FMT	"%.3s %.3s%3d %2.2d:%2.2d:%2.2d %-4s\n"
-#else /* !defined __GNUC__ */
-#define ASCTIME_FMT	"%.3s %.3s%3d %02.2d:%02.2d:%02.2d %-4s\n"
-#endif /* !defined __GNUC__ */
-/*
-** For years that are more than four digits we put extra spaces before the year
-** so that code trying to overwrite the newline won't end up overwriting
-** a digit within a year and truncating the year (operating on the assumption
-** that no output is better than wrong output).
-*/
-#ifdef __GNUC__
-#define ASCTIME_FMT_B	"%.3s %.3s%3d %2.2d:%2.2d:%2.2d     %s\n"
-#else /* !defined __GNUC__ */
-#define ASCTIME_FMT_B	"%.3s %.3s%3d %02.2d:%02.2d:%02.2d     %s\n"
-#endif /* !defined __GNUC__ */
-
-#define STD_ASCTIME_BUF_SIZE	26
-/*
-** Big enough for something such as
-** ??? ???-2147483648 -2147483648:-2147483648:-2147483648     -2147483648\n
-** (two three-character abbreviations, five strings denoting integers,
-** seven explicit spaces, two explicit colons, a newline,
-** and a trailing NUL byte).
-** The values above are for systems where an int is 32 bits and are provided
-** as an example; the define below calculates the maximum for the system at
-** hand.
-*/
-#define MAX_ASCTIME_BUF_SIZE	(2*3+5*INT_STRLEN_MAXIMUM(int)+7+2+1+1)
-
-static char	buf_asctime[MAX_ASCTIME_BUF_SIZE];
-
-/*
-** A la ISO/IEC 9945-1, ANSI/IEEE Std 1003.1, 2004 Edition.
-*/
-
-char *
-asctime_r(const struct tm *timeptr, char *buf)
-{
-	static const char	wday_name[][3] = {
-		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-	};
-	static const char	mon_name[][3] = {
-		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-	};
-	const char *	wn;
-	const char *	mn;
-	char			year[INT_STRLEN_MAXIMUM(int) + 2];
-	char			result[MAX_ASCTIME_BUF_SIZE];
-
-	if (timeptr == NULL) {
-		errno = EINVAL;
-		return strcpy(buf, "??? ??? ?? ??:??:?? ????\n");
-	}
-	if (timeptr->tm_wday < 0 || timeptr->tm_wday >= DAYSPERWEEK)
-		wn = "???";
-	else	wn = wday_name[timeptr->tm_wday];
-	if (timeptr->tm_mon < 0 || timeptr->tm_mon >= MONSPERYEAR)
-		mn = "???";
-	else	mn = mon_name[timeptr->tm_mon];
-	/*
-	** Use strftime's %Y to generate the year, to avoid overflow problems
-	** when computing timeptr->tm_year + TM_YEAR_BASE.
-	** Assume that strftime is unaffected by other out-of-range members
-	** (e.g., timeptr->tm_mday) when processing "%Y".
-	*/
-	(void) strftime(year, sizeof year, "%Y", timeptr);
-	(void) snprintf(result,
-		sizeof(result),
-		((strlen(year) <= 4) ? ASCTIME_FMT : ASCTIME_FMT_B),
-		wn, mn,
-		timeptr->tm_mday, timeptr->tm_hour,
-		timeptr->tm_min, timeptr->tm_sec,
-		year);
-	if (strlen(result) < STD_ASCTIME_BUF_SIZE || buf == buf_asctime)
-		return strcpy(buf, result);
-	else {
-		errno = EOVERFLOW;
-		return NULL;
-	}
-}
-
-/*
-** A la ISO/IEC 9945-1, ANSI/IEEE Std 1003.1, 2004 Edition.
-*/
-
-char *
-asctime(const struct tm *timeptr)
-{
-	return asctime_r(timeptr, buf_asctime);
-}
diff --git a/lib/libc/time/checktab.awk b/lib/libc/time/checktab.awk
deleted file mode 100644
index 77fe7554f..000000000
--- a/lib/libc/time/checktab.awk
+++ /dev/null
@@ -1,224 +0,0 @@
-#	$NetBSD: checktab.awk,v 1.8 2014/08/15 11:04:07 christos Exp $
-
-# Check tz tables for consistency.
-
-# Contributed by Paul Eggert.
-
-BEGIN {
-	FS = "\t"
-
-	if (!iso_table) iso_table = "iso3166.tab"
-	if (!zone_table) zone_table = "zone1970.tab"
-	if (!want_warnings) want_warnings = -1
-
-	# A special (and we hope temporary) case.
-	tztab["America/Montreal"] = 1
-
-	# Some more special cases; these are zones that should probably
-	# be turned into links.
-	if (zone_table == "zone1970.tab") {
-	  tztab["Africa/Addis_Ababa"] = 1
-	  tztab["Africa/Asmara"] = 1
-	  tztab["Africa/Bangui"] = 1
-	  tztab["Africa/Blantyre"] = 1
-	  tztab["Africa/Brazzaville"] = 1
-	  tztab["Africa/Bujumbura"] = 1
-	  tztab["Africa/Dar_es_Salaam"] = 1
-	  tztab["Africa/Djibouti"] = 1
-	  tztab["Africa/Douala"] = 1
-	  tztab["Africa/Gaborone"] = 1
-	  tztab["Africa/Harare"] = 1
-	  tztab["Africa/Kampala"] = 1
-	  tztab["Africa/Kigali"] = 1
-	  tztab["Africa/Kinshasa"] = 1
-	  tztab["Africa/Libreville"] = 1
-	  tztab["Africa/Luanda"] = 1
-	  tztab["Africa/Lubumbashi"] = 1
-	  tztab["Africa/Lusaka"] = 1
-	  tztab["Africa/Malabo"] = 1
-	  tztab["Africa/Maseru"] = 1
-	  tztab["Africa/Mbabane"] = 1
-	  tztab["Africa/Mogadishu"] = 1
-	  tztab["Africa/Niamey"] = 1
-	  tztab["Africa/Porto-Novo"] = 1
-	  tztab["America/Antigua"] = 1
-	  tztab["America/Cayman"] = 1
-	  tztab["Asia/Aden"] = 1
-	  tztab["Asia/Bahrain"] = 1
-	  tztab["Asia/Ho_Chi_Minh"] = 1
-	  tztab["Asia/Kuwait"] = 1
-	  tztab["Asia/Muscat"] = 1
-	  tztab["Asia/Phnom_Penh"] = 1
-	  tztab["Asia/Vientiane"] = 1
-	  tztab["Indian/Antananarivo"] = 1
-	  tztab["Indian/Comoro"] = 1
-	  tztab["Indian/Mayotte"] = 1
-	  tztab["Pacific/Midway"] = 1
-	  tztab["Pacific/Saipan"] = 1
-	}
-
-	while (getline <iso_table) {
-		iso_NR++
-		if ($0 ~ /^#/) continue
-		if (NF != 2) {
-			printf "%s:%d: wrong number of columns\n", \
-				iso_table, iso_NR >>"/dev/stderr"
-			status = 1
-		}
-		cc = $1
-		name = $2
-		if (cc !~ /^[A-Z][A-Z]$/) {
-			printf "%s:%d: invalid country code '%s'\n", \
-				iso_table, iso_NR, cc >>"/dev/stderr"
-			status = 1
-		}
-		if (cc <= cc0) {
-			if (cc == cc0) {
-				s = "duplicate";
-			} else {
-				s = "out of order";
-			}
-
-			printf "%s:%d: country code '%s' is %s\n", \
-				iso_table, iso_NR, cc, s \
-				>>"/dev/stderr"
-			status = 1
-		}
-		cc0 = cc
-		if (name2cc[name]) {
-			printf "%s:%d: '%s' and '%s' have the sname name\n", \
-				iso_table, iso_NR, name2cc[name], cc \
-				>>"/dev/stderr"
-			status = 1
-		}
-		name2cc[name] = cc
-		cc2name[cc] = name
-		cc2NR[cc] = iso_NR
-	}
-
-	cc0 = ""
-
-	while (getline <zone_table) {
-		zone_NR++
-		if ($0 ~ /^#/) continue
-		if (NF != 3 && NF != 4) {
-			printf "%s:%d: wrong number of columns\n", \
-				zone_table, zone_NR >>"/dev/stderr"
-			status = 1
-		}
-		split($1, cca, /,/)
-		cc = cca[1]
-		coordinates = $2
-		tz = $3
-		comments = $4
-		if (cc < cc0) {
-			printf "%s:%d: country code '%s' is out of order\n", \
-				zone_table, zone_NR, cc >>"/dev/stderr"
-			status = 1
-		}
-		cc0 = cc
-		tztab[tz] = 1
-		tz2comments[tz] = comments
-		tz2NR[tz] = zone_NR
-		for (i in cca) {
-		    cc = cca[i]
-		    cctz = cc tz
-		    cctztab[cctz] = 1
-		    if (cc2name[cc]) {
-			cc_used[cc]++
-		    } else {
-			printf "%s:%d: %s: unknown country code\n", \
-				zone_table, zone_NR, cc >>"/dev/stderr"
-			status = 1
-		    }
-		}
-		if (coordinates !~ /^[-+][0-9][0-9][0-5][0-9][-+][01][0-9][0-9][0-5][0-9]$/ \
-		    && coordinates !~ /^[-+][0-9][0-9][0-5][0-9][0-5][0-9][-+][01][0-9][0-9][0-5][0-9][0-5][0-9]$/) {
-			printf "%s:%d: %s: invalid coordinates\n", \
-				zone_table, zone_NR, coordinates >>"/dev/stderr"
-			status = 1
-		}
-	}
-
-	for (cctz in cctztab) {
-		cc = substr (cctz, 1, 2)
-		tz = substr (cctz, 3)
-		if (1 < cc_used[cc]) {
-			comments_needed[tz] = cc
-		}
-	}
-	for (cctz in cctztab) {
-	  cc = substr (cctz, 1, 2)
-	  tz = substr (cctz, 3)
-	  if (!comments_needed[tz] && tz2comments[tz]) {
-	    printf "%s:%d: unnecessary comment '%s'\n", \
-		zone_table, tz2NR[tz], tz2comments[tz] \
-		>>"/dev/stderr"
-	    tz2comments[tz] = 0
-	    status = 1
-	  } else if (comments_needed[tz] && !tz2comments[tz]) {
-	    printf "%s:%d: missing comment for %s\n", \
-	      zone_table, tz2NR[tz], comments_needed[tz] \
-	      >>"/dev/stderr"
-	    status = 1
-	  }
-	}
-	FS = " "
-}
-
-$1 ~ /^#/ { next }
-
-{
-	tz = rules = ""
-	if ($1 == "Zone") {
-		tz = $2
-		ruleUsed[$4] = 1
-	} else if ($1 == "Link" && zone_table == "zone.tab") {
-		# Ignore Link commands if source and destination basenames
-		# are identical, e.g. Europe/Istanbul versus Asia/Istanbul.
-		src = $2
-		dst = $3
-		while ((i = index(src, "/"))) src = substr(src, i+1)
-		while ((i = index(dst, "/"))) dst = substr(dst, i+1)
-		if (src != dst) tz = $3
-	} else if ($1 == "Rule") {
-		ruleDefined[$2] = 1
-	} else {
-		ruleUsed[$2] = 1
-	}
-	if (tz && tz ~ /\//) {
-		if (!tztab[tz]) {
-			printf "%s: no data for '%s'\n", zone_table, tz \
-				>>"/dev/stderr"
-			status = 1
-		}
-		zoneSeen[tz] = 1
-	}
-}
-
-END {
-	for (tz in ruleDefined) {
-		if (!ruleUsed[tz]) {
-			printf "%s: Rule never used\n", tz
-			status = 1
-		}
-	}
-	for (tz in tztab) {
-		if (!zoneSeen[tz]) {
-			printf "%s:%d: no Zone table for '%s'\n", \
-				zone_table, tz2NR[tz], tz >>"/dev/stderr"
-			status = 1
-		}
-	}
-	if (0 < want_warnings) {
-		for (cc in cc2name) {
-			if (!cc_used[cc]) {
-				printf "%s:%d: warning: " \
-					"no Zone entries for %s (%s)\n", \
-					iso_table, cc2NR[cc], cc, cc2name[cc]
-			}
-		}
-	}
-
-	exit status
-}
diff --git a/lib/libc/time/ctime.3 b/lib/libc/time/ctime.3
deleted file mode 100644
index 012b3b8db..000000000
--- a/lib/libc/time/ctime.3
+++ /dev/null
@@ -1,537 +0,0 @@
-.\" $NetBSD: ctime.3,v 1.51 2014/10/07 21:51:03 christos Exp $
-.\"
-.\" XXX: License missing?
-.\"
-.Dd October 7, 2014
-.Dt CTIME 3
-.Os
-.Sh NAME
-.Nm asctime ,
-.Nm asctime_r ,
-.Nm ctime ,
-.Nm ctime_r ,
-.Nm ctime_rz ,
-.Nm difftime ,
-.Nm gmtime ,
-.Nm gmtime_r ,
-.Nm localtime ,
-.Nm localtime_r ,
-.Nm localtime_rz ,
-.Nm mktime ,
-.Nm mktime_z ,
-.Nd convert date and time
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Vt extern char *tzname[2];
-.Ft char *
-.Fn asctime "const struct tm *tm"
-.Ft char *
-.Fn asctime_r "const struct tm restrict tm" "char * restrict buf"
-.Ft char *
-.Fn ctime "const time_t *clock"
-.Ft char *
-.Fn ctime_r "const time_t *clock"  "char *buf"
-.Ft char *
-.Fn ctime_rz "timezone_t restrict tz" "const time_t *clock"  "char *buf"
-.Ft double
-.Fn difftime "time_t time1" "time_t time0"
-.Ft struct tm *
-.Fn gmtime "const time_t *clock"
-.Ft struct tm *
-.Fn gmtime_r "const time_t * restrict clock" "struct tm * restrict result"
-.Ft struct tm *
-.Fn localtime "const time_t *clock"
-.Ft struct tm *
-.Fn localtime_r "const time_t * restrict clock" "struct tm * restrict result"
-.Ft struct tm *
-.Fn localtime_rz "timezone_t restrict tz" "const time_t * restrict clock" "struct tm * restrict result"
-.Ft time_t
-.Fn mktime "struct tm *tm"
-.Ft time_t
-.Fn mktime_z "timezone_t restrict tz" "struct tm *restrict tm"
-.Sh DESCRIPTION
-The
-.Nm
-family of functions provide various standard library routines
-to operate with time and conversions related to time.
-.Sh FUNCTIONS
-.Bl -tag -width abcd
-.It Fn asctime "tm"
-The
-.Fn asctime
-function converts a time value contained in the
-.Fa tm
-structure to a string with the following general format:
-.Bd -literal -offset indent
-.D1 Thu Nov 24 18:22:48 1986\en\e0
-.Ed
-.Pp
-The
-.Fa tm
-structure is described in
-.Xr tm 3 .
-.It Fn asctime_r "tm" "buf"
-The
-.Fn asctime_r
-has the same behavior as
-.Fn asctime ,
-but the result is stored to
-.Fa buf ,
-which should have a size of at least 26 bytes.
-.It Fn ctime "clock"
-The
-.Fn ctime
-function converts a
-.Vt time_t ,
-pointed to by
-.Fa clock ,
-and returns a pointer to a string with the format described above.
-Years requiring fewer than four characters are padded with leading zeroes.
-For years longer than four characters, the string is of the form
-.Bd -literal -offset indent
-.D1 "Thu Nov 24 18:22:48     81986\en\e0"
-.Ed
-.Pp
-with five spaces before the year.
-These unusual formats are designed to make it less likely that older
-software that expects exactly 26 bytes of output will mistakenly output
-misleading values for out-of-range years.
-.Pp
-The
-.Fa clock
-time stamp represents the time in seconds since 1970-01-01 00:00:00
-Coordinated Universal Time (UTC).
-The POSIX standard says that time stamps must be nonnegative
-and must ignore leap seconds.
-Many implementations extend POSIX by allowing negative time stamps,
-and can therefore represent time stamps that predate the
-introduction of UTC and are some other flavor of Universal Time (UT).
-Some implementations support leap seconds, in contradiction to POSIX.
-.It Fn ctime_r "clock" "buf"
-The
-.Fn ctime_r
-is similar to
-.Fn ctime ,
-except it places the result of the conversion on the
-.Fa buf
-argument, which should be 26 or more bytes long,
-instead of using a global static buffer.
-.It Fn ctime_rz "tz" "clock" "buf"
-The
-.Fn ctime_rz
-function is similar to
-.Fn ctime_r ,
-but it also takes a
-.Ft "timezone_t"
-argument, as returned by a previous call to
-.Fn tzalloc ,
-or a
-.Dv NULL
-pointer denoting
-Coordinated Universal Time
-.Pq Tn UTC .
-.It Fn difftime "time1" "time2"
-The
-.Fn difftime
-function returns the difference between two calendar times,
-.Fa ( time1 No - Fa time0 ) ,
-expressed in seconds.
-.Pp
-The
-.Fn ctime_r ,
-.Fn localtime_r ,
-.Fn gmtime_r ,
-and
-.Fn asctime_r
-functions
-are like their unsuffixed counterparts, except that they accept an
-additional argument specifying where to store the result if successful.
-.Pp
-The
-.Fn ctime_rz ,
-.Fn localtime_rz ,
-and
-.Fn mktime_z
-functions
-are like their unsuffixed counterparts, except that they accept an
-extra initial
-.Ar zone
-argument specifying the time zone to be used for conversion.
-If
-.Fa zone
-is
-.Dv NULL ,
-UTC is used; otherwise,
-.Fa zone
-should be have been allocated by
-.Fn tzalloc
-and should not be freed until after all uses (e.g., by calls to
-.Fn strftime )
-of the filled-in
-.Fn tm_zone
-fields.
-.It Fn gmtime "clock"
-The
-.Fn gmtime
-function converts to Coordinated Universal Time
-.Pq Tn UTC
-and returns a pointer to the
-.Va tm
-structure described in
-.Xr tm 3 .
-.It Fn gmtime_r "clock" "result"
-The
-.Fn gmtime_r
-provides the same functionality as
-.Fn gmtime ,
-differing in that the caller must supply a buffer area
-.Fa result
-to which the result is stored.
-.It Fn localtime "clock"
-Also
-.Fn localtime
-is comparable to
-.Fn gmtime .
-However,
-.Fn localtime
-corrects for the time zone and any time zone adjustments
-(such as Daylight Saving Time in the U.S.A.).
-After filling in the
-.Va tm
-structure, the function sets the
-.Fa tm_isdst Ns 'th
-element of
-.Fa tzname
-to a pointer to an
-ASCII string that is the time zone abbreviation to be used with
-.Fn localtime Ns 's
-return value.
-.It Fn localtime_r "clock" "result"
-As
-.Fn gmtime_r ,
-the
-.Fn localtime_r
-takes an additional buffer
-.Fa result
-as a parameter and stores the result to it.
-Note however that
-.Fn localtime_r
-does not imply initialization of the local time conversion information;
-the application may need to do so by calling
-.Xr tzset 3 .
-.It Fn localtime_rz "tz" "clock" "result"
-The
-.Fn localtime_rz
-function is similar to
-.Fn localtime_r ,
-but it also takes a
-.Ft "timezone_t"
-argument, returned by a previous call to
-.Fn tzalloc ,
-or a
-.Dv NULL
-pointer denoting Coordinated Universal Time
-.Pq Tn UTC .
-.It Fn mktime "tm"
-The
-.Fn mktime
-function converts the broken-down time,
-expressed as local time in the
-.Xr tm 3
-structure, into a calendar time value with
-the same encoding as that of the values returned by the
-.Xr time 3
-function.
-The following remarks should be taken into account.
-.Bl -bullet
-.It
-The original values of the
-.Fa tm_wday
-and
-.Fa tm_yday
-components of the structure are ignored,
-and the original values of the other components are not restricted
-to their normal ranges.
-(A positive or zero value for
-.Fa tm_isdst
-causes
-.Fn mktime
-to presume initially that summer time (for example, Daylight Saving Time
-in the U.S.A.) respectively,
-is or is not in effect for the specified time.
-.It
-A negative value for
-.Fa tm_isdst
-causes the
-.Fn mktime
-function to attempt to divine whether summer time is in effect
-for the specified time; in this case it does not use a consistent
-rule and may give a different answer when later
-presented with the same argument.
-.It
-On successful completion, the values of the
-.Fa tm_wday
-and
-.Fa tm_yday
-components of the structure are set appropriately,
-and the other components are set to represent the specified calendar time,
-but with their values forced to their normal ranges; the final value of
-.Fa tm_mday
-is not set until
-.Fa tm_mon
-and
-.Fa tm_year
-are determined.
-.El
-.Pp
-The function returns the specified calendar time;
-if the calendar time cannot be represented, it returns
-.Va "(time_t)-1" .
-This can happen either because the resulting conversion would not fit
-in a
-.Vt time_t
-variable, or because the time specified happens to be in the daylight
-savings gap and
-.Fa tm_isdst
-was set to
-.Dv \-1 .
-Other
-.Fn mktime
-implementations do not return an error in the second case and return
-the appropriate time offset after the daylight savings gap.
-There is code to mimick this behavior, but it is not enabled by default.
-.It Fn mktime_z "tz" "tm"
-The
-.Fn mktime_z
-function is similar to
-.Fn mktime
-but it also takes a
-.Ft "const timezone_t"
-argument, returned by a previous call to
-.Fn tzalloc ,
-or a null pointer denoting
-Coordinated Universal Time
-.Pq Tn UTC .
-.El
-.Pp
-Declarations of all the functions and externals, and the 
-.Ft tm
-structure, are in the
-.In time.h
-header file.
-The structure (of type)
-.Ft struct tm
-includes the following fields:
-.Bd -literal
-       int tm_sec;      /* seconds (0 - 60) */
-       int tm_min;      /* minutes (0 - 59) */
-       int tm_hour;     /* hours (0 - 23) */
-       int tm_mday;     /* day of month (1 - 31) */
-       int tm_mon;      /* month of year (0 - 11) */
-       int tm_year;     /* year - 1900 */
-       int tm_wday;     /* day of week (Sunday = 0) */
-       int tm_yday;     /* day of year (0 - 365) */
-       int tm_isdst;    /* is summer time in effect? */
-       char *tm_zone;   /* abbreviation of timezone name */
-       long tm_gmtoff;  /* offset from UT in seconds */
-.Ed
-.Pp
-The
-.Fa tm_zone
-and
-.Fa tm_gmtoff
-fields exist, and are filled in, only if
-arrangements to do so were made when the library containing these functions
-was created.
-There is no guarantee that these fields  will  continue to exist in this form
-in future releases of this code.
-.Bl -bullet
-.It
-.Va tm_isdst
-is non-zero if summer time is in effect.
-.It
-.Va tm_gmtoff
-is the offset (in seconds) of the time represented from UT,
-with positive values indicating east of the Prime Meridian.
-The field's name is derived from Greenwich Mean Time, a precursor of UT.
-.El
-.Sh RETURN VALUES
-.Bl -bullet
-.It
-On success the
-.Fn asctime
-and
-.Fn ctime
-functions return a pointer to a static character buffer, and the
-.Fn asctime_r ,
-.Fn ctime_r ,
-and
-.Fn ctime_rz
-function return a pointer to the user-supplied buffer.
-On failure they all return
-.Dv NULL
-and no errors are defined for them.
-.It
-On success the
-.Fn gmtime ,
-and
-.Fn localtime
-functions return a pointer to a statically allocated
-.Va "struct tm"
-whereas the
-.Fn gmtime_r ,
-.Fn localtime_r ,
-and
-.Fn localtime_rz ,
-functions return a pointer to the user-supplied
-.Va "struct tm" .
-On failure they all return
-.Dv NULL
-and the global variable
-.Va errno
-is set to indicate the error.
-.It
-The
-.Fn mktime
-and
-.Fn mktime_z
-function returns the specified time since the Epoch as a
-.Vt time_t
-type value.
-If the time cannot be represented, then
-.Fn mktime
-and
-.Fn mktime_z
-return
-.Va "(time_t)-1"
-setting the global variable
-.Va errno
-to indicate the error.
-.It
-The
-.Fn tzalloc
-function returns a pointer to a
-.Ft timezone_t
-object or
-.Dv NULL
-on failure, setting
-.Va errno
-to indicate the error.
-It may also return
-.Dv NULL
-when the
-.Fa name
-argument is
-.Dv NULL ,
-and this is not an error, but a way of referring to
-Coordinated Universal Time
-.Pq Tn UTC .
-.It
-.Fn tzgetzone
-function returns string containing the name of the timezone given in
-.Fa tz .
-.El
-.Sh FILES
-.Bl -tag -width /usr/share/zoneinfo/posixrules -compact
-.It Pa /etc/localtime
-local time zone file
-.It Pa /usr/share/zoneinfo
-time zone information directory
-.It Pa /usr/share/zoneinfo/posixrules
-used with POSIX-style TZ's
-.It Pa /usr/share/zoneinfo/GMT
-for UTC leap seconds
-.El
-.Pp
-If
-.Pa /usr/share/zoneinfo/GMT
-is absent, UTC leap seconds are loaded from
-.Pa /usr/share/zoneinfo/posixrules .
-.Sh ERRORS
-The described functions may fail with
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The result cannot be represented because a parameter is incorrect, or
-the conversion failed because no such time exists (for example a time
-in the DST gap).
-.It Bq Er EOVERFLOW
-The result cannot be represented because the time requested is out of bounds
-and the time calculation resulted in overflow.
-.El
-.Pp
-All functions that return values, except their
-.Dq z
-variants, can also return the same errors as
-.Xr open 2
-and
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr getenv 3 ,
-.Xr strftime 3 ,
-.Xr time 3 ,
-.Xr tm 3 ,
-.Xr tzset 3 ,
-.Xr tzfile 5
-.Sh STANDARDS
-The
-.Fn ctime ,
-.Fn difftime ,
-.Fn asctime ,
-.Fn localtime ,
-.Fn gmtime
-and
-.Fn mktime
-functions conform to
-.St -ansiC .
-Rest of the functions conform to
-.St -p1003.1-2008 .
-.Sh CAVEATS
-The functions that do not take an explicit
-.Ft timezone_t
-argument return values point to static data; the data is overwritten by
-each call.
-For the above functions the
-.Fa tm_zone
-field of a returned
-.Va "struct tm"
-points to a static array of characters, which
-will also be overwritten at the next call
-(and by calls to
-.Xr tzset 3 ) .
-The functions that do take an explicit
-.Ft timezone_t
-argument and set the fields of a supplied
-.Va "struct tm"
-should not call
-.Fn tzfree
-since the
-.Fa tm_zone
-field of the
-.Va "struct tm"
-points to data allocated by
-.Fn tzalloc .
-.Pp
-The
-.Fn asctime ,
-.Fn asctime_r ,
-.Fn ctime ,
-.Fn ctime_r ,
-and
-.Fn ctime_rz ,
-functions behave strangely for years before 1000 or after 9999.
-The 1989 and 1999 editions of the C Standard say
-that years from \-99 through 999 are converted without
-extra spaces, but this conflicts with longstanding
-tradition and with this implementation.
-The 2011 edition says that the behavior
-is undefined if the year is before 1000 or after 9999.
-Traditional implementations of these two functions are
-restricted to years in the range 1900 through 2099.
-To avoid this portability mess, new programs should use
-.Fn strftime
-instead.
-.\" @(#)newctime.3	8.3
-.\" This file is in the public domain, so clarified as of
-.\" 2009-05-17 by Arthur David Olson.
diff --git a/lib/libc/time/difftime.c b/lib/libc/time/difftime.c
deleted file mode 100644
index 0ab86d613..000000000
--- a/lib/libc/time/difftime.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: difftime.c,v 1.16 2015/08/13 11:21:18 christos Exp $	*/
-
-/*
-** This file is in the public domain, so clarified as of
-** 1996-06-05 by Arthur David Olson.
-*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char	elsieid[] = "@(#)difftime.c	8.1";
-#else
-__RCSID("$NetBSD: difftime.c,v 1.16 2015/08/13 11:21:18 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*LINTLIBRARY*/
-
-#include "private.h"	/* for time_t and TYPE_SIGNED */
-
-/* Return -X as a double.  Using this avoids casting to 'double'.  */
-static double
-dminus(double x)
-{
-	return -x;
-}
-
-double ATTRIBUTE_CONST
-difftime(time_t time1, time_t time0)
-{
-	/*
-	** If double is large enough, simply convert and subtract
-	** (assuming that the larger type has more precision).
-	*/
-	if (sizeof (time_t) < sizeof (double)) {
-		double t1 = time1, t0 = time0;
-		return t1 - t0;
- 	}
-
-	/*
-	** The difference of two unsigned values can't overflow
-	** if the minuend is greater than or equal to the subtrahend.
-	*/
-	if (!TYPE_SIGNED(time_t))
-		return time0 <= time1 ? time1 - time0 : dminus(time0 - time1);
-
-	/* Use uintmax_t if wide enough.  */
-	if (sizeof (time_t) <= sizeof (uintmax_t)) {
-		uintmax_t t1 = time1, t0 = time0;
-		return time0 <= time1 ? t1 - t0 : dminus(t0 - t1);
-	}
-
-	/*
-	** Handle cases where both time1 and time0 have the same sign
-	** (meaning that their difference cannot overflow).
-	*/
-	if ((time1 < 0) == (time0 < 0))
-		return time1 - time0;
-
-	/*
-	** The values have opposite signs and uintmax_t is too narrow.
-	** This suffers from double rounding; attempt to lessen that
-	** by using long double temporaries.
-	*/
-	{
-		long double t1 = time1, t0 = time0;
-		return t1 - t0;
-	}
-}
diff --git a/lib/libc/time/getdate.3 b/lib/libc/time/getdate.3
deleted file mode 100644
index f8d4576ea..000000000
--- a/lib/libc/time/getdate.3
+++ /dev/null
@@ -1,234 +0,0 @@
-.\"	$NetBSD: getdate.3,v 1.8 2012/12/14 23:26:17 uwe Exp $
-.\"
-.\" Copyright (c) 2009, 2011, 2012, The NetBSD Foundation.
-.\" All Rights Reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Brian Ginsbach.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd December 14, 2012
-.Dt GETDATE 3
-.Os
-.Sh NAME
-.Nm getdate ,
-.Nm getdate_err
-.Nd convert user format date and time
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft "struct tm *"
-.Fo "getdate"
-.Fa "const char *str"
-.Fc
-.Vt extern int getdate_err ;
-.Sh DESCRIPTION
-The
-.Fn getdate
-function converts a date or time character string pointed to by
-.Fa str
-into a static
-.Vt tm
-structure described in
-.Xr tm 3 .
-.Pp
-The input string is parsed and interpreted using templates.
-A text file containing templates is specified by the
-environment variable
-.Ev DATEMSK .
-This should contain the full path to the template file.
-Lines in the template file represent acceptable date and/or time
-conversion specifications.
-These specifications are similar to those given for
-.Xr strptime 3 .
-The first line in the template file that matches the input string
-is used to interpret and convert to internal time format.
-.Ss Internal Format Conversion
-The following rules apply to converting the input into the internal format.
-.Bl -bullet -offset indent
-.It
-If only the weekday is given, the conversion assumes today when the
-weekday matches today or the first future matching weekday.
-.It
-If only the month and no year is given, the conversion assumes the
-current month when the month matches or the first future matching month.
-The first day of the month is assumed if no day is given.
-.It
-If only the year is given, the values of the
-.Fa tm_mon ,
-.Fa tm_mday ,
-.Fa tm_wday ,
-.Fa tm_yday ,
-and
-.Fa tm_isdst
-members of the returned
-.Vt "struct tm"
-are unspecified.
-.It
-If the century is given, but the year within the century is not given,
-the conversion assumes the current year.
-.It
-If no hour, minute, and second are given, the conversion assumes
-the current hour, minute, and second.
-.It
-If no date is given, the conversion assumes today when the given hour
-is greater than the current hour and tomorrow when the given hour is less.
-.It
-If
-.Cm \&%Z
-is being scanned, then the broken-down time is based on the the
-current time of the matched timezone and not the current runtime
-environment timezone.
-.El
-.Sh RETURN VALUES
-If successful, the
-.Fn getdate
-function returns a pointer to a static
-.Vt tm
-structure containing the broken-down time.
-Otherwise, a null pointer is returned and
-.Va getdate_err
-is set to indicate the error.
-.Pp
-The variable
-.Va getdate_err
-can have the following values:
-.Bl -tag -width NNN
-.It 1
-.Ev DATEMSK
-environment variable is null or undefined.
-.It 2
-Cannot open the template file for reading.
-.It 3
-Get file status failed for template file.
-.It 4
-Template file is not a regular file.
-.It 5
-Encountered an error while reading the template file.
-.It 6
-Cannot allocate memory.
-.It 7
-Input string does not match any line in the template file.
-.It 8
-Input string is invalid (for example, February 31)
-or could not be represented in a
-.Vt time_t .
-.El
-.Sh ENVIRONMENT
-.Bl -tag -width DATEMSK
-.It Ev DATEMSK
-The full path to the text file containing the templates
-for acceptable date and/or time conversions.
-.El
-.Sh FILES
-.Bl -tag -width DATEMSK
-.It  Pa /usr/share/examples/getdate/datemsk.template
-An example template file that could be specified via the
-.Ev DATEMSK
-environment variable.
-.El
-.Sh EXAMPLES
-The following example shows the possible contents of a template file:
-.Pp
-.Bd -literal -offset indent -compact
-%m
-%A %B %d, %Y, %H:%M:%S
-%A
-%B
-%m/%d/%y %I %p
-%d,%m,%Y %H:%M
-at %A the %dst of %B in %Y
-run job at %I %p, %B %dnd
-%A den %d. %B %Y %H.%M Uhr
-.Ed
-.Pp
-The following are examples of valid input for the above template:
-.Pp
-.Bd -literal -offset indent -compact
-10/1/87 4 PM
-Friday
-Friday September 18, 1987, 10:30:30
-24,9,1986 10:30
-at monday the 1st of december in 1986
-run job at 3 PM, december 2nd
-.Ed
-.Pp
-The following examples show how local data and time specification can be
-defined in the template.
-.Pp
-.Bl -column -offset indent ".Li Friday 12:00:00" ".Sy Line in Template"
-.It Sy "Input String" Ta Sy "Line in Template"
-.It Li 11/27/86 Ta Li \&%m/\&%d/\&%y
-.It Li 27.11.86 Ta Li \&%d.\&%m.\&%y
-.It Li 86-11-27 Ta Li \&%y-\&%m-\&%d
-.It Li "Friday 12:00:00" Ta Li "\&%A \&%H:\&%M:\&%S"
-.El
-.Pp
-The following examples illustrate the Internal Format Conversion rules
-given that the current date is
-.Li "Mon Sep 22 12:19:47 EDT 1986"
-and the
-.Ev LC_TIME
-environment variable is set to the default C locale.
-.Pp
-.Bl -column -offset indent ".Li Jan Wed 1989" ".Sy Line in Template" ".Sy Date"
-.It Sy Input String Ta Sy Line in Template Ta Sy Date
-.It Li Mon Ta Li \&%a Ta Li "Mon Sep 22 12:19:47 EDT 1986"
-.It Li Sun Ta Li \&%a Ta Li "Sun Sep 28 12:19:47 EDT 1986"
-.It Li Fri Ta Li \&%a Ta Li "Fri Sep 26 12:19:47 EDT 1986"
-.It Li September Ta Li \&%B Ta Li "Mon Sep  1 12:19:47 EDT 1986"
-.It Li January Ta Li \&%B Ta Li "Thu Jan  1 12:19:47 EST 1987"
-.It Li December Ta Li \&%B Ta Li "Mon Dec  1 12:19:47 EST 1986"
-.It Li "Sep Mon" Ta Li "\&%b %a" Ta Li "Mon Sep  1 12:19:47 EDT 1986"
-.It Li "Jan Fri" Ta Li "\&%b %a" Ta Li "Fri Jan  2 12:19:47 EST 1987"
-.It Li "Dec Mon" Ta Li "\&%b %a" Ta Li "Mon Dec  1 12:19:47 EST 1986"
-.It Li "Jan Wed 1989" Ta Li "\&%b \&%a \&%Y" Ta Li "Wed Jan  4 12:19:47 EST 1989"
-.It Li "Fri 9" Ta Li "\&%a \&%H" Ta Li "Fri Sep 26 09:00:00 EDT 1986"
-.It Li "Feb 10:30" Ta Li "\&%b \&%H:\&%S" Ta Li "Sun Feb  1 10:00:30 EST 1987"
-.It Li 10:30 Ta Li "\&%H:\&%M" Ta Li "Tue Sep 23 10:30:00 EDT 1986"
-.It Li 13:30 Ta Li "\&%H:\&%M" Ta Li "Tue Sep 22 13:30:00 EDT 1986"
-.El
-.Sh SEE ALSO
-.Xr ctime 3 ,
-.Xr localtime 3 ,
-.Xr mktime 3 ,
-.Xr strftime 3 ,
-.Xr strptime 3 ,
-.Xr time 3
-.Sh STANDARDS
-The
-.Fn getdate
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Nm
-function appeared in
-.At V.4 .
-.Sh BUGS
-The
-.Nm
-interface is inherently unsafe for multi-threaded programs or libraries,
-since it returns a pointer to a static variable and uses a global state
-variable.
diff --git a/lib/libc/time/getdate.c b/lib/libc/time/getdate.c
deleted file mode 100644
index 8851ee6d8..000000000
--- a/lib/libc/time/getdate.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/*	$NetBSD: getdate.c,v 1.3 2014/09/18 13:58:20 christos Exp $	*/
-/*
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Brian Ginsbach.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <util.h>
-
-#define TMSENTINEL	(-1)
-
-/*
- * getdate_err is set to one of the following values on error.
- *
- * 1	The DATEMSK environment variable is null or undefined.
- * 2	The template file cannot be opened for reading.
- * 3	Failed to get file status information.
- * 4	Template file is not a regular file.
- * 5	Encountered an error while reading the template file.
- * 6	Cannot allocate memory.
- * 7	Input string does not match any line in the template.
- * 8	Input string is invalid (for example, February 31) or could not
- *	be represented in a time_t.
- */
-
-int getdate_err;
-
-struct tm *
-getdate(const char *str)
-{
-	char *datemsk, *line, *rp;
-	FILE *fp;
-	struct stat sb;
-	static struct tm rtm, tmnow;
-	struct tm *tmp, *rtmp = &rtm;
-	size_t lineno = 0;
-	time_t now;
-
-	if (((datemsk = getenv("DATEMSK")) == NULL) || *datemsk == '\0') {
-		getdate_err = 1;
-		return (NULL);
-	}
-
-	if (stat(datemsk, &sb) < 0) {
-		getdate_err = 3;
-		return (NULL);
-	}
-
-	if ((sb.st_mode & S_IFMT) != S_IFREG) {
-		getdate_err = 4;
-		return (NULL);
-	}
-
-	if ((fp = fopen(datemsk, "re")) == NULL) {
-		getdate_err = 2;
-		return (NULL);
-	}
-
-	/* loop through datemsk file */
-	errno = 0;
-	rp = NULL;
-	while ((line = fparseln(fp, NULL, &lineno, NULL, 0)) != NULL) {
-		/* initialize tmp with sentinels */
-		rtm.tm_sec = rtm.tm_min = rtm.tm_hour = TMSENTINEL;
-		rtm.tm_mday = rtm.tm_mon = rtm.tm_year = TMSENTINEL;
-		rtm.tm_wday = rtm.tm_yday = rtm.tm_isdst = TMSENTINEL;
-		rtm.tm_gmtoff = 0;
-		rtm.tm_zone = NULL;
-		rp = strptime(str, line, rtmp);
-		free(line);
-		if (rp != NULL) 
-			break;
-		errno = 0;
-	}
-	if (errno != 0 || ferror(fp)) {
-		if (errno == ENOMEM)
-			getdate_err = 6;
-		else
-			getdate_err = 5;
-		fclose(fp);
-		return (NULL);
-	}
-	if (feof(fp) || (rp != NULL && *rp != '\0')) {
-		getdate_err = 7;
-		return (NULL);
-	}
-	fclose(fp);
-
-	time(&now);
-	tmp = localtime(&now);
-	tmnow = *tmp;
-
-	/*
-	 * This implementation does not accept setting the broken-down time
-	 * to anything other than the localtime().  It is not possible to
-	 * change the scanned timezone with %Z.
-	 *
-	 * Note IRIX and Solaris accept only the current zone for %Z.
-	 * XXX Is there any implementation that matches the standard?
-	 * XXX (Or am I reading the standard wrong?)
-	 *
-	 * Note: Neither XPG 6 (POSIX 2004) nor XPG 7 (POSIX 2008)
-	 * requires strptime(3) support for %Z.
-	 */
-
-	/*
-	 * Given only a weekday find the first matching weekday starting
-	 * with the current weekday and moving into the future.
-	 */
-	if (rtm.tm_wday != TMSENTINEL && rtm.tm_year == TMSENTINEL &&
-	    rtm.tm_mon == TMSENTINEL && rtm.tm_mday == TMSENTINEL) {
-		rtm.tm_year = tmnow.tm_year;
-		rtm.tm_mon = tmnow.tm_mon;
-		rtm.tm_mday = tmnow.tm_mday +
-			(rtm.tm_wday - tmnow.tm_wday + 7) % 7;
-	}
-
-	/*
-	 * Given only a month (and no year) find the first matching month
-	 * starting with the current month and moving into the future.
-	 */
-	if (rtm.tm_mon != TMSENTINEL) {
-		if (rtm.tm_year == TMSENTINEL) {
-			rtm.tm_year = tmnow.tm_year +
-				((rtm.tm_mon < tmnow.tm_mon)? 1 : 0);
-		}
-		if (rtm.tm_mday == TMSENTINEL) {
-			/* assume the first of the month */
-			rtm.tm_mday = 1;
-			/*
-			 * XXX This isn't documented! Just observed behavior.
-			 *
-			 * Given the weekday find the first matching weekday
-			 * starting with the weekday of the first day of the
-			 * the month and moving into the future.
-			 */
-			if (rtm.tm_wday != TMSENTINEL) {
-				struct tm tm;
-
-				memset(&tm, 0, sizeof(struct tm));
-				tm.tm_year = rtm.tm_year;
-				tm.tm_mon = rtm.tm_mon;
-				tm.tm_mday = 1;
-				mktime(&tm);
-				rtm.tm_mday +=
-					(rtm.tm_wday - tm.tm_wday + 7) % 7;
-			}
-		}
-	}
-
-	/*
-	 * Given no time of day assume the current time of day.
-	 */
-	if (rtm.tm_hour == TMSENTINEL &&
-	    rtm.tm_min == TMSENTINEL && rtm.tm_sec == TMSENTINEL) {
-		rtm.tm_hour = tmnow.tm_hour;
-		rtm.tm_min = tmnow.tm_min;
-		rtm.tm_sec = tmnow.tm_sec;
-	}
-	/*
-	 * Given an hour and no date, find the first matching hour starting
-	 * with the current hour and moving into the future
-	 */
-	if (rtm.tm_hour != TMSENTINEL &&
-	    rtm.tm_year == TMSENTINEL && rtm.tm_mon == TMSENTINEL &&
-	    rtm.tm_mday == TMSENTINEL) {
-		rtm.tm_year = tmnow.tm_year;
-		rtm.tm_mon = tmnow.tm_mon;
-		rtm.tm_mday = tmnow.tm_mday;
-		if (rtm.tm_hour < tmnow.tm_hour)
-			rtm.tm_hour += 24;
-	}
-
-	/*
-	 * Set to 'sane' values; mktime(3) does funny things otherwise.
-	 * No hours, no minutes, no seconds, no service.
-	 */
-	if (rtm.tm_hour == TMSENTINEL)
-		rtm.tm_hour = 0;
-	if (rtm.tm_min == TMSENTINEL)
-		rtm.tm_min = 0;
-	if (rtm.tm_sec == TMSENTINEL)
-		rtm.tm_sec = 0;
-
-	/*
-	 * Given only a year the values of month, day of month, day of year,
-	 * week day and is daylight (summer) time are unspecified.
-	 * (Specified on the Solaris man page not POSIX.)
-	 */
-	if (rtm.tm_year != TMSENTINEL &&
-	    rtm.tm_mon == TMSENTINEL && rtm.tm_mday == TMSENTINEL) {
-		rtm.tm_mon = 0;
-		rtm.tm_mday = 1;
-		/*
-		 * XXX More undocumented functionality but observed.
-		 *
-		 * Given the weekday find the first matching weekday
-		 * starting with the weekday of the first day of the
-		 * month and moving into the future.
-		 */
-		if (rtm.tm_wday != TMSENTINEL) {
-			struct tm tm;
-
-			memset(&tm, 0, sizeof(struct tm));
-			tm.tm_year = rtm.tm_year;
-			tm.tm_mon = rtm.tm_mon;
-			tm.tm_mday = 1;
-			mktime(&tm);
-			rtm.tm_mday += (rtm.tm_wday - tm.tm_wday + 7) % 7;
-		}
-	}
-
-	/*
-	 * Given only the century but no year within, the current year
-	 * is assumed.  (Specified on the Solaris man page not POSIX.)
-	 *
-	 * Warning ugly end case
-	 *
-	 * This is more work since strptime(3) doesn't "do the right thing".
-	 */
-	if (rtm.tm_year != TMSENTINEL && (rtm.tm_year - 1900) >= 0) {
-		rtm.tm_year -= 1900;
-		rtm.tm_year += (tmnow.tm_year % 100);
-	}
-
-	/*
-	 * mktime() will normalize all values and also check that the
-	 * value will fit into a time_t.
-	 *
-	 * This is only for POSIX correctness.	A date >= 1900 is
-	 * really ok, but using a time_t limits things.
-	 */
-	if (mktime(rtmp) < 0) {
-		getdate_err = 8;
-		return (NULL);
-	}
-
-	return (rtmp);
-}
diff --git a/lib/libc/time/leapseconds.awk b/lib/libc/time/leapseconds.awk
deleted file mode 100644
index 739615ae0..000000000
--- a/lib/libc/time/leapseconds.awk
+++ /dev/null
@@ -1,66 +0,0 @@
-# Generate the 'leapseconds' file from 'leap-seconds.list'.
-
-# This file is in the public domain.
-
-BEGIN {
-  print "# Allowance for leapseconds added to each timezone file."
-  print ""
-  print "# This file is in the public domain."
-  print ""
-  print "# This file is generated automatically from the data in the public-domain"
-  print "# leap-seconds.list file available from most NIST time servers."
-  print "# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,"
-  print "# you should be able to pick up leap-seconds.list from a secondary NIST server."
-  print "# For more about leap-seconds.list, please see"
-  print "# The NTP Timescale and Leap Seconds"
-  print "# <http://www.eecis.udel.edu/~mills/leap.html>."
-  print ""
-  print "# The International Earth Rotation Service periodically uses leap seconds"
-  print "# to keep UTC to within 0.9 s of UT1"
-  print "# (which measures the true angular orientation of the earth in space); see"
-  print "# Terry J Quinn, The BIPM and the accurate measure of time,"
-  print "# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>."
-  print "# There were no leap seconds before 1972, because the official mechanism"
-  print "# accounting for the discrepancy between atomic time and the earth's rotation"
-  print "# did not exist until the early 1970s."
-  print ""
-  print "# The correction (+ or -) is made at the given time, so lines"
-  print "# will typically look like:"
-  print "#	Leap	YEAR	MON	DAY	23:59:60	+	R/S"
-  print "# or"
-  print "#	Leap	YEAR	MON	DAY	23:59:59	-	R/S"
-  print ""
-  print "# If the leapsecond is Rolling (R) the given time is local time."
-  print "# If the leapsecond is Stationary (S) the given time is UTC."
-  print ""
-  print "# Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S"
-}
-
-/^ *$/ { next }
-/^#/ { next }
-
-{
-    NTP_timestamp = $1
-    TAI_minus_UTC = $2
-    hash_mark = $3
-    one = $4
-    month = $5
-    year = $6
-    if (old_TAI_minus_UTC) {
-	if (old_TAI_minus_UTC < TAI_minus_UTC) {
-	    sign = "23:59:60\t+"
-	} else {
-	    sign = "23:59:59\t-"
-	}
-	if (month == "Jan") {
-	    year--;
-	    month = "Dec";
-	    day = 31
-	} else if (month == "Jul") {
-	    month = "Jun";
-	    day = 30
-	}
-	printf "Leap\t%s\t%s\t%s\t%s\tS\n", year, month, day, sign
-    }
-    old_TAI_minus_UTC = TAI_minus_UTC
-}
diff --git a/lib/libc/time/localtime.c b/lib/libc/time/localtime.c
deleted file mode 100644
index aaae0a0fa..000000000
--- a/lib/libc/time/localtime.c
+++ /dev/null
@@ -1,2347 +0,0 @@
-/*	$NetBSD: localtime.c,v 1.98 2015/10/09 17:21:45 christos Exp $	*/
-
-/*
-** This file is in the public domain, so clarified as of
-** 1996-06-05 by Arthur David Olson.
-*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char	elsieid[] = "@(#)localtime.c	8.17";
-#else
-__RCSID("$NetBSD: localtime.c,v 1.98 2015/10/09 17:21:45 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
-** Leap second handling from Bradley White.
-** POSIX-style TZ environment variable handling from Guy Harris.
-*/
-
-/*LINTLIBRARY*/
-
-#include "namespace.h"
-#include <assert.h>
-#define LOCALTIME_IMPLEMENTATION
-#include "private.h"
-
-#include "tzfile.h"
-#include "fcntl.h"
-#include "reentrant.h"
-
-#if NETBSD_INSPIRED
-# define NETBSD_INSPIRED_EXTERN
-#else
-# define NETBSD_INSPIRED_EXTERN static
-#endif
-
-#if defined(__weak_alias)
-__weak_alias(daylight,_daylight)
-__weak_alias(tzname,_tzname)
-#endif
-
-#ifndef TZ_ABBR_MAX_LEN
-#define TZ_ABBR_MAX_LEN	16
-#endif /* !defined TZ_ABBR_MAX_LEN */
-
-#ifndef TZ_ABBR_CHAR_SET
-#define TZ_ABBR_CHAR_SET \
-	"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 :+-._"
-#endif /* !defined TZ_ABBR_CHAR_SET */
-
-#ifndef TZ_ABBR_ERR_CHAR
-#define TZ_ABBR_ERR_CHAR	'_'
-#endif /* !defined TZ_ABBR_ERR_CHAR */
-
-/*
-** SunOS 4.1.1 headers lack O_BINARY.
-*/
-
-#ifdef O_BINARY
-#define OPEN_MODE	(O_RDONLY | O_BINARY | O_CLOEXEC)
-#endif /* defined O_BINARY */
-#ifndef O_BINARY
-#define OPEN_MODE	(O_RDONLY | O_CLOEXEC)
-#endif /* !defined O_BINARY */
-
-#ifndef WILDABBR
-/*
-** Someone might make incorrect use of a time zone abbreviation:
-**	1.	They might reference tzname[0] before calling tzset (explicitly
-**		or implicitly).
-**	2.	They might reference tzname[1] before calling tzset (explicitly
-**		or implicitly).
-**	3.	They might reference tzname[1] after setting to a time zone
-**		in which Daylight Saving Time is never observed.
-**	4.	They might reference tzname[0] after setting to a time zone
-**		in which Standard Time is never observed.
-**	5.	They might reference tm.TM_ZONE after calling offtime.
-** What's best to do in the above cases is open to debate;
-** for now, we just set things up so that in any of the five cases
-** WILDABBR is used. Another possibility: initialize tzname[0] to the
-** string "tzname[0] used before set", and similarly for the other cases.
-** And another: initialize tzname[0] to "ERA", with an explanation in the
-** manual page of what this "time zone abbreviation" means (doing this so
-** that tzname[0] has the "normal" length of three characters).
-*/
-#define WILDABBR	"   "
-#endif /* !defined WILDABBR */
-
-static const char	wildabbr[] = WILDABBR;
-
-static const char	gmt[] = "GMT";
-
-/*
-** The DST rules to use if TZ has no rules and we can't load TZDEFRULES.
-** We default to US rules as of 1999-08-17.
-** POSIX 1003.1 section 8.1.1 says that the default DST rules are
-** implementation dependent; for historical reasons, US rules are a
-** common default.
-*/
-#ifndef TZDEFRULESTRING
-#define TZDEFRULESTRING ",M4.1.0,M10.5.0"
-#endif /* !defined TZDEFDST */
-
-struct ttinfo {				/* time type information */
-	int_fast32_t	tt_gmtoff;	/* UT offset in seconds */
-	bool		tt_isdst;	/* used to set tm_isdst */
-	int		tt_abbrind;	/* abbreviation list index */
-	bool		tt_ttisstd;	/* transition is std time */
-	bool		tt_ttisgmt;	/* transition is UT */
-};
-
-struct lsinfo {				/* leap second information */
-	time_t		ls_trans;	/* transition time */
-	int_fast64_t	ls_corr;	/* correction to apply */
-};
-
-#define SMALLEST(a, b)	(((a) < (b)) ? (a) : (b))
-#define BIGGEST(a, b)	(((a) > (b)) ? (a) : (b))
-
-#ifdef TZNAME_MAX
-#define MY_TZNAME_MAX	TZNAME_MAX
-#endif /* defined TZNAME_MAX */
-#ifndef TZNAME_MAX
-#define MY_TZNAME_MAX	255
-#endif /* !defined TZNAME_MAX */
-
-#define state __state
-struct state {
-	int		leapcnt;
-	int		timecnt;
-	int		typecnt;
-	int		charcnt;
-	bool		goback;
-	bool		goahead;
-	time_t		ats[TZ_MAX_TIMES];
-	unsigned char	types[TZ_MAX_TIMES];
-	struct ttinfo	ttis[TZ_MAX_TYPES];
-	char		chars[/*CONSTCOND*/BIGGEST(BIGGEST(TZ_MAX_CHARS + 1,
-				sizeof gmt), (2 * (MY_TZNAME_MAX + 1)))];
-	struct lsinfo	lsis[TZ_MAX_LEAPS];
-	int		defaulttype; /* for early times or if no transitions */
-};
-
-enum r_type {
-  JULIAN_DAY,		/* Jn = Julian day */
-  DAY_OF_YEAR,		/* n = day of year */
-  MONTH_NTH_DAY_OF_WEEK	/* Mm.n.d = month, week, day of week */
-};
-
-struct rule {
-	enum r_type	r_type;		/* type of rule */
-	int		r_day;		/* day number of rule */
-	int		r_week;		/* week number of rule */
-	int		r_mon;		/* month number of rule */
-	int_fast32_t	r_time;		/* transition time of rule */
-};
-
-static struct tm *gmtsub(struct state const *, time_t const *, int_fast32_t,
-			 struct tm *);
-static bool increment_overflow(int *, int);
-static bool increment_overflow_time(time_t *, int_fast32_t);
-static bool normalize_overflow32(int_fast32_t *, int *, int);
-static struct tm *timesub(time_t const *, int_fast32_t, struct state const *,
-			  struct tm *);
-static bool typesequiv(struct state const *, int, int);
-static bool tzparse(char const *, struct state *, bool);
-
-static timezone_t lclptr;
-static timezone_t gmtptr;
-
-#ifndef TZ_STRLEN_MAX
-#define TZ_STRLEN_MAX 255
-#endif /* !defined TZ_STRLEN_MAX */
-
-static char		lcl_TZname[TZ_STRLEN_MAX + 1];
-static int		lcl_is_set;
-
-#if !defined(__LIBC12_SOURCE__)
-
-__aconst char *		tzname[2] = {
-	(__aconst char *)__UNCONST(wildabbr),
-	(__aconst char *)__UNCONST(wildabbr)
-};
-
-#else
-
-extern __aconst char *	tzname[2];
-
-#endif
-
-#ifdef _REENTRANT
-static rwlock_t lcl_lock = RWLOCK_INITIALIZER;
-#endif
-
-/*
-** Section 4.12.3 of X3.159-1989 requires that
-**	Except for the strftime function, these functions [asctime,
-**	ctime, gmtime, localtime] return values in one of two static
-**	objects: a broken-down time structure and an array of char.
-** Thanks to Paul Eggert for noting this.
-*/
-
-static struct tm	tm;
-
-#ifdef USG_COMPAT
-#if !defined(__LIBC12_SOURCE__)
-long 			timezone = 0;
-int			daylight = 0;
-#else
-extern int		daylight;
-extern long		timezone __RENAME(__timezone13);
-#endif
-#endif /* defined USG_COMPAT */
-
-#ifdef ALTZONE
-long			altzone = 0;
-#endif /* defined ALTZONE */
-
-/* Initialize *S to a value based on GMTOFF, ISDST, and ABBRIND.  */
-static void
-init_ttinfo(struct ttinfo *s, int_fast32_t gmtoff, bool isdst, int abbrind)
-{
-	s->tt_gmtoff = gmtoff;
-	s->tt_isdst = isdst;
-	s->tt_abbrind = abbrind;
-	s->tt_ttisstd = false;
-	s->tt_ttisgmt = false;
-}
-
-static int_fast32_t
-detzcode(const char *const codep)
-{
-	int_fast32_t result;
-	int	i;
-	int_fast32_t one = 1;
-	int_fast32_t halfmaxval = one << (32 - 2);
-	int_fast32_t maxval = halfmaxval - 1 + halfmaxval;
-	int_fast32_t minval = -1 - maxval;
-
-	result = codep[0] & 0x7f;
-	for (i = 1; i < 4; ++i)
-		result = (result << 8) | (codep[i] & 0xff);
-
-	if (codep[0] & 0x80) {
-	  /* Do two's-complement negation even on non-two's-complement machines.
-	     If the result would be minval - 1, return minval.  */
-	    result -= !TWOS_COMPLEMENT(int_fast32_t) && result != 0;
-	    result += minval;
-	}
- 	return result;
-}
-
-static int_fast64_t
-detzcode64(const char *const codep)
-{
-	int_fast64_t result;
-	int	i;
-	int_fast64_t one = 1;
-	int_fast64_t halfmaxval = one << (64 - 2);
-	int_fast64_t maxval = halfmaxval - 1 + halfmaxval;
-	int_fast64_t minval = -TWOS_COMPLEMENT(int_fast64_t) - maxval;
-
-	result = codep[0] & 0x7f;
-	for (i = 1; i < 8; ++i)
-		result = (result << 8) | (codep[i] & 0xff);
-
-	if (codep[0] & 0x80) {
-	  /* Do two's-complement negation even on non-two's-complement machines.
-	     If the result would be minval - 1, return minval.  */
-	  result -= !TWOS_COMPLEMENT(int_fast64_t) && result != 0;
-	  result += minval;
-	}
- 	return result;
-}
-
-const char *
-tzgetname(const timezone_t sp, int isdst)
-{
-	int i;
-	for (i = 0; i < sp->timecnt; ++i) {
-		const struct ttinfo *const ttisp = &sp->ttis[sp->types[i]];
-
-		if (ttisp->tt_isdst == isdst)
-			return &sp->chars[ttisp->tt_abbrind];
-	}
-	errno = ESRCH;
-	return NULL;
-}
-
-static void
-scrub_abbrs(struct state *sp)
-{
-	int i;
-
-	/*
-	** First, replace bogus characters.
-	*/
-	for (i = 0; i < sp->charcnt; ++i)
-		if (strchr(TZ_ABBR_CHAR_SET, sp->chars[i]) == NULL)
-			sp->chars[i] = TZ_ABBR_ERR_CHAR;
-	/*
-	** Second, truncate long abbreviations.
-	*/
-	for (i = 0; i < sp->typecnt; ++i) {
-		const struct ttinfo * const	ttisp = &sp->ttis[i];
-		char *				cp = &sp->chars[ttisp->tt_abbrind];
-
-		if (strlen(cp) > TZ_ABBR_MAX_LEN &&
-			strcmp(cp, GRANDPARENTED) != 0)
-				*(cp + TZ_ABBR_MAX_LEN) = '\0';
-	}
-}
-
-static void
-update_tzname_etc(const struct state *sp, const struct ttinfo *ttisp)
-{
-	tzname[ttisp->tt_isdst] = __UNCONST(&sp->chars[ttisp->tt_abbrind]);
-#ifdef USG_COMPAT
-	if (!ttisp->tt_isdst)
-		timezone = - ttisp->tt_gmtoff;
-#endif
-#ifdef ALTZONE
-	if (ttisp->tt_isdst)
-	    altzone = - ttisp->tt_gmtoff;
-#endif /* defined ALTZONE */
-}
-
-static void
-settzname(void)
-{
-	timezone_t const	sp = lclptr;
-	int			i;
-
-	tzname[0] = (__aconst char *)__UNCONST(wildabbr);
-	tzname[1] = (__aconst char *)__UNCONST(wildabbr);
-#ifdef USG_COMPAT
-	daylight = 0;
-	timezone = 0;
-#endif /* defined USG_COMPAT */
-#ifdef ALTZONE
-	altzone = 0;
-#endif /* defined ALTZONE */
-	if (sp == NULL) {
-		tzname[0] = tzname[1] = (__aconst char *)__UNCONST(gmt);
-		return;
-	}
-	/*
-	** And to get the latest zone names into tzname. . .
-	*/
-	for (i = 0; i < sp->typecnt; ++i)
-		update_tzname_etc(sp, &sp->ttis[i]);
-
-	for (i = 0; i < sp->timecnt; ++i) {
-		const struct ttinfo * const ttisp = &sp->ttis[sp->types[i]];
-		update_tzname_etc(sp, ttisp);
-#ifdef USG_COMPAT
-		if (ttisp->tt_isdst)
-			daylight = 1;
-#endif /* defined USG_COMPAT */
-	}
-}
-
-static bool
-differ_by_repeat(const time_t t1, const time_t t0)
-{
-	if (TYPE_BIT(time_t) - TYPE_SIGNED(time_t) < SECSPERREPEAT_BITS)
-		return 0;
-	return (int_fast64_t)t1 - (int_fast64_t)t0 == SECSPERREPEAT;
-}
-
-union input_buffer {
-	/* The first part of the buffer, interpreted as a header.  */
-	struct tzhead tzhead;
-
-	/* The entire buffer.  */
-	char buf[2 * sizeof(struct tzhead) + 2 * sizeof (struct state)
-	  + 4 * TZ_MAX_TIMES];
-};
-
-/* Local storage needed for 'tzloadbody'.  */
-union local_storage {
-	/* The file name to be opened.  */
-	char fullname[FILENAME_MAX + 1];
-
-	/* The results of analyzing the file's contents after it is opened.  */
-	struct {
-		/* The input buffer.  */
-		union input_buffer u;
-
-		/* A temporary state used for parsing a TZ string in the file.  */
-		struct state st;
-	} u;
-};
-
-/* Load tz data from the file named NAME into *SP.  Read extended
-   format if DOEXTEND.  Use *LSP for temporary storage.  Return 0 on
-   success, an errno value on failure.  */
-static int
-tzloadbody(char const *name, struct state *sp, bool doextend,
-  union local_storage *lsp)
-{
-	int			i;
-	int			fid;
-	int			stored;
-	ssize_t			nread;
-	bool			doaccess;
-	char			*fullname = lsp->fullname;
-	union input_buffer	*up = &lsp->u.u;
-	size_t			tzheadsize = sizeof(struct tzhead);
-
-	sp->goback = sp->goahead = false;
-
-	if (! name) {
-		name = TZDEFAULT;
-		if (! name)
-			return EINVAL;
-	}
-
-	if (name[0] == ':')
-		++name;
-	doaccess = name[0] == '/';
-	if (!doaccess) {
-		char const *p = TZDIR;
-		if (! p)
-			return EINVAL;
-		if (sizeof lsp->fullname - 1 <= strlen(p) + strlen(name))
-			return ENAMETOOLONG;
-		strcpy(fullname, p);
-		strcat(fullname, "/");
-		strcat(fullname, name);
-		/* Set doaccess if '.' (as in "../") shows up in name.  */
-		if (strchr(name, '.'))
-			doaccess = true;
-		name = fullname;
-	}
-	if (doaccess && access(name, R_OK) != 0)
-		return errno;
-
-	fid = open(name, OPEN_MODE);
-	if (fid < 0)
-		return errno;
-	nread = read(fid, up->buf, sizeof up->buf);
-	if (nread < (ssize_t)tzheadsize) {
-		int err = nread < 0 ? errno : EINVAL;
-		close(fid);
-		return err;
-	}
-	if (close(fid) < 0)
-		return errno;
-	for (stored = 4; stored <= 8; stored *= 2) {
-		int_fast32_t ttisstdcnt = detzcode(up->tzhead.tzh_ttisstdcnt);
-		int_fast32_t ttisgmtcnt = detzcode(up->tzhead.tzh_ttisgmtcnt);
-		int_fast32_t leapcnt = detzcode(up->tzhead.tzh_leapcnt);
-		int_fast32_t timecnt = detzcode(up->tzhead.tzh_timecnt);
-		int_fast32_t typecnt = detzcode(up->tzhead.tzh_typecnt);
-		int_fast32_t charcnt = detzcode(up->tzhead.tzh_charcnt);
-		char const *p = up->buf + tzheadsize;
-		if (! (0 <= leapcnt && leapcnt < TZ_MAX_LEAPS
-		       && 0 < typecnt && typecnt < TZ_MAX_TYPES
-		       && 0 <= timecnt && timecnt < TZ_MAX_TIMES
-		       && 0 <= charcnt && charcnt < TZ_MAX_CHARS
-		       && (ttisstdcnt == typecnt || ttisstdcnt == 0)
-		       && (ttisgmtcnt == typecnt || ttisgmtcnt == 0)))
-		  return EINVAL;
-		if ((size_t)nread
-		    < (tzheadsize		/* struct tzhead */
-		       + timecnt * stored	/* ats */
-		       + timecnt		/* types */
-		       + typecnt * 6		/* ttinfos */
-		       + charcnt		/* chars */
-		       + leapcnt * (stored + 4)	/* lsinfos */
-		       + ttisstdcnt		/* ttisstds */
-		       + ttisgmtcnt))		/* ttisgmts */
-		  return EINVAL;
-		sp->leapcnt = leapcnt;
-		sp->timecnt = timecnt;
-		sp->typecnt = typecnt;
-		sp->charcnt = charcnt;
-
-		/* Read transitions, discarding those out of time_t range.
-		   But pretend the last transition before time_t_min
-		   occurred at time_t_min.  */
-		timecnt = 0;
-		for (i = 0; i < sp->timecnt; ++i) {
-			int_fast64_t at
-			  = stored == 4 ? detzcode(p) : detzcode64(p);
-			sp->types[i] = at <= time_t_max;
-			if (sp->types[i]) {
-				time_t attime
-				    = ((TYPE_SIGNED(time_t) ?
-				    at < time_t_min : at < 0)
-				    ? time_t_min : (time_t)at);
-				if (timecnt && attime <= sp->ats[timecnt - 1]) {
-					if (attime < sp->ats[timecnt - 1])
-						return EINVAL;
-					sp->types[i - 1] = 0;
-					timecnt--;
-				}
-				sp->ats[timecnt++] = attime;
-			}
-			p += stored;
-		}
-
-		timecnt = 0;
-		for (i = 0; i < sp->timecnt; ++i) {
-			unsigned char typ = *p++;
-			if (sp->typecnt <= typ)
-			  return EINVAL;
-			if (sp->types[i])
-				sp->types[timecnt++] = typ;
-		}
-		sp->timecnt = timecnt;
-		for (i = 0; i < sp->typecnt; ++i) {
-			struct ttinfo *	ttisp;
-			unsigned char isdst, abbrind;
-
-			ttisp = &sp->ttis[i];
-			ttisp->tt_gmtoff = detzcode(p);
-			p += 4;
-			isdst = *p++;
-			if (! (isdst < 2))
-				return EINVAL;
-			ttisp->tt_isdst = isdst;
-			abbrind = *p++;
-			if (! (abbrind < sp->charcnt))
-				return EINVAL;
-			ttisp->tt_abbrind = abbrind;
-		}
-		for (i = 0; i < sp->charcnt; ++i)
-			sp->chars[i] = *p++;
-		sp->chars[i] = '\0';	/* ensure '\0' at end */
-
-		/* Read leap seconds, discarding those out of time_t range.  */
-		leapcnt = 0;
-		for (i = 0; i < sp->leapcnt; ++i) {
-			int_fast64_t tr = stored == 4 ? detzcode(p) :
-			    detzcode64(p);
-			int_fast32_t corr = detzcode(p + stored);
-			p += stored + 4;
-			if (tr <= time_t_max) {
-				time_t trans = ((TYPE_SIGNED(time_t) ?
-				    tr < time_t_min : tr < 0)
-				    ? time_t_min : (time_t)tr);
-				if (leapcnt && trans <=
-				    sp->lsis[leapcnt - 1].ls_trans) {
-					if (trans <
-					    sp->lsis[leapcnt - 1].ls_trans)
-						return EINVAL;
-					leapcnt--;
-				}
-				sp->lsis[leapcnt].ls_trans = trans;
-				sp->lsis[leapcnt].ls_corr = corr;
-				leapcnt++;
-			}
-		}
-		sp->leapcnt = leapcnt;
-
-		for (i = 0; i < sp->typecnt; ++i) {
-			struct ttinfo *	ttisp;
-
-			ttisp = &sp->ttis[i];
-			if (ttisstdcnt == 0)
-				ttisp->tt_ttisstd = false;
-			else {
-				if (*p != true && *p != false)
-				  return EINVAL;
-				ttisp->tt_ttisstd = *p++;
-			}
-		}
-		for (i = 0; i < sp->typecnt; ++i) {
-			struct ttinfo *	ttisp;
-
-			ttisp = &sp->ttis[i];
-			if (ttisgmtcnt == 0)
-				ttisp->tt_ttisgmt = false;
-			else {
-				if (*p != true && *p != false)
-						return EINVAL;
-				ttisp->tt_ttisgmt = *p++;
-			}
-		}
-		/*
-		** If this is an old file, we're done.
-		*/
-		if (up->tzhead.tzh_version[0] == '\0')
-			break;
-		nread -= p - up->buf;
-		memmove(up->buf, p, (size_t)nread);
-	}
-	if (doextend && nread > 2 &&
-		up->buf[0] == '\n' && up->buf[nread - 1] == '\n' &&
-		sp->typecnt + 2 <= TZ_MAX_TYPES) {
-			struct state *ts = &lsp->u.st;
-
-			up->buf[nread - 1] = '\0';
-			if (tzparse(&up->buf[1], ts, false)
-			    && ts->typecnt == 2) {
-
-			  /* Attempt to reuse existing abbreviations.
-			     Without this, America/Anchorage would stop
-			     working after 2037 when TZ_MAX_CHARS is 50, as
-			     sp->charcnt equals 42 (for LMT CAT CAWT CAPT AHST
-			     AHDT YST AKDT AKST) and ts->charcnt equals 10
-			     (for AKST AKDT).  Reusing means sp->charcnt can
-			     stay 42 in this example.  */
-			  int gotabbr = 0;
-			  int charcnt = sp->charcnt;
-			  for (i = 0; i < 2; i++) {
-			    char *tsabbr = ts->chars + ts->ttis[i].tt_abbrind;
-			    int j;
-			    for (j = 0; j < charcnt; j++)
-			      if (strcmp(sp->chars + j, tsabbr) == 0) {
-				ts->ttis[i].tt_abbrind = j;
-				gotabbr++;
-				break;
-			      }
-			    if (! (j < charcnt)) {
-			      int tsabbrlen = strlen(tsabbr);
-			      if (j + tsabbrlen < TZ_MAX_CHARS) {
-				strcpy(sp->chars + j, tsabbr);
-				charcnt = j + tsabbrlen + 1;
-				ts->ttis[i].tt_abbrind = j;
-				gotabbr++;
-			      }
-			    }
-			  }
-			  if (gotabbr == 2) {
-			    sp->charcnt = charcnt;
-			    for (i = 0; i < ts->timecnt; i++)
-			      if (sp->ats[sp->timecnt - 1] < ts->ats[i])
-				break;
-			    while (i < ts->timecnt
-				   && sp->timecnt < TZ_MAX_TIMES) {
-			      sp->ats[sp->timecnt] = ts->ats[i];
-			      sp->types[sp->timecnt] = (sp->typecnt
-							+ ts->types[i]);
-			      sp->timecnt++;
-			      i++;
-			    }
-			    sp->ttis[sp->typecnt++] = ts->ttis[0];
-			    sp->ttis[sp->typecnt++] = ts->ttis[1];
-			  }
-			}
-	}
-	if (sp->timecnt > 1) {
-		for (i = 1; i < sp->timecnt; ++i)
-			if (typesequiv(sp, sp->types[i], sp->types[0]) &&
-				differ_by_repeat(sp->ats[i], sp->ats[0])) {
-					sp->goback = true;
-					break;
-				}
-		for (i = sp->timecnt - 2; i >= 0; --i)
-			if (typesequiv(sp, sp->types[sp->timecnt - 1],
-				sp->types[i]) &&
-				differ_by_repeat(sp->ats[sp->timecnt - 1],
-				sp->ats[i])) {
-					sp->goahead = true;
-					break;
-		}
-	}
-	/*
-	** If type 0 is is unused in transitions,
-	** it's the type to use for early times.
-	*/
-	for (i = 0; i < sp->timecnt; ++i)
-		if (sp->types[i] == 0)
-			break;
-	i = i < sp->timecnt ? -1 : 0;
-	/*
-	** Absent the above,
-	** if there are transition times
-	** and the first transition is to a daylight time
-	** find the standard type less than and closest to
-	** the type of the first transition.
-	*/
-	if (i < 0 && sp->timecnt > 0 && sp->ttis[sp->types[0]].tt_isdst) {
-		i = sp->types[0];
-		while (--i >= 0)
-			if (!sp->ttis[i].tt_isdst)
-				break;
-	}
-	/*
-	** If no result yet, find the first standard type.
-	** If there is none, punt to type zero.
-	*/
-	if (i < 0) {
-		i = 0;
-		while (sp->ttis[i].tt_isdst)
-			if (++i >= sp->typecnt) {
-				i = 0;
-				break;
-			}
-	}
-	sp->defaulttype = i;
-	return 0;
-}
-
-/* Load tz data from the file named NAME into *SP.  Read extended
-   format if DOEXTEND.  Return 0 on success, an errno value on failure.  */
-static int
-tzload(char const *name, struct state *sp, bool doextend)
-{
-	union local_storage *lsp = malloc(sizeof *lsp);
-	if (!lsp)
-		return errno;
-	else {
-		int err = tzloadbody(name, sp, doextend, lsp);
-		free(lsp);
-		return err;
-	}
-}
-
-static bool
-typesequiv(const struct state *sp, int a, int b)
-{
-	bool result;
-
-	if (sp == NULL ||
-		a < 0 || a >= sp->typecnt ||
-		b < 0 || b >= sp->typecnt)
-			result = false;
-	else {
-		const struct ttinfo *	ap = &sp->ttis[a];
-		const struct ttinfo *	bp = &sp->ttis[b];
-		result = ap->tt_gmtoff == bp->tt_gmtoff &&
-			ap->tt_isdst == bp->tt_isdst &&
-			ap->tt_ttisstd == bp->tt_ttisstd &&
-			ap->tt_ttisgmt == bp->tt_ttisgmt &&
-			strcmp(&sp->chars[ap->tt_abbrind],
-			&sp->chars[bp->tt_abbrind]) == 0;
-	}
-	return result;
-}
-
-static const int	mon_lengths[2][MONSPERYEAR] = {
-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-static const int	year_lengths[2] = {
-	DAYSPERNYEAR, DAYSPERLYEAR
-};
-
-/*
-** Given a pointer into a time zone string, scan until a character that is not
-** a valid character in a zone name is found. Return a pointer to that
-** character.
-*/
-
-static const char * ATTRIBUTE_PURE
-getzname(const char *strp)
-{
-	char	c;
-
-	while ((c = *strp) != '\0' && !is_digit(c) && c != ',' && c != '-' &&
-		c != '+')
-			++strp;
-	return strp;
-}
-
-/*
-** Given a pointer into an extended time zone string, scan until the ending
-** delimiter of the zone name is located. Return a pointer to the delimiter.
-**
-** As with getzname above, the legal character set is actually quite
-** restricted, with other characters producing undefined results.
-** We don't do any checking here; checking is done later in common-case code.
-*/
-
-static const char * ATTRIBUTE_PURE
-getqzname(const char *strp, const int delim)
-{
-	int	c;
-
-	while ((c = *strp) != '\0' && c != delim)
-		++strp;
-	return strp;
-}
-
-/*
-** Given a pointer into a time zone string, extract a number from that string.
-** Check that the number is within a specified range; if it is not, return
-** NULL.
-** Otherwise, return a pointer to the first character not part of the number.
-*/
-
-static const char *
-getnum(const char *strp, int *const nump, const int min, const int max)
-{
-	char	c;
-	int	num;
-
-	if (strp == NULL || !is_digit(c = *strp)) {
-		errno = EINVAL;
-		return NULL;
-	}
-	num = 0;
-	do {
-		num = num * 10 + (c - '0');
-		if (num > max) {
-			errno = EOVERFLOW;
-			return NULL;	/* illegal value */
-		}
-		c = *++strp;
-	} while (is_digit(c));
-	if (num < min) {
-		errno = EINVAL;
-		return NULL;		/* illegal value */
-	}
-	*nump = num;
-	return strp;
-}
-
-/*
-** Given a pointer into a time zone string, extract a number of seconds,
-** in hh[:mm[:ss]] form, from the string.
-** If any error occurs, return NULL.
-** Otherwise, return a pointer to the first character not part of the number
-** of seconds.
-*/
-
-static const char *
-getsecs(const char *strp, int_fast32_t *const secsp)
-{
-	int	num;
-
-	/*
-	** 'HOURSPERDAY * DAYSPERWEEK - 1' allows quasi-Posix rules like
-	** "M10.4.6/26", which does not conform to Posix,
-	** but which specifies the equivalent of
-	** "02:00 on the first Sunday on or after 23 Oct".
-	*/
-	strp = getnum(strp, &num, 0, HOURSPERDAY * DAYSPERWEEK - 1);
-	if (strp == NULL)
-		return NULL;
-	*secsp = num * (int_fast32_t) SECSPERHOUR;
-	if (*strp == ':') {
-		++strp;
-		strp = getnum(strp, &num, 0, MINSPERHOUR - 1);
-		if (strp == NULL)
-			return NULL;
-		*secsp += num * SECSPERMIN;
-		if (*strp == ':') {
-			++strp;
-			/* 'SECSPERMIN' allows for leap seconds.  */
-			strp = getnum(strp, &num, 0, SECSPERMIN);
-			if (strp == NULL)
-				return NULL;
-			*secsp += num;
-		}
-	}
-	return strp;
-}
-
-/*
-** Given a pointer into a time zone string, extract an offset, in
-** [+-]hh[:mm[:ss]] form, from the string.
-** If any error occurs, return NULL.
-** Otherwise, return a pointer to the first character not part of the time.
-*/
-
-static const char *
-getoffset(const char *strp, int_fast32_t *const offsetp)
-{
-	bool neg = false;
-
-	if (*strp == '-') {
-		neg = true;
-		++strp;
-	} else if (*strp == '+')
-		++strp;
-	strp = getsecs(strp, offsetp);
-	if (strp == NULL)
-		return NULL;		/* illegal time */
-	if (neg)
-		*offsetp = -*offsetp;
-	return strp;
-}
-
-/*
-** Given a pointer into a time zone string, extract a rule in the form
-** date[/time]. See POSIX section 8 for the format of "date" and "time".
-** If a valid rule is not found, return NULL.
-** Otherwise, return a pointer to the first character not part of the rule.
-*/
-
-static const char *
-getrule(const char *strp, struct rule *const rulep)
-{
-	if (*strp == 'J') {
-		/*
-		** Julian day.
-		*/
-		rulep->r_type = JULIAN_DAY;
-		++strp;
-		strp = getnum(strp, &rulep->r_day, 1, DAYSPERNYEAR);
-	} else if (*strp == 'M') {
-		/*
-		** Month, week, day.
-		*/
-		rulep->r_type = MONTH_NTH_DAY_OF_WEEK;
-		++strp;
-		strp = getnum(strp, &rulep->r_mon, 1, MONSPERYEAR);
-		if (strp == NULL)
-			return NULL;
-		if (*strp++ != '.')
-			return NULL;
-		strp = getnum(strp, &rulep->r_week, 1, 5);
-		if (strp == NULL)
-			return NULL;
-		if (*strp++ != '.')
-			return NULL;
-		strp = getnum(strp, &rulep->r_day, 0, DAYSPERWEEK - 1);
-	} else if (is_digit(*strp)) {
-		/*
-		** Day of year.
-		*/
-		rulep->r_type = DAY_OF_YEAR;
-		strp = getnum(strp, &rulep->r_day, 0, DAYSPERLYEAR - 1);
-	} else	return NULL;		/* invalid format */
-	if (strp == NULL)
-		return NULL;
-	if (*strp == '/') {
-		/*
-		** Time specified.
-		*/
-		++strp;
-		strp = getoffset(strp, &rulep->r_time);
-	} else	rulep->r_time = 2 * SECSPERHOUR;	/* default = 2:00:00 */
-	return strp;
-}
-
-/*
-** Given a year, a rule, and the offset from UT at the time that rule takes
-** effect, calculate the year-relative time that rule takes effect.
-*/
-
-static int_fast32_t ATTRIBUTE_PURE
-transtime(const int year, const struct rule *const rulep,
-	  const int_fast32_t offset)
-{
-	bool	leapyear;
-	int_fast32_t value;
-	int	i;
-	int		d, m1, yy0, yy1, yy2, dow;
-
-	INITIALIZE(value);
-	leapyear = isleap(year);
-	switch (rulep->r_type) {
-
-	case JULIAN_DAY:
-		/*
-		** Jn - Julian day, 1 == January 1, 60 == March 1 even in leap
-		** years.
-		** In non-leap years, or if the day number is 59 or less, just
-		** add SECSPERDAY times the day number-1 to the time of
-		** January 1, midnight, to get the day.
-		*/
-		value = (rulep->r_day - 1) * SECSPERDAY;
-		if (leapyear && rulep->r_day >= 60)
-			value += SECSPERDAY;
-		break;
-
-	case DAY_OF_YEAR:
-		/*
-		** n - day of year.
-		** Just add SECSPERDAY times the day number to the time of
-		** January 1, midnight, to get the day.
-		*/
-		value = rulep->r_day * SECSPERDAY;
-		break;
-
-	case MONTH_NTH_DAY_OF_WEEK:
-		/*
-		** Mm.n.d - nth "dth day" of month m.
-		*/
-
-		/*
-		** Use Zeller's Congruence to get day-of-week of first day of
-		** month.
-		*/
-		m1 = (rulep->r_mon + 9) % 12 + 1;
-		yy0 = (rulep->r_mon <= 2) ? (year - 1) : year;
-		yy1 = yy0 / 100;
-		yy2 = yy0 % 100;
-		dow = ((26 * m1 - 2) / 10 +
-			1 + yy2 + yy2 / 4 + yy1 / 4 - 2 * yy1) % 7;
-		if (dow < 0)
-			dow += DAYSPERWEEK;
-
-		/*
-		** "dow" is the day-of-week of the first day of the month. Get
-		** the day-of-month (zero-origin) of the first "dow" day of the
-		** month.
-		*/
-		d = rulep->r_day - dow;
-		if (d < 0)
-			d += DAYSPERWEEK;
-		for (i = 1; i < rulep->r_week; ++i) {
-			if (d + DAYSPERWEEK >=
-				mon_lengths[leapyear][rulep->r_mon - 1])
-					break;
-			d += DAYSPERWEEK;
-		}
-
-		/*
-		** "d" is the day-of-month (zero-origin) of the day we want.
-		*/
-		value = d * SECSPERDAY;
-		for (i = 0; i < rulep->r_mon - 1; ++i)
-			value += mon_lengths[leapyear][i] * SECSPERDAY;
-		break;
-	}
-
-	/*
-	** "value" is the year-relative time of 00:00:00 UT on the day in
-	** question. To get the year-relative time of the specified local
-	** time on that day, add the transition time and the current offset
-	** from UT.
-	*/
-	return value + rulep->r_time + offset;
-}
-
-/*
-** Given a POSIX section 8-style TZ string, fill in the rule tables as
-** appropriate.
-*/
-
-static bool
-tzparse(const char *name, struct state *sp, bool lastditch)
-{
-	const char *	stdname;
-	const char *	dstname;
-	size_t		stdlen;
-	size_t		dstlen;
-	size_t		charcnt;
-	int_fast32_t	stdoffset;
-	int_fast32_t	dstoffset;
-	char *		cp;
-	bool		load_ok;
-
-	dstname = NULL; /* XXX gcc */
-	stdname = name;
-	if (lastditch) {
-		stdlen = sizeof gmt - 1;
-		name += stdlen;
-		stdoffset = 0;
-	} else {
-		if (*name == '<') {
-			name++;
-			stdname = name;
-			name = getqzname(name, '>');
-			if (*name != '>')
-			  return false;
-			stdlen = name - stdname;
-			name++;
-		} else {
-			name = getzname(name);
-			stdlen = name - stdname;
-		}
-		if (!stdlen)
-			return false;
-		name = getoffset(name, &stdoffset);
-		if (name == NULL)
-			return false;
-	}
-	charcnt = stdlen + 1;
-	if (sizeof sp->chars < charcnt)
-		return false;
-	load_ok = tzload(TZDEFRULES, sp, false) == 0;
-	if (!load_ok)
-		sp->leapcnt = 0;		/* so, we're off a little */
-	if (*name != '\0') {
-		if (*name == '<') {
-			dstname = ++name;
-			name = getqzname(name, '>');
-			if (*name != '>')
-				return false;
-			dstlen = name - dstname;
-			name++;
-		} else {
-			dstname = name;
-			name = getzname(name);
-			dstlen = name - dstname; /* length of DST zone name */
-		}
-		if (!dstlen)
-		  return false;
-		charcnt += dstlen + 1;
-		if (sizeof sp->chars < charcnt)
-		  return false;
-		if (*name != '\0' && *name != ',' && *name != ';') {
-			name = getoffset(name, &dstoffset);
-			if (name == NULL)
-			  return false;
-		} else	dstoffset = stdoffset - SECSPERHOUR;
-		if (*name == '\0' && !load_ok)
-			name = TZDEFRULESTRING;
-		if (*name == ',' || *name == ';') {
-			struct rule	start;
-			struct rule	end;
-			int		year;
-			int		yearlim;
-			int		timecnt;
-			time_t		janfirst;
-
-			++name;
-			if ((name = getrule(name, &start)) == NULL)
-				return false;
-			if (*name++ != ',')
-				return false;
-			if ((name = getrule(name, &end)) == NULL)
-				return false;
-			if (*name != '\0')
-				return false;
-			sp->typecnt = 2;	/* standard time and DST */
-			/*
-			** Two transitions per year, from EPOCH_YEAR forward.
-			*/
-			init_ttinfo(&sp->ttis[0], -dstoffset, true, 
-			    (int)(stdlen + 1));
-			init_ttinfo(&sp->ttis[1], -stdoffset, false, 0);
-			sp->defaulttype = 0;
-			timecnt = 0;
-			janfirst = 0;
-			yearlim = EPOCH_YEAR + YEARSPERREPEAT;
-			for (year = EPOCH_YEAR; year < yearlim; year++) {
-				int_fast32_t
-				  starttime = transtime(year, &start, stdoffset),
-				  endtime = transtime(year, &end, dstoffset);
-				int_fast32_t
-				  yearsecs = (year_lengths[isleap(year)]
-					      * SECSPERDAY);
-				bool reversed = endtime < starttime;
-				if (reversed) {
-					int_fast32_t swap = starttime;
-					starttime = endtime;
-					endtime = swap;
-				}
-				if (reversed
-				    || (starttime < endtime
-					&& (endtime - starttime
-					    < (yearsecs
-					       + (stdoffset - dstoffset))))) {
-					if (TZ_MAX_TIMES - 2 < timecnt)
-						break;
-					yearlim = year + YEARSPERREPEAT + 1;
-					sp->ats[timecnt] = janfirst;
-					if (increment_overflow_time
-					    (&sp->ats[timecnt], starttime))
-						break;
-					sp->types[timecnt++] = reversed;
-					sp->ats[timecnt] = janfirst;
-					if (increment_overflow_time
-					    (&sp->ats[timecnt], endtime))
-						break;
-					sp->types[timecnt++] = !reversed;
-				}
-				if (increment_overflow_time(&janfirst, yearsecs))
-					break;
-			}
-			sp->timecnt = timecnt;
-			if (!timecnt)
-				sp->typecnt = 1;	/* Perpetual DST.  */
-		} else {
-			int_fast32_t	theirstdoffset;
-			int_fast32_t	theirdstoffset;
-			int_fast32_t	theiroffset;
-			bool		isdst;
-			int		i;
-			int		j;
-
-			if (*name != '\0')
-				return false;
-			/*
-			** Initial values of theirstdoffset and theirdstoffset.
-			*/
-			theirstdoffset = 0;
-			for (i = 0; i < sp->timecnt; ++i) {
-				j = sp->types[i];
-				if (!sp->ttis[j].tt_isdst) {
-					theirstdoffset =
-						-sp->ttis[j].tt_gmtoff;
-					break;
-				}
-			}
-			theirdstoffset = 0;
-			for (i = 0; i < sp->timecnt; ++i) {
-				j = sp->types[i];
-				if (sp->ttis[j].tt_isdst) {
-					theirdstoffset =
-						-sp->ttis[j].tt_gmtoff;
-					break;
-				}
-			}
-			/*
-			** Initially we're assumed to be in standard time.
-			*/
-			isdst = false;
-			theiroffset = theirstdoffset;
-			/*
-			** Now juggle transition times and types
-			** tracking offsets as you do.
-			*/
-			for (i = 0; i < sp->timecnt; ++i) {
-				j = sp->types[i];
-				sp->types[i] = sp->ttis[j].tt_isdst;
-				if (sp->ttis[j].tt_ttisgmt) {
-					/* No adjustment to transition time */
-				} else {
-					/*
-					** If summer time is in effect, and the
-					** transition time was not specified as
-					** standard time, add the summer time
-					** offset to the transition time;
-					** otherwise, add the standard time
-					** offset to the transition time.
-					*/
-					/*
-					** Transitions from DST to DDST
-					** will effectively disappear since
-					** POSIX provides for only one DST
-					** offset.
-					*/
-					if (isdst && !sp->ttis[j].tt_ttisstd) {
-						sp->ats[i] += (time_t)
-						    (dstoffset - theirdstoffset);
-					} else {
-						sp->ats[i] += (time_t)
-						    (stdoffset - theirstdoffset);
-					}
-				}
-				theiroffset = -sp->ttis[j].tt_gmtoff;
-				if (sp->ttis[j].tt_isdst)
-					theirstdoffset = theiroffset;
-				else	theirdstoffset = theiroffset;
-			}
-			/*
-			** Finally, fill in ttis.
-			*/
-			init_ttinfo(&sp->ttis[0], -stdoffset, false, 0);
-			init_ttinfo(&sp->ttis[1], -dstoffset, true,
-			    (int)(stdlen + 1));
-			sp->typecnt = 2;
-			sp->defaulttype = 0;
-		}
-	} else {
-		dstlen = 0;
-		sp->typecnt = 1;		/* only standard time */
-		sp->timecnt = 0;
-		init_ttinfo(&sp->ttis[0], -stdoffset, false, 0);
-		init_ttinfo(&sp->ttis[1], 0, false, 0);
-		sp->defaulttype = 0;
-	}
-	sp->charcnt = charcnt;
-	cp = sp->chars;
-	(void) memcpy(cp, stdname, stdlen);
-	cp += stdlen;
-	*cp++ = '\0';
-	if (dstlen != 0) {
-		(void) memcpy(cp, dstname, dstlen);
-		*(cp + dstlen) = '\0';
-	}
-	return true;
-}
-
-static void
-gmtload(struct state *const sp)
-{
-	if (tzload(gmt, sp, true) != 0)
-		(void) tzparse(gmt, sp, true);
-}
-
-static int
-zoneinit(struct state *sp, char const *name)
-{
-	if (name && ! name[0]) {
-		/*
-		** User wants it fast rather than right.
-		*/
-		sp->leapcnt = 0;		/* so, we're off a little */
-		sp->timecnt = 0;
-		sp->typecnt = 0;
-		sp->charcnt = 0;
-		sp->goback = sp->goahead = false;
-		init_ttinfo(&sp->ttis[0], 0, false, 0);
-		strcpy(sp->chars, gmt);
-		sp->defaulttype = 0;
-		return 0;
-	} else {
-		int err = tzload(name, sp, true);
-		if (err != 0 && name && name[0] != ':' &&
-		    tzparse(name, sp, false))
-			err = 0;
-		if (err == 0)
-			scrub_abbrs(sp);
-		return err;
-	}
-}
- 
-static void
-tzsetlcl(char const *name)
-{
-	struct state *sp = lclptr;
-	int lcl = name ? strlen(name) < sizeof lcl_TZname : -1;
-	if (lcl < 0 ? lcl_is_set < 0
-	    : 0 < lcl_is_set && strcmp(lcl_TZname, name) == 0)
-		return;
-
-	if (! sp)
-		lclptr = sp = malloc(sizeof *lclptr);
-	if (sp) {
-		if (zoneinit(sp, name) != 0)
-			zoneinit(sp, "");
-		if (0 < lcl)
-			strcpy(lcl_TZname, name);
-	}
-	settzname();
-	lcl_is_set = lcl;
-}
-
-#ifdef STD_INSPIRED
-void
-tzsetwall(void)
-{
-	rwlock_wrlock(&lcl_lock);
-	tzsetlcl(NULL);
-	rwlock_unlock(&lcl_lock);
-}
-#endif
-
-static void
-tzset_unlocked(void)
-{
-	tzsetlcl(getenv("TZ"));
-}
-
-void
-tzset(void)
-{
-	rwlock_wrlock(&lcl_lock);
-	tzset_unlocked();
-	rwlock_unlock(&lcl_lock);
-}
-
-static void
-gmtcheck(void)
-{
-	static bool gmt_is_set;
-	rwlock_wrlock(&lcl_lock);
-	if (! gmt_is_set) {
-		gmtptr = malloc(sizeof *gmtptr);
-		if (gmtptr)
-			gmtload(gmtptr);
-		gmt_is_set = true;
-	}
-	rwlock_unlock(&lcl_lock);
-}
-
-#if NETBSD_INSPIRED
-
-timezone_t
-tzalloc(const char *name)
-{
-	timezone_t sp = malloc(sizeof *sp);
-	if (sp) {
-		int err = zoneinit(sp, name);
-		if (err != 0) {
-			free(sp);
-			errno = err;
-			return NULL;
-		}
-	}
-	return sp;
-}
-
-void
-tzfree(timezone_t sp)
-{
-	free(sp);
-}
-
-/*
-** NetBSD 6.1.4 has ctime_rz, but omit it because POSIX says ctime and
-** ctime_r are obsolescent and have potential security problems that
-** ctime_rz would share.  Callers can instead use localtime_rz + strftime.
-**
-** NetBSD 6.1.4 has tzgetname, but omit it because it doesn't work
-** in zones with three or more time zone abbreviations.
-** Callers can instead use localtime_rz + strftime.
-*/
-
-#endif
-
-/*
-** The easy way to behave "as if no library function calls" localtime
-** is to not call it, so we drop its guts into "localsub", which can be
-** freely called. (And no, the PANS doesn't require the above behavior,
-** but it *is* desirable.)
-**
-** If successful and SETNAME is nonzero,
-** set the applicable parts of tzname, timezone and altzone;
-** however, it's OK to omit this step if the time zone is POSIX-compatible,
-** since in that case tzset should have already done this step correctly.
-** SETNAME's type is intfast32_t for compatibility with gmtsub,
-** but it is actually a boolean and its value should be 0 or 1.
-*/
-
-/*ARGSUSED*/
-static struct tm *
-localsub(struct state const *sp, time_t const *timep, int_fast32_t setname,
-	 struct tm *const tmp)
-{
-	const struct ttinfo *	ttisp;
-	int			i;
-	struct tm *		result;
-	const time_t			t = *timep;
-
-	if (sp == NULL) {
-		/* Don't bother to set tzname etc.; tzset has already done it.  */
-		return gmtsub(gmtptr, timep, 0, tmp);
-	}
-	if ((sp->goback && t < sp->ats[0]) ||
-		(sp->goahead && t > sp->ats[sp->timecnt - 1])) {
-			time_t			newt = t;
-			time_t		seconds;
-			time_t		years;
-
-			if (t < sp->ats[0])
-				seconds = sp->ats[0] - t;
-			else	seconds = t - sp->ats[sp->timecnt - 1];
-			--seconds;
-			years = (time_t)((seconds / SECSPERREPEAT + 1) * YEARSPERREPEAT);
-			seconds = (time_t)(years * AVGSECSPERYEAR);
-			if (t < sp->ats[0])
-				newt += seconds;
-			else	newt -= seconds;
-			if (newt < sp->ats[0] ||
-				newt > sp->ats[sp->timecnt - 1]) {
-				errno = EINVAL;
-				return NULL;	/* "cannot happen" */
-			}
-			result = localsub(sp, &newt, setname, tmp);
-			if (result) {
-				int_fast64_t newy;
-
-				newy = result->tm_year;
-				if (t < sp->ats[0])
-					newy -= years;
-				else	newy += years;
-				if (! (INT_MIN <= newy && newy <= INT_MAX)) {
-					errno = EOVERFLOW;
-					return NULL;
-				}
-				result->tm_year = (int)newy;
-			}
-			return result;
-	}
-	if (sp->timecnt == 0 || t < sp->ats[0]) {
-		i = sp->defaulttype;
-	} else {
-		int	lo = 1;
-		int	hi = sp->timecnt;
-
-		while (lo < hi) {
-			int	mid = (lo + hi) / 2;
-
-			if (t < sp->ats[mid])
-				hi = mid;
-			else	lo = mid + 1;
-		}
-		i = (int) sp->types[lo - 1];
-	}
-	ttisp = &sp->ttis[i];
-	/*
-	** To get (wrong) behavior that's compatible with System V Release 2.0
-	** you'd replace the statement below with
-	**	t += ttisp->tt_gmtoff;
-	**	timesub(&t, 0L, sp, tmp);
-	*/
-	result = timesub(&t, ttisp->tt_gmtoff, sp, tmp);
-	if (result) {
-		result->tm_isdst = ttisp->tt_isdst;
-#ifdef TM_ZONE
-		result->TM_ZONE = __UNCONST(&sp->chars[ttisp->tt_abbrind]);
-#endif /* defined TM_ZONE */
-		if (setname)
-			update_tzname_etc(sp, ttisp);
-	}
-	return result;
-}
-
-#if NETBSD_INSPIRED
-
-struct tm *
-localtime_rz(timezone_t sp, time_t const *timep, struct tm *tmp)
-{
-	return localsub(sp, timep, 0, tmp);
-}
-
-#endif
-
-static struct tm *
-localtime_tzset(time_t const *timep, struct tm *tmp, bool setname)
-{
-	rwlock_wrlock(&lcl_lock);
-	if (setname || !lcl_is_set)
-		tzset_unlocked();
-	tmp = localsub(lclptr, timep, setname, tmp);
-	rwlock_unlock(&lcl_lock);
-	return tmp;
-}
-
-struct tm *
-localtime(const time_t *timep)
-{
-	return localtime_tzset(timep, &tm, true);
-}
-
-struct tm *
-localtime_r(const time_t * __restrict timep, struct tm *tmp)
-{
-	return localtime_tzset(timep, tmp, false);
-}
-
-/*
-** gmtsub is to gmtime as localsub is to localtime.
-*/
-
-static struct tm *
-gmtsub(struct state const *sp, const time_t *timep, int_fast32_t offset,
-       struct tm *tmp)
-{
-	struct tm *	result;
-
-	result = timesub(timep, offset, gmtptr, tmp);
-#ifdef TM_ZONE
-	/*
-	** Could get fancy here and deliver something such as
-	** "UT+xxxx" or "UT-xxxx" if offset is non-zero,
-	** but this is no time for a treasure hunt.
-	*/
-	if (result)
-		result->TM_ZONE = offset ? __UNCONST(wildabbr) : gmtptr ?
-		    gmtptr->chars : __UNCONST(gmt);
-#endif /* defined TM_ZONE */
-	return result;
-}
-
-
-/*
-** Re-entrant version of gmtime.
-*/
-
-struct tm *
-gmtime_r(const time_t *timep, struct tm *tmp)
-{
-	gmtcheck();
-	return gmtsub(NULL, timep, 0, tmp);
-}
-
-struct tm *
-gmtime(const time_t *timep)
-{
-	return gmtime_r(timep, &tm);
-}
-#ifdef STD_INSPIRED
-
-struct tm *
-offtime(const time_t *timep, long offset)
-{
-	gmtcheck();
-	return gmtsub(gmtptr, timep, (int_fast32_t)offset, &tm);
-}
-
-struct tm *
-offtime_r(const time_t *timep, long offset, struct tm *tmp)
-{
-	gmtcheck();
-	return gmtsub(NULL, timep, (int_fast32_t)offset, tmp);
-}
-
-#endif /* defined STD_INSPIRED */
-
-/*
-** Return the number of leap years through the end of the given year
-** where, to make the math easy, the answer for year zero is defined as zero.
-*/
-
-static int ATTRIBUTE_PURE
-leaps_thru_end_of(const int y)
-{
-	return (y >= 0) ? (y / 4 - y / 100 + y / 400) :
-		-(leaps_thru_end_of(-(y + 1)) + 1);
-}
-
-static struct tm *
-timesub(const time_t *timep, int_fast32_t offset,
-    const struct state *sp, struct tm *tmp)
-{
-	const struct lsinfo *	lp;
-	time_t			tdays;
-	int			idays;	/* unsigned would be so 2003 */
-	int_fast64_t		rem;
-	int			y;
-	const int *		ip;
-	int_fast64_t		corr;
-	bool			hit;
-	int			i;
-
-	corr = 0;
-	hit = false;
-	i = (sp == NULL) ? 0 : sp->leapcnt;
-	while (--i >= 0) {
-		lp = &sp->lsis[i];
-		if (*timep >= lp->ls_trans) {
-			if (*timep == lp->ls_trans) {
-				hit = ((i == 0 && lp->ls_corr > 0) ||
-					lp->ls_corr > sp->lsis[i - 1].ls_corr);
-				if (hit)
-					while (i > 0 &&
-						sp->lsis[i].ls_trans ==
-						sp->lsis[i - 1].ls_trans + 1 &&
-						sp->lsis[i].ls_corr ==
-						sp->lsis[i - 1].ls_corr + 1) {
-							++hit;
-							--i;
-					}
-			}
-			corr = lp->ls_corr;
-			break;
-		}
-	}
-	y = EPOCH_YEAR;
-	tdays = (time_t)(*timep / SECSPERDAY);
-	rem = *timep % SECSPERDAY;
-	while (tdays < 0 || tdays >= year_lengths[isleap(y)]) {
-		int		newy;
-		time_t	tdelta;
-		int	idelta;
-		int	leapdays;
-
-		tdelta = tdays / DAYSPERLYEAR;
-		if (! ((! TYPE_SIGNED(time_t) || INT_MIN <= tdelta)
-		       && tdelta <= INT_MAX))
-			goto out_of_range;
-		_DIAGASSERT(__type_fit(int, tdelta));
-		idelta = (int)tdelta;
-		if (idelta == 0)
-			idelta = (tdays < 0) ? -1 : 1;
-		newy = y;
-		if (increment_overflow(&newy, idelta))
-			goto out_of_range;
-		leapdays = leaps_thru_end_of(newy - 1) -
-			leaps_thru_end_of(y - 1);
-		tdays -= ((time_t) newy - y) * DAYSPERNYEAR;
-		tdays -= leapdays;
-		y = newy;
-	}
-	/*
-	** Given the range, we can now fearlessly cast...
-	*/
-	idays = (int) tdays;
-	rem += offset - corr;
-	while (rem < 0) {
-		rem += SECSPERDAY;
-		--idays;
-	}
-	while (rem >= SECSPERDAY) {
-		rem -= SECSPERDAY;
-		++idays;
-	}
-	while (idays < 0) {
-		if (increment_overflow(&y, -1))
-			goto out_of_range;
-		idays += year_lengths[isleap(y)];
-	}
-	while (idays >= year_lengths[isleap(y)]) {
-		idays -= year_lengths[isleap(y)];
-		if (increment_overflow(&y, 1))
-			goto out_of_range;
-	}
-	tmp->tm_year = y;
-	if (increment_overflow(&tmp->tm_year, -TM_YEAR_BASE))
-		goto out_of_range;
-	tmp->tm_yday = idays;
-	/*
-	** The "extra" mods below avoid overflow problems.
-	*/
-	tmp->tm_wday = EPOCH_WDAY +
-		((y - EPOCH_YEAR) % DAYSPERWEEK) *
-		(DAYSPERNYEAR % DAYSPERWEEK) +
-		leaps_thru_end_of(y - 1) -
-		leaps_thru_end_of(EPOCH_YEAR - 1) +
-		idays;
-	tmp->tm_wday %= DAYSPERWEEK;
-	if (tmp->tm_wday < 0)
-		tmp->tm_wday += DAYSPERWEEK;
-	tmp->tm_hour = (int) (rem / SECSPERHOUR);
-	rem %= SECSPERHOUR;
-	tmp->tm_min = (int) (rem / SECSPERMIN);
-	/*
-	** A positive leap second requires a special
-	** representation. This uses "... ??:59:60" et seq.
-	*/
-	tmp->tm_sec = (int) (rem % SECSPERMIN) + hit;
-	ip = mon_lengths[isleap(y)];
-	for (tmp->tm_mon = 0; idays >= ip[tmp->tm_mon]; ++(tmp->tm_mon))
-		idays -= ip[tmp->tm_mon];
-	tmp->tm_mday = (int) (idays + 1);
-	tmp->tm_isdst = 0;
-#ifdef TM_GMTOFF
-	tmp->TM_GMTOFF = offset;
-#endif /* defined TM_GMTOFF */
-	return tmp;
-out_of_range:
-	errno = EOVERFLOW;
-	return NULL;
-}
-
-#if !defined(__minix) || !defined(_LIBMINC)
-char *
-ctime(const time_t *timep)
-{
-/*
-** Section 4.12.3.2 of X3.159-1989 requires that
-**	The ctime function converts the calendar time pointed to by timer
-**	to local time in the form of a string. It is equivalent to
-**		asctime(localtime(timer))
-*/
-	struct tm *tmp = localtime(timep);
-	return tmp ? asctime(tmp) : NULL;
-}
-
-char *
-ctime_r(const time_t *timep, char *buf)
-{
-	struct tm mytm;
-	struct tm *tmp = localtime_r(timep, &mytm);
-	return tmp ? asctime_r(tmp, buf) : NULL;
-}
-
-char *
-ctime_rz(const timezone_t sp, const time_t * timep, char *buf)
-{
-	struct tm	mytm, *rtm;
-
-	rtm = localtime_rz(sp, timep, &mytm);
-	if (rtm == NULL)
-		return NULL;
-	return asctime_r(rtm, buf);
-}
-#endif /* !defined(__minix) || !defined(_LIBMINC) */
-
-/*
-** Adapted from code provided by Robert Elz, who writes:
-**	The "best" way to do mktime I think is based on an idea of Bob
-**	Kridle's (so its said...) from a long time ago.
-**	It does a binary search of the time_t space. Since time_t's are
-**	just 32 bits, its a max of 32 iterations (even at 64 bits it
-**	would still be very reasonable).
-*/
-
-#ifndef WRONG
-#define WRONG	((time_t)-1)
-#endif /* !defined WRONG */
-
-/*
-** Normalize logic courtesy Paul Eggert.
-*/
-
-static bool
-increment_overflow(int *ip, int j)
-{
-	int const	i = *ip;
-
-	/*
-	** If i >= 0 there can only be overflow if i + j > INT_MAX
-	** or if j > INT_MAX - i; given i >= 0, INT_MAX - i cannot overflow.
-	** If i < 0 there can only be overflow if i + j < INT_MIN
-	** or if j < INT_MIN - i; given i < 0, INT_MIN - i cannot overflow.
-	*/
-	if ((i >= 0) ? (j > INT_MAX - i) : (j < INT_MIN - i))
-		return true;
-	*ip += j;
-	return false;
-}
-
-static bool
-increment_overflow32(int_fast32_t *const lp, int const m)
-{
-	int_fast32_t const l = *lp;
-
-	if ((l >= 0) ? (m > INT_FAST32_MAX - l) : (m < INT_FAST32_MIN - l))
-		return true;
-	*lp += m;
-	return false;
-}
-
-static bool
-increment_overflow_time(time_t *tp, int_fast32_t j)
-{
-	/*
-	** This is like
-	** 'if (! (time_t_min <= *tp + j && *tp + j <= time_t_max)) ...',
-	** except that it does the right thing even if *tp + j would overflow.
-	*/
-	if (! (j < 0
-	       ? (TYPE_SIGNED(time_t) ? time_t_min - j <= *tp : -1 - j < *tp)
-	       : *tp <= time_t_max - j))
-		return true;
-	*tp += j;
-	return false;
-}
-
-static bool
-normalize_overflow(int *const tensptr, int *const unitsptr, const int base)
-{
-	int	tensdelta;
-
-	tensdelta = (*unitsptr >= 0) ?
-		(*unitsptr / base) :
-		(-1 - (-1 - *unitsptr) / base);
-	*unitsptr -= tensdelta * base;
-	return increment_overflow(tensptr, tensdelta);
-}
-
-static bool
-normalize_overflow32(int_fast32_t *tensptr, int *unitsptr, int base)
-{
-	int	tensdelta;
-
-	tensdelta = (*unitsptr >= 0) ?
-		(*unitsptr / base) :
-		(-1 - (-1 - *unitsptr) / base);
-	*unitsptr -= tensdelta * base;
-	return increment_overflow32(tensptr, tensdelta);
-}
-
-static int
-tmcomp(const struct tm *const atmp,
-       const struct tm *const btmp)
-{
-	int	result;
-
-	if (atmp->tm_year != btmp->tm_year)
-		return atmp->tm_year < btmp->tm_year ? -1 : 1;
-	if ((result = (atmp->tm_mon - btmp->tm_mon)) == 0 &&
-		(result = (atmp->tm_mday - btmp->tm_mday)) == 0 &&
-		(result = (atmp->tm_hour - btmp->tm_hour)) == 0 &&
-		(result = (atmp->tm_min - btmp->tm_min)) == 0)
-			result = atmp->tm_sec - btmp->tm_sec;
-	return result;
-}
-
-static time_t
-time2sub(struct tm *const tmp,
-	 struct tm *(*funcp)(struct state const *, time_t const *,
-			     int_fast32_t, struct tm *),
-	 struct state const *sp,
- 	 const int_fast32_t offset,
-	 bool *okayp,
-	 bool do_norm_secs)
-{
-	int			dir;
-	int			i, j;
-	int			saved_seconds;
-	int_fast32_t		li;
-	time_t			lo;
-	time_t			hi;
-#ifdef NO_ERROR_IN_DST_GAP
-	time_t			ilo;
-#endif
-	int_fast32_t		y;
-	time_t			newt;
-	time_t			t;
-	struct tm		yourtm, mytm;
-
-	*okayp = false;
-	yourtm = *tmp;
-#ifdef NO_ERROR_IN_DST_GAP
-again:
-#endif
-	if (do_norm_secs) {
-		if (normalize_overflow(&yourtm.tm_min, &yourtm.tm_sec,
-		    SECSPERMIN))
-			goto out_of_range;
-	}
-	if (normalize_overflow(&yourtm.tm_hour, &yourtm.tm_min, MINSPERHOUR))
-		goto out_of_range;
-	if (normalize_overflow(&yourtm.tm_mday, &yourtm.tm_hour, HOURSPERDAY))
-		goto out_of_range;
-	y = yourtm.tm_year;
-	if (normalize_overflow32(&y, &yourtm.tm_mon, MONSPERYEAR))
-		goto out_of_range;
-	/*
-	** Turn y into an actual year number for now.
-	** It is converted back to an offset from TM_YEAR_BASE later.
-	*/
-	if (increment_overflow32(&y, TM_YEAR_BASE))
-		goto out_of_range;
-	while (yourtm.tm_mday <= 0) {
-		if (increment_overflow32(&y, -1))
-			goto out_of_range;
-		li = y + (1 < yourtm.tm_mon);
-		yourtm.tm_mday += year_lengths[isleap(li)];
-	}
-	while (yourtm.tm_mday > DAYSPERLYEAR) {
-		li = y + (1 < yourtm.tm_mon);
-		yourtm.tm_mday -= year_lengths[isleap(li)];
-		if (increment_overflow32(&y, 1))
-			goto out_of_range;
-	}
-	for ( ; ; ) {
-		i = mon_lengths[isleap(y)][yourtm.tm_mon];
-		if (yourtm.tm_mday <= i)
-			break;
-		yourtm.tm_mday -= i;
-		if (++yourtm.tm_mon >= MONSPERYEAR) {
-			yourtm.tm_mon = 0;
-			if (increment_overflow32(&y, 1))
-				goto out_of_range;
-		}
-	}
-	if (increment_overflow32(&y, -TM_YEAR_BASE))
-		goto out_of_range;
-	if (! (INT_MIN <= y && y <= INT_MAX))
-		goto out_of_range;
-	yourtm.tm_year = (int)y;
-	if (yourtm.tm_sec >= 0 && yourtm.tm_sec < SECSPERMIN)
-		saved_seconds = 0;
-	else if (y + TM_YEAR_BASE < EPOCH_YEAR) {
-		/*
-		** We can't set tm_sec to 0, because that might push the
-		** time below the minimum representable time.
-		** Set tm_sec to 59 instead.
-		** This assumes that the minimum representable time is
-		** not in the same minute that a leap second was deleted from,
-		** which is a safer assumption than using 58 would be.
-		*/
-		if (increment_overflow(&yourtm.tm_sec, 1 - SECSPERMIN))
-			goto out_of_range;
-		saved_seconds = yourtm.tm_sec;
-		yourtm.tm_sec = SECSPERMIN - 1;
-	} else {
-		saved_seconds = yourtm.tm_sec;
-		yourtm.tm_sec = 0;
-	}
-	/*
-	** Do a binary search (this works whatever time_t's type is).
-	*/
-	lo = time_t_min;
-	hi = time_t_max;
-#ifdef NO_ERROR_IN_DST_GAP
-	ilo = lo;
-#endif
-	for ( ; ; ) {
-		t = lo / 2 + hi / 2;
-		if (t < lo)
-			t = lo;
-		else if (t > hi)
-			t = hi;
-		if (! funcp(sp, &t, offset, &mytm)) {
-			/*
-			** Assume that t is too extreme to be represented in
-			** a struct tm; arrange things so that it is less
-			** extreme on the next pass.
-			*/
-			dir = (t > 0) ? 1 : -1;
-		} else	dir = tmcomp(&mytm, &yourtm);
-		if (dir != 0) {
-			if (t == lo) {
-				if (t == time_t_max)
-					goto out_of_range;
-				++t;
-				++lo;
-			} else if (t == hi) {
-				if (t == time_t_min)
-					goto out_of_range;
-				--t;
-				--hi;
-			}
-#ifdef NO_ERROR_IN_DST_GAP
-			if (ilo != lo && lo - 1 == hi && yourtm.tm_isdst < 0 &&
-			    do_norm_secs) {
-				for (i = sp->typecnt - 1; i >= 0; --i) {
-					for (j = sp->typecnt - 1; j >= 0; --j) {
-						time_t off;
-						if (sp->ttis[j].tt_isdst ==
-						    sp->ttis[i].tt_isdst)
-							continue;
-						off = sp->ttis[j].tt_gmtoff -
-						    sp->ttis[i].tt_gmtoff;
-						yourtm.tm_sec += off < 0 ?
-						    -off : off;
-						goto again;
-					}
-				}
-			}
-#endif
-			if (lo > hi)
-				goto invalid;
-			if (dir > 0)
-				hi = t;
-			else	lo = t;
-			continue;
-		}
-#if defined TM_GMTOFF && ! UNINIT_TRAP
-		if (mytm.TM_GMTOFF != yourtm.TM_GMTOFF
-		    && (yourtm.TM_GMTOFF < 0
-			? (-SECSPERDAY <= yourtm.TM_GMTOFF
-			   && (mytm.TM_GMTOFF <=
-			       (/*CONSTCOND*/SMALLEST (INT_FAST32_MAX, LONG_MAX)
-				+ yourtm.TM_GMTOFF)))
-			: (yourtm.TM_GMTOFF <= SECSPERDAY
-			   && ((/*CONSTCOND*/BIGGEST (INT_FAST32_MIN, LONG_MIN)
-				+ yourtm.TM_GMTOFF)
-			       <= mytm.TM_GMTOFF)))) {
-		  /* MYTM matches YOURTM except with the wrong UTC offset.
-		     YOURTM.TM_GMTOFF is plausible, so try it instead.
-		     It's OK if YOURTM.TM_GMTOFF contains uninitialized data,
-		     since the guess gets checked.  */
-		  time_t altt = t;
-		  int_fast32_t diff = (int_fast32_t)
-		      (mytm.TM_GMTOFF - yourtm.TM_GMTOFF);
-		  if (!increment_overflow_time(&altt, diff)) {
-		    struct tm alttm;
-		    if (! funcp(sp, &altt, offset, &alttm)
-			&& alttm.tm_isdst == mytm.tm_isdst
-			&& alttm.TM_GMTOFF == yourtm.TM_GMTOFF
-			&& tmcomp(&alttm, &yourtm)) {
-		      t = altt;
-		      mytm = alttm;
-		    }
-		  }
-		}
-#endif
-		if (yourtm.tm_isdst < 0 || mytm.tm_isdst == yourtm.tm_isdst)
-			break;
-		/*
-		** Right time, wrong type.
-		** Hunt for right time, right type.
-		** It's okay to guess wrong since the guess
-		** gets checked.
-		*/
-		if (sp == NULL)
-			goto invalid;
-		for (i = sp->typecnt - 1; i >= 0; --i) {
-			if (sp->ttis[i].tt_isdst != yourtm.tm_isdst)
-				continue;
-			for (j = sp->typecnt - 1; j >= 0; --j) {
-				if (sp->ttis[j].tt_isdst == yourtm.tm_isdst)
-					continue;
-				newt = (time_t)(t + sp->ttis[j].tt_gmtoff -
-				    sp->ttis[i].tt_gmtoff);
-				if (! funcp(sp, &newt, offset, &mytm))
-					continue;
-				if (tmcomp(&mytm, &yourtm) != 0)
-					continue;
-				if (mytm.tm_isdst != yourtm.tm_isdst)
-					continue;
-				/*
-				** We have a match.
-				*/
-				t = newt;
-				goto label;
-			}
-		}
-		goto invalid;
-	}
-label:
-	newt = t + saved_seconds;
-	if ((newt < t) != (saved_seconds < 0))
-		goto out_of_range;
-	t = newt;
-	if (funcp(sp, &t, offset, tmp)) {
-		*okayp = true;
-		return t;
-	}
-out_of_range:
-	errno = EOVERFLOW;
-	return WRONG;
-invalid:
-	errno = EINVAL;
-	return WRONG;
-}
-
-static time_t
-time2(struct tm * const	tmp,
-      struct tm *(*funcp)(struct state const *, time_t const *,
-			  int_fast32_t, struct tm *),
-      struct state const *sp,
-      const int_fast32_t offset,
-      bool *okayp)
-{
-	time_t	t;
-
-	/*
-	** First try without normalization of seconds
-	** (in case tm_sec contains a value associated with a leap second).
-	** If that fails, try with normalization of seconds.
-	*/
-	t = time2sub(tmp, funcp, sp, offset, okayp, false);
-	return *okayp ? t : time2sub(tmp, funcp, sp, offset, okayp, true);
-}
-
-static time_t
-time1(struct tm *const tmp,
-      struct tm *(*funcp) (struct state const *, time_t const *,
-			   int_fast32_t, struct tm *),
-      struct state const *sp,
-      const int_fast32_t offset)
-{
-	time_t			t;
-	int			samei, otheri;
-	int			sameind, otherind;
-	int			i;
-	int			nseen;
-	int			save_errno;
-	char				seen[TZ_MAX_TYPES];
-	unsigned char			types[TZ_MAX_TYPES];
-	bool				okay;
-
-	if (tmp == NULL) {
-		errno = EINVAL;
-		return WRONG;
-	}
-	if (tmp->tm_isdst > 1)
-		tmp->tm_isdst = 1;
-	save_errno = errno;
-	t = time2(tmp, funcp, sp, offset, &okay);
-	if (okay) {
-		errno = save_errno;
-		return t;
-	}
-	if (tmp->tm_isdst < 0)
-#ifdef PCTS
-		/*
-		** POSIX Conformance Test Suite code courtesy Grant Sullivan.
-		*/
-		tmp->tm_isdst = 0;	/* reset to std and try again */
-#else
-		return t;
-#endif /* !defined PCTS */
-	/*
-	** We're supposed to assume that somebody took a time of one type
-	** and did some math on it that yielded a "struct tm" that's bad.
-	** We try to divine the type they started from and adjust to the
-	** type they need.
-	*/
-	if (sp == NULL) {
-		errno = EINVAL;
-		return WRONG;
-	}
-	for (i = 0; i < sp->typecnt; ++i)
-		seen[i] = false;
-	nseen = 0;
-	for (i = sp->timecnt - 1; i >= 0; --i)
-		if (!seen[sp->types[i]]) {
-			seen[sp->types[i]] = true;
-			types[nseen++] = sp->types[i];
-		}
-	for (sameind = 0; sameind < nseen; ++sameind) {
-		samei = types[sameind];
-		if (sp->ttis[samei].tt_isdst != tmp->tm_isdst)
-			continue;
-		for (otherind = 0; otherind < nseen; ++otherind) {
-			otheri = types[otherind];
-			if (sp->ttis[otheri].tt_isdst == tmp->tm_isdst)
-				continue;
-			tmp->tm_sec += (int)(sp->ttis[otheri].tt_gmtoff -
-					sp->ttis[samei].tt_gmtoff);
-			tmp->tm_isdst = !tmp->tm_isdst;
-			t = time2(tmp, funcp, sp, offset, &okay);
-			if (okay) {
-				errno = save_errno;
-				return t;
-			}
-			tmp->tm_sec -= (int)(sp->ttis[otheri].tt_gmtoff -
-					sp->ttis[samei].tt_gmtoff);
-			tmp->tm_isdst = !tmp->tm_isdst;
-		}
-	}
-	errno = EOVERFLOW;
-	return WRONG;
-}
-
-static time_t
-mktime_tzname(timezone_t sp, struct tm *tmp, bool setname)
-{
-	if (sp)
-		return time1(tmp, localsub, sp, setname);
-	else {
-		gmtcheck();
-		return time1(tmp, gmtsub, gmtptr, 0);
-	}
-}
-
-#if NETBSD_INSPIRED
-
-time_t
-mktime_z(timezone_t sp, struct tm *const tmp)
-{
-	return mktime_tzname(sp, tmp, false);
-}
-
-#endif
-
-time_t
-mktime(struct tm *tmp)
-{
-	time_t t;
-
-	rwlock_wrlock(&lcl_lock);
-	tzset_unlocked();
-	t = mktime_tzname(lclptr, tmp, true);
-	rwlock_unlock(&lcl_lock);
-	return t;
-}
-
-#ifdef STD_INSPIRED
-
-time_t
-timelocal_z(const timezone_t sp, struct tm *const tmp)
-{
-	if (tmp != NULL)
-		tmp->tm_isdst = -1;	/* in case it wasn't initialized */
-	return mktime_z(sp, tmp);
-}
-
-time_t
-timelocal(struct tm *tmp)
-{
-	if (tmp != NULL)
-		tmp->tm_isdst = -1;	/* in case it wasn't initialized */
-	return mktime(tmp);
-}
-
-time_t
-timegm(struct tm *tmp)
-{
-
-	return timeoff(tmp, 0);
-}
-
-time_t
-timeoff(struct tm *tmp, long offset)
-{
-	if (tmp)
-		tmp->tm_isdst = 0;
-	gmtcheck();
-	return time1(tmp, gmtsub, gmtptr, (int_fast32_t)offset);
-}
-
-#endif /* defined STD_INSPIRED */
-
-/*
-** XXX--is the below the right way to conditionalize??
-*/
-
-#ifdef STD_INSPIRED
-
-/*
-** IEEE Std 1003.1-1988 (POSIX) legislates that 536457599
-** shall correspond to "Wed Dec 31 23:59:59 UTC 1986", which
-** is not the case if we are accounting for leap seconds.
-** So, we provide the following conversion routines for use
-** when exchanging timestamps with POSIX conforming systems.
-*/
-
-static int_fast64_t
-leapcorr(const timezone_t sp, time_t t)
-{
-	struct lsinfo const * lp;
-	int		i;
-
-	i = sp->leapcnt;
-	while (--i >= 0) {
-		lp = &sp->lsis[i];
-		if (t >= lp->ls_trans)
-			return lp->ls_corr;
-	}
-	return 0;
-}
-
-NETBSD_INSPIRED_EXTERN time_t ATTRIBUTE_PURE
-time2posix_z(timezone_t sp, time_t t)
-{
-	return (time_t)(t - leapcorr(sp, t));
-}
-
-time_t
-time2posix(time_t t)
-{
-	rwlock_wrlock(&lcl_lock);
-	if (!lcl_is_set)
-		tzset_unlocked();
-	if (lclptr)
-		t = (time_t)(t - leapcorr(lclptr, t));
-	rwlock_unlock(&lcl_lock);
-	return t;
-}
-
-NETBSD_INSPIRED_EXTERN time_t ATTRIBUTE_PURE
-posix2time_z(timezone_t sp, time_t t)
-{
-	time_t	x;
-	time_t	y;
-
-	/*
-	** For a positive leap second hit, the result
-	** is not unique. For a negative leap second
-	** hit, the corresponding time doesn't exist,
-	** so we return an adjacent second.
-	*/
-	x = (time_t)(t + leapcorr(sp, t));
-	y = (time_t)(x - leapcorr(sp, x));
-	if (y < t) {
-		do {
-			x++;
-			y = (time_t)(x - leapcorr(sp, x));
-		} while (y < t);
-		x -= y != t;
-	} else if (y > t) {
-		do {
-			--x;
-			y = (time_t)(x - leapcorr(sp, x));
-		} while (y > t);
-		x += y != t;
-	}
-	return x;
-}
-
-time_t
-posix2time(time_t t)
-{
-	rwlock_wrlock(&lcl_lock);
-	if (!lcl_is_set)
-		tzset_unlocked();
-	if (lclptr)
-		t = posix2time_z(lclptr, t);
-	rwlock_unlock(&lcl_lock);
-	return t;
-}
-
-#endif /* defined STD_INSPIRED */
diff --git a/lib/libc/time/offtime.3 b/lib/libc/time/offtime.3
deleted file mode 100644
index ecfc7648c..000000000
--- a/lib/libc/time/offtime.3
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"	$NetBSD: offtime.3,v 1.3 2011/04/14 05:50:50 jruoho Exp $
-.\" Written by Klaus Klein, May 10, 2004.
-.\" Public domain.
-.Dd April 14, 2011
-.Dt OFFTIME 3
-.Os
-.Sh NAME
-.Nm offtime ,
-.Nm timeoff ,
-.Nm timegm ,
-.Nm timelocal
-.Nd convert date and time
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft struct tm *
-.Fn offtime "const time_t * clock" "long int offset"
-.Ft struct tm *
-.Fn offtime_r "const time_t * clock" "long int offset" "struct tm *ret"
-.Ft time_t
-.Fn timeoff "struct tm * tm" "long int offset"
-.Ft time_t
-.Fn timegm "struct tm * tm"
-.Ft time_t
-.Fn timelocal "struct tm * tm"
-.Sh DESCRIPTION
-These functions are inspired by C standard interfaces named similarly.
-.Pp
-.Fn offtime
-converts the calendar time
-.Fa clock ,
-offset by
-.Fa offset
-seconds,
-into broken-down time, expressed as Coordinated Universal Time (UTC).
-.Pp
-.Fn offtime_r
-is similar to
-.Fn offtime
-but it places the returned
-.Ft "struct tm *"
-in the user supplied
-.Fa ret
-argument.
-.Pp
-.Fn timeoff
-converts the broken-down time
-.Fa tm ,
-expressed as UTC,
-offset by
-.Fa offset
-seconds,
-into a calendar time value.
-.Pp
-.Fn timegm
-converts the broken-down time
-.Fa tm
-into a calendar time value, effectively being the inverse of
-.Xr gmtime 3 .
-It is equivalent to the C standard function
-.Xr mktime 3
-operating in UTC.
-.Pp
-.Fn timelocal
-converts the broken down time
-.Fa tm ,
-expressed as local time, into a calendar time value.
-It is equivalent to the C standard function
-.Xr mktime 3 ,
-and is provided for symmetry only.
-.Sh SEE ALSO
-.Xr ctime 3 ,
-.Xr tm 3 ,
-.Xr tzset 3
diff --git a/lib/libc/time/private.h b/lib/libc/time/private.h
deleted file mode 100644
index 706cf488e..000000000
--- a/lib/libc/time/private.h
+++ /dev/null
@@ -1,597 +0,0 @@
-/*	$NetBSD: private.h,v 1.44 2015/10/09 17:21:45 christos Exp $	*/
-
-#ifndef PRIVATE_H
-#define PRIVATE_H
-
-/* NetBSD defaults */
-#define TM_GMTOFF	tm_gmtoff
-#define TM_ZONE		tm_zone
-#define STD_INSPIRED	1
-#define HAVE_LONG_DOUBLE 1
-
-/* For when we build zic as a host tool. */
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-/*
-** This file is in the public domain, so clarified as of
-** 1996-06-05 by Arthur David Olson.
-*/
-
-/*
-** This header is for use ONLY with the time conversion code.
-** There is no guarantee that it will remain unchanged,
-** or that it will remain at all.
-** Do NOT copy it to any system include directory.
-** Thank you!
-*/
-
-#define GRANDPARENTED	"Local time zone must be set--see zic manual page"
-
-/*
-** Defaults for preprocessor symbols.
-** You can override these in your C compiler options, e.g. '-DHAVE_GETTEXT=1'.
-*/
-
-#ifndef HAVE_GETTEXT
-#define HAVE_GETTEXT		0
-#endif /* !defined HAVE_GETTEXT */
-
-#ifndef HAVE_INCOMPATIBLE_CTIME_R
-#define HAVE_INCOMPATIBLE_CTIME_R	0
-#endif /* !defined INCOMPATIBLE_CTIME_R */
-
-#ifndef HAVE_LINK
-#define HAVE_LINK		1
-#endif /* !defined HAVE_LINK */
-
-#ifndef HAVE_STRDUP
-#define HAVE_STRDUP 1
-#endif
-
-#ifndef HAVE_SYMLINK
-#define HAVE_SYMLINK		1
-#endif /* !defined HAVE_SYMLINK */
-
-#ifndef HAVE_SYS_STAT_H
-#define HAVE_SYS_STAT_H		1
-#endif /* !defined HAVE_SYS_STAT_H */
-
-#ifndef HAVE_SYS_WAIT_H
-#define HAVE_SYS_WAIT_H		1
-#endif /* !defined HAVE_SYS_WAIT_H */
-
-#ifndef HAVE_UNISTD_H
-#define HAVE_UNISTD_H		1
-#endif /* !defined HAVE_UNISTD_H */
-
-#ifndef HAVE_UTMPX_H
-#define HAVE_UTMPX_H		1
-#endif /* !defined HAVE_UTMPX_H */
-
-#ifndef NETBSD_INSPIRED
-# define NETBSD_INSPIRED 1
-#endif
-
-#if HAVE_INCOMPATIBLE_CTIME_R
-#define asctime_r _incompatible_asctime_r
-#define ctime_r _incompatible_ctime_r
-#endif /* HAVE_INCOMPATIBLE_CTIME_R */
-
-/* Enable tm_gmtoff and tm_zone on GNUish systems.  */
-#define _GNU_SOURCE 1
-/* Fix asctime_r on Solaris 10.  */
-#define _POSIX_PTHREAD_SEMANTICS 1
-/* Enable strtoimax on Solaris 10.  */
-#define __EXTENSIONS__ 1
-
-/*
-** Nested includes
-*/
-
-#ifndef __minix
-/* Avoid clashes with NetBSD by renaming NetBSD's declarations.  */
-#define localtime_rz sys_localtime_rz
-#define mktime_z sys_mktime_z
-#define posix2time_z sys_posix2time_z
-#define time2posix_z sys_time2posix_z
-#define timezone_t sys_timezone_t
-#define tzalloc sys_tzalloc
-#define tzfree sys_tzfree
-#include <time.h>
-#undef localtime_rz
-#undef mktime_z
-#undef posix2time_z
-#undef time2posix_z
-#undef timezone_t
-#undef tzalloc
-#undef tzfree
-#else
-#include "time.h"
-#endif
-
-#include "sys/types.h"	/* for time_t */
-#include "stdio.h"
-#include "string.h"
-#include "limits.h"	/* for CHAR_BIT et al. */
-#include "stdlib.h"
-
-#include "errno.h"
-
-#ifndef ENAMETOOLONG
-# define ENAMETOOLONG EINVAL
-#endif
-#ifndef EOVERFLOW
-# define EOVERFLOW EINVAL
-#endif
-
-#if HAVE_GETTEXT
-#include "libintl.h"
-#endif /* HAVE_GETTEXT */
-
-#if HAVE_SYS_WAIT_H
-#include <sys/wait.h>	/* for WIFEXITED and WEXITSTATUS */
-#endif /* HAVE_SYS_WAIT_H */
-
-#ifndef WIFEXITED
-#define WIFEXITED(status)	(((status) & 0xff) == 0)
-#endif /* !defined WIFEXITED */
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(status)	(((status) >> 8) & 0xff)
-#endif /* !defined WEXITSTATUS */
-
-#if HAVE_UNISTD_H
-#include "unistd.h"	/* for F_OK, R_OK, and other POSIX goodness */
-#endif /* HAVE_UNISTD_H */
-
-#ifndef HAVE_STRFTIME_L
-# if _POSIX_VERSION < 200809
-#  define HAVE_STRFTIME_L 0
-# else
-#  define HAVE_STRFTIME_L 1
-# endif
-#endif
-
-#ifndef F_OK
-#define F_OK	0
-#endif /* !defined F_OK */
-#ifndef R_OK
-#define R_OK	4
-#endif /* !defined R_OK */
-
-/* Unlike <ctype.h>'s isdigit, this also works if c < 0 | c > UCHAR_MAX. */
-#define is_digit(c) ((unsigned)(c) - '0' <= 9)
-
-/*
-** Define HAVE_STDINT_H's default value here, rather than at the
-** start, since __GLIBC__'s value depends on previously-included
-** files.
-** (glibc 2.1 and later have stdint.h, even with pre-C99 compilers.)
-*/
-#ifndef HAVE_STDINT_H
-#define HAVE_STDINT_H \
-   (199901 <= __STDC_VERSION__ \
-    || 2 < __GLIBC__ + (1 <= __GLIBC_MINOR__)	\
-    || __CYGWIN__)
-#endif /* !defined HAVE_STDINT_H */
-
-#if HAVE_STDINT_H
-#include "stdint.h"
-#endif /* !HAVE_STDINT_H */
-
-#ifndef HAVE_INTTYPES_H
-# define HAVE_INTTYPES_H HAVE_STDINT_H
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-
-/* Pre-C99 GCC compilers define __LONG_LONG_MAX__ instead of LLONG_MAX.  */
-#ifdef __LONG_LONG_MAX__
-# ifndef LLONG_MAX
-#  define LLONG_MAX __LONG_LONG_MAX__
-# endif
-# ifndef LLONG_MIN
-#  define LLONG_MIN (-1 - LLONG_MAX)
-# endif
-#endif
-
-#ifndef INT_FAST64_MAX
-# ifdef LLONG_MAX
-typedef long long	int_fast64_t;
-#  define INT_FAST64_MIN LLONG_MIN
-#  define INT_FAST64_MAX LLONG_MAX
-# else
-#  if LONG_MAX >> 31 < 0xffffffff
-Please use a compiler that supports a 64-bit integer type (or wider);
-you may need to compile with "-DHAVE_STDINT_H".
-#  endif
-typedef long		int_fast64_t;
-#  define INT_FAST64_MIN LONG_MIN
-#  define INT_FAST64_MAX LONG_MAX
-# endif
-#endif
-
-#ifndef SCNdFAST64
-# if INT_FAST64_MAX == LLONG_MAX
-#  define SCNdFAST64 "lld"
-# else
-#  define SCNdFAST64 "ld"
-# endif
-#endif
-
-#ifndef INT_FAST32_MAX
-# if INT_MAX >> 31 == 0
-typedef long int_fast32_t;
-#  define INT_FAST32_MAX LONG_MAX
-#  define INT_FAST32_MIN LONG_MIN
-# else
-typedef int int_fast32_t;
-#  define INT_FAST32_MAX INT_MAX
-#  define INT_FAST32_MIN INT_MIN
-# endif
-#endif
-
-#ifndef INTMAX_MAX
-# ifdef LLONG_MAX
-typedef long long intmax_t;
-#  define strtoimax strtoll
-#  define INTMAX_MAX LLONG_MAX
-#  define INTMAX_MIN LLONG_MIN
-# else
-typedef long intmax_t;
-#  define strtoimax strtol
-#  define INTMAX_MAX LONG_MAX
-#  define INTMAX_MIN LONG_MIN
-# endif
-#endif
-
-#ifndef PRIdMAX
-# if INTMAX_MAX == LLONG_MAX
-#  define PRIdMAX "lld"
-# else
-#  define PRIdMAX "ld"
-# endif
-#endif
-
-#ifndef UINT_FAST64_MAX
-# if defined ULLONG_MAX || defined __LONG_LONG_MAX__
-typedef unsigned long long uint_fast64_t;
-# else
-#  if ULONG_MAX >> 31 >> 1 < 0xffffffff
-Please use a compiler that supports a 64-bit integer type (or wider);
-you may need to compile with "-DHAVE_STDINT_H".
-#  endif
-typedef unsigned long	uint_fast64_t;
-# endif
-#endif
-
-#ifndef UINTMAX_MAX
-# if defined ULLONG_MAX || defined __LONG_LONG_MAX__
-typedef unsigned long long uintmax_t;
-# else
-typedef unsigned long uintmax_t;
-# endif
-#endif
-
-#ifndef PRIuMAX
-# if defined ULLONG_MAX || defined __LONG_LONG_MAX__
-#  define PRIuMAX "llu"
-# else
-#  define PRIuMAX "lu"
-# endif
-#endif
-
-#ifndef INT32_MAX
-#define INT32_MAX 0x7fffffff
-#endif /* !defined INT32_MAX */
-#ifndef INT32_MIN
-#define INT32_MIN (-1 - INT32_MAX)
-#endif /* !defined INT32_MIN */
-
-#ifndef SIZE_MAX
-#define SIZE_MAX ((size_t) -1)
-#endif
-
-#if 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
-# define ATTRIBUTE_CONST __attribute__ ((__const__))
-# define ATTRIBUTE_PURE __attribute__ ((__pure__))
-# define ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-#else
-# define ATTRIBUTE_CONST /* empty */
-# define ATTRIBUTE_PURE /* empty */
-# define ATTRIBUTE_FORMAT(spec) /* empty */
-#endif
-
-#if !defined _Noreturn && __STDC_VERSION__ < 201112
-# if 2 < __GNUC__ + (8 <= __GNUC_MINOR__)
-#  define _Noreturn __attribute__ ((__noreturn__))
-# else
-#  define _Noreturn
-# endif
-#endif
-
-#if __STDC_VERSION__ < 199901 && !defined restrict
-# define restrict /* empty */
-#endif
-
-/*
-** Workarounds for compilers/systems.
-*/
-
-/*
-** Compile with -Dtime_tz=T to build the tz package with a private
-** time_t type equivalent to T rather than the system-supplied time_t.
-** This debugging feature can test unusual design decisions
-** (e.g., time_t wider than 'long', or unsigned time_t) even on
-** typical platforms.
-*/
-#ifdef time_tz
-# ifdef LOCALTIME_IMPLEMENTATION
-static time_t sys_time(time_t *x) { return time(x); }
-# endif
-
-typedef time_tz tz_time_t;
-
-# undef  ctime
-# define ctime tz_ctime
-# undef  ctime_r
-# define ctime_r tz_ctime_r
-# undef  difftime
-# define difftime tz_difftime
-# undef  gmtime
-# define gmtime tz_gmtime
-# undef  gmtime_r
-# define gmtime_r tz_gmtime_r
-# undef  localtime
-# define localtime tz_localtime
-# undef  localtime_r
-# define localtime_r tz_localtime_r
-# undef  localtime_rz
-# define localtime_rz tz_localtime_rz
-# undef  mktime
-# define mktime tz_mktime
-# undef  mktime_z
-# define mktime_z tz_mktime_z
-# undef  offtime
-# define offtime tz_offtime
-# undef  posix2time
-# define posix2time tz_posix2time
-# undef  posix2time_z
-# define posix2time_z tz_posix2time_z
-# undef  time
-# define time tz_time
-# undef  time2posix
-# define time2posix tz_time2posix
-# undef  time2posix_z
-# define time2posix_z tz_time2posix_z
-# undef  time_t
-# define time_t tz_time_t
-# undef  timegm
-# define timegm tz_timegm
-# undef  timelocal
-# define timelocal tz_timelocal
-# undef  timeoff
-# define timeoff tz_timeoff
-# undef  tzalloc
-# define tzalloc tz_tzalloc
-# undef  tzfree
-# define tzfree tz_tzfree
-# undef  tzset
-# define tzset tz_tzset
-# undef  tzsetwall
-# define tzsetwall tz_tzsetwall
-
-char *ctime(time_t const *);
-char *ctime_r(time_t const *, char *);
-double difftime(time_t, time_t);
-struct tm *gmtime(time_t const *);
-struct tm *gmtime_r(time_t const *restrict, struct tm *restrict);
-struct tm *localtime(time_t const *);
-struct tm *localtime_r(time_t const *restrict, struct tm *restrict);
-time_t mktime(struct tm *);
-time_t time(time_t *);
-void tzset(void);
-#endif
-
-/*
-** Some time.h implementations don't declare asctime_r.
-** Others might define it as a macro.
-** Fix the former without affecting the latter.
-** Similarly for timezone, daylight, and altzone.
-*/
-
-#ifndef asctime_r
-extern char *	asctime_r(struct tm const *restrict, char *restrict);
-#endif
-
-#if defined(USG_COMPAT) && !defined(__minix)
-# ifndef timezone
-extern long timezone;
-# endif
-# ifndef daylight
-extern int daylight;
-# endif
-#endif
-#if defined ALTZONE && !defined altzone
-extern long altzone;
-#endif
-
-/*
-** The STD_INSPIRED functions are similar, but most also need
-** declarations if time_tz is defined.
-*/
-
-#ifdef STD_INSPIRED
-# if !defined tzsetwall || defined time_tz
-void tzsetwall(void);
-# endif
-# if !defined offtime || defined time_tz
-struct tm *offtime(time_t const *, long);
-# endif
-# if !defined timegm || defined time_tz
-time_t timegm(struct tm *);
-# endif
-# if !defined timelocal || defined time_tz
-time_t timelocal(struct tm *);
-# endif
-# if !defined timeoff || defined time_tz
-time_t timeoff(struct tm *, long);
-# endif
-# if !defined time2posix || defined time_tz
-time_t time2posix(time_t);
-# endif
-# if !defined posix2time || defined time_tz
-time_t posix2time(time_t);
-# endif
-#endif
-
-/* Infer TM_ZONE on systems where this information is known, but suppress
-   guessing if NO_TM_ZONE is defined.  Similarly for TM_GMTOFF.  */
-#if (defined __GLIBC__ || defined __FreeBSD__ || defined __minix ||            \
-     defined __OpenBSD__ || (defined __APPLE__ && defined __MACH__))
-# if !defined TM_GMTOFF && !defined NO_TM_GMTOFF
-#  define TM_GMTOFF tm_gmtoff
-# endif
-# if !defined TM_ZONE && !defined NO_TM_ZONE
-#  define TM_ZONE tm_zone
-# endif
-#endif
-
-/*
-** Define functions that are ABI compatible with NetBSD but have
-** better prototypes.  NetBSD 6.1.4 defines a pointer type timezone_t
-** and labors under the misconception that 'const timezone_t' is a
-** pointer to a constant.  This use of 'const' is ineffective, so it
-** is not done here.  What we call 'struct state' NetBSD calls
-** 'struct __state', but this is a private name so it doesn't matter.
-*/
-#ifndef __minix
-#if NETBSD_INSPIRED
-typedef struct state *timezone_t;
-struct tm *localtime_rz(timezone_t restrict, time_t const *restrict,
-			struct tm *restrict);
-time_t mktime_z(timezone_t restrict, struct tm *restrict);
-timezone_t tzalloc(char const *);
-void tzfree(timezone_t);
-# ifdef STD_INSPIRED
-#  if !defined posix2time_z || defined time_tz
-time_t posix2time_z(timezone_t __restrict, time_t) ATTRIBUTE_PURE;
-#  endif
-#  if !defined time2posix_z || defined time_tz
-time_t time2posix_z(timezone_t __restrict, time_t) ATTRIBUTE_PURE;
-#  endif
-# endif
-#endif
-#endif
-
-/*
-** Finally, some convenience items.
-*/
-
-#if __STDC_VERSION__ < 199901
-# define true 1
-# define false 0
-# define bool int
-#else
-# include <stdbool.h>
-#endif
-
-#ifndef TYPE_BIT
-#define TYPE_BIT(type)	(sizeof (type) * CHAR_BIT)
-#endif /* !defined TYPE_BIT */
-
-#ifndef TYPE_SIGNED
-#define TYPE_SIGNED(type) (/*CONSTCOND*/((type) -1) < 0)
-#endif /* !defined TYPE_SIGNED */
-
-#define TWOS_COMPLEMENT(t) (/*CONSTCOND*/(t) ~ (t) 0 < 0)
-
-/* Max and min values of the integer type T, of which only the bottom
-   B bits are used, and where the highest-order used bit is considered
-   to be a sign bit if T is signed.  */
-#define MAXVAL(t, b) /*LINTED*/					\
-  ((t) (((t) 1 << ((b) - 1 - TYPE_SIGNED(t)))			\
-	- 1 + ((t) 1 << ((b) - 1 - TYPE_SIGNED(t)))))
-#define MINVAL(t, b)						\
-  ((t) (TYPE_SIGNED(t) ? - TWOS_COMPLEMENT(t) - MAXVAL(t, b) : 0))
-
-#ifdef LOCALTIME_IMPLEMENTATION
-/* The minimum and maximum finite time values.  This assumes no padding.  */
-static time_t const time_t_min = MINVAL(time_t, TYPE_BIT(time_t));
-static time_t const time_t_max = MAXVAL(time_t, TYPE_BIT(time_t));
-#endif
-
-#ifndef INT_STRLEN_MAXIMUM
-/*
-** 302 / 1000 is log10(2.0) rounded up.
-** Subtract one for the sign bit if the type is signed;
-** add one for integer division truncation;
-** add one more for a minus sign if the type is signed.
-*/
-#define INT_STRLEN_MAXIMUM(type) \
-	((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + \
-	1 + TYPE_SIGNED(type))
-#endif /* !defined INT_STRLEN_MAXIMUM */
-
-/*
-** INITIALIZE(x)
-*/
-
-#if defined(__GNUC__) || defined(__lint__)
-# define INITIALIZE(x)	((x) = 0)
-#else
-# define INITIALIZE(x)
-#endif
-
-#ifndef UNINIT_TRAP
-# define UNINIT_TRAP 0
-#endif
-
-/*
-** For the benefit of GNU folk...
-** '_(MSGID)' uses the current locale's message library string for MSGID.
-** The default is to use gettext if available, and use MSGID otherwise.
-*/
-
-#ifndef _
-#if HAVE_GETTEXT
-#define _(msgid) gettext(msgid)
-#else /* !HAVE_GETTEXT */
-#define _(msgid) msgid
-#endif /* !HAVE_GETTEXT */
-#endif /* !defined _ */
-
-#if !defined TZ_DOMAIN && defined HAVE_GETTEXT
-# define TZ_DOMAIN "tz"
-#endif
-
-#if HAVE_INCOMPATIBLE_CTIME_R
-#undef asctime_r
-#undef ctime_r
-char *asctime_r(struct tm const *, char *);
-char *ctime_r(time_t const *, char *);
-#endif /* HAVE_INCOMPATIBLE_CTIME_R */
-
-#ifndef YEARSPERREPEAT
-#define YEARSPERREPEAT		400	/* years before a Gregorian repeat */
-#endif /* !defined YEARSPERREPEAT */
-
-/*
-** The Gregorian year averages 365.2425 days, which is 31556952 seconds.
-*/
-
-#ifndef AVGSECSPERYEAR
-#define AVGSECSPERYEAR		31556952L
-#endif /* !defined AVGSECSPERYEAR */
-
-#ifndef SECSPERREPEAT
-#define SECSPERREPEAT		((int_fast64_t) YEARSPERREPEAT * (int_fast64_t) AVGSECSPERYEAR)
-#endif /* !defined SECSPERREPEAT */
-
-#ifndef SECSPERREPEAT_BITS
-#define SECSPERREPEAT_BITS	34	/* ceil(log2(SECSPERREPEAT)) */
-#endif /* !defined SECSPERREPEAT_BITS */
-
-#endif /* !defined PRIVATE_H */
diff --git a/lib/libc/time/strftime.3 b/lib/libc/time/strftime.3
deleted file mode 100644
index c4b7aa282..000000000
--- a/lib/libc/time/strftime.3
+++ /dev/null
@@ -1,268 +0,0 @@
-.\" Copyright (c) 1989, 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     from: @(#)strftime.3	5.12 (Berkeley) 6/29/91
-.\"	$NetBSD: strftime.3,v 1.30 2013/09/20 19:06:54 christos Exp $
-.\"
-.Dd April 14, 2011
-.Dt STRFTIME 3
-.Os
-.Sh NAME
-.Nm strftime ,
-.Nm strftime_z
-.Nd format date and time
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft size_t
-.Fn strftime "char * restrict buf" "size_t maxsize" "const char * restrict format" "const struct tm * restrict timeptr"
-.Ft size_t
-.Fn strftime_z "const timezone_t tz" "char * restrict buf" "size_t maxsize" "const char * restrict format" "const struct tm * restrict timeptr"
-.Sh DESCRIPTION
-The
-.Fn strftime
-function formats the information from
-.Fa timeptr
-into the buffer
-.Fa buf
-according to the string pointed to by
-.Fa format .
-.Pp
-The
-.Fa format
-string consists of zero or more conversion specifications and
-ordinary characters.
-All ordinary characters are copied directly into the buffer.
-A conversion specification consists of a percent sign
-.Ql %
-and one other character.
-.Pp
-No more than
-.Fa maxsize
-characters will be placed into the array.
-If the total number of resulting characters, including the terminating
-null character, is not more than
-.Fa maxsize ,
-.Fn strftime
-returns the number of characters in the array, not counting the
-terminating null.
-Otherwise, zero is returned and the contents of the array are undefined.
-.Pp
-Each conversion specification is replaced by the characters as
-follows which are then copied into the buffer.
-.Bl -tag -width "xxxx"
-.It Cm \&%A
-is replaced by the locale's full weekday name.
-.It Cm %a
-is replaced by the locale's abbreviated weekday name.
-.It Cm \&%B
-is replaced by the locale's full month name.
-.It Cm \&%b No or Cm \&%h
-is replaced by the locale's abbreviated month name.
-.It Cm \&%C
-is replaced by the century (a year divided by 100 and truncated to an integer)
-as a decimal number [00,99].
-.It Cm \&%c
-is replaced by the locale's appropriate date and time representation.
-.It Cm \&%D
-is replaced by the date in the format
-.Dq Li %m/%d/%y .
-.It Cm \&%d
-is replaced by the day of the month as a decimal number [01,31].
-.It Cm \&%e
-is replaced by the day of month as a decimal number [1,31];
-single digits are preceded by a blank.
-.It Cm \&%F
-is replaced by the date in the format
-.Dq Li %Y-%m-%d
-(the ISO 8601 date format).
-.It Cm \&%G
-is replaced by the ISO 8601 year with century as a decimal number.
-.It Cm \&%g
-is replaced by the ISO 8601 year without century as a decimal number (00-99).
-This is the year that includes the greater part of the week.
-(Monday as the first day of a week).
-See also the
-.Ql \&%V
-conversion specification.
-.It Cm \&%H
-is replaced by the hour (24-hour clock) as a decimal number [00,23].
-.It Cm \&%I
-is replaced by the hour (12-hour clock) as a decimal number [01,12].
-.It Cm \&%j
-is replaced by the day of the year as a decimal number [001,366].
-.It Cm \&%k
-is replaced by the hour (24-hour clock) as a decimal number [0,23];
-single digits are preceded by a blank.
-.It Cm \&%l
-is replaced by the hour (12-hour clock) as a decimal number [1,12];
-single digits are preceded by a blank.
-.It Cm \&%M
-is replaced by the minute as a decimal number [00,59].
-.It Cm %m
-is replaced by the month as a decimal number [01,12].
-.It Cm %n
-is replaced by a newline.
-.It Cm %p
-is replaced by the locale's equivalent of either
-.Dq Tn AM
-or
-.Dq Tn PM .
-.It Cm \&%R
-is replaced by the time in the format
-.Dq Li %H:%M .
-.It Cm \&%r
-is replaced by the locale's representation of 12-hour clock time
-using AM/PM notation.
-.It Cm \&%S
-is replaced by the second as a decimal number [00,61].
-The range of
-seconds is (00-61) instead of (00-59) to allow for the periodic occurrence
-of leap seconds and double leap seconds.
-.It Cm %s
-is replaced by the number of seconds since the Epoch (see
-.Xr ctime 3 ) .
-.It Cm \&%T
-is replaced by the time in the format
-.Dq Li %H:%M:%S .
-.It Cm \&%t
-is replaced by a tab.
-.It Cm \&%U
-is replaced by the week number of the year (Sunday as the first day of
-the week) as a decimal number [00,53].
-.It Cm \&%u
-is replaced by the weekday (Monday as the first day of the week)
-as a decimal number [1,7].
-.It Cm \&%V
-is replaced by the week number of the year (Monday as the first day of
-the week) as a decimal number [01,53]. According to ISO 8601 the week
-containing January 1 is week 1 if it has four or more days in the new year,
-otherwise it is week 53 of the previous year, and the next week is week 1.
-The year is given by the
-.Ql \&%G
-conversion specification.
-.It Cm \&%v
-is replaced by the date in the format
-.Dq Li %e-%b-%Y .
-.It Cm \&%W
-is replaced by the week number of the year (Monday as the first day of
-the week) as a decimal number [00,53].
-.It Cm \&%w
-is replaced by the weekday (Sunday as the first day of the week)
-as a decimal number [0,6].
-.It Cm \&%X
-is replaced by the locale's appropriate time representation.
-.It Cm \&%x
-is replaced by the locale's appropriate date representation.
-.It Cm \&%Y
-is replaced by the year with century as a decimal number.
-.It Cm \&%y
-is replaced by the year without century as a decimal number [00,99].
-.It Cm \&%Z
-is replaced by the time zone name.
-.It Cm \&%z
-is replaced by the offset from the Prime Meridian in the format
-+HHMM or -HHMM (ISO 8601) as appropriate, with positive values representing
-locations east of Greenwich, or by the empty string if this is
-not determinable.
-.Dq Li [-]hhmm .
-.It Cm %%
-is replaced by
-.Ql % .
-.El
-.Pp
-The
-.Fn strftime_z
-function is similar to
-.Fn strftime ,
-but it also takes a
-.Ft "const timezone_t"
-.Fa tz
-argument.
-.Sh SEE ALSO
-.Xr date 1 ,
-.Xr printf 1 ,
-.Xr ctime 3 ,
-.Xr printf 3 ,
-.Xr strptime 3 ,
-.Xr tm 3
-.Sh STANDARDS
-The
-.Fn strftime
-function
-conforms to
-.St -isoC-99 .
-The
-.Ql \&%C ,
-.Ql \&%D ,
-.Ql \&%e ,
-.Ql \&%g ,
-.Ql \&%G ,
-.Ql \&%h ,
-.Ql \&%k ,
-.Ql \&%l ,
-.Ql \&%n ,
-.Ql \&%r ,
-.Ql \&%R ,
-.Ql \&%s ,
-.Ql \&%t ,
-.Ql \&%T ,
-.Ql \&%u ,
-.Ql \&%V ,
-and
-.Ql \&%v
-conversion specifications are extensions.
-.Pp
-Use of the ISO 8601 conversions may produce non-intuitive results.
-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.
-.Sh BUGS
-There is no conversion specification for the phase of the moon.
-.Pp
-A return value of zero does not necessarily indicate an error.
-If the resulting string is an empty string, the result value is
-zero and it is not possible to distinguish between success and error.
-For example, in many locales
-.Cm \&%p
-yields an empty string.
-This problem can be avoided by inserting an extra space at the
-beginning of the format string and then skipping over it or removing
-it from the result.
diff --git a/lib/libc/time/strftime.c b/lib/libc/time/strftime.c
deleted file mode 100644
index 61ffa9d44..000000000
--- a/lib/libc/time/strftime.c
+++ /dev/null
@@ -1,681 +0,0 @@
-/*	$NetBSD: strftime.c,v 1.35 2015/10/09 17:21:45 christos Exp $	*/
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char	elsieid[] = "@(#)strftime.c	7.64";
-static char	elsieid[] = "@(#)strftime.c	8.3";
-#else
-__RCSID("$NetBSD: strftime.c,v 1.35 2015/10/09 17:21:45 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <stddef.h>
-#include <assert.h>
-#include <locale.h>
-#include "setlocale_local.h"
-
-/*
-** Based on the UCB version with the copyright notice and sccsid
-** appearing below.
-**
-** This is ANSIish only when "multibyte character == plain character".
-*/
-
-#include "private.h"
-
-/*
-** We don't use these extensions in strftime operation even when
-** supported by the local tzcode configuration.  A strictly
-** conforming C application may leave them in undefined state.
-*/
-
-#ifdef _LIBC
-#undef TM_ZONE
-#undef TM_GMTOFF
-#endif
-
-/*
-** Copyright (c) 1989, 1993
-**	The Regents of the University of California.  All rights reserved.
-**
-** Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions
-** are met:
-** 1. Redistributions of source code must retain the above copyright
-**    notice, this list of conditions and the following disclaimer.
-** 2. Redistributions in binary form must reproduce the above copyright
-**    notice, this list of conditions and the following disclaimer in the
-**    documentation and/or other materials provided with the distribution.
-** 3. 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.
-*/
-
-#include "tzfile.h"
-#include "fcntl.h"
-#include "locale.h"
-
-#ifdef __weak_alias
-__weak_alias(strftime_l, _strftime_l)
-__weak_alias(strftime_lz, _strftime_lz)
-__weak_alias(strftime_z, _strftime_z)
-#endif
-
-#include "sys/localedef.h"
-#define _TIME_LOCALE(loc) \
-    ((_TimeLocale *)((loc)->part_impl[(size_t)LC_TIME]))
-#define c_fmt   d_t_fmt
-
-static char *	_add(const char *, char *, const char *);
-static char *	_conv(int, const char *, char *, const char *);
-static char *	_fmt(const timezone_t, const char *, const struct tm *, char *,
-			const char *, int *, locale_t);
-static char *	_yconv(int, int, bool, bool, char *, const char *);
-
-extern char *	tzname[];
-
-#ifndef YEAR_2000_NAME
-#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
-
-size_t
-strftime_z(const timezone_t sp, char * __restrict s, size_t maxsize,
-    const char * __restrict format, const struct tm * __restrict t)
-{
-	return strftime_lz(sp, s, maxsize, format, t, _current_locale());
-}
-
-#if HAVE_STRFTIME_L
-size_t
-strftime_l(char *s, size_t maxsize, char const *format, struct tm const *t,
-	   locale_t locale)
-{
-  /* Just call strftime, as only the C locale is supported.  */
-  return strftime(s, maxsize, format, t);
-}
-#endif
-
-size_t
-strftime_lz(const timezone_t sp, char *const s, const size_t maxsize,
-    const char *const format, const struct tm *const t, locale_t loc)
-{
-	char *	p;
-	int	warn;
-
-	warn = IN_NONE;
-	p = _fmt(sp, ((format == NULL) ? "%c" : format), t, s, s + maxsize,
-	    &warn, loc);
-#ifndef NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU
-	if (warn != IN_NONE && getenv(YEAR_2000_NAME) != NULL) {
-		(void) fprintf(stderr, "\n");
-		if (format == NULL)
-			(void) fprintf(stderr, "NULL strftime format ");
-		else	(void) fprintf(stderr, "strftime format \"%s\" ",
-				format);
-		(void) fprintf(stderr, "yields only two digits of years in ");
-		if (warn == IN_SOME)
-			(void) fprintf(stderr, "some locales");
-		else if (warn == IN_THIS)
-			(void) fprintf(stderr, "the current locale");
-		else	(void) fprintf(stderr, "all locales");
-		(void) fprintf(stderr, "\n");
-	}
-#endif /* !defined NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU */
-	if (p == s + maxsize)
-		return 0;
-	*p = '\0';
-	return p - s;
-}
-
-static char *
-_fmt(const timezone_t sp, const char *format, const struct tm *t, char *pt,
-     const char *ptlim, int *warnp, locale_t loc)
-{
-	for ( ; *format; ++format) {
-		if (*format == '%') {
-label:
-			switch (*++format) {
-			case '\0':
-				--format;
-				break;
-			case 'A':
-				pt = _add((t->tm_wday < 0 ||
-					t->tm_wday >= DAYSPERWEEK) ?
-					"?" : _TIME_LOCALE(loc)->day[t->tm_wday],
-					pt, ptlim);
-				continue;
-			case 'a':
-				pt = _add((t->tm_wday < 0 ||
-					t->tm_wday >= DAYSPERWEEK) ?
-					"?" : _TIME_LOCALE(loc)->abday[t->tm_wday],
-					pt, ptlim);
-				continue;
-			case 'B':
-				pt = _add((t->tm_mon < 0 ||
-					t->tm_mon >= MONSPERYEAR) ?
-					"?" : _TIME_LOCALE(loc)->mon[t->tm_mon],
-					pt, ptlim);
-				continue;
-			case 'b':
-			case 'h':
-				pt = _add((t->tm_mon < 0 ||
-					t->tm_mon >= MONSPERYEAR) ?
-					"?" : _TIME_LOCALE(loc)->abmon[t->tm_mon],
-					pt, ptlim);
-				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)
-				*/
-				pt = _yconv(t->tm_year, TM_YEAR_BASE,
-					    true, false, pt, ptlim);
-				continue;
-			case 'c':
-				{
-				int warn2 = IN_SOME;
-
-				pt = _fmt(sp, _TIME_LOCALE(loc)->c_fmt, t, pt,
-				    ptlim, &warn2, loc);
-				if (warn2 == IN_ALL)
-					warn2 = IN_THIS;
-				if (warn2 > *warnp)
-					*warnp = warn2;
-				}
-				continue;
-			case 'D':
-				pt = _fmt(sp, "%m/%d/%y", t, pt, ptlim, warnp,
-				    loc);
-				continue;
-			case 'd':
-				pt = _conv(t->tm_mday, "%02d", pt, ptlim);
-				continue;
-			case 'E':
-			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.
-				*/
-				goto label;
-			case 'e':
-				pt = _conv(t->tm_mday, "%2d", pt, ptlim);
-				continue;
-			case 'F':
-				pt = _fmt(sp, "%Y-%m-%d", t, pt, ptlim, warnp,
-				    loc);
-				continue;
-			case 'H':
-				pt = _conv(t->tm_hour, "%02d", pt, ptlim);
-				continue;
-			case 'I':
-				pt = _conv((t->tm_hour % 12) ?
-					(t->tm_hour % 12) : 12,
-					"%02d", pt, ptlim);
-				continue;
-			case 'j':
-				pt = _conv(t->tm_yday + 1, "%03d", pt, ptlim);
-				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)
-				*/
-				pt = _conv(t->tm_hour, "%2d", pt, ptlim);
-				continue;
-#ifdef KITCHEN_SINK
-			case 'K':
-				/*
-				** After all this time, still unclaimed!
-				*/
-				pt = _add("kitchen sink", pt, ptlim);
-				continue;
-#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)
-				*/
-				pt = _conv((t->tm_hour % 12) ?
-					(t->tm_hour % 12) : 12,
-					"%2d", pt, ptlim);
-				continue;
-			case 'M':
-				pt = _conv(t->tm_min, "%02d", pt, ptlim);
-				continue;
-			case 'm':
-				pt = _conv(t->tm_mon + 1, "%02d", pt, ptlim);
-				continue;
-			case 'n':
-				pt = _add("\n", pt, ptlim);
-				continue;
-			case 'p':
-				pt = _add((t->tm_hour >= (HOURSPERDAY / 2)) ?
-					_TIME_LOCALE(loc)->am_pm[1] :
-					_TIME_LOCALE(loc)->am_pm[0],
-					pt, ptlim);
-				continue;
-			case 'R':
-				pt = _fmt(sp, "%H:%M", t, pt, ptlim, warnp,
-				    loc);
-				continue;
-			case 'r':
-				pt = _fmt(sp, _TIME_LOCALE(loc)->t_fmt_ampm, t,
-				    pt, ptlim, warnp, loc);
-				continue;
-			case 'S':
-				pt = _conv(t->tm_sec, "%02d", pt, ptlim);
-				continue;
-			case 's':
-				{
-					struct tm	tm;
-					char		buf[INT_STRLEN_MAXIMUM(
-								time_t) + 1];
-					time_t		mkt;
-
-					tm = *t;
-					mkt = mktime(&tm);
-					/* CONSTCOND */
-					if (TYPE_SIGNED(time_t))
-						(void)snprintf(buf, sizeof(buf),
-						    "%jd", (intmax_t) mkt);
-					else	(void)snprintf(buf, sizeof(buf),
-						    "%ju", (uintmax_t) mkt);
-					pt = _add(buf, pt, ptlim);
-				}
-				continue;
-			case 'T':
-				pt = _fmt(sp, "%H:%M:%S", t, pt, ptlim, warnp,
-				    loc);
-				continue;
-			case 't':
-				pt = _add("\t", pt, ptlim);
-				continue;
-			case 'U':
-				pt = _conv((t->tm_yday + DAYSPERWEEK -
-					t->tm_wday) / DAYSPERWEEK,
-					"%02d", pt, ptlim);
-				continue;
-			case 'u':
-				/*
-				** 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);
-				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)
-*/
-				{
-					int	year;
-					int	base;
-					int	yday;
-					int	wday;
-					int	w;
-
-					year = t->tm_year;
-					base = TM_YEAR_BASE;
-					yday = t->tm_yday;
-					wday = t->tm_wday;
-					for ( ; ; ) {
-						int	len;
-						int	bot;
-						int	top;
-
-						len = isleap_sum(year, base) ?
-							DAYSPERLYEAR :
-							DAYSPERNYEAR;
-						/*
-						** 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?
-						*/
-						top = bot -
-							(len % DAYSPERWEEK);
-						if (top < -3)
-							top += DAYSPERWEEK;
-						top += len;
-						if (yday >= top) {
-							++base;
-							w = 1;
-							break;
-						}
-						if (yday >= bot) {
-							w = 1 + ((yday - bot) /
-								DAYSPERWEEK);
-							break;
-						}
-						--base;
-						yday += isleap_sum(year, base) ?
-							DAYSPERLYEAR :
-							DAYSPERNYEAR;
-					}
-#ifdef XPG4_1994_04_09
-					if ((w == 52 &&
-						t->tm_mon == TM_JANUARY) ||
-						(w == 1 &&
-						t->tm_mon == TM_DECEMBER))
-							w = 53;
-#endif /* defined XPG4_1994_04_09 */
-					if (*format == 'V')
-						pt = _conv(w, "%02d",
-							pt, ptlim);
-					else if (*format == 'g') {
-						*warnp = IN_ALL;
-						pt = _yconv(year, base,
-							false, true,
-							pt, ptlim);
-					} else	pt = _yconv(year, base,
-							true, true,
-							pt, ptlim);
-				}
-				continue;
-			case 'v':
-				/*
-				** From Arnold Robbins' strftime version 3.0:
-				** "date as dd-bbb-YYYY"
-				** (ado, 1993-05-24)
-				*/
-				pt = _fmt(sp, "%e-%b-%Y", t, pt, ptlim, warnp,
-				    loc);
-				continue;
-			case 'W':
-				pt = _conv((t->tm_yday + DAYSPERWEEK -
-					(t->tm_wday ?
-					(t->tm_wday - 1) :
-					(DAYSPERWEEK - 1))) / DAYSPERWEEK,
-					"%02d", pt, ptlim);
-				continue;
-			case 'w':
-				pt = _conv(t->tm_wday, "%d", pt, ptlim);
-				continue;
-			case 'X':
-				pt = _fmt(sp, _TIME_LOCALE(loc)->t_fmt, t, pt,
-				    ptlim, warnp, loc);
-				continue;
-			case 'x':
-				{
-				int	warn2 = IN_SOME;
-
-				pt = _fmt(sp, _TIME_LOCALE(loc)->d_fmt, t, pt,
-				    ptlim, &warn2, loc);
-				if (warn2 == IN_ALL)
-					warn2 = IN_THIS;
-				if (warn2 > *warnp)
-					*warnp = warn2;
-				}
-				continue;
-			case 'y':
-				*warnp = IN_ALL;
-				pt = _yconv(t->tm_year, TM_YEAR_BASE,
-					false, true,
-					pt, ptlim);
-				continue;
-			case 'Y':
-				pt = _yconv(t->tm_year, TM_YEAR_BASE,
-					true, true,
-					pt, ptlim);
-				continue;
-			case 'Z':
-#ifdef TM_ZONE
-				pt = _add(t->TM_ZONE, pt, ptlim);
-#endif /* defined TM_ZONE */
-				if (t->tm_isdst >= 0)
-					pt = _add((sp ?
-					    tzgetname(sp, t->tm_isdst) :
-					    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.
-				*/
-				continue;
-			case 'z':
-				{
-				long		diff;
-				char const *	sign;
-
-				if (t->tm_isdst < 0)
-					continue;
-#ifdef TM_GMTOFF
-				diff = (int)t->TM_GMTOFF;
-#else /* !defined TM_GMTOFF */
-				/*
-				** C99 says that the UT 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.
-				*/
-#ifndef STD_INSPIRED
-				if (t->tm_isdst == 0)
-#ifdef USG_COMPAT
-					diff = -timezone;
-#else /* !defined USG_COMPAT */
-					continue;
-#endif /* !defined USG_COMPAT */
-				else
-#ifdef ALTZONE
-					diff = -altzone;
-#else /* !defined ALTZONE */
-					continue;
-#endif /* !defined ALTZONE */
-#else /* defined STD_INSPIRED */
-				{
-					struct tm tmp;
-					time_t lct, gct;
-
-					/*
-					** Get calendar time from t
-					** being treated as local.
-					*/
-					tmp = *t; /* mktime discards const */
-					lct = mktime(&tmp);
-
-					if (lct == (time_t)-1)
-						continue;
-
-					/*
-					** Get calendar time from t
-					** being treated as GMT.
-					**/
-					tmp = *t; /* mktime discards const */
-					gct = timegm(&tmp);
-
-					if (gct == (time_t)-1)
-						continue;
-
-					/* LINTED difference will fit int */
-					diff = (intmax_t)gct - (intmax_t)lct;
-				}
-#endif /* defined STD_INSPIRED */
-#endif /* !defined TM_GMTOFF */
-				if (diff < 0) {
-					sign = "-";
-					diff = -diff;
-				} else	sign = "+";
-				pt = _add(sign, pt, ptlim);
-				diff /= SECSPERMIN;
-				diff = (diff / MINSPERHOUR) * 100 +
-					(diff % MINSPERHOUR);
-				_DIAGASSERT(__type_fit(int, diff));
-				pt = _conv((int)diff, "%04d", pt, ptlim);
-				}
-				continue;
-#if defined(__minix)
-			case '+':
-				pt = _fmt(sp, _TIME_LOCALE(loc)->c_fmt, t, pt, ptlim, warnp, loc);
-				continue;
-#endif /* defined(__minix) */
-#if 0
-			case '+':
-				pt = _fmt(sp, _TIME_LOCALE(loc)->date_fmt, t,
-				    pt, ptlim, warnp, loc);
-				continue;
-#endif
-			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.
-			*/
-			default:
-				break;
-			}
-		}
-		if (pt == ptlim)
-			break;
-		*pt++ = *format;
-	}
-	return pt;
-}
-
-size_t
-strftime(char *s, size_t maxsize, const char *format, const struct tm *t)
-{
-	tzset();
-	return strftime_z(NULL, s, maxsize, format, t);
-}
-
-size_t
-strftime_l(char * __restrict s, size_t maxsize, const char * __restrict format,
-    const struct tm * __restrict t, locale_t loc)
-{
-	tzset();
-	return strftime_lz(NULL, s, maxsize, format, t, loc);
-}
-
-static char *
-_conv(int n, const char *format, char *pt, const char *ptlim)
-{
-	char	buf[INT_STRLEN_MAXIMUM(int) + 1];
-
-	(void) snprintf(buf, sizeof(buf), format, n);
-	return _add(buf, pt, ptlim);
-}
-
-static char *
-_add(const char *str, char *pt, const char *ptlim)
-{
-	while (pt < ptlim && (*pt = *str++) != '\0')
-		++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.
-*/
-
-static char *
-_yconv(int a, int b, bool convert_top, bool convert_yy,
-    char *pt, const char * ptlim)
-{
-	int	lead;
-	int	trail;
-
-#define DIVISOR	100
-	trail = a % DIVISOR + b % DIVISOR;
-	lead = a / DIVISOR + b / DIVISOR + trail / DIVISOR;
-	trail %= DIVISOR;
-	if (trail < 0 && lead > 0) {
-		trail += DIVISOR;
-		--lead;
-	} else if (lead < 0 && trail > 0) {
-		trail -= DIVISOR;
-		++lead;
-	}
-	if (convert_top) {
-		if (lead == 0 && trail < 0)
-			pt = _add("-0", pt, ptlim);
-		else	pt = _conv(lead, "%02d", pt, ptlim);
-	}
-	if (convert_yy)
-		pt = _conv(((trail < 0) ? -trail : trail), "%02d", pt, ptlim);
-	return pt;
-}
diff --git a/lib/libc/time/strptime.3 b/lib/libc/time/strptime.3
deleted file mode 100644
index 80299755f..000000000
--- a/lib/libc/time/strptime.3
+++ /dev/null
@@ -1,345 +0,0 @@
-.\"	$NetBSD: strptime.3,v 1.31 2015/04/06 14:38:22 ginsbach Exp $
-.\"
-.\" Copyright (c) 1997, 1998, 2008 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This file was 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.
-.\"
-.Dd April  6, 2015
-.Dt STRPTIME 3
-.Os
-.Sh NAME
-.Nm strptime
-.Nd converts a character string to a time value
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft char *
-.Fn strptime "const char * restrict buf" "const char * restrict format" "struct tm * restrict tm"
-.Sh DESCRIPTION
-The
-.Fn strptime
-function converts the character string pointed to by
-.Fa buf
-to values which are stored in the
-.Va tm
-structure pointed to by
-.Fa tm ,
-using the format specified by
-.Fa format .
-.Pp
-The
-.Fa format
-string consists of zero or more conversion specifications, whitespace
-characters as defined by
-.Fn isspace ,
-and ordinary characters.
-All ordinary characters in
-.Fa format
-are compared directly against the corresponding characters in
-.Fa buf ;
-comparisons which fail will cause
-.Fn strptime
-to fail.
-Whitespace characters in
-.Fa format
-match any number of whitespace characters in
-.Fa buf ,
-including none.
-.Pp
-A conversion specification consists of a percent sign
-.Ql %
-followed by one
-or two conversion characters which specify the replacement required.
-There must be white-space or other non-alphanumeric characters between any
-two conversion specifications.
-.Pp
-Conversion of alphanumeric strings (such as month and weekday names) is
-done without regard to case.
-Conversion specifications which cannot be matched will cause
-.Fn strptime
-to fail.
-.Pp
-The LC_TIME category defines the locale values for the conversion
-specifications.
-The following conversion specifications are supported:
-.Bl -tag -width "xxxx"
-.It Cm \&%a
-the day of week, using the locale's weekday names;
-either the abbreviated or full name may be specified.
-.It Cm \&%A
-the same as
-.Cm \&%a .
-.It Cm \&%b
-the month, using the locale's month names;
-either the abbreviated or full name may be specified.
-.It Cm \&%B
-the same as
-.Cm \&%b .
-.It Cm \&%c
-the date and time, using the locale's date and time format.
-.It Cm \&%C
-the century number [0,99];
-leading zeros are permitted but not required.
-This conversion should be used in conjunction with the \&%y conversion.
-.It Cm \&%d
-the day of month [1,31];
-leading zeros are permitted but not required.
-.It Cm \&%D
-the date as %m/%d/%y.
-.It Cm \&%e
-the same as
-.Cm \&%d .
-.It Cm \&%F
-the date as %Y-%m-%d
-(the ISO 8601 date format).
-.It Cm \&%g
-the year corresponding to the ISO week number, without the century.
-.Po
-A
-.Nx
-extension.
-.Pc
-.It Cm \&%G
-the year corresponding to the ISO week number, with the century.
-.Po
-A
-.Nx
-extension.
-.Pc
-.It Cm \&%h
-the same as
-.Cm \&%b .
-.It Cm \&%H
-the hour (24-hour clock) [0,23];
-leading zeros are permitted but not required.
-.It Cm \&%I
-the hour (12-hour clock) [1,12];
-leading zeros are permitted but not required.
-.It Cm \&%j
-the day number of the year [1,366];
-leading zeros are permitted but not required.
-.It Cm \&%k
-the same as
-.Cm \&%H .
-.It Cm \&%l
-the same as
-.Cm \&%I .
-.It Cm \&%m
-the month number [1,12];
-leading zeros are permitted but not required.
-.It Cm \&%M
-the minute [0,59];
-leading zeros are permitted but not required.
-.It Cm \&%n
-any white-space, including none.
-.It Cm \&%p
-the locale's equivalent of a.m. or p.m.
-.It Cm \&%r
-the time (12-hour clock) with %p, using the locale's time format.
-.It Cm \&%R
-the time as %H:%M.
-.It Cm \&%S
-the seconds [0,61];
-leading zeros are permitted but not required.
-.It Cm \&%s
-the number of seconds since the Epoch, UTC (see
-.Xr mktime 3 ) .
-.Po
-A
-.Nx
-extension.
-.Pc
-.It Cm \&%t
-any white-space, including none.
-.It Cm \&%T
-the time as %H:%M:%S.
-.It Cm \&%u
-the day of the week as a decimal number, where Monday = 1.
-.Po
-A
-.Nx
-extension.
-.Pc
-.It Cm \&%U
-the week number of the year (Sunday as the first day of the week)
-as a decimal number [0,53];
-leading zeros are permitted but not required.
-All days in a year preceding the first Sunday are considered to be in week 0.
-.It Cm \&%V
-the ISO 8601:1988 week number as a decimal number.
-If the week (starting on Monday) that contains January 1 has more than
-three days in the new year, then it is considered the first week of the
-year.
-If it has fewer than four days in the new year, then it is considered
-the last week of the previous year.
-Weeks are numbered from 1 to 53.
-.Po
-A
-.Nx
-extension.
-.Pc
-.It Cm \&%w
-the weekday as a decimal number [0,6], with 0 representing Sunday;
-leading zeros are permitted but not required.
-.It Cm \&%W
-the week number of the year (Monday as the first day of the week)
-as a decimal number [0,53];
-leading zeros are permitted but not required.
-All days in a year preceding the first Monday are considered to be in week 0.
-.It Cm \&%x
-the date, using the locale's date format.
-.It Cm \&%X
-the time, using the locale's time format.
-.It Cm \&%y
-the year within the 20th century [69,99] or the 21st century [0,68];
-leading zeros are permitted but not required.
-If specified in conjunction
-with \&%C, specifies the year [0,99] within that century.
-.It Cm \&%Y
-the year, including the century (i.e., 1996).
-.It Cm \&%z
-an ISO 8601 or RFC-2822 time zone specification.
-This is one of the following:
-the offset from
-Coordinated Universal Time
-.Pq Ql UTC
-specified as:
-.Dq [+-]hhmm ,
-.Dq [+-]hh:mm ,
-or
-.Dq [+-]hh ;
-.Ql UTC
-specified as:
-.Dq GMT
-.Pq Ql Greenwich Mean Time ,
-.Dq UT
-.Pq Ql Universal Time ,
-or
-.Dq Z
-.Pq Ql Zulu Time ;
-a three character US time zone specified as:
-.Dq EDT ,
-.Dq EST ,
-.Dq CDT ,
-.Dq CST ,
-.Dq MDT ,
-.Dq MST ,
-.Dq PDT ,
-or
-.Dq PST ,
-with the first letter standing for
-.Ql Eastern
-.Pq Dq E ,
-.Ql Central
-.Pq Dq C ,
-.Ql Mountain
-.Pq Dq M
-or
-.Ql Pacific
-.Pq Dq P ,
-and the second letter standing for
-.Ql Daylight
-.Po
-.Dq D
-or summer
-.Pc
-time
-or
-.Ql Standard
-.Pq Dq S
-time;
-a single letter military time zone specified as:
-.Dq A
-through
-.Dq I
-and
-.Dq K
-through
-.Dq Y .
-.Po
-A
-.Nx
-extension.
-.Pc
-.It Cm \&%Z
-time zone name or no characters when time zone information is unavailable.
-.Po
-A
-.Nx
-extension.
-.Pc
-.It Cm \&%%
-matches a literal `%'.
-No argument is converted.
-.El
-.Ss Modified conversion specifications
-For compatibility, certain conversion specifications can be modified
-by the
-.Cm E
-and
-.Cm O
-modifier characters to indicate that an alternative format or specification
-should be used rather than the one normally used by the unmodified
-conversion specification.
-As there are currently neither alternative formats
-nor specifications supported by the system, the behavior will be as if the
-unmodified conversion specification were used.
-.Pp
-Case is ignored when matching string items in
-.Fa buf ,
-such as month and weekday names.
-.Sh RETURN VALUES
-If successful, the
-.Fn strptime
-function returns a pointer to the character following the last character
-parsed.
-Otherwise, a
-.Dv NULL
-pointer is returned.
-.Sh SEE ALSO
-.Xr ctime 3 ,
-.Xr isspace 3 ,
-.Xr localtime 3 ,
-.Xr strftime 3 ,
-.Xr tm 3
-.Sh STANDARDS
-The
-.Fn strptime
-function conforms to
-.St -xpg4 .
-.Sh BUGS
-The
-.Cm \&%Z
-format specifier only accepts time zone
-abbreviations of the local time zone,
-or the values
-.Dq GMT
-or
-.Dq UTC .
-This limitation is caused by the ambiguity
-of overloaded time zone abbreviations,
-for example EST is both Eastern Standard
-Time and Eastern Australia Summer Time.
diff --git a/lib/libc/time/strptime.c b/lib/libc/time/strptime.c
deleted file mode 100644
index 51cbc9121..000000000
--- a/lib/libc/time/strptime.c
+++ /dev/null
@@ -1,710 +0,0 @@
-/*	$NetBSD: strptime.c,v 1.49 2015/10/09 17:21:45 christos Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code was contributed to The NetBSD Foundation by Klaus Klein.
- * Heavily optimised by David Laight
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strptime.c,v 1.49 2015/10/09 17:21:45 christos Exp $");
-#endif
-
-#include "namespace.h"
-#include <sys/localedef.h>
-#include <sys/types.h>
-#include <ctype.h>
-#include <locale.h>
-#include <string.h>
-#include <time.h>
-#include <tzfile.h>
-#include "private.h"
-#include "setlocale_local.h"
-
-#ifdef __weak_alias
-__weak_alias(strptime,_strptime)
-__weak_alias(strptime_l, _strptime_l)
-#endif
-
-static const u_char *conv_num(const unsigned char *, int *, uint, uint);
-static const u_char *find_string(const u_char *, int *, const char * const *,
-	const char * const *, int);
-
-#define _TIME_LOCALE(loc) \
-    ((_TimeLocale *)((loc)->part_impl[(size_t)LC_TIME]))
-
-/*
- * We do not implement alternate representations. However, we always
- * check whether a given modifier is allowed for a certain conversion.
- */
-#define ALT_E			0x01
-#define ALT_O			0x02
-#define LEGAL_ALT(x)		{ if (alt_format & ~(x)) return NULL; }
-
-#define S_YEAR			(1 << 0)
-#define S_MON			(1 << 1)
-#define S_YDAY			(1 << 2)
-#define S_MDAY			(1 << 3)
-#define S_WDAY			(1 << 4)
-#define S_HOUR			(1 << 5)
-
-#define HAVE_MDAY(s)		(s & S_MDAY)
-#define HAVE_MON(s)		(s & S_MON)
-#define HAVE_WDAY(s)		(s & S_WDAY)
-#define HAVE_YDAY(s)		(s & S_YDAY)
-#define HAVE_YEAR(s)		(s & S_YEAR)
-#define HAVE_HOUR(s)		(s & S_HOUR)
-
-static char gmt[] = { "GMT" };
-static char utc[] = { "UTC" };
-/* RFC-822/RFC-2822 */
-static const char * const nast[5] = {
-       "EST",    "CST",    "MST",    "PST",    "\0\0\0"
-};
-static const char * const nadt[5] = {
-       "EDT",    "CDT",    "MDT",    "PDT",    "\0\0\0"
-};
-
-/*
- * Table to determine the ordinal date for the start of a month.
- * Ref: http://en.wikipedia.org/wiki/ISO_week_date
- */
-static const int start_of_month[2][13] = {
-	/* non-leap year */
-	{ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
-	/* leap year */
-	{ 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
-};
-
-/*
- * Calculate the week day of the first day of a year. Valid for
- * the Gregorian calendar, which began Sept 14, 1752 in the UK
- * and its colonies. Ref:
- * http://en.wikipedia.org/wiki/Determination_of_the_day_of_the_week
- */
-
-static int
-first_wday_of(int yr)
-{
-	return ((2 * (3 - (yr / 100) % 4)) + (yr % 100) + ((yr % 100) /  4) +
-	    (isleap(yr) ? 6 : 0) + 1) % 7;
-}
-
-char *
-strptime(const char *buf, const char *fmt, struct tm *tm)
-{
-	return strptime_l(buf, fmt, tm, _current_locale());
-}
-
-char *
-strptime_l(const char *buf, const char *fmt, struct tm *tm, locale_t loc)
-{
-	unsigned char c;
-	const unsigned char *bp, *ep;
-	int alt_format, i, split_year = 0, neg = 0, state = 0,
-	    day_offset = -1, week_offset = 0, offs;
-	const char *new_fmt;
-
-	bp = (const u_char *)buf;
-
-	while (bp != NULL && (c = *fmt++) != '\0') {
-		/* Clear `alternate' modifier prior to new conversion. */
-		alt_format = 0;
-		i = 0;
-
-		/* Eat up white-space. */
-		if (isspace(c)) {
-			while (isspace(*bp))
-				bp++;
-			continue;
-		}
-
-		if (c != '%')
-			goto literal;
-
-
-again:		switch (c = *fmt++) {
-		case '%':	/* "%%" is converted to "%". */
-literal:
-			if (c != *bp++)
-				return NULL;
-			LEGAL_ALT(0);
-			continue;
-
-		/*
-		 * "Alternative" modifiers. Just set the appropriate flag
-		 * and start over again.
-		 */
-		case 'E':	/* "%E?" alternative conversion modifier. */
-			LEGAL_ALT(0);
-			alt_format |= ALT_E;
-			goto again;
-
-		case 'O':	/* "%O?" alternative conversion modifier. */
-			LEGAL_ALT(0);
-			alt_format |= ALT_O;
-			goto again;
-
-		/*
-		 * "Complex" conversion rules, implemented through recursion.
-		 */
-		case 'c':	/* Date and time, using the locale's format. */
-			new_fmt = _TIME_LOCALE(loc)->d_t_fmt;
-			state |= S_WDAY | S_MON | S_MDAY | S_YEAR;
-			goto recurse;
-
-		case 'D':	/* The date as "%m/%d/%y". */
-			new_fmt = "%m/%d/%y";
-			LEGAL_ALT(0);
-			state |= S_MON | S_MDAY | S_YEAR;
-			goto recurse;
-
-		case 'F':	/* The date as "%Y-%m-%d". */
-			new_fmt = "%Y-%m-%d";
-			LEGAL_ALT(0);
-			state |= S_MON | S_MDAY | S_YEAR;
-			goto recurse;
-
-		case 'R':	/* The time as "%H:%M". */
-			new_fmt = "%H:%M";
-			LEGAL_ALT(0);
-			goto recurse;
-
-		case 'r':	/* The time in 12-hour clock representation. */
-			new_fmt = _TIME_LOCALE(loc)->t_fmt_ampm;
-			LEGAL_ALT(0);
-			goto recurse;
-
-		case 'T':	/* The time as "%H:%M:%S". */
-			new_fmt = "%H:%M:%S";
-			LEGAL_ALT(0);
-			goto recurse;
-
-		case 'X':	/* The time, using the locale's format. */
-			new_fmt = _TIME_LOCALE(loc)->t_fmt;
-			goto recurse;
-
-		case 'x':	/* The date, using the locale's format. */
-			new_fmt = _TIME_LOCALE(loc)->d_fmt;
-			state |= S_MON | S_MDAY | S_YEAR;
-		    recurse:
-			bp = (const u_char *)strptime((const char *)bp,
-							    new_fmt, tm);
-			LEGAL_ALT(ALT_E);
-			continue;
-
-		/*
-		 * "Elementary" conversion rules.
-		 */
-		case 'A':	/* The day of week, using the locale's form. */
-		case 'a':
-			bp = find_string(bp, &tm->tm_wday,
-			    _TIME_LOCALE(loc)->day, _TIME_LOCALE(loc)->abday, 7);
-			LEGAL_ALT(0);
-			state |= S_WDAY;
-			continue;
-
-		case 'B':	/* The month, using the locale's form. */
-		case 'b':
-		case 'h':
-			bp = find_string(bp, &tm->tm_mon,
-			    _TIME_LOCALE(loc)->mon, _TIME_LOCALE(loc)->abmon,
-			    12);
-			LEGAL_ALT(0);
-			state |= S_MON;
-			continue;
-
-		case 'C':	/* The century number. */
-			i = 20;
-			bp = conv_num(bp, &i, 0, 99);
-
-			i = i * 100 - TM_YEAR_BASE;
-			if (split_year)
-				i += tm->tm_year % 100;
-			split_year = 1;
-			tm->tm_year = i;
-			LEGAL_ALT(ALT_E);
-			state |= S_YEAR;
-			continue;
-
-		case 'd':	/* The day of month. */
-		case 'e':
-			bp = conv_num(bp, &tm->tm_mday, 1, 31);
-			LEGAL_ALT(ALT_O);
-			state |= S_MDAY;
-			continue;
-
-		case 'k':	/* The hour (24-hour clock representation). */
-			LEGAL_ALT(0);
-			/* FALLTHROUGH */
-		case 'H':
-			bp = conv_num(bp, &tm->tm_hour, 0, 23);
-			LEGAL_ALT(ALT_O);
-			state |= S_HOUR;
-			continue;
-
-		case 'l':	/* The hour (12-hour clock representation). */
-			LEGAL_ALT(0);
-			/* FALLTHROUGH */
-		case 'I':
-			bp = conv_num(bp, &tm->tm_hour, 1, 12);
-			if (tm->tm_hour == 12)
-				tm->tm_hour = 0;
-			LEGAL_ALT(ALT_O);
-			state |= S_HOUR;
-			continue;
-
-		case 'j':	/* The day of year. */
-			i = 1;
-			bp = conv_num(bp, &i, 1, 366);
-			tm->tm_yday = i - 1;
-			LEGAL_ALT(0);
-			state |= S_YDAY;
-			continue;
-
-		case 'M':	/* The minute. */
-			bp = conv_num(bp, &tm->tm_min, 0, 59);
-			LEGAL_ALT(ALT_O);
-			continue;
-
-		case 'm':	/* The month. */
-			i = 1;
-			bp = conv_num(bp, &i, 1, 12);
-			tm->tm_mon = i - 1;
-			LEGAL_ALT(ALT_O);
-			state |= S_MON;
-			continue;
-
-		case 'p':	/* The locale's equivalent of AM/PM. */
-			bp = find_string(bp, &i, _TIME_LOCALE(loc)->am_pm,
-			    NULL, 2);
-			if (HAVE_HOUR(state) && tm->tm_hour > 11)
-				return NULL;
-			tm->tm_hour += i * 12;
-			LEGAL_ALT(0);
-			continue;
-
-		case 'S':	/* The seconds. */
-			bp = conv_num(bp, &tm->tm_sec, 0, 61);
-			LEGAL_ALT(ALT_O);
-			continue;
-
-#ifndef TIME_MAX
-#define TIME_MAX	INT64_MAX
-#endif
-		case 's':	/* seconds since the epoch */
-			{
-				time_t sse = 0;
-				uint64_t rulim = TIME_MAX;
-
-				if (*bp < '0' || *bp > '9') {
-					bp = NULL;
-					continue;
-				}
-
-				do {
-					sse *= 10;
-					sse += *bp++ - '0';
-					rulim /= 10;
-				} while ((sse * 10 <= TIME_MAX) &&
-					 rulim && *bp >= '0' && *bp <= '9');
-
-				if (sse < 0 || (uint64_t)sse > TIME_MAX) {
-					bp = NULL;
-					continue;
-				}
-
-				if (localtime_r(&sse, tm) == NULL)
-					bp = NULL;
-				else
-					state |= S_YDAY | S_WDAY |
-					    S_MON | S_MDAY | S_YEAR;
-			}
-			continue;
-
-		case 'U':	/* The week of year, beginning on sunday. */
-		case 'W':	/* The week of year, beginning on monday. */
-			/*
-			 * XXX This is bogus, as we can not assume any valid
-			 * information present in the tm structure at this
-			 * point to calculate a real value, so just check the
-			 * range for now.
-			 */
-			bp = conv_num(bp, &i, 0, 53);
-			LEGAL_ALT(ALT_O);
-			if (c == 'U')
-				day_offset = TM_SUNDAY;
-			else
-				day_offset = TM_MONDAY;
-			week_offset = i;
-			continue;
-
-		case 'w':	/* The day of week, beginning on sunday. */
-			bp = conv_num(bp, &tm->tm_wday, 0, 6);
-			LEGAL_ALT(ALT_O);
-			state |= S_WDAY;
-			continue;
-
-		case 'u':	/* The day of week, monday = 1. */
-			bp = conv_num(bp, &i, 1, 7);
-			tm->tm_wday = i % 7;
-			LEGAL_ALT(ALT_O);
-			state |= S_WDAY;
-			continue;
-
-		case 'g':	/* The year corresponding to the ISO week
-				 * number but without the century.
-				 */
-			bp = conv_num(bp, &i, 0, 99);
-			continue;
-
-		case 'G':	/* The year corresponding to the ISO week
-				 * number with century.
-				 */
-			do
-				bp++;
-			while (isdigit(*bp));
-			continue;
-
-		case 'V':	/* The ISO 8601:1988 week number as decimal */
-			bp = conv_num(bp, &i, 0, 53);
-			continue;
-
-		case 'Y':	/* The year. */
-			i = TM_YEAR_BASE;	/* just for data sanity... */
-			bp = conv_num(bp, &i, 0, 9999);
-			tm->tm_year = i - TM_YEAR_BASE;
-			LEGAL_ALT(ALT_E);
-			state |= S_YEAR;
-			continue;
-
-		case 'y':	/* The year within 100 years of the epoch. */
-			/* LEGAL_ALT(ALT_E | ALT_O); */
-			bp = conv_num(bp, &i, 0, 99);
-
-			if (split_year)
-				/* preserve century */
-				i += (tm->tm_year / 100) * 100;
-			else {
-				split_year = 1;
-				if (i <= 68)
-					i = i + 2000 - TM_YEAR_BASE;
-				else
-					i = i + 1900 - TM_YEAR_BASE;
-			}
-			tm->tm_year = i;
-			state |= S_YEAR;
-			continue;
-
-		case 'Z':
-			tzset();
-			if (strncmp((const char *)bp, gmt, 3) == 0 ||
-			    strncmp((const char *)bp, utc, 3) == 0) {
-				tm->tm_isdst = 0;
-#ifdef TM_GMTOFF
-				tm->TM_GMTOFF = 0;
-#endif
-#ifdef TM_ZONE
-				tm->TM_ZONE = gmt;
-#endif
-				bp += 3;
-			} else {
-				ep = find_string(bp, &i,
-					       	 (const char * const *)tzname,
-					       	  NULL, 2);
-				if (ep != NULL) {
-					tm->tm_isdst = i;
-#ifdef TM_GMTOFF
-					tm->TM_GMTOFF = -(timezone);
-#endif
-#ifdef TM_ZONE
-					tm->TM_ZONE = tzname[i];
-#endif
-				}
-				bp = ep;
-			}
-			continue;
-
-		case 'z':
-			/*
-			 * We recognize all ISO 8601 formats:
-			 * Z	= Zulu time/UTC
-			 * [+-]hhmm
-			 * [+-]hh:mm
-			 * [+-]hh
-			 * We recognize all RFC-822/RFC-2822 formats:
-			 * UT|GMT
-			 *          North American : UTC offsets
-			 * E[DS]T = Eastern : -4 | -5
-			 * C[DS]T = Central : -5 | -6
-			 * M[DS]T = Mountain: -6 | -7
-			 * P[DS]T = Pacific : -7 | -8
-			 *          Military
-			 * [A-IL-M] = -1 ... -9 (J not used)
-			 * [N-Y]  = +1 ... +12
-			 */
-			while (isspace(*bp))
-				bp++;
-
-			switch (*bp++) {
-			case 'G':
-				if (*bp++ != 'M')
-					return NULL;
-				/*FALLTHROUGH*/
-			case 'U':
-				if (*bp++ != 'T')
-					return NULL;
-				/*FALLTHROUGH*/
-			case 'Z':
-				tm->tm_isdst = 0;
-#ifdef TM_GMTOFF
-				tm->TM_GMTOFF = 0;
-#endif
-#ifdef TM_ZONE
-				tm->TM_ZONE = utc;
-#endif
-				continue;
-			case '+':
-				neg = 0;
-				break;
-			case '-':
-				neg = 1;
-				break;
-			default:
-				--bp;
-				ep = find_string(bp, &i, nast, NULL, 4);
-				if (ep != NULL) {
-#ifdef TM_GMTOFF
-					tm->TM_GMTOFF = -5 - i;
-#endif
-#ifdef TM_ZONE
-					tm->TM_ZONE = __UNCONST(nast[i]);
-#endif
-					bp = ep;
-					continue;
-				}
-				ep = find_string(bp, &i, nadt, NULL, 4);
-				if (ep != NULL) {
-					tm->tm_isdst = 1;
-#ifdef TM_GMTOFF
-					tm->TM_GMTOFF = -4 - i;
-#endif
-#ifdef TM_ZONE
-					tm->TM_ZONE = __UNCONST(nadt[i]);
-#endif
-					bp = ep;
-					continue;
-				}
-
-				if ((*bp >= 'A' && *bp <= 'I') ||
-				    (*bp >= 'L' && *bp <= 'Y')) {
-#ifdef TM_GMTOFF
-					/* Argh! No 'J'! */
-					if (*bp >= 'A' && *bp <= 'I')
-						tm->TM_GMTOFF =
-						    ('A' - 1) - (int)*bp;
-					else if (*bp >= 'L' && *bp <= 'M')
-						tm->TM_GMTOFF = 'A' - (int)*bp;
-					else if (*bp >= 'N' && *bp <= 'Y')
-						tm->TM_GMTOFF = (int)*bp - 'M';
-#endif
-#ifdef TM_ZONE
-					tm->TM_ZONE = utc; /* XXX */
-#endif
-					bp++;
-					continue;
-				}
-				return NULL;
-			}
-			offs = 0;
-			for (i = 0; i < 4; ) {
-				if (isdigit(*bp)) {
-					offs = offs * 10 + (*bp++ - '0');
-					i++;
-					continue;
-				}
-				if (i == 2 && *bp == ':') {
-					bp++;
-					continue;
-				}
-				break;
-			}
-			switch (i) {
-			case 2:
-				offs *= 100;
-				break;
-			case 4:
-				i = offs % 100;
-				if (i >= 60)
-					return NULL;
-				/* Convert minutes into decimal */
-				offs = (offs / 100) * 100 + (i * 50) / 30;
-				break;
-			default:
-				return NULL;
-			}
-			if (neg)
-				offs = -offs;
-			tm->tm_isdst = 0;	/* XXX */
-#ifdef TM_GMTOFF
-			tm->TM_GMTOFF = offs;
-#endif
-#ifdef TM_ZONE
-			tm->TM_ZONE = utc;	/* XXX */
-#endif
-			continue;
-
-		/*
-		 * Miscellaneous conversions.
-		 */
-		case 'n':	/* Any kind of white-space. */
-		case 't':
-			while (isspace(*bp))
-				bp++;
-			LEGAL_ALT(0);
-			continue;
-
-
-		default:	/* Unknown/unsupported conversion. */
-			return NULL;
-		}
-	}
-
-	if (!HAVE_YDAY(state) && HAVE_YEAR(state)) {
-		if (HAVE_MON(state) && HAVE_MDAY(state)) {
-			/* calculate day of year (ordinal date) */
-			tm->tm_yday =  start_of_month[isleap_sum(tm->tm_year,
-			    TM_YEAR_BASE)][tm->tm_mon] + (tm->tm_mday - 1);
-			state |= S_YDAY;
-		} else if (day_offset != -1) {
-			/*
-			 * Set the date to the first Sunday (or Monday)
-			 * of the specified week of the year.
-			 */
-			if (!HAVE_WDAY(state)) {
-				tm->tm_wday = day_offset;
-				state |= S_WDAY;
-			}
-			tm->tm_yday = (7 -
-			    first_wday_of(tm->tm_year + TM_YEAR_BASE) +
-			    day_offset) % 7 + (week_offset - 1) * 7 +
-			    tm->tm_wday  - day_offset;
-			state |= S_YDAY;
-		}
-	}
-
-	if (HAVE_YDAY(state) && HAVE_YEAR(state)) {
-		int isleap;
-
-		if (!HAVE_MON(state)) {
-			/* calculate month of day of year */
-			i = 0;
-			isleap = isleap_sum(tm->tm_year, TM_YEAR_BASE);
-			while (tm->tm_yday >= start_of_month[isleap][i])
-				i++;
-			if (i > 12) {
-				i = 1;
-				tm->tm_yday -= start_of_month[isleap][12];
-				tm->tm_year++;
-			}
-			tm->tm_mon = i - 1;
-			state |= S_MON;
-		}
-
-		if (!HAVE_MDAY(state)) {
-			/* calculate day of month */
-			isleap = isleap_sum(tm->tm_year, TM_YEAR_BASE);
-			tm->tm_mday = tm->tm_yday -
-			    start_of_month[isleap][tm->tm_mon] + 1;
-			state |= S_MDAY;
-		}
-
-		if (!HAVE_WDAY(state)) {
-			/* calculate day of week */
-			i = 0;
-			week_offset = first_wday_of(tm->tm_year);
-			while (i++ <= tm->tm_yday) {
-				if (week_offset++ >= 6)
-					week_offset = 0;
-			}
-			tm->tm_wday = week_offset;
-			state |= S_WDAY;
-		}
-	}
-
-	return __UNCONST(bp);
-}
-
-
-static const u_char *
-conv_num(const unsigned char *buf, int *dest, uint llim, uint ulim)
-{
-	uint result = 0;
-	unsigned char ch;
-
-	/* The limit also determines the number of valid digits. */
-	uint rulim = ulim;
-
-	ch = *buf;
-	if (ch < '0' || ch > '9')
-		return NULL;
-
-	do {
-		result *= 10;
-		result += ch - '0';
-		rulim /= 10;
-		ch = *++buf;
-	} while ((result * 10 <= ulim) && rulim && ch >= '0' && ch <= '9');
-
-	if (result < llim || result > ulim)
-		return NULL;
-
-	*dest = result;
-	return buf;
-}
-
-static const u_char *
-find_string(const u_char *bp, int *tgt, const char * const *n1,
-		const char * const *n2, int c)
-{
-	int i;
-	size_t len;
-
-	/* check full name - then abbreviated ones */
-	for (; n1 != NULL; n1 = n2, n2 = NULL) {
-		for (i = 0; i < c; i++, n1++) {
-			len = strlen(*n1);
-			if (strncasecmp(*n1, (const char *)bp, len) == 0) {
-				*tgt = i;
-				return bp + len;
-			}
-		}
-	}
-
-	/* Nothing matched */
-	return NULL;
-}
diff --git a/lib/libc/time/time2posix.3 b/lib/libc/time/time2posix.3
deleted file mode 100644
index f404d4418..000000000
--- a/lib/libc/time/time2posix.3
+++ /dev/null
@@ -1,154 +0,0 @@
-.\"	$NetBSD: time2posix.3,v 1.19 2014/10/07 21:51:03 christos Exp $
-.Dd October 6, 2014
-.Dt TIME2POSIX 3
-.Os
-.Sh NAME
-.Nm time2posix ,
-.Nm time2posix_z ,
-.Nm posix2time ,
-.Nm posix2time_z ,
-.Nd convert seconds since the Epoch
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft time_t
-.Fn time2posix "time_t t"
-.Ft time_t
-.Fn time2posix_z "const timezone_t tz" "time_t t"
-.Ft time_t
-.Fn posix2time "time_t t"
-.Ft time_t
-.Fn posix2time_z "const timezone_t tz" "time_t t"
-.Sh DESCRIPTION
-.St -p1003.1
-requires the
-.Ft time_t
-value of
-.Dv 536457599
-to stand for
-.Dl Wed Dec 31 23:59:59 UTC 1986 .
-This effectively implies that POSIX
-.Ft time_t
-values cannot include leap seconds and, therefore,
-that the system time must be adjusted as each leap occurs.
-.Pp
-If the time package is configured with leap-second support
-enabled, however, no such adjustment is needed and
-.Va time_t
-values continue to increase over leap events
-(as a true 
-.Dq "seconds since..."
-value).
-This means that these values will differ from those required by POSIX
-by the net number of leap seconds inserted since the Epoch.
-.Pp
-Typically this is not a problem as the type
-.Va time_t
-is intended to be (mostly)
-opaque \*(en
-.Va time_t
-values should only be obtained-from and
-passed-to functions such as
-.Xr time 3 ,
-.Xr localtime 3 ,
-.Xr localtime_r 3 ,
-.Xr localtime_rz 3 ,
-.Xr mktime 3 ,
-.Xr mktime_z 3 ,
-and
-.Xr difftime 3 .
-However, POSIX gives an arithmetic expression for directly computing a
-.Va time_t
-value from a given date/time, and the same relationship is assumed by
-some (usually older) applications.
-Any programs creating/dissecting
-.Va time_t Ns 's
-using such a relationship will typically not handle intervals over
-leap seconds correctly.
-.Pp
-The
-.Fn time2posix ,
-.Fn time2posix_z ,
-.Fn posix2time ,
-and
-.Fn posix2time_z
-functions are provided to address this
-.Va time_t
-mismatch by converting between local
-.Va time_t
-values and their POSIX equivalents.
-This is done by accounting for the number of time-base changes that would
-have taken place on a POSIX system as leap seconds were inserted or deleted.
-These converted values can then be used in lieu of correcting the
-older applications, or when communicating with POSIX-compliant systems.
-.Pp
-.Fn time2posix
-and
-.Fn time2posix_z
-are single-valued.
-That is, every local
-.Va time_t
-corresponds to a single POSIX
-.Va time_t .
-.Fn posix2time
-and
-.Fn posix2time
-are less well-behaved: for a positive leap second hit the result is not
-unique, and for a negative leap second hit the corresponding POSIX
-.Va time_t
-doesn't exist so an adjacent value is returned.
-Both of these are good indicators of the inferiority of the POSIX
-representation.
-.Pp
-The
-.Dq z
-variants of the two functions behave exactly like their counterparts,
-but they operate in the given
-.Fa tz
-argument which was previously allocated using
-.Xr tzalloc 3
-and are re-entrant.
-.Pp
-The following table summarizes the relationship between a
-.Va time_t
-and its conversion to, and back from, the POSIX representation over
-the leap second inserted at the end of June, 1993.
-.Bl -column "93/06/30" "23:59:59" "A+0" "X=time2posix(T)" "posix2time(X)" -offset indent
-.It Sy DATE	TIME	T	X=time2posix(T)	posix2time(X)
-.It 93/06/30	23:59:59	A+0	B+0	A+0
-.It 93/06/30	23:59:60	A+1	B+1	A+1 or A+2
-.It 93/07/01	00:00:00	A+2	B+1	A+1 or A+2
-.It 93/07/01	00:00:01	A+3	B+2	A+3
-.El
-.Pp
-A leap second deletion would look like...
-.Bl -column "??/06/30" "23:59:58" "A+0" "X=time2posix(T)" "posix2time(X)" -offset indent
-.It Sy DATE	TIME	T	X=time2posix(T)	posix2time(X)
-.It ??/06/30	23:59:58	A+0	B+0	A+0
-.It ??/07/01	00:00:00	A+1	B+2	A+1
-.It ??/07/01	00:00:01	A+2	B+3	A+2
-.El
-[Note: posix2time(B+1) =\*[Gt] A+0 or A+1]
-.Pp
-If leap-second support is not enabled, local
-.Va time_t Ns 's
-and POSIX
-.Va time_t Ns 's
-are equivalent, and both
-.Fn time2posix
-and
-.Fn posix2time
-degenerate to the identity function.
-.Sh SEE ALSO
-.Xr difftime 3 ,
-.Xr localtime 3 ,
-.Xr localtime_r 3 ,
-.Xr localtime_rz 3 ,
-.Xr mktime 3 ,
-.Xr mktime_z 3 ,
-.Xr time 3 ,
-.Xr tzalloc 3
-.\" @(#)time2posix.3	7.7
-.\" This file is in the public domain, so clarified as of
-.\" 1996-06-05 by Arthur David Olson.
diff --git a/lib/libc/time/tz-art.htm b/lib/libc/time/tz-art.htm
deleted file mode 100644
index 86f381e75..000000000
--- a/lib/libc/time/tz-art.htm
+++ /dev/null
@@ -1,513 +0,0 @@
-<!DOCTYPE html
-PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<meta http-equiv="Content-type" content='text/html; charset="UTF-8"'>
-<title>Time and the Arts</title>
-</head>
-<body>
-<h1>Time and the Arts</h1>
-<p>
-This file is in the public domain, so clarified as of
-2009-05-17 by Arthur David Olson.
-</p>
-<p>
-Please send corrections to this web page to the
-<a href="mailto:tz@iana.org">time zone mailing list</a>.</p>
-<p>
-See also <a href="tz-link.htm">Sources for Time Zone and Daylight Saving Time Data</a>.</p>
-<hr>
-<p>
-Data on recordings of "Save That Time," Russ Long, Serrob Publishing, BMI:</p>
-<table>
-<tr><td>Artist</td><td>Karrin Allyson</td></tr>
-<tr><td>CD</td><td>I Didn't Know About You</td></tr>
-<tr><td>Copyright Date</td><td>1993</td></tr>
-<tr><td>Label</td><td>Concord Jazz, Inc.</td></tr>
-<tr><td>ID</td><td>CCD-4543</td></tr>
-<tr><td>Track Time</td><td>3:44</td></tr>
-<tr><td>Personnel</td><td>Karrin Allyson, vocal;
-Russ Long, piano;
-Gerald Spaits, bass;
-Todd Strait, drums</td></tr>
-<tr><td>Notes</td><td>CD notes "additional lyric by Karrin Allyson;
-arranged by Russ Long and Karrin Allyson"</td></tr>
-<tr><td>ADO Rating</td><td>1 star</td></tr>
-<tr><td><a href="http://www.allmusic.com/album/i-didnt-know-about-you-mw0000618657">AMG Rating</a></td><td>4 stars</td></tr>
-<tr><td>Penguin Rating</td><td>3.5 stars</td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td>Artist</td><td>Kevin Mahogany</td></tr>
-<tr><td>CD</td><td>Double Rainbow</td></tr>
-<tr><td>Copyright Date</td><td>1993</td></tr>
-<tr><td>Label</td><td>Enja Records</td></tr>
-<tr><td>ID</td><td>ENJ-7097 2</td></tr>
-<tr><td>Track Time</td><td>6:27</td></tr>
-<tr><td>Personnel</td><td>Kevin Mahogany, vocal;
-Kenny Barron, piano;
-Ray Drummond, bass;
-Ralph Moore, tenor saxophone;
-Lewis Nash, drums</td></tr>
-<tr><td>ADO Rating</td><td>1.5 stars</td></tr>
-<tr><td><a href="http://www.allmusic.com/album/double-rainbow-mw0000620371">AMG Rating</a></td><td>3 stars</td></tr>
-<tr><td>Penguin Rating</td><td>3 stars</td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td>Artist</td><td>Joe Williams</td></tr>
-<tr><td>CD</td><td>Here's to Life</td></tr>
-<tr><td>Copyright Date</td><td>1994</td></tr>
-<tr><td>Label</td><td>Telarc International Corporation</td></tr>
-<tr><td>ID</td><td>CD-83357</td></tr>
-<tr><td>Track Time</td><td>3:58</td></tr>
-<tr><td>Personnel</td><td>Joe Williams, vocal
-The Robert Farnon [39 piece] Orchestra</td></tr>
-<tr><td>Notes</td><td>This CD is also available as part of a 3-CD package from
-Telarc, "Triple Play" (CD-83461)</td></tr>
-<tr><td>ADO Rating</td><td>black dot</td></tr>
-<tr><td><a href="http://www.allmusic.com/album/heres-to-life-mw0000623648">AMG Rating</a></td><td>2 stars</td></tr>
-<tr><td>Penguin Rating</td><td>3 stars</td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td>Artist</td><td>Charles Fambrough</td></tr>
-<tr><td>CD</td><td>Keeper of the Spirit</td></tr>
-<tr><td>Copyright Date</td><td>1995</td></tr>
-<tr><td>Label</td><td>AudioQuest Music</td></tr>
-<tr><td>ID</td><td>AQ-CD1033</td></tr>
-<tr><td>Track Time</td><td>7:07</td></tr>
-<tr><td>Personnel</td><td>Charles Fambrough, bass;
-Joel Levine, tenor recorder;
-Edward Simon, piano;
-Lenny White, drums;
-Marion Simon, percussion</td></tr>
-<tr><td>ADO Rating</td><td>2 stars</td></tr>
-<tr><td><a href="http://www.allmusic.com/album/keeper-of-the-spirit-mw0000176559">AMG Rating</a></td><td>unrated</td></tr>
-<tr><td>Penguin Rating</td><td>3 stars</td></tr>
-</table>
-<hr>
-<p>Also of note:</p>
-<table>
-<tr><td>Artist</td><td>Holly Cole Trio</td></tr>
-<tr><td>CD</td><td>Blame It On My Youth</td></tr>
-<tr><td>Copyright Date</td><td>1992</td></tr>
-<tr><td>Label</td><td>Manhattan</td></tr>
-<tr><td>ID</td><td>CDP 7 97349 2</td></tr>
-<tr><td>Total Time</td><td>37:45</td></tr>
-<tr><td>Personnel</td><td>Holly Cole, voice;
-Aaron Davis, piano;
-David Piltch, string bass</td></tr>
-<tr><td>Notes</td><td>Lyrical reference to "Eastern Standard Time" in
-Tom Waits' "Purple Avenue"</td></tr>
-<tr><td>ADO Rating</td><td>2.5 stars</td></tr>
-<tr><td><a href="http://www.allmusic.com/album/blame-it-on-my-youth-mw0000274303">AMG Rating</a></td><td>3 stars</td></tr>
-<tr><td>Penguin Rating</td><td>unrated</td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td>Artist</td><td>Milt Hinton</td></tr>
-<tr><td>CD</td><td>Old Man Time</td></tr>
-<tr><td>Copyright Date</td><td>1990</td></tr>
-<tr><td>Label</td><td>Chiaroscuro</td></tr>
-<tr><td>ID</td><td>CR(D) 310</td></tr>
-<tr><td>Total Time</td><td>149:38 (two CDs)</td></tr>
-<tr><td>Personnel</td><td>Milt Hinton, bass;
-Doc Cheatham, Dizzy Gillespie, Clark Terry, trumpet;
-Al Grey, trombone;
-Eddie Barefield, Joe Camel (Flip Phillips), Buddy Tate,
-clarinet and saxophone;
-John Bunch, Red Richards, Norman Simmons, Derek Smith,
-Ralph Sutton, piano;
-Danny Barker, Al Casey, guitar;
-Gus Johnson, Gerryck King, Bob Rosengarden, Jackie Williams,
-drums;
-Lionel Hampton, vibraphone;
-Cab Calloway, Joe Williams, vocal;
-Buck Clayton, arrangements</td></tr>
-<tr><td>Notes</td><td>tunes include Old Man Time, Time After Time,
-Sometimes I'm Happy,
-A Hot Time in the Old Town Tonight,
-Four or Five Times, Now's the Time,
-Time on My Hands, This Time It's Us,
-and Good Time Charlie.
-<a href="http://www.chiaroscurojazz.com/album.php?C=310">Album info</a>
-is available.</td></tr>
-<tr><td>ADO Rating</td><td>3 stars</td></tr>
-<tr><td><a href="http://www.allmusic.com/album/old-man-time-mw0000269353">AMG Rating</a></td><td>4.5 stars</td></tr>
-<tr><td>Penguin Rating</td><td>3 stars</td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td>Artist</td><td>Alan Broadbent</td></tr>
-<tr><td>CD</td><td>Pacific Standard Time</td></tr>
-<tr><td>Copyright Date</td><td>1995</td></tr>
-<tr><td>Label</td><td>Concord Jazz, Inc.</td></tr>
-<tr><td>ID</td><td>CCD-4664</td></tr>
-<tr><td>Total Time</td><td>62:42</td></tr>
-<tr><td>Personnel</td><td>Alan Broadbent, piano;
-Putter Smith, Bass;
-Frank Gibson, Jr., drums</td></tr>
-<tr><td>Notes</td><td>The CD cover features an analemma for equation-of-time fans</td></tr>
-<tr><td>ADO Rating</td><td>1 star</td></tr>
-<tr><td><a href="http://www.allmusic.com/album/pacific-standard-time-mw0000645433">AMG Rating</a></td><td>4 stars</td></tr>
-<tr><td>Penguin Rating</td><td>3.5 stars</td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td>Artist</td><td>Anthony Braxton/Richard Teitelbaum</td></tr>
-<tr><td>CD</td><td>Silence/Time Zones</td></tr>
-<tr><td>Copyright Date</td><td>1996</td></tr>
-<tr><td>Label</td><td>Black Lion</td></tr>
-<tr><td>ID</td><td>BLCD 760221</td></tr>
-<tr><td>Total Time</td><td>72:58</td></tr>
-<tr><td>Personnel</td><td>Anthony Braxton, sopranino and alto saxophones,
-contrebasse clarinet, miscellaneous instruments;
-Leo Smith, trumpet and miscellaneous instruments;
-Leroy Jenkins, violin and miscellaneous instruments;
-Richard Teitelbaum, modular moog and micromoog synthesizer</td></tr>
-<tr><td>ADO Rating</td><td>black dot</td></tr>
-<tr><td><a href="http://www.allmusic.com/album/silence-time-zones-mw0000595735">AMG Rating</a></td><td>4 stars</td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td>Artist</td><td>Charles Gayle</td></tr>
-<tr><td>CD</td><td>Time Zones</td></tr>
-<tr><td>Copyright Date</td><td>2006</td></tr>
-<tr><td>Label</td><td>Tompkins Square</td></tr>
-<tr><td>ID</td><td>TSQ2839</td></tr>
-<tr><td>Total Time</td><td>49:06</td></tr>
-<tr><td>Personnel</td><td>Charles Gayle, piano</td></tr>
-<tr><td>ADO Rating</td><td>1 star</td></tr>
-<tr><td><a href="http://www.allmusic.com/album/time-zones-mw0000349642">AMG Rating</a></td><td>4.5 stars</td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td>Artist</td><td>The Get Up Kids</td></tr>
-<tr><td>CD</td><td>Eudora</td></tr>
-<tr><td>Copyright Date</td><td>2001</td></tr>
-<tr><td>Label</td><td>Vagrant</td></tr>
-<tr><td>ID</td><td>357</td></tr>
-<tr><td>Total Time</td><td>65:12</td></tr>
-<tr><td>Notes</td><td>Includes the song "Central Standard Time." Thanks to Colin Bowern for this information.</td></tr>
-<tr><td><a href="http://www.allmusic.com/album/eudora-mw0000592063">AMG Rating</a></td><td>2.5 stars</td></tr>
-<tr><td>&nbsp;</td></tr>
-
-<tr><td>Artist</td><td>Coldplay</td></tr>
-<tr><td>Song</td><td>Clocks</td></tr>
-<tr><td>Copyright Date</td><td>2003</td></tr>
-<tr><td>Label</td><td>Capitol Records</td></tr>
-<tr><td>ID</td><td>52608</td></tr>
-<tr><td>Total Time</td><td>4:13</td></tr>
-<tr><td>Notes</td><td>Won the 2004 Record of the Year honor at the
-Grammy Awards. Co-written and performed by Chris Martin,
-great-great-grandson of DST inventor William Willett. The song's first
-line is "Lights go out and I can't be saved".</td></tr>
-<tr><td>&nbsp;</td></tr>
-
-<tr><td>Artist</td><td>Irving Kahal and Harry Richman</td></tr>
-<tr><td>Song</td><td>There Ought to be a Moonlight Saving Time</td></tr>
-<tr><td>Copyright Date</td><td>1931</td>
-<tr><td>Notes</td><td>This musical standard was a No. 1 hit for Guy Lombardo
-in 1931, and was also performed by Maurice Chevalier, Blossom Dearie
-and many others. The phrase "Moonlight saving time" also appears in
-the 1995 country song "Not Enough Hours in the Night" written by Aaron
-Barker, Kim Williams and Rob Harbin and performed by Doug
-Supernaw.</td></tr>
-<tr><td>&nbsp;</td></tr>
-
-<tr><td>Artist</td><td>The Microscopic Septet</td></tr>
-<tr><td>CD</td><td>Lobster Leaps In</td></tr>
-<tr><td>Copyright Date</td><td>2008</td></tr>
-<tr><td>Label</td><td>Cuneiform</td></tr>
-<tr><td>ID</td><td>272</td></tr>
-<tr><td>Total Time</td><td>73:05</td></tr>
-<tr><td>Notes</td><td>Includes the song "Twilight Time Zone."</td></tr>
-<tr><td><a href="http://www.allmusic.com/album/lobster-leaps-in-mw0000794929">AMG Rating</a></td><td>3.5 stars</td></tr>
-<tr><td>ADO Rating</td><td>2 stars</td></tr>
-
-<tr><td>&nbsp;</td></tr>
-
-<tr><td>Artist</td><td>Bob Dylan</td></tr>
-<tr><td>CD</td><td>The Times They Are a-Changin'</td></tr>
-<tr><td>Copyright Date</td><td>1964</td></tr>
-<tr><td>Label</td><td>Columbia</td></tr>
-<tr><td>ID</td><td>CK-8905</td></tr>
-<tr><td>Total Time</td><td>45:36</td></tr>
-<tr><td><a href="http://www.allmusic.com/album/the-times-they-a-changin-mw0000202344">AMG Rating</a></td><td>4.5 stars</td></tr>
-<tr><td>ADO Rating</td><td>1.5 stars</td></tr>
-<tr><td>Notes<td>The title song is also available on "Bob Dylan's Greatest Hits" and "The Essential Bob Dylan."</td></tr>
-<tr><td>&nbsp;</td></tr>
- 
-<tr><td>Artist</td><td>Luciana Souza</td></tr>
-<tr><td>CD</td><td>Tide</td></tr>
-<tr><td>Copyright Date</td><td>2009</td></tr>
-<tr><td>Label</td><td>Universal Jazz France</td></tr>
-<tr><td>ID</td><td>B0012688-02</td></tr>
-<tr><td>Total Time</td><td>42:31</td></tr>
-<tr><td><a href="http://www.allmusic.com/album/tide-mw0000815692">AMG Rating</a></td><td>3.5 stars</td></tr>
-<tr><td>ADO Rating</td><td>2.5 stars</td></tr>
-<tr><td>Notes<td>Includes the song "Fire and Wood" with the lyric
-"The clocks were turned back you remember/Think it's still November."
-</td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td>Artist</td><td>Ken Nordine</td></tr>
-<tr><td>CD</td><td>You're Getting Better: The Word Jazz Dot Masters</td></tr>
-<tr><td>Copyright Date</td><td>2005</td></tr>
-<tr><td>Label</td><td>Geffen</td></tr>
-<tr><td>ID</td><td>B0005171-02</td></tr>
-<tr><td>Total Time</td><td>156:22</td></tr>
-<tr><td>ADO Rating</td><td>1 star</td></tr>
-<tr><td><a href="http://www.allmusic.com/album/youre-getting-better-the-word-jazz-dot-masters-mw0000736197">AMG Rating</a></td><td>4.5 stars</td></tr>
-<tr><td>Notes</td><td>Includes the piece "What Time Is It"
-("He knew what time it was everywhere...that counted").</td></tr>
-<tr><td>&nbsp;</td></tr>
-
-<tr><td>TV episode title</td><td>The Lost Hour</td>
-<tr><td>TV series</td><td><em>Eerie, Indiana</em></td>
-<tr><td>TV episode number</td><td>10</td>
-<tr><td>Network</td><td>NBC</td>
-<tr><td>Air date</td><td>1991-12-01</td>
-<tr><td>Notes</td><td>Despite Indiana's then-lack of DST, Marshall changes his clock with unusual consequences.</td></tr>
-<tr><td>&nbsp;</td></tr>
-
-<tr><td>TV episode title</td><td>Time Tunnel</td>
-<tr><td>TV series</td><td><em>The Adventures of Pete &amp; Pete</em></td>
-<tr><td>TV episode number</td><td>5, season 2</td>
-<tr><td>Network</td><td>Nickelodeon</td>
-<tr><td>Air date</td><td>1994-10-23</td>
-<tr><td>Notes</td><td>The two Petes travel back in time an hour on the day that DST ends.</td></tr>
-<tr><td>&nbsp;</td></tr>
-
-<tr><td>TV episode title</td><td>King-Size Homer</td>
-<tr><td>TV series</td><td><em>The Simpsons</em></td>
-<tr><td>TV episode number</td><td>135</td>
-<tr><td>Network</td><td>Fox</td>
-<tr><td>Air date</td><td>1995-11-05</td>
-<tr><td>Notes</td><td>Homer, working from home, remarks "8:58, first
-time I've ever been early for work. Except for all those daylight
-savings days. Lousy farmers."</td></tr>
-<tr><td>&nbsp;</td></tr>
-
-<tr><td>Artist</td><td>Jules Verne</td></tr>
-<tr><td>Book</td><td><em>Around the World in Eighty Days</em>
-(<em>Le tour du monde en quatre-vingts jours</em>)</td></tr>
-<tr><td>Notes</td><td>Wall-clock time plays a central role in the plot.
-European readers of the 1870s clearly held the U.S. press in
-deep contempt; the protagonists cross the U.S. without once
-reading a paper.
-An on-line French-language version of the book
-"with illustrations from the original 1873 French-language edition"
-is available at
-<a href="http://fourmilab.ch/etexts/www/tdm80j">http://fourmilab.ch/etexts/www/tdm80j</a>
-An on-line English-language translation of the book is available at
-<a href="http://www.literature.org/Works/Jules-Verne/eighty">http://www.literature.org/Works/Jules-Verne/eighty</a></td></tr>
-
-<tr><td>&nbsp;</td></tr>
-<tr><td>Artist</td><td>Nick Enright</td></tr>
-<tr><td>Play</td><td><em>Daylight Saving</em></td></tr>
-<tr><td>Copyright Date</td><td>1989</td></tr>
-<tr><td>Notes</td><td>
-A fast-paced comedy about love and loneliness as the clocks turn back.
-</td></tr>
-
-<tr><td>&nbsp;</td></tr>
-<tr><td>Artist</td><td>Umberto Eco</td></tr>
-<tr><td>Book</td><td><em>The Island of the Day Before</em>
-(<em>L'isola del giorno prima</em>)</td></tr>
-<tr><td>Copyright Date</td><td>1994</td></tr>
-<tr><td>Notes</td><td>
-"...the story of a 17th century Italian nobleman trapped near an island
-on the International Date Line.  Time and time zones play an integral
-part in the novel." (Paul Eggert, 2006-04-22)
-</td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td>Artist</td><td>John Dunning</td></tr>
-<tr><td>Book</td><td><a
-href="http://books.simonandschuster.com/Two-OClock-Eastern-Wartime/John-Dunning/9781439171530"><em>Two
-O'Clock, Eastern Wartime</em></a></td></tr>
-<tr><td>Copyright Date</td><td>2001</td></tr>
-<tr><td>Notes</td><td>
-Mystery, history, daylight saving time, and old-time radio.
-</td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td>Film</td><td><em>About Time</em></td></tr>
-<tr><td>Copyright Date</td><td>1962</td></tr>
-<tr><td>Notes</td><td>The Bell Science extravaganza, with Frank Baxter,
-Richard Deacon, and Les Tremayne.
-<a href="http://www.imdb.com/title/tt0154110/">Information</a>
-is available at IMDb.</td></tr>
-</table>
-<hr>
-<ul>
-<li>
-An episode of <em>The Adventures of Superman</em> entitled "The Mysterious
-Cube," first aired 1958-02-24, had Superman convincing the controllers
-of the Arlington Time Signal to broadcast ahead of actual time;
-doing so got a crook trying to be declared dead to
-emerge a bit too early from the titular enclosure.
-</li>
-<li>
-The 1960s ITC television series <em>The Prisoner</em> included an episode
-entitled "The Chimes of Big Ben" in which our protagonist tumbled to
-the fraudulent nature of a Poland-to-England escape upon hearing "Big
-Ben" chiming on Polish local time.
-</li>
-<li>
-The series <em>Seinfeld</em> included an episode entitled "The Susie," first
-broadcast 1997-02-13, in which Kramer decides that daylight saving time
-isn't coming fast enough, so he sets his watch ahead an hour.
-</li>
-<li>
-The syndicated comic strip <em>Dilbert</em> featured an all-too-rare example of
-time zone humor on 1998-03-14.
-</li>
-<li>
-Surrealist artist Guy Billout's work "Date Line" appeared on page 103
-of the 1999-11 <em>Atlantic Monthly</em>.
-</li>
-<li>
-"Gloom, Gloom, Go Away" by Walter Kirn appeared on page 106 of <em>Time</em>
-magazine's 2002-11-11 issue; among other things, it proposed
-year-round DST as a way of lessening wintertime despair.
-</li>
-<li>
-The "20 Hours in America" episode of <em>The West Wing</em>,
-first aired 2002-09-25,
-saw White House staffers stranded in Indiana; they thought they had time to
-catch Air Force One but were done in by intra-Indiana local time changes.
-</li>
-<li>
-"In what time zone would you find New York City?" was a $200 question on
-the 1999-11-13 United States airing of <em>Who Wants to Be a Millionaire?</em>,
-and "In 1883, what industry led the movement to divide the U.S. into four time
-zones?" was a $32,000 question on the 2001-05-23 United States airing of
-the same show. At this rate, the million-dollar time-zone
-question should have been asked 2002-06-04.
-</li>
-<li>
-A private jet's mid-flight change of time zones distorts Alison Dubois'
-premonition in the "We Had a Dream" episode of <em>Medium</em>
-(originally aired 2007-02-28).
-</li>
-<li>
-In the <em>30 Rock</em> episode "Anna Howard Shaw Day"
-(first broadcast 2010-02-11),
-Jack Donaghy's date realizes that a Geneva-to-New-York business phone call
-received in the evening must be fake given the difference in local times.
-</li>
-<li>
-In the 1946 movie <em>A Matter of Life and Death</em>
-(U.S. title <em>Stairway to Heaven</em>)
-there is a reference to British Double Summer Time.
-The time does not play a large part in the plot;
-it's just a passing reference to the time when one of the
-characters was supposed to have died (but didn't).
-The IMDb page is at
-<a href="http://us.imdb.com/title/tt0038733/">
-http://us.imdb.com/title/tt0038733/
-</a>. (Dave Cantor)
-<li>
-The 1953 railway comedy movie <em>The Titfield Thunderbolt</em> includes a
-play on words on British Double Summer Time. Valentine's wife wants
-him to leave the pub and asks him, "Do you know what time it is?"
-And he, happy where he is, replies: "Yes, my love. Summer double time."
-IMDb page:
-<a href="http://us.imdb.com/title/tt0046436/">
-http://us.imdb.com/title/tt0046436/
-</a>. (Mark Brader, 2009-10-02)
-</li>
-<li>
-The premise of the 1999 caper movie <em>Entrapment</em> involves computers
-in an international banking network being shut down briefly at
-midnight in each time zone to avoid any problems at the transition
-from the year 1999 to 2000 in that zone. (Hmmmm.) If this shutdown
-is extended by 10 seconds, it will create a one-time opportunity for
-a gigantic computerized theft. To achieve this, at one location the
-crooks interfere with the microwave system supplying time signals to
-the computer, advancing the time by 0.1 second each minute over the
-last hour of 1999. (So this movie teaches us that 0.1 &times; 60 = 10.)
-IMDb page:
-<a href="http://us.imdb.com/title/tt0137494/">
-http://us.imdb.com/title/tt0137494/
-</a>. (Mark Brader, 2009-10-02)
-</li>
-<li>
-In the "Run by the Monkeys" episode of <em>Da Vinci's Inquest</em>
-(first broadcast 2002-11-17),
-a witness in a five-year-old fire case realizes they may not have set
-their clock back when daylight saving ended on the day of the fire,
-introducing the possibility of an hour when arson might have occurred.
-</li>
-<li>
-In "The Todd Couple" episode of <em>Outsourced</em> (first aired 2011-02-10),
-Manmeet sets up Valentine's Day teledates for 6:00 and 9:00pm;
-since one is with a New Yorker and the other with a San Franciscan,
-hilarity ensues.
-(Never mind that this should be 7:30am in Mumbai, yet for some reason the show
-proceeds as though it's also mid-evening there.)
-</li>
-</ul>
-<hr>
-<ul>
-<li>
-"We've been using the five-cent nickel in this country since 1492.
-Now that's pretty near 100 years, daylight saving."
-(Groucho Marx as Captain Spaulding in <em>Animal Crackers</em>, 1930,
-as noted by Will Fitzgerald)
-</li>
-<li>
-Brady: "...[Bishop Usher] determined that the Lord began the Creation
-on the 23rd of October in the Year 4004 B.C. at &ndash; uh, at 9 A.M.!"
-<br>
-Drummond: "That Eastern Standard Time? (Laughter)  Or Rocky Mountain
-Time? (More laughter)  It wasn't daylight-saving time, was it?  Because
-the Lord didn't make the sun until the fourth day!"
-<br>
-(From the play <em>Inherit the Wind</em> by Jerome Lawrence and Robert E. Lee,
-filmed in 1960 with Spencer Tracy as Drummond and Fredric March as
-Brady, and several other times. Thanks to Mark Brader.)
-</li>
-<li>
-"Good news."
-"What did they do? Extend Daylight Saving Time year round?"
-(Professional tanner George Hamilton, in dialog from a
-May, 1999 episode of the syndicated television series <em>Baywatch</em>)
-</li>
-<li>
-"A fundamental belief held by Americans is that if you are on land, you
-cannot be killed by a fish...So most Americans remain on land, believing
-they're safe. Unfortunately, this belief &ndash; like so many myths, such as that
-there's a reason for 'Daylight Saving Time' &ndash; is false."
-(Dave Barry column, 2000-07-02)
-</li>
-<li>
-"I once had sex for an hour and five minutes, but that was on the day
-when you turn the clocks ahead."
-(Garry Shandling, 52nd Annual Emmys, 2000-09-10)
-</li>
-<li>
-"Would it impress you if I told you I invented Daylight Savings Time?"
-("Sahjhan" to "Lilah" in dialog from the "Loyalty" episode of <em>Angel</em>,
-originally aired 2002-02-25)
-</li>
-<li>
-"I thought you said Tulsa was a three-hour flight."
-"Well, you're forgetting about the time difference."
-("Joey" and "Chandler" in dialog from the episode of <em>Friends</em>
-entitled "The One With Rachel's Phone Number," originally aired 2002-12-05)
-</li>
-<li>
-"Is that a pertinent fact,
-or are you just trying to dazzle me with your command of time zones?"
-(Kelsey Grammer as "Frasier Crane" to "Roz" from the episode of <em>Frasier</em>
-entitled "The Kid," originally aired 1997-11-04)
-</li>
-<li>
-"I put myself and my staff through this crazy, huge ordeal, all because
-I refused to go on at midnight, okay?  And so I work, you know, and
-then I get this job at eleven, supposed to be a big deal.  Then
-yesterday daylight [saving] time ended. Right now it's basically
-midnight." (Conan O'Brien on the 2010-11-08 premiere of <em>Conan</em>.)
-</li>
-<li>
-"Well, in my time zone that's all the time I have,
-but maybe in your time zone I haven't finished yet. So stay tuned!"
-(Goldie Hawn, <em>Rowan &amp; Martin's Laugh-In</em> No. 65, 1970-03-09)
-</li>
-<li>
-Peppermint Patty: "What if the world comes to an end tonight, Marcie?"
-<br>
-Marcie: "I promise there'll be a tomorrow, sir ... in fact,
-it's already tomorrow in Australia!"
-<br>
-(Charles M. Schulz, <em>Peanuts</em>, 1980-06-13)
-</li>
-</ul>
-</body>
-</html>
diff --git a/lib/libc/time/tz-link.htm b/lib/libc/time/tz-link.htm
deleted file mode 100644
index 63ec38546..000000000
--- a/lib/libc/time/tz-link.htm
+++ /dev/null
@@ -1,792 +0,0 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD HTML 4.01//EN"
-	"http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Sources for Time Zone and Daylight Saving Time Data</title>
-<link rel="schema.DC" href="http://purl.org/DC/elements/1.1/">
-<meta http-equiv="Content-type" content='text/html; charset="UTF-8"'>
-<meta name="DC.Creator" content="Eggert, Paul">
-<meta name="DC.Contributor" content="Olson, Arthur David">
-<meta name="DC.Date" content="2015-10-01">
-<meta name="DC.Description"
- content="Sources of information about time zones and daylight saving time">
-<meta name="DC.Identifier"
- content="http://www.iana.org/time-zones/repository/tz-link.htm">
-<meta name="Keywords"
- content="database,daylight saving,DST,time zone,timezone,tz,zoneinfo">
-</head>
-<body>
-<h1>Sources for Time Zone and Daylight Saving Time Data</h1>
-<h2>The <code><abbr title="time zone">tz</abbr></code> database</h2>
-<p>
-The <a href="https://en.wikipedia.org/wiki/Public_domain">public-domain</a>
-time zone database contains code and data
-that represent the history of local time
-for many representative locations around the globe.
-It is updated periodically to reflect changes made by political bodies
-to <a href="https://en.wikipedia.org/wiki/Time_zone">time zone</a>
-boundaries and
-<a href="https://en.wikipedia.org/wiki/Daylight_saving_time">daylight-saving</a>
-rules.
-This database (often called <code>zoneinfo</code> or
-<code><abbr>tz</abbr></code>)
-is used by several implementations,
-including
-<a href="http://www.gnu.org/software/libc/">the
-<abbr title="GNU's Not Unix">GNU</abbr>
-C Library</a> (used in
-<a href="https://en.wikipedia.org/wiki/Linux"><abbr>GNU</abbr>/Linux</a>),
-<a href="http://www.android.com">Android</a>,
-<a href="https://developer.mozilla.org/en-US/Firefox_OS">Firefox
-<abbr title="Operating System">OS</abbr></a>,
-<a href="https://www.freebsd.org">Free<abbr
-title="Berkeley Software Distribution">BSD</abbr></a>,
-<a href="http://netbsd.org">Net<abbr>BSD</abbr></a>,
-<a href="http://www.openbsd.org">Open<abbr>BSD</abbr></a>,
-<a href="https://cygwin.com">Cygwin</a>,
-<a href="http://www.delorie.com/djgpp/"><abbr
-title="DJ's GNU Programming Platform">DJGPP</abbr></a>,
-<a href="https://en.wikipedia.org/wiki/MINIX">MINIX</a>,
-<a href="https://en.wikipedia.org/wiki/WebOS"><abbr
-title="Web Operating System">webOS</abbr></a>,
-<a href="http://ibm.com/aix"><abbr
-title="Advanced Interactive eXecutive">AIX</abbr></a>,
-<a href="https://en.wikipedia.org/wiki/BlackBerry_10">BlackBerry 10</a>,
-<a href="http://www.apple.com/ios/"><abbr
-title="iPhone OS">iOS</abbr></a>,
-<a href="http://windows.microsoft.com">Microsoft Windows</a>,
-<a href="http://www8.hp.com/us/en/products/servers/openvms/overview.html">Open<abbr
-title="Virtual Memory System">VMS</abbr></a>,
-<a href="https://www.oracle.com/database/index.html">Oracle Database</a>,
-<a href="http://oracle.com/solaris">Oracle Solaris</a>, and
-<a href="http://www.apple.com/osx/"><abbr title="Operating System Ten">OS
-X</abbr></a>.</p>
-<p>
-Each location in the database represents a region where all
-clocks keeping local time have agreed since 1970.
-Locations are identified by continent or ocean and then by the name of
-the location, which is typically the largest city within the region.
-For example, <code>America/New_York</code>
-represents most of the <abbr title="United States">US</abbr> eastern time zone;
-<code>America/Phoenix</code> represents most of Arizona, which
-uses mountain time without daylight saving time (<abbr
-title="daylight saving time">DST</abbr>);
-<code>America/Detroit</code> represents most of Michigan, which uses
-eastern time but with different <abbr>DST</abbr> rules in 1975;
-and other entries represent smaller regions like Starke County,
-Indiana, which switched from central to eastern time in 1991
-and switched back in 2006.
-To use the database on an extended <a
-href="https://en.wikipedia.org/wiki/POSIX"><abbr
-title="Portable Operating System Interface">POSIX</abbr></a>
-implementation set the <code><abbr>TZ</abbr></code>
-environment variable to the location's full name,
-e.g., <code><abbr>TZ</abbr>="America/New_York"</code>.</p>
-<p>
-Associated with each region is a history of offsets from
-<a href="https://en.wikipedia.org/wiki/Universal_Time">Universal
-Time</a> (<abbr>UT</abbr>), which is <a
-href="https://en.wikipedia.org/wiki/Greenwich_Mean_Time">Greenwich Mean
-Time</a> (<abbr>GMT</abbr>) with days beginning at midnight;
-for time stamps after 1960 this is more precisely <a
-href="https://en.wikipedia.org/wiki/Coordinated_Universal_Time">Coordinated
-Universal Time</a> (<abbr>UTC</abbr>).
-The database also records when daylight saving time was in use,
-along with alphabetic time zone abbreviations such as <abbr>EST</abbr>
-for Eastern Standard Time in the <abbr>US</abbr>.</p>
-<p>
-In the <code><abbr>tz</abbr></code> database's
-<a href="ftp://ftp.iana.org/tz/releases/"><abbr
-title="File Transfer Protocol">FTP</abbr> releases</a>
-the code is in the file <code>tzcode<var>C</var>.tar.gz</code>,
-where <code><var>C</var></code> is the code's version;
-similarly, the data entries are in <code>tzdata<var>D</var>.tar.gz</code>,
-where <code><var>D</var></code> is the data's version.
-Since 1996, each version has been a four-digit year followed by
-lower-case letter (<samp>a</samp> through <samp>z</samp>,
-then <samp>za</samp> through <samp>zz</samp>, then <samp>zza</samp>
-through <samp>zzz</samp>, and so on).
-Convenience links to
-the <a href="ftp://ftp.iana.org/tz/tzcode-latest.tar.gz">latest
-code</a> and
-<a href="ftp://ftp.iana.org/tz/tzdata-latest.tar.gz">latest data</a> revisions
-are also available.
-The following <a
-href="https://en.wikipedia.org/wiki/Unix_shell">shell</a> commands download
-these files to a <abbr>GNU</abbr>/Linux or similar host;
-see the downloaded
-<code>README</code> file for what to do next.</p>
-<pre style="margin-left: 2em"><code>mkdir tz
-cd tz
-<a href="http://www.gnu.org/software/wget/">wget</a> --retr-symlinks 'ftp://ftp.iana.org/tz/tz*-latest.tar.gz'
-<a href="http://www.gnu.org/software/gzip/">gzip</a> -dc tzcode-latest.tar.gz | <a href="http://www.gnu.org/software/tar/">tar</a> -xf -
-gzip -dc tzdata-latest.tar.gz | tar -xf -
-</code></pre>
-<p>
-The code and data files can also be obtained from the
-<a href="http://www.iana.org/time-zones">Time Zone Database website</a>
-of the <a href="http://www.iana.org">Internet Assigned Numbers
-Authority (IANA)</a>.
-An <a href="https://github.com/eggert/tz">unofficial development
-repository</a> of the code and data is available
-in <a href="http://git-scm.com">Git</a> form
-from <a href="https://github.com">GitHub</a>; be careful, as this
-repository is less well tested and probably contains more errors.
-<p>
-The code lets you compile the <code><abbr>tz</abbr></code> source files into
-machine-readable binary files, one for each location. It also lets
-you read a <code><abbr>tz</abbr></code> binary file and interpret time stamps for that
-location.</p>
-<p>
-The files are by no means authoritative. If you find errors, please
-send changes to the <a href="mailto:tz@iana.org">time zone
-mailing list</a>. You can also <a
-href="http://news.gmane.org/gmane.comp.time.tz">browse recent
-messages</a> sent to the mailing list, <a
-href="https://mm.icann.org/mailman/listinfo/tz">subscribe</a> to it,
-and browse the <a
-href="http://mm.icann.org/pipermail/tz/">archive of old
-messages</a>. For further information about updates, please see
-<a href="http://tools.ietf.org/html/rfc6557">Procedures for
-Maintaining the Time Zone Database</a> (Internet <abbr
-title="Request For Comments">RFC</abbr> 6557).</p>
-<p>
-The Web has several other sources for time zone and daylight saving time data.
-Here are some links that may be of interest.
-</p>
-<h2>Commentary on the <code><abbr>tz</abbr></code> database</h2>
-<ul>
-<li>The article
-<a href="https://en.wikipedia.org/wiki/Tz_database">tz database</a> is
-an encyclopedic summary.</li>
-<li><a href="https://web.archive.org/web/20140221080916/http://www.cstdbill.com/tzdb/tz-how-to.html">How to Read the
-tz Database Source Files</a> explains the <code><abbr>tz</abbr></code>
-database format.</li>
-<li><a
-href="http://blog.jonudell.net/2009/10/23/a-literary-appreciation-of-the-olsonzoneinfotz-database/">A
-literary appreciation of the Olson/Zoneinfo/tz database</a> comments on the
-database's style.</li>
-</ul>
-<h2>Web sites using recent versions of the <code><abbr>tz</abbr></code> database</h2>
-<p>
-These are listed roughly in ascending order of complexity and fanciness.
-</p>
-<ul>
-<li><a href="http://time.is">Time.is</a> shows locations'
-time and zones in a simple format.</li>
-<li><a
-href="http://twiki.org/cgi-bin/xtra/tzdatepick.html">Date and Time Gateway</a>
-lets you see the <code><abbr>TZ</abbr></code> values directly.</li>
-<li><a
-href="http://convertit.com/Go/ConvertIt/World_Time/Current_Time.ASP">Current
-Time in 1000 Places</a> uses descriptions of the values.</li>
-<li><a href="http://www.timezoneconverter.com/cgi-bin/tzc.tzc">Time Zone
-Converter</a>
-uses a pulldown menu.</li>
-<li><a href="http://home.kpn.nl/vanadovv/time/TZworld.html">Complete
-timezone information for all countries</a> displays tables of DST rules.
-<li><a href="http://www.timeanddate.com/worldclock/">The World Clock &ndash;
-Time Zones</a> lets you sort zone names and convert times.</li>
-<li><a href="http://www.zeitverschiebung.net/en/">Time Difference</a>
-calculates the current time difference between locations.</li>
-<li><a href="http://www.wx-now.com">Weather Now</a> lists the weather too.</li>
-<li><a href="http://www.thetimenow.com">The Time Now</a> also lists weather.</li>
-<li><a href="http://worldtime.io">worldtime.io</a>
-also contains data about time zone boundaries; it supports queries via place
-names and shows location maps.</li>
-</ul>
-<h2>Network protocols for <code><abbr>tz</abbr></code> data</h2>
-<ul>
-<li>The <a href="http://www.ietf.org">Internet Engineering Task Force</a>'s
-<a href="http://datatracker.ietf.org/wg/tzdist/charter/">Time Zone Data
-Distribution Service (tzdist) working group</a> is developing a scalable
-protocol for distributing time zone data to clients. It has generated a
-a <a href="http://datatracker.ietf.org/doc/draft-ietf-tzdist-service/">draft
-protocol for transferring time zone data</a> and a <a
-href="http://datatracker.ietf.org/doc/draft-ietf-tzdist-caldav-timezone-ref/">draft
-protocol for transferring time zone data by reference</a>. This work is based
-on the iCalendar and CalConnect efforts described below.</li>
-<li>The <a href="http://tools.ietf.org/html/rfc5545">
-Internet Calendaring and Scheduling Core Object Specification
-(iCalendar)</a> (Internet <abbr>RFC</abbr> 5445)
-covers time zone
-data; see its VTIMEZONE calendar component.
-The iCalendar format requires specialized parsers and generators; a
-variant <a href="http://tools.ietf.org/html/rfc6321">xCal</a>
-(Internet <abbr>RFC</abbr> 6321) uses
-<a href="http://www.w3.org/XML/"><abbr
-title="Extensible Markup Language">XML</abbr></a> format, and a variant
-<a href="http://tools.ietf.org/html/rfc7265">jCal</a>
-(Internet <abbr>RFC</abbr> 7265)
-uses <a href="http://www.json.org"><abbr
-title="JavaScript Object Notation">JSON</abbr></a> format.
-<a href="http://calconnect.org">CalConnect, The Calendaring and Scheduling
-Consortium</a> is promoting further work in this area. <a
-href="http://calconnect.org/publications/icalendartimezoneproblemsandrecommendationsv1.0.pdf">iCalendar
-TIMEZONE Problems and Recommendations</a> offers guidelines and
-recommendations for the use of VTIMEZONE and <code><abbr>tz</abbr></code>.</li>
-<li>The <a
-href="http://calconnect.org/publications/timezoneregistryandservicerecommendationsv1.0.pdf">Timezone
-Registry and Service Recommendations</a> of CalConnect's
-<a href="http://calconnect.org/tc-timezone.shtml">TIMEZONE
-Technical Committee</a> discusses a
-strategy for defining and deploying a time zone
-registration process that would establish unique names for each
-version of each <code><abbr>tz</abbr></code> zone, along with a polygonal
-representation of the geographical area corresponding to the
-zone.</li>
-<li>The <a
-href="http://lists.w3.org/Archives/Public/www-rdf-calendar/">www-rdf-calendar</a>
-list discusses <a
-href="http://www.w3.org/RDF/"><abbr
-title="Resource Description Framework">RDF</abbr></a>-based calendar
-and group scheduling systems, and has a <a
-href="http://www.w3.org/2002/12/cal/#tzd">workspace on time zone
-data</a> converted from <code><abbr>tz</abbr></code>.</li>
-</ul>
-<h2>Other <code><abbr>tz</abbr></code> compilers</h2>
-<ul>
-<li><a href="http://sourceforge.net/projects/vzic/">Vzic</a> is a <a
-href="https://en.wikipedia.org/wiki/C_%28programming_language%29">C</a>
-program that compiles
-<code><abbr>tz</abbr></code> source into iCalendar-compatible VTIMEZONE files.
-Vzic is freely
-available under the <a
-href="http://www.gnu.org/copyleft/gpl.html"><abbr>GNU</abbr>
-General Public License (<abbr
-title="General Public License">GPL</abbr>)</a>.</li>
-<li><a href="http://sourceforge.net/projects/tzical/">tziCal &ndash; tz
-database conversion utility</a> is like Vzic, except for the <a
-href="https://msdn.microsoft.com/netframework">.NET framework</a>
-and with a <abbr>BSD</abbr>-style license.</li>
-<li><a
-href="http://search.cpan.org/dist/DateTime-TimeZone/">DateTime::TimeZone</a>
-contains a script <code>parse_olson</code> that compiles
-<code><abbr>tz</abbr></code> source into <a href="http://www.perl.org">Perl</a>
-modules. It is part of the Perl <a
-href="http://datetime.perl.org">DateTime Project</a>, which is freely
-available under both the <abbr>GPL</abbr> and the Perl Artistic
-License. DateTime::TimeZone also contains a script
-<code>tests_from_zdump</code> that generates test cases for each clock
-transition in the <code><abbr>tz</abbr></code> database.</li>
-<li>The <a href="http://howardhinnant.github.io/tz.html">Time Zone
-Database Parser</a> is a
-<a href="https://en.wikipedia.org/wiki/C%2B%2B">C++</a> parser and
-runtime library. It is freely available under the
-<a href="http://creativecommons.org/licenses/by/4.0/">Creative Commons
-Attribution 4.0 International Public License</a>.</li>
-<li><a href="http://site.icu-project.org">International Components for
-Unicode (<abbr>ICU</abbr>)</a> contains C/C++ and <a
-href="https://en.wikipedia.org/wiki/Java_%28programming_language%29">Java</a>
-libraries for internationalization that
-has a compiler from <code><abbr>tz</abbr></code> source
-and from <abbr title="Common Locale Data Repository">CLDR</abbr> data
-(mentioned below)
-into an <abbr>ICU</abbr>-specific format.
-<abbr>ICU</abbr> is freely available under a
-<abbr>BSD</abbr>-style license.</li>
-<li>The <a
-href="http://www.oracle.com/technetwork/java/javase/tzupdater-readme-136440.html">TZUpdater
-tool</a> compiles <code><abbr>tz</abbr></code> source into the format used by
-Oracle Java.</li>
-<li><a href="http://www.joda.org/joda-time/">Joda-Time &ndash; Java date
-and time <abbr title="Application Program Interface">API</abbr></a>
-contains a class
-<code>org.joda.time.tz.ZoneInfoCompiler</code> that compiles
-<code><abbr>tz</abbr></code> source into a Joda-specific binary format. Joda Time
-is freely available under a <abbr>BSD</abbr>-style license.</li>
-<li><a href="http://nodatime.org">Noda Time &ndash; Date and time API for
-.NET</a> and <a href="http://www.babiej.demon.nl/Tz4Net/main.htm">TZ4Net</a>
-are similar to Joda Time, but for the .NET framework instead of
-Java. They are freely available under the
-<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License</a>
-and a <abbr>BSD</abbr>-style license, respectively.</li>
-<li><a href="https://en.wikipedia.org/wiki/JavaScript">JavaScript</a>-based
-compilers and libraries include:
-<ul>
-<li><a href="http://momentjs.com/timezone/">Moment Timezone</a> is a
-plugin for the <a href="http://momentjs.com">Moment.js</a> date
-manipulation library. It is freely available under
-the <abbr title="Massachusetts Institute of Technology">MIT</abbr>
-license.</li>
-<li><a href="https://github.com/mde/timezone-js">TimezoneJS.Date</a>'s
-<abbr>API</abbr> is upward compatible with standard JavaScript
-Dates. It is freely available under the Apache License.</li>
-<li><a href="https://github.com/sproutsocial/walltime-js">Walltime-js</a>
-translates <abbr>UT</abbr> to local time. It is freely available under
-the <abbr>MIT</abbr> license.</li>
-</ul>
-<li><a href="http://pytz.sourceforge.net">pytz &ndash; World Timezone
-Definitions for Python</a> compiles <code><abbr>tz</abbr></code> source into
-<a href="https://www.python.org">Python</a>.
-It is freely available under a <abbr>BSD</abbr>-style license.</li>
-<li><a href="http://tzinfo.github.io">TZInfo &ndash;
-Ruby Timezone Library</a>
-compiles <code><abbr>tz</abbr></code> source into
-<a href="https://www.ruby-lang.org/en/">Ruby</a>.
-It is freely available under the <abbr>MIT</abbr> license.</li>
-<li>The <a href="http://www.squeaksource.com/Chronos/">Chronos Date/Time
-Library</a> is
-a <a href="https://en.wikipedia.org/wiki/Smalltalk">Smalltalk</a> class
-library that compiles <code><abbr>tz</abbr></code> source into a time
-zone repository whose format
-is either proprietary or an <abbr>XML</abbr>-encoded
-representation.</li>
-<li><a href="http://tcl.tk">Tcl</a>
-contains a developer-oriented parser that compiles <code><abbr>tz</abbr></code>
-source into text files, along with a runtime that can read those
-files. Tcl is freely available under a <abbr>BSD</abbr>-style
-license.</li>
-</ul>
-<h2>Other <code><abbr>tz</abbr></code> binary file readers</h2>
-<ul>
-<li>The <a
-href="http://www.gnu.org/software/libc/"><abbr>GNU</abbr> C
-Library</a>
-has an independent, thread-safe implementation of
-a <code><abbr>tz</abbr></code> binary file reader.
-This library is freely available under the
-<a href="http://www.gnu.org/copyleft/lesser.html">
-<abbr>GNU</abbr> Lesser General Public License
-(<abbr title="Lesser General Public License">LGPL</abbr>)</a>,
-and is widely used in <abbr>GNU</abbr>/Linux systems.</li>
-<li><a href="https://www.gnome.org">GNOME</a>'s Glib has
-a <code><abbr>tz</abbr></code> binary file reader written in C that
-creates a <code>GTimeZone</code> object representing sets
-of <abbr>UT</abbr> offsets.
-It is freely available under the <abbr>LGPL</abbr>.</li>
-<li><a href="http://bmsi.com/java/#TZ">ZoneInfo.java</a>
-is a <code><abbr>tz</abbr></code> binary file reader written in Java.
-It is freely available under the <abbr>LGPL</abbr>.</li>
-<li><a href="https://github.com/bigeasy/timezone">Timezone</a> is a
-JavaScript library that supports date arithmetic that is time zone
-aware. It is freely available under the <abbr>MIT</abbr> license.</li>
-<li>Tcl, mentioned above, also contains a
-<code><abbr>tz</abbr></code> binary file reader.</li>
-<li><a href="http://search.cpan.org/perldoc?DateTime::TimeZone::Tzfile">
-DateTime::TimeZone::Tzfile</a>
-is a <code><abbr>tz</abbr></code> binary file reader written in Perl.
-It is freely available under the same terms as Perl
-(dual <abbr>GPL</abbr> and Artistic license).</li>
-<li>The
-public-domain <a href="https://github.com/dbaron/tz.js">tz.js</a>
-library contains a Python tool that
-converts <code><abbr>tz</abbr></code> binary data into
-<abbr>JSON</abbr>-format data suitable for use
-in its JavaScript library for time zone conversion. Dates before 1970
-are not supported.</li>
-<li>The <a
-href="http://hackage.haskell.org/package/timezone-olson">timezone-olson</a>
-package contains <a href="http://haskell.org">Haskell</a> code that
-parses and uses <code><abbr>tz</abbr></code> binary data. It is freely
-available under a BSD-style license.</li>
-</ul>
-<h2>Other <code><abbr>tz</abbr></code>-based time zone software</h2>
-<ul>
-<li><a href="https://foxclocks.org">FoxClocks</a>
-is an extension for <a href="http://www.google.com/chrome/">Google
-Chrome</a> and for <a
-href="https://developer.mozilla.org/en-US/docs/Mozilla/Tech/Toolkit_API">Mozilla
-Toolkit</a> applications like <a
-href="https://www.mozilla.org/en-US/firefox/new/">Firefox</a> and <a
-href="https://www.mozilla.org/en-US/thunderbird/">Thunderbird</a>.
-It displays multiple clocks in the application window, and has a mapping
-interface to <a href="http://www.google.com/earth/">Google Earth</a>.
-It is freely available under the <abbr>GPL</abbr>.</li>
-<li><a href="http://golang.org">Go programming language</a>
-implementations contain a copy of a 32-bit subset of a recent
-<code><abbr>tz</abbr></code> database in a
-Go-specific format.</li>
-<li><a
-href="http://users.skynet.be/Peter.Verthez/projects/intclock/">International
-clock (intclock)</a> is a clock that displays multiple time zones on
-<abbr>GNU</abbr>/Linux and similar systems. It is freely available
-under the <abbr>GPL</abbr>.</li>
-<li>Microsoft Windows 8.1
-and later has <code><abbr>tz</abbr></code> data and <abbr>CLDR</abbr>
-data (mentioned below) used by
-<a href="https://en.wikipedia.org/wiki/Windows_Runtime">Windows Runtime</a>
-classes such as <a
-href="https://msdn.microsoft.com/en-us/library/windows/apps/windows.globalization.datetimeformatting.datetimeformatter.aspx"><code>DateTimeFormatter</code></a>.
-<a
-href="http://blogs.msdn.com/b/bclteam/archive/2007/06/07/exploring-windows-time-zones-with-system-timezoneinfo-josh-free.aspx">Exploring
-Windows Time Zones with <code>System.TimeZoneInfo</code></a> describes
-the older, proprietary method of Microsoft Windows 2000 and later,
-which stores time zone data in the
-<a href="https://en.wikipedia.org/wiki/Windows_Registry">Windows Registry</a>. The
-<a
-href="http://www.unicode.org/cldr/charts/latest/supplemental/zone_tzid.html">Zone &rarr;
-Tzid table</a> or <a
-href="http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml"><abbr>XML</abbr>
-file</a> of the <abbr>CLDR</abbr> data maps proprietary zone IDs
-to <code><abbr>tz</abbr></code> names.
-<li><a
-href="https://www.oracle.com/java/index.html">Oracle
-Java</a> contains a copy of a subset of a recent
-<code><abbr>tz</abbr></code> database in a
-Java-specific format.</li>
-<li><a href="https://kimmo.suominen.com/sw/timezone/">Time Zone</a> is
-a <a href="https://wordpress.org">WordPress</a> plugin. It is freely
-available under a <abbr>BSD</abbr>-style license.</li>
-<li><a href="http://www.relativedata.com/time-zone-master">Time Zone
-Master</a> is a Microsoft Windows clock program that can automatically
-download, compile and use the <code>tzdata<var>D</var>.tar.gz</code>
-files as they are released. The Basic version is free.</li>
-<li><a
-href="http://veladg.com/velaterra.html">VelaTerra</a> is
-an <abbr>OS X</abbr> program. Its developers
-<a href="http://veladg.com/tzoffer.html">offer free
-licenses</a> to <code><abbr>tz</abbr></code> contributors.</li>
-</ul>
-<h2>Other time zone databases</h2>
-<ul>
-<li><a href="http://www.astro.com/cgi/aq.cgi">Atlas Query</a>
-is Astrodienst's Web version of Shanks and Pottenger's
-time zone history atlases published in both <a
-href="http://astrocom.com/astrology-products/software/acs-atlas-software">computer</a>
-and book form (<a
-href="http://www.astrocom.com/astrology/books/american-atlas">one volume
-for the <abbr>US</abbr></a>, and <a
-href="http://www.astrocom.com/astrology/books/international-atlas">one for
-other locations</a>) by <a
-href="http://astrocom.com">Astro Computing Services</a>.
-These atlases are extensive but unreliable, as Shanks appears to have
-guessed many <abbr>UT</abbr> offsets and transitions. The atlases cite no
-sources and do not indicate which entries are guesswork.</li>
-<li><a href="https://en.wikipedia.org/wiki/HP-UX">HP-UX</a> has a database in
-its own <code>tztab</code>(4) format.</li>
-<li>Microsoft Windows has proprietary data mentioned above.</li>
-<li><a href="http://www.worldtimeserver.com">World Time Server</a>
-is another time zone database.</li>
-<li><a href="http://tycho.usno.navy.mil/tzones.html">World Time Zones</a>
-contains data from the Time Service Department of the
-<abbr>US</abbr> Naval Observatory.</li>
-<li>The <a href="http://www.iata.org/publications/Pages/ssim.aspx">Standard
-Schedules Information Manual</a> of the
-International Air Transport Association
-gives current time zone rules for airports served by commercial aviation.</li>
-</ul>
-<h2>Maps</h2>
-<ul>
-<li>The <a href="https://www.cia.gov/index.html">United States Central
-Intelligence Agency (<abbr
-title="Central Intelligence Agency">CIA</abbr>)</a> publishes a <a
-href="https://www.cia.gov/library/publications/the-world-factbook/graphics/ref_maps/physical/pdf/standard_time_zones_of_the_world.pdf">time
-zone map</a>; the
-<a
-href="http://www.lib.utexas.edu/maps/world.html">Perry&ndash;Casta&ntilde;eda
-Library Map Collection</a>
-of the University of Texas at Austin has copies of
-recent editions.
-The pictorial quality is good,
-but the maps do not indicate summer time,
-and parts of the data are a few years out of date.</li>
-<li><a href="http://www.worldtimezone.com">Current time around the world
-and standard time zones map of the world</a>
-has several fancy time zone maps; it covers Russia particularly well.
-The maps' pictorial quality is not quite as good as the
-<abbr>CIA</abbr>'s
-but the maps are more up to date.</li>
-<li><a
-href="http://blog.poormansmath.net/how-much-is-time-wrong-around-the-world/">How
-much is time wrong around the world?</a> maps the difference between
-mean solar and standard time, highlighting areas such as western China
-where the two differ greatly. It's a bit out of date, unfortunately.</li>
-</ul>
-<h2>Time zone boundaries</h2>
-<ul>
-<li><a href="http://efele.net/maps/tz/"><abbr>TZ</abbr> timezones
-maps</a> contains <a
-href="https://en.wikipedia.org/wiki/Shapefile">shapefiles</a> of
-sets of <code><abbr>tz</abbr></code> regions.</li>
-<li>The <a href="https://github.com/bradfitz/latlong">latlong package</a>
-maps geographical coordinates to a <code><abbr>tz</abbr></code> region.
-It is written in Go and is freely available under the Apache License.</li>
-<li><a href="http://derickrethans.nl/what-time-is-it.html">What Time
-is It Here?</a> applies <a href="http://www.mongodb.org">MongoDB</a>
-geospatial query operators to shapefiles' data.</li>
-<li><a href="http://statoids.com/statoids.html">Administrative
-Divisions of Countries ("Statoids")</a> contains lists of
-political subdivision data related to time zones.</li>
-<li><a href="http://home.kpn.nl/vanadovv/time/Multizones.html">Time
-zone boundaries for multizone countries</a> summarizes legal
-boundaries between time zones within countries.</li>
-<li>Manifold.net's <a
-href="http://manifold.net/info/freestuff.shtml">Free Stuff for
-Manifold System Users</a> includes a Manifold-format map of
-world time zone boundaries distributed under the
-<abbr>GPL</abbr>.</li>
-<li>The GeoCommunity lists several commercial sources for <a
-href="http://spatialnews.geocomm.com/features/timezones/">International
-Time Zones and Time Zone Data</a>.</li>
-<li>A ship within the <a
-href="https://en.wikipedia.org/wiki/Territorial_waters">territorial
-waters</a> of any nation uses that nation's time. In international
-waters, time zone boundaries are meridians 15&deg; apart, except that
-<abbr>UTC</abbr>&minus;12 and <abbr>UTC</abbr>+12 are each 7.5&deg;
-wide and are separated by
-the 180&deg; meridian (not by the International Date Line, which is
-for land and territorial waters only). A captain can change ship's
-clocks any time after entering a new time zone; midnight changes are
-common.</li>
-</ul>
-<h2>Civil time concepts and history</h2>
-<ul>
-<li><a href="http://www.nist.gov/pml/general/time/index.cfm">A
-Walk through Time</a>
-surveys the evolution of timekeeping.</li>
-<li><a href="http://www.webexhibits.org/daylightsaving/">About Daylight
-Saving Time &ndash; History, rationale, laws &amp; dates</a>
-is an overall history of <abbr>DST</abbr>.</li>
-<li><a href="http://www.w3.org/TR/timezone/">Working with Time Zones</a>
-contains guidelines and best practices for software applications that
-deal with civil time.</li>
-<li><a href="http://energy.ca.gov/daylightsaving.html">Saving Time,
-Saving Energy</a> discusses a primary justification for <abbr>DST</abbr>.</li>
-<li><a href="http://seizethedaylight.com/dst/">A Brief
-History of Daylight Saving Time</a> summarizes some of the contentious
-history of <abbr>DST</abbr>.</li>
-<li><a href="http://www.staff.science.uu.nl/~gent0113/idl/idl.htm">A History of
-the International Date Line</a> tells the story of the most important
-time zone boundary.</li>
-<li><a href="http://statoids.com/tconcept.html">Basic Time
-Zone Concepts</a> discusses terminological issues behind time zones.</li>
-</ul>
-<h2>National histories of legal time</h2>
-<dl>
-<dt>Australia</dt>
-<dd>The Parliamentary Library has commissioned a <a
-href="http://www.aph.gov.au/binaries/library/pubs/rp/2009-10/10rp10.pdf">research
-paper on daylight saving time in Australia</a>.
-The Bureau of Meteorology publishes a list of <a
-href="http://www.bom.gov.au/climate/averages/tables/dst_times.shtml">Implementation
-Dates of Daylight Savings Time within Australia</a>.</dd>
-<dt>Belgium</dt>
-<dd>The Royal Observatory of Belgium maintains a table of <a
-href="http://www.astro.oma.be/GENERAL/INFO/nli001a.html"
-hreflang="nl">time in Belgium (in Dutch)</a>.</dd>
-<dt>Brazil</dt>
-<dd>The Time Service Department of the National Observatory
-records <a href="http://pcdsh01.on.br/DecHV.html"
-hreflang="pt-BR">Brazil's daylight saving time decrees (in
-Portuguese)</a>.</dd>
-<dt>Canada</dt>
-<dd>National Research Council Canada publishes current
-and some older information about <a
-href="http://www.nrc-cnrc.gc.ca/eng/services/time/time_zones.html">time
-zones &amp; daylight saving time</a>.</dd>
-<dt>Chile</dt>
-<dd>The Hydrographic and Oceanographic Service of the Chilean Navy publishes a
-<a href="http://www.horaoficial.cl/historia_hora.html" hreflang="es">history of
-Chile's official time (in Spanish)</a>.</dd>
-<dt>Germany</dt>
-<dd>The National Institute for Science and Technology maintains the <a
-href="http://www.ptb.de/cms/en/fachabteilungen/abt4/fb-44/ag-441/realisation-of-legal-time-in-germany.html">Realisation
-of Legal Time in Germany</a>.</dd>
-<dt>Israel</dt>
-<dd>The Interior Ministry periodically issues <a
-href="ftp://ftp.cs.huji.ac.il/pub/tz/announcements"
-hreflang="he">announcements (in Hebrew)</a>.</dd>
-<dt>Mexico</dt>
-<dd>The Investigation and Analysis Service of the Mexican Library of
-Congress has published a <a
-href="http://www.diputados.gob.mx/bibliot/publica/inveyana/polisoc/horver/index.htm"
-hreflang="es">history of Mexican local time (in Spanish)</a>.</dd>
-<dt>Malaysia</dt>
-<dd>See Singapore below.</dd>
-<dt>Netherlands</dt>
-<dd><a href="http://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm"
-hreflang="nl">Legal time in the Netherlands (in Dutch)</a>
-covers the history of local time in the Netherlands from ancient times.</dd>
-<dt>New Zealand</dt>
-<dd>The Department of Internal Affairs maintains a brief <a
-href="http://www.dia.govt.nz/Daylight-Saving-History">History of
-Daylight Saving</a>. The privately-maintained <a
-href="http://astrologyschool.com/nztime.html">History of New Zealand
-time</a> has more details.</dd>
-<dt>Singapore</dt>
-<dd><a
-href="http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html">Why
-is Singapore in the "Wrong" Time Zone?</a> details the
-history of legal time in Singapore and Malaysia.</dd>
-<dt>United Kingdom</dt>
-<dd><a
-href="http://www.polyomino.org.uk/british-time/">History of
-legal time in Britain</a> discusses in detail the country
-with perhaps the best-documented history of clock adjustments.
-The National Physical Laboratory also maintains an <a
-href="http://www.npl.co.uk/educate-explore/what-is-time/archive-of-summer-time-dates-1916-2006">Archive
-of Summer time dates</a>.</dd>
-<dt>United States</dt>
-<dd>The Department of Transportation's <a
-href="http://www.transportation.gov/regulations/recent-time-zone-proceedings">Recent
-Time Zone Proceedings</a> lists changes to time zone boundaries.</dd>
-</dl>
-<h2>Precision timekeeping</h2>
-<ul>
-<li><a
-href="http://literature.agilent.com/litweb/pdf/5965-7984E.pdf">The
-Science of Timekeeping</a> is a thorough introduction
-to the theory and practice of precision timekeeping.</li>
-<li><a href="http://www.ntp.org"><abbr
-title="Network Time Protocol">NTP</abbr>: The Network
-Time Protocol</a>
-discusses how to synchronize clocks of
-Internet hosts.</li>
-<li>The <a href="http://www.nist.gov/el/isd/ieee/ieee1588.cfm">Precision
-Time Protocol</a> (<abbr
-title="Institute of Electrical and Electronics Engineers">IEEE</abbr> 1588)
-can achieve submicrosecond clock accuracy on a local area network.</li>
-<li><a
-href="http://tools.ietf.org/html/rfc4833">Timezone
-Options for <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr></a>
-(Internet <abbr>RFC</abbr> 4833)
-specifies a <a
-href="https://en.wikipedia.org/wiki/Dynamic_Host_Configuration_Protocol"><abbr>DHCP</abbr></a>
-option for a server to configure
-a client's time zone and daylight saving settings automatically.</li>
-<li><a href="http://gauss.gge.unb.ca/GMT.UT.and.the.RGO.html">A Few Facts
-Concerning <abbr>GMT</abbr>, <abbr>UT</abbr>, and
-the <abbr title="Royal Greenwich Observatory">RGO</abbr></a>
-answers questions like "What is the
-difference between <abbr>GMT</abbr> and <abbr>UTC</abbr>?"</li>
-<li><a
-href="http://www.cv.nrao.edu/~rfisher/Ephemerides/times.html">Astronomical
-Times</a> explains more abstruse astronomical time scales like
-<abbr title="Terrestrial Dynamic Time">TDT</abbr>,
-<abbr title="Geocentric Coordinate Time">TCG</abbr>, and
-<abbr title="Barycentric Dynamic Time">TDB</abbr>.
-<a href="http://www.ucolick.org/~sla/leapsecs/timescales.html">Time
-Scales</a> goes into more detail, particularly for historical variants.</li>
-<li>The <a href="http://iau.org"><abbr
-title="International Astronomical Union">IAU</abbr></a>'s <a
-href="http://www.iausofa.org"><abbr
-title="Standards Of Fundamental Astronomy">SOFA</abbr></a>
-collection contains C and <a
-href="https://en.wikipedia.org/wiki/Fortran">Fortran</a>
-code for converting among time scales like
-<abbr title="International Atomic Time">TAI</abbr>,
-<abbr>TDB</abbr>, <abbr>TDT</abbr> and
-<abbr>UTC</abbr>.</li>
-<li><a href="http://www2.jpl.nasa.gov/basics/bsf2-3.php">Basics of
-Space Flight &ndash; Reference Systems &ndash; Time Conventions</a>
-briefly explains interplanetary space flight timekeeping.</li>
-<li><a
-href="http://www.giss.nasa.gov/tools/mars24/help/notes.html">Technical
-Notes on Mars Solar Time as Adopted by the Mars24 Sunclock</a> briefly
-describes Mars Coordinated Time (<abbr
-title="Mars Coordinated Time">MTC</abbr>) and the
-diverse local time
-scales used by each landed mission on Mars.</li>
-<li><a href="http://leapsecond.com">LeapSecond.com</a> is
-dedicated not only to leap seconds but to precise time and frequency
-in general. It covers the state of the art in amateur timekeeping, and
-how the art has progressed over the past few decades.</li>
-<li><a
-href="http://www.iers.org/IERS/EN/Publications/Bulletins/bulletins.html"><abbr
-title="International Earth Rotation and Reference Systems Service">IERS</abbr>
-Bulletins</a> contains official publications of the International
-Earth Rotation and Reference Systems Service, which decides
-when leap seconds occur.</li>
-<li>The <a
-href="https://pairlist6.pair.net/mailman/listinfo/leapsecs">Leap
-Second Discussion List</a> covers <a
-href="http://gauss.gge.unb.ca/papers.pdf/gpsworld.november99.pdf">McCarthy
-and Klepczynski's proposal to discontinue leap seconds</a>,
-discussed further in
-<a href="http://www.cl.cam.ac.uk/~mgk25/time/metrologia-leapsecond.pdf">The
-leap second: its history and possible future</a>.
-<a href="http://www.ucolick.org/~sla/leapsecs/"><abbr>UTC</abbr>
-might be redefined
-without Leap Seconds</a> gives pointers on this
-contentious issue.</li>
-</ul>
-<h2>Time notation</h2>
-<ul>
-<li>The <a href="http://cldr.unicode.org">Unicode Common Locale Data
-Repository (<abbr>CLDR</abbr>) Project</a> has localizations for time
-zone names, abbreviations, identifiers, and formats. For example, it
-contains French translations for "Eastern European Summer Time",
-"<abbr title="Eastern European Summer Time">EEST</abbr>", and
-"Bucharest". Its
-<a href="http://unicode.org/cldr/charts/by_type/index.html">by-type
-charts</a> show these values for many locales. Data values are available in
-both <abbr title="Locale Data Markup Language">LDML</abbr>
-(an <abbr>XML</abbr> format) and <abbr>JSON</abbr>.
-<li>
-<a href="http://www.cl.cam.ac.uk/~mgk25/iso-time.html">A summary of
-the international standard date and time notation</a> is a good
-summary of
-<a
-href="http://www.iso.org/iso/catalogue_detail?csnumber=40874"><abbr
-title="International Organization for Standardization">ISO</abbr>
-8601:2004 &ndash; Data elements and interchange formats &ndash; Information
-interchange &ndash; Representation of dates and times</a>.</li>
-<li>
-<a href="http://www.w3.org/TR/xmlschema-2/#dateTime"><abbr>XML</abbr>
-Schema: Datatypes &ndash; dateTime</a> specifies a format inspired by
-<abbr>ISO</abbr> 8601 that is in common use in <abbr>XML</abbr> data.</li>
-<li>
-<a href="http://tools.ietf.org/html/rfc5322">Internet
-Message Format</a> (Internet <abbr>RFC</abbr> 5322) &sect;3.3
-specifies the time notation used in email and <a
-href="https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol"><abbr>HTTP</abbr></a>
-headers.</li>
-<li>
-<a href="http://tools.ietf.org/html/rfc3339">Date and Time
-on the Internet: Timestamps</a> (Internet <abbr>RFC</abbr> 3339)
-specifies an <abbr>ISO</abbr> 8601
-profile for use in new Internet
-protocols.</li>
-<li>
-<a href="http://www.hackcraft.net/web/datetime/">Date &amp; Time
-Formats on the Web</a> surveys web- and Internet-oriented date and time
-formats.</li>
-<li>
-<a href="http://exit109.com/~ghealton/y2k/yrexamples.html">The
-Best of Dates, the Worst of Dates</a> covers many problems encountered
-by software developers when handling dates and time stamps.</li>
-<li>Alphabetic time zone abbreviations should not be used as unique
-identifiers for <abbr>UTC</abbr> offsets as they are ambiguous in
-practice. For example, in English-speaking North America
-"<abbr>CST</abbr>" denotes 6 hours behind <abbr>UTC</abbr>,
-but in China it denotes 8 hours ahead of <abbr>UTC</abbr>,
-and French-speaking North Americans prefer
-"<abbr title="Heure Normale du Centre">HNC</abbr>" to
-"<abbr>CST</abbr>". For <abbr>POSIX</abbr> the <code><abbr>tz</abbr></code>
-database contains English abbreviations for all time stamps but in
-many cases these are merely inventions of the database
-maintainers.</li>
-<li>Numeric time zone abbreviations typically count hours east of
-<abbr>UTC</abbr>, e.g., +09 for Japan and
-&minus;10 for Hawaii. However, the <abbr>POSIX</abbr>
-<code><abbr>TZ</abbr></code> environment variable uses the opposite convention.
-For example, one might use <code><abbr>TZ</abbr>="<abbr
-title="Japan Standard Time">JST</abbr>-9"</code> and
-<code><abbr>TZ</abbr>="<abbr title="Hawaii Standard Time">HST</abbr>10"</code>
-for Japan and Hawaii, respectively. If the
-<code><abbr>tz</abbr></code> database is available, it is usually better to use
-settings like <code><abbr>TZ</abbr>="Asia/Tokyo"</code> and
-<code><abbr>TZ</abbr>="Pacific/Honolulu"</code> instead, as this should avoid
-confusion, handle old time stamps better, and insulate you better from
-any future changes to the rules. One should never set
-<abbr>POSIX</abbr> <code><abbr>TZ</abbr></code> to a value like
-<code>"GMT-9"</code>, though, since this would falsely claim that
-local time is nine hours ahead of <abbr>UTC</abbr> and the time zone
-is called "<abbr>GMT</abbr>".</li>
-</ul>
-<h2>See also</h2>
-<ul>
-<li><a href="tz-art.htm">Time and the Arts</a></li>
-</ul>
-<hr>
-<address>
-This web page is in the public domain, so clarified as of
-2009-05-17 by Arthur David Olson.
-<br>
-Please send corrections to this web page to the
-<a href="mailto:tz@iana.org">time zone mailing list</a>.
-</address>
-</body>
-</html>
diff --git a/lib/libc/time/tzfile.5 b/lib/libc/time/tzfile.5
deleted file mode 100644
index 1dfa459bc..000000000
--- a/lib/libc/time/tzfile.5
+++ /dev/null
@@ -1,162 +0,0 @@
-.\"	$NetBSD: tzfile.5,v 1.23 2015/10/09 17:21:45 christos Exp $
-.\"
-.\" This file is in the public domain, so clarified as of
-.\" 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
-.Dd October 6, 2014
-.Dt TZFILE 5
-.Os
-.Sh NAME
-.Nm tzfile
-.Nd time zone information
-.Sh DESCRIPTION
-The time zone information files used by
-.Xr tzset 3
-begin with the magic characters
-.Dq TZif
-to identify them as time zone information files,
-followed by a character identifying the version of the file's format
-(as of 2013, either an ASCII NUL or a '2', or '3')
-followed by fifteen bytes containing zeroes reserved for future use,
-followed by six four-byte values of type
-.Fa long ,
-followed by six four-byte integer values written in a standard
-byte order (the high-order byte of the value is written first).
-These values are, in order:
-.Bl -tag -width XXXXXX -compact
-.It Va tzh_ttisgmtcnt
-The number of UT/local indicators stored in the file.
-.It Va tzh_ttisstdcnt
-The number of standard/wall indicators stored in the file.
-.It Va tzh_leapcnt
-The number of leap seconds for which data entries are stored in the file.
-.It Va tzh_timecnt
-The number of transition times for which data entries are stored
-in the file.
-.It Va tzh_typecnt
-The number of local time types for which data entries are stored
-in the file (must not be zero).
-.It Va tzh_charcnt
-The number of characters of time zone abbreviation strings
-stored in the file.
-.El
-.Pp
-The above header is followed by
-.Va tzh_timecnt
-four-byte signed integer values sorted in ascending order.
-These values are written in
-These values are written in standard byte order.
-Each is used as a transition time (as returned by
-.Xr time 3 )
-at which the rules for computing local time change.
-Next come
-.Va tzh_timecnt
-one-byte unsigned integer values;
-each one tells which of the different types of local time types
-described in the file is associated with the time period
-starting with the same-indexed transition time.
-These values serve as indices into an array of
-.Fa ttinfo
-structures (with
-.Va tzh_typecnt
-entries) that appears next in the file;
-these structures are defined as follows:
-.Bd -literal
-struct ttinfo {
-	int32_t		tt_gmtoff;
-	unsigned char	tt_isdst;
-	unsigned char	tt_abbrind;
-};
-.Ed
-Each structure is written as a four-byte signed integer value for
-.Va tt_gmtoff
-in a standard byte order, followed by a one-byte value for
-.Va tt_isdst
-and a one-byte value for
-.Va tt_abbrind .
-In each structure,
-.Va tt_gmtoff
-gives the number of seconds to be added to UT,
-.Va tt_isdst
-tells whether
-.Va tm_isdst
-should be set by
-.Xr localtime 3
-and
-.Va tt_abbrind
-serves as an index into the array of time zone abbreviation characters
-that follow the
-.Va ttinfo
-structure(s) in the file.
-.Pp
-Then there are
-.Va tzh_leapcnt
-pairs of four-byte values, written in standard byte order;
-the first value of each pair gives the time
-(as returned by
-.Xr time 3 )
-at which a leap second occurs;
-the second gives the
-.Em total
-number of leap seconds to be applied during the time period
-starting at the given time.
-The pairs of values are sorted in ascending order by time.
-.Pp
-Then there are
-.Va tzh_ttisstdcnt
-standard/wall indicators, each stored as a one-byte value;
-they tell whether the transition times associated with local time types
-were specified as standard time or wall clock time,
-and are used when a time zone file is used in handling POSIX-style
-time zone environment variables.
-.Pp
-Finally there are
-.Va tzh_ttisgmtcnt
-UT/local indicators, each stored as a one-byte value;
-they tell whether the transition times associated with local time types
-were specified as UT or local time,
-and are used when a time zone file is used in handling POSIX-style
-time zone environment variables.
-.Pp
-.Xr localtime 3
-uses the first standard-time
-.Fa ttinfo
-structure in the file
-(or simply the first
-.Fa ttinfo
-structure in the absence of a standard-time structure)
-if either
-.Va tzh_timecnt
-is zero or the time argument is less than the first transition time recorded
-in the file.
-.Pp
-For version-2-format time zone files,
-the above header and data are followed by a second header and data,
-identical in format except that
-eight bytes are used for each transition time or leap second time.
-After the second header and data comes a newline-enclosed,
-POSIX-TZ-environment-variable-style string for use in handling instants
-after the last transition time stored in the file
-(with nothing between the newlines if there is no POSIX representation for
-such instants).
-.Pp
-For version-3-format time zone files, the POSIX-TZ-style string may
-use two minor extensions to the POSIX TZ format, as described in
-.Xr tzset 3 .
-First, the hours part of its transition times may be signed and range from
-\-167 through 167 instead of the POSIX-required unsigned values
-from 0 through 24.
-Second, DST is in effect all year if it starts
-January 1 at 00:00 and ends December 31 at 24:00 plus the difference
-between daylight saving and standard time.
-.Pp
-Future changes to the format may append more data.
-.Sh SEE ALSO
-.Xr ctime 3 ,
-.Xr localtime 3 ,
-.Xr time 3 ,
-.Xr tzset 3 ,
-.Xr zdump 8
-.Xr zic 8
-.\" @(#)tzfile.5	8.3
-.\" This file is in the public domain, so clarified as of
-.\" 1996-06-05 by Arthur David Olson.
diff --git a/lib/libc/time/tzselect.8 b/lib/libc/time/tzselect.8
deleted file mode 100644
index 274a01eb2..000000000
--- a/lib/libc/time/tzselect.8
+++ /dev/null
@@ -1,116 +0,0 @@
-.\"	$NetBSD: tzselect.8,v 1.6 2014/08/15 11:04:07 christos Exp $
-.\"
-.TH TZSELECT 8
-.SH NAME
-tzselect \- select a time zone
-.SH SYNOPSIS
-.ie \n(.g .ds - \f(CW-\fP
-.el ds - \-
-.B tzselect
-[
-.B \*-c
-.I coord
-] [
-.B \*-n
-.I limit
-] [
-.B \*-\*-help
-] [
-.B \*-\*-version
-]
-.SH DESCRIPTION
-The
-.B tzselect
-program asks the user for information about the current location,
-and outputs the resulting time zone description to standard output.
-The output is suitable as a value for the TZ environment variable.
-.PP
-All interaction with the user is done via standard input and standard error.
-.SH OPTIONS
-.TP
-.BI "\*-c " coord
-Instead of asking for continent and then country and then city,
-ask for selection from time zones whose largest cities
-are closest to the location with geographical coordinates
-.I coord.
-Use ISO 6709 notation for
-.I coord,
-that is, a latitude immediately followed by a longitude.  The latitude
-and longitude should be signed integers followed by an optional
-decimal point and fraction: positive numbers represent north and east,
-negative south and west.  Latitudes with two and longitudes with three
-integer digits are treated as degrees; latitudes with four or six and
-longitudes with five or seven integer digits are treated as
-.I "DDMM, DDDMM, DDMMSS,"
-or
-.I DDDMMSS
-representing
-.I DD
-or
-.I DDD
-degrees,
-.I MM
-minutes,
-and zero or
-.I SS
-seconds, with any trailing fractions represent fractional minutes or
-(if
-.I SS
-is present) seconds.  The decimal point is that of the current locale.
-For example, in the (default) C locale,
-.B "\*-c\ +40.689\*-074.045"
-specifies 40.689\(de\|N, 74.045\(de\|W,
-.B "\*-c\ +4041.4\*-07402.7"
-specifies 40\(de\|41.4\(fm\|N, 74\(de\|2.7\(fm\|W, and
-.B "\*-c\ +404121\*-0740240"
-specifies 40\(de\|41\(fm\|21\(sd\|N, 74\(de\|2\(fm\|40\(sd\|W.
-If
-.I coord
-is not one of the documented forms, the resulting behavior is unspecified.
-.TP
-.BI "\*-n " limit
-When
-.B \*-c
-is used, display the closest
-.I limit
-locations (default 10).
-.TP
-.B "\*-\*-help"
-Output help information and exit.
-.TP
-.B "\*-\*-version"
-Output version information and exit.
-.SH "ENVIRONMENT VARIABLES"
-.TP
-\f3AWK\fP
-Name of a Posix-compliant
-.I awk
-program (default:
-.BR awk ).
-.TP
-\f3TZDIR\fP
-Name of the directory containing time zone data files (default:
-.BR /usr/local/etc/zoneinfo ).
-.SH FILES
-.TP
-\f2TZDIR\fP\f3/iso3166.tab\fP
-Table of ISO 3166 2-letter country codes and country names.
-.TP
-\f2TZDIR\fP\f3/zone1970.tab\fP
-Table of country codes, latitude and longitude, zone names, and
-descriptive comments.
-.TP
-\f2TZDIR\fP\f3/\fP\f2TZ\fP
-Time zone data file for time zone \f2TZ\fP.
-.SH "EXIT STATUS"
-The exit status is zero if a time zone was successfully obtained from the user,
-nonzero otherwise.
-.SH "SEE ALSO"
-newctime(3), tzfile(5), zdump(8), zic(8)
-.SH NOTES
-Applications should not assume that
-.BR tzselect 's
-output matches the user's political preferences.
-.\" @(#)tzselect.8	8.2
-.\" This file is in the public domain, so clarified as of
-.\" 2009-05-17 by Arthur David Olson.
diff --git a/lib/libc/time/tzselect.ksh b/lib/libc/time/tzselect.ksh
deleted file mode 100644
index 9bc2db7a1..000000000
--- a/lib/libc/time/tzselect.ksh
+++ /dev/null
@@ -1,558 +0,0 @@
-#! /bin/bash
-#
-#	$NetBSD: tzselect.ksh,v 1.14 2015/06/21 16:06:51 christos Exp $
-#
-PKGVERSION='(tzcode) '
-TZVERSION=see_Makefile
-REPORT_BUGS_TO=tz@iana.org
-
-# Ask the user about the time zone, and output the resulting TZ value to stdout.
-# Interact with the user via stderr and stdin.
-
-# Contributed by Paul Eggert.
-
-# Porting notes:
-#
-# This script requires a Posix-like shell and prefers the extension of a
-# 'select' statement.  The 'select' statement was introduced in the
-# Korn shell and is available in Bash and other shell implementations.
-# If your host lacks both Bash and the Korn shell, you can get their
-# source from one of these locations:
-#
-#	Bash <http://www.gnu.org/software/bash/bash.html>
-#	Korn Shell <http://www.kornshell.com/>
-#	Public Domain Korn Shell <http://www.cs.mun.ca/~michael/pdksh/>
-#
-# For portability to Solaris 9 /bin/sh this script avoids some POSIX
-# features and common extensions, such as $(...) (which works sometimes
-# but not others), $((...)), and $10.
-#
-# This script also uses several features of modern awk programs.
-# If your host lacks awk, or has an old awk that does not conform to Posix,
-# you can use either of the following free programs instead:
-#
-#	Gawk (GNU awk) <http://www.gnu.org/software/gawk/>
-#	mawk <http://invisible-island.net/mawk/>
-
-
-# Specify default values for environment variables if they are unset.
-: ${AWK=awk}
-: ${TZDIR=`pwd`}
-
-# Output one argument as-is to standard output.
-# Safer than 'echo', which can mishandle '\' or leading '-'.
-say() {
-    printf '%s\n' "$1"
-}
-
-# Check for awk Posix compliance.
-($AWK -v x=y 'BEGIN { exit 123 }') </dev/null >/dev/null 2>&1
-[ $? = 123 ] || {
-	say >&2 "$0: Sorry, your '$AWK' program is not Posix compatible."
-	exit 1
-}
-
-coord=
-location_limit=10
-zonetabtype=zone1970
-
-usage="Usage: tzselect [--version] [--help] [-c COORD] [-n LIMIT]
-Select a time zone interactively.
-
-Options:
-
-  -c COORD
-    Instead of asking for continent and then country and then city,
-    ask for selection from time zones whose largest cities
-    are closest to the location with geographical coordinates COORD.
-    COORD should use ISO 6709 notation, for example, '-c +4852+00220'
-    for Paris (in degrees and minutes, North and East), or
-    '-c -35-058' for Buenos Aires (in degrees, South and West).
-
-  -n LIMIT
-    Display at most LIMIT locations when -c is used (default $location_limit).
-
-  --version
-    Output version information.
-
-  --help
-    Output this help.
-
-Report bugs to $REPORT_BUGS_TO."
-
-# Ask the user to select from the function's arguments,
-# and assign the selected argument to the variable 'select_result'.
-# Exit on EOF or I/O error.  Use the shell's 'select' builtin if available,
-# falling back on a less-nice but portable substitute otherwise.
-if
-  case $BASH_VERSION in
-  ?*) : ;;
-  '')
-    # '; exit' should be redundant, but Dash doesn't properly fail without it.
-    (eval 'set --; select x; do break; done; exit') </dev/null 2>/dev/null
-  esac
-then
-  # Do this inside 'eval', as otherwise the shell might exit when parsing it
-  # even though it is never executed.
-  eval '
-    doselect() {
-      select select_result
-      do
-	case $select_result in
-	"") echo >&2 "Please enter a number in range." ;;
-	?*) break
-	esac
-      done || exit
-    }
-
-    # Work around a bug in bash 1.14.7 and earlier, where $PS3 is sent to stdout.
-    case $BASH_VERSION in
-    [01].*)
-      case `echo 1 | (select x in x; do break; done) 2>/dev/null` in
-      ?*) PS3=
-      esac
-    esac
-  '
-else
-  doselect() {
-    # Field width of the prompt numbers.
-    select_width=`expr $# : '.*'`
-
-    select_i=
-
-    while :
-    do
-      case $select_i in
-      '')
-	select_i=0
-	for select_word
-	do
-	  select_i=`expr $select_i + 1`
-	  printf >&2 "%${select_width}d) %s\\n" $select_i "$select_word"
-	done ;;
-      *[!0-9]*)
-	echo >&2 'Please enter a number in range.' ;;
-      *)
-	if test 1 -le $select_i && test $select_i -le $#; then
-	  shift `expr $select_i - 1`
-	  select_result=$1
-	  break
-	fi
-	echo >&2 'Please enter a number in range.'
-      esac
-
-      # Prompt and read input.
-      printf >&2 %s "${PS3-#? }"
-      read select_i || exit
-    done
-  }
-fi
-
-while getopts c:n:t:-: opt
-do
-    case $opt$OPTARG in
-    c*)
-	coord=$OPTARG ;;
-    n*)
-	location_limit=$OPTARG ;;
-    t*) # Undocumented option, used for developer testing.
-	zonetabtype=$OPTARG ;;
-    -help)
-	exec echo "$usage" ;;
-    -version)
-	exec echo "tzselect $PKGVERSION$TZVERSION" ;;
-    -*)
-	say >&2 "$0: -$opt$OPTARG: unknown option; try '$0 --help'"; exit 1 ;;
-    *)
-	say >&2 "$0: try '$0 --help'"; exit 1 ;;
-    esac
-done
-
-shift `expr $OPTIND - 1`
-case $# in
-0) ;;
-*) say >&2 "$0: $1: unknown argument"; exit 1 ;;
-esac
-
-# Make sure the tables are readable.
-TZ_COUNTRY_TABLE=$TZDIR/iso3166.tab
-TZ_ZONE_TABLE=$TZDIR/$zonetabtype.tab
-for f in $TZ_COUNTRY_TABLE $TZ_ZONE_TABLE
-do
-	<"$f" || {
-		say >&2 "$0: time zone files are not set up correctly"
-		exit 1
-	}
-done
-
-# If the current locale does not support UTF-8, convert data to current
-# locale's format if possible, as the shell aligns columns better that way.
-# Check the UTF-8 of U+12345 CUNEIFORM SIGN URU TIMES KI.
-! $AWK 'BEGIN { u12345 = "\360\222\215\205"; exit length(u12345) != 1 }' &&
-    { tmp=`(mktemp -d) 2>/dev/null` || {
-	tmp=${TMPDIR-/tmp}/tzselect.$$ &&
-	(umask 77 && mkdir -- "$tmp")
-    };} &&
-    trap 'status=$?; rm -fr -- "$tmp"; exit $status' 0 HUP INT PIPE TERM &&
-    (iconv -f UTF-8 -t //TRANSLIT <"$TZ_COUNTRY_TABLE" >$tmp/iso3166.tab) \
-        2>/dev/null &&
-    TZ_COUNTRY_TABLE=$tmp/iso3166.tab &&
-    iconv -f UTF-8 -t //TRANSLIT <"$TZ_ZONE_TABLE" >$tmp/$zonetabtype.tab &&
-    TZ_ZONE_TABLE=$tmp/$zonetabtype.tab
-
-newline='
-'
-IFS=$newline
-
-
-# Awk script to read a time zone table and output the same table,
-# with each column preceded by its distance from 'here'.
-output_distances='
-  BEGIN {
-    FS = "\t"
-    while (getline <TZ_COUNTRY_TABLE)
-      if ($0 ~ /^[^#]/)
-        country[$1] = $2
-    country["US"] = "US" # Otherwise the strings get too long.
-  }
-  function abs(x) {
-    return x < 0 ? -x : x;
-  }
-  function min(x, y) {
-    return x < y ? x : y;
-  }
-  function convert_coord(coord, deg, minute, ilen, sign, sec) {
-    if (coord ~ /^[-+]?[0-9]?[0-9][0-9][0-9][0-9][0-9][0-9]([^0-9]|$)/) {
-      degminsec = coord
-      intdeg = degminsec < 0 ? -int(-degminsec / 10000) : int(degminsec / 10000)
-      minsec = degminsec - intdeg * 10000
-      intmin = minsec < 0 ? -int(-minsec / 100) : int(minsec / 100)
-      sec = minsec - intmin * 100
-      deg = (intdeg * 3600 + intmin * 60 + sec) / 3600
-    } else if (coord ~ /^[-+]?[0-9]?[0-9][0-9][0-9][0-9]([^0-9]|$)/) {
-      degmin = coord
-      intdeg = degmin < 0 ? -int(-degmin / 100) : int(degmin / 100)
-      minute = degmin - intdeg * 100
-      deg = (intdeg * 60 + minute) / 60
-    } else
-      deg = coord
-    return deg * 0.017453292519943296
-  }
-  function convert_latitude(coord) {
-    match(coord, /..*[-+]/)
-    return convert_coord(substr(coord, 1, RLENGTH - 1))
-  }
-  function convert_longitude(coord) {
-    match(coord, /..*[-+]/)
-    return convert_coord(substr(coord, RLENGTH))
-  }
-  # Great-circle distance between points with given latitude and longitude.
-  # Inputs and output are in radians.  This uses the great-circle special
-  # case of the Vicenty formula for distances on ellipsoids.
-  function gcdist(lat1, long1, lat2, long2, dlong, x, y, num, denom) {
-    dlong = long2 - long1
-    x = cos(lat2) * sin(dlong)
-    y = cos(lat1) * sin(lat2) - sin(lat1) * cos(lat2) * cos(dlong)
-    num = sqrt(x * x + y * y)
-    denom = sin(lat1) * sin(lat2) + cos(lat1) * cos(lat2) * cos(dlong)
-    return atan2(num, denom)
-  }
-  # Parallel distance between points with given latitude and longitude.
-  # This is the product of the longitude difference and the cosine
-  # of the latitude of the point that is further from the equator.
-  # I.e., it considers longitudes to be further apart if they are
-  # nearer the equator.
-  function pardist(lat1, long1, lat2, long2) {
-    return abs(long1 - long2) * min(cos(lat1), cos(lat2))
-  }
-  # The distance function is the sum of the great-circle distance and
-  # the parallel distance.  It could be weighted.
-  function dist(lat1, long1, lat2, long2) {
-    return gcdist(lat1, long1, lat2, long2) + pardist(lat1, long1, lat2, long2)
-  }
-  BEGIN {
-    coord_lat = convert_latitude(coord)
-    coord_long = convert_longitude(coord)
-  }
-  /^[^#]/ {
-    here_lat = convert_latitude($2)
-    here_long = convert_longitude($2)
-    line = $1 "\t" $2 "\t" $3
-    sep = "\t"
-    ncc = split($1, cc, /,/)
-    for (i = 1; i <= ncc; i++) {
-      line = line sep country[cc[i]]
-      sep = ", "
-    }
-    if (NF == 4)
-      line = line " - " $4
-    printf "%g\t%s\n", dist(coord_lat, coord_long, here_lat, here_long), line
-  }
-'
-
-# Begin the main loop.  We come back here if the user wants to retry.
-while
-
-	echo >&2 'Please identify a location' \
-		'so that time zone rules can be set correctly.'
-
-	continent=
-	country=
-	region=
-
-	case $coord in
-	?*)
-		continent=coord;;
-	'')
-
-	# Ask the user for continent or ocean.
-
-	echo >&2 'Please select a continent, ocean, "coord", or "TZ".'
-
-        quoted_continents=`
-	  $AWK '
-	    BEGIN { FS = "\t" }
-	    /^[^#]/ {
-              entry = substr($3, 1, index($3, "/") - 1)
-              if (entry == "America")
-		entry = entry "s"
-              if (entry ~ /^(Arctic|Atlantic|Indian|Pacific)$/)
-		entry = entry " Ocean"
-              printf "'\''%s'\''\n", entry
-            }
-          ' <"$TZ_ZONE_TABLE" |
-	  sort -u |
-	  tr '\n' ' '
-	  echo ''
-	`
-
-	eval '
-	    doselect '"$quoted_continents"' \
-		"coord - I want to use geographical coordinates." \
-		"TZ - I want to specify the time zone using the Posix TZ format."
-	    continent=$select_result
-	    case $continent in
-	    Americas) continent=America;;
-	    *" "*) continent=`expr "$continent" : '\''\([^ ]*\)'\''`
-	    esac
-	'
-	esac
-
-	case $continent in
-	TZ)
-		# Ask the user for a Posix TZ string.  Check that it conforms.
-		while
-			echo >&2 'Please enter the desired value' \
-				'of the TZ environment variable.'
-			echo >&2 'For example, GST-10 is a zone named GST' \
-				'that is 10 hours ahead (east) of UTC.'
-			read TZ
-			$AWK -v TZ="$TZ" 'BEGIN {
-				tzname = "[^-+,0-9][^-+,0-9][^-+,0-9]+"
-				time = "[0-2]?[0-9](:[0-5][0-9](:[0-5][0-9])?)?"
-				offset = "[-+]?" time
-				date = "(J?[0-9]+|M[0-9]+\\.[0-9]+\\.[0-9]+)"
-				datetime = "," date "(/" time ")?"
-				tzpattern = "^(:.*|" tzname offset "(" tzname \
-				  "(" offset ")?(" datetime datetime ")?)?)$"
-				if (TZ ~ tzpattern) exit 1
-				exit 0
-			}'
-		do
-		    say >&2 "'$TZ' is not a conforming Posix time zone string."
-		done
-		TZ_for_date=$TZ;;
-	*)
-		case $continent in
-		coord)
-		    case $coord in
-		    '')
-			echo >&2 'Please enter coordinates' \
-				'in ISO 6709 notation.'
-			echo >&2 'For example, +4042-07403 stands for'
-			echo >&2 '40 degrees 42 minutes north,' \
-				'74 degrees 3 minutes west.'
-			read coord;;
-		    esac
-		    distance_table=`$AWK \
-			    -v coord="$coord" \
-			    -v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \
-			    "$output_distances" <"$TZ_ZONE_TABLE" |
-		      sort -n |
-		      sed "${location_limit}q"
-		    `
-		    regions=`say "$distance_table" | $AWK '
-		      BEGIN { FS = "\t" }
-		      { print $NF }
-		    '`
-		    echo >&2 'Please select one of the following' \
-			    'time zone regions,'
-		    echo >&2 'listed roughly in increasing order' \
-			    "of distance from $coord".
-		    doselect $regions
-		    region=$select_result
-		    TZ=`say "$distance_table" | $AWK -v region="$region" '
-		      BEGIN { FS="\t" }
-		      $NF == region { print $4 }
-		    '`
-		    ;;
-		*)
-		# Get list of names of countries in the continent or ocean.
-		countries=`$AWK \
-			-v continent="$continent" \
-			-v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \
-		'
-			BEGIN { FS = "\t" }
-			/^#/ { next }
-			$3 ~ ("^" continent "/") {
-			    ncc = split($1, cc, /,/)
-			    for (i = 1; i <= ncc; i++)
-				if (!cc_seen[cc[i]]++) cc_list[++ccs] = cc[i]
-			}
-			END {
-				while (getline <TZ_COUNTRY_TABLE) {
-					if ($0 !~ /^#/) cc_name[$1] = $2
-				}
-				for (i = 1; i <= ccs; i++) {
-					country = cc_list[i]
-					if (cc_name[country]) {
-					  country = cc_name[country]
-					}
-					print country
-				}
-			}
-		' <"$TZ_ZONE_TABLE" | sort -f`
-
-
-		# If there's more than one country, ask the user which one.
-		case $countries in
-		*"$newline"*)
-			echo >&2 'Please select a country' \
-				'whose clocks agree with yours.'
-			doselect $countries
-			country=$select_result;;
-		*)
-			country=$countries
-		esac
-
-
-		# Get list of names of time zone rule regions in the country.
-		regions=`$AWK \
-			-v country="$country" \
-			-v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \
-		'
-			BEGIN {
-				FS = "\t"
-				cc = country
-				while (getline <TZ_COUNTRY_TABLE) {
-					if ($0 !~ /^#/  &&  country == $2) {
-						cc = $1
-						break
-					}
-				}
-			}
-			/^#/ { next }
-			$1 ~ cc { print $4 }
-		' <"$TZ_ZONE_TABLE"`
-
-
-		# If there's more than one region, ask the user which one.
-		case $regions in
-		*"$newline"*)
-			echo >&2 'Please select one of the following' \
-				'time zone regions.'
-			doselect $regions
-			region=$select_result;;
-		*)
-			region=$regions
-		esac
-
-		# Determine TZ from country and region.
-		TZ=`$AWK \
-			-v country="$country" \
-			-v region="$region" \
-			-v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \
-		'
-			BEGIN {
-				FS = "\t"
-				cc = country
-				while (getline <TZ_COUNTRY_TABLE) {
-					if ($0 !~ /^#/  &&  country == $2) {
-						cc = $1
-						break
-					}
-				}
-			}
-			/^#/ { next }
-			$1 ~ cc && $4 == region { print $3 }
-		' <"$TZ_ZONE_TABLE"`
-		esac
-
-		# Make sure the corresponding zoneinfo file exists.
-		TZ_for_date=$TZDIR/$TZ
-		<"$TZ_for_date" || {
-			say >&2 "$0: time zone files are not set up correctly"
-			exit 1
-		}
-	esac
-
-
-	# Use the proposed TZ to output the current date relative to UTC.
-	# Loop until they agree in seconds.
-	# Give up after 8 unsuccessful tries.
-
-	extra_info=
-	for i in 1 2 3 4 5 6 7 8
-	do
-		TZdate=`LANG=C TZ="$TZ_for_date" date`
-		UTdate=`LANG=C TZ=UTC0 date`
-		TZsec=`expr "$TZdate" : '.*:\([0-5][0-9]\)'`
-		UTsec=`expr "$UTdate" : '.*:\([0-5][0-9]\)'`
-		case $TZsec in
-		$UTsec)
-			extra_info="
-Local time is now:	$TZdate.
-Universal Time is now:	$UTdate."
-			break
-		esac
-	done
-
-
-	# Output TZ info and ask the user to confirm.
-
-	echo >&2 ""
-	echo >&2 "The following information has been given:"
-	echo >&2 ""
-	case $country%$region%$coord in
-	?*%?*%)	say >&2 "	$country$newline	$region";;
-	?*%%)	say >&2 "	$country";;
-	%?*%?*) say >&2 "	coord $coord$newline	$region";;
-	%%?*)	say >&2 "	coord $coord";;
-	*)	say >&2 "	TZ='$TZ'"
-	esac
-	say >&2 ""
-	say >&2 "Therefore TZ='$TZ' will be used.$extra_info"
-	say >&2 "Is the above information OK?"
-
-	doselect Yes No
-	ok=$select_result
-	case $ok in
-	Yes) break
-	esac
-do coord=
-done
-
-case $SHELL in
-*csh) file=.login line="setenv TZ '$TZ'";;
-*) file=.profile line="TZ='$TZ'; export TZ"
-esac
-
-say >&2 "
-You can make this change permanent for yourself by appending the line
-	$line
-to the file '$file' in your home directory; then log out and log in again.
-
-Here is that TZ value again, this time on standard output so that you
-can use the $0 command in shell scripts:"
-
-say "$TZ"
diff --git a/lib/libc/time/tzset.3 b/lib/libc/time/tzset.3
deleted file mode 100644
index 6fdbcc22f..000000000
--- a/lib/libc/time/tzset.3
+++ /dev/null
@@ -1,393 +0,0 @@
-.\"	$NetBSD: tzset.3,v 1.32 2015/04/05 08:36:38 pgoyette Exp $
-.Dd October 23, 2014
-.Dt TZSET 3
-.Os
-.Sh NAME
-.Nm tzset ,
-.Nm tzalloc ,
-.Nm tzgetname ,
-.Nm tzfree
-.Nd initialize time conversion information
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft timezone_t
-.Fn tzalloc "const char *zone"
-.Ft void
-.Fn tzfree "timezone_t restrict tz"
-.Ft const char *
-.Fn tzgetname "timezone_t restrict tz" "int isdst"
-.Ft void
-.Fn tzset "void"
-.Sh DESCRIPTION
-The
-.Fn tzalloc
-function takes as an argument a timezone name and returns a
-.Ft timezone_t
-object suitable to be used in the
-.Fn ctime_rz ,
-.Fn localtime_rz ,
-and
-.Fn mktime_z
-functions.
-.Pp
-If
-.Ar tz
-is not a valid time zone description, or if the object cannot be allocated,
-.Fn tzalloc
-returns a
-.Dv NULL
-pointer and sets
-.Va errno .
-.Pp
-A
-.Dv NULL
-pointer may be passed to
-.Fn tzalloc
-instead of a timezone name, to refer to the current system timezone.
-An empty timezone string indicates Coordinated Universal Time
-.Pq Tn UTC .
-.Pp
-Note that instead of setting the environment variable
-.Va TZ ,
-and globally changing the behavior of the calling program, one can use
-multiple timezones at the same time by using separate
-.Ft timezone_t
-objects allocated by
-.Fn tzalloc
-and calling the
-.Dq z
-variants of the functions.
-The
-.Fn tzfree
-function deallocates
-.Fa tz ,
-which was previously allocated by
-.Fn tzalloc .
-This invalidates any
-.Ft tm_zone
-pointers that
-.Fa tz
-was used to set.
-Finally,
-.Fn tzgetname
-returns the name for the given
-.Fa tz .
-If
-.Fa isdst
-is
-.Va 0 ,
-the call is equivalent to
-.Va tzname[0] .
-If
-.Fa isdst
-is set to
-.Va 1
-the call is equivalent to
-.Va tzname[1] .
-The
-.Fn tzset
-function acts like
-.Dv tzalloc(getenv("TZ")) ,
-except it saves any resulting time zone object into internal
-storage that is accessed by
-.Fn localtime ,
-.Fn localtime_r ,
-and
-.Fn mktime .
-The anonymous shared time zone object is freed by the next call to
-.Fn tzset .
-If the implied call to
-.Fn tzalloc
-fails,
-.Fn tzset
-falls back on UTC.
-If
-.Ev TZ
-is
-.Dv NULL ,
-the best available approximation to local wall clock time, as
-specified by the
-.Xr tzfile 5
-format file
-.Pa /etc/localtime
-is used by
-.Xr localtime 3 .
-If
-.Ev TZ
-appears in the environment but its value is the empty string,
-Universal Time (UT) is used, with the abbreviation
-.Dq UTC
-and without leap second correction; please see
-.Xr ctime 3 .
-If
-.Ev TZ
-is nonnull and nonempty:
-.Bl -dash
-.It
-if the value begins with a colon, it is used as a pathname of a file
-from which to read the time conversion information;
-.It
-if the value does not begin with a colon, it is first used as the
-pathname of a file from which to read the time conversion information,
-and, if that file cannot be read, is used directly as a specification
-of the time conversion information.
-.El
-.Pp
-When
-.Ev TZ
-is used as a pathname, if it begins with a slash, it is used as an
-absolute pathname; otherwise, it is used as a pathname relative to
-.Pa /usr/share/zoneinfo .
-The file must be in the format specified in
-.Xr tzfile 5 .
-.Pp
-When
-.Ev TZ
-is used directly as a specification of the time conversion information,
-it must have the following syntax (spaces inserted for clarity):
-.Sm off
-.Bd -literal -offset indent
-.Cm std Cm offset Oo
-.Cm dst Oo
-.Cm offset Oc Oo
-.No , Cm rule Oc Oc
-.Ed
-.Sm on
-.Pp
-where:
-.Bl -tag -width "std and dst" -compact
-.It Cm std No and Cm dst
-Three or more bytes that are the designation for the standard
-.Cm ( std )
-or summer
-.Cm ( dst )
-time zone.
-Only
-.Cm std
-is required; if
-.Cm dst
-is missing, then summer time does not apply in this locale.
-Upper- and lowercase letters are explicitly allowed.
-Any characters except a leading colon (:), digits, comma (,), minus (-),
-plus (+), and NUL bytes are allowed.
-.It Cm offset
-Indicates the value one must add to the local time to arrive at
-Coordinated Universal Time.
-The
-.Cm offset
-has the form:
-.Sm off
-.Bd -literal -offset indent
-.Cm hh Oo
-.Cm :mm Oo
-.Cm :ss Oc Oc
-.Ed
-.Sm on
-.Pp
-The minutes
-.Cm ( mm )
-and seconds
-.Cm ( ss )
-are optional.
-The hour
-.Cm ( hh )
-is required and may be a single digit.
-The
-.Cm offset
-following
-.Cm std
-is required.
-If no
-.Cm offset
-follows
-.Cm dst ,
-summer time is assumed to be one hour ahead of standard time.
-One or more digits may be used; the value is always interpreted as a
-decimal number.
-The hour must be between zero and 24, and the minutes (and
-seconds) \*(en if present \*(en between zero and 59.
-If preceded by a
-.Dq -
-the time zone shall be east of the Prime Meridian; otherwise it shall be
-west (which may be indicated by an optional preceding
-.Dq + ) .
-.It Cm rule
-Indicates when to change to and back from summer time.
-The
-.Cm rule
-has the form:
-.Sm off
-.Bd -literal -offset indent
-.Xo
-.Cm date No /
-.Cm time No ,
-.Cm date No /
-.Cm time
-.Xc
-.Ed
-.Sm on
-.Pp
-where the first
-.Cm date
-describes when the change from standard to summer time occurs and the
-second
-.Cm date
-describes when the change back happens.
-Each
-.Cm time
-field describes when, in current local time, the change to the other
-time is made.
-As an extension to POSIX, daylight saving is assumed to be in effect
-all year if it begins January 1 at 00:00 and ends December 31 at
-24:00 plus the difference between daylight saving and standard time,
-leaving no room for standard time in the calendar.
-The format of
-.Fa date
-is one of the following:
-.Bl -tag -width "The Julian day" -compact
-.It Cm J Ns Ar n
-The Julian day
-.Ar n
-(1 \*[Le]
-.Ar n
-\*[Le] 365).
-Leap days are not counted; that is, in all years \*(en including leap
-years \*(en February 28 is day 59 and March 1 is day 60.
-It is impossible to explicitly refer to the occasional February 29.
-.It Ar n
-The zero-based Julian day (0\ \*[Le]
-.Ar n
-\*[Le]\ 365).
-Leap days are counted, and it is possible to refer to
-February 29.
-.Sm off
-.It Cm M Ns Ar m No . Ar n No . Ar d
-.Sm on
-The
-.Ar d Ns 'th
-day
-(0 \*[Le]
-.Ar d
-\*[Le]\ 6) of week
-.Ar n
-of month
-.Ar m
-of the year
-(1 \*[Le]
-.Ar n
-\*[Le]\ 5, 1 \*[Le]
-.Ar m
-\*[Le]\ 12, where week 5 means
-.Dq the\ last Ar d No day\ in\ month Ar m
-which may occur in either the fourth or the fifth week).
-Week 1 is the first week in which the
-.Ar d Ns 'th
-day occurs.
-Day zero is Sunday.
-.El
-The
-.Cm time
-has the same format as
-.Cm offset
-except that POSIX does not allow a leading sign
-.Dq -
-or
-.Dq +
-is allowed.
-As an extension to POSIX, the hours part of
-.Cm time
-can range from \-167 through 167; this allows for unusual rules such as
-.Dq the Saturday before the first Sunday of March .
-The default, if
-.Cm time
-is not given, is
-.Cm 02:00:00 .
-.El
-.Pp
-Here are some examples of
-.Va TZ
-values that directly specify the time zone rules; they use some of the
-extensions to POSIX.
-.Bl -tag
-.It EST5
-stands for US Eastern Standard
-Time (EST), 5 hours behind UTC, without daylight saving.
-.It FJT\-12FJST,M11.1.0,M1.3.4/75
-stands for Fiji Time (FJT) and Fiji Summer Time (FJST), 12 hours ahead
-of UTC, springing forward on November's first Sunday at 02:00, and
-falling back on January's third Thursday at 75:00 (i.e., 03:00 on the
-first Sunday on or after January 18).
-.It IST\-2IDT,M3.4.4/26,M10.5.0
-stands for Israel Standard Time (IST) and Israel Daylight Time (IDT),
-2 hours ahead of UTC, springing forward on March's fourth
-Thursday at 26:00 (i.e., 02:00 on the first Friday on or after March
-23), and falling back on October's last Sunday at 02:00.
-.It WART4WARST,J1/0,J365/25
-stands for Western Argentina Summer Time (WARST), 3 hours behind UTC.
-There is a dummy fall-back transition on December 31 at 25:00 daylight
-saving time (i.e., 24:00 standard time, equivalent to January 1 at
-00:00 standard time), and a simultaneous spring-forward transition on
-January 1 at 00:00 standard time, so daylight saving time is in effect
-all year and the initial
-.Em WART
-is a placeholder.
-.It WGT3WGST,M3.5.0/\-2,M10.5.0/\-1
-stands for Western Greenland Time (WGT) and Western Greenland Summer
-Time (WGST), 3 hours behind UTC, where clocks follow the EU rules of
-springing forward on March's last Sunday at 01:00 UTC (\-02:00 local
-time) and falling back on October's last Sunday at 01:00 UTC
-(\-01:00 local time).
-.El
-.Pp
-If no
-.Cm rule
-is present in
-.Ev TZ ,
-the rules specified by the
-.Xr tzfile 5
-format file
-.Pa posixrules
-in
-.Pa /usr/share/zoneinfo
-are used, with the standard and summer time offsets from UTC replaced
-by those specified by the
-.Cm offset
-values in
-.Ev TZ .
-.Pp
-For compatibility with System V Release 3.1, a semicolon (;) may be
-used to separate the
-.Cm rule
-from the rest of the specification.
-.Sh FILES
-.Bl -tag -width /usr/share/zoneinfo/posixrules -compact
-.It Pa /etc/localtime
-local time zone file
-.It Pa /usr/share/zoneinfo
-time zone information directory
-.It Pa /usr/share/zoneinfo/posixrules
-used with POSIX-style TZ's
-.It Pa /usr/share/zoneinfo/GMT
-for UTC leap seconds
-.El
-.Pp
-If
-.Pa /usr/share/zoneinfo/GMT
-is absent, UTC leap seconds are loaded from
-.Pa /usr/share/zoneinfo/posixrules .
-.Sh SEE ALSO
-.Xr ctime 3 ,
-.Xr getenv 3 ,
-.Xr strftime 3 ,
-.Xr time 3 ,
-.Xr tzfile 5
-.Sh STANDARDS
-The
-.Fn tzset
-function conforms to
-.St -p1003.1-88 .
-.\" @(#)newtzset.3	8.2
-.\" This file is in the public domain, so clarified as of
-.\" 2009-05-17 by Arthur David Olson.
diff --git a/lib/libc/time/version.h b/lib/libc/time/version.h
deleted file mode 100644
index a47f7476b..000000000
--- a/lib/libc/time/version.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define	PKGVERSION	"(tzcode) "
-#define	TZVERSION	"2013e"
-#ifndef REPORT_BUGS_TO
-#define	REPORT_BUGS_TO	"tz@iana.org"
-#endif
diff --git a/lib/libc/time/zdump.8 b/lib/libc/time/zdump.8
deleted file mode 100644
index 75e233d8f..000000000
--- a/lib/libc/time/zdump.8
+++ /dev/null
@@ -1,103 +0,0 @@
-.\"	$NetBSD: zdump.8,v 1.14 2014/10/23 18:45:58 christos Exp $
-.Dd October 23, 2014
-.Dt ZDUMP 8
-.Os
-.Sh NAME
-.Nm zdump
-.Nd time zone dumper
-.Sh SYNOPSIS
-.Nm zdump
-.Op Fl \-version
-.Op Fl v
-.Op Fl V
-.Op Fl c Ar [loyear,]highyear
-.Op Ar zonename ...
-.Nm zdump
-.Fl t
-.Ar [lotime,]hightime
-.Op Ar zonename ...
-.Sh DESCRIPTION
-.Nm
-prints the current time in each
-.Ar zonename
-named on the command line.
-.Pp
-These options are available:
-.Bl -tag -width XXXXXXXXX -compact
-.It Fl \-version
-Output version information and exit.
-.It Fl v
-For each
-.Ar zonename
-on the command line,
-print the time at the lowest possible time value,
-the time one day after the lowest possible time value,
-the times both one second before and exactly at
-each detected time discontinuity,
-the time at one day less than the highest possible time value,
-and the time at the highest possible time value.
-Each line is followed by
-.Dl isdst= D
-where
-.Dl D
-is positive, zero, or negative depending on whether
-the given time is daylight saving time, standard time,
-or an unknown time type, respectively.
-Each line is also followed by
-.Dl gmtoff= N
-if the given local time is known to be
-.D N
-seconds east of Greenwich.
-.It Fl c Ar [loyear,]highyear
-Cut off verbose output at the given year(s).
-Cutoff times are computed using the proleptic Gregorian calendar with year 0
-and with Universal Time (UT) ignoring leap seconds.
-The lower bound is exclusive and the upper is inclusive; for example, a
-.Dl loyear
-of 1970 excludes a transition occurring at 1970-01-01 00:00:00 UTC but a
-.Dl hiyear
-of 1970 includes the transition.
-The default cutoff is
-.Dl \*-500,2500 .
-.It Fl t Ar [lotime,]hightime
-Cut off verbose output at the given time(s),
-given in decimal seconds since 1970-01-01 00:00:00
-Coordinated Universal Time (UTC).
-The
-.Ar zonename
-determines whether the count includes leap seconds.
-As with
-.Fl c ,
-the cutoff's lower bound is exclusive and its upper bound is inclusive.
-.It Fl V
-Like
-.Fl v ,
-except omit the times relative to the extreme time values.
-This generates output that is easier to compare to that of
-implementations with different time representations.
-.El
-.Sh LIMITATIONS
-Time discontinuities are found by sampling the results returned by localtime
-at twelve-hour intervals.
-This works in all real-world cases;
-one can construct artificial time zones for which this fails.
-.Pp
-In the output, 
-.Dq UT
-denotes the value returned by
-.Xr gmtime 3 ,
-which uses UTC for modern time stamps and some other UT flavor for
-time stamps that predate the introduction of UTC.
-No attempt is currently made to have the output use
-.Dq UTC
-for newer and
-.Dq UT
-for older time stamps,
-partly because the exact date of the introduction of UTC is problematic.
-.Sh SEE ALSO
-.Xr ctime 3 ,
-.Xr tzfile 5 ,
-.Xr zic 8
-.\" @(#)zdump.8	8.2
-.\" This file is in the public domain, so clarified as of
-.\" 2009-05-17 by Arthur David Olson.
diff --git a/lib/libc/time/zdump.c b/lib/libc/time/zdump.c
deleted file mode 100644
index f33fe6922..000000000
--- a/lib/libc/time/zdump.c
+++ /dev/null
@@ -1,1021 +0,0 @@
-/*	$NetBSD: zdump.c,v 1.42 2015/08/13 11:21:18 christos Exp $	*/
-/*
-** This file is in the public domain, so clarified as of
-** 2009-05-17 by Arthur David Olson.
-*/
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: zdump.c,v 1.42 2015/08/13 11:21:18 christos Exp $");
-#endif /* !defined lint */
-
-/*
-** This code has been made independent of the rest of the time
-** conversion package to increase confidence in the verification it provides.
-** You can use this code to help in verifying other implementations.
-**
-** To do this, compile with -DUSE_LTZ=0 and link without the tz library.
-*/
-
-#ifndef NETBSD_INSPIRED
-# define NETBSD_INSPIRED 1
-#endif
-#ifndef USE_LTZ
-# define USE_LTZ 1
-#endif
-
-#if USE_LTZ
-#include "private.h"
-#endif
-
-/* Enable tm_gmtoff and tm_zone on GNUish systems.  */
-#define _GNU_SOURCE 1
-/* Enable strtoimax on Solaris 10.  */
-#define __EXTENSIONS__ 1
-
-#include "stdio.h"	/* for stdout, stderr */
-#include "string.h"	/* for strcpy */
-#include "sys/types.h"	/* for time_t */
-#include "time.h"	/* for struct tm */
-#include "stdlib.h"	/* for exit, malloc, atoi */
-#include "limits.h"	/* for CHAR_BIT, LLONG_MAX */
-#include <errno.h>
-#include <err.h>
-
-/*
-** Substitutes for pre-C99 compilers.
-** Much of this section of code is stolen from private.h.
-*/
-
-#ifndef HAVE_STDINT_H
-# define HAVE_STDINT_H \
-    (199901 <= __STDC_VERSION__ \
-     || 2 < __GLIBC__ + (1 <= __GLIBC_MINOR__)	\
-     || __CYGWIN__)
-#endif
-#if HAVE_STDINT_H
-# include "stdint.h"
-#endif
-#ifndef HAVE_INTTYPES_H
-# define HAVE_INTTYPES_H HAVE_STDINT_H
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-
-#ifndef INT_FAST32_MAX
-# if INT_MAX >> 31 == 0
-typedef long int_fast32_t;
-# else
-typedef int int_fast32_t;
-# endif
-#endif
-
-/* Pre-C99 GCC compilers define __LONG_LONG_MAX__ instead of LLONG_MAX.  */
-#if !defined LLONG_MAX && defined __LONG_LONG_MAX__
-# define LLONG_MAX __LONG_LONG_MAX__
-#endif
-
-#ifndef INTMAX_MAX
-# ifdef LLONG_MAX
-typedef long long intmax_t;
-#  define strtoimax strtoll
-#  define INTMAX_MAX LLONG_MAX
-# else
-typedef long intmax_t;
-#  define strtoimax strtol
-#  define INTMAX_MAX LONG_MAX
-# endif
-#endif
-
-#ifndef PRIdMAX
-# if INTMAX_MAX == LLONG_MAX
-#  define PRIdMAX "lld"
-# else
-#  define PRIdMAX "ld"
-# endif
-#endif
-
-/* Infer TM_ZONE on systems where this information is known, but suppress
-   guessing if NO_TM_ZONE is defined.  Similarly for TM_GMTOFF.  */
-#if (defined __GLIBC__ || defined __FreeBSD__ || defined __minix ||            \
-     defined __OpenBSD__ || (defined __APPLE__ && defined __MACH__))
-# if !defined TM_GMTOFF && !defined NO_TM_GMTOFF
-#  define TM_GMTOFF tm_gmtoff
-# endif
-# if !defined TM_ZONE && !defined NO_TM_ZONE
-#  define TM_ZONE tm_zone
-# endif
-#endif
-
-#ifndef HAVE_LOCALTIME_R
-# define HAVE_LOCALTIME_R 1
-#endif
-
-#ifndef HAVE_LOCALTIME_RZ
-# ifdef TM_ZONE
-#  define HAVE_LOCALTIME_RZ (NETBSD_INSPIRED && USE_LTZ)
-# else
-#  define HAVE_LOCALTIME_RZ 0
-# endif
-#endif
-
-#ifndef HAVE_TZSET
-# define HAVE_TZSET 1
-#endif
-
-#ifndef ZDUMP_LO_YEAR
-#define ZDUMP_LO_YEAR	(-500)
-#endif /* !defined ZDUMP_LO_YEAR */
-
-#ifndef ZDUMP_HI_YEAR
-#define ZDUMP_HI_YEAR	2500
-#endif /* !defined ZDUMP_HI_YEAR */
-
-#ifndef MAX_STRING_LENGTH
-#define MAX_STRING_LENGTH	1024
-#endif /* !defined MAX_STRING_LENGTH */
-
-#if __STDC_VERSION__ < 199901
-# define true 1
-# define false 0
-# define bool int
-#else
-# include <stdbool.h>
-#endif
-
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS	0
-#endif /* !defined EXIT_SUCCESS */
-
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE	1
-#endif /* !defined EXIT_FAILURE */
-
-#ifndef SECSPERMIN
-#define SECSPERMIN	60
-#endif /* !defined SECSPERMIN */
-
-#ifndef MINSPERHOUR
-#define MINSPERHOUR	60
-#endif /* !defined MINSPERHOUR */
-
-#ifndef SECSPERHOUR
-#define SECSPERHOUR	(SECSPERMIN * MINSPERHOUR)
-#endif /* !defined SECSPERHOUR */
-
-#ifndef HOURSPERDAY
-#define HOURSPERDAY	24
-#endif /* !defined HOURSPERDAY */
-
-#ifndef EPOCH_YEAR
-#define EPOCH_YEAR	1970
-#endif /* !defined EPOCH_YEAR */
-
-#ifndef TM_YEAR_BASE
-#define TM_YEAR_BASE	1900
-#endif /* !defined TM_YEAR_BASE */
-
-#ifndef DAYSPERNYEAR
-#define DAYSPERNYEAR	365
-#endif /* !defined DAYSPERNYEAR */
-
-#ifndef isleap
-#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
-#endif /* !defined isleap */
-
-#ifndef isleap_sum
-/*
-** See tzfile.h for details on isleap_sum.
-*/
-#define isleap_sum(a, b)	isleap((a) % 400 + (b) % 400)
-#endif /* !defined isleap_sum */
-
-#define SECSPERDAY	((int_fast32_t) SECSPERHOUR * HOURSPERDAY)
-#define SECSPERNYEAR	(SECSPERDAY * DAYSPERNYEAR)
-#define SECSPERLYEAR	(SECSPERNYEAR + SECSPERDAY)
-#define SECSPER400YEARS	(SECSPERNYEAR * (intmax_t) (300 + 3)	\
-			 + SECSPERLYEAR * (intmax_t) (100 - 3))
-
-/*
-** True if SECSPER400YEARS is known to be representable as an
-** intmax_t.  It's OK that SECSPER400YEARS_FITS can in theory be false
-** even if SECSPER400YEARS is representable, because when that happens
-** the code merely runs a bit more slowly, and this slowness doesn't
-** occur on any practical platform.
-*/
-enum { SECSPER400YEARS_FITS = SECSPERLYEAR <= INTMAX_MAX / 400 };
-
-#ifndef HAVE_GETTEXT
-#define HAVE_GETTEXT 0
-#endif
-#if HAVE_GETTEXT
-#include "locale.h"	/* for setlocale */
-#include "libintl.h"
-#endif /* HAVE_GETTEXT */
-
-#ifndef ATTRIBUTE_PURE
-#if 2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)
-# define ATTRIBUTE_PURE __attribute__ ((ATTRIBUTE_PURE__))
-#else
-# define ATTRIBUTE_PURE /* empty */
-#endif
-#endif
-
-#ifndef INITIALIZE
-#if defined(__GNUC__) || defined(__lint__)
-#define INITIALIZE(x)	((x) = 0)
-#else /* !defined GNUC || lint */
-#define INITIALIZE(x)
-#endif /* !defined GNUC || lint */
-#endif /* !defined INITIALIZE */
-
-/*
-** For the benefit of GNU folk...
-** '_(MSGID)' uses the current locale's message library string for MSGID.
-** The default is to use gettext if available, and use MSGID otherwise.
-*/
-
-#ifndef _
-#if HAVE_GETTEXT
-#define _(msgid) gettext(msgid)
-#else /* !HAVE_GETTEXT */
-#define _(msgid) msgid
-#endif /* !HAVE_GETTEXT */
-#endif /* !defined _ */
-
-#if !defined TZ_DOMAIN && defined HAVE_GETTEXT
-# define TZ_DOMAIN "tz"
-#endif
-
-#if ! HAVE_LOCALTIME_RZ
-# undef  timezone_t
-# define timezone_t char **
-#endif
-
-extern char **	environ;
-extern int	getopt(int argc, char * const argv[],
-			const char * options);
-extern char *	optarg;
-extern int	optind;
-
-/* The minimum and maximum finite time values.  */
-enum { atime_shift = CHAR_BIT * sizeof (time_t) - 2 };
-static time_t	absolute_min_time =
-  ((time_t) -1 < 0
-    ? (- ((time_t) ~ (time_t) 0 < 0)
-       - (((time_t) 1 << atime_shift) - 1 + ((time_t) 1 << atime_shift)))
-    : 0);
-static time_t	absolute_max_time =
-  ((time_t) -1 < 0
-    ? (((time_t) 1 << atime_shift) - 1 + ((time_t) 1 << atime_shift))
-   : -1);
-static size_t	longest;
-static char *	progname;
-static bool	warned;
-static bool	errout;
-
-static char const *abbr(struct tm const *);
-static intmax_t	delta(struct tm *, struct tm *) ATTRIBUTE_PURE;
-static void dumptime(struct tm const *);
-static time_t hunt(timezone_t, char *, time_t, time_t);
-static void show(timezone_t, char *, time_t, bool);
-static const char *tformat(void);
-static time_t yeartot(intmax_t) ATTRIBUTE_PURE;
-
-/* Unlike <ctype.h>'s isdigit, this also works if c < 0 | c > UCHAR_MAX. */
-#define is_digit(c) ((unsigned)(c) - '0' <= 9)
-
-/* Is A an alphabetic character in the C locale?  */
-static bool
-is_alpha(char a)
-{
-	switch (a) {
-	  default:
-		return false;
-	  case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G':
-	  case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N':
-	  case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U':
-	  case 'V': case 'W': case 'X': case 'Y': case 'Z':
-	  case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g':
-	  case 'h': case 'i': case 'j': case 'k': case 'l': case 'm': case 'n':
-	  case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
-	  case 'v': case 'w': case 'x': case 'y': case 'z':
-	  	return true;
-	}
-}
-
-/* Return A + B, exiting if the result would overflow.  */
-static size_t
-sumsize(size_t a, size_t b)
-{
-	size_t sum = a + b;
-	if (sum < a)
-		errx(EXIT_FAILURE, "size overflow");
-	return sum;
-}
-
-#if ! HAVE_TZSET
-# undef tzset
-# define tzset zdump_tzset
-static void tzset(void) { }
-#endif
-
-/* Assume gmtime_r works if localtime_r does.
-   A replacement localtime_r is defined below if needed.  */
-#if ! HAVE_LOCALTIME_R
-
-# undef gmtime_r
-# define gmtime_r zdump_gmtime_r
-
-static struct tm *
-gmtime_r(time_t *tp, struct tm *tmp)
-{
-	struct tm *r = gmtime(tp);
-	if (r) {
-		*tmp = *r;
-		r = tmp;
-	}
-	return r;
-}
-
-#endif
-
-/* Platforms with TM_ZONE don't need tzname, so they can use the
-   faster localtime_rz or localtime_r if available.  */
-
-#if defined TM_ZONE && HAVE_LOCALTIME_RZ
-# define USE_LOCALTIME_RZ true
-#else
-# define USE_LOCALTIME_RZ false
-#endif
-
-#if ! USE_LOCALTIME_RZ
-
-# if !defined TM_ZONE || ! HAVE_LOCALTIME_R || ! HAVE_TZSET
-#  undef localtime_r
-#  define localtime_r zdump_localtime_r
-static struct tm *
-localtime_r(time_t *tp, struct tm *tmp)
-{
-	struct tm *r = localtime(tp);
-	if (r) {
-		*tmp = *r;
-		r = tmp;
-	}
-	return r;
-}
-# endif
-
-# undef localtime_rz
-# define localtime_rz zdump_localtime_rz
-static struct tm *
-localtime_rz(timezone_t rz, time_t *tp, struct tm *tmp)
-{
-	return localtime_r(tp, tmp);
-}
-
-# ifdef TYPECHECK
-#  undef mktime_z
-#  define mktime_z zdump_mktime_z
-static time_t
-mktime_z(timezone_t tz, struct tm *tmp)
-{
-	return mktime(tmp);
-}
-# endif
-
-# undef tzalloc
-# undef tzfree
-# define tzalloc zdump_tzalloc
-# define tzfree zdump_tzfree
-
-static timezone_t
-tzalloc(char const *val)
-{
-	static char **fakeenv;
-	char **env = fakeenv;
-	char *env0;
-	if (! env) {
-		char **e = environ;
-		int to;
-
-		while (*e++)
-			continue;
-		env = malloc(sumsize(sizeof *environ,
-		    (e - environ) * sizeof *environ));
-		if (! env) {
-			err(EXIT_FAILURE, "malloc");
-		}
-		to = 1;
-		for (e = environ; (env[to] = *e); e++)
-			to += strncmp(*e, "TZ=", 3) != 0;
-	}
-	env0 = malloc(sumsize(sizeof "TZ=", strlen(val)));
-	if (! env0) {
-		err(EXIT_FAILURE, "malloc");
-	}
-	env[0] = strcat(strcpy(env0, "TZ="), val);
-	environ = fakeenv = env;
-	tzset();
-	return env;
-}
-
-static void
-tzfree(timezone_t env)
-{
-	environ = env + 1;
-	free(env[0]);
-}
-#endif /* ! USE_LOCALTIME_RZ */
-
-/* A UTC time zone, and its initializer.  */
-static timezone_t gmtz;
-static void
-gmtzinit(void)
-{
-	if (USE_LOCALTIME_RZ) {
-		static char const utc[] = "UTC0";
-		gmtz = tzalloc(utc);
-		if (!gmtz) {
-		      err(EXIT_FAILURE, "Cannot create %s", utc);
-		}
-	}
-}
-
-/* Convert *TP to UTC, storing the broken-down time into *TMP.
-   Return TMP if successful, NULL otherwise.  This is like gmtime_r(TP, TMP),
-   except typically faster if USE_LOCALTIME_RZ.  */
-static struct tm *
-my_gmtime_r(time_t *tp, struct tm *tmp)
-{
-	return USE_LOCALTIME_RZ ?
-	    localtime_rz(gmtz, tp, tmp) : gmtime_r(tp, tmp);
-}
-
-#ifndef TYPECHECK
-#define my_localtime_rz	localtime_rz
-#else /* !defined TYPECHECK */
-static struct tm *
-my_localtime_rz(timezone_t tz, const time_t *tp, struct tm *tmp)
-{
-	tmp = localtime_rz(tz, tp, tmp);
-	if (tmp) {
-		struct tm	tm;
-		time_t	t;
-
-		tm = *tmp;
-		t = mktime_z(tz, &tm);
-		if (t != *tp) {
-			(void) fflush(stdout);
-			(void) fprintf(stderr, "\n%s: ", progname);
-			(void) fprintf(stderr, tformat(), *tp);
-			(void) fprintf(stderr, " ->");
-			(void) fprintf(stderr, " year=%d", tmp->tm_year);
-			(void) fprintf(stderr, " mon=%d", tmp->tm_mon);
-			(void) fprintf(stderr, " mday=%d", tmp->tm_mday);
-			(void) fprintf(stderr, " hour=%d", tmp->tm_hour);
-			(void) fprintf(stderr, " min=%d", tmp->tm_min);
-			(void) fprintf(stderr, " sec=%d", tmp->tm_sec);
-			(void) fprintf(stderr, " isdst=%d", tmp->tm_isdst);
-			(void) fprintf(stderr, " -> ");
-			(void) fprintf(stderr, tformat(), t);
-			(void) fprintf(stderr, "\n");
-			errout = true;
-		}
-	}
-	return tmp;
-}
-#endif /* !defined TYPECHECK */
-
-static void
-abbrok(const char *const abbrp, const char *const zone)
-{
-	const char *cp;
-	const char *wp;
-
-	if (warned)
-		return;
-	cp = abbrp;
-	while (is_alpha(*cp) || is_digit(*cp) || *cp == '-' || *cp == '+')
-		++cp;
-	if (cp - abbrp < 3)
-		wp = _("has fewer than 3 characters");
-	else if (cp - abbrp > 6)
-		wp = _("has more than 6 characters");
-	else if (*cp)
-		wp = _("has characters other than ASCII alphanumerics, '-' or '+'");
-	else
-		return;
-	(void) fflush(stdout);
-	(void) fprintf(stderr,
-		_("%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"),
-		progname, zone, abbrp, wp);
-	warned = errout = true;
-}
-
-/* Return a time zone abbreviation.  If the abbreviation needs to be
-   saved, use *BUF (of size *BUFALLOC) to save it, and return the
-   abbreviation in the possibly-reallocated *BUF.  Otherwise, just
-   return the abbreviation.  Get the abbreviation from TMP.
-   Exit on memory allocation failure.  */
-static char const *
-saveabbr(char **buf, size_t *bufalloc, struct tm const *tmp)
-{
-	char const *ab = abbr(tmp);
-	if (HAVE_LOCALTIME_RZ)
-		return ab;
-	else {
-		size_t ablen = strlen(ab);
-		if (*bufalloc <= ablen) {
-			free(*buf);
-
-			/* Make the new buffer at least twice as long as the
-			   old, to avoid O(N**2) behavior on repeated calls.  */
-			*bufalloc = sumsize(*bufalloc, ablen + 1);
-			*buf = malloc(*bufalloc);
-			if (! *buf) {
-				err(EXIT_FAILURE, "malloc");
-			}
-		}
-		return strcpy(*buf, ab);
-	}
-}
-
-static void
-close_file(FILE *stream)
-{
-	char const *e = (ferror(stream) ? _("I/O error")
-	    : fclose(stream) != 0 ? strerror(errno) : NULL);
-	if (e) {
-		errx(EXIT_FAILURE, "%s", e);
-	}
-}
-
-__dead static void
-usage(FILE *const stream, const int status)
-{
-	(void) fprintf(stream,
-_("%s: usage: %s [--version] [--help] [-{vV}] [-{ct} [lo,]hi] zonename ...\n"
-  "\n"
-  "Report bugs to %s.\n"),
-		       progname, progname, REPORT_BUGS_TO);
-	if (status == EXIT_SUCCESS)
-		close_file(stream);
-	exit(status);
-}
-
-int
-main(int argc, char *argv[])
-{
-	/* These are static so that they're initially zero.  */
-	static char *		abbrev;
-	static size_t		abbrevsize;
-	static struct tm	newtm;
-
-	int		i;
-	bool		vflag;
-	bool		Vflag;
-	char *		cutarg;
-	char *		cuttimes;
-	time_t		cutlotime;
-	time_t		cuthitime;
-	time_t		now;
-	time_t		t;
-	time_t		newt;
-	struct tm	tm;
-	struct tm *	tmp;
-	struct tm *	newtmp;
-
-	cutlotime = absolute_min_time;
-	cuthitime = absolute_max_time;
-#if HAVE_GETTEXT
-	(void) setlocale(LC_ALL, "");
-#ifdef TZ_DOMAINDIR
-	(void) bindtextdomain(TZ_DOMAIN, TZ_DOMAINDIR);
-#endif /* defined TEXTDOMAINDIR */
-	(void) textdomain(TZ_DOMAIN);
-#endif /* HAVE_GETTEXT */
-	progname = argv[0];
-	for (i = 1; i < argc; ++i)
-		if (strcmp(argv[i], "--version") == 0) {
-			(void) printf("zdump %s%s\n", PKGVERSION, TZVERSION);
-			return EXIT_SUCCESS;
-		} else if (strcmp(argv[i], "--help") == 0) {
-			usage(stdout, EXIT_SUCCESS);
-		}
-	vflag = Vflag = false;
-	cutarg = cuttimes = NULL;
-	for (;;)
-	  switch (getopt(argc, argv, "c:t:vV")) {
-	  case 'c': cutarg = optarg; break;
-	  case 't': cuttimes = optarg; break;
-	  case 'v': vflag = true; break;
-	  case 'V': Vflag = true; break;
-	  case -1:
-	    if (! (optind == argc - 1 && strcmp(argv[optind], "=") == 0))
-	      goto arg_processing_done;
-	    /* Fall through.  */
-	  default:
-	    usage(stderr, EXIT_FAILURE);
-	  }
- arg_processing_done:;
-
-	if (vflag | Vflag) {
-		intmax_t	lo;
-		intmax_t	hi;
-		char *loend, *hiend;
-		intmax_t cutloyear = ZDUMP_LO_YEAR;
-		intmax_t cuthiyear = ZDUMP_HI_YEAR;
-		if (cutarg != NULL) {
-			lo = strtoimax(cutarg, &loend, 10);
-			if (cutarg != loend && !*loend) {
-				hi = lo;
-				cuthiyear = hi;
-			} else if (cutarg != loend && *loend == ','
-				   && (hi = strtoimax(loend + 1, &hiend, 10),
-				       loend + 1 != hiend && !*hiend)) {
-				cutloyear = lo;
-				cuthiyear = hi;
-			} else {
-				fprintf(stderr, _("%s: wild -c argument %s\n"),
-					progname, cutarg);
-				return EXIT_FAILURE;
-			}
-		}
-		if (cutarg != NULL || cuttimes == NULL) {
-			cutlotime = yeartot(cutloyear);
-			cuthitime = yeartot(cuthiyear);
-		}
-		if (cuttimes != NULL) {
-			lo = strtoimax(cuttimes, &loend, 10);
-			if (cuttimes != loend && !*loend) {
-				hi = lo;
-				if (hi < cuthitime) {
-					if (hi < absolute_min_time)
-						hi = absolute_min_time;
-					cuthitime = hi;
-				}
-			} else if (cuttimes != loend && *loend == ','
-				   && (hi = strtoimax(loend + 1, &hiend, 10),
-				       loend + 1 != hiend && !*hiend)) {
-				if (cutlotime < lo) {
-					if (absolute_max_time < lo)
-						lo = absolute_max_time;
-					cutlotime = lo;
-				}
-				if (hi < cuthitime) {
-					if (hi < absolute_min_time)
-						hi = absolute_min_time;
-					cuthitime = hi;
-				}
-			} else {
-				(void) fprintf(stderr,
-					_("%s: wild -t argument %s\n"),
-					progname, cuttimes);
-				return EXIT_FAILURE;
-			}
-		}
-	}
-	gmtzinit();
-	now = time(NULL);
-	longest = 0;
-	for (i = optind; i < argc; i++) {
-		size_t arglen = strlen(argv[i]);
-		if (longest < arglen)
-			longest = arglen < INT_MAX ? arglen : INT_MAX;
-	}
-
-	for (i = optind; i < argc; ++i) {
-		timezone_t tz = tzalloc(argv[i]);
-		char const *ab;
-		if (!tz) {
-			errx(EXIT_FAILURE, "%s", argv[i]);
-		}
-		if (! (vflag | Vflag)) {
-			show(tz, argv[i], now, false);
-			tzfree(tz);
-			continue;
-		}
-		warned = false;
-		t = absolute_min_time;
-		if (!Vflag) {
-			show(tz, argv[i], t, true);
-			t += SECSPERDAY;
-			show(tz, argv[i], t, true);
-		}
-		if (t < cutlotime)
-			t = cutlotime;
-		tmp = my_localtime_rz(tz, &t, &tm);
-		if (tmp)
-			ab = saveabbr(&abbrev, &abbrevsize, &tm);
-		else
-			ab = NULL;
-		while (t < cuthitime) {
-			newt = ((t < absolute_max_time - SECSPERDAY / 2
-				&& t + SECSPERDAY / 2 < cuthitime)
-				? t + SECSPERDAY / 2
-				: cuthitime);
-			newtmp = localtime_rz(tz, &newt, &newtm);
-			if ((tmp == NULL || newtmp == NULL) ? (tmp != newtmp) :
-			    (delta(&newtm, &tm) != (newt - t) ||
-			    newtm.tm_isdst != tm.tm_isdst ||
-			    strcmp(abbr(&newtm), ab) != 0)) {
-				newt = hunt(tz, argv[i], t, newt);
-				newtmp = localtime_rz(tz, &newt, &newtm);
-				if (newtmp)
-					  ab = saveabbr(&abbrev, &abbrevsize,
-							&newtm);
-			}
-			t = newt;
-			tm = newtm;
-			tmp = newtmp;
-		}
-		if (!Vflag) {
-			t = absolute_max_time;
-			t -= SECSPERDAY;
-			show(tz, argv[i], t, true);
-			t += SECSPERDAY;
-			show(tz, argv[i], t, true);
-		}
-		tzfree(tz);
-	}
-	close_file(stdout);
-	if (errout && (ferror(stderr) || fclose(stderr) != 0))
-		return EXIT_FAILURE;
-	return EXIT_SUCCESS;
-}
-
-static time_t
-yeartot(intmax_t y)
-{
-	intmax_t	myy, seconds, years;
-	time_t		t;
-
-	myy = EPOCH_YEAR;
-	t = 0;
-	while (myy < y) {
-		if (SECSPER400YEARS_FITS && 400 <= y - myy) {
-			intmax_t diff400 = (y - myy) / 400;
-			if (INTMAX_MAX / SECSPER400YEARS < diff400)
-				return absolute_max_time;
-			seconds = diff400 * SECSPER400YEARS;
-			years = diff400 * 400;
-                } else {
-			seconds = isleap(myy) ? SECSPERLYEAR : SECSPERNYEAR;
-			years = 1;
-		}
-		myy += years;
-		if (t > absolute_max_time - seconds)
-			return absolute_max_time;
-		t += seconds;
-	}
-	while (y < myy) {
-		if (SECSPER400YEARS_FITS && y + 400 <= myy && myy < 0) {
-			intmax_t diff400 = (myy - y) / 400;
-			if (INTMAX_MAX / SECSPER400YEARS < diff400)
-				return absolute_min_time;
-			seconds = diff400 * SECSPER400YEARS;
-			years = diff400 * 400;
-		} else {
-			seconds = isleap(myy - 1) ? SECSPERLYEAR : SECSPERNYEAR;
-			years = 1;
-		}
-		myy -= years;
-		if (t < absolute_min_time + seconds)
-			return absolute_min_time;
-		t -= seconds;
-	}
-	return t;
-}
-
-static time_t
-hunt(timezone_t tz, char *name, time_t lot, time_t hit)
-{
-	static char *		loab;
-	static size_t		loabsize;
-	char const *		ab;
-	time_t			t;
-	struct tm		lotm;
-	struct tm *	lotmp;
-	struct tm		tm;
-	struct tm *	tmp;
-
-	lotmp = my_localtime_rz(tz, &lot, &lotm);
-	if (lotmp)
-		ab = saveabbr(&loab, &loabsize, &lotm);
-	else
-		ab = NULL;
-	for ( ; ; ) {
-		time_t diff = hit - lot;
-		if (diff < 2)
-			break;
-		t = lot;
-		t += diff / 2;
-		if (t <= lot)
-			++t;
-		else if (t >= hit)
-			--t;
-		tmp = my_localtime_rz(tz, &t, &tm);
-		if ((lotmp == NULL || tmp == NULL) ? (lotmp == tmp) :
-			(delta(&tm, &lotm) == (t - lot) &&
-			tm.tm_isdst == lotm.tm_isdst &&
-			strcmp(abbr(&tm), ab) == 0)) {
-				lot = t;
-				lotm = tm;
-				lotmp = tmp;
-		} else	hit = t;
-	}
-	show(tz, name, lot, true);
-	show(tz, name, hit, true);
-	return hit;
-}
-
-/*
-** Thanks to Paul Eggert for logic used in delta.
-*/
-
-static intmax_t
-delta(struct tm *newp, struct tm *oldp)
-{
-	intmax_t	result;
-	int		tmy;
-
-	if (newp->tm_year < oldp->tm_year)
-		return -delta(oldp, newp);
-	result = 0;
-	for (tmy = oldp->tm_year; tmy < newp->tm_year; ++tmy)
-		result += DAYSPERNYEAR + isleap_sum(tmy, TM_YEAR_BASE);
-	result += newp->tm_yday - oldp->tm_yday;
-	result *= HOURSPERDAY;
-	result += newp->tm_hour - oldp->tm_hour;
-	result *= MINSPERHOUR;
-	result += newp->tm_min - oldp->tm_min;
-	result *= SECSPERMIN;
-	result += newp->tm_sec - oldp->tm_sec;
-	return result;
-}
-
-#ifndef TM_GMTOFF
-/* Return A->tm_yday, adjusted to compare it fairly to B->tm_yday.
-   Assume A and B differ by at most one year.  */
-static int
-adjusted_yday(struct tm const *a, struct tm const *b)
-{
-	int yday = a->tm_yday;
-	if (b->tm_year < a->tm_year)
-		yday += 365 + isleap_sum(b->tm_year, TM_YEAR_BASE);
-	return yday;
-}
-#endif
-
-/* If A is the broken-down local time and B the broken-down UTC for
-   the same instant, return A's UTC offset in seconds, where positive
-   offsets are east of Greenwich.  On failure, return LONG_MIN.  */
-static long
-gmtoff(struct tm const *a, struct tm const *b)
-{
-#ifdef TM_GMTOFF
-	return a->TM_GMTOFF;
-#else
-	if (! b)
-		return LONG_MIN;
-	else {
-		int ayday = adjusted_yday(a, b);
-		int byday = adjusted_yday(b, a);
-		int days = ayday - byday;
-		long hours = a->tm_hour - b->tm_hour + 24 * days;
-		long minutes = a->tm_min - b->tm_min + 60 * hours;
-		long seconds = a->tm_sec - b->tm_sec + 60 * minutes;
-		return seconds;
-	}
-#endif
-}
-
-static void
-show(timezone_t tz, char *zone, time_t t, bool v)
-{
-	struct tm *	tmp;
-	struct tm *	gmtmp;
-	struct tm tm, gmtm;
-
-	(void) printf("%-*s  ", (int) longest, zone);
-	if (v) {
-		gmtmp = my_gmtime_r(&t, &gmtm);
-		if (gmtmp == NULL) {
-			printf(tformat(), t);
-		} else {
-			dumptime(gmtmp);
-			(void) printf(" UT");
-		}
-		(void) printf(" = ");
-	}
-	tmp = my_localtime_rz(tz, &t, &tm);
-	dumptime(tmp);
-	if (tmp != NULL) {
-		if (*abbr(tmp) != '\0')
-			(void) printf(" %s", abbr(tmp));
-		if (v) {
-			long off = gmtoff(tmp, gmtmp);
-			(void) printf(" isdst=%d", tmp->tm_isdst);
-			if (off != LONG_MIN)
-				(void) printf(" gmtoff=%ld", off);
-		}
-	}
-	(void) printf("\n");
-	if (tmp != NULL && *abbr(tmp) != '\0')
-		abbrok(abbr(tmp), zone);
-}
-
-static const char *
-abbr(struct tm const *tmp)
-{
-#ifdef TM_ZONE
-	return tmp->TM_ZONE;
-#else
-	return (0 <= tmp->tm_isdst && tzname[0 < tmp->tm_isdst]
-		? tzname[0 < tmp->tm_isdst]
-		: "");
-#endif
-}
-
-/*
-** The code below can fail on certain theoretical systems;
-** it works on all known real-world systems as of 2004-12-30.
-*/
-
-static const char *
-tformat(void)
-{
-	if (0 > (time_t) -1) {		/* signed */
-		if (sizeof (time_t) == sizeof (intmax_t))
-			return "%"PRIdMAX;
-		if (sizeof (time_t) > sizeof (long))
-			return "%lld";
-		if (sizeof (time_t) > sizeof (int))
-			return "%ld";
-		return "%d";
-	}
-#ifdef PRIuMAX
-	if (sizeof (time_t) == sizeof (uintmax_t))
-		return "%"PRIuMAX;
-#endif
-	if (sizeof (time_t) > sizeof (unsigned long))
-		return "%llu";
-	if (sizeof (time_t) > sizeof (unsigned int))
-		return "%lu";
-	return "%u";
-}
-
-static void
-dumptime(const struct tm *timeptr)
-{
-	static const char	wday_name[][3] = {
-		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-	};
-	static const char	mon_name[][3] = {
-		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-	};
-	const char *	wn;
-	const char *	mn;
-	int		lead;
-	int		trail;
-
-	if (timeptr == NULL) {
-		printf("NULL");
-		return;
-	}
-	/*
-	** The packaged localtime_rz and gmtime_r never put out-of-range
-	** values in tm_wday or tm_mon, but since this code might be compiled
-	** with other (perhaps experimental) versions, paranoia is in order.
-	*/
-	if (timeptr->tm_wday < 0 || timeptr->tm_wday >=
-		(int) (sizeof wday_name / sizeof wday_name[0]))
-			wn = "???";
-	else		wn = wday_name[timeptr->tm_wday];
-	if (timeptr->tm_mon < 0 || timeptr->tm_mon >=
-		(int) (sizeof mon_name / sizeof mon_name[0]))
-			mn = "???";
-	else		mn = mon_name[timeptr->tm_mon];
-	printf("%.3s %.3s%3d %.2d:%.2d:%.2d ",
-		wn, mn,
-		timeptr->tm_mday, timeptr->tm_hour,
-		timeptr->tm_min, timeptr->tm_sec);
-#define DIVISOR	10
-	trail = timeptr->tm_year % DIVISOR + TM_YEAR_BASE % DIVISOR;
-	lead = timeptr->tm_year / DIVISOR + TM_YEAR_BASE / DIVISOR +
-		trail / DIVISOR;
-	trail %= DIVISOR;
-	if (trail < 0 && lead > 0) {
-		trail += DIVISOR;
-		--lead;
-	} else if (lead < 0 && trail > 0) {
-		trail -= DIVISOR;
-		++lead;
-	}
-	if (lead == 0)
-		printf("%d", trail);
-	else	printf("%d%d", lead, ((trail < 0) ? -trail : trail));
-}
diff --git a/lib/libc/time/zic.8 b/lib/libc/time/zic.8
deleted file mode 100644
index 86b45632c..000000000
--- a/lib/libc/time/zic.8
+++ /dev/null
@@ -1,504 +0,0 @@
-.\"	$NetBSD: zic.8,v 1.26 2015/08/13 11:21:18 christos Exp $
-.Dd August 13, 2015
-.Dt ZIC 8
-.Os
-.Sh NAME
-.Nm zic
-.Nd time zone compiler
-.Sh SYNOPSIS
-.Nm
-.Op Fl \-version
-.Op Fl d Ar directory
-.Op Fl L Ar leapsecondfilename
-.Op Fl l Ar localtime
-.Op Fl p Ar posixrules
-.Op Fl s
-.Op Fl v
-.Op Fl y Ar command
-.Op Ar Filename ...
-.Sh DESCRIPTION
-.Nm
-reads text from the file(s) named on the command line
-and creates the time conversion information files specified in this input.
-If a
-.Ar filename
-is
-.Ar \&- ,
-the standard input is read.
-.Pp
-These options are available:
-.Bl -tag -width XXXXXXXXXX -compact
-.It Fl \-version
-Output version information and exit.
-.It Fl d Ar directory
-Create time conversion information files in the named directory rather than
-in the standard directory named below.
-.It Fl L Ar leapsecondfilename
-Read leap second information from the file with the given name.
-If this option is not used,
-no leap second information appears in output files.
-.It Fl l Ar timezone
-Use the given time zone as local time.
-.Nm
-will act as if the input contained a link line of the form
-.Dl Link	timezone	localtime
-.It Fl p Ar timezone
-Use the given time zone's rules when handling POSIX-format
-time zone environment variables.
-.Nm
-will act as if the input contained a link line of the form
-.Dl Link	timezone	posixrules
-.It Fl s
-Limit time values stored in output files to values that are the same
-whether they're taken to be signed or unsigned.
-You can use this option to generate SVVS-compatible files.
-.It Fl v
-Be more verbose, and complain about the following situations:
-.Bl -dash
-.It The input specifies a link to a link.
-.It A year that appears in a data file is outside the range
-.It A time of 24:00 or more appears in the input.
-Pre-1998 versions of
-.Xr zic 8
-prohibit 24:00, and pre-2007 versions prohibit times greater than 24:00.
-.It A rule goes past the start or end of the month.
-Pre-2004 versions of
-.Xr zic 8
-prohibit this.
-.It The output file does not contain all the information about the
-long-term future of a zone, because the future cannot be summarized as
-an extended POSIX TZ string.
-For example, as of 2013 this problem
-occurs for Iran's daylight-saving rules for the predicted future, as
-these rules are based on the Iranian calendar, which cannot be
-represented.
-.It The output contains data that may not be handled properly by client
-code designed for older
-.Xr zic 8
-output formats.
-These compatibility issues affect only time stamps
-before 1970 or after the start of 2038.
-.It A time zone abbreviation has fewer than 3 characters.
-POSIX requires at least 3.
-.It An output file name contains a byte that is not an ASCII letter,
-.Dq - ,
-.Dq / ,
-or
-.Dq _ ;
-or it 
-or it contains a file name component that contains more than 14 bytes
-or that starts with
-.Dq - .
-.El
-.Pp
-Input files should be text files, that is, they should be a series of
-zero or more lines, each ending in a newline byte and containing at
-most 511 bytes, and without any
-.Dv NUL
-bytes.
-The input text's encoding
-is typically UTF-8 or ASCII; it should have a unibyte representation
-for the POSIX Portable Character Set (PPCS)
-.%U http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap06.html
-and the encoding's non-unibyte characters should consist entirely of
-non-PPCS bytes.
-Non-PPCS characters typically occur only in comments:
-although output file names and time zone abbreviations can contain
-nearly any character, other software will work better if these are
-limited to the restricted syntax described under the
-.Op v
-option.
-.Pp
-Input lines are made up of fields.
-Fields are separated from one another by one or more white space characters.
-The white space characters are space, form feed, carriage return, newline,
-tab, and vertical tab.
-Leading and trailing white space on input lines is ignored.
-An unquoted sharp character (#) in the input introduces a comment which extends
-to the end of the line the sharp character appears on.
-White space characters and sharp characters may be enclosed in double
-quotes
-.Pq \&"
-.\" XXX "
-if they're to be used as part of a field.
-Any line that is blank (after comment stripping) is ignored.
-Non-blank lines are expected to be of one of three types:
-rule lines, zone lines, and link lines.
-.Pp
-Names (such as month names) must be in English and are case insensitive.
-Abbreviations, if used, must be unambiguous in context.
-.Pp
-A rule line has the form
-.Dl Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-For example:
-.Dl Rule	US	1967	1973	\-	Apr	lastSun	2:00	1:00	D
-The fields that make up a rule line are:
-.Bl -tag -width "LETTER/S" -compact
-.It NAME
-Gives the (arbitrary) name of the set of rules this rule is part of.
-.It FROM
-Gives the first year in which the rule applies.
-Any integer year can be supplied; the proleptic Gregorian calendar is assumed.
-The word
-.Em minimum
-(or an abbreviation) means the minimum year representable as an integer.
-The word
-.Em maximum
-(or an abbreviation) means the maximum year representable as an integer.
-Rules can describe times that are not representable as time values,
-with the unrepresentable times ignored; this allows rules to be portable
-among hosts with differing time value types.
-.It TO
-Gives the final year in which the rule applies.
-In addition to
-.Em minimum
-and
-.Em maximum
-(as above),
-the word
-.Em only
-(or an abbreviation)
-may be used to repeat the value of the
-.Em FROM
-field.
-.It TYPE
-should be
-.Dq -
-and is present for compatibility with older versions of
-.Nm
-in which it could contain year types.
-.It IN
-Names the month in which the rule takes effect.
-Month names may be abbreviated.
-.It ON
-Gives the day on which the rule takes effect.
-Recognized forms include:
-.Bl -tag -width lastSun -compact -offset indent
-.It 5
-the fifth of the month
-.It lastSun
-the last Sunday in the month
-.It lastMon
-the last Monday in the month
-.It Sun\*[Ge]8
-first Sunday on or after the eighth
-.It Sun\*[Le]25
-last Sunday on or before the 25th
-.El
-Names of days of the week may be abbreviated or spelled out in full.
-Note that there must be no spaces within the
-.Em ON
-field.
-.It AT
-Gives the time of day at which the rule takes effect.
-Recognized forms include:
-.Bl -tag -width "1X28X14" -compact -offset indent
-.It 2
-time in hours
-.It 2:00
-time in hours and minutes
-.It 15:00
-24-hour format time (for times after noon)
-.It 1:28:14
-time in hours, minutes, and seconds
-.It \-
-equivalent to 0
-.El
-where hour 0 is midnight at the start of the day,
-and hour 24 is midnight at the end of the day.
-Any of these forms may be followed by the letter
-.Em w
-if the given time is local
-.Dq wall clock
-time,
-.Em s
-if the given time is local
-.Dq standard
-time, or
-.Em u
-(or
-.Em g
-or
-.Em z )
-if the given time is universal time;
-in the absence of an indicator,
-wall clock time is assumed.
-The intent is that a rule line describes the instants when a
-clock/calendar set to the type of time specified in the
-.Em AT
-field would show the specified date and time of day.
-.It SAVE
-Gives the amount of time to be added to local standard time when the rule is in
-effect.
-This field has the same format as the
-.Em AT
-field
-(although, of course, the
-.Em w
-and
-.Em s
-suffixes are not used).
-Only the sum of standard time and this amount matters; for example,
-.Nm
-does not distinguish a 10:30 standard time plus an 0:30
-.Em SAVE
-from a 10:00 standard time plus a 1:00
-.Em SAVE .
-.It LETTER/S
-Gives the
-.Dq variable part
-(for example, the
-.Dq S
-or
-.Dq D
-in
-.Dq EST
-or
-.Dq EDT )
-of time zone abbreviations to be used when this rule is in effect.
-If this field is
-.Em \&- ,
-the variable part is null.
-.El
-.Pp
-A zone line has the form
-.sp
-.Dl Zone	NAME			GMTOFF	RULES/SAVE	FORMAT	[UNTILYEAR [MONTH [DAY [TIME]]]]
-For example:
-.Dl Zone	Australia/Adelaide	9:30	Aus	AC%sT	1971 Oct 31 2:00
-The fields that make up a zone line are:
-.Bl -tag -width "RULES/SAVE" -compact
-.It NAME
-The name of the time zone.
-This is the name used in creating the time conversion information file for the
-zone.
-It should not contain a file name component
-.Dq .
-or
-.Dq .. ;
-a file name component is a maximal substring that does not contain
-.Dq / .
-.It GMTOFF
-The amount of time to add to UT to get standard time in this zone.
-This field has the same format as the
-.Em AT
-and
-.Em SAVE
-fields of rule lines;
-begin the field with a minus sign if time must be subtracted from UT.
-.It RULES/SAVE
-The name of the rule(s) that apply in the time zone or,
-alternatively, an amount of time to add to local standard time.
-If this field is
-.Em \&-
-then standard time always applies in the time zone.
-When an amount of time is given, only the sum of standard time and
-this amount matters.
-.It FORMAT
-The format for time zone abbreviations in this time zone.
-The pair of characters
-.Em %s
-is used to show where the
-.Dq variable part
-of the time zone abbreviation goes.
-Alternately, a format can use the pair of characters
-.Em %z
-+to stand for the UTC offset in the form
-.Em \(+- hh ,
-.Em \(+- hhmm ,
-or
-.Em \(+- hhmmss ,
-using the shortest form that does not lose information, where
-.Em hh ,
-.Em mm ,
-and
-.Em ss
-are the hours, minutes, and seconds east (+) or west (\(mi) of UTC.
-Alternatively,
-a slash
-.Pq \&/
-separates standard and daylight abbreviations.
-To conform to POSIX, a time zone abbreviation should contain only
-alphanumeric ASCII characters, "+" and "\*-".
-.It UNTILYEAR [MONTH [DAY [TIME]]]
-The time at which the UT offset or the rule(s) change for a location.
-It is specified as a year, a month, a day, and a time of day.
-If this is specified,
-the time zone information is generated from the given UT offset
-and rule change until the time specified, which is interpreted using
-the rules in effect just before the transition.
-The month, day, and time of day have the same format as the IN, ON, and AT
-fields of a rule; trailing fields can be omitted, and default to the
-earliest possible value for the missing fields.
-.El
-The next line must be a
-.Dq continuation
-line; this has the same form as a zone line except that the
-string
-.Dq Zone
-and the name are omitted, as the continuation line will
-place information starting at the time specified as the
-.Em until
-information in the previous line in the file used by the previous line.
-Continuation lines may contain
-.Em until
-information, just as zone lines do, indicating that the next line is a further
-continuation.
-.Pp
-If a zone changes at the same instant that a rule would otherwise take
-effect in the earlier zone or continuation line, the rule is ignored.
-In a single zone it is an error if two rules take effect at the same
-instant, or if two zone changes take effect at the same instant.
-.Pp
-A link line has the form
-.Dl Link	TARGET	LINK-NAME
-For example:
-.Dl Link	Europe/Istanbul	Asia/Istanbul
-The
-.Em TARGET
-field should appear as the
-.Em NAME
-field in some zone line.
-The
-.Em LINK-NAME
-field is used as an alternative name for that zone;
-it has the same syntax as a zone line's
-.Em NAME
-field.
-.Pp
-Except for continuation lines,
-lines may appear in any order in the input.
-However, the behavior is unspecified if multiple zone or link lines
-define the same name, or if the source of one link line is the target
-of another.
-.Pp
-Lines in the file that describes leap seconds have the following form:
-.Dl Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S
-For example:
-.Dl Leap	1974	Dec	31	23:59:60	+	S
-The
-.Em YEAR ,
-.Em MONTH ,
-.Em DAY ,
-and
-.Em HH:MM:SS
-fields tell when the leap second happened.
-The
-.Em CORR
-field
-should be
-.Dq \&+
-if a second was added
-or
-.Dq \&-
-if a second was skipped.
-.\" There's no need to document the following, since it's impossible for more
-.\" than one leap second to be inserted or deleted at a time.
-.\" The C Standard is in error in suggesting the possibility.
-.\" See Terry J Quinn, The BIPM and the accurate measure of time,
-.\" Proc IEEE 79, 7 (July 1991), 894-905.
-.\"	or
-.\"	.Dq ++
-.\"	if two seconds were added
-.\"	or
-.\"	.Dq --
-.\"	if two seconds were skipped.
-The
-.Em R/S
-field
-should be (an abbreviation of)
-.Dq Stationary
-if the leap second time given by the other fields should be interpreted as UTC
-or
-(an abbreviation of)
-.Dq Rolling
-if the leap second time given by the other fields should be interpreted as
-local wall clock time.
-.El
-.Sh EXTENDED EXAMPLE
-Here is an extended example of
-.Ic zic
-input, intended to illustrate many of its features.
-.Bl -column -compact "# Rule" "Swiss" "FROM" "1995" "TYPE" "Oct" "lastSun" "1:00u" "SAVE" "LETTER/S"
-.It # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-.It Rule	Swiss	1941	1942	-	May	Mon>=1	1:00	1:00	S
-.It Rule	Swiss	1941	1942	-	Oct	Mon>=1	2:00	0	-
-.Pp
-.It Rule	EU	1977	1980	-	Apr	Sun>=1	1:00u	1:00	S
-.It Rule	EU	1977	only	-	Sep	lastSun	1:00u	0	-
-.It Rule	EU	1978	only	-	Oct	 1	1:00u	0	-
-.It Rule	EU	1979	1995	-	Sep	lastSun	1:00u	0	-
-.It Rule	EU	1981	max	-	Mar	lastSun	1:00u	1:00	S
-.It Rule	EU	1996	max	-	Oct	lastSun	1:00u	0	-
-.El
-.Pp
-.Bl -column -compact "# Zone" "Europe/Zurich" "0:34:08" "RULES/SAVE" "FORMAT" "UNTIL"
-.It # Zone	NAME	GMTOFF	RULES/SAVE	FORMAT	UNTIL
-.It Zone	Europe/Zurich	0:34:08	-	LMT	1853 Jul 16
-.It 		0:29:44	-	BMT	1894 Jun
-.It 		1:00	Swiss	CE%sT	1981
-.It 		1:00	EU	CE%sT
-.It Link	Europe/Zurich	Switzerland
-.El
-.Pp
-In this example, the zone is named Europe/Zurich but it has an alias
-as Switzerland.
-This example says that Zurich was 34 minutes and 8
-seconds west of UT until 1853-07-16 at 00:00, when the legal offset
-was changed to 7\(de\|26\(fm\|22.50\(sd; although this works out to
-0:29:45.50, the input format cannot represent fractional seconds so it
-is rounded here.
-After 1894-06-01 at 00:00 Swiss daylight saving rules
-(defined with lines beginning with "Rule Swiss") apply, and the UT offset
-became one hour.
-From 1981 to the present, EU daylight saving rules have
-applied, and the UTC offset has remained at one hour.
-.Pp
-In 1941 and 1942, daylight saving time applied from the first Monday
-in May at 01:00 to the first Monday in October at 02:00.
-The pre-1981 EU daylight-saving rules have no effect
-here, but are included for completeness.
-Since 1981, daylight
-saving has begun on the last Sunday in March at 01:00 UTC.
-Until 1995 it ended the last Sunday in September at 01:00 UTC,
-but this changed to the last Sunday in October starting in 1996.
-.Pp
-For purposes of
-display, "LMT" and "BMT" were initially used, respectively.
-Since
-Swiss rules and later EU rules were applied, the display name for the
-time zone has been CET for standard time and CEST for daylight saving
-time.
-.Sh NOTES
-For areas with more than two types of local time,
-you may need to use local standard time in the
-.Em AT
-field of the earliest transition time's rule to ensure that
-the earliest transition time recorded in the compiled file is correct.
-.Pp
-If,
-for a particular zone,
-a clock advance caused by the start of daylight saving
-coincides with and is equal to
-a clock retreat caused by a change in UT offset,
-.Ic zic
-produces a single transition to daylight saving at the new UT offset
-(without any change in wall clock time).
-To get separate transitions
-use multiple zone continuation lines
-specifying transition instants using universal time.
-.Pp
-Time stamps well before the Big Bang are silently omitted from the output.
-This works around bugs in software that mishandles large negative time stamps.
-Call it sour grapes, but pre-Big-Bang time stamps are physically suspect anyway.
-The pre-Big-Bang cutoff time is approximate and may change in future versions.
-.Sh FILES
-.Pa /usr/share/zoneinfo
-- standard directory used for created files
-.Sh SEE ALSO
-.Xr ctime 3 ,
-.Xr tzfile 5 ,
-.Xr zdump 8
-.\" @(#)zic.8	8.6
-.\" This file is in the public domain, so clarified as of
-.\" 2009-05-17 by Arthur David Olson.
diff --git a/lib/libc/time/zic.c b/lib/libc/time/zic.c
deleted file mode 100644
index cd9441c47..000000000
--- a/lib/libc/time/zic.c
+++ /dev/null
@@ -1,3039 +0,0 @@
-/*	$NetBSD: zic.c,v 1.56 2015/10/09 17:21:45 christos Exp $	*/
-/*
-** This file is in the public domain, so clarified as of
-** 2006-07-17 by Arthur David Olson.
-*/
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: zic.c,v 1.56 2015/10/09 17:21:45 christos Exp $");
-#endif /* !defined lint */
-
-#include "private.h"
-#include "locale.h"
-#include "tzfile.h"
-
-#include <stdarg.h>
-#include <unistd.h>
-
-#define	ZIC_VERSION_PRE_2013 '2'
-#define	ZIC_VERSION	'3'
-
-typedef int_fast64_t	zic_t;
-#define ZIC_MIN INT_FAST64_MIN
-#define ZIC_MAX INT_FAST64_MAX
-#define SCNdZIC SCNdFAST64
-
-#ifndef ZIC_MAX_ABBR_LEN_WO_WARN
-#define ZIC_MAX_ABBR_LEN_WO_WARN	6
-#endif /* !defined ZIC_MAX_ABBR_LEN_WO_WARN */
-
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef S_IRUSR
-#define MKDIR_UMASK (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
-#else
-#define MKDIR_UMASK 0755
-#endif
-
-struct rule {
-	const char *	r_filename;
-	int		r_linenum;
-	const char *	r_name;
-
-	zic_t		r_loyear;	/* for example, 1986 */
-	zic_t		r_hiyear;	/* for example, 1986 */
-	const char *	r_yrtype;
-	bool		r_lowasnum;
-	bool		r_hiwasnum;
-
-	int		r_month;	/* 0..11 */
-
-	int		r_dycode;	/* see below */
-	int		r_dayofmonth;
-	int		r_wday;
-
-	zic_t		r_tod;		/* time from midnight */
-	bool		r_todisstd;	/* above is standard time if 1 */
-					/* or wall clock time if 0 */
-	bool		r_todisgmt;	/* above is GMT if 1 */
-					/* or local time if 0 */
-	zic_t		r_stdoff;	/* offset from standard time */
-	const char *	r_abbrvar;	/* variable part of abbreviation */
-
-	int		r_todo;		/* a rule to do (used in outzone) */
-	zic_t		r_temp;		/* used in outzone */
-};
-
-/*
-**	r_dycode		r_dayofmonth	r_wday
-*/
-
-#define DC_DOM		0	/* 1..31 */	/* unused */
-#define DC_DOWGEQ	1	/* 1..31 */	/* 0..6 (Sun..Sat) */
-#define DC_DOWLEQ	2	/* 1..31 */	/* 0..6 (Sun..Sat) */
-
-struct zone {
-	const char *	z_filename;
-	int		z_linenum;
-
-	const char *	z_name;
-	zic_t		z_gmtoff;
-	const char *	z_rule;
-	const char *	z_format;
-	char		z_format_specifier;
-
-	zic_t		z_stdoff;
-
-	struct rule *	z_rules;
-	int		z_nrules;
-
-	struct rule	z_untilrule;
-	zic_t		z_untiltime;
-};
-
-extern int	getopt(int argc, char * const argv[],
-			const char * options);
-extern int	link(const char * fromname, const char * toname);
-extern char *	optarg;
-extern int	optind;
-
-#if ! HAVE_LINK
-# define link(from, to) (-1)
-#endif
-#if ! HAVE_SYMLINK
-# define symlink(from, to) (-1)
-#endif
-
-static void	addtt(zic_t starttime, int type);
-static int	addtype(zic_t, char * const, bool, bool, bool);
-static void	leapadd(zic_t, bool, int, int);
-static void	adjleap(void);
-static void	associate(void);
-static void	dolink(const char * fromfield, const char * tofield);
-static char **	getfields(char * buf);
-static zic_t	gethms(const char * string, const char * errstring,
-			bool);
-static void	infile(const char * filename);
-static void	inleap(char ** fields, int nfields);
-static void	inlink(char ** fields, int nfields);
-static void	inrule(char ** fields, int nfields);
-static bool	inzcont(char ** fields, int nfields);
-static bool	inzone(char ** fields, int nfields);
-static bool	inzsub(char ** fields, int nfields, int iscont);
-static int	itsdir(const char * name);
-static bool	is_alpha(char a);
-static char	lowerit(char);
-static bool	mkdirs(char * filename);
-static void	newabbr(const char * abbr);
-static zic_t	oadd(zic_t t1, zic_t t2);
-static void	outzone(const struct zone * zp, int ntzones);
-static int	rcomp(const void * leftp, const void * rightp);
-static zic_t	rpytime(const struct rule * rp, zic_t wantedy);
-static void	rulesub(struct rule * rp,
-			const char * loyearp, const char * hiyearp,
-			const char * typep, const char * monthp,
-			const char * dayp, const char * timep);
-static zic_t	tadd(zic_t t1, zic_t t2);
-static bool	yearistype(int year, const char * type);
-static int	atcomp(const void *avp, const void *bvp);
-static void	updateminmax(zic_t x);
-
-/* Bound on length of what %z can expand to.  */
-enum { PERCENT_Z_LEN_BOUND = sizeof "+995959" - 1 };
-
-static int		charcnt;
-static bool		errors;
-static bool		warnings;
-static const char *	filename;
-static int		leapcnt;
-static bool		leapseen;
-static zic_t		leapminyear;
-static zic_t		leapmaxyear;
-static int		linenum;
-static size_t		max_abbrvar_len = PERCENT_Z_LEN_BOUND;
-static size_t		max_format_len;
-static zic_t		max_year;
-static zic_t		min_year;
-static bool		noise;
-static const char *	rfilename;
-static int		rlinenum;
-static const char *	progname;
-static int		timecnt;
-static int		timecnt_alloc;
-static int		typecnt;
-
-/*
-** Line codes.
-*/
-
-#define LC_RULE		0
-#define LC_ZONE		1
-#define LC_LINK		2
-#define LC_LEAP		3
-
-/*
-** Which fields are which on a Zone line.
-*/
-
-#define ZF_NAME		1
-#define ZF_GMTOFF	2
-#define ZF_RULE		3
-#define ZF_FORMAT	4
-#define ZF_TILYEAR	5
-#define ZF_TILMONTH	6
-#define ZF_TILDAY	7
-#define ZF_TILTIME	8
-#define ZONE_MINFIELDS	5
-#define ZONE_MAXFIELDS	9
-
-/*
-** Which fields are which on a Zone continuation line.
-*/
-
-#define ZFC_GMTOFF	0
-#define ZFC_RULE	1
-#define ZFC_FORMAT	2
-#define ZFC_TILYEAR	3
-#define ZFC_TILMONTH	4
-#define ZFC_TILDAY	5
-#define ZFC_TILTIME	6
-#define ZONEC_MINFIELDS	3
-#define ZONEC_MAXFIELDS	7
-
-/*
-** Which files are which on a Rule line.
-*/
-
-#define RF_NAME		1
-#define RF_LOYEAR	2
-#define RF_HIYEAR	3
-#define RF_COMMAND	4
-#define RF_MONTH	5
-#define RF_DAY		6
-#define RF_TOD		7
-#define RF_STDOFF	8
-#define RF_ABBRVAR	9
-#define RULE_FIELDS	10
-
-/*
-** Which fields are which on a Link line.
-*/
-
-#define LF_FROM		1
-#define LF_TO		2
-#define LINK_FIELDS	3
-
-/*
-** Which fields are which on a Leap line.
-*/
-
-#define LP_YEAR		1
-#define LP_MONTH	2
-#define LP_DAY		3
-#define LP_TIME		4
-#define LP_CORR		5
-#define LP_ROLL		6
-#define LEAP_FIELDS	7
-
-/*
-** Year synonyms.
-*/
-
-#define YR_MINIMUM	0
-#define YR_MAXIMUM	1
-#define YR_ONLY		2
-
-static struct rule *	rules;
-static int		nrules;	/* number of rules */
-static int		nrules_alloc;
-
-static struct zone *	zones;
-static int		nzones;	/* number of zones */
-static int		nzones_alloc;
-
-struct link {
-	const char *	l_filename;
-	int		l_linenum;
-	const char *	l_from;
-	const char *	l_to;
-};
-
-static struct link *	links;
-static int		nlinks;
-static int		nlinks_alloc;
-
-struct lookup {
-	const char *	l_word;
-	const int	l_value;
-};
-
-static struct lookup const *	byword(const char * string,
-					const struct lookup * lp);
-
-static struct lookup const	line_codes[] = {
-	{ "Rule",	LC_RULE },
-	{ "Zone",	LC_ZONE },
-	{ "Link",	LC_LINK },
-	{ "Leap",	LC_LEAP },
-	{ NULL,		0}
-};
-
-static struct lookup const	mon_names[] = {
-	{ "January",	TM_JANUARY },
-	{ "February",	TM_FEBRUARY },
-	{ "March",	TM_MARCH },
-	{ "April",	TM_APRIL },
-	{ "May",	TM_MAY },
-	{ "June",	TM_JUNE },
-	{ "July",	TM_JULY },
-	{ "August",	TM_AUGUST },
-	{ "September",	TM_SEPTEMBER },
-	{ "October",	TM_OCTOBER },
-	{ "November",	TM_NOVEMBER },
-	{ "December",	TM_DECEMBER },
-	{ NULL,		0 }
-};
-
-static struct lookup const	wday_names[] = {
-	{ "Sunday",	TM_SUNDAY },
-	{ "Monday",	TM_MONDAY },
-	{ "Tuesday",	TM_TUESDAY },
-	{ "Wednesday",	TM_WEDNESDAY },
-	{ "Thursday",	TM_THURSDAY },
-	{ "Friday",	TM_FRIDAY },
-	{ "Saturday",	TM_SATURDAY },
-	{ NULL,		0 }
-};
-
-static struct lookup const	lasts[] = {
-	{ "last-Sunday",	TM_SUNDAY },
-	{ "last-Monday",	TM_MONDAY },
-	{ "last-Tuesday",	TM_TUESDAY },
-	{ "last-Wednesday",	TM_WEDNESDAY },
-	{ "last-Thursday",	TM_THURSDAY },
-	{ "last-Friday",	TM_FRIDAY },
-	{ "last-Saturday",	TM_SATURDAY },
-	{ NULL,			0 }
-};
-
-static struct lookup const	begin_years[] = {
-	{ "minimum",	YR_MINIMUM },
-	{ "maximum",	YR_MAXIMUM },
-	{ NULL,		0 }
-};
-
-static struct lookup const	end_years[] = {
-	{ "minimum",	YR_MINIMUM },
-	{ "maximum",	YR_MAXIMUM },
-	{ "only",	YR_ONLY },
-	{ NULL,		0 }
-};
-
-static struct lookup const	leap_types[] = {
-	{ "Rolling",	true },
-	{ "Stationary",	false },
-	{ NULL,		0 }
-};
-
-static const int	len_months[2][MONSPERYEAR] = {
-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-static const int	len_years[2] = {
-	DAYSPERNYEAR, DAYSPERLYEAR
-};
-
-static struct attype {
-	zic_t		at;
-	unsigned char	type;
-} *			attypes;
-static zic_t		gmtoffs[TZ_MAX_TYPES];
-static char		isdsts[TZ_MAX_TYPES];
-static unsigned char	abbrinds[TZ_MAX_TYPES];
-static bool		ttisstds[TZ_MAX_TYPES];
-static bool		ttisgmts[TZ_MAX_TYPES];
-static char		chars[TZ_MAX_CHARS];
-static zic_t		trans[TZ_MAX_LEAPS];
-static zic_t		corr[TZ_MAX_LEAPS];
-static char		roll[TZ_MAX_LEAPS];
-
-/*
-** Memory allocation.
-*/
-
-static _Noreturn void
-memory_exhausted(const char *msg)
-{
-	fprintf(stderr, _("%s: Memory exhausted: %s\n"), progname, msg);
-	exit(EXIT_FAILURE);
-}
-
-static ATTRIBUTE_PURE size_t
-size_product(size_t nitems, size_t itemsize)
-{
-	if (SIZE_MAX / itemsize < nitems)
-		memory_exhausted(_("size overflow"));
-	return nitems * itemsize;
-}
-
-#if !HAVE_STRDUP
-static char *
-strdup(char const *str)
-{
-	char *result = malloc(strlen(str) + 1);
-	return result ? strcpy(result, str) : result;
-}
-#endif
-
-static ATTRIBUTE_PURE void *
-memcheck(void *ptr)
-{
-	if (ptr == NULL)
-		memory_exhausted(strerror(errno));
-	return ptr;
-}
-
-static void *
-zic_malloc(size_t size)
-{
-	return memcheck(malloc(size));
-}
-
-static void *
-zic_realloc(void *ptr, size_t size)
-{
-	return memcheck(realloc(ptr, size));
-}
-
-static char *
-ecpyalloc(char const *str)
-{
-	return memcheck(strdup(str));
-}
-
-static void *
-growalloc(void *ptr, size_t itemsize, int nitems, int *nitems_alloc)
-{
-	if (nitems < *nitems_alloc)
-		return ptr;
-	else {
-		int amax = INT_MAX < SIZE_MAX ? INT_MAX : SIZE_MAX;
-		if ((amax - 1) / 3 * 2 < *nitems_alloc)
-			memory_exhausted(_("int overflow"));
-		*nitems_alloc = *nitems_alloc + (*nitems_alloc >> 1) + 1;
-		return zic_realloc(ptr, size_product(*nitems_alloc, itemsize));
-	}
-}
-
-/*
-** Error handling.
-*/
-
-static void
-eats(const char *const name, const int num, const char *const rname,
-    const int rnum)
-{
-	filename = name;
-	linenum = num;
-	rfilename = rname;
-	rlinenum = rnum;
-}
-
-static void
-eat(const char *const name, const int num)
-{
-	eats(name, num, NULL, -1);
-}
-
-static void ATTRIBUTE_FORMAT((printf, 1, 0))
-verror(const char *const string, va_list args)
-{
-	/*
-	** Match the format of "cc" to allow sh users to
-	**	zic ... 2>&1 | error -t "*" -v
-	** on BSD systems.
-	*/
-	if (filename)
-	  fprintf(stderr, _("\"%s\", line %d: "), filename, linenum);
-	vfprintf(stderr, string, args);
-	if (rfilename != NULL)
-		fprintf(stderr, _(" (rule from \"%s\", line %d)"),
-			rfilename, rlinenum);
-	fprintf(stderr, "\n");
-}
-
-static void ATTRIBUTE_FORMAT((printf, 1, 2))
-error(const char *const string, ...)
-{
-	va_list args;
-	va_start(args, string);
-	verror(string, args);
-	va_end(args);
-	errors = true;
-}
-
-static void ATTRIBUTE_FORMAT((printf, 1, 2))
-warning(const char *const string, ...)
-{
-	va_list args;
-	fprintf(stderr, _("warning: "));
-	va_start(args, string);
-	verror(string, args);
-	va_end(args);
-	warnings = true;
-}
-
-static void
-close_file(FILE *stream, char const *name)
-{
-  char const *e = (ferror(stream) ? _("I/O error")
-		   : fclose(stream) != 0 ? strerror(errno) : NULL);
-  if (e) {
-    fprintf(stderr, "%s: ", progname);
-    if (name)
-      fprintf(stderr, "%s: ", name);
-    fprintf(stderr, "%s\n", e);
-    exit(EXIT_FAILURE);
-  }
-}
-
-static _Noreturn void
-usage(FILE *stream, int status)
-{
-  fprintf(stream,
-	  _("%s: usage is %s [ --version ] [ --help ] [ -v ] \\\n"
-	    "\t[ -l localtime ] [ -p posixrules ] [ -d directory ] \\\n"
-	    "\t[ -L leapseconds ] [ filename ... ]\n\n"
-	    "Report bugs to %s.\n"),
-	  progname, progname, REPORT_BUGS_TO);
-  if (status == EXIT_SUCCESS)
-    close_file(stream, NULL);
-  exit(status);
-}
-
-static const char *	psxrules;
-static const char *	lcltime;
-static const char *	directory;
-static const char *	leapsec;
-static const char *	yitcommand;
-
-int
-main(int argc, char *argv[])
-{
-	int	i;
-	int	j;
-	int	c;
-
-#ifdef S_IWGRP
-	(void) umask(umask(S_IWGRP | S_IWOTH) | (S_IWGRP | S_IWOTH));
-#endif
-#if HAVE_GETTEXT - 0
-	(void) setlocale(LC_MESSAGES, "");
-#ifdef TZ_DOMAINDIR
-	(void) bindtextdomain(TZ_DOMAIN, TZ_DOMAINDIR);
-#endif /* defined TEXTDOMAINDIR */
-	(void) textdomain(TZ_DOMAIN);
-#endif /* HAVE_GETTEXT */
-	progname = argv[0];
-	if (TYPE_BIT(zic_t) < 64) {
-		(void) fprintf(stderr, "%s: %s\n", progname,
-			_("wild compilation-time specification of zic_t"));
-		return EXIT_FAILURE;
-	}
-	for (i = 1; i < argc; ++i)
-		if (strcmp(argv[i], "--version") == 0) {
-			(void) printf("zic %s%s\n", PKGVERSION, TZVERSION);
-			close_file(stdout, NULL);
-			return EXIT_SUCCESS;
-		} else if (strcmp(argv[i], "--help") == 0) {
-			usage(stdout, EXIT_SUCCESS);
-		}
-	while ((c = getopt(argc, argv, "d:l:p:L:vsy:")) != EOF && c != -1)
-		switch (c) {
-			default:
-				usage(stderr, EXIT_FAILURE);
-			case 'd':
-				if (directory == NULL)
-					directory = optarg;
-				else {
-					fprintf(stderr,
-_("%s: More than one -d option specified\n"),
-						progname);
-					return EXIT_FAILURE;
-				}
-				break;
-			case 'l':
-				if (lcltime == NULL)
-					lcltime = optarg;
-				else {
-					fprintf(stderr,
-_("%s: More than one -l option specified\n"),
-						progname);
-					return EXIT_FAILURE;
-				}
-				break;
-			case 'p':
-				if (psxrules == NULL)
-					psxrules = optarg;
-				else {
-					fprintf(stderr,
-_("%s: More than one -p option specified\n"),
-						progname);
-					return EXIT_FAILURE;
-				}
-				break;
-			case 'y':
-				if (yitcommand == NULL)
-					yitcommand = optarg;
-				else {
-					fprintf(stderr,
-_("%s: More than one -y option specified\n"),
-						progname);
-					return EXIT_FAILURE;
-				}
-				break;
-			case 'L':
-				if (leapsec == NULL)
-					leapsec = optarg;
-				else {
-					fprintf(stderr,
-_("%s: More than one -L option specified\n"),
-						progname);
-					return EXIT_FAILURE;
-				}
-				break;
-			case 'v':
-				noise = true;
-				break;
-			case 's':
-				warning(_("-s ignored"));
-				break;
-		}
-	if (optind == argc - 1 && strcmp(argv[optind], "=") == 0)
-		usage(stderr, EXIT_FAILURE);	/* usage message by request */
-	if (directory == NULL)
-		directory = TZDIR;
-	if (yitcommand == NULL)
-		yitcommand = "yearistype";
-
-	if (optind < argc && leapsec != NULL) {
-		infile(leapsec);
-		adjleap();
-	}
-
-	for (i = optind; i < argc; ++i)
-		infile(argv[i]);
-	if (errors)
-		return EXIT_FAILURE;
-	associate();
-	for (i = 0; i < nzones; i = j) {
-		/*
-		** Find the next non-continuation zone entry.
-		*/
-		for (j = i + 1; j < nzones && zones[j].z_name == NULL; ++j)
-			continue;
-		outzone(&zones[i], j - i);
-	}
-	/*
-	** Make links.
-	*/
-	for (i = 0; i < nlinks; ++i) {
-		eat(links[i].l_filename, links[i].l_linenum);
-		dolink(links[i].l_from, links[i].l_to);
-		if (noise)
-			for (j = 0; j < nlinks; ++j)
-				if (strcmp(links[i].l_to,
-					links[j].l_from) == 0)
-						warning(_("link to link"));
-	}
-	if (lcltime != NULL) {
-		eat(_("command line"), 1);
-		dolink(lcltime, TZDEFAULT);
-	}
-	if (psxrules != NULL) {
-		eat(_("command line"), 1);
-		dolink(psxrules, TZDEFRULES);
-	}
-	if (warnings && (ferror(stderr) || fclose(stderr) != 0))
-	  return EXIT_FAILURE;
-	return errors ? EXIT_FAILURE : EXIT_SUCCESS;
-}
-
-static bool
-componentcheck(char const *name, char const *component,
-	       char const *component_end)
-{
-	enum { component_len_max = 14 };
-	size_t component_len = component_end - component;
-	if (component_len == 0) {
-	  if (!*name)
-	    error (_("empty file name"));
-	  else
-	    error (_(component == name
-		     ? "file name '%s' begins with '/'"
-		     : *component_end
-		     ? "file name '%s' contains '//'"
-		     : "file name '%s' ends with '/'"),
-		   name);
-	  return false;
-	}
-	if (0 < component_len && component_len <= 2
-	    && component[0] == '.' && component_end[-1] == '.') {
-	  error(_("file name '%s' contains '%.*s' component"),
-		name, (int) component_len, component);
-	  return false;
-	}
-	if (noise) {
-	  if (0 < component_len && component[0] == '-')
-	    warning(_("file name '%s' component contains leading '-'"),
-		    name);
-	  if (component_len_max < component_len)
-	    warning(_("file name '%s' contains overlength component"
-		      " '%.*s...'"),
-		    name, component_len_max, component);
-	}
-	return true;
-}
-
-static bool
-namecheck(const char *name)
-{
-	char const *cp;
-
-	/* Benign characters in a portable file name.  */
-	static char const benign[] =
-	  "-/_"
-	  "abcdefghijklmnopqrstuvwxyz"
-	  "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-	/* Non-control chars in the POSIX portable character set,
-	   excluding the benign characters.  */
-	static char const printable_and_not_benign[] =
-	  " !\"#$%&'()*+,.0123456789:;<=>?@[\\]^`{|}~";
-
-	char const *component = name;
-	for (cp = name; *cp; cp++) {
-		unsigned char c = *cp;
-		if (noise && !strchr(benign, c)) {
-			warning((strchr(printable_and_not_benign, c)
-				 ? _("file name '%s' contains byte '%c'")
-				 : _("file name '%s' contains byte '\\%o'")),
-				name, c);
-		}
-		if (c == '/') {
-			if (!componentcheck(name, component, cp))
-			  return false;
-			component = cp + 1;
-		}
-	}
-	return componentcheck(name, component, cp);
-}
-
-static char *
-relname(char const *dir, char const *base)
-{
-	if (*base == '/')
-		return ecpyalloc(base);
-	else {
-		size_t dir_len = strlen(dir);
-		bool needs_slash = dir_len && dir[dir_len - 1] != '/';
-		char *result = zic_malloc(dir_len + needs_slash + strlen(base) + 1);
-		result[dir_len] = '/';
-		strcpy(result + dir_len + needs_slash, base);
-		return memcpy(result, dir, dir_len);
-	}
-}
-
-static void
-dolink(char const *fromfield, char const *tofield)
-{
-	char *	fromname;
-	char *	toname;
-	int fromisdir;
-
-	fromname = relname(directory, fromfield);
-	toname = relname(directory, tofield);
-	/*
-	** We get to be careful here since
-	** there's a fair chance of root running us.
-	*/
-	fromisdir = itsdir(fromname);
-	if (fromisdir) {
-		char const *e = strerror(fromisdir < 0 ? errno : EPERM);
-		fprintf(stderr, _("%s: link from %s failed: %s"),
-			progname, fromname, e);
-		exit(EXIT_FAILURE);
-	}
-	if (itsdir(toname) <= 0)
-		remove(toname);
-	if (link(fromname, toname) != 0) {
-		int	result;
-
-		if (! mkdirs(toname))
-			exit(EXIT_FAILURE);
-
-		result = link(fromname, toname);
-		if (result != 0) {
-				const char *s = fromfield;
-				const char *t;
-				char *p;
-				size_t dotdots = 0;
-				char * symlinkcontents = NULL;
-
-				do
-					 t = s;
-				while ((s = strchr(s, '/'))
-				       && ! strncmp (fromfield, tofield,
-						     ++s - fromfield));
-
-				for (s = tofield + (t - fromfield); *s; s++)
-					dotdots += *s == '/';
-				symlinkcontents
-				    = zic_malloc(3 * dotdots + strlen(t) + 1);
-				for (p = symlinkcontents; dotdots-- != 0; p += 3)
-					memcpy(p, "../", 3);
-				strcpy(p, t);
-				result = symlink(symlinkcontents, toname);
-				if (result == 0)
-					warning(_("hard link failed, symbolic link used"));
-				free(symlinkcontents);
-		}
-		if (result != 0) {
-			FILE *fp, *tp;
-			int c;
-			fp = fopen(fromname, "rb");
-			if (!fp) {
-				const char *e = strerror(errno);
-				fprintf(stderr,
-					       _("%s: Can't read %s: %s\n"),
-					       progname, fromname, e);
-				exit(EXIT_FAILURE);
-			}
-			tp = fopen(toname, "wb");
-			if (!tp) {
-				const char *e = strerror(errno);
-				fprintf(stderr,
-					       _("%s: Can't create %s: %s\n"),
-					       progname, toname, e);
-				exit(EXIT_FAILURE);
-			}
-			while ((c = getc(fp)) != EOF)
-				putc(c, tp);
-			close_file(fp, fromname);
-			close_file(tp, toname);
-			warning(_("link failed, copy used"));
-		}
-	}
-	free(fromname);
-	free(toname);
-}
-
-#define TIME_T_BITS_IN_FILE	64
-
-static zic_t const min_time = MINVAL (zic_t, TIME_T_BITS_IN_FILE);
-static zic_t const max_time = MAXVAL (zic_t, TIME_T_BITS_IN_FILE);
-
-/* Estimated time of the Big Bang, in seconds since the POSIX epoch.
-   rounded downward to the negation of a power of two that is
-   comfortably outside the error bounds.
-
-   zic does not output time stamps before this, partly because they
-   are physically suspect, and partly because GNOME mishandles them; see
-   GNOME bug 730332 <https://bugzilla.gnome.org/show_bug.cgi?id=730332>.
-
-   For the time of the Big Bang, see:
-
-   Ade PAR, Aghanim N, Armitage-Caplan C et al.  Planck 2013 results.
-   I. Overview of products and scientific results.
-   arXiv:1303.5062 2013-03-20 20:10:01 UTC
-   <http://arxiv.org/pdf/1303.5062v1> [PDF]
-
-   Page 36, Table 9, row Age/Gyr, column Planck+WP+highL+BAO 68% limits
-   gives the value 13.798 plus-or-minus 0.037 billion years.
-   Multiplying this by 1000000000 and then by 31557600 (the number of
-   seconds in an astronomical year) gives a value that is comfortably
-   less than 2**59, so BIG_BANG is - 2**59.
-
-   BIG_BANG is approximate, and may change in future versions.
-   Please do not rely on its exact value.  */
-
-#ifndef BIG_BANG
-#define BIG_BANG (- (1LL << 59))
-#endif
-
-static const zic_t big_bang_time = BIG_BANG;
-
-/* Return 1 if NAME is a directory, 0 if it's something else, -1 if trouble.  */
-static int
-itsdir(char const *name)
-{
-	struct stat st;
-	int res = stat(name, &st);
-	if (res != 0)
-		return res;
-#ifdef S_ISDIR
-	return S_ISDIR(st.st_mode) != 0;
-#else
-	{
-		char *nameslashdot = relname(name, ".");
-		res = stat(nameslashdot, &st);
-		free(nameslashdot);
-		return res == 0;
-	}
-#endif
-}
-
-/*
-** Associate sets of rules with zones.
-*/
-
-/*
-** Sort by rule name.
-*/
-
-static int
-rcomp(const void *cp1, const void *cp2)
-{
-	return strcmp(((const struct rule *) cp1)->r_name,
-		((const struct rule *) cp2)->r_name);
-}
-
-static void
-associate(void)
-{
-	struct zone *	zp;
-	struct rule *	rp;
-	int		base, out;
-	int		i, j;
-
-	if (nrules != 0) {
-		(void) qsort(rules, (size_t)nrules, sizeof *rules, rcomp);
-		for (i = 0; i < nrules - 1; ++i) {
-			if (strcmp(rules[i].r_name,
-				rules[i + 1].r_name) != 0)
-					continue;
-			if (strcmp(rules[i].r_filename,
-				rules[i + 1].r_filename) == 0)
-					continue;
-			eat(rules[i].r_filename, rules[i].r_linenum);
-			warning(_("same rule name in multiple files"));
-			eat(rules[i + 1].r_filename, rules[i + 1].r_linenum);
-			warning(_("same rule name in multiple files"));
-			for (j = i + 2; j < nrules; ++j) {
-				if (strcmp(rules[i].r_name,
-					rules[j].r_name) != 0)
-						break;
-				if (strcmp(rules[i].r_filename,
-					rules[j].r_filename) == 0)
-						continue;
-				if (strcmp(rules[i + 1].r_filename,
-					rules[j].r_filename) == 0)
-						continue;
-				break;
-			}
-			i = j - 1;
-		}
-	}
-	for (i = 0; i < nzones; ++i) {
-		zp = &zones[i];
-		zp->z_rules = NULL;
-		zp->z_nrules = 0;
-	}
-	for (base = 0; base < nrules; base = out) {
-		rp = &rules[base];
-		for (out = base + 1; out < nrules; ++out)
-			if (strcmp(rp->r_name, rules[out].r_name) != 0)
-				break;
-		for (i = 0; i < nzones; ++i) {
-			zp = &zones[i];
-			if (strcmp(zp->z_rule, rp->r_name) != 0)
-				continue;
-			zp->z_rules = rp;
-			zp->z_nrules = out - base;
-		}
-	}
-	for (i = 0; i < nzones; ++i) {
-		zp = &zones[i];
-		if (zp->z_nrules == 0) {
-			/*
-			** Maybe we have a local standard time offset.
-			*/
-			eat(zp->z_filename, zp->z_linenum);
-			zp->z_stdoff = gethms(zp->z_rule, _("unruly zone"),
-				true);
-			/*
-			** Note, though, that if there's no rule,
-			** a '%s' in the format is a bad thing.
-			*/
-			if (zp->z_format_specifier == 's')
-				error("%s", _("%s in ruleless zone"));
-		}
-	}
-	if (errors)
-		exit(EXIT_FAILURE);
-}
-
-static void
-infile(const char *name)
-{
-	FILE *			fp;
-	char **		fields;
-	char *			cp;
-	const struct lookup *	lp;
-	int			nfields;
-	bool			wantcont;
-	int			num;
-	char				buf[BUFSIZ];
-
-	if (strcmp(name, "-") == 0) {
-		name = _("standard input");
-		fp = stdin;
-	} else if ((fp = fopen(name, "r")) == NULL) {
-		const char *e = strerror(errno);
-
-		fprintf(stderr, _("%s: Can't open %s: %s\n"),
-			progname, name, e);
-		exit(EXIT_FAILURE);
-	}
-	wantcont = false;
-	for (num = 1; ; ++num) {
-		eat(name, num);
-		if (fgets(buf, (int) sizeof buf, fp) != buf)
-			break;
-		cp = strchr(buf, '\n');
-		if (cp == NULL) {
-			error(_("line too long"));
-			exit(EXIT_FAILURE);
-		}
-		*cp = '\0';
-		fields = getfields(buf);
-		nfields = 0;
-		while (fields[nfields] != NULL) {
-			static char	nada;
-
-			if (strcmp(fields[nfields], "-") == 0)
-				fields[nfields] = &nada;
-			++nfields;
-		}
-		if (nfields == 0) {
-			/* nothing to do */
-		} else if (wantcont) {
-			wantcont = inzcont(fields, nfields);
-		} else {
-			lp = byword(fields[0], line_codes);
-			if (lp == NULL)
-				error(_("input line of unknown type"));
-			else switch ((int) (lp->l_value)) {
-				case LC_RULE:
-					inrule(fields, nfields);
-					wantcont = false;
-					break;
-				case LC_ZONE:
-					wantcont = inzone(fields, nfields);
-					break;
-				case LC_LINK:
-					inlink(fields, nfields);
-					wantcont = false;
-					break;
-				case LC_LEAP:
-					if (name != leapsec)
-					  warning(_("%s: Leap line in non leap"
-						    " seconds file %s"),
-						  progname, name);
-					else	inleap(fields, nfields);
-					wantcont = false;
-					break;
-				default:	/* "cannot happen" */
-					fprintf(stderr,
-_("%s: panic: Invalid l_value %d\n"),
-						progname, lp->l_value);
-					exit(EXIT_FAILURE);
-			}
-		}
-		free(fields);
-	}
-	close_file(fp, filename);
-	if (wantcont)
-		error(_("expected continuation line not found"));
-}
-
-/*
-** Convert a string of one of the forms
-**	h	-h	hh:mm	-hh:mm	hh:mm:ss	-hh:mm:ss
-** into a number of seconds.
-** A null string maps to zero.
-** Call error with errstring and return zero on errors.
-*/
-
-static zic_t
-gethms(char const *string, char const *errstring, bool signable)
-{
-	zic_t	hh;
-	int	mm, ss, sign;
-	char	xs;
-
-	if (string == NULL || *string == '\0')
-		return 0;
-	if (!signable)
-		sign = 1;
-	else if (*string == '-') {
-		sign = -1;
-		++string;
-	} else	sign = 1;
-	if (sscanf(string, "%"SCNdZIC"%c", &hh, &xs) == 1)
-		mm = ss = 0;
-	else if (sscanf(string, "%"SCNdZIC":%d%c", &hh, &mm, &xs) == 2)
-		ss = 0;
-	else if (sscanf(string, "%"SCNdZIC":%d:%d%c", &hh, &mm, &ss, &xs)
-		 != 3) {
-			error("%s", errstring);
-			return 0;
-	}
-	if (hh < 0 ||
-		mm < 0 || mm >= MINSPERHOUR ||
-		ss < 0 || ss > SECSPERMIN) {
-			error("%s", errstring);
-			return 0;
-	}
-	if (ZIC_MAX / SECSPERHOUR < hh) {
-		error(_("time overflow"));
-		return 0;
-	}
-	if (noise && (hh > HOURSPERDAY ||
-		(hh == HOURSPERDAY && (mm != 0 || ss != 0))))
-warning(_("values over 24 hours not handled by pre-2007 versions of zic"));
-	return oadd(sign * hh * SECSPERHOUR,
-		    sign * (mm * SECSPERMIN + ss));
-}
-
-static void
-inrule(char **fields, int nfields)
-{
-	static struct rule	r;
-
-	if (nfields != RULE_FIELDS) {
-		error(_("wrong number of fields on Rule line"));
-		return;
-	}
-	if (*fields[RF_NAME] == '\0') {
-		error(_("nameless rule"));
-		return;
-	}
-	r.r_filename = filename;
-	r.r_linenum = linenum;
-	r.r_stdoff = gethms(fields[RF_STDOFF], _("invalid saved time"), true);
-	rulesub(&r, fields[RF_LOYEAR], fields[RF_HIYEAR], fields[RF_COMMAND],
-		fields[RF_MONTH], fields[RF_DAY], fields[RF_TOD]);
-	r.r_name = ecpyalloc(fields[RF_NAME]);
-	r.r_abbrvar = ecpyalloc(fields[RF_ABBRVAR]);
-	if (max_abbrvar_len < strlen(r.r_abbrvar))
-		max_abbrvar_len = strlen(r.r_abbrvar);
-	rules = growalloc(rules, sizeof *rules, nrules, &nrules_alloc);
-	rules[nrules++] = r;
-}
-
-static bool
-inzone(char **fields, int nfields)
-{
-	int	i;
-
-	if (nfields < ZONE_MINFIELDS || nfields > ZONE_MAXFIELDS) {
-		error(_("wrong number of fields on Zone line"));
-		return false;
-	}
-	if (strcmp(fields[ZF_NAME], TZDEFAULT) == 0 && lcltime != NULL) {
-		error(
-_("\"Zone %s\" line and -l option are mutually exclusive"),
-			TZDEFAULT);
-		return false;
-	}
-	if (strcmp(fields[ZF_NAME], TZDEFRULES) == 0 && psxrules != NULL) {
-		error(
-_("\"Zone %s\" line and -p option are mutually exclusive"),
-			TZDEFRULES);
-		return false;
-	}
-	for (i = 0; i < nzones; ++i)
-		if (zones[i].z_name != NULL &&
-			strcmp(zones[i].z_name, fields[ZF_NAME]) == 0) {
-			error(
-_("duplicate zone name %s (file \"%s\", line %d)"),
-					fields[ZF_NAME],
-					zones[i].z_filename,
-					zones[i].z_linenum);
-				return false;
-		}
-	return inzsub(fields, nfields, false);
-}
-
-static bool
-inzcont(char **fields, int nfields)
-{
-	if (nfields < ZONEC_MINFIELDS || nfields > ZONEC_MAXFIELDS) {
-		error(_("wrong number of fields on Zone continuation line"));
-		return false;
-	}
-	return inzsub(fields, nfields, true);
-}
-
-static bool
-inzsub(char **const fields, const int nfields, const int iscont)
-{
-	char *		cp;
-	char *		cp1;
-	static struct zone	z;
-	int		i_gmtoff, i_rule, i_format;
-	int		i_untilyear, i_untilmonth;
-	int		i_untilday, i_untiltime;
-	bool		hasuntil;
-
-	if (iscont) {
-		i_gmtoff = ZFC_GMTOFF;
-		i_rule = ZFC_RULE;
-		i_format = ZFC_FORMAT;
-		i_untilyear = ZFC_TILYEAR;
-		i_untilmonth = ZFC_TILMONTH;
-		i_untilday = ZFC_TILDAY;
-		i_untiltime = ZFC_TILTIME;
-		z.z_name = NULL;
-	} else if (!namecheck(fields[ZF_NAME]))
-		return false;
-	else {
-		i_gmtoff = ZF_GMTOFF;
-		i_rule = ZF_RULE;
-		i_format = ZF_FORMAT;
-		i_untilyear = ZF_TILYEAR;
-		i_untilmonth = ZF_TILMONTH;
-		i_untilday = ZF_TILDAY;
-		i_untiltime = ZF_TILTIME;
-		z.z_name = ecpyalloc(fields[ZF_NAME]);
-	}
-	z.z_filename = filename;
-	z.z_linenum = linenum;
-	z.z_gmtoff = gethms(fields[i_gmtoff], _("invalid UT offset"), true);
-	if ((cp = strchr(fields[i_format], '%')) != 0) {
-		if ((*++cp != 's' && *cp != 'z') || strchr(cp, '%')
-		    || strchr(fields[i_format], '/')) {
-			error(_("invalid abbreviation format"));
-			return false;
-		}
-	}
-	z.z_rule = ecpyalloc(fields[i_rule]);
-	z.z_format = cp1 = ecpyalloc(fields[i_format]);
-	z.z_format_specifier = cp ? *cp : '\0';
-	if (z.z_format_specifier == 'z') {
-	  if (noise)
-	    warning(_("format '%s' not handled by pre-2015 versions of zic"),
-		    z.z_format);
-	  cp1[cp - fields[i_format]] = 's';
-	}
-	if (max_format_len < strlen(z.z_format))
-		max_format_len = strlen(z.z_format);
-	hasuntil = nfields > i_untilyear;
-	if (hasuntil) {
-		z.z_untilrule.r_filename = filename;
-		z.z_untilrule.r_linenum = linenum;
-		rulesub(&z.z_untilrule,
-			fields[i_untilyear],
-			"only",
-			"",
-			(nfields > i_untilmonth) ?
-			fields[i_untilmonth] : "Jan",
-			(nfields > i_untilday) ? fields[i_untilday] : "1",
-			(nfields > i_untiltime) ? fields[i_untiltime] : "0");
-		z.z_untiltime = rpytime(&z.z_untilrule,
-			z.z_untilrule.r_loyear);
-		if (iscont && nzones > 0 &&
-			z.z_untiltime > min_time &&
-			z.z_untiltime < max_time &&
-			zones[nzones - 1].z_untiltime > min_time &&
-			zones[nzones - 1].z_untiltime < max_time &&
-			zones[nzones - 1].z_untiltime >= z.z_untiltime) {
-				error(_(
-"Zone continuation line end time is not after end time of previous line"
-					));
-				return false;
-		}
-	}
-	zones = growalloc(zones, sizeof *zones, nzones, &nzones_alloc);
-	zones[nzones++] = z;
-	/*
-	** If there was an UNTIL field on this line,
-	** there's more information about the zone on the next line.
-	*/
-	return hasuntil;
-}
-
-static void
-inleap(char **fields, int nfields)
-{
-	const char *		cp;
-	const struct lookup *	lp;
-	int			i, j;
-	zic_t			year;
-	int			month, day;
-	zic_t			dayoff, tod;
-	zic_t			t;
-	char			xs;
-
-	if (nfields != LEAP_FIELDS) {
-		error(_("wrong number of fields on Leap line"));
-		return;
-	}
-	dayoff = 0;
-	cp = fields[LP_YEAR];
-	if (sscanf(cp, "%"SCNdZIC"%c", &year, &xs) != 1) {
-		/*
-		** Leapin' Lizards!
-		*/
-		error(_("invalid leaping year"));
-		return;
-	}
-	if (!leapseen || leapmaxyear < year)
-		leapmaxyear = year;
-	if (!leapseen || leapminyear > year)
-		leapminyear = year;
-	leapseen = true;
-	j = EPOCH_YEAR;
-	while (j != year) {
-		if (year > j) {
-			i = len_years[isleap(j)];
-			++j;
-		} else {
-			--j;
-			i = -len_years[isleap(j)];
-		}
-		dayoff = oadd(dayoff, i);
-	}
-	if ((lp = byword(fields[LP_MONTH], mon_names)) == NULL) {
-		error(_("invalid month name"));
-		return;
-	}
-	month = lp->l_value;
-	j = TM_JANUARY;
-	while (j != month) {
-		i = len_months[isleap(year)][j];
-		dayoff = oadd(dayoff, i);
-		++j;
-	}
-	cp = fields[LP_DAY];
-	if (sscanf(cp, "%d%c", &day, &xs) != 1 ||
-		day <= 0 || day > len_months[isleap(year)][month]) {
-			error(_("invalid day of month"));
-			return;
-	}
-	dayoff = oadd(dayoff, day - 1);
-	if (dayoff < min_time / SECSPERDAY) {
-		error(_("time too small"));
-		return;
-	}
-	if (dayoff > max_time / SECSPERDAY) {
-		error(_("time too large"));
-		return;
-	}
-	t = dayoff * SECSPERDAY;
-	tod = gethms(fields[LP_TIME], _("invalid time of day"), false);
-	cp = fields[LP_CORR];
-	{
-		bool	positive;
-		int	count;
-
-		if (strcmp(cp, "") == 0) { /* infile() turns "-" into "" */
-			positive = false;
-			count = 1;
-		} else if (strcmp(cp, "--") == 0) {
-			positive = false;
-			count = 2;
-		} else if (strcmp(cp, "+") == 0) {
-			positive = true;
-			count = 1;
-		} else if (strcmp(cp, "++") == 0) {
-			positive = true;
-			count = 2;
-		} else {
-			error(_("illegal CORRECTION field on Leap line"));
-			return;
-		}
-		if ((lp = byword(fields[LP_ROLL], leap_types)) == NULL) {
-			error(_(
-				"illegal Rolling/Stationary field on Leap line"
-				));
-			return;
-		}
-		t = tadd(t, tod);
-		if (t < big_bang_time) {
-			error(_("leap second precedes Big Bang"));
-			return;
-		}
-		leapadd(t, positive, lp->l_value, count);
-	}
-}
-
-static void
-inlink(char **const fields, const int nfields)
-{
-	struct link	l;
-
-	if (nfields != LINK_FIELDS) {
-		error(_("wrong number of fields on Link line"));
-		return;
-	}
-	if (*fields[LF_FROM] == '\0') {
-		error(_("blank FROM field on Link line"));
-		return;
-	}
-	if (! namecheck(fields[LF_TO]))
-	  return;
-	l.l_filename = filename;
-	l.l_linenum = linenum;
-	l.l_from = ecpyalloc(fields[LF_FROM]);
-	l.l_to = ecpyalloc(fields[LF_TO]);
-	links = growalloc(links, sizeof *links, nlinks, &nlinks_alloc);
-	links[nlinks++] = l;
-}
-
-static void
-rulesub(struct rule *rp, const char *loyearp, const char *hiyearp,
-    const char *typep, const char *monthp, const char *dayp,
-    const char *timep)
-{
-	const struct lookup *	lp;
-	const char *		cp;
-	char *			dp;
-	char *			ep;
-	char			xs;
-
-	if ((lp = byword(monthp, mon_names)) == NULL) {
-		error(_("invalid month name"));
-		return;
-	}
-	rp->r_month = lp->l_value;
-	rp->r_todisstd = false;
-	rp->r_todisgmt = false;
-	dp = ecpyalloc(timep);
-	if (*dp != '\0') {
-		ep = dp + strlen(dp) - 1;
-		switch (lowerit(*ep)) {
-			case 's':	/* Standard */
-				rp->r_todisstd = true;
-				rp->r_todisgmt = false;
-				*ep = '\0';
-				break;
-			case 'w':	/* Wall */
-				rp->r_todisstd = false;
-				rp->r_todisgmt = false;
-				*ep = '\0';
-				break;
-			case 'g':	/* Greenwich */
-			case 'u':	/* Universal */
-			case 'z':	/* Zulu */
-				rp->r_todisstd = true;
-				rp->r_todisgmt = true;
-				*ep = '\0';
-				break;
-		}
-	}
-	rp->r_tod = gethms(dp, _("invalid time of day"), false);
-	free(dp);
-	/*
-	** Year work.
-	*/
-	cp = loyearp;
-	lp = byword(cp, begin_years);
-	rp->r_lowasnum = lp == NULL;
-	if (!rp->r_lowasnum) switch ((int) lp->l_value) {
-		case YR_MINIMUM:
-			rp->r_loyear = ZIC_MIN;
-			break;
-		case YR_MAXIMUM:
-			rp->r_loyear = ZIC_MAX;
-			break;
-		default:	/* "cannot happen" */
-			fprintf(stderr,
-				_("%s: panic: Invalid l_value %d\n"),
-				progname, lp->l_value);
-			exit(EXIT_FAILURE);
-	} else if (sscanf(cp, "%"SCNdZIC"%c", &rp->r_loyear, &xs) != 1) {
-		error(_("invalid starting year"));
-		return;
-	}
-	cp = hiyearp;
-	lp = byword(cp, end_years);
-	rp->r_hiwasnum = lp == NULL;
-	if (!rp->r_hiwasnum) switch ((int) lp->l_value) {
-		case YR_MINIMUM:
-			rp->r_hiyear = ZIC_MIN;
-			break;
-		case YR_MAXIMUM:
-			rp->r_hiyear = ZIC_MAX;
-			break;
-		case YR_ONLY:
-			rp->r_hiyear = rp->r_loyear;
-			break;
-		default:	/* "cannot happen" */
-			fprintf(stderr,
-				_("%s: panic: Invalid l_value %d\n"),
-				progname, lp->l_value);
-			exit(EXIT_FAILURE);
-	} else if (sscanf(cp, "%"SCNdZIC"%c", &rp->r_hiyear, &xs) != 1) {
-		error(_("invalid ending year"));
-		return;
-	}
-	if (rp->r_loyear > rp->r_hiyear) {
-		error(_("starting year greater than ending year"));
-		return;
-	}
-	if (*typep == '\0')
-		rp->r_yrtype = NULL;
-	else {
-		if (rp->r_loyear == rp->r_hiyear) {
-			error(_("typed single year"));
-			return;
-		}
-		rp->r_yrtype = ecpyalloc(typep);
-	}
-	/*
-	** Day work.
-	** Accept things such as:
-	**	1
-	**	last-Sunday
-	**	Sun<=20
-	**	Sun>=7
-	*/
-	dp = ecpyalloc(dayp);
-	if ((lp = byword(dp, lasts)) != NULL) {
-		rp->r_dycode = DC_DOWLEQ;
-		rp->r_wday = lp->l_value;
-		rp->r_dayofmonth = len_months[1][rp->r_month];
-	} else {
-		if ((ep = strchr(dp, '<')) != 0)
-			rp->r_dycode = DC_DOWLEQ;
-		else if ((ep = strchr(dp, '>')) != 0)
-			rp->r_dycode = DC_DOWGEQ;
-		else {
-			ep = dp;
-			rp->r_dycode = DC_DOM;
-		}
-		if (rp->r_dycode != DC_DOM) {
-			*ep++ = 0;
-			if (*ep++ != '=') {
-				error(_("invalid day of month"));
-				free(dp);
-				return;
-			}
-			if ((lp = byword(dp, wday_names)) == NULL) {
-				error(_("invalid weekday name"));
-				free(dp);
-				return;
-			}
-			rp->r_wday = lp->l_value;
-		}
-		if (sscanf(ep, "%d%c", &rp->r_dayofmonth, &xs) != 1 ||
-			rp->r_dayofmonth <= 0 ||
-			(rp->r_dayofmonth > len_months[1][rp->r_month])) {
-				error(_("invalid day of month"));
-				free(dp);
-				return;
-		}
-	}
-	free(dp);
-}
-
-static void
-convert(const zic_t val, char *const buf)
-{
-	int	i;
-	int	shift;
-	unsigned char *const b = (unsigned char *) buf;
-
-	for (i = 0, shift = 24; i < 4; ++i, shift -= 8)
-		b[i] = val >> shift;
-}
-
-static void
-convert64(const zic_t val, char *const buf)
-{
-	int	i;
-	int	shift;
-	unsigned char *const b = (unsigned char *) buf;
-
-	for (i = 0, shift = 56; i < 8; ++i, shift -= 8)
-		b[i] = val >> shift;
-}
-
-static void
-puttzcode(const zic_t val, FILE *const fp)
-{
-	char	buf[4];
-
-	convert(val, buf);
-	(void) fwrite(buf, sizeof buf, (size_t) 1, fp);
-}
-
-static void
-puttzcode64(const zic_t val, FILE *const fp)
-{
-	char	buf[8];
-
-	convert64(val, buf);
-	(void) fwrite(buf, sizeof buf, (size_t) 1, fp);
-}
-
-static int
-atcomp(const void *avp, const void *bvp)
-{
-	const zic_t	a = ((const struct attype *) avp)->at;
-	const zic_t	b = ((const struct attype *) bvp)->at;
-
-	return (a < b) ? -1 : (a > b);
-}
-
-static bool
-is32(const zic_t x)
-{
-	return INT32_MIN <= x && x <= INT32_MAX;
-}
-
-static void
-writezone(const char *const name, const char *const string, char version)
-{
-	FILE *			fp;
-	int			i, j;
-	int			leapcnt32, leapi32;
-	int			timecnt32, timei32;
-	int			pass;
-	char *			fullname;
-	static const struct tzhead	tzh0;
-	static struct tzhead		tzh;
-	zic_t *ats = zic_malloc(size_product(timecnt, sizeof *ats + 1));
-	void *typesptr = ats + timecnt;
-	unsigned char *types = typesptr;
-
-	/*
-	** Sort.
-	*/
-	if (timecnt > 1)
-		(void) qsort(attypes, (size_t) timecnt, sizeof *attypes,
-		    atcomp);
-	/*
-	** Optimize.
-	*/
-	{
-		int	fromi;
-		int	toi;
-
-		toi = 0;
-		fromi = 0;
-		while (fromi < timecnt && attypes[fromi].at < big_bang_time)
-			++fromi;
-		for ( ; fromi < timecnt; ++fromi) {
-			if (toi > 1 && ((attypes[fromi].at +
-				gmtoffs[attypes[toi - 1].type]) <=
-				(attypes[toi - 1].at +
-				gmtoffs[attypes[toi - 2].type]))) {
-					attypes[toi - 1].type =
-						attypes[fromi].type;
-					continue;
-			}
-			if (toi == 0 ||
-				attypes[toi - 1].type != attypes[fromi].type)
-					attypes[toi++] = attypes[fromi];
-		}
-		timecnt = toi;
-	}
-	if (noise && timecnt > 1200)
-		warning(_("pre-2014 clients may mishandle"
-			  " more than 1200 transition times"));
-	/*
-	** Transfer.
-	*/
-	for (i = 0; i < timecnt; ++i) {
-		ats[i] = attypes[i].at;
-		types[i] = attypes[i].type;
-	}
-	/*
-	** Correct for leap seconds.
-	*/
-	for (i = 0; i < timecnt; ++i) {
-		j = leapcnt;
-		while (--j >= 0)
-			if (ats[i] > trans[j] - corr[j]) {
-				ats[i] = tadd(ats[i], corr[j]);
-				break;
-			}
-	}
-	/*
-	** Figure out 32-bit-limited starts and counts.
-	*/
-	timecnt32 = timecnt;
-	timei32 = 0;
-	leapcnt32 = leapcnt;
-	leapi32 = 0;
-	while (timecnt32 > 0 && !is32(ats[timecnt32 - 1]))
-		--timecnt32;
-	while (timecnt32 > 0 && !is32(ats[timei32])) {
-		--timecnt32;
-		++timei32;
-	}
-	/*
-	** Output an INT32_MIN "transition" if appropriate; see below.
-	*/
-	if (timei32 > 0 && ats[timei32] > INT32_MIN) {
-		--timei32;
-		++timecnt32;
-	}
-	while (leapcnt32 > 0 && !is32(trans[leapcnt32 - 1]))
-		--leapcnt32;
-	while (leapcnt32 > 0 && !is32(trans[leapi32])) {
-		--leapcnt32;
-		++leapi32;
-	}
-	fullname = relname(directory, name);
-	/*
-	** Remove old file, if any, to snap links.
-	*/
-	if (itsdir(fullname) <= 0 && remove(fullname) != 0 && errno != ENOENT) {
-		const char *e = strerror(errno);
-
-		(void) fprintf(stderr, _("%s: Can't remove %s: %s\n"),
-			progname, fullname, e);
-		exit(EXIT_FAILURE);
-	}
-	if ((fp = fopen(fullname, "wb")) == NULL) {
-		if (! mkdirs(fullname))
-			exit(EXIT_FAILURE);
-		if ((fp = fopen(fullname, "wb")) == NULL) {
-			const char *e = strerror(errno);
-
-			(void) fprintf(stderr, _("%s: Can't create %s: %s\n"),
-				progname, fullname, e);
-			exit(EXIT_FAILURE);
-		}
-	}
-	for (pass = 1; pass <= 2; ++pass) {
-		int	thistimei, thistimecnt;
-		int	thisleapi, thisleapcnt;
-		int	thistimelim, thisleaplim;
-		int		writetype[TZ_MAX_TYPES];
-		int		typemap[TZ_MAX_TYPES];
-		int	thistypecnt;
-		char		thischars[TZ_MAX_CHARS];
-		char		thischarcnt;
-		int		indmap[TZ_MAX_CHARS];
-
-		if (pass == 1) {
-			thistimei = timei32;
-			thistimecnt = timecnt32;
-			thisleapi = leapi32;
-			thisleapcnt = leapcnt32;
-		} else {
-			thistimei = 0;
-			thistimecnt = timecnt;
-			thisleapi = 0;
-			thisleapcnt = leapcnt;
-		}
-		thistimelim = thistimei + thistimecnt;
-		thisleaplim = thisleapi + thisleapcnt;
-		for (i = 0; i < typecnt; ++i)
-			writetype[i] = thistimecnt == timecnt;
-		if (thistimecnt == 0) {
-			/*
-			** No transition times fall in the current
-			** (32- or 64-bit) window.
-			*/
-			if (typecnt != 0)
-				writetype[typecnt - 1] = true;
-		} else {
-			for (i = thistimei - 1; i < thistimelim; ++i)
-				if (i >= 0)
-					writetype[types[i]] = true;
-			/*
-			** For America/Godthab and Antarctica/Palmer
-			*/
-			if (thistimei == 0)
-				writetype[0] = true;
-		}
-#ifndef LEAVE_SOME_PRE_2011_SYSTEMS_IN_THE_LURCH
-		/*
-		** For some pre-2011 systems: if the last-to-be-written
-		** standard (or daylight) type has an offset different from the
-		** most recently used offset,
-		** append an (unused) copy of the most recently used type
-		** (to help get global "altzone" and "timezone" variables
-		** set correctly).
-		*/
-		{
-			int	mrudst, mrustd, hidst, histd, type;
-
-			hidst = histd = mrudst = mrustd = -1;
-			for (i = thistimei; i < thistimelim; ++i) {
-				if (i < 0)
-					continue;
-				if (isdsts[types[i]])
-					mrudst = types[i];
-				else	mrustd = types[i];
-			}
-			for (i = 0; i < typecnt; ++i)
-				if (writetype[i]) {
-					if (isdsts[i])
-						hidst = i;
-					else	histd = i;
-				}
-			if (hidst >= 0 && mrudst >= 0 && hidst != mrudst &&
-				gmtoffs[hidst] != gmtoffs[mrudst]) {
-					isdsts[mrudst] = -1;
-					type = addtype(gmtoffs[mrudst],
-						&chars[abbrinds[mrudst]],
-						true,
-						ttisstds[mrudst],
-						ttisgmts[mrudst]);
-					isdsts[mrudst] = 1;
-					writetype[type] = true;
-			}
-			if (histd >= 0 && mrustd >= 0 && histd != mrustd &&
-				gmtoffs[histd] != gmtoffs[mrustd]) {
-					isdsts[mrustd] = -1;
-					type = addtype(gmtoffs[mrustd],
-						&chars[abbrinds[mrustd]],
-						false,
-						ttisstds[mrustd],
-						ttisgmts[mrustd]);
-					isdsts[mrustd] = 0;
-					writetype[type] = true;
-			}
-		}
-#endif /* !defined LEAVE_SOME_PRE_2011_SYSTEMS_IN_THE_LURCH */
-		thistypecnt = 0;
-		for (i = 0; i < typecnt; ++i)
-			typemap[i] = writetype[i] ?  thistypecnt++ : -1;
-		for (i = 0; i < (int)(sizeof indmap / sizeof indmap[0]); ++i)
-			indmap[i] = -1;
-		thischarcnt = 0;
-		for (i = 0; i < typecnt; ++i) {
-			char *	thisabbr;
-
-			if (!writetype[i])
-				continue;
-			if (indmap[abbrinds[i]] >= 0)
-				continue;
-			thisabbr = &chars[abbrinds[i]];
-			for (j = 0; j < thischarcnt; ++j)
-				if (strcmp(&thischars[j], thisabbr) == 0)
-					break;
-			if (j == thischarcnt) {
-				(void) strcpy(&thischars[(int) thischarcnt],
-					thisabbr);
-				thischarcnt += strlen(thisabbr) + 1;
-			}
-			indmap[abbrinds[i]] = j;
-		}
-#define DO(field)	(void) fwrite(tzh.field, \
-				sizeof tzh.field, (size_t) 1, fp)
-		tzh = tzh0;
-		(void) strncpy(tzh.tzh_magic, TZ_MAGIC, sizeof tzh.tzh_magic);
-		tzh.tzh_version[0] = version;
-		convert(thistypecnt, tzh.tzh_ttisgmtcnt);
-		convert(thistypecnt, tzh.tzh_ttisstdcnt);
-		convert(thisleapcnt, tzh.tzh_leapcnt);
-		convert(thistimecnt, tzh.tzh_timecnt);
-		convert(thistypecnt, tzh.tzh_typecnt);
-		convert(thischarcnt, tzh.tzh_charcnt);
-		DO(tzh_magic);
-		DO(tzh_version);
-		DO(tzh_reserved);
-		DO(tzh_ttisgmtcnt);
-		DO(tzh_ttisstdcnt);
-		DO(tzh_leapcnt);
-		DO(tzh_timecnt);
-		DO(tzh_typecnt);
-		DO(tzh_charcnt);
-#undef DO
-		for (i = thistimei; i < thistimelim; ++i)
-			if (pass == 1)
-				/*
-				** Output an INT32_MIN "transition"
-				** if appropriate; see above.
-				*/
-				puttzcode(((ats[i] < INT32_MIN) ?
-					INT32_MIN : ats[i]), fp);
-			else	puttzcode64(ats[i], fp);
-		for (i = thistimei; i < thistimelim; ++i) {
-			unsigned char	uc;
-
-			uc = typemap[types[i]];
-			(void) fwrite(&uc, sizeof uc, (size_t) 1, fp);
-		}
-		for (i = 0; i < typecnt; ++i)
-			if (writetype[i]) {
-				puttzcode(gmtoffs[i], fp);
-				(void) putc(isdsts[i], fp);
-				(void) putc((unsigned char) indmap[abbrinds[i]], fp);
-			}
-		if (thischarcnt != 0)
-			(void) fwrite(thischars, sizeof thischars[0],
-				(size_t) thischarcnt, fp);
-		for (i = thisleapi; i < thisleaplim; ++i) {
-			zic_t	todo;
-
-			if (roll[i]) {
-				if (timecnt == 0 || trans[i] < ats[0]) {
-					j = 0;
-					while (isdsts[j])
-						if (++j >= typecnt) {
-							j = 0;
-							break;
-						}
-				} else {
-					j = 1;
-					while (j < timecnt &&
-						trans[i] >= ats[j])
-							++j;
-					j = types[j - 1];
-				}
-				todo = tadd(trans[i], -gmtoffs[j]);
-			} else	todo = trans[i];
-			if (pass == 1)
-				puttzcode(todo, fp);
-			else	puttzcode64(todo, fp);
-			puttzcode(corr[i], fp);
-		}
-		for (i = 0; i < typecnt; ++i)
-			if (writetype[i])
-				(void) putc(ttisstds[i], fp);
-		for (i = 0; i < typecnt; ++i)
-			if (writetype[i])
-				(void) putc(ttisgmts[i], fp);
-	}
-	(void) fprintf(fp, "\n%s\n", string);
-	close_file(fp, fullname);
-	free(ats);
-	free(fullname);
-}
-
-static char const *
-abbroffset(char *buf, zic_t offset)
-{
-	char sign = '+';
-	int seconds, minutes;
-
-	if (offset < 0) {
-		offset = -offset;
-		sign = '-';
-	}
-
-	seconds = offset % SECSPERMIN;
-	offset /= SECSPERMIN;
-	minutes = offset % MINSPERHOUR;
-	offset /= MINSPERHOUR;
-	if (100 <= offset) {
-		error(_("%%z UTC offset magnitude exceeds 99:59:59"));
-		return "%z";
-	} else {
-		char *p = buf;
-		*p++ = sign;
-		*p++ = '0' + offset / 10;
-		*p++ = '0' + offset % 10;
-		if (minutes | seconds) {
-			*p++ = '0' + minutes / 10;
-			*p++ = '0' + minutes % 10;
-			if (seconds) {
-				*p++ = '0' + seconds / 10;
-				*p++ = '0' + seconds % 10;
-			}
-		}
-		*p = '\0';
-		return buf;
-	}
-}
-
-static size_t
-doabbr(char *abbr, int abbrlen, struct zone const *zp, const char *letters,
-    zic_t stdoff, bool doquotes)
-{
-	char *	cp;
-	char *	slashp;
-	size_t	len;
-	char const *format = zp->z_format;
-
-	slashp = strchr(format, '/');
-	if (slashp == NULL) {
-		char letterbuf[PERCENT_Z_LEN_BOUND + 1];
-		if (zp->z_format_specifier == 'z')
-			letters = abbroffset(letterbuf, -zp->z_gmtoff + stdoff);
-		else if (!letters)
-			letters = "%s";
-		(void) snprintf(abbr, abbrlen, format, letters);
-	} else if (stdoff != 0) {
-		(void) strlcpy(abbr, slashp + 1, abbrlen);
-	} else {
-		(void) memcpy(abbr, format, slashp - format);
-		abbr[slashp - format] = '\0';
-	}
-	len = strlen(abbr);
-	if (!doquotes)
-		return len;
-	for (cp = abbr; is_alpha(*cp); cp++)
-		continue;
-	if (len > 0 && *cp == '\0')
-		return len;
-	abbr[len + 2] = '\0';
-	abbr[len + 1] = '>';
-	memmove(abbr + 1, abbr, len);
-	abbr[0] = '<';
-	return len + 2;
-}
-
-static void
-updateminmax(const zic_t x)
-{
-	if (min_year > x)
-		min_year = x;
-	if (max_year < x)
-		max_year = x;
-}
-
-static int
-stringoffset(char *result, zic_t offset)
-{
-	int	hours;
-	int	minutes;
-	int	seconds;
-	bool negative = offset < 0;
-	int len = negative;
-
-	if (negative) {
-		offset = -offset;
-		result[0] = '-';
-	}
-	seconds = offset % SECSPERMIN;
-	offset /= SECSPERMIN;
-	minutes = offset % MINSPERHOUR;
-	offset /= MINSPERHOUR;
-	hours = offset;
-	if (hours >= HOURSPERDAY * DAYSPERWEEK) {
-		result[0] = '\0';
-		return 0;
-	}
-	len += sprintf(result + len, "%d", hours);
-	if (minutes != 0 || seconds != 0) {
-		len += sprintf(result + len, ":%02d", minutes);
-		if (seconds != 0)
-			len += sprintf(result + len, ":%02d", seconds);
-	}
-	return len;
-}
-
-static int
-stringrule(char *result, const struct rule *const rp, const zic_t dstoff,
-    const zic_t gmtoff)
-{
-	zic_t	tod = rp->r_tod;
-	int	compat = 0;
-
-	if (rp->r_dycode == DC_DOM) {
-		int	month, total;
-
-		if (rp->r_dayofmonth == 29 && rp->r_month == TM_FEBRUARY)
-			return -1;
-		total = 0;
-		for (month = 0; month < rp->r_month; ++month)
-			total += len_months[0][month];
-		/* Omit the "J" in Jan and Feb, as that's shorter.  */
-		if (rp->r_month <= 1)
-		  result += sprintf(result, "%d", total + rp->r_dayofmonth - 1);
-		else
-		  result += sprintf(result, "J%d", total + rp->r_dayofmonth);
-	} else {
-		int	week;
-		int	wday = rp->r_wday;
-		int	wdayoff;
-
-		if (rp->r_dycode == DC_DOWGEQ) {
-			wdayoff = (rp->r_dayofmonth - 1) % DAYSPERWEEK;
-			if (wdayoff)
-				compat = 2013;
-			wday -= wdayoff;
-			tod += wdayoff * SECSPERDAY;
-			week = 1 + (rp->r_dayofmonth - 1) / DAYSPERWEEK;
-		} else if (rp->r_dycode == DC_DOWLEQ) {
-			if (rp->r_dayofmonth == len_months[1][rp->r_month])
-				week = 5;
-			else {
-				wdayoff = rp->r_dayofmonth % DAYSPERWEEK;
-				if (wdayoff)
-					compat = 2013;
-				wday -= wdayoff;
-				tod += wdayoff * SECSPERDAY;
-				week = rp->r_dayofmonth / DAYSPERWEEK;
-			}
-		} else	return -1;	/* "cannot happen" */
-		if (wday < 0)
-			wday += DAYSPERWEEK;
-		result += sprintf(result, "M%d.%d.%d",
-				  rp->r_month + 1, week, wday);
-	}
-	if (rp->r_todisgmt)
-		tod += gmtoff;
-	if (rp->r_todisstd && rp->r_stdoff == 0)
-		tod += dstoff;
-	if (tod != 2 * SECSPERMIN * MINSPERHOUR) {
-		*result++ = '/';
-		if (! stringoffset(result, tod))
-			return -1;
-		if (tod < 0) {
-			if (compat < 2013)
-				compat = 2013;
-		} else if (SECSPERDAY <= tod) {
-			if (compat < 1994)
-				compat = 1994;
-		}
-	}
-	return compat;
-}
-
-static int
-rule_cmp(struct rule const *a, struct rule const *b)
-{
-	if (!a)
-		return -!!b;
-	if (!b)
-		return 1;
-	if (a->r_hiyear != b->r_hiyear)
-		return a->r_hiyear < b->r_hiyear ? -1 : 1;
-	if (a->r_month - b->r_month != 0)
-		return a->r_month - b->r_month;
-	return a->r_dayofmonth - b->r_dayofmonth;
-}
-
-enum { YEAR_BY_YEAR_ZONE = 1 };
-
-static int
-stringzone(char *result, const int resultlen, const struct zone *const zpfirst,
-    const int zonecount)
-{
-	const struct zone *	zp;
-	struct rule *		rp;
-	struct rule *		stdrp;
-	struct rule *		dstrp;
-	int			i;
-	const char *		abbrvar;
-	int			compat = 0;
-	int			c;
-	size_t			len;
-	int			offsetlen;
-	struct rule		stdr, dstr;
-
-	result[0] = '\0';
-	zp = zpfirst + zonecount - 1;
-	stdrp = dstrp = NULL;
-	for (i = 0; i < zp->z_nrules; ++i) {
-		rp = &zp->z_rules[i];
-		if (rp->r_hiwasnum || rp->r_hiyear != ZIC_MAX)
-			continue;
-		if (rp->r_yrtype != NULL)
-			continue;
-		if (rp->r_stdoff == 0) {
-			if (stdrp == NULL)
-				stdrp = rp;
-			else	return -1;
-		} else {
-			if (dstrp == NULL)
-				dstrp = rp;
-			else	return -1;
-		}
-	}
-	if (stdrp == NULL && dstrp == NULL) {
-		/*
-		** There are no rules running through "max".
-		** Find the latest std rule in stdabbrrp
-		** and latest rule of any type in stdrp.
-		*/
-		struct rule *stdabbrrp = NULL;
-		for (i = 0; i < zp->z_nrules; ++i) {
-			rp = &zp->z_rules[i];
-			if (rp->r_stdoff == 0 && rule_cmp(stdabbrrp, rp) < 0)
-				stdabbrrp = rp;
-			if (rule_cmp(stdrp, rp) < 0)
-				stdrp = rp;
-		}
-		/*
-		** Horrid special case: if year is 2037,
-		** presume this is a zone handled on a year-by-year basis;
-		** do not try to apply a rule to the zone.
-		*/
-		if (stdrp != NULL && stdrp->r_hiyear == 2037)
-			return YEAR_BY_YEAR_ZONE;
-
-		if (stdrp != NULL && stdrp->r_stdoff != 0) {
-			/* Perpetual DST.  */
-			dstr.r_month = TM_JANUARY;
-			dstr.r_dycode = DC_DOM;
-			dstr.r_dayofmonth = 1;
-			dstr.r_tod = 0;
-			dstr.r_todisstd = dstr.r_todisgmt = false;
-			dstr.r_stdoff = stdrp->r_stdoff;
-			dstr.r_abbrvar = stdrp->r_abbrvar;
-			stdr.r_month = TM_DECEMBER;
-			stdr.r_dycode = DC_DOM;
-			stdr.r_dayofmonth = 31;
-			stdr.r_tod = SECSPERDAY + stdrp->r_stdoff;
-			stdr.r_todisstd = stdr.r_todisgmt = false;
-			stdr.r_stdoff = 0;
-			stdr.r_abbrvar
-			  = (stdabbrrp ? stdabbrrp->r_abbrvar : "");
-			dstrp = &dstr;
-			stdrp = &stdr;
-		}
-	}
-	if (stdrp == NULL && (zp->z_nrules != 0 || zp->z_stdoff != 0))
-		return -1;
-	abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar;
-	len = doabbr(result, resultlen, zp, abbrvar, 0, true);
-	offsetlen = stringoffset(result + len, -zp->z_gmtoff);
-	if (! offsetlen) {
-		result[0] = '\0';
-		return -1;
-	}
-	len += offsetlen;
-	if (dstrp == NULL)
-		return compat;
-	len += doabbr(result + len, resultlen - len, zp, dstrp->r_abbrvar, dstrp->r_stdoff, true);
-	if (dstrp->r_stdoff != SECSPERMIN * MINSPERHOUR) {
-		offsetlen = stringoffset(result + len,
-		    -(zp->z_gmtoff + dstrp->r_stdoff));
-		if (! offsetlen) {
-			result[0] = '\0';
-			return -1;
-		}
-		len += offsetlen;
-	}
-	result[len++] = ',';
-	c = stringrule(result + len, dstrp, dstrp->r_stdoff, zp->z_gmtoff);
-	if (c < 0) {
-		result[0] = '\0';
-		return -1;
-	}
-	if (compat < c)
-		compat = c;
-	len += strlen(result + len);
-	result[len++] = ',';
-	c = stringrule(result + len, stdrp, dstrp->r_stdoff, zp->z_gmtoff);
-	if (c < 0) {
-		result[0] = '\0';
-		return -1;
-	}
-	if (compat < c)
-		compat = c;
-	return compat;
-}
-
-static void
-outzone(const struct zone *zpfirst, int zonecount)
-{
-	const struct zone *	zp;
-	struct rule *		rp;
-	int			i, j;
-	bool			usestart, useuntil;
-	zic_t			starttime, untiltime;
-	zic_t			gmtoff;
-	zic_t			stdoff;
-	zic_t			year;
-	zic_t			startoff;
-	bool			startttisstd;
-	bool			startttisgmt;
-	int			type;
-	char *			startbuf;
-	char *			ab;
-	char *			envvar;
-	size_t			max_abbr_len;
-	size_t			max_envvar_len;
-	bool			prodstic; /* all rules are min to max */
-	int			compat;
-	bool			do_extend;
-	int			version;
-
-	max_abbr_len = 2 + max_format_len + max_abbrvar_len;
-	max_envvar_len = 2 * max_abbr_len + 5 * 9;
-	startbuf = zic_malloc(max_abbr_len + 1);
-	ab = zic_malloc(max_abbr_len + 1);
-	envvar = zic_malloc(max_envvar_len + 1);
-	INITIALIZE(untiltime);
-	INITIALIZE(starttime);
-	/*
-	** Now. . .finally. . .generate some useful data!
-	*/
-	timecnt = 0;
-	typecnt = 0;
-	charcnt = 0;
-	prodstic = zonecount == 1;
-	/*
-	** Thanks to Earl Chew
-	** for noting the need to unconditionally initialize startttisstd.
-	*/
-	startttisstd = false;
-	startttisgmt = false;
-	min_year = max_year = EPOCH_YEAR;
-	if (leapseen) {
-		updateminmax(leapminyear);
-		updateminmax(leapmaxyear + (leapmaxyear < ZIC_MAX));
-	}
-	for (i = 0; i < zonecount; ++i) {
-		zp = &zpfirst[i];
-		if (i < zonecount - 1)
-			updateminmax(zp->z_untilrule.r_loyear);
-		for (j = 0; j < zp->z_nrules; ++j) {
-			rp = &zp->z_rules[j];
-			if (rp->r_lowasnum)
-				updateminmax(rp->r_loyear);
-			if (rp->r_hiwasnum)
-				updateminmax(rp->r_hiyear);
-			if (rp->r_lowasnum || rp->r_hiwasnum)
-				prodstic = false;
-		}
-	}
-	/*
-	** Generate lots of data if a rule can't cover all future times.
-	*/
-	compat = stringzone(envvar, max_envvar_len + 1, zpfirst, zonecount);
-	version = compat < 2013 ? ZIC_VERSION_PRE_2013 : ZIC_VERSION;
-	do_extend = compat < 0 || compat == YEAR_BY_YEAR_ZONE;
-	if (noise) {
-		if (!*envvar)
-			warning("%s %s",
-				_("no POSIX environment variable for zone"),
-				zpfirst->z_name);
-		else if (compat != 0 && compat != YEAR_BY_YEAR_ZONE) {
-			/* Circa-COMPAT clients, and earlier clients, might
-			   not work for this zone when given dates before
-			   1970 or after 2038.  */
-			warning(_("%s: pre-%d clients may mishandle"
-				  " distant timestamps"),
-				zpfirst->z_name, compat);
-		}
-	}
-	if (do_extend) {
-		/*
-		** Search through a couple of extra years past the obvious
-		** 400, to avoid edge cases.  For example, suppose a non-POSIX
-		** rule applies from 2012 onwards and has transitions in March
-		** and September, plus some one-off transitions in November
-		** 2013.  If zic looked only at the last 400 years, it would
-		** set max_year=2413, with the intent that the 400 years 2014
-		** through 2413 will be repeated.  The last transition listed
-		** in the tzfile would be in 2413-09, less than 400 years
-		** after the last one-off transition in 2013-11.  Two years
-		** might be overkill, but with the kind of edge cases
-		** available we're not sure that one year would suffice.
-		*/
-		enum { years_of_observations = YEARSPERREPEAT + 2 };
-
-		if (min_year >= ZIC_MIN + years_of_observations)
-			min_year -= years_of_observations;
-		else	min_year = ZIC_MIN;
-		if (max_year <= ZIC_MAX - years_of_observations)
-			max_year += years_of_observations;
-		else	max_year = ZIC_MAX;
-		/*
-		** Regardless of any of the above,
-		** for a "proDSTic" zone which specifies that its rules
-		** always have and always will be in effect,
-		** we only need one cycle to define the zone.
-		*/
-		if (prodstic) {
-			min_year = 1900;
-			max_year = min_year + years_of_observations;
-		}
-	}
-	/*
-	** For the benefit of older systems,
-	** generate data from 1900 through 2037.
-	*/
-	if (min_year > 1900)
-		min_year = 1900;
-	if (max_year < 2037)
-		max_year = 2037;
-	for (i = 0; i < zonecount; ++i) {
-		/*
-		** A guess that may well be corrected later.
-		*/
-		stdoff = 0;
-		zp = &zpfirst[i];
-		usestart = i > 0 && (zp - 1)->z_untiltime > big_bang_time;
-		useuntil = i < (zonecount - 1);
-		if (useuntil && zp->z_untiltime <= big_bang_time)
-			continue;
-		gmtoff = zp->z_gmtoff;
-		eat(zp->z_filename, zp->z_linenum);
-		*startbuf = '\0';
-		startoff = zp->z_gmtoff;
-		if (zp->z_nrules == 0) {
-			stdoff = zp->z_stdoff;
-			doabbr(startbuf, max_abbr_len + 1, zp,
-			    NULL, stdoff, false);
-			type = addtype(oadd(zp->z_gmtoff, stdoff),
-				startbuf, stdoff != 0, startttisstd,
-				startttisgmt);
-			if (usestart) {
-				addtt(starttime, type);
-				usestart = false;
-			} else	addtt(big_bang_time, type);
-		} else for (year = min_year; year <= max_year; ++year) {
-			if (useuntil && year > zp->z_untilrule.r_hiyear)
-				break;
-			/*
-			** Mark which rules to do in the current year.
-			** For those to do, calculate rpytime(rp, year);
-			*/
-			for (j = 0; j < zp->z_nrules; ++j) {
-				rp = &zp->z_rules[j];
-				eats(zp->z_filename, zp->z_linenum,
-					rp->r_filename, rp->r_linenum);
-				rp->r_todo = year >= rp->r_loyear &&
-						year <= rp->r_hiyear &&
-						yearistype(year, rp->r_yrtype);
-				if (rp->r_todo)
-					rp->r_temp = rpytime(rp, year);
-			}
-			for ( ; ; ) {
-				int	k;
-				zic_t	jtime, ktime;
-				zic_t	offset;
-
-				INITIALIZE(ktime);
-				if (useuntil) {
-					/*
-					** Turn untiltime into UT
-					** assuming the current gmtoff and
-					** stdoff values.
-					*/
-					untiltime = zp->z_untiltime;
-					if (!zp->z_untilrule.r_todisgmt)
-						untiltime = tadd(untiltime,
-							-gmtoff);
-					if (!zp->z_untilrule.r_todisstd)
-						untiltime = tadd(untiltime,
-							-stdoff);
-				}
-				/*
-				** Find the rule (of those to do, if any)
-				** that takes effect earliest in the year.
-				*/
-				k = -1;
-				for (j = 0; j < zp->z_nrules; ++j) {
-					rp = &zp->z_rules[j];
-					if (!rp->r_todo)
-						continue;
-					eats(zp->z_filename, zp->z_linenum,
-						rp->r_filename, rp->r_linenum);
-					offset = rp->r_todisgmt ? 0 : gmtoff;
-					if (!rp->r_todisstd)
-						offset = oadd(offset, stdoff);
-					jtime = rp->r_temp;
-					if (jtime == min_time ||
-						jtime == max_time)
-							continue;
-					jtime = tadd(jtime, -offset);
-					if (k < 0 || jtime < ktime) {
-						k = j;
-						ktime = jtime;
-					} else if (jtime == ktime) {
-					  char const *dup_rules_msg =
-					    _("two rules for same instant");
-					  eats(zp->z_filename, zp->z_linenum,
-					       rp->r_filename, rp->r_linenum);
-					  warning("%s", dup_rules_msg);
-					  rp = &zp->z_rules[k];
-					  eats(zp->z_filename, zp->z_linenum,
-					       rp->r_filename, rp->r_linenum);
-					  error("%s", dup_rules_msg);
-					}
-				}
-				if (k < 0)
-					break;	/* go on to next year */
-				rp = &zp->z_rules[k];
-				rp->r_todo = false;
-				if (useuntil && ktime >= untiltime)
-					break;
-				stdoff = rp->r_stdoff;
-				if (usestart && ktime == starttime)
-					usestart = false;
-				if (usestart) {
-					if (ktime < starttime) {
-						startoff = oadd(zp->z_gmtoff,
-							stdoff);
-						doabbr(startbuf,
-							max_abbr_len + 1,
-							zp,
-							rp->r_abbrvar,
-							rp->r_stdoff,
-							false);
-						continue;
-					}
-					if (*startbuf == '\0' &&
-						startoff == oadd(zp->z_gmtoff,
-						stdoff)) {
-							doabbr(startbuf,
-								max_abbr_len + 1,
-								zp,
-								rp->r_abbrvar,
-								rp->r_stdoff,
-								false);
-					}
-				}
-				eats(zp->z_filename, zp->z_linenum,
-					rp->r_filename, rp->r_linenum);
-				doabbr(ab, max_abbr_len + 1, zp, rp->r_abbrvar,
-					rp->r_stdoff, false);
-				offset = oadd(zp->z_gmtoff, rp->r_stdoff);
-				type = addtype(offset, ab, rp->r_stdoff != 0,
-					rp->r_todisstd, rp->r_todisgmt);
-				addtt(ktime, type);
-			}
-		}
-		if (usestart) {
-			if (*startbuf == '\0' &&
-				zp->z_format != NULL &&
-				strchr(zp->z_format, '%') == NULL &&
-				strchr(zp->z_format, '/') == NULL)
-					(void)strncpy(startbuf, zp->z_format,
-					    max_abbr_len + 1 - 1);
-			eat(zp->z_filename, zp->z_linenum);
-			if (*startbuf == '\0')
-error(_("can't determine time zone abbreviation to use just after until time"));
-			else	addtt(starttime,
-					addtype(startoff, startbuf,
-						startoff != zp->z_gmtoff,
-						startttisstd,
-						startttisgmt));
-		}
-		/*
-		** Now we may get to set starttime for the next zone line.
-		*/
-		if (useuntil) {
-			startttisstd = zp->z_untilrule.r_todisstd;
-			startttisgmt = zp->z_untilrule.r_todisgmt;
-			starttime = zp->z_untiltime;
-			if (!startttisstd)
-				starttime = tadd(starttime, -stdoff);
-			if (!startttisgmt)
-				starttime = tadd(starttime, -gmtoff);
-		}
-	}
-	if (do_extend) {
-		/*
-		** If we're extending the explicitly listed observations
-		** for 400 years because we can't fill the POSIX-TZ field,
-		** check whether we actually ended up explicitly listing
-		** observations through that period.  If there aren't any
-		** near the end of the 400-year period, add a redundant
-		** one at the end of the final year, to make it clear
-		** that we are claiming to have definite knowledge of
-		** the lack of transitions up to that point.
-		*/
-		struct rule xr;
-		struct attype *lastat;
-		xr.r_month = TM_JANUARY;
-		xr.r_dycode = DC_DOM;
-		xr.r_dayofmonth = 1;
-		xr.r_tod = 0;
-		for (lastat = &attypes[0], i = 1; i < timecnt; i++)
-			if (attypes[i].at > lastat->at)
-				lastat = &attypes[i];
-		if (lastat->at < rpytime(&xr, max_year - 1)) {
-			/*
-			** Create new type code for the redundant entry,
-			** to prevent it being optimized away.
-			*/
-			if (typecnt >= TZ_MAX_TYPES) {
-				error(_("too many local time types"));
-				exit(EXIT_FAILURE);
-			}
-			gmtoffs[typecnt] = gmtoffs[lastat->type];
-			isdsts[typecnt] = isdsts[lastat->type];
-			ttisstds[typecnt] = ttisstds[lastat->type];
-			ttisgmts[typecnt] = ttisgmts[lastat->type];
-			abbrinds[typecnt] = abbrinds[lastat->type];
-			++typecnt;
-			addtt(rpytime(&xr, max_year + 1), typecnt-1);
-		}
-	}
-	writezone(zpfirst->z_name, envvar, version);
-	free(startbuf);
-	free(ab);
-	free(envvar);
-}
-
-static void
-addtt(zic_t starttime, int type)
-{
-	if (starttime <= big_bang_time ||
-		(timecnt == 1 && attypes[0].at < big_bang_time)) {
-		gmtoffs[0] = gmtoffs[type];
-		isdsts[0] = isdsts[type];
-		ttisstds[0] = ttisstds[type];
-		ttisgmts[0] = ttisgmts[type];
-		if (abbrinds[type] != 0)
-			strcpy(chars, &chars[abbrinds[type]]);
-		abbrinds[0] = 0;
-		charcnt = strlen(chars) + 1;
-		typecnt = 1;
-		timecnt = 0;
-		type = 0;
-	}
-	attypes = growalloc(attypes, sizeof *attypes, timecnt, &timecnt_alloc);
-	attypes[timecnt].at = starttime;
-	attypes[timecnt].type = type;
-	++timecnt;
-}
-
-static int
-addtype(zic_t gmtoff, char *const abbr, bool isdst, bool ttisstd, bool ttisgmt)
-{
-	int	i, j;
-
-	/*
-	** See if there's already an entry for this zone type.
-	** If so, just return its index.
-	*/
-	for (i = 0; i < typecnt; ++i) {
-		if (gmtoff == gmtoffs[i] && isdst == isdsts[i] &&
-			strcmp(abbr, &chars[abbrinds[i]]) == 0 &&
-			ttisstd == ttisstds[i] &&
-			ttisgmt == ttisgmts[i])
-				return i;
-	}
-	/*
-	** There isn't one; add a new one, unless there are already too
-	** many.
-	*/
-	if (typecnt >= TZ_MAX_TYPES) {
-		error(_("too many local time types"));
-		exit(EXIT_FAILURE);
-	}
-	if (! (-1L - 2147483647L <= gmtoff && gmtoff <= 2147483647L)) {
-		error(_("UT offset out of range"));
-		exit(EXIT_FAILURE);
-	}
-	gmtoffs[i] = gmtoff;
-	isdsts[i] = isdst;
-	ttisstds[i] = ttisstd;
-	ttisgmts[i] = ttisgmt;
-
-	for (j = 0; j < charcnt; ++j)
-		if (strcmp(&chars[j], abbr) == 0)
-			break;
-	if (j == charcnt)
-		newabbr(abbr);
-	abbrinds[i] = j;
-	++typecnt;
-	return i;
-}
-
-static void
-leapadd(zic_t t, bool positive, int rolling, int count)
-{
-	int	i, j;
-
-	if (leapcnt + (positive ? count : 1) > TZ_MAX_LEAPS) {
-		error(_("too many leap seconds"));
-		exit(EXIT_FAILURE);
-	}
-	for (i = 0; i < leapcnt; ++i)
-		if (t <= trans[i]) {
-			if (t == trans[i]) {
-				error(_("repeated leap second moment"));
-				exit(EXIT_FAILURE);
-			}
-			break;
-		}
-	do {
-		for (j = leapcnt; j > i; --j) {
-			trans[j] = trans[j - 1];
-			corr[j] = corr[j - 1];
-			roll[j] = roll[j - 1];
-		}
-		trans[i] = t;
-		corr[i] = positive ? 1 : -count;
-		roll[i] = rolling;
-		++leapcnt;
-	} while (positive && --count != 0);
-}
-
-static void
-adjleap(void)
-{
-	int	i;
-	zic_t	last = 0;
-
-	/*
-	** propagate leap seconds forward
-	*/
-	for (i = 0; i < leapcnt; ++i) {
-		trans[i] = tadd(trans[i], last);
-		last = corr[i] += last;
-	}
-}
-
-static bool
-yearistype(int year, const char *type)
-{
-	static char *	buf;
-	int		result;
-
-	if (type == NULL || *type == '\0')
-		return true;
-	buf = zic_realloc(buf, 132 + strlen(yitcommand) + strlen(type));
-	(void)sprintf(buf, "%s %d %s", yitcommand, year, type); /* XXX: sprintf is safe */
-	result = system(buf);
-	if (WIFEXITED(result)) switch (WEXITSTATUS(result)) {
-		case 0:
-			return true;
-		case 1:
-			return false;
-	}
-	error(_("Wild result from command execution"));
-	(void) fprintf(stderr, _("%s: command was '%s', result was %d\n"),
-		progname, buf, result);
-	for ( ; ; )
-		exit(EXIT_FAILURE);
-}
-
-/* Is A a space character in the C locale?  */
-static bool
-is_space(char a)
-{
-	switch (a) {
-	  default:
-		return false;
-	  case ' ': case '\f': case '\n': case '\r': case '\t': case '\v':
-	  	return true;
-	}
-}
-
-/* Is A an alphabetic character in the C locale?  */
-static bool
-is_alpha(char a)
-{
-	switch (a) {
-	  default:
-		return 0;
-	  case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G':
-	  case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N':
-	  case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U':
-	  case 'V': case 'W': case 'X': case 'Y': case 'Z':
-	  case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g':
-	  case 'h': case 'i': case 'j': case 'k': case 'l': case 'm': case 'n':
-	  case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
-	  case 'v': case 'w': case 'x': case 'y': case 'z':
-		return true;
-	}
-}
-
-/* If A is an uppercase character in the C locale, return its lowercase
-   counterpart.  Otherwise, return A.  */
-static char
-lowerit(char a)
-{
-	switch (a) {
-	  default: return a;
-	  case 'A': return 'a'; case 'B': return 'b'; case 'C': return 'c';
-	  case 'D': return 'd'; case 'E': return 'e'; case 'F': return 'f';
-	  case 'G': return 'g'; case 'H': return 'h'; case 'I': return 'i';
-	  case 'J': return 'j'; case 'K': return 'k'; case 'L': return 'l';
-	  case 'M': return 'm'; case 'N': return 'n'; case 'O': return 'o';
-	  case 'P': return 'p'; case 'Q': return 'q'; case 'R': return 'r';
-	  case 'S': return 's'; case 'T': return 't'; case 'U': return 'u';
-	  case 'V': return 'v'; case 'W': return 'w'; case 'X': return 'x';
-	  case 'Y': return 'y'; case 'Z': return 'z';
-	}
-}
-
-/* case-insensitive equality */
-static ATTRIBUTE_PURE bool
-ciequal(const char *ap, const char *bp)
-{
-	while (lowerit(*ap) == lowerit(*bp++))
-		if (*ap++ == '\0')
-			return true;
-	return false;
-}
-
-static ATTRIBUTE_PURE bool
-itsabbr(const char *abbr, const char *word)
-{
-	if (lowerit(*abbr) != lowerit(*word))
-		return false;
-	++word;
-	while (*++abbr != '\0')
-		do {
-			if (*word == '\0')
-				return false;
-		} while (lowerit(*word++) != lowerit(*abbr));
-	return true;
-}
-
-static ATTRIBUTE_PURE const struct lookup *
-byword(const char *word, const struct lookup *table)
-{
-	const struct lookup *	foundlp;
-	const struct lookup *	lp;
-
-	if (word == NULL || table == NULL)
-		return NULL;
-	/*
-	** Look for exact match.
-	*/
-	for (lp = table; lp->l_word != NULL; ++lp)
-		if (ciequal(word, lp->l_word))
-			return lp;
-	/*
-	** Look for inexact match.
-	*/
-	foundlp = NULL;
-	for (lp = table; lp->l_word != NULL; ++lp)
-		if (itsabbr(word, lp->l_word)) {
-			if (foundlp == NULL)
-				foundlp = lp;
-			else	return NULL;	/* multiple inexact matches */
-		}
-	return foundlp;
-}
-
-static char **
-getfields(char *cp)
-{
-	char *	dp;
-	char **	array;
-	int	nsubs;
-
-	if (cp == NULL)
-		return NULL;
-	array = zic_malloc(size_product(strlen(cp) + 1, sizeof *array));
-	nsubs = 0;
-	for ( ; ; ) {
-		while (is_space(*cp))
-				++cp;
-		if (*cp == '\0' || *cp == '#')
-			break;
-		array[nsubs++] = dp = cp;
-		do {
-			if ((*dp = *cp++) != '"')
-				++dp;
-			else while ((*dp = *cp++) != '"')
-				if (*dp != '\0')
-					++dp;
-				else {
-					error(_(
-						"Odd number of quotation marks"
-						));
-					exit(1);
-				}
-		} while (*cp && *cp != '#' && !is_space(*cp));
-		if (is_space(*cp))
-			++cp;
-		*dp = '\0';
-	}
-	array[nsubs] = NULL;
-	return array;
-}
-
-static _Noreturn void
-time_overflow(void)
-{
-	error(_("time overflow"));
-	exit(EXIT_FAILURE);
-}
-
-static ATTRIBUTE_PURE zic_t
-oadd(zic_t t1, zic_t t2)
-{
-	if (t1 < 0 ? t2 < ZIC_MIN - t1 : ZIC_MAX - t1 < t2)
-		time_overflow();
-	return t1 + t2;
-}
-
-static ATTRIBUTE_PURE zic_t
-tadd(zic_t t1, zic_t t2)
-{
-	if (t1 < 0) {
-		if (t2 < min_time - t1) {
-			if (t1 != min_time)
-				time_overflow();
-			return min_time;
-		}
-	} else {
-		if (max_time - t1 < t2) {
-			if (t1 != max_time)
-				time_overflow();
-			return max_time;
-		}
-	}
-	return t1 + t2;
-}
-
-/*
-** Given a rule, and a year, compute the date (in seconds since January 1,
-** 1970, 00:00 LOCAL time) in that year that the rule refers to.
-*/
-
-static zic_t
-rpytime(const struct rule *rp, zic_t wantedy)
-{
-	int	m, i;
-	zic_t	dayoff;			/* with a nod to Margaret O. */
-	zic_t	t, y;
-
-	if (wantedy == ZIC_MIN)
-		return min_time;
-	if (wantedy == ZIC_MAX)
-		return max_time;
-	dayoff = 0;
-	m = TM_JANUARY;
-	y = EPOCH_YEAR;
-	while (wantedy != y) {
-		if (wantedy > y) {
-			i = len_years[isleap(y)];
-			++y;
-		} else {
-			--y;
-			i = -len_years[isleap(y)];
-		}
-		dayoff = oadd(dayoff, i);
-	}
-	while (m != rp->r_month) {
-		i = len_months[isleap(y)][m];
-		dayoff = oadd(dayoff, i);
-		++m;
-	}
-	i = rp->r_dayofmonth;
-	if (m == TM_FEBRUARY && i == 29 && !isleap(y)) {
-		if (rp->r_dycode == DC_DOWLEQ)
-			--i;
-		else {
-			error(_("use of 2/29 in non leap-year"));
-			exit(EXIT_FAILURE);
-		}
-	}
-	--i;
-	dayoff = oadd(dayoff, i);
-	if (rp->r_dycode == DC_DOWGEQ || rp->r_dycode == DC_DOWLEQ) {
-		zic_t	wday;
-
-#define LDAYSPERWEEK	((zic_t) DAYSPERWEEK)
-		wday = EPOCH_WDAY;
-		/*
-		** Don't trust mod of negative numbers.
-		*/
-		if (dayoff >= 0)
-			wday = (wday + dayoff) % LDAYSPERWEEK;
-		else {
-			wday -= ((-dayoff) % LDAYSPERWEEK);
-			if (wday < 0)
-				wday += LDAYSPERWEEK;
-		}
-		while (wday != rp->r_wday)
-			if (rp->r_dycode == DC_DOWGEQ) {
-				dayoff = oadd(dayoff, (zic_t) 1);
-				if (++wday >= LDAYSPERWEEK)
-					wday = 0;
-				++i;
-			} else {
-				dayoff = oadd(dayoff, (zic_t) -1);
-				if (--wday < 0)
-					wday = LDAYSPERWEEK - 1;
-				--i;
-			}
-		if (i < 0 || i >= len_months[isleap(y)][m]) {
-			if (noise)
-				warning(_("rule goes past start/end of month; \
-will not work with pre-2004 versions of zic"));
-		}
-	}
-	if (dayoff < min_time / SECSPERDAY)
-		return min_time;
-	if (dayoff > max_time / SECSPERDAY)
-		return max_time;
-	t = (zic_t) dayoff * SECSPERDAY;
-	return tadd(t, rp->r_tod);
-}
-
-static void
-newabbr(const char *string)
-{
-	int	i;
-
-	if (strcmp(string, GRANDPARENTED) != 0) {
-		const char *	cp;
-		const char *	mp;
-
-		cp = string;
-		mp = NULL;
-		while (is_alpha(*cp) || ('0' <= *cp && *cp <= '9')
-		       || *cp == '-' || *cp == '+')
-				++cp;
-		if (noise && cp - string < 3)
-		  mp = _("time zone abbreviation has fewer than 3 characters");
-		if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN)
-		  mp = _("time zone abbreviation has too many characters");
-		if (*cp != '\0')
-mp = _("time zone abbreviation differs from POSIX standard");
-		if (mp != NULL)
-			warning("%s (%s)", mp, string);
-	}
-	i = strlen(string) + 1;
-	if (charcnt + i > TZ_MAX_CHARS) {
-		error(_("too many, or too long, time zone abbreviations"));
-		exit(EXIT_FAILURE);
-	}
-	(void)strncpy(&chars[charcnt], string, sizeof(chars) - charcnt - 1);
-	charcnt += i;
-}
-
-static bool
-mkdirs(char *argname)
-{
-	char *	name;
-	char *	cp;
-
-	if (argname == NULL || *argname == '\0')
-		return true;
-	cp = name = ecpyalloc(argname);
-	while ((cp = strchr(cp + 1, '/')) != 0) {
-		*cp = '\0';
-#ifdef HAVE_DOS_FILE_NAMES
-		/*
-		** DOS drive specifier?
-		*/
-		if (is_alpha(name[0]) && name[1] == ':' && name[2] == '\0') {
-				*cp = '/';
-				continue;
-		}
-#endif
-		/*
-		** Try to create it.  It's OK if creation fails because
-		** the directory already exists, perhaps because some
-		** other process just created it.
-		*/
-		if (mkdir(name, MKDIR_UMASK) != 0) {
-			int err = errno;
-			if (itsdir(name) <= 0) {
-				char const *e = strerror(err);
-				warning(_("%s: Can't create directory"
-					  " %s: %s"),
-					progname, name, e);
-				free(name);
-				return false;
-			}
-		}
-		*cp = '/';
-	}
-	free(name);
-	return true;
-}
diff --git a/lib/libc/tls/Makefile.inc b/lib/libc/tls/Makefile.inc
deleted file mode 100644
index 3d536995b..000000000
--- a/lib/libc/tls/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2011/03/12 07:55:09 matt Exp $
-
-.include <bsd.own.mk>
-
-# Our sources
-.PATH:	${.PARSEDIR} ${ARCHDIR}/tls
-
-SRCS+=			tls.c
-CPPFLAGS.tls.c+=	-D_LIBC_SOURCE
diff --git a/lib/libc/tls/tls.c b/lib/libc/tls/tls.c
deleted file mode 100644
index 7f7b05018..000000000
--- a/lib/libc/tls/tls.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*	$NetBSD: tls.c,v 1.8 2014/12/14 23:49:17 chs Exp $	*/
-
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Joerg Sonnenberger.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: tls.c,v 1.8 2014/12/14 23:49:17 chs Exp $");
-
-#include "namespace.h"
-
-#define	_rtld_tls_allocate	__libc_rtld_tls_allocate
-#define	_rtld_tls_free		__libc_rtld_tls_free
-
-#include <sys/tls.h>
-
-#if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
-
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <link_elf.h>
-#include <lwp.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-__dso_hidden void	__libc_static_tls_setup(void);
-
-static const void *tls_initaddr;
-static size_t tls_initsize;
-static size_t tls_size;
-static size_t tls_allocation;
-static void *initial_thread_tcb;
-
-void * __libc_tls_get_addr(void);
-
-__weak_alias(__tls_get_addr, __libc_tls_get_addr)
-#ifdef __i386__
-__weak_alias(___tls_get_addr, __libc_tls_get_addr)
-#endif
-
-void *
-__libc_tls_get_addr(void)
-{
-
-	abort();
-	/* NOTREACHED */
-}
-
-__weak_alias(_rtld_tls_allocate, __libc_rtld_tls_allocate)
-
-struct tls_tcb *
-_rtld_tls_allocate(void)
-{
-	struct tls_tcb *tcb;
-	uint8_t *p;
-
-	if (initial_thread_tcb == NULL) {
-#ifdef __HAVE_TLS_VARIANT_II
-		tls_size = roundup2(tls_size, sizeof(void *));
-#endif
-		tls_allocation = tls_size + sizeof(*tcb);
-
-		initial_thread_tcb = p = mmap(NULL, tls_allocation,
-		    PROT_READ | PROT_WRITE, MAP_ANON, -1, 0);
-	} else {
-		p = calloc(1, tls_allocation);
-	}
-	if (p == NULL) {
-		static const char msg[] =  "TLS allocation failed, terminating\n";
-		write(STDERR_FILENO, msg, sizeof(msg));
-		_exit(127);
-	}
-#ifdef __HAVE_TLS_VARIANT_I
-	/* LINTED */
-	tcb = (struct tls_tcb *)p;
-	p += sizeof(struct tls_tcb);
-#else
-	/* LINTED tls_size is rounded above */
-	tcb = (struct tls_tcb *)(p + tls_size);
-	tcb->tcb_self = tcb;
-#endif
-	memcpy(p, tls_initaddr, tls_initsize);
-
-	return tcb;
-}
-
-__weak_alias(_rtld_tls_free, __libc_rtld_tls_free)
-
-void
-_rtld_tls_free(struct tls_tcb *tcb)
-{
-	uint8_t *p;
-
-#ifdef __HAVE_TLS_VARIANT_I
-	/* LINTED */
-	p = (uint8_t *)tcb;
-#else
-	/* LINTED */
-	p = (uint8_t *)tcb - tls_size;
-#endif
-	if (p == initial_thread_tcb)
-		munmap(p, tls_allocation);
-	else
-		free(p);
-}
-
-__weakref_visible int rtld_DYNAMIC __weak_reference(_DYNAMIC);
-
-static int __section(".text.startup")
-__libc_static_tls_setup_cb(struct dl_phdr_info *data, size_t len, void *cookie)
-{
-	const Elf_Phdr *phdr = data->dlpi_phdr;
-	const Elf_Phdr *phlimit = data->dlpi_phdr + data->dlpi_phnum;
-
-	for (; phdr < phlimit; ++phdr) {
-		if (phdr->p_type != PT_TLS)
-			continue;
-		tls_initaddr = (void *)(phdr->p_vaddr + data->dlpi_addr);
-		tls_initsize = phdr->p_filesz;
-		tls_size = phdr->p_memsz;
-	}
-	return 0;
-}
-
-void
-__libc_static_tls_setup(void)
-{
-	struct tls_tcb *tcb;
-
-	if (&rtld_DYNAMIC != NULL) {
-		return;
-	}
-
-	dl_iterate_phdr(__libc_static_tls_setup_cb, NULL);
-
-	tcb = _rtld_tls_allocate();
-#ifdef __HAVE___LWP_SETTCB
-	__lwp_settcb(tcb);
-#else
-	_lwp_setprivate(tcb);
-#endif
-}
-
-#endif /* __HAVE_TLS_VARIANT_I || __HAVE_TLS_VARIANT_II */
diff --git a/lib/libc/uuid/Makefile.inc b/lib/libc/uuid/Makefile.inc
deleted file mode 100644
index 45ca2ceb2..000000000
--- a/lib/libc/uuid/Makefile.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2004/09/13 21:44:54 thorpej Exp $
-
-# DCE 1.1 compatible UUID implementation sources
-
-.PATH: ${.CURDIR}/uuid
-
-SRCS+=	uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \
-	uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_stream.c \
-	uuid_to_string.c
-
-MAN+=	uuid.3
-
-MLINKS+=uuid.3 uuid_compare.3
-MLINKS+=uuid.3 uuid_create.3
-MLINKS+=uuid.3 uuid_create_nil.3
-MLINKS+=uuid.3 uuid_equal.3
-MLINKS+=uuid.3 uuid_from_string.3
-MLINKS+=uuid.3 uuid_hash.3
-MLINKS+=uuid.3 uuid_is_nil.3
-MLINKS+=uuid.3 uuid_to_string.3
-
-MLINKS+=uuid.3 uuid_enc_le.3
-MLINKS+=uuid.3 uuid_dec_le.3
-MLINKS+=uuid.3 uuid_enc_be.3
-MLINKS+=uuid.3 uuid_dec_be.3
diff --git a/lib/libc/uuid/uuid.3 b/lib/libc/uuid/uuid.3
deleted file mode 100644
index 172026862..000000000
--- a/lib/libc/uuid/uuid.3
+++ /dev/null
@@ -1,211 +0,0 @@
-.\"	$NetBSD: uuid.3,v 1.7 2008/05/02 18:11:05 martin Exp $
-.\"
-.\" Copyright (c) 2004 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" Copyright (c) 2002 Marcel Moolenaar
-.\" Copyright (c) 2002 Hiten Mahesh Pandya
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list 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: src/lib/libc/uuid/uuid.3,v 1.4 2003/08/08 19:12:28 marcel Exp $
-.\"
-.Dd April 22, 2008
-.Dt UUID 3
-.Os
-.Sh NAME
-.Nm uuid_compare , uuid_create , uuid_create_nil , uuid_equal ,
-.Nm uuid_from_string , uuid_hash , uuid_is_nil , uuid_to_string ,
-.Nm uuid_enc_le , uuid_dec_le , uuid_enc_be , uuid_dec_be
-.Nd Universally Unique Identifier routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In uuid.h
-.Ft int32_t
-.Fn uuid_compare "const uuid_t *uuid1" "const uuid_t *uuid2" "uint32_t *status"
-.Ft void
-.Fn uuid_create "uuid_t *uuid" "uint32_t *status"
-.Ft void
-.Fn uuid_create_nil "uuid_t *uuid" "uint32_t *status"
-.Ft int32_t
-.Fn uuid_equal "const uuid_t *uuid1" "const uuid_t *uuid2" "uint32_t *status"
-.Ft void
-.Fn uuid_from_string "const char *str" "uuid_t *uuid" "uint32_t *status"
-.Ft uint16_t
-.Fn uuid_hash "const uuid_t *uuid" "uint32_t *status"
-.Ft int32_t
-.Fn uuid_is_nil "const uuid_t *uuid" "uint32_t *status"
-.Ft void
-.Fn uuid_to_string "const uuid_t *uuid" "char **str" "uint32_t *status"
-.Ft void
-.Fn uuid_enc_le "void *buf" "const uuid_t *uuid"
-.Ft void
-.Fn uuid_dec_le "const void *buf" "uuid_t *"
-.Ft void
-.Fn uuid_enc_be "void *buf" "const uuid_t *uuid"
-.Ft void
-.Fn uuid_dec_be "const void *buf" "uuid_t *"
-.Sh DESCRIPTION
-These routines provide for the creation and manipulation of Universally
-Unique Identifiers
-.Pq UUIDs ,
-also referred to as Globally Unique Identifiers
-.Pq GUIDs .
-.Pp
-The
-.Fn uuid_compare
-function compares two UUIDs.
-It returns \-1 if
-.Fa uuid1
-precedes
-.Fa uuid2 ,
-0 if they are equal, or 1 if
-.Fa uuid1
-follows
-.Fa uuid2 .
-.Pp
-The
-.Fn uuid_create
-function creates a new UUID.
-Storage for the new UUID must be pre-allocated by the caller.
-.Pp
-The
-.Fn uuid_create_nil
-function creates a nil-valued UUID.
-Storage for the new UUID must be pre-allocated by the caller.
-.Pp
-The
-.Fn uuid_equal
-function compares two UUIDs to determine if they are equal.
-It returns 1 if they are equal, and 0 if they are not equal.
-.Pp
-The
-.Fn uuid_from_string
-function parses a 36-character string representation of a UUID and
-converts it to binary representation.
-Storage for the UUID must be pre-allocated by the caller.
-.Pp
-The
-.Fn uuid_hash
-function generates a hash value for the specified UUID.
-Note that the hash value is not a cryptographic hash, and should not be
-assumed to be unique given two different UUIDs.
-.Pp
-The
-.Fn uuid_is_nil
-function returns 1 if the UUID is nil-valued and 0 if it is not.
-.Pp
-The
-.Fn uuid_to_string
-function converts a UUID from binary representation to string representation.
-Storage for the string is dynamically allocated and returned via the
-.Fa str
-argument.
-This pointer should be passed to
-.Xr free 3
-to release the allocated storage when it is no longer needed.
-.Pp
-The
-.Fn uuid_enc_le
-and
-.Fn uuid_enc_be
-functions encode a binary representation of a UUID into an octet stream
-in little-endian and big-endian byte-order, respectively.
-The destination buffer must be pre-allocated by the caller, and must be
-large enough to hold the 16-octet binary UUID.
-.Pp
-The
-.Fn uuid_dec_le
-and
-.Fn uuid_dec_be
-functions decode a UUID from an octet stream in little-endian and
-big-endian byte-order, respectively.
-.Sh RETURN VALUES
-The
-.Fn uuid_compare ,
-.Fn uuid_create ,
-.Fn uuid_create_nil ,
-.Fn uuid_equal ,
-.Fn uuid_from_string ,
-.Fn uuid_hash ,
-.Fn uuid_is_nil ,
-and
-.Fn uuid_to_string
-functions return successful or unsuccessful completion status in the
-.Fa status
-argument.
-Possible values are:
-.Pp
-.Bl -tag -width ".Dv uuid_s_invalid_string_uuid"
-.It Dv uuid_s_ok
-The function completed successfully.
-.It Dv uuid_s_bad_version
-The UUID does not have a known version.
-.It Dv uuid_s_invalid_string_uuid
-The string representation of a UUID is not valid.
-.It Dv uuid_s_no_memory
-Memory could not be allocated for the operation.
-.El
-.Sh SEE ALSO
-.Xr uuidgen 1 ,
-.Xr uuidgen 2
-.Sh STANDARDS
-The
-.Fn uuid_compare ,
-.Fn uuid_create ,
-.Fn uuid_create_nil ,
-.Fn uuid_equal ,
-.Fn uuid_from_string ,
-.Fn uuid_hash ,
-.Fn uuid_is_nil ,
-and
-.Fn uuid_to_string
-functions are compatible with the DCE 1.1 RPC specification.
-.Sh HISTORY
-The UUID functions first appeared in
-.Nx 3.0 .
diff --git a/lib/libc/uuid/uuid_compare.c b/lib/libc/uuid/uuid_compare.c
deleted file mode 100644
index 439c827e7..000000000
--- a/lib/libc/uuid/uuid_compare.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*	$NetBSD: uuid_compare.c,v 1.2 2008/04/23 07:52:32 plunky Exp $	*/
-
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/uuid/uuid_compare.c,v 1.3 2003/08/08 19:18:43 marcel Exp $
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: uuid_compare.c,v 1.2 2008/04/23 07:52:32 plunky Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <string.h>
-#include <uuid.h>
-
-/*
- * uuid_compare() - compare two UUIDs.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_compare.htm
- *
- * NOTE: Either UUID can be NULL, meaning a nil UUID. nil UUIDs are smaller
- *	 than any non-nil UUID.
- */
-int32_t
-uuid_compare(const uuid_t *a, const uuid_t *b, uint32_t *status)
-{
-	int res;
-
-	if (status != NULL)
-		*status = uuid_s_ok;
-
-	/* Deal with NULL or equal pointers. */
-	if (a == b)
-		return (0);
-	if (a == NULL)
-		return ((uuid_is_nil(b, NULL)) ? 0 : -1);
-	if (b == NULL)
-		return ((uuid_is_nil(a, NULL)) ? 0 : 1);
-
-	/* We have to compare the hard way. */
-	res = (int)((int64_t)a->time_low - (int64_t)b->time_low);
-	if (res)
-		return ((res < 0) ? -1 : 1);
-	res = (int)a->time_mid - (int)b->time_mid;
-	if (res)
-		return ((res < 0) ? -1 : 1);
-	res = (int)a->time_hi_and_version - (int)b->time_hi_and_version;
-	if (res)
-		return ((res < 0) ? -1 : 1);
-	res = (int)a->clock_seq_hi_and_reserved -
-	    (int)b->clock_seq_hi_and_reserved;
-	if (res)
-		return ((res < 0) ? -1 : 1);
-	res = (int)a->clock_seq_low - (int)b->clock_seq_low;
-	if (res)
-		return ((res < 0) ? -1 : 1);
-	res = memcmp(a->node, b->node, sizeof(a->node));
-	if (res)
-		return ((res < 0) ? -1 : 1);
-	return (0);
-}
diff --git a/lib/libc/uuid/uuid_create.c b/lib/libc/uuid/uuid_create.c
deleted file mode 100644
index 0dcaebdb4..000000000
--- a/lib/libc/uuid/uuid_create.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: uuid_create.c,v 1.1 2004/09/13 21:44:54 thorpej Exp $	*/
-
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/uuid/uuid_create.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: uuid_create.c,v 1.1 2004/09/13 21:44:54 thorpej Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <uuid.h>
-
-#if defined(__minix)
-#include <paths.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-/* Fake a uuidgen() syscall */
-int uuidgen(struct uuid *store, int count)
-{
-	int rfd;
-
-	if((rfd = open(_PATH_RANDOM, O_RDONLY)) < 0) {
-		return -1;
-	}
-
-	while(count--) {
-		if(read(rfd, store++, sizeof(*store)) < sizeof(*store)) {
-			close(rfd);
-			return -1;
-		}
-	}
-
-	close(rfd);
-
-	return 0;
-}
-#endif /* defined(__minix) */
-
-/*
- * uuid_create() - create an UUID.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_create.htm
- */
-void
-uuid_create(uuid_t *u, uint32_t *status)
-{
-	uint32_t s;
-
-	if (uuidgen(u, 1) == -1)
-		s = uuid_s_no_memory;	/* XXX */
-	else
-		s = uuid_s_ok;
-
-	if (status)
-		*status = s;
-}
diff --git a/lib/libc/uuid/uuid_create_nil.c b/lib/libc/uuid/uuid_create_nil.c
deleted file mode 100644
index e48dc269f..000000000
--- a/lib/libc/uuid/uuid_create_nil.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: uuid_create_nil.c,v 1.2 2005/02/09 21:35:47 kleink Exp $	*/
-
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/uuid/uuid_create_nil.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: uuid_create_nil.c,v 1.2 2005/02/09 21:35:47 kleink Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <string.h>
-#include <uuid.h>
-
-#ifdef __weak_alias
-__weak_alias(uuid_create_nil,_uuid_create_nil)
-#endif
-
-/*
- * uuid_create_nil() - create a nil UUID.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_create_nil.htm
- */
-void
-uuid_create_nil(uuid_t *u, uint32_t *status)
-{
-
-	memset(u, 0, sizeof(*u));
-
-	if (status)
-		*status = uuid_s_ok;
-}
diff --git a/lib/libc/uuid/uuid_equal.c b/lib/libc/uuid/uuid_equal.c
deleted file mode 100644
index c7c83e870..000000000
--- a/lib/libc/uuid/uuid_equal.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: uuid_equal.c,v 1.2 2008/04/23 07:52:32 plunky Exp $	*/
-
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/uuid/uuid_equal.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: uuid_equal.c,v 1.2 2008/04/23 07:52:32 plunky Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <string.h>
-#include <uuid.h>
-
-/*
- * uuid_equal() - compare for equality.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_equal.htm
- */
-int32_t
-uuid_equal(const uuid_t *a, const uuid_t *b, uint32_t *status)
-{
-
-	if (status != NULL)
-		*status = uuid_s_ok;
-
-	/* Deal with equal or NULL pointers. */
-	if (a == b)
-		return (1);
-	if (a == NULL)
-		return (uuid_is_nil(b, NULL));
-	if (b == NULL)
-		return (uuid_is_nil(a, NULL));
-
-	/* Do a byte for byte comparison. */
-	return ((memcmp(a, b, sizeof(uuid_t))) ? 0 : 1);
-}
diff --git a/lib/libc/uuid/uuid_from_string.c b/lib/libc/uuid/uuid_from_string.c
deleted file mode 100644
index f33906845..000000000
--- a/lib/libc/uuid/uuid_from_string.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*	$NetBSD: uuid_from_string.c,v 1.1 2004/09/13 21:44:54 thorpej Exp $	*/
-
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/uuid/uuid_from_string.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: uuid_from_string.c,v 1.1 2004/09/13 21:44:54 thorpej Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <uuid.h>
-
-/*
- * uuid_from_string() - convert a string representation of an UUID into
- *			a binary representation.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_from_string.htm
- *
- * NOTE: The sequence field is in big-endian, while the time fields are in
- *	 native byte order.
- */
-void
-uuid_from_string(const char *s, uuid_t *u, uint32_t *status)
-{
-	int n;
-
-	/* Short-circuit 2 special cases: NULL pointer and empty string. */
-	if (s == NULL || *s == '\0') {
-		uuid_create_nil(u, status);
-		return;
-	}
-
-	/* Assume the worst. */
-	if (status != NULL)
-		*status = uuid_s_invalid_string_uuid;
-
-	/* The UUID string representation has a fixed length. */
-	if (strlen(s) != 36)
-		return;
-
-	/*
-	 * We only work with "new" UUIDs. New UUIDs have the form:
-	 *	01234567-89ab-cdef-0123-456789abcdef
-	 * The so called "old" UUIDs, which we don't support, have the form:
-	 *	0123456789ab.cd.ef.01.23.45.67.89.ab
-	 */
-	if (s[8] != '-')
-		return;
-
-	n = sscanf(s,
-	    "%8x-%4hx-%4hx-%2hhx%2hhx-%2hhx%2hhx%2hhx%2hhx%2hhx%2hhx",
-	    &u->time_low, &u->time_mid, &u->time_hi_and_version,
-	    &u->clock_seq_hi_and_reserved, &u->clock_seq_low, &u->node[0],
-	    &u->node[1], &u->node[2], &u->node[3], &u->node[4], &u->node[5]);
-
-	/* Make sure we have all conversions. */
-	if (n != 11)
-		return;
-
-	/* We have a successful scan. Check semantics... */
-	n = u->clock_seq_hi_and_reserved;
-	if ((n & 0x80) != 0x00 &&			/* variant 0? */
-	    (n & 0xc0) != 0x80 &&			/* variant 1? */
-	    (n & 0xe0) != 0xc0) {			/* variant 2? */
-		if (status != NULL)
-			*status = uuid_s_bad_version;
-	} else {
-		if (status != NULL)
-			*status = uuid_s_ok;
-	}
-}
diff --git a/lib/libc/uuid/uuid_hash.c b/lib/libc/uuid/uuid_hash.c
deleted file mode 100644
index 996989dc7..000000000
--- a/lib/libc/uuid/uuid_hash.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: uuid_hash.c,v 1.2 2008/04/23 07:52:32 plunky Exp $	*/
-
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/uuid/uuid_hash.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: uuid_hash.c,v 1.2 2008/04/23 07:52:32 plunky Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <uuid.h>
-
-/*
- * uuid_hash() - generate a hash value.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_hash.htm
- */
-uint16_t
-uuid_hash(const uuid_t *u, uint32_t *status)
-{
-
-	if (status)
-		*status = uuid_s_ok;
-
-	/*
-	 * Use the most frequently changing bits in the UUID as the hash
-	 * value. This should yield a good enough distribution...
-	 */
-	return ((u) ? u->time_low & 0xffff : 0);
-}
diff --git a/lib/libc/uuid/uuid_is_nil.c b/lib/libc/uuid/uuid_is_nil.c
deleted file mode 100644
index 3c9ab2d27..000000000
--- a/lib/libc/uuid/uuid_is_nil.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: uuid_is_nil.c,v 1.4 2008/04/23 07:52:32 plunky Exp $	*/
-
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/uuid/uuid_is_nil.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: uuid_is_nil.c,v 1.4 2008/04/23 07:52:32 plunky Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <string.h>
-#include <uuid.h>
-
-#ifdef __weak_alias
-__weak_alias(uuid_is_nil,_uuid_is_nil)
-#endif
-
-/*
- * uuid_is_nil() - return whether the UUID is a nil UUID.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_is_nil.htm
- */
-int32_t
-uuid_is_nil(const uuid_t *u, uint32_t *status)
-{
-	static const uuid_t nil = { .time_low = 0 };
-
-	if (status)
-		*status = uuid_s_ok;
-
-	if (!u)
-		return (1);
-
-	return (memcmp(u, &nil, sizeof(uuid_t)) == 0 ? 1 : 0);
-}
diff --git a/lib/libc/uuid/uuid_stream.c b/lib/libc/uuid/uuid_stream.c
deleted file mode 100644
index 4d08c4535..000000000
--- a/lib/libc/uuid/uuid_stream.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*	$NetBSD: uuid_stream.c,v 1.3 2008/04/19 18:21:38 plunky Exp $	*/
-
-/*
- * 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: uuid_stream.c,v 1.3 2008/04/19 18:21:38 plunky Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <machine/endian.h>
-#include <uuid.h>
-
-/*
- * Encode/Decode UUID into octet-stream.
- *   http://www.opengroup.org/dce/info/draft-leach-uuids-guids-01.txt
- *
- * 0                   1                   2                   3
- *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |                          time_low                             |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |       time_mid                |         time_hi_and_version   |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |clk_seq_hi_res |  clk_seq_low  |         node (0-1)            |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |                         node (2-5)                            |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- * NOTE: These routines are not part of the DCE RPC API.  There are
- * provided for convenience.
- */
-
-void
-uuid_enc_le(void *buf, const uuid_t *uuid)
-{
-	uint8_t *p = buf;
-	int i;
-
-	le32enc(p, uuid->time_low);
-	le16enc(p + 4, uuid->time_mid);
-	le16enc(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];
-}
-
-void
-uuid_dec_le(const void *buf, uuid_t *uuid)
-{
-	const uint8_t *p = buf;
-	int i;
-
-	uuid->time_low = le32dec(p);
-	uuid->time_mid = le16dec(p + 4);
-	uuid->time_hi_and_version = le16dec(p + 6);
-	uuid->clock_seq_hi_and_reserved = p[8];
-	uuid->clock_seq_low = p[9];
-	for (i = 0; i < _UUID_NODE_LEN; i++)
-		uuid->node[i] = p[10 + i];
-}
-
-void
-uuid_enc_be(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];
-}
-
-void
-uuid_dec_be(const void *buf, uuid_t *uuid)
-{
-	const uint8_t *p = buf;
-	int i;
-
-	uuid->time_low = be32dec(p);
-	uuid->time_mid = be16dec(p + 4);
-	uuid->time_hi_and_version = be16dec(p + 6);
-	uuid->clock_seq_hi_and_reserved = p[8];
-	uuid->clock_seq_low = p[9];
-	for (i = 0; i < _UUID_NODE_LEN; i++)
-		uuid->node[i] = p[10 + i];
-}
diff --git a/lib/libc/uuid/uuid_to_string.c b/lib/libc/uuid/uuid_to_string.c
deleted file mode 100644
index 7f46e3967..000000000
--- a/lib/libc/uuid/uuid_to_string.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$NetBSD: uuid_to_string.c,v 1.2 2008/04/23 07:52:32 plunky Exp $	*/
-
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/uuid/uuid_to_string.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: uuid_to_string.c,v 1.2 2008/04/23 07:52:32 plunky Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <uuid.h>
-
-/*
- * uuid_to_string() - Convert a binary UUID into a string representation.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_to_string.htm
- *
- * NOTE: The references given above do not have a status code for when
- *	 the string could not be allocated. The status code has been
- *	 taken from the Hewlett-Packard implementation.
- */
-void
-uuid_to_string(const uuid_t *u, char **s, uint32_t *status)
-{
-	static const uuid_t nil = { .time_low = 0 };
-
-	if (status != NULL)
-		*status = uuid_s_ok;
-
-	/* Why allow a NULL-pointer here? */
-	if (s == 0)
-		return;
-
-	if (u == NULL)
-		u = &nil;
-
-	asprintf(s, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-	    u->time_low, u->time_mid, u->time_hi_and_version,
-	    u->clock_seq_hi_and_reserved, u->clock_seq_low, u->node[0],
-	    u->node[1], u->node[2], u->node[3], u->node[4], u->node[5]);
-
-	if (*s == NULL && status != NULL)
-		*status = uuid_s_no_memory;
-}
diff --git a/lib/libc/yp/Makefile.inc b/lib/libc/yp/Makefile.inc
deleted file mode 100644
index 59d3666af..000000000
--- a/lib/libc/yp/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.15 2012/03/02 17:27:49 christos Exp $
-
-# yp sources
-.PATH: ${ARCHDIR}/yp ${.CURDIR}/yp
-
-SRCS+=	xdryp.c yp_all.c yp_first.c yp_maplist.c yp_master.c yp_match.c \
-	yp_order.c yplib.c yperr_string.c ypprot_err.c
-MAN+=	ypclnt.3
-
-MLINKS+=ypclnt.3 yp_all.3 ypclnt.3 yp_bind.3 ypclnt.3 yp_first.3 \
-	ypclnt.3 yp_get_default_domain.3 ypclnt.3 yp_master.3 \
-	ypclnt.3 yp_match.3 ypclnt.3 yp_next.3 ypclnt.3 yp_order.3 \
-	ypclnt.3 yp_unbind.3 ypclnt.3 yperr_string.3 ypclnt.3 ypprot_err.3 \
-	ypclnt.3 yp_setbindtries.3
diff --git a/lib/libc/yp/local.h b/lib/libc/yp/local.h
deleted file mode 100644
index 80240748f..000000000
--- a/lib/libc/yp/local.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*	$NetBSD: local.h,v 1.4 2012/03/20 16:30:26 matt Exp $	*/
-
-/*
- * Copyright (c) 1996 Christos Zoulas.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-__BEGIN_DECLS
-void __yp_unbind(struct dom_binding *);
-int _yp_invalid_domain(const char *);
-__END_DECLS
diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c
deleted file mode 100644
index 368ce9488..000000000
--- a/lib/libc/yp/xdryp.c
+++ /dev/null
@@ -1,548 +0,0 @@
-/*	$NetBSD: xdryp.c,v 1.32 2012/03/20 16:30:26 matt Exp $	*/
-
-/*
- * Copyright (c) 1996 Jason R. Thorpe <thorpej@NetBSD.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 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 Jason R. Thorpe.
- * 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.
- */
-
-/*
- * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: xdryp.c,v 1.32 2012/03/20 16:30:26 matt Exp $");
-#endif
-
-/*
- * XDR routines used by the YP protocol.  Note that these routines do
- * not strictly conform to the RPC definition in yp.x.  This file
- * replicates the functions exported by the Sun YP API; reality is
- * often inaccurate.
- */
-
-#include "namespace.h"
-
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-
-#ifdef __weak_alias
-__weak_alias(xdr_datum,_xdr_datum)
-__weak_alias(xdr_domainname,_xdr_domainname)
-__weak_alias(xdr_mapname,_xdr_mapname)
-__weak_alias(xdr_peername,_xdr_peername)
-__weak_alias(xdr_yp_inaddr,_xdr_yp_inaddr)
-__weak_alias(xdr_ypall,_xdr_ypall)
-__weak_alias(xdr_ypbind_resp,_xdr_ypbind_resp)
-__weak_alias(xdr_ypbind_setdom,_xdr_ypbind_setdom)
-__weak_alias(xdr_ypdomain_wrap_string,_xdr_ypdomain_wrap_string)
-__weak_alias(xdr_ypmap_parms,_xdr_ypmap_parms)
-__weak_alias(xdr_ypmap_wrap_string,_xdr_ypmap_wrap_string)
-__weak_alias(xdr_ypmaplist,_xdr_ypmaplist)
-__weak_alias(xdr_ypowner_wrap_string,_xdr_ypowner_wrap_string)
-__weak_alias(xdr_yppushresp_xfr,_xdr_yppushresp_xfr)
-__weak_alias(xdr_ypreq_key,_xdr_ypreq_key)
-__weak_alias(xdr_ypreq_nokey,_xdr_ypreq_nokey)
-__weak_alias(xdr_ypreq_xfr,_xdr_ypreq_xfr)
-__weak_alias(xdr_ypresp_key_val,_xdr_ypresp_key_val)
-__weak_alias(xdr_ypresp_maplist,_xdr_ypresp_maplist)
-__weak_alias(xdr_ypresp_master,_xdr_ypresp_master)
-__weak_alias(xdr_ypresp_order,_xdr_ypresp_order)
-__weak_alias(xdr_ypresp_val,_xdr_ypresp_val)
-#endif
-
-/*
- * Functions used only within this file.
- */
-static	bool_t xdr_ypbind_binding(XDR *, struct ypbind_binding *);
-static	bool_t xdr_ypbind_resptype(XDR *, enum ypbind_resptype *);
-static	bool_t xdr_ypstat(XDR *, enum ypbind_resptype *);
-static	bool_t xdr_ypmaplist_str(XDR *, char *);
-
-__warn_references(xdr_domainname,
-    "warning: this program uses xdr_domainname(), which is deprecated and buggy.")
-
-bool_t
-xdr_domainname(XDR *xdrs, char *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	return xdr_string(xdrs, &objp, YPMAXDOMAIN);
-}
-
-__warn_references(xdr_peername,
-    "warning: this program uses xdr_peername(), which is deprecated and buggy.")
-
-bool_t
-xdr_peername(XDR *xdrs, char *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	return xdr_string(xdrs, &objp, YPMAXPEER);
-}
-
-__warn_references(xdr_mapname,
-    "warning: this program uses xdr_mapname(), which is deprecated and buggy.")
-
-bool_t
-xdr_mapname(XDR *xdrs, char *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	return xdr_string(xdrs, &objp, YPMAXMAP);
-}
-
-bool_t
-xdr_ypdomain_wrap_string(XDR *xdrs, char **objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	return xdr_string(xdrs, objp, YPMAXDOMAIN);
-}
-
-bool_t
-xdr_ypmap_wrap_string(XDR *xdrs, char **objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	return xdr_string(xdrs, objp, YPMAXMAP);
-}
-
-bool_t
-xdr_ypowner_wrap_string(XDR *xdrs, char **objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	return xdr_string(xdrs, objp, YPMAXPEER);
-}
-
-bool_t
-xdr_datum(XDR *xdrs, datum *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	return xdr_bytes(xdrs, __UNCONST(&objp->dptr),
-	    (u_int *)&objp->dsize, YPMAXRECORD);
-}
-
-bool_t
-xdr_ypreq_key(XDR *xdrs, struct ypreq_key *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_ypdomain_wrap_string(xdrs, __UNCONST(&objp->domain)))
-		return FALSE;
-
-	if (!xdr_ypmap_wrap_string(xdrs, __UNCONST(&objp->map)))
-		return FALSE;
-
-	if (!xdr_datum(xdrs, &objp->keydat))
-		return FALSE;
-
-	return TRUE;
-}
-
-bool_t
-xdr_ypreq_nokey(XDR *xdrs, struct ypreq_nokey *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_ypdomain_wrap_string(xdrs, __UNCONST(&objp->domain)))
-		return FALSE;
-
-	if (!xdr_ypmap_wrap_string(xdrs, __UNCONST(&objp->map)))
-		return FALSE;
-
-	return TRUE;
-}
-
-bool_t
-xdr_yp_inaddr(XDR *xdrs, struct in_addr *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	return xdr_opaque(xdrs, (caddr_t)(void *)&objp->s_addr,
-	    (u_int)sizeof objp->s_addr);
-}
-
-static bool_t
-xdr_ypbind_binding(XDR *xdrs, struct ypbind_binding *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_yp_inaddr(xdrs, &objp->ypbind_binding_addr))
-		return FALSE;
-
-	if (!xdr_opaque(xdrs, (void *)&objp->ypbind_binding_port,
-	    (u_int)sizeof objp->ypbind_binding_port))
-		return FALSE;
-
-	return TRUE;
-}
-
-static bool_t
-xdr_ypbind_resptype(XDR *xdrs, enum ypbind_resptype *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	return xdr_enum(xdrs, (enum_t *)(void *)objp);
-}
-
-static bool_t
-xdr_ypstat(XDR *xdrs, enum ypbind_resptype *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	return xdr_enum(xdrs, (enum_t *)(void *)objp);
-}
-
-bool_t
-xdr_ypbind_resp(XDR *xdrs, struct ypbind_resp *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_ypbind_resptype(xdrs, &objp->ypbind_status))
-		return FALSE;
-
-	switch (objp->ypbind_status) {
-	case YPBIND_FAIL_VAL:
-		return xdr_u_int(xdrs,
-		    (u_int *)&objp->ypbind_respbody.ypbind_error);
-
-	case YPBIND_SUCC_VAL:
-		return xdr_ypbind_binding(xdrs,
-		    &objp->ypbind_respbody.ypbind_bindinfo);
-
-	default:
-		return FALSE;
-	}
-	/* NOTREACHED */
-}
-
-bool_t
-xdr_ypresp_val(XDR *xdrs, struct ypresp_val *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_ypstat(xdrs, (enum ypbind_resptype *)(void *)&objp->status))
-		return FALSE;
-
-	if (!xdr_datum(xdrs, &objp->valdat))
-		return FALSE;
-
-	return TRUE;
-}
-
-bool_t
-xdr_ypbind_setdom(XDR *xdrs, struct ypbind_setdom *objp)
-{
-	char *cp;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	cp = objp->ypsetdom_domain;
-
-	if (!xdr_ypdomain_wrap_string(xdrs, &cp))
-		return FALSE;
-
-	if (!xdr_ypbind_binding(xdrs, &objp->ypsetdom_binding))
-		return FALSE;
-
-	if (!xdr_u_int(xdrs, &objp->ypsetdom_vers))
-		return FALSE;
-
-	return TRUE;
-}
-
-bool_t
-xdr_ypresp_key_val(XDR *xdrs, struct ypresp_key_val *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_ypstat(xdrs, (enum ypbind_resptype *)(void *)&objp->status))
-		return FALSE;
-
-	if (!xdr_datum(xdrs, &objp->valdat))
-		return FALSE;
-
-	if (!xdr_datum(xdrs, &objp->keydat))
-		return FALSE;
-
-	return TRUE;
-}
-
-bool_t
-xdr_ypall(XDR *xdrs, struct ypall_callback *incallback)
-{
-	struct ypresp_key_val out;
-	char key[YPMAXRECORD], val[YPMAXRECORD];
-	bool_t more, status;
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(incallback != NULL);
-
-	/*
-	 * Set up key/val struct to be used during the transaction.
-	 */
-	memset(&out, 0, sizeof out);
-	out.keydat.dptr = key;
-	out.keydat.dsize = sizeof(key);
-	out.valdat.dptr = val;
-	out.valdat.dsize = sizeof(val);
-
-	for (;;) {
-		/* Values pending? */
-		if (!xdr_bool(xdrs, &more))
-			return FALSE;		/* can't tell! */
-		if (!more)
-			return TRUE;		/* no more */
-
-		/* Transfer key/value pair. */
-		status = xdr_ypresp_key_val(xdrs, &out);
-
-		/*
-		 * If we succeeded, call the callback function.
-		 * The callback will return TRUE when it wants
-		 * no more values.  If we fail, indicate the
-		 * error.
-		 */
-		if (status) {
-			if ((*incallback->foreach)((int)out.status,
-			    __UNCONST(out.keydat.dptr), out.keydat.dsize,
-			    __UNCONST(out.valdat.dptr), out.valdat.dsize,
-			    incallback->data))
-				return TRUE;
-		} else
-			return FALSE;
-	}
-}
-
-bool_t
-xdr_ypresp_master(XDR *xdrs, struct ypresp_master *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_ypstat(xdrs, (enum ypbind_resptype *)(void *)&objp->status))
-		return FALSE;
-
-	if (!xdr_string(xdrs, &objp->master, YPMAXPEER))
-		return FALSE;
-
-	return TRUE;
-}
-
-static bool_t
-xdr_ypmaplist_str(XDR *xdrs, char *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	return xdr_string(xdrs, &objp, YPMAXMAP+1);
-}
-
-bool_t
-xdr_ypmaplist(XDR *xdrs, struct ypmaplist *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_ypmaplist_str(xdrs, objp->ypml_name))
-		return FALSE;
-
-	if (!xdr_pointer(xdrs, (char **)(void *)&objp->ypml_next,
-	    (u_int)sizeof(struct ypmaplist), (xdrproc_t)xdr_ypmaplist))
-		return FALSE;
-
-	return TRUE;
-}
-
-bool_t
-xdr_ypresp_maplist(XDR *xdrs, struct ypresp_maplist *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_ypstat(xdrs, (enum ypbind_resptype *)(void *)&objp->status))
-		return FALSE;
-
-	if (!xdr_pointer(xdrs, (char **)(void *)&objp->list,
-	    (u_int)sizeof(struct ypmaplist), (xdrproc_t)xdr_ypmaplist))
-		return FALSE;
-
-	return TRUE;
-}
-
-bool_t
-xdr_ypresp_order(XDR *xdrs, struct ypresp_order *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_ypstat(xdrs, (enum ypbind_resptype *)(void *)&objp->status))
-		return FALSE;
-
-	if (!xdr_u_int(xdrs, &objp->ordernum))
-		return FALSE;
-
-	return TRUE;
-}
-
-bool_t
-xdr_ypreq_xfr(XDR *xdrs, struct ypreq_xfr *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_ypmap_parms(xdrs, &objp->map_parms))
-		return FALSE;
-
-	if (!xdr_u_int(xdrs, &objp->transid))
-		return FALSE;
-
-	if (!xdr_u_int(xdrs, &objp->proto))
-		return FALSE;
-
-	if (!xdr_u_int(xdrs, &objp->port))
-		return FALSE;
-
-	return TRUE;
-}
-
-bool_t
-xdr_ypmap_parms(XDR *xdrs, struct ypmap_parms *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_ypdomain_wrap_string(xdrs, __UNCONST(&objp->domain)))
-		return FALSE;
-
-	if (!xdr_ypmap_wrap_string(xdrs, __UNCONST(&objp->map)))
-		return FALSE;
-
-	if (!xdr_u_int(xdrs, &objp->ordernum))
-		return FALSE;
-
-	if (!xdr_ypowner_wrap_string(xdrs, &objp->owner))
-		return FALSE;
-
-	return TRUE;
-}
-
-bool_t
-xdr_yppushresp_xfr(XDR *xdrs, struct yppushresp_xfr *objp)
-{
-
-	_DIAGASSERT(xdrs != NULL);
-	_DIAGASSERT(objp != NULL);
-
-	if (!xdr_u_int(xdrs, &objp->transid))
-		return FALSE;
-
-	if (!xdr_enum(xdrs, (enum_t *)&objp->status))
-		return FALSE;
-
-	return TRUE;
-}
diff --git a/lib/libc/yp/yp_all.c b/lib/libc/yp/yp_all.c
deleted file mode 100644
index 41c1ec32a..000000000
--- a/lib/libc/yp/yp_all.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*	$NetBSD: yp_all.c,v 1.13 2012/06/25 22:32:46 abs Exp $	 */
-
-/*
- * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: yp_all.c,v 1.13 2012/06/25 22:32:46 abs Exp $");
-#endif
-
-#include "namespace.h"
-#include <string.h>
-#include <err.h>
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#include "local.h"
-
-extern struct timeval _yplib_timeout;
-
-#ifdef __weak_alias
-__weak_alias(yp_all,_yp_all)
-#endif
-
-int
-yp_all(const char *indomain, const char *inmap,
-    struct ypall_callback *incallback)
-{
-	struct ypreq_nokey yprnk;
-	struct dom_binding *ysd;
-	struct sockaddr_in clnt_sin;
-	enum clnt_stat  status;
-	CLIENT         *clnt;
-	int             clnt_sock;
-
-	if (_yp_invalid_domain(indomain))
-		return YPERR_BADARGS;
-	if (inmap == NULL || *inmap == '\0'
-	    || strlen(inmap) > YPMAXMAP)
-		return YPERR_BADARGS;
-	if (incallback == NULL)
-		return YPERR_BADARGS;
-
-	if (_yp_dobind(indomain, &ysd) != 0)
-		return YPERR_DOMAIN;
-
-	clnt_sock = RPC_ANYSOCK;
-	clnt_sin = ysd->dom_server_addr;
-	clnt_sin.sin_port = 0;
-	clnt = clnttcp_create(&clnt_sin, YPPROG, YPVERS, &clnt_sock, 0, 0);
-	if (clnt == NULL) {
-		warnx("clnttcp_create failed");
-		return YPERR_PMAP;
-	}
-	yprnk.domain = indomain;
-	yprnk.map = inmap;
-
-	status = clnt_call(clnt, (rpcproc_t)YPPROC_ALL,
-	    (xdrproc_t)xdr_ypreq_nokey, &yprnk,
-	    (xdrproc_t)xdr_ypall, (char *)(void *)incallback, _yplib_timeout);
-	clnt_destroy(clnt);
-
-	/* not really needed... */
-	__yp_unbind(ysd);
-
-	if (status != RPC_SUCCESS)
-		return YPERR_RPC;
-
-	return 0;
-}
diff --git a/lib/libc/yp/yp_first.c b/lib/libc/yp/yp_first.c
deleted file mode 100644
index fa6dccad5..000000000
--- a/lib/libc/yp/yp_first.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*	$NetBSD: yp_first.c,v 1.16 2012/06/25 22:32:46 abs Exp $	 */
-
-/*
- * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: yp_first.c,v 1.16 2012/06/25 22:32:46 abs Exp $");
-#endif
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <string.h>
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#include "local.h"
-
-extern struct timeval _yplib_timeout;
-extern int _yplib_nerrs;
-extern int _yplib_bindtries;
-
-#ifdef __weak_alias
-__weak_alias(yp_first,_yp_first)
-__weak_alias(yp_next,_yp_next)
-#endif
-
-int
-yp_first(const char *indomain, const char *inmap, char **outkey,
-    int *outkeylen, char **outval, int *outvallen)
-{
-	struct ypresp_key_val yprkv;
-	struct ypreq_nokey yprnk;
-	struct dom_binding *ysd;
-	int r, nerrs = 0;
-
-	if (outkey == NULL || outkeylen == NULL || \
-	    outval == NULL || outvallen == NULL)
-		return YPERR_BADARGS;
-	*outkey = *outval = NULL;
-	*outkeylen = *outvallen = 0;
-	if (_yp_invalid_domain(indomain))
-		return YPERR_BADARGS;
-	if (inmap == NULL || *inmap == '\0'
-	    || strlen(inmap) > YPMAXMAP)
-		return YPERR_BADARGS;
-
-again:
-	if (_yp_dobind(indomain, &ysd) != 0)
-		return YPERR_DOMAIN;
-
-	yprnk.domain = indomain;
-	yprnk.map = inmap;
-	(void)memset(&yprkv, 0, sizeof yprkv);
-
-	r = clnt_call(ysd->dom_client, (rpcproc_t)YPPROC_FIRST,
-	    (xdrproc_t)xdr_ypreq_nokey,
-	    &yprnk, (xdrproc_t)xdr_ypresp_key_val, &yprkv, _yplib_timeout);
-	if (r != RPC_SUCCESS) {
-		if (_yplib_bindtries <= 0 && ++nerrs == _yplib_nerrs) {
-			clnt_perror(ysd->dom_client, "yp_first: clnt_call");
-			nerrs = 0;
-		} else if (_yplib_bindtries > 0 && ++nerrs == _yplib_bindtries)
-			return YPERR_YPSERV;
-		ysd->dom_vers = -1;
-		goto again;
-	}
-	if (!(r = ypprot_err(yprkv.status))) {
-		*outkeylen = yprkv.keydat.dsize;
-		if ((*outkey = malloc((size_t)(*outkeylen + 1))) == NULL)
-			r = YPERR_RESRC;
-		else {
-			(void)memcpy(*outkey, yprkv.keydat.dptr, 
-			    (size_t)*outkeylen);
-			(*outkey)[*outkeylen] = '\0';
-		}
-		*outvallen = yprkv.valdat.dsize;
-		if ((*outval = malloc((size_t)(*outvallen + 1))) == NULL)
-			r = YPERR_RESRC;
-		else {
-			(void)memcpy(*outval, yprkv.valdat.dptr,
-			    (size_t)*outvallen);
-			(*outval)[*outvallen] = '\0';
-		}
-	}
-	xdr_free((xdrproc_t)xdr_ypresp_key_val, (char *)(void *)&yprkv);
-	__yp_unbind(ysd);
-	if (r != 0) {
-		if (*outkey) {
-			free(*outkey);
-			*outkey = NULL;
-		}
-		if (*outval) {
-			free(*outval);
-			*outval = NULL;
-		}
-	}
-	return r;
-}
-
-int
-yp_next(const char *indomain, const char *inmap, const char *inkey,
-    int inkeylen, char **outkey, int *outkeylen, char **outval, int *outvallen)
-{
-	struct ypresp_key_val yprkv;
-	struct ypreq_key yprk;
-	struct dom_binding *ysd;
-	int r, nerrs = 0;
-
-	if (outkey == NULL || outkeylen == NULL || \
-	    outval == NULL || outvallen == NULL || \
-	    inkey == NULL)
-		return YPERR_BADARGS;
-	*outkey = *outval = NULL;
-	*outkeylen = *outvallen = 0;
-
-	if (_yp_invalid_domain(indomain))
-		return YPERR_BADARGS;
-	if (inmap == NULL || *inmap == '\0'
-	    || strlen(inmap) > YPMAXMAP)
-		return YPERR_BADARGS;
-
-again:
-	if (_yp_dobind(indomain, &ysd) != 0)
-		return YPERR_DOMAIN;
-
-	yprk.domain = indomain;
-	yprk.map = inmap;
-	yprk.keydat.dptr = inkey;
-	yprk.keydat.dsize = inkeylen;
-	(void)memset(&yprkv, 0, sizeof yprkv);
-
-	r = clnt_call(ysd->dom_client, (rpcproc_t)YPPROC_NEXT,
-	    (xdrproc_t)xdr_ypreq_key,
-	    &yprk, (xdrproc_t)xdr_ypresp_key_val, &yprkv, _yplib_timeout);
-	if (r != RPC_SUCCESS) {
-		if (_yplib_bindtries <= 0 && ++nerrs == _yplib_nerrs) {
-			clnt_perror(ysd->dom_client, "yp_next: clnt_call");
-			nerrs = 0;
-		} else if (_yplib_bindtries > 0 && ++nerrs == _yplib_bindtries)
-			return YPERR_YPSERV;
-		ysd->dom_vers = -1;
-		goto again;
-	}
-	if (!(r = ypprot_err(yprkv.status))) {
-		*outkeylen = yprkv.keydat.dsize;
-		if ((*outkey = malloc((size_t)(*outkeylen + 1))) == NULL)
-			r = YPERR_RESRC;
-		else {
-			(void)memcpy(*outkey, yprkv.keydat.dptr,
-			    (size_t)*outkeylen);
-			(*outkey)[*outkeylen] = '\0';
-		}
-		*outvallen = yprkv.valdat.dsize;
-		if ((*outval = malloc((size_t)(*outvallen + 1))) == NULL)
-			r = YPERR_RESRC;
-		else {
-			(void)memcpy(*outval, yprkv.valdat.dptr,
-			    (size_t)*outvallen);
-			(*outval)[*outvallen] = '\0';
-		}
-	}
-	xdr_free((xdrproc_t)xdr_ypresp_key_val, (char *)(void *)&yprkv);
-	__yp_unbind(ysd);
-	if (r != 0) {
-		if (*outkey) {
-			free(*outkey);
-			*outkey = NULL;
-		}
-		if (*outval) {
-			free(*outval);
-			*outval = NULL;
-		}
-	}
-	return r;
-}
diff --git a/lib/libc/yp/yp_maplist.c b/lib/libc/yp/yp_maplist.c
deleted file mode 100644
index 3de820b71..000000000
--- a/lib/libc/yp/yp_maplist.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: yp_maplist.c,v 1.13 2012/06/25 22:32:46 abs Exp $	 */
-
-/*
- * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: yp_maplist.c,v 1.13 2012/06/25 22:32:46 abs Exp $");
-#endif
-
-#include "namespace.h"
-#include <string.h>
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#include "local.h"
-
-extern struct timeval _yplib_timeout;
-extern int _yplib_nerrs;
-extern int _yplib_bindtries;
-
-#ifdef __weak_alias
-__weak_alias(yp_maplist,_yp_maplist)
-#endif
-
-int
-yp_maplist( const char *indomain, struct ypmaplist **outmaplist)
-{
-	struct dom_binding *ysd;
-	struct ypresp_maplist ypml;
-	int r, nerrs = 0;
-
-	if (_yp_invalid_domain(indomain))
-		return YPERR_BADARGS;
-	if (outmaplist == NULL)
-		return YPERR_BADARGS;
-again:
-	if (_yp_dobind(indomain, &ysd) != 0)
-		return YPERR_DOMAIN;
-
-	memset(&ypml, 0, sizeof ypml);
-
-	r = clnt_call(ysd->dom_client, (rpcproc_t)YPPROC_MAPLIST,
-		   (xdrproc_t)xdr_ypdomain_wrap_string, &indomain,
-		   (xdrproc_t)xdr_ypresp_maplist, &ypml, _yplib_timeout);
-	if (r != RPC_SUCCESS) {
-		if (_yplib_bindtries <= 0 && ++nerrs == _yplib_nerrs) {
-			clnt_perror(ysd->dom_client, "yp_maplist: clnt_call");
-			nerrs = 0;
-		} else if (_yplib_bindtries > 0 && ++nerrs == _yplib_bindtries)
-			return YPERR_YPSERV;
-		ysd->dom_vers = -1;
-		goto again;
-	}
-	*outmaplist = ypml.list;
-	/* NO: xdr_free(xdr_ypresp_maplist, &ypml); */
-	__yp_unbind(ysd);
-	return ypprot_err(ypml.status);
-}
diff --git a/lib/libc/yp/yp_master.c b/lib/libc/yp/yp_master.c
deleted file mode 100644
index 97510d9f8..000000000
--- a/lib/libc/yp/yp_master.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*	$NetBSD: yp_master.c,v 1.15 2012/06/25 22:32:46 abs Exp $	 */
-
-/*
- * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: yp_master.c,v 1.15 2012/06/25 22:32:46 abs Exp $");
-#endif
-
-#include "namespace.h"
-#include <string.h>
-#include <stdlib.h>
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#include "local.h"
-
-extern struct timeval _yplib_timeout;
-extern int _yplib_nerrs;
-extern int _yplib_bindtries;
-
-#ifdef __weak_alias
-__weak_alias(yp_master,_yp_master)
-#endif
-
-int
-yp_master(const char *indomain, const char *inmap, char **outname)
-{
-	struct dom_binding *ysd;
-	struct ypresp_master yprm;
-	struct ypreq_nokey yprnk;
-	int r, nerrs = 0;
-
-	if (outname == NULL)
-		return YPERR_BADARGS;
-	*outname = NULL;
-
-	if (_yp_invalid_domain(indomain))
-		return YPERR_BADARGS;
-	if (inmap == NULL || *inmap == '\0'
-	    || strlen(inmap) > YPMAXMAP)
-		return YPERR_BADARGS;
-
-again:
-	if (_yp_dobind(indomain, &ysd) != 0)
-		return YPERR_DOMAIN;
-
-	yprnk.domain = indomain;
-	yprnk.map = inmap;
-
-	(void)memset(&yprm, 0, sizeof yprm);
-
-	r = clnt_call(ysd->dom_client, (rpcproc_t)YPPROC_MASTER,
-		      (xdrproc_t)xdr_ypreq_nokey, &yprnk,
-		      (xdrproc_t)xdr_ypresp_master, &yprm, _yplib_timeout);
-	if (r != RPC_SUCCESS) {
-		if (_yplib_bindtries <= 0 && ++nerrs == _yplib_nerrs) {
-			clnt_perror(ysd->dom_client, "yp_master: clnt_call");
-			nerrs = 0;
-		} else if (_yplib_bindtries > 0 && ++nerrs == _yplib_bindtries)
-			return YPERR_YPSERV;
-		ysd->dom_vers = -1;
-		goto again;
-	}
-	if (!(r = ypprot_err(yprm.status))) {
-		if ((*outname = strdup(yprm.master)) == NULL)
-			r = YPERR_RESRC;
-	}
-	xdr_free((xdrproc_t)xdr_ypresp_master, (char *)(void *)&yprm);
-	__yp_unbind(ysd);
-	if (r != 0) {
-		if (*outname) {
-			free(*outname);
-			*outname = NULL;
-		}
-	}
-	return r;
-}
diff --git a/lib/libc/yp/yp_match.c b/lib/libc/yp/yp_match.c
deleted file mode 100644
index fec7fd152..000000000
--- a/lib/libc/yp/yp_match.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/*	$NetBSD: yp_match.c,v 1.19 2012/03/20 16:30:26 matt Exp $	 */
-
-/*
- * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: yp_match.c,v 1.19 2012/03/20 16:30:26 matt Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#include "local.h"
-
-#define YPMATCHCACHE
-
-extern struct timeval _yplib_timeout;
-extern int _yplib_nerrs;
-extern int _yplib_bindtries;
-extern char _yp_domain[];
-
-#ifdef __weak_alias
-__weak_alias(yp_match,_yp_match)
-#endif
-
-#ifdef YPMATCHCACHE
-int _yplib_cache = 5;
-
-static struct ypmatch_ent {
-	struct ypmatch_ent 	*next;
-	char     		*map, *key;
-	char           		*val;
-	int             	 keylen, vallen;
-	time_t          	 expire_t;
-} *ypmc;
-
-static bool_t ypmatch_add(const char *, const char *, int, char *, int);
-static bool_t ypmatch_find(const char *, const char *, int, const char **,
-    int *);
-
-static bool_t
-ypmatch_add(const char *map, const char *key, int keylen, char *val, int vallen)
-{
-	struct ypmatch_ent *ep;
-	time_t t;
-
-	_DIAGASSERT(map != NULL);
-	_DIAGASSERT(key != NULL);
-	_DIAGASSERT(val != NULL);
-
-	(void)time(&t);
-
-	for (ep = ypmc; ep; ep = ep->next)
-		if (ep->expire_t < t)
-			break;
-	if (ep == NULL) {
-		if ((ep = malloc(sizeof *ep)) == NULL)
-			return 0;
-		(void)memset(ep, 0, sizeof *ep);
-		if (ypmc)
-			ep->next = ypmc;
-		ypmc = ep;
-	}
-
-	if (ep->key) {
-		free(ep->key);
-		ep->key = NULL;
-	}
-	if (ep->val) {
-		free(ep->val);
-		ep->val = NULL;
-	}
-
-	if ((ep->key = malloc((size_t)keylen)) == NULL)
-		return 0;
-
-	if ((ep->val = malloc((size_t)vallen)) == NULL) {
-		free(ep->key);
-		ep->key = NULL;
-		return 0;
-	}
-
-	ep->keylen = keylen;
-	ep->vallen = vallen;
-
-	(void)memcpy(ep->key, key, (size_t)ep->keylen);
-	(void)memcpy(ep->val, val, (size_t)ep->vallen);
-
-	if (ep->map) {
-		if (strcmp(ep->map, map)) {
-			free(ep->map);
-			if ((ep->map = strdup(map)) == NULL)
-				return 0;
-		}
-	} else {
-		if ((ep->map = strdup(map)) == NULL)
-			return 0;
-	}
-
-	ep->expire_t = t + _yplib_cache;
-	return 1;
-}
-
-static bool_t
-ypmatch_find(const char *map, const char *key, int keylen, const char **val,
-	int *vallen)
-{
-	struct ypmatch_ent *ep;
-	time_t          t;
-
-	_DIAGASSERT(map != NULL);
-	_DIAGASSERT(key != NULL);
-	_DIAGASSERT(val != NULL);
-
-	if (ypmc == NULL)
-		return 0;
-
-	(void) time(&t);
-
-	for (ep = ypmc; ep; ep = ep->next) {
-		if (ep->keylen != keylen)
-			continue;
-		if (strcmp(ep->map, map))
-			continue;
-		if (memcmp(ep->key, key, (size_t)keylen))
-			continue;
-		if (t > ep->expire_t)
-			continue;
-
-		*val = ep->val;
-		*vallen = ep->vallen;
-		return 1;
-	}
-	return 0;
-}
-#endif
-
-int
-yp_match(const char *indomain, const char *inmap, const char *inkey,
-	int inkeylen, char **outval, int *outvallen)
-{
-	struct dom_binding *ysd;
-	struct ypresp_val yprv;
-	struct ypreq_key yprk;
-	int r, nerrs = 0;
-
-	if (outval == NULL || outvallen == NULL)
-		return YPERR_BADARGS;
-	*outval = NULL;
-	*outvallen = 0;
-
-	if (_yp_invalid_domain(indomain))
-		return YPERR_BADARGS;
-	if (inmap == NULL || *inmap == '\0'
-	    || strlen(inmap) > YPMAXMAP)
-		return YPERR_BADARGS;
-	if (inkey == NULL || inkeylen == 0)
-		return YPERR_BADARGS;
-
-again:
-	if (_yp_dobind(indomain, &ysd) != 0)
-		return YPERR_DOMAIN;
-
-#ifdef YPMATCHCACHE
-	if (!strcmp(_yp_domain, indomain) && ypmatch_find(inmap, inkey,
-			 inkeylen, &yprv.valdat.dptr, &yprv.valdat.dsize)) {
-		*outvallen = yprv.valdat.dsize;
-		if ((*outval = malloc((size_t)(*outvallen + 1))) == NULL)
-			return YPERR_YPERR;
-		(void)memcpy(*outval, yprv.valdat.dptr, (size_t)*outvallen);
-		(*outval)[*outvallen] = '\0';
-		return 0;
-	}
-#endif
-
-	yprk.domain = indomain;
-	yprk.map = inmap;
-	yprk.keydat.dptr = __UNCONST(inkey);
-	yprk.keydat.dsize = inkeylen;
-
-	memset(&yprv, 0, sizeof yprv);
-
-	r = clnt_call(ysd->dom_client, (rpcproc_t)YPPROC_MATCH,
-		      (xdrproc_t)xdr_ypreq_key, &yprk,
-		      (xdrproc_t)xdr_ypresp_val, &yprv, 
-		      _yplib_timeout);
-	if (r != RPC_SUCCESS) {
-		if (_yplib_bindtries <= 0 && ++nerrs == _yplib_nerrs) {
-			clnt_perror(ysd->dom_client, "yp_match: clnt_call");
-			nerrs = 0;
-		}
-		else if (_yplib_bindtries > 0 && ++nerrs == _yplib_bindtries) {
-			return YPERR_YPSERV;
-		}
-		ysd->dom_vers = -1;
-		goto again;
-	}
-	if (!(r = ypprot_err(yprv.status))) {
-		*outvallen = yprv.valdat.dsize;
-		if ((*outval = malloc((size_t)(*outvallen + 1))) == NULL)
-			return YPERR_YPERR;
-		(void)memcpy(*outval, yprv.valdat.dptr, (size_t)*outvallen);
-		(*outval)[*outvallen] = '\0';
-#ifdef YPMATCHCACHE
-		if (strcmp(_yp_domain, indomain) == 0)
-			if (!ypmatch_add(inmap, inkey, inkeylen,
-					 *outval, *outvallen))
-				r = YPERR_RESRC;
-#endif
-	}
-	xdr_free((xdrproc_t)xdr_ypresp_val, (char *)(void *)&yprv);
-	__yp_unbind(ysd);
-	if (r != 0) {
-		if (*outval) {
-			free(*outval);
-			*outval = NULL;
-		}
-	}
-	return r;
-}
diff --git a/lib/libc/yp/yp_order.c b/lib/libc/yp/yp_order.c
deleted file mode 100644
index 6e0c11690..000000000
--- a/lib/libc/yp/yp_order.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$NetBSD: yp_order.c,v 1.14 2012/06/25 22:32:46 abs Exp $	 */
-
-/*
- * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: yp_order.c,v 1.14 2012/06/25 22:32:46 abs Exp $");
-#endif
-
-#include "namespace.h"
-#include <string.h>
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#include "local.h"
-
-extern struct timeval _yplib_timeout;
-extern int _yplib_nerrs;
-extern int _yplib_bindtries;
-
-#ifdef __weak_alias
-__weak_alias(yp_order,_yp_order)
-#endif
-
-int
-yp_order(const char *indomain, const char *inmap, int *outorder)
-{
-	struct dom_binding *ysd;
-	struct ypresp_order ypro;
-	struct ypreq_nokey yprnk;
-	int r, nerrs = 0;
-
-	if (_yp_invalid_domain(indomain))
-		return YPERR_BADARGS;
-	if (inmap == NULL || *inmap == '\0'
-	    || strlen(inmap) > YPMAXMAP)
-		return YPERR_BADARGS;
-	if (outorder == NULL)
-		return YPERR_BADARGS;
-
-again:
-	if (_yp_dobind(indomain, &ysd) != 0)
-		return YPERR_DOMAIN;
-
-	yprnk.domain = indomain;
-	yprnk.map = inmap;
-
-	(void)memset(&ypro, 0, sizeof ypro);
-
-	r = clnt_call(ysd->dom_client, (rpcproc_t)YPPROC_ORDER,
-		      (xdrproc_t)xdr_ypreq_nokey, &yprnk,
-		      (xdrproc_t)xdr_ypresp_order, &ypro, 
-		      _yplib_timeout);
-	if (r != RPC_SUCCESS) {
-		if (_yplib_bindtries <= 0 && ++nerrs == _yplib_nerrs) {
-			clnt_perror(ysd->dom_client, "yp_order: clnt_call");
-			nerrs = 0;
-		} else if (_yplib_bindtries > 0 && ++nerrs == _yplib_bindtries)
-			return YPERR_YPSERV;
-	        if (r == RPC_PROCUNAVAIL) {
-			/* Case of NIS+ server in NIS compat mode */
-			r = YPERR_YPERR;
-			goto bail;
-	        } 
-		ysd->dom_vers = -1;
-		goto again;
-	}
-	*outorder = ypro.ordernum;
-	xdr_free((xdrproc_t)xdr_ypresp_order, (char *)(void *)&ypro);
-	r = ypprot_err(ypro.status);
-bail:
-	__yp_unbind(ysd);
-	return r;
-}
diff --git a/lib/libc/yp/ypclnt.3 b/lib/libc/yp/ypclnt.3
deleted file mode 100644
index d24e0801a..000000000
--- a/lib/libc/yp/ypclnt.3
+++ /dev/null
@@ -1,424 +0,0 @@
-.\"	$NetBSD: ypclnt.3,v 1.26 2012/03/04 11:52:32 wiz Exp $
-.\"
-.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd March 2, 2012
-.Dt YPCLNT 3
-.Os
-.Sh NAME
-.Nm yp_all ,
-.Nm yp_bind ,
-.Nm yp_first ,
-.Nm yp_get_default_domain ,
-.Nm yp_master ,
-.Nm yp_match ,
-.Nm yp_next ,
-.Nm yp_order ,
-.Nm yp_unbind ,
-.Nm yperr_string ,
-.Nm ypprot_err
-.Nm yp_setbindtries
-.Nd Interface to the YP subsystem
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In rpc/rpc.h
-.In rpcsvc/ypclnt.h
-.In rpcsvc/yp_prot.h
-.Ft int
-.Fn yp_all "const char *indomain" "const char *inmap" "struct ypall_callback *incallback"
-.Ft int
-.Fn yp_bind "const char *dom"
-.Ft int
-.Fn yp_first "const char *indomain" "const char *inmap" "char **outkey" "int *outkeylen" "char **outval" "int *outvallen"
-.Ft int
-.Fn yp_get_default_domain "char **outdomain"
-.Ft int
-.Fn yp_master "const char *indomain" "const char *inmap" "char **outname"
-.Ft int
-.Fn yp_match "const char *indomain" "const char *inmap" "const char *inkey" "int inkeylen" "char **outval" "int *outvallen"
-.Ft int
-.Fn yp_next "const char *indomain" "const char *inmap" "const char *inkey" "int inkeylen" "char **outkey" "int *outkeylen" "char **outval" "int *outvallen"
-.Ft int
-.Fn yp_order "const char *indomain" "const char *inmap" "int *outorder"
-.Ft void
-.Fn yp_unbind "const char *dom"
-.Ft char *
-.Fn yperr_string "int incode"
-.Ft int
-.Fn ypprot_err "unsigned int incode"
-.Ft int
-.Fn yp_setbindtries "int ntries"
-.Sh DESCRIPTION
-The
-.Nm ypclnt
-suite provides an interface to the
-.Tn YP
-subsystem.
-For a general description of the
-.Tn YP
-subsystem, see
-.Xr yp 8 .
-.Pp
-For all functions, input values begin with
-.Pa in
-and output values begin with
-.Pa out .
-.Pp
-Any output values of type
-.Em char **
-should be the addresses of uninitialized character pointers.
-These values will be reset to the null pointer (unless the address
-itself is the null pointer, in which case the error
-.Er YPERR_BADARGS
-will be returned).
-If necessary,
-memory will be allocated by the
-.Tn YP
-client routines using
-.Fn malloc ,
-and the result will be stored in the appropriate output value.
-If the invocation of a
-.Tn YP
-client routine doesn't return an error,
-and an output value is not the null pointer, then this memory
-should be freed by the user when there is no additional need for
-the data stored there.
-For
-.Pa outkey
-and
-.Pa outval ,
-two extra bytes of memory are allocated for a
-.Ql \en
-and
-.Ql \e0 ,
-which are not
-reflected in the values of
-.Pa outkeylen
-or
-.Pa outvallen .
-.Pp
-All occurrences of
-.Pa indomain
-and
-.Pa inmap
-must be non-null, NUL-terminated strings.
-All input strings which also have
-a corresponding length parameter cannot be the null pointer unless the
-corresponding length value is zero.
-Such strings need not be NUL-terminated.
-.Pp
-All
-.Tn YP
-lookup calls (the functions
-.Fn yp_all ,
-.Fn yp_first ,
-.Fn yp_master ,
-.Fn yp_match ,
-.Fn yp_next ,
-.Fn yp_order )
-require a
-.Tn YP
-domain name and a
-.Tn YP
-map name.
-The default domain name may be obtained by calling
-.Fn yp_get_default_domain ,
-and should thus be used before all other
-.Tn YP
-calls in a client program.
-The value it places
-.Pa outdomain
-is suitable for use as the
-.Pa indomain
-parameter to all subsequent
-.Tn YP
-calls.
-.Pp
-In order for
-.Tn YP
-lookup calls to succeed, the client process must be bound
-to a
-.Tn YP
-server process.
-The client process need not explicitly bind to
-the server, as it happens automatically whenever a lookup occurs.
-The function
-.Fn yp_bind
-is provided for a backup strategy, e.g. a local file, when a
-.Tn YP
-server process is not available.
-Each binding uses one socket descriptor on the client
-process, which may be explicitly freed using
-.Fn yp_unbind ,
-which frees all per-process and per-node resources to bind the domain and
-marks the domain unbound.
-.Pp
-If, during a
-.Tn YP
-lookup, an RPC failure occurs, the domain used in the lookup
-is automatically marked unbound and the
-.Nm ypclnt
-layer retries the lookup as long as
-.Xr ypbind 8
-is running and either the client process cannot bind to a server for the domain
-specified in the lookup, or RPC requests to the
-.Tn YP
-server process fail.
-If an error is not RPC-related, one of the
-.Tn YP
-error codes described below
-is returned and control given back to the user code.
-.Pp
-The
-.Nm ypclnt
-suite provides the following functionality:
-.Bl -tag -width yp_matchxxxx
-.It Fn yp_match
-Provides the value associated with the given key.
-.It Fn yp_first
-Provides the first key-value pair from the given map in the named domain.
-.It Fn yp_next
-Provides the next key-value pair in the given map.
-To obtain the second pair,
-the
-.Pa inkey
-value should be the
-.Pa outkey
-value provided by the initial call to
-.Fn yp_first .
-In the general case, the next key-value pair may be obtained by using the
-.Pa outkey
-value from the previous call to
-.Fn yp_next
-as the value for
-.Pa inkey .
-.Pp
-Of course, the notions of
-.Dq first
-and
-.Dq next
-are particular to the
-type of
-.Tn YP
-map being accessed, and thus there is no guarantee of lexical order.
-The only guarantees provided with
-.Fn yp_first
-and
-.Fn yp_next ,
-providing that the same map on the same server is polled repeatedly until
-.Fn yp_next
-returns YPERR_NOMORE, are that all key-value pairs in that map will be accessed
-exactly once, and if the entire procedure is repeated, the order will be
-the same.
-.Pp
-If the server is heavily loaded or the server fails for some reason, the
-domain being used may become unbound.
-If this happens, and the client process re-binds, the retrieval rules
-will break: some entries may be seen twice, and others not at all.
-For this reason, the function
-.Fn yp_all
-provides a better solution for reading all of the entries in a particular map.
-.It Fn yp_all
-This function provides a way to transfer an entire map from
-the server to the client process with a single request.
-This transfer uses TCP, unlike all other functions in the
-.Nm ypclnt
-suite, which use UDP.
-The entire transaction occurs in a single RPC request-response.
-The third argument to this function provides a way to supply
-the name of a function to process each key-value pair in the map.
-.Fn yp_all
-returns after the entire transaction is complete, or the
-.Pa foreach
-function decides that it does not want any more key-value pairs.
-The third argument to
-.Fn yp_all
-is:
-.Bd -literal -offset indent
-struct ypall_callback *incallback {
-	int (*foreach)();
-	char *data;
-};
-.Ed
-.Pp
-The
-.Em char *data
-argument is an opaque pointer for use by the callback function.
-The
-.Pa foreach
-function should return non-zero when it no longer wishes to process
-key-value pairs, at which time
-.Fn yp_all
-returns a value of 0, and is called with the following arguments:
-.Pp
-.Bd -literal -offset indent
-int foreach (
-	int instatus,
-	char *inkey,
-	int inkeylen,
-	char *inval,
-	int invallen,
-	char *indata
-);
-.Ed
-.Pp
-Where:
-.Bl -tag -width "inkey, inval"
-.It Fa instatus
-Holds one of the return status values described in
-.In rpcsvc/yp_prot.h :
-see
-.Fn ypprot_err
-below for a function that will translate
-.Tn YP
-protocol errors into a
-.Nm ypclnt
-layer error code as described in
-.In rpcsvc/ypclnt.h .
-.It Fa inkey, inval
-The key and value arguments are somewhat different here than described
-above.
-In this case, the memory pointed to by
-.Fa inkey
-and
-.Fa inval
-is private to
-.Fn yp_all ,
-and is overwritten with each subsequent key-value pair, thus the
-.Pa foreach
-function should do something useful with the contents of that memory during
-each iteration.
-If the key-value pairs are not terminated with either
-.Ql \en
-or
-.Ql \e0
-in the map, then they will not be terminated as such when given to the
-.Pa foreach
-function, either.
-.It Fa indata
-This is the contents of the
-.Pa incallback-\*[Gt]data
-element of the callback structure.
-It is provided as a means to share state between the
-.Pa foreach
-function and the user code.
-Its use is completely optional: cast it to
-something useful or simply ignore it.
-.El
-.It Fn yp_order
-Returns the order number for a map.
-.It Fn yp_master
-Returns the hostname for the machine on which the master
-.Tn YP
-server process for
-a map is running.
-.It Fn yperr_string
-Returns a pointer to a NUL-terminated error string that does not contain a
-.Ql \&.
-or
-.Ql \en .
-.It Fn ypprot_err
-Converts a
-.Tn YP
-protocol error code to a
-.Nm ypclnt
-error code suitable for
-.Fn yperr_string .
-.It Fn yp_setbindtries
-Set the number of tries to attempt to bind to the domain before returning
-an error.
-The default is
-.Dv 0
-which means wait forever if no ypserver is not found of if the RPC
-communication with the yp server fails.
-If the number passed is negative, the current number of tries is not modified.
-.Pp
-This function is an extention to the client library that allows application
-to catch communication problems with the ypserver without blocking forever.
-.El
-.Sh RETURN VALUES
-All functions in the
-.Nm ypclnt
-suite which are of type
-.Em int
-return 0 upon success or one of the following error codes upon failure:
-.Bl -tag -width "YPERR_BADARGS   "
-.It Bq Er YPERR_BADARGS
-The passed arguments to the function are invalid.
-.It Bq Er YPERR_BADDB
-The
-.Tn YP
-map that was polled is defective.
-.It Bq Er YPERR_DOMAIN
-Client process cannot bind to server on this
-.Tn YP
-domain.
-.It Bq Er YPERR_KEY
-The key passed does not exist.
-.It Bq Er YPERR_MAP
-There is no such map in the server's domain.
-.It Bq Er YPERR_DOM
-The local
-.Tn YP
-domain is not set.
-.It Bq Er YPERR_NOMORE
-There are no more records in the queried map.
-.It Bq Er YPERR_PMAP
-Cannot communicate with portmapper (see
-.Xr rpcbind 8 ) .
-.It Bq Er YPERR_RESRC
-A resource allocation failure occurred.
-.It Bq Er YPERR_RPC
-An RPC failure has occurred.
-The domain has been marked unbound.
-.It Bq Er YPERR_VERS
-Client/server version mismatch.
-If the server is running version 1 of the
-.Tn YP
-protocol,
-.Fn yp_all
-functionality does not exist.
-.It Bq Er YPERR_BIND
-Cannot communicate with
-.Xr ypbind 8 .
-.It Bq Er YPERR_YPERR
-An internal server or client error has occurred.
-.It Bq Er YPERR_YPSERV
-The client cannot communicate with the
-.Tn YP
-server process.
-.El
-.Sh SEE ALSO
-.Xr malloc 3 ,
-.Xr yp 8 ,
-.Xr ypbind 8 ,
-.Xr ypserv 8
-.Sh AUTHORS
-.An Theo De Raadt
diff --git a/lib/libc/yp/yperr_string.c b/lib/libc/yp/yperr_string.c
deleted file mode 100644
index 050a1fed2..000000000
--- a/lib/libc/yp/yperr_string.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*	$NetBSD: yperr_string.c,v 1.9 2015/06/17 00:15:26 christos Exp $	 */
-
-/*
- * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: yperr_string.c,v 1.9 2015/06/17 00:15:26 christos Exp $");
-#endif
-
-#include "namespace.h"
-#include <stdio.h>
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-
-#ifdef __weak_alias
-__weak_alias(yperr_string,_yperr_string)
-#endif
-
-char *
-yperr_string(int incode)
-{
-	static char     err[80];
-
-	switch (incode) {
-	case 0:
-		return __UNCONST("Success");
-	case YPERR_BADARGS:
-		return __UNCONST("Request arguments bad");
-	case YPERR_RPC:
-		return __UNCONST("RPC failure");
-	case YPERR_DOMAIN:
-		return __UNCONST(
-		    "Can't bind to server which serves this domain");
-	case YPERR_MAP:
-		return __UNCONST("No such map in server's domain");
-	case YPERR_KEY:
-		return __UNCONST("No such key in map");
-	case YPERR_YPERR:
-		return __UNCONST("YP server error");
-	case YPERR_RESRC:
-		return __UNCONST("Local resource allocation failure");
-	case YPERR_NOMORE:
-		return __UNCONST("No more records in map database");
-	case YPERR_PMAP:
-		return __UNCONST("Can't communicate with portmapper");
-	case YPERR_YPBIND:
-		return __UNCONST("Can't communicate with ypbind");
-	case YPERR_YPSERV:
-		return __UNCONST("Can't communicate with ypserv");
-	case YPERR_NODOM:
-		return __UNCONST("Local domain name not set");
-	case YPERR_BADDB:
-		return __UNCONST("Server data base is bad");
-	case YPERR_VERS:
-		return __UNCONST(
-		    "YP server version mismatch - server can't supply service."
-		    );
-	case YPERR_ACCESS:
-		return __UNCONST("Access violation");
-	case YPERR_BUSY:
-		return __UNCONST("Database is busy");
-	}
-	(void) snprintf(err, sizeof(err), "YP unknown error %d", incode);
-	return err;
-}
diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c
deleted file mode 100644
index 1db223614..000000000
--- a/lib/libc/yp/yplib.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/*	$NetBSD: yplib.c,v 1.46 2014/09/18 13:58:20 christos Exp $	 */
-
-/*
- * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: yplib.c,v 1.46 2014/09/18 13:58:20 christos Exp $");
-#endif
-
-#include "namespace.h"
-#include "reentrant.h"
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/uio.h>
-
-#include <arpa/nameser.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#include "local.h"
-
-#define BINDINGDIR	"/var/yp/binding"
-#define YPBINDLOCK	"/var/run/ypbind.lock"
-
-struct dom_binding *_ypbindlist;
-char _yp_domain[MAXHOSTNAMELEN];
-
-#define YPLIB_TIMEOUT		10
-#define YPLIB_RPC_RETRIES	4
-
-struct timeval _yplib_timeout = { YPLIB_TIMEOUT, 0 };
-struct timeval _yplib_rpc_timeout = { YPLIB_TIMEOUT / YPLIB_RPC_RETRIES,
-	1000000 * (YPLIB_TIMEOUT % YPLIB_RPC_RETRIES) / YPLIB_RPC_RETRIES };
-int _yplib_nerrs = 5;
-int _yplib_bindtries = 0;
-
-#ifdef __weak_alias
-__weak_alias(yp_bind, _yp_bind)
-__weak_alias(yp_unbind, _yp_unbind)
-__weak_alias(yp_get_default_domain, _yp_get_default_domain)
-__weak_alias(yp_setbindtries, _yp_setbindtries)
-#endif
-
-#ifdef _REENTRANT
-static 	mutex_t			_ypmutex = MUTEX_INITIALIZER;
-#define YPLOCK()		mutex_lock(&_ypmutex)
-#define YPUNLOCK()		mutex_unlock(&_ypmutex)
-#else
-#define YPLOCK()
-#define YPUNLOCK()
-#endif
-
-int
-yp_setbindtries(int ntries)
-{
-	int old_val = _yplib_bindtries;
-
-	if (ntries >= 0)
-		_yplib_bindtries = ntries;
-	return old_val;
-}
-
-int
-_yp_dobind(const char *dom, struct dom_binding **ypdb)
-{
-	static int      pid = -1;
-	char            path[MAXPATHLEN];
-	struct dom_binding *ysd, *ysd2;
-	struct ypbind_resp ypbr;
-	struct sockaddr_in clnt_sin;
-	int             clnt_sock, fd, gpid;
-	CLIENT         *client;
-	int             new = 0;
-	int             nerrs = 0;
-	ssize_t		r;
-
-	if (dom == NULL || *dom == '\0')
-		return YPERR_BADARGS;
-
-	/*
-	 * test if YP is running or not
-	 */
-	if ((fd = open(YPBINDLOCK, O_RDONLY | O_CLOEXEC)) == -1)
-		return YPERR_YPBIND;
-	if (!(flock(fd, LOCK_EX | LOCK_NB) == -1 && errno == EWOULDBLOCK)) {
-		(void)close(fd);
-		return YPERR_YPBIND;
-	}
-	(void)close(fd);
-
-	gpid = getpid();
-	if (!(pid == -1 || pid == gpid)) {
-		ysd = _ypbindlist;
-		while (ysd) {
-			if (ysd->dom_client)
-				clnt_destroy(ysd->dom_client);
-			ysd2 = ysd->dom_pnext;
-			free(ysd);
-			ysd = ysd2;
-		}
-		_ypbindlist = NULL;
-	}
-	pid = gpid;
-
-	if (ypdb != NULL)
-		*ypdb = NULL;
-
-	for (ysd = _ypbindlist; ysd; ysd = ysd->dom_pnext)
-		if (strcmp(dom, ysd->dom_domain) == 0)
-			break;
-	if (ysd == NULL) {
-		if ((ysd = malloc(sizeof *ysd)) == NULL)
-			return YPERR_YPERR;
-		(void)memset(ysd, 0, sizeof *ysd);
-		ysd->dom_socket = -1;
-		ysd->dom_vers = 0;
-		new = 1;
-	}
-again:
-	if (ysd->dom_vers == 0) {
-		(void) snprintf(path, sizeof(path), "%s/%s.%d",
-				BINDINGDIR, dom, 2);
-		if ((fd = open(path, O_RDONLY | O_CLOEXEC)) == -1) {
-			/*
-			 * no binding file, YP is dead, or not yet fully
-			 * alive.
-			 */
-			goto trynet;
-		}
-		if (flock(fd, LOCK_EX | LOCK_NB) == -1 &&
-		    errno == EWOULDBLOCK) {
-			struct iovec    iov[2];
-			struct ypbind_resp ybr;
-			u_short         ypb_port;
-			struct ypbind_binding *bn;
-
-			iov[0].iov_base = &ypb_port;
-			iov[0].iov_len = sizeof ypb_port;
-			iov[1].iov_base = &ybr;
-			iov[1].iov_len = sizeof ybr;
-
-			r = readv(fd, iov, 2);
-			if (r != (ssize_t)(iov[0].iov_len + iov[1].iov_len)) {
-				(void)close(fd);
-				ysd->dom_vers = -1;
-				goto again;
-			}
-			(void)memset(&ysd->dom_server_addr, 0,
-				     sizeof ysd->dom_server_addr);
-			ysd->dom_server_addr.sin_len =
-				sizeof(struct sockaddr_in);
-			ysd->dom_server_addr.sin_family = AF_INET;
-			bn = &ybr.ypbind_respbody.ypbind_bindinfo;
-			ysd->dom_server_addr.sin_port =
-				bn->ypbind_binding_port;
-				
-			ysd->dom_server_addr.sin_addr =
-				bn->ypbind_binding_addr;
-
-			ysd->dom_server_port = ysd->dom_server_addr.sin_port;
-			(void)close(fd);
-			goto gotit;
-		} else {
-			/* no lock on binding file, YP is dead. */
-			(void)close(fd);
-			if (new)
-				free(ysd);
-			return YPERR_YPBIND;
-		}
-	}
-trynet:
-	if (ysd->dom_vers == -1 || ysd->dom_vers == 0) {
-		struct ypbind_binding *bn;
-		(void)memset(&clnt_sin, 0, sizeof clnt_sin);
-		clnt_sin.sin_len = sizeof(struct sockaddr_in);
-		clnt_sin.sin_family = AF_INET;
-		clnt_sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-
-		clnt_sock = RPC_ANYSOCK;
-		client = clnttcp_create(&clnt_sin, YPBINDPROG, YPBINDVERS,
-					&clnt_sock, 0, 0);
-		if (client == NULL) {
-			clnt_pcreateerror("clnttcp_create");
-			if (new)
-				free(ysd);
-			return YPERR_YPBIND;
-		}
-		r = clnt_call(client, (rpcproc_t)YPBINDPROC_DOMAIN,
-		    (xdrproc_t)xdr_ypdomain_wrap_string, &dom,
-		    (xdrproc_t)xdr_ypbind_resp, &ypbr, _yplib_timeout);
-		if (r != RPC_SUCCESS) {
-			if (_yplib_bindtries <= 0 && new == 0 &&
-			    ++nerrs == _yplib_nerrs) {
-				nerrs = 0;
-				fprintf(stderr,
-		    "YP server for domain %s not responding, still trying\n",
-				    dom);
-			}
-			else if (_yplib_bindtries > 0 &&
-			         ++nerrs == _yplib_bindtries) {
-				free(ysd);
-				return YPERR_YPBIND;
-			}
-			clnt_destroy(client);
-			ysd->dom_vers = -1;
-			goto again;
-		}
-		clnt_destroy(client);
-
-		(void)memset(&ysd->dom_server_addr, 0, 
-			     sizeof ysd->dom_server_addr);
-		ysd->dom_server_addr.sin_len = sizeof(struct sockaddr_in);
-		ysd->dom_server_addr.sin_family = AF_INET;
-		bn = &ypbr.ypbind_respbody.ypbind_bindinfo;
-		ysd->dom_server_addr.sin_port =
-			bn->ypbind_binding_port;
-		ysd->dom_server_addr.sin_addr.s_addr =
-			bn->ypbind_binding_addr.s_addr;
-		ysd->dom_server_port =
-			bn->ypbind_binding_port;
-gotit:
-		ysd->dom_vers = YPVERS;
-		(void)strlcpy(ysd->dom_domain, dom, sizeof(ysd->dom_domain));
-	}
-	if (ysd->dom_client)
-		clnt_destroy(ysd->dom_client);
-	ysd->dom_socket = RPC_ANYSOCK;
-	ysd->dom_client = clntudp_create(&ysd->dom_server_addr,
-	    YPPROG, YPVERS, _yplib_rpc_timeout, &ysd->dom_socket);
-	if (ysd->dom_client == NULL) {
-		clnt_pcreateerror("clntudp_create");
-		ysd->dom_vers = -1;
-		goto again;
-	}
-	if (fcntl(ysd->dom_socket, F_SETFD, FD_CLOEXEC) == -1)
-		perror("fcntl: F_SETFD");
-
-	if (new) {
-		ysd->dom_pnext = _ypbindlist;
-		_ypbindlist = ysd;
-	}
-	if (ypdb != NULL)
-		*ypdb = ysd;
-	return 0;
-}
-
-void
-__yp_unbind(struct dom_binding *ypb)
-{
-
-	_DIAGASSERT(ypb != NULL);
-
-	clnt_destroy(ypb->dom_client);
-	ypb->dom_client = NULL;
-	ypb->dom_socket = -1;
-}
-
-int
-yp_bind(const char *dom)
-{
-	if (_yp_invalid_domain(dom))
-		return YPERR_BADARGS;
-
-	return _yp_dobind(dom, NULL);
-}
-
-void
-yp_unbind(const char *dom)
-{
-	struct dom_binding *ypb, *ypbp;
-
-	if (_yp_invalid_domain(dom))
-		return;
-
-	ypbp = NULL;
-	for (ypb = _ypbindlist; ypb; ypb = ypb->dom_pnext) {
-		if (strcmp(dom, ypb->dom_domain) == 0) {
-			clnt_destroy(ypb->dom_client);
-			if (ypbp)
-				ypbp->dom_pnext = ypb->dom_pnext;
-			else
-				_ypbindlist = ypb->dom_pnext;
-			free(ypb);
-			return;
-		}
-		ypbp = ypb;
-	}
-	return;
-}
-
-int
-yp_get_default_domain(char **domp)
-{
-	if (domp == NULL)
-		return YPERR_BADARGS;
-	*domp = NULL;
-	if (_yp_domain[0] == '\0')
-		if (getdomainname(_yp_domain, sizeof _yp_domain))
-			return YPERR_NODOM;
-	*domp = _yp_domain;
-	return 0;
-}
-
-int
-_yp_check(char **dom)
-{
-	char           *unused;
-	int 		good;
-
-	YPLOCK();
-
-	if (_yp_domain[0] == '\0')
-		if (yp_get_default_domain(&unused)) {
-			good = 0;
-			goto done;
-		}
-	if (dom)
-		*dom = _yp_domain;
-
-	good = yp_bind(_yp_domain) == 0;
-done:
-	YPUNLOCK();
-	return good;
-}
-
-/*
- * _yp_invalid_domain: check if given domainname isn't legal.
- * returns non-zero if invalid
- */
-int
-_yp_invalid_domain(const char *dom)
-{
-	if (dom == NULL || *dom == '\0')
-		return 1;
-
-	if (strlen(dom) > YPMAXDOMAIN)
-		return 1;
-
-	if (strchr(dom, '/') != NULL)
-		return 1;
-
-	return 0;
-}
diff --git a/lib/libc/yp/ypprot_err.c b/lib/libc/yp/ypprot_err.c
deleted file mode 100644
index af42f059d..000000000
--- a/lib/libc/yp/ypprot_err.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: ypprot_err.c,v 1.6 2012/06/25 22:32:46 abs Exp $	 */
-
-/*
- * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ypprot_err.c,v 1.6 2012/06/25 22:32:46 abs Exp $");
-#endif
-
-#include "namespace.h"
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-
-#ifdef __weak_alias
-__weak_alias(ypprot_err,_ypprot_err)
-#endif
-
-int
-ypprot_err(unsigned int incode)
-{
-	switch (incode) {
-	case YP_TRUE:
-		return 0;
-	case YP_FALSE:
-		return YPERR_YPBIND;
-	case YP_NOMORE:
-		return YPERR_NOMORE;
-	case YP_NOMAP:
-		return YPERR_MAP;
-	case YP_NODOM:
-		return YPERR_NODOM;
-	case YP_NOKEY:
-		return YPERR_KEY;
-	case YP_BADOP:
-		return YPERR_YPERR;
-	case YP_BADDB:
-		return YPERR_BADDB;
-	case YP_YPERR:
-		return YPERR_YPERR;
-	case YP_BADARGS:
-		return YPERR_BADARGS;
-	case YP_VERS:
-		return YPERR_VERS;
-	}
-	return YPERR_YPERR;
-}
diff --git a/lib/libc_vfp/Makefile b/lib/libc_vfp/Makefile
deleted file mode 100644
index 6b2da2842..000000000
--- a/lib/libc_vfp/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#	$NetBSD: Makefile,v 1.4 2015/07/08 01:08:24 matt Exp $
-#
-
-LIB=		c_vfp
-
-USE_SHLIBDIR=	yes
-
-.include <bsd.own.mk>
-
-CPUFLAGS+=	-mfpu=vfp -marm
-
-SRCS=		vfpsf.S vfpdf.S
-AFLAGS.vfpsf.S+=	-mfpu=vfp
-AFLAGS.vfpdf.S+=	-mfpu=vfp
-
-.include <bsd.lib.mk>
diff --git a/lib/libc_vfp/shlib_version b/lib/libc_vfp/shlib_version
deleted file mode 100644
index 1b83bbd0d..000000000
--- a/lib/libc_vfp/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.1 2013/01/28 17:04:40 matt Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=0
-minor=0
diff --git a/lib/libc_vfp/vfpdf.S b/lib/libc_vfp/vfpdf.S
deleted file mode 100644
index af11737ca..000000000
--- a/lib/libc_vfp/vfpdf.S
+++ /dev/null
@@ -1,273 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-
-RCSID("$NetBSD: vfpdf.S,v 1.2 2013/06/23 06:19:55 matt Exp $")
-
-/*
- * This file provides softfloat compatible routines which use VFP instructions
- * to do the actual work.  This should give near hard-float performance while
- * being compatible with soft-float code.
- *
- * This file implements the double precision floating point routines.
- */
-
-#ifdef	__ARMEL__
-#define	vmov_arg0	vmov	d0, r0, r1
-#define	vmov_arg1	vmov	d1, r2, r3
-#define	vmov_ret	vmov	r0, r1, d0
-#else
-#define	vmov_arg0	vmov	d0, r1, r0
-#define	vmov_arg1	vmov	d1, r3, r2
-#define	vmov_ret	vmov	r1, r0, d0
-#endif
-#define	vmov_args	vmov_arg0; vmov_arg1
-
-#ifdef __ARM_EABI__
-#define	__adddf3	__aeabi_dadd
-#define	__divdf3	__aeabi_ddiv
-#define	__muldf3	__aeabi_dmul
-#define	__subdf3	__aeabi_dsub
-#define	__negdf2	__aeabi_dneg
-#define	__extendsfdf2	__aeabi_f2d
-#define	__fixdfsi	__aeabi_d2iz
-#define	__fixunsdfsi	__aeabi_d2uiz
-#define	__floatsidf	__aeabi_i2d
-#define	__floatunsidf	__aeabi_ui2d
-#endif
-
-ENTRY(__adddf3)
-	vmov_args
-	vadd.f64	d0, d0, d1
-	vmov_ret
-	RET
-END(__adddf3)
-
-ENTRY(__subdf3)
-	vmov_args
-	vsub.f64	d0, d0, d1
-	vmov_ret
-	RET
-END(__subdf3)
-
-#ifdef __ARM_EABI__
-ENTRY(__aeabi_drsub)
-	vmov_args
-	vsub.f64	d0, d1, d0
-	vmov_ret
-	RET
-END(__aeabi_drsub)
-#endif
-
-ENTRY(__muldf3)
-	vmov_args
-	vmul.f64	d0, d0, d1
-	vmov_ret
-	RET
-END(__muldf3)
-
-ENTRY(__divdf3)
-	vmov_args
-	vdiv.f64	d0, d0, d1
-	vmov_ret
-	RET
-END(__divdf3)
-
-ENTRY(__negdf2)
-	vmov_arg0
-	vneg.f64	d0, d0
-	vmov_ret
-	RET
-END(__negdf2)
-
-ENTRY(__extendsfdf2)
-	vmov		s0, r0
-	vcvt.f64.f32	d0, s0
-	vmov_ret
-	RET
-END(__extendsfdf2)
-
-ENTRY(__fixdfsi)
-	vmov_arg0
-	vcvt.s32.f64	s0, d0
-	vmov		r0, s0
-	RET
-END(__fixdfsi)
-
-ENTRY(__fixunsdfsi)
-	vmov_arg0
-	vcvt.u32.f64	s0, d0
-	vmov		r0, s0
-	RET
-END(__fixunsdfsi)
-
-ENTRY(__floatsidf)
-	vmov		s0, r0
-	vcvt.f64.s32	d0, s0
-	vmov_ret
-	RET
-END(__floatsidf)
-
-ENTRY(__floatunsidf)
-	vmov		s0, r0
-	vcvt.f64.u32	d0, s0
-	vmov_ret
-	RET
-END(__floatunsidf)
-
-/*
- * Effect of a floating point comparision on the condition flags.
- *      N Z C V
- * EQ = 0 1 1 0
- * LT = 1 0 0 0
- * GT = 0 0 1 0
- * UN = 0 0 1 1
- */
-#ifdef __ARM_EABI__
-ENTRY(__aeabi_cdcmpeq)
-	vmov_args
-	vcmp.f64	d0, d1
-	vmrs		APSR_nzcv, fpscr
-	RET
-END(__aeabi_cdcmpeq)
-
-ENTRY(__aeabi_cdcmple)
-	vmov_args
-	vcmpe.f64	d0, d1
-	vmrs		APSR_nzcv, fpscr
-	RET
-END(__aeabi_cdcmple)
-
-ENTRY(__aeabi_cdrcmple)
-	vmov_args
-	vcmpe.f64	d1, d0
-	vmrs		APSR_nzcv, fpscr
-	RET
-END(__aeabi_cdrcmple)
-
-ENTRY(__aeabi_dcmpeq)
-	vmov_args
-	vcmp.f64	d0, d1
-	vmrs		APSR_nzcv, fpscr
-	moveq		r0, #1		/* (a == b) */
-	movne		r0, #0		/* (a != b) or unordered */
-	RET
-END(__aeabi_dcmpeq)
-
-ENTRY(__aeabi_dcmplt)
-	vmov_args
-	vcmp.f64	d0, d1
-	vmrs		APSR_nzcv, fpscr
-	movlt		r0, #1		/* (a < b) */
-	movcs		r0, #0		/* (a >= b) or unordered */
-	RET
-END(__aeabi_dcmplt)
-
-ENTRY(__aeabi_dcmple)
-	vmov_args
-	vcmp.f64	d0, d1
-	vmrs		APSR_nzcv, fpscr
-	movls		r0, #1		/* (a <= b) */
-	movhi		r0, #0		/* (a > b) or unordered */
-	RET
-END(__aeabi_dcmple)
-
-ENTRY(__aeabi_dcmpge)
-	vmov_args
-	vcmp.f64	d0, d1
-	vmrs		APSR_nzcv, fpscr
-	movge		r0, #1		/* (a >= b) */
-	movlt		r0, #0		/* (a < b) or unordered */
-	RET
-END(__aeabi_dcmpge)
-
-ENTRY(__aeabi_dcmpgt)
-	vmov_args
-	vcmp.f64	d0, d1
-	vmrs		APSR_nzcv, fpscr
-	movgt		r0, #1		/* (a > b) */
-	movle		r0, #0		/* (a <= b) or unordered */
-	RET
-END(__aeabi_dcmpgt)
-
-ENTRY(__aeabi_dcmpun)
-	vmov_args
-	vcmp.f64	d0, d1
-	vmrs		APSR_nzcv, fpscr
-	movvs		r0, #1		/* (isnan(a) || isnan(b)) */
-	movvc		r0, #0		/* !isnan(a) && !isnan(b) */
-	RET
-END(__aeabi_dcmpun)
-
-#else
-/* N set if compare <= result */
-/* Z set if compare = result */
-/* C set if compare (=,>=,UNORD) result */
-/* V set if compare UNORD result */
-
-STRONG_ALIAS(__eqdf2, __nedf2)
-ENTRY(__nedf2)
-	vmov_args
-	vcmp.f64	d0, d1
-	vmrs		APSR_nzcv, fpscr
-	moveq		r0, #0		/* !(a == b) */
-	movne		r0, #1		/* !(a == b) */
-	RET
-END(__nedf2)
-
-STRONG_ALIAS(__gedf2, __ltdf2)
-ENTRY(__ltdf2)
-	vmov_args
-	vcmp.f64	d0, d1
-	vmrs		APSR_nzcv, fpscr
-	mvnmi		r0, #0		/* -(a < b) */
-	movpl		r0, #0		/* -(a < b) */
-	RET
-END(__ltdf2)
-
-STRONG_ALIAS(__gtdf2, __ledf2)
-ENTRY(__ledf2)
-	vmov_args
-	vcmp.f64	d0, d1
-	vmrs		APSR_nzcv, fpscr
-	movgt		r0, #1		/* (a > b) */
-	movle		r0, #0		/* (a > b) */
-	RET
-END(__ledf2)
-
-ENTRY(__unorddf2)
-	vmov_args
-	vcmp.f64	d0, d1
-	vmrs		APSR_nzcv, fpscr
-	movvs		r0, #1		/* isnan(a) || isnan(b) */
-	movvc		r0, #0		/* isnan(a) || isnan(b) */
-	RET
-END(__unorddf2)
-#endif /* !__ARM_EABI__ */
diff --git a/lib/libc_vfp/vfpsf.S b/lib/libc_vfp/vfpsf.S
deleted file mode 100644
index a7e28025e..000000000
--- a/lib/libc_vfp/vfpsf.S
+++ /dev/null
@@ -1,267 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-#include <arm/vfpreg.h>
-
-RCSID("$NetBSD: vfpsf.S,v 1.2 2013/06/23 06:19:55 matt Exp $")
-
-/*
- * This file provides softfloat compatible routines which use VFP instructions
- * to do the actual work.  This should give near hard-float performance while
- * being compatible with soft-float code.
- *
- * This file implements the single precision floating point routines.
- */
-
-#ifdef __ARM_EABI__
-#define	__addsf3	__aeabi_fadd
-#define	__divsf3	__aeabi_fdiv
-#define	__mulsf3	__aeabi_fmul
-#define	__subsf3	__aeabi_fsub
-#define	__negsf2	__aeabi_fneg
-#define	__truncdfsf2	__aeabi_d2f
-#define	__fixsfsi	__aeabi_f2iz
-#define	__fixunssfsi	__aeabi_f2uiz
-#define	__floatsisf	__aeabi_i2f
-#define	__floatunsisf	__aeabi_ui2f
-#endif
-
-ENTRY(__addsf3)
-	vmov		s0, s1, r0, r1
-	vadd.f32	s0, s0, s1
-	vmov		r0, s0
-	RET
-END(__addsf3)
-
-ENTRY(__subsf3)
-	vmov		s0, s1, r0, r1
-	vsub.f32	s0, s0, s1
-	vmov		r0, s0
-	RET
-END(__subsf3)
-
-#ifdef __ARM_EABI__
-ENTRY(__aeabi_frsub)
-	vmov		s0, s1, r0, r1
-	vsub.f32	s0, s1, s0
-	vmov		r0, s0
-	RET
-END(__aeabi_frsub)
-#endif
-
-ENTRY(__mulsf3)
-	vmov		s0, s1, r0, r1
-	vmul.f32	s0, s0, s1
-	vmov		r0, s0
-	RET
-END(__mulsf3)
-
-ENTRY(__divsf3)
-	vmov		s0, s1, r0, r1
-	vdiv.f32	s0, s0, s1
-	vmov		r0, s0
-	RET
-END(__divsf3)
-
-ENTRY(__negsf2)
-	vmov		s0, r0
-	vneg.f32	s0, s0
-	vmov		r0, s0
-	RET
-END(__negsf2)
-
-ENTRY(__truncdfsf2)
-#ifdef __ARMEL__
-	vmov		d0, r0, r1
-#else
-	vmov		d0, r1, r0
-#endif
-	vcvt.f32.f64	s0, d0
-	vmov		r0, s0
-	RET
-END(__truncdfsf2)
-
-ENTRY(__fixsfsi)
-	vmov		s0, r0
-	vcvt.s32.f32	s0, s0
-	vmov		r0, s0
-	RET
-END(__fixsfsi)
-
-ENTRY(__fixunssfsi)
-	vmov		s0, r0
-	vcvt.u32.f32	s0, s0
-	vmov		r0, s0
-	RET
-END(__fixunssfsi)
-
-ENTRY(__floatsisf)
-	vmov		s0, r0
-	vcvt.f32.s32	s0, s0
-	vmov		r0, s0
-	RET
-END(__floatsisf)
-
-ENTRY(__floatunsisf)
-	vmov		s0, r0
-	vcvt.f32.u32	s0, s0
-	vmov		r0, s0
-	RET
-END(__floatunsisf)
-
-/*
- * Effect of a floating point comparision on the condition flags.
- *      N Z C V
- * EQ = 0 1 1 0
- * LT = 1 0 0 0
- * GT = 0 0 1 0
- * UN = 0 0 1 1
- */
-#ifdef __ARM_EABI__
-ENTRY(__aeabi_cfcmpeq)
-	vmov		s0, s1, r0, r1
-	vcmp.f32	s0, s1
-	vmrs		APSR_nzcv, fpscr
-	RET
-END(__aeabi_cfcmpeq)
-
-ENTRY(__aeabi_cfcmple)
-	vmov		s0, s1, r0, r1
-	vcmpe.f32	s0, s1
-	vmrs		APSR_nzcv, fpscr
-	RET
-END(__aeabi_cfcmple)
-
-ENTRY(__aeabi_cfrcmple)
-	vmov		s0, s1, r0, r1
-	vcmpe.f32	s1, s0
-	vmrs		APSR_nzcv, fpscr
-	RET
-END(__aeabi_cfrcmple)
-
-ENTRY(__aeabi_fcmpeq)
-	vmov		s0, s1, r0, r1
-	vcmp.f32	s0, s1
-	vmrs		APSR_nzcv, fpscr
-	moveq		r0, #1		/* (a == b) */
-	movne		r0, #0		/* (a != b) or unordered */
-	RET
-END(__aeabi_fcmpeq)
-
-ENTRY(__aeabi_fcmplt)
-	vmov		s0, s1, r0, r1
-	vcmp.f32	s0, s1
-	vmrs		APSR_nzcv, fpscr
-	movlt		r0, #1		/* (a < b) */
-	movcs		r0, #0		/* (a >= b) or unordered */
-	RET
-END(__aeabi_fcmplt)
-
-ENTRY(__aeabi_fcmple)
-	vmov		s0, s1, r0, r1
-	vcmp.f32	s0, s1
-	vmrs		APSR_nzcv, fpscr
-	movls		r0, #1		/* (a <= b) */
-	movhi		r0, #0		/* (a > b) or unordered */
-	RET
-END(__aeabi_fcmple)
-
-ENTRY(__aeabi_fcmpge)
-	vmov		s0, s1, r0, r1
-	vcmp.f32	s0, s1
-	vmrs		APSR_nzcv, fpscr
-	movge		r0, #1		/* (a >= b) */
-	movlt		r0, #0		/* (a < b) or unordered */
-	RET
-END(__aeabi_fcmpge)
-
-ENTRY(__aeabi_fcmpgt)
-	vmov		s0, s1, r0, r1
-	vcmp.f32	s0, s1
-	vmrs		APSR_nzcv, fpscr
-	movgt		r0, #1		/* (a > b) */
-	movle		r0, #0		/* (a <= b) or unordered */
-	RET
-END(__aeabi_fcmpgt)
-
-ENTRY(__aeabi_fcmpun)
-	vmov		s0, s1, r0, r1
-	vcmp.f32	s0, s1
-	vmrs		APSR_nzcv, fpscr
-	movvs		r0, #1		/* (isnan(a) || isnan(b)) */
-	movvc		r0, #0		/* !isnan(a) && !isnan(b) */
-	RET
-END(__aeabi_fcmpun)
-
-#else
-/* N set if compare <= result */
-/* Z set if compare = result */
-/* C set if compare (=,>=,UNORD) result */
-/* V set if compare UNORD result */
-
-STRONG_ALIAS(__eqsf2, __nesf2)
-ENTRY(__nesf2)
-	vmov		s0, s1, r0, r1
-	vcmp.f32	s0, s1
-	vmrs		APSR_nzcv, fpscr
-	moveq		r0, #0		/* !(a == b) */
-	movne		r0, #1		/* !(a == b) */
-	RET
-END(__nesf2)
-
-STRONG_ALIAS(__gesf2, __ltsf2)
-ENTRY(__ltsf2)
-	vmov		s0, s1, r0, r1
-	vcmp.f32	s0, s1
-	vmrs		APSR_nzcv, fpscr
-	mvnmi		r0, #0		/* -(a < b) */
-	movpl		r0, #0		/* -(a < b) */
-	RET
-END(__ltsf2)
-
-STRONG_ALIAS(__gtsf2, __lesf2)
-ENTRY(__lesf2)
-	vmov		s0, s1, r0, r1
-	vcmp.f32	s0, s1
-	vmrs		APSR_nzcv, fpscr
-	movgt		r0, #1		/* (a > b) */
-	movle		r0, #0		/* (a > b) */
-	RET
-END(__lesf2)
-
-ENTRY(__unordsf2)
-	vmov		s0, s1, r0, r1
-	vcmp.f32	s0, s1
-	vmrs		APSR_nzcv, fpscr
-	movvs		r0, #1		/* isnan(a) || isnan(b) */
-	movvc		r0, #0		/* isnan(a) || isnan(b) */
-	RET
-END(__unordsf2)
-#endif /* !__ARM_EABI__ */
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
deleted file mode 100644
index c3929466f..000000000
--- a/lib/libcrypt/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#	$NetBSD: Makefile,v 1.25 2013/08/10 18:42:29 dholland Exp $
-
-USE_SHLIBDIR=	yes
-
-LIB=	crypt
-
-SRCS=	crypt.c md5crypt.c bcrypt.c crypt-sha1.c util.c pw_gensalt.c
-SRCS+=	hmac_sha1.c
-
-WARNS?=	5
-
-MAN=	crypt.3
-MLINKS= crypt.3 encrypt.3 crypt.3 setkey.3
-
-
-.if make(*.test)
-.SUFFIXES: .test
-.c.test:
-	${CC} -o $@ -DUNIT_TEST -DMAIN ${LDSTATIC} ${.IMPSRC} ${LDADD}
-LDADD+= -L${.OBJDIR} -l${LIB} -L${.OBJDIR}/../../libc
-DPADD+= lib${LIB}.a
-LDSTATIC?= -static
-.include <bsd.prog.mk>
-.else
-.include <bsd.lib.mk>
-.endif
diff --git a/lib/libcrypt/bcrypt.c b/lib/libcrypt/bcrypt.c
deleted file mode 100644
index 23325838d..000000000
--- a/lib/libcrypt/bcrypt.c
+++ /dev/null
@@ -1,379 +0,0 @@
-/*	$NetBSD: bcrypt.c,v 1.19 2013/08/28 17:47:07 riastradh Exp $	*/
-/*	$OpenBSD: bcrypt.c,v 1.16 2002/02/19 19:39:36 millert Exp $	*/
-
-/*
- * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Niels Provos.
- * 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.
- */
-
-/* This password hashing algorithm was designed by David Mazieres
- * <dm@lcs.mit.edu> and works as follows:
- *
- * 1. state := InitState ()
- * 2. state := ExpandKey (state, salt, password) 3.
- * REPEAT rounds:
- *	state := ExpandKey (state, 0, salt)
- *      state := ExpandKey(state, 0, password)
- * 4. ctext := "OrpheanBeholderScryDoubt"
- * 5. REPEAT 64:
- * 	ctext := Encrypt_ECB (state, ctext);
- * 6. RETURN Concatenate (salt, ctext);
- *
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: bcrypt.c,v 1.19 2013/08/28 17:47:07 riastradh Exp $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <limits.h>
-
-#include "crypt.h"
-#include "blowfish.c"
-
-/* This implementation is adaptable to current computing power.
- * You can have up to 2^31 rounds which should be enough for some
- * time to come.
- */
-
-#define BCRYPT_VERSION '2'
-#define BCRYPT_MAXSALT 16	/* Precomputation is just so nice */
-#define BCRYPT_MAXSALTLEN 	(7 + (BCRYPT_MAXSALT * 4 + 2) / 3 + 1)
-#define BCRYPT_BLOCKS 6		/* Ciphertext blocks */
-#define BCRYPT_MINROUNDS 16	/* we have log2(rounds) in salt */
-
-static void encode_salt(char *, u_int8_t *, u_int16_t, u_int8_t);
-static void encode_base64(u_int8_t *, u_int8_t *, u_int16_t);
-static void decode_base64(u_int8_t *, u_int16_t, const u_int8_t *);
-
-char *__bcrypt(const char *, const char *);	/* XXX */
-
-static char    encrypted[_PASSWORD_LEN];
-
-static const u_int8_t Base64Code[] =
-"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-
-char *bcrypt_gensalt(u_int8_t);
-
-static const u_int8_t index_64[128] =
-{
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-	255, 255, 255, 255, 255, 255, 0, 1, 54, 55,
-	56, 57, 58, 59, 60, 61, 62, 63, 255, 255,
-	255, 255, 255, 255, 255, 2, 3, 4, 5, 6,
-	7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-	17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
-	255, 255, 255, 255, 255, 255, 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, 255, 255, 255, 255, 255
-};
-#define CHAR64(c)  ( (c) > 127 ? 255 : index_64[(c)])
-
-static void
-decode_base64(u_int8_t *buffer, u_int16_t len, const u_int8_t *data)
-{
-	u_int8_t *bp = buffer;
-	const u_int8_t *p = data;
-	u_int8_t c1, c2, c3, c4;
-	while (bp < buffer + len) {
-		c1 = CHAR64(*p);
-		c2 = CHAR64(*(p + 1));
-
-		/* Invalid data */
-		if (c1 == 255 || c2 == 255)
-			break;
-
-		*bp++ = ((u_int32_t)c1 << 2) | (((u_int32_t)c2 & 0x30) >> 4);
-		if (bp >= buffer + len)
-			break;
-
-		c3 = CHAR64(*(p + 2));
-		if (c3 == 255)
-			break;
-
-		*bp++ = (((u_int32_t)c2 & 0x0f) << 4) | (((uint32_t)c3 & 0x3c) >> 2);
-		if (bp >= buffer + len)
-			break;
-
-		c4 = CHAR64(*(p + 3));
-		if (c4 == 255)
-			break;
-		*bp++ = ((c3 & 0x03) << 6) | c4;
-
-		p += 4;
-	}
-}
-
-static void
-encode_salt(char *salt, u_int8_t *csalt, u_int16_t clen, u_int8_t logr)
-{
-	salt[0] = '$';
-	salt[1] = BCRYPT_VERSION;
-	salt[2] = 'a';
-	salt[3] = '$';
-
-	snprintf(salt + 4, 4, "%2.2u$", logr);
-
-	encode_base64((u_int8_t *) salt + 7, csalt, clen);
-}
-
-int
-__gensalt_blowfish(char *salt, size_t saltlen, const char *option)
-{
-	size_t i;
-	u_int32_t seed = 0;
-	u_int8_t csalt[BCRYPT_MAXSALT];
-	unsigned long nrounds;
-	char *ep;
-
-	if (saltlen < BCRYPT_MAXSALTLEN) {
-		errno = ENOSPC;
-		return -1;
-	}
-	if (option == NULL) {
-		errno = EINVAL;
-		return -1;
-	}
-	nrounds = strtoul(option, &ep, 0);
-	if (option == ep || *ep) {
-		errno = EINVAL;
-		return -1;
-	}
-	if (errno == ERANGE && nrounds == ULONG_MAX)
-		return -1;
-
-	if (nrounds < 4)
-		nrounds = 4;
-	else if (nrounds > 31)
-		nrounds = 31;
-
-	for (i = 0; i < BCRYPT_MAXSALT; i++) {
-		if (i % 4 == 0)
-			seed = arc4random();
-		csalt[i] = seed & 0xff;
-		seed = seed >> 8;
-	}
-	encode_salt(salt, csalt, BCRYPT_MAXSALT, (u_int8_t)nrounds);
-	return 0;
-}
-
-/* Generates a salt for this version of crypt.
-   Since versions may change. Keeping this here
-   seems sensible.
-   XXX: compat.
- */
-char *
-bcrypt_gensalt(u_int8_t log_rounds)
-{
-	static char gsalt[BCRYPT_MAXSALTLEN];
-	char num[10];
-
-	(void)snprintf(num, sizeof(num), "%d", log_rounds);
-	if (__gensalt_blowfish(gsalt, sizeof(gsalt), num) == -1)
-		return NULL;
-	return gsalt;
-}
-
-/* We handle $Vers$log2(NumRounds)$salt+passwd$
-   i.e. $2$04$iwouldntknowwhattosayetKdJ6iFtacBqJdKe6aW7ou */
-
-char   *
-__bcrypt(const char *key, const char *salt)
-{
-	blf_ctx state;
-	u_int32_t rounds, i, k;
-	u_int16_t j;
-	u_int8_t key_len, salt_len, logr, minor;
-	u_int8_t ciphertext[4 * BCRYPT_BLOCKS] = "OrpheanBeholderScryDoubt";
-	u_int8_t csalt[BCRYPT_MAXSALT];
-	u_int32_t cdata[BCRYPT_BLOCKS];
-	int n;
-	size_t len;
-
-	/* Discard "$" identifier */
-	salt++;
-
-	if (*salt > BCRYPT_VERSION)
-		return NULL;
-
-	/* Check for minor versions */
-	if (salt[1] != '$') {
-		switch (salt[1]) {
-		case 'a':
-			/* 'ab' should not yield the same as 'abab' */
-			minor = salt[1];
-			salt++;
-			break;
-		default:
-			return NULL;
-		}
-	} else
-		 minor = 0;
-
-	/* Discard version + "$" identifier */
-	salt += 2;
-
-	if (salt[2] != '$')
-		/* Out of sync with passwd entry */
-		return NULL;
-
-	/* Computer power doesn't increase linear, 2^x should be fine */
-	n = atoi(salt);
-	if (n > 31 || n < 0)
-		return NULL;
-	logr = (u_int8_t)n;
-	if ((rounds = (u_int32_t) 1 << logr) < BCRYPT_MINROUNDS)
-		return NULL;
-
-	/* Discard num rounds + "$" identifier */
-	salt += 3;
-
-	if (strlen(salt) * 3 / 4 < BCRYPT_MAXSALT)
-		return NULL;
-
-	/* We dont want the base64 salt but the raw data */
-	decode_base64(csalt, BCRYPT_MAXSALT, (const u_int8_t *)salt);
-	salt_len = BCRYPT_MAXSALT;
-	len = strlen(key);
-	if (len > 72)
-		key_len = 72;
-	else
-		key_len = (uint8_t)len;
-	key_len += minor >= 'a' ? 1 : 0;
-
-	/* Setting up S-Boxes and Subkeys */
-	Blowfish_initstate(&state);
-	Blowfish_expandstate(&state, csalt, salt_len,
-	    (const u_int8_t *) key, key_len);
-	for (k = 0; k < rounds; k++) {
-		Blowfish_expand0state(&state, (const u_int8_t *) key, key_len);
-		Blowfish_expand0state(&state, csalt, salt_len);
-	}
-
-	/* This can be precomputed later */
-	j = 0;
-	for (i = 0; i < BCRYPT_BLOCKS; i++)
-		cdata[i] = Blowfish_stream2word(ciphertext, 4 * BCRYPT_BLOCKS, &j);
-
-	/* Now do the encryption */
-	for (k = 0; k < 64; k++)
-		blf_enc(&state, cdata, BCRYPT_BLOCKS / 2);
-
-	for (i = 0; i < BCRYPT_BLOCKS; i++) {
-		ciphertext[4 * i + 3] = cdata[i] & 0xff;
-		cdata[i] = cdata[i] >> 8;
-		ciphertext[4 * i + 2] = cdata[i] & 0xff;
-		cdata[i] = cdata[i] >> 8;
-		ciphertext[4 * i + 1] = cdata[i] & 0xff;
-		cdata[i] = cdata[i] >> 8;
-		ciphertext[4 * i + 0] = cdata[i] & 0xff;
-	}
-
-
-	i = 0;
-	encrypted[i++] = '$';
-	encrypted[i++] = BCRYPT_VERSION;
-	if (minor)
-		encrypted[i++] = minor;
-	encrypted[i++] = '$';
-
-	snprintf(encrypted + i, 4, "%2.2u$", logr);
-
-	encode_base64((u_int8_t *) encrypted + i + 3, csalt, BCRYPT_MAXSALT);
-	encode_base64((u_int8_t *) encrypted + strlen(encrypted), ciphertext,
-	    4 * BCRYPT_BLOCKS - 1);
-	explicit_memset(&state, 0, sizeof(state));
-	return encrypted;
-}
-
-static void
-encode_base64(u_int8_t *buffer, u_int8_t *data, u_int16_t len)
-{
-	u_int8_t *bp = buffer;
-	u_int8_t *p = data;
-	u_int8_t c1, c2;
-	while (p < data + len) {
-		c1 = *p++;
-		*bp++ = Base64Code[((u_int32_t)c1 >> 2)];
-		c1 = (c1 & 0x03) << 4;
-		if (p >= data + len) {
-			*bp++ = Base64Code[c1];
-			break;
-		}
-		c2 = *p++;
-		c1 |= ((u_int32_t)c2 >> 4) & 0x0f;
-		*bp++ = Base64Code[c1];
-		c1 = (c2 & 0x0f) << 2;
-		if (p >= data + len) {
-			*bp++ = Base64Code[c1];
-			break;
-		}
-		c2 = *p++;
-		c1 |= ((u_int32_t)c2 >> 6) & 0x03;
-		*bp++ = Base64Code[c1];
-		*bp++ = Base64Code[c2 & 0x3f];
-	}
-	*bp = '\0';
-}
-#if 0
-void
-main()
-{
-	char    blubber[73];
-	char    salt[100];
-	char   *p;
-	salt[0] = '$';
-	salt[1] = BCRYPT_VERSION;
-	salt[2] = '$';
-
-	snprintf(salt + 3, 4, "%2.2u$", 5);
-
-	printf("24 bytes of salt: ");
-	fgets(salt + 6, 94, stdin);
-	salt[99] = 0;
-	printf("72 bytes of password: ");
-	fpurge(stdin);
-	fgets(blubber, 73, stdin);
-	blubber[72] = 0;
-
-	p = crypt(blubber, salt);
-	printf("Passwd entry: %s\n\n", p);
-
-	p = bcrypt_gensalt(5);
-	printf("Generated salt: %s\n", p);
-	p = crypt(blubber, p);
-	printf("Passwd entry: %s\n", p);
-}
-#endif
diff --git a/lib/libcrypt/blowfish.c b/lib/libcrypt/blowfish.c
deleted file mode 100644
index c0ab28952..000000000
--- a/lib/libcrypt/blowfish.c
+++ /dev/null
@@ -1,498 +0,0 @@
-/*	$NetBSD: blowfish.c,v 1.4 2005/12/24 21:11:16 perry Exp $	*/
-/* $OpenBSD: blowfish.c,v 1.16 2002/02/19 19:39:36 millert Exp $ */
-/*
- * Blowfish block cipher for OpenBSD
- * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
- * All rights reserved.
- *
- * Implementation advice by David Mazieres <dm@lcs.mit.edu>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Niels Provos.
- * 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.
- */
-
-/*
- * This code is derived from section 14.3 and the given source
- * in section V of Applied Cryptography, second edition.
- * Blowfish is an unpatented fast block cipher designed by
- * Bruce Schneier.
- */
-
-/*
- * Note: This has been trimmed down to only what is needed by
- * __bcrypt().  Also note that this file is actually included
- * directly by bcrypt.c, not built separately.
- */
-
-__RCSID("$NetBSD: blowfish.c,v 1.4 2005/12/24 21:11:16 perry Exp $");
-
-#include <sys/types.h>
-
-/* Schneier specifies a maximum key length of 56 bytes.
- * This ensures that every key bit affects every cipher
- * bit.  However, the subkeys can hold up to 72 bytes.
- * Warning: For normal blowfish encryption only 56 bytes
- * of the key affect all cipherbits.
- */
-
-#define BLF_N	16			/* Number of Subkeys */
-#define BLF_MAXKEYLEN ((BLF_N-2)*4)	/* 448 bits */
-
-/* Blowfish context */
-typedef struct BlowfishContext {
-	u_int32_t S[4][256];	/* S-Boxes */
-	u_int32_t P[BLF_N + 2];	/* Subkeys */
-} blf_ctx;
-
-
-/* Function for Feistel Networks */
-
-#define F(s, x) ((((s)[        (((x)>>24)&0xFF)]  \
-		 + (s)[0x100 + (((x)>>16)&0xFF)]) \
-		 ^ (s)[0x200 + (((x)>> 8)&0xFF)]) \
-		 + (s)[0x300 + ( (x)     &0xFF)])
-
-#define BLFRND(s,p,i,j,n) (i ^= F(s,j) ^ (p)[n])
-
-static void
-Blowfish_encipher(blf_ctx *c, u_int32_t *xl, u_int32_t *xr)
-{
-	u_int32_t Xl;
-	u_int32_t Xr;
-	u_int32_t *s = c->S[0];
-	u_int32_t *p = c->P;
-
-	Xl = *xl;
-	Xr = *xr;
-
-	Xl ^= p[0];
-	BLFRND(s, p, Xr, Xl, 1); BLFRND(s, p, Xl, Xr, 2);
-	BLFRND(s, p, Xr, Xl, 3); BLFRND(s, p, Xl, Xr, 4);
-	BLFRND(s, p, Xr, Xl, 5); BLFRND(s, p, Xl, Xr, 6);
-	BLFRND(s, p, Xr, Xl, 7); BLFRND(s, p, Xl, Xr, 8);
-	BLFRND(s, p, Xr, Xl, 9); BLFRND(s, p, Xl, Xr, 10);
-	BLFRND(s, p, Xr, Xl, 11); BLFRND(s, p, Xl, Xr, 12);
-	BLFRND(s, p, Xr, Xl, 13); BLFRND(s, p, Xl, Xr, 14);
-	BLFRND(s, p, Xr, Xl, 15); BLFRND(s, p, Xl, Xr, 16);
-
-	*xl = Xr ^ p[17];
-	*xr = Xl;
-}
-
-static void
-Blowfish_initstate(blf_ctx *c)
-{
-
-/* P-box and S-box tables initialized with digits of Pi */
-
-	static const blf_ctx init_state =
-
-	{ {
-		{
-			0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
-			0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
-			0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-			0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
-			0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
-			0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-			0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
-			0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
-			0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-			0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-			0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-			0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-			0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
-			0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
-			0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-			0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
-			0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
-			0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-			0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
-			0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-			0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-			0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-			0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
-			0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-			0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
-			0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
-			0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-			0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
-			0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
-			0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-			0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
-			0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
-			0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-			0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
-			0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
-			0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-			0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
-			0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
-			0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-			0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-			0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
-			0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-			0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
-			0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-			0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-			0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
-			0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
-			0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-			0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
-			0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-			0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-			0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
-			0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
-			0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-			0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-			0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
-			0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-			0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
-			0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
-			0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-			0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
-			0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-			0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-		0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a},
-		{
-			0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
-			0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
-			0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-			0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
-			0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
-			0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-			0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
-			0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
-			0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-			0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
-			0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-			0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-			0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
-			0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
-			0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-			0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-			0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
-			0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-			0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
-			0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
-			0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-			0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-			0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
-			0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-			0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
-			0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-			0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-			0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
-			0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
-			0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-			0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
-			0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
-			0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-			0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
-			0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
-			0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-			0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
-			0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
-			0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-			0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
-			0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
-			0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-			0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
-			0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-			0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-			0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-			0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
-			0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-			0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
-			0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
-			0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-			0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
-			0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
-			0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-			0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-			0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-			0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-			0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
-			0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
-			0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-			0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
-			0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-			0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-		0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7},
-		{
-			0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
-			0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-			0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-			0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
-			0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
-			0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-			0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
-			0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
-			0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-			0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
-			0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-			0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-			0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
-			0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
-			0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-			0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
-			0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
-			0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-			0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
-			0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
-			0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-			0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-			0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
-			0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-			0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
-			0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
-			0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-			0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
-			0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
-			0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-			0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
-			0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-			0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-			0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
-			0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
-			0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-			0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
-			0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
-			0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-			0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
-			0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
-			0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-			0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
-			0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-			0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-			0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
-			0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
-			0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-			0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
-			0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
-			0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-			0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-			0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
-			0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-			0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-			0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
-			0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-			0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
-			0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
-			0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-			0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
-			0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-			0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-		0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0},
-		{
-			0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
-			0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
-			0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-			0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
-			0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
-			0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-			0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
-			0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-			0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-			0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
-			0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-			0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-			0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
-			0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
-			0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-			0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
-			0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
-			0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-			0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
-			0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
-			0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-			0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-			0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
-			0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-			0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
-			0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
-			0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-			0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-			0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
-			0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-			0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
-			0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
-			0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-			0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
-			0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
-			0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-			0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
-			0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-			0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-			0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
-			0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
-			0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-			0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
-			0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-			0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-			0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
-			0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
-			0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-			0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
-			0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
-			0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-			0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
-			0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
-			0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-			0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-			0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
-			0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-			0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-			0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
-			0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-			0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
-			0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-			0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-		0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6}
-	},
-	{
-		0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
-		0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
-		0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-		0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
-		0x9216d5d9, 0x8979fb1b
-	} };
-
-	*c = init_state;
-
-}
-
-static u_int32_t
-Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes, u_int16_t *current)
-{
-	u_int8_t i;
-	u_int16_t j;
-	u_int32_t temp;
-
-	temp = 0x00000000;
-	j = *current;
-
-	for (i = 0; i < 4; i++, j++) {
-		if (j >= databytes)
-			j = 0;
-		temp = (temp << 8) | data[j];
-	}
-
-	*current = j;
-	return temp;
-}
-
-static void
-Blowfish_expand0state(blf_ctx *c, const u_int8_t *key, u_int16_t keybytes)
-{
-	u_int16_t i;
-	u_int16_t j;
-	u_int16_t k;
-	u_int32_t temp;
-	u_int32_t datal;
-	u_int32_t datar;
-
-	j = 0;
-	for (i = 0; i < BLF_N + 2; i++) {
-		/* Extract 4 int8 to 1 int32 from keystream */
-		temp = Blowfish_stream2word(key, keybytes, &j);
-		c->P[i] = c->P[i] ^ temp;
-	}
-
-	j = 0;
-	datal = 0x00000000;
-	datar = 0x00000000;
-	for (i = 0; i < BLF_N + 2; i += 2) {
-		Blowfish_encipher(c, &datal, &datar);
-
-		c->P[i] = datal;
-		c->P[i + 1] = datar;
-	}
-
-	for (i = 0; i < 4; i++) {
-		for (k = 0; k < 256; k += 2) {
-			Blowfish_encipher(c, &datal, &datar);
-
-			c->S[i][k] = datal;
-			c->S[i][k + 1] = datar;
-		}
-	}
-}
-
-
-static void
-Blowfish_expandstate(blf_ctx *c, const u_int8_t *data, u_int16_t databytes,
-		     const u_int8_t *key, u_int16_t keybytes)
-{
-	u_int16_t i;
-	u_int16_t j;
-	u_int16_t k;
-	u_int32_t temp;
-	u_int32_t datal;
-	u_int32_t datar;
-
-	j = 0;
-	for (i = 0; i < BLF_N + 2; i++) {
-		/* Extract 4 int8 to 1 int32 from keystream */
-		temp = Blowfish_stream2word(key, keybytes, &j);
-		c->P[i] = c->P[i] ^ temp;
-	}
-
-	j = 0;
-	datal = 0x00000000;
-	datar = 0x00000000;
-	for (i = 0; i < BLF_N + 2; i += 2) {
-		datal ^= Blowfish_stream2word(data, databytes, &j);
-		datar ^= Blowfish_stream2word(data, databytes, &j);
-		Blowfish_encipher(c, &datal, &datar);
-
-		c->P[i] = datal;
-		c->P[i + 1] = datar;
-	}
-
-	for (i = 0; i < 4; i++) {
-		for (k = 0; k < 256; k += 2) {
-			datal ^= Blowfish_stream2word(data, databytes, &j);
-			datar ^= Blowfish_stream2word(data, databytes, &j);
-			Blowfish_encipher(c, &datal, &datar);
-
-			c->S[i][k] = datal;
-			c->S[i][k + 1] = datar;
-		}
-	}
-
-}
-
-static void
-blf_enc(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
-{
-	u_int32_t *d;
-	u_int16_t i;
-
-	d = data;
-	for (i = 0; i < blocks; i++) {
-		Blowfish_encipher(c, d, d + 1);
-		d += 2;
-	}
-}
diff --git a/lib/libcrypt/crypt-sha1.c b/lib/libcrypt/crypt-sha1.c
deleted file mode 100644
index 7c37cef2c..000000000
--- a/lib/libcrypt/crypt-sha1.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/* $NetBSD: crypt-sha1.c,v 1.8 2013/08/28 17:47:07 riastradh Exp $ */
-
-/*
- * Copyright (c) 2004, 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.  
- * 3. Neither the name of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include <sys/cdefs.h>
-#if !defined(lint)
-__RCSID("$NetBSD: crypt-sha1.c,v 1.8 2013/08/28 17:47:07 riastradh Exp $");
-#endif /* not lint */
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-#include <err.h>
-#include "crypt.h"
-
-/*
- * The default iterations - should take >0s on a fast CPU
- * but not be insane for a slow CPU.
- */
-#ifndef CRYPT_SHA1_ITERATIONS
-# define CRYPT_SHA1_ITERATIONS 24680
-#endif
-/*
- * Support a reasonably? long salt.
- */
-#ifndef CRYPT_SHA1_SALT_LENGTH
-# define CRYPT_SHA1_SALT_LENGTH 64
-#endif
-
-/*
- * This may be called from crypt_sha1 or gensalt.
- *
- * The value returned will be slightly less than <hint> which defaults
- * to 24680.  The goals are that the number of iterations should take
- * non-zero amount of time on a fast cpu while not taking insanely
- * long on a slow cpu.  The current default will take about 5 seconds
- * on a 100MHz sparc, and about 0.04 seconds on a 3GHz i386.
- * The number is varied to frustrate those attempting to generate a
- * dictionary of pre-computed hashes.
- */
-unsigned int
-__crypt_sha1_iterations (unsigned int hint)
-{
-    static int once = 1;
-
-    /*
-     * We treat CRYPT_SHA1_ITERATIONS as a hint.
-     * Make it harder for someone to pre-compute hashes for a
-     * dictionary attack by not using the same iteration count for
-     * every entry.
-     */
-
-    if (once) {
-	int pid = getpid();
-	
-	srandom(time(NULL) ^ (pid * pid));
-	once = 0;
-    }
-    if (hint == 0)
-	hint = CRYPT_SHA1_ITERATIONS;
-    return hint - (random() % (hint / 4));
-}
-
-/*
- * UNIX password using hmac_sha1
- * This is PBKDF1 from RFC 2898, but using hmac_sha1.
- *
- * The format of the encrypted password is:
- * $<tag>$<iterations>$<salt>$<digest>
- *
- * where:
- * 	<tag>		is "sha1"
- *	<iterations>	is an unsigned int identifying how many rounds
- * 			have been applied to <digest>.  The number
- * 			should vary slightly for each password to make
- * 			it harder to generate a dictionary of
- * 			pre-computed hashes.  See crypt_sha1_iterations.
- * 	<salt>		up to 64 bytes of random data, 8 bytes is
- * 			currently considered more than enough.
- *	<digest>	the hashed password.
- *
- * NOTE:
- * To be FIPS 140 compliant, the password which is used as a hmac key,
- * should be between 10 and 20 characters to provide at least 80bits
- * strength, and avoid the need to hash it before using as the 
- * hmac key.
- */
-char *
-__crypt_sha1 (const char *pw, const char *salt)
-{
-    static const char *magic = SHA1_MAGIC;
-    static unsigned char hmac_buf[SHA1_SIZE];
-    static char passwd[(2 * sizeof(SHA1_MAGIC)) +
-		       CRYPT_SHA1_SALT_LENGTH + SHA1_SIZE];
-    const char *sp;
-    char *ep;
-    unsigned long ul;
-    int sl;
-    int pl;
-    int dl;
-    unsigned int iterations;
-    unsigned int i;
-    /* XXX silence -Wpointer-sign (would be nice to fix this some other way) */
-    const unsigned char *pwu = (const unsigned char *)pw;
-
-    /*
-     * Salt format is
-     * $<tag>$<iterations>$salt[$]
-     * If it does not start with $ we use our default iterations.
-     */
-
-    /* If it starts with the magic string, then skip that */
-    if (!strncmp(salt, magic, strlen(magic))) {
-	salt += strlen(magic);
-	/* and get the iteration count */
-	iterations = strtoul(salt, &ep, 10);
-	if (*ep != '$')
-	    return NULL;		/* invalid input */
-	salt = ep + 1;			/* skip over the '$' */
-    } else {
-	iterations = __crypt_sha1_iterations(0);
-    }
-
-    /* It stops at the next '$', max CRYPT_SHA1_ITERATIONS chars */
-    for (sp = salt; *sp && *sp != '$' && sp < (salt + CRYPT_SHA1_ITERATIONS); sp++)
-	continue;
-
-    /* Get the length of the actual salt */
-    sl = sp - salt;
-    pl = strlen(pw);
-
-    /*
-     * Now get to work...
-     * Prime the pump with <salt><magic><iterations>
-     */
-    dl = snprintf(passwd, sizeof (passwd), "%.*s%s%u", 
-		  sl, salt, magic, iterations);
-    /*
-     * Then hmac using <pw> as key, and repeat...
-     */
-    __hmac_sha1((unsigned char *)passwd, dl, pwu, pl, hmac_buf);
-    for (i = 1; i < iterations; i++) {
-	__hmac_sha1(hmac_buf, SHA1_SIZE, pwu, pl, hmac_buf);
-    }
-    /* Now output... */
-    pl = snprintf(passwd, sizeof(passwd), "%s%u$%.*s$",
-		  magic, iterations, sl, salt);
-    ep = passwd + pl;
-
-    /* Every 3 bytes of hash gives 24 bits which is 4 base64 chars */
-    for (i = 0; i < SHA1_SIZE - 3; i += 3) {
-	ul = (hmac_buf[i+0] << 16) |
-	    (hmac_buf[i+1] << 8) |
-	    hmac_buf[i+2];
-	__crypt_to64(ep, ul, 4); ep += 4;
-    }
-    /* Only 2 bytes left, so we pad with byte0 */
-    ul = (hmac_buf[SHA1_SIZE - 2] << 16) |
-	(hmac_buf[SHA1_SIZE - 1] << 8) |
-	hmac_buf[0];
-    __crypt_to64(ep, ul, 4); ep += 4;
-    *ep = '\0';
-
-    /* Don't leave anything around in vm they could use. */
-    explicit_memset(hmac_buf, 0, sizeof hmac_buf);
-
-    return passwd;
-}	
diff --git a/lib/libcrypt/crypt.3 b/lib/libcrypt/crypt.3
deleted file mode 100644
index b6da1da7d..000000000
--- a/lib/libcrypt/crypt.3
+++ /dev/null
@@ -1,407 +0,0 @@
-.\"	$NetBSD: crypt.3,v 1.27 2012/03/23 18:08:35 njoly Exp $
-.\"
-.\" Copyright (c) 1989, 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. 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.
-.\"
-.\"     @(#)crypt.3	8.2 (Berkeley) 12/11/93
-.\"
-.Dd January 1, 2012
-.Dt CRYPT 3
-.Os
-.Sh NAME
-.Nm crypt ,
-.Nm setkey ,
-.Nm encrypt ,
-.Nm des_setkey ,
-.Nm des_cipher
-.Nd password encryption
-.Sh LIBRARY
-.Lb libcrypt
-.Sh SYNOPSIS
-.In unistd.h
-.Ft "char *"
-.Fn crypt "const char *key" "const char *setting"
-.Ft int
-.Fn encrypt "char *block" "int flag"
-.Ft int
-.Fn des_setkey "const char *key"
-.Ft int
-.Fn des_cipher "const char *in" "char *out" "long salt" "int count"
-.In stdlib.h
-.Ft int
-.Fn setkey "const char *key"
-.Sh DESCRIPTION
-The
-.Fn crypt
-function
-performs password encryption.
-The encryption scheme used by
-.Fn crypt
-is dependent upon the contents of the
-.Dv NUL Ns -terminated
-string
-.Ar setting .
-If it begins
-with a string character
-.Pq Ql $
-and a number then a different algorithm is used depending on the number.
-At the moment a
-.Ql $1
-chooses MD5 hashing and a
-.Ql $2
-chooses Blowfish hashing; see below for more information.
-If
-.Ar setting
-begins with the ``_'' character, DES encryption with a user specified number
-of perturbations is selected.
-If
-.Ar setting
-begins with any other character, DES encryption with a fixed number
-of perturbations is selected.
-.Ss DES encryption
-The DES encryption scheme is derived from the
-.Tn NBS
-Data Encryption Standard.
-Additional code has been added to deter key search attempts and to use
-stronger hashing algorithms.
-In the DES case, the second argument to
-.Fn crypt
-is a character array, 9 bytes in length, consisting of an underscore (``_'')
-followed by 4 bytes of iteration count and 4 bytes of salt.
-Both the iteration
-.Fa count
-and the
-.Fa salt
-are encoded with 6 bits per character, least significant bits first.
-The values 0 to 63 are encoded by the characters ``./0-9A-Za-z'',
-respectively.
-.Pp
-The
-.Fa salt
-is used to induce disorder in to the
-.Tn DES
-algorithm
-in one of 16777216
-possible ways
-(specifically, if bit
-.Em i
-of the
-.Ar salt
-is set then bits
-.Em i
-and
-.Em i+24
-are swapped in the
-.Tn DES
-``E'' box output).
-The
-.Ar key
-is divided into groups of 8 characters (a short final group is null-padded)
-and the low-order 7 bits of each character (56 bits per group) are
-used to form the DES key as follows: the first group of 56 bits becomes the
-initial DES key.
-For each additional group, the XOR of the group bits and the encryption of
-the DES key with itself becomes the next DES key.
-Then the final DES key is used to perform
-.Ar count
-cumulative encryptions of a 64-bit constant.
-The value returned is a
-.Dv NUL Ns -terminated
-string, 20 bytes in length, consisting
-of the
-.Ar setting
-followed by the encoded 64-bit encryption.
-.Pp
-For compatibility with historical versions of
-.Fn crypt ,
-the
-.Ar setting
-may consist of 2 bytes of salt, encoded as above, in which case an
-iteration
-.Ar count
-of 25 is used, fewer perturbations of
-.Tn DES
-are available, at most 8
-characters of
-.Ar key
-are used, and the returned value is a
-.Dv NUL Ns -terminated
-string 13 bytes in length.
-.Pp
-The
-functions
-.Fn encrypt ,
-.Fn setkey ,
-.Fn des_setkey
-and
-.Fn des_cipher
-allow limited access to the
-.Tn DES
-algorithm itself.
-The
-.Ar key
-argument to
-.Fn setkey
-is a 64 character array of
-binary values (numeric 0 or 1).
-A 56-bit key is derived from this array by dividing the array
-into groups of 8 and ignoring the last bit in each group.
-.Pp
-The
-.Fn encrypt
-argument
-.Fa block
-is also a 64 character array of
-binary values.
-If the value of
-.Fa flag
-is 0,
-the argument
-.Fa block
-is encrypted, otherwise it
-is decrypted.
-The encryption or decryption is returned in the original
-array
-.Fa block
-after using the
-key specified
-by
-.Fn setkey
-to process it.
-.Pp
-The
-.Fn des_setkey
-and
-.Fn des_cipher
-functions are faster but less portable than
-.Fn setkey
-and
-.Fn encrypt .
-The argument to
-.Fn des_setkey
-is a character array of length 8.
-The
-.Em least
-significant bit in each character is ignored and the next 7 bits of each
-character are concatenated to yield a 56-bit key.
-The function
-.Fn des_cipher
-encrypts (or decrypts if
-.Fa count
-is negative) the 64-bits stored in the 8 characters at
-.Fa in
-using
-.Xr abs 3
-of
-.Fa count
-iterations of
-.Tn DES
-and stores the 64-bit result in the 8 characters at
-.Fa out .
-The
-.Fa salt
-specifies perturbations to
-.Tn DES
-as described above.
-.Ss MD5 encryption
-For the
-.Tn MD5
-encryption scheme, the version number (in this case ``1''),
-.Fa salt
-and the hashed password are separated
-by the ``$'' character.
-A valid password looks like this:
-.Pp
-``$1$2qGr5PPQ$eT08WBFev3RPLNChixg0H.''.
-.Pp
-The entire password string is passed as
-.Fa setting
-for interpretation.
-.Ss "Blowfish" crypt
-The
-.Tn Blowfish
-version of
-.Fn crypt
-has 128 bits of
-.Fa salt
-in order to make building dictionaries of common passwords space consuming.
-The initial state of the
-.Tn Blowfish
-cipher is expanded using the
-.Fa salt
-and the
-.Fa password
-repeating the process a variable number of rounds, which is encoded in
-the password string.
-The maximum password length is 72.
-The final Blowfish password entry is created by encrypting the string
-.Pp
-.Dq OrpheanBeholderScryDoubt
-.Pp
-with the
-.Tn Blowfish
-state 64 times.
-.Pp
-The version number, the logarithm of the number of rounds and
-the concatenation of salt and hashed password are separated by the
-.Ql $
-character.
-An encoded
-.Sq 8
-would specify 256 rounds.
-A valid Blowfish password looks like this:
-.Pp
-.Dq $2a$12$eIAq8PR8sIUnJ1HaohxX2O9x9Qlm2vK97LJ5dsXdmB.eXF42qjchC .
-.Pp
-The whole Blowfish password string is passed as
-.Fa setting
-for interpretation.
-.Sh RETURN VALUES
-The function
-.Fn crypt
-returns a pointer to the encrypted value on success.
-.Pp
-The behavior of
-.Fn crypt
-on errors isn't well standardized.
-Some implementations simply can't fail (unless the process dies, in which
-case they obviously can't return), others return
-.Dv NULL
-or a fixed string.
-Most implementations don't set
-.Va errno ,
-but some do.
-.St -susv2
-specifies
-only returning
-.Dv NULL
-and setting
-.Va errno
-as a valid behavior, and defines
-only one possible error
-.Er ( ENOSYS ,
-.Dq "The functionality is not supported on this implementation." )
-Unfortunately, most existing applications aren't prepared to handle
-.Dv NULL
-returns from
-.Fn crypt .
-The description below corresponds to this implementation of
-.Fn crypt
-only.
-The behavior may change to match standards, other implementations or existing
-applications.
-.Pp
-.Fn crypt
-may only fail (and return) when passed an invalid or unsupported
-.Fa setting ,
-in which case it returns a pointer to a magic string that is shorter than 13
-characters and is guaranteed to differ from
-.Fa setting .
-This behavior is safe for older applications which assume that
-.Fn crypt
-can't fail, when both setting new passwords and authenticating against
-existing password hashes.
-.Pp
-The functions
-.Fn setkey ,
-.Fn encrypt ,
-.Fn des_setkey ,
-and
-.Fn des_cipher
-return 0 on success and 1 on failure.
-Historically, the functions
-.Fn setkey
-and
-.Fn encrypt
-did not return any value.
-They have been provided return values primarily to distinguish
-implementations where hardware support is provided but not
-available or where the DES encryption is not available due to the
-usual political silliness.
-.Sh SEE ALSO
-.Xr login 1 ,
-.Xr passwd 1 ,
-.Xr pwhash 1 ,
-.Xr getpass 3 ,
-.Xr md5 3 ,
-.Xr passwd 5 ,
-.Xr passwd.conf 5
-.Rs
-.%T "Mathematical Cryptology for Computer Scientists and Mathematicians"
-.%A Wayne Patterson
-.%D 1987
-.%N ISBN 0-8476-7438-X
-.Re
-.Rs
-.%T "Password Security: A Case History"
-.%A R. Morris
-.%A Ken Thompson
-.%J "Communications of the ACM"
-.%V vol. 22
-.%P pp. 594-597
-.%D Nov. 1979
-.Re
-.Rs
-.%T "DES will be Totally Insecure within Ten Years"
-.%A M.E. Hellman
-.%J "IEEE Spectrum"
-.%V vol. 16
-.%P pp. 32-39
-.%D July 1979
-.Re
-.Sh HISTORY
-A rotor-based
-.Fn crypt
-function appeared in
-.At v6 .
-The current style
-.Fn crypt
-first appeared in
-.At v7 .
-.Sh BUGS
-Dropping the
-.Em least
-significant bit in each character of the argument to
-.Fn des_setkey
-is ridiculous.
-.Pp
-The
-.Fn crypt
-function leaves its result in an internal static object and returns
-a pointer to that object.
-Subsequent calls to
-.Fn crypt
-will modify the same object.
-.Pp
-Before
-.Nx 6.0
-.Fn crypt
-returned either
-.Dv NULL
-or
-.Dv \&:
-on error.
diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c
deleted file mode 100644
index 0c17951f0..000000000
--- a/lib/libcrypt/crypt.c
+++ /dev/null
@@ -1,1024 +0,0 @@
-/*	$NetBSD: crypt.c,v 1.34 2015/06/17 00:15:26 christos Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Tom Truscott.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if !defined(lint)
-#if 0
-static char sccsid[] = "@(#)crypt.c	8.1.1.1 (Berkeley) 8/18/93";
-#else
-__RCSID("$NetBSD: crypt.c,v 1.34 2015/06/17 00:15:26 christos Exp $");
-#endif
-#endif /* not lint */
-
-#include <limits.h>
-#include <pwd.h>
-#include <stdlib.h>
-#include <unistd.h>
-#if defined(DEBUG) || defined(MAIN) || defined(UNIT_TEST)
-#include <stdio.h>
-#endif
-
-#include "crypt.h"
-
-/*
- * UNIX password, and DES, encryption.
- * By Tom Truscott, trt@rti.rti.org,
- * from algorithms by Robert W. Baldwin and James Gillogly.
- *
- * References:
- * "Mathematical Cryptology for Computer Scientists and Mathematicians,"
- * by Wayne Patterson, 1987, ISBN 0-8476-7438-X.
- *
- * "Password Security: A Case History," R. Morris and Ken Thompson,
- * Communications of the ACM, vol. 22, pp. 594-597, Nov. 1979.
- *
- * "DES will be Totally Insecure within Ten Years," M.E. Hellman,
- * IEEE Spectrum, vol. 16, pp. 32-39, July 1979.
- */
-
-/* =====  Configuration ==================== */
-
-/*
- * define "MUST_ALIGN" if your compiler cannot load/store
- * long integers at arbitrary (e.g. odd) memory locations.
- * (Either that or never pass unaligned addresses to des_cipher!)
- */
-#if !defined(__vax__) && !defined(__i386__)
-#define	MUST_ALIGN
-#endif
-
-#ifdef CHAR_BITS
-#if CHAR_BITS != 8
-	#error C_block structure assumes 8 bit characters
-#endif
-#endif
-
-/*
- * define "B64" to be the declaration for a 64 bit integer.
- * XXX this feature is currently unused, see "endian" comment below.
- */
-#if defined(cray)
-#define	B64	long
-#endif
-#if defined(convex)
-#define	B64	long long
-#endif
-
-/*
- * define "LARGEDATA" to get faster permutations, by using about 72 kilobytes
- * of lookup tables.  This speeds up des_setkey() and des_cipher(), but has
- * little effect on crypt().
- */
-#if defined(notdef)
-#define	LARGEDATA
-#endif
-
-/* compile with "-DSTATIC=void" when profiling */
-#ifndef STATIC
-#define	STATIC	static void
-#endif
-
-/* ==================================== */
-
-/*
- * Cipher-block representation (Bob Baldwin):
- *
- * DES operates on groups of 64 bits, numbered 1..64 (sigh).  One
- * representation is to store one bit per byte in an array of bytes.  Bit N of
- * the NBS spec is stored as the LSB of the Nth byte (index N-1) in the array.
- * Another representation stores the 64 bits in 8 bytes, with bits 1..8 in the
- * first byte, 9..16 in the second, and so on.  The DES spec apparently has
- * bit 1 in the MSB of the first byte, but that is particularly noxious so we
- * bit-reverse each byte so that bit 1 is the LSB of the first byte, bit 8 is
- * the MSB of the first byte.  Specifically, the 64-bit input data and key are
- * converted to LSB format, and the output 64-bit block is converted back into
- * MSB format.
- *
- * DES operates internally on groups of 32 bits which are expanded to 48 bits
- * by permutation E and shrunk back to 32 bits by the S boxes.  To speed up
- * the computation, the expansion is applied only once, the expanded
- * representation is maintained during the encryption, and a compression
- * permutation is applied only at the end.  To speed up the S-box lookups,
- * the 48 bits are maintained as eight 6 bit groups, one per byte, which
- * directly feed the eight S-boxes.  Within each byte, the 6 bits are the
- * most significant ones.  The low two bits of each byte are zero.  (Thus,
- * bit 1 of the 48 bit E expansion is stored as the "4"-valued bit of the
- * first byte in the eight byte representation, bit 2 of the 48 bit value is
- * the "8"-valued bit, and so on.)  In fact, a combined "SPE"-box lookup is
- * used, in which the output is the 64 bit result of an S-box lookup which
- * has been permuted by P and expanded by E, and is ready for use in the next
- * iteration.  Two 32-bit wide tables, SPE[0] and SPE[1], are used for this
- * lookup.  Since each byte in the 48 bit path is a multiple of four, indexed
- * lookup of SPE[0] and SPE[1] is simple and fast.  The key schedule and
- * "salt" are also converted to this 8*(6+2) format.  The SPE table size is
- * 8*64*8 = 4K bytes.
- *
- * To speed up bit-parallel operations (such as XOR), the 8 byte
- * representation is "union"ed with 32 bit values "i0" and "i1", and, on
- * machines which support it, a 64 bit value "b64".  This data structure,
- * "C_block", has two problems.  First, alignment restrictions must be
- * honored.  Second, the byte-order (e.g. little-endian or big-endian) of
- * the architecture becomes visible.
- *
- * The byte-order problem is unfortunate, since on the one hand it is good
- * to have a machine-independent C_block representation (bits 1..8 in the
- * first byte, etc.), and on the other hand it is good for the LSB of the
- * first byte to be the LSB of i0.  We cannot have both these things, so we
- * currently use the "little-endian" representation and avoid any multi-byte
- * operations that depend on byte order.  This largely precludes use of the
- * 64-bit datatype since the relative order of i0 and i1 are unknown.  It
- * also inhibits grouping the SPE table to look up 12 bits at a time.  (The
- * 12 bits can be stored in a 16-bit field with 3 low-order zeroes and 1
- * high-order zero, providing fast indexing into a 64-bit wide SPE.)  On the
- * other hand, 64-bit datatypes are currently rare, and a 12-bit SPE lookup
- * requires a 128 kilobyte table, so perhaps this is not a big loss.
- *
- * Permutation representation (Jim Gillogly):
- *
- * A transformation is defined by its effect on each of the 8 bytes of the
- * 64-bit input.  For each byte we give a 64-bit output that has the bits in
- * the input distributed appropriately.  The transformation is then the OR
- * of the 8 sets of 64-bits.  This uses 8*256*8 = 16K bytes of storage for
- * each transformation.  Unless LARGEDATA is defined, however, a more compact
- * table is used which looks up 16 4-bit "chunks" rather than 8 8-bit chunks.
- * The smaller table uses 16*16*8 = 2K bytes for each transformation.  This
- * is slower but tolerable, particularly for password encryption in which
- * the SPE transformation is iterated many times.  The small tables total 9K
- * bytes, the large tables total 72K bytes.
- *
- * The transformations used are:
- * IE3264: MSB->LSB conversion, initial permutation, and expansion.
- *	This is done by collecting the 32 even-numbered bits and applying
- *	a 32->64 bit transformation, and then collecting the 32 odd-numbered
- *	bits and applying the same transformation.  Since there are only
- *	32 input bits, the IE3264 transformation table is half the size of
- *	the usual table.
- * CF6464: Compression, final permutation, and LSB->MSB conversion.
- *	This is done by two trivial 48->32 bit compressions to obtain
- *	a 64-bit block (the bit numbering is given in the "CIFP" table)
- *	followed by a 64->64 bit "cleanup" transformation.  (It would
- *	be possible to group the bits in the 64-bit block so that 2
- *	identical 32->32 bit transformations could be used instead,
- *	saving a factor of 4 in space and possibly 2 in time, but
- *	byte-ordering and other complications rear their ugly head.
- *	Similar opportunities/problems arise in the key schedule
- *	transforms.)
- * PC1ROT: MSB->LSB, PC1 permutation, rotate, and PC2 permutation.
- *	This admittedly baroque 64->64 bit transformation is used to
- *	produce the first code (in 8*(6+2) format) of the key schedule.
- * PC2ROT[0]: Inverse PC2 permutation, rotate, and PC2 permutation.
- *	It would be possible to define 15 more transformations, each
- *	with a different rotation, to generate the entire key schedule.
- *	To save space, however, we instead permute each code into the
- *	next by using a transformation that "undoes" the PC2 permutation,
- *	rotates the code, and then applies PC2.  Unfortunately, PC2
- *	transforms 56 bits into 48 bits, dropping 8 bits, so PC2 is not
- *	invertible.  We get around that problem by using a modified PC2
- *	which retains the 8 otherwise-lost bits in the unused low-order
- *	bits of each byte.  The low-order bits are cleared when the
- *	codes are stored into the key schedule.
- * PC2ROT[1]: Same as PC2ROT[0], but with two rotations.
- *	This is faster than applying PC2ROT[0] twice,
- *
- * The Bell Labs "salt" (Bob Baldwin):
- *
- * The salting is a simple permutation applied to the 48-bit result of E.
- * Specifically, if bit i (1 <= i <= 24) of the salt is set then bits i and
- * i+24 of the result are swapped.  The salt is thus a 24 bit number, with
- * 16777216 possible values.  (The original salt was 12 bits and could not
- * swap bits 13..24 with 36..48.)
- *
- * It is possible, but ugly, to warp the SPE table to account for the salt
- * permutation.  Fortunately, the conditional bit swapping requires only
- * about four machine instructions and can be done on-the-fly with about an
- * 8% performance penalty.
- */
-
-typedef union {
-	unsigned char b[8];
-	struct {
-		int32_t	i0;
-		int32_t	i1;
-	} b32;
-#if defined(B64)
-	B64	b64;
-#endif
-} C_block;
-
-/*
- * Convert twenty-four-bit long in host-order
- * to six bits (and 2 low-order zeroes) per char little-endian format.
- */
-#define	TO_SIX_BIT(rslt, src) {				\
-		C_block cvt;				\
-		cvt.b[0] = src; src >>= 6;		\
-		cvt.b[1] = src; src >>= 6;		\
-		cvt.b[2] = src; src >>= 6;		\
-		cvt.b[3] = src;				\
-		rslt = (cvt.b32.i0 & 0x3f3f3f3fL) << 2;	\
-	}
-
-/*
- * These macros may someday permit efficient use of 64-bit integers.
- */
-#define	ZERO(d,d0,d1)			d0 = 0, d1 = 0
-#define	LOAD(d,d0,d1,bl)		d0 = (bl).b32.i0, d1 = (bl).b32.i1
-#define	LOADREG(d,d0,d1,s,s0,s1)	d0 = s0, d1 = s1
-#define	OR(d,d0,d1,bl)			d0 |= (bl).b32.i0, d1 |= (bl).b32.i1
-#define	STORE(s,s0,s1,bl)		(bl).b32.i0 = s0, (bl).b32.i1 = s1
-#define	DCL_BLOCK(d,d0,d1)		int32_t d0, d1
-
-#if defined(LARGEDATA)
-	/* Waste memory like crazy.  Also, do permutations in line */
-#define	LGCHUNKBITS	3
-#define	CHUNKBITS	(1<<LGCHUNKBITS)
-#define	PERM6464(d,d0,d1,cpp,p)				\
-	LOAD(d,d0,d1,(p)[(0<<CHUNKBITS)+(cpp)[0]]);		\
-	OR (d,d0,d1,(p)[(1<<CHUNKBITS)+(cpp)[1]]);		\
-	OR (d,d0,d1,(p)[(2<<CHUNKBITS)+(cpp)[2]]);		\
-	OR (d,d0,d1,(p)[(3<<CHUNKBITS)+(cpp)[3]]);		\
-	OR (d,d0,d1,(p)[(4<<CHUNKBITS)+(cpp)[4]]);		\
-	OR (d,d0,d1,(p)[(5<<CHUNKBITS)+(cpp)[5]]);		\
-	OR (d,d0,d1,(p)[(6<<CHUNKBITS)+(cpp)[6]]);		\
-	OR (d,d0,d1,(p)[(7<<CHUNKBITS)+(cpp)[7]]);
-#define	PERM3264(d,d0,d1,cpp,p)				\
-	LOAD(d,d0,d1,(p)[(0<<CHUNKBITS)+(cpp)[0]]);		\
-	OR (d,d0,d1,(p)[(1<<CHUNKBITS)+(cpp)[1]]);		\
-	OR (d,d0,d1,(p)[(2<<CHUNKBITS)+(cpp)[2]]);		\
-	OR (d,d0,d1,(p)[(3<<CHUNKBITS)+(cpp)[3]]);
-#else
-	/* "small data" */
-#define	LGCHUNKBITS	2
-#define	CHUNKBITS	(1<<LGCHUNKBITS)
-#define	PERM6464(d,d0,d1,cpp,p)				\
-	{ C_block tblk; permute(cpp,&tblk,p,8); LOAD (d,d0,d1,tblk); }
-#define	PERM3264(d,d0,d1,cpp,p)				\
-	{ C_block tblk; permute(cpp,&tblk,p,4); LOAD (d,d0,d1,tblk); }
-#endif /* LARGEDATA */
-
-STATIC	init_des(void);
-STATIC	init_perm(C_block [64/CHUNKBITS][1<<CHUNKBITS],
-		       const unsigned char [64], int, int);
-#ifndef LARGEDATA
-STATIC	permute(const unsigned char *, C_block *, C_block *, int);
-#endif
-#ifdef DEBUG
-STATIC	prtab(const char *, unsigned char *, int);
-#endif
-
-
-#ifndef LARGEDATA
-STATIC
-permute(const unsigned char *cp, C_block *out, C_block *p, int chars_in)
-{
-	DCL_BLOCK(D,D0,D1);
-	C_block *tp;
-	int t;
-
-	ZERO(D,D0,D1);
-	do {
-		t = *cp++;
-		tp = &p[t&0xf]; OR(D,D0,D1,*tp); p += (1<<CHUNKBITS);
-		tp = &p[t>>4];  OR(D,D0,D1,*tp); p += (1<<CHUNKBITS);
-	} while (--chars_in > 0);
-	STORE(D,D0,D1,*out);
-}
-#endif /* LARGEDATA */
-
-
-/* =====  (mostly) Standard DES Tables ==================== */
-
-static const unsigned char IP[] = {	/* initial permutation */
-	58, 50, 42, 34, 26, 18, 10,  2,
-	60, 52, 44, 36, 28, 20, 12,  4,
-	62, 54, 46, 38, 30, 22, 14,  6,
-	64, 56, 48, 40, 32, 24, 16,  8,
-	57, 49, 41, 33, 25, 17,  9,  1,
-	59, 51, 43, 35, 27, 19, 11,  3,
-	61, 53, 45, 37, 29, 21, 13,  5,
-	63, 55, 47, 39, 31, 23, 15,  7,
-};
-
-/* The final permutation is the inverse of IP - no table is necessary */
-
-static const unsigned char ExpandTr[] = {	/* expansion operation */
-	32,  1,  2,  3,  4,  5,
-	 4,  5,  6,  7,  8,  9,
-	 8,  9, 10, 11, 12, 13,
-	12, 13, 14, 15, 16, 17,
-	16, 17, 18, 19, 20, 21,
-	20, 21, 22, 23, 24, 25,
-	24, 25, 26, 27, 28, 29,
-	28, 29, 30, 31, 32,  1,
-};
-
-static const unsigned char PC1[] = {	/* permuted choice table 1 */
-	57, 49, 41, 33, 25, 17,  9,
-	 1, 58, 50, 42, 34, 26, 18,
-	10,  2, 59, 51, 43, 35, 27,
-	19, 11,  3, 60, 52, 44, 36,
-
-	63, 55, 47, 39, 31, 23, 15,
-	 7, 62, 54, 46, 38, 30, 22,
-	14,  6, 61, 53, 45, 37, 29,
-	21, 13,  5, 28, 20, 12,  4,
-};
-
-static const unsigned char Rotates[] = {/* PC1 rotation schedule */
-	1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1,
-};
-
-/* note: each "row" of PC2 is left-padded with bits that make it invertible */
-static const unsigned char PC2[] = {	/* permuted choice table 2 */
-	 9, 18,    14, 17, 11, 24,  1,  5,
-	22, 25,     3, 28, 15,  6, 21, 10,
-	35, 38,    23, 19, 12,  4, 26,  8,
-	43, 54,    16,  7, 27, 20, 13,  2,
-
-	 0,  0,    41, 52, 31, 37, 47, 55,
-	 0,  0,    30, 40, 51, 45, 33, 48,
-	 0,  0,    44, 49, 39, 56, 34, 53,
-	 0,  0,    46, 42, 50, 36, 29, 32,
-};
-
-static const unsigned char S[8][64] = {	/* 48->32 bit substitution tables */
-					/* S[1]			*/
-	{ 14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
-	   0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
-	   4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
-	  15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13 },
-					/* S[2]			*/
-	{ 15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
-	   3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
-	   0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
-	  13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9 },
-					/* S[3]			*/
-	{ 10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
-	  13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
-	  13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
-	   1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12 },
-					/* S[4]			*/
-	{  7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
-	  13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
-	  10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
-	   3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14 },
-					/* S[5]			*/
-	{  2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
-	  14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
-	   4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
-	  11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3 },
-					/* S[6]			*/
-	{ 12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
-	  10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
-	   9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
-	   4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13 },
-					/* S[7]			*/
-	{  4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
-	  13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
-	   1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
-	   6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12 },
-					/* S[8]			*/
-	{ 13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
-	   1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
-	   7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
-	   2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11 }
-};
-
-static const unsigned char P32Tr[] = {	/* 32-bit permutation function */
-	16,  7, 20, 21,
-	29, 12, 28, 17,
-	 1, 15, 23, 26,
-	 5, 18, 31, 10,
-	 2,  8, 24, 14,
-	32, 27,  3,  9,
-	19, 13, 30,  6,
-	22, 11,  4, 25,
-};
-
-static const unsigned char CIFP[] = {	/* compressed/interleaved permutation */
-	 1,  2,  3,  4,   17, 18, 19, 20,
-	 5,  6,  7,  8,   21, 22, 23, 24,
-	 9, 10, 11, 12,   25, 26, 27, 28,
-	13, 14, 15, 16,   29, 30, 31, 32,
-
-	33, 34, 35, 36,   49, 50, 51, 52,
-	37, 38, 39, 40,   53, 54, 55, 56,
-	41, 42, 43, 44,   57, 58, 59, 60,
-	45, 46, 47, 48,   61, 62, 63, 64,
-};
-
-static const unsigned char itoa64[] =		/* 0..63 => ascii-64 */
-	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-
-/* =====  Tables that are initialized at run time  ==================== */
-
-
-/* Initial key schedule permutation */
-static C_block	PC1ROT[64/CHUNKBITS][1<<CHUNKBITS];
-
-/* Subsequent key schedule rotation permutations */
-static C_block	PC2ROT[2][64/CHUNKBITS][1<<CHUNKBITS];
-
-/* Initial permutation/expansion table */
-static C_block	IE3264[32/CHUNKBITS][1<<CHUNKBITS];
-
-/* Table that combines the S, P, and E operations.  */
-static int32_t SPE[2][8][64];
-
-/* compressed/interleaved => final permutation table */
-static C_block	CF6464[64/CHUNKBITS][1<<CHUNKBITS];
-
-
-/* ==================================== */
-
-
-static C_block	constdatablock;			/* encryption constant */
-static char	cryptresult[1+4+4+11+1];	/* encrypted result */
-
-/*
- * We match the behavior of UFC-crypt on systems where "char" is signed by
- * default (the majority), regardless of char's signedness on our system.
- */
-static inline int
-ascii_to_bin(char ch)
-{
-	signed char sch = ch;
-	int retval;
-
-	if (sch >= 'a')
-		retval = sch - ('a' - 38);
-	else if (sch >= 'A') 
-		retval = sch - ('A' - 12);
-	else
-		retval = sch - '.';
-
-	return retval & 0x3f;
-}
-
-/*
- * When we choose to "support" invalid salts, nevertheless disallow those
- * containing characters that would violate the passwd file format.
- */
-static inline int
-ascii_is_unsafe(char ch)
-{
-	return !ch || ch == '\n' || ch == ':';
-}
-
-/*
- * Return a pointer to static data consisting of the "setting"
- * followed by an encryption produced by the "key" and "setting".
- */
-static char *
-__crypt(const char *key, const char *setting)
-{
-	char *encp;
-	int32_t i;
-	int t;
-	int32_t salt;
-	int num_iter, salt_size;
-	C_block keyblock, rsltblock;
-
-	/* Non-DES encryption schemes hook in here. */
-	if (setting[0] == _PASSWORD_NONDES) {
-		switch (setting[1]) {
-		case '2':
-			return (__bcrypt(key, setting));
-		case 's':
-			return (__crypt_sha1(key, setting));
-		case '1':
-		default:
-			return (__md5crypt(key, setting));
-		}
-	}
-
-	for (i = 0; i < 8; i++) {
-		if ((t = 2*(unsigned char)(*key)) != 0)
-			key++;
-		keyblock.b[i] = t;
-	}
-	if (des_setkey((char *)keyblock.b))
-		return (NULL);
-
-	encp = &cryptresult[0];
-	switch (*setting) {
-	case _PASSWORD_EFMT1:
-		/*
-		 * Involve the rest of the password 8 characters at a time.
-		 */
-		while (*key) {
-			if (des_cipher((char *)(void *)&keyblock,
-			    (char *)(void *)&keyblock, 0L, 1))
-				return (NULL);
-			for (i = 0; i < 8; i++) {
-				if ((t = 2*(unsigned char)(*key)) != 0)
-					key++;
-				keyblock.b[i] ^= t;
-			}
-			if (des_setkey((char *)keyblock.b))
-				return (NULL);
-		}
-
-		*encp++ = *setting++;
-
-		/* get iteration count */
-		num_iter = 0;
-		for (i = 4; --i >= 0; ) {
-			int value = ascii_to_bin(setting[i]);
-			if (itoa64[value] != setting[i])
-				return NULL;
-			encp[i] = setting[i];
-			num_iter = (num_iter << 6) | value;
-		}
-		if (num_iter == 0)
-			return NULL;
-		setting += 4;
-		encp += 4;
-		salt_size = 4;
-		break;
-	default:
-		num_iter = 25;
-		salt_size = 2;
-		if (ascii_is_unsafe(setting[0]) || ascii_is_unsafe(setting[1]))
-			return NULL;
-	}
-
-	salt = 0;
-	for (i = salt_size; --i >= 0; ) {
-		int value = ascii_to_bin(setting[i]);
-		if (salt_size > 2 && itoa64[value] != setting[i])
-			return NULL;
-		encp[i] = setting[i];
-		salt = (salt << 6) | value;
-	}
-	encp += salt_size;
-	if (des_cipher((char *)(void *)&constdatablock,
-	    (char *)(void *)&rsltblock, salt, num_iter))
-		return (NULL);
-
-	/*
-	 * Encode the 64 cipher bits as 11 ascii characters.
-	 */
-	i = ((int32_t)((rsltblock.b[0]<<8) | rsltblock.b[1])<<8) |
-	    rsltblock.b[2];
-	encp[3] = itoa64[i&0x3f];	i >>= 6;
-	encp[2] = itoa64[i&0x3f];	i >>= 6;
-	encp[1] = itoa64[i&0x3f];	i >>= 6;
-	encp[0] = itoa64[i];		encp += 4;
-	i = ((int32_t)((rsltblock.b[3]<<8) | rsltblock.b[4])<<8) |
-	    rsltblock.b[5];
-	encp[3] = itoa64[i&0x3f];	i >>= 6;
-	encp[2] = itoa64[i&0x3f];	i >>= 6;
-	encp[1] = itoa64[i&0x3f];	i >>= 6;
-	encp[0] = itoa64[i];		encp += 4;
-	i = ((int32_t)((rsltblock.b[6])<<8) | rsltblock.b[7])<<2;
-	encp[2] = itoa64[i&0x3f];	i >>= 6;
-	encp[1] = itoa64[i&0x3f];	i >>= 6;
-	encp[0] = itoa64[i];
-
-	encp[3] = 0;
-
-	return (cryptresult);
-}
-
-char *
-crypt(const char *key, const char *salt)
-{
-	char *res = __crypt(key, salt);
-	if (res)
-		return res;
-	/* How do I handle errors ? Return "*0" or "*1" */
-	return __UNCONST(salt[0] == '*' && salt[1] == '0' ? "*1" : "*0");
-}
-
-/*
- * The Key Schedule, filled in by des_setkey() or setkey().
- */
-#define	KS_SIZE	16
-static C_block	KS[KS_SIZE];
-
-/*
- * Set up the key schedule from the key.
- */
-int
-des_setkey(const char *key)
-{
-	DCL_BLOCK(K, K0, K1);
-	C_block *help, *ptabp;
-	int i;
-	static int des_ready = 0;
-
-	if (!des_ready) {
-		init_des();
-		des_ready = 1;
-	}
-
-	PERM6464(K,K0,K1,(const unsigned char *)key,(C_block *)PC1ROT);
-	help = &KS[0];
-	STORE(K&~0x03030303L, K0&~0x03030303L, K1, *help);
-	for (i = 1; i < 16; i++) {
-		help++;
-		STORE(K,K0,K1,*help);
-		ptabp = (C_block *)PC2ROT[Rotates[i]-1];
-		PERM6464(K,K0,K1,(const unsigned char *)help,ptabp);
-		STORE(K&~0x03030303L, K0&~0x03030303L, K1, *help);
-	}
-	return (0);
-}
-
-/*
- * Encrypt (or decrypt if num_iter < 0) the 8 chars at "in" with abs(num_iter)
- * iterations of DES, using the given 24-bit salt and the pre-computed key
- * schedule, and store the resulting 8 chars at "out" (in == out is permitted).
- *
- * NOTE: the performance of this routine is critically dependent on your
- * compiler and machine architecture.
- */
-int
-des_cipher(const char *in, char *out, long salt, int num_iter)
-{
-	/* variables that we want in registers, most important first */
-#if defined(pdp11)
-	int j;
-#endif
-	int32_t L0, L1, R0, R1, k;
-	C_block *kp;
-	int ks_inc, loop_count;
-	C_block B;
-
-	L0 = salt;
-	TO_SIX_BIT(salt, L0);	/* convert to 4*(6+2) format */
-
-#if defined(__vax__) || defined(pdp11)
-	salt = ~salt;	/* "x &~ y" is faster than "x & y". */
-#define	SALT (~salt)
-#else
-#define	SALT salt
-#endif
-
-#if defined(MUST_ALIGN)
-	B.b[0] = in[0]; B.b[1] = in[1]; B.b[2] = in[2]; B.b[3] = in[3];
-	B.b[4] = in[4]; B.b[5] = in[5]; B.b[6] = in[6]; B.b[7] = in[7];
-	LOAD(L,L0,L1,B);
-#else
-	LOAD(L,L0,L1,*(const C_block *)in);
-#endif
-	LOADREG(R,R0,R1,L,L0,L1);
-	L0 &= 0x55555555L;
-	L1 &= 0x55555555L;
-	L0 = (L0 << 1) | L1;	/* L0 is the even-numbered input bits */
-	R0 &= 0xaaaaaaaaL;
-	R1 = (R1 >> 1) & 0x55555555L;
-	L1 = R0 | R1;		/* L1 is the odd-numbered input bits */
-	STORE(L,L0,L1,B);
-	PERM3264(L,L0,L1,B.b,  (C_block *)IE3264);	/* even bits */
-	PERM3264(R,R0,R1,B.b+4,(C_block *)IE3264);	/* odd bits */
-
-	if (num_iter >= 0)
-	{		/* encryption */
-		kp = &KS[0];
-		ks_inc  = sizeof(*kp);
-	}
-	else
-	{		/* decryption */
-		num_iter = -num_iter;
-		kp = &KS[KS_SIZE-1];
-		ks_inc  = -(long)sizeof(*kp);
-	}
-
-	while (--num_iter >= 0) {
-		loop_count = 8;
-		do {
-
-#define	SPTAB(t, i) \
-	    (*(int32_t *)((unsigned char *)t + i*(sizeof(int32_t)/4)))
-#if defined(gould)
-			/* use this if B.b[i] is evaluated just once ... */
-#define	DOXOR(x,y,i)	x^=SPTAB(SPE[0][i],B.b[i]); y^=SPTAB(SPE[1][i],B.b[i]);
-#else
-#if defined(pdp11)
-			/* use this if your "long" int indexing is slow */
-#define	DOXOR(x,y,i)	j=B.b[i]; x^=SPTAB(SPE[0][i],j); y^=SPTAB(SPE[1][i],j);
-#else
-			/* use this if "k" is allocated to a register ... */
-#define	DOXOR(x,y,i)	k=B.b[i]; x^=SPTAB(SPE[0][i],k); y^=SPTAB(SPE[1][i],k);
-#endif
-#endif
-
-#define	CRUNCH(p0, p1, q0, q1)	\
-			k = (q0 ^ q1) & SALT;	\
-			B.b32.i0 = k ^ q0 ^ kp->b32.i0;		\
-			B.b32.i1 = k ^ q1 ^ kp->b32.i1;		\
-			kp = (C_block *)((char *)kp+ks_inc);	\
-							\
-			DOXOR(p0, p1, 0);		\
-			DOXOR(p0, p1, 1);		\
-			DOXOR(p0, p1, 2);		\
-			DOXOR(p0, p1, 3);		\
-			DOXOR(p0, p1, 4);		\
-			DOXOR(p0, p1, 5);		\
-			DOXOR(p0, p1, 6);		\
-			DOXOR(p0, p1, 7);
-
-			CRUNCH(L0, L1, R0, R1);
-			CRUNCH(R0, R1, L0, L1);
-		} while (--loop_count != 0);
-		kp = (C_block *)((char *)kp-(ks_inc*KS_SIZE));
-
-
-		/* swap L and R */
-		L0 ^= R0;  L1 ^= R1;
-		R0 ^= L0;  R1 ^= L1;
-		L0 ^= R0;  L1 ^= R1;
-	}
-
-	/* store the encrypted (or decrypted) result */
-	L0 = ((L0 >> 3) & 0x0f0f0f0fL) | ((L1 << 1) & 0xf0f0f0f0L);
-	L1 = ((R0 >> 3) & 0x0f0f0f0fL) | ((R1 << 1) & 0xf0f0f0f0L);
-	STORE(L,L0,L1,B);
-	PERM6464(L,L0,L1,B.b, (C_block *)CF6464);
-#if defined(MUST_ALIGN)
-	STORE(L,L0,L1,B);
-	out[0] = B.b[0]; out[1] = B.b[1]; out[2] = B.b[2]; out[3] = B.b[3];
-	out[4] = B.b[4]; out[5] = B.b[5]; out[6] = B.b[6]; out[7] = B.b[7];
-#else
-	STORE(L,L0,L1,*(C_block *)out);
-#endif
-	return (0);
-}
-
-
-/*
- * Initialize various tables.  This need only be done once.  It could even be
- * done at compile time, if the compiler were capable of that sort of thing.
- */
-STATIC
-init_des(void)
-{
-	int i, j;
-	int32_t k;
-	int tableno;
-	static unsigned char perm[64], tmp32[32];	/* "static" for speed */
-
-	/*
-	 * PC1ROT - bit reverse, then PC1, then Rotate, then PC2.
-	 */
-	for (i = 0; i < 64; i++)
-		perm[i] = 0;
-	for (i = 0; i < 64; i++) {
-		if ((k = PC2[i]) == 0)
-			continue;
-		k += Rotates[0]-1;
-		if ((k%28) < Rotates[0]) k -= 28;
-		k = PC1[k];
-		if (k > 0) {
-			k--;
-			k = (k|07) - (k&07);
-			k++;
-		}
-		perm[i] = k;
-	}
-#ifdef DEBUG
-	prtab("pc1tab", perm, 8);
-#endif
-	init_perm(PC1ROT, perm, 8, 8);
-
-	/*
-	 * PC2ROT - PC2 inverse, then Rotate (once or twice), then PC2.
-	 */
-	for (j = 0; j < 2; j++) {
-		unsigned char pc2inv[64];
-		for (i = 0; i < 64; i++)
-			perm[i] = pc2inv[i] = 0;
-		for (i = 0; i < 64; i++) {
-			if ((k = PC2[i]) == 0)
-				continue;
-			pc2inv[k-1] = i+1;
-		}
-		for (i = 0; i < 64; i++) {
-			if ((k = PC2[i]) == 0)
-				continue;
-			k += j;
-			if ((k%28) <= j) k -= 28;
-			perm[i] = pc2inv[k];
-		}
-#ifdef DEBUG
-		prtab("pc2tab", perm, 8);
-#endif
-		init_perm(PC2ROT[j], perm, 8, 8);
-	}
-
-	/*
-	 * Bit reverse, then initial permutation, then expansion.
-	 */
-	for (i = 0; i < 8; i++) {
-		for (j = 0; j < 8; j++) {
-			k = (j < 2)? 0: IP[ExpandTr[i*6+j-2]-1];
-			if (k > 32)
-				k -= 32;
-			else if (k > 0)
-				k--;
-			if (k > 0) {
-				k--;
-				k = (k|07) - (k&07);
-				k++;
-			}
-			perm[i*8+j] = k;
-		}
-	}
-#ifdef DEBUG
-	prtab("ietab", perm, 8);
-#endif
-	init_perm(IE3264, perm, 4, 8);
-
-	/*
-	 * Compression, then final permutation, then bit reverse.
-	 */
-	for (i = 0; i < 64; i++) {
-		k = IP[CIFP[i]-1];
-		if (k > 0) {
-			k--;
-			k = (k|07) - (k&07);
-			k++;
-		}
-		perm[k-1] = i+1;
-	}
-#ifdef DEBUG
-	prtab("cftab", perm, 8);
-#endif
-	init_perm(CF6464, perm, 8, 8);
-
-	/*
-	 * SPE table
-	 */
-	for (i = 0; i < 48; i++)
-		perm[i] = P32Tr[ExpandTr[i]-1];
-	for (tableno = 0; tableno < 8; tableno++) {
-		for (j = 0; j < 64; j++)  {
-			k = (((j >> 0) &01) << 5)|
-			    (((j >> 1) &01) << 3)|
-			    (((j >> 2) &01) << 2)|
-			    (((j >> 3) &01) << 1)|
-			    (((j >> 4) &01) << 0)|
-			    (((j >> 5) &01) << 4);
-			k = S[tableno][k];
-			k = (((k >> 3)&01) << 0)|
-			    (((k >> 2)&01) << 1)|
-			    (((k >> 1)&01) << 2)|
-			    (((k >> 0)&01) << 3);
-			for (i = 0; i < 32; i++)
-				tmp32[i] = 0;
-			for (i = 0; i < 4; i++)
-				tmp32[4 * tableno + i] = (k >> i) & 01;
-			k = 0;
-			for (i = 24; --i >= 0; )
-				k = (k<<1) | tmp32[perm[i]-1];
-			TO_SIX_BIT(SPE[0][tableno][j], k);
-			k = 0;
-			for (i = 24; --i >= 0; )
-				k = (k<<1) | tmp32[perm[i+24]-1];
-			TO_SIX_BIT(SPE[1][tableno][j], k);
-		}
-	}
-}
-
-/*
- * Initialize "perm" to represent transformation "p", which rearranges
- * (perhaps with expansion and/or contraction) one packed array of bits
- * (of size "chars_in" characters) into another array (of size "chars_out"
- * characters).
- *
- * "perm" must be all-zeroes on entry to this routine.
- */
-STATIC
-init_perm(C_block perm[64/CHUNKBITS][1<<CHUNKBITS], const unsigned char p[64],
-    int chars_in, int chars_out)
-{
-	int i, j, k, l;
-
-	for (k = 0; k < chars_out*8; k++) {	/* each output bit position */
-		l = p[k] - 1;		/* where this bit comes from */
-		if (l < 0)
-			continue;	/* output bit is always 0 */
-		i = l>>LGCHUNKBITS;	/* which chunk this bit comes from */
-		l = 1<<(l&(CHUNKBITS-1));	/* mask for this bit */
-		for (j = 0; j < (1<<CHUNKBITS); j++) {	/* each chunk value */
-			if ((j & l) != 0)
-				perm[i][j].b[k>>3] |= 1<<(k&07);
-		}
-	}
-}
-
-/*
- * "setkey" routine (for backwards compatibility)
- */
-int
-setkey(const char *key)
-{
-	int i, j, k;
-	C_block keyblock;
-
-	for (i = 0; i < 8; i++) {
-		k = 0;
-		for (j = 0; j < 8; j++) {
-			k <<= 1;
-			k |= (unsigned char)*key++;
-		}
-		keyblock.b[i] = k;
-	}
-	return (des_setkey((char *)keyblock.b));
-}
-
-/*
- * "encrypt" routine (for backwards compatibility)
- */
-int
-encrypt(char *block, int flag)
-{
-	int i, j, k;
-	C_block cblock;
-
-	for (i = 0; i < 8; i++) {
-		k = 0;
-		for (j = 0; j < 8; j++) {
-			k <<= 1;
-			k |= (unsigned char)*block++;
-		}
-		cblock.b[i] = k;
-	}
-	if (des_cipher((char *)&cblock, (char *)&cblock, 0L, (flag ? -1: 1)))
-		return (1);
-	for (i = 7; i >= 0; i--) {
-		k = cblock.b[i];
-		for (j = 7; j >= 0; j--) {
-			*--block = k&01;
-			k >>= 1;
-		}
-	}
-	return (0);
-}
-
-#ifdef DEBUG
-STATIC
-prtab(const char *s, unsigned char *t, int num_rows)
-{
-	int i, j;
-
-	(void)printf("%s:\n", s);
-	for (i = 0; i < num_rows; i++) {
-		for (j = 0; j < 8; j++) {
-			 (void)printf("%3d", t[i*8+j]);
-		}
-		(void)printf("\n");
-	}
-	(void)printf("\n");
-}
-#endif
-
-#if defined(MAIN) || defined(UNIT_TEST)
-#include <err.h>
-
-int
-main(int argc, char *argv[])
-{
-	if (argc < 2) {
-		fprintf(stderr, "Usage: %s password [salt]\n", getprogname());
-		return EXIT_FAILURE;
-	}
-
-	printf("%s\n", crypt(argv[1], (argc > 2) ? argv[2] : argv[1]));
-	return EXIT_SUCCESS;
-}
-#endif
diff --git a/lib/libcrypt/crypt.h b/lib/libcrypt/crypt.h
deleted file mode 100644
index ce81a7422..000000000
--- a/lib/libcrypt/crypt.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * $NetBSD: crypt.h,v 1.4 2006/10/27 18:22:56 drochner Exp $
- */
-char	*__md5crypt(const char *pw, const char *salt);	/* XXX */
-char *__bcrypt(const char *, const char *);	/* XXX */
-char *__crypt_sha1(const char *pw, const char *salt);
-unsigned int __crypt_sha1_iterations (unsigned int hint);
-void __hmac_sha1(const unsigned char *, size_t, const unsigned char *, size_t,
-		 unsigned char *);
-void __crypt_to64(char *s, u_int32_t v, int n);
-
-int __gensalt_blowfish(char *salt, size_t saltlen, const char *option);
-int __gensalt_old(char *salt, size_t saltsiz, const char *option);
-int __gensalt_new(char *salt, size_t saltsiz, const char *option);
-int __gensalt_md5(char *salt, size_t saltsiz, const char *option);
-int __gensalt_sha1(char *salt, size_t saltsiz, const char *option);
-
-#define SHA1_MAGIC "$sha1$"
-#define SHA1_SIZE 20
diff --git a/lib/libcrypt/hmac.c b/lib/libcrypt/hmac.c
deleted file mode 100644
index 127da86a5..000000000
--- a/lib/libcrypt/hmac.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* $NetBSD: hmac.c,v 1.3 2011/05/16 10:39:12 drochner Exp $ */
-
-/*
- * Copyright (c) 2004, 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.  
- * 3. Neither the name of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-/*
- * Implement HMAC as described in RFC 2104
- *
- * You need to define the following before including this file.
- *
- * HMAC_FUNC the name of the function (hmac_sha1 or hmac_md5 etc)
- * HASH_LENGTH the size of the digest (20 for SHA1, 16 for MD5)
- * HASH_CTX the name of the HASH CTX
- * HASH_Init
- * HASH_Update
- * Hash_Final
- */
-#include <sys/cdefs.h>
-#if !defined(lint)
-__RCSID("$NetBSD: hmac.c,v 1.3 2011/05/16 10:39:12 drochner Exp $");
-#endif /* not lint */
-
-#include <stdlib.h>
-#include <string.h>
-
-/* Don't change these */
-#define HMAC_IPAD 0x36
-#define HMAC_OPAD 0x5c
-
-/* Nor this */
-#ifndef HMAC_BLOCKSZ
-# define HMAC_BLOCKSZ 64
-#endif
-
-/*
- * The logic here is lifted straight from RFC 2104 except that
- * rather than filling the pads with 0, copying in the key and then
- * XOR with the pad byte, we just fill with the pad byte and
- * XOR with the key.
- */
-void
-HMAC_FUNC (const unsigned char *text, size_t text_len,
-	   const unsigned char *key, size_t key_len,
-	   unsigned char *digest)
-{
-    HASH_CTX context;
-    /* Inner padding key XOR'd with ipad */
-    unsigned char k_ipad[HMAC_BLOCKSZ];
-    /* Outer padding key XOR'd with opad */
-    unsigned char k_opad[HMAC_BLOCKSZ];
-    /* HASH(key) if needed */
-    unsigned char tk[HASH_LENGTH];	
-    size_t i;
-
-    /*
-     * If key is longer than HMAC_BLOCKSZ bytes
-     * reset it to key=HASH(key)
-     */
-    if (key_len > HMAC_BLOCKSZ) {
-	HASH_CTX      tctx;
-
-	HASH_Init(&tctx);
-	HASH_Update(&tctx, key, key_len);
-	HASH_Final(tk, &tctx);
-
-	key = tk;
-	key_len = HASH_LENGTH;
-    }
-
-    /*
-     * The HMAC_ transform looks like:
-     *
-     * HASH(K XOR opad, HASH(K XOR ipad, text))
-     *
-     * where K is an n byte key
-     * ipad is the byte HMAC_IPAD repeated HMAC_BLOCKSZ times
-     * opad is the byte HMAC_OPAD repeated HMAC_BLOCKSZ times
-     * and text is the data being protected
-     */
-
-    /*
-     * Fill the pads and XOR in the key
-     */
-    memset( k_ipad, HMAC_IPAD, sizeof k_ipad);
-    memset( k_opad, HMAC_OPAD, sizeof k_opad);
-    for (i = 0; i < key_len; i++) {
-	k_ipad[i] ^= key[i];
-	k_opad[i] ^= key[i];
-    }
-
-    /*
-     * Perform inner HASH.
-     * Start with inner pad,
-     * then the text.
-     */
-    HASH_Init(&context);
-    HASH_Update(&context, k_ipad, HMAC_BLOCKSZ);
-    HASH_Update(&context, text, text_len);
-    HASH_Final(digest, &context);
-
-    /*
-     * Perform outer HASH.
-     * Start with the outer pad,
-     * then the result of the inner hash.
-     */
-    HASH_Init(&context);
-    HASH_Update(&context, k_opad, HMAC_BLOCKSZ);
-    HASH_Update(&context, digest, HASH_LENGTH);
-    HASH_Final(digest, &context);
-}
-
-#if defined(MAIN) || defined(UNIT_TEST)
-#include <stdio.h>
-
-
-static char *
-b2x(char *buf, int bufsz, unsigned char *data, int nbytes)
-{
-	int i;
-
-	if (bufsz <= (nbytes * 2))
-	    return NULL;
-	buf[0] = '\0';
-	for (i = 0; i < nbytes; i++) {
-	    (void) sprintf(&buf[i*2], "%02x", data[i]);
-	}
-	return buf;
-}
-
-#if defined(UNIT_TEST)
-
-static int
-x2b(unsigned char *buf, int bufsz, char *data, int nbytes)
-{
-	int i;
-	int c;
-
-	if (nbytes < 0)
-	    nbytes = strlen(data);
-	nbytes /= 2;
-	if (bufsz <= nbytes)
-	    return 0;
-	for (i = 0; i < nbytes; i++) {
-	    if (sscanf(&data[i*2], "%02x", &c) < 1)
-		break;
-	    buf[i] = c;
-	}
-	buf[i] = 0;
-	return i;
-}
-
-#ifndef HMAC_KAT
-# define HMAC_KAT hmac_kat
-#endif
-
-/*
- * If a test key or data starts with 0x we'll convert to binary.
- */
-#define X2B(v, b) do { \
-    if (strncmp(v, "0x", 2) == 0) { \
-        v += 2; \
-        x2b(b, sizeof(b), v, strlen(v)); \
-        v = b; \
-    } \
-} while (0)
-
-/*
- * Run some of the known answer tests from RFC 2202
- * We assume that HASH_LENGTH==20 means SHA1 else MD5.
- */
-static int
-HMAC_KAT (FILE *fp)
-{
-    struct test_s {
-	unsigned char *key;
-	unsigned char *data;
-	unsigned char *expect;
-    } tests[] = {
-	{
-#if HASH_LENGTH == 20
-	    "0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-	    "Hi There",
-	    "0xb617318655057264e28bc0b6fb378c8ef146be00",
-#else
-	    "0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-	    "Hi There",
-	    "0x9294727a3638bb1c13f48ef8158bfc9d",
-#endif
-	},
-	{
-	    "Jefe",
-	    "what do ya want for nothing?",
-#if HASH_LENGTH == 20
-	    "0xeffcdf6ae5eb2fa2d27416d5f184df9c259a7c79",
-#else
-	    "0x750c783e6ab0b503eaa86e310a5db738",
-#endif
-	},
-	{
-#if HASH_LENGTH == 20
-	    "0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
-	    "Test With Truncation",
-	    "0x4c1a03424b55e07fe7f27be1d58bb9324a9a5a04",
-#else
-	    "0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
-	    "Test With Truncation",
-	    "0x56461ef2342edc00f9bab995690efd4c",
-#endif
-	},
-	{
-	    "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-	    "Test Using Larger Than Block-Size Key - Hash Key First",
-#if HASH_LENGTH == 20
-	    "0xaa4ae5e15272d00e95705637ce8a3b55ed402112",
-#else
-	    "0x6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd",
-#endif
-	},
-	{
-		0, 0, 0,
-	},
-    };
-    struct test_s *test = tests;
-    unsigned char digest[HASH_LENGTH];
-    unsigned char kbuf[BUFSIZ];
-    unsigned char dbuf[BUFSIZ];
-    unsigned char *key;
-    unsigned char *data;
-    char *result;
-    int n = 0;
-    
-    for (test = tests; test->key; test++) {
-	key = test->key;
-	X2B(key, kbuf);
-	data = test->data;
-	X2B(data, dbuf);
-	HMAC_FUNC(data, strlen(data), key, strlen(key), digest);
-	strcpy(dbuf, "0x");
-	b2x(&dbuf[2], (sizeof dbuf) - 2, digest, HASH_LENGTH);
-	
-	if (strcmp(dbuf, test->expect) == 0)
-	    result = "Ok";
-	else {
-	    n++;
-	    result = test->expect;
-	}
-	if (fp)
-	    fprintf(fp, "key=%s, data=%s, result=%s: %s\n",
-		    test->key, test->data, dbuf, result);
-    }
-    return n;
-}
-#endif
-
-
-int
-main (int argc, char *argv[])
-{
-    char buf[BUFSIZ];
-    unsigned char *key;
-    unsigned char *data;
-    int key_len;
-    int data_len;
-    int i;
-    unsigned char digest[HASH_LENGTH];
-
-#ifdef UNIT_TEST
-    if (argc == 1)
-	exit(HMAC_KAT(stdout));
-#endif
-    
-    if (argc < 3) {
-	fprintf(stderr, "Usage:\n\t%s key data\n", argv[0]);
-	exit(1);
-    }
-    key = argv[1];
-    data = argv[2];
-    key_len = strlen(key);
-    data_len = strlen(data);
-    HMAC_FUNC(data, data_len, key, key_len, digest);
-    printf("0x%s\n", b2x(buf, sizeof buf, digest, HASH_LENGTH));
-    exit(0);
-}
-#endif
-
-		
diff --git a/lib/libcrypt/hmac_sha1.c b/lib/libcrypt/hmac_sha1.c
deleted file mode 100644
index 2fd463a72..000000000
--- a/lib/libcrypt/hmac_sha1.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $NetBSD: hmac_sha1.c,v 1.1 2006/10/27 18:22:56 drochner Exp $ */
-
-/*
- * hmac_sha1 - using HMAC from RFC 2104
- */
-
-#include <sha1.h> /* XXX */
-#include "crypt.h"
-
-#define HMAC_HASH SHA1
-#define HMAC_FUNC __hmac_sha1
-#define HMAC_KAT  hmac_kat_sha1
-
-#define HASH_LENGTH SHA1_DIGEST_LENGTH
-#define HASH_CTX SHA1_CTX
-#define HASH_Init SHA1Init
-#define HASH_Update SHA1Update
-#define HASH_Final SHA1Final
-
-#include "hmac.c"
diff --git a/lib/libcrypt/md5crypt.c b/lib/libcrypt/md5crypt.c
deleted file mode 100644
index 47852206c..000000000
--- a/lib/libcrypt/md5crypt.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*	$NetBSD: md5crypt.c,v 1.14 2013/08/28 17:47:07 riastradh Exp $	*/
-
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * from FreeBSD: crypt.c,v 1.5 1996/10/14 08:34:02 phk Exp
- * via OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp
- *
- */
-
-#include <sys/cdefs.h>
-#if !defined(lint)
-__RCSID("$NetBSD: md5crypt.c,v 1.14 2013/08/28 17:47:07 riastradh Exp $");
-#endif /* not lint */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <md5.h>
-
-#include "crypt.h"
-
-#define MD5_MAGIC	"$1$"
-#define MD5_MAGIC_LEN	3
-
-#define	INIT(x)			MD5Init((x))
-#define	UPDATE(x, b, l)		MD5Update((x), (b), (l))
-#define	FINAL(v, x)		MD5Final((v), (x))
-
-
-/*
- * MD5 password encryption.
- */
-char *
-__md5crypt(const char *pw, const char *salt)
-{
-	static char passwd[120], *p;
-	const char *sp, *ep;
-	unsigned char final[16];
-	unsigned int i, sl, pwl;
-	MD5_CTX	ctx, ctx1;
-	u_int32_t l;
-	int pl;
-	
-	pwl = strlen(pw);
-	
-	/* Refine the salt first */
-	sp = salt;
-
-	/* If it starts with the magic string, then skip that */
-	if (strncmp(sp, MD5_MAGIC, MD5_MAGIC_LEN) == 0)
-		sp += MD5_MAGIC_LEN;
-
-	/* It stops at the first '$', max 8 chars */
-	for (ep = sp; *ep != '\0' && *ep != '$' && ep < (sp + 8); ep++)
-		continue;
-
-	/* get the length of the true salt */
-	sl = ep - sp;
-
-	INIT(&ctx);
-
-	/* The password first, since that is what is most unknown */
-	UPDATE(&ctx, (const unsigned char *)pw, pwl);
-
-	/* Then our magic string */
-	UPDATE(&ctx, (const unsigned char *)MD5_MAGIC, MD5_MAGIC_LEN);
-
-	/* Then the raw salt */
-	UPDATE(&ctx, (const unsigned char *)sp, sl);
-
-	/* Then just as many characters of the MD5(pw,salt,pw) */
-	INIT(&ctx1);
-	UPDATE(&ctx1, (const unsigned char *)pw, pwl);
-	UPDATE(&ctx1, (const unsigned char *)sp, sl);
-	UPDATE(&ctx1, (const unsigned char *)pw, pwl);
-	FINAL(final, &ctx1);
-
-	for (pl = pwl; pl > 0; pl -= 16)
-		UPDATE(&ctx, final, (unsigned int)(pl > 16 ? 16 : pl));
-
-	/* Don't leave anything around in vm they could use. */
-	memset(final, 0, sizeof(final));
-
-	/* Then something really weird... */
-	for (i = pwl; i != 0; i >>= 1)
-		if ((i & 1) != 0)
-		    UPDATE(&ctx, final, 1);
-		else
-		    UPDATE(&ctx, (const unsigned char *)pw, 1);
-
-	/* Now make the output string */
-	memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
-	strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1);
-	strlcat(passwd, "$", sizeof(passwd));
-
-	FINAL(final, &ctx);
-
-	/* memset(&ctx, 0, sizeof(ctx)); done by MD5Final() */
-
-	/*
-	 * And now, just to make sure things don't run too fast. On a 60 MHz
-	 * Pentium this takes 34 msec, so you would need 30 seconds to build
-	 * a 1000 entry dictionary...
-	 */
-	for (i = 0; i < 1000; i++) {
-		INIT(&ctx1);
-
-		if ((i & 1) != 0)
-			UPDATE(&ctx1, (const unsigned char *)pw, pwl);
-		else
-			UPDATE(&ctx1, final, 16);
-
-		if ((i % 3) != 0)
-			UPDATE(&ctx1, (const unsigned char *)sp, sl);
-
-		if ((i % 7) != 0)
-			UPDATE(&ctx1, (const unsigned char *)pw, pwl);
-
-		if ((i & 1) != 0)
-			UPDATE(&ctx1, final, 16);
-		else
-			UPDATE(&ctx1, (const unsigned char *)pw, pwl);
-
-		FINAL(final, &ctx1);
-	}
-
-	/* memset(&ctx1, 0, sizeof(ctx1)); done by MD5Final() */
-
-	p = passwd + sl + MD5_MAGIC_LEN + 1;
-
-	l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; __crypt_to64(p,l,4); p += 4;
-	l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; __crypt_to64(p,l,4); p += 4;
-	l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; __crypt_to64(p,l,4); p += 4;
-	l = (final[ 3]<<16) | (final[ 9]<<8) | final[15]; __crypt_to64(p,l,4); p += 4;
-	l = (final[ 4]<<16) | (final[10]<<8) | final[ 5]; __crypt_to64(p,l,4); p += 4;
-	l =		       final[11]		; __crypt_to64(p,l,2); p += 2;
-	*p = '\0';
-
-	/* Don't leave anything around in vm they could use. */
-	explicit_memset(final, 0, sizeof(final));
-	return (passwd);
-}
diff --git a/lib/libcrypt/pw_gensalt.c b/lib/libcrypt/pw_gensalt.c
deleted file mode 100644
index 094f0cef1..000000000
--- a/lib/libcrypt/pw_gensalt.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*	$NetBSD: pw_gensalt.c,v 1.7 2009/01/18 12:15:27 lukem Exp $	*/
-
-/*
- * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Niels Provos.
- * 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.
- *
- * from OpenBSD: pwd_gensalt.c,v 1.9 1998/07/05 21:08:32 provos Exp
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: pw_gensalt.c,v 1.7 2009/01/18 12:15:27 lukem Exp $");
-#endif /* not lint */
-
-#include <sys/syslimits.h>
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <err.h>
-#include <grp.h>
-#include <pwd.h>
-#include <util.h>
-#include <time.h>
-#include <errno.h>
-
-#include "crypt.h"
-
-
-static const struct pw_salt {
-	const char *name;
-	int (*gensalt)(char *, size_t, const char *);
-} salts[] = {
-	{ "old", __gensalt_old },
-	{ "new", __gensalt_new },
-	{ "newsalt", __gensalt_new },
-	{ "md5", __gensalt_md5 },
-	{ "sha1", __gensalt_sha1 },
-	{ "blowfish", __gensalt_blowfish },
-	{ NULL, NULL }
-};
-
-static int
-getnum(const char *str, size_t *num)
-{
-	char *ep;
-	unsigned long rv;
-
-	if (str == NULL) {
-		*num = 0;
-		return 0;
-	}
-
-	rv = strtoul(str, &ep, 0);
-
-	if (str == ep || *ep) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	if (errno == ERANGE && rv == ULONG_MAX)
-		return -1;
-	*num = (size_t)rv;
-	return 0;
-}
-
-int
-/*ARGSUSED2*/
-__gensalt_old(char *salt, size_t saltsiz, const char *option)
-{
-	if (saltsiz < 3) {
-		errno = ENOSPC;
-		return -1;
-	}
-	__crypt_to64(&salt[0], arc4random(), 2);
-	salt[2] = '\0';
-	return 0;
-}
-
-int
-/*ARGSUSED2*/
-__gensalt_new(char *salt, size_t saltsiz, const char* option)
-{
-	size_t nrounds;
-
-	if (saltsiz < 10) {
-		errno = ENOSPC;
-		return -1;
-	}
-
-	if (getnum(option, &nrounds) == -1)
-		return -1;
-
-	/* Check rounds, 24 bit is max */
-	if (nrounds < 7250)
-		nrounds = 7250;
-	else if (nrounds > 0xffffff)
-		nrounds = 0xffffff;
-	salt[0] = _PASSWORD_EFMT1;
-	__crypt_to64(&salt[1], (uint32_t)nrounds, 4);
-	__crypt_to64(&salt[5], arc4random(), 4);
-	salt[9] = '\0';
-	return 0;
-}
-
-int
-/*ARGSUSED2*/
-__gensalt_md5(char *salt, size_t saltsiz, const char *option)
-{
-	if (saltsiz < 13) {  /* $1$8salt$\0 */
-		errno = ENOSPC;
-		return -1;
-	}
-	salt[0] = _PASSWORD_NONDES;
-	salt[1] = '1';
-	salt[2] = '$';
-	__crypt_to64(&salt[3], arc4random(), 4);
-	__crypt_to64(&salt[7], arc4random(), 4);
-	salt[11] = '$';
-	salt[12] = '\0';
-	return 0;
-}
-
-int
-__gensalt_sha1(char *salt, size_t saltsiz, const char *option)
-{
-	int n;
-	size_t nrounds;
-
-	if (getnum(option, &nrounds) == -1)
-		return -1;
-	n = snprintf(salt, saltsiz, "%s%u$", SHA1_MAGIC,
-	    __crypt_sha1_iterations(nrounds));
-	/*
-	 * The salt can be up to 64 bytes, but 8
-	 * is considered enough for now.
-	 */
-	if ((size_t)n + 9 >= saltsiz)
-		return 0;
-	__crypt_to64(&salt[n], arc4random(), 4);
-	__crypt_to64(&salt[n + 4], arc4random(), 4);
-	salt[n + 8] = '$';
-	salt[n + 9] = '\0';
-	return 0;
-}
-
-int
-pw_gensalt(char *salt, size_t saltlen, const char *type, const char *option)
-{
-	const struct pw_salt *sp;
-
-	for (sp = salts; sp->name; sp++)
-		if (strcmp(sp->name, type) == 0)
-			return (*sp->gensalt)(salt, saltlen, option);
-
-	errno = EINVAL;
-	return -1;
-}
diff --git a/lib/libcrypt/shlib_version b/lib/libcrypt/shlib_version
deleted file mode 100644
index 8cfa7b769..000000000
--- a/lib/libcrypt/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.6 2009/01/11 03:07:47 christos Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=1
-minor=0
diff --git a/lib/libcrypt/util.c b/lib/libcrypt/util.c
deleted file mode 100644
index b8d85809e..000000000
--- a/lib/libcrypt/util.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <sys/cdefs.h>
-#if !defined(lint)
-__RCSID("$NetBSD: util.c,v 1.1 2004/07/02 00:05:23 sjg Exp $");
-#endif /* not lint */
-
-#include <sys/types.h>
-
-#include "crypt.h"
-
-static const unsigned char itoa64[] =		/* 0 ... 63 => ascii - 64 */
-	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-void
-__crypt_to64(char *s, u_int32_t v, int n)
-{
-
-	while (--n >= 0) {
-		*s++ = itoa64[v & 0x3f];
-		v >>= 6;
-	}
-}
diff --git a/lib/libcurses/EXAMPLES/Makefile b/lib/libcurses/EXAMPLES/Makefile
deleted file mode 100644
index b3759fdc5..000000000
--- a/lib/libcurses/EXAMPLES/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#$Id: Makefile,v 1.2 2007/05/28 15:01:58 blymn Exp $
-#$Log: Makefile,v $
-#Revision 1.2  2007/05/28 15:01:58  blymn
-#Merge in wide curses code done as a Summer of Code project by
-#Ruibiao Qiu.
-#
-#Revision 1.1.2.2  2007/01/31 10:08:47  blymn
-#Fix up build errors.
-#
-#Revision 1.1.2.1  2007/01/21 12:05:54  blymn
-#Merge wide curses.
-#
-#Revision 1.1  2007/01/21 11:38:59  blymn
-#Wide curses merge
-#
-#Revision 1.1  2005/08/31 14:52:08  ruibiao
-#
-#A patach for the current source
-#
-#Revision 1.2  2005/08/23 21:29:08  ruibiao
-#
-#Changed to the right libraries
-#
-#Revision 1.1  2005/08/23 16:38:22  ruibiao
-#
-#Initial version, to build all versions of file views and the unit tester
-#
-
-RM = /bin/rm -f
-CFLAGS =
-
-.if defined(DEBUG)
-CFLAGS+= -g
-.endif
-
-all: wcview nwview ccview tcview ncview ex1
-
-wcview: view.c
-	gcc -DHAVE_WCHAR -o wcview view.c -I.. $(CFLAGS) -lcurses -Wl,-rpath,.. -L..
-
-nwview: view.c
-	gcc -DHAVE_WCHAR -o nwview view.c -DNCURSES -I/usr/pkg/include $(CFLAGS) -lcurses -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib
-
-ccview: view.c
-	gcc -o ccview view.c -I.. $(CFLAGS) -lcurses -Wl,-rpath,.. -L..
-
-tcview: view.c
-	gcc -o tcview view.c -L/usr/lib -Wl,-rpath,/usr/lib $(CFLAGS) -lcurses
-
-ncview: view.c
-	gcc -o ncview view.c -I/usr/pkg/include -DNCURSES -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib $(CFLAGS) -lncurses
-
-ex1: ex1.c
-	gcc -DHAVE_WCHAR -o ex1 ex1.c -I.. $(CFLAGS) -lcurses -Wl,-rpath,.. -L..
diff --git a/lib/libcurses/EXAMPLES/ex1.c b/lib/libcurses/EXAMPLES/ex1.c
deleted file mode 100644
index e71ed33d0..000000000
--- a/lib/libcurses/EXAMPLES/ex1.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/*	$NetBSD: ex1.c,v 1.5 2007/05/28 15:01:58 blymn Exp $	*/
-
-/*
- * 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.
- * 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)ex1.c	8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-#include <sys/types.h>
-#include <curses.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <locale.h>
-#include <assert.h>
-
-#define YSIZE 4
-#define XSIZE 30
-
-void quit( int );
-
-main()
-{
-	int i, j, c, n = 0, ac = 0;
-	size_t len;
-	char id[100];
-	FILE *fp;
-	char *s;
-    cchar_t cc, ncc, cstr[ 128 ], icc, icstr[ 128 ], bcc;
-    int wc_on = 0, wgc_on = 0;
-    char mbs[] = "´ó";
-    char mbstr[] = "´óѧ֮µÀ£¬ÔÚÃ÷Ã÷µÂ£¬ÔÚÇ×Ãñ£¬ÔÚÖ¹ÓÚÖÁÉÆ¡£ (Liji)";
-    wchar_t wstr[ 128 ], owstr[ 4 ], gwstr[ 128 ], iwstr[ 128 ];
-    int wslen = 0;
-    wint_t wc;
-    char nostr[ 128 ];
-    attr_t al[ 15 ] = { WA_BLINK,
-                        WA_BOLD,
-                        WA_DIM,
-                        WA_LOW,
-                        WA_TOP,
-                        WA_INVIS,
-                        WA_HORIZONTAL,
-                        WA_VERTICAL,
-                        WA_LEFT,
-                        WA_RIGHT,
-                        WA_PROTECT,
-                        WA_REVERSE,
-                        WA_STANDOUT,
-                        WA_UNDERLINE };
-
-    fprintf( stderr, "Current locale: %s\n", setlocale(LC_ALL, ""));
-    if (( wslen =  mbstowcs( &cc.vals[ 0 ], mbs, strlen( mbs ))) < 0 ) {
-        fprintf( stderr, "mbstowcs() failed\n" );
-        return -1;
-    }
-    fprintf( stderr, "WC string length: %d\n", wslen );
-    fprintf( stderr, "WC width: %d\n", wcwidth( cc.vals[ 0 ]));
-    cc.elements = ncc.elements = 8;
-    cc.attributes = ncc.attributes = 0;
-    ncc.vals[ 0 ] = 0xda00;
-    cc.vals[ 1 ] = ncc.vals[ 1 ] = 0xda01;
-    cc.vals[ 2 ] = ncc.vals[ 2 ] = 0xda02;
-    cc.vals[ 3 ] = ncc.vals[ 3 ] = 0xda03;
-    cc.vals[ 4 ] = ncc.vals[ 4 ] = 0xda04;
-    cc.vals[ 5 ] = ncc.vals[ 5 ] = 0xda05;
-    cc.vals[ 6 ] = ncc.vals[ 6 ] = 0xda06;
-    cc.vals[ 7 ] = ncc.vals[ 7 ] = 0xda07;
-
-    if (( wslen =  mbstowcs( wstr, mbstr, strlen( mbstr ))) < 0 ) {
-        fprintf( stderr, "mbstowcs() failed\n" );
-        return -1;
-    }
-
-    for ( i = 0; i < wslen; i++ ) {
-        cstr[ i ].vals[ 0 ] = wstr[ i ];
-    }
-    cstr[ wslen ].vals[ 0 ] = 0;
-
-    bcc.elements = 8;
-    bcc.attributes = 0;
-    bcc.vals[ 0 ] = L'_';
-    bcc.vals[ 1 ] = 0xda01;
-    bcc.vals[ 2 ] = 0xda02;
-    bcc.vals[ 3 ] = 0xda03;
-    bcc.vals[ 4 ] = 0xda04;
-    bcc.vals[ 5 ] = 0xda05;
-    bcc.vals[ 6 ] = 0xda06;
-    bcc.vals[ 7 ] = 0xda07;
-
-	initscr();			/* Always call initscr() first */
-	signal(SIGINT, quit);		/* Make sure wou have a 'cleanup' fn */
-	crmode();			/* We want cbreak mode */
-	noecho();			/* We want to have control of chars */
-	delwin(stdscr);			/* Create our own stdscr */
-	stdscr = newwin(YSIZE, XSIZE, 1, 1);
-	flushok(stdscr, TRUE);		/* Enable flushing of stdout */
-	scrollok(stdscr, TRUE);		/* Enable scrolling */
-	erase();			/* Initially, clear the screen */
-
-	standout();
-	move(0,0);
-	while (1) {
-        if ( !wgc_on ) {
-		    c = getchar();
-		    switch(c) {
-		        case 'q':		/* Quit on 'q' */
-			        quit( 0 );
-			        break;
-                case 'p':
-                    keypad( stdscr, TRUE );
-                    break;
-                case 'P':
-                    keypad( stdscr, FALSE );
-                    break;
-                case 'g':
-                    wgc_on = 1;
-                    echo();
-                    break;
-                case 'b':
-                    get_wstr( gwstr );
-                    move( 1, 0 );
-                    addstr( "Input:" );
-                    addwstr( gwstr );
-                    refresh();
-                    break;
-                case 'h':
-                    move( 0, 0 );
-                    in_wch( &icc );
-                    move( 1, 0 );
-                    add_wch( &icc );
-                    refresh();
-                    break;
-                case 'y':
-                    move( 0, 0 );
-                    in_wchstr( icstr );
-                    move( 1, 0 );
-                    add_wchstr( icstr );
-                    refresh();
-                    break;
-                case 'u':
-                    move( 0, 0 );
-                    inwstr( iwstr );
-                    move( 1, 0 );
-                    addwstr( iwstr );
-                    refresh();
-                    break;
-                case 'i':
-                    move( 0, 0 );
-                    hline_set( &cc, 20 );
-                    move( 0, 0 );
-                    vline_set( &cc, 20 );
-                    refresh();
-                    break;
-                case 'o':
-                    clrtobot();
-                    refresh();
-                    break;
-		        case 's':		/* Go into standout mode on 's' */
-			        standout();
-			        break;
-		        case 'e':		/* Exit standout mode on 'e' */
-			        standend();
-			        break;
-		        case 'r':		/* Force a refresh on 'r' */
-			        wrefresh(curscr);
-			        break;
-		        case 'w':		/* Turn on/off add_wch() tests */
-                    wc_on = 1 - wc_on;
-                    break;
-                case 'd':
-                    add_wchstr(( const cchar_t *)&cstr );
-                    refresh();
-                    break;
-                case 'c':
-                    addwstr(( const wchar_t *)&wstr );
-                    refresh();
-                    break;
-                case 'z':
-                    move( 0, 1 );
-                    if ( wc_on )
-                        add_wch( &cc );
-                    else
-                        addch( c );
-                    refresh();
-                    break;
-                case 'x':
-                    move( 0, 3 );
-                    if ( wc_on )
-                        add_wch( &cc );
-                    else
-                        addch( c );
-                    refresh();
-                    break;
-                case 'n':
-                    add_wch( &ncc );
-                    refresh();
-                    break;
-                case 'm':
-                    //border( 0, 0, 0, 0, 0, 0, 0, 0 );
-                    border_set( NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL );
-                    refresh();
-                    break;
-                case 'j':
-                    box_set( stdscr, &cc, &cc );
-                    refresh();
-                    break;
-                case 'k':
-                    erase();
-                    refresh();
-                    break;
-                case '1':
-                    move( 0, 0 );
-                    clrtoeol();
-                    refresh();
-                    break;
-                case '2':
-                    move( 0, 0 );
-                    sprintf( nostr, "Orig:%x", al[ ac ]);
-                    addstr( nostr );
-                    ac = ( ac + 1 ) % 16;
-                    bcc.attributes = al[ ac ];
-                    bkgrnd( &bcc );
-                    move( 1, 0 );
-                    sprintf( nostr, "New:%x", al[ ac ]);
-                    //addstr( nostr );
-                    insstr( nostr );
-                    refresh();
-                    break;
-                case 'v':
-                    if ( wc_on )
-                        ins_wch( &cc );
-                    else
-                        insch( c );
-                    refresh();
-                    break;
-                case 'f':
-                    ins_wstr(( const wchar_t *)&wstr );
-                    refresh();
-                    break;
-                case 't':
-                    for ( i = 0; i < 4; i++ ) {
-                        owstr[ i ] = wstr[ i + 5 ];
-                        wstr[ i + 5 ] = i + 0xda05;
-                    }
-                    ins_wstr(( const wchar_t *)&wstr );
-                    refresh();
-                    for ( i = 0; i < 4; i++ )
-                        wstr[ i + 5 ] = owstr[ i ];
-                    break;
-		        default:		/* By default output the character */
-                    if ( wc_on )
-                        add_wch( &cc );
-                    else {
-                        if ( c < 0x7F )
-                            addch( c );
-                        else {
-                            addstr( keyname( c ));
-                        }
-                    }
-                    refresh();
-		    }
-        } else {
-            get_wch( &wc );
-            switch ( wc ) {
-                case L'w':
-                    wgc_on = 0;
-                    noecho();
-                    break;
-                case L'q':
-                    quit( 0 );
-                    break;
-                case L't':
-                    notimeout( stdscr, TRUE );
-                    break;
-                case L'T':
-                    notimeout( stdscr, FALSE );
-                    break;
-                case L'd':
-                    nodelay( stdscr, TRUE );
-                    break;
-                case L'D':
-                    nodelay( stdscr, FALSE );
-                    break;
-                case L'p':
-                    keypad( stdscr, TRUE );
-                    break;
-                case L'P':
-                    keypad( stdscr, FALSE );
-                    break;
-                default:
-                    break;
-            }
-        }
-	}
-}
-
-void quit( int sig )
-{
-	erase();		/* Terminate by erasing the screen */
-	refresh();
-	endwin();		/* Always end with endwin() */
-	delwin(curscr);		/* Return storage */
-	delwin(stdscr);
-	putchar('\n');
-	exit( sig );
-}
-
diff --git a/lib/libcurses/EXAMPLES/view.c b/lib/libcurses/EXAMPLES/view.c
deleted file mode 100644
index 74df2a83d..000000000
--- a/lib/libcurses/EXAMPLES/view.c
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- * view.c -- a silly little viewer program
- *
- * written by Eric S. Raymond <esr@snark.thyrsus.com> December 1994
- * to test the scrolling code in ncurses.
- *
- * modified by Thomas Dickey <dickey@clark.net> July 1995 to demonstrate
- * the use of 'resizeterm()', and May 2000 to illustrate wide-character
- * handling.
- *
- * Takes a filename argument.  It's a simple file-viewer with various
- * scroll-up and scroll-down commands.
- *
- * n	-- scroll one line forward
- * p	-- scroll one line back
- *
- * Either command accepts a numeric prefix interpreted as a repeat count.
- * Thus, typing `5n' should scroll forward 5 lines in the file.
- *
- * The way you can tell this is working OK is that, in the trace file,
- * there should be one scroll operation plus a small number of line
- * updates, as opposed to a whole-page update.  This means the physical
- * scroll operation worked, and the refresh() code only had to do a
- * partial repaint.
- *
- * $Id: view.c,v 1.2 2007/05/28 15:01:58 blymn Exp $
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <signal.h>
-#ifdef NCURSES
-#define _XOPEN_SOURCE_EXTENDED
-#include <ncurses.h>
-#include <term.h>
-#else
-#include <curses.h>
-#endif /* NCURSES */
-#include <locale.h>
-#include <assert.h>
-#include <ctype.h>
-#include <termios.h>
-#include <util.h>
-#include <unistd.h>
-#ifdef HAVE_WCHAR
-#include <wchar.h>
-#endif /* HAVE_WCHAR */
-#ifdef DEBUG
-#include <syslog.h>
-#endif /* DEBUG */
-
-#define UChar(c)    ((unsigned char)(c))
-#define SIZEOF(table)	(sizeof(table)/sizeof(table[0]))
-#define typeMalloc(type,n) (type *) malloc((n) * sizeof(type))
-
-#define my_pair 1
-
-#undef CURSES_CH_T
-#ifdef HAVE_WCHAR
-#define CURSES_CH_T cchar_t
-#else
-#define CURSES_CH_T chtype
-#endif /* HAVE_WCHAR */
-
-static void finish(int sig);
-static void show_all(const char *tag);
-
-static int shift = 0;
-static bool try_color = FALSE;
-
-static char *fname;
-static CURSES_CH_T **my_lines;
-static CURSES_CH_T **lptr;
-static unsigned num_lines;
-
-static void usage(void)
-{
-    static const char *msg[] = {
-	    "Usage: view [options] file"
-	    ,""
-	    ,"Options:"
-	    ," -c       use color if terminal supports it"
-	    ," -i       ignore INT, QUIT, TERM signals"
-	    ," -n NUM   specify maximum number of lines (default 1000)"
-#if defined(KEY_RESIZE)
-	    ," -r       use old-style sigwinch handler rather than KEY_RESIZE"
-#endif
-#ifdef TRACE
-	    ," -t       trace screen updates"
-	    ," -T NUM   specify trace mask"
-#endif
-    };
-    size_t n;
-    for (n = 0; n < SIZEOF(msg); n++)
-	    fprintf(stderr, "%s\n", msg[n]);
-    exit( 1 );
-}
-
-static int ch_len(CURSES_CH_T * src)
-{
-    int result = 0;
-
-#ifdef HAVE_WCHAR
-    while (getcchar(src++, NULL, NULL, NULL, NULL) > 0)
-	    result++;
-#else
-    while (*src++)
-	result++;
-#endif
-    return result;
-}
-
-/*
- * Allocate a string into an array of chtype's.  If UTF-8 mode is
- * active, translate the string accordingly.
- */
-static CURSES_CH_T * ch_dup(char *src)
-{
-    unsigned len = strlen(src);
-    CURSES_CH_T *dst = typeMalloc(CURSES_CH_T, len + 1);
-    unsigned j, k;
-#ifdef HAVE_WCHAR
-    wchar_t wstr[CCHARW_MAX + 1];
-    wchar_t wch;
-    int l = 0;
-    mbstate_t state;
-    size_t rc;
-    int width;
-#endif
-
-#ifdef HAVE_WCHAR
-    mbrtowc( NULL, NULL, 1, &state );
-#endif
-    for (j = k = 0; j < len; j++) {
-#ifdef HAVE_WCHAR
-	    rc = mbrtowc(&wch, src + j, len - j, &state);
-#ifdef DEBUG
-        syslog( LOG_INFO, "[ch_dup]mbrtowc() returns %d", rc );
-#endif /* DEBUG */
-	    if (rc == (size_t) -1 || rc == (size_t) -2)
-	        break;
-	    j += rc - 1;
-	    if ((width = wcwidth(wch)) < 0)
-	        break;
-	    if ((width > 0 && l > 0) || l == CCHARW_MAX) {
-	        wstr[l] = L'\0';
-	        l = 0;
-	        if (setcchar(dst + k, wstr, 0, 0, NULL) != OK)
-		        break;
-	        ++k;
-	    }
-	    if (width == 0 && l == 0)
-	        wstr[l++] = L' ';
-	    wstr[l++] = wch;
-#ifdef DEBUG
-        syslog( LOG_INFO, "[ch_dup]wch=%x", wch );
-#endif /* DEBUG */
-#else
-	    dst[k++] = src[j];
-#endif
-    }
-#ifdef HAVE_WCHAR
-    if (l > 0) {
-	    wstr[l] = L'\0';
-	    if (setcchar(dst + k, wstr, 0, 0, NULL) == OK)
-	        ++k;
-    }
-    setcchar(dst + k, L"", 0, 0, NULL);
-#else
-    dst[k] = 0;
-#endif
-    return dst;
-}
-
-int main(int argc, char *argv[])
-{
-    int MAXLINES = 1000;
-    FILE *fp;
-    char buf[BUFSIZ];
-    int i;
-    int my_delay = 0;
-    CURSES_CH_T **olptr;
-    int length = 0;
-    int value = 0;
-    bool done = FALSE;
-    bool got_number = FALSE;
-    const char *my_label = "Input";
-#ifdef HAVE_WCHAR
-    cchar_t icc;
-#endif /* HAVE_WCHAR */
-
-    setlocale(LC_ALL, "");
-
-    (void) signal(SIGINT, finish);	/* arrange interrupts to terminate */
-
-    while ((i = getopt(argc, argv, "cin:rtT:")) != EOF) {
-	    switch (i) {
-	        case 'c':
-	            try_color = TRUE;
-	            break;
-	        case 'i':
-	            signal(SIGINT, SIG_IGN);
-	            signal(SIGQUIT, SIG_IGN);
-	            signal(SIGTERM, SIG_IGN);
-	            break;
-	        case 'n':
-	            if ((MAXLINES = atoi(optarg)) < 1)
-		        usage();
-	            break;
-#ifdef TRACE
-	        case 'T':
-	            trace(atoi(optarg));
-	            break;
-	        case 't':
-	            trace(TRACE_CALLS);
-	            break;
-#endif
-	        default:
-	            usage();
-	    }
-    }
-    if (optind + 1 != argc)
-	    usage();
-
-    if ((my_lines = typeMalloc(CURSES_CH_T *, MAXLINES + 2)) == 0)
-	    usage();
-
-    fname = argv[optind];
-    if ((fp = fopen(fname, "r")) == 0) {
-	    perror(fname);
-	    exit( 1 );
-    }
-
-    /* slurp the file */
-    num_lines = 0;
-    for (lptr = &my_lines[0]; (lptr - my_lines) < MAXLINES; lptr++) {
-	    char temp[BUFSIZ], *s, *d;
-	    int col;
-
-	    if (fgets(buf, sizeof(buf), fp) == 0)
-	        break;
-
-	    /* convert tabs so that shift will work properly */
-	    for (s = buf, d = temp, col = 0; (*d = *s) != '\0'; s++) {
-	        if (*d == '\n') {
-		        *d = '\0';
-		        break;
-	        } else if (*d == '\t') {
-		        col = (col | 7) + 1;
-		        while ((d - temp) != col)
-		            *d++ = ' ';
-	        } else
-#ifdef HAVE_WCHAR
-		        col++, d++;
-#else
-	            if (isprint(UChar(*d))) {
-		            col++;
-		            d++;
-	            } else {
-		            sprintf(d, "\\%03o", UChar(*s));
-		            d += strlen(d);
-		            col = (d - temp);
-	            }
-#endif
-	    }
-	    *lptr = ch_dup(temp);
-	    num_lines++;
-    }
-    (void) fclose(fp);
-    length = lptr - my_lines;
-
-    (void) initscr();		/* initialize the curses library */
-    keypad(stdscr, TRUE);	/* enable keyboard mapping */
-    (void) nonl();	 /* tell curses not to do NL->CR/NL on output */
-    (void) cbreak(); /* take input chars one at a time, no wait for \n */
-    (void) noecho();		/* don't echo input */
-    nodelay(stdscr, TRUE);
-    idlok(stdscr, TRUE);	/* allow use of insert/delete line */
-
-    if (try_color) {
-	    if (has_colors()) {
-	        start_color();
-	        init_pair(my_pair, COLOR_WHITE, COLOR_BLUE);
-	        bkgd(COLOR_PAIR(my_pair));
-	    } else {
-	        try_color = FALSE;
-	    }
-    }
-
-    lptr = my_lines;
-    while (!done) {
-	    int n;
-#ifdef HAVE_WCHAR
-        wint_t c = 0;
-        int ret;
-#else
-        int c = 0;
-#endif /* HAVE_WCHAR */
-
-	    if (!got_number)
-	        show_all(my_label);
-
-	    n = 0;
-	    for (;;) {
-            c = 0;
-#ifdef HAVE_WCHAR
-            ret = get_wch( &c );
-            if ( ret == ERR ) {
-	            if (!my_delay)
-		            napms(50);
-                continue;
-            }
-#ifdef DEBUG
-            else if ( ret == KEY_CODE_YES )
-                syslog( LOG_INFO, "[main]Func key(%x)", c );
-            else
-                syslog( LOG_INFO, "[main]c=%x", c );
-#endif /* DEBUG */
-#else
-	        c = getch();
-#ifdef DEBUG
-            syslog( LOG_INFO, "[main]c='%c'", c );
-#endif /* DEBUG */
-#endif /* HAVE_WCHAR */
-	        if ((c < 127) && isdigit(c)) {
-		        if (!got_number) {
-		            mvprintw(0, 0, "Count: ");
-		            clrtoeol();
-		        }
-		        addch(c);
-		        value = 10 * value + (c - '0');
-		        got_number = TRUE;
-	        } else
-		        break;
-	    }
-	    if (got_number && value) {
-	        n = value;
-	    } else {
-	        n = 1;
-	    }
-
-#ifdef HAVE_WCHAR
-	    if (ret != ERR)
-            my_label = key_name( c );
-        else
-	        if (!my_delay)
-		        napms(50);
-#else
-	    if (c != ERR)
-	        my_label = keyname(c);
-#endif /* HAVE_WCHAR */
-	    switch (c) {
-	        case KEY_DOWN:
-#ifdef HAVE_WCHAR
-            case L'n':
-#else
-	        case 'n':
-#endif /* HAVE_WCHAR */
-	            olptr = lptr;
-	            for (i = 0; i < n; i++)
-		            if ((lptr - my_lines) < (length - LINES + 1))
-		                lptr++;
-		            else
-		                break;
-	            wscrl(stdscr, lptr - olptr);
-	            break;
-
-	        case KEY_UP:
-#ifdef HAVE_WCHAR
-            case L'p':
-#else
-	        case 'p':
-#endif /* HAVE_WCHAR */
-	            olptr = lptr;
-	            for (i = 0; i < n; i++)
-		            if (lptr > my_lines)
-		                lptr--;
-		            else
-		                break;
-	            wscrl(stdscr, lptr - olptr);
-	            break;
-
-#ifdef HAVE_WCHAR
-            case L'h':
-#else
-	        case 'h':
-#endif /* HAVE_WCHAR */
-	        case KEY_HOME:
-	            lptr = my_lines;
-	            break;
-
-#ifdef HAVE_WCHAR
-            case L'e':
-#else
-	        case 'e':
-#endif /* HAVE_WCHAR */
-	        case KEY_END:
-	            if (length > LINES)
-		            lptr = my_lines + length - LINES + 1;
-	            else
-		            lptr = my_lines;
-	            break;
-
-#ifdef HAVE_WCHAR
-            case L'r':
-#else
-	        case 'r':
-#endif /* HAVE_WCHAR */
-	        case KEY_RIGHT:
-	            shift += n;
-	            break;
-
-#ifdef HAVE_WCHAR
-            case L'l':
-#else
-	        case 'l':
-#endif /* HAVE_WCHAR */
-	        case KEY_LEFT:
-	            shift -= n;
-	            if (shift < 0) {
-		            shift = 0;
-		            beep();
-	            }
-	            break;
-
-#ifdef HAVE_WCHAR
-            case L'q':
-#else
-	        case 'q':
-#endif /* HAVE_WCHAR */
-	            done = TRUE;
-	            break;
-
-#ifdef KEY_RESIZE
-	        case KEY_RESIZE:
-                //refresh();
-	            break;
-#endif
-#ifdef HAVE_WCHAR
-	        case L's':
-#else
-            case 's':
-#endif /* HAVE_WCHAR */
-	            if (got_number) {
-		            halfdelay(my_delay = n);
-	            } else {
-		            nodelay(stdscr, FALSE);
-		            my_delay = -1;
-	            }
-	            break;
-#ifdef HAVE_WCHAR
-            case L' ':
-#else
-	        case ' ':
-#endif /* HAVE_WCHAR */
-	            nodelay(stdscr, TRUE);
-	            my_delay = 0;
-	            break;
-#ifndef HAVE_WCHAR
-	        case ERR:
-	            if (!my_delay)
-		            napms(50);
-	            break;
-#endif /* HAVE_WCHAR */
-	        default:
-	            beep();
-	            break;
-	    }
-	    if (c >= KEY_MIN || (c > 0 && !isdigit(c))) {
-	        got_number = FALSE;
-	        value = 0;
-	    }
-    }
-
-    finish(0);			/* we're done */
-}
-
-static void finish(int sig)
-{
-    endwin();
-    exit(sig != 0 ?  1 : 0 );
-}
-
-static void show_all(const char *tag)
-{
-    int i;
-    char temp[BUFSIZ];
-    CURSES_CH_T *s;
-    time_t this_time;
-
-    sprintf(temp, "%s (%3dx%3d) col %d ", tag, LINES, COLS, shift);
-    i = strlen(temp);
-    sprintf(temp + i, "view %.*s", (int) (sizeof(temp) - 7 - i), fname);
-    move(0, 0);
-    printw("%.*s", COLS, temp);
-    clrtoeol();
-    this_time = time((time_t *) 0);
-    strcpy(temp, ctime(&this_time));
-    if ((i = strlen(temp)) != 0) {
-	    temp[--i] = 0;
-	    if (move(0, COLS - i - 2) != ERR)
-	        printw("  %s", temp);
-    }
-
-    scrollok(stdscr, FALSE);	/* prevent screen from moving */
-    for (i = 1; i < LINES; i++) {
-	    move(i, 0);
-	    printw("%3ld:", (long) (lptr + i - my_lines));
-	    clrtoeol();
-	    if ((s = lptr[i - 1]) != 0) {
-		    if (i < num_lines) {
-			    int len = ch_len(s);
-			    if (len > shift) {
-#ifdef HAVE_WCHAR
-				    add_wchstr(s + shift);
-#else
-				    addchstr(s + shift);
-#endif
-			    }
-		    }
-	    }
-    }
-    setscrreg(1, LINES - 1);
-    scrollok(stdscr, TRUE);
-    refresh();
-}
diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
deleted file mode 100644
index d25b7a25f..000000000
--- a/lib/libcurses/Makefile
+++ /dev/null
@@ -1,192 +0,0 @@
-#	$NetBSD: Makefile,v 1.71 2014/07/05 22:31:32 dholland Exp $
-#	@(#)Makefile	8.2 (Berkeley) 1/2/94
-
-.include <bsd.own.mk>
-
-.if defined(__MINIX)
-# /usr/minix/src-clang/lib/libcurses/get_wch.c:646:15: error: comparison of unsigned expression < 0 is always false [-Werror,-Wtautological-compare]
-WARNS=0
-.else
-WARNS=	2
-.endif
-
-CPPFLAGS+=-I${.CURDIR} -I${NETBSDSRCDIR}/lib/libterminfo
-.if defined(DEBUG_CURSES)
-CPPFLAGS+=-g -DDEBUG
-.endif
-.if defined(SMALL)
-CPPFLAGS+=-DSMALL
-.endif
-LIB=	curses
-SRCS=	acs.c addbytes.c addch.c addchnstr.c addnstr.c attributes.c \
-	background.c bell.c border.c box.c chgat.c clear.c clearok.c \
-	clrtobot.c clrtoeol.c color.c copywin.c cr_put.c \
-	ctrace.c cur_hash.c curs_set.c \
-	curses.c delch.c deleteln.c delwin.c echochar.c erase.c fileio.c \
-	flushok.c fullname.c getch.c getstr.c getyx.c id_subwins.c idlok.c \
-	idcok.c inch.c inchstr.c initscr.c insch.c insdelln.c insertln.c \
-	instr.c keypad.c keyname.c leaveok.c line.c meta.c move.c \
-	mvwin.c newwin.c nodelay.c notimeout.c overlay.c overwrite.c pause.c \
-	printw.c putchar.c refresh.c resize.c scanw.c screen.c scroll.c \
-	scrollok.c setterm.c standout.c timeout.c toucholap.c touchwin.c \
-	tstp.c tty.c unctrl.c underscore.c
-
-MAN=	curses.3 curses_addch.3 curses_addchstr.3 curses_addstr.3 \
-	curses_attributes.3 curses_background.3 curses_border.3 \
-	curses_chgat.3 curses_clear.3 curses_color.3 \
-	curses_cursor.3 curses_default_colors.3 \
-	curses_delch.3 curses_deleteln.3 curses_echochar.3 curses_fileio.3 \
-	curses_inch.3 curses_input.3 curses_insertch.3 curses_insertln.3 \
-	curses_insdelln.3 curses_keyname.3 curses_line.3 curses_pad.3 \
-	curses_print.3 curses_refresh.3 curses_scanw.3 curses_screen.3 \
-	curses_scroll.3 curses_standout.3 curses_termcap.3 curses_touch.3 \
-	curses_tty.3 curses_underscore.3 curses_window.3
-INCS=	curses.h unctrl.h
-INCSDIR=/usr/include
-
-LIBDPLIBS+=	terminfo	${.CURDIR}/../libterminfo
-
-.if !defined(DISABLE_WCHAR)
-CPPFLAGS+=-DHAVE_WCHAR
-SRCS+= cchar.c add_wch.c add_wchstr.c addwstr.c echo_wchar.c ins_wch.c \
-	insstr.c ins_wstr.c get_wch.c get_wstr.c in_wch.c in_wchstr.c \
-	inwstr.c
-.else
-CPPFLAGS+=-DDISABLE_WCHAR
-.endif
-
-MLINKS+= curses_addch.3 addch.3 curses_addchstr.3 addchnstr.3 \
-	 curses_addchstr.3 addchstr.3 curses_addstr.3 addnstr.3 \
-	 curses_addstr.3 addstr.3 \
-	 curses_default_colors.3 assume_default_colors.3 \
-	 curses_attributes.3 attr_get.3 curses_attributes.3 attr_off.3 \
-	 curses_attributes.3 attr_on.3 curses_attributes.3 attr_set.3 \
-	 curses_attributes.3 attron.3 curses_attributes.3 attroff.3 \
-	 curses_attributes.3 attrset.3 curses_tty.3 beep.3 \
-	 curses_background.3 bkgd.3 curses_background.3 bkgdset.3 \
-	 curses_border.3 border.3 curses_border.3 box.3 \
-	 curses_chgat.3 chgat.3 curses_chgat.3 mvchgat.3 \
-	 curses_chgat.3 mvwchgat.3 curses_chgat.3 wchgat.3 \
-	 curses_color.3 can_change_color.3 curses_tty.3 cbreak.3 \
-	 curses_clear.3 clear.3 curses_clear.3 clearok.3 \
-	 curses_clear.3 clrtobot.3 curses_clear.3 clrtoeol.3 \
-	 curses_color.3 color_content.3 curses_attributes.3 color_set.3 \
-	 curses_window.3 copywin.3 curses_tty.3 curs_set.3 \
-	 curses_input.3 define_key.3 \
-	 curses_tty.3 delay_output.3  curses_tty.3 def_prog_mode.3 \
-	 curses_tty.3 def_shell_mode.3 curses_delch.3 delch.3 \
-	 curses_deleteln.3 deleteln.3 curses_screen.3 delscreen.3 \
-	 curses_window.3 delwin.3 curses_window.3 derwin.3 \
-	 curses_refresh.3 doupdate.3 curses_window.3 dupwin.3 \
-	 curses_tty.3 echo.3 curses_echochar.3 echochar.3 \
-	 curses_screen.3 endwin.3 curses_clear.3 erase.3 \
-	 curses_tty.3 erasechar.3 \
-	 curses_tty.3 flash.3 curses_tty.3 flushinp.3 \
-	 curses_refresh.3 flushok.3 \
-	 curses_termcap.3 fullname.3 curses_attributes.3 getattrs.3  \
-	 curses_background.3 getbkgd.3 \
-	 curses_input.3 getch.3 curses_cursor.3 getcury.3 \
-	 curses_cursor.3 getcurx.3 curses_cursor.3 getbegy.3 \
-	 curses_cursor.3 getbegx.3 curses_cursor.3 getmaxx.3 \
-	 curses_cursor.3 getmaxy.3 curses_cursor.3 getmaxyx.3 \
-	 curses_input.3 getnstr.3 \
-	 curses_cursor.3 getpary.3 curses_cursor.3 getparx.3 \
-	 curses_cursor.3 getparyx.3 curses_fileio.3 getwin.3 \
-	 curses_input.3 getstr.3 \
-	 curses_tty.3 gettmode.3 curses_cursor.3 getyx.3 \
-	 curses_color.3 has_colors.3 curses_tty.3 has_ic.3 \
-	 curses_tty.3 halfdelay.3 curses_tty.3 has_il.3 \
-	 curses_line.3 hline.3 curses_tty.3 idcok.3 \
-	 curses_tty.3 idlok.3 curses_inch.3 inch.3 \
-	 curses_inch.3 inchnstr.3 curses_inch.3 inchstr.3 \
-	 curses_inch.3 innstr.3 curses_color.3 init_color.3 \
-	 curses_color.3 init_pair.3 curses_screen.3 initscr.3 \
-	 curses_insertch.3 insch.3 curses_insdelln.3 insdelln.3 \
-	 curses_insertln.3 insertln.3 curses_inch.3 instr.3 \
-	 curses_tty.3 intrflush.3 curses_touch.3 is_linetouched.3 \
-	 curses_touch.3 is_wintouched.3 curses_screen.3 isendwin.3 \
-	 curses_keyname.3 keyname.3 \
-	 curses_input.3 keypad.3 curses_tty.3 killchar.3 \
-	 curses_refresh.3 leaveok.3 \
-	 curses_tty.3 meta.3 curses_cursor.3 move.3 \
-	 curses_addch.3 mvaddch.3 curses_addchstr.3 mvaddchnstr.3 \
-	 curses_addchstr.3 mvaddchstr.3 curses_addstr.3 mvaddnstr.3 \
-	 curses_addstr.3 mvaddstr.3 \
-	 curses_cursor.3 mvcur.3 curses_window.3 mvderwin.3 \
-	 curses_input.3 mvgetch.3 \
-	 curses_input.3 mvgetnstr.3 curses_input.3 mvgetstr.3 \
-	 curses_line.3 mvhline.3 curses_print.3 mvprintw.3 \
-	 curses_line.3 mvvline.3 curses_addch.3 mvwaddch.3 \
-	 curses_addchstr.3 mvwaddchnstr.3 curses_addchstr.3 mvwaddchstr.3 \
-	 curses_addstr.3 mvwaddnstr.3 curses_addstr.3 mvwaddstr.3 \
-	 curses_input.3 mvwgetch.3 \
-	 curses_input.3 mvwgetnstr.3 curses_input.3 mvwgetstr.3 \
-	 curses_line.3 mvwhline.3 curses_window.3 mvwin.3 \
-	 curses_inch.3 mvinchnstr.3 \
-	 curses_inch.3 mvinchstr.3 curses_inch.3 mvinnstr.3 \
-	 curses_inch.3 mvinstr.3 curses_inch.3 mvwinchnstr.3 \
-	 curses_inch.3 mvwinchstr.3 curses_inch.3 mvwinnstr.3 \
-	 curses_inch.3 mvwinstr.3 curses_print.3 mvwprintw.3 \
-	 curses_line.3 mvwvline.3 curses_tty.3 napms.3 \
-	 curses_pad.3 newpad.3 curses_screen.3 newterm.3 \
-	 curses_window.3 newwin.3 curses_tty.3 nl.3 \
-	 curses_tty.3 nocbreak.3 curses_input.3 nodelay.3 \
-	 curses_tty.3 noecho.3 curses_tty.3 nonl.3 \
-	 curses_tty.3 noqiflush.3 \
-	 curses_tty.3 noraw.3 curses_input.3 notimeout.3 \
-	 curses_window.3 overlay.3 curses_window.3 overwrite.3 \
-	 curses_color.3 pair_content.3 curses_echochar.3 pechochar.3 \
-	 curses_pad.3 pnoutrefresh.3 \
-	 curses_pad.3 prefresh.3 curses_print.3 printw.3 \
-	 curses_fileio.3 putwin.3 curses_tty.3 qiflush.3 \
-	 curses_tty.3 raw.3 curses_refresh.3 refresh.3 \
-	 curses_tty.3 reset_prog_mode.3 curses_tty.3 reset_shell_mode.3 \
-	 curses_tty.3 resetty.3 curses_screen.3 resizeterm.3 \
-	 curses_tty.3 savetty.3 curses_scanw.3 scanw.3 \
-	 curses_scroll.3 scrl.3 curses_scroll.3 scroll.3 \
-	 curses_scroll.3 scrollok.3 curses_scroll.3 setscrreg.3 \
-	 curses_screen.3 set_term.3 curses_screen.3 setterm.3 \
-	 curses_standout.3 standend.3 curses_standout.3 standout.3 \
-	 curses_color.3 start_color.3 curses_pad.3 subpad.3 \
-	 curses_window.3 subwin.3 curses_input.3 timeout.3 \
-	 curses_touch.3 touchline.3 curses_touch.3 touchoverlap.3 \
-	 curses_touch.3 touchwin.3 curses_print.3 unctrl.3 \
-	 curses_underscore.3 underend.3 curses_underscore.3 underscore.3 \
-	 curses_input.3 ungetch.3 curses_touch.3 untouchwin.3 \
-	 curses_default_colors.3 use_default_colors.3 curses_line.3 vline.3 \
-	 curses_addch.3 waddch.3 curses_addchstr.3 waddchnstr.3 \
-	 curses_addchstr.3 waddchstr.3 curses_addstr.3 waddnstr.3 \
-	 curses_addstr.3 waddstr.3 \
-	 curses_attributes.3 wattr_get.3 curses_attributes.3 wattr_off.3 \
-	 curses_attributes.3 wattr_on.3 curses_attributes.3 wattr_set.3 \
-	 curses_attributes.3 wattron.3 curses_attributes.3 wattroff.3 \
-	 curses_attributes.3 wattrset.3 curses_background.3 wbkgd.3 \
-	 curses_background.3 wbkgdset.3 curses_border.3 wborder.3 \
-	 curses_clear.3 wclear.3 curses_clear.3 wclrtobot.3 \
-	 curses_clear.3 wclrtoeol.3 curses_attributes.3 wcolor_set.3 \
-	 curses_delch.3 wdelch.3 curses_deleteln.3 wdeleteln.3 \
-	 curses_echochar.3 wechochar.3 \
-	 curses_clear.3 werase.3 curses_input.3 wgetch.3 \
-	 curses_input.3 wgetnstr.3 curses_input.3 wgetstr.3 \
-	 curses_line.3 whline.3 curses_inch.3 winch.3 \
-	 curses_inch.3 winchnstr.3 curses_inch.3 winchstr.3 \
-	 curses_inch.3 winnstr.3 curses_insertch.3 winsch.3 \
-	 curses_insdelln.3 winsdelln.3 curses_insertln.3 winsertln.3 \
-	 curses_inch.3 winstr.3 curses_cursor.3 wmove.3 \
-	 curses_refresh.3 wnoutrefresh.3 curses_print.3 wprintw.3 \
-	 curses_refresh.3 wrefresh.3 curses_window.3 wresize.3 \
-	 curses_scanw.3 wscanw.3 curses_scroll.3 wscrl.3 \
-	 curses_scroll.3 wsetscrreg.3 curses_standout.3 wstandend.3 \
-	 curses_standout.3 wstandout.3 curses_input.3 wtimeout.3 \
-	 curses_touch.3 wtouchln.3 curses_underscore.3 wunderend.3 \
-	 curses_underscore.3 wunderscore.3 curses_line.3 wvline.3
-
-.if !defined(__MINIX)
-SUBDIR+= PSD.doc
-.endif # !defined(__MINIX)
-
-fileio.h: shlib_version genfileioh.awk
-	${TOOL_AWK} -f ${.CURDIR}/genfileioh.awk < ${.CURDIR}/shlib_version > ${.CURDIR}/fileio.h
-
-.include <bsd.lib.mk>
-.include <bsd.subdir.mk>
diff --git a/lib/libcurses/PSD.doc/Makefile b/lib/libcurses/PSD.doc/Makefile
deleted file mode 100644
index 256b6c291..000000000
--- a/lib/libcurses/PSD.doc/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#	$NetBSD: Makefile,v 1.14 2014/07/15 13:27:58 christos Exp $
-#	from: @(#)Makefile	8.2 (Berkeley) 5/23/94
-
-SECTION=reference/ref3
-ARTICLE=curses
-SRCS=	Master
-CEXAMPLES= ex1.gr ex2.gr life.gr twinkle1.gr twinkle2.gr win_st.gr
-DEPSRCS=appen.A appen.B appen.C doc.I doc.II doc.III doc.IV fns.doc \
-	intro.0 intro.1 intro.2.tbl intro.3 intro.4 intro.5 intro.6 \
-	macros c_macros $(CEXAMPLES)
-MACROS=	-me
-CLEANFILES+= ${CEXAMPLES} intro.2.tbl
-
-.SUFFIXES:
-.SUFFIXES: .c .gr
-
-#
-# this section formats C input source into nice troffable (or nroffable)
-# versions.  It uses the capabilites of "vgrind", which sets keywords in
-# bold font, and comments in italics.
-#
-
-# Don't re-run vgrind unless you want to patch the output files.
-
-.c.gr:
-	${TOOL_VFONTEDPR} ${.IMPSRC} | grep -v "^'wh" > ${.TARGET}
-
-# Unfortunately our make doesn't handle single-suffix rules.
-intro.2.tbl: intro.2
-	${TOOL_TBL} ${.ALLSRC} > ${.TARGET}
-
-.include <bsd.doc.mk>
diff --git a/lib/libcurses/PSD.doc/Master b/lib/libcurses/PSD.doc/Master
deleted file mode 100644
index 0af37df05..000000000
--- a/lib/libcurses/PSD.doc/Master
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"	$NetBSD: Master,v 1.5 2003/08/07 16:44:26 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)Master	8.2 (Berkeley) 5/24/94
-.\"
-.ds Ln Screen Package
-.so macros
-.so c_macros
-.so intro.0
-.pn 3
-.bp
-.so intro.1
-.so intro.2.tbl
-.so intro.3
-.so intro.4
-.so intro.5
-.so intro.6
-.bp
-.so appen.A
-.pn 2
-.oh '\*(Ln''PSD:19-%'
-.eh 'PSD:19-%''\*(Ln'
-.bp
-.bi Contents
-.sp
-.xp
diff --git a/lib/libcurses/PSD.doc/appen.A b/lib/libcurses/PSD.doc/appen.A
deleted file mode 100644
index c707d85bd..000000000
--- a/lib/libcurses/PSD.doc/appen.A
+++ /dev/null
@@ -1,77 +0,0 @@
-.\"	$NetBSD: appen.A,v 1.7 2003/08/07 16:44:26 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)appen.A	8.1 (Berkeley) 6/8/93
-.\"
-.ie t .oh '\*(Ln Appendix A''PS1:19-%'
-.eh 'PS1:19-%''\*(Ln Appendix A'
-.el .he ''\fIAppendix A\fR''
-.bp
-.(x
-.ti 0
-.b "Appendix A"
-.)x
-.sh 1 "Examples" 1
-.pp
-Here we present a few examples
-of how to use the package.
-They attempt to be representative,
-though not comprehensive.
-Further examples can be found in the games section
-of the source tree and in various utilities that use the screen such as
-.i systat(1) .
-.pp
-The following examples are intended to demonstrate
-the basic structure of a program
-using the package.
-An additional, more comprehensive, program can be found in
-the source code in the
-\fIexamples\fP subdirectory.
-.sh 2 "Simple Character Output"
-.pp
-This program demonstrates how to set up a window and output characters to it.
-Also, it demonstrates how one might control the output to the window.
-If you run this program, you will get a demonstration of the character output
-chracteristics discussed in the above Character Output section.
-.(l I
-.so ex1.gr
-.)l
-.sh 2 "Twinkle"
-.pp
-This is a moderately simple program which prints
-patterns on the screen.
-It switches between patterns of asterisks,
-putting them on one by one in random order,
-and then taking them off in the same fashion.
-It is more efficient to write this
-using only the motion optimization,
-as is demonstrated below.
-.(l I
-.so twinkle1.gr
-.)l
diff --git a/lib/libcurses/PSD.doc/appen.B b/lib/libcurses/PSD.doc/appen.B
deleted file mode 100644
index 5a41fe035..000000000
--- a/lib/libcurses/PSD.doc/appen.B
+++ /dev/null
@@ -1,199 +0,0 @@
-.\"	$NetBSD: appen.B,v 1.5 2003/08/07 16:44:26 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)appen.B	8.1 (Berkeley) 6/8/93
-.\"
-.ie t .oh '\*(Ln Appendix B''PS1:19-%'
-.eh 'PS1:19-%''\*(Ln Appendix B'
-.el .he ''\fIAppendix B\fR''
-.bp
-.(x
-.ti 0
-.b "Appendix B"
-.)x
-.nr $1 0
-.sh 1 "The WINDOW structure"
-.pp
-The WINDOW structure is defined as follows:
-.(l I
-.so win_st.gr
-.)l
-.pp
-.Vn \*_cury \\*
-.(f
-\**
-All variables not normally accessed directly by the user
-are named with an initial
-.Bq \*_
-to avoid conflicts with the user's variables.
-.)f
-and
-.Vn \*_curx
-are the current \*y for the window.
-New characters added to the screen
-are added at this point.
-.Vn \*_maxy
-and
-.Vn \*_maxx
-are the maximum values allowed for
-.Vn \*_cury\*,\*_curx ). (
-.Vn \*_begy
-and
-.Vn \*_begx
-are the starting \*y on the terminal for the window,
-.i i.e. ,
-the window's home.
-.Vn \*_cury ,
-.Vn \*_curx ,
-.Vn \*_maxy ,
-and
-.Vn \*_maxx
-are measured relative to
-.Vn \*_begy\*,\*_begx ), (
-not the terminal's home.
-.pp
-.Vn \*_clear
-tells if a clear-screen sequence is to be generated
-on the next
-.Fn refresh
-call.
-This is only meaningful for screens.
-The initial clear-screen for the first
-.Fn refresh
-call is generated by initially setting clear to be TRUE for
-.Vn curscr ,
-which always generates a clear-screen if set,
-irrelevant of the dimensions of the window involved.
-.Vn \*_leave
-is TRUE if the current \*y and the cursor
-are to be left after the last character changed on the terminal,
-or not moved if there is no change.
-.Vn \*_scroll
-is TRUE
-if scrolling is allowed.
-.pp
-.Vn \*_y
-is a pointer to an array of lines which describe the terminal.
-Thus:
-.(l
-\*_y[i]
-.)l
-.lp
-is a pointer to the
-.Vn i th
-line, and
-.(l
-\*_y[i][j]
-.)l
-.lp
-is the
-.Vn j th
-character on the
-.Vn i th
-line.
-.Vn \*_flags
-can have one or more values
-or'd into it.
-.pp
-For windows that are not subwindows,
-.Vn \*_orig
-is
-NULL .
-For subwindows,
-it points to the main window
-to which the window is subsidiary.
-.Vn \*_nextp
-is a pointer in a circularly linked list
-of all the windows which are subwindows of the same main window,
-plus the main window itself.
-.pp
-.Vn \*_firstch
-and
-.Vn \*_lastch
-are
-.Fn malloc ed
-arrays which contain the index of the
-first and last changed characters
-on the line.
-.Vn \*_ch\*_off
-is the x offset for the window
-in the
-.Vn \*_firstch
-and
-.Vn \*_lastch
-arrays for this window.
-For main windows,
-this is always 0;
-for subwindows
-it is the difference between the starting point of the main window
-and that of the subindow,
-so that change markers can be set relative to the main window.
-This makes these markers global in scope.
-.pp
-All subwindows share the appropriate portions of
-.Vn _y ,
-.Vn _firstch ,
-.Vn _lastch ,
-and
-.Vn _insdel
-with their main window.
-.pp
-.b \*_ENDLINE
-says that the end of the line for this window
-is also the end of a screen.
-.b \*_FULLWIN
-says that this window is a screen.
-.b \*_SCROLLWIN
-indicates that the last character of this screen
-is at the lower right-hand corner of the terminal;
-.i i.e. ,
-if a character was put there,
-the terminal would scroll.
-.b \*_FULLLINE
-says that the width of a line is the same as the width of the terminal.
-If
-.b \*_FLUSH
-is set,
-it says that
-.Fn fflush "" "" stdout
-should be called at the end of each
-.Fn refresh
-.b \*_STANDOUT
-says that all characters added to the screen
-are in standout mode.
-.b \*_INSDEL
-is reserved for future use,
-and is set by
-.Fn idlok .
-.Vn \*_firstch
-is set to
-.b \*_NOCHANGE
-for lines on which there has been no change
-since the last
-.Fn refresh .
diff --git a/lib/libcurses/PSD.doc/appen.C b/lib/libcurses/PSD.doc/appen.C
deleted file mode 100644
index ce12a2ea7..000000000
--- a/lib/libcurses/PSD.doc/appen.C
+++ /dev/null
@@ -1,126 +0,0 @@
-.\"	$NetBSD: appen.C,v 1.7 2003/08/07 16:44:26 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)appen.C	8.1 (Berkeley) 6/8/93
-.\"
-.ie t .oh '\*(Ln Appendix A''PS1:19-%'
-.eh 'PS1:19-%''\*(Ln Appendix A'
-.el .he ''\fIAppendix A\fR''
-.bp
-.(x
-.ti 0
-.b "Appendix A"
-.)x
-.sh 1 "Examples" 1
-.pp
-Here we present a few examples
-of how to use the package.
-They attempt to be representative,
-though not comprehensive.
-Further examples can be found in the games section
-of the source tree and in various utilities that use the screen such as
-.i systat(1) .
-.sh 2 "Screen Updating"
-.pp
-The following examples are intended to demonstrate
-the basic structure of a program
-using the screen updating sections of the package.
-Several of the programs require calculational sections
-which are irrelevant of to the example,
-and are therefore usually not included.
-It is hoped that the data structure definitions
-give enough of an idea to allow understanding
-of what the relevant portions do.
-.sh 3 "Simple Character Output"
-.pp
-This program demonstrates how to set up a window and output characters to it.
-Also, it demonstrates how one might control the output to the window.
-If you run this program, you will get a demonstration of the character output
-chracteristics discussed in the above Character Output section.
-.(l I
-.so t2.gr
-.)l
-.sh 3 "A Small Screen Manipulator"
-.pp
-The next example follows the lines of the previous one but extends then to
-demonstrate the various othe uses of the package.
-Make sure you understand how this program works as it encompasses most of
-anything you will need to do with the package.
-.(l I
-.so t3.gr
-.)l
-.sh 3 "Twinkle"
-.pp
-This is a moderately simple program which prints
-patterns on the screen.
-It switches between patterns of asterisks,
-putting them on one by one in random order,
-and then taking them off in the same fashion.
-It is more efficient to write this
-using only the motion optimization,
-as is demonstrated below.
-.(l I
-.so twinkle1.gr
-.)l
-.sh 3 "Life"
-.pp
-This program fragment models the famous computer pattern game of life
-(Scientific American, May, 1974).
-The calculational routines create a linked list of structures
-defining where each piece is.
-Nothing here claims to be optimal,
-merely demonstrative.
-This code, however,
-is a very good place to use the screen updating routines,
-as it allows them to worry about what the last position looked like,
-so you don't have to.
-It also demonstrates some of the input routines.
-.(l I
-.so life.gr
-.)l
-.sh 2 "Motion optimization"
-.pp
-The following example shows how motion optimization
-is written on its own.
-Programs which flit from one place to another without
-regard for what is already there
-usually do not need the overhead of both space and time
-associated with screen updating.
-They should instead use motion optimization.
-.sh 3 "Twinkle"
-.pp
-The
-.b twinkle
-program
-is a good candidate for simple motion optimization.
-Here is how it could be written
-(only the routines that have been changed are shown):
-.(l
-.so twinkle2.gr
-.)l
diff --git a/lib/libcurses/PSD.doc/c_macros b/lib/libcurses/PSD.doc/c_macros
deleted file mode 100644
index ba039363e..000000000
--- a/lib/libcurses/PSD.doc/c_macros
+++ /dev/null
@@ -1,68 +0,0 @@
-.\"	$NetBSD: c_macros,v 1.5 2003/08/07 16:44:26 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)c_macros	8.1 (Berkeley) 6/4/93
-.\"
-'ie t 'ds _ \d\(mi\u
-'el 'ds _ _
-'tr *\(**
-'ps 9p
-'vs 10p
-'ds - \(mi
-'ds /* \\h'\\w' 'u-\\w'/'u'/*
-'bd B 3
-'bd S B 3
-'nr cm 0
-'nf
-'de ()
-'pn 1
-..
-'de +C
-'nr cm 1
-'ft 2
-'ds +K
-'ds -K
-..
-'de -C
-'nr cm 0
-'ft 1
-.ie t 'ds +K \f3
-.el 'ds +K \fI
-'ds -K \fP
-..
-'+C
-'-C
-'am +C
-'ne 3
-..
-'de -F
-'rm =f
-..
-'ft 1
-'lg 0
diff --git a/lib/libcurses/PSD.doc/doc.I b/lib/libcurses/PSD.doc/doc.I
deleted file mode 100644
index 01bb3fc17..000000000
--- a/lib/libcurses/PSD.doc/doc.I
+++ /dev/null
@@ -1,347 +0,0 @@
-.\"	$NetBSD: doc.I,v 1.5 2003/08/07 16:44:27 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)doc.I	8.1 (Berkeley) 6/4/93
-.\"
-.Ds
-.Fd addch ch \*m
-char	ch;
-.Fd waddch win\*,ch
-WINDOW	*win;
-char	ch;
-.De
-Add the character
-.Vn ch
-on the window
-at the current \*y.
-If the character is a newline
-(\'\en\')
-the line will be cleared to the end,
-and the current \*y will be changed to the
-beginning off the next line
-if newline mapping is on,
-or to the next line at the same x co-ordinate
-if it is off.
-A return
-(\'\er\')
-will move to the beginning of the line on the window.
-Tabs
-(\'\et\')
-will be expanded into spaces
-in the normal tabstop positions of
-every eight characters.
-\*(Es
-.Ds
-.Fd addstr str \*m
-char	*str;
-.Fd waddstr win\*,str
-WINDOW	*win;
-char	*str;
-.De
-Add the string pointed to by
-.Vn str
-on the window at the current \*y.
-\*(Es
-In this case, it will put on as much as it can.
-.Ds
-.Fd box win\*,vert\*,hor
-WINDOW	*win;
-char	vert\*,hor;
-.De
-.Pp
-Draws a box around the window using
-.Vn vert
-as the character for drawing the vertical sides, and
-.Vn hor
-for drawing the horizontal lines.
-If scrolling is not allowed,
-and the window encompasses the lower right-hand corner of the terminal,
-the corners are left blank to avoid a scroll.
-.Ds
-.Fd clear "" \*m
-.Fd wclear win
-WINDOW	*win;
-.De
-Resets the entire window to blanks.
-If
-.Vn win
-is a screen,
-this sets the clear flag,
-which will cause a clear-screen sequence to be sent
-on the next
-.Fn refresh
-call.
-This also moves the current \*y
-to (0\*,0).
-.Ds
-.Fd clearok scr\*,boolf \*m
-WINDOW	*scr;
-bool	boolf;
-.De
-Sets the clear flag for the screen
-.Vn scr .
-If
-.Vn boolf
-is TRUE,
-this will force a clear-screen to be printed on the next
-.Fn refresh ,
-or stop it from doing so if
-.Vn boolf
-is FALSE.
-This only works on screens,
-and,
-unlike
-.Fn clear ,
-does not alter the contents of the screen.
-If
-.Vn scr
-is
-.Vn curscr ,
-the next
-.Fn refresh
-call will cause a clear-screen,
-even if the window passed to
-.Fn refresh
-is not a screen.
-.Ds
-.Fd clrtobot "" \*m
-.Fd wclrtobot win
-WINDOW	*win;
-.De
-Wipes the window clear from the current \*y to the bottom.
-This does not force a clear-screen sequence on the next refresh
-under any circumstances.
-\*(Nm
-.Ds
-.Fd clrtoeol "" \*m
-.Fd wclrtoeol win
-WINDOW	*win;
-.De
-Wipes the window clear from the current \*y to the end of the line.
-\*(Nm
-.Ds
-.Fd delch
-.Fd wdelch win
-WINDOW	*win;
-.De
-Delete the character at the current \*y.
-Each character after it on the line shifts to the left,
-and the last character becomes blank.
-.Ds
-.Fd deleteln
-.Fd wdeleteln win
-WINDOW	*win;
-.De
-Delete the current line.
-Every line below the current one will move up,
-and the bottom line will become blank.
-The current \*y will remain unchanged.
-.Ds
-.Fd erase "" \*m
-.Fd werase win
-WINDOW	*win;
-.De
-Erases the window to blanks without setting the clear flag.
-This is analagous to
-.Fn clear ,
-except that it never causes a clear-screen sequence to be generated
-on a
-.Fn refresh .
-\*(Nm
-.Ds
-.Fd flushok win\*,boolf \*m
-WINDOW	*win;
-bool	boolf;
-.De
-Normally,
-.Fn refresh
-.Fn fflush 's
-.Vn stdout
-when it is finished.
-.Fn flushok
-allows you to control this.
-if
-.Vn boolf
-is TRUE
-(\c
-.i i.e. ,
-non-zero)
-it will do the
-.Fn fflush ;
-if it is FALSE.
-it will not.
-.Ds
-.Fd idlok win\*,boolf
-WINDOW	*win;
-bool	boolf;
-.De
-Reserved for future use.
-This will eventually signal to
-.Fn refresh
-that it is all right to use the insert and delete line sequences
-when updating the window.
-.Ds
-.Fd insch c
-char	c;
-.Fd winsch win\*,c
-WINDOW	*win;
-char	c;
-.De
-Insert
-.Vn c
-at the current \*y
-Each character after it shifts to the right,
-and the last character disappears.
-\*(Es
-.Ds
-.Fd insertln
-.Fd winsertln win
-WINDOW	*win;
-.De
-Insert a line above the current one.
-Every line below the current line
-will be shifted down,
-and the bottom line will disappear.
-The current line will become blank,
-and the current \*y will remain unchanged.
-.Ds
-.Fd move y\*,x \*m
-int	y\*,x;
-.Fd wmove win\*,y\*,x
-WINDOW	*win;
-int	y\*,x;
-.De
-Change the current \*y of the window to
-.Vn y\*,x ). (
-\*(Es
-.Ds
-.Fd overlay win1\*,win2
-WINDOW	*win1\*,*win2;
-.De
-Overlay
-.Vn win1
-on
-.Vn win2 .
-The contents of
-.Vn win1 ,
-insofar as they fit,
-are placed on
-.Vn win2
-at their starting \*y.
-This is done non-destructively,
-i.e., blanks on
-.Vn win1
-leave the contents of the space on
-.Vn win2
-untouched.
-.Ds
-.Fd overwrite win1\*,win2
-WINDOW	*win1\*,*win2;
-.De
-Overwrite
-.Vn win1
-on
-.Vn win2 .
-The contents of
-.Vn win1 ,
-insofar as they fit,
-are placed on
-.Vn win2
-at their starting \*y.
-This is done destructively,
-.i i.e. ,
-blanks on
-.Vn win1
-become blank on
-.Vn win2 .
-.Ds
-.Fd printw fmt\*,arg1\*,arg2\*,...
-char	*fmt;
-.Fd wprintw win\*,fmt\*,arg1\*,arg2\*,...
-WINDOW	*win;
-char	*fmt;
-.De
-Performs a
-.Fn printf
-on the window starting at the current \*y.
-It uses
-.Fn addstr
-to add the string on the window.
-It is often advisable to use the field width options of
-.Fn printf
-to avoid leaving things on the window from earlier calls.
-\*(Es
-.Ds
-.Fd refresh "" \*m
-.Fd wrefresh win
-WINDOW	*win;
-.De
-Synchronize the terminal screen with the desired window.
-If the window is not a screen,
-only that part covered by it is updated.
-\*(Es
-In this case, it will update whatever it can
-without causing the scroll.
-.sp
-As a special case,
-if
-.Fn wrefresh
-is called with the window
-.Vn curscr
-the screen is cleared
-and repainted as it is currently.
-This is very useful for allowing the redrawing of the screen
-when the user has garbage dumped on his terminal.
-.Ds
-.Fd standout "" \*m
-.Fd wstandout win
-WINDOW	*win;
-.Fd standend "" \*m
-.Fd wstandend win
-WINDOW	*win;
-.De
-Start and stop putting characters onto
-.i win
-in standout mode.
-.Fn standout
-causes any characters added to the window
-to be put in standout mode on the terminal
-(if it has that capability).
-.Fn standend
-stops this.
-The sequences
-.Vn SO
-and
-.Vn SE
-(or
-.Vn US
-and
-.Vn UE
-if they are not defined)
-are used (see Appendix A).
diff --git a/lib/libcurses/PSD.doc/doc.II b/lib/libcurses/PSD.doc/doc.II
deleted file mode 100644
index 7209da0d6..000000000
--- a/lib/libcurses/PSD.doc/doc.II
+++ /dev/null
@@ -1,140 +0,0 @@
-.\"	$NetBSD: doc.II,v 1.5 2003/08/07 16:44:27 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)doc.II	8.1 (Berkeley) 6/4/93
-.\"
-.Ds
-.Fd cbreak "" \*m
-.Fd nocbreak "" \*m
-.Fd crmode "" \*m
-.Fd nocrmode "" \*m
-.De
-Set or unset the terminal to/from cbreak mode.
-The misnamed macros
-.Fn crmode
-and
-.Fn nocrmode
-are retained for backwards compatibility
-with ealier versions of the library.
-.Ds
-.Fd echo "" \*m
-.Fd noecho "" \*m
-.De
-Sets the terminal to echo or not echo characters.
-.Ds
-.Fd getch "" \*m
-.Fd wgetch win
-WINDOW	*win;
-.De
-Gets a character from the terminal and (if necessary)
-echos it on the window.
-\*(Es
-Otherwise, the character gotten is returned.
-If
-.i noecho
-has been set, then the window is left unaltered.
-In order to retain control of the terminal,
-it is necessary to have one of
-.i noecho ,
-.i cbreak ,
-or
-.i rawmode
-set.
-If you do not set one,
-whatever routine you call to read characters will set
-.i cbreak
-for you,
-and then reset to the original mode when finished.
-.Ds
-.Fd getstr str \*m
-char	*str;
-.Fd wgetstr win\*,str
-WINDOW	*win;
-char	*str;
-.De
-Get a string through the window
-and put it in the location pointed to by
-.Vn str ,
-which is assumed to be large enough to handle it.
-It sets tty modes if necessary,
-and then calls
-.Fn getch
-(or
-.Fn wgetch ) "" win
-to get the characters needed to fill in the string
-until a newline or EOF is encountered.
-The newline stripped off the string.
-\*(Es
-.Ds
-.Fd \*_putchar c
-char	c;
-.De
-Put out a character using the
-.Fn putchar
-macro.
-This function is used to output every character
-that
-.b curses
-generates.
-Thus,
-it can be redefined by the user who wants to do non-standard things
-with the output.
-It is named with an initial \*(lq\*_\*(rq
-because it usually should be invisible to the programmer.
-.Ds
-.Fd raw "" \*m
-.Fd noraw "" \*m
-.De
-Set or unset the terminal to/from raw mode.
-On version 7
-.Un \**
-.(f
-\**
-.Un
-is a trademark of Bell Laboratories.
-.)f
-this also turns of newline mapping
-(see
-.Fn nl ).
-.Ds
-.Fd scanw fmt\*,arg1\*,arg2\*,...
-char	*fmt;
-.Fd wscanw win\*,fmt\*,arg1\*,arg2\*,...
-WINDOW	*win;
-char	*fmt;
-.De
-Perform a
-.Fn scanf
-through the window using
-.Vn fmt .
-It does this using consecutive
-.Fn getch 's
-(or
-.Fn wgetch 's). "" win
-\*(Es
diff --git a/lib/libcurses/PSD.doc/doc.III b/lib/libcurses/PSD.doc/doc.III
deleted file mode 100644
index 94d4dd267..000000000
--- a/lib/libcurses/PSD.doc/doc.III
+++ /dev/null
@@ -1,341 +0,0 @@
-.\"	$NetBSD: doc.III,v 1.5 2003/08/07 16:44:27 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)doc.III	8.1 (Berkeley) 6/4/93
-.\"
-.Ds
-.Fd baudrate "" \*m
-.De
-Returns the output baud rate of the terminal.
-This is a system dependent constant
-(defined in
-.b <sys/tty.h>
-on BSD systems,
-which is included by
-.b <curses.h> ).
-.Ds
-.Fd delwin win
-WINDOW	*win;
-.De
-Deletes the window from existence.
-All resources are freed for future use by
-.b calloc (3).
-If a window has a
-.Fn subwin
-allocated window inside of it,
-deleting the outer window
-the subwindow is not affected,
-even though this does invalidate it.
-Therefore,
-subwindows should be deleted before their
-outer windows are.
-.Ds
-.Fd endwin
-.De
-Finish up window routines before exit.
-This restores the terminal to the state it was before
-.Fn initscr
-(or
-.Fn gettmode
-and
-.Fn setterm )
-was called.
-It should always be called before exiting.
-It does not exit.
-This is especially useful for resetting tty stats
-when trapping rubouts via
-.b signal (2).
-.Ds
-.Fd erasechar "" \*m
-.De
-Returns the erase character
-for the terminal,
-.i i.e. ,
-the character used by the user to erase a single character from the input.
-.Ds
-.Fd getcap str "" "char *"
-char	*str;
-.De
-Return a pointer to the
-.b termcap
-capability described by
-.Vn str
-(see
-.b termcap (5)
-for details).
-.Ds
-.Fd getyx win\*,y\*,x \*m
-WINDOW	*win;
-int	y\*,x;
-.De
-Puts the current \*y of
-.Vn win
-in the variables
-.Vn y
-and
-.Vn x .
-Since it is a macro,
-not a function,
-you do not pass the address
-of
-.Vn y
-and
-.Vn x .
-.Ds
-.Fd inch "" \*m
-.Fd winch win \*m
-WINDOW	*win;
-.De
-Returns the character at the current \*(y
-on the given window.
-This does not make any changes to the window.
-.Ds
-.Fd initscr
-.De
-Initialize the screen routines.
-This must be called before any of the screen routines are used.
-It initializes the terminal-type data and such,
-and without it none of the routines can operate.
-If standard input is not a tty,
-it sets the specifications to the terminal
-whose name is pointed to by
-.Vn Def\*_term
-(initialy "dumb").
-If the boolean
-.Vn My\*_term
-is true,
-.Vn Def\*_term
-is always used.
-If the system supports the
-.b TIOCGWINSZ
-.Fn ioctl "" "" 2
-call,
-it is used to get the number of lines and columns for the terminal,
-otherwise it is taken from the
-.b termcap
-description.
-.Ds
-.Fd killchar "" \*m
-.De
-Returns the line kill character
-for the terminal,
-.i i.e. ,
-the character used by the user to erase an entire line from the input.
-.Ds
-.Fd leaveok win\*,boolf \*m
-WINDOW	*win;
-bool	boolf;
-.De
-Sets the boolean flag for leaving the cursor after the last change.
-If
-.Vn boolf
-is TRUE,
-the cursor will be left after the last update on the terminal,
-and the current \*y for
-.Vn win
-will be changed accordingly.
-If it is FALSE,
-it will be moved to the current \*y.
-This flag
-(initialy FALSE)
-retains its value until changed by the user.
-.Ds
-.Fd longname termbuf\*,name
-char	*termbuf\*,*name;
-.Fd fullname termbuf\*,name
-char	*termbuf\*,*name;
-.De
-.Fn longname
-fills in
-.Vn name
-with the long name of the terminal described by the
-.b termcap
-entry in
-.Vn termbuf .
-It is generally of little use,
-but is nice for telling the user in a readable format what terminal
-we think he has.
-This is available in the global variable
-.Vn ttytype .
-.Vn termbuf
-is usually set via the termlib routine
-.Fn tgetent .
-.Fn fullname
-is the same as
-.Fn longname ,
-except that it gives the fullest name given in the entry,
-which can be quite verbose.
-.Ds
-.Fd mvwin win\*,y\*,x
-WINDOW	*win;
-int	y, x;
-.De
-Move the home position of the window
-.Vn win
-from its current starting coordinates
-to
-.Vn y\*,x ). (
-If that would put part or all of the window
-off the edge of the terminal screen,
-.Fn mvwin
-returns ERR and does not change anything.
-For subwindows,
-.Fn mvwin
-also returns ERR if you attempt to move it off its main window.
-If you move a main window,
-all subwindows are moved along with it.
-.Ds
-.Fd newwin lines\*,cols\*,begin\*_y\*,begin\*_x "" "WINDOW *"
-int	lines\*,cols\*,begin\*_y\*,begin\*_x;
-.De
-Create a new window with
-.Vn lines
-lines and
-.Vn cols
-columns starting at position
-.Vn begin\*_y\*,begin\*_x ). (
-If either
-.Vn lines
-or
-.Vn cols
-is 0 (zero),
-that dimension will be set to
-.Vn "LINES \- begin\*_y" ) (
-or
-.Vn "COLS \- begin\*_x" ) (
-respectively.
-Thus, to get a new window of dimensions
-.Vn LINES
-\(mu
-.Vn COLS ,
-use
-.Fn newwin . "" 0\*,0\*,0\*,0
-.Ds
-.Fd nl "" \*m
-.Fd nonl "" \*m
-.De
-Set or unset the terminal to/from nl mode,
-.i i.e. ,
-start/stop the system from mapping
-.b <RETURN>
-to
-.b <LINE-FEED> .
-If the mapping is not done,
-.Fn refresh
-can do more optimization,
-so it is recommended, but not required, to turn it off.
-.Ds
-.Fd scrollok win\*,boolf \*m
-WINDOW	*win;
-bool	boolf;
-.De
-Set the scroll flag for the given window.
-If
-.Vn boolf
-is FALSE, scrolling is not allowed.
-This is its default setting.
-.Ds
-.Fd touchline win\*,y\*,startx\*,endx
-WINDOW	*win;
-int	y\*,startx\*,endx;
-.De
-This function performs a function similar to
-.Fn touchwin
-on a single line.
-It marks the first change for the given line
-to be
-.Vn startx ,
-if it is before the current first change mark,
-and
-the last change mark is set to be
-.Vn endx
-if it is currently less than
-.Vn endx .
-.Ds
-.Fd touchoverlap win1\*,win2
-WINDOW	*win1, *win2;
-.De
-Touch the window
-.Vn win2
-in the area which overlaps with
-.Vn win1 .
-If they do not overlap,
-no changes are made.
-.Ds
-.Fd touchwin win
-WINDOW	*win;
-.De
-Make it appear that the every location on the window
-has been changed.
-This is usually only needed for refreshes with overlapping windows.
-.Ds
-.Fd subwin win\*,lines\*,cols\*,begin\*_y\*,begin\*_x "" "WINDOW *"
-WINDOW	*win;
-int	lines\*,cols\*,begin\*_y\*,begin\*_x;
-.De
-Create a new window with
-.Vn lines
-lines and
-.Vn cols
-columns starting at position
-.Vn begin\*_y\*,begin\*_x ) (
-inside the window
-.i win .
-This means that any change made to either window
-in the area covered
-by the subwindow will be made on both windows.
-.Vn begin\*_y\*,begin\*_x
-are specified relative to the overall screen,
-not the relative (0\*,0) of
-.Vn win .
-If either
-.Vn lines
-or
-.Vn cols
-is 0 (zero),
-that dimension will be set to
-.Vn "LINES \- begin\*_y" ) (
-or
-.Vn "COLS \- begin\*_x" ) (
-respectively.
-.Ds
-.Fd unctrl ch \*m
-char	ch;
-.De
-This is actually a debug function for the library,
-but it is of general usefulness.
-It returns a string which is a representation of
-.Vn ch .
-Control characters become their upper-case equivalents preceded by a "^".
-Other letters stay just as they are.
-To use
-.Fn unctrl ,
-you may have to have
-.b #include\ <unctrl.h>
-in your file.
diff --git a/lib/libcurses/PSD.doc/doc.IV b/lib/libcurses/PSD.doc/doc.IV
deleted file mode 100644
index 8f60c0e7a..000000000
--- a/lib/libcurses/PSD.doc/doc.IV
+++ /dev/null
@@ -1,108 +0,0 @@
-.\"	$NetBSD: doc.IV,v 1.5 2003/08/07 16:44:27 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)doc.IV	8.1 (Berkeley) 6/4/93
-.\"
-.Ds
-.Fd gettmode
-.De
-Get the tty stats.
-This is normally called by
-.Fn initscr .
-.Ds
-.Fd mvcur lasty\*,lastx\*,newy\*,newx
-int	lasty\*,lastx\*,newy\*,newx;
-.De
-Moves the terminal's cursor from
-.Vn lasty\*,lastx ) (
-to
-.Vn newy\*,newx ) (
-in an approximation of optimal fashion.
-This routine uses the functions borrowed from
-.i ex
-version 2.6.
-It is possible to use this optimization
-without the benefit of the screen routines.
-With the screen routines, this should not be called by the user.
-.Fn move
-and
-.Fn refresh
-should be used to move the cursor position,
-so that the routines know what's going on.
-.Ds
-.Fd scroll win
-WINDOW	*win;
-.De
-Scroll the window upward one line.
-This is normally not used by the user.
-.Ds
-.Fd savetty "" \*m
-.Fd resetty "" \*m
-.De
-.Fn savetty
-saves the current tty characteristic flags.
-.Fn resetty
-restores them to what
-.Fn savetty
-stored.
-These functions are performed automatically by
-.Fn initscr
-and
-.Fn endwin .
-.Ds
-.Fd setterm name
-char	*name;
-.De
-Set the terminal characteristics to be those of the terminal named
-.Vn name ,
-getting the terminal size from the
-.b TIOCGWINSZ
-.Fn ioctl "" "" 2
-if it exists,
-otherwise from the environment.
-This is normally called by
-.Fn initscr .
-.Ds
-.Fd tstp
-.De
-If the new
-.b tty (4)
-driver is in use,
-this function
-will save the current tty state
-and then put the process to sleep.
-When the process gets restarted,
-it restores the tty state
-and then calls
-.Fn wrefresh "" "" curscr
-to redraw the screen.
-.Fn initscr
-sets the signal
-SIGTSTP
-to trap to this routine.
diff --git a/lib/libcurses/PSD.doc/ex1.c b/lib/libcurses/PSD.doc/ex1.c
deleted file mode 100644
index 27f2583da..000000000
--- a/lib/libcurses/PSD.doc/ex1.c
+++ /dev/null
@@ -1,100 +0,0 @@
-.\"	$NetBSD: ex1.c,v 1.6 2003/08/07 16:44:27 agc Exp $
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)ex1.c	8.1 (Berkeley) 6/8/93
-.\"
-#include <sys/types.h>
-#include <curses.h>
-#include <stdio.h>
-#include <signal.h>
-
-
-#define YSIZE 10
-#define XSIZE 20
-
-int quit();
-
-main()
-{
-	int i, j, c;
-	size_t len;
-	char id[100];
-	FILE *fp;
-	char *s;
-
-	initscr();			/* Always call initscr() first */
-	signal(SIGINT, quit);		/* Make sure wou have a 'cleanup' fn */
-	crmode();			/* We want cbreak mode */
-	noecho();			/* We want to have control of chars */
-	delwin(stdscr);			/* Create our own stdscr */
-	stdscr = newwin(YSIZE, XSIZE, 10, 35);
-	flushok(stdscr, TRUE);		/* Enable flushing of stdout */
-	scrollok(stdscr, TRUE);		/* Enable scrolling */
-	erase();			/* Initially, clear the screen */
-
-	standout();
-	move(0,0);
-	while (1) {
-		c = getchar();
-		switch(c) {
-		case 'q':		/* Quit on 'q' */
-			quit();
-			break;
-		case 's':		/* Go into standout mode on 's' */
-			standout();
-			break;
-		case 'e':		/* Exit standout mode on 'e' */
-			standend();
-			break;
-		case 'r':		/* Force a refresh on 'r' */
-			wrefresh(curscr);
-			break;
-		default:		/* By default output the character */
-			addch(c);
-			refresh();
-		}
-	}
-}
-
-
-int
-quit()
-{
-	erase();		/* Terminate by erasing the screen */
-	refresh();
-	endwin();		/* Always end with endwin() */
-	delwin(curscr);		/* Return storage */
-	delwin(stdscr);
-	putchar('\n');
-	exit(0);
-}
-
-
-
-
diff --git a/lib/libcurses/PSD.doc/ex2.c b/lib/libcurses/PSD.doc/ex2.c
deleted file mode 100644
index f2e6e7d9e..000000000
--- a/lib/libcurses/PSD.doc/ex2.c
+++ /dev/null
@@ -1,208 +0,0 @@
-.\"	$NetBSD: ex2.c,v 1.7 2003/08/07 16:44:27 agc Exp $
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)ex2.c	8.1 (Berkeley) 6/8/93
-.\"
-#include <curses.h>
-#include <stdio.h>
-#include <signal.h>
-
-#define YSIZE LINES
-#define XSIZE COLS
-
-static int quit();
-
-/*
- * This program fills the screen up with characters and the allows the user to
- * manipulate the text on the screen using some basic commands.
- * Nothing fancy, just a demonstration of the elementary features of the
- * curses(3) package.
- */
-main()
-{
-	int i, j, c, n, d = 0;
-	char id[100];
-	int hh = 0;
-	int curx, cury, base, arg;
-
-	initscr();
-	signal(SIGINT, quit);
-	crmode();
-	noecho();
-	nonl();
-	delwin(stdscr);
-	stdscr = newwin(YSIZE, XSIZE, 0, 0);
-	flushok(stdscr, TRUE);
-	scrollok(stdscr, TRUE);
-	erase();
-	refresh();
-
-	move(0,0);
-	refresh();
-	for (i = 0; i < YSIZE + 2; i++) {
-		(void)snprintf(id, sizeof id, "%d: ", i);
-		addstr(id);
-		for (j = 0; j < XSIZE - strlen(id); j++)
-			addch('0' + (i % 10));
-	}
-	c = getchar();
-	base = 2;
-	curx = cury = 0;
-	move(0, 0);
-	refresh();
-
-	/*
-	 * The screen manipulator has the following commands:
-	 * 'D' - clear to the end of the current line.
-	 * 'B' - clear to the bottom of the screen.
-	 * 'E' - erase the screen.
-	 * 's' - enter standout mode.
-	 * 'e' - exit standout mode.
-	 * 'd' n - delete n lines below cursor line.
-	 * 'i' n - insert n lines below cursor line.
-	 * 'q' - quit.
-	 * 'f' - move cursor one position to the right.
-	 * 'b' - move cursor one position to the left.
-	 * 'n' - move cursor one line down.
-	 * 'p' - move cursor one line up.
-	 * 'h' - home cusor.
-	 * 'l' - force refresh.
-	 * 'r' - simulate a carriage return.
-	 *
-	 * All other characters are ignored.
-	 */
-	for(;;) {
-		switch(c = getchar()) {
-		case 'D':
-			clrtoeol();
-			refresh();
-			continue;
-		case 'B':
-			clrtobot();
-			refresh();
-			continue;
-		case 'E':
-			erase();
-			refresh();
-			continue;
-		case 's':
-			standout();
-			continue;
-		case 'e':
-			standend();
-			continue;
-		case 'd':
-			arg = getchar() - '0';
-			for (i = 0; i < arg; i++)
-				deleteln();
-			refresh();
-			continue;
-		case 'i':
-			arg = getchar() - '0';
-			for (i = 0; i < arg; i++)
-				insertln();
-			refresh();
-			continue;
-		case 'q':
-			quit();
-		case 'f':
-			if (curx < XSIZE - 1)
-				curx++;
-			else {
-				cury++;
-				curx = 0;
-			}
-			break;
-		case 'b':
-			if (curx == 0) {
-				cury--;
-				curx = XSIZE - 1;
-			} else
-				curx--;
-			break;
-		case 'n':
-			cury++;
-			break;
-		case 'p':
-			cury--;
-			break;
-		case 'h':
-			curx = cury = 0;
-			break;
-		case 'l':
-			wrefresh(curscr);
-			continue;
-		case 'r':   /* return */
-		{
-			int x, y;
-			getyx(stdscr, y, x);
-			move(y+1, 0);
-			insertln();
-			move(y, x);
-			clrtoeol();
-			refresh();
-			continue;
-		}
-		default:
-			continue;
-		}
-
-		if (cury < 0) {
-			base--;
-			move(0, 0);
-			insertln();
-			(void)snprintf(id, sizeof id, "%d: ", base);
-			addstr(id);
-			for (j = 0; j < XSIZE - strlen(id) - 2; j++)
-				addch('0' + (base % 10));
-			cury++;
-		} else if (cury >= YSIZE) {
-			move(0, 0);
-			deleteln();
-			move(YSIZE - 1, 0);
-			(void)snprintf(id, sizeof id, "%d: ", base + YSIZE);
-			addstr(id);
-			for (j = 0; j < XSIZE - strlen(id) - 2; j++)
-				addch('0' + ((base + YSIZE) % 10));
-			cury--;
-			base++;
-		}
-		move(cury, curx);
-		refresh();
-	}
-}
-
-int
-quit()
-{
-	erase();
-	refresh();
-	endwin();
-	exit(0);
-}
diff --git a/lib/libcurses/PSD.doc/fns.doc b/lib/libcurses/PSD.doc/fns.doc
deleted file mode 100644
index 8880dcfb1..000000000
--- a/lib/libcurses/PSD.doc/fns.doc
+++ /dev/null
@@ -1,1757 +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.
-.\" 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.
-.\"
-.\"     @(#)fns.doc	8.2 (Berkeley) 6/1/94
-.\"
-.Ds
-.Fn addbytes "char *str" "int len"
-.De
-This function is the low level character output function.
-.Vn Len
-characters of the string
-.Vn str
-are output to the current \*y position of the window.
-.Ds
-.Fn addch "chtype ch" \(dg
-.De
-Add the character
-.Vn ch
-on the window
-at the current \*y.
-If the character is a newline
-(\'\en\')
-the line will be cleared to the end,
-and the current \*y will be changed to the
-beginning off the next line
-if newline mapping is on,
-or to the next line at the same x co-ordinate
-if it is off.
-A return
-(\'\er\')
-will move to the beginning of the line on the window.
-Tabs
-(\'\et\')
-will be expanded into spaces
-in the normal tabstop positions of
-every eight characters.
-\*(Es
-.Ds
-.Fn addchstr "chtype *str" \(dg
-.De
-Add the characters and attributes in the string pointed to by
-.Vn str
-on the window at the current \*y.
-\*(Es
-In this case, it will put on as much as it can.
-.Ds
-.Fn addchnstr "chtype *str" "int len" \(dg
-.De
-Add no more than
-.Vn len
-characters and attributes of the string pointed to by
-.Vn str
-on the window at the current \*y.
-\*(Es
-In this case, it will put on as much as it can.
-.Ds
-.Fn addstr "char *str" \(dg
-.De
-Add the string pointed to by
-.Vn str
-on the window at the current \*y.
-\*(Es
-In this case, it will put on as much as it can.
-.Ds
-.Fn addnstr "char *str" "int len" \(dg
-.De
-Add no more than
-.Vn len
-characters of the string pointed to by
-.Vn str
-on the window at the current \*y.
-\*(Es
-In this case, it will put on as much as it can.
-.Ds
-.Fn assume_default_colors "short fore" "short back"
-.De
-Set the curses default foreground and background colors to
-.Vn fore
-and
-.Vn back .
-.Ds
-.Fn attr_get "attr_t *attr" "short *pair" "void *opt" \(dg
-.De
-Get the attributes and colour pair for the window.
-Either
-.Vn attr
-or
-.Vn pair
-may be NULL.
-The
-.Vn opt
-argument is not used.
-.Ds
-.Fn attr_off "attr_t attr" "void *opt" \(dg
-.De
-Remove character attributes set by
-.Fn attr_on
-or
-.Fn attr_set .
-.Ds
-.Fn attr_on "attr_t attr" "void *opt" \(dg
-.De
-Add character attributes for any characters
-added to the window (if it has that capability).
-The attributes that can be set are \fBA_UNDERLINE\fR,
-\fBA_REVERSE\fR, \fBA_BLINK\fR, \fBA_DIM\fR,
-\fBA_BOLD\fR, \fBA_BLANK\fR, \fBA_PROTECT\fB,
-\fBA_ALTCHARSET\fR and \fBCOLOR_PAIR(n)\fR.
-.Ds
-.Fn attr_set "attr_t attr" "short pair" "void *opt" \(dg
-.De
-Set character attributes and color pair for any characters
-added to the window (if it has that capability).
-.Ds
-.Fn attroff "int attribute" \(dg
-.De
-Remove character attributes set by
-.Fn attron
-or
-.Fn attrset .
-To clear all character attributes, use
-.Fn attroff "A_ATTRIBUTES" .
-.Fn attroff "A_STANDOUT"
-is equivalent to
-.Fn standend .
-.Fn attroff "A_UNDERLINE"
-is equivalent to
-.Fn underend .
-.Ds
-.Fn attron "int attribute" \(dg
-.De
-Add character attributes for any characters
-added to the window (if it has that capability).
-.Fn attron "A_STANDOUT"
-is equivalent to
-.Fn standout .
-.Fn attron "A_UNDERLINE"
-is equivalent to
-.Fn underscore .
-.Ds
-.Fn attrset "int attribute" \(dg
-.De
-Set character attributes for any characters
-added to the window (if it has that capability).
-.Ds
-.Fn baudrate "" \(dg
-.De
-Returns the output baud rate of the terminal.
-This is a system dependent constant
-(defined in
-.b <sys/tty.h>
-on BSD systems,
-which is included by
-.b <curses.h> ).
-.Ds
-.Fn beep ""
-.De
-Sound the terminal bell.  If the terminal has no bell capability,
-but has the ability to flash the screen, do that instead.  See also
-.Fn flash
-.Ds
-.Fn bkgd "chtype ch"
-.De
-Sets the background rendition to
-.Vn ch .
-.Ds
-.Fn bkgdset "chtype ch"
-.De
-Sets the background rendition to
-.Vn ch 
-and applies this rendition to the window.
-.Ds
-.Fn border "chtype left" "chtype right" "chtype top" "chtype bottom" "chtype topleft" "chtype topright" "chtype botleft" "chtype botright"
-.De
-.Pp
-Draws a border around the window using the characters:
-.Vn left
-for drawing the left side, 
-.Vn right
-for drawing the left side, 
-.Vn top
-for drawing the top edge, 
-.Vn bottom
-for drawing the top edge, 
-.Vn topleft
-for drawing the top-left corner, 
-.Vn topright
-for drawing the top-right corner, 
-.Vn botleft
-for drawing the bottom-left corner, and 
-.Vn botright
-for drawing the bottom-right corner.  If scrolling is not allowed,
-and the window encompasses the lower right-hand corner of the terminal,
-the corners are left blank to avoid a scroll.
-.Ds
-.Fn box "WINDOW win" "chtype vert" "chtype hor"
-.De
-.Pp
-Draws a box around the window using
-.Vn vert
-as the character for drawing the vertical sides, and
-.Vn hor
-for drawing the horizontal lines.
-If scrolling is not allowed,
-and the window encompasses the lower right-hand corner of the terminal,
-the corners are left blank to avoid a scroll.
-.Ds
-.Fn can_change_color ""
-.De
-Check if terminal can change colors.
-.Ds
-.Fn cbreak ""
-.De
-Set the terminal to cbreak mode.
-.Ds
-.Fn clear "" \(dg
-.De
-Resets the entire window to blanks.
-If
-.Vn win
-is a screen,
-this sets the clear flag,
-which will cause a clear-screen sequence to be sent
-on the next
-.Fn refresh
-call.
-This also moves the current \*y
-to (0\*,0).
-.Ds
-.Fn clearok "WINDOW *scr" "int boolf" \(dg
-.De
-Sets the clear flag for the screen
-.Vn scr .
-If
-.Vn boolf
-is non-zero,
-this will force a clear-screen to be printed on the next
-.Fn refresh ,
-or stop it from doing so if
-.Vn boolf
-is 0.
-This only works on screens,
-and,
-unlike
-.Fn clear ,
-does not alter the contents of the screen.
-If
-.Vn scr
-is
-.Vn curscr ,
-the next
-.Fn refresh
-call will cause a clear-screen,
-even if the window passed to
-.Fn refresh
-is not a screen.
-.Ds
-.Fn clrtobot "" \(dg
-.De
-Wipes the window clear from the current \*y to the bottom.
-This does not force a clear-screen sequence on the next refresh
-under any circumstances.
-\*(Nm
-.Ds
-.Fn clrtoeol "" \(dg
-.De
-Wipes the window clear from the current \*y to the end of the line.
-\*(Nm
-.Ds
-.Fn color_content "short color" "short *red" "short *green" "short *blue"
-.De
-Get the red, green and blue values of color
-.Vn color .
-.Ds
-.Fn color_set "short pair" "void *opt" \(dg
-.De
-Set color pair for any characters added to the window (if it has
-that capability).
-.Ds
-.Fn copywin "const WINDOW *src" "WINDOW *dst" "int sminrow" "int smincol" "int dminrow" "int dmincol" "int dmaxrow" "int dmaxcol" "int overlay"
-.De
-Copies the contents of the window
-.Vn src
-starting at (
-.Vn sminrow ,
-.Vn smincol )
-to the destination window
-.Vn dst
-starting at (
-.Vn dminrow ,
-.Vn dmincol )
-and ending at either the end of the source window or (
-.Vn dmaxrow ,
-.Vn dmaxcol )
-whichever is the lesser.  The parameter
-.Vn overlay
-determines the nature of the copy.  If 
-.Vn overlay
-is TRUE then only the non-space characters from
-.Vn src
-are copied to
-.Vn dst .
-If 
-.Vn overlay
-is FALSE then all characters are copied from
-.Vn src
-to
-.Vn dst.
-.Ds
-.Fn curs_set "int visibility"
-.De
-Sets the visibility of the screen cursor.  The parameter
-.Vn visibility
-can be one of three values, 0 means make the cursor invisible, 1 means
-set the cursor to normal visibility and 2 sets the cursor to high
-visibility.  In all cases the old mode of the cursor is returned if
-the call was successful and
-.b ERR
-is returned if the terminal cannot support the requested visibility
-mode.
-.Ds
-.Fn crmode "" \(dg
-.De
-Identical to
-.Fn cbreak .
-The misnamed macro
-.Fn crmode
-and
-.Fn nocrmode
-is retained for backwards compatibility
-with ealier versions of the library.
-.Ds
-.Fn delay_output "int ms"
-.De
-Pause output for
-.Vn ms
-milliseconds using the terminal pad character.
-.Ds
-.Fn def_prog_mode ""
-.De
-Save the current terminal modes as the \'in curses\' state for use with
-.Fn reset_prog_mode .
-.Ds
-.Fn def_shell_mode ""
-.De
-Save the current terminal modes as the \'not in curses\' state for use with
-.Fn reset_shell_mode .
-.Ds
-.Fn define_key "char *sequence" "int key_symbol" 
-.De
-Assigns the character sequence given in
-.Vn sequence
-to the key symbol
-.Vn key_symbol .
-If 
-.Fn keypad
-has set been set TRUE and the character sequence is found in the input
-stream then the key symbol defined will be returned.  Normally the
-sequences are found in the
-.b termcap
-database but this function allows extensions to be added by the
-application.  If 
-.Vn sequence
-is a NULL pointer then all the sequences associated with
-.Vn key_symbol
-will be removed, including any definitions inserted by
-.b termcap .
-.Ds
-.Fn delch ""
-.De
-Delete the character at the current \*y.
-Each character after it on the line shifts to the left,
-and the last character becomes blank.
-.Ds
-.Fn deleteln ""
-.De
-Delete the current line.
-Every line below the current one will move up,
-and the bottom line will become blank.
-The current \*y will remain unchanged.
-.Ds
-.Fn delscreen "SCREEN *screen"
-.De
-Delete the screen and frees all associated resources.
-.Ds
-.Fn delwin "WINDOW *win"
-.De
-Deletes the window from existence.
-All resources are freed for future use by
-.b calloc (3).
-If a window has a
-.Fn subwin
-allocated window inside of it,
-deleting the outer window
-the subwindow is not affected,
-even though this does invalidate it.
-Therefore,
-subwindows should be deleted before their
-outer windows are.
-.Ds
-.Fn derwin "WINDOW *orig" "int nlines" "int ncols" "int by" "int bx"
-.De
-Performs a function very similar to that of
-.Fn subwin .
-The difference being that with
-.Fn derwin
-the origin of the child window given by (
-.Vn by ,
-.Vn bx )
-is relative to the origin of the parent window
-.Vn orig
-instead of being absolute screen coordinates as they are in
-.Fn subwin .
-.Ds
-.Fn doupdate ""
-.De
-Synchronize the terminal screen with the virtual screen that
-has had window contents added to it by calls to
-.Fn wnoutrefresh .
-.Ds
-.Fn dupwin "WINDOW *win"
-.De
-Creates an exact copy of the window
-.Vn win .
-.Ds
-.Fn echo "" \(dg
-.De
-Sets the terminal to echo characters.
-.Ds
-.Fn echochar "const chtype ch" \(dg
-.De
-Add the character
-.Vn ch
-on the window
-at the current \*y and immediately refresh the window.
-.Ds
-.Fn endwin ""
-.De
-Finish up window routines before exit.
-This restores the terminal to the state it was before
-.Fn initscr
-(or
-.Fn gettmode
-and
-.Fn setterm )
-was called.
-It should always be called before exiting and before the final calls to
-.Fn delwin .
-It does not exit.
-This is especially useful for resetting tty stats
-when trapping rubouts via
-.b signal (2).
-.Ds
-.Fn erase "" \(dg
-.De
-Erases the window to blanks without setting the clear flag.
-This is analagous to
-.Fn clear ,
-except that it never causes a clear-screen sequence to be generated
-on a
-.Fn refresh .
-\*(Nm
-.Ds
-.Fn erasechar "" \(dg
-.De
-Returns the erase character
-for the terminal,
-.i i.e. ,
-the character used by the user to erase a single character from the input.
-.Ds
-.Fn flash ""
-.De
-Flash the terminal screen.  If the terminal has no flash capability,
-but has the ability to sound the bell, do that instead.  See also
-.Fn bell
-.Ds
-.Fn flushinp ""
-.De
-Throw away any input that has been typed by the user but has not yet
-been read by the program.
-.Ds
-.Fn flushok "WINDOW *win" "int boolf"
-.De
-Normally,
-.Fn refresh
-.Fn fflush 's
-.Vn stdout
-when it is finished.
-.Fn flushok
-allows you to control this.
-if
-.Vn boolf
-is non-zero
-(\c
-.i i.e. ,
-non-zero)
-it will do the
-.Fn fflush ,
-otherwise it will not.
-.Ds
-.Fn getattrs "WINDOW *win"
-.De
-Gets the attributes for
-.Vn win .
-.Ds
-.Fn getbkgd "WINDOW *win"
-.De
-Gets the background rendition for
-.Vn win .
-.Ds
-.Fn getcap "char *name"
-.De
-Get the terminal capability
-.Vn name .
-.Ds
-.Fn getch "" \(dg
-.De
-Gets a character from the terminal and (if necessary)
-echos it on the window.
-\*(Es
-Otherwise, the character gotten is returned.
-If
-.i noecho
-has been set, then the window is left unaltered.
-In order to retain control of the terminal,
-it is necessary to have one of
-.i noecho ,
-.i cbreak ,
-or
-.i rawmode
-set.
-If you do not set one,
-whatever routine you call to read characters will set
-.i cbreak
-for you,
-and then reset to the original mode when finished.
-.Ds
-.Fn getcury "WINDOW *win"
-.De
-Get current y position on
-.Vn win .
-.Ds
-.Fn getcurx "WINDOW *win"
-.De
-Get current x position on
-.Vn win .
-.Ds
-.Fn getbegy "WINDOW *win"
-.De
-Get start y position on
-.Vn win .
-.Ds
-.Fn getbegx "WINDOW *win"
-.De
-Get start x position on
-.Vn win .
-.Ds
-.Fn getmaxy "WINDOW *win"
-.De
-Get maximum y position on
-.Vn win .
-.Ds
-.Fn getmaxx "WINDOW *win"
-.De
-Get maximum x position on
-.Vn win .
-.Ds
-.Fn getnstr "char *str" \(dg
-.De
-Get a string through the window
-and put it in the location pointed to by
-.Vn str .
-A maximum of
-.Vn n
-characters is returned (including the trailing null).
-It sets tty modes if necessary,
-and then calls
-.Fn getch
-(or
-.Fn wgetch )
-to get the characters needed to fill in the string
-until a newline or EOF is encountered.
-The newline stripped off the string.
-\*(Es
-.Ds
-.Fn getstr "char *str" \(dg
-.De
-Get a string through the window
-and put it in the location pointed to by
-.Vn str ,
-which is assumed to be large enough to handle it.
-It sets tty modes if necessary,
-and then calls
-.Fn getch
-(or
-.Fn wgetch )
-to get the characters needed to fill in the string
-until a newline or EOF is encountered.
-The newline stripped off the string.
-\*(Es
-.Ds
-.Fn getparx "WINDOW *win"
-.De
-Returns the x location of the given subwindow relative to the parent
-window.  If the window is not a subwindow then -1 is returned.
-.Ds
-.Fn getpary "WINDOW *win"
-.De
-Returns the y location of the given subwindow relative to the parent
-window.  If the window is not a subwindow then -1 is returned.
-.Ds
-.Fn getpary "WINDOW *win" "int y" "int x"
-.De
-Is a macro that sets the 
-.Vn y
-and
-.Vn x
-parameters to the respective coordinates of the top left hand corner
-of the subwindow relative to the parent window.  If the given window
-.Vn win
-is not a subwindow then both
-.Vn y
-and 
-.Vn x
-will be set to -1.
-.Ds
-.Fn gettmode ""
-.De
-Get the tty stats.
-This is normally called by
-.Fn initscr .
-.Ds 
-.Fn getwin "FILE *fp"
-.De
-Creates a window from a file written by
-.Fn putwin .
-.Ds
-.Fn getyx "WINDOW *win" "int y" "int x"
-.De
-Puts the current \*y of
-.Vn win
-in the variables
-.Vn y
-and
-.Vn x .
-Since it is a macro,
-not a function,
-you do not pass the address
-of
-.Vn y
-and
-.Vn x .
-.Ds
-.Fn halfdelay "int timeout"
-.De
-Sets the terminal into a mode similar to that done by
-.Fn cbreak
-with the exception that the input routines will wait for
-.Vn timeout
-number of tenths of a second, if at this time there is no input then
-ERR will be returned.
-.Ds
-.Fn has_colors ""
-.De
-Check if terminal has colors.
-.Ds
-.Fn hline "chtype ch" "int count"
-.De
-Draw a horizontal line of the character ch starting at the current
-cursor position and moving towards the rightmost column.  At most
-.Vn count
-characters will be written, less if the edge of the screen is reached
-before 
-.Vn count
-is reached.
-.Ds
-.Fn idcok "WINDOW *win" "int boolf"
-.De
-Reserved for future use.
-This will eventually signal to
-.Fn refresh
-that it is all right to use the insert and delete char sequences
-when updating the window.
-.Ds
-.Fn idlok "WINDOW *win" "int boolf"
-.De
-Reserved for future use.
-This will eventually signal to
-.Fn refresh
-that it is all right to use the insert and delete line sequences
-when updating the window.
-.ne 1i
-.Ds
-.Fn inch "" \(dg
-.De
-Returns the character at the current position on the given window.
-This does not make any changes to the window.
-.Ds
-.Fn inchnstr "chtype *chstr" "int n"
-.De
-Get an array of at most
-.Vn n
-characters and renditions starting at the current cursor position and
-ending at the end of the line and put it in the location pointed to by
-.Vn chstr .
-.Ds
-.Fn inchstr "chtype *chstr"
-.De
-Get an array of characters and renditions starting at the current cursor
-position and ending at the end of the line and put it in the location
-pointed to by
-.Vn chstr ,
-which is assumed to be large enough to handle it.
-.Ds
-.Fn innstr "char *str" "int n"
-.De
-Get a string of at most
-.Vn n
-characters starting at the current cursor position and ending at the end
-of the line and put it in the location pointed to by
-.Vn str .
-.Ds
-.Fn init_color "short color" "short red" "short green" "short blue"
-.De
-Set the red, green and blue values of color
-.Vn color .
-.Ds
-.Fn init_pair "short pair" "short fore" "short back"
-.De
-Set the foreground and background colors of pair
-.Vn pair .
-.Ds
-.Fn initscr ""
-.De
-Initialize the screen routines.
-This must be called before any of the screen routines are used.
-It initializes the terminal-type data and such,
-and without it none of the routines can operate.
-If standard input is not a tty,
-it sets the specifications to the terminal
-whose name is pointed to by
-.Vn Def\*_term
-(initially "dumb").
-If the boolean
-.Vn My\*_term
-is non-zero,
-.Vn Def\*_term
-is always used.
-If the system supports the
-.b TIOCGWINSZ
-.i ioctl(2)
-call,
-it is used to get the number of lines and columns for the terminal,
-otherwise it is taken from the
-.b termcap
-description.
-.Ds
-.Fn insch "char c"
-.De
-Insert
-.Vn c
-at the current \*y
-Each character after it shifts to the right,
-and the last character disappears.
-\*(Es
-.Ds
-.Fn insdelln "int n"
-.De
-If
-.Vn n
-is positive insert
-.Vn n
-lines above the current one.
-Every line below the current line
-will be shifted down,
-and the last
-.Vn n
-lines will disappear.
-If
-.Vn n
-is negative, delete
-.Vn n
-lines starting from the current one.
-The last
-.Vn n
-lines are cleared.
-The current \*y will remain unchanged.
-.Ds
-.Fn insertln ""
-.De
-Insert a line above the current one.
-Every line below the current line
-will be shifted down,
-and the bottom line will disappear.
-The current line will become blank,
-and the current \*y will remain unchanged.
-.Ds
-.Fn instr "char *str"
-.De
-Get an string starting at the current cursor position and ending at the
-end of the line and put it in the location pointed to by
-.Vn str ,
-which is assumed to be large enough to handle it.
-.Ds
-.Fn is_linetouched "WINDOW *win" "int line"
-.De
-Returns TRUE if 
-.Vn line
-in the window
-.Vn win
-has been modified since the last call to
-.Fn wrefresh .
-.Ds
-.Fn is_wintouched "WINDOW *win" "int line"
-.De
-Returns TRUE if the window
-.Vn win
-has been modified since the last call to
-.Fn wrefresh .
-.Ds
-.Fn isendwin ""
-.De
-Returns TRUE if
-.Fn endwin
-has been called without a subsequent call to
-.Fn wrefresh ,
-and FALSE otherwise.
-.Ds
-.Fn intrflush "WINDOW *win" "int boolf"
-.De
-Sets the terminal flush on interrupt mode.  If
-.Vn boolf
-is non-zero, flushing of the output buffer will occur when an
-interrupt key is pressed.  The default is inherited from the
-terminal settings.
-.Ds
-.Fn keyok "int key_symbol" "bool flag"
-.De
-Controls the recognition of the key symbol
-.Vn key_symbol .
-By setting
-.Vn flag
-to FALSE the recognition of any sequence of characters
-that have been associated with the key symbol will be disabled.
-By default, this flag is TRUE so sequences will be recognised.
-.Ds
-.Fn keyname "int key"
-.De
-Returns a description of the key
-.Vn key .
-.Ds
-.Fn keypad "WINDOW *win" "int boolf"
-.De
-Sets the boolean flag for interpretation of escape sequences.  If
-.Vn boolf
-is non-zero, escape sequences from terminal keypad and function
-keys will be interpreted by the library.  Escape sequences are not
-interpreted by default.  The include file
-.b <curses.h>
-contains the list of recognised keypad and function keys.  See also
-.Fn notimeout .
-.Ds
-.Fn killchar "" \(dg
-.De
-Returns the line kill character
-for the terminal,
-.i i.e. ,
-the character used by the user to erase an entire line from the input.
-.Ds
-.Fn leaveok "WINDOW *win" "int boolf" \(dg
-.De
-Sets the boolean flag for leaving the cursor after the last change.
-If
-.Vn boolf
-is non-zero,
-the cursor will be left after the last update on the terminal,
-and the current \*y for
-.Vn win
-will be changed accordingly.
-If
-.Vn boolf
- is 0 the cursor will be moved to the current \*y.
-This flag
-(initially 0)
-retains its value until changed by the user.
-.Ds
-.Fn longname "" \(dg
-.De
-Returns a string containing the verbose description of the terminal.
-.Ds
-.Fn meta "WINDOW *win" "bool bf"
-.De
-Manipulates the meta mode on terminals that support this capability.
-Note that 
-.Vn win
-is always ignored.
-.Ds
-.Fn move "int y" "int x"
-.De
-Change the current \*y of the window to
-.Vn y\*,x ). (
-\*(Es
-.Ds
-.Fn mvaddch "int y" "int x" "chtype ch"
-.De
-Moves the cursor to the position
-.Vn (y ,
-.Vn x )
-and then adds a character in the same manner as
-.Fn addch .
-.Ds
-.Fn mvaddchstr "int y" "int x" "chtype *str" \(dg
-.De
-Moves the cursor to the position
-.Vn (y ,
-.Vn x )
-and then adds characters and attributes in the same manner as
-.Fn addchstr .
-.Ds
-.Fn mvaddchnstr "int y" "int x" "chtype *str" \(dg
-.De
-Moves the cursor to the position
-.Vn (y ,
-.Vn x )
-and then adds characters and attributes in the same manner as
-.Fn addchnstr .
-.Ds
-.Fn mvaddstr "int y" "int x" "char *str" \(dg
-.De
-Moves the cursor to the position
-.Vn (y ,
-.Vn x )
-and then adds a string in the same manner as
-.Fn addstr .
-.Ds
-.Fn mvaddnstr "int y" "int x" "char *str" \(dg
-.De
-Moves the cursor to the position
-.Vn (y ,
-.Vn x )
-and then adds a string in the same manner as
-.Fn addnstr .
-.Ds
-.Fn mvcur "int lasty" "int lastx" "int newy" "int newx"
-.De
-Moves the terminal's cursor from
-.Vn lasty\*,lastx ) (
-to
-.Vn newy\*,newx ) (
-in an approximation of optimal fashion.
-This routine uses the functions borrowed from
-.i ex
-version 2.6.
-It is possible to use this optimization
-without the benefit of the screen routines.
-With the screen routines, this should not be called by the user.
-.Fn move
-and
-.Fn refresh
-should be used to move the cursor position,
-so that the routines know what's going on.
-.Ds
-.Fn mvderwin "WINDOW *win" "int y" "int x"
-.De
-Moves the subwindow
-.Vn win
-to the location
-.Vn y\*,x ) (
-where the location is relative to the top left hand corner of the
-parent window.  This call will return ERR if 
-.Vn win
-is not a subwindow or if the relocated window would lie outside the
-parent window.
-.Ds
-.Fn mvhline "int y" "int x" "chtype ch" "int count"
-.De
-Moves the cursor to the position
-.Vn (y ,
-.Vn x )
-and then draws a horizontal line in the same manner as
-.Fn hline .
-.Ds
-.Fn mvprintw "int y" "int x" "const char *fmt" "..."
-.De
-Equivalent to:
-.(l
-move(y, x);
-printw(fmt, ...);
-.)l
-.Ds
-.Fn mvscanw "int y" "int x" "const char *fmt" "..."
-.De
-Equivalent to:
-.(l
-move(y, x);
-scanw(fmt, ...);
-.)l
-.Ds
-.Fn mvvline "int y" "int x" "chtype ch" "int count"
-.De
-Moves the cursor to the position
-.Vn (y ,
-.Vn x )
-and then draws a vertical line in the same manner as
-.Fn vline .
-.Ds
-.Fn mvwhline "WINDOW *win" "int y" "int x" "chtype ch" "int count"
-.De
-Moves the cursor to the position
-.Vn (y ,
-.Vn x )
-on window 
-.Vn win
-and then draws a horizontal line in the same manner as
-.Fn whline .
-.Ds
-.Fn mvwvline "WINDOW *win" "int y" "int x" "chtype ch" "int count"
-.De
-Moves the cursor to the position
-.Vn (y ,
-.Vn x )
-on window 
-.Vn win
-and then draws a horizontal line in the same manner as
-.Fn wvline .
-.Ds
-.Fn mvwin "WINDOW *win" "int y" "int x"
-.De
-Move the home position of the window
-.Vn win
-from its current starting coordinates
-to
-.Vn y\*,x ). (
-If that would put part or all of the window
-off the edge of the terminal screen,
-.Fn mvwin
-returns ERR and does not change anything.
-For subwindows,
-.Fn mvwin
-also returns ERR if you attempt to move it off its main window.
-If you move a main window,
-all subwindows are moved along with it.
-.Ds
-.Fn mvwprintw "WINDOW *win" "int y" "int x" "const char *fmt" "..."
-.De
-Equivalent to:
-.(l
-wmove(win, y, x);
-printw(fmt, ...);
-.)l
-.Ds
-.Fn mvwscanw "WINDOW *win" "int y" "int x" "const char *fmt" "..."
-.De
-Equivalent to:
-.(l
-wmove(win, y, x);
-scanw(fmt, ...);
-.)l
-.Ds
-.Fn napms "int ms"
-.De
-Sleep for
-.Vn ms
-milliseconds.
-.Ds
-.Ft "WINDOW *"
-.Fn newpad "int lines" "int cols"
-.De
-Create a new pad with
-.Vn lines
-lines and
-.Vn cols
-columns.
-.Ds
-.Ft "SCREEN *"
-.Fn newterm "char *type" "FILE *outfd" "FILE *infd"
-.De
-Iinitialise the curses subsystem to use the terminal of type
-.Vn type
-connected via the input and output streams
-.Vn infd,outfd. 
-The 
-.Fn newterm
-is used in multi-terminal applications and returns a pointer to a
-.Ft "SCREEN"
-structure that holds the state for that particular terminal.  The
-application may swap between the terminals by calling the
-.Fn set_term
-function.  If the 
-.Vn type
-parameter is NULL then the $TERM variable is used as the terminal type.
-.Ds
-.Ft "WINDOW *"
-.Fn newwin "int lines" "int cols" "int begin_y" "int begin_x"
-.De
-Create a new window with
-.Vn lines
-lines and
-.Vn cols
-columns starting at position
-.Vn begin\*_y\*,begin\*_x ). (
-If either
-.Vn lines
-or
-.Vn cols
-is 0 (zero),
-that dimension will be set to
-.Vn "LINES \- begin\*_y" ) (
-or
-.Vn "COLS \- begin\*_x" ) (
-respectively.
-Thus, to get a new window of dimensions
-.Vn LINES
-\(mu
-.Vn COLS ,
-use
-.Fn newwin 0 0 0 0 .
-.Ds
-.Fn nl ""
-.De
-Set the terminal to nl mode,
-.i i.e. ,
-start/stop the system from mapping
-.b <RETURN>
-to
-.b <LINE-FEED> .
-If the mapping is not done,
-.Fn refresh
-can do more optimization,
-so it is recommended, but not required, to turn it off.
-.Ds
-.Fn no_color_video ""
-.De
-Return attributes that cannot be combined with color.
-.Ds
-.Fn nocbreak ""
-.De
-Unset the terminal from cbreak mode.
-.Ds
-.Fn nocrmode "" \(dg
-.De
-Identical to
-.Fn nocbreak .
-The misnamed macro
-.Fn nocrmode
-is retained for backwards compatibility
-with ealier versions of the library.
-.Ds
-.Fn nodelay "WINDOW *win1" "int boolf"
-.De
-Sets the boolean flag for non-blocking
-.Fn getch .
-If
-.Vn boolf
-is non-zero,
-.Fn getch
-will return ERR is no input is waiting.  The default
-is to for
-.Fn getch
-to block indefinitely.  See also
-.Fn timeout .
-.Ds
-.Fn noecho "" \(dg
-.De
-Turn echoing of characters off.
-.Ds
-.Fn nonl ""
-.De
-Unset the terminal to from nl mode.  See
-.Fn nl .
-.ne 1i
-.Ds
-.Fn noqiflush \(dg
-.De
-Unset the terminal flush on interrupt mode.
-This is equivalent to
-.Fn intrflush stdscr FALSE .
-.Ds
-.Fn noraw ""
-.De
-Unset the terminal from raw mode.  See
-.Fn raw .
-.Ds
-.Fn notimeout "WINDOW *win1" "int boolf"
-.De
-Sets the boolean flag for inter-key timeouts
-for escape sequences interpreted when
-.Fn keypad
-is set.
-By default,
-.Fn keypad
-sets a timer while waiting for the next character of
-an escape sequence.
-If
-.Vn boolf
-is non-zero,
-.Fn getch
-will wait indefinitely between escape sequence characters,
-or until a delay set by
-.Fn timeout
-expires.
-.Ds
-.Fn overlay "WINDOW *win1" "WINDOW *win2"
-.De
-Overlay
-.Vn win1
-on
-.Vn win2 .
-The contents of
-.Vn win1 ,
-insofar as they fit,
-are placed on
-.Vn win2
-at their starting \*y.
-This is done non-destructively,
-i.e., blanks on
-.Vn win1
-leave the contents of the space on
-.Vn win2
-untouched.  Note that all non-blank characters are overwritten
-destructively in the overlay.
-.Ds
-.Fn overwrite "WINDOW *win1" "WINDOW *win2"
-.De
-Overwrite
-.Vn win1
-on
-.Vn win2 .
-The contents of
-.Vn win1 ,
-insofar as they fit,
-are placed on
-.Vn win2
-at their starting \*y.
-This is done destructively,
-.i i.e. ,
-blanks on
-.Vn win1
-become blank on
-.Vn win2 .
-.Ds
-.Fn pair_content "short pair" "short *fore" "short *back"
-.De
-Get the foreground and background colors of pair
-.Vn pair .
-.Ds
-.Fn pechochar "const chtype ch" \(dg
-.De
-Add the character
-.Vn ch
-on the pad
-at the current \*y and immediately refresh the pad.
-.Ds 
-.Fn pnoutrefresh "WINDOW *pad" "int pbeg_y" "int pbeg_x" "int sbeg_y" "int sbeg_x" "int smax_y" "int smax_x"
-.De    
-Add the pad contents to a virtual screen.  Several pads can be added
-before a call to
-.Fn doupdate ,
-thus allowing the screen to updated in an efficient manner.
-.Ds
-.Fn prefresh "WINDOW *pad" "int pbeg_y" "int pbeg_x" "int sbeg_y" "int sbeg_x" "int smax_y" "int smax_x"
-.De 
-Synchronize the terminal screen with the desired pad.
-.Ds
-.Fn printw "char *fmt" "..."
-.De
-Performs a
-.Fn printf
-on the window starting at the current \*y.
-It uses
-.Fn addstr
-to add the string on the window.
-It is often advisable to use the field width options of
-.Fn printf
-to avoid leaving things on the window from earlier calls.
-\*(Es
-.Ds 
-.Fn putwin "WINDOW *win" "FILE *fp"
-.De
-Writes the window data to a file.
-.Ds
-.Fn qiflush \(dg
-.De
-Set the terminal flush on interrupt mode.
-This is equivalent to
-.Fn intrflush stdscr TRUE .
-.Ds
-.Fn raw ""
-.De
-Set the terminal to raw mode.
-On version 7
-.Un \**
-.(f
-\**
-.Un
-is a trademark of Unix System Laboratories.
-.)f
-this also turns off newline mapping
-(see
-.Fn nl ).
-.Ds
-.Fn redrawwin "WINDOW *win" \(dg
-.De
-Mark the entire window as having been corrupted.
-This is equivalent to the
-.Fn touchwin
-function.
-.Ds
-.Fn refresh "" \(dg
-.De
-Synchronize the terminal screen with the desired window.
-If the window is not a screen,
-only that part covered by it is updated.
-\*(Es
-In this case, it will update whatever it can
-without causing the scroll.
-.sp
-As a special case,
-if
-.Fn wrefresh
-is called with the window
-.Vn curscr
-the screen is cleared
-and repainted as it is currently.
-This is very useful for allowing the redrawing of the screen
-when the user has garbage dumped on his terminal.
-.Ds
-.Fn reset_prog_mode ""
-.De
-Restore the terminal to the \'in curses\' state.
-.Ds
-.Fn reset_shell_mode ""
-.De
-Restore the terminal to the \'not in curses\' state.
-.Ds
-.Fn resetty "" \(dg
-.De
-.Fn resetty
-restores them to what
-.Fn savetty
-stored.
-These functions are performed automatically by
-.Fn initscr
-and
-.Fn endwin .
-This function should not be used by the user.
-.Ds
-.Fn resizeterm "int lines" "int columns" \(dg
-.De
-Resizes the curses terminal to the given size.  All internal curses
-structures are resized to the new dimensions and all curses windows that
-would have boundaries outside the new terminal size will be resized to fit
-within the new boundaries.  All windows will be cleared and it is expected
-that the application will redraw the window contents.
-.Ds
-.Fn savetty "" \(dg
-.De
-.Fn savetty
-saves the current tty characteristic flags. See
-.Fn resetty .
-This function should not be used by the user.
-.Ds
-.Fn scanw "char *fmt" "..."
-.De
-Perform a
-.Fn scanf
-through the window using
-.Vn fmt .
-It does this using consecutive calls to
-.Fn getch
-(or
-.Fn wgetch ).
-\*(Es
-.ne 1i
-.Ds
-.Fn scrl "int n"
-.De
-Scroll the window by
-.Vn n
-lines. If
-.Vn n
-is positive, scroll upward, otherwise
-scroll downward.
-.Ds
-.Fn scroll "WINDOW *win"
-.De
-Scroll the window upward one line.
-This is normally not used by the user.
-.Ds
-.Fn scrollok "WINDOW *win" "int boolf" \(dg
-.De
-Set the scroll flag for the given window.
-If
-.Vn boolf
-is 0, scrolling is not allowed.
-This is its default setting.
-.Ds
-.Ft "SCREEN *"
-.Fn set_term "SCREEN *new"
-.De
-Sets the current screen for input and output to be the one given.  The 
-.Vn new
-structure must be one that has been previously created by the 
-.Fn newterm
-function.  The 
-.Fn set_term
-function returns the previous screen on successful completion.
-.Ds
-.Fn standend "" \(dg
-.De
-End standout mode initiated by
-.Fn standout .
-This function is provided for compatibility
-with older curses implementations.
-.Ds
-.Fn standout "" \(dg
-.De
-Causes any characters added to the window
-to be put in standout mode on the terminal
-(if it has that capability).  This function
-is provided for compatibility with older curses
-implementations.  A larger range of character
-attributes supported by modern terminals can be
-accessed using
-.Fn attron
-and
-.Fn attrset .
-.Ds
-.Fn start_color ""
-.De
-Initialize the color routines. 
-This must be called before any of the color routines are used.
-The terminal is setup to use the curses default colors of white foreground
-on black background, unless
-.Fn assume_default_colors
-or
-.Fn use_default_colors
-are called.
-.Ds
-.Ft "WINDOW *"
-.Fn subpad "WINDOW *win" "int lines" "int cols" "int begin_y" "int begin_x"
-.De
-Create a new pad with
-.Vn lines
-lines and
-.Vn cols
-columns starting at position
-.Vn begin\*_y\*,begin\*_x ) (
-inside the pad
-.i win .
-This means that any change made to either pad
-in the area covered
-by the subpad will be made on both pads.
-.Vn begin\*_y\*,begin\*_x
-are specified relative to the relative (0\*,0) of
-.Vn win .
-.Ds
-.Ft "WINDOW *"
-.Fn subwin "WINDOW *win" "int lines" "int cols" "int begin_y" "int begin_x"
-.De
-Create a new window with
-.Vn lines
-lines and
-.Vn cols
-columns starting at position
-.Vn begin\*_y\*,begin\*_x ) (
-inside the window
-.i win .
-This means that any change made to either window
-in the area covered
-by the subwindow will be made on both windows.
-.Vn begin\*_y\*,begin\*_x
-are specified relative to the overall screen,
-not the relative (0\*,0) of
-.Vn win .
-If either
-.Vn lines
-or
-.Vn cols
-is 0 (zero),
-that dimension will be set to
-.Vn "LINES \- begin\*_y" ) (
-or
-.Vn "COLS \- begin\*_x" ) (
-respectively.
-.Ds
-.Fn termattrs ""
-.De
-Returns the attributes that can be applied to the screen.
-.Ds
-.Fn term_attrs ""
-.De
-Returns the wide attributes that can be applied to the screen.
-.Ds
-.Fn timeout "int delay" \(dg
-.De
-Sets blocking or non-blocking
-.Fn getch .
-If
-.Vn delay
-is positive,
-.Fn getch
-will block for
-.Vn delay
-milliseconds before returning.  If
-.Vn delay
-is zero,
-.Fn getch
-will return ERR is no input is waiting.  If
-.Vn delay
-is negative,
-.Fn getch
-will block indefinitely.  See also
-.Fn keypad ,
-.Fn nodelay
-and
-.Fn notimeout .
-.Ds
-.Fn touchline "WINDOW *win" "int y" "int startx" "int endx"
-.De
-This function performs a function similar to
-.Fn touchwin
-on a single line.
-It marks the first change for the given line
-to be
-.Vn startx ,
-if it is before the current first change mark,
-and
-the last change mark is set to be
-.Vn endx
-if it is currently less than
-.Vn endx .
-.Ds
-.Fn touchoverlap "WINDOW *win1" "WINDOW *win2"
-.De
-Touch the window
-.Vn win2
-in the area which overlaps with
-.Vn win1 .
-If they do not overlap,
-no changes are made.
-.Ds
-.Fn touchwin "WINDOW *win"
-.De
-Make it appear that the every location on the window
-has been changed.
-This is usually only needed for refreshes with overlapping windows.
-.Ds
-.Fn tstp
-.De
-This function
-will save the current tty state
-and then put the process to sleep.
-When the process gets restarted,
-it restores the saved tty state
-and then calls
-.Fn wrefresh "curscr"
-to redraw the screen.
-.Fn Initscr
-sets the signal
-SIGTSTP
-to trap to this routine.
-.Ds
-.Fn unctrl "char *ch" \(dg
-.De
-Returns a string which is an ASCII representation of
-.Vn ch .
-Characters are 8 bits long.
-.Ds
-.Fn unctrllen "char *ch" \(dg
-.De
-Returns the length of the ASCII representation of
-.Vn ch .
-.ne 1i
-.Ds
-.Fn underend "" \(dg
-.De
-End underscore mode initiated by
-.Fn underscore .
-This is equivalent to
-.Fn attroff "A_UNDERLINE" .
-.Ds
-.Fn underscore "" \(dg
-.De
-Causes any characters added to the window
-to be put in underscore mode on the terminal
-(if it has that capability).
-This is equivalent to
-.Fn attron "A_UNDERLINE" .
-.Ds
-.Fn ungetch "int c"
-.De
-Places the contents of
-.Vn c
-converted to a character back into the input queue.  Only one
-character of push back before a subsequent call to
-.Fn getch
-or
-.Fn wgetch
-is guaranteed to function correctly.  The results of attempting more
-than one character of push back is undefined.
-.Ds
-.Fn untouchwin "WINDOW *win"
-.De
-Make the window appear to have not been updated even if it has been.
-.Ds
-.Fn use_default_colors ""
-.De
-Use the terminal foreground and background colors as the curses default
-foreground and background colors.
-.Ds
-.Fn vline "chtype ch" "int count"
-.De
-Draws a vertical line of character
-.Vn ch
-starting at the current cursor location and moving towards the bottom
-of the screen.  At most
-.Vn count
-characters are drawn, less if the bottom of the screen is reached
-before
-.Vn count
-expires.
-.Ds
-.Fn vwprintw "WINDOW *win" "const char *fmt" "va_list ap"
-.De
-Identical to
-.Fn printw
-except that it takes both a window specification and a pointer to a variable
-length argument list.
-.Ds
-.Fn vwscanw "WINDOW *win" "const char *fmt" "va_list ap"
-.De
-Identical to
-.Fn scanw
-except that it takes both a window specification and a pointer to a variable
-length argument list.
-.Ds
-.Fn wnoutrefresh "WINDOW *win"
-.De
-Add the window contents to a virtual screen.  Several windows can be added
-before a call to
-.Fn doupdate ,
-thus allowing the screen to updated in an efficient manner.
-.Ds
-.Fn wredrawln "WINDOW *win" "int line" "int n" \(dg
-.De
-Mark
-.Vn n
-lines starting at
-.Vn line
-in the window as corrupted.
-This is equivalent to
-.Fn wtouchln "win" "line" "n" "1" .
-.Ds
-.Fn wresize "WINDOW *win" "int lines" "int columns"
-.De
-Resize the specified window to the given dimensions.  The window will be
-cleared and the application is expected to redraw the window contents.
-.Ds
-.Fn wtouchln "WINDOW *win" "int line" "int n" "int changed"
-.De
-If 
-.Vn changed
-is 1 then 
-.Vn n
-lines starting at
-.Vn line
-in the window are touched.  If
-.Vn changed
-is 0 then 
-.Vn n
-lines starting at
-.Vn line
-in the window are untouched.
-.sp 2
-.pp
-\fIThe following functions differ from the standard functions only in their
-specification of a window, rather than the use of the default
-.Vn stdscr.\fP
-.Ds
-.Fn waddbytes "WINDOW *win" "char* str" "int len"
-.Fn waddch "WINDOW *win" "chtype ch"
-.Fn waddchnstr "WINDOW *win" "chtype *str" "int len"
-.Fn waddchstr "WINDOW *win" "chtype *str" "int len"
-.Fn waddnstr "WINDOW *win" "char *str" "int len"
-.Fn waddstr "WINDOW *win" "char *str"
-.Fn wattroff "WINDOW *win" "int attr"
-.Fn wattron "WINDOW *win" "int attr"
-.Fn wattrset "WINDOW *win" "int attr"
-.Fn wbkgd "WINDOW *win" "chtype ch"
-.Fn wbkgdset "WINDOW *win" "chtype ch"
-.Fn wborder "WINDOW *win" "chtype left" "chtype right" "chtype top" "chtype bottom" "chtype topleft" "chtype topright" "chtype botleft" "chtype botright"
-.Fn wclear "WINDOW *win"
-.Fn wclrtobot "WINDOW *win"
-.Fn wclrtoeol "WINDOW *win"
-.Fn wdelch "WINDOW *win"
-.Fn wdeleteln "WINDOW *win"
-.Fn wechochar "WINDOW *win" "chtype ch"
-.Fn werase "WINDOW *win"
-.Fn wgetch "WINDOW *win"
-.Fn wgetnstr "WINDOW *win" "char *str" "int len"
-.Fn wgetstr "WINDOW *win" "char *str"
-.Fn whline "WINDOW *win" "chtype ch" "int count"
-.Fn winch "WINDOW *win" \(dg
-.Fn winchnstr "WINDOW *win" "chtype *chstr" "int n"
-.Fn winchstr "WINDOW *win" "chtype *chstr"
-.Fn winnstr "WINDOW *win" "char *str" "int n"
-.Fn winsch "WINDOW *win" "char c"
-.Fn winsdelln "WINDOW *win" "int n"
-.Fn winsertln "WINDOW *win"
-.Fn winstr "WINDOW *win" "char *str"
-.Fn wmove "WINDOW *win" "int y" int x"
-.Fn wprintw "WINDOW *win" "char *fmt" "..."
-.Fn wrefresh "WINDOW *win"
-.Fn wscanw "WINDOW *win" "char *fmt" "..."
-.Fn wscrl "WINDOW *win" "int n"
-.Fn wstandend "WINDOW *win"
-.Fn wstandout "WINDOW *win"
-.Fn wtimeout "WINDOW *win" "int delay"
-.Fn wunderend "WINDOW *win"
-.Fn wunderscore "WINDOW *win"
-.Fn wvline "WINDOW *win" "chtype ch" "int count"
-.Fn mvwaddch "WINDOW *win" "int y" "int x" "chtype ch"
-.Fn mvwaddchstr "WINDOW *win" "int y" "int x" "chtype *str" \(dg
-.Fn mvwaddchnstr "WINDOW *win" "int y" "int x" "chtype *str" \(dg
-.Fn mvwaddnstr "WINDOW *win" "int y" "int x" "char *str" "int len"
-.Fn mvwaddstr "WINDOW *win" "int y" "int x" "char *str"
-.Fn mvwgetnstr "WINDOW *win" "int y" "int x" "char *str" "int len"
-.Fn mvwgetstr "WINDOW *win" "int y" "int x" "char *str"
-.Fn mvwhline "WINDOW *win" "int y" "int x" "chtype ch" "int count"
-.Fn mvwvline "WINDOW *win" "int y" "int x" "chtype ch" "int count"
-
-.Dg
diff --git a/lib/libcurses/PSD.doc/intro.0 b/lib/libcurses/PSD.doc/intro.0
deleted file mode 100644
index ae6b808cc..000000000
--- a/lib/libcurses/PSD.doc/intro.0
+++ /dev/null
@@ -1,104 +0,0 @@
-.\"	$NetBSD: intro.0,v 1.6 2003/08/07 16:44:27 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)intro.0	8.1 (Berkeley) 6/4/93
-.\"
-.tp
-.(l C
-.ps 12
-.ft B
-Screen Updating and Cursor Movement Optimization:
-.fl
-A Library Package
-.ft
-.ps
-.sp
-.i "Kenneth C. R. C. Arnold"
-.i "Elan Amir"
-.sp
-Computer Science Division
-Department of Electrical Engineering and Computer Science
-University of California, Berkeley
-Berkeley, California  94720
-.sp 3
-.bi ABSTRACT
-.sp 2
-.)l
-.(q
-.pp
-This document describes a package of C library functions
-which allow the user to:
-.ie t .ip \ \ \ \(bu
-.el .ip 1)
-update a screen with reasonable optimization,
-.ie t .ip \ \ \ \(bu
-.el .ip 2)
-get input from the terminal
-in a screen-oriented fashion,
-and
-.ie t .ip \ \ \ \(bu
-.el .ip 3)
-independent from the above, move the cursor optimally
-from one point to another.
-.pp
-These routines all use the
-\*(tc \*(db to describe the capabilities of the terminal.
-.)q
-.b Acknowledgements
-.pp
-This package would not exist
-without the work of Bill Joy,
-who,
-in writing his editor,
-created the capability to generally describe terminals,
-wrote the routines which read this \*(db,
-and, most importantly,
-those which implement optimal cursor movement,
-which routines I have simply lifted nearly intact.
-Doug Merritt and Kurt Shoens also were extremely important,
-as were both willing to waste time listening to me rant and rave.
-The help and/or support of
-Ken Abrams,
-Alan Char,
-Mark Horton,
-and
-Joe Kalash,
-was, and is,
-also greatly appreciated.
-.i "Ken Arnold    16 April 1986"
-.pp
-The help and/or support of Kirk McKusick and Keith Bostic (public vi!)
-was invaluable in bringing the package ``into the 90's'', which now
-includes completely new data structures and screen refresh optimization
-routines.
-.i "Elan Amir   29 December 1992"
-
-
-
-
diff --git a/lib/libcurses/PSD.doc/intro.1 b/lib/libcurses/PSD.doc/intro.1
deleted file mode 100644
index 14d1e39b0..000000000
--- a/lib/libcurses/PSD.doc/intro.1
+++ /dev/null
@@ -1,247 +0,0 @@
-.\"	$NetBSD: intro.1,v 1.7 2003/08/07 16:44:27 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)intro.1	8.1 (Berkeley) 6/4/93
-.\"
-.bp
-.sh 1 Overview
-.pp
-In making available the generalized terminal descriptions in \*(tc,
-much information was made available to the programmer,
-but little work was taken out of one's hands.
-The purpose of this package is to allow the C programmer
-to do the most common type of terminal dependent functions,
-those of movement optimization and optimal screen updating,
-without doing any of the dirty work,
-and with nearly as much ease as is necessary to simply print
-or read things.
-.sh 2 "Terminology"
-.pp
-In this document, the following terminology is used:
-.de Ip
-.sp
-.in 5n
-.ti 0n
-.b "\\$1" :
-..
-.Ip window
-An internal representation
-containing an image of what a section of the terminal screen may look like
-at some point in time.
-This subsection can either encompass the entire terminal screen,
-or any smaller portion down to a single character within that screen.
-.Ip terminal
-Sometimes called
-.b terminal
-.b screen .
-The package's idea of what the terminal's screen currently looks like,
-.i i.e. ,
-what the user sees now.
-This is a special
-.i screen :
-.Ip screen
-This is a subset of windows which are as large as the terminal screen,
-.i i.e. ,
-they start at the upper left hand corner
-and encompass the lower right hand corner.
-One of these,
-.Vn stdscr ,
-is automatically provided for the programmer.
-.rm Ip
-.sh 2 "Compiling Applications"
-.pp
-In order to use the library,
-it is necessary to have certain types and variables defined.
-Therefore, the programmer must have a line:
-.(l
-.b "#include <curses.h>"
-.)l
-at the top of the program source.
-Compilations should have the following form:
-.(l
-.ie t \fBcc\fR [ \fIflags\fR ] file ... \fB\-lcurses \-ltermcap\fR
-.el \fIcc\fR [ flags ] file ... \fI\-lcurses \-ltermcap\fR
-.)l
-.sh 2 "Screen Updating"
-.pp
-In order to update the screen optimally,
-it is necessary for the routines to know what the screen currently looks like
-and what the programmer wants it to look like next.
-For this purpose,
-a data type
-(structure)
-named
-.Vn WINDOW
-is defined
-which describes a window image to the routines,
-including its starting position on the screen
-(the \*y of the upper left hand corner)
-and its size.
-One of these
-(called
-.Vn curscr
-for
-.i "current screen" )
-is a screen image of what the terminal currently looks like.
-Another screen
-(called
-.Vn stdscr ,
-for
-.i "standard screen" )
-is provided
-by default
-to make changes on.
-.pp
-A window is a purely internal representation.
-It is used to build and store
-a potential image of a portion of the terminal.
-It doesn't bear any necessary relation
-to what is really on the terminal screen.
-It is more like an array of characters on which to make changes.
-.pp
-When one has a window which describes
-what some part the terminal should look like,
-the routine
-.Fn refresh
-(or
-.Fn wrefresh
-if the window is not
-.Vn stdscr )
-is called.
-.Fn refresh
-makes the terminal,
-in the area covered by the window,
-look like that window.
-Note, therefore, that changing something on a window
-.i does
-.bi not
-.i "change the terminal" .
-Actual updates to the terminal screen
-are made only by calling
-.Fn refresh
-or
-.Fn wrefresh .
-This allows the programmer to maintain several different ideas
-of what a portion of the terminal screen should look like.
-Also, changes can be made to windows in any order,
-without regard to motion efficiency.
-Then, at will,
-the programmer can effectively say
-.q "make it look like this" ,
-and the package will execute the changes in an optimal way.
-.sh 2 "Naming Conventions"
-.pp
-As hinted above,
-the routines can use several windows,
-but two are always available:
-.Vn curscr ,
-which is the image of what the terminal looks like at present,
-and
-.Vn stdscr ,
-which is the image of what the programmer wants the terminal to look like next.
-The user should not access
-.Vn curscr
-directly.
-Changes should be made to
-the appropriate screen,
-and then the routine
-.Fn refresh
-(or
-.Fn wrefresh )
-should be called.
-.pp
-Many functions are set up to deal with
-.Vn stdscr
-as a default screen.
-For example, to add a character to
-.Vn stdscr ,
-one calls
-.Fn addch
-with the desired character.
-If a different window is to be used,
-the routine
-.Fn waddch
-(for
-.b w indow-specific
-.Fn addch )
-is provided\**.
-.(f
-\**
-Actually,
-.Fn addch
-is really a
-.q #define
-macro with arguments,
-as are most of the "functions" which act upon
-.Vn stdscr .
-.)f
-This convention of prepending function names with a
-.Bq w
-when they are to be applied to specific windows
-is consistent.
-The only routines which do
-.i not
-do this are those
-to which a window must always be specified.
-.pp
-In order to move the current \*y from one point to another,
-the routines
-.Fn move
-and
-.Fn wmove
-are provided.
-However,
-it is often desirable to first move and then perform some I/O operation.
-In order to avoid clumsiness,
-most I/O routines can be preceded by the prefix
-.Bq mv
-and the desired \*y can then be added to the arguments to the function.
-For example,
-the calls
-.(l
-move(y\*,x);
-addch(ch);
-.)l
-can be replaced by
-.(l
-mvaddch(y\*,x\*,ch);
-.)l
-and
-.(l
-wmove(win\*,y\*,x);
-waddch(win\*,ch);
-.)l
-can be replaced by
-.(l
-mvwaddch(win\*,y\*,x\*,ch);
-.)l
-Note that the window description pointer
-.Vn win ) (
-comes before the added \*y.
-If a window pointer is needed, it is always the first parameter passed.
diff --git a/lib/libcurses/PSD.doc/intro.2 b/lib/libcurses/PSD.doc/intro.2
deleted file mode 100644
index be3d46800..000000000
--- a/lib/libcurses/PSD.doc/intro.2
+++ /dev/null
@@ -1,82 +0,0 @@
-.\"	$NetBSD: intro.2,v 1.8 2003/08/07 16:44:28 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)intro.2	8.1 (Berkeley) 6/4/93
-.\"
-.sh 1 Variables
-.pp
-Many variables which are used to describe the terminal environment
-are available to the programmer.
-They are:
-.(b
-.TS
-expand;
-lw(6m) lw(8n) lw(50n).
-type	name	description
-_
-WINDOW *	curscr	T{
-.fi
-current version of the screen (terminal screen).
-T}
-WINDOW *	stdscr	T{
-standard screen.
-Most updates are usually done here.
-T}
-char *	Def\*_term	T{
-default terminal type if type cannot be determined
-T}
-bool	My\*_term	T{
-use the terminal specification in \fIDef\*_term\fR as terminal,
-irrelevant of real terminal type
-T}
-char *	ttytype	T{
-full name of the current terminal.
-T}
-int	LINES	T{
-number of lines on the terminal
-T}
-int	COLS	T{
-number of columns on the terminal
-T}
-int	COLORS	T{
-number of colors on the terminal
-T}
-int	COLOR_PAIRS	T{
-number of color pairs on the terminal
-T}
-int	ERR	T{
-error flag returned by routines on a fail.
-T}
-int	OK	T{
-flag returned by routines upon success.
-T}
-.TE
-.fi
-.)b
-.lp
diff --git a/lib/libcurses/PSD.doc/intro.3 b/lib/libcurses/PSD.doc/intro.3
deleted file mode 100644
index 2d67b822b..000000000
--- a/lib/libcurses/PSD.doc/intro.3
+++ /dev/null
@@ -1,228 +0,0 @@
-.\"	$NetBSD: intro.3,v 1.9 2003/11/02 11:16:03 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)intro.3	8.1 (Berkeley) 6/4/93
-.\"
-.sh 1 Usage
-.pp
-This is a description of how to actually use the screen package.
-For simplicity, we assume all updating, reading, etc.
-is applied to
-.Vn stdscr ,
-although a different window can of course be specified.
-.sh 2 "Initialization"
-.pp
-In order to use the screen package,
-the routines must know about terminal characteristics,
-and the space for
-.Vn curscr
-and
-.Vn stdscr
-must be allocated.
-These functions are performed by
-.Fn initscr .
-Since it must allocate space for the windows,
-it can overflow core when attempting to do so.
-On this rather rare occasion,
-.Fn initscr
-returns ERR.
-.Fn initscr
-must
-.bi always
-be called before any of the routines which affect windows are used.
-If it is not,
-the program will core dump as soon as either
-.Vn curscr
-or
-.Vn stdscr
-are referenced.
-However, it is usually best to wait to call it
-until after you are sure you will need it,
-like after checking for startup errors.
-Terminal status changing routines
-like
-.Fn nl
-and
-.Fn cbreak
-should be called after
-.Fn initscr .
-.pp
-After the initial window allocation done by
-.Fn initscr ,
-specific window characteristics can be set.
-Scrolling can be enabled by calling
-.Fn scrollok .
-If you want the cursor to be left after the last change, use
-.Fn leaveok .
-If this isn't done,
-.Fn refresh
-will move the cursor to the window's current \*y after updating it.
-Additional windows can be created by using the functions
-.Fn newwin
-and
-.Fn subwin .
-.Fn delwin
-allows you to delete an existing window.
-The variables
-.Vn LINES
-and
-.Vn COLS
-control the size of the terminal.
-They are initially implicitly set by
-.Fn initscr ,
-but can be altered explicitly by the user followed by a call to
-.Fn initscr .
-Note that any call to
-.Fn initscr ,
-will always delete any existing
-.Vn stdscr
-and/or
-.Vn curscr
-before creating new ones so this change is best done before the initial call to
-.Fn initscr .
-.pp
-.sh 2 "Output"
-.pp
-The basic functions
-used to change what will go on a window are
-.Fn addch
-and
-.Fn move .
-.Fn addch
-adds a character at the current \*y,
-returning ERR if it would cause the window to illegally scroll,
-.i i.e. ,
-printing a character in the lower right-hand corner
-of a terminal which automatically scrolls
-if scrolling is not allowed.
-.Fn move
-changes the current \*y to whatever you want them to be.
-It returns ERR if you try to move off the window.
-As mentioned above, you can combine the two into
-.Fn mvaddch
-to do both things in one call.
-.pp
-The other output functions
-(such as
-.Fn addstr
-and
-.Fn printw )
-all call
-.Fn addch
-to add characters to the window.
-.pp
-After a change has been made to the window,
-you must call
-.Fn refresh .
-when you want the portion of the terminal covered by the window
-to reflect the change.
-In order to optimize finding changes,
-.Fn refresh
-assumes that any part of the window not changed
-since the last
-.Fn refresh
-of that window has not been changed on the terminal,
-.i i.e. ,
-that you have not refreshed a portion of the terminal
-with an overlapping window.
-If this is not the case,
-the routines
-.Fn touchwin ,
-.Fn touchline ,
-and
-.Fn touchoverlap
-are provided to make it look like a desired part of window has been changed,
-thus forcing
-.Fn refresh
-to check that whole subsection of the terminal for changes.
-.pp
-If you call
-.Fn wrefresh
-with
-.Vn curscr ,
-it will make the screen look like the image of
-.Vn curscr .
-This is useful for implementing a command
-which would redraw the screen in case it got messed up.
-.sh 2 Input
-.pp
-Input is essentially a mirror image of output.
-The complementary function to
-.Fn addch
-is
-.Fn getch
-which,
-if echo is set,
-will call
-.Fn addch
-to echo the character.
-Since the screen package needs to know what is on the terminal at all times,
-if characters are to be echoed,
-the tty must be in raw or cbreak mode.
-If it is not,
-.Fn getch
-sets it to be cbreak,
-and then reads in the character.
-.sh 2 "Termination"
-.pp
-In order to perform certain optimizations,
-and,
-on some terminals,
-to work at all,
-some things must be done
-before the screen routines start up.
-These functions are performed in
-.Fn getttmode
-and
-.Fn setterm ,
-which are called by
-.Fn initscr .
-In order to clean up after the routines,
-the routine
-.Fn endwin
-is provided.
-It restores tty modes to what they were
-when
-.Fn initscr
-was first called.
-The terminal state module uses the variable
-.Vn curses_termios
-to save the original terminal state which is then restored upon a call to
-.Fn endwin .
-Thus,
-anytime after the call to initscr,
-.Fn endwin
-should be called before exiting.
-Note however, that
-.Fn endwin
-should always be called
-.b before
-the final calls to
-.Fn delwin ,
-which free the storage of the windows.
diff --git a/lib/libcurses/PSD.doc/intro.4 b/lib/libcurses/PSD.doc/intro.4
deleted file mode 100644
index af62690ae..000000000
--- a/lib/libcurses/PSD.doc/intro.4
+++ /dev/null
@@ -1,67 +0,0 @@
-.\"	$NetBSD: intro.4,v 1.5 2003/08/07 16:44:28 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)intro.4	8.1 (Berkeley) 6/4/93
-.\"
-.sh 1 "Cursor Movement Optimizations"
-.pp
-One of the most difficult things to do properly is motion optimization.
-After using
-.Fn gettmode
-and
-.Fn setterm
-to get the terminal descriptions,
-the function
-.Fn mvcur
-deals with this task.
-It usage is simple:
-simply tell it where you are now and where you want to go.
-For example
-.(l
-mvcur(0\*,0\*,LINES/2\*,COLS/2);
-.)l
-.lp
-would move the cursor from the home position (0\*,0)
-to the middle of the screen.
-If you wish to force absolute addressing,
-you can use the function
-.Fn tgoto
-from the
-.b termlib (7)
-routines,
-or you can tell
-.Fn mvcur
-that you are impossibly far away,
-For example,
-to absolutely address the lower left hand corner of the screen
-from anywhere
-just claim that you are in the upper right hand corner:
-.(l
-mvcur(0\*,COLS\-1\*,LINES\-1\*,0);
-.)l
diff --git a/lib/libcurses/PSD.doc/intro.5 b/lib/libcurses/PSD.doc/intro.5
deleted file mode 100644
index 50bd75adb..000000000
--- a/lib/libcurses/PSD.doc/intro.5
+++ /dev/null
@@ -1,90 +0,0 @@
-.\"	$NetBSD: intro.5,v 1.8 2003/11/02 11:16:03 wiz Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)intro.5	8.1 (Berkeley) 6/4/93
-.\"
-.sh 1 "Character Output and Scrolling"
-.pp
-The character output policy deals with the following problems.
-First, where is the location of the cursor after a character is printed, and
-secondly, when does the screen scroll if scrolling is enabled.
-.pp
-In the normal case the characters are output as expected, with the cursor
-occupying the position of the next character to be output.
-However, when the
-cursor is on the last column of the line, the cursor will remain on that
-position after the last character on the line is output and will only assume
-the position on the next line when the next character (the first on the next
-line) is output.
-.pp
-Likewise, if scrolling is enabled, a scroll will be invoked only when the
-first character on he first line past the bottom line of the window is
-output.
-If scrolling is not enabled the chracters will to be output to the
-bottom right corner of the window which is the cursor location.
-.pp
-This policy allows consistent behavior of the cursor at the boundary
-conditions.
-Furthermore, it prevents a scroll from happening before it is
-actually needed (the old package used to scroll when the bottom right position
-was output a character).
-As a precedent, it models the
-.i xterm
-character output conventions.
-.sh 1 "Terminal State Handling"
-.pp
-The variable
-.Vn curses_termios
-contains the terminal state of the terminal.
-Certain historical routines return information:
-.Fn baudrate ,
-.Fn erasechar ,
-.Fn killchar ,
-and
-.Fn ospeed .
-These routines are obsolete and exist only for backward compatibility.
-If you wish to use the information in the
-.Vn curses_termios
-structure, you should use the
-\fItsetattr\fP(3)
-routines.
-.sh 1 "Subwindows"
-.pp
-Subwindows are windows which do not have an independent text structure,
-.i i.e. ,
-they are windows whose text is a subset of the text of a larger window: the
-.i parent
-window.
-One consequence of this is that changes to either the parent or the
-child window are destructive to the other,
-.i i.e. ,
-a change to the subwindow is also a change to the parent window and a change
-to the parent window in the region defined by the subwindow is implicitly a
-change to the subwindow as well.
-Apart from this detail, subwindows function like any other window.
diff --git a/lib/libcurses/PSD.doc/intro.6 b/lib/libcurses/PSD.doc/intro.6
deleted file mode 100644
index 7a16ebacd..000000000
--- a/lib/libcurses/PSD.doc/intro.6
+++ /dev/null
@@ -1,44 +0,0 @@
-.\"	$NetBSD: intro.6,v 1.6 2003/08/07 16:44:28 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)intro.6	8.1 (Berkeley) 6/4/93
-.\"
-.sh 1 "The Functions"
-.pp
-In the following definitions,
-.q \*m
-means that if
-.Vn _CURSES_USE_MACROS
-is defined, the
-.q function
-is really a
-.q #define
-macro with arguments.
-.ta 11m 17m 25m 33m 41m 49m 57m 65m 73m
-.so fns.doc
diff --git a/lib/libcurses/PSD.doc/life.c b/lib/libcurses/PSD.doc/life.c
deleted file mode 100644
index 72a15945e..000000000
--- a/lib/libcurses/PSD.doc/life.c
+++ /dev/null
@@ -1,161 +0,0 @@
-.\"	$NetBSD: life.c,v 1.6 2003/08/07 16:44:28 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)life.c	8.1 (Berkeley) 6/8/93
-.\"
-# include	<curses.h>
-# include	<signal.h>
-
-/*
- *	Run a life game.  This is a demonstration program for
- * the Screen Updating section of the -lcurses cursor package.
- */
-
-typedef struct lst_st {			/* linked list element */
-	int		y, x;		/* (y, x) position of piece */
-	struct lst_st	*next, *last;	/* doubly linked */
-} LIST;
-
-LIST	*Head;			/* head of linked list */
-
-int	die();
-
-main(ac, av)
-int	ac;
-char	*av[];
-{
-	evalargs(ac, av);		/* evaluate arguments */
-
-	initscr();			/* initialize screen package */
-	signal(SIGINT, die);		/* set to restore tty stats */
-	cbreak();			/* set for char-by-char */
-	noecho();			/*	input */
-	nonl();				/* for optimization */
-
-	getstart();			/* get starting position */
-	for (;;) {
-		prboard();		/* print out current board */
-		update();		/* update board position */
-	}
-}
-
-/*
- * This is the routine which is called when rubout is hit.
- * It resets the tty stats to their original values.  This
- * is the normal way of leaving the program.
- */
-die()
-{
-	signal(SIGINT, SIG_IGN);		/* ignore rubouts */
-	mvcur(0, COLS - 1, LINES - 1, 0);	/* go to bottom of screen */
-	endwin();				/* set terminal to good state */
-	exit(0);
-}
-
-/*
- * Get the starting position from the user.  They keys u, i, o, j, l,
- * m, ,, and . are used for moving their relative directions from the
- * k key.  Thus, u move diagonally up to the left, , moves directly down,
- * etc.  x places a piece at the current position, " " takes it away.
- * The input can also be from a file.  The list is built after the
- * board setup is ready.
- */
-getstart()
-{
-	reg char	c;
-	reg int		x, y;
-	auto char	buf[100];
-
-	box(stdscr, '|', '_');		/* box in the screen */
-	move(1, 1);			/* move to upper left corner */
-
-	for (;;) {
-		refresh();		/* print current position */
-		if ((c = getch()) == 'q')
-			break;
-		switch (c) {
-		  case 'u':
-		  case 'i':
-		  case 'o':
-		  case 'j':
-		  case 'l':
-		  case 'm':
-		  case ',':
-		  case '.':
-			adjustyx(c);
-			break;
-		  case 'f':
-			mvaddstr(0, 0, "File name: ");
-			getstr(buf);
-			readfile(buf);
-			break;
-		  case 'x':
-			addch('X');
-			break;
-		  case ' ':
-			addch(' ');
-			break;
-		}
-	}
-
-	if (Head != NULL)			/* start new list */
-		dellist(Head);
-	Head = malloc(sizeof (LIST));
-
-	/*
-	 * loop through the screen looking for 'x's, and add a list
-	 * element for each one
-	 */
-	for (y = 1; y < LINES - 1; y++)
-		for (x = 1; x < COLS - 1; x++) {
-			move(y, x);
-			if (inch() == 'x')
-				addlist(y, x);
-		}
-}
-
-/*
- * Print out the current board position from the linked list
- */
-prboard() {
-
-	reg LIST	*hp;
-
-	erase();			/* clear out last position */
-	box(stdscr, '|', '_');		/* box in the screen */
-
-	/*
-	 * go through the list adding each piece to the newly
-	 * blank board
-	 */
-	for (hp = Head; hp; hp = hp->next)
-		mvaddch(hp->y, hp->x, 'X');
-
-	refresh();
-}
diff --git a/lib/libcurses/PSD.doc/macros b/lib/libcurses/PSD.doc/macros
deleted file mode 100644
index a4773b4cf..000000000
--- a/lib/libcurses/PSD.doc/macros
+++ /dev/null
@@ -1,143 +0,0 @@
-.\"	$NetBSD: macros,v 1.8 2004/04/27 02:15:04 uwe Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)macros	8.1 (Berkeley) 8/14/93
-.\"
-.\" this is the uncommented version.  The commented one is in "macros.coms"
-.ie t .ds _ \d\(mi\u
-.el .ds _ _
-.ds , ,\ \" attention: trailing space
-.ds y (y\*,x) co-ordinates
-.ds db database
-.ie n .ds f \fI
-.el .ds f \fB
-.ds tc \*ftermcap\fP(5)
-.ds Es This returns ERR if it would cause the screen to scroll illegally.
-.ds Nm This has no associated \*(lq\fBmv\fP\*(rq command.
-.ie t .ds m \fB\s-2\(dg\s+2\fP
-.el .ds m [*]
-.\" .hy WINDOW
-.\".he ''\*(Ln''
-.\".fo ''\- % \-''
-.oh '\*(Ln''PS1:19-%'
-.eh 'PS1:19-%''\*(Ln'
-.de Un
-.b
-\s-2\\$2UNIX\\$1\s+2
-.ft
-..
-.de Ds
-.sp
-.lp
-.ev 1
-.nf
-.ft I
-.in 0
-.di
-.Df
-..
-.de De
-.di
-.Df
-.ne \n(dn+2
-.ev
-.ip
-..
-.de Dg
-.di
-.Df
-.ne \n(dn+2
-.ev
-..
-.de Fd
-.br
-\&\\$4
-.fi
-.b
-\&\\$1(\\$2)
-.ft
-\&\\$3
-.br
-.nf
-..
-.de Vn
-\&\\$3\c
-.i "\\$1" \\$2
-..
-.de Bq
-.ie t \&\*(lq\fB\\$1\fP\*(rq
-.el \&\*(lq\fI\\$1\fP\*(rq
-..
-.de $0
-.(x
-.in \\n(Xs
-\\*($n \\$1
-.)x
-..
-.de $1
-.nr Xs 0
-..
-.de $2
-.nr Xs 3
-..
-.de $3
-.nr Xs 6
-..
-.de Fn
-.if \\n(.$==0 .tm error
-.nr ll 0
-.nr dg 0
-.ft R
-.if '\\$\\n(.$'.' .nr ll 1
-.if '\\$\\n(.$',' .nr ll 1
-.if '\\$\\n(.$')' .nr ll 1
-.if '\\$\\n(.$').' .nr ll 1
-.if '\\$\\n(.$';' .nr ll 1
-.if '\\$\\n(.$':' .nr ll 1
-.if '\\$\\n(.$'\'s' .nr ll 1
-.if '\\$\\n(.$'\(dg' .nr ll 1
-.\" .if '\\$\\n(.$'' .nr ll 1
-.nr al \\n(.$-\\n(ll
-.ds ot \f(CB\\$1\fP(
-.if \\n(al>1 .as ot \fI\\$2\fP
-.if \\n(al>2 .as ot ", \fI\\$3\fP
-.if \\n(al>3 .as ot ", \fI\\$4\fP
-.if \\n(al>4 .as ot ", \fI\\$5\fP
-.if \\n(al>5 .as ot ", \fI\\$6\fP
-.if \\n(al>6 .as ot ", \fI\\$7\fP
-.if \\n(al>7 .as ot ", \fI\\$8\fP
-.if \\n(al>8 .as ot ", \fI\\$9\fP
-.as ot )
-.if \\n(.$>1 \{\
-.       if \\n(ll==0 .as ot ;
-.       if '\\$\\n(.$'\(dg' .as ot ;
-.\}
-.if \\n(ll==1 .as ot \\$\\n(.$
-\\*(ot
-..
diff --git a/lib/libcurses/PSD.doc/twinkle1.c b/lib/libcurses/PSD.doc/twinkle1.c
deleted file mode 100644
index c37d2a02b..000000000
--- a/lib/libcurses/PSD.doc/twinkle1.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*	$NetBSD: twinkle1.c,v 1.6 2005/05/23 04:04:49 christos Exp $	*/
-
-/*
- * 
- *  Copyright (c) 1980, 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.
- * 
- * 	@(#)twinkle1.c	8.1 (Berkeley) 6/8/93
- */ 
-#include	<curses.h>
-#include	<signal.h>
-
-/*
- * the idea for this program was a product of the imagination of
- * Kurt Schoens.  Not responsible for minds lost or stolen.
- */
-
-#define	NCOLS	80
-#define	NLINES	24
-#define	MAXPATTERNS	4
-
-typedef struct {
-	int	y, x;
-} LOCS;
-
-static LOCS	Layout[NCOLS * NLINES];	/* current board layout */
-
-static int	Pattern,		/* current pattern number */
-		Numstars;		/* number of stars in pattern */
-
-static void puton(char);
-static void makeboard(void);
-static int ison(int, int);
-static void die(int);
-
-int
-main(void)
-{
-	srand(getpid());		/* initialize random sequence */
-
-	initscr();
-	signal(SIGINT, die);
-	noecho();
-	nonl();
-	leaveok(stdscr, TRUE);
-	scrollok(stdscr, FALSE);
-
-	for (;;) {
-		makeboard();		/* make the board setup */
-		puton('*');		/* put on '*'s */
-		puton(' ');		/* cover up with ' 's */
-	}
-}
-
-/*
- * On program exit, move the cursor to the lower left corner by
- * direct addressing, since current location is not guaranteed.
- * We lie and say we used to be at the upper right corner to guarantee
- * absolute addressing.
- */
-static void
-die(int n)
-{
-	signal(SIGINT, SIG_IGN);
-	mvcur(0, COLS - 1, LINES - 1, 0);
-	endwin();
-	exit(n);
-}
-
-
-/*
- * Make the current board setup.  It picks a random pattern and
- * calls ison() to determine if the character is on that pattern
- * or not.
- */
-static void
-makeboard(void)
-{
-	int		y, x;
-	LOCS	*lp;
-
-	Pattern = rand() % MAXPATTERNS;
-	lp = Layout;
-	for (y = 0; y < NLINES; y++)
-		for (x = 0; x < NCOLS; x++)
-			if (ison(y, x)) {
-				lp->y = y;
-				lp->x = x;
-				lp++;
-			}
-	Numstars = lp - Layout;
-}
-
-/*
- * Return TRUE if (y, x) is on the current pattern.
- */
-static int
-ison(int y, int x)
-{
-	switch (Pattern) {
-	  case 0:	/* alternating lines */
-		return !(y & 01);
-	  case 1:	/* box */
-		if (x >= LINES && y >= NCOLS)
-			return FALSE;
-		if (y < 3 || y >= NLINES - 3)
-			return TRUE;
-		return (x < 3 || x >= NCOLS - 3);
-	  case 2:	/* holy pattern! */
-		return ((x + y) & 01);
-	  case 3:	/* bar across center */
-		return (y >= 9 && y <= 15);
-	}
-	/* NOTREACHED */
-}
-
-static void
-puton(char ch)
-{
-	LOCS	*lp;
-	int	r;
-	LOCS	*end;
-	LOCS	temp;
-
-	end = &Layout[Numstars];
-	for (lp = Layout; lp < end; lp++) {
-		r = rand() % Numstars;
-		temp = *lp;
-		*lp = Layout[r];
-		Layout[r] = temp;
-	}
-
-	for (lp = Layout; lp < end; lp++) {
-		mvaddch(lp->y, lp->x, ch);
-		refresh();
-	}
-}
diff --git a/lib/libcurses/PSD.doc/twinkle2.c b/lib/libcurses/PSD.doc/twinkle2.c
deleted file mode 100644
index 6fdc7695d..000000000
--- a/lib/libcurses/PSD.doc/twinkle2.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*	$NetBSD: twinkle2.c,v 1.6 2005/05/23 04:04:49 christos Exp $	*/
-
-/*
- * 
- *  Copyright (c) 1980, 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.
- * 
- * 	@(#)twinkle2.c	8.1 (Berkeley) 6/8/93
- */
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <curses.h>
-#include <signal.h>
-
-#define	NCOLS	80
-#define	NLINES	24
-#define	MAXPATTERNS	4
-
-typedef struct {
-	int	y, x;
-} LOCS;
-
-static LOCS	Layout[NCOLS * NLINES];	/* current board layout */
-
-static int	Pattern,		/* current pattern number */
-		Numstars;		/* number of stars in pattern */
-
-static void puton(char);
-static void die(int);
-static void makeboard(void);
-static int ison(int, int);
-
-static int AM;
-static char *VS;
-static char *TI;
-static char *CL;
-
-int
-main(void)
-{
-	char	*sp;
-	char	buf[1024];
-	char	*ptr = buf;
-
-	srand(getpid());		/* initialize random sequence */
-
-	if (isatty(0)) {
-		initscr();
-		gettmode();
-		if ((sp = getenv("TERM")) != NULL)
-			setterm(sp);
-		signal(SIGINT, die);
-	}
-	else {
-		printf("Need a terminal on fd=%d\n", 0);
-		exit(1);
-	}
-
-	tgetent(buf, sp);
-
-	AM = tgetflag("am");
-	TI = tgetstr("ti", &ptr);
-	if (TI == NULL) {
-		printf("terminal does not have the ti capability\n");
-		exit(1);
-	}
-	VS = tgetstr("vs", &ptr);
-	if (VS == NULL) {
-		printf("terminal does not have the vs capability\n");
-		exit(1);
-	}
-	CL = tgetstr("cl", &ptr);
-	if (CL == NULL) {
-		printf("terminal does not have the cl capability\n");
-		exit(1);
-	}
-	puts(TI);
-	puts(VS);
-
-	noecho();
-	nonl();
-	tputs(CL, NLINES, putchar);
-	for (;;) {
-		makeboard();		/* make the board setup */
-		puton('*');		/* put on '*'s */
-		puton(' ');		/* cover up with ' 's */
-	}
-}
-
-/*
- * On program exit, move the cursor to the lower left corner by
- * direct addressing, since current location is not guaranteed.
- * We lie and say we used to be at the upper right corner to guarantee
- * absolute addressing.
- */
-static void
-die(int n)
-{
-	signal(SIGINT, SIG_IGN);
-	mvcur(0, COLS - 1, LINES - 1, 0);
-	endwin();
-	exit(n);
-}
-
-static void
-puton(char ch)
-{
-	LOCS	*lp;
-	int		r;
-	LOCS	*end;
-	LOCS		temp;
-	static int	lasty, lastx;
-
-	end = &Layout[Numstars];
-	for (lp = Layout; lp < end; lp++) {
-		r = rand() % Numstars;
-		temp = *lp;
-		*lp = Layout[r];
-		Layout[r] = temp;
-	}
-
-	for (lp = Layout; lp < end; lp++)
-			/* prevent scrolling */
-		if (!AM || (lp->y < NLINES - 1 || lp->x < NCOLS - 1)) {
-			mvcur(lasty, lastx, lp->y, lp->x);
-			putchar(ch);
-			lasty = lp->y;
-			if ((lastx = lp->x + 1) >= NCOLS)
-				if (AM) {
-					lastx = 0;
-					lasty++;
-				}
-				else
-					lastx = NCOLS - 1;
-		}
-}
-
-/*
- * Make the current board setup.  It picks a random pattern and
- * calls ison() to determine if the character is on that pattern
- * or not.
- */
-static void
-makeboard(void)
-{
-	int		y, x;
-	LOCS	*lp;
-
-	Pattern = rand() % MAXPATTERNS;
-	lp = Layout;
-	for (y = 0; y < NLINES; y++)
-		for (x = 0; x < NCOLS; x++)
-			if (ison(y, x)) {
-				lp->y = y;
-				lp->x = x;
-				lp++;
-			}
-	Numstars = lp - Layout;
-}
-
-/*
- * Return TRUE if (y, x) is on the current pattern.
- */
-static int
-ison(int y, int x)
-{
-	switch (Pattern) {
-	  case 0:	/* alternating lines */
-		return !(y & 01);
-	  case 1:	/* box */
-		if (x >= LINES && y >= NCOLS)
-			return FALSE;
-		if (y < 3 || y >= NLINES - 3)
-			return TRUE;
-		return (x < 3 || x >= NCOLS - 3);
-	  case 2:	/* holy pattern! */
-		return ((x + y) & 01);
-	  case 3:	/* bar across center */
-		return (y >= 9 && y <= 15);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libcurses/PSD.doc/win_st.c b/lib/libcurses/PSD.doc/win_st.c
deleted file mode 100644
index 2bca05415..000000000
--- a/lib/libcurses/PSD.doc/win_st.c
+++ /dev/null
@@ -1,56 +0,0 @@
-.\"	$NetBSD: win_st.c,v 1.5 2003/08/07 16:44:29 agc Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\"	@(#)win_st.c	8.1 (Berkeley) 6/8/93
-.\"
-# define	WINDOW	struct _win_st
-
-struct _win_st {
-	short		_cury, _curx;
-	short		_maxy, _maxx;
-	short		_begy, _begx;
-	short		_flags;
-	short		_ch_off;
-	bool		_clear;
-	bool		_leave;
-	bool		_scroll;
-	char		**_y;
-	short		*_firstch;
-	short		*_lastch;
-	struct _win_st	*_nextp, *_orig;
-};
-
-# define	_ENDLINE	001
-# define	_FULLWIN	002
-# define	_SCROLLWIN	004
-# define	_FLUSH		010
-# define	_FULLLINE	020
-# define	_IDLINE		040
-# define	_STANDOUT	0200
-# define	_NOCHANGE	-1
diff --git a/lib/libcurses/acs.c b/lib/libcurses/acs.c
deleted file mode 100644
index 39815179d..000000000
--- a/lib/libcurses/acs.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/*	$NetBSD: acs.c,v 1.20 2012/04/21 12:27:27 roy Exp $	*/
-
-/*
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: acs.c,v 1.20 2012/04/21 12:27:27 roy Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-chtype _acs_char[NUM_ACS];
-#ifdef HAVE_WCHAR
-#include <assert.h>
-#include <locale.h>
-#include <langinfo.h>
-#include <strings.h>
-
-cchar_t _wacs_char[ NUM_ACS ];
-#endif /* HAVE_WCHAR */
-
-/*
- * __init_acs --
- *	Fill in the ACS characters.  The 'acs_chars' terminfo entry is a list of
- *	character pairs - ACS definition then terminal representation.
- */
-void
-__init_acs(SCREEN *screen)
-{
-	int		count;
-	const char	*aofac;	/* Address of 'ac' */
-	unsigned char	acs, term;
-
-	/* Default value '+' for all ACS characters */
-	for (count=0; count < NUM_ACS; count++)
-		_acs_char[count]= '+';
-
-	/* Add the SUSv2 defaults (those that are not '+') */
-	ACS_RARROW = '>';
-	ACS_LARROW = '<';
-	ACS_UARROW = '^';
-	ACS_DARROW = 'v';
-	ACS_BLOCK = '#';
-/*	ACS_DIAMOND = '+';	*/
-	ACS_CKBOARD = ':';
-	ACS_DEGREE = 39;	/* ' */
-	ACS_PLMINUS = '#';
-	ACS_BOARD = '#';
-	ACS_LANTERN = '#';
-/*	ACS_LRCORNER = '+';	*/
-/*	ACS_URCORNER = '+';	*/
-/*	ACS_ULCORNER = '+';	*/
-/*	ACS_LLCORNER = '+';	*/
-/*	ACS_PLUS = '+';		*/
-	ACS_HLINE = '-';
-	ACS_S1 = '-';
-	ACS_S9 = '_';
-/*	ACS_LTEE = '+';		*/
-/*	ACS_RTEE = '+';		*/
-/*	ACS_BTEE = '+';		*/
-/*	ACS_TTEE = '+';		*/
-	ACS_VLINE = '|';
-	ACS_BULLET = 'o';
-	/* Add the extensions defaults */
-	ACS_S3 = '-';
-	ACS_S7 = '-';
-	ACS_LEQUAL = '<';
-	ACS_GEQUAL = '>';
-	ACS_PI = '*';
-	ACS_NEQUAL = '!';
-	ACS_STERLING = 'f';
-
-	if (t_acs_chars(screen->term) == NULL)
-		goto out;
-
-	aofac = t_acs_chars(screen->term);
-
-	while (*aofac != '\0') {
-		if ((acs = *aofac) == '\0')
-			return;
-		if ((term = *++aofac) == '\0')
-			return;
-	 	/* Only add characters 1 to 127 */
-		if (acs < NUM_ACS)
-			_acs_char[acs] = term | __ALTCHARSET;
-		aofac++;
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INIT, "__init_acs: %c = %c\n", acs, term);
-#endif
-	}
-
-	if (t_ena_acs(screen->term) != NULL)
-		ti_puts(screen->term, t_ena_acs(screen->term), 0,
-		    __cputchar_args, screen->outfd);
-
-out:
-	for (count=0; count < NUM_ACS; count++)
-		screen->acs_char[count]= _acs_char[count];
-}
-
-void
-_cursesi_reset_acs(SCREEN *screen)
-{
-	int count;
-
-	for (count=0; count < NUM_ACS; count++)
-		_acs_char[count]= screen->acs_char[count];
-}
-
-#ifdef HAVE_WCHAR
-/*
- * __init_wacs --
- *	Fill in the ACS characters.  The 'acs_chars' terminfo entry is a list of
- *	character pairs - ACS definition then terminal representation.
- */
-void
-__init_wacs(SCREEN *screen)
-{
-	int		count;
-	const char	*aofac;	/* Address of 'ac' */
-	unsigned char	acs, term;
-	char	*lstr;
-
-	/* Default value '+' for all ACS characters */
-	for (count=0; count < NUM_ACS; count++) {
-		_wacs_char[ count ].vals[ 0 ] = ( wchar_t )btowc( '+' );
-		_wacs_char[ count ].attributes = 0;
-		_wacs_char[ count ].elements = 1;
-	}
-
-	/* Add the SUSv2 defaults (those that are not '+') */
-	if (!strcmp(setlocale(LC_CTYPE, NULL), "C"))
-		setlocale(LC_CTYPE, "");
-	lstr = nl_langinfo(CODESET);
-	_DIAGASSERT(lstr);
-	if (strcasecmp(lstr, "UTF-8")) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INIT, "__init_wacs: setting defaults\n" );
-#endif /* DEBUG */
-		WACS_RARROW->vals[0]  = ( wchar_t )btowc( '>' );
-		WACS_LARROW->vals[0]  = ( wchar_t )btowc( '<' );
-		WACS_UARROW->vals[0]  = ( wchar_t )btowc( '^' );
-		WACS_DARROW->vals[0]  = ( wchar_t )btowc( 'v' );
-		WACS_BLOCK->vals[0]   = ( wchar_t )btowc( '#' );
-		WACS_CKBOARD->vals[0] = ( wchar_t )btowc( ':' );
-		WACS_DEGREE->vals[0]  = ( wchar_t )btowc( 39 );	/* ' */
-		WACS_PLMINUS->vals[0] = ( wchar_t )btowc( '#' );
-		WACS_BOARD->vals[0]   = ( wchar_t )btowc( '#' );
-		WACS_LANTERN->vals[0] = ( wchar_t )btowc( '#' );
-		WACS_HLINE->vals[0]   = ( wchar_t )btowc( '-' );
-		WACS_S1->vals[0]      = ( wchar_t )btowc( '-' );
-		WACS_S9->vals[0]      = ( wchar_t )btowc( '_' );
-		WACS_VLINE->vals[0]   = ( wchar_t )btowc( '|' );
-		WACS_BULLET->vals[0]  = ( wchar_t )btowc( 'o' );
-		WACS_S3->vals[0]      = ( wchar_t )btowc( 'p' );
-		WACS_S7->vals[0]      = ( wchar_t )btowc( 'r' );
-		WACS_LEQUAL->vals[0]  = ( wchar_t )btowc( 'y' );
-		WACS_GEQUAL->vals[0]  = ( wchar_t )btowc( 'z' );
-		WACS_PI->vals[0]      = ( wchar_t )btowc( '{' );
-		WACS_NEQUAL->vals[0]  = ( wchar_t )btowc( '|' );
-		WACS_STERLING->vals[0]= ( wchar_t )btowc( '}' );
-	} else {
-		/* Unicode defaults */
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INIT,
-		    "__init_wacs: setting Unicode defaults\n" );
-#endif /* DEBUG */
-		WACS_RARROW->vals[0]  = 0x2192;
-		ACS_RARROW = '+' | __ACS_IS_WACS;
-		WACS_LARROW->vals[0]  = 0x2190;
-		ACS_LARROW = ',' | __ACS_IS_WACS;
-		WACS_UARROW->vals[0]  = 0x2191;
-		ACS_UARROW = '-' | __ACS_IS_WACS;
-		WACS_DARROW->vals[0]  = 0x2193;
-		ACS_DARROW = '.' | __ACS_IS_WACS;
-		WACS_BLOCK->vals[0]   = 0x25ae;
-		ACS_BLOCK = '0' | __ACS_IS_WACS;
-  		WACS_DIAMOND->vals[0] = 0x25c6;
-		ACS_DIAMOND = '`' | __ACS_IS_WACS;
-		WACS_CKBOARD->vals[0] = 0x2592;
-		ACS_CKBOARD = 'a' | __ACS_IS_WACS;
-		WACS_DEGREE->vals[0]  = 0x00b0;
-		ACS_DEGREE = 'f' | __ACS_IS_WACS;
-		WACS_PLMINUS->vals[0] = 0x00b1;
-		ACS_PLMINUS = 'g' | __ACS_IS_WACS;
-		WACS_BOARD->vals[0]   = 0x2592;
-		ACS_BOARD = 'h' | __ACS_IS_WACS;
-		WACS_LANTERN->vals[0] = 0x2603;
-		ACS_LANTERN = 'i' | __ACS_IS_WACS;
-  		WACS_LRCORNER->vals[0]= 0x2518;
-		ACS_LRCORNER = 'j' | __ACS_IS_WACS;
-  		WACS_URCORNER->vals[0]= 0x2510;
-		ACS_URCORNER = 'k' | __ACS_IS_WACS;
-  		WACS_ULCORNER->vals[0]= 0x250c;
-		ACS_ULCORNER = 'l' | __ACS_IS_WACS;
-  		WACS_LLCORNER->vals[0]= 0x2514;
-		ACS_LLCORNER = 'm' | __ACS_IS_WACS;
-  		WACS_PLUS->vals[0]    = 0x253c;
-		ACS_PLUS = 'n' | __ACS_IS_WACS;
-		WACS_HLINE->vals[0]   = 0x2500;
-		ACS_HLINE = 'q' | __ACS_IS_WACS;
-		WACS_S1->vals[0]      = 0x23ba;
-		ACS_S1 = 'o' | __ACS_IS_WACS;
-		WACS_S9->vals[0]      = 0x23bd;
-		ACS_S9 = 's' | __ACS_IS_WACS;
-  		WACS_LTEE->vals[0]    = 0x251c;
-		ACS_LTEE = 't' | __ACS_IS_WACS;
-  		WACS_RTEE->vals[0]    = 0x2524;
-		ACS_RTEE = 'u' | __ACS_IS_WACS;
-  		WACS_BTEE->vals[0]    = 0x2534;
-		ACS_BTEE = 'v' | __ACS_IS_WACS;
-  		WACS_TTEE->vals[0]    = 0x252c;
-		ACS_TTEE = 'w' | __ACS_IS_WACS;
-		WACS_VLINE->vals[0]   = 0x2502;
-		ACS_VLINE = 'x' | __ACS_IS_WACS;
-		WACS_BULLET->vals[0]  = 0x00b7;
-		ACS_BULLET = '~' | __ACS_IS_WACS;
-		WACS_S3->vals[0]      = 0x23bb;
-		ACS_S3 = 'p' | __ACS_IS_WACS;
-		WACS_S7->vals[0]      = 0x23bc;
-		ACS_S7 = 'r' | __ACS_IS_WACS;
-		WACS_LEQUAL->vals[0]  = 0x2264;
-		ACS_LEQUAL = 'y' | __ACS_IS_WACS;
-		WACS_GEQUAL->vals[0]  = 0x2265;
-		ACS_GEQUAL = 'z' | __ACS_IS_WACS;
-		WACS_PI->vals[0]      = 0x03C0;
-		ACS_PI = '{' | __ACS_IS_WACS;
-		WACS_NEQUAL->vals[0]  = 0x2260;
-		ACS_NEQUAL = '|' | __ACS_IS_WACS;
-		WACS_STERLING->vals[0]= 0x00A3;
-		ACS_STERLING = '}' | __ACS_IS_WACS;
-	}
-
-	if (t_acs_chars(screen->term) == NULL) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INIT,
-		    "__init_wacs: no alternative characters\n" );
-#endif /* DEBUG */
-		goto out;
-	}
-
-	aofac = t_acs_chars(screen->term);
-
-	while (*aofac != '\0') {
-		if ((acs = *aofac) == '\0')
-			return;
-		if ((term = *++aofac) == '\0')
-			return;
-	 	/* Only add characters 1 to 127 */
-		if (acs < NUM_ACS) {
-			_wacs_char[acs].vals[ 0 ] = term;
-			_wacs_char[acs].attributes |= WA_ALTCHARSET;
-		}
-		aofac++;
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INIT, "__init_wacs: %c = %c\n", acs, term);
-#endif
-	}
-
-	if (t_ena_acs(screen->term) != NULL)
-		ti_puts(screen->term, t_ena_acs(screen->term), 0,
-			   __cputchar_args, screen->outfd);
-
-out:
-	for (count=0; count < NUM_ACS; count++) {
-		memcpy(&screen->wacs_char[count], &_wacs_char[count],
-			sizeof(cchar_t));
-		screen->acs_char[count]= _acs_char[count];
-	}
-}
-
-void
-_cursesi_reset_wacs(SCREEN *screen)
-{
-	int count;
-
-	for (count=0; count < NUM_ACS; count++)
-		memcpy( &_wacs_char[count], &screen->wacs_char[count],
-			sizeof( cchar_t ));
-}
-#endif /* HAVE_WCHAR */
diff --git a/lib/libcurses/add_wch.c b/lib/libcurses/add_wch.c
deleted file mode 100644
index ddbdecdfc..000000000
--- a/lib/libcurses/add_wch.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*   $NetBSD: add_wch.c,v 1.4 2013/11/09 11:16:59 blymn Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation Inc.
- * All rights reserved.
- *
- * This code is derived from code donated to the NetBSD Foundation
- * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@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.
- * 3. Neither the name of the NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
- * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: add_wch.c,v 1.4 2013/11/09 11:16:59 blymn Exp $");
-#endif /* not lint */
-
-#include <stdlib.h>
-#include "curses.h"
-#include "curses_private.h"
-#ifdef DEBUG
-#include <assert.h>
-#endif
-
-/*
- * add_wch --
- *	Add the wide character to the current position in stdscr.
- *
- */
-int
-add_wch(const cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return wadd_wch(stdscr, wch);
-#endif /* HAVE_WCHAR */
-}
-
-
-/*
- * mvadd_wch --
- *      Add the wide character to stdscr at the given location.
- */
-int
-mvadd_wch(int y, int x, const cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwadd_wch(stdscr, y, x, wch);
-#endif /* HAVE_WCHAR */
-}
-
-
-/*
- * mvwadd_wch --
- *      Add the character to the given window at the given location.
- */
-int
-mvwadd_wch(WINDOW *win, int y, int x, const cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return wadd_wch(win, wch);
-#endif /* HAVE_WCHAR */
-}
-
-
-/*
- * wadd_wch --
- *	Add the wide character to the current position in the
- *	given window.
- *
- */
-int
-wadd_wch(WINDOW *win, const cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	int x = win->curx, y = win->cury;
-	__LINE *lnp = NULL;
-
-#ifdef DEBUG
-	int i;
-
-	for (i = 0; i < win->maxy; i++) {
-		assert(win->alines[i]->sentinel == SENTINEL_VALUE);
-	}
-	__CTRACE(__CTRACE_INPUT, "wadd_wch: win(%p)", win);
-#endif
-	lnp = win->alines[y];
-	return _cursesi_addwchar(win, &lnp, &y, &x, wch, 1);
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/add_wchstr.c b/lib/libcurses/add_wchstr.c
deleted file mode 100644
index d112e03d9..000000000
--- a/lib/libcurses/add_wchstr.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/*   $NetBSD: add_wchstr.c,v 1.4 2010/02/23 19:48:26 drochner Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation Inc.
- * All rights reserved.
- *
- * This code is derived from code donated to the NetBSD Foundation
- * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@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.
- * 3. Neither the name of the NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
- * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: add_wchstr.c,v 1.4 2010/02/23 19:48:26 drochner Exp $");
-#endif				/* not lint */
-
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * add_wchstr --
- *  Add a wide string to stdscr starting at (_cury, _curx).
- */
-int
-add_wchstr(const cchar_t *wchstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return wadd_wchnstr(stdscr, wchstr, -1);
-#endif
-}
-
-
-/*
- * wadd_wchstr --
- *      Add a string to the given window starting at (_cury, _curx).
- */
-int
-wadd_wchstr(WINDOW *win, const cchar_t *wchstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return wadd_wchnstr(win, wchstr, -1);
-#endif
-}
-
-
-/*
- * add_wchnstr --
- *      Add a string (at most n characters) to stdscr starting
- *	at (_cury, _curx).  If n is negative, add the entire string.
- */
-int
-add_wchnstr(const cchar_t *wchstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return wadd_wchnstr(stdscr, wchstr, n);
-#endif
-}
-
-
-/*
- * mvadd_wchstr --
- *      Add a string to stdscr starting at (y, x)
- */
-int
-mvadd_wchstr(int y, int x, const cchar_t *wchstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwadd_wchnstr(stdscr, y, x, wchstr, -1);
-#endif
-}
-
-
-/*
- * mvwadd_wchstr --
- *      Add a string to the given window starting at (y, x)
- */
-int
-mvwadd_wchstr(WINDOW *win, int y, int x, const cchar_t *wchstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwadd_wchnstr(win, y, x, wchstr, -1);
-#endif
-}
-
-
-/*
- * mvadd_wchnstr --
- *      Add a string of at most n characters to stdscr
- *      starting at (y, x).
- */
-int
-mvadd_wchnstr(int y, int x, const cchar_t *wchstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwadd_wchnstr(stdscr, y, x, wchstr, n);
-#endif
-}
-
-
-/*
- * mvwadd_wchnstr --
- *      Add a string of at most n characters to the given window
- *      starting at (y, x).
- */
-int
-mvwadd_wchnstr(WINDOW *win, int y, int x, const cchar_t *wchstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return wadd_wchnstr(win, wchstr, n);
-#endif
-}
-
-
-/*
- * wadd_wchnstr --
- *	Add a string (at most n wide characters) to the given window
- *	starting at (_cury, _curx).  If n is -1, add the entire string.
- */
-int
-wadd_wchnstr(WINDOW *win, const cchar_t *wchstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	const cchar_t *chp;
-	wchar_t wc;
-	int cw, x, y, sx, ex, newx, i, cnt;
-	__LDATA *lp, *tp;
-	nschar_t *np, *tnp;
-	__LINE *lnp;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT,
-	    "wadd_wchnstr: win = %p, wchstr = %p, n = %d\n", win, wchstr, n);
-#endif
-
-	if (!wchstr)
-		return OK;
-
-	/* compute length of the cchar string */
-	if (n < -1)
-		return ERR;
-	if (n >= 0)
-		for (chp = wchstr, cnt = 0; n && chp->vals[0];
-			n--, chp++, ++cnt);
-	else
-		for (chp = wchstr, cnt = 0; chp->vals[0]; chp++, ++cnt);
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "wadd_wchnstr: len=%d\n", cnt);
-#endif /* DEBUG */
-	chp = wchstr;
-	x = win->curx;
-	y = win->cury;
-	lp = &win->alines[y]->line[x];
-	lnp = win->alines[y];
-
-	cw = WCOL(*lp);
-	if (cw >= 0) {
-		sx = x;
-	} else {
-		if (wcwidth(chp->vals[0])) {
-			/* clear the partial character before cursor */
-			for (tp = lp + cw; tp < lp; tp++) {
-				tp->ch = (wchar_t) btowc((int) win->bch);
-				if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
-					return ERR;
-				tp->attr = win->battr;
-				SET_WCOL(*tp, 1);
-				np = tp->nsp;
-			}
-		} else {
-			/* move to the start of current char */
-			lp += cw;
-			x += cw;
-		}
-		sx = x + cw;
-	}
-	lnp->flags |= __ISDIRTY;
-	newx = sx + win->ch_off;
-	if (newx < *lnp->firstchp)
-		*lnp->firstchp = newx;
-
-	/* add characters in the string */
-	ex = x;
-	while (cnt) {
-		x = ex;
-		wc = chp->vals[0];
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT, "wadd_wchnstr: adding %x", wc);
-#endif /* DEBUG */
-		cw = wcwidth(wc);
-		if (cw < 0)
-			cw = 1;
-		if (cw) {
-			/* spacing character */
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    " as a spacing char(width=%d)\n", cw);
-#endif /* DEBUG */
-			if (cw > win->maxx - ex) {
-				/* clear to EOL */
-				while (ex < win->maxx) {
-					lp->ch = (wchar_t)
-						btowc((int) win->bch);
-					if (_cursesi_copy_nsp(win->bnsp, lp)
-					    == ERR)
-						return ERR;
-					lp->attr = win->battr;
-					SET_WCOL(*lp, 1);
-					lp++, ex++;
-				}
-				ex = win->maxx - 1;
-				break;
-			}
-			/* this could combine with the insertion of
-			 * non-spacing char */
-			np = lp->nsp;
-			if (np) {
-				while (np) {
-					tnp = np->next;
-					free(np);
-					np = tnp;
-				}
-				lp->nsp = NULL;
-			}
-			lp->ch = chp->vals[0];
-			lp->attr = chp->attributes & WA_ATTRIBUTES;
-			SET_WCOL(*lp, cw);
-			if (chp->elements > 1) {
-				for (i = 1; i < chp->elements; i++) {
-					np = (nschar_t *)
-						malloc(sizeof(nschar_t));
-					if (!np)
-						return ERR;
-					np->ch = chp->vals[i];
-					np->next = lp->nsp;
-					lp->nsp = np;
-				}
-			}
-			lp++, ex++;
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-				"wadd_wchnstr: ex = %d, x = %d, cw = %d\n",
-				 ex, x, cw);
-#endif /* DEBUG */
-			while (ex - x <= cw - 1) {
-				np = lp->nsp;
-				if (np) {
-					while (np) {
-						tnp = np->next;
-						free(np);
-						np = tnp;
-					}
-					lp->nsp = NULL;
-				}
-				lp->ch = chp->vals[0];
-				lp->attr = chp->attributes & WA_ATTRIBUTES;
-				SET_WCOL(*lp, x - ex);
-				lp++, ex++;
-			}
-		} else {
-			/* non-spacing character */
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-				"wadd_wchnstr: as non-spacing char");
-#endif /* DEBUG */
-			for (i = 0; i < chp->elements; i++) {
-				np = (nschar_t *)malloc(sizeof(nschar_t));
-				if (!np)
-					return ERR;
-				np->ch = chp->vals[i];
-				np->next = lp->nsp;
-				lp->nsp = np;
-			}
-		}
-		cnt--, chp++;
-	}
-#ifdef DEBUG
-	for (i = sx; i < ex; i++) {
-		__CTRACE(__CTRACE_INPUT, "wadd_wchnstr: (%d,%d)=(%x,%x,%p)\n",
-		    win->cury, i, win->alines[win->cury]->line[i].ch,
-		    win->alines[win->cury]->line[i].attr,
-		    win->alines[win->cury]->line[i].nsp);
-	}
-#endif /* DEBUG */
-	lnp->flags |= __ISDIRTY;
-	newx = ex + win->ch_off;
-	if (newx > *lnp->lastchp)
-		*lnp->lastchp = newx;
-	__touchline(win, y, sx, ex);
-
-	return OK;
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/addbytes.c b/lib/libcurses/addbytes.c
deleted file mode 100644
index 7653297f0..000000000
--- a/lib/libcurses/addbytes.c
+++ /dev/null
@@ -1,609 +0,0 @@
-/*	$NetBSD: addbytes.c,v 1.42 2013/11/10 03:14:16 christos Exp $	*/
-
-/*
- * Copyright (c) 1987, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)addbytes.c	8.4 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: addbytes.c,v 1.42 2013/11/10 03:14:16 christos Exp $");
-#endif
-#endif				/* not lint */
-
-#include <stdlib.h>
-#include <string.h>
-#include "curses.h"
-#include "curses_private.h"
-#ifdef DEBUG
-#include <assert.h>
-#endif
-
-#define	SYNCH_IN	{y = win->cury; x = win->curx;}
-#define	SYNCH_OUT	{win->cury = y; win->curx = x;}
-#define	PSYNCH_IN	{*y = win->cury; *x = win->curx;}
-#define	PSYNCH_OUT	{win->cury = *y; win->curx = *x;}
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * addbytes --
- *      Add the character to the current position in stdscr.
- */
-int
-addbytes(const char *bytes, int count)
-{
-	return _cursesi_waddbytes(stdscr, bytes, count, 0, 1);
-}
-
-/*
- * waddbytes --
- *      Add the character to the current position in the given window.
- */
-int
-waddbytes(WINDOW *win, const char *bytes, int count)
-{
-	return _cursesi_waddbytes(win, bytes, count, 0, 1);
-}
-
-/*
- * mvaddbytes --
- *      Add the characters to stdscr at the location given.
- */
-int
-mvaddbytes(int y, int x, const char *bytes, int count)
-{
-	return mvwaddbytes(stdscr, y, x, bytes, count);
-}
-
-/*
- * mvwaddbytes --
- *      Add the characters to the given window at the location given.
- */
-int
-mvwaddbytes(WINDOW *win, int y, int x, const char *bytes, int count)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return _cursesi_waddbytes(win, bytes, count, 0, 1);
-}
-
-#endif
-
-int
-__waddbytes(WINDOW *win, const char *bytes, int count, attr_t attr)
-{
-	return _cursesi_waddbytes(win, bytes, count, attr, 1);
-}
-
-/*
- * _cursesi_waddbytes --
- *	Add the character to the current position in the given window.
- * if char_interp is non-zero then character interpretation is done on
- * the byte (i.e. \n to newline, \r to carriage return, \b to backspace
- * and so on).
- */
-int
-_cursesi_waddbytes(WINDOW *win, const char *bytes, int count, attr_t attr,
-	    int char_interp)
-{
-	int		x, y, err;
-	__LINE		*lp;
-#ifdef HAVE_WCHAR
-	int		n;
-	cchar_t		cc;
-	wchar_t		wc;
-	mbstate_t	st;
-#else
-	int		c;
-#endif
-#ifdef DEBUG
-	int             i;
-
-	for (i = 0; i < win->maxy; i++) {
-		assert(win->alines[i]->sentinel == SENTINEL_VALUE);
-	}
-
-	__CTRACE(__CTRACE_INPUT, "ADDBYTES: add %d bytes\n", count);
-#endif
-
-	err = OK;
-	SYNCH_IN;
-	lp = win->alines[y];
-
-#ifdef HAVE_WCHAR
-	(void)memset(&st, 0, sizeof(st));
-#endif
-	while (count > 0) {
-#ifndef HAVE_WCHAR
-		c = *bytes++;
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT, "ADDBYTES('%c', %x) at (%d, %d)\n",
-		    c, attr, y, x);
-#endif
-		err = _cursesi_addbyte(win, &lp, &y, &x, c, attr, char_interp);
-		count--;
-#else
-		/*
-		 * For wide-character support only, try and convert the
-		 * given string into a wide character - we do this because
-		 * this is how ncurses behaves (not that I think this is
-		 * actually the correct thing to do but if we don't do it
-		 * a lot of things that rely on this behaviour will break
-		 * and we will be blamed).  If the conversion succeeds
-		 * then we eat the n characters used to make the wide char
-		 * from the string.
-		 */
-		n = (int)mbrtowc(&wc, bytes, (size_t)count, &st);
-		if (n < 0) {
-			/* not a valid conversion just eat a char */
-			wc = *bytes;
-			n = 1;
-			(void)memset(&st, 0, sizeof(st));
-		} else if (wc == 0) {
-			break;
-		}
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT,
-		 "ADDBYTES WIDE(0x%x [%s], %x) at (%d, %d), ate %d bytes\n",
-		 (unsigned) wc, unctrl((unsigned) wc), attr, y, x, n);
-#endif
-		cc.vals[0] = wc;
-		cc.elements = 1;
-		cc.attributes = attr;
-		err = _cursesi_addwchar(win, &lp, &y, &x, &cc, char_interp);
-		bytes += n;
-		count -= n;
-#endif
-	}
-
-	SYNCH_OUT;
-
-#ifdef DEBUG
-	for (i = 0; i < win->maxy; i++) {
-		assert(win->alines[i]->sentinel == SENTINEL_VALUE);
-	}
-#endif
-
-	return (err);
-}
-
-/*
- * _cursesi_addbyte -
- *	Internal function to add a byte and update the row and column
- * positions as appropriate.  This function is only used in the narrow
- * character version of curses.  If update_cursor is non-zero then character
- * interpretation.
- */
-int
-_cursesi_addbyte(WINDOW *win, __LINE **lp, int *y, int *x, int c,
-		 attr_t attr, int char_interp)
-{
-	static char	 blank[] = " ";
-	int		 tabsize;
-	int		 newx, i;
-	attr_t		 attributes;
-
-	if (char_interp) {
-		switch (c) {
-		case '\t':
-			tabsize = win->screen->TABSIZE;
-			PSYNCH_OUT;
-			for (i = 0; i < (tabsize - (*x % tabsize)); i++) {
-				if (waddbytes(win, blank, 1) == ERR)
-					return (ERR);
-			}
-			PSYNCH_IN;
-			return (OK);
-
-		case '\n':
-			PSYNCH_OUT;
-			wclrtoeol(win);
-			PSYNCH_IN;
-			(*lp)->flags |= __ISPASTEOL;
-			break;
-
-		case '\r':
-			*x = 0;
-			win->curx = *x;
-			return (OK);
-
-		case '\b':
-			if (--(*x) < 0)
-				*x = 0;
-			win->curx = *x;
-			return (OK);
-		}
-	}
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "ADDBYTES(%p, %d, %d)\n", win, *y, *x);
-#endif
-
-	if (char_interp && ((*lp)->flags & __ISPASTEOL)) {
-		*x = 0;
-		(*lp)->flags &= ~__ISPASTEOL;
-		if (*y == win->scr_b) {
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-				 "ADDBYTES - on bottom "
-				 "of scrolling region\n");
-#endif
-			if (!(win->flags & __SCROLLOK))
-				return ERR;
-			PSYNCH_OUT;
-			scroll(win);
-			PSYNCH_IN;
-		} else {
-			(*y)++;
-		}
-		*lp = win->alines[*y];
-		if (c == '\n')
-			return (OK);
-	}
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT,
-		 "ADDBYTES: 1: y = %d, x = %d, firstch = %d, lastch = %d\n",
-		 *y, *x, *win->alines[*y]->firstchp,
-		 *win->alines[*y]->lastchp);
-#endif
-
-	attributes = (win->wattr | attr) & (__ATTRIBUTES & ~__COLOR);
-	if (attr & __COLOR)
-		attributes |= attr & __COLOR;
-	else if (win->wattr & __COLOR)
-		attributes |= win->wattr & __COLOR;
-
-	/*
-	 * Always update the change pointers.  Otherwise,
-	 * we could end up not displaying 'blank' characters
-	 * when overlapping windows are displayed.
-	 */
-	newx = *x + win->ch_off;
-	(*lp)->flags |= __ISDIRTY;
-	/*
-	 * firstchp/lastchp are shared between
-	 * parent window and sub-window.
-	 */
-	if (newx < *(*lp)->firstchp)
-		*(*lp)->firstchp = newx;
-	if (newx > *(*lp)->lastchp)
-		*(*lp)->lastchp = newx;
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "ADDBYTES: change gives f/l: %d/%d [%d/%d]\n",
-		 *(*lp)->firstchp, *(*lp)->lastchp,
-		 *(*lp)->firstchp - win->ch_off,
-		 *(*lp)->lastchp - win->ch_off);
-#endif
-	if (win->bch != ' ' && c == ' ')
-		(*lp)->line[*x].ch = win->bch;
-	else
-		(*lp)->line[*x].ch = c;
-
-	if (attributes & __COLOR)
-		(*lp)->line[*x].attr =
-			attributes | (win->battr & ~__COLOR);
-	else
-		(*lp)->line[*x].attr = attributes | win->battr;
-
-	if (*x == win->maxx - 1)
-		(*lp)->flags |= __ISPASTEOL;
-	else
-		(*x)++;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT,
-		 "ADDBYTES: 2: y = %d, x = %d, firstch = %d, lastch = %d\n",
-		 *y, *x, *win->alines[*y]->firstchp,
-		 *win->alines[*y]->lastchp);
-#endif
-	return (OK);
-}
-
-/*
- * _cursesi_addwchar -
- *	Internal function to add a wide character and update the row
- * and column positions.
- */
-int
-_cursesi_addwchar(WINDOW *win, __LINE **lnp, int *y, int *x,
-		  const cchar_t *wch, int char_interp)
-{
-#ifndef HAVE_WCHAR
-	return (ERR);
-#else
-	int sx = 0, ex = 0, cw = 0, i = 0, newx = 0, tabsize;
-	__LDATA *lp = &win->alines[*y]->line[*x], *tp = NULL;
-	nschar_t *np = NULL;
-	cchar_t cc;
-	attr_t attributes;
-
-	if (char_interp) {
-		/* special characters handling */
-		switch (wch->vals[0]) {
-		case L'\b':
-			if (--*x < 0)
-				*x = 0;
-			win->curx = *x;
-			return OK;
-		case L'\r':
-			*x = 0;
-			win->curx = *x;
-			return OK;
-		case L'\n':
-			wclrtoeol(win);
-			PSYNCH_IN;
-			*x = 0;
-			(*lnp)->flags &= ~__ISPASTEOL;
-			if (*y == win->scr_b) {
-				if (!(win->flags & __SCROLLOK))
-					return ERR;
-				PSYNCH_OUT;
-				scroll(win);
-				PSYNCH_IN;
-			} else {
-				(*y)++;
-			}
-			PSYNCH_OUT;
-			return OK;
-		case L'\t':
-			cc.vals[0] = L' ';
-			cc.elements = 1;
-			cc.attributes = win->wattr;
-			tabsize = win->screen->TABSIZE;
-			for (i = 0; i < tabsize - (*x % tabsize); i++) {
-				if (wadd_wch(win, &cc) == ERR)
-					return ERR;
-			}
-			return OK;
-		}
-	}
-
-	/* check for non-spacing character */
-	if (!wcwidth(wch->vals[0])) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT,
-			 "_cursesi_addwchar: char '%c' is non-spacing\n",
-			 wch->vals[0]);
-#endif /* DEBUG */
-		cw = WCOL(*lp);
-		if (cw < 0) {
-			lp += cw;
-			*x += cw;
-		}
-		for (i = 0; i < wch->elements; i++) {
-			if (!(np = (nschar_t *) malloc(sizeof(nschar_t))))
-				return ERR;;
-			np->ch = wch->vals[i];
-			np->next = lp->nsp;
-			lp->nsp = np;
-		}
-		(*lnp)->flags |= __ISDIRTY;
-		newx = *x + win->ch_off;
-		if (newx < *(*lnp)->firstchp)
-			*(*lnp)->firstchp = newx;
-		if (newx > *(*lnp)->lastchp)
-			*(*lnp)->lastchp = newx;
-		__touchline(win, *y, *x, *x);
-		return OK;
-	}
-	/* check for new line first */
-	if (char_interp && ((*lnp)->flags & __ISPASTEOL)) {
-		*x = 0;
-		(*lnp)->flags &= ~__ISPASTEOL;
-		if (*y == win->scr_b) {
-			if (!(win->flags & __SCROLLOK))
-				return ERR;
-			PSYNCH_OUT;
-			scroll(win);
-			PSYNCH_IN;
-		} else {
-			(*y)++;
-		}
-		(*lnp) = win->alines[*y];
-		lp = &win->alines[*y]->line[*x];
-	}
-	/* clear out the current character */
-	cw = WCOL(*lp);
-	if (cw >= 0) {
-		sx = *x;
-	} else {
-		for (sx = *x - 1; sx >= max(*x + cw, 0); sx--) {
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-				 "_cursesi_addwchar: clear current char (%d,%d)\n",
-				 *y, sx);
-#endif /* DEBUG */
-			tp = &win->alines[*y]->line[sx];
-			tp->ch = (wchar_t) btowc((int) win->bch);
-			if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
-				return ERR;
-
-			tp->attr = win->battr;
-			SET_WCOL(*tp, 1);
-		}
-		sx = *x + cw;
-		(*lnp)->flags |= __ISDIRTY;
-		newx = sx + win->ch_off;
-		if (newx < *(*lnp)->firstchp)
-			*(*lnp)->firstchp = newx;
-	}
-
-	/* check for enough space before the end of line */
-	cw = wcwidth(wch->vals[0]);
-	if (cw < 0)
-		cw = 1;
-
-	if (cw > win->maxx - *x) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT,
-			 "_cursesi_addwchar: clear EOL (%d,%d)\n",
-			 *y, *x);
-#endif /* DEBUG */
-		(*lnp)->flags |= __ISDIRTY;
-		newx = *x + win->ch_off;
-		if (newx < *(*lnp)->firstchp)
-			*(*lnp)->firstchp = newx;
-		for (tp = lp; *x < win->maxx; tp++, (*x)++) {
-			tp->ch = (wchar_t) btowc((int) win->bch);
-			if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
-				return ERR;
-			tp->attr = win->battr;
-			SET_WCOL(*tp, 1);
-		}
-		newx = win->maxx - 1 + win->ch_off;
-		if (newx > *(*lnp)->lastchp)
-			*(*lnp)->lastchp = newx;
-		__touchline(win, *y, sx, (int) win->maxx - 1);
-		sx = *x = 0;
-		if (*y == win->scr_b) {
-			if (!(win->flags & __SCROLLOK))
-				return ERR;
-			PSYNCH_OUT;
-			scroll(win);
-			PSYNCH_IN;
-		} else {
-			(*y)++;
-		}
-		lp = &win->alines[*y]->line[0];
-		(*lnp) = win->alines[*y];
-	}
-	win->cury = *y;
-
-	/* add spacing character */
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT,
-		 "_cursesi_addwchar: add character (%d,%d) 0x%x\n",
-		 *y, *x, wch->vals[0]);
-#endif /* DEBUG */
-	(*lnp)->flags |= __ISDIRTY;
-	newx = *x + win->ch_off;
-	if (newx < *(*lnp)->firstchp)
-		*(*lnp)->firstchp = newx;
-	if (lp->nsp) {
-		__cursesi_free_nsp(lp->nsp);
-		lp->nsp = NULL;
-	}
-
-	lp->ch = wch->vals[0];
-
-	attributes = (win->wattr | wch->attributes)
-		& (WA_ATTRIBUTES & ~__COLOR);
-	if (wch->attributes & __COLOR)
-		attributes |= wch->attributes & __COLOR;
-	else if (win->wattr & __COLOR)
-		attributes |= win->wattr & __COLOR;
-	if (attributes & __COLOR)
-		lp->attr = attributes | (win->battr & ~__COLOR);
-	else
-		lp->attr = attributes | win->battr;
-
-	SET_WCOL(*lp, cw);
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT,
-		 "_cursesi_addwchar: add spacing char 0x%x, attr 0x%x\n",
-		 lp->ch, lp->attr);
-#endif /* DEBUG */
-
-	if (wch->elements > 1) {
-		for (i = 1; i < wch->elements; i++) {
-			np = (nschar_t *)malloc(sizeof(nschar_t));
-			if (!np)
-				return ERR;;
-			np->ch = wch->vals[i];
-			np->next = lp->nsp;
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "_cursesi_addwchar: add non-spacing char 0x%x\n", np->ch);
-#endif /* DEBUG */
-			lp->nsp = np;
-		}
-	}
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "_cursesi_addwchar: non-spacing list header: %p\n",
-	    lp->nsp);
-	__CTRACE(__CTRACE_INPUT, "_cursesi_addwchar: add rest columns (%d:%d)\n",
-		sx + 1, sx + cw - 1);
-#endif /* DEBUG */
-	for (tp = lp + 1, *x = sx + 1; *x - sx <= cw - 1; tp++, (*x)++) {
-		if (tp->nsp) {
-			__cursesi_free_nsp(tp->nsp);
-			tp->nsp = NULL;
-		}
-		tp->ch = wch->vals[0];
-		tp->attr = lp->attr & WA_ATTRIBUTES;
-		/* Mark as "continuation" cell */
-		tp->attr |= __WCWIDTH;
-	}
-
-	if (*x == win->maxx) {
-		(*lnp)->flags |= __ISPASTEOL;
-		newx = win->maxx - 1 + win->ch_off;
-		if (newx > *(*lnp)->lastchp)
-			*(*lnp)->lastchp = newx;
-		__touchline(win, *y, sx, (int) win->maxx - 1);
-		win->curx = sx;
-	} else {
-		win->curx = *x;
-
-		/* clear the remining of the current characer */
-		if (*x && *x < win->maxx) {
-			ex = sx + cw;
-			tp = &win->alines[*y]->line[ex];
-			while (ex < win->maxx && WCOL(*tp) < 0) {
-#ifdef DEBUG
-				__CTRACE(__CTRACE_INPUT,
-				 	"_cursesi_addwchar: clear "
-				 	"remaining of current char (%d,%d)nn",
-				 	*y, ex);
-#endif /* DEBUG */
-				tp->ch = (wchar_t) btowc((int) win->bch);
-				if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
-					return ERR;
-				tp->attr = win->battr;
-				SET_WCOL(*tp, 1);
-				tp++, ex++;
-			}
-			newx = ex - 1 + win->ch_off;
-			if (newx > *(*lnp)->lastchp)
-				*(*lnp)->lastchp = newx;
-			__touchline(win, *y, sx, ex - 1);
-		}
-	}
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "add_wch: %d : 0x%x\n", lp->ch, lp->attr);
-#endif /* DEBUG */
-	return OK;
-#endif
-}
diff --git a/lib/libcurses/addch.c b/lib/libcurses/addch.c
deleted file mode 100644
index 734fe6594..000000000
--- a/lib/libcurses/addch.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*	$NetBSD: addch.c,v 1.17 2013/11/09 11:16:59 blymn Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)addch.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: addch.c,v 1.17 2013/11/09 11:16:59 blymn Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * addch --
- *	Add the character to the current position in stdscr.
- *
- */
-int
-addch(chtype ch)
-{
-	return waddch(stdscr, ch);
-}
-
-/*
- * mvaddch --
- *      Add the character to stdscr at the given location.
- */
-int
-mvaddch(int y, int x, chtype ch)
-{
-	return mvwaddch(stdscr, y, x, ch);
-}
-
-/*
- * mvwaddch --
- *      Add the character to the given window at the given location.
- */
-int
-mvwaddch(WINDOW *win, int y, int x, chtype ch)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return waddch(win, ch);
-}
-
-#endif
-
-/*
- * waddch --
- *	Add the character to the current position in the given window.
- *
- */
-int
-waddch(WINDOW *win, chtype ch)
-{
-#ifdef HAVE_WCHAR
-	cchar_t cc;
-#else
-	__LDATA buf;
-#endif
-
-#ifdef HAVE_WCHAR
-	__cursesi_chtype_to_cchar(ch, &cc);
-#else
-	buf.ch = (wchar_t) ch & __CHARTEXT;
-	buf.attr = (attr_t) ch & __ATTRIBUTES;
-#endif
-
-#ifdef DEBUG
-#ifdef HAVE_WCHAR
-	__CTRACE(__CTRACE_INPUT,
-		 "addch: %d : 0x%x (adding char as wide char)\n",
-		 cc.vals[0], cc.attributes);
-#else
-	__CTRACE(__CTRACE_INPUT, "addch: %d : 0x%x\n", buf.ch, buf.attr);
-#endif
-#endif
-
-#ifdef HAVE_WCHAR
-	return (wadd_wch(win, &cc));
-#else
-	return (__waddch(win, &buf));
-#endif
-}
-
-int
-__waddch(WINDOW *win, __LDATA *dp)
-{
-	char	buf[2];
-
-	buf[0] = dp->ch;
-	buf[1] = '\0';
-	return (_cursesi_waddbytes(win, buf, 1, dp->attr, 1));
-}
diff --git a/lib/libcurses/addchnstr.c b/lib/libcurses/addchnstr.c
deleted file mode 100644
index 2ebad828d..000000000
--- a/lib/libcurses/addchnstr.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*	$NetBSD: addchnstr.c,v 1.6 2013/11/09 11:16:59 blymn Exp $	*/
-
-/*
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Douwe Kiela (virtus@wanadoo.nl).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: addchnstr.c,v 1.6 2013/11/09 11:16:59 blymn Exp $");
-#endif				/* not lint */
-
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * addchstr --
- *      Add a string to stdscr starting at (_cury, _curx).
- */
-int
-addchstr(const chtype *chstr)
-{
-	return waddchnstr(stdscr, chstr, -1);
-}
-
-/*
- * waddchstr --
- *      Add a string to the given window starting at (_cury, _curx).
- */
-int
-waddchstr(WINDOW *win, const chtype *chstr)
-{
-	return waddchnstr(win, chstr, -1);
-}
-
-/*
- * addchnstr --
- *      Add a string (at most n characters) to stdscr starting
- *	at (_cury, _curx).  If n is negative, add the entire string.
- */
-int
-addchnstr(const chtype *chstr, int n)
-{
-	return waddchnstr(stdscr, chstr, n);
-}
-
-/*
- * mvaddchstr --
- *      Add a string to stdscr starting at (y, x)
- */
-int
-mvaddchstr(int y, int x, const chtype *chstr)
-{
-	return mvwaddchnstr(stdscr, y, x, chstr, -1);
-}
-
-/*
- * mvwaddchstr --
- *      Add a string to the given window starting at (y, x)
- */
-int
-mvwaddchstr(WINDOW *win, int y, int x, const chtype *chstr)
-{
-	return mvwaddchnstr(win, y, x, chstr, -1);
-}
-
-/*
- * mvaddchnstr --
- *      Add a string of at most n characters to stdscr
- *      starting at (y, x).
- */
-int
-mvaddchnstr(int y, int x, const chtype *chstr, int n)
-{
-	return mvwaddchnstr(stdscr, y, x, chstr, n);
-}
-
-/*
- * mvwaddchnstr --
- *      Add a string of at most n characters to the given window
- *      starting at (y, x).
- */
-int
-mvwaddchnstr(WINDOW *win, int y, int x, const chtype *chstr, int n)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return waddchnstr(win, chstr, n);
-}
-
-#endif
-
-/*
- * waddchnstr --
- *	Add a string (at most n characters) to the given window
- *	starting at (_cury, _curx) until the end of line is reached or
- *      n characters have been added.  If n is negative, add as much
- *	of the string that will fit on the current line.  SUSv2 says
- *      that the addchnstr family does not wrap and strings are truncated
- *      to the RHS of the window.
- */
-int
-waddchnstr(WINDOW *win, const chtype *chstr, int n)
-{
-	size_t  len;
-	const chtype *chp;
-	attr_t	attr;
-	char	*ocp, *cp, *start;
-	int i, ret, ox, oy;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "waddchnstr: win = %p, chstr = %p, n = %d\n",
-	    win, chstr, n);
-#endif
-
-	if (n >= 0)
-		for (chp = chstr, len = 0; n-- && *chp++; ++len);
-	else
-		for (chp = chstr, len = 0; *chp++; ++len);
-
-	/* check if string is too long for current location */
-	if (len > (win->maxx - win->curx))
-		len = win->maxx - win->curx;
-
-	if ((ocp = malloc(len + 1)) == NULL)
-		return ERR;
-	chp = chstr;
-	cp = ocp;
-	start = ocp;
-	i = 0;
-	attr = (*chp) & __ATTRIBUTES;
-	ox = win->curx;
-	oy = win->cury;
-	while (len) {
-		*cp = (*chp) & __CHARTEXT;
-		cp++;
-		chp++;
-		i++;
-		len--;
-		if (((*chp) & __ATTRIBUTES) != attr) {
-			*cp = '\0';
-			if (_cursesi_waddbytes(win, start, i, attr, 0) == ERR) {
-				free(ocp);
-				return ERR;
-			}
-			attr = (*chp) & __ATTRIBUTES;
-			start = cp;
-			i = 0;
-		}
-	}
-	*cp = '\0';
-	ret = _cursesi_waddbytes(win, start, i, attr, 0);
-	free(ocp);
-	wmove(win, oy, ox);
-	return ret;
-}
diff --git a/lib/libcurses/addnstr.c b/lib/libcurses/addnstr.c
deleted file mode 100644
index 51b76d60c..000000000
--- a/lib/libcurses/addnstr.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*	$NetBSD: addnstr.c,v 1.14 2014/07/13 01:58:08 blymn Exp $	*/
-
-/*
- * Copyright (c) 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)addnstr.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: addnstr.c,v 1.14 2014/07/13 01:58:08 blymn Exp $");
-#endif
-#endif				/* not lint */
-
-#include <string.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * addstr --
- *      Add a string to stdscr starting at (_cury, _curx).
- */
-int
-addstr(const char *s)
-{
-	return waddnstr(stdscr, s, -1);
-}
-
-/*
- * waddstr --
- *      Add a string to the given window starting at (_cury, _curx).
- */
-int
-waddstr(WINDOW *win, const char *s)
-{
-	return waddnstr(win, s, -1);
-}
-
-/*
- * addnstr --
- *      Add a string (at most n characters) to stdscr starting
- *	at (_cury, _curx).  If n is negative, add the entire string.
- */
-int
-addnstr(const char *str, int n)
-{
-	return waddnstr(stdscr, str, n);
-}
-
-/*
- * mvaddstr --
- *      Add a string to stdscr starting at (y, x)
- */
-int
-mvaddstr(int y, int x, const char *str)
-{
-	return mvwaddnstr(stdscr, y, x, str, -1);
-}
-
-/*
- * mvwaddstr --
- *      Add a string to the given window starting at (y, x)
- */
-int
-mvwaddstr(WINDOW *win, int y, int x, const char *str)
-{
-	return mvwaddnstr(win, y, x, str, -1);
-}
-
-/*
- * mvaddnstr --
- *      Add a string of at most n characters to stdscr
- *      starting at (y, x).
- */
-int
-mvaddnstr(int y, int x, const char *str, int count)
-{
-	return mvwaddnstr(stdscr, y, x, str, count);
-}
-
-/*
- * mvwaddnstr --
- *      Add a string of at most n characters to the given window
- *      starting at (y, x).
- */
-int
-mvwaddnstr(WINDOW *win, int y, int x, const char *str, int count)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return waddnstr(win, str, count);
-}
-
-#endif
-
-/*
- * waddnstr --
- *	Add a string (at most n characters) to the given window
- *	starting at (_cury, _curx).  If n is negative, add the
- *	entire string.
- */
-int
-waddnstr(WINDOW *win, const char *s, int n)
-{
-	size_t  len;
-	const char *p;
-
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT, "ADDNSTR: win %p, length %d\n",
-			 win, n);
-#endif
-	/*
-	 * behavior changed from traditional BSD curses, for better XCURSES
-	 * conformance.
-	 *
-	 * BSD curses: if (n > 0) then "at most n", else "len = strlen(s)"
-	 * ncurses: if (n >= 0) then "at most n", else "len = strlen(s)"
-	 * XCURSES: if (n != -1) then "at most n", else "len = strlen(s)"
-	 * 
-	 */
-	if (n >= 0)
-		for (p = s, len = 0; n-- && *p++; ++len);
-	else
-		len = strlen(s);
-	
-	return(waddbytes(win, s, (int) len));
-}
diff --git a/lib/libcurses/addwstr.c b/lib/libcurses/addwstr.c
deleted file mode 100644
index 0a433a1c7..000000000
--- a/lib/libcurses/addwstr.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*   $NetBSD: addwstr.c,v 1.2 2007/05/28 15:01:54 blymn Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation Inc.
- * All rights reserved.
- *
- * This code is derived from code donated to the NetBSD Foundation
- * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@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.
- * 3. Neither the name of the NetBSD Foundation nor the names of its
- *	contributors may be used to endorse or promote products derived
- *	from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
- * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: addwstr.c,v 1.2 2007/05/28 15:01:54 blymn Exp $");
-#endif						  /* not lint */
-
-#include <string.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * addwstr --
- *	  Add a string to stdscr starting at (_cury, _curx).
- */
-int
-addwstr(const wchar_t *s)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return waddnwstr(stdscr, s, -1);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * waddwstr --
- *	  Add a string to the given window starting at (_cury, _curx).
- */
-int
-waddwstr(WINDOW *win, const wchar_t *s)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return waddnwstr(win, s, -1);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * addnwstr --
- *	  Add a string (at most n characters) to stdscr starting
- *	at (_cury, _curx).  If n is negative, add the entire string.
- */
-int
-addnwstr(const wchar_t *str, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return waddnwstr(stdscr, str, n);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvaddwstr --
- *	  Add a string to stdscr starting at (y, x)
- */
-int
-mvaddwstr(int y, int x, const wchar_t *str)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwaddnwstr(stdscr, y, x, str, -1);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvwaddwstr --
- *	  Add a string to the given window starting at (y, x)
- */
-int
-mvwaddwstr(WINDOW *win, int y, int x, const wchar_t *str)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwaddnwstr(win, y, x, str, -1);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvaddnwstr --
- *	  Add a string of at most n characters to stdscr
- *	  starting at (y, x).
- */
-int
-mvaddnwstr(int y, int x, const wchar_t *str, int count)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwaddnwstr(stdscr, y, x, str, count);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvwaddnwstr --
- *	  Add a string of at most n characters to the given window
- *	  starting at (y, x).
- */
-int
-mvwaddnwstr(WINDOW *win, int y, int x, const wchar_t *str, int count)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return waddnwstr(win, str, count);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * waddnwstr --
- *	Add a string (at most n characters) to the given window
- *	starting at (_cury, _curx).  If n is negative, add the
- *	entire string.
- */
-int
-waddnwstr(WINDOW *win, const wchar_t *s, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	size_t  len;
-	const wchar_t *p;
-	cchar_t cc;
-	wchar_t wc[ 2 ];
-
-	/*
-	 * BSD curses: if (n > 0) then "at most n", else "len = strlen(s)"
-	 * ncurses: if (n >= 0) then "at most n", else "len = strlen(s)"
-	 * XCURSES: if (n != -1) then "at most n", else "len = strlen(s)"
-	 */
-	/* compute the length and column width of string */
-	if ( n < -1 ) 
-		return ERR;
-	if (n >= 0)
-		for (p = s, len = 0; n-- && *p++; ++len );
-	else
-		len = wcslen(s);
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "waddnwstr: string len=%ld\n", (long) len);
-#endif /* DEBUG */
-
-	p = s;
-	while ( len ) {
-		wc[ 0 ] = *p;
-		wc[ 1 ] = L'\0';
-		if ( setcchar( &cc, wc, win->wattr, 0, NULL ) == ERR )
-			return ERR;
-		if ( wadd_wch( win, &cc ) == ERR )
-			return ERR;
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT, "waddnwstr: (%x,%x,%d) added\n", 
-				cc.vals[ 0 ], cc.attributes, cc.elements );
-#endif /* DEBUG */
-		p++, len--;
-	}
-
-	return OK;
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/attributes.c b/lib/libcurses/attributes.c
deleted file mode 100644
index b0bfe29f2..000000000
--- a/lib/libcurses/attributes.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/*	$NetBSD: attributes.c,v 1.21 2010/12/25 10:08:20 blymn Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: attributes.c,v 1.21 2010/12/25 10:08:20 blymn Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-void __wcolor_set(WINDOW *, attr_t);
-
-#ifndef _CURSES_USE_MACROS
-/*
- * attr_get --
- *	Get wide attributes and color pair from stdscr
- */
-/* ARGSUSED */
-int
-attr_get(attr_t *attr, short *pair, void *opt)
-{
-	return wattr_get(stdscr, attr, pair, opt);
-}
-
-/*
- * attr_on --
- *	Test and set wide attributes on stdscr
- */
-/* ARGSUSED */
-int
-attr_on(attr_t attr, void *opt)
-{
-	return wattr_on(stdscr, attr, opt);
-}
-
-/*
- * attr_off --
- *	Test and unset wide attributes on stdscr
- */
-/* ARGSUSED */
-int
-attr_off(attr_t attr, void *opt)
-{
-	return wattr_off(stdscr, attr, opt);
-}
-
-/*
- * attr_set --
- *	Set wide attributes and color pair on stdscr
- */
-/* ARGSUSED */
-int
-attr_set(attr_t attr, short pair, void *opt)
-{
-	return wattr_set(stdscr, attr, pair, opt);
-}
-
-/*
- * color_set --
- *	Set color pair on stdscr
- */
-/* ARGSUSED */
-int
-color_set(short pair, void *opt)
-{
-	return wcolor_set(stdscr, pair, opt);
-}
-
-/*
- * attron --
- *	Test and set attributes on stdscr
- */
-int
-attron(int attr)
-{
-	return wattr_on(stdscr, (attr_t) attr, NULL);
-}
-
-/*
- * attroff --
- *	Test and unset attributes on stdscr.
- */
-int
-attroff(int attr)
-{
-	return wattr_off(stdscr, (attr_t) attr, NULL);
-}
-
-/*
- * attrset --
- *	Set specific attribute modes.
- *	Unset others.  On stdscr.
- */
-int
-attrset(int attr)
-{
-	return wattrset(stdscr, attr);
-}
-#endif	/* _CURSES_USE_MACROS */
-
-/*
- * wattr_get --
- *	Get wide attributes and colour pair from window
- *	Note that attributes also includes colour.
- */
-/* ARGSUSED */
-int
-wattr_get(WINDOW *win, attr_t *attr, short *pair, void *opt)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "wattr_get: win %p\n", win);
-#endif
-	if (attr != NULL) {
-		*attr = win->wattr;
-#ifdef HAVE_WCHAR
-		*attr &= WA_ATTRIBUTES;
-#endif
-	}
-
-	if (pair != NULL)
-		*pair = PAIR_NUMBER(win->wattr);
-	return OK;
-}
-
-/*
- * wattr_on --
- *	Test and set wide attributes on window
- */
-/* ARGSUSED */
-int
-wattr_on(WINDOW *win, attr_t attr, void *opt)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "wattr_on: win %p, attr %08x\n", win, attr);
-#endif
-	/* If can enter modes, set the relevent attribute bits. */
-	if (exit_attribute_mode != NULL) {
-		if (attr & __BLINK && enter_blink_mode != NULL)
-			win->wattr |= __BLINK;
-		if (attr & __BOLD && enter_bold_mode != NULL)
-			win->wattr |= __BOLD;
-		if (attr & __DIM && enter_dim_mode != NULL)
-			win->wattr |= __DIM;
-		if (attr & __BLANK && enter_secure_mode != NULL)
-			win->wattr |= __BLANK;
-		if (attr & __PROTECT && enter_protected_mode != NULL)
-			win->wattr |= __PROTECT;
-		if (attr & __REVERSE && enter_reverse_mode != NULL)
-			win->wattr |= __REVERSE;
-#ifdef HAVE_WCHAR
-		if (attr & WA_LOW && enter_low_hl_mode != NULL)
-			win->wattr |= WA_LOW;
-		if (attr & WA_TOP && enter_top_hl_mode != NULL)
-			win->wattr |= WA_TOP;
-		if (attr & WA_LEFT && enter_left_hl_mode != NULL)
-			win->wattr |= WA_LEFT;
-		if (attr & WA_RIGHT && enter_right_hl_mode != NULL)
-			win->wattr |= WA_RIGHT;
-		if (attr & WA_HORIZONTAL && enter_horizontal_hl_mode != NULL)
-			win->wattr |= WA_HORIZONTAL;
-		if (attr & WA_VERTICAL && enter_vertical_hl_mode != NULL)
-			win->wattr |= WA_VERTICAL;
-#endif /* HAVE_WCHAR */
-	}
-	if (attr & __STANDOUT && enter_standout_mode != NULL && exit_standout_mode != NULL)
-		wstandout(win);
-	if (attr & __UNDERSCORE && enter_underline_mode != NULL && exit_underline_mode != NULL)
-		wunderscore(win);
-	if ((attr_t) attr & __COLOR)
-		__wcolor_set(win, (attr_t) attr);
-	return OK;
-}
-
-/*
- * wattr_off --
- *	Test and unset wide attributes on window
- *
- *	Note that the 'me' sequence unsets all attributes.  We handle
- *	which attributes should really be set in refresh.c:makech().
- */
-/* ARGSUSED */
-int
-wattr_off(WINDOW *win, attr_t attr, void *opt)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "wattr_off: win %p, attr %08x\n", win, attr);
-#endif
-	/* If can do exit modes, unset the relevent attribute bits. */
-	if (exit_attribute_mode != NULL) {
-		if (attr & __BLINK)
-			win->wattr &= ~__BLINK;
-		if (attr & __BOLD)
-			win->wattr &= ~__BOLD;
-		if (attr & __DIM)
-			win->wattr &= ~__DIM;
-		if (attr & __BLANK)
-			win->wattr &= ~__BLANK;
-		if (attr & __PROTECT)
-			win->wattr &= ~__PROTECT;
-		if (attr & __REVERSE)
-			win->wattr &= ~__REVERSE;
-#ifdef HAVE_WCHAR
-		if (attr & WA_LOW)
-			win->wattr &= ~WA_LOW;
-		if (attr & WA_TOP)
-			win->wattr &= ~WA_TOP;
-		if (attr & WA_LEFT)
-			win->wattr &= ~WA_LEFT;
-		if (attr & WA_RIGHT)
-			win->wattr &= ~WA_RIGHT;
-		if (attr & WA_HORIZONTAL)
-			win->wattr &= ~WA_HORIZONTAL;
-	if (attr & WA_VERTICAL)
-			win->wattr &= ~WA_VERTICAL;
-#endif /* HAVE_WCHAR */
-	}
-	if (attr & __STANDOUT)
-		wstandend(win);
-	if (attr & __UNDERSCORE)
-		wunderend(win);
-	if ((attr_t) attr & __COLOR) {
-		if (max_colors != 0)
-			win->wattr &= ~__COLOR;
-	}
-	return OK;
-}
-
-/*
- * wattr_set --
- *	Set wide attributes and color pair on window
- */
-int
-wattr_set(WINDOW *win, attr_t attr, short pair, void *opt)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "wattr_set: win %p, attr %08x, pair %d\n",
-	    win, attr, pair);
-#endif
- 	wattr_off(win, __ATTRIBUTES, opt);
-	/*
-	 * This overwrites any colour setting from the attributes
-	 * and is compatible with ncurses.
-	 */
- 	attr = (attr & ~__COLOR) | COLOR_PAIR(pair);
- 	wattr_on(win, attr, opt);
-	return OK;
-}
-
-/*
- * wattron --
- *	Test and set attributes.
- */
-int
-wattron(WINDOW *win, int attr)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "wattron: win %p, attr %08x\n", win, attr);
-#endif
-	return wattr_on(win, (attr_t) attr, NULL);
-}
-
-/*
- * wattroff --
- *	Test and unset attributes.
- */
-int
-wattroff(WINDOW *win, int attr)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "wattroff: win %p, attr %08x\n", win, attr);
-#endif
-	return wattr_off(win, (attr_t) attr, NULL);
-}
-
-/*
- * wattrset --
- *	Set specific attribute modes.
- *	Unset others.
- */
-int
-wattrset(WINDOW *win, int attr)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "wattrset: win %p, attr %08x\n", win, attr);
-#endif
-	wattr_off(win, __ATTRIBUTES, NULL);
-	wattr_on(win, (attr_t) attr, NULL);
-	return OK;
-}
-
-/*
- * wcolor_set --
- *	Set color pair on window
- */
-/* ARGSUSED */
-int
-wcolor_set(WINDOW *win, short pair, void *opt)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_COLOR, "wolor_set: win %p, pair %d\n", win, pair);
-#endif
-	__wcolor_set(win, (attr_t) COLOR_PAIR(pair));
-	return OK;
-}
-
-/*
- * getattrs --
- *	Get window attributes.
- */
-chtype
-getattrs(WINDOW *win)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "getattrs: win %p\n", win);
-#endif
-	return((chtype) win->wattr);
-}
-
-/*
- * termattrs --
- *	Get terminal attributes
- */
-chtype
-termattrs(void)
-{
-	chtype ch = 0;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "termattrs\n");
-#endif
-	if (exit_attribute_mode != NULL) {
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "termattrs: have exit attribute mode\n");
-#endif
-		if (enter_blink_mode != NULL)
-			ch |= __BLINK;
-		if (enter_bold_mode != NULL)
-			ch |= __BOLD;
-		if (enter_dim_mode != NULL)
-			ch |= __DIM;
-		if (enter_secure_mode != NULL)
-			ch |= __BLANK;
-		if (enter_protected_mode != NULL)
-			ch |= __PROTECT;
-		if (enter_reverse_mode != NULL)
-			ch |= __REVERSE;
-	}
-	if (enter_standout_mode != NULL && exit_standout_mode != NULL)
-		ch |= __STANDOUT;
-	if (enter_underline_mode != NULL && exit_underline_mode != NULL)
-		ch |= __UNDERSCORE;
-	if (enter_alt_charset_mode != NULL && exit_alt_charset_mode != NULL)
-		ch |= __ALTCHARSET;
-
-	return ch;
-}
-
-/*
- * term_attrs --
- *	Get terminal wide attributes
- */
-attr_t
-term_attrs(void)
-{
-	attr_t attr = 0;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "term_attrs\n");
-#endif
-	if (exit_attribute_mode != NULL) {
-		if (enter_blink_mode != NULL)
-			attr |= __BLINK;
-		if (enter_bold_mode != NULL)
-			attr |= __BOLD;
-		if (enter_dim_mode != NULL)
-			attr |= __DIM;
-		if (enter_secure_mode != NULL)
-			attr |= __BLANK;
-		if (enter_protected_mode != NULL)
-			attr |= __PROTECT;
-		if (enter_reverse_mode != NULL)
-			attr |= __REVERSE;
-#ifdef HAVE_WCHAR
-		if (enter_low_hl_mode != NULL)
-			attr |= WA_LOW;
-		if (enter_top_hl_mode != NULL)
-			attr |= WA_TOP;
-		if (enter_left_hl_mode != NULL)
-			attr |= WA_LEFT;
-		if (enter_right_hl_mode != NULL)
-			attr |= WA_RIGHT;
-		if (enter_horizontal_hl_mode != NULL)
-			attr |= WA_HORIZONTAL;
-		if (enter_vertical_hl_mode != NULL)
-			attr |= WA_VERTICAL;
-#endif /* HAVE_WCHAR */
-	}
-	if (enter_standout_mode != NULL && exit_standout_mode != NULL)
-		attr |= __STANDOUT;
-	if (enter_underline_mode != NULL && exit_underline_mode != NULL)
-		attr |= __UNDERSCORE;
-	if (enter_alt_charset_mode != NULL && exit_alt_charset_mode != NULL)
-		attr |= __ALTCHARSET;
-
-	return attr;
-}
-
-/*
- * __wcolor_set --
- * Set color attribute on window
- */
-void
-__wcolor_set(WINDOW *win, attr_t attr)
-{
-	/* If another color pair is set, turn that off first. */
-	win->wattr &= ~__COLOR;
-	/* If can do color video, set the color pair bits. */
-	if (max_colors != 0 && attr & __COLOR)
-		win->wattr |= attr & __COLOR;
-}
diff --git a/lib/libcurses/background.c b/lib/libcurses/background.c
deleted file mode 100644
index 3e3469d21..000000000
--- a/lib/libcurses/background.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*	$NetBSD: background.c,v 1.15 2009/07/22 16:57:14 roy Exp $	*/
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: background.c,v 1.15 2009/07/22 16:57:14 roy Exp $");
-#endif				/* not lint */
-
-#include <stdlib.h>
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * bkgdset
- *	Set new background attributes on stdscr.
- */
-void
-bkgdset(chtype ch)
-{
-	wbkgdset(stdscr, ch);
-}
-
-/*
- * bkgd --
- *	Set new background and new background attributes on stdscr.
- */
-int
-bkgd(chtype ch)
-{
-	return(wbkgd(stdscr, ch));
-}
-
-/*
- * wbkgdset
- *	Set new background attributes.
- */
-void
-wbkgdset(WINDOW *win, chtype ch)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "wbkgdset: (%p), '%s', %08x\n",
-	    win, unctrl(ch & +__CHARTEXT), ch & __ATTRIBUTES);
-#endif
-
-	/* Background character. */
-	if (ch & __CHARTEXT)
-		win->bch = (wchar_t) ch & __CHARTEXT;
-
-	/* Background attributes (check colour). */
-	if (__using_color && !(ch & __COLOR))
-		ch |= __default_color;
-	win->battr = (attr_t) ch & __ATTRIBUTES;
-}
-
-/*
- * wbkgd --
- *	Set new background and new background attributes.
- */
-int
-wbkgd(WINDOW *win, chtype ch)
-{
-	int	y, x;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "wbkgd: (%p), '%s', %08x\n",
-	    win, unctrl(ch & +__CHARTEXT), ch & __ATTRIBUTES);
-#endif
-
-	/* Background attributes (check colour). */
-	if (__using_color && !(ch & __COLOR))
-		ch |= __default_color;
-
-	win->battr = (attr_t) ch & __ATTRIBUTES;
-	wbkgdset(win, ch);
-	for (y = 0; y < win->maxy; y++)
-		for (x = 0; x < win->maxx; x++) {
-			/* Copy character if space */
-			if (ch & A_CHARTEXT && win->alines[y]->line[x].ch == ' ')
-				win->alines[y]->line[x].ch = ch & __CHARTEXT;
-			/* Merge attributes */
-			if (win->alines[y]->line[x].attr & __ALTCHARSET)
-				win->alines[y]->line[x].attr =
-				    (ch & __ATTRIBUTES) | __ALTCHARSET;
-			else
-				win->alines[y]->line[x].attr =
-				    ch & __ATTRIBUTES;
-#ifdef HAVE_WCHAR
-			SET_WCOL(win->alines[y]->line[x], 1);
-#endif
-		}
-	__touchwin(win);
-	return(OK);
-}
-
-/*
- * getbkgd --
- *	Get current background attributes.
- */
-chtype
-getbkgd(WINDOW *win)
-{
-	attr_t	battr;
-
-	/* Background attributes (check colour). */
-	battr = win->battr & A_ATTRIBUTES;
-	if (__using_color && ((battr & __COLOR) == __default_color))
-		battr &= ~__default_color;
-
-	return ((chtype) ((win->bch & A_CHARTEXT) | battr));
-}
-
-int bkgrnd(const cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return wbkgrnd( stdscr, wch );
-#endif /* HAVE_WCHAR */
-}
-
-void bkgrndset(const cchar_t *wch)
-{
-#ifdef HAVE_WCHAR
-	wbkgrndset( stdscr, wch );
-#endif /* HAVE_WCHAR */
-}
-
-int getbkgrnd(cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return wgetbkgrnd( stdscr, wch );
-#endif /* HAVE_WCHAR */
-}
-
-int wbkgrnd(WINDOW *win, const cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-/* 	int	y, x, i; */
-	attr_t battr;
-/* 	nschar_t *np, *tnp, *pnp; */
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "wbkgrnd: (%p), '%s', %x\n",
-		win, (const char *) wunctrl(wch), wch->attributes);
-#endif
-
-	/* ignore multi-column characters */
-	if ( !wch->elements || wcwidth( wch->vals[ 0 ]) > 1 )
-		return ERR;
-
-	/* Background attributes (check colour). */
-	battr = wch->attributes & WA_ATTRIBUTES;
-	if (__using_color && !( battr & __COLOR))
-		battr |= __default_color;
-
-	win->battr = battr;
-	wbkgrndset(win, wch);
-	__touchwin(win);
-	return OK;
-#endif /* HAVE_WCHAR */
-}
-
-void wbkgrndset(WINDOW *win, const cchar_t *wch)
-{
-#ifdef HAVE_WCHAR
-	attr_t battr;
-	nschar_t *np, *tnp;
-	int i;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "wbkgrndset: (%p), '%s', %x\n",
-		win, (const char *) wunctrl(wch), wch->attributes);
-#endif
-
-	/* ignore multi-column characters */
-	if ( !wch->elements || wcwidth( wch->vals[ 0 ]) > 1 )
-		return;
-
-	/* Background character. */
-	tnp = np = win->bnsp;
-	if ( wcwidth( wch->vals[ 0 ]))
-		win->bch = wch->vals[ 0 ];
-	else {
-		if ( !np ) {
-			np = (nschar_t *)malloc(sizeof(nschar_t));
-			if (!np)
-				return;
-			np->next = NULL;
-			win->bnsp = np;
-		}
-		np->ch = wch->vals[ 0 ];
-		tnp = np;
-		np = np->next;
-	}
-	/* add non-spacing characters */
-	if ( wch->elements > 1 ) {
-		for ( i = 1; i < wch->elements; i++ ) {
-			if ( !np ) {
-				np = (nschar_t *)malloc(sizeof(nschar_t));
-				if (!np)
-					return;
-				np->next = NULL;
-				if ( tnp )
-					tnp->next = np;
-				else
-					win->bnsp = np;
-			}
-			np->ch = wch->vals[ i ];
-			tnp = np;
-			np = np->next;
-		}
-	}
-	/* clear the old non-spacing characters */
-	while ( np ) {
-		tnp = np->next;
-		free( np );
-		np = tnp;
-	}
-
-	/* Background attributes (check colour). */
-	battr = wch->attributes & WA_ATTRIBUTES;
-	if (__using_color && !( battr & __COLOR))
-		battr |= __default_color;
-	win->battr = battr;
-	SET_BGWCOL((*win), 1);
-#endif /* HAVE_WCHAR */
-}
-
-int wgetbkgrnd(WINDOW *win, cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	nschar_t *np;
-
-	/* Background attributes (check colour). */
-	wch->attributes = win->battr & WA_ATTRIBUTES;
-	if (__using_color && (( wch->attributes & __COLOR )
-			== __default_color))
-		wch->attributes &= ~__default_color;
-	wch->vals[ 0 ] = win->bch;
-	wch->elements = 1;
-	np = win->bnsp;
-	if (np) {
-		while ( np && wch->elements < CURSES_CCHAR_MAX ) {
-			wch->vals[ wch->elements++ ] = np->ch;
-			np = np->next;
-		}
-	}
-
-	return OK;
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/bell.c b/lib/libcurses/bell.c
deleted file mode 100644
index 42571671d..000000000
--- a/lib/libcurses/bell.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*	$NetBSD: bell.c,v 1.8 2010/02/03 15:34:40 roy Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: bell.c,v 1.8 2010/02/03 15:34:40 roy Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * beep
- *	Ring the terminal bell
- */
-int
-beep(void)
-{
-	if (bell != NULL) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_MISC, "beep: bl\n");
-#endif
-		tputs(bell, 0, __cputchar);
-	} else if (flash_screen != NULL) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_MISC, "beep: vb\n");
-#endif
-		tputs(flash_screen, 0, __cputchar);
-	}
-	return (1);
-}
-
-/*
- * flash
- *	Flash the terminal screen
- */
-int
-flash(void)
-{
-	if (flash_screen != NULL) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_MISC, "flash: vb\n");
-#endif
-		tputs(flash_screen, 0, __cputchar);
-	} else if (bell != NULL) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_MISC, "flash: bl\n");
-#endif
-		tputs(bell, 0, __cputchar);
-	}
-	return (1);
-}
diff --git a/lib/libcurses/border.c b/lib/libcurses/border.c
deleted file mode 100644
index 6085b114f..000000000
--- a/lib/libcurses/border.c
+++ /dev/null
@@ -1,622 +0,0 @@
-/*	$NetBSD: border.c,v 1.15 2013/05/05 14:23:16 jdc Exp $	*/
-
-/*
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: border.c,v 1.15 2013/05/05 14:23:16 jdc Exp $");
-#endif				/* not lint */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * border --
- *	Draw a border around stdscr using the specified
- *	delimiting characters.
- */
-int
-border(chtype left, chtype right, chtype top, chtype bottom, chtype topleft,
-       chtype topright, chtype botleft, chtype botright)
-{
-	return wborder(stdscr, left, right, top, bottom, topleft, topright,
-	    botleft, botright);
-}
-
-#endif
-
-/*
- * wborder --
- *	Draw a border around the given window using the specified delimiting
- *	characters.
- */
-int
-wborder(WINDOW *win, chtype left, chtype right, chtype top, chtype bottom,
-	chtype topleft, chtype topright, chtype botleft, chtype botright)
-{
-#ifndef HAVE_WCHAR
-	int	 endy, endx, i;
-	__LDATA	*fp, *lp;
-
-	if (!(left & __CHARTEXT))
-		left |= ACS_VLINE;
-	if (!(right & __CHARTEXT))
-		right |= ACS_VLINE;
-	if (!(top & __CHARTEXT))
-		top |= ACS_HLINE;
-	if (!(bottom & __CHARTEXT))
-		bottom |= ACS_HLINE;
-	if (!(topleft & __CHARTEXT))
-		topleft |= ACS_ULCORNER;
-	if (!(topright & __CHARTEXT))
-		topright |= ACS_URCORNER;
-	if (!(botleft & __CHARTEXT))
-		botleft |= ACS_LLCORNER;
-	if (!(botright & __CHARTEXT))
-		botright |= ACS_LRCORNER;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "wborder: left = %c, 0x%x\n",
-	    left & __CHARTEXT, left & __ATTRIBUTES);
-	__CTRACE(__CTRACE_INPUT, "wborder: right = %c, 0x%x\n",
-	    right & __CHARTEXT, right & __ATTRIBUTES);
-	__CTRACE(__CTRACE_INPUT, "wborder: top = %c, 0x%x\n",
-	    top & __CHARTEXT, top & __ATTRIBUTES);
-	__CTRACE(__CTRACE_INPUT, "wborder: bottom = %c, 0x%x\n",
-	    bottom & __CHARTEXT, bottom & __ATTRIBUTES);
-	__CTRACE(__CTRACE_INPUT, "wborder: topleft = %c, 0x%x\n",
-	    topleft & __CHARTEXT, topleft & __ATTRIBUTES);
-	__CTRACE(__CTRACE_INPUT, "wborder: topright = %c, 0x%x\n",
-	    topright & __CHARTEXT, topright & __ATTRIBUTES);
-	__CTRACE(__CTRACE_INPUT, "wborder: botleft = %c, 0x%x\n",
-	    botleft & __CHARTEXT, botleft & __ATTRIBUTES);
-	__CTRACE(__CTRACE_INPUT, "wborder: botright = %c, 0x%x\n",
-	    botright & __CHARTEXT, botright & __ATTRIBUTES);
-#endif
-
-	/* Merge window and background attributes */
-	left |= (left & __COLOR) ? (win->wattr & ~__COLOR) : win->wattr;
-	left |= (left & __COLOR) ? (win->battr & ~__COLOR) : win->battr;
-	right |= (right & __COLOR) ? (win->wattr & ~__COLOR) : win->wattr;
-	right |= (right & __COLOR) ? (win->battr & ~__COLOR) : win->battr;
-	top |= (top & __COLOR) ? (win->wattr & ~__COLOR) : win->wattr;
-	top |= (top & __COLOR) ? (win->battr & ~__COLOR) : win->battr;
-	bottom |= (bottom & __COLOR) ? (win->wattr & ~__COLOR) : win->wattr;
-	bottom |= (bottom & __COLOR) ? (win->battr & ~__COLOR) : win->battr;
-	topleft |= (topleft & __COLOR) ? (win->wattr & ~__COLOR) : win->wattr;
-	topleft |= (topleft & __COLOR) ? (win->battr & ~__COLOR) : win->battr;
-	topright |= (topright & __COLOR) ? (win->wattr & ~__COLOR) : win->wattr;
-	topright |= (topright & __COLOR) ? (win->battr & ~__COLOR) : win->battr;
-	botleft |= (botleft & __COLOR) ? (win->wattr & ~__COLOR) : win->wattr;
-	botleft |= (botleft & __COLOR) ? (win->battr & ~__COLOR) : win->battr;
-	botright |= (botright & __COLOR) ? (win->wattr & ~__COLOR) : win->wattr;
-	botright |= (botright & __COLOR) ? (win->battr & ~__COLOR) : win->battr;
-
-	endx = win->maxx - 1;
-	endy = win->maxy - 1;
-	fp = win->alines[0]->line;
-	lp = win->alines[endy]->line;
-
-	/* Sides */
-	for (i = 1; i < endy; i++) {
-		win->alines[i]->line[0].ch = (wchar_t) left & __CHARTEXT;
-		win->alines[i]->line[0].attr = (attr_t) left & __ATTRIBUTES;
-		win->alines[i]->line[endx].ch = (wchar_t) right & __CHARTEXT;
-		win->alines[i]->line[endx].attr = (attr_t) right & __ATTRIBUTES;
-	}
-	for (i = 1; i < endx; i++) {
-		fp[i].ch = (wchar_t) top & __CHARTEXT;
-		fp[i].attr = (attr_t) top & __ATTRIBUTES;
-		lp[i].ch = (wchar_t) bottom & __CHARTEXT;
-		lp[i].attr = (attr_t) bottom & __ATTRIBUTES;
-	}
-
-	/* Corners */
-	if (!(win->maxx == LINES && win->maxy == COLS &&
-	    (win->flags & __SCROLLOK) && (win->flags & __SCROLLWIN))) {
-		fp[0].ch = (wchar_t) topleft & __CHARTEXT;
-		fp[0].attr = (attr_t) topleft & __ATTRIBUTES;
-		fp[endx].ch = (wchar_t) topright & __CHARTEXT;
-		fp[endx].attr = (attr_t) topright & __ATTRIBUTES;
-		lp[0].ch = (wchar_t) botleft & __CHARTEXT;
-		lp[0].attr = (attr_t) botleft & __ATTRIBUTES;
-		lp[endx].ch = (wchar_t) botright & __CHARTEXT;
-		lp[endx].attr = (attr_t) botright & __ATTRIBUTES;
-	}
-	__touchwin(win);
-	return (OK);
-#else /* HAVE_WCHAR */
-	cchar_t ls, rs, ts, bs, tl, tr, bl, br;
-	cchar_t *lsp, *rsp, *tsp, *bsp, *tlp, *trp, *blp, *brp;
-
-#define S(in, out, def) \
-	if (in & __CHARTEXT) { \
-		__cursesi_chtype_to_cchar(in, &out); \
-	} else { \
-		memcpy(&out, def, sizeof(cchar_t)); \
-		out.attributes |= in & __ATTRIBUTES; \
-	} \
-	out##p = &out;
-
-	S(left, ls, WACS_VLINE);
-	S(right, rs, WACS_VLINE);
-	S(top, ts, WACS_HLINE);
-	S(bottom, bs, WACS_HLINE);
-	S(topleft, tl, WACS_ULCORNER);
-	S(topright, tr, WACS_URCORNER);
-	S(botleft, bl, WACS_LLCORNER);
-	S(botright, br, WACS_LRCORNER);
-#undef S
-	return wborder_set(win, lsp, rsp, tsp, bsp, tlp, trp, blp, brp);
-#endif /* HAVE_WCHAR */
-}
-
-int border_set(const cchar_t *ls, const cchar_t *rs, const cchar_t *ts,
-	   const cchar_t *bs, const cchar_t *tl, const cchar_t *tr,
-	   const cchar_t *bl, const cchar_t *br)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return wborder_set(stdscr, ls, rs, ts, bs, tl, tr, bl, br);
-#endif /* HAVE_WCHAR */
-}
-
-int wborder_set(WINDOW *win, const cchar_t *ls, const cchar_t *rs,
-		const cchar_t *ts, const cchar_t *bs,
-		const cchar_t *tl, const cchar_t *tr,
-		const cchar_t *bl, const cchar_t *br)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	int	 endy, endx, i, j, k, cw, pcw, tlcw, blcw, trcw, brcw;
-	cchar_t left, right, bottom, top, topleft, topright, botleft, botright;
-	nschar_t *np, *tnp;
-
-	if ( ls && wcwidth( ls->vals[ 0 ]))
-		memcpy( &left, ls, sizeof( cchar_t ));
-	else
-		memcpy( &left, WACS_VLINE, sizeof( cchar_t ));
-	if ( rs && wcwidth( rs->vals[ 0 ]))
-		memcpy( &right, rs, sizeof( cchar_t ));
-	else
-		memcpy( &right, WACS_VLINE, sizeof( cchar_t ));
-	if ( ts && wcwidth( ts->vals[ 0 ]))
-		memcpy( &top, ts, sizeof( cchar_t ));
-	else
-		memcpy( &top, WACS_HLINE, sizeof( cchar_t ));
-	if ( bs && wcwidth( bs->vals[ 0 ]))
-		memcpy( &bottom, bs, sizeof( cchar_t ));
-	else
-		memcpy( &bottom, WACS_HLINE, sizeof( cchar_t ));
-	if ( tl && wcwidth( tl->vals[ 0 ]))
-		memcpy( &topleft, tl, sizeof( cchar_t ));
-	else
-		memcpy( &topleft, WACS_ULCORNER, sizeof( cchar_t ));
-	if ( tr && wcwidth( tr->vals[ 0 ]))
-		memcpy( &topright, tr, sizeof( cchar_t ));
-	else
-		memcpy( &topright, WACS_URCORNER, sizeof( cchar_t ));
-	if ( bl && wcwidth( bl->vals[ 0 ]))
-		memcpy( &botleft, bl, sizeof( cchar_t ));
-	else
-		memcpy( &botleft, WACS_LLCORNER, sizeof( cchar_t ));
-	if ( br && wcwidth( br->vals[ 0 ]))
-		memcpy( &botright, br, sizeof( cchar_t ));
-	else
-		memcpy( &botright, WACS_LRCORNER, sizeof( cchar_t ));
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "wborder_set: left = %c, 0x%x\n",
-	    left.vals[0], left.attributes );
-	__CTRACE(__CTRACE_INPUT, "wborder_set: right = %c, 0x%x\n",
-	    right.vals[0], right.attributes );
-	__CTRACE(__CTRACE_INPUT, "wborder_set: top = %c, 0x%x\n",
-	    top.vals[0], top.attributes );
-	__CTRACE(__CTRACE_INPUT, "wborder_set: bottom = %c, 0x%x\n",
-	    bottom.vals[0], bottom.attributes );
-	__CTRACE(__CTRACE_INPUT, "wborder_set: topleft = %c, 0x%x\n",
-	    topleft.vals[0], topleft.attributes );
-	__CTRACE(__CTRACE_INPUT, "wborder_set: topright = %c, 0x%x\n",
-	    topright.vals[0], topright.attributes );
-	__CTRACE(__CTRACE_INPUT, "wborder_set: botleft = %c, 0x%x\n",
-	    botleft.vals[0], botleft.attributes );
-	__CTRACE(__CTRACE_INPUT, "wborder_set: botright = %c, 0x%x\n",
-	    botright.vals[0], botright.attributes );
-#endif
-
-	/* Merge window attributes */
-	left.attributes |= (left.attributes & __COLOR) ?
-		(win->wattr & ~__COLOR) : win->wattr;
-	left.attributes |= (left.attributes & __COLOR) ?
-		(win->battr & ~__COLOR) : win->battr;
-	right.attributes |= (right.attributes & __COLOR) ?
-		(win->wattr & ~__COLOR) : win->wattr;
-	right.attributes |= (right.attributes & __COLOR) ?
-		(win->battr & ~__COLOR) : win->battr;
-	top.attributes |= (top.attributes & __COLOR) ?
-		(win->wattr & ~__COLOR) : win->wattr;
-	top.attributes |= (top.attributes & __COLOR) ?
-		(win->battr & ~__COLOR) : win->battr;
-	bottom.attributes |= (bottom.attributes & __COLOR) ?
-		(win->wattr & ~__COLOR) : win->wattr;
-	bottom.attributes |= (bottom.attributes & __COLOR) ?
-		(win->battr & ~__COLOR) : win->battr;
-	topleft.attributes |= (topleft.attributes & __COLOR) ?
-		(win->wattr & ~__COLOR) : win->wattr;
-	topleft.attributes |= (topleft.attributes & __COLOR) ?
-		(win->battr & ~__COLOR) : win->battr;
-	topright.attributes |= (topright.attributes & __COLOR) ?
-		(win->wattr & ~__COLOR) : win->wattr;
-	topright.attributes |= (topright.attributes & __COLOR) ?
-		(win->battr & ~__COLOR) : win->battr;
-	botleft.attributes |= (botleft.attributes & __COLOR) ?
-		(win->wattr & ~__COLOR) : win->wattr;
-	botleft.attributes |= (botleft.attributes & __COLOR) ?
-		(win->battr & ~__COLOR) : win->battr;
-	botright.attributes |= (botright.attributes & __COLOR) ?
-		(win->wattr & ~__COLOR) : win->wattr;
-	botright.attributes |= (botright.attributes & __COLOR) ?
-		(win->battr & ~__COLOR) : win->battr;
-
-	endx = win->maxx - 1;
-	endy = win->maxy - 1;
-
-	/* Sides */
-	for (i = 1; i < endy; i++) {
-		/* left border */
-		cw = wcwidth( left.vals[ 0 ]);
-		if (cw < 0)
-			cw = 1;
-		for ( j = 0; j < cw; j++ ) {
-			win->alines[i]->line[j].ch = left.vals[ 0 ];
-			win->alines[i]->line[j].attr = left.attributes;
-			np = win->alines[i]->line[j].nsp;
-			if (np) {
-				while ( np ) {
-					tnp = np->next;
-					free( np );
-					np = tnp;
-				}
-				win->alines[i]->line[j].nsp = NULL;
-			}
-			if ( j )
-				SET_WCOL( win->alines[i]->line[j], -j );
-			else {
-				SET_WCOL( win->alines[i]->line[j], cw );
-				if ( left.elements > 1 ) {
-					for (k = 1; k < left.elements; k++) {
-						np = (nschar_t *)malloc(sizeof(nschar_t));
-						if (!np)
-							return ERR;
-						np->ch = left.vals[ k ];
-						np->next = win->alines[i]->line[j].nsp;
-						win->alines[i]->line[j].nsp
-							= np;
-					}
-				}
-			}
-		}
-		for ( j = cw; WCOL( win->alines[i]->line[j]) < 0; j++ ) {
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "wborder_set: clean out partial char[%d]", j);
-#endif /* DEBUG */
-			win->alines[i]->line[j].ch = ( wchar_t )btowc(win->bch);
-			if (_cursesi_copy_nsp(win->bnsp,
-					      &win->alines[i]->line[j]) == ERR)
-				return ERR;
-			SET_WCOL( win->alines[i]->line[j], 1 );
-		}
-		/* right border */
-		cw = wcwidth( right.vals[ 0 ]);
-		if (cw < 0)
-			cw = 1;
-		pcw = WCOL( win->alines[i]->line[endx - cw]);
-		for ( j = endx - cw + 1; j <= endx; j++ ) {
-			win->alines[i]->line[j].ch = right.vals[ 0 ];
-			win->alines[i]->line[j].attr = right.attributes;
-			np = win->alines[i]->line[j].nsp;
-			if (np) {
-				while ( np ) {
-					tnp = np->next;
-					free( np );
-					np = tnp;
-				}
-				win->alines[i]->line[j].nsp = NULL;
-			}
-			if ( j == endx - cw + 1 ) {
-				SET_WCOL( win->alines[i]->line[j], cw );
-				if ( right.elements > 1 ) {
-					for (k = 1; k < right.elements; k++) {
-						np = (nschar_t *)malloc(sizeof(nschar_t));
-						if (!np)
-							return ERR;
-						np->ch = right.vals[ k ];
-						np->next = win->alines[i]->line[j].nsp;
-						win->alines[i]->line[j].nsp
-							= np;
-					}
-				}
-			} else
-				SET_WCOL( win->alines[i]->line[j],
-					endx - cw + 1 - j );
-		}
-		if ( pcw != 1 ) {
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "wborder_set: clean out partial chars[%d:%d]",
-			    endx - cw + pcw, endx - cw );
-#endif /* DEBUG */
-			k = pcw < 0 ? endx -cw + pcw : endx - cw;
-			for ( j = endx - cw; j >= k; j-- ) {
-				win->alines[i]->line[j].ch
-					= (wchar_t)btowc(win->bch);
-				if (_cursesi_copy_nsp(win->bnsp,
-					       &win->alines[i]->line[j]) == ERR)
-					return ERR;
-				win->alines[i]->line[j].attr = win->battr;
-				SET_WCOL( win->alines[i]->line[j], 1 );
-			}
-		}
-	}
-	tlcw = wcwidth( topleft.vals[ 0 ]);
-	if (tlcw < 0)
-		tlcw = 1;
-	blcw = wcwidth( botleft.vals[ 0 ]);
-	if (blcw < 0)
-		blcw = 1;
-	trcw = wcwidth( topright.vals[ 0 ]);
-	if (trcw < 0)
-		trcw = 1;
-	brcw = wcwidth( botright.vals[ 0 ]);
-	if (brcw < 0)
-		brcw = 1;
-	/* upper border */
-	cw = wcwidth( top.vals[ 0 ]);
-	if (cw < 0)
-		cw = 1;
-	for (i = tlcw; i <= min( endx - cw, endx - trcw ); i += cw ) {
-		for ( j = 0; j < cw; j++ ) {
-			win->alines[ 0 ]->line[i + j].ch = top.vals[ 0 ];
-			win->alines[ 0 ]->line[i + j].attr = top.attributes;
-			np = win->alines[ 0 ]->line[i + j].nsp;
-			if (np) {
-				while ( np ) {
-					tnp = np->next;
-					free( np );
-					np = tnp;
-				}
-				win->alines[ 0 ]->line[i + j].nsp = NULL;
-			}
-			if ( j )
-				SET_WCOL( win->alines[ 0 ]->line[ i + j ], -j );
-			else {
-				SET_WCOL( win->alines[ 0 ]->line[ i + j ], cw );
-				if ( top.elements > 1 ) {
-					for ( k = 1; k < top.elements; k++ ) {
-						np = (nschar_t *)malloc(sizeof(nschar_t));
-						if (!np)
-							return ERR;
-						np->ch = top.vals[ k ];
-						np->next = win->alines[0]->line[i + j].nsp;
-						win->alines[0]->line[i + j].nsp
-							= np;
-					}
-				}
-			}
-		}
-	}
-	while ( i <= endx - trcw ) {
-		win->alines[0]->line[i].ch =
-			( wchar_t )btowc(( int ) win->bch );
-		if (_cursesi_copy_nsp(win->bnsp,
-				      &win->alines[0]->line[i]) == ERR)
-			return ERR;
-		win->alines[ 0 ]->line[ i ].attr = win->battr;
-		SET_WCOL( win->alines[ 0 ]->line[ i ], 1 );
-		i++;
-	}
-	/* lower border */
-	for (i = blcw; i <= min( endx - cw, endx - brcw ); i += cw ) {
-		for ( j = 0; j < cw; j++ ) {
-			win->alines[ endy ]->line[i + j].ch = bottom.vals[ 0 ];
-			win->alines[endy]->line[i + j].attr = bottom.attributes;
-			np = win->alines[ endy ]->line[i + j].nsp;
-			if (np) {
-				while ( np ) {
-					tnp = np->next;
-					free( np );
-					np = tnp;
-				}
-				win->alines[ endy ]->line[i + j].nsp = NULL;
-			}
-			if ( j )
-				SET_WCOL( win->alines[endy]->line[i + j], -j);
-			else {
-				SET_WCOL( win->alines[endy]->line[i + j], cw );
-				if ( bottom.elements > 1 ) {
-					for ( k = 1; k < bottom.elements;
-							k++ ) {
-						if ( !( np = ( nschar_t *)malloc( sizeof( nschar_t ))))
-							return ERR;
-						np->ch = bottom.vals[ k ];
-						np->next = win->alines[endy]->line[i + j].nsp;
-						win->alines[endy]->line[i + j].nsp = np;
-					}
-				}
-			}
-		}
-	}
-	while ( i <= endx - brcw ) {
-		win->alines[endy]->line[i].ch =
-			(wchar_t)btowc((int) win->bch );
-		if (_cursesi_copy_nsp(win->bnsp,
-				      &win->alines[endy]->line[i]) == ERR)
-			return ERR;
-		win->alines[ endy ]->line[ i ].attr = win->battr;
-		SET_WCOL( win->alines[ endy ]->line[ i ], 1 );
-		i++;
-	}
-
-	/* Corners */
-	if (!(win->maxx == LINES && win->maxy == COLS &&
-		(win->flags & __SCROLLOK) && (win->flags & __SCROLLWIN))) {
-		for ( i = 0; i < tlcw; i++ ) {
-			win->alines[ 0 ]->line[i].ch = topleft.vals[ 0 ];
-			win->alines[ 0 ]->line[i].attr = topleft.attributes;
-			np = win->alines[ 0 ]->line[i].nsp;
-			if (np) {
-				while ( np ) {
-					tnp = np->next;
-					free( np );
-					np = tnp;
-				}
-				win->alines[ 0 ]->line[i].nsp = NULL;
-			}
-			if ( i )
-				SET_WCOL( win->alines[ 0 ]->line[ i ], -i );
-			else {
-				SET_WCOL( win->alines[ 0 ]->line[ i ], tlcw );
-				if ( topleft.elements > 1 ) {
-					for ( k = 1; k < topleft.elements;
-							k++ ) {
-						np = (nschar_t *)malloc(sizeof(nschar_t));
-						if (!np)
-							return ERR;
-						np->ch = topleft.vals[ k ];
-						np->next = win->alines[ 0 ]->line[i].nsp;
-						win->alines[ 0 ]->line[i].nsp
-							= np;
-					}
-				}
-			}
-		}
-		for ( i = endx - trcw + 1; i <= endx; i++ ) {
-			win->alines[ 0 ]->line[i].ch = topright.vals[ 0 ];
-			win->alines[ 0 ]->line[i].attr = topright.attributes;
-			np = win->alines[ 0 ]->line[i].nsp;
-			if (np) {
-				while ( np ) {
-					tnp = np->next;
-					free( np );
-					np = tnp;
-				}
-				win->alines[ 0 ]->line[i].nsp = NULL;
-			}
-			if ( i == endx - trcw + 1 ) {
-				SET_WCOL( win->alines[ 0 ]->line[ i ], trcw );
-				if ( topright.elements > 1 ) {
-					for ( k = 1; k < topright.elements;
-							k++ ) {
-						np = (nschar_t *)malloc(sizeof(nschar_t));
-						if (!np)
-							return ERR;
-						np->ch = topright.vals[ k ];
-						np->next = win->alines[0]->line[i].nsp;
-						win->alines[ 0 ]->line[i].nsp
-							= np;
-					}
-				}
-			} else
-				SET_WCOL( win->alines[ 0 ]->line[ i ],
-					  endx - trcw + 1 - i );
-		}
-		for ( i = 0; i < blcw; i++ ) {
-			win->alines[ endy ]->line[i].ch = botleft.vals[ 0 ];
-			win->alines[ endy ]->line[i].attr = botleft.attributes;
-			np = win->alines[ endy ]->line[i].nsp;
-			if (np) {
-				while ( np ) {
-					tnp = np->next;
-					free( np );
-					np = tnp;
-				}
-				win->alines[ endy ]->line[i].nsp = NULL;
-			}
-			if ( i )
-				SET_WCOL( win->alines[endy]->line[i], -i );
-			else {
-				SET_WCOL( win->alines[endy]->line[i], blcw );
-				if ( botleft.elements > 1 ) {
-					for ( k = 1; k < botleft.elements;
-							k++ ) {
-						np = (nschar_t *)malloc(sizeof(nschar_t));
-						if (!np)
-							return ERR;
-						np->ch = botleft.vals[ k ];
-						np->next = win->alines[endy]->line[i].nsp;
-						win->alines[endy]->line[i].nsp
-							= np;
-					}
-				}
-			}
-		}
-		for ( i = endx - brcw + 1; i <= endx; i++ ) {
-			win->alines[ endy ]->line[i].ch = botright.vals[ 0 ];
-			win->alines[ endy ]->line[i].attr = botright.attributes;
-			np = win->alines[ endy ]->line[i].nsp;
-			if (np) {
-				while ( np ) {
-					tnp = np->next;
-					free( np );
-					np = tnp;
-				}
-				win->alines[ endy ]->line[i].nsp = NULL;
-			}
-			if ( i == endx - brcw + 1 ) {
-				SET_WCOL( win->alines[ endy ]->line[ i ],
-					  brcw );
-				if ( botright.elements > 1 ) {
-					for ( k = 1; k < botright.elements; k++ ) {
-						np = (nschar_t *)malloc(sizeof(nschar_t));
-						if (!np)
-							return ERR;
-						np->ch = botright.vals[ k ];
-						np->next = win->alines[endy]->line[i].nsp;
-						win->alines[endy]->line[i].nsp
-							= np;
-					}
-				}
-			} else
-				SET_WCOL( win->alines[ endy ]->line[ i ],
-					endx - brcw + 1 - i );
-		}
-	}
-	__touchwin(win);
-	return (OK);
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/box.c b/lib/libcurses/box.c
deleted file mode 100644
index 9ffe7106a..000000000
--- a/lib/libcurses/box.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: box.c,v 1.14 2007/05/28 15:01:54 blymn Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)box.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: box.c,v 1.14 2007/05/28 15:01:54 blymn Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-
-/*
- * box --
- *	Draw a box around the given window with "vert" as the vertical
- *	delimiting char, and "hor", as the horizontal one.  Uses wborder().
- */
-int
-box(WINDOW *win, chtype vert, chtype hor)
-{
-	return (wborder(win, vert, vert, hor, hor, 0, 0, 0, 0));
-}
-
-int 
-box_set(WINDOW *win, const cchar_t *verch, const cchar_t *horch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return wborder_set(win, verch, verch, horch, horch, NULL, NULL, NULL, NULL);
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/cchar.c b/lib/libcurses/cchar.c
deleted file mode 100644
index 3f7230648..000000000
--- a/lib/libcurses/cchar.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*   $NetBSD: cchar.c,v 1.5 2010/12/16 17:42:28 wiz Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation Inc.
- * All rights reserved.
- *
- * This code is derived from code donated to the NetBSD Foundation
- * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@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.
- * 3. Neither the name of the NetBSD Foundation nor the names of its
- *	contributors may be used to endorse or promote products derived
- *	from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
- * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: cchar.c,v 1.5 2010/12/16 17:42:28 wiz Exp $");
-#endif						  /* not lint */
-
-#include <string.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * getcchar --
- *	get a wide-character string and rendition from a cchar_t
- */
-int
-getcchar(const cchar_t *wcval, wchar_t *wch, attr_t *attrs,
-					 short *color_pair, void *opts)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	wchar_t *wp;
-	size_t len;
-
-	if ( opts )
-		return ERR;
-
-	len = (wp = wmemchr(wcval->vals, L'\0', CCHARW_MAX))
-		? wp - wcval->vals : CCHARW_MAX;
-
-	if (wch == NULL)
-		return (int) len;
-	if (attrs == 0 || color_pair == 0)
-		return ERR;
-	if (len > 0) {
-		*attrs = wcval->attributes;
-		*color_pair = COLOR_PAIR( wcval -> attributes );
-		wmemcpy(wch, wcval->vals, (unsigned) len);
-		wch[len] = L'\0';
-	}
-	return OK;
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * setcchar --
- *	set cchar_t from a wide-character string and rendition
- */
-int
-setcchar(cchar_t *wcval, const wchar_t *wch, const attr_t attrs,
-					 short color_pair, const void *opts)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	int i;
-	size_t len;
-
-	if (opts || (len = wcslen(wch)) > CCHARW_MAX
-		|| (len > 1 && wcwidth(wch[0]) < 0)) {
-		return ERR;
-	}
-
-	/*
-	 * If we have a following spacing-character, stop at that point.  We
-	 * are only interested in adding non-spacing characters.
-	 */
-	for (i = 1; i < len; ++i) {
-		if (wcwidth(wch[i]) != 0) {
-			len = i;
-			break;
-		}
-	}
-
-	memset(wcval, 0, sizeof(*wcval));
-	if (len != 0) {
-		wcval -> attributes = attrs | color_pair;
-		wcval -> elements = 1;
-		memcpy(&wcval->vals, wch, len * sizeof(wchar_t));
-	}
-
-	return OK;
-#endif /* HAVE_WCHAR */
-}
-
-void
-__cursesi_chtype_to_cchar(chtype in, cchar_t *out)
-{
-	unsigned int idx;
-
-	if (in & __ACS_IS_WACS) {
-		idx = in & __CHARTEXT;
-		if (idx < NUM_ACS) {
-			memcpy(out, &_wacs_char[idx], sizeof(cchar_t));
-			out->attributes |= in & __ATTRIBUTES;
-			return;
-		}
-	}
-	out->vals[0] = in & __CHARTEXT;
-	out->attributes = in & __ATTRIBUTES;
-	out->elements = 1;
-}
diff --git a/lib/libcurses/chgat.c b/lib/libcurses/chgat.c
deleted file mode 100644
index ce81033e2..000000000
--- a/lib/libcurses/chgat.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$NetBSD: chgat.c,v 1.5 2012/09/28 06:05:19 blymn Exp $	*/
-
-/*
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Joerg Sonnenberger.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: chgat.c,v 1.5 2012/09/28 06:05:19 blymn Exp $");
-
-#include "curses.h"
-#include "curses_private.h"
-
-int
-chgat(int n, attr_t attr, short color, const void *opts)
-{
-	return wchgat(stdscr, n, attr, color, opts);
-}
-
-int
-mvchgat(int y, int x, int n, attr_t attr, short color,
-    const void *opts)
-{
-	return mvwchgat(stdscr, y, x, n, attr, color, opts);
-}
-
-int
-wchgat(WINDOW *win, int n, attr_t attr, short color, const void *opts)
-{
-	return mvwchgat(win, win->cury, win->curx, n, attr, color, opts);
-}
-
-int
-mvwchgat(WINDOW *win , int y, int x, int count, attr_t attr, short color,
-    const void *opts)
-{
-	__LINE *lp;
-	__LDATA *lc;
-
-	if (x < 0 || y < 0)
-		return (ERR);
-	if (x >= win->maxx || y >= win->maxy)
-		return (ERR);
-
-	attr = (attr & ~__COLOR) | COLOR_PAIR(color);
-
-	if (count < 0 || count > win->maxx - x)
-		count = win->maxx - x;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ATTR, "mvwchgat: x: %d y: %d count: %d attr: 0x%x "
-		 "color pair %d\n", x, y, count, (attr & ~__COLOR),
-		 PAIR_NUMBER(color));
-#endif
-	lp = win->alines[y];
-	lc = &lp->line[x];
-
-	if (x + win->ch_off < *lp->firstchp)
-		*lp->firstchp = x + win->ch_off;
-	if (x + win->ch_off + count > *lp->lastchp)
-		*lp->lastchp = x + win->ch_off + count;
-
-	while (count-- > 0) {
-		lp->flags |= __ISDIRTY;
-#ifdef HAVE_WCHAR
-		lc->attr = (lc->attr & ~WA_ATTRIBUTES) | attr;
-#else
-		lc->attr = attr;
-#endif
-		++lc;
-	}
-
-	return OK;
-}
diff --git a/lib/libcurses/clear.c b/lib/libcurses/clear.c
deleted file mode 100644
index 59238b1e6..000000000
--- a/lib/libcurses/clear.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: clear.c,v 1.13 2003/08/07 16:44:19 agc Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)clear.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: clear.c,v 1.13 2003/08/07 16:44:19 agc Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * clear --
- *	Clear stdscr
- */
-int
-clear(void)
-{
-	return wclear(_cursesi_screen->stdscr);
-}
-
-#endif
-
-/*
- * wclear --
- *	Clear the window.
- */
-int
-wclear(WINDOW *win)
-{
-	if (werase(win) == OK) {
-		win->flags |= __CLEAROK;
-		return (OK);
-	}
-	return (ERR);
-}
diff --git a/lib/libcurses/clearok.c b/lib/libcurses/clearok.c
deleted file mode 100644
index 3bf49b136..000000000
--- a/lib/libcurses/clearok.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: clearok.c,v 1.5 2008/04/28 20:23:01 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: clearok.c,v 1.5 2008/04/28 20:23:01 martin Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * clearok --
- *	Turn on and off clear before refresh for the given window.
- */
-int
-clearok(WINDOW *win, bool bf)
-{
-	if (bf)
-		win->flags |= __CLEAROK;
-	else
-		win->flags &= ~__CLEAROK;
-	return (OK);
-}
diff --git a/lib/libcurses/clrtobot.c b/lib/libcurses/clrtobot.c
deleted file mode 100644
index 3ffccc5ff..000000000
--- a/lib/libcurses/clrtobot.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*	$NetBSD: clrtobot.c,v 1.22 2012/02/19 19:38:13 christos Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)clrtobot.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: clrtobot.c,v 1.22 2012/02/19 19:38:13 christos Exp $");
-#endif
-#endif				/* not lint */
-
-#include <stdlib.h>
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * clrtobot --
- *	Erase everything on stdscr.
- */
-int
-clrtobot(void)
-{
-	return wclrtobot(stdscr);
-}
-
-#endif
-
-/*
- * wclrtobot --
- *	Erase everything on the window.
- */
-int
-wclrtobot(WINDOW *win)
-{
-	int	 minx, startx, starty, y;
-	__LDATA	*sp, *end, *maxx;
-	attr_t	attr;
-
-#ifdef __GNUC__
-	maxx = NULL;		/* XXX gcc -Wuninitialized */
-#endif
-	if (win->alines[win->cury]->flags & __ISPASTEOL) {
-		starty = win->cury + 1;
-		startx = 0;
-	} else {
-		starty = win->cury;
-		startx = win->curx;
-	}
-	if (win != curscr)
-		attr = win->battr & __ATTRIBUTES;
-	else
-		attr = 0;
-	for (y = starty; y < win->maxy; y++) {
-		minx = -1;
-		end = &win->alines[y]->line[win->maxx];
-		for (sp = &win->alines[y]->line[startx]; sp < end; sp++) {
-#ifndef HAVE_WCHAR
-			if (sp->ch != win->bch || sp->attr != attr) {
-#else
-			if (sp->ch != (wchar_t)btowc((int) win->bch) ||
-			    (sp->attr & WA_ATTRIBUTES) != attr || sp->nsp) {
-#endif /* HAVE_WCHAR */
-				maxx = sp;
-				if (minx == -1)
-					minx = (int)(sp - win->alines[y]->line);
-				if (sp->attr & __ALTCHARSET)
-					sp->attr = attr | __ALTCHARSET;
-				else
-					sp->attr = attr;
-#ifdef HAVE_WCHAR
-				sp->ch = ( wchar_t )btowc(( int ) win->bch);
-				if (_cursesi_copy_nsp(win->bnsp, sp) == ERR)
-					return ERR;
-				SET_WCOL( *sp, 1 );
-#else
-				sp->ch = win->bch;
-#endif /* HAVE_WCHAR */
-			}
-		}
-
-		if (minx != -1)
-			__touchline(win, y, minx,
-				    (int) (maxx - win->alines[y]->line));
-		startx = 0;
-	}
-	return (OK);
-}
diff --git a/lib/libcurses/clrtoeol.c b/lib/libcurses/clrtoeol.c
deleted file mode 100644
index 7daccbfc1..000000000
--- a/lib/libcurses/clrtoeol.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*	$NetBSD: clrtoeol.c,v 1.26 2012/02/19 19:38:13 christos Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)clrtoeol.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: clrtoeol.c,v 1.26 2012/02/19 19:38:13 christos Exp $");
-#endif
-#endif				/* not lint */
-
-#include <stdlib.h>
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * clrtoeol --
- *	Clear up to the end of line.
- */
-int
-clrtoeol(void)
-{
-	return wclrtoeol(stdscr);
-}
-
-#endif
-
-/*
- * wclrtoeol --
- *	Clear up to the end of line.
- */
-int
-wclrtoeol(WINDOW *win)
-{
-	int     minx, x, y;
-	__LDATA *end, *maxx, *sp;
-	attr_t	attr;
-
-	y = win->cury;
-	x = win->curx;
-	if (win->alines[y]->flags & __ISPASTEOL) {
-		if (y < win->maxy - 1) {
-			win->alines[y]->flags &= ~__ISPASTEOL;
-			y++;
-			x = 0;
-			win->cury = y;
-			win->curx = x;
-		} else
-			return (OK);
-	}
-	end = &win->alines[y]->line[win->maxx];
-	minx = -1;
-	maxx = &win->alines[y]->line[x];
-	if (win != curscr)
-		attr = win->battr & __ATTRIBUTES;
-	else
-		attr = 0;
-	for (sp = maxx; sp < end; sp++)
-#ifndef HAVE_WCHAR
-		if (sp->ch != win->bch || sp->attr != attr) {
-#else
-		if (sp->ch != ( wchar_t )btowc(( int ) win->bch ) ||
-		    (sp->attr & WA_ATTRIBUTES) != attr || sp->nsp
-		    || (WCOL(*sp) < 0)) {
-#endif /* HAVE_WCHAR */
-			maxx = sp;
-			if (minx == -1)
-				minx = (int) (sp - win->alines[y]->line);
-			sp->attr = attr | (sp->attr & __ALTCHARSET);
-#ifdef HAVE_WCHAR
-			sp->ch = ( wchar_t )btowc(( int ) win->bch);
-			if (_cursesi_copy_nsp(win->bnsp, sp) == ERR)
-				return ERR;
-			SET_WCOL( *sp, 1 );
-#else
-			sp->ch = win->bch;
-#endif /* HAVE_WCHAR */
-		}
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ERASE, "CLRTOEOL: y = %d, minx = %d, maxx = %d, "
-	    "firstch = %d, lastch = %d\n",
-	    y, minx, (int) (maxx - win->alines[y]->line),
-	    *win->alines[y]->firstchp, *win->alines[y]->lastchp);
-#endif
-	/* Update firstch and lastch for the line. */
-	return (__touchline(win, y, x, (int) win->maxx - 1));
-}
diff --git a/lib/libcurses/color.c b/lib/libcurses/color.c
deleted file mode 100644
index 5f3976fdd..000000000
--- a/lib/libcurses/color.c
+++ /dev/null
@@ -1,687 +0,0 @@
-/*	$NetBSD: color.c,v 1.38 2011/10/03 12:32:15 roy Exp $	*/
-
-/*
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: color.c,v 1.38 2011/10/03 12:32:15 roy Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/* Have we initialised colours? */
-int	__using_color = 0;
-
-/* Default colour number */
-attr_t	__default_color = 0;
-
-/* Default colour pair values - white on black. */
-struct __pair	__default_pair = {COLOR_WHITE, COLOR_BLACK, 0};
-
-/* Default colour values */
-/* Flags for colours and pairs */
-#define	__USED		0x01
-
-static void
-__change_pair(short);
-
-/*
- * has_colors --
- *	Check if terminal has colours.
- */
-bool
-has_colors(void)
-{
-	if (max_colors > 0 && max_pairs > 0 &&
-	    ((set_a_foreground != NULL && set_a_background != NULL) ||
-		initialize_pair != NULL || initialize_color != NULL ||
-		(set_background != NULL && set_foreground != NULL)))
-		return(TRUE);
-	else
-		return(FALSE);
-}
-
-/*
- * can_change_color --
- *	Check if terminal can change colours.
- */
-bool
-can_change_color(void)
-{
-	if (can_change)
-		return(TRUE);
-	else
-		return(FALSE);
-}
-
-/*
- * start_color --
- *	Initialise colour support.
- */
-int
-start_color(void)
-{
-	int			 i;
-	attr_t			 temp_nc;
-	struct __winlist	*wlp;
-	WINDOW			*win;
-	int			 y, x;
-
-	if (has_colors() == FALSE)
-		return(ERR);
-
-	/* Max colours and colour pairs */
-	if (max_colors == -1)
-		COLORS = 0;
-	else {
-		COLORS = max_colors > MAX_COLORS ? MAX_COLORS : max_colors;
-		if (max_pairs == -1) {
-			COLOR_PAIRS = 0;
-			COLORS = 0;
-		} else {
-			COLOR_PAIRS = (max_pairs > MAX_PAIRS - 1 ?
-			    MAX_PAIRS - 1 : max_pairs);
-			 /* Use the last colour pair for curses default. */
-			__default_color = COLOR_PAIR(MAX_PAIRS - 1);
-		}
-	}
-	if (!COLORS)
-		return (ERR);
-
-	_cursesi_screen->COLORS = COLORS;
-	_cursesi_screen->COLOR_PAIRS = COLOR_PAIRS;
-
-	/* Reset terminal colour and colour pairs. */
-	if (orig_colors != NULL)
-		tputs(orig_colors, 0, __cputchar);
-	if (orig_pair != NULL) {
-		tputs(orig_pair, 0, __cputchar);
-		curscr->wattr &= _cursesi_screen->mask_op;
-	}
-
-	/* Type of colour manipulation - ANSI/TEK/HP/other */
-	if (set_a_foreground != NULL && set_a_background != NULL)
-		_cursesi_screen->color_type = COLOR_ANSI;
-	else if (initialize_pair != NULL)
-		_cursesi_screen->color_type = COLOR_HP;
-	else if (initialize_color != NULL)
-		_cursesi_screen->color_type = COLOR_TEK;
-	else if (set_foreground != NULL && set_background != NULL)
-		_cursesi_screen->color_type = COLOR_OTHER;
-	else
-		return(ERR);		/* Unsupported colour method */
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_COLOR, "start_color: COLORS = %d, COLOR_PAIRS = %d",
-	    COLORS, COLOR_PAIRS);
-	switch (_cursesi_screen->color_type) {
-	case COLOR_ANSI:
-		__CTRACE(__CTRACE_COLOR, " (ANSI style)\n");
-		break;
-	case COLOR_HP:
-		__CTRACE(__CTRACE_COLOR, " (HP style)\n");
-		break;
-	case COLOR_TEK:
-		__CTRACE(__CTRACE_COLOR, " (Tektronics style)\n");
-		break;
-	case COLOR_OTHER:
-		__CTRACE(__CTRACE_COLOR, " (Other style)\n");
-		break;
-	}
-#endif
-
-	/*
-	 * Attributes that cannot be used with color.
-	 * Store these in an attr_t for wattrset()/wattron().
-	 */
-	_cursesi_screen->nca = __NORMAL;
-	if (no_color_video != -1) {
-		temp_nc = (attr_t) t_no_color_video(_cursesi_screen->term);
-		if (temp_nc & 0x0001)
-			_cursesi_screen->nca |= __STANDOUT;
-		if (temp_nc & 0x0002)
-			_cursesi_screen->nca |= __UNDERSCORE;
-		if (temp_nc & 0x0004)
-			_cursesi_screen->nca |= __REVERSE;
-		if (temp_nc & 0x0008)
-			_cursesi_screen->nca |= __BLINK;
-		if (temp_nc & 0x0010)
-			_cursesi_screen->nca |= __DIM;
-		if (temp_nc & 0x0020)
-			_cursesi_screen->nca |= __BOLD;
-		if (temp_nc & 0x0040)
-			_cursesi_screen->nca |= __BLANK;
-		if (temp_nc & 0x0080)
-			_cursesi_screen->nca |= __PROTECT;
-		if (temp_nc & 0x0100)
-			_cursesi_screen->nca |= __ALTCHARSET;
-	}
-#ifdef DEBUG
-	__CTRACE(__CTRACE_COLOR, "start_color: _cursesi_screen->nca = %08x\n",
-	    _cursesi_screen->nca);
-#endif
-
-	/* Set up initial 8 colours */
-	if (COLORS >= COLOR_BLACK)
-		(void) init_color(COLOR_BLACK, 0, 0, 0);
-	if (COLORS >= COLOR_RED)
-		(void) init_color(COLOR_RED, 1000, 0, 0);
-	if (COLORS >= COLOR_GREEN)
-		(void) init_color(COLOR_GREEN, 0, 1000, 0);
-	if (COLORS >= COLOR_YELLOW)
-		(void) init_color(COLOR_YELLOW, 1000, 1000, 0);
-	if (COLORS >= COLOR_BLUE)
-		(void) init_color(COLOR_BLUE, 0, 0, 1000);
-	if (COLORS >= COLOR_MAGENTA)
-		(void) init_color(COLOR_MAGENTA, 1000, 0, 1000);
-	if (COLORS >= COLOR_CYAN)
-		(void) init_color(COLOR_CYAN, 0, 1000, 1000);
-	if (COLORS >= COLOR_WHITE)
-		(void) init_color(COLOR_WHITE, 1000, 1000, 1000);
-
-	/* Initialise other colours */
-	for (i = 8; i < COLORS; i++) {
-		_cursesi_screen->colours[i].red = 0;
-		_cursesi_screen->colours[i].green = 0;
-		_cursesi_screen->colours[i].blue = 0;
-		_cursesi_screen->colours[i].flags = 0;
-	}
-
-	/* Initialise pair 0 to default colours. */
-	_cursesi_screen->colour_pairs[0].fore = -1;
-	_cursesi_screen->colour_pairs[0].back = -1;
-	_cursesi_screen->colour_pairs[0].flags = 0;
-
-	/* Initialise user colour pairs to default (white on black) */
-	for (i = 0; i < COLOR_PAIRS; i++) {
-		_cursesi_screen->colour_pairs[i].fore = COLOR_WHITE;
-		_cursesi_screen->colour_pairs[i].back = COLOR_BLACK;
-		_cursesi_screen->colour_pairs[i].flags = 0;
-	}
-
-	/* Initialise default colour pair. */
-	_cursesi_screen->colour_pairs[PAIR_NUMBER(__default_color)].fore =
-	    __default_pair.fore;
-	_cursesi_screen->colour_pairs[PAIR_NUMBER(__default_color)].back =
-	    __default_pair.back;
-	_cursesi_screen->colour_pairs[PAIR_NUMBER(__default_color)].flags =
-	    __default_pair.flags;
-
-	__using_color = 1;
-
-	/* Set all positions on all windows to curses default colours. */
-	for (wlp = _cursesi_screen->winlistp; wlp != NULL; wlp = wlp->nextp) {
-		win = wlp->winp;
-		if (wlp->winp != __virtscr && wlp->winp != curscr) {
-			/* Set color attribute on other windows */
-			win->battr |= __default_color;
-			for (y = 0; y < win->maxy; y++) {
-				for (x = 0; x < win->maxx; x++) {
-					win->alines[y]->line[x].attr &= ~__COLOR;
-					win->alines[y]->line[x].attr |= __default_color;
-				}
-			}
-			__touchwin(win);
-		}
-	}
-
-	return(OK);
-}
-
-/*
- * init_pair --
- *	Set pair foreground and background colors.
- *	Our default colour ordering is ANSI - 1 = red, 4 = blue, 3 = yellow,
- *	6 = cyan.  The older style (Sb/Sf) uses 1 = blue, 4 = red, 3 = cyan,
- *	6 = yellow, so we swap them here and in pair_content().
- */
-int
-init_pair(short pair, short fore, short back)
-{
-	int	changed;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_COLOR, "init_pair: %d, %d, %d\n", pair, fore, back);
-#endif
-
-	if (pair < 0 || pair >= COLOR_PAIRS)
-		return (ERR);
-
-	if (pair == 0) /* Ignore request for pair 0, it is default. */
-		return OK;
-
-	if (fore >= COLORS)
-		return (ERR);
-	if (back >= COLORS)
-		return (ERR);
-
-	/* Swap red/blue and yellow/cyan */
-	if (_cursesi_screen->color_type == COLOR_OTHER) {
-		switch (fore) {
-		case COLOR_RED:
-			fore = COLOR_BLUE;
-			break;
-		case COLOR_BLUE:
-			fore = COLOR_RED;
-			break;
-		case COLOR_YELLOW:
-			fore = COLOR_CYAN;
-			break;
-		case COLOR_CYAN:
-			fore = COLOR_YELLOW;
-			break;
-		}
-		switch (back) {
-		case COLOR_RED:
-			back = COLOR_BLUE;
-			break;
-		case COLOR_BLUE:
-			back = COLOR_RED;
-			break;
-		case COLOR_YELLOW:
-			back = COLOR_CYAN;
-			break;
-		case COLOR_CYAN:
-			back = COLOR_YELLOW;
-			break;
-		}
-	}
-
-	if ((_cursesi_screen->colour_pairs[pair].flags & __USED) &&
-	    (fore != _cursesi_screen->colour_pairs[pair].fore ||
-	     back != _cursesi_screen->colour_pairs[pair].back))
-		changed = 1;
-	else
-		changed = 0;
-
-	_cursesi_screen->colour_pairs[pair].flags |= __USED;
-	_cursesi_screen->colour_pairs[pair].fore = fore;
-	_cursesi_screen->colour_pairs[pair].back = back;
-
-	/* XXX: need to initialise HP style (Ip) */
-
-	if (changed)
-		__change_pair(pair);
-	return (OK);
-}
-
-/*
- * pair_content --
- *	Get pair foreground and background colours.
- */
-int
-pair_content(short pair, short *forep, short *backp)
-{
-	if (pair < 0 || pair > _cursesi_screen->COLOR_PAIRS)
-		return(ERR);
-
-	*forep = _cursesi_screen->colour_pairs[pair].fore;
-	*backp = _cursesi_screen->colour_pairs[pair].back;
-
-	/* Swap red/blue and yellow/cyan */
-	if (_cursesi_screen->color_type == COLOR_OTHER) {
-		switch (*forep) {
-		case COLOR_RED:
-			*forep = COLOR_BLUE;
-			break;
-		case COLOR_BLUE:
-			*forep = COLOR_RED;
-			break;
-		case COLOR_YELLOW:
-			*forep = COLOR_CYAN;
-			break;
-		case COLOR_CYAN:
-			*forep = COLOR_YELLOW;
-			break;
-		}
-		switch (*backp) {
-		case COLOR_RED:
-			*backp = COLOR_BLUE;
-			break;
-		case COLOR_BLUE:
-			*backp = COLOR_RED;
-			break;
-		case COLOR_YELLOW:
-			*backp = COLOR_CYAN;
-			break;
-		case COLOR_CYAN:
-			*backp = COLOR_YELLOW;
-			break;
-		}
-	}
-	return(OK);
-}
-
-/*
- * init_color --
- *	Set colour red, green and blue values.
- */
-int
-init_color(short color, short red, short green, short blue)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_COLOR, "init_color: %d, %d, %d, %d\n",
-	    color, red, green, blue);
-#endif
-	if (color < 0 || color >= _cursesi_screen->COLORS)
-		return(ERR);
-
-	_cursesi_screen->colours[color].red = red;
-	_cursesi_screen->colours[color].green = green;
-	_cursesi_screen->colours[color].blue = blue;
-	/* XXX Not yet implemented */
-	return(ERR);
-	/* XXX: need to initialise Tek style (Ic) and support HLS */
-}
-
-/*
- * color_content --
- *	Get colour red, green and blue values.
- */
-int
-color_content(short color, short *redp, short *greenp, short *bluep)
-{
-	if (color < 0 || color >= _cursesi_screen->COLORS)
-		return(ERR);
-
-	*redp = _cursesi_screen->colours[color].red;
-	*greenp = _cursesi_screen->colours[color].green;
-	*bluep = _cursesi_screen->colours[color].blue;
-	return(OK);
-}
-
-/*
- * use_default_colors --
- *	Use terminal default colours instead of curses default colour.
-  */
-int
-use_default_colors()
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_COLOR, "use_default_colors\n");
-#endif
-
-	return(assume_default_colors(-1, -1));
-}
-
-/*
- * assume_default_colors --
- *	Set the default foreground and background colours.
- */
-int
-assume_default_colors(short fore, short back)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_COLOR, "assume_default_colors: %d, %d\n",
-	    fore, back);
-	__CTRACE(__CTRACE_COLOR, "assume_default_colors: default_colour = %d, pair_number = %d\n", __default_color, PAIR_NUMBER(__default_color));
-#endif
-
-	/* Swap red/blue and yellow/cyan */
-	if (_cursesi_screen->color_type == COLOR_OTHER) {
-		switch (fore) {
-		case COLOR_RED:
-			fore = COLOR_BLUE;
-			break;
-		case COLOR_BLUE:
-			fore = COLOR_RED;
-			break;
-		case COLOR_YELLOW:
-			fore = COLOR_CYAN;
-			break;
-		case COLOR_CYAN:
-			fore = COLOR_YELLOW;
-			break;
-		}
-		switch (back) {
-		case COLOR_RED:
-			back = COLOR_BLUE;
-			break;
-		case COLOR_BLUE:
-			back = COLOR_RED;
-			break;
-		case COLOR_YELLOW:
-			back = COLOR_CYAN;
-			break;
-		case COLOR_CYAN:
-			back = COLOR_YELLOW;
-			break;
-		}
-	}
-	__default_pair.fore = fore;
-	__default_pair.back = back;
-	__default_pair.flags = __USED;
-
-	if (COLOR_PAIRS) {
-		_cursesi_screen->colour_pairs[PAIR_NUMBER(__default_color)].fore = fore;
-		_cursesi_screen->colour_pairs[PAIR_NUMBER(__default_color)].back = back;
-		_cursesi_screen->colour_pairs[PAIR_NUMBER(__default_color)].flags = __USED;
-	}
-
-	/*
-	 * If we've already called start_color(), make sure all instances
-	 * of the curses default colour pair are dirty.
-	 */
-	if (__using_color)
-		__change_pair(PAIR_NUMBER(__default_color));
-
-	return(OK);
-}
-
-/* no_color_video is a terminfo macro, but we need to retain binary compat */
-#ifdef __strong_alias
-#undef no_color_video
-__strong_alias(no_color_video, no_color_attributes)
-#endif
-/*
- * no_color_attributes --
- *	Return attributes that cannot be combined with color.
- */
-attr_t
-no_color_attributes(void)
-{
-	return(_cursesi_screen->nca);
-}
-
-/*
- * __set_color --
- *	Set terminal foreground and background colours.
- */
-void
-__set_color( /*ARGSUSED*/ WINDOW *win, attr_t attr)
-{
-	short	pair;
-
-	if ((curscr->wattr & __COLOR) == (attr & __COLOR))
-		return;
-
-	pair = PAIR_NUMBER((u_int32_t)attr);
-#ifdef DEBUG
-	__CTRACE(__CTRACE_COLOR, "__set_color: %d, %d, %d\n", pair,
-		 _cursesi_screen->colour_pairs[pair].fore,
-		 _cursesi_screen->colour_pairs[pair].back);
-#endif
-	switch (_cursesi_screen->color_type) {
-	/* Set ANSI forground and background colours */
-	case COLOR_ANSI:
-		if (_cursesi_screen->colour_pairs[pair].fore < 0 ||
-		    _cursesi_screen->colour_pairs[pair].back < 0)
-			__unset_color(curscr);
-		if (_cursesi_screen->colour_pairs[pair].fore >= 0)
-			tputs(tiparm(t_set_a_foreground(_cursesi_screen->term),
-			    (int)_cursesi_screen->colour_pairs[pair].fore),
-			    0, __cputchar);
-		if (_cursesi_screen->colour_pairs[pair].back >= 0)
-			tputs(tiparm(t_set_a_background(_cursesi_screen->term),
-			    (int)_cursesi_screen->colour_pairs[pair].back),
-			    0, __cputchar);
-		break;
-	case COLOR_HP:
-		/* XXX: need to support HP style */
-		break;
-	case COLOR_TEK:
-		/* XXX: need to support Tek style */
-		break;
-	case COLOR_OTHER:
-		if (_cursesi_screen->colour_pairs[pair].fore < 0 ||
-		    _cursesi_screen->colour_pairs[pair].back < 0)
-			__unset_color(curscr);
-		if (_cursesi_screen->colour_pairs[pair].fore >= 0)
-			tputs(tiparm(t_set_foreground(_cursesi_screen->term),
-			    (int)_cursesi_screen->colour_pairs[pair].fore),
-			    0, __cputchar);
-		if (_cursesi_screen->colour_pairs[pair].back >= 0)
-			tputs(tiparm(t_set_background(_cursesi_screen->term),
-			    (int)_cursesi_screen->colour_pairs[pair].back),
-			    0, __cputchar);
-		break;
-	}
-	curscr->wattr &= ~__COLOR;
-	curscr->wattr |= attr & __COLOR;
-}
-
-/*
- * __unset_color --
- *	Clear terminal foreground and background colours.
- */
-void
-__unset_color(WINDOW *win)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_COLOR, "__unset_color\n");
-#endif
-	switch (_cursesi_screen->color_type) {
-	/* Clear ANSI forground and background colours */
-	case COLOR_ANSI:
-		if (orig_pair != NULL) {
-			tputs(orig_pair, 0, __cputchar);
-			win->wattr &= __mask_op;
-		}
-		break;
-	case COLOR_HP:
-		/* XXX: need to support HP style */
-		break;
-	case COLOR_TEK:
-		/* XXX: need to support Tek style */
-		break;
-	case COLOR_OTHER:
-		if (orig_pair != NULL) {
-			tputs(orig_pair, 0, __cputchar);
-			win->wattr &= __mask_op;
-		}
-		break;
-	}
-}
-
-/*
- * __restore_colors --
- *	Redo color definitions after restarting 'curses' mode.
- */
-void
-__restore_colors(void)
-{
-	if (can_change != 0)
-		switch (_cursesi_screen->color_type) {
-		case COLOR_HP:
-			/* XXX: need to re-initialise HP style (Ip) */
-			break;
-		case COLOR_TEK:
-			/* XXX: need to re-initialise Tek style (Ic) */
-			break;
-		}
-}
-
-/*
- * __change_pair --
- *	Mark dirty all positions using pair.
- */
-void
-__change_pair(short pair)
-{
-	struct __winlist	*wlp;
-	WINDOW			*win;
-	int			 y, x;
-	__LINE			*lp;
-	uint32_t		cl = COLOR_PAIR(pair);
-
-
-	for (wlp = _cursesi_screen->winlistp; wlp != NULL; wlp = wlp->nextp) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_COLOR, "__change_pair: win = %p\n",
-		    wlp->winp);
-#endif
-		win = wlp->winp;
-		if (win == __virtscr)
-			continue;
-		else if (win == curscr) {
-			/* Reset colour attribute on curscr */
-#ifdef DEBUG
-			__CTRACE(__CTRACE_COLOR,
-			    "__change_pair: win == curscr\n");
-#endif
-			for (y = 0; y < curscr->maxy; y++) {
-				lp = curscr->alines[y];
-				for (x = 0; x < curscr->maxx; x++) {
-					if ((lp->line[x].attr & __COLOR) == cl)
-						lp->line[x].attr &= ~__COLOR;
-				}
-			}
-		} else {
-			/* Mark dirty those positions with colour pair "pair" */
-			for (y = 0; y < win->maxy; y++) {
-				lp = win->alines[y];
-				for (x = 0; x < win->maxx; x++)
-					if ((lp->line[x].attr &
-					    __COLOR) == cl) {
-						if (!(lp->flags & __ISDIRTY))
-							lp->flags |= __ISDIRTY;
-						/*
-					 	* firstchp/lastchp are shared
-					 	* between parent window and
-					 	* sub-window.
-					 	*/
-						if (*lp->firstchp > x)
-						*lp->firstchp = x;
-						if (*lp->lastchp < x)
-							*lp->lastchp = x;
-					}
-#ifdef DEBUG
-				if ((win->alines[y]->flags & __ISDIRTY))
-					__CTRACE(__CTRACE_COLOR,
-					    "__change_pair: first = %d, "
-					    "last = %d\n",
-					    *win->alines[y]->firstchp,
-					    *win->alines[y]->lastchp);
-#endif
-			}
-		}
-	}
-}
diff --git a/lib/libcurses/copywin.c b/lib/libcurses/copywin.c
deleted file mode 100644
index 4bb984304..000000000
--- a/lib/libcurses/copywin.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*	$NetBSD: copywin.c,v 1.15 2009/07/22 16:57:14 roy Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: copywin.c,v 1.15 2009/07/22 16:57:14 roy Exp $");
-#endif				/* not lint */
-
-#include <ctype.h>
-#include <string.h>
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * copywin --
- *     Copy the box starting at (sminrow, smincol) with a size that
- *     matches the destination box (dminrow, dmincol) by (dmaxrow, dmaxcol)
- *     from the source window srcwin to the destination window dstwin.
- *     All these coordindinates are relative to the relevant window.
- *     If dooverlay is true then the copy is nondestructive otherwise the
- *     copy is destructive.
- */
-int copywin(const WINDOW *srcwin, WINDOW *dstwin,
-	    int sminrow, int smincol,
-	    int dminrow, int dmincol, int dmaxrow, int dmaxcol, int dooverlay)
-{
-	int dcol;
-	__LDATA *sp, *end;
-#ifdef HAVE_WCHAR
-	cchar_t cc;
-	nschar_t *np;
-#endif /* HAVE_WCHAR */
-
-	/* overwrite() and overlay() can come here with -ve srcwin coords */
-	if (sminrow < 0) {
-		dminrow -= sminrow;
-		sminrow = 0;
-	}
-	if (smincol < 0) {
-		dmincol -= smincol;
-		smincol = 0;
-	}
-
-	/* for symmetry allow dstwin coords to be -ve as well */
-	if (dminrow < 0) {
-		sminrow -= dminrow;
-		dminrow = 0;
-	}
-	if (dmincol < 0) {
-		smincol -= dmincol;
-		dmincol = 0;
-	}
-
-	/* Bound dmaxcol for both windows (should be ok for dstwin) */
-	if (dmaxcol >= dstwin->maxx)
-		dmaxcol = dstwin->maxx - 1;
-	if (smincol + (dmaxcol - dmincol) >= srcwin->maxx)
-		dmaxcol = srcwin->maxx + dmincol - smincol - 1;
-	if (dmaxcol < dmincol)
-		/* nothing in the intersection */
-		return OK;
-
-	/* Bound dmaxrow for both windows (should be ok for dstwin) */
-	if (dmaxrow >= dstwin->maxy)
-		dmaxrow = dstwin->maxy - 1;
-	if (sminrow + (dmaxrow - dminrow) >= srcwin->maxy)
-		dmaxrow = srcwin->maxy + dminrow - sminrow - 1;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_WINDOW,
-	    "copywin %s mode: from (%d,%d) to (%d,%d-%d,%d)\n",
-	    dooverlay ? "overlay" : "overwrite",
-	    sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol);
-#endif
-
-	for (; dminrow <= dmaxrow; sminrow++, dminrow++) {
-		sp = &srcwin->alines[sminrow]->line[smincol];
-		end = sp + dmaxcol - dmincol;
-		for (dcol = dmincol; sp <= end; dcol++, sp++) {
-			/* XXX: Perhaps this should check for the
-			 * background character
-			 */
-			if ((dooverlay && !isspace(sp->ch)) || !dooverlay) {
-				wmove(dstwin, dminrow, dcol);
-#ifndef HAVE_WCHAR
-				__waddch(dstwin, sp);
-#else
-				cc.vals[0] = sp->ch;
-				cc.attributes = sp->attr;
-				cc.elements = 1;
-				np = sp->nsp;
-				if (np) {
-					/* MINIX: off by one error, has to be strictly less than. */
-					while (np && cc.elements <
-					    CURSES_CCHAR_MAX) {
-						cc.vals[cc.elements++] = np->ch;
-						np = np->next;
-					}
-				}
-				wadd_wch(dstwin, &cc);
-#endif /* HAVE_WCHAR */
-			}
-		}
-	}
-	__touchwin(dstwin);
-	return OK;
-}
-
diff --git a/lib/libcurses/cr_put.c b/lib/libcurses/cr_put.c
deleted file mode 100644
index 3d7dc5e88..000000000
--- a/lib/libcurses/cr_put.c
+++ /dev/null
@@ -1,480 +0,0 @@
-/*	$NetBSD: cr_put.c,v 1.31 2011/10/03 12:32:15 roy Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cr_put.c	8.3 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: cr_put.c,v 1.31 2011/10/03 12:32:15 roy Exp $");
-#endif
-#endif				/* not lint */
-
-#include <string.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-#define	HARDTABS	8
-
-/*
- * Terminal driving and line formatting routines.  Basic motion optimizations
- * are done here as well as formatting lines (printing of control characters,
- * line numbering and the like).
- */
-
-/* Stub function for the users. */
-int
-mvcur(int ly, int lx, int y, int x)
-{
-	return (__mvcur(ly, lx, y, x, 0));
-}
-
-static void fgoto __P((int));
-static int plod __P((int, int));
-static int plodput __P((int));
-static int tabcol __P((int, int));
-
-static int outcol, outline, destcol, destline;
-
-/*
- * Sync the position of the output cursor.  Most work here is rounding for
- * terminal boundaries getting the column position implied by wraparound or
- * the lack thereof and rolling up the screen to get destline on the screen.
- */
-int
-__mvcur(int ly, int lx, int y, int x, int in_refresh)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_OUTPUT,
-	    "mvcur: moving cursor from (%d, %d) to (%d, %d)\n", ly, lx, y, x);
-#endif
-	destcol = x;
-	destline = y;
-	outcol = lx;
-	outline = ly;
-	fgoto(in_refresh);
-	return (OK);
-}
-
-static void
-fgoto(in_refresh)
-	int	 in_refresh;
-{
-	int	 c, l;
-	char	*cgp;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_OUTPUT, "fgoto: in_refresh=%d\n", in_refresh);
-#endif /* DEBUG */
-	if (destcol >= COLS) {
-		destline += destcol / COLS;
-		destcol %= COLS;
-	}
-	if (outcol >= COLS) {
-		l = (outcol + 1) / COLS;
-		outline += l;
-		outcol %= COLS;
-		if (auto_left_margin == 0) {
-			while (l > 0) {
-				if (__pfast) {
-					if (carriage_return)
-						tputs(carriage_return,
-							0, __cputchar);
-					else
-						__cputchar('\r');
-				}
-				if (cursor_down)
-					tputs(cursor_down, 0, __cputchar);
-				else
-					__cputchar('\n');
-				l--;
-			}
-			outcol = 0;
-		}
-		if (outline > LINES - 1) {
-			destline -= outline - (LINES - 1);
-			outline = LINES - 1;
-		}
-	}
-	if (destline >= LINES) {
-		l = destline;
-		destline = LINES - 1;
-		if (outline < LINES - 1) {
-			c = destcol;
-			if (__pfast == 0 && !cursor_address)
-				destcol = 0;
-			fgoto(in_refresh);
-			destcol = c;
-		}
-		while (l >= LINES) {
-			/* The following linefeed (or simulation thereof) is
-			 * supposed to scroll up the screen, since we are on
-			 * the bottom line.  We make the assumption that
-			 * linefeed will scroll.  If ns is in the capability
-			 * list this won't work.  We should probably have an
-			 * sc capability but sf will generally take the place
-			 * if it works.
-			 *
-			 * Superbee glitch: in the middle of the screen have to
-			 * use esc B (down) because linefeed screws up in
-			 * "Efficient Paging" (what a joke) mode (which is
-			 * essential in some SB's because CRLF mode puts
-			 * garbage in at end of memory), but you must use
-			 * linefeed to scroll since down arrow won't go past
-			 * memory end. I turned this off after recieving Paul
-			 * Eggert's Superbee description which wins better. */
-			if (cursor_down /* && !__tc_xb */ && __pfast)
-				tputs(cursor_down, 0, __cputchar);
-			else
-				__cputchar('\n');
-			l--;
-			if (__pfast == 0)
-				outcol = 0;
-		}
-	}
-	if (destline < outline && !(cursor_address || cursor_up))
-		destline = outline;
-	
-	if (cursor_address &&
-	    (cgp = tiparm(cursor_address, destline, destcol)))
-	{
-		/*
-		 * Need this condition due to inconsistent behavior
-		 * of backspace on the last column.
-		 */
-#ifdef DEBUG
-		__CTRACE(__CTRACE_OUTPUT, "fgoto: cgp=%s\n", cgp);
-#endif /* DEBUG */
-		if (outcol != COLS - 1 &&
-		    plod((int) strlen(cgp), in_refresh) > 0)
-			plod(0, in_refresh);
-		else
-			tputs(cgp, 0, __cputchar);
-	} else
-		plod(0, in_refresh);
-	outline = destline;
-	outcol = destcol;
-}
-/*
- * Move (slowly) to destination.
- * Hard thing here is using home cursor on really deficient terminals.
- * Otherwise just use cursor motions, hacking use of tabs and overtabbing
- * and backspace.
- *
- * XXX this needs to be revisited for wide characters since we may output
- * XXX more than one byte for a character.
- */
-
-static int plodcnt, plodflg;
-
-static int
-plodput(c)
-	int	 c;
-{
-	if (plodflg)
-		--plodcnt;
-	else
-		__cputchar(c);
-	return (0);
-}
-
-static int
-plod(cnt, in_refresh)
-	int	 cnt, in_refresh;
-{
-	int	 i, j, k, soutcol, soutline;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_OUTPUT, "plod: cnt=%d, in_refresh=%d\n",
-	    cnt, in_refresh);
-#endif /* DEBUG */
-	plodcnt = plodflg = cnt;
-	soutcol = outcol;
-	soutline = outline;
-
-	/*
-	 * Consider homing and moving down/right from there, vs. moving
-	 * directly with local motions to the right spot.
-	 */
-	if (cursor_home) {
-		/*
-		 * i is the cost to home and tab/space to the right to get to
-		 * the proper column.  This assumes nd space costs 1 char.  So
-		 * i + destcol is cost of motion with home.
-		 */
-		if (__GT)
-			i = (destcol / HARDTABS) + (destcol % HARDTABS);
-		else
-			i = destcol;
-
-		/* j is cost to move locally without homing. */
-		if (destcol >= outcol) {	/* if motion is to the right */
-			j = destcol / HARDTABS - outcol / HARDTABS;
-			if (__GT && j)
-				j += destcol % HARDTABS;
-			else
-				j = destcol - outcol;
-		} else
-			/* leftward motion only works if we can backspace. */
-			if (outcol - destcol <= i)
-				/* Cheaper to backspace. */
-				i = j = outcol - destcol;
-			else
-				/* Impossibly expensive. */
-				j = i + 1;
-
-		/* k is the absolute value of vertical distance. */
-		k = outline - destline;
-		if (k < 0)
-			k = -k;
-		j += k;
-
-		/* Decision.  We may not have a choice if no up. */
-		if (i + destline < j || (!cursor_up && destline < outline)) {
-			/*
-			 * Cheaper to home.  Do it now and pretend it's a
-			 * regular local motion.
-			 */
-			tputs(cursor_home, 0, plodput);
-			outcol = outline = 0;
-		} else
-			if (cursor_to_ll) {
-				/*
-				 * Quickly consider homing down and moving from
-				 * there.  Assume cost of ll is 2.
-				 */
-				k = (LINES - 1) - destline;
-				if (i + k + 2 < j && (k <= 0 || cursor_up)) {
-					tputs(cursor_to_ll, 0, plodput);
-					outcol = 0;
-					outline = LINES - 1;
-				}
-			}
-	} else
-		/* No home and no up means it's impossible. */
-		if (!cursor_up && destline < outline)
-			return (-1);
-	if (__GT)
-		i = destcol % HARDTABS + destcol / HARDTABS;
-	else
-		i = destcol;
-#ifdef notdef
-	if (back_tab && outcol > destcol &&
-	    (j = (((outcol + 7) & ~7) - destcol - 1) >> 3)) {
-		j *= (k = strlen(back_tab));
-		if ((k += (destcol & 7)) > 4)
-			j += 8 - (destcol & 7);
-		else
-			j += k;
-	} else
-#endif
-		j = outcol - destcol;
-
-	/*
-	 * If we will later need a \n which will turn into a \r\n by the
-	 * system or the terminal, then don't bother to try to \r.
-	 */
-	if ((__NONL || !__pfast) && outline < destline)
-		goto dontcr;
-
-	/*
-	 * If the terminal will do a \r\n and there isn't room for it, then
-	 * we can't afford a \r.
-	 */
-	if (!carriage_return && outline >= destline)
-		goto dontcr;
-
-	/*
-	 * If it will be cheaper, or if we can't back up, then send a return
-	 * preliminarily.
-	 */
-	if (j > i + 1 || outcol > destcol) {
-		/*
-		 * BUG: this doesn't take the (possibly long) length of cr
-		 * into account.
-		 */
-		if (carriage_return)
-			tputs(carriage_return, 0, plodput);
-		else
-			plodput('\r');
-		if (!carriage_return) {
-			if (cursor_down)
-				tputs(cursor_down, 0, plodput);
-			else
-				plodput('\n');
-			outline++;
-		}
-		outcol = 0;
-	}
-dontcr:while (outline < destline) {
-		outline++;
-		if (cursor_down)
-			tputs(cursor_down, 0, plodput);
-		else
-			plodput('\n');
-		if (plodcnt < 0)
-			goto out;
-		if (__NONL || __pfast == 0)
-			outcol = 0;
-	}
-	if (back_tab)
-		k = (int) strlen(back_tab);
-	while (outcol > destcol) {
-		if (plodcnt < 0)
-			goto out;
-#ifdef notdef
-		if (back_tab && outcol - destcol > k + 4) {
-			tputs(back_tab, 0, plodput);
-			outcol--;
-			outcol &= ~7;
-			continue;
-		}
-#endif
-		outcol--;
-		if (cursor_left)
-			tputs(cursor_left, 0, plodput);
-		else
-			plodput('\b');
-	}
-	while (outline > destline) {
-		outline--;
-		tputs(cursor_up, 0, plodput);
-		if (plodcnt < 0)
-			goto out;
-	}
-	if (__GT && destcol - outcol > 1) {
-		for (;;) {
-			i = tabcol(outcol, HARDTABS);
-			if (i > destcol)
-				break;
-			if (tab)
-				tputs(tab, 0, plodput);
-			else
-				plodput('\t');
-			outcol = i;
-		}
-		if (destcol - outcol > 4 && i < COLS) {
-			if (tab)
-				tputs(tab, 0, plodput);
-			else
-				plodput('\t');
-			outcol = i;
-			while (outcol > destcol) {
-				outcol--;
-				if (cursor_left)
-					tputs(cursor_left, 0, plodput);
-				else
-					plodput('\b');
-			}
-		}
-	}
-	while (outcol < destcol) {
-		/*
-		 * Move one char to the right.  We don't use nd space because
-		 * it's better to just print the char we are moving over.
-		 */
-		if (in_refresh)
-			if (plodflg)	/* Avoid a complex calculation. */
-				plodcnt--;
-			else {
-#ifndef HAVE_WCHAR
-				i = curscr->alines[outline]->line[outcol].ch
-				    & __CHARTEXT;
-				if (curscr->alines[outline]->line[outcol].attr
-				    == curscr->wattr)
-					__cputchar(i);
-#else
-				if ((curscr->alines[outline]->line[outcol].attr
-				    & WA_ATTRIBUTES)
-				    == curscr->wattr) {
-					switch (WCOL(curscr->alines[outline]->line[outcol])) {
-					case 1:
-						__cputwchar(curscr->alines[outline]->line[outcol].ch);
-						__cursesi_putnsp(curscr->alines[outline]->line[outcol].nsp,
-								outline,
-								outcol);
-#ifdef DEBUG
-						__CTRACE(__CTRACE_OUTPUT,
-						    "plod: (%d,%d)WCOL(%d), "
-						    "putwchar(%x)\n",
-						    outline, outcol,
-						    WCOL(curscr->alines[outline]->line[outcol]),
-						    curscr->alines[outline]->line[outcol].ch);
-#endif /* DEBUG */
-					/*FALLTHROUGH*/
-					case 0:
-						break;
-					default:
-						goto nondes;
-					}
-				}
-#endif /* HAVE_WCHAR */
-				else
-					goto nondes;
-			}
-		else
-	nondes:	if (cursor_right)
-			tputs(cursor_right, 0, plodput);
-		else
-			plodput(' ');
-		outcol++;
-		if (plodcnt < 0)
-			goto out;
-	}
-
-out:	if (plodflg) {
-		outcol = soutcol;
-		outline = soutline;
-	}
-#ifdef DEBUG
-	__CTRACE(__CTRACE_OUTPUT, "plod: returns %d\n", plodcnt);
-#endif /* DEBUG */
-	return (plodcnt);
-}
-/*
- * Return the column number that results from being in column col and
- * hitting a tab, where tabs are set every ts columns.  Work right for
- * the case where col > COLS, even if ts does not divide COLS.
- */
-static int
-tabcol(col, ts)
-	int	 col, ts;
-{
-	int	 offset;
-
-	if (col >= COLS) {
-		offset = COLS * (col / COLS);
-		col -= offset;
-	} else
-		offset = 0;
-	return (col + ts - (col % ts) + offset);
-}
diff --git a/lib/libcurses/ctrace.c b/lib/libcurses/ctrace.c
deleted file mode 100644
index 04cccad15..000000000
--- a/lib/libcurses/ctrace.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*	$NetBSD: ctrace.c,v 1.20 2009/01/17 15:25:36 christos Exp $	*/
-
-/*-
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ctrace.c	8.2 (Berkeley) 10/5/93";
-#else
-__RCSID("$NetBSD: ctrace.c,v 1.20 2009/01/17 15:25:36 christos Exp $");
-#endif
-#endif				/* not lint */
-
-#ifdef DEBUG
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <sys/time.h>
-#include <string.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-static FILE *tracefp = NULL;		/* Curses debugging file descriptor. */
-
-static int tracemask;	/* Areas of trace output we want. */
-
-static int init_done = 0;
-
-void
-__CTRACE_init()
-{
-	char *tf, *tm;
-
-	tm = getenv("CURSES_TRACE_MASK");
-	if (tm == NULL)
-		tracemask = __CTRACE_ALL;
-	else {
-		tracemask = (int) strtol(tm, NULL, 0);
-	}
-	if (tracemask < 0)
-		tracemask = (0 - tracemask) ^ __CTRACE_ALL;
-	if (tracemask == 0)
-		return;
-
-	tf = getenv("CURSES_TRACE_FILE");
-
-	if ((tf != NULL) && !strcmp( tf, "<none>"))
-		tf = NULL;
-
-	if (tf != NULL)
-		tracefp = fopen(tf, "w");
-
-	init_done = 1;
-	__CTRACE(__CTRACE_ALL, "Trace mask: 0x%08x\n", tracemask);
-}
-
-void
-__CTRACE(int area, const char *fmt,...)
-{
-	struct timeval tv;
-        static int seencr = 1;
-	va_list ap;
-
-	if (!init_done)
-		__CTRACE_init();
-	if (tracefp == NULL || !(tracemask & area)) {
-		return;
-	}
-	gettimeofday(&tv, NULL);
-        if (seencr && (tracemask & __CTRACE_TSTAMP)) {
-                gettimeofday(&tv, NULL);
-                (void) fprintf(tracefp, "%llu.%06lu: ", 
-		    (long long)tv.tv_sec, (long)tv.tv_usec);
-        }
-	va_start(ap, fmt);
-        (void) vfprintf(tracefp, fmt, ap);
-        seencr = (strchr(fmt, '\n') != NULL);
-	va_end(ap);
-	(void) fflush(tracefp);
-}
-#else
-/* this kills the empty translation unit message from lint... */
-void
-__cursesi_make_lint_shut_up_if_debug_not_defined(void);
-
-void
-__cursesi_make_lint_shut_up_if_debug_not_defined(void)
-{
-	return;
-}
-#endif
diff --git a/lib/libcurses/cur_hash.c b/lib/libcurses/cur_hash.c
deleted file mode 100644
index caf051535..000000000
--- a/lib/libcurses/cur_hash.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: cur_hash.c,v 1.12 2005/02/18 22:16:27 dsl Exp $	*/
-
-/*
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cur_hash.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: cur_hash.c,v 1.12 2005/02/18 22:16:27 dsl Exp $");
-#endif
-#endif				/* not lint */
-
-#include <sys/types.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * __hash_more() is "hashpjw" from the Dragon Book, Aho, Sethi & Ullman, p.436.
- */
-u_int
-__hash_more(const void  *v_s, size_t len, u_int h)
-{
-	u_int g;
-	size_t i = 0;
-	const char *s = v_s;
-
-	while (i < len) {
-		h = (h << 4) + s[i];
-		if ((g = h & 0xf0000000) != 0) {
-			h = h ^ (g >> 24);
-			h = h ^ g;
-		}
-		i++;
-	}
-	return h;
-}
diff --git a/lib/libcurses/curs_set.c b/lib/libcurses/curs_set.c
deleted file mode 100644
index 90688824b..000000000
--- a/lib/libcurses/curs_set.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*	$NetBSD: curs_set.c,v 1.10 2011/03/30 09:47:02 blymn Exp $	*/
-
-/*-
- * Copyright (c) 1998-2000 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: curs_set.c,v 1.10 2011/03/30 09:47:02 blymn Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * curs_set --
- *    Set the visibility of the cursor, 0 means invisible, 1 means normal
- *    visibility and 2 means high visibility.  Return the previous
- *    visibility iff the terminal supports the new visibility otherwise
- *    return ERR.
- */
-int
-curs_set(int visibility)
-{
-	int old_one;
-
-	old_one = _cursesi_screen->old_mode;
-	switch (visibility) {
-		case 0: /* invisible */
-			if (cursor_invisible != NULL) {
-#ifdef DEBUG
-				__CTRACE(__CTRACE_MISC,
-				    "curs_set: invisible\n");
-#endif
-				_cursesi_screen->old_mode = 0;
-				tputs(cursor_invisible, 0, __cputchar);
-				fflush(_cursesi_screen->outfd);
-				return old_one;
-			}
-			break;
-
-		case 1: /* normal */
-			if (cursor_normal != NULL) {
-#ifdef DEBUG
-				__CTRACE(__CTRACE_MISC, "curs_set: normal\n");
-#endif
-				_cursesi_screen->old_mode = 1;
-				tputs(cursor_normal, 0, __cputchar);
-				fflush(_cursesi_screen->outfd);
-				return old_one;
-			}
-			break;
-
-		case 2: /* high visibility */
-			if (cursor_visible != NULL) {
-#ifdef DEBUG
-				__CTRACE(__CTRACE_MISC,
-				    "curs_set: high vis\n");
-#endif
-				_cursesi_screen->old_mode = 2;
-				tputs(cursor_visible, 0, __cputchar);
-				fflush(_cursesi_screen->outfd);
-				return old_one;
-			}
-			break;
-
-		default:
-			break;
-	}
-
-	return ERR;
-}
-
-/*
- * __restore_cursor_vis --
- *     Restore the old cursor visibility.
- */
-void
-__restore_cursor_vis(void)
-{
-	curs_set(_cursesi_screen->old_mode);
-}
-
diff --git a/lib/libcurses/curses.3 b/lib/libcurses/curses.3
deleted file mode 100644
index 901552aad..000000000
--- a/lib/libcurses/curses.3
+++ /dev/null
@@ -1,336 +0,0 @@
-.\"	$NetBSD: curses.3,v 1.63 2012/04/21 12:27:27 roy Exp $
-.\"
-.\" Copyright (c) 1985, 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. 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.
-.\"
-.\"     @(#)curses.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd April 5, 2012
-.Dt CURSES 3
-.Os
-.Sh NAME
-.Nm curses
-.Nd screen functions with
-.Dq optimal
-cursor motion
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.Nm cc
-.Op Ar flags
-.Ar files
-.Fl lcurses
-.Op Ar libraries
-.Sh DESCRIPTION
-These routines give the user a method of updating screens with reasonable
-optimization.
-They keep an image of the current screen,
-and the user sets up an image of a new one.
-Then the
-.Fn refresh
-tells the routines to make the current screen look like the new one.
-In order to initialize the routines, the routine
-.Fn initscr
-must be called before any of the other routines that deal with windows and
-screens are used.
-The routine
-.Fn endwin
-should be called before exiting.
-The routine
-.Fn start_color
-must be called before any of the other routines that deal with color are used.
-.Sh FUNCTIONS
-.Bl -column "subwin(win,lines,cols,begin_y,begin_x)"
-.It Sy "Function Name" Ta Sy "Manual Page Name"
-.It addch Ta Xr curses_addch 3
-.It addchnstr Ta Xr curses_addchstr 3
-.It addchstr Ta Xr curses_addchstr 3
-.It addnstr Ta Xr curses_addstr 3
-.It addstr Ta Xr curses_addstr 3
-.It assume_default_colors Ta Xr curses_default_colors 3
-.It attr_get Ta Xr curses_attributes 3
-.It attr_off Ta Xr curses_attributes 3
-.It attr_on Ta Xr curses_attributes 3
-.It attr_set Ta Xr curses_attributes 3
-.It attroff Ta Xr curses_attributes 3
-.It attron Ta Xr curses_attributes 3
-.It attrset Ta Xr curses_attributes 3
-.It beep Ta Xr curses_tty 3
-.It bkgd Ta Xr curses_background 3
-.It bkgdset Ta Xr curses_background 3
-.It border Ta Xr curses_border 3
-.It box Ta Xr curses_border 3
-.It can_change_color Ta Xr curses_color 3
-.It cbreak Ta Xr curses_tty 3
-.It chgat Ta Xr curses_chgat 3
-.It clear Ta Xr curses_clear 3
-.It clearok Ta Xr curses_clear 3
-.It clrtobot Ta Xr curses_clear 3
-.It clrtoeol Ta Xr curses_clear 3
-.It color_content Ta Xr curses_color 3
-.It color_set Ta Xr curses_attributes 3
-.It copywin Ta Xr curses_window 3
-.It curs_set Ta Xr curses_tty 3
-.It def_prog_mode Ta Xr curses_tty 3
-.It def_shell_mode Ta Xr curses_tty 3
-.It define_key Ta Xr curses_input 3
-.It delay_output Ta Xr curses_tty 3
-.It delch Ta Xr curses_delch 3
-.It deleteln Ta Xr curses_deleteln 3
-.It delscreen Ta Xr curses_screen 3
-.It delwin Ta Xr curses_window 3
-.It derwin Ta Xr curses_window 3
-.It doupdate Ta Xr curses_refresh 3
-.It dupwin Ta Xr curses_window 3
-.It echo Ta Xr curses_tty 3
-.It endwin Ta Xr curses_screen 3
-.It erase Ta Xr curses_clear 3
-.It erasechar Ta Xr curses_tty 3
-.It flash Ta Xr curses_tty 3
-.It flushinp Ta Xr curses_tty 3
-.It flushok Ta Xr curses_refresh 3
-.It fullname Ta Xr curses_termcap 3
-.It getattrs Ta Xr curses_attributes 3
-.It getbegx Ta Xr curses_cursor 3
-.It getbegy Ta Xr curses_cursor 3
-.It getbkgd Ta Xr curses_background 3
-.It getch Ta Xr curses_input 3
-.It getcurx Ta Xr curses_cursor 3
-.It getcury Ta Xr curses_cursor 3
-.It getmaxx Ta Xr curses_cursor 3
-.It getmaxy Ta Xr curses_cursor 3
-.It getnstr Ta Xr curses_input 3
-.It getparx Ta Xr curses_cursor 3
-.It getpary Ta Xr curses_cursor 3
-.It getparyx Ta Xr curses_cursor 3
-.It getstr Ta Xr curses_input 3
-.It gettmode Ta Xr curses_tty 3
-.It getwin Ta Xr curses_fileio 3
-.It getyx Ta Xr curses_cursor 3
-.It has_colors Ta Xr curses_color 3
-.It has_ic Ta Xr curses_tty 3
-.It has_il Ta Xr curses_tty 3
-.It hline Ta Xr curses_line 3
-.It idcok Ta Xr curses_tty 3
-.It idlok Ta Xr curses_tty 3
-.It inch Ta Xr curses_inch 3
-.It inchnstr Ta Xr curses_inch 3
-.It inchstr Ta Xr curses_inch 3
-.It init_color Ta Xr curses_color 3
-.It init_pair Ta Xr curses_color 3
-.It initscr Ta Xr curses_screen 3
-.It innstr Ta Xr curses_inch 3
-.It insch Ta Xr curses_insertch 3
-.It insdelln Ta Xr curses_insdelln 3
-.It insertln Ta Xr curses_insertln 3
-.It instr Ta Xr curses_inch 3
-.It intrflush Ta Xr curses_tty 3
-.It is_linetouched Ta Xr curses_touch 3
-.It is_wintouched Ta Xr curses_touch 3
-.It isendwin Ta Xr curses_screen 3
-.It keyname Ta Xr curses_keyname 3
-.It keyok Ta Xr curses_input 3
-.It keypad Ta Xr curses_input 3
-.It killchar Ta Xr curses_tty 3
-.It leaveok Ta Xr curses_tty 3
-.It meta Ta Xr curses_tty 3
-.It move Ta Xr curses_cursor 3
-.It mvaddch Ta Xr curses_addch 3
-.It mvaddchnstr Ta Xr curses_addchstr 3
-.It mvaddchstr Ta Xr curses_addchstr 3
-.It mvaddnstr Ta Xr curses_addstr 3
-.It mvaddstr Ta Xr curses_addstr 3
-.It mvchgat Ta Xr curses_chgat 3
-.It mvcur Ta Xr curses_cursor 3
-.It mvderwin Ta Xr curses_window 3
-.It mvgetnstr Ta Xr curses_input 3
-.It mvgetstr Ta Xr curses_input 3
-.It mvhline Ta Xr curses_line 3
-.It mvinchstr Ta Xr curses_inch 3
-.It mvinchnstr Ta Xr curses_inch 3
-.It mvprintw Ta Xr curses_print 3
-.It mvscanw Ta Xr curses_scanw 3
-.It mvvline Ta Xr curses_line 3
-.It mvwaddch Ta Xr curses_addch 3
-.It mvwaddchnstr Ta Xr curses_addchstr 3
-.It mvwaddchstr Ta Xr curses_addchstr 3
-.It mvwaddnstr Ta Xr curses_addstr 3
-.It mvwaddstr Ta Xr curses_addstr 3
-.It mvwchgat Ta Xr curses_chgat 3
-.It mvwgetnstr Ta Xr curses_input 3
-.It mvwgetstr Ta Xr curses_input 3
-.It mvwhline Ta Xr curses_line 3
-.It mvwinchstr Ta Xr curses_inch 3
-.It mvwinchnstr Ta Xr curses_inch 3
-.It mvwprintw Ta Xr curses_print 3
-.It mvwscanw Ta Xr curses_scanw 3
-.It mvwvline Ta Xr curses_line 3
-.It napms Ta Xr curses_tty 3
-.It newpad Ta Xr curses_pad 3
-.It newterm Ta Xr curses_screen 3
-.It newwin Ta Xr curses_window 3
-.It \&nl Ta Xr curses_tty 3
-.It nocbreak Ta Xr curses_tty 3
-.It nodelay Ta Xr curses_input 3
-.It noecho Ta Xr curses_tty 3
-.It nonl Ta Xr curses_tty 3
-.It noqiflush Ta Xr curses_tty 3
-.It noraw Ta Xr curses_tty 3
-.It notimeout Ta Xr curses_input 3
-.It overlay Ta Xr curses_window 3
-.It overwrite Ta Xr curses_window 3
-.It pair_content Ta Xr curses_color 3
-.It pnoutrefresh Ta Xr curses_pad 3
-.It prefresh Ta Xr curses_pad 3
-.It printw Ta Xr curses_print 3
-.It putwin Ta Xr curses_fileio 3
-.It qiflush Ta Xr curses_tty 3
-.It raw Ta Xr curses_tty 3
-.It redrawwin Ta Xr curses_touch 3
-.It refresh Ta Xr curses_refresh 3
-.It reset_prog_mode Ta Xr curses_tty 3
-.It reset_shell_mode Ta Xr curses_tty 3
-.It resetty Ta Xr curses_tty 3
-.It resizeterm Ta Xr curses_screen 3
-.It savetty Ta Xr curses_tty 3
-.It scanw Ta Xr curses_scanw 3
-.It scrl Ta Xr curses_scroll 3
-.It scroll Ta Xr curses_scroll 3
-.It scrollok Ta Xr curses_scroll 3
-.It set_term Ta Xr curses_screen 3
-.It setscrreg Ta Xr curses_scroll 3
-.It setterm Ta Xr curses_screen 3
-.It standend Ta Xr curses_standout 3
-.It standout Ta Xr curses_standout 3
-.It start_color Ta Xr curses_color 3
-.It subpad Ta Xr curses_pad 3
-.It subwin Ta Xr curses_window 3
-.It termattrs Ta Xr curses_attributes 3
-.It timeout Ta Xr curses_input 3
-.It touchline Ta Xr curses_touch 3
-.It touchoverlap Ta Xr curses_touch 3
-.It touchwin Ta Xr curses_touch 3
-.It unctrl Ta Xr curses_print 3
-.It underend Ta Xr curses_underscore 3
-.It underscore Ta Xr curses_underscore 3
-.It ungetch Ta Xr curses_input 3
-.It untouchwin Ta Xr curses_touch 3
-.It use_default_colors Ta Xr curses_default_colors 3
-.It vline Ta Xr curses_line 3
-.It waddch Ta Xr curses_addch 3
-.It waddchnstr Ta Xr curses_addchstr 3
-.It waddchstr Ta Xr curses_addchstr 3
-.It waddnstr Ta Xr curses_addstr 3
-.It waddstr Ta Xr curses_addstr 3
-.It wattr_get Ta Xr curses_attributes 3
-.It wattr_off Ta Xr curses_attributes 3
-.It wattr_on Ta Xr curses_attributes 3
-.It wattr_set Ta Xr curses_attributes 3
-.It wattroff Ta Xr curses_attributes 3
-.It wattron Ta Xr curses_attributes 3
-.It wattrset Ta Xr curses_attributes 3
-.It wbkgd Ta Xr curses_background 3
-.It wbkgdset Ta Xr curses_background 3
-.It wborder Ta Xr curses_border 3
-.It wchgat Ta Xr curses_chgat 3
-.It wclear Ta Xr curses_clear 3
-.It wclrtobot Ta Xr curses_clear 3
-.It wclrtoeol Ta Xr curses_clear 3
-.It wcolor_set Ta Xr curses_attributes 3
-.It wdelch Ta Xr curses_delch 3
-.It wdeleteln Ta Xr curses_deleteln 3
-.It werase Ta Xr curses_clear 3
-.It wgetch Ta Xr curses_input 3
-.It wgetnstr Ta Xr curses_input 3
-.It wgetstr Ta Xr curses_input 3
-.It whline Ta Xr curses_line 3
-.It winch Ta Xr curses_inch 3
-.It winchnstr Ta Xr curses_inch 3
-.It winchstr Ta Xr curses_inch 3
-.It winnstr Ta Xr curses_inch 3
-.It winsch Ta Xr curses_insertch 3
-.It winsdelln Ta Xr curses_insdelln 3
-.It winsertln Ta Xr curses_insertln 3
-.It winstr Ta Xr curses_inch 3
-.It wmove Ta Xr curses_cursor 3
-.It wnoutrefresh Ta Xr curses_refresh 3
-.It wprintw Ta Xr curses_print 3
-.It wredrawln Ta Xr curses_touch 3
-.It wrefresh Ta Xr curses_refresh 3
-.It wresize Ta Xr curses_window 3
-.It wscanw Ta Xr curses_scanw 3
-.It wscrl Ta Xr curses_scroll 3
-.It wsetscrreg Ta Xr curses_scroll 3
-.It wstandend Ta Xr curses_standout 3
-.It wstandout Ta Xr curses_standout 3
-.It wtimeout Ta Xr curses_input 3
-.It wtouchln Ta Xr curses_touch 3
-.It wunderend Ta Xr curses_underscore 3
-.It wunderscore Ta Xr curses_underscore 3
-.It wvline Ta Xr curses_line 3
-.El
-.Sh ENVIRONMENT
-.Bl -tag -width CURSES_TRACE_MASK
-.It COLUMNS
-The number of columns in the terminal if set.
-This is usually automatically configured by querying the kernel.
-.It CURSES_TRACE_MASK
-An integer mask that enables specific debugging traces.
-Enabled only in the debug build of curses.
-.It CURSES_TRACE_FILE
-A file where to output debugging information.
-Enabled only in the debug build of curses.
-.It ESCDELAY
-The maximum delay in milliseconds between characters in multi-character
-keystrokes (such are arrow keys) where the adjacent characters are considered
-part of the same multi-character sequence.
-The default is 300 milliseconds.
-.It LINES
-The number of lines in the terminal if set.
-is usually automatically configured by querying the kernel.
-.It TERM
-The terminal type of the current terminal.
-.El
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr getenv 3 ,
-.Xr tty 4 ,
-.Xr terminfo 5
-.Rs
-.%T Screen Updating and Cursor Movement Optimization: A Library Package
-.%A Ken Arnold
-.Re
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
-.Sh AUTHORS
-.An Ken Arnold
diff --git a/lib/libcurses/curses.c b/lib/libcurses/curses.c
deleted file mode 100644
index 24615fe1d..000000000
--- a/lib/libcurses/curses.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*	$NetBSD: curses.c,v 1.25 2013/10/16 19:59:29 roy Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#include <stdlib.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)curses.c	8.3 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: curses.c,v 1.25 2013/10/16 19:59:29 roy Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/* Private. */
-int	__echoit = 1;			 /* If stty indicates ECHO. */
-int	__pfast;
-int	__rawmode = 0;			 /* If stty indicates RAW mode. */
-int	__noqch = 0;
-					 /* If terminal doesn't have
-					 * insert/delete line capabilities
-					 * for quick change on refresh.
-					 */
-char	__CA;
-
-/*
- * Public.
- *
- * XXX
- * UPPERCASE isn't used by libcurses, and is left for backward
- * compatibility only.
- */
-WINDOW	*curscr;			/* Current screen. */
-WINDOW	*stdscr;			/* Standard screen. */
-WINDOW	*__virtscr;			/* Virtual screen (for doupdate()). */
-SCREEN  *_cursesi_screen;               /* the current screen we are using */
-int	 COLS;				/* Columns on the screen. */
-int	 LINES;				/* Lines on the screen. */
-int	 TABSIZE;			/* Size of a tab. */
-int	 COLORS;			/* Maximum colors on the screen */
-int	 COLOR_PAIRS = 0;		/* Maximum color pairs on the screen */
-int	 My_term = 0;			/* Use Def_term regardless. */
-const char	*Def_term = "unknown";	/* Default terminal type. */
-char	 __GT;				/* Gtty indicates tabs. */
-char	 __NONL;			/* Term can't hack LF doing a CR. */
-char	 __UPPERCASE;			/* Terminal is uppercase only. */
-
-#ifdef HAVE_WCHAR
-/*
- * Copy the non-spacing character list (src_nsp) to the given character,
- * allocate or free storage as required.
- */
-int
-_cursesi_copy_nsp(nschar_t *src_nsp, struct __ldata *ch)
-{
-	nschar_t *np, *tnp, *pnp;
-
-	pnp = NULL;
-	np = src_nsp;
-	if (np) {
-		tnp = ch->nsp;
-		while (np) {
-			if (tnp) {
-				tnp->ch = np->ch;
-				pnp = tnp;
-				tnp = tnp->next;
-			} else {
-				tnp = (nschar_t *)malloc(sizeof(nschar_t));
-				if (!tnp)
-					return ERR;
-				tnp->ch = np->ch;
-				pnp->next = tnp;
-				tnp->next = NULL;
-				pnp = tnp;
-				tnp = NULL;
-			}
-			np = np->next;
-		}
-                np = tnp;
-		if (np) {
-			pnp->next = NULL;
-			__cursesi_free_nsp(np);
-		}
-	} else {
-		if (ch->nsp) {
-			__cursesi_free_nsp(ch->nsp);
-			ch->nsp = NULL;
-		}
-	}
-
-	return OK;
-}
-
-/*
- * Free the storage associated with a non-spacing character - traverse the
- * linked list until all storage is done.
- */
-void
-__cursesi_free_nsp(nschar_t *inp)
-{
-	nschar_t *tnp, *np;
-
-	np = inp;
-	if (np) {
-		while (np) {
-			tnp = np->next;
-			free(np);
-			np = tnp;
-		}
-	}
-}
-
-/*
- * Traverse all the cells in the given window free'ing the non-spacing
- * character storage.
- */
-void
-__cursesi_win_free_nsp(WINDOW *win)
-{
-	int     i, j;
-	__LDATA *sp;
-
-	for (i = 0; i < win->maxy; i++) {
-		for (sp = win->alines[i]->line, j = 0; j < win->maxx;
-		     j++, sp++) {
-			__cursesi_free_nsp(sp->nsp);
-		}
-	}
-}
-
-#endif
diff --git a/lib/libcurses/curses.h b/lib/libcurses/curses.h
deleted file mode 100644
index 5c183b05e..000000000
--- a/lib/libcurses/curses.h
+++ /dev/null
@@ -1,933 +0,0 @@
-/*	$NetBSD: curses.h,v 1.107 2015/06/08 12:38:57 joerg Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)curses.h	8.5 (Berkeley) 4/29/95
- *
- *	Modified by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@gmail.com> 2005
- *	to add wide-character support
- *  - Add complex character structure (cchar_t)
- *	- Add definitions of wide-character routines
- *	- Add KEY_CODE_YES
- */
-
-#ifndef _CURSES_H_
-#define	_CURSES_H_
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-#include <wchar.h>
-
-#include <stdio.h>
-#include <stdbool.h>
-
-/*
- * attr_t must be the same size as wchar_t (see <wchar.h>) to avoid padding
- * in __LDATA.
- */
-typedef wchar_t	chtype;
-typedef wchar_t	attr_t;
-
-#if !defined(HAVE_WCHAR) && !defined(DISABLE_WCHAR)
-#define HAVE_WCHAR 1
-#endif
-
-#ifdef HAVE_WCHAR
-/* 
- * The complex character structure required by the X/Open reference and used
- * in * functions such as in_wchstr(). It includes a string of up to 8 wide
- * characters and its length, an attribute, and a color-pair.
- */
-#define CURSES_CCHAR_MAX 8
-#define CCHARW_MAX       5
-typedef struct {
-	attr_t		attributes;		/* character attributes */
-	unsigned	elements;		/* number of wide char in
-						   vals[] */
-	wchar_t		vals[CURSES_CCHAR_MAX]; /* wide chars including
-						   non-spacing */
-} cchar_t;
-#else 
-typedef chtype cchar_t;
-#endif /* HAVE_WCHAR */
-
-#ifndef TRUE
-#define	TRUE	(/*CONSTCOND*/1)
-#endif
-#ifndef FALSE
-#define	FALSE	(/*CONSTCOND*/0)
-#endif
-
-#ifndef _CURSES_PRIVATE
-
-#define _puts(s)        tputs(s, 0, __cputchar)
-#define _putchar(c)     __cputchar(c)
-
-/* Old-style terminal modes access. */
-#define crmode()        cbreak()
-#define nocrmode()      nocbreak()
-#endif /* _CURSES_PRIVATE */
-
-
-/* symbols for values returned by getch in keypad mode */
-#define    KEY_MIN        0x101    /* minimum extended key value */
-#define    KEY_BREAK      0x101    /* break key */
-#define    KEY_DOWN       0x102    /* down arrow */
-#define    KEY_UP         0x103    /* up arrow */
-#define    KEY_LEFT       0x104    /* left arrow */
-#define    KEY_RIGHT      0x105    /* right arrow*/
-#define    KEY_HOME       0x106    /* home key */
-#define    KEY_BACKSPACE  0x107    /* Backspace */
-
-/* First function key (block of 64 follow) */
-#define    KEY_F0         0x108
-/* Function defining other function key values*/
-#define    KEY_F(n)       (KEY_F0+(n))
-
-#define    KEY_DL         0x148    /* Delete Line */
-#define    KEY_IL         0x149    /* Insert Line*/
-#define    KEY_DC         0x14A    /* Delete Character */
-#define    KEY_IC         0x14B    /* Insert Character */
-#define    KEY_EIC        0x14C    /* Exit Insert Char mode */
-#define    KEY_CLEAR      0x14D    /* Clear screen */
-#define    KEY_EOS        0x14E    /* Clear to end of screen */
-#define    KEY_EOL        0x14F    /* Clear to end of line */
-#define    KEY_SF         0x150    /* Scroll one line forward */
-#define    KEY_SR         0x151    /* Scroll one line back */
-#define    KEY_NPAGE      0x152    /* Next Page */
-#define    KEY_PPAGE      0x153    /* Prev Page */
-#define    KEY_STAB       0x154    /* Set Tab */
-#define    KEY_CTAB       0x155    /* Clear Tab */
-#define    KEY_CATAB      0x156    /* Clear All Tabs */
-#define    KEY_ENTER      0x157    /* Enter or Send */
-#define    KEY_SRESET     0x158    /* Soft Reset */
-#define    KEY_RESET      0x159    /* Hard Reset */
-#define    KEY_PRINT      0x15A    /* Print */
-#define    KEY_LL         0x15B    /* Home Down */
-
-/*
- * "Keypad" keys arranged like this:
- *
- *  A1   up  A3
- * left  B2 right
- *  C1  down C3
- *
- */
-#define    KEY_A1         0x15C    /* Keypad upper left */
-#define    KEY_A3         0x15D    /* Keypad upper right */
-#define    KEY_B2         0x15E    /* Keypad centre key */
-#define    KEY_C1         0x15F    /* Keypad lower left */
-#define    KEY_C3         0x160    /* Keypad lower right */
-
-#define    KEY_BTAB       0x161    /* Back Tab */
-#define    KEY_BEG        0x162    /* Begin key */
-#define    KEY_CANCEL     0x163    /* Cancel key */
-#define    KEY_CLOSE      0x164    /* Close Key */
-#define    KEY_COMMAND    0x165    /* Command Key */
-#define    KEY_COPY       0x166    /* Copy key */
-#define    KEY_CREATE     0x167    /* Create key */
-#define    KEY_END        0x168    /* End key */
-#define    KEY_EXIT       0x169    /* Exit key */
-#define    KEY_FIND       0x16A    /* Find key */
-#define    KEY_HELP       0x16B    /* Help key */
-#define    KEY_MARK       0x16C    /* Mark key */
-#define    KEY_MESSAGE    0x16D    /* Message key */
-#define    KEY_MOVE       0x16E    /* Move key */
-#define    KEY_NEXT       0x16F    /* Next Object key */
-#define    KEY_OPEN       0x170    /* Open key */
-#define    KEY_OPTIONS    0x171    /* Options key */
-#define    KEY_PREVIOUS   0x172    /* Previous Object key */
-#define    KEY_REDO       0x173    /* Redo key */
-#define    KEY_REFERENCE  0x174    /* Ref Key */
-#define    KEY_REFRESH    0x175    /* Refresh key */
-#define    KEY_REPLACE    0x176    /* Replace key */
-#define    KEY_RESTART    0x177    /* Restart key */
-#define    KEY_RESUME     0x178    /* Resume key */
-#define    KEY_SAVE       0x179    /* Save key */
-#define    KEY_SBEG       0x17A    /* Shift begin key */
-#define    KEY_SCANCEL    0x17B    /* Shift Cancel key */
-#define    KEY_SCOMMAND   0x17C    /* Shift Command key */
-#define    KEY_SCOPY      0x17D    /* Shift Copy key */
-#define    KEY_SCREATE    0x17E    /* Shift Create key */
-#define    KEY_SDC        0x17F    /* Shift Delete Character */
-#define    KEY_SDL        0x180    /* Shift Delete Line */
-#define    KEY_SELECT     0x181    /* Select key */
-#define    KEY_SEND       0x182    /* Send key */
-#define    KEY_SEOL       0x183    /* Shift Clear Line key */
-#define    KEY_SEXIT      0x184    /* Shift Exit key */
-#define    KEY_SFIND      0x185    /* Shift Find key */
-#define    KEY_SHELP      0x186    /* Shift Help key */
-#define    KEY_SHOME      0x187    /* Shift Home key */
-#define    KEY_SIC        0x188    /* Shift Input key */
-#define    KEY_SLEFT      0x189    /* Shift Left Arrow key */
-#define    KEY_SMESSAGE   0x18A    /* Shift Message key */
-#define    KEY_SMOVE      0x18B    /* Shift Move key */
-#define    KEY_SNEXT      0x18C    /* Shift Next key */
-#define    KEY_SOPTIONS   0x18D    /* Shift Options key */
-#define    KEY_SPREVIOUS  0x18E    /* Shift Previous key */
-#define    KEY_SPRINT     0x18F    /* Shift Print key */
-#define    KEY_SREDO      0x190    /* Shift Redo key */
-#define    KEY_SREPLACE   0x191    /* Shift Replace key */
-#define    KEY_SRIGHT     0x192    /* Shift Right Arrow key */
-#define    KEY_SRSUME     0x193    /* Shift Resume key */
-#define    KEY_SSAVE      0x194    /* Shift Save key */
-#define    KEY_SSUSPEND   0x195    /* Shift Suspend key */
-#define    KEY_SUNDO      0x196    /* Shift Undo key */
-#define    KEY_SUSPEND    0x197    /* Suspend key */
-#define    KEY_UNDO       0x198    /* Undo key */
-#define    KEY_MOUSE      0x199    /* Mouse event has occurred */
-#define    KEY_RESIZE     0x200    /* Resize event has occurred */
-#define    KEY_MAX        0x240    /* maximum extended key value */
-#define    KEY_CODE_YES   0x241    /* A function key pressed */
-
-#include <unctrl.h>
-
-/*
- * A window an array of __LINE structures pointed to by the 'lines' pointer.
- * A line is an array of __LDATA structures pointed to by the 'line' pointer.
- */
-
-/*
- * Definitions for characters and attributes in __LDATA
- */
-#define __CHARTEXT	0x000000ff	/* bits for 8-bit characters */
-#define __NORMAL	0x00000000	/* Added characters are normal. */
-#define __STANDOUT	0x00000100	/* Added characters are standout. */
-#define __UNDERSCORE	0x00000200	/* Added characters are underscored. */
-#define __REVERSE	0x00000400	/* Added characters are reverse
-					   video. */
-#define __BLINK		0x00000800	/* Added characters are blinking. */
-#define __DIM		0x00001000	/* Added characters are dim. */
-#define __BOLD		0x00002000	/* Added characters are bold. */
-#define __BLANK		0x00004000	/* Added characters are blanked. */
-#define __PROTECT	0x00008000	/* Added characters are protected. */
-#define __ALTCHARSET	0x00010000	/* Added characters are ACS */
-#define __COLOR		0x03fe0000	/* Color bits */
-#define __ATTRIBUTES	0x03ffff00	/* All 8-bit attribute bits */
-#ifdef HAVE_WCHAR
-#define __ACS_IS_WACS	0x04000000 /* internal: use wacs table for ACS char */
-#endif
-
-typedef struct __ldata __LDATA;
-typedef struct __line  __LINE;
-typedef struct __window  WINDOW;
-typedef struct __screen SCREEN;
-
-/*
- * Attribute definitions
- */
-#define	A_NORMAL	__NORMAL
-#define	A_STANDOUT	__STANDOUT
-#define	A_UNDERLINE	__UNDERSCORE
-#define	A_REVERSE	__REVERSE
-#define	A_BLINK		__BLINK
-#define	A_DIM		__DIM
-#define	A_BOLD		__BOLD
-#define	A_BLANK		__BLANK
-#define	A_INVIS		__BLANK
-#define	A_PROTECT	__PROTECT
-#define	A_ALTCHARSET	__ALTCHARSET
-#define	A_ATTRIBUTES	__ATTRIBUTES
-#define	A_CHARTEXT	__CHARTEXT
-#define	A_COLOR		__COLOR
-
-#ifdef HAVE_WCHAR
-#define WA_ATTRIBUTES	0x03ffffff	/* Wide character attributes mask */
-#define WA_NORMAL	__NORMAL
-#define WA_STANDOUT	__STANDOUT	/* Best highlighting mode */
-#define WA_UNDERLINE	__UNDERSCORE	/* Underlining */
-#define WA_REVERSE	__REVERSE	/* Reverse video */
-#define WA_BLINK	__BLINK		/* Blinking */
-#define WA_DIM		__DIM		/* Half bright */
-#define WA_BOLD		__BOLD		/* Extra bright or bold */
-#define WA_INVIS	__BLANK		/* Invisible */
-#define WA_PROTECT	__PROTECT	/* Protected */
-#define WA_ALTCHARSET	__ALTCHARSET	/* Alternate character set */
-#define WA_LOW		0x00000002	/* Low highlight */
-#define WA_TOP		0x00000004	/* Top highlight */
-#define WA_HORIZONTAL	0x00000008	/* Horizontal highlight */
-#define WA_VERTICAL	0x00000010	/* Vertical highlight */
-#define WA_LEFT		0x00000020	/* Left highlight */
-#define WA_RIGHT	0x00000040	/* Right highlight */
-#endif /* HAVE_WCHAR */
-
-/*
- * Alternate character set definitions
- */
-
-#define	NUM_ACS	128
-
-extern chtype _acs_char[NUM_ACS];
-#ifdef __cplusplus
-#define __UC_CAST(a)	static_cast<unsigned char>(a)
-#else
-#define __UC_CAST(a)	(unsigned char)(a)
-#endif
-
-/* Standard definitions */
-#define	ACS_RARROW	_acs_char[__UC_CAST('+')]
-#define	ACS_LARROW	_acs_char[__UC_CAST(',')]
-#define	ACS_UARROW	_acs_char[__UC_CAST('-')]
-#define	ACS_DARROW	_acs_char[__UC_CAST('.')]
-#define	ACS_BLOCK	_acs_char[__UC_CAST('0')]
-#define	ACS_DIAMOND	_acs_char[__UC_CAST('`')]
-#define	ACS_CKBOARD	_acs_char[__UC_CAST('a')]
-#define	ACS_DEGREE	_acs_char[__UC_CAST('f')]
-#define	ACS_PLMINUS	_acs_char[__UC_CAST('g')]
-#define	ACS_BOARD	_acs_char[__UC_CAST('h')]
-#define	ACS_LANTERN	_acs_char[__UC_CAST('i')]
-#define	ACS_LRCORNER	_acs_char[__UC_CAST('j')]
-#define	ACS_URCORNER	_acs_char[__UC_CAST('k')]
-#define	ACS_ULCORNER	_acs_char[__UC_CAST('l')]
-#define	ACS_LLCORNER	_acs_char[__UC_CAST('m')]
-#define	ACS_PLUS	_acs_char[__UC_CAST('n')]
-#define	ACS_HLINE	_acs_char[__UC_CAST('q')]
-#define	ACS_S1		_acs_char[__UC_CAST('o')]
-#define	ACS_S9		_acs_char[__UC_CAST('s')]
-#define	ACS_LTEE	_acs_char[__UC_CAST('t')]
-#define	ACS_RTEE	_acs_char[__UC_CAST('u')]
-#define	ACS_BTEE	_acs_char[__UC_CAST('v')]
-#define	ACS_TTEE	_acs_char[__UC_CAST('w')]
-#define	ACS_VLINE	_acs_char[__UC_CAST('x')]
-#define	ACS_BULLET	_acs_char[__UC_CAST('~')]
-
-/* Extensions */
-#define	ACS_S3		_acs_char[__UC_CAST('p')]
-#define	ACS_S7		_acs_char[__UC_CAST('r')]
-#define	ACS_LEQUAL	_acs_char[__UC_CAST('y')]
-#define	ACS_GEQUAL	_acs_char[__UC_CAST('z')]
-#define	ACS_PI		_acs_char[__UC_CAST('{')]
-#define	ACS_NEQUAL	_acs_char[__UC_CAST('|')]
-#define	ACS_STERLING	_acs_char[__UC_CAST('}')]
-
-#ifdef HAVE_WCHAR
-extern cchar_t _wacs_char[NUM_ACS];
-
-#define	WACS_RARROW     (&_wacs_char[(unsigned char)'+'])
-#define	WACS_LARROW     (&_wacs_char[(unsigned char)','])
-#define	WACS_UARROW     (&_wacs_char[(unsigned char)'-'])
-#define	WACS_DARROW     (&_wacs_char[(unsigned char)'.'])
-#define	WACS_BLOCK      (&_wacs_char[(unsigned char)'0'])
-#define	WACS_DIAMOND    (&_wacs_char[(unsigned char)'`'])
-#define	WACS_CKBOARD    (&_wacs_char[(unsigned char)'a'])
-#define	WACS_DEGREE     (&_wacs_char[(unsigned char)'f'])
-#define	WACS_PLMINUS    (&_wacs_char[(unsigned char)'g'])
-#define	WACS_BOARD      (&_wacs_char[(unsigned char)'h'])
-#define	WACS_LANTERN    (&_wacs_char[(unsigned char)'i'])
-#define	WACS_LRCORNER   (&_wacs_char[(unsigned char)'j'])
-#define	WACS_URCORNER   (&_wacs_char[(unsigned char)'k'])
-#define	WACS_ULCORNER   (&_wacs_char[(unsigned char)'l'])
-#define	WACS_LLCORNER   (&_wacs_char[(unsigned char)'m'])
-#define	WACS_PLUS       (&_wacs_char[(unsigned char)'n'])
-#define	WACS_HLINE      (&_wacs_char[(unsigned char)'q'])
-#define	WACS_S1         (&_wacs_char[(unsigned char)'o'])
-#define	WACS_S9         (&_wacs_char[(unsigned char)'s'])
-#define	WACS_LTEE       (&_wacs_char[(unsigned char)'t'])
-#define	WACS_RTEE       (&_wacs_char[(unsigned char)'u'])
-#define	WACS_BTEE       (&_wacs_char[(unsigned char)'v'])
-#define	WACS_TTEE       (&_wacs_char[(unsigned char)'w'])
-#define	WACS_VLINE      (&_wacs_char[(unsigned char)'x'])
-#define	WACS_BULLET     (&_wacs_char[(unsigned char)'~'])
-#define	WACS_S3		(&_wacs_char[(unsigned char)'p'])
-#define	WACS_S7		(&_wacs_char[(unsigned char)'r'])
-#define	WACS_LEQUAL	(&_wacs_char[(unsigned char)'y'])
-#define	WACS_GEQUAL	(&_wacs_char[(unsigned char)'z'])
-#define	WACS_PI		(&_wacs_char[(unsigned char)'{'])
-#define	WACS_NEQUAL	(&_wacs_char[(unsigned char)'|'])
-#define	WACS_STERLING	(&_wacs_char[(unsigned char)'}'])
-#endif /* HAVE_WCHAR */
-
-/* System V compatibility */
-#define	ACS_SBBS	ACS_LRCORNER
-#define	ACS_BBSS	ACS_URCORNER
-#define	ACS_BSSB	ACS_ULCORNER
-#define	ACS_SSBB	ACS_LLCORNER
-#define	ACS_SSSS	ACS_PLUS
-#define	ACS_BSBS	ACS_HLINE
-#define	ACS_SSSB	ACS_LTEE
-#define	ACS_SBSS	ACS_RTEE
-#define	ACS_SSBS	ACS_BTEE
-#define	ACS_BSSS	ACS_TTEE
-#define	ACS_SBSB	ACS_VLINE
-#define	_acs_map	_acs_char
-
-/*
- * Color definitions (ANSI color numbers)
- */
-
-#define	COLOR_BLACK	0x00
-#define	COLOR_RED	0x01
-#define	COLOR_GREEN	0x02
-#define	COLOR_YELLOW	0x03
-#define	COLOR_BLUE	0x04
-#define	COLOR_MAGENTA	0x05
-#define	COLOR_CYAN	0x06
-#define	COLOR_WHITE	0x07
-
-#ifdef __cplusplus
-#define __UINT32_CAST(a)	static_cast<u_int32_t>(a)
-#else
-#define __UINT32_CAST(a)	(u_int32_t)(a)
-#endif
-#define	COLOR_PAIR(n)	(((__UINT32_CAST(n)) << 17) & A_COLOR)
-#define	PAIR_NUMBER(n)	(((__UINT32_CAST(n)) & A_COLOR) >> 17)
-
-/* Curses external declarations. */
-extern WINDOW	*curscr;		/* Current screen. */
-extern WINDOW	*stdscr;		/* Standard screen. */
-
-extern int	__tcaction;		/* If terminal hardware set. */
-
-extern int	 COLS;			/* Columns on the screen. */
-extern int	 LINES;			/* Lines on the screen. */
-extern int	 COLORS;		/* Max colors on the screen. */
-extern int	 COLOR_PAIRS;		/* Max color pairs on the screen. */
-
-extern int	 ESCDELAY;		/* Delay between keys in esc seq's. */
-extern int	 TABSIZE;		/* Size of a tab. */
-
-#ifndef OK
-#define	ERR	(-1)			/* Error return. */
-#define	OK	(0)			/* Success return. */
-#endif
-
-/*
- * The following have, traditionally, been macros but X/Open say they
- * need to be functions.  Keep the old macros for debugging.
- */
-#ifdef _CURSES_USE_MACROS
-/* Standard screen pseudo functions. */
-#define	addbytes(s, n)			__waddbytes(stdscr, s, n, 0)
-#define	addch(ch)			waddch(stdscr, ch)
-#define	addchnstr(s)			waddchnstr(stdscr, s, n)
-#define	addchstr(s)			waddchnstr(stdscr, s, -1)
-#define	addnstr(s, n)			waddnstr(stdscr, s, n)
-#define	addstr(s)			waddnstr(stdscr, s, -1)
-#define attr_get(a, p, o)		wattr_get(stdscr, a, p, o)
-#define attr_off(a, o)			wattr_off(stdscr, a, o)
-#define attr_on(a, o)			wattr_on(stdscr, a, o)
-#define attr_set(a, p, o)		wattr_set(stdscr, a, p, o)
-#define	attroff(attr)			wattroff(stdscr, attr)
-#define	attron(attr)			wattron(stdscr, attr)
-#define	attrset(attr)			wattrset(stdscr, attr)
-#define bkgd(ch)			wbkgd(stdscr, ch)
-#define bkgdset(ch)			wbkgdset(stdscr, ch)
-#define	border(l, r, t, b, tl, tr, bl, br) \
-	wborder(stdscr, l, r, t, b, tl, tr, bl, br)
-#define	clear()				wclear(stdscr)
-#define	clrtobot()			wclrtobot(stdscr)
-#define	clrtoeol()			wclrtoeol(stdscr)
-#define color_set(c, o)			wcolor_set(stdscr, c, o)
-#define	delch()				wdelch(stdscr)
-#define	deleteln()			wdeleteln(stdscr)
-#define	echochar(c)			wechochar(stdscr, c)
-#define	erase()				werase(stdscr)
-#define	getch()				wgetch(stdscr)
-#define	getnstr(s, n)			wgetnstr(stdscr, s, n)
-#define	getstr(s)			wgetstr(stdscr, s)
-#define	inch()				winch(stdscr)
-#define	inchnstr(c)			winchnstr(stdscr, c)
-#define	inchstr(c)			winchstr(stdscr, c)
-#define	innstr(s, n)			winnstr(stdscr, s, n)
-#define	insch(ch)			winsch(stdscr, ch)
-#define	insdelln(n)			winsdelln(stdscr, n)
-#define	insertln()			winsertln(stdscr)
-#define	instr(s)			winstr(stdscr, s)
-#define	move(y, x)			wmove(stdscr, y, x)
-#define	refresh()			wrefresh(stdscr)
-#define	scrl(n)				wscrl(stdscr, n)
-#define	setscrreg(t, b)			wsetscrreg(stdscr, t, b)
-#define	standend()			wstandend(stdscr)
-#define	standout()			wstandout(stdscr)
-#define	timeout(delay)			wtimeout(stdscr, delay)
-#define	underscore()			wunderscore(stdscr)
-#define	underend()			wunderend(stdscr)
-#define	waddbytes(w, s, n)		__waddbytes(w, s, n, 0)
-#define	waddstr(w, s)			waddnstr(w, s, -1)
-
-/* Standard screen plus movement pseudo functions. */
-#define	mvaddbytes(y, x, s, n)		mvwaddbytes(stdscr, y, x, s, n)
-#define	mvaddch(y, x, ch)		mvwaddch(stdscr, y, x, ch)
-#define	mvaddchnstr(y, x, s, n)		mvwaddchnstr(stdscr, y, x, s, n)
-#define	mvaddchstr(y, x, s)		mvwaddchstr(stdscr, y, x, s)
-#define	mvaddnstr(y, x, s, n)		mvwaddnstr(stdscr, y, x, s, n)
-#define	mvaddstr(y, x, s)		mvwaddstr(stdscr, y, x, s)
-#define	mvdelch(y, x)			mvwdelch(stdscr, y, x)
-#define	mvgetch(y, x)			mvwgetch(stdscr, y, x)
-#define	mvgetnstr(y, x, s, n)		mvwgetnstr(stdscr, y, x, s, n)
-#define	mvgetstr(y, x, s)		mvwgetstr(stdscr, y, x, s)
-#define	mvinch(y, x)			mvwinch(stdscr, y, x)
-#define	mvinchnstr(y, x, c, n)		mvwinchnstr(stdscr, y, x, c, n)
-#define	mvinchstr(y, x, c)		mvwinchstr(stdscr, y, x, c)
-#define	mvinnstr(y, x, s, n)		mvwinnstr(stdscr, y, x, s, n)
-#define	mvinsch(y, x, c)		mvwinsch(stdscr, y, x, c)
-#define	mvinstr(y, x, s)		mvwinstr(stdscr, y, x, s)
-#define	mvwaddbytes(w, y, x, s, n) \
-	(wmove(w, y, x) == ERR ? ERR : __waddbytes(w, s, n, 0))
-#define	mvwaddch(w, y, x, ch) \
-	(wmove(w, y, x) == ERR ? ERR : waddch(w, ch))
-#define	mvwaddchnstr(w, y, x, s, n) \
-	(wmove(w, y, x) == ERR ? ERR : waddchnstr(w, s, n))
-#define	mvwaddchstr(w, y, x, s) \
-	(wmove(w, y, x) == ERR ? ERR : waddchnstr(w, s, -1))
-#define	mvwaddnstr(w, y, x, s, n) \
-	(wmove(w, y, x) == ERR ? ERR : waddnstr(w, s, n))
-#define	mvwaddstr(w, y, x, s) \
-	(wmove(w, y, x) == ERR ? ERR : waddnstr(w, s, -1))
-#define	mvwdelch(w, y, x) \
-	(wmove(w, y, x) == ERR ? ERR : wdelch(w))
-#define	mvwgetch(w, y, x) \
-	(wmove(w, y, x) == ERR ? ERR : wgetch(w))
-#define	mvwgetnstr(w, y, x, s, n) \
-	(wmove(w, y, x) == ERR ? ERR : wgetnstr(w, s, n))
-#define	mvwgetstr(w, y, x, s) \
-	(wmove(w, y, x) == ERR ? ERR : wgetstr(w, s))
-#define	mvwinch(w, y, x) \
-	(wmove(w, y, x) == ERR ? ERR : winch(w))
-#define	mvwinchnstr(w, y, x, c, n) \
-	(wmove(w, y, x) == ERR ? ERR : winchnstr(w, c, n))
-#define	mvwinchstr(w, y, x, s) \
-	(wmove(w, y, x) == ERR ? ERR : winchstr(w, c))
-#define	mvwinnstr(w, y, x, s, n) \
-	(wmove(w, y, x) == ERR ? ERR : winnstr(w, s, n))
-#define	mvwinsch(w, y, x, c) \
-	(wmove(w, y, x) == ERR ? ERR : winsch(w, c))
-#define	mvwinstr(w, y, x, s) \
-	(wmove(w, y, x) == ERR ? ERR : winstr(w, s))
-
-/* Miscellaneous. */
-#define	noqiflush()		intrflush(stdscr, FALSE)
-#define	qiflush()		intrflush(stdscr, TRUE)
-
-#else
-/* Use functions not macros... */
-__BEGIN_DECLS
-int	 addbytes(const char *, int);
-int	 addch(chtype);
-int	 addchnstr(const chtype *, int);
-int	 addchstr(const chtype *);
-int	 addnstr(const char *, int);
-int	 addstr(const char *);
-int	 attr_get(attr_t *, short *, void *);
-int	 attr_off(attr_t, void *);
-int	 attr_on(attr_t, void *);
-int	 attr_set(attr_t, short, void *);
-int	 attroff(int);
-int	 attron(int);
-int	 attrset(int);
-int	 bkgd(chtype);
-void	 bkgdset(chtype);
-int	 border(chtype, chtype, chtype, chtype,
-	   chtype, chtype, chtype, chtype);
-int	 clear(void);
-int	 clrtobot(void);
-int	 clrtoeol(void);
-int	 color_set(short, void *);
-int	 delch(void);
-int	 deleteln(void);
-int	 echochar(const chtype);
-int	 erase(void);
-int	 getch(void);
-int	 getnstr(char *, int);
-int	 getstr(char *);
-chtype	 inch(void);
-int	 inchnstr(chtype *, int);
-int	 inchstr(chtype *);
-int	 innstr(char *, int);
-int	 insch(chtype);
-int	 insdelln(int);
-int	 insertln(void);
-int	 instr(char *);
-int	 move(int, int);
-int	 refresh(void);
-int	 scrl(int);
-int	 setscrreg(int, int);
-int	 standend(void);
-int	 standout(void);
-void	 timeout(int);
-int	 underscore(void);
-int	 underend(void);
-int	 waddbytes(WINDOW *, const char *, int);
-int	 waddstr(WINDOW *, const char *);
-
-/* Standard screen plus movement functions. */
-int	 mvaddbytes(int, int, const char *, int);
-int	 mvaddch(int, int, chtype);
-int	 mvaddchnstr(int, int, const chtype *, int);
-int	 mvaddchstr(int, int, const chtype *);
-int	 mvaddnstr(int, int, const char *, int);
-int	 mvaddstr(int, int, const char *);
-int	 mvdelch(int, int);
-int	 mvgetch(int, int);
-int	 mvgetnstr(int, int, char *, int);
-int	 mvgetstr(int, int, char *);
-chtype	 mvinch(int, int);
-int	 mvinchnstr(int, int, chtype *, int);
-int	 mvinchstr(int, int, chtype *);
-int	 mvinnstr(int, int, char *, int);
-int	 mvinsch(int, int, chtype);
-int	 mvinstr(int, int, char *);
-
-int	 mvwaddbytes(WINDOW *, int, int, const char *, int);
-int	 mvwaddch(WINDOW *, int, int, chtype);
-int	 mvwaddchnstr(WINDOW *, int, int, const chtype *, int);
-int	 mvwaddchstr(WINDOW *, int, int, const chtype *);
-int	 mvwaddnstr(WINDOW *, int, int, const char *, int);
-int	 mvwaddstr(WINDOW *, int, int, const char *);
-int	 mvwdelch(WINDOW *, int, int);
-int	 mvwgetch(WINDOW *, int, int);
-int	 mvwgetnstr(WINDOW *, int, int, char *, int);
-int	 mvwgetstr(WINDOW *, int, int, char *);
-chtype	 mvwinch(WINDOW *, int, int);
-int	 mvwinsch(WINDOW *, int, int, chtype);
-__END_DECLS
-#endif /* _CURSES_USE_MACROS */
-
-#define	getyx(w, y, x)		(y) = getcury(w), (x) = getcurx(w)
-#define	getbegyx(w, y, x)	(y) = getbegy(w), (x) = getbegx(w)
-#define	getmaxyx(w, y, x)	(y) = getmaxy(w), (x) = getmaxx(w)
-#define	getparyx(w, y, x)	(y) = getpary(w), (x) = getparx(w)
-
-/* Public function prototypes. */
-__BEGIN_DECLS
-int	 assume_default_colors(short, short);
-int	 baudrate(void);
-int	 beep(void);
-int	 box(WINDOW *, chtype, chtype);
-bool	 can_change_color(void);
-int	 cbreak(void);
-int	 clearok(WINDOW *, bool);
-int	 color_content(short, short *, short *, short *);
-int	 copywin(const WINDOW *, WINDOW *, int, int, int, int, int, int, int);
-int	 curs_set(int);
-int	 def_prog_mode(void);
-int	 def_shell_mode(void);
-int      define_key(char *, int);
-int	 delay_output(int);
-void     delscreen(SCREEN *);
-int	 delwin(WINDOW *);
-WINDOW	*derwin(WINDOW *, int, int, int, int);
-WINDOW	*dupwin(WINDOW *);
-int	 doupdate(void);
-int	 echo(void);
-int	 endwin(void);
-char     erasechar(void);
-int	 flash(void);
-int	 flushinp(void);
-int	 flushok(WINDOW *, bool);
-char	*fullname(const char *, char *);
-chtype	 getattrs(WINDOW *);
-chtype	 getbkgd(WINDOW *);
-int	 getcury(WINDOW *);
-int	 getcurx(WINDOW *);
-int	 getbegy(WINDOW *);
-int	 getbegx(WINDOW *);
-int	 getmaxy(WINDOW *);
-int	 getmaxx(WINDOW *);
-int	 getpary(WINDOW *);
-int	 getparx(WINDOW *);
-int	 gettmode(void);
-WINDOW	*getwin(FILE *);
-int	 halfdelay(int);
-bool	 has_colors(void);
-bool	 has_ic(void);
-bool	 has_il(void);
-int	 hline(chtype, int);
-int	 idcok(WINDOW *, bool);
-int	 idlok(WINDOW *, bool);
-int	 init_color(short, short, short, short);
-int	 init_pair(short, short, short);
-WINDOW	*initscr(void);
-int	 intrflush(WINDOW *, bool);
-bool	 isendwin(void);
-bool	 is_linetouched(WINDOW *, int);
-bool	 is_wintouched(WINDOW *);
-int      keyok(int, bool);
-int	 keypad(WINDOW *, bool);
-char	*keyname(int);
-char     killchar(void);
-int	 leaveok(WINDOW *, bool);
-int	 meta(WINDOW *, bool);
-int	 mvcur(int, int, int, int);
-int      mvderwin(WINDOW *, int, int);
-int	 mvhline(int, int, chtype, int);
-int	 mvprintw(int, int, const char *, ...) __printflike(3, 4);
-int	 mvscanw(int, int, const char *, ...) __scanflike(3, 4);
-int	 mvvline(int, int, chtype, int);
-int	 mvwhline(WINDOW *, int, int, chtype, int);
-int	 mvwvline(WINDOW *, int, int, chtype, int);
-int	 mvwin(WINDOW *, int, int);
-int	 mvwinchnstr(WINDOW *, int, int, chtype *, int);
-int	 mvwinchstr(WINDOW *, int, int, chtype *);
-int	 mvwinnstr(WINDOW *, int, int, char *, int);
-int	 mvwinstr(WINDOW *, int, int, char *);
-int	 mvwprintw(WINDOW *, int, int, const char *, ...) __printflike(4, 5);
-int	 mvwscanw(WINDOW *, int, int, const char *, ...) __scanflike(4, 5);
-int	 napms(int);
-WINDOW	*newpad(int, int);
-SCREEN  *newterm(char *, FILE *, FILE *);
-WINDOW	*newwin(int, int, int, int);
-int	 nl(void);
-attr_t	 no_color_attributes(void);
-int	 nocbreak(void);
-int	 nodelay(WINDOW *, bool);
-int	 noecho(void);
-int	 nonl(void);
-void	 noqiflush(void);
-int	 noraw(void);
-int	 notimeout(WINDOW *, bool);
-int	 overlay(const WINDOW *, WINDOW *);
-int	 overwrite(const WINDOW *, WINDOW *);
-int	 pair_content(short, short *, short *);
-int	 pechochar(WINDOW *, const chtype);
-int	 pnoutrefresh(WINDOW *, int, int, int, int, int, int);
-int	 prefresh(WINDOW *, int, int, int, int, int, int);
-int	 printw(const char *, ...) __printflike(1, 2);
-int	 putwin(WINDOW *, FILE *);
-void	 qiflush(void);
-int	 raw(void);
-int	 redrawwin(WINDOW *);
-int	 reset_prog_mode(void);
-int	 reset_shell_mode(void);
-int	 resetty(void);
-int      resizeterm(int, int);
-int	 savetty(void);
-int	 scanw(const char *, ...) __scanflike(1, 2);
-int	 scroll(WINDOW *);
-int	 scrollok(WINDOW *, bool);
-int	 setterm(char *);
-SCREEN  *set_term(SCREEN *);
-int	 start_color(void);
-WINDOW	*subpad(WINDOW *, int, int, int, int);
-WINDOW	*subwin(WINDOW *, int, int, int, int);
-chtype	 termattrs(void);
-attr_t	 term_attrs(void);
-int	 touchline(WINDOW *, int, int);
-int	 touchoverlap(WINDOW *, WINDOW *);
-int	 touchwin(WINDOW *);
-int	 ungetch(int);
-int	 untouchwin(WINDOW *);
-int	 use_default_colors(void);
-int	 vline(chtype, int);
-int	 vw_printw(WINDOW *, const char *, __va_list) __printflike(2, 0);
-int	 vw_scanw(WINDOW *, const char *, __va_list) __scanflike(2, 0);
-int	 vwprintw(WINDOW *, const char *, __va_list) __printflike(2, 0);
-int	 vwscanw(WINDOW *, const char *, __va_list) __scanflike(2, 0);
-int	 waddch(WINDOW *, chtype);
-int	 waddchnstr(WINDOW *, const chtype *, int);
-int	 waddchstr(WINDOW *, const chtype *);
-int	 waddnstr(WINDOW *, const char *, int);
-int	 wattr_get(WINDOW *, attr_t *, short *, void *);
-int	 wattr_off(WINDOW *, attr_t, void *);
-int	 wattr_on(WINDOW *, attr_t, void *);
-int	 wattr_set(WINDOW *, attr_t, short, void *);
-int	 wattroff(WINDOW *, int);
-int	 wattron(WINDOW *, int);
-int	 wattrset(WINDOW *, int);
-int	 wbkgd(WINDOW *, chtype);
-void	 wbkgdset(WINDOW *, chtype);
-int	 wborder(WINDOW *, chtype, chtype, chtype, chtype, chtype, chtype,
-		chtype, chtype);
-int	 wclear(WINDOW *);
-int	 wclrtobot(WINDOW *);
-int	 wclrtoeol(WINDOW *);
-int	 wcolor_set(WINDOW *, short, void *);
-void	 wcursyncup(WINDOW *);
-int	 wdelch(WINDOW *);
-int	 wdeleteln(WINDOW *);
-int	 wechochar(WINDOW *, const chtype);
-int	 werase(WINDOW *);
-int	 wgetch(WINDOW *);
-int	 wgetnstr(WINDOW *, char *, int);
-int	 wgetstr(WINDOW *, char *);
-int	 whline(WINDOW *, chtype, int);
-chtype	 winch(WINDOW *);
-int	 winchnstr(WINDOW *, chtype *, int);
-int	 winchstr(WINDOW *, chtype *);
-int	 winnstr(WINDOW *, char *, int);
-int	 winsch(WINDOW *, chtype);
-int	 winsdelln(WINDOW *, int);
-int	 winsertln(WINDOW *);
-int	 winstr(WINDOW *, char *);
-int	 wmove(WINDOW *, int, int);
-int	 wnoutrefresh(WINDOW *);
-int	 wprintw(WINDOW *, const char *, ...)  __printflike(2, 3);
-int	 wredrawln(WINDOW *, int, int);
-int	 wrefresh(WINDOW *);
-int      wresize(WINDOW *, int, int);
-int	 wscanw(WINDOW *, const char *, ...) __scanflike(2, 3);
-int	 wscrl(WINDOW *, int);
-int	 wsetscrreg(WINDOW *, int, int);
-int	 wstandend(WINDOW *);
-int	 wstandout(WINDOW *);
-void	 wsyncdown(WINDOW *);
-void	 wsyncup(WINDOW *);
-void	 wtimeout(WINDOW *, int);
-int	 wtouchln(WINDOW *, int, int, int);
-int	 wunderend(WINDOW *);
-int	 wunderscore(WINDOW *);
-int	 wvline(WINDOW *, chtype, int);
-
-int insnstr(const char *, int);
-int insstr(const char *);
-int mvinsnstr(int, int, const char *, int);
-int mvinsstr(int, int, const char *);
-int mvwinsnstr(WINDOW *, int, int, const char *, int);
-int mvwinsstr(WINDOW *, int, int, const char *);
-int winsnstr(WINDOW *, const char *, int);
-int winsstr(WINDOW *, const char *);
-
-int chgat(int, attr_t, short, const void *);
-int wchgat(WINDOW *, int, attr_t, short, const void *);
-int mvchgat(int, int, int, attr_t, short, const void *);
-int mvwchgat(WINDOW *, int, int, int, attr_t, short, const void *);
-
-/* wide-character support routines */
-/* return ERR when HAVE_WCHAR is not defined */
-/* add */
-int add_wch(const cchar_t *);
-int wadd_wch(WINDOW *, const cchar_t *);
-int mvadd_wch(int, int, const cchar_t *);
-int mvwadd_wch(WINDOW *, int, int, const cchar_t *);
-
-int add_wchnstr(const cchar_t *, int);
-int add_wchstr(const cchar_t *);
-int wadd_wchnstr(WINDOW *, const cchar_t *, int);
-int wadd_wchstr(WINDOW *, const cchar_t *);
-int mvadd_wchnstr(int, int, const cchar_t *, int);
-int mvadd_wchstr(int, int, const cchar_t *);
-int mvwadd_wchnstr(WINDOW *, int, int, const cchar_t *, int);
-int mvwadd_wchstr(WINDOW *, int, int, const cchar_t *);
-
-int addnwstr(const wchar_t *, int);
-int addwstr(const wchar_t *);
-int mvaddnwstr(int, int x, const wchar_t *, int);
-int mvaddwstr(int, int x, const wchar_t *);
-int mvwaddnwstr(WINDOW *, int, int, const wchar_t *, int);
-int mvwaddwstr(WINDOW *, int, int, const wchar_t *);
-int waddnwstr(WINDOW *, const wchar_t *, int);
-int waddwstr(WINDOW *, const wchar_t *);
-
-int echo_wchar(const cchar_t *);
-int wecho_wchar(WINDOW *, const cchar_t *);
-int pecho_wchar(WINDOW *, const cchar_t *);
-
-/* insert */
-int ins_wch(const cchar_t *);
-int wins_wch(WINDOW *, const cchar_t *);
-int mvins_wch(int, int, const cchar_t *);
-int mvwins_wch(WINDOW *, int, int, const cchar_t *);
-
-int ins_nwstr(const wchar_t *, int);
-int ins_wstr(const wchar_t *);
-int mvins_nwstr(int, int, const wchar_t *, int);
-int mvins_wstr(int, int, const wchar_t *);
-int mvwins_nwstr(WINDOW *, int, int, const wchar_t *, int);
-int mvwins_wstr(WINDOW *, int, int, const wchar_t *);
-int wins_nwstr(WINDOW *, const wchar_t *, int);
-int wins_wstr(WINDOW *, const wchar_t *);
-
-/* input */
-int get_wch(wint_t *);
-int unget_wch(const wchar_t);
-int mvget_wch(int, int, wint_t *);
-int mvwget_wch(WINDOW *, int, int, wint_t *);
-int wget_wch(WINDOW *, wint_t *);
-
-int getn_wstr(wchar_t *, int);
-int get_wstr(wchar_t *);
-int mvgetn_wstr(int, int, wchar_t *, int);
-int mvget_wstr(int, int, wchar_t *);
-int mvwgetn_wstr(WINDOW *, int, int, wchar_t *, int);
-int mvwget_wstr(WINDOW *, int, int, wchar_t *);
-int wgetn_wstr(WINDOW *, wchar_t *, int);
-int wget_wstr(WINDOW *, wchar_t *);
-
-int in_wch(cchar_t *);
-int mvin_wch(int, int, cchar_t *);
-int mvwin_wch(WINDOW *, int, int, cchar_t *);
-int win_wch(WINDOW *, cchar_t *);
-
-int in_wchnstr(cchar_t *, int);
-int in_wchstr(cchar_t *);
-int mvin_wchnstr(int, int, cchar_t *, int);
-int mvin_wchstr(int, int, cchar_t *);
-int mvwin_wchnstr(WINDOW *, int, int, cchar_t *, int);
-int mvwin_wchstr(WINDOW *, int, int, cchar_t *);
-int win_wchnstr(WINDOW *, cchar_t *, int);
-int win_wchstr(WINDOW *, cchar_t *);
-
-int innwstr(wchar_t *, int);
-int inwstr(wchar_t *);
-int mvinnwstr(int, int, wchar_t *, int);
-int mvinwstr(int, int, wchar_t *);
-int mvwinnwstr(WINDOW *, int, int, wchar_t *, int);
-int mvwinwstr(WINDOW *, int, int, wchar_t *);
-int winnwstr(WINDOW *, wchar_t *, int);
-int winwstr(WINDOW *, wchar_t *);
-
-/* cchar handlgin */
-int setcchar(cchar_t *, const wchar_t *, const attr_t, short, const void *);
-int getcchar(const cchar_t *, wchar_t *, attr_t *, short *, void *);
-
-/* misc */
-char *key_name( wchar_t );
-int border_set(const cchar_t *, const cchar_t *, const cchar_t *,
-               const cchar_t *, const cchar_t *, const cchar_t *,
-               const cchar_t *, const cchar_t *);
-int wborder_set(WINDOW *, const cchar_t *, const cchar_t *,
-                const cchar_t *, const cchar_t *, const cchar_t *, 
-                const cchar_t *, const cchar_t *, const cchar_t *);
-int box_set(WINDOW *, const cchar_t *, const cchar_t *);
-int erasewchar(wchar_t *);
-int killwchar(wchar_t *);
-int hline_set(const cchar_t *, int);
-int mvhline_set(int, int, const cchar_t *, int);
-int mvvline_set(int, int, const cchar_t *, int);
-int mvwhline_set(WINDOW *, int, int, const cchar_t *, int);
-int mvwvline_set(WINDOW *, int, int, const cchar_t *, int);
-int vline_set(const cchar_t *, int);
-int whline_set(WINDOW *, const cchar_t *, int);
-int wvline_set(WINDOW *, const cchar_t *, int);
-int bkgrnd(const cchar_t *);
-void bkgrndset(const cchar_t *);
-int getbkgrnd(cchar_t *);
-int wbkgrnd(WINDOW *, const cchar_t *);
-void wbkgrndset(WINDOW *, const cchar_t *);
-int wgetbkgrnd(WINDOW *, cchar_t *);
-
-/* Private functions that are needed for user programs prototypes. */
-int	 __cputchar(int);
-int	 __waddbytes(WINDOW *, const char *, int, attr_t);
-#ifdef HAVE_WCHAR
-int __cputwchar( wchar_t );
-#endif /* HAVE_WCHAR */
-__END_DECLS
-
-#endif /* !_CURSES_H_ */
diff --git a/lib/libcurses/curses_addch.3 b/lib/libcurses/curses_addch.3
deleted file mode 100644
index 597506a3c..000000000
--- a/lib/libcurses/curses_addch.3
+++ /dev/null
@@ -1,187 +0,0 @@
-.\"	$NetBSD: curses_addch.3,v 1.8 2007/07/15 21:37:55 wiz Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd July 11, 2007
-.Dt CURSES_ADDCH 3
-.Os
-.Sh NAME
-.Nm curses_addch ,
-.Nm addch ,
-.Nm waddch ,
-.Nm mvaddch ,
-.Nm mvwaddch
-.Nd curses add characters to windows routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn addch "chtype ch"
-.Ft int
-.Fn waddch "WINDOW *win" "chtype ch"
-.Ft int
-.Fn mvaddch "int y" "int x" "chtype ch"
-.Ft int
-.Fn mvwaddch "WINDOW *win" "int y" "int x" "chtype ch"
-.Sh DESCRIPTION
-These functions add characters to
-.Dv stdscr
-or to the specified window.
-.Pp
-The
-.Fn addch
-function adds the character given in
-.Fa ch
-to
-.Dv stdscr
-at the current cursor position and advances the current cursor position by one.
-Any character attributes set in
-.Fa ch
-will be merged with the background attributes currently set on
-.Dv stdscr .
-.Pp
-The
-.Fn waddch
-function is the same as the
-.Fn addch
-function, excepting that the character is added to the window specified by
-.Fa win .
-.Pp
-The
-.Fn mvaddch
-and
-.Fn mvwaddch
-functions are the same as the
-.Fn addch
-and
-.Fn waddch
-functions, respectively, excepting that
-.Fn wmove
-is called to move the cursor to the position specified by
-.Fa y ,
-.Fa x
-before the character is added to the window.
-.Ss LINE DRAWING CHARACTERS
-Some terminals support the display of line drawing and graphics characters.
-These characters can be added using their defined names, as shown in the
-table below.
-Where the terminal does not support a specific character, the default
-(non-graphics) character is displayed instead.
-.Bl -column -offset indent ".Sy System V Name" ".Sy Default"
-.It Sy "Name" Ta Sy "Default" Ta Sy "Description"
-.It ACS_RARROW Ta \*[Gt] Ta "Arrow pointing right"
-.It ACS_LARROW Ta \*[Lt] Ta "Arrow pointing left"
-.It ACS_UARROW Ta ^ Ta "Arrow pointing up"
-.It ACS_DARROW Ta v Ta "Arrow pointing down"
-.It ACS_BLOCK Ta # Ta "Solid square block"
-.It ACS_DIAMOND Ta + Ta "Diamond"
-.It ACS_CKBOARD Ta : Ta "Checker board (stipple)"
-.It ACS_DEGREE Ta ' Ta "Degree symbol"
-.It ACS_PLMINUS Ta # Ta "Plus/minus"
-.It ACS_BOARD Ta # Ta "Board of squares"
-.It ACS_LANTERN Ta # Ta "Lantern symbol"
-.It ACS_LRCORNER Ta + Ta "Lower right-hand corner"
-.It ACS_URCORNER Ta + Ta "Upper right-hand corner"
-.It ACS_ULCORNER Ta + Ta "Upper left-hand corner"
-.It ACS_LLCORNER Ta + Ta "Lower left-hand corner"
-.It ACS_PLUS Ta + Ta "Plus"
-.It ACS_HLINE Ta - Ta "Horizontal line"
-.It ACS_S1 Ta - Ta "Scan line 1"
-.It ACS_S9 Ta - Ta "Scan line 9"
-.It ACS_LTEE Ta + Ta "Left tee"
-.It ACS_RTEE Ta + Ta "Right tee"
-.It ACS_BTEE Ta + Ta "Bottom tee"
-.It ACS_TTEE Ta + Ta "Top tee"
-.It ACS_VLINE Ta | Ta "Vertical line"
-.It ACS_BULLET Ta o Ta "Bullet"
-.El
-.Pp
-The following additional,
-.Em ncurses
-compatible, characters are also supported.
-.Bl -column -offset indent ".Sy System V Name" ".Sy Default"
-.It Sy "Name" Ta Sy "Default" Ta Sy "Description"
-.It ACS_S3 Ta - Ta "Scan line 3"
-.It ACS_S7 Ta - Ta "Scan line 7"
-.It ACS_LEQUAL Ta \*[Lt] Ta "Less than or equal to"
-.It ACS_GEQUAL Ta \*[Gt] Ta "Greater than or equal to"
-.It ACS_PI Ta * Ta "Pi symbol"
-.It ACS_NEQUAL Ta ! Ta "Not equal to"
-.It ACS_STERLING Ta f Ta "Sterling symbol"
-.El
-.Pp
-For compatibility with some
-.Em System V
-implementations, the following definitions are also supported.
-.Bl -column -offset indent ".Sy System V Name" ".Sy Default"
-.It Sy "System V Name" Ta Sy "NetBSD Curses Name"
-.It ACS_SBBS Ta ACS_LRCORNER
-.It ACS_BBSS Ta ACS_URCORNER
-.It ACS_BSSB Ta ACS_ULCORNER
-.It ACS_SSBB Ta ACS_LLCORNER
-.It ACS_SSSS Ta ACS_PLUS
-.It ACS_BSBS Ta ACS_HLINE
-.It ACS_SSSB Ta ACS_LTEE
-.It ACS_SBSS Ta ACS_RTEE
-.It ACS_SSBS Ta ACS_BTEE
-.It ACS_BSSS Ta ACS_TTEE
-.It ACS_SBSB Ta ACS_VLINE
-.El
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_addchstr 3 ,
-.Xr curses_addstr 3 ,
-.Xr curses_attributes 3 ,
-.Xr curses_cursor 3 ,
-.Xr curses_delch 3 ,
-.Xr curses_inch 3 ,
-.Xr curses_insertch 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_addchstr.3 b/lib/libcurses/curses_addchstr.3
deleted file mode 100644
index 82df0f2b0..000000000
--- a/lib/libcurses/curses_addchstr.3
+++ /dev/null
@@ -1,155 +0,0 @@
-.\"	$NetBSD: curses_addchstr.3,v 1.3 2008/04/30 13:10:51 martin Exp $
-.\"
-.\" Copyright (c) 2003
-.\"	Douwe Kiela (virtus@wanadoo.nl)
-.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Douwe Kiela (virtus@wanadoo.nl).
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"
-.Dd May 21, 2003
-.Dt CURSES_ADDCHSTR 3
-.Os
-.Sh NAME
-.Nm curses_addchstr ,
-.Nm addchstr ,
-.Nm waddchstr ,
-.Nm addchnstr ,
-.Nm waddchnstr ,
-.Nm mvaddchstr ,
-.Nm mvwaddchstr ,
-.Nm mvaddchnstr ,
-.Nm mvwaddchnstr
-.Nd curses add character strings to windows routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn addchstr "const chtype *chstr"
-.Ft int
-.Fn waddchstr "WINDOW *win" "const chtype *chstr"
-.Ft int
-.Fn mvaddchstr "int y" "int x" "const chtype *chstr"
-.Ft int
-.Fn mvwaddchstr "WINDOW *win" "int y" "int x" "const chtype *chstr"
-.Ft int
-.Fn addchnstr "const chtype *chstr" "int n"
-.Ft int
-.Fn waddchnstr "WINDOW *win" "const chtype *chstr" "int n"
-.Ft int
-.Fn mvaddchnstr "int y" "int x" "const chtype *chstr" "int n"
-.Ft int
-.Fn mvwaddchnstr "WINDOW *win" "int y" "int x" "const chtype *chstr" "int n"
-.Sh DESCRIPTION
-These functions add character strings and attributes to
-.Dv stdscr
-or to the specified window.
-.Pp
-The
-.Fn addchstr
-function will add the characters and their attributes passed in
-.Fa chstr
-to
-.Dv stdscr
-starting at the current cursor position.
-Any character attributes set in
-.Fa chstr
-will be merged with the background attributes currently set on
-.Dv stdscr .
-The
-.Fn waddstr
-function does the same as
-.Fn addchstr
-but adds the string to the window specified by
-.Fn win .
-.Pp
-The
-.Fn addchnstr
-function will add the contents of
-.Fa string
-to
-.Dv stdscr
-but will limit the number of characters added to be, at most,
-.Fa n .
-If
-.Fa n
-is \-1 then
-.Fa addchnstr
-will add the number of characters contained in the null terminated string
-.Fa chstr .
-Any character attributes set in
-.Fa chstr
-will be merged with the background attributes currently set on
-.Dv stdscr .
-.Pp
-The
-.Fn waddchnstr
-function does the same as
-.Fa addchnstr
-but adds the string to the window specified by
-.Fa win .
-.Pp
-The functions
-.Fn mvaddchstr ,
-.Fn mwaddchnstr ,
-.Fn mvwaddchstr
-and
-.Fn mvwaddchnstr
-are the same as the functions
-.Fn addchstr ,
-.Fn waddchstr ,
-.Fn waddchstr
-and
-.Fn waddchnstr ,
-respectively, except that
-.Fn wmove
-is called to move the cursor to the position specified by
-.Fa y ,
-.Fa x
-before the string is added to the window.
-.Sh RETURN VALUES
-The functions will return one of the following values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_addch 3 ,
-.Xr curses_addstr 3 ,
-.Xr curses_attributes 3 ,
-.Xr curses_cursor 3 ,
-.Xr curses_inch 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-These functions first appeared in
-.Nx 2.0 .
diff --git a/lib/libcurses/curses_addstr.3 b/lib/libcurses/curses_addstr.3
deleted file mode 100644
index 8ed7199f2..000000000
--- a/lib/libcurses/curses_addstr.3
+++ /dev/null
@@ -1,159 +0,0 @@
-.\"	$NetBSD: curses_addstr.3,v 1.4 2003/05/21 21:22:15 jdc Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd May 21, 2003
-.Dt CURSES_ADDSTR 3
-.Os
-.Sh NAME
-.Nm curses_addstr ,
-.Nm addstr ,
-.Nm waddstr ,
-.Nm addnstr ,
-.Nm waddnstr ,
-.Nm mvaddstr ,
-.Nm mvwaddstr ,
-.Nm mvaddnstr ,
-.Nm mvwaddnstr
-.Nd curses add character strings to windows routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn addstr "const char *string"
-.Ft int
-.Fn waddstr "WINDOW *win" "const char *string"
-.Ft int
-.Fn mvaddstr "int y" "int x" "const char *string"
-.Ft int
-.Fn mvwaddstr "WINDOW *win" "int y" "int x" "const char *string"
-.Ft int
-.Fn addnstr "const char *string" "int len"
-.Ft int
-.Fn waddnstr "WINDOW *win" "const char *string" "int len"
-.Ft int
-.Fn mvaddnstr "int y" "int x" "const char *string" "int len"
-.Ft int
-.Fn mvwaddnstr "WINDOW *win" "int y" "int x" "const char *string" "int len"
-.Sh DESCRIPTION
-These functions add character strings to
-.Dv stdscr
-or to the specified window.
-.Pp
-The
-.Fn addstr
-function
-will add the characters passed in
-.Fa string
-to
-.Dv stdscr
-starting at the current cursor position.
-Any background attributes currently set on
-.Dv stdscr
-will be applied to the added character.
-The
-.Fn waddstr
-function does the same as
-.Fn addstr
-but adds the string to the window specified by
-.Fn win .
-.Pp
-The
-.Fn addnstr
-function will add the contents of
-.Fa string
-to
-.Dv stdscr
-but will limit the number of characters added to be, at most,
-.Fa len .
-If
-.Fa len
-is \-1 then
-.Fa addnstr
-will add the number of characters contained in the null terminated string
-.Fa string .
-Any background attributes currently set on
-.Dv stdscr
-will be applied to the added character.
-The
-.Fn waddnstr
-function
-does the same as
-.Fa addnstr
-but adds the string to the window specified by
-.Fa win .
-.Pp
-The functions
-.Fn mvaddstr ,
-.Fn mwaddnstr ,
-.Fn mvwaddstr
-and
-.Fn mvwaddnstr
-are the same as the functions
-.Fn addstr ,
-.Fn waddstr ,
-.Fn waddstr
-and
-.Fn waddnstr ,
-respectively, excepting that
-.Fn wmove
-is called to move the cursor to the position specified by
-.Fa y ,
-.Fa x
-before the string is added to the window.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_addch 3 ,
-.Xr curses_addchstr 3 ,
-.Xr curses_attributes 3 ,
-.Xr curses_cursor 3 ,
-.Xr curses_inch 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_attributes.3 b/lib/libcurses/curses_attributes.3
deleted file mode 100644
index 307ea858b..000000000
--- a/lib/libcurses/curses_attributes.3
+++ /dev/null
@@ -1,342 +0,0 @@
-.\"	$NetBSD: curses_attributes.3,v 1.8 2008/04/30 13:10:51 martin Exp $
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Julian Coleman.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd March 14, 2008
-.Dt CURSES_ATTRIBUTES 3
-.Os
-.Sh NAME
-.Nm curses_attributes ,
-.Nm attron ,
-.Nm attroff ,
-.Nm attrset ,
-.Nm color_set ,
-.Nm getattrs ,
-.Nm termattrs ,
-.Nm wattron ,
-.Nm wattroff ,
-.Nm wattrset ,
-.Nm wcolor_set ,
-.Nm attr_on ,
-.Nm attr_off ,
-.Nm attr_set ,
-.Nm attr_get ,
-.Nm term_attrs ,
-.Nm wattr_on ,
-.Nm wattr_off ,
-.Nm wattr_set ,
-.Nm wattr_get
-.Nd curses general attribute manipulation routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn attron "int attr"
-.Ft int
-.Fn attroff "int attr"
-.Ft int
-.Fn attrset "int attr"
-.Ft int
-.Fn color_set "short pair" "void *opt"
-.Ft chtype
-.Fn getattrs "WINDOW *win"
-.Ft chtype
-.Fn termattrs "void"
-.Ft int
-.Fn wcolor_set "WINDOW *win" "short pair" "void *opt"
-.Ft int
-.Fn wattron "WINDOW * win" "int attr"
-.Ft int
-.Fn wattroff "WINDOW * win" "int attr"
-.Ft int
-.Fn wattrset "WINDOW * win" "int attr"
-.Ft int
-.Fn attr_on "attr_t attr" "void *opt"
-.Ft int
-.Fn attr_off "attr_t attr" "void *opt"
-.Ft int
-.Fn attr_set "attr_t attr" "short pair" "void *opt"
-.Ft int
-.Fn attr_get "attr_t *attr" "short *pair" "void *opt"
-.Ft attr_t
-.Fn term_attrs "void"
-.Ft int
-.Fn wattr_on "WINDOW *win" "attr_t attr" "void *opt"
-.Ft int
-.Fn wattr_off "WINDOW *win" "attr_t attr" "void *opt"
-.Ft int
-.Fn wattr_set "WINDOW *win" "attr_t attr" "short pair" "void *opt"
-.Ft int
-.Fn wattr_get "WINDOW *win" "attr_t *attr" "short *pair" "void *opt"
-.Sh DESCRIPTION
-These functions manipulate attributes on
-.Dv stdscr
-or on the specified window.
-The attributes that can be manipulated are:
-.Pp
-.Bl -tag -width "COLOR_PAIR(n)" -compact -offset indent
-.It A_NORMAL
-no special attributes are applied
-.It A_STANDOUT
-characters are displayed in standout mode
-.It A_UNDERLINE
-characters are displayed underlined
-.It A_REVERSE
-characters are displayed in inverse video
-.It A_BLINK
-characters blink
-.It A_DIM
-characters are displayed at a lower intensity
-.It A_BOLD
-characters are displayed at a higher intensity
-.It A_INVIS
-characters are added invisibly
-.It A_PROTECT
-characters are protected from modification
-.It A_ALTCHARSET
-characters are displayed using the alternate character set (ACS)
-.It COLOR_PAIR(n)
-characters are displayed using color pair n.
-.El
-.Pp
-The
-.Fn attron
-function turns on the attributes specified in
-.Fa attr
-on
-.Dv stdscr ,
-while the
-.Fn attroff
-function turns off the attributes specified in
-.Fa attr
-on
-.Dv stdscr .
-.Pp
-The function
-.Fn attrset
-sets the attributes of
-.Dv stdscr
-to those specified in
-.Fa attr ,
-turning off any others.
-To turn off all the attributes (including color and alternate character set),
-use
-.Fn attrset A_NORMAL .
-.Pp
-Multiple attributes can be manipulated by combining the attributes
-using a logical
-.Em OR .
-For example,
-.Fn attron "A_REVERSE | A_BOLD"
-will turn on both inverse video and higher intensity.
-.Pp
-The function
-.Fn color_set
-sets the color pair attribute to the pair specified in
-.Fa pair .
-.Pp
-The function
-.Fn getattrs
-returns the attributes that are currently applied to window specified by
-.Fa win .
-.Pp
-The function
-.Fn termattrs
-returns the logical
-.Em OR
-of attributes that can be applied to the screen.
-.Pp
-The functions
-.Fn wattron ,
-.Fn wattroff ,
-.Fn wattrset ,
-and
-.Fn wcolor_set
-are equivalent to
-.Fn attron ,
-.Fn attroff
-.Fn attrset ,
-and
-.Fn color_set
-respectively, excepting that the attributes are applied to the window
-specified by
-.Fa win .
-.Pp
-The following functions additionally manipulate wide attributes on
-.Dv stdscr
-or on the specified window.
-The additional wide attributes that can be manipulated are:
-.Pp
-.Bl -tag -width "COLOR_PAIR(n)" -compact -offset indent
-.It WA_STANDOUT
-characters are displayed in standout mode
-.It WA_UNDERLINE
-characters are displayed underlined
-.It WA_REVERSE
-characters are displayed in inverse video
-.It WA_BLINK
-characters blink
-.It WA_DIM
-characters are displayed at a lower intensity
-.It WA_BOLD
-characters are displayed at a higher intensity
-.It WA_INVIS
-characters are added invisibly
-.It WA_PROTECT
-characters are protected from modification
-.It WA_ALTCHARSET
-characters are displayed using the alternate character set (ACS)
-.It WA_LOW
-characters are displayed with low highlight
-.It WA_TOP
-characters are displayed with top highlight
-.It WA_HORIZONTAL
-characters are displayed with horizontal highlight
-.It WA_VERTICAL
-characters are displayed with vertical highlight
-.It WA_LEFT
-characters are displayed with left highlight
-.It WA_RIGHT
-characters are displayed with right highlight
-.El
-.Pp
-The
-.Fn attr_on
-function turns on the wide attributes specified in
-.Fa attr
-on
-.Dv stdscr ,
-while the
-.Fn attr_off
-function turns off the wide attributes specified in
-.Fa attr
-on
-.Dv stdscr .
-.Pp
-The function
-.Fn attr_set
-sets the wide attributes of
-.Dv stdscr
-to those specified in
-.Fa attr
-and
-.Fa pair ,
-turning off any others.
-Note that a color pair specified in
-.Fa pair
-will override any color pair specified in
-.Fa attr .
-.Pp
-The function
-.Fn attr_get
-sets
-.Fa attr
-to the wide attributes and
-.Fa pair
-to the color pair currently applied to
-.Dv stdscr .
-Either of
-.Fa attr
-and
-.Fa pair
-can be
-.Dv NULL ,
-if the relevant value is of no interest.
-.Pp
-The function
-.Fn term_attrs
-returns the logical
-.Em OR
-of wide attributes that can be applied to the screen.
-.Pp
-The functions
-.Fn wattr_on ,
-.Fn wattr_off
-and
-.Fn wattr_set
-are equivalent to
-.Fn attr_on ,
-.Fn attr_off
-and
-.Fn attr_set
-respectively, excepting that the character is added to the window specified by
-.Fa win .
-.Pp
-The function
-.Fn wattr_get
-is equivalent to
-.Fn attr_get ,
-excepting that the wide attributes and color pair currently applied to
-.Fa win
-are set.
-.Pp
-The following constants can be used to extract the components of a
-.Dv chtype :
-.Pp
-.Bl -tag -width "COLOR_PAIR(n)" -compact -offset indent
-.It A_ATTRIBUTES
-bit-mask containing attributes part
-.It A_CHARTEXT
-bit-mask containing character part
-.It A_COLOR
-bit-mask containing color-pair part
-.El
-.Sh RETURN VALUES
-These functions return OK on success and ERR on failure.
-.Sh SEE ALSO
-.Xr curses_addch 3 ,
-.Xr curses_addchstr 3 ,
-.Xr curses_addstr 3 ,
-.Xr curses_background 3 ,
-.Xr curses_color 3 ,
-.Xr curses_insertch 3 ,
-.Xr curses_standout 3 ,
-.Xr curses_underscore 3
-.Sh NOTES
-The
-.Fa opt
-argument is not currently used but is reserved for a future version of the
-specification.
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Pp
-The
-.Fn getattrs
-function
-is a
-.Nx
-extension.
-.Sh HISTORY
-These functions first appeared in
-.Nx 1.5 .
-.Sh BUGS
-Some terminals do not support characters with both color and other attributes
-set.
-In this case, the other attribute is displayed instead of the color attribute.
diff --git a/lib/libcurses/curses_background.3 b/lib/libcurses/curses_background.3
deleted file mode 100644
index f07f6dbf2..000000000
--- a/lib/libcurses/curses_background.3
+++ /dev/null
@@ -1,124 +0,0 @@
-.\"	$NetBSD: curses_background.3,v 1.6 2008/04/30 13:10:51 martin Exp $
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Julian Coleman.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 15, 2006
-.Dt CURSES_BACKGROUND 3
-.Os
-.Sh NAME
-.Nm curses_background ,
-.Nm bkgd ,
-.Nm bkgdset ,
-.Nm getbkgd ,
-.Nm wbkgd ,
-.Nm wbkgdset
-.Nd curses attribute manipulation routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn bkgd chtype
-.Ft int
-.Fn bkgdset chtype
-.Ft chtype
-.Fn getbkgd "WINDOW *"
-.Ft int
-.Fn wbkgd chtype
-.Ft int
-.Fn wbkgdset chtype
-.Sh DESCRIPTION
-These functions manipulate the background attributes on
-.Dv stdscr
-or on the specified window.
-.Pp
-The function
-.Fn wbkgdset win ch
-sets the background attributes of the specified window
-.Fa win
-to
-.Fa ch .
-.Pp
-When the background attributes are set on a window, characters are added to
-the window with the logical
-.Em OR
-of the background attributes and the character's attributes.
-If both the background attribute and the character attribute contain color,
-the color of the character attribute is rendered.
-If the background attribute contains a non-space character, then this
-character is added where the foreground character is a space character.
-.Pp
-Note that subwindows created from
-.Fa win
-inherit the background attributes of
-.Fa win .
-.Pp
-The function
-.Fn wbkgd win ch
-sets the background attributes of the specified window
-.Fa win
-to
-.Fa ch
-and also sets the rendition of every character position on that window,
-as if the characters had been newly added to
-.Fa win .
-The rendition of characters on subwindows of
-.Fa win
-is also set to
-.Fa ch .
-.Pp
-The functions
-.Fn bkgdset ch
-and
-.Fn bkgd ch
-are equivalent to
-.Fn wbkgdset stdscr ch
-and
-.Fn wbkgd stdscr ch ,
-respectively.
-.Pp
-The function
-.Fn getbkgd win
-returns the background attributes for the window
-.Fa win .
-.Sh RETURN VALUES
-The functions
-.Fn wbkgdset
-and
-.Fn wbkgd
-return OK on success and ERR on failure.
-.Sh SEE ALSO
-.Xr curses_attributes 3 ,
-.Xr curses_color 3 ,
-.Xr curses_window 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-These functions first appeared in
-.Nx 1.6 .
diff --git a/lib/libcurses/curses_border.3 b/lib/libcurses/curses_border.3
deleted file mode 100644
index 25098e246..000000000
--- a/lib/libcurses/curses_border.3
+++ /dev/null
@@ -1,159 +0,0 @@
-.\"	$NetBSD: curses_border.3,v 1.4 2004/03/16 19:20:20 snj Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd August 12, 2002
-.Dt CURSES_BORDER 3
-.Os
-.Sh NAME
-.Nm curses_border ,
-.Nm border ,
-.Nm box ,
-.Nm wborder
-.Nd curses border drawing routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fo border
-.Fa "chtype ls"
-.Fa "chtype rs"
-.Fa "chtype ts"
-.Fa "chtype bs"
-.Fa "chtype tl"
-.Fa "chtype tr"
-.Fa "chtype bl"
-.Fa "chtype br"
-.Fc
-.Ft int
-.Fn box "WINDOW *win" "chtype vertical" "chtype horizontal"
-.Ft int
-.Fo wborder
-.Fa "WINDOW *win"
-.Fa "chtype ls"
-.Fa "chtype rs"
-.Fa "chtype ts"
-.Fa "chtype bs"
-.Fa "chtype tl"
-.Fa "chtype tr"
-.Fa "chtype bl"
-.Fa "chtype br"
-.Fc
-.Sh DESCRIPTION
-These functions draw borders around
-.Dv stdscr
-or around the specified window.
-.Pp
-The
-.Fn border
-function draws a border around
-.Dv stdscr
-using the characters given as arguments to the function.
-The
-.Fa ls ,
-.Fa rs ,
-.Fa ts
-and
-.Fa bs
-are the characters used to draw the left, right, top and bottom sides,
-respectively.
-The
-.Fa tl ,
-.Fa tr ,
-.Fa bl
-and
-.Fa br
-are the characters used to draw the top-left, top-right, bottom-left
-and bottom-right corners, respectively.
-If any of the characters have a text portion that is 0 then a default
-alternate character set character is used for that character.
-Note that even though the text portion of the argument is 0, the argument
-can still be used to specify the attributes for that portion of the border.
-The following table shows the default characters for each argument:
-.Pp
-.Bl -column "ls" -offset indent
-.It ls	ACS_VLINE
-.It rs	ACS_VLINE
-.It ts	ACS_HLINE
-.It bs	ACS_HLINE
-.It tl	ACS_ULCORNER
-.It tr	ACS_URCORNER
-.It bl	ACS_LLCORNER
-.It br	ACS_LRCORNER
-.El
-.Pp
-.Fn wborder
-is the same as
-.Fn border
-excepting that the border is drawn around the specified window.
-.Pp
-The
-.Fn box
-command draws a box around the window given in
-.Fa win
-using the
-.Fa vertical
-character for the vertical lines and the
-.Fa horizontal
-character for the horizontal lines.
-The corner characters of this box will be the defaults as described for
-.Fn border
-above.
-Passing characters with text portion that is 0 to
-.Fn box
-will result in the same defaults as those for
-.Fn border
-as described above.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_attributes 3 ,
-.Xr curses_line 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_chgat.3 b/lib/libcurses/curses_chgat.3
deleted file mode 100644
index db726efc1..000000000
--- a/lib/libcurses/curses_chgat.3
+++ /dev/null
@@ -1,119 +0,0 @@
-.\" $NetBSD: curses_chgat.3,v 1.5 2011/02/10 08:54:12 blymn Exp $
-.\"
-.\" Copyright (c) 2009 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Joerg Sonnenberger.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd July 6, 2009
-.Dt CURSES_CHGAT 3
-.Os
-.Sh NAME
-.Nm chgat ,
-.Nm wchgat ,
-.Nm mvchgat ,
-.Nm mvwchgat
-.Nd curses on-screen attribute manipulation routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn chgat "int n" "attr_t attr" "short color" "const void *opts"
-.Ft int
-.Fn wchgat "WINDOW *win" "int n" "attr_t attr" "short color" \
-"const void *opts"
-.Ft int
-.Fn mvchgat "int y" "int x" "int n" "attr_t attr" "short color" \
-"const void *opts"
-.Ft int
-.Fn mvwchgat "WINDOW *win" "int y" "int x" "int n" "attr_t attr" \
-"short color" "const void *opts"
-.Sh DESCRIPTION
-These functions modify the attributes of the drawn content on stdscr or
-on the specified window.
-.Pp
-The
-.Fn chgat
-function sets the attributes of the next
-.Fa n
-characters to
-.Fa attr
-and the color pair to
-.Fa color .
-If
-.Fa n
-is negative or larger than the remainder of the line, it gets truncated.
-.Pp
-The
-.Fn wchgat
-is the same as the
-.Fn chgat
-function, excepting that the attributes are changed in the window specified by
-.Fa win .
-.Pp
-The
-.Fn mvchgat
-and
-.Fn mvwchgat
-functions are the same as the
-.Fn chgat
-and
-.Fn wchgat
-functions, respectively, excepting that they operate from the position
-specified by
-.Fa y ,
-.Fa x .
-.Pp
-These functions do not perform wrapping.
-They do not update the cursor position.
-.Sh RETURN VALUES
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_attributes 3
-.Sh STANDARDS
-The
-.Fn chgat ,
-.Fn wchgat ,
-.Fn mvchgat ,
-and
-.Fn mvwchgat
-functions conform to
-.St -xcurses4.2 .
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
-Support for the
-.Fn chgat
-family was added in
-.Nx 6.0 .
diff --git a/lib/libcurses/curses_clear.3 b/lib/libcurses/curses_clear.3
deleted file mode 100644
index 1a318b79f..000000000
--- a/lib/libcurses/curses_clear.3
+++ /dev/null
@@ -1,141 +0,0 @@
-.\"	$NetBSD: curses_clear.3,v 1.3 2003/04/16 13:35:00 wiz Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd August 12, 2002
-.Dt CURSES_CLEAR 3
-.Os
-.Sh NAME
-.Nm curses_clear ,
-.Nm clear ,
-.Nm wclear ,
-.Nm clearok ,
-.Nm clrtobot ,
-.Nm clrtoeol ,
-.Nm erase ,
-.Nm werase ,
-.Nm wclrtobot ,
-.Nm wclrtoeol
-.Nd curses clear window routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn clear "void"
-.Ft int
-.Fn clearok "WINDOW *win" "bool flag"
-.Ft int
-.Fn clrtobot "void"
-.Ft int
-.Fn clrtoeol "void"
-.Ft int
-.Fn erase "void"
-.Ft int
-.Fn wclear "WINDOW *win"
-.Ft int
-.Fn werase "WINDOW *win"
-.Ft int
-.Fn wclrtobot "WINDOW *win"
-.Ft int
-.Fn wclrtoeol "WINDOW *win"
-.Sh DESCRIPTION
-These functions clear all or part of
-.Dv stdscr
-or of the specified window.
-.Pp
-The
-.Fn clear
-and
-.Fn erase
-functions erase all characters on
-.Dv stdscr .
-.Fn wclear
-and
-.Fn werase
-perform the same function as
-.Fn clear
-and
-.Fn erase ,
-respectively, excepting that the specified window is cleared.
-.Pp
-By setting
-.Fa flag
-to
-.Dv TRUE ,
-the
-.Fn clearok
-function is used to force the next call to
-.Fn wrefresh
-to clear and completely redraw the window given in
-.Fa win .
-.Pp
-The function
-.Fn clrtobot
-will clear
-.Dv stdscr
-from the current row to the bottom of the screen.
-.Fn clrtoeol
-will clear
-.Dv stdscr
-from the current column position to the end of the line.
-.Fn wclrtobot
-and
-.Fn wclrtoeol
-are the same as
-.Fn clrtobot
-and
-.Fn clrtoeol ,
-respectively, excepting the window specified is operated on instead of
-.Dv stdscr .
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_refresh 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_color.3 b/lib/libcurses/curses_color.3
deleted file mode 100644
index 19b567ad7..000000000
--- a/lib/libcurses/curses_color.3
+++ /dev/null
@@ -1,232 +0,0 @@
-.\"	$NetBSD: curses_color.3,v 1.12 2009/07/22 16:57:14 roy Exp $
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Julian Coleman.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd July 20, 2009
-.Dt CURSES_COLOR 3
-.Os
-.Sh NAME
-.Nm curses_color ,
-.Nm has_colors ,
-.Nm can_change_color ,
-.Nm start_color ,
-.Nm init_pair ,
-.Nm pair_content ,
-.Nm COLOR_PAIR ,
-.Nm PAIR_NUMBER ,
-.Nm init_color ,
-.Nm color_content ,
-.Nm no_color_attributes
-.Nd curses color manipulation routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft bool
-.Fn has_colors void
-.Ft bool
-.Fn can_change_color void
-.Ft int
-.Fn start_color void
-.Ft int
-.Fn init_pair "short pair" "short fore" "short back"
-.Ft int
-.Fn pair_content "short pair" "short *fore" "short *back"
-.Ft int
-.Fn COLOR_PAIR "int n"
-.Ft int
-.Fn PAIR_NUMBER "int val"
-.Ft int
-.Fn init_color "short color" "short red" "short green" "short blue"
-.Ft int
-.Fn color_content "short color" "short *red" "short *green" "short *blue"
-.Ft attr_t
-.Fn no_color_attributes void
-.Pp
-.Va extern int COLOR_PAIRS ;
-.Pp
-.Va extern int COLORS ;
-.Sh DESCRIPTION
-These functions manipulate color on terminals that support color attributes.
-.Pp
-The function
-.Fn has_colors
-indicates whether a terminal is capable of displaying color attributes.
-It returns
-.Dv TRUE
-if the terminal is capable of displaying color attributes and
-.Dv FALSE
-otherwise.
-.Pp
-The function
-.Fn can_change_color
-indicates whether a terminal is capable of redefining colors.
-It returns
-.Dv TRUE
-if colors can be redefined and
-.Dv FALSE
-if they can not.
-.Pp
-The function
-.Fn start_color
-initializes the curses color support on a terminal.
-It must be called before any color manipulation functions are called on that
-terminal.
-The function initializes the eight basic colors (black, red, green, yellow,
-blue, magenta, cyan and white) that are specified using the color macros
-(such as
-.Dv COLOR_BLACK )
-defined in
-.Em \*[Lt]curses.h\*[Gt] .
-.Fn start_color
-also initializes the global external variables
-.Va COLORS
-and
-.Va COLOR_PAIRS .
-.Va COLORS
-defines the number of colors that the terminal supports and
-.Va COLOR_PAIRS
-defines the number of color-pairs that the terminal supports.
-These color-pairs are initialized to white foreground on black background.
-.Fn start_color
-sets the colors on the terminal to the curses defaults of white
-foreground on black background unless the functions
-.Fn assume_default_colors
-or
-.Fn use_default_colors
-have been called previously.
-.Pp
-The function
-.Fn init_pair pair fore back
-sets foreground color
-.Fa fore
-and background color
-.Fa back
-for color-pair number
-.Fa pair .
-The valid range for the color-pair
-.Fa pair
-is from 1 to
-.Va COLOR_PAIRS
-\&- 1
-and the valid range for the colors is any number less than
-.Va COLORS .
-Specifying a negative number will set that color to the default foreground
-or background color.
-The 8 initial colors are defined as:
-.Bl -tag -width "COLOR_MAGENTA" -compact -offset indent
-.It COLOR_BLACK
-.It COLOR_RED
-.It COLOR_GREEN
-.It COLOR_YELLOW
-.It COLOR_BLUE
-.It COLOR_MAGENTA
-.It COLOR_CYAN
-.It COLOR_WHITE
-.El
-Color-pair 0 is used as the default color pair, so changing this will
-have no effect.
-Use the function
-.Fn assume_default_colors
-to change the default colors.
-.Pp
-The function
-.Fn pair_content pair *fore *back
-stores the foreground and background color numbers of color-pair
-.Fa pair
-in the variables
-.Fa fore
-and
-.Fa back ,
-respectively.
-.Pp
-The macro
-.Fn COLOR_PAIR n
-gives the attribute value of color-pair number
-.Fa n .
-This is the value that is used to set the attribute of a character to this
-color-pair.
-For example,
-.Dl attrset(COLOR_PAIR(2))
-will display characters using color-pair 2.
-.Pp
-The macro
-.Fn PAIR_NUMBER val
-gives the color-pair number associated with the attribute value
-.Fa val .
-.Pp
-The function
-.Fn init_color color red green blue
-sets the red, green and blue intensity components of color
-.Fa color
-to the values
-.Fa red ,
-.Fa green
-and
-.Fa blue ,
-respectively.
-The minimum intensity value is 0 and the maximum intensity value is 1000.
-.Pp
-The function
-.Fn color_content color *red *green *blue
-stores the red, green and blue intensity components of color
-.Fa color
-in the variables
-.Fa red ,
-.Fa green ,
-and
-.Fa blue ,
-respectively.
-.Pp
-The function
-.Fn no_color_attributes
-returns those attributes that a terminal is unable to combine with color.
-.Sh RETURN VALUES
-The functions
-.Fn start_color ,
-.Fn init_pair ,
-.Fn pair_content ,
-.Fn init_color
-and
-.Fn color_content
-return OK on success and ERR on failure.
-.Sh SEE ALSO
-.Xr curses_attributes 3 ,
-.Xr curses_background 3 ,
-.Xr curses_default_colors 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Pp
-The function
-.Fn no_color_attributes
-and the use of negative color numbers
-are extensions to the X/Open Curses specification.
-.Sh HISTORY
-These functions first appeared in
-.Nx 1.5 .
diff --git a/lib/libcurses/curses_cursor.3 b/lib/libcurses/curses_cursor.3
deleted file mode 100644
index dd15d8c39..000000000
--- a/lib/libcurses/curses_cursor.3
+++ /dev/null
@@ -1,223 +0,0 @@
-.\"	$NetBSD: curses_cursor.3,v 1.7 2010/02/24 13:02:13 drochner Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd February 23, 2010
-.Dt CURSES 3
-.Os
-.Sh NAME
-.Nm curses_cursor ,
-.Nm getcury ,
-.Nm getcurx ,
-.Nm getyx ,
-.Nm getbegy ,
-.Nm getbegx ,
-.Nm getbegyx ,
-.Nm getmaxy ,
-.Nm getmaxx ,
-.Nm getmaxyx ,
-.Nm getpary ,
-.Nm getparx ,
-.Nm getparyx ,
-.Nm move ,
-.Nm wmove ,
-.Nm mvcur ,
-.Nm wcursyncup
-.Nd curses cursor and window location and positioning routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn getcury "WINDOW *win"
-.Ft int
-.Fn getcurx "WINDOW *win"
-.Ft void
-.Fn getyx "WINDOW *win" "int y" "int x"
-.Ft int
-.Fn getbegy "WINDOW *win"
-.Ft int
-.Fn getbegx "WINDOW *win"
-.Ft void
-.Fn getbegyx "WINDOW *win" "int y" "int x"
-.Ft int
-.Fn getmaxy "WINDOW *win"
-.Ft int
-.Fn getmaxx "WINDOW *win"
-.Ft void
-.Fn getmaxyx "WINDOW *win" "int y" "int x"
-.Ft int
-.Fn getpary "WINDOW *win"
-.Ft int
-.Fn getparx "WINDOW *win"
-.Ft void
-.Fn getparyx "WINDOW *win" "int y" "int x"
-.Ft int
-.Fn move "int y" "int x"
-.Ft int
-.Fn wmove "WINDOW *win" "int y" "int x"
-.Ft int
-.Fn mvcur "int oldy" "int oldx" "int y" "int x"
-.Ft void
-.Fn wcursyncup "WINDOW *win"
-.Sh DESCRIPTION
-These functions and macros locate and position cursors and windows.
-.Pp
-The
-.Fn getcury
-and
-.Fn getcurx
-functions get the current row and column positions, respectively, of the cursor in
-the window
-.Fa win .
-The
-.Fn getyx
-macro sets the values of
-.Fa y
-and
-.Fa x
-to the current row and column positions of the cursor in the window
-.Fa win .
-.Pp
-The origin row and columns of a window
-.Fa win
-can be
-determined by calling the
-.Fn getbegy
-and
-.Fn getbegx
-functions, respectively, and the maximum row and column for the window can be
-found by calling the functions
-.Fn getmaxy
-and
-.Fn getmaxx ,
-respectively.
-The
-.Fn getbegyx
-and
-.Fn getmaxyx
-macros set the values of
-.Fa y
-and
-.Fa x
-to the origin and maximum row and column positions, respectively, for the window
-.Fa win .
-.Pp
-The
-.Fn getpary
-and
-.Fn getparx
-functions return the row and column position of the given subwindow relative to
-the window's parent.
-The macro
-.Fn getparyx
-sets the values of
-.Fa y
-and
-.Fa x
-to the origin of the subwindow relative to the window's parent.
-.Pp
-The
-.Fn move
-function positions the cursor on the current window at the position given by
-.Fa y ,
-.Fa x .
-The cursor position is not changed on the screen until the next
-.Fn refresh .
-.Pp
-The
-.Fn wmove
-function is the same as the
-.Fn move
-function, excepting that the cursor is moved in the window specified by
-.Fa win .
-.Pp
-The function
-.Fn mvcur
-moves the cursor to
-.Fa y ,
-.Fa x
-on the screen.
-The arguments
-.Fa oldy ,
-.Fa oldx
-define the previous cursor position for terminals that do not support
-absolute cursor motions.
-The curses library may optimise the cursor motion based on these values.
-If the
-.Fn mvcur
-succeeds then the curses internal structures are updated with the new
-position of the cursor.
-If the destination arguments for
-.Fn mvcur
-exceed the terminal bounds an error will be returned and the cursor
-position will be unchanged.
-.Pp
-The
-.Fn wcursyncup
-function sets the cursor positions of all ancestors of
-.Fa win
-to that of
-.Fa win .
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_refresh 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of
-the Single Unix Specification.
-The
-.Fn getbegx ,
-.Fn getbegy ,
-.Fn getcurx ,
-.Fn getcury ,
-.Fn getmaxx ,
-.Fn getmaxy ,
-.Fn getparx ,
-and
-.Fn getpary
-functions are extensions.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_default_colors.3 b/lib/libcurses/curses_default_colors.3
deleted file mode 100644
index 2efd8c3fb..000000000
--- a/lib/libcurses/curses_default_colors.3
+++ /dev/null
@@ -1,73 +0,0 @@
-.\"	$NetBSD: curses_default_colors.3,v 1.6 2008/04/30 13:10:51 martin Exp $
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Julian Coleman.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd October 13, 2002
-.Dt CURSES_DEFAULT_COLORS 3
-.Os
-.Sh NAME
-.Nm curses_default_colors ,
-.Nm assume_default_colors ,
-.Nm use_default_colors
-.Nd curses default colors setting routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn assume_default_colors "short fore" "short back"
-.Ft int
-.Fn use_default_colors ""
-.Sh DESCRIPTION
-These functions tell the curses library to set the default colors or to use
-the terminal's default colors instead of using the default colors for curses
-applications (which are white foreground on black background).
-.Pp
-The function
-.Fn assume_default_colors fore back
-sets the default colors to foreground color
-.Fa fore
-and background color
-.Fa back .
-If a value of \-1 is used for a color, then the terminal default color is used
-for that color.
-.Pp
-The function
-.Fn use_default_colors
-sets both the foreground and background colors to the terminal default colors.
-This is equivalent to
-.Fn assume_default_colors \-1 \-1 .
-.Sh RETURN VALUES
-These functions return OK on success and ERR on failure.
-.Sh SEE ALSO
-.Xr curses_color 3
-.Sh STANDARDS
-These functions are based on
-.Em ncurses
-extensions to the curses standards.
-.Sh HISTORY
-These functions first appeared in
-.Nx 2.0 .
diff --git a/lib/libcurses/curses_delch.3 b/lib/libcurses/curses_delch.3
deleted file mode 100644
index 5768a4fe5..000000000
--- a/lib/libcurses/curses_delch.3
+++ /dev/null
@@ -1,90 +0,0 @@
-.\"	$NetBSD: curses_delch.3,v 1.3 2003/04/16 13:35:01 wiz Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd August 12, 2002
-.Dt CURSES_DELCH 3
-.Os
-.Sh NAME
-.Nm curses_delch ,
-.Nm delch ,
-.Nm wdelch
-.Nd curses delete characters routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn delch "void"
-.Ft int
-.Fn wdelch "WINDOW *win"
-.Sh DESCRIPTION
-These functions delete characters from
-.Dv stdscr
-or from the specified window.
-.Pp
-The
-.Fn delch
-function deletes the character at the current cursor position on
-.Dv stdscr .
-Characters to the right of the deleted character are moved one position
-to the left.
-The cursor position is unchanged.
-.Pp
-The
-.Fn wdelch
-function is the same as the
-.Fn delch
-function, excepting that the character is deleted from the specified window.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_addch 3 ,
-.Xr curses_insertch 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_deleteln.3 b/lib/libcurses/curses_deleteln.3
deleted file mode 100644
index c0324be15..000000000
--- a/lib/libcurses/curses_deleteln.3
+++ /dev/null
@@ -1,110 +0,0 @@
-.\"	$NetBSD: curses_deleteln.3,v 1.4 2003/04/16 13:35:01 wiz Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd August 12, 2002
-.Dt CURSES_DELETELN 3
-.Os
-.Sh NAME
-.Nm curses_deleteln ,
-.Nm deleteln ,
-.Nm wdeleteln
-.Nd curses delete single line routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn deleteln "void"
-.Ft int
-.Fn wdeleteln "WINDOW *win"
-.Sh DESCRIPTION
-These functions delete a single line from
-.Dv stdscr
-or from the specified window.
-.Pp
-The
-.Fn deleteln
-function deletes the screen line containing the cursor in the
-.Dv stdscr .
-The
-.Fn wdeleteln
-function is the same as the
-.Fn deleteln
-function, excepting that the line is deleted from the window specified by
-.Fa win .
-.Pp
-All lines following the deleted line are moved up one line toward the cursor.
-The last line of the window is cleared.
-The cursor position is unchanged.
-.Pp
-If a scrolling region has been set with the
-.Fn setscrreg
-or
-.Fn wsetscrreg
-functions and the current cursor position is inside the scrolling region,
-then only the lines from the current line to the bottom of the scrolling
-region are moved up and the bottom line of the scrolling region cleared.
-.Pp
-The functions
-.Fn deleteln
-and
-.Fn wdeleteln win
-are equivalent to
-.Fn winsdelln stdscr \-1
-and
-.Fn winsdelln win \-1
-respectively.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_insdelln 3 ,
-.Xr curses_insertln 3 ,
-.Xr curses_scroll 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_echochar.3 b/lib/libcurses/curses_echochar.3
deleted file mode 100644
index d2f8d4f87..000000000
--- a/lib/libcurses/curses_echochar.3
+++ /dev/null
@@ -1,123 +0,0 @@
-.\"	$NetBSD: curses_echochar.3,v 1.3 2008/04/30 13:10:51 martin Exp $
-.\" Copyright (c) 2004 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Julian Coleman.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd March 27, 2004
-.Dt CURSES_ECHOCHAR 3
-.Os
-.Sh NAME
-.Nm curses_echochar ,
-.Nm echochar ,
-.Nm wechochar ,
-.Nm pechochar
-.Nd curses add characters and then refresh routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn echochar "const chtype ch"
-.Ft int
-.Fn wechochar "WINDOW *win" "const chtype ch"
-.Ft int
-.Fn pechochar "WINDOW *pad" "const chtype ch"
-.Sh DESCRIPTION
-These functions add characters to
-.Dv stdscr
-or to the specified window or pad and then cause an immediate
-.Fn refresh
-of that window or pad.
-.Pp
-The
-.Fn echochar
-function adds the character given in
-.Fa ch
-to
-.Dv stdscr
-at the current cursor position and advances the current cursor position by one.
-Any character attributes set in
-.Fa ch
-will be merged with the background attributes currently set on
-.Dv stdscr .
-.Dv stdscr
-is then refreshed.
-Calling
-.Fn echochar
-is equivalent to calling
-.Fn addch
-followed by
-.Fn refresh .
-.Pp
-The
-.Fn wechochar
-function is the same as the
-.Fn echochar
-function, excepting that the character is added to the window specified by
-.Fa win
-and
-.Fa win
-is refreshed.
-.Pp
-The
-.Fn pechochar
-function is the similar to the
-.Fn echochar
-function, excepting that the character is added to the pad specified by
-.Fa pad
-and
-.Fa pad
-is refreshed at its previous location on the screen.
-Calling
-.Fn pechochar
-is equivalent to calling
-.Fn addch
-followed by
-.Fn prefresh .
-.Sh RETURN VALUES
-These functions will return one of the following values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_addch 3 ,
-.Xr curses_attributes 3 ,
-.Xr curses_pad 3 ,
-.Xr curses_refresh 3
-.Sh STANDARDS
-The
-.Fn echochar ,
-.Fn wechochar ,
-and
-.Fn pechochar
-functions comply with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_fileio.3 b/lib/libcurses/curses_fileio.3
deleted file mode 100644
index f85c248d6..000000000
--- a/lib/libcurses/curses_fileio.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\"	$NetBSD: curses_fileio.3,v 1.4 2010/12/09 11:21:49 njoly Exp $
-.\" Copyright (c) 2008 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Julian Coleman.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd March 31, 2008
-.Dt CURSES_FILEIO 3
-.Os
-.Sh NAME
-.Nm curses_fileio ,
-.Nm getwin ,
-.Nm putwin
-.Nd curses file input/output routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft WINDOW *
-.Fn getwin "FILE *fp"
-.Ft int
-.Fn putwin "WINDOW *win" "FILE *fp"
-.Sh DESCRIPTION
-These functions read and write data to and from files.
-.Pp
-The
-.Fn getwin
-function reads window data that has been stored in the file to which
-.Fa fp
-points, and then creates a new window using that data.
-.Pp
-The
-.Fn putwin
-function writes window data from the window
-.Fa win
-to the file pointed to by
-.Fa fp .
-.Sh RETURN VALUES
-The
-.Fn getwin
-function returns one of the following values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Pp
-The
-.Fn putwin
-function returns
-.Dv NULL
-if an error is detected.
-.Sh SEE ALSO
-.Xr curses_window 3 ,
-.Xr fread 3 ,
-.Xr fwrite 3
-.Sh NOTES
-Subwindows can not be created by the
-.Fn getwin
-function, nor written by the
-.Fn putwin
-function.
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-These functions first appeared in
-.Nx 5.0 .
diff --git a/lib/libcurses/curses_inch.3 b/lib/libcurses/curses_inch.3
deleted file mode 100644
index e66d558cb..000000000
--- a/lib/libcurses/curses_inch.3
+++ /dev/null
@@ -1,264 +0,0 @@
-.\"	$NetBSD: curses_inch.3,v 1.12 2011/08/07 11:37:06 wiz Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd August 7, 2011
-.Dt CURSES_INCH 3
-.Os
-.Sh NAME
-.Nm curses_inch ,
-.Nm inch ,
-.Nm winch ,
-.Nm inchnstr ,
-.Nm mvinchnstr ,
-.Nm winchnstr ,
-.Nm mvwinchnstr ,
-.Nm inchstr ,
-.Nm mvinchstr ,
-.Nm winchstr ,
-.Nm mvwinchstr ,
-.Nm innstr ,
-.Nm winnstr ,
-.Nm mvinnstr ,
-.Nm mvwinnstr ,
-.Nm instr ,
-.Nm winstr
-.Nm mvinstr ,
-.Nm mvwinstr
-.Nd curses read screen contents routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft chtype
-.Fn inch "void"
-.Ft chtype
-.Fn winch "WINDOW *win"
-.Ft int
-.Fn inchnstr "chtype *chars" "int n"
-.Ft int
-.Fn mvinchnstr "int y" "int x" "chtype *chstr" "int n"
-.Ft int
-.Fn winchnstr "WINDOW *win" "chtype *chars" "int n"
-.Ft int
-.Fn mvwinchnstr "WINDOW *win" "int y" "int x" "chtype *chstr" "int n"
-.Ft int
-.Fn inchstr "chtype *chars"
-.Ft int
-.Fn mvinchstr "int y" "int x" "chtype *chstr"
-.Ft int
-.Fn winchstr "WINDOW *win" "chtype *chars"
-.Ft int
-.Ft mvwinchstr "WINDOW *win" "int y" "int x" "chtype *chstr"
-.Ft int
-.Fn innstr "char *str" "int n"
-.Ft int
-.Fn winnstr "WINDOW *win" "char *str" "int n"
-.Ft int
-.Fn mvinnstr "int y" "int x" "char *str" "int n"
-.Ft int
-.Fn mvwinnstr "WINDOW *win" "int y" "int x" "char *str" "int n"
-.Ft int
-.Fn instr "char *str"
-.Ft int
-.Fn winstr "WINDOW *win" "char *str"
-.Ft int
-.Fn mvinstr "int y" "int x" "char *str"
-.Ft int
-.Fn mvwinstr "WINDOW *win" "int y" "int x" "char *str"
-.Sh DESCRIPTION
-These functions read the contents of
-.Dv stdscr
-or of the specified window.
-.Pp
-The
-.Fn inch
-function returns the character that is displayed on
-.Dv stdscr
-at the current cursor position.
-.Pp
-The
-.Fn winch
-function is the same as the
-.Fn inch
-function, excepting that the character is read from window specified by
-.Fa win .
-.Pp
-The
-.Fn inchnstr
-function fills an array of
-.Ft chtype
-with characters read from
-.Dv stdscr ,
-the characters are read starting from the current cursor position and
-continuing until either n \- 1 characters are read or the right hand
-side of the screen is reached.
-The resulting character array will be
-.Dv NULL
-terminated.
-.Pp
-The
-.Fn winchnstr
-function is the same as
-.Fn inchnstr
-excepting that the characters are read from the window specified by
-.Fa win .
-.Pp
-The
-.Fn inchstr
-and
-.Fn winchstr
-functions are the same as the
-.Fn inchnstr
-and
-.Fn winchnstr
-functions, respectively, excepting that they do not limit the number
-of characters read.
-The characters returned are those from the current starting position to
-the right hand side of the screen.
-The use of
-.Fn inchstr
-and
-.Fn winchstr
-is not recommended as the character buffer can be overflowed.
-.Pp
-The
-.Fn innstr
-function
-is similar to the
-.Fn inchstr
-function, excepting that the array of characters returned is stripped of all
-the curses attributes making it a plain character string.
-.Pp
-The
-.Fn mvinchstr ,
-.Fn mvinchnstr ,
-.Fn mvwinchstr ,
-and
-.Fn mvwinchnstr
-functions are the same as the
-.Fn inchstr ,
-.Fn inchnstr ,
-.Fn winchstr ,
-and
-.Fn winchstr
-functions, respectively, except that
-.Fn wmove
-is called to move the cursor to the position specified by
-.Fa y ,
-.Fa x
-before the output is printed on the window.
-Likewise, the
-.Fn mvinstr ,
-.Fn mvinnstr ,
-.Fn mvwinstr ,
-and
-.Fn mvwinnstr
-functions are the same as the
-.Fn instr ,
-.Fn innstr ,
-.Fn winstr ,
-and
-.Fn winstr
-functions, respectively, except that
-.Fn wmove
-is called to move the cursor to the position specified by
-.Fa y ,
-.Fa x
-before the output is printed on the window.
-.Pp
-The
-.Fn winnstr
-function is the same as the
-.Fn innstr
-function, excepting that characters are read from the window specified by
-.Fa win .
-.Pp
-The
-.Fn instr
-and
-.Fn winstr
-functions
-are the same as the
-.Fn innstr
-and
-.Fn winnstr
-functions, respectively, excepting that there are no limits placed on the
-size of the returned string, which may cause buffer overflows.
-For this reason, the use of
-.Fn instr
-and
-.Fn winstr
-is not recommended.
-.Sh RETURN VALUES
-If the calls
-.Fn innstr ,
-.Fn mvinnstr ,
-.Fn mvwinnstr ,
-and
-.Fn winnstr
-succeed then they will return the number of characters actually read.
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_addch 3 ,
-.Xr curses_addstr 3 ,
-.Xr curses_attributes 3 ,
-.Xr curses_insertch 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part
-of the Single Unix Specification.
-.Sh NOTES
-The
-.Fn inchnstr
-and
-.Fn innstr
-function read at most n \- 1 characters from the screen so as to leave
-room for
-.Dv NULL
-termination.
-The X/Open specification is unclear as to whether or not this is the correct
-behaviour.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_input.3 b/lib/libcurses/curses_input.3
deleted file mode 100644
index d6ea58e79..000000000
--- a/lib/libcurses/curses_input.3
+++ /dev/null
@@ -1,584 +0,0 @@
-.\"	$NetBSD: curses_input.3,v 1.22 2012/04/21 12:27:28 roy Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd April 5, 2012
-.Dt CURSES_INPUT 3
-.Os
-.Sh NAME
-.Nm curses_input ,
-.Nm getch ,
-.Nm wgetch ,
-.Nm mvgetch ,
-.Nm mvwgetch ,
-.Nm define_key ,
-.Nm keyok ,
-.Nm getnstr ,
-.Nm wgetnstr ,
-.Nm mvgetnstr ,
-.Nm mvwgetnstr ,
-.Nm getstr ,
-.Nm wgetstr ,
-.Nm mvgetstr ,
-.Nm mvwgetstr ,
-.Nm keypad ,
-.Nm notimeout ,
-.Nm timeout ,
-.Nm wtimeout ,
-.Nm nodelay ,
-.Nm ungetch
-.Nd curses input stream routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn getch "void"
-.Ft int
-.Fn wgetch "WINDOW *win"
-.Ft int
-.Fn mvgetch "int y" "int x"
-.Ft int
-.Fn mvwgetch "WINDOW *win" "int y" "int x"
-.Ft int
-.Fn keyok "int key_symbol" "bool flag"
-.Ft int
-.Fn define_key "char *sequence" "int key_symbol"
-.Ft int
-.Fn getnstr "char *str" "int limit"
-.Ft int
-.Fn wgetnstr "WINDOW *win" "char *str" "int limit"
-.Ft int
-.Fn mvgetnstr "int y" "int x" "char *str" "int limit"
-.Ft int
-.Fn mvwgetnstr "WINDOW *win" "int y" "int x" "char *str" "int limit"
-.Ft int
-.Fn getstr "char *str"
-.Ft int
-.Fn wgetstr "WINDOW *win" "char *str"
-.Ft int
-.Fn mvgetstr "int y" "int x" "char *str"
-.Ft int
-.Fn mvwgetstr "WINDOW *win" "int y" "int x" "char *str"
-.Ft int
-.Fn keypad "WINDOW *win" "boolf flag"
-.Ft int
-.Fn notimeout "WINDOW *win" "boolf flag"
-.Ft int
-.Fn timeout "int delay"
-.Ft int
-.Fn wtimeout "WINDOW *win" "int delay"
-.Ft int
-.Fn nodelay "WINDOW *win" "boolf flag"
-.Ft int
-.Fn ungetch "int c"
-.Pp
-.Va extern int ESCDELAY ;
-.Sh DESCRIPTION
-These functions read characters and strings from the window input file
-descriptor.
-.Pp
-The
-.Fn getch
-function reads a character from the
-.Dv stdscr
-input file descriptor and returns it.
-If the
-.Fn keypad
-flag has been set to
-.Dv TRUE ,
-then
-.Fn getch
-will assemble multi-character key sequences into key symbols,
-If the terminal is resized,
-.Fn getch
-will return
-.Dv KEY_RESIZE ,
-regardless of the setting of
-.Fn keypad .
-Calling
-.Fn getch
-will cause an implicit
-.Fn refresh
-on
-.Dv stdscr .
-.Pp
-The
-.Fn wgetch
-function is the same as the
-.Fn getch
-function, excepting that it reads from the input file descriptor associated
-with the window specified by
-.Fa win .
-.Pp
-If the
-.Fn keypad
-flag is
-.Dv TRUE
-then the assembly of specific key symbols can be disabled by using the
-.Fn keyok
-function.
-If the
-.Fa flag
-is set to
-.Dv FALSE
-on a key symbol then
-.Fn getch
-will behave as if the character sequence associated with that key symbol
-was not recognised and will return the component characters one at a time to
-the caller.
-.Pp
-Custom associations between sequences of characters and a key symbol can
-be made by using the
-.Fn define_key
-function.
-Normally, these associations are made by the information in the
-.Xr terminfo 5
-database but the
-.Fn define_key
-function gives the capability to remove or add more associations.
-If
-.Fn define_key
-is passed a non-NULL string in
-.Fa sequence
-it will associate that sequence with the key symbol passed in
-.Fa key_symbol .
-The key symbol may be one of the ones listed below or a custom value that
-is application defined.
-It is valid to have multiple character sequences map to the same key
-symbol and there are no constraints on the length of the sequence allowed.
-The assembly of custom sequences follow the same rules for inter-character
-timing and so forth as the
-.Xr terminfo 5
-derived ones.
-If
-.Fn define_key
-is passed a NULL in
-.Fa sequence
-then all associations for the key symbol in
-.Fa key_symbol
-will be deleted, this includes any associations that were derived from
-.Xr terminfo 5 .
-.Pp
-The
-.Fn mvgetch
-and
-.Fn mvwgetch
-functions are the same as the
-.Fn getch
-and
-.Fn wgetch
-functions, respectively, excepting that
-.Fn wmove
-is called to move the cursor to the position specified by
-.Fa y ,
-.Fa x
-before the character is read.
-.Pp
-Calling
-.Fn getnstr ,
-.Fn wgetnstr ,
-.Fn mvgetnstr
-or
-.Fn mvwgetnstr
-is effectively the same as calling
-.Fn getch
-repeatedly until a newline is received or the character limit
-.Fa limit
-is reached.
-Once this happens the string is
-.Dv NULL
-terminated and returned in
-.Fa str .
-During input, the normal curses input key processing is performed and
-affects the input buffer.
-The
-.Fn mvgetnstr
-function calls
-.Fn wmove
-to move the cursor to the position given by
-.Fa y ,
-.Fa x
-before getting the string,
-.Fn wgetnstr
-reads the input from the designated window,
-.Fn mvwgetnstr
-moves the cursor to the position given by
-.Fa y ,
-.Fa x
-before getting the input from the designated window.
-.Pp
-The functions
-.Fn getstr ,
-.Fn wgetstr ,
-.Fn mvgetstr ,
-and
-.Fn mvwgetstr
-are similar to
-.Fn getnstr ,
-.Fn wgetnstr ,
-.Fn mvgetnstr ,
-and
-.Fn mvwgetnstr ,
-respectively, excepting that there is no limit on the number of characters
-that may be inserted into
-.Fa str .
-This may cause the buffer to be overflowed, so their use is not recommended.
-.Pp
-The
-.Fn keypad
-function is used to affect how
-.Fn getch
-processes input characters.
-If
-.Fa flag
-is set to
-.Dv TRUE ,
-then
-.Fn getch
-will scan the input stream looking for multi-character key sequences
-that are emitted by some terminal function keys.
-If a recognised sequence of characters is found, then
-.Fn getch
-will collapse that sequence into an integer key symbol, as shown below.
-The default setting for the flag is
-.Dv FALSE .
-.Pp
-The
-.Fn notimeout
-function controls whether or not
-.Fn getch
-will wait indefinitely between characters in a multi-character key
-sequence or not.
-If
-.Fa flag
-is
-.Dv TRUE ,
-then there is no timeout applied between characters comprising a
-multi-character key sequence.
-If
-.Fa flag
-is
-.Dv FALSE ,
-then the component characters of a multi-character sequence must not
-have an inter-character gap of more than
-.Va ESCDELAY .
-If this timing is exceeded, then the multi-character key assembly is
-deemed to have failed and the characters read thus far are returned
-one at a time when
-.Fn getch
-is called.
-The default setting for the flag is
-.Dv FALSE .
-The default value of
-.Va ESCDELAY
-is 300ms.
-If
-.Va ESCDELAY
-is negative, no timeout is applied between characters comprising a
-multi-character key sequence.
-.Pp
-The
-.Fn timeout
-function affects the behaviour of
-.Fn getch
-when reading a character from
-.Dv stdscr .
-If
-.Fa delay
-is negative, then
-.Fn getch
-will block indefinitely on a read.
-If
-.Fa delay
-is 0, then
-.Fn getch
-will return immediately with
-.Dv ERR
-if there are no characters immediately available.
-If
-.Fa delay
-is a positive number, then
-.Fn getch
-will wait for that many milliseconds before returning and, if no character
-was available, then
-.Dv ERR
-will be returned.
-Note that for a positive number, the timeout is only accurate to the nearest
-tenth of a second.
-Also, the maximum value of
-.Fa delay
-is 25500 milliseconds.
-The
-.Fn wtimeout
-function does the same as
-.Fn timeout
-but applies to the specified window
-.Fa win .
-.Pp
-The
-.Fn nodelay
-function turns on and off blocking reads for
-.Fn getch .
-If
-.Fa flag
-is
-.Dv TRUE ,
-then
-.Fn getch
-will not block on reads, if
-.Fa flag
-is
-.Dv FALSE ,
-then reads will block.
-The default setting for the flag is
-.Dv FALSE .
-.Fn nodelay win TRUE
-is equivalent to
-.Fn wtimeout win 0
-and
-.Fn nodelay win FALSE
-is equivalent to
-.Fn wtimeout win \-1 .
-.Pp
-.Fn ungetch
-will convert
-.Fa c
-into an unsigned char and push that character back onto the input stream.
-Only one character of push-back is guaranteed to work, more may be possible
-depending on system resources.
-.Sh RETURN VALUES
-The functions
-.Fn getch ,
-.Fn wgetch ,
-.Fn mvgetch ,
-and
-.Fn mvwgetch
-will return the value of the key pressed or
-.Dv ERR
-in the case of an error or a timeout.
-Additionally, if
-.Fn keypad TRUE
-has been called on a window, then it may return one of the following values:
-.Pp
-.Bl -column "Termcap entry" "getch Return Value" "Key Function" -offset indent
-.It Sy "Termcap entry" Ta Sy "getch Return Value" Ta Sy "Key Function"
-.It \&!1 Ta KEY_SSAVE Ta Shift Save
-.It \&!2 Ta KEY_SSUSPEND Ta Shift Suspend
-.It \&!3 Ta KEY_SUNDO Ta Shift Undo
-.It \&#1 Ta KEY_SHELP Ta Shift Help
-.It \&#2 Ta KEY_SHOME Ta Shift Home
-.It \&#3 Ta KEY_SIC Ta Shift Insert Character
-.It \&#4 Ta KEY_SLEFT Ta Shift Left Arrow
-.It \&%0 Ta KEY_REDO Ta Redo
-.It \&%1 Ta KEY_HELP Ta Help
-.It \&%2 Ta KEY_MARK Ta Mark
-.It \&%3 Ta KEY_MESSAGE Ta Message
-.It \&%4 Ta KEY_MOVE Ta Move
-.It \&%5 Ta KEY_NEXT Ta Next Object
-.It \&%6 Ta KEY_OPEN Ta Open
-.It \&%7 Ta KEY_OPTIONS Ta Options
-.It \&%8 Ta KEY_PREVIOUS Ta Previous Object
-.It \&%9 Ta KEY_PRINT Ta Print
-.It \&%a Ta KEY_SMESSAGE Ta Shift Message
-.It \&%b Ta KEY_SMOVE Ta Shift Move
-.It \&%c Ta KEY_SNEXT Ta Shift Next Object
-.It \&%d Ta KEY_SOPTIONS Ta Shift Options
-.It \&%e Ta KEY_SPREVIOUS Ta Shift Previous Object
-.It \&%f Ta KEY_SPRINT Ta Shift Print
-.It \&%g Ta KEY_SREDO Ta Shift Redo
-.It \&%h Ta KEY_SREPLACE Ta Shift Replace
-.It \&%i Ta KEY_SRIGHT Ta Shift Right Arrow
-.It \&%j Ta KEY_SRSUME Ta Shift Resume
-.It \&\*[Am]0 Ta KEY_SCANCEL Ta Shift Cancel
-.It \&\*[Am]1 Ta KEY_REFERENCE Ta Reference
-.It \&\*[Am]2 Ta KEY_REFRESH Ta Refresh
-.It \&\*[Am]3 Ta KEY_REPLACE Ta Replace
-.It \&\*[Am]4 Ta KEY_RESTART Ta Restart
-.It \&\*[Am]5 Ta KEY_RESUME Ta Resume
-.It \&\*[Am]6 Ta KEY_SAVE Ta Save
-.It \&\*[Am]7 Ta KEY_SUSPEND Ta Suspend
-.It \&\*[Am]8 Ta KEY_UNDO Ta Undo
-.It \&\*[Am]9 Ta KEY_SBEG Ta Shift Begin
-.It \&*0 Ta KEY_SFIND Ta Shift Find
-.It \&*1 Ta KEY_SCOMMAND Ta Shift Command
-.It \&*2 Ta KEY_SCOPY Ta Shift Copy
-.It \&*3 Ta KEY_SCREATE Ta Shift Create
-.It \&*4 Ta KEY_SDC Ta Shift Delete Character
-.It \&*5 Ta KEY_SDL Ta Shift Delete Line
-.It \&*6 Ta KEY_SELECT Ta Select
-.It \&*7 Ta KEY_SEND Ta Shift End
-.It \&*8 Ta KEY_SEOL Ta Shift Clear to EOL
-.It \&*9 Ta KEY_SEXIT Ta Shift Exit
-.It \&@0 Ta KEY_FIND Ta Find
-.It \&@1 Ta KEY_BEG Ta Begin
-.It \&@2 Ta KEY_CANCEL Ta Cancel
-.It \&@3 Ta KEY_CLOSE Ta Close
-.It \&@4 Ta KEY_COMMAND Ta Command
-.It \&@5 Ta KEY_COPY Ta Copy
-.It \&@6 Ta KEY_CREATE Ta Create
-.It \&@7 Ta KEY_END Ta End
-.It \&@8 Ta KEY_ENTER Ta Enter
-.It \&@9 Ta KEY_EXIT Ta Exit
-.It \&F1 Ta KEY_F(11) Ta Function Key 11
-.It \&F2 Ta KEY_F(12) Ta Function Key 12
-.It \&F3 Ta KEY_F(13) Ta Function Key 13
-.It \&F4 Ta KEY_F(14) Ta Function Key 14
-.It \&F5 Ta KEY_F(15) Ta Function Key 15
-.It \&F6 Ta KEY_F(16) Ta Function Key 16
-.It \&F7 Ta KEY_F(17) Ta Function Key 17
-.It \&F8 Ta KEY_F(18) Ta Function Key 18
-.It \&F9 Ta KEY_F(19) Ta Function Key 19
-.It \&FA Ta KEY_F(20) Ta Function Key 20
-.It \&FB Ta KEY_F(21) Ta Function Key 21
-.It \&FC Ta KEY_F(22) Ta Function Key 22
-.It \&FD Ta KEY_F(23) Ta Function Key 23
-.It \&FE Ta KEY_F(24) Ta Function Key 24
-.It \&FF Ta KEY_F(25) Ta Function Key 25
-.It \&FG Ta KEY_F(26) Ta Function Key 26
-.It \&FH Ta KEY_F(27) Ta Function Key 27
-.It \&FI Ta KEY_F(28) Ta Function Key 28
-.It \&FJ Ta KEY_F(29) Ta Function Key 29
-.It \&FK Ta KEY_F(30) Ta Function Key 30
-.It \&FL Ta KEY_F(31) Ta Function Key 31
-.It \&FM Ta KEY_F(32) Ta Function Key 32
-.It \&FN Ta KEY_F(33) Ta Function Key 33
-.It \&FO Ta KEY_F(34) Ta Function Key 34
-.It \&FP Ta KEY_F(35) Ta Function Key 35
-.It \&FQ Ta KEY_F(36) Ta Function Key 36
-.It \&FR Ta KEY_F(37) Ta Function Key 37
-.It \&FS Ta KEY_F(38) Ta Function Key 38
-.It \&FT Ta KEY_F(39) Ta Function Key 39
-.It \&FU Ta KEY_F(40) Ta Function Key 40
-.It \&FV Ta KEY_F(41) Ta Function Key 41
-.It \&FW Ta KEY_F(42) Ta Function Key 42
-.It \&FX Ta KEY_F(43) Ta Function Key 43
-.It \&FY Ta KEY_F(44) Ta Function Key 44
-.It \&FZ Ta KEY_F(45) Ta Function Key 45
-.It \&Fa Ta KEY_F(46) Ta Function Key 46
-.It \&Fb Ta KEY_F(47) Ta Function Key 47
-.It \&Fc Ta KEY_F(48) Ta Function Key 48
-.It \&Fd Ta KEY_F(49) Ta Function Key 49
-.It \&Fe Ta KEY_F(50) Ta Function Key 50
-.It \&Ff Ta KEY_F(51) Ta Function Key 51
-.It \&Fg Ta KEY_F(52) Ta Function Key 52
-.It \&Fh Ta KEY_F(53) Ta Function Key 53
-.It \&Fi Ta KEY_F(54) Ta Function Key 54
-.It \&Fj Ta KEY_F(55) Ta Function Key 55
-.It \&Fk Ta KEY_F(56) Ta Function Key 56
-.It \&Fl Ta KEY_F(57) Ta Function Key 57
-.It \&Fm Ta KEY_F(58) Ta Function Key 58
-.It \&Fn Ta KEY_F(59) Ta Function Key 59
-.It \&Fo Ta KEY_F(60) Ta Function Key 60
-.It \&Fp Ta KEY_F(61) Ta Function Key 61
-.It \&Fq Ta KEY_F(62) Ta Function Key 62
-.It \&Fr Ta KEY_F(63) Ta Function Key 63
-.It \&K1 Ta KEY_A1 Ta Upper left key in keypad
-.It \&K2 Ta KEY_B2 Ta Centre key in keypad
-.It \&K3 Ta KEY_A3 Ta Upper right key in keypad
-.It \&K4 Ta KEY_C1 Ta Lower left key in keypad
-.It \&K5 Ta KEY_C3 Ta Lower right key in keypad
-.It \&Km Ta KEY_MOUSE Ta Mouse Event
-.It \&k0 Ta KEY_F0 Ta Function Key 0
-.It \&k1 Ta KEY_F(1) Ta Function Key 1
-.It \&k2 Ta KEY_F(2) Ta Function Key 2
-.It \&k3 Ta KEY_F(3) Ta Function Key 3
-.It \&k4 Ta KEY_F(4) Ta Function Key 4
-.It \&k5 Ta KEY_F(5) Ta Function Key 5
-.It \&k6 Ta KEY_F(6) Ta Function Key 6
-.It \&k7 Ta KEY_F(7) Ta Function Key 7
-.It \&k8 Ta KEY_F(8) Ta Function Key 8
-.It \&k9 Ta KEY_F(9) Ta Function Key 9
-.It \&k; Ta KEY_F(10) Ta Function Key 10
-.It \&kA Ta KEY_IL Ta Insert Line
-.It \&ka Ta KEY_CATAB Ta Clear All Tabs
-.It \&kB Ta KEY_BTAB Ta Back Tab
-.It \&kb Ta KEY_BACKSPACE Ta Backspace
-.It \&kC Ta KEY_CLEAR Ta Clear
-.It \&kD Ta KEY_DC Ta Delete Character
-.It \&kd Ta KEY_DOWN Ta Down Arrow
-.It \&kE Ta KEY_EOL Ta Clear to End Of Line
-.It \&kF Ta KEY_SF Ta Scroll Forward one line
-.It \&kH Ta KEY_LL Ta Home Down
-.It \&kh Ta KEY_HOME Ta Home
-.It \&kI Ta KEY_IC Ta Insert Character
-.It \&kL Ta KEY_DL Ta Delete Line
-.It \&kl Ta KEY_LEFT Ta Left Arrow
-.It \&kM Ta KEY_EIC Ta Exit Insert Character Mode
-.It \&kN Ta KEY_NPAGE Ta Next Page
-.It \&kP Ta KEY_PPAGE Ta Previous Page
-.It \&kR Ta KEY_SR Ta Scroll One Line Back
-.It \&kr Ta KEY_RIGHT Ta Right Arrow
-.It \&kS Ta KEY_EOS Ta Clear to End Of Screen
-.It \&kT Ta KEY_STAB Ta Set Tab
-.It \&kt Ta KEY_CTAB Ta Clear Tab
-.It \&ku Ta KEY_UP Ta Up Arrow
-.El
-.Pp
-Note that not all terminals are capable of generating all the keycodes
-listed above nor are terminfo entries normally configured with all the
-above capabilities defined.
-.Pp
-Other functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Pp
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-.Sh SEE ALSO
-.Xr curses_cursor 3 ,
-.Xr curses_keyname 3 ,
-.Xr curses_refresh 3 ,
-.Xr curses_tty 3 ,
-.Xr terminfo 5
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh NOTES
-The
-.Fn keyok
-and
-.Fn define_key
-functions are implementations of extensions made by the NCurses library
-to the Curses standard.
-Portable implementations should avoid the use of these functions.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_insdelln.3 b/lib/libcurses/curses_insdelln.3
deleted file mode 100644
index b590d125b..000000000
--- a/lib/libcurses/curses_insdelln.3
+++ /dev/null
@@ -1,115 +0,0 @@
-.\"	$NetBSD: curses_insdelln.3,v 1.3 2003/04/16 13:35:01 wiz Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd August 12, 2002
-.Dt CURSES_INSDEL 3
-.Os
-.Sh NAME
-.Nm curses_insdelln ,
-.Nm insdelln ,
-.Nm winsdelln
-.Nd curses insert or delete lines routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn insdelln "int n"
-.Ft int
-.Fn winsdelln "WINDOW *win" "int n"
-.Sh DESCRIPTION
-These functions insert or delete lines on
-.Dv stdscr
-or on the specified window.
-.Pp
-If
-.Fn insdelln
-is called with a positive number in
-.Fa n ,
-then the specified number of lines are inserted before the current line on
-.Dv stdscr .
-The last
-.Fa n
-lines of the screen are no longer displayed.
-If
-.Fa n
-is negative, then
-.Fa n
-lines are deleted from
-.Dv stdscr ,
-starting at the current line.
-The last
-.Fa n
-lines of
-.Dv stdscr
-are cleared.
-.Pp
-The
-.Fn winsdelln
-function is the same as the
-.Fn insdelln
-function, excepting that lines are inserted or deleted from the window
-specified by
-.Fa win .
-.Pp
-If a scrolling region has been set with the
-.Fn setscrreg
-or
-.Fn wsetscrreg
-functions and the current cursor position is inside the scrolling region,
-then only the lines from the current line to the bottom of the scrolling
-region are affected.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_deleteln 3 ,
-.Xr curses_insertln 3 ,
-.Xr curses_scroll 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of
-the Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_insertch.3 b/lib/libcurses/curses_insertch.3
deleted file mode 100644
index c5c13e712..000000000
--- a/lib/libcurses/curses_insertch.3
+++ /dev/null
@@ -1,113 +0,0 @@
-.\"	$NetBSD: curses_insertch.3,v 1.4 2006/02/05 17:07:13 jdc Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd February 5, 2006
-.Dt CURSES_INSERTCH 3
-.Os
-.Sh NAME
-.Nm curses_insert ,
-.Nm insch ,
-.Nm winsch ,
-.Nm mvinsch ,
-.Nm mvwinsch
-.Nd curses insert characters routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn insch "chtype ch"
-.Ft int
-.Fn winsch "WINDOW *win" "chtype ch"
-.Ft int
-.Fn mvinsch "int y" "int x" "chtype ch"
-.Ft int
-.Fn mvwinsch "WINDOW *win" "int y" "int x" "chtype ch"
-.Sh DESCRIPTION
-These functions insert characters on
-.Dv stdscr
-or on the specified window.
-.Pp
-The
-.Fn insch
-function inserts the character given in
-.Fa ch
-at the current cursor position on
-.Dv stdscr .
-The cursor is not advanced and wrapping is not performed.
-.Pp
-The
-.Fn winsch
-function is the same as the
-.Fn insch
-function, excepting that the character is inserted on the window specified by
-.Fa win .
-.Pp
-The
-.Fn mvinsch
-and
-.Fn mvwinsch
-functions are the same as the
-.Fn insch
-and
-.Fn insch
-functions, respectively, excepting that
-.Fn wmove
-is called to move the cursor to the position specified by
-.Fa y ,
-.Fa x
-before the character is inserted on the window.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_addch 3 ,
-.Xr curses_cursor 3 ,
-.Xr curses_delch 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of
-the Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_insertln.3 b/lib/libcurses/curses_insertln.3
deleted file mode 100644
index 6cd325e12..000000000
--- a/lib/libcurses/curses_insertln.3
+++ /dev/null
@@ -1,109 +0,0 @@
-.\"	$NetBSD: curses_insertln.3,v 1.4 2006/02/05 17:07:13 jdc Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd February 5, 2006
-.Dt CURSES_INSERTLN 3
-.Os
-.Sh NAME
-.Nm curses_insertln ,
-.Nm insertln ,
-.Nm winsertln
-.Nd curses insert single line routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn insertln "void"
-.Ft int
-.Fn winsertln "WINDOW *win"
-.Sh DESCRIPTION
-These functions insert a single line on
-.Dv stdscr
-or on the specified window.
-.Pp
-The
-.Fn insertln
-function inserts a blank line before the current line on
-.Dv stdscr .
-The current line and all lines below are moved down one line away from
-the cursor and the bottom line of the window is lost.
-.Pp
-The
-.Fn winsertln
-function is the same as the
-.Fn insertln
-function, excepting that the line is inserted on the window
-.Fa win .
-.Pp
-If a scrolling region has been set with the
-.Fn setscrreg
-or
-.Fn wsetscrreg
-functions and the current cursor position is inside the scrolling region,
-then only the lines from the current line to the bottom of the scrolling
-region are moved down and the bottom line of the scrolling region lost.
-.Pp
-The functions
-.Fn insertln
-and
-.Fn winsertln win
-are equivalent to
-.Fn insdelln 1
-and
-.Fn winsdelln win 1 ,
-respectively.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_deleteln 3 ,
-.Xr curses_insdelln 3 ,
-.Xr curses_scroll 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of
-the Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_keyname.3 b/lib/libcurses/curses_keyname.3
deleted file mode 100644
index bb0bda0d1..000000000
--- a/lib/libcurses/curses_keyname.3
+++ /dev/null
@@ -1,72 +0,0 @@
-.\"	$NetBSD: curses_keyname.3,v 1.5 2008/04/30 13:10:51 martin Exp $
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Julian Coleman.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd October 17, 2007
-.Dt CURSES_KEYNAME 3
-.Os
-.Sh NAME
-.Nm curses_keyname ,
-.Nm keyname
-.Nd curses report key name routine
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft "char *"
-.Fn keyname "int key"
-.Sh DESCRIPTION
-The function
-.Fn keyname
-generates a character string containing a description of the key specified in
-.Fa key .
-.Pp
-The string is formatted according to the following table:
-.Bl -column "Meta + control character" "KEY_MIN - KEY_MAX" "String format"
-.It "Description" Ta "Key range" Ta "String format"
-.It Li "Control character" Ta "0 - 31" Ta "^X"
-.It Li "Visible character" Ta "32 - 126" Ta "X"
-.It Li "Delete character" Ta "127" Ta "^?"
-.It Li "Meta + control character" Ta "128 - 158" Ta "M-^X"
-.It Li "Meta + visible character" Ta "159 - 254" Ta "M-X"
-.It Li "Meta + delete character" Ta "255" Ta "M-^?"
-.It Li "Named key" Ta "KEY_MIN - KEY_MAX" Ta "KEY_EXIT"
-.It Li "Unknown key" Ta "" Ta "-1"
-.El
-.Sh SEE ALSO
-.Xr curses_input 3
-.Sh NOTE
-The return value of
-.Fn keyname
-is a static buffer, which will be overwritten on a subsequent call.
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-These functions first appeared in
-.Nx 2.0 .
diff --git a/lib/libcurses/curses_line.3 b/lib/libcurses/curses_line.3
deleted file mode 100644
index 7da7b5318..000000000
--- a/lib/libcurses/curses_line.3
+++ /dev/null
@@ -1,171 +0,0 @@
-.\"	$NetBSD: curses_line.3,v 1.6 2010/02/20 10:23:04 wiz Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd February 19, 2010
-.Dt CURSES_LINE 3
-.Os
-.Sh NAME
-.Nm curses_line ,
-.Nm hline ,
-.Nm whline ,
-.Nm vline ,
-.Nm wvline ,
-.Nm mvhline ,
-.Nm mvwhline ,
-.Nm mvvline ,
-.Nm mvwvline
-.Nd curses draw lines on windows routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn hline "chtype ch" "int n"
-.Ft int
-.Fn whline "WINDOW *win" "chtype ch" "int n"
-.Ft int
-.Fn mvhline "int y" "int x" "chtype ch" "int n"
-.Ft int
-.Fn mvwvline "WINDOW *win" "int y" "int x" "chtype c" "int n"
-.Ft int
-.Fn vline "chtype c" "int n"
-.Ft int
-.Fn wvline "WINDOW *win" "chtype c" "int n"
-.Ft int
-.Fn mvvline "int y" "int x" "chtype ch" "int n"
-.Ft int
-.Fn mvwhline "WINDOW *win" "int y" "int x" "chtype c" "int n"
-.Sh DESCRIPTION
-These functions draw lines on
-.Dv stdscr
-or on the specified window.
-.Pp
-The
-.Fn hline
-function draws a horizontal line of the character
-.Fa ch
-on
-.Dv stdscr
-starting at the current cursor position and extending for
-.Fa n
-characters, or until the right hand side of
-.Dv stdscr
-is reached.
-If the text portion of
-.Fa ch
-is 0 then the line will be drawn with the
-.Dv ACS_HLINE
-character.
-.Pp
-The
-.Fn whline
-function is the same as the
-.Fn hline
-function, excepting that the line is drawn in the window specified by
-.Fa win .
-.Pp
-The
-.Fn vline
-function draws a vertical line of character
-.Fa ch
-on
-.Dv stdscr
-starting at the current cursor position and moving down until either
-.Fa n
-characters have been drawn or the bottom of
-.Dv stdscr
-is reached.
-If the text portion of
-.Fa ch
-is 0 then the line will be drawn with the
-.Dv ACS_VLINE
-character.
-.Pp
-The
-.Fn wvline
-function is the same as the
-.Fn vline
-function, excepting that the line is drawn on the given window.
-.Pp
-The
-.Fn mvhline ,
-.Fn mvwhline ,
-.Fn mvvline
-and
-.Fn mvwvline
-functions are the same as the
-.Fn hline ,
-.Fn whline ,
-.Fn vline
-and
-.Fn wvline
-functions, respectively, excepting that
-.Fn wmove
-is called to move the cursor to the position specified by
-.Fa y ,
-.Fa x
-before the line is drawn on the window.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_border 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of
-the Single Unix Specification.
-.Pp
-The use of
-.Dv ACS_HLINE
-and
-.Dv ACS_VLINE
-as default drawing character in
-.Fn hline
-and
-.Fn vline
-is a
-.Nx
-extension which should not be relied on in portable code.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_pad.3 b/lib/libcurses/curses_pad.3
deleted file mode 100644
index 00488b0a0..000000000
--- a/lib/libcurses/curses_pad.3
+++ /dev/null
@@ -1,142 +0,0 @@
-.\"	$NetBSD: curses_pad.3,v 1.4 2008/04/30 13:10:51 martin Exp $
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Julian Coleman.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd December 4, 2002
-.Dt CURSES_PAD 3
-.Os
-.Sh NAME
-.Nm curses_pad ,
-.Nm newpad ,
-.Nm subpad ,
-.Nm prefresh ,
-.Nm pnoutrefresh
-.Nd curses pad routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft WINDOW *
-.Fn newpad "int lines" "int cols"
-.Ft WINDOW *
-.Fn subpad "WINDOW *pad" "int lines" "int cols" "int begin_y" "int begin_x"
-.Ft int
-.Fn prefresh "WINDOW *pad" "int pbeg_y" "int pbeg_x" "int sbeg_y" "int sbeg_x" "int smax_y" "int smax_x"
-.Ft int
-.Fn pnoutrefresh "WINDOW *pad" "int pbeg_y" "int pbeg_x" "int sbeg_y" "int sbeg_x" "int smax_y" "int smax_x"
-.Sh DESCRIPTION
-These functions create and display pads on the current screen.
-.Pp
-The
-.Fn newpad
-function creates a new pad of size
-.Fa lines ,
-.Fa cols .
-.Pp
-.Fn subpad
-is similar to
-.Fn newpad
-excepting that the size of the subpad is bounded by the parent
-pad
-.Fa pad .
-The subpad shares internal data structures with the parent pad
-and will be refreshed when the parent pad is refreshed.
-The starting column and row
-.Fa begin_y ,
-.Fa begin_x
-are relative to the parent pad origin.
-.Pp
-The
-.Fn pnoutrefresh
-function performs the internal processing required by curses to determine
-what changes need to be made to synchronise the internal screen buffer
-and the terminal but does not modify the terminal display.
-A rectangular area of the pad starting at column and row
-.Fa pbeg_y ,
-.Fa pbeg_x
-is copied to the corresponding rectangular area of the screen buffer starting
-at column and row
-.Fa sbeg_y ,
-.Fa sbeg_x
-and extending to
-.Fa smax_y ,
-.Fa smax_x .
-.Pp
-The
-.Fn prefresh
-function causes curses to propagate changes made to the pad specified by
-.Fa pad
-to the terminal display.
-A rectangular area of the pad starting at column and row
-.Fa pbeg_y ,
-.Fa pbeg_x
-is copied to the corresponding rectangular area of the terminal starting
-at column and row
-.Fa sbeg_y ,
-.Fa sbeg_x
-and extending to
-.Fa smax_y ,
-.Fa smax_x .
-.Pp
-The
-.Fn pnoutrefresh
-and
-.Fn doupdate
-functions can be used together to speed up terminal redraws by
-deferring the actual terminal updates until after a batch of updates
-to multiple pads has been done.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_refresh 3 ,
-.Xr curses_window 3
-.Sh NOTES
-The
-.Fn subpad
-function is similar to the
-.Xr derwin 3
-function, and not the
-.Xr subwin 3
-function.
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_print.3 b/lib/libcurses/curses_print.3
deleted file mode 100644
index 7047693e5..000000000
--- a/lib/libcurses/curses_print.3
+++ /dev/null
@@ -1,125 +0,0 @@
-.\"	$NetBSD: curses_print.3,v 1.7 2011/04/06 08:38:43 jruoho Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd April 6, 2011
-.Dt CURSES_PRINT 3
-.Os
-.Sh NAME
-.Nm curses_print ,
-.Nm printw ,
-.Nm wprintw ,
-.Nm mvprintw ,
-.Nm mvwprintw ,
-.Nm unctrl
-.Nd curses print formatted strings on windows routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn printw "const char *fmt" "..."
-.Ft int
-.Fn wprintw "WINDOW *win" "const char *fmt" "..."
-.Ft int
-.Fn mvprintw "int y" "int x" "const char *fmt" "..."
-.Ft int
-.Fn mvwprintw "WINDOW *win" "int y" "int x" "const char *fmt" "..."
-.Ft char *
-.Fn unctrl "chtype ch"
-.Sh DESCRIPTION
-These functions print formatted strings on
-.Dv stdscr
-or on the specified window.
-.Pp
-The
-.Fn printw
-function formats and prints its arguments on
-.Dv stdscr .
-The behavior is deliberately similar to that of
-.Xr printf 3 ,
-but, notably, the return value differs.
-.Pp
-The
-.Fn wprintw
-function is the same as the
-.Fn printw
-function, excepting that the resulting output is printed on the window
-specified by
-.Fa win .
-.Pp
-The
-.Fn mvprintw
-and
-.Fn mvwprintw
-functions are the same as the
-.Fn printw
-and
-.Fn wprintw
-functions, respectively, excepting that
-.Fn wmove
-is called to move the cursor to the position specified by
-.Fa y ,
-.Fa x
-before the output is printed on the window.
-.Pp
-The
-.Fn unctrl
-function returns a printable string representation of the character
-.Fa ch .
-If
-.Fa ch
-is a control character then it will be converted to the form ^Y.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -offset indent
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_cursor 3 ,
-.Xr curses_scanw 3 ,
-.Xr printf 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_private.h b/lib/libcurses/curses_private.h
deleted file mode 100644
index 5716c61d0..000000000
--- a/lib/libcurses/curses_private.h
+++ /dev/null
@@ -1,366 +0,0 @@
-/*	$NetBSD: curses_private.h,v 1.50 2014/02/20 09:42:42 blymn Exp $	*/
-
-/*-
- * Copyright (c) 1998-2000 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software 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.
- *
- *
- */
-
-/* Modified by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@gmail.com>
- * to add support for wide characters
- * Changes:
- * - Add a compiler variable HAVE_WCHAR for wide character only code
- * - Add a pointer to liked list of non-spacing characters in __ldata
- *   and the macro to access the width field in the attribute field
- * - Add a circular input character buffer in __screen to handle
- *   wide-character input (used in get_wch())
- */
-
-#include <term.h>
-#include <termios.h>
-
-/* Private structure definitions for curses. */
-
-/* Termcap capabilities. */
-#ifdef HAVE_WCHAR
-/*
- * Add a list of non-spacing characters to each spacing
- * character in a singly linked list
- */
-typedef struct nschar_t {
-	wchar_t			ch;		/* Non-spacing character */
-	struct nschar_t	*next;	/* Next non-spacing character */
-} nschar_t;
-#endif /* HAVE_WCHAR */
-
-/*
- * A window is an array of __LINE structures pointed to by the 'lines' pointer.
- * A line is an array of __LDATA structures pointed to by the 'line' pointer.
- *
- * IMPORTANT: the __LDATA structure must NOT induce any padding, so if new
- * fields are added -- padding fields with *constant values* should ensure
- * that the compiler will not generate any padding when storing an array of
- *  __LDATA structures.  This is to enable consistent use of memcmp, and memcpy
- * for comparing and copying arrays.
- */
-
-struct __ldata {
-	wchar_t	ch;			/* Character */
-	attr_t	attr;			/* Attributes */
-#ifdef HAVE_WCHAR
-	nschar_t	*nsp;	/* Foreground non-spacing character pointer */
-#endif /* HAVE_WCHAR */
-};
-
-#ifdef HAVE_WCHAR
-/* macros to extract the width of a wide character */
-#define __WCWIDTH 0xfc000000
-#define WCW_SHIFT 26
-#define WCOL(wc) ((((unsigned) (wc).attr) >> WCW_SHIFT ) > MB_LEN_MAX ? ((int)(((unsigned) (wc).attr ) >> WCW_SHIFT )) - 64 : ((int)(((unsigned) (wc).attr ) >> WCW_SHIFT)))
-#define SET_WCOL(c, w) do { 						\
-	((c).attr) = ((((c).attr) & WA_ATTRIBUTES ) | ((w) << WCW_SHIFT )); \
-} while(/*CONSTCOND*/0)
-#define BGWCOL(wc) ((((wc).battr) >> WCW_SHIFT ) > MB_LEN_MAX ? (((wc).battr ) >> WCW_SHIFT ) - 64 : (((wc).battr ) >> WCW_SHIFT ))
-#define SET_BGWCOL(c, w) do { 						\
-	((c).battr) = ((((c).battr) & WA_ATTRIBUTES ) | ((w) << WCW_SHIFT )); \
-} while(/*CONSTCOND*/0)
-#endif /* HAVE_WCHAR */
-
-#define __LDATASIZE	(sizeof(__LDATA))
-
-struct __line {
-#ifdef DEBUG
-#define SENTINEL_VALUE 0xaac0ffee
-
-	unsigned int sentinel;          /* try to catch line overflows */
-#endif
-#define	__ISDIRTY	0x01		/* Line is dirty. */
-#define __ISPASTEOL	0x02		/* Cursor is past end of line */
-#define __ISFORCED	0x04		/* Force update, no optimisation */
-	unsigned int flags;
-	unsigned int hash;		/* Hash value for the line. */
-	int *firstchp, *lastchp;	/* First and last chngd columns ptrs */
-	int firstch, lastch;		/* First and last changed columns. */
-	__LDATA *line;			/* Pointer to the line text. */
-};
-
-struct __window {		/* Window structure. */
-	struct __window	*nextp, *orig;	/* Subwindows list and parent. */
-	int begy, begx;			/* Window home. */
-	int cury, curx;			/* Current x, y coordinates. */
-	int maxy, maxx;			/* Maximum values for curx, cury. */
-	int reqy, reqx;			/* Size requested when created */
-	int ch_off;			/* x offset for firstch/lastch. */
-	__LINE **alines;		/* Array of pointers to the lines */
-	__LINE  *lspace;		/* line space (for cleanup) */
-	__LDATA *wspace;		/* window space (for cleanup) */
-
-#define	__ENDLINE	0x00000001	/* End of screen. */
-#define	__FLUSH		0x00000002	/* Fflush(stdout) after refresh. */
-#define	__FULLWIN	0x00000004	/* Window is a screen. */
-#define	__IDLINE	0x00000008	/* Insert/delete sequences. */
-#define	__SCROLLWIN	0x00000010	/* Last char will scroll window. */
-#define	__SCROLLOK	0x00000020	/* Scrolling ok. */
-#define	__CLEAROK	0x00000040	/* Clear on next refresh. */
-#define	__LEAVEOK	0x00000100	/* If cursor left */
-#define	__KEYPAD	0x00010000	/* If interpreting keypad codes */
-#define	__NOTIMEOUT	0x00020000	/* Wait indefinitely for func keys */
-#define __IDCHAR	0x00040000	/* insert/delete char sequences */
-#define __ISPAD		0x00080000	/* "window" is a pad */
-#define __ISDERWIN	0x00100000	/* "window" is derived from parent */
-	unsigned int flags;
-	int	delay;			/* delay for getch() */
-	attr_t	wattr;			/* Character attributes */
-	wchar_t	bch;			/* Background character */
-	attr_t	battr;			/* Background attributes */
-	int	scr_t, scr_b;		/* Scrolling region top, bottom */
-	SCREEN	*screen;		/* Screen for this window */
-	int	pbegy, pbegx,
-		sbegy, sbegx,
-		smaxy, smaxx;		/* Saved prefresh() values */
-	int	dery, derx;		/* derived window coordinates
-					   - top left corner of source 
-					   relative to parent win */
-#ifdef HAVE_WCHAR
-	nschar_t *bnsp;			/* Background non-spacing char list */
-#endif /* HAVE_WCHAR */
-};
-
-/* Set of attributes unset by 'me' - 'mb', 'md', 'mh', 'mk', 'mp' and 'mr'. */
-#ifndef HAVE_WCHAR
-#define	__TERMATTR \
-	(__REVERSE | __BLINK | __DIM | __BOLD | __BLANK | __PROTECT)
-#else
-#define	__TERMATTR \
-	(__REVERSE | __BLINK | __DIM | __BOLD | __BLANK | __PROTECT \
-	| WA_TOP | WA_LOW | WA_LEFT | WA_RIGHT | WA_HORIZONTAL | WA_VERTICAL)
-#endif /* HAVE_WCHAR */
-
-struct __winlist {
-	struct __window		*winp;	/* The window. */
-	struct __winlist	*nextp;	/* Next window. */
-};
-
-struct __color {
-	short	num;
-	short	red;
-	short	green;
-	short	blue;
-	int	flags;
-};
-
-/* List of colour pairs */
-struct __pair {
-	short	fore;
-	short	back;
-	int	flags;
-};
-
-/* Maximum colours */
-#define	MAX_COLORS	64
-/* Maximum colour pairs - determined by number of colour bits in attr_t */
-#define	MAX_PAIRS	PAIR_NUMBER(__COLOR)
-
-typedef struct keymap keymap_t;
-
-/* this is the encapsulation of the terminal definition, one for
- * each terminal that curses talks to.
- */
-struct __screen {
-	FILE    *infd, *outfd;  /* input and output file descriptors */
-	WINDOW	*curscr;	/* Current screen. */
-	WINDOW	*stdscr;	/* Standard screen. */
-	WINDOW	*__virtscr;	/* Virtual screen (for doupdate()). */
-	int      curwin;        /* current window for refresh */
-	int      lx, ly;        /* loop parameters for refresh */
-	int	 COLS;		/* Columns on the screen. */
-	int	 LINES;		/* Lines on the screen. */
-	int	 TABSIZE;	/* Size of a tab. */
-	int	 COLORS;	/* Maximum colors on the screen */
-	int	 COLOR_PAIRS;	/* Maximum color pairs on the screen */
-	int	 My_term;	/* Use Def_term regardless. */
-	char	 GT;		/* Gtty indicates tabs. */
-	char	 NONL;		/* Term can't hack LF doing a CR. */
-	char	 UPPERCASE;	/* Terminal is uppercase only. */
-
-	chtype acs_char[NUM_ACS];
-#ifdef HAVE_WCHAR
-	cchar_t wacs_char[ NUM_ACS ];
-#endif /* HAVE_WCHAR */
-	struct __color colours[MAX_COLORS];
-	struct __pair  colour_pairs[MAX_PAIRS];
-	attr_t	nca;
-
-/* Style of colour manipulation */
-#define COLOR_NONE	0
-#define COLOR_ANSI	1	/* ANSI/DEC-style colour manipulation */
-#define COLOR_HP	2	/* HP-style colour manipulation */
-#define COLOR_TEK	3	/* Tektronix-style colour manipulation */
-#define COLOR_OTHER	4	/* None of the others but can set fore/back */
-	int color_type;
-
-	attr_t mask_op;
-	attr_t mask_me;
-	attr_t mask_ue;
-	attr_t mask_se;
-	TERMINAL *term;
-	int old_mode; /* old cursor visibility state for terminal */
-	keymap_t *base_keymap;
-	int echoit;
-	int pfast;
-	int rawmode;
-	int nl;
-	int noqch;
-	int clearok;
-	int useraw;
-	struct __winlist *winlistp;
-	struct   termios cbreakt, rawt, *curt, save_termios;
-	struct termios orig_termios, baset, savedtty;
-	int ovmin;
-	int ovtime;
-	char *stdbuf;
-	unsigned int len;
-	int meta_state;
-	char padchar;
-	int endwin;
-	int notty;
-	int half_delay;
-	int resized;
-	wchar_t *unget_list;
-	int unget_len, unget_pos;
-#ifdef HAVE_WCHAR
-#define MB_LEN_MAX 8
-#define MAX_CBUF_SIZE MB_LEN_MAX
-	int		cbuf_head;		/* header to cbuf */
-	int		cbuf_tail;		/* tail to cbuf */
-	int		cbuf_cur;		/* the current char in cbuf */
-	mbstate_t	sp;			/* wide char processing state */
-	char		cbuf[ MAX_CBUF_SIZE ];	/* input character buffer */
-#endif /* HAVE_WCHAR */
-};
-
-
-extern char	 __GT;			/* Gtty indicates tabs. */
-extern char	 __NONL;		/* Term can't hack LF doing a CR. */
-extern char	 __UPPERCASE;		/* Terminal is uppercase only. */
-extern int	 My_term;		/* Use Def_term regardless. */
-extern const char	*Def_term;	/* Default terminal type. */
-extern SCREEN   *_cursesi_screen;       /* The current screen in use */
-
-/* Debugging options/functions. */
-#ifdef DEBUG
-#define __CTRACE_TSTAMP		0x00000001
-#define __CTRACE_MISC		0x00000002
-#define __CTRACE_INIT		0x00000004
-#define __CTRACE_SCREEN		0x00000008
-#define __CTRACE_WINDOW		0x00000010
-#define __CTRACE_REFRESH	0x00000020
-#define __CTRACE_COLOR		0x00000040
-#define __CTRACE_INPUT		0x00000080
-#define __CTRACE_OUTPUT		0x00000100
-#define __CTRACE_LINE		0x00000200
-#define __CTRACE_ATTR		0x00000400
-#define __CTRACE_ERASE		0x00000800
-#define __CTRACE_FILEIO		0x00001000
-#define __CTRACE_ALL		0x7fffffff
-void	 __CTRACE_init(void);
-void	 __CTRACE(int, const char *, ...) __attribute__((__format__(__printf__, 2, 3)));
-#endif
-
-/* Private functions. */
-int     __cputchar_args(int, void *);
-void     _cursesi_free_keymap(keymap_t *);
-int      _cursesi_gettmode(SCREEN *);
-void     _cursesi_reset_acs(SCREEN *);
-int	_cursesi_addbyte(WINDOW *, __LINE **, int *, int *, int , attr_t, int);
-int	_cursesi_addwchar(WINDOW *, __LINE **, int *, int *, const cchar_t *,
-			  int);
-int	_cursesi_waddbytes(WINDOW *, const char *, int, attr_t, int);
-#ifdef HAVE_WCHAR
-void     _cursesi_reset_wacs(SCREEN *);
-#endif /* HAVE_WCHAR */
-void     _cursesi_resetterm(SCREEN *);
-int      _cursesi_setterm(char *, SCREEN *);
-int	 __delay(void);
-u_int	 __hash_more(const void *, size_t, u_int);
-#define	__hash(s, len)	__hash_more((s), (len), 0u)
-void	 __id_subwins(WINDOW *);
-void	 __init_getch(SCREEN *);
-void	 __init_acs(SCREEN *);
-#ifdef HAVE_WCHAR
-void	 __init_get_wch(SCREEN *);
-void	 __init_wacs(SCREEN *);
-int	__cputwchar_args( wchar_t, void * );
-int     _cursesi_copy_nsp(nschar_t *, struct __ldata *);
-void	__cursesi_free_nsp(nschar_t *);
-void	__cursesi_win_free_nsp(WINDOW *);
-void	__cursesi_putnsp(nschar_t *, const int, const int);
-void	__cursesi_chtype_to_cchar(chtype, cchar_t *);
-#endif /* HAVE_WCHAR */
-int	 __unget(wint_t);
-int	 __mvcur(int, int, int, int, int);
-WINDOW  *__newwin(SCREEN *, int, int, int, int, int);
-int	 __nodelay(void);
-int	 __notimeout(void);
-void	 __restartwin(void);
-void	 __restore_colors(void);
-void     __restore_cursor_vis(void);
-void     __restore_meta_state(void);
-void	 __restore_termios(void);
-void	 __restore_stophandler(void);
-void	 __restore_winchhandler(void);
-void	 __save_termios(void);
-void	 __set_color(WINDOW *win, attr_t attr);
-void	 __set_stophandler(void);
-void	 __set_winchhandler(void);
-void	 __set_subwin(WINDOW *, WINDOW *);
-void	 __startwin(SCREEN *);
-void	 __stop_signal_handler(int);
-int	 __stopwin(void);
-void	 __swflags(WINDOW *);
-int	 __timeout(int);
-int	 __touchline(WINDOW *, int, int, int);
-int	 __touchwin(WINDOW *);
-void	 __unsetattr(int);
-void	 __unset_color(WINDOW *win);
-int	 __waddch(WINDOW *, __LDATA *);
-int	 __wgetnstr(WINDOW *, char *, int);
-void	 __winch_signal_handler(int);
-
-/* Private #defines. */
-#define	min(a,b)	((a) < (b) ? (a) : (b))
-#define	max(a,b)	((a) > (b) ? (a ): (b))
-
-/* Private externs. */
-extern int		 __echoit;
-extern int		 __endwin;
-extern int		 __pfast;
-extern int		 __rawmode;
-extern int		 __noqch;
-extern attr_t		 __mask_op, __mask_me, __mask_ue, __mask_se;
-extern WINDOW		*__virtscr;
-extern int		 __using_color;
-extern attr_t		 __default_color;
diff --git a/lib/libcurses/curses_refresh.3 b/lib/libcurses/curses_refresh.3
deleted file mode 100644
index 9800b1aab..000000000
--- a/lib/libcurses/curses_refresh.3
+++ /dev/null
@@ -1,157 +0,0 @@
-.\"	$NetBSD: curses_refresh.3,v 1.10 2003/04/16 13:35:01 wiz Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd March 26, 2003
-.Dt CURSES_REFRESH 3
-.Os
-.Sh NAME
-.Nm curses_refresh ,
-.Nm refresh ,
-.Nm wrefresh ,
-.Nm wnoutrefresh ,
-.Nm doupdate ,
-.Nm leaveok ,
-.Nm flushok
-.Nd curses terminal update routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn refresh "void"
-.Ft int
-.Fn wrefresh "WINDOW *win"
-.Ft int
-.Fn wnoutrefresh "WINDOW *win"
-.Ft int
-.Fn doupdate "void"
-.Ft int
-.Fn leaveok "WINDOW *win" "boolf flag"
-.Ft int
-.Fn flushok "WINDOW *win" "boolf flag"
-.Sh DESCRIPTION
-These functions update the terminal with the contents of
-.Dv stdscr
-or of the specified window(s).
-.Pp
-The
-.Fn refresh
-function causes curses to propagate changes made to
-.Dv stdscr
-to the terminal display.
-Any changes made to subwindows of
-.Dv stdscr
-are also propagated.
-.Pp
-The
-.Fn wrefresh
-function is the same as the
-.Fn refresh
-function, excepting that changes are propagated to the terminal from the
-window specified by
-.Fa win .
-.Pp
-The
-.Fn wnoutrefresh
-function performs the internal processing required by curses to determine
-what changes need to be made to synchronise the internal screen buffer
-and the terminal but does not modify the terminal display.
-.Pp
-The
-.Fn doupdate
-function updates the terminal display to match the internal curses
-representation of the display.
-.Pp
-The
-.Fn wnoutrefresh
-and
-.Fn doupdate
-functions can be used together to speed up terminal redraws by
-deferring the actual terminal updates until after a batch of updates
-to multiple windows has been done.
-.Pp
-The
-.Fn refresh
-function is equivalent to
-.Fn wnoutrefresh stdscr
-followed by
-.Fn doupdate .
-.Pp
-The
-.Fn leaveok
-function determines whether refresh operations may leave the screen cursor
-in an arbitrary position on the screen.
-Setting
-.Fa flag
-to
-.Dv FALSE
-ensures that the screen cursor is positioned at the current cursor
-position after a refresh operation has taken place.
-.Pp
-The
-.Fn flushok
-function is used to determine whether or not the screen's output file
-descriptor will be flushed on refresh.
-Setting
-.Fa flag
-to
-.Dv TRUE
-will cause the output to be flushed.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_pad 3 ,
-.Xr curses_touch 3 ,
-.Xr getch 3
-.Sh NOTES
-Calling
-.Fn wrefresh
-on a new, unchanged window has no effect.
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_scanw.3 b/lib/libcurses/curses_scanw.3
deleted file mode 100644
index b6c1ab7f9..000000000
--- a/lib/libcurses/curses_scanw.3
+++ /dev/null
@@ -1,114 +0,0 @@
-.\"	$NetBSD: curses_scanw.3,v 1.5 2003/04/16 13:35:01 wiz Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd August 12, 2002
-.Dt CURSES_SCANW 3
-.Os
-.Sh NAME
-.Nm curses_scanw ,
-.Nm scanw ,
-.Nm wscanw ,
-.Nm mvscanw ,
-.Nm mvwscanw
-.Nd curses read formatted data from screen routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn scanw "const char *fmt" "..."
-.Ft int
-.Fn wscanw "WINDOW *win" "const char *fmt" "..."
-.Ft int
-.Fn mvscanw "int y" "int x" "const char *fmt" "..."
-.Ft int
-.Fn mvwscanw "WINDOW *win" "int y" "int x" "const char *fmt" "..."
-.Sh DESCRIPTION
-These functions read formatted data from
-.Dv stdscr
-or from the specified window.
-.Pp
-The
-.Fn scanw
-function is the same as the
-.Fn scanf
-function, excepting that the input data stream is read from the current
-cursor position on
-.Dv stdscr ,
-.Pp
-The
-.Fn wscanw
-function is the same
-as the
-.Fn scanw
-function, excepting that the data stream is read from the window specified by
-.Fa win .
-.Pp
-The
-.Fn mvscanw
-and
-.Fn mvwscanw
-functions are the same as the
-.Fn scanw
-and
-.Fn mvscanw
-functions, respectively, excepting that
-.Fn wmove
-is called to move the cursor to the position specified by
-.Fa y ,
-.Fa x
-before the data is read from the window.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_cursor 3 ,
-.Xr curses_print 3 ,
-.Xr scanf 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_screen.3 b/lib/libcurses/curses_screen.3
deleted file mode 100644
index c8b91ebf3..000000000
--- a/lib/libcurses/curses_screen.3
+++ /dev/null
@@ -1,204 +0,0 @@
-.\"	$NetBSD: curses_screen.3,v 1.15 2012/04/21 12:27:28 roy Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd April 5, 2012
-.Dt CURSES_SCREEN 3
-.Os
-.Sh NAME
-.Nm curses_screen ,
-.Nm newterm ,
-.Nm set_term ,
-.Nm delscreen ,
-.Nm endwin ,
-.Nm initscr ,
-.Nm isendwin ,
-.Nm resizeterm ,
-.Nm setterm
-.Nd curses terminal and screen routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft SCREEN *
-.Fn newterm "char *type" "FILE *outfd" "FILE *infd"
-.Ft SCREEN *
-.Fn set_term "SCREEN *screen"
-.Ft void
-.Fn delscreen "SCREEN *screen"
-.Ft int
-.Fn endwin "void"
-.Ft WINDOW *
-.Fn initscr "void"
-.Ft bool
-.Fn isendwin "void"
-.Ft int
-.Fn resizeterm "int lines" "int cols"
-.Ft int
-.Fn setterm "char *name"
-.Pp
-.Va extern int LINES ;
-.Pp
-.Va extern int COLS ;
-.Sh DESCRIPTION
-These functions initialize terminals and screens.
-.Pp
-The
-.Fn newterm
-function initialises the curses data structures and pointers ready for
-use by curses.
-The
-.Fa type
-argument points to a
-.Xr terminfo 5
-entry, or it may be
-.Dv NULL
-in which case the TERM environment variable is used.
-The
-.Fa outfd
-and
-.Fa infd
-are the output and input file descriptors for the terminal.
-The
-.Fn newterm
-function must only be called once  per terminal.
-.Pp
-The
-.Fn set_term
-function can be used to switch between the screens defined by calling
-.Fn newterm ,
-a pointer to the previous screen structure that was in use will be
-returned on success.
-.Pp
-Calling
-.Fn delscreen
-will destroy the given screen and free all allocated resources.
-.Pp
-Calling
-.Fn endwin
-will end the curses session and restore the saved terminal settings.
-.Pp
-The curses session must be initialised by calling
-.Fn initscr
-which saves the current terminal state and sets up the terminal and
-internal data structures to support the curses application.
-This
-function call must be, with few exceptions, the first Curses library
-call made.
-The exception to this rule is the
-.Fn newterm
-call which may be called prior to
-.Fn initscr .
-The size of the curses screen is determined by checking the
-.Xr tty 4
-size and then the
-.Xr terminfo 5
-entries for the terminal type.
-If the environment variables
-.Va LINES
-or
-.Va COLS
-are set, then these will be used instead.
-.Pp
-When either
-.Fn newterm
-or
-.Fn initscr
-are called, the Curses library sets up signal handlers for
-.Dv SIGTSTP
-and
-.Dv SIGWINCH .
-If a signal handler is already installed for
-.Dv SIGWINCH ,
-this will also be called when the Curses library handler is called.
-.Pp
-The
-.Fn isendwin
-function can be used to determine whether or not a refresh of the
-screen has occurred since the last call to
-.Fn endwin .
-.Pp
-The size of the screen may be changed  by calling
-.Fn resizeterm
-with the updated number of lines and columns.
-This will resize the curses internal data structures to accommodate the
-changed terminal geometry.
-The
-.Dv curscr
-and
-.Dv stdscr
-windows and any of their subwindows will be resized to fit the new
-screen size.
-The application must redraw the screen after a call to
-.Fn resizeterm .
-.Pp
-The
-.Fn setterm
-function sets the terminal type for the current screen to the one
-passed, initialising all the curses internal data structures with
-information related to the named terminal.
-The
-.Fa name
-argument must be a valid name or alias in the
-.Xr terminfo 5
-database for this function to succeed.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_window 3 ,
-.Xr tty 4 ,
-.Xr terminfo 5 ,
-.Xr signal 7
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
-The
-.Fn resizeterm
-function is a
-.Em ncurses
-extension to the Curses library and was added in
-.Nx 1.6 .
diff --git a/lib/libcurses/curses_scroll.3 b/lib/libcurses/curses_scroll.3
deleted file mode 100644
index 459de9af4..000000000
--- a/lib/libcurses/curses_scroll.3
+++ /dev/null
@@ -1,169 +0,0 @@
-.\"	$NetBSD: curses_scroll.3,v 1.4 2003/04/16 13:35:01 wiz Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd August 12, 2002
-.Dt CURSES_SCROLL 3
-.Os
-.Sh NAME
-.Nm curses_scroll ,
-.Nm scrl ,
-.Nm wscrl
-.Nm scroll ,
-.Nm scrollok ,
-.Nm setscrreg ,
-.Nm wsetscrreg
-.Nd curses window scrolling routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn scrl "int n"
-.Ft int
-.Fn wscrl "WINDOW *win" "int n"
-.Ft int
-.Fn scroll "WINDOW *win"
-.Ft int
-.Fn scrollok "WINDOW *win" "boolf flag"
-.Ft int
-.Fn setscrreg "int top" "int bottom"
-.Ft int
-.Fn wsetscrreg "WINDOW *win" "int top" "int bottom"
-.Sh DESCRIPTION
-These functions scroll areas on
-.Dv stdscr
-or on the specified window.
-.Pp
-The
-.Fn scrl
-function scrolls
-.Dv stdscr
-by
-.Fa n
-lines.
-If
-.Fa n
-is positive then then
-.Dv stdscr
-is scrolled up.
-.Fa n
-lines are lost from the top of
-.Dv stdscr
-and
-.Fa n
-blank lines are inserted at the bottom.
-If
-.Fa n
-is negative then
-.Dv stdscr
-is scrolled down.
-.Fa n
-blank lines are inserted at the top of
-.Dv stdscr
-and
-.Fa n
-lines are lost from the bottom.
-.Pp
-The
-.Fn wscrl
-function is the same as the
-.Fn scrl
-function, excepting that it scrolls the window specified by
-.Fa win .
-.Pp
-The
-.Fn scroll
-function scrolls the window
-.Fa win
-up by one line.
-.Pp
-The scrolling behaviour of a window can be controlled by using the
-.Fn scrollok
-function.
-If the
-.Fa flag
-argument is
-.Dv TRUE
-then a line wrap at the bottom of the window will cause the window to
-be scrolled up one line, if
-.Fa flag
-is
-.Dv FALSE
-then lines that would force a scroll will be truncated.
-.Pp
-The
-.Fn setscrreg
-function sets up a software scrolling region on
-.Dv stdscr
-which will define a region of the screen that will be scrolled.
-The scrolling of this region is also controlled by the
-.Fn scrollok
-function.
-.Pp
-The
-.Fn wsetscrreg
-function does the same as the
-.Fn setscrreg
-function, except that the scrolling region is set on the window specified by
-.Fa win .
-.Pp
-If a scrolling region has been set with the
-.Fn setscrreg
-or
-.Fn wsetscrreg
-functions and the current cursor position is inside the scrolling region,
-then only the area inside the scrolling region is scrolled.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_deleteln 3 ,
-.Xr curses_insdelln 3 ,
-.Xr curses_insertln 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_standout.3 b/lib/libcurses/curses_standout.3
deleted file mode 100644
index d448c9cac..000000000
--- a/lib/libcurses/curses_standout.3
+++ /dev/null
@@ -1,108 +0,0 @@
-.\"	$NetBSD: curses_standout.3,v 1.6 2012/05/02 04:23:09 agc Exp $
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Julian Coleman.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 1, 2012
-.Dt CURSES_STANDOUT 3
-.Os
-.Sh NAME
-.Nm curses_standout ,
-.Nm standout ,
-.Nm standend ,
-.Nm wstandout ,
-.Nm wstandend
-.Nd curses standout attribute manipulation routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn standout void
-.Ft int
-.Fn standend void
-.Ft int
-.Fo wstandout
-.Fa "WINDOW *win"
-.Fc
-.Ft int
-.Fo wstandend
-.Fa "WINDOW *win"
-.Fc
-.Sh DESCRIPTION
-These functions manipulate the standout attribute on
-.Dv stdscr
-or on the specified window.
-.Pp
-The
-.Fn standout
-function turns on the standout attribute
-on
-.Dv stdscr .
-The
-.Fn standend
-function turns off the standout attribute
-on
-.Dv stdscr .
-.Pp
-The
-.Fn wstandout
-and
-.Fn wstandend
-functions are equivalent to
-.Fn standout
-and
-.Fn standend ,
-respectively, excepting that the attribute is manipulated on the
-window specified by
-.Fa win .
-.Pp
-The
-.Fn standout
-and
-.Fn standend
-functions are equivalent to
-.Fn attron A_STANDOUT
-and
-.Fn attroff A_STANDOUT ,
-respectively.
-.Sh RETURN VALUES
-These functions always return 1.
-.Sh SEE ALSO
-.Xr curses_attributes 3 ,
-.Xr curses_underscore 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
-.Sh BUGS
-On modern terminals that support other attributes, there is no difference
-between characters displayed with the standout attribute set and those
-displayed with one of the other attributes set (usually bold).
-It is best to avoid using standout if the terminal supports other attributes.
diff --git a/lib/libcurses/curses_termcap.3 b/lib/libcurses/curses_termcap.3
deleted file mode 100644
index 19247b66d..000000000
--- a/lib/libcurses/curses_termcap.3
+++ /dev/null
@@ -1,81 +0,0 @@
-.\"	$NetBSD: curses_termcap.3,v 1.6 2012/04/21 12:27:28 roy Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd October 4, 2011
-.Dt CURSES_TERMCAP 3
-.Os
-.Sh NAME
-.Nm curses_termcap ,
-.Nm fullname
-.Nd curses termcap querying routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft char *
-.Fn fullname "char *termbuf" "char *name"
-.Sh DESCRIPTION
-The
-.Fn fullname
-function takes the termcap entry in
-.Fa termbuf
-and copies the full name of the terminal from the entry into the
-target variable
-.Fa name .
-The full name of the terminal is assumed to be the last alias in the
-termcap entry name.
-It is assumed that the
-.Fa name
-variable has sufficient storage to hold the full name of the terminal.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr terminfo 5
-.Sh STANDARDS
-The
-.Lb libcurses
-library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_touch.3 b/lib/libcurses/curses_touch.3
deleted file mode 100644
index c5d32a036..000000000
--- a/lib/libcurses/curses_touch.3
+++ /dev/null
@@ -1,199 +0,0 @@
-.\"	$NetBSD: curses_touch.3,v 1.8 2010/02/24 13:02:13 drochner Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd February 23, 2010
-.Dt CURSES_TOUCH 3
-.Os
-.Sh NAME
-.Nm curses_touch ,
-.Nm touchline ,
-.Nm touchoverlap ,
-.Nm touchwin ,
-.Nm untouchwin ,
-.Nm wtouchln ,
-.Nm is_linetouched ,
-.Nm is_wintouched ,
-.Nm redrawwin ,
-.Nm wredrawln ,
-.Nm wsyncup ,
-.Nm wsyncdown
-.Nd curses window modification routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn touchline "WINDOW *win" "int start" "int count"
-.Ft int
-.Fn touchoverlap "WINDOW *win1" "WINDOW *win2"
-.Ft int
-.Fn touchwin "WINDOW *win"
-.Ft int
-.Fn untouchwin "WINDOW *win"
-.Ft int
-.Fn wtouchln "WINDOW *win" "int line" "int n" "boolf changed"
-.Ft bool
-.Fn is_linetouched "WINDOW *win" "int line"
-.Ft bool
-.Fn is_wintouched "WINDOW *win"
-.Ft int
-.Fn redrawwin "WINDOW *win"
-.Ft int
-.Fn wredrawln "WINDOW *win" "int line" "int n"
-.Ft void
-.Fn wsyncup "WINDOW *win"
-.Ft void
-.Fn wsyncdown "WINDOW *win"
-.Sh DESCRIPTION
-These functions mark lines and windows as modified and check the modification
-status of lines and windows.
-.Pp
-The
-.Fn touchline
-function marks
-.Fa count
-lines starting from
-.Fa start
-in window
-.Fa win
-as having been modified.
-These characters will be synced to the terminal on the next call to
-.Fn wrefresh .
-.Pp
-The
-.Fn touchoverlap
-function marks the portion of
-.Fa win2
-that overlaps
-.Fa win1
-as being modified.
-.Pp
-The
-.Fn touchwin
-function marks the entire window
-.Fa win
-as having been modified.
-Conversely,
-the
-.Fn untouchwin
-function marks the window
-.Fa win
-as being unmodified, so that any changes made to that window will
-not be synced to the terminal during a
-.Fn wrefresh .
-.Pp
-The
-.Fn wtouchln
-function performs one of two operations on
-.Fa n
-lines starting at
-.Fa line
-in the given window.
-If
-.Fa changed
-is 1 then the given line range is marked as being modified, if
-.Fa changed
-is 0 then the given line range is set to being unmodified.
-.Pp
-The
-.Fn is_linetouched
-function returns
-.Dv TRUE
-if
-.Fa line
-in window
-.Fa win
-has been modified since the last refresh was done, otherwise
-.Dv FALSE
-is returned.
-.Pp
-.Fn is_wintouched
-returns
-.Dv TRUE
-if the window
-.Fa win
-has been modified since the last refresh, otherwise
-.Dv FALSE
-is returned.
-.Pp
-The
-.Fn redrawwin
-function marks the entire window
-.Fa win
-as having been corrupted.
-Is is equivalent to the
-.Fn touchwin
-function.
-.Pp
-The
-.Fn wredrawln
-function marks
-.Fa n
-lines starting at
-.Fa line
-in the given window as corrupted.
-It is equivalent to
-.Fn wtouchln win line n 1 .
-.Pp
-The
-.Fn wsyncup
-function touches all ancestors of
-.Fa win .
-.Pp
-The
-.Fn wsyncdown
-function touches
-.Fa win
-if any of its ancestors is touched.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_refresh 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_tty.3 b/lib/libcurses/curses_tty.3
deleted file mode 100644
index 5c2969dc5..000000000
--- a/lib/libcurses/curses_tty.3
+++ /dev/null
@@ -1,360 +0,0 @@
-.\"	$NetBSD: curses_tty.3,v 1.8 2004/03/16 19:27:35 snj Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd June 13, 2003
-.Dt CURSES_TTY 3
-.Os
-.Sh NAME
-.Nm curses_tty ,
-.Nm beep ,
-.Nm flash ,
-.Nm curs_set ,
-.Nm def_prog_mode ,
-.Nm reset_prog_mode ,
-.Nm def_shell_mode ,
-.Nm reset_shell_mode ,
-.Nm echo ,
-.Nm noecho ,
-.Nm delay_output ,
-.Nm erasechar ,
-.Nm flushinp ,
-.Nm gettmode ,
-.Nm halfdelay ,
-.Nm has_ic ,
-.Nm has_il ,
-.Nm idcok ,
-.Nm idlok ,
-.Nm intrflush ,
-.Nm noqiflush ,
-.Nm qiflush ,
-.Nm killchar ,
-.Nm meta ,
-.Nm napms ,
-.Nm nl ,
-.Nm nonl ,
-.Nm cbreak ,
-.Nm nocbreak ,
-.Nm raw ,
-.Nm noraw ,
-.Nm savetty ,
-.Nm resetty
-.Nd curses terminal manipulation routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn beep "void"
-.Ft int
-.Fn flash "void"
-.Ft int
-.Fn curs_set "int visibility"
-.Ft int
-.Fn def_prog_mode "void"
-.Ft int
-.Fn reset_prog_mode "void"
-.Ft int
-.Fn def_shell_mode "void"
-.Ft int
-.Fn reset_shell_mode "void"
-.Ft int
-.Fn echo "void"
-.Ft int
-.Fn noecho "void"
-.Ft int
-.Fn delay_output "int ms"
-.Ft char
-.Fn erasechar "void"
-.Ft int
-.Fn flushinp "void"
-.Ft int
-.Fn gettmode "void"
-.Ft int
-.Fn has_ic "void"
-.Ft int
-.Fn has_il "void"
-.Ft int
-.Fn idcok "WINDOW *win" "boolf flag"
-.Ft int
-.Fn idlok "WINDOW *win" "boolf flag"
-.Ft int
-.Fn intrflush "WINDOW *win" "boolf flag"
-.Ft void
-.Fn noqiflush "void"
-.Ft void
-.Fn qiflush "void"
-.Ft char
-.Fn killchar "void"
-.Ft int
-.Fn meta "WINDOW *win" "boolf flag"
-.Ft int
-.Fn napms "int ms"
-.Ft int
-.Fn nl "void"
-.Ft int
-.Fn nonl "void"
-.Ft int
-.Fn cbreak "void"
-.Ft int
-.Fn nocbreak "void"
-.Ft int
-.Fn halfdelay "int"
-.Ft int
-.Fn raw "void"
-.Ft int
-.Fn noraw "void"
-.Ft int
-.Fn savetty "void"
-.Ft int
-.Fn resetty "void"
-.Sh DESCRIPTION
-These functions manipulate curses terminal settings.
-.Pp
-The
-.Fn beep
-function rings the terminal bell, if this is possible.
-Failing that, the terminal screen will be flashed.
-If neither of these are possible, then no action will be taken.
-.Fn flash
-will flash the terminal screen if possible.
-Failing that, the terminal bell will be rung.
-If neither of these are possible then no action will be taken.
-.Pp
-The cursor
-visibility can be set by calling
-.Fn curs_set .
-The following visibility settings are valid for
-.Fn curs_set :
-.Pp
-.Bl -tag -width visibility -compact -offset indent
-.It Visibility
-Effect
-.It 0
-cursor is invisible.
-.It 1
-cursor is normal visibility
-.It 2
-cursor is high visibility
-.El
-.Pp
-A successful call to
-.Fn curs_set
-will return the previous visibility setting for the cursor.
-.Pp
-The
-.Fn delay_output
-function pauses the output to the terminal by sending the appropriate
-number of terminal pad characters such that the transmission time of
-the pad characters will take
-.Fa ms
-milliseconds.
-.Pp
-Calling
-.Fn def_prog_mode
-will cause the current terminal curses setting to be saved.
-A subsequent call to
-.Fn reset_prog_mode ,
-will restore the saved settings.
-This is useful when calls to external programs are made that may
-reset the terminal characteristics.
-.Pp
-The
-.Fn def_shell_mode
-function saves the current terminal line settings.
-These settings are the ones that will be restored when the curses
-application exits.
-Conversely,
-.Fn reset_shell_mode
-will save the current terminal curses settings for later restoration and
-restores the previously saved terminal line settings.
-.Pp
-The
-.Fn echo
-function turns on curses echo mode, characters entered will be echoed
-to the terminal by curses.
-The
-.Fn noecho
-function disables this feature.
-.Pp
-The current erase character for the terminal can be determined by
-calling the
-.Fn erasechar
-function.
-.Pp
-The
-.Fn flushinp
-function discards any pending input for the current screen.
-.Pp
-The modes
-for the current terminal can be reset by calling
-.Fn gettmode ,
-this will perform the initialisation on the terminal that is normally
-done by curses at start up.
-.Pp
-The
-.Fn has_ic
-function returns either
-.Dv TRUE
-or
-.Dv FALSE
-depending on whether or not the terminal has a insert character
-capability or not.
-Similarly the
-.Fn has_il
-function does the same test but for a insert line capability.
-.Pp
-The use of the insert character capability in curses operations can be
-enabled or disabled by calling
-.Fn idcok
-on the desired window.
-Similarly, the use of the insert line capability can be controlled using the
-.Fn idlok
-function.
-.Pp
-The
-.Fn intrflush
-function controls whether or not a flush of the input buffer is
-performed when an interrupt key (kill, suspend or quit) is pressed.
-The
-.Fa win
-parameter is ignored.
-The
-.Fn noqiflush
-function is equivalent to
-.Fn intrflush stdscr FALSE .
-The
-.Fn qiflush
-function is equivalent to
-.Fn intrflush stdscr TRUE .
-.Pp
-The character that performs the line kill function can be determined
-by calling the
-.Fn killchar
-function.
-.Pp
-The
-.Fn meta
-function turns on and off the generation of 8 bit characters by the
-terminal, if
-.Fa flag
-is
-.Dv FALSE
-then only 7 bit characters will be returned, if
-.Fa flag
-is
-.Dv TRUE
-then 8 bit characters will be returned by the terminal.
-.Pp
-The
-.Fn napms
-causes the application to sleep for the number of milliseconds
-specified by
-.Fa ms .
-.Pp
-Calling
-.Fn nl
-will cause curses to map all carriage returns to newlines on input,
-this functionality is enabled by default.
-The
-.Fn nonl
-function disables this behaviour.
-.Pp
-The
-.Fn cbreak
-function will put the terminal into cbreak mode, which means that
-characters will be returned one at a time instead of waiting for a
-newline character, line discipline processing will be performed.
-The
-.Fn nocbreak
-function disables this mode.
-.Pp
-Calling
-.Fn halfdelay
-puts the terminal into the same mode as
-.Fn cbreak
-with the exception that if no character is received within the specified
-number of tenths of a second then the input routine will return
-.Er ERR .
-This mode can be cancelled by calling
-.Fn nocbreak .
-The valid range for the timeout is from 1 to 255 tenths of a second.
-.Pp
-The
-.Fn noraw
-function sets the input mode for the current terminal into Cooked mode,
-that is input character translation and signal character processing is
-performed.
-The
-.Fn raw
-function puts the terminal into Raw mode, no input character
-translation is done nor is signal character processing.
-.Pp
-The terminal
-tty flags can be saved by calling
-.Fn savetty
-and may be restored by calling
-.Fn resetty ,
-the use of these functions is discouraged as they may cause the
-terminal to be put into a state that is incompatible with curses
-operation.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr getch 3 ,
-.Xr termios 4
-.Sh NOTES
-The
-.Fn idcok
-and
-.Fn idlok
-currently have no effect on the curses code at all, currently curses
-will always use the terminal insert character and insert line
-capabilities if available.
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/curses_underscore.3 b/lib/libcurses/curses_underscore.3
deleted file mode 100644
index b0b149822..000000000
--- a/lib/libcurses/curses_underscore.3
+++ /dev/null
@@ -1,100 +0,0 @@
-.\"	$NetBSD: curses_underscore.3,v 1.5 2008/04/30 13:10:51 martin Exp $
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Julian Coleman.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd October 13, 2002
-.Dt CURSES_UNDERSCORE 3
-.Os
-.Sh NAME
-.Nm curses_underscore ,
-.Nm underscore ,
-.Nm underend ,
-.Nm wunderscore ,
-.Nm wunderend
-.Nd curses underscore attribute manipulation routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fn underscore void
-.Ft int
-.Fn underend void
-.Ft int
-.Fn wunderscore void
-.Ft int
-.Fn wunderend void
-.Sh DESCRIPTION
-These functions manipulate the underscore attribute on
-.Dv stdscr
-or on the specified window.
-.Pp
-The
-.Fn underscore
-function turns on the underscore attribute
-on
-.Dv stdscr .
-The
-.Fn underend
-function turns off the underscore attribute on
-.Dv stdscr .
-.Pp
-The
-.Fn wunderscore
-and
-.Fn wunderend
-functions
-are equivalent to
-.Fn underscore
-and
-.Fn underend ,
-respectively, excepting that the attribute is manipulated on the
-window specified by
-.Fa win .
-.Pp
-The
-.Fn underscore
-and
-.Fn underend
-functions
-are equivalent to
-.Fn wattron A_UNDERLINE
-and
-.Fn wattroff A_UNDERLINE ,
-respectively.
-.Sh RETURN VALUES
-These functions always return 1.
-.Sh SEE ALSO
-.Xr curses_attributes 3 ,
-.Xr curses_standout 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-These functions first appeared in
-.Nx 1.5 .
diff --git a/lib/libcurses/curses_window.3 b/lib/libcurses/curses_window.3
deleted file mode 100644
index f13ab32bd..000000000
--- a/lib/libcurses/curses_window.3
+++ /dev/null
@@ -1,274 +0,0 @@
-.\"	$NetBSD: curses_window.3,v 1.16 2013/10/15 22:15:17 roy Exp $
-.\"
-.\" Copyright (c) 2002
-.\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
-.\"
-.\" This code is donated to the NetBSD Foundation by the Author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"
-.Dd October 15, 2013
-.Dt CURSES_WINDOW 3
-.Os
-.Sh NAME
-.Nm curses_window ,
-.Nm copywin ,
-.Nm dupwin ,
-.Nm delwin ,
-.Nm derwin ,
-.Nm mvwin ,
-.Nm mvderwin ,
-.Nm newwin ,
-.Nm overlay ,
-.Nm overwrite ,
-.Nm subwin ,
-.Nm wresize
-.Nd curses window routines
-.Sh LIBRARY
-.Lb libcurses
-.Sh SYNOPSIS
-.In curses.h
-.Ft int
-.Fo copywin
-.Fa "WINDOW *source"
-.Fa "WINDOW *dest"
-.Fa "int sminrow"
-.Fa "int smincol"
-.Fa "int dminrow"
-.Fa "int dmincol"
-.Fa "int dmaxrow"
-.Fa "int dmaxcol"
-.Fa "int overlay"
-.Fc
-.Ft WINDOW *
-.Fn dupwin "WINDOW *win"
-.Ft WINDOW *
-.Fn derwin "WINDOW *win" "int lines" "int cols" "int y" "int x"
-.Ft int
-.Fn delwin "WINDOW *win"
-.Ft int
-.Fn mvwin "WINDOW *win" "int y" "int x"
-.Ft int
-.Fn mvderwin "WINDOW *win" "int y" "int x"
-.Ft WINDOW *
-.Fn newwin "int lines" "int cols" "int begin_y" "int begin_x"
-.Ft WINDOW *
-.Fn subwin "WINDOW *win" "int lines" "int cols" "int begin_y" "int begin_x"
-.Ft int
-.Fn overlay "WINDOW *source" "WINDOW *dest"
-.Ft int
-.Fn overwrite "WINDOW *source" "WINDOW *dest"
-.Ft int
-.Fn wresize "WINDOW *win" "int lines" "int cols"
-.Sh DESCRIPTION
-These functions create, modify and delete windows on the current screen.
-.Pp
-The contents of a window may be copied to another window by using the
-.Fn copywin
-function, a section of the destination window
-.Fa dest
-bounded by
-.Fa (dminrow ,
-.Fa dmincol )
-and
-.Fa (dmaxrow ,
-.Fa dmaxcol )
-will be overwritten with the contents of the window
-.Fa source
-starting at the coordinates
-.Fa (sminrow ,
-.Fa smincol ) .
-If the
-.Fa overlay
-flag is
-.Dv TRUE
-then only non-blank characters from
-.Fa source
-will be copied to
-.Fa dest ,
-if
-.Fa overlay
-is
-.Dv FALSE
-then all characters from
-.Fa source
-will be copied to
-.Fa dest .
-If the bounding rectangles of either the source or the destination
-windows lay outside the maximum size of the respective windows then
-the size of the window copied will be adjusted to be within the bounds
-of both the source and destination windows.
-.Pp
-The
-.Fn dupwin
-function creates an exact duplicate of
-.Fa win
-and returns a pointer to it.
-.Pp
-Calling
-.Fn derwin
-will create a subwindow of
-.Fa win
-in the same manner as
-.Fn subwin
-excepting that the starting column and row
-.Fa y ,
-.Fa x
-are relative to the parent window origin.
-.Pp
-A window may deleted and all resources freed by calling the
-.Fn delwin
-function with the pointer to the window to be deleted in
-.Fa win .
-If
-.Fa win
-is
-.Dv NULL ,
-then no action occurs.
-.Pp
-A window can be moved to a new position by calling the
-.Fn mvwin
-function.
-The
-.Fa y
-and
-.Fa x
-positions are the new origin of the window on the screen.
-If the new position would cause the any part of the window to lie outside
-the screen, it is an error and the window is not moved.
-.Pp
-A mapping of a region relative to the parent window may be created by
-calling the
-.Fn mvderwin
-function, the
-.Fa y
-and
-.Fa x
-positions are relative to the origin of the parent window.
-The screen offset of
-.Fa win
-is not updated, the characters beginning at
-.Fa y ,
-.Fa x
-for the area the size of
-.Fa win
-will be displayed at the screen offset of
-.Fa win .
-If the given window in
-.Fa win
-is not a subwindow then an error will be returned.
-If the new position would cause the any part of the window to lie outside
-the parent window, it is an error and the mapping is not updated.
-.Pp
-The
-.Fn newwin
-function creates a new window of size
-.Fa lines ,
-.Fa cols
-with an origin at
-.Fa begin_y ,
-.Fa begin_x .
-If
-.Fa lines
-is less than or equal to zero then the number of rows
-for the window is set to
-.Dv LINES -
-.Fa begin_x
-+
-.Fa lines .
-Similarly if
-.Fa cols
-is less than or equal to zero then the number of columns
-for the window is set to
-.Dv COLS -
-.Fa begin_y
-+
-.Fa cols .
-.Pp
-.Fn subwin
-is similar to
-.Fn newwin
-excepting that the size of the subwindow is bounded by the parent
-window
-.Fa win .
-The subwindow shares internal data structures with the parent window
-and will be refreshed when the parent window is refreshed.
-The subwindow inherits the background character and attributes of the
-parent window.
-.Pp
-The
-.Fn overlay
-function copies the contents of the source window
-.Fa source
-to the destination window
-.Fa dest ,
-only the characters that are not the background character in the
-source window are copied to the destination.
-The windows need not be the same size, only the overlapping portion of both
-windows will be copied.
-The
-.Fn overwrite
-function performs the same functions as
-.Fn overlay
-excepting that characters from the source window are copied to the
-destination without exception.
-.Pp
-.Fn wresize
-resizes the specified window to the new number of lines and columns
-given, all internal curses structures are resized.
-Any subwindows of the specified window will also be resized if any part
-of them falls outside the new parent window size.
-The application must redraw the window after it has been resized.
-Note that
-.Dv curscr
-and
-.Dv stdscr
-can not be resized to be larger than the size of the screen.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-values:
-.Pp
-.Bl -tag -width ERR -compact
-.It Er OK
-The function completed successfully.
-.It Er ERR
-An error occurred in the function.
-.El
-.Sh SEE ALSO
-.Xr curses_fileio 3 ,
-.Xr curses_pad 3 ,
-.Xr curses_screen 3
-.Sh STANDARDS
-The
-.Nx
-Curses library complies with the X/Open Curses specification, part of the
-Single Unix Specification.
-.Sh HISTORY
-The Curses package appeared in
-.Bx 4.0 .
diff --git a/lib/libcurses/delch.c b/lib/libcurses/delch.c
deleted file mode 100644
index c41d1bd61..000000000
--- a/lib/libcurses/delch.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*	$NetBSD: delch.c,v 1.22 2009/07/22 16:57:14 roy Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)delch.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: delch.c,v 1.22 2009/07/22 16:57:14 roy Exp $");
-#endif
-#endif				/* not lint */
-
-#include <string.h>
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-/*
- * delch --
- *	Do a delete-char on the line, leaving (cury, curx) unchanged.
- */
-int
-delch(void)
-{
-	return wdelch(stdscr);
-}
-
-/*
- * mvdelch --
- *	Do a delete-char on the line at (y, x) on stdscr.
- */
-int
-mvdelch(int y, int x)
-{
-	return mvwdelch(stdscr, y, x);
-}
-
-/*
- * mvwdelch --
- *	Do a delete-char on the line at (y, x) of the given window.
- */
-int
-mvwdelch(WINDOW *win, int y, int x)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return wdelch(win);
-}
-
-#endif
-
-/*
- * wdelch --
- *	Do a delete-char on the line, leaving (cury, curx) unchanged.
- */
-int
-wdelch(WINDOW *win)
-{
-	__LDATA *end, *temp1, *temp2;
-
-#ifndef HAVE_WCHAR
-	end = &win->alines[win->cury]->line[win->maxx - 1];
-	temp1 = &win->alines[win->cury]->line[win->curx];
-	temp2 = temp1 + 1;
-	while (temp1 < end) {
-		(void) memcpy(temp1, temp2, sizeof(__LDATA));
-		temp1++, temp2++;
-	}
-	temp1->ch = win->bch;
-	if (__using_color && win != curscr)
-		temp1->attr = win->battr & __COLOR;
-	else
-		temp1->attr = 0;
-	__touchline(win, (int) win->cury, (int) win->curx, (int) win->maxx - 1);
-	return (OK);
-#else
-	int cw, sx;
-	nschar_t *np, *tnp;
-
-	end = &win->alines[win->cury]->line[win->maxx - 1];
-	sx = win->curx;
-	temp1 = &win->alines[win->cury]->line[win->curx];
-	cw = WCOL( *temp1 );
-	if ( cw < 0 ) {
-		temp1 += cw;
-		sx += cw;
-		cw = WCOL( *temp1 );
-	}
-	np = temp1->nsp;
-	if (np) {
-		while ( np ) {
-			tnp = np->next;
-			free( np );
-			np = tnp;
-		}
-		temp1->nsp = NULL;
-	}
-	if ( sx + cw < win->maxx ) {
-		temp2 = temp1 + cw;
-		while ( temp1 < end - ( cw - 1 )) {
-			( void )memcpy( temp1, temp2, sizeof( __LDATA ));
-			temp1++, temp2++;
-		}
-	}
-	while ( temp1 <= end ) {
-		temp1->ch = ( wchar_t )btowc(( int ) win->bch );
-		temp1->attr = 0;
-		if (_cursesi_copy_nsp(win->bnsp, temp1) == ERR)
-			return ERR;
-		SET_WCOL(*temp1, 1);
-		temp1++;
-	}
-	__touchline(win, (int) win->cury, sx, (int) win->maxx - 1);
-	return (OK);
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/deleteln.c b/lib/libcurses/deleteln.c
deleted file mode 100644
index 355d5f839..000000000
--- a/lib/libcurses/deleteln.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: deleteln.c,v 1.14 2003/08/07 16:44:21 agc Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)deleteln.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: deleteln.c,v 1.14 2003/08/07 16:44:21 agc Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-/*
- * deleteln --
- *	Delete a line from stdscr.  It leaves (cury, curx) unchanged.
- */
-int
-deleteln(void)
-{
-	return(winsdelln(stdscr, -1));
-}
-
-#endif
-
-/*
- * wdeleteln --
- *	Delete a line from the screen.  It leaves (cury, curx) unchanged.
- */
-int
-wdeleteln(WINDOW *win)
-{
-	return(winsdelln(win, -1));
-}
diff --git a/lib/libcurses/delwin.c b/lib/libcurses/delwin.c
deleted file mode 100644
index f114df27a..000000000
--- a/lib/libcurses/delwin.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*	$NetBSD: delwin.c,v 1.18 2013/10/15 22:15:17 roy Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)delwin.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: delwin.c,v 1.18 2013/10/15 22:15:17 roy Exp $");
-#endif
-#endif				/* not lint */
-
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * delwin --
- *	Delete a window and release it back to the system.
- */
-int
-delwin(WINDOW *win)
-{
-	WINDOW *wp, *np;
-	struct __winlist *wl, *pwl;
-	SCREEN *screen;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_WINDOW, "delwin(%p)\n", win);
-#endif
-
-	if (win == NULL)
-		return (OK);
-
-	/*
-	 * Free any storage used by non-spacing characters in the window.
-	 */
-#ifdef HAVE_WCHAR
-	__cursesi_win_free_nsp(win);
-#endif
-
-	if (win->orig == NULL) {
-		/*
-		 * If we are the original window, delete the space for all
-		 * the subwindows and the window space.
-		 */
-		free(win->wspace);
-		wp = win->nextp;
-		while (wp != win) {
-			np = wp->nextp;
-			delwin(wp);
-			wp = np;
-		}
-		/* Remove ourselves from the list of windows on the screen. */
-		pwl = NULL;
-		screen = win->screen;
-		for (wl = screen->winlistp; wl; pwl = wl, wl = wl->nextp) {
-			if (wl->winp != win)
-				continue;
-			if (pwl != NULL)
-				pwl->nextp = wl->nextp;
-			else
-				screen->winlistp = wl->nextp;
-			free(wl);
-			break;
-		}
-	} else {
-		/*
-		 * If we are a subwindow, take ourselves out of the list.
-		 * NOTE: if we are a subwindow, the minimum list is orig
-		 * followed by this subwindow, so there are always at least
-		 * two windows in the list.
-		 */
-		for (wp = win->nextp; wp->nextp != win; wp = wp->nextp)
-			continue;
-		wp->nextp = win->nextp;
-	}
-	free(win->lspace);
-	free(win->alines);
-	if (win == _cursesi_screen->curscr)
-		_cursesi_screen->curscr = NULL;
-	if (win == _cursesi_screen->stdscr)
-		_cursesi_screen->stdscr = NULL;
-	if (win == _cursesi_screen->__virtscr)
-		_cursesi_screen->__virtscr = NULL;
-	free(win);
-	return (OK);
-}
diff --git a/lib/libcurses/echo_wchar.c b/lib/libcurses/echo_wchar.c
deleted file mode 100644
index a7a9e7cd6..000000000
--- a/lib/libcurses/echo_wchar.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*   $NetBSD: echo_wchar.c,v 1.2 2007/05/28 15:01:55 blymn Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation Inc.
- * All rights reserved.
- *
- * This code is derived from code donated to the NetBSD Foundation
- * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@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.
- * 3. Neither the name of the NetBSD Foundation nor the names of its
- *	contributors may be used to endorse or promote products derived
- *	from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
- * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: echo_wchar.c,v 1.2 2007/05/28 15:01:55 blymn Exp $");
-#endif						  /* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * echo_wchar --
- *	Echo wide character and attributes on stdscr and refresh stdscr.
- */
-int
-echo_wchar(const cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return wecho_wchar(stdscr, wch);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * echo_wchar --
- *	Echo wide character and attributes on "win" and refresh "win".
- */
-int
-wecho_wchar(WINDOW *win, const cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	int retval;
-
-	retval = wadd_wch(win, wch);
-	if (retval == OK)
-		 retval = wrefresh(win);
-	return retval;
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * pecho_wchar --
- *	Echo character and attributes on "pad" and refresh "pad" at
- *	its previous position on the screen.
- */
-int
-pecho_wchar(WINDOW *pad, const cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	int retval;
-
-	retval = wadd_wch(pad, wch);
-	if (retval == OK)
-		 retval = prefresh(pad, pad->pbegy, pad->pbegx,
-			pad->sbegy, pad->sbegx, pad->smaxy, pad->smaxx);
-	return retval;
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/echochar.c b/lib/libcurses/echochar.c
deleted file mode 100644
index a615fc719..000000000
--- a/lib/libcurses/echochar.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: echochar.c,v 1.2 2008/04/29 06:53:01 martin Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: echochar.c,v 1.2 2008/04/29 06:53:01 martin Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-/*
- * echochar --
- *	Echo character and attributes on stdscr and refresh stdscr.
- */
-int
-echochar(const chtype ch)
-{
-
-	return wechochar(stdscr, ch);
-}
-#endif	/* _CURSES_USE_MACROS */
-
-/*
- * echochar --
- *	Echo character and attributes on "win" and refresh "win".
- */
-int
-wechochar(WINDOW *win, const chtype ch)
-{
-	int retval;
-
-	retval = waddch(win, ch);
-	if (retval == OK)
-		 retval = wrefresh(win);
-	return retval;
-}
-
-/*
- * pechochar --
- *	Echo character and attributes on "pad" and refresh "pad" at
- *	its previous position on the screen.
- */
-int
-pechochar(WINDOW *pad, const chtype ch)
-{
-	int retval;
-
-	retval = waddch(pad, ch);
-	if (retval == OK)
-		 retval = prefresh(pad, pad->pbegy, pad->pbegx,
-		    pad->sbegy, pad->sbegx, pad->smaxy, pad->smaxx);
-	return retval;
-}
diff --git a/lib/libcurses/erase.c b/lib/libcurses/erase.c
deleted file mode 100644
index 85b0addf8..000000000
--- a/lib/libcurses/erase.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*	$NetBSD: erase.c,v 1.25 2011/07/10 12:11:49 blymn Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)erase.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: erase.c,v 1.25 2011/07/10 12:11:49 blymn Exp $");
-#endif
-#endif				/* not lint */
-
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * erase --
- *	Erases everything on stdscr.
- */
-int
-erase(void)
-{
-	return werase(stdscr);
-}
-
-#endif
-
-/*
- * werase --
- *	Erases everything on the window.
- */
-int
-werase(WINDOW *win)
-{
-
-	int     y;
-	__LDATA *sp, *end, *start;
-	attr_t	attr;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_ERASE, "werase: (%p)\n", win);
-#endif
-	if (win != curscr)
-		attr = win->battr & __ATTRIBUTES;
-	else
-		attr = 0;
-	for (y = 0; y < win->maxy; y++) {
-		start = win->alines[y]->line;
-		end = &start[win->maxx];
-		for (sp = start; sp < end; sp++)
-#ifndef HAVE_WCHAR
-			if (sp->ch != win->bch || sp->attr != 0) {
-#else
-			if (sp->ch != ( wchar_t )btowc(( int ) win->bch ) ||
-			    (sp->attr & WA_ATTRIBUTES) != 0 || sp->nsp) {
-#endif /* HAVE_WCHAR */
-				if (sp->attr & __ALTCHARSET)
-					sp->attr = attr | __ALTCHARSET;
-				else
-					sp->attr = attr;
-#ifdef HAVE_WCHAR
-				sp->ch = ( wchar_t )btowc(( int ) win->bch);
-				if (_cursesi_copy_nsp(win->bnsp, sp) == ERR)
-					return ERR;
-				SET_WCOL( *sp, 1 );
-#else
-				sp->ch = win->bch;
-#endif /* HAVE_WCHAR */
-			}
-	}
-	/*
-	 * Mark the whole window as changed in case we have overlapping
-	 * windows - this will result in the (intended) clearing of the
-	 * screen over the area covered by the window. */
-	__touchwin(win);
-	wmove(win, 0, 0);
-	return (OK);
-}
diff --git a/lib/libcurses/fileio.c b/lib/libcurses/fileio.c
deleted file mode 100644
index 4065fc115..000000000
--- a/lib/libcurses/fileio.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*	$NetBSD: fileio.c,v 1.4 2009/07/22 16:57:14 roy Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: fileio.c,v 1.4 2009/07/22 16:57:14 roy Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-#include "fileio.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef HAVE_WCHAR
-static int __putnsp(nschar_t *, FILE *);
-static int __getnsp(nschar_t *, FILE *);
-#endif /* HAVE_WCHAR */
-
-#ifdef HAVE_WCHAR
-/*
- * __putnsp --
- *	Write non-spacing character chain to file, consisting of:
- *	((int) 1, (wchar_t) ch) pairs followed by (int) 0.
- */
-static int
-__putnsp(nschar_t *nsp, FILE *fp)
-{
-	int n;
-
-	n = 1;
-	while (nsp != NULL) {
-		if (fwrite(&n, sizeof(int), 1, fp) != 1)
-			return ERR;
-		if (fwrite(&nsp->ch, sizeof(wchar_t), 1, fp) != 1)
-			return ERR;
-	}
-	n = 0;
-	if (fwrite(&n, sizeof(int), 1, fp) != 1)
-		return ERR;
-
-	return OK;
-}
-#endif /* HAVE_WCHAR */
-
-/*
- * putwin --
- *	Write window data to file
- */
-int
-putwin(WINDOW *win, FILE *fp)
-{
-	int major = CURSES_LIB_MAJOR;
-	int minor = CURSES_LIB_MINOR;
-	int y, x;
-	__LDATA *sp;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_FILEIO, "putwin: win %p\n", win);
-#endif
-
-	if (win == NULL)
-		return ERR;
-
-	/* win can't be a subwin */
-	if (win->orig != NULL)
-		return ERR;
-
-	/* Library version */
-	if (fwrite(&major, sizeof(int), 1, fp) != 1)
-		return ERR;
-	if (fwrite(&minor, sizeof(int), 1, fp) != 1)
-		return ERR;
-
-	/* Window parameters */
-	if (fwrite(win, sizeof(WINDOW), 1, fp) != 1)
-		return ERR;
-#ifdef HAVE_WCHAR
-	/* Background non-spacing character */
-	if (__putnsp(win->bnsp, fp) == ERR)
-		return ERR;
-#endif /* HAVE_WCHAR */
-
-	/* Lines and line data */
-	for (y = 0; y < win->maxy; y++)
-		for (sp = win->alines[y]->line, x = 0; x < win->maxx;
-		    x++, sp++) {
-			if (fwrite(&sp->ch, sizeof(wchar_t), 1, fp) != 1)
-				return ERR;
-			if (fwrite(&sp->attr, sizeof(attr_t), 1, fp) != 1)
-				return ERR;
-#ifdef HAVE_WCHAR
-			if (sp->nsp != NULL) {
-				if (__putnsp(win->bnsp, fp) == ERR)
-					return ERR;
-			}
-#endif /* HAVE_WCHAR */
-		}
-
-	return OK;
-}
-
-#ifdef HAVE_WCHAR
-/*
- * __getnsp --
- *	Read non-spacing character chain from file
- */
-static int
-__getnsp(nschar_t *nsp, FILE *fp)
-{
-	int n;
-	nschar_t *onsp, *tnsp;
-
-	if (fread(&n, sizeof(int), 1, fp) != 1)
-		return ERR;
-	onsp = nsp;
-	while (n != 0) {
-		tnsp = (nschar_t *)malloc(sizeof(nschar_t));
-		if (tnsp == NULL) {
-			__cursesi_free_nsp(nsp);
-			return OK;
-		}
-		if (fread(&tnsp->ch, sizeof(wchar_t), 1, fp) != 1) {
-			__cursesi_free_nsp(nsp);
-			return OK;
-		}
-		tnsp->next = NULL;
-		onsp->next = tnsp;
-		onsp = onsp->next;
-		if (fread(&n, sizeof(int), 1, fp) != 1) {
-			__cursesi_free_nsp(nsp);
-			return ERR;
-		}
-	}
-	return OK;
-}
-#endif /* HAVE_WCHAR */
-
-/*
- * getwin --
- *	Read window data from file
- */
-WINDOW *
-getwin(FILE *fp)
-{
-	int major, minor;
-	WINDOW *wtmp, *win;
-	int y, x;
-	__LDATA *sp;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_FILEIO, "getwin\n");
-#endif
-
-	/* Check library version */
-	if (fread(&major, sizeof(int), 1, fp) != 1)
-		return NULL;
-	if (fread(&minor, sizeof(int), 1, fp) != 1)
-		return NULL;
-	if(major != CURSES_LIB_MAJOR || minor != CURSES_LIB_MINOR)
-		return NULL;
-
-	/* Window parameters */
-	wtmp = (WINDOW *)malloc(sizeof(WINDOW));
-	if (wtmp == NULL)
-		return NULL;
-	if (fread(wtmp, sizeof(WINDOW), 1, fp) != 1)
-		goto error0;
-	win = __newwin(_cursesi_screen, wtmp->maxy, wtmp->maxx,
-	    wtmp->begy, wtmp->begx, FALSE);
-	if (win == NULL)
-		goto error0;
-	win->cury = wtmp->cury;
-	win->curx = wtmp->curx;
-	win->reqy = wtmp->reqy;
-	win->reqx = wtmp->reqx;
-	win->flags = wtmp->flags;
-	win->delay = wtmp->delay;
-	win->wattr = wtmp->wattr;
-	win->bch = wtmp->bch;
-	win->battr = wtmp->battr;
-	win->scr_t = wtmp->scr_t;
-	win->scr_b = wtmp->scr_b;
-	free(wtmp);
-	wtmp = NULL;
-	__swflags(win);
-
-#ifdef HAVE_WCHAR
-	if (__getnsp(win->bnsp, fp) == ERR)
-		goto error1;
-#endif /* HAVE_WCHAR */
-
-	/* Lines and line data */
-	for (y = 0; y < win->maxy; y++) {
-		for (sp = win->alines[y]->line, x = 0; x < win->maxx;
-		    x++, sp++) {
-			if (fread(&sp->ch, sizeof(wchar_t), 1, fp) != 1)
-				goto error1;
-			if (fread(&sp->attr, sizeof(attr_t), 1, fp) != 1)
-				goto error1;
-#ifdef HAVE_WCHAR
-			if (sp->nsp != NULL) {
-				if (__getnsp(win->bnsp, fp) == ERR)
-					goto error1;
-			}
-#endif /* HAVE_WCHAR */
-		}
-		__touchline(win, y, 0, (int) win->maxx - 1);
-	}
-#ifdef DEBUG
-	__CTRACE(__CTRACE_FILEIO, "getwin: win = 0x%p\n", win);
-#endif
-	return win;
-
-error1:
-	delwin(win);
-error0:
-	if (wtmp)
-		free(wtmp);
-	return NULL;
-}
diff --git a/lib/libcurses/fileio.h b/lib/libcurses/fileio.h
deleted file mode 100644
index ef38907b3..000000000
--- a/lib/libcurses/fileio.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Do not edit!  Automatically generated file:
- *   from: NetBSD: shlib_version,v 1.40 2009/01/11 03:07:47 christos Exp 
- *   by  : NetBSD: genfileioh.awk,v 1.2 2008/05/02 11:13:02 martin Exp 
- */
-
-#define CURSES_LIB_MAJOR 7
-#define CURSES_LIB_MINOR 0
diff --git a/lib/libcurses/flushok.c b/lib/libcurses/flushok.c
deleted file mode 100644
index 25f86745d..000000000
--- a/lib/libcurses/flushok.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: flushok.c,v 1.5 2008/04/28 20:23:01 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: flushok.c,v 1.5 2008/04/28 20:23:01 martin Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * flushok --
- *	Turn on and off Fflush(stdout) after refresh for the given window.
- */
-int
-flushok(WINDOW *win, bool bf)
-{
-	if (bf)
-		win->flags |= __FLUSH;
-	else
-		win->flags &= ~__FLUSH;
-	return (OK);
-}
diff --git a/lib/libcurses/fullname.c b/lib/libcurses/fullname.c
deleted file mode 100644
index 026c5c78c..000000000
--- a/lib/libcurses/fullname.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: fullname.c,v 1.11 2003/08/07 16:44:21 agc Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)fullname.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: fullname.c,v 1.11 2003/08/07 16:44:21 agc Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-
-/*
- * fullname --
- *	This routine fills in "def" with the full name of the terminal.
- *	This is assumed to be the last name in the list of aliases.
- */
-char   *
-fullname(const char *bp, char *def)
-{
-	char   *cp;
-
-	*def = '\0';		/* In case no name. */
-
-	while (*bp && *bp != ':') {
-		cp = def;	/* Start of answer. */
-		while (*bp && *bp != ':' && *bp != '|')
-			*cp++ = *bp++;	/* Copy name over. */
-		*cp = '\0';	/* Zero end of name. */
-		if (*bp == '|')
-			bp++;	/* Skip over '|' if that is case. */
-	}
-	return (def);
-}
diff --git a/lib/libcurses/genfileioh.awk b/lib/libcurses/genfileioh.awk
deleted file mode 100644
index 3106d4d56..000000000
--- a/lib/libcurses/genfileioh.awk
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/awk -F
-#
-#	$NetBSD: genfileioh.awk,v 1.2 2008/05/02 11:13:02 martin Exp $
-#
-# Copyright (c) 2008 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Julian Coleman.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-function mangle_vers(vers) {
-	sub("^.*\\$NetBSD", "NetBSD", vers);
-	sub("\\$[^$]*$", "", vers);
-	return vers;
-}
-
-BEGIN {
-	MYVER="$NetBSD: genfileioh.awk,v 1.2 2008/05/02 11:13:02 martin Exp $";
-	MYVER=mangle_vers(MYVER);
-}
-
-{
-	if ($0 ~/\$NetBSD:/) {
-		SHVER=mangle_vers($0);
-	}
-	if ($1 ~ /^major=/) {
-		MAJ=$1;
-		sub("^major=", "", MAJ);
-	}
-	if ($1 ~ /^minor=/) {
-		MIN=$1;
-		sub("^minor=", "", MIN);
-	}
-}
-
-END {
-	printf("/*\n");
-	printf(" * Do not edit!  Automatically generated file:\n");
-	printf(" *   from: %s\n", SHVER);
-	printf(" *   by  : %s\n", MYVER);
-	printf(" */\n");
-	printf("\n");
-	printf("#define CURSES_LIB_MAJOR %s\n", MAJ);
-	printf("#define CURSES_LIB_MINOR %s\n", MIN);
-}
diff --git a/lib/libcurses/get_wch.c b/lib/libcurses/get_wch.c
deleted file mode 100644
index 0e69334a4..000000000
--- a/lib/libcurses/get_wch.c
+++ /dev/null
@@ -1,658 +0,0 @@
-/*   $NetBSD: get_wch.c,v 1.10 2012/06/29 10:40:29 blymn Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation Inc.
- * All rights reserved.
- *
- * This code is derived from code donated to the NetBSD Foundation
- * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@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.
- * 3. Neither the name of the NetBSD Foundation nor the names of its
- *	contributors may be used to endorse or promote products derived
- *	from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
- * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: get_wch.c,v 1.10 2012/06/29 10:40:29 blymn Exp $");
-#endif						  /* not lint */
-
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include "curses.h"
-#include "curses_private.h"
-#include "keymap.h"
-
-#ifdef HAVE_WCHAR
-static short   wstate;		  /* state of the wcinkey function */
-#endif /* HAVE_WCHAR */
-extern short state;		/* storage declared in getch.c */
-
-/* prototypes for private functions */
-#ifdef HAVE_WCHAR
-static int inkey(wchar_t *wc, int to, int delay);
-#endif /* HAVE_WCHAR */
-
-#ifdef HAVE_WCHAR
-/*
- * __init_get_wch - initialise all the pointers & structures needed to make
- * get_wch work in keypad mode.
- *
- */
-void
-__init_get_wch(SCREEN *screen)
-{
-	wstate = INKEY_NORM;
-	memset( &screen->cbuf, 0, sizeof(screen->cbuf));
-	screen->cbuf_head = screen->cbuf_tail = screen->cbuf_cur = 0;
-}
-#endif /* HAVE_WCHAR */
-
-
-#ifdef HAVE_WCHAR
-/*
- * inkey - do the work to process keyboard input, check for multi-key
- * sequences and return the appropriate symbol if we get a match.
- *
- */
-static int
-inkey(wchar_t *wc, int to, int delay)
-{
-	wchar_t		 k = 0;
-	int		  c, mapping, ret = 0;
-	size_t	  mlen = 0;
-	keymap_t	*current = _cursesi_screen->base_keymap;
-	FILE		*infd = _cursesi_screen->infd;
-	int		 *start = &_cursesi_screen->cbuf_head,
-				*working = &_cursesi_screen->cbuf_cur,
-				*end = &_cursesi_screen->cbuf_tail;
-	char		*inbuf = &_cursesi_screen->cbuf[ 0 ];
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "inkey (%p, %d, %d)\n", wc, to, delay);
-#endif
-	for (;;) { /* loop until we get a complete key sequence */
-		if (wstate == INKEY_NORM) {
-			if (delay && __timeout(delay) == ERR)
-				return ERR;
-			c = fgetc(infd);
-			if (c == WEOF) {
-				clearerr(infd);
-				return ERR;
-			}
-
-			if (delay && (__notimeout() == ERR))
-				return ERR;
-
-			k = (wchar_t) c;
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "inkey (wstate normal) got '%s'\n", unctrl(k));
-#endif
-
-			inbuf[ *end ] = k;
-			*end = ( *end + 1 ) % MAX_CBUF_SIZE;
-			*working = *start;
-			wstate = INKEY_ASSEMBLING; /* go to assembling state */
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "inkey: NORM=>ASSEMBLING: start(%d), "
-			    "current(%d), end(%d)\n", *start, *working, *end);
-#endif /* DEBUG */
-		} else if (wstate == INKEY_BACKOUT) {
-			k = inbuf[*working];
-			*working = ( *working + 1 ) % MAX_CBUF_SIZE;
-			if (*working == *end) {	/* see if run out of keys */
-				/* if so, switch to assembling */
-				wstate = INKEY_ASSEMBLING;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_INPUT,
-				    "inkey: BACKOUT=>ASSEMBLING, start(%d), "
-				    "current(%d), end(%d)\n",
-				    *start, *working, *end);
-#endif /* DEBUG */
-			}
-		} else if (wstate == INKEY_ASSEMBLING) {
-			/* assembling a key sequence */
-			if (delay) {
-				if (__timeout(to ? (ESCDELAY / 100) : delay)
-						== ERR)
-					return ERR;
-			} else {
-				if (to && (__timeout(ESCDELAY / 100) == ERR))
-					return ERR;
-			}
-
-			c = fgetc(infd);
-			if (ferror(infd)) {
-				clearerr(infd);
-				return ERR;
-			}
-
-			if ((to || delay) && (__notimeout() == ERR))
-				return ERR;
-
-			k = (wchar_t) c;
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "inkey (wstate assembling) got '%s'\n", unctrl(k));
-#endif /* DEBUG */
-			if (feof(infd)) { /* inter-char T/O, start backout */
-				clearerr(infd);
-				if (*start == *end)
-					/* no chars in the buffer, restart */
-					continue;
-
-				k = inbuf[*start];
-				wstate = INKEY_TIMEOUT;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_INPUT,
-				    "inkey: ASSEMBLING=>TIMEOUT, start(%d), "
-				    "current(%d), end(%d)\n",
-				    *start, *working, *end);
-#endif /* DEBUG */
-			} else {
-				inbuf[ *end ] = k;
-				*working = *end;
-				*end = ( *end + 1 ) % MAX_CBUF_SIZE;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_INPUT,
-				    "inkey: ASSEMBLING: start(%d), "
-				    "current(%d), end(%d)",
-				    *start, *working, *end);
-#endif /* DEBUG */
-			}
-		} else if (wstate == INKEY_WCASSEMBLING) {
-			/* assembling a wide-char sequence */
-			if (delay) {
-				if (__timeout(to ? (ESCDELAY / 100) : delay)
-						== ERR)
-					return ERR;
-			} else {
-				if (to && (__timeout(ESCDELAY / 100) == ERR))
-					return ERR;
-			}
-
-			c = fgetc(infd);
-			if (ferror(infd)) {
-				clearerr(infd);
-				return ERR;
-			}
-
-			if ((to || delay) && (__notimeout() == ERR))
-				return ERR;
-
-			k = (wchar_t) c;
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "inkey (wstate wcassembling) got '%s'\n",
-				unctrl(k));
-#endif
-			if (feof(infd)) { /* inter-char T/O, start backout */
-				clearerr(infd);
-				if (*start == *end)
-					/* no chars in the buffer, restart */
-					continue;
-
-				*wc = inbuf[*start];
-				*working = *start
-					= ( *start + 1 ) % MAX_CBUF_SIZE;
-				if (*start == *end) {
-					state = wstate = INKEY_NORM;
-#ifdef DEBUG
-					__CTRACE(__CTRACE_INPUT,
-					    "inkey: WCASSEMBLING=>NORM, "
-					    "start(%d), current(%d), end(%d)",
-					    *start, *working, *end);
-#endif /* DEBUG */
-				} else {
-					state = wstate = INKEY_BACKOUT;
-#ifdef DEBUG
-					__CTRACE(__CTRACE_INPUT,
-					    "inkey: WCASSEMBLING=>BACKOUT, "
-					    "start(%d), current(%d), end(%d)",
-					    *start, *working, *end);
-#endif /* DEBUG */
-				}
-				return OK;
-			} else {
-				/* assembling wide characters */
-				inbuf[ *end ] = k;
-				*working = *end;
-				*end = ( *end + 1 ) % MAX_CBUF_SIZE;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_INPUT,
-				    "inkey: WCASSEMBLING[head(%d), "
-				    "urrent(%d), tail(%d)]\n",
-				    *start, *working, *end);
-#endif /* DEBUG */
-				ret = (int) mbrtowc( wc, inbuf + (*working), 1,
-					&_cursesi_screen->sp );
-#ifdef DEBUG
-				__CTRACE(__CTRACE_INPUT,
-				    "inkey: mbrtowc returns %d, wc(%x)\n",
-				    ret, *wc );
-#endif /* DEBUG */
-				if ( ret == -2 ) {
-					*working = (*working + 1)
-						% MAX_CBUF_SIZE;
-					continue;
-				}
-				if ( ret == 0 )
-					ret = 1;
-				if ( ret == -1 ) {
-					/* return the 1st character we know */
-					*wc = inbuf[ *start ];
-					*working = *start = ( *start + 1 ) % MAX_CBUF_SIZE;
-#ifdef DEBUG
-					__CTRACE(__CTRACE_INPUT,
-					    "inkey: Invalid wide char(%x) "
-					    "[head(%d), current(%d), "
-					    "tail(%d)]\n",
-					    *wc, *start, *working, *end);
-#endif /* DEBUG */
-				} else { /* > 0 */
-					/* return the wide character */
-					*start = *working
-					       = (*working + ret)%MAX_CBUF_SIZE;
-#ifdef DEBUG
-					__CTRACE(__CTRACE_INPUT,
-					    "inkey: Wide char found(%x) "
-					    "[head(%d), current(%d), "
-					    "tail(%d)]\n",
-					    *wc, *start, *working, *end);
-#endif /* DEBUG */
-				}
-
-				if (*start == *end) {	/* only one char processed */
-					state = wstate = INKEY_NORM;
-#ifdef DEBUG
-					__CTRACE(__CTRACE_INPUT,
-					    "inkey: WCASSEMBLING=>NORM, "
-					    "start(%d), current(%d), end(%d)",
-					    *start, *working, *end);
-#endif /* DEBUG */
-				} else {
-					/* otherwise we must have more than one char to backout */
-					state = wstate = INKEY_BACKOUT;
-#ifdef DEBUG
-					__CTRACE(__CTRACE_INPUT,
-					    "inkey: WCASSEMBLING=>BACKOUT, "
-					    "start(%d), current(%d), end(%d)",
-					    *start, *working, *end);
-#endif /* DEBUG */
-				}
-				return OK;
-			}
-		} else {
-			fprintf(stderr, "Inkey wstate screwed - exiting!!!");
-			exit(2);
-		}
-
-		/*
-		 * Check key has no special meaning and we have not
-		 * timed out and the key has not been disabled
-		 */
-		mapping = current->mapping[k];
-		if (((wstate == INKEY_TIMEOUT) || (mapping < 0))
-				|| ((current->key[mapping]->type
-					== KEYMAP_LEAF)
-				&& (current->key[mapping]->enable == FALSE))) {
-			/* wide-character specific code */
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "inkey: Checking for wide char\n");
-#endif /* DEBUG */
-			mbrtowc( NULL, NULL, 1, &_cursesi_screen->sp );
-			*working = *start;
-			mlen = *end > *working ?
-				*end - *working : MAX_CBUF_SIZE - *working;
-			if ( !mlen )
-				return ERR;
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "inkey: Check wide char[head(%d), "
-			    "current(%d), tail(%d), mlen(%ld)]\n",
-			    *start, *working, *end, (long) mlen);
-#endif /* DEBUG */
-			ret = (int) mbrtowc( wc, inbuf + (*working), mlen,
-				&_cursesi_screen->sp );
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "inkey: mbrtowc returns %d, wc(%x)\n", ret, *wc);
-#endif /* DEBUG */
-			if ( ret == -2 && *end < *working ) {
-				/* second half of a wide character */
-				*working = 0;
-				mlen = *end;
-				if ( mlen )
-					ret = (int) mbrtowc( wc, inbuf, mlen,
-						&_cursesi_screen->sp );
-			}
-			if ( ret == -2 && wstate != INKEY_TIMEOUT ) {
-				*working = (*working + (int) mlen)
-					% MAX_CBUF_SIZE;
-				wstate = INKEY_WCASSEMBLING;
-				continue;
-			}
-			if ( ret == 0 )
-				ret = 1;
-			if ( ret == -1 ) {
-				/* return the first key we know about */
-				*wc = inbuf[ *start ];
-				*working = *start
-					= ( *start + 1 ) % MAX_CBUF_SIZE;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_INPUT,
-				    "inkey: Invalid wide char(%x)[head(%d), "
-				    "current(%d), tail(%d)]\n",
-				    *wc, *start, *working, *end);
-#endif /* DEBUG */
-			} else { /* > 0 */
-				/* return the wide character */
-				*start = *working
-					= ( *working + ret ) % MAX_CBUF_SIZE;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_INPUT,
-				    "inkey: Wide char found(%x)[head(%d), "
-				    "current(%d), tail(%d)]\n",
-				    *wc, *start, *working, *end);
-#endif /* DEBUG */
-			}
-
-			if (*start == *end) {	/* only one char processed */
-				state = wstate = INKEY_NORM;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_INPUT,
-				    "inkey: Empty cbuf=>NORM, "
-				    "start(%d), current(%d), end(%d)\n",
-				    *start, *working, *end);
-#endif /* DEBUG */
-			} else {
-				/* otherwise we must have more than one char to backout */
-				state = wstate = INKEY_BACKOUT;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_INPUT,
-				    "inkey: Non-empty cbuf=>BACKOUT, "
-				    "start(%d), current(%d), end(%d)\n",
-				    *start, *working, *end);
-#endif /* DEBUG */
-			}
-			return OK;
-		} else {	/* must be part of a multikey sequence */
-					/* check for completed key sequence */
-			if (current->key[current->mapping[k]]->type
-					== KEYMAP_LEAF) {
-				/* eat the key sequence in cbuf */
-				*start = *working = ( *working + 1 ) % MAX_CBUF_SIZE;
-
-				/* check if inbuf empty now */
-#ifdef DEBUG
-				__CTRACE(__CTRACE_INPUT,
-				    "inkey: Key found(%s)\n",
-				    key_name(current->key[mapping]->value.symbol));
-#endif /* DEBUG */
-				if (*start == *end) {
-					/* if it is go back to normal */
-					state = wstate = INKEY_NORM;
-#ifdef DEBUG
-					__CTRACE(__CTRACE_INPUT,
-					    "[inkey]=>NORM, start(%d), "
-					    "current(%d), end(%d)",
-					    *start, *working, *end);
-#endif /* DEBUG */
-				} else {
-					/* otherwise go to backout state */
-					state = wstate = INKEY_BACKOUT;
-#ifdef DEBUG
-					__CTRACE(__CTRACE_INPUT,
-					    "[inkey]=>BACKOUT, start(%d), "
-					    "current(%d), end(%d)",
-					    *start, *working, *end );
-#endif /* DEBUG */
-				}
-
-				/* return the symbol */
-				*wc = current->key[mapping]->value.symbol;
-				return KEY_CODE_YES;
-			} else {
-				/* Step to next part of multi-key sequence */
-				current = current->key[current->mapping[k]]->value.next;
-			}
-		}
-	}
-}
-#endif /* HAVE_WCHAR */
-
-/*
- * get_wch --
- *	Read in a wide character from stdscr.
- */
-int
-get_wch(wint_t *ch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return wget_wch(stdscr, ch);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvget_wch --
- *	  Read in a character from stdscr at the given location.
- */
-int
-mvget_wch(int y, int x, wint_t *ch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwget_wch(stdscr, y, x, ch);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvwget_wch --
- *	  Read in a character from stdscr at the given location in the
- *	  given window.
- */
-int
-mvwget_wch(WINDOW *win, int y, int x, wint_t *ch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return wget_wch(win, ch);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * wget_wch --
- *	Read in a wide character from the window.
- */
-int
-wget_wch(WINDOW *win, wint_t *ch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	int ret, weset;
-	int c;
-	FILE *infd = _cursesi_screen->infd;
-	cchar_t wc;
-	wchar_t inp, ws[ 2 ];
-
-	if (!(win->flags & __SCROLLOK) && (win->flags & __FULLWIN)
-			&& win->curx == win->maxx - 1
-			&& win->cury == win->maxy - 1
-			&& __echoit)
-		return (ERR);
-
-	if (is_wintouched(win))
-		wrefresh(win);
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "wget_wch: __echoit = %d, "
-	    "__rawmode = %d, __nl = %d, flags = %#.4x\n",
-	    __echoit, __rawmode, _cursesi_screen->nl, win->flags);
-#endif
-	if (_cursesi_screen->resized) {
-		_cursesi_screen->resized = 0;
-		*ch = KEY_RESIZE;
-		return KEY_CODE_YES;
-	}
-	if (_cursesi_screen->unget_pos) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT, "wget_wch returning char at %d\n",
-		    _cursesi_screen->unget_pos);
-#endif
-		_cursesi_screen->unget_pos--;
-		*ch = _cursesi_screen->unget_list[_cursesi_screen->unget_pos];
-		if (__echoit) {
-			ws[0] = *ch, ws[1] = L'\0';
-			setcchar(&wc, ws, win->wattr, 0, NULL);
-			wadd_wch(win, &wc);
-		}
-		return KEY_CODE_YES;
-	}
-	if (__echoit && !__rawmode) {
-		cbreak();
-		weset = 1;
-	} else
-		weset = 0;
-
-	__save_termios();
-
-	if (win->flags & __KEYPAD) {
-		switch (win->delay) {
-			case -1:
-				ret = inkey(&inp,
-					win->flags & __NOTIMEOUT ? 0 : 1, 0);
-				break;
-			case 0:
-				if (__nodelay() == ERR)
-					return ERR;
-				ret = inkey(&inp, 0, 0);
-				break;
-			default:
-				ret = inkey(&inp,
-					win->flags & __NOTIMEOUT ? 0 : 1,
-					win->delay);
-				break;
-		}
-		if ( ret == ERR )
-			return ERR;
-	} else {
-		switch (win->delay) {
-			case -1:
-				break;
-			case 0:
-				if (__nodelay() == ERR)
-					return ERR;
-				break;
-			default:
-				if (__timeout(win->delay) == ERR)
-					return ERR;
-				break;
-		}
-
-		c = getwchar();
-		if (feof(infd)) {
-			clearerr(infd);
-			__restore_termios();
-			return ERR;	/* we have timed out */
-		}
-
-		if (ferror(infd)) {
-			clearerr(infd);
-			return ERR;
-		} else {
-			ret = c;
-			inp = c;
-		}
-	}
-#ifdef DEBUG
-	if (inp > 255)
-		/* we have a key symbol - treat it differently */
-		/* XXXX perhaps __unctrl should be expanded to include
-		 * XXXX the keysyms in the table....
-		 */
-		__CTRACE(__CTRACE_INPUT, "wget_wch assembled keysym 0x%x\n",
-		    inp);
-	else
-		__CTRACE(__CTRACE_INPUT, "wget_wch got '%s'\n", unctrl(inp));
-#endif
-	if (win->delay > -1) {
-		if (__delay() == ERR)
-			return ERR;
-	}
-
-	__restore_termios();
-
-	if (__echoit) {
-		if ( ret == KEY_CODE_YES ) {
-			/* handle [DEL], [BS], and [LEFT] */
-			if ( win->curx &&
-					( inp == KEY_DC ||
-					  inp == KEY_BACKSPACE ||
-					  inp == KEY_LEFT )) {
-				wmove( win, win->cury, win->curx - 1 );
-				wdelch( win );
-			}
-		} else {
-			ws[ 0 ] = inp, ws[ 1 ] = L'\0';
-			setcchar( &wc, ws, win->wattr, 0, NULL );
-			wadd_wch( win, &wc );
-		}
-	}
-
-	if (weset)
-		nocbreak();
-
-	if (_cursesi_screen->nl && inp == 13)
-		inp = 10;
-
-	*ch = inp;
-
-	if ( ret == KEY_CODE_YES )
-		return KEY_CODE_YES;
-	return ( inp < 0 ? ERR : OK );
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * unget_wch --
- *	 Put the wide character back into the input queue.
- */
-int
-unget_wch(const wchar_t c)
-{
-	return __unget((wint_t) c);
-}
diff --git a/lib/libcurses/get_wstr.c b/lib/libcurses/get_wstr.c
deleted file mode 100644
index b95c8276e..000000000
--- a/lib/libcurses/get_wstr.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*   $NetBSD: get_wstr.c,v 1.3 2008/04/14 20:33:59 jdc Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation Inc.
- * All rights reserved.
- *
- * This code is derived from code donated to the NetBSD Foundation
- * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@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.
- * 3. Neither the name of the NetBSD Foundation nor the names of its
- *	contributors may be used to endorse or promote products derived
- *	from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
- * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: get_wstr.c,v 1.3 2008/04/14 20:33:59 jdc Exp $");
-#endif						  /* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/* prototypes for private functions */
-#ifdef HAVE_WCHAR
-static int __wgetn_wstr(WINDOW *, wchar_t *, int);
-#endif /* HAVE_WCHAR */
-
-/*
- * getn_wstr --
- *	Get a string (of maximum n) characters from stdscr starting at
- *	(cury, curx).
- */
-int
-getn_wstr(wchar_t *wstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return wgetn_wstr(stdscr, wstr, n);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * get_wstr --
- *	Get a string from stdscr starting at (cury, curx).
- */
-__warn_references(get_wstr,
-	"warning: this program uses get_wstr(), which is unsafe.")
-int
-get_wstr(wchar_t *wstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return wget_wstr(stdscr, wstr);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvgetn_wstr --
- *  Get a string (of maximum n) characters from stdscr starting at (y, x).
- */
-int
-mvgetn_wstr(int y, int x, wchar_t *wstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwgetn_wstr(stdscr, y, x, wstr, n);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvget_wstr --
- *	  Get a string from stdscr starting at (y, x).
- */
-__warn_references(mvget_wstr,
-	"warning: this program uses mvget_wstr(), which is unsafe.")
-int
-mvget_wstr(int y, int x, wchar_t *wstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwget_wstr(stdscr, y, x, wstr);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvwgetn_wstr --
- *  Get a string (of maximum n) characters from the given window starting
- *	at (y, x).
- */
-int
-mvwgetn_wstr(WINDOW *win, int y, int x, wchar_t *wstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return wgetn_wstr(win, wstr, n);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvwget_wstr --
- *	  Get a string from the given window starting at (y, x).
- */
-__warn_references(mvget_wstr,
-	"warning: this program uses mvget_wstr(), which is unsafe.")
-int
-mvwget_wstr(WINDOW *win, int y, int x, wchar_t *wstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return wget_wstr(win, wstr);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * wget_wstr --
- *	Get a string starting at (cury, curx).
- */
-__warn_references(wget_wstr,
-	"warning: this program uses wget_wstr(), which is unsafe.")
-int
-wget_wstr(WINDOW *win, wchar_t *wstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return __wgetn_wstr(win, wstr, -1);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * wgetn_wstr --
- *	Get a string starting at (cury, curx).
- *	Note that n <  2 means that we return ERR (SUSv2 specification).
- */
-int
-wgetn_wstr(WINDOW *win, wchar_t *wstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (n < 1)
-		return (ERR);
-	if (n == 1) {
-		wstr[0] = L'\0';
-		return (ERR);
-	}
-	return __wgetn_wstr(win, wstr, n);
-#endif /* HAVE_WCHAR */
-}
-
-#ifdef HAVE_WCHAR
-/*
- * __wgetn_wstr --
- *	The actual implementation.
- *	Note that we include a trailing L'\0' for safety, so str will contain
- *	at most n - 1 other characters.
- */
-int
-__wgetn_wstr(WINDOW *win, wchar_t *wstr, int n)
-{
-	wchar_t *ostr, ec, kc, sc[ 2 ];
-	int oldx, remain;
-	wint_t wc;
-	cchar_t cc;
-
-	ostr = wstr;
-	if ( erasewchar( &ec ) == ERR )
-		return ERR;
-	if ( killwchar( &kc ) == ERR )
-		return ERR;
-	sc[ 0 ] = ( wchar_t )btowc( ' ' );
-	sc[ 1 ] = L'\0';
-	setcchar( &cc, sc, win->wattr, 0, NULL );
-	oldx = win->curx;
-	remain = n - 1;
-
-	while (wget_wch(win, &wc) != ERR
-	       && wc != L'\n' && wc != L'\r') {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT,
-		    "__wgetn_wstr: win %p, char 0x%x, remain %d\n",
-		    win, wc, remain);
-#endif
-		*wstr = wc;
-		touchline(win, win->cury, 1);
-		if (wc == ec || wc == KEY_BACKSPACE || wc == KEY_LEFT) {
-			*wstr = L'\0';
-			if (wstr != ostr) {
-				if ((wchar_t)wc == ec) {
-					mvwadd_wch(win, win->cury,
-						win->curx, &cc);
-					wmove(win, win->cury, win->curx - 1);
-				}
-				if (wc == KEY_BACKSPACE || wc == KEY_LEFT) {
-					/* getch() displays the key sequence */
-					mvwadd_wch(win, win->cury,
-						win->curx - 1, &cc);
-					mvwadd_wch(win, win->cury,
-						win->curx - 2, &cc);
-					wmove(win, win->cury, win->curx - 1);
-				}
-				wstr--;
-				if (n != -1) {
-					/* We're counting chars */
-					remain++;
-				}
-			} else { /* str == ostr */
-				if (wc == KEY_BACKSPACE || wc == KEY_LEFT)
-					/* getch() displays the other keys */
-					mvwadd_wch(win, win->cury,
-						win->curx - 1, &cc);
-				wmove(win, win->cury, oldx);
-			}
-		} else if (wc == kc) {
-			*wstr = L'\0';
-			if (wstr != ostr) {
-				/* getch() displays the kill character */
-				mvwadd_wch(win, win->cury, win->curx - 1, &cc);
-				/* Clear the characters from screen and str */
-				while (wstr != ostr) {
-					mvwadd_wch(win, win->cury,
-						win->curx - 1, &cc);
-					wmove(win, win->cury, win->curx - 1);
-					wstr--;
-					if (n != -1)
-						/* We're counting chars */
-						remain++;
-				}
-				mvwadd_wch(win, win->cury, win->curx - 1, &cc);
-				wmove(win, win->cury, win->curx - 1);
-			} else
-				/* getch() displays the kill character */
-				mvwadd_wch( win, win->cury, oldx, &cc );
-			wmove(win, win->cury, oldx);
-		} else if (wc >= KEY_MIN && wc <= KEY_MAX) {
-			/* get_wch() displays these characters */
-			mvwadd_wch( win, win->cury, win->curx - 1, &cc );
-			wmove(win, win->cury, win->curx - 1);
-		} else {
-			if (remain) {
-				wstr++;
-				remain--;
-			} else {
-				mvwadd_wch(win, win->cury, win->curx - 1, &cc);
-				wmove(win, win->cury, win->curx - 1);
-			}
-		}
-	}
-
-	if (wc == ERR) {
-		*wstr = L'\0';
-		return ERR;
-	}
-	*wstr = L'\0';
-	return OK;
-}
-#endif /* HAVE_WCHAR */
diff --git a/lib/libcurses/getch.c b/lib/libcurses/getch.c
deleted file mode 100644
index 025313908..000000000
--- a/lib/libcurses/getch.c
+++ /dev/null
@@ -1,968 +0,0 @@
-/*	$NetBSD: getch.c,v 1.59 2012/04/21 12:27:28 roy Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)getch.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: getch.c,v 1.59 2012/04/21 12:27:28 roy Exp $");
-#endif
-#endif					/* not lint */
-
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include "curses.h"
-#include "curses_private.h"
-#include "keymap.h"
-
-short	state;		/* state of the inkey function */
-
-static const struct tcdata tc[] = {
-	{TICODE_kSAV, KEY_SSAVE},
-	{TICODE_kSPD, KEY_SSUSPEND},
-	{TICODE_kUND, KEY_SUNDO},
-	{TICODE_kHLP, KEY_SHELP},
-	{TICODE_kHOM, KEY_SHOME},
-	{TICODE_kIC, KEY_SIC},
-	{TICODE_kLFT, KEY_SLEFT},
-	{TICODE_krdo, KEY_REDO},
-	{TICODE_khlp, KEY_HELP},
-	{TICODE_kmrk, KEY_MARK},
-	{TICODE_kmsg, KEY_MESSAGE},
-	{TICODE_kmov, KEY_MOVE},
-	{TICODE_knxt, KEY_NEXT},
-	{TICODE_kopn, KEY_OPEN},
-	{TICODE_kopt, KEY_OPTIONS},
-	{TICODE_kprv, KEY_PREVIOUS},
-	{TICODE_kprt, KEY_PRINT},
-	{TICODE_kMSG, KEY_SMESSAGE},
-	{TICODE_kMOV, KEY_SMOVE},
-	{TICODE_kNXT, KEY_SNEXT},
-	{TICODE_kOPT, KEY_SOPTIONS},
-	{TICODE_kPRV, KEY_SPREVIOUS},
-	{TICODE_kPRT, KEY_SPRINT},
-	{TICODE_kRDO, KEY_SREDO},
-	{TICODE_kRPL, KEY_SREPLACE},
-	{TICODE_kRIT, KEY_SRIGHT},
-	{TICODE_kRES, KEY_SRSUME},
-	{TICODE_kCAN, KEY_SCANCEL},
-	{TICODE_kref, KEY_REFERENCE},
-	{TICODE_krfr, KEY_REFRESH},
-	{TICODE_krpl, KEY_REPLACE},
-	{TICODE_krst, KEY_RESTART},
-	{TICODE_kres, KEY_RESUME},
-	{TICODE_ksav, KEY_SAVE},
-	{TICODE_kspd, KEY_SUSPEND},
-	{TICODE_kund, KEY_UNDO},
-	{TICODE_kBEG, KEY_SBEG},
-	{TICODE_kFND, KEY_SFIND},
-	{TICODE_kCMD, KEY_SCOMMAND},
-	{TICODE_kCPY, KEY_SCOPY},
-	{TICODE_kCRT, KEY_SCREATE},
-	{TICODE_kDC, KEY_SDC},
-	{TICODE_kDL, KEY_SDL},
-	{TICODE_kslt, KEY_SELECT},
-	{TICODE_kEND, KEY_SEND},
-	{TICODE_kEOL, KEY_SEOL},
-	{TICODE_kEXT, KEY_SEXIT},
-	{TICODE_kfnd, KEY_FIND},
-	{TICODE_kbeg, KEY_BEG},
-	{TICODE_kcan, KEY_CANCEL},
-	{TICODE_kclo, KEY_CLOSE},
-	{TICODE_kcmd, KEY_COMMAND},
-	{TICODE_kcpy, KEY_COPY},
-	{TICODE_kcrt, KEY_CREATE},
-	{TICODE_kend, KEY_END},
-	{TICODE_kent, KEY_ENTER},
-	{TICODE_kext, KEY_EXIT},
-	{TICODE_kf11, KEY_F(11)},
-	{TICODE_kf12, KEY_F(12)},
-	{TICODE_kf13, KEY_F(13)},
-	{TICODE_kf14, KEY_F(14)},
-	{TICODE_kf15, KEY_F(15)},
-	{TICODE_kf16, KEY_F(16)},
-	{TICODE_kf17, KEY_F(17)},
-	{TICODE_kf18, KEY_F(18)},
-	{TICODE_kf19, KEY_F(19)},
-	{TICODE_kf20, KEY_F(20)},
-	{TICODE_kf21, KEY_F(21)},
-	{TICODE_kf22, KEY_F(22)},
-	{TICODE_kf23, KEY_F(23)},
-	{TICODE_kf24, KEY_F(24)},
-	{TICODE_kf25, KEY_F(25)},
-	{TICODE_kf26, KEY_F(26)},
-	{TICODE_kf27, KEY_F(27)},
-	{TICODE_kf28, KEY_F(28)},
-	{TICODE_kf29, KEY_F(29)},
-	{TICODE_kf30, KEY_F(30)},
-	{TICODE_kf31, KEY_F(31)},
-	{TICODE_kf32, KEY_F(32)},
-	{TICODE_kf33, KEY_F(33)},
-	{TICODE_kf34, KEY_F(34)},
-	{TICODE_kf35, KEY_F(35)},
-	{TICODE_kf36, KEY_F(36)},
-	{TICODE_kf37, KEY_F(37)},
-	{TICODE_kf38, KEY_F(38)},
-	{TICODE_kf39, KEY_F(39)},
-	{TICODE_kf40, KEY_F(40)},
-	{TICODE_kf41, KEY_F(41)},
-	{TICODE_kf42, KEY_F(42)},
-	{TICODE_kf43, KEY_F(43)},
-	{TICODE_kf44, KEY_F(44)},
-	{TICODE_kf45, KEY_F(45)},
-	{TICODE_kf46, KEY_F(46)},
-	{TICODE_kf47, KEY_F(47)},
-	{TICODE_kf48, KEY_F(48)},
-	{TICODE_kf49, KEY_F(49)},
-	{TICODE_kf50, KEY_F(50)},
-	{TICODE_kf51, KEY_F(51)},
-	{TICODE_kf52, KEY_F(52)},
-	{TICODE_kf53, KEY_F(53)},
-	{TICODE_kf54, KEY_F(54)},
-	{TICODE_kf55, KEY_F(55)},
-	{TICODE_kf56, KEY_F(56)},
-	{TICODE_kf57, KEY_F(57)},
-	{TICODE_kf58, KEY_F(58)},
-	{TICODE_kf59, KEY_F(59)},
-	{TICODE_kf60, KEY_F(60)},
-	{TICODE_kf61, KEY_F(61)},
-	{TICODE_kf62, KEY_F(62)},
-	{TICODE_kf63, KEY_F(63)},
-	{TICODE_ka1, KEY_A1},
-	{TICODE_kb2, KEY_B2},
-	{TICODE_ka3, KEY_A3},
-	{TICODE_kc1, KEY_C1},
-	{TICODE_kc3, KEY_C3},
-	{TICODE_kmous, KEY_MOUSE},
-	{TICODE_kf0, KEY_F0},
-	{TICODE_kf1, KEY_F(1)},
-	{TICODE_kf2, KEY_F(2)},
-	{TICODE_kf3, KEY_F(3)},
-	{TICODE_kf4, KEY_F(4)},
-	{TICODE_kf5, KEY_F(5)},
-	{TICODE_kf6, KEY_F(6)},
-	{TICODE_kf7, KEY_F(7)},
-	{TICODE_kf8, KEY_F(8)},
-	{TICODE_kf9, KEY_F(9)},
-	{TICODE_kf10, KEY_F(10)},
-	{TICODE_kil1, KEY_IL},
-	{TICODE_ktbc, KEY_CATAB},
-	{TICODE_kcbt, KEY_BTAB},
-	{TICODE_kbs, KEY_BACKSPACE},
-	{TICODE_kclr, KEY_CLEAR},
-	{TICODE_kdch1, KEY_DC},
-	{TICODE_kcud1, KEY_DOWN},
-	{TICODE_kel, KEY_EOL},
-	{TICODE_kind, KEY_SF},
-	{TICODE_kll, KEY_LL},
-	{TICODE_khome, KEY_HOME},
-	{TICODE_kich1, KEY_IC},
-	{TICODE_kdl1, KEY_DL},
-	{TICODE_kcub1, KEY_LEFT},
-	{TICODE_krmir, KEY_EIC},
-	{TICODE_knp, KEY_NPAGE},
-	{TICODE_kpp, KEY_PPAGE},
-	{TICODE_kri, KEY_SR},
-	{TICODE_kcuf1, KEY_RIGHT},
-	{TICODE_ked, KEY_EOS},
-	{TICODE_khts, KEY_STAB},
-	{TICODE_kctab, KEY_CTAB},
-	{TICODE_kcuu1, KEY_UP}
-};
-/* Number of TC entries .... */
-static const int num_tcs = (sizeof(tc) / sizeof(struct tcdata));
-
-int	ESCDELAY = 300;		/* Delay in ms between keys for esc seq's */
-
-/* Key buffer */
-#define INBUF_SZ 16		/* size of key buffer - must be larger than
-				 * longest multi-key sequence */
-static wchar_t	inbuf[INBUF_SZ];
-static int	start, end, working; /* pointers for manipulating inbuf data */
-
-/* prototypes for private functions */
-static void add_key_sequence(SCREEN *screen, char *sequence, int key_type);
-static key_entry_t *add_new_key(keymap_t *current, char ch, int key_type,
-        int symbol);
-static void delete_key_sequence(keymap_t *current, int key_type);
-static void do_keyok(keymap_t *current, int key_type, bool flag, int *retval);
-static keymap_t *new_keymap(void); /* create a new keymap */
-static key_entry_t *new_key(void); /* create a new key entry */
-static wchar_t		inkey(int to, int delay);
-
-/*
- * Free the storage associated with the given keymap
- */
-void
-_cursesi_free_keymap(keymap_t *map)
-{
-	int i;
-
-	  /* check for, and free, child keymaps */
-	for (i = 0; i < MAX_CHAR; i++) {
-		if (map->mapping[i] >= 0) {
-			if (map->key[map->mapping[i]]->type == KEYMAP_MULTI)
-				_cursesi_free_keymap(
-					map->key[map->mapping[i]]->value.next);
-		}
-	}
-
-	  /* now free any allocated keymap structs */
-	for (i = 0; i < map->count; i += KEYMAP_ALLOC_CHUNK) {
-		free(map->key[i]);
-	}
-
-	free(map->key);
-	free(map);
-}
-
-
-/*
- * Add a new key entry to the keymap pointed to by current.  Entry
- * contains the character to add to the keymap, type is the type of
- * entry to add (either multikey or leaf) and symbol is the symbolic
- * value for a leaf type entry.  The function returns a pointer to the
- * new keymap entry.
- */
-static key_entry_t *
-add_new_key(keymap_t *current, char chr, int key_type, int symbol)
-{
-	key_entry_t *the_key;
-        int i, ki;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC,
-	    "Adding character %s of type %d, symbol 0x%x\n",
-	    unctrl(chr), key_type, symbol);
-#endif
-	if (current->mapping[(unsigned char) chr] < 0) {
-		if (current->mapping[(unsigned char) chr] == MAPPING_UNUSED) {
-			  /* first time for this char */
-			current->mapping[(unsigned char) chr] =
-				current->count;	/* map new entry */
-			ki = current->count;
-
-			  /* make sure we have room in the key array first */
-			if ((current->count & (KEYMAP_ALLOC_CHUNK - 1)) == 0)
-			{
-				if ((current->key =
-				     realloc(current->key,
-					     ki * sizeof(key_entry_t *)
-					     + KEYMAP_ALLOC_CHUNK * sizeof(key_entry_t *))) == NULL) {
-					fprintf(stderr,
-					  "Could not malloc for key entry\n");
-					exit(1);
-				}
-
-				the_key = new_key();
-				for (i = 0; i < KEYMAP_ALLOC_CHUNK; i++) {
-					current->key[ki + i] = &the_key[i];
-				}
-			}
-                } else {
-			  /* the mapping was used but freed, reuse it */
-			ki = - current->mapping[(unsigned char) chr];
-			current->mapping[(unsigned char) chr] = ki;
-		}
-
-		current->count++;
-
-		  /* point at the current key array element to use */
-		the_key = current->key[ki];
-
-		the_key->type = key_type;
-
-		switch (key_type) {
-		  case KEYMAP_MULTI:
-			    /* need for next key */
-#ifdef DEBUG
-			  __CTRACE(__CTRACE_MISC, "Creating new keymap\n");
-#endif
-			  the_key->value.next = new_keymap();
-			  the_key->enable = TRUE;
-			  break;
-
-		  case KEYMAP_LEAF:
-				/* the associated symbol for the key */
-#ifdef DEBUG
-			  __CTRACE(__CTRACE_MISC, "Adding leaf key\n");
-#endif
-			  the_key->value.symbol = symbol;
-			  the_key->enable = TRUE;
-			  break;
-
-		  default:
-			  fprintf(stderr, "add_new_key: bad type passed\n");
-			  exit(1);
-		}
-	} else {
-		  /* the key is already known - just return the address. */
-#ifdef DEBUG
-		__CTRACE(__CTRACE_MISC, "Keymap already known\n");
-#endif
-		the_key = current->key[current->mapping[(unsigned char) chr]];
-	}
-
-        return the_key;
-}
-
-/*
- * Delete the given key symbol from the key mappings for the screen.
- *
- */
-void
-delete_key_sequence(keymap_t *current, int key_type)
-{
-	key_entry_t *key;
-	int i;
-
-	  /*
-	   * we need to iterate over all the keys as there may be
-	   * multiple instances of the leaf symbol.
-	   */
-	for (i = 0; i < MAX_CHAR; i++) {
-		if (current->mapping[i] < 0)
-			continue; /* no mapping for the key, next! */
-
-		key = current->key[current->mapping[i]];
-
-		if (key->type == KEYMAP_MULTI) {
-			  /* have not found the leaf, recurse down */
-			delete_key_sequence(key->value.next, key_type);
-			  /* if we deleted the last key in the map, free */
-			if (key->value.next->count == 0)
-				_cursesi_free_keymap(key->value.next);
-		} else if ((key->type == KEYMAP_LEAF)
-			   && (key->value.symbol == key_type)) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT, "delete_key_sequence: found keysym %d, deleting\n",
-		    key_type);
-#endif
-			key->enable = FALSE;
-		}
-	}
-}
-
-/*
- * Add the sequence of characters given in sequence as the key mapping
- * for the given key symbol.
- */
-void
-add_key_sequence(SCREEN *screen, char *sequence, int key_type)
-{
-	key_entry_t *tmp_key;
-	keymap_t *current;
-	int length, j, key_ent;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "add_key_sequence: add key sequence: %s(%s)\n",
-	    sequence, keyname(key_type));
-#endif /* DEBUG */
-	current = screen->base_keymap;	/* always start with
-					 * base keymap. */
-	length = (int) strlen(sequence);
-
-	/*
-	 * OK - we really should never get a zero length string here, either
-	 * the terminfo entry is there and it has a value or we are not called
-	 * at all.  Unfortunately, if someone assigns a terminfo string to the
-	 * ^@ value we get passed a null string which messes up our length.
-	 * So, if we get a null string then just insert a leaf value in
-	 * the 0th char position of the root keymap.  Note that we are
-	 * totally screwed if someone terminates a multichar sequence
-	 * with ^@... oh well.
-	 */
-	if (length == 0)
-		length = 1;
-
-	for (j = 0; j < length - 1; j++) {
-		  /* add the entry to the struct */
-		tmp_key = add_new_key(current, sequence[j], KEYMAP_MULTI, 0);
-
-		  /* index into the key array - it's
-		     clearer if we stash this */
-		key_ent = current->mapping[(unsigned char) sequence[j]];
-
-		current->key[key_ent] = tmp_key;
-
-		  /* next key uses this map... */
-		current = current->key[key_ent]->value.next;
-	}
-
-	/*
-	 * This is the last key in the sequence (it may have been the
-	 * only one but that does not matter) this means it is a leaf
-	 * key and should have a symbol associated with it.
-	 */
-	tmp_key = add_new_key(current, sequence[length - 1], KEYMAP_LEAF,
-			      key_type);
-	current->key[current->mapping[(int)sequence[length - 1]]] = tmp_key;
-}
-
-/*
- * Init_getch - initialise all the pointers & structures needed to make
- * getch work in keypad mode.
- *
- */
-void
-__init_getch(SCREEN *screen)
-{
-	char entry[1024], *p;
-	const char *s;
-	int     i;
-	size_t limit, l;
-#ifdef DEBUG
-	int k, length;
-#endif
-
-	/* init the inkey state variable */
-	state = INKEY_NORM;
-
-	/* init the base keymap */
-	screen->base_keymap = new_keymap();
-
-	/* key input buffer pointers */
-	start = end = working = 0;
-
-	/* now do the terminfo snarfing ... */
-
-	for (i = 0; i < num_tcs; i++) {
-		p = entry;
-		limit = 1023;
-		s = screen->term->strs[tc[i].code];
-		if (s == NULL)
-			continue;
-		l = strlen(s) + 1;
-		if (limit < l)
-			continue;
-		strlcpy(p, s, limit);
-		p += l;
-		limit -= l;
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INIT,
-			    "Processing terminfo entry %d, sequence ",
-			    tc[i].code);
-			length = (int) strlen(entry);
-			for (k = 0; k <= length -1; k++)
-				__CTRACE(__CTRACE_INIT, "%s", unctrl(entry[k]));
-			__CTRACE(__CTRACE_INIT, "\n");
-#endif
-		add_key_sequence(screen, entry, tc[i].symbol);
-	}
-}
-
-
-/*
- * new_keymap - allocates & initialises a new keymap structure.  This
- * function returns a pointer to the new keymap.
- *
- */
-static keymap_t *
-new_keymap(void)
-{
-	int     i;
-	keymap_t *new_map;
-
-	if ((new_map = malloc(sizeof(keymap_t))) == NULL) {
-		perror("Inkey: Cannot allocate new keymap");
-		exit(2);
-	}
-
-	/* Initialise the new map */
-	new_map->count = 0;
-	for (i = 0; i < MAX_CHAR; i++) {
-		new_map->mapping[i] = MAPPING_UNUSED; /* no mapping for char */
-	}
-
-	/* key array will be allocated when first key is added */
-	new_map->key = NULL;
-
-	return new_map;
-}
-
-/*
- * new_key - allocates & initialises a new key entry.  This function returns
- * a pointer to the newly allocated key entry.
- *
- */
-static key_entry_t *
-new_key(void)
-{
-	key_entry_t *new_one;
-	int i;
-
-	if ((new_one = malloc(KEYMAP_ALLOC_CHUNK * sizeof(key_entry_t)))
-	    == NULL) {
-		perror("inkey: Cannot allocate new key entry chunk");
-		exit(2);
-	}
-
-	for (i = 0; i < KEYMAP_ALLOC_CHUNK; i++) {
-		new_one[i].type = 0;
-		new_one[i].value.next = NULL;
-	}
-
-	return new_one;
-}
-
-/*
- * inkey - do the work to process keyboard input, check for multi-key
- * sequences and return the appropriate symbol if we get a match.
- *
- */
-
-wchar_t
-inkey(int to, int delay)
-{
-	wchar_t		 k;
-	int              c, mapping;
-	keymap_t	*current = _cursesi_screen->base_keymap;
-	FILE            *infd = _cursesi_screen->infd;
-
-	k = 0;		/* XXX gcc -Wuninitialized */
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "inkey (%d, %d)\n", to, delay);
-#endif
-	for (;;) {		/* loop until we get a complete key sequence */
-reread:
-		if (state == INKEY_NORM) {
-			if (delay && __timeout(delay) == ERR)
-				return ERR;
-			c = fgetc(infd);
-			if (c == EOF) {
-				clearerr(infd);
-				return ERR;
-			}
-
-			if (delay && (__notimeout() == ERR))
-				return ERR;
-
-			k = (wchar_t) c;
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "inkey (state normal) got '%s'\n", unctrl(k));
-#endif
-
-			working = start;
-			inbuf[working] = k;
-			INC_POINTER(working);
-			end = working;
-			state = INKEY_ASSEMBLING;	/* go to the assembling
-							 * state now */
-		} else if (state == INKEY_BACKOUT) {
-			k = inbuf[working];
-			INC_POINTER(working);
-			if (working == end) {	/* see if we have run
-						 * out of keys in the
-						 * backlog */
-
-				/* if we have then switch to assembling */
-				state = INKEY_ASSEMBLING;
-			}
-		} else if (state == INKEY_ASSEMBLING) {
-			/* assembling a key sequence */
-			if (delay) {
-				if (__timeout(to ? (ESCDELAY / 100) : delay)
-				    == ERR)
-					return ERR;
-			} else {
-				if (to && (__timeout(ESCDELAY / 100) == ERR))
-					return ERR;
-			}
-
-			c = fgetc(infd);
-			if (ferror(infd)) {
-				clearerr(infd);
-				return ERR;
-			}
-
-			if ((to || delay) && (__notimeout() == ERR))
-					return ERR;
-
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "inkey (state assembling) got '%s'\n", unctrl(k));
-#endif
-			if (feof(infd) || c == -1) {	/* inter-char timeout,
-							 * start backing out */
-				clearerr(infd);
-				if (start == end)
-					/* no chars in the buffer, restart */
-					goto reread;
-
-				k = inbuf[start];
-				state = INKEY_TIMEOUT;
-			} else {
-				k = (wchar_t) c;
-				inbuf[working] = k;
-				INC_POINTER(working);
-				end = working;
-			}
-		} else {
-			fprintf(stderr, "Inkey state screwed - exiting!!!");
-			exit(2);
-		}
-
-		  /*
-		   * Check key has no special meaning and we have not
-		   * timed out and the key has not been disabled
-		   */
-		mapping = current->mapping[k];
-		if (((state == INKEY_TIMEOUT) || (mapping < 0))
-			|| ((current->key[mapping]->type == KEYMAP_LEAF)
-			    && (current->key[mapping]->enable == FALSE))) {
-			/* return the first key we know about */
-			k = inbuf[start];
-
-			INC_POINTER(start);
-			working = start;
-
-			if (start == end) {	/* only one char processed */
-				state = INKEY_NORM;
-			} else {/* otherwise we must have more than one char
-				 * to backout */
-				state = INKEY_BACKOUT;
-			}
-			return k;
-		} else {	/* must be part of a multikey sequence */
-			/* check for completed key sequence */
-			if (current->key[current->mapping[k]]->type == KEYMAP_LEAF) {
-				start = working;	/* eat the key sequence
-							 * in inbuf */
-
-				/* check if inbuf empty now */
-				if (start == end) {
-					/* if it is go back to normal */
-					state = INKEY_NORM;
-				} else {
-					/* otherwise go to backout state */
-					state = INKEY_BACKOUT;
-				}
-
-				/* return the symbol */
-				return current->key[current->mapping[k]]->value.symbol;
-
-			} else {
-				/*
-				 * Step on to next part of the multi-key
-				 * sequence.
-				 */
-				current = current->key[current->mapping[k]]->value.next;
-			}
-		}
-	}
-}
-
-#ifndef _CURSES_USE_MACROS
-/*
- * getch --
- *	Read in a character from stdscr.
- */
-int
-getch(void)
-{
-	return wgetch(stdscr);
-}
-
-/*
- * mvgetch --
- *      Read in a character from stdscr at the given location.
- */
-int
-mvgetch(int y, int x)
-{
-	return mvwgetch(stdscr, y, x);
-}
-
-/*
- * mvwgetch --
- *      Read in a character from stdscr at the given location in the
- *      given window.
- */
-int
-mvwgetch(WINDOW *win, int y, int x)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return wgetch(win);
-}
-
-#endif
-
-/*
- * keyok --
- *      Set the enable flag for a keysym, if the flag is false then
- * getch will not return this keysym even if the matching key sequence
- * is seen.
- */
-int
-keyok(int key_type, bool flag)
-{
-	int result = ERR;
-
-	do_keyok(_cursesi_screen->base_keymap, key_type, flag, &result);
-	return result;
-}
-
-/*
- * do_keyok --
- *       Does the actual work for keyok, we need to recurse through the
- * keymaps finding the passed key symbol.
- */
-void
-do_keyok(keymap_t *current, int key_type, bool flag, int *retval)
-{
-	key_entry_t *key;
-	int i;
-
-	  /*
-	   * we need to iterate over all the keys as there may be
-	   * multiple instances of the leaf symbol.
-	   */
-	for (i = 0; i < MAX_CHAR; i++) {
-		if (current->mapping[i] < 0)
-			continue; /* no mapping for the key, next! */
-
-		key = current->key[current->mapping[i]];
-
-		if (key->type == KEYMAP_MULTI)
-			do_keyok(key->value.next, key_type, flag, retval);
-		else if ((key->type == KEYMAP_LEAF)
-			 && (key->value.symbol == key_type)) {
-			key->enable = flag;
-			*retval = OK; /* we found at least one instance, ok */
-		}
-	}
-}
-
-/*
- * define_key --
- *      Add a custom mapping of a key sequence to key symbol.
- *
- */
-int
-define_key(char *sequence, int symbol)
-{
-
-	if (symbol <= 0)
-		return ERR;
-
-	if (sequence == NULL) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT, "define_key: deleting keysym %d\n",
-		    symbol);
-#endif
-		delete_key_sequence(_cursesi_screen->base_keymap, symbol);
-	} else
-		add_key_sequence(_cursesi_screen, sequence, symbol);
-
-	return OK;
-}
-
-/*
- * wgetch --
- *	Read in a character from the window.
- */
-int
-wgetch(WINDOW *win)
-{
-	int inp, weset;
-	int c;
-	FILE *infd = _cursesi_screen->infd;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "wgetch: win(%p)\n", win);
-#endif
-	if (!(win->flags & __SCROLLOK) && (win->flags & __FULLWIN)
-	    && win->curx == win->maxx - 1 && win->cury == win->maxy - 1
-	    && __echoit)
-		return (ERR);
-
-	if (is_wintouched(win))
-		wrefresh(win);
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "wgetch: __echoit = %d, "
-	    "__rawmode = %d, __nl = %d, flags = %#.4x, delay = %d\n",
-	    __echoit, __rawmode, _cursesi_screen->nl, win->flags, win->delay);
-#endif
-	if (_cursesi_screen->resized) {
-		_cursesi_screen->resized = 0;
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT, "wgetch returning KEY_RESIZE\n");
-#endif
-		return KEY_RESIZE;
-	}
-	if (_cursesi_screen->unget_pos) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT, "wgetch returning char at %d\n",
-		    _cursesi_screen->unget_pos);
-#endif
-		_cursesi_screen->unget_pos--;
-		c = _cursesi_screen->unget_list[_cursesi_screen->unget_pos];
-		if (__echoit)
-			waddch(win, (chtype) c);
-		return c;
-	}
-	if (__echoit && !__rawmode) {
-		cbreak();
-		weset = 1;
-	} else
-		weset = 0;
-
-	__save_termios();
-
-	if (win->flags & __KEYPAD) {
-		switch (win->delay)
-		{
-		case -1:
-			inp = inkey (win->flags & __NOTIMEOUT ? 0 : 1, 0);
-			break;
-		case 0:
-			if (__nodelay() == ERR)
-				return ERR;
-			inp = inkey(0, 0);
-			break;
-		default:
-			inp = inkey(win->flags & __NOTIMEOUT ? 0 : 1, win->delay);
-			break;
-		}
-	} else {
-		switch (win->delay)
-		{
-		case -1:
-			if (__delay() == ERR)
-				return ERR;
-			break;
-		case 0:
-			if (__nodelay() == ERR)
-				return ERR;
-			break;
-		default:
-			if (__timeout(win->delay) == ERR)
-				return ERR;
-			break;
-		}
-
-		c = fgetc(infd);
-		if (feof(infd)) {
-			clearerr(infd);
-			__restore_termios();
-			return ERR;	/* we have timed out */
-		}
-
-		if (ferror(infd)) {
-			clearerr(infd);
-			inp = ERR;
-		} else {
-			inp = c;
-		}
-	}
-#ifdef DEBUG
-	if (inp > 255)
-		  /* we have a key symbol - treat it differently */
-		  /* XXXX perhaps __unctrl should be expanded to include
-		   * XXXX the keysyms in the table....
-		   */
-		__CTRACE(__CTRACE_INPUT, "wgetch assembled keysym 0x%x\n", inp);
-	else
-		__CTRACE(__CTRACE_INPUT, "wgetch got '%s'\n", unctrl(inp));
-#endif
-	if (win->delay > -1) {
-		if (__delay() == ERR)
-			return ERR;
-	}
-
-	__restore_termios();
-
-	if ((__echoit) && (inp < KEY_MIN))
-		waddch(win, (chtype) inp);
-
-	if (weset)
-		nocbreak();
-
-	if (_cursesi_screen->nl && inp == 13)
-		inp = 10;
-
-	return ((inp < 0) || (inp == ERR) ? ERR : inp);
-}
-
-/*
- * ungetch --
- *     Put the character back into the input queue.
- */
-int
-ungetch(int c)
-{
-	return __unget((wint_t) c);
-}
-
-/*
- * __unget --
- *    Do the work for ungetch() and unget_wch();
- */
-int
-__unget(wint_t c)
-{
-	wchar_t	*p;
-	int	len;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "__unget(%x)\n", c);
-#endif
-	if (_cursesi_screen->unget_pos >= _cursesi_screen->unget_len) {
-		len = _cursesi_screen->unget_len + 32;
-		if ((p = realloc(_cursesi_screen->unget_list,
-		    sizeof(wchar_t) * len)) == NULL) {
-			/* Can't realloc(), so just lose the oldest entry */
-			memmove(_cursesi_screen->unget_list,
-			    _cursesi_screen->unget_list + sizeof(wchar_t),
-			    _cursesi_screen->unget_len - 1);
-			_cursesi_screen->unget_list[_cursesi_screen->unget_len
-			    - 1] = c;
-			_cursesi_screen->unget_pos =
-			    _cursesi_screen->unget_len;
-			return OK;
-		} else {
-			_cursesi_screen->unget_pos =
-			    _cursesi_screen->unget_len;
-			_cursesi_screen->unget_len = len;
-			_cursesi_screen->unget_list = p;
-		}
-	}
-	_cursesi_screen->unget_list[_cursesi_screen->unget_pos] = c;
-	_cursesi_screen->unget_pos++;
-	return OK;
-}
diff --git a/lib/libcurses/getstr.c b/lib/libcurses/getstr.c
deleted file mode 100644
index da294c0f8..000000000
--- a/lib/libcurses/getstr.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/*	$NetBSD: getstr.c,v 1.23 2013/10/01 11:41:14 blymn Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <assert.h>
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)getstr.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: getstr.c,v 1.23 2013/10/01 11:41:14 blymn Exp $");
-#endif
-#endif				/* not lint */
-
-#include <ctype.h>
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * getnstr --
- *	Get a string (of maximum n) characters from stdscr starting at
- *	(cury, curx).
- */
-int
-getnstr(char *str, int n)
-{
-	return wgetnstr(stdscr, str, n);
-}
-
-/*
- * getstr --
- *	Get a string from stdscr starting at (cury, curx).
- */
-__warn_references(getstr,
-    "warning: this program uses getstr(), which is unsafe.")
-int
-getstr(char *str)
-{
-	return wgetstr(stdscr, str);
-}
-
-/*
- * mvgetnstr --
- *      Get a string (of maximum n) characters from stdscr starting at (y, x).
- */
-int
-mvgetnstr(int y, int x, char *str, int n)
-{
-	return mvwgetnstr(stdscr, y, x, str, n);
-}
-
-/*
- * mvgetstr --
- *      Get a string from stdscr starting at (y, x).
- */
-__warn_references(mvgetstr,
-    "warning: this program uses mvgetstr(), which is unsafe.")
-int
-mvgetstr(int y, int x, char *str)
-{
-	return mvwgetstr(stdscr, y, x, str);
-}
-
-/*
- * mvwgetnstr --
- *      Get a string (of maximum n) characters from the given window starting
- *	at (y, x).
- */
-int
-mvwgetnstr(WINDOW *win, int y, int x, char *str, int n)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return wgetnstr(win, str, n);
-}
-
-/*
- * mvwgetstr --
- *      Get a string from the given window starting at (y, x).
- */
-__warn_references(mvgetstr,
-    "warning: this program uses mvgetstr(), which is unsafe.")
-int
-mvwgetstr(WINDOW *win, int y, int x, char *str)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return wgetstr(win, str);
-}
-
-#endif
-
-/*
- * wgetstr --
- *	Get a string starting at (cury, curx).
- */
-__warn_references(wgetstr,
-    "warning: this program uses wgetstr(), which is unsafe.")
-int
-wgetstr(WINDOW *win, char *str)
-{
-	return __wgetnstr(win, str, -1);
-}
-
-/*
- * wgetnstr --
- *	Get a string starting at (cury, curx).
- *	Note that n <  2 means that we return ERR (SUSv2 specification).
- */
-int
-wgetnstr(WINDOW *win, char *str, int n)
-{
-	if (n < 1)
-		return (ERR);
-	if (n == 1) {
-		str[0] = '\0';
-		return (ERR);
-	}
-	return __wgetnstr(win, str, n);
-}
-
-/*
- * __wgetnstr --
- *	The actual implementation.
- *	Note that we include a trailing '\0' for safety, so str will contain
- *	at most n - 1 other characters.
- *	XXX: character deletion from screen is based on how the characters
- *	are displayed by wgetch().
- */
-int
-__wgetnstr(WINDOW *win, char *str, int n)
-{
-	char *ostr, ec, kc;
-	int c, xpos, oldx, remain;
-
-	ostr = str;
-	ec = erasechar();
-	kc = killchar();
-	xpos = oldx = win->curx;
-	_DIAGASSERT(n == -1 || n > 1);
-	remain = n - 1;
-
-	while ((c = wgetch(win)) != ERR && c != '\n' && c != '\r') {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT,
-		    "__wgetnstr: win %p, char 0x%x, remain %d\n",
-		    win, c, remain);
-#endif
-		*str = c;
-		__touchline(win, win->cury, 0, (int) win->maxx - 1);
-		if (c == ec || c == KEY_BACKSPACE || c == KEY_LEFT) {
-			*str = '\0';
-			if (str != ostr) {
-				if ((char) c == ec) {
-					mvwaddch(win, win->cury, xpos, ' ');
-					if (xpos > oldx)
-						mvwaddch(win, win->cury,
-						    xpos - 1, ' ');
-					if (win->curx > xpos - 1)
-						wmove(win, win->cury, xpos - 1);
-					xpos--;
-				}
-				if (c == KEY_BACKSPACE || c == KEY_LEFT) {
-					/* getch() displays the key sequence */
-					mvwaddch(win, win->cury, win->curx,
-					    ' ');
-					mvwaddch(win, win->cury, win->curx - 1,
-					    ' ');
-					if (win->curx > xpos)
-						wmove(win, win->cury, xpos - 1);
-					xpos--;
-				}
-				str--;
-				if (n != -1) {
-					/* We're counting chars */
-					remain++;
-				}
-			} else {        /* str == ostr */
-				/* getch() displays the other keys */
-				if (win->curx > oldx)
-					mvwaddch(win, win->cury, win->curx - 1,
-					    ' ');
-				wmove(win, win->cury, oldx);
-				xpos = oldx;
-			}
-		} else if (c == kc) {
-			*str = '\0';
-			if (str != ostr) {
-				/* getch() displays the kill character */
-				mvwaddch(win, win->cury, win->curx - 1, ' ');
-				/* Clear the characters from screen and str */
-				while (str != ostr) {
-					mvwaddch(win, win->cury, win->curx - 1,
-					    ' ');
-					wmove(win, win->cury, win->curx - 1);
-					str--;
-					if (n != -1)
-						/* We're counting chars */
-						remain++;
-				}
-				mvwaddch(win, win->cury, win->curx - 1, ' ');
-				wmove(win, win->cury, win->curx - 1);
-			} else
-				/* getch() displays the kill character */
-				mvwaddch(win, win->cury, oldx, ' ');
-			wmove(win, win->cury, oldx);
-		} else if (c >= KEY_MIN && c <= KEY_MAX) {
-			/* getch() displays these characters */
-			mvwaddch(win, win->cury, xpos, ' ');
-			wmove(win, win->cury, xpos);
-		} else {
-			if (remain) {
-				if (iscntrl((unsigned char)c))
-					mvwaddch(win, win->cury, xpos, ' ');
-				str++;
-				xpos++;
-				remain--;
-			} else
-				mvwaddch(win, win->cury, xpos, ' ');
-			wmove(win, win->cury, xpos);
-		}
-	}
-
-	if (c == ERR) {
-		*str = '\0';
-		return (ERR);
-	}
-	*str = '\0';
-	return (OK);
-}
diff --git a/lib/libcurses/getyx.c b/lib/libcurses/getyx.c
deleted file mode 100644
index 671f08e3e..000000000
--- a/lib/libcurses/getyx.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*	$NetBSD: getyx.c,v 1.5 2008/04/28 20:23:01 martin Exp $	*/
-
-/*
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: getyx.c,v 1.5 2008/04/28 20:23:01 martin Exp $");
-#endif				/* not lint */
-
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * getpary --
- *      Get the y postion of the window relative to the parent window
- * return -1 if not a subwindow.
- */
-int
-getpary(WINDOW *win)
-{
-	if (win == NULL)
-		return -1;
-
-	if (win->orig == NULL)
-		return -1;
-
-	return (win->begy - win->orig->begy);
-}
-
-/*
- * getparx --
- *      Get the x postion of the window relative to the parent window
- * return -1 if not a subwindow.
- */
-int
-getparx(WINDOW *win)
-{
-	if (win == NULL)
-		return -1;
-
-	if (win->orig == NULL)
-		return -1;
-
-	return (win->begx - win->orig->begx);
-}
-
-/*
- * getcury --
- *	Get current y position on window.
- */
-int
-getcury(WINDOW *win)
-{
-	return(win->cury);
-}
-
-/*
- * getcurx --
- *	Get current x position on window.
- */
-int
-getcurx(WINDOW *win)
-{
-	return(win->curx);
-}
-
-/*
- * getbegy --
- *	Get begin y position on window.
- */
-int
-getbegy(WINDOW *win)
-{
-	return(win->begy);
-}
-
-/*
- * getbegx --
- *	Get begin x position on window.
- */
-int
-getbegx(WINDOW *win)
-{
-	return(win->begx);
-}
-
-/*
- * getmaxy --
- *	Get maximum y position on window.
- */
-int
-getmaxy(WINDOW *win)
-{
-	return(win->maxy);
-}
-
-/*
- * getmaxx --
- *	Get maximum x position on window.
- */
-int
-getmaxx(WINDOW *win)
-{
-	return(win->maxx);
-}
diff --git a/lib/libcurses/id_subwins.c b/lib/libcurses/id_subwins.c
deleted file mode 100644
index c91a50080..000000000
--- a/lib/libcurses/id_subwins.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: id_subwins.c,v 1.14 2009/07/22 16:57:14 roy Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)id_subwins.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: id_subwins.c,v 1.14 2009/07/22 16:57:14 roy Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * __id_subwins --
- *	Re-sync the pointers to lines for all the subwindows.
- */
-void
-__id_subwins(WINDOW *orig)
-{
-	WINDOW *win;
-	int     oy, y;
-
-	for (win = orig->nextp; win != orig; win = win->nextp) {
-		oy = win->begy - orig->begy;
-		for (y = 0; y < win->maxy; y++)
-			win->alines[y]->line =
-			    &orig->alines[oy + y]->line[win->ch_off];
-	}
-}
diff --git a/lib/libcurses/idcok.c b/lib/libcurses/idcok.c
deleted file mode 100644
index 0af687b2e..000000000
--- a/lib/libcurses/idcok.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: idcok.c,v 1.1 2002/07/19 13:22:41 blymn Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.com)
- * All rights reserved.
- *
- * This software has been donated to the NetBSD Foundation by the
- * Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)idcok.c	blymn 2002/06/06";
-#else
-__RCSID("$NetBSD: idcok.c,v 1.1 2002/07/19 13:22:41 blymn Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * idcok --
- *	Turn on and off using insert/delete char sequences for the
- *	given window.  Note, currently, the ic/dc capabilities are not
- *      used, this function is only provided for compatibility.
- */
-int
-idcok(WINDOW *win, bool bf)
-{
-	if (bf)
-		win->flags |= __IDCHAR;
-	else
-		win->flags &= ~__IDCHAR;
-	return (OK);
-}
diff --git a/lib/libcurses/idlok.c b/lib/libcurses/idlok.c
deleted file mode 100644
index 27a1ae6ce..000000000
--- a/lib/libcurses/idlok.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: idlok.c,v 1.11 2003/08/07 16:44:22 agc Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)idlok.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: idlok.c,v 1.11 2003/08/07 16:44:22 agc Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * idlok --
- *	Turn on and off using insert/deleteln sequences for the
- *	given window.
- */
-int
-idlok(WINDOW *win, bool bf)
-{
-	if (bf)
-		win->flags |= __IDLINE;
-	else
-		win->flags &= ~__IDLINE;
-	return (OK);
-}
diff --git a/lib/libcurses/in_wch.c b/lib/libcurses/in_wch.c
deleted file mode 100644
index 46b01383e..000000000
--- a/lib/libcurses/in_wch.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*   $NetBSD: in_wch.c,v 1.3 2009/07/22 16:57:14 roy Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation Inc.
- * All rights reserved.
- *
- * This code is derived from code donated to the NetBSD Foundation
- * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@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.
- * 3. Neither the name of the NetBSD Foundation nor the names of its
- *	contributors may be used to endorse or promote products derived
- *	from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
- * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: in_wch.c,v 1.3 2009/07/22 16:57:14 roy Exp $");
-#endif						  /* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * in_wch --
- *	Return wide character at cursor position from stdscr.
- */
-int
-in_wch(cchar_t *wcval)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return win_wch(stdscr, wcval);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvin_wch --
- *  Return wide character at position (y, x) from stdscr.
- */
-int
-mvin_wch(int y, int x, cchar_t *wcval)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwin_wch(stdscr, y, x, wcval);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvwin_wch --
- *  Return wide character at position (y, x) from the given window.
- */
-int
-mvwin_wch(WINDOW *win, int y, int x, cchar_t *wcval)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return win_wch(win, wcval);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * win_wch --
- *	Return wide character at cursor position.
- */
-int
-win_wch(WINDOW *win, cchar_t *wcval)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	nschar_t *np;
-	__LDATA *lp = &win->alines[ win->cury ]->line[ win->curx ];
-	int cw = WCOL( *lp );
-
-	if ( cw < 0 ) 
-		lp += cw;
-	wcval->vals[ 0 ] = lp->ch;
-	wcval->attributes = lp->attr;
-	wcval->elements = 1;
-	np = lp->nsp;
-	if (np) {
-		do {
-			wcval->vals[ wcval->elements++ ] = np->ch;
-			np = np-> next;
-		} while ( np );
-	}
-
-	return OK;
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/in_wchstr.c b/lib/libcurses/in_wchstr.c
deleted file mode 100644
index b6d3d75da..000000000
--- a/lib/libcurses/in_wchstr.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*   $NetBSD: in_wchstr.c,v 1.3 2009/07/22 16:57:14 roy Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation Inc.
- * All rights reserved.
- *
- * This code is derived from code donated to the NetBSD Foundation
- * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@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.
- * 3. Neither the name of the NetBSD Foundation nor the names of its
- *	contributors may be used to endorse or promote products derived
- *	from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
- * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: in_wchstr.c,v 1.3 2009/07/22 16:57:14 roy Exp $");
-#endif						  /* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * in_wchstr, in_wchnstr --
- *	Return an array of wide characters at cursor position from stdscr.
- */
-__warn_references(in_wchstr,
-	"warning: this program uses in_wchstr(), which is unsafe.")
-int
-in_wchstr(cchar_t *wchstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return win_wchstr(stdscr, wchstr);
-#endif /* HAVE_WCHAR */
-}
-
-int
-in_wchnstr(cchar_t *wchstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return win_wchnstr(stdscr, wchstr, n);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvin_wchstr, mv_winchnstr --
- *  Return an array of wide characters at position (y, x) from stdscr.
- */
-__warn_references(mvin_wchstr,
-	"warning: this program uses mvin_wchstr(), which is unsafe.")
-int
-mvin_wchstr(int y, int x, cchar_t *wchstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwin_wchstr(stdscr, y, x, wchstr);
-#endif /* HAVE_WCHAR */
-}
-
-int
-mvin_wchnstr(int y, int x, cchar_t *wchstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwin_wchnstr(stdscr, y, x, wchstr, n);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvwin_wchstr, mvwin_wchnstr --
- *  Return an array wide characters at position (y, x) from the given window.
- */
-__warn_references(mvwin_wchstr,
-	"warning: this program uses mvwin_wchstr(), which is unsafe.")
-int
-mvwin_wchstr(WINDOW *win, int y, int x, cchar_t *wchstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return win_wchstr(win, wchstr);
-#endif /* HAVE_WCHAR */
-}
-
-int
-mvwin_wchnstr(WINDOW *win, int y, int x, cchar_t *wchstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return win_wchnstr(win, wchstr, n);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * win_wchstr, win_wchnstr --
- *	Return an array of characters at cursor position.
- */
-__warn_references(win_wchstr,
-	"warning: this program uses win_wchstr(), which is unsafe.")
-int
-win_wchstr(WINDOW *win, cchar_t *wchstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-
-	return win_wchnstr(win, wchstr, -1);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * - SUSv2/xcurses doesn't document whether the trailing 0 is included
- *   in the length count or not.  For safety's sake it _is_ included.
- */
-int
-win_wchnstr(WINDOW *win, cchar_t *wchstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	__LDATA	*start;
-	int x = 0, cw = 0, cnt = 0;
-	cchar_t *wcp;
-	nschar_t *np;
-
-	if (wchstr == NULL)
-		return ERR;
-
-	start = &win->alines[win->cury]->line[win->curx];
-	x = win->curx;
-	cw = WCOL(*start);
-	if (cw < 0) {
-		start += cw;
-		x += cw;
-	}
-	wcp = wchstr;
-	/* (n - 1) to leave room for the trailing 0 element */
-	while ((x < win->maxx) && ((n < 0) || ((n > 1) && (cnt < n - 1)))) {
-		cw = WCOL( *start );
-		wcp->vals[ 0 ] = start->ch;
-		wcp->attributes = start->attr;
-		wcp->elements = 1;
-		np = start->nsp;
-		if (np) {
-			do {
-				wcp->vals[ wcp->elements++ ] = np->ch;
-				np = np->next;
-			} while ( np );
-		}
-		wcp++;
-		cnt++;
-		x += cw;
-		if ( x < win->maxx ) 
-			start += cw;
-	}
-	wcp->vals[ 0 ] = L'\0';
-	wcp->elements = 1;
-	wcp->attributes = win->wattr;
-
-	return OK;
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/inch.c b/lib/libcurses/inch.c
deleted file mode 100644
index 908eef5d9..000000000
--- a/lib/libcurses/inch.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*	$NetBSD: inch.c,v 1.10 2009/10/06 20:03:27 jdc Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: inch.c,v 1.10 2009/10/06 20:03:27 jdc Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * inch --
- *	Return character at cursor position from stdscr.
- */
-chtype
-inch(void)
-{
-	return winch(stdscr);
-}
-
-/*
- * mvinch --
- *      Return character at position (y, x) from stdscr.
- */
-chtype
-mvinch(int y, int x)
-{
-	return mvwinch(stdscr, y, x);
-}
-
-/*
- * mvwinch --
- *      Return character at position (y, x) from the given window.
- */
-chtype
-mvwinch(WINDOW *win, int y, int x)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return winch(win);
-}
-
-#endif
-
-/*
- * winch --
- *	Return character at cursor position.
- */
-chtype
-winch(WINDOW *win)
-{
-	chtype	ch;
-	attr_t	attr;
-
-	ch = (chtype) ((win)->alines[(win)->cury]->line[(win)->curx].ch &
-	    __CHARTEXT);
-	attr = (attr_t) ((win)->alines[(win)->cury]->line[(win)->curx].attr &
-	    __ATTRIBUTES);
-	if (__using_color && ((attr & __COLOR) == __default_color))
-		attr &= ~__default_color;
-	return (ch | attr);
-}
diff --git a/lib/libcurses/inchstr.c b/lib/libcurses/inchstr.c
deleted file mode 100644
index c5893972d..000000000
--- a/lib/libcurses/inchstr.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*	$NetBSD: inchstr.c,v 1.6 2012/04/21 11:33:16 blymn Exp $	*/
-
-/*
- * Copyright 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Simon Burge for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC. BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: inchstr.c,v 1.6 2012/04/21 11:33:16 blymn Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * inchstr, inchnstr --
- *	Return an array of characters at cursor position from stdscr.
- */
-__warn_references(inchstr,
-    "warning: this program uses inchstr(), which is unsafe.")
-int
-inchstr(chtype *chstr)
-{
-	return winchstr(stdscr, chstr);
-}
-
-int
-inchnstr(chtype *chstr, int n)
-{
-	return winchnstr(stdscr, chstr, n);
-}
-
-/*
- * mvinchstr, mvinchnstr --
- *      Return an array of characters at position (y, x) from stdscr.
- */
-__warn_references(mvinchstr,
-    "warning: this program uses mvinchstr(), which is unsafe.")
-int
-mvinchstr(int y, int x, chtype *chstr)
-{
-	return mvwinchstr(stdscr, y, x, chstr);
-}
-
-int
-mvinchnstr(int y, int x, chtype *chstr, int n)
-{
-	return mvwinchnstr(stdscr, y, x, chstr, n);
-}
-
-/*
- * mvwinchstr, mvwinchnstr --
- *      Return an array characters at position (y, x) from the given window.
- */
-__warn_references(mvwinchstr,
-    "warning: this program uses mvwinchstr(), which is unsafe.")
-int
-mvwinchstr(WINDOW *win, int y, int x, chtype *chstr)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return winchstr(win, chstr);
-}
-
-int
-mvwinchnstr(WINDOW *win, int y, int x, chtype *chstr, int n)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return winchnstr(win, chstr, n);
-}
-
-#endif	/* _CURSES_USE_MACROS */
-
-/*
- * winchstr, winchnstr --
- *	Return an array of characters at cursor position.
- */
-__warn_references(winchstr,
-    "warning: this program uses winchstr(), which is unsafe.")
-int
-winchstr(WINDOW *win, chtype *chstr)
-{
-
-	return winchnstr(win, chstr, -1);
-}
-
-/*
- * XXX: This should go in a manpage!
- * - SUSv2/xcurses doesn't document whether the trailing 0 is included
- *   in the length count or not.  For safety's sake it _is_ included.
- */
-int
-winchnstr(WINDOW *win, chtype *chstr, int n)
-{
-	__LDATA	*end, *start;
-	int epos;
-
-	if (chstr == NULL)
-		return ERR;
-
-	start = &win->alines[win->cury]->line[win->curx];
-	/* (n - 1) to leave room for the trailing 0 element */
-	if (n < 0 || (n - 1) > win->maxx - win->curx - 1)
-		epos = win->maxx - 1;
-	else
-		/* extra -1 for trailing NUL */
-		epos = win->curx + n -1 - 1;
-	end = &win->alines[win->cury]->line[epos];
-
-	while (start <= end) {
-		/* or in the attributes but strip out internal flags */
-#ifdef HAVE_WCHAR
-		*chstr = start->ch | (start->attr & ~__ACS_IS_WACS);
-#else
-		*chstr = start->ch | start->attr;
-#endif
-		chstr++;
-		start++;
-	}
-	*chstr = 0;
-
-	return OK;
-}
diff --git a/lib/libcurses/initscr.c b/lib/libcurses/initscr.c
deleted file mode 100644
index b82c68ce4..000000000
--- a/lib/libcurses/initscr.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*	$NetBSD: initscr.c,v 1.29 2007/01/22 21:14:53 jdc Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)initscr.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: initscr.c,v 1.29 2007/01/22 21:14:53 jdc Exp $");
-#endif
-#endif	/* not lint */
-
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-
-/*
- * initscr --
- *	Initialize the current and standard screen.
- */
-WINDOW *
-initscr(void)
-{
-	const char *sp;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INIT, "initscr\n");
-#endif
-
-	/*
-	 * If My_term is set, or can't find a terminal in the environment,
-	 * use Def_term.
-	 */
-	if (My_term || (sp = getenv("TERM")) == NULL)
-		sp = Def_term;
-
-	/* LINTED const castaway; newterm does not modify sp! */
-	if ((_cursesi_screen = newterm((char *) sp, stdout, stdin)) == NULL)
-		return NULL;
-
-	__echoit = _cursesi_screen->echoit;
-        __pfast = _cursesi_screen->pfast;
-	__rawmode = _cursesi_screen->rawmode;
-	__noqch = _cursesi_screen->noqch;
-	COLS = _cursesi_screen->COLS;
-	LINES = _cursesi_screen->LINES;
-	COLORS = _cursesi_screen->COLORS;
-	COLOR_PAIRS = _cursesi_screen->COLOR_PAIRS;
-	__GT = _cursesi_screen->GT;
-	__NONL = _cursesi_screen->NONL;
-	__UPPERCASE = _cursesi_screen->UPPERCASE;
-
-	set_term(_cursesi_screen);
-	wrefresh(curscr);
-
-	return (stdscr);
-}
diff --git a/lib/libcurses/ins_wch.c b/lib/libcurses/ins_wch.c
deleted file mode 100644
index 3ade74990..000000000
--- a/lib/libcurses/ins_wch.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/*   $NetBSD: ins_wch.c,v 1.6 2013/10/16 19:59:29 roy Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation Inc.
- * All rights reserved.
- *
- * This code is derived from code donated to the NetBSD Foundation
- * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@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.
- * 3. Neither the name of the NetBSD Foundation nor the names of its
- *	contributors may be used to endorse or promote products derived
- *	from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
- * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: ins_wch.c,v 1.6 2013/10/16 19:59:29 roy Exp $");
-#endif						  /* not lint */
-
-#include <string.h>
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * ins_wch --
- *	Do an insert-char on the line, leaving (cury, curx) unchanged.
- */
-int
-ins_wch(const cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return wins_wch(stdscr, wch);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvins_wch --
- *	  Do an insert-char on the line at (y, x).
- */
-int
-mvins_wch(int y, int x, const cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwins_wch(stdscr, y, x, wch);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvwins_wch --
- *	  Do an insert-char on the line at (y, x) in the given window.
- */
-int
-mvwins_wch(WINDOW *win, int y, int x, const cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return wins_wch(stdscr, wch);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * wins_wch --
- *	Do an insert-char on the line, leaving (cury, curx) unchanged.
- */
-int
-wins_wch(WINDOW *win, const cchar_t *wch)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	__LDATA	*start, *temp1, *temp2;
-	__LINE *lnp;
-	int cw, pcw, x, y, sx, ex, newx, i, tabsize;
-	nschar_t *np, *tnp;
-	wchar_t ws[] = L"		";
-
-	/* check for non-spacing characters */
-	if ( !wch )
-		return OK;
-	cw = wcwidth(wch->vals[0]);
-	if (cw < 0)
-		cw = 1;
-	if (!cw)
-		return wadd_wch( win, wch );
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "--before--\n");
-	for ( x = 0; x < win->maxx; x++ )
-		__CTRACE(__CTRACE_INPUT, "wins_wch: (0,%d)=(%x,%x,%p)\n", x,
-		    win->alines[0]->line[x].ch,
-		    win->alines[0]->line[x].attr,
-		    win->alines[0]->line[x].nsp);
-#endif /* DEBUG */
-	x = win->curx;
-	y = win->cury;
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "wins_wch: (%d,%d)\n", y, x);
-#endif /* DEBUG */
-	switch ( wch->vals[ 0 ]) {
-		case L'\b':
-			if ( --x < 0 )
-				x = 0;
-			win->curx = x;
-			return OK;
-		case L'\r':
-			win->curx = 0;
-			return OK;
-		case L'\n':
-			wclrtoeol( win );
-			if (y == win->scr_b) {
-				if (!(win->flags & __SCROLLOK))
-					return ERR;
-				scroll(win);
-			}
-			return OK;
-		case L'\t':
-			tabsize = win->screen->TABSIZE;
-			if (wins_nwstr(win, ws, min(win->maxx - x,
-			    tabsize - (x % tabsize))) == ERR)
-				return ERR;
-			return OK;
-	}
-
-	/* locate current cell */
-	x = win->curx;
-	y = win->cury;
-	lnp = win->alines[ y ];
-	start = &win->alines[ y ]->line[ x ];
-	sx = x;
-	pcw = WCOL( *start );
-	if (pcw < 0) {
-		start += pcw;
-		sx += pcw;
-	}
-	if ( cw > win->maxx - sx )
-		return ERR;
-	lnp->flags |= __ISDIRTY;
-	newx = sx + win->ch_off;
-	if ( newx < *lnp->firstchp )
-		*lnp->firstchp = newx;
-
-	/* shift all complete characters */
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "wins_wch: shift all characters\n");
-#endif /* DEBUG */
-	temp1 = &win->alines[ y ]->line[ win->maxx - 1 ];
-	temp2 = temp1 - cw;
-	pcw = WCOL(*(temp2 + 1));
-	if (pcw < 0) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT, "wins_wch: clear EOL\n");
-#endif /* DEBUG */
-		temp2 += pcw;
-		while ( temp1 > temp2 + cw ) {
-			np = temp1->nsp;
-			if (np) {
-				while ( np ) {
-					tnp = np->next;
-					free( np );
-					np = tnp;
-				}
-				temp1->nsp = NULL;
-			}
-			temp1->ch = ( wchar_t )btowc(( int ) win->bch );
-			if (_cursesi_copy_nsp(win->bnsp, temp1) == ERR)
-				return ERR;
-			temp1->attr = win->battr;
-			SET_WCOL( *temp1, 1 );
-			temp1--;
-		}
-	}
-	while ( temp2 >= start ) {
-		( void )memcpy( temp1, temp2, sizeof( __LDATA ));
-		temp1--, temp2--;
-	}
-
-	/* update character under cursor */
-	start->nsp = NULL;
-	start->ch = wch->vals[ 0 ];
-	start->attr = wch->attributes & WA_ATTRIBUTES;
-	SET_WCOL( *start, cw );
-	if ( wch->elements > 1 ) {
-		for ( i = 1; i < wch->elements; i++ ) {
-			np = (nschar_t *)malloc(sizeof(nschar_t));
-			if (!np)
-				return ERR;
-			np->ch = wch->vals[ i ];
-			np->next = start->nsp;
-			start->nsp = np;
-		}
-	}
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "wins_wch: insert (%x,%x,%p)\n",
-	    start->ch, start->attr, start->nsp);
-#endif /* DEBUG */
-	temp1 = start + 1;
-	ex = x + 1;
-	while ( ex - x < cw ) {
-		temp1->ch = wch->vals[ 0 ];
-		SET_WCOL( *temp1, x - ex );
-		temp1->nsp = NULL;
-		ex++, temp1++;
-	}
-#ifdef DEBUG
-	{
-		__CTRACE(__CTRACE_INPUT, "--after---\n");
-		for ( x = 0; x < win->maxx; x++ )
-			__CTRACE(__CTRACE_INPUT,
-			    "wins_wch: (0,%d)=(%x,%x,%p)\n", x,
-			    win->alines[0]->line[x].ch,
-			    win->alines[0]->line[x].attr,
-			    win->alines[0]->line[x].nsp);
-	}
-#endif /* DEBUG */
-	newx = win->maxx - 1 + win->ch_off;
-	if ( newx > *lnp->lastchp )
-		*lnp->lastchp = newx;
-	__touchline(win, y, sx, (int) win->maxx - 1);
-
-	return OK;
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/ins_wstr.c b/lib/libcurses/ins_wstr.c
deleted file mode 100644
index 2d7ef2449..000000000
--- a/lib/libcurses/ins_wstr.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/*   $NetBSD: ins_wstr.c,v 1.7 2013/10/16 19:59:29 roy Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation Inc.
- * All rights reserved.
- *
- * This code is derived from code donated to the NetBSD Foundation
- * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@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.
- * 3. Neither the name of the NetBSD Foundation nor the names of its
- *	contributors may be used to endorse or promote products derived
- *	from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
- * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: ins_wstr.c,v 1.7 2013/10/16 19:59:29 roy Exp $");
-#endif						  /* not lint */
-
-#include <string.h>
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * ins_wstr --
- *	insert a multi-character wide-character string into the current window
- */
-int
-ins_wstr(const wchar_t *wstr)
-{
-	return wins_wstr(stdscr, wstr);
-}
-
-/*
- * ins_nwstr --
- *	insert a multi-character wide-character string into the current window
- *	with at most n characters
- */
-int
-ins_nwstr(const wchar_t *wstr, int n)
-{
-	return wins_nwstr(stdscr, wstr, n);
-}
-
-/*
- * mvins_wstr --
- *	  Do an insert-string on the line at (y, x).
- */
-int
-mvins_wstr(int y, int x, const wchar_t *wstr)
-{
-	return mvwins_wstr(stdscr, y, x, wstr);
-}
-
-/*
- * mvins_nwstr --
- *	  Do an insert-n-string on the line at (y, x).
- */
-int
-mvins_nwstr(int y, int x, const wchar_t *wstr, int n)
-{
-	return mvwins_nwstr(stdscr, y, x, wstr, n);
-}
-
-/*
- * mvwins_wstr --
- *	  Do an insert-string on the line at (y, x) in the given window.
- */
-int
-mvwins_wstr(WINDOW *win, int y, int x, const wchar_t *wstr)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return wins_wstr(stdscr, wstr);
-}
-
-/*
- * mvwins_nwstr --
- *	  Do an insert-n-string on the line at (y, x) in the given window.
- */
-int
-mvwins_nwstr(WINDOW *win, int y, int x, const wchar_t *wstr, int n)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return wins_nwstr(stdscr, wstr, n);
-}
-
-
-/*
- * wins_wstr --
- *	Do an insert-string on the line, leaving (cury, curx) unchanged.
- */
-int
-wins_wstr(WINDOW *win, const wchar_t *wstr)
-{
-	return wins_nwstr(win, wstr, -1);
-}
-
-/*
- * wins_nwstr --
- *	Do an insert-n-string on the line, leaving (cury, curx) unchanged.
- */
-int
-wins_nwstr(WINDOW *win, const wchar_t *wstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	__LDATA	 *start, *temp1, *temp2;
-	__LINE	  *lnp;
-	const wchar_t *scp;
-	int width, len, sx, x, y, cw, pcw, newx, tabsize;
-	nschar_t *np;
-	wchar_t ws[] = L"		";
-
-	/* check for leading non-spacing character */
-	if (!wstr)
-		return OK;
-	cw = wcwidth(*wstr);
-	if (cw < 0)
-		cw = 1;
-	if (!cw)
-		return ERR;
-
-	scp = wstr + 1;
-	width = cw;
-	len = 1;
-	n--;
-	while (*scp) {
-		int w;
-		if (!n)
-			break;
-		w = wcwidth(*scp);
-		if (w < 0)
-			w = 1;
-		n--, len++, width += w;
-		scp++;
-	}
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "wins_nwstr: width=%d,len=%d\n", width, len);
-#endif /* DEBUG */
-
-	if (cw > win->maxx - win->curx + 1)
-		return ERR;
-	start = &win->alines[win->cury]->line[win->curx];
-	sx = win->curx;
-	lnp = win->alines[win->cury];
-	pcw = WCOL(*start);
-	if (pcw < 0) {
-		sx += pcw;
-		start += pcw;
-	}
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "wins_nwstr: start@(%d)\n", sx);
-#endif /* DEBUG */
-	pcw = WCOL(*start);
-	lnp->flags |= __ISDIRTY;
-	newx = sx + win->ch_off;
-	if (newx < *lnp->firstchp)
-		*lnp->firstchp = newx;
-#ifdef DEBUG
-	{
-		__CTRACE(__CTRACE_INPUT, "========before=======\n");
-		for (x = 0; x < win->maxx; x++)
-			__CTRACE(__CTRACE_INPUT,
-			    "wins_nwstr: (%d,%d)=(%x,%x,%p)\n",
-			    (int) win->cury, x,
-			    win->alines[win->cury]->line[x].ch,
-			    win->alines[win->cury]->line[x].attr,
-			    win->alines[win->cury]->line[x].nsp);
-	}
-#endif /* DEBUG */
-
-	/* shift all complete characters */
-	if (sx + width + pcw <= win->maxx) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT, "wins_nwstr: shift all characters\n");
-#endif /* DEBUG */
-		temp1 = &win->alines[win->cury]->line[win->maxx - 1];
-		temp2 = temp1 - width;
-		pcw = WCOL(*(temp2 + 1));
-		if (pcw < 0) {
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "wins_nwstr: clear from %d to EOL(%d)\n",
-			    win->maxx + pcw, win->maxx - 1);
-#endif /* DEBUG */
-			temp2 += pcw;
-			while (temp1 > temp2 + width) {
-				temp1->ch = (wchar_t)btowc((int) win->bch);
-				if (_cursesi_copy_nsp(win->bnsp, temp1) == ERR)
-					return ERR;
-				temp1->attr = win->battr;
-				SET_WCOL(*temp1, 1);
-#ifdef DEBUG
-				__CTRACE(__CTRACE_INPUT,
-				    "wins_nwstr: empty cell(%p)\n", temp1);
-#endif /* DEBUG */
-				temp1--;
-			}
-		}
-		while (temp2 >= start) {
-			(void)memcpy(temp1, temp2, sizeof(__LDATA));
-			temp1--, temp2--;
-		}
-#ifdef DEBUG
-		{
-			__CTRACE(__CTRACE_INPUT, "=====after shift====\n");
-			for (x = 0; x < win->maxx; x++)
-				__CTRACE(__CTRACE_INPUT,
-				    "wins_nwstr: (%d,%d)=(%x,%x,%p)\n",
-				    (int) win->cury, x,
-				    win->alines[win->cury]->line[x].ch,
-				    win->alines[win->cury]->line[x].attr,
-				    win->alines[win->cury]->line[x].nsp);
-		}
-#endif /* DEBUG */
-	}
-
-	/* update string columns */
-	x = win->curx;
-	y = win->cury;
-	for (scp = wstr, temp1 = start; len; len--, scp++) {
-		switch (*scp) {
-			case L'\b':
-				if (--x < 0)
-					x = 0;
-				win->curx = x;
-				continue;;
-			case L'\r':
-				win->curx = 0;
-				continue;
-			case L'\n':
-				wclrtoeol(win);
-				if (y == win->scr_b) {
-					if (!(win->flags & __SCROLLOK))
-						return ERR;
-					scroll(win);
-				}
-				continue;
-			case L'\t':
-				tabsize = win->screen->TABSIZE;
-				if (wins_nwstr(win, ws,
-				    min(win->maxx - x, tabsize - (x % tabsize)))
-				    == ERR)
-					return ERR;
-				continue;
-		}
-		cw = wcwidth(*scp);
-		if (cw < 0)
-			cw = 1;
-		if (cw) {
-			/* 1st column */
-			temp1->ch = (wchar_t)*scp;
-			temp1->attr = win->wattr;
-			SET_WCOL(*temp1, cw);
-			temp1->nsp = NULL;
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "wins_nwstr: add spacing char(%x)\n", temp1->ch);
-#endif /* DEBUG */
-			temp2 = temp1++;
-			if (cw > 1) {
-				x = -1;
-				while (temp1 < temp2 + cw) {
-					/* the rest columns */
-					temp1->ch = (wchar_t)*scp;
-					temp1->attr = win->wattr;
-					temp1->nsp = NULL;
-					SET_WCOL(*temp1, x);
-					temp1++, x--;
-				}
-				temp1--;
-			}
-		} else {
-			/* non-spacing character */
-			np = (nschar_t *)malloc(sizeof(nschar_t));
-			if (!np)
-				return ERR;
-			np->ch = *scp;
-			np->next = temp1->nsp;
-			temp1->nsp = np;
-#ifdef DEBUG
-			__CTRACE(__CTRACE_INPUT,
-			    "wins_nstr: add non-spacing char(%x)\n", np->ch);
-#endif /* DEBUG */
-		}
-	}
-#ifdef DEBUG
-	{
-		__CTRACE(__CTRACE_INPUT, "========after=======\n");
-		for (x = 0; x < win->maxx; x++)
-			__CTRACE(__CTRACE_INPUT,
-			    "wins_nwstr: (%d,%d)=(%x,%x,%p)\n",
-			    (int) win->cury, x,
-			    win->alines[win->cury]->line[x].ch,
-			    win->alines[win->cury]->line[x].attr,
-			    win->alines[win->cury]->line[x].nsp);
-	}
-#endif /* DEBUG */
-	newx = win->maxx - 1 + win->ch_off;
-	if (newx > *lnp->lastchp)
-		*lnp->lastchp = newx;
-	__touchline(win, (int) win->cury, sx, (int) win->maxx - 1);
-	return OK;
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/insch.c b/lib/libcurses/insch.c
deleted file mode 100644
index 317dfb070..000000000
--- a/lib/libcurses/insch.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*	$NetBSD: insch.c,v 1.22 2009/07/22 16:57:15 roy Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)insch.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: insch.c,v 1.22 2009/07/22 16:57:15 roy Exp $");
-#endif
-#endif				/* not lint */
-
-#include <string.h>
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * insch --
- *	Do an insert-char on the line, leaving (cury, curx) unchanged.
- */
-int
-insch(chtype ch)
-{
-	return winsch(stdscr, ch);
-}
-
-/*
- * mvinsch --
- *	Do an insert-char on the line at (y, x).
- */
-int
-mvinsch(int y, int x, chtype ch)
-{
-	return mvwinsch(stdscr, y, x, ch);
-}
-
-/*
- * mvwinsch --
- *	Do an insert-char on the line at (y, x) in the given window.
- */
-int
-mvwinsch(WINDOW *win, int y, int x, chtype ch)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return winsch(stdscr, ch);
-}
-
-#endif
-
-/*
- * winsch --
- *	Do an insert-char on the line, leaving (cury, curx) unchanged.
- */
-int
-winsch(WINDOW *win, chtype ch)
-{
-
-	__LDATA	*end, *temp1, *temp2;
-	attr_t attr;
-
-	if (__using_color)
-		attr = win->battr & __COLOR;
-	else
-		attr = 0;
-	end = &win->alines[win->cury]->line[win->curx];
-	temp1 = &win->alines[win->cury]->line[win->maxx - 1];
-	temp2 = temp1 - 1;
-	while (temp1 > end) {
-		(void) memcpy(temp1, temp2, sizeof(__LDATA));
-		temp1--, temp2--;
-	}
-	temp1->ch = (wchar_t) ch & __CHARTEXT;
-	if (temp1->ch == ' ')
-		temp1->ch = win->bch;
-	temp1->attr = (attr_t) ch & __ATTRIBUTES;
-	if (temp1->attr & __COLOR)
-		temp1->attr |= (win->battr & ~__COLOR);
-	else
-		temp1->attr |= win->battr;
-#ifdef HAVE_WCHAR
-	if (_cursesi_copy_nsp(win->bnsp, temp1) == ERR)
-		return ERR;
-	SET_WCOL(*temp1, 1);
-#endif /* HAVE_WCHAR */
-	__touchline(win, (int) win->cury, (int) win->curx, (int) win->maxx - 1);
-	if (win->cury == LINES - 1 &&
-	    (win->alines[LINES - 1]->line[COLS - 1].ch != ' ' ||
-		win->alines[LINES - 1]->line[COLS - 1].attr != attr)) {
-		if (win->flags & __SCROLLOK) {
-			wrefresh(win);
-			scroll(win);
-			win->cury--;
-		} else
-			return (ERR);
-	}
-	return (OK);
-}
diff --git a/lib/libcurses/insdelln.c b/lib/libcurses/insdelln.c
deleted file mode 100644
index 2a150b5ec..000000000
--- a/lib/libcurses/insdelln.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*	$NetBSD: insdelln.c,v 1.16 2009/07/22 16:57:15 roy Exp $	*/
-
-/*
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: insdelln.c,v 1.16 2009/07/22 16:57:15 roy Exp $");
-#endif				/* not lint */
-
-/*
- * Based on deleteln.c and insertln.c -
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- */
-
-#include <string.h>
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * insdelln --
- *	Insert or delete lines on stdscr, leaving (cury, curx) unchanged.
- */
-int
-insdelln(int nlines)
-{
-	return winsdelln(stdscr, nlines);
-}
-
-#endif
-
-/*
- * winsdelln --
- *	Insert or delete lines on the window, leaving (cury, curx) unchanged.
- */
-int
-winsdelln(WINDOW *win, int nlines)
-{
-	int     y, i, last;
-	__LINE *temp;
-#ifdef HAVE_WCHAR
-	__LDATA *lp;
-#endif /* HAVE_WCHAR */
-	attr_t	attr;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_LINE,
-	    "winsdelln: (%p) cury=%d lines=%d\n", win, win->cury, nlines);
-#endif
-
-	if (!nlines)
-		return(OK);
-
-	if (__using_color && win != curscr)
-		attr = win->battr & __COLOR;
-	else
-		attr = 0;
-
-	if (nlines > 0) {
-		/* Insert lines */
-		if (win->cury < win->scr_t || win->cury > win->scr_b) {
-			/*  Outside scrolling region */
-			if (nlines > win->maxy - win->cury)
-				nlines = win->maxy - win->cury;
-			last = win->maxy - 1;
-		} else {
-			/* Inside scrolling region */
-			if (nlines > win->scr_b + 1 - win->cury)
-				nlines = win->scr_b + 1 - win->cury;
-			last = win->scr_b;
-		}
-		for (y = last - nlines; y >= win->cury; --y) {
-			win->alines[y]->flags &= ~__ISPASTEOL;
-			win->alines[y + nlines]->flags &= ~__ISPASTEOL;
-			if (win->orig == NULL) {
-				temp = win->alines[y + nlines];
-				win->alines[y + nlines] = win->alines[y];
-				win->alines[y] = temp;
-			} else {
-				(void) memcpy(win->alines[y + nlines]->line,
-				    win->alines[y]->line,
-				    (size_t) win->maxx * __LDATASIZE);
-			}
-		}
-		for (y = win->cury - 1 + nlines; y >= win->cury; --y)
-			for (i = 0; i < win->maxx; i++) {
-				win->alines[y]->line[i].ch = win->bch;
-				win->alines[y]->line[i].attr = attr;
-#ifndef HAVE_WCHAR
-				win->alines[y]->line[i].ch = win->bch;
-#else
-				win->alines[y]->line[i].ch
-					= ( wchar_t )btowc(( int ) win->bch );
-				lp = &win->alines[y]->line[i];
-				if (_cursesi_copy_nsp(win->bnsp, lp) == ERR)
-					return ERR;
-				SET_WCOL( *lp, 1 );
-#endif /* HAVE_WCHAR */
-			}
-		for (y = last; y >= win->cury; --y)
-			__touchline(win, y, 0, (int) win->maxx - 1);
-	} else {
-		/* Delete nlines */
-		nlines = 0 - nlines;
-		if (win->cury < win->scr_t || win->cury > win->scr_b) {
-			/*  Outside scrolling region */
-			if (nlines > win->maxy - win->cury)
-				nlines = win->maxy - win->cury;
-			last = win->maxy;
-		} else {
-			/* Inside scrolling region */
-			if (nlines > win->scr_b + 1 - win->cury)
-				nlines = win->scr_b + 1 - win->cury;
-			last = win->scr_b + 1;
-		}
-		for (y = win->cury; y < last - nlines; y++) {
-			win->alines[y]->flags &= ~__ISPASTEOL;
-			win->alines[y + nlines]->flags &= ~__ISPASTEOL;
-			if (win->orig == NULL) {
-				temp = win->alines[y];
-				win->alines[y] = win->alines[y + nlines];
-				win->alines[y + nlines] = temp;
-			} else {
-				(void) memcpy(win->alines[y]->line,
-				    win->alines[y + nlines]->line,
-				    (size_t) win->maxx * __LDATASIZE);
-			}
-		}
-		for (y = last - nlines; y < last; y++)
-			for (i = 0; i < win->maxx; i++) {
-				win->alines[y]->line[i].ch = win->bch;
-				win->alines[y]->line[i].attr = attr;
-#ifndef HAVE_WCHAR
-				win->alines[y]->line[i].ch = win->bch;
-#else
-				win->alines[y]->line[i].ch
-					= (wchar_t)btowc((int) win->bch);
-				lp = &win->alines[y]->line[i];
-				SET_WCOL( *lp, 1 );
-				if (_cursesi_copy_nsp(win->bnsp, lp) == ERR)
-					return ERR;
-#endif /* HAVE_WCHAR */
-			}
-		for (y = win->cury; y < last; y++)
-			__touchline(win, y, 0, (int) win->maxx - 1);
-	}
-	if (win->orig != NULL)
-		__id_subwins(win->orig);
-	return (OK);
-}
diff --git a/lib/libcurses/insertln.c b/lib/libcurses/insertln.c
deleted file mode 100644
index 0515c077a..000000000
--- a/lib/libcurses/insertln.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: insertln.c,v 1.13 2003/08/07 16:44:22 agc Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)insertln.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: insertln.c,v 1.13 2003/08/07 16:44:22 agc Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * insertln --
- *	Do an insert-line on stdscr, leaving (cury, curx) unchanged.
- */
-int
-insertln(void)
-{
-	return(winsdelln(stdscr, 1));
-}
-
-#endif
-
-/*
- * winsertln --
- *	Do an insert-line on the window, leaving (cury, curx) unchanged.
- */
-int
-winsertln(WINDOW *win)
-{
-	return(winsdelln(win, 1));
-}
diff --git a/lib/libcurses/insstr.c b/lib/libcurses/insstr.c
deleted file mode 100644
index 56c8169f5..000000000
--- a/lib/libcurses/insstr.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*   $NetBSD: insstr.c,v 1.3 2009/07/22 16:57:15 roy Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation Inc.
- * All rights reserved.
- *
- * This code is derived from code donated to the NetBSD Foundation
- * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@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.
- * 3. Neither the name of the NetBSD Foundation nor the names of its
- *	contributors may be used to endorse or promote products derived
- *	from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
- * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: insstr.c,v 1.3 2009/07/22 16:57:15 roy Exp $");
-#endif						  /* not lint */
-
-#include <string.h>
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * insstr --
- *	insert a multi-byte character string into the current window
- */
-int
-insstr(const char *str)
-{
-	return winsstr(stdscr, str);
-}
-
-/*
- * insnstr --
- *	insert a multi-byte character string into the current window
- *	with at most n characters
- */
-int
-insnstr(const char *str, int n)
-{
-	return winsnstr(stdscr, str, n);
-}
-
-/*
- * mvinsstr --
- *	  Do an insert-string on the line at (y, x).
- */
-int
-mvinsstr(int y, int x, const char *str)
-{
-	return mvwinsstr(stdscr, y, x, str);
-}
-
-/*
- * mvinsnstr --
- *	  Do an insert-n-string on the line at (y, x).
- */
-int
-mvinsnstr(int y, int x, const char *str, int n)
-{
-	return mvwinsnstr(stdscr, y, x, str, n);
-}
-
-/*
- * mvwinsstr --
- *	  Do an insert-string on the line at (y, x) in the given window.
- */
-int
-mvwinsstr(WINDOW *win, int y, int x, const char *str)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return winsstr(stdscr, str);
-}
-
-/*
- * mvwinsnstr --
- *	  Do an insert-n-string on the line at (y, x) in the given window.
- */
-int
-mvwinsnstr(WINDOW *win, int y, int x, const char *str, int n)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return winsnstr(stdscr, str, n);
-}
-
-#endif
-
-/*
- * winsstr --
- *	Do an insert-string on the line, leaving (cury, curx) unchanged.
- *	No wrapping.
- */
-int
-winsstr(WINDOW *win, const char *str)
-{
-	return winsnstr( win, str, -1 );
-}
-
-/*
- * winsnstr --
- *	Do an insert-n-string on the line, leaving (cury, curx) unchanged.
- *	Performs wrapping.
- */
-int
-winsnstr(WINDOW *win, const char *str, int n)
-{
-	__LDATA	*end, *temp1, *temp2;
-	const char *scp;
-	int len, x;
-	__LINE *lnp;
-#ifdef HAVE_WCHAR
-	nschar_t *np, *tnp;
-#endif /* HAVE_WCHAR */
-
-	/* find string length */
-	if ( n > 0 )
-		for ( scp = str, len = 0; n-- && *scp++; ++len );
-	else
-		for ( scp = str, len = 0; *scp++; ++len );
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INPUT, "winsnstr: len = %d\n", len);
-#endif /* DEBUG */
-
-	/* move string */
-	end = &win->alines[win->cury]->line[win->curx];
-	if ( len < win->maxx - win->curx ) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT, "winsnstr: shift %d cells\n", len);
-#endif /* DEBUG */
-		temp1 = &win->alines[win->cury]->line[win->maxx - 1];
-		temp2 = temp1 - len;
-		while (temp2 >= end) {
-#ifdef HAVE_WCHAR
-			np = temp1->nsp;
-			if (np){
-				while ( np ) {
-					tnp = np->next;
-					free( np );
-					np = tnp;
-				}
-				temp1->nsp = NULL;
-			}
-#endif /* HAVE_WCHAR */
-			(void) memcpy(temp1, temp2, sizeof(__LDATA));
-			temp1--, temp2--;
-		}
-	}
-
-	for ( scp = str, temp1 = end, x = win->curx;
-			*scp && x < len + win->curx && x < win->maxx;
-			scp++, temp1++, x++ ) {
-		temp1->ch = (wchar_t)*scp & __CHARTEXT;
-		temp1->attr = win->wattr;
-#ifdef HAVE_WCHAR
-		SET_WCOL( *temp1, 1 );
-#endif /* HAVE_WCHAR */
-	}
-#ifdef DEBUG
-	{
-		int i;
-
-		for ( i = win->curx; i < win->curx + len; i++ ) {
-			__CTRACE(__CTRACE_INPUT,
-			    "winsnstr: (%d,%d)=('%c',%x)\n", win->cury, i,
-			    win->alines[win->cury]->line[i].ch,
-			    win->alines[win->cury]->line[i].attr);
-		}
-	}
-#endif /* DEBUG */
-	lnp = win->alines[ win->cury ];
-	lnp->flags |= __ISDIRTY;
-	if ( win->ch_off < *lnp->firstchp )
-		*lnp->firstchp = win->ch_off;
-	if ( win->ch_off + win->maxx - 1 > *lnp->lastchp )
-		*lnp->lastchp = win->ch_off + win->maxx - 1;
-	__touchline(win, (int)win->cury, (int)win->curx, (int)win->maxx - 1);
-	return OK;
-}
diff --git a/lib/libcurses/instr.c b/lib/libcurses/instr.c
deleted file mode 100644
index d387e212d..000000000
--- a/lib/libcurses/instr.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*	$NetBSD: instr.c,v 1.4 2011/08/07 10:54:53 blymn Exp $	*/
-
-/*
- * Copyright 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Simon Burge for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC. BE 
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: instr.c,v 1.4 2011/08/07 10:54:53 blymn Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * instr, innstr --
- *	Return a string of characters at cursor position from stdscr.
- */
-__warn_references(instr,
-    "warning: this program uses instr(), which is unsafe.")
-int
-instr(char *str)
-{
-	return winstr(stdscr, str);
-}
-
-int
-innstr(char *str, int n)
-{
-	return winnstr(stdscr, str, n);
-}
-
-/*
- * mvinstr, mvinnstr --
- *      Return a string of characters at position (y, x) from stdscr.
- *	XXX: should be multi-byte characters for SUSv2.
- */
-__warn_references(mvinstr,
-    "warning: this program uses mvinstr(), which is unsafe.")
-int
-mvinstr(int y, int x, char *str)
-{
-	return mvwinstr(stdscr, y, x, str);
-}
-
-int
-mvinnstr(int y, int x, char *str, int n)
-{
-	return mvwinnstr(stdscr, y, x, str, n);
-}
-
-/*
- * mvwinstr, mvwinnstr --
- *      Return an array characters at position (y, x) from the given window.
- *	XXX: should be multi-byte characters for SUSv2.
- */
-__warn_references(mvwinstr,
-    "warning: this program uses mvwinstr(), which is unsafe.")
-int
-mvwinstr(WINDOW *win, int y, int x, char *str)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return winstr(win, str);
-}
-
-int
-mvwinnstr(WINDOW *win, int y, int x, char *str, int n)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return winnstr(win, str, n);
-}
-
-#endif	/* _CURSES_USE_MACROS */
-
-/*
- * winstr, winnstr --
- *	Return a string of characters at cursor position.
- *	XXX: should be multi-byte characters for SUSv2.
- */
-__warn_references(winstr,
-    "warning: this program uses winstr(), which is unsafe.")
-int
-winstr(WINDOW *win, char *str)
-{
-
-	return winnstr(win, str, -1);
-}
-
-/*
- * XXX: This should go in a manpage!
- * - winnstr() returns the number of characters copied only of if it is
- *   called with n >= 0 (ie, as inchnstr(), mvinchnstr(), mvwinchnstr()
- *   or winchnstr()).  If N < 0, it returns `OK'.
- * - SUSv2/xcurses doesn't document whether the trailing NUL is included
- *   in the length count or not.  For safety's sake it _is_ included.
- * - This implementation does not (yet) support multi-byte characters
- *   strings.
- */
-int
-winnstr(WINDOW *win, char *str, int n)
-{
-	__LDATA	*end, *start;
-	int epos, sn;
-
-	if (str == NULL)
-		return ERR;
-
-	sn = n;
-	start = &win->alines[win->cury]->line[win->curx];
-	/* (n - 1) to leave room for the trailing NUL */
-	if (n < 0 || (n - 1) > win->maxx - win->curx - 1) {
-		epos = win->maxx - 1;
-		n = win->maxx - win->curx;
-	} else {
-		/* extra -1 for trailing NUL */
-		epos = win->curx + n - 1 - 1;
-		n--;
-	}
-	end = &win->alines[win->cury]->line[epos];
-
-	while (start <= end) {
-		*str = start->ch & __CHARTEXT;
-		str++;
-		start++;
-	}
-	*str = '\0';
-
-	if (sn < 0)
-		return OK;
-	else
-		return n;
-}
diff --git a/lib/libcurses/inwstr.c b/lib/libcurses/inwstr.c
deleted file mode 100644
index 3af1d5c8b..000000000
--- a/lib/libcurses/inwstr.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*   $NetBSD: inwstr.c,v 1.3 2009/07/22 16:57:15 roy Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation Inc.
- * All rights reserved.
- *
- * This code is derived from code donated to the NetBSD Foundation
- * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@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.
- * 3. Neither the name of the NetBSD Foundation nor the names of its
- *	contributors may be used to endorse or promote products derived
- *	from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
- * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: inwstr.c,v 1.3 2009/07/22 16:57:15 roy Exp $");
-#endif						  /* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * inwstr, innwstr --
- *	Return a string of wide characters at cursor position from stdscr.
- */
-__warn_references(inwstr,
-	"warning: this program uses inwstr(), which is unsafe.")
-int
-inwstr(wchar_t *wstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return winwstr(stdscr, wstr);
-#endif /* HAVE_WCHAR */
-}
-
-int
-innwstr(wchar_t *wstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return winnwstr(stdscr, wstr, n);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvinwstr, mvinnwstr --
- *  Return a string of wide characters at position (y, x) from stdscr.
- */
-__warn_references(mvinwstr,
-	"warning: this program uses mvinwstr(), which is unsafe.")
-int
-mvinwstr(int y, int x, wchar_t *wstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwinwstr(stdscr, y, x, wstr);
-#endif /* HAVE_WCHAR */
-}
-
-int
-mvinnwstr(int y, int x, wchar_t *wstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwinnwstr(stdscr, y, x, wstr, n);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * mvwinwstr, mvwinnwstr --
- *  Return an array wide characters at position (y, x) from the given window.
- */
-__warn_references(mvwinwstr,
-	"warning: this program uses mvwinwstr(), which is unsafe.")
-int
-mvwinwstr(WINDOW *win, int y, int x, wchar_t *wstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return winwstr(win, wstr);
-#endif /* HAVE_WCHAR */
-}
-
-int
-mvwinnwstr(WINDOW *win, int y, int x, wchar_t *wstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return winnwstr(win, wstr, n);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * winwstr, winnwstr --
- *	Return a string of wide characters at cursor position.
- */
-__warn_references(winwstr,
-	"warning: this program uses winwstr(), which is unsafe.")
-int
-winwstr(WINDOW *win, wchar_t *wstr)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-
-	return winnwstr(win, wstr, -1);
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * - winnwstr() returns the number of characters copied only of if it is
- *   called with n >= 0 (ie, as in_wchnstr(), mvin_wchnstr(), mvwin_wchnstr()
- *   or win_wchnstr()).  If N < 0, it returns `OK'.
- * - SUSv2/xcurses doesn't document whether the trailing NUL is included
- *   in the length count or not.  For safety's sake it _is_ included.
- * - This implementation does not (yet) support multi-byte characters
- *   strings.
- */
-int
-winnwstr(WINDOW *win, wchar_t *wstr, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	__LDATA	*start;
-	int x, cw, cnt;
-	wchar_t *wcp;
-
-	if (wstr == NULL)
-		return ERR;
-
-	start = &win->alines[win->cury]->line[win->curx];
-	x = win->curx;
-	cw = WCOL( *start );
-	if (cw < 0) {
-		start += cw;
-		x += cw;
-	}
-    cnt = 0;
-	wcp = wstr;
-	/* (n - 1) to leave room for the trailing 0 element */
-	while ((x < win->maxx) && ((n < 0) || ((n > 1) && (cnt < n - 1)))) {
-		cw = WCOL( *start );
-		*wcp = start->ch;
-		wcp++;
-		cnt++;
-		x += cw;
-		if ( x < win->maxx ) 
-			start += cw;
-	}
-	*wcp = L'\0';
-
-	if (n < 0)
-		return OK;
-	else
-		return cnt;
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/keymap.h b/lib/libcurses/keymap.h
deleted file mode 100644
index 9443d120e..000000000
--- a/lib/libcurses/keymap.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*   $NetBSD: keymap.h,v 1.4 2012/04/21 12:27:28 roy Exp $ */
-
-/*
- * Copyright (c) 2005 The NetBSD Foundation Inc.
- * All rights reserved.
- *
- * This code is derived from code donated to the NetBSD Foundation
- * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@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.
- * 3. Neither the name of the NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
- * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE 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 _KEYMAP_H_
-#define _KEYMAP_H_
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: keymap.h,v 1.4 2012/04/21 12:27:28 roy Exp $");
-#endif                          /* not lint */
-
-/* keymap related stuff */
-/*
- * moved here by Ruibiao Qiu
- * because it is needed by both getch() and get_wch()
- *
- * Keyboard input handler.  Do this by snarfing
- * all the info we can out of the terminfo entry for TERM and putting it
- * into a set of keymaps.  A keymap is an array the size of all the possible
- * single characters we can get, the contents of the array is a structure
- * that contains the type of entry this character is (i.e. part/end of a
- * multi-char sequence or a plain char) and either a pointer which will point
- * to another keymap (in the case of a multi-char sequence) OR the data value
- * that this key should return.
- *
- */
-
-/* private data structures for holding the key definitions */
-typedef struct key_entry key_entry_t;
-
-struct key_entry {
-	short   type;		/* type of key this is */
-	bool    enable;         /* true if the key is active */
-	union {
-		keymap_t *next;	/* next keymap is key is multi-key sequence */
-		wchar_t   symbol;	/* key symbol if key is a leaf entry */
-	} value;
-};
-/* Types of key structures we can have */
-#define KEYMAP_MULTI  1		/* part of a multi char sequence */
-#define KEYMAP_LEAF   2		/* key has a symbol associated with it, either
-				 * it is the end of a multi-char sequence or a
-				 * single char key that generates a symbol */
-
-/* allocate this many key_entry structs at once to speed start up must
- * be a power of 2.
- */
-#define KEYMAP_ALLOC_CHUNK 4
-
-/* The max number of different chars we can receive */
-#define MAX_CHAR 256
-
-/*
- * Unused mapping flag.
- */
-#define MAPPING_UNUSED (0 - MAX_CHAR) /* never been used */
-
-struct keymap {
-	int	count;	       /* count of number of key structs allocated */
-	short	mapping[MAX_CHAR]; /* mapping of key to allocated structs */
-	key_entry_t **key;     /* dynamic array of keys */
-};
-
-#define INC_POINTER(ptr)  do {	\
-	(ptr)++;		\
-	(ptr) %= INBUF_SZ;	\
-} while(/*CONSTCOND*/0)
-
-#define INKEY_NORM	   0 /* no key backlog to process */
-#define INKEY_ASSEMBLING   1 /* assembling a multi-key sequence */
-#define INKEY_BACKOUT	   2 /* recovering from an unrecognised key */
-#define INKEY_TIMEOUT	   3 /* multi-key sequence timeout */
-#ifdef HAVE_WCHAR
-#define INKEY_WCASSEMBLING 4 /* assembling a wide char sequence */
-#endif /* HAVE_WCHAR */
-
-/* The terminfo data we are interested in and the symbols they map to */
-struct tcdata {
-	int code;		/* code of the terminfo entry */
-	wchar_t	symbol;		/* the symbol associated with it */
-};
-
-#endif /* _KEYMAP_H_ */
diff --git a/lib/libcurses/keyname.c b/lib/libcurses/keyname.c
deleted file mode 100644
index 2adef1d01..000000000
--- a/lib/libcurses/keyname.c
+++ /dev/null
@@ -1,508 +0,0 @@
-/*	$NetBSD: keyname.c,v 1.6 2008/04/28 20:23:01 martin Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: keyname.c,v 1.6 2008/04/28 20:23:01 martin Exp $");
-#endif				/* not lint */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-#define KEYNAMEMAX (size_t) 14	/* "KEY_BACKSPACE\0" */
-static char name[KEYNAMEMAX + 1];
-
-/*
- * keyname --
- *	Return name of key or NULL;
- */
-char *
-keyname(int key)
-{
-/* We don't bother with the large keyname table if SMALL is defined. */
-#ifdef SMALL
-	strcpy(name, "-1\0");
-	return name;
-#else
-	if (key < 0) {
-		strcpy(name, "-1\0");
-		return name;
-	}
-
-	/* No name. */
-	if (key == 0x100) {
-		strcpy(name, "-1\0");
-		return name;
-	}
-
-	/* Control codes */
-	if (key < 0x20) {
-		name[0] = '^';
-		name[1] = (char) (key + 64);	/* Offset of '@' */
-		name[2] = '\0';
-		return name;
-	}
-
-	/* "Normal" keys */
-	if (key < 0x7F) {
-		name[0] = (char) key;
-		name[1] = '\0';
-		return name;
-	}
-
-	/* Delete key */
-	if (key == 0x7F) {
-		strcpy(name, "^?\0");
-		return name;
-	}
-
-	/* Meta + control codes */
-	if (key < 0x9F) {
-		strcpy(name, "M-^"); 
-		name[3] = (char) (key - 64);	/* Offset of '@' */
-		name[4] = '\0';
-		return name;
-	}
-
-	/* Meta + "normal" keys */
-	if (key < 0xFF) {
-		strcpy (name, "M-");
-		name[2] = (char) (key - 128);
-		name[3] = '\0';
-		return name;
-	}
-
-	/* Meta + delete key */
-	if (key == 0xFF) {
-		strcpy(name, "M-^?\0");
-		return name;
-	}
-
-	/* Key names.  Synchronise this with curses.h. */
-	if (key == 0x101) {
-		strncpy(name, "KEY_BREAK\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x102) {
-		strncpy(name, "KEY_DOWN\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x103) {
-		strncpy(name, "KEY_UP\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x104) {
-		strncpy(name, "KEY_LEFT\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x105) {
-		strncpy(name, "KEY_RIGHT\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x106) {
-		strncpy(name, "KEY_HOME\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x107) {
-		strncpy(name, "KEY_BACKSPACE\0", KEYNAMEMAX);
-		return name;
-	}
-	/* Function key block (64 keys). */
-	if (key < 0x148) {
-		int i;
-
-		strcpy(name, "KEY_F(");
-		i = snprintf(&name[6], (size_t) 3, "%d", key - 0x108);
-		name[6 + i] = ')';
-		name[7 + i] = '\0';
-		return name;
-	}
-	if (key == 0x148) {
-		strncpy(name, "KEY_DL\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x149) {
-		strncpy(name, "KEY_IL\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x14A) {
-		strncpy(name, "KEY_DC\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x14B) {
-		strncpy(name, "KEY_IC\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x14C) {
-		strncpy(name, "KEY_EIC\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x14D) {
-		strncpy(name, "KEY_CLEAR\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x14E) {
-		strncpy(name, "KEY_EOS\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x14F) {
-		strncpy(name, "KEY_EOL\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x150) {
-		strncpy(name, "KEY_SF\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x151) {
-		strncpy(name, "KEY_SR\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x152) {
-		strncpy(name, "KEY_NPAGE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x153) {
-		strncpy(name, "KEY_PPAGE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x154) {
-		strncpy(name, "KEY_STAB\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x155) {
-		strncpy(name, "KEY_CTAB\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x156) {
-		strncpy(name, "KEY_CATAB\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x157) {
-		strncpy(name, "KEY_ENTER\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x158) {
-		strncpy(name, "KEY_SRESET\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x159) {
-		strncpy(name, "KEY_RESET\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x15A) {
-		strncpy(name, "KEY_PRINT\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x15B) {
-		strncpy(name, "KEY_LL\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x15C) {
-		strncpy(name, "KEY_A1\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x15D) {
-		strncpy(name, "KEY_A3\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x15E) {
-		strncpy(name, "KEY_B2\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x15F) {
-		strncpy(name, "KEY_C1\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x160) {
-		strncpy(name, "KEY_C3\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x161) {
-		strncpy(name, "KEY_BTAB\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x162) {
-		strncpy(name, "KEY_BEG\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x163) {
-		strncpy(name, "KEY_CANCEL\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x164) {
-		strncpy(name, "KEY_CLOSE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x165) {
-		strncpy(name, "KEY_COMMAND\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x166) {
-		strncpy(name, "KEY_COPY\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x167) {
-		strncpy(name, "KEY_CREATE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x168) {
-		strncpy(name, "KEY_END\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x169) {
-		strncpy(name, "KEY_EXIT\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x16A) {
-		strncpy(name, "KEY_FIND\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x16B) {
-		strncpy(name, "KEY_HELP\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x16C) {
-		strncpy(name, "KEY_MARK\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x16D) {
-		strncpy(name, "KEY_MESSAGE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x16E) {
-		strncpy(name, "KEY_MOVE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x16F) {
-		strncpy(name, "KEY_NEXT\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x170) {
-		strncpy(name, "KEY_OPEN\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x171) {
-		strncpy(name, "KEY_OPTIONS\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x172) {
-		strncpy(name, "KEY_PREVIOUS\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x173) {
-		strncpy(name, "KEY_REDO\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x174) {
-		strncpy(name, "KEY_REFERENCE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x175) {
-		strncpy(name, "KEY_REFRESH\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x176) {
-		strncpy(name, "KEY_REPLACE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x177) {
-		strncpy(name, "KEY_RESTART\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x178) {
-		strncpy(name, "KEY_RESUME\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x179) {
-		strncpy(name, "KEY_SAVE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x17A) {
-		strncpy(name, "KEY_SBEG\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x17B) {
-		strncpy(name, "KEY_SCANCEL\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x17C) {
-		strncpy(name, "KEY_SCOMMAND\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x17D) {
-		strncpy(name, "KEY_SCOPY\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x17E) {
-		strncpy(name, "KEY_SCREATE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x17F) {
-		strncpy(name, "KEY_SDC\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x180) {
-		strncpy(name, "KEY_SDL\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x181) {
-		strncpy(name, "KEY_SELECT\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x182) {
-		strncpy(name, "KEY_SEND\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x183) {
-		strncpy(name, "KEY_SEOL\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x184) {
-		strncpy(name, "KEY_SEXIT\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x185) {
-		strncpy(name, "KEY_SFIND\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x186) {
-		strncpy(name, "KEY_SHELP\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x187) {
-		strncpy(name, "KEY_SHOME\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x188) {
-		strncpy(name, "KEY_SIC\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x189) {
-		strncpy(name, "KEY_SLEFT\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x18A) {
-		strncpy(name, "KEY_SMESSAGE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x18B) {
-		strncpy(name, "KEY_SMOVE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x18C) {
-		strncpy(name, "KEY_SNEXT\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x18D) {
-		strncpy(name, "KEY_SOPTIONS\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x18E) {
-		strncpy(name, "KEY_SPREVIOUS\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x18F) {
-		strncpy(name, "KEY_SPRINT\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x190) {
-		strncpy(name, "KEY_SREDO\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x191) {
-		strncpy(name, "KEY_SREPLACE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x192) {
-		strncpy(name, "KEY_SRIGHT\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x193) {
-		strncpy(name, "KEY_SRSUME\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x194) {
-		strncpy(name, "KEY_SSAVE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x195) {
-		strncpy(name, "KEY_SSUSPEND\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x196) {
-		strncpy(name, "KEY_SUNDO\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x197) {
-		strncpy(name, "KEY_SUSPEND\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x198) {
-		strncpy(name, "KEY_UNDO\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x199) {
-		strncpy(name, "KEY_MOUSE\0", KEYNAMEMAX);
-		return name;
-	}
-	if (key == 0x200) {
-		strncpy(name, "KEY_RESIZE\0", KEYNAMEMAX);
-		return name;
-	}
-	/* No more names. */
-	strncpy(name, "UNKOWN KEY\0", KEYNAMEMAX);
-	return name;
-#endif
-}
-/*
- * key_name --
- *	Return name of key or NULL;
- */
-char *
-key_name(wchar_t key)
-{
-#ifndef HAVE_WCHAR
-	return NULL;
-#else
-	(void) keyname((int) key);
-
-	if (!strncmp(name, "M-", 2)) {
-		/* Remove the "M-" */
-		name[0] = name[2];
-		name[1] = '\0';
-	}
-	return name;
-#endif /* HAVE_WCHAR */
-}
-
diff --git a/lib/libcurses/keypad.c b/lib/libcurses/keypad.c
deleted file mode 100644
index 94640a22f..000000000
--- a/lib/libcurses/keypad.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: keypad.c,v 1.12 2010/02/03 15:34:40 roy Exp $  */
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.com)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, 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>
-#ifndef lint
-__RCSID("$NetBSD: keypad.c,v 1.12 2010/02/03 15:34:40 roy Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * keypad --
- *	Turn on and off interpretation of function/keypad keys in the
- *	given window.
- */
-int
-keypad(WINDOW *win, bool bf)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC,
-	    "keypad: win %p, %s\n", win, bf ? "TRUE" : "FALSE");
-#endif
-	if (bf) {
-		win->flags |= __KEYPAD;
-		if (!(curscr->flags & __KEYPAD)) {
-			tputs (keypad_xmit, 0, __cputchar);
-			curscr->flags |= __KEYPAD;
-		}
-	} else
-		win->flags &= ~__KEYPAD;
-
-	return OK;
-}
diff --git a/lib/libcurses/leaveok.c b/lib/libcurses/leaveok.c
deleted file mode 100644
index e997763aa..000000000
--- a/lib/libcurses/leaveok.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: leaveok.c,v 1.5 2008/04/28 20:23:01 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: leaveok.c,v 1.5 2008/04/28 20:23:01 martin Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * leaveok --
- *	Turn on and off leave cursor after refresh for the given window.
- */
-int
-leaveok(WINDOW *win, bool bf)
-{
-	if (bf)
-		win->flags |= __LEAVEOK;
-	else
-		win->flags &= ~__LEAVEOK;
-	return (OK);
-}
diff --git a/lib/libcurses/line.c b/lib/libcurses/line.c
deleted file mode 100644
index 50c93034b..000000000
--- a/lib/libcurses/line.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/*	$NetBSD: line.c,v 1.6 2010/02/23 19:48:26 drochner Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *						 (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: line.c,v 1.6 2010/02/23 19:48:26 drochner Exp $");
-#endif				/* not lint */
-
-#include <string.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * hline --
- *	Draw a horizontal line of character c on stdscr.
- */
-int
-hline(chtype ch, int count)
-{
-	return whline(stdscr, ch, count);
-}
-
-/*
- * mvhline --
- *	Move to location (y, x) and draw a horizontal line of character c
- *	on stdscr.
- */
-int
-mvhline(int y, int x, chtype ch, int count)
-{
-	return mvwhline(stdscr, y, x, ch, count);
-}
-
-/*
- * mvwhline --
- *	Move to location (y, x) and draw a horizontal line of character c
- *	in the given window.
- */
-int
-mvwhline(WINDOW *win, int y, int x, chtype ch, int count)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return whline(win, ch, count);
-}
-
-/*
- * whline --
- *	Draw a horizontal line of character c in the given window moving
- *	towards the rightmost column.  At most count characters are drawn
- *	or until the edge of the screen, whichever comes first.
- */
-int
-whline(WINDOW *win, chtype ch, int count)
-{
-#ifndef HAVE_WCHAR
-	int ocurx, n, i;
-
-	n = min(count, win->maxx - win->curx);
-	ocurx = win->curx;
-
-	if (!(ch & __CHARTEXT))
-		ch |= ACS_HLINE;
-	for (i = 0; i < n; i++)
-		mvwaddch(win, win->cury, ocurx + i, ch);
-		
-	wmove(win, win->cury, ocurx);
-	return OK;
-#else
-	cchar_t cch, *cchp;
-
-	if (ch & __CHARTEXT) {
-		__cursesi_chtype_to_cchar(ch, &cch);
-		cchp = & cch;
-	} else
-		cchp = WACS_HLINE;
-
-	return whline_set(win, cchp, count);
-#endif
-}
-
-/*
- * vline --
- *	Draw a vertical line of character ch on stdscr.
- */
-int
-vline(chtype ch, int count)
-{
-	return wvline(stdscr, ch, count);
-}
-
-/*
- * mvvline --
- *	Move to the given location an draw a vertical line of character ch.
- */
-int
-mvvline(int y, int x, chtype ch, int count)
-{
-	return mvwvline(stdscr, y, x, ch, count);
-}
-
-/*
- * mvwvline --
- *	Move to the given location and draw a vertical line of character ch
- *	on the given window.
- */
-int
-mvwvline(WINDOW *win, int y, int x, chtype ch, int count)
-{
-	if (wmove(win, y, x) == ERR)
-		return ERR;
-
-	return wvline(win, ch, count);
-}
-
-/*
- * wvline --
- *	Draw a vertical line of character ch in the given window moving
- *	towards the bottom of the screen.  At most count characters are drawn
- *	or until the edge of the screen, whichever comes first.
- */
-int
-wvline(WINDOW *win, chtype ch, int count)
-{
-#ifndef HAVE_WCHAR
-	int ocury, ocurx, n, i;
-
-	n = min(count, win->maxy - win->cury);
-	ocury = win->cury;
-	ocurx = win->curx;
-
-	if (!(ch & __CHARTEXT))
-		ch |= ACS_VLINE;
-	for (i = 0; i < n; i++)
-		mvwaddch(win, ocury + i, ocurx, ch);
-
-	wmove(win, ocury, ocurx);
-	return OK;
-#else
-	cchar_t cch, *cchp;
-
-	if (ch & __CHARTEXT) {
-		__cursesi_chtype_to_cchar(ch, &cch);
-		cchp = & cch;
-	} else
-		cchp = WACS_VLINE;
-
-	return wvline_set(win, cchp, count);
-#endif
-}
-
-int hline_set(const cchar_t *wch, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return whline_set( stdscr, wch, n );
-#endif /* HAVE_WCHAR */
-}
-
-int mvhline_set(int y, int x, const cchar_t *wch, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwhline_set( stdscr, y, x, wch, n );
-#endif /* HAVE_WCHAR */
-}
-
-int mvwhline_set(WINDOW *win, int y, int x, const cchar_t *wch, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if ( wmove( win, y , x ) == ERR )
-		return ERR;
-
-	return whline_set( win, wch, n );
-#endif /* HAVE_WCHAR */
-}
-
-int whline_set(WINDOW *win, const cchar_t *wch, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	int ocurx, wcn, i, cw;
-	cchar_t cc;
-
-	cw = wcwidth( wch->vals[ 0 ]);
-	if (cw < 0)
-		cw = 1;
-	if ( ( win->maxx - win->curx ) < cw )
-		return ERR;
-	wcn = min( n, ( win->maxx - win->curx ) / cw );
-#ifdef DEBUG
-	__CTRACE(__CTRACE_LINE, "whline_set: line of %d\n", wcn);
-#endif /* DEBUG */
-	ocurx = win->curx;
-
-	memcpy( &cc, wch, sizeof( cchar_t ));
-	if (!(wch->vals[ 0 ]))
-		cc.vals[ 0 ] |= WACS_HLINE->vals[0];
-	for (i = 0; i < wcn; i++ ) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_LINE, "whline_set: (%d,%d)\n",
-		   win->cury, ocurx + i * cw);
-#endif /* DEBUG */
-		mvwadd_wch(win, win->cury, ocurx + i * cw, &cc);
-	}
-		
-	wmove(win, win->cury, ocurx);
-	return OK;
-#endif /* HAVE_WCHAR */
-}
-
-int vline_set(const cchar_t *wch, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return wvline_set( stdscr, wch, n );
-#endif /* HAVE_WCHAR */
-}
-
-int mvvline_set(int y, int x, const cchar_t *wch, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	return mvwvline_set( stdscr, y, x, wch, n );
-#endif /* HAVE_WCHAR */
-}
-
-int mvwvline_set(WINDOW *win, int y, int x, const cchar_t *wch, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if ( wmove( win, y, x ) == ERR )
-		return ERR;
-
-	return wvline_set( win, wch, n );
-#endif /* HAVE_WCHAR */
-}
-
-int wvline_set(WINDOW *win, const cchar_t *wch, int n)
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	int ocury, ocurx, wcn, i;
-	cchar_t cc;
-
-	wcn = min( n, win->maxy - win->cury);
-#ifdef DEBUG
-	__CTRACE(__CTRACE_LINE, "wvline_set: line of %d\n", wcn);
-#endif /* DEBUG */
-	ocury = win->cury;
-	ocurx = win->curx;
-
-	memcpy( &cc, wch, sizeof( cchar_t ));
-	if (!(wch->vals[ 0 ]))
-		cc.vals[ 0 ] |= WACS_VLINE->vals[0];
-	for (i = 0; i < wcn; i++) {
-		mvwadd_wch(win, ocury + i, ocurx, &cc);
-#ifdef DEBUG
-		__CTRACE(__CTRACE_LINE, "wvline_set: (%d,%d)\n",
-		    ocury + i, ocurx);
-#endif /* DEBUG */
-	}
-	wmove(win, ocury, ocurx);
-	return OK;
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/meta.c b/lib/libcurses/meta.c
deleted file mode 100644
index 36e10bb38..000000000
--- a/lib/libcurses/meta.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: meta.c,v 1.8 2011/08/07 10:52:18 blymn Exp $	*/
-
-/*-
- * Copyright (c) 1998-2000 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: meta.c,v 1.8 2011/08/07 10:52:18 blymn Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * meta --
- *    Turn on or off the terminal meta mode.
- */
-int
-meta(/*ARGSUSED*/ WINDOW *win, bool bf)
-{
-	if (bf == TRUE) {
-		if (meta_on != NULL) {
-#ifdef DEBUG
-			__CTRACE(__CTRACE_MISC, "meta: TRUE\n");
-#endif
-			tputs(meta_on, 0, __cputchar);
-			_cursesi_screen->meta_state = TRUE;
-			fflush(_cursesi_screen->outfd);
-		}
-	} else {
-		if (meta_off != NULL) {
-#ifdef DEBUG
-			__CTRACE(__CTRACE_MISC, "meta: FALSE\n");
-#endif
-			tputs(meta_off, 0, __cputchar);
-			_cursesi_screen->meta_state = FALSE;
-			fflush(_cursesi_screen->outfd);
-		}
-	}
-
-	return OK;
-}
-
-/*
- * __restore_meta_state --
- *    Restore old meta state.
- */
-void
-__restore_meta_state(void)
-{
-	meta(NULL, _cursesi_screen->meta_state);
-}
-
diff --git a/lib/libcurses/move.c b/lib/libcurses/move.c
deleted file mode 100644
index b964105ef..000000000
--- a/lib/libcurses/move.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*	$NetBSD: move.c,v 1.17 2010/02/23 19:48:26 drochner Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)move.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: move.c,v 1.17 2010/02/23 19:48:26 drochner Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-/*
- * move --
- *	Moves the cursor to the given point on stdscr.
- */
-int
-move(int y, int x)
-{
-	return wmove(stdscr, y, x);
-}
-
-#endif
-
-/*
- * wmove --
- *	Moves the cursor to the given point.
- */
-int
-wmove(WINDOW *win, int y, int x)
-{
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "wmove: (%d, %d)\n", y, x);
-#endif
-	if (x < 0 || y < 0)
-		return (ERR);
-	if (x >= win->maxx || y >= win->maxy)
-		return (ERR);
-	win->curx = x;
-	win->alines[win->cury]->flags &= ~__ISPASTEOL;
-	win->cury = y;
-	win->alines[y]->flags &= ~__ISPASTEOL;
-	return (OK);
-}
-
-void
-wcursyncup(WINDOW *win)
-{
-
-	while (win->orig) {
-		wmove(win->orig, win->cury + win->begy - win->orig->begy,
-			win->curx + win->begx - win->orig->begx);
-		win = win->orig;
-	}
-}
diff --git a/lib/libcurses/mvwin.c b/lib/libcurses/mvwin.c
deleted file mode 100644
index 6c9c451a6..000000000
--- a/lib/libcurses/mvwin.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*	$NetBSD: mvwin.c,v 1.19 2014/02/20 09:42:42 blymn Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mvwin.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: mvwin.c,v 1.19 2014/02/20 09:42:42 blymn Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * mvderwin --
- *      Move a derived window.  This does not change the physical screen
- * coordinates of the subwin, rather maps the characters in the subwin
- * sized part of the parent window starting at dy, dx into the subwin.
- *
- */
-int
-mvderwin(WINDOW *win, int dy, int dx)
-{
-	WINDOW *parent;
-	int x, i;
-	__LINE *plp;
-
-	if (win == NULL)
-		return ERR;
-
-	parent = win->orig;
-
-	if (parent == NULL)
-		return ERR;
-
-	if (((win->maxx + dx) > parent->maxx) ||
-	    ((win->maxy + dy) > parent->maxy))
-		return ERR;
-
-	win->flags |= __ISDERWIN;
-	win->derx = dx;
-	win->dery = dy;
-
-	x = parent->begx + dx;
-
-	/*
-	 * Mark the source area for the derwin as changed so it will be
-	 * copied to the destination window on refresh.
-	 */
-	for (i = 0; i < win->maxy; i++) {
-		plp = parent->alines[i + dy];
-		plp->flags = __ISDIRTY;
-		if (*plp->firstchp > x)
-			*plp->firstchp = x;
-		if (*plp->lastchp < x + win->maxx)
-			*plp->lastchp = x + win->maxx;
-#ifdef DEBUG
-		__CTRACE(__CTRACE_REFRESH, "mvderwin: firstchp = %d, lastchp = %d\n", *plp->firstchp, *plp->lastchp);
-#endif
-	}
-
-	return OK;
-}
-
-/*
- * mvwin --
- *	Relocate the starting position of a window.
- */
-int
-mvwin(WINDOW *win, int by, int bx)
-{
-	WINDOW *orig;
-	int     dy, dx;
-
-	if (by < 0 || by + win->maxy > LINES || bx < 0 || bx + win->maxx > COLS)
-		return (ERR);
-	dy = by - win->begy;
-	dx = bx - win->begx;
-	orig = win->orig;
-	if (orig == NULL) {
-		orig = win;
-		do {
-			win->begy += dy;
-			win->begx += dx;
-			__swflags(win);
-			win = win->nextp;
-		} while (win != orig);
-	} else {
-		if (by < orig->begy || win->maxy + dy > orig->maxy)
-			return (ERR);
-		if (bx < orig->begx || win->maxx + dx > orig->maxx)
-			return (ERR);
-		win->begy = by;
-		win->begx = bx;
-		__swflags(win);
-		__set_subwin(orig, win);
-	}
-	__touchwin(win);
-	return (OK);
-}
diff --git a/lib/libcurses/newwin.c b/lib/libcurses/newwin.c
deleted file mode 100644
index 4084b66e9..000000000
--- a/lib/libcurses/newwin.c
+++ /dev/null
@@ -1,416 +0,0 @@
-/*	$NetBSD: newwin.c,v 1.47 2009/07/22 16:57:15 roy Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)newwin.c	8.3 (Berkeley) 7/27/94";
-#else
-__RCSID("$NetBSD: newwin.c,v 1.47 2009/07/22 16:57:15 roy Exp $");
-#endif
-#endif				/* not lint */
-
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-
-static WINDOW *__makenew(SCREEN *screen, int nlines, int ncols, int by,
-			 int bx, int sub, int ispad);
-static WINDOW *__subwin(WINDOW *orig, int nlines, int ncols, int by, int bx,
-			 int ispad);
-
-/*
- * derwin --
- *      Create a new window in the same manner as subwin but (by, bx)
- *      are relative to the origin of window orig instead of absolute.
- */
-WINDOW *
-derwin(WINDOW *orig, int nlines, int ncols, int by, int bx)
-{
-
-	return __subwin(orig, nlines, ncols, orig->begy + by, orig->begx + bx,
-	    FALSE);
-}
-
-/*
- * subpad --
- *      Create a new pad in the same manner as subwin but (by, bx)
- *      are relative to the origin of window orig instead of absolute.
- */
-WINDOW *
-subpad(WINDOW *orig, int nlines, int ncols, int by, int bx)
-{
-
-	return __subwin(orig, nlines, ncols, orig->begy + by, orig->begx + bx,
-	    TRUE);
-}
-
-/*
- * dupwin --
- *      Create a copy of the given window.
- */
-WINDOW *
-dupwin(WINDOW *win)
-{
-	WINDOW *new_one;
-
-	if ((new_one = __newwin(_cursesi_screen, win->maxy, win->maxx,
-				win->begy, win->begx, FALSE)) == NULL)
-		return NULL;
-
-	overwrite(win, new_one);
-	return new_one;
-}
-
-/*
- * newwin --
- *	Allocate space for and set up defaults for a new window.
- */
-WINDOW *
-newwin(int nlines, int ncols, int by, int bx)
-{
-	return __newwin(_cursesi_screen, nlines, ncols, by, bx, FALSE);
-}
-
-/*
- * newpad --
- *	Allocate space for and set up defaults for a new pad.
- */
-WINDOW *
-newpad(int nlines, int ncols)
-{
-	if (nlines < 1 || ncols < 1)
-		return NULL;
-	return __newwin(_cursesi_screen, nlines, ncols, 0, 0, TRUE);
-}
-
-WINDOW *
-__newwin(SCREEN *screen, int nlines, int ncols, int by, int bx, int ispad)
-{
-	WINDOW *win;
-	__LINE *lp;
-	int     i, j;
-	int	maxy, maxx;
-	__LDATA *sp;
-
-	if (by < 0 || bx < 0)
-		return (NULL);
-
-	maxy = nlines > 0 ? nlines : LINES - by + nlines;
-	maxx = ncols > 0 ? ncols : COLS - bx + ncols;
-
-	if ((win = __makenew(screen, maxy, maxx, by, bx, 0, ispad)) == NULL)
-		return (NULL);
-
-	win->bch = ' ';
-	if (__using_color)
-		win->battr = __default_color;
-	else
-		win->battr = 0;
-	win->nextp = win;
-	win->ch_off = 0;
-	win->orig = NULL;
-	win->reqy = nlines;
-	win->reqx = ncols;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_WINDOW, "newwin: win->ch_off = %d\n", win->ch_off);
-#endif
-
-	for (i = 0; i < maxy; i++) {
-		lp = win->alines[i];
-		if (ispad)
-			lp->flags = __ISDIRTY;
-		else
-			lp->flags = 0;
-		for (sp = lp->line, j = 0; j < maxx; j++, sp++) {
-			sp->attr = 0;
-#ifndef HAVE_WCHAR
-			sp->ch = win->bch;
-#else
-			sp->ch = ( wchar_t )btowc(( int ) win->bch );
-			sp->nsp = NULL;
-			SET_WCOL( *sp, 1 );
-#endif /* HAVE_WCHAR */
-		}
-		lp->hash = __hash((char *)(void *)lp->line,
-		    (size_t) (ncols * __LDATASIZE));
-	}
-	return (win);
-}
-
-WINDOW *
-subwin(WINDOW *orig, int nlines, int ncols, int by, int bx)
-{
-
-	return __subwin(orig, nlines, ncols, by, bx, FALSE);
-}
-
-static WINDOW *
-__subwin(WINDOW *orig, int nlines, int ncols, int by, int bx, int ispad)
-{
-	int     i;
-	__LINE *lp;
-	WINDOW *win;
-	int	maxy, maxx;
-
-#ifdef	DEBUG
-	__CTRACE(__CTRACE_WINDOW, "subwin: (%p, %d, %d, %d, %d, %d)\n",
-	    orig, nlines, ncols, by, bx, ispad);
-#endif
-	if (orig == NULL || orig->orig != NULL)
-		return NULL;
-
-	/* Make sure window fits inside the original one. */
-	maxy = nlines > 0 ? nlines : orig->maxy + orig->begy - by + nlines;
-	maxx = ncols > 0 ? ncols : orig->maxx + orig->begx - bx + ncols;
-	if (by < orig->begy || bx < orig->begx
-	    || by + maxy > orig->maxy + orig->begy
-	    || bx + maxx > orig->maxx + orig->begx)
-		return (NULL);
-	if ((win = __makenew(_cursesi_screen, maxy, maxx,
-			     by, bx, 1, ispad)) == NULL)
-		return (NULL);
-	win->bch = orig->bch;
-	win->battr = orig->battr;
-	win->reqy = nlines;
-	win->reqx = ncols;
-	win->nextp = orig->nextp;
-	orig->nextp = win;
-	win->orig = orig;
-
-	/* Initialize flags here so that refresh can also use __set_subwin. */
-	for (lp = win->lspace, i = 0; i < win->maxy; i++, lp++)
-		lp->flags = 0;
-	__set_subwin(orig, win);
-	return (win);
-}
-/*
- * This code is shared with mvwin().
- */
-void
-__set_subwin(WINDOW *orig, WINDOW *win)
-{
-	int     i;
-	__LINE *lp, *olp;
-#ifdef HAVE_WCHAR
-	__LDATA *cp;
-	int j;
-	nschar_t *np;
-#endif /* HAVE_WCHAR */
-
-	win->ch_off = win->begx - orig->begx;
-	/* Point line pointers to line space. */
-	for (lp = win->lspace, i = 0; i < win->maxy; i++, lp++) {
-		win->alines[i] = lp;
-		olp = orig->alines[i + win->begy - orig->begy];
-#ifdef DEBUG
-		lp->sentinel = SENTINEL_VALUE;
-#endif
-		lp->line = &olp->line[win->ch_off];
-		lp->firstchp = &olp->firstch;
-		lp->lastchp = &olp->lastch;
-#ifndef HAVE_WCHAR
-		lp->hash = __hash((char *)(void *)lp->line,
-		    (size_t) (win->maxx * __LDATASIZE));
-#else
-		for ( cp = lp->line, j = 0; j < win->maxx; j++, cp++ ) {
-			lp->hash = __hash_more( &cp->ch,
-				sizeof( wchar_t ), lp->hash );
-			lp->hash = __hash_more( &cp->attr,
-				sizeof( wchar_t ), lp->hash );
-			if ( cp->nsp ) {
-				np = cp->nsp;
-				while ( np ) {
-					lp->hash = __hash_more( &np->ch,
-						sizeof( wchar_t ), lp->hash );
-					np = np->next;
-				}
-			}
-		}
-#endif /* HAVE_WCHAR */
-	}
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_WINDOW, "__set_subwin: win->ch_off = %d\n",
-	    win->ch_off);
-#endif
-}
-/*
- * __makenew --
- *	Set up a window buffer and returns a pointer to it.
- */
-static WINDOW *
-__makenew(SCREEN *screen, int nlines, int ncols, int by, int bx, int sub,
-	int ispad)
-{
-	WINDOW			*win;
-	__LINE			*lp;
-	struct __winlist	*wlp, *wlp2;
-	int			 i;
-
-
-#ifdef	DEBUG
-	__CTRACE(__CTRACE_WINDOW, "makenew: (%d, %d, %d, %d)\n",
-	    nlines, ncols, by, bx);
-#endif
-	if (nlines <= 0 || ncols <= 0)
-		return NULL;
-
-	if ((win = malloc(sizeof(WINDOW))) == NULL)
-		return (NULL);
-#ifdef DEBUG
-	__CTRACE(__CTRACE_WINDOW, "makenew: win = %p\n", win);
-#endif
-
-	/* Set up line pointer array and line space. */
-	if ((win->alines = malloc(nlines * sizeof(__LINE *))) == NULL) {
-		free(win);
-		return NULL;
-	}
-	if ((win->lspace = malloc(nlines * sizeof(__LINE))) == NULL) {
-		free(win->alines);
-		free(win);
-		return NULL;
-	}
-	/* Don't allocate window and line space if it's a subwindow */
-	if (sub)
-		win->wspace = NULL;
-	else {
-		/*
-		 * Allocate window space in one chunk.
-		 */
-		if ((win->wspace =
-			malloc(ncols * nlines * sizeof(__LDATA))) == NULL) {
-			free(win->lspace);
-			free(win->alines);
-			free(win);
-			return NULL;
-		}
-		/*
-		 * Append window to window list.
-		 */
-		if ((wlp = malloc(sizeof(struct __winlist))) == NULL) {
-			free(win->wspace);
-			free(win->lspace);
-			free(win->alines);
-			free(win);
-			return NULL;
-		}
-		wlp->winp = win;
-		wlp->nextp = NULL;
-		if (screen->winlistp == NULL)
-			screen->winlistp = wlp;
-		else {
-			wlp2 = screen->winlistp;
-			while (wlp2->nextp != NULL)
-				wlp2 = wlp2->nextp;
-			wlp2->nextp = wlp;
-		}
-		/*
-		 * Point line pointers to line space, and lines themselves into
-		 * window space.
-		 */
-		for (lp = win->lspace, i = 0; i < nlines; i++, lp++) {
-			win->alines[i] = lp;
-			lp->line = &win->wspace[i * ncols];
-#ifdef DEBUG
-			lp->sentinel = SENTINEL_VALUE;
-#endif
-			lp->firstchp = &lp->firstch;
-			lp->lastchp = &lp->lastch;
-			if (ispad) {
-				lp->firstch = 0;
-				lp->lastch = ncols;
-			} else {
-				lp->firstch = ncols;
-				lp->lastch = 0;
-			}
-		}
-	}
-#ifdef DEBUG
-	__CTRACE(__CTRACE_WINDOW, "makenew: ncols = %d\n", ncols);
-#endif
-	win->screen = screen;
-	win->cury = win->curx = 0;
-	win->maxy = nlines;
-	win->maxx = ncols;
-	win->reqy = nlines;
-	win->reqx = ncols;
-
-	win->begy = by;
-	win->begx = bx;
-	win->flags = (__IDLINE | __IDCHAR);
-	win->delay = -1;
-	win->wattr = 0;
-#ifdef HAVE_WCHAR
-	win->bnsp = NULL;
-	SET_BGWCOL( *win, 1 );
-#endif /* HAVE_WCHAR */
-	win->scr_t = 0;
-	win->scr_b = win->maxy - 1;
-	if (ispad) {
-		win->flags |= __ISPAD;
-		win->pbegy = 0;
-		win->pbegx = 0;
-		win->sbegy = 0;
-		win->sbegx = 0;
-		win->smaxy = 0;
-		win->smaxx = 0;
-	} else
-		__swflags(win);
-#ifdef DEBUG
-	__CTRACE(__CTRACE_WINDOW, "makenew: win->wattr = %08x\n", win->wattr);
-	__CTRACE(__CTRACE_WINDOW, "makenew: win->flags = %#.4x\n", win->flags);
-	__CTRACE(__CTRACE_WINDOW, "makenew: win->maxy = %d\n", win->maxy);
-	__CTRACE(__CTRACE_WINDOW, "makenew: win->maxx = %d\n", win->maxx);
-	__CTRACE(__CTRACE_WINDOW, "makenew: win->begy = %d\n", win->begy);
-	__CTRACE(__CTRACE_WINDOW, "makenew: win->begx = %d\n", win->begx);
-	__CTRACE(__CTRACE_WINDOW, "makenew: win->scr_t = %d\n", win->scr_t);
-	__CTRACE(__CTRACE_WINDOW, "makenew: win->scr_b = %d\n", win->scr_b);
-#endif
-	return (win);
-}
-
-void
-__swflags(WINDOW *win)
-{
-	win->flags &= ~(__ENDLINE | __FULLWIN | __SCROLLWIN | __LEAVEOK);
-	if (win->begx + win->maxx == COLS && !(win->flags & __ISPAD)) {
-		win->flags |= __ENDLINE;
-		if (win->begx == 0 && win->maxy == LINES && win->begy == 0)
-			win->flags |= __FULLWIN;
-		if (win->begy + win->maxy == LINES)
-			win->flags |= __SCROLLWIN;
-	}
-}
diff --git a/lib/libcurses/nodelay.c b/lib/libcurses/nodelay.c
deleted file mode 100644
index 12748a505..000000000
--- a/lib/libcurses/nodelay.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*      $NetBSD: nodelay.c,v 1.6 2003/12/04 21:24:36 jdc Exp $  */
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.com)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, 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>
-#ifndef lint
-__RCSID("$NetBSD: nodelay.c,v 1.6 2003/12/04 21:24:36 jdc Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * nodelay --
- *	Turn on and off blocking reads in getch for a
- *	given window.
- */
-int
-nodelay(WINDOW *win, bool bf)
-{
-	if (bf)
-		win->delay = 0;
-	else
-		win->delay = -1;
-	return(OK);
-}
diff --git a/lib/libcurses/notimeout.c b/lib/libcurses/notimeout.c
deleted file mode 100644
index d48edd40c..000000000
--- a/lib/libcurses/notimeout.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*      $NetBSD: notimeout.c,v 1.6 2014/02/28 07:58:42 blymn Exp $  */
-
-/*-
- * Copyright (c) 1998-2014 Brett Lymn (blymn@netbsd.org)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: notimeout.c,v 1.6 2014/02/28 07:58:42 blymn Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * notimeout --
- *	Turn on and off inter-key timeout when assembling function keys for a
- *	given window.
- */
-int
-notimeout(WINDOW *win, bool bf)
-{
-	if (bf)
-		win->flags |= __NOTIMEOUT;
-	else
-		win->flags &= ~__NOTIMEOUT;
-
-	return OK;
-}
diff --git a/lib/libcurses/overlay.c b/lib/libcurses/overlay.c
deleted file mode 100644
index 75f5cb39b..000000000
--- a/lib/libcurses/overlay.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: overlay.c,v 1.17 2007/01/21 13:25:36 jdc Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)overlay.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: overlay.c,v 1.17 2007/01/21 13:25:36 jdc Exp $");
-#endif
-#endif				/* not lint */
-
-#include <ctype.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * overlay --
- *	Writes win1 on win2 non-destructively.
- */
-int
-overlay(const WINDOW *win1, WINDOW *win2)
-{
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_WINDOW, "overlay: (%p, %p);\n", win1, win2);
-#endif
-	return copywin(win1, win2,
-			win2->begy - win1->begy, win2->begx - win1->begx,
-			0, 0, win2->maxy - 1, win2->maxx - 1, TRUE);
-}
diff --git a/lib/libcurses/overwrite.c b/lib/libcurses/overwrite.c
deleted file mode 100644
index 5900b808b..000000000
--- a/lib/libcurses/overwrite.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: overwrite.c,v 1.18 2007/01/21 13:25:36 jdc Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)overwrite.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: overwrite.c,v 1.18 2007/01/21 13:25:36 jdc Exp $");
-#endif
-#endif				/* not lint */
-
-#include <ctype.h>
-#include <string.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * overwrite --
- *	Writes win1 on win2 destructively.
- */
-int
-overwrite(const WINDOW *win1, WINDOW *win2)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_WINDOW, "overwrite: (%p, %p);\n", win1, win2);
-#endif
-	return copywin(win1, win2,
-			win2->begy - win1->begy, win2->begx - win1->begx,
-			0, 0, win2->maxy - 1, win2->maxx - 1, FALSE);
-}
diff --git a/lib/libcurses/pause.c b/lib/libcurses/pause.c
deleted file mode 100644
index ab2cee6b0..000000000
--- a/lib/libcurses/pause.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: pause.c,v 1.9 2009/07/22 16:57:15 roy Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: pause.c,v 1.9 2009/07/22 16:57:15 roy Exp $");
-#endif				/* not lint */
-
-#include <stdarg.h>
-#include <stdlib.h>
-#include <sys/time.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * napms --
- *	Sleep for ms milliseconds.
- */
-int
-napms(int ms)
-{
-	struct timespec	ts;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "napms: %d\n", ms);
-#endif
-	ts.tv_sec = ms / 1000;
-	ts.tv_nsec = (ms % 1000) * 1000000;
-	(void) nanosleep(&ts, NULL);
-	return(OK);
-}
-
-/*
- * delay_output --
- *	Pause output using terminal pad character.
- */
-int
-delay_output(int ms)
-{
-	char *delstr;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "delay_output: %d\n", ms);
-#endif
-	if (!_cursesi_screen->padchar)
-		return(napms(ms));
-
-	if (asprintf(&delstr, "%d", ms) == -1)
-		return (ERR);
-	tputs (delstr, 0, __cputchar);
-	free(delstr);
-	return (OK);
-}
diff --git a/lib/libcurses/printw.c b/lib/libcurses/printw.c
deleted file mode 100644
index df5e8317f..000000000
--- a/lib/libcurses/printw.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*	$NetBSD: printw.c,v 1.22 2011/07/17 20:54:34 joerg Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)printw.c	8.3 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: printw.c,v 1.22 2011/07/17 20:54:34 joerg Exp $");
-#endif
-#endif				/* not lint */
-
-#include <stdarg.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * printw and friends.
- */
-
-static int __winwrite __P((void *, const char *, int));
-
-/*
- * printw --
- *	Printf on the standard screen.
- */
-int
-printw(const char *fmt,...)
-{
-	va_list ap;
-	int     ret;
-
-	va_start(ap, fmt);
-	ret = vw_printw(stdscr, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
-/*
- * wprintw --
- *	Printf on the given window.
- */
-int
-wprintw(WINDOW *win, const char *fmt,...)
-{
-	va_list ap;
-	int     ret;
-
-	va_start(ap, fmt);
-	ret = vw_printw(win, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
-/*
- * mvprintw, mvwprintw --
- *	Implement the mvprintw commands.  Due to the variable number of
- *	arguments, they cannot be macros.  Sigh....
- */
-int
-mvprintw(int y, int x, const char *fmt,...)
-{
-	va_list ap;
-	int     ret;
-
-	if (move(y, x) != OK)
-		return (ERR);
-	va_start(ap, fmt);
-	ret = vw_printw(stdscr, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
-
-int
-mvwprintw(WINDOW * win, int y, int x, const char *fmt,...)
-{
-	va_list ap;
-	int     ret;
-
-	if (wmove(win, y, x) != OK)
-		return (ERR);
-
-	va_start(ap, fmt);
-	ret = vw_printw(win, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
-/*
- * Internal write-buffer-to-window function.
- */
-static int
-__winwrite(cookie, buf, n)
-	void   *cookie;
-	const char *buf;
-	int     n;
-{
-	WINDOW *win;
-	int     c;
-
-	for (c = n, win = cookie; --c >= 0;)
-	{
-#ifdef DEBUG
-		__CTRACE(__CTRACE_MISC, "__winwrite: %c\n", *buf);
-#endif
-		if (waddch(win, (chtype) (*buf++ & __CHARTEXT)) == ERR)
-			return (-1);
-	}
-	return (n);
-}
-/*
- * vw_printw --
- *	This routine actually executes the printf and adds it to the window.
- */
-int
-vw_printw(WINDOW *win, const char *fmt, va_list ap)
-{
-	FILE   *f;
-
-	if ((f = funopen(win, NULL, __winwrite, NULL, NULL)) == NULL)
-		return (ERR);
-	(void) vfprintf(f, fmt, ap);
-	return (fclose(f) ? ERR : OK);
-}
-
-__strong_alias(vwprintw, vw_printw)
diff --git a/lib/libcurses/putchar.c b/lib/libcurses/putchar.c
deleted file mode 100644
index f3c8243b1..000000000
--- a/lib/libcurses/putchar.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*	$NetBSD: putchar.c,v 1.21 2010/02/03 15:34:40 roy Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)putchar.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: putchar.c,v 1.21 2010/02/03 15:34:40 roy Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-int
-__cputchar(int ch)
-{
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_OUTPUT, "__cputchar: %s\n", unctrl(ch));
-#endif
-	return (putc(ch, _cursesi_screen->outfd));
-}
-
-/*
- * This is the same as __cputchar but the extra argument holds the file
- * descriptor to write the output to.  This function can only be used with
- * the "new" libterm interface.
- */
-int
-__cputchar_args(int ch, void *args)
-{
-	FILE *outfd = (FILE *) args;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_OUTPUT, "__cputchar_args: %s on fd %d\n",
-	    unctrl(ch), outfd->_file);
-#endif
-	return putc(ch, outfd);
-}
-
-#ifdef HAVE_WCHAR
-int
-__cputwchar(wchar_t wch)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_OUTPUT, "__cputwchar: 0x%x\n", wch);
-#endif
-	return (putwc(wch, _cursesi_screen->outfd));
-}
-
-/*
- * This is the same as __cputchar but the extra argument holds the file
- * descriptor to write the output to.  This function can only be used with
- * the "new" libterm interface.
- */
-int
-__cputwchar_args(wchar_t wch, void *args)
-{
-	FILE *outfd = (FILE *) args;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_OUTPUT, "__cputwchar_args: 0x%x on fd %d\n",
-	    wch, outfd->_file);
-#endif
-	return putwc(wch, outfd);
-}
-#endif /* HAVE_WCHAR */
diff --git a/lib/libcurses/refresh.c b/lib/libcurses/refresh.c
deleted file mode 100644
index cd97a5df5..000000000
--- a/lib/libcurses/refresh.c
+++ /dev/null
@@ -1,1970 +0,0 @@
-/*	$NetBSD: refresh.c,v 1.79 2014/02/20 09:42:42 blymn Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)refresh.c	8.7 (Berkeley) 8/13/94";
-#else
-__RCSID("$NetBSD: refresh.c,v 1.79 2014/02/20 09:42:42 blymn Exp $");
-#endif
-#endif				/* not lint */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-static void	domvcur(int, int, int, int);
-static int	makech(int);
-static void	quickch(void);
-static void	scrolln(int, int, int, int, int);
-
-static int _cursesi_wnoutrefresh(SCREEN *, WINDOW *,
-				 int, int, int, int, int, int);
-
-#ifdef HAVE_WCHAR
-int cellcmp( __LDATA *, __LDATA * );
-int linecmp( __LDATA *, __LDATA *, size_t );
-#endif /* HAVE_WCHAR */
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * refresh --
- *	Make the current screen look like "stdscr" over the area covered by
- *	stdscr.
- */
-int
-refresh(void)
-{
-	return wrefresh(stdscr);
-}
-
-#endif
-
-/*
- * wnoutrefresh --
- *	Add the contents of "win" to the virtual window.
- */
-int
-wnoutrefresh(WINDOW *win)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_REFRESH, "wnoutrefresh: win %p\n", win);
-#endif
-
-	return _cursesi_wnoutrefresh(_cursesi_screen, win, 0, 0, win->begy,
-	    win->begx, win->maxy, win->maxx);
-}
-
-/*
- * pnoutrefresh --
- *	Add the contents of "pad" to the virtual window.
- */
-int
-pnoutrefresh(WINDOW *pad, int pbegy, int pbegx, int sbegy, int sbegx,
-	int smaxy, int smaxx)
-{
-	int pmaxy, pmaxx;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_REFRESH, "pnoutrefresh: pad %p, flags 0x%08x\n",
-	    pad, pad->flags);
-	__CTRACE(__CTRACE_REFRESH,
-	    "pnoutrefresh: (%d, %d), (%d, %d), (%d, %d)\n",
-	    pbegy, pbegx, sbegy, sbegx, smaxy, smaxx);
-#endif
-
-	/* SUS says if these are negative, they should be treated as zero */
-	if (pbegy < 0)
-		pbegy = 0;
-	if (pbegx < 0)
-		pbegx = 0;
-	if (sbegy < 0)
-		sbegy = 0;
-	if (sbegx < 0)
-		sbegx = 0;
-
-	/* Calculate rectangle on pad - used by _cursesi_wnoutrefresh */
-	pmaxy = pbegy + smaxy - sbegy + 1;
-	pmaxx = pbegx + smaxx - sbegx + 1;
-
-	/* Check rectangle fits in pad */
-	if (pmaxy > pad->maxy - pad->begy)
-		pmaxy = pad->maxy - pad->begy;
-	if (pmaxx > pad->maxx - pad->begx)
-		pmaxx = pad->maxx - pad->begx;
-
-	if (smaxy - sbegy < 0 || smaxx - sbegx < 0 )
-		return ERR;
-
-	return _cursesi_wnoutrefresh(_cursesi_screen, pad,
-	    pad->begy + pbegy, pad->begx + pbegx, pad->begy + sbegy,
-	    pad->begx + sbegx, pmaxy, pmaxx);
-}
-
-/*
- * _cursesi_wnoutrefresh --
- *	Does the grunt work for wnoutrefresh to the given screen.
- *	Copies the part of the window given by the rectangle
- *	(begy, begx) to (maxy, maxx) at screen position (wbegy, wbegx).
- */
-int
-_cursesi_wnoutrefresh(SCREEN *screen, WINDOW *win, int begy, int begx,
-	int wbegy, int wbegx, int maxy, int maxx)
-{
-
-	short	sy, wy, wx, y_off, x_off, mx, dy_off, dx_off, endy;
-	__LINE	*wlp, *vlp, *dwlp;
-	WINDOW	*sub_win, *orig, *swin, *dwin;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_REFRESH, "_wnoutrefresh: win %p, flags 0x%08x\n",
-	    win, win->flags);
-	__CTRACE(__CTRACE_REFRESH,
-	    "_wnoutrefresh: (%d, %d), (%d, %d), (%d, %d)\n",
-	    begy, begx, wbegy, wbegx, maxy, maxx);
-#endif
-
-	if (screen->curwin)
-		return OK;
-
-	swin = dwin = win;
-	if (win->flags & __ISDERWIN)
-		swin = win->orig;
-
-	/*
-	 * Recurse through any sub-windows, mark as dirty lines on the parent
-	 * window that are dirty on the sub-window and clear the dirty flag on
-	 * the sub-window.
-	 */
-	if (dwin->orig == 0) {
-		orig = dwin;
-		for (sub_win = dwin->nextp; sub_win != orig;
-		    sub_win = sub_win->nextp) {
-			if (sub_win->flags & __ISDERWIN)
-				continue;
-#ifdef DEBUG
-			__CTRACE(__CTRACE_REFRESH,
-			    "wnout_refresh: win %p, sub_win %p\n",
-			    orig, sub_win);
-#endif
-			for (sy = 0; sy < sub_win->maxy; sy++) {
-				if (sub_win->alines[sy]->flags & __ISDIRTY) {
-					orig->alines[sy + sub_win->begy - orig->begy]->flags
-					    |= __ISDIRTY;
-					sub_win->alines[sy]->flags
-					    &= ~__ISDIRTY;
-				}
-				if (sub_win->alines[sy]->flags & __ISFORCED) {
-					orig->alines[sy + sub_win->begy - orig->begy]->flags
-					    |= __ISFORCED;
-					sub_win->alines[sy]->flags
-					    &= ~__ISFORCED;
-				}
-			}
-		}
-	}
-
-	/* Check that cursor position on "win" is valid for "__virtscr" */
-	if (dwin->cury + wbegy - begy < screen->__virtscr->maxy &&
-	    dwin->cury + wbegy - begy >= 0 && dwin->cury < maxy - begy)
-		screen->__virtscr->cury = dwin->cury + wbegy - begy;
-	if (dwin->curx + wbegx - begx < screen->__virtscr->maxx &&
-	    dwin->curx + wbegx - begx >= 0 && dwin->curx < maxx - begx)
-		screen->__virtscr->curx = dwin->curx + wbegx - begx;
-
-	/* Copy the window flags from "win" to "__virtscr" */
-	if (dwin->flags & __CLEAROK) {
-		if (dwin->flags & __FULLWIN)
-			screen->__virtscr->flags |= __CLEAROK;
-		dwin->flags &= ~__CLEAROK;
-	}
-	screen->__virtscr->flags &= ~__LEAVEOK;
-	screen->__virtscr->flags |= dwin->flags;
-
-	if ((dwin->flags & __ISDERWIN) != 0)
-		endy = begy + maxy;
-	else
-		endy = maxy;
-
-	for (wy = begy, y_off = wbegy, dy_off = 0; wy < endy &&
-	    y_off < screen->__virtscr->maxy; wy++, y_off++, dy_off++) {
-		wlp = swin->alines[wy];
-		dwlp = dwin->alines[dy_off];
-#ifdef DEBUG
-		__CTRACE(__CTRACE_REFRESH,
-		    "_wnoutrefresh: wy %d\tf %d\tl %d\tflags %x\n",
-		    wy, *wlp->firstchp, *wlp->lastchp, wlp->flags);
-
-		if ((dwin->flags & __ISDERWIN) != 0) {
-			__CTRACE(__CTRACE_REFRESH,
-		    	"_wnoutrefresh: derwin wy %d\tf %d\tl %d\tflags %x\n",
-		    	dy_off, *dwlp->firstchp, *dwlp->lastchp, dwlp->flags);
-			__CTRACE(__CTRACE_REFRESH,
-			"_wnoutrefresh: derwin maxx %d\tch_off %d\n",
-			dwin->maxx, dwin->ch_off);
-		}
-#endif
-		if (((wlp->flags & (__ISDIRTY | __ISFORCED)) == 0) &&
-		    ((dwlp->flags & (__ISDIRTY | __ISFORCED)) == 0))
-			continue;
-		vlp = screen->__virtscr->alines[y_off];
-
-		if ((*wlp->firstchp < maxx + swin->ch_off &&
-		    *wlp->lastchp >= swin->ch_off) ||
-		    ((((dwin->flags & __ISDERWIN) != 0) &&
-		     (*dwlp->firstchp < dwin->maxx + dwin->ch_off &&
-		      *dwlp->lastchp >= dwin->ch_off)))) {
-			/* Set start column */
-			wx = begx;
-			x_off = wbegx;
-			dx_off = 0;
-			/*
-			 * if a derwin then source change pointers aren't
-			 * relevant.
-			 */
-			if ((dwin->flags & __ISDERWIN) != 0)
-				mx = wx + maxx;
-			else {
-				if (*wlp->firstchp - swin->ch_off > 0) {
-					wx += *wlp->firstchp - swin->ch_off;
-					x_off += *wlp->firstchp - swin->ch_off;
-				}
-				mx = maxx;
-				if (mx > *wlp->lastchp - swin->ch_off + 1)
-					mx = *dwlp->lastchp - dwin->ch_off + 1;
-				if (x_off + (mx - wx) > __virtscr->maxx)
-					mx -= (x_off + maxx) - __virtscr->maxx;
-			}
-
-			/* Copy line from "win" to "__virtscr". */
-			while (wx < mx) {
-#ifdef DEBUG
-				__CTRACE(__CTRACE_REFRESH,
-				    "_wnoutrefresh: copy from %d, "
-				    "%d to %d, %d: %s, 0x%x",
-				    wy, wx, y_off, x_off,
-				    unctrl(wlp->line[wx].ch),
-				    wlp->line[wx].attr);
-#endif
-				/* Copy character */
-				vlp->line[x_off].ch = wlp->line[wx].ch;
-				/* Copy attributes  */
-				vlp->line[x_off].attr = wlp->line[wx].attr;
-				/* Check for nca conflict with colour */
-				if ((vlp->line[x_off].attr & __COLOR) &&
-				    (vlp->line[x_off].attr &
-				    _cursesi_screen->nca))
-					vlp->line[x_off].attr &= ~__COLOR;
-				if (win->flags & __ISDERWIN) {
-					dwlp->line[dx_off].ch =
-						wlp->line[wx].ch;
-					dwlp->line[dx_off].attr = 
-						wlp->line[wx].attr;
-				}
-
-#ifdef HAVE_WCHAR
-				if (wlp->line[wx].ch
-				    == (wchar_t)btowc((int) win->bch)) {
-					vlp->line[x_off].ch = win->bch;
-					SET_WCOL( vlp->line[x_off], 1 );
-					if (_cursesi_copy_nsp(win->bnsp,
-							      &vlp->line[x_off])
-					    == ERR)
-						return ERR;
-					if (win->flags & __ISDERWIN) {
-						dwlp->line[dx_off].ch =
-							win->bch;
-						SET_WCOL(dwlp->line[dx_off], 1);
-						if (_cursesi_copy_nsp(win->bnsp,
-						     &dwlp->line[dx_off])
-					    	    == ERR)
-							return ERR;
-					}
-				}
-#endif /* HAVE_WCHAR */
-#ifdef DEBUG
-				__CTRACE(__CTRACE_REFRESH, " = %s, 0x%x\n",
-				    unctrl(vlp->line[x_off].ch),
-				    vlp->line[x_off].attr);
-#endif
-				wx++;
-				x_off++;
-				dx_off++;
-			}
-
-			/* Set flags on "__virtscr" and unset on "win". */
-			if (wlp->flags & __ISPASTEOL)
-				vlp->flags |= __ISPASTEOL;
-			else
-				vlp->flags &= ~__ISPASTEOL;
-			if (wlp->flags & __ISDIRTY)
-				vlp->flags |= __ISDIRTY;
-			if (wlp->flags & __ISFORCED)
-				vlp->flags |= __ISFORCED;
-
-#ifdef DEBUG
-			__CTRACE(__CTRACE_REFRESH,
-			    "win: firstch = %d, lastch = %d\n",
-			    *wlp->firstchp, *wlp->lastchp);
-			if (win->flags & __ISDERWIN) {
-				__CTRACE(__CTRACE_REFRESH,
-				    "derwin: fistch = %d, lastch = %d\n",
-				    *dwlp->firstchp, *dwlp->lastchp);
-			}
-#endif
-			/* Set change pointers on "__virtscr". */
-			if (*vlp->firstchp >
-				*wlp->firstchp + wbegx - win->ch_off)
-					*vlp->firstchp =
-					    *wlp->firstchp + wbegx - win->ch_off;
-			if (*vlp->lastchp <
-				*wlp->lastchp + wbegx - win->ch_off)
-					*vlp->lastchp =
-					    *wlp->lastchp + wbegx - win->ch_off;
-
-			if (win->flags & __ISDERWIN) {
-				if (*vlp->firstchp > 
-				    *dwlp->firstchp + wbegx - dwin->ch_off) {
-					*vlp->firstchp =
-					    *dwlp->firstchp + wbegx
-						- dwin->ch_off;
-					vlp->flags |= __ISDIRTY;
-				}
-
-				if (*vlp->lastchp <
-				    *dwlp->lastchp + wbegx - dwin->ch_off) {
-					*vlp->lastchp = *dwlp->lastchp
-					    + wbegx - dwin->ch_off;
-					vlp->flags |= __ISDIRTY;
-				}
-			}
-
-#ifdef DEBUG
-			__CTRACE(__CTRACE_REFRESH,
-			    "__virtscr: firstch = %d, lastch = %d\n",
-			    *vlp->firstchp, *vlp->lastchp);
-#endif
-			/*
-			 * Unset change pointers only if a window and we
-			 * are not forcing a redraw. A pad can be displayed
-			 * again without any of the contents changing.
-			 */
-			if ((!(win->flags & __ISPAD)) ||
-			    ((wlp->flags & __ISFORCED) == __ISFORCED)) {
-				/* Set change pointers on "win". */
-				if (*wlp->firstchp >= win->ch_off)
-					*wlp->firstchp = maxx + win->ch_off;
-				if (*wlp->lastchp < maxx + win->ch_off)
-					*wlp->lastchp = win->ch_off;
-				if ((*wlp->lastchp < *wlp->firstchp) ||
-				    (*wlp->firstchp >= maxx + win->ch_off) ||
-				    (*wlp->lastchp <= win->ch_off)) {
-#ifdef DEBUG
-					__CTRACE(__CTRACE_REFRESH,
-					    "_wnoutrefresh: "
-					    "line %d notdirty\n", wy);
-#endif
-					wlp->flags &= ~__ISDIRTY;
-				}
-			}
-		}
-	}
-	return OK;
-}
-
-/*
- * wrefresh --
- *	Make the current screen look like "win" over the area covered by
- *	win.
- */
-int
-wrefresh(WINDOW *win)
-{
-	int retval;
-	int pbegx, pbegy;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_REFRESH, "wrefresh: win %p\n", win);
-#endif
-
-	_cursesi_screen->curwin = (win == _cursesi_screen->curscr);
-	if (!_cursesi_screen->curwin) {
-		pbegx = pbegy = 0;
-		if ((win->flags & __ISDERWIN) == __ISDERWIN) {
-			pbegx = win->derx;
-			pbegy = win->dery;
-#ifdef DEBUG
-	__CTRACE(__CTRACE_REFRESH, "wrefresh: derwin, begy = %d, begx = %x\n",
-		pbegy, pbegx);
-#endif
-		}
-		retval = _cursesi_wnoutrefresh(_cursesi_screen, win, pbegy,
-		    pbegx, win->begy, win->begx, win->maxy, win->maxx);
-	} else
-		retval = OK;
-	if (retval == OK) {
-		retval = doupdate();
-		if (!(win->flags & __LEAVEOK)) {
-			win->cury = max(0, curscr->cury - win->begy);
-			win->curx = max(0, curscr->curx - win->begx);
-		}
-	}
-	_cursesi_screen->curwin = 0;
-	return(retval);
-}
-
- /*
- * prefresh --
- *	Make the current screen look like "pad" over the area coverd by
- *	the specified area of pad.
- */
-int
-prefresh(WINDOW *pad, int pbegy, int pbegx, int sbegy, int sbegx,
-	int smaxy, int smaxx)
-{
-	int retval;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_REFRESH, "prefresh: pad %p, flags 0x%08x\n",
-	    pad, pad->flags);
-#endif
-	/* Retain values in case pechochar() is called. */
-	pad->pbegy = pbegy;
-	pad->pbegx = pbegx;
-	pad->sbegy = sbegy;
-	pad->sbegx = sbegx;
-	pad->smaxy = smaxy;
-	pad->smaxx = smaxx;
-
-	/* Use pnoutrefresh() to avoid duplicating code here */
-	retval = pnoutrefresh(pad, pbegy, pbegx, sbegy, sbegx, smaxy, smaxx);
-	if (retval == OK) {
-		retval = doupdate();
-		if (!(pad->flags & __LEAVEOK)) {
-			pad->cury = max(0, curscr->cury - pad->begy);
-			pad->curx = max(0, curscr->curx - pad->begx);
-		}
-	}
-	return(retval);
-}
-
-/*
- * doupdate --
- *	Make the current screen look like the virtual window "__virtscr".
- */
-int
-doupdate(void)
-{
-	WINDOW	*win;
-	__LINE	*wlp, *vlp;
-	short	 wy;
-	int	 dnum, was_cleared;
-#ifdef HAVE_WCHAR
-	__LDATA *lp;
-	nschar_t *np;
-	int x;
-#endif /* HAVE_WCHAR */
-
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	if (_cursesi_screen->curwin)
-		win = curscr;
-	else
-		win = _cursesi_screen->__virtscr;
-
-	/* Initialize loop parameters. */
-	_cursesi_screen->ly = curscr->cury;
-	_cursesi_screen->lx = curscr->curx;
-	wy = 0;
-
-	if (!_cursesi_screen->curwin) {
-		for (wy = 0; wy < win->maxy; wy++) {
-			wlp = win->alines[wy];
-			if (wlp->flags & __ISDIRTY) {
-#ifndef HAVE_WCHAR
-				wlp->hash = __hash(wlp->line,
-				    (size_t)(win->maxx * __LDATASIZE));
-#else
-				wlp->hash = 0;
-				for ( x = 0; x < win->maxx; x++ ) {
-					lp = &wlp->line[ x ];
-					wlp->hash = __hash_more( &lp->ch,
-						sizeof( wchar_t ), wlp->hash );
-					wlp->hash = __hash_more( &lp->attr,
-						sizeof( attr_t ), wlp->hash );
-					np = lp->nsp;
-					if (np) {
-						while ( np ) {
-							wlp->hash
-							    = __hash_more(
-								&np->ch,
-								sizeof(wchar_t),
-								wlp->hash );
-							np = np->next;
-						}
-					}
-				}
-#endif /* HAVE_WCHAR */
-			}
-		}
-	}
-
-	was_cleared = 0;
-	if ((win->flags & __CLEAROK) || (curscr->flags & __CLEAROK) ||
-	    _cursesi_screen->curwin) {
-		if (curscr->wattr & __COLOR)
-			__unsetattr(0);
-		tputs(clear_screen, 0, __cputchar);
-		_cursesi_screen->ly = 0;
-		_cursesi_screen->lx = 0;
-		if (!_cursesi_screen->curwin) {
-			curscr->flags &= ~__CLEAROK;
-			curscr->cury = 0;
-			curscr->curx = 0;
-			werase(curscr);
-		}
-		__touchwin(win);
-		win->flags &= ~__CLEAROK;
-		/* note we cleared for later */
-		was_cleared = 1;
-	}
-	if (!cursor_address) {
-		if (win->curx != 0)
-			__cputchar('\n');
-		if (!_cursesi_screen->curwin)
-			werase(curscr);
-	}
-#ifdef DEBUG
-	__CTRACE(__CTRACE_REFRESH, "doupdate: (%p): curwin = %d\n", win,
-	    _cursesi_screen->curwin);
-	__CTRACE(__CTRACE_REFRESH, "doupdate: \tfirstch\tlastch\n");
-#endif
-
-	if (!_cursesi_screen->curwin) {
-		/*
-		 * Invoke quickch() only if more than a quarter of the lines
-		 * in the window are dirty.
-		 */
-		for (wy = 0, dnum = 0; wy < win->maxy; wy++)
-			if (win->alines[wy]->flags & __ISDIRTY)
-				dnum++;
-		if (!__noqch && dnum > (int) win->maxy / 4)
-			quickch();
-	}
-
-#ifdef DEBUG
-	{
-		int	i, j;
-
-		__CTRACE(__CTRACE_REFRESH,
-		    "#####################################\n");
-		__CTRACE(__CTRACE_REFRESH,
-		    "stdscr(%p)-curscr(%p)-__virtscr(%p)\n",
-		    stdscr, curscr, _cursesi_screen->__virtscr);
-		for (i = 0; i < curscr->maxy; i++) {
-			__CTRACE(__CTRACE_REFRESH, "C: %d:", i);
-			__CTRACE(__CTRACE_REFRESH, " 0x%x \n",
-			    curscr->alines[i]->hash);
-			for (j = 0; j < curscr->maxx; j++)
-				__CTRACE(__CTRACE_REFRESH, "%c",
-				    curscr->alines[i]->line[j].ch);
-			__CTRACE(__CTRACE_REFRESH, "\n");
-			__CTRACE(__CTRACE_REFRESH, " attr:");
-			for (j = 0; j < curscr->maxx; j++)
-				__CTRACE(__CTRACE_REFRESH, " %x",
-				    curscr->alines[i]->line[j].attr);
-			__CTRACE(__CTRACE_REFRESH, "\n");
-			__CTRACE(__CTRACE_REFRESH, "W: %d:", i);
-			__CTRACE(__CTRACE_REFRESH, " 0x%x \n",
-			    win->alines[i]->hash);
-			__CTRACE(__CTRACE_REFRESH, " 0x%x ",
-			    win->alines[i]->flags);
-			for (j = 0; j < win->maxx; j++)
-				__CTRACE(__CTRACE_REFRESH, "%c",
-				    win->alines[i]->line[j].ch);
-			__CTRACE(__CTRACE_REFRESH, "\n");
-			__CTRACE(__CTRACE_REFRESH, " attr:");
-			for (j = 0; j < win->maxx; j++)
-				__CTRACE(__CTRACE_REFRESH, " %x",
-				    win->alines[i]->line[j].attr);
-			__CTRACE(__CTRACE_REFRESH, "\n");
-#ifdef HAVE_WCHAR
-			__CTRACE(__CTRACE_REFRESH, " nsp:");
-			for (j = 0; j < curscr->maxx; j++)
-				__CTRACE(__CTRACE_REFRESH, " %p",
-				    win->alines[i]->line[j].nsp);
-			__CTRACE(__CTRACE_REFRESH, "\n");
-			__CTRACE(__CTRACE_REFRESH, " bnsp:");
-			for (j = 0; j < curscr->maxx; j++)
-				__CTRACE(__CTRACE_REFRESH, " %p",
-				    win->bnsp);
-			__CTRACE(__CTRACE_REFRESH, "\n");
-#endif /* HAVE_WCHAR */
-		}
-	}
-#endif /* DEBUG */
-
-	for (wy = 0; wy < win->maxy; wy++) {
-		wlp = win->alines[wy];
-		vlp = _cursesi_screen->__virtscr->alines[win->begy + wy];
-/* XXX: remove this debug */
-#ifdef DEBUG
-		__CTRACE(__CTRACE_REFRESH,
-		    "doupdate: wy %d\tf: %d\tl:%d\tflags %x\n",
-		    wy, *wlp->firstchp, *wlp->lastchp, wlp->flags);
-#endif /* DEBUG */
-		if (!_cursesi_screen->curwin)
-			curscr->alines[wy]->hash = wlp->hash;
-		if ((wlp->flags & __ISDIRTY) ||
-		    (wlp->flags & __ISFORCED)) {
-#ifdef DEBUG
-			__CTRACE(__CTRACE_REFRESH,
-			    "doupdate: [ISDIRTY]wy:%d\tf:%d\tl:%d\n", wy,
-			    *wlp->firstchp, *wlp->lastchp);
-#endif /* DEBUG */
-			/*
-		 	* We have just cleared so don't force an update
-		 	* otherwise we spray neeedless blanks to a cleared
-		 	* screen.
-		 	*/
-			if (was_cleared == 1)
-				win->alines[wy]->flags &= ~__ISFORCED;
-
-			if (makech(wy) == ERR)
-				return (ERR);
-			else {
-				if (*wlp->firstchp >= 0)
-					*wlp->firstchp = win->maxx;
-				if (*wlp->lastchp < win->maxx)
-					*wlp->lastchp = win->ch_off;
-				if (*wlp->lastchp < *wlp->firstchp) {
-#ifdef DEBUG
-					__CTRACE(__CTRACE_REFRESH,
-					    "doupdate: line %d notdirty\n", wy);
-#endif /* DEBUG */
-					wlp->flags &= ~(__ISDIRTY | __ISFORCED);
-				}
-			}
-		}
-
-		/*
-		 * virtscr is now synced for the line, unset the change
-		 * pointers.
-		 */
-		if (*vlp->firstchp >= 0)
-			*vlp->firstchp = _cursesi_screen->__virtscr->maxx;
-		if (*vlp->lastchp <= _cursesi_screen->__virtscr->maxx)
-			*vlp->lastchp = 0;
-
-#ifdef DEBUG
-		__CTRACE(__CTRACE_REFRESH, "\t%d\t%d\n",
-		    *wlp->firstchp, *wlp->lastchp);
-#endif /* DEBUG */
-	}
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_REFRESH, "doupdate: ly=%d, lx=%d\n",
-	    _cursesi_screen->ly, _cursesi_screen->lx);
-#endif /* DEBUG */
-
-	if (_cursesi_screen->curwin)
-		domvcur(_cursesi_screen->ly, _cursesi_screen->lx,
-			win->cury, win->curx);
-	else {
-		if (win->flags & __LEAVEOK) {
-			curscr->cury = _cursesi_screen->ly;
-			curscr->curx = _cursesi_screen->lx;
-		} else {
-			domvcur(_cursesi_screen->ly, _cursesi_screen->lx,
-				win->cury, win->curx);
-			curscr->cury = win->cury;
-			curscr->curx = win->curx;
-		}
-	}
-
-	/* Don't leave the screen with attributes set. */
-	__unsetattr(0);
-#ifdef DEBUG
-#ifdef HAVE_WCHAR
-	{
-		int	i, j;
-
-		__CTRACE(__CTRACE_REFRESH,
-		    "***********after*****************\n");
-		__CTRACE(__CTRACE_REFRESH,
-		    "stdscr(%p)-curscr(%p)-__virtscr(%p)\n",
-		    stdscr, curscr, _cursesi_screen->__virtscr);
-		for (i = 0; i < curscr->maxy; i++) {
-			for (j = 0; j < curscr->maxx; j++)
-				__CTRACE(__CTRACE_REFRESH,
-				    "[%d,%d](%x,%x,%p)-(%x,%x,%p)\n",
-				    i, j,
-				    curscr->alines[i]->line[j].ch,
-				    curscr->alines[i]->line[j].attr,
-				    curscr->alines[i]->line[j].nsp,
-				    _cursesi_screen->__virtscr->alines[i]->line[j].ch,
-				    _cursesi_screen->__virtscr->alines[i]->line[j].attr,
-				    _cursesi_screen->__virtscr->alines[i]->line[j].nsp);
-		}
-	}
-#endif /* HAVE_WCHAR */
-#endif /* DEBUG */
-	return fflush(_cursesi_screen->outfd) == EOF ? ERR : OK;
-}
-
-/*
- * makech --
- *	Make a change on the screen.
- */
-static int
-makech(int wy)
-{
-	WINDOW	*win;
-	static __LDATA blank;
-	__LDATA *nsp, *csp, *cp, *cep;
-	__LINE *wlp;
-	size_t	clsp, nlsp;	/* Last space in lines. */
-	int	lch, wx;
-	const char	*ce;
-	attr_t	lspc;		/* Last space colour */
-	attr_t	off, on;
-
-#ifdef __GNUC__
-	nlsp = lspc = 0;	/* XXX gcc -Wuninitialized */
-#endif
-	if (_cursesi_screen->curwin)
-		win = curscr;
-	else
-		win = __virtscr;
-#ifdef HAVE_WCHAR
-	blank.ch = ( wchar_t )btowc(( int ) win->bch );
-	blank.attr = 0;
-	if (_cursesi_copy_nsp(win->bnsp, &blank) == ERR)
-		return ERR;
-	SET_WCOL( blank, 1 );
-#endif /* HAVE_WCHAR */
-#ifdef DEBUG
-#if HAVE_WCHAR
-	{
-		int x;
-		__LDATA *lp, *vlp;
-
-		__CTRACE(__CTRACE_REFRESH,
-		    "[makech-before]wy=%d,curscr(%p)-__virtscr(%p)\n",
-		    wy, curscr, __virtscr);
-		for (x = 0; x < curscr->maxx; x++) {
-			lp = &curscr->alines[wy]->line[x];
-			vlp = &__virtscr->alines[wy]->line[x];
-			__CTRACE(__CTRACE_REFRESH,
-			    "[%d,%d](%x,%x,%x,%x,%p)-"
-			    "(%x,%x,%x,%x,%p)\n",
-			    wy, x, lp->ch, lp->attr,
-			    win->bch, win->battr, lp->nsp,
-			    vlp->ch, vlp->attr,
-			    win->bch, win->battr, vlp->nsp);
-		}
-	}
-#endif /* HAVE_WCHAR */
-#endif /* DEBUG */
-	/* Is the cursor still on the end of the last line? */
-	if (wy > 0 && curscr->alines[wy - 1]->flags & __ISPASTEOL) {
-		domvcur(_cursesi_screen->ly, _cursesi_screen->lx,
-			_cursesi_screen->ly + 1, 0);
-		_cursesi_screen->ly++;
-		_cursesi_screen->lx = 0;
-	}
-	wlp = win->alines[wy];
-	wx = *win->alines[wy]->firstchp;
-	if (wx < 0)
-		wx = 0;
-	else
-		if (wx >= win->maxx)
-			return (OK);
-	lch = *win->alines[wy]->lastchp;
-	if (lch < 0)
-		return (OK);
-	else
-		if (lch >= (int) win->maxx)
-			lch = win->maxx - 1;
-
-	if (_cursesi_screen->curwin) {
-		csp = &blank;
-#ifdef DEBUG
-		__CTRACE(__CTRACE_REFRESH, "makech: csp is blank\n");
-#endif /* DEBUG */
-	} else {
-		csp = &curscr->alines[wy]->line[wx];
-#ifdef DEBUG
-		__CTRACE(__CTRACE_REFRESH,
-		    "makech: csp is on curscr:(%d,%d)\n", wy, wx);
-#endif /* DEBUG */
-	}
-
-	nsp = &win->alines[wy]->line[wx];
-#ifdef DEBUG
-	if ( _cursesi_screen->curwin )
-		__CTRACE(__CTRACE_REFRESH,
-		    "makech: nsp is at curscr:(%d,%d)\n", wy, wx);
-	else
-		__CTRACE(__CTRACE_REFRESH,
-		    "makech: nsp is at __virtscr:(%d,%d)\n", wy, wx);
-#endif /* DEBUG */
-	if (clr_eol && !_cursesi_screen->curwin) {
-		cp = &win->alines[wy]->line[win->maxx - 1];
-		lspc = cp->attr & __COLOR;
-#ifndef HAVE_WCHAR
-		while (cp->ch == ' ' && cp->attr == lspc) /* XXX */
-			if (cp-- <= win->alines[wy]->line)
-				break;
-#else
-		while (cp->ch == ( wchar_t )btowc(( int )' ' )
-				&& ( cp->attr & WA_ATTRIBUTES ) == lspc)
-			if (cp-- <= win->alines[wy]->line)
-				break;
-#endif /* HAVE_WCHAR */
-		if (win->alines[wy]->line > cp)
-			nlsp = 0;
-		else
-			nlsp = cp - win->alines[wy]->line;
-	}
-	if (!_cursesi_screen->curwin)
-		ce = clr_eol;
-	else
-		ce = NULL;
-
-	while (wx <= lch) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_REFRESH, "makech: wx=%d,lch=%d\n", wx, lch);
-#endif /* DEBUG */
-#ifndef HAVE_WCHAR
-		if (!(wlp->flags & __ISFORCED) && 
-		    (memcmp(nsp, csp, sizeof(__LDATA)) == 0)) {
-			if (wx <= lch) {
-				while (wx <= lch &&
-				    memcmp(nsp, csp, sizeof(__LDATA)) == 0) {
-					nsp++;
-					if (!_cursesi_screen->curwin)
-						++csp;
-					++wx;
-				}
-				continue;
-			}
-			break;
-		}
-#else
-#ifdef DEBUG
-		__CTRACE(__CTRACE_REFRESH, "makech: nsp=(%x,%x,%x,%x,%p)\n",
-			nsp->ch, nsp->attr, win->bch, win->battr, nsp->nsp);
-		__CTRACE(__CTRACE_REFRESH, "makech: csp=(%x,%x,%x,%x,%p)\n",
-			csp->ch, csp->attr, win->bch, win->battr, csp->nsp);
-#endif /* DEBUG */
-		if (!(wlp->flags & __ISFORCED) &&
-		     (((nsp->attr & __WCWIDTH) != __WCWIDTH) &&
-		       cellcmp(nsp, csp))) {
-			if (wx <= lch) {
-				while (wx <= lch && cellcmp( csp, nsp )) {
-					nsp++;
-					if (!_cursesi_screen->curwin)
-						++csp;
-					++wx;
-				}
-				continue;
-			}
-			break;
-		}
-#endif /* HAVE_WCHAR */
-		domvcur(_cursesi_screen->ly, _cursesi_screen->lx, wy, wx);
-
-#ifdef DEBUG
-		__CTRACE(__CTRACE_REFRESH, "makech: 1: wx = %d, ly= %d, "
-		    "lx = %d, newy = %d, newx = %d\n",
-		    wx, _cursesi_screen->ly, _cursesi_screen->lx, wy, wx);
-#endif
-		_cursesi_screen->ly = wy;
-		_cursesi_screen->lx = wx;
-#ifndef HAVE_WCHAR
-		while (wx <= lch && (memcmp(nsp, csp, sizeof(__LDATA)) != 0) ||
-			(wlp->flags & __ISFORCED)) {
-			if (ce != NULL &&
-			    wx >= nlsp && nsp->ch == ' ' && nsp->attr == lspc) {
-#else
-		while ((!cellcmp(nsp, csp) || (wlp->flags & __ISFORCED)) &&
-			wx <= lch) {
-			if (ce != NULL && wx >= nlsp
-			   && nsp->ch == (wchar_t)btowc((int)' ') /* XXX */
-			   && (nsp->attr & WA_ATTRIBUTES) == lspc) {
-
-#endif
-				/* Check for clear to end-of-line. */
-				cep = &curscr->alines[wy]->line[win->maxx - 1];
-#ifndef HAVE_WCHAR
-				while (cep->ch == ' ' && cep->attr == lspc) /* XXX */
-#else
-				while (cep->ch == (wchar_t)btowc((int)' ')
-				       && (cep->attr & WA_ATTRIBUTES) == lspc)
-#endif /* HAVE_WCHAR */
-					if (cep-- <= csp)
-						break;
-				if (cep > (curscr->alines[wy]->line + win->begx * __LDATASIZE))
-					clsp = cep - curscr->alines[wy]->line -
-				    	win->begx * __LDATASIZE;
-				else
-					clsp = 0;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_REFRESH,
-				    "makech: clsp = %zu, nlsp = %zu\n",
-				    clsp, nlsp);
-				__CTRACE(__CTRACE_REFRESH,
-				    "makech: line = %p, cep = %p, begx = %u\n",
-				    curscr->alines[wy]->line, cep, win->begx);
-#endif
-				if (((clsp - nlsp >= strlen(clr_eol) &&
-				    clsp < win->maxx * __LDATASIZE) ||
-				    wy == win->maxy - 1) &&
-				    (!(lspc & __COLOR) ||
-				    ((lspc & __COLOR) && back_color_erase))) {
-					__unsetattr(0);
-					if (__using_color &&
-					    ((lspc & __COLOR) !=
-					    (curscr->wattr & __COLOR)))
-						__set_color(curscr, lspc &
-						    __COLOR);
-					tputs(clr_eol, 0, __cputchar);
-					_cursesi_screen->lx = wx + win->begx;
-					while (wx++ <= clsp) {
-						csp->attr = lspc;
-#ifndef HAVE_WCHAR
-						csp->ch = ' '; /* XXX */
-#else
-						csp->ch = (wchar_t)btowc((int)' ');
-						SET_WCOL( *csp, 1 );
-#endif /* HAVE_WCHAR */
-						csp++;
-					}
-					return (OK);
-				}
-				ce = NULL;
-			}
-
-#ifdef DEBUG
-				__CTRACE(__CTRACE_REFRESH,
-				    "makech: have attr %08x, need attr %08x\n",
-				    curscr->wattr
-#ifndef HAVE_WCHAR
-				 & __ATTRIBUTES
-#else
-				 & WA_ATTRIBUTES
-#endif
-					 ,  nsp->attr
-#ifndef HAVE_WCHAR
-				 & __ATTRIBUTES
-#else
-				 & WA_ATTRIBUTES
-#endif
-					);
-#endif
-
-			off = (~nsp->attr & curscr->wattr)
-#ifndef HAVE_WCHAR
-				 & __ATTRIBUTES
-#else
-				 & WA_ATTRIBUTES
-#endif
-				;
-
-			/*
-			 * Unset attributes as appropriate.  Unset first
-			 * so that the relevant attributes can be reset
-			 * (because 'me' unsets 'mb', 'md', 'mh', 'mk',
-			 * 'mp' and 'mr').  Check to see if we also turn off
-			 * standout, attributes and colour.
-			 */
-			if (off & __TERMATTR && exit_attribute_mode != NULL) {
-				tputs(exit_attribute_mode, 0, __cputchar);
-				curscr->wattr &= __mask_me;
-				off &= __mask_me;
-			}
-
-			/*
-			 * Exit underscore mode if appropriate.
-			 * Check to see if we also turn off standout,
-			 * attributes and colour.
-			 */
-			if (off & __UNDERSCORE && exit_underline_mode != NULL) {
-				tputs(exit_underline_mode, 0, __cputchar);
-				curscr->wattr &= __mask_ue;
-				off &= __mask_ue;
-			}
-
-			/*
-			 * Exit standout mode as appropriate.
-			 * Check to see if we also turn off underscore,
-			 * attributes and colour.
-			 * XXX
-			 * Should use uc if so/se not available.
-			 */
-			if (off & __STANDOUT && exit_standout_mode != NULL) {
-				tputs(exit_standout_mode, 0, __cputchar);
-				curscr->wattr &= __mask_se;
-				off &= __mask_se;
-			}
-
-			if (off & __ALTCHARSET && exit_alt_charset_mode != NULL) {
-				tputs(exit_alt_charset_mode, 0, __cputchar);
-				curscr->wattr &= ~__ALTCHARSET;
-			}
-
-			/* Set/change colour as appropriate. */
-			if (__using_color)
-				__set_color(curscr, nsp->attr & __COLOR);
-
-			on = (nsp->attr & ~curscr->wattr)
-#ifndef HAVE_WCHAR
-				 & __ATTRIBUTES
-#else
-				 & WA_ATTRIBUTES
-#endif
-				 ;
-
-			/*
-			 * Enter standout mode if appropriate.
-			 */
-			if (on & __STANDOUT &&
-			    enter_standout_mode != NULL &&
-			    exit_standout_mode != NULL)
-			{
-				tputs(enter_standout_mode, 0, __cputchar);
-				curscr->wattr |= __STANDOUT;
-			}
-
-			/*
-			 * Enter underscore mode if appropriate.
-			 * XXX
-			 * Should use uc if us/ue not available.
-			 */
-			if (on & __UNDERSCORE &&
-			    enter_underline_mode != NULL &&
-			    exit_underline_mode != NULL)
-			{
-				tputs(enter_underline_mode, 0, __cputchar);
-				curscr->wattr |= __UNDERSCORE;
-			}
-
-			/*
-			 * Set other attributes as appropriate.
-			 */
-			if (exit_attribute_mode != NULL) {
-				if (on & __BLINK &&
-				    enter_blink_mode != NULL)
-				{
-					tputs(enter_blink_mode, 0, __cputchar);
-					curscr->wattr |= __BLINK;
-				}
-				if (on & __BOLD &&
-				    enter_bold_mode != NULL)
-				{
-					tputs(enter_bold_mode, 0, __cputchar);
-					curscr->wattr |= __BOLD;
-				}
-				if (on & __DIM &&
-				    enter_dim_mode != NULL)
-				{
-					tputs(enter_dim_mode, 0, __cputchar);
-					curscr->wattr |= __DIM;
-				}
-				if (on & __BLANK &&
-				    enter_secure_mode != NULL)
-				{
-					tputs(enter_secure_mode, 0, __cputchar);
-					curscr->wattr |= __BLANK;
-				}
-				if (on & __PROTECT &&
-				    enter_protected_mode != NULL)
-				{
-					tputs(enter_protected_mode, 0, __cputchar);
-					curscr->wattr |= __PROTECT;
-				}
-				if (on & __REVERSE &&
-				    enter_reverse_mode != NULL)
-				{
-					tputs(enter_reverse_mode, 0, __cputchar);
-					curscr->wattr |= __REVERSE;
-				}
-#ifdef HAVE_WCHAR
-				if (on & WA_TOP &&
-				    enter_top_hl_mode != NULL)
-				{
-					tputs(enter_top_hl_mode, 0, __cputchar);
-					curscr->wattr |= WA_TOP;
-				}
-				if (on & WA_LOW &&
-				    enter_low_hl_mode != NULL)
-				{
-					tputs(enter_low_hl_mode, 0, __cputchar);
-					curscr->wattr |= WA_LOW;
-				}
-				if (on & WA_LEFT &&
-				    enter_left_hl_mode != NULL)
-				{
-					tputs(enter_left_hl_mode, 0, __cputchar);
-					curscr->wattr |= WA_LEFT;
-				}
-				if (on & WA_RIGHT &&
-				    enter_right_hl_mode != NULL)
-				{
-					tputs(enter_right_hl_mode, 0, __cputchar);
-					curscr->wattr |= WA_RIGHT;
-				}
-				if (on & WA_HORIZONTAL &&
-				    enter_horizontal_hl_mode != NULL)
-				{
-					tputs(enter_horizontal_hl_mode, 0, __cputchar);
-					curscr->wattr |= WA_HORIZONTAL;
-				}
-				if (on & WA_VERTICAL &&
-				    enter_vertical_hl_mode != NULL)
-				{
-					tputs(enter_vertical_hl_mode, 0, __cputchar);
-					curscr->wattr |= WA_VERTICAL;
-				}
-#endif /* HAVE_WCHAR */
-			}
-
-			/* Enter/exit altcharset mode as appropriate. */
-			if (on & __ALTCHARSET && enter_alt_charset_mode != NULL &&
-			    exit_alt_charset_mode != NULL) {
-				tputs(enter_alt_charset_mode, 0, __cputchar);
-				curscr->wattr |= __ALTCHARSET;
-			}
-
-			wx++;
-			if (wx >= win->maxx &&
-			    wy == win->maxy - 1 && !_cursesi_screen->curwin) {
-				if (win->flags & __SCROLLOK) {
-					if (win->flags & __ENDLINE)
-						__unsetattr(1);
-					if (!(win->flags & __SCROLLWIN)) {
-						if (!_cursesi_screen->curwin) {
-							csp->attr = nsp->attr;
-							csp->ch = nsp->ch;
-#ifdef HAVE_WCHAR
-							if (_cursesi_copy_nsp(nsp->nsp, csp) == ERR)
-								return ERR;
-#endif /* HAVE_WCHAR */
-						}
-#ifndef HAVE_WCHAR
-						__cputchar((int) nsp->ch);
-#else
-						if ( WCOL( *nsp ) > 0 ) {
-							__cputwchar((int)nsp->ch);
-#ifdef DEBUG
-							__CTRACE(__CTRACE_REFRESH,
-							    "makech: (%d,%d)putwchar(0x%x)\n",
-								wy, wx - 1,
-								nsp->ch );
-#endif /* DEBUG */
-							/*
-							 * Output non-spacing
-							 * characters for the
-							 * cell.
-							 */
-							__cursesi_putnsp(nsp->nsp,
-									 wy, wx);
-
-						}
-#endif /* HAVE_WCHAR */
-					}
-					if (wx < curscr->maxx) {
-						domvcur(_cursesi_screen->ly, wx,
-						    (int) (win->maxy - 1),
-						    (int) (win->maxx - 1));
-					}
-					_cursesi_screen->ly = win->maxy - 1;
-					_cursesi_screen->lx = win->maxx - 1;
-					return (OK);
-				}
-			}
-			if (wx < win->maxx || wy < win->maxy - 1 ||
-			    !(win->flags & __SCROLLWIN)) {
-				if (!_cursesi_screen->curwin) {
-					csp->attr = nsp->attr;
-					csp->ch = nsp->ch;
-#ifdef HAVE_WCHAR
-					if (_cursesi_copy_nsp(nsp->nsp,
-							      csp) == ERR)
-						return ERR;
-#endif /* HAVE_WCHAR */
-					csp++;
-				}
-#ifndef HAVE_WCHAR
-				__cputchar((int) nsp->ch);
-#ifdef DEBUG
-				__CTRACE(__CTRACE_REFRESH,
-				    "makech: putchar(%c)\n", nsp->ch & 0177);
-#endif
-#else
-				if (WCOL(*nsp) > 0) {
-					__cputwchar((int) nsp->ch);
-#ifdef DEBUG
-					__CTRACE(__CTRACE_REFRESH,
-					    "makech:(%d,%d) putwchar(%x)\n",
-					    wy, wx - 1, nsp->ch);
-					__cursesi_putnsp(nsp->nsp, wy, wx);
-#endif /* DEBUG */
-				}
-#endif /* HAVE_WCHAR */
-			}
-			if (underline_char && ((nsp->attr & __STANDOUT) ||
-			    (nsp->attr & __UNDERSCORE))) {
-				__cputchar('\b');
-				tputs(underline_char, 0, __cputchar);
-			}
-			nsp++;
-#ifdef DEBUG
-			__CTRACE(__CTRACE_REFRESH,
-			    "makech: 2: wx = %d, lx = %d\n",
-			    wx, _cursesi_screen->lx);
-#endif
-		}
-		if (_cursesi_screen->lx == wx)	/* If no change. */
-			break;
-		_cursesi_screen->lx = wx;
-		if (_cursesi_screen->lx >= COLS && auto_right_margin)
-			_cursesi_screen->lx = COLS - 1;
-		else
-			if (wx >= win->maxx) {
-				domvcur(_cursesi_screen->ly,
-					_cursesi_screen->lx,
-					_cursesi_screen->ly,
-					(int) (win->maxx - 1));
-				_cursesi_screen->lx = win->maxx - 1;
-			}
-#ifdef DEBUG
-		__CTRACE(__CTRACE_REFRESH, "makech: 3: wx = %d, lx = %d\n",
-		    wx, _cursesi_screen->lx);
-#endif
-	}
-#ifdef DEBUG
-#if HAVE_WCHAR
-	{
-		int x;
-		__LDATA *lp, *vlp;
-
-		__CTRACE(__CTRACE_REFRESH,
-		    "makech-after: curscr(%p)-__virtscr(%p)\n",
-		    curscr, __virtscr );
-		for (x = 0; x < curscr->maxx; x++) {
-			lp = &curscr->alines[wy]->line[x];
-			vlp = &__virtscr->alines[wy]->line[x];
-			__CTRACE(__CTRACE_REFRESH,
-			    "[%d,%d](%x,%x,%x,%x,%p)-"
-			    "(%x,%x,%x,%x,%p)\n",
-			    wy, x, lp->ch, lp->attr,
-			    win->bch, win->battr, lp->nsp,
-			    vlp->ch, vlp->attr,
-			    win->bch, win->battr, vlp->nsp);
-		}
-	}
-#endif /* HAVE_WCHAR */
-#endif /* DEBUG */
-
-	return (OK);
-}
-
-/*
- * domvcur --
- *	Do a mvcur, leaving attributes if necessary.
- */
-static void
-domvcur(oy, ox, ny, nx)
-	int	oy, ox, ny, nx;
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_REFRESH, "domvcur: (%x,%d)=>(%d,%d)\n",
-	    oy, ox, ny, nx );
-#endif /* DEBUG */
-	__unsetattr(1);
-	if ( oy == ny && ox == nx )
-		return;
-	__mvcur(oy, ox, ny, nx, 1);
-}
-
-/*
- * Quickch() attempts to detect a pattern in the change of the window
- * in order to optimize the change, e.g., scroll n lines as opposed to
- * repainting the screen line by line.
- */
-
-static __LDATA buf[128];
-static  u_int last_hash;
-static  size_t last_hash_len;
-#define BLANKSIZE (sizeof(buf) / sizeof(buf[0]))
-
-static void
-quickch(void)
-{
-#define THRESH		(int) __virtscr->maxy / 4
-
-	__LINE *clp, *tmp1, *tmp2;
-	int	bsize, curs, curw, starts, startw, i, j;
-	int	n, target, cur_period, bot, top, sc_region;
-	u_int	blank_hash;
-	attr_t	bcolor;
-
-#ifdef __GNUC__
-	curs = curw = starts = startw = 0;	/* XXX gcc -Wuninitialized */
-#endif
-	/*
-	 * Find how many lines from the top of the screen are unchanged.
-	 */
-	for (top = 0; top < __virtscr->maxy; top++)
-#ifndef HAVE_WCHAR
-		if (__virtscr->alines[top]->flags & __ISDIRTY &&
-		    (__virtscr->alines[top]->hash != curscr->alines[top]->hash ||
-		    memcmp(__virtscr->alines[top]->line,
-		    curscr->alines[top]->line,
-		    (size_t) __virtscr->maxx * __LDATASIZE)
-		    != 0))
-			break;
-#else
-		if (__virtscr->alines[top]->flags & __ISDIRTY &&
-		    (__virtscr->alines[top]->hash != curscr->alines[top]->hash ||
-		    !linecmp(__virtscr->alines[top]->line,
-		    curscr->alines[top]->line,
-	(size_t) __virtscr->maxx )))
-			break;
-#endif /* HAVE_WCHAR */
-		else
-			__virtscr->alines[top]->flags &= ~__ISDIRTY;
-	/*
-	 * Find how many lines from bottom of screen are unchanged.
-	 */
-	for (bot = __virtscr->maxy - 1; bot >= 0; bot--)
-#ifndef HAVE_WCHAR
-		if (__virtscr->alines[bot]->flags & __ISDIRTY &&
-		    (__virtscr->alines[bot]->hash != curscr->alines[bot]->hash ||
-		    memcmp(__virtscr->alines[bot]->line,
-		    curscr->alines[bot]->line,
-		    (size_t) __virtscr->maxx * __LDATASIZE)
-		    != 0))
-			break;
-#else
-		if (__virtscr->alines[bot]->flags & __ISDIRTY &&
-		    (__virtscr->alines[bot]->hash != curscr->alines[bot]->hash ||
-		    !linecmp(__virtscr->alines[bot]->line,
-		    curscr->alines[bot]->line,
-		    (size_t) __virtscr->maxx )))
-			break;
-#endif /* HAVE_WCHAR */
-		else
-			__virtscr->alines[bot]->flags &= ~__ISDIRTY;
-
-	/*
-	 * Work round an xterm bug where inserting lines causes all the
-	 * inserted lines to be covered with the background colour we
-	 * set on the first line (even if we unset it for subsequent
-	 * lines).
-	 */
-	bcolor = __virtscr->alines[min(top,
-	    __virtscr->maxy - 1)]->line[0].attr & __COLOR;
-	for (i = top + 1, j = 0; i < bot; i++) {
-		if ((__virtscr->alines[i]->line[0].attr & __COLOR) != bcolor) {
-			bcolor = __virtscr->alines[i]->line[__virtscr->maxx].
-			    attr & __COLOR;
-			j = i - top;
-		} else
-			break;
-	}
-	top += j;
-
-#ifdef NO_JERKINESS
-	/*
-	 * If we have a bottom unchanged region return.  Scrolling the
-	 * bottom region up and then back down causes a screen jitter.
-	 * This will increase the number of characters sent to the screen
-	 * but it looks better.
-	 */
-	if (bot < __virtscr->maxy - 1)
-		return;
-#endif				/* NO_JERKINESS */
-
-	/*
-	 * Search for the largest block of text not changed.
-	 * Invariants of the loop:
-	 * - Startw is the index of the beginning of the examined block in
-	 *   __virtscr.
-	 * - Starts is the index of the beginning of the examined block in
-	 *   curscr.
-	 * - Curw is the index of one past the end of the exmined block in
-	 *   __virtscr.
-	 * - Curs is the index of one past the end of the exmined block in
-	 *   curscr.
-	 * - bsize is the current size of the examined block.
-	*/
-
-	for (bsize = bot - top; bsize >= THRESH; bsize--) {
-		for (startw = top; startw <= bot - bsize; startw++)
-			for (starts = top; starts <= bot - bsize;
-				starts++) {
-				for (curw = startw, curs = starts;
-				    curs < starts + bsize; curw++, curs++)
-					if (__virtscr->alines[curw]->hash !=
-					    curscr->alines[curs]->hash)
-						break;
-				if (curs != starts + bsize)
-					continue;
-				for (curw = startw, curs = starts;
-					curs < starts + bsize; curw++, curs++)
-#ifndef HAVE_WCHAR
-					if (memcmp(__virtscr->alines[curw]->line,
-					    curscr->alines[curs]->line,
-					    (size_t) __virtscr->maxx *
-					    __LDATASIZE) != 0)
-						break;
-#else
-					if (!linecmp(__virtscr->alines[curw]->line,
-					    curscr->alines[curs]->line,
-					    (size_t) __virtscr->maxx))
-						break;
-#endif /* HAVE_WCHAR */
-				if (curs == starts + bsize)
-					goto done;
-			}
-	}
-done:
-
-	/* Did not find anything */
-	if (bsize < THRESH)
-		return;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_REFRESH, "quickch:bsize=%d, starts=%d, startw=%d, "
-	    "curw=%d, curs=%d, top=%d, bot=%d\n",
-	    bsize, starts, startw, curw, curs, top, bot);
-#endif
-
-	/*
-	 * Make sure that there is no overlap between the bottom and top
-	 * regions and the middle scrolled block.
-	 */
-	if (bot < curs)
-		bot = curs - 1;
-	if (top > starts)
-		top = starts;
-
-	n = startw - starts;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_REFRESH, "#####################################\n");
-	for (i = 0; i < curscr->maxy; i++) {
-		__CTRACE(__CTRACE_REFRESH, "C: %d:", i);
-		__CTRACE(__CTRACE_REFRESH, " 0x%x \n", curscr->alines[i]->hash);
-		for (j = 0; j < curscr->maxx; j++)
-			__CTRACE(__CTRACE_REFRESH, "%c",
-			    curscr->alines[i]->line[j].ch);
-		__CTRACE(__CTRACE_REFRESH, "\n");
-		__CTRACE(__CTRACE_REFRESH, " attr:");
-		for (j = 0; j < curscr->maxx; j++)
-			__CTRACE(__CTRACE_REFRESH, " %x",
-			    curscr->alines[i]->line[j].attr);
-		__CTRACE(__CTRACE_REFRESH, "\n");
-		__CTRACE(__CTRACE_REFRESH, "W: %d:", i);
-		__CTRACE(__CTRACE_REFRESH, " 0x%x \n",
-		    __virtscr->alines[i]->hash);
-		__CTRACE(__CTRACE_REFRESH, " 0x%x ",
-		    __virtscr->alines[i]->flags);
-		for (j = 0; j < __virtscr->maxx; j++)
-			__CTRACE(__CTRACE_REFRESH, "%c",
-			    __virtscr->alines[i]->line[j].ch);
-		__CTRACE(__CTRACE_REFRESH, "\n");
-		__CTRACE(__CTRACE_REFRESH, " attr:");
-		for (j = 0; j < __virtscr->maxx; j++)
-			__CTRACE(__CTRACE_REFRESH, " %x",
-			    __virtscr->alines[i]->line[j].attr);
-		__CTRACE(__CTRACE_REFRESH, "\n");
-	}
-#endif
-
-#ifndef HAVE_WCHAR
-	if (buf[0].ch != ' ') {
-		for (i = 0; i < BLANKSIZE; i++) {
-			buf[i].ch = ' ';
-			buf[i].attr = 0;
-		}
-	}
-#else
-	if (buf[0].ch != ( wchar_t )btowc(( int ) curscr->bch )) {
-		for (i = 0; i < BLANKSIZE; i++) {
-			buf[i].ch = ( wchar_t )btowc(( int ) curscr->bch );
-			if (_cursesi_copy_nsp(curscr->bnsp, &buf[i]) == ERR)
-				return;
-			buf[i].attr = 0;
-			SET_WCOL( buf[ i ], 1 );
-		}
-	}
-#endif /* HAVE_WCHAR */
-
-	if (__virtscr->maxx != last_hash_len) {
-		blank_hash = 0;
-		for (i = __virtscr->maxx; i > BLANKSIZE; i -= BLANKSIZE) {
-			blank_hash = __hash_more(buf, sizeof(buf), blank_hash);
-		}
-		blank_hash = __hash_more((char *)(void *)buf,
-		    i * sizeof(buf[0]), blank_hash);
-		/* cache result in static data - screen width doesn't change often */
-		last_hash_len = __virtscr->maxx;
-		last_hash = blank_hash;
-	} else
-		blank_hash = last_hash;
-
-	/*
-	 * Perform the rotation to maintain the consistency of curscr.
-	 * This is hairy since we are doing an *in place* rotation.
-	 * Invariants of the loop:
-	 * - I is the index of the current line.
-	 * - Target is the index of the target of line i.
-	 * - Tmp1 points to current line (i).
-	 * - Tmp2 and points to target line (target);
-	 * - Cur_period is the index of the end of the current period.
-	 *   (see below).
-	 *
-	 * There are 2 major issues here that make this rotation non-trivial:
-	 * 1.  Scrolling in a scrolling region bounded by the top
-	 *     and bottom regions determined (whose size is sc_region).
-	 * 2.  As a result of the use of the mod function, there may be a
-	 *     period introduced, i.e., 2 maps to 4, 4 to 6, n-2 to 0, and
-	 *     0 to 2, which then causes all odd lines not to be rotated.
-	 *     To remedy this, an index of the end ( = beginning) of the
-	 *     current 'period' is kept, cur_period, and when it is reached,
-	 *     the next period is started from cur_period + 1 which is
-	 *     guaranteed not to have been reached since that would mean that
-	 *     all records would have been reached. (think about it...).
-	 *
-	 * Lines in the rotation can have 3 attributes which are marked on the
-	 * line so that curscr is consistent with the visual screen.
-	 * 1.  Not dirty -- lines inside the scrolled block, top region or
-	 *                  bottom region.
-	 * 2.  Blank lines -- lines in the differential of the scrolling
-	 *		      region adjacent to top and bot regions
-	 *                    depending on scrolling direction.
-	 * 3.  Dirty line -- all other lines are marked dirty.
-	 */
-	sc_region = bot - top + 1;
-	i = top;
-	tmp1 = curscr->alines[top];
-	cur_period = top;
-	for (j = top; j <= bot; j++) {
-		target = (i - top + n + sc_region) % sc_region + top;
-		tmp2 = curscr->alines[target];
-		curscr->alines[target] = tmp1;
-		/* Mark block as clean and blank out scrolled lines. */
-		clp = curscr->alines[target];
-#ifdef DEBUG
-		__CTRACE(__CTRACE_REFRESH,
-		    "quickch: n=%d startw=%d curw=%d i = %d target=%d ",
-		    n, startw, curw, i, target);
-#endif
-		if ((target >= startw && target < curw) || target < top
-		    || target > bot) {
-#ifdef DEBUG
-			__CTRACE(__CTRACE_REFRESH, " notdirty\n");
-#endif
-			__virtscr->alines[target]->flags &= ~__ISDIRTY;
-		} else
-			if ((n > 0 && target >= top && target < top + n) ||
-			    (n < 0 && target <= bot && target > bot + n)) {
-#ifndef HAVE_WCHAR
-				if (clp->hash != blank_hash ||
-				    memcmp(clp->line, clp->line + 1,
-				    (__virtscr->maxx - 1)
-				    * __LDATASIZE) ||
-				    memcmp(clp->line, buf, __LDATASIZE)) {
-#else
-				if (clp->hash != blank_hash
-				    || linecmp(clp->line, clp->line + 1,
-				    (unsigned int) (__virtscr->maxx - 1))
-				    || cellcmp(clp->line, buf)) {
-#endif /* HAVE_WCHAR */
-					for (i = __virtscr->maxx;
-					    i > BLANKSIZE;
-					    i -= BLANKSIZE) {
-						(void) memcpy(clp->line + i -
-						    BLANKSIZE, buf, sizeof(buf));
-					}
-					(void) memcpy(clp->line , buf, i *
-					    sizeof(buf[0]));
-#ifdef DEBUG
-					__CTRACE(__CTRACE_REFRESH,
-					    " blanked out: dirty\n");
-#endif
-					clp->hash = blank_hash;
-					__touchline(__virtscr, target, 0, (int) __virtscr->maxx - 1);
-				} else {
-#ifdef DEBUG
-					__CTRACE(__CTRACE_REFRESH,
-					    " -- blank line already: dirty\n");
-#endif
-					__touchline(__virtscr, target, 0, (int) __virtscr->maxx - 1);
-				}
-			} else {
-#ifdef DEBUG
-				__CTRACE(__CTRACE_REFRESH, " -- dirty\n");
-#endif
-				__touchline(__virtscr, target, 0, (int) __virtscr->maxx - 1);
-			}
-		if (target == cur_period) {
-			i = target + 1;
-			tmp1 = curscr->alines[i];
-			cur_period = i;
-		} else {
-			tmp1 = tmp2;
-			i = target;
-		}
-	}
-#ifdef DEBUG
-	__CTRACE(__CTRACE_REFRESH, "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n");
-	for (i = 0; i < curscr->maxy; i++) {
-		__CTRACE(__CTRACE_REFRESH, "C: %d:", i);
-		for (j = 0; j < curscr->maxx; j++)
-			__CTRACE(__CTRACE_REFRESH, "%c",
-			    curscr->alines[i]->line[j].ch);
-		__CTRACE(__CTRACE_REFRESH, "\n");
-		__CTRACE(__CTRACE_REFRESH, "W: %d:", i);
-		for (j = 0; j < __virtscr->maxx; j++)
-			__CTRACE(__CTRACE_REFRESH, "%c",
-			    __virtscr->alines[i]->line[j].ch);
-		__CTRACE(__CTRACE_REFRESH, "\n");
-	}
-#endif
-	if (n != 0)
-		scrolln(starts, startw, curs, bot, top);
-}
-
-/*
- * scrolln --
- *	Scroll n lines, where n is starts - startw.
- */
-static void /* ARGSUSED */
-scrolln(starts, startw, curs, bot, top)
-	int	starts, startw, curs, bot, top;
-{
-	int	i, oy, ox, n;
-
-	oy = curscr->cury;
-	ox = curscr->curx;
-	n = starts - startw;
-
-	/*
-	 * XXX
-	 * The initial tests that set __noqch don't let us reach here unless
-	 * we have either cs + ho + SF/sf/SR/sr, or AL + DL.  SF/sf and SR/sr
-	 * scrolling can only shift the entire scrolling region, not just a
-	 * part of it, which means that the quickch() routine is going to be
-	 * sadly disappointed in us if we don't have cs as well.
-	 *
-	 * If cs, ho and SF/sf are set, can use the scrolling region.  Because
-	 * the cursor position after cs is undefined, we need ho which gives us
-	 * the ability to move to somewhere without knowledge of the current
-	 * location of the cursor.  Still call __mvcur() anyway, to update its
-	 * idea of where the cursor is.
-	 *
-	 * When the scrolling region has been set, the cursor has to be at the
-	 * last line of the region to make the scroll happen.
-	 *
-	 * Doing SF/SR or AL/DL appears faster on the screen than either sf/sr
-	 * or AL/DL, and, some terminals have AL/DL, sf/sr, and cs, but not
-	 * SF/SR.  So, if we're scrolling almost all of the screen, try and use
-	 * AL/DL, otherwise use the scrolling region.  The "almost all" is a
-	 * shameless hack for vi.
-	 */
-	if (n > 0) {
-		if (change_scroll_region != NULL && cursor_home != NULL &&
-		    (parm_index != NULL ||
-		    ((parm_insert_line == NULL || parm_delete_line == NULL ||
-		    top > 3 || bot + 3 < __virtscr->maxy) &&
-		    scroll_forward != NULL)))
-		{
-			tputs(tiparm(change_scroll_region, top, bot),
-			    0, __cputchar);
-			__mvcur(oy, ox, 0, 0, 1);
-			tputs(cursor_home, 0, __cputchar);
-			__mvcur(0, 0, bot, 0, 1);
-			if (parm_index != NULL)
-				tputs(tiparm(parm_index, n),
-				    0, __cputchar);
-			else
-				for (i = 0; i < n; i++)
-					tputs(scroll_forward, 0, __cputchar);
-			tputs(tiparm(change_scroll_region,
-			    0, (int) __virtscr->maxy - 1), 0, __cputchar);
-			__mvcur(bot, 0, 0, 0, 1);
-			tputs(cursor_home, 0, __cputchar);
-			__mvcur(0, 0, oy, ox, 1);
-			return;
-		}
-
-		/* Scroll up the block. */
-		if (parm_index != NULL && top == 0) {
-			__mvcur(oy, ox, bot, 0, 1);
-			tputs(tiparm(parm_index, n), 0, __cputchar);
-		} else
-			if (parm_delete_line != NULL) {
-				__mvcur(oy, ox, top, 0, 1);
-				tputs(tiparm(parm_delete_line, n),
-				    0, __cputchar);
-			} else
-				if (delete_line != NULL) {
-					__mvcur(oy, ox, top, 0, 1);
-					for (i = 0; i < n; i++)
-						tputs(delete_line,
-						    0, __cputchar);
-				} else
-					if (scroll_forward != NULL && top == 0) {
-						__mvcur(oy, ox, bot, 0, 1);
-						for (i = 0; i < n; i++)
-							tputs(scroll_forward, 0,
-							    __cputchar);
-					} else
-						abort();
-
-		/* Push down the bottom region. */
-		__mvcur(top, 0, bot - n + 1, 0, 1);
-		if (parm_insert_line != NULL)
-			tputs(tiparm(parm_insert_line, n), 0, __cputchar);
-		else
-			if (insert_line != NULL)
-				for (i = 0; i < n; i++)
-					tputs(insert_line, 0, __cputchar);
-			else
-				abort();
-		__mvcur(bot - n + 1, 0, oy, ox, 1);
-	} else {
-		/*
-		 * !!!
-		 * n < 0
-		 *
-		 * If cs, ho and SR/sr are set, can use the scrolling region.
-		 * See the above comments for details.
-		 */
-		if (change_scroll_region != NULL && cursor_home != NULL &&
-		    (parm_rindex != NULL ||
-		    ((parm_insert_line == NULL || parm_delete_line == NULL ||
-		    top > 3 ||
-		    bot + 3 < __virtscr->maxy) && scroll_reverse != NULL)))
-		{
-			tputs(tiparm(change_scroll_region, top, bot),
-			    0, __cputchar);
-			__mvcur(oy, ox, 0, 0, 1);
-			tputs(cursor_home, 0, __cputchar);
-			__mvcur(0, 0, top, 0, 1);
-
-			if (parm_rindex != NULL)
-				tputs(tiparm(parm_rindex, -n),
-				    0, __cputchar);
-			else
-				for (i = n; i < 0; i++)
-					tputs(scroll_reverse, 0, __cputchar);
-			tputs(tiparm(change_scroll_region,
-			    0, (int) __virtscr->maxy - 1), 0, __cputchar);
-			__mvcur(top, 0, 0, 0, 1);
-			tputs(cursor_home, 0, __cputchar);
-			__mvcur(0, 0, oy, ox, 1);
-			return;
-		}
-
-		/* Preserve the bottom lines. */
-		__mvcur(oy, ox, bot + n + 1, 0, 1);
-		if (parm_rindex != NULL && bot == __virtscr->maxy)
-			tputs(tiparm(parm_rindex, -n), 0, __cputchar);
-		else
-			if (parm_delete_line != NULL)
-				tputs(tiparm(parm_delete_line, -n),
-				    0, __cputchar);
-			else
-				if (delete_line != NULL)
-					for (i = n; i < 0; i++)
-						tputs(delete_line,
-						    0, __cputchar);
-				else
-					if (scroll_reverse != NULL &&
-					    bot == __virtscr->maxy)
-						for (i = n; i < 0; i++)
-							tputs(scroll_reverse, 0,
-							    __cputchar);
-					else
-						abort();
-
-		/* Scroll the block down. */
-		__mvcur(bot + n + 1, 0, top, 0, 1);
-		if (parm_insert_line != NULL)
-			tputs(tiparm(parm_insert_line, -n), 0, __cputchar);
-		else
-			if (insert_line != NULL)
-				for (i = n; i < 0; i++)
-					tputs(insert_line, 0, __cputchar);
-			else
-				abort();
-		__mvcur(top, 0, oy, ox, 1);
-	}
-}
-
-/*
- * __unsetattr --
- *	Unset attributes on curscr.  Leave standout, attribute and colour
- *	modes if necessary (!ms).  Always leave altcharset (xterm at least
- *	ignores a cursor move if we don't).
- */
-void /* ARGSUSED */
-__unsetattr(int checkms)
-{
-	int	isms;
-
-	if (checkms)
-		if (!move_standout_mode) {
-			isms = 1;
-		} else {
-			isms = 0;
-		}
-	else
-		isms = 1;
-#ifdef DEBUG
-	__CTRACE(__CTRACE_REFRESH,
-	    "__unsetattr: checkms = %d, ms = %s, wattr = %08x\n",
-	    checkms, move_standout_mode ? "TRUE" : "FALSE", curscr->wattr);
-#endif
-
-	/*
-	 * Don't leave the screen in standout mode (check against ms).  Check
-	 * to see if we also turn off underscore, attributes and colour.
-	 */
-	if (curscr->wattr & __STANDOUT && isms) {
-		tputs(exit_standout_mode, 0, __cputchar);
-		curscr->wattr &= __mask_se;
-	}
-	/*
-	 * Don't leave the screen in underscore mode (check against ms).
-	 * Check to see if we also turn off attributes.  Assume that we
-	 * also turn off colour.
-	 */
-	if (curscr->wattr & __UNDERSCORE && isms) {
-		tputs(exit_underline_mode, 0, __cputchar);
-		curscr->wattr &= __mask_ue;
-	}
-	/*
-	 * Don't leave the screen with attributes set (check against ms).
-	 * Assume that also turn off colour.
-	 */
-	if (curscr->wattr & __TERMATTR && isms) {
-		tputs(exit_attribute_mode, 0, __cputchar);
-		curscr->wattr &= __mask_me;
-	}
-	/* Don't leave the screen with altcharset set (don't check ms). */
-	if (curscr->wattr & __ALTCHARSET) {
-		tputs(exit_alt_charset_mode, 0, __cputchar);
-		curscr->wattr &= ~__ALTCHARSET;
-	}
-	/* Don't leave the screen with colour set (check against ms). */
-	if (__using_color && isms)
-		__unset_color(curscr);
-}
-
-#ifdef HAVE_WCHAR
-/* compare two cells on screen, must have the same forground/background,
- * and the same sequence of non-spacing characters */
-int
-cellcmp( __LDATA *x, __LDATA *y )
-{
-	nschar_t *xnp = x->nsp, *ynp = y->nsp;
-	int ret = ( x->ch == y->ch ) & ( x->attr == y->attr );
-
-	if ( !ret )
-		return 0;
-	if ( !xnp && !ynp )
-		return 1;
-	if (( xnp && !ynp ) || ( !xnp && ynp ))
-		return 0;
-
-	while ( xnp && ynp ) {
-		if ( xnp->ch != ynp->ch )
-			return 0;
-		xnp = xnp->next;
-		ynp = ynp->next;
-	}
-	return ( !xnp && !ynp );
-}
-
-/* compare two line segments */
-int
-linecmp( __LDATA *xl, __LDATA *yl, size_t len )
-{
-	int i = 0;
-	__LDATA *xp = xl, *yp = yl;
-
-	for ( i = 0; i < len; i++, xp++, yp++ ) {
-		if ( !cellcmp( xp, yp ))
-			return 0;
-	}
-	return 1;
-}
-
-/*
- * Output the non-spacing characters associated with the given character
- * cell to the screen.
- */
-
-void
-__cursesi_putnsp(nschar_t *nsp, const int wy, const int wx)
-{
-	nschar_t *p;
-
-	/* this shuts up gcc warnings about wx and wy not being used */
-	if (wx > wy) {
-	}
-
-	p = nsp;
-	while (p != NULL) {
-		__cputwchar((int) p->ch);
-#ifdef DEBUG
-		__CTRACE(__CTRACE_REFRESH,
-		       "_cursesi_putnsp: (%d,%d) non-spacing putwchar(0x%x)\n",
-			 wy, wx - 1, p->ch);
-#endif
-		p = p->next;
-	}
-}
-
-#endif /* HAVE_WCHAR */
diff --git a/lib/libcurses/resize.c b/lib/libcurses/resize.c
deleted file mode 100644
index 1f1f4a2ae..000000000
--- a/lib/libcurses/resize.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*	$NetBSD: resize.c,v 1.20 2009/07/22 16:57:15 roy Exp $	*/
-
-/*
- * Copyright (c) 2001
- *	Brett Lymn.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)resize.c   blymn 2001/08/26";
-#else
-__RCSID("$NetBSD: resize.c,v 1.20 2009/07/22 16:57:15 roy Exp $");
-#endif
-#endif				/* not lint */
-
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-static int __resizeterm(WINDOW *win, int nlines, int ncols);
-static int __resizewin(WINDOW *win, int nlines, int ncols);
-
-/*
- * wresize --
- *	Resize the given window to the new size.
- */
-int
-wresize(WINDOW *win, int req_nlines, int req_ncols)
-{
-	int	nlines = req_nlines;
-	int	ncols = req_ncols;
-
-	if (win == NULL)
-		return ERR;
-
-#ifdef	DEBUG
-	__CTRACE(__CTRACE_WINDOW, "wresize: (%p, %d, %d)\n",
-	    win, nlines, ncols);
-#endif
-	if (win->orig == NULL) {
-		/* bound "our" windows by the screen size */
-		if (win == curscr || win == __virtscr || win == stdscr) {
-			if (nlines > LINES)
-				nlines = LINES;
-			if (nlines < 1)
-				nlines = 1;
-			if (ncols > COLS)
-				ncols = COLS;
-			if (ncols < 1)
-				ncols = 1;
-		} else {
-			if (win->begy > LINES)
-				win->begy = 0;
-			if (win->begy + nlines > LINES)
-				nlines = 0;
-			if (nlines <= 0)
-				nlines += LINES - win->begy;
-			if (nlines < 1)
-				nlines = 1;
-			if (win->begx > COLS)
-				win->begx = 0;
-			if (win->begx + ncols > COLS)
-				ncols = 0;
-			if (ncols <= 0)
-				ncols += COLS - win->begx;
-			if (ncols < 1)
-				ncols = 1;
-		}
-	} else {
-		/* subwins must fit inside the parent - check this */
-		if (win->begy > win->orig->begy + win->orig->maxy)
-			win->begy = win->orig->begy + win->orig->maxy - 1;
-		if (win->begy + nlines > win->orig->begy + win->orig->maxy)
-			nlines = 0;
-		if (nlines <= 0)
-			nlines += win->orig->begy + win->orig->maxy - win->begy;
-		if (nlines < 1)
-			nlines = 1;
-		if (win->begx > win->orig->begx + win->orig->maxx)
-			win->begx = win->orig->begx + win->orig->maxx - 1;
-		if (win->begx + ncols > win->orig->begx + win->orig->maxx)
-			ncols = 0;
-		if (ncols <= 0)
-			ncols += win->orig->begx + win->orig->maxx - win->begx;
-		if (ncols < 1)
-			ncols = 1;
-	}
-
-	if ((__resizewin(win, nlines, ncols)) == ERR)
-		return ERR;
-
-	win->reqy = req_nlines;
-	win->reqx = req_ncols;
-
-	/* If someone resizes curscr, we must also resize __virtscr */
-	if (win == curscr) {
-		if ((__resizewin(__virtscr, nlines, ncols)) == ERR)
-			return ERR;
-		__virtscr->reqy = req_nlines;
-		__virtscr->reqx = req_ncols;
-	}
-
-	return OK;
-}
-
-/*
- * resizeterm --
- *	Resize the terminal window, resizing the dependent windows.
- */
-int
-resizeterm(int nlines, int ncols)
-{
-	WINDOW *win;
-	struct __winlist *list;
-
-#ifdef	DEBUG
-	__CTRACE(__CTRACE_WINDOW, "resizeterm: (%d, %d)\n", nlines, ncols);
-#endif
-
-	if (__resizeterm(curscr, nlines, ncols) == ERR)
-		return ERR;
-	if (__resizeterm(__virtscr, nlines, ncols) == ERR)
-		return ERR;
-	if (__resizeterm(stdscr, nlines, ncols) == ERR)
-		return ERR;
-
-	LINES = nlines;
-	COLS = ncols;
-
-	  /* tweak the flags now that we have updated the LINES and COLS */
-	for (list = _cursesi_screen->winlistp; list != NULL; list = list->nextp) {
-		win = list->winp;
-
-		if (!(win->flags & __ISPAD))
-			__swflags(win);
-	}
-
-	wrefresh(curscr);
-	return OK;
-}
-
-/*
- * __resizeterm
- *	Setup window for resizing.
- */
-static int
-__resizeterm(WINDOW *win, int nlines, int ncols)
-{
-	int newlines, newcols;
-
-	newlines = win->reqy;
-	if (win->begy + newlines >= nlines)
-		newlines = 0;
-	if (newlines == 0)
-		newlines = nlines - win->begy;
-
-	newcols = win->reqx;
-	if (win->begx + newcols >= ncols)
-		newcols = 0;
-	if (newcols == 0)
-		newcols = ncols - win->begx;
-
-	return __resizewin(win, newlines, newcols);
-}
-
-/*
- * __resizewin --
- *	Resize the given window.
- */
-static int
-__resizewin(WINDOW *win, int nlines, int ncols)
-{
-	__LINE			*lp, *olp, **newlines, *newlspace;
-	__LDATA			*sp;
-	__LDATA			*newwspace;
-	int			 i, j;
-	int			 y, x;
-	WINDOW			*swin;
-
-#ifdef	DEBUG
-	__CTRACE(__CTRACE_WINDOW, "resize: (%p, %d, %d)\n", win, nlines, ncols);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->wattr = %08x\n", win->wattr);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->flags = %#.4x\n", win->flags);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->maxy = %d\n", win->maxy);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->maxx = %d\n", win->maxx);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->begy = %d\n", win->begy);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->begx = %d\n", win->begx);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->scr_t = %d\n", win->scr_t);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->scr_b = %d\n", win->scr_b);
-#endif
-
-	/*
-	 * free up any non-spacing storage before we lose the
-	 * pointers...
-	 */
-#ifdef HAVE_WCHAR
-	__cursesi_win_free_nsp(win);
-#endif
-
-	if (nlines <= 0 || ncols <= 0)
-		nlines = ncols = 0;
-	else {
-		/* Reallocate line pointer array and line space. */
-		newlines = realloc(win->alines, nlines * sizeof(__LINE *));
-		if (newlines == NULL)
-			return ERR;
-		win->alines = newlines;
-
-		newlspace = realloc(win->lspace, nlines * sizeof(__LINE));
-		if (newlspace == NULL)
-			return ERR;
-		win->lspace = newlspace;
-	}
-
-	/* Don't allocate window and line space if it's a subwindow */
-	if (win->orig == NULL) {
-		/*
-		 * Allocate window space in one chunk.
-		 */
-		if (ncols != 0) {
-			newwspace = realloc(win->wspace,
-					    ncols * nlines * sizeof(__LDATA));
-			if (newwspace == NULL)
-				return ERR;
-			win->wspace = newwspace;
-		}
-
-		/*
-		 * Point line pointers to line space, and lines themselves into
-		 * window space.
-		 */
-		for (lp = win->lspace, i = 0; i < nlines; i++, lp++) {
-			win->alines[i] = lp;
-			lp->line = &win->wspace[i * ncols];
-#ifdef DEBUG
-			lp->sentinel = SENTINEL_VALUE;
-#endif
-			lp->firstchp = &lp->firstch;
-			lp->lastchp = &lp->lastch;
-			lp->firstch = 0;
-			lp->lastch = ncols - 1;
-			lp->flags = __ISDIRTY;
-		}
-	} else {
-
-		win->ch_off = win->begx - win->orig->begx;
-		  /* Point line pointers to line space. */
-		for (lp = win->lspace, i = 0; i < nlines; i++, lp++) {
-			win->alines[i] = lp;
-			olp = win->orig->alines[i + win->begy - win->orig->begy];
-			lp->line = &olp->line[win->ch_off];
-#ifdef DEBUG
-			lp->sentinel = SENTINEL_VALUE;
-#endif
-			lp->firstchp = &olp->firstch;
-			lp->lastchp = &olp->lastch;
-			lp->flags = __ISDIRTY;
-		}
-	}
-
-
-	win->cury = win->curx = 0;
-	win->maxy = nlines;
-	win->maxx = ncols;
-	win->scr_b = win->maxy - 1;
-	__swflags(win);
-
-	  /*
-	   * we must zot the window contents otherwise lines may pick
-	   * up attributes from the previous line when the window is
-	   * made smaller.  The client will redraw the window anyway
-	   * so this is no big deal.
-	   */
-	for (i = 0; i < win->maxy; i++) {
-		lp = win->alines[i];
-		for (sp = lp->line, j = 0; j < win->maxx; j++, sp++) {
-			sp->attr = 0;
-#ifndef HAVE_WCHAR
-			sp->ch = win->bch;
-#else
-			sp->ch = ( wchar_t )btowc(( int ) win->bch );
-			sp->nsp = NULL;
-			if (_cursesi_copy_nsp(win->bnsp, sp) == ERR)
-				return ERR;
-			SET_WCOL( *sp, 1 );
-#endif /* HAVE_WCHAR */
-		}
-		lp->hash = __hash((char *)(void *)lp->line,
-				  (size_t) (ncols * __LDATASIZE));
-	}
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_WINDOW, "resize: win->wattr = %08x\n", win->wattr);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->flags = %#.4x\n", win->flags);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->maxy = %d\n", win->maxy);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->maxx = %d\n", win->maxx);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->begy = %d\n", win->begy);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->begx = %d\n", win->begx);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->scr_t = %d\n", win->scr_t);
-	__CTRACE(__CTRACE_WINDOW, "resize: win->scr_b = %d\n", win->scr_b);
-#endif
-
-	if (win->orig == NULL) {
-		/* bound subwindows to new size and fixup their pointers */
-		for (swin = win->nextp; swin != win; swin = swin->nextp) {
-			y = swin->reqy;
-			if (swin->begy > win->begy + win->maxy)
-				swin->begy = win->begy + win->maxy - 1;
-			if (swin->begy + y > win->begy + win->maxy)
-				y = 0;
-			if (y <= 0)
-				y += win->begy + win->maxy - swin->begy;
-			if (y < 1)
-				y = 1;
-			x = swin->reqx;
-			if (swin->begx > win->begx + win->maxx)
-				swin->begx = win->begx + win->maxx - 1;
-			if (swin->begx + x > win->begx + win->maxx)
-				x = 0;
-			if (x <= 0)
-				x += win->begy + win->maxx - swin->begx;
-			if (x < 1)
-				x = 1;
-			__resizewin(swin, y, x);
-		}
-	}
-
-	return OK;
-}
diff --git a/lib/libcurses/scanw.c b/lib/libcurses/scanw.c
deleted file mode 100644
index bbcf8f127..000000000
--- a/lib/libcurses/scanw.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*	$NetBSD: scanw.c,v 1.21 2011/07/17 20:54:34 joerg Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)scanw.c	8.3 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: scanw.c,v 1.21 2011/07/17 20:54:34 joerg Exp $");
-#endif
-#endif				/* not lint */
-
-/*
- * scanw and friends.
- */
-
-#include <stdarg.h>
-
-#include "curses.h"
-
-/*
- * scanw --
- *	Implement a scanf on the standard screen.
- */
-int
-scanw(const char *fmt,...)
-{
-	va_list ap;
-	int     ret;
-
-	va_start(ap, fmt);
-	ret = vw_scanw(stdscr, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
-/*
- * wscanw --
- *	Implements a scanf on the given window.
- */
-int
-wscanw(WINDOW *win, const char *fmt,...)
-{
-	va_list ap;
-	int     ret;
-
-	va_start(ap, fmt);
-	ret = vw_scanw(win, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
-/*
- * mvscanw, mvwscanw --
- *	Implement the mvscanw commands.  Due to the variable number of
- *	arguments, they cannot be macros.  Another sigh....
- */
-int
-mvscanw(int y, int x, const char *fmt,...)
-{
-	va_list ap;
-	int     ret;
-
-	if (move(y, x) != OK)
-		return (ERR);
-	va_start(ap, fmt);
-	ret = vw_scanw(stdscr, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
-
-int
-mvwscanw(WINDOW * win, int y, int x, const char *fmt,...)
-{
-	va_list ap;
-	int     ret;
-
-	if (move(y, x) != OK)
-		return (ERR);
-	va_start(ap, fmt);
-	ret = vw_scanw(win, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
-/*
- * vwscanw --
- *	This routine actually executes the scanf from the window.
- */
-int
-vw_scanw(WINDOW *win, const char *fmt, va_list ap)
-{
-
-	char    buf[1024];
-
-	return (wgetnstr(win, buf, (int) sizeof(buf)) == OK ?
-	    vsscanf(buf, fmt, ap) : ERR);
-}
-
-__strong_alias(vwscanw, vw_scanw)
diff --git a/lib/libcurses/screen.c b/lib/libcurses/screen.c
deleted file mode 100644
index 439dcff41..000000000
--- a/lib/libcurses/screen.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*	$NetBSD: screen.c,v 1.23 2010/06/10 05:24:55 dholland Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)screen.c	8.2 (blymn) 11/27/2001";
-#else
-__RCSID("$NetBSD: screen.c,v 1.23 2010/06/10 05:24:55 dholland Exp $");
-#endif
-#endif					/* not lint */
-
-#include <stdlib.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * set_term --
- *      Change the term to the given screen.
- *
- */
-SCREEN *
-set_term(SCREEN *new)
-{
-	SCREEN *old_screen = _cursesi_screen;
-
-	if (_cursesi_screen != NULL) {
-		  /* save changes made to the current screen... */
-		old_screen->echoit = __echoit;
-		old_screen->pfast = __pfast;
-		old_screen->rawmode = __rawmode;
-		old_screen->noqch = __noqch;
-		old_screen->COLS = COLS;
-		old_screen->LINES = LINES;
-		old_screen->COLORS = COLORS;
-		old_screen->COLOR_PAIRS = COLOR_PAIRS;
-		old_screen->GT = __GT;
-		old_screen->NONL = __NONL;
-		old_screen->UPPERCASE = __UPPERCASE;
-	}
-
-	_cursesi_screen = new;
-
-	__echoit = new->echoit;
-        __pfast = new->pfast;
-	__rawmode = new->rawmode;
-	__noqch = new->noqch;
-	COLS = new->COLS;
-	LINES = new->LINES;
-	COLORS = new->COLORS;
-	COLOR_PAIRS = new->COLOR_PAIRS;
-	__GT = new->GT;
-	__NONL = new->NONL;
-	__UPPERCASE = new->UPPERCASE;
-
-	_cursesi_resetterm(new);
-
-	curscr = new->curscr;
-	clearok(curscr, new->clearok);
-	stdscr = new->stdscr;
-	__virtscr = new->__virtscr;
-
-	_cursesi_reset_acs(new);
-#ifdef HAVE_WCHAR
-    _cursesi_reset_wacs(new);
-#endif /* HAVE_WCHAR */
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_SCREEN, "set_term: LINES = %d, COLS = %d\n",
-	    LINES, COLS);
-#endif
-
-	return old_screen;
-}
-
-/*
- * newterm --
- *      Set up a new screen.
- *
- */
-SCREEN *
-newterm(char *type, FILE *outfd, FILE *infd)
-{
-	SCREEN *new_screen;
-	char *sp;
-
-	sp = type;
-	if ((type == NULL) && (sp = getenv("TERM")) == NULL)
-		return NULL;
-
-	if ((new_screen = calloc(1, sizeof(SCREEN))) == NULL)
-		return NULL;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INIT, "newterm\n");
-#endif
-
-	new_screen->infd = infd;
-	new_screen->outfd = outfd;
-	new_screen->echoit = new_screen->nl = 1;
-	new_screen->pfast = new_screen->rawmode = new_screen->noqch = 0;
-	new_screen->nca = A_NORMAL;
-	new_screen->color_type = COLOR_NONE;
-	new_screen->COLOR_PAIRS = 0;
-	new_screen->old_mode = 2;
-	new_screen->stdbuf = NULL;
-	new_screen->stdscr = NULL;
-	new_screen->curscr = NULL;
-	new_screen->__virtscr = NULL;
-	new_screen->curwin = 0;
-	new_screen->notty = FALSE;
-	new_screen->half_delay = FALSE;
-	new_screen->resized = 0;
-	new_screen->unget_len = 32;
-
-	if ((new_screen->unget_list =
-	    malloc(sizeof(wchar_t) * new_screen->unget_len)) == NULL) {
-		goto error_exit;
-	}
-	new_screen->unget_pos = 0;
-
-	if (_cursesi_gettmode(new_screen) == ERR)
-		goto error_exit;
-
-	if (_cursesi_setterm((char *)sp, new_screen) == ERR)
-		goto error_exit;
-
-	/* Need either homing or cursor motion for refreshes */
-	if (!t_cursor_home(new_screen->term) &&
-	    !t_cursor_address(new_screen->term))
-		goto error_exit;
-
-	new_screen->winlistp = NULL;
-
-	if ((new_screen->curscr = __newwin(new_screen, 0,
-	    0, 0, 0, FALSE)) == NULL)
-		goto error_exit;
-
-	if ((new_screen->stdscr = __newwin(new_screen, 0,
-	    0, 0, 0, FALSE)) == NULL) {
-		delwin(new_screen->curscr);
-		goto error_exit;
-	}
-
-	clearok(new_screen->stdscr, 1);
-
-	if ((new_screen->__virtscr = __newwin(new_screen, 0,
-	    0, 0, 0, FALSE)) == NULL) {
-		delwin(new_screen->curscr);
-		delwin(new_screen->stdscr);
-		goto error_exit;
-	}
-
-	__init_getch(new_screen);
-	__init_acs(new_screen);
-#ifdef HAVE_WCHAR
-	__init_get_wch( new_screen );
-	__init_wacs(new_screen);
-#endif /* HAVE_WCHAR */
-
-	__set_stophandler();
-	__set_winchhandler();
-
-	  /*
-	   * bleh - it seems that apps expect the first newterm to set
-	   * up the curses screen.... emulate this.
-	   */
-	if (_cursesi_screen == NULL || _cursesi_screen->endwin) {
-		set_term(new_screen);
-	}
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_SCREEN, "newterm: LINES = %d, COLS = %d\n",
-	    LINES, COLS);
-#endif
-	__startwin(new_screen);
-
-	return new_screen;
-
-  error_exit:
-	free(new_screen);
-	return NULL;
-}
-
-/*
- * delscreen --
- *   Free resources used by the given screen and destroy it.
- *
- */
-void
-delscreen(SCREEN *screen)
-{
-        struct __winlist *list;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_SCREEN, "delscreen(%p)\n", screen);
-#endif
-	  /* free up the terminfo stuff */
-	del_curterm(screen->term);
-
-	  /* walk the window list and kill all the parent windows */
-	while ((list = screen->winlistp) != NULL) {
-		delwin(list->winp);
-		if (list == screen->winlistp)
-			/* sanity - abort if window didn't remove itself */
-			break;
-	}
-
-	  /* free the storage of the keymaps */
-	_cursesi_free_keymap(screen->base_keymap);
-
-	free(screen->stdbuf);
-	screen->stdbuf = NULL;
-	if (_cursesi_screen == screen)
-		_cursesi_screen = NULL;
-	free(screen);
-}
diff --git a/lib/libcurses/scroll.c b/lib/libcurses/scroll.c
deleted file mode 100644
index b64db040c..000000000
--- a/lib/libcurses/scroll.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*	$NetBSD: scroll.c,v 1.22 2010/02/03 15:34:40 roy Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)scroll.c	8.3 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: scroll.c,v 1.22 2010/02/03 15:34:40 roy Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * scroll --
- *	Scroll the window up a line.
- */
-int
-scroll(WINDOW *win)
-{
-	return(wscrl(win, 1));
-}
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * scrl --
- *	Scroll stdscr n lines - up if n is positive, down if n is negative.
- */
-int
-scrl(int nlines)
-{
-	return wscrl(stdscr, nlines);
-}
-
-/*
- * setscrreg --
- *	Set the top and bottom of the scrolling region for stdscr.
- */
-int
-setscrreg(int top, int bottom)
-{
-	return wsetscrreg(stdscr, top, bottom);
-}
-
-#endif
-
-/*
- * wscrl --
- *	Scroll a window n lines - up if n is positive, down if n is negative.
- */
-int
-wscrl(WINDOW *win, int nlines)
-{
-	int     oy, ox;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_WINDOW, "wscrl: (%p) lines=%d\n", win, nlines);
-#endif
-
-	if (!(win->flags & __SCROLLOK))
-		return (ERR);
-	if (!nlines)
-		return (OK);
-
-	getyx(win, oy, ox);
-#ifdef DEBUG
-	__CTRACE(__CTRACE_WINDOW, "wscrl: y=%d\n", oy);
-#endif
-	if (oy < win->scr_t || oy > win->scr_b)
-		/* Outside scrolling region */
-		wmove(win, 0, 0);
-	else
-		/* Inside scrolling region */
-		wmove(win, win->scr_t, 0);
-	winsdelln(win, 0 - nlines);
-	wmove(win, oy, ox);
-
-	if (win == curscr) {
-		__cputchar('\n');
-		if (!__NONL)
-			win->curx = 0;
-#ifdef DEBUG
-		__CTRACE(__CTRACE_WINDOW, "scroll: win == curscr\n");
-#endif
-	}
-	return (OK);
-}
-
-/*
- * wsetscrreg --
- *	Set the top and bottom of the scrolling region for win.
- */
-int
-wsetscrreg(WINDOW *win, int top, int bottom)
-{
-	if (top < 0 || bottom >= win->maxy || bottom - top < 1)
-		return (ERR);
-	win->scr_t = top;
-	win->scr_b = bottom;
-	return (OK);
-}
-
-/*
- * has_ic --
- *	Does the terminal have insert- and delete-character?
- */
-bool
-has_ic(void)
-{
-	if (insert_character != NULL && delete_character != NULL)
-		return (TRUE);
-	else
-		return (FALSE);
-}
-
-/*
- * has_ic --
- *	Does the terminal have insert- and delete-line?
- */
-bool
-has_il(void)
-{
-	if (insert_line !=NULL && delete_line != NULL)
-		return (TRUE);
-	else
-		return (FALSE);
-}
diff --git a/lib/libcurses/scrollok.c b/lib/libcurses/scrollok.c
deleted file mode 100644
index 59ecb207c..000000000
--- a/lib/libcurses/scrollok.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: scrollok.c,v 1.5 2008/04/28 20:23:01 martin Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: scrollok.c,v 1.5 2008/04/28 20:23:01 martin Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * scrollok --
- *	Turn on and off scrolling for the given window.
- */
-int
-scrollok(WINDOW *win, bool bf)
-{
-	if (bf)
-		win->flags |= __SCROLLOK;
-	else
-		win->flags &= ~__SCROLLOK;
-	return (OK);
-}
diff --git a/lib/libcurses/setterm.c b/lib/libcurses/setterm.c
deleted file mode 100644
index f64467416..000000000
--- a/lib/libcurses/setterm.c
+++ /dev/null
@@ -1,360 +0,0 @@
-/*	$NetBSD: setterm.c,v 1.52 2013/10/16 19:59:29 roy Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)setterm.c	8.8 (Berkeley) 10/25/94";
-#else
-__RCSID("$NetBSD: setterm.c,v 1.52 2013/10/16 19:59:29 roy Exp $");
-#endif
-#endif /* not lint */
-
-#include <sys/ioctl.h>		/* TIOCGWINSZ on old systems. */
-
-#include <stdlib.h>
-#include <string.h>
-#include <termios.h>
-#include <unistd.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-static int does_esc_m(const char *cap);
-static int does_ctrl_o(const char *exit_cap, const char *acs_cap);
-
-attr_t	 __mask_op, __mask_me, __mask_ue, __mask_se;
-
-int
-setterm(char *type)
-{
-	return _cursesi_setterm(type, _cursesi_screen);
-}
-
-int
-_cursesi_setterm(char *type, SCREEN *screen)
-{
-	int unknown, r;
-	struct winsize win;
-	char *p;
-
-	if (type[0] == '\0')
-		type = "xx";
-	unknown = 0;
-	(void)ti_setupterm(&screen->term, type, fileno(screen->outfd), &r);
-	if (screen->term == NULL) {
-		unknown++;
-		(void)ti_setupterm(&screen->term, "dumb",
-		    fileno(screen->outfd), &r);
-		/* No dumb term? We can't continue */
-		if (screen->term == NULL)
-			return ERR;
-	}
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INIT, "setterm: tty = %s\n", type);
-#endif
-
-	/* Try TIOCGWINSZ, and, if it fails, the terminfo entry. */
-	if (ioctl(fileno(screen->outfd), TIOCGWINSZ, &win) != -1 &&
-	    win.ws_row != 0 && win.ws_col != 0) {
-		screen->LINES = win.ws_row;
-		screen->COLS = win.ws_col;
-	}  else {
-		if (unknown) {
-			screen->LINES = -1;
-			screen->COLS = -1;
-		} else {
-			screen->LINES = t_lines(screen->term);
-			screen->COLS = t_columns(screen->term);
-		}
-	}
-
-	/* POSIX 1003.2 requires that the environment override. */
-	if ((p = getenv("LINES")) != NULL)
-		screen->LINES = (int) strtol(p, NULL, 0);
-	if ((p = getenv("COLUMNS")) != NULL)
-		screen->COLS = (int) strtol(p, NULL, 0);
-	if ((p = getenv("ESCDELAY")) != NULL)
-		ESCDELAY = (int) strtol(p, NULL, 0);
-	if ((p = getenv("TABSIZE")) != NULL)
-		screen->TABSIZE = (int) strtol(p, NULL, 0);
-	else if (t_init_tabs(screen->term) >= 0)
-		screen->TABSIZE = (int) t_init_tabs(screen->term);
-	else
-		screen->TABSIZE = 8;
-	/*
-	 * Want cols > 4, otherwise things will fail.
-	 */
-	if (screen->COLS <= 4)
-		return (ERR);
-
-	LINES = screen->LINES;
-	COLS = screen->COLS;
-	TABSIZE = screen->TABSIZE;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INIT,
-	    "setterm: LINES = %d, COLS = %d\n, TABSIZE = %d\n",
-	    LINES, COLS, TABSIZE);
-#endif
-
-	/*
-	 * set the pad char, only take the first char of the pc capability
-	 * as this is all we can use.
-	 */
-	screen->padchar = t_pad_char(screen->term) ?
-	    t_pad_char(screen->term)[0] : 0; 
-
-	/* If no scrolling commands, no quick change. */
-	screen->noqch =
-  	    (t_change_scroll_region(screen->term) == NULL ||
-		t_cursor_home(screen->term) == NULL ||
-		(t_parm_index(screen->term) == NULL &&
-		    t_scroll_forward(screen->term) == NULL) ||
-		(t_parm_rindex(screen->term) == NULL &&
-		    t_scroll_reverse(screen->term) == NULL)) &&
-	    ((t_parm_insert_line(screen->term) == NULL &&
-		t_insert_line(screen->term) == NULL) ||
-		(t_parm_delete_line(screen->term) == NULL &&
-		    t_delete_line(screen->term) == NULL));
-
-	/*
-	 * Precalculate conflict info for color/attribute end commands.
-	 */
-#ifndef HAVE_WCHAR
-	screen->mask_op = __ATTRIBUTES & ~__COLOR;
-#else
-	screen->mask_op = WA_ATTRIBUTES & ~__COLOR;
-#endif /* HAVE_WCHAR */
-	if (t_orig_pair(screen->term) != NULL) {
-		if (does_esc_m(t_orig_pair(screen->term)))
-			screen->mask_op &=
-			    ~(__STANDOUT | __UNDERSCORE | __TERMATTR);
-		else {
-			if (t_exit_standout_mode(screen->term) != NULL &&
-			    !strcmp(t_orig_pair(screen->term),
-				t_exit_standout_mode(screen->term)))
-				screen->mask_op &= ~__STANDOUT;
-			if (t_exit_underline_mode(screen->term) != NULL &&
-			    !strcmp(t_orig_pair(screen->term),
-				t_exit_underline_mode(screen->term)))
-				screen->mask_op &= ~__UNDERSCORE;
-			if (t_exit_attribute_mode(screen->term) != NULL &&
-			    !strcmp(t_orig_pair(screen->term),
-				t_exit_attribute_mode(screen->term)))
-				screen->mask_op &= ~__TERMATTR;
-		}
-	}
-	/*
-	 * Assume that "me" turns off all attributes apart from ACS.
-	 * It might turn off ACS, so check for that.
-	 */
-	if (t_exit_attribute_mode(screen->term) != NULL &&
-	    t_exit_alt_charset_mode(screen->term) != NULL &&
-	    does_ctrl_o(t_exit_attribute_mode(screen->term),
-	    t_exit_alt_charset_mode(screen->term)))
-		screen->mask_me = 0;
-	else
-		screen->mask_me = __ALTCHARSET;
-
-	/* Check what turning off the attributes also turns off */
-#ifndef HAVE_WCHAR
-	screen->mask_ue = __ATTRIBUTES & ~__UNDERSCORE;
-#else
-	screen->mask_ue = WA_ATTRIBUTES & ~__UNDERSCORE;
-#endif /* HAVE_WCHAR */
-	if (t_exit_underline_mode(screen->term) != NULL) {
-		if (does_esc_m(t_exit_underline_mode(screen->term)))
-			screen->mask_ue &=
-			    ~(__STANDOUT | __TERMATTR | __COLOR);
-		else {
-			if (t_exit_standout_mode(screen->term) != NULL &&
-			    !strcmp(t_exit_underline_mode(screen->term),
-				t_exit_standout_mode(screen->term)))
-				screen->mask_ue &= ~__STANDOUT;
-			if (t_exit_attribute_mode(screen->term) != NULL &&
-			    !strcmp(t_exit_underline_mode(screen->term),
-				t_exit_attribute_mode(screen->term)))
-				screen->mask_ue &= ~__TERMATTR;
-			if (t_orig_pair(screen->term) != NULL &&
-			    !strcmp(t_exit_underline_mode(screen->term),
-				t_orig_pair(screen->term)))
-				screen->mask_ue &= ~__COLOR;
-		}
-	}
-#ifndef HAVE_WCHAR
-	screen->mask_se = __ATTRIBUTES & ~__STANDOUT;
-#else
-	screen->mask_se = WA_ATTRIBUTES & ~__STANDOUT;
-#endif /* HAVE_WCHAR */
-	if (t_exit_standout_mode(screen->term) != NULL) {
-		if (does_esc_m(t_exit_standout_mode(screen->term)))
-			screen->mask_se &=
-			    ~(__UNDERSCORE | __TERMATTR | __COLOR);
-		else {
-			if (t_exit_underline_mode(screen->term) != NULL &&
-			    !strcmp(t_exit_standout_mode(screen->term),
-				t_exit_underline_mode(screen->term)))
-				screen->mask_se &= ~__UNDERSCORE;
-			if (t_exit_attribute_mode(screen->term) != NULL &&
-			    !strcmp(t_exit_standout_mode(screen->term),
-				t_exit_attribute_mode(screen->term)))
-				screen->mask_se &= ~__TERMATTR;
-			if (t_orig_pair(screen->term) != NULL &&
-			    !strcmp(t_exit_standout_mode(screen->term),
-				t_orig_pair(screen->term)))
-				screen->mask_se &= ~__COLOR;
-		}
-	}
-
-	return (unknown ? ERR : OK);
-}
-
-/*
- * _cursesi_resetterm --
- *  Copy the terminal instance data for the given screen to the global
- *  variables.
- */
-void
-_cursesi_resetterm(SCREEN *screen)
-{
-
-	LINES = screen->LINES;
-	COLS = screen->COLS;
-	TABSIZE = screen->TABSIZE;
-	__GT = screen->GT;
-
-	__noqch = screen->noqch;
-	__mask_op = screen->mask_op;
-	__mask_me = screen->mask_me;
-	__mask_ue = screen->mask_ue;
-	__mask_se = screen->mask_se;
-
-	set_curterm(screen->term);
-}
-
-/*
- * does_esc_m --
- * A hack for xterm-like terminals where "\E[m" or "\E[0m" will turn off
- * other attributes, so we check for this in the capability passed to us.
- * Note that we can't just do simple string comparison, as the capability
- * may contain multiple, ';' separated sequence parts.
- */
-static int
-does_esc_m(const char *cap)
-{
-#define WAITING 0
-#define PARSING 1
-#define NUMBER 2
-#define FOUND 4
-	const char *capptr;
-	int seq;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INIT, "does_esc_m: Checking %s\n", cap);
-#endif
-	/* Is it just "\E[m" or "\E[0m"? */
-	if (!strcmp(cap, "\x1b[m") || !strcmp(cap, "\x1b[0m"))
-		return 1;
-
-	/* Does it contain a "\E[...m" sequence? */
-	if (strlen(cap) < 4)
-		return 0;
-	capptr = cap;
-	seq = WAITING;
-	while (*capptr != 0) {
-		switch (seq) {
-		/* Start of sequence */
-		case WAITING:
-			if (!strncmp(capptr, "\x1b[", 2)) {
-				capptr+=2;
-				if (*capptr == 'm')
-					return 1;
-				else {
-					seq=PARSING;
-					continue;
-				}
-			}
-			break;
-		/* Looking for '0' */
-		case PARSING:
-			if (*capptr == '0')
-				seq=FOUND;
-			else if (*capptr > '0' && *capptr <= '9')
-				seq=NUMBER;
-			else if (*capptr != ';')
-				seq=WAITING;
-			break;
-		/* Some other number */
-		case NUMBER:
-			if (*capptr == ';')
-				seq=PARSING;
-			else if (!(*capptr >= '0' && *capptr <= '9'))
-				seq=WAITING;
-			break;
-		/* Found a '0' */
-		case FOUND:
-			if (*capptr == 'm')
-				return 1;
-			else if (!((*capptr >= '0' && *capptr <= '9') ||
-			    *capptr == ';'))
-				seq=WAITING;
-			break;
-		default:
-			break;
-		}
-		capptr++;
-	}
-	return 0;
-}
-
-/*
- * does_ctrl_o --
- * A hack for vt100/xterm-like terminals where the "me" capability also
- * unsets acs.
- */
-static int
-does_ctrl_o(const char *exit_cap, const char *acs_cap)
-{
-	const char *eptr = exit_cap, *aptr = acs_cap;
-	int l;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_INIT, "does_ctrl_o: Testing %s for %s\n", eptr, aptr);
-#endif
-	l = strlen(acs_cap);
-	while (*eptr != 0) {
-		if (!strncmp(eptr, aptr, l))
-			return 1;
-		eptr++;
-	}
-	return 0;
-}
diff --git a/lib/libcurses/shlib_version b/lib/libcurses/shlib_version
deleted file mode 100644
index 1c7107b66..000000000
--- a/lib/libcurses/shlib_version
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$NetBSD: shlib_version,v 1.40 2009/01/11 03:07:47 christos Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#	Remember to run `make fileio.h` when changing
-#	Remember to increment the major numbers of both libform and libmenu
-#	when the libcurses major number increments.
-#
-major=7
-minor=0
diff --git a/lib/libcurses/standout.c b/lib/libcurses/standout.c
deleted file mode 100644
index fb9531bc8..000000000
--- a/lib/libcurses/standout.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*	$NetBSD: standout.c,v 1.16 2010/02/03 15:34:40 roy Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)standout.c	8.3 (Berkeley) 8/10/94";
-#else
-__RCSID("$NetBSD: standout.c,v 1.16 2010/02/03 15:34:40 roy Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * standout --
- *	Enter standout mode on stdscr.
- */
-int
-standout(void)
-{
-	return wstandout(stdscr);
-}
-
-/*
- * standend --
- *	Exit standout mode on stdscr.
- */
-int
-standend(void)
-{
-	return wstandend(stdscr);
-}
-
-#endif
-
-/*
- * wstandout --
- *	Enter standout mode in window win.
- */
-int
-wstandout(WINDOW *win)
-{
-	/*
-	 * If standout/standend strings, or can underline, set the
-	 * screen standout bit.
-	 */
-	if ((enter_standout_mode != NULL && exit_standout_mode != NULL) ||
-	    underline_char != NULL)
-		win->wattr |= __STANDOUT;
-	return (1);
-}
-
-/*
- * wstandend --
- *	Exit standout mode in window win.
- */
-int
-wstandend(WINDOW *win)
-{
-	win->wattr &= ~__STANDOUT;
-	return (1);
-}
diff --git a/lib/libcurses/timeout.c b/lib/libcurses/timeout.c
deleted file mode 100644
index ab9ef9e32..000000000
--- a/lib/libcurses/timeout.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: timeout.c,v 1.8 2009/11/04 21:24:57 dsl Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: timeout.c,v 1.8 2009/11/04 21:24:57 dsl Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * timeout --
- *	Set the getch() delay for stdscr.
- */
-void
-timeout(int delay)
-{
-	wtimeout(stdscr, delay);
-}
-
-#endif
-
-/*
- * wtimeout --
- *	Set the getch() delay for a window.
- */
-void
-wtimeout(WINDOW *win, int delay)
-{
-
-	if (delay < 0)
-		win->delay = -1;
-	else if (!delay)
-		win->delay = delay;
-	else {
-		/*
-		 * 1. VTIME is a char
-		 * 2. timeout granularity is ms but VTIME is 0.1s
-		 */
-		if (delay > 25500)
-			win->delay = 255;
-		else
-			win->delay = (delay - 1)/ 100 + 1;
-	}
-}
diff --git a/lib/libcurses/toucholap.c b/lib/libcurses/toucholap.c
deleted file mode 100644
index 97b46dd25..000000000
--- a/lib/libcurses/toucholap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: toucholap.c,v 1.15 2007/01/21 13:25:36 jdc Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)toucholap.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: toucholap.c,v 1.15 2007/01/21 13:25:36 jdc Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * touchoverlap --
- *	Touch, on win2, the part that overlaps with win1.
- */
-int
-touchoverlap(WINDOW *win1, WINDOW *win2)
-{
-	int     y, endy, endx, starty, startx;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_WINDOW, "touchoverlap: (%p, %p);\n", win1, win2);
-#endif
-	starty = max(win1->begy, win2->begy);
-	startx = max(win1->begx, win2->begx);
-	endy = min(win1->maxy + win1->begy, win2->maxy + win2->begx);
-	endx = min(win1->maxx + win1->begx, win2->maxx + win2->begx);
-#ifdef DEBUG
-	__CTRACE(__CTRACE_WINDOW, "touchoverlap: from (%d,%d) to (%d,%d)\n",
-	    starty, startx, endy, endx);
-	__CTRACE(__CTRACE_WINDOW, "touchoverlap: win1 (%d,%d) to (%d,%d)\n",
-	    win1->begy, win1->begx, win1->begy + win1->maxy,
-	    win1->begx + win1->maxx);
-	__CTRACE(__CTRACE_WINDOW, "touchoverlap: win2 (%d,%d) to (%d,%d)\n",
-	    win2->begy, win2->begx, win2->begy + win2->maxy,
-	    win2->begx + win2->maxx);
-#endif
-	if (starty >= endy || startx >= endx)
-		return (OK);
-	starty -= win2->begy;
-	startx -= win2->begx;
-	endy -= win2->begy;
-	endx -= win2->begx;
-	for (--endx, y = starty; y < endy; y++)
-		__touchline(win2, y, startx, endx);
-	return (OK);
-}
diff --git a/lib/libcurses/touchwin.c b/lib/libcurses/touchwin.c
deleted file mode 100644
index 07ca0c68b..000000000
--- a/lib/libcurses/touchwin.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/*	$NetBSD: touchwin.c,v 1.27 2013/12/06 11:23:47 blymn Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)touchwin.c	8.2 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: touchwin.c,v 1.27 2013/12/06 11:23:47 blymn Exp $");
-#endif
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-static int _cursesi_touchline_force(WINDOW *, int, int, int, int);
-
-/*
- * is_linetouched --
- *	Indicate if line has been touched or not.
- */
-bool
-is_linetouched(WINDOW *win, int line)
-{
-	if (line > win->maxy)
-		return FALSE;
-
-	return ((win->alines[line]->flags & __ISDIRTY) != 0);
-}
-
-/*
- * touchline --
- *	Touch count lines starting at start.  This is the SUS v2 compliant
- *	version.
- */
-int
-touchline(WINDOW *win, int start, int count)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_LINE, "touchline: (%p, %d, %d)\n", win, start, count);
-#endif
-	return wtouchln(win, start, count, 1);
-}
-
-/*
- * wredrawln --
- *	Mark count lines starting at start as corrupted.  Implemented using
- *	wtouchln().
- */
-int wredrawln(WINDOW *win, int start, int count)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_LINE, "wredrawln: (%p, %d, %d)\n", win, start, count);
-#endif
-	return wtouchln(win, start, count, 1);
-}
-
-/*
- * is_wintouched --
- *	Check if the window has been touched.
- */
-bool
-is_wintouched(WINDOW *win)
-{
-	int y, maxy;
-
-	maxy = win->maxy;
-	for (y = 0; y < maxy; y++) {
-		if (is_linetouched(win, y) == TRUE)
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-/*
- * touchwin --
- *	Make it look like the whole window has been changed.
- */
-int
-touchwin(WINDOW *win)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_LINE, "touchwin: (%p)\n", win);
-#endif
-	return wtouchln(win, 0, win->maxy, 1);
-}
-
-/*
- * redrawwin --
- *	Mark entire window as corrupted.  Implemented using wtouchln().
- */
-int
-redrawwin(WINDOW *win)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_LINE, "redrawwin: (%p)\n", win);
-#endif
-	return wtouchln(win, 0, win->maxy, 1);
-}
-
-/*
- * untouchwin --
- *	 Make it look like the window has not been changed.
- */
-int
-untouchwin(WINDOW *win)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_LINE, "untouchwin: (%p)\n", win);
-#endif
-	return wtouchln(win, 0, win->maxy, 0);
-}
-
-/*
- * wtouchln --
- *	If changed is 1 then touch n lines starting at line.  If changed
- *	is 0 then mark the lines as unchanged.
- */
-int
-wtouchln(WINDOW *win, int line, int n, int changed)
-{
-	int	y;
-	__LINE	*wlp;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_LINE, "wtouchln: (%p) %d, %d, %d\n",
-	    win, line, n, changed);
-#endif
-	if (line + n > win->maxy)
-		line = win->maxy - n;
-	for (y = line; y < line + n; y++) {
-		if (changed == 1)
-			_cursesi_touchline_force(win, y, 0,
-			    (int) win->maxx - 1, 1);
-		else {
-			wlp = win->alines[y];
-			if (*wlp->firstchp >= win->ch_off &&
-			    *wlp->firstchp < win->maxx + win->ch_off)
-				*wlp->firstchp = win->maxx + win->ch_off;
-			if (*wlp->lastchp >= win->ch_off &&
-			    *wlp->lastchp < win->maxx + win->ch_off)
-				*wlp->lastchp = win->ch_off;
-			wlp->flags &= ~(__ISDIRTY | __ISFORCED);
-		}
-	}
-
-	return OK;
-}
-
-int
-__touchwin(WINDOW *win)
-{
-	int	 y, maxy;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_LINE, "__touchwin: (%p)\n", win);
-#endif
-	maxy = win->maxy;
-	for (y = 0; y < maxy; y++)
-		__touchline(win, y, 0, (int) win->maxx - 1);
-	return (OK);
-}
-
-int
-__touchline(WINDOW *win, int y, int sx, int ex)
-{
-	return (_cursesi_touchline_force(win, y, sx, ex, 0));
-}
-
-/*
- * Touch line y on window win starting from column sx and ending at
- * column ex.  If force is 1 then we mark this line as a forced update
- * which will bypass screen optimisation in the refresh code to rewrite
- * this line unconditionally (even if refresh thinks the screen matches
- * what is in the virtscr)
- */
-static int
-_cursesi_touchline_force(WINDOW *win, int y, int sx, int ex, int force)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_LINE, "__touchline: (%p, %d, %d, %d)\n",
-	    win, y, sx, ex);
-	__CTRACE(__CTRACE_LINE, "__touchline: first = %d, last = %d\n",
-	    *win->alines[y]->firstchp, *win->alines[y]->lastchp);
-#endif
-	sx += win->ch_off;
-	ex += win->ch_off;
-	win->alines[y]->flags |= __ISDIRTY;
-	if (force == 1)
-		win->alines[y]->flags |= __ISFORCED;
-	/* firstchp/lastchp are shared between parent window and sub-window. */
-	if (*win->alines[y]->firstchp > sx)
-		*win->alines[y]->firstchp = sx;
-	if (*win->alines[y]->lastchp < ex)
-		*win->alines[y]->lastchp = ex;
-#ifdef DEBUG
-	__CTRACE(__CTRACE_LINE, "__touchline: first = %d, last = %d\n",
-	    *win->alines[y]->firstchp, *win->alines[y]->lastchp);
-#endif
-	return (OK);
-}
-
-void
-wsyncup(WINDOW *win)
-{
-
-	do {
-		__touchwin(win);
-		win = win->orig;
-	} while (win);
-}
-
-void
-wsyncdown(WINDOW *win)
-{
-	WINDOW *w = win->orig;
-
-	while (w) {
-		if (is_wintouched(w)) {
-			__touchwin(win);
-			break;
-		}
-		w = w->orig;
-	}
-}
diff --git a/lib/libcurses/tscroll.c b/lib/libcurses/tscroll.c
deleted file mode 100644
index fdba8b132..000000000
--- a/lib/libcurses/tscroll.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*	$NetBSD: tscroll.c,v 1.13 2007/01/21 13:25:36 jdc Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tscroll.c	8.4 (Berkeley) 7/27/94";
-#else
-__RCSID("$NetBSD: tscroll.c,v 1.13 2007/01/21 13:25:36 jdc Exp $");
-#endif
-#endif				/* not lint */
-
-#include <string.h>
-#include <stdarg.h>
-#include "curses.h"
-#include "curses_private.h"
-
-#define	MAXRETURNSIZE	64
-
-char   *
-__tscroll(const char *cap, int n1, int n2)
-{
-	return (__parse_cap(cap, n1, n2));
-}
-
-/*
- * Routines to parse capabilities.  Derived from tgoto.c in termcap(3)
- * library.  Cap is a string containing printf type escapes to allow
- * scrolling.  The following escapes are defined for substituting n:
- *
- *	%d	as in printf
- *	%2	like %2d
- *	%3	like %3d
- *	%.	gives %c hacking special case characters
- *	%+x	like %c but adding x first
- *
- *	The codes below affect the state but don't use up a value.
- *
- *	%>xy	if value > x add y
- *	%i	increments n
- *	%%	gives %
- *	%B	BCD (2 decimal digits encoded in one byte)
- *	%D	Delta Data (backwards bcd)
- *
- * all other characters are ``self-inserting''.
- *
- * XXX:
- *	%r	reverse order of two parameters
- * is also defined but we don't support it (yet).
- */
-char	*
-__parse_cap (char const *cap, ...)
-{
-	va_list	ap;
-	static char result[MAXRETURNSIZE];
-	int     c, n;
-	char   *dp;
-	int	have_input;
-
-	va_start (ap, cap);
-	n = 0;			/* XXX gcc -Wuninitialized */
-
-	if (cap == NULL)
-		goto err;
-#ifdef DEBUG
-	{
-		int	i;
-		
-		__CTRACE(__CTRACE_MISC, "__parse_cap: cap = ");
-		for (i = 0; i < strlen(cap); i++)
-			__CTRACE(__CTRACE_MISC, "%s", unctrl(cap[i]));
-		__CTRACE(__CTRACE_MISC, "\n");
-	}
-#endif
-	have_input = 0;
-	for (dp = result; (c = *cap++) != '\0';) {
-		if (c != '%') {
-			*dp++ = c;
-			continue;
-		}
-		switch (c = *cap++) {
-		case 'n':
-			if (!have_input) {
-				n = va_arg (ap, int);
-				have_input = 1;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_MISC,
-				    "__parse_cap: %%n, val = %d\n", n);
-#endif
-			}
-			n ^= 0140;
-			continue;
-		case 'd':
-			if (!have_input) {
-				n = va_arg (ap, int);
-				have_input = 1;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_MISC,
-				    "__parse_cap: %%d, val = %d\n", n);
-#endif
-			}
-			if (n < 10)
-				goto one;
-			if (n < 100)
-				goto two;
-			/* FALLTHROUGH */
-		case '3':
-			if (!have_input) {
-				n = va_arg (ap, int);
-				have_input = 1;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_MISC,
-				    "__parse_cap: %%3, val = %d\n", n);
-#endif
-			}
-			*dp++ = (n / 100) | '0';
-			n %= 100;
-			/* FALLTHROUGH */
-		case '2':
-			if (!have_input) {
-				n = va_arg (ap, int);
-				have_input = 1;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_MISC,
-				    "__parse_cap: %%2, val = %d\n", n);
-#endif
-			}
-	two:		*dp++ = n / 10 | '0';
-	one:		*dp++ = n % 10 | '0';
-			have_input = 0;
-			continue;
-		case '>':
-			if (!have_input) {
-				n = va_arg (ap, int);
-				have_input = 1;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_MISC,
-				    "__parse_cap: %%>, val = %d\n", n);
-#endif
-			}
-			if (n > *cap++)
-				n += *cap++;
-			else
-				cap++;
-			continue;
-		case '+':
-			if (!have_input) {
-				n = va_arg (ap, int);
-				have_input = 1;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_MISC,
-				    "__parse_cap: %%+, val = %d\n", n);
-#endif
-			}
-			n += *cap++;
-			/* FALLTHROUGH */
-		case '.':
-			if (!have_input) {
-				n = va_arg (ap, int);
-				have_input = 1;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_MISC,
-				    "__parse_cap: %%., val = %d\n", n);
-#endif
-			}
-			*dp++ = n;
-			have_input = 0;
-			continue;
-		case 'i':
-			if (!have_input) {
-				n = va_arg (ap, int);
-				have_input = 1;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_MISC,
-				    "__parse_cap: %%i, val = %d\n", n);
-#endif
-			}
-			n++;
-			continue;
-		case '%':
-			*dp++ = c;
-			continue;
-		case 'B':
-			if (!have_input) {
-				n = va_arg (ap, int);
-				have_input = 1;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_MISC,
-				    "__parse_cap: %%B, val = %d\n", n);
-#endif
-			}
-			n = (n / 10 << 4) + n % 10;
-			continue;
-		case 'D':
-			if (!have_input) {
-				n = va_arg (ap, int);
-				have_input = 1;
-#ifdef DEBUG
-				__CTRACE(__CTRACE_MISC,
-				    "__parse_cap: %%D, val = %d\n", n);
-#endif
-			}
-			n = n - 2 * (n % 16);
-			continue;
-			/*
-			 * XXX
-			 * System V terminfo files have lots of extra gunk.
-			 * The only other one we've seen in capability strings
-			 * is %pN, and it seems to work okay if we ignore it.
-			 */
-		case 'p':
-			++cap;
-			continue;
-		default:
-			goto err;
-		}
-	}
-	*dp = '\0';
-	va_end (ap);
-	return (result);
-
-err:	va_end (ap);
-	return ((char *) "\0");
-}
diff --git a/lib/libcurses/tstp.c b/lib/libcurses/tstp.c
deleted file mode 100644
index 0eee1322d..000000000
--- a/lib/libcurses/tstp.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/*	$NetBSD: tstp.c,v 1.40 2013/10/15 13:00:52 christos Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tstp.c	8.3 (Berkeley) 5/4/94";
-#else
-__RCSID("$NetBSD: tstp.c,v 1.40 2013/10/15 13:00:52 christos Exp $");
-#endif
-#endif				/* not lint */
-
-#include <sys/ioctl.h>
-
-#include <errno.h>
-#include <signal.h>
-#include <termios.h>
-#include <unistd.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-static int tstp_set = 0;
-static int winch_set = 0;
-
-static void (*otstpfn)
-__P((int)) = SIG_DFL;
-
-static struct sigaction	owsa;
-#ifndef TCSASOFT
-#define TCSASOFT 0
-#endif
-
-/*
- * stop_signal_handler --
- *	Handle stop signals.
- */
-void
-__stop_signal_handler(/*ARGSUSED*/int signo)
-{
-	sigset_t oset, set;
-
-	/*
-	 * Block window change and timer signals.  The latter is because
-	 * applications use timers to decide when to repaint the screen.
-	 */
-	(void) sigemptyset(&set);
-	(void) sigaddset(&set, SIGALRM);
-	(void) sigaddset(&set, SIGWINCH);
-	(void) sigprocmask(SIG_BLOCK, &set, &oset);
-
-	/*
-	 * End the window, which also resets the terminal state to the
-	 * original modes.
-	 */
-	__stopwin();
-
-	/* Unblock SIGTSTP. */
-	(void) sigemptyset(&set);
-	(void) sigaddset(&set, SIGTSTP);
-	(void) sigprocmask(SIG_UNBLOCK, &set, NULL);
-
-	/* Stop ourselves. */
-	(void) kill(0, SIGTSTP);
-
-	/* Time passes ... */
-
-	/* restart things */
-	__restartwin();
-
-	/* Reset the signals. */
-	(void) sigprocmask(SIG_SETMASK, &oset, NULL);
-}
-
-/*
- * Set the TSTP handler.
- */
-void
-__set_stophandler(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "__set_stophandler: %d\n", tstp_set);
-#endif
-	if (!tstp_set) {
-		otstpfn = signal(SIGTSTP, __stop_signal_handler);
-		tstp_set = 1;
-	}
-}
-
-/*
- * Restore the TSTP handler.
- */
-void
-__restore_stophandler(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "__restore_stophandler: %d\n", tstp_set);
-#endif
-	if (tstp_set) {
-		(void) signal(SIGTSTP, otstpfn);
-		tstp_set = 0;
-	}
-}
-
-/*
- * winch_signal_handler --
- *	Handle winch signals by pushing KEY_RESIZE into the input stream.
- */
-void
-__winch_signal_handler(/*ARGSUSED*/int signo)
-{
-	struct winsize win;
-
-	if (ioctl(fileno(_cursesi_screen->outfd), TIOCGWINSZ, &win) != -1 &&
-	    win.ws_row != 0 && win.ws_col != 0) {
-		LINES = win.ws_row;
-		COLS = win.ws_col;
-	}
-	/*
-	 * If there was a previous handler, call that,
-	 * otherwise tell getch() to send KEY_RESIZE.
-	 */
-	if (owsa.sa_handler !=  NULL)
-		owsa.sa_handler(signo);
-	else
-		_cursesi_screen->resized = 1;
-}
-
-/*
- * Set the WINCH handler.
- */
-void
-__set_winchhandler(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "__set_winchhandler: %d\n", winch_set);
-#endif
-	if (!winch_set) {
-		struct sigaction sa;
-
-		sa.sa_handler = __winch_signal_handler;
-		sa.sa_flags = 0;
-		sigemptyset(&sa.sa_mask);
-		sigaction(SIGWINCH, &sa, &owsa);
-		winch_set = 1;
-#ifdef DEBUG
-		__CTRACE(__CTRACE_MISC,
-		    "__set_winchhandler: owsa.sa_handler=%p\n",
-		    owsa.sa_handler);
-#endif
-	}
-}
-
-/*
- * Restore the WINCH handler.
- */
-void
-__restore_winchhandler(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "__restore_winchhandler: %d\n", winch_set);
-#endif
-	if (winch_set > 0) {
-		struct sigaction cwsa;
-
-		sigaction(SIGWINCH, NULL, &cwsa);
-		if (cwsa.sa_handler == owsa.sa_handler) {
-			sigaction(SIGWINCH, &owsa, NULL);
-			winch_set = 0;
-		} else {
-			/*
-			 * We're now using the programs WINCH handler,
-			 * so don't restore the previous one.
-			 */
-			winch_set = -1;
-#ifdef DEBUG
-			__CTRACE(__CTRACE_MISC, "cwsa.sa_handler = %p\n",
-			    cwsa.sa_handler);
-#endif
-		}
-	}
-}
-
-/* To allow both SIGTSTP and endwin() to come back nicely, we provide
-   the following routines. */
-
-int
-__stopwin(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "__stopwin\n");
-#endif
-	if (_cursesi_screen->endwin)
-		return OK;
-
-	/* Get the current terminal state (which the user may have changed). */
-	(void) tcgetattr(fileno(_cursesi_screen->infd),
-			 &_cursesi_screen->save_termios);
-
-	__restore_stophandler();
-	__restore_winchhandler();
-
-	if (curscr != NULL) {
-		__unsetattr(0);
-		__mvcur((int) curscr->cury, (int) curscr->curx,
-		    (int) curscr->maxy - 1, 0, 0);
-	}
-
-	if (meta_on != NULL)
-		(void) tputs(meta_on, 0, __cputchar);
-
-	if ((curscr != NULL) && (curscr->flags & __KEYPAD))
-		(void) tputs(keypad_local, 0, __cputchar);
-	(void) tputs(cursor_normal, 0, __cputchar);
-	(void) tputs(exit_ca_mode, 0, __cputchar);
-	(void) fflush(_cursesi_screen->outfd);
-	(void) setvbuf(_cursesi_screen->outfd, NULL, _IOLBF, (size_t) 0);
-
-	_cursesi_screen->endwin = 1;
-
-	return tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSADRAIN,
-	    &_cursesi_screen->orig_termios) ? ERR : OK;
-}
-
-
-void
-__restartwin(void)
-{
-	struct winsize win;
-	int nlines, ncols;
-
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "__restartwin\n");
-#endif
-	if (!_cursesi_screen->endwin)
-		return;
-
-	/* Reset the curses SIGTSTP and SIGWINCH signal handlers. */
-	__set_stophandler();
-	__set_winchhandler();
-
-	/*
-	 * Check to see if the window size has changed.
-	 * If the application didn't update LINES and COLS,
-	 * set the * resized flag to tell getch() to push KEY_RESIZE.
-	 * Update curscr (which also updates __virtscr) and stdscr
-	 * to match the new size.
-	 */
-	if (ioctl(fileno(_cursesi_screen->outfd), TIOCGWINSZ, &win) != -1 &&
-	    win.ws_row != 0 && win.ws_col != 0) {
-		if (win.ws_row != LINES) {
-			LINES = win.ws_row;
-			_cursesi_screen->resized = 1;
-		}
-		if (win.ws_col != COLS) {
-			COLS = win.ws_col;
-			_cursesi_screen->resized = 1;
-		}
-	}
-	/*
-	 * We need to make local copies of LINES and COLS, otherwise we
-	 * could lose if they are changed between wresize() calls.
-	 */
-	nlines = LINES;
-	ncols = COLS;
-	if (curscr->maxy != nlines || curscr->maxx != ncols)
-		wresize(curscr, nlines, ncols);
-	if (stdscr->maxy != nlines || stdscr->maxx != ncols)
-		wresize(stdscr, nlines, ncols);
-
-	/* save the new "default" terminal state */
-	(void) tcgetattr(fileno(_cursesi_screen->infd),
-			 &_cursesi_screen->orig_termios);
-
-	/* Reset the terminal state to the mode just before we stopped. */
-	(void) tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSADRAIN,
-	    &_cursesi_screen->save_termios);
-
-	/* Restore colours */
-	__restore_colors();
-
-	/* Reset meta */
-	__restore_meta_state();
-
-	/* Restart the screen. */
-	__startwin(_cursesi_screen);
-
-	/* Reset cursor visibility */
-	__restore_cursor_vis();
-
-	/* Repaint the screen. */
-	wrefresh(curscr);
-}
-
-int
-def_prog_mode(void)
-{
-	if (_cursesi_screen->endwin)
-		return ERR;
-
-	return tcgetattr(fileno(_cursesi_screen->infd),
-	    &_cursesi_screen->save_termios) ? ERR : OK;
-}
-
-int
-reset_prog_mode(void)
-{
-
-	return tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSADRAIN,
-	    &_cursesi_screen->save_termios) ? ERR : OK;
-}
-
-int
-def_shell_mode(void)
-{
-	return tcgetattr(fileno(_cursesi_screen->infd),
-	    &_cursesi_screen->orig_termios) ? ERR : OK;
-}
-
-int
-reset_shell_mode(void)
-{
-	return __stopwin();
-}
diff --git a/lib/libcurses/tty.c b/lib/libcurses/tty.c
deleted file mode 100644
index 20ca42184..000000000
--- a/lib/libcurses/tty.c
+++ /dev/null
@@ -1,671 +0,0 @@
-/*	$NetBSD: tty.c,v 1.43 2011/08/29 11:07:38 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tty.c	8.6 (Berkeley) 1/10/95";
-#else
-__RCSID("$NetBSD: tty.c,v 1.43 2011/08/29 11:07:38 christos Exp $");
-#endif
-#endif				/* not lint */
-
-#include <sys/types.h>
-
-#include <stdlib.h>
-#include <termios.h>
-#include <unistd.h>
-#include <sys/fcntl.h>
-#include <sys/ioctl.h>
-
-#include "curses.h"
-#include "curses_private.h"
-
-/*
- * In general, curses should leave tty hardware settings alone (speed, parity,
- * word size).  This is most easily done in BSD by using TCSASOFT on all
- * tcsetattr calls.  On other systems, it would be better to get and restore
- * those attributes at each change, or at least when stopped and restarted.
- * See also the comments in getterm().
- */
-#ifndef TCSASOFT
-#define	TCSASOFT	0
-#endif
-
-int __tcaction = TCSASOFT != 0;		/* Ignore hardware settings */
-
-#ifndef	OXTABS
-#ifdef	XTABS			/* SMI uses XTABS. */
-#define	OXTABS	XTABS
-#else
-#define	OXTABS	0
-#endif
-#endif
-
-/*
- * baudrate --
- *	Return the current baudrate
- */
-int
-baudrate(void)
-{
-	if (_cursesi_screen->notty == TRUE)
-		return 0;
-
-	return cfgetospeed(&_cursesi_screen->baset);
-}
-
-/*
- * gettmode --
- *	Do terminal type initialization.
- */
-int
-gettmode(void)
-{
-	if (_cursesi_gettmode(_cursesi_screen) == ERR)
-		return ERR;
-
-	__GT = _cursesi_screen->GT;
-	__NONL = _cursesi_screen->NONL;
-	return OK;
-}
-
-/*
- * _cursesi_gettmode --
- *      Do the terminal type initialisation for the tty attached to the
- *  given screen.
- */
-int
-_cursesi_gettmode(SCREEN *screen)
-{
-	screen->useraw = 0;
-
-	if (tcgetattr(fileno(screen->infd), &screen->orig_termios)) {
-		/* if the input fd is not a tty try the output */
-		if (tcgetattr(fileno(screen->infd), &screen->orig_termios)) {
-			/* not a tty ... we will disable tty related stuff */
-			screen->notty = TRUE;
-			__GT = 0;
-			__NONL = 0;
-			return OK;
-		}
-	}
-
-	screen->baset = screen->orig_termios;
-	screen->baset.c_oflag &= ~OXTABS;
-
-	screen->GT = 0;	/* historical. was used before we wired OXTABS off */
-	screen->NONL = (screen->baset.c_oflag & ONLCR) == 0;
-
-	/*
-	 * XXX
-	 * System V and SMI systems overload VMIN and VTIME, such that
-	 * VMIN is the same as the VEOF element, and VTIME is the same
-	 * as the VEOL element.  This means that, if VEOF was ^D, the
-	 * default VMIN is 4.  Majorly stupid.
-	 */
-	screen->cbreakt = screen->baset;
-	screen->cbreakt.c_lflag &= ~(ECHO | ECHONL | ICANON);
-	screen->cbreakt.c_cc[VMIN] = 1;
-	screen->cbreakt.c_cc[VTIME] = 0;
-
-	screen->rawt = screen->cbreakt;
-	screen->rawt.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | INLCR | IGNCR |
-				  ICRNL | IXON);
-	screen->rawt.c_oflag &= ~OPOST;
-	screen->rawt.c_lflag &= ~(ISIG | IEXTEN);
-
-#if TCSASOFT == 0
-	/*
-	 * In general, curses should leave hardware-related settings alone.
-	 * This includes parity and word size.  Older versions set the tty
-	 * to 8 bits, no parity in raw(), but this is considered to be an
-	 * artifact of the old tty interface.  If it's desired to change
-	 * parity and word size, the TCSASOFT bit has to be removed from the
-	 * calls that switch to/from "raw" mode.
-	 */
-	screen->rawt.c_iflag &= ~ISTRIP;
-	screen->rawt.c_cflag &= ~(CSIZE | PARENB);
-	screen->rawt.c_cflag |= CS8;
-#endif
-
-	screen->curt = &screen->baset;
-	return tcsetattr(fileno(screen->infd), TCSASOFT | TCSADRAIN,
-	    screen->curt) ? ERR : OK;
-}
-
-/*
- * raw --
- *	Put the terminal into raw mode
- */
-int
-raw(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "raw()\n");
-#endif
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	_cursesi_screen->useraw = __pfast = __rawmode = 1;
-	_cursesi_screen->curt = &_cursesi_screen->rawt;
-	if (_cursesi_screen->notty == TRUE)
-		return OK;
-	return tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSADRAIN,
-	    _cursesi_screen->curt) ? ERR : OK;
-}
-
-/*
- * noraw --
- *	Put the terminal into cooked mode
- */
-int
-noraw(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "noraw()\n");
-#endif
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	_cursesi_screen->useraw = __pfast = __rawmode = 0;
-	if (_cursesi_screen->notty == TRUE)
-		return OK;
-	_cursesi_screen->curt = &_cursesi_screen->baset;
-	return tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSADRAIN,
-	    _cursesi_screen->curt) ? ERR : OK;
-}
-
-/*
- * cbreak --
- * 	Enable cbreak mode
- */
-int
-cbreak(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "cbreak()\n");
-#endif
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	__rawmode = 1;
-	if (_cursesi_screen->notty == TRUE)
-		return OK;
-	_cursesi_screen->curt = _cursesi_screen->useraw ?
-		&_cursesi_screen->rawt : &_cursesi_screen->cbreakt;
-	return tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSADRAIN,
-	    _cursesi_screen->curt) ? ERR : OK;
-}
-
-/*
- * nocbreak --
- *	Disable cbreak mode
- */
-int
-nocbreak(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "nocbreak()\n");
-#endif
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	__rawmode = 0;
-	if (_cursesi_screen->notty == TRUE)
-		return OK;
-	  /* if we were in halfdelay mode then nuke the timeout */
-	if ((_cursesi_screen->half_delay == TRUE) &&
-	    (__notimeout() == ERR))
-		return ERR;
-
-	_cursesi_screen->half_delay = FALSE;
-	_cursesi_screen->curt = _cursesi_screen->useraw ?
-		&_cursesi_screen->rawt : &_cursesi_screen->baset;
-	return tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSADRAIN,
-	    _cursesi_screen->curt) ? ERR : OK;
-}
-
-/*
- * halfdelay --
- *    Put the terminal into cbreak mode with the specified timeout.
- *
- */
-int
-halfdelay(int duration)
-{
-	if ((duration < 1) || (duration > 255))
-		return ERR;
-
-	if (cbreak() == ERR)
-		return ERR;
-
-	if (__timeout(duration) == ERR)
-		return ERR;
-
-	_cursesi_screen->half_delay = TRUE;
-	return OK;
-}
-	
-int
-__delay(void)
- {
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "__delay()\n");
-#endif
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	if (_cursesi_screen->notty == TRUE)
-		return OK;
-	_cursesi_screen->rawt.c_cc[VMIN] = 1;
-	_cursesi_screen->rawt.c_cc[VTIME] = 0;
-	_cursesi_screen->cbreakt.c_cc[VMIN] = 1;
-	_cursesi_screen->cbreakt.c_cc[VTIME] = 0;
-	_cursesi_screen->baset.c_cc[VMIN] = 1;
-	_cursesi_screen->baset.c_cc[VTIME] = 0;
-
-	if (tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSANOW, 
-	    _cursesi_screen->curt)) {
-		__restore_termios();
-		return ERR;
-	}
-
-	return OK;
-}
-
-int
-__nodelay(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "__nodelay()\n");
-#endif
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	if (_cursesi_screen->notty == TRUE)
-		return OK;
-	_cursesi_screen->rawt.c_cc[VMIN] = 0;
-	_cursesi_screen->rawt.c_cc[VTIME] = 0;
-	_cursesi_screen->cbreakt.c_cc[VMIN] = 0;
-	_cursesi_screen->cbreakt.c_cc[VTIME] = 0;
-	_cursesi_screen->baset.c_cc[VMIN] = 0;
-	_cursesi_screen->baset.c_cc[VTIME] = 0;
-
-	if (tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSANOW,
-	    _cursesi_screen->curt)) {
-		__restore_termios();
-		return ERR;
-	}
-
-	return OK;
-}
-
-void
-__save_termios(void)
-{
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	if (_cursesi_screen->notty == TRUE)
-		return;
-	_cursesi_screen->ovmin = _cursesi_screen->cbreakt.c_cc[VMIN];
-	_cursesi_screen->ovtime = _cursesi_screen->cbreakt.c_cc[VTIME];
-}
-
-void
-__restore_termios(void)
-{
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	if (_cursesi_screen->notty == TRUE)
-		return;
-	_cursesi_screen->rawt.c_cc[VMIN] = _cursesi_screen->ovmin;
-	_cursesi_screen->rawt.c_cc[VTIME] = _cursesi_screen->ovtime;
-	_cursesi_screen->cbreakt.c_cc[VMIN] = _cursesi_screen->ovmin;
-	_cursesi_screen->cbreakt.c_cc[VTIME] = _cursesi_screen->ovtime;
-	_cursesi_screen->baset.c_cc[VMIN] = _cursesi_screen->ovmin;
-	_cursesi_screen->baset.c_cc[VTIME] = _cursesi_screen->ovtime;
-}
-
-int
-__timeout(int delay)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "__timeout()\n");
-#endif
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	if (_cursesi_screen->notty == TRUE)
-		return OK;
-	_cursesi_screen->ovmin = _cursesi_screen->cbreakt.c_cc[VMIN];
-	_cursesi_screen->ovtime = _cursesi_screen->cbreakt.c_cc[VTIME];
-	_cursesi_screen->rawt.c_cc[VMIN] = 0;
-	_cursesi_screen->rawt.c_cc[VTIME] = delay;
-	_cursesi_screen->cbreakt.c_cc[VMIN] = 0;
-	_cursesi_screen->cbreakt.c_cc[VTIME] = delay;
-	_cursesi_screen->baset.c_cc[VMIN] = 0;
-	_cursesi_screen->baset.c_cc[VTIME] = delay;
-
-	if (tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSANOW,
-	    _cursesi_screen->curt)) {
-		__restore_termios();
-		return ERR;
-	}
-
-	return OK;
-}
-
-int
-__notimeout(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "__notimeout()\n");
-#endif
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	if (_cursesi_screen->notty == TRUE)
-		return OK;
-	_cursesi_screen->rawt.c_cc[VMIN] = 1;
-	_cursesi_screen->rawt.c_cc[VTIME] = 0;
-	_cursesi_screen->cbreakt.c_cc[VMIN] = 1;
-	_cursesi_screen->cbreakt.c_cc[VTIME] = 0;
-	_cursesi_screen->baset.c_cc[VMIN] = 1;
-	_cursesi_screen->baset.c_cc[VTIME] = 0;
-
-	return tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSANOW,
-	    _cursesi_screen->curt) ? ERR : OK;
-}
-
-int
-echo(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "echo()\n");
-#endif
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	__echoit = 1;
-	return OK;
-}
-
-int
-noecho(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "noecho()\n");
-#endif
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	__echoit = 0;
-	return OK;
-}
-
-int
-nl(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "nl()\n");
-#endif
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	if (_cursesi_screen->notty == TRUE)
-		return OK;
-	_cursesi_screen->rawt.c_iflag |= ICRNL;
-	_cursesi_screen->rawt.c_oflag |= ONLCR;
-	_cursesi_screen->cbreakt.c_iflag |= ICRNL;
-	_cursesi_screen->cbreakt.c_oflag |= ONLCR;
-	_cursesi_screen->baset.c_iflag |= ICRNL;
-	_cursesi_screen->baset.c_oflag |= ONLCR;
-
-	_cursesi_screen->nl = 1;
-	_cursesi_screen->pfast = _cursesi_screen->rawmode;
-	return tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSADRAIN,
-	    _cursesi_screen->curt) ? ERR : OK;
-}
-
-int
-nonl(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "nonl()\n");
-#endif
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	if (_cursesi_screen->notty == TRUE)
-		return OK;
-	_cursesi_screen->rawt.c_iflag &= ~ICRNL;
-	_cursesi_screen->rawt.c_oflag &= ~ONLCR;
-	_cursesi_screen->cbreakt.c_iflag &= ~ICRNL;
-	_cursesi_screen->cbreakt.c_oflag &= ~ONLCR;
-	_cursesi_screen->baset.c_iflag &= ~ICRNL;
-	_cursesi_screen->baset.c_oflag &= ~ONLCR;
-
-	_cursesi_screen->nl = 0;
-	__pfast = 1;
-	return tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSADRAIN,
-	    _cursesi_screen->curt) ? ERR : OK;
-}
-
-#ifndef _CURSES_USE_MACROS
-void
-noqiflush(void)
-{
-	(void) intrflush(stdscr, FALSE);
-}
-
-void
-qiflush(void)
-{
-	(void) intrflush(stdscr, TRUE);
-}
-#endif	/* _CURSES_USE_MACROS */
-
-int
-intrflush(WINDOW *win, bool bf)	/*ARGSUSED*/
-{
-	/* Check if we need to restart ... */
-	if (_cursesi_screen->endwin)
-		__restartwin();
-
-	if (_cursesi_screen->notty == TRUE)
-		return OK;
-	if (bf) {
-		_cursesi_screen->rawt.c_lflag &= ~NOFLSH;
-		_cursesi_screen->cbreakt.c_lflag &= ~NOFLSH;
-		_cursesi_screen->baset.c_lflag &= ~NOFLSH;
-	} else {
-		_cursesi_screen->rawt.c_lflag |= NOFLSH;
-		_cursesi_screen->cbreakt.c_lflag |= NOFLSH;
-		_cursesi_screen->baset.c_lflag |= NOFLSH;
-	}
-
-	__pfast = 1;
-	return tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSADRAIN,
-	    _cursesi_screen->curt) ? ERR : OK;
-}
-
-void
-__startwin(SCREEN *screen)
-{
-
-	(void) fflush(screen->infd);
-
-	/*
-	 * Some C libraries default to a 1K buffer when talking to a tty.
-	 * With a larger screen, especially across a network, we'd like
-	 * to get it to all flush in a single write.  Make it twice as big
-	 * as just the characters (so that we have room for cursor motions
-	 * and attribute information) but no more than 8K.
-	 */
-	if (screen->stdbuf == NULL) {
-		screen->len = LINES * COLS * 2;
-		if (screen->len > 8192)
-			screen->len = 8192;
-		if ((screen->stdbuf = malloc(screen->len)) == NULL)
-			screen->len = 0;
-	}
-	(void) setvbuf(screen->outfd, screen->stdbuf, _IOFBF, screen->len);
-
-	ti_puts(screen->term, t_enter_ca_mode(screen->term), 0,
-		__cputchar_args, (void *) screen->outfd);
-	ti_puts(screen->term, t_cursor_normal(screen->term), 0,
-	    __cputchar_args, (void *) screen->outfd);
-	if (screen->curscr->flags & __KEYPAD)
-		ti_puts(screen->term, t_keypad_xmit(screen->term), 0,
-		    __cputchar_args, (void *) screen->outfd);
-	screen->endwin = 0;
-}
-
-int
-endwin(void)
-{
-#ifdef DEBUG
-	__CTRACE(__CTRACE_MISC, "endwin\n");
-#endif
-	return __stopwin();
-}
-
-bool
-isendwin(void)
-{
-	return _cursesi_screen->endwin ? TRUE : FALSE;
-}
-
-int
-flushinp(void)
-{
-	(void) fpurge(_cursesi_screen->infd);
-	return OK;
-}
-
-/*
- * The following routines, savetty and resetty are completely useless and
- * are left in only as stubs.  If people actually use them they will almost
- * certainly screw up the state of the world.
- */
-/*static struct termios savedtty;*/
-int
-savetty(void)
-{
-	if (_cursesi_screen->notty == TRUE)
-		return OK;
-	return tcgetattr(fileno(_cursesi_screen->infd),
-	    &_cursesi_screen->savedtty) ? ERR : OK;
-}
-
-int
-resetty(void)
-{
-	if (_cursesi_screen->notty == TRUE)
-		return OK;
-	return tcsetattr(fileno(_cursesi_screen->infd), TCSASOFT | TCSADRAIN,
-	    &_cursesi_screen->savedtty) ? ERR : OK;
-}
-
-/*
- * erasechar --
- *     Return the character of the erase key.
- */
-char
-erasechar(void)
-{
-	if (_cursesi_screen->notty == TRUE)
-		return 0;
-	return _cursesi_screen->baset.c_cc[VERASE];
-}
-
-/*
- * killchar --
- *     Return the character of the kill key.
- */
-char
-killchar(void)
-{
-	if (_cursesi_screen->notty == TRUE)
-		return 0;
-	return _cursesi_screen->baset.c_cc[VKILL];
-}
-
-/*
- * erasewchar --
- *     Return the wide character of the erase key.
- */
-int
-erasewchar( wchar_t *ch )
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (_cursesi_screen->notty == TRUE)
-		return ERR;
-	*ch = _cursesi_screen->baset.c_cc[VERASE];
-	return OK;
-#endif /* HAVE_WCHAR */
-}
-
-/*
- * killwchar --
- *     Return the wide character of the kill key.
- */
-int
-killwchar( wchar_t *ch )
-{
-#ifndef HAVE_WCHAR
-	return ERR;
-#else
-	if (_cursesi_screen->notty == TRUE)
-		return 0;
-	*ch = _cursesi_screen->baset.c_cc[VKILL];
-	return OK;
-#endif /* HAVE_WCHAR */
-}
diff --git a/lib/libcurses/unctrl.c b/lib/libcurses/unctrl.c
deleted file mode 100644
index ffb6aeb4d..000000000
--- a/lib/libcurses/unctrl.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*	$NetBSD: unctrl.c,v 1.11 2007/05/28 15:01:58 blymn Exp $	*/
-
-/*
- * Copyright (c) 1981, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)unctrl.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: unctrl.c,v 1.11 2007/05/28 15:01:58 blymn Exp $");
-#endif
-#endif /* not lint */
-
-#include <unctrl.h>
-
-const char   * const __unctrl[256] = {
-	"^@", "^A", "^B", "^C", "^D", "^E", "^F", "^G",
-	"^H", "^I", "^J", "^K", "^L", "^M", "^N", "^O",
-	"^P", "^Q", "^R", "^S", "^T", "^U", "^V", "^W",
-	"^X", "^Y", "^Z", "^[", "^\\", "^]", "^~", "^_",
-	" ", "!", "\"", "#", "$", "%", "&", "'",
-	"(", ")", "*", "+", ",", "-", ".", "/",
-	"0", "1", "2", "3", "4", "5", "6", "7",
-	"8", "9", ":", ";", "<", "=", ">", "?",
-	"@", "A", "B", "C", "D", "E", "F", "G",
-	"H", "I", "J", "K", "L", "M", "N", "O",
-	"P", "Q", "R", "S", "T", "U", "V", "W",
-	"X", "Y", "Z", "[", "\\", "]", "^", "_",
-	"`", "a", "b", "c", "d", "e", "f", "g",
-	"h", "i", "j", "k", "l", "m", "n", "o",
-	"p", "q", "r", "s", "t", "u", "v", "w",
-	"x", "y", "z", "{", "|", "}", "~", "^?",
-
-	"0x80", "0x81", "0x82", "0x83", "0x84", "0x85", "0x86", "0x87",
-	"0x88", "0x89", "0x8a", "0x8b", "0x8c", "0x8d", "0x8e", "0x8f",
-	"0x90", "0x91", "0x92", "0x93", "0x94", "0x95", "0x96", "0x97",
-	"0x98", "0x99", "0x9a", "0x9b", "0x9c", "0x9d", "0x9e", "0x9f",
-	"0xa0", "0xa1", "0xa2", "0xa3", "0xa4", "0xa5", "0xa6", "0xa7",
-	"0xa8", "0xa9", "0xaa", "0xab", "0xac", "0xad", "0xae", "0xaf",
-	"0xb0", "0xb1", "0xb2", "0xb3", "0xb4", "0xb5", "0xb6", "0xb7",
-	"0xb8", "0xb9", "0xba", "0xbb", "0xbc", "0xbd", "0xbe", "0xbf",
-	"0xc0", "0xc1", "0xc2", "0xc3", "0xc4", "0xc5", "0xc6", "0xc7",
-	"0xc8", "0xc9", "0xca", "0xcb", "0xcc", "0xcd", "0xce", "0xcf",
-	"0xd0", "0xd1", "0xd2", "0xd3", "0xd4", "0xd5", "0xd6", "0xd7",
-	"0xd8", "0xd9", "0xda", "0xdb", "0xdc", "0xdd", "0xde", "0xdf",
-	"0xe0", "0xe1", "0xe2", "0xe3", "0xe4", "0xe5", "0xe6", "0xe7",
-	"0xe8", "0xe9", "0xea", "0xeb", "0xec", "0xed", "0xee", "0xef",
-	"0xf0", "0xf1", "0xf2", "0xf3", "0xf4", "0xf5", "0xf6", "0xf7",
-	"0xf8", "0xf9", "0xfa", "0xfb", "0xfc", "0xfd", "0xfe", "0xff",
-};
-
-const unsigned char    __unctrllen[256] = {
-	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,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 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,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 4, 4, 4, 4, 4,
-};
-
-#ifdef HAVE_WCHAR
-const wchar_t   * const __wunctrl[256] = {
-	L"^@", L"^A", L"^B", L"^C", L"^D", L"^E", L"^F", L"^G",
-	L"^H", L"^I", L"^J", L"^K", L"^L", L"^M", L"^N", L"^O",
-	L"^P", L"^Q", L"^R", L"^S", L"^T", L"^U", L"^V", L"^W",
-	L"^X", L"^Y", L"^Z", L"^[", L"^\\", L"^]", L"^~", L"^_",
-	L" ", L"!", L"\"", L"#", L"$", L"%", L"&", L"'",
-	L"(", L")", L"*", L"+", L",", L"-", L".", L"/",
-	L"0", L"1", L"2", L"3", L"4", L"5", L"6", L"7",
-	L"8", L"9", L":", L";", L"<", L"=", L">", L"?",
-	L"@", L"A", L"B", L"C", L"D", L"E", L"F", L"G",
-	L"H", L"I", L"J", L"K", L"L", L"M", L"N", L"O",
-	L"P", L"Q", L"R", L"S", L"T", L"U", L"V", L"W",
-	L"X", L"Y", L"Z", L"[", L"\\", L"]", L"^", L"_",
-	L"`", L"a", L"b", L"c", L"d", L"e", L"f", L"g",
-	L"h", L"i", L"j", L"k", L"l", L"m", L"n", L"o",
-	L"p", L"q", L"r", L"s", L"t", L"u", L"v", L"w",
-	L"x", L"y", L"z", L"{", L"|", L"}", L"~", L"^?",
-
-	L"0x80", L"0x81", L"0x82", L"0x83", L"0x84", L"0x85", L"0x86", L"0x87",
-	L"0x88", L"0x89", L"0x8a", L"0x8b", L"0x8c", L"0x8d", L"0x8e", L"0x8f",
-	L"0x90", L"0x91", L"0x92", L"0x93", L"0x94", L"0x95", L"0x96", L"0x97",
-	L"0x98", L"0x99", L"0x9a", L"0x9b", L"0x9c", L"0x9d", L"0x9e", L"0x9f",
-	L"0xa0", L"0xa1", L"0xa2", L"0xa3", L"0xa4", L"0xa5", L"0xa6", L"0xa7",
-	L"0xa8", L"0xa9", L"0xaa", L"0xab", L"0xac", L"0xad", L"0xae", L"0xaf",
-	L"0xb0", L"0xb1", L"0xb2", L"0xb3", L"0xb4", L"0xb5", L"0xb6", L"0xb7",
-	L"0xb8", L"0xb9", L"0xba", L"0xbb", L"0xbc", L"0xbd", L"0xbe", L"0xbf",
-	L"0xc0", L"0xc1", L"0xc2", L"0xc3", L"0xc4", L"0xc5", L"0xc6", L"0xc7",
-	L"0xc8", L"0xc9", L"0xca", L"0xcb", L"0xcc", L"0xcd", L"0xce", L"0xcf",
-	L"0xd0", L"0xd1", L"0xd2", L"0xd3", L"0xd4", L"0xd5", L"0xd6", L"0xd7",
-	L"0xd8", L"0xd9", L"0xda", L"0xdb", L"0xdc", L"0xdd", L"0xde", L"0xdf",
-	L"0xe0", L"0xe1", L"0xe2", L"0xe3", L"0xe4", L"0xe5", L"0xe6", L"0xe7",
-	L"0xe8", L"0xe9", L"0xea", L"0xeb", L"0xec", L"0xed", L"0xee", L"0xef",
-	L"0xf0", L"0xf1", L"0xf2", L"0xf3", L"0xf4", L"0xf5", L"0xf6", L"0xf7",
-	L"0xf8", L"0xf9", L"0xfa", L"0xfb", L"0xfc", L"0xfd", L"0xfe", L"0xff",
-};
-#endif /* HAVE_WCHAR */
diff --git a/lib/libcurses/unctrl.h b/lib/libcurses/unctrl.h
deleted file mode 100644
index bdeed619e..000000000
--- a/lib/libcurses/unctrl.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: unctrl.h,v 1.5 2015/05/28 06:28:37 wiz Exp $	*/
-
-/*
- * Copyright (c) 1982, 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.
- *
- *	@(#)unctrl.h	8.1 (Berkeley) 5/31/93
- */
-
-#ifndef _UNCTRL_H_
-#define _UNCTRL_H_
-
-#include <sys/cdefs.h>
-#ifdef HAVE_WCHAR
-#include <wchar.h>
-#include <curses.h>
-#endif /* HAVE_WCHAR */
-
-__BEGIN_DECLS
-extern const char * const  __unctrl[];		/* Control strings. */
-extern const unsigned char __unctrllen[];	/* Control strings length. */
-#ifdef HAVE_WCHAR
-extern const wchar_t * const  __wunctrl[];	/* Wide char control strings. */
-#endif /* HAVE_WCHAR */
-__END_DECLS
-
-/* 8-bit ASCII characters. */
-#define	unctrl(c)		__unctrl[((unsigned char)c) & 0xff]
-#define	unctrllen(c)	__unctrllen[((unsigned char)c) & 0xff]
-
-#ifdef HAVE_WCHAR
-#define	wunctrl(wc)		__wunctrl[( int )((wc)->vals[ 0 ]) & 0xff]
-#endif /* HAVE_WCHAR */
-#endif /* _UNCTRL_H_ */
diff --git a/lib/libcurses/underscore.c b/lib/libcurses/underscore.c
deleted file mode 100644
index c790c2183..000000000
--- a/lib/libcurses/underscore.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$NetBSD: underscore.c,v 1.11 2010/02/03 15:34:40 roy Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: underscore.c,v 1.11 2010/02/03 15:34:40 roy Exp $");
-#endif				/* not lint */
-
-#include "curses.h"
-#include "curses_private.h"
-
-#ifndef _CURSES_USE_MACROS
-
-/*
- * underscore --
- *	Enter underscore mode on stdscr.
- */
-int
-underscore(void)
-{
-	return wunderscore(stdscr);
-}
-
-
-/*
- * underend --
- *	Exit underscore mode on stdscr.
- */
-int
-underend(void)
-{
-	return wunderend(stdscr);
-}
-
-#endif
-
-/*
- * wunderscore --
- *	Enter underscore mode.
- */
-int
-wunderscore(WINDOW *win)
-{
-	/* If can underscore, set the screen underscore bit. */
-	if ((enter_underline_mode != NULL && exit_underline_mode != NULL) ||
-	    underline_char != NULL)
-	{
-#ifdef DEBUG
-		__CTRACE(__CTRACE_ATTR, "wunderscore\n");
-#endif
-		win->wattr |= __UNDERSCORE;
-	}
-	return (1);
-}
-
-/*
- * wunderend --
- *	Exit underscore mode.
- */
-int
-wunderend(WINDOW *win)
-{
-	if (exit_underline_mode != NULL) {
-#ifdef DEBUG
-		__CTRACE(__CTRACE_ATTR, "wunderend\n");
-#endif
-		win->wattr &= ~__UNDERSCORE;
-	}
-        return 1;
-}
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
deleted file mode 100644
index 12811bdbf..000000000
--- a/lib/libedit/Makefile
+++ /dev/null
@@ -1,135 +0,0 @@
-#	$NetBSD: Makefile,v 1.53 2015/01/29 20:30:02 joerg Exp $
-#	@(#)Makefile	8.1 (Berkeley) 6/4/93
-
-USE_SHLIBDIR=	yes
-
-WIDECHAR ?= yes
-WARNS?=	5
-LIB=	edit
-
-LIBDPLIBS+=     terminfo ${.CURDIR}/../libterminfo
-
-.include "bsd.own.mk"
-
-COPTS+=	-Wunused-parameter
-CWARNFLAGS.gcc+=	-Wconversion
-CWARNFLAGS.clang+=	-Wno-cast-qual
-
-OSRCS=	chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \
-	hist.c keymacro.c map.c chartype.c \
-	parse.c prompt.c read.c refresh.c search.c sig.c terminal.c tty.c vi.c
-
-MAN=	editline.3 editrc.5
-
-MLINKS=	editline.3 el_init.3 editline.3 el_end.3 editline.3 el_reset.3 \
-	editline.3 el_gets.3 editline.3 el_getc.3 editline.3 el_push.3 \
-	editline.3 el_parse.3 editline.3 el_set.3 editline.3 el_get.3 \
-	editline.3 el_source.3 editline.3 el_resize.3 editline.3 el_line.3 \
-	editline.3 el_insertstr.3 editline.3 el_deletestr.3 \
-	editline.3 history_init.3 editline.3 history_end.3 \
-	editline.3 history.3 \
-	editline.3 tok_init.3 editline.3 tok_end.3 editline.3 tok_reset.3 \
-	editline.3 tok_line.3 editline.3 tok_str.3
-
-# For speed and debugging
-#SRCS=   ${OSRCS} readline.c tokenizer.c history.c
-# For protection
-SRCS=	editline.c readline.c tokenizer.c history.c
-
-.if ${WIDECHAR} == "yes"
-OSRCS += eln.c
-SRCS += tokenizern.c historyn.c
-CLEANFILES+=tokenizern.c.tmp tokenizern.c historyn.c.tmp historyn.c
-CPPFLAGS+=-DWIDECHAR
-.endif
-
-LIBEDITDIR?=${.CURDIR}
-
-INCS= histedit.h
-INCSDIR=/usr/include
-
-CLEANFILES+=editline.c
-CLEANFILES+=common.h.tmp editline.c.tmp emacs.h.tmp fcns.c.tmp fcns.h.tmp
-CLEANFILES+=help.c.tmp help.h.tmp vi.h.tmp tc1.o tc1
-CLEANFILES+=tokenizern.c.tmp tokenizern.c tokenizerw.c.tmp tokenizerw.c
-CPPFLAGS+=-I. -I${LIBEDITDIR} 
-CPPFLAGS+=-I. -I${.CURDIR}
-CPPFLAGS+=#-DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH
-CPPFLAGS+=#-DDEBUG_PASTE -DDEBUG_EDIT
-
-AHDR=vi.h emacs.h common.h 
-ASRC=${LIBEDITDIR}/vi.c ${LIBEDITDIR}/emacs.c ${LIBEDITDIR}/common.c
-
-DPSRCS+=	${AHDR} fcns.h help.h fcns.c help.c
-CLEANFILES+=	${AHDR} fcns.h help.h fcns.c help.c
-
-SUBDIR=	readline
-
-vi.h: vi.c makelist Makefile
-	${_MKTARGET_CREATE}
-	${HOST_SH} ${LIBEDITDIR}/makelist -h ${LIBEDITDIR}/vi.c \
-	    > ${.TARGET}.tmp && \
-	    mv ${.TARGET}.tmp ${.TARGET}
-
-emacs.h: emacs.c makelist Makefile
-	${_MKTARGET_CREATE}
-	${HOST_SH} ${LIBEDITDIR}/makelist -h ${LIBEDITDIR}/emacs.c \
-	    > ${.TARGET}.tmp && \
-	    mv ${.TARGET}.tmp ${.TARGET}
-
-common.h: common.c makelist Makefile
-	${_MKTARGET_CREATE}
-	${HOST_SH} ${LIBEDITDIR}/makelist -h ${LIBEDITDIR}/common.c \
-	    > ${.TARGET}.tmp && \
-	    mv ${.TARGET}.tmp ${.TARGET}
-
-fcns.h: ${AHDR} makelist Makefile
-	${_MKTARGET_CREATE}
-	${HOST_SH} ${LIBEDITDIR}/makelist -fh ${AHDR} > ${.TARGET}.tmp && \
-	    mv ${.TARGET}.tmp ${.TARGET}
-
-fcns.c: ${AHDR} fcns.h help.h makelist Makefile
-	${_MKTARGET_CREATE}
-	${HOST_SH} ${LIBEDITDIR}/makelist -fc ${AHDR} > ${.TARGET}.tmp && \
-	    mv ${.TARGET}.tmp ${.TARGET}
-
-help.c: ${ASRC} makelist Makefile
-	${_MKTARGET_CREATE}
-	${HOST_SH} ${LIBEDITDIR}/makelist -bc ${ASRC} > ${.TARGET}.tmp && \
-	    mv ${.TARGET}.tmp ${.TARGET}
-
-help.h: ${ASRC} makelist Makefile
-	${_MKTARGET_CREATE}
-	${HOST_SH} ${LIBEDITDIR}/makelist -bh ${ASRC} > ${.TARGET}.tmp && \
-	    mv ${.TARGET}.tmp ${.TARGET}
-
-editline.c: ${OSRCS} makelist Makefile
-	${_MKTARGET_CREATE}
-	${HOST_SH} ${LIBEDITDIR}/makelist -e ${OSRCS:T} > ${.TARGET}.tmp && \
-	    mv ${.TARGET}.tmp ${.TARGET}
-
-tokenizern.c: makelist Makefile
-	${_MKTARGET_CREATE}
-	${HOST_SH} ${LIBEDITDIR}/makelist -n tokenizer.c > ${.TARGET}.tmp && \
-	    mv ${.TARGET}.tmp ${.TARGET}
-
-historyn.c: makelist Makefile
-	${_MKTARGET_CREATE}
-	${HOST_SH} ${LIBEDITDIR}/makelist -n history.c > ${.TARGET}.tmp && \
-	    mv ${.TARGET}.tmp ${.TARGET}
-
-tc1.o:	${LIBEDITDIR}/TEST/tc1.c
-
-tc1:	libedit.a tc1.o 
-	${_MKTARGET_LINK}
-	${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD} -ltermlib
-
-.include <bsd.lib.mk>
-.include <bsd.subdir.mk>
-
-# XXX
-.if defined(HAVE_GCC)
-COPTS.editline.c+=	-Wno-cast-qual
-COPTS.tokenizer.c+=	-Wno-cast-qual
-COPTS.tokenizern.c+=	-Wno-cast-qual
-.endif
diff --git a/lib/libedit/TEST/Makefile b/lib/libedit/TEST/Makefile
deleted file mode 100644
index e06fcebff..000000000
--- a/lib/libedit/TEST/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2010/02/03 15:34:43 roy Exp $
-
-NOMAN=1
-PROG=wtc1
-CPPFLAGS=-I${.CURDIR}/..
-LDADD+=-ledit -ltermlib
-DPADD+=${LIBEDIT} ${LIBTERMLIB}
-
-.ifdef DEBUG
-CPPFLAGS+=-DDEBUG
-.endif
-
-.include <bsd.prog.mk>
diff --git a/lib/libedit/TEST/rl1.c b/lib/libedit/TEST/rl1.c
deleted file mode 100644
index 78ff518e6..000000000
--- a/lib/libedit/TEST/rl1.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: rl1.c,v 1.1 2010/09/16 20:08:51 christos Exp $	*/
-
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if !defined(lint)
-__RCSID("$NetBSD: rl1.c,v 1.1 2010/09/16 20:08:51 christos Exp $");
-#endif /* not lint  */
-
-/*
- * test.c: A little test program
- */
-#include <stdio.h>
-#include <readline/readline.h>
-
-int
-main(int argc, char *argv[])
-{
-	char *p;
-	while ((p = readline("hi$")) != NULL) {
-		add_history(p);
-		printf("%d %s\n", history_length, p);
-	}
-	return 0;
-}
diff --git a/lib/libedit/TEST/tc1.c b/lib/libedit/TEST/tc1.c
deleted file mode 100644
index 88b3cd643..000000000
--- a/lib/libedit/TEST/tc1.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/*	$NetBSD: tc1.c,v 1.6 2014/06/18 20:12:15 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n");
-#endif /* not lint */
-
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)test.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: tc1.c,v 1.6 2014/06/18 20:12:15 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * test.c: A little test program
- */
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <locale.h>
-
-#include "histedit.h"
-
-static int continuation = 0;
-volatile sig_atomic_t gotsig = 0;
-
-static	unsigned char	complete(EditLine *, int);
-	int	main(int, char **);
-static	char   *prompt(EditLine *);
-static	void	sig(int);
-
-static char *
-prompt(EditLine *el)
-{
-	static char a[] = "\1\033[7m\1Edit$\1\033[0m\1 ";
-	static char b[] = "Edit> ";
-
-	return (continuation ? b : a);
-}
-
-static void
-sig(int i)
-{
-	gotsig = i;
-}
-
-static unsigned char
-complete(EditLine *el, int ch)
-{
-	DIR *dd = opendir(".");
-	struct dirent *dp;
-	const char* ptr;
-	const LineInfo *lf = el_line(el);
-	int len;
-	int res = CC_ERROR;
-
-	/*
-	 * Find the last word
-	 */
-	for (ptr = lf->cursor - 1;
-	    !isspace((unsigned char)*ptr) && ptr > lf->buffer; ptr--)
-		continue;
-	len = lf->cursor - ++ptr;
-
-	for (dp = readdir(dd); dp != NULL; dp = readdir(dd)) {
-		if (len > strlen(dp->d_name))
-			continue;
-		if (strncmp(dp->d_name, ptr, len) == 0) {
-			if (el_insertstr(el, &dp->d_name[len]) == -1)
-				res = CC_ERROR;
-			else
-				res = CC_REFRESH;
-			break;
-		}
-	}
-
-	closedir(dd);
-	return res;
-}
-
-int
-main(int argc, char *argv[])
-{
-	EditLine *el = NULL;
-	int num;
-	const char *buf;
-	Tokenizer *tok;
-#if 0
-	int lastevent = 0;
-#endif
-	int ncontinuation;
-	History *hist;
-	HistEvent ev;
-
-	(void) setlocale(LC_CTYPE, "");
-	(void) signal(SIGINT, sig);
-	(void) signal(SIGQUIT, sig);
-	(void) signal(SIGHUP, sig);
-	(void) signal(SIGTERM, sig);
-
-	hist = history_init();		/* Init the builtin history	*/
-					/* Remember 100 events		*/
-	history(hist, &ev, H_SETSIZE, 100);
-
-	tok  = tok_init(NULL);		/* Initialize the tokenizer	*/
-
-					/* Initialize editline		*/
-	el = el_init(*argv, stdin, stdout, stderr);
-
-	el_set(el, EL_EDITOR, "vi");	/* Default editor is vi		*/
-	el_set(el, EL_SIGNAL, 1);	/* Handle signals gracefully	*/
-	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);
-
-					/* Add a user-defined function	*/
-	el_set(el, EL_ADDFN, "ed-complete", "Complete argument", complete);
-
-					/* Bind tab to it 		*/
-	el_set(el, EL_BIND, "^I", "ed-complete", NULL);
-
-	/*
-	 * Bind j, k in vi command mode to previous and next line, instead
-	 * of previous and next history.
-	 */
-	el_set(el, EL_BIND, "-a", "k", "ed-prev-line", NULL);
-	el_set(el, EL_BIND, "-a", "j", "ed-next-line", NULL);
-
-	/*
-	 * Source the user's defaults file.
-	 */
-	el_source(el, NULL);
-
-	while ((buf = el_gets(el, &num)) != NULL && num != 0)  {
-		int ac, cc, co;
-#ifdef DEBUG
-		int i;
-#endif
-		const char **av;
-		const LineInfo *li;
-		li = el_line(el);
-#ifdef DEBUG
-		(void) fprintf(stderr, "==> got %d %s", num, buf);
-		(void) fprintf(stderr, "  > li `%.*s_%.*s'\n",
-		    (li->cursor - li->buffer), li->buffer,
-		    (li->lastchar - 1 - li->cursor),
-		    (li->cursor >= li->lastchar) ? "" : li->cursor);
-
-#endif
-		if (gotsig) {
-			(void) fprintf(stderr, "Got signal %d.\n", (int)gotsig);
-			gotsig = 0;
-			el_reset(el);
-		}
-
-		if (!continuation && num == 1)
-			continue;
-
-		ac = cc = co = 0;
-		ncontinuation = tok_line(tok, li, &ac, &av, &cc, &co);
-		if (ncontinuation < 0) {
-			(void) fprintf(stderr, "Internal error\n");
-			continuation = 0;
-			continue;
-		}
-#ifdef DEBUG
-		(void) fprintf(stderr, "  > nc %d ac %d cc %d co %d\n",
-		    ncontinuation, ac, cc, co);
-#endif
-#if 0
-		if (continuation) {
-			/*
-			 * Append to the right event in case the user
-			 * moved around in history.
-			 */
-			if (history(hist, &ev, H_SET, lastevent) == -1)
-				err(1, "%d: %s", lastevent, ev.str);
-			history(hist, &ev, H_ADD , buf);
-		} else {
-			history(hist, &ev, H_ENTER, buf);
-			lastevent = ev.num;
-		}
-#else
-				/* Simpler */
-		history(hist, &ev, continuation ? H_APPEND : H_ENTER, buf);
-#endif
-
-		continuation = ncontinuation;
-		ncontinuation = 0;
-		if (continuation)
-			continue;
-#ifdef DEBUG
-		for (i = 0; i < ac; i++) {
-			(void) fprintf(stderr, "  > arg# %2d ", i);
-			if (i != cc)
-				(void) fprintf(stderr, "`%s'\n", av[i]);
-			else
-				(void) fprintf(stderr, "`%.*s_%s'\n",
-				    co, av[i], av[i] + co);
-		}
-#endif
-
-		if (strcmp(av[0], "history") == 0) {
-			int rv;
-
-			switch (ac) {
-			case 1:
-				for (rv = history(hist, &ev, H_LAST); rv != -1;
-				    rv = history(hist, &ev, H_PREV))
-					(void) fprintf(stdout, "%4d %s",
-					    ev.num, ev.str);
-				break;
-
-			case 2:
-				if (strcmp(av[1], "clear") == 0)
-					 history(hist, &ev, H_CLEAR);
-				else
-					 goto badhist;
-				break;
-
-			case 3:
-				if (strcmp(av[1], "load") == 0)
-					 history(hist, &ev, H_LOAD, av[2]);
-				else if (strcmp(av[1], "save") == 0)
-					 history(hist, &ev, H_SAVE, av[2]);
-				break;
-
-			badhist:
-			default:
-				(void) fprintf(stderr,
-				    "Bad history arguments\n");
-				break;
-			}
-		} else if (el_parse(el, ac, av) == -1) {
-			switch (fork()) {
-			case 0:
-				execvp(av[0], (char *const *)__UNCONST(av));
-				perror(av[0]);
-				_exit(1);
-				/*NOTREACHED*/
-				break;
-
-			case -1:
-				perror("fork");
-				break;
-
-			default:
-				if (wait(&num) == -1)
-					perror("wait");
-				(void) fprintf(stderr, "Exit %x\n", num);
-				break;
-			}
-		}
-
-		tok_reset(tok);
-	}
-
-	el_end(el);
-	tok_end(tok);
-	history_end(hist);
-
-	return (0);
-}
diff --git a/lib/libedit/TEST/wtc1.c b/lib/libedit/TEST/wtc1.c
deleted file mode 100644
index 3e6fa9e81..000000000
--- a/lib/libedit/TEST/wtc1.c
+++ /dev/null
@@ -1,278 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <err.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <limits.h>
-#include <locale.h>
-
-#include "../histedit.h"
-
-
-static int continuation;
-volatile sig_atomic_t gotsig;
-static const char hfile[] = ".whistory";
-
-static wchar_t *
-prompt(EditLine *el)
-{
-	static wchar_t a[] = L"\1\033[7m\1Edit$\1\033[0m\1 ";
-	static wchar_t b[] = L"Edit> ";
-
-	return continuation ? b : a;
-}
-
-
-static void
-sig(int i)
-{
-	gotsig = i;
-}
-
-const char *
-my_wcstombs(const wchar_t *wstr)
-{
-	static struct {
-		char *str;
-		int len;
-	} buf;
-
-	int needed = wcstombs(0, wstr, 0) + 1;
-	if (needed > buf.len) {
-		buf.str = malloc(needed);
-		buf.len = needed;
-	}
-	wcstombs(buf.str, wstr, needed);
-	buf.str[needed - 1] = 0;
-
-	return buf.str;
-}
-
-
-static unsigned char
-complete(EditLine *el, int ch)
-{
-	DIR *dd = opendir(".");
-	struct dirent *dp;
-	const wchar_t *ptr;
-	char *buf, *bptr;
-	const LineInfoW *lf = el_wline(el);
-	int len, mblen, i;
-	unsigned char res = 0;
-	wchar_t dir[1024];
-
-	/* Find the last word */
-	for (ptr = lf->cursor -1; !iswspace(*ptr) && ptr > lf->buffer; --ptr)
-		continue;
-	len = lf->cursor - ++ptr;
-
-	/* Convert last word to multibyte encoding, so we can compare to it */
-	wctomb(NULL, 0); /* Reset shift state */
-	mblen = MB_LEN_MAX * len + 1;
-	buf = bptr = malloc(mblen);
-	if (buf == NULL)
-		err(1, "malloc");
-	for (i = 0; i < len; ++i) {
-		/* Note: really should test for -1 return from wctomb */
-		bptr += wctomb(bptr, ptr[i]);
-	}
-	*bptr = 0; /* Terminate multibyte string */
-	mblen = bptr - buf;
-
-	/* Scan directory for matching name */
-	for (dp = readdir(dd); dp != NULL; dp = readdir(dd)) {
-		if (mblen > strlen(dp->d_name))
-			continue;
-		if (strncmp(dp->d_name, buf, mblen) == 0) {
-			mbstowcs(dir, &dp->d_name[mblen],
-			    sizeof(dir) / sizeof(*dir));
-			if (el_winsertstr(el, dir) == -1)
-				res = CC_ERROR;
-			else
-				res = CC_REFRESH;
-			break;
-		}
-	}
-
-	closedir(dd);
-	free(buf);
-	return res;
-}
-
-
-int
-main(int argc, char *argv[])
-{
-	EditLine *el = NULL;
-	int numc, ncontinuation;
-	const wchar_t *line;
-	TokenizerW *tok;
-	HistoryW *hist;
-	HistEventW ev;
-#ifdef DEBUG
-	int i;
-#endif
-
-	setlocale(LC_ALL, "");
-
-	(void)signal(SIGINT,  sig);
-	(void)signal(SIGQUIT, sig);
-	(void)signal(SIGHUP,  sig);
-	(void)signal(SIGTERM, sig);
-
-	hist = history_winit();		/* Init built-in history     */
-	history_w(hist, &ev, H_SETSIZE, 100);	/* Remember 100 events	     */
-	history_w(hist, &ev, H_LOAD, hfile);
-
-	tok = tok_winit(NULL);			/* Init the tokenizer	     */
-
-	el = el_init(argv[0], stdin, stdout, stderr);
-
-	el_wset(el, EL_EDITOR, L"vi");		/* Default editor is vi	     */
-	el_wset(el, EL_SIGNAL, 1);		/* Handle signals gracefully */
-	el_wset(el, EL_PROMPT_ESC, prompt, '\1'); /* Set the prompt function */
-
-	el_wset(el, EL_HIST, history_w, hist);	/* FIXME - history_w? */
-
-					/* Add a user-defined function	*/
-	el_wset(el, EL_ADDFN, L"ed-complete", L"Complete argument", complete);
-
-					/* Bind <tab> to it */
-	el_wset(el, EL_BIND, L"^I", L"ed-complete", NULL);
-
-	/*
-	* Bind j, k in vi command mode to previous and next line, instead
-	* of previous and next history.
-	*/
-	el_wset(el, EL_BIND, L"-a", L"k", L"ed-prev-line", NULL);
-	el_wset(el, EL_BIND, L"-a", L"j", L"ed-next-line", NULL);
-
-	/* Source the user's defaults file. */
-	el_source(el, NULL);
-
-	while((line = el_wgets(el, &numc)) != NULL && numc != 0) {
-		int ac, cc, co, rc;
-		const wchar_t **av;
-
-		const LineInfoW *li;
-		li = el_wline(el);
-
-#ifdef DEBUG
-		(void)fwprintf(stderr, L"==> got %d %ls", numc, line);
-		(void)fwprintf(stderr, L"  > li `%.*ls_%.*ls'\n",
-		    (li->cursor - li->buffer), li->buffer,
-		    (li->lastchar - 1 - li->cursor),
-		    (li->cursor >= li->lastchar) ? L"" : li->cursor);
-#endif
-
-		if (gotsig) {
-			(void)fprintf(stderr, "Got signal %d.\n", (int)gotsig);
-			gotsig = 0;
-			el_reset(el);
-		}
-
-		if(!continuation && numc == 1)
-			continue;	/* Only got a linefeed */
-
-		ac = cc = co = 0;
-		ncontinuation = tok_wline(tok, li, &ac, &av, &cc, &co);
-		if (ncontinuation < 0) {
-			(void) fprintf(stderr, "Internal error\n");
-			continuation = 0;
-			continue;
-		}
-
-#ifdef DEBUG
-		(void)fprintf(stderr, "  > nc %d ac %d cc %d co %d\n",
-			ncontinuation, ac, cc, co);
-#endif
-		history_w(hist, &ev, continuation ? H_APPEND : H_ENTER, line);
-
-		continuation = ncontinuation;
-		ncontinuation = 0;
-		if(continuation)
-			continue;
-
-#ifdef DEBUG
-		for (i = 0; i < ac; ++i) {
-			(void)fwprintf(stderr, L"  > arg# %2d ", i);
-			if (i != cc)
-				(void)fwprintf(stderr, L"`%ls'\n", av[i]);
-			else
-				(void)fwprintf(stderr, L"`%.*ls_%ls'\n",
-				    co, av[i], av[i] + co);
-		}
-#endif
-
-		if (wcscmp (av[0], L"history") == 0) {
-			switch(ac) {
-			case 1:
-				for(rc = history_w(hist, &ev, H_LAST);
-				     rc != -1;
-				     rc = history_w(hist, &ev, H_PREV))
-					(void)fwprintf(stdout, L"%4d %ls",
-					     ev.num, ev.str);
-				break;
-			case 2:
-				if (wcscmp(av[1], L"clear") == 0)
-					history_w(hist, &ev, H_CLEAR);
-				else
-					goto badhist;
-				break;
-			case 3:
-				if (wcscmp(av[1], L"load") == 0)
-					history_w(hist, &ev, H_LOAD,
-					    my_wcstombs(av[2]));
-				else if (wcscmp(av[1], L"save") == 0)
-					history_w(hist, &ev, H_SAVE,
-					    my_wcstombs(av[2]));
-				else
-					goto badhist;
-				break;
-			badhist:
-			default:
-				(void)fprintf(stderr,
-				    "Bad history arguments\n");
-				break;
-			}
-		} else if (el_wparse(el, ac, av) == -1) {
-			switch (fork()) {
-			case 0: {
-				Tokenizer *ntok = tok_init(NULL);
-				int nargc;
-				const char **nav;
-				tok_str(ntok, my_wcstombs(line), &nargc, &nav);
-				execvp(nav[0],(char **)nav);
-				perror(nav[0]);
-				_exit(1);
-				/* NOTREACHED */
-				break;
-			}
-			case -1:
-				perror("fork");
-				break;
-			default:
-				if (wait(&rc) == -1)
-					perror("wait");
-				(void)fprintf(stderr, "Exit %x\n", rc);
-				break;
-			}
-		}
-
-		tok_wreset(tok);
-	}
-
-	el_end(el);
-	tok_wend(tok);
-	history_w(hist, &ev, H_SAVE, hfile);
-	history_wend(hist);
-
-	fprintf(stdout, "\n");
-	return 0;
-}
-
-
diff --git a/lib/libedit/chared.c b/lib/libedit/chared.c
deleted file mode 100644
index 3934a684f..000000000
--- a/lib/libedit/chared.c
+++ /dev/null
@@ -1,769 +0,0 @@
-/*	$NetBSD: chared.c,v 1.40 2014/06/18 18:12:28 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)chared.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: chared.c,v 1.40 2014/06/18 18:12:28 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * chared.c: Character editor utilities
- */
-#include <stdlib.h>
-#include "el.h"
-
-private void ch__clearmacro (EditLine *);
-
-/* value to leave unused in line buffer */
-#define	EL_LEAVE	2
-
-/* cv_undo():
- *	Handle state for the vi undo command
- */
-protected void
-cv_undo(EditLine *el)
-{
-	c_undo_t *vu = &el->el_chared.c_undo;
-	c_redo_t *r = &el->el_chared.c_redo;
-	size_t size;
-
-	/* Save entire line for undo */
-	size = (size_t)(el->el_line.lastchar - el->el_line.buffer);
-	vu->len = (ssize_t)size;
-	vu->cursor = (int)(el->el_line.cursor - el->el_line.buffer);
-	(void)memcpy(vu->buf, el->el_line.buffer, size * sizeof(*vu->buf));
-
-	/* save command info for redo */
-	r->count = el->el_state.doingarg ? el->el_state.argument : 0;
-	r->action = el->el_chared.c_vcmd.action;
-	r->pos = r->buf;
-	r->cmd = el->el_state.thiscmd;
-	r->ch = el->el_state.thisch;
-}
-
-/* cv_yank():
- *	Save yank/delete data for paste
- */
-protected void
-cv_yank(EditLine *el, const Char *ptr, int size)
-{
-	c_kill_t *k = &el->el_chared.c_kill;
-
-	(void)memcpy(k->buf, ptr, (size_t)size * sizeof(*k->buf));
-	k->last = k->buf + size;
-}
-
-
-/* c_insert():
- *	Insert num characters
- */
-protected void
-c_insert(EditLine *el, int num)
-{
-	Char *cp;
-
-	if (el->el_line.lastchar + num >= el->el_line.limit) {
-		if (!ch_enlargebufs(el, (size_t)num))
-			return;		/* can't go past end of buffer */
-	}
-
-	if (el->el_line.cursor < el->el_line.lastchar) {
-		/* if I must move chars */
-		for (cp = el->el_line.lastchar; cp >= el->el_line.cursor; cp--)
-			cp[num] = *cp;
-	}
-	el->el_line.lastchar += num;
-}
-
-
-/* c_delafter():
- *	Delete num characters after the cursor
- */
-protected void
-c_delafter(EditLine *el, int num)
-{
-
-	if (el->el_line.cursor + num > el->el_line.lastchar)
-		num = (int)(el->el_line.lastchar - el->el_line.cursor);
-
-	if (el->el_map.current != el->el_map.emacs) {
-		cv_undo(el);
-		cv_yank(el, el->el_line.cursor, num);
-	}
-
-	if (num > 0) {
-		Char *cp;
-
-		for (cp = el->el_line.cursor; cp <= el->el_line.lastchar; cp++)
-			*cp = cp[num];
-
-		el->el_line.lastchar -= num;
-	}
-}
-
-
-/* c_delafter1():
- *	Delete the character after the cursor, do not yank
- */
-protected void
-c_delafter1(EditLine *el)
-{
-	Char *cp;
-
-	for (cp = el->el_line.cursor; cp <= el->el_line.lastchar; cp++)
-		*cp = cp[1];
-
-	el->el_line.lastchar--;
-}
-
-
-/* c_delbefore():
- *	Delete num characters before the cursor
- */
-protected void
-c_delbefore(EditLine *el, int num)
-{
-
-	if (el->el_line.cursor - num < el->el_line.buffer)
-		num = (int)(el->el_line.cursor - el->el_line.buffer);
-
-	if (el->el_map.current != el->el_map.emacs) {
-		cv_undo(el);
-		cv_yank(el, el->el_line.cursor - num, num);
-	}
-
-	if (num > 0) {
-		Char *cp;
-
-		for (cp = el->el_line.cursor - num;
-		    cp <= el->el_line.lastchar;
-		    cp++)
-			*cp = cp[num];
-
-		el->el_line.lastchar -= num;
-	}
-}
-
-
-/* c_delbefore1():
- *	Delete the character before the cursor, do not yank
- */
-protected void
-c_delbefore1(EditLine *el)
-{
-	Char *cp;
-
-	for (cp = el->el_line.cursor - 1; cp <= el->el_line.lastchar; cp++)
-		*cp = cp[1];
-
-	el->el_line.lastchar--;
-}
-
-
-/* ce__isword():
- *	Return if p is part of a word according to emacs
- */
-protected int
-ce__isword(Int p)
-{
-	return Isalnum(p) || Strchr(STR("*?_-.[]~="), p) != NULL;
-}
-
-
-/* cv__isword():
- *	Return if p is part of a word according to vi
- */
-protected int
-cv__isword(Int p)
-{
-	if (Isalnum(p) || p == '_')
-		return 1;
-	if (Isgraph(p))
-		return 2;
-	return 0;
-}
-
-
-/* cv__isWord():
- *	Return if p is part of a big word according to vi
- */
-protected int
-cv__isWord(Int p)
-{
-	return !Isspace(p);
-}
-
-
-/* c__prev_word():
- *	Find the previous word
- */
-protected Char *
-c__prev_word(Char *p, Char *low, int n, int (*wtest)(Int))
-{
-	p--;
-
-	while (n--) {
-		while ((p >= low) && !(*wtest)(*p))
-			p--;
-		while ((p >= low) && (*wtest)(*p))
-			p--;
-	}
-
-	/* cp now points to one character before the word */
-	p++;
-	if (p < low)
-		p = low;
-	/* cp now points where we want it */
-	return p;
-}
-
-
-/* c__next_word():
- *	Find the next word
- */
-protected Char *
-c__next_word(Char *p, Char *high, int n, int (*wtest)(Int))
-{
-	while (n--) {
-		while ((p < high) && !(*wtest)(*p))
-			p++;
-		while ((p < high) && (*wtest)(*p))
-			p++;
-	}
-	if (p > high)
-		p = high;
-	/* p now points where we want it */
-	return p;
-}
-
-/* cv_next_word():
- *	Find the next word vi style
- */
-protected Char *
-cv_next_word(EditLine *el, Char *p, Char *high, int n, int (*wtest)(Int))
-{
-	int test;
-
-	while (n--) {
-		test = (*wtest)(*p);
-		while ((p < high) && (*wtest)(*p) == test)
-			p++;
-		/*
-		 * vi historically deletes with cw only the word preserving the
-		 * trailing whitespace! This is not what 'w' does..
-		 */
-		if (n || el->el_chared.c_vcmd.action != (DELETE|INSERT))
-			while ((p < high) && Isspace(*p))
-				p++;
-	}
-
-	/* p now points where we want it */
-	if (p > high)
-		return high;
-	else
-		return p;
-}
-
-
-/* cv_prev_word():
- *	Find the previous word vi style
- */
-protected Char *
-cv_prev_word(Char *p, Char *low, int n, int (*wtest)(Int))
-{
-	int test;
-
-	p--;
-	while (n--) {
-		while ((p > low) && Isspace(*p))
-			p--;
-		test = (*wtest)(*p);
-		while ((p >= low) && (*wtest)(*p) == test)
-			p--;
-	}
-	p++;
-
-	/* p now points where we want it */
-	if (p < low)
-		return low;
-	else
-		return p;
-}
-
-
-/* cv_delfini():
- *	Finish vi delete action
- */
-protected void
-cv_delfini(EditLine *el)
-{
-	int size;
-	int action = el->el_chared.c_vcmd.action;
-
-	if (action & INSERT)
-		el->el_map.current = el->el_map.key;
-
-	if (el->el_chared.c_vcmd.pos == 0)
-		/* sanity */
-		return;
-
-	size = (int)(el->el_line.cursor - el->el_chared.c_vcmd.pos);
-	if (size == 0)
-		size = 1;
-	el->el_line.cursor = el->el_chared.c_vcmd.pos;
-	if (action & YANK) {
-		if (size > 0)
-			cv_yank(el, el->el_line.cursor, size);
-		else
-			cv_yank(el, el->el_line.cursor + size, -size);
-	} else {
-		if (size > 0) {
-			c_delafter(el, size);
-			re_refresh_cursor(el);
-		} else  {
-			c_delbefore(el, -size);
-			el->el_line.cursor += size;
-		}
-	}
-	el->el_chared.c_vcmd.action = NOP;
-}
-
-
-/* cv__endword():
- *	Go to the end of this word according to vi
- */
-protected Char *
-cv__endword(Char *p, Char *high, int n, int (*wtest)(Int))
-{
-	int test;
-
-	p++;
-
-	while (n--) {
-		while ((p < high) && Isspace(*p))
-			p++;
-
-		test = (*wtest)(*p);
-		while ((p < high) && (*wtest)(*p) == test)
-			p++;
-	}
-	p--;
-	return p;
-}
-
-/* ch_init():
- *	Initialize the character editor
- */
-protected int
-ch_init(EditLine *el)
-{
-	c_macro_t *ma = &el->el_chared.c_macro;
-
-	el->el_line.buffer		= el_malloc(EL_BUFSIZ *
-	    sizeof(*el->el_line.buffer));
-	if (el->el_line.buffer == NULL)
-		return -1;
-
-	(void) memset(el->el_line.buffer, 0, EL_BUFSIZ *
-	    sizeof(*el->el_line.buffer));
-	el->el_line.cursor		= el->el_line.buffer;
-	el->el_line.lastchar		= el->el_line.buffer;
-	el->el_line.limit		= &el->el_line.buffer[EL_BUFSIZ - EL_LEAVE];
-
-	el->el_chared.c_undo.buf	= el_malloc(EL_BUFSIZ *
-	    sizeof(*el->el_chared.c_undo.buf));
-	if (el->el_chared.c_undo.buf == NULL)
-		return -1;
-	(void) memset(el->el_chared.c_undo.buf, 0, EL_BUFSIZ *
-	    sizeof(*el->el_chared.c_undo.buf));
-	el->el_chared.c_undo.len	= -1;
-	el->el_chared.c_undo.cursor	= 0;
-	el->el_chared.c_redo.buf	= el_malloc(EL_BUFSIZ *
-	    sizeof(*el->el_chared.c_redo.buf));
-	if (el->el_chared.c_redo.buf == NULL)
-		return -1;
-	el->el_chared.c_redo.pos	= el->el_chared.c_redo.buf;
-	el->el_chared.c_redo.lim	= el->el_chared.c_redo.buf + EL_BUFSIZ;
-	el->el_chared.c_redo.cmd	= ED_UNASSIGNED;
-
-	el->el_chared.c_vcmd.action	= NOP;
-	el->el_chared.c_vcmd.pos	= el->el_line.buffer;
-
-	el->el_chared.c_kill.buf	= el_malloc(EL_BUFSIZ *
-	    sizeof(*el->el_chared.c_kill.buf));
-	if (el->el_chared.c_kill.buf == NULL)
-		return -1;
-	(void) memset(el->el_chared.c_kill.buf, 0, EL_BUFSIZ *
-	    sizeof(*el->el_chared.c_kill.buf));
-	el->el_chared.c_kill.mark	= el->el_line.buffer;
-	el->el_chared.c_kill.last	= el->el_chared.c_kill.buf;
-	el->el_chared.c_resizefun	= NULL;
-	el->el_chared.c_resizearg	= NULL;
-	el->el_chared.c_aliasfun	= NULL;
-	el->el_chared.c_aliasarg	= NULL;
-
-	el->el_map.current		= el->el_map.key;
-
-	el->el_state.inputmode		= MODE_INSERT; /* XXX: save a default */
-	el->el_state.doingarg		= 0;
-	el->el_state.metanext		= 0;
-	el->el_state.argument		= 1;
-	el->el_state.lastcmd		= ED_UNASSIGNED;
-
-	ma->level	= -1;
-	ma->offset	= 0;
-	ma->macro	= el_malloc(EL_MAXMACRO * sizeof(*ma->macro));
-	if (ma->macro == NULL)
-		return -1;
-	return 0;
-}
-
-/* ch_reset():
- *	Reset the character editor
- */
-protected void
-ch_reset(EditLine *el, int mclear)
-{
-	el->el_line.cursor		= el->el_line.buffer;
-	el->el_line.lastchar		= el->el_line.buffer;
-
-	el->el_chared.c_undo.len	= -1;
-	el->el_chared.c_undo.cursor	= 0;
-
-	el->el_chared.c_vcmd.action	= NOP;
-	el->el_chared.c_vcmd.pos	= el->el_line.buffer;
-
-	el->el_chared.c_kill.mark	= el->el_line.buffer;
-
-	el->el_map.current		= el->el_map.key;
-
-	el->el_state.inputmode		= MODE_INSERT; /* XXX: save a default */
-	el->el_state.doingarg		= 0;
-	el->el_state.metanext		= 0;
-	el->el_state.argument		= 1;
-	el->el_state.lastcmd		= ED_UNASSIGNED;
-
-	el->el_history.eventno		= 0;
-
-	if (mclear)
-		ch__clearmacro(el);
-}
-
-private void
-ch__clearmacro(EditLine *el)
-{
-	c_macro_t *ma = &el->el_chared.c_macro;
-	while (ma->level >= 0)
-		el_free(ma->macro[ma->level--]);
-}
-
-/* ch_enlargebufs():
- *	Enlarge line buffer to be able to hold twice as much characters.
- *	Returns 1 if successful, 0 if not.
- */
-protected int
-ch_enlargebufs(EditLine *el, size_t addlen)
-{
-	size_t sz, newsz;
-	Char *newbuffer, *oldbuf, *oldkbuf;
-
-	sz = (size_t)(el->el_line.limit - el->el_line.buffer + EL_LEAVE);
-	newsz = sz * 2;
-	/*
-	 * If newly required length is longer than current buffer, we need
-	 * to make the buffer big enough to hold both old and new stuff.
-	 */
-	if (addlen > sz) {
-		while(newsz - sz < addlen)
-			newsz *= 2;
-	}
-
-	/*
-	 * Reallocate line buffer.
-	 */
-	newbuffer = el_realloc(el->el_line.buffer, newsz * sizeof(*newbuffer));
-	if (!newbuffer)
-		return 0;
-
-	/* zero the newly added memory, leave old data in */
-	(void) memset(&newbuffer[sz], 0, (newsz - sz) * sizeof(*newbuffer));
-	    
-	oldbuf = el->el_line.buffer;
-
-	el->el_line.buffer = newbuffer;
-	el->el_line.cursor = newbuffer + (el->el_line.cursor - oldbuf);
-	el->el_line.lastchar = newbuffer + (el->el_line.lastchar - oldbuf);
-	/* don't set new size until all buffers are enlarged */
-	el->el_line.limit  = &newbuffer[sz - EL_LEAVE];
-
-	/*
-	 * Reallocate kill buffer.
-	 */
-	newbuffer = el_realloc(el->el_chared.c_kill.buf, newsz *
-	    sizeof(*newbuffer));
-	if (!newbuffer)
-		return 0;
-
-	/* zero the newly added memory, leave old data in */
-	(void) memset(&newbuffer[sz], 0, (newsz - sz) * sizeof(*newbuffer));
-
-	oldkbuf = el->el_chared.c_kill.buf;
-
-	el->el_chared.c_kill.buf = newbuffer;
-	el->el_chared.c_kill.last = newbuffer +
-					(el->el_chared.c_kill.last - oldkbuf);
-	el->el_chared.c_kill.mark = el->el_line.buffer +
-					(el->el_chared.c_kill.mark - oldbuf);
-
-	/*
-	 * Reallocate undo buffer.
-	 */
-	newbuffer = el_realloc(el->el_chared.c_undo.buf,
-	    newsz * sizeof(*newbuffer));
-	if (!newbuffer)
-		return 0;
-
-	/* zero the newly added memory, leave old data in */
-	(void) memset(&newbuffer[sz], 0, (newsz - sz) * sizeof(*newbuffer));
-	el->el_chared.c_undo.buf = newbuffer;
-
-	newbuffer = el_realloc(el->el_chared.c_redo.buf,
-	    newsz * sizeof(*newbuffer));
-	if (!newbuffer)
-		return 0;
-	el->el_chared.c_redo.pos = newbuffer +
-			(el->el_chared.c_redo.pos - el->el_chared.c_redo.buf);
-	el->el_chared.c_redo.lim = newbuffer +
-			(el->el_chared.c_redo.lim - el->el_chared.c_redo.buf);
-	el->el_chared.c_redo.buf = newbuffer;
-	
-	if (!hist_enlargebuf(el, sz, newsz))
-		return 0;
-
-	/* Safe to set enlarged buffer size */
-	el->el_line.limit  = &el->el_line.buffer[newsz - EL_LEAVE];
-	if (el->el_chared.c_resizefun)
-		(*el->el_chared.c_resizefun)(el, el->el_chared.c_resizearg);
-	return 1;
-}
-
-/* ch_end():
- *	Free the data structures used by the editor
- */
-protected void
-ch_end(EditLine *el)
-{
-	el_free(el->el_line.buffer);
-	el->el_line.buffer = NULL;
-	el->el_line.limit = NULL;
-	el_free(el->el_chared.c_undo.buf);
-	el->el_chared.c_undo.buf = NULL;
-	el_free(el->el_chared.c_redo.buf);
-	el->el_chared.c_redo.buf = NULL;
-	el->el_chared.c_redo.pos = NULL;
-	el->el_chared.c_redo.lim = NULL;
-	el->el_chared.c_redo.cmd = ED_UNASSIGNED;
-	el_free(el->el_chared.c_kill.buf);
-	el->el_chared.c_kill.buf = NULL;
-	ch_reset(el, 1);
-	el_free(el->el_chared.c_macro.macro);
-	el->el_chared.c_macro.macro = NULL;
-}
-
-
-/* el_insertstr():
- *	Insert string at cursorI
- */
-public int
-FUN(el,insertstr)(EditLine *el, const Char *s)
-{
-	size_t len;
-
-	if (s == NULL || (len = Strlen(s)) == 0)
-		return -1;
-	if (el->el_line.lastchar + len >= el->el_line.limit) {
-		if (!ch_enlargebufs(el, len))
-			return -1;
-	}
-
-	c_insert(el, (int)len);
-	while (*s)
-		*el->el_line.cursor++ = *s++;
-	return 0;
-}
-
-
-/* el_deletestr():
- *	Delete num characters before the cursor
- */
-public void
-el_deletestr(EditLine *el, int n)
-{
-	if (n <= 0)
-		return;
-
-	if (el->el_line.cursor < &el->el_line.buffer[n])
-		return;
-
-	c_delbefore(el, n);		/* delete before dot */
-	el->el_line.cursor -= n;
-	if (el->el_line.cursor < el->el_line.buffer)
-		el->el_line.cursor = el->el_line.buffer;
-}
-
-/* el_cursor():
- *	Move the cursor to the left or the right of the current position
- */
-public int
-el_cursor(EditLine *el, int n)
-{
-	if (n == 0)
-		goto out;
-
-	el->el_line.cursor += n;
-
-	if (el->el_line.cursor < el->el_line.buffer)
-		el->el_line.cursor = el->el_line.buffer;
-	if (el->el_line.cursor > el->el_line.lastchar)
-		el->el_line.cursor = el->el_line.lastchar;
-out:
-	return (int)(el->el_line.cursor - el->el_line.buffer);
-}
-
-/* c_gets():
- *	Get a string
- */
-protected int
-c_gets(EditLine *el, Char *buf, const Char *prompt)
-{
-	Char ch;
-	ssize_t len;
-	Char *cp = el->el_line.buffer;
-
-	if (prompt) {
-		len = (ssize_t)Strlen(prompt);
-		(void)memcpy(cp, prompt, (size_t)len * sizeof(*cp));
-		cp += len;
-	}
-	len = 0;
-
-	for (;;) {
-		el->el_line.cursor = cp;
-		*cp = ' ';
-		el->el_line.lastchar = cp + 1;
-		re_refresh(el);
-
-		if (FUN(el,getc)(el, &ch) != 1) {
-			ed_end_of_file(el, 0);
-			len = -1;
-			break;
-		}
-
-		switch (ch) {
-
-		case 0010:	/* Delete and backspace */
-		case 0177:
-			if (len == 0) {
-				len = -1;
-				break;
-			}
-			cp--;
-			continue;
-
-		case 0033:	/* ESC */
-		case '\r':	/* Newline */
-		case '\n':
-			buf[len] = ch;
-			break;
-
-		default:
-			if (len >= (ssize_t)(EL_BUFSIZ - 16))
-				terminal_beep(el);
-			else {
-				buf[len++] = ch;
-				*cp++ = ch;
-			}
-			continue;
-		}
-		break;
-	}
-
-	el->el_line.buffer[0] = '\0';
-	el->el_line.lastchar = el->el_line.buffer;
-	el->el_line.cursor = el->el_line.buffer;
-	return (int)len;
-}
-
-
-/* c_hpos():
- *	Return the current horizontal position of the cursor
- */
-protected int
-c_hpos(EditLine *el)
-{
-	Char *ptr;
-
-	/*
-	 * Find how many characters till the beginning of this line.
-	 */
-	if (el->el_line.cursor == el->el_line.buffer)
-		return 0;
-	else {
-		for (ptr = el->el_line.cursor - 1;
-		     ptr >= el->el_line.buffer && *ptr != '\n';
-		     ptr--)
-			continue;
-		return (int)(el->el_line.cursor - ptr - 1);
-	}
-}
-
-protected int
-ch_resizefun(EditLine *el, el_zfunc_t f, void *a)
-{
-	el->el_chared.c_resizefun = f;
-	el->el_chared.c_resizearg = a;
-	return 0;
-}
-
-protected int
-ch_aliasfun(EditLine *el, el_afunc_t f, void *a)
-{
-	el->el_chared.c_aliasfun = f;
-	el->el_chared.c_aliasarg = a;
-	return 0;
-}
diff --git a/lib/libedit/chared.h b/lib/libedit/chared.h
deleted file mode 100644
index 6d6ef2341..000000000
--- a/lib/libedit/chared.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*	$NetBSD: chared.h,v 1.22 2014/06/18 18:12:28 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)chared.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.chared.h: Character editor interface
- */
-#ifndef _h_el_chared
-#define	_h_el_chared
-
-#include <ctype.h>
-#include <string.h>
-
-#include "histedit.h"
-
-#define	EL_MAXMACRO	10
-
-/*
- * This is an issue of basic "vi" look-and-feel. Defining VI_MOVE works
- * like real vi: i.e. the transition from command<->insert modes moves
- * the cursor.
- *
- * On the other hand we really don't want to move the cursor, because
- * all the editing commands don't include the character under the cursor.
- * Probably the best fix is to make all the editing commands aware of
- * this fact.
- */
-#define	VI_MOVE
-
-
-typedef struct c_macro_t {
-	int	  level;
-	int	  offset;
-	Char	**macro;
-} c_macro_t;
-
-/*
- * Undo information for vi - no undo in emacs (yet)
- */
-typedef struct c_undo_t {
-	ssize_t	 len;			/* length of saved line */
-	int	 cursor;		/* position of saved cursor */
-	Char	*buf;			/* full saved text */
-} c_undo_t;
-
-/* redo for vi */
-typedef struct c_redo_t {
-	Char	*buf;			/* redo insert key sequence */
-	Char	*pos;
-	Char	*lim;
-	el_action_t	cmd;		/* command to redo */
-	Char	ch;			/* char that invoked it */
-	int	count;
-	int	action;			/* from cv_action() */
-} c_redo_t;
-
-/*
- * Current action information for vi
- */
-typedef struct c_vcmd_t {
-	int	 action;
-	Char	*pos;
-} c_vcmd_t;
-
-/*
- * Kill buffer for emacs
- */
-typedef struct c_kill_t {
-	Char	*buf;
-	Char	*last;
-	Char	*mark;
-} c_kill_t;
-
-typedef void (*el_zfunc_t)(EditLine *, void *);
-typedef const char *(*el_afunc_t)(void *, const char *);
-
-/*
- * Note that we use both data structures because the user can bind
- * commands from both editors!
- */
-typedef struct el_chared_t {
-	c_undo_t	c_undo;
-	c_kill_t	c_kill;
-	c_redo_t	c_redo;
-	c_vcmd_t	c_vcmd;
-	c_macro_t	c_macro;
-	el_zfunc_t	c_resizefun;
-	el_afunc_t	c_aliasfun;
-	void *		c_resizearg;
-	void *		c_aliasarg;
-} el_chared_t;
-
-
-#define	STRQQ		"\"\""
-
-#define	isglob(a)	(strchr("*[]?", (a)) != NULL)
-
-#define	NOP		0x00
-#define	DELETE		0x01
-#define	INSERT		0x02
-#define	YANK		0x04
-
-#define	CHAR_FWD	(+1)
-#define	CHAR_BACK	(-1)
-
-#define	MODE_INSERT	0
-#define	MODE_REPLACE	1
-#define	MODE_REPLACE_1	2
-
-#include "common.h"
-#include "vi.h"
-#include "emacs.h"
-#include "search.h"
-#include "fcns.h"
-
-
-protected int	 cv__isword(Int);
-protected int	 cv__isWord(Int);
-protected void	 cv_delfini(EditLine *);
-protected Char	*cv__endword(Char *, Char *, int, int (*)(Int));
-protected int	 ce__isword(Int);
-protected void	 cv_undo(EditLine *);
-protected void	 cv_yank(EditLine *, const Char *, int);
-protected Char	*cv_next_word(EditLine*, Char *, Char *, int, int (*)(Int));
-protected Char	*cv_prev_word(Char *, Char *, int, int (*)(Int));
-protected Char	*c__next_word(Char *, Char *, int, int (*)(Int));
-protected Char	*c__prev_word(Char *, Char *, int, int (*)(Int));
-protected void	 c_insert(EditLine *, int);
-protected void	 c_delbefore(EditLine *, int);
-protected void	 c_delbefore1(EditLine *);
-protected void	 c_delafter(EditLine *, int);
-protected void	 c_delafter1(EditLine *);
-protected int	 c_gets(EditLine *, Char *, const Char *);
-protected int	 c_hpos(EditLine *);
-
-protected int	 ch_init(EditLine *);
-protected void	 ch_reset(EditLine *, int);
-protected int	 ch_resizefun(EditLine *, el_zfunc_t, void *);
-protected int	 ch_aliasfun(EditLine *, el_afunc_t, void *);
-protected int	 ch_enlargebufs(EditLine *, size_t);
-protected void	 ch_end(EditLine *);
-
-#endif /* _h_el_chared */
diff --git a/lib/libedit/chartype.c b/lib/libedit/chartype.c
deleted file mode 100644
index b780bb1c3..000000000
--- a/lib/libedit/chartype.c
+++ /dev/null
@@ -1,364 +0,0 @@
-/*	$NetBSD: chartype.c,v 1.12 2015/02/22 02:16:19 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * chartype.c: character classification and meta information
- */
-#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: chartype.c,v 1.12 2015/02/22 02:16:19 christos Exp $");
-#endif /* not lint && not SCCSID */
-#include "el.h"
-#include <stdlib.h>
-
-#define CT_BUFSIZ ((size_t)1024)
-
-#ifdef WIDECHAR
-protected int
-ct_conv_cbuff_resize(ct_buffer_t *conv, size_t csize)
-{
-	void *p;
-
-	if (csize <= conv->csize)
-		return 0;
-
-	conv->csize = csize;
-
-	p = el_realloc(conv->cbuff, conv->csize * sizeof(*conv->cbuff));
-	if (p == NULL) {
-		conv->csize = 0;
-		el_free(conv->cbuff);
-		conv->cbuff = NULL;
-		return -1;
-	}
-	conv->cbuff = p;
-	return 0;
-}
-
-protected int
-ct_conv_wbuff_resize(ct_buffer_t *conv, size_t wsize)
-{
-	void *p;
-
-	if (wsize <= conv->wsize) 
-		return 0;
-
-	conv->wsize = wsize;
-
-	p = el_realloc(conv->wbuff, conv->wsize * sizeof(*conv->wbuff));
-	if (p == NULL) {
-		conv->wsize = 0;
-		el_free(conv->wbuff);
-		conv->wbuff = NULL;
-		return -1;
-	}
-	conv->wbuff = p;
-	return 0;
-}
-
-
-public char *
-ct_encode_string(const Char *s, ct_buffer_t *conv)
-{
-	char *dst;
-	ssize_t used;
-
-	if (!s)
-		return NULL;
-
-	dst = conv->cbuff;
-	for (;;) {
-		used = (ssize_t)(dst - conv->cbuff);
-		if ((conv->csize - (size_t)used) < 5) {
-			if (ct_conv_cbuff_resize(conv,
-			    conv->csize + CT_BUFSIZ) == -1)
-				return NULL;
-			dst = conv->cbuff + used;
-		}
-		if (!*s)
-			break;
-		used = ct_encode_char(dst, (size_t)5, *s);
-		if (used == -1) /* failed to encode, need more buffer space */
-			abort();
-		++s;
-		dst += used;
-	}
-	*dst = '\0';
-	return conv->cbuff;
-}
-
-public Char *
-ct_decode_string(const char *s, ct_buffer_t *conv)
-{
-	size_t len;
-
-	if (!s)
-		return NULL;
-
-	len = ct_mbstowcs(NULL, s, (size_t)0);
-	if (len == (size_t)-1)
-		return NULL;
-
-	if (conv->wsize < ++len)
-		if (ct_conv_wbuff_resize(conv, len + CT_BUFSIZ) == -1)
-			return NULL;
-
-	ct_mbstowcs(conv->wbuff, s, conv->wsize);
-	return conv->wbuff;
-}
-
-
-protected Char **
-ct_decode_argv(int argc, const char *argv[], ct_buffer_t *conv)
-{
-	size_t bufspace;
-	int i;
-	Char *p;
-	Char **wargv;
-	ssize_t bytes;
-
-	/* Make sure we have enough space in the conversion buffer to store all
-	 * the argv strings. */
-	for (i = 0, bufspace = 0; i < argc; ++i)
-		bufspace += argv[i] ? strlen(argv[i]) + 1 : 0;
-	if (conv->wsize < ++bufspace)
-		if (ct_conv_wbuff_resize(conv, bufspace + CT_BUFSIZ) == -1)
-			return NULL;
-
-	wargv = el_malloc((size_t)argc * sizeof(*wargv));
-
-	for (i = 0, p = conv->wbuff; i < argc; ++i) {
-		if (!argv[i]) {   /* don't pass null pointers to mbstowcs */
-			wargv[i] = NULL;
-			continue;
-		} else {
-			wargv[i] = p;
-			bytes = (ssize_t)mbstowcs(p, argv[i], bufspace);
-		}
-		if (bytes == -1) {
-			el_free(wargv);
-			return NULL;
-		} else
-			bytes++;  /* include '\0' in the count */
-		bufspace -= (size_t)bytes;
-		p += bytes;
-	}
-
-	return wargv;
-}
-
-
-protected size_t
-ct_enc_width(Char c)
-{
-	/* UTF-8 encoding specific values */
-	if (c < 0x80)
-		return 1;
-	else if (c < 0x0800)
-		return 2;
-	else if (c < 0x10000)
-		return 3;
-	else if (c < 0x110000)
-		return 4;
-	else
-		return 0; /* not a valid codepoint */
-}
-
-protected ssize_t
-ct_encode_char(char *dst, size_t len, Char c)
-{
-	ssize_t l = 0;
-	if (len < ct_enc_width(c))
-		return -1;
-	l = ct_wctomb(dst, c);
-
-	if (l < 0) {
-		ct_wctomb_reset;
-		l = 0;
-	}
-	return l;
-}
-#endif
-
-protected const Char *
-ct_visual_string(const Char *s)
-{
-	static Char *buff = NULL;
-	static size_t buffsize = 0;
-	void *p;
-	Char *dst;
-	ssize_t used = 0;
-
-	if (!s)
-		return NULL;
-	if (!buff) {
-	    buffsize = CT_BUFSIZ;
-	    buff = el_malloc(buffsize * sizeof(*buff));
-	}
-	dst = buff;
-	while (*s) {
-		used = ct_visual_char(dst, buffsize - (size_t)(dst - buff), *s);
-		if (used == -1) { /* failed to encode, need more buffer space */
-			used = dst - buff;
-			buffsize += CT_BUFSIZ;
-			p = el_realloc(buff, buffsize * sizeof(*buff));
-			if (p == NULL)
-				goto out;
-			buff = p;
-			dst = buff + used;
-			/* don't increment s here - we want to retry it! */
-		}
-		else
-		    ++s;
-		dst += used;
-	}
-	if (dst >= (buff + buffsize)) { /* sigh */
-		buffsize += 1;
-		p = el_realloc(buff, buffsize * sizeof(*buff));
-		if (p == NULL)
-			goto out;
-		buff = p;
-		dst = buff + buffsize - 1;
-	}
-	*dst = 0;
-	return buff;
-out:
-	el_free(buff);
-	buffsize = 0;
-	return NULL;
-}
-
-
-
-protected int
-ct_visual_width(Char c)
-{
-	int t = ct_chr_class(c);
-	switch (t) {
-	case CHTYPE_ASCIICTL:
-		return 2; /* ^@ ^? etc. */
-	case CHTYPE_TAB:
-		return 1; /* Hmm, this really need to be handled outside! */
-	case CHTYPE_NL:
-		return 0; /* Should this be 1 instead? */
-#ifdef WIDECHAR
-	case CHTYPE_PRINT:
-		return wcwidth(c);
-	case CHTYPE_NONPRINT:
-		if (c > 0xffff) /* prefer standard 4-byte display over 5-byte */
-			return 8; /* \U+12345 */
-		else
-			return 7; /* \U+1234 */
-#else
-	case CHTYPE_PRINT:
-		return 1;
-	case CHTYPE_NONPRINT:
-		return 4; /* \123 */
-#endif
-	default:
-		return 0; /* should not happen */
-	}
-}
-
-
-protected ssize_t
-ct_visual_char(Char *dst, size_t len, Char c)
-{
-	int t = ct_chr_class(c);
-	switch (t) {
-	case CHTYPE_TAB:
-	case CHTYPE_NL:
-	case CHTYPE_ASCIICTL:
-		if (len < 2)
-			return -1;   /* insufficient space */
-		*dst++ = '^';
-		if (c == '\177')
-			*dst = '?'; /* DEL -> ^? */
-		else
-			*dst = c | 0100;    /* uncontrolify it */
-		return 2;
-	case CHTYPE_PRINT:
-		if (len < 1)
-			return -1;  /* insufficient space */
-		*dst = c;
-		return 1;
-	case CHTYPE_NONPRINT:
-		/* we only use single-width glyphs for display,
-		 * so this is right */
-		if ((ssize_t)len < ct_visual_width(c))
-			return -1;   /* insufficient space */
-#ifdef WIDECHAR
-		*dst++ = '\\';
-		*dst++ = 'U';
-		*dst++ = '+';
-#define tohexdigit(v) "0123456789ABCDEF"[v]
-		if (c > 0xffff) /* prefer standard 4-byte display over 5-byte */
-			*dst++ = tohexdigit(((unsigned int) c >> 16) & 0xf);
-		*dst++ = tohexdigit(((unsigned int) c >> 12) & 0xf);
-		*dst++ = tohexdigit(((unsigned int) c >>  8) & 0xf);
-		*dst++ = tohexdigit(((unsigned int) c >>  4) & 0xf);
-		*dst   = tohexdigit(((unsigned int) c      ) & 0xf);
-		return c > 0xffff ? 8 : 7;
-#else
-		*dst++ = '\\';
-#define tooctaldigit(v) ((v) + '0')
-		*dst++ = tooctaldigit(((unsigned int) c >> 6) & 0x7);
-		*dst++ = tooctaldigit(((unsigned int) c >> 3) & 0x7);
-		*dst++ = tooctaldigit(((unsigned int) c     ) & 0x7);
-#endif
-		/*FALLTHROUGH*/
-	/* these two should be handled outside this function */
-	default:            /* we should never hit the default */
-		return 0;
-	}
-}
-
-
-
-
-protected int
-ct_chr_class(Char c)
-{
-	if (c == '\t')
-		return CHTYPE_TAB;
-	else if (c == '\n')
-		return CHTYPE_NL;
-	else if (IsASCII(c) && Iscntrl(c))
-		return CHTYPE_ASCIICTL;
-	else if (Isprint(c))
-		return CHTYPE_PRINT;
-	else
-		return CHTYPE_NONPRINT;
-}
diff --git a/lib/libedit/chartype.h b/lib/libedit/chartype.h
deleted file mode 100644
index 18c35b99d..000000000
--- a/lib/libedit/chartype.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/*	$NetBSD: chartype.h,v 1.15 2015/05/17 13:14:41 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _h_chartype_f
-#define _h_chartype_f
-
-
-
-#ifdef WIDECHAR
-
-/* Ideally we should also test the value of the define to see if it
- * supports non-BMP code points without requiring UTF-16, but nothing
- * seems to actually advertise this properly, despite Unicode 3.1 having
- * been around since 2001... */
-#if !defined(__minix)
-#if !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) &&           \
-    !defined(__OpenBSD__) && !defined(__FreeBSD__)
-#ifndef __STDC_ISO_10646__
-/* In many places it is assumed that the first 127 code points are ASCII
- * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
- * funky encoding that could break us in weird and wonderful ways. */
-	#error wchar_t must store ISO 10646 characters
-#endif
-#endif
-#endif /* !defined(__minix) */
-
-/* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it...
- * ref: ISO/IEC DTR 19769
- */
-#if WCHAR_MAX < INT32_MAX
-#warning Build environment does not support non-BMP characters
-#endif
-
-#define ct_mbtowc            mbtowc
-#define ct_mbtowc_reset      mbtowc(0,0,(size_t)0)
-#define ct_wctomb            wctomb
-#define ct_wctomb_reset      wctomb(0,0)
-#define ct_wcstombs          wcstombs
-#define ct_mbstowcs          mbstowcs
-
-#define Char			wchar_t
-#define Int			wint_t
-#define FUN(prefix,rest)	prefix ## _w ## rest
-#define FUNW(type)		type ## _w
-#define TYPE(type)		type ## W
-#define FCHAR			"%lc"
-#define FSTR			"%ls"
-#define STR(x) 			L ## x
-#define UC(c)			c
-#define Isalpha(x)  iswalpha(x)
-#define Isalnum(x)  iswalnum(x)
-#define Isgraph(x)  iswgraph(x)
-#define Isspace(x)  iswspace(x)
-#define Isdigit(x)  iswdigit(x)
-#define Iscntrl(x)  iswcntrl(x)
-#define Isprint(x)  iswprint(x)
-
-#define Isupper(x)  iswupper(x)
-#define Islower(x)  iswlower(x)
-#define Toupper(x)  towupper(x)
-#define Tolower(x)  towlower(x)
-
-#define IsASCII(x)  (x < 0x100)
-
-#define Strlen(x)       wcslen(x)
-#define Strchr(s,c)     wcschr(s,c)
-#define Strrchr(s,c)    wcsrchr(s,c)
-#define Strstr(s,v)     wcsstr(s,v)
-#define Strdup(x)       wcsdup(x)
-#define Strcpy(d,s)     wcscpy(d,s)
-#define Strncpy(d,s,n)  wcsncpy(d,s,n)
-#define Strncat(d,s,n)  wcsncat(d,s,n)
-
-#define Strcmp(s,v)     wcscmp(s,v)
-#define Strncmp(s,v,n)  wcsncmp(s,v,n)
-#define Strcspn(s,r)    wcscspn(s,r)
-
-#define Strtol(p,e,b)   wcstol(p,e,b)
-
-static inline int
-Width(wchar_t c)
-{
-	int w = wcwidth(c);
-	return w < 0 ? 0 : w;
-}
-
-#else /* NARROW */
-
-#define ct_mbtowc            error
-#define ct_mbtowc_reset      
-#define ct_wctomb            error
-#define ct_wctomb_reset      
-#define ct_wcstombs(a, b, c)    (strncpy(a, b, c), strlen(a))
-#define ct_mbstowcs(a, b, c)    (strncpy(a, b, c), strlen(a))
-
-#define Char			char
-#define Int			int
-#define FUN(prefix,rest)	prefix ## _ ## rest
-#define FUNW(type)		type
-#define TYPE(type)		type
-#define FCHAR			"%c"
-#define FSTR			"%s"
-#define STR(x) 			x
-#define UC(c)			(unsigned char)(c)
-
-#define Isalpha(x)  isalpha((unsigned char)x)
-#define Isalnum(x)  isalnum((unsigned char)x)
-#define Isgraph(x)  isgraph((unsigned char)x)
-#define Isspace(x)  isspace((unsigned char)x)
-#define Isdigit(x)  isdigit((unsigned char)x)
-#define Iscntrl(x)  iscntrl((unsigned char)x)
-#define Isprint(x)  isprint((unsigned char)x)
-
-#define Isupper(x)  isupper((unsigned char)x)
-#define Islower(x)  islower((unsigned char)x)
-#define Toupper(x)  toupper((unsigned char)x)
-#define Tolower(x)  tolower((unsigned char)x)
-
-#define IsASCII(x)  isascii((unsigned char)x)
-
-#define Strlen(x)       strlen(x)
-#define Strchr(s,c)     strchr(s,c)
-#define Strrchr(s,c)    strrchr(s,c)
-#define Strstr(s,v)     strstr(s,v)
-#define Strdup(x)       strdup(x)
-#define Strcpy(d,s)     strcpy(d,s)
-#define Strncpy(d,s,n)  strncpy(d,s,n)
-#define Strncat(d,s,n)  strncat(d,s,n)
-
-#define Strcmp(s,v)     strcmp(s,v)
-#define Strncmp(s,v,n)  strncmp(s,v,n)
-#define Strcspn(s,r)    strcspn(s,r)
-
-#define Strtol(p,e,b)   strtol(p,e,b)
-
-#define Width(c)	1
-
-#endif
-
-
-#ifdef WIDECHAR
-/*
- * Conversion buffer
- */
-typedef struct ct_buffer_t {
-        char    *cbuff;
-        size_t  csize;
-        Char *wbuff;
-        size_t  wsize;
-} ct_buffer_t;
-
-#define ct_encode_string __ct_encode_string
-/* Encode a wide-character string and return the UTF-8 encoded result. */
-public char *ct_encode_string(const Char *, ct_buffer_t *);
-
-#define ct_decode_string __ct_decode_string
-/* Decode a (multi)?byte string and return the wide-character string result. */
-public Char *ct_decode_string(const char *, ct_buffer_t *);
-
-/* Decode a (multi)?byte argv string array.
- * The pointer returned must be free()d when done. */
-protected Char **ct_decode_argv(int, const char *[],  ct_buffer_t *);
-
-/* Resizes the conversion buffer(s) if needed. */
-protected int ct_conv_cbuff_resize(ct_buffer_t *, size_t);
-protected int ct_conv_wbuff_resize(ct_buffer_t *, size_t);
-protected ssize_t ct_encode_char(char *, size_t, Char);
-protected size_t ct_enc_width(Char);
-
-#define ct_free_argv(s)	el_free(s)
-
-#else
-#define	ct_encode_string(s, b)	(s)
-#define ct_decode_string(s, b)	(s)
-#define ct_decode_argv(l, s, b)	(s)
-#define ct_conv_cbuff_resize(b, s) ((s) == (0))
-#define ct_conv_wbuff_resize(b, s) ((s) == (0))
-#define ct_encode_char(d, l, s)	(*d = s, 1)
-#define ct_free_argv(s)
-#endif
-
-#ifndef NARROWCHAR
-/* Encode a characted into the destination buffer, provided there is sufficent
- * buffer space available. Returns the number of bytes used up (zero if the
- * character cannot be encoded, -1 if there was not enough space available). */
-
-/* The maximum buffer size to hold the most unwieldly visual representation,
- * in this case \U+nnnnn. */
-#define VISUAL_WIDTH_MAX ((size_t)8)
-
-/* The terminal is thought of in terms of X columns by Y lines. In the cases
- * where a wide character takes up more than one column, the adjacent 
- * occupied column entries will contain this faux character. */
-#define MB_FILL_CHAR ((Char)-1)
-
-/* Visual width of character c, taking into account ^? , \0177 and \U+nnnnn
- * style visual expansions. */
-protected int ct_visual_width(Char);
-
-/* Turn the given character into the appropriate visual format, matching
- * the width given by ct_visual_width(). Returns the number of characters used
- * up, or -1 if insufficient space. Buffer length is in count of Char's. */
-protected ssize_t ct_visual_char(Char *, size_t, Char);
-
-/* Convert the given string into visual format, using the ct_visual_char()
- * function. Uses a static buffer, so not threadsafe. */
-protected const Char *ct_visual_string(const Char *);
-
-
-/* printable character, use ct_visual_width() to find out display width */
-#define CHTYPE_PRINT        ( 0)
-/* control character found inside the ASCII portion of the charset */
-#define CHTYPE_ASCIICTL     (-1)
-/* a \t */
-#define CHTYPE_TAB          (-2)
-/* a \n */
-#define CHTYPE_NL           (-3)
-/* non-printable character */
-#define CHTYPE_NONPRINT     (-4)
-/* classification of character c, as one of the above defines */
-protected int ct_chr_class(Char c);
-#endif
-
-
-#endif /* _chartype_f */
diff --git a/lib/libedit/common.c b/lib/libedit/common.c
deleted file mode 100644
index 1726b0f81..000000000
--- a/lib/libedit/common.c
+++ /dev/null
@@ -1,919 +0,0 @@
-/*	$NetBSD: common.c,v 1.29 2012/03/24 20:08:43 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)common.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: common.c,v 1.29 2012/03/24 20:08:43 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * common.c: Common Editor functions
- */
-#include "el.h"
-
-/* ed_end_of_file():
- *	Indicate end of file
- *	[^D]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_end_of_file(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	re_goto_bottom(el);
-	*el->el_line.lastchar = '\0';
-	return CC_EOF;
-}
-
-
-/* ed_insert():
- *	Add character to the line
- *	Insert a character [bound to all insert keys]
- */
-protected el_action_t
-ed_insert(EditLine *el, Int c)
-{
-	int count = el->el_state.argument;
-
-	if (c == '\0')
-		return CC_ERROR;
-
-	if (el->el_line.lastchar + el->el_state.argument >=
-	    el->el_line.limit) {
-		/* end of buffer space, try to allocate more */
-		if (!ch_enlargebufs(el, (size_t) count))
-			return CC_ERROR;	/* error allocating more */
-	}
-
-	if (count == 1) {
-		if (el->el_state.inputmode == MODE_INSERT
-		    || el->el_line.cursor >= el->el_line.lastchar)
-			c_insert(el, 1);
-
-		*el->el_line.cursor++ = c;
-		re_fastaddc(el);		/* fast refresh for one char. */
-	} else {
-		if (el->el_state.inputmode != MODE_REPLACE_1)
-			c_insert(el, el->el_state.argument);
-
-		while (count-- && el->el_line.cursor < el->el_line.lastchar)
-			*el->el_line.cursor++ = c;
-		re_refresh(el);
-	}
-
-	if (el->el_state.inputmode == MODE_REPLACE_1)
-		return vi_command_mode(el, 0);
-
-	return CC_NORM;
-}
-
-
-/* ed_delete_prev_word():
- *	Delete from beginning of current word to cursor
- *	[M-^?] [^W]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_delete_prev_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *cp, *p, *kp;
-
-	if (el->el_line.cursor == el->el_line.buffer)
-		return CC_ERROR;
-
-	cp = c__prev_word(el->el_line.cursor, el->el_line.buffer,
-	    el->el_state.argument, ce__isword);
-
-	for (p = cp, kp = el->el_chared.c_kill.buf; p < el->el_line.cursor; p++)
-		*kp++ = *p;
-	el->el_chared.c_kill.last = kp;
-
-	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 */
-	return CC_REFRESH;
-}
-
-
-/* ed_delete_next_char():
- *	Delete character under cursor
- *	[^D] [x]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_delete_next_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-#ifdef DEBUG_EDIT
-#define	EL	el->el_line
-	(void) fprintf(el->el_errlfile,
-	    "\nD(b: %x(%s)  c: %x(%s) last: %x(%s) limit: %x(%s)\n",
-	    EL.buffer, EL.buffer, EL.cursor, EL.cursor, EL.lastchar,
-	    EL.lastchar, EL.limit, EL.limit);
-#endif
-	if (el->el_line.cursor == el->el_line.lastchar) {
-			/* if I'm at the end */
-		if (el->el_map.type == MAP_VI) {
-			if (el->el_line.cursor == el->el_line.buffer) {
-				/* if I'm also at the beginning */
-#ifdef KSHVI
-				return CC_ERROR;
-#else
-				/* then do an EOF */
-				terminal_writec(el, c);
-				return CC_EOF;
-#endif
-			} else {
-#ifdef KSHVI
-				el->el_line.cursor--;
-#else
-				return CC_ERROR;
-#endif
-			}
-		} else
-				return CC_ERROR;
-	}
-	c_delafter(el, el->el_state.argument);	/* delete after dot */
-	if (el->el_map.type == MAP_VI &&
-	    el->el_line.cursor >= el->el_line.lastchar &&
-	    el->el_line.cursor > el->el_line.buffer)
-			/* bounds check */
-		el->el_line.cursor = el->el_line.lastchar - 1;
-	return CC_REFRESH;
-}
-
-
-/* ed_kill_line():
- *	Cut to the end of line
- *	[^K] [^K]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_kill_line(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *kp, *cp;
-
-	cp = el->el_line.cursor;
-	kp = el->el_chared.c_kill.buf;
-	while (cp < el->el_line.lastchar)
-		*kp++ = *cp++;	/* copy it */
-	el->el_chared.c_kill.last = kp;
-			/* zap! -- delete to end */
-	el->el_line.lastchar = el->el_line.cursor;
-	return CC_REFRESH;
-}
-
-
-/* ed_move_to_end():
- *	Move cursor to the end of line
- *	[^E] [^E]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_move_to_end(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_line.cursor = el->el_line.lastchar;
-	if (el->el_map.type == MAP_VI) {
-		if (el->el_chared.c_vcmd.action != NOP) {
-			cv_delfini(el);
-			return CC_REFRESH;
-		}
-#ifdef VI_MOVE
-		el->el_line.cursor--;
-#endif
-	}
-	return CC_CURSOR;
-}
-
-
-/* ed_move_to_beg():
- *	Move cursor to the beginning of line
- *	[^A] [^A]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_move_to_beg(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_line.cursor = el->el_line.buffer;
-
-	if (el->el_map.type == MAP_VI) {
-			/* We want FIRST non space character */
-		while (Isspace(*el->el_line.cursor))
-			el->el_line.cursor++;
-		if (el->el_chared.c_vcmd.action != NOP) {
-			cv_delfini(el);
-			return CC_REFRESH;
-		}
-	}
-	return CC_CURSOR;
-}
-
-
-/* ed_transpose_chars():
- *	Exchange the character to the left of the cursor with the one under it
- *	[^T] [^T]
- */
-protected el_action_t
-ed_transpose_chars(EditLine *el, Int c)
-{
-
-	if (el->el_line.cursor < el->el_line.lastchar) {
-		if (el->el_line.lastchar <= &el->el_line.buffer[1])
-			return CC_ERROR;
-		else
-			el->el_line.cursor++;
-	}
-	if (el->el_line.cursor > &el->el_line.buffer[1]) {
-		/* must have at least two chars entered */
-		c = el->el_line.cursor[-2];
-		el->el_line.cursor[-2] = el->el_line.cursor[-1];
-		el->el_line.cursor[-1] = c;
-		return CC_REFRESH;
-	} else
-		return CC_ERROR;
-}
-
-
-/* ed_next_char():
- *	Move to the right one character
- *	[^F] [^F]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_next_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *lim = el->el_line.lastchar;
-
-	if (el->el_line.cursor >= lim ||
-	    (el->el_line.cursor == lim - 1 &&
-	    el->el_map.type == MAP_VI &&
-	    el->el_chared.c_vcmd.action == NOP))
-		return CC_ERROR;
-
-	el->el_line.cursor += el->el_state.argument;
-	if (el->el_line.cursor > lim)
-		el->el_line.cursor = lim;
-
-	if (el->el_map.type == MAP_VI)
-		if (el->el_chared.c_vcmd.action != NOP) {
-			cv_delfini(el);
-			return CC_REFRESH;
-		}
-	return CC_CURSOR;
-}
-
-
-/* ed_prev_word():
- *	Move to the beginning of the current word
- *	[M-b] [b]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_prev_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor == el->el_line.buffer)
-		return CC_ERROR;
-
-	el->el_line.cursor = c__prev_word(el->el_line.cursor,
-	    el->el_line.buffer,
-	    el->el_state.argument,
-	    ce__isword);
-
-	if (el->el_map.type == MAP_VI)
-		if (el->el_chared.c_vcmd.action != NOP) {
-			cv_delfini(el);
-			return CC_REFRESH;
-		}
-	return CC_CURSOR;
-}
-
-
-/* ed_prev_char():
- *	Move to the left one character
- *	[^B] [^B]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_prev_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor > el->el_line.buffer) {
-		el->el_line.cursor -= el->el_state.argument;
-		if (el->el_line.cursor < el->el_line.buffer)
-			el->el_line.cursor = el->el_line.buffer;
-
-		if (el->el_map.type == MAP_VI)
-			if (el->el_chared.c_vcmd.action != NOP) {
-				cv_delfini(el);
-				return CC_REFRESH;
-			}
-		return CC_CURSOR;
-	} else
-		return CC_ERROR;
-}
-
-
-/* ed_quoted_insert():
- *	Add the next character typed verbatim
- *	[^V] [^V]
- */
-protected el_action_t
-ed_quoted_insert(EditLine *el, Int c)
-{
-	int num;
-	Char tc;
-
-	tty_quotemode(el);
-	num = FUN(el,getc)(el, &tc);
-	c = tc;
-	tty_noquotemode(el);
-	if (num == 1)
-		return ed_insert(el, c);
-	else
-		return ed_end_of_file(el, 0);
-}
-
-
-/* ed_digit():
- *	Adds to argument or enters a digit
- */
-protected el_action_t
-ed_digit(EditLine *el, Int c)
-{
-
-	if (!Isdigit(c))
-		return CC_ERROR;
-
-	if (el->el_state.doingarg) {
-			/* if doing an arg, add this in... */
-		if (el->el_state.lastcmd == EM_UNIVERSAL_ARGUMENT)
-			el->el_state.argument = c - '0';
-		else {
-			if (el->el_state.argument > 1000000)
-				return CC_ERROR;
-			el->el_state.argument =
-			    (el->el_state.argument * 10) + (c - '0');
-		}
-		return CC_ARGHACK;
-	}
-
-	return ed_insert(el, c);
-}
-
-
-/* ed_argument_digit():
- *	Digit that starts argument
- *	For ESC-n
- */
-protected el_action_t
-ed_argument_digit(EditLine *el, Int c)
-{
-
-	if (!Isdigit(c))
-		return CC_ERROR;
-
-	if (el->el_state.doingarg) {
-		if (el->el_state.argument > 1000000)
-			return CC_ERROR;
-		el->el_state.argument = (el->el_state.argument * 10) +
-		    (c - '0');
-	} else {		/* else starting an argument */
-		el->el_state.argument = c - '0';
-		el->el_state.doingarg = 1;
-	}
-	return CC_ARGHACK;
-}
-
-
-/* ed_unassigned():
- *	Indicates unbound character
- *	Bound to keys that are not assigned
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_unassigned(EditLine *el __attribute__((__unused__)),
-    Int c __attribute__((__unused__)))
-{
-
-	return CC_ERROR;
-}
-
-
-/**
- ** TTY key handling.
- **/
-
-/* ed_tty_sigint():
- *	Tty interrupt character
- *	[^C]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_tty_sigint(EditLine *el __attribute__((__unused__)), 
-	      Int c __attribute__((__unused__)))
-{
-
-	return CC_NORM;
-}
-
-
-/* ed_tty_dsusp():
- *	Tty delayed suspend character
- *	[^Y]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_tty_dsusp(EditLine *el __attribute__((__unused__)), 
-	     Int c __attribute__((__unused__)))
-{
-
-	return CC_NORM;
-}
-
-
-/* ed_tty_flush_output():
- *	Tty flush output characters
- *	[^O]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_tty_flush_output(EditLine *el __attribute__((__unused__)), 
-		    Int c __attribute__((__unused__)))
-{
-
-	return CC_NORM;
-}
-
-
-/* ed_tty_sigquit():
- *	Tty quit character
- *	[^\]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_tty_sigquit(EditLine *el __attribute__((__unused__)), 
-	       Int c __attribute__((__unused__)))
-{
-
-	return CC_NORM;
-}
-
-
-/* ed_tty_sigtstp():
- *	Tty suspend character
- *	[^Z]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_tty_sigtstp(EditLine *el __attribute__((__unused__)), 
-	       Int c __attribute__((__unused__)))
-{
-
-	return CC_NORM;
-}
-
-
-/* ed_tty_stop_output():
- *	Tty disallow output characters
- *	[^S]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_tty_stop_output(EditLine *el __attribute__((__unused__)), 
-		   Int c __attribute__((__unused__)))
-{
-
-	return CC_NORM;
-}
-
-
-/* ed_tty_start_output():
- *	Tty allow output characters
- *	[^Q]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_tty_start_output(EditLine *el __attribute__((__unused__)), 
-		    Int c __attribute__((__unused__)))
-{
-
-	return CC_NORM;
-}
-
-
-/* ed_newline():
- *	Execute command
- *	[^J]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_newline(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	re_goto_bottom(el);
-	*el->el_line.lastchar++ = '\n';
-	*el->el_line.lastchar = '\0';
-	return CC_NEWLINE;
-}
-
-
-/* ed_delete_prev_char():
- *	Delete the character to the left of the cursor
- *	[^?]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_delete_prev_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor <= el->el_line.buffer)
-		return CC_ERROR;
-
-	c_delbefore(el, el->el_state.argument);
-	el->el_line.cursor -= el->el_state.argument;
-	if (el->el_line.cursor < el->el_line.buffer)
-		el->el_line.cursor = el->el_line.buffer;
-	return CC_REFRESH;
-}
-
-
-/* ed_clear_screen():
- *	Clear screen leaving current line at the top
- *	[^L]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_clear_screen(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	terminal_clear_screen(el);	/* clear the whole real screen */
-	re_clear_display(el);	/* reset everything */
-	return CC_REFRESH;
-}
-
-
-/* ed_redisplay():
- *	Redisplay everything
- *	^R
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_redisplay(EditLine *el __attribute__((__unused__)), 
-	     Int c __attribute__((__unused__)))
-{
-
-	return CC_REDISPLAY;
-}
-
-
-/* ed_start_over():
- *	Erase current line and start from scratch
- *	[^G]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_start_over(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	ch_reset(el, 0);
-	return CC_REFRESH;
-}
-
-
-/* ed_sequence_lead_in():
- *	First character in a bound sequence
- *	Placeholder for external keys
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_sequence_lead_in(EditLine *el __attribute__((__unused__)), 
-		    Int c __attribute__((__unused__)))
-{
-
-	return CC_NORM;
-}
-
-
-/* ed_prev_history():
- *	Move to the previous history line
- *	[^P] [k]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_prev_history(EditLine *el, Int c __attribute__((__unused__)))
-{
-	char beep = 0;
-	int sv_event = el->el_history.eventno;
-
-	el->el_chared.c_undo.len = -1;
-	*el->el_line.lastchar = '\0';		/* just in case */
-
-	if (el->el_history.eventno == 0) {	/* save the current buffer
-						 * away */
-		(void) Strncpy(el->el_history.buf, el->el_line.buffer,
-		    EL_BUFSIZ);
-		el->el_history.last = el->el_history.buf +
-		    (el->el_line.lastchar - el->el_line.buffer);
-	}
-	el->el_history.eventno += el->el_state.argument;
-
-	if (hist_get(el) == CC_ERROR) {
-		if (el->el_map.type == MAP_VI) {
-			el->el_history.eventno = sv_event;
-			
-		}
-		beep = 1;
-		/* el->el_history.eventno was fixed by first call */
-		(void) hist_get(el);
-	}
-	if (beep)
-		return CC_REFRESH_BEEP;
-	return CC_REFRESH;
-}
-
-
-/* ed_next_history():
- *	Move to the next history line
- *	[^N] [j]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_next_history(EditLine *el, Int c __attribute__((__unused__)))
-{
-	el_action_t beep = CC_REFRESH, rval;
-
-	el->el_chared.c_undo.len = -1;
-	*el->el_line.lastchar = '\0';	/* just in case */
-
-	el->el_history.eventno -= el->el_state.argument;
-
-	if (el->el_history.eventno < 0) {
-		el->el_history.eventno = 0;
-		beep = CC_REFRESH_BEEP;
-	}
-	rval = hist_get(el);
-	if (rval == CC_REFRESH)
-		return beep;
-	return rval;
-
-}
-
-
-/* ed_search_prev_history():
- *	Search previous in history for a line matching the current
- *	next search history [M-P] [K]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_search_prev_history(EditLine *el, Int c __attribute__((__unused__)))
-{
-	const Char *hp;
-	int h;
-	bool_t found = 0;
-
-	el->el_chared.c_vcmd.action = NOP;
-	el->el_chared.c_undo.len = -1;
-	*el->el_line.lastchar = '\0';	/* just in case */
-	if (el->el_history.eventno < 0) {
-#ifdef DEBUG_EDIT
-		(void) fprintf(el->el_errfile,
-		    "e_prev_search_hist(): eventno < 0;\n");
-#endif
-		el->el_history.eventno = 0;
-		return CC_ERROR;
-	}
-	if (el->el_history.eventno == 0) {
-		(void) Strncpy(el->el_history.buf, el->el_line.buffer,
-		    EL_BUFSIZ);
-		el->el_history.last = el->el_history.buf +
-		    (el->el_line.lastchar - el->el_line.buffer);
-	}
-	if (el->el_history.ref == NULL)
-		return CC_ERROR;
-
-	hp = HIST_FIRST(el);
-	if (hp == NULL)
-		return CC_ERROR;
-
-	c_setpat(el);		/* Set search pattern !! */
-
-	for (h = 1; h <= el->el_history.eventno; h++)
-		hp = HIST_NEXT(el);
-
-	while (hp != NULL) {
-#ifdef SDEBUG
-		(void) fprintf(el->el_errfile, "Comparing with \"%s\"\n", hp);
-#endif
-		if ((Strncmp(hp, el->el_line.buffer, (size_t)
-			    (el->el_line.lastchar - el->el_line.buffer)) ||
-			hp[el->el_line.lastchar - el->el_line.buffer]) &&
-		    c_hmatch(el, hp)) {
-			found++;
-			break;
-		}
-		h++;
-		hp = HIST_NEXT(el);
-	}
-
-	if (!found) {
-#ifdef SDEBUG
-		(void) fprintf(el->el_errfile, "not found\n");
-#endif
-		return CC_ERROR;
-	}
-	el->el_history.eventno = h;
-
-	return hist_get(el);
-}
-
-
-/* ed_search_next_history():
- *	Search next in history for a line matching the current
- *	[M-N] [J]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_search_next_history(EditLine *el, Int c __attribute__((__unused__)))
-{
-	const Char *hp;
-	int h;
-	bool_t found = 0;
-
-	el->el_chared.c_vcmd.action = NOP;
-	el->el_chared.c_undo.len = -1;
-	*el->el_line.lastchar = '\0';	/* just in case */
-
-	if (el->el_history.eventno == 0)
-		return CC_ERROR;
-
-	if (el->el_history.ref == NULL)
-		return CC_ERROR;
-
-	hp = HIST_FIRST(el);
-	if (hp == NULL)
-		return CC_ERROR;
-
-	c_setpat(el);		/* Set search pattern !! */
-
-	for (h = 1; h < el->el_history.eventno && hp; h++) {
-#ifdef SDEBUG
-		(void) fprintf(el->el_errfile, "Comparing with \"%s\"\n", hp);
-#endif
-		if ((Strncmp(hp, el->el_line.buffer, (size_t)
-			    (el->el_line.lastchar - el->el_line.buffer)) ||
-			hp[el->el_line.lastchar - el->el_line.buffer]) &&
-		    c_hmatch(el, hp))
-			found = h;
-		hp = HIST_NEXT(el);
-	}
-
-	if (!found) {		/* is it the current history number? */
-		if (!c_hmatch(el, el->el_history.buf)) {
-#ifdef SDEBUG
-			(void) fprintf(el->el_errfile, "not found\n");
-#endif
-			return CC_ERROR;
-		}
-	}
-	el->el_history.eventno = found;
-
-	return hist_get(el);
-}
-
-
-/* ed_prev_line():
- *	Move up one line
- *	Could be [k] [^p]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_prev_line(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *ptr;
-	int nchars = c_hpos(el);
-
-	/*
-         * Move to the line requested
-         */
-	if (*(ptr = el->el_line.cursor) == '\n')
-		ptr--;
-
-	for (; ptr >= el->el_line.buffer; ptr--)
-		if (*ptr == '\n' && --el->el_state.argument <= 0)
-			break;
-
-	if (el->el_state.argument > 0)
-		return CC_ERROR;
-
-	/*
-         * Move to the beginning of the line
-         */
-	for (ptr--; ptr >= el->el_line.buffer && *ptr != '\n'; ptr--)
-		continue;
-
-	/*
-         * Move to the character requested
-         */
-	for (ptr++;
-	    nchars-- > 0 && ptr < el->el_line.lastchar && *ptr != '\n';
-	    ptr++)
-		continue;
-
-	el->el_line.cursor = ptr;
-	return CC_CURSOR;
-}
-
-
-/* ed_next_line():
- *	Move down one line
- *	Could be [j] [^n]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_next_line(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *ptr;
-	int nchars = c_hpos(el);
-
-	/*
-         * Move to the line requested
-         */
-	for (ptr = el->el_line.cursor; ptr < el->el_line.lastchar; ptr++)
-		if (*ptr == '\n' && --el->el_state.argument <= 0)
-			break;
-
-	if (el->el_state.argument > 0)
-		return CC_ERROR;
-
-	/*
-         * Move to the character requested
-         */
-	for (ptr++;
-	    nchars-- > 0 && ptr < el->el_line.lastchar && *ptr != '\n';
-	    ptr++)
-		continue;
-
-	el->el_line.cursor = ptr;
-	return CC_CURSOR;
-}
-
-
-/* ed_command():
- *	Editline extended command
- *	[M-X] [:]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_command(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char tmpbuf[EL_BUFSIZ];
-	int tmplen;
-
-	tmplen = c_gets(el, tmpbuf, STR("\n: "));
-	terminal__putc(el, '\n');
-
-	if (tmplen < 0 || (tmpbuf[tmplen] = 0, parse_line(el, tmpbuf)) == -1)
-		terminal_beep(el);
-
-	el->el_map.current = el->el_map.key;
-	re_clear_display(el);
-	return CC_REFRESH;
-}
diff --git a/lib/libedit/config.h b/lib/libedit/config.h
deleted file mode 100644
index d5cb57a6a..000000000
--- a/lib/libedit/config.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if the `closedir' function returns void instead of `int'. */
-/* #undef CLOSEDIR_VOID */
-
-/* Define to 1 if you have the <curses.h> header file. */
-#define HAVE_CURSES_H 1
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the `endpwent' function. */
-#define HAVE_ENDPWENT 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `fgetln' function. */
-#define HAVE_FGETLN 1
-
-/* Define to 1 if you have the `fork' function. */
-#define HAVE_FORK 1
-
-/* Define to 1 if you have getpwnam_r and getpwuid_r that are draft POSIX.1
-   versions. */
-/* #undef HAVE_GETPW_R_DRAFT */
-
-/* Define to 1 if you have getpwnam_r and getpwuid_r that are POSIX.1
-   compatible. */
-#define HAVE_GETPW_R_POSIX 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `isascii' function. */
-#define HAVE_ISASCII 1
-
-/* Define to 1 if you have the `issetugid' function. */
-#define HAVE_ISSETUGID 1
-
-/* Define to 1 if you have the `curses' library (-lcurses). */
-/* #undef HAVE_LIBCURSES */
-
-/* Define to 1 if you have the `ncurses' library (-lncurses). */
-/* #undef HAVE_LIBNCURSES */
-
-/* Define to 1 if you have the `termcap' library (-ltermcap). */
-/* #undef HAVE_LIBTERMCAP */
-
-/* Define to 1 if you have the `terminfo' library (-lterminfo). */
-#define HAVE_LIBTERMINFO 1
-
-/* Define to 1 if you have the `termlib' library (-ltermlib). */
-/* #undef HAVE_LIBTERMLIB */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define to 1 if you have the `memchr' function. */
-#define HAVE_MEMCHR 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the <ncurses.h> header file. */
-/* #undef HAVE_NCURSES_H */
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the `regcomp' function. */
-#define HAVE_REGCOMP 1
-
-/* Define to 1 if you have the `re_comp' function. */
-/* #undef HAVE_RE_COMP */
-
-/* Define to 1 if `stat' has the bug that it succeeds when given the
-   zero-length file name argument. */
-/* #undef HAVE_STAT_EMPTY_STRING_BUG */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#define HAVE_STRCASECMP 1
-
-/* Define to 1 if you have the `strchr' function. */
-#define HAVE_STRCHR 1
-
-/* Define to 1 if you have the `strcspn' function. */
-#define HAVE_STRCSPN 1
-
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strlcat' function. */
-#define HAVE_STRLCAT 1
-
-/* Define to 1 if you have the `strlcpy' function. */
-#define HAVE_STRLCPY 1
-
-/* Define to 1 if you have the `strrchr' function. */
-#define HAVE_STRRCHR 1
-
-/* Define to 1 if you have the `strstr' function. */
-#define HAVE_STRSTR 1
-
-/* Define to 1 if you have the `strtol' function. */
-#define HAVE_STRTOL 1
-
-/* Define to 1 if struct dirent has member d_namlen */
-#define HAVE_STRUCT_DIRENT_D_NAMLEN 1
-
-/* Define to 1 if you have the `strunvis' function. */
-#define HAVE_STRUNVIS 1
-
-/* Define to 1 if you have the `strvis' function. */
-#define HAVE_STRVIS 1
-
-/* Define to 1 if you have the <sys/cdefs.h> header file. */
-#define HAVE_SYS_CDEFS_H 1
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* 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
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#define HAVE_SYS_WAIT_H 1
-
-/* Define to 1 if you have the <termcap.h> header file. */
-#define HAVE_TERMCAP_H 1
-
-/* Define to 1 if you have the <term.h> header file. */
-#define HAVE_TERM_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if the system has the type `u_int32_t'. */
-#define HAVE_U_INT32_T 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 if you have the `vis' function. */
-#define HAVE_VIS 1
-
-/* Define to 1 if you have the `wcsdup' function. */
-#define HAVE_WCSDUP 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 `lstat' dereferences a symlink specified with a trailing
-   slash. */
-#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "libedit-20110729"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "libedit"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libedit 3.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libedit-20110729"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "3.0"
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-
-/* Version number of package */
-#define VERSION "3.0"
-
-/* Define to 1 if you want wide-character code */
-/* #undef WIDECHAR */
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* 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 as `fork' if `vfork' does not work. */
-/* #undef vfork */
-
-
-#include "sys.h"
-/* #undef SCCSID */
-/* #undef LIBC_SCCS */
-/* #undef lint */
-
diff --git a/lib/libedit/editline.3 b/lib/libedit/editline.3
deleted file mode 100644
index 02a986f8b..000000000
--- a/lib/libedit/editline.3
+++ /dev/null
@@ -1,930 +0,0 @@
-.\"	$NetBSD: editline.3,v 1.84 2014/12/25 13:39:41 wiz Exp $
-.\"
-.\" Copyright (c) 1997-2014 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This file was contributed to The NetBSD Foundation by Luke Mewburn.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd December 25, 2014
-.Dt EDITLINE 3
-.Os
-.Sh NAME
-.Nm editline ,
-.Nm el_init ,
-.Nm el_init_fd ,
-.Nm el_end ,
-.Nm el_reset ,
-.Nm el_gets ,
-.Nm el_wgets ,
-.Nm el_getc ,
-.Nm el_wgetc ,
-.Nm el_push ,
-.Nm el_wpush ,
-.Nm el_parse ,
-.Nm el_wparse ,
-.Nm el_set ,
-.Nm el_wset ,
-.Nm el_get ,
-.Nm el_wget ,
-.Nm el_source ,
-.Nm el_resize ,
-.Nm el_cursor ,
-.Nm el_line ,
-.Nm el_wline ,
-.Nm el_insertstr ,
-.Nm el_winsertstr ,
-.Nm el_deletestr ,
-.Nm el_wdeletestr ,
-.Nm history_init ,
-.Nm history_winit ,
-.Nm history_end ,
-.Nm history_wend ,
-.Nm history ,
-.Nm history_w ,
-.Nm tok_init ,
-.Nm tok_winit ,
-.Nm tok_end ,
-.Nm tok_wend ,
-.Nm tok_reset ,
-.Nm tok_wreset ,
-.Nm tok_line ,
-.Nm tok_wline ,
-.Nm tok_str
-.Nm tok_wstr
-.Nd line editor, history and tokenization functions
-.Sh LIBRARY
-.Lb libedit
-.Sh SYNOPSIS
-.In histedit.h
-.Ft EditLine *
-.Fn el_init "const char *prog" "FILE *fin" "FILE *fout" "FILE *ferr"
-.Ft EditLine *
-.Fn el_init_fd "const char *prog" "FILE *fin" "FILE *fout" "FILE *ferr" "int fdin" "int fdout" "int fderr"
-.Ft void
-.Fn el_end "EditLine *e"
-.Ft void
-.Fn el_reset "EditLine *e"
-.Ft const char *
-.Fn el_gets "EditLine *e" "int *count"
-.Ft const wchar_t *
-.Fn el_wgets "EditLine *e" "int *count"
-.Ft int
-.Fn el_getc "EditLine *e" "char *ch"
-.Ft int
-.Fn el_wgetc "EditLine *e" "wchar_t *ch"
-.Ft void
-.Fn el_push "EditLine *e" "const char *str"
-.Ft void
-.Fn el_wpush "EditLine *e" "const wchar_t *str"
-.Ft int
-.Fn el_parse "EditLine *e" "int argc" "const char *argv[]"
-.Ft int
-.Fn el_wparse "EditLine *e" "int argc" "const wchar_t *argv[]"
-.Ft int
-.Fn el_set "EditLine *e" "int op" "..."
-.Ft int
-.Fn el_wset "EditLine *e" "int op" "..."
-.Ft int
-.Fn el_get "EditLine *e" "int op" "..."
-.Ft int
-.Fn el_wget "EditLine *e" "int op" "..."
-.Ft int
-.Fn el_source "EditLine *e" "const char *file"
-.Ft void
-.Fn el_resize "EditLine *e"
-.Fn int
-.Fn el_cursor "EditLine *e" "int count"
-.Ft const LineInfo *
-.Fn el_line "EditLine *e"
-.Ft const LineInfoW *
-.Fn el_wline "EditLine *e"
-.Ft int
-.Fn el_insertstr "EditLine *e" "const char *str"
-.Ft int
-.Fn el_winsertstr "EditLine *e" "const wchar_t *str"
-.Ft void
-.Fn el_deletestr "EditLine *e" "int count"
-.Ft void
-.Fn el_wdeletestr "EditLine *e" "int count"
-.Ft History *
-.Fn history_init
-.Ft HistoryW *
-.Fn history_winit
-.Ft void
-.Fn history_end "History *h"
-.Ft void
-.Fn history_wend "HistoryW *h"
-.Ft int
-.Fn history "History *h" "HistEvent *ev" "int op" "..."
-.Ft int
-.Fn history_w "HistoryW *h" "HistEventW *ev" "int op" "..."
-.Ft Tokenizer *
-.Fn tok_init "const char *IFS"
-.Ft TokenizerW *
-.Fn tok_winit "const wchar_t *IFS"
-.Ft void
-.Fn tok_end "Tokenizer *t"
-.Ft void
-.Fn tok_wend "TokenizerW *t"
-.Ft void
-.Fn tok_reset "Tokenizer *t"
-.Ft void
-.Fn tok_wreset "TokenizerW *t"
-.Ft int
-.Fn tok_line "Tokenizer *t" "const LineInfo *li" "int *argc" "const char **argv[]" "int *cursorc" "int *cursoro"
-.Ft int
-.Fn tok_wline "TokenizerW *t" "const LineInfoW *li" "int *argc" "const wchar_t **argv[]" "int *cursorc" "int *cursoro"
-.Ft int
-.Fn tok_str "Tokenizer *t" "const char *str" "int *argc" "const char **argv[]"
-.Ft int
-.Fn tok_wstr "TokenizerW *t" "const wchar_t *str" "int *argc" "const wchar_t **argv[]"
-.Sh DESCRIPTION
-The
-.Nm
-library provides generic line editing, history and tokenization functions,
-similar to those found in
-.Xr sh 1 .
-.Pp
-These functions are available in the
-.Nm libedit
-library (which needs the
-.Nm libtermcap
-library).
-Programs should be linked with
-.Fl ledit ltermcap .
-.Sh LINE EDITING FUNCTIONS
-The line editing functions use a common data structure,
-.Fa EditLine ,
-which is created by
-.Fn el_init
-or
-.Fn el_init_fd
-and freed by
-.Fn el_end .
-.Pp
-The wide-character functions behave the same way as their narrow
-counterparts.
-.Pp
-The following functions are available:
-.Bl -tag -width 4n
-.It Fn el_init
-Initialise the line editor, and return a data structure
-to be used by all other line editing functions, or
-.Dv NULL
-on failure.
-.Fa prog
-is the name of the invoking program, used when reading the
-.Xr editrc 5
-file to determine which settings to use.
-.Fa fin ,
-.Fa fout
-and
-.Fa ferr
-are the input, output, and error streams (respectively) to use.
-In this documentation, references to
-.Dq the tty
-are actually to this input/output stream combination.
-.It Fn el_init_fd
-Like
-.Fn el_init
-but allows specifying file descriptors for the
-.Xr stdio 3
-corresponding streams, in case those were created with
-.Xr funopen 3 .
-.It Fn el_end
-Clean up and finish with
-.Fa e ,
-assumed to have been created with
-.Fn el_init
-or
-.Fn el_init_fd .
-.It Fn el_reset
-Reset the tty and the parser.
-This should be called after an error which may have upset the tty's
-state.
-.It Fn el_gets
-Read a line from the tty.
-.Fa count
-is modified to contain the number of characters read.
-Returns the line read if successful, or
-.Dv NULL
-if no characters were read or if an error occurred.
-If an error occurred,
-.Fa count
-is set to \-1 and
-.Dv errno
-contains the error code that caused it.
-The return value may not remain valid across calls to
-.Fn el_gets
-and must be copied if the data is to be retained.
-.It Fn el_getc
-Read a character from the tty.
-.Fa ch
-is modified to contain the character read.
-Returns the number of characters read if successful, \-1 otherwise,
-in which case
-.Dv errno
-can be inspected for the cause.
-.It Fn el_push
-Pushes
-.Fa str
-back onto the input stream.
-This is used by the macro expansion mechanism.
-Refer to the description of
-.Ic bind
-.Fl s
-in
-.Xr editrc 5
-for more information.
-.It Fn el_parse
-Parses the
-.Fa argv
-array (which is
-.Fa argc
-elements in size)
-to execute builtin
-.Nm
-commands.
-If the command is prefixed with
-.Dq prog :
-then
-.Fn el_parse
-will only execute the command if
-.Dq prog
-matches the
-.Fa prog
-argument supplied to
-.Fn el_init .
-The return value is
-\-1 if the command is unknown,
-0 if there was no error or
-.Dq prog
-didn't match, or
-1 if the command returned an error.
-Refer to
-.Xr editrc 5
-for more information.
-.It Fn el_set
-Set
-.Nm
-parameters.
-.Fa op
-determines which parameter to set, and each operation has its
-own parameter list.
-Returns 0 on success, \-1 on failure.
-.Pp
-The following values for
-.Fa op
-are supported, along with the required argument list:
-.Bl -tag -width 4n
-.It Dv EL_PROMPT , Fa "char *(*f)(EditLine *)"
-Define prompt printing function as
-.Fa f ,
-which is to return a string that contains the prompt.
-.It Dv EL_PROMPT_ESC , Fa "char *(*f)(EditLine *)" , Fa "char c"
-Same as
-.Dv EL_PROMPT ,
-but the
-.Fa c
-argument indicates the start/stop literal prompt character.
-.Pp
-If a start/stop literal character is found in the prompt, the
-character itself
-is not printed, but characters after it are printed directly to the
-terminal without affecting the state of the current line.
-A subsequent second start/stop literal character ends this behavior.
-This is typically used to embed literal escape sequences that change the
-color/style of the terminal in the prompt.
-.Dv 0
-unsets it.
-.It Dv EL_REFRESH
-Re-display the current line on the next terminal line.
-.It Dv EL_RPROMPT , Fa "char *(*f)(EditLine *)"
-Define right side prompt printing function as
-.Fa f ,
-which is to return a string that contains the prompt.
-.It Dv EL_RPROMPT_ESC , Fa "char *(*f)(EditLine *)" , Fa "char c"
-Define the right prompt printing function but with a literal escape character.
-.It Dv EL_TERMINAL , Fa "const char *type"
-Define terminal type of the tty to be
-.Fa type ,
-or to
-.Ev TERM
-if
-.Fa type
-is
-.Dv NULL .
-.It Dv EL_EDITOR , Fa "const char *mode"
-Set editing mode to
-.Fa mode ,
-which must be one of
-.Dq emacs
-or
-.Dq vi .
-.It Dv EL_SIGNAL , Fa "int flag"
-If
-.Fa flag
-is non-zero,
-.Nm
-will install its own signal handler for the following signals when
-reading command input:
-.Dv SIGCONT ,
-.Dv SIGHUP ,
-.Dv SIGINT ,
-.Dv SIGQUIT ,
-.Dv SIGSTOP ,
-.Dv SIGTERM ,
-.Dv SIGTSTP ,
-and
-.Dv SIGWINCH .
-Otherwise, the current signal handlers will be used.
-.It Dv EL_BIND , Fa "const char *" , Fa "..." , Dv NULL
-Perform the
-.Ic bind
-builtin command.
-Refer to
-.Xr editrc 5
-for more information.
-.It Dv EL_ECHOTC , Fa "const char *" , Fa "..." , Dv NULL
-Perform the
-.Ic echotc
-builtin command.
-Refer to
-.Xr editrc 5
-for more information.
-.It Dv EL_SETTC , Fa "const char *" , Fa "..." , Dv NULL
-Perform the
-.Ic settc
-builtin command.
-Refer to
-.Xr editrc 5
-for more information.
-.It Dv EL_SETTY , Fa "const char *" , Fa "..." , Dv NULL
-Perform the
-.Ic setty
-builtin command.
-Refer to
-.Xr editrc 5
-for more information.
-.It Dv EL_TELLTC , Fa "const char *" , Fa "..." , Dv NULL
-Perform the
-.Ic telltc
-builtin command.
-Refer to
-.Xr editrc 5
-for more information.
-.It Dv EL_ADDFN , Fa "const char *name" , Fa "const char *help" , \
-Fa "unsigned char (*func)(EditLine *e, int ch)"
-Add a user defined function,
-.Fn func ,
-referred to as
-.Fa name
-which is invoked when a key which is bound to
-.Fa name
-is entered.
-.Fa help
-is a description of
-.Fa name .
-At invocation time,
-.Fa ch
-is the key which caused the invocation.
-The return value of
-.Fn func
-should be one of:
-.Bl -tag -width "CC_REDISPLAY"
-.It Dv CC_NORM
-Add a normal character.
-.It Dv CC_NEWLINE
-End of line was entered.
-.It Dv CC_EOF
-EOF was entered.
-.It Dv CC_ARGHACK
-Expecting further command input as arguments, do nothing visually.
-.It Dv CC_REFRESH
-Refresh display.
-.It Dv CC_REFRESH_BEEP
-Refresh display, and beep.
-.It Dv CC_CURSOR
-Cursor moved, so update and perform
-.Dv CC_REFRESH .
-.It Dv CC_REDISPLAY
-Redisplay entire input line.
-This is useful if a key binding outputs extra information.
-.It Dv CC_ERROR
-An error occurred.
-Beep, and flush tty.
-.It Dv CC_FATAL
-Fatal error, reset tty to known state.
-.El
-.It Dv EL_HIST , Fa "History *(*func)(History *, int op, ...)" , \
-Fa "const char *ptr"
-Defines which history function to use, which is usually
-.Fn history .
-.Fa ptr
-should be the value returned by
-.Fn history_init .
-.It Dv EL_EDITMODE , Fa "int flag"
-If
-.Fa flag
-is non-zero,
-editing is enabled (the default).
-Note that this is only an indication, and does not
-affect the operation of
-.Nm .
-At this time, it is the caller's responsibility to
-check this
-(using
-.Fn el_get )
-to determine if editing should be enabled or not.
-.It Dv EL_UNBUFFERED , Fa "int flag"
-If
-.Fa flag
-is zero,
-unbuffered mode is disabled (the default).
-In unbuffered mode,
-.Fn el_gets
-will return immediately after processing a single character.
-.It Dv EL_GETCFN , Fa "int (*f)(EditLine *, char *c)"
-Define the character reading function as
-.Fa f ,
-which is to return the number of characters read and store them in
-.Fa c .
-This function is called internally by
-.Fn el_gets
-and
-.Fn el_getc .
-The builtin function can be set or restored with the special function
-name
-.Dq Dv EL_BUILTIN_GETCFN .
-.It Dv EL_CLIENTDATA , Fa "void *data"
-Register
-.Fa data
-to be associated with this EditLine structure.
-It can be retrieved with the corresponding
-.Fn el_get
-call.
-.It Dv EL_SETFP , Fa "int fd" , Fa "FILE *fp"
-Set the current
-.Nm editline
-file pointer for
-.Dq input
-.Fa fd
-=
-.Dv 0 ,
-.Dq output
-.Fa fd
-=
-.Dv 1 ,
-or
-.Dq error
-.Fa fd
-=
-.Dv 2
-from
-.Fa fp .
-.El
-.It Fn el_get
-Get
-.Nm
-parameters.
-.Fa op
-determines which parameter to retrieve into
-.Fa result .
-Returns 0 if successful, \-1 otherwise.
-.Pp
-The following values for
-.Fa op
-are supported, along with actual type of
-.Fa result :
-.Bl -tag -width 4n
-.It Dv EL_PROMPT , Fa "char *(*f)(EditLine *)" , Fa "char *c"
-Return a pointer to the function that displays the prompt in
-.Fa f .
-If
-.Fa c
-is not
-.Dv NULL ,
-return the start/stop literal prompt character in it.
-.It Dv EL_RPROMPT , Fa "char *(*f)(EditLine *)" , Fa "char *c"
-Return a pointer to the function that displays the prompt in
-.Fa f .
-If
-.Fa c
-is not
-.Dv NULL ,
-return the start/stop literal prompt character in it.
-.It Dv EL_EDITOR , Fa "const char **"
-Return the name of the editor, which will be one of
-.Dq emacs
-or
-.Dq vi .
-.It Dv EL_GETTC , Fa "const char *name" , Fa "void *value"
-Return non-zero if
-.Fa name
-is a valid
-.Xr termcap 5
-capability
-and set
-.Fa value
-to the current value of that capability.
-.It Dv EL_SIGNAL , Fa "int *"
-Return non-zero if
-.Nm
-has installed private signal handlers (see
-.Fn el_get
-above).
-.It Dv EL_EDITMODE , Fa "int *"
-Return non-zero if editing is enabled.
-.It Dv EL_GETCFN , Fa "int (**f)(EditLine *, char *)"
-Return a pointer to the function that read characters, which is equal to
-.Dq Dv EL_BUILTIN_GETCFN
-in the case of the default builtin function.
-.It Dv EL_CLIENTDATA , Fa "void **data"
-Retrieve
-.Fa data
-previously registered with the corresponding
-.Fn el_set
-call.
-.It Dv EL_UNBUFFERED , Fa "int"
-Return non-zero if unbuffered mode is enabled.
-.It Dv EL_PREP_TERM , Fa "int"
-Sets or clears terminal editing mode.
-.It Dv EL_GETFP , Fa "int fd", Fa "FILE **fp"
-Return in
-.Fa fp
-the current
-.Nm editline
-file pointer for
-.Dq input
-.Fa fd
-=
-.Dv 0 ,
-.Dq output
-.Fa fd
-=
-.Dv 1 ,
-or
-.Dq error
-.Fa fd
-=
-.Dv 2 .
-.El
-.It Fn el_source
-Initialise
-.Nm
-by reading the contents of
-.Fa file .
-.Fn el_parse
-is called for each line in
-.Fa file .
-If
-.Fa file
-is
-.Dv NULL ,
-try
-.Pa $HOME/.editrc .
-Refer to
-.Xr editrc 5
-for details on the format of
-.Fa file .
-.Fn el_source
-returns 0 on success and \-1 on error.
-.It Fn el_resize
-Must be called if the terminal size changes.
-If
-.Dv EL_SIGNAL
-has been set with
-.Fn el_set ,
-then this is done automatically.
-Otherwise, it's the responsibility of the application to call
-.Fn el_resize
-on the appropriate occasions.
-.It Fn el_cursor
-Move the cursor to the right (if positive) or to the left (if negative)
-.Fa count
-characters.
-Returns the resulting offset of the cursor from the beginning of the line.
-.It Fn el_line
-Return the editing information for the current line in a
-.Fa LineInfo
-structure, which is defined as follows:
-.Bd -literal
-typedef struct lineinfo {
-    const char *buffer;    /* address of buffer */
-    const char *cursor;    /* address of cursor */
-    const char *lastchar;  /* address of last character */
-} LineInfo;
-.Ed
-.Pp
-.Fa buffer
-is not NUL terminated.
-This function may be called after
-.Fn el_gets
-to obtain the
-.Fa LineInfo
-structure pertaining to line returned by that function,
-and from within user defined functions added with
-.Dv EL_ADDFN .
-.It Fn el_insertstr
-Insert
-.Fa str
-into the line at the cursor.
-Returns \-1 if
-.Fa str
-is empty or won't fit, and 0 otherwise.
-.It Fn el_deletestr
-Delete
-.Fa count
-characters before the cursor.
-.El
-.Sh HISTORY LIST FUNCTIONS
-The history functions use a common data structure,
-.Fa History ,
-which is created by
-.Fn history_init
-and freed by
-.Fn history_end .
-.Pp
-The following functions are available:
-.Bl -tag -width 4n
-.It Fn history_init
-Initialise the history list, and return a data structure
-to be used by all other history list functions, or
-.Dv NULL
-on failure.
-.It Fn history_end
-Clean up and finish with
-.Fa h ,
-assumed to have been created with
-.Fn history_init .
-.It Fn history
-Perform operation
-.Fa op
-on the history list, with optional arguments as needed by the
-operation.
-.Fa ev
-is changed accordingly to operation.
-The following values for
-.Fa op
-are supported, along with the required argument list:
-.Bl -tag -width 4n
-.It Dv H_SETSIZE , Fa "int size"
-Set size of history to
-.Fa size
-elements.
-.It Dv H_GETSIZE
-Get number of events currently in history.
-.It Dv H_END
-Cleans up and finishes with
-.Fa h ,
-assumed to be created with
-.Fn history_init .
-.It Dv H_CLEAR
-Clear the history.
-.It Dv H_FUNC , Fa "void *ptr" , Fa "history_gfun_t first" , \
-Fa "history_gfun_t next" , Fa "history_gfun_t last" , \
-Fa "history_gfun_t prev" , Fa "history_gfun_t curr" , \
-Fa "history_sfun_t set" , Fa "history_vfun_t clear" , \
-Fa "history_efun_t enter" , Fa "history_efun_t add"
-Define functions to perform various history operations.
-.Fa ptr
-is the argument given to a function when it's invoked.
-.It Dv H_FIRST
-Return the first element in the history.
-.It Dv H_LAST
-Return the last element in the history.
-.It Dv H_PREV
-Return the previous element in the history.
-.It Dv H_NEXT
-Return the next element in the history.
-.It Dv H_CURR
-Return the current element in the history.
-.It Dv H_SET
-Set the cursor to point to the requested element.
-.It Dv H_ADD , Fa "const char *str"
-Append
-.Fa str
-to the current element of the history, or perform the
-.Dv H_ENTER
-operation with argument
-.Fa str
-if there is no current element.
-.It Dv H_APPEND , Fa "const char *str"
-Append
-.Fa str
-to the last new element of the history.
-.It Dv H_ENTER , Fa "const char *str"
-Add
-.Fa str
-as a new element to the history, and, if necessary,
-removing the oldest entry to keep the list to the created size.
-If
-.Dv H_SETUNIQUE
-has been called with a non-zero argument, the element
-will not be entered into the history if its contents match
-the ones of the current history element.
-If the element is entered
-.Fn history
-returns 1; if it is ignored as a duplicate returns 0.
-Finally
-.Fn history
-returns \-1 if an error occurred.
-.It Dv H_PREV_STR , Fa "const char *str"
-Return the closest previous event that starts with
-.Fa str .
-.It Dv H_NEXT_STR , Fa "const char *str"
-Return the closest next event that starts with
-.Fa str .
-.It Dv H_PREV_EVENT , Fa "int e"
-Return the previous event numbered
-.Fa e .
-.It Dv H_NEXT_EVENT , Fa "int e"
-Return the next event numbered
-.Fa e .
-.It Dv H_LOAD , Fa "const char *file"
-Load the history list stored in
-.Fa file .
-.It Dv H_SAVE , Fa "const char *file"
-Save the history list to
-.Fa file .
-.It Dv H_SAVE_FP , Fa "FILE *fp"
-Save the history list to the opened
-.Ft FILE
-pointer
-.Fa fp .
-.It Dv H_SETUNIQUE , Fa "int unique"
-Set flag that adjacent identical event strings should not be entered
-into the history.
-.It Dv H_GETUNIQUE
-Retrieve the current setting if adjacent identical elements should
-be entered into the history.
-.It Dv H_DEL , Fa "int e"
-Delete the event numbered
-.Fa e .
-This function is only provided for
-.Xr readline 3
-compatibility.
-The caller is responsible for free'ing the string in the returned
-.Fa HistEvent .
-.El
-.Pp
-.Fn history
-returns \*[Gt]= 0 if the operation
-.Fa op
-succeeds.
-Otherwise, \-1 is returned and
-.Fa ev
-is updated to contain more details about the error.
-.El
-.Sh TOKENIZATION FUNCTIONS
-The tokenization functions use a common data structure,
-.Fa Tokenizer ,
-which is created by
-.Fn tok_init
-and freed by
-.Fn tok_end .
-.Pp
-The following functions are available:
-.Bl -tag -width 4n
-.It Fn tok_init
-Initialise the tokenizer, and return a data structure
-to be used by all other tokenizer functions.
-.Fa IFS
-contains the Input Field Separators, which defaults to
-.Aq space ,
-.Aq tab ,
-and
-.Aq newline
-if
-.Dv NULL .
-.It Fn tok_end
-Clean up and finish with
-.Fa t ,
-assumed to have been created with
-.Fn tok_init .
-.It Fn tok_reset
-Reset the tokenizer state.
-Use after a line has been successfully tokenized
-by
-.Fn tok_line
-or
-.Fn tok_str
-and before a new line is to be tokenized.
-.It Fn tok_line
-Tokenize
-.Fa li ,
-If successful, modify:
-.Fa argv
-to contain the words,
-.Fa argc
-to contain the number of words,
-.Fa cursorc
-(if not
-.Dv NULL )
-to contain the index of the word containing the cursor,
-and
-.Fa cursoro
-(if not
-.Dv NULL )
-to contain the offset within
-.Fa argv[cursorc]
-of the cursor.
-.Pp
-Returns
-0 if successful,
-\-1 for an internal error,
-1 for an unmatched single quote,
-2 for an unmatched double quote,
-and
-3 for a backslash quoted
-.Aq newline .
-A positive exit code indicates that another line should be read
-and tokenization attempted again.
-.
-.It Fn tok_str
-A simpler form of
-.Fn tok_line ;
-.Fa str
-is a NUL terminated string to tokenize.
-.El
-.
-.\"XXX.Sh EXAMPLES
-.\"XXX: provide some examples
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr signal 3 ,
-.Xr termcap 3 ,
-.Xr editrc 5 ,
-.Xr termcap 5
-.Sh HISTORY
-The
-.Nm
-library first appeared in
-.Bx 4.4 .
-.Dv CC_REDISPLAY
-appeared in
-.Nx 1.3 .
-.Dv CC_REFRESH_BEEP ,
-.Dv EL_EDITMODE
-and the readline emulation appeared in
-.Nx 1.4 .
-.Dv EL_RPROMPT
-appeared in
-.Nx 1.5 .
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm
-library was written by
-.An Christos Zoulas .
-.An Luke Mewburn
-wrote this manual and implemented
-.Dv CC_REDISPLAY ,
-.Dv CC_REFRESH_BEEP ,
-.Dv EL_EDITMODE ,
-and
-.Dv EL_RPROMPT .
-.An Jaromir Dolecek
-implemented the readline emulation.
-.An Johny Mattsson
-implemented wide-character support.
-.Sh BUGS
-At this time, it is the responsibility of the caller to
-check the result of the
-.Dv EL_EDITMODE
-operation of
-.Fn el_get
-(after an
-.Fn el_source
-or
-.Fn el_parse )
-to determine if
-.Nm
-should be used for further input.
-I.e.,
-.Dv EL_EDITMODE
-is purely an indication of the result of the most recent
-.Xr editrc 5
-.Ic edit
-command.
diff --git a/lib/libedit/editrc.5 b/lib/libedit/editrc.5
deleted file mode 100644
index 9f796c772..000000000
--- a/lib/libedit/editrc.5
+++ /dev/null
@@ -1,524 +0,0 @@
-.\"	$NetBSD: editrc.5,v 1.29 2014/12/25 13:39:41 wiz Exp $
-.\"
-.\" Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This file was contributed to The NetBSD Foundation by Luke Mewburn.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd December 25, 2014
-.Dt EDITRC 5
-.Os
-.Sh NAME
-.Nm editrc
-.Nd configuration file for editline library
-.Sh SYNOPSIS
-.Nm
-.Sh DESCRIPTION
-The
-.Nm
-file defines various settings to be used by the
-.Xr editline 3
-library.
-.Pp
-The format of each line is:
-.Pp
-.Dl [prog:]command [arg ...]
-.Pp
-.Ar command
-is one of the
-.Xr editline 3
-builtin commands.
-Refer to
-.Sx BUILTIN COMMANDS
-for more information.
-.Pp
-.Ar prog
-is the program name string that a program defines when it calls
-.Xr el_init 3
-to set up
-.Xr editline 3 ,
-which is usually
-.Va argv[0] .
-.Ar command
-will be executed for any program which matches
-.Ar prog .
-.Pp
-.Ar prog
-may also be a
-.Xr regex 3
-style
-regular expression, in which case
-.Ar command
-will be executed for any program that matches the regular expression.
-.Pp
-If
-.Ar prog
-is absent,
-.Ar command
-is executed for all programs.
-.Sh BUILTIN COMMANDS
-The
-.Nm editline
-library has some builtin commands, which affect the way
-that the line editing and history functions operate.
-These are based on similar named builtins present in the
-.Xr tcsh 1
-shell.
-.Pp
-The following builtin commands are available:
-.Bl -tag -width 4n
-.It Ic bind Oo Fl a Oc Oo Fl e Oc Oo Fl k Oc Oo Fl l Oc Oo Fl r Oc \
-Oo Fl s Oc Oo Fl v Oc Oo Ar key Oo Ar command Oc Oc
-Without options, list all bound keys, and the editor command to which
-each is bound.
-If
-.Ar key
-is supplied, show the bindings for
-.Ar key .
-If
-.Ar key command
-is supplied, bind
-.Ar command
-to
-.Ar key .
-Options include:
-.Bl -tag -width 4n
-.It Fl a
-List or change key bindings in the
-.Xr vi 1
-mode alternate (command mode) key map.
-.It Fl e
-Bind all keys to the standard GNU Emacs-like bindings.
-.It Fl k
-.Ar key
-is interpreted as a symbolic arrow key name, which may be one of
-.Sq up ,
-.Sq down ,
-.Sq left
-or
-.Sq right .
-.It Fl l
-List all editor commands and a short description of each.
-.It Fl r
-Remove a key's binding.
-.It Fl s
-.Ar command
-is taken as a literal string and treated as terminal input when
-.Ar key
-is typed.
-Bound keys in
-.Ar command
-are themselves reinterpreted, and this continues for ten levels of
-interpretation.
-.It Fl v
-Bind all keys to the standard
-.Xr vi 1 Ns -like
-bindings.
-.El
-.Pp
-.Ar command
-may be one of the commands documented in
-.Sx "EDITOR COMMANDS"
-below, or another key.
-.Pp
-.Ar key
-and
-.Ar command
-can contain control characters of the form
-.Sm off
-.Sq No ^ Ar character
-.Sm on
-.Po
-e.g.\&
-.Sq ^A
-.Pc ,
-and the following backslashed escape sequences:
-.Pp
-.Bl -tag -compact -offset indent -width 4n
-.It Ic \ea
-Bell
-.It Ic \eb
-Backspace
-.It Ic \ee
-Escape
-.It Ic \ef
-Formfeed
-.It Ic \en
-Newline
-.It Ic \er
-Carriage return
-.It Ic \et
-Horizontal tab
-.It Ic \ev
-Vertical tab
-.Sm off
-.It Sy \e Ar nnn
-.Sm on
-The ASCII character corresponding to the octal number
-.Ar nnn .
-.El
-.Pp
-.Sq \e
-nullifies the special meaning of the following character,
-if it has any, notably
-.Sq \e
-and
-.Sq ^ .
-.It Ic echotc Oo Fl sv Oc Ar arg Ar ...
-Exercise terminal capabilities given in
-.Ar arg ... .
-If
-.Ar arg
-is
-.Sq baud ,
-.Sq cols ,
-.Sq lines ,
-.Sq rows ,
-.Sq meta ,
-or
-.Sq tabs ,
-the value of that capability is printed, with
-.Dq yes
-or
-.Dq no
-indicating that the terminal does or does not have that capability.
-.Pp
-.Fl s
-returns an empty string for non-existent capabilities, rather than
-causing an error.
-.Fl v
-causes messages to be verbose.
-.It Ic edit Op Li on | Li off
-Enable or disable the
-.Nm editline
-functionality in a program.
-.It Ic history Ar list | Ar size Dv n | Ar unique Dv n
-The
-.Ar list
-command lists all entries in the history.
-The
-.Ar size
-command sets the history size to
-.Dv n
-entries.
-The
-.Ar unique
-command controls if history should keep duplicate entries.
-If
-.Dv n
-is non zero, only keep unique history entries.
-If
-.Dv n
-is zero, then keep all entries (the default).
-.It Ic settc Ar cap Ar val
-Set the terminal capability
-.Ar cap
-to
-.Ar val ,
-as defined in
-.Xr termcap 5 .
-No sanity checking is done.
-.It Ic setty Oo Fl a Oc Oo Fl d Oc Oo Fl q Oc Oo Fl x Oc Oo Ar +mode Oc \
-Oo Ar -mode Oc Oo Ar mode Oc Oo Ar char=c Oc
-Control which tty modes that
-.Nm
-won't allow the user to change.
-.Fl d ,
-.Fl q
-or
-.Fl x
-tells
-.Ic setty
-to act on the
-.Sq edit ,
-.Sq quote
-or
-.Sq execute
-set of tty modes respectively; defaulting to
-.Fl x .
-.Pp
-Without other arguments,
-.Ic setty
-lists the modes in the chosen set which are fixed on
-.Po
-.Sq +mode
-.Pc
-or off
-.Po
-.Sq -mode
-.Pc .
-.Fl a
-lists all tty modes in the chosen set regardless of the setting.
-With
-.Ar +mode ,
-.Ar -mode
-or
-.Ar mode ,
-fixes
-.Ar mode
-on or off or removes control of
-.Ar mode
-in the chosen set.
-.Pp
-.Ic Setty
-can also be used to set tty characters to particular values using
-.Ar char=value .
-If
-.Ar value
-is empty
-then the character is set to
-.Dv _POSIX_VDISABLE .
-.It Ic telltc
-List the values of all the terminal capabilities (see
-.Xr termcap 5 ) .
-.El
-.Sh EDITOR COMMANDS
-The following editor commands are available for use in key bindings:
-.\" Section automatically generated with makelist
-.Bl -tag -width 4n
-.It Ic vi-paste-next
-Vi paste previous deletion to the right of the cursor.
-.It Ic vi-paste-prev
-Vi paste previous deletion to the left of the cursor.
-.It Ic vi-prev-big-word
-Vi move to the previous space delimited word.
-.It Ic vi-prev-word
-Vi move to the previous word.
-.It Ic vi-next-big-word
-Vi move to the next space delimited word.
-.It Ic vi-next-word
-Vi move to the next word.
-.It Ic vi-change-case
-Vi change case of character under the cursor and advance one character.
-.It Ic vi-change-meta
-Vi change prefix command.
-.It Ic vi-insert-at-bol
-Vi enter insert mode at the beginning of line.
-.It Ic vi-replace-char
-Vi replace character under the cursor with the next character typed.
-.It Ic vi-replace-mode
-Vi enter replace mode.
-.It Ic vi-substitute-char
-Vi replace character under the cursor and enter insert mode.
-.It Ic vi-substitute-line
-Vi substitute entire line.
-.It Ic vi-change-to-eol
-Vi change to end of line.
-.It Ic vi-insert
-Vi enter insert mode.
-.It Ic vi-add
-Vi enter insert mode after the cursor.
-.It Ic vi-add-at-eol
-Vi enter insert mode at end of line.
-.It Ic vi-delete-meta
-Vi delete prefix command.
-.It Ic vi-end-big-word
-Vi move to the end of the current space delimited word.
-.It Ic vi-end-word
-Vi move to the end of the current word.
-.It Ic vi-undo
-Vi undo last change.
-.It Ic vi-command-mode
-Vi enter command mode (use alternative key bindings).
-.It Ic vi-zero
-Vi move to the beginning of line.
-.It Ic vi-delete-prev-char
-Vi move to previous character (backspace).
-.It Ic vi-list-or-eof
-Vi list choices for completion or indicate end of file if empty line.
-.It Ic vi-kill-line-prev
-Vi cut from beginning of line to cursor.
-.It Ic vi-search-prev
-Vi search history previous.
-.It Ic vi-search-next
-Vi search history next.
-.It Ic vi-repeat-search-next
-Vi repeat current search in the same search direction.
-.It Ic vi-repeat-search-prev
-Vi repeat current search in the opposite search direction.
-.It Ic vi-next-char
-Vi move to the character specified next.
-.It Ic vi-prev-char
-Vi move to the character specified previous.
-.It Ic vi-to-next-char
-Vi move up to the character specified next.
-.It Ic vi-to-prev-char
-Vi move up to the character specified previous.
-.It Ic vi-repeat-next-char
-Vi repeat current character search in the same search direction.
-.It Ic vi-repeat-prev-char
-Vi repeat current character search in the opposite search direction.
-.It Ic vi-match
-Vi go to matching () {} or [].
-.It Ic vi-undo-line
-Vi undo all changes to line.
-.It Ic vi-to-column
-Vi go to specified column.
-.It Ic vi-yank-end
-Vi yank to end of line.
-.It Ic vi-yank
-Vi yank.
-.It Ic vi-comment-out
-Vi comment out current command.
-.It Ic vi-alias
-Vi include shell alias.
-.It Ic vi-to-history-line
-Vi go to specified history file line..
-.It Ic vi-histedit
-Vi edit history line with vi.
-.It Ic vi-history-word
-Vi append word from previous input line.
-.It Ic vi-redo
-Vi redo last non-motion command.
-.It Ic em-delete-or-list
-Delete character under cursor or list completions if at end of line.
-.It Ic em-delete-next-word
-Cut from cursor to end of current word.
-.It Ic em-yank
-Paste cut buffer at cursor position.
-.It Ic em-kill-line
-Cut the entire line and save in cut buffer.
-.It Ic em-kill-region
-Cut area between mark and cursor and save in cut buffer.
-.It Ic em-copy-region
-Copy area between mark and cursor to cut buffer.
-.It Ic em-gosmacs-transpose
-Exchange the two characters before the cursor.
-.It Ic em-next-word
-Move next to end of current word.
-.It Ic em-upper-case
-Uppercase the characters from cursor to end of current word.
-.It Ic em-capitol-case
-Capitalize the characters from cursor to end of current word.
-.It Ic em-lower-case
-Lowercase the characters from cursor to end of current word.
-.It Ic em-set-mark
-Set the mark at cursor.
-.It Ic em-exchange-mark
-Exchange the cursor and mark.
-.It Ic em-universal-argument
-Universal argument (argument times 4).
-.It Ic em-meta-next
-Add 8th bit to next character typed.
-.It Ic em-toggle-overwrite
-Switch from insert to overwrite mode or vice versa.
-.It Ic em-copy-prev-word
-Copy current word to cursor.
-.It Ic em-inc-search-next
-Emacs incremental next search.
-.It Ic em-inc-search-prev
-Emacs incremental reverse search.
-.It Ic ed-end-of-file
-Indicate end of file.
-.It Ic ed-insert
-Add character to the line.
-.It Ic ed-delete-prev-word
-Delete from beginning of current word to cursor.
-.It Ic ed-delete-next-char
-Delete character under cursor.
-.It Ic ed-kill-line
-Cut to the end of line.
-.It Ic ed-move-to-end
-Move cursor to the end of line.
-.It Ic ed-move-to-beg
-Move cursor to the beginning of line.
-.It Ic ed-transpose-chars
-Exchange the character to the left of the cursor with the one under it.
-.It Ic ed-next-char
-Move to the right one character.
-.It Ic ed-prev-word
-Move to the beginning of the current word.
-.It Ic ed-prev-char
-Move to the left one character.
-.It Ic ed-quoted-insert
-Add the next character typed verbatim.
-.It Ic ed-digit
-Adds to argument or enters a digit.
-.It Ic ed-argument-digit
-Digit that starts argument.
-.It Ic ed-unassigned
-Indicates unbound character.
-.It Ic ed-tty-sigint
-Tty interrupt character.
-.It Ic ed-tty-dsusp
-Tty delayed suspend character.
-.It Ic ed-tty-flush-output
-Tty flush output characters.
-.It Ic ed-tty-sigquit
-Tty quit character.
-.It Ic ed-tty-sigtstp
-Tty suspend character.
-.It Ic ed-tty-stop-output
-Tty disallow output characters.
-.It Ic ed-tty-start-output
-Tty allow output characters.
-.It Ic ed-newline
-Execute command.
-.It Ic ed-delete-prev-char
-Delete the character to the left of the cursor.
-.It Ic ed-clear-screen
-Clear screen leaving current line at the top.
-.It Ic ed-redisplay
-Redisplay everything.
-.It Ic ed-start-over
-Erase current line and start from scratch.
-.It Ic ed-sequence-lead-in
-First character in a bound sequence.
-.It Ic ed-prev-history
-Move to the previous history line.
-.It Ic ed-next-history
-Move to the next history line.
-.It Ic ed-search-prev-history
-Search previous in history for a line matching the current.
-.It Ic ed-search-next-history
-Search next in history for a line matching the current.
-.It Ic ed-prev-line
-Move up one line.
-.It Ic ed-next-line
-Move down one line.
-.It Ic ed-command
-Editline extended command.
-.El
-.\" End of section automatically generated with makelist
-.Sh FILES
-.Bl -tag -width "~/.editrcXXX"
-.It Pa ~/.editrc
-User configuration file for the
-.Xr editline 3
-library.
-.El
-.Sh SEE ALSO
-.Xr editline 3 ,
-.Xr regex 3 ,
-.Xr termcap 5
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm editline
-library was written by
-.An Christos Zoulas ,
-and this manual was written by
-.An Luke Mewburn ,
-with some sections inspired by
-.Xr tcsh 1 .
diff --git a/lib/libedit/el.c b/lib/libedit/el.c
deleted file mode 100644
index 864193d59..000000000
--- a/lib/libedit/el.c
+++ /dev/null
@@ -1,632 +0,0 @@
-/*	$NetBSD: el.c,v 1.73 2014/06/18 18:12:28 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)el.c	8.2 (Berkeley) 1/3/94";
-#else
-__RCSID("$NetBSD: el.c,v 1.73 2014/06/18 18:12:28 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * el.c: EditLine interface functions
- */
-#include <sys/types.h>
-#include <sys/param.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <locale.h>
-#include <langinfo.h>
-#include "el.h"
-
-/* el_init():
- *	Initialize editline and set default parameters.
- */
-public EditLine *
-el_init(const char *prog, FILE *fin, FILE *fout, FILE *ferr)
-{
-    return el_init_fd(prog, fin, fout, ferr, fileno(fin), fileno(fout),
-	fileno(ferr));
-}
-
-public EditLine *
-el_init_fd(const char *prog, FILE *fin, FILE *fout, FILE *ferr,
-    int fdin, int fdout, int fderr)
-{
-	EditLine *el = el_malloc(sizeof(*el));
-
-	if (el == NULL)
-		return NULL;
-
-	memset(el, 0, sizeof(EditLine));
-
-	el->el_infile = fin;
-	el->el_outfile = fout;
-	el->el_errfile = ferr;
-
-	el->el_infd = fdin;
-	el->el_outfd = fdout;
-	el->el_errfd = fderr;
-
-	el->el_prog = Strdup(ct_decode_string(prog, &el->el_scratch));
-	if (el->el_prog == NULL) {
-		el_free(el);
-		return NULL;
-	}
-
-	/*
-         * Initialize all the modules. Order is important!!!
-         */
-	el->el_flags = 0;
-#ifdef WIDECHAR
-	if (setlocale(LC_CTYPE, NULL) != NULL){
-		if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0)
-			el->el_flags |= CHARSET_IS_UTF8;
-	}
-#endif
-
-	if (terminal_init(el) == -1) {
-		el_free(el->el_prog);
-		el_free(el);
-		return NULL;
-	}
-	(void) keymacro_init(el);
-	(void) map_init(el);
-	if (tty_init(el) == -1)
-		el->el_flags |= NO_TTY;
-	(void) ch_init(el);
-	(void) search_init(el);
-	(void) hist_init(el);
-	(void) prompt_init(el);
-	(void) sig_init(el);
-	(void) read_init(el);
-
-	return el;
-}
-
-
-/* el_end():
- *	Clean up.
- */
-public void
-el_end(EditLine *el)
-{
-
-	if (el == NULL)
-		return;
-
-	el_reset(el);
-
-	terminal_end(el);
-	keymacro_end(el);
-	map_end(el);
-	tty_end(el);
-	ch_end(el);
-	search_end(el);
-	hist_end(el);
-	prompt_end(el);
-	sig_end(el);
-
-	el_free(el->el_prog);
-#ifdef WIDECHAR
-	el_free(el->el_scratch.cbuff);
-	el_free(el->el_scratch.wbuff);
-	el_free(el->el_lgcyconv.cbuff);
-	el_free(el->el_lgcyconv.wbuff);
-#endif
-	el_free(el);
-}
-
-
-/* el_reset():
- *	Reset the tty and the parser
- */
-public void
-el_reset(EditLine *el)
-{
-
-	tty_cookedmode(el);
-	ch_reset(el, 0);		/* XXX: Do we want that? */
-}
-
-
-/* el_set():
- *	set the editline parameters
- */
-public int
-FUN(el,set)(EditLine *el, int op, ...)
-{
-	va_list ap;
-	int rv = 0;
-
-	if (el == NULL)
-		return -1;
-	va_start(ap, op);
-
-	switch (op) {
-	case EL_PROMPT:
-	case EL_RPROMPT: {
-		el_pfunc_t p = va_arg(ap, el_pfunc_t);
-
-		rv = prompt_set(el, p, 0, op, 1);
-		break;
-	}
-
-	case EL_RESIZE: {
-		el_zfunc_t p = va_arg(ap, el_zfunc_t);
-		void *arg = va_arg(ap, void *);
-		rv = ch_resizefun(el, p, arg);
-		break;
-	}
-
-	case EL_ALIAS_TEXT: {
-		el_afunc_t p = va_arg(ap, el_afunc_t);
-		void *arg = va_arg(ap, void *);
-		rv = ch_aliasfun(el, p, arg);
-		break;
-	}
-
-	case EL_PROMPT_ESC:
-	case EL_RPROMPT_ESC: {
-		el_pfunc_t p = va_arg(ap, el_pfunc_t);
-		int c = va_arg(ap, int);
-
-		rv = prompt_set(el, p, c, op, 1);
-		break;
-	}
-
-	case EL_TERMINAL:
-		rv = terminal_set(el, va_arg(ap, char *));
-		break;
-
-	case EL_EDITOR:
-		rv = map_set_editor(el, va_arg(ap, Char *));
-		break;
-
-	case EL_SIGNAL:
-		if (va_arg(ap, int))
-			el->el_flags |= HANDLE_SIGNALS;
-		else
-			el->el_flags &= ~HANDLE_SIGNALS;
-		break;
-
-	case EL_BIND:
-	case EL_TELLTC:
-	case EL_SETTC:
-	case EL_ECHOTC:
-	case EL_SETTY:
-	{
-		const Char *argv[20];
-		int i;
-
-		for (i = 1; i < (int)__arraycount(argv); i++)
-			if ((argv[i] = va_arg(ap, Char *)) == NULL)
-				break;
-
-		switch (op) {
-		case EL_BIND:
-			argv[0] = STR("bind");
-			rv = map_bind(el, i, argv);
-			break;
-
-		case EL_TELLTC:
-			argv[0] = STR("telltc");
-			rv = terminal_telltc(el, i, argv);
-			break;
-
-		case EL_SETTC:
-			argv[0] = STR("settc");
-			rv = terminal_settc(el, i, argv);
-			break;
-
-		case EL_ECHOTC:
-			argv[0] = STR("echotc");
-			rv = terminal_echotc(el, i, argv);
-			break;
-
-		case EL_SETTY:
-			argv[0] = STR("setty");
-			rv = tty_stty(el, i, argv);
-			break;
-
-		default:
-			rv = -1;
-			EL_ABORT((el->el_errfile, "Bad op %d\n", op));
-			break;
-		}
-		break;
-	}
-
-	case EL_ADDFN:
-	{
-		Char *name = va_arg(ap, Char *);
-		Char *help = va_arg(ap, Char *);
-		el_func_t func = va_arg(ap, el_func_t);
-
-		rv = map_addfunc(el, name, help, func);
-		break;
-	}
-
-	case EL_HIST:
-	{
-		hist_fun_t func = va_arg(ap, hist_fun_t);
-		void *ptr = va_arg(ap, void *);
-
-		rv = hist_set(el, func, ptr);
-		if (!(el->el_flags & CHARSET_IS_UTF8))
-			el->el_flags &= ~NARROW_HISTORY;
-		break;
-	}
-
-	case EL_EDITMODE:
-		if (va_arg(ap, int))
-			el->el_flags &= ~EDIT_DISABLED;
-		else
-			el->el_flags |= EDIT_DISABLED;
-		rv = 0;
-		break;
-
-	case EL_GETCFN:
-	{
-		el_rfunc_t rc = va_arg(ap, el_rfunc_t);
-		rv = el_read_setfn(el, rc);
-		el->el_flags &= ~NARROW_READ;
-		break;
-	}
-
-	case EL_CLIENTDATA:
-		el->el_data = va_arg(ap, void *);
-		break;
-
-	case EL_UNBUFFERED:
-		rv = va_arg(ap, int);
-		if (rv && !(el->el_flags & UNBUFFERED)) {
-			el->el_flags |= UNBUFFERED;
-			read_prepare(el);
-		} else if (!rv && (el->el_flags & UNBUFFERED)) {
-			el->el_flags &= ~UNBUFFERED;
-			read_finish(el);
-		}
-		rv = 0;
-		break;
-
-	case EL_PREP_TERM:
-		rv = va_arg(ap, int);
-		if (rv)
-			(void) tty_rawmode(el);
-		else
-			(void) tty_cookedmode(el);
-		rv = 0;
-		break;
-
-	case EL_SETFP:
-	{
-		FILE *fp;
-		int what;
-
-		what = va_arg(ap, int);
-		fp = va_arg(ap, FILE *);
-
-		rv = 0;
-		switch (what) {
-		case 0:
-			el->el_infile = fp;
-			el->el_infd = fileno(fp);
-			break;
-		case 1:
-			el->el_outfile = fp;
-			el->el_outfd = fileno(fp);
-			break;
-		case 2:
-			el->el_errfile = fp;
-			el->el_errfd = fileno(fp);
-			break;
-		default:
-			rv = -1;
-			break;
-		}
-		break;
-	}
-
-	case EL_REFRESH:
-		re_clear_display(el);
-		re_refresh(el);
-		terminal__flush(el);
-		break;
-
-	default:
-		rv = -1;
-		break;
-	}
-
-	va_end(ap);
-	return rv;
-}
-
-
-/* el_get():
- *	retrieve the editline parameters
- */
-public int
-FUN(el,get)(EditLine *el, int op, ...)
-{
-	va_list ap;
-	int rv;
-
-	if (el == NULL)
-		return -1;
-
-	va_start(ap, op);
-
-	switch (op) {
-	case EL_PROMPT:
-	case EL_RPROMPT: {
-		el_pfunc_t *p = va_arg(ap, el_pfunc_t *);
-		rv = prompt_get(el, p, 0, op);
-		break;
-	}
-	case EL_PROMPT_ESC:
-	case EL_RPROMPT_ESC: {
-		el_pfunc_t *p = va_arg(ap, el_pfunc_t *);
-		Char *c = va_arg(ap, Char *);
-
-		rv = prompt_get(el, p, c, op);
-		break;
-	}
-
-	case EL_EDITOR:
-		rv = map_get_editor(el, va_arg(ap, const Char **));
-		break;
-
-	case EL_SIGNAL:
-		*va_arg(ap, int *) = (el->el_flags & HANDLE_SIGNALS);
-		rv = 0;
-		break;
-
-	case EL_EDITMODE:
-		*va_arg(ap, int *) = !(el->el_flags & EDIT_DISABLED);
-		rv = 0;
-		break;
-
-	case EL_TERMINAL:
-		terminal_get(el, va_arg(ap, const char **));
-		rv = 0;
-		break;
-
-	case EL_GETTC:
-	{
-		static char name[] = "gettc";
-		char *argv[20];
-		int i;
-
- 		for (i = 1; i < (int)__arraycount(argv); i++)
-			if ((argv[i] = va_arg(ap, char *)) == NULL)
-				break;
-
-		argv[0] = name;
-		rv = terminal_gettc(el, i, argv);
-		break;
-	}
-
-	case EL_GETCFN:
-		*va_arg(ap, el_rfunc_t *) = el_read_getfn(el);
-		rv = 0;
-		break;
-
-	case EL_CLIENTDATA:
-		*va_arg(ap, void **) = el->el_data;
-		rv = 0;
-		break;
-
-	case EL_UNBUFFERED:
-		*va_arg(ap, int *) = (el->el_flags & UNBUFFERED) != 0;
-		rv = 0;
-		break;
-
-	case EL_GETFP:
-	{
-		int what;
-		FILE **fpp;
-
-		what = va_arg(ap, int);
-		fpp = va_arg(ap, FILE **);
-		rv = 0;
-		switch (what) {
-		case 0:
-			*fpp = el->el_infile;
-			break;
-		case 1:
-			*fpp = el->el_outfile;
-			break;
-		case 2:
-			*fpp = el->el_errfile;
-			break;
-		default:
-			rv = -1;
-			break;
-		}
-		break;
-	}
-	default:
-		rv = -1;
-		break;
-	}
-	va_end(ap);
-
-	return rv;
-}
-
-
-/* el_line():
- *	Return editing info
- */
-public const TYPE(LineInfo) *
-FUN(el,line)(EditLine *el)
-{
-
-	return (const TYPE(LineInfo) *)(void *)&el->el_line;
-}
-
-
-/* el_source():
- *	Source a file
- */
-public int
-el_source(EditLine *el, const char *fname)
-{
-	FILE *fp;
-	size_t len;
-	char *ptr;
-	char *path = NULL;
-	const Char *dptr;
-	int error = 0;
-
-	fp = NULL;
-	if (fname == NULL) {
-#ifdef HAVE_ISSETUGID
-		static const char elpath[] = "/.editrc";
-		size_t plen = sizeof(elpath);
-
-		if (issetugid())
-			return -1;
-		if ((ptr = getenv("HOME")) == NULL)
-			return -1;
-		plen += strlen(ptr);
-		if ((path = el_malloc(plen * sizeof(*path))) == NULL)
-			return -1;
-		(void)snprintf(path, plen, "%s%s", ptr, elpath);
-		fname = path;
-#else
-		/*
-		 * If issetugid() is missing, always return an error, in order
-		 * to keep from inadvertently opening up the user to a security
-		 * hole.
-		 */
-		return -1;
-#endif
-	}
-	if (fp == NULL)
-		fp = fopen(fname, "r");
-	if (fp == NULL) {
-		el_free(path);
-		return -1;
-	}
-
-	while ((ptr = fgetln(fp, &len)) != NULL) {
-		if (*ptr == '\n')
-			continue;	/* Empty line. */
-		dptr = ct_decode_string(ptr, &el->el_scratch);
-		if (!dptr)
-			continue;
-		if (len > 0 && dptr[len - 1] == '\n')
-			--len;
-
-		/* loop until first non-space char or EOL */
-		while (*dptr != '\0' && Isspace(*dptr))
-			dptr++;
-		if (*dptr == '#')
-			continue;   /* ignore, this is a comment line */
-		if ((error = parse_line(el, dptr)) == -1)
-			break;
-	}
-
-	el_free(path);
-	(void) fclose(fp);
-	return error;
-}
-
-
-/* el_resize():
- *	Called from program when terminal is resized
- */
-public void
-el_resize(EditLine *el)
-{
-	int lins, cols;
-	sigset_t oset, nset;
-
-	(void) sigemptyset(&nset);
-	(void) sigaddset(&nset, SIGWINCH);
-	(void) sigprocmask(SIG_BLOCK, &nset, &oset);
-
-	/* get the correct window size */
-	if (terminal_get_size(el, &lins, &cols))
-		terminal_change_size(el, lins, cols);
-
-	(void) sigprocmask(SIG_SETMASK, &oset, NULL);
-}
-
-
-/* el_beep():
- *	Called from the program to beep
- */
-public void
-el_beep(EditLine *el)
-{
-
-	terminal_beep(el);
-}
-
-
-/* el_editmode()
- *	Set the state of EDIT_DISABLED from the `edit' command.
- */
-protected int
-/*ARGSUSED*/
-el_editmode(EditLine *el, int argc, const Char **argv)
-{
-	const Char *how;
-
-	if (argv == NULL || argc != 2 || argv[1] == NULL)
-		return -1;
-
-	how = argv[1];
-	if (Strcmp(how, STR("on")) == 0) {
-		el->el_flags &= ~EDIT_DISABLED;
-		tty_rawmode(el);
-	} else if (Strcmp(how, STR("off")) == 0) {
-		tty_cookedmode(el);
-		el->el_flags |= EDIT_DISABLED;
-	}
-	else {
-		(void) fprintf(el->el_errfile, "edit: Bad value `" FSTR "'.\n",
-		    how);
-		return -1;
-	}
-	return 0;
-}
diff --git a/lib/libedit/el.h b/lib/libedit/el.h
deleted file mode 100644
index 70c67b8b9..000000000
--- a/lib/libedit/el.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*	$NetBSD: el.h,v 1.25 2011/07/29 23:44:44 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)el.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.h: Internal structures.
- */
-#ifndef _h_el
-#define	_h_el
-/*
- * Local defaults
- */
-#define	KSHVI
-#define	VIDEFAULT
-#define	ANCHOR
-
-#include "histedit.h"
-#include "chartype.h"
-#include <stdio.h>
-#include <sys/types.h>
-
-#define	EL_BUFSIZ	((size_t)1024)	/* Maximum line size		*/
-
-#define	HANDLE_SIGNALS	0x01
-#define	NO_TTY		0x02
-#define	EDIT_DISABLED	0x04
-#define	UNBUFFERED	0x08
-#define	CHARSET_IS_UTF8 0x10
-#define	IGNORE_EXTCHARS 0x20            /* Ignore characters read > 0xff */
-#define	NARROW_HISTORY	0x40
-#define	NARROW_READ	0x80
-
-typedef int bool_t;			/* True or not			*/
-
-typedef unsigned char el_action_t;	/* Index to command array	*/
-
-typedef struct coord_t {		/* Position on the screen	*/
-	int	h;
-	int	v;
-} coord_t;
-
-typedef struct el_line_t {
-	Char 		*buffer;	/* Input line			*/
-	Char	        *cursor;	/* Cursor position		*/
-	Char	        *lastchar;	/* Last character		*/
-	const Char	*limit;		/* Max position			*/
-} el_line_t;
-
-/*
- * Editor state
- */
-typedef struct el_state_t {
-	int		inputmode;	/* What mode are we in?		*/
-	int		doingarg;	/* Are we getting an argument?	*/
-	int		argument;	/* Numeric argument		*/
-	int		metanext;	/* Is the next char a meta char */
-	el_action_t	lastcmd;	/* Previous command		*/
-	el_action_t	thiscmd;	/* this command 		*/
-	Char		thisch;		/* char that generated it	*/
-} el_state_t;
-
-/*
- * Until we come up with something better...
- */
-#define	el_malloc(a)	malloc(a)
-#define	el_realloc(a,b)	realloc(a, b)
-#define	el_free(a)	free(a)
-
-#include "tty.h"
-#include "prompt.h"
-#include "keymacro.h"
-#include "terminal.h"
-#include "refresh.h"
-#include "chared.h"
-#include "common.h"
-#include "search.h"
-#include "hist.h"
-#include "map.h"
-#include "parse.h"
-#include "sig.h"
-#include "help.h"
-#include "read.h"
-
-struct editline {
-	Char		 *el_prog;	/* the program name		*/
-	FILE		 *el_infile;	/* Stdio stuff			*/
-	FILE		 *el_outfile;	/* Stdio stuff			*/
-	FILE		 *el_errfile;	/* Stdio stuff			*/
-	int		  el_infd;	/* Input file descriptor	*/
-	int		  el_outfd;	/* Output file descriptor	*/
-	int		  el_errfd;	/* Error file descriptor	*/
-	int		  el_flags;	/* Various flags.		*/
-	int		  el_errno;	/* Local copy of errno		*/
-	coord_t		  el_cursor;	/* Cursor location		*/
-	Char		**el_display;	/* Real screen image = what is there */
-	Char		**el_vdisplay;	/* Virtual screen image = what we see */
-	void		 *el_data;	/* Client data			*/
-	el_line_t	  el_line;	/* The current line information	*/
-	el_state_t	  el_state;	/* Current editor state		*/
-	el_terminal_t	  el_terminal;	/* Terminal dependent stuff	*/
-	el_tty_t	  el_tty;	/* Tty dependent stuff		*/
-	el_refresh_t	  el_refresh;	/* Refresh stuff		*/
-	el_prompt_t	  el_prompt;	/* Prompt stuff			*/
-	el_prompt_t	  el_rprompt;	/* Prompt stuff			*/
-	el_chared_t	  el_chared;	/* Characted editor stuff	*/
-	el_map_t	  el_map;	/* Key mapping stuff		*/
-	el_keymacro_t	  el_keymacro;	/* Key binding stuff		*/
-	el_history_t	  el_history;	/* History stuff		*/
-	el_search_t	  el_search;	/* Search stuff			*/
-	el_signal_t	  el_signal;	/* Signal handling stuff	*/
-	el_read_t	  el_read;	/* Character reading stuff	*/
-#ifdef WIDECHAR
-	ct_buffer_t       el_scratch;   /* Scratch conversion buffer    */
-	ct_buffer_t       el_lgcyconv;  /* Buffer for legacy wrappers   */
-	LineInfo          el_lgcylinfo; /* Legacy LineInfo buffer       */
-#endif
-};
-
-protected int	el_editmode(EditLine *, int, const Char **);
-
-#ifdef DEBUG
-#define	EL_ABORT(a)	do { \
-				fprintf(el->el_errfile, "%s, %d: ", \
-					 __FILE__, __LINE__); \
-				fprintf a; \
-				abort(); \
-			} while( /*CONSTCOND*/0);
-#else
-#define EL_ABORT(a)	abort()
-#endif
-#endif /* _h_el */
diff --git a/lib/libedit/eln.c b/lib/libedit/eln.c
deleted file mode 100644
index e1de71adf..000000000
--- a/lib/libedit/eln.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/*	$NetBSD: eln.c,v 1.19 2015/05/18 15:07:04 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: eln.c,v 1.19 2015/05/18 15:07:04 christos Exp $");
-#endif /* not lint && not SCCSID */
-
-#include "histedit.h"
-#include "el.h"
-#include "read.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-public int
-el_getc(EditLine *el, char *cp)
-{
-	int num_read;
-	wchar_t wc = 0;
-
-	if (!(el->el_flags & CHARSET_IS_UTF8))
-		el->el_flags |= IGNORE_EXTCHARS;
-	num_read = el_wgetc (el, &wc);
-	if (!(el->el_flags & CHARSET_IS_UTF8))
-		el->el_flags &= ~IGNORE_EXTCHARS;
-
-	if (num_read > 0)
-		*cp = (char)wc;
-	return num_read;
-}
-
-
-public void
-el_push(EditLine *el, const char *str)
-{
-	/* Using multibyte->wide string decoding works fine under single-byte
-	 * character sets too, and Does The Right Thing. */
-	el_wpush(el, ct_decode_string(str, &el->el_lgcyconv));
-}
-
-
-public const char *
-el_gets(EditLine *el, int *nread)
-{
-	const wchar_t *tmp;
-
-	if (!(el->el_flags & CHARSET_IS_UTF8))
-		el->el_flags |= IGNORE_EXTCHARS;
-	tmp = el_wgets(el, nread);
-	if (tmp != NULL) {
-	    size_t nwread = 0;
-	    for (int i = 0; i < *nread; i++)
-		nwread += ct_enc_width(tmp[i]);
-	    *nread = (int)nwread;
-	}
-	if (!(el->el_flags & CHARSET_IS_UTF8))
-		el->el_flags &= ~IGNORE_EXTCHARS;
-	return ct_encode_string(tmp, &el->el_lgcyconv);
-}
-
-
-public int
-el_parse(EditLine *el, int argc, const char *argv[])
-{
-	int ret;
-	const wchar_t **wargv;
-
-	wargv = (const wchar_t **)
-	    ct_decode_argv(argc, argv, &el->el_lgcyconv);
-	if (!wargv)
-		return -1;
-	ret = el_wparse(el, argc, wargv);
-	ct_free_argv(wargv);
-
-	return ret;
-}
-
-
-public int
-el_set(EditLine *el, int op, ...)
-{
-	va_list ap;
-	int ret;
-
-	if (!el)
-		return -1;
-	va_start(ap, op);
-
-	switch (op) {
-	case EL_PROMPT:         /* el_pfunc_t */
-	case EL_RPROMPT: {
-		el_pfunc_t p = va_arg(ap, el_pfunc_t);
-		ret = prompt_set(el, p, 0, op, 0);
-		break;
-	}
-
-	case EL_RESIZE: {
-		el_zfunc_t p = va_arg(ap, el_zfunc_t);
-		void *arg = va_arg(ap, void *);
-		ret = ch_resizefun(el, p, arg);
-		break;
-	}
-
-	case EL_ALIAS_TEXT: {
-		el_afunc_t p = va_arg(ap, el_afunc_t);
-		void *arg = va_arg(ap, void *);
-		ret = ch_aliasfun(el, p, arg);
-		break;
-	}
-
-	case EL_PROMPT_ESC:
-	case EL_RPROMPT_ESC: {
-		el_pfunc_t p = va_arg(ap, el_pfunc_t);
-		int c = va_arg(ap, int);
-
-		ret = prompt_set(el, p, c, op, 0);
-		break;
-	}
-
-	case EL_TERMINAL:       /* const char * */
-		ret = el_wset(el, op, va_arg(ap, char *));
-		break;
-
-	case EL_EDITOR:		/* const wchar_t * */
-		ret = el_wset(el, op, ct_decode_string(va_arg(ap, char *),
-		    &el->el_lgcyconv));
-		break;
-
-	case EL_SIGNAL:         /* int */
-	case EL_EDITMODE:
-	case EL_UNBUFFERED:
-	case EL_PREP_TERM:
-		ret = el_wset(el, op, va_arg(ap, int));
-		break;
-
-	case EL_BIND:   /* const char * list -> const wchar_t * list */
-	case EL_TELLTC:
-	case EL_SETTC:
-	case EL_ECHOTC:
-	case EL_SETTY: {
-		const char *argv[20];
-		int i;
-		const wchar_t **wargv;
-		for (i = 1; i < (int)__arraycount(argv) - 1; ++i)
-			if ((argv[i] = va_arg(ap, const char *)) == NULL)
-			    break;
-		argv[0] = argv[i] = NULL;
-		wargv = (const wchar_t **)
-		    ct_decode_argv(i + 1, argv, &el->el_lgcyconv);
-		if (!wargv) {
-		    ret = -1;
-		    goto out;
-		}
-		/*
-		 * AFAIK we can't portably pass through our new wargv to
-		 * el_wset(), so we have to reimplement the body of
-		 * el_wset() for these ops.
-		 */
-		switch (op) {
-		case EL_BIND:
-			wargv[0] = STR("bind");
-			ret = map_bind(el, i, wargv);
-			break;
-		case EL_TELLTC:
-			wargv[0] = STR("telltc");
-			ret = terminal_telltc(el, i, wargv);
-			break;
-		case EL_SETTC:
-			wargv[0] = STR("settc");
-			ret = terminal_settc(el, i, wargv);
-			break;
-		case EL_ECHOTC:
-			wargv[0] = STR("echotc");
-			ret = terminal_echotc(el, i, wargv);
-			break;
-		case EL_SETTY:
-			wargv[0] = STR("setty");
-			ret = tty_stty(el, i, wargv);
-			break;
-		default:
-			ret = -1;
-		}
-		ct_free_argv(wargv);
-		break;
-	}
-
-	/* XXX: do we need to change el_func_t too? */
-	case EL_ADDFN: {          /* const char *, const char *, el_func_t */
-		const char *args[2];
-		el_func_t func;
-		wchar_t **wargv;
-
-		args[0] = va_arg(ap, const char *);
-		args[1] = va_arg(ap, const char *);
-		func = va_arg(ap, el_func_t);
-
-		wargv = ct_decode_argv(2, args, &el->el_lgcyconv);
-		if (!wargv) {
-		    ret = -1;
-		    goto out;
-		}
-		// XXX: The two strdup's leak
-		ret = map_addfunc(el, Strdup(wargv[0]), Strdup(wargv[1]),
-		    func);
-		ct_free_argv(wargv);
-		break;
-	}
-	case EL_HIST: {           /* hist_fun_t, const char * */
-		hist_fun_t fun = va_arg(ap, hist_fun_t);
-		void *ptr = va_arg(ap, void *);
-		ret = hist_set(el, fun, ptr);
-		el->el_flags |= NARROW_HISTORY;
-		break;
-	}
-
-	/* XXX: do we need to change el_rfunc_t? */
-	case EL_GETCFN:         /* el_rfunc_t */
-		ret = el_wset(el, op, va_arg(ap, el_rfunc_t));
-		el->el_flags |= NARROW_READ;
-		break;
-
-	case EL_CLIENTDATA:     /* void * */
-		ret = el_wset(el, op, va_arg(ap, void *));
-		break;
-
-	case EL_SETFP: {          /* int, FILE * */
-		int what = va_arg(ap, int);
-		FILE *fp = va_arg(ap, FILE *);
-		ret = el_wset(el, op, what, fp);
-		break;
-	}
-
-	case EL_REFRESH:
-		re_clear_display(el);
-		re_refresh(el);
-		terminal__flush(el);
-		ret = 0;
-		break;
-
-	default:
-		ret = -1;
-		break;
-	}
-
-out:
-	va_end(ap);
-	return ret;
-}
-
-
-public int
-el_get(EditLine *el, int op, ...)
-{
-	va_list ap;
-	int ret;
-
-	if (!el)
-		return -1;
-
-	va_start(ap, op);
-
-	switch (op) {
-	case EL_PROMPT:         /* el_pfunc_t * */
-	case EL_RPROMPT: {
-		el_pfunc_t *p = va_arg(ap, el_pfunc_t *);
-		ret = prompt_get(el, p, 0, op);
-		break;
-	}
-
-	case EL_PROMPT_ESC: /* el_pfunc_t *, char **/
-	case EL_RPROMPT_ESC: {
-		el_pfunc_t *p = va_arg(ap, el_pfunc_t *);
-		char *c = va_arg(ap, char *);
-		wchar_t wc = 0;
-		ret = prompt_get(el, p, &wc, op);
-		*c = (char)wc;
-		break;
-	}
-
-	case EL_EDITOR: {
-		const char **p = va_arg(ap, const char **);
-		const wchar_t *pw;
-		ret = el_wget(el, op, &pw);
-		*p = ct_encode_string(pw, &el->el_lgcyconv);
-		if (!el->el_lgcyconv.csize)
-			ret = -1;
-		break;
-	}
-
-	case EL_TERMINAL:       /* const char ** */
-		ret = el_wget(el, op, va_arg(ap, const char **));
-		break;
-
-	case EL_SIGNAL:         /* int * */
-	case EL_EDITMODE:
-	case EL_UNBUFFERED:
-	case EL_PREP_TERM:
-		ret = el_wget(el, op, va_arg(ap, int *));
-		break;
-
-	case EL_GETTC: {
-		char *argv[20];
-		static char gettc[] = "gettc";
-		int i;
-		for (i = 1; i < (int)__arraycount(argv); ++i)
-			if ((argv[i] = va_arg(ap, char *)) == NULL)
-				break;
-		argv[0] = gettc;
-		ret = terminal_gettc(el, i, argv);
-		break;
-	}
-
-	/* XXX: do we need to change el_rfunc_t? */
-	case EL_GETCFN:         /* el_rfunc_t */
-		ret = el_wget(el, op, va_arg(ap, el_rfunc_t *));
-		break;
-
-	case EL_CLIENTDATA:     /* void ** */
-		ret = el_wget(el, op, va_arg(ap, void **));
-		break;
-
-	case EL_GETFP: {          /* int, FILE ** */
-		int what = va_arg(ap, int);
-		FILE **fpp = va_arg(ap, FILE **);
-		ret = el_wget(el, op, what, fpp);
-		break;
-	}
-
-	default:
-		ret = -1;
-		break;
-	}
-
-	va_end(ap);
-	return ret;
-}
-
-
-const LineInfo *
-el_line(EditLine *el)
-{
-	const LineInfoW *winfo = el_wline(el);
-	LineInfo *info = &el->el_lgcylinfo;
-	size_t offset;
-	const Char *p;
-
-	info->buffer   = ct_encode_string(winfo->buffer, &el->el_lgcyconv);
-
-	offset = 0;
-	for (p = winfo->buffer; p < winfo->cursor; p++)
-		offset += ct_enc_width(*p);
-	info->cursor = info->buffer + offset;
-
-	offset = 0;
-	for (p = winfo->buffer; p < winfo->lastchar; p++)
-		offset += ct_enc_width(*p);
-	info->lastchar = info->buffer + offset;
-
-	return info;
-}
-
-
-int
-el_insertstr(EditLine *el, const char *str)
-{
-	return el_winsertstr(el, ct_decode_string(str, &el->el_lgcyconv));
-}
diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c
deleted file mode 100644
index ab1e2dfe1..000000000
--- a/lib/libedit/emacs.c
+++ /dev/null
@@ -1,508 +0,0 @@
-/*	$NetBSD: emacs.c,v 1.25 2011/07/29 15:16:33 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)emacs.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: emacs.c,v 1.25 2011/07/29 15:16:33 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * emacs.c: Emacs functions
- */
-#include "el.h"
-
-/* em_delete_or_list():
- *	Delete character under cursor or list completions if at end of line
- *	[^D]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_delete_or_list(EditLine *el, Int c)
-{
-
-	if (el->el_line.cursor == el->el_line.lastchar) {
-					/* if I'm at the end */
-		if (el->el_line.cursor == el->el_line.buffer) {
-					/* and the beginning */
-			terminal_writec(el, c);	/* then do an EOF */
-			return CC_EOF;
-		} else {
-			/*
-			 * Here we could list completions, but it is an
-			 * error right now
-			 */
-			terminal_beep(el);
-			return CC_ERROR;
-		}
-	} else {
-		if (el->el_state.doingarg)
-			c_delafter(el, el->el_state.argument);
-		else
-			c_delafter1(el);
-		if (el->el_line.cursor > el->el_line.lastchar)
-			el->el_line.cursor = el->el_line.lastchar;
-				/* bounds check */
-		return CC_REFRESH;
-	}
-}
-
-
-/* em_delete_next_word():
- *	Cut from cursor to end of current word
- *	[M-d]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_delete_next_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *cp, *p, *kp;
-
-	if (el->el_line.cursor == el->el_line.lastchar)
-		return CC_ERROR;
-
-	cp = c__next_word(el->el_line.cursor, el->el_line.lastchar,
-	    el->el_state.argument, ce__isword);
-
-	for (p = el->el_line.cursor, kp = el->el_chared.c_kill.buf; p < cp; p++)
-				/* save the text */
-		*kp++ = *p;
-	el->el_chared.c_kill.last = kp;
-
-	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 */
-	return CC_REFRESH;
-}
-
-
-/* em_yank():
- *	Paste cut buffer at cursor position
- *	[^Y]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_yank(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *kp, *cp;
-
-	if (el->el_chared.c_kill.last == el->el_chared.c_kill.buf)
-		return CC_NORM;
-
-	if (el->el_line.lastchar +
-	    (el->el_chared.c_kill.last - el->el_chared.c_kill.buf) >=
-	    el->el_line.limit)
-		return CC_ERROR;
-
-	el->el_chared.c_kill.mark = el->el_line.cursor;
-	cp = el->el_line.cursor;
-
-	/* open the space, */
-	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;
-
-	/* if an arg, cursor at beginning else cursor at end */
-	if (el->el_state.argument == 1)
-		el->el_line.cursor = cp;
-
-	return CC_REFRESH;
-}
-
-
-/* em_kill_line():
- *	Cut the entire line and save in cut buffer
- *	[^U]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_kill_line(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *kp, *cp;
-
-	cp = el->el_line.buffer;
-	kp = el->el_chared.c_kill.buf;
-	while (cp < el->el_line.lastchar)
-		*kp++ = *cp++;	/* copy it */
-	el->el_chared.c_kill.last = kp;
-				/* zap! -- delete all of it */
-	el->el_line.lastchar = el->el_line.buffer;
-	el->el_line.cursor = el->el_line.buffer;
-	return CC_REFRESH;
-}
-
-
-/* em_kill_region():
- *	Cut area between mark and cursor and save in cut buffer
- *	[^W]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_kill_region(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *kp, *cp;
-
-	if (!el->el_chared.c_kill.mark)
-		return CC_ERROR;
-
-	if (el->el_chared.c_kill.mark > el->el_line.cursor) {
-		cp = el->el_line.cursor;
-		kp = el->el_chared.c_kill.buf;
-		while (cp < el->el_chared.c_kill.mark)
-			*kp++ = *cp++;	/* copy it */
-		el->el_chared.c_kill.last = kp;
-		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, (int)(cp - el->el_chared.c_kill.mark));
-		el->el_line.cursor = el->el_chared.c_kill.mark;
-	}
-	return CC_REFRESH;
-}
-
-
-/* em_copy_region():
- *	Copy area between mark and cursor to cut buffer
- *	[M-W]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_copy_region(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *kp, *cp;
-
-	if (!el->el_chared.c_kill.mark)
-		return CC_ERROR;
-
-	if (el->el_chared.c_kill.mark > el->el_line.cursor) {
-		cp = el->el_line.cursor;
-		kp = el->el_chared.c_kill.buf;
-		while (cp < el->el_chared.c_kill.mark)
-			*kp++ = *cp++;	/* copy it */
-		el->el_chared.c_kill.last = kp;
-	} else {
-		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;
-	}
-	return CC_NORM;
-}
-
-
-/* em_gosmacs_transpose():
- *	Exchange the two characters before the cursor
- *	Gosling emacs transpose chars [^T]
- */
-protected el_action_t
-em_gosmacs_transpose(EditLine *el, Int c)
-{
-
-	if (el->el_line.cursor > &el->el_line.buffer[1]) {
-		/* must have at least two chars entered */
-		c = el->el_line.cursor[-2];
-		el->el_line.cursor[-2] = el->el_line.cursor[-1];
-		el->el_line.cursor[-1] = c;
-		return CC_REFRESH;
-	} else
-		return CC_ERROR;
-}
-
-
-/* em_next_word():
- *	Move next to end of current word
- *	[M-f]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_next_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-	if (el->el_line.cursor == el->el_line.lastchar)
-		return CC_ERROR;
-
-	el->el_line.cursor = c__next_word(el->el_line.cursor,
-	    el->el_line.lastchar,
-	    el->el_state.argument,
-	    ce__isword);
-
-	if (el->el_map.type == MAP_VI)
-		if (el->el_chared.c_vcmd.action != NOP) {
-			cv_delfini(el);
-			return CC_REFRESH;
-		}
-	return CC_CURSOR;
-}
-
-
-/* em_upper_case():
- *	Uppercase the characters from cursor to end of current word
- *	[M-u]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_upper_case(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *cp, *ep;
-
-	ep = c__next_word(el->el_line.cursor, el->el_line.lastchar,
-	    el->el_state.argument, ce__isword);
-
-	for (cp = el->el_line.cursor; cp < ep; cp++)
-		if (Islower(*cp))
-			*cp = Toupper(*cp);
-
-	el->el_line.cursor = ep;
-	if (el->el_line.cursor > el->el_line.lastchar)
-		el->el_line.cursor = el->el_line.lastchar;
-	return CC_REFRESH;
-}
-
-
-/* em_capitol_case():
- *	Capitalize the characters from cursor to end of current word
- *	[M-c]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_capitol_case(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *cp, *ep;
-
-	ep = c__next_word(el->el_line.cursor, el->el_line.lastchar,
-	    el->el_state.argument, ce__isword);
-
-	for (cp = el->el_line.cursor; cp < ep; cp++) {
-		if (Isalpha(*cp)) {
-			if (Islower(*cp))
-				*cp = Toupper(*cp);
-			cp++;
-			break;
-		}
-	}
-	for (; cp < ep; cp++)
-		if (Isupper(*cp))
-			*cp = Tolower(*cp);
-
-	el->el_line.cursor = ep;
-	if (el->el_line.cursor > el->el_line.lastchar)
-		el->el_line.cursor = el->el_line.lastchar;
-	return CC_REFRESH;
-}
-
-
-/* em_lower_case():
- *	Lowercase the characters from cursor to end of current word
- *	[M-l]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_lower_case(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *cp, *ep;
-
-	ep = c__next_word(el->el_line.cursor, el->el_line.lastchar,
-	    el->el_state.argument, ce__isword);
-
-	for (cp = el->el_line.cursor; cp < ep; cp++)
-		if (Isupper(*cp))
-			*cp = Tolower(*cp);
-
-	el->el_line.cursor = ep;
-	if (el->el_line.cursor > el->el_line.lastchar)
-		el->el_line.cursor = el->el_line.lastchar;
-	return CC_REFRESH;
-}
-
-
-/* em_set_mark():
- *	Set the mark at cursor
- *	[^@]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_set_mark(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_chared.c_kill.mark = el->el_line.cursor;
-	return CC_NORM;
-}
-
-
-/* em_exchange_mark():
- *	Exchange the cursor and mark
- *	[^X^X]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_exchange_mark(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *cp;
-
-	cp = el->el_line.cursor;
-	el->el_line.cursor = el->el_chared.c_kill.mark;
-	el->el_chared.c_kill.mark = cp;
-	return CC_CURSOR;
-}
-
-
-/* em_universal_argument():
- *	Universal argument (argument times 4)
- *	[^U]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_universal_argument(EditLine *el, Int c __attribute__((__unused__)))
-{				/* multiply current argument by 4 */
-
-	if (el->el_state.argument > 1000000)
-		return CC_ERROR;
-	el->el_state.doingarg = 1;
-	el->el_state.argument *= 4;
-	return CC_ARGHACK;
-}
-
-
-/* em_meta_next():
- *	Add 8th bit to next character typed
- *	[<ESC>]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_meta_next(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_state.metanext = 1;
-	return CC_ARGHACK;
-}
-
-
-/* em_toggle_overwrite():
- *	Switch from insert to overwrite mode or vice versa
- */
-protected el_action_t
-/*ARGSUSED*/
-em_toggle_overwrite(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_state.inputmode = (el->el_state.inputmode == MODE_INSERT) ?
-	    MODE_REPLACE : MODE_INSERT;
-	return CC_NORM;
-}
-
-
-/* em_copy_prev_word():
- *	Copy current word to cursor
- */
-protected el_action_t
-/*ARGSUSED*/
-em_copy_prev_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *cp, *oldc, *dp;
-
-	if (el->el_line.cursor == el->el_line.buffer)
-		return CC_ERROR;
-
-	oldc = el->el_line.cursor;
-	/* does a bounds check */
-	cp = c__prev_word(el->el_line.cursor, el->el_line.buffer,
-	    el->el_state.argument, ce__isword);
-
-	c_insert(el, (int)(oldc - cp));
-	for (dp = oldc; cp < oldc && dp < el->el_line.lastchar; cp++)
-		*dp++ = *cp;
-
-	el->el_line.cursor = dp;/* put cursor at end */
-
-	return CC_REFRESH;
-}
-
-
-/* em_inc_search_next():
- *	Emacs incremental next search
- */
-protected el_action_t
-/*ARGSUSED*/
-em_inc_search_next(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_search.patlen = 0;
-	return ce_inc_search(el, ED_SEARCH_NEXT_HISTORY);
-}
-
-
-/* em_inc_search_prev():
- *	Emacs incremental reverse search
- */
-protected el_action_t
-/*ARGSUSED*/
-em_inc_search_prev(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_search.patlen = 0;
-	return ce_inc_search(el, ED_SEARCH_PREV_HISTORY);
-}
-
-
-/* em_delete_prev_char():
- *	Delete the character to the left of the cursor
- *	[^?]
- */
-protected el_action_t
-/*ARGSUSED*/
-em_delete_prev_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor <= el->el_line.buffer)
-		return CC_ERROR;
-
-	if (el->el_state.doingarg)
-		c_delbefore(el, el->el_state.argument);
-	else
-		c_delbefore1(el);
-	el->el_line.cursor -= el->el_state.argument;
-	if (el->el_line.cursor < el->el_line.buffer)
-		el->el_line.cursor = el->el_line.buffer;
-	return CC_REFRESH;
-}
diff --git a/lib/libedit/filecomplete.c b/lib/libedit/filecomplete.c
deleted file mode 100644
index 576414d3b..000000000
--- a/lib/libedit/filecomplete.c
+++ /dev/null
@@ -1,581 +0,0 @@
-/*	$NetBSD: filecomplete.c,v 1.34 2014/10/18 15:07:02 riz Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jaromir Dolecek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: filecomplete.c,v 1.34 2014/10/18 15:07:02 riz Exp $");
-#endif /* not lint && not SCCSID */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <dirent.h>
-#include <string.h>
-#include <pwd.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <limits.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#include "el.h"
-#include "fcns.h"		/* for EL_NUM_FCNS */
-#include "histedit.h"
-#include "filecomplete.h"
-
-static const Char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@',
-    '$', '>', '<', '=', ';', '|', '&', '{', '(', '\0' };
-
-
-/********************************/
-/* completion functions */
-
-/*
- * does tilde expansion of strings of type ``~user/foo''
- * if ``user'' isn't valid user name or ``txt'' doesn't start
- * w/ '~', returns pointer to strdup()ed copy of ``txt''
- *
- * it's the caller's responsibility to free() the returned string
- */
-char *
-fn_tilde_expand(const char *txt)
-{
-#if defined(HAVE_GETPW_R_POSIX) || defined(HAVE_GETPW_R_DRAFT)
-	struct passwd pwres;
-	char pwbuf[1024];
-#endif
-	struct passwd *pass;
-	char *temp;
-	size_t len = 0;
-
-	if (txt[0] != '~')
-		return strdup(txt);
-
-	temp = strchr(txt + 1, '/');
-	if (temp == NULL) {
-		temp = strdup(txt + 1);
-		if (temp == NULL)
-			return NULL;
-	} else {
-		/* text until string after slash */
-		len = (size_t)(temp - txt + 1);
-		temp = el_malloc(len * sizeof(*temp));
-		if (temp == NULL)
-			return NULL;
-		(void)strncpy(temp, txt + 1, len - 2);
-		temp[len - 2] = '\0';
-	}
-	if (temp[0] == 0) {
-#ifdef HAVE_GETPW_R_POSIX
- 		if (getpwuid_r(getuid(), &pwres, pwbuf, sizeof(pwbuf),
-		    &pass) != 0)
- 			pass = NULL;
-#elif HAVE_GETPW_R_DRAFT
-		pass = getpwuid_r(getuid(), &pwres, pwbuf, sizeof(pwbuf));
-#else
-		pass = getpwuid(getuid());
-#endif
-	} else {
-#ifdef HAVE_GETPW_R_POSIX
-		if (getpwnam_r(temp, &pwres, pwbuf, sizeof(pwbuf), &pass) != 0)
-			pass = NULL;
-#elif HAVE_GETPW_R_DRAFT
-		pass = getpwnam_r(temp, &pwres, pwbuf, sizeof(pwbuf));
-#else
-		pass = getpwnam(temp);
-#endif
-	}
-	el_free(temp);		/* value no more needed */
-	if (pass == NULL)
-		return strdup(txt);
-
-	/* update pointer txt to point at string immedially following */
-	/* first slash */
-	txt += len;
-
-	len = strlen(pass->pw_dir) + 1 + strlen(txt) + 1;
-	temp = el_malloc(len * sizeof(*temp));
-	if (temp == NULL)
-		return NULL;
-	(void)snprintf(temp, len, "%s/%s", pass->pw_dir, txt);
-
-	return temp;
-}
-
-
-/*
- * return first found file name starting by the ``text'' or NULL if no
- * such file can be found
- * value of ``state'' is ignored
- *
- * it's the caller's responsibility to free the returned string
- */
-char *
-fn_filename_completion_function(const char *text, int state)
-{
-	static DIR *dir = NULL;
-	static char *filename = NULL, *dirname = NULL, *dirpath = NULL;
-	static size_t filename_len = 0;
-	struct dirent *entry;
-	char *temp;
-	size_t len;
-
-	if (state == 0 || dir == NULL) {
-		temp = strrchr(text, '/');
-		if (temp) {
-			char *nptr;
-			temp++;
-			nptr = el_realloc(filename, (strlen(temp) + 1) *
-			    sizeof(*nptr));
-			if (nptr == NULL) {
-				el_free(filename);
-				filename = NULL;
-				return NULL;
-			}
-			filename = nptr;
-			(void)strcpy(filename, temp);
-			len = (size_t)(temp - text);	/* including last slash */
-
-			nptr = el_realloc(dirname, (len + 1) *
-			    sizeof(*nptr));
-			if (nptr == NULL) {
-				el_free(dirname);
-				dirname = NULL;
-				return NULL;
-			}
-			dirname = nptr;
-			(void)strncpy(dirname, text, len);
-			dirname[len] = '\0';
-		} else {
-			el_free(filename);
-			if (*text == 0)
-				filename = NULL;
-			else {
-				filename = strdup(text);
-				if (filename == NULL)
-					return NULL;
-			}
-			el_free(dirname);
-			dirname = NULL;
-		}
-
-		if (dir != NULL) {
-			(void)closedir(dir);
-			dir = NULL;
-		}
-
-		/* support for ``~user'' syntax */
-
-		el_free(dirpath);
-		dirpath = NULL;
-		if (dirname == NULL) {
-			if ((dirname = strdup("")) == NULL)
-				return NULL;
-			dirpath = strdup("./");
-		} else if (*dirname == '~')
-			dirpath = fn_tilde_expand(dirname);
-		else
-			dirpath = strdup(dirname);
-
-		if (dirpath == NULL)
-			return NULL;
-
-		dir = opendir(dirpath);
-		if (!dir)
-			return NULL;	/* cannot open the directory */
-
-		/* will be used in cycle */
-		filename_len = filename ? strlen(filename) : 0;
-	}
-
-	/* find the match */
-	while ((entry = readdir(dir)) != NULL) {
-		/* skip . and .. */
-		if (entry->d_name[0] == '.' && (!entry->d_name[1]
-		    || (entry->d_name[1] == '.' && !entry->d_name[2])))
-			continue;
-		if (filename_len == 0)
-			break;
-		/* otherwise, get first entry where first */
-		/* filename_len characters are equal	  */
-		if (entry->d_name[0] == filename[0]
-#if HAVE_STRUCT_DIRENT_D_NAMLEN
-		    && entry->d_namlen >= filename_len
-#else
-		    && strlen(entry->d_name) >= filename_len
-#endif
-		    && strncmp(entry->d_name, filename,
-			filename_len) == 0)
-			break;
-	}
-
-	if (entry) {		/* match found */
-
-#if HAVE_STRUCT_DIRENT_D_NAMLEN
-		len = entry->d_namlen;
-#else
-		len = strlen(entry->d_name);
-#endif
-
-		len = strlen(dirname) + len + 1;
-		temp = el_malloc(len * sizeof(*temp));
-		if (temp == NULL)
-			return NULL;
-		(void)snprintf(temp, len, "%s%s", dirname, entry->d_name);
-	} else {
-		(void)closedir(dir);
-		dir = NULL;
-		temp = NULL;
-	}
-
-	return temp;
-}
-
-
-static const char *
-append_char_function(const char *name)
-{
-	struct stat stbuf;
-	char *expname = *name == '~' ? fn_tilde_expand(name) : NULL;
-	const char *rs = " ";
-
-	if (stat(expname ? expname : name, &stbuf) == -1)
-		goto out;
-	if (S_ISDIR(stbuf.st_mode))
-		rs = "/";
-out:
-	if (expname)
-		el_free(expname);
-	return rs;
-}
-/*
- * returns list of completions for text given
- * non-static for readline.
- */
-char ** completion_matches(const char *, char *(*)(const char *, int));
-char **
-completion_matches(const char *text, char *(*genfunc)(const char *, int))
-{
-	char **match_list = NULL, *retstr, *prevstr;
-	size_t match_list_len, max_equal, which, i;
-	size_t matches;
-
-	matches = 0;
-	match_list_len = 1;
-	while ((retstr = (*genfunc) (text, (int)matches)) != NULL) {
-		/* allow for list terminator here */
-		if (matches + 3 >= match_list_len) {
-			char **nmatch_list;
-			while (matches + 3 >= match_list_len)
-				match_list_len <<= 1;
-			nmatch_list = el_realloc(match_list,
-			    match_list_len * sizeof(*nmatch_list));
-			if (nmatch_list == NULL) {
-				el_free(match_list);
-				return NULL;
-			}
-			match_list = nmatch_list;
-
-		}
-		match_list[++matches] = retstr;
-	}
-
-	if (!match_list)
-		return NULL;	/* nothing found */
-
-	/* find least denominator and insert it to match_list[0] */
-	which = 2;
-	prevstr = match_list[1];
-	max_equal = strlen(prevstr);
-	for (; which <= matches; which++) {
-		for (i = 0; i < max_equal &&
-		    prevstr[i] == match_list[which][i]; i++)
-			continue;
-		max_equal = i;
-	}
-
-	retstr = el_malloc((max_equal + 1) * sizeof(*retstr));
-	if (retstr == NULL) {
-		el_free(match_list);
-		return NULL;
-	}
-	(void)strncpy(retstr, match_list[1], max_equal);
-	retstr[max_equal] = '\0';
-	match_list[0] = retstr;
-
-	/* add NULL as last pointer to the array */
-	match_list[matches + 1] = NULL;
-
-	return match_list;
-}
-
-/*
- * Sort function for qsort(). Just wrapper around strcasecmp().
- */
-static int
-_fn_qsort_string_compare(const void *i1, const void *i2)
-{
-	const char *s1 = ((const char * const *)i1)[0];
-	const char *s2 = ((const char * const *)i2)[0];
-
-	return strcasecmp(s1, s2);
-}
-
-/*
- * Display list of strings in columnar format on readline's output stream.
- * 'matches' is list of strings, 'num' is number of strings in 'matches',
- * 'width' is maximum length of string in 'matches'.
- *
- * matches[0] is not one of the match strings, but it is counted in
- * num, so the strings are matches[1] *through* matches[num-1].
- */
-void
-fn_display_match_list (EditLine *el, char **matches, size_t num, size_t width)
-{
-	size_t line, lines, col, cols, thisguy;
-	int screenwidth = el->el_terminal.t_size.h;
-
-	/* Ignore matches[0]. Avoid 1-based array logic below. */
-	matches++;
-	num--;
-
-	/*
-	 * Find out how many entries can be put on one line; count
-	 * with one space between strings the same way it's printed.
-	 */
-	cols = (size_t)screenwidth / (width + 1);
-	if (cols == 0)
-		cols = 1;
-
-	/* how many lines of output, rounded up */
-	lines = (num + cols - 1) / cols;
-
-	/* Sort the items. */
-	qsort(matches, num, sizeof(char *), _fn_qsort_string_compare);
-
-	/*
-	 * On the ith line print elements i, i+lines, i+lines*2, etc.
-	 */
-	for (line = 0; line < lines; line++) {
-		for (col = 0; col < cols; col++) {
-			thisguy = line + col * lines;
-			if (thisguy >= num)
-				break;
-			(void)fprintf(el->el_outfile, "%s%-*s",
-			    col == 0 ? "" : " ", (int)width, matches[thisguy]);
-		}
-		(void)fprintf(el->el_outfile, "\n");
-	}
-}
-
-/*
- * Complete the word at or before point,
- * 'what_to_do' says what to do with the completion.
- * \t   means do standard completion.
- * `?' means list the possible completions.
- * `*' means insert all of the possible completions.
- * `!' means to do standard completion, and list all possible completions if
- * there is more than one.
- *
- * Note: '*' support is not implemented
- *       '!' could never be invoked
- */
-int
-fn_complete(EditLine *el,
-	char *(*complet_func)(const char *, int),
-	char **(*attempted_completion_function)(const char *, int, int),
-	const Char *word_break, const Char *special_prefixes,
-	const char *(*app_func)(const char *), size_t query_items,
-	int *completion_type, int *over, int *point, int *end)
-{
-	const TYPE(LineInfo) *li;
-	Char *temp;
-        char **matches;
-	const Char *ctemp;
-	size_t len;
-	int what_to_do = '\t';
-	int retval = CC_NORM;
-
-	if (el->el_state.lastcmd == el->el_state.thiscmd)
-		what_to_do = '?';
-
-	/* readline's rl_complete() has to be told what we did... */
-	if (completion_type != NULL)
-		*completion_type = what_to_do;
-
-	if (!complet_func)
-		complet_func = fn_filename_completion_function;
-	if (!app_func)
-		app_func = append_char_function;
-
-	/* We now look backwards for the start of a filename/variable word */
-	li = FUN(el,line)(el);
-	ctemp = li->cursor;
-	while (ctemp > li->buffer
-	    && !Strchr(word_break, ctemp[-1])
-	    && (!special_prefixes || !Strchr(special_prefixes, ctemp[-1]) ) )
-		ctemp--;
-
-	len = (size_t)(li->cursor - ctemp);
-	temp = el_malloc((len + 1) * sizeof(*temp));
-	(void)Strncpy(temp, ctemp, len);
-	temp[len] = '\0';
-
-	/* these can be used by function called in completion_matches() */
-	/* or (*attempted_completion_function)() */
-	if (point != 0)
-		*point = (int)(li->cursor - li->buffer);
-	if (end != NULL)
-		*end = (int)(li->lastchar - li->buffer);
-
-	if (attempted_completion_function) {
-		int cur_off = (int)(li->cursor - li->buffer);
-		matches = (*attempted_completion_function)(
-		    ct_encode_string(temp, &el->el_scratch),
-		    cur_off - (int)len, cur_off);
-	} else
-		matches = 0;
-	if (!attempted_completion_function || 
-	    (over != NULL && !*over && !matches))
-		matches = completion_matches(
-		    ct_encode_string(temp, &el->el_scratch), complet_func);
-
-	if (over != NULL)
-		*over = 0;
-
-	if (matches) {
-		int i;
-		size_t matches_num, maxlen, match_len, match_display=1;
-
-		retval = CC_REFRESH;
-		/*
-		 * Only replace the completed string with common part of
-		 * possible matches if there is possible completion.
-		 */
-		if (matches[0][0] != '\0') {
-			el_deletestr(el, (int) len);
-			FUN(el,insertstr)(el,
-			    ct_decode_string(matches[0], &el->el_scratch));
-		}
-
-		if (what_to_do == '?')
-			goto display_matches;
-
-		if (matches[2] == NULL &&
-		    (matches[1] == NULL || strcmp(matches[0], matches[1]) == 0)) {
-			/*
-			 * We found exact match. Add a space after
-			 * it, unless we do filename completion and the
-			 * object is a directory.
-			 */
-			FUN(el,insertstr)(el,
-			    ct_decode_string((*app_func)(matches[0]),
-			    &el->el_scratch));
-		} else if (what_to_do == '!') {
-    display_matches:
-			/*
-			 * More than one match and requested to list possible
-			 * matches.
-			 */
-
-			for(i = 1, maxlen = 0; matches[i]; i++) {
-				match_len = strlen(matches[i]);
-				if (match_len > maxlen)
-					maxlen = match_len;
-			}
-			/* matches[1] through matches[i-1] are available */
-			matches_num = (size_t)(i - 1);
-				
-			/* newline to get on next line from command line */
-			(void)fprintf(el->el_outfile, "\n");
-
-			/*
-			 * If there are too many items, ask user for display
-			 * confirmation.
-			 */
-			if (matches_num > query_items) {
-				(void)fprintf(el->el_outfile,
-				    "Display all %zu possibilities? (y or n) ",
-				    matches_num);
-				(void)fflush(el->el_outfile);
-				if (getc(stdin) != 'y')
-					match_display = 0;
-				(void)fprintf(el->el_outfile, "\n");
-			}
-
-			if (match_display) {
-				/*
-				 * Interface of this function requires the
-				 * strings be matches[1..num-1] for compat.
-				 * We have matches_num strings not counting
-				 * the prefix in matches[0], so we need to
-				 * add 1 to matches_num for the call.
-				 */
-				fn_display_match_list(el, matches,
-				    matches_num+1, maxlen);
-			}
-			retval = CC_REDISPLAY;
-		} else if (matches[0][0]) {
-			/*
-			 * There was some common match, but the name was
-			 * not complete enough. Next tab will print possible
-			 * completions.
-			 */
-			el_beep(el);
-		} else {
-			/* lcd is not a valid object - further specification */
-			/* is needed */
-			el_beep(el);
-			retval = CC_NORM;
-		}
-
-		/* free elements of array and the array itself */
-		for (i = 0; matches[i]; i++)
-			el_free(matches[i]);
-		el_free(matches);
-		matches = NULL;
-	}
-	el_free(temp);
-	return retval;
-}
-
-/*
- * el-compatible wrapper around rl_complete; needed for key binding
- */
-/* ARGSUSED */
-unsigned char
-_el_fn_complete(EditLine *el, int ch __attribute__((__unused__)))
-{
-	return (unsigned char)fn_complete(el, NULL, NULL,
-	    break_chars, NULL, NULL, (size_t)100,
-	    NULL, NULL, NULL, NULL);
-}
diff --git a/lib/libedit/filecomplete.h b/lib/libedit/filecomplete.h
deleted file mode 100644
index 971e6e059..000000000
--- a/lib/libedit/filecomplete.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: filecomplete.h,v 1.9 2009/12/30 22:37:40 christos Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jaromir Dolecek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _FILECOMPLETE_H_
-#define _FILECOMPLETE_H_
-
-int fn_complete(EditLine *,
-    char *(*)(const char *, int),
-    char **(*)(const char *, int, int),
-    const Char *, const Char *, const char *(*)(const char *), size_t,
-    int *, int *, int *, int *);
-
-void fn_display_match_list(EditLine *, char **, size_t, size_t);
-char *fn_tilde_expand(const char *);
-char *fn_filename_completion_function(const char *, int);
-
-#endif
diff --git a/lib/libedit/hist.c b/lib/libedit/hist.c
deleted file mode 100644
index 77dbaabc4..000000000
--- a/lib/libedit/hist.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*	$NetBSD: hist.c,v 1.20 2011/07/29 15:16:33 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)hist.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: hist.c,v 1.20 2011/07/29 15:16:33 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * hist.c: History access functions
- */
-#include <stdlib.h>
-#include "el.h"
-
-/* hist_init():
- *	Initialization function.
- */
-protected int
-hist_init(EditLine *el)
-{
-
-	el->el_history.fun = NULL;
-	el->el_history.ref = NULL;
-	el->el_history.buf = el_malloc(EL_BUFSIZ * sizeof(*el->el_history.buf));
-	el->el_history.sz  = EL_BUFSIZ;
-	if (el->el_history.buf == NULL)
-		return -1;
-	el->el_history.last = el->el_history.buf;
-	return 0;
-}
-
-
-/* hist_end():
- *	clean up history;
- */
-protected void
-hist_end(EditLine *el)
-{
-
-	el_free(el->el_history.buf);
-	el->el_history.buf = NULL;
-}
-
-
-/* hist_set():
- *	Set new history interface
- */
-protected int
-hist_set(EditLine *el, hist_fun_t fun, void *ptr)
-{
-
-	el->el_history.ref = ptr;
-	el->el_history.fun = fun;
-	return 0;
-}
-
-
-/* hist_get():
- *	Get a history line and update it in the buffer.
- *	eventno tells us the event to get.
- */
-protected el_action_t
-hist_get(EditLine *el)
-{
-	const Char *hp;
-	int h;
-
-	if (el->el_history.eventno == 0) {	/* if really the current line */
-		(void) Strncpy(el->el_line.buffer, el->el_history.buf,
-		    el->el_history.sz);
-		el->el_line.lastchar = el->el_line.buffer +
-		    (el->el_history.last - el->el_history.buf);
-
-#ifdef KSHVI
-		if (el->el_map.type == MAP_VI)
-			el->el_line.cursor = el->el_line.buffer;
-		else
-#endif /* KSHVI */
-			el->el_line.cursor = el->el_line.lastchar;
-
-		return CC_REFRESH;
-	}
-	if (el->el_history.ref == NULL)
-		return CC_ERROR;
-
-	hp = HIST_FIRST(el);
-
-	if (hp == NULL)
-		return CC_ERROR;
-
-	for (h = 1; h < el->el_history.eventno; h++)
-		if ((hp = HIST_NEXT(el)) == NULL) {
-			el->el_history.eventno = h;
-			return CC_ERROR;
-		}
-	(void) Strncpy(el->el_line.buffer, hp,
-			(size_t)(el->el_line.limit - el->el_line.buffer));
-	el->el_line.buffer[el->el_line.limit - el->el_line.buffer - 1] = '\0';
-	el->el_line.lastchar = el->el_line.buffer + Strlen(el->el_line.buffer);
-
-	if (el->el_line.lastchar > el->el_line.buffer
-	    && el->el_line.lastchar[-1] == '\n')
-		el->el_line.lastchar--;
-	if (el->el_line.lastchar > el->el_line.buffer
-	    && el->el_line.lastchar[-1] == ' ')
-		el->el_line.lastchar--;
-#ifdef KSHVI
-	if (el->el_map.type == MAP_VI)
-		el->el_line.cursor = el->el_line.buffer;
-	else
-#endif /* KSHVI */
-		el->el_line.cursor = el->el_line.lastchar;
-
-	return CC_REFRESH;
-}
-
-
-/* hist_command()
- *	process a history command
- */
-protected int
-hist_command(EditLine *el, int argc, const Char **argv)
-{
-	const Char *str;
-	int num;
-	TYPE(HistEvent) ev;
-
-	if (el->el_history.ref == NULL)
-		return -1;
-
-	if (argc == 1 || Strcmp(argv[1], STR("list")) == 0) {
-		 /* List history entries */
-
-		for (str = HIST_LAST(el); str != NULL; str = HIST_PREV(el))
-			(void) fprintf(el->el_outfile, "%d %s",
-			    el->el_history.ev.num, ct_encode_string(str, &el->el_scratch));
-		return 0;
-	}
-
-	if (argc != 3)
-		return -1;
-
-	num = (int)Strtol(argv[2], NULL, 0);
-
-	if (Strcmp(argv[1], STR("size")) == 0)
-		return FUNW(history)(el->el_history.ref, &ev, H_SETSIZE, num);
-
-	if (Strcmp(argv[1], STR("unique")) == 0)
-		return FUNW(history)(el->el_history.ref, &ev, H_SETUNIQUE, num);
-
-	return -1;
-}
-
-/* hist_enlargebuf()
- *	Enlarge history buffer to specified value. Called from el_enlargebufs().
- *	Return 0 for failure, 1 for success.
- */
-protected int
-/*ARGSUSED*/
-hist_enlargebuf(EditLine *el, size_t oldsz, size_t newsz)
-{
-	Char *newbuf;
-
-	newbuf = el_realloc(el->el_history.buf, newsz * sizeof(*newbuf));
-	if (!newbuf)
-		return 0;
-
-	(void) memset(&newbuf[oldsz], '\0', (newsz - oldsz) * sizeof(*newbuf));
-
-	el->el_history.last = newbuf +
-				(el->el_history.last - el->el_history.buf);
-	el->el_history.buf = newbuf;
-	el->el_history.sz  = newsz;
-
-	return 1;
-}
-
-#ifdef WIDECHAR
-protected wchar_t *
-hist_convert(EditLine *el, int fn, void *arg)
-{
-	HistEventW ev;
-	if ((*(el)->el_history.fun)((el)->el_history.ref, &ev, fn, arg) == -1)
-		return NULL;
-	return ct_decode_string((const char *)(const void *)ev.str,
-	    &el->el_scratch);
-}
-#endif
diff --git a/lib/libedit/hist.h b/lib/libedit/hist.h
deleted file mode 100644
index 58e5876c9..000000000
--- a/lib/libedit/hist.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*	$NetBSD: hist.h,v 1.14 2014/05/11 01:05:17 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)hist.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.hist.c: History functions
- */
-#ifndef _h_el_hist
-#define	_h_el_hist
-
-#include "histedit.h"
-
-typedef int (*hist_fun_t)(void *, TYPE(HistEvent) *, int, ...);
-
-typedef struct el_history_t {
-	Char		*buf;		/* The history buffer		*/
-	size_t		sz;		/* Size of history buffer	*/
-	Char		*last;		/* The last character		*/
-	int		 eventno;	/* Event we are looking for	*/
-	void *		 ref;		/* Argument for history fcns	*/
-	hist_fun_t	 fun;		/* Event access			*/
-	TYPE(HistEvent)	 ev;		/* Event cookie			*/
-} el_history_t;
-
-#define	HIST_FUN_INTERNAL(el, fn, arg)	\
-    ((((*(el)->el_history.fun) ((el)->el_history.ref, &(el)->el_history.ev, \
-	fn, arg)) == -1) ? NULL : (el)->el_history.ev.str)
-#ifdef WIDECHAR
-#define HIST_FUN(el, fn, arg) \
-    (((el)->el_flags & NARROW_HISTORY) ? hist_convert(el, fn, arg) : \
-	HIST_FUN_INTERNAL(el, fn, arg))
-#else
-#define HIST_FUN(el, fn, arg) HIST_FUN_INTERNAL(el, fn, arg)
-#endif
-
-
-#define	HIST_NEXT(el)		HIST_FUN(el, H_NEXT, NULL)
-#define	HIST_FIRST(el)		HIST_FUN(el, H_FIRST, NULL)
-#define	HIST_LAST(el)		HIST_FUN(el, H_LAST, NULL)
-#define	HIST_PREV(el)		HIST_FUN(el, H_PREV, NULL)
-#define	HIST_SET(el, num)	HIST_FUN(el, H_SET, num)
-#define	HIST_LOAD(el, fname)	HIST_FUN(el, H_LOAD fname)
-#define	HIST_SAVE(el, fname)	HIST_FUN(el, H_SAVE fname)
-#define	HIST_SAVE_FP(el, fp)	HIST_FUN(el, H_SAVE_FP fp)
-
-protected int		hist_init(EditLine *);
-protected void		hist_end(EditLine *);
-protected el_action_t	hist_get(EditLine *);
-protected int		hist_set(EditLine *, hist_fun_t, void *);
-protected int		hist_command(EditLine *, int, const Char **);
-protected int		hist_enlargebuf(EditLine *, size_t, size_t);
-#ifdef WIDECHAR
-protected wchar_t 	*hist_convert(EditLine *, int, void *);
-#endif
-
-#endif /* _h_el_hist */
diff --git a/lib/libedit/histedit.h b/lib/libedit/histedit.h
deleted file mode 100644
index 94f33ed2a..000000000
--- a/lib/libedit/histedit.h
+++ /dev/null
@@ -1,322 +0,0 @@
-/*	$NetBSD: histedit.h,v 1.53 2014/06/18 18:12:28 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)histedit.h	8.2 (Berkeley) 1/3/94
- */
-
-/*
- * histedit.h: Line editor and history interface.
- */
-#ifndef _HISTEDIT_H_
-#define	_HISTEDIT_H_
-
-#define	LIBEDIT_MAJOR 2
-#define	LIBEDIT_MINOR 11
-
-#include <sys/types.h>
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * ==== Editing ====
- */
-
-typedef struct editline EditLine;
-
-/*
- * For user-defined function interface
- */
-typedef struct lineinfo {
-	const char	*buffer;
-	const char	*cursor;
-	const char	*lastchar;
-} LineInfo;
-
-/*
- * EditLine editor function return codes.
- * For user-defined function interface
- */
-#define	CC_NORM		0
-#define	CC_NEWLINE	1
-#define	CC_EOF		2
-#define	CC_ARGHACK	3
-#define	CC_REFRESH	4
-#define	CC_CURSOR	5
-#define	CC_ERROR	6
-#define	CC_FATAL	7
-#define	CC_REDISPLAY	8
-#define	CC_REFRESH_BEEP	9
-
-/*
- * Initialization, cleanup, and resetting
- */
-EditLine	*el_init(const char *, FILE *, FILE *, FILE *);
-EditLine	*el_init_fd(const char *, FILE *, FILE *, FILE *,
-    int, int, int);
-void		 el_end(EditLine *);
-void		 el_reset(EditLine *);
-
-/*
- * Get a line, a character or push a string back in the input queue
- */
-const char	*el_gets(EditLine *, int *);
-int		 el_getc(EditLine *, char *);
-void		 el_push(EditLine *, const char *);
-
-/*
- * Beep!
- */
-void		 el_beep(EditLine *);
-
-/*
- * High level function internals control
- * Parses argc, argv array and executes builtin editline commands
- */
-int		 el_parse(EditLine *, int, const char **);
-
-/*
- * Low level editline access functions
- */
-int		 el_set(EditLine *, int, ...);
-int		 el_get(EditLine *, int, ...);
-unsigned char	_el_fn_complete(EditLine *, int);
-
-/*
- * el_set/el_get parameters
- *
- * When using el_wset/el_wget (as opposed to el_set/el_get):
- *   Char is wchar_t, otherwise it is char.
- *   prompt_func is el_wpfunc_t, otherwise it is el_pfunc_t .
-
- * Prompt function prototypes are:
- *   typedef char    *(*el_pfunct_t)  (EditLine *);
- *   typedef wchar_t *(*el_wpfunct_t) (EditLine *);
- *
- * For operations that support set or set/get, the argument types listed are for
- * the "set" operation. For "get", each listed type must be a pointer.
- * E.g. EL_EDITMODE takes an int when set, but an int* when get.
- * 
- * Operations that only support "get" have the correct argument types listed.
- */
-#define	EL_PROMPT	0	/* , prompt_func);		      set/get */
-#define	EL_TERMINAL	1	/* , const char *);		      set/get */
-#define	EL_EDITOR	2	/* , const Char *);		      set/get */
-#define	EL_SIGNAL	3	/* , int);			      set/get */
-#define	EL_BIND		4	/* , const Char *, ..., NULL);	      set     */
-#define	EL_TELLTC	5	/* , const Char *, ..., NULL);	      set     */
-#define	EL_SETTC	6	/* , const Char *, ..., NULL);	      set     */
-#define	EL_ECHOTC	7	/* , const Char *, ..., NULL);        set     */
-#define	EL_SETTY	8	/* , const Char *, ..., NULL);        set     */
-#define	EL_ADDFN	9	/* , const Char *, const Char,        set     */
-				/*   el_func_t);		 	      */
-#define	EL_HIST		10	/* , hist_fun_t, const void *);	      set     */
-#define	EL_EDITMODE	11	/* , int);			      set/get */
-#define	EL_RPROMPT	12	/* , prompt_func);		      set/get */
-#define	EL_GETCFN	13	/* , el_rfunc_t);		      set/get */
-#define	EL_CLIENTDATA	14	/* , void *);			      set/get */
-#define	EL_UNBUFFERED	15	/* , int);			      set/get */
-#define	EL_PREP_TERM	16	/* , int);			      set     */
-#define	EL_GETTC	17	/* , const Char *, ..., NULL);		  get */
-#define	EL_GETFP	18	/* , int, FILE **);		          get */
-#define	EL_SETFP	19	/* , int, FILE *);		      set     */
-#define	EL_REFRESH	20	/* , void);			      set     */
-#define	EL_PROMPT_ESC	21	/* , prompt_func, Char);	      set/get */
-#define	EL_RPROMPT_ESC	22	/* , prompt_func, Char);	      set/get */
-#define	EL_RESIZE	23	/* , el_zfunc_t, void *);	      set     */
-#define	EL_ALIAS_TEXT	24	/* , el_afunc_t, void *);	      set     */
-
-#define	EL_BUILTIN_GETCFN	(NULL)
-
-/*
- * Source named file or $PWD/.editrc or $HOME/.editrc
- */
-int		el_source(EditLine *, const char *);
-
-/*
- * Must be called when the terminal changes size; If EL_SIGNAL
- * is set this is done automatically otherwise it is the responsibility
- * of the application
- */
-void		 el_resize(EditLine *);
-
-/*
- * User-defined function interface.
- */
-const LineInfo	*el_line(EditLine *);
-int		 el_insertstr(EditLine *, const char *);
-void		 el_deletestr(EditLine *, int);
-
-
-/*
- * ==== History ====
- */
-
-typedef struct history History;
-
-typedef struct HistEvent {
-	int		 num;
-	const char	*str;
-} HistEvent;
-
-/*
- * History access functions.
- */
-History *	history_init(void);
-void		history_end(History *);
-
-int		history(History *, HistEvent *, int, ...);
-
-#define	H_FUNC		 0	/* , UTSL		*/
-#define	H_SETSIZE	 1	/* , const int);	*/
-#define	H_GETSIZE	 2	/* , void);		*/
-#define	H_FIRST		 3	/* , void);		*/
-#define	H_LAST		 4	/* , void);		*/
-#define	H_PREV		 5	/* , void);		*/
-#define	H_NEXT		 6	/* , void);		*/
-#define	H_CURR		 8	/* , const int);	*/
-#define	H_SET		 7	/* , int);		*/
-#define	H_ADD		 9	/* , const wchar_t *);	*/
-#define	H_ENTER		10	/* , const wchar_t *);	*/
-#define	H_APPEND	11	/* , const wchar_t *);	*/
-#define	H_END		12	/* , void);		*/
-#define	H_NEXT_STR	13	/* , const wchar_t *);	*/
-#define	H_PREV_STR	14	/* , const wchar_t *);	*/
-#define	H_NEXT_EVENT	15	/* , const int);	*/
-#define	H_PREV_EVENT	16	/* , const int);	*/
-#define	H_LOAD		17	/* , const char *);	*/
-#define	H_SAVE		18	/* , const char *);	*/
-#define	H_CLEAR		19	/* , void);		*/
-#define	H_SETUNIQUE	20	/* , int);		*/
-#define	H_GETUNIQUE	21	/* , void);		*/
-#define	H_DEL		22	/* , int);		*/
-#define	H_NEXT_EVDATA	23	/* , const int, histdata_t *);	*/
-#define	H_DELDATA	24	/* , int, histdata_t *);*/
-#define	H_REPLACE	25	/* , const char *, histdata_t);	*/
-#define	H_SAVE_FP	26	/* , FILE *);		*/
-
-
-
-/*
- * ==== Tokenization ====
- */
-
-typedef struct tokenizer Tokenizer;
-
-/*
- * String tokenization functions, using simplified sh(1) quoting rules
- */
-Tokenizer	*tok_init(const char *);
-void		 tok_end(Tokenizer *);
-void		 tok_reset(Tokenizer *);
-int		 tok_line(Tokenizer *, const LineInfo *,
-		    int *, const char ***, int *, int *);
-int		 tok_str(Tokenizer *, const char *,
-		    int *, const char ***);
-
-/*
- * Begin Wide Character Support
- */
-#ifdef __linux__
-/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#endif
-
-#include <wchar.h>
-#include <wctype.h>
-
-/*
- * Wide character versions
- */
-
-/*
- * ==== Editing ====
- */
-typedef struct lineinfow {
-	const wchar_t	*buffer;
-	const wchar_t	*cursor;
-	const wchar_t	*lastchar;
-} LineInfoW;
-
-const wchar_t	*el_wgets(EditLine *, int *);
-int		 el_wgetc(EditLine *, wchar_t *);
-void		 el_wpush(EditLine *, const wchar_t *);
-
-int		 el_wparse(EditLine *, int, const wchar_t **);
-
-int		 el_wset(EditLine *, int, ...);
-int		 el_wget(EditLine *, int, ...);
-
-int		 el_cursor(EditLine *, int);
-const LineInfoW	*el_wline(EditLine *);
-int		 el_winsertstr(EditLine *, const wchar_t *);
-#define          el_wdeletestr  el_deletestr
-
-/*
- * ==== History ====
- */
-typedef struct histeventW {
-	int		 num;
-	const wchar_t	*str;
-} HistEventW;
-
-typedef struct historyW HistoryW;
-
-HistoryW *	history_winit(void);
-void		history_wend(HistoryW *);
-
-int		history_w(HistoryW *, HistEventW *, int, ...);
-
-/*
- * ==== Tokenization ====
- */
-typedef struct tokenizerW TokenizerW;
-
-/* Wide character tokenizer support */
-TokenizerW	*tok_winit(const wchar_t *);
-void		 tok_wend(TokenizerW *);
-void		 tok_wreset(TokenizerW *);
-int		 tok_wline(TokenizerW *, const LineInfoW *,
-		    int *, const wchar_t ***, int *, int *);
-int		 tok_wstr(TokenizerW *, const wchar_t *,
-		    int *, const wchar_t ***);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _HISTEDIT_H_ */
diff --git a/lib/libedit/history.c b/lib/libedit/history.c
deleted file mode 100644
index 6cd05a475..000000000
--- a/lib/libedit/history.c
+++ /dev/null
@@ -1,1121 +0,0 @@
-/*	$NetBSD: history.c,v 1.47 2014/05/11 01:05:17 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)history.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: history.c,v 1.47 2014/05/11 01:05:17 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * hist.c: TYPE(History) access functions
- */
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <vis.h>
-#include <sys/stat.h>
-
-static const char hist_cookie[] = "_HiStOrY_V2_\n";
-
-#include "histedit.h"
-#include "chartype.h"
-
-typedef int (*history_gfun_t)(void *, TYPE(HistEvent) *);
-typedef int (*history_efun_t)(void *, TYPE(HistEvent) *, const Char *);
-typedef void (*history_vfun_t)(void *, TYPE(HistEvent) *);
-typedef int (*history_sfun_t)(void *, TYPE(HistEvent) *, const int);
-
-struct TYPE(history) {
-	void *h_ref;		/* Argument for history fcns	 */
-	int h_ent;		/* Last entry point for history	 */
-	history_gfun_t h_first;	/* Get the first element	 */
-	history_gfun_t h_next;	/* Get the next element		 */
-	history_gfun_t h_last;	/* Get the last element		 */
-	history_gfun_t h_prev;	/* Get the previous element	 */
-	history_gfun_t h_curr;	/* Get the current element	 */
-	history_sfun_t h_set;	/* Set the current element	 */
-	history_sfun_t h_del;	/* Set the given element	 */
-	history_vfun_t h_clear;	/* Clear the history list	 */
-	history_efun_t h_enter;	/* Add an element		 */
-	history_efun_t h_add;	/* Append to an element		 */
-};
-
-#define	HNEXT(h, ev)		(*(h)->h_next)((h)->h_ref, ev)
-#define	HFIRST(h, ev)		(*(h)->h_first)((h)->h_ref, ev)
-#define	HPREV(h, ev)		(*(h)->h_prev)((h)->h_ref, ev)
-#define	HLAST(h, ev)		(*(h)->h_last)((h)->h_ref, ev)
-#define	HCURR(h, ev)		(*(h)->h_curr)((h)->h_ref, ev)
-#define	HSET(h, ev, n)		(*(h)->h_set)((h)->h_ref, ev, n)
-#define	HCLEAR(h, ev)		(*(h)->h_clear)((h)->h_ref, ev)
-#define	HENTER(h, ev, str)	(*(h)->h_enter)((h)->h_ref, ev, str)
-#define	HADD(h, ev, str)	(*(h)->h_add)((h)->h_ref, ev, str)
-#define	HDEL(h, ev, n)		(*(h)->h_del)((h)->h_ref, ev, n)
-
-#define	h_strdup(a)	Strdup(a)
-#define	h_malloc(a)	malloc(a)
-#define	h_realloc(a, b)	realloc((a), (b))
-#define	h_free(a)	free(a)
-
-typedef struct {
-    int		num;
-    Char	*str;
-} HistEventPrivate;
-
-
-
-private int history_setsize(TYPE(History) *, TYPE(HistEvent) *, int);
-private int history_getsize(TYPE(History) *, TYPE(HistEvent) *);
-private int history_setunique(TYPE(History) *, TYPE(HistEvent) *, int);
-private int history_getunique(TYPE(History) *, TYPE(HistEvent) *);
-private int history_set_fun(TYPE(History) *, TYPE(History) *);
-private int history_load(TYPE(History) *, const char *);
-private int history_save(TYPE(History) *, const char *);
-private int history_save_fp(TYPE(History) *, FILE *);
-private int history_prev_event(TYPE(History) *, TYPE(HistEvent) *, int);
-private int history_next_event(TYPE(History) *, TYPE(HistEvent) *, int);
-private int history_next_string(TYPE(History) *, TYPE(HistEvent) *, const Char *);
-private int history_prev_string(TYPE(History) *, TYPE(HistEvent) *, const Char *);
-
-
-/***********************************************************************/
-
-/*
- * Builtin- history implementation
- */
-typedef struct hentry_t {
-	TYPE(HistEvent) ev;		/* What we return		 */
-	void *data;		/* data				 */
-	struct hentry_t *next;	/* Next entry			 */
-	struct hentry_t *prev;	/* Previous entry		 */
-} hentry_t;
-
-typedef struct history_t {
-	hentry_t list;		/* Fake list header element	*/
-	hentry_t *cursor;	/* Current element in the list	*/
-	int max;		/* Maximum number of events	*/
-	int cur;		/* Current number of events	*/
-	int eventid;		/* For generation of unique event id	 */
-	int flags;		/* TYPE(History) flags		*/
-#define H_UNIQUE	1	/* Store only unique elements	*/
-} history_t;
-
-private int history_def_next(void *, TYPE(HistEvent) *);
-private int history_def_first(void *, TYPE(HistEvent) *);
-private int history_def_prev(void *, TYPE(HistEvent) *);
-private int history_def_last(void *, TYPE(HistEvent) *);
-private int history_def_curr(void *, TYPE(HistEvent) *);
-private int history_def_set(void *, TYPE(HistEvent) *, const int);
-private void history_def_clear(void *, TYPE(HistEvent) *);
-private int history_def_enter(void *, TYPE(HistEvent) *, const Char *);
-private int history_def_add(void *, TYPE(HistEvent) *, const Char *);
-private int history_def_del(void *, TYPE(HistEvent) *, const int);
-
-private int history_def_init(void **, TYPE(HistEvent) *, int);
-private int history_def_insert(history_t *, TYPE(HistEvent) *, const Char *);
-private void history_def_delete(history_t *, TYPE(HistEvent) *, hentry_t *);
-
-private int history_deldata_nth(history_t *, TYPE(HistEvent) *, int, void **);
-private int history_set_nth(void *, TYPE(HistEvent) *, int);
-
-#define	history_def_setsize(p, num)(void) (((history_t *)p)->max = (num))
-#define	history_def_getsize(p)  (((history_t *)p)->cur)
-#define	history_def_getunique(p) (((((history_t *)p)->flags) & H_UNIQUE) != 0)
-#define	history_def_setunique(p, uni) \
-    if (uni) \
-	(((history_t *)p)->flags) |= H_UNIQUE; \
-    else \
-	(((history_t *)p)->flags) &= ~H_UNIQUE
-
-#define	he_strerror(code)	he_errlist[code]
-#define	he_seterrev(evp, code)	{\
-				    evp->num = code;\
-				    evp->str = he_strerror(code);\
-				}
-
-/* error messages */
-static const Char *const he_errlist[] = {
-	STR("OK"),
-	STR("unknown error"),
-	STR("malloc() failed"),
-	STR("first event not found"),
-	STR("last event not found"),
-	STR("empty list"),
-	STR("no next event"),
-	STR("no previous event"),
-	STR("current event is invalid"),
-	STR("event not found"),
-	STR("can't read history from file"),
-	STR("can't write history"),
-	STR("required parameter(s) not supplied"),
-	STR("history size negative"),
-	STR("function not allowed with other history-functions-set the default"),
-	STR("bad parameters")
-};
-/* error codes */
-#define	_HE_OK                   0
-#define	_HE_UNKNOWN		 1
-#define	_HE_MALLOC_FAILED        2
-#define	_HE_FIRST_NOTFOUND       3
-#define	_HE_LAST_NOTFOUND        4
-#define	_HE_EMPTY_LIST           5
-#define	_HE_END_REACHED          6
-#define	_HE_START_REACHED	 7
-#define	_HE_CURR_INVALID	 8
-#define	_HE_NOT_FOUND		 9
-#define	_HE_HIST_READ		10
-#define	_HE_HIST_WRITE		11
-#define	_HE_PARAM_MISSING	12
-#define	_HE_SIZE_NEGATIVE	13
-#define	_HE_NOT_ALLOWED		14
-#define	_HE_BAD_PARAM		15
-
-/* history_def_first():
- *	Default function to return the first event in the history.
- */
-private int
-history_def_first(void *p, TYPE(HistEvent) *ev)
-{
-	history_t *h = (history_t *) p;
-
-	h->cursor = h->list.next;
-	if (h->cursor != &h->list)
-		*ev = h->cursor->ev;
-	else {
-		he_seterrev(ev, _HE_FIRST_NOTFOUND);
-		return -1;
-	}
-
-	return 0;
-}
-
-
-/* history_def_last():
- *	Default function to return the last event in the history.
- */
-private int
-history_def_last(void *p, TYPE(HistEvent) *ev)
-{
-	history_t *h = (history_t *) p;
-
-	h->cursor = h->list.prev;
-	if (h->cursor != &h->list)
-		*ev = h->cursor->ev;
-	else {
-		he_seterrev(ev, _HE_LAST_NOTFOUND);
-		return -1;
-	}
-
-	return 0;
-}
-
-
-/* history_def_next():
- *	Default function to return the next event in the history.
- */
-private int
-history_def_next(void *p, TYPE(HistEvent) *ev)
-{
-	history_t *h = (history_t *) p;
-
-	if (h->cursor == &h->list) {
-		he_seterrev(ev, _HE_EMPTY_LIST);
-		return -1;
-	}
-
-	if (h->cursor->next == &h->list) {
-		he_seterrev(ev, _HE_END_REACHED);
-		return -1;
-	}
-
-        h->cursor = h->cursor->next;
-        *ev = h->cursor->ev;
-
-	return 0;
-}
-
-
-/* history_def_prev():
- *	Default function to return the previous event in the history.
- */
-private int
-history_def_prev(void *p, TYPE(HistEvent) *ev)
-{
-	history_t *h = (history_t *) p;
-
-	if (h->cursor == &h->list) {
-		he_seterrev(ev,
-		    (h->cur > 0) ? _HE_END_REACHED : _HE_EMPTY_LIST);
-		return -1;
-	}
-
-	if (h->cursor->prev == &h->list) {
-		he_seterrev(ev, _HE_START_REACHED);
-		return -1;
-	}
-
-        h->cursor = h->cursor->prev;
-        *ev = h->cursor->ev;
-
-	return 0;
-}
-
-
-/* history_def_curr():
- *	Default function to return the current event in the history.
- */
-private int
-history_def_curr(void *p, TYPE(HistEvent) *ev)
-{
-	history_t *h = (history_t *) p;
-
-	if (h->cursor != &h->list)
-		*ev = h->cursor->ev;
-	else {
-		he_seterrev(ev,
-		    (h->cur > 0) ? _HE_CURR_INVALID : _HE_EMPTY_LIST);
-		return -1;
-	}
-
-	return 0;
-}
-
-
-/* history_def_set():
- *	Default function to set the current event in the history to the
- *	given one.
- */
-private int
-history_def_set(void *p, TYPE(HistEvent) *ev, const int n)
-{
-	history_t *h = (history_t *) p;
-
-	if (h->cur == 0) {
-		he_seterrev(ev, _HE_EMPTY_LIST);
-		return -1;
-	}
-	if (h->cursor == &h->list || h->cursor->ev.num != n) {
-		for (h->cursor = h->list.next; h->cursor != &h->list;
-		    h->cursor = h->cursor->next)
-			if (h->cursor->ev.num == n)
-				break;
-	}
-	if (h->cursor == &h->list) {
-		he_seterrev(ev, _HE_NOT_FOUND);
-		return -1;
-	}
-	return 0;
-}
-
-
-/* history_set_nth():
- *	Default function to set the current event in the history to the
- *	n-th one.
- */
-private int
-history_set_nth(void *p, TYPE(HistEvent) *ev, int n)
-{
-	history_t *h = (history_t *) p;
-
-	if (h->cur == 0) {
-		he_seterrev(ev, _HE_EMPTY_LIST);
-		return -1;
-	}
-	for (h->cursor = h->list.prev; h->cursor != &h->list;
-	    h->cursor = h->cursor->prev)
-		if (n-- <= 0)
-			break;
-	if (h->cursor == &h->list) {
-		he_seterrev(ev, _HE_NOT_FOUND);
-		return -1;
-	}
-	return 0;
-}
-
-
-/* history_def_add():
- *	Append string to element
- */
-private int
-history_def_add(void *p, TYPE(HistEvent) *ev, const Char *str)
-{
-	history_t *h = (history_t *) p;
-	size_t len;
-	Char *s;
-	HistEventPrivate *evp = (void *)&h->cursor->ev;
-
-	if (h->cursor == &h->list)
-		return history_def_enter(p, ev, str);
-	len = Strlen(evp->str) + Strlen(str) + 1;
-	s = h_malloc(len * sizeof(*s));
-	if (s == NULL) {
-		he_seterrev(ev, _HE_MALLOC_FAILED);
-		return -1;
-	}
-	(void) Strncpy(s, h->cursor->ev.str, len);
-        s[len - 1] = '\0';
-	(void) Strncat(s, str, len - Strlen(s) - 1);
-	h_free(evp->str);
-	evp->str = s;
-	*ev = h->cursor->ev;
-	return 0;
-}
-
-
-private int
-history_deldata_nth(history_t *h, TYPE(HistEvent) *ev,
-    int num, void **data)
-{
-	if (history_set_nth(h, ev, num) != 0)
-		return -1;
-	/* magic value to skip delete (just set to n-th history) */
-	if (data == (void **)-1)
-		return 0;
-	ev->str = Strdup(h->cursor->ev.str);
-	ev->num = h->cursor->ev.num;
-	if (data)
-		*data = h->cursor->data;
-	history_def_delete(h, ev, h->cursor);
-	return 0;
-}
-
-
-/* history_def_del():
- *	Delete element hp of the h list
- */
-/* ARGSUSED */
-private int
-history_def_del(void *p, TYPE(HistEvent) *ev __attribute__((__unused__)),
-    const int num)
-{
-	history_t *h = (history_t *) p;
-	if (history_def_set(h, ev, num) != 0)
-		return -1;
-	ev->str = Strdup(h->cursor->ev.str);
-	ev->num = h->cursor->ev.num;
-	history_def_delete(h, ev, h->cursor);
-	return 0;
-}
-
-
-/* history_def_delete():
- *	Delete element hp of the h list
- */
-/* ARGSUSED */
-private void
-history_def_delete(history_t *h, 
-		   TYPE(HistEvent) *ev __attribute__((__unused__)), hentry_t *hp)
-{
-	HistEventPrivate *evp = (void *)&hp->ev;
-	if (hp == &h->list)
-		abort();
-	if (h->cursor == hp) {
-		h->cursor = hp->prev;
-		if (h->cursor == &h->list)
-			h->cursor = hp->next;
-	}
-	hp->prev->next = hp->next;
-	hp->next->prev = hp->prev;
-	h_free(evp->str);
-	h_free(hp);
-	h->cur--;
-}
-
-
-/* history_def_insert():
- *	Insert element with string str in the h list
- */
-private int
-history_def_insert(history_t *h, TYPE(HistEvent) *ev, const Char *str)
-{
-	hentry_t *c;
-
-	c = h_malloc(sizeof(*c));
-	if (c == NULL)
-		goto oomem;
-	if ((c->ev.str = h_strdup(str)) == NULL) {
-		h_free(c);
-		goto oomem;
-	}
-	c->data = NULL;
-	c->ev.num = ++h->eventid;
-	c->next = h->list.next;
-	c->prev = &h->list;
-	h->list.next->prev = c;
-	h->list.next = c;
-	h->cur++;
-	h->cursor = c;
-
-	*ev = c->ev;
-	return 0;
-oomem:
-	he_seterrev(ev, _HE_MALLOC_FAILED);
-	return -1;
-}
-
-
-/* history_def_enter():
- *	Default function to enter an item in the history
- */
-private int
-history_def_enter(void *p, TYPE(HistEvent) *ev, const Char *str)
-{
-	history_t *h = (history_t *) p;
-
-	if ((h->flags & H_UNIQUE) != 0 && h->list.next != &h->list &&
-	    Strcmp(h->list.next->ev.str, str) == 0)
-	    return 0;
-
-	if (history_def_insert(h, ev, str) == -1)
-		return -1;	/* error, keep error message */
-
-	/*
-         * Always keep at least one entry.
-         * This way we don't have to check for the empty list.
-         */
-	while (h->cur > h->max && h->cur > 0)
-		history_def_delete(h, ev, h->list.prev);
-
-	return 1;
-}
-
-
-/* history_def_init():
- *	Default history initialization function
- */
-/* ARGSUSED */
-private int
-history_def_init(void **p, TYPE(HistEvent) *ev __attribute__((__unused__)), int n)
-{
-	history_t *h = (history_t *) h_malloc(sizeof(*h));
-	if (h == NULL)
-		return -1;
-
-	if (n <= 0)
-		n = 0;
-	h->eventid = 0;
-	h->cur = 0;
-	h->max = n;
-	h->list.next = h->list.prev = &h->list;
-	h->list.ev.str = NULL;
-	h->list.ev.num = 0;
-	h->cursor = &h->list;
-	h->flags = 0;
-	*p = h;
-	return 0;
-}
-
-
-/* history_def_clear():
- *	Default history cleanup function
- */
-private void
-history_def_clear(void *p, TYPE(HistEvent) *ev)
-{
-	history_t *h = (history_t *) p;
-
-	while (h->list.prev != &h->list)
-		history_def_delete(h, ev, h->list.prev);
-	h->cursor = &h->list;
-	h->eventid = 0;
-	h->cur = 0;
-}
-
-
-
-
-/************************************************************************/
-
-/* history_init():
- *	Initialization function.
- */
-public TYPE(History) *
-FUN(history,init)(void)
-{
-	TYPE(HistEvent) ev;
-	TYPE(History) *h = (TYPE(History) *) h_malloc(sizeof(*h));
-	if (h == NULL)
-		return NULL;
-
-	if (history_def_init(&h->h_ref, &ev, 0) == -1) {
-		h_free(h);
-		return NULL;
-	}
-	h->h_ent = -1;
-	h->h_next = history_def_next;
-	h->h_first = history_def_first;
-	h->h_last = history_def_last;
-	h->h_prev = history_def_prev;
-	h->h_curr = history_def_curr;
-	h->h_set = history_def_set;
-	h->h_clear = history_def_clear;
-	h->h_enter = history_def_enter;
-	h->h_add = history_def_add;
-	h->h_del = history_def_del;
-
-	return h;
-}
-
-
-/* history_end():
- *	clean up history;
- */
-public void
-FUN(history,end)(TYPE(History) *h)
-{
-	TYPE(HistEvent) ev;
-
-	if (h->h_next == history_def_next)
-		history_def_clear(h->h_ref, &ev);
-	h_free(h->h_ref);
-	h_free(h);
-}
-
-
-
-/* history_setsize():
- *	Set history number of events
- */
-private int
-history_setsize(TYPE(History) *h, TYPE(HistEvent) *ev, int num)
-{
-
-	if (h->h_next != history_def_next) {
-		he_seterrev(ev, _HE_NOT_ALLOWED);
-		return -1;
-	}
-	if (num < 0) {
-		he_seterrev(ev, _HE_BAD_PARAM);
-		return -1;
-	}
-	history_def_setsize(h->h_ref, num);
-	return 0;
-}
-
-
-/* history_getsize():
- *      Get number of events currently in history
- */
-private int
-history_getsize(TYPE(History) *h, TYPE(HistEvent) *ev)
-{
-	if (h->h_next != history_def_next) {
-		he_seterrev(ev, _HE_NOT_ALLOWED);
-		return -1;
-	}
-	ev->num = history_def_getsize(h->h_ref);
-	if (ev->num < -1) {
-		he_seterrev(ev, _HE_SIZE_NEGATIVE);
-		return -1;
-	}
-	return 0;
-}
-
-
-/* history_setunique():
- *	Set if adjacent equal events should not be entered in history.
- */
-private int
-history_setunique(TYPE(History) *h, TYPE(HistEvent) *ev, int uni)
-{
-
-	if (h->h_next != history_def_next) {
-		he_seterrev(ev, _HE_NOT_ALLOWED);
-		return -1;
-	}
-	history_def_setunique(h->h_ref, uni);
-	return 0;
-}
-
-
-/* history_getunique():
- *	Get if adjacent equal events should not be entered in history.
- */
-private int
-history_getunique(TYPE(History) *h, TYPE(HistEvent) *ev)
-{
-	if (h->h_next != history_def_next) {
-		he_seterrev(ev, _HE_NOT_ALLOWED);
-		return -1;
-	}
-	ev->num = history_def_getunique(h->h_ref);
-	return 0;
-}
-
-
-/* history_set_fun():
- *	Set history functions
- */
-private int
-history_set_fun(TYPE(History) *h, TYPE(History) *nh)
-{
-	TYPE(HistEvent) ev;
-
-	if (nh->h_first == NULL || nh->h_next == NULL || nh->h_last == NULL ||
-	    nh->h_prev == NULL || nh->h_curr == NULL || nh->h_set == NULL ||
-	    nh->h_enter == NULL || nh->h_add == NULL || nh->h_clear == NULL ||
-	    nh->h_del == NULL || nh->h_ref == NULL) {
-		if (h->h_next != history_def_next) {
-			if (history_def_init(&h->h_ref, &ev, 0) == -1)
-				return -1;
-			h->h_first = history_def_first;
-			h->h_next = history_def_next;
-			h->h_last = history_def_last;
-			h->h_prev = history_def_prev;
-			h->h_curr = history_def_curr;
-			h->h_set = history_def_set;
-			h->h_clear = history_def_clear;
-			h->h_enter = history_def_enter;
-			h->h_add = history_def_add;
-			h->h_del = history_def_del;
-		}
-		return -1;
-	}
-	if (h->h_next == history_def_next)
-		history_def_clear(h->h_ref, &ev);
-
-	h->h_ent = -1;
-	h->h_first = nh->h_first;
-	h->h_next = nh->h_next;
-	h->h_last = nh->h_last;
-	h->h_prev = nh->h_prev;
-	h->h_curr = nh->h_curr;
-	h->h_set = nh->h_set;
-	h->h_clear = nh->h_clear;
-	h->h_enter = nh->h_enter;
-	h->h_add = nh->h_add;
-	h->h_del = nh->h_del;
-
-	return 0;
-}
-
-
-/* history_load():
- *	TYPE(History) load function
- */
-private int
-history_load(TYPE(History) *h, const char *fname)
-{
-	FILE *fp;
-	char *line;
-	size_t sz, max_size;
-	char *ptr;
-	int i = -1;
-	TYPE(HistEvent) ev;
-#ifdef WIDECHAR
-	static ct_buffer_t conv;
-#endif
-
-	if ((fp = fopen(fname, "r")) == NULL)
-		return i;
-
-	if ((line = fgetln(fp, &sz)) == NULL)
-		goto done;
-
-	if (strncmp(line, hist_cookie, sz) != 0)
-		goto done;
-
-	ptr = h_malloc((max_size = 1024) * sizeof(*ptr));
-	if (ptr == NULL)
-		goto done;
-	for (i = 0; (line = fgetln(fp, &sz)) != NULL; i++) {
-		char c = line[sz];
-
-		if (sz != 0 && line[sz - 1] == '\n')
-			line[--sz] = '\0';
-		else
-			line[sz] = '\0';
-
-		if (max_size < sz) {
-			char *nptr;
-			max_size = (sz + 1024) & (size_t)~1023;
-			nptr = h_realloc(ptr, max_size * sizeof(*ptr));
-			if (nptr == NULL) {
-				i = -1;
-				goto oomem;
-			}
-			ptr = nptr;
-		}
-		(void) strunvis(ptr, line);
-		line[sz] = c;
-		if (HENTER(h, &ev, ct_decode_string(ptr, &conv)) == -1) {
-			i = -1;
-			goto oomem;
-		}
-	}
-oomem:
-	h_free(ptr);
-done:
-	(void) fclose(fp);
-	return i;
-}
-
-
-/* history_save_fp():
- *	TYPE(History) save function
- */
-private int
-history_save_fp(TYPE(History) *h, FILE *fp)
-{
-	TYPE(HistEvent) ev;
-	int i = -1, retval;
-	size_t len, max_size;
-	char *ptr;
-	const char *str;
-#ifdef WIDECHAR
-	static ct_buffer_t conv;
-#endif
-
-	if (fchmod(fileno(fp), S_IRUSR|S_IWUSR) == -1)
-		goto done;
-	if (fputs(hist_cookie, fp) == EOF)
-		goto done;
-	ptr = h_malloc((max_size = 1024) * sizeof(*ptr));
-	if (ptr == NULL)
-		goto done;
-	for (i = 0, retval = HLAST(h, &ev);
-	    retval != -1;
-	    retval = HPREV(h, &ev), i++) {
-		str = ct_encode_string(ev.str, &conv);
-		len = strlen(str) * 4;
-		if (len >= max_size) {
-			char *nptr;
-			max_size = (len + 1024) & (size_t)~1023;
-			nptr = h_realloc(ptr, max_size * sizeof(*ptr));
-			if (nptr == NULL) {
-				i = -1;
-				goto oomem;
-			}
-			ptr = nptr;
-		}
-		(void) strvis(ptr, str, VIS_WHITE);
-		(void) fprintf(fp, "%s\n", ptr);
-	}
-oomem:
-	h_free(ptr);
-done:
-	return i;
-}
-
-
-/* history_save():
- *    History save function
- */
-private int
-history_save(TYPE(History) *h, const char *fname)
-{
-    FILE *fp;
-    int i;
-
-    if ((fp = fopen(fname, "w")) == NULL)
-	return -1;
-
-    i = history_save_fp(h, fp);
-
-    (void) fclose(fp);
-    return i;
-}
-
-
-/* history_prev_event():
- *	Find the previous event, with number given
- */
-private int
-history_prev_event(TYPE(History) *h, TYPE(HistEvent) *ev, int num)
-{
-	int retval;
-
-	for (retval = HCURR(h, ev); retval != -1; retval = HPREV(h, ev))
-		if (ev->num == num)
-			return 0;
-
-	he_seterrev(ev, _HE_NOT_FOUND);
-	return -1;
-}
-
-
-private int
-history_next_evdata(TYPE(History) *h, TYPE(HistEvent) *ev, int num, void **d)
-{
-	int retval;
-
-	for (retval = HCURR(h, ev); retval != -1; retval = HPREV(h, ev))
-		if (ev->num == num) {
-			if (d)
-				*d = ((history_t *)h->h_ref)->cursor->data;
-			return 0;
-		}
-
-	he_seterrev(ev, _HE_NOT_FOUND);
-	return -1;
-}
-
-
-/* history_next_event():
- *	Find the next event, with number given
- */
-private int
-history_next_event(TYPE(History) *h, TYPE(HistEvent) *ev, int num)
-{
-	int retval;
-
-	for (retval = HCURR(h, ev); retval != -1; retval = HNEXT(h, ev))
-		if (ev->num == num)
-			return 0;
-
-	he_seterrev(ev, _HE_NOT_FOUND);
-	return -1;
-}
-
-
-/* history_prev_string():
- *	Find the previous event beginning with string
- */
-private int
-history_prev_string(TYPE(History) *h, TYPE(HistEvent) *ev, const Char *str)
-{
-	size_t len = Strlen(str);
-	int retval;
-
-	for (retval = HCURR(h, ev); retval != -1; retval = HNEXT(h, ev))
-		if (Strncmp(str, ev->str, len) == 0)
-			return 0;
-
-	he_seterrev(ev, _HE_NOT_FOUND);
-	return -1;
-}
-
-
-/* history_next_string():
- *	Find the next event beginning with string
- */
-private int
-history_next_string(TYPE(History) *h, TYPE(HistEvent) *ev, const Char *str)
-{
-	size_t len = Strlen(str);
-	int retval;
-
-	for (retval = HCURR(h, ev); retval != -1; retval = HPREV(h, ev))
-		if (Strncmp(str, ev->str, len) == 0)
-			return 0;
-
-	he_seterrev(ev, _HE_NOT_FOUND);
-	return -1;
-}
-
-
-/* history():
- *	User interface to history functions.
- */
-int
-FUNW(history)(TYPE(History) *h, TYPE(HistEvent) *ev, int fun, ...)
-{
-	va_list va;
-	const Char *str;
-	int retval;
-
-	va_start(va, fun);
-
-	he_seterrev(ev, _HE_OK);
-
-	switch (fun) {
-	case H_GETSIZE:
-		retval = history_getsize(h, ev);
-		break;
-
-	case H_SETSIZE:
-		retval = history_setsize(h, ev, va_arg(va, int));
-		break;
-
-	case H_GETUNIQUE:
-		retval = history_getunique(h, ev);
-		break;
-
-	case H_SETUNIQUE:
-		retval = history_setunique(h, ev, va_arg(va, int));
-		break;
-
-	case H_ADD:
-		str = va_arg(va, const Char *);
-		retval = HADD(h, ev, str);
-		break;
-
-	case H_DEL:
-		retval = HDEL(h, ev, va_arg(va, const int));
-		break;
-
-	case H_ENTER:
-		str = va_arg(va, const Char *);
-		if ((retval = HENTER(h, ev, str)) != -1)
-			h->h_ent = ev->num;
-		break;
-
-	case H_APPEND:
-		str = va_arg(va, const Char *);
-		if ((retval = HSET(h, ev, h->h_ent)) != -1)
-			retval = HADD(h, ev, str);
-		break;
-
-	case H_FIRST:
-		retval = HFIRST(h, ev);
-		break;
-
-	case H_NEXT:
-		retval = HNEXT(h, ev);
-		break;
-
-	case H_LAST:
-		retval = HLAST(h, ev);
-		break;
-
-	case H_PREV:
-		retval = HPREV(h, ev);
-		break;
-
-	case H_CURR:
-		retval = HCURR(h, ev);
-		break;
-
-	case H_SET:
-		retval = HSET(h, ev, va_arg(va, const int));
-		break;
-
-	case H_CLEAR:
-		HCLEAR(h, ev);
-		retval = 0;
-		break;
-
-	case H_LOAD:
-		retval = history_load(h, va_arg(va, const char *));
-		if (retval == -1)
-			he_seterrev(ev, _HE_HIST_READ);
-		break;
-
-	case H_SAVE:
-		retval = history_save(h, va_arg(va, const char *));
-		if (retval == -1)
-			he_seterrev(ev, _HE_HIST_WRITE);
-		break;
-
-	case H_SAVE_FP:
-		retval = history_save_fp(h, va_arg(va, FILE *));
-		if (retval == -1)
-		    he_seterrev(ev, _HE_HIST_WRITE);
-		break;
-
-	case H_PREV_EVENT:
-		retval = history_prev_event(h, ev, va_arg(va, int));
-		break;
-
-	case H_NEXT_EVENT:
-		retval = history_next_event(h, ev, va_arg(va, int));
-		break;
-
-	case H_PREV_STR:
-		retval = history_prev_string(h, ev, va_arg(va, const Char *));
-		break;
-
-	case H_NEXT_STR:
-		retval = history_next_string(h, ev, va_arg(va, const Char *));
-		break;
-
-	case H_FUNC:
-	{
-		TYPE(History) hf;
-
-		hf.h_ref = va_arg(va, void *);
-		h->h_ent = -1;
-		hf.h_first = va_arg(va, history_gfun_t);
-		hf.h_next = va_arg(va, history_gfun_t);
-		hf.h_last = va_arg(va, history_gfun_t);
-		hf.h_prev = va_arg(va, history_gfun_t);
-		hf.h_curr = va_arg(va, history_gfun_t);
-		hf.h_set = va_arg(va, history_sfun_t);
-		hf.h_clear = va_arg(va, history_vfun_t);
-		hf.h_enter = va_arg(va, history_efun_t);
-		hf.h_add = va_arg(va, history_efun_t);
-		hf.h_del = va_arg(va, history_sfun_t);
-
-		if ((retval = history_set_fun(h, &hf)) == -1)
-			he_seterrev(ev, _HE_PARAM_MISSING);
-		break;
-	}
-
-	case H_END:
-		FUN(history,end)(h);
-		retval = 0;
-		break;
-
-	case H_NEXT_EVDATA:
-	{
-		int num = va_arg(va, int);
-		void **d = va_arg(va, void **);
-		retval = history_next_evdata(h, ev, num, d);
-		break;
-	}
-
-	case H_DELDATA:
-	{
-		int num = va_arg(va, int);
-		void **d = va_arg(va, void **);
-		retval = history_deldata_nth((history_t *)h->h_ref, ev, num, d);
-		break;
-	}
-
-	case H_REPLACE: /* only use after H_NEXT_EVDATA */
-	{
-		const Char *line = va_arg(va, const Char *);
-		void *d = va_arg(va, void *);
-		const Char *s;
-		if(!line || !(s = Strdup(line))) {
-			retval = -1;
-			break;
-		}
-		((history_t *)h->h_ref)->cursor->ev.str = s;
-		((history_t *)h->h_ref)->cursor->data = d;
-		retval = 0;
-		break;
-	}
-
-	default:
-		retval = -1;
-		he_seterrev(ev, _HE_UNKNOWN);
-		break;
-	}
-	va_end(va);
-	return retval;
-}
diff --git a/lib/libedit/keymacro.c b/lib/libedit/keymacro.c
deleted file mode 100644
index 1cab508fa..000000000
--- a/lib/libedit/keymacro.c
+++ /dev/null
@@ -1,671 +0,0 @@
-/*	$NetBSD: keymacro.c,v 1.7 2011/08/16 16:25:15 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)key.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: keymacro.c,v 1.7 2011/08/16 16:25:15 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * keymacro.c: This module contains the procedures for maintaining
- *	       the extended-key map.
- *
- *      An extended-key (key) is a sequence of keystrokes introduced
- *	with a sequence introducer and consisting of an arbitrary
- *	number of characters.  This module maintains a map (the
- *	el->el_keymacro.map)
- *	to convert these extended-key sequences into input strs
- *	(XK_STR), editor functions (XK_CMD), or unix commands (XK_EXE).
- *
- *      Warning:
- *	  If key is a substr of some other keys, then the longer
- *	  keys are lost!!  That is, if the keys "abcd" and "abcef"
- *	  are in el->el_keymacro.map, adding the key "abc" will cause
- *	  the first two definitions to be lost.
- *
- *      Restrictions:
- *      -------------
- *      1) It is not possible to have one key that is a
- *	   substr of another.
- */
-#include <string.h>
-#include <stdlib.h>
-
-#include "el.h"
-
-/*
- * The Nodes of the el->el_keymacro.map.  The el->el_keymacro.map is a
- * linked list of these node elements
- */
-struct keymacro_node_t {
-	Char		 ch;		/* single character of key 	 */
-	int		 type;		/* node type			 */
-	keymacro_value_t val;		/* command code or pointer to str,  */
-					/* if this is a leaf 		 */
-	struct keymacro_node_t *next;	/* ptr to next char of this key  */
-	struct keymacro_node_t *sibling;/* ptr to another key with same prefix*/
-};
-
-private int		 node_trav(EditLine *, keymacro_node_t *, Char *,
-    keymacro_value_t *);
-private int		 node__try(EditLine *, keymacro_node_t *, const Char *,
-    keymacro_value_t *, int);
-private keymacro_node_t	*node__get(Int);
-private void		 node__free(keymacro_node_t *);
-private void		 node__put(EditLine *, keymacro_node_t *);
-private int		 node__delete(EditLine *, keymacro_node_t **,
-    const Char *);
-private int		 node_lookup(EditLine *, const Char *,
-    keymacro_node_t *, size_t);
-private int		 node_enum(EditLine *, keymacro_node_t *, size_t);
-
-#define	KEY_BUFSIZ	EL_BUFSIZ
-
-
-/* keymacro_init():
- *	Initialize the key maps
- */
-protected int
-keymacro_init(EditLine *el)
-{
-
-	el->el_keymacro.buf = el_malloc(KEY_BUFSIZ *
-	    sizeof(*el->el_keymacro.buf));
-	if (el->el_keymacro.buf == NULL)
-		return -1;
-	el->el_keymacro.map = NULL;
-	keymacro_reset(el);
-	return 0;
-}
-
-/* keymacro_end():
- *	Free the key maps
- */
-protected void
-keymacro_end(EditLine *el)
-{
-
-	el_free(el->el_keymacro.buf);
-	el->el_keymacro.buf = NULL;
-	node__free(el->el_keymacro.map);
-}
-
-
-/* keymacro_map_cmd():
- *	Associate cmd with a key value
- */
-protected keymacro_value_t *
-keymacro_map_cmd(EditLine *el, int cmd)
-{
-
-	el->el_keymacro.val.cmd = (el_action_t) cmd;
-	return &el->el_keymacro.val;
-}
-
-
-/* keymacro_map_str():
- *	Associate str with a key value
- */
-protected keymacro_value_t *
-keymacro_map_str(EditLine *el, Char *str)
-{
-
-	el->el_keymacro.val.str = str;
-	return &el->el_keymacro.val;
-}
-
-
-/* keymacro_reset():
- *	Takes all nodes on el->el_keymacro.map and puts them on free list.
- *	Then initializes el->el_keymacro.map with arrow keys
- *	[Always bind the ansi arrow keys?]
- */
-protected void
-keymacro_reset(EditLine *el)
-{
-
-	node__put(el, el->el_keymacro.map);
-	el->el_keymacro.map = NULL;
-	return;
-}
-
-
-/* keymacro_get():
- *	Calls the recursive function with entry point el->el_keymacro.map
- *      Looks up *ch in map and then reads characters until a
- *      complete match is found or a mismatch occurs. Returns the
- *      type of the match found (XK_STR, XK_CMD, or XK_EXE).
- *      Returns NULL in val.str and XK_STR for no match.
- *      The last character read is returned in *ch.
- */
-protected int
-keymacro_get(EditLine *el, Char *ch, keymacro_value_t *val)
-{
-
-	return node_trav(el, el->el_keymacro.map, ch, val);
-}
-
-
-/* keymacro_add():
- *      Adds key to the el->el_keymacro.map and associates the value in
- *	val with it. If key is already is in el->el_keymacro.map, the new
- *	code is applied to the existing key. Ntype specifies if code is a
- *	command, an out str or a unix command.
- */
-protected void
-keymacro_add(EditLine *el, const Char *key, keymacro_value_t *val, int ntype)
-{
-
-	if (key[0] == '\0') {
-		(void) fprintf(el->el_errfile,
-		    "keymacro_add: Null extended-key not allowed.\n");
-		return;
-	}
-	if (ntype == XK_CMD && val->cmd == ED_SEQUENCE_LEAD_IN) {
-		(void) fprintf(el->el_errfile,
-		    "keymacro_add: sequence-lead-in command not allowed\n");
-		return;
-	}
-	if (el->el_keymacro.map == NULL)
-		/* tree is initially empty.  Set up new node to match key[0] */
-		el->el_keymacro.map = node__get(key[0]);
-			/* it is properly initialized */
-
-	/* Now recurse through el->el_keymacro.map */
-	(void) node__try(el, el->el_keymacro.map, key, val, ntype);
-	return;
-}
-
-
-/* keymacro_clear():
- *
- */
-protected void
-keymacro_clear(EditLine *el, el_action_t *map, const Char *in)
-{
-#ifdef WIDECHAR
-        if (*in > N_KEYS) /* can't be in the map */
-                return;
-#endif
-	if ((map[(unsigned char)*in] == ED_SEQUENCE_LEAD_IN) &&
-	    ((map == el->el_map.key &&
-	    el->el_map.alt[(unsigned char)*in] != ED_SEQUENCE_LEAD_IN) ||
-	    (map == el->el_map.alt &&
-	    el->el_map.key[(unsigned char)*in] != ED_SEQUENCE_LEAD_IN)))
-		(void) keymacro_delete(el, in);
-}
-
-
-/* keymacro_delete():
- *      Delete the key and all longer keys staring with key, if
- *      they exists.
- */
-protected int
-keymacro_delete(EditLine *el, const Char *key)
-{
-
-	if (key[0] == '\0') {
-		(void) fprintf(el->el_errfile,
-		    "keymacro_delete: Null extended-key not allowed.\n");
-		return -1;
-	}
-	if (el->el_keymacro.map == NULL)
-		return 0;
-
-	(void) node__delete(el, &el->el_keymacro.map, key);
-	return 0;
-}
-
-
-/* keymacro_print():
- *	Print the binding associated with key key.
- *	Print entire el->el_keymacro.map if null
- */
-protected void
-keymacro_print(EditLine *el, const Char *key)
-{
-
-	/* do nothing if el->el_keymacro.map is empty and null key specified */
-	if (el->el_keymacro.map == NULL && *key == 0)
-		return;
-
-	el->el_keymacro.buf[0] = '"';
-	if (node_lookup(el, key, el->el_keymacro.map, (size_t)1) <= -1)
-		/* key is not bound */
-		(void) fprintf(el->el_errfile, "Unbound extended key \"" FSTR
-		    "\"\n", key);
-	return;
-}
-
-
-/* node_trav():
- *	recursively traverses node in tree until match or mismatch is
- * 	found.  May read in more characters.
- */
-private int
-node_trav(EditLine *el, keymacro_node_t *ptr, Char *ch, keymacro_value_t *val)
-{
-
-	if (ptr->ch == *ch) {
-		/* match found */
-		if (ptr->next) {
-			/* key not complete so get next char */
-			if (FUN(el,getc)(el, ch) != 1) {/* if EOF or error */
-				val->cmd = ED_END_OF_FILE;
-				return XK_CMD;
-				/* PWP: Pretend we just read an end-of-file */
-			}
-			return node_trav(el, ptr->next, ch, val);
-		} else {
-			*val = ptr->val;
-			if (ptr->type != XK_CMD)
-				*ch = '\0';
-			return ptr->type;
-		}
-	} else {
-		/* no match found here */
-		if (ptr->sibling) {
-			/* try next sibling */
-			return node_trav(el, ptr->sibling, ch, val);
-		} else {
-			/* no next sibling -- mismatch */
-			val->str = NULL;
-			return XK_STR;
-		}
-	}
-}
-
-
-/* node__try():
- * 	Find a node that matches *str or allocate a new one
- */
-private int
-node__try(EditLine *el, keymacro_node_t *ptr, const Char *str,
-    keymacro_value_t *val, int ntype)
-{
-
-	if (ptr->ch != *str) {
-		keymacro_node_t *xm;
-
-		for (xm = ptr; xm->sibling != NULL; xm = xm->sibling)
-			if (xm->sibling->ch == *str)
-				break;
-		if (xm->sibling == NULL)
-			xm->sibling = node__get(*str);	/* setup new node */
-		ptr = xm->sibling;
-	}
-	if (*++str == '\0') {
-		/* we're there */
-		if (ptr->next != NULL) {
-			node__put(el, ptr->next);
-				/* lose longer keys with this prefix */
-			ptr->next = NULL;
-		}
-		switch (ptr->type) {
-		case XK_CMD:
-		case XK_NOD:
-			break;
-		case XK_STR:
-		case XK_EXE:
-			if (ptr->val.str)
-				el_free(ptr->val.str);
-			break;
-		default:
-			EL_ABORT((el->el_errfile, "Bad XK_ type %d\n",
-			    ptr->type));
-			break;
-		}
-
-		switch (ptr->type = ntype) {
-		case XK_CMD:
-			ptr->val = *val;
-			break;
-		case XK_STR:
-		case XK_EXE:
-			if ((ptr->val.str = Strdup(val->str)) == NULL)
-				return -1;
-			break;
-		default:
-			EL_ABORT((el->el_errfile, "Bad XK_ type %d\n", ntype));
-			break;
-		}
-	} else {
-		/* still more chars to go */
-		if (ptr->next == NULL)
-			ptr->next = node__get(*str);	/* setup new node */
-		(void) node__try(el, ptr->next, str, val, ntype);
-	}
-	return 0;
-}
-
-
-/* node__delete():
- *	Delete node that matches str
- */
-private int
-node__delete(EditLine *el, keymacro_node_t **inptr, const Char *str)
-{
-	keymacro_node_t *ptr;
-	keymacro_node_t *prev_ptr = NULL;
-
-	ptr = *inptr;
-
-	if (ptr->ch != *str) {
-		keymacro_node_t *xm;
-
-		for (xm = ptr; xm->sibling != NULL; xm = xm->sibling)
-			if (xm->sibling->ch == *str)
-				break;
-		if (xm->sibling == NULL)
-			return 0;
-		prev_ptr = xm;
-		ptr = xm->sibling;
-	}
-	if (*++str == '\0') {
-		/* we're there */
-		if (prev_ptr == NULL)
-			*inptr = ptr->sibling;
-		else
-			prev_ptr->sibling = ptr->sibling;
-		ptr->sibling = NULL;
-		node__put(el, ptr);
-		return 1;
-	} else if (ptr->next != NULL &&
-	    node__delete(el, &ptr->next, str) == 1) {
-		if (ptr->next != NULL)
-			return 0;
-		if (prev_ptr == NULL)
-			*inptr = ptr->sibling;
-		else
-			prev_ptr->sibling = ptr->sibling;
-		ptr->sibling = NULL;
-		node__put(el, ptr);
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
-
-/* node__put():
- *	Puts a tree of nodes onto free list using free(3).
- */
-private void
-node__put(EditLine *el, keymacro_node_t *ptr)
-{
-	if (ptr == NULL)
-		return;
-
-	if (ptr->next != NULL) {
-		node__put(el, ptr->next);
-		ptr->next = NULL;
-	}
-	node__put(el, ptr->sibling);
-
-	switch (ptr->type) {
-	case XK_CMD:
-	case XK_NOD:
-		break;
-	case XK_EXE:
-	case XK_STR:
-		if (ptr->val.str != NULL)
-			el_free(ptr->val.str);
-		break;
-	default:
-		EL_ABORT((el->el_errfile, "Bad XK_ type %d\n", ptr->type));
-		break;
-	}
-	el_free(ptr);
-}
-
-
-/* node__get():
- *	Returns pointer to a keymacro_node_t for ch.
- */
-private keymacro_node_t *
-node__get(Int ch)
-{
-	keymacro_node_t *ptr;
-
-	ptr = el_malloc(sizeof(*ptr));
-	if (ptr == NULL)
-		return NULL;
-	ptr->ch = ch;
-	ptr->type = XK_NOD;
-	ptr->val.str = NULL;
-	ptr->next = NULL;
-	ptr->sibling = NULL;
-	return ptr;
-}
-
-private void
-node__free(keymacro_node_t *k)
-{
-	if (k == NULL)
-		return;
-	node__free(k->sibling);
-	node__free(k->next);
-	el_free(k);
-}
-
-/* node_lookup():
- *	look for the str starting at node ptr.
- *	Print if last node
- */
-private int
-node_lookup(EditLine *el, const Char *str, keymacro_node_t *ptr, size_t cnt)
-{
-	ssize_t used;
-
-	if (ptr == NULL)
-		return -1;	/* cannot have null ptr */
-
-	if (!str || *str == 0) {
-		/* no more chars in str.  node_enum from here. */
-		(void) node_enum(el, ptr, cnt);
-		return 0;
-	} else {
-		/* If match put this char into el->el_keymacro.buf.  Recurse */
-		if (ptr->ch == *str) {
-			/* match found */
-			used = ct_visual_char(el->el_keymacro.buf + cnt,
-			    KEY_BUFSIZ - cnt, ptr->ch);
-			if (used == -1)
-				return -1; /* ran out of buffer space */
-			if (ptr->next != NULL)
-				/* not yet at leaf */
-				return (node_lookup(el, str + 1, ptr->next,
-				    (size_t)used + cnt));
-			else {
-			    /* next node is null so key should be complete */
-				if (str[1] == 0) {
-					size_t px = cnt + (size_t)used;
-					el->el_keymacro.buf[px] = '"';
-					el->el_keymacro.buf[px + 1] = '\0';
-					keymacro_kprint(el, el->el_keymacro.buf,
-					    &ptr->val, ptr->type);
-					return 0;
-				} else
-					return -1;
-					/* mismatch -- str still has chars */
-			}
-		} else {
-			/* no match found try sibling */
-			if (ptr->sibling)
-				return (node_lookup(el, str, ptr->sibling,
-				    cnt));
-			else
-				return -1;
-		}
-	}
-}
-
-
-/* node_enum():
- *	Traverse the node printing the characters it is bound in buffer
- */
-private int
-node_enum(EditLine *el, keymacro_node_t *ptr, size_t cnt)
-{
-        ssize_t used;
-
-	if (cnt >= KEY_BUFSIZ - 5) {	/* buffer too small */
-		el->el_keymacro.buf[++cnt] = '"';
-		el->el_keymacro.buf[++cnt] = '\0';
-		(void) fprintf(el->el_errfile,
-		    "Some extended keys too long for internal print buffer");
-		(void) fprintf(el->el_errfile, " \"" FSTR "...\"\n",
-		    el->el_keymacro.buf);
-		return 0;
-	}
-	if (ptr == NULL) {
-#ifdef DEBUG_EDIT
-		(void) fprintf(el->el_errfile,
-		    "node_enum: BUG!! Null ptr passed\n!");
-#endif
-		return -1;
-	}
-	/* put this char at end of str */
-        used = ct_visual_char(el->el_keymacro.buf + cnt, KEY_BUFSIZ - cnt,
-	    ptr->ch);
-	if (ptr->next == NULL) {
-		/* print this key and function */
-		el->el_keymacro.buf[cnt + (size_t)used   ] = '"';
-		el->el_keymacro.buf[cnt + (size_t)used + 1] = '\0';
-		keymacro_kprint(el, el->el_keymacro.buf, &ptr->val, ptr->type);
-	} else
-		(void) node_enum(el, ptr->next, cnt + (size_t)used);
-
-	/* go to sibling if there is one */
-	if (ptr->sibling)
-		(void) node_enum(el, ptr->sibling, cnt);
-	return 0;
-}
-
-
-/* keymacro_kprint():
- *	Print the specified key and its associated
- *	function specified by val
- */
-protected void
-keymacro_kprint(EditLine *el, const Char *key, keymacro_value_t *val, int ntype)
-{
-	el_bindings_t *fp;
-	char unparsbuf[EL_BUFSIZ];
-	static const char fmt[] = "%-15s->  %s\n";
-
-	if (val != NULL)
-		switch (ntype) {
-		case XK_STR:
-		case XK_EXE:
-			(void) keymacro__decode_str(val->str, unparsbuf,
-			    sizeof(unparsbuf), 
-			    ntype == XK_STR ? "\"\"" : "[]");
-			(void) fprintf(el->el_outfile, fmt,
-			    ct_encode_string(key, &el->el_scratch), unparsbuf);
-			break;
-		case XK_CMD:
-			for (fp = el->el_map.help; fp->name; fp++)
-				if (val->cmd == fp->func) {
-                    ct_wcstombs(unparsbuf, fp->name, sizeof(unparsbuf));
-                    unparsbuf[sizeof(unparsbuf) -1] = '\0';
-					(void) fprintf(el->el_outfile, fmt,
-                        ct_encode_string(key, &el->el_scratch), unparsbuf);
-					break;
-				}
-#ifdef DEBUG_KEY
-			if (fp->name == NULL)
-				(void) fprintf(el->el_outfile,
-				    "BUG! Command not found.\n");
-#endif
-
-			break;
-		default:
-			EL_ABORT((el->el_errfile, "Bad XK_ type %d\n", ntype));
-			break;
-		}
-	else
-		(void) fprintf(el->el_outfile, fmt, ct_encode_string(key,
-		    &el->el_scratch), "no input");
-}
-
-
-#define ADDC(c) \
-	if (b < eb) \
-		*b++ = c; \
-	else \
-		b++
-/* keymacro__decode_str():
- *	Make a printable version of the ey
- */
-protected size_t
-keymacro__decode_str(const Char *str, char *buf, size_t len, const char *sep)
-{
-	char *b = buf, *eb = b + len;
-	const Char *p;
-
-	b = buf;
-	if (sep[0] != '\0') {
-		ADDC(sep[0]);
-	}
-	if (*str == '\0') {
-		ADDC('^');
-		ADDC('@');
-		goto add_endsep;
-	}
-	for (p = str; *p != 0; p++) {
-		Char dbuf[VISUAL_WIDTH_MAX];
-		Char *p2 = dbuf;
-		ssize_t l = ct_visual_char(dbuf, VISUAL_WIDTH_MAX, *p);
-		while (l-- > 0) {
-			ssize_t n = ct_encode_char(b, (size_t)(eb - b), *p2++);
-			if (n == -1) /* ran out of space */
-				goto add_endsep;
-			else
-				b += n;
-		}
-	}
-add_endsep:
-	if (sep[0] != '\0' && sep[1] != '\0') {
-		ADDC(sep[1]);
-	}
-	ADDC('\0');
-	if ((size_t)(b - buf) >= len)
-	    buf[len - 1] = '\0';
-	return (size_t)(b - buf);
-}
diff --git a/lib/libedit/keymacro.h b/lib/libedit/keymacro.h
deleted file mode 100644
index 2445de5a5..000000000
--- a/lib/libedit/keymacro.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: keymacro.h,v 1.2 2011/07/28 03:44:36 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)key.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.keymacro.h: Key macro header
- */
-#ifndef _h_el_keymacro
-#define	_h_el_keymacro
-
-typedef union keymacro_value_t {
-	el_action_t	 cmd;	/* If it is a command the #	*/
-	Char		*str;	/* If it is a string...		*/
-} keymacro_value_t;
-
-typedef struct keymacro_node_t keymacro_node_t;
-
-typedef struct el_keymacromacro_t {
-	Char		*buf;	/* Key print buffer		*/
-	keymacro_node_t	*map;	/* Key map			*/
-	keymacro_value_t val;	/* Local conversion buffer	*/
-} el_keymacro_t;
-
-#define	XK_CMD	0
-#define	XK_STR	1
-#define	XK_NOD	2
-#define	XK_EXE	3
-
-protected int keymacro_init(EditLine *);
-protected void keymacro_end(EditLine *);
-protected keymacro_value_t *keymacro_map_cmd(EditLine *, int);
-protected keymacro_value_t *keymacro_map_str(EditLine *, Char *);
-protected void keymacro_reset(EditLine *);
-protected int keymacro_get(EditLine *, Char *, keymacro_value_t *);
-protected void keymacro_add(EditLine *, const Char *, keymacro_value_t *, int);
-protected void keymacro_clear(EditLine *, el_action_t *, const Char *);
-protected int keymacro_delete(EditLine *, const Char *);
-protected void keymacro_print(EditLine *, const Char *);
-protected void keymacro_kprint(EditLine *, const Char *, keymacro_value_t *,
-    int);
-protected size_t keymacro__decode_str(const Char *, char *, size_t,
-    const char *);
-
-#endif /* _h_el_keymacro */
diff --git a/lib/libedit/makelist b/lib/libedit/makelist
deleted file mode 100644
index 588397bc6..000000000
--- a/lib/libedit/makelist
+++ /dev/null
@@ -1,259 +0,0 @@
-#!/bin/sh -
-#	$NetBSD: makelist,v 1.18 2012/03/21 05:34:54 matt Exp $
-#
-# Copyright (c) 1992, 1993
-#	The Regents of the University of California.  All rights reserved.
-#
-# This code is derived from software contributed to Berkeley by
-# Christos Zoulas of Cornell University.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must 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.
-#
-#	@(#)makelist	5.3 (Berkeley) 6/4/93
-
-# makelist.sh: Automatically generate header files...
-
-AWK=awk
-USAGE="Usage: $0 -n|-h|-e|-fc|-fh|-bc|-bh|-m <filenames>"
-
-if [ "x$1" = "x" ]
-then
-    echo $USAGE 1>&2
-    exit 1
-fi
-
-FLAG="$1"
-shift
-
-FILES="$@"
-
-case $FLAG in
-
-#	generate foo.h file from foo.c
-#
--n)
-    cat << _EOF
-#include "config.h"
-#undef WIDECHAR
-#define NARROWCHAR
-#include "${FILES}"
-_EOF
-    ;;
-    
--h)
-    set - `echo $FILES | sed -e 's/\\./_/g'`
-    hdr="_h_`basename $1`"
-    cat $FILES | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#ifndef %s\n#define %s\n", "'$hdr'", "'$hdr'");
-	}
-	/\(\):/ {
-	    pr = substr($2, 1, 2);
-	    if (pr == "vi" || pr == "em" || pr == "ed") {
-		name = substr($2, 1, length($2) - 3);
-#
-# XXX:	need a space between name and prototype so that -fc and -fh
-#	parsing is much easier
-#
-		printf("protected el_action_t\t%s (EditLine *, Int);\n", name);
-	    }
-	}
-	END {
-	    printf("#endif /* %s */\n", "'$hdr'");
-	}'
-	;;
-
-#	generate help.c from various .c files
-#
--bc)
-    cat $FILES | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#include \"config.h\"\n#include \"el.h\"\n");
-	    printf("#include \"chartype.h\"\n");
-	    printf("private const struct el_bindings_t el_func_help[] = {\n");
-	    low = "abcdefghijklmnopqrstuvwxyz_";
-	    high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_";
-	    for (i = 1; i <= length(low); i++)
-		tr[substr(low, i, 1)] = substr(high, i, 1);
-	}
-	/\(\):/ {
-	    pr = substr($2, 1, 2);
-	    if (pr == "vi" || pr == "em" || pr == "ed") {
-		name = substr($2, 1, length($2) - 3);
-		uname = "";
-		fname = "";
-		for (i = 1; i <= length(name); i++) {
-		    s = substr(name, i, 1);
-		    uname = uname tr[s];
-		    if (s == "_")
-			s = "-";
-		    fname = fname s;
-		}
-
-		printf("    { %-30.30s %-30.30s\n","STR(\"" fname "\"),", uname ",");
-		ok = 1;
-	    }
-	}
-	/^ \*/ {
-	    if (ok) {
-		printf("      STR(\"");
-		for (i = 2; i < NF; i++)
-		    printf("%s ", $i);
-		printf("%s\") },\n", $i);
-		ok = 0;
-	    }
-	}
-	END {
-	    printf("};\n");
-	    printf("\nprotected const el_bindings_t* help__get(void)");
-	    printf("{ return el_func_help; }\n");
-	}'
-	;;
-
-#	generate help.h from various .c files
-#
--bh)
-    $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#ifndef _h_help_c\n#define _h_help_c\n");
-	    printf("protected const el_bindings_t *help__get(void);\n");
-	    printf("#endif /* _h_help_c */\n");
-	}' /dev/null
-	;;
-
-#	generate fcns.h from various .h files
-#
--fh)
-    cat $FILES | $AWK '/el_action_t/ { print $3 }' | \
-    sort | tr '[:lower:]' '[:upper:]' | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n");
-	    count = 0;
-	}
-	{
-	    printf("#define\t%-30.30s\t%3d\n", $1, count++);
-	}
-	END {
-	    printf("#define\t%-30.30s\t%3d\n", "EL_NUM_FCNS", count);
-
-	    printf("typedef el_action_t (*el_func_t)(EditLine *, Int);");
-	    printf("\nprotected const el_func_t* func__get(void);\n");
-	    printf("#endif /* _h_fcns_c */\n");
-	}'
-	;;
-
-#	generate fcns.c from various .h files
-#
--fc)
-    cat $FILES | $AWK '/el_action_t/ { print $3 }' | sort | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#include \"config.h\"\n#include \"el.h\"\n");
-	    printf("private const el_func_t el_func[] = {");
-	    maxlen = 80;
-	    needn = 1;
-	    len = 0;
-	}
-	{
-	    clen = 25 + 2;
-	    len += clen;
-	    if (len >= maxlen)
-		needn = 1;
-	    if (needn) {
-		printf("\n    ");
-		needn = 0;
-		len = 4 + clen;
-	    }
-	    s = $1 ",";
-	    printf("%-26.26s ", s);
-	}
-	END {
-	    printf("\n};\n");
-	    printf("\nprotected const el_func_t* func__get(void) { return el_func; }\n");
-	}'
-	;;
-
-#	generate editline.c from various .c files
-#
--e)
-	echo "$FILES" | tr ' ' '\012' | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#define protected static\n");
-	    printf("#define SCCSID\n");
-	}
-	{
-	    printf("#include \"%s\"\n", $1);
-	}'
-	;;
-
-#	generate man page fragment from various .c files
-#
--m)
-    cat $FILES | $AWK '
-	BEGIN {
-	    printf(".\\\" Section automatically generated with makelist\n");
-	    printf(".Bl -tag -width 4n\n");
-	}
-	/\(\):/ {
-	    pr = substr($2, 1, 2);
-	    if (pr == "vi" || pr == "em" || pr == "ed") {
-		name = substr($2, 1, length($2) - 3);
-		fname = "";
-		for (i = 1; i <= length(name); i++) {
-		    s = substr(name, i, 1);
-		    if (s == "_")
-			s = "-";
-		    fname = fname s;
-		}
-
-		printf(".It Ic %s\n", fname);
-		ok = 1;
-	    }
-	}
-	/^ \*/ {
-	    if (ok) {
-		for (i = 2; i < NF; i++)
-		    printf("%s ", $i);
-		printf("%s.\n", $i);
-		ok = 0;
-	    }
-	}
-	END {
-	    printf(".El\n");
-	    printf(".\\\" End of section automatically generated with makelist\n");
-	}'
-	;;
-
-*)
-    echo $USAGE 1>&2
-    exit 1
-    ;;
-
-esac
diff --git a/lib/libedit/map.c b/lib/libedit/map.c
deleted file mode 100644
index 96da438bc..000000000
--- a/lib/libedit/map.c
+++ /dev/null
@@ -1,1422 +0,0 @@
-/*	$NetBSD: map.c,v 1.35 2015/05/14 10:44:15 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: map.c,v 1.35 2015/05/14 10:44:15 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * map.c: Editor function definitions
- */
-#include <stdlib.h>
-#include "el.h"
-
-private void	map_print_key(EditLine *, el_action_t *, const Char *);
-private void	map_print_some_keys(EditLine *, el_action_t *, Int, Int);
-private void	map_print_all_keys(EditLine *);
-private void	map_init_nls(EditLine *);
-private void	map_init_meta(EditLine *);
-
-/* keymap tables ; should be N_KEYS*sizeof(KEYCMD) bytes long */
-
-
-private const el_action_t  el_map_emacs[] = {
-	/*   0 */	EM_SET_MARK,		/* ^@ */
-	/*   1 */	ED_MOVE_TO_BEG,		/* ^A */
-	/*   2 */	ED_PREV_CHAR,		/* ^B */
-	/*   3 */	ED_TTY_SIGINT,		/* ^C */
-	/*   4 */	EM_DELETE_OR_LIST,	/* ^D */
-	/*   5 */	ED_MOVE_TO_END,		/* ^E */
-	/*   6 */	ED_NEXT_CHAR,		/* ^F */
-	/*   7 */	ED_UNASSIGNED,		/* ^G */
-	/*   8 */	EM_DELETE_PREV_CHAR,	/* ^H */
-	/*   9 */	ED_UNASSIGNED,		/* ^I */
-	/*  10 */	ED_NEWLINE,		/* ^J */
-	/*  11 */	ED_KILL_LINE,		/* ^K */
-	/*  12 */	ED_CLEAR_SCREEN,	/* ^L */
-	/*  13 */	ED_NEWLINE,		/* ^M */
-	/*  14 */	ED_NEXT_HISTORY,	/* ^N */
-	/*  15 */	ED_TTY_FLUSH_OUTPUT,	/* ^O */
-	/*  16 */	ED_PREV_HISTORY,	/* ^P */
-	/*  17 */	ED_TTY_START_OUTPUT,	/* ^Q */
-	/*  18 */	ED_REDISPLAY,		/* ^R */
-	/*  19 */	ED_TTY_STOP_OUTPUT,	/* ^S */
-	/*  20 */	ED_TRANSPOSE_CHARS,	/* ^T */
-	/*  21 */	EM_KILL_LINE,		/* ^U */
-	/*  22 */	ED_QUOTED_INSERT,	/* ^V */
-	/*  23 */	EM_KILL_REGION,		/* ^W */
-	/*  24 */	ED_SEQUENCE_LEAD_IN,	/* ^X */
-	/*  25 */	EM_YANK,		/* ^Y */
-	/*  26 */	ED_TTY_SIGTSTP,		/* ^Z */
-	/*  27 */	EM_META_NEXT,		/* ^[ */
-	/*  28 */	ED_TTY_SIGQUIT,		/* ^\ */
-	/*  29 */	ED_TTY_DSUSP,		/* ^] */
-	/*  30 */	ED_UNASSIGNED,		/* ^^ */
-	/*  31 */	ED_UNASSIGNED,		/* ^_ */
-	/*  32 */	ED_INSERT,		/* SPACE */
-	/*  33 */	ED_INSERT,		/* ! */
-	/*  34 */	ED_INSERT,		/* " */
-	/*  35 */	ED_INSERT,		/* # */
-	/*  36 */	ED_INSERT,		/* $ */
-	/*  37 */	ED_INSERT,		/* % */
-	/*  38 */	ED_INSERT,		/* & */
-	/*  39 */	ED_INSERT,		/* ' */
-	/*  40 */	ED_INSERT,		/* ( */
-	/*  41 */	ED_INSERT,		/* ) */
-	/*  42 */	ED_INSERT,		/* * */
-	/*  43 */	ED_INSERT,		/* + */
-	/*  44 */	ED_INSERT,		/* , */
-	/*  45 */	ED_INSERT,		/* - */
-	/*  46 */	ED_INSERT,		/* . */
-	/*  47 */	ED_INSERT,		/* / */
-	/*  48 */	ED_DIGIT,		/* 0 */
-	/*  49 */	ED_DIGIT,		/* 1 */
-	/*  50 */	ED_DIGIT,		/* 2 */
-	/*  51 */	ED_DIGIT,		/* 3 */
-	/*  52 */	ED_DIGIT,		/* 4 */
-	/*  53 */	ED_DIGIT,		/* 5 */
-	/*  54 */	ED_DIGIT,		/* 6 */
-	/*  55 */	ED_DIGIT,		/* 7 */
-	/*  56 */	ED_DIGIT,		/* 8 */
-	/*  57 */	ED_DIGIT,		/* 9 */
-	/*  58 */	ED_INSERT,		/* : */
-	/*  59 */	ED_INSERT,		/* ; */
-	/*  60 */	ED_INSERT,		/* < */
-	/*  61 */	ED_INSERT,		/* = */
-	/*  62 */	ED_INSERT,		/* > */
-	/*  63 */	ED_INSERT,		/* ? */
-	/*  64 */	ED_INSERT,		/* @ */
-	/*  65 */	ED_INSERT,		/* A */
-	/*  66 */	ED_INSERT,		/* B */
-	/*  67 */	ED_INSERT,		/* C */
-	/*  68 */	ED_INSERT,		/* D */
-	/*  69 */	ED_INSERT,		/* E */
-	/*  70 */	ED_INSERT,		/* F */
-	/*  71 */	ED_INSERT,		/* G */
-	/*  72 */	ED_INSERT,		/* H */
-	/*  73 */	ED_INSERT,		/* I */
-	/*  74 */	ED_INSERT,		/* J */
-	/*  75 */	ED_INSERT,		/* K */
-	/*  76 */	ED_INSERT,		/* L */
-	/*  77 */	ED_INSERT,		/* M */
-	/*  78 */	ED_INSERT,		/* N */
-	/*  79 */	ED_INSERT,		/* O */
-	/*  80 */	ED_INSERT,		/* P */
-	/*  81 */	ED_INSERT,		/* Q */
-	/*  82 */	ED_INSERT,		/* R */
-	/*  83 */	ED_INSERT,		/* S */
-	/*  84 */	ED_INSERT,		/* T */
-	/*  85 */	ED_INSERT,		/* U */
-	/*  86 */	ED_INSERT,		/* V */
-	/*  87 */	ED_INSERT,		/* W */
-	/*  88 */	ED_INSERT,		/* X */
-	/*  89 */	ED_INSERT,		/* Y */
-	/*  90 */	ED_INSERT,		/* Z */
-	/*  91 */	ED_INSERT,		/* [ */
-	/*  92 */	ED_INSERT,		/* \ */
-	/*  93 */	ED_INSERT,		/* ] */
-	/*  94 */	ED_INSERT,		/* ^ */
-	/*  95 */	ED_INSERT,		/* _ */
-	/*  96 */	ED_INSERT,		/* ` */
-	/*  97 */	ED_INSERT,		/* a */
-	/*  98 */	ED_INSERT,		/* b */
-	/*  99 */	ED_INSERT,		/* c */
-	/* 100 */	ED_INSERT,		/* d */
-	/* 101 */	ED_INSERT,		/* e */
-	/* 102 */	ED_INSERT,		/* f */
-	/* 103 */	ED_INSERT,		/* g */
-	/* 104 */	ED_INSERT,		/* h */
-	/* 105 */	ED_INSERT,		/* i */
-	/* 106 */	ED_INSERT,		/* j */
-	/* 107 */	ED_INSERT,		/* k */
-	/* 108 */	ED_INSERT,		/* l */
-	/* 109 */	ED_INSERT,		/* m */
-	/* 110 */	ED_INSERT,		/* n */
-	/* 111 */	ED_INSERT,		/* o */
-	/* 112 */	ED_INSERT,		/* p */
-	/* 113 */	ED_INSERT,		/* q */
-	/* 114 */	ED_INSERT,		/* r */
-	/* 115 */	ED_INSERT,		/* s */
-	/* 116 */	ED_INSERT,		/* t */
-	/* 117 */	ED_INSERT,		/* u */
-	/* 118 */	ED_INSERT,		/* v */
-	/* 119 */	ED_INSERT,		/* w */
-	/* 120 */	ED_INSERT,		/* x */
-	/* 121 */	ED_INSERT,		/* y */
-	/* 122 */	ED_INSERT,		/* z */
-	/* 123 */	ED_INSERT,		/* { */
-	/* 124 */	ED_INSERT,		/* | */
-	/* 125 */	ED_INSERT,		/* } */
-	/* 126 */	ED_INSERT,		/* ~ */
-	/* 127 */	EM_DELETE_PREV_CHAR,	/* ^? */
-	/* 128 */	ED_UNASSIGNED,		/* M-^@ */
-	/* 129 */	ED_UNASSIGNED,		/* M-^A */
-	/* 130 */	ED_UNASSIGNED,		/* M-^B */
-	/* 131 */	ED_UNASSIGNED,		/* M-^C */
-	/* 132 */	ED_UNASSIGNED,		/* M-^D */
-	/* 133 */	ED_UNASSIGNED,		/* M-^E */
-	/* 134 */	ED_UNASSIGNED,		/* M-^F */
-	/* 135 */	ED_UNASSIGNED,		/* M-^G */
-	/* 136 */	ED_DELETE_PREV_WORD,	/* M-^H */
-	/* 137 */	ED_UNASSIGNED,		/* M-^I */
-	/* 138 */	ED_UNASSIGNED,		/* M-^J */
-	/* 139 */	ED_UNASSIGNED,		/* M-^K */
-	/* 140 */	ED_CLEAR_SCREEN,	/* M-^L */
-	/* 141 */	ED_UNASSIGNED,		/* M-^M */
-	/* 142 */	ED_UNASSIGNED,		/* M-^N */
-	/* 143 */	ED_UNASSIGNED,		/* M-^O */
-	/* 144 */	ED_UNASSIGNED,		/* M-^P */
-	/* 145 */	ED_UNASSIGNED,		/* M-^Q */
-	/* 146 */	ED_UNASSIGNED,		/* M-^R */
-	/* 147 */	ED_UNASSIGNED,		/* M-^S */
-	/* 148 */	ED_UNASSIGNED,		/* M-^T */
-	/* 149 */	ED_UNASSIGNED,		/* M-^U */
-	/* 150 */	ED_UNASSIGNED,		/* M-^V */
-	/* 151 */	ED_UNASSIGNED,		/* M-^W */
-	/* 152 */	ED_UNASSIGNED,		/* M-^X */
-	/* 153 */	ED_UNASSIGNED,		/* M-^Y */
-	/* 154 */	ED_UNASSIGNED,		/* M-^Z */
-	/* 155 */	ED_UNASSIGNED,		/* M-^[ */
-	/* 156 */	ED_UNASSIGNED,		/* M-^\ */
-	/* 157 */	ED_UNASSIGNED,		/* M-^] */
-	/* 158 */	ED_UNASSIGNED,		/* M-^^ */
-	/* 159 */	EM_COPY_PREV_WORD,	/* M-^_ */
-	/* 160 */	ED_UNASSIGNED,		/* M-SPACE */
-	/* 161 */	ED_UNASSIGNED,		/* M-! */
-	/* 162 */	ED_UNASSIGNED,		/* M-" */
-	/* 163 */	ED_UNASSIGNED,		/* M-# */
-	/* 164 */	ED_UNASSIGNED,		/* M-$ */
-	/* 165 */	ED_UNASSIGNED,		/* M-% */
-	/* 166 */	ED_UNASSIGNED,		/* M-& */
-	/* 167 */	ED_UNASSIGNED,		/* M-' */
-	/* 168 */	ED_UNASSIGNED,		/* M-( */
-	/* 169 */	ED_UNASSIGNED,		/* M-) */
-	/* 170 */	ED_UNASSIGNED,		/* M-* */
-	/* 171 */	ED_UNASSIGNED,		/* M-+ */
-	/* 172 */	ED_UNASSIGNED,		/* M-, */
-	/* 173 */	ED_UNASSIGNED,		/* M-- */
-	/* 174 */	ED_UNASSIGNED,		/* M-. */
-	/* 175 */	ED_UNASSIGNED,		/* M-/ */
-	/* 176 */	ED_ARGUMENT_DIGIT,	/* M-0 */
-	/* 177 */	ED_ARGUMENT_DIGIT,	/* M-1 */
-	/* 178 */	ED_ARGUMENT_DIGIT,	/* M-2 */
-	/* 179 */	ED_ARGUMENT_DIGIT,	/* M-3 */
-	/* 180 */	ED_ARGUMENT_DIGIT,	/* M-4 */
-	/* 181 */	ED_ARGUMENT_DIGIT,	/* M-5 */
-	/* 182 */	ED_ARGUMENT_DIGIT,	/* M-6 */
-	/* 183 */	ED_ARGUMENT_DIGIT,	/* M-7 */
-	/* 184 */	ED_ARGUMENT_DIGIT,	/* M-8 */
-	/* 185 */	ED_ARGUMENT_DIGIT,	/* M-9 */
-	/* 186 */	ED_UNASSIGNED,		/* M-: */
-	/* 187 */	ED_UNASSIGNED,		/* M-; */
-	/* 188 */	ED_UNASSIGNED,		/* M-< */
-	/* 189 */	ED_UNASSIGNED,		/* M-= */
-	/* 190 */	ED_UNASSIGNED,		/* M-> */
-	/* 191 */	ED_UNASSIGNED,		/* M-? */
-	/* 192 */	ED_UNASSIGNED,		/* M-@ */
-	/* 193 */	ED_UNASSIGNED,		/* M-A */
-	/* 194 */	ED_PREV_WORD,		/* M-B */
-	/* 195 */	EM_CAPITOL_CASE,	/* M-C */
-	/* 196 */	EM_DELETE_NEXT_WORD,	/* M-D */
-	/* 197 */	ED_UNASSIGNED,		/* M-E */
-	/* 198 */	EM_NEXT_WORD,		/* M-F */
-	/* 199 */	ED_UNASSIGNED,		/* M-G */
-	/* 200 */	ED_UNASSIGNED,		/* M-H */
-	/* 201 */	ED_UNASSIGNED,		/* M-I */
-	/* 202 */	ED_UNASSIGNED,		/* M-J */
-	/* 203 */	ED_UNASSIGNED,		/* M-K */
-	/* 204 */	EM_LOWER_CASE,		/* M-L */
-	/* 205 */	ED_UNASSIGNED,		/* M-M */
-	/* 206 */	ED_SEARCH_NEXT_HISTORY,	/* M-N */
-	/* 207 */	ED_SEQUENCE_LEAD_IN,	/* M-O */
-	/* 208 */	ED_SEARCH_PREV_HISTORY,	/* M-P */
-	/* 209 */	ED_UNASSIGNED,		/* M-Q */
-	/* 210 */	ED_UNASSIGNED,		/* M-R */
-	/* 211 */	ED_UNASSIGNED,		/* M-S */
-	/* 212 */	ED_UNASSIGNED,		/* M-T */
-	/* 213 */	EM_UPPER_CASE,		/* M-U */
-	/* 214 */	ED_UNASSIGNED,		/* M-V */
-	/* 215 */	EM_COPY_REGION,		/* M-W */
-	/* 216 */	ED_COMMAND,		/* M-X */
-	/* 217 */	ED_UNASSIGNED,		/* M-Y */
-	/* 218 */	ED_UNASSIGNED,		/* M-Z */
-	/* 219 */	ED_SEQUENCE_LEAD_IN,	/* M-[ */
-	/* 220 */	ED_UNASSIGNED,		/* M-\ */
-	/* 221 */	ED_UNASSIGNED,		/* M-] */
-	/* 222 */	ED_UNASSIGNED,		/* M-^ */
-	/* 223 */	ED_UNASSIGNED,		/* M-_ */
-	/* 223 */	ED_UNASSIGNED,		/* M-` */
-	/* 224 */	ED_UNASSIGNED,		/* M-a */
-	/* 225 */	ED_PREV_WORD,		/* M-b */
-	/* 226 */	EM_CAPITOL_CASE,	/* M-c */
-	/* 227 */	EM_DELETE_NEXT_WORD,	/* M-d */
-	/* 228 */	ED_UNASSIGNED,		/* M-e */
-	/* 229 */	EM_NEXT_WORD,		/* M-f */
-	/* 230 */	ED_UNASSIGNED,		/* M-g */
-	/* 231 */	ED_UNASSIGNED,		/* M-h */
-	/* 232 */	ED_UNASSIGNED,		/* M-i */
-	/* 233 */	ED_UNASSIGNED,		/* M-j */
-	/* 234 */	ED_UNASSIGNED,		/* M-k */
-	/* 235 */	EM_LOWER_CASE,		/* M-l */
-	/* 236 */	ED_UNASSIGNED,		/* M-m */
-	/* 237 */	ED_SEARCH_NEXT_HISTORY,	/* M-n */
-	/* 238 */	ED_UNASSIGNED,		/* M-o */
-	/* 239 */	ED_SEARCH_PREV_HISTORY,	/* M-p */
-	/* 240 */	ED_UNASSIGNED,		/* M-q */
-	/* 241 */	ED_UNASSIGNED,		/* M-r */
-	/* 242 */	ED_UNASSIGNED,		/* M-s */
-	/* 243 */	ED_UNASSIGNED,		/* M-t */
-	/* 244 */	EM_UPPER_CASE,		/* M-u */
-	/* 245 */	ED_UNASSIGNED,		/* M-v */
-	/* 246 */	EM_COPY_REGION,		/* M-w */
-	/* 247 */	ED_COMMAND,		/* M-x */
-	/* 248 */	ED_UNASSIGNED,		/* M-y */
-	/* 249 */	ED_UNASSIGNED,		/* M-z */
-	/* 250 */	ED_UNASSIGNED,		/* M-{ */
-	/* 251 */	ED_UNASSIGNED,		/* M-| */
-	/* 252 */	ED_UNASSIGNED,		/* M-} */
-	/* 253 */	ED_UNASSIGNED,		/* M-~ */
-	/* 254 */	ED_DELETE_PREV_WORD	/* M-^? */
-	/* 255 */
-};
-
-
-/*
- * keymap table for vi.  Each index into above tbl; should be
- * N_KEYS entries long.  Vi mode uses a sticky-extend to do command mode:
- * insert mode characters are in the normal keymap, and command mode
- * in the extended keymap.
- */
-private const el_action_t  el_map_vi_insert[] = {
-#ifdef KSHVI
-	/*   0 */	ED_UNASSIGNED,		/* ^@ */
-	/*   1 */	ED_INSERT,		/* ^A */
-	/*   2 */	ED_INSERT,		/* ^B */
-	/*   3 */	ED_INSERT,		/* ^C */
-	/*   4 */	VI_LIST_OR_EOF,		/* ^D */
-	/*   5 */	ED_INSERT,		/* ^E */
-	/*   6 */	ED_INSERT,		/* ^F */
-	/*   7 */	ED_INSERT,		/* ^G */
-	/*   8 */	VI_DELETE_PREV_CHAR,	/* ^H */   /* BackSpace key */
-	/*   9 */	ED_INSERT,		/* ^I */   /* Tab Key  */
-	/*  10 */	ED_NEWLINE,		/* ^J */
-	/*  11 */	ED_INSERT,		/* ^K */
-	/*  12 */	ED_INSERT,		/* ^L */
-	/*  13 */	ED_NEWLINE,		/* ^M */
-	/*  14 */	ED_INSERT,		/* ^N */
-	/*  15 */	ED_INSERT,		/* ^O */
-	/*  16 */	ED_INSERT,		/* ^P */
-	/*  17 */	ED_TTY_START_OUTPUT,	/* ^Q */
-	/*  18 */	ED_INSERT,		/* ^R */
-	/*  19 */	ED_TTY_STOP_OUTPUT,	/* ^S */
-	/*  20 */	ED_INSERT,		/* ^T */
-	/*  21 */	VI_KILL_LINE_PREV,	/* ^U */
-	/*  22 */	ED_QUOTED_INSERT,	/* ^V */
-	/*  23 */	ED_DELETE_PREV_WORD,	/* ^W */
-		/* ED_DELETE_PREV_WORD: Only until strt edit pos */
-	/*  24 */	ED_INSERT,		/* ^X */
-	/*  25 */	ED_INSERT,		/* ^Y */
-	/*  26 */	ED_INSERT,		/* ^Z */
-	/*  27 */	VI_COMMAND_MODE,	/* ^[ */  /* [ Esc ] key */
-	/*  28 */	ED_TTY_SIGQUIT,		/* ^\ */
-	/*  29 */	ED_INSERT,		/* ^] */
-	/*  30 */	ED_INSERT,		/* ^^ */
-	/*  31 */	ED_INSERT,		/* ^_ */
-#else /* !KSHVI */
-				/*
-				 * NOTE: These mappings do NOT Correspond well
-				 * to the KSH VI editing assignments.
-				 * On the other and they are convenient and
-				 * many people have have gotten used to them.
-				 */
-	/*   0 */	ED_UNASSIGNED,		/* ^@ */
-	/*   1 */	ED_MOVE_TO_BEG,		/* ^A */
-	/*   2 */	ED_PREV_CHAR,		/* ^B */
-	/*   3 */	ED_TTY_SIGINT,		/* ^C */
-	/*   4 */	VI_LIST_OR_EOF,		/* ^D */
-	/*   5 */	ED_MOVE_TO_END,		/* ^E */
-	/*   6 */	ED_NEXT_CHAR,		/* ^F */
-	/*   7 */	ED_UNASSIGNED,		/* ^G */
-	/*   8 */	VI_DELETE_PREV_CHAR,	/* ^H */   /* BackSpace key */
-	/*   9 */	ED_UNASSIGNED,		/* ^I */   /* Tab Key */
-	/*  10 */	ED_NEWLINE,		/* ^J */
-	/*  11 */	ED_KILL_LINE,		/* ^K */
-	/*  12 */	ED_CLEAR_SCREEN,	/* ^L */
-	/*  13 */	ED_NEWLINE,		/* ^M */
-	/*  14 */	ED_NEXT_HISTORY,	/* ^N */
-	/*  15 */	ED_TTY_FLUSH_OUTPUT,	/* ^O */
-	/*  16 */	ED_PREV_HISTORY,	/* ^P */
-	/*  17 */	ED_TTY_START_OUTPUT,	/* ^Q */
-	/*  18 */	ED_REDISPLAY,		/* ^R */
-	/*  19 */	ED_TTY_STOP_OUTPUT,	/* ^S */
-	/*  20 */	ED_TRANSPOSE_CHARS,	/* ^T */
-	/*  21 */	VI_KILL_LINE_PREV,	/* ^U */
-	/*  22 */	ED_QUOTED_INSERT,	/* ^V */
-	/*  23 */	ED_DELETE_PREV_WORD,	/* ^W */
-	/*  24 */	ED_UNASSIGNED,		/* ^X */
-	/*  25 */	ED_TTY_DSUSP,		/* ^Y */
-	/*  26 */	ED_TTY_SIGTSTP,		/* ^Z */
-	/*  27 */	VI_COMMAND_MODE,	/* ^[ */
-	/*  28 */	ED_TTY_SIGQUIT,		/* ^\ */
-	/*  29 */	ED_UNASSIGNED,		/* ^] */
-	/*  30 */	ED_UNASSIGNED,		/* ^^ */
-	/*  31 */	ED_UNASSIGNED,		/* ^_ */
-#endif  /* KSHVI */
-	/*  32 */	ED_INSERT,		/* SPACE */
-	/*  33 */	ED_INSERT,		/* ! */
-	/*  34 */	ED_INSERT,		/* " */
-	/*  35 */	ED_INSERT,		/* # */
-	/*  36 */	ED_INSERT,		/* $ */
-	/*  37 */	ED_INSERT,		/* % */
-	/*  38 */	ED_INSERT,		/* & */
-	/*  39 */	ED_INSERT,		/* ' */
-	/*  40 */	ED_INSERT,		/* ( */
-	/*  41 */	ED_INSERT,		/* ) */
-	/*  42 */	ED_INSERT,		/* * */
-	/*  43 */	ED_INSERT,		/* + */
-	/*  44 */	ED_INSERT,		/* , */
-	/*  45 */	ED_INSERT,		/* - */
-	/*  46 */	ED_INSERT,		/* . */
-	/*  47 */	ED_INSERT,		/* / */
-	/*  48 */	ED_INSERT,		/* 0 */
-	/*  49 */	ED_INSERT,		/* 1 */
-	/*  50 */	ED_INSERT,		/* 2 */
-	/*  51 */	ED_INSERT,		/* 3 */
-	/*  52 */	ED_INSERT,		/* 4 */
-	/*  53 */	ED_INSERT,		/* 5 */
-	/*  54 */	ED_INSERT,		/* 6 */
-	/*  55 */	ED_INSERT,		/* 7 */
-	/*  56 */	ED_INSERT,		/* 8 */
-	/*  57 */	ED_INSERT,		/* 9 */
-	/*  58 */	ED_INSERT,		/* : */
-	/*  59 */	ED_INSERT,		/* ; */
-	/*  60 */	ED_INSERT,		/* < */
-	/*  61 */	ED_INSERT,		/* = */
-	/*  62 */	ED_INSERT,		/* > */
-	/*  63 */	ED_INSERT,		/* ? */
-	/*  64 */	ED_INSERT,		/* @ */
-	/*  65 */	ED_INSERT,		/* A */
-	/*  66 */	ED_INSERT,		/* B */
-	/*  67 */	ED_INSERT,		/* C */
-	/*  68 */	ED_INSERT,		/* D */
-	/*  69 */	ED_INSERT,		/* E */
-	/*  70 */	ED_INSERT,		/* F */
-	/*  71 */	ED_INSERT,		/* G */
-	/*  72 */	ED_INSERT,		/* H */
-	/*  73 */	ED_INSERT,		/* I */
-	/*  74 */	ED_INSERT,		/* J */
-	/*  75 */	ED_INSERT,		/* K */
-	/*  76 */	ED_INSERT,		/* L */
-	/*  77 */	ED_INSERT,		/* M */
-	/*  78 */	ED_INSERT,		/* N */
-	/*  79 */	ED_INSERT,		/* O */
-	/*  80 */	ED_INSERT,		/* P */
-	/*  81 */	ED_INSERT,		/* Q */
-	/*  82 */	ED_INSERT,		/* R */
-	/*  83 */	ED_INSERT,		/* S */
-	/*  84 */	ED_INSERT,		/* T */
-	/*  85 */	ED_INSERT,		/* U */
-	/*  86 */	ED_INSERT,		/* V */
-	/*  87 */	ED_INSERT,		/* W */
-	/*  88 */	ED_INSERT,		/* X */
-	/*  89 */	ED_INSERT,		/* Y */
-	/*  90 */	ED_INSERT,		/* Z */
-	/*  91 */	ED_INSERT,		/* [ */
-	/*  92 */	ED_INSERT,		/* \ */
-	/*  93 */	ED_INSERT,		/* ] */
-	/*  94 */	ED_INSERT,		/* ^ */
-	/*  95 */	ED_INSERT,		/* _ */
-	/*  96 */	ED_INSERT,		/* ` */
-	/*  97 */	ED_INSERT,		/* a */
-	/*  98 */	ED_INSERT,		/* b */
-	/*  99 */	ED_INSERT,		/* c */
-	/* 100 */	ED_INSERT,		/* d */
-	/* 101 */	ED_INSERT,		/* e */
-	/* 102 */	ED_INSERT,		/* f */
-	/* 103 */	ED_INSERT,		/* g */
-	/* 104 */	ED_INSERT,		/* h */
-	/* 105 */	ED_INSERT,		/* i */
-	/* 106 */	ED_INSERT,		/* j */
-	/* 107 */	ED_INSERT,		/* k */
-	/* 108 */	ED_INSERT,		/* l */
-	/* 109 */	ED_INSERT,		/* m */
-	/* 110 */	ED_INSERT,		/* n */
-	/* 111 */	ED_INSERT,		/* o */
-	/* 112 */	ED_INSERT,		/* p */
-	/* 113 */	ED_INSERT,		/* q */
-	/* 114 */	ED_INSERT,		/* r */
-	/* 115 */	ED_INSERT,		/* s */
-	/* 116 */	ED_INSERT,		/* t */
-	/* 117 */	ED_INSERT,		/* u */
-	/* 118 */	ED_INSERT,		/* v */
-	/* 119 */	ED_INSERT,		/* w */
-	/* 120 */	ED_INSERT,		/* x */
-	/* 121 */	ED_INSERT,		/* y */
-	/* 122 */	ED_INSERT,		/* z */
-	/* 123 */	ED_INSERT,		/* { */
-	/* 124 */	ED_INSERT,		/* | */
-	/* 125 */	ED_INSERT,		/* } */
-	/* 126 */	ED_INSERT,		/* ~ */
-	/* 127 */	VI_DELETE_PREV_CHAR,	/* ^? */
-	/* 128 */	ED_INSERT,		/* M-^@ */
-	/* 129 */	ED_INSERT,		/* M-^A */
-	/* 130 */	ED_INSERT,		/* M-^B */
-	/* 131 */	ED_INSERT,		/* M-^C */
-	/* 132 */	ED_INSERT,		/* M-^D */
-	/* 133 */	ED_INSERT,		/* M-^E */
-	/* 134 */	ED_INSERT,		/* M-^F */
-	/* 135 */	ED_INSERT,		/* M-^G */
-	/* 136 */	ED_INSERT,		/* M-^H */
-	/* 137 */	ED_INSERT,		/* M-^I */
-	/* 138 */	ED_INSERT,		/* M-^J */
-	/* 139 */	ED_INSERT,		/* M-^K */
-	/* 140 */	ED_INSERT,		/* M-^L */
-	/* 141 */	ED_INSERT,		/* M-^M */
-	/* 142 */	ED_INSERT,		/* M-^N */
-	/* 143 */	ED_INSERT,		/* M-^O */
-	/* 144 */	ED_INSERT,		/* M-^P */
-	/* 145 */	ED_INSERT,		/* M-^Q */
-	/* 146 */	ED_INSERT,		/* M-^R */
-	/* 147 */	ED_INSERT,		/* M-^S */
-	/* 148 */	ED_INSERT,		/* M-^T */
-	/* 149 */	ED_INSERT,		/* M-^U */
-	/* 150 */	ED_INSERT,		/* M-^V */
-	/* 151 */	ED_INSERT,		/* M-^W */
-	/* 152 */	ED_INSERT,		/* M-^X */
-	/* 153 */	ED_INSERT,		/* M-^Y */
-	/* 154 */	ED_INSERT,		/* M-^Z */
-	/* 155 */	ED_INSERT,		/* M-^[ */
-	/* 156 */	ED_INSERT,		/* M-^\ */
-	/* 157 */	ED_INSERT,		/* M-^] */
-	/* 158 */	ED_INSERT,		/* M-^^ */
-	/* 159 */	ED_INSERT,		/* M-^_ */
-	/* 160 */	ED_INSERT,		/* M-SPACE */
-	/* 161 */	ED_INSERT,		/* M-! */
-	/* 162 */	ED_INSERT,		/* M-" */
-	/* 163 */	ED_INSERT,		/* M-# */
-	/* 164 */	ED_INSERT,		/* M-$ */
-	/* 165 */	ED_INSERT,		/* M-% */
-	/* 166 */	ED_INSERT,		/* M-& */
-	/* 167 */	ED_INSERT,		/* M-' */
-	/* 168 */	ED_INSERT,		/* M-( */
-	/* 169 */	ED_INSERT,		/* M-) */
-	/* 170 */	ED_INSERT,		/* M-* */
-	/* 171 */	ED_INSERT,		/* M-+ */
-	/* 172 */	ED_INSERT,		/* M-, */
-	/* 173 */	ED_INSERT,		/* M-- */
-	/* 174 */	ED_INSERT,		/* M-. */
-	/* 175 */	ED_INSERT,		/* M-/ */
-	/* 176 */	ED_INSERT,		/* M-0 */
-	/* 177 */	ED_INSERT,		/* M-1 */
-	/* 178 */	ED_INSERT,		/* M-2 */
-	/* 179 */	ED_INSERT,		/* M-3 */
-	/* 180 */	ED_INSERT,		/* M-4 */
-	/* 181 */	ED_INSERT,		/* M-5 */
-	/* 182 */	ED_INSERT,		/* M-6 */
-	/* 183 */	ED_INSERT,		/* M-7 */
-	/* 184 */	ED_INSERT,		/* M-8 */
-	/* 185 */	ED_INSERT,		/* M-9 */
-	/* 186 */	ED_INSERT,		/* M-: */
-	/* 187 */	ED_INSERT,		/* M-; */
-	/* 188 */	ED_INSERT,		/* M-< */
-	/* 189 */	ED_INSERT,		/* M-= */
-	/* 190 */	ED_INSERT,		/* M-> */
-	/* 191 */	ED_INSERT,		/* M-? */
-	/* 192 */	ED_INSERT,		/* M-@ */
-	/* 193 */	ED_INSERT,		/* M-A */
-	/* 194 */	ED_INSERT,		/* M-B */
-	/* 195 */	ED_INSERT,		/* M-C */
-	/* 196 */	ED_INSERT,		/* M-D */
-	/* 197 */	ED_INSERT,		/* M-E */
-	/* 198 */	ED_INSERT,		/* M-F */
-	/* 199 */	ED_INSERT,		/* M-G */
-	/* 200 */	ED_INSERT,		/* M-H */
-	/* 201 */	ED_INSERT,		/* M-I */
-	/* 202 */	ED_INSERT,		/* M-J */
-	/* 203 */	ED_INSERT,		/* M-K */
-	/* 204 */	ED_INSERT,		/* M-L */
-	/* 205 */	ED_INSERT,		/* M-M */
-	/* 206 */	ED_INSERT,		/* M-N */
-	/* 207 */	ED_INSERT,		/* M-O */
-	/* 208 */	ED_INSERT,		/* M-P */
-	/* 209 */	ED_INSERT,		/* M-Q */
-	/* 210 */	ED_INSERT,		/* M-R */
-	/* 211 */	ED_INSERT,		/* M-S */
-	/* 212 */	ED_INSERT,		/* M-T */
-	/* 213 */	ED_INSERT,		/* M-U */
-	/* 214 */	ED_INSERT,		/* M-V */
-	/* 215 */	ED_INSERT,		/* M-W */
-	/* 216 */	ED_INSERT,		/* M-X */
-	/* 217 */	ED_INSERT,		/* M-Y */
-	/* 218 */	ED_INSERT,		/* M-Z */
-	/* 219 */	ED_INSERT,		/* M-[ */
-	/* 220 */	ED_INSERT,		/* M-\ */
-	/* 221 */	ED_INSERT,		/* M-] */
-	/* 222 */	ED_INSERT,		/* M-^ */
-	/* 223 */	ED_INSERT,		/* M-_ */
-	/* 224 */	ED_INSERT,		/* M-` */
-	/* 225 */	ED_INSERT,		/* M-a */
-	/* 226 */	ED_INSERT,		/* M-b */
-	/* 227 */	ED_INSERT,		/* M-c */
-	/* 228 */	ED_INSERT,		/* M-d */
-	/* 229 */	ED_INSERT,		/* M-e */
-	/* 230 */	ED_INSERT,		/* M-f */
-	/* 231 */	ED_INSERT,		/* M-g */
-	/* 232 */	ED_INSERT,		/* M-h */
-	/* 233 */	ED_INSERT,		/* M-i */
-	/* 234 */	ED_INSERT,		/* M-j */
-	/* 235 */	ED_INSERT,		/* M-k */
-	/* 236 */	ED_INSERT,		/* M-l */
-	/* 237 */	ED_INSERT,		/* M-m */
-	/* 238 */	ED_INSERT,		/* M-n */
-	/* 239 */	ED_INSERT,		/* M-o */
-	/* 240 */	ED_INSERT,		/* M-p */
-	/* 241 */	ED_INSERT,		/* M-q */
-	/* 242 */	ED_INSERT,		/* M-r */
-	/* 243 */	ED_INSERT,		/* M-s */
-	/* 244 */	ED_INSERT,		/* M-t */
-	/* 245 */	ED_INSERT,		/* M-u */
-	/* 246 */	ED_INSERT,		/* M-v */
-	/* 247 */	ED_INSERT,		/* M-w */
-	/* 248 */	ED_INSERT,		/* M-x */
-	/* 249 */	ED_INSERT,		/* M-y */
-	/* 250 */	ED_INSERT,		/* M-z */
-	/* 251 */	ED_INSERT,		/* M-{ */
-	/* 252 */	ED_INSERT,		/* M-| */
-	/* 253 */	ED_INSERT,		/* M-} */
-	/* 254 */	ED_INSERT,		/* M-~ */
-	/* 255 */	ED_INSERT		/* M-^? */
-};
-
-private const el_action_t el_map_vi_command[] = {
-	/*   0 */	ED_UNASSIGNED,		/* ^@ */
-	/*   1 */	ED_MOVE_TO_BEG,		/* ^A */
-	/*   2 */	ED_UNASSIGNED,		/* ^B */
-	/*   3 */	ED_TTY_SIGINT,		/* ^C */
-	/*   4 */	ED_UNASSIGNED,		/* ^D */
-	/*   5 */	ED_MOVE_TO_END,		/* ^E */
-	/*   6 */	ED_UNASSIGNED,		/* ^F */
-	/*   7 */	ED_UNASSIGNED,		/* ^G */
-	/*   8 */	ED_DELETE_PREV_CHAR,	/* ^H */
-	/*   9 */	ED_UNASSIGNED,		/* ^I */
-	/*  10 */	ED_NEWLINE,		/* ^J */
-	/*  11 */	ED_KILL_LINE,		/* ^K */
-	/*  12 */	ED_CLEAR_SCREEN,	/* ^L */
-	/*  13 */	ED_NEWLINE,		/* ^M */
-	/*  14 */	ED_NEXT_HISTORY,	/* ^N */
-	/*  15 */	ED_TTY_FLUSH_OUTPUT,	/* ^O */
-	/*  16 */	ED_PREV_HISTORY,	/* ^P */
-	/*  17 */	ED_TTY_START_OUTPUT,	/* ^Q */
-	/*  18 */	ED_REDISPLAY,		/* ^R */
-	/*  19 */	ED_TTY_STOP_OUTPUT,	/* ^S */
-	/*  20 */	ED_UNASSIGNED,		/* ^T */
-	/*  21 */	VI_KILL_LINE_PREV,	/* ^U */
-	/*  22 */	ED_UNASSIGNED,		/* ^V */
-	/*  23 */	ED_DELETE_PREV_WORD,	/* ^W */
-	/*  24 */	ED_UNASSIGNED,		/* ^X */
-	/*  25 */	ED_UNASSIGNED,		/* ^Y */
-	/*  26 */	ED_UNASSIGNED,		/* ^Z */
-	/*  27 */	EM_META_NEXT,		/* ^[ */
-	/*  28 */	ED_TTY_SIGQUIT,		/* ^\ */
-	/*  29 */	ED_UNASSIGNED,		/* ^] */
-	/*  30 */	ED_UNASSIGNED,		/* ^^ */
-	/*  31 */	ED_UNASSIGNED,		/* ^_ */
-	/*  32 */	ED_NEXT_CHAR,		/* SPACE */
-	/*  33 */	ED_UNASSIGNED,		/* ! */
-	/*  34 */	ED_UNASSIGNED,		/* " */
-	/*  35 */	VI_COMMENT_OUT,		/* # */
-	/*  36 */	ED_MOVE_TO_END,		/* $ */
-	/*  37 */	VI_MATCH,		/* % */
-	/*  38 */	ED_UNASSIGNED,		/* & */
-	/*  39 */	ED_UNASSIGNED,		/* ' */
-	/*  40 */	ED_UNASSIGNED,		/* ( */
-	/*  41 */	ED_UNASSIGNED,		/* ) */
-	/*  42 */	ED_UNASSIGNED,		/* * */
-	/*  43 */	ED_NEXT_HISTORY,	/* + */
-	/*  44 */	VI_REPEAT_PREV_CHAR,	/* , */
-	/*  45 */	ED_PREV_HISTORY,	/* - */
-	/*  46 */	VI_REDO,		/* . */
-	/*  47 */	VI_SEARCH_PREV,		/* / */
-	/*  48 */	VI_ZERO,		/* 0 */
-	/*  49 */	ED_ARGUMENT_DIGIT,	/* 1 */
-	/*  50 */	ED_ARGUMENT_DIGIT,	/* 2 */
-	/*  51 */	ED_ARGUMENT_DIGIT,	/* 3 */
-	/*  52 */	ED_ARGUMENT_DIGIT,	/* 4 */
-	/*  53 */	ED_ARGUMENT_DIGIT,	/* 5 */
-	/*  54 */	ED_ARGUMENT_DIGIT,	/* 6 */
-	/*  55 */	ED_ARGUMENT_DIGIT,	/* 7 */
-	/*  56 */	ED_ARGUMENT_DIGIT,	/* 8 */
-	/*  57 */	ED_ARGUMENT_DIGIT,	/* 9 */
-	/*  58 */	ED_COMMAND,		/* : */
-	/*  59 */	VI_REPEAT_NEXT_CHAR,	/* ; */
-	/*  60 */	ED_UNASSIGNED,		/* < */
-	/*  61 */	ED_UNASSIGNED,		/* = */
-	/*  62 */	ED_UNASSIGNED,		/* > */
-	/*  63 */	VI_SEARCH_NEXT,		/* ? */
-	/*  64 */	VI_ALIAS,		/* @ */
-	/*  65 */	VI_ADD_AT_EOL,		/* A */
-	/*  66 */	VI_PREV_BIG_WORD,	/* B */
-	/*  67 */	VI_CHANGE_TO_EOL,	/* C */
-	/*  68 */	ED_KILL_LINE,		/* D */
-	/*  69 */	VI_END_BIG_WORD,	/* E */
-	/*  70 */	VI_PREV_CHAR,		/* F */
-	/*  71 */	VI_TO_HISTORY_LINE,	/* G */
-	/*  72 */	ED_UNASSIGNED,		/* H */
-	/*  73 */	VI_INSERT_AT_BOL,	/* I */
-	/*  74 */	ED_SEARCH_NEXT_HISTORY,	/* J */
-	/*  75 */	ED_SEARCH_PREV_HISTORY,	/* K */
-	/*  76 */	ED_UNASSIGNED,		/* L */
-	/*  77 */	ED_UNASSIGNED,		/* M */
-	/*  78 */	VI_REPEAT_SEARCH_PREV,	/* N */
-	/*  79 */	ED_SEQUENCE_LEAD_IN,	/* O */
-	/*  80 */	VI_PASTE_PREV,		/* P */
-	/*  81 */	ED_UNASSIGNED,		/* Q */
-	/*  82 */	VI_REPLACE_MODE,	/* R */
-	/*  83 */	VI_SUBSTITUTE_LINE,	/* S */
-	/*  84 */	VI_TO_PREV_CHAR,	/* T */
-	/*  85 */	VI_UNDO_LINE,		/* U */
-	/*  86 */	ED_UNASSIGNED,		/* V */
-	/*  87 */	VI_NEXT_BIG_WORD,	/* W */
-	/*  88 */	ED_DELETE_PREV_CHAR,	/* X */
-	/*  89 */	VI_YANK_END,		/* Y */
-	/*  90 */	ED_UNASSIGNED,		/* Z */
-	/*  91 */	ED_SEQUENCE_LEAD_IN,	/* [ */
-	/*  92 */	ED_UNASSIGNED,		/* \ */
-	/*  93 */	ED_UNASSIGNED,		/* ] */
-	/*  94 */	ED_MOVE_TO_BEG,		/* ^ */
-	/*  95 */	VI_HISTORY_WORD,	/* _ */
-	/*  96 */	ED_UNASSIGNED,		/* ` */
-	/*  97 */	VI_ADD,			/* a */
-	/*  98 */	VI_PREV_WORD,		/* b */
-	/*  99 */	VI_CHANGE_META,		/* c */
-	/* 100 */	VI_DELETE_META,		/* d */
-	/* 101 */	VI_END_WORD,		/* e */
-	/* 102 */	VI_NEXT_CHAR,		/* f */
-	/* 103 */	ED_UNASSIGNED,		/* g */
-	/* 104 */	ED_PREV_CHAR,		/* h */
-	/* 105 */	VI_INSERT,		/* i */
-	/* 106 */	ED_NEXT_HISTORY,	/* j */
-	/* 107 */	ED_PREV_HISTORY,	/* k */
-	/* 108 */	ED_NEXT_CHAR,		/* l */
-	/* 109 */	ED_UNASSIGNED,		/* m */
-	/* 110 */	VI_REPEAT_SEARCH_NEXT,	/* n */
-	/* 111 */	ED_UNASSIGNED,		/* o */
-	/* 112 */	VI_PASTE_NEXT,		/* p */
-	/* 113 */	ED_UNASSIGNED,		/* q */
-	/* 114 */	VI_REPLACE_CHAR,	/* r */
-	/* 115 */	VI_SUBSTITUTE_CHAR,	/* s */
-	/* 116 */	VI_TO_NEXT_CHAR,	/* t */
-	/* 117 */	VI_UNDO,		/* u */
-	/* 118 */	VI_HISTEDIT,		/* v */
-	/* 119 */	VI_NEXT_WORD,		/* w */
-	/* 120 */	ED_DELETE_NEXT_CHAR,	/* x */
-	/* 121 */	VI_YANK,		/* y */
-	/* 122 */	ED_UNASSIGNED,		/* z */
-	/* 123 */	ED_UNASSIGNED,		/* { */
-	/* 124 */	VI_TO_COLUMN,		/* | */
-	/* 125 */	ED_UNASSIGNED,		/* } */
-	/* 126 */	VI_CHANGE_CASE,		/* ~ */
-	/* 127 */	ED_DELETE_PREV_CHAR,	/* ^? */
-	/* 128 */	ED_UNASSIGNED,		/* M-^@ */
-	/* 129 */	ED_UNASSIGNED,		/* M-^A */
-	/* 130 */	ED_UNASSIGNED,		/* M-^B */
-	/* 131 */	ED_UNASSIGNED,		/* M-^C */
-	/* 132 */	ED_UNASSIGNED,		/* M-^D */
-	/* 133 */	ED_UNASSIGNED,		/* M-^E */
-	/* 134 */	ED_UNASSIGNED,		/* M-^F */
-	/* 135 */	ED_UNASSIGNED,		/* M-^G */
-	/* 136 */	ED_UNASSIGNED,		/* M-^H */
-	/* 137 */	ED_UNASSIGNED,		/* M-^I */
-	/* 138 */	ED_UNASSIGNED,		/* M-^J */
-	/* 139 */	ED_UNASSIGNED,		/* M-^K */
-	/* 140 */	ED_UNASSIGNED,		/* M-^L */
-	/* 141 */	ED_UNASSIGNED,		/* M-^M */
-	/* 142 */	ED_UNASSIGNED,		/* M-^N */
-	/* 143 */	ED_UNASSIGNED,		/* M-^O */
-	/* 144 */	ED_UNASSIGNED,		/* M-^P */
-	/* 145 */	ED_UNASSIGNED,		/* M-^Q */
-	/* 146 */	ED_UNASSIGNED,		/* M-^R */
-	/* 147 */	ED_UNASSIGNED,		/* M-^S */
-	/* 148 */	ED_UNASSIGNED,		/* M-^T */
-	/* 149 */	ED_UNASSIGNED,		/* M-^U */
-	/* 150 */	ED_UNASSIGNED,		/* M-^V */
-	/* 151 */	ED_UNASSIGNED,		/* M-^W */
-	/* 152 */	ED_UNASSIGNED,		/* M-^X */
-	/* 153 */	ED_UNASSIGNED,		/* M-^Y */
-	/* 154 */	ED_UNASSIGNED,		/* M-^Z */
-	/* 155 */	ED_UNASSIGNED,		/* M-^[ */
-	/* 156 */	ED_UNASSIGNED,		/* M-^\ */
-	/* 157 */	ED_UNASSIGNED,		/* M-^] */
-	/* 158 */	ED_UNASSIGNED,		/* M-^^ */
-	/* 159 */	ED_UNASSIGNED,		/* M-^_ */
-	/* 160 */	ED_UNASSIGNED,		/* M-SPACE */
-	/* 161 */	ED_UNASSIGNED,		/* M-! */
-	/* 162 */	ED_UNASSIGNED,		/* M-" */
-	/* 163 */	ED_UNASSIGNED,		/* M-# */
-	/* 164 */	ED_UNASSIGNED,		/* M-$ */
-	/* 165 */	ED_UNASSIGNED,		/* M-% */
-	/* 166 */	ED_UNASSIGNED,		/* M-& */
-	/* 167 */	ED_UNASSIGNED,		/* M-' */
-	/* 168 */	ED_UNASSIGNED,		/* M-( */
-	/* 169 */	ED_UNASSIGNED,		/* M-) */
-	/* 170 */	ED_UNASSIGNED,		/* M-* */
-	/* 171 */	ED_UNASSIGNED,		/* M-+ */
-	/* 172 */	ED_UNASSIGNED,		/* M-, */
-	/* 173 */	ED_UNASSIGNED,		/* M-- */
-	/* 174 */	ED_UNASSIGNED,		/* M-. */
-	/* 175 */	ED_UNASSIGNED,		/* M-/ */
-	/* 176 */	ED_UNASSIGNED,		/* M-0 */
-	/* 177 */	ED_UNASSIGNED,		/* M-1 */
-	/* 178 */	ED_UNASSIGNED,		/* M-2 */
-	/* 179 */	ED_UNASSIGNED,		/* M-3 */
-	/* 180 */	ED_UNASSIGNED,		/* M-4 */
-	/* 181 */	ED_UNASSIGNED,		/* M-5 */
-	/* 182 */	ED_UNASSIGNED,		/* M-6 */
-	/* 183 */	ED_UNASSIGNED,		/* M-7 */
-	/* 184 */	ED_UNASSIGNED,		/* M-8 */
-	/* 185 */	ED_UNASSIGNED,		/* M-9 */
-	/* 186 */	ED_UNASSIGNED,		/* M-: */
-	/* 187 */	ED_UNASSIGNED,		/* M-; */
-	/* 188 */	ED_UNASSIGNED,		/* M-< */
-	/* 189 */	ED_UNASSIGNED,		/* M-= */
-	/* 190 */	ED_UNASSIGNED,		/* M-> */
-	/* 191 */	ED_UNASSIGNED,		/* M-? */
-	/* 192 */	ED_UNASSIGNED,		/* M-@ */
-	/* 193 */	ED_UNASSIGNED,		/* M-A */
-	/* 194 */	ED_UNASSIGNED,		/* M-B */
-	/* 195 */	ED_UNASSIGNED,		/* M-C */
-	/* 196 */	ED_UNASSIGNED,		/* M-D */
-	/* 197 */	ED_UNASSIGNED,		/* M-E */
-	/* 198 */	ED_UNASSIGNED,		/* M-F */
-	/* 199 */	ED_UNASSIGNED,		/* M-G */
-	/* 200 */	ED_UNASSIGNED,		/* M-H */
-	/* 201 */	ED_UNASSIGNED,		/* M-I */
-	/* 202 */	ED_UNASSIGNED,		/* M-J */
-	/* 203 */	ED_UNASSIGNED,		/* M-K */
-	/* 204 */	ED_UNASSIGNED,		/* M-L */
-	/* 205 */	ED_UNASSIGNED,		/* M-M */
-	/* 206 */	ED_UNASSIGNED,		/* M-N */
-	/* 207 */	ED_SEQUENCE_LEAD_IN,	/* M-O */
-	/* 208 */	ED_UNASSIGNED,		/* M-P */
-	/* 209 */	ED_UNASSIGNED,		/* M-Q */
-	/* 210 */	ED_UNASSIGNED,		/* M-R */
-	/* 211 */	ED_UNASSIGNED,		/* M-S */
-	/* 212 */	ED_UNASSIGNED,		/* M-T */
-	/* 213 */	ED_UNASSIGNED,		/* M-U */
-	/* 214 */	ED_UNASSIGNED,		/* M-V */
-	/* 215 */	ED_UNASSIGNED,		/* M-W */
-	/* 216 */	ED_UNASSIGNED,		/* M-X */
-	/* 217 */	ED_UNASSIGNED,		/* M-Y */
-	/* 218 */	ED_UNASSIGNED,		/* M-Z */
-	/* 219 */	ED_SEQUENCE_LEAD_IN,	/* M-[ */
-	/* 220 */	ED_UNASSIGNED,		/* M-\ */
-	/* 221 */	ED_UNASSIGNED,		/* M-] */
-	/* 222 */	ED_UNASSIGNED,		/* M-^ */
-	/* 223 */	ED_UNASSIGNED,		/* M-_ */
-	/* 224 */	ED_UNASSIGNED,		/* M-` */
-	/* 225 */	ED_UNASSIGNED,		/* M-a */
-	/* 226 */	ED_UNASSIGNED,		/* M-b */
-	/* 227 */	ED_UNASSIGNED,		/* M-c */
-	/* 228 */	ED_UNASSIGNED,		/* M-d */
-	/* 229 */	ED_UNASSIGNED,		/* M-e */
-	/* 230 */	ED_UNASSIGNED,		/* M-f */
-	/* 231 */	ED_UNASSIGNED,		/* M-g */
-	/* 232 */	ED_UNASSIGNED,		/* M-h */
-	/* 233 */	ED_UNASSIGNED,		/* M-i */
-	/* 234 */	ED_UNASSIGNED,		/* M-j */
-	/* 235 */	ED_UNASSIGNED,		/* M-k */
-	/* 236 */	ED_UNASSIGNED,		/* M-l */
-	/* 237 */	ED_UNASSIGNED,		/* M-m */
-	/* 238 */	ED_UNASSIGNED,		/* M-n */
-	/* 239 */	ED_UNASSIGNED,		/* M-o */
-	/* 240 */	ED_UNASSIGNED,		/* M-p */
-	/* 241 */	ED_UNASSIGNED,		/* M-q */
-	/* 242 */	ED_UNASSIGNED,		/* M-r */
-	/* 243 */	ED_UNASSIGNED,		/* M-s */
-	/* 244 */	ED_UNASSIGNED,		/* M-t */
-	/* 245 */	ED_UNASSIGNED,		/* M-u */
-	/* 246 */	ED_UNASSIGNED,		/* M-v */
-	/* 247 */	ED_UNASSIGNED,		/* M-w */
-	/* 248 */	ED_UNASSIGNED,		/* M-x */
-	/* 249 */	ED_UNASSIGNED,		/* M-y */
-	/* 250 */	ED_UNASSIGNED,		/* M-z */
-	/* 251 */	ED_UNASSIGNED,		/* M-{ */
-	/* 252 */	ED_UNASSIGNED,		/* M-| */
-	/* 253 */	ED_UNASSIGNED,		/* M-} */
-	/* 254 */	ED_UNASSIGNED,		/* M-~ */
-	/* 255 */	ED_UNASSIGNED		/* M-^? */
-};
-
-
-/* map_init():
- *	Initialize and allocate the maps
- */
-protected int
-map_init(EditLine *el)
-{
-
-	/*
-         * Make sure those are correct before starting.
-         */
-#ifdef MAP_DEBUG
-	if (sizeof(el_map_emacs) != N_KEYS * sizeof(el_action_t))
-		EL_ABORT((el->errfile, "Emacs map incorrect\n"));
-	if (sizeof(el_map_vi_command) != N_KEYS * sizeof(el_action_t))
-		EL_ABORT((el->errfile, "Vi command map incorrect\n"));
-	if (sizeof(el_map_vi_insert) != N_KEYS * sizeof(el_action_t))
-		EL_ABORT((el->errfile, "Vi insert map incorrect\n"));
-#endif
-
-	el->el_map.alt = el_malloc(sizeof(*el->el_map.alt) * N_KEYS);
-	if (el->el_map.alt == NULL)
-		return -1;
-	el->el_map.key = el_malloc(sizeof(*el->el_map.key) * N_KEYS);
-	if (el->el_map.key == NULL)
-		return -1;
-	el->el_map.emacs = el_map_emacs;
-	el->el_map.vic = el_map_vi_command;
-	el->el_map.vii = el_map_vi_insert;
-	el->el_map.help = el_malloc(sizeof(*el->el_map.help) * EL_NUM_FCNS);
-	if (el->el_map.help == NULL)
-		return -1;
-	(void) memcpy(el->el_map.help, help__get(),
-	    sizeof(*el->el_map.help) * EL_NUM_FCNS);
-	el->el_map.func = el_malloc(sizeof(*el->el_map.func) * EL_NUM_FCNS);
-	if (el->el_map.func == NULL)
-		return -1;
-	memcpy(el->el_map.func, func__get(), sizeof(*el->el_map.func)
-	    * EL_NUM_FCNS);
-	el->el_map.nfunc = EL_NUM_FCNS;
-
-#ifdef VIDEFAULT
-	map_init_vi(el);
-#else
-	map_init_emacs(el);
-#endif /* VIDEFAULT */
-	return 0;
-}
-
-
-/* map_end():
- *	Free the space taken by the editor maps
- */
-protected void
-map_end(EditLine *el)
-{
-
-	el_free(el->el_map.alt);
-	el->el_map.alt = NULL;
-	el_free(el->el_map.key);
-	el->el_map.key = NULL;
-	el->el_map.emacs = NULL;
-	el->el_map.vic = NULL;
-	el->el_map.vii = NULL;
-	el_free(el->el_map.help);
-	el->el_map.help = NULL;
-	el_free(el->el_map.func);
-	el->el_map.func = NULL;
-}
-
-
-/* map_init_nls():
- *	Find all the printable keys and bind them to self insert
- */
-private void
-map_init_nls(EditLine *el)
-{
-	int i;
-
-	el_action_t *map = el->el_map.key;
-
-	for (i = 0200; i <= 0377; i++)
-		if (Isprint(i))
-			map[i] = ED_INSERT;
-}
-
-
-/* map_init_meta():
- *	Bind all the meta keys to the appropriate ESC-<key> sequence
- */
-private void
-map_init_meta(EditLine *el)
-{
-	Char buf[3];
-	int i;
-	el_action_t *map = el->el_map.key;
-	el_action_t *alt = el->el_map.alt;
-
-	for (i = 0; i <= 0377 && map[i] != EM_META_NEXT; i++)
-		continue;
-
-	if (i > 0377) {
-		for (i = 0; i <= 0377 && alt[i] != EM_META_NEXT; i++)
-			continue;
-		if (i > 0377) {
-			i = 033;
-			if (el->el_map.type == MAP_VI)
-				map = alt;
-		} else
-			map = alt;
-	}
-	buf[0] = (Char) i;
-	buf[2] = 0;
-	for (i = 0200; i <= 0377; i++)
-		switch (map[i]) {
-		case ED_INSERT:
-		case ED_UNASSIGNED:
-		case ED_SEQUENCE_LEAD_IN:
-			break;
-		default:
-			buf[1] = i & 0177;
-			keymacro_add(el, buf, keymacro_map_cmd(el, (int) map[i]), XK_CMD);
-			break;
-		}
-	map[(int) buf[0]] = ED_SEQUENCE_LEAD_IN;
-}
-
-
-/* map_init_vi():
- *	Initialize the vi bindings
- */
-protected void
-map_init_vi(EditLine *el)
-{
-	int i;
-	el_action_t *key = el->el_map.key;
-	el_action_t *alt = el->el_map.alt;
-	const el_action_t *vii = el->el_map.vii;
-	const el_action_t *vic = el->el_map.vic;
-
-	el->el_map.type = MAP_VI;
-	el->el_map.current = el->el_map.key;
-
-	keymacro_reset(el);
-
-	for (i = 0; i < N_KEYS; i++) {
-		key[i] = vii[i];
-		alt[i] = vic[i];
-	}
-
-	map_init_meta(el);
-	map_init_nls(el);
-
-	tty_bind_char(el, 1);
-	terminal_bind_arrow(el);
-}
-
-
-/* map_init_emacs():
- *	Initialize the emacs bindings
- */
-protected void
-map_init_emacs(EditLine *el)
-{
-	int i;
-	Char buf[3];
-	el_action_t *key = el->el_map.key;
-	el_action_t *alt = el->el_map.alt;
-	const el_action_t *emacs = el->el_map.emacs;
-
-	el->el_map.type = MAP_EMACS;
-	el->el_map.current = el->el_map.key;
-	keymacro_reset(el);
-
-	for (i = 0; i < N_KEYS; i++) {
-		key[i] = emacs[i];
-		alt[i] = ED_UNASSIGNED;
-	}
-
-	map_init_meta(el);
-	map_init_nls(el);
-
-	buf[0] = CONTROL('X');
-	buf[1] = CONTROL('X');
-	buf[2] = 0;
-	keymacro_add(el, buf, keymacro_map_cmd(el, EM_EXCHANGE_MARK), XK_CMD);
-
-	tty_bind_char(el, 1);
-	terminal_bind_arrow(el);
-}
-
-
-/* map_set_editor():
- *	Set the editor
- */
-protected int
-map_set_editor(EditLine *el, Char *editor)
-{
-
-	if (Strcmp(editor, STR("emacs")) == 0) {
-		map_init_emacs(el);
-		return 0;
-	}
-	if (Strcmp(editor, STR("vi")) == 0) {
-		map_init_vi(el);
-		return 0;
-	}
-	return -1;
-}
-
-
-/* map_get_editor():
- *	Retrieve the editor
- */
-protected int
-map_get_editor(EditLine *el, const Char **editor)
-{
-
-	if (editor == NULL)
-		return -1;
-	switch (el->el_map.type) {
-	case MAP_EMACS:
-		*editor = STR("emacs");
-		return 0;
-	case MAP_VI:
-		*editor = STR("vi");
-		return 0;
-	}
-	return -1;
-}
-
-
-/* map_print_key():
- *	Print the function description for 1 key
- */
-private void
-map_print_key(EditLine *el, el_action_t *map, const Char *in)
-{
-	char outbuf[EL_BUFSIZ];
-	el_bindings_t *bp, *ep;
-
-	if (in[0] == '\0' || in[1] == '\0') {
-		(void) keymacro__decode_str(in, outbuf, sizeof(outbuf), "");
-		ep = &el->el_map.help[el->el_map.nfunc];
-		for (bp = el->el_map.help; bp < ep; bp++)
-			if (bp->func == map[(unsigned char) *in]) {
-				(void) fprintf(el->el_outfile,
-				    "%s\t->\t" FSTR "\n", outbuf, bp->name);
-				return;
-			}
-	} else
-		keymacro_print(el, in);
-}
-
-
-/* map_print_some_keys():
- *	Print keys from first to last
- */
-private void
-map_print_some_keys(EditLine *el, el_action_t *map, Int first, Int last)
-{
-	el_bindings_t *bp, *ep;
-	Char firstbuf[2], lastbuf[2];
-	char unparsbuf[EL_BUFSIZ], extrabuf[EL_BUFSIZ];
-
-	firstbuf[0] = first;
-	firstbuf[1] = 0;
-	lastbuf[0] = last;
-	lastbuf[1] = 0;
-	if (map[first] == ED_UNASSIGNED) {
-		if (first == last) {
-			(void) keymacro__decode_str(firstbuf, unparsbuf, 
-			    sizeof(unparsbuf), STRQQ);
-			(void) fprintf(el->el_outfile,
-			    "%-15s->  is undefined\n", unparsbuf);
-		}
-		return;
-	}
-	ep = &el->el_map.help[el->el_map.nfunc];
-	for (bp = el->el_map.help; bp < ep; bp++) {
-		if (bp->func == map[first]) {
-			if (first == last) {
-				(void) keymacro__decode_str(firstbuf, unparsbuf, 
-				    sizeof(unparsbuf), STRQQ);
-				(void) fprintf(el->el_outfile, "%-15s->  " FSTR "\n",
-				    unparsbuf, bp->name);
-			} else {
-				(void) keymacro__decode_str(firstbuf, unparsbuf, 
-				    sizeof(unparsbuf), STRQQ);
-				(void) keymacro__decode_str(lastbuf, extrabuf, 
-				    sizeof(extrabuf), STRQQ);
-				(void) fprintf(el->el_outfile,
-				    "%-4s to %-7s->  " FSTR "\n",
-				    unparsbuf, extrabuf, bp->name);
-			}
-			return;
-		}
-	}
-#ifdef MAP_DEBUG
-	if (map == el->el_map.key) {
-		(void) keymacro__decode_str(firstbuf, unparsbuf, 
-		    sizeof(unparsbuf), STRQQ);
-		(void) fprintf(el->el_outfile,
-		    "BUG!!! %s isn't bound to anything.\n", unparsbuf);
-		(void) fprintf(el->el_outfile, "el->el_map.key[%d] == %d\n",
-		    first, el->el_map.key[first]);
-	} else {
-		(void) keymacro__decode_str(firstbuf, unparsbuf, 
-		    sizeof(unparsbuf), STRQQ);
-		(void) fprintf(el->el_outfile,
-		    "BUG!!! %s isn't bound to anything.\n", unparsbuf);
-		(void) fprintf(el->el_outfile, "el->el_map.alt[%d] == %d\n",
-		    first, el->el_map.alt[first]);
-	}
-#endif
-	EL_ABORT((el->el_errfile, "Error printing keys\n"));
-}
-
-
-/* map_print_all_keys():
- *	Print the function description for all keys.
- */
-private void
-map_print_all_keys(EditLine *el)
-{
-	int prev, i;
-
-	(void) fprintf(el->el_outfile, "Standard key bindings\n");
-	prev = 0;
-	for (i = 0; i < N_KEYS; i++) {
-		if (el->el_map.key[prev] == el->el_map.key[i])
-			continue;
-		map_print_some_keys(el, el->el_map.key, prev, i - 1);
-		prev = i;
-	}
-	map_print_some_keys(el, el->el_map.key, prev, i - 1);
-
-	(void) fprintf(el->el_outfile, "Alternative key bindings\n");
-	prev = 0;
-	for (i = 0; i < N_KEYS; i++) {
-		if (el->el_map.alt[prev] == el->el_map.alt[i])
-			continue;
-		map_print_some_keys(el, el->el_map.alt, prev, i - 1);
-		prev = i;
-	}
-	map_print_some_keys(el, el->el_map.alt, prev, i - 1);
-
-	(void) fprintf(el->el_outfile, "Multi-character bindings\n");
-	keymacro_print(el, STR(""));
-	(void) fprintf(el->el_outfile, "Arrow key bindings\n");
-	terminal_print_arrow(el, STR(""));
-}
-
-
-/* map_bind():
- *	Add/remove/change bindings
- */
-protected int
-map_bind(EditLine *el, int argc, const Char **argv)
-{
-	el_action_t *map;
-	int ntype, rem;
-	const Char *p;
-	Char inbuf[EL_BUFSIZ];
-	Char outbuf[EL_BUFSIZ];
-	const Char *in = NULL;
-	Char *out;
-	el_bindings_t *bp, *ep;
-	int cmd;
-	int key;
-
-	if (argv == NULL)
-		return -1;
-
-	map = el->el_map.key;
-	ntype = XK_CMD;
-	key = rem = 0;
-	for (argc = 1; (p = argv[argc]) != NULL; argc++)
-		if (p[0] == '-')
-			switch (p[1]) {
-			case 'a':
-				map = el->el_map.alt;
-				break;
-
-			case 's':
-				ntype = XK_STR;
-				break;
-#ifdef notyet
-			case 'c':
-				ntype = XK_EXE;
-				break;
-#endif
-			case 'k':
-				key = 1;
-				break;
-
-			case 'r':
-				rem = 1;
-				break;
-
-			case 'v':
-				map_init_vi(el);
-				return 0;
-
-			case 'e':
-				map_init_emacs(el);
-				return 0;
-
-			case 'l':
-				ep = &el->el_map.help[el->el_map.nfunc];
-				for (bp = el->el_map.help; bp < ep; bp++)
-					(void) fprintf(el->el_outfile,
-					    "" FSTR "\n\t" FSTR "\n",
-					    bp->name, bp->description);
-				return 0;
-			default:
-				(void) fprintf(el->el_errfile,
-				    "" FSTR ": Invalid switch `" FCHAR "'.\n",
-				    argv[0], (Int)p[1]);
-			}
-		else
-			break;
-
-	if (argv[argc] == NULL) {
-		map_print_all_keys(el);
-		return 0;
-	}
-	if (key)
-		in = argv[argc++];
-	else if ((in = parse__string(inbuf, argv[argc++])) == NULL) {
-		(void) fprintf(el->el_errfile,
-		    "" FSTR ": Invalid \\ or ^ in instring.\n",
-		    argv[0]);
-		return -1;
-	}
-	if (rem) {
-		if (key) {
-			(void) terminal_clear_arrow(el, in);
-			return -1;
-		}
-		if (in[1])
-			(void) keymacro_delete(el, in);
-		else if (map[(unsigned char) *in] == ED_SEQUENCE_LEAD_IN)
-			(void) keymacro_delete(el, in);
-		else
-			map[(unsigned char) *in] = ED_UNASSIGNED;
-		return 0;
-	}
-	if (argv[argc] == NULL) {
-		if (key)
-			terminal_print_arrow(el, in);
-		else
-			map_print_key(el, map, in);
-		return 0;
-	}
-#ifdef notyet
-	if (argv[argc + 1] != NULL) {
-		bindkeymacro_usage();
-		return -1;
-	}
-#endif
-
-	switch (ntype) {
-	case XK_STR:
-	case XK_EXE:
-		if ((out = parse__string(outbuf, argv[argc])) == NULL) {
-			(void) fprintf(el->el_errfile,
-			    "" FSTR ": Invalid \\ or ^ in outstring.\n", argv[0]);
-			return -1;
-		}
-		if (key)
-			terminal_set_arrow(el, in, keymacro_map_str(el, out), ntype);
-		else
-			keymacro_add(el, in, keymacro_map_str(el, out), ntype);
-		map[(unsigned char) *in] = ED_SEQUENCE_LEAD_IN;
-		break;
-
-	case XK_CMD:
-		if ((cmd = parse_cmd(el, argv[argc])) == -1) {
-			(void) fprintf(el->el_errfile,
-			    "" FSTR ": Invalid command `" FSTR "'.\n",
-			    argv[0], argv[argc]);
-			return -1;
-		}
-		if (key)
-			terminal_set_arrow(el, in, keymacro_map_cmd(el, cmd), ntype);
-		else {
-			if (in[1]) {
-				keymacro_add(el, in, keymacro_map_cmd(el, cmd), ntype);
-				map[(unsigned char) *in] = ED_SEQUENCE_LEAD_IN;
-			} else {
-				keymacro_clear(el, map, in);
-				map[(unsigned char) *in] = (el_action_t)cmd;
-			}
-		}
-		break;
-
-	/* coverity[dead_error_begin] */
-	default:
-		EL_ABORT((el->el_errfile, "Bad XK_ type %d\n", ntype));
-		break;
-	}
-	return 0;
-}
-
-
-/* map_addfunc():
- *	add a user defined function
- */
-protected int
-map_addfunc(EditLine *el, const Char *name, const Char *help, el_func_t func)
-{
-	void *p;
-	size_t nf = el->el_map.nfunc + 1;
-
-	if (name == NULL || help == NULL || func == NULL)
-		return -1;
-
-	if ((p = el_realloc(el->el_map.func, nf *
-	    sizeof(*el->el_map.func))) == NULL)
-		return -1;
-	el->el_map.func = p;
-	if ((p = el_realloc(el->el_map.help, nf * sizeof(*el->el_map.help)))
-	    == NULL)
-		return -1;
-	el->el_map.help = p;
-
-	nf = (size_t)el->el_map.nfunc;
-	el->el_map.func[nf] = func;
-
-	el->el_map.help[nf].name = name;
-	el->el_map.help[nf].func = (int)nf;
-	el->el_map.help[nf].description = help;
-	el->el_map.nfunc++;
-
-	return 0;
-}
diff --git a/lib/libedit/map.h b/lib/libedit/map.h
deleted file mode 100644
index f01b58b81..000000000
--- a/lib/libedit/map.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: map.h,v 1.10 2014/07/06 18:15:34 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)map.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.map.h:	Editor maps
- */
-#ifndef _h_el_map
-#define	_h_el_map
-
-typedef struct el_bindings_t {	/* for the "bind" shell command */
-	const Char	*name;		/* function name for bind command */
-	int		 func;		/* function numeric value */
-	const Char	*description;	/* description of function */
-} el_bindings_t;
-
-
-typedef struct el_map_t {
-	el_action_t	*alt;		/* The current alternate key map */
-	el_action_t	*key;		/* The current normal key map	*/
-	el_action_t	*current;	/* The keymap we are using	*/
-	const el_action_t *emacs;	/* The default emacs key map	*/
-	const el_action_t *vic;		/* The vi command mode key map	*/
-	const el_action_t *vii;		/* The vi insert mode key map	*/
-	int		 type;		/* Emacs or vi			*/
-	el_bindings_t	*help;		/* The help for the editor functions */
-	el_func_t	*func;		/* List of available functions	*/
-	size_t		 nfunc;		/* The number of functions/help items */
-} el_map_t;
-
-#define	MAP_EMACS	0
-#define	MAP_VI		1
-
-#define N_KEYS      256
-
-protected int	map_bind(EditLine *, int, const Char **);
-protected int	map_init(EditLine *);
-protected void	map_end(EditLine *);
-protected void	map_init_vi(EditLine *);
-protected void	map_init_emacs(EditLine *);
-protected int	map_set_editor(EditLine *, Char *);
-protected int	map_get_editor(EditLine *, const Char **);
-protected int	map_addfunc(EditLine *, const Char *, const Char *, el_func_t);
-
-#endif /* _h_el_map */
diff --git a/lib/libedit/parse.c b/lib/libedit/parse.c
deleted file mode 100644
index 47d6f7d9b..000000000
--- a/lib/libedit/parse.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*	$NetBSD: parse.c,v 1.27 2014/07/06 18:15:34 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: parse.c,v 1.27 2014/07/06 18:15:34 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * parse.c: parse an editline extended command
- *
- * commands are:
- *
- *	bind
- *	echotc
- *	edit
- *	gettc
- *	history
- *	settc
- *	setty
- */
-#include "el.h"
-#include <stdlib.h>
-
-private const struct {
-	const Char *name;
-	int (*func)(EditLine *, int, const Char **);
-} cmds[] = {
-	{ STR("bind"),  	map_bind	},
-	{ STR("echotc"),	terminal_echotc	},
-	{ STR("edit"),  	el_editmode	},
-	{ STR("history"),	hist_command	},
-	{ STR("telltc"),	terminal_telltc	},
-	{ STR("settc"),	        terminal_settc	},
-	{ STR("setty"),	        tty_stty	},
-	{ NULL,		        NULL		}
-};
-
-
-/* parse_line():
- *	Parse a line and dispatch it
- */
-protected int
-parse_line(EditLine *el, const Char *line)
-{
-	const Char **argv;
-	int argc;
-	TYPE(Tokenizer) *tok;
-
-	tok = FUN(tok,init)(NULL);
-	FUN(tok,str)(tok, line, &argc, &argv);
-	argc = FUN(el,parse)(el, argc, argv);
-	FUN(tok,end)(tok);
-	return argc;
-}
-
-
-/* el_parse():
- *	Command dispatcher
- */
-public int
-FUN(el,parse)(EditLine *el, int argc, const Char *argv[])
-{
-	const Char *ptr;
-	int i;
-
-	if (argc < 1)
-		return -1;
-	ptr = Strchr(argv[0], ':');
-	if (ptr != NULL) {
-		Char *tprog;
-		size_t l;
-
-		if (ptr == argv[0])
-			return 0;
-		l = (size_t)(ptr - argv[0] - 1);
-		tprog = el_malloc((l + 1) * sizeof(*tprog));
-		if (tprog == NULL)
-			return 0;
-		(void) Strncpy(tprog, argv[0], l);
-		tprog[l] = '\0';
-		ptr++;
-		l = (size_t)el_match(el->el_prog, tprog);
-		el_free(tprog);
-		if (!l)
-			return 0;
-	} else
-		ptr = argv[0];
-
-	for (i = 0; cmds[i].name != NULL; i++)
-		if (Strcmp(cmds[i].name, ptr) == 0) {
-			i = (*cmds[i].func) (el, argc, argv);
-			return -i;
-		}
-	return -1;
-}
-
-
-/* parse__escape():
- *	Parse a string of the form ^<char> \<odigit> \<char> \U+xxxx and return
- *	the appropriate character or -1 if the escape is not valid
- */
-protected int
-parse__escape(const Char **ptr)
-{
-	const Char *p;
-	Int c;
-
-	p = *ptr;
-
-	if (p[1] == 0)
-		return -1;
-
-	if (*p == '\\') {
-		p++;
-		switch (*p) {
-		case 'a':
-			c = '\007';	/* Bell */
-			break;
-		case 'b':
-			c = '\010';	/* Backspace */
-			break;
-		case 't':
-			c = '\011';	/* Horizontal Tab */
-			break;
-		case 'n':
-			c = '\012';	/* New Line */
-			break;
-		case 'v':
-			c = '\013';	/* Vertical Tab */
-			break;
-		case 'f':
-			c = '\014';	/* Form Feed */
-			break;
-		case 'r':
-			c = '\015';	/* Carriage Return */
-			break;
-		case 'e':
-			c = '\033';	/* Escape */
-			break;
-                case 'U':               /* Unicode \U+xxxx or \U+xxxxx format */
-                {
-                        int i;
-                        const Char hex[] = STR("0123456789ABCDEF");
-                        const Char *h;
-                        ++p;
-                        if (*p++ != '+')
-                                return -1;
-			c = 0;
-                        for (i = 0; i < 5; ++i) {
-                                h = Strchr(hex, *p++);
-                                if (!h && i < 4)
-                                        return -1;
-                                else if (h)
-                                        c = (c << 4) | ((int)(h - hex));
-                                else
-                                        --p;
-                        }
-                        if (c > 0x10FFFF) /* outside valid character range */
-                                return -1;
-                        break;
-                }
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		{
-			int cnt, ch;
-
-			for (cnt = 0, c = 0; cnt < 3; cnt++) {
-				ch = *p++;
-				if (ch < '0' || ch > '7') {
-					p--;
-					break;
-				}
-				c = (c << 3) | (ch - '0');
-			}
-			if ((c & (wint_t)0xffffff00) != (wint_t)0)
-				return -1;
-			--p;
-			break;
-		}
-		default:
-			c = *p;
-			break;
-		}
-	} else if (*p == '^') {
-		p++;
-		c = (*p == '?') ? '\177' : (*p & 0237);
-	} else
-		c = *p;
-	*ptr = ++p;
-	return c;
-}
-
-/* parse__string():
- *	Parse the escapes from in and put the raw string out
- */
-protected Char *
-parse__string(Char *out, const Char *in)
-{
-	Char *rv = out;
-	int n;
-
-	for (;;)
-		switch (*in) {
-		case '\0':
-			*out = '\0';
-			return rv;
-
-		case '\\':
-		case '^':
-			if ((n = parse__escape(&in)) == -1)
-				return NULL;
-			*out++ = n;
-			break;
-
-		case 'M':
-			if (in[1] == '-' && in[2] != '\0') {
-				*out++ = '\033';
-				in += 2;
-				break;
-			}
-			/*FALLTHROUGH*/
-
-		default:
-			*out++ = *in++;
-			break;
-		}
-}
-
-
-/* parse_cmd():
- *	Return the command number for the command string given
- *	or -1 if one is not found
- */
-protected int
-parse_cmd(EditLine *el, const Char *cmd)
-{
-	el_bindings_t *b = el->el_map.help;
-	size_t i;
-
-	for (i = 0; i < el->el_map.nfunc; i++)
-		if (Strcmp(b[i].name, cmd) == 0)
-			return b[i].func;
-	return -1;
-}
diff --git a/lib/libedit/parse.h b/lib/libedit/parse.h
deleted file mode 100644
index ec04051bc..000000000
--- a/lib/libedit/parse.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: parse.h,v 1.7 2009/12/30 22:37:40 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)parse.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.parse.h: Parser functions
- */
-#ifndef _h_el_parse
-#define	_h_el_parse
-
-protected int	 parse_line(EditLine *, const Char *);
-protected int	 parse__escape(const Char **);
-protected Char	*parse__string(Char *, const Char *);
-protected int	 parse_cmd(EditLine *, const Char *);
-
-#endif /* _h_el_parse */
diff --git a/lib/libedit/prompt.c b/lib/libedit/prompt.c
deleted file mode 100644
index 48b2d27f8..000000000
--- a/lib/libedit/prompt.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*	$NetBSD: prompt.c,v 1.20 2011/07/29 15:16:33 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)prompt.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: prompt.c,v 1.20 2011/07/29 15:16:33 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * prompt.c: Prompt printing functions
- */
-#include <stdio.h>
-#include "el.h"
-
-private Char	*prompt_default(EditLine *);
-private Char	*prompt_default_r(EditLine *);
-
-/* prompt_default():
- *	Just a default prompt, in case the user did not provide one
- */
-private Char *
-/*ARGSUSED*/
-prompt_default(EditLine *el __attribute__((__unused__)))
-{
-	static Char a[3] = {'?', ' ', '\0'};
-
-	return a;
-}
-
-
-/* prompt_default_r():
- *	Just a default rprompt, in case the user did not provide one
- */
-private Char *
-/*ARGSUSED*/
-prompt_default_r(EditLine *el __attribute__((__unused__)))
-{
-	static Char a[1] = {'\0'};
-
-	return a;
-}
-
-
-/* prompt_print():
- *	Print the prompt and update the prompt position.
- */
-protected void
-prompt_print(EditLine *el, int op)
-{
-	el_prompt_t *elp;
-	Char *p;
-	int ignore = 0;
-
-	if (op == EL_PROMPT)
-		elp = &el->el_prompt;
-	else
-		elp = &el->el_rprompt;
-
-	if (elp->p_wide)
-		p = (*elp->p_func)(el);
-	else
-		p = ct_decode_string((char *)(void *)(*elp->p_func)(el),
-		    &el->el_scratch);
-
-	for (; *p; p++) {
-		if (elp->p_ignore == *p) {
-			ignore = !ignore;
-			continue;
-		}
-		if (ignore)
-			terminal__putc(el, *p);
-		else
-			re_putc(el, *p, 1);
-	}
-
-	elp->p_pos.v = el->el_refresh.r_cursor.v;
-	elp->p_pos.h = el->el_refresh.r_cursor.h;
-}
-
-
-/* prompt_init():
- *	Initialize the prompt stuff
- */
-protected int
-prompt_init(EditLine *el)
-{
-
-	el->el_prompt.p_func = prompt_default;
-	el->el_prompt.p_pos.v = 0;
-	el->el_prompt.p_pos.h = 0;
-	el->el_prompt.p_ignore = '\0';
-	el->el_rprompt.p_func = prompt_default_r;
-	el->el_rprompt.p_pos.v = 0;
-	el->el_rprompt.p_pos.h = 0;
-	el->el_rprompt.p_ignore = '\0';
-	return 0;
-}
-
-
-/* prompt_end():
- *	Clean up the prompt stuff
- */
-protected void
-/*ARGSUSED*/
-prompt_end(EditLine *el __attribute__((__unused__)))
-{
-}
-
-
-/* prompt_set():
- *	Install a prompt printing function
- */
-protected int
-prompt_set(EditLine *el, el_pfunc_t prf, Char c, int op, int wide)
-{
-	el_prompt_t *p;
-
-	if (op == EL_PROMPT || op == EL_PROMPT_ESC)
-		p = &el->el_prompt;
-	else
-		p = &el->el_rprompt;
-
-	if (prf == NULL) {
-		if (op == EL_PROMPT || op == EL_PROMPT_ESC)
-			p->p_func = prompt_default;
-		else
-			p->p_func = prompt_default_r;
-	} else {
-		p->p_func = prf;
-	}
-
-	p->p_ignore = c;
-
-	p->p_pos.v = 0;
-	p->p_pos.h = 0;
-	p->p_wide = wide;
-
-	return 0;
-}
-
-
-/* prompt_get():
- *	Retrieve the prompt printing function
- */
-protected int
-prompt_get(EditLine *el, el_pfunc_t *prf, Char *c, int op)
-{
-	el_prompt_t *p;
-
-	if (prf == NULL)
-		return -1;
-
-	if (op == EL_PROMPT)
-		p = &el->el_prompt;
-	else
-		p = &el->el_rprompt;
-
-	if (prf)
-		*prf = p->p_func;
-	if (c)
-		*c = p->p_ignore;
-
-	return 0;
-}
diff --git a/lib/libedit/prompt.h b/lib/libedit/prompt.h
deleted file mode 100644
index af63b82b6..000000000
--- a/lib/libedit/prompt.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: prompt.h,v 1.10 2009/12/30 22:37:40 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)prompt.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.prompt.h: Prompt printing stuff
- */
-#ifndef _h_el_prompt
-#define	_h_el_prompt
-
-#include "histedit.h"
-
-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 */
-	Char		p_ignore;	/* character to start/end literal */
-	int		p_wide;	
-} el_prompt_t;
-
-protected void	prompt_print(EditLine *, int);
-protected int	prompt_set(EditLine *, el_pfunc_t, Char, int, int);
-protected int	prompt_get(EditLine *, el_pfunc_t *, Char *, int);
-protected int	prompt_init(EditLine *);
-protected void	prompt_end(EditLine *);
-
-#endif /* _h_el_prompt */
diff --git a/lib/libedit/read.c b/lib/libedit/read.c
deleted file mode 100644
index b81cff609..000000000
--- a/lib/libedit/read.c
+++ /dev/null
@@ -1,735 +0,0 @@
-/*	$NetBSD: read.c,v 1.71 2014/07/06 18:15:34 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: read.c,v 1.71 2014/07/06 18:15:34 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * read.c: Clean this junk up! This is horrible code.
- *	   Terminal read functions
- */
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <limits.h>
-#include "el.h"
-
-#define OKCMD	-1	/* must be -1! */
-
-private int	read__fixio(int, int);
-private int	read_preread(EditLine *);
-private int	read_char(EditLine *, Char *);
-private int	read_getcmd(EditLine *, el_action_t *, Char *);
-private void	read_pop(c_macro_t *);
-
-/* read_init():
- *	Initialize the read stuff
- */
-protected int
-read_init(EditLine *el)
-{
-	/* builtin read_char */
-	el->el_read.read_char = read_char;
-	return 0;
-}
-
-
-/* el_read_setfn():
- *	Set the read char function to the one provided.
- *	If it is set to EL_BUILTIN_GETCFN, then reset to the builtin one.
- */
-protected int
-el_read_setfn(EditLine *el, el_rfunc_t rc)
-{
-	el->el_read.read_char = (rc == EL_BUILTIN_GETCFN) ? read_char : rc;
-	return 0;
-}
-
-
-/* el_read_getfn():
- *	return the current read char function, or EL_BUILTIN_GETCFN
- *	if it is the default one
- */
-protected el_rfunc_t
-el_read_getfn(EditLine *el)
-{
-       return el->el_read.read_char == read_char ?
-	    EL_BUILTIN_GETCFN : el->el_read.read_char;
-}
-
-
-#ifndef MIN
-#define MIN(A,B) ((A) < (B) ? (A) : (B))
-#endif
-
-#ifdef DEBUG_EDIT
-private void
-read_debug(EditLine *el)
-{
-
-	if (el->el_line.cursor > el->el_line.lastchar)
-		(void) fprintf(el->el_errfile, "cursor > lastchar\r\n");
-	if (el->el_line.cursor < el->el_line.buffer)
-		(void) fprintf(el->el_errfile, "cursor < buffer\r\n");
-	if (el->el_line.cursor > el->el_line.limit)
-		(void) fprintf(el->el_errfile, "cursor > limit\r\n");
-	if (el->el_line.lastchar > el->el_line.limit)
-		(void) fprintf(el->el_errfile, "lastchar > limit\r\n");
-	if (el->el_line.limit != &el->el_line.buffer[EL_BUFSIZ - 2])
-		(void) fprintf(el->el_errfile, "limit != &buffer[EL_BUFSIZ-2]\r\n");
-}
-#endif /* DEBUG_EDIT */
-
-
-/* read__fixio():
- *	Try to recover from a read error
- */
-/* ARGSUSED */
-private int
-read__fixio(int fd __attribute__((__unused__)), int e)
-{
-
-	switch (e) {
-	case -1:		/* Make sure that the code is reachable */
-
-#ifdef EWOULDBLOCK
-	case EWOULDBLOCK:
-#ifndef TRY_AGAIN
-#define TRY_AGAIN
-#endif
-#endif /* EWOULDBLOCK */
-
-#if defined(POSIX) && defined(EAGAIN)
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-	case EAGAIN:
-#ifndef TRY_AGAIN
-#define TRY_AGAIN
-#endif
-#endif /* EWOULDBLOCK && EWOULDBLOCK != EAGAIN */
-#endif /* POSIX && EAGAIN */
-
-		e = 0;
-#ifdef TRY_AGAIN
-#if defined(F_SETFL) && defined(O_NDELAY)
-		if ((e = fcntl(fd, F_GETFL, 0)) == -1)
-			return -1;
-
-		if (fcntl(fd, F_SETFL, e & ~O_NDELAY) == -1)
-			return -1;
-		else
-			e = 1;
-#endif /* F_SETFL && O_NDELAY */
-
-#ifdef FIONBIO
-		{
-			int zero = 0;
-
-			if (ioctl(fd, FIONBIO, &zero) == -1)
-				return -1;
-			else
-				e = 1;
-		}
-#endif /* FIONBIO */
-
-#endif /* TRY_AGAIN */
-		return e ? 0 : -1;
-
-	case EINTR:
-		return 0;
-
-	default:
-		return -1;
-	}
-}
-
-
-/* read_preread():
- *	Try to read the stuff in the input queue;
- */
-private int
-read_preread(EditLine *el)
-{
-	int chrs = 0;
-
-	if (el->el_tty.t_mode == ED_IO)
-		return 0;
-
-#ifndef WIDECHAR
-/* FIONREAD attempts to buffer up multiple bytes, and to make that work
- * properly with partial wide/UTF-8 characters would need some careful work. */
-#ifdef FIONREAD
-	(void) ioctl(el->el_infd, FIONREAD, &chrs);
-	if (chrs > 0) {
-		char buf[EL_BUFSIZ];
-
-		chrs = read(el->el_infd, buf,
-		    (size_t) MIN(chrs, EL_BUFSIZ - 1));
-		if (chrs > 0) {
-			buf[chrs] = '\0';
-			el_push(el, buf);
-		}
-	}
-#endif /* FIONREAD */
-#endif
-	return chrs > 0;
-}
-
-
-/* el_push():
- *	Push a macro
- */
-public void
-FUN(el,push)(EditLine *el, const Char *str)
-{
-	c_macro_t *ma = &el->el_chared.c_macro;
-
-	if (str != NULL && ma->level + 1 < EL_MAXMACRO) {
-		ma->level++;
-		if ((ma->macro[ma->level] = Strdup(str)) != NULL)
-			return;
-		ma->level--;
-	}
-	terminal_beep(el);
-	terminal__flush(el);
-}
-
-
-/* read_getcmd():
- *	Get next command from the input stream, return OKCMD on success.
- *	Character values > 255 are not looked up in the map, but inserted.
- */
-private int
-read_getcmd(EditLine *el, el_action_t *cmdnum, Char *ch)
-{
-	el_action_t cmd;
-	int num;
-
-	el->el_errno = 0;
-	do {
-		if ((num = FUN(el,getc)(el, ch)) != 1) {/* if EOF or error */
-			el->el_errno = num == 0 ? 0 : errno;
-			return 0;	/* not OKCMD */
-		}
-
-#ifdef	KANJI
-		if ((*ch & 0200)) {
-			el->el_state.metanext = 0;
-			cmd = CcViMap[' '];
-			break;
-		} else
-#endif /* KANJI */
-
-		if (el->el_state.metanext) {
-			el->el_state.metanext = 0;
-			*ch |= 0200;
-		}
-#ifdef WIDECHAR
-		if (*ch >= N_KEYS)
-			cmd = ED_INSERT;
-		else
-#endif
-			cmd = el->el_map.current[(unsigned char) *ch];
-		if (cmd == ED_SEQUENCE_LEAD_IN) {
-			keymacro_value_t val;
-			switch (keymacro_get(el, ch, &val)) {
-			case XK_CMD:
-				cmd = val.cmd;
-				break;
-			case XK_STR:
-				FUN(el,push)(el, val.str);
-				break;
-#ifdef notyet
-			case XK_EXE:
-				/* XXX: In the future to run a user function */
-				RunCommand(val.str);
-				break;
-#endif
-			default:
-				EL_ABORT((el->el_errfile, "Bad XK_ type \n"));
-				break;
-			}
-		}
-		if (el->el_map.alt == NULL)
-			el->el_map.current = el->el_map.key;
-	} while (cmd == ED_SEQUENCE_LEAD_IN);
-	*cmdnum = cmd;
-	return OKCMD;
-}
-
-#ifdef WIDECHAR
-/* utf8_islead():
- *	Test whether a byte is a leading byte of a UTF-8 sequence.
- */
-private int
-utf8_islead(int c)
-{
-	return c < 0x80 ||	       /* single byte char */
-	       (c >= 0xc2 && c <= 0xf4); /* start of multibyte sequence */
-}
-#endif
-
-/* read_char():
- *	Read a character from the tty.
- */
-private int
-read_char(EditLine *el, Char *cp)
-{
-	ssize_t num_read;
-	int tried = 0;
-	char cbuf[MB_LEN_MAX];
-	size_t cbp = 0;
-	int bytes = 0;
-
- again:
-	el->el_signal->sig_no = 0;
-	while ((num_read = read(el->el_infd, cbuf + cbp, (size_t)1)) == -1) {
-		int e = errno;
-		switch (el->el_signal->sig_no) {
-		case SIGCONT:
-			FUN(el,set)(el, EL_REFRESH);
-			/*FALLTHROUGH*/
-		case SIGWINCH:
-			sig_set(el);
-			goto again;
-		default:
-			break;
-		}
-		if (!tried && read__fixio(el->el_infd, e) == 0)
-			tried = 1;
-		else {
-			errno = e;
-			*cp = '\0';
-			return -1;
-		}
-	}
-
-	/* Test for EOF */
-	if (num_read == 0) {
-		errno = 0;
-		*cp = '\0';
-		return 0;
-	}
-
-#ifdef WIDECHAR
-	if (el->el_flags & CHARSET_IS_UTF8) {
-		if (!utf8_islead((unsigned char)cbuf[0]))
-			goto again; /* discard the byte we read and try again */
-		++cbp;
-		if ((bytes = ct_mbtowc(cp, cbuf, cbp)) == -1) {
-			ct_mbtowc_reset;
-			if (cbp >= MB_LEN_MAX) { /* "shouldn't happen" */
-				errno = EILSEQ;
-				*cp = '\0';
-				return -1;
-			}
-			goto again;
-		}
-	} else if (isascii((unsigned char)cbuf[0]) ||
-		/* we don't support other multibyte charsets */
-		++cbp != 1 ||
-		/* Try non-ASCII characters in a 8-bit character set */
-		(bytes = ct_mbtowc(cp, cbuf, cbp)) != 1)
-#endif
-		*cp = (unsigned char)cbuf[0];
-
-	if ((el->el_flags & IGNORE_EXTCHARS) && bytes > 1) {
-		cbp = 0; /* skip this character */
-		goto again;
-	}
-
-	return (int)num_read;
-}
-
-/* read_pop():
- *	Pop a macro from the stack
- */
-private void
-read_pop(c_macro_t *ma)
-{
-	int i;
-
-	el_free(ma->macro[0]);
-	for (i = 0; i < ma->level; i++)
-		ma->macro[i] = ma->macro[i + 1];
-	ma->level--;
-	ma->offset = 0;
-}
-
-/* el_getc():
- *	Read a character
- */
-public int
-FUN(el,getc)(EditLine *el, Char *cp)
-{
-	int num_read;
-	c_macro_t *ma = &el->el_chared.c_macro;
-
-	terminal__flush(el);
-	for (;;) {
-		if (ma->level < 0) {
-			if (!read_preread(el))
-				break;
-		}
-
-		if (ma->level < 0)
-			break;
-
-		if (ma->macro[0][ma->offset] == '\0') {
-			read_pop(ma);
-			continue;
-		}
-
-		*cp = ma->macro[0][ma->offset++];
-
-		if (ma->macro[0][ma->offset] == '\0') {
-			/* Needed for QuoteMode On */
-			read_pop(ma);
-		}
-
-		return 1;
-	}
-
-#ifdef DEBUG_READ
-	(void) fprintf(el->el_errfile, "Turning raw mode on\n");
-#endif /* DEBUG_READ */
-	if (tty_rawmode(el) < 0)/* make sure the tty is set up correctly */
-		return 0;
-
-#ifdef DEBUG_READ
-	(void) fprintf(el->el_errfile, "Reading a character\n");
-#endif /* DEBUG_READ */
-	num_read = (*el->el_read.read_char)(el, cp);
-	if (num_read < 0)
-		el->el_errno = errno;
-#ifdef WIDECHAR
-	if (el->el_flags & NARROW_READ)
-		*cp = *(char *)(void *)cp;
-#endif
-#ifdef DEBUG_READ
-	(void) fprintf(el->el_errfile, "Got it %c\n", *cp);
-#endif /* DEBUG_READ */
-	return num_read;
-}
-
-protected void
-read_prepare(EditLine *el)
-{
-	if (el->el_flags & HANDLE_SIGNALS)
-		sig_set(el);
-	if (el->el_flags & NO_TTY)
-		return;
-	if ((el->el_flags & (UNBUFFERED|EDIT_DISABLED)) == UNBUFFERED)
-		tty_rawmode(el);
-
-	/* This is relatively cheap, and things go terribly wrong if
-	   we have the wrong size. */
-	el_resize(el);
-	re_clear_display(el);	/* reset the display stuff */
-	ch_reset(el, 0);
-	re_refresh(el);		/* print the prompt */
-
-	if (el->el_flags & UNBUFFERED)
-		terminal__flush(el);
-}
-
-protected void
-read_finish(EditLine *el)
-{
-	if ((el->el_flags & UNBUFFERED) == 0)
-		(void) tty_cookedmode(el);
-	if (el->el_flags & HANDLE_SIGNALS)
-		sig_clr(el);
-}
-
-public const Char *
-FUN(el,gets)(EditLine *el, int *nread)
-{
-	int retval;
-	el_action_t cmdnum = 0;
-	int num;		/* how many chars we have read at NL */
-	Char ch, *cp;
-	int crlf = 0;
-	int nrb;
-#ifdef FIONREAD
-	c_macro_t *ma = &el->el_chared.c_macro;
-#endif /* FIONREAD */
-
-	if (nread == NULL)
-		nread = &nrb;
-	*nread = 0;
-
-	if (el->el_flags & NO_TTY) {
-		size_t idx;
-
-		cp = el->el_line.buffer;
-		while ((num = (*el->el_read.read_char)(el, cp)) == 1) {
-			/* make sure there is space for next character */
-			if (cp + 1 >= el->el_line.limit) {
-				idx = (size_t)(cp - el->el_line.buffer);
-				if (!ch_enlargebufs(el, (size_t)2))
-					break;
-				cp = &el->el_line.buffer[idx];
-			}
-			cp++;
-			if (el->el_flags & UNBUFFERED)
-				break;
-			if (cp[-1] == '\r' || cp[-1] == '\n')
-				break;
-		}
-		if (num == -1) {
-			if (errno == EINTR)
-				cp = el->el_line.buffer;
-			el->el_errno = errno;
-		}
-
-		goto noedit;
-	}
-
-
-#ifdef FIONREAD
-	if (el->el_tty.t_mode == EX_IO && ma->level < 0) {
-		long chrs = 0;
-
-		(void) ioctl(el->el_infd, FIONREAD, &chrs);
-		if (chrs == 0) {
-			if (tty_rawmode(el) < 0) {
-				errno = 0;
-				*nread = 0;
-				return NULL;
-			}
-		}
-	}
-#endif /* FIONREAD */
-
-	if ((el->el_flags & UNBUFFERED) == 0)
-		read_prepare(el);
-
-	if (el->el_flags & EDIT_DISABLED) {
-		size_t idx;
-
-		if ((el->el_flags & UNBUFFERED) == 0)
-			cp = el->el_line.buffer;
-		else
-			cp = el->el_line.lastchar;
-
-		terminal__flush(el);
-
-		while ((num = (*el->el_read.read_char)(el, cp)) == 1) {
-			/* make sure there is space next character */
-			if (cp + 1 >= el->el_line.limit) {
-				idx = (size_t)(cp - el->el_line.buffer);
-				if (!ch_enlargebufs(el, (size_t)2))
-					break;
-				cp = &el->el_line.buffer[idx];
-			}
-			cp++;
-			crlf = cp[-1] == '\r' || cp[-1] == '\n';
-			if (el->el_flags & UNBUFFERED)
-				break;
-			if (crlf)
-				break;
-		}
-
-		if (num == -1) {
-			if (errno == EINTR)
-				cp = el->el_line.buffer;
-			el->el_errno = errno;
-		}
-
-		goto noedit;
-	}
-
-	for (num = OKCMD; num == OKCMD;) {	/* while still editing this
-						 * line */
-#ifdef DEBUG_EDIT
-		read_debug(el);
-#endif /* DEBUG_EDIT */
-		/* if EOF or error */
-		if ((num = read_getcmd(el, &cmdnum, &ch)) != OKCMD) {
-			num = -1;
-#ifdef DEBUG_READ
-			(void) fprintf(el->el_errfile,
-			    "Returning from el_gets %d\n", num);
-#endif /* DEBUG_READ */
-			break;
-		}
-		if (el->el_errno == EINTR) {
-			el->el_line.buffer[0] = '\0';
-			el->el_line.lastchar =
-			    el->el_line.cursor = el->el_line.buffer;
-			break;
-		}
-		if ((size_t)cmdnum >= el->el_map.nfunc) {	/* BUG CHECK command */
-#ifdef DEBUG_EDIT
-			(void) fprintf(el->el_errfile,
-			    "ERROR: illegal command from key 0%o\r\n", ch);
-#endif /* DEBUG_EDIT */
-			continue;	/* try again */
-		}
-		/* now do the real command */
-#ifdef DEBUG_READ
-		{
-			el_bindings_t *b;
-			for (b = el->el_map.help; b->name; b++)
-				if (b->func == cmdnum)
-					break;
-			if (b->name)
-				(void) fprintf(el->el_errfile,
-				    "Executing %s\n", b->name);
-			else
-				(void) fprintf(el->el_errfile,
-				    "Error command = %d\n", cmdnum);
-		}
-#endif /* DEBUG_READ */
-		/* vi redo needs these way down the levels... */
-		el->el_state.thiscmd = cmdnum;
-		el->el_state.thisch = ch;
-		if (el->el_map.type == MAP_VI &&
-		    el->el_map.current == el->el_map.key &&
-		    el->el_chared.c_redo.pos < el->el_chared.c_redo.lim) {
-			if (cmdnum == VI_DELETE_PREV_CHAR &&
-			    el->el_chared.c_redo.pos != el->el_chared.c_redo.buf
-			    && Isprint(el->el_chared.c_redo.pos[-1]))
-				el->el_chared.c_redo.pos--;
-			else
-				*el->el_chared.c_redo.pos++ = ch;
-		}
-		retval = (*el->el_map.func[cmdnum]) (el, ch);
-#ifdef DEBUG_READ
-		(void) fprintf(el->el_errfile,
-			"Returned state %d\n", retval );
-#endif /* DEBUG_READ */
-
-		/* save the last command here */
-		el->el_state.lastcmd = cmdnum;
-
-		/* use any return value */
-		switch (retval) {
-		case CC_CURSOR:
-			re_refresh_cursor(el);
-			break;
-
-		case CC_REDISPLAY:
-			re_clear_lines(el);
-			re_clear_display(el);
-			/* FALLTHROUGH */
-
-		case CC_REFRESH:
-			re_refresh(el);
-			break;
-
-		case CC_REFRESH_BEEP:
-			re_refresh(el);
-			terminal_beep(el);
-			break;
-
-		case CC_NORM:	/* normal char */
-			break;
-
-		case CC_ARGHACK:	/* Suggested by Rich Salz */
-			/* <rsalz@pineapple.bbn.com> */
-			continue;	/* keep going... */
-
-		case CC_EOF:	/* end of file typed */
-			if ((el->el_flags & UNBUFFERED) == 0)
-				num = 0;
-			else if (num == -1) {
-				*el->el_line.lastchar++ = CONTROL('d');
-				el->el_line.cursor = el->el_line.lastchar;
-				num = 1;
-			}
-			break;
-
-		case CC_NEWLINE:	/* normal end of line */
-			num = (int)(el->el_line.lastchar - el->el_line.buffer);
-			break;
-
-		case CC_FATAL:	/* fatal error, reset to known state */
-#ifdef DEBUG_READ
-			(void) fprintf(el->el_errfile,
-			    "*** editor fatal ERROR ***\r\n\n");
-#endif /* DEBUG_READ */
-			/* put (real) cursor in a known place */
-			re_clear_display(el);	/* reset the display stuff */
-			ch_reset(el, 1);	/* reset the input pointers */
-			re_refresh(el); /* print the prompt again */
-			break;
-
-		case CC_ERROR:
-		default:	/* functions we don't know about */
-#ifdef DEBUG_READ
-			(void) fprintf(el->el_errfile,
-			    "*** editor ERROR ***\r\n\n");
-#endif /* DEBUG_READ */
-			terminal_beep(el);
-			terminal__flush(el);
-			break;
-		}
-		el->el_state.argument = 1;
-		el->el_state.doingarg = 0;
-		el->el_chared.c_vcmd.action = NOP;
-		if (el->el_flags & UNBUFFERED)
-			break;
-	}
-
-	terminal__flush(el);		/* flush any buffered output */
-	/* make sure the tty is set up correctly */
-	if ((el->el_flags & UNBUFFERED) == 0) {
-		read_finish(el);
-		*nread = num != -1 ? num : 0;
-	} else {
-		*nread = (int)(el->el_line.lastchar - el->el_line.buffer);
-	}
-	goto done;
-noedit:
-	el->el_line.cursor = el->el_line.lastchar = cp;
-	*cp = '\0';
-	*nread = (int)(el->el_line.cursor - el->el_line.buffer);
-done:
-	if (*nread == 0) {
-		if (num == -1) {
-			*nread = -1;
-			errno = el->el_errno;
-		}
-		return NULL;
-	} else
-		return el->el_line.buffer;
-}
diff --git a/lib/libedit/read.h b/lib/libedit/read.h
deleted file mode 100644
index 852606a9c..000000000
--- a/lib/libedit/read.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: read.h,v 1.7 2009/12/30 22:37:40 christos Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Anthony Mallet.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * el.read.h: Character reading functions
- */
-#ifndef	_h_el_read
-#define	_h_el_read
-
-typedef int (*el_rfunc_t)(EditLine *, Char *);
-
-typedef struct el_read_t {
-	el_rfunc_t	read_char;	/* Function to read a character */
-} el_read_t;
- 
-protected int		read_init(EditLine *);
-protected void		read_prepare(EditLine *);
-protected void		read_finish(EditLine *);
-protected int		el_read_setfn(EditLine *, el_rfunc_t);
-protected el_rfunc_t	el_read_getfn(EditLine *);
-
-#endif /* _h_el_read */
diff --git a/lib/libedit/readline.c b/lib/libedit/readline.c
deleted file mode 100644
index a2bced4f2..000000000
--- a/lib/libedit/readline.c
+++ /dev/null
@@ -1,2325 +0,0 @@
-/*	$NetBSD: readline.c,v 1.117 2015/06/02 15:35:31 christos Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jaromir Dolecek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.117 2015/06/02 15:35:31 christos Exp $");
-#endif /* not lint && not SCCSID */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <dirent.h>
-#include <string.h>
-#include <pwd.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <limits.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <setjmp.h>
-#include <vis.h>
-
-#include "readline/readline.h"
-#include "el.h"
-#include "fcns.h"		/* for EL_NUM_FCNS */
-#include "histedit.h"
-#include "filecomplete.h"
-
-void rl_prep_terminal(int);
-void rl_deprep_terminal(void);
-
-/* for rl_complete() */
-#define TAB		'\r'
-
-/* see comment at the #ifdef for sense of this */
-/* #define GDB_411_HACK */
-
-/* readline compatibility stuff - look at readline sources/documentation */
-/* to see what these variables mean */
-const char *rl_library_version = "EditLine wrapper";
-int rl_readline_version = RL_READLINE_VERSION;
-static char empty[] = { '\0' };
-static char expand_chars[] = { ' ', '\t', '\n', '=', '(', '\0' };
-static char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@', '$',
-    '>', '<', '=', ';', '|', '&', '{', '(', '\0' };
-char *rl_readline_name = empty;
-FILE *rl_instream = NULL;
-FILE *rl_outstream = NULL;
-int rl_point = 0;
-int rl_end = 0;
-char *rl_line_buffer = NULL;
-rl_vcpfunc_t *rl_linefunc = NULL;
-int rl_done = 0;
-VFunction *rl_event_hook = NULL;
-KEYMAP_ENTRY_ARRAY emacs_standard_keymap,
-    emacs_meta_keymap,
-    emacs_ctlx_keymap;
-/*
- * The following is not implemented; we always catch signals in the
- * libedit fashion: set handlers on entry to el_gets() and clear them
- * on the way out. This simplistic approach works for most cases; if
- * it does not work for your application, please let us know.
- */
-int rl_catch_signals = 1;
-int rl_catch_sigwinch = 1;
-
-int history_base = 1;		/* probably never subject to change */
-int history_length = 0;
-int max_input_history = 0;
-char history_expansion_char = '!';
-char history_subst_char = '^';
-char *history_no_expand_chars = expand_chars;
-Function *history_inhibit_expansion_function = NULL;
-char *history_arg_extract(int start, int end, const char *str);
-
-int rl_inhibit_completion = 0;
-int rl_attempted_completion_over = 0;
-char *rl_basic_word_break_characters = break_chars;
-char *rl_completer_word_break_characters = NULL;
-char *rl_completer_quote_characters = NULL;
-rl_compentry_func_t *rl_completion_entry_function = NULL;
-char *(*rl_completion_word_break_hook)(void) = NULL;
-rl_completion_func_t *rl_attempted_completion_function = NULL;
-Function *rl_pre_input_hook = NULL;
-Function *rl_startup1_hook = NULL;
-int (*rl_getc_function)(FILE *) = NULL;
-char *rl_terminal_name = NULL;
-int rl_already_prompted = 0;
-int rl_filename_completion_desired = 0;
-int rl_ignore_completion_duplicates = 0;
-int readline_echoing_p = 1;
-int _rl_print_completions_horizontally = 0;
-VFunction *rl_redisplay_function = NULL;
-Function *rl_startup_hook = NULL;
-VFunction *rl_completion_display_matches_hook = NULL;
-VFunction *rl_prep_term_function = (VFunction *)rl_prep_terminal;
-VFunction *rl_deprep_term_function = (VFunction *)rl_deprep_terminal;
-KEYMAP_ENTRY_ARRAY emacs_meta_keymap;
-
-/*
- * The current prompt string.
- */
-char *rl_prompt = NULL;
-/*
- * This is set to character indicating type of completion being done by
- * rl_complete_internal(); this is available for application completion
- * functions.
- */
-int rl_completion_type = 0;
-
-/*
- * If more than this number of items results from query for possible
- * completions, we ask user if they are sure to really display the list.
- */
-int rl_completion_query_items = 100;
-
-/*
- * List of characters which are word break characters, but should be left
- * in the parsed text when it is passed to the completion function.
- * Shell uses this to help determine what kind of completing to do.
- */
-char *rl_special_prefixes = NULL;
-
-/*
- * This is the character appended to the completed words if at the end of
- * the line. Default is ' ' (a space).
- */
-int rl_completion_append_character = ' ';
-
-/* stuff below is used internally by libedit for readline emulation */
-
-static History *h = NULL;
-static EditLine *e = NULL;
-static rl_command_func_t *map[256];
-static jmp_buf topbuf;
-
-/* internal functions */
-static unsigned char	 _el_rl_complete(EditLine *, int);
-static unsigned char	 _el_rl_tstp(EditLine *, int);
-static char		*_get_prompt(EditLine *);
-static int		 _getc_function(EditLine *, char *);
-static HIST_ENTRY	*_move_history(int);
-static int		 _history_expand_command(const char *, size_t, size_t,
-    char **);
-static char		*_rl_compat_sub(const char *, const char *,
-    const char *, int);
-static int		 _rl_event_read_char(EditLine *, char *);
-static void		 _rl_update_pos(void);
-
-
-/* ARGSUSED */
-static char *
-_get_prompt(EditLine *el __attribute__((__unused__)))
-{
-	rl_already_prompted = 1;
-	return rl_prompt;
-}
-
-
-/*
- * generic function for moving around history
- */
-static HIST_ENTRY *
-_move_history(int op)
-{
-	HistEvent ev;
-	static HIST_ENTRY rl_he;
-
-	if (history(h, &ev, op) != 0)
-		return NULL;
-
-	rl_he.line = ev.str;
-	rl_he.data = NULL;
-
-	return &rl_he;
-}
-
-
-/*
- * read one key from user defined input function
- */
-static int
-/*ARGSUSED*/
-_getc_function(EditLine *el __attribute__((__unused__)), char *c)
-{
-	int i;
-
-	i = (*rl_getc_function)(NULL);
-	if (i == -1)
-		return 0;
-	*c = (char)i;
-	return 1;
-}
-
-static void
-_resize_fun(EditLine *el, void *a)
-{
-	const LineInfo *li;
-	char **ap = a;
-
-	li = el_line(el);
-	/* a cheesy way to get rid of const cast. */
-	*ap = memchr(li->buffer, *li->buffer, (size_t)1);
-}
-
-static const char *
-_default_history_file(void)
-{
-	struct passwd *p;
-	static char *path;
-	size_t len;
-
-	if (path)
-		return path;
-
-	if ((p = getpwuid(getuid())) == NULL)
-		return NULL;
-
-	len = strlen(p->pw_dir) + sizeof("/.history");
-	if ((path = malloc(len)) == NULL)
-		return NULL;
-
-	(void)snprintf(path, len, "%s/.history", p->pw_dir);
-	return path;
-}
-
-/*
- * READLINE compatibility stuff
- */
-
-/*
- * Set the prompt
- */
-int
-rl_set_prompt(const char *prompt)
-{
-	char *p;
-
-	if (!prompt)
-		prompt = "";
-	if (rl_prompt != NULL && strcmp(rl_prompt, prompt) == 0) 
-		return 0;
-	if (rl_prompt)
-		el_free(rl_prompt);
-	rl_prompt = strdup(prompt);
-	if (rl_prompt == NULL)
-		return -1;
-
-	while ((p = strchr(rl_prompt, RL_PROMPT_END_IGNORE)) != NULL)
-		*p = RL_PROMPT_START_IGNORE;
-
-	return 0;
-}
-
-/*
- * initialize rl compat stuff
- */
-int
-rl_initialize(void)
-{
-	HistEvent ev;
-	int editmode = 1;
-	struct termios t;
-
-	if (e != NULL)
-		el_end(e);
-	if (h != NULL)
-		history_end(h);
-
-	if (!rl_instream)
-		rl_instream = stdin;
-	if (!rl_outstream)
-		rl_outstream = stdout;
-
-	/*
-	 * See if we don't really want to run the editor
-	 */
-	if (tcgetattr(fileno(rl_instream), &t) != -1 && (t.c_lflag & ECHO) == 0)
-		editmode = 0;
-
-	e = el_init(rl_readline_name, rl_instream, rl_outstream, stderr);
-
-	if (!editmode)
-		el_set(e, EL_EDITMODE, 0);
-
-	h = history_init();
-	if (!e || !h)
-		return -1;
-
-	history(h, &ev, H_SETSIZE, INT_MAX);	/* unlimited */
-	history_length = 0;
-	max_input_history = INT_MAX;
-	el_set(e, EL_HIST, history, h);
-
-	/* Setup resize function */
-	el_set(e, EL_RESIZE, _resize_fun, &rl_line_buffer);
-
-	/* setup getc function if valid */
-	if (rl_getc_function)
-		el_set(e, EL_GETCFN, _getc_function);
-
-	/* for proper prompt printing in readline() */
-	if (rl_set_prompt("") == -1) {
-		history_end(h);
-		el_end(e);
-		return -1;
-	}
-	el_set(e, EL_PROMPT, _get_prompt, RL_PROMPT_START_IGNORE);
-	el_set(e, EL_SIGNAL, rl_catch_signals);
-
-	/* set default mode to "emacs"-style and read setting afterwards */
-	/* so this can be overridden */
-	el_set(e, EL_EDITOR, "emacs");
-	if (rl_terminal_name != NULL)
-		el_set(e, EL_TERMINAL, rl_terminal_name);
-	else
-		el_get(e, EL_TERMINAL, &rl_terminal_name);
-
-	/*
-	 * Word completion - this has to go AFTER rebinding keys
-	 * to emacs-style.
-	 */
-	el_set(e, EL_ADDFN, "rl_complete",
-	    "ReadLine compatible completion function",
-	    _el_rl_complete);
-	el_set(e, EL_BIND, "^I", "rl_complete", NULL);
-
-	/*
-	 * Send TSTP when ^Z is pressed.
-	 */
-	el_set(e, EL_ADDFN, "rl_tstp",
-	    "ReadLine compatible suspend function",
-	    _el_rl_tstp);
-	el_set(e, EL_BIND, "^Z", "rl_tstp", NULL);
-		
-	/*
-	 * Set some readline compatible key-bindings.
-	 */
-	el_set(e, EL_BIND, "^R", "em-inc-search-prev", NULL);
-
-	/*
-	 * Allow the use of Home/End keys.
-	 */
-	el_set(e, EL_BIND, "\\e[1~", "ed-move-to-beg", NULL);
-	el_set(e, EL_BIND, "\\e[4~", "ed-move-to-end", NULL);
-	el_set(e, EL_BIND, "\\e[7~", "ed-move-to-beg", NULL);
-	el_set(e, EL_BIND, "\\e[8~", "ed-move-to-end", NULL);
-	el_set(e, EL_BIND, "\\e[H", "ed-move-to-beg", NULL);
-	el_set(e, EL_BIND, "\\e[F", "ed-move-to-end", NULL);
-
-	/*
-	 * Allow the use of the Delete/Insert keys.
-	 */
-	el_set(e, EL_BIND, "\\e[3~", "ed-delete-next-char", NULL);
-	el_set(e, EL_BIND, "\\e[2~", "ed-quoted-insert", NULL);
-
-	/*
-	 * Ctrl-left-arrow and Ctrl-right-arrow for word moving.
-	 */
-	el_set(e, EL_BIND, "\\e[1;5C", "em-next-word", NULL);
-	el_set(e, EL_BIND, "\\e[1;5D", "ed-prev-word", NULL);
-	el_set(e, EL_BIND, "\\e[5C", "em-next-word", NULL);
-	el_set(e, EL_BIND, "\\e[5D", "ed-prev-word", NULL);
-	el_set(e, EL_BIND, "\\e\\e[C", "em-next-word", NULL);
-	el_set(e, EL_BIND, "\\e\\e[D", "ed-prev-word", NULL);
-
-	/* read settings from configuration file */
-	el_source(e, NULL);
-
-	/*
-	 * Unfortunately, some applications really do use rl_point
-	 * and rl_line_buffer directly.
-	 */
-	_resize_fun(e, &rl_line_buffer);
-	_rl_update_pos();
-
-	if (rl_startup_hook)
-		(*rl_startup_hook)(NULL, 0);
-
-	return 0;
-}
-
-
-/*
- * read one line from input stream and return it, chomping
- * trailing newline (if there is any)
- */
-char *
-readline(const char *p)
-{
-	HistEvent ev;
-	const char * volatile prompt = p;
-	int count;
-	const char *ret;
-	char *buf;
-	static int used_event_hook;
-
-	if (e == NULL || h == NULL)
-		rl_initialize();
-
-	rl_done = 0;
-
-	(void)setjmp(topbuf);
-
-	/* update prompt accordingly to what has been passed */
-	if (rl_set_prompt(prompt) == -1)
-		return NULL;
-
-	if (rl_pre_input_hook)
-		(*rl_pre_input_hook)(NULL, 0);
-
-	if (rl_event_hook && !(e->el_flags&NO_TTY)) {
-		el_set(e, EL_GETCFN, _rl_event_read_char);
-		used_event_hook = 1;
-	}
-
-	if (!rl_event_hook && used_event_hook) {
-		el_set(e, EL_GETCFN, EL_BUILTIN_GETCFN);
-		used_event_hook = 0;
-	}
-
-	rl_already_prompted = 0;
-
-	/* get one line from input stream */
-	ret = el_gets(e, &count);
-
-	if (ret && count > 0) {
-		int lastidx;
-
-		buf = strdup(ret);
-		if (buf == NULL)
-			return NULL;
-		lastidx = count - 1;
-		if (buf[lastidx] == '\n')
-			buf[lastidx] = '\0';
-	} else
-		buf = NULL;
-
-	history(h, &ev, H_GETSIZE);
-	history_length = ev.num;
-
-	return buf;
-}
-
-/*
- * history functions
- */
-
-/*
- * is normally called before application starts to use
- * history expansion functions
- */
-void
-using_history(void)
-{
-	if (h == NULL || e == NULL)
-		rl_initialize();
-}
-
-
-/*
- * substitute ``what'' with ``with'', returning resulting string; if
- * globally == 1, substitutes all occurrences of what, otherwise only the
- * first one
- */
-static char *
-_rl_compat_sub(const char *str, const char *what, const char *with,
-    int globally)
-{
-	const	char	*s;
-	char	*r, *result;
-	size_t	len, with_len, what_len;
-
-	len = strlen(str);
-	with_len = strlen(with);
-	what_len = strlen(what);
-
-	/* calculate length we need for result */
-	s = str;
-	while (*s) {
-		if (*s == *what && !strncmp(s, what, what_len)) {
-			len += with_len - what_len;
-			if (!globally)
-				break;
-			s += what_len;
-		} else
-			s++;
-	}
-	r = result = el_malloc((len + 1) * sizeof(*r));
-	if (result == NULL)
-		return NULL;
-	s = str;
-	while (*s) {
-		if (*s == *what && !strncmp(s, what, what_len)) {
-			(void)strncpy(r, with, with_len);
-			r += with_len;
-			s += what_len;
-			if (!globally) {
-				(void)strcpy(r, s);
-				return result;
-			}
-		} else
-			*r++ = *s++;
-	}
-	*r = '\0';
-	return result;
-}
-
-static	char	*last_search_pat;	/* last !?pat[?] search pattern */
-static	char	*last_search_match;	/* last !?pat[?] that matched */
-
-const char *
-get_history_event(const char *cmd, int *cindex, int qchar)
-{
-	int idx, sign, sub, num, begin, ret;
-	size_t len;
-	char	*pat;
-	const char *rptr;
-	HistEvent ev;
-
-	idx = *cindex;
-	if (cmd[idx++] != history_expansion_char)
-		return NULL;
-
-	/* find out which event to take */
-	if (cmd[idx] == history_expansion_char || cmd[idx] == '\0') {
-		if (history(h, &ev, H_FIRST) != 0)
-			return NULL;
-		*cindex = cmd[idx]? (idx + 1):idx;
-		return ev.str;
-	}
-	sign = 0;
-	if (cmd[idx] == '-') {
-		sign = 1;
-		idx++;
-	}
-
-	if ('0' <= cmd[idx] && cmd[idx] <= '9') {
-		HIST_ENTRY *rl_he;
-
-		num = 0;
-		while (cmd[idx] && '0' <= cmd[idx] && cmd[idx] <= '9') {
-			num = num * 10 + cmd[idx] - '0';
-			idx++;
-		}
-		if (sign)
-			num = history_length - num + 1;
-
-		if (!(rl_he = history_get(num)))
-			return NULL;
-
-		*cindex = idx;
-		return rl_he->line;
-	}
-	sub = 0;
-	if (cmd[idx] == '?') {
-		sub = 1;
-		idx++;
-	}
-	begin = idx;
-	while (cmd[idx]) {
-		if (cmd[idx] == '\n')
-			break;
-		if (sub && cmd[idx] == '?')
-			break;
-		if (!sub && (cmd[idx] == ':' || cmd[idx] == ' '
-				    || cmd[idx] == '\t' || cmd[idx] == qchar))
-			break;
-		idx++;
-	}
-	len = (size_t)idx - (size_t)begin;
-	if (sub && cmd[idx] == '?')
-		idx++;
-	if (sub && len == 0 && last_search_pat && *last_search_pat)
-		pat = last_search_pat;
-	else if (len == 0)
-		return NULL;
-	else {
-		if ((pat = el_malloc((len + 1) * sizeof(*pat))) == NULL)
-			return NULL;
-		(void)strncpy(pat, cmd + begin, len);
-		pat[len] = '\0';
-	}
-
-	if (history(h, &ev, H_CURR) != 0) {
-		if (pat != last_search_pat)
-			el_free(pat);
-		return NULL;
-	}
-	num = ev.num;
-
-	if (sub) {
-		if (pat != last_search_pat) {
-			if (last_search_pat)
-				el_free(last_search_pat);
-			last_search_pat = pat;
-		}
-		ret = history_search(pat, -1);
-	} else
-		ret = history_search_prefix(pat, -1);
-
-	if (ret == -1) {
-		/* restore to end of list on failed search */
-		history(h, &ev, H_FIRST);
-		(void)fprintf(rl_outstream, "%s: Event not found\n", pat);
-		if (pat != last_search_pat)
-			el_free(pat);
-		return NULL;
-	}
-
-	if (sub && len) {
-		if (last_search_match && last_search_match != pat)
-			el_free(last_search_match);
-		last_search_match = pat;
-	}
-
-	if (pat != last_search_pat)
-		el_free(pat);
-
-	if (history(h, &ev, H_CURR) != 0)
-		return NULL;
-	*cindex = idx;
-	rptr = ev.str;
-
-	/* roll back to original position */
-	(void)history(h, &ev, H_SET, num);
-
-	return rptr;
-}
-
-/*
- * the real function doing history expansion - takes as argument command
- * to do and data upon which the command should be executed
- * does expansion the way I've understood readline documentation
- *
- * returns 0 if data was not modified, 1 if it was and 2 if the string
- * should be only printed and not executed; in case of error,
- * returns -1 and *result points to NULL
- * it's the caller's responsibility to free() the string returned in *result
- */
-static int
-_history_expand_command(const char *command, size_t offs, size_t cmdlen,
-    char **result)
-{
-	char *tmp, *search = NULL, *aptr;
-	const char *ptr, *cmd;
-	static char *from = NULL, *to = NULL;
-	int start, end, idx, has_mods = 0;
-	int p_on = 0, g_on = 0;
-
-	*result = NULL;
-	aptr = NULL;
-	ptr = NULL;
-
-	/* First get event specifier */
-	idx = 0;
-
-	if (strchr(":^*$", command[offs + 1])) {
-		char str[4];
-		/*
-		* "!:" is shorthand for "!!:".
-		* "!^", "!*" and "!$" are shorthand for
-		* "!!:^", "!!:*" and "!!:$" respectively.
-		*/
-		str[0] = str[1] = '!';
-		str[2] = '0';
-		ptr = get_history_event(str, &idx, 0);
-		idx = (command[offs + 1] == ':')? 1:0;
-		has_mods = 1;
-	} else {
-		if (command[offs + 1] == '#') {
-			/* use command so far */
-			if ((aptr = el_malloc((offs + 1) * sizeof(*aptr)))
-			    == NULL)
-				return -1;
-			(void)strncpy(aptr, command, offs);
-			aptr[offs] = '\0';
-			idx = 1;
-		} else {
-			int	qchar;
-
-			qchar = (offs > 0 && command[offs - 1] == '"')? '"':0;
-			ptr = get_history_event(command + offs, &idx, qchar);
-		}
-		has_mods = command[offs + (size_t)idx] == ':';
-	}
-
-	if (ptr == NULL && aptr == NULL)
-		return -1;
-
-	if (!has_mods) {
-		*result = strdup(aptr ? aptr : ptr);
-		if (aptr)
-			el_free(aptr);
-		if (*result == NULL)
-			return -1;
-		return 1;
-	}
-
-	cmd = command + offs + idx + 1;
-
-	/* Now parse any word designators */
-
-	if (*cmd == '%')	/* last word matched by ?pat? */
-		tmp = strdup(last_search_match? last_search_match:"");
-	else if (strchr("^*$-0123456789", *cmd)) {
-		start = end = -1;
-		if (*cmd == '^')
-			start = end = 1, cmd++;
-		else if (*cmd == '$')
-			start = -1, cmd++;
-		else if (*cmd == '*')
-			start = 1, cmd++;
-	       else if (*cmd == '-' || isdigit((unsigned char) *cmd)) {
-			start = 0;
-			while (*cmd && '0' <= *cmd && *cmd <= '9')
-				start = start * 10 + *cmd++ - '0';
-
-			if (*cmd == '-') {
-				if (isdigit((unsigned char) cmd[1])) {
-					cmd++;
-					end = 0;
-					while (*cmd && '0' <= *cmd && *cmd <= '9')
-						end = end * 10 + *cmd++ - '0';
-				} else if (cmd[1] == '$') {
-					cmd += 2;
-					end = -1;
-				} else {
-					cmd++;
-					end = -2;
-				}
-			} else if (*cmd == '*')
-				end = -1, cmd++;
-			else
-				end = start;
-		}
-		tmp = history_arg_extract(start, end, aptr? aptr:ptr);
-		if (tmp == NULL) {
-			(void)fprintf(rl_outstream, "%s: Bad word specifier",
-			    command + offs + idx);
-			if (aptr)
-				el_free(aptr);
-			return -1;
-		}
-	} else
-		tmp = strdup(aptr? aptr:ptr);
-
-	if (aptr)
-		el_free(aptr);
-
-	if (*cmd == '\0' || ((size_t)(cmd - (command + offs)) >= cmdlen)) {
-		*result = tmp;
-		return 1;
-	}
-
-	for (; *cmd; cmd++) {
-		if (*cmd == ':')
-			continue;
-		else if (*cmd == 'h') {		/* remove trailing path */
-			if ((aptr = strrchr(tmp, '/')) != NULL)
-				*aptr = '\0';
-		} else if (*cmd == 't') {	/* remove leading path */
-			if ((aptr = strrchr(tmp, '/')) != NULL) {
-				aptr = strdup(aptr + 1);
-				el_free(tmp);
-				tmp = aptr;
-			}
-		} else if (*cmd == 'r') {	/* remove trailing suffix */
-			if ((aptr = strrchr(tmp, '.')) != NULL)
-				*aptr = '\0';
-		} else if (*cmd == 'e') {	/* remove all but suffix */
-			if ((aptr = strrchr(tmp, '.')) != NULL) {
-				aptr = strdup(aptr);
-				el_free(tmp);
-				tmp = aptr;
-			}
-		} else if (*cmd == 'p')		/* print only */
-			p_on = 1;
-		else if (*cmd == 'g')
-			g_on = 2;
-		else if (*cmd == 's' || *cmd == '&') {
-			char *what, *with, delim;
-			size_t len, from_len;
-			size_t size;
-
-			if (*cmd == '&' && (from == NULL || to == NULL))
-				continue;
-			else if (*cmd == 's') {
-				delim = *(++cmd), cmd++;
-				size = 16;
-				what = el_realloc(from, size * sizeof(*what));
-				if (what == NULL) {
-					el_free(from);
-					el_free(tmp);
-					return 0;
-				}
-				len = 0;
-				for (; *cmd && *cmd != delim; cmd++) {
-					if (*cmd == '\\' && cmd[1] == delim)
-						cmd++;
-					if (len >= size) {
-						char *nwhat;
-						nwhat = el_realloc(what,
-						    (size <<= 1) *
-						    sizeof(*nwhat));
-						if (nwhat == NULL) {
-							el_free(what);
-							el_free(tmp);
-							return 0;
-						}
-						what = nwhat;
-					}
-					what[len++] = *cmd;
-				}
-				what[len] = '\0';
-				from = what;
-				if (*what == '\0') {
-					el_free(what);
-					if (search) {
-						from = strdup(search);
-						if (from == NULL) {
-							el_free(tmp);
-							return 0;
-						}
-					} else {
-						from = NULL;
-						el_free(tmp);
-						return -1;
-					}
-				}
-				cmd++;	/* shift after delim */
-				if (!*cmd)
-					continue;
-
-				size = 16;
-				with = el_realloc(to, size * sizeof(*with));
-				if (with == NULL) {
-					el_free(to);
-					el_free(tmp);
-					return -1;
-				}
-				len = 0;
-				from_len = strlen(from);
-				for (; *cmd && *cmd != delim; cmd++) {
-					if (len + from_len + 1 >= size) {
-						char *nwith;
-						size += from_len + 1;
-						nwith = el_realloc(with,
-						    size * sizeof(*nwith));
-						if (nwith == NULL) {
-							el_free(with);
-							el_free(tmp);
-							return -1;
-						}
-						with = nwith;
-					}
-					if (*cmd == '&') {
-						/* safe */
-						(void)strcpy(&with[len], from);
-						len += from_len;
-						continue;
-					}
-					if (*cmd == '\\'
-					    && (*(cmd + 1) == delim
-						|| *(cmd + 1) == '&'))
-						cmd++;
-					with[len++] = *cmd;
-				}
-				with[len] = '\0';
-				to = with;
-			}
-
-			aptr = _rl_compat_sub(tmp, from, to, g_on);
-			if (aptr) {
-				el_free(tmp);
-				tmp = aptr;
-			}
-			g_on = 0;
-		}
-	}
-	*result = tmp;
-	return p_on? 2:1;
-}
-
-
-/*
- * csh-style history expansion
- */
-int
-history_expand(char *str, char **output)
-{
-	int ret = 0;
-	size_t idx, i, size;
-	char *tmp, *result;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	if (history_expansion_char == 0) {
-		*output = strdup(str);
-		return 0;
-	}
-
-	*output = NULL;
-	if (str[0] == history_subst_char) {
-		/* ^foo^foo2^ is equivalent to !!:s^foo^foo2^ */
-		*output = el_malloc((strlen(str) + 4 + 1) * sizeof(**output));
-		if (*output == NULL)
-			return 0;
-		(*output)[0] = (*output)[1] = history_expansion_char;
-		(*output)[2] = ':';
-		(*output)[3] = 's';
-		(void)strcpy((*output) + 4, str);
-		str = *output;
-	} else {
-		*output = strdup(str);
-		if (*output == NULL)
-			return 0;
-	}
-
-#define ADD_STRING(what, len, fr)					\
-	{								\
-		if (idx + len + 1 > size) {				\
-			char *nresult = el_realloc(result,		\
-			    (size += len + 1) * sizeof(*nresult));	\
-			if (nresult == NULL) {				\
-				el_free(*output);			\
-				if (/*CONSTCOND*/fr)			\
-					el_free(tmp);			\
-				return 0;				\
-			}						\
-			result = nresult;				\
-		}							\
-		(void)strncpy(&result[idx], what, len);			\
-		idx += len;						\
-		result[idx] = '\0';					\
-	}
-
-	result = NULL;
-	size = idx = 0;
-	tmp = NULL;
-	for (i = 0; str[i];) {
-		int qchar, loop_again;
-		size_t len, start, j;
-
-		qchar = 0;
-		loop_again = 1;
-		start = j = i;
-loop:
-		for (; str[j]; j++) {
-			if (str[j] == '\\' &&
-			    str[j + 1] == history_expansion_char) {
-				len = strlen(&str[j + 1]) + 1;
-				memmove(&str[j], &str[j + 1], len);
-				continue;
-			}
-			if (!loop_again) {
-				if (isspace((unsigned char) str[j])
-				    || str[j] == qchar)
-					break;
-			}
-			if (str[j] == history_expansion_char
-			    && !strchr(history_no_expand_chars, str[j + 1])
-			    && (!history_inhibit_expansion_function ||
-			    (*history_inhibit_expansion_function)(str,
-			    (int)j) == 0))
-				break;
-		}
-
-		if (str[j] && loop_again) {
-			i = j;
-			qchar = (j > 0 && str[j - 1] == '"' )? '"':0;
-			j++;
-			if (str[j] == history_expansion_char)
-				j++;
-			loop_again = 0;
-			goto loop;
-		}
-		len = i - start;
-		ADD_STRING(&str[start], len, 0);
-
-		if (str[i] == '\0' || str[i] != history_expansion_char) {
-			len = j - i;
-			ADD_STRING(&str[i], len, 0);
-			if (start == 0)
-				ret = 0;
-			else
-				ret = 1;
-			break;
-		}
-		ret = _history_expand_command (str, i, (j - i), &tmp);
-		if (ret > 0 && tmp) {
-			len = strlen(tmp);
-			ADD_STRING(tmp, len, 1);
-		}
-		if (tmp) {
-			el_free(tmp);
-			tmp = NULL;
-		}
-		i = j;
-	}
-
-	/* ret is 2 for "print only" option */
-	if (ret == 2) {
-		add_history(result);
-#ifdef GDB_411_HACK
-		/* gdb 4.11 has been shipped with readline, where */
-		/* history_expand() returned -1 when the line	  */
-		/* should not be executed; in readline 2.1+	  */
-		/* it should return 2 in such a case		  */
-		ret = -1;
-#endif
-	}
-	el_free(*output);
-	*output = result;
-
-	return ret;
-}
-
-/*
-* Return a string consisting of arguments of "str" from "start" to "end".
-*/
-char *
-history_arg_extract(int start, int end, const char *str)
-{
-	size_t  i, len, max;
-	char	**arr, *result = NULL;
-
-	arr = history_tokenize(str);
-	if (!arr)
-		return NULL;
-	if (arr && *arr == NULL)
-		goto out;
-
-	for (max = 0; arr[max]; max++)
-		continue;
-	max--;
-
-	if (start == '$')
-		start = (int)max;
-	if (end == '$')
-		end = (int)max;
-	if (end < 0)
-		end = (int)max + end + 1;
-	if (start < 0)
-		start = end;
-
-	if (start < 0 || end < 0 || (size_t)start > max ||
-	    (size_t)end > max || start > end)
-		goto out;
-
-	for (i = (size_t)start, len = 0; i <= (size_t)end; i++)
-		len += strlen(arr[i]) + 1;
-	len++;
-	result = el_malloc(len * sizeof(*result));
-	if (result == NULL)
-		goto out;
-
-	for (i = (size_t)start, len = 0; i <= (size_t)end; i++) {
-		(void)strcpy(result + len, arr[i]);
-		len += strlen(arr[i]);
-		if (i < (size_t)end)
-			result[len++] = ' ';
-	}
-	result[len] = '\0';
-
-out:
-	for (i = 0; arr[i]; i++)
-		el_free(arr[i]);
-	el_free(arr);
-
-	return result;
-}
-
-/*
- * Parse the string into individual tokens,
- * similar to how shell would do it.
- */
-char **
-history_tokenize(const char *str)
-{
-	int size = 1, idx = 0, i, start;
-	size_t len;
-	char **result = NULL, *temp, delim = '\0';
-
-	for (i = 0; str[i];) {
-		while (isspace((unsigned char) str[i]))
-			i++;
-		start = i;
-		for (; str[i];) {
-			if (str[i] == '\\') {
-				if (str[i+1] != '\0')
-					i++;
-			} else if (str[i] == delim)
-				delim = '\0';
-			else if (!delim &&
-				    (isspace((unsigned char) str[i]) ||
-				strchr("()<>;&|$", str[i])))
-				break;
-			else if (!delim && strchr("'`\"", str[i]))
-				delim = str[i];
-			if (str[i])
-				i++;
-		}
-
-		if (idx + 2 >= size) {
-			char **nresult;
-			size <<= 1;
-			nresult = el_realloc(result, (size_t)size * sizeof(*nresult));
-			if (nresult == NULL) {
-				el_free(result);
-				return NULL;
-			}
-			result = nresult;
-		}
-		len = (size_t)i - (size_t)start;
-		temp = el_malloc((size_t)(len + 1) * sizeof(*temp));
-		if (temp == NULL) {
-			for (i = 0; i < idx; i++)
-				el_free(result[i]);
-			el_free(result);
-			return NULL;
-		}
-		(void)strncpy(temp, &str[start], len);
-		temp[len] = '\0';
-		result[idx++] = temp;
-		result[idx] = NULL;
-		if (str[i])
-			i++;
-	}
-	return result;
-}
-
-
-/*
- * limit size of history record to ``max'' events
- */
-void
-stifle_history(int max)
-{
-	HistEvent ev;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	if (history(h, &ev, H_SETSIZE, max) == 0)
-		max_input_history = max;
-}
-
-
-/*
- * "unlimit" size of history - set the limit to maximum allowed int value
- */
-int
-unstifle_history(void)
-{
-	HistEvent ev;
-	int omax;
-
-	history(h, &ev, H_SETSIZE, INT_MAX);
-	omax = max_input_history;
-	max_input_history = INT_MAX;
-	return omax;		/* some value _must_ be returned */
-}
-
-
-int
-history_is_stifled(void)
-{
-
-	/* cannot return true answer */
-	return max_input_history != INT_MAX;
-}
-
-static const char _history_tmp_template[] = "/tmp/.historyXXXXXX";
-
-int
-history_truncate_file (const char *filename, int nlines)
-{
-	int ret = 0;
-	FILE *fp, *tp;
-	char template[sizeof(_history_tmp_template)];
-	char buf[4096];
-	int fd;
-	char *cp;
-	off_t off;
-	int count = 0;
-	ssize_t left = 0;
-
-	if (filename == NULL && (filename = _default_history_file()) == NULL)
-		return errno;
-	if ((fp = fopen(filename, "r+")) == NULL)
-		return errno;
-	strcpy(template, _history_tmp_template);
-	if ((fd = mkstemp(template)) == -1) {
-		ret = errno;
-		goto out1;
-	}
-
-	if ((tp = fdopen(fd, "r+")) == NULL) {
-		close(fd);
-		ret = errno;
-		goto out2;
-	}
-
-	for(;;) {
-		if (fread(buf, sizeof(buf), (size_t)1, fp) != 1) {
-			if (ferror(fp)) {
-				ret = errno;
-				break;
-			}
-			if (fseeko(fp, (off_t)sizeof(buf) * count, SEEK_SET) ==
-			    (off_t)-1) {
-				ret = errno;
-				break;
-			}
-			left = (ssize_t)fread(buf, (size_t)1, sizeof(buf), fp);
-			if (ferror(fp)) {
-				ret = errno;
-				break;
-			}
-			if (left == 0) {
-				count--;
-				left = sizeof(buf);
-			} else if (fwrite(buf, (size_t)left, (size_t)1, tp)
-			    != 1) {
-				ret = errno;
-				break;
-			}
-			fflush(tp);
-			break;
-		}
-		if (fwrite(buf, sizeof(buf), (size_t)1, tp) != 1) {
-			ret = errno;
-			break;
-		}
-		count++;
-	}
-	if (ret)
-		goto out3;
-	cp = buf + left - 1;
-	if(*cp != '\n')
-		cp++;
-	for(;;) {
-		while (--cp >= buf) {
-			if (*cp == '\n') {
-				if (--nlines == 0) {
-					if (++cp >= buf + sizeof(buf)) {
-						count++;
-						cp = buf;
-					}
-					break;
-				}
-			}
-		}
-		if (nlines <= 0 || count == 0)
-			break;
-		count--;
-		if (fseeko(tp, (off_t)sizeof(buf) * count, SEEK_SET) < 0) {
-			ret = errno;
-			break;
-		}
-		if (fread(buf, sizeof(buf), (size_t)1, tp) != 1) {
-			if (ferror(tp)) {
-				ret = errno;
-				break;
-			}
-			ret = EAGAIN;
-			break;
-		}
-		cp = buf + sizeof(buf);
-	}
-
-	if (ret || nlines > 0)
-		goto out3;
-
-	if (fseeko(fp, (off_t)0, SEEK_SET) == (off_t)-1) {
-		ret = errno;
-		goto out3;
-	}
-
-	if (fseeko(tp, (off_t)sizeof(buf) * count + (cp - buf), SEEK_SET) ==
-	    (off_t)-1) {
-		ret = errno;
-		goto out3;
-	}
-
-	for(;;) {
-		if ((left = (ssize_t)fread(buf, (size_t)1, sizeof(buf), tp)) == 0) {
-			if (ferror(fp))
-				ret = errno;
-			break;
-		}
-		if (fwrite(buf, (size_t)left, (size_t)1, fp) != 1) {
-			ret = errno;
-			break;
-		}
-	}
-	fflush(fp);
-	if((off = ftello(fp)) > 0)
-		(void)ftruncate(fileno(fp), off);
-out3:
-	fclose(tp);
-out2:
-	unlink(template);
-out1:
-	fclose(fp);
-
-	return ret;
-}
-
-
-/*
- * read history from a file given
- */
-int
-read_history(const char *filename)
-{
-	HistEvent ev;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-	if (filename == NULL && (filename = _default_history_file()) == NULL)
-		return errno;
-	return history(h, &ev, H_LOAD, filename) == -1 ?
-	    (errno ? errno : EINVAL) : 0;
-}
-
-
-/*
- * write history to a file given
- */
-int
-write_history(const char *filename)
-{
-	HistEvent ev;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-	if (filename == NULL && (filename = _default_history_file()) == NULL)
-		return errno;
-	return history(h, &ev, H_SAVE, filename) == -1 ?
-	    (errno ? errno : EINVAL) : 0;
-}
-
-
-/*
- * returns history ``num''th event
- *
- * returned pointer points to static variable
- */
-HIST_ENTRY *
-history_get(int num)
-{
-	static HIST_ENTRY she;
-	HistEvent ev;
-	int curr_num;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	/* save current position */
-	if (history(h, &ev, H_CURR) != 0)
-		return NULL;
-	curr_num = ev.num;
-
-	/* start from the oldest */
-	if (history(h, &ev, H_LAST) != 0)
-		return NULL;	/* error */
-
-	/* look forwards for event matching specified offset */
-	if (history(h, &ev, H_NEXT_EVDATA, num, &she.data))
-		return NULL;
-
-	she.line = ev.str;
-
-	/* restore pointer to where it was */
-	(void)history(h, &ev, H_SET, curr_num);
-
-	return &she;
-}
-
-
-/*
- * add the line to history table
- */
-int
-add_history(const char *line)
-{
-	HistEvent ev;
-
-	if (line == NULL)
-		return 0;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	(void)history(h, &ev, H_ENTER, line);
-	if (history(h, &ev, H_GETSIZE) == 0)
-		history_length = ev.num;
-
-	return !(history_length > 0); /* return 0 if all is okay */
-}
-
-
-/*
- * remove the specified entry from the history list and return it.
- */
-HIST_ENTRY *
-remove_history(int num)
-{
-	HIST_ENTRY *he;
-	HistEvent ev;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	if ((he = el_malloc(sizeof(*he))) == NULL)
-		return NULL;
-
-	if (history(h, &ev, H_DELDATA, num, &he->data) != 0) {
-		el_free(he);
-		return NULL;
-	}
-
-	he->line = ev.str;
-	if (history(h, &ev, H_GETSIZE) == 0)
-		history_length = ev.num;
-
-	return he;
-}
-
-
-/*
- * replace the line and data of the num-th entry
- */
-HIST_ENTRY *
-replace_history_entry(int num, const char *line, histdata_t data)
-{
-	HIST_ENTRY *he;
-	HistEvent ev;
-	int curr_num;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	/* save current position */
-	if (history(h, &ev, H_CURR) != 0)
-		return NULL;
-	curr_num = ev.num;
-
-	/* start from the oldest */
-	if (history(h, &ev, H_LAST) != 0)
-		return NULL;	/* error */
-
-	if ((he = el_malloc(sizeof(*he))) == NULL)
-		return NULL;
-
-	/* look forwards for event matching specified offset */
-	if (history(h, &ev, H_NEXT_EVDATA, num, &he->data))
-		goto out;
-
-	he->line = strdup(ev.str);
-	if (he->line == NULL)
-		goto out;
-
-	if (history(h, &ev, H_REPLACE, line, data))
-		goto out;
-
-	/* restore pointer to where it was */
-	if (history(h, &ev, H_SET, curr_num))
-		goto out;
-
-	return he;
-out:
-	el_free(he);
-	return NULL;
-}
-
-/*
- * clear the history list - delete all entries
- */
-void
-clear_history(void)
-{
-	HistEvent ev;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	(void)history(h, &ev, H_CLEAR);
-	history_length = 0;
-}
-
-
-/*
- * returns offset of the current history event
- */
-int
-where_history(void)
-{
-	HistEvent ev;
-	int curr_num, off;
-
-	if (history(h, &ev, H_CURR) != 0)
-		return 0;
-	curr_num = ev.num;
-
-	(void)history(h, &ev, H_FIRST);
-	off = 1;
-	while (ev.num != curr_num && history(h, &ev, H_NEXT) == 0)
-		off++;
-
-	return off;
-}
-
-
-/*
- * returns current history event or NULL if there is no such event
- */
-HIST_ENTRY *
-current_history(void)
-{
-
-	return _move_history(H_CURR);
-}
-
-
-/*
- * returns total number of bytes history events' data are using
- */
-int
-history_total_bytes(void)
-{
-	HistEvent ev;
-	int curr_num;
-	size_t size;
-
-	if (history(h, &ev, H_CURR) != 0)
-		return -1;
-	curr_num = ev.num;
-
-	(void)history(h, &ev, H_FIRST);
-	size = 0;
-	do
-		size += strlen(ev.str) * sizeof(*ev.str);
-	while (history(h, &ev, H_NEXT) == 0);
-
-	/* get to the same position as before */
-	history(h, &ev, H_PREV_EVENT, curr_num);
-
-	return (int)size;
-}
-
-
-/*
- * sets the position in the history list to ``pos''
- */
-int
-history_set_pos(int pos)
-{
-	HistEvent ev;
-	int curr_num;
-
-	if (pos >= history_length || pos < 0)
-		return -1;
-
-	(void)history(h, &ev, H_CURR);
-	curr_num = ev.num;
-
-	/*
-	 * use H_DELDATA to set to nth history (without delete) by passing
-	 * (void **)-1
-	 */
-	if (history(h, &ev, H_DELDATA, pos, (void **)-1)) {
-		(void)history(h, &ev, H_SET, curr_num);
-		return -1;
-	}
-	return 0;
-}
-
-
-/*
- * returns previous event in history and shifts pointer accordingly
- */
-HIST_ENTRY *
-previous_history(void)
-{
-
-	return _move_history(H_PREV);
-}
-
-
-/*
- * returns next event in history and shifts pointer accordingly
- */
-HIST_ENTRY *
-next_history(void)
-{
-
-	return _move_history(H_NEXT);
-}
-
-
-/*
- * searches for first history event containing the str
- */
-int
-history_search(const char *str, int direction)
-{
-	HistEvent ev;
-	const char *strp;
-	int curr_num;
-
-	if (history(h, &ev, H_CURR) != 0)
-		return -1;
-	curr_num = ev.num;
-
-	for (;;) {
-		if ((strp = strstr(ev.str, str)) != NULL)
-			return (int)(strp - ev.str);
-		if (history(h, &ev, direction < 0 ? H_NEXT:H_PREV) != 0)
-			break;
-	}
-	(void)history(h, &ev, H_SET, curr_num);
-	return -1;
-}
-
-
-/*
- * searches for first history event beginning with str
- */
-int
-history_search_prefix(const char *str, int direction)
-{
-	HistEvent ev;
-
-	return (history(h, &ev, direction < 0 ?
-	    H_PREV_STR : H_NEXT_STR, str));
-}
-
-
-/*
- * search for event in history containing str, starting at offset
- * abs(pos); continue backward, if pos<0, forward otherwise
- */
-/* ARGSUSED */
-int
-history_search_pos(const char *str,
-		   int direction __attribute__((__unused__)), int pos)
-{
-	HistEvent ev;
-	int curr_num, off;
-
-	off = (pos > 0) ? pos : -pos;
-	pos = (pos > 0) ? 1 : -1;
-
-	if (history(h, &ev, H_CURR) != 0)
-		return -1;
-	curr_num = ev.num;
-
-	if (history_set_pos(off) != 0 || history(h, &ev, H_CURR) != 0)
-		return -1;
-
-	for (;;) {
-		if (strstr(ev.str, str))
-			return off;
-		if (history(h, &ev, (pos < 0) ? H_PREV : H_NEXT) != 0)
-			break;
-	}
-
-	/* set "current" pointer back to previous state */
-	(void)history(h, &ev,
-	    pos < 0 ? H_NEXT_EVENT : H_PREV_EVENT, curr_num);
-
-	return -1;
-}
-
-
-/********************************/
-/* completion functions */
-
-char *
-tilde_expand(char *name)
-{
-	return fn_tilde_expand(name);
-}
-
-char *
-filename_completion_function(const char *name, int state)
-{
-	return fn_filename_completion_function(name, state);
-}
-
-/*
- * a completion generator for usernames; returns _first_ username
- * which starts with supplied text
- * text contains a partial username preceded by random character
- * (usually '~'); state resets search from start (??? should we do that anyway)
- * it's the caller's responsibility to free the returned value
- */
-char *
-username_completion_function(const char *text, int state)
-{
-#if defined(HAVE_GETPW_R_POSIX) || defined(HAVE_GETPW_R_DRAFT)
-	struct passwd pwres;
-	char pwbuf[1024];
-#endif
-	struct passwd *pass = NULL;
-
-	if (text[0] == '\0')
-		return NULL;
-
-	if (*text == '~')
-		text++;
-
-	if (state == 0)
-		setpwent();
-
-	while (
-#if defined(HAVE_GETPW_R_POSIX) || defined(HAVE_GETPW_R_DRAFT)
-	    getpwent_r(&pwres, pwbuf, sizeof(pwbuf), &pass) == 0 && pass != NULL
-#else
-	    (pass = getpwent()) != NULL
-#endif
-	    && text[0] == pass->pw_name[0]
-	    && strcmp(text, pass->pw_name) == 0)
-		continue;
-
-	if (pass == NULL) {
-		endpwent();
-		return NULL;
-	}
-	return strdup(pass->pw_name);
-}
-
-
-/*
- * el-compatible wrapper to send TSTP on ^Z
- */
-/* ARGSUSED */
-static unsigned char
-_el_rl_tstp(EditLine *el __attribute__((__unused__)), int ch __attribute__((__unused__)))
-{
-	(void)kill(0, SIGTSTP);
-	return CC_NORM;
-}
-
-/*
- * Display list of strings in columnar format on readline's output stream.
- * 'matches' is list of strings, 'len' is number of strings in 'matches',
- * 'max' is maximum length of string in 'matches'.
- */
-void
-rl_display_match_list(char **matches, int len, int max)
-{
-
-	fn_display_match_list(e, matches, (size_t)len, (size_t)max);
-}
-
-static const char *
-/*ARGSUSED*/
-_rl_completion_append_character_function(const char *dummy
-    __attribute__((__unused__)))
-{
-	static char buf[2];
-	buf[0] = (char)rl_completion_append_character;
-	buf[1] = '\0';
-	return buf;
-}
-
-
-/*
- * complete word at current point
- */
-/* ARGSUSED */
-int
-rl_complete(int ignore __attribute__((__unused__)), int invoking_key)
-{
-#ifdef WIDECHAR
-	static ct_buffer_t wbreak_conv, sprefix_conv;
-#endif
-	char *breakchars;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	if (rl_inhibit_completion) {
-		char arr[2];
-		arr[0] = (char)invoking_key;
-		arr[1] = '\0';
-		el_insertstr(e, arr);
-		return CC_REFRESH;
-	}
-
-	if (rl_completion_word_break_hook != NULL)
-		breakchars = (*rl_completion_word_break_hook)();
-	else
-		breakchars = rl_basic_word_break_characters;
-
-	_rl_update_pos();
-
-	/* Just look at how many global variables modify this operation! */
-	return fn_complete(e,
-	    (rl_compentry_func_t *)rl_completion_entry_function,
-	    rl_attempted_completion_function,
-	    ct_decode_string(rl_basic_word_break_characters, &wbreak_conv),
-	    ct_decode_string(breakchars, &sprefix_conv),
-	    _rl_completion_append_character_function,
-	    (size_t)rl_completion_query_items,
-	    &rl_completion_type, &rl_attempted_completion_over,
-	    &rl_point, &rl_end);
-
-
-}
-
-
-/* ARGSUSED */
-static unsigned char
-_el_rl_complete(EditLine *el __attribute__((__unused__)), int ch)
-{
-	return (unsigned char)rl_complete(0, ch);
-}
-
-/*
- * misc other functions
- */
-
-/*
- * bind key c to readline-type function func
- */
-int
-rl_bind_key(int c, rl_command_func_t *func)
-{
-	int retval = -1;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	if (func == rl_insert) {
-		/* XXX notice there is no range checking of ``c'' */
-		e->el_map.key[c] = ED_INSERT;
-		retval = 0;
-	}
-	return retval;
-}
-
-
-/*
- * read one key from input - handles chars pushed back
- * to input stream also
- */
-int
-rl_read_key(void)
-{
-	char fooarr[2 * sizeof(int)];
-
-	if (e == NULL || h == NULL)
-		rl_initialize();
-
-	return el_getc(e, fooarr);
-}
-
-
-/*
- * reset the terminal
- */
-/* ARGSUSED */
-void
-rl_reset_terminal(const char *p __attribute__((__unused__)))
-{
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-	el_reset(e);
-}
-
-
-/*
- * insert character ``c'' back into input stream, ``count'' times
- */
-int
-rl_insert(int count, int c)
-{
-	char arr[2];
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	/* XXX - int -> char conversion can lose on multichars */
-	arr[0] = (char)c;
-	arr[1] = '\0';
-
-	for (; count > 0; count--)
-		el_push(e, arr);
-
-	return 0;
-}
-
-int
-rl_insert_text(const char *text)
-{
-	if (!text || *text == 0)
-		return 0;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	if (el_insertstr(e, text) < 0)
-		return 0;
-	return (int)strlen(text);
-}
-
-/*ARGSUSED*/
-int
-rl_newline(int count __attribute__((__unused__)),
-    int c __attribute__((__unused__)))
-{
-	/*
-	 * Readline-4.0 appears to ignore the args.
-	 */
-	return rl_insert(1, '\n');
-}
-
-/*ARGSUSED*/
-static unsigned char
-rl_bind_wrapper(EditLine *el __attribute__((__unused__)), unsigned char c)
-{
-	if (map[c] == NULL)
-	    return CC_ERROR;
-
-	_rl_update_pos();
-
-	(*map[c])(1, c);
-
-	/* If rl_done was set by the above call, deal with it here */
-	if (rl_done)
-		return CC_EOF;
-
-	return CC_NORM;
-}
-
-int
-rl_add_defun(const char *name, rl_command_func_t *fun, int c)
-{
-	char dest[8];
-	if ((size_t)c >= sizeof(map) / sizeof(map[0]) || c < 0)
-		return -1;
-	map[(unsigned char)c] = fun;
-	el_set(e, EL_ADDFN, name, name, rl_bind_wrapper);
-	vis(dest, c, VIS_WHITE|VIS_NOSLASH, 0);
-	el_set(e, EL_BIND, dest, name, NULL);
-	return 0;
-}
-
-void
-rl_callback_read_char(void)
-{
-	int count = 0, done = 0;
-	const char *buf = el_gets(e, &count);
-	char *wbuf;
-
-	if (buf == NULL || count-- <= 0)
-		return;
-	if (count == 0 && buf[0] == e->el_tty.t_c[TS_IO][C_EOF])
-		done = 1;
-	if (buf[count] == '\n' || buf[count] == '\r')
-		done = 2;
-
-	if (done && rl_linefunc != NULL) {
-		el_set(e, EL_UNBUFFERED, 0);
-		if (done == 2) {
-		    if ((wbuf = strdup(buf)) != NULL)
-			wbuf[count] = '\0';
-		} else
-			wbuf = NULL;
-		(*(void (*)(const char *))rl_linefunc)(wbuf);
-		el_set(e, EL_UNBUFFERED, 1);
-	}
-}
-
-void 
-rl_callback_handler_install(const char *prompt, rl_vcpfunc_t *linefunc)
-{
-	if (e == NULL) {
-		rl_initialize();
-	}
-	(void)rl_set_prompt(prompt);
-	rl_linefunc = linefunc;
-	el_set(e, EL_UNBUFFERED, 1);
-}   
-
-void 
-rl_callback_handler_remove(void)
-{
-	el_set(e, EL_UNBUFFERED, 0);
-	rl_linefunc = NULL;
-}
-
-void
-rl_redisplay(void)
-{
-	char a[2];
-	a[0] = (char)e->el_tty.t_c[TS_IO][C_REPRINT];
-	a[1] = '\0';
-	el_push(e, a);
-}
-
-int
-rl_get_previous_history(int count, int key)
-{
-	char a[2];
-	a[0] = (char)key;
-	a[1] = '\0';
-	while (count--)
-		el_push(e, a);
-	return 0;
-}
-
-void
-/*ARGSUSED*/
-rl_prep_terminal(int meta_flag __attribute__((__unused__)))
-{
-	el_set(e, EL_PREP_TERM, 1);
-}
-
-void
-rl_deprep_terminal(void)
-{
-	el_set(e, EL_PREP_TERM, 0);
-}
-
-int
-rl_read_init_file(const char *s)
-{
-	return el_source(e, s);
-}
-
-int
-rl_parse_and_bind(const char *line)
-{
-	const char **argv;
-	int argc;
-	Tokenizer *tok;
-
-	tok = tok_init(NULL);
-	tok_str(tok, line, &argc, &argv);
-	argc = el_parse(e, argc, argv);
-	tok_end(tok);
-	return argc ? 1 : 0;
-}
-
-int
-rl_variable_bind(const char *var, const char *value)
-{
-	/*
-	 * The proper return value is undocument, but this is what the
-	 * readline source seems to do.
-	 */
-	return el_set(e, EL_BIND, "", var, value, NULL) == -1 ? 1 : 0;
-}
-
-void
-rl_stuff_char(int c)
-{
-	char buf[2];
-
-	buf[0] = (char)c;
-	buf[1] = '\0';
-	el_insertstr(e, buf);
-}
-
-static int
-_rl_event_read_char(EditLine *el, char *cp)
-{
-	int	n;
-	ssize_t num_read = 0;
-
-	*cp = '\0';
-	while (rl_event_hook) {
-
-		(*rl_event_hook)();
-
-#if defined(FIONREAD)
-		if (ioctl(el->el_infd, FIONREAD, &n) < 0)
-			return -1;
-		if (n)
-			num_read = read(el->el_infd, cp, (size_t)1);
-		else
-			num_read = 0;
-#elif defined(F_SETFL) && defined(O_NDELAY)
-		if ((n = fcntl(el->el_infd, F_GETFL, 0)) < 0)
-			return -1;
-		if (fcntl(el->el_infd, F_SETFL, n|O_NDELAY) < 0)
-			return -1;
-		num_read = read(el->el_infd, cp, 1);
-		if (fcntl(el->el_infd, F_SETFL, n))
-			return -1;
-#else
-		/* not non-blocking, but what you gonna do? */
-		num_read = read(el->el_infd, cp, 1);
-		return -1;
-#endif
-
-		if (num_read < 0 && errno == EAGAIN)
-			continue;
-		if (num_read == 0)
-			continue;
-		break;
-	}
-	if (!rl_event_hook)
-		el_set(el, EL_GETCFN, EL_BUILTIN_GETCFN);
-	return (int)num_read;
-}
-
-static void
-_rl_update_pos(void)
-{
-	const LineInfo *li = el_line(e);
-
-	rl_point = (int)(li->cursor - li->buffer);
-	rl_end = (int)(li->lastchar - li->buffer);
-}
-
-void
-rl_get_screen_size(int *rows, int *cols)
-{
-	if (rows)
-		el_get(e, EL_GETTC, "li", rows, (void *)0);
-	if (cols)
-		el_get(e, EL_GETTC, "co", cols, (void *)0);
-}
-
-void
-rl_set_screen_size(int rows, int cols)
-{
-	char buf[64];
-	(void)snprintf(buf, sizeof(buf), "%d", rows);
-	el_set(e, EL_SETTC, "li", buf, NULL);
-	(void)snprintf(buf, sizeof(buf), "%d", cols);
-	el_set(e, EL_SETTC, "co", buf, NULL);
-}
-
-char **
-rl_completion_matches(const char *str, rl_compentry_func_t *fun)
-{
-	size_t len, max, i, j, min;
-	char **list, *match, *a, *b;
-
-	len = 1;
-	max = 10;
-	if ((list = el_malloc(max * sizeof(*list))) == NULL)
-		return NULL;
-
-	while ((match = (*fun)(str, (int)(len - 1))) != NULL) {
-		list[len++] = match;
-		if (len == max) {
-			char **nl;
-			max += 10;
-			if ((nl = el_realloc(list, max * sizeof(*nl))) == NULL)
-				goto out;
-			list = nl;
-		}
-	}
-	if (len == 1)
-		goto out;
-	list[len] = NULL;
-	if (len == 2) {
-		if ((list[0] = strdup(list[1])) == NULL)
-			goto out;
-		return list;
-	}
-	qsort(&list[1], len - 1, sizeof(*list),
-	    (int (*)(const void *, const void *)) strcmp);
-	min = SIZE_T_MAX;
-	for (i = 1, a = list[i]; i < len - 1; i++, a = b) {
-		b = list[i + 1];
-		for (j = 0; a[j] && a[j] == b[j]; j++)
-			continue;
-		if (min > j)
-			min = j;
-	}
-	if (min == 0 && *str) {
-		if ((list[0] = strdup(str)) == NULL)
-			goto out;
-	} else {
-		if ((list[0] = el_malloc((min + 1) * sizeof(*list[0]))) == NULL)
-			goto out;
-		(void)memcpy(list[0], list[1], min);
-		list[0][min] = '\0';
-	}
-	return list;
-		
-out:
-	el_free(list);
-	return NULL;
-}
-
-char *
-rl_filename_completion_function (const char *text, int state)
-{
-	return fn_filename_completion_function(text, state);
-}
-
-void
-rl_forced_update_display(void)
-{
-	el_set(e, EL_REFRESH);
-}
-
-int
-_rl_abort_internal(void)
-{
-	el_beep(e);
-	longjmp(topbuf, 1);
-	/*NOTREACHED*/
-}
-
-int
-_rl_qsort_string_compare(char **s1, char **s2)
-{
-	return strcoll(*s1, *s2);
-}
-
-HISTORY_STATE *
-history_get_history_state(void)
-{
-	HISTORY_STATE *hs;
-
-	if ((hs = el_malloc(sizeof(*hs))) == NULL)
-		return NULL;
-	hs->length = history_length;
-	return hs;
-}
-
-int
-/*ARGSUSED*/
-rl_kill_text(int from __attribute__((__unused__)),
-    int to __attribute__((__unused__)))
-{
-	return 0;
-}
-
-Keymap
-rl_make_bare_keymap(void)
-{
-	return NULL;
-}
-
-Keymap
-rl_get_keymap(void)
-{
-	return NULL;
-}
-
-void
-/*ARGSUSED*/
-rl_set_keymap(Keymap k __attribute__((__unused__)))
-{
-}
-
-int
-/*ARGSUSED*/
-rl_generic_bind(int type __attribute__((__unused__)),
-    const char * keyseq __attribute__((__unused__)),
-    const char * data __attribute__((__unused__)),
-    Keymap k __attribute__((__unused__)))
-{
-	return 0;
-}
-
-int
-/*ARGSUSED*/
-rl_bind_key_in_map(int key __attribute__((__unused__)),
-    rl_command_func_t *fun __attribute__((__unused__)),
-    Keymap k __attribute__((__unused__)))
-{
-	return 0;
-}
-
-/* unsupported, but needed by python */
-void
-rl_cleanup_after_signal(void)
-{
-}
-
-int
-rl_on_new_line(void)
-{
-	return 0;
-}
-
-void
-rl_free_line_state(void)
-{
-}
diff --git a/lib/libedit/readline/Makefile b/lib/libedit/readline/Makefile
deleted file mode 100644
index 3d5111fe3..000000000
--- a/lib/libedit/readline/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#	$NetBSD: Makefile,v 1.7 2003/08/03 09:23:15 lukem Exp $	
-
-NOOBJ=		# defined
-
-.include <bsd.own.mk>
-
-.PATH:	${NETBSDSRCDIR}/lib/libedit
-
-INCS=		readline.h
-INCSDIR=	/usr/include/readline
-INCSYMLINKS=	readline.h ${INCSDIR}/history.h
-
-.include <bsd.prog.mk>
diff --git a/lib/libedit/readline/readline.h b/lib/libedit/readline/readline.h
deleted file mode 100644
index 08fb37fa6..000000000
--- a/lib/libedit/readline/readline.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*	$NetBSD: readline.h,v 1.37 2015/06/02 15:36:45 christos Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jaromir Dolecek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _READLINE_H_
-#define _READLINE_H_
-
-#include <sys/types.h>
-#include <stdio.h>
-
-/* list of readline stuff supported by editline library's readline wrapper */
-
-/* typedefs */
-typedef int	  Function(const char *, int);
-typedef void	  VFunction(void);
-typedef void	  rl_vcpfunc_t(char *);
-typedef char	**rl_completion_func_t(const char *, int, int);
-typedef char     *rl_compentry_func_t(const char *, int);
-typedef int	  rl_command_func_t(int, int);
-
-/* only supports length */
-typedef struct {
-	int length;
-} HISTORY_STATE;
-
-typedef void *histdata_t;
-
-typedef struct _hist_entry {
-	const char	*line;
-	histdata_t 	 data;
-} HIST_ENTRY;
-
-typedef struct _keymap_entry {
-	char type;
-#define ISFUNC	0
-#define ISKMAP	1
-#define ISMACR	2
-	Function *function;
-} KEYMAP_ENTRY;
-
-#define KEYMAP_SIZE	256
-
-typedef KEYMAP_ENTRY KEYMAP_ENTRY_ARRAY[KEYMAP_SIZE];
-typedef KEYMAP_ENTRY *Keymap;
-
-#define control_character_threshold	0x20
-#define control_character_bit		0x40
-
-#ifndef CTRL
-#include <sys/ioctl.h>
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
-#include <sys/ttydefaults.h>
-#endif
-#ifndef CTRL
-#define CTRL(c)		((c) & 037)
-#endif
-#endif
-#ifndef UNCTRL
-#define UNCTRL(c)	(((c) - 'a' + 'A')|control_character_bit)
-#endif
-
-#define RUBOUT		0x7f
-#define ABORT_CHAR	CTRL('G')
-#define RL_READLINE_VERSION 	0x0402
-#define RL_PROMPT_START_IGNORE	'\1'
-#define RL_PROMPT_END_IGNORE	'\2'
-
-/* global variables used by readline enabled applications */
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern const char	*rl_library_version;
-extern int 		rl_readline_version; 
-extern char		*rl_readline_name;
-extern FILE		*rl_instream;
-extern FILE		*rl_outstream;
-extern char		*rl_line_buffer;
-extern int		 rl_point, rl_end;
-extern int		 history_base, history_length;
-extern int		 max_input_history;
-extern char		*rl_basic_word_break_characters;
-extern char		*rl_completer_word_break_characters;
-extern char		*rl_completer_quote_characters;
-extern rl_compentry_func_t *rl_completion_entry_function;
-extern char		*(*rl_completion_word_break_hook)(void);
-extern rl_completion_func_t *rl_attempted_completion_function;
-extern int		 rl_attempted_completion_over;
-extern int		rl_completion_type;
-extern int		rl_completion_query_items;
-extern char		*rl_special_prefixes;
-extern int		rl_completion_append_character;
-extern int		rl_inhibit_completion;
-extern Function		*rl_pre_input_hook;
-extern Function		*rl_startup_hook;
-extern char		*rl_terminal_name;
-extern int		rl_already_prompted;
-extern char		*rl_prompt;
-/*
- * The following is not implemented
- */
-extern int		rl_catch_signals;
-extern int		rl_catch_sigwinch;
-extern KEYMAP_ENTRY_ARRAY emacs_standard_keymap,
-			emacs_meta_keymap,
-			emacs_ctlx_keymap;
-extern int		rl_filename_completion_desired;
-extern int		rl_ignore_completion_duplicates;
-extern int		(*rl_getc_function)(FILE *);
-extern VFunction	*rl_redisplay_function;
-extern VFunction	*rl_completion_display_matches_hook;
-extern VFunction	*rl_prep_term_function;
-extern VFunction	*rl_deprep_term_function;
-extern int		readline_echoing_p;
-extern int		_rl_print_completions_horizontally;
-
-/* supported functions */
-char		*readline(const char *);
-int		 rl_initialize(void);
-
-void		 using_history(void);
-int		 add_history(const char *);
-void		 clear_history(void);
-void		 stifle_history(int);
-int		 unstifle_history(void);
-int		 history_is_stifled(void);
-int		 where_history(void);
-HIST_ENTRY	*current_history(void);
-HIST_ENTRY	*history_get(int);
-HIST_ENTRY	*remove_history(int);
-HIST_ENTRY	*replace_history_entry(int, const char *, histdata_t);
-int		 history_total_bytes(void);
-int		 history_set_pos(int);
-HIST_ENTRY	*previous_history(void);
-HIST_ENTRY	*next_history(void);
-int		 history_search(const char *, int);
-int		 history_search_prefix(const char *, int);
-int		 history_search_pos(const char *, int, int);
-int		 read_history(const char *);
-int		 write_history(const char *);
-int		 history_truncate_file (const char *, int);
-int		 history_expand(char *, char **);
-char	       **history_tokenize(const char *);
-const char	*get_history_event(const char *, int *, int);
-char		*history_arg_extract(int, int, const char *);
-
-char		*tilde_expand(char *);
-char		*filename_completion_function(const char *, int);
-char		*username_completion_function(const char *, int);
-int		 rl_complete(int, int);
-int		 rl_read_key(void);
-char	       **completion_matches(const char *, rl_compentry_func_t *);
-void		 rl_display_match_list(char **, int, int);
-
-int		 rl_insert(int, int);
-int		 rl_insert_text(const char *);
-void		 rl_reset_terminal(const char *);
-int		 rl_bind_key(int, rl_command_func_t *);
-int		 rl_newline(int, int);
-void		 rl_callback_read_char(void);
-void		 rl_callback_handler_install(const char *, rl_vcpfunc_t *);
-void		 rl_callback_handler_remove(void);
-void		 rl_redisplay(void);
-int		 rl_get_previous_history(int, int);
-void		 rl_prep_terminal(int);
-void		 rl_deprep_terminal(void);
-int		 rl_read_init_file(const char *);
-int		 rl_parse_and_bind(const char *);
-int		 rl_variable_bind(const char *, const char *);
-void		 rl_stuff_char(int);
-int		 rl_add_defun(const char *, rl_command_func_t *, int);
-HISTORY_STATE	*history_get_history_state(void);
-void		 rl_get_screen_size(int *, int *);
-void		 rl_set_screen_size(int, int);
-char 		*rl_filename_completion_function (const char *, int);
-int		 _rl_abort_internal(void);
-int		 _rl_qsort_string_compare(char **, char **);
-char 	       **rl_completion_matches(const char *, rl_compentry_func_t *);
-void		 rl_forced_update_display(void);
-int		 rl_set_prompt(const char *);
-int		 rl_on_new_line(void);
-
-/*
- * The following are not implemented
- */
-int		 rl_kill_text(int, int);
-Keymap		 rl_get_keymap(void);
-void		 rl_set_keymap(Keymap);
-Keymap		 rl_make_bare_keymap(void);
-int		 rl_generic_bind(int, const char *, const char *, Keymap);
-int		 rl_bind_key_in_map(int, rl_command_func_t *, Keymap);
-void		 rl_cleanup_after_signal(void);
-void		 rl_free_line_state(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _READLINE_H_ */
diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c
deleted file mode 100644
index 3e1176ece..000000000
--- a/lib/libedit/refresh.c
+++ /dev/null
@@ -1,1183 +0,0 @@
-/*	$NetBSD: refresh.c,v 1.37 2011/07/29 23:44:45 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)refresh.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: refresh.c,v 1.37 2011/07/29 23:44:45 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * refresh.c: Lower level screen refreshing functions
- */
-#include <stdio.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <string.h>
-
-#include "el.h"
-
-private void	re_nextline(EditLine *);
-private void	re_addc(EditLine *, Int);
-private void	re_update_line(EditLine *, Char *, Char *, int);
-private void	re_insert (EditLine *, Char *, int, int, Char *, int);
-private void	re_delete(EditLine *, Char *, int, int, int);
-private void	re_fastputc(EditLine *, Int);
-private void	re_clear_eol(EditLine *, int, int, int);
-private void	re__strncopy(Char *, Char *, size_t);
-private void	re__copy_and_pad(Char *, const Char *, size_t);
-
-#ifdef DEBUG_REFRESH
-private void	re_printstr(EditLine *, const char *, char *, char *);
-#define	__F el->el_errfile
-#define	ELRE_ASSERT(a, b, c)	do 				\
-				    if (/*CONSTCOND*/ a) {	\
-					(void) fprintf b;	\
-					c;			\
-				    }				\
-				while (/*CONSTCOND*/0)
-#define	ELRE_DEBUG(a, b)	ELRE_ASSERT(a,b,;)
-
-/* re_printstr():
- *	Print a string on the debugging pty
- */
-private void
-re_printstr(EditLine *el, const char *str, char *f, char *t)
-{
-
-	ELRE_DEBUG(1, (__F, "%s:\"", str));
-	while (f < t)
-		ELRE_DEBUG(1, (__F, "%c", *f++ & 0177));
-	ELRE_DEBUG(1, (__F, "\"\r\n"));
-}
-#else
-#define	ELRE_ASSERT(a, b, c)
-#define	ELRE_DEBUG(a, b)
-#endif
-
-/* re_nextline():
- *	Move to the next line or scroll
- */
-private void
-re_nextline(EditLine *el)
-{
-	el->el_refresh.r_cursor.h = 0;	/* reset it. */
-
-	/*
-	 * If we would overflow (input is longer than terminal size),
-	 * emulate scroll by dropping first line and shuffling the rest.
-	 * We do this via pointer shuffling - it's safe in this case
-	 * and we avoid memcpy().
-	 */
-	if (el->el_refresh.r_cursor.v + 1 >= el->el_terminal.t_size.v) {
-		int i, lins = el->el_terminal.t_size.v;
-		Char *firstline = el->el_vdisplay[0];
-
-		for(i = 1; i < lins; i++)
-			el->el_vdisplay[i - 1] = el->el_vdisplay[i];
-
-		firstline[0] = '\0';		/* empty the string */	
-		el->el_vdisplay[i - 1] = firstline;
-	} else
-		el->el_refresh.r_cursor.v++;
-
-	ELRE_ASSERT(el->el_refresh.r_cursor.v >= el->el_terminal.t_size.v,
-	    (__F, "\r\nre_putc: overflow! r_cursor.v == %d > %d\r\n",
-	    el->el_refresh.r_cursor.v, el->el_terminal.t_size.v),
-	    abort());
-}
-
-/* re_addc():
- *	Draw c, expanding tabs, control chars etc.
- */
-private void
-re_addc(EditLine *el, Int c)
-{
-	switch (ct_chr_class((Char)c)) {
-	case CHTYPE_TAB:        /* expand the tab */
-		for (;;) {
-			re_putc(el, ' ', 1);
-			if ((el->el_refresh.r_cursor.h & 07) == 0)
-				break;			/* go until tab stop */
-		}
-		break;
-	case CHTYPE_NL: {
-		int oldv = el->el_refresh.r_cursor.v;
-		re_putc(el, '\0', 0);			/* assure end of line */
-		if (oldv == el->el_refresh.r_cursor.v)	/* XXX */
-			re_nextline(el);
-		break;
-	}
-	case CHTYPE_PRINT:
-		re_putc(el, c, 1);
-		break;
-	default: {
-		Char visbuf[VISUAL_WIDTH_MAX];
-		ssize_t i, n =
-		    ct_visual_char(visbuf, VISUAL_WIDTH_MAX, (Char)c);
-		for (i = 0; n-- > 0; ++i)
-		    re_putc(el, visbuf[i], 1);
-		break;
-	}
-	}
-}
-
-
-/* re_putc():
- *	Draw the character given
- */
-protected void
-re_putc(EditLine *el, Int c, int shift)
-{
-	int i, w = Width(c);
-	ELRE_DEBUG(1, (__F, "printing %5x '%c'\r\n", c, c));
-
-	while (shift && (el->el_refresh.r_cursor.h + w > el->el_terminal.t_size.h))
-	    re_putc(el, ' ', 1);
-
-	el->el_vdisplay[el->el_refresh.r_cursor.v]
-	    [el->el_refresh.r_cursor.h] = c;
-	/* assumes !shift is only used for single-column chars */
-	i = w;
-	while (--i > 0)
-		el->el_vdisplay[el->el_refresh.r_cursor.v]
-		    [el->el_refresh.r_cursor.h + i] = MB_FILL_CHAR;
-
-	if (!shift)
-		return;
-
-	el->el_refresh.r_cursor.h += w;	/* advance to next place */
-	if (el->el_refresh.r_cursor.h >= el->el_terminal.t_size.h) {
-		/* assure end of line */
-		el->el_vdisplay[el->el_refresh.r_cursor.v][el->el_terminal.t_size.h]
-		    = '\0';
-		re_nextline(el);
-	}
-}
-
-
-/* re_refresh():
- *	draws the new virtual screen image from the current input
- *  	line, then goes line-by-line changing the real image to the new
- *	virtual image. The routine to re-draw a line can be replaced
- *	easily in hopes of a smarter one being placed there.
- */
-protected void
-re_refresh(EditLine *el)
-{
-	int i, rhdiff;
-	Char *cp, *st;
-	coord_t cur;
-#ifdef notyet
-	size_t termsz;
-#endif
-
-	ELRE_DEBUG(1, (__F, "el->el_line.buffer = :%s:\r\n",
-	    el->el_line.buffer));
-
-	/* reset the Drawing cursor */
-	el->el_refresh.r_cursor.h = 0;
-	el->el_refresh.r_cursor.v = 0;
-
-	/* temporarily draw rprompt to calculate its size */
-	prompt_print(el, EL_RPROMPT);
-
-	/* reset the Drawing cursor */
-	el->el_refresh.r_cursor.h = 0;
-	el->el_refresh.r_cursor.v = 0;
-
-	if (el->el_line.cursor >= el->el_line.lastchar) {
-		if (el->el_map.current == el->el_map.alt
-		    && el->el_line.lastchar != el->el_line.buffer)
-			el->el_line.cursor = el->el_line.lastchar - 1;
-		else
-			el->el_line.cursor = el->el_line.lastchar;
-	}
-
-	cur.h = -1;		/* set flag in case I'm not set */
-	cur.v = 0;
-
-	prompt_print(el, EL_PROMPT);
-
-	/* draw the current input buffer */
-#if notyet
-	termsz = el->el_terminal.t_size.h * el->el_terminal.t_size.v;
-	if (el->el_line.lastchar - el->el_line.buffer > termsz) {
-		/*
-		 * If line is longer than terminal, process only part
-		 * of line which would influence display.
-		 */
-		size_t rem = (el->el_line.lastchar-el->el_line.buffer)%termsz;
-
-		st = el->el_line.lastchar - rem
-			- (termsz - (((rem / el->el_terminal.t_size.v) - 1)
-					* el->el_terminal.t_size.v));
-	} else
-#endif
-		st = el->el_line.buffer;
-
-	for (cp = st; cp < el->el_line.lastchar; cp++) {
-		if (cp == el->el_line.cursor) {
-                        int w = Width(*cp);
-			/* save for later */
-			cur.h = el->el_refresh.r_cursor.h;
-			cur.v = el->el_refresh.r_cursor.v;
-                        /* handle being at a linebroken doublewidth char */
-                        if (w > 1 && el->el_refresh.r_cursor.h + w >
-			    el->el_terminal.t_size.h) {
-				cur.h = 0;
-				cur.v++;
-                        }
-		}
-		re_addc(el, *cp);
-	}
-
-	if (cur.h == -1) {	/* if I haven't been set yet, I'm at the end */
-		cur.h = el->el_refresh.r_cursor.h;
-		cur.v = el->el_refresh.r_cursor.v;
-	}
-	rhdiff = el->el_terminal.t_size.h - el->el_refresh.r_cursor.h -
-	    el->el_rprompt.p_pos.h;
-	if (el->el_rprompt.p_pos.h && !el->el_rprompt.p_pos.v &&
-	    !el->el_refresh.r_cursor.v && rhdiff > 1) {
-		/*
-		 * have a right-hand side prompt that will fit
-		 * on the end of the first line with at least
-		 * one character gap to the input buffer.
-		 */
-		while (--rhdiff > 0)	/* pad out with spaces */
-			re_putc(el, ' ', 1);
-		prompt_print(el, EL_RPROMPT);
-	} else {
-		el->el_rprompt.p_pos.h = 0;	/* flag "not using rprompt" */
-		el->el_rprompt.p_pos.v = 0;
-	}
-
-	re_putc(el, '\0', 0);	/* make line ended with NUL, no cursor shift */
-
-	el->el_refresh.r_newcv = el->el_refresh.r_cursor.v;
-
-	ELRE_DEBUG(1, (__F,
-		"term.h=%d vcur.h=%d vcur.v=%d vdisplay[0]=\r\n:%80.80s:\r\n",
-		el->el_terminal.t_size.h, el->el_refresh.r_cursor.h,
-		el->el_refresh.r_cursor.v, ct_encode_string(el->el_vdisplay[0])));
-
-	ELRE_DEBUG(1, (__F, "updating %d lines.\r\n", el->el_refresh.r_newcv));
-	for (i = 0; i <= el->el_refresh.r_newcv; i++) {
-		/* NOTE THAT re_update_line MAY CHANGE el_display[i] */
-		re_update_line(el, el->el_display[i], el->el_vdisplay[i], i);
-
-		/*
-		 * Copy the new line to be the current one, and pad out with
-		 * spaces to the full width of the terminal so that if we try
-		 * moving the cursor by writing the character that is at the
-		 * end of the screen line, it won't be a NUL or some old
-		 * leftover stuff.
-		 */
-		re__copy_and_pad(el->el_display[i], el->el_vdisplay[i],
-		    (size_t) el->el_terminal.t_size.h);
-	}
-	ELRE_DEBUG(1, (__F,
-	"\r\nel->el_refresh.r_cursor.v=%d,el->el_refresh.r_oldcv=%d i=%d\r\n",
-	    el->el_refresh.r_cursor.v, el->el_refresh.r_oldcv, i));
-
-	if (el->el_refresh.r_oldcv > el->el_refresh.r_newcv)
-		for (; i <= el->el_refresh.r_oldcv; i++) {
-			terminal_move_to_line(el, i);
-			terminal_move_to_char(el, 0);
-                        /* This Strlen should be safe even with MB_FILL_CHARs */
-			terminal_clear_EOL(el, (int) Strlen(el->el_display[i]));
-#ifdef DEBUG_REFRESH
-			terminal_overwrite(el, "C\b", (size_t)2);
-#endif /* DEBUG_REFRESH */
-			el->el_display[i][0] = '\0';
-		}
-
-	el->el_refresh.r_oldcv = el->el_refresh.r_newcv; /* set for next time */
-	ELRE_DEBUG(1, (__F,
-	    "\r\ncursor.h = %d, cursor.v = %d, cur.h = %d, cur.v = %d\r\n",
-	    el->el_refresh.r_cursor.h, el->el_refresh.r_cursor.v,
-	    cur.h, cur.v));
-	terminal_move_to_line(el, cur.v);	/* go to where the cursor is */
-	terminal_move_to_char(el, cur.h);
-}
-
-
-/* re_goto_bottom():
- *	 used to go to last used screen line
- */
-protected void
-re_goto_bottom(EditLine *el)
-{
-
-	terminal_move_to_line(el, el->el_refresh.r_oldcv);
-	terminal__putc(el, '\n');
-	re_clear_display(el);
-	terminal__flush(el);
-}
-
-
-/* re_insert():
- *	insert num characters of s into d (in front of the character)
- *	at dat, maximum length of d is dlen
- */
-private void
-/*ARGSUSED*/
-re_insert(EditLine *el __attribute__((__unused__)),
-    Char *d, int dat, int dlen, Char *s, int num)
-{
-	Char *a, *b;
-
-	if (num <= 0)
-		return;
-	if (num > dlen - dat)
-		num = dlen - dat;
-
-	ELRE_DEBUG(1,
-	    (__F, "re_insert() starting: %d at %d max %d, d == \"%s\"\n",
-	    num, dat, dlen, ct_encode_string(d)));
-	ELRE_DEBUG(1, (__F, "s == \"%s\"\n", ct_encode_string(s)));
-
-	/* open up the space for num chars */
-	if (num > 0) {
-		b = d + dlen - 1;
-		a = b - num;
-		while (a >= &d[dat])
-			*b-- = *a--;
-		d[dlen] = '\0';	/* just in case */
-	}
-
-	ELRE_DEBUG(1, (__F,
-		"re_insert() after insert: %d at %d max %d, d == \"%s\"\n",
-		num, dat, dlen, ct_encode_string(d)));
-	ELRE_DEBUG(1, (__F, "s == \"%s\"\n", ct_encode_string(s)));
-
-	/* copy the characters */
-	for (a = d + dat; (a < d + dlen) && (num > 0); num--)
-		*a++ = *s++;
-
-#ifdef notyet
-        /* ct_encode_string() uses a static buffer, so we can't conveniently
-         * encode both d & s here */
-	ELRE_DEBUG(1,
-	    (__F, "re_insert() after copy: %d at %d max %d, %s == \"%s\"\n",
-	    num, dat, dlen, d, s));
-	ELRE_DEBUG(1, (__F, "s == \"%s\"\n", s));
-#endif
-}
-
-
-/* re_delete():
- *	delete num characters d at dat, maximum length of d is dlen
- */
-private void
-/*ARGSUSED*/
-re_delete(EditLine *el __attribute__((__unused__)),
-    Char *d, int dat, int dlen, int num)
-{
-	Char *a, *b;
-
-	if (num <= 0)
-		return;
-	if (dat + num >= dlen) {
-		d[dat] = '\0';
-		return;
-	}
-	ELRE_DEBUG(1,
-	    (__F, "re_delete() starting: %d at %d max %d, d == \"%s\"\n",
-	    num, dat, dlen, ct_encode_string(d)));
-
-	/* open up the space for num chars */
-	if (num > 0) {
-		b = d + dat;
-		a = b + num;
-		while (a < &d[dlen])
-			*b++ = *a++;
-		d[dlen] = '\0';	/* just in case */
-	}
-	ELRE_DEBUG(1,
-	    (__F, "re_delete() after delete: %d at %d max %d, d == \"%s\"\n",
-	    num, dat, dlen, ct_encode_string(d)));
-}
-
-
-/* re__strncopy():
- *	Like strncpy without padding.
- */
-private void
-re__strncopy(Char *a, Char *b, size_t n)
-{
-
-	while (n-- && *b)
-		*a++ = *b++;
-}
-
-/* re_clear_eol():
- *	Find the number of characters we need to clear till the end of line
- *	in order to make sure that we have cleared the previous contents of
- *	the line. fx and sx is the number of characters inserted or deleted
- *	in the first or second diff, diff is the difference between the
- * 	number of characters between the new and old line.
- */
-private void
-re_clear_eol(EditLine *el, int fx, int sx, int diff)
-{
-
-	ELRE_DEBUG(1, (__F, "re_clear_eol sx %d, fx %d, diff %d\n",
-	    sx, fx, diff));
-
-	if (fx < 0)
-		fx = -fx;
-	if (sx < 0)
-		sx = -sx;
-	if (fx > diff)
-		diff = fx;
-	if (sx > diff)
-		diff = sx;
-
-	ELRE_DEBUG(1, (__F, "re_clear_eol %d\n", diff));
-	terminal_clear_EOL(el, diff);
-}
-
-/*****************************************************************
-    re_update_line() is based on finding the middle difference of each line
-    on the screen; vis:
-
-			     /old first difference
-	/beginning of line   |              /old last same       /old EOL
-	v		     v              v                    v
-old:	eddie> Oh, my little gruntle-buggy is to me, as lurgid as
-new:	eddie> Oh, my little buggy says to me, as lurgid as
-	^		     ^        ^			   ^
-	\beginning of line   |        \new last same	   \new end of line
-			     \new first difference
-
-    all are character pointers for the sake of speed.  Special cases for
-    no differences, as well as for end of line additions must be handled.
-**************************************************************** */
-
-/* Minimum at which doing an insert it "worth it".  This should be about
- * half the "cost" of going into insert mode, inserting a character, and
- * going back out.  This should really be calculated from the termcap
- * data...  For the moment, a good number for ANSI terminals.
- */
-#define	MIN_END_KEEP	4
-
-private void
-re_update_line(EditLine *el, Char *old, Char *new, int i)
-{
-	Char *o, *n, *p, c;
-	Char *ofd, *ols, *oe, *nfd, *nls, *ne;
-	Char *osb, *ose, *nsb, *nse;
-	int fx, sx;
-	size_t len;
-
-	/*
-         * find first diff
-         */
-	for (o = old, n = new; *o && (*o == *n); o++, n++)
-		continue;
-	ofd = o;
-	nfd = n;
-
-	/*
-         * Find the end of both old and new
-         */
-	while (*o)
-		o++;
-	/*
-         * Remove any trailing blanks off of the end, being careful not to
-         * back up past the beginning.
-         */
-	while (ofd < o) {
-		if (o[-1] != ' ')
-			break;
-		o--;
-	}
-	oe = o;
-	*oe = '\0';
-
-	while (*n)
-		n++;
-
-	/* remove blanks from end of new */
-	while (nfd < n) {
-		if (n[-1] != ' ')
-			break;
-		n--;
-	}
-	ne = n;
-	*ne = '\0';
-
-	/*
-         * if no diff, continue to next line of redraw
-         */
-	if (*ofd == '\0' && *nfd == '\0') {
-		ELRE_DEBUG(1, (__F, "no difference.\r\n"));
-		return;
-	}
-	/*
-         * find last same pointer
-         */
-	while ((o > ofd) && (n > nfd) && (*--o == *--n))
-		continue;
-	ols = ++o;
-	nls = ++n;
-
-	/*
-         * find same begining and same end
-         */
-	osb = ols;
-	nsb = nls;
-	ose = ols;
-	nse = nls;
-
-	/*
-         * case 1: insert: scan from nfd to nls looking for *ofd
-         */
-	if (*ofd) {
-		for (c = *ofd, n = nfd; n < nls; n++) {
-			if (c == *n) {
-				for (o = ofd, p = n;
-				    p < nls && o < ols && *o == *p;
-				    o++, p++)
-					continue;
-				/*
-				 * if the new match is longer and it's worth
-				 * keeping, then we take it
-				 */
-				if (((nse - nsb) < (p - n)) &&
-				    (2 * (p - n) > n - nfd)) {
-					nsb = n;
-					nse = p;
-					osb = ofd;
-					ose = o;
-				}
-			}
-		}
-	}
-	/*
-         * case 2: delete: scan from ofd to ols looking for *nfd
-         */
-	if (*nfd) {
-		for (c = *nfd, o = ofd; o < ols; o++) {
-			if (c == *o) {
-				for (n = nfd, p = o;
-				    p < ols && n < nls && *p == *n;
-				    p++, n++)
-					continue;
-				/*
-				 * if the new match is longer and it's worth
-				 * keeping, then we take it
-				 */
-				if (((ose - osb) < (p - o)) &&
-				    (2 * (p - o) > o - ofd)) {
-					nsb = nfd;
-					nse = n;
-					osb = o;
-					ose = p;
-				}
-			}
-		}
-	}
-	/*
-         * Pragmatics I: If old trailing whitespace or not enough characters to
-         * save to be worth it, then don't save the last same info.
-         */
-	if ((oe - ols) < MIN_END_KEEP) {
-		ols = oe;
-		nls = ne;
-	}
-	/*
-         * Pragmatics II: if the terminal isn't smart enough, make the data
-         * dumber so the smart update doesn't try anything fancy
-         */
-
-	/*
-         * fx is the number of characters we need to insert/delete: in the
-         * beginning to bring the two same begins together
-         */
-	fx = (int)((nsb - nfd) - (osb - ofd));
-	/*
-         * sx is the number of characters we need to insert/delete: in the
-         * end to bring the two same last parts together
-         */
-	sx = (int)((nls - nse) - (ols - ose));
-
-	if (!EL_CAN_INSERT) {
-		if (fx > 0) {
-			osb = ols;
-			ose = ols;
-			nsb = nls;
-			nse = nls;
-		}
-		if (sx > 0) {
-			ols = oe;
-			nls = ne;
-		}
-		if ((ols - ofd) < (nls - nfd)) {
-			ols = oe;
-			nls = ne;
-		}
-	}
-	if (!EL_CAN_DELETE) {
-		if (fx < 0) {
-			osb = ols;
-			ose = ols;
-			nsb = nls;
-			nse = nls;
-		}
-		if (sx < 0) {
-			ols = oe;
-			nls = ne;
-		}
-		if ((ols - ofd) > (nls - nfd)) {
-			ols = oe;
-			nls = ne;
-		}
-	}
-	/*
-         * Pragmatics III: make sure the middle shifted pointers are correct if
-         * they don't point to anything (we may have moved ols or nls).
-         */
-	/* if the change isn't worth it, don't bother */
-	/* was: if (osb == ose) */
-	if ((ose - osb) < MIN_END_KEEP) {
-		osb = ols;
-		ose = ols;
-		nsb = nls;
-		nse = nls;
-	}
-	/*
-         * Now that we are done with pragmatics we recompute fx, sx
-         */
-	fx = (int)((nsb - nfd) - (osb - ofd));
-	sx = (int)((nls - nse) - (ols - ose));
-
-	ELRE_DEBUG(1, (__F, "fx %d, sx %d\n", fx, sx));
-	ELRE_DEBUG(1, (__F, "ofd %d, osb %d, ose %d, ols %d, oe %d\n",
-		ofd - old, osb - old, ose - old, ols - old, oe - old));
-	ELRE_DEBUG(1, (__F, "nfd %d, nsb %d, nse %d, nls %d, ne %d\n",
-		nfd - new, nsb - new, nse - new, nls - new, ne - new));
-	ELRE_DEBUG(1, (__F,
-		"xxx-xxx:\"00000000001111111111222222222233333333334\"\r\n"));
-	ELRE_DEBUG(1, (__F,
-		"xxx-xxx:\"01234567890123456789012345678901234567890\"\r\n"));
-#ifdef DEBUG_REFRESH
-	re_printstr(el, "old- oe", old, oe);
-	re_printstr(el, "new- ne", new, ne);
-	re_printstr(el, "old-ofd", old, ofd);
-	re_printstr(el, "new-nfd", new, nfd);
-	re_printstr(el, "ofd-osb", ofd, osb);
-	re_printstr(el, "nfd-nsb", nfd, nsb);
-	re_printstr(el, "osb-ose", osb, ose);
-	re_printstr(el, "nsb-nse", nsb, nse);
-	re_printstr(el, "ose-ols", ose, ols);
-	re_printstr(el, "nse-nls", nse, nls);
-	re_printstr(el, "ols- oe", ols, oe);
-	re_printstr(el, "nls- ne", nls, ne);
-#endif /* DEBUG_REFRESH */
-
-	/*
-         * el_cursor.v to this line i MUST be in this routine so that if we
-         * don't have to change the line, we don't move to it. el_cursor.h to
-         * first diff char
-         */
-	terminal_move_to_line(el, i);
-
-	/*
-         * at this point we have something like this:
-         *
-         * /old                  /ofd    /osb               /ose    /ols     /oe
-         * v.....................v       v..................v       v........v
-         * eddie> Oh, my fredded gruntle-buggy is to me, as foo var lurgid as
-         * eddie> Oh, my fredded quiux buggy is to me, as gruntle-lurgid as
-         * ^.....................^     ^..................^       ^........^
-         * \new                  \nfd  \nsb               \nse     \nls    \ne
-         *
-         * fx is the difference in length between the chars between nfd and
-         * nsb, and the chars between ofd and osb, and is thus the number of
-         * characters to delete if < 0 (new is shorter than old, as above),
-         * or insert (new is longer than short).
-         *
-         * sx is the same for the second differences.
-         */
-
-	/*
-         * if we have a net insert on the first difference, AND inserting the
-         * net amount ((nsb-nfd) - (osb-ofd)) won't push the last useful
-         * character (which is ne if nls != ne, otherwise is nse) off the edge
-	 * of the screen (el->el_terminal.t_size.h) else we do the deletes first
-	 * so that we keep everything we need to.
-         */
-
-	/*
-         * if the last same is the same like the end, there is no last same
-         * part, otherwise we want to keep the last same part set p to the
-         * last useful old character
-         */
-	p = (ols != oe) ? oe : ose;
-
-	/*
-         * if (There is a diffence in the beginning) && (we need to insert
-         *   characters) && (the number of characters to insert is less than
-         *   the term width)
-	 *	We need to do an insert!
-	 * else if (we need to delete characters)
-	 *	We need to delete characters!
-	 * else
-	 *	No insert or delete
-         */
-	if ((nsb != nfd) && fx > 0 &&
-	    ((p - old) + fx <= el->el_terminal.t_size.h)) {
-		ELRE_DEBUG(1,
-		    (__F, "first diff insert at %d...\r\n", nfd - new));
-		/*
-		 * Move to the first char to insert, where the first diff is.
-		 */
-		terminal_move_to_char(el, (int)(nfd - new));
-		/*
-		 * Check if we have stuff to keep at end
-		 */
-		if (nsb != ne) {
-			ELRE_DEBUG(1, (__F, "with stuff to keep at end\r\n"));
-			/*
-		         * insert fx chars of new starting at nfd
-		         */
-			if (fx > 0) {
-				ELRE_DEBUG(!EL_CAN_INSERT, (__F,
-				"ERROR: cannot insert in early first diff\n"));
-				terminal_insertwrite(el, nfd, fx);
-				re_insert(el, old, (int)(ofd - old),
-				    el->el_terminal.t_size.h, nfd, fx);
-			}
-			/*
-		         * write (nsb-nfd) - fx chars of new starting at
-		         * (nfd + fx)
-			 */
-			len = (size_t) ((nsb - nfd) - fx);
-			terminal_overwrite(el, (nfd + fx), len);
-			re__strncopy(ofd + fx, nfd + fx, len);
-		} else {
-			ELRE_DEBUG(1, (__F, "without anything to save\r\n"));
-			len = (size_t)(nsb - nfd);
-			terminal_overwrite(el, nfd, len);
-			re__strncopy(ofd, nfd, len);
-			/*
-		         * Done
-		         */
-			return;
-		}
-	} else if (fx < 0) {
-		ELRE_DEBUG(1,
-		    (__F, "first diff delete at %d...\r\n", ofd - old));
-		/*
-		 * move to the first char to delete where the first diff is
-		 */
-		terminal_move_to_char(el, (int)(ofd - old));
-		/*
-		 * Check if we have stuff to save
-		 */
-		if (osb != oe) {
-			ELRE_DEBUG(1, (__F, "with stuff to save at end\r\n"));
-			/*
-		         * fx is less than zero *always* here but we check
-		         * for code symmetry
-		         */
-			if (fx < 0) {
-				ELRE_DEBUG(!EL_CAN_DELETE, (__F,
-				    "ERROR: cannot delete in first diff\n"));
-				terminal_deletechars(el, -fx);
-				re_delete(el, old, (int)(ofd - old),
-				    el->el_terminal.t_size.h, -fx);
-			}
-			/*
-		         * write (nsb-nfd) chars of new starting at nfd
-		         */
-			len = (size_t) (nsb - nfd);
-			terminal_overwrite(el, nfd, len);
-			re__strncopy(ofd, nfd, len);
-
-		} else {
-			ELRE_DEBUG(1, (__F,
-			    "but with nothing left to save\r\n"));
-			/*
-		         * write (nsb-nfd) chars of new starting at nfd
-		         */
-			terminal_overwrite(el, nfd, (size_t)(nsb - nfd));
-			re_clear_eol(el, fx, sx,
-			    (int)((oe - old) - (ne - new)));
-			/*
-		         * Done
-		         */
-			return;
-		}
-	} else
-		fx = 0;
-
-	if (sx < 0 && (ose - old) + fx < el->el_terminal.t_size.h) {
-		ELRE_DEBUG(1, (__F,
-		    "second diff delete at %d...\r\n", (ose - old) + fx));
-		/*
-		 * Check if we have stuff to delete
-		 */
-		/*
-		 * fx is the number of characters inserted (+) or deleted (-)
-		 */
-
-		terminal_move_to_char(el, (int)((ose - old) + fx));
-		/*
-		 * Check if we have stuff to save
-		 */
-		if (ols != oe) {
-			ELRE_DEBUG(1, (__F, "with stuff to save at end\r\n"));
-			/*
-		         * Again a duplicate test.
-		         */
-			if (sx < 0) {
-				ELRE_DEBUG(!EL_CAN_DELETE, (__F,
-				    "ERROR: cannot delete in second diff\n"));
-				terminal_deletechars(el, -sx);
-			}
-			/*
-		         * write (nls-nse) chars of new starting at nse
-		         */
-			terminal_overwrite(el, nse, (size_t)(nls - nse));
-		} else {
-			ELRE_DEBUG(1, (__F,
-			    "but with nothing left to save\r\n"));
-			terminal_overwrite(el, nse, (size_t)(nls - nse));
-			re_clear_eol(el, fx, sx,
-			    (int)((oe - old) - (ne - new)));
-		}
-	}
-	/*
-         * if we have a first insert AND WE HAVEN'T ALREADY DONE IT...
-         */
-	if ((nsb != nfd) && (osb - ofd) <= (nsb - nfd) && (fx == 0)) {
-		ELRE_DEBUG(1, (__F, "late first diff insert at %d...\r\n",
-		    nfd - new));
-
-		terminal_move_to_char(el, (int)(nfd - new));
-		/*
-		 * Check if we have stuff to keep at the end
-		 */
-		if (nsb != ne) {
-			ELRE_DEBUG(1, (__F, "with stuff to keep at end\r\n"));
-			/*
-		         * We have to recalculate fx here because we set it
-		         * to zero above as a flag saying that we hadn't done
-		         * an early first insert.
-		         */
-			fx = (int)((nsb - nfd) - (osb - ofd));
-			if (fx > 0) {
-				/*
-				 * insert fx chars of new starting at nfd
-				 */
-				ELRE_DEBUG(!EL_CAN_INSERT, (__F,
-				 "ERROR: cannot insert in late first diff\n"));
-				terminal_insertwrite(el, nfd, fx);
-				re_insert(el, old, (int)(ofd - old),
-				    el->el_terminal.t_size.h, nfd, fx);
-			}
-			/*
-		         * write (nsb-nfd) - fx chars of new starting at
-		         * (nfd + fx)
-			 */
-			len = (size_t) ((nsb - nfd) - fx);
-			terminal_overwrite(el, (nfd + fx), len);
-			re__strncopy(ofd + fx, nfd + fx, len);
-		} else {
-			ELRE_DEBUG(1, (__F, "without anything to save\r\n"));
-			len = (size_t) (nsb - nfd);
-			terminal_overwrite(el, nfd, len);
-			re__strncopy(ofd, nfd, len);
-		}
-	}
-	/*
-         * line is now NEW up to nse
-         */
-	if (sx >= 0) {
-		ELRE_DEBUG(1, (__F,
-		    "second diff insert at %d...\r\n", (int)(nse - new)));
-		terminal_move_to_char(el, (int)(nse - new));
-		if (ols != oe) {
-			ELRE_DEBUG(1, (__F, "with stuff to keep at end\r\n"));
-			if (sx > 0) {
-				/* insert sx chars of new starting at nse */
-				ELRE_DEBUG(!EL_CAN_INSERT, (__F,
-				    "ERROR: cannot insert in second diff\n"));
-				terminal_insertwrite(el, nse, sx);
-			}
-			/*
-		         * write (nls-nse) - sx chars of new starting at
-			 * (nse + sx)
-		         */
-			terminal_overwrite(el, (nse + sx),
-			    (size_t)((nls - nse) - sx));
-		} else {
-			ELRE_DEBUG(1, (__F, "without anything to save\r\n"));
-			terminal_overwrite(el, nse, (size_t)(nls - nse));
-
-			/*
-	                 * No need to do a clear-to-end here because we were
-	                 * doing a second insert, so we will have over
-	                 * written all of the old string.
-		         */
-		}
-	}
-	ELRE_DEBUG(1, (__F, "done.\r\n"));
-}
-
-
-/* re__copy_and_pad():
- *	Copy string and pad with spaces
- */
-private void
-re__copy_and_pad(Char *dst, const Char *src, size_t width)
-{
-	size_t i;
-
-	for (i = 0; i < width; i++) {
-		if (*src == '\0')
-			break;
-		*dst++ = *src++;
-	}
-
-	for (; i < width; i++)
-		*dst++ = ' ';
-
-	*dst = '\0';
-}
-
-
-/* re_refresh_cursor():
- *	Move to the new cursor position
- */
-protected void
-re_refresh_cursor(EditLine *el)
-{
-	Char *cp;
-	int h, v, th, w;
-
-	if (el->el_line.cursor >= el->el_line.lastchar) {
-		if (el->el_map.current == el->el_map.alt
-		    && el->el_line.lastchar != el->el_line.buffer)
-			el->el_line.cursor = el->el_line.lastchar - 1;
-		else
-			el->el_line.cursor = el->el_line.lastchar;
-	}
-
-	/* first we must find where the cursor is... */
-	h = el->el_prompt.p_pos.h;
-	v = el->el_prompt.p_pos.v;
-	th = el->el_terminal.t_size.h;	/* optimize for speed */
-
-	/* do input buffer to el->el_line.cursor */
-	for (cp = el->el_line.buffer; cp < el->el_line.cursor; cp++) {
-                switch (ct_chr_class(*cp)) {
-		case CHTYPE_NL:  /* handle newline in data part too */
-			h = 0;
-			v++;
-			break;
-		case CHTYPE_TAB: /* if a tab, to next tab stop */
-			while (++h & 07)
-				continue;
-			break;
-		default:
-			w = Width(*cp);
-			if (w > 1 && h + w > th) { /* won't fit on line */
-				h = 0;
-				v++;
-			}
-			h += ct_visual_width(*cp);
-			break;
-                }
-
-		if (h >= th) {	/* check, extra long tabs picked up here also */
-			h -= th;
-			v++;
-		}
-	}
-        /* if we have a next character, and it's a doublewidth one, we need to
-         * check whether we need to linebreak for it to fit */
-        if (cp < el->el_line.lastchar && (w = Width(*cp)) > 1)
-                if (h + w > th) {
-                    h = 0;
-                    v++;
-                }
-
-	/* now go there */
-	terminal_move_to_line(el, v);
-	terminal_move_to_char(el, h);
-	terminal__flush(el);
-}
-
-
-/* re_fastputc():
- *	Add a character fast.
- */
-private void
-re_fastputc(EditLine *el, Int c)
-{
-	int w = Width((Char)c);
-	while (w > 1 && el->el_cursor.h + w > el->el_terminal.t_size.h)
-	    re_fastputc(el, ' ');
-
-	terminal__putc(el, c);
-	el->el_display[el->el_cursor.v][el->el_cursor.h++] = c;
-	while (--w > 0)
-		el->el_display[el->el_cursor.v][el->el_cursor.h++]
-			= MB_FILL_CHAR;
-
-	if (el->el_cursor.h >= el->el_terminal.t_size.h) {
-		/* if we must overflow */
-		el->el_cursor.h = 0;
-
-		/*
-		 * If we would overflow (input is longer than terminal size),
-		 * emulate scroll by dropping first line and shuffling the rest.
-		 * We do this via pointer shuffling - it's safe in this case
-		 * and we avoid memcpy().
-		 */
-		if (el->el_cursor.v + 1 >= el->el_terminal.t_size.v) {
-			int i, lins = el->el_terminal.t_size.v;
-			Char *firstline = el->el_display[0];
-	
-			for(i = 1; i < lins; i++)
-				el->el_display[i - 1] = el->el_display[i];
-
-			re__copy_and_pad(firstline, STR(""), (size_t)0);
-			el->el_display[i - 1] = firstline;
-		} else {
-			el->el_cursor.v++;
-			el->el_refresh.r_oldcv++;
-		}
-		if (EL_HAS_AUTO_MARGINS) {
-			if (EL_HAS_MAGIC_MARGINS) {
-				terminal__putc(el, ' ');
-				terminal__putc(el, '\b');
-			}
-		} else {
-			terminal__putc(el, '\r');
-			terminal__putc(el, '\n');
-		}
-	}
-}
-
-
-/* re_fastaddc():
- *	we added just one char, handle it fast.
- *	Assumes that screen cursor == real cursor
- */
-protected void
-re_fastaddc(EditLine *el)
-{
-	Char c;
-	int rhdiff;
-
-	c = el->el_line.cursor[-1];
-
-	if (c == '\t' || el->el_line.cursor != el->el_line.lastchar) {
-		re_refresh(el);	/* too hard to handle */
-		return;
-	}
-	rhdiff = el->el_terminal.t_size.h - el->el_cursor.h -
-	    el->el_rprompt.p_pos.h;
-	if (el->el_rprompt.p_pos.h && rhdiff < 3) {
-		re_refresh(el);	/* clear out rprompt if less than 1 char gap */
-		return;
-	}			/* else (only do at end of line, no TAB) */
-	switch (ct_chr_class(c)) {
-	case CHTYPE_TAB: /* already handled, should never happen here */
-		break;
-	case CHTYPE_NL:
-	case CHTYPE_PRINT:
-		re_fastputc(el, c);
-		break;
-	case CHTYPE_ASCIICTL:
-	case CHTYPE_NONPRINT: {
-		Char visbuf[VISUAL_WIDTH_MAX];
-		ssize_t i, n =
-		    ct_visual_char(visbuf, VISUAL_WIDTH_MAX, (Char)c);
-		for (i = 0; n-- > 0; ++i)
-			re_fastputc(el, visbuf[i]);
-		break;
-	}
-	}
-	terminal__flush(el);
-}
-
-
-/* re_clear_display():
- *	clear the screen buffers so that new new prompt starts fresh.
- */
-protected void
-re_clear_display(EditLine *el)
-{
-	int i;
-
-	el->el_cursor.v = 0;
-	el->el_cursor.h = 0;
-	for (i = 0; i < el->el_terminal.t_size.v; i++)
-		el->el_display[i][0] = '\0';
-	el->el_refresh.r_oldcv = 0;
-}
-
-
-/* re_clear_lines():
- *	Make sure all lines are *really* blank
- */
-protected void
-re_clear_lines(EditLine *el)
-{
-
-	if (EL_CAN_CEOL) {
-		int i;
-		for (i = el->el_refresh.r_oldcv; i >= 0; i--) {
-			/* for each line on the screen */
-			terminal_move_to_line(el, i);
-			terminal_move_to_char(el, 0);
-			terminal_clear_EOL(el, el->el_terminal.t_size.h);
-		}
-	} else {
-		terminal_move_to_line(el, el->el_refresh.r_oldcv);
-					/* go to last line */
-		terminal__putc(el, '\r');	/* go to BOL */
-		terminal__putc(el, '\n');	/* go to new line */
-	}
-}
diff --git a/lib/libedit/refresh.h b/lib/libedit/refresh.h
deleted file mode 100644
index f80be4635..000000000
--- a/lib/libedit/refresh.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: refresh.h,v 1.6 2009/12/30 22:37:40 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)refresh.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.refresh.h: Screen refresh functions
- */
-#ifndef _h_el_refresh
-#define	_h_el_refresh
-
-#include "histedit.h"
-
-typedef struct {
-	coord_t	r_cursor;	/* Refresh cursor position	*/
-	int	r_oldcv;	/* Vertical locations		*/
-	int	r_newcv;
-} el_refresh_t;
-
-protected void	re_putc(EditLine *, Int, int);
-protected void	re_clear_lines(EditLine *);
-protected void	re_clear_display(EditLine *);
-protected void	re_refresh(EditLine *);
-protected void	re_refresh_cursor(EditLine *);
-protected void	re_fastaddc(EditLine *);
-protected void	re_goto_bottom(EditLine *);
-
-#endif /* _h_el_refresh */
diff --git a/lib/libedit/search.c b/lib/libedit/search.c
deleted file mode 100644
index 762b40604..000000000
--- a/lib/libedit/search.c
+++ /dev/null
@@ -1,641 +0,0 @@
-/*	$NetBSD: search.c,v 1.30 2011/10/04 15:27:04 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)search.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: search.c,v 1.30 2011/10/04 15:27:04 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * search.c: History and character search functions
- */
-#include <stdlib.h>
-#if defined(REGEX)
-#include <regex.h>
-#elif defined(REGEXP)
-#include <regexp.h>
-#endif
-#include "el.h"
-
-/*
- * Adjust cursor in vi mode to include the character under it
- */
-#define	EL_CURSOR(el) \
-    ((el)->el_line.cursor + (((el)->el_map.type == MAP_VI) && \
-			    ((el)->el_map.current == (el)->el_map.alt)))
-
-/* search_init():
- *	Initialize the search stuff
- */
-protected int
-search_init(EditLine *el)
-{
-
-	el->el_search.patbuf = el_malloc(EL_BUFSIZ *
-	    sizeof(*el->el_search.patbuf));
-	if (el->el_search.patbuf == NULL)
-		return -1;
-	el->el_search.patlen = 0;
-	el->el_search.patdir = -1;
-	el->el_search.chacha = '\0';
-	el->el_search.chadir = CHAR_FWD;
-	el->el_search.chatflg = 0;
-	return 0;
-}
-
-
-/* search_end():
- *	Initialize the search stuff
- */
-protected void
-search_end(EditLine *el)
-{
-
-	el_free(el->el_search.patbuf);
-	el->el_search.patbuf = NULL;
-}
-
-
-#ifdef REGEXP
-/* regerror():
- *	Handle regular expression errors
- */
-public void
-/*ARGSUSED*/
-regerror(const char *msg)
-{
-}
-#endif
-
-
-/* el_match():
- *	Return if string matches pattern
- */
-protected int
-el_match(const Char *str, const Char *pat)
-{
-#ifdef WIDECHAR
-	static ct_buffer_t conv;
-#endif
-#if defined (REGEX)
-	regex_t re;
-	int rv;
-#elif defined (REGEXP)
-	regexp *rp;
-	int rv;
-#else
-	extern char	*re_comp(const char *);
-	extern int	 re_exec(const char *);
-#endif
-
-	if (Strstr(str, pat) != 0)
-		return 1;
-
-#if defined(REGEX)
-	if (regcomp(&re, ct_encode_string(pat, &conv), 0) == 0) {
-		rv = regexec(&re, ct_encode_string(str, &conv), (size_t)0, NULL,
-		    0) == 0;
-		regfree(&re);
-	} else {
-		rv = 0;
-	}
-	return rv;
-#elif defined(REGEXP)
-	if ((re = regcomp(ct_encode_string(pat, &conv))) != NULL) {
-		rv = regexec(re, ct_encode_string(str, &conv));
-		el_free(re);
-	} else {
-		rv = 0;
-	}
-	return rv;
-#else
-	if (re_comp(ct_encode_string(pat, &conv)) != NULL)
-		return 0;
-	else
-		return re_exec(ct_encode_string(str, &conv) == 1);
-#endif
-}
-
-
-/* c_hmatch():
- *	 return True if the pattern matches the prefix
- */
-protected int
-c_hmatch(EditLine *el, const Char *str)
-{
-#ifdef SDEBUG
-	(void) fprintf(el->el_errfile, "match `%s' with `%s'\n",
-	    el->el_search.patbuf, str);
-#endif /* SDEBUG */
-
-	return el_match(str, el->el_search.patbuf);
-}
-
-
-/* c_setpat():
- *	Set the history seatch pattern
- */
-protected void
-c_setpat(EditLine *el)
-{
-	if (el->el_state.lastcmd != ED_SEARCH_PREV_HISTORY &&
-	    el->el_state.lastcmd != ED_SEARCH_NEXT_HISTORY) {
-		el->el_search.patlen =
-		    (size_t)(EL_CURSOR(el) - el->el_line.buffer);
-		if (el->el_search.patlen >= EL_BUFSIZ)
-			el->el_search.patlen = EL_BUFSIZ - 1;
-		if (el->el_search.patlen != 0) {
-			(void) Strncpy(el->el_search.patbuf, el->el_line.buffer,
-			    el->el_search.patlen);
-			el->el_search.patbuf[el->el_search.patlen] = '\0';
-		} else
-			el->el_search.patlen = Strlen(el->el_search.patbuf);
-	}
-#ifdef SDEBUG
-	(void) fprintf(el->el_errfile, "\neventno = %d\n",
-	    el->el_history.eventno);
-	(void) fprintf(el->el_errfile, "patlen = %d\n", el->el_search.patlen);
-	(void) fprintf(el->el_errfile, "patbuf = \"%s\"\n",
-	    el->el_search.patbuf);
-	(void) fprintf(el->el_errfile, "cursor %d lastchar %d\n",
-	    EL_CURSOR(el) - el->el_line.buffer,
-	    el->el_line.lastchar - el->el_line.buffer);
-#endif
-}
-
-
-/* ce_inc_search():
- *	Emacs incremental search
- */
-protected el_action_t
-ce_inc_search(EditLine *el, int dir)
-{
-	static const Char STRfwd[] = {'f', 'w', 'd', '\0'},
-	     STRbck[] = {'b', 'c', 'k', '\0'};
-	static Char pchar = ':';/* ':' = normal, '?' = failed */
-	static Char endcmd[2] = {'\0', '\0'};
-	Char ch, *ocursor = el->el_line.cursor, oldpchar = pchar;
-	const Char *cp;
-
-	el_action_t ret = CC_NORM;
-
-	int ohisteventno = el->el_history.eventno;
-	size_t oldpatlen = el->el_search.patlen;
-	int newdir = dir;
-	int done, redo;
-
-	if (el->el_line.lastchar + sizeof(STRfwd) /
-	    sizeof(*el->el_line.lastchar) + 2 +
-	    el->el_search.patlen >= el->el_line.limit)
-		return CC_ERROR;
-
-	for (;;) {
-
-		if (el->el_search.patlen == 0) {	/* first round */
-			pchar = ':';
-#ifdef ANCHOR
-#define	LEN	2
-			el->el_search.patbuf[el->el_search.patlen++] = '.';
-			el->el_search.patbuf[el->el_search.patlen++] = '*';
-#else
-#define	LEN	0
-#endif
-		}
-		done = redo = 0;
-		*el->el_line.lastchar++ = '\n';
-		for (cp = (newdir == ED_SEARCH_PREV_HISTORY) ? STRbck : STRfwd;
-		    *cp; *el->el_line.lastchar++ = *cp++)
-			continue;
-		*el->el_line.lastchar++ = pchar;
-		for (cp = &el->el_search.patbuf[LEN];
-		    cp < &el->el_search.patbuf[el->el_search.patlen];
-		    *el->el_line.lastchar++ = *cp++)
-			continue;
-		*el->el_line.lastchar = '\0';
-		re_refresh(el);
-
-		if (FUN(el,getc)(el, &ch) != 1)
-			return ed_end_of_file(el, 0);
-
-		switch (el->el_map.current[(unsigned char) ch]) {
-		case ED_INSERT:
-		case ED_DIGIT:
-			if (el->el_search.patlen >= EL_BUFSIZ - LEN)
-				terminal_beep(el);
-			else {
-				el->el_search.patbuf[el->el_search.patlen++] =
-				    ch;
-				*el->el_line.lastchar++ = ch;
-				*el->el_line.lastchar = '\0';
-				re_refresh(el);
-			}
-			break;
-
-		case EM_INC_SEARCH_NEXT:
-			newdir = ED_SEARCH_NEXT_HISTORY;
-			redo++;
-			break;
-
-		case EM_INC_SEARCH_PREV:
-			newdir = ED_SEARCH_PREV_HISTORY;
-			redo++;
-			break;
-
-		case EM_DELETE_PREV_CHAR:
-		case ED_DELETE_PREV_CHAR:
-			if (el->el_search.patlen > LEN)
-				done++;
-			else
-				terminal_beep(el);
-			break;
-
-		default:
-			switch (ch) {
-			case 0007:	/* ^G: Abort */
-				ret = CC_ERROR;
-				done++;
-				break;
-
-			case 0027:	/* ^W: Append word */
-			/* No can do if globbing characters in pattern */
-				for (cp = &el->el_search.patbuf[LEN];; cp++)
-				    if (cp >= &el->el_search.patbuf[
-					el->el_search.patlen]) {
-					el->el_line.cursor +=
-					    el->el_search.patlen - LEN - 1;
-					cp = c__next_word(el->el_line.cursor,
-					    el->el_line.lastchar, 1,
-					    ce__isword);
-					while (el->el_line.cursor < cp &&
-					    *el->el_line.cursor != '\n') {
-						if (el->el_search.patlen >=
-						    EL_BUFSIZ - LEN) {
-							terminal_beep(el);
-							break;
-						}
-						el->el_search.patbuf[el->el_search.patlen++] =
-						    *el->el_line.cursor;
-						*el->el_line.lastchar++ =
-						    *el->el_line.cursor++;
-					}
-					el->el_line.cursor = ocursor;
-					*el->el_line.lastchar = '\0';
-					re_refresh(el);
-					break;
-				    } else if (isglob(*cp)) {
-					    terminal_beep(el);
-					    break;
-				    }
-				break;
-
-			default:	/* Terminate and execute cmd */
-				endcmd[0] = ch;
-				FUN(el,push)(el, endcmd);
-				/* FALLTHROUGH */
-
-			case 0033:	/* ESC: Terminate */
-				ret = CC_REFRESH;
-				done++;
-				break;
-			}
-			break;
-		}
-
-		while (el->el_line.lastchar > el->el_line.buffer &&
-		    *el->el_line.lastchar != '\n')
-			*el->el_line.lastchar-- = '\0';
-		*el->el_line.lastchar = '\0';
-
-		if (!done) {
-
-			/* Can't search if unmatched '[' */
-			for (cp = &el->el_search.patbuf[el->el_search.patlen-1],
-			    ch = ']';
-			    cp >= &el->el_search.patbuf[LEN];
-			    cp--)
-				if (*cp == '[' || *cp == ']') {
-					ch = *cp;
-					break;
-				}
-			if (el->el_search.patlen > LEN && ch != '[') {
-				if (redo && newdir == dir) {
-					if (pchar == '?') { /* wrap around */
-						el->el_history.eventno =
-						    newdir == ED_SEARCH_PREV_HISTORY ? 0 : 0x7fffffff;
-						if (hist_get(el) == CC_ERROR)
-							/* el->el_history.event
-							 * no was fixed by
-							 * first call */
-							(void) hist_get(el);
-						el->el_line.cursor = newdir ==
-						    ED_SEARCH_PREV_HISTORY ?
-						    el->el_line.lastchar :
-						    el->el_line.buffer;
-					} else
-						el->el_line.cursor +=
-						    newdir ==
-						    ED_SEARCH_PREV_HISTORY ?
-						    -1 : 1;
-				}
-#ifdef ANCHOR
-				el->el_search.patbuf[el->el_search.patlen++] =
-				    '.';
-				el->el_search.patbuf[el->el_search.patlen++] =
-				    '*';
-#endif
-				el->el_search.patbuf[el->el_search.patlen] =
-				    '\0';
-				if (el->el_line.cursor < el->el_line.buffer ||
-				    el->el_line.cursor > el->el_line.lastchar ||
-				    (ret = ce_search_line(el, newdir))
-				    == CC_ERROR) {
-					/* avoid c_setpat */
-					el->el_state.lastcmd =
-					    (el_action_t) newdir;
-					ret = (el_action_t)
-					    (newdir == ED_SEARCH_PREV_HISTORY ?
-					    ed_search_prev_history(el, 0) :
-					    ed_search_next_history(el, 0));
-					if (ret != CC_ERROR) {
-						el->el_line.cursor = newdir ==
-						    ED_SEARCH_PREV_HISTORY ?
-						    el->el_line.lastchar :
-						    el->el_line.buffer;
-						(void) ce_search_line(el,
-						    newdir);
-					}
-				}
-				el->el_search.patlen -= LEN;
-				el->el_search.patbuf[el->el_search.patlen] =
-				    '\0';
-				if (ret == CC_ERROR) {
-					terminal_beep(el);
-					if (el->el_history.eventno !=
-					    ohisteventno) {
-						el->el_history.eventno =
-						    ohisteventno;
-						if (hist_get(el) == CC_ERROR)
-							return CC_ERROR;
-					}
-					el->el_line.cursor = ocursor;
-					pchar = '?';
-				} else {
-					pchar = ':';
-				}
-			}
-			ret = ce_inc_search(el, newdir);
-
-			if (ret == CC_ERROR && pchar == '?' && oldpchar == ':')
-				/*
-				 * break abort of failed search at last
-				 * non-failed
-				 */
-				ret = CC_NORM;
-
-		}
-		if (ret == CC_NORM || (ret == CC_ERROR && oldpatlen == 0)) {
-			/* restore on normal return or error exit */
-			pchar = oldpchar;
-			el->el_search.patlen = oldpatlen;
-			if (el->el_history.eventno != ohisteventno) {
-				el->el_history.eventno = ohisteventno;
-				if (hist_get(el) == CC_ERROR)
-					return CC_ERROR;
-			}
-			el->el_line.cursor = ocursor;
-			if (ret == CC_ERROR)
-				re_refresh(el);
-		}
-		if (done || ret != CC_NORM)
-			return ret;
-	}
-}
-
-
-/* cv_search():
- *	Vi search.
- */
-protected el_action_t
-cv_search(EditLine *el, int dir)
-{
-	Char ch;
-	Char tmpbuf[EL_BUFSIZ];
-	ssize_t tmplen;
-
-#ifdef ANCHOR
-	tmpbuf[0] = '.';
-	tmpbuf[1] = '*';
-#endif
-	tmplen = LEN;
-
-	el->el_search.patdir = dir;
-
-	tmplen = c_gets(el, &tmpbuf[LEN],
-		dir == ED_SEARCH_PREV_HISTORY ? STR("\n/") : STR("\n?") );
-	if (tmplen == -1)
-		return CC_REFRESH;
-
-	tmplen += LEN;
-	ch = tmpbuf[tmplen];
-	tmpbuf[tmplen] = '\0';
-
-	if (tmplen == LEN) {
-		/*
-		 * Use the old pattern, but wild-card it.
-		 */
-		if (el->el_search.patlen == 0) {
-			re_refresh(el);
-			return CC_ERROR;
-		}
-#ifdef ANCHOR
-		if (el->el_search.patbuf[0] != '.' &&
-		    el->el_search.patbuf[0] != '*') {
-			(void) Strncpy(tmpbuf, el->el_search.patbuf,
-			    sizeof(tmpbuf) / sizeof(*tmpbuf) - 1);
-			el->el_search.patbuf[0] = '.';
-			el->el_search.patbuf[1] = '*';
-			(void) Strncpy(&el->el_search.patbuf[2], tmpbuf,
-			    EL_BUFSIZ - 3);
-			el->el_search.patlen++;
-			el->el_search.patbuf[el->el_search.patlen++] = '.';
-			el->el_search.patbuf[el->el_search.patlen++] = '*';
-			el->el_search.patbuf[el->el_search.patlen] = '\0';
-		}
-#endif
-	} else {
-#ifdef ANCHOR
-		tmpbuf[tmplen++] = '.';
-		tmpbuf[tmplen++] = '*';
-#endif
-		tmpbuf[tmplen] = '\0';
-		(void) Strncpy(el->el_search.patbuf, tmpbuf, EL_BUFSIZ - 1);
-		el->el_search.patlen = (size_t)tmplen;
-	}
-	el->el_state.lastcmd = (el_action_t) dir;	/* avoid c_setpat */
-	el->el_line.cursor = el->el_line.lastchar = el->el_line.buffer;
-	if ((dir == ED_SEARCH_PREV_HISTORY ? ed_search_prev_history(el, 0) :
-	    ed_search_next_history(el, 0)) == CC_ERROR) {
-		re_refresh(el);
-		return CC_ERROR;
-	}
-	if (ch == 0033) {
-		re_refresh(el);
-		return ed_newline(el, 0);
-	}
-	return CC_REFRESH;
-}
-
-
-/* ce_search_line():
- *	Look for a pattern inside a line
- */
-protected el_action_t
-ce_search_line(EditLine *el, int dir)
-{
-	Char *cp = el->el_line.cursor;
-	Char *pattern = el->el_search.patbuf;
-	Char oc, *ocp;
-#ifdef ANCHOR
-	ocp = &pattern[1];
-	oc = *ocp;
-	*ocp = '^';
-#else
-	ocp = pattern;
-	oc = *ocp;
-#endif
-
-	if (dir == ED_SEARCH_PREV_HISTORY) {
-		for (; cp >= el->el_line.buffer; cp--) {
-			if (el_match(cp, ocp)) {
-				*ocp = oc;
-				el->el_line.cursor = cp;
-				return CC_NORM;
-			}
-		}
-		*ocp = oc;
-		return CC_ERROR;
-	} else {
-		for (; *cp != '\0' && cp < el->el_line.limit; cp++) {
-			if (el_match(cp, ocp)) {
-				*ocp = oc;
-				el->el_line.cursor = cp;
-				return CC_NORM;
-			}
-		}
-		*ocp = oc;
-		return CC_ERROR;
-	}
-}
-
-
-/* cv_repeat_srch():
- *	Vi repeat search
- */
-protected el_action_t
-cv_repeat_srch(EditLine *el, Int c)
-{
-
-#ifdef SDEBUG
-	(void) fprintf(el->el_errfile, "dir %d patlen %d patbuf %s\n",
-	    c, el->el_search.patlen, ct_encode_string(el->el_search.patbuf));
-#endif
-
-	el->el_state.lastcmd = (el_action_t) c;	/* Hack to stop c_setpat */
-	el->el_line.lastchar = el->el_line.buffer;
-
-	switch (c) {
-	case ED_SEARCH_NEXT_HISTORY:
-		return ed_search_next_history(el, 0);
-	case ED_SEARCH_PREV_HISTORY:
-		return ed_search_prev_history(el, 0);
-	default:
-		return CC_ERROR;
-	}
-}
-
-
-/* cv_csearch():
- *	Vi character search
- */
-protected el_action_t
-cv_csearch(EditLine *el, int direction, Int ch, int count, int tflag)
-{
-	Char *cp;
-
-	if (ch == 0)
-		return CC_ERROR;
-
-	if (ch == (Int)-1) {
-		Char c;
-		if (FUN(el,getc)(el, &c) != 1)
-			return ed_end_of_file(el, 0);
-		ch = c;
-	}
-
-	/* Save for ';' and ',' commands */
-	el->el_search.chacha = ch;
-	el->el_search.chadir = direction;
-	el->el_search.chatflg = (char)tflag;
-
-	cp = el->el_line.cursor;
-	while (count--) {
-		if ((Int)*cp == ch)
-			cp += direction;
-		for (;;cp += direction) {
-			if (cp >= el->el_line.lastchar)
-				return CC_ERROR;
-			if (cp < el->el_line.buffer)
-				return CC_ERROR;
-			if ((Int)*cp == ch)
-				break;
-		}
-	}
-
-	if (tflag)
-		cp -= direction;
-
-	el->el_line.cursor = cp;
-
-	if (el->el_chared.c_vcmd.action != NOP) {
-		if (direction > 0)
-			el->el_line.cursor++;
-		cv_delfini(el);
-		return CC_REFRESH;
-	}
-	return CC_CURSOR;
-}
diff --git a/lib/libedit/search.h b/lib/libedit/search.h
deleted file mode 100644
index d9f27e561..000000000
--- a/lib/libedit/search.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: search.h,v 1.9 2009/12/30 22:37:40 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)search.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.search.h: Line and history searching utilities
- */
-#ifndef _h_el_search
-#define	_h_el_search
-
-#include "histedit.h"
-
-typedef struct el_search_t {
-	Char	*patbuf;		/* The pattern buffer		*/
-	size_t	 patlen;		/* Length of the pattern buffer	*/
-	int	 patdir;		/* Direction of the last search	*/
-	int	 chadir;		/* Character search direction	*/
-	Char	 chacha;		/* Character we are looking for	*/
-	char	 chatflg;		/* 0 if f, 1 if t */
-} el_search_t;
-
-
-protected int		el_match(const Char *, const Char *);
-protected int		search_init(EditLine *);
-protected void		search_end(EditLine *);
-protected int		c_hmatch(EditLine *, const Char *);
-protected void		c_setpat(EditLine *);
-protected el_action_t	ce_inc_search(EditLine *, int);
-protected el_action_t	cv_search(EditLine *, int);
-protected el_action_t	ce_search_line(EditLine *, int);
-protected el_action_t	cv_repeat_srch(EditLine *, Int);
-protected el_action_t	cv_csearch(EditLine *, int, Int, int, int);
-
-#endif /* _h_el_search */
diff --git a/lib/libedit/shlib_version b/lib/libedit/shlib_version
deleted file mode 100644
index 303609d26..000000000
--- a/lib/libedit/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.19 2013/01/22 20:23:21 christos Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=3
-minor=1
diff --git a/lib/libedit/sig.c b/lib/libedit/sig.c
deleted file mode 100644
index a5a8a895e..000000000
--- a/lib/libedit/sig.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*	$NetBSD: sig.c,v 1.17 2011/07/28 20:50:55 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)sig.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: sig.c,v 1.17 2011/07/28 20:50:55 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * sig.c: Signal handling stuff.
- *	  our policy is to trap all signals, set a good state
- *	  and pass the ball to our caller.
- */
-#include "el.h"
-#include <stdlib.h>
-
-private EditLine *sel = NULL;
-
-private const int sighdl[] = {
-#define	_DO(a)	(a),
-	ALLSIGS
-#undef	_DO
-	- 1
-};
-
-private void sig_handler(int);
-
-/* sig_handler():
- *	This is the handler called for all signals
- *	XXX: we cannot pass any data so we just store the old editline
- *	state in a private variable
- */
-private void
-sig_handler(int signo)
-{
-	int i;
-	sigset_t nset, oset;
-
-	(void) sigemptyset(&nset);
-	(void) sigaddset(&nset, signo);
-	(void) sigprocmask(SIG_BLOCK, &nset, &oset);
-
-	sel->el_signal->sig_no = signo;
-
-	switch (signo) {
-	case SIGCONT:
-		tty_rawmode(sel);
-		if (ed_redisplay(sel, 0) == CC_REFRESH)
-			re_refresh(sel);
-		terminal__flush(sel);
-		break;
-
-	case SIGWINCH:
-		el_resize(sel);
-		break;
-
-	default:
-		tty_cookedmode(sel);
-		break;
-	}
-
-	for (i = 0; sighdl[i] != -1; i++)
-		if (signo == sighdl[i])
-			break;
-
-	(void) sigaction(signo, &sel->el_signal->sig_action[i], NULL);
-	sel->el_signal->sig_action[i].sa_handler = SIG_ERR;
-	sel->el_signal->sig_action[i].sa_flags = 0;
-	sigemptyset(&sel->el_signal->sig_action[i].sa_mask);
-	(void) sigprocmask(SIG_SETMASK, &oset, NULL);
-	(void) kill(0, signo);
-}
-
-
-/* sig_init():
- *	Initialize all signal stuff
- */
-protected int
-sig_init(EditLine *el)
-{
-	size_t i;
-	sigset_t *nset, oset;
-
-	el->el_signal = el_malloc(sizeof(*el->el_signal));
-	if (el->el_signal == NULL)
-		return -1;
-
-	nset = &el->el_signal->sig_set;
-	(void) sigemptyset(nset);
-#define	_DO(a) (void) sigaddset(nset, a);
-	ALLSIGS
-#undef	_DO
-	(void) sigprocmask(SIG_BLOCK, nset, &oset);
-
-	for (i = 0; sighdl[i] != -1; i++) {
-		el->el_signal->sig_action[i].sa_handler = SIG_ERR;
-		el->el_signal->sig_action[i].sa_flags = 0;
-		sigemptyset(&el->el_signal->sig_action[i].sa_mask);
-	}
-
-	(void) sigprocmask(SIG_SETMASK, &oset, NULL);
-
-	return 0;
-}
-
-
-/* sig_end():
- *	Clear all signal stuff
- */
-protected void
-sig_end(EditLine *el)
-{
-
-	el_free(el->el_signal);
-	el->el_signal = NULL;
-}
-
-
-/* sig_set():
- *	set all the signal handlers
- */
-protected void
-sig_set(EditLine *el)
-{
-	size_t i;
-	sigset_t oset;
-	struct sigaction osa, nsa;
-
-	nsa.sa_handler = sig_handler;
-	nsa.sa_flags = 0;
-	sigemptyset(&nsa.sa_mask);
-
-	(void) sigprocmask(SIG_BLOCK, &el->el_signal->sig_set, &oset);
-
-	for (i = 0; sighdl[i] != -1; i++) {
-		/* This could happen if we get interrupted */
-		if (sigaction(sighdl[i], &nsa, &osa) != -1 &&
-		    osa.sa_handler != sig_handler)
-			el->el_signal->sig_action[i] = osa;
-	}
-	sel = el;
-	(void) sigprocmask(SIG_SETMASK, &oset, NULL);
-}
-
-
-/* sig_clr():
- *	clear all the signal handlers
- */
-protected void
-sig_clr(EditLine *el)
-{
-	size_t i;
-	sigset_t oset;
-
-	(void) sigprocmask(SIG_BLOCK, &el->el_signal->sig_set, &oset);
-
-	for (i = 0; sighdl[i] != -1; i++)
-		if (el->el_signal->sig_action[i].sa_handler != SIG_ERR)
-			(void)sigaction(sighdl[i],
-			    &el->el_signal->sig_action[i], NULL);
-
-	sel = NULL;		/* we are going to die if the handler is
-				 * called */
-	(void)sigprocmask(SIG_SETMASK, &oset, NULL);
-}
diff --git a/lib/libedit/sig.h b/lib/libedit/sig.h
deleted file mode 100644
index c957cfdf5..000000000
--- a/lib/libedit/sig.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: sig.h,v 1.8 2009/02/19 15:20:22 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)sig.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.sig.h: Signal handling functions
- */
-#ifndef _h_el_sig
-#define	_h_el_sig
-
-#include <signal.h>
-
-#include "histedit.h"
-
-/*
- * Define here all the signals we are going to handle
- * The _DO macro is used to iterate in the source code
- */
-#define	ALLSIGS		\
-	_DO(SIGINT)	\
-	_DO(SIGTSTP)	\
-	_DO(SIGQUIT)	\
-	_DO(SIGHUP)	\
-	_DO(SIGTERM)	\
-	_DO(SIGCONT)	\
-	_DO(SIGWINCH)
-#define ALLSIGSNO	7
-
-typedef struct {
-	struct sigaction sig_action[ALLSIGSNO];
-	sigset_t sig_set;
-	volatile sig_atomic_t sig_no;
-} *el_signal_t;
-
-protected void	sig_end(EditLine*);
-protected int	sig_init(EditLine*);
-protected void	sig_set(EditLine*);
-protected void	sig_clr(EditLine*);
-
-#endif /* _h_el_sig */
diff --git a/lib/libedit/sys.h b/lib/libedit/sys.h
deleted file mode 100644
index 690e1354b..000000000
--- a/lib/libedit/sys.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*	$NetBSD: sys.h,v 1.17 2011/09/28 14:08:04 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)sys.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * sys.h: Put all the stupid compiler and system dependencies here...
- */
-#ifndef _h_sys
-#define	_h_sys
-
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-
-#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__)  || __GNUC__ == 2 && __GNUC_MINOR__ < 8)
-# define __attribute__(A)
-#endif
-
-#ifndef __BEGIN_DECLS
-# ifdef  __cplusplus
-#  define __BEGIN_DECLS  extern "C" {
-#  define __END_DECLS    }
-# else
-#  define __BEGIN_DECLS
-#  define __END_DECLS
-# endif
-#endif
- 
-#ifndef public
-# define public		/* Externally visible functions/variables */
-#endif
-
-#ifndef private
-# define private	static	/* Always hidden internals */
-#endif
-
-#ifndef protected
-# define protected	/* Redefined from elsewhere to "static" */
-			/* When we want to hide everything	*/
-#endif
-
-#ifndef __arraycount
-# define __arraycount(a) (sizeof(a) / sizeof(*(a)))
-#endif
-
-#include <stdio.h>
-
-#ifndef HAVE_STRLCAT
-#define	strlcat libedit_strlcat
-size_t	strlcat(char *dst, const char *src, size_t size);
-#endif
-
-#ifndef HAVE_STRLCPY
-#define	strlcpy libedit_strlcpy
-size_t	strlcpy(char *dst, const char *src, size_t size);
-#endif
-
-#ifndef HAVE_FGETLN
-#define	fgetln libedit_fgetln
-char	*fgetln(FILE *fp, size_t *len);
-#endif
-
-#ifndef HAVE_WCSDUP
-#include <wchar.h>
-wchar_t *wcsdup(const wchar_t *);
-#endif
-
-#ifndef _DIAGASSERT
-#define _DIAGASSERT(x)
-#endif
-
-#ifndef __RCSID
-#define __RCSID(x)
-#endif
-
-#ifndef HAVE_U_INT32_T
-typedef unsigned int	u_int32_t;
-#endif
-
-#ifndef SIZE_T_MAX
-#define SIZE_T_MAX	((size_t)-1)
-#endif
-
-#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
-
-#endif /* _h_sys */
diff --git a/lib/libedit/terminal.c b/lib/libedit/terminal.c
deleted file mode 100644
index c4a2543e4..000000000
--- a/lib/libedit/terminal.c
+++ /dev/null
@@ -1,1673 +0,0 @@
-/*	$NetBSD: terminal.c,v 1.14 2012/05/30 18:21:14 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)term.c	8.2 (Berkeley) 4/30/95";
-#else
-__RCSID("$NetBSD: terminal.c,v 1.14 2012/05/30 18:21:14 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * terminal.c: Editor/termcap-curses interface
- *	       We have to declare a static variable here, since the
- *	       termcap putchar routine does not take an argument!
- */
-#include <stdio.h>
-#include <signal.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <limits.h>
-#ifdef HAVE_TERMCAP_H
-#include <termcap.h>
-#endif
-#ifdef HAVE_CURSES_H
-#include <curses.h>
-#elif HAVE_NCURSES_H
-#include <ncurses.h>
-#endif
-
-/* Solaris's term.h does horrid things. */
-#if defined(HAVE_TERM_H) && !defined(__sun) && !defined(HAVE_TERMCAP_H)
-#include <term.h>
-#endif
- 
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#ifdef _REENTRANT
-#include <pthread.h>
-#endif
-
-#include "el.h"
-
-/*
- * IMPORTANT NOTE: these routines are allowed to look at the current screen
- * and the current position assuming that it is correct.  If this is not
- * true, then the update will be WRONG!  This is (should be) a valid
- * assumption...
- */
-
-#define	TC_BUFSIZE	((size_t)2048)
-
-#define	GoodStr(a)	(el->el_terminal.t_str[a] != NULL && \
-			    el->el_terminal.t_str[a][0] != '\0')
-#define	Str(a)		el->el_terminal.t_str[a]
-#define	Val(a)		el->el_terminal.t_val[a]
-
-private const struct termcapstr {
-	const char *name;
-	const char *long_name;
-} tstr[] = {
-#define	T_al	0
-	{ "al", "add new blank line" },
-#define	T_bl	1
-	{ "bl", "audible bell" },
-#define	T_cd	2
-	{ "cd", "clear to bottom" },
-#define	T_ce	3
-	{ "ce", "clear to end of line" },
-#define	T_ch	4
-	{ "ch", "cursor to horiz pos" },
-#define	T_cl	5
-	{ "cl", "clear screen" },
-#define	T_dc	6
-	{ "dc", "delete a character" },
-#define	T_dl	7
-	{ "dl", "delete a line" },
-#define	T_dm	8
-	{ "dm", "start delete mode" },
-#define	T_ed	9
-	{ "ed", "end delete mode" },
-#define	T_ei	10
-	{ "ei", "end insert mode" },
-#define	T_fs	11
-	{ "fs", "cursor from status line" },
-#define	T_ho	12
-	{ "ho", "home cursor" },
-#define	T_ic	13
-	{ "ic", "insert character" },
-#define	T_im	14
-	{ "im", "start insert mode" },
-#define	T_ip	15
-	{ "ip", "insert padding" },
-#define	T_kd	16
-	{ "kd", "sends cursor down" },
-#define	T_kl	17
-	{ "kl", "sends cursor left" },
-#define	T_kr	18
-	{ "kr", "sends cursor right" },
-#define	T_ku	19
-	{ "ku", "sends cursor up" },
-#define	T_md	20
-	{ "md", "begin bold" },
-#define	T_me	21
-	{ "me", "end attributes" },
-#define	T_nd	22
-	{ "nd", "non destructive space" },
-#define	T_se	23
-	{ "se", "end standout" },
-#define	T_so	24
-	{ "so", "begin standout" },
-#define	T_ts	25
-	{ "ts", "cursor to status line" },
-#define	T_up	26
-	{ "up", "cursor up one" },
-#define	T_us	27
-	{ "us", "begin underline" },
-#define	T_ue	28
-	{ "ue", "end underline" },
-#define	T_vb	29
-	{ "vb", "visible bell" },
-#define	T_DC	30
-	{ "DC", "delete multiple chars" },
-#define	T_DO	31
-	{ "DO", "cursor down multiple" },
-#define	T_IC	32
-	{ "IC", "insert multiple chars" },
-#define	T_LE	33
-	{ "LE", "cursor left multiple" },
-#define	T_RI	34
-	{ "RI", "cursor right multiple" },
-#define	T_UP	35
-	{ "UP", "cursor up multiple" },
-#define	T_kh	36
-	{ "kh", "send cursor home" },
-#define	T_at7	37
-	{ "@7", "send cursor end" },
-#define	T_kD	38
-	{ "kD", "send cursor delete" },
-#define	T_str	39
-	{ NULL, NULL }
-};
-
-private const struct termcapval {
-	const char *name;
-	const char *long_name;
-} tval[] = {
-#define	T_am	0
-	{ "am", "has automatic margins" },
-#define	T_pt	1
-	{ "pt", "has physical tabs" },
-#define	T_li	2
-	{ "li", "Number of lines" },
-#define	T_co	3
-	{ "co", "Number of columns" },
-#define	T_km	4
-	{ "km", "Has meta key" },
-#define	T_xt	5
-	{ "xt", "Tab chars destructive" },
-#define	T_xn	6
-	{ "xn", "newline ignored at right margin" },
-#define	T_MT	7
-	{ "MT", "Has meta key" },			/* XXX? */
-#define	T_val	8
-	{ NULL, NULL, }
-};
-/* do two or more of the attributes use me */
-
-private void	terminal_setflags(EditLine *);
-private int	terminal_rebuffer_display(EditLine *);
-private void	terminal_free_display(EditLine *);
-private int	terminal_alloc_display(EditLine *);
-private void	terminal_alloc(EditLine *, const struct termcapstr *,
-    const char *);
-private void	terminal_init_arrow(EditLine *);
-private void	terminal_reset_arrow(EditLine *);
-private int	terminal_putc(int);
-private void	terminal_tputs(EditLine *, const char *, int);
-
-#ifdef _REENTRANT
-private pthread_mutex_t terminal_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
-private FILE *terminal_outfile = NULL;
-
-
-/* terminal_setflags():
- *	Set the terminal capability flags
- */
-private void
-terminal_setflags(EditLine *el)
-{
-	EL_FLAGS = 0;
-	if (el->el_tty.t_tabs)
-		EL_FLAGS |= (Val(T_pt) && !Val(T_xt)) ? TERM_CAN_TAB : 0;
-
-	EL_FLAGS |= (Val(T_km) || Val(T_MT)) ? TERM_HAS_META : 0;
-	EL_FLAGS |= GoodStr(T_ce) ? TERM_CAN_CEOL : 0;
-	EL_FLAGS |= (GoodStr(T_dc) || GoodStr(T_DC)) ? TERM_CAN_DELETE : 0;
-	EL_FLAGS |= (GoodStr(T_im) || GoodStr(T_ic) || GoodStr(T_IC)) ?
-	    TERM_CAN_INSERT : 0;
-	EL_FLAGS |= (GoodStr(T_up) || GoodStr(T_UP)) ? TERM_CAN_UP : 0;
-	EL_FLAGS |= Val(T_am) ? TERM_HAS_AUTO_MARGINS : 0;
-	EL_FLAGS |= Val(T_xn) ? TERM_HAS_MAGIC_MARGINS : 0;
-
-	if (GoodStr(T_me) && GoodStr(T_ue))
-		EL_FLAGS |= (strcmp(Str(T_me), Str(T_ue)) == 0) ?
-		    TERM_CAN_ME : 0;
-	else
-		EL_FLAGS &= ~TERM_CAN_ME;
-	if (GoodStr(T_me) && GoodStr(T_se))
-		EL_FLAGS |= (strcmp(Str(T_me), Str(T_se)) == 0) ?
-		    TERM_CAN_ME : 0;
-
-
-#ifdef DEBUG_SCREEN
-	if (!EL_CAN_UP) {
-		(void) fprintf(el->el_errfile,
-		    "WARNING: Your terminal cannot move up.\n");
-		(void) fprintf(el->el_errfile,
-		    "Editing may be odd for long lines.\n");
-	}
-	if (!EL_CAN_CEOL)
-		(void) fprintf(el->el_errfile, "no clear EOL capability.\n");
-	if (!EL_CAN_DELETE)
-		(void) fprintf(el->el_errfile, "no delete char capability.\n");
-	if (!EL_CAN_INSERT)
-		(void) fprintf(el->el_errfile, "no insert char capability.\n");
-#endif /* DEBUG_SCREEN */
-}
-
-/* terminal_init():
- *	Initialize the terminal stuff
- */
-protected int
-terminal_init(EditLine *el)
-{
-
-	el->el_terminal.t_buf = el_malloc(TC_BUFSIZE *
-	    sizeof(*el->el_terminal.t_buf));
-	if (el->el_terminal.t_buf == NULL)
-		return -1;
-	el->el_terminal.t_cap = el_malloc(TC_BUFSIZE *
-	    sizeof(*el->el_terminal.t_cap));
-	if (el->el_terminal.t_cap == NULL)
-		return -1;
-	el->el_terminal.t_fkey = el_malloc(A_K_NKEYS *
-	    sizeof(*el->el_terminal.t_fkey));
-	if (el->el_terminal.t_fkey == NULL)
-		return -1;
-	el->el_terminal.t_loc = 0;
-	el->el_terminal.t_str = el_malloc(T_str *
-	    sizeof(*el->el_terminal.t_str));
-	if (el->el_terminal.t_str == NULL)
-		return -1;
-	(void) memset(el->el_terminal.t_str, 0, T_str *
-	    sizeof(*el->el_terminal.t_str));
-	el->el_terminal.t_val = el_malloc(T_val *
-	    sizeof(*el->el_terminal.t_val));
-	if (el->el_terminal.t_val == NULL)
-		return -1;
-	(void) memset(el->el_terminal.t_val, 0, T_val *
-	    sizeof(*el->el_terminal.t_val));
-	(void) terminal_set(el, NULL);
-	terminal_init_arrow(el);
-	return 0;
-}
-
-/* terminal_end():
- *	Clean up the terminal stuff
- */
-protected void
-terminal_end(EditLine *el)
-{
-
-	el_free(el->el_terminal.t_buf);
-	el->el_terminal.t_buf = NULL;
-	el_free(el->el_terminal.t_cap);
-	el->el_terminal.t_cap = NULL;
-	el->el_terminal.t_loc = 0;
-	el_free(el->el_terminal.t_str);
-	el->el_terminal.t_str = NULL;
-	el_free(el->el_terminal.t_val);
-	el->el_terminal.t_val = NULL;
-	el_free(el->el_terminal.t_fkey);
-	el->el_terminal.t_fkey = NULL;
-	terminal_free_display(el);
-}
-
-
-/* terminal_alloc():
- *	Maintain a string pool for termcap strings
- */
-private void
-terminal_alloc(EditLine *el, const struct termcapstr *t, const char *cap)
-{
-	char termbuf[TC_BUFSIZE];
-	size_t tlen, clen;
-	char **tlist = el->el_terminal.t_str;
-	char **tmp, **str = &tlist[t - tstr];
-
-	(void) memset(termbuf, 0, sizeof(termbuf));
-	if (cap == NULL || *cap == '\0') {
-		*str = NULL;
-		return;
-	} else
-		clen = strlen(cap);
-
-	tlen = *str == NULL ? 0 : strlen(*str);
-
-	/*
-         * New string is shorter; no need to allocate space
-         */
-	if (clen <= tlen) {
-		if (*str)
-			(void) strcpy(*str, cap);	/* XXX strcpy is safe */
-		return;
-	}
-	/*
-         * New string is longer; see if we have enough space to append
-         */
-	if (el->el_terminal.t_loc + 3 < TC_BUFSIZE) {
-						/* XXX strcpy is safe */
-		(void) strcpy(*str = &el->el_terminal.t_buf[
-		    el->el_terminal.t_loc], cap);
-		el->el_terminal.t_loc += clen + 1;	/* one for \0 */
-		return;
-	}
-	/*
-         * Compact our buffer; no need to check compaction, cause we know it
-         * fits...
-         */
-	tlen = 0;
-	for (tmp = tlist; tmp < &tlist[T_str]; tmp++)
-		if (*tmp != NULL && *tmp != '\0' && *tmp != *str) {
-			char *ptr;
-
-			for (ptr = *tmp; *ptr != '\0'; termbuf[tlen++] = *ptr++)
-				continue;
-			termbuf[tlen++] = '\0';
-		}
-	memcpy(el->el_terminal.t_buf, termbuf, TC_BUFSIZE);
-	el->el_terminal.t_loc = tlen;
-	if (el->el_terminal.t_loc + 3 >= TC_BUFSIZE) {
-		(void) fprintf(el->el_errfile,
-		    "Out of termcap string space.\n");
-		return;
-	}
-					/* XXX strcpy is safe */
-	(void) strcpy(*str = &el->el_terminal.t_buf[el->el_terminal.t_loc],
-	    cap);
-	el->el_terminal.t_loc += (size_t)clen + 1;	/* one for \0 */
-	return;
-}
-
-
-/* terminal_rebuffer_display():
- *	Rebuffer the display after the screen changed size
- */
-private int
-terminal_rebuffer_display(EditLine *el)
-{
-	coord_t *c = &el->el_terminal.t_size;
-
-	terminal_free_display(el);
-
-	c->h = Val(T_co);
-	c->v = Val(T_li);
-
-	if (terminal_alloc_display(el) == -1)
-		return -1;
-	return 0;
-}
-
-
-/* terminal_alloc_display():
- *	Allocate a new display.
- */
-private int
-terminal_alloc_display(EditLine *el)
-{
-	int i;
-	Char **b;
-	coord_t *c = &el->el_terminal.t_size;
-
-	b =  el_malloc(sizeof(*b) * (size_t)(c->v + 1));
-	if (b == NULL)
-		return -1;
-	for (i = 0; i < c->v; i++) {
-		b[i] = el_malloc(sizeof(**b) * (size_t)(c->h + 1));
-		if (b[i] == NULL) {
-			while (--i >= 0)
-				el_free(b[i]);
-			el_free(b);
-			return -1;
-		}
-	}
-	b[c->v] = NULL;
-	el->el_display = b;
-
-	b = el_malloc(sizeof(*b) * (size_t)(c->v + 1));
-	if (b == NULL)
-		return -1;
-	for (i = 0; i < c->v; i++) {
-		b[i] = el_malloc(sizeof(**b) * (size_t)(c->h + 1));
-		if (b[i] == NULL) {
-			while (--i >= 0)
-				el_free(b[i]);
-			el_free(b);
-			return -1;
-		}
-	}
-	b[c->v] = NULL;
-	el->el_vdisplay = b;
-	return 0;
-}
-
-
-/* terminal_free_display():
- *	Free the display buffers
- */
-private void
-terminal_free_display(EditLine *el)
-{
-	Char **b;
-	Char **bufp;
-
-	b = el->el_display;
-	el->el_display = NULL;
-	if (b != NULL) {
-		for (bufp = b; *bufp != NULL; bufp++)
-			el_free(*bufp);
-		el_free(b);
-	}
-	b = el->el_vdisplay;
-	el->el_vdisplay = NULL;
-	if (b != NULL) {
-		for (bufp = b; *bufp != NULL; bufp++)
-			el_free(*bufp);
-		el_free(b);
-	}
-}
-
-
-/* terminal_move_to_line():
- *	move to line <where> (first line == 0)
- * 	as efficiently as possible
- */
-protected void
-terminal_move_to_line(EditLine *el, int where)
-{
-	int del;
-
-	if (where == el->el_cursor.v)
-		return;
-
-	if (where > el->el_terminal.t_size.v) {
-#ifdef DEBUG_SCREEN
-		(void) fprintf(el->el_errfile,
-		    "terminal_move_to_line: where is ridiculous: %d\r\n",
-		    where);
-#endif /* DEBUG_SCREEN */
-		return;
-	}
-	if ((del = where - el->el_cursor.v) > 0) {
-		while (del > 0) {
-			if (EL_HAS_AUTO_MARGINS &&
-			    el->el_display[el->el_cursor.v][0] != '\0') {
-                                size_t h = (size_t)
-				    (el->el_terminal.t_size.h - 1);
-#ifdef WIDECHAR
-                                for (; h > 0 &&
-                                         el->el_display[el->el_cursor.v][h] ==
-                                                 MB_FILL_CHAR;
-                                         h--)
-                                                continue;
-#endif
-				/* move without newline */
-				terminal_move_to_char(el, (int)h);
-				terminal_overwrite(el, &el->el_display
-				    [el->el_cursor.v][el->el_cursor.h],
-				    (size_t)(el->el_terminal.t_size.h -
-				    el->el_cursor.h));
-				/* updates Cursor */
-				del--;
-			} else {
-				if ((del > 1) && GoodStr(T_DO)) {
-					terminal_tputs(el, tgoto(Str(T_DO), del,
-					    del), del);
-					del = 0;
-				} else {
-					for (; del > 0; del--)
-						terminal__putc(el, '\n');
-					/* because the \n will become \r\n */
-					el->el_cursor.h = 0;
-				}
-			}
-		}
-	} else {		/* del < 0 */
-		if (GoodStr(T_UP) && (-del > 1 || !GoodStr(T_up)))
-			terminal_tputs(el, tgoto(Str(T_UP), -del, -del), -del);
-		else {
-			if (GoodStr(T_up))
-				for (; del < 0; del++)
-					terminal_tputs(el, Str(T_up), 1);
-		}
-	}
-	el->el_cursor.v = where;/* now where is here */
-}
-
-
-/* terminal_move_to_char():
- *	Move to the character position specified
- */
-protected void
-terminal_move_to_char(EditLine *el, int where)
-{
-	int del, i;
-
-mc_again:
-	if (where == el->el_cursor.h)
-		return;
-
-	if (where > el->el_terminal.t_size.h) {
-#ifdef DEBUG_SCREEN
-		(void) fprintf(el->el_errfile,
-		    "terminal_move_to_char: where is riduculous: %d\r\n",
-		    where);
-#endif /* DEBUG_SCREEN */
-		return;
-	}
-	if (!where) {		/* if where is first column */
-		terminal__putc(el, '\r');	/* do a CR */
-		el->el_cursor.h = 0;
-		return;
-	}
-	del = where - el->el_cursor.h;
-
-	if ((del < -4 || del > 4) && GoodStr(T_ch))
-		/* go there directly */
-		terminal_tputs(el, tgoto(Str(T_ch), where, where), where);
-	else {
-		if (del > 0) {	/* moving forward */
-			if ((del > 4) && GoodStr(T_RI))
-				terminal_tputs(el, tgoto(Str(T_RI), del, del),
-				    del);
-			else {
-					/* if I can do tabs, use them */
-				if (EL_CAN_TAB) {
-					if ((el->el_cursor.h & 0370) !=
-					    (where & ~0x7)
-#ifdef WIDECHAR
-					    && (el->el_display[
-					    el->el_cursor.v][where & 0370] !=
-					    MB_FILL_CHAR)
-#endif
-					    ) {
-						/* if not within tab stop */
-						for (i =
-						    (el->el_cursor.h & 0370);
-						    i < (where & ~0x7);
-						    i += 8)
-							terminal__putc(el,
-							    '\t');	
-							/* then tab over */
-						el->el_cursor.h = where & ~0x7;
-					}
-				}
-				/*
-				 * it's usually cheaper to just write the
-				 * chars, so we do.
-				 */
-				/*
-				 * NOTE THAT terminal_overwrite() WILL CHANGE
-				 * el->el_cursor.h!!!
-				 */
-				terminal_overwrite(el, &el->el_display[
-				    el->el_cursor.v][el->el_cursor.h],
-				    (size_t)(where - el->el_cursor.h));
-
-			}
-		} else {	/* del < 0 := moving backward */
-			if ((-del > 4) && GoodStr(T_LE))
-				terminal_tputs(el, tgoto(Str(T_LE), -del, -del),
-				    -del);
-			else {	/* can't go directly there */
-				/*
-				 * if the "cost" is greater than the "cost"
-				 * from col 0
-				 */
-				if (EL_CAN_TAB ?
-				    ((unsigned int)-del >
-				    (((unsigned int) where >> 3) +
-				     (where & 07)))
-				    : (-del > where)) {
-					terminal__putc(el, '\r');/* do a CR */
-					el->el_cursor.h = 0;
-					goto mc_again;	/* and try again */
-				}
-				for (i = 0; i < -del; i++)
-					terminal__putc(el, '\b');
-			}
-		}
-	}
-	el->el_cursor.h = where;		/* now where is here */
-}
-
-
-/* terminal_overwrite():
- *	Overstrike num characters
- *	Assumes MB_FILL_CHARs are present to keep the column count correct
- */
-protected void
-terminal_overwrite(EditLine *el, const Char *cp, size_t n)
-{
-	if (n == 0)
-		return;
-
-	if (n > (size_t)el->el_terminal.t_size.h) {
-#ifdef DEBUG_SCREEN
-		(void) fprintf(el->el_errfile,
-		    "terminal_overwrite: n is riduculous: %d\r\n", n);
-#endif /* DEBUG_SCREEN */
-		return;
-	}
-
-        do {
-                /* terminal__putc() ignores any MB_FILL_CHARs */
-                terminal__putc(el, *cp++);
-                el->el_cursor.h++;
-        } while (--n);
-
-	if (el->el_cursor.h >= el->el_terminal.t_size.h) {	/* wrap? */
-		if (EL_HAS_AUTO_MARGINS) {	/* yes */
-			el->el_cursor.h = 0;
-			el->el_cursor.v++;
-			if (EL_HAS_MAGIC_MARGINS) {
-				/* force the wrap to avoid the "magic"
-				 * situation */
-				Char c;
-				if ((c = el->el_display[el->el_cursor.v]
-				    [el->el_cursor.h]) != '\0') {
-					terminal_overwrite(el, &c, (size_t)1);
-#ifdef WIDECHAR
-					while (el->el_display[el->el_cursor.v]
-					    [el->el_cursor.h] == MB_FILL_CHAR)
-						el->el_cursor.h++;
-#endif
-				} else {
-					terminal__putc(el, ' ');
-					el->el_cursor.h = 1;
-				}
-			}
-		} else		/* no wrap, but cursor stays on screen */
-			el->el_cursor.h = el->el_terminal.t_size.h - 1;
-	}
-}
-
-
-/* terminal_deletechars():
- *	Delete num characters
- */
-protected void
-terminal_deletechars(EditLine *el, int num)
-{
-	if (num <= 0)
-		return;
-
-	if (!EL_CAN_DELETE) {
-#ifdef DEBUG_EDIT
-		(void) fprintf(el->el_errfile, "   ERROR: cannot delete   \n");
-#endif /* DEBUG_EDIT */
-		return;
-	}
-	if (num > el->el_terminal.t_size.h) {
-#ifdef DEBUG_SCREEN
-		(void) fprintf(el->el_errfile,
-		    "terminal_deletechars: num is riduculous: %d\r\n", num);
-#endif /* DEBUG_SCREEN */
-		return;
-	}
-	if (GoodStr(T_DC))	/* if I have multiple delete */
-		if ((num > 1) || !GoodStr(T_dc)) {	/* if dc would be more
-							 * expen. */
-			terminal_tputs(el, tgoto(Str(T_DC), num, num), num);
-			return;
-		}
-	if (GoodStr(T_dm))	/* if I have delete mode */
-		terminal_tputs(el, Str(T_dm), 1);
-
-	if (GoodStr(T_dc))	/* else do one at a time */
-		while (num--)
-			terminal_tputs(el, Str(T_dc), 1);
-
-	if (GoodStr(T_ed))	/* if I have delete mode */
-		terminal_tputs(el, Str(T_ed), 1);
-}
-
-
-/* terminal_insertwrite():
- *	Puts terminal in insert character mode or inserts num
- *	characters in the line
- *      Assumes MB_FILL_CHARs are present to keep column count correct
- */
-protected void
-terminal_insertwrite(EditLine *el, Char *cp, int num)
-{
-	if (num <= 0)
-		return;
-	if (!EL_CAN_INSERT) {
-#ifdef DEBUG_EDIT
-		(void) fprintf(el->el_errfile, "   ERROR: cannot insert   \n");
-#endif /* DEBUG_EDIT */
-		return;
-	}
-	if (num > el->el_terminal.t_size.h) {
-#ifdef DEBUG_SCREEN
-		(void) fprintf(el->el_errfile,
-		    "StartInsert: num is riduculous: %d\r\n", num);
-#endif /* DEBUG_SCREEN */
-		return;
-	}
-	if (GoodStr(T_IC))	/* if I have multiple insert */
-		if ((num > 1) || !GoodStr(T_ic)) {
-				/* if ic would be more expensive */
-			terminal_tputs(el, tgoto(Str(T_IC), num, num), num);
-			terminal_overwrite(el, cp, (size_t)num);
-				/* this updates el_cursor.h */
-			return;
-		}
-	if (GoodStr(T_im) && GoodStr(T_ei)) {	/* if I have insert mode */
-		terminal_tputs(el, Str(T_im), 1);
-
-		el->el_cursor.h += num;
-		do
-			terminal__putc(el, *cp++);
-		while (--num);
-
-		if (GoodStr(T_ip))	/* have to make num chars insert */
-			terminal_tputs(el, Str(T_ip), 1);
-
-		terminal_tputs(el, Str(T_ei), 1);
-		return;
-	}
-	do {
-		if (GoodStr(T_ic))	/* have to make num chars insert */
-			terminal_tputs(el, Str(T_ic), 1);
-
-		terminal__putc(el, *cp++);
-
-		el->el_cursor.h++;
-
-		if (GoodStr(T_ip))	/* have to make num chars insert */
-			terminal_tputs(el, Str(T_ip), 1);
-					/* pad the inserted char */
-
-	} while (--num);
-}
-
-
-/* terminal_clear_EOL():
- *	clear to end of line.  There are num characters to clear
- */
-protected void
-terminal_clear_EOL(EditLine *el, int num)
-{
-	int i;
-
-	if (EL_CAN_CEOL && GoodStr(T_ce))
-		terminal_tputs(el, Str(T_ce), 1);
-	else {
-		for (i = 0; i < num; i++)
-			terminal__putc(el, ' ');
-		el->el_cursor.h += num;	/* have written num spaces */
-	}
-}
-
-
-/* terminal_clear_screen():
- *	Clear the screen
- */
-protected void
-terminal_clear_screen(EditLine *el)
-{				/* clear the whole screen and home */
-
-	if (GoodStr(T_cl))
-		/* send the clear screen code */
-		terminal_tputs(el, Str(T_cl), Val(T_li));
-	else if (GoodStr(T_ho) && GoodStr(T_cd)) {
-		terminal_tputs(el, Str(T_ho), Val(T_li));	/* home */
-		/* clear to bottom of screen */
-		terminal_tputs(el, Str(T_cd), Val(T_li));
-	} else {
-		terminal__putc(el, '\r');
-		terminal__putc(el, '\n');
-	}
-}
-
-
-/* terminal_beep():
- *	Beep the way the terminal wants us
- */
-protected void
-terminal_beep(EditLine *el)
-{
-	if (GoodStr(T_bl))
-		/* what termcap says we should use */
-		terminal_tputs(el, Str(T_bl), 1);
-	else
-		terminal__putc(el, '\007');	/* an ASCII bell; ^G */
-}
-
-
-protected void
-terminal_get(EditLine *el, const char **term)
-{
-	*term = el->el_terminal.t_name;
-}
-
-
-/* terminal_set():
- *	Read in the terminal capabilities from the requested terminal
- */
-protected int
-terminal_set(EditLine *el, const char *term)
-{
-	int i;
-	char buf[TC_BUFSIZE];
-	char *area;
-	const struct termcapstr *t;
-	sigset_t oset, nset;
-	int lins, cols;
-
-	(void) sigemptyset(&nset);
-	(void) sigaddset(&nset, SIGWINCH);
-	(void) sigprocmask(SIG_BLOCK, &nset, &oset);
-
-	area = buf;
-
-
-	if (term == NULL)
-		term = getenv("TERM");
-
-	if (!term || !term[0])
-		term = "dumb";
-
-	if (strcmp(term, "emacs") == 0)
-		el->el_flags |= EDIT_DISABLED;
-
-	(void) memset(el->el_terminal.t_cap, 0, TC_BUFSIZE);
-
-	i = tgetent(el->el_terminal.t_cap, term);
-
-	if (i <= 0) {
-		if (i == -1)
-			(void) fprintf(el->el_errfile,
-			    "Cannot read termcap database;\n");
-		else if (i == 0)
-			(void) fprintf(el->el_errfile,
-			    "No entry for terminal type \"%s\";\n", term);
-		(void) fprintf(el->el_errfile,
-		    "using dumb terminal settings.\n");
-		Val(T_co) = 80;	/* do a dumb terminal */
-		Val(T_pt) = Val(T_km) = Val(T_li) = 0;
-		Val(T_xt) = Val(T_MT);
-		for (t = tstr; t->name != NULL; t++)
-			terminal_alloc(el, t, NULL);
-	} else {
-		/* auto/magic margins */
-		Val(T_am) = tgetflag("am");
-		Val(T_xn) = tgetflag("xn");
-		/* Can we tab */
-		Val(T_pt) = tgetflag("pt");
-		Val(T_xt) = tgetflag("xt");
-		/* do we have a meta? */
-		Val(T_km) = tgetflag("km");
-		Val(T_MT) = tgetflag("MT");
-		/* Get the size */
-		Val(T_co) = tgetnum("co");
-		Val(T_li) = tgetnum("li");
-		for (t = tstr; t->name != NULL; t++) {
-			/* XXX: some systems' tgetstr needs non const */
-			terminal_alloc(el, t, tgetstr(strchr(t->name, *t->name),
-			    &area));
-		}
-	}
-
-	if (Val(T_co) < 2)
-		Val(T_co) = 80;	/* just in case */
-	if (Val(T_li) < 1)
-		Val(T_li) = 24;
-
-	el->el_terminal.t_size.v = Val(T_co);
-	el->el_terminal.t_size.h = Val(T_li);
-
-	terminal_setflags(el);
-
-				/* get the correct window size */
-	(void) terminal_get_size(el, &lins, &cols);
-	if (terminal_change_size(el, lins, cols) == -1)
-		return -1;
-	(void) sigprocmask(SIG_SETMASK, &oset, NULL);
-	terminal_bind_arrow(el);
-	el->el_terminal.t_name = term;
-	return i <= 0 ? -1 : 0;
-}
-
-
-/* terminal_get_size():
- *	Return the new window size in lines and cols, and
- *	true if the size was changed.
- */
-protected int
-terminal_get_size(EditLine *el, int *lins, int *cols)
-{
-
-	*cols = Val(T_co);
-	*lins = Val(T_li);
-
-#ifdef TIOCGWINSZ
-	{
-		struct winsize ws;
-		if (ioctl(el->el_infd, TIOCGWINSZ, &ws) != -1) {
-			if (ws.ws_col)
-				*cols = ws.ws_col;
-			if (ws.ws_row)
-				*lins = ws.ws_row;
-		}
-	}
-#endif
-#ifdef TIOCGSIZE
-	{
-		struct ttysize ts;
-		if (ioctl(el->el_infd, TIOCGSIZE, &ts) != -1) {
-			if (ts.ts_cols)
-				*cols = ts.ts_cols;
-			if (ts.ts_lines)
-				*lins = ts.ts_lines;
-		}
-	}
-#endif
-	return Val(T_co) != *cols || Val(T_li) != *lins;
-}
-
-
-/* terminal_change_size():
- *	Change the size of the terminal
- */
-protected int
-terminal_change_size(EditLine *el, int lins, int cols)
-{
-	/*
-         * Just in case
-         */
-	Val(T_co) = (cols < 2) ? 80 : cols;
-	Val(T_li) = (lins < 1) ? 24 : lins;
-
-	/* re-make display buffers */
-	if (terminal_rebuffer_display(el) == -1)
-		return -1;
-	re_clear_display(el);
-	return 0;
-}
-
-
-/* terminal_init_arrow():
- *	Initialize the arrow key bindings from termcap
- */
-private void
-terminal_init_arrow(EditLine *el)
-{
-	funckey_t *arrow = el->el_terminal.t_fkey;
-
-	arrow[A_K_DN].name = STR("down");
-	arrow[A_K_DN].key = T_kd;
-	arrow[A_K_DN].fun.cmd = ED_NEXT_HISTORY;
-	arrow[A_K_DN].type = XK_CMD;
-
-	arrow[A_K_UP].name = STR("up");
-	arrow[A_K_UP].key = T_ku;
-	arrow[A_K_UP].fun.cmd = ED_PREV_HISTORY;
-	arrow[A_K_UP].type = XK_CMD;
-
-	arrow[A_K_LT].name = STR("left");
-	arrow[A_K_LT].key = T_kl;
-	arrow[A_K_LT].fun.cmd = ED_PREV_CHAR;
-	arrow[A_K_LT].type = XK_CMD;
-
-	arrow[A_K_RT].name = STR("right");
-	arrow[A_K_RT].key = T_kr;
-	arrow[A_K_RT].fun.cmd = ED_NEXT_CHAR;
-	arrow[A_K_RT].type = XK_CMD;
-
-	arrow[A_K_HO].name = STR("home");
-	arrow[A_K_HO].key = T_kh;
-	arrow[A_K_HO].fun.cmd = ED_MOVE_TO_BEG;
-	arrow[A_K_HO].type = XK_CMD;
-
-	arrow[A_K_EN].name = STR("end");
-	arrow[A_K_EN].key = T_at7;
-	arrow[A_K_EN].fun.cmd = ED_MOVE_TO_END;
-	arrow[A_K_EN].type = XK_CMD;
-
-	arrow[A_K_DE].name = STR("delete");
-	arrow[A_K_DE].key = T_kD;
-	arrow[A_K_DE].fun.cmd = ED_DELETE_NEXT_CHAR;
-	arrow[A_K_DE].type = XK_CMD;
-}
-
-
-/* terminal_reset_arrow():
- *	Reset arrow key bindings
- */
-private void
-terminal_reset_arrow(EditLine *el)
-{
-	funckey_t *arrow = el->el_terminal.t_fkey;
-	static const Char strA[] = {033, '[', 'A', '\0'};
-	static const Char strB[] = {033, '[', 'B', '\0'};
-	static const Char strC[] = {033, '[', 'C', '\0'};
-	static const Char strD[] = {033, '[', 'D', '\0'};
-	static const Char strH[] = {033, '[', 'H', '\0'};
-	static const Char strF[] = {033, '[', 'F', '\0'};
-	static const Char stOA[] = {033, 'O', 'A', '\0'};
-	static const Char stOB[] = {033, 'O', 'B', '\0'};
-	static const Char stOC[] = {033, 'O', 'C', '\0'};
-	static const Char stOD[] = {033, 'O', 'D', '\0'};
-	static const Char stOH[] = {033, 'O', 'H', '\0'};
-	static const Char stOF[] = {033, 'O', 'F', '\0'};
-
-	keymacro_add(el, strA, &arrow[A_K_UP].fun, arrow[A_K_UP].type);
-	keymacro_add(el, strB, &arrow[A_K_DN].fun, arrow[A_K_DN].type);
-	keymacro_add(el, strC, &arrow[A_K_RT].fun, arrow[A_K_RT].type);
-	keymacro_add(el, strD, &arrow[A_K_LT].fun, arrow[A_K_LT].type);
-	keymacro_add(el, strH, &arrow[A_K_HO].fun, arrow[A_K_HO].type);
-	keymacro_add(el, strF, &arrow[A_K_EN].fun, arrow[A_K_EN].type);
-	keymacro_add(el, stOA, &arrow[A_K_UP].fun, arrow[A_K_UP].type);
-	keymacro_add(el, stOB, &arrow[A_K_DN].fun, arrow[A_K_DN].type);
-	keymacro_add(el, stOC, &arrow[A_K_RT].fun, arrow[A_K_RT].type);
-	keymacro_add(el, stOD, &arrow[A_K_LT].fun, arrow[A_K_LT].type);
-	keymacro_add(el, stOH, &arrow[A_K_HO].fun, arrow[A_K_HO].type);
-	keymacro_add(el, stOF, &arrow[A_K_EN].fun, arrow[A_K_EN].type);
-
-	if (el->el_map.type != MAP_VI)
-		return;
-	keymacro_add(el, &strA[1], &arrow[A_K_UP].fun, arrow[A_K_UP].type);
-	keymacro_add(el, &strB[1], &arrow[A_K_DN].fun, arrow[A_K_DN].type);
-	keymacro_add(el, &strC[1], &arrow[A_K_RT].fun, arrow[A_K_RT].type);
-	keymacro_add(el, &strD[1], &arrow[A_K_LT].fun, arrow[A_K_LT].type);
-	keymacro_add(el, &strH[1], &arrow[A_K_HO].fun, arrow[A_K_HO].type);
-	keymacro_add(el, &strF[1], &arrow[A_K_EN].fun, arrow[A_K_EN].type);
-	keymacro_add(el, &stOA[1], &arrow[A_K_UP].fun, arrow[A_K_UP].type);
-	keymacro_add(el, &stOB[1], &arrow[A_K_DN].fun, arrow[A_K_DN].type);
-	keymacro_add(el, &stOC[1], &arrow[A_K_RT].fun, arrow[A_K_RT].type);
-	keymacro_add(el, &stOD[1], &arrow[A_K_LT].fun, arrow[A_K_LT].type);
-	keymacro_add(el, &stOH[1], &arrow[A_K_HO].fun, arrow[A_K_HO].type);
-	keymacro_add(el, &stOF[1], &arrow[A_K_EN].fun, arrow[A_K_EN].type);
-}
-
-
-/* terminal_set_arrow():
- *	Set an arrow key binding
- */
-protected int
-terminal_set_arrow(EditLine *el, const Char *name, keymacro_value_t *fun,
-    int type)
-{
-	funckey_t *arrow = el->el_terminal.t_fkey;
-	int i;
-
-	for (i = 0; i < A_K_NKEYS; i++)
-		if (Strcmp(name, arrow[i].name) == 0) {
-			arrow[i].fun = *fun;
-			arrow[i].type = type;
-			return 0;
-		}
-	return -1;
-}
-
-
-/* terminal_clear_arrow():
- *	Clear an arrow key binding
- */
-protected int
-terminal_clear_arrow(EditLine *el, const Char *name)
-{
-	funckey_t *arrow = el->el_terminal.t_fkey;
-	int i;
-
-	for (i = 0; i < A_K_NKEYS; i++)
-		if (Strcmp(name, arrow[i].name) == 0) {
-			arrow[i].type = XK_NOD;
-			return 0;
-		}
-	return -1;
-}
-
-
-/* terminal_print_arrow():
- *	Print the arrow key bindings
- */
-protected void
-terminal_print_arrow(EditLine *el, const Char *name)
-{
-	int i;
-	funckey_t *arrow = el->el_terminal.t_fkey;
-
-	for (i = 0; i < A_K_NKEYS; i++)
-		if (*name == '\0' || Strcmp(name, arrow[i].name) == 0)
-			if (arrow[i].type != XK_NOD)
-				keymacro_kprint(el, arrow[i].name,
-				    &arrow[i].fun, arrow[i].type);
-}
-
-
-/* terminal_bind_arrow():
- *	Bind the arrow keys
- */
-protected void
-terminal_bind_arrow(EditLine *el)
-{
-	el_action_t *map;
-	const el_action_t *dmap;
-	int i, j;
-	char *p;
-	funckey_t *arrow = el->el_terminal.t_fkey;
-
-	/* Check if the components needed are initialized */
-	if (el->el_terminal.t_buf == NULL || el->el_map.key == NULL)
-		return;
-
-	map = el->el_map.type == MAP_VI ? el->el_map.alt : el->el_map.key;
-	dmap = el->el_map.type == MAP_VI ? el->el_map.vic : el->el_map.emacs;
-
-	terminal_reset_arrow(el);
-
-	for (i = 0; i < A_K_NKEYS; i++) {
-		Char wt_str[VISUAL_WIDTH_MAX];
-		Char *px;
-		size_t n;
-
-		p = el->el_terminal.t_str[arrow[i].key];
-		if (!p || !*p)
-			continue;
-		for (n = 0; n < VISUAL_WIDTH_MAX && p[n]; ++n)
-			wt_str[n] = p[n];
-		while (n < VISUAL_WIDTH_MAX)
-			wt_str[n++] = '\0';
-		px = wt_str;
-		j = (unsigned char) *p;
-		/*
-		 * Assign the arrow keys only if:
-		 *
-		 * 1. They are multi-character arrow keys and the user
-		 *    has not re-assigned the leading character, or
-		 *    has re-assigned the leading character to be
-		 *	  ED_SEQUENCE_LEAD_IN
-		 * 2. They are single arrow keys pointing to an
-		 *    unassigned key.
-		 */
-		if (arrow[i].type == XK_NOD)
-			keymacro_clear(el, map, px);
-		else {
-			if (p[1] && (dmap[j] == map[j] ||
-				map[j] == ED_SEQUENCE_LEAD_IN)) {
-				keymacro_add(el, px, &arrow[i].fun,
-				    arrow[i].type);
-				map[j] = ED_SEQUENCE_LEAD_IN;
-			} else if (map[j] == ED_UNASSIGNED) {
-				keymacro_clear(el, map, px);
-				if (arrow[i].type == XK_CMD)
-					map[j] = arrow[i].fun.cmd;
-				else
-					keymacro_add(el, px, &arrow[i].fun,
-					    arrow[i].type);
-			}
-		}
-	}
-}
-
-/* terminal_putc():
- *	Add a character
- */
-private int
-terminal_putc(int c)
-{
-	if (terminal_outfile == NULL)
-		return -1;
-	return fputc(c, terminal_outfile);
-}
-
-private void
-terminal_tputs(EditLine *el, const char *cap, int affcnt)
-{
-#ifdef _REENTRANT
-	pthread_mutex_lock(&terminal_mutex);
-#endif
-	terminal_outfile = el->el_outfile;
-	(void)tputs(cap, affcnt, terminal_putc);
-#ifdef _REENTRANT
-	pthread_mutex_unlock(&terminal_mutex);
-#endif
-}
-
-/* terminal__putc():
- *	Add a character
- */
-protected int
-terminal__putc(EditLine *el, Int c)
-{
-	char buf[MB_LEN_MAX +1];
-	ssize_t i;
-	if (c == (Int)MB_FILL_CHAR)
-		return 0;
-	i = ct_encode_char(buf, (size_t)MB_LEN_MAX, c);
-	if (i <= 0)
-		return (int)i;
-	buf[i] = '\0';
-	return fputs(buf, el->el_outfile);
-}
-
-/* terminal__flush():
- *	Flush output
- */
-protected void
-terminal__flush(EditLine *el)
-{
-
-	(void) fflush(el->el_outfile);
-}
-
-/* terminal_writec():
- *	Write the given character out, in a human readable form
- */
-protected void
-terminal_writec(EditLine *el, Int c)
-{
-	Char visbuf[VISUAL_WIDTH_MAX +1];
-	ssize_t vcnt = ct_visual_char(visbuf, VISUAL_WIDTH_MAX, c);
-	if (vcnt < 0)
-		vcnt = 0;
-	visbuf[vcnt] = '\0';
-	terminal_overwrite(el, visbuf, (size_t)vcnt);
-	terminal__flush(el);
-}
-
-
-/* terminal_telltc():
- *	Print the current termcap characteristics
- */
-protected int
-/*ARGSUSED*/
-terminal_telltc(EditLine *el, int argc __attribute__((__unused__)), 
-    const Char **argv __attribute__((__unused__)))
-{
-	const struct termcapstr *t;
-	char **ts;
-
-	(void) fprintf(el->el_outfile, "\n\tYour terminal has the\n");
-	(void) fprintf(el->el_outfile, "\tfollowing characteristics:\n\n");
-	(void) fprintf(el->el_outfile, "\tIt has %d columns and %d lines\n",
-	    Val(T_co), Val(T_li));
-	(void) fprintf(el->el_outfile,
-	    "\tIt has %s meta key\n", EL_HAS_META ? "a" : "no");
-	(void) fprintf(el->el_outfile,
-	    "\tIt can%suse tabs\n", EL_CAN_TAB ? " " : "not ");
-	(void) fprintf(el->el_outfile, "\tIt %s automatic margins\n",
-	    EL_HAS_AUTO_MARGINS ? "has" : "does not have");
-	if (EL_HAS_AUTO_MARGINS)
-		(void) fprintf(el->el_outfile, "\tIt %s magic margins\n",
-		    EL_HAS_MAGIC_MARGINS ? "has" : "does not have");
-
-	for (t = tstr, ts = el->el_terminal.t_str; t->name != NULL; t++, ts++) {
-		const char *ub;
-		if (*ts && **ts) {
-			ub = ct_encode_string(ct_visual_string(
-			    ct_decode_string(*ts, &el->el_scratch)),
-			    &el->el_scratch);
-		} else {
-			ub = "(empty)";
-		}
-		(void) fprintf(el->el_outfile, "\t%25s (%s) == %s\n",
-		    t->long_name, t->name, ub);
-	}
-	(void) fputc('\n', el->el_outfile);
-	return 0;
-}
-
-
-/* terminal_settc():
- *	Change the current terminal characteristics
- */
-protected int
-/*ARGSUSED*/
-terminal_settc(EditLine *el, int argc __attribute__((__unused__)),
-    const Char **argv)
-{
-	const struct termcapstr *ts;
-	const struct termcapval *tv;
-	char what[8], how[8];
-
-	if (argv == NULL || argv[1] == NULL || argv[2] == NULL)
-		return -1;
-
-	strncpy(what, ct_encode_string(argv[1], &el->el_scratch), sizeof(what));
-	what[sizeof(what) - 1] = '\0';
-	strncpy(how,  ct_encode_string(argv[2], &el->el_scratch), sizeof(how));
-	how[sizeof(how) - 1] = '\0';
-
-	/*
-         * Do the strings first
-         */
-	for (ts = tstr; ts->name != NULL; ts++)
-		if (strcmp(ts->name, what) == 0)
-			break;
-
-	if (ts->name != NULL) {
-		terminal_alloc(el, ts, how);
-		terminal_setflags(el);
-		return 0;
-	}
-	/*
-         * Do the numeric ones second
-         */
-	for (tv = tval; tv->name != NULL; tv++)
-		if (strcmp(tv->name, what) == 0)
-			break;
-
-	if (tv->name != NULL)
-		return -1;
-
-	if (tv == &tval[T_pt] || tv == &tval[T_km] ||
-	    tv == &tval[T_am] || tv == &tval[T_xn]) {
-		if (strcmp(how, "yes") == 0)
-			el->el_terminal.t_val[tv - tval] = 1;
-		else if (strcmp(how, "no") == 0)
-			el->el_terminal.t_val[tv - tval] = 0;
-		else {
-			(void) fprintf(el->el_errfile,
-			    "" FSTR ": Bad value `%s'.\n", argv[0], how);
-			return -1;
-		}
-		terminal_setflags(el);
-		if (terminal_change_size(el, Val(T_li), Val(T_co)) == -1)
-			return -1;
-		return 0;
-	} else {
-		long i;
-		char *ep;
-
-		i = strtol(how, &ep, 10);
-		if (*ep != '\0') {
-			(void) fprintf(el->el_errfile,
-			    "" FSTR ": Bad value `%s'.\n", argv[0], how);
-			return -1;
-		}
-		el->el_terminal.t_val[tv - tval] = (int) i;
-		el->el_terminal.t_size.v = Val(T_co);
-		el->el_terminal.t_size.h = Val(T_li);
-		if (tv == &tval[T_co] || tv == &tval[T_li])
-			if (terminal_change_size(el, Val(T_li), Val(T_co))
-			    == -1)
-				return -1;
-		return 0;
-	}
-}
-
-
-/* terminal_gettc():
- *	Get the current terminal characteristics
- */
-protected int
-/*ARGSUSED*/
-terminal_gettc(EditLine *el, int argc __attribute__((__unused__)), char **argv)
-{
-	const struct termcapstr *ts;
-	const struct termcapval *tv;
-	char *what;
-	void *how;
-
-	if (argv == NULL || argv[1] == NULL || argv[2] == NULL)
-		return -1;
-
-	what = argv[1];
-	how = argv[2];
-
-	/*
-         * Do the strings first
-         */
-	for (ts = tstr; ts->name != NULL; ts++)
-		if (strcmp(ts->name, what) == 0)
-			break;
-
-	if (ts->name != NULL) {
-		*(char **)how = el->el_terminal.t_str[ts - tstr];
-		return 0;
-	}
-	/*
-         * Do the numeric ones second
-         */
-	for (tv = tval; tv->name != NULL; tv++)
-		if (strcmp(tv->name, what) == 0)
-			break;
-
-	if (tv->name == NULL)
-		return -1;
-
-	if (tv == &tval[T_pt] || tv == &tval[T_km] ||
-	    tv == &tval[T_am] || tv == &tval[T_xn]) {
-		static char yes[] = "yes";
-		static char no[] = "no";
-		if (el->el_terminal.t_val[tv - tval])
-			*(char **)how = yes;
-		else
-			*(char **)how = no;
-		return 0;
-	} else {
-		*(int *)how = el->el_terminal.t_val[tv - tval];
-		return 0;
-	}
-}
-
-/* terminal_echotc():
- *	Print the termcap string out with variable substitution
- */
-protected int
-/*ARGSUSED*/
-terminal_echotc(EditLine *el, int argc __attribute__((__unused__)),
-    const Char **argv)
-{
-	char *cap, *scap;
-	Char *ep;
-	int arg_need, arg_cols, arg_rows;
-	int verbose = 0, silent = 0;
-	char *area;
-	static const char fmts[] = "%s\n", fmtd[] = "%d\n";
-	const struct termcapstr *t;
-	char buf[TC_BUFSIZE];
-	long i;
-
-	area = buf;
-
-	if (argv == NULL || argv[1] == NULL)
-		return -1;
-	argv++;
-
-	if (argv[0][0] == '-') {
-		switch (argv[0][1]) {
-		case 'v':
-			verbose = 1;
-			break;
-		case 's':
-			silent = 1;
-			break;
-		default:
-			/* stderror(ERR_NAME | ERR_TCUSAGE); */
-			break;
-		}
-		argv++;
-	}
-	if (!*argv || *argv[0] == '\0')
-		return 0;
-	if (Strcmp(*argv, STR("tabs")) == 0) {
-		(void) fprintf(el->el_outfile, fmts, EL_CAN_TAB ? "yes" : "no");
-		return 0;
-	} else if (Strcmp(*argv, STR("meta")) == 0) {
-		(void) fprintf(el->el_outfile, fmts, Val(T_km) ? "yes" : "no");
-		return 0;
-	} else if (Strcmp(*argv, STR("xn")) == 0) {
-		(void) fprintf(el->el_outfile, fmts, EL_HAS_MAGIC_MARGINS ?
-		    "yes" : "no");
-		return 0;
-	} else if (Strcmp(*argv, STR("am")) == 0) {
-		(void) fprintf(el->el_outfile, fmts, EL_HAS_AUTO_MARGINS ?
-		    "yes" : "no");
-		return 0;
-	} else if (Strcmp(*argv, STR("baud")) == 0) {
-		(void) fprintf(el->el_outfile, fmtd, (int)el->el_tty.t_speed);
-		return 0;
-	} else if (Strcmp(*argv, STR("rows")) == 0 ||
-                   Strcmp(*argv, STR("lines")) == 0) {
-		(void) fprintf(el->el_outfile, fmtd, Val(T_li));
-		return 0;
-	} else if (Strcmp(*argv, STR("cols")) == 0) {
-		(void) fprintf(el->el_outfile, fmtd, Val(T_co));
-		return 0;
-	}
-	/*
-         * Try to use our local definition first
-         */
-	scap = NULL;
-	for (t = tstr; t->name != NULL; t++)
-		if (strcmp(t->name,
-		    ct_encode_string(*argv, &el->el_scratch)) == 0) {
-			scap = el->el_terminal.t_str[t - tstr];
-			break;
-		}
-	if (t->name == NULL) {
-		/* XXX: some systems' tgetstr needs non const */
-                scap = tgetstr(ct_encode_string(*argv, &el->el_scratch), &area);
-	}
-	if (!scap || scap[0] == '\0') {
-		if (!silent)
-			(void) fprintf(el->el_errfile,
-			    "echotc: Termcap parameter `" FSTR "' not found.\n",
-			    *argv);
-		return -1;
-	}
-	/*
-         * Count home many values we need for this capability.
-         */
-	for (cap = scap, arg_need = 0; *cap; cap++)
-		if (*cap == '%')
-			switch (*++cap) {
-			case 'd':
-			case '2':
-			case '3':
-			case '.':
-			case '+':
-				arg_need++;
-				break;
-			case '%':
-			case '>':
-			case 'i':
-			case 'r':
-			case 'n':
-			case 'B':
-			case 'D':
-				break;
-			default:
-				/*
-				 * hpux has lot's of them...
-				 */
-				if (verbose)
-					(void) fprintf(el->el_errfile,
-				"echotc: Warning: unknown termcap %% `%c'.\n",
-					    *cap);
-				/* This is bad, but I won't complain */
-				break;
-			}
-
-	switch (arg_need) {
-	case 0:
-		argv++;
-		if (*argv && *argv[0]) {
-			if (!silent)
-				(void) fprintf(el->el_errfile,
-				    "echotc: Warning: Extra argument `" FSTR "'.\n",
-				    *argv);
-			return -1;
-		}
-		terminal_tputs(el, scap, 1);
-		break;
-	case 1:
-		argv++;
-		if (!*argv || *argv[0] == '\0') {
-			if (!silent)
-				(void) fprintf(el->el_errfile,
-				    "echotc: Warning: Missing argument.\n");
-			return -1;
-		}
-		arg_cols = 0;
-		i = Strtol(*argv, &ep, 10);
-		if (*ep != '\0' || i < 0) {
-			if (!silent)
-				(void) fprintf(el->el_errfile,
-				    "echotc: Bad value `" FSTR "' for rows.\n",
-				    *argv);
-			return -1;
-		}
-		arg_rows = (int) i;
-		argv++;
-		if (*argv && *argv[0]) {
-			if (!silent)
-				(void) fprintf(el->el_errfile,
-				    "echotc: Warning: Extra argument `" FSTR
-				    "'.\n", *argv);
-			return -1;
-		}
-		terminal_tputs(el, tgoto(scap, arg_cols, arg_rows), 1);
-		break;
-	default:
-		/* This is wrong, but I will ignore it... */
-		if (verbose)
-			(void) fprintf(el->el_errfile,
-			 "echotc: Warning: Too many required arguments (%d).\n",
-			    arg_need);
-		/* FALLTHROUGH */
-	case 2:
-		argv++;
-		if (!*argv || *argv[0] == '\0') {
-			if (!silent)
-				(void) fprintf(el->el_errfile,
-				    "echotc: Warning: Missing argument.\n");
-			return -1;
-		}
-		i = Strtol(*argv, &ep, 10);
-		if (*ep != '\0' || i < 0) {
-			if (!silent)
-				(void) fprintf(el->el_errfile,
-				    "echotc: Bad value `" FSTR "' for cols.\n",
-				    *argv);
-			return -1;
-		}
-		arg_cols = (int) i;
-		argv++;
-		if (!*argv || *argv[0] == '\0') {
-			if (!silent)
-				(void) fprintf(el->el_errfile,
-				    "echotc: Warning: Missing argument.\n");
-			return -1;
-		}
-		i = Strtol(*argv, &ep, 10);
-		if (*ep != '\0' || i < 0) {
-			if (!silent)
-				(void) fprintf(el->el_errfile,
-				    "echotc: Bad value `" FSTR "' for rows.\n",
-				    *argv);
-			return -1;
-		}
-		arg_rows = (int) i;
-		if (*ep != '\0') {
-			if (!silent)
-				(void) fprintf(el->el_errfile,
-				    "echotc: Bad value `" FSTR "'.\n", *argv);
-			return -1;
-		}
-		argv++;
-		if (*argv && *argv[0]) {
-			if (!silent)
-				(void) fprintf(el->el_errfile,
-				    "echotc: Warning: Extra argument `" FSTR
-				    "'.\n", *argv);
-			return -1;
-		}
-		terminal_tputs(el, tgoto(scap, arg_cols, arg_rows), arg_rows);
-		break;
-	}
-	return 0;
-}
diff --git a/lib/libedit/terminal.h b/lib/libedit/terminal.h
deleted file mode 100644
index c50736305..000000000
--- a/lib/libedit/terminal.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*	$NetBSD: terminal.h,v 1.4 2012/03/24 20:09:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)term.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.term.h: Termcap header
- */
-#ifndef _h_el_terminal
-#define	_h_el_terminal
-
-#include "histedit.h"
-
-typedef struct {		/* Symbolic function key bindings	*/
-	const Char	*name;	/* name of the key			*/
-	int		 key;	/* Index in termcap table		*/
-	keymacro_value_t	 fun;	/* Function bound to it			*/
-	int		 type;	/* Type of function			*/
-} funckey_t;
-
-typedef struct {
-	const char *t_name;		/* the terminal name	*/
-	coord_t	  t_size;		/* # lines and cols	*/
-	int	  t_flags;
-#define	TERM_CAN_INSERT		0x001	/* Has insert cap	*/
-#define	TERM_CAN_DELETE		0x002	/* Has delete cap	*/
-#define	TERM_CAN_CEOL		0x004	/* Has CEOL cap		*/
-#define	TERM_CAN_TAB		0x008	/* Can use tabs		*/
-#define	TERM_CAN_ME		0x010	/* Can turn all attrs.	*/
-#define	TERM_CAN_UP		0x020	/* Can move up		*/
-#define	TERM_HAS_META		0x040	/* Has a meta key	*/
-#define	TERM_HAS_AUTO_MARGINS	0x080	/* Has auto margins	*/
-#define	TERM_HAS_MAGIC_MARGINS	0x100	/* Has magic margins	*/
-	char	 *t_buf;		/* Termcap buffer	*/
-	size_t	  t_loc;		/* location used	*/
-	char	**t_str;		/* termcap strings	*/
-	int	 *t_val;		/* termcap values	*/
-	char	 *t_cap;		/* Termcap buffer	*/
-	funckey_t	 *t_fkey;		/* Array of keys	*/
-} el_terminal_t;
-
-/*
- * fKey indexes
- */
-#define	A_K_DN		0
-#define	A_K_UP		1
-#define	A_K_LT		2
-#define	A_K_RT		3
-#define	A_K_HO		4
-#define	A_K_EN		5
-#define	A_K_DE		6
-#define	A_K_NKEYS	7
-
-protected void	terminal_move_to_line(EditLine *, int);
-protected void	terminal_move_to_char(EditLine *, int);
-protected void	terminal_clear_EOL(EditLine *, int);
-protected void	terminal_overwrite(EditLine *, const Char *, size_t);
-protected void	terminal_insertwrite(EditLine *, Char *, int);
-protected void	terminal_deletechars(EditLine *, int);
-protected void	terminal_clear_screen(EditLine *);
-protected void	terminal_beep(EditLine *);
-protected int	terminal_change_size(EditLine *, int, int);
-protected int	terminal_get_size(EditLine *, int *, int *);
-protected int	terminal_init(EditLine *);
-protected void	terminal_bind_arrow(EditLine *);
-protected void	terminal_print_arrow(EditLine *, const Char *);
-protected int	terminal_clear_arrow(EditLine *, const Char *);
-protected int	terminal_set_arrow(EditLine *, const Char *, keymacro_value_t *, int);
-protected void	terminal_end(EditLine *);
-protected void	terminal_get(EditLine *, const char **);
-protected int	terminal_set(EditLine *, const char *);
-protected int	terminal_settc(EditLine *, int, const Char **);
-protected int	terminal_gettc(EditLine *, int, char **);
-protected int	terminal_telltc(EditLine *, int, const Char **);
-protected int	terminal_echotc(EditLine *, int, const Char **);
-protected void	terminal_writec(EditLine *, Int);
-protected int	terminal__putc(EditLine *, Int);
-protected void	terminal__flush(EditLine *);
-
-/*
- * Easy access macros
- */
-#define	EL_FLAGS	(el)->el_terminal.t_flags
-
-#define	EL_CAN_INSERT		(EL_FLAGS & TERM_CAN_INSERT)
-#define	EL_CAN_DELETE		(EL_FLAGS & TERM_CAN_DELETE)
-#define	EL_CAN_CEOL		(EL_FLAGS & TERM_CAN_CEOL)
-#define	EL_CAN_TAB		(EL_FLAGS & TERM_CAN_TAB)
-#define	EL_CAN_ME		(EL_FLAGS & TERM_CAN_ME)
-#define EL_CAN_UP		(EL_FLAGS & TERM_CAN_UP)
-#define	EL_HAS_META		(EL_FLAGS & TERM_HAS_META)
-#define	EL_HAS_AUTO_MARGINS	(EL_FLAGS & TERM_HAS_AUTO_MARGINS)
-#define	EL_HAS_MAGIC_MARGINS	(EL_FLAGS & TERM_HAS_MAGIC_MARGINS)
-
-#endif /* _h_el_terminal */
diff --git a/lib/libedit/tokenizer.c b/lib/libedit/tokenizer.c
deleted file mode 100644
index 7fd842d48..000000000
--- a/lib/libedit/tokenizer.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/*	$NetBSD: tokenizer.c,v 1.21 2011/08/16 16:25:15 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)tokenizer.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: tokenizer.c,v 1.21 2011/08/16 16:25:15 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/* We build this file twice, once as NARROW, once as WIDE. */
-/*
- * tokenize.c: Bourne shell like tokenizer
- */
-#include <string.h>
-#include <stdlib.h>
-#include "histedit.h"
-#include "chartype.h"
-
-typedef enum {
-	Q_none, Q_single, Q_double, Q_one, Q_doubleone
-} quote_t;
-
-#define	TOK_KEEP	1
-#define	TOK_EAT		2
-
-#define	WINCR		20
-#define	AINCR		10
-
-#define	IFS		STR("\t \n")
-
-#define	tok_malloc(a)		malloc(a)
-#define	tok_free(a)		free(a)
-#define	tok_realloc(a, b)	realloc(a, b)
-#define	tok_strdup(a)		Strdup(a)
-
-
-struct TYPE(tokenizer) {
-	Char	*ifs;		/* In field separator			 */
-	size_t	 argc, amax;	/* Current and maximum number of args	 */
-	Char   **argv;		/* Argument list			 */
-	Char	*wptr, *wmax;	/* Space and limit on the word buffer	 */
-	Char	*wstart;	/* Beginning of next word		 */
-	Char	*wspace;	/* Space of word buffer			 */
-	quote_t	 quote;		/* Quoting state			 */
-	int	 flags;		/* flags;				 */
-};
-
-
-private void FUN(tok,finish)(TYPE(Tokenizer) *);
-
-
-/* FUN(tok,finish)():
- *	Finish a word in the tokenizer.
- */
-private void
-FUN(tok,finish)(TYPE(Tokenizer) *tok)
-{
-
-	*tok->wptr = '\0';
-	if ((tok->flags & TOK_KEEP) || tok->wptr != tok->wstart) {
-		tok->argv[tok->argc++] = tok->wstart;
-		tok->argv[tok->argc] = NULL;
-		tok->wstart = ++tok->wptr;
-	}
-	tok->flags &= ~TOK_KEEP;
-}
-
-
-/* FUN(tok,init)():
- *	Initialize the tokenizer
- */
-public TYPE(Tokenizer) *
-FUN(tok,init)(const Char *ifs)
-{
-	TYPE(Tokenizer) *tok = tok_malloc(sizeof(*tok));
-
-	if (tok == NULL)
-		return NULL;
-	tok->ifs = tok_strdup(ifs ? ifs : IFS);
-	if (tok->ifs == NULL) {
-		tok_free(tok);
-		return NULL;
-	}
-	tok->argc = 0;
-	tok->amax = AINCR;
-	tok->argv = tok_malloc(sizeof(*tok->argv) * tok->amax);
-	if (tok->argv == NULL) {
-		tok_free(tok->ifs);
-		tok_free(tok);
-		return NULL;
-	}
-	tok->argv[0] = NULL;
-	tok->wspace = tok_malloc(WINCR * sizeof(*tok->wspace));
-	if (tok->wspace == NULL) {
-		tok_free(tok->argv);
-		tok_free(tok->ifs);
-		tok_free(tok);
-		return NULL;
-	}
-	tok->wmax = tok->wspace + WINCR;
-	tok->wstart = tok->wspace;
-	tok->wptr = tok->wspace;
-	tok->flags = 0;
-	tok->quote = Q_none;
-
-	return tok;
-}
-
-
-/* FUN(tok,reset)():
- *	Reset the tokenizer
- */
-public void
-FUN(tok,reset)(TYPE(Tokenizer) *tok)
-{
-
-	tok->argc = 0;
-	tok->wstart = tok->wspace;
-	tok->wptr = tok->wspace;
-	tok->flags = 0;
-	tok->quote = Q_none;
-}
-
-
-/* FUN(tok,end)():
- *	Clean up
- */
-public void
-FUN(tok,end)(TYPE(Tokenizer) *tok)
-{
-
-	tok_free(tok->ifs);
-	tok_free(tok->wspace);
-	tok_free(tok->argv);
-	tok_free(tok);
-}
-
-
-
-/* FUN(tok,line)():
- *	Bourne shell (sh(1)) like tokenizing
- *	Arguments:
- *		tok	current tokenizer state (setup with FUN(tok,init)())
- *		line	line to parse
- *	Returns:
- *		-1	Internal error
- *		 3	Quoted return
- *		 2	Unmatched double quote
- *		 1	Unmatched single quote
- *		 0	Ok
- *	Modifies (if return value is 0):
- *		argc	number of arguments
- *		argv	argument array
- *		cursorc	if !NULL, argv element containing cursor
- *		cursorv	if !NULL, offset in argv[cursorc] of cursor
- */
-public int
-FUN(tok,line)(TYPE(Tokenizer) *tok, const TYPE(LineInfo) *line,
-    int *argc, const Char ***argv, int *cursorc, int *cursoro)
-{
-	const Char *ptr;
-	int cc, co;
-
-	cc = co = -1;
-	ptr = line->buffer;
-	for (ptr = line->buffer; ;ptr++) {
-		if (ptr >= line->lastchar)
-			ptr = STR("");
-		if (ptr == line->cursor) {
-			cc = (int)tok->argc;
-			co = (int)(tok->wptr - tok->wstart);
-		}
-		switch (*ptr) {
-		case '\'':
-			tok->flags |= TOK_KEEP;
-			tok->flags &= ~TOK_EAT;
-			switch (tok->quote) {
-			case Q_none:
-				tok->quote = Q_single;	/* Enter single quote
-							 * mode */
-				break;
-
-			case Q_single:	/* Exit single quote mode */
-				tok->quote = Q_none;
-				break;
-
-			case Q_one:	/* Quote this ' */
-				tok->quote = Q_none;
-				*tok->wptr++ = *ptr;
-				break;
-
-			case Q_double:	/* Stay in double quote mode */
-				*tok->wptr++ = *ptr;
-				break;
-
-			case Q_doubleone:	/* Quote this ' */
-				tok->quote = Q_double;
-				*tok->wptr++ = *ptr;
-				break;
-
-			default:
-				return -1;
-			}
-			break;
-
-		case '"':
-			tok->flags &= ~TOK_EAT;
-			tok->flags |= TOK_KEEP;
-			switch (tok->quote) {
-			case Q_none:	/* Enter double quote mode */
-				tok->quote = Q_double;
-				break;
-
-			case Q_double:	/* Exit double quote mode */
-				tok->quote = Q_none;
-				break;
-
-			case Q_one:	/* Quote this " */
-				tok->quote = Q_none;
-				*tok->wptr++ = *ptr;
-				break;
-
-			case Q_single:	/* Stay in single quote mode */
-				*tok->wptr++ = *ptr;
-				break;
-
-			case Q_doubleone:	/* Quote this " */
-				tok->quote = Q_double;
-				*tok->wptr++ = *ptr;
-				break;
-
-			default:
-				return -1;
-			}
-			break;
-
-		case '\\':
-			tok->flags |= TOK_KEEP;
-			tok->flags &= ~TOK_EAT;
-			switch (tok->quote) {
-			case Q_none:	/* Quote next character */
-				tok->quote = Q_one;
-				break;
-
-			case Q_double:	/* Quote next character */
-				tok->quote = Q_doubleone;
-				break;
-
-			case Q_one:	/* Quote this, restore state */
-				*tok->wptr++ = *ptr;
-				tok->quote = Q_none;
-				break;
-
-			case Q_single:	/* Stay in single quote mode */
-				*tok->wptr++ = *ptr;
-				break;
-
-			case Q_doubleone:	/* Quote this \ */
-				tok->quote = Q_double;
-				*tok->wptr++ = *ptr;
-				break;
-
-			default:
-				return -1;
-			}
-			break;
-
-		case '\n':
-			tok->flags &= ~TOK_EAT;
-			switch (tok->quote) {
-			case Q_none:
-				goto tok_line_outok;
-
-			case Q_single:
-			case Q_double:
-				*tok->wptr++ = *ptr;	/* Add the return */
-				break;
-
-			case Q_doubleone:   /* Back to double, eat the '\n' */
-				tok->flags |= TOK_EAT;
-				tok->quote = Q_double;
-				break;
-
-			case Q_one:	/* No quote, more eat the '\n' */
-				tok->flags |= TOK_EAT;
-				tok->quote = Q_none;
-				break;
-
-			default:
-				return 0;
-			}
-			break;
-
-		case '\0':
-			switch (tok->quote) {
-			case Q_none:
-				/* Finish word and return */
-				if (tok->flags & TOK_EAT) {
-					tok->flags &= ~TOK_EAT;
-					return 3;
-				}
-				goto tok_line_outok;
-
-			case Q_single:
-				return 1;
-
-			case Q_double:
-				return 2;
-
-			case Q_doubleone:
-				tok->quote = Q_double;
-				*tok->wptr++ = *ptr;
-				break;
-
-			case Q_one:
-				tok->quote = Q_none;
-				*tok->wptr++ = *ptr;
-				break;
-
-			default:
-				return -1;
-			}
-			break;
-
-		default:
-			tok->flags &= ~TOK_EAT;
-			switch (tok->quote) {
-			case Q_none:
-				if (Strchr(tok->ifs, *ptr) != NULL)
-					FUN(tok,finish)(tok);
-				else
-					*tok->wptr++ = *ptr;
-				break;
-
-			case Q_single:
-			case Q_double:
-				*tok->wptr++ = *ptr;
-				break;
-
-
-			case Q_doubleone:
-				*tok->wptr++ = '\\';
-				tok->quote = Q_double;
-				*tok->wptr++ = *ptr;
-				break;
-
-			case Q_one:
-				tok->quote = Q_none;
-				*tok->wptr++ = *ptr;
-				break;
-
-			default:
-				return -1;
-
-			}
-			break;
-		}
-
-		if (tok->wptr >= tok->wmax - 4) {
-			size_t size = (size_t)(tok->wmax - tok->wspace + WINCR);
-			Char *s = tok_realloc(tok->wspace,
-			    size * sizeof(*s));
-			if (s == NULL)
-				return -1;
-
-			if (s != tok->wspace) {
-				size_t i;
-				for (i = 0; i < tok->argc; i++) {
-				    tok->argv[i] =
-					(tok->argv[i] - tok->wspace) + s;
-				}
-				tok->wptr = (tok->wptr - tok->wspace) + s;
-				tok->wstart = (tok->wstart - tok->wspace) + s;
-				tok->wspace = s;
-			}
-			tok->wmax = s + size;
-		}
-		if (tok->argc >= tok->amax - 4) {
-			Char **p;
-			tok->amax += AINCR;
-			p = tok_realloc(tok->argv, tok->amax * sizeof(*p));
-			if (p == NULL)
-				return -1;
-			tok->argv = p;
-		}
-	}
- tok_line_outok:
-	if (cc == -1 && co == -1) {
-		cc = (int)tok->argc;
-		co = (int)(tok->wptr - tok->wstart);
-	}
-	if (cursorc != NULL)
-		*cursorc = cc;
-	if (cursoro != NULL)
-		*cursoro = co;
-	FUN(tok,finish)(tok);
-	*argv = (const Char **)tok->argv;
-	*argc = (int)tok->argc;
-	return 0;
-}
-
-/* FUN(tok,str)():
- *	Simpler version of tok_line, taking a NUL terminated line
- *	and splitting into words, ignoring cursor state.
- */
-public int
-FUN(tok,str)(TYPE(Tokenizer) *tok, const Char *line, int *argc,
-    const Char ***argv)
-{
-	TYPE(LineInfo) li;
-
-	memset(&li, 0, sizeof(li));
-	li.buffer = line;
-	li.cursor = li.lastchar = Strchr(line, '\0');
-	return FUN(tok,line(tok, &li, argc, argv, NULL, NULL));
-}
diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c
deleted file mode 100644
index d33f05b57..000000000
--- a/lib/libedit/tty.c
+++ /dev/null
@@ -1,1325 +0,0 @@
-/*	$NetBSD: tty.c,v 1.47 2015/05/14 10:44:15 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: tty.c,v 1.47 2015/05/14 10:44:15 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * tty.c: tty interface stuff
- */
-#include <assert.h>
-#include <errno.h>
-#include <unistd.h>	/* for isatty */
-#include <strings.h>	/* for ffs */
-#include <stdlib.h>	/* for abort */
-#include "el.h"
-#include "tty.h"
-
-typedef struct ttymodes_t {
-	const char *m_name;
-	unsigned int m_value;
-	int m_type;
-}          ttymodes_t;
-
-typedef struct ttymap_t {
-	Int nch, och;		/* Internal and termio rep of chars */
-	el_action_t bind[3];	/* emacs, vi, and vi-cmd */
-} ttymap_t;
-
-
-private const ttyperm_t ttyperm = {
-	{
-		{"iflag:", ICRNL, (INLCR | IGNCR)},
-		{"oflag:", (OPOST | ONLCR), ONLRET},
-		{"cflag:", 0, 0},
-		{"lflag:", (ISIG | ICANON | ECHO | ECHOE | ECHOCTL | IEXTEN),
-		(NOFLSH | ECHONL | EXTPROC | FLUSHO)},
-		{"chars:", 0, 0},
-	},
-	{
-		{"iflag:", (INLCR | ICRNL), IGNCR},
-		{"oflag:", (OPOST | ONLCR), ONLRET},
-		{"cflag:", 0, 0},
-		{"lflag:", ISIG,
-		(NOFLSH | ICANON | ECHO | ECHOK | ECHONL | EXTPROC | IEXTEN | FLUSHO)},
-		{"chars:", (C_SH(C_MIN) | C_SH(C_TIME) | C_SH(C_SWTCH) | C_SH(C_DSWTCH) |
-			    C_SH(C_SUSP) | C_SH(C_DSUSP) | C_SH(C_EOL) | C_SH(C_DISCARD) |
-		    C_SH(C_PGOFF) | C_SH(C_PAGE) | C_SH(C_STATUS)), 0}
-	},
-	{
-		{"iflag:", 0, IXON | IXOFF | INLCR | ICRNL},
-		{"oflag:", 0, 0},
-		{"cflag:", 0, 0},
-		{"lflag:", 0, ISIG | IEXTEN},
-		{"chars:", 0, 0},
-	}
-};
-
-private const ttychar_t ttychar = {
-	{
-		CINTR, CQUIT, CERASE, CKILL,
-		CEOF, CEOL, CEOL2, CSWTCH,
-		CDSWTCH, CERASE2, CSTART, CSTOP,
-		CWERASE, CSUSP, CDSUSP, CREPRINT,
-		CDISCARD, CLNEXT, CSTATUS, CPAGE,
-		CPGOFF, CKILL2, CBRK, CMIN,
-		CTIME
-	},
-	{
-		CINTR, CQUIT, CERASE, CKILL,
-		_POSIX_VDISABLE, _POSIX_VDISABLE, _POSIX_VDISABLE, _POSIX_VDISABLE,
-		_POSIX_VDISABLE, CERASE2, CSTART, CSTOP,
-		_POSIX_VDISABLE, CSUSP, _POSIX_VDISABLE, _POSIX_VDISABLE,
-		CDISCARD, _POSIX_VDISABLE, _POSIX_VDISABLE, _POSIX_VDISABLE,
-		_POSIX_VDISABLE, _POSIX_VDISABLE, _POSIX_VDISABLE, 1,
-		0
-	},
-	{
-		0, 0, 0, 0,
-		0, 0, 0, 0,
-		0, 0, 0, 0,
-		0, 0, 0, 0,
-		0, 0, 0, 0,
-		0, 0, 0, 0,
-		0
-	}
-};
-
-private const ttymap_t tty_map[] = {
-#ifdef VERASE
-	{C_ERASE, VERASE,
-	{EM_DELETE_PREV_CHAR, VI_DELETE_PREV_CHAR, ED_PREV_CHAR}},
-#endif /* VERASE */
-#ifdef VERASE2
-	{C_ERASE2, VERASE2,
-	{EM_DELETE_PREV_CHAR, VI_DELETE_PREV_CHAR, ED_PREV_CHAR}},
-#endif /* VERASE2 */
-#ifdef VKILL
-	{C_KILL, VKILL,
-	{EM_KILL_LINE, VI_KILL_LINE_PREV, ED_UNASSIGNED}},
-#endif /* VKILL */
-#ifdef VKILL2
-	{C_KILL2, VKILL2,
-	{EM_KILL_LINE, VI_KILL_LINE_PREV, ED_UNASSIGNED}},
-#endif /* VKILL2 */
-#ifdef VEOF
-	{C_EOF, VEOF,
-	{EM_DELETE_OR_LIST, VI_LIST_OR_EOF, ED_UNASSIGNED}},
-#endif /* VEOF */
-#ifdef VWERASE
-	{C_WERASE, VWERASE,
-	{ED_DELETE_PREV_WORD, ED_DELETE_PREV_WORD, ED_PREV_WORD}},
-#endif /* VWERASE */
-#ifdef VREPRINT
-	{C_REPRINT, VREPRINT,
-	{ED_REDISPLAY, ED_INSERT, ED_REDISPLAY}},
-#endif /* VREPRINT */
-#ifdef VLNEXT
-	{C_LNEXT, VLNEXT,
-	{ED_QUOTED_INSERT, ED_QUOTED_INSERT, ED_UNASSIGNED}},
-#endif /* VLNEXT */
-	{(Int)-1, (Int)-1,
-	{ED_UNASSIGNED, ED_UNASSIGNED, ED_UNASSIGNED}}
-};
-
-private const ttymodes_t ttymodes[] = {
-#ifdef	IGNBRK
-	{"ignbrk", IGNBRK, MD_INP},
-#endif /* IGNBRK */
-#ifdef	BRKINT
-	{"brkint", BRKINT, MD_INP},
-#endif /* BRKINT */
-#ifdef	IGNPAR
-	{"ignpar", IGNPAR, MD_INP},
-#endif /* IGNPAR */
-#ifdef	PARMRK
-	{"parmrk", PARMRK, MD_INP},
-#endif /* PARMRK */
-#ifdef	INPCK
-	{"inpck", INPCK, MD_INP},
-#endif /* INPCK */
-#ifdef	ISTRIP
-	{"istrip", ISTRIP, MD_INP},
-#endif /* ISTRIP */
-#ifdef	INLCR
-	{"inlcr", INLCR, MD_INP},
-#endif /* INLCR */
-#ifdef	IGNCR
-	{"igncr", IGNCR, MD_INP},
-#endif /* IGNCR */
-#ifdef	ICRNL
-	{"icrnl", ICRNL, MD_INP},
-#endif /* ICRNL */
-#ifdef	IUCLC
-	{"iuclc", IUCLC, MD_INP},
-#endif /* IUCLC */
-#ifdef	IXON
-	{"ixon", IXON, MD_INP},
-#endif /* IXON */
-#ifdef	IXANY
-	{"ixany", IXANY, MD_INP},
-#endif /* IXANY */
-#ifdef	IXOFF
-	{"ixoff", IXOFF, MD_INP},
-#endif /* IXOFF */
-#ifdef  IMAXBEL
-	{"imaxbel", IMAXBEL, MD_INP},
-#endif /* IMAXBEL */
-
-#ifdef	OPOST
-	{"opost", OPOST, MD_OUT},
-#endif /* OPOST */
-#ifdef	OLCUC
-	{"olcuc", OLCUC, MD_OUT},
-#endif /* OLCUC */
-#ifdef	ONLCR
-	{"onlcr", ONLCR, MD_OUT},
-#endif /* ONLCR */
-#ifdef	OCRNL
-	{"ocrnl", OCRNL, MD_OUT},
-#endif /* OCRNL */
-#ifdef	ONOCR
-	{"onocr", ONOCR, MD_OUT},
-#endif /* ONOCR */
-#ifdef ONOEOT
-	{"onoeot", ONOEOT, MD_OUT},
-#endif /* ONOEOT */
-#ifdef	ONLRET
-	{"onlret", ONLRET, MD_OUT},
-#endif /* ONLRET */
-#ifdef	OFILL
-	{"ofill", OFILL, MD_OUT},
-#endif /* OFILL */
-#ifdef	OFDEL
-	{"ofdel", OFDEL, MD_OUT},
-#endif /* OFDEL */
-#ifdef	NLDLY
-	{"nldly", NLDLY, MD_OUT},
-#endif /* NLDLY */
-#ifdef	CRDLY
-	{"crdly", CRDLY, MD_OUT},
-#endif /* CRDLY */
-#ifdef	TABDLY
-	{"tabdly", TABDLY, MD_OUT},
-#endif /* TABDLY */
-#ifdef	XTABS
-	{"xtabs", XTABS, MD_OUT},
-#endif /* XTABS */
-#ifdef	BSDLY
-	{"bsdly", BSDLY, MD_OUT},
-#endif /* BSDLY */
-#ifdef	VTDLY
-	{"vtdly", VTDLY, MD_OUT},
-#endif /* VTDLY */
-#ifdef	FFDLY
-	{"ffdly", FFDLY, MD_OUT},
-#endif /* FFDLY */
-#ifdef	PAGEOUT
-	{"pageout", PAGEOUT, MD_OUT},
-#endif /* PAGEOUT */
-#ifdef	WRAP
-	{"wrap", WRAP, MD_OUT},
-#endif /* WRAP */
-
-#ifdef	CIGNORE
-	{"cignore", CIGNORE, MD_CTL},
-#endif /* CBAUD */
-#ifdef	CBAUD
-	{"cbaud", CBAUD, MD_CTL},
-#endif /* CBAUD */
-#ifdef	CSTOPB
-	{"cstopb", CSTOPB, MD_CTL},
-#endif /* CSTOPB */
-#ifdef	CREAD
-	{"cread", CREAD, MD_CTL},
-#endif /* CREAD */
-#ifdef	PARENB
-	{"parenb", PARENB, MD_CTL},
-#endif /* PARENB */
-#ifdef	PARODD
-	{"parodd", PARODD, MD_CTL},
-#endif /* PARODD */
-#ifdef	HUPCL
-	{"hupcl", HUPCL, MD_CTL},
-#endif /* HUPCL */
-#ifdef	CLOCAL
-	{"clocal", CLOCAL, MD_CTL},
-#endif /* CLOCAL */
-#ifdef	LOBLK
-	{"loblk", LOBLK, MD_CTL},
-#endif /* LOBLK */
-#ifdef	CIBAUD
-	{"cibaud", CIBAUD, MD_CTL},
-#endif /* CIBAUD */
-#ifdef CRTSCTS
-#ifdef CCTS_OFLOW
-	{"ccts_oflow", CCTS_OFLOW, MD_CTL},
-#else
-	{"crtscts", CRTSCTS, MD_CTL},
-#endif /* CCTS_OFLOW */
-#endif /* CRTSCTS */
-#ifdef CRTS_IFLOW
-	{"crts_iflow", CRTS_IFLOW, MD_CTL},
-#endif /* CRTS_IFLOW */
-#ifdef CDTRCTS
-	{"cdtrcts", CDTRCTS, MD_CTL},
-#endif /* CDTRCTS */
-#ifdef MDMBUF
-	{"mdmbuf", MDMBUF, MD_CTL},
-#endif /* MDMBUF */
-#ifdef RCV1EN
-	{"rcv1en", RCV1EN, MD_CTL},
-#endif /* RCV1EN */
-#ifdef XMT1EN
-	{"xmt1en", XMT1EN, MD_CTL},
-#endif /* XMT1EN */
-
-#ifdef	ISIG
-	{"isig", ISIG, MD_LIN},
-#endif /* ISIG */
-#ifdef	ICANON
-	{"icanon", ICANON, MD_LIN},
-#endif /* ICANON */
-#ifdef	XCASE
-	{"xcase", XCASE, MD_LIN},
-#endif /* XCASE */
-#ifdef	ECHO
-	{"echo", ECHO, MD_LIN},
-#endif /* ECHO */
-#ifdef	ECHOE
-	{"echoe", ECHOE, MD_LIN},
-#endif /* ECHOE */
-#ifdef	ECHOK
-	{"echok", ECHOK, MD_LIN},
-#endif /* ECHOK */
-#ifdef	ECHONL
-	{"echonl", ECHONL, MD_LIN},
-#endif /* ECHONL */
-#ifdef	NOFLSH
-	{"noflsh", NOFLSH, MD_LIN},
-#endif /* NOFLSH */
-#ifdef	TOSTOP
-	{"tostop", TOSTOP, MD_LIN},
-#endif /* TOSTOP */
-#ifdef	ECHOCTL
-	{"echoctl", ECHOCTL, MD_LIN},
-#endif /* ECHOCTL */
-#ifdef	ECHOPRT
-	{"echoprt", ECHOPRT, MD_LIN},
-#endif /* ECHOPRT */
-#ifdef	ECHOKE
-	{"echoke", ECHOKE, MD_LIN},
-#endif /* ECHOKE */
-#ifdef	DEFECHO
-	{"defecho", DEFECHO, MD_LIN},
-#endif /* DEFECHO */
-#ifdef	FLUSHO
-	{"flusho", FLUSHO, MD_LIN},
-#endif /* FLUSHO */
-#ifdef	PENDIN
-	{"pendin", PENDIN, MD_LIN},
-#endif /* PENDIN */
-#ifdef	IEXTEN
-	{"iexten", IEXTEN, MD_LIN},
-#endif /* IEXTEN */
-#ifdef	NOKERNINFO
-	{"nokerninfo", NOKERNINFO, MD_LIN},
-#endif /* NOKERNINFO */
-#ifdef	ALTWERASE
-	{"altwerase", ALTWERASE, MD_LIN},
-#endif /* ALTWERASE */
-#ifdef	EXTPROC
-	{"extproc", EXTPROC, MD_LIN},
-#endif /* EXTPROC */
-
-#if defined(VINTR)
-	{"intr", C_SH(C_INTR), MD_CHAR},
-#endif /* VINTR */
-#if defined(VQUIT)
-	{"quit", C_SH(C_QUIT), MD_CHAR},
-#endif /* VQUIT */
-#if defined(VERASE)
-	{"erase", C_SH(C_ERASE), MD_CHAR},
-#endif /* VERASE */
-#if defined(VKILL)
-	{"kill", C_SH(C_KILL), MD_CHAR},
-#endif /* VKILL */
-#if defined(VEOF)
-	{"eof", C_SH(C_EOF), MD_CHAR},
-#endif /* VEOF */
-#if defined(VEOL)
-	{"eol", C_SH(C_EOL), MD_CHAR},
-#endif /* VEOL */
-#if defined(VEOL2)
-	{"eol2", C_SH(C_EOL2), MD_CHAR},
-#endif /* VEOL2 */
-#if defined(VSWTCH)
-	{"swtch", C_SH(C_SWTCH), MD_CHAR},
-#endif /* VSWTCH */
-#if defined(VDSWTCH)
-	{"dswtch", C_SH(C_DSWTCH), MD_CHAR},
-#endif /* VDSWTCH */
-#if defined(VERASE2)
-	{"erase2", C_SH(C_ERASE2), MD_CHAR},
-#endif /* VERASE2 */
-#if defined(VSTART)
-	{"start", C_SH(C_START), MD_CHAR},
-#endif /* VSTART */
-#if defined(VSTOP)
-	{"stop", C_SH(C_STOP), MD_CHAR},
-#endif /* VSTOP */
-#if defined(VWERASE)
-	{"werase", C_SH(C_WERASE), MD_CHAR},
-#endif /* VWERASE */
-#if defined(VSUSP)
-	{"susp", C_SH(C_SUSP), MD_CHAR},
-#endif /* VSUSP */
-#if defined(VDSUSP)
-	{"dsusp", C_SH(C_DSUSP), MD_CHAR},
-#endif /* VDSUSP */
-#if defined(VREPRINT)
-	{"reprint", C_SH(C_REPRINT), MD_CHAR},
-#endif /* VREPRINT */
-#if defined(VDISCARD)
-	{"discard", C_SH(C_DISCARD), MD_CHAR},
-#endif /* VDISCARD */
-#if defined(VLNEXT)
-	{"lnext", C_SH(C_LNEXT), MD_CHAR},
-#endif /* VLNEXT */
-#if defined(VSTATUS)
-	{"status", C_SH(C_STATUS), MD_CHAR},
-#endif /* VSTATUS */
-#if defined(VPAGE)
-	{"page", C_SH(C_PAGE), MD_CHAR},
-#endif /* VPAGE */
-#if defined(VPGOFF)
-	{"pgoff", C_SH(C_PGOFF), MD_CHAR},
-#endif /* VPGOFF */
-#if defined(VKILL2)
-	{"kill2", C_SH(C_KILL2), MD_CHAR},
-#endif /* VKILL2 */
-#if defined(VBRK)
-	{"brk", C_SH(C_BRK), MD_CHAR},
-#endif /* VBRK */
-#if defined(VMIN)
-	{"min", C_SH(C_MIN), MD_CHAR},
-#endif /* VMIN */
-#if defined(VTIME)
-	{"time", C_SH(C_TIME), MD_CHAR},
-#endif /* VTIME */
-	{NULL, 0, -1},
-};
-
-
-
-#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 *);
-private speed_t	tty__getspeed(struct termios *);
-private int	tty_setup(EditLine *);
-private void	tty_setup_flags(EditLine *, struct termios *, int);
-
-#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
- */
-private int
-tty_setup(EditLine *el)
-{
-	int rst = 1;
-
-	if (el->el_flags & EDIT_DISABLED)
-		return 0;
-
-	if (!isatty(el->el_outfd)) {
-#ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile, "%s: isatty: %s\n", __func__,
-		    strerror(errno));
-#endif /* DEBUG_TTY */
-		return -1;
-	}
-	if (tty_getty(el, &el->el_tty.t_or) == -1) {
-#ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile, "%s: tty_getty: %s\n", __func__,
-		    strerror(errno));
-#endif /* DEBUG_TTY */
-		return -1;
-	}
-	el->el_tty.t_ts = el->el_tty.t_ex = el->el_tty.t_ed = el->el_tty.t_or;
-
-	el->el_tty.t_speed = tty__getspeed(&el->el_tty.t_ex);
-	el->el_tty.t_tabs = tty__gettabs(&el->el_tty.t_ex);
-	el->el_tty.t_eight = tty__geteightbit(&el->el_tty.t_ex);
-
-	tty_setup_flags(el, &el->el_tty.t_ex, EX_IO);
-
-	/*
-         * Reset the tty chars to reasonable defaults
-         * If they are disabled, then enable them.
-         */
-	if (rst) {
-		if (tty__cooked_mode(&el->el_tty.t_ts)) {
-			tty__getchar(&el->el_tty.t_ts, el->el_tty.t_c[TS_IO]);
-			/*
-	                 * Don't affect CMIN and CTIME for the editor mode
-	                 */
-			for (rst = 0; rst < C_NCC - 2; rst++)
-				if (el->el_tty.t_c[TS_IO][rst] !=
-				      el->el_tty.t_vdisable
-				    && el->el_tty.t_c[ED_IO][rst] !=
-				      el->el_tty.t_vdisable)
-					el->el_tty.t_c[ED_IO][rst] =
-					    el->el_tty.t_c[TS_IO][rst];
-			for (rst = 0; rst < C_NCC; rst++)
-				if (el->el_tty.t_c[TS_IO][rst] !=
-				    el->el_tty.t_vdisable)
-					el->el_tty.t_c[EX_IO][rst] =
-					    el->el_tty.t_c[TS_IO][rst];
-		}
-		tty__setchar(&el->el_tty.t_ex, el->el_tty.t_c[EX_IO]);
-		if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ex) == -1) {
-#ifdef DEBUG_TTY
-			(void) fprintf(el->el_errfile, "%s: tty_setty: %s\n",
-			    __func__, strerror(errno));
-#endif /* DEBUG_TTY */
-			return -1;
-		}
-	}
-
-	tty_setup_flags(el, &el->el_tty.t_ed, ED_IO);
-
-	tty__setchar(&el->el_tty.t_ed, el->el_tty.t_c[ED_IO]);
-	tty_bind_char(el, 1);
-	return 0;
-}
-
-protected int
-tty_init(EditLine *el)
-{
-
-	el->el_tty.t_mode = EX_IO;
-	el->el_tty.t_vdisable = _POSIX_VDISABLE;
-	(void) memcpy(el->el_tty.t_t, ttyperm, sizeof(ttyperm_t));
-	(void) memcpy(el->el_tty.t_c, ttychar, sizeof(ttychar_t));
-	return tty_setup(el);
-}
-
-
-/* tty_end():
- *	Restore the tty to its original settings
- */
-protected void
-/*ARGSUSED*/
-tty_end(EditLine *el)
-{
-	if (tty_setty(el, TCSAFLUSH, &el->el_tty.t_or) == -1) {
-#ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile,
-		    "%s: tty_setty: %s\n", __func__, strerror(errno));
-#endif /* DEBUG_TTY */
-	}
-}
-
-
-/* tty__getspeed():
- *	Get the tty speed
- */
-private speed_t
-tty__getspeed(struct termios *td)
-{
-	speed_t spd;
-
-	if ((spd = cfgetispeed(td)) == 0)
-		spd = cfgetospeed(td);
-	return spd;
-}
-
-/* tty__getspeed():
- *	Return the index of the asked char in the c_cc array
- */
-private int
-tty__getcharindex(int i)
-{
-	switch (i) {
-#ifdef VINTR
-	case C_INTR:
-		return VINTR;
-#endif /* VINTR */
-#ifdef VQUIT
-	case C_QUIT:
-		return VQUIT;
-#endif /* VQUIT */
-#ifdef VERASE
-	case C_ERASE:
-		return VERASE;
-#endif /* VERASE */
-#ifdef VKILL
-	case C_KILL:
-		return VKILL;
-#endif /* VKILL */
-#ifdef VEOF
-	case C_EOF:
-		return VEOF;
-#endif /* VEOF */
-#ifdef VEOL
-	case C_EOL:
-		return VEOL;
-#endif /* VEOL */
-#ifdef VEOL2
-	case C_EOL2:
-		return VEOL2;
-#endif /* VEOL2 */
-#ifdef VSWTCH
-	case C_SWTCH:
-		return VSWTCH;
-#endif /* VSWTCH */
-#ifdef VDSWTCH
-	case C_DSWTCH:
-		return VDSWTCH;
-#endif /* VDSWTCH */
-#ifdef VERASE2
-	case C_ERASE2:
-		return VERASE2;
-#endif /* VERASE2 */
-#ifdef VSTART
-	case C_START:
-		return VSTART;
-#endif /* VSTART */
-#ifdef VSTOP
-	case C_STOP:
-		return VSTOP;
-#endif /* VSTOP */
-#ifdef VWERASE
-	case C_WERASE:
-		return VWERASE;
-#endif /* VWERASE */
-#ifdef VSUSP
-	case C_SUSP:
-		return VSUSP;
-#endif /* VSUSP */
-#ifdef VDSUSP
-	case C_DSUSP:
-		return VDSUSP;
-#endif /* VDSUSP */
-#ifdef VREPRINT
-	case C_REPRINT:
-		return VREPRINT;
-#endif /* VREPRINT */
-#ifdef VDISCARD
-	case C_DISCARD:
-		return VDISCARD;
-#endif /* VDISCARD */
-#ifdef VLNEXT
-	case C_LNEXT:
-		return VLNEXT;
-#endif /* VLNEXT */
-#ifdef VSTATUS
-	case C_STATUS:
-		return VSTATUS;
-#endif /* VSTATUS */
-#ifdef VPAGE
-	case C_PAGE:
-		return VPAGE;
-#endif /* VPAGE */
-#ifdef VPGOFF
-	case C_PGOFF:
-		return VPGOFF;
-#endif /* VPGOFF */
-#ifdef VKILL2
-	case C_KILL2:
-		return VKILL2;
-#endif /* KILL2 */
-#ifdef VMIN
-	case C_MIN:
-		return VMIN;
-#endif /* VMIN */
-#ifdef VTIME
-	case C_TIME:
-		return VTIME;
-#endif /* VTIME */
-	default:
-		return -1;
-	}
-}
-
-/* tty__getchar():
- *	Get the tty characters
- */
-private void
-tty__getchar(struct termios *td, unsigned char *s)
-{
-
-#ifdef VINTR
-	s[C_INTR] = td->c_cc[VINTR];
-#endif /* VINTR */
-#ifdef VQUIT
-	s[C_QUIT] = td->c_cc[VQUIT];
-#endif /* VQUIT */
-#ifdef VERASE
-	s[C_ERASE] = td->c_cc[VERASE];
-#endif /* VERASE */
-#ifdef VKILL
-	s[C_KILL] = td->c_cc[VKILL];
-#endif /* VKILL */
-#ifdef VEOF
-	s[C_EOF] = td->c_cc[VEOF];
-#endif /* VEOF */
-#ifdef VEOL
-	s[C_EOL] = td->c_cc[VEOL];
-#endif /* VEOL */
-#ifdef VEOL2
-	s[C_EOL2] = td->c_cc[VEOL2];
-#endif /* VEOL2 */
-#ifdef VSWTCH
-	s[C_SWTCH] = td->c_cc[VSWTCH];
-#endif /* VSWTCH */
-#ifdef VDSWTCH
-	s[C_DSWTCH] = td->c_cc[VDSWTCH];
-#endif /* VDSWTCH */
-#ifdef VERASE2
-	s[C_ERASE2] = td->c_cc[VERASE2];
-#endif /* VERASE2 */
-#ifdef VSTART
-	s[C_START] = td->c_cc[VSTART];
-#endif /* VSTART */
-#ifdef VSTOP
-	s[C_STOP] = td->c_cc[VSTOP];
-#endif /* VSTOP */
-#ifdef VWERASE
-	s[C_WERASE] = td->c_cc[VWERASE];
-#endif /* VWERASE */
-#ifdef VSUSP
-	s[C_SUSP] = td->c_cc[VSUSP];
-#endif /* VSUSP */
-#ifdef VDSUSP
-	s[C_DSUSP] = td->c_cc[VDSUSP];
-#endif /* VDSUSP */
-#ifdef VREPRINT
-	s[C_REPRINT] = td->c_cc[VREPRINT];
-#endif /* VREPRINT */
-#ifdef VDISCARD
-	s[C_DISCARD] = td->c_cc[VDISCARD];
-#endif /* VDISCARD */
-#ifdef VLNEXT
-	s[C_LNEXT] = td->c_cc[VLNEXT];
-#endif /* VLNEXT */
-#ifdef VSTATUS
-	s[C_STATUS] = td->c_cc[VSTATUS];
-#endif /* VSTATUS */
-#ifdef VPAGE
-	s[C_PAGE] = td->c_cc[VPAGE];
-#endif /* VPAGE */
-#ifdef VPGOFF
-	s[C_PGOFF] = td->c_cc[VPGOFF];
-#endif /* VPGOFF */
-#ifdef VKILL2
-	s[C_KILL2] = td->c_cc[VKILL2];
-#endif /* KILL2 */
-#ifdef VMIN
-	s[C_MIN] = td->c_cc[VMIN];
-#endif /* VMIN */
-#ifdef VTIME
-	s[C_TIME] = td->c_cc[VTIME];
-#endif /* VTIME */
-}				/* tty__getchar */
-
-
-/* tty__setchar():
- *	Set the tty characters
- */
-private void
-tty__setchar(struct termios *td, unsigned char *s)
-{
-
-#ifdef VINTR
-	td->c_cc[VINTR] = s[C_INTR];
-#endif /* VINTR */
-#ifdef VQUIT
-	td->c_cc[VQUIT] = s[C_QUIT];
-#endif /* VQUIT */
-#ifdef VERASE
-	td->c_cc[VERASE] = s[C_ERASE];
-#endif /* VERASE */
-#ifdef VKILL
-	td->c_cc[VKILL] = s[C_KILL];
-#endif /* VKILL */
-#ifdef VEOF
-	td->c_cc[VEOF] = s[C_EOF];
-#endif /* VEOF */
-#ifdef VEOL
-	td->c_cc[VEOL] = s[C_EOL];
-#endif /* VEOL */
-#ifdef VEOL2
-	td->c_cc[VEOL2] = s[C_EOL2];
-#endif /* VEOL2 */
-#ifdef VSWTCH
-	td->c_cc[VSWTCH] = s[C_SWTCH];
-#endif /* VSWTCH */
-#ifdef VDSWTCH
-	td->c_cc[VDSWTCH] = s[C_DSWTCH];
-#endif /* VDSWTCH */
-#ifdef VERASE2
-	td->c_cc[VERASE2] = s[C_ERASE2];
-#endif /* VERASE2 */
-#ifdef VSTART
-	td->c_cc[VSTART] = s[C_START];
-#endif /* VSTART */
-#ifdef VSTOP
-	td->c_cc[VSTOP] = s[C_STOP];
-#endif /* VSTOP */
-#ifdef VWERASE
-	td->c_cc[VWERASE] = s[C_WERASE];
-#endif /* VWERASE */
-#ifdef VSUSP
-	td->c_cc[VSUSP] = s[C_SUSP];
-#endif /* VSUSP */
-#ifdef VDSUSP
-	td->c_cc[VDSUSP] = s[C_DSUSP];
-#endif /* VDSUSP */
-#ifdef VREPRINT
-	td->c_cc[VREPRINT] = s[C_REPRINT];
-#endif /* VREPRINT */
-#ifdef VDISCARD
-	td->c_cc[VDISCARD] = s[C_DISCARD];
-#endif /* VDISCARD */
-#ifdef VLNEXT
-	td->c_cc[VLNEXT] = s[C_LNEXT];
-#endif /* VLNEXT */
-#ifdef VSTATUS
-	td->c_cc[VSTATUS] = s[C_STATUS];
-#endif /* VSTATUS */
-#ifdef VPAGE
-	td->c_cc[VPAGE] = s[C_PAGE];
-#endif /* VPAGE */
-#ifdef VPGOFF
-	td->c_cc[VPGOFF] = s[C_PGOFF];
-#endif /* VPGOFF */
-#ifdef VKILL2
-	td->c_cc[VKILL2] = s[C_KILL2];
-#endif /* VKILL2 */
-#ifdef VMIN
-	td->c_cc[VMIN] = s[C_MIN];
-#endif /* VMIN */
-#ifdef VTIME
-	td->c_cc[VTIME] = s[C_TIME];
-#endif /* VTIME */
-}				/* tty__setchar */
-
-
-/* tty_bind_char():
- *	Rebind the editline functions
- */
-protected void
-tty_bind_char(EditLine *el, int force)
-{
-
-	unsigned char *t_n = el->el_tty.t_c[ED_IO];
-	unsigned char *t_o = el->el_tty.t_ed.c_cc;
-	Char new[2], old[2];
-	const ttymap_t *tp;
-	el_action_t *map, *alt;
-	const el_action_t *dmap, *dalt;
-	new[1] = old[1] = '\0';
-
-	map = el->el_map.key;
-	alt = el->el_map.alt;
-	if (el->el_map.type == MAP_VI) {
-		dmap = el->el_map.vii;
-		dalt = el->el_map.vic;
-	} else {
-		dmap = el->el_map.emacs;
-		dalt = NULL;
-	}
-
-	for (tp = tty_map; tp->nch != (Int)-1; tp++) {
-		new[0] = t_n[tp->nch];
-		old[0] = t_o[tp->och];
-		if (new[0] == old[0] && !force)
-			continue;
-		/* Put the old default binding back, and set the new binding */
-		keymacro_clear(el, map, old);
-		map[UC(old[0])] = dmap[UC(old[0])];
-		keymacro_clear(el, map, new);
-		/* MAP_VI == 1, MAP_EMACS == 0... */
-		map[UC(new[0])] = tp->bind[el->el_map.type];
-		if (dalt) {
-			keymacro_clear(el, alt, old);
-			alt[UC(old[0])] = dalt[UC(old[0])];
-			keymacro_clear(el, alt, new);
-			alt[UC(new[0])] = tp->bind[el->el_map.type + 1];
-		}
-	}
-}
-
-
-private tcflag_t *
-tty__get_flag(struct termios *t, int kind) {
-	switch (kind) {
-	case MD_INP:
-		return &t->c_iflag;
-	case MD_OUT:
-		return &t->c_oflag;
-	case MD_CTL:
-		return &t->c_cflag;
-	case MD_LIN:
-		return &t->c_lflag;
-	default:
-		abort();
-		/*NOTREACHED*/
-	}
-}
-
-
-private tcflag_t
-tty_update_flag(EditLine *el, tcflag_t f, int mode, int kind)
-{
-	f &= ~el->el_tty.t_t[mode][kind].t_clrmask;
-	f |= el->el_tty.t_t[mode][kind].t_setmask;
-	return f;
-}
-
-
-private void
-tty_update_flags(EditLine *el, int kind)
-{
-	tcflag_t *tt, *ed, *ex;
-	tt = tty__get_flag(&el->el_tty.t_ts, kind);
-	ed = tty__get_flag(&el->el_tty.t_ed, kind);
-	ex = tty__get_flag(&el->el_tty.t_ex, kind);
-
-	if (*tt != *ex && (kind != MD_CTL || *tt != *ed)) {
-		*ed = tty_update_flag(el, *tt, ED_IO, kind);
-		*ex = tty_update_flag(el, *tt, EX_IO, kind);
-	}
-}
-
-
-private void
-tty_update_char(EditLine *el, int mode, int c) {
-	if (!((el->el_tty.t_t[mode][MD_CHAR].t_setmask & C_SH(c)))
-	    && (el->el_tty.t_c[TS_IO][c] != el->el_tty.t_c[EX_IO][c]))
-		el->el_tty.t_c[mode][c] = el->el_tty.t_c[TS_IO][c];
-	if (el->el_tty.t_t[mode][MD_CHAR].t_clrmask & C_SH(c))
-		el->el_tty.t_c[mode][c] = el->el_tty.t_vdisable;
-}
-
-
-/* tty_rawmode():
- * 	Set terminal into 1 character at a time mode.
- */
-protected int
-tty_rawmode(EditLine *el)
-{
-
-	if (el->el_tty.t_mode == ED_IO || el->el_tty.t_mode == QU_IO)
-		return 0;
-
-	if (el->el_flags & EDIT_DISABLED)
-		return 0;
-
-	if (tty_getty(el, &el->el_tty.t_ts) == -1) {
-#ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile, "%s: tty_getty: %s\n", __func__,
-		    strerror(errno));
-#endif /* DEBUG_TTY */
-		return -1;
-	}
-	/*
-         * We always keep up with the eight bit setting and the speed of the
-         * tty. But we only believe changes that are made to cooked mode!
-         */
-	el->el_tty.t_eight = tty__geteightbit(&el->el_tty.t_ts);
-	el->el_tty.t_speed = tty__getspeed(&el->el_tty.t_ts);
-
-	if (tty__getspeed(&el->el_tty.t_ex) != el->el_tty.t_speed ||
-	    tty__getspeed(&el->el_tty.t_ed) != el->el_tty.t_speed) {
-		(void) cfsetispeed(&el->el_tty.t_ex, el->el_tty.t_speed);
-		(void) cfsetospeed(&el->el_tty.t_ex, el->el_tty.t_speed);
-		(void) cfsetispeed(&el->el_tty.t_ed, el->el_tty.t_speed);
-		(void) cfsetospeed(&el->el_tty.t_ed, el->el_tty.t_speed);
-	}
-	if (tty__cooked_mode(&el->el_tty.t_ts)) {
-		int i;
-
-		for (i = MD_INP; i <= MD_LIN; i++)
-			tty_update_flags(el, i);
-
-		if (tty__gettabs(&el->el_tty.t_ex) == 0)
-			el->el_tty.t_tabs = 0;
-		else
-			el->el_tty.t_tabs = EL_CAN_TAB ? 1 : 0;
-
-		tty__getchar(&el->el_tty.t_ts, el->el_tty.t_c[TS_IO]);
-		/*
-		 * Check if the user made any changes.
-		 * If he did, then propagate the changes to the
-		 * edit and execute data structures.
-		 */
-		for (i = 0; i < C_NCC; i++)
-			if (el->el_tty.t_c[TS_IO][i] !=
-			    el->el_tty.t_c[EX_IO][i])
-				break;
-
-		if (i != C_NCC) {
-			/*
-			 * Propagate changes only to the unprotected
-			 * chars that have been modified just now.
-			 */
-			for (i = 0; i < C_NCC; i++)
-				tty_update_char(el, ED_IO, i);
-
-			tty_bind_char(el, 0);
-			tty__setchar(&el->el_tty.t_ed, el->el_tty.t_c[ED_IO]);
-
-			for (i = 0; i < C_NCC; i++)
-				tty_update_char(el, EX_IO, i);
-
-			tty__setchar(&el->el_tty.t_ex, el->el_tty.t_c[EX_IO]);
-		}
-	}
-	if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ed) == -1) {
-#ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile, "%s: tty_setty: %s\n", __func__,
-		    strerror(errno));
-#endif /* DEBUG_TTY */
-		return -1;
-	}
-	el->el_tty.t_mode = ED_IO;
-	return 0;
-}
-
-
-/* tty_cookedmode():
- *	Set the tty back to normal mode
- */
-protected int
-tty_cookedmode(EditLine *el)
-{				/* set tty in normal setup */
-
-	if (el->el_tty.t_mode == EX_IO)
-		return 0;
-
-	if (el->el_flags & EDIT_DISABLED)
-		return 0;
-
-	if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ex) == -1) {
-#ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile, "%s: tty_setty: %s\n", __func__,
-		    strerror(errno));
-#endif /* DEBUG_TTY */
-		return -1;
-	}
-	el->el_tty.t_mode = EX_IO;
-	return 0;
-}
-
-
-/* tty_quotemode():
- *	Turn on quote mode
- */
-protected int
-tty_quotemode(EditLine *el)
-{
-	if (el->el_tty.t_mode == QU_IO)
-		return 0;
-
-	el->el_tty.t_qu = el->el_tty.t_ed;
-
-	tty_setup_flags(el, &el->el_tty.t_qu, QU_IO);
-
-	if (tty_setty(el, TCSADRAIN, &el->el_tty.t_qu) == -1) {
-#ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile, "%s: tty_setty: %s\n", __func__,
-		    strerror(errno));
-#endif /* DEBUG_TTY */
-		return -1;
-	}
-	el->el_tty.t_mode = QU_IO;
-	return 0;
-}
-
-
-/* tty_noquotemode():
- *	Turn off quote mode
- */
-protected int
-tty_noquotemode(EditLine *el)
-{
-
-	if (el->el_tty.t_mode != QU_IO)
-		return 0;
-	if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ed) == -1) {
-#ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile, "%s: tty_setty: %s\n", __func__,
-		    strerror(errno));
-#endif /* DEBUG_TTY */
-		return -1;
-	}
-	el->el_tty.t_mode = ED_IO;
-	return 0;
-}
-
-
-/* tty_stty():
- *	Stty builtin
- */
-protected int
-/*ARGSUSED*/
-tty_stty(EditLine *el, int argc __attribute__((__unused__)), const Char **argv)
-{
-	const ttymodes_t *m;
-	char x;
-	int aflag = 0;
-	const Char *s, *d;
-        char name[EL_BUFSIZ];
-	struct termios *tios = &el->el_tty.t_ex;
-	int z = EX_IO;
-
-	if (argv == NULL)
-		return -1;
-	strncpy(name, ct_encode_string(*argv++, &el->el_scratch), sizeof(name));
-        name[sizeof(name) - 1] = '\0';
-
-	while (argv && *argv && argv[0][0] == '-' && argv[0][2] == '\0')
-		switch (argv[0][1]) {
-		case 'a':
-			aflag++;
-			argv++;
-			break;
-		case 'd':
-			argv++;
-			tios = &el->el_tty.t_ed;
-			z = ED_IO;
-			break;
-		case 'x':
-			argv++;
-			tios = &el->el_tty.t_ex;
-			z = EX_IO;
-			break;
-		case 'q':
-			argv++;
-			tios = &el->el_tty.t_ts;
-			z = QU_IO;
-			break;
-		default:
-			(void) fprintf(el->el_errfile,
-			    "%s: Unknown switch `" FCHAR "'.\n",
-			    name, (Int)argv[0][1]);
-			return -1;
-		}
-
-	if (!argv || !*argv) {
-		int i = -1;
-		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",
-				    i != -1 ? "\n" : "",
-				    el->el_tty.t_t[z][m->m_type].t_name);
-				i = m->m_type;
-				st = len =
-				    strlen(el->el_tty.t_t[z][m->m_type].t_name);
-			}
-			if (i != -1) {
-			    x = (el->el_tty.t_t[z][i].t_setmask & m->m_value)
-				?  '+' : '\0';
-
-			    if (el->el_tty.t_t[z][i].t_clrmask & m->m_value)
-				x = '-';
-			} else {
-			    x = '\0';
-			}
-
-			if (x != '\0' || aflag) {
-
-				cu = strlen(m->m_name) + (x != '\0') + 1;
-
-				if (len + cu >=
-				    (size_t)el->el_terminal.t_size.h) {
-					(void) fprintf(el->el_outfile, "\n%*s",
-					    (int)st, "");
-					len = st + cu;
-				} else
-					len += cu;
-
-				if (x != '\0')
-					(void) fprintf(el->el_outfile, "%c%s ",
-					    x, m->m_name);
-				else
-					(void) fprintf(el->el_outfile, "%s ",
-					    m->m_name);
-			}
-		}
-		(void) fprintf(el->el_outfile, "\n");
-		return 0;
-	}
-	while (argv && (s = *argv++)) {
-		const Char *p;
-		switch (*s) {
-		case '+':
-		case '-':
-			x = (char)*s++;
-			break;
-		default:
-			x = '\0';
-			break;
-		}
-		d = s;
-		p = Strchr(s, '=');
-		for (m = ttymodes; m->m_name; m++)
-			if ((p ? strncmp(m->m_name, ct_encode_string(d,
-			    &el->el_scratch), (size_t)(p - d)) :
-			    strcmp(m->m_name, ct_encode_string(d,
-			    &el->el_scratch))) == 0 &&
-			    (p == NULL || m->m_type == MD_CHAR))
-				break;
-
-		if (!m->m_name) {
-			(void) fprintf(el->el_errfile,
-			    "%s: Invalid argument `" FSTR "'.\n", name, d);
-			return -1;
-		}
-		if (p) {
-			int c = ffs((int)m->m_value);
-			int v = *++p ? parse__escape(&p) :
-			    el->el_tty.t_vdisable;
-			assert(c != 0);
-			c--;
-			c = tty__getcharindex(c);
-			assert(c != -1);
-			tios->c_cc[c] = (cc_t)v;
-			continue;
-		}
-		switch (x) {
-		case '+':
-			el->el_tty.t_t[z][m->m_type].t_setmask |= m->m_value;
-			el->el_tty.t_t[z][m->m_type].t_clrmask &= ~m->m_value;
-			break;
-		case '-':
-			el->el_tty.t_t[z][m->m_type].t_setmask &= ~m->m_value;
-			el->el_tty.t_t[z][m->m_type].t_clrmask |= m->m_value;
-			break;
-		default:
-			el->el_tty.t_t[z][m->m_type].t_setmask &= ~m->m_value;
-			el->el_tty.t_t[z][m->m_type].t_clrmask &= ~m->m_value;
-			break;
-		}
-	}
-
-	tty_setup_flags(el, tios, z);
-	if (el->el_tty.t_mode == z) {
-		if (tty_setty(el, TCSADRAIN, tios) == -1) {
-#ifdef DEBUG_TTY
-			(void) fprintf(el->el_errfile, "%s: tty_setty: %s\n",
-			    __func__, strerror(errno));
-#endif /* DEBUG_TTY */
-			return -1;
-		}
-	}
-
-	return 0;
-}
-
-
-#ifdef notyet
-/* tty_printchar():
- *	DEbugging routine to print the tty characters
- */
-private void
-tty_printchar(EditLine *el, unsigned char *s)
-{
-	ttyperm_t *m;
-	int i;
-
-	for (i = 0; i < C_NCC; i++) {
-		for (m = el->el_tty.t_t; m->m_name; m++)
-			if (m->m_type == MD_CHAR && C_SH(i) == m->m_value)
-				break;
-		if (m->m_name)
-			(void) fprintf(el->el_errfile, "%s ^%c ",
-			    m->m_name, s[i] + 'A' - 1);
-		if (i % 5 == 0)
-			(void) fprintf(el->el_errfile, "\n");
-	}
-	(void) fprintf(el->el_errfile, "\n");
-}
-#endif /* notyet */
-
-
-private void
-tty_setup_flags(EditLine *el, struct termios *tios, int mode)
-{
-	int kind;
-	for (kind = MD_INP; kind <= MD_LIN; kind++) {
-		tcflag_t *f = tty__get_flag(tios, kind);
-		*f = tty_update_flag(el, *f, mode, kind);
-	}
-}
diff --git a/lib/libedit/tty.h b/lib/libedit/tty.h
deleted file mode 100644
index 0bf4b64ce..000000000
--- a/lib/libedit/tty.h
+++ /dev/null
@@ -1,482 +0,0 @@
-/*	$NetBSD: tty.h,v 1.15 2014/05/19 19:54:12 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)tty.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.tty.h: Local terminal header
- */
-#ifndef _h_el_tty
-#define	_h_el_tty
-
-#include "sys.h"
-#include "histedit.h"
-#include <termios.h>
-#include <unistd.h>
-
-/* Define our own since everyone gets it wrong! */
-#define	CONTROL(A)	((A) & 037)
-
-/*
- * Aix compatible names
- */
-# if defined(VWERSE) && !defined(VWERASE)
-#  define VWERASE VWERSE
-# endif /* VWERSE && !VWERASE */
-
-# if defined(VDISCRD) && !defined(VDISCARD)
-#  define VDISCARD VDISCRD
-# endif /* VDISCRD && !VDISCARD */
-
-# if defined(VFLUSHO) && !defined(VDISCARD)
-#  define VDISCARD VFLUSHO
-# endif  /* VFLUSHO && VDISCARD */
-
-# if defined(VSTRT) && !defined(VSTART)
-#  define VSTART VSTRT
-# endif /* VSTRT && ! VSTART */
-
-# if defined(VSTAT) && !defined(VSTATUS)
-#  define VSTATUS VSTAT
-# endif /* VSTAT && ! VSTATUS */
-
-# ifndef ONLRET
-#  define ONLRET 0
-# endif /* ONLRET */
-
-# ifndef TAB3
-#  ifdef OXTABS
-#   define TAB3 OXTABS
-#  else
-#   define TAB3 0
-#  endif /* OXTABS */
-# endif /* !TAB3 */
-
-# if defined(OXTABS) && !defined(XTABS)
-#  define XTABS OXTABS
-# endif /* OXTABS && !XTABS */
-
-# ifndef ONLCR
-#  define ONLCR 0
-# endif /* ONLCR */
-
-# ifndef IEXTEN
-#  define IEXTEN 0
-# endif /* IEXTEN */
-
-# ifndef ECHOCTL
-#  define ECHOCTL 0
-# endif /* ECHOCTL */
-
-# ifndef PARENB
-#  define PARENB 0
-# endif /* PARENB */
-
-# ifndef EXTPROC
-#  define EXTPROC 0
-# endif /* EXTPROC */
-
-# ifndef FLUSHO
-#  define FLUSHO  0
-# endif /* FLUSHO */
-
-
-# if defined(VDISABLE) && !defined(_POSIX_VDISABLE)
-#  define _POSIX_VDISABLE VDISABLE
-# endif /* VDISABLE && ! _POSIX_VDISABLE */
-
-/*
- * Work around ISC's definition of IEXTEN which is
- * XCASE!
- */
-# ifdef ISC
-#  if defined(IEXTEN) && defined(XCASE)
-#   if IEXTEN == XCASE
-#    undef IEXTEN
-#    define IEXTEN 0
-#   endif /* IEXTEN == XCASE */
-#  endif /* IEXTEN && XCASE */
-#  if defined(IEXTEN) && !defined(XCASE)
-#   define XCASE IEXTEN
-#   undef IEXTEN
-#   define IEXTEN 0
-#  endif /* IEXTEN && !XCASE */
-# endif /* ISC */
-
-/*
- * Work around convex weirdness where turning off IEXTEN makes us
- * lose all postprocessing!
- */
-#if defined(convex) || defined(__convex__)
-# if defined(IEXTEN) && IEXTEN != 0
-#  undef IEXTEN
-#  define IEXTEN 0
-# endif /* IEXTEN != 0 */
-#endif /* convex || __convex__ */
-
-/*
- * So that we don't lose job control.
- */
-#ifdef __SVR4
-# undef CSWTCH
-#endif
-
-#ifndef _POSIX_VDISABLE
-# define _POSIX_VDISABLE ((unsigned char) -1)
-#endif /* _POSIX_VDISABLE */
-
-#if !defined(CREPRINT) && defined(CRPRNT)
-# define CREPRINT CRPRNT
-#endif /* !CREPRINT && CRPRNT */
-#if !defined(CDISCARD) && defined(CFLUSH)
-# define CDISCARD CFLUSH
-#endif /* !CDISCARD && CFLUSH */
-
-#ifndef CINTR
-# define CINTR		CONTROL('c')
-#endif /* CINTR */
-#ifndef CQUIT
-# define CQUIT		034	/* ^\ */
-#endif /* CQUIT */
-#ifndef CERASE
-# define CERASE		0177	/* ^? */
-#endif /* CERASE */
-#ifndef CKILL
-# define CKILL		CONTROL('u')
-#endif /* CKILL */
-#ifndef CEOF
-# define CEOF		CONTROL('d')
-#endif /* CEOF */
-#ifndef CEOL
-# define CEOL		_POSIX_VDISABLE
-#endif /* CEOL */
-#ifndef CEOL2
-# define CEOL2		_POSIX_VDISABLE
-#endif /* CEOL2 */
-#ifndef CSWTCH
-# define CSWTCH		_POSIX_VDISABLE
-#endif /* CSWTCH */
-#ifndef CDSWTCH
-# define CDSWTCH	_POSIX_VDISABLE
-#endif /* CDSWTCH */
-#ifndef CERASE2
-# define CERASE2	_POSIX_VDISABLE
-#endif /* CERASE2 */
-#ifndef CSTART
-# define CSTART		CONTROL('q')
-#endif /* CSTART */
-#ifndef CSTOP
-# define CSTOP		CONTROL('s')
-#endif /* CSTOP */
-#ifndef CSUSP
-# define CSUSP		CONTROL('z')
-#endif /* CSUSP */
-#ifndef CDSUSP
-# define CDSUSP		CONTROL('y')
-#endif /* CDSUSP */
-
-#ifdef hpux
-
-# ifndef CREPRINT
-#  define CREPRINT	_POSIX_VDISABLE
-# endif /* CREPRINT */
-# ifndef CDISCARD
-#  define CDISCARD	_POSIX_VDISABLE
-# endif /* CDISCARD */
-# ifndef CLNEXT
-#  define CLNEXT	_POSIX_VDISABLE
-# endif /* CLNEXT */
-# ifndef CWERASE
-#  define CWERASE	_POSIX_VDISABLE
-# endif /* CWERASE */
-
-#else /* !hpux */
-
-# ifndef CREPRINT
-#  define CREPRINT	CONTROL('r')
-# endif /* CREPRINT */
-# ifndef CDISCARD
-#  define CDISCARD	CONTROL('o')
-# endif /* CDISCARD */
-# ifndef CLNEXT
-#  define CLNEXT	CONTROL('v')
-# endif /* CLNEXT */
-# ifndef CWERASE
-#  define CWERASE	CONTROL('w')
-# endif /* CWERASE */
-
-#endif /* hpux */
-
-#ifndef CSTATUS
-# define CSTATUS	CONTROL('t')
-#endif /* CSTATUS */
-#ifndef CPAGE
-# define CPAGE		' '
-#endif /* CPAGE */
-#ifndef CPGOFF
-# define CPGOFF		CONTROL('m')
-#endif /* CPGOFF */
-#ifndef CKILL2
-# define CKILL2		_POSIX_VDISABLE
-#endif /* CKILL2 */
-#ifndef CBRK
-# ifndef masscomp
-#  define CBRK		0377
-# else
-#  define CBRK		'\0'
-# endif /* masscomp */
-#endif /* CBRK */
-#ifndef CMIN
-# define CMIN		CEOF
-#endif /* CMIN */
-#ifndef CTIME
-# define CTIME		CEOL
-#endif /* CTIME */
-
-/*
- * Fix for sun inconsistency. On termio VSUSP and the rest of the
- * ttychars > NCC are defined. So we undefine them.
- */
-#if defined(TERMIO) || defined(POSIX)
-# if defined(POSIX) && defined(NCCS)
-#  define NUMCC		NCCS
-# else
-#  ifdef NCC
-#   define NUMCC	NCC
-#  endif /* NCC */
-# endif /* POSIX && NCCS */
-# ifdef NUMCC
-#  ifdef VINTR
-#   if NUMCC <= VINTR
-#    undef VINTR
-#   endif /* NUMCC <= VINTR */
-#  endif /* VINTR */
-#  ifdef VQUIT
-#   if NUMCC <= VQUIT
-#    undef VQUIT
-#   endif /* NUMCC <= VQUIT */
-#  endif /* VQUIT */
-#  ifdef VERASE
-#   if NUMCC <= VERASE
-#    undef VERASE
-#   endif /* NUMCC <= VERASE */
-#  endif /* VERASE */
-#  ifdef VKILL
-#   if NUMCC <= VKILL
-#    undef VKILL
-#   endif /* NUMCC <= VKILL */
-#  endif /* VKILL */
-#  ifdef VEOF
-#   if NUMCC <= VEOF
-#    undef VEOF
-#   endif /* NUMCC <= VEOF */
-#  endif /* VEOF */
-#  ifdef VEOL
-#   if NUMCC <= VEOL
-#    undef VEOL
-#   endif /* NUMCC <= VEOL */
-#  endif /* VEOL */
-#  ifdef VEOL2
-#   if NUMCC <= VEOL2
-#    undef VEOL2
-#   endif /* NUMCC <= VEOL2 */
-#  endif /* VEOL2 */
-#  ifdef VSWTCH
-#   if NUMCC <= VSWTCH
-#    undef VSWTCH
-#   endif /* NUMCC <= VSWTCH */
-#  endif /* VSWTCH */
-#  ifdef VDSWTCH
-#   if NUMCC <= VDSWTCH
-#    undef VDSWTCH
-#   endif /* NUMCC <= VDSWTCH */
-#  endif /* VDSWTCH */
-#  ifdef VERASE2
-#   if NUMCC <= VERASE2
-#    undef VERASE2
-#   endif /* NUMCC <= VERASE2 */
-#  endif /* VERASE2 */
-#  ifdef VSTART
-#   if NUMCC <= VSTART
-#    undef VSTART
-#   endif /* NUMCC <= VSTART */
-#  endif /* VSTART */
-#  ifdef VSTOP
-#   if NUMCC <= VSTOP
-#    undef VSTOP
-#   endif /* NUMCC <= VSTOP */
-#  endif /* VSTOP */
-#  ifdef VWERASE
-#   if NUMCC <= VWERASE
-#    undef VWERASE
-#   endif /* NUMCC <= VWERASE */
-#  endif /* VWERASE */
-#  ifdef VSUSP
-#   if NUMCC <= VSUSP
-#    undef VSUSP
-#   endif /* NUMCC <= VSUSP */
-#  endif /* VSUSP */
-#  ifdef VDSUSP
-#   if NUMCC <= VDSUSP
-#    undef VDSUSP
-#   endif /* NUMCC <= VDSUSP */
-#  endif /* VDSUSP */
-#  ifdef VREPRINT
-#   if NUMCC <= VREPRINT
-#    undef VREPRINT
-#   endif /* NUMCC <= VREPRINT */
-#  endif /* VREPRINT */
-#  ifdef VDISCARD
-#   if NUMCC <= VDISCARD
-#    undef VDISCARD
-#   endif /* NUMCC <= VDISCARD */
-#  endif /* VDISCARD */
-#  ifdef VLNEXT
-#   if NUMCC <= VLNEXT
-#    undef VLNEXT
-#   endif /* NUMCC <= VLNEXT */
-#  endif /* VLNEXT */
-#  ifdef VSTATUS
-#   if NUMCC <= VSTATUS
-#    undef VSTATUS
-#   endif /* NUMCC <= VSTATUS */
-#  endif /* VSTATUS */
-#  ifdef VPAGE
-#   if NUMCC <= VPAGE
-#    undef VPAGE
-#   endif /* NUMCC <= VPAGE */
-#  endif /* VPAGE */
-#  ifdef VPGOFF
-#   if NUMCC <= VPGOFF
-#    undef VPGOFF
-#   endif /* NUMCC <= VPGOFF */
-#  endif /* VPGOFF */
-#  ifdef VKILL2
-#   if NUMCC <= VKILL2
-#    undef VKILL2
-#   endif /* NUMCC <= VKILL2 */
-#  endif /* VKILL2 */
-#  ifdef VBRK
-#   if NUMCC <= VBRK
-#    undef VBRK
-#   endif /* NUMCC <= VBRK */
-#  endif /* VBRK */
-#  ifdef VMIN
-#   if NUMCC <= VMIN
-#    undef VMIN
-#   endif /* NUMCC <= VMIN */
-#  endif /* VMIN */
-#  ifdef VTIME
-#   if NUMCC <= VTIME
-#    undef VTIME
-#   endif /* NUMCC <= VTIME */
-#  endif /* VTIME */
-# endif /* NUMCC */
-#endif /* !POSIX */
-
-#define	C_INTR		 0
-#define	C_QUIT		 1
-#define	C_ERASE		 2
-#define	C_KILL		 3
-#define	C_EOF		 4
-#define	C_EOL		 5
-#define	C_EOL2		 6
-#define	C_SWTCH		 7
-#define	C_DSWTCH	 8
-#define	C_ERASE2	 9
-#define	C_START		10
-#define	C_STOP		11
-#define	C_WERASE	12
-#define	C_SUSP		13
-#define	C_DSUSP		14
-#define	C_REPRINT	15
-#define	C_DISCARD	16
-#define	C_LNEXT		17
-#define	C_STATUS	18
-#define	C_PAGE		19
-#define	C_PGOFF		20
-#define	C_KILL2		21
-#define	C_BRK		22
-#define	C_MIN		23
-#define	C_TIME		24
-#define	C_NCC		25
-#define	C_SH(A)		((unsigned int)(1 << (A)))
-
-/*
- * Terminal dependend data structures
- */
-#define	EX_IO	0	/* while we are executing	*/
-#define	ED_IO	1	/* while we are editing		*/
-#define	TS_IO	2	/* new mode from terminal	*/
-#define	QU_IO	2	/* used only for quoted chars	*/
-#define	NN_IO	3	/* The number of entries	*/
-
-/* Don't re-order */
-#define	MD_INP	0
-#define	MD_OUT	1
-#define	MD_CTL	2
-#define	MD_LIN	3
-#define	MD_CHAR	4
-#define	MD_NN	5
-
-typedef struct {
-	const char	*t_name;
-	unsigned int	 t_setmask;
-	unsigned int	 t_clrmask;
-} ttyperm_t[NN_IO][MD_NN];
-
-typedef unsigned char ttychar_t[NN_IO][C_NCC];
-
-protected int	tty_init(EditLine *);
-protected void	tty_end(EditLine *);
-protected int	tty_stty(EditLine *, int, const Char **);
-protected int	tty_rawmode(EditLine *);
-protected int	tty_cookedmode(EditLine *);
-protected int	tty_quotemode(EditLine *);
-protected int	tty_noquotemode(EditLine *);
-protected void	tty_bind_char(EditLine *, int);
-
-typedef struct {
-    ttyperm_t t_t;
-    ttychar_t t_c;
-    struct termios t_or, t_ex, t_ed, t_ts;
-    int t_tabs;
-    int t_eight;
-    speed_t t_speed;
-    int t_mode;
-    unsigned char t_vdisable;
-} el_tty_t;
-
-
-#endif /* _h_el_tty */
diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c
deleted file mode 100644
index 53c478171..000000000
--- a/lib/libedit/vi.c
+++ /dev/null
@@ -1,1150 +0,0 @@
-/*	$NetBSD: vi.c,v 1.45 2014/06/18 18:12:28 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 "config.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <limits.h>
-#include <sys/wait.h>
-
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)vi.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: vi.c,v 1.45 2014/06/18 18:12:28 christos Exp $");
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * vi.c: Vi mode commands.
- */
-#include "el.h"
-
-private el_action_t	cv_action(EditLine *, Int);
-private el_action_t	cv_paste(EditLine *, Int);
-
-/* cv_action():
- *	Handle vi actions.
- */
-private el_action_t
-cv_action(EditLine *el, Int c)
-{
-
-	if (el->el_chared.c_vcmd.action != NOP) {
-		/* 'cc', 'dd' and (possibly) friends */
-		if (c != (Int)el->el_chared.c_vcmd.action)
-			return CC_ERROR;
-
-		if (!(c & YANK))
-			cv_undo(el);
-		cv_yank(el, el->el_line.buffer,
-		    (int)(el->el_line.lastchar - el->el_line.buffer));
-		el->el_chared.c_vcmd.action = NOP;
-		el->el_chared.c_vcmd.pos = 0;
-		if (!(c & YANK)) {
-			el->el_line.lastchar = el->el_line.buffer;
-			el->el_line.cursor = el->el_line.buffer;
-		}
-		if (c & INSERT)
-			el->el_map.current = el->el_map.key;
-
-		return CC_REFRESH;
-	}
-	el->el_chared.c_vcmd.pos = el->el_line.cursor;
-	el->el_chared.c_vcmd.action = c;
-	return CC_ARGHACK;
-}
-
-/* cv_paste():
- *	Paste previous deletion before or after the cursor
- */
-private el_action_t
-cv_paste(EditLine *el, Int c)
-{
-	c_kill_t *k = &el->el_chared.c_kill;
-	size_t len = (size_t)(k->last - k->buf);
-
-	if (k->buf == NULL || len == 0)
-		return CC_ERROR;
-#ifdef DEBUG_PASTE
-	(void) fprintf(el->el_errfile, "Paste: \"%.*s\"\n", (int)len, k->buf);
-#endif
-
-	cv_undo(el);
-
-	if (!c && el->el_line.cursor < el->el_line.lastchar)
-		el->el_line.cursor++;
-
-	c_insert(el, (int)len);
-	if (el->el_line.cursor + len > el->el_line.lastchar)
-		return CC_ERROR;
-	(void) memcpy(el->el_line.cursor, k->buf, len *
-	    sizeof(*el->el_line.cursor));
-
-	return CC_REFRESH;
-}
-
-
-/* vi_paste_next():
- *	Vi paste previous deletion to the right of the cursor
- *	[p]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_paste_next(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	return cv_paste(el, 0);
-}
-
-
-/* vi_paste_prev():
- *	Vi paste previous deletion to the left of the cursor
- *	[P]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_paste_prev(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	return cv_paste(el, 1);
-}
-
-
-/* vi_prev_big_word():
- *	Vi move to the previous space delimited word
- *	[B]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_prev_big_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor == el->el_line.buffer)
-		return CC_ERROR;
-
-	el->el_line.cursor = cv_prev_word(el->el_line.cursor,
-	    el->el_line.buffer,
-	    el->el_state.argument,
-	    cv__isWord);
-
-	if (el->el_chared.c_vcmd.action != NOP) {
-		cv_delfini(el);
-		return CC_REFRESH;
-	}
-	return CC_CURSOR;
-}
-
-
-/* vi_prev_word():
- *	Vi move to the previous word
- *	[b]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_prev_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor == el->el_line.buffer)
-		return CC_ERROR;
-
-	el->el_line.cursor = cv_prev_word(el->el_line.cursor,
-	    el->el_line.buffer,
-	    el->el_state.argument,
-	    cv__isword);
-
-	if (el->el_chared.c_vcmd.action != NOP) {
-		cv_delfini(el);
-		return CC_REFRESH;
-	}
-	return CC_CURSOR;
-}
-
-
-/* vi_next_big_word():
- *	Vi move to the next space delimited word
- *	[W]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_next_big_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor >= el->el_line.lastchar - 1)
-		return CC_ERROR;
-
-	el->el_line.cursor = cv_next_word(el, el->el_line.cursor,
-	    el->el_line.lastchar, el->el_state.argument, cv__isWord);
-
-	if (el->el_map.type == MAP_VI)
-		if (el->el_chared.c_vcmd.action != NOP) {
-			cv_delfini(el);
-			return CC_REFRESH;
-		}
-	return CC_CURSOR;
-}
-
-
-/* vi_next_word():
- *	Vi move to the next word
- *	[w]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_next_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor >= el->el_line.lastchar - 1)
-		return CC_ERROR;
-
-	el->el_line.cursor = cv_next_word(el, el->el_line.cursor,
-	    el->el_line.lastchar, el->el_state.argument, cv__isword);
-
-	if (el->el_map.type == MAP_VI)
-		if (el->el_chared.c_vcmd.action != NOP) {
-			cv_delfini(el);
-			return CC_REFRESH;
-		}
-	return CC_CURSOR;
-}
-
-
-/* vi_change_case():
- *	Vi change case of character under the cursor and advance one character
- *	[~]
- */
-protected el_action_t
-vi_change_case(EditLine *el, Int c)
-{
-	int i;
-
-	if (el->el_line.cursor >= el->el_line.lastchar)
-		return CC_ERROR;
-	cv_undo(el);
-	for (i = 0; i < el->el_state.argument; i++) {
-
-		c = *el->el_line.cursor;
-		if (Isupper(c))
-			*el->el_line.cursor = Tolower(c);
-		else if (Islower(c))
-			*el->el_line.cursor = Toupper(c);
-
-		if (++el->el_line.cursor >= el->el_line.lastchar) {
-			el->el_line.cursor--;
-			re_fastaddc(el);
-			break;
-		}
-		re_fastaddc(el);
-	}
-	return CC_NORM;
-}
-
-
-/* vi_change_meta():
- *	Vi change prefix command
- *	[c]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_change_meta(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	/*
-         * Delete with insert == change: first we delete and then we leave in
-         * insert mode.
-         */
-	return cv_action(el, DELETE | INSERT);
-}
-
-
-/* vi_insert_at_bol():
- *	Vi enter insert mode at the beginning of line
- *	[I]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_insert_at_bol(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_line.cursor = el->el_line.buffer;
-	cv_undo(el);
-	el->el_map.current = el->el_map.key;
-	return CC_CURSOR;
-}
-
-
-/* vi_replace_char():
- *	Vi replace character under the cursor with the next character typed
- *	[r]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_replace_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor >= el->el_line.lastchar)
-		return CC_ERROR;
-
-	el->el_map.current = el->el_map.key;
-	el->el_state.inputmode = MODE_REPLACE_1;
-	cv_undo(el);
-	return CC_ARGHACK;
-}
-
-
-/* vi_replace_mode():
- *	Vi enter replace mode
- *	[R]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_replace_mode(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_map.current = el->el_map.key;
-	el->el_state.inputmode = MODE_REPLACE;
-	cv_undo(el);
-	return CC_NORM;
-}
-
-
-/* vi_substitute_char():
- *	Vi replace character under the cursor and enter insert mode
- *	[s]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_substitute_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	c_delafter(el, el->el_state.argument);
-	el->el_map.current = el->el_map.key;
-	return CC_REFRESH;
-}
-
-
-/* vi_substitute_line():
- *	Vi substitute entire line
- *	[S]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_substitute_line(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	cv_undo(el);
-	cv_yank(el, el->el_line.buffer,
-	    (int)(el->el_line.lastchar - el->el_line.buffer));
-	(void) em_kill_line(el, 0);
-	el->el_map.current = el->el_map.key;
-	return CC_REFRESH;
-}
-
-
-/* vi_change_to_eol():
- *	Vi change to end of line
- *	[C]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_change_to_eol(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	cv_undo(el);
-	cv_yank(el, el->el_line.cursor,
-	    (int)(el->el_line.lastchar - el->el_line.cursor));
-	(void) ed_kill_line(el, 0);
-	el->el_map.current = el->el_map.key;
-	return CC_REFRESH;
-}
-
-
-/* vi_insert():
- *	Vi enter insert mode
- *	[i]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_insert(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_map.current = el->el_map.key;
-	cv_undo(el);
-	return CC_NORM;
-}
-
-
-/* vi_add():
- *	Vi enter insert mode after the cursor
- *	[a]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_add(EditLine *el, Int c __attribute__((__unused__)))
-{
-	int ret;
-
-	el->el_map.current = el->el_map.key;
-	if (el->el_line.cursor < el->el_line.lastchar) {
-		el->el_line.cursor++;
-		if (el->el_line.cursor > el->el_line.lastchar)
-			el->el_line.cursor = el->el_line.lastchar;
-		ret = CC_CURSOR;
-	} else
-		ret = CC_NORM;
-
-	cv_undo(el);
-
-	return (el_action_t)ret;
-}
-
-
-/* vi_add_at_eol():
- *	Vi enter insert mode at end of line
- *	[A]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_add_at_eol(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_map.current = el->el_map.key;
-	el->el_line.cursor = el->el_line.lastchar;
-	cv_undo(el);
-	return CC_CURSOR;
-}
-
-
-/* vi_delete_meta():
- *	Vi delete prefix command
- *	[d]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_delete_meta(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	return cv_action(el, DELETE);
-}
-
-
-/* vi_end_big_word():
- *	Vi move to the end of the current space delimited word
- *	[E]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_end_big_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor == el->el_line.lastchar)
-		return CC_ERROR;
-
-	el->el_line.cursor = cv__endword(el->el_line.cursor,
-	    el->el_line.lastchar, el->el_state.argument, cv__isWord);
-
-	if (el->el_chared.c_vcmd.action != NOP) {
-		el->el_line.cursor++;
-		cv_delfini(el);
-		return CC_REFRESH;
-	}
-	return CC_CURSOR;
-}
-
-
-/* vi_end_word():
- *	Vi move to the end of the current word
- *	[e]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_end_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor == el->el_line.lastchar)
-		return CC_ERROR;
-
-	el->el_line.cursor = cv__endword(el->el_line.cursor,
-	    el->el_line.lastchar, el->el_state.argument, cv__isword);
-
-	if (el->el_chared.c_vcmd.action != NOP) {
-		el->el_line.cursor++;
-		cv_delfini(el);
-		return CC_REFRESH;
-	}
-	return CC_CURSOR;
-}
-
-
-/* vi_undo():
- *	Vi undo last change
- *	[u]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_undo(EditLine *el, Int c __attribute__((__unused__)))
-{
-	c_undo_t un = el->el_chared.c_undo;
-
-	if (un.len == -1)
-		return CC_ERROR;
-
-	/* switch line buffer and undo buffer */
-	el->el_chared.c_undo.buf = el->el_line.buffer;
-	el->el_chared.c_undo.len = el->el_line.lastchar - el->el_line.buffer;
-	el->el_chared.c_undo.cursor =
-	    (int)(el->el_line.cursor - el->el_line.buffer);
-	el->el_line.limit = un.buf + (el->el_line.limit - el->el_line.buffer);
-	el->el_line.buffer = un.buf;
-	el->el_line.cursor = un.buf + un.cursor;
-	el->el_line.lastchar = un.buf + un.len;
-
-	return CC_REFRESH;
-}
-
-
-/* vi_command_mode():
- *	Vi enter command mode (use alternative key bindings)
- *	[<ESC>]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_command_mode(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	/* [Esc] cancels pending action */
-	el->el_chared.c_vcmd.action = NOP;
-	el->el_chared.c_vcmd.pos = 0;
-
-	el->el_state.doingarg = 0;
-
-	el->el_state.inputmode = MODE_INSERT;
-	el->el_map.current = el->el_map.alt;
-#ifdef VI_MOVE
-	if (el->el_line.cursor > el->el_line.buffer)
-		el->el_line.cursor--;
-#endif
-	return CC_CURSOR;
-}
-
-
-/* vi_zero():
- *	Vi move to the beginning of line
- *	[0]
- */
-protected el_action_t
-vi_zero(EditLine *el, Int c)
-{
-
-	if (el->el_state.doingarg)
-		return ed_argument_digit(el, c);
-
-	el->el_line.cursor = el->el_line.buffer;
-	if (el->el_chared.c_vcmd.action != NOP) {
-		cv_delfini(el);
-		return CC_REFRESH;
-	}
-	return CC_CURSOR;
-}
-
-
-/* vi_delete_prev_char():
- * 	Vi move to previous character (backspace)
- *	[^H] in insert mode only
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_delete_prev_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor <= el->el_line.buffer)
-		return CC_ERROR;
-
-	c_delbefore1(el);
-	el->el_line.cursor--;
-	return CC_REFRESH;
-}
-
-
-/* vi_list_or_eof():
- *	Vi list choices for completion or indicate end of file if empty line
- *	[^D]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_list_or_eof(EditLine *el, Int c)
-{
-
-	if (el->el_line.cursor == el->el_line.lastchar) {
-		if (el->el_line.cursor == el->el_line.buffer) {
-			terminal_writec(el, c);	/* then do a EOF */
-			return CC_EOF;
-		} else {
-			/*
-			 * Here we could list completions, but it is an
-			 * error right now
-			 */
-			terminal_beep(el);
-			return CC_ERROR;
-		}
-	} else {
-#ifdef notyet
-		re_goto_bottom(el);
-		*el->el_line.lastchar = '\0';	/* just in case */
-		return CC_LIST_CHOICES;
-#else
-		/*
-		 * Just complain for now.
-		 */
-		terminal_beep(el);
-		return CC_ERROR;
-#endif
-	}
-}
-
-
-/* vi_kill_line_prev():
- *	Vi cut from beginning of line to cursor
- *	[^U]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_kill_line_prev(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *kp, *cp;
-
-	cp = el->el_line.buffer;
-	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, (int)(el->el_line.cursor - el->el_line.buffer));
-	el->el_line.cursor = el->el_line.buffer;	/* zap! */
-	return CC_REFRESH;
-}
-
-
-/* vi_search_prev():
- *	Vi search history previous
- *	[?]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_search_prev(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	return cv_search(el, ED_SEARCH_PREV_HISTORY);
-}
-
-
-/* vi_search_next():
- *	Vi search history next
- *	[/]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_search_next(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	return cv_search(el, ED_SEARCH_NEXT_HISTORY);
-}
-
-
-/* vi_repeat_search_next():
- *	Vi repeat current search in the same search direction
- *	[n]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_repeat_search_next(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_search.patlen == 0)
-		return CC_ERROR;
-	else
-		return cv_repeat_srch(el, el->el_search.patdir);
-}
-
-
-/* vi_repeat_search_prev():
- *	Vi repeat current search in the opposite search direction
- *	[N]
- */
-/*ARGSUSED*/
-protected el_action_t
-vi_repeat_search_prev(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_search.patlen == 0)
-		return CC_ERROR;
-	else
-		return (cv_repeat_srch(el,
-		    el->el_search.patdir == ED_SEARCH_PREV_HISTORY ?
-		    ED_SEARCH_NEXT_HISTORY : ED_SEARCH_PREV_HISTORY));
-}
-
-
-/* vi_next_char():
- *	Vi move to the character specified next
- *	[f]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_next_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-	return cv_csearch(el, CHAR_FWD, -1, el->el_state.argument, 0);
-}
-
-
-/* vi_prev_char():
- *	Vi move to the character specified previous
- *	[F]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_prev_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-	return cv_csearch(el, CHAR_BACK, -1, el->el_state.argument, 0);
-}
-
-
-/* vi_to_next_char():
- *	Vi move up to the character specified next
- *	[t]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_to_next_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-	return cv_csearch(el, CHAR_FWD, -1, el->el_state.argument, 1);
-}
-
-
-/* vi_to_prev_char():
- *	Vi move up to the character specified previous
- *	[T]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_to_prev_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-	return cv_csearch(el, CHAR_BACK, -1, el->el_state.argument, 1);
-}
-
-
-/* vi_repeat_next_char():
- *	Vi repeat current character search in the same search direction
- *	[;]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_repeat_next_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	return cv_csearch(el, el->el_search.chadir, el->el_search.chacha,
-		el->el_state.argument, el->el_search.chatflg);
-}
-
-
-/* vi_repeat_prev_char():
- *	Vi repeat current character search in the opposite search direction
- *	[,]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_repeat_prev_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-	el_action_t r;
-	int dir = el->el_search.chadir;
-
-	r = cv_csearch(el, -dir, el->el_search.chacha,
-		el->el_state.argument, el->el_search.chatflg);
-	el->el_search.chadir = dir;
-	return r;
-}
-
-
-/* vi_match():
- *	Vi go to matching () {} or []
- *	[%]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_match(EditLine *el, Int c __attribute__((__unused__)))
-{
-	const Char match_chars[] = STR("()[]{}");
-	Char *cp;
-	size_t delta, i, count;
-	Char o_ch, c_ch;
-
-	*el->el_line.lastchar = '\0';		/* just in case */
-
-	i = Strcspn(el->el_line.cursor, match_chars);
-	o_ch = el->el_line.cursor[i];
-	if (o_ch == 0)
-		return CC_ERROR;
-	delta = (size_t)(Strchr(match_chars, o_ch) - match_chars);
-	c_ch = match_chars[delta ^ 1];
-	count = 1;
-	delta = 1 - (delta & 1) * 2;
-
-	for (cp = &el->el_line.cursor[i]; count; ) {
-		cp += delta;
-		if (cp < el->el_line.buffer || cp >= el->el_line.lastchar)
-			return CC_ERROR;
-		if (*cp == o_ch)
-			count++;
-		else if (*cp == c_ch)
-			count--;
-	}
-
-	el->el_line.cursor = cp;
-
-	if (el->el_chared.c_vcmd.action != NOP) {
-		/* NB posix says char under cursor should NOT be deleted
-		   for -ve delta - this is different to netbsd vi. */
-		if (delta > 0)
-			el->el_line.cursor++;
-		cv_delfini(el);
-		return CC_REFRESH;
-	}
-	return CC_CURSOR;
-}
-
-/* vi_undo_line():
- *	Vi undo all changes to line
- *	[U]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_undo_line(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	cv_undo(el);
-	return hist_get(el);
-}
-
-/* vi_to_column():
- *	Vi go to specified column
- *	[|]
- * NB netbsd vi goes to screen column 'n', posix says nth character
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_to_column(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_line.cursor = el->el_line.buffer;
-	el->el_state.argument--;
-	return ed_next_char(el, 0);
-}
-
-/* vi_yank_end():
- *	Vi yank to end of line
- *	[Y]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_yank_end(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	cv_yank(el, el->el_line.cursor,
-	    (int)(el->el_line.lastchar - el->el_line.cursor));
-	return CC_REFRESH;
-}
-
-/* vi_yank():
- *	Vi yank
- *	[y]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_yank(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	return cv_action(el, YANK);
-}
-
-/* vi_comment_out():
- *	Vi comment out current command
- *	[#]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_comment_out(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_line.cursor = el->el_line.buffer;
-	c_insert(el, 1);
-	*el->el_line.cursor = '#';
-	re_refresh(el);
-	return ed_newline(el, 0);
-}
-
-/* vi_alias():
- *	Vi include shell alias
- *	[@]
- * NB: posix implies that we should enter insert mode, however
- * this is against historical precedent...
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_alias(EditLine *el, Int c __attribute__((__unused__)))
-{
-	char alias_name[3];
-	const char *alias_text;
-
-	if (el->el_chared.c_aliasfun == NULL)
-		return CC_ERROR;
-
-	alias_name[0] = '_';
-	alias_name[2] = 0;
-	if (el_getc(el, &alias_name[1]) != 1)
-		return CC_ERROR;
-
-	alias_text = (*el->el_chared.c_aliasfun)(el->el_chared.c_aliasarg,
-	    alias_name);
-	if (alias_text != NULL)
-		FUN(el,push)(el, ct_decode_string(alias_text, &el->el_scratch));
-	return CC_NORM;
-}
-
-/* vi_to_history_line():
- *	Vi go to specified history file line.
- *	[G]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_to_history_line(EditLine *el, Int c __attribute__((__unused__)))
-{
-	int sv_event_no = el->el_history.eventno;
-	el_action_t rval;
-
-
-	if (el->el_history.eventno == 0) {
-		 (void) Strncpy(el->el_history.buf, el->el_line.buffer,
-		     EL_BUFSIZ);
-		 el->el_history.last = el->el_history.buf +
-			 (el->el_line.lastchar - el->el_line.buffer);
-	}
-
-	/* Lack of a 'count' means oldest, not 1 */
-	if (!el->el_state.doingarg) {
-		el->el_history.eventno = 0x7fffffff;
-		hist_get(el);
-	} else {
-		/* This is brain dead, all the rest of this code counts
-		 * upwards going into the past.  Here we need count in the
-		 * other direction (to match the output of fc -l).
-		 * I could change the world, but this seems to suffice.
-		 */
-		el->el_history.eventno = 1;
-		if (hist_get(el) == CC_ERROR)
-			return CC_ERROR;
-		el->el_history.eventno = 1 + el->el_history.ev.num 
-					- el->el_state.argument;
-		if (el->el_history.eventno < 0) {
-			el->el_history.eventno = sv_event_no;
-			return CC_ERROR;
-		}
-	}
-	rval = hist_get(el);
-	if (rval == CC_ERROR)
-		el->el_history.eventno = sv_event_no;
-	return rval;
-}
-
-/* vi_histedit():
- *	Vi edit history line with vi
- *	[v]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_histedit(EditLine *el, Int c __attribute__((__unused__)))
-{
-	int fd;
-	pid_t pid;
-	ssize_t st;
-	int status;
-	char tempfile[] = "/tmp/histedit.XXXXXXXXXX";
-	char *cp = NULL;
-	size_t len;
-	Char *line = NULL;
-
-	if (el->el_state.doingarg) {
-		if (vi_to_history_line(el, 0) == CC_ERROR)
-			return CC_ERROR;
-	}
-
-	fd = mkstemp(tempfile);
-	if (fd < 0)
-		return CC_ERROR;
-	len = (size_t)(el->el_line.lastchar - el->el_line.buffer);
-#define TMP_BUFSIZ (EL_BUFSIZ * MB_LEN_MAX)
-	cp = el_malloc(TMP_BUFSIZ * sizeof(*cp));
-	if (cp == NULL)
-		goto error;
-	line = el_malloc(len * sizeof(*line) + 1);
-	if (line == NULL)
-		goto error;
-	Strncpy(line, el->el_line.buffer, len);
-	line[len] = '\0';
-	ct_wcstombs(cp, line, TMP_BUFSIZ - 1);
-	cp[TMP_BUFSIZ - 1] = '\0';
-	len = strlen(cp);
-	write(fd, cp, len);
-	write(fd, "\n", (size_t)1);
-	pid = fork();
-	switch (pid) {
-	case -1:
-		goto error;
-	case 0:
-		close(fd);
-		execlp("vi", "vi", tempfile, (char *)NULL);
-		exit(0);
-		/*NOTREACHED*/
-	default:
-		while (waitpid(pid, &status, 0) != pid)
-			continue;
-		lseek(fd, (off_t)0, SEEK_SET);
-		st = read(fd, cp, TMP_BUFSIZ);
-		if (st > 0) {
-			len = (size_t)(el->el_line.lastchar -
-			    el->el_line.buffer);
-			len = ct_mbstowcs(el->el_line.buffer, cp, len);
-			if (len > 0 && el->el_line.buffer[len -1] == '\n')
-				--len;
-		}
-		else
-			len = 0;
-                el->el_line.cursor = el->el_line.buffer;
-                el->el_line.lastchar = el->el_line.buffer + len;
-		el_free(cp);
-                el_free(line);
-		break;
-	}
-
-	close(fd);
-	unlink(tempfile);
-	/* return CC_REFRESH; */
-	return ed_newline(el, 0);
-error:
-	el_free(line);
-	el_free(cp);
-	close(fd);
-	unlink(tempfile);
-	return CC_ERROR;
-}
-
-/* vi_history_word():
- *	Vi append word from previous input line
- *	[_]
- * Who knows where this one came from!
- * '_' in vi means 'entire current line', so 'cc' is a synonym for 'c_'
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_history_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-	const Char *wp = HIST_FIRST(el);
-	const Char *wep, *wsp;
-	int len;
-	Char *cp;
-	const Char *lim;
-
-	if (wp == NULL)
-		return CC_ERROR;
-
-	wep = wsp = 0;
-	do {
-		while (Isspace(*wp))
-			wp++;
-		if (*wp == 0)
-			break;
-		wsp = wp;
-		while (*wp && !Isspace(*wp))
-			wp++;
-		wep = wp;
-	} while ((!el->el_state.doingarg || --el->el_state.argument > 0)
-	    && *wp != 0);
-
-	if (wsp == 0 || (el->el_state.doingarg && el->el_state.argument != 0))
-		return CC_ERROR;
-
-	cv_undo(el);
-	len = (int)(wep - wsp);
-	if (el->el_line.cursor < el->el_line.lastchar)
-		el->el_line.cursor++;
-	c_insert(el, len + 1);
-	cp = el->el_line.cursor;
-	lim = el->el_line.limit;
-	if (cp < lim)
-		*cp++ = ' ';
-	while (wsp < wep && cp < lim)
-		*cp++ = *wsp++;
-	el->el_line.cursor = cp;
-
-	el->el_map.current = el->el_map.key;
-	return CC_REFRESH;
-}
-
-/* vi_redo():
- *	Vi redo last non-motion command
- *	[.]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_redo(EditLine *el, Int c __attribute__((__unused__)))
-{
-	c_redo_t *r = &el->el_chared.c_redo;
-
-	if (!el->el_state.doingarg && r->count) {
-		el->el_state.doingarg = 1;
-		el->el_state.argument = r->count;
-	}
-
-	el->el_chared.c_vcmd.pos = el->el_line.cursor;
-	el->el_chared.c_vcmd.action = r->action;
-	if (r->pos != r->buf) {
-		if (r->pos + 1 > r->lim)
-			/* sanity */
-			r->pos = r->lim - 1;
-		r->pos[0] = 0;
-		FUN(el,push)(el, r->buf);
-	}
-
-	el->el_state.thiscmd = r->cmd;
-	el->el_state.thisch = r->ch;
-	return (*el->el_map.func[r->cmd])(el, r->ch);
-}
diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile
deleted file mode 100644
index 9458eea88..000000000
--- a/lib/libexecinfo/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2014/10/24 22:42:16 joerg Exp $
-
-.include <bsd.own.mk>
-
-LIBEXECINFO_MACHINE_ARCH?= ${MACHINE_ARCH}
-USE_UNWIND=yes
-WARNS?=4
-INCSDIR=/usr/include
-INCS=execinfo.h
-
-.if ${HAVE_LIBGCC_EH} == "yes"
-INCS+=	unwind.h
-.endif
-
-#CPPFLAGS+='-D__RCSID(a)=' -D_GNU_SOURCE '-D__printflike(a,b)='
-#CPPFLAGS+=-I/usr/include/libelf
-#COPTS+=-std=gnu99
-
-LIBDPLIBS+= elf	${NETBSDSRCDIR}/external/bsd/elftoolchain/lib/libelf
-
-LIB=execinfo
-SRCS=symtab.c backtrace.c
-MAN= backtrace.3
-
-.if ${USE_UNWIND} == "yes"
-SRCS+=unwind.c
-.if !empty(LIBEXECINFO_MACHINE_ARCH:Mearm*)
-SRCS+=unwind_arm_ehabi_stub.c
-.endif
-.else
-SRCS+=builtin.c
-.endif
-
-MLINKS+= backtrace.3 backtrace_symbols.3
-MLINKS+= backtrace.3 backtrace_symbols_fmt.3
-MLINKS+= backtrace.3 backtrace_symbols_fd.3
-MLINKS+= backtrace.3 backtrace_symbols_fd_fmt.3
-
-.include <bsd.lib.mk>
diff --git a/lib/libexecinfo/backtrace.3 b/lib/libexecinfo/backtrace.3
deleted file mode 100644
index 570c0f16c..000000000
--- a/lib/libexecinfo/backtrace.3
+++ /dev/null
@@ -1,159 +0,0 @@
-.\"	$NetBSD: backtrace.3,v 1.5 2013/08/22 17:08:43 christos Exp $
-.\"
-.\" Copyright (c) 2012 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 26, 2012
-.Dt BACKTRACE 3
-.Os
-.Sh NAME
-.Nm backtrace
-.Nd fill in the backtrace of the currently executing thread
-.Sh LIBRARY
-.Lb libexecinfo
-.Sh SYNOPSIS
-.In execinfo.h
-.Ft size_t
-.Fn backtrace "void **addrlist" "size_t len"
-.Ft "char **"
-.Fn backtrace_symbols "void * const *addrlist" "size_t len"
-.Ft int
-.Fn backtrace_symbols_fd "void * const *addrlist" "size_t len" "int fd"
-.Ft "char **"
-.Fn backtrace_symbols_fmt "void * const *addrlist" "size_t len" "const char *fmt"
-.Ft int
-.Fn backtrace_symbols_fmt_fd "void * const *addrlist" "size_t len" "const char *fmt" "int fd"
-.Sh DESCRIPTION
-The
-.Fn backtrace
-function places into the array pointed by
-.Fa addrlist
-the array of the values of the program counter for each frame called up to
-.Fa len
-frames.
-The number of frames found (which can be fewer than
-.Fa len )
-is returned.
-.Pp
-The
-.Fn backtrace_symbols_fmt
-function takes an array of previously filled addresses from
-.Fn backtrace
-in
-.Fa addrlist
-of
-.Fa len
-elements, and uses
-.Fa fmt
-to format them.
-The formatting characters available are:
-.Bl -tag -width a -offset indent
-.It Dv a
-The numeric address of each element as would be printed using %p.
-.It Dv n
-The name of the nearest function symbol (smaller than the address element)
-as determined by
-.Xr dladdr 3
-if the symbol was dynamic, or looked up in the executable if static and
-the /proc filesystem is available to determine the executable path.
-.It Dv d
-The difference of the symbol address and the address element printed
-using 0x%tx.
-.It Dv D
-The difference of the symbol addresss and the address element printed using
-+0x%tx if non-zero, or nothing if zero.
-.It Dv f
-The filename of the symbol as determined by
-.Xr dladdr 3 .
-.El
-.Pp
-The array of formatted strings is returned as a contiguous memory address which
-can be freed by a single
-.Xr free 3 .
-.Pp
-The
-.Fn backtrace_symbols
-function is equivalent of calling
-.Fn backtrace_symbols_fmt
-with a format argument of
-.Dv "%a <%n%D> at %f"
-.Pp
-The
-.Fn backtrace_symbols_fd
-and
-.Fn backtrace_symbols_fmt_fd
-are similar to the non _fd named functions, only instead of returning
-an array or strings, they print a new-line separated array of strings in
-fd, and return
-.Dv 0
-on success and
-.Dv \-1
-on failure.
-.Sh RETURN VALUES
-The
-.Fn backtrace
-function returns the number of elements that were filled in the backtrace.
-The
-.Fn backtrace_symbols
-and
-.Fn backtrace_symbols_fmt
-return a string array on success, and
-.Dv NULL
-on failure, setting
-.Va errno .
-Diagnostic output may also be produced by the ELF symbol lookup functions.
-.Sh SEE ALSO
-.Xr dladdr 3 ,
-.Xr elf 3
-.Sh HISTORY
-The
-.Fn backtrace
-library of functions first appeared in
-.Nx 7.0 .
-.Sh BUGS
-.Bl -enum
-.It
-Errors should not be printed but communicated to the caller differently.
-.It
-Because these functions use
-.Xr elf 3
-this is a separate library instead of being part of libc/libutil
-so that no library dependencies are introduced.
-.It
-The Linux versions of the functions (there are no _fmt variants) use
-.Ft int
-instead of
-.Ft size_t
-arguments.
-.It
-Since
-.Xr dladdr 3
-only deals with dynamic symbols, we need to find the symbols from the main
-portion of the program.
-For that we need to locate the executable, and we use procfs for
-finding it, which is not portable.
-.El
diff --git a/lib/libexecinfo/backtrace.c b/lib/libexecinfo/backtrace.c
deleted file mode 100644
index f3245ebb4..000000000
--- a/lib/libexecinfo/backtrace.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*	$NetBSD: backtrace.c,v 1.6 2015/09/25 19:27:31 christos Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: backtrace.c,v 1.6 2015/09/25 19:27:31 christos Exp $");
-
-#include <sys/param.h>
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <dlfcn.h>
-#include <elf.h>
-
-#include "execinfo.h"
-#include "symtab.h"
-
-#ifdef __linux__
-#define SELF	"/proc/self/exe"
-#else
-#include <sys/sysctl.h>
-#define SELF	"/proc/curproc/file"
-#endif
-
-static int
-open_self(int flags)
-{
-	const char *pathname = SELF;
-#ifdef KERN_PROC_PATHNAME
-	static const int name[] = {
-		CTL_KERN, KERN_PROC_ARGS, -1, KERN_PROC_PATHNAME,
-	};
-	char path[MAXPATHLEN];
-	size_t len;
-
-	len = sizeof(path);
-	if (sysctl(name, __arraycount(name), path, &len, NULL, 0) != -1)
-		pathname = path;
-#endif
-	return open(pathname, flags);
-}
-
-
-static int __printflike(4, 5)
-rasprintf(char **buf, size_t *bufsiz, size_t offs, const char *fmt, ...)
-{
-	for (;;) {
-		size_t nbufsiz;
-		char *nbuf;
-
-		if (*buf && offs < *bufsiz) {
-			va_list ap;
-			int len;
-
-			va_start(ap, fmt);
-			len = vsnprintf(*buf + offs, *bufsiz - offs, fmt, ap);
-			va_end(ap);
-
-			if (len < 0 || (size_t)len + 1 < *bufsiz - offs)
-				return len;
-			nbufsiz = MAX(*bufsiz + 512, (size_t)len + 1);
-		} else
-			nbufsiz = MAX(offs, *bufsiz) + 512;
-			
-		nbuf = realloc(*buf, nbufsiz);
-		if (nbuf == NULL)
-			return -1;
-		*buf = nbuf;
-		*bufsiz = nbufsiz;
-	}
-}
-
-/*
- * format specifiers:
- *	%a	= address
- *	%n	= symbol_name
- *	%d	= symbol_address - address
- *	%D	= if symbol_address == address "" else +%d
- *	%f	= filename
- */
-static ssize_t
-format_string(char **buf, size_t *bufsiz, size_t offs, const char *fmt,
-    Dl_info *dli, const void *addr)
-{
-	ptrdiff_t diff = (const char *)addr - (const char *)dli->dli_saddr;
-	size_t o = offs;
-	int len;
-
-	for (; *fmt; fmt++) {
-		if (*fmt != '%')
-			goto printone;
-		switch (*++fmt) {
-		case 'a':
-			len = rasprintf(buf, bufsiz, o, "%p", addr);
-			break;
-		case 'n':
-			len = rasprintf(buf, bufsiz, o, "%s", dli->dli_sname);
-			break;
-		case 'D':
-			if (diff)
-				len = rasprintf(buf, bufsiz, o, "+0x%tx", diff);
-			else
-				len = 0;
-			break;
-		case 'd':
-			len = rasprintf(buf, bufsiz, o, "0x%tx", diff);
-			break;
-		case 'f':
-			len = rasprintf(buf, bufsiz, o, "%s", dli->dli_fname);
-			break;
-		default:
-		printone:
-			len = rasprintf(buf, bufsiz, o, "%c", *fmt);
-			break;
-		}
-		if (len == -1)
-			return -1;
-		o += len;
-	}
-	return o - offs;
-}
-
-static ssize_t
-format_address(symtab_t *st, char **buf, size_t *bufsiz, size_t offs,
-    const char *fmt, const void *addr)
-{
-	Dl_info dli;
-
-	memset(&dli, 0, sizeof(dli));
-	(void)dladdr(addr, &dli);
-	if (st)
-		symtab_find(st, addr, &dli);
-
-	if (dli.dli_sname == NULL)
-		dli.dli_sname = "???";
-	if (dli.dli_fname == NULL)
-		dli.dli_fname = "???";
-	if (dli.dli_saddr == NULL)
-		dli.dli_saddr = (void *)(intptr_t)addr;
-
-	return format_string(buf, bufsiz, offs, fmt, &dli, addr);
-}
-
-char **
-backtrace_symbols_fmt(void *const *trace, size_t len, const char *fmt)
-{
-
-	static const size_t slen = sizeof(char *) + 64;	/* estimate */
-	char *ptr;
-	symtab_t *st;
-	int fd;
-
-	if ((fd = open_self(O_RDONLY)) != -1)
-		st = symtab_create(fd, -1, STT_FUNC);
-	else
-		st = NULL;
-
-	if ((ptr = calloc(len, slen)) == NULL)
-		goto out;
-
-	size_t psize = len * slen;
-	size_t offs = len * sizeof(char *);
-
-	/* We store only offsets in the first pass because of realloc */
-	for (size_t i = 0; i < len; i++) {
-		ssize_t x;
-		((char **)(void *)ptr)[i] = (void *)offs;
-		x = format_address(st, &ptr, &psize, offs, fmt, trace[i]);
-		if (x == -1) {
-			free(ptr);
-			ptr = NULL;
-			goto out;
-		}
-		offs += x;
-		ptr[offs++] = '\0';
-		assert(offs < psize);
-	}
-
-	/* Change offsets to pointers */
-	for (size_t j = 0; j < len; j++)
-		((char **)(void *)ptr)[j] += (intptr_t)ptr;
-
-out:
-	symtab_destroy(st);
-	if (fd != -1)
-		(void)close(fd);
-
-	return (void *)ptr;
-}
-
-int
-backtrace_symbols_fd_fmt(void *const *trace, size_t len, int fd,
-    const char *fmt)
-{
-	char **s = backtrace_symbols_fmt(trace, len, fmt);
-	if (s == NULL)
-		return -1;
-	for (size_t i = 0; i < len; i++)
-		if (dprintf(fd, "%s\n", s[i]) < 0)
-			break;
-	free(s);
-	return 0;
-}
-
-static const char fmt[] = "%a <%n%D> at %f";
-
-char **
-backtrace_symbols(void *const *trace, size_t len)
-{
-	return backtrace_symbols_fmt(trace, len, fmt);
-}
-
-int
-backtrace_symbols_fd(void *const *trace, size_t len, int fd)
-{
-	return backtrace_symbols_fd_fmt(trace, len, fd, fmt);
-}
diff --git a/lib/libexecinfo/builtin.c b/lib/libexecinfo/builtin.c
deleted file mode 100644
index 3fc861958..000000000
--- a/lib/libexecinfo/builtin.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: builtin.c,v 1.1 2012/05/26 22:02:29 christos Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: builtin.c,v 1.1 2012/05/26 22:02:29 christos Exp $");
-
-#include <sys/param.h>
-#include <sys/types.h>
-
-#include "execinfo.h"
-
-#ifdef __MACHINE_STACK_GROWS_UP
-#define BELOW >
-#else
-#define BELOW <
-#endif
-
-#ifdef __lint__
-#define __builtin_frame_address(a)	((void *)a)
-#endif
-
-struct frameinfo {
-	struct frameinfo *next;
-	void *return_address;
-};
-
-size_t
-backtrace(void **trace, size_t len)
-{
-	const struct frameinfo *frame = __builtin_frame_address(0);
-	void *stack = &stack;
-
-	for (size_t i = 0; i < len; i++) {
-		if ((const void *)frame BELOW stack)
-			return i;
-		trace[i] = frame->return_address;
-		frame = frame->next;
-	}
-
-	return len;
-}
diff --git a/lib/libexecinfo/execinfo.h b/lib/libexecinfo/execinfo.h
deleted file mode 100644
index 0ea529e80..000000000
--- a/lib/libexecinfo/execinfo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: execinfo.h,v 1.2 2012/06/09 21:22:17 christos Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _EXECINFO_H_
-#define _EXECINFO_H_
-
-#include <stddef.h>
-
-__BEGIN_DECLS
-size_t backtrace(void **, size_t);
-char **backtrace_symbols(void *const *, size_t);
-int backtrace_symbols_fd(void *const *, size_t, int);
-char **backtrace_symbols_fmt(void *const *, size_t, const char *);
-int backtrace_symbols_fd_fmt(void *const *, size_t, int, const char *);
-__END_DECLS
-
-#endif /* _EXECINFO_H_ */
diff --git a/lib/libexecinfo/shlib_version b/lib/libexecinfo/shlib_version
deleted file mode 100644
index 3995abd3d..000000000
--- a/lib/libexecinfo/shlib_version
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: shlib_version,v 1.1 2012/05/26 22:02:29 christos Exp $
-major=0
-minor=0
diff --git a/lib/libexecinfo/symtab.c b/lib/libexecinfo/symtab.c
deleted file mode 100644
index 19f9839de..000000000
--- a/lib/libexecinfo/symtab.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*	$NetBSD: symtab.c,v 1.3 2013/09/03 08:44:45 christos Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: symtab.c,v 1.3 2013/09/03 08:44:45 christos Exp $");
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
-#include <err.h>
-#include <dlfcn.h>
-
-#include <libelf.h>
-#include <gelf.h>
-#ifndef ELF_ST_BIND
-#define ELF_ST_BIND(x)          ((x) >> 4)
-#endif
-#ifndef ELF_ST_TYPE
-#define ELF_ST_TYPE(x)          (((unsigned int)x) & 0xf)
-#endif
-
-
-#include "symtab.h"
-
-struct symbol {
-	char *st_name;
-	uintptr_t st_value;
-	uintptr_t st_info;
-};
-
-struct symtab {
-	size_t nsymbols;
-	struct symbol *symbols;
-};
-
-static int
-address_compare(const void *a, const void *b)
-{
-	const struct symbol *sa = a;
-	const struct symbol *sb = b;
-	return (int)(intmax_t)(sa->st_value - sb->st_value);
-}
-
-void
-symtab_destroy(symtab_t *s)
-{
-	if (s == NULL)
-		return;
-	for (size_t i = 0; i < s->nsymbols; i++)
-		free(s->symbols[i].st_name);
-	free(s->symbols);
-	free(s);
-}
-
-symtab_t *
-symtab_create(int fd, int bind, int type)
-{
-	Elf *elf;
-	symtab_t *st;
-	Elf_Scn *scn = NULL;
-
-	if (elf_version(EV_CURRENT) == EV_NONE) {
-		warnx("Elf Library is out of date.");
-		return NULL;
-	}
-
-	elf = elf_begin(fd, ELF_C_READ, NULL);
-	if (elf == NULL) {
-		warnx("Error opening elf file: %s", elf_errmsg(elf_errno()));
-		return NULL;
-	}
-	st = calloc(1, sizeof(*st));
-	if (st == NULL) {
-		warnx("Error allocating symbol table");
-		elf_end(elf);
-		return NULL;
-	}
-
-	while ((scn = elf_nextscn(elf, scn)) != NULL) {
-		GElf_Shdr shdr;
-		Elf_Data *edata;
-		size_t ns;
-		struct symbol *s;
-
-		gelf_getshdr(scn, &shdr);
-		if(shdr.sh_type != SHT_SYMTAB)
-			continue;
-
-		edata = elf_getdata(scn, NULL);
-		ns = shdr.sh_size / shdr.sh_entsize;
-		s = calloc(ns, sizeof(*s));
-		if (s == NULL) {
-			warn("Cannot allocate %zu symbols", ns);
-			goto out;
-		}
-		st->symbols = s;
-
-		for (size_t i = 0; i < ns; i++) {
-			GElf_Sym sym;
-                        gelf_getsym(edata, (int)i, &sym);
-
-			if (bind != -1 &&
-			    (unsigned)bind != ELF_ST_BIND(sym.st_info))
-				continue;
-
-			if (type != -1 &&
-			    (unsigned)type != ELF_ST_TYPE(sym.st_info))
-				continue;
-
-			s->st_value = sym.st_value;
-			s->st_info = sym.st_info;
-			s->st_name = strdup(
-			    elf_strptr(elf, shdr.sh_link, sym.st_name));
-			if (s->st_name == NULL) {
-				warn("Cannot allocate symbol");
-				goto out;
-			}
-			s++;
-                }
-		st->nsymbols = s - st->symbols;
-		if (st->nsymbols == 0) {
-			warnx("No symbols found");
-			goto out;
-		}
-		qsort(st->symbols, st->nsymbols, sizeof(*st->symbols),
-		    address_compare);
-		elf_end(elf);
-		return st;
-	}
-out:
-	symtab_destroy(st);
-	elf_end(elf);
-	return NULL;
-}
-
-	
-int
-symtab_find(const symtab_t *st, const void *p, Dl_info *dli)
-{
-	struct symbol *s = st->symbols;
-	size_t ns = st->nsymbols;
-	size_t hi = ns;
-	size_t lo = 0;
-	size_t mid = ns / 2;
-	uintptr_t dd, sd, me = (uintptr_t)p;
-
-	for (;;) {
-		if (s[mid].st_value < me)
-			lo = mid;
-		else if (s[mid].st_value > me)
-			hi = mid;
-		else
-			break;
-		if (hi - lo == 1) {
-			mid = lo;
-			break;
-		}
-		mid = (hi + lo) / 2;
-	}
-	dd = me - (uintptr_t)dli->dli_saddr;
-	sd = me - s[mid].st_value;
-	if (dd > sd) {
-		dli->dli_saddr = (void *)s[mid].st_value;
-		dli->dli_sname = s[mid].st_name;
-	}
-	return 1;
-}
diff --git a/lib/libexecinfo/symtab.h b/lib/libexecinfo/symtab.h
deleted file mode 100644
index d527a3cc4..000000000
--- a/lib/libexecinfo/symtab.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: symtab.h,v 1.1 2012/05/26 22:02:29 christos Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _SYMTAB_H_
-#define _SYMTAB_H_
-
-__BEGIN_DECLS
-typedef struct symtab symtab_t;
-
-void symtab_destroy(symtab_t *);
-symtab_t * symtab_create(int, int, int);
-int symtab_find(const symtab_t *, const void *, Dl_info *);
-__END_DECLS
-
-#endif /* _SYMTAB_H_ */
diff --git a/lib/libexecinfo/unwind.c b/lib/libexecinfo/unwind.c
deleted file mode 100644
index f2a27cef0..000000000
--- a/lib/libexecinfo/unwind.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: unwind.c,v 1.2 2014/03/24 21:26:01 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <stdio.h>
-
-#include "unwind.h"
-#include "execinfo.h"
-
-struct tracer_context {
-	void **arr;
-	size_t len;
-	size_t n;
-};
-
-static _Unwind_Reason_Code
-tracer(struct _Unwind_Context *ctx, void *arg)
-{
-	struct tracer_context *t = arg;
-	if (t->n == (size_t)~0) {
-		/* Skip backtrace frame */
-		t->n = 0;
-		return 0;
-	}
-	if (t->n < t->len)
-		t->arr[t->n++] = (void *)_Unwind_GetIP(ctx);
-	return 0;
-}
-
-size_t
-backtrace(void **arr, size_t len)
-{
-	struct tracer_context ctx;
-
-	ctx.arr = arr;
-	ctx.len = len;
-	ctx.n = (size_t)~0;
-
-	_Unwind_Backtrace(tracer, &ctx);
-	if (ctx.n != (size_t)~0 && ctx.n > 0)
-		ctx.arr[--ctx.n] = NULL;	/* Skip frame below __start */
-
-	return ctx.n;
-}
diff --git a/lib/libexecinfo/unwind.h b/lib/libexecinfo/unwind.h
deleted file mode 100644
index 96d76e38f..000000000
--- a/lib/libexecinfo/unwind.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*	$NetBSD: unwind.h,v 1.3 2014/10/22 16:30:21 christos Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _UNWIND_H_
-#define _UNWIND_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-struct _Unwind_Context;
-struct _Unwind_Exception;
-typedef int _Unwind_Reason_Code;
-typedef void *_Unwind_Ptr;
-typedef long _Unwind_Word;
-
-#define	_URC_NO_REASON			0
-#define	_URC_FOREIGN_EXCEPTION_CAUGHT	1
-#define	_URC_FATAL_PHASE2_ERROR		2
-#define	_URC_FATAL_PHASE1_ERROR		3
-#define	_URC_NORMAL_STOP		4
-#define	_URC_END_OF_STACK		5
-#define	_URC_HANDLER_FOUND		6
-#define	_URC_INSTALL_CONTEXT		7
-#define	_URC_CONTINUE_UNWIND		8
-
-typedef _Unwind_Reason_Code
-    (*_Unwind_Trace_Fn)(struct _Unwind_Context *, void *);
-#ifdef notyet
-typedef _Unwind_Reason_Code
-    (*_Unwind_Stop_Fn)(struct _Unwind_Context *, void *);
-#endif
-
-_Unwind_Reason_Code	 _Unwind_Backtrace(_Unwind_Trace_Fn, void *);
-void 			 _Unwind_DeleteException(struct _Unwind_Exception *);
-void 	       		*_Unwind_FindEnclosingFunction(void *);
-#ifdef notyet
-_Unwind_Reason_Code 	 _Unwind_ForcedUnwind(struct _Unwind_Exception *,
-    _Unwind_Stop_fn, void *);
-#endif
-_Unwind_Word		 _Unwind_GetCFA(struct _Unwind_Context *);
-_Unwind_Ptr		 _Unwind_GetDataRelBase(struct _Unwind_Context *);
-_Unwind_Word 		 _Unwind_GetGR(struct _Unwind_Context *, int);
-_Unwind_Ptr		 _Unwind_GetIP(struct _Unwind_Context *);
-_Unwind_Ptr		 _Unwind_GetIPInfo(struct _Unwind_Context *, int *);
-_Unwind_Ptr		 _Unwind_GetLanguageSpecificData(
-    struct _Unwind_Context *);
-_Unwind_Ptr		 _Unwind_GetRegionStart(struct _Unwind_Context *);
-_Unwind_Ptr		 _Unwind_GetTextRelBase(struct _Unwind_Context *);
-_Unwind_Reason_Code	 _Unwind_RaiseException(struct _Unwind_Exception *);
-void			 _Unwind_Resume(struct _Unwind_Exception *);
-_Unwind_Reason_Code	 _Unwind_Resume_or_Rethrow(struct _Unwind_Exception *);
-void			 _Unwind_SetGR(struct _Unwind_Context *, int,
-    _Unwind_Ptr);
-void			 _Unwind_SetIP(struct _Unwind_Context *, _Unwind_Ptr);
-__END_DECLS
-#endif /* _UNWIND_H_ */
diff --git a/lib/libexecinfo/unwind_arm_ehabi_stub.c b/lib/libexecinfo/unwind_arm_ehabi_stub.c
deleted file mode 100644
index 2390aadac..000000000
--- a/lib/libexecinfo/unwind_arm_ehabi_stub.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __ARM_DWARF_EH__
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include "unwind.h"
-
-void _Unwind_VRS_Get(struct _Unwind_Context *, int, _Unwind_Word, int, void *);
-void _Unwind_VRS_Set(struct _Unwind_Context *, int, _Unwind_Word, int, void *);
-
-_Unwind_Word
-_Unwind_GetGR(struct _Unwind_Context *context, int regno)
-{
-	_Unwind_Word val;
-	_Unwind_VRS_Get(context, 0 /*_UVRSC_CORE*/, regno, 0 /*_UVRSD_UINT32*/,
-	    &val);
-
-	return val;
-}
-
-_Unwind_Ptr
-_Unwind_GetIP(struct _Unwind_Context *context)
-{
-	return (_Unwind_Ptr)(_Unwind_GetGR (context, 15) & ~(_Unwind_Word)1);
-}
-
-_Unwind_Ptr
-_Unwind_GetIPInfo(struct _Unwind_Context *context, int *p)
-{
-	*p = 0;
-	return _Unwind_GetIP(context);
-}
-
-void
-_Unwind_SetGR(struct _Unwind_Context *context, int reg, _Unwind_Ptr val)
-{
-	_Unwind_VRS_Set(context, 0 /*_UVRSC_CORE*/, reg, 0 /*_UVRSD_UINT32*/,
-		&val);
-}
-
-#endif /* __ARM_DWARF_EH__ */
diff --git a/lib/libform/Makefile b/lib/libform/Makefile
deleted file mode 100644
index f919518bf..000000000
--- a/lib/libform/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-#	$NetBSD: Makefile,v 1.10 2012/03/21 05:38:49 matt Exp $
-#
-
-WARNS=	2
-
-CPPFLAGS+=-I${.CURDIR}
-.if defined(DEBUG_FORMS)
-CFLAGS+=-gdwarf-2
-CPPFLAGS+=-DDEBUG
-LDFLAGS+=-g
-.endif
-LIB=	form
-
-LIBDPLIBS+=	curses	${.CURDIR}/../libcurses
-
-SRCS=	driver.c field_types.c internals.c field.c form.c post.c type_alnum.c \
-        type_alpha.c type_integer.c type_numeric.c type_enum.c type_regex.c \
-	type_ipv4.c type_ipv6.c
-MAN=	form_cursor.3 form_data.3 form_driver.3 form_field.3 \
-	form_field_attributes.3 form_field_buffer.3 form_field_info.3 \
-	form_field_just.3 form_field_new.3 form_field_opts.3 \
-	form_field_userptr.3 form_field_validation.3 form_fieldtype.3 \
-	form_hook.3 form_new.3 form_new_page.3 form_opts.3 form_page.3 \
-	form_post.3 form_userptr.3 form_win.3 forms.3
-MLINKS+=	forms.3 form.3 form_page.3 current_field.3 \
-		form_data.3 data_ahead.3 form_field_new.3 dup_field.3 \
-		form_field_info.3 dynamic_field_info.3 \
-		form_page.3 current_field.3 form_data.3 data_ahead.3 \
-		form_data.3 data_behind.3 form_field_new.3 dup_field.3 \
-		form_field_info.3 dynamic_field_info.3 \
-		form_field_validation.3 field_arg.3 \
-		form_field_attributes.3 field_back.3 \
-		form_field_buffer.3 field_buffer.3 \
-		form_field.3 field_count.3 \
-		form_field_attributes.3 field_fore.3 \
-		form_page.3 field_index.3 form_field_info.3 field_info.3 \
-		form_hook.3 field_init.3 form_field_just.3 field_just.3 \
-		form_field_opts.3 field_opts.3 \
-		form_field_opts.3 field_opts_off.3 \
-		form_field_opts.3 field_opts_on.3 \
-		form_field_attributes.3 field_pad.3 \
-		form_field_buffer.3 field_status.3 form_hook.3 field_term.3 \
-		form_field_validation.3 field_type.3 \
-		form_field_userptr.3 field_userptr.3 \
-		form_field.3 form_fields.3 \
-		form_hook.3 form_init.3 form_page.3 form_max_page.3 \
-		form_opts.3 form_opts_off.3 \
-		form_opts.3 form_opts_on.3 \
-		form_win.3 form_sub.3 form_hook.3 form_term.3 \
-		form_field_new.3 free_field.3 \
-		form_fieldtype.3 free_fieldtype.3 \
-		form_new.3 free_form.3 form_field_new.3 link_field.3 \
-		form_fieldtype.3 link_fieldtype.3 form_field.3 move_field.3 \
-		form_field_new.3 new_field.3 \
-		form_fieldtype.3 new_fieldtype.3 \
-		form_new.3 new_form.3 form_new_page.3 new_page.3 \
-		form_cursor.3 pos_form_cursor.3 form_post.3 post_form.3 \
-		form_win.3 scale_form.3 form_page.3 set_current_field.3 \
-		form_field_attributes.3 set_field_back.3 \
-		form_field_buffer.3 set_field_buffer.3 \
-		form_field_attributes.3 set_field_fore.3 \
-		form_hook.3 set_field_init.3 \
-		form_field_just.3 set_field_just.3 \
-		form_field_opts.3 set_field_opts.3 \
-		form_field_attributes.3 set_field_pad.3 \
-		form_field_buffer.3 set_field_printf.3 \
-		form_field_buffer.3 set_field_status.3 \
-		form_hook.3 set_field_term.3 \
-		form_field_validation.3 set_field_type.3 \
-		form_field_userptr.3 set_field_userptr.3 \
-		form_fieldtype.3 set_fieldtype_arg.3 \
-		form_fieldtype.3 set_fieldtype_choice.3 \
-		form_field.3 set_form_fields.3 \
-		form_hook.3 set_form_init.3 form_opts.3 set_form_opts.3 \
-		form_page.3 set_form_page.3 form_win.3 set_form_sub.3 \
-		form_hook.3 set_form_term.3 form_userptr.3 set_form_userptr.3 \
-		form_win.3 set_form_win.3 form_field_buffer.3 set_max_field.3 \
-		form_new_page.3 set_new_page.3 form_post.3 unpost_form.3
-
-INCS=	form.h
-INCSDIR=/usr/include
-
-.include <bsd.lib.mk>
-.include <bsd.subdir.mk>
diff --git a/lib/libform/driver.c b/lib/libform/driver.c
deleted file mode 100644
index 59c6751ff..000000000
--- a/lib/libform/driver.c
+++ /dev/null
@@ -1,468 +0,0 @@
-/*	$NetBSD: driver.c,v 1.18 2013/11/26 01:17:00 christos Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: driver.c,v 1.18 2013/11/26 01:17:00 christos Exp $");
-
-#include <ctype.h>
-#include "form.h"
-#include "internals.h"
-
-static int
-traverse_form_links(FORM *form, int direction);
-
-/*
- * Traverse the links of the current field in the given direction until
- * either a active & visible field is found or we return to the current
- * field.  Direction is the REQ_{LEFT,RIGHT,UP,DOWN}_FIELD driver commands.
- * The function returns E_OK if a valid field is found, E_REQUEST_DENIED
- * otherwise.
- */
-static int
-traverse_form_links(FORM *form, int direction)
-{
-	unsigned idx;
-
-	idx = form->cur_field;
-	
-	do {
-		switch (direction) {
-		case REQ_LEFT_FIELD:
-			if (form->fields[idx]->left == NULL)
-				return E_REQUEST_DENIED;
-			idx = form->fields[idx]->left->index;
-			break;
-			
-		case REQ_RIGHT_FIELD:
-			if (form->fields[idx]->right == NULL)
-				return E_REQUEST_DENIED;
-			idx = form->fields[idx]->right->index;
-			break;
-			
-		case REQ_UP_FIELD:
-			if (form->fields[idx]->up == NULL)
-				return E_REQUEST_DENIED;
-			idx = form->fields[idx]->up->index;
-			break;
-			
-		case REQ_DOWN_FIELD:
-			if (form->fields[idx]->down == NULL)
-				return E_REQUEST_DENIED;
-			idx = form->fields[idx]->down->index;
-			break;
-
-		default:
-			return E_REQUEST_DENIED;
-		}
-
-		if ((form->fields[idx]->opts & (O_ACTIVE | O_VISIBLE))
-		    == (O_ACTIVE | O_VISIBLE)) {
-			form->cur_field = idx;
-			return E_OK;
-		}
-	} while (idx != form->cur_field);
-
-	return E_REQUEST_DENIED;
-}
-
-int
-form_driver(FORM *form, int c)
-{
-	FIELD *fieldp;
-	int update_page, update_field, old_field, old_page, status;
-	int start_field;
-	unsigned int pos;
-	
-	if (form == NULL)
-		return E_BAD_ARGUMENT;
-
-	if ((form->fields == NULL) || (*(form->fields) == NULL))
-		return E_INVALID_FIELD;
-
-	if (form->posted != 1)
-		return E_NOT_POSTED;
-
-	if (form->in_init == 1)
-		return E_BAD_STATE;
-
-
-	old_field = start_field = form->cur_field;
-	fieldp = form->fields[form->cur_field];
-	update_page = update_field = 0;
-	status = E_OK;
-	
-	if (c < REQ_MIN_REQUEST) {
-		if (isprint(c) || isblank(c)) {
-			do {
-				pos = fieldp->start_char + fieldp->row_xpos;
-				
-			      /* check if we are allowed to edit this field */
-				if ((fieldp->opts & O_EDIT) != O_EDIT)
-					return E_REQUEST_DENIED;
-				
-				if ((status =
-				     (_formi_add_char(fieldp, pos, c)))
-				    == E_REQUEST_DENIED) {
-			
-					  /*
-					   * Need to check here if we
-					   * want to autoskip.  we
-					   * call the form driver
-					   * recursively to pos us on
-					   * the next field and then
-					   * we loop back to ensure
-					   * the next field selected
-					   * can have data added to it
-					   */
-					if ((fieldp->opts & O_AUTOSKIP)
-					    != O_AUTOSKIP)
-						return E_REQUEST_DENIED;
-					status = form_driver(form,
-							     REQ_NEXT_FIELD);
-					if (status != E_OK)
-						return status;
-
-					  /*
-					   * check if we have looped
-                                           * around all the fields.
-                                           * This can easily happen if
-                                           * all the fields are full.
-					   */
-					if (start_field == form->cur_field)
-						return E_REQUEST_DENIED;
-					
-					old_field = form->cur_field;
-					fieldp = form->fields[form->cur_field];
-					status = _formi_add_char(fieldp,
-							fieldp->start_char
-							+ fieldp->cursor_xpos,
-							c);
-				} else if (status == E_INVALID_FIELD)
-					  /* char failed validation, just
-					   * return the status.
-					   */
-					return status;
-				else if (status == E_NO_ROOM)
-					  /* we will get this if the line
-					   * wrapping fails.  Deny the
-					   * request.
-					   */
-					return E_REQUEST_DENIED;
-			}
-			while (status != E_OK);
-			update_field = (status == E_OK);
-		} else
-			return E_REQUEST_DENIED;
-	} else {
-		if (c > REQ_MAX_COMMAND)
-			return E_UNKNOWN_COMMAND;
-
-		if ((c >= REQ_NEXT_PAGE) && (c <= REQ_DOWN_FIELD)) {
-			  /* first check the field we are in is ok */
-			if (_formi_validate_field(form) != E_OK)
-				return E_INVALID_FIELD;
-
-			if (form->field_term != NULL)
-				form->field_term(form);
-
-			  /*
-			   * if we have a page movement then the form term
-			   * needs to be called too
-			   */ 
-			if ((c <= REQ_LAST_PAGE) && (form->form_term != NULL))
-				form->form_term(form);
-		}
-		
-			
-		switch (c) {
-		case REQ_NEXT_PAGE:
-			if (form->page < form->max_page) {
-				old_page = form->page;
-				form->page++;
-				update_page = 1;
-				if (_formi_pos_first_field(form) != E_OK) {
-					form->page = old_page;
-					status = E_REQUEST_DENIED;
-				}
-			} else
-				status = E_REQUEST_DENIED;
-			break;
-		
-		case REQ_PREV_PAGE:
-			if (form->page > 0) {
-				old_page = form->page;
-				form->page--;
-				update_page = 1;
-				if (_formi_pos_first_field(form) != E_OK) {
-					form->page = old_page;
-					status = E_REQUEST_DENIED;
-				}
-			} else
-				status = E_REQUEST_DENIED;
-			break;
-		
-		case REQ_FIRST_PAGE:
-			old_page = form->page;
-			form->page = 0;
-			update_page = 1;
-			if (_formi_pos_first_field(form) != E_OK) {
-				form->page = old_page;
-				status = E_REQUEST_DENIED;
-			}
-			break;
-		
-		case REQ_LAST_PAGE:
-			old_page = form->page;
-			form->page = form->max_page - 1;
-			update_page = 1;
-			if (_formi_pos_first_field(form) != E_OK) {
-				form->page = old_page;
-				status = E_REQUEST_DENIED;
-			}
-			break;
-		
-		case REQ_NEXT_FIELD:
-			status = _formi_pos_new_field(form, _FORMI_FORWARD,
-						      FALSE);
-			update_field = 1;
-			break;
-		
-		case REQ_PREV_FIELD:
-			status = _formi_pos_new_field(form, _FORMI_BACKWARD,
-						      FALSE);
-			update_field = 1;
-			break;
-		
-		case REQ_FIRST_FIELD:
-			form->cur_field = 0;
-			update_field = 1;
-			break;
-		
-		case REQ_LAST_FIELD:
-			form->cur_field = form->field_count - 1;
-			update_field = 1;
-			break;
-		
-		case REQ_SNEXT_FIELD:
-			status = _formi_pos_new_field(form, _FORMI_FORWARD,
-						      TRUE);
-			update_field = 1;
-			break;
-		
-		case REQ_SPREV_FIELD:
-			status = _formi_pos_new_field(form, _FORMI_BACKWARD,
-						      TRUE);
-			update_field = 1;
-			break;
-		
-		case REQ_SFIRST_FIELD:
-			fieldp = TAILQ_FIRST(&form->sorted_fields);
-			form->cur_field = fieldp->index;
-			update_field = 1;
-			break;
-		
-		case REQ_SLAST_FIELD:
-			fieldp = TAILQ_LAST(&form->sorted_fields,
-			    _formi_sort_head);
-			form->cur_field = fieldp->index;
-			update_field = 1;
-			break;
-
-			  /*
-			   * The up, down, left and right field traversals
-			   * are rolled up into a single function, allow a
-			   * fall through to that function.
-			   */
-		case REQ_LEFT_FIELD:
-		case REQ_RIGHT_FIELD:
-		case REQ_UP_FIELD:
-		case REQ_DOWN_FIELD:
-			status = traverse_form_links(form, c);
-			update_field = 1;
-			break;
-
-			  /* the following commands modify the buffer, check if
-			     this is allowed first before falling through. */
-
-		case REQ_DEL_PREV:
-			  /*
-			   * need to check for the overloading of this
-			   * request.  If overload flag set and we are
-			   * at the start of field this request turns
-			   * into a previous field request. Otherwise
-			   * fallthrough to the field handler.
-			   */
-			if ((form->opts & O_BS_OVERLOAD) == O_BS_OVERLOAD) {
-				if ((fieldp->start_char == 0) &&
-				    (fieldp->start_line == 0) &&
-				    (fieldp->row_xpos == 0)) {
-					update_field =
-						_formi_manipulate_field(form,
-							REQ_PREV_FIELD);
-					break;
-				}
-			}
-
-			  /* FALLTHROUGH */
-		case REQ_NEW_LINE:
-			  /*
-			   * need to check for the overloading of this
-			   * request.  If overload flag set and we are
-			   * at the start of field this request turns
-			   * into a next field request. Otherwise
-			   * fallthrough to the field handler.
-			   */
-			if ((form->opts & O_NL_OVERLOAD) == O_NL_OVERLOAD) {
-				if ((fieldp->start_char == 0) &&
-				    (fieldp->start_line == 0) &&
-				    (fieldp->row_xpos == 0)) {
-					update_field =
-						_formi_manipulate_field(form,
-							REQ_NEXT_FIELD);
-					break;
-				}
-			}
-
-			  /* FALLTHROUGH */
-		case REQ_INS_CHAR:
-		case REQ_INS_LINE:
-		case REQ_DEL_CHAR:
-		case REQ_DEL_LINE:
-		case REQ_DEL_WORD:
-		case REQ_CLR_EOL:
-		case REQ_CLR_EOF:
-		case REQ_CLR_FIELD:
-		case REQ_OVL_MODE:
-		case REQ_INS_MODE:
-			  /* check if we are allowed to edit the field and fall
-			   * through if we are.
-			   */
-			if ((form->fields[form->cur_field]->opts & O_EDIT) != O_EDIT)
-				return E_REQUEST_DENIED;
-		
-			  /* the following manipulate the field contents, bundle
-			     them into one function.... */
-			  /* FALLTHROUGH */
-		case REQ_NEXT_CHAR:
-		case REQ_PREV_CHAR:
-		case REQ_NEXT_LINE:
-		case REQ_PREV_LINE:
-		case REQ_NEXT_WORD:
-		case REQ_PREV_WORD:
-		case REQ_BEG_FIELD:
-		case REQ_END_FIELD:
-		case REQ_BEG_LINE:
-		case REQ_END_LINE:
-		case REQ_LEFT_CHAR:
-		case REQ_RIGHT_CHAR:
-		case REQ_UP_CHAR:
-		case REQ_DOWN_CHAR:
-		case REQ_SCR_FLINE:
-		case REQ_SCR_BLINE:
-		case REQ_SCR_FPAGE:
-		case REQ_SCR_BPAGE:
-		case REQ_SCR_FHPAGE:
-		case REQ_SCR_BHPAGE:
-		case REQ_SCR_FCHAR:
-		case REQ_SCR_BCHAR:
-		case REQ_SCR_HFLINE:
-		case REQ_SCR_HBLINE:
-		case REQ_SCR_HFHALF:
-		case REQ_SCR_HBHALF:
-			update_field = _formi_manipulate_field(form, c);
-			break;
-		
-		case REQ_VALIDATION:
-			return _formi_validate_field(form);
-			  /* NOTREACHED */
-			break;
-		
-		case REQ_PREV_CHOICE:
-		case REQ_NEXT_CHOICE:
-			update_field = _formi_field_choice(form, c);
-			  /* reinit the cursor pos just in case */
-			if (update_field == 1) {
-				_formi_init_field_xpos(fieldp);
-				fieldp->row_xpos = 0;
-			}
-			break;
-
-		default: /* should not need to do this, but.... */
-			return E_UNKNOWN_COMMAND;
-			  /* NOTREACHED */
-			break;
-		}
-	}
-
-	  /* call the field and form init functions if required. */
-	if ((c >= REQ_NEXT_PAGE) && (c <= REQ_DOWN_FIELD)) {
-		if (form->field_init != NULL)
-			form->field_init(form);
-
-		  /*
-		   * if we have a page movement then the form init
-		   * needs to be called too
-		   */ 
-		if ((c <= REQ_LAST_PAGE) && (form->form_init != NULL))
-			form->form_init(form);
-
-		  /*
-		   * if there was an error just return now...
-		   */
-		if (status != E_OK)
-			return status;
-
-		  /* if we have no error, reset the various offsets */
-		fieldp = form->fields[form->cur_field];
-		fieldp->start_char = 0;
-		fieldp->start_line = fieldp->alines;
-		fieldp->cur_line = fieldp->alines;
-		fieldp->row_xpos = 0;
-		fieldp->cursor_ypos = 0;
-		_formi_init_field_xpos(fieldp);
-	}
-	
-	if (update_field < 0)
-		return update_field;
-
-	if (update_field == 1)
-		update_page |= _formi_update_field(form, old_field);
-
-	if (update_page == 1)
-		_formi_draw_page(form);
-
-	pos_form_cursor(form);
-
-	if ((update_page == 1) || (update_field == 1))
-		wrefresh(form->scrwin);
-	
-	return E_OK;
-}
diff --git a/lib/libform/field.c b/lib/libform/field.c
deleted file mode 100644
index 9e2b096f5..000000000
--- a/lib/libform/field.c
+++ /dev/null
@@ -1,938 +0,0 @@
-/*	$NetBSD: field.c,v 1.29 2015/09/07 15:50:49 joerg Exp $	*/
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: field.c,v 1.29 2015/09/07 15:50:49 joerg Exp $");
-
-#include <sys/param.h>
-#include <stdlib.h>
-#include <strings.h>
-#include <stdarg.h>
-#include <form.h>
-#include "internals.h"
-
-extern FORM _formi_default_form;
-
-FIELD _formi_default_field = {
-	0, /* rows in the field */
-	0, /* columns in the field */
-	0, /* dynamic rows */
-	0, /* dynamic columns */
-	0, /* maximum growth */
-	0, /* starting row in the form subwindow */
-	0, /* starting column in the form subwindow */
-	0, /* number of off screen rows */
-	0, /* index of this field in form fields array. */
-	0, /* number of buffers associated with this field */
-	FALSE, /* set to true if buffer 0 has changed. */
-	NO_JUSTIFICATION, /* justification style of the field */
-	FALSE, /* set to true if field is in overlay mode */
-	NULL, /* pointer to the current line cursor is on */
-	0, /* starting char in string (horiz scroll) */
-	NULL, /* starting line in field (vert scroll) */
-	0, /* number of rows actually used in field */
-	0, /* actual pos of cursor in row, not same as x pos due to tabs */
-	0, /* x pos of cursor in field */
-	0, /* y pos of cursor in field */
-	0, /* start of a new page on the form if 1 */
-	0, /* number of the page this field is on */
-	A_NORMAL, /* character attributes for the foreground */
-	A_NORMAL, /* character attributes for the background */
-	' ', /* padding character */
-	DEFAULT_FORM_OPTS, /* options for the field */
-	NULL, /* the form this field is bound to, if any */
-	NULL, /* field above this one */
-	NULL, /* field below this one */
-	NULL, /* field to the left of this one */
-	NULL, /* field to the right of this one */
-	NULL,  /* user defined pointer. */
-	NULL, /* used if fields are linked */
-	NULL, /* type struct for the field */
-	{NULL, NULL}, /* circle queue glue for sorting fields */
-	NULL, /* args for field type. */
-	NULL, /* pointer to the array of lines structures. */
-	NULL, /* list of lines available for reuse */
-	NULL, /* array of buffers for the field */
-};
-
-/* internal function prototypes */
-static int
-field_buffer_init(FIELD *field, int buffer, unsigned int len);
-static FIELD *
-_formi_create_field(FIELD *, int, int, int, int, int, int);
-
-   
-/*
- * Set the userptr for the field
- */
-int
-set_field_userptr(FIELD *field, void *ptr)
-{
-	FIELD *fp = (field == NULL) ? &_formi_default_field : field;
-
-	fp->userptr = ptr;
-
-	return E_OK;
-}
-
-/*
- * Return the userptr for the field.
- */
-
-void *
-field_userptr(FIELD *field)
-{
-	if (field == NULL)
-		return _formi_default_field.userptr;
-	else
-		return field->userptr;
-}
-
-/*
- * Set the options for the designated field.
- */
-int
-set_field_opts(FIELD *field, Form_Options options)
-{
-	int i;
-	
-	FIELD *fp = (field == NULL) ? &_formi_default_field : field;
-
-	  /* not allowed to set opts if the field is the current one */
-	if ((field != NULL) && (field->parent != NULL) &&
-	    (field->parent->cur_field == field->index))
-		return E_CURRENT;
-	
-	if ((options & O_STATIC) == O_STATIC) {
-		for (i = 0; i < fp->nbuf; i++) {
-			if (fp->buffers[i].length > fp->cols)
-				fp->buffers[i].string[fp->cols] = '\0';
-		}
-	}
-	
-	fp->opts = options;
-
-	  /* if appropriate, redraw the field */
-	if ((field != NULL) && (field->parent != NULL)
-	    && (field->parent->posted == 1)) {
-		_formi_redraw_field(field->parent, field->index);
-		pos_form_cursor(field->parent);
-		wrefresh(field->parent->scrwin);
-	}
-	
-	return E_OK;
-}
-
-/*
- * Turn on the passed field options.
- */
-int
-field_opts_on(FIELD *field, Form_Options options)
-{
-	int i;
-	
-	FIELD *fp = (field == NULL) ? &_formi_default_field : field;
-
-	  /* not allowed to set opts if the field is the current one */
-	if ((field != NULL) && (field->parent != NULL) &&
-	    (field->parent->cur_field == field->index))
-		return E_CURRENT;
-	
-	if ((options & O_STATIC) == O_STATIC) {
-		for (i = 0; i < fp->nbuf; i++) {
-			if (fp->buffers[i].length > fp->cols)
-				fp->buffers[i].string[fp->cols] = '\0';
-		}
-	}
-	
-	fp->opts |= options;
-	
-	  /* if appropriate, redraw the field */
-	if ((field != NULL) && (field->parent != NULL)
-	    && (field->parent->posted == 1)) {
-		_formi_redraw_field(field->parent, field->index);
-		pos_form_cursor(field->parent);
-		wrefresh(field->parent->scrwin);
-	}
-
-	return E_OK;
-}
-
-/*
- * Turn off the passed field options.
- */
-int
-field_opts_off(FIELD *field, Form_Options options)
-{
-	FIELD *fp = (field == NULL) ? &_formi_default_field : field;
-
-	  /* not allowed to set opts if the field is the current one */
-	if ((field != NULL) && (field->parent != NULL) &&
-	    (field->parent->cur_field == field->index))
-		return E_CURRENT;
-	
-	fp->opts &= ~options;
-	
-	  /* if appropriate, redraw the field */
-	if ((field != NULL) && (field->parent != NULL)
-	    && (field->parent->posted == 1)) {
-		_formi_redraw_field(field->parent, field->index);
-		pos_form_cursor(field->parent);
-		wrefresh(field->parent->scrwin);
-	}
-	
-	return E_OK;
-}
-
-/*
- * Return the field options associated with the passed field.
- */
-Form_Options
-field_opts(FIELD *field)
-{
-	if (field == NULL)
-		return _formi_default_field.opts;
-	else
-		return field->opts;
-}
-
-/*
- * Set the justification for the passed field.
- */
-int
-set_field_just(FIELD *field, int justification)
-{
-	FIELD *fp = (field == NULL) ? &_formi_default_field : field;
-
-	  /*
-	   * not allowed to set justification if the field is
-	   * the current one
-	   */
-	if ((field != NULL) && (field->parent != NULL) &&
-	    (field->parent->cur_field == field->index))
-		return E_CURRENT;
-	
-	if ((justification < MIN_JUST_STYLE) /* check justification valid */
-	    || (justification > MAX_JUST_STYLE))
-		return E_BAD_ARGUMENT;
-
-	  /* only allow justification on static, single row fields */
-	if (((fp->opts & O_STATIC) != O_STATIC) ||
-	    ((fp->rows + fp->nrows) > 1))
-		return E_BAD_ARGUMENT;
-	
-	fp->justification = justification;
-
-	_formi_init_field_xpos(fp);
-	
-	return E_OK;
-}
-
-/*
- * Return the justification style of the field passed.
- */
-int
-field_just(FIELD *field)
-{
-	if (field == NULL)
-		return _formi_default_field.justification;
-	else
-		return field->justification;
-}
-
-/*
- * Return information about the field passed.
- */
-int
-field_info(FIELD *field, int *rows, int *cols, int *frow, int *fcol,
-	   int *nrow, int *nbuf)
-{
-	if (field == NULL)
-		return E_BAD_ARGUMENT;
-
-	*rows = field->rows;
-	*cols = field->cols;
-	*frow = field->form_row;
-	*fcol = field->form_col;
-	*nrow = field->nrows;
-	*nbuf = field->nbuf;
-
-	return E_OK;
-}
-
-/*
- * Report the dynamic field information.
- */
-int
-dynamic_field_info(FIELD *field, int *drows, int *dcols, int *max)
-{
-	if (field == NULL)
-		return E_BAD_ARGUMENT;
-
-	if ((field->opts & O_STATIC) == O_STATIC) {
-		*drows = field->rows;
-		*dcols = field->cols;
-	} else {
-		*drows = field->drows;
-		*dcols = field->dcols;
-	}
-	
-	*max = field->max;
-
-	return E_OK;
-}
-
-/*
- * Init all the field variables, perform wrapping and other tasks
- * after the field buffer is set.
- */
-static int
-field_buffer_init(FIELD *field, int buffer, unsigned int len)
-{
-	int status;
-	char *newp;
-	
-	if (buffer == 0) {
-		field->start_char = 0;
-		field->start_line = 0;
-		field->row_xpos = 0;
-		field->cursor_xpos = 0;
-		field->cursor_ypos = 0;
-		field->row_count = 1; /* must be at least one row  XXX need to shift old rows (if any) to free list??? */
-		field->alines->length = len;
-		if ((newp = realloc(field->alines->string,
-				    (size_t) len + 1)) == NULL)
-			return E_SYSTEM_ERROR;
-		field->alines->string = newp;
-		field->alines->allocated = len + 1;
-		strlcpy(field->alines->string, field->buffers[buffer].string,
-			(size_t) len + 1);
-		field->alines->expanded =
-			_formi_tab_expanded_length(field->alines->string,
-						   0, field->alines->length);
-
-		field->start_line = field->alines;
-		field->cur_line = field->alines;
-		
-		  /* we have to hope the wrap works - if it does not then the
-		     buffer is pretty much borked */
-		status = _formi_wrap_field(field, field->cur_line);
-		if (status != E_OK)
-			return status;
-
-		  /*
-		   * calculate the tabs for a single row field, the
-		   * multiline case is handled when the wrap is done.
-		   */
-		if (field->row_count == 1)
-			_formi_calculate_tabs(field->alines);
-
-		  /* redraw the field to reflect the new contents. If the field
-		   * is attached....
-		   */
-		if ((field->parent != NULL) && (field->parent->posted == 1)) {
-			_formi_redraw_field(field->parent, field->index);
-			  /* make sure cursor goes back to current field */
-			pos_form_cursor(field->parent);
-		}
-	}
-
-	return E_OK;
-}
-
-
-/*
- * Set the field buffer to the string that results from processing
- * the given format (fmt) using sprintf.
- */
-int
-set_field_printf(FIELD *field, int buffer, char *fmt, ...)
-{
-	int len;
-	va_list args;
-	
-	if (field == NULL)
-		return E_BAD_ARGUMENT;
-
-	if (buffer >= field->nbuf)
-		return E_BAD_ARGUMENT;
-
-	va_start(args, fmt);
-	  /* check for buffer already existing, free the storage */
-	if (field->buffers[buffer].allocated != 0)
-		free(field->buffers[buffer].string);
-
-	len = vasprintf(&field->buffers[buffer].string, fmt, args);
-	va_end(args);
-	if (len < 0)
-		return E_SYSTEM_ERROR;
-	
-	field->buffers[buffer].length = len;
-	field->buffers[buffer].allocated = len + 1;
-	if (((field->opts & O_STATIC) == O_STATIC) && (len > field->cols)
-	    && ((field->rows + field->nrows) == 1))
-		len = field->cols;
-
-	field->buffers[buffer].string[len] = '\0';
-	return field_buffer_init(field, buffer, (unsigned int) len);
-}
-	
-/*
- * Set the value of the field buffer to the value given.
- */
-
-int
-set_field_buffer(FIELD *field, int buffer, const char *value)
-{
-	unsigned int len;
-	int status;
-	
-	if (field == NULL)
-		return E_BAD_ARGUMENT;
-
-	if (buffer >= field->nbuf) /* make sure buffer is valid */
-		return E_BAD_ARGUMENT;
-
-	len = (unsigned int) strlen(value);
-	if (((field->opts & O_STATIC) == O_STATIC) && (len > field->cols)
-	    && ((field->rows + field->nrows) == 1))
-		len = field->cols;
-
-#ifdef DEBUG
-	if (_formi_create_dbg_file() != E_OK)
-		return E_SYSTEM_ERROR;
-
-	fprintf(dbg,
-		"set_field_buffer: entry: len = %d, value = %s, buffer=%d\n",
-		len, value, buffer);
-	fprintf(dbg, "set_field_buffer: entry: string = ");
-	if (field->buffers[buffer].string != NULL)
-		fprintf(dbg, "%s, len = %d\n", field->buffers[buffer].string,
-			field->buffers[buffer].length);
-	else
-		fprintf(dbg, "(null), len = 0\n");
-	fprintf(dbg, "set_field_buffer: entry: lines.len = %d\n",
-		field->alines[0].length);
-#endif
-	
-	if ((field->buffers[buffer].string =
-	     (char *) realloc(field->buffers[buffer].string,
-			      (size_t) len + 1)) == NULL)
-		return E_SYSTEM_ERROR;
-
-	strlcpy(field->buffers[buffer].string, value, (size_t) len + 1);
-	field->buffers[buffer].length = len;
-	field->buffers[buffer].allocated = len + 1;
-	status = field_buffer_init(field, buffer, len);
-
-#ifdef DEBUG
-	fprintf(dbg, "set_field_buffer: exit: len = %d, value = %s\n",
-		len, value);
-	fprintf(dbg, "set_field_buffer: exit: string = %s, len = %d\n",
-		field->buffers[buffer].string, field->buffers[buffer].length);
-	fprintf(dbg, "set_field_buffer: exit: lines.len = %d\n",
-		field->alines[0].length);
-#endif
-
-	return status;
-}
-
-/*
- * Return the requested field buffer to the caller.
- */
-char *
-field_buffer(FIELD *field, int buffer)
-{
-
-	char *reformat, *p;
-	_FORMI_FIELD_LINES *linep;
-	size_t bufsize, pos;
-	
-	if (field == NULL)
-		return NULL;
-
-	if (buffer >= field->nbuf)
-		return NULL;
-
-	  /*
-	   * We force a sync from the line structs to the buffer here.
-	   * Traditional libform say we don't need to because it is
-	   * done on a REQ_VALIDATE but NetBSD libform previously did
-	   * not enforce this because the buffer contents were always
-	   * current.  Changes to line handling make this no longer so
-	   * - the line structs may contain different data to the
-	   * buffer if unsynced.
-	   */
-	if (_formi_sync_buffer(field) != E_OK)
-		return NULL;
-	
-	if ((field->opts & O_REFORMAT) != O_REFORMAT)
-		return field->buffers[buffer].string;
-
-	if (field->row_count <= 1)
-		return strdup(field->buffers[buffer].string);
-
-	/*
-	 * create a single string containing each line,
-	 * separated by newline, last line having no
-	 * newline, but NUL terminated.
-	 */
-	bufsize = pos = 0;
-	reformat = NULL;
-	for (linep = field->alines; linep; linep = linep->next) {
-		size_t len = strlen(linep->string);
-		if (len + 1 >= bufsize - pos) {
-			bufsize += MAX(1024, 2 * len);
-			p = realloc(reformat, bufsize);
-			if (p == NULL) {
-				free(reformat);
-				return NULL;
-			}
-			reformat = p;
-		}
-		memcpy(reformat + pos, linep->string, len);
-		pos += len;
-		reformat[pos++] = linep->next ? '\n' : '\0';
-	}
-	return reformat;
-}
-
-/*
- * Set the buffer 0 field status.
- */
-int
-set_field_status(FIELD *field, int status)
-{
-
-	if (field == NULL)
-		return E_BAD_ARGUMENT;
-
-	if (status != FALSE)
-		field->buf0_status = TRUE;
-	else
-		field->buf0_status = FALSE;
-
-	return E_OK;
-}
-
-/*
- * Return the buffer 0 status flag for the given field.
- */
-int
-field_status(FIELD *field)
-{
-
-	if (field == NULL) /* the default buffer 0 never changes :-) */
-		return FALSE;
-
-	return field->buf0_status;
-}
-
-/*
- * Set the maximum growth for a dynamic field.
- */
-int
-set_max_field(FIELD *fptr, int max)
-{
-	FIELD *field = (fptr == NULL)? &_formi_default_field : fptr;
-
-	if ((field->opts & O_STATIC) == O_STATIC) /* check if field dynamic */
-		return E_BAD_ARGUMENT;
-
-	if (max < 0) /* negative numbers are bad.... */
-		return E_BAD_ARGUMENT;
-	
-	field->max = max;
-	return E_OK;
-}
-
-/*
- * Set the field foreground character attributes.
- */
-int
-set_field_fore(FIELD *fptr, chtype attribute)
-{
-	FIELD *field = (fptr == NULL)? &_formi_default_field : fptr;
-
-	field->fore = attribute;
-	return E_OK;
-}
-
-/*
- * Return the foreground character attribute for the given field.
- */
-chtype
-field_fore(FIELD *field)
-{
-	if (field == NULL)
-		return _formi_default_field.fore;
-	else
-		return field->fore;
-}
-
-/*
- * Set the background character attribute for the given field.
- */
-int
-set_field_back(FIELD *field, chtype attribute)
-{
-	if (field == NULL)
-		_formi_default_field.back = attribute;
-	else
-		field->back = attribute;
-
-	return E_OK;
-}
-
-/*
- * Get the background character attribute for the given field.
- */
-chtype
-field_back(FIELD *field)
-{
-	if (field == NULL)
-		return _formi_default_field.back;
-	else
-		return field->back;
-}
-
-/*
- * Set the pad character for the given field.
- */
-int
-set_field_pad(FIELD *field, int pad)
-{
-	if (field == NULL)
-		_formi_default_field.pad = pad;
-	else
-		field->pad = pad;
-
-	return E_OK;
-}
-
-/*
- * Return the padding character for the given field.
- */
-int
-field_pad(FIELD *field)
-{
-	if (field == NULL)
-		return _formi_default_field.pad;
-	else
-		return field->pad;
-}
-
-/*
- * Set the field initialisation function hook.
- */
-int
-set_field_init(FORM *form, Form_Hook function)
-{
-	if (form == NULL)
-		_formi_default_form.field_init = function;
-	else
-		form->field_init = function;
-
-	return E_OK;
-}
-
-/*
- * Return the function hook for the field initialisation.
- */
-Form_Hook
-field_init(FORM *form)
-{
-	if (form == NULL)
-		return _formi_default_form.field_init;
-	else
-		return form->field_init;
-}
-
-/*
- * Set the field termination function hook.
- */
-int
-set_field_term(FORM *form, Form_Hook function)
-{
-	if (form == NULL)
-		_formi_default_form.field_term = function;
-	else
-		form->field_term = function;
-
-	return E_OK;
-}
-
-/*
- * Return the function hook defined for the field termination.
- */
-Form_Hook
-field_term(FORM *form)
-{
-	if (form == NULL)
-		return _formi_default_form.field_term;
-	else
-		return form->field_term;
-}
-
-/*
- * Set the page flag on the given field to indicate it is the start of a
- * new page.
- */
-int
-set_new_page(FIELD *fptr, int page)
-{
-	FIELD *field = (fptr == NULL)? &_formi_default_field : fptr;
-
-	if (field->parent != NULL) /* check if field is connected to a form */
-		return E_CONNECTED;
-	
-	field->page_break = (page != FALSE);
-	return E_OK;
-}
-
-/*
- * Return the page status for the given field.  TRUE is returned if the
- * field is the start of a new page.
- */
-int
-new_page(FIELD *field)
-{
-	if (field == NULL)
-		return _formi_default_field.page_break;
-	else
-		return field->page_break;
-}
-
-/*
- * Return the index of the field in the form fields array.
- */
-int
-field_index(FIELD *field)
-{
-	if (field == NULL)
-		return E_BAD_ARGUMENT;
-
-	if (field->parent == NULL)
-		return E_NOT_CONNECTED;
-
-	return field->index;
-}
-
-/*
- * Internal function that does most of the work to create a new field.
- * The new field is initialised from the information in the prototype
- * field passed.
- * Returns NULL on error.
- */
-static FIELD *
-_formi_create_field(FIELD *prototype, int rows, int cols, int frow,
-		    int fcol, int nrows, int nbuf)
-{
-	FIELD *new;
-	
-	if ((rows <= 0) || (cols <= 0) || (frow < 0) || (fcol < 0) ||
-	    (nrows < 0) || (nbuf < 0))
-		return NULL;
-	
-	if ((new = (FIELD *)malloc(sizeof(FIELD))) == NULL) {
-		return NULL;
-	}
-
-	  /* copy in the default field info */
-	bcopy(prototype, new, sizeof(FIELD));
-
-	new->nbuf = nbuf + 1;
-	new->rows = rows;
-	new->cols = cols;
-	new->form_row = frow;
-	new->form_col = fcol;
-	new->nrows = nrows;
-	new->link = new;
-	return new;
-}
-
-/*
- * Create a new field structure.
- */
-FIELD *
-new_field(int rows, int cols, int frow, int fcol, int nrows, int nbuf)
-{
-	FIELD *new;
-	size_t buf_len;
-	int i;
-	
-
-	if ((new = _formi_create_field(&_formi_default_field, rows, cols,
-				       frow, fcol, nrows, nbuf)) == NULL)
-		return NULL;
-	
-	buf_len = (nbuf + 1) * sizeof(FORM_STR);
-	
-	if ((new->buffers = (FORM_STR *)malloc(buf_len)) == NULL) {
-		free(new);
-		return NULL;
-	}
-
-	  /* Initialise the strings to a zero length string */
-	for (i = 0; i < nbuf + 1; i++) {
-		if ((new->buffers[i].string =
-		     (char *) malloc(sizeof(char))) == NULL) {
-			free(new->buffers);
-			free(new);
-			return NULL;
-		}
-		new->buffers[i].string[0] = '\0';
-		new->buffers[i].length = 0;
-		new->buffers[i].allocated = 1;
-	}
-
-	if ((new->alines = (_FORMI_FIELD_LINES *)
-	     malloc(sizeof(struct _formi_field_lines))) == NULL) {
-		free(new->buffers);
-		free(new);
-		return NULL;
-	}
-
-	new->alines->prev = NULL;
-	new->alines->next = NULL;
-	new->alines->allocated = 0;
-	new->alines->length = 0;
-	new->alines->expanded = 0;
-	new->alines->string = NULL;
-	new->alines->hard_ret = FALSE;
-	new->alines->tabs = NULL;
-	new->start_line = new->alines;
-	new->cur_line = new->alines;
-	
-	return new;
-}
-
-/*
- * Duplicate the given field, including its buffers.
- */
-FIELD *
-dup_field(FIELD *field, int frow, int fcol)
-{
-	FIELD *new;
-	size_t row_len, buf_len;
-	
-	if (field == NULL)
-		return NULL;
-
-	  /* XXXX this right???? */
-	if ((new = _formi_create_field(field, (int) field->rows,
-				       (int ) field->cols,
-				       frow, fcol, (int) field->nrows,
-				       field->nbuf - 1)) == NULL)
-		return NULL;
-
-	row_len = (field->rows + field->nrows + 1) * field->cols;
-	buf_len = (field->nbuf + 1) * row_len * sizeof(FORM_STR);
-	
-	if ((new->buffers = (FORM_STR *)malloc(buf_len)) == NULL) {
-		free(new);
-		return NULL;
-	}
-
-	  /* copy the buffers from the source field into the new copy */
-	bcopy(field->buffers, new->buffers, buf_len);
-
-	return new;
-}
-
-/*
- * Create a new field at the specified location by duplicating the given
- * field.  The buffers are shared with the parent field.
- */
-FIELD *
-link_field(FIELD *field, int frow, int fcol)
-{
-	FIELD *new;
-
-	if (field == NULL)
-		return NULL;
-	
-	if ((new = _formi_create_field(field, (int) field->rows,
-				       (int) field->cols,
-				       frow, fcol, (int) field->nrows,
-				       field->nbuf - 1)) == NULL)
-		return NULL;
-
-	new->link = field->link;
-	field->link = new;
-	
-	  /* we are done.  The buffer pointer was copied during the field
-	     creation. */
-	return new;
-}
-
-/*
- * Release all storage allocated to the field
- */
-int
-free_field(FIELD *field)
-{
-	FIELD *flink;
-	int i;
-	_formi_tab_t *ts, *nts;
-	
-	if (field == NULL)
-		return E_BAD_ARGUMENT;
-
-	if (field->parent != NULL)
-		return E_CONNECTED;
-
-	if (field->link == field) { /* check if field linked */
-		  /* no it is not - release the buffers */
-		free(field->buffers);
-		  /* free the tab structures */
-		for (i = 0; i < field->row_count - 1; i++) {
-			if (field->alines[i].tabs != NULL) {
-				ts = field->alines[i].tabs;
-				while (ts != NULL) {
-					nts = ts->fwd;
-					free(ts);
-					ts = nts;
-				}
-			}
-		}
-	} else {
-		  /* is linked, traverse the links to find the field referring
-		   * to the one to be freed.
-		   */
-		for (flink = field->link; flink != field; flink = flink->link);
-		flink->link = field->link;
-	}
-
-	free(field);
-	return E_OK;
-}
-
-	
diff --git a/lib/libform/field_types.c b/lib/libform/field_types.c
deleted file mode 100644
index db7e59ae0..000000000
--- a/lib/libform/field_types.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/*	$NetBSD: field_types.c,v 1.7 2006/03/19 20:02:27 christos Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: field_types.c,v 1.7 2006/03/19 20:02:27 christos Exp $");
-
-#include <stdlib.h>
-#include <stdarg.h>
-#include "form.h"
-#include "internals.h"
-
-extern FIELD _formi_default_field;
-
-/* function prototypes.... */
-static void
-_formi_create_field_args(FIELDTYPE *type, char **type_args,
-			 formi_type_link **link, va_list *args, int *error);
-static FIELDTYPE *
-_formi_create_fieldtype(void);
-
-/*
- * Process the arguments, if any, for the field type.
- */
-static void
-_formi_create_field_args(FIELDTYPE *type, char **type_args,
-			 formi_type_link **link, va_list *args, int *error)
-{
-	formi_type_link *l;
-
-	l = NULL;
-	if ((type != NULL)
-	    && ((type->flags & _TYPE_HAS_ARGS) == _TYPE_HAS_ARGS)) {
-		if ((type->flags & _TYPE_IS_LINKED) == _TYPE_IS_LINKED) {
-			l = malloc(sizeof(*l));
-			if (l != NULL) {
-				_formi_create_field_args(type->link->next,
-							 type_args,
-							 &type->link->next->link,
-							 args,
-							 error);
-				_formi_create_field_args(type->link->prev,
-							 type_args,
-							 &type->link->prev->link,
-							 args,
-							 error);
-				(*link) = l;
-			}
-
-			(*error)++;
-		} else {
-			if ((*type_args = (char *) type->make_args(args))
-			    == NULL)
-				(*error)++;
-		}
-	}
-}
-
-/*
- * Allocate a new fieldtype structure, initialise it and return the
- * struct to the caller.
- */
-static FIELDTYPE *
-_formi_create_fieldtype(void)
-{
-	FIELDTYPE *new;
-	
-	if ((new = malloc(sizeof(*new))) == NULL)
-		return NULL;
-
-	new->flags = _TYPE_NO_FLAGS;
-	new->refcount = 0;
-	new->link = NULL;
-	new->make_args = NULL;
-	new->copy_args = NULL;
-	new->free_args = NULL;
-	new->field_check = NULL;
-	new->char_check = NULL;
-	new->next_choice = NULL;
-	new->prev_choice = NULL;
-
-	return new;
-}
-
-/*
- * Set the field type of the field to be the one given.
- */
-int
-set_field_type(FIELD *fptr, FIELDTYPE *type, ...)
-{
-	va_list args;
-	FIELD *field;
-	int error = 0;
-
-	va_start(args, type);
-	
-	field = (fptr == NULL)? &_formi_default_field : fptr;
-
-	field->type = type;
-	_formi_create_field_args(type, &field->args, &type->link, &args,
-				 &error);
-	va_end(args);
-	
-	if (error)
-		return E_BAD_ARGUMENT;
-		
-	return E_OK;
-}
-
-/*
- * Return the field type associated with the given field
- */
-FIELDTYPE *
-field_type(FIELD *fptr)
-{
-	FIELD *field;
-	
-	field = (fptr == NULL)? &_formi_default_field : fptr;
-
-	return field->type;
-}
-
-
-/*
- * Return the field arguments for the given field.
- */
-char *
-field_arg(FIELD *fptr)
-{
-	FIELD *field;
-
-	field = (fptr == NULL)? &_formi_default_field : fptr;
-
-	return field->args;
-}
-
-/*
- * Create a new field type.  Caller must specify a field_check routine
- * and char_check routine.
- */
-FIELDTYPE *
-new_fieldtype(int (*field_check)(FIELD *, char *),
-	      int (*char_check)(int, char *))
-{
-	FIELDTYPE *new;
-	
-	if ((field_check == NULL) && (char_check == NULL))
-		return NULL;
-
-	if ((new = _formi_create_fieldtype()) != NULL) {
-		new->field_check = field_check;
-		new->char_check = char_check;
-	}
-
-	return new;
-}
-
-/*
- * Free the storage used by the fieldtype.
- */
-int
-free_fieldtype(FIELDTYPE *fieldtype)
-{
-	if (fieldtype == NULL)
-		return E_BAD_ARGUMENT;
-
-	if (fieldtype->refcount > 0)
-		return E_CONNECTED;
-
-	if ((fieldtype->flags & _TYPE_IS_BUILTIN) == _TYPE_IS_BUILTIN)
-		return E_BAD_ARGUMENT; /* don't delete builtin types! */
-
-	if ((fieldtype->flags & _TYPE_IS_LINKED) == _TYPE_IS_LINKED) 
-	{
-		fieldtype->link->next->refcount--;
-		fieldtype->link->prev->refcount--;
-	}
-	
-	free(fieldtype);
-
-	return E_OK;
-}
-
-/*
- * Set the field type arguments for the given field type.
- */
-int
-set_fieldtype_arg(FIELDTYPE *fieldtype, char * (*make_args)(va_list *),
-		  char * (*copy_args)(char*), void (*free_args)(char *))
-{
-	if ((fieldtype == NULL) || (make_args == NULL)
-	    || (copy_args == NULL) || (free_args == NULL))
-		return E_BAD_ARGUMENT;
-
-	fieldtype->make_args = make_args;
-	fieldtype->copy_args = copy_args;
-	fieldtype->free_args = free_args;
-
-	return E_OK;
-}
-
-/*
- * Set up the choice list functions for the given fieldtype.
- */
-int
-set_fieldtype_choice(FIELDTYPE *fieldtype, int (*next_choice)(FIELD *, char *),
-		     int (*prev_choice)(FIELD *, char *))
-{
-	if ((fieldtype == NULL) || (next_choice == NULL)
-	    || (prev_choice == NULL))
-		return E_BAD_ARGUMENT;
-
-	fieldtype->next_choice = next_choice;
-	fieldtype->prev_choice = prev_choice;
-
-	return E_OK;
-}
-
-/*
- * Link the two given types to produce a new type, return this new type.
- */
-FIELDTYPE *
-link_fieldtype(FIELDTYPE *type1, FIELDTYPE *type2)
-{
-	FIELDTYPE *new;
-
-	if ((type1 == NULL) || (type2 == NULL))
-		return NULL;
-	
-	if ((new = _formi_create_fieldtype()) == NULL)
-		return NULL;
-
-	new->flags = _TYPE_IS_LINKED;
-	new->flags |= ((type1->flags & _TYPE_HAS_ARGS)
-		       | (type2->flags & _TYPE_HAS_ARGS));
-	if ((new->link = malloc(sizeof(*new->link))) == NULL) {
-		free(new);
-		return NULL;
-	}
-	
-	new->link->prev = type1;
-	new->link->next = type2;
-	type1->refcount++;
-	type2->refcount++;
-	
-	return new;
-}
diff --git a/lib/libform/form.c b/lib/libform/form.c
deleted file mode 100644
index 7be3d3c8b..000000000
--- a/lib/libform/form.c
+++ /dev/null
@@ -1,613 +0,0 @@
-/*	$NetBSD: form.c,v 1.15 2004/11/24 11:57:09 blymn Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: form.c,v 1.15 2004/11/24 11:57:09 blymn Exp $");
-
-#include <stdlib.h>
-#include <strings.h>
-#include <form.h>
-#include "internals.h"
-
-extern FIELD _formi_default_field;
-
-FORM _formi_default_form = {
-	FALSE, /* true if performing a init or term function */
-	FALSE, /* the form is posted */
-	FALSE, /* make field list circular if true */
-	NULL, /* window for the form */
-	NULL, /* subwindow for the form */
-	NULL, /* use this window for output */
-	NULL, /* user defined pointer */
-	0, /* options for the form */
-	NULL, /* function called when form posted and
-				after page change */
-	NULL, /* function called when form is unposted and
-				before page change */
-	NULL, /* function called when form posted and after
-				 current field changes */
-	NULL, /* function called when form unposted and
-				 before current field changes */
-	0, /* number of fields attached */
-	0, /* current field */
-	0, /* current page of form */
-	0, /* number of pages in the form */
-	NULL, /* dynamic array of fields that start
-					   the pages */
-	{NULL, NULL}, /* sorted field list */
-	NULL /* array of fields attached to this form. */
-};
-
-/*
- * Set the window associated with the form
- */
-int
-set_form_win(FORM *form, WINDOW *win)
-{
-	if (form == NULL) {
-		_formi_default_form.win = win;
-		_formi_default_form.scrwin = win;
-	} else {
-		if (form->posted == TRUE)
-			return E_POSTED;
-		else {
-			form->win = win;
-			form->scrwin = win;
-		}
-	}
-
-	return E_OK;
-}
-
-/*
- * Return the window used by the given form
- */
-WINDOW *
-form_win(FORM *form)
-{
-	if (form == NULL)
-		return _formi_default_form.win;
-	else
-		return form->win;
-}
-
-/*
- * Set the subwindow for the form.
- */
-int
-set_form_sub(FORM *form, WINDOW *window)
-{
-	if (form == NULL) {
-		_formi_default_form.subwin = window;
-		_formi_default_form.scrwin = window;
-	} else {
-		if (form->posted == TRUE)
-			return E_POSTED;
-		else {
-			form->subwin = window;
-			form->scrwin = window;
-		}
-	}
-
-	return E_OK;
-}
-
-/*
- * Return the subwindow for the given form.
- */
-WINDOW *
-form_sub(FORM *form)
-{
-	if (form == NULL)
-		return _formi_default_form.subwin;
-	else
-		return form->subwin;
-}
-
-/*
- * Return the minimum size required to contain the form.
- */
-int
-scale_form(FORM *form, int *rows, int *cols)
-{
-	int i, max_row, max_col, temp;
-
-	if ((form->fields == NULL) || (form->fields[0] == NULL))
-		return E_NOT_CONNECTED;
-
-	max_row = 0;
-	max_col = 0;
-	
-	for (i = 0; i < form->field_count; i++) {
-		temp = form->fields[i]->form_row + form->fields[i]->rows;
-		max_row = (temp > max_row)? temp : max_row;
-		temp = form->fields[i]->form_col + form->fields[i]->cols;
-		max_col = (temp > max_col)? temp : max_col;
-	}
-
-	(*rows) = max_row;
-	(*cols) = max_col;
-	
-	return E_OK;
-}
-
-/*
- * Set the user defined pointer for the form given.
- */
-int
-set_form_userptr(FORM *form, void *ptr)
-{
-	if (form == NULL)
-		_formi_default_form.userptr = ptr;
-	else
-		form->userptr = ptr;
-
-	return E_OK;
-}
-
-/*
- * Return the user defined pointer associated with the given form.
- */
-void *
-form_userptr(FORM *form)
-{
-
-	if (form == NULL)
-		return _formi_default_form.userptr;
-	else
-		return form->userptr;
-}
-
-/*
- * Set the form options to the given ones.
- */
-int
-set_form_opts(FORM *form, Form_Options options)
-{
-	if (form == NULL)
-		_formi_default_form.opts = options;
-	else
-		form->opts = options;
-
-	return E_OK;
-}
-
-/*
- * Turn the given options on for the form.
- */
-int
-form_opts_on(FORM *form, Form_Options options)
-{
-	if (form == NULL)
-		_formi_default_form.opts |= options;
-	else
-		form->opts |= options;
-
-	return E_OK;
-}
-
-/*
- * Turn the given options off for the form.
- */
-int
-form_opts_off(FORM *form, Form_Options options)
-{
-	if (form == NULL)
-		_formi_default_form.opts &= ~options;
-	else
-		form->opts &= ~options;
-
-
-	return E_OK;
-}
-
-/*
- * Return the options set for the given form.
- */
-Form_Options
-form_opts(FORM *form)
-{
-	if (form == NULL)
-		return _formi_default_form.opts;
-	else
-		return form->opts;
-}
-
-/*
- * Set the form init function for the given form
- */
-int
-set_form_init(FORM *form, Form_Hook func)
-{
-	if (form == NULL)
-		_formi_default_form.form_init = func;
-	else
-		form->form_init = func;
-
-	return E_OK;
-}
-
-/*
- * Return the init function associated with the given form.
- */
-Form_Hook
-form_init(FORM *form)
-{
-	if (form == NULL)
-		return _formi_default_form.form_init;
-	else
-		return form->form_init;
-}
-
-/*
- * Set the function to be called on form termination.
- */
-int
-set_form_term(FORM *form, Form_Hook function)
-{
-	if (form == NULL)
-		_formi_default_form.form_term = function;
-	else
-		form->form_term = function;
-
-	return E_OK;
-}
-
-/*
- * Return the function defined for the termination function.
- */
-Form_Hook
-form_term(FORM *form)
-{
-
-	if (form == NULL)
-		return _formi_default_form.form_term;
-	else
-		return form->form_term;
-}
-
-	
-/*
- * Attach the given fields to the form.
- */
-int
-set_form_fields(FORM *form, FIELD **fields)
-{
-	int num_fields = 0, i, maxpg = 1, status;
-
-	if (form == NULL)
-		return E_BAD_ARGUMENT;
-
-	if (form->posted == TRUE)
-		return E_POSTED;
-
-	if (fields == NULL)
-		return E_BAD_ARGUMENT;
-
-	while (fields[num_fields] != NULL) {
-		if ((fields[num_fields]->parent != NULL) &&
-		    (fields[num_fields]->parent != form))
-			return E_CONNECTED;
-		num_fields++;
-	}
-
-	  /* disconnect old fields, if any */
-	if (form->fields != NULL) {
-		for (i = 0; i < form->field_count; i++) {
-			form->fields[i]->parent = NULL;
-			form->fields[i]->index = -1;
-		}
-	}
-
-	  /* kill old page pointers if any */
-	if (form->page_starts != NULL)
-		free(form->page_starts);
-
-	form->field_count = num_fields;
-
-	  /* now connect the new fields to the form */
-	for (i = 0; i < num_fields; i++) {
-		fields[i]->parent = form;
-		fields[i]->index = i;
-		  /* set the page number of the field */
-		if (fields[i]->page_break == 1) 
-			maxpg++;
-		fields[i]->page = maxpg;
-	}
-
-	form->fields = fields;
-	form->cur_field = 0;
-	form->max_page = maxpg;
-	if ((status = _formi_find_pages(form)) != E_OK)
-		return status;
-
-	  /* sort the fields and set the navigation pointers */
-	_formi_sort_fields(form);
-	_formi_stitch_fields(form);
-	
-	return E_OK;
-}
-
-/*
- * Return the fields attached to the form given.
- */
-FIELD **
-form_fields(FORM *form)
-{
-	if (form == NULL)
-		return NULL;
-
-	return form->fields;
-}
-
-/*
- * Return the number of fields attached to the given form.
- */
-int
-field_count(FORM *form)
-{
-	if (form == NULL)
-		return -1;
-
-	return form->field_count;
-}
-
-/*
- * Move the given field to the row and column given.
- */
-int
-move_field(FIELD *fptr, int frow, int fcol)
-{
-	FIELD *field = (fptr == NULL) ? &_formi_default_field : fptr;
-
-	if (field->parent != NULL)
-		return E_CONNECTED;
-
-	field->form_row = frow;
-	field->form_col = fcol;
-
-	return E_OK;
-}
-
-/*
- * Set the page of the form to the given page.
- */
-int
-set_form_page(FORM *form, int page)
-{
-	if (form == NULL)
-		return E_BAD_ARGUMENT;
-
-	if (form->in_init == TRUE)
-		return E_BAD_STATE;
-
-	if (page > form->max_page)
-		return E_BAD_ARGUMENT;
-
-	form->page = page;
-	return E_OK;
-}
-
-/*
- * Return the maximum page of the form.
- */
-int
-form_max_page(FORM *form)
-{
-	if (form == NULL)
-		return _formi_default_form.max_page;
-	else
-		return form->max_page;
-}
-
-/*
- * Return the current page of the form.
- */
-int
-form_page(FORM *form)
-{
-	if (form == NULL)
-		return E_BAD_ARGUMENT;
-
-	return form->page;
-}
-
-/*
- * Set the current field to the field given.
- */
-int
-set_current_field(FORM *form, FIELD *field)
-{
-	if (form == NULL)
-		return E_BAD_ARGUMENT;
-
-	if (form->in_init == TRUE)
-		return E_BAD_STATE;
-
-	if (field == NULL)
-		return E_INVALID_FIELD;
-
-	if ((field->parent == NULL) || (field->parent != form))
-		return E_INVALID_FIELD; /* field is not of this form */
-
-	form->cur_field = field->index;
-
-	  /* XXX update page if posted??? */
-	return E_OK;
-}
-
-/*
- * Return the current field of the given form.
- */
-FIELD *
-current_field(FORM *form)
-{
-	if (form == NULL)
-		return NULL;
-
-	if (form->fields == NULL)
-		return NULL;
-
-	return form->fields[form->cur_field];
-}
-
-/*
- * Allocate a new form with the given fields.
- */
-FORM *
-new_form(FIELD **fields)
-{
-	FORM *new;
-
-	if ((new = (FORM *) malloc(sizeof(FORM))) == NULL)
-		return NULL;
-
-	
-	  /* copy in the defaults... */
-	bcopy(&_formi_default_form, new, sizeof(FORM));
-
-	if (new->win == NULL)
-		new->scrwin = stdscr; /* something for curses to write to */
-
-	if (fields != NULL) { /* attach the fields, if any */
-		if (set_form_fields(new, fields) < 0) {
-			free(new); /* field attach failed, back out */
-			return NULL;
-		}
-	}
-
-	return new;
-}
-
-/*
- * Free the given form.
- */
-int
-free_form(FORM *form)
-{
-	int i;
-	
-	if (form == NULL)
-		return E_BAD_ARGUMENT;
-
-	if (form->posted == TRUE)
-		return E_POSTED;
-
-	for (i = 0; i < form->field_count; i++) {
-		  /* detach all the fields from the form */
-		form->fields[i]->parent = NULL;
-		form->fields[i]->index = -1;
-	}
-
-	free(form);
-
-	return E_OK;
-}
-
-/*
- * Tell if the current field of the form has offscreen data ahead
- */
-int
-data_ahead(FORM *form)
-{
-	FIELD *cur;
-	
-	if ((form == NULL) || (form->fields == NULL)
-	    || (form->fields[0] == NULL))
-		return FALSE;
-
-	cur = form->fields[form->cur_field];
-
-	  /*XXXX wrong */
-	if (cur->cur_line->expanded > cur->cols)
-		return TRUE;
-
-	return FALSE;
-}
-
-/*
- * Tell if current field of the form has offscreen data behind
- */
-int
-data_behind(FORM *form)
-{
-	FIELD *cur;
-	
-	if ((form == NULL) || (form->fields == NULL)
-	    || (form->fields[0] == NULL))
-		return FALSE;
-
-	cur = form->fields[form->cur_field];
-
-	if (cur->start_char > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-/*
- * Position the form cursor.
- */
-int
-pos_form_cursor(FORM *form)
-{
-	FIELD *cur;
-	int row, col;
-	
-	if ((form == NULL) || (form->fields == NULL) ||
-	    (form->fields[0] == NULL))
-		return E_BAD_ARGUMENT;
-
-	if (form->posted != 1)
-		return E_NOT_POSTED;
-
-	cur = form->fields[form->cur_field];
-	row = cur->form_row;
-	col = cur->form_col;
-
-	  /* if the field is public then show the cursor pos */
-	if ((cur->opts & O_PUBLIC) == O_PUBLIC) {
-		row += cur->cursor_ypos;
-		col += cur->cursor_xpos;
-		if (cur->cursor_xpos >= cur->cols) {
-			col = cur->form_col;
-			row++;
-		}
-	}
-	
-#ifdef DEBUG
-	fprintf(dbg, "pos_cursor: row=%d, col=%d\n", row, col);
-#endif
-	
-	wmove(form->scrwin, row, col);
-
-	return E_OK;
-}
diff --git a/lib/libform/form.h b/lib/libform/form.h
deleted file mode 100644
index 3ce2bff14..000000000
--- a/lib/libform/form.h
+++ /dev/null
@@ -1,382 +0,0 @@
-/*	$NetBSD: form.h,v 1.23 2015/09/07 15:50:49 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *               (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software 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.
- *
- *
- */
-
-#ifndef FORM_H
-#define FORM_H 1
-#include <sys/queue.h>
-#include <stdarg.h>
-#include <curses.h>
-#include <eti.h>
-
-/* Define the types of field justification that can be used. */
-#define NO_JUSTIFICATION  (0)
-#define JUSTIFY_RIGHT     (1)
-#define JUSTIFY_LEFT      (2)
-#define JUSTIFY_CENTER    (3)
-
-/* Define the max and min valid justification styles for range checking */
-#define MIN_JUST_STYLE    NO_JUSTIFICATION
-#define MAX_JUST_STYLE    JUSTIFY_CENTER
-
-/* Options for the fields */
-typedef unsigned int Form_Options;
-
-/* form options */
-#define O_BS_OVERLOAD (0x001)
-#define O_NL_OVERLOAD (0x002)
-
-/* field options */
-#define O_VISIBLE  (0x001)  /* Field is visible */
-#define O_ACTIVE   (0x002)  /* Field is active in the form */
-#define O_PUBLIC   (0x004)  /* The contents entered into the field is echoed */
-#define O_EDIT     (0x008)  /* Can edit the field */
-#define O_WRAP     (0x010)  /* The field contents can line wrap */
-#define O_BLANK    (0x020)  /* Blank the field on modification */
-#define O_AUTOSKIP (0x040)  /* Skip to next field when current is full */
-#define O_NULLOK   (0x080)  /* Field is allowed to contain no data */
-#define O_STATIC   (0x100)  /* Field is not dynamic */
-#define O_PASSOK   (0x200)  /* An umodified field is OK */
-#define O_REFORMAT (0x400)  /* Insert newlines at linebreaks on buffer get */
-
-/*
- * Form driver requests - be VERY careful about changing the ordering
- * of the requests below.  The form driver code depends on a particular
- * order for the requests.
- */
-#define REQ_MIN_REQUEST   (KEY_MAX + 0x101) /* must equal value of the
-                                               first request */
-
-#define REQ_NEXT_PAGE     (KEY_MAX + 0x101) /* next page in form */
-#define REQ_PREV_PAGE     (KEY_MAX + 0x102) /* previous page in form */
-#define REQ_FIRST_PAGE    (KEY_MAX + 0x103) /* goto first page in form */
-#define REQ_LAST_PAGE     (KEY_MAX + 0x104) /* goto last page in form */
-
-#define REQ_NEXT_FIELD    (KEY_MAX + 0x105) /* move to the next field */
-#define REQ_PREV_FIELD    (KEY_MAX + 0x106) /* move to the previous field */
-#define REQ_FIRST_FIELD   (KEY_MAX + 0x107) /* goto the first field */
-#define REQ_LAST_FIELD    (KEY_MAX + 0x108) /* goto the last field */
-
-#define REQ_SNEXT_FIELD   (KEY_MAX + 0x109) /* move to the next field
-                                               in sorted order */
-#define REQ_SPREV_FIELD   (KEY_MAX + 0x10a) /* move to the prev field
-                                               in sorted order */
-#define REQ_SFIRST_FIELD  (KEY_MAX + 0x10b) /* move to the first
-                                               sorted field */
-#define REQ_SLAST_FIELD   (KEY_MAX + 0x10c) /* move to the last sorted
-                                               field */
-
-#define REQ_LEFT_FIELD    (KEY_MAX + 0x10d) /* go left one field */
-#define REQ_RIGHT_FIELD   (KEY_MAX + 0x10e) /* go right one field */
-#define REQ_UP_FIELD      (KEY_MAX + 0x10f) /* go up one field */
-#define REQ_DOWN_FIELD    (KEY_MAX + 0x110) /* go down one field */
-
-#define REQ_NEXT_CHAR     (KEY_MAX + 0x111) /* move to the next char
-                                               in field */
-#define REQ_PREV_CHAR     (KEY_MAX + 0x112) /* move to the previous
-                                               char in field */
-#define REQ_NEXT_LINE     (KEY_MAX + 0x113) /* go to the next line in
-                                               the field */
-#define REQ_PREV_LINE     (KEY_MAX + 0x114) /* go to the previous line
-                                               in the field */
-#define REQ_NEXT_WORD     (KEY_MAX + 0x115) /* go to the next word in
-                                               the field */
-#define REQ_PREV_WORD     (KEY_MAX + 0x116) /* go to the previous word
-                                               in the field */
-#define REQ_BEG_FIELD     (KEY_MAX + 0x117) /* go to the beginning of
-                                               the field */
-#define REQ_END_FIELD     (KEY_MAX + 0x118) /* go to the end of the field */
-#define REQ_BEG_LINE      (KEY_MAX + 0x119) /* go to the beginning of
-                                               the line */
-#define REQ_END_LINE      (KEY_MAX + 0x11a) /* go to the end of the
-                                               line */
-#define REQ_LEFT_CHAR     (KEY_MAX + 0x11b) /* move left in the field */
-#define REQ_RIGHT_CHAR    (KEY_MAX + 0x11c) /* move right in the field */
-#define REQ_UP_CHAR       (KEY_MAX + 0x11d) /* move up in the field */
-#define REQ_DOWN_CHAR     (KEY_MAX + 0x11e) /* move down in the field */
-
-#define REQ_NEW_LINE      (KEY_MAX + 0x11f) /* insert/overlay a new line */
-#define REQ_INS_CHAR      (KEY_MAX + 0x120) /* insert a blank char at
-                                               the cursor */
-#define REQ_INS_LINE      (KEY_MAX + 0x121) /* insert a blank line at
-                                               the cursor */
-
-#define REQ_DEL_CHAR      (KEY_MAX + 0x122) /* delete the current character */
-#define REQ_DEL_PREV      (KEY_MAX + 0x123) /* delete the character
-                                               before the current */
-#define REQ_DEL_LINE      (KEY_MAX + 0x124) /* delete the current line */
-#define REQ_DEL_WORD      (KEY_MAX + 0x125) /* delete the word at the cursor */
-#define REQ_CLR_EOL       (KEY_MAX + 0x126) /* clear to the end of the line */
-#define REQ_CLR_EOF       (KEY_MAX + 0x127) /* clear to the end of the field */
-#define REQ_CLR_FIELD     (KEY_MAX + 0x128) /* clear the field */
-
-#define REQ_OVL_MODE      (KEY_MAX + 0x129) /* overlay mode */
-#define REQ_INS_MODE      (KEY_MAX + 0x12a) /* insert mode */
-
-#define REQ_SCR_FLINE     (KEY_MAX + 0x12b) /* scroll field forward one line */
-#define REQ_SCR_BLINE     (KEY_MAX + 0x12c) /* scroll field backward
-                                               one line */
-#define REQ_SCR_FPAGE     (KEY_MAX + 0x12d) /* scroll field forward one page */
-#define REQ_SCR_BPAGE     (KEY_MAX + 0x12e) /* scroll field backward
-                                               one page */
-#define REQ_SCR_FHPAGE    (KEY_MAX + 0x12f) /* scroll field forward
-                                               half a page */
-#define REQ_SCR_BHPAGE    (KEY_MAX + 0x130) /* scroll field backward
-                                               half a page */
-
-#define REQ_SCR_FCHAR     (KEY_MAX + 0x131) /* horizontal scroll
-                                               forward a character */
-#define REQ_SCR_BCHAR     (KEY_MAX + 0x132) /* horizontal scroll
-                                               backward a character */
-#define REQ_SCR_HFLINE    (KEY_MAX + 0x133) /* horizontal scroll
-                                               forward a line */
-#define REQ_SCR_HBLINE    (KEY_MAX + 0x134) /* horizontal scroll
-                                               backward a line */
-#define REQ_SCR_HFHALF    (KEY_MAX + 0x135) /* horizontal scroll
-                                               forward half a line */
-#define REQ_SCR_HBHALF    (KEY_MAX + 0x136) /* horizontal scroll
-                                               backward half a line */
-
-#define REQ_VALIDATION    (KEY_MAX + 0x137) /* validate the field */
-#define REQ_PREV_CHOICE   (KEY_MAX + 0x138) /* display previous field choice */
-#define REQ_NEXT_CHOICE   (KEY_MAX + 0x139) /* display next field choice */
-
-#define REQ_MAX_COMMAND   (KEY_MAX + 0x139) /* must match the last
-                                               driver command */
-
-/* The following defines are for ncurses compatibility */
-#define MIN_FORM_COMMAND	REQ_MIN_REQUEST
-#define MAX_FORM_COMMAND	REQ_MAX_COMMAND
-
-
-typedef struct _form_string {
-	size_t allocated;
-	unsigned int length;
-	char *string;
-} FORM_STR;
-
-typedef struct _form_field FIELD;
-typedef struct _form_struct FORM;
-typedef struct _form_fieldtype FIELDTYPE;
-
-typedef struct _formi_page_struct _FORMI_PAGE_START;
-typedef struct formi_type_link_struct _FORMI_TYPE_LINK;
-typedef struct _formi_field_lines _FORMI_FIELD_LINES;
-
-
-typedef void (*Form_Hook)(FORM *);
-
-/* definition of a field in the form */
-struct _form_field {
-	unsigned int rows; /* rows in the field */
-	unsigned int cols; /* columns in the field */
-	unsigned int drows; /* dynamic rows */
-	unsigned int dcols; /* dynamic columns */
-	unsigned int max; /* maximum growth */
-	unsigned int form_row; /* starting row in the form subwindow */
-	unsigned int form_col; /* starting column in the form subwindow */
-	unsigned int nrows; /* number of off screen rows */
-	int index; /* index of this field in form fields array. */
-	int nbuf; /* number of buffers associated with this field */
-	int buf0_status; /* set to true if buffer 0 has changed. */
-	int justification; /* justification style of the field */
-	int overlay; /* set to true if field is in overlay mode */
-	_FORMI_FIELD_LINES *cur_line; /* pointer to the current line cursor
-					 is on */
-	unsigned int start_char; /* starting char in string (horiz scroll) */
-	_FORMI_FIELD_LINES *start_line; /* start line in field (vert scroll) */
-	unsigned int row_count; /* number of rows actually used in field */
-	unsigned int row_xpos; /* char offset of cursor in field, not same
-				  as cursor_xpos due to tab expansion */
-	unsigned int cursor_xpos; /* x pos of cursor in field */
-	unsigned int cursor_ypos; /* y pos of cursor in field */
-	short page_break; /* start of a new page on the form if 1 */
-	short page; /* number of the page this field is on */
-	chtype fore; /* character attributes for the foreground */
-	chtype back; /* character attributes for the background */
-	int pad; /* padding character */
-	Form_Options opts; /* options for the field */
-	FORM *parent; /* the form this field is bound to, if any */
-	FIELD *up; /* field above this one */
-	FIELD *down; /* field below this one */
-	FIELD *left; /* field to the left of this one */
-	FIELD *right; /* field to the right of this one */
-	void *userptr;  /* user defined pointer. */
-	FIELD *link; /* used if fields are linked */
-	FIELDTYPE *type; /* type struct for the field */
-	TAILQ_ENTRY(_form_field) glue; /* tail queue glue for sorting fields */
-	char *args; /* args for field type. */
-	_FORMI_FIELD_LINES *alines; /* array of the starts and ends of lines */
-	_FORMI_FIELD_LINES *free; /* list of lines available for reuse */
-	FORM_STR *buffers; /* array of buffers for the field */
-};
-
-/* define the types of fields we can have */
-extern FIELDTYPE *TYPE_ALNUM;
-extern FIELDTYPE *TYPE_ALPHA;
-extern FIELDTYPE *TYPE_ENUM;
-extern FIELDTYPE *TYPE_INTEGER;
-extern FIELDTYPE *TYPE_NUMERIC;
-extern FIELDTYPE *TYPE_REGEXP;
-extern FIELDTYPE *TYPE_IPV4;
-extern FIELDTYPE *TYPE_IPV6;
-extern FIELDTYPE *TYPE_USER;
-
-/* definition of a field type. */
-struct _form_fieldtype {
-	unsigned flags; /* status of the type */
-	unsigned refcount; /* in use if > 0 */
-	_FORMI_TYPE_LINK *link; /* set if this type is linked */
-
-	char * (*make_args)(va_list *); /* make the args for the type */
-	char * (*copy_args)(char *); /* copy the args for the type */
-	void (*free_args)(char *); /* free storage used by the args */
-	int (*field_check)(FIELD *, char *); /* field validation routine */
-	int (*char_check)(int, char *); /* char validation routine */
-	int (*next_choice)(FIELD *, char *); /* function to select next
-						choice */
-	int (*prev_choice)(FIELD *, char *); /* function to select prev
-						choice */
-};
-	
-/*definition of a form */
-
-struct _form_struct {
-	int in_init; /* true if performing a init or term function */
-	int posted; /* the form is posted */
-	int wrap; /* wrap from last field to first field if true */
-	WINDOW *win; /* window for the form */
-	WINDOW *subwin; /* subwindow for the form */
-	WINDOW *scrwin; /* this is the window to use for output */
-	void *userptr; /* user defined pointer */
-	Form_Options opts; /* options for the form */
-	Form_Hook form_init; /* function called when form posted and
-				after page change */
-	Form_Hook form_term; /* function called when form is unposted and
-				before page change */
-	Form_Hook field_init; /* function called when form posted and after
-				 current field changes */
-	Form_Hook field_term; /* function called when form unposted and
-				 before current field changes */
-	int field_count; /* number of fields attached */
-	int cur_field; /* current field */
-	int page; /* current page of form */
-	int max_page; /* number of pages in the form */
-	_FORMI_PAGE_START *page_starts; /* dynamic array of fields that start
-					   the pages */
-	TAILQ_HEAD(_formi_sort_head, _form_field) sorted_fields; /* sorted field
-								list */
-	FIELD **fields; /* array of fields attached to this form. */
-};
-
-/* Public function prototypes. */
-__BEGIN_DECLS
-
-FIELD       *current_field(FORM *);
-int          data_ahead(FORM *);
-int          data_behind(FORM *);
-FIELD       *dup_field(FIELD *, int, int);
-int          dynamic_field_info(FIELD *, int *, int *, int *);
-char        *field_arg(FIELD *);
-chtype       field_back(FIELD *);
-char        *field_buffer(FIELD *, int);
-int          field_count(FORM *);
-chtype       field_fore(FIELD *);
-int          field_index(FIELD *);
-int          field_info(FIELD *, int *, int *, int *, int *, int *, int *);
-Form_Hook    field_init(FORM *);
-int          field_just(FIELD *);
-Form_Options field_opts(FIELD *);
-int          field_opts_off(FIELD *, Form_Options);
-int          field_opts_on(FIELD *, Form_Options);
-int          field_pad(FIELD *);
-int          field_status(FIELD *);
-Form_Hook    field_term(FORM *);
-FIELDTYPE   *field_type(FIELD *);
-void        *field_userptr(FIELD *);
-int          form_driver(FORM *, int);
-FIELD      **form_fields(FORM *);
-Form_Hook    form_init(FORM *);
-int          form_max_page(FORM *);
-Form_Options form_opts(FORM *);
-int          form_opts_off(FORM *, Form_Options);
-int          form_opts_on(FORM *, Form_Options);
-int          form_page(FORM *);
-WINDOW      *form_sub(FORM *);
-Form_Hook    form_term(FORM *);
-void        *form_userptr(FORM *);
-WINDOW      *form_win(FORM *);
-int          free_field(FIELD *);
-int          free_fieldtype(FIELDTYPE *);
-int          free_form(FORM *);
-FIELD       *link_field(FIELD *, int, int);
-FIELDTYPE   *link_fieldtype(FIELDTYPE *, FIELDTYPE *);
-int          move_field(FIELD *, int, int);
-FIELD       *new_field(int, int, int, int, int, int);
-FIELDTYPE   *new_fieldtype(int (* field_check)(FIELD *, char *),
-			   int (* char_check)(int, char *));
-FORM        *new_form(FIELD **);
-int          new_page(FIELD *);
-int          pos_form_cursor(FORM *);
-int          post_form(FORM *);
-int          scale_form(FORM *, int *, int *);
-int          set_current_field(FORM *, FIELD *);
-int          set_field_back(FIELD *, chtype);
-int          set_field_buffer(FIELD *, int, const char *);
-int          set_field_fore(FIELD *, chtype);
-int          set_field_init(FORM *, Form_Hook);
-int          set_field_just(FIELD *, int);
-int          set_field_opts(FIELD *, Form_Options);
-int          set_field_pad(FIELD *, int);
-int          set_field_printf(FIELD *, int, char *, ...) __printflike(3, 4);
-int          set_field_status(FIELD *, int);
-int          set_field_term(FORM *, Form_Hook);
-int          set_field_type(FIELD *, FIELDTYPE *, ...);
-int          set_field_userptr(FIELD *, void *);
-int          set_fieldtype_arg(FIELDTYPE *, char *(*)(va_list *),
-			       char *(*)(char *),
-			       void (*)(char *));
-int          set_fieldtype_choice(FIELDTYPE *, int (*)(FIELD *, char *),
-				  int (*)(FIELD *, char *));
-int          set_form_fields(FORM *, FIELD **);
-int          set_form_init(FORM *, Form_Hook);
-int          set_form_opts(FORM *, Form_Options);
-int          set_form_page(FORM *, int);
-int          set_form_sub(FORM *, WINDOW *);
-int          set_form_term(FORM *, Form_Hook);
-int          set_form_userptr(FORM *, void *);
-int          set_form_win(FORM *, WINDOW *);
-int          set_max_field(FIELD *, int);
-int          set_new_page(FIELD *, int);
-int          unpost_form(FORM *);
-
-__END_DECLS
-
-#endif /* FORM_H */
diff --git a/lib/libform/form_cursor.3 b/lib/libform/form_cursor.3
deleted file mode 100644
index dbb6a39d8..000000000
--- a/lib/libform/form_cursor.3
+++ /dev/null
@@ -1,71 +0,0 @@
-.\"	$NetBSD: form_cursor.3,v 1.9 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm pos_form_cursor
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft int
-.Fn pos_form_cursor "FORM *form"
-.Sh DESCRIPTION
-The function
-.Fn pos_form_cursor
-positions the screen cursor at the correct position for the form.
-This function can be used to restore the cursor state after using
-other curses routines.
-.Sh RETURN VALUES
-.Fn pos_form_cursor
-will return one of the following error values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_BAD_ARGUMENT
-A bad argument was passed to the function.
-.It Er E_NOT_POSTED
-The form is not posted to the screen.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_data.3 b/lib/libform/form_data.3
deleted file mode 100644
index 3fafd3ee8..000000000
--- a/lib/libform/form_data.3
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"	$NetBSD: form_data.3,v 1.9 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORM_DATA 3
-.Os
-.Sh NAME
-.Nm form
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft int
-.Fn data_ahead "FORM *form"
-.Ft int
-.Fn data_behind "FORM *form"
-.Sh DESCRIPTION
-If there is data offscreen to the right of the current field of the
-given form then
-.Fn data_ahead
-will return
-.Dv TRUE ,
-otherwise
-.Dv FALSE
-is returned.
-Similarly, if there is
-data offscreen to the left of the current field of the given form then
-.Fn data_behind
-will return
-.Dv TRUE .
-.Sh RETURN VALUES
-If the condition is met then the functions will return
-.Dv TRUE ,
-if there
-is an error or there is no data offscreen the functions will return
-.Dv FALSE .
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_driver.3 b/lib/libform/form_driver.3
deleted file mode 100644
index 3c18991a1..000000000
--- a/lib/libform/form_driver.3
+++ /dev/null
@@ -1,226 +0,0 @@
-.\"	$NetBSD: form_driver.3,v 1.11 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm form_driver
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft int
-.Fn form_driver "FORM *form" "int request"
-.Sh DESCRIPTION
-The
-.Fn form_driver
-is the heart of the forms library, it takes commands in the
-.Fa request
-parameter that is either a request to the driver to perform some
-action or is a character to be inserted into the current field.
-The form driver will attempt to insert any printable character passed to
-it into the current field.
-This may or may not succeed depending on the state of the current field.
-If the character passed is not
-printable then the driver attempts to process it as a driver request.
-If the character passed is not a valid request then the driver will
-return an unknown command error.
-.Sh PARAMETERS
-The forms driver recognizes the following requests:
-.Pp
-.Bl -tag -width REQ_SFIRST_FIELD -compact
-.It REQ_NEXT_PAGE
-Change to the next page in the form.
-.It REQ_PREV_PAGE
-Change to the previous page in the form.
-.It REQ_FIRST_PAGE
-Select the first page in the form.
-.It REQ_LAST_PAGE
-Go to the last page in the form.
-.It REQ_NEXT_FIELD
-Move to the next field in the form field array.
-.It REQ_PREV_FIELD
-Move to the previous field in the form field array.
-.It REQ_FIRST_FIELD
-Go to the first field in the form field array.
-.It REQ_LAST_FIELD
-Go to the last field in the form field array.
-.It REQ_SNEXT_FIELD
-Move to the next sorted field on the form.
-.It REQ_SPREV_FIELD
-Move to the previous sorted field on the form.
-.It REQ_SFIRST_FIELD
-Go to the first field in the sorted list.
-.It REQ_SLAST_FIELD
-Move to the last field in the sorted list.
-.It REQ_LEFT_FIELD
-Go one field to the left on the form page.
-.It REQ_RIGHT_FIELD
-Go one field to the right on the form page.
-.It REQ_UP_FIELD
-Go up one field on the form page.
-.It REQ_DOWN_FIELD
-Go down one field on the form page.
-.It REQ_NEXT_CHAR
-Move one char to the right within the field
-.It REQ_PREV_CHAR
-Move one char to the left within the current field.
-.It REQ_NEXT_LINE
-Go down one line in the current field.
-.It REQ_PREV_LINE
-Go up one line in the current field.
-.It REQ_NEXT_WORD
-Go forward one word in the current field
-.It REQ_PREV_WORD
-Go backward one word in the current field.
-.It REQ_BEG_FIELD
-Move the cursor to the beginning of the current field.
-.It REQ_END_FIELD
-Move the cursor to the end of the current field.
-.It REQ_BEG_LINE
-Move the cursor to the beginning of the line in the current field.
-.It REQ_END_LINE
-Move the cursor to the end of the line.
-.It REQ_LEFT_CHAR
-Move the cursor left one character
-.It REQ_RIGHT_CHAR
-Move the cursor right one character
-.It REQ_UP_CHAR
-Move the cursor up one line.
-.It REQ_DOWN_CHAR
-Move the cursor down one line.
-.It REQ_NEW_LINE
-Insert a new line at the current cursor position.
-.It REQ_INS_CHAR
-Insert a blank character at the current cursor position
-.It REQ_INS_LINE
-Open a blank line at the current cursor position.
-.It REQ_DEL_CHAR
-Delete the character at the current cursor position.
-.It REQ_DEL_PREV
-Delete the character to the left of the current cursor position.
-.It REQ_DEL_LINE
-Delete the current line.
-.It REQ_DEL_WORD
-Delete the word at the current cursor position.
-.It REQ_CLR_EOL
-Clear the field from the current cursor position to the end of the
-current line.
-.It REQ_CLR_EOF
-Clear the field from the current cursor position to the end of the field.
-.It REQ_CLR_FIELD
-Clear the field.
-.It REQ_OVL_MODE
-Enter overlay mode, characters added to the field will replace the
-ones already there.
-.It REQ_INS_MODE
-Enter insert mode, characters will be inserted at the current cursor
-position.
-Any characters to the right of the cursor will be moved
-right to accommodate the new characters.
-.It REQ_SCR_FLINE
-Scroll the field forward one line.
-.It REQ_SCR_BLINE
-Scroll the field backward one line.
-.It REQ_SCR_FPAGE
-Scroll the field forward one field page.
-.It REQ_SCR_BPAGE
-Scroll the field backward one field page.
-.It REQ_SCR_FHPAGE
-Scroll the field forward half one field page.
-.It REQ_SCR_BHPAGE
-Scroll the field backward half one field page.
-.It REQ_SCR_FCHAR
-Scroll the field horizontally forward one character
-.It REQ_SCR_BCHAR
-Scroll the field horizontally backward one character
-.It REQ_SCR_HFLINE
-Scroll the field horizontally forward one field line.
-.It REQ_SCR_HBLINE
-Scroll the field horizontally backward one field line.
-.It REQ_SCR_HFHALF
-Scroll the field horizontally forward half a field line.
-.It REQ_SCR_HBHALF
-Scroll the field horizontally backward half a field line.
-.It REQ_VALIDATION
-Request the contents of the current field be validated using any field
-validation function that has been set for the field.
-Normally, the field is validated before the current field changes.
-This request allows the current field to be validated.
-.It REQ_PREV_CHOICE
-Select the previous choice in an enumerated type field.
-.It REQ_NEXT_CHOICE
-Select the next choice in an enumerated type field.
-.El
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following error
-values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_REQUEST_DENIED
-The forms driver request could not be fulfilled
-.It Er E_UNKNOWN_COMMAND
-The passed character is not a printable character and is not a valid
-forms driver request.
-.It Er E_BAD_ARGUMENT
-A bad argument was passed to the forms driver.
-.It Er E_INVALID_FIELD
-The form passed to the driver has no valid attached fields.
-.It Er E_NOT_POSTED
-The given form is not currently posted to the screen.
-.It Er E_BAD_STATE
-The forms driver was called from within an init or term function.
-.It Er E_INVALID_FIELD
-The character passed to the forms driver fails the character
-validation for the current field.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-Field sorting is done by location of the field on the form page, the
-fields are sorted by position starting with the top-most, left-most
-field and progressing left to right.
-For the purposes of sorting, the
-fields top left corner is used as the sort criteria.
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_field.3 b/lib/libform/form_field.3
deleted file mode 100644
index 4432bb2e8..000000000
--- a/lib/libform/form_field.3
+++ /dev/null
@@ -1,111 +0,0 @@
-.\"	$NetBSD: form_field.3,v 1.12 2012/10/08 18:15:09 njoly Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm field_count ,
-.Nm form_fields ,
-.Nm move_field ,
-.Nm set_form_fields
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft int
-.Fn field_count "FORM *form"
-.Ft FIELD **
-.Fn form_fields "FORM *form"
-.Ft int
-.Fn move_field "FIELD *field" "int frow" "int fcol"
-.Ft int
-.Fn set_form_fields "FORM *form" "FIELD **fields"
-.Sh DESCRIPTION
-The
-.Fn field_count
-function returns the number of fields that are attached to the given
-form, if the form argument passed is
-.Dv NULL
-then
-.Fn field_count
-will return \-1.
-The function
-.Fn form_fields
-will return a pointer to array of attach fields for the given form,
-this array is not
-.Dv NULL
-terminated, fields may be attached to the given
-form by calling
-.Fn set_form_fields .
-The
-.Fa fields
-argument in this function is a pointer to a
-.Dv NULL
-terminated array of
-fields that will be attached to the form.
-If there are already fields attached to the form then they will be
-detached before the new fields are attached.
-The new fields given must not be attached to any other form.
-The
-.Fn move_field
-function will move the given field to the location specified by
-.Fa frow
-and
-.Fa fcol .
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following error
-values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_CONNECTED
-The field is connected to a form.
-.It Er E_POSTED
-The form is currently posted to the screen.
-.It Er E_BAD_ARGUMENT
-The function was passed a bad argument.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_field_attributes.3 b/lib/libform/form_field_attributes.3
deleted file mode 100644
index 11b1bab41..000000000
--- a/lib/libform/form_field_attributes.3
+++ /dev/null
@@ -1,100 +0,0 @@
-.\"	$NetBSD: form_field_attributes.3,v 1.10 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm field_back ,
-.Nm field_fore ,
-.Nm field_pad ,
-.Nm set_field_back ,
-.Nm set_field_fore ,
-.Nm set_field_pad
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft chtype
-.Fn field_back "FIELD *field"
-.Ft chtype
-.Fn field_fore "FIELD *field"
-.Ft int
-.Fn field_pad "FIELD *field"
-.Ft int
-.Fn set_field_back "FIELD *field" "chtype attribute"
-.Ft int
-.Fn set_field_fore "FIELD *field" "chtype attribute"
-.Ft int
-.Fn set_field_pad "FIELD *field" "int pad"
-.Sh DESCRIPTION
-Calling the function
-.Fn field_back
-will return the character attributes that will be applied to a field
-that is not the current field, these attributes can be set by the
-.Fn set_field_back
-function.
-The
-.Fn field_fore
-function returns the character attributes that will be used to
-indicate that a field is the currently active one on the form, this
-attribute may be set by using the
-.Fn set_field_fore
-function.
-The pad character for a field is the character that will be printed in all
-field locations not occupied with actual field contents.
-The pad character can be retrieved by calling the
-.Fn field_pad
-function, the pad character is set by using the
-.Fn set_field_pad
-function.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following error
-values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_field_buffer.3 b/lib/libform/form_field_buffer.3
deleted file mode 100644
index 7b17104fa..000000000
--- a/lib/libform/form_field_buffer.3
+++ /dev/null
@@ -1,134 +0,0 @@
-.\"	$NetBSD: form_field_buffer.3,v 1.13 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd October 15, 2005
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm field_buffer ,
-.Nm field_status ,
-.Nm set_field_buffer ,
-.Nm set_field_printf ,
-.Nm set_field_status ,
-.Nm set_max_field
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft char *
-.Fn field_buffer "FIELD *field" "int buffer"
-.Ft int
-.Fn field_status "FIELD *field"
-.Ft int
-.Fn set_field_buffer "FIELD *field" "int buffer" "char *value"
-.Ft int
-.Fn set_field_printf "FIELD *field" "int buffer" "char *fmt" "..."
-.Ft int
-.Fn set_field_status "FIELD *field" "int status"
-.Ft int
-.Fn set_max_field "FIELD *field" "int max"
-.Sh DESCRIPTION
-The
-.Fn field_buffer
-function returns the contents of the buffer number specified by
-.Fa buffer
-for the given field.
-If the requested buffer number exceeds the
-number of buffers attached to the field then
-.Dv NULL
-will be returned.
-If the field option
-.Dv O_REFORMAT
-is enabled on the given field then
-storage will be allocated to hold the reformatted buffer.
-This storage must be release by calling
-.Xr free 3
-when it is no longer required.
-If the
-.Dv O_REFORMAT
-field option is not set then no extra storage is allocated.
-The field buffer may be set by calling
-.Fn set_field_buffer
-which will set the given buffer number to the contents of the string
-passed.
-A buffer may also be set by calling
-.Fn set_field_printf
-which sets the buffer using the format arg
-.Fa fmt
-after being expanded using the subsequent arguments in the same manner
-as
-.Xr sprintf 3
-does.
-Calling
-.Fn field_status
-will return the status of the first buffer attached to the field.
-If the field has been modified then the function will return
-.Dv TRUE
-otherwise
-.Dv FALSE
-is returned, the status of the first buffer may be
-programmatically set by calling
-.Fn set_field_status .
-The maximum growth of a dynamic field can be set by calling
-.Fn set_max_field
-which limits the fields rows if the field is a multiline field or the
-fields columns if the field only has a single row.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following error
-values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_BAD_ARGUMENT
-A bad parameter was passed to the function.
-.It Er E_SYSTEM_ERROR
-A system error occurred performing the function.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
-The function
-.Fn set_field_printf
-is a
-.Nx
-extension and must not be used in portable code.
diff --git a/lib/libform/form_field_info.3 b/lib/libform/form_field_info.3
deleted file mode 100644
index f299cf3b1..000000000
--- a/lib/libform/form_field_info.3
+++ /dev/null
@@ -1,89 +0,0 @@
-.\"	$NetBSD: form_field_info.3,v 1.9 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm dynamic_field_info ,
-.Nm field_info
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft int
-.Fn dynamic_field_info "FIELD *field" "int *drows" "int *dcols" "int *max"
-.Ft int
-.Fn field_info "FIELD *field" "int *rows" "int *cols" "int *frow" "int *fcol" \
-"int *nrow" "int *nbuf"
-.Sh DESCRIPTION
-The function
-.Fn dynamic_field_info
-returns the sizing information for the field given.
-The function will return the number of rows, columns and the maximum
-growth of the field in the storage pointed to by the drows, dcols and max
-parameters respectively.
-Dynamic field information cannot be requested for the default field.
-If the field given is not dynamic then
-.Fn dynamic_field_info
-will simply return the size of the actual field.
-The
-.Fn field_info
-will return the number or rows, columns, field starting row, field
-starting column, number of off screen rows and number of buffers in
-.Fa rows ,
-.Fa cols ,
-.Fa frow ,
-.Fa fcol ,
-.Fa nrow
-and
-.Fa nbuf
-respectively.
-.Sh RETURN VALUES
-The functions will return one of the following error values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_BAD_ARGUMENT
-A bad argument was passed to the function.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_field_just.3 b/lib/libform/form_field_just.3
deleted file mode 100644
index e0e0dfbf6..000000000
--- a/lib/libform/form_field_just.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\"	$NetBSD: form_field_just.3,v 1.11 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm field_just ,
-.Nm set_field_just
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft int
-.Fn field_just "FIELD *field"
-.Ft int
-.Fn set_field_just "FIELD *field" "int justification"
-.Sh DESCRIPTION
-Field justification is only applied to static fields, a dynamic field
-will not be justified.
-The default justification for a field is
-NO_JUSTIFICATION.
-The
-.Fn field_just
-will return the current justification value of the given field and the
-justification may be set by calling the
-.Fn set_field_just
-function.
-.Sh PARAMETERS
-The following are the valid justifications for a field:
-.Pp
-.Bl -tag -width NO_JUSTIFICATION -compact
-.It NO_JUSTIFICATION
-No justification is to be applied to the field.
-In practice, this is the same as JUSTIFY_LEFT.
-.It JUSTIFY_RIGHT
-The field will be right justified.
-That is, the end of each line will
-be butted up against the right hand side of the field.
-.It JUSTIFY_LEFT
-The field will be left justified.
-That is, the start of each line
-will be butted up against the left hand side of the field.
-.It JUSTIFY_CENTER
-The field will be centre justified, padding will be applied to either
-end of the line to make the line centred in the field.
-.El
-.Sh RETURN VALUES
-The functions will return one of the following error values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_CURRENT
-The field specified is the currently active one on the form.
-.It Er E_BAD_ARGUMENT
-A bad argument was passed to the function.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_field_new.3 b/lib/libform/form_field_new.3
deleted file mode 100644
index f3e4a1c84..000000000
--- a/lib/libform/form_field_new.3
+++ /dev/null
@@ -1,117 +0,0 @@
-.\"	$NetBSD: form_field_new.3,v 1.11 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm dup_field ,
-.Nm free_field ,
-.Nm link_field ,
-.Nm new_field
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft FIELD *
-.Fn dup_field "FIELD *field" "int frow" "int fcol"
-.Ft int
-.Fn free_field "FIELD *field"
-.Ft FIELD *
-.Fn link_field "FIELD *field" "int frow" "int fcol"
-.Ft FIELD *
-.Fo new_field
-.Fa "int rows"
-.Fa "int cols"
-.Fa "int frow"
-.Fa "int fcol"
-.Fa "int nrows"
-.Fa "int nbuf"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn dup_field
-function duplicates the given field, including any buffers associated
-with the field and returns the pointer to the newly created field.
-.Fn free_field
-destroys the field and frees any allocated resources associated with
-the field.
-The function
-.Fn link_field
-copies the given field to a new field at the location
-.Fa frow
-and
-.Fa fcol
-but shares the buffers with the original field.
-.Fn new_field
-creates a new field of size
-.Fa rows
-by
-.Fa cols
-at location
-.Fa frow ,
-.Fa fcol
-on the page, the argument
-.Fa nrows
-specified the number of off screen rows the field has and the
-.Fa nbuf
-parameter specifies the number of extra buffers attached to the
-field.
-There will always be one buffer associated with a field.
-.Sh RETURN VALUES
-On error
-.Fn dup_field
-and
-.Fn new_field
-will return
-.Dv NULL .
-The functions will one of the following error
-values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_BAD_ARGUMENT
-A bad argument was passed to the function.
-.It Er E_CONNECTED
-The field is connected to a form.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_field_opts.3 b/lib/libform/form_field_opts.3
deleted file mode 100644
index 1de3e2adc..000000000
--- a/lib/libform/form_field_opts.3
+++ /dev/null
@@ -1,157 +0,0 @@
-.\"	$NetBSD: form_field_opts.3,v 1.11 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd November 24, 2004
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm field_opts ,
-.Nm field_opts_off ,
-.Nm field_opts_on ,
-.Nm set_field_opts
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft Form_Options
-.Fn field_opts "FIELD *field"
-.Ft int
-.Fn field_opts_off "FIELD *field" "Form_Options options"
-.Ft int
-.Fn field_opts_on "FIELD *field" "Form_Options options"
-.Ft int
-.Fn set_field_opts "FIELD *field" "Form_Options options"
-.Sh DESCRIPTION
-The function
-.Fn field_opts
-returns the current options settings for the given field.
-The
-.Fn field_opts_off
-will turn the options given in
-.Fa options
-off for the given field, options not specified in
-.Fa options
-will remain unchanged.
-Conversely, the function
-.Fn field_opts_on
-will turn on the options given in
-.Fa options
-for the specified field, again, any options not specified will remain
-unchanged.
-The options for a field may be set to a specific set of
-options by calling the
-.Fn set_field_opts
-function.
-Options may only be changed if the field given is not the
-currently active one.
-.Sh PARAMETERS
-The following options are available for a field:
-.Pp
-.Bl -tag -width O_REFORMAT -compact
-.It Dv O_VISIBLE
-The field is visible, hence is displayed when the form is posted.
-.It Dv O_ACTIVE
-The field is active in the form, meaning that it can be visited during
-form processing.
-.It Dv O_PUBLIC
-The contents of the field are echoed to the screen.
-.It Dv O_EDIT
-The contents of the field can be modified
-.It Dv O_WRAP
-The contents of the field are wrapped on a word boundary, if this
-option is off then the field will be wrapped on a character boundary.
-.It Dv O_BLANK
-Blank the field on new data being entered if and only if the field
-cursor is at the left hand side of the field.
-.It Dv O_AUTOSKIP
-Skip to the next field when the current field reaches its maximum
-size.
-.It Dv O_NULLOK
-The field is allowed to contain no data
-.It Dv O_STATIC
-The field is not dynamic, it has a fixed size.
-.It Dv O_PASSOK
-An unmodified field is allowed.
-.It Dv O_REFORMAT
-Retain the formatting of a field when the buffer is retrieved.
-If this option is not set then the buffer returned will be a single string
-with no line breaks.
-When this option is set newline characters will be inserted at the point
-where the string has been wrapped in a multiline field.
-This option is an extension to the forms library and must not be used
-in portable code.
-See the
-.Xr field_buffer 3
-man page for how this option modifies the behaviour of
-.Fn field_buffer .
-.El
-.Pp
-The following options are on by default for a field:
-.Dv O_VISIBLE ,
-.Dv O_ACTIVE ,
-.Dv O_PUBLIC ,
-.Dv O_EDIT ,
-.Dv O_WRAP ,
-.Dv O_BLANK ,
-.Dv O_AUTOSKIP ,
-.Dv O_NULLOK ,
-.Dv O_PASSOK ,
-and
-.Dv O_STATIC .
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following error
-values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_CURRENT
-The field specified is the currently active one in the form.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
-The option
-.Dv O_REFORMAT
-is a
-.Nx
- extension and must not be used in portable code.
diff --git a/lib/libform/form_field_userptr.3 b/lib/libform/form_field_userptr.3
deleted file mode 100644
index 4aff31cbf..000000000
--- a/lib/libform/form_field_userptr.3
+++ /dev/null
@@ -1,74 +0,0 @@
-.\"	$NetBSD: form_field_userptr.3,v 1.9 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm field_userptr ,
-.Nm set_field_userptr
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft void *
-.Fn field_userptr "FIELD *field"
-.Ft int
-.Fn set_field_userptr "FIELD *field" "void *ptr"
-.Sh DESCRIPTION
-The
-.Fn field_userptr
-function returns the pointer to the user defined data for the field,
-this pointer may be set by calling the
-.Fn set_field_userptr
-function.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following error
-values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_field_validation.3 b/lib/libform/form_field_validation.3
deleted file mode 100644
index 928896e22..000000000
--- a/lib/libform/form_field_validation.3
+++ /dev/null
@@ -1,82 +0,0 @@
-.\"	$NetBSD: form_field_validation.3,v 1.10 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm field_arg ,
-.Nm field_type ,
-.Nm set_field_type
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft char *
-.Fn field_arg "FIELD *field"
-.Ft FIELDTYPE *
-.Fn field_type "FIELD *field"
-.Ft int
-.Fn set_field_type "FIELD *field" "FIELDTYPE *type" "..."
-.Sh DESCRIPTION
-The
-.Fn field_arg
-function returns the field type arguments that are associated with the
-given field.
-The
-.Fn field_type
-function returns the field type structure associated with the given
-field, this type can be set by calling the
-.Fn set_field_type
-function which associates the given field type with the field, the
-third and subsequent parameters are field dependent arguments.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following error
-values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_fieldtype.3 b/lib/libform/form_fieldtype.3
deleted file mode 100644
index c4faa0b0c..000000000
--- a/lib/libform/form_fieldtype.3
+++ /dev/null
@@ -1,150 +0,0 @@
-.\"	$NetBSD: form_fieldtype.3,v 1.11 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm free_fieldtype ,
-.Nm link_fieldtype ,
-.Nm new_fieldtype ,
-.Nm set_fieldtype_arg ,
-.Nm set_fieldtype_choice
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft int
-.Fn free_fieldtype "FIELDTYPE *fieldtype"
-.Ft FIELDTYPE *
-.Fn link_fieldtype "FIELDTYPE *type1" "FIELDTYPE *type2"
-.Ft FIELDTYPE *
-.Fo new_fieldtype
-.Fa "int (*field_check)(FIELD *, char *)"
-.Fa "int (*char_check)(int, char *)"
-.Fc
-.Ft int
-.Fo "set_fieldtype_arg"
-.Fa "FIELDTYPE *fieldtype"
-.Fa "char * (*make_args)(va_list *)"
-.Fa "char * (*copy_args)(char *)"
-.Fa "void (*free_args)(char *)"
-.Fc
-.Ft int
-.Fo set_fieldtype_choice
-.Fa "FIELDTYPE *fieldtype"
-.Fa "int (*next_choice)(FIELD *, char *)"
-.Fa "int (*prev_choice)(FIELD *, char *)"
-.Fc
-.Sh DESCRIPTION
-The function
-.Fn free_fieldtype
-frees the storage associated with the field type and destroys it.
-The function
-.Fn link_fieldtype
-links together the two given field types to produce a new field type.
-A new field type can be created by calling
-.Fn new_fieldtype
-which requires pointers to two functions which perform validation, the
-.Fa field_check
-function must validate the field contents and return
-.Dv TRUE
-if they are acceptable and
-.Dv FALSE
-if they are not.
-The
-.Fa char_check
-validates the character input into the field, this function will be
-called for each character entered, if the character can be entered
-into the field then
-.Fa char_check
-must return
-.Dv TRUE .
-Neither
-.Fa field_check
-nor
-.Fa char_check
-may be
-.Dv NULL .
-The functions for handling the field type arguments can
-be defined by using the
-.Fn set_fieldtype_arg
-function, the
-.Fa make_args
-function is used to create new arguments for the fieldtype, the
-.Fa copy_args
-is used to copy the fieldtype arguments to a new arguments structure
-and
-.Fa free_args
-is used to destroy the fieldtype arguments and release any associated
-storage, none of these function pointers may be
-.Dv NULL .
-The field type choice functions can be set by calling
-.Fn set_fieldtype_choice ,
-the
-.Fa next_choice
-and
-.Fa prev_choice
-specify the next and previous choice functions for the field type.
-These functions must perform the necessary actions to select the next
-or previous choice for the field, updating the field buffer if
-necessary.
-The choice functions must return
-.Dv TRUE
-if the function succeeded and
-.Dv FALSE
-otherwise.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following error
-values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_BAD_ARGUMENT
-The function was passed a bad argument.
-.It Er E_CONNECTED
-The field is connected to a form.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_hook.3 b/lib/libform/form_hook.3
deleted file mode 100644
index 2c7045502..000000000
--- a/lib/libform/form_hook.3
+++ /dev/null
@@ -1,116 +0,0 @@
-.\"	$NetBSD: form_hook.3,v 1.10 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm field_init ,
-.Nm field_term ,
-.Nm form_init ,
-.Nm form_term ,
-.Nm set_field_init ,
-.Nm set_field_term ,
-.Nm set_form_init ,
-.Nm set_form_term
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft void (*)(FORM *)
-.Fn field_init "FORM *form"
-.Ft void (*)(FORM *)
-.Fn field_term "FORM *form"
-.Ft void (*)(FORM *)
-.Fn form_init "FORM *form"
-.Ft void (*)(FORM *)
-.Fn form_term "FORM *form"
-.Ft int
-.Fn set_field_init "FORM *form" "void (*function)(FORM *)"
-.Ft int
-.Fn set_field_term "FORM *form" "void (*function)(FORM *)"
-.Ft int
-.Fn set_form_init "FORM *form" "void (*function)(FORM *)"
-.Ft int
-.Fn set_form_term "FORM *form" "void (*function)(FORM *)"
-.Sh DESCRIPTION
-The
-.Fn field_init
-function returns a pointer to the function that will be called just
-after the current field changes and just before the form is posted,
-this function may be set by using the
-.Fn set_field_init
-function.
-Similarly, the function
-.Fn field_term
-will return a pointer to the function that will be called just before
-the current field changes and just after the form is unposted, this
-function pointer may be set by using the
-.Fn set_field_term
-function.
-The
-.Fn form_init
-function will return a pointer to the function that will be called
-just before the form is posted to the screen, this function can be set
-by calling the
-.Fn set_form_init
-function.
-The
-.Fn form_term
-function will return a pointer to the function that will be called
-just after the form is unposted from the screen, this function may be
-set by using the
-.Fn set_form_term
-function.
-By default, the init and term function pointers are
-.Dv NULL .
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following error
-values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_new.3 b/lib/libform/form_new.3
deleted file mode 100644
index 7d4b84128..000000000
--- a/lib/libform/form_new.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"	$NetBSD: form_new.3,v 1.9 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm free_form ,
-.Nm new_form
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft int
-.Fn free_form "FORM *form"
-.Ft FORM *
-.Fn new_form "FIELD **fields"
-.Sh DESCRIPTION
-The function
-.Fn free_form
-frees all the resources associated with the form and destroys the
-form.
-Calling
-.Fn new_form
-will create a new form, set the form parameters to the current
-defaults and attach the passed fields to the form.
-The array of fields passed to
-.Fn new_form
-must be terminated with a
-.Dv NULL
-pointer to indicate the end of the fields.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following error
-values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_BAD_ARGUMENT
-The function was passed a bad argument.
-.It Er E_POSTED
-The form is posted to the screen.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_new_page.3 b/lib/libform/form_new_page.3
deleted file mode 100644
index 0a1ae42f1..000000000
--- a/lib/libform/form_new_page.3
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"	$NetBSD: form_new_page.3,v 1.11 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm new_page ,
-.Nm set_new_page
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft int
-.Fn new_page "FIELD *field"
-.Ft int
-.Fn set_new_page "FIELD *field" "int page"
-.Sh DESCRIPTION
-The
-.Fn new_page
-function returns
-.Dv TRUE
-if the given field is the start of a new page, otherwise it returns
-.Dv FALSE ,
-the new page status of a field can be set or unset using the
-.Fn set_new_page
-function.
-.Sh RETURN VALUES
-The functions will return one of the following error values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_CONNECTED
-The field is connected to a form.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_opts.3 b/lib/libform/form_opts.3
deleted file mode 100644
index 180d16071..000000000
--- a/lib/libform/form_opts.3
+++ /dev/null
@@ -1,104 +0,0 @@
-.\"	$NetBSD: form_opts.3,v 1.10 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm form_opts ,
-.Nm form_opts_off ,
-.Nm form_opts_on ,
-.Nm set_form_opts
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft Form_Options
-.Fn form_opts "FORM *form"
-.Ft int
-.Fn form_opts_off "FORM *form" "Form_Options options"
-.Ft int
-.Fn form_opts_on "FORM *form" "Form_Options options"
-.Ft int
-.Fn set_form_opts "FORM *form" "Form_Options options"
-.Sh DESCRIPTION
-The function
-.Fn form_opts
-returns the current options that are set on the given form.
-The
-.Fn form_opts_off
-will turn off the form options given in
-.Fa options
-for the form, similarly,
-.Fn form_opts_on
-will turn on the options specified in
-.Fa options
-for the given form.
-The form options can be set to an explicit set by calling
-.Fn set_form_opts .
-.Sh PARAMETERS
-The following form options are valid:
-.Pp
-.Bl -tag -width O_BS_OVERLOAD -compact
-.It O_BS_OVERLOAD
-If this option is set and the cursor is at the first character in the
-field then the backspace character will perform the same function as a
-REQ_PREV_FIELD driver request, moving to the previous field in the
-form.
-.It O_NL_OVERLOAD
-If this option is set and the cursor is at the end of the field then
-the new line character will perform the same function as a
-REQ_NEXT_FIELD driver request, moving to the next field in the form.
-.El
-.Pp
-By default no form options are set.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following error
-values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_page.3 b/lib/libform/form_page.3
deleted file mode 100644
index 39a59e3bc..000000000
--- a/lib/libform/form_page.3
+++ /dev/null
@@ -1,119 +0,0 @@
-.\"	$NetBSD: form_page.3,v 1.10 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORM_PAGE 3
-.Os
-.Sh NAME
-.Nm current_field ,
-.Nm field_index ,
-.Nm form_page ,
-.Nm form_max_page ,
-.Nm set_current_field ,
-.Nm set_form_page
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft FIELD *
-.Fn current_field "FORM *form"
-.Ft int
-.Fn field_index "FIELD *field"
-.Ft int
-.Fn form_page "FORM *form"
-.Ft int
-.Fn form_max_page "FORM *form"
-.Ft int
-.Fn set_current_field "FORM *form" "FIELD *field"
-.Ft int
-.Fn set_form_page "FORM *form" "int page"
-.Sh DESCRIPTION
-The
-.Fn current_field
-returns a pointer to the structure for the field that is currently
-active on the page.
-If there is an error,
-.Fn current_field
-will return
-.Dv NULL .
-Calling
-.Fn field_index
-will return the index of the given field in the form field array.
-The
-current page the form is on can be determined by using
-.Fn form_page ,
-the current page of a form can be programmatically set by calling
-.Fn set_form_page .
-The maximum page number for a form can be found by
-calling the function
-.Fn form_max_page
-but note that this function is a
-.Nx
-extension and must not be used in portable forms library programs.
-The current field on the form may be set by calling
-.Fn set_current_field
-which will set the current field to the one given.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following
-error values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_BAD_ARGUMENT
-The function was passed a bad argument.
-.It Er E_NOT_CONNECTED
-The given field is not associated with a form.
-.It Er E_BAD_STATE
-The function was called from within an init or term function.
-.It Er E_INVALID_FIELD
-The field given is not part of the given form.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
-.Pp
-The
-.Nm form_max_page
-is a
-.Nx
-extension and should not be used in portable applications.
diff --git a/lib/libform/form_post.3 b/lib/libform/form_post.3
deleted file mode 100644
index ed71b5f37..000000000
--- a/lib/libform/form_post.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"	$NetBSD: form_post.3,v 1.10 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm post_form ,
-.Nm unpost_form
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft int
-.Fn post_form "FORM *form"
-.Ft int
-.Fn unpost_form "FORM *form"
-.Sh DESCRIPTION
-The
-.Fn post_form
-function performs the actions necessary to present the form on the
-curses screen.
-If there are any init functions that need to be called
-then they will be called prior to the form being posted and the cursor
-will be positioned on the first active field that can be visited.
-Conversely, the function
-.Fn unpost_form
-removes the form from the screen and calls any termination functions
-that were specified.
-.Sh RETURN VALUES
-The functions will return one of the following error values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_BAD_ARGUMENT
-A bad argument was passed to the function.
-.It Er E_POSTED
-The form is already posted to the screen.
-.It Er E_NOT_POSTED
-The form was not posted to the screen.
-.It Er E_NOT_CONNECTED
-There are no fields associated with the form.
-.It Er E_BAD_STATE
-The function was called from within a init or term function.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_userptr.3 b/lib/libform/form_userptr.3
deleted file mode 100644
index 0fc421209..000000000
--- a/lib/libform/form_userptr.3
+++ /dev/null
@@ -1,74 +0,0 @@
-.\"	$NetBSD: form_userptr.3,v 1.9 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm form_userptr ,
-.Nm set_form_userptr
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft void *
-.Fn form_userptr "FORM *form"
-.Ft int
-.Fn set_form_userptr "FORM *form" "void *ptr"
-.Sh DESCRIPTION
-The
-.Fn form_userptr
-function returns the pointer to the user defined data associated with
-the form, this pointer may be set using the
-.Fn set_form_userptr
-call.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following error
-values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/form_win.3 b/lib/libform/form_win.3
deleted file mode 100644
index 0d065f209..000000000
--- a/lib/libform/form_win.3
+++ /dev/null
@@ -1,109 +0,0 @@
-.\"	$NetBSD: form_win.3,v 1.10 2010/03/22 21:58:31 joerg Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd January 1, 2001
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm form_sub ,
-.Nm form_win ,
-.Nm scale_form ,
-.Nm set_form_sub ,
-.Nm set_form_win
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Ft WINDOW *
-.Fn form_sub "FORM *form"
-.Ft WINDOW *
-.Fn form_win "FORM *form"
-.Ft int
-.Fn scale_form "FORM *form" "int *rows" "int *cols"
-.Ft int
-.Fn set_form_sub "FORM *form" "WINDOW *window"
-.Ft int
-.Fn set_form_win "FORM *form" "WINDOW *window"
-.Sh DESCRIPTION
-All output to the screen done by the forms library is handled by the
-curses library routines.
-By default, the forms library will output to the curses
-.Fa stdscr ,
-but if the forms window has been set via
-.Fn set_form_win
-then output will be sent to the window specified by
-.Fn set_form_win ,
-unless the forms subwindow has been set using
-.Fn set_form_sub .
-If a subwindow has been specified using
-.Fn set_form_sub
-then it will be used by the forms library to for screen output.
-The current setting for the form window can be retrieved by calling
-.Fn form_win .
-If the forms window has not been set then
-.Dv NULL
-will be returned.
-Similarly, the forms subwindow can be found by calling the
-.Fn form_sub
-function, again, if the subwindow has not been set then
-.Dv NULL
-will be
-returned.
-The
-.Fn scale_form
-function will return the minimum number of rows and columns that will
-entirely contain the given form.
-.Sh RETURN VALUES
-Functions returning pointers will return
-.Dv NULL
-if an error is detected.
-The functions that return an int will return one of the following error
-values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_NOT_CONNECTED
-The form has no fields connected to it.
-.It Er E_POSTED
-The form is posted to the screen.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr forms 3
-.Sh NOTES
-The header
-.In form.h
-automatically includes both
-.In curses.h
-and
-.In eti.h .
diff --git a/lib/libform/forms.3 b/lib/libform/forms.3
deleted file mode 100644
index 6be7ae3a7..000000000
--- a/lib/libform/forms.3
+++ /dev/null
@@ -1,235 +0,0 @@
-.\"	$NetBSD: forms.3,v 1.16 2004/11/24 12:09:13 wiz Exp $
-.\"
-.\" Copyright (c) 2001
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd November 24, 2004
-.Dt FORMS 3
-.Os
-.Sh NAME
-.Nm form
-.Nd form library
-.Sh LIBRARY
-.Lb libform
-.Sh SYNOPSIS
-.In form.h
-.Sh DESCRIPTION
-The
-.Nm
-library provides a terminal independent form system using the
-.Xr curses 3
-library.
-Before using the
-.Nm
-functions the terminal must be set up by
-.Xr curses 3
-using the
-.Fn initscr
-function or similar.
-Programs using
-.Nm
-functions must be linked with the
-.Xr curses 3
-library
-.Fl lcurses .
-.Pp
-The
-.Nm
-library provides facilities for defining form fields, placing a form on the
-terminal screen, assign pre and post change operations and setting the
-attributes of both the form and its fields.
-.Ss Defining default attributes for forms and fields
-The
-.Nm
-library allows any settable attribute or option of both the form and field
-objects to be defined such that any new form or field automatically inherits
-the value as default.
-Setting the default value will not affect any field or
-form that has already been created but will be applied to subsequent objects.
-To set the default attribute or option the set routine is passed a
-.Dv NULL
-pointer in the field or form parameter when calling the set routine.
-The current default value can be retrieved by calling the get routine with a
-.Dv NULL
-pointer for the field or form parameter.
-.Pp
-.Bl -column set_fieldtype_choiceXX
-.It Sy "Form Routine Name" Ta Sy "Manual Page Name"
-.It current_field Ta Xr form_page 3
-.It data_ahead Ta Xr form_data 3
-.It data_behind Ta Xr form_data 3
-.It dup_field Ta Xr form_field_new 3
-.It dynamic_field_info Ta Xr form_field_info 3
-.It field_arg Ta Xr form_field_validation 3
-.It field_back Ta Xr form_field_attributes 3
-.It field_buffer Ta Xr form_field_buffer 3
-.It field_count Ta Xr form_field 3
-.It field_fore Ta Xr form_field_attributes 3
-.It field_index Ta Xr form_page 3
-.It field_info Ta Xr form_field_info 3
-.It field_init Ta Xr form_hook 3
-.It field_just Ta Xr form_field_just 3
-.It field_opts Ta Xr form_field_opts 3
-.It field_opts_off Ta Xr form_field_opts 3
-.It field_opts_on Ta Xr form_field_opts 3
-.It field_pad Ta Xr form_field_attributes 3
-.It field_status Ta Xr form_field_buffer 3
-.It field_term Ta Xr form_hook 3
-.It field_type Ta Xr form_field_validation 3
-.It field_userptr Ta Xr form_field_userptr 3
-.It form_driver Ta Xr form_driver 3
-.It form_fields Ta Xr form_field 3
-.It form_init Ta Xr form_hook 3
-.It form_max_page Ta Xr form_page 3
-.It form_opts Ta Xr form_opts 3
-.It form_opts_off Ta Xr form_opts 3
-.It form_opts_on Ta Xr form_opts 3
-.It form_page Ta Xr form_page 3
-.It form_sub Ta Xr form_win 3
-.It form_term Ta Xr form_hook 3
-.It form_userptr Ta Xr form_userptr 3
-.It form_win Ta Xr form_win 3
-.It free_field Ta Xr form_field_new 3
-.It free_fieldtype Ta Xr form_fieldtype 3
-.It free_form Ta Xr form_new 3
-.It link_field Ta Xr form_field_new 3
-.It link_fieldtype Ta Xr form_fieldtype 3
-.It move_field Ta Xr form_field 3
-.It new_field Ta Xr form_field_new 3
-.It new_fieldtype Ta Xr form_fieldtype 3
-.It new_form Ta Xr form_new 3
-.It new_page Ta Xr form_new_page 3
-.It pos_form_cursor Ta Xr form_cursor 3
-.It post_form Ta Xr form_post 3
-.It scale_form Ta Xr form_win 3
-.It set_current_field Ta Xr form_page 3
-.It set_field_back Ta Xr form_field_attributes 3
-.It set_field_buffer Ta Xr form_field_buffer 3
-.It set_field_fore Ta Xr form_field_attributes 3
-.It set_field_init Ta Xr form_hook 3
-.It set_field_just Ta Xr form_field_just 3
-.It set_field_opts Ta Xr form_field_opts 3
-.It set_field_pad Ta Xr form_field_attributes 3
-.It set_field_printf Ta Xr form_field_buffer 3
-.It set_field_status Ta Xr form_field_buffer 3
-.It set_field_term Ta Xr form_hook 3
-.It set_field_type Ta Xr form_field_validation 3
-.It set_field_userptr Ta Xr form_field_userptr 3
-.It set_fieldtype_arg Ta Xr form_fieldtype 3
-.It set_fieldtype_choice Ta Xr form_fieldtype 3
-.It set_form_fields Ta Xr form_field 3
-.It set_form_init Ta Xr form_hook 3
-.It set_form_opts Ta Xr form_opts 3
-.It set_form_page Ta Xr form_page 3
-.It set_form_sub Ta Xr form_win 3
-.It set_form_term Ta Xr form_hook 3
-.It set_form_userptr Ta Xr form_userptr 3
-.It set_form_win Ta Xr form_win 3
-.It set_max_field Ta Xr form_field_buffer 3
-.It set_new_page Ta Xr form_new_page 3
-.It unpost_form Ta Xr form_post 3
-.El
-.Sh RETURN VALUES
-Any function returning a string pointer will return
-.Dv NULL
-if an error occurs.
-Functions returning an integer will return one of the following:
-.Bl -column set_fieldtype_choiceXX
-.It Dv E_OK Ta No The function was successful.
-.It Dv E_SYSTEM_ERROR Ta No There was a system error during the call.
-.It Dv E_BAD_ARGUMENT Ta No One or more of the arguments passed to \
-the function was incorrect.
-.It Dv E_POSTED Ta No The form is already posted.
-.It Dv E_CONNECTED Ta No A field was already connected to a form.
-.It Dv E_BAD_STATE Ta No The function was called from within an \
-initialization or termination routine.
-.It Dv E_NO_ROOM Ta No The form does not fit within the subwindow.
-.It Dv E_NOT_POSTED Ta No The form is not posted.
-.It Dv E_UNKNOWN_COMMAND Ta No The form driver does not recognize the \
-request passed to it.
-.It Dv E_NOT_SELECTABLE Ta No The field could not be selected.
-.It Dv E_NOT_CONNECTED Ta No The field is not connected to a form.
-.It Dv E_REQUEST_DENIED Ta No The form driver could not process the request.
-.It Dv E_INVALID_FIELD Ta No The field is invalid.
-.It Dv E_CURRENT Ta No The field is the active one on the form.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-This implementation of the forms library does depart in behavior
-subtly from the original AT\*[Am]T implementation.
-Some of the more notable departures are:
-.Pp
-.Bl -tag -width "The TAB character" -compact
-.It field wrapping
-For multi-line fields the data will be wrapped as it is entered, this
-does not happen in the AT\*[Am]T implementation.
-.It buffer 0
-In this implementation, the contents of buffer 0 are always current
-regardless of whether the field has been validated or not.
-.It circular fields
-In the AT\*[Am]T implementation fields are circular on a page, that is, a
-next field from the last field will go to the first field on the
-current page.
-In this implementation a next field request on the last
-field of a page will result in the forms library positioning the
-cursor on the first field of the next page.
-If the field is the last
-field in the form then going to the next field will be denied, in the
-AT\*[Am]T it would result in the cursor being placed on the first field of
-the first page.
-.It buffer returns
-In this implementation only the data entered by the user in the form
-field will be returned, unlike the AT\*[Am]T library which would return the
-contents of the field padded to the size of the field with the pad
-character.
-.It The TAB character
-The handling of the TAB character in fields varies between
-implementations.
-In ncurses attempting to set a field contents with a
-string containing a TAB will result in an error and will not allow a
-TAB to be entered into a field.
-The AT\*[Am]T library statically
-converts tabs to the equivalent number of spaces when the field buffer
-is set but the form driver will not allow a TAB to be inserted into
-the field buffer.
-This implementation allows TAB when setting the
-field buffer and also will allow TAB to be inserted into a field
-buffer via the form driver and correctly calculates the cursor
-position allowing for expansion of the TAB character.
-.It set_field_printf
-This function is a
-.Nx
-extension and must not be used in portable code.
-.It Dv O_REFORMAT
-This field option is a
-.Nx
-extension and must not be used in portable code.
-.El
diff --git a/lib/libform/gdbinit b/lib/libform/gdbinit
deleted file mode 100644
index 6a8d4231d..000000000
--- a/lib/libform/gdbinit
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Print out the line structs
-#
-define lstructs
-	set $lstruct=(_FORMI_FIELD_LINES *)$arg0
-	while ($lstruct)
-		print *($lstruct)
-		if ($lstruct->prev != 0x0)
-			if ($lstruct->prev->next != $lstruct)
-				print "WARNING: backward pointers inconsistent"
-			end
-		end
-		if ($lstruct->next != 0x0)
-			if ($lstruct->next->prev != $lstruct)
-				print "WARNING: forward pointers inconsistent"
-			end
-		end
-		set $lstruct = $lstruct->next
-	end
-end
diff --git a/lib/libform/internals.c b/lib/libform/internals.c
deleted file mode 100644
index 0b7b49bdd..000000000
--- a/lib/libform/internals.c
+++ /dev/null
@@ -1,3651 +0,0 @@
-/*	$NetBSD: internals.c,v 1.37 2013/11/26 01:17:00 christos Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: internals.c,v 1.37 2013/11/26 01:17:00 christos Exp $");
-
-#include <limits.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <strings.h>
-#include <assert.h>
-#include "internals.h"
-#include "form.h"
-
-#ifdef DEBUG
-/*
- *  file handle to write debug info to, this will be initialised when
- *  the form is first posted.
- */
-FILE *dbg = NULL;
-
-/*
- * map the request numbers to strings for debug
- */
-char *reqs[] = {
-	"NEXT_PAGE", "PREV_PAGE", "FIRST_PAGE",	"LAST_PAGE", "NEXT_FIELD",
-	"PREV_FIELD", "FIRST_FIELD", "LAST_FIELD", "SNEXT_FIELD",
-	"SPREV_FIELD", "SFIRST_FIELD", "SLAST_FIELD", "LEFT_FIELD",
-	"RIGHT_FIELD", "UP_FIELD", "DOWN_FIELD", "NEXT_CHAR", "PREV_CHAR",
-	"NEXT_LINE", "PREV_LINE", "NEXT_WORD", "PREV_WORD", "BEG_FIELD",
-	"END_FIELD", "BEG_LINE", "END_LINE", "LEFT_CHAR", "RIGHT_CHAR",
-	"UP_CHAR", "DOWN_CHAR", "NEW_LINE", "INS_CHAR", "INS_LINE",
-	"DEL_CHAR", "DEL_PREV", "DEL_LINE", "DEL_WORD", "CLR_EOL",
-	"CLR_EOF", "CLR_FIELD", "OVL_MODE", "INS_MODE", "SCR_FLINE",
-	"SCR_BLINE", "SCR_FPAGE", "SCR_BPAGE", "SCR_FHPAGE", "SCR_BHPAGE",
-	"SCR_FCHAR", "SCR_BCHAR", "SCR_HFLINE", "SCR_HBLINE", "SCR_HFHALF",
-	"SCR_HBHALF", "VALIDATION", "PREV_CHOICE", "NEXT_CHOICE" };
-#endif
-
-/* define our own min function - this is not generic but will do here
- * (don't believe me?  think about what value you would get
- * from min(x++, y++)
- */
-#define min(a,b) (((a) > (b))? (b) : (a))
-
-/* for the line joining function... */
-#define JOIN_NEXT    1
-#define JOIN_NEXT_NW 2 /* next join, don't wrap the joined line */
-#define JOIN_PREV    3
-#define JOIN_PREV_NW 4 /* previous join, don't wrap the joined line */
-
-/* for the bump_lines function... */
-#define _FORMI_USE_CURRENT -1 /* indicates current cursor pos to be used */
-
-/* used in add_char for initial memory allocation for string in row */
-#define INITIAL_LINE_ALLOC 16
-
-unsigned
-field_skip_blanks(unsigned int start, _FORMI_FIELD_LINES **rowp);
-static void
-_formi_do_char_validation(FIELD *field, FIELDTYPE *type, char c, int *ret_val);
-static void
-_formi_do_validation(FIELD *field, FIELDTYPE *type, int *ret_val);
-static int
-_formi_join_line(FIELD *field, _FORMI_FIELD_LINES **rowp, int direction);
-void
-_formi_hscroll_back(FIELD *field, _FORMI_FIELD_LINES *row, unsigned int amt);
-void
-_formi_hscroll_fwd(FIELD *field, _FORMI_FIELD_LINES *row, unsigned int amt);
-static void
-_formi_scroll_back(FIELD *field, unsigned int amt);
-static void
-_formi_scroll_fwd(FIELD *field, unsigned int amt);
-static int
-_formi_set_cursor_xpos(FIELD *field, int no_scroll);
-static int
-find_sow(unsigned int offset, _FORMI_FIELD_LINES **rowp);
-static int
-split_line(FIELD *field, bool hard_split, unsigned pos,
-	   _FORMI_FIELD_LINES **rowp);
-static bool
-check_field_size(FIELD *field);
-static int
-add_tab(FORM *form, _FORMI_FIELD_LINES *row, unsigned int i, char c);
-static int
-tab_size(_FORMI_FIELD_LINES *row, unsigned int i);
-static unsigned int
-tab_fit_len(_FORMI_FIELD_LINES *row, unsigned int len);
-static int
-tab_fit_window(FIELD *field, unsigned int pos, unsigned int window);
-static void
-add_to_free(FIELD *field, _FORMI_FIELD_LINES *line);
-static void
-adjust_ypos(FIELD *field, _FORMI_FIELD_LINES *line);
-static _FORMI_FIELD_LINES *
-copy_row(_FORMI_FIELD_LINES *row);
-static void
-destroy_row_list(_FORMI_FIELD_LINES *start);
-
-/*
- * Calculate the cursor y position to make the given row appear on the
- * field.  This may be as simple as just changing the ypos (if at all) but
- * may encompass resetting the start_line of the field to place the line
- * at the bottom of the field.  The field is assumed to be a multi-line one.
- */
-static void
-adjust_ypos(FIELD *field, _FORMI_FIELD_LINES *line)
-{
-	unsigned ypos;
-	_FORMI_FIELD_LINES *rs;
-	
-	ypos = 0;
-	rs = field->alines;
-	while (rs != line) {
-		rs = rs->next;
-		ypos++;
-	}
-
-	field->cursor_ypos = ypos;
-	field->start_line = field->alines;
-	if (ypos > (field->rows - 1)) {
-		  /*
-		   * cur_line off the end of the field,
-		   * adjust start_line so fix this.
-		   */
-		field->cursor_ypos = field->rows - 1;
-		ypos = ypos - (field->rows - 1);
-		while (ypos > 0) {
-			ypos--;
-			field->start_line = field->start_line->next;
-		}
-	}
-}
-
-			
-/*
- * Delete the given row and add it to the free list of the given field.
- */
-static void
-add_to_free(FIELD *field, _FORMI_FIELD_LINES *line)
-{
-	_FORMI_FIELD_LINES *saved;
-
-	saved = line;
-
-	  /* don't remove if only one line... */
-	if ((line->prev == NULL) && (line->next == NULL))
-		return;
-
-	if (line->prev == NULL) {
-		/* handle top of list */
-		field->alines = line->next;
-		field->alines->prev = NULL;
-
-		if (field->cur_line == saved)
-			field->cur_line = field->alines;
-		if (field->start_line == saved)
-			field->start_line = saved;
-	} else if (line->next == NULL) {
-		/* handle bottom of list */
-		line->prev->next = NULL;
-		if (field->cur_line == saved)
-			field->cur_line = saved->prev;
-		if (field->start_line == saved)
-			field->cur_line = saved->prev;
-	} else {
-		saved->next->prev = saved->prev;
-		saved->prev->next = saved->next;
-		if (field->cur_line == saved)
-			field->cur_line = saved->prev;
-		if (field->start_line == saved)
-			field->start_line = saved;
-	}
-
-	saved->next = field->free;
-	field->free = saved;
-	saved->prev = NULL;
-	if (saved->next != NULL)
-		saved->next->prev = line;
-}
-
-/*
- * Duplicate the given row, return the pointer to the new copy or
- * NULL if the copy fails.
- */
-static _FORMI_FIELD_LINES *
-copy_row(_FORMI_FIELD_LINES *row)
-{
-	_FORMI_FIELD_LINES *new;
-	_formi_tab_t *tp, *newt;
-
-	if ((new = (_FORMI_FIELD_LINES *) malloc(sizeof(_FORMI_FIELD_LINES)))
-	    == NULL) {
-		return NULL;
-	}
-
-	memcpy(new, row, sizeof(_FORMI_FIELD_LINES));
-	
-	  /* nuke the pointers from the source row so we don't get confused */
-	new->next = NULL;
-	new->prev = NULL;
-	new->tabs = NULL;
-
-	if ((new->string = (char *) malloc((size_t)new->allocated)) == NULL) {
-		free(new);
-		return NULL;
-	}
-
-	memcpy(new->string, row->string, (size_t) row->length + 1);
-
-	if (row->tabs != NULL) {
-		tp = row->tabs;
-		if ((new->tabs = (_formi_tab_t *) malloc(sizeof(_formi_tab_t)))
-		    == NULL) {
-			free(new->string);
-			free(new);
-			return NULL;
-		}
-
-		memcpy(new->tabs, row->tabs, sizeof(_formi_tab_t));
-		new->tabs->back = NULL;
-		new->tabs->fwd = NULL;
-		
-		tp = tp->fwd;
-		newt = new->tabs;
-
-		while (tp != NULL) {
-			if ((newt->fwd =
-			     (_formi_tab_t *) malloc(sizeof(_formi_tab_t)))
-			    == NULL) {
-				/* error... unwind allocations */
-				tp = new->tabs;
-				while (tp != NULL) {
-					newt = tp->fwd;
-					free(tp);
-					tp = newt;
-				}
-
-				free(new->string);
-				free(new);
-				return NULL;
-			}
-
-			memcpy(newt->fwd, tp, sizeof(_formi_tab_t));
-			newt->fwd->back = newt;
-			newt = newt->fwd;
-			newt->fwd = NULL;
-			tp = tp->fwd;
-		}
-	}
-		
-	return new;
-}
-	
-/*
- * Initialise the row offset for a field, depending on the type of
- * field it is and the type of justification used.  The justification
- * is only used on static single line fields, everything else will
- * have the cursor_xpos set to 0.
- */
-void
-_formi_init_field_xpos(FIELD *field)
-{
-	  /* not static or is multi-line which are not justified, so 0 it is */
-	if (((field->opts & O_STATIC) != O_STATIC) ||
-	    ((field->rows + field->nrows) != 1)) {
-		field->cursor_xpos = 0;
-		return;
-	}
-
-	switch (field->justification) {
-	case JUSTIFY_RIGHT:
-		field->cursor_xpos = field->cols - 1;
-		break;
-
-	case JUSTIFY_CENTER:
-		field->cursor_xpos = (field->cols - 1) / 2;
-		break;
-
-	default: /* assume left justify */
-		field->cursor_xpos = 0;
-		break;
-	}
-}
-
-
-/*
- * Open the debug file if it is not already open....
- */
-#ifdef DEBUG
-int
-_formi_create_dbg_file(void)
-{
-	if (dbg == NULL) {
-		dbg = fopen("___form_dbg.out", "w");
-		if (dbg == NULL) {
-			fprintf(stderr, "Cannot open debug file!\n");
-			return E_SYSTEM_ERROR;
-		}
-	}
-
-	return E_OK;
-}
-#endif
-
-/*
- * Check the sizing of the field, if the maximum size is set for a
- * dynamic field then check that the number of rows or columns does
- * not exceed the set maximum.  The decision to check the rows or
- * columns is made on the basis of how many rows are in the field -
- * one row means the max applies to the number of columns otherwise it
- * applies to the number of rows.  If the row/column count is less
- * than the maximum then return TRUE.
- *
- */
-static bool
-check_field_size(FIELD *field)
-{
-	if ((field->opts & O_STATIC) != O_STATIC) {
-		  /* dynamic field */
-		if (field->max == 0) /* unlimited */
-			return TRUE;
-
-		if (field->rows == 1) {
-			return (field->alines->length < field->max);
-		} else {
-			return (field->row_count <= field->max);
-		}
-	} else {
-		if ((field->rows + field->nrows) == 1) {
-			return (field->alines->length <= field->cols);
-		} else {
-			return (field->row_count <= (field->rows
-						     + field->nrows));
-		}
-	}
-}
-
-/*
- * Set the form's current field to the first valid field on the page.
- * Assume the fields have been sorted and stitched.
- */
-int
-_formi_pos_first_field(FORM *form)
-{
-	FIELD *cur;
-	int old_page;
-
-	old_page = form->page;
-
-	  /* scan forward for an active page....*/
-	while (form->page_starts[form->page].in_use == 0) {
-		form->page++;
-		if (form->page > form->max_page) {
-			form->page = old_page;
-			return E_REQUEST_DENIED;
-		}
-	}
-
-	  /* then scan for a field we can use */
-	cur = form->fields[form->page_starts[form->page].first];
-	while ((cur->opts & (O_VISIBLE | O_ACTIVE))
-	       != (O_VISIBLE | O_ACTIVE)) {
-		cur = TAILQ_NEXT(cur, glue);
-		if (cur == NULL) {
-			form->page = old_page;
-			return E_REQUEST_DENIED;
-		}
-	}
-
-	form->cur_field = cur->index;
-	return E_OK;
-}
-
-/*
- * Set the field to the next active and visible field, the fields are
- * traversed in index order in the direction given.  If the parameter
- * use_sorted is TRUE then the sorted field list will be traversed instead
- * of using the field index.
- */
-int
-_formi_pos_new_field(FORM *form, unsigned direction, unsigned use_sorted)
-{
-	FIELD *cur;
-	int i;
-
-	i = form->cur_field;
-	cur = form->fields[i];
-
-	do {
-		if (direction == _FORMI_FORWARD) {
-			if (use_sorted == TRUE) {
-				if ((form->wrap == FALSE) &&
-				    (cur == TAILQ_LAST(&form->sorted_fields,
-					_formi_sort_head)))
-					return E_REQUEST_DENIED;
-				cur = TAILQ_NEXT(cur, glue);
-				i = cur->index;
-			} else {
-				if ((form->wrap == FALSE) &&
-				    ((i + 1) >= form->field_count))
-					return E_REQUEST_DENIED;
-				i++;
-				if (i >= form->field_count)
-					i = 0;
-			}
-		} else {
-			if (use_sorted == TRUE) {
-				if ((form->wrap == FALSE) &&
-				    (cur == TAILQ_FIRST(&form->sorted_fields)))
-					return E_REQUEST_DENIED;
-				cur = TAILQ_PREV(cur, _formi_sort_head, glue);
-				i = cur->index;
-			} else {
-				if ((form->wrap == FALSE) && (i <= 0))
-					return E_REQUEST_DENIED;
-				i--;
-				if (i < 0)
-					i = form->field_count - 1;
-			}
-		}
-
-		if ((form->fields[i]->opts & (O_VISIBLE | O_ACTIVE))
-			== (O_VISIBLE | O_ACTIVE)) {
-			form->cur_field = i;
-			return E_OK;
-		}
-	}
-	while (i != form->cur_field);
-
-	return E_REQUEST_DENIED;
-}
-
-/*
- * Destroy the list of line structs passed by freeing all allocated
- * memory.
- */
-static void
-destroy_row_list(_FORMI_FIELD_LINES *start)
-{
-	_FORMI_FIELD_LINES *temp, *row;
-	_formi_tab_t *tt, *tp;
-
-	row = start;
-	while (row != NULL) {
-		if (row->tabs != NULL) {
-			  /* free up the tab linked list... */
-			tp = row->tabs;
-			while (tp != NULL) {
-				tt = tp->fwd;
-				free(tp);
-				tp = tt;
-			}
-		}
-
-		if (row->string != NULL)
-			free(row->string);
-
-		temp = row->next;
-		free(row);
-		row = temp;
-	}
-}
-
-/*
- * Word wrap the contents of the field's buffer 0 if this is allowed.
- * If the wrap is successful, that is, the row count nor the buffer
- * size is exceeded then the function will return E_OK, otherwise it
- * will return E_REQUEST_DENIED.
- */
-int
-_formi_wrap_field(FIELD *field, _FORMI_FIELD_LINES *loc)
-{
-	int width, wrap_err;
-	unsigned int pos, saved_xpos, saved_ypos, saved_cur_xpos;
-	unsigned int saved_row_count;
-	_FORMI_FIELD_LINES *saved_row, *row, *row_backup, *saved_cur_line;
-	_FORMI_FIELD_LINES *saved_start_line, *temp;
-
-	if ((field->opts & O_STATIC) == O_STATIC) {
-		if ((field->rows + field->nrows) == 1) {
-			return E_OK; /* cannot wrap a single line */
-		}
-		width = field->cols;
-	} else {
-		  /* if we are limited to one line then don't try to wrap */
-		if ((field->drows + field->nrows) == 1) {
-			return E_OK;
-		}
-
-		  /*
-		   * hueristic - if a dynamic field has more than one line
-		   * on the screen then the field grows rows, otherwise
-		   * it grows columns, effectively a single line field.
-		   * This is documented AT&T behaviour.
-		   */
-		if (field->rows > 1) {
-			width = field->cols;
-		} else {
-			return E_OK;
-		}
-	}
-
-	row = loc;
-
-	  /* if we are not at the top of the field then back up one
-	   * row because we may be able to merge the current row into
-	   * the one above.
-	   */
-	if (row->prev != NULL)
-		row = row->prev;
-
-	saved_row = row;
-	saved_xpos = field->row_xpos;
-	saved_cur_xpos = field->cursor_xpos;
-	saved_ypos = field->cursor_ypos;
-	saved_row_count = field->row_count;
-	
-	  /*
-	   * Save a copy of the lines affected, just in case things
-	   * don't work out.
-	   */
-	if ((row_backup = copy_row(row)) == NULL)
-		return E_SYSTEM_ERROR;
-
-	temp = row_backup;
-	row = row->next;
-
-	saved_cur_line = temp;
-	saved_start_line = temp;
-	
-	while (row != NULL) {
-		if ((temp->next = copy_row(row)) == NULL) {
-			  /* a row copy failed... free up allocations */
-			destroy_row_list(row_backup);
-			return E_SYSTEM_ERROR;
-		}
-
-		temp->next->prev = temp;
-		temp = temp->next;
-		
-		if (row == field->start_line)
-			saved_start_line = temp;
-		if (row == field->cur_line)
-			saved_cur_line = temp;
-
-		row = row->next;
-	}
-
-	row = saved_row;
-	while (row != NULL) {
-		pos = row->length - 1;
-		if (row->expanded < width) {
-			  /* line may be too short, try joining some lines */
-			if ((row->hard_ret == TRUE) && (row->next != NULL)) {
-				/*
-				 * Skip the line if it has a hard return
-				 * and it is not the last, we cannot join
-				 * anything to it.
-				 */
-				row = row->next;
-				continue;
-			}
-			
-			if (row->next == NULL) {
-				/*
-				 * If there are no more lines and this line
-				 * is too short then our job is over.
-				 */
-				break;
-			}
-
-			if (_formi_join_line(field, &row,
-					     JOIN_NEXT_NW) == E_OK) {
-				continue;
-			} else
-				break;
-		} else if (row->expanded > width) {
-			  /* line is too long, split it */
-
-			  /*
-			   * split on first whitespace before current word
-			   * if the line has tabs we need to work out where
-			   * the field border lies when the tabs are expanded.
-			   */
-			if (row->tabs == NULL) {
-				pos = width - 1;
-				if (pos >= row->expanded)
-					pos = row->expanded - 1;
-			} else {
-				pos = tab_fit_len(row, field->cols);
-			}
-
-			if ((!isblank((unsigned char)row->string[pos])) &&
-			    ((field->opts & O_WRAP) == O_WRAP)) {
-				if (!isblank((unsigned char)row->string[pos - 1]))
-					pos = find_sow((unsigned int) pos,
-						       &row);
-				/*
-				 * If we cannot split the line then return
-				 * NO_ROOM so the driver can tell that it
-				 * should not autoskip (if that is enabled)
-				 */
-				if ((pos == 0)
-				    || (!isblank((unsigned char)row->string[pos - 1]))) {
-					wrap_err = E_NO_ROOM;
-					goto restore_and_exit;
-				}
-			}
-
-			  /* if we are at the end of the string and it has
-			   * a trailing blank, don't wrap the blank.
-			   */
-			if ((row->next == NULL) && (pos == row->length - 1) &&
-			    (isblank((unsigned char)row->string[pos])) &&
-			    row->expanded <= field->cols)
-				continue;
-
-			  /*
-			   * otherwise, if we are still sitting on a
-			   * blank but not at the end of the line
-			   * move forward one char so the blank
-			   * is on the line boundary.
-			   */
-			if ((isblank((unsigned char)row->string[pos])) &&
-			    (pos != row->length - 1))
-				pos++;
-
-			if (split_line(field, FALSE, pos, &row) != E_OK) {
-				wrap_err = E_REQUEST_DENIED;
-				goto restore_and_exit;
-			}
-		} else
-			  /* line is exactly the right length, do next one */
-			row = row->next;
-	}
-
-	  /* Check if we have not run out of room */
-	if ((((field->opts & O_STATIC) == O_STATIC) &&
-	     field->row_count > (field->rows + field->nrows)) ||
-	    ((field->max != 0) && (field->row_count > field->max))) {
-
-		wrap_err = E_REQUEST_DENIED;
-
-	  restore_and_exit:
-		if (saved_row->prev == NULL) {
-			field->alines = row_backup;
-		} else {
-			saved_row->prev->next = row_backup;
-			row_backup->prev = saved_row->prev;
-		}
-
-		field->row_xpos = saved_xpos;
-		field->cursor_xpos = saved_cur_xpos;
-		field->cursor_ypos = saved_ypos;
-		field->row_count = saved_row_count;
-		field->start_line = saved_start_line;
-		field->cur_line = saved_cur_line;
-
-		destroy_row_list(saved_row);
-		return wrap_err;
-	}
-
-	destroy_row_list(row_backup);
-	return E_OK;
-}
-
-/*
- * Join the two lines that surround the location pos, the type
- * variable indicates the direction of the join, JOIN_NEXT will join
- * the next line to the current line, JOIN_PREV will join the current
- * line to the previous line, the new lines will be wrapped unless the
- * _NW versions of the directions are used.  Returns E_OK if the join
- * was successful or E_REQUEST_DENIED if the join cannot happen.
- */
-static int
-_formi_join_line(FIELD *field, _FORMI_FIELD_LINES **rowp, int direction)
-{
-	int old_len, count;
-	struct _formi_field_lines *saved;
-	char *newp;
-	_FORMI_FIELD_LINES *row = *rowp;
-#ifdef DEBUG
-	int dbg_ok = FALSE;
-
-	if (_formi_create_dbg_file() == E_OK) {
-		dbg_ok = TRUE;
-	}
-
-	if (dbg_ok == TRUE) {
-		fprintf(dbg, "join_line: working on row %p, row_count = %d\n",
-			row, field->row_count);
-	}
-#endif
-
-	if ((direction == JOIN_NEXT) || (direction == JOIN_NEXT_NW)) {
-		  /*
-		   * See if there is another line following, or if the
-		   * line contains a hard return then we don't join
-		   * any lines to it.
-		   */
-		if ((row->next == NULL) || (row->hard_ret == TRUE)) {
-			return E_REQUEST_DENIED;
-		}
-
-#ifdef DEBUG
-		if (dbg_ok == TRUE) {
-			fprintf(dbg,
-			"join_line: join_next before length = %d, expanded = %d",
-				row->length, row->expanded);
-			fprintf(dbg,
-				" :: next row length = %d, expanded = %d\n",
-				row->length, row->expanded);
-		}
-#endif
-
-		if (row->allocated < (row->length + row->next->length + 1)) {
-			if ((newp = realloc(row->string, (size_t)(row->length +
-							  row->next->length
-							  + 1))) == NULL)
-				return E_REQUEST_DENIED;
-			row->string = newp;
-			row->allocated = row->length + row->next->length + 1;
-		}
-
-		strcat(row->string, row->next->string);
-		old_len = row->length;
-		row->length += row->next->length;
-		if (row->length > 0)
-			row->expanded =
-				_formi_tab_expanded_length(row->string, 0,
-							   row->length - 1);
-		else
-			row->expanded = 0;
-		
-		_formi_calculate_tabs(row);
-		row->hard_ret = row->next->hard_ret;
-
-		  /* adjust current line if it is on the row being eaten */
-		if (field->cur_line == row->next) {
-			field->cur_line = row;
-			field->row_xpos += old_len;
-			field->cursor_xpos =
-				_formi_tab_expanded_length(row->string, 0,
-							   field->row_xpos);
-			if (field->cursor_xpos > 0)
-				field->cursor_xpos--;
-			
-			if (field->cursor_ypos > 0)
-				field->cursor_ypos--;
-			else {
-				if (field->start_line->prev != NULL)
-					field->start_line =
-						field->start_line->prev;
-			}
-		}
-
-		  /* remove joined line record from the row list */
-		add_to_free(field, row->next);
-
-#ifdef DEBUG
-		if (dbg_ok == TRUE) {
-			fprintf(dbg,
-				"join_line: exit length = %d, expanded = %d\n",
-				row->length, row->expanded);
-		}
-#endif
-	} else {
-		if (row->prev == NULL) {
-			return E_REQUEST_DENIED;
-		}
-
-		saved = row->prev;
-
-		  /*
-		   * Don't try to join if the line above has a hard
-		   * return on it.
-		   */
-		if (saved->hard_ret == TRUE) {
-			return E_REQUEST_DENIED;
-		}
-
-#ifdef DEBUG
-		if (dbg_ok == TRUE) {
-			fprintf(dbg,
-			"join_line: join_prev before length = %d, expanded = %d",
-				row->length, row->expanded);
-			fprintf(dbg,
-				" :: prev row length = %d, expanded = %d\n",
-				saved->length, saved->expanded);
-		}
-#endif
-
-		if (saved->allocated < (row->length + saved->length + 1)) {
-			if ((newp = realloc(saved->string,
-					    (size_t) (row->length +
-						      saved->length
-						      + 1))) == NULL)
-				return E_REQUEST_DENIED;
-			saved->string = newp;
-			saved->allocated = row->length + saved->length + 1;
-		}
-
-		strcat(saved->string, row->string);
-		old_len = saved->length;
-		saved->length += row->length;
-		if (saved->length > 0)
-			saved->expanded =
-				_formi_tab_expanded_length(saved->string, 0,
-							   saved->length - 1);
-		else
-			saved->length = 0;
-
-		saved->hard_ret = row->hard_ret;
-
-		  /* adjust current line if it was on the row being eaten */
-		if (field->cur_line == row) {
-			field->cur_line = saved;
-			field->row_xpos += old_len;
-			field->cursor_xpos =
-				_formi_tab_expanded_length(saved->string, 0,
-							   field->row_xpos);
-			if (field->cursor_xpos > 0)
-				field->cursor_xpos--;
-		}
-
-		add_to_free(field, row);
-
-#ifdef DEBUG
-		if (dbg_ok == TRUE) {
-			fprintf(dbg,
-				"join_line: exit length = %d, expanded = %d\n",
-				saved->length, saved->expanded);
-		}
-#endif
-		row = saved;
-	}
-
-
-	  /*
-	   * Work out where the line lies in the field in relation to
-	   * the cursor_ypos.  First count the rows from the start of
-	   * the field until we hit the row we just worked on.
-	   */
-	saved = field->start_line;
-	count = 0;
-	while (saved->next != NULL) {
-		if (saved == row)
-			break;
-		count++;
-		saved = saved->next;
-	}
-
-	  /* now check if we need to adjust cursor_ypos */
-	if (field->cursor_ypos > count) {
-		field->cursor_ypos--;
-	}
-	
-	field->row_count--;
-	*rowp = row;
-
-	  /* wrap the field if required, if this fails undo the change */
-	if ((direction == JOIN_NEXT) || (direction == JOIN_PREV)) {
-		if (_formi_wrap_field(field, row) != E_OK) {
-			return E_REQUEST_DENIED;
-		}
-	}
-
-	return E_OK;
-}
-
-/*
- * Split the line at the given position, if possible.  If hard_split is
- * TRUE then split the line regardless of the position, otherwise don't
- * split at the beginning of a line.
- */
-static int
-split_line(FIELD *field, bool hard_split, unsigned pos,
-	   _FORMI_FIELD_LINES **rowp)
-{
-	struct _formi_field_lines *new_line;
-	char *newp;
-	_FORMI_FIELD_LINES *row = *rowp;
-#ifdef DEBUG
-	short dbg_ok = FALSE;
-#endif
-
-	  /* if asked to split right where the line already starts then
-	   * just return - nothing to do unless we are appending a line
-	   * to the buffer.
-	   */
-	if ((pos == 0) && (hard_split == FALSE))
-		return E_OK;
-
-#ifdef DEBUG
-	if (_formi_create_dbg_file() == E_OK) {
-		fprintf(dbg, "split_line: splitting line at %d\n", pos);
-		dbg_ok = TRUE;
-	}
-#endif
-
-	  /* Need an extra line struct, check free list first */
-	if (field->free != NULL) {
-		new_line = field->free;
-		field->free = new_line->next;
-		if (field->free != NULL)
-			field->free->prev = NULL;
-	} else {
-		if ((new_line = (struct _formi_field_lines *)
-		     malloc(sizeof(struct _formi_field_lines))) == NULL)
-			return E_SYSTEM_ERROR;
-		new_line->prev = NULL;
-		new_line->next = NULL;
-		new_line->allocated = 0;
-		new_line->length = 0;
-		new_line->expanded = 0;
-		new_line->string = NULL;
-		new_line->hard_ret = FALSE;
-		new_line->tabs = NULL;
-	}
-
-#ifdef DEBUG
-	if (dbg_ok == TRUE) {
-		fprintf(dbg,
-	"split_line: enter: length = %d, expanded = %d\n",
-			row->length, row->expanded);
-	}
-#endif
-
-	assert((row->length < INT_MAX) && (row->expanded < INT_MAX));
-
-
-	  /* add new line to the row list */
-	new_line->next = row->next;
-	new_line->prev = row;
-	row->next = new_line;
-	if (new_line->next != NULL)
-		new_line->next->prev = new_line;
-
-	new_line->length = row->length - pos;
-	if (new_line->length >= new_line->allocated) {
-		if ((newp = realloc(new_line->string,
-				    (size_t) new_line->length + 1)) == NULL)
-			return E_SYSTEM_ERROR;
-		new_line->string = newp;
-		new_line->allocated = new_line->length + 1;
-	}
-
-	strcpy(new_line->string, &row->string[pos]);
-
-	row->length = pos;
-	row->string[pos] = '\0';
-
-	if (row->length != 0)
-		row->expanded = _formi_tab_expanded_length(row->string, 0,
-							   row->length - 1);
-	else
-		row->expanded = 0;
-	_formi_calculate_tabs(row);
-
-	if (new_line->length != 0)
-		new_line->expanded =
-			_formi_tab_expanded_length(new_line->string, 0,
-						   new_line->length - 1);
-	else
-		new_line->expanded = 0;
-
-	_formi_calculate_tabs(new_line);
-
-	  /*
-	   * If the given row was the current line then adjust the
-	   * current line pointer if necessary
-	   */
-	if ((field->cur_line == row) && (field->row_xpos >= pos)) {
-		field->cur_line = new_line;
-		field->row_xpos -= pos;
-		field->cursor_xpos =
-			_formi_tab_expanded_length(new_line->string, 0,
-						   field->row_xpos);
-		if (field->cursor_xpos > 0)
-			field->cursor_xpos--;
-		
-		field->cursor_ypos++;
-		if (field->cursor_ypos >= field->rows) {
-			if (field->start_line->next != NULL) {
-				field->start_line = field->start_line->next;
-				field->cursor_ypos = field->rows - 1;
-			}
-			else
-				assert(field->start_line->next == NULL);
-		}
-	}
-
-	  /*
-	   * If the line split had a hard return then replace the
-	   * current line's hard return with a soft return and carry
-	   * the hard return onto the line after.
-	   */
-	if (row->hard_ret == TRUE) {
-		new_line->hard_ret = TRUE;
-		row->hard_ret = FALSE;
-	}
-
-	  /*
-	   * except where we are doing a hard split then the current
-	   * row must have a hard return on it too...
-	   */
-	if (hard_split == TRUE) {
-		row->hard_ret = TRUE;
-	}
-	
-	assert(((row->expanded < INT_MAX) &&
-		(new_line->expanded < INT_MAX) &&
-		(row->length < INT_MAX) &&
-		(new_line->length < INT_MAX)));
-
-#ifdef DEBUG
-	if (dbg_ok == TRUE) {
-		fprintf(dbg, "split_line: exit: ");
-		fprintf(dbg, "row.length = %d, row.expanded = %d, ",
-			row->length, row->expanded);
-		fprintf(dbg,
-			"next_line.length = %d, next_line.expanded = %d, ",
-			new_line->length, new_line->expanded);
-		fprintf(dbg, "row_count = %d\n", field->row_count + 1);
-	}
-#endif
-
-	field->row_count++;
-	*rowp = new_line;
-	
-	return E_OK;
-}
-
-/*
- * skip the blanks in the given string, start at the index start and
- * continue forward until either the end of the string or a non-blank
- * character is found.  Return the index of either the end of the string or
- * the first non-blank character.
- */
-unsigned
-_formi_skip_blanks(char *string, unsigned int start)
-{
-	unsigned int i;
-
-	i = start;
-	
-	while ((string[i] != '\0') && isblank((unsigned char)string[i]))
-		i++;
-
-	return i;
-}
-
-/*
- * Skip the blanks in the string associated with the given row, pass back
- * the row and the offset at which the first non-blank is found.  If no
- * non-blank character is found then return the index to the last
- * character on the last line.
- */
-
-unsigned
-field_skip_blanks(unsigned int start, _FORMI_FIELD_LINES **rowp)
-{
-	unsigned int i;
-	_FORMI_FIELD_LINES *row, *last = NULL;
-
-	row = *rowp;
-	i = start;
-
-	do {
-		i = _formi_skip_blanks(&row->string[i], i);
-		if (!isblank((unsigned char)row->string[i])) {
-			last = row;
-			row = row->next;
-			  /*
-			   * don't reset if last line otherwise we will
-			   * not be at the end of the string.
-			   */
-			if (row != NULL)
-				i = 0;
-		} else
-			break;
-	}
-	while (row != NULL);
-
-	  /*
-	   * If we hit the end of the row list then point at the last row
-	   * otherwise we return the row we found the blank on.
-	   */
-	if (row == NULL)
-		*rowp = last;
-	else
-		*rowp = row;
-
-	return i;
-}
-
-/*
- * Return the index of the top left most field of the two given fields.
- */
-static int
-_formi_top_left(FORM *form, int a, int b)
-{
-	  /* lower row numbers always win here.... */
-	if (form->fields[a]->form_row < form->fields[b]->form_row)
-		return a;
-
-	if (form->fields[a]->form_row > form->fields[b]->form_row)
-		return b;
-
-	  /* rows must be equal, check columns */
-	if (form->fields[a]->form_col < form->fields[b]->form_col)
-		return a;
-
-	if (form->fields[a]->form_col > form->fields[b]->form_col)
-		return b;
-
-	  /* if we get here fields must be in exactly the same place, punt */
-	return a;
-}
-
-/*
- * Return the index to the field that is the bottom-right-most of the
- * two given fields.
- */
-static int
-_formi_bottom_right(FORM *form, int a, int b)
-{
-	  /* check the rows first, biggest row wins */
-	if (form->fields[a]->form_row > form->fields[b]->form_row)
-		return a;
-	if (form->fields[a]->form_row < form->fields[b]->form_row)
-		return b;
-
-	  /* rows must be equal, check cols, biggest wins */
-	if (form->fields[a]->form_col > form->fields[b]->form_col)
-		return a;
-	if (form->fields[a]->form_col < form->fields[b]->form_col)
-		return b;
-
-	  /* fields in the same place, punt */
-	return a;
-}
-
-/*
- * Find the end of the current word in the string str, starting at
- * offset - the end includes any trailing whitespace.  If the end of
- * the string is found before a new word then just return the offset
- * to the end of the string.  If do_join is TRUE then lines will be
- * joined (without wrapping) until either the end of the field or the
- * end of a word is found (whichever comes first).
- */
-static int
-find_eow(FIELD *cur, unsigned int offset, bool do_join,
-	 _FORMI_FIELD_LINES **rowp)
-{
-	int start;
-	_FORMI_FIELD_LINES *row;
-
-	row = *rowp;
-	start = offset;
-
-	do {
-		  /* first skip any non-whitespace */
-		while ((row->string[start] != '\0')
-		       && !isblank((unsigned char)row->string[start]))
-			start++;
-
-		  /* see if we hit the end of the string */
-		if (row->string[start] == '\0') {
-			if (do_join == TRUE) {
-				if (row->next == NULL)
-					return start;
-				
-				if (_formi_join_line(cur, &row, JOIN_NEXT_NW)
-				    != E_OK)
-					return E_REQUEST_DENIED;
-			} else {
-				do {
-					if (row->next == NULL) {
-						*rowp = row;
-						return start;
-					} else {
-						row = row->next;
-						start = 0;
-					}
-				} while (row->length == 0);
-			}
-		}
-	} while (!isblank((unsigned char)row->string[start]));
-
-	do {
-		  /* otherwise skip the whitespace.... */
-		while ((row->string[start] != '\0')
-		       && isblank((unsigned char)row->string[start]))
-			start++;
-
-		if (row->string[start] == '\0') {
-			if (do_join == TRUE) {
-				if (row->next == NULL)
-					return start;
-				
-				if (_formi_join_line(cur, &row, JOIN_NEXT_NW)
-				    != E_OK)
-					return E_REQUEST_DENIED;
-			} else {
-				do {
-					if (row->next == NULL) {
-						*rowp = row;
-						return start;
-					} else {
-						row = row->next;
-						start = 0;
-					}
-				} while (row->length == 0);
-			}
-		}
-	} while (isblank((unsigned char)row->string[start]));
-
-	*rowp = row;
-	return start;
-}
-
-/*
- * Find the beginning of the current word in the string str, starting
- * at offset.
- */
-static int
-find_sow(unsigned int offset, _FORMI_FIELD_LINES **rowp)
-{
-	int start;
-	char *str;
-	_FORMI_FIELD_LINES *row;
-
-	row = *rowp;
-	str = row->string;
-	start = offset;
-
-	do {
-		if (start > 0) {
-			if (isblank((unsigned char)str[start]) ||
-			    isblank((unsigned char)str[start - 1])) {
-				if (isblank((unsigned char)str[start - 1]))
-					start--;
-				  /* skip the whitespace.... */
-				while ((start >= 0) &&
-				    isblank((unsigned char)str[start]))
-					start--;
-			}
-		}
-		
-		  /* see if we hit the start of the string */
-		if (start < 0) {
-			do {
-				if (row->prev == NULL) {
-					*rowp = row;
-					start = 0;
-					return start;
-				} else {
-					row = row->prev;
-					str = row->string;
-					if (row->length > 0)
-						start = row->length - 1;
-					else
-						start = 0;
-				}
-			} while (row->length == 0);
-		}
-	} while (isblank((unsigned char)row->string[start]));
-
-	  /* see if we hit the start of the string */
-	if (start < 0) {
-		*rowp = row;
-		return 0;
-	}
-
-	  /* now skip any non-whitespace */
-	do {
-		while ((start >= 0) && !isblank((unsigned char)str[start]))
-			start--;
-
-		
-		if (start < 0) {
-			do {
-				if (row->prev == NULL) {
-					*rowp = row;
-					start = 0;
-					return start;
-				} else {
-					row = row->prev;
-					str = row->string;
-					if (row->length > 0)
-						start = row->length - 1;
-					else
-						start = 0;
-				}
-			} while (row->length == 0);
-		}
-	} while (!isblank((unsigned char)str[start]));
-	
-	if (start > 0) {
-		start++; /* last loop has us pointing at a space, adjust */
-		if (start >= row->length) {
-			if (row->next != NULL) {
-				start = 0;
-				row = row->next;
-			} else {
-				start = row->length - 1;
-			}
-		}
-	}
-	
-	if (start < 0)
-		start = 0;
-
-	*rowp = row;
-	return start;
-}
-
-/*
- * Scroll the field forward the given number of lines.
- */
-static void
-_formi_scroll_fwd(FIELD *field, unsigned int amt)
-{
-	unsigned int count;
-	_FORMI_FIELD_LINES *end_row;
-
-	end_row = field->start_line;
-	  /* walk the line structs forward to find the bottom of the field */
-	count = field->rows - 1;
-	while ((count > 0) && (end_row->next != NULL))
-	{
-		count--;
-		end_row = end_row->next;
-	}
-
-	  /* check if there are lines to scroll */
-	if ((count > 0) && (end_row->next == NULL))
-		return;
-
-	  /*
-	   * ok, lines to scroll - do this by walking both the start_line
-	   * and the end_row at the same time for amt lines, we stop when
-	   * either we have done the number of lines or end_row hits the
-	   * last line in the field.
-	   */
-	count = amt;
-	while ((count > 0) && (end_row->next != NULL)) {
-		count--;
-		field->start_line = field->start_line->next;
-		end_row = end_row->next;
-	}
-}
-
-/*
- * Scroll the field backward the given number of lines.
- */
-static void
-_formi_scroll_back(FIELD *field, unsigned int amt)
-{
-	unsigned int count;
-
-	  /* check for lines above */
-	if (field->start_line->prev == NULL)
-		return;
-
-	  /*
-	   * Backward scroll is easy, follow row struct chain backward until
-	   * the number of lines done or we reach the top of the field.
-	   */
-	count = amt;
-	while ((count > 0) && (field->start_line->prev != NULL)) {
-		count--;
-		field->start_line = field->start_line->prev;
-	}
-}
-
-/*
- * Scroll the field forward the given number of characters.
- */
-void
-_formi_hscroll_fwd(FIELD *field, _FORMI_FIELD_LINES *row, int unsigned amt)
-{
-	unsigned int end, scroll_amt, expanded;
-	_formi_tab_t *ts;
-
-
-	if ((row->tabs == NULL) || (row->tabs->in_use == FALSE)) {
-		  /* if the line has no tabs things are easy... */
-		end =  field->start_char + field->cols + amt - 1;
-		scroll_amt = amt;
-		if (end > row->length) {
-			end = row->length;
-			scroll_amt = end - field->start_char - field->cols + 1;
-		}
-	} else {
-		  /*
-		   * If there are tabs we need to add on the scroll amount,
-		   * find the last char position that will fit into
-		   * the field and finally fix up the start_char.  This
-		   * is a lot of work but handling the case where there
-		   * are not enough chars to scroll by amt is difficult.
-		   */
-		end = field->start_char + field->row_xpos + amt;
-		if (end >= row->length)
-			end = row->length - 1;
-		else {
-			expanded = _formi_tab_expanded_length(
-				row->string,
-				field->start_char + amt,
-				field->start_char + field->row_xpos + amt);
-			ts = row->tabs;
-			  /* skip tabs to the lhs of our starting point */
-			while ((ts != NULL) && (ts->in_use == TRUE)
-			       && (ts->pos < end))
-				ts = ts->fwd;
-
-			while ((expanded <= field->cols)
-			       && (end < row->length)) {
-				if (row->string[end] == '\t') {
-					assert((ts != NULL)
-					       && (ts->in_use == TRUE));
-					if (ts->pos == end) {
-						if ((expanded + ts->size)
-						    > field->cols)
-							break;
-						expanded += ts->size;
-						ts = ts->fwd;
-					}
-					else
-						assert(ts->pos == end);
-				} else
-					expanded++;
-				end++;
-			}
-		}
-
-		scroll_amt = tab_fit_window(field, end, field->cols);
-		if (scroll_amt < field->start_char)
-			scroll_amt = 1;
-		else
-			scroll_amt -= field->start_char;
-
-		scroll_amt = min(scroll_amt, amt);
-	}
-
-	field->start_char += scroll_amt;
-	field->cursor_xpos =
-		_formi_tab_expanded_length(row->string,
-					   field->start_char,
-					   field->row_xpos
-					   + field->start_char) - 1;
-
-}
-
-/*
- * Scroll the field backward the given number of characters.
- */
-void
-_formi_hscroll_back(FIELD *field, _FORMI_FIELD_LINES *row, unsigned int amt)
-{
-	field->start_char -= min(field->start_char, amt);
-	field->cursor_xpos =
-		_formi_tab_expanded_length(row->string, field->start_char,
-					   field->row_xpos
-					   + field->start_char) - 1;
-	if (field->cursor_xpos >= field->cols) {
-		field->row_xpos = 0;
-		field->cursor_xpos = 0;
-	}
-}
-
-/*
- * Find the different pages in the form fields and assign the form
- * page_starts array with the information to find them.
- */
-int
-_formi_find_pages(FORM *form)
-{
-	int i, cur_page = 0;
-
-	if ((form->page_starts = (_FORMI_PAGE_START *)
-	     malloc((form->max_page + 1) * sizeof(_FORMI_PAGE_START))) == NULL)
-		return E_SYSTEM_ERROR;
-
-	  /* initialise the page starts array */
-	memset(form->page_starts, 0,
-	       (form->max_page + 1) * sizeof(_FORMI_PAGE_START));
-
-	for (i =0; i < form->field_count; i++) {
-		if (form->fields[i]->page_break == 1)
-			cur_page++;
-		if (form->page_starts[cur_page].in_use == 0) {
-			form->page_starts[cur_page].in_use = 1;
-			form->page_starts[cur_page].first = i;
-			form->page_starts[cur_page].last = i;
-			form->page_starts[cur_page].top_left = i;
-			form->page_starts[cur_page].bottom_right = i;
-		} else {
-			form->page_starts[cur_page].last = i;
-			form->page_starts[cur_page].top_left =
-				_formi_top_left(form,
-						form->page_starts[cur_page].top_left,
-						i);
-			form->page_starts[cur_page].bottom_right =
-				_formi_bottom_right(form,
-						    form->page_starts[cur_page].bottom_right,
-						    i);
-		}
-	}
-
-	return E_OK;
-}
-
-/*
- * Completely redraw the field of the given form.
- */
-void
-_formi_redraw_field(FORM *form, int field)
-{
-	unsigned int pre, post, flen, slen, i, j, start, line;
-	unsigned int tab, cpos, len;
-	char *str, c;
-	FIELD *cur;
-	_FORMI_FIELD_LINES *row;
-#ifdef DEBUG
-	char buffer[100];
-#endif
-
-	cur = form->fields[field];
-	flen = cur->cols;
-	slen = 0;
-	start = 0;
-	line = 0;
-
-	for (row = cur->start_line; ((row != NULL) && (line < cur->rows));
-	     row = row->next, line++) {
-		wmove(form->scrwin, (int) (cur->form_row + line),
-		      (int) cur->form_col);
-		if ((cur->rows + cur->nrows) == 1) {
-			if ((cur->cols + cur->start_char) >= row->length)
-				len = row->length;
-			else
-				len = cur->cols + cur->start_char;
-			if (row->string != NULL)
-				slen = _formi_tab_expanded_length(
-					row->string, cur->start_char, len);
-			else
-				slen = 0;
-			
-			if (slen > cur->cols)
-				slen = cur->cols;
-			slen += cur->start_char;
-		} else
-			slen = row->expanded;
-
-		if ((cur->opts & O_STATIC) == O_STATIC) {
-			switch (cur->justification) {
-			case JUSTIFY_RIGHT:
-				post = 0;
-				if (flen < slen)
-					pre = 0;
-				else
-					pre = flen - slen;
-				break;
-
-			case JUSTIFY_CENTER:
-				if (flen < slen) {
-					pre = 0;
-					post = 0;
-				} else {
-					pre = flen - slen;
-					post = pre = pre / 2;
-					  /* get padding right if
-					     centring is not even */
-					if ((post + pre + slen) < flen)
-						post++;
-				}
-				break;
-
-			case NO_JUSTIFICATION:
-			case JUSTIFY_LEFT:
-			default:
-				pre = 0;
-				if (flen <= slen)
-					post = 0;
-				else {
-					post = flen - slen;
-					if (post > flen)
-						post = flen;
-				}
-				break;
-			}
-		} else {
-			  /* dynamic fields are not justified */
-			pre = 0;
-			if (flen <= slen)
-				post = 0;
-			else {
-				post = flen - slen;
-				if (post > flen)
-					post = flen;
-			}
-
-			  /* but they do scroll.... */
-
-			if (pre > cur->start_char - start)
-				pre = pre - cur->start_char + start;
-			else
-				pre = 0;
-
-			if (slen > cur->start_char) {
-				slen -= cur->start_char;
-				if (slen > flen)
-					post = 0;
-				else
-					post = flen - slen;
-
-				if (post > flen)
-					post = flen;
-			} else {
-				slen = 0;
-				post = flen - pre;
-			}
-		}
-
-		if (form->cur_field == field)
-			wattrset(form->scrwin, cur->fore);
-		else
-			wattrset(form->scrwin, cur->back);
-
-		str = &row->string[cur->start_char];
-
-#ifdef DEBUG
-		if (_formi_create_dbg_file() == E_OK) {
-			fprintf(dbg,
-  "redraw_field: start=%d, pre=%d, slen=%d, flen=%d, post=%d, start_char=%d\n",
-				start, pre, slen, flen, post, cur->start_char);
-			if (str != NULL) {
-				if (row->expanded != 0) {
-					strncpy(buffer, str, flen);
-				} else {
-					strcpy(buffer, "(empty)");
-				}
-			} else {
-				strcpy(buffer, "(null)");
-			}
-			buffer[flen] = '\0';
-			fprintf(dbg, "redraw_field: %s\n", buffer);
-		}
-#endif
-
-		for (i = start + cur->start_char; i < pre; i++)
-			waddch(form->scrwin, cur->pad);
-
-#ifdef DEBUG
-		fprintf(dbg, "redraw_field: will add %d chars\n",
-			min(slen, flen));
-#endif
-		for (i = 0, cpos = cur->start_char; i < min(slen, flen);
-		     i++, str++, cpos++) 
-		{
-			c = *str;
-			tab = 0; /* just to shut gcc up */
-#ifdef DEBUG
-			fprintf(dbg, "adding char str[%d]=%c\n",
-				cpos + cur->start_char,	c);
-#endif
-			if (((cur->opts & O_PUBLIC) != O_PUBLIC)) {
-				if (c == '\t')
-					tab = add_tab(form, row, cpos,
-						      cur->pad);
-				else
-					waddch(form->scrwin, cur->pad);
-			} else if ((cur->opts & O_VISIBLE) == O_VISIBLE) {
-				if (c == '\t')
-					tab = add_tab(form, row, cpos, ' ');
-				else
-					waddch(form->scrwin, c);
-			} else {
-				if (c == '\t')
-					tab = add_tab(form, row, cpos, ' ');
-				else
-					waddch(form->scrwin, ' ');
-			}
-
-			  /*
-			   * If we have had a tab then skip forward
-			   * the requisite number of chars to keep
-			   * things in sync.
-			   */
-			if (c == '\t')
-				i += tab - 1;
-		}
-
-		for (i = 0; i < post; i++)
-			waddch(form->scrwin, cur->pad);
-	}
-
-	for (i = line; i < cur->rows; i++) {
-		wmove(form->scrwin, (int) (cur->form_row + i),
-		      (int) cur->form_col);
-
-		if (form->cur_field == field)
-			wattrset(form->scrwin, cur->fore);
-		else
-			wattrset(form->scrwin, cur->back);
-
-		for (j = 0; j < cur->cols; j++) {
-			waddch(form->scrwin, cur->pad);
-		}
-	}
-
-	wattrset(form->scrwin, cur->back);
-	return;
-}
-
-/*
- * Add the correct number of the given character to simulate a tab
- * in the field.
- */
-static int
-add_tab(FORM *form, _FORMI_FIELD_LINES *row, unsigned int i, char c)
-{
-	int j;
-	_formi_tab_t *ts = row->tabs;
-
-	while ((ts != NULL) && (ts->pos != i))
-		ts = ts->fwd;
-
-	assert(ts != NULL);
-
-	for (j = 0; j < ts->size; j++)
-		waddch(form->scrwin, c);
-
-	return ts->size;
-}
-
-
-/*
- * Display the fields attached to the form that are on the current page
- * on the screen.
- *
- */
-int
-_formi_draw_page(FORM *form)
-{
-	int i;
-
-	if (form->page_starts[form->page].in_use == 0)
-		return E_BAD_ARGUMENT;
-
-	wclear(form->scrwin);
-
-	for (i = form->page_starts[form->page].first;
-	     i <= form->page_starts[form->page].last; i++)
-		_formi_redraw_field(form, i);
-
-	return E_OK;
-}
-
-/*
- * Add the character c at the position pos in buffer 0 of the given field
- */
-int
-_formi_add_char(FIELD *field, unsigned int pos, char c)
-{
-	char *new, old_c;
-	unsigned int new_size;
-	int status;
-	_FORMI_FIELD_LINES *row, *temp, *next_temp;
-
-	row = field->cur_line;
-
-	  /*
-	   * If buffer has not had a string before, set it to a blank
-	   * string.  Everything should flow from there....
-	   */
-	if (row->string == NULL) {
-		if ((row->string = (char *) malloc((size_t)INITIAL_LINE_ALLOC))
-		    == NULL)
-			return E_SYSTEM_ERROR;
-		row->string[0] = '\0';
-		row->allocated = INITIAL_LINE_ALLOC;
-		row->length = 0;
-		row->expanded = 0;
-	}
-
-	if (_formi_validate_char(field, c) != E_OK) {
-#ifdef DEBUG
-		fprintf(dbg, "add_char: char %c failed char validation\n", c);
-#endif
-		return E_INVALID_FIELD;
-	}
-
-	if ((c == '\t') && (field->cols <= 8)) {
-#ifdef DEBUG
-		fprintf(dbg, "add_char: field too small for a tab\n");
-#endif
-		return E_NO_ROOM;
-	}
-
-#ifdef DEBUG
-	fprintf(dbg, "add_char: pos=%d, char=%c\n", pos, c);
-	fprintf(dbg, "add_char enter: xpos=%d, row_pos=%d, start=%d\n",
-		field->cursor_xpos, field->row_xpos, field->start_char);
-	fprintf(dbg, "add_char enter: length=%d(%d), allocated=%d\n",
-		row->expanded, row->length, row->allocated);
-	fprintf(dbg, "add_char enter: %s\n", row->string);
-	fprintf(dbg, "add_char enter: buf0_status=%d\n", field->buf0_status);
-#endif
-	if (((field->opts & O_BLANK) == O_BLANK) &&
-	    (field->buf0_status == FALSE) &&
-	    ((field->row_xpos + field->start_char) == 0)) {
-		row = field->alines;
-		if (row->next != NULL) {
-			  /* shift all but one line structs to free list */
-			temp = row->next;
-			do {
-				next_temp = temp->next;
-				add_to_free(field, temp);
-				temp = next_temp;
-			} while (temp != NULL);
-		}
-
-		row->length = 0;
-		row->string[0] = '\0';
-		pos = 0;
-		field->start_char = 0;
-		field->start_line = row;
-		field->cur_line = row;
-		field->row_count = 1;
-		field->row_xpos = 0;
-		field->cursor_ypos = 0;
-		row->expanded = 0;
-		row->length = 0;
-		_formi_init_field_xpos(field);
-	}
-
-
-	if ((field->overlay == 0)
-	    || ((field->overlay == 1) && (pos >= row->length))) {
-		  /* first check if the field can have more chars...*/
-		if (check_field_size(field) == FALSE)
-			return E_REQUEST_DENIED;
-
-		if (row->length + 2
-		    >= row->allocated) {
-			new_size = row->allocated + 16 - (row->allocated % 16);
-			if ((new = (char *) realloc(row->string,
-						  (size_t) new_size )) == NULL)
-				return E_SYSTEM_ERROR;
-			row->allocated = new_size;
-			row->string = new;
-		}
-	}
-
-	if ((field->overlay == 0) && (row->length > pos)) {
-		bcopy(&row->string[pos], &row->string[pos + 1],
-		      (size_t) (row->length - pos + 1));
-	}
-
-	old_c = row->string[pos];
-	row->string[pos] = c;
-	if (pos >= row->length) {
-		  /* make sure the string is terminated if we are at the
-		   * end of the string, the terminator would be missing
-		   * if we are are at the end of the field.
-		   */
-		row->string[pos + 1] = '\0';
-	}
-
-	  /* only increment the length if we are inserting characters
-	   * OR if we are at the end of the field in overlay mode.
-	   */
-	if ((field->overlay == 0)
-	    || ((field->overlay == 1) && (pos >= row->length))) {
-		row->length++;
-	}
-
-	_formi_calculate_tabs(row);
-	row->expanded = _formi_tab_expanded_length(row->string, 0,
-						   row->length - 1);
-
-	  /* wrap the field, if needed */
-	status = _formi_wrap_field(field, row);
-
-	row = field->cur_line;
-	pos = field->row_xpos;
-
-	  /*
-	   * check the wrap worked or that we have not exceeded the
-	   * max field size - this can happen if the field is re-wrapped
-	   * and the row count is increased past the set limit.
-	   */
-	if ((status != E_OK) || (check_field_size(field) == FALSE)) {
-		if ((field->overlay == 0)
-		    || ((field->overlay == 1)
-			&& (pos >= (row->length - 1) /*XXXX- append check???*/))) {
-			  /*
-			   * wrap failed for some reason, back out the
-			   * char insert
-			   */
-			bcopy(&row->string[pos + 1], &row->string[pos],
-			      (size_t) (row->length - pos));
-			row->length--;
-			if (pos > 0)
-				pos--;
-		} else if (field->overlay == 1) {
-			  /* back out character overlay */
-			row->string[pos] = old_c;
-		}
-
-		_formi_calculate_tabs(row);
-
-		_formi_wrap_field(field, row);
-		  /*
-		   * If we are here then either the status is bad or we
-		   * simply ran out of room.  If the status is E_OK then
-		   * we ran out of room, let the form driver know this.
-		   */
-		if (status == E_OK)
-			status = E_REQUEST_DENIED;
-
-	} else {
-		field->buf0_status = TRUE;
-		field->row_xpos++;
-		if ((field->rows + field->nrows) == 1) {
-			status = _formi_set_cursor_xpos(field, FALSE);
-		} else {
-			field->cursor_xpos =
-				_formi_tab_expanded_length(
-					row->string, 0,	field->row_xpos - 1);
-
-			  /*
-			   * Annoying corner case - if we are right in
-			   * the bottom right corner of the field we
-			   * need to scroll the field one line so the
-			   * cursor is positioned correctly in the
-			   * field.
-			   */
-			if ((field->cursor_xpos >= field->cols) &&
-			    (field->cursor_ypos == (field->rows - 1))) {
-				field->cursor_ypos--;
-				field->start_line = field->start_line->next;
-			}
-		}
-	}
-
-	assert((field->cursor_xpos <= field->cols)
-	       && (field->cursor_ypos < 400000));
-
-#ifdef DEBUG
-	fprintf(dbg, "add_char exit: xpos=%d, row_pos=%d, start=%d\n",
-		field->cursor_xpos, field->row_xpos, field->start_char);
-	fprintf(dbg, "add_char_exit: length=%d(%d), allocated=%d\n",
-		row->expanded, row->length, row->allocated);
-	fprintf(dbg, "add_char exit: ypos=%d, start_line=%p\n",
-		field->cursor_ypos, field->start_line);
-	fprintf(dbg,"add_char exit: %s\n", row->string);
-	fprintf(dbg, "add_char exit: buf0_status=%d\n", field->buf0_status);
-	fprintf(dbg, "add_char exit: status = %s\n",
-		(status == E_OK)? "OK" : "FAILED");
-#endif
-	return status;
-}
-
-/*
- * Set the position of the cursor on the screen in the row depending on
- * where the current position in the string is and the justification
- * that is to be applied to the field.  Justification is only applied
- * to single row, static fields.
- */
-static int
-_formi_set_cursor_xpos(FIELD *field, int noscroll)
-{
-	int just, pos;
-
-	just = field->justification;
-	pos = field->start_char + field->row_xpos;
-
-#ifdef DEBUG
-	fprintf(dbg,
-	  "cursor_xpos enter: pos %d, start_char %d, row_xpos %d, xpos %d\n",
-		pos, field->start_char, field->row_xpos, field->cursor_xpos);
-#endif
-
-	  /*
-	   * make sure we apply the correct justification to non-static
-	   * fields.
-	   */
-	if (((field->rows + field->nrows) != 1) ||
-	    ((field->opts & O_STATIC) != O_STATIC))
-		just = JUSTIFY_LEFT;
-
-	switch (just) {
-	case JUSTIFY_RIGHT:
-		field->cursor_xpos = field->cols - 1
-			- _formi_tab_expanded_length(
-				field->cur_line->string, 0,
-				field->cur_line->length - 1)
-			+ _formi_tab_expanded_length(
-				field->cur_line->string, 0,
-				field->row_xpos);
-		break;
-
-	case JUSTIFY_CENTER:
-		field->cursor_xpos = ((field->cols - 1) 
-			- _formi_tab_expanded_length(
-				field->cur_line->string, 0,
-				field->cur_line->length - 1) + 1) / 2
-			+ _formi_tab_expanded_length(field->cur_line->string,
-						     0, field->row_xpos);
-
-		if (field->cursor_xpos > (field->cols - 1))
-			field->cursor_xpos = (field->cols - 1);
-		break;
-
-	default:
-		field->cursor_xpos = _formi_tab_expanded_length(
-			field->cur_line->string,
-			field->start_char,
-			field->row_xpos	+ field->start_char);
-		if ((field->cursor_xpos <= (field->cols - 1)) &&
-		    ((field->start_char + field->row_xpos)
-		     < field->cur_line->length))
-			field->cursor_xpos--;
-
-		if (field->cursor_xpos > (field->cols - 1)) {
-			if ((field->opts & O_STATIC) == O_STATIC) {
-				field->start_char = 0;
-
-				if (field->row_xpos
-				    == (field->cur_line->length - 1)) {
-					field->cursor_xpos = field->cols - 1;
-				} else {
-					field->cursor_xpos =
-						_formi_tab_expanded_length(
-						  field->cur_line->string,
-						  field->start_char,
-						  field->row_xpos
-						    + field->start_char
-						  - 1) - 1;
-				}
-			} else {
-				if (noscroll == FALSE) {
-					field->start_char =
-						tab_fit_window(
-							field,
-							field->start_char
-							+ field->row_xpos,
-							field->cols);
-					field->row_xpos = pos
-						- field->start_char;
-					field->cursor_xpos =
-						_formi_tab_expanded_length(
-						   field->cur_line->string,
-						   field->start_char,
-						   field->row_xpos
-						      + field->start_char - 1);
-				} else {
-					field->cursor_xpos = (field->cols - 1);
-				}
-			}
-
-		}
-		break;
-	}
-
-#ifdef DEBUG
-	fprintf(dbg,
-	  "cursor_xpos exit: pos %d, start_char %d, row_xpos %d, xpos %d\n",
-		pos, field->start_char, field->row_xpos, field->cursor_xpos);
-#endif
-	return E_OK;
-}
-
-/*
- * Manipulate the text in a field, this takes the given form and performs
- * the passed driver command on the current text field.  Returns 1 if the
- * text field was modified.
- */
-int
-_formi_manipulate_field(FORM *form, int c)
-{
-	FIELD *cur;
-	char *str, saved;
-	unsigned int start, end, pos, status, old_count, size;
-	unsigned int old_xpos, old_row_pos;
-	int len, wb;
-	bool eat_char;
-	_FORMI_FIELD_LINES *row, *rs;
-
-	cur = form->fields[form->cur_field];
-	if (cur->cur_line->string == NULL)
-		return E_REQUEST_DENIED;
-
-#ifdef DEBUG
-	fprintf(dbg, "entry: request is REQ_%s\n", reqs[c - REQ_MIN_REQUEST]);
-	fprintf(dbg,
-	"entry: xpos=%d, row_pos=%d, start_char=%d, length=%d, allocated=%d\n",
-		cur->cursor_xpos, cur->row_xpos, cur->start_char,
-		cur->cur_line->length,	cur->cur_line->allocated);
-	fprintf(dbg, "entry: start_line=%p, ypos=%d\n", cur->start_line,
-		cur->cursor_ypos);
-	fprintf(dbg, "entry: string=");
-	if (cur->cur_line->string == NULL)
-		fprintf(dbg, "(null)\n");
-	else
-		fprintf(dbg, "\"%s\"\n", cur->cur_line->string);
-#endif
-
-	  /* Cannot manipulate a null string! */
-	if (cur->cur_line->string == NULL)
-		return E_REQUEST_DENIED;
-
-	saved = '\0';
-	row = cur->cur_line;
-
-	switch (c) {
-	case REQ_RIGHT_CHAR:
-		  /*
-		   * The right_char request performs the same function
-		   * as the next_char request except that the cursor is
-		   * not wrapped if it is at the end of the line, so
-		   * check if the cursor is at the end of the line and
-		   * deny the request otherwise just fall through to
-		   * the next_char request handler.
-		   */
-		if (cur->cursor_xpos >= cur->cols - 1)
-			return E_REQUEST_DENIED;
-
-		  /* FALLTHRU */
-
-	case REQ_NEXT_CHAR:
-		  /* for a dynamic field allow an offset of one more
-		   * char so we can insert chars after end of string.
-		   * Static fields cannot do this so deny request if
-		   * cursor is at the end of the field.
-		   */
-		if (((cur->opts & O_STATIC) == O_STATIC) &&
-		    (cur->row_xpos == cur->cols - 1) &&
-		    ((cur->rows + cur->nrows) == 1))
-			return E_REQUEST_DENIED;
-
-		if (((cur->rows + cur->nrows) == 1) &&
-		    (cur->row_xpos + cur->start_char + 1) > row->length)
-			return E_REQUEST_DENIED;
-
-		if ((cur->rows + cur->nrows) == 1) {
-			cur->row_xpos++;
-			_formi_set_cursor_xpos(cur, (c == REQ_RIGHT_CHAR));
-		} else {
-			if (cur->cursor_xpos >= (row->expanded - 1)) {
-				if ((row->next == NULL) ||
-				    (c == REQ_RIGHT_CHAR))
-					return E_REQUEST_DENIED;
-
-				cur->cursor_xpos = 0;
-				cur->row_xpos = 0;
-				cur->cur_line = cur->cur_line->next;
-				if (cur->cursor_ypos == (cur->rows - 1))
-					cur->start_line =
-						cur->start_line->next;
-				else
-					cur->cursor_ypos++;
-			} else {
-				old_xpos = cur->cursor_xpos;
-				old_row_pos = cur->row_xpos;
-				if (row->string[cur->row_xpos] == '\t')
-					cur->cursor_xpos += tab_size(row,
-							cur->row_xpos);
-				else
-					cur->cursor_xpos++;
-				cur->row_xpos++;
-				if (cur->cursor_xpos
-				    >= row->expanded) {
-					if ((row->next == NULL) ||
-					    (c == REQ_RIGHT_CHAR)) {
-						cur->cursor_xpos = old_xpos;
-						cur->row_xpos = old_row_pos;
-						return E_REQUEST_DENIED;
-					}
-
-					cur->cursor_xpos = 0;
-					cur->row_xpos = 0;
-					cur->cur_line = cur->cur_line->next;
-					if (cur->cursor_ypos
-					    == (cur->rows - 1))
-						cur->start_line =
-							cur->start_line->next;
-					else
-						cur->cursor_ypos++;
-				}
-			}
-		}
-
-		break;
-
-	case REQ_LEFT_CHAR:
-		  /*
-		   * The behaviour of left_char is the same as prev_char
-		   * except that the cursor will not wrap if it has
-		   * reached the LHS of the field, so just check this
-		   * and fall through if we are not at the LHS.
-		   */
-		if (cur->cursor_xpos == 0)
-			return E_REQUEST_DENIED;
-
-		  /* FALLTHRU */
-	case REQ_PREV_CHAR:
-		if ((cur->rows + cur->nrows) == 1) {
-			if (cur->row_xpos == 0) {
-				if (cur->start_char > 0)
-					cur->start_char--;
-				else
-					return E_REQUEST_DENIED;
-			} else {
-				cur->row_xpos--;
-				_formi_set_cursor_xpos(cur, FALSE);
-			}
-		} else {
-			if ((cur->cursor_xpos == 0) &&
-			    (cur->cursor_ypos == 0) &&
-			    (cur->start_line->prev == NULL))
-				return E_REQUEST_DENIED;
-
-			pos = cur->row_xpos;
-			if (cur->cursor_xpos > 0) {
-				if (row->string[pos] == '\t') {
-					size = tab_size(row, pos);
-					if (size > cur->cursor_xpos) {
-						cur->cursor_xpos = 0;
-						cur->row_xpos = 0;
-					} else {
-						cur->row_xpos--;
-						cur->cursor_xpos -= size;
-					}
-				} else {
-					cur->cursor_xpos--;
-					cur->row_xpos--;
-				}
-			} else {
-				cur->cur_line = cur->cur_line->prev;
-				if (cur->cursor_ypos > 0)
-					cur->cursor_ypos--;
-				else
-					cur->start_line =
-						cur->start_line->prev;
-				row = cur->cur_line;
-				if (row->expanded > 0) {
-					cur->cursor_xpos = row->expanded - 1;
-				} else {
-					cur->cursor_xpos = 0;
-				}
-
-				if (row->length > 0)
-					cur->row_xpos = row->length - 1;
-				else
-					cur->row_xpos = 0;
-			}
-		}
-
-		break;
-
-	case REQ_DOWN_CHAR:
-		  /*
-		   * The down_char request has the same functionality as
-		   * the next_line request excepting that the field is not
-		   * scrolled if the cursor is at the bottom of the field.
-		   * Check to see if the cursor is at the bottom of the field
-		   * and if it is then deny the request otherwise fall
-		   * through to the next_line handler.
-		   */
-		if (cur->cursor_ypos >= cur->rows - 1)
-			return E_REQUEST_DENIED;
-
-		  /* FALLTHRU */
-
-	case REQ_NEXT_LINE:
-		if ((row->next == NULL) || (cur->cur_line->next == NULL))
-			return E_REQUEST_DENIED;
-
-		cur->cur_line = cur->cur_line->next;
-		if ((cur->cursor_ypos + 1) >= cur->rows) {
-			cur->start_line = cur->start_line->next;
-		} else
-			cur->cursor_ypos++;
-		row = cur->cur_line;
-
-		if (row->length == 0) {
-			cur->row_xpos = 0;
-			cur->cursor_xpos = 0;
-		} else {
-			if (cur->cursor_xpos > (row->expanded - 1))
-				cur->cursor_xpos = row->expanded - 1;
-
-			cur->row_xpos =	tab_fit_len(row, cur->cursor_xpos + 1);
-			if (cur->row_xpos == 0)
-				cur->cursor_xpos = 0;
-			else
-				cur->cursor_xpos =
-					_formi_tab_expanded_length(
-						row->string, 0, cur->row_xpos);
-			if (cur->cursor_xpos > 0)
-				cur->cursor_xpos--;
-		}
-		break;
-
-	case REQ_UP_CHAR:
-		  /*
-		   * The up_char request has the same functionality as
-		   * the prev_line request excepting the field is not
-		   * scrolled, check if the cursor is at the top of the
-		   * field, if it is deny the request otherwise fall
-		   * through to the prev_line handler.
-		   */
-		if (cur->cursor_ypos == 0)
-			return E_REQUEST_DENIED;
-
-		  /* FALLTHRU */
-
-	case REQ_PREV_LINE:
-		if (cur->cur_line->prev == NULL)
-			return E_REQUEST_DENIED;
-
-		if (cur->cursor_ypos == 0) {
-			if (cur->start_line->prev == NULL)
-				return E_REQUEST_DENIED;
-			cur->start_line = cur->start_line->prev;
-		} else
-			cur->cursor_ypos--;
-
-		cur->cur_line = cur->cur_line->prev;
-		row = cur->cur_line;
-
-		if (row->length == 0) {
-			cur->row_xpos = 0;
-			cur->cursor_xpos = 0;
-		} else {
-			if (cur->cursor_xpos > (row->expanded - 1))
-				cur->cursor_xpos = row->expanded - 1;
-
-			cur->row_xpos =	tab_fit_len(row, cur->cursor_xpos + 1);
-			cur->cursor_xpos =
-				_formi_tab_expanded_length(row->string,
-							   0, cur->row_xpos);
-			if (cur->cursor_xpos > 0)
-				cur->cursor_xpos--;
-		}
-		break;
-
-	case REQ_NEXT_WORD:
-		start = cur->row_xpos + cur->start_char;
-		str = row->string;
-
-		wb = find_eow(cur, start, FALSE, &row);
-		if (wb < 0)
-			return wb;
-
-		start = wb;
-		  /* check if we hit the end */
-		if (str[start] == '\0')
-			return E_REQUEST_DENIED;
-
-		  /* otherwise we must have found the start of a word...*/
-		if ((cur->rows + cur->nrows) == 1) {
-			  /* single line field */
-			size = _formi_tab_expanded_length(str,
-				cur->start_char, start);
-			if (size < cur->cols) {
-				cur->row_xpos = start - cur->start_char;
-			} else {
-				cur->start_char = start;
-				cur->row_xpos = 0;
-			}
-			_formi_set_cursor_xpos(cur, FALSE);
-		} else {
-			  /* multiline field */
-			cur->cur_line = row;
-			adjust_ypos(cur, row);
-
-			cur->row_xpos = start;
-			cur->cursor_xpos =
-				_formi_tab_expanded_length(
-					row->string, 0, cur->row_xpos) - 1;
-		}
-		break;
-		
-	case REQ_PREV_WORD:
-		start = cur->start_char + cur->row_xpos;
-		if (cur->start_char > 0)
-			start--;
-
-		if ((start == 0) && (row->prev == NULL))
-			return E_REQUEST_DENIED;
-
-		if (start == 0) {
-			row = row->prev;
-			if (row->length > 0)
-				start = row->length - 1;
-			else
-				start = 0;
-		}
-
-		str = row->string;
-
-		start = find_sow(start, &row);
-		
-		if ((cur->rows + cur->nrows) == 1) {
-			  /* single line field */
-			size = _formi_tab_expanded_length(str,
-				cur->start_char, start);
-			
-			if (start > cur->start_char) {
-				cur->row_xpos = start - cur->start_char;
-			} else {
-				cur->start_char = start;
-				cur->row_xpos = 0;
-			}
-			_formi_set_cursor_xpos(cur, FALSE);
-		} else {
-			  /* multiline field */
-			cur->cur_line = row;
-			adjust_ypos(cur, row);
-			cur->row_xpos = start;
-			cur->cursor_xpos =
-				_formi_tab_expanded_length(
-					row->string, 0,
-					cur->row_xpos) - 1;
-		}
-		
-		break;
-
-	case REQ_BEG_FIELD:
-		cur->start_char = 0;
-		while (cur->start_line->prev != NULL)
-			cur->start_line = cur->start_line->prev;
-		cur->cur_line = cur->start_line;
-		cur->row_xpos = 0;
-		_formi_init_field_xpos(cur);
-		cur->cursor_ypos = 0;
-		break;
-		
-	case REQ_BEG_LINE:
-		cur->row_xpos = 0;
-		_formi_init_field_xpos(cur);
-		cur->start_char = 0;
-		break;
-			
-	case REQ_END_FIELD:
-		while (cur->cur_line->next != NULL)
-			cur->cur_line = cur->cur_line->next;
-		
-		if (cur->row_count > cur->rows) {
-			cur->start_line = cur->cur_line;
-			pos = cur->rows - 1;
-			while (pos > 0) {
-				cur->start_line = cur->start_line->prev;
-				pos--;
-			}
-			cur->cursor_ypos = cur->rows - 1;
-		} else {
-			cur->cursor_ypos = cur->row_count - 1;
-		}
-
-		  /* we fall through here deliberately, we are on the
-		   * correct row, now we need to get to the end of the
-		   * line.
-		   */
-		  /* FALLTHRU */
-		
-	case REQ_END_LINE:
-		row = cur->cur_line;
-
-		if ((cur->rows + cur->nrows) == 1) {
-			if (row->expanded > cur->cols - 1) {
-				if ((cur->opts & O_STATIC) != O_STATIC) {
-					cur->start_char = tab_fit_window(
-						cur, row->length,
-						cur->cols) + 1;
-					cur->row_xpos = row->length
-						- cur->start_char;
-				} else {
-					cur->start_char = 0;
-					cur->row_xpos = cur->cols - 1;
-				}
-			} else {
-				cur->row_xpos = row->length + 1;
-				cur->start_char = 0;
-			}
-			_formi_set_cursor_xpos(cur, FALSE);
-		} else {
-			cur->row_xpos = row->length - 1;
-			cur->cursor_xpos = row->expanded - 1;
-			if (row->next == NULL) {
-				cur->row_xpos++;
-				cur->cursor_xpos++;
-			}
-		}
-		break;
-		
-	case REQ_NEW_LINE:
-		start = cur->start_char	+ cur->row_xpos;
-		if ((status = split_line(cur, TRUE, start, &row)) != E_OK)
-			return status;
-		cur->cur_line->hard_ret = TRUE;
-		cur->cursor_xpos = 0;
-		cur->row_xpos = 0;
-		break;
-		
-	case REQ_INS_CHAR:
-		if ((status = _formi_add_char(cur, cur->start_char
-					      + cur->row_xpos,
-					      cur->pad)) != E_OK)
-			return status;
-		break;
-		
-	case REQ_INS_LINE:
-		if ((status = split_line(cur, TRUE, 0, &row)) != E_OK)
-			return status;
-		cur->cur_line->hard_ret = TRUE;
-		break;
-		
-	case REQ_DEL_CHAR:
-		row = cur->cur_line;
-		start = cur->start_char + cur->row_xpos;
-		end = row->length - 1;
-		if ((start >= row->length) && (row->next == NULL))
-			return E_REQUEST_DENIED;
-		
-		if ((start == row->length - 1) || (row->length == 0)) {
-			if ((cur->rows + cur->nrows) > 1) {
-				/*
-				 * Firstly, check if the current line has
-				 * a hard return.  In this case we just
-				 * want to "delete" the hard return and
-				 * re-wrap the field.  The hard return
-				 * does not occupy a character space in
-				 * the buffer but we must make it appear
-				 * like it does for a deletion.
-				 */
-				if (row->hard_ret == TRUE) {
-					row->hard_ret = FALSE;
-					if (_formi_join_line(cur, &row,
-							     JOIN_NEXT)
-					    != E_OK) {
-						row->hard_ret = TRUE;
-						return 0;
-					} else {
-						return 1;
-					}
-				}
-					
-				/*
-				 * If we have more than one row, join the
-				 * next row to make things easier unless
-				 * we are at the end of the string, in
-				 * that case the join would fail but we
-				 * really want to delete the last char
-				 * in the field.
-				 */
-				if (row->next != NULL) {
-					if (_formi_join_line(cur, &row,
-							     JOIN_NEXT_NW)
-					    != E_OK) {
-						return E_REQUEST_DENIED;
-					}
-				}
-			}
-		}
-			
-		saved = row->string[start];
-		bcopy(&row->string[start + 1], &row->string[start],
-		      (size_t) (end - start + 1));
-		row->string[end] = '\0';
-		row->length--;
-		if (row->length > 0)
-			row->expanded = _formi_tab_expanded_length(
-				row->string, 0, row->length - 1);
-		else
-			row->expanded = 0;
-
-		  /*
-		   * recalculate tabs for a single line field, multiline
-		   * fields will do this when the field is wrapped.
-		   */
-		if ((cur->rows + cur->nrows) == 1)
-			_formi_calculate_tabs(row);
-		  /*
-		   * if we are at the end of the string then back the
-		   * cursor pos up one to stick on the end of the line
-		   */
-		if (start == row->length) {
-			if (row->length > 1) {
-				if ((cur->rows + cur->nrows) == 1) {
-					pos = cur->row_xpos + cur->start_char;
-					cur->start_char =
-						tab_fit_window(
-							cur,
-							cur->start_char + cur->row_xpos,
-							cur->cols);
-					cur->row_xpos = pos - cur->start_char
-						- 1;
-					_formi_set_cursor_xpos(cur, FALSE);
-				} else {
-					if (cur->row_xpos == 0) {
-						if (row->next != NULL) {
-							if (_formi_join_line(
-								cur, &row,
-								JOIN_PREV_NW)
-							    != E_OK) {
-								return E_REQUEST_DENIED;
-							}
-						} else {
-							if (cur->row_count > 1)
-								cur->row_count--;
-						}
-
-					}
-					
-					cur->row_xpos = start - 1;
-					cur->cursor_xpos =
-						_formi_tab_expanded_length(
-							row->string,
-							0, cur->row_xpos - 1);
-					if ((cur->cursor_xpos > 0)
-					    && (start != (row->expanded - 1)))
-						cur->cursor_xpos--;
-				}
-				
-				start--;
-			} else {
-				start = 0;
-				cur->row_xpos = 0;
-				_formi_init_field_xpos(cur);
-			}
-		}
-		
-		if ((cur->rows + cur->nrows) > 1) {
-			if (_formi_wrap_field(cur, row) != E_OK) {
-				bcopy(&row->string[start],
-				      &row->string[start + 1],
-				      (size_t) (end - start));
-				row->length++;
-				row->string[start] = saved;
-				_formi_wrap_field(cur, row);
-				return E_REQUEST_DENIED;
-			}
-		}
-		break;
-			
-	case REQ_DEL_PREV:
-		if ((cur->cursor_xpos == 0) && (cur->start_char == 0)
-		    && (cur->start_line->prev == NULL)
-		    && (cur->cursor_ypos == 0))
-			   return E_REQUEST_DENIED;
-
-		row = cur->cur_line;
-		start = cur->row_xpos + cur->start_char;
-		end = row->length - 1;
-		eat_char = TRUE;
-
-		if ((cur->start_char + cur->row_xpos) == 0) {
-			if (row->prev == NULL)
-				return E_REQUEST_DENIED;
-
-			  /*
-			   * If we are a multiline field then check if
-			   * the line above has a hard return.  If it does
-			   * then just "eat" the hard return and re-wrap
-			   * the field.
-			   */
-			if (row->prev->hard_ret == TRUE) {
-				row->prev->hard_ret = FALSE;
-				if (_formi_join_line(cur, &row,
-						     JOIN_PREV) != E_OK) {
-					row->prev->hard_ret = TRUE;
-					return 0;
-				}
-
-				eat_char = FALSE;
-			} else {
-				start = row->prev->length;
-				  /*
-				   * Join this line to the previous
-				   * one.
-				   */
-				if (_formi_join_line(cur, &row,
-						     JOIN_PREV_NW) != E_OK) {
-					return 0;
-				}
-				end = row->length - 1;
-			}
-		}
-
-		if (eat_char == TRUE) {
-			  /*
-			   * eat a char from the buffer.  Normally we do
-			   * this unless we have deleted a "hard return"
-			   * in which case we just want to join the lines
-			   * without losing a char.
-			   */
-			saved = row->string[start - 1];
-			bcopy(&row->string[start], &row->string[start - 1],
-			      (size_t) (end - start + 1));
-			row->length--;
-			row->string[row->length] = '\0';
-			row->expanded = _formi_tab_expanded_length(
-				row->string, 0, row->length - 1);
-		}
-
-		if ((cur->rows + cur->nrows) == 1) {
-			_formi_calculate_tabs(row);
-			pos = cur->row_xpos + cur->start_char;
-			if (pos > 0)
-				pos--;
-			cur->start_char =
-				tab_fit_window(cur,
-					       cur->start_char + cur->row_xpos,
-					       cur->cols);
-			cur->row_xpos = pos - cur->start_char;
-			_formi_set_cursor_xpos(cur, FALSE);
-		} else {
-			if (eat_char == TRUE) {
-				cur->row_xpos--;
-				if (cur->row_xpos > 0)
-					cur->cursor_xpos =
-						_formi_tab_expanded_length(
-							row->string, 0,
-							cur->row_xpos - 1);
-				else
-					cur->cursor_xpos = 0;
-			}
-			
-			if ((_formi_wrap_field(cur, row) != E_OK)) {
-				bcopy(&row->string[start - 1],
-				      &row->string[start],
-				      (size_t) (end - start));
-				row->length++;
-				row->string[start - 1] = saved;
-				row->string[row->length] = '\0';
-				_formi_wrap_field(cur, row);
-				return E_REQUEST_DENIED;
-			}
-		}
-		break;
-			
-	case REQ_DEL_LINE:
-		if (((cur->rows + cur->nrows) == 1) ||
-		    (cur->row_count == 1)) {
-			  /* single line case */
-			row->length = 0;
-			row->expanded = row->length = 0;
-			cur->row_xpos = 0;
-			_formi_init_field_xpos(cur);
-			cur->cursor_ypos = 0;
-		} else {
-			  /* multiline field */
-			old_count = cur->row_count;
-			cur->row_count--;
-			if (cur->row_count == 0)
-				cur->row_count = 1;
-
-			if (old_count == 1) {
-				row->expanded = row->length = 0;
-				cur->cursor_xpos = 0;
-				cur->row_xpos = 0;
-				cur->cursor_ypos = 0;
-			} else
-				add_to_free(cur, row);
-			
-			if (row->next == NULL) {
-				if (cur->cursor_ypos == 0) {
-					if (cur->start_line->prev != NULL) {
-						cur->start_line =
-							cur->start_line->prev;
-					}
-				} else {
-					cur->cursor_ypos--;
-				}
-			}
-
-			if (old_count > 1) {
-				if (cur->cursor_xpos > row->expanded) {
-					cur->cursor_xpos = row->expanded - 1;
-					cur->row_xpos = row->length - 1;
-				}
-
-				cur->start_line = cur->alines;
-				rs = cur->start_line;
-				cur->cursor_ypos = 0;
-				while (rs != row) {
-					if (cur->cursor_ypos < cur->rows)
-						cur->cursor_ypos++;
-					else
-						cur->start_line =
-							cur->start_line->next;
-					rs = rs->next;
-				}
-			} 
-		}
-		break;
-
-	case REQ_DEL_WORD:
-		start = cur->start_char + cur->row_xpos;
-		str = row->string;
-
-		wb = find_eow(cur, start, TRUE, &row);
-		if (wb < 0)
-			return wb;
-
-		end = wb;
-
-		  /*
-		   * If not at the start of a word then find the start,
-		   * we cannot blindly call find_sow because this will
-		   * skip back a word if we are already at the start of
-		   * a word.
-		   */
-		if ((start > 0)
-		    && !(isblank((unsigned char)str[start - 1]) &&
-			!isblank((unsigned char)str[start])))
-			start = find_sow(start, &row);
-		str = row->string;
-		  /* XXXX hmmmm what if start and end on diff rows? XXXX */
-		bcopy(&str[end], &str[start],
-		      (size_t) (row->length - end + 1));
-		len = end - start;
-		row->length -= len;
-
-		if ((cur->rows + cur->nrows) > 1) {
-			row = cur->start_line + cur->cursor_ypos;
-			if (row->next != NULL) {
-				/*
-				 * if not on the last row we need to
-				 * join on the next row so the line
-				 * will be re-wrapped.
-				 */
-				_formi_join_line(cur, &row, JOIN_NEXT_NW);
-			}
-			_formi_wrap_field(cur, row);
-			cur->row_xpos = start;
-			cur->cursor_xpos = _formi_tab_expanded_length(
-				row->string, 0, cur->row_xpos);
-			if (cur->cursor_xpos > 0)
-				cur->cursor_xpos--;
-		} else {
-			_formi_calculate_tabs(row);
-			cur->row_xpos = start - cur->start_char;
-			if (cur->row_xpos > 0)
-				cur->row_xpos--;
-			_formi_set_cursor_xpos(cur, FALSE);
-		}
-		break;
-		
-	case REQ_CLR_EOL:
-		row->string[cur->row_xpos + 1] = '\0';
-		row->length = cur->row_xpos + 1;
-		row->expanded = cur->cursor_xpos + 1;
-		break;
-
-	case REQ_CLR_EOF:
-		row = cur->cur_line->next;
-		while (row != NULL) {
-			rs = row->next;
-			add_to_free(cur, row);
-			row = rs;
-			cur->row_count--;
-		}
-		break;
-		
-	case REQ_CLR_FIELD:
-		row = cur->alines->next;
-		cur->cur_line = cur->alines;
-		cur->start_line = cur->alines;
-		
-		while (row != NULL) {
-			rs = row->next;
-			add_to_free(cur, row);
-			row = rs;
-		}
-
-		cur->alines->string[0] = '\0';
-		cur->alines->length = 0;
-		cur->alines->expanded = 0;
-		cur->row_count = 1;
-		cur->cursor_ypos = 0;
-		cur->row_xpos = 0;
-		_formi_init_field_xpos(cur);
-		cur->start_char = 0;
-		break;
-		
-	case REQ_OVL_MODE:
-		cur->overlay = 1;
-		break;
-		
-	case REQ_INS_MODE:
-		cur->overlay = 0;
-		break;
-		
-	case REQ_SCR_FLINE:
-		_formi_scroll_fwd(cur, 1);
-		break;
-		
-	case REQ_SCR_BLINE:
-		_formi_scroll_back(cur, 1);
-		break;
-		
-	case REQ_SCR_FPAGE:
-		_formi_scroll_fwd(cur, cur->rows);
-		break;
-		
-	case REQ_SCR_BPAGE:
-		_formi_scroll_back(cur, cur->rows);
-		break;
-		
-	case REQ_SCR_FHPAGE:
-		_formi_scroll_fwd(cur, cur->rows / 2);
-		break;
-		
-	case REQ_SCR_BHPAGE:
-		_formi_scroll_back(cur, cur->rows / 2);
-		break;
-		
-	case REQ_SCR_FCHAR:
-		_formi_hscroll_fwd(cur, row, 1);
-		break;
-		
-	case REQ_SCR_BCHAR:
-		_formi_hscroll_back(cur, row, 1);
-		break;
-		
-	case REQ_SCR_HFLINE:
-		_formi_hscroll_fwd(cur, row, cur->cols);
-		break;
-		
-	case REQ_SCR_HBLINE:
-		_formi_hscroll_back(cur, row, cur->cols);
-		break;
-		
-	case REQ_SCR_HFHALF:
-		_formi_hscroll_fwd(cur, row, cur->cols / 2);
-		break;
-		
-	case REQ_SCR_HBHALF:
-		_formi_hscroll_back(cur, row, cur->cols / 2);
-		break;
-
-	default:
-		return 0;
-	}
-	
-#ifdef DEBUG
-	fprintf(dbg,
-	 "exit: cursor_xpos=%d, row_xpos=%d, start_char=%d, length=%d, allocated=%d\n",
-		cur->cursor_xpos, cur->row_xpos, cur->start_char,
-		cur->cur_line->length,	cur->cur_line->allocated);
-	fprintf(dbg, "exit: start_line=%p, ypos=%d\n", cur->start_line,
-		cur->cursor_ypos);
-	fprintf(dbg, "exit: string=\"%s\"\n", cur->cur_line->string);
-	assert ((cur->cursor_xpos < INT_MAX) && (cur->row_xpos < INT_MAX)
-		&& (cur->cursor_xpos >= cur->row_xpos));
-#endif
-	return 1;
-}
-
-/*
- * Validate the given character by passing it to any type character
- * checking routines, if they exist.
- */
-int
-_formi_validate_char(FIELD *field, char c)
-{
-	int ret_val;
-	
-	if (field->type == NULL)
-		return E_OK;
-
-	ret_val = E_INVALID_FIELD;
-	_formi_do_char_validation(field, field->type, c, &ret_val);
-
-	return ret_val;
-}
-
-		
-/*
- * Perform the validation of the character, invoke all field_type validation
- * routines.  If the field is ok then update ret_val to E_OK otherwise
- * ret_val is not changed.
- */
-static void
-_formi_do_char_validation(FIELD *field, FIELDTYPE *type, char c, int *ret_val)
-{
-	if ((type->flags & _TYPE_IS_LINKED) == _TYPE_IS_LINKED) {
-		_formi_do_char_validation(field, type->link->next, c, ret_val);
-		_formi_do_char_validation(field, type->link->prev, c, ret_val);
-	} else {
-		if (type->char_check == NULL)
-			*ret_val = E_OK;
-		else {
-			if (type->char_check((int)(unsigned char) c,
-					     field->args) == TRUE)
-				*ret_val = E_OK;
-		}
-	}
-}
-
-/*
- * Validate the current field.  If the field validation returns success then
- * return E_OK otherwise return E_INVALID_FIELD.
- *
- */
-int
-_formi_validate_field(FORM *form)
-{
-	FIELD *cur;
-	int ret_val, count;
-	
-
-	if ((form == NULL) || (form->fields == NULL) ||
-	    (form->fields[0] == NULL))
-		return E_INVALID_FIELD;
-
-	cur = form->fields[form->cur_field];
-
-	  /*
-	   * Sync the buffer if it has been modified so the field
-	   * validation routines can use it and because this is
-	   * the correct behaviour according to AT&T implementation.
-	   */
-	if ((cur->buf0_status == TRUE)
-	    && ((ret_val = _formi_sync_buffer(cur)) != E_OK))
-			return ret_val;
-
-	  /*
-	   * If buffer is untouched then the string pointer may be
-	   * NULL, see if this is ok or not.
-	   */
-	if (cur->buffers[0].string == NULL) {
-		if ((cur->opts & O_NULLOK) == O_NULLOK)
-			return E_OK;
-		else
-			return E_INVALID_FIELD;
-	}
-	
-	count = _formi_skip_blanks(cur->buffers[0].string, 0);
-
-	  /* check if we have a null field, depending on the nullok flag
-	   * this may be acceptable or not....
-	   */
-	if (cur->buffers[0].string[count] == '\0') {
-		if ((cur->opts & O_NULLOK) == O_NULLOK)
-			return E_OK;
-		else
-			return E_INVALID_FIELD;
-	}
-	
-	  /* check if an unmodified field is ok */
-	if (cur->buf0_status == 0) {
-		if ((cur->opts & O_PASSOK) == O_PASSOK)
-			return E_OK;
-		else
-			return E_INVALID_FIELD;
-	}
-
-	  /* if there is no type then just accept the field */
-	if (cur->type == NULL)
-		return E_OK;
-
-	ret_val = E_INVALID_FIELD;
-	_formi_do_validation(cur, cur->type, &ret_val);
-	
-	return ret_val;
-}
-
-/*
- * Perform the validation of the field, invoke all field_type validation
- * routines.  If the field is ok then update ret_val to E_OK otherwise
- * ret_val is not changed.
- */
-static void
-_formi_do_validation(FIELD *field, FIELDTYPE *type, int *ret_val)
-{
-	if ((type->flags & _TYPE_IS_LINKED) == _TYPE_IS_LINKED) {
-		_formi_do_validation(field, type->link->next, ret_val);
-		_formi_do_validation(field, type->link->prev, ret_val);
-	} else {
-		if (type->field_check == NULL)
-			*ret_val = E_OK;
-		else {
-			if (type->field_check(field, field_buffer(field, 0))
-			    == TRUE)
-				*ret_val = E_OK;
-		}
-	}
-}
-
-/*
- * Select the next/previous choice for the field, the driver command
- * selecting the direction will be passed in c.  Return 1 if a choice
- * selection succeeded, 0 otherwise.
- */
-int
-_formi_field_choice(FORM *form, int c)
-{
-	FIELDTYPE *type;
-	FIELD *field;
-	
-	if ((form == NULL) || (form->fields == NULL) ||
-	    (form->fields[0] == NULL) ||
-	    (form->fields[form->cur_field]->type == NULL))
-		return 0;
-	
-	field = form->fields[form->cur_field];
-	type = field->type;
-	
-	switch (c) {
-	case REQ_NEXT_CHOICE:
-		if (type->next_choice == NULL)
-			return 0;
-		else
-			return type->next_choice(field,
-						 field_buffer(field, 0));
-
-	case REQ_PREV_CHOICE:
-		if (type->prev_choice == NULL)
-			return 0;
-		else
-			return type->prev_choice(field,
-						 field_buffer(field, 0));
-
-	default: /* should never happen! */
-		return 0;
-	}
-}
-
-/*
- * Update the fields if they have changed.  The parameter old has the
- * previous current field as the current field may have been updated by
- * the driver.  Return 1 if the form page needs updating.
- *
- */
-int
-_formi_update_field(FORM *form, int old_field)
-{
-	int cur, i;
-
-	cur = form->cur_field;
-	
-	if (old_field != cur) {
-		if (!((cur >= form->page_starts[form->page].first) &&
-		      (cur <= form->page_starts[form->page].last))) {
-			  /* not on same page any more */
-			for (i = 0; i < form->max_page; i++) {
-				if ((form->page_starts[i].in_use == 1) &&
-				    (form->page_starts[i].first <= cur) &&
-				    (form->page_starts[i].last >= cur)) {
-					form->page = i;
-					return 1;
-				}
-			}
-		}
-	}
-
-	_formi_redraw_field(form, old_field);
-	_formi_redraw_field(form, form->cur_field);
-	return 0;
-}
-
-/*
- * Compare function for the field sorting
- *
- */
-static int
-field_sort_compare(const void *one, const void *two)
-{
-	const FIELD *a, *b;
-	int tl;
-	
-	  /* LINTED const castaway; we don't modify these! */	
-	a = (const FIELD *) *((const FIELD **) one);
-	b = (const FIELD *) *((const FIELD **) two);
-
-	if (a == NULL)
-		return 1;
-
-	if (b == NULL)
-		return -1;
-	
-	  /*
-	   * First check the page, we want the fields sorted by page.
-	   *
-	   */
-	if (a->page != b->page)
-		return ((a->page > b->page)? 1 : -1);
-
-	tl = _formi_top_left(a->parent, a->index, b->index);
-
-	  /*
-	   * sort fields left to right, top to bottom so the top left is
-	   * the lesser value....
-	   */
-	return ((tl == a->index)? -1 : 1);
-}
-	
-/*
- * Sort the fields in a form ready for driver traversal.
- */
-void
-_formi_sort_fields(FORM *form)
-{
-	FIELD **sort_area;
-	int i;
-	
-	TAILQ_INIT(&form->sorted_fields);
-
-	if ((sort_area = malloc(sizeof(*sort_area) * form->field_count))
-	    == NULL)
-		return;
-
-	bcopy(form->fields, sort_area,
-	      (size_t) (sizeof(FIELD *) * form->field_count));
-	qsort(sort_area, (size_t) form->field_count, sizeof(FIELD *),
-	      field_sort_compare);
-	
-	for (i = 0; i < form->field_count; i++)
-		TAILQ_INSERT_TAIL(&form->sorted_fields, sort_area[i], glue);
-
-	free(sort_area);
-}
-
-/*
- * Set the neighbours for all the fields in the given form.
- */
-void
-_formi_stitch_fields(FORM *form)
-{
-	int above_row, below_row, end_above, end_below, cur_row, real_end;
-	FIELD *cur, *above, *below;
-
-	  /*
-	   * check if the sorted fields circle queue is empty, just
-	   * return if it is.
-	   */
-	if (TAILQ_EMPTY(&form->sorted_fields))
-		return;
-	
-	  /* initially nothing is above..... */
-	above_row = -1;
-	end_above = TRUE;
-	above = NULL;
-
-	  /* set up the first field as the current... */
-	cur = TAILQ_FIRST(&form->sorted_fields);
-	cur_row = cur->form_row;
-	
-	  /* find the first field on the next row if any */
-	below = TAILQ_NEXT(cur, glue);
-	below_row = -1;
-	end_below = TRUE;
-	real_end = TRUE;
-	while (below != NULL) {
-		if (below->form_row != cur_row) {
-			below_row = below->form_row;
-			end_below = FALSE;
-			real_end = FALSE;
-			break;
-		}
-		below = TAILQ_NEXT(below, glue);
-	}
-
-	  /* walk the sorted fields, setting the neighbour pointers */
-	while (cur != NULL) {
-		if (cur == TAILQ_FIRST(&form->sorted_fields))
-			cur->left = NULL;
-		else
-			cur->left = TAILQ_PREV(cur, _formi_sort_head, glue);
-
-		if (cur == TAILQ_LAST(&form->sorted_fields, _formi_sort_head))
-			cur->right = NULL;
-		else
-			cur->right = TAILQ_NEXT(cur, glue);
-
-		if (end_above == TRUE)
-			cur->up = NULL;
-		else {
-			cur->up = above;
-			above = TAILQ_NEXT(above, glue);
-			if (above_row != above->form_row) {
-				end_above = TRUE;
-				above_row = above->form_row;
-			}
-		}
-
-		if (end_below == TRUE)
-			cur->down = NULL;
-		else {
-			cur->down = below;
-			below = TAILQ_NEXT(below, glue);
-			if (below == NULL) {
-				end_below = TRUE;
-				real_end = TRUE;
-			} else if (below_row != below->form_row) {
-				end_below = TRUE;
-				below_row = below->form_row;
-			}
-		}
-
-		cur = TAILQ_NEXT(cur, glue);
-		if ((cur != NULL)
-		    && (cur_row != cur->form_row)) {
-			cur_row = cur->form_row;
-			if (end_above == FALSE) {
-				for (; above !=
-				    TAILQ_FIRST(&form->sorted_fields);
-				    above = TAILQ_NEXT(above, glue)) {
-					if (above->form_row != above_row) {
-						above_row = above->form_row;
-						break;
-					}
-				}
-			} else if (above == NULL) {
-				above = TAILQ_FIRST(&form->sorted_fields);
-				end_above = FALSE;
-				above_row = above->form_row;
-			} else
-				end_above = FALSE;
-
-			if (end_below == FALSE) {
-				while (below_row == below->form_row) {
-					below = TAILQ_NEXT(below, glue);
-					if (below == NULL) {
-						real_end = TRUE;
-						end_below = TRUE;
-						break;
-					}
-				}
-
-				if (below != NULL)
-					below_row = below->form_row;
-			} else if (real_end == FALSE)
-				end_below = FALSE;
-			
-		}
-	}
-}
-
-/*
- * Calculate the length of the displayed line allowing for any tab
- * characters that need to be expanded.  We assume that the tab stops
- * are 8 characters apart.  The parameters start and end are the
- * character positions in the string str we want to get the length of,
- * the function returns the number of characters from the start
- * position to the end position that should be displayed after any
- * intervening tabs have been expanded.
- */
-int
-_formi_tab_expanded_length(char *str, unsigned int start, unsigned int end)
-{
-	int len, start_len, i;
-
-	  /* if we have a null string then there is no length */
-	if (str[0] == '\0')
-		return 0;
-	
-	len = 0;
-	start_len = 0;
-
-	  /*
-	   * preceding tabs affect the length tabs in the span, so
-	   * we need to calculate the length including the stuff before
-	   * start and then subtract off the unwanted bit.
-	   */
-	for (i = 0; i <= end; i++) {
-		if (i == start) /* stash preamble length for later */
-			start_len = len;
-
-		if (str[i] == '\0')
-			break;
-		
-		if (str[i] == '\t')
-			len = len - (len % 8) + 8;
-		else
-			len++;
-	}
-
-#ifdef DEBUG
-	if (dbg != NULL) {
-		fprintf(dbg,
-		    "tab_expanded: start=%d, end=%d, expanded=%d (diff=%d)\n",
-			start, end, (len - start_len), (end - start));
-	}
-#endif
-	
-	return (len - start_len);
-}
-
-/*
- * Calculate the tab stops on a given line in the field and set up
- * the tabs list with the results.  We do this by scanning the line for tab
- * characters and if one is found, noting the position and the number of
- * characters to get to the next tab stop.  This information is kept to
- * make manipulating the field (scrolling and so on) easier to handle.
- */
-void
-_formi_calculate_tabs(_FORMI_FIELD_LINES *row)
-{
-	_formi_tab_t *ts = row->tabs, *old_ts = NULL, **tsp;
-	int i, j;
-
-	  /*
-	   * If the line already has tabs then invalidate them by
-	   * walking the list and killing the in_use flag.
-	   */
-	for (; ts != NULL; ts = ts->fwd)
-		ts->in_use = FALSE;
-
-
-	  /*
-	   * Now look for tabs in the row and record the info...
-	   */
-	tsp = &row->tabs;
-	for (i = 0, j = 0; i < row->length; i++, j++) {
-		if (row->string[i] == '\t') {
-			if (*tsp == NULL) {
-				if ((*tsp = (_formi_tab_t *)
-				     malloc(sizeof(_formi_tab_t))) == NULL)
-					return;
-				(*tsp)->back = old_ts;
-				(*tsp)->fwd = NULL;
-			}
-			
-			(*tsp)->in_use = TRUE;
-			(*tsp)->pos = i;
-			(*tsp)->size = 8 - (j % 8);
-			j += (*tsp)->size - 1;
-			old_ts = *tsp;
-			tsp = &(*tsp)->fwd;
-		}
-	}
-}
-
-/*
- * Return the size of the tab padding for a tab character at the given
- * position.  Return 1 if there is not a tab char entry matching the
- * given location.
- */
-static int
-tab_size(_FORMI_FIELD_LINES *row, unsigned int i)
-{
-	_formi_tab_t *ts;
-
-	ts = row->tabs;
-	while ((ts != NULL) && (ts->pos != i))
-		ts = ts->fwd;
-
-	if (ts == NULL)
-		return 1;
-	else
-		return ts->size;
-}
-
-/*
- * Find the character offset that corresponds to longest tab expanded
- * string that will fit into the given window.  Walk the string backwards
- * evaluating the sizes of any tabs that are in the string.  Note that
- * using this function on a multi-line window will produce undefined
- * results - it is really only required for a single row field.
- */
-static int
-tab_fit_window(FIELD *field, unsigned int pos, unsigned int window)
-{
-	int scroll_amt, i;
-	_formi_tab_t *ts;
-	
-	  /* first find the last tab */
-	ts = field->alines->tabs;
-
-	  /*
-	   * unless there are no tabs - just return the window size,
-	   * if there is enough room, otherwise 0.
-	   */
-	if (ts == NULL) {
-		if (field->alines->length < window)
-			return 0;
-		else
-			return field->alines->length - window + 1;
-	}
-		
-	while ((ts->fwd != NULL) && (ts->fwd->in_use == TRUE))
-		ts = ts->fwd;
-
-	  /*
-	   * now walk backwards finding the first tab that is to the
-	   * left of our starting pos.
-	   */
-	while ((ts != NULL) && (ts->in_use == TRUE) && (ts->pos > pos))
-		ts = ts->back;
-	
-	scroll_amt = 0;
-	for (i = pos; i >= 0; i--) {
-		if (field->alines->string[i] == '\t') {
-			assert((ts != NULL) && (ts->in_use == TRUE));
-			if (ts->pos == i) {
-				if ((scroll_amt + ts->size) > window) {
-					break;
-				}
-				scroll_amt += ts->size;
-				ts = ts->back;
-			}
-			else
-				assert(ts->pos == i);
-		} else {
-			scroll_amt++;
-			if (scroll_amt > window)
-				break;
-		}
-	}
-
-	return ++i;
-}
-
-/*
- * Return the position of the last character that will fit into the
- * given width after tabs have been expanded for a given row of a given
- * field.
- */
-static unsigned int
-tab_fit_len(_FORMI_FIELD_LINES *row, unsigned int width)
-{
-	unsigned int pos, len, row_pos;
-	_formi_tab_t *ts;
-
-	ts = row->tabs;
-	pos = 0;
-	len = 0;
-	row_pos = 0;
-
-	if (width == 0)
-		return 0;
-
-	while ((len < width) && (pos < row->length)) {
-		if (row->string[pos] == '\t') {
-			assert((ts != NULL) && (ts->in_use == TRUE));
-			if (ts->pos == row_pos) {
-				if ((len + ts->size) > width)
-					break;
-				len += ts->size;
-				ts = ts->fwd;
-			}
-			else
-				assert(ts->pos == row_pos);
-		} else
-			len++;
-		pos++;
-		row_pos++;
-	}
-
-	if (pos > 0)
-		pos--;
-	return pos;
-}
-
-/*
- * Sync the field line structures with the contents of buffer 0 for that
- * field.  We do this by walking all the line structures and concatenating
- * all the strings into one single string in buffer 0.
- */
-int
-_formi_sync_buffer(FIELD *field) 
-{
-	_FORMI_FIELD_LINES *line;
-	char *nstr, *tmp;
-	unsigned length;
-
-	if (field->alines == NULL)
-		return E_BAD_ARGUMENT;
-
-	if (field->alines->string == NULL)
-		return E_BAD_ARGUMENT;
-
-	  /*
-	   * init nstr up front, just in case there are no line contents,
-	   * this could happen if the field just contains hard returns.
-	   */
-	if ((nstr = malloc(sizeof(char))) == NULL)
-		return E_SYSTEM_ERROR;
-	nstr[0] = '\0';
-	
-	line = field->alines;
-	length = 1; /* allow for terminating null */
-	
-	while (line != NULL) {
-		if (line->length != 0) {
-			if ((tmp = realloc(nstr,
-					   (size_t) (length + line->length)))
-			    == NULL) {
-				if (nstr != NULL)
-					free(nstr);
-				return (E_SYSTEM_ERROR);
-			}
-
-			nstr = tmp;
-			strcat(nstr, line->string);
-			length += line->length;
-		}
-
-		line = line->next;
-	}
-
-	if (field->buffers[0].string != NULL)
-		free(field->buffers[0].string);
-	field->buffers[0].allocated = length;
-	field->buffers[0].length = length - 1;
-	field->buffers[0].string = nstr;
-	return E_OK;
-}
-
-		
-			
diff --git a/lib/libform/internals.h b/lib/libform/internals.h
deleted file mode 100644
index 52c8ae427..000000000
--- a/lib/libform/internals.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*	$NetBSD: internals.h,v 1.10 2004/11/24 11:57:09 blymn Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software 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 <stdio.h>
-#include "form.h"
-
-#ifndef FORMI_INTERNALS_H
-#define FORMI_INTERNALS_H 1
-
-#ifdef DEBUG
-extern FILE *dbg;
-#endif
-
-/* direction definitions for _formi_pos_new_field */
-#define _FORMI_BACKWARD 1
-#define _FORMI_FORWARD  2
-
-/* define the default options for a form... */
-#define DEFAULT_FORM_OPTS (O_VISIBLE | O_ACTIVE | O_PUBLIC | O_EDIT | \
-                           O_WRAP | O_BLANK | O_AUTOSKIP | O_NULLOK | \
-                           O_PASSOK | O_STATIC)
-
-/* definitions of the flags for the FIELDTYPE structure */
-#define _TYPE_NO_FLAGS   0
-#define _TYPE_HAS_ARGS   0x01
-#define _TYPE_IS_LINKED  0x02
-#define _TYPE_IS_BUILTIN 0x04
-#define _TYPE_HAS_CHOICE 0x08
-
-typedef struct formi_type_link_struct formi_type_link;
-
-struct formi_type_link_struct
-{
-	FIELDTYPE *next;
-	FIELDTYPE *prev;
-};
-
-
-struct _formi_page_struct
-{
-	int in_use;
-	int first;
-	int last;
-	int top_left;
-	int bottom_right;
-};
-
-struct _formi_tab_stops
-{
-	struct _formi_tab_stops *fwd;
-	struct _formi_tab_stops *back;
-	unsigned char in_use;
-	unsigned pos;
-	unsigned size;
-};
-
-typedef struct _formi_tab_stops _formi_tab_t;
-
-/* lines structure for the field - keeps start and ends and length of the
- * lines in a field.
- */
-struct _formi_field_lines
-{
-	_FORMI_FIELD_LINES *prev;
-	_FORMI_FIELD_LINES *next;
-	unsigned allocated;
-	unsigned length;
-	unsigned expanded;
-	char *string;
-	unsigned char hard_ret; /* line contains hard return */
-	_formi_tab_t *tabs;
-};
-
-
-/* function prototypes */
-unsigned
-_formi_skip_blanks(char *string, unsigned int start);
-int
-_formi_add_char(FIELD *cur, unsigned pos, char c);
-void
-_formi_calculate_tabs(_FORMI_FIELD_LINES *row);
-int
-_formi_draw_page(FORM *form);
-int
-_formi_find_pages(FORM *form);
-int
-_formi_field_choice(FORM *form, int c);
-void
-_formi_init_field_xpos(FIELD *field);
-int
-_formi_manipulate_field(FORM *form, int c);
-int
-_formi_pos_first_field(FORM *form);
-int
-_formi_pos_new_field(FORM *form, unsigned direction, unsigned use_sorted);
-void
-_formi_redraw_field(FORM *form, int field);
-void
-_formi_sort_fields(FORM *form);
-void
-_formi_stitch_fields(FORM *form);
-int
-_formi_tab_expanded_length(char *str, unsigned int start, unsigned int end);
-int
-_formi_update_field(FORM *form, int old_field);
-int
-_formi_validate_char(FIELD *field, char c);
-int
-_formi_validate_field(FORM *form);
-int
-_formi_wrap_field(FIELD *field, _FORMI_FIELD_LINES *pos);
-int
-_formi_sync_buffer(FIELD *field);
-
-#ifdef DEBUG
-int
-_formi_create_dbg_file(void);
-#endif /* DEBUG */
-	
-#endif
-
-
-
diff --git a/lib/libform/post.c b/lib/libform/post.c
deleted file mode 100644
index 7fe4085e3..000000000
--- a/lib/libform/post.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*	$NetBSD: post.c,v 1.9 2003/03/09 00:57:19 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1998-2000 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: post.c,v 1.9 2003/03/09 00:57:19 lukem Exp $");
-
-#include "form.h"
-#include "internals.h"
-
-/*
- * Post the form to the screen.
- */
-int
-post_form(FORM *form)
-{
-	int rows, cols, status;
-	
-	if (form == NULL)
-		return E_BAD_ARGUMENT;
-
-	if (form->posted == 1)
-		return E_POSTED;
-
-	if ((form->fields == NULL) || (form->fields[0] == NULL))
-		return E_NOT_CONNECTED;
-
-	if (form->in_init == 1)
-		return E_BAD_STATE;
-
-	if (scale_form(form, &rows, &cols) != E_OK)
-		return E_SYSTEM_ERROR;
-	
-	if ((form->scrwin != NULL) && ((rows > getmaxy(form->scrwin))
-				       || (cols > getmaxx(form->scrwin)))) {
-		return E_NO_ROOM;
-	}
-
-#ifdef DEBUG
-	if (_formi_create_dbg_file() != E_OK)
-		return E_SYSTEM_ERROR;
-#endif
-	
-	form->in_init = 1;
-	if (form->form_init != NULL)
-		form->form_init(form);
-
-	if (form->field_init != NULL)
-		form->field_init(form);
-	form->in_init = 0;
-
-	_formi_pos_first_field(form);
-	if ((status = _formi_draw_page(form)) != E_OK)
-		return status;
-
-	form->posted = 1;
-	pos_form_cursor(form);
-	
-	return E_OK;
-}
-
-/*
- * Unpost the form from the screen
- */
-int
-unpost_form(FORM *form)
-{
-
-	if (form == NULL)
-		return E_BAD_ARGUMENT;
-
-	if (form->posted != 1)
-		return E_NOT_POSTED;
-
-	if (form->in_init == 1)
-		return E_BAD_STATE;
-
-	form->in_init = 1;
-	if (form->field_term != NULL)
-		form->field_term(form);
-
-	if (form->form_term != NULL)
-		form->form_term(form);
-	form->in_init = 0;
-
-	wclear(form->scrwin);
-
-	form->posted = 0;
-
-	return E_OK;
-}
-
diff --git a/lib/libform/shlib_version b/lib/libform/shlib_version
deleted file mode 100644
index 8890efa58..000000000
--- a/lib/libform/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.17 2009/01/11 03:07:48 christos Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=6
-minor=0
diff --git a/lib/libform/std_header.c b/lib/libform/std_header.c
deleted file mode 100644
index 26ff3e3a7..000000000
--- a/lib/libform/std_header.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*	$NetBSD: std_header.c,v 1.3 2003/03/09 00:57:19 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: std_header.c,v 1.3 2003/03/09 00:57:19 lukem Exp $");
-
diff --git a/lib/libform/type_alnum.c b/lib/libform/type_alnum.c
deleted file mode 100644
index 14bc6546f..000000000
--- a/lib/libform/type_alnum.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*	$NetBSD: type_alnum.c,v 1.10 2004/11/24 11:57:09 blymn Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software 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 <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <ctype.h>
-#include "form.h"
-#include "internals.h"
-
-/*
- * The alpha-numeric type handling.
- */
-
-typedef struct 
-{
-	unsigned width;
-} alnum_args;
-
-/*
- * Create the alnum arguments structure from the given args.  Return NULL
- * if the call fails, otherwise return a pointer to the structure allocated.
- */
-static char *
-create_alnum_args(va_list *args)
-{
-	alnum_args *new;
-
-	new = (alnum_args *) malloc(sizeof(alnum_args));
-
-	if (new != NULL)
-		new->width = va_arg(*args, int);
-
-	return (void *) new;
-}
-
-/*
- * Copy the alnum argument structure.
- */
-static char *
-copy_alnum_args(char *args)
-{
-	alnum_args *new;
-
-	new = (alnum_args *) malloc(sizeof(alnum_args));
-
-	if (new != NULL)
-		new->width = ((alnum_args *) (void *)args)->width;
-
-	return (char *) (void *) new;
-}
-
-/*
- * Free the allocated storage associated with the type arguments.
- */
-static void
-free_alnum_args(char *args)
-{
-	if (args != NULL)
-		free(args);
-}
-
-/*
- * Check the contents of the field buffer are alphanumeric only.
- */
-static int
-alnum_check_field(FIELD *field, char *args)
-{
-	int width, start, cur, end;
-	char *buf, *new;
-
-	width = ((alnum_args *) (void *) field->args)->width;
-	buf = args;
-	start = 0;
-
-	if (buf == NULL)
-		return FALSE;
-	
-	  /* skip leading white space */
-	while ((buf[start] != '\0')
-	       && ((buf[start] == ' ') || (buf[start] == '\t')))
-		start++;
-
-	  /* no good if we have hit the end */
-	if (buf[start] == '\0')
-		return FALSE;
-
-	  /* find the end of the non-whitespace stuff */
-	cur = start;
-	while(isalnum((unsigned char)buf[cur]))
-		cur++;
-
-	  /* no good if it exceeds the width */
-	if ((cur - start) > width)
-		return FALSE;
-
-	end = cur;
-	
-	  /* check there is only trailing whitespace */
-	while ((buf[cur] != '\0')
-	       && ((buf[cur] == ' ') || (buf[cur] == '\t')))
-		cur++;
-
-	  /* no good if we are not at the end of the string */
-	if (buf[cur] != '\0')
-		return FALSE;
-
-	if ((new = (char *) malloc(sizeof(char) * (end - start))) == NULL)
-		return FALSE;
-
-	if ((end - start) >= 1) {
-		strncpy(new, &buf[start], (size_t) (end - start - 1));
-		new[end] = '\0';
-	} else
-		new[0]= '\0';
-		
-	set_field_buffer(field, 0, new);
-	free(new);
-	
-	  /* otherwise all was ok */
-	return TRUE;
-}
-
-/*
- * Check the given character is alpha-numeric, return TRUE if it is.
- */
-static int
-alnum_check_char(/* ARGSUSED1 */ int c, char *args)
-{
-	return (isalnum(c) ? TRUE : FALSE);
-}
-
-static FIELDTYPE builtin_alnum = {
-	_TYPE_HAS_ARGS | _TYPE_IS_BUILTIN,  /* flags */
-	0,                                  /* refcount */
-	NULL,                               /* link */
-	create_alnum_args,                  /* make_args */
-	copy_alnum_args,                    /* copy_args */
-	free_alnum_args,                    /* free_args */
-	alnum_check_field,                  /* field_check */
-	alnum_check_char,                   /* char_check */
-	NULL,                               /* next_choice */
-	NULL                                /* prev_choice */
-};
-
-FIELDTYPE *TYPE_ALNUM = &builtin_alnum;
-
-
diff --git a/lib/libform/type_alpha.c b/lib/libform/type_alpha.c
deleted file mode 100644
index 7f35cc916..000000000
--- a/lib/libform/type_alpha.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*	$NetBSD: type_alpha.c,v 1.11 2004/11/24 11:57:09 blymn Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: type_alpha.c,v 1.11 2004/11/24 11:57:09 blymn Exp $");
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "form.h"
-#include "internals.h"
-
-/*
- * The alpha type handling.
- */
-
-typedef struct 
-{
-	unsigned width;
-} alpha_args;
-
-/*
- * Create the alpha arguments structure from the given args.  Return NULL
- * if the call fails, otherwise return a pointer to the structure allocated.
- */
-static char *
-create_alpha_args(va_list *args)
-{
-	alpha_args *new;
-
-	new = (alpha_args *) malloc(sizeof(alpha_args));
-
-	if (new != NULL)
-		new->width = va_arg(*args, int);
-
-	return (void *) new;
-}
-
-/*
- * Copy the alpha argument structure.
- */
-static char *
-copy_alpha_args(char *args)
-{
-	alpha_args *new;
-
-	new = (alpha_args *) malloc(sizeof(alpha_args));
-
-	if (new != NULL)
-		new->width = ((alpha_args *) (void *) args)->width;
-
-	return (void *) new;
-}
-
-/*
- * Free the allocated storage associated with the type arguments.
- */
-static void
-free_alpha_args(char *args)
-{
-	if (args != NULL)
-		free(args);
-}
-
-/*
- * Check the contents of the field buffer are alphanumeric only.
- */
-static int
-alpha_check_field(FIELD *field, char *args)
-{
-	int width, start, cur, end;
-	char *buf, *new;
-
-	width = ((alpha_args *) (void *) field->args)->width;
-	buf = args;
-	start = 0;
-
-	if (buf == NULL)
-		return FALSE;
-	
-	  /* skip leading white space */
-	while ((buf[start] != '\0')
-	       && ((buf[start] == ' ') || (buf[start] == '\t')))
-		start++;
-
-	  /* no good if we have hit the end */
-	if (buf[start] == '\0')
-		return FALSE;
-
-	  /* find the end of the non-whitespace stuff */
-	cur = start;
-	while(isalpha((unsigned char)buf[cur]))
-		cur++;
-
-	  /* no good if it exceeds the width */
-	if ((cur - start) > width)
-		return FALSE;
-
-	end = cur;
-	
-	  /* check there is only trailing whitespace */
-	while ((buf[cur] != '\0')
-	       && ((buf[cur] == ' ') || (buf[cur] == '\t')))
-		cur++;
-
-	  /* no good if we are not at the end of the string */
-	if (buf[cur] != '\0')
-		return FALSE;
-
-	  /* set buffer 0 to the new string */
-	if ((new = (char *) malloc(sizeof(char) * (end - start))) == NULL)
-		return FALSE;
-
-	if ((end - start) >= 1) {
-		strncpy(new, &buf[start], (size_t) (end - start - 1));
-		new[end] = '\0';
-	} else
-		new[0] = '\0';
-	
-		
-	set_field_buffer(field, 0, new);
-	free(new);
-	
-	  /* otherwise all was ok */
-	return TRUE;
-}
-
-/*
- * Check the given character is alphabetic, return TRUE if it is.
- */
-static int
-alpha_check_char(/* ARGSUSED1 */ int c, char *args)
-{
-	return (isalpha(c) ? TRUE : FALSE);
-}
-
-static FIELDTYPE builtin_alpha = {
-	_TYPE_HAS_ARGS | _TYPE_IS_BUILTIN,  /* flags */
-	0,                                  /* refcount */
-	NULL,                               /* link */
-	create_alpha_args,                  /* make_args */
-	copy_alpha_args,                    /* copy_args */
-	free_alpha_args,                    /* free_args */
-	alpha_check_field,                  /* field_check */
-	alpha_check_char,                   /* char_check */
-	NULL,                               /* next_choice */
-	NULL                                /* prev_choice */
-};
-
-FIELDTYPE *TYPE_ALPHA = &builtin_alpha;
-
-
diff --git a/lib/libform/type_enum.c b/lib/libform/type_enum.c
deleted file mode 100644
index 1f1b5139a..000000000
--- a/lib/libform/type_enum.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/*	$NetBSD: type_enum.c,v 1.11 2010/05/13 17:52:12 tnozaki Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: type_enum.c,v 1.11 2010/05/13 17:52:12 tnozaki Exp $");
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <strings.h>
-#include "form.h"
-#include "internals.h"
-
-/*
- * Prototypes.
- */
-static int
-trim_blanks(char *field);
-
-/*
- * The enum type handling.
- */
-
-typedef struct 
-{
-	char **choices;
-	unsigned num_choices;
-	bool ignore_case;
-	bool exact;
-} enum_args;
-
-/*
- * Find the first non-blank character at the end of a field, return the
- * index of that character.
- */
-static int
-trim_blanks(char *field)
-{
-	int i;
-
-	i = (int) strlen(field);
-	if (i > 0)
-		i--;
-	else
-		return 0;
-	
-	while ((i > 0) && isblank((unsigned char)field[i]))
-		i--;
-	
-	return i;
-}
-
-/*
- * Create the enum arguments structure from the given args.  Return NULL
- * if the call fails, otherwise return a pointer to the structure allocated.
- */
-static char *
-create_enum_args(va_list *args)
-{
-	enum_args *new;
-	char **choices;
-
-	new = (enum_args *) malloc(sizeof(enum_args));
-
-	if (new != NULL) {
-		new->choices = va_arg(*args, char **);
-		new->ignore_case = (va_arg(*args, int)) ? TRUE : FALSE;
-		new->exact = (va_arg(*args, int)) ? TRUE : FALSE;
-
-#ifdef DEBUG
-		if (_formi_create_dbg_file() != E_OK)
-			return NULL;
-		fprintf(dbg,
-			"create_enum_args: ignore_case %d, no_blanks %d\n",
-			new->ignore_case, new->exact);
-#endif
-		
-		  /* count the choices we have */
-		choices = new->choices;
-		new->num_choices = 0;
-		while (*choices != NULL) {
-#ifdef DEBUG
-			fprintf(dbg, "create_enum_args: choice[%d] = \'%s\'\n",
-				new->num_choices,
-				new->choices[new->num_choices]);
-#endif
-			new->num_choices++;
-			choices++;
-		}
-#ifdef DEBUG
-		fprintf(dbg, "create_enum_args: have %d choices\n",
-			new->num_choices);
-#endif
-		
-	}
-
-	return (void *) new;
-}
-
-/*
- * Copy the enum argument structure.
- */
-static char *
-copy_enum_args(char *args)
-{
-	enum_args *new;
-
-	new = (enum_args *) malloc(sizeof(enum_args));
-
-	if (new != NULL)
-		bcopy(args, new, sizeof(enum_args));
-
-	return (void *) new;
-}
-
-/*
- * Free the allocated storage associated with the type arguments.
- */
-static void
-free_enum_args(char *args)
-{
-	if (args != NULL)
-		free(args);
-}
-
-/*
- * Attempt to match the string in this to the choices given.  Returns
- * TRUE if match found otherwise FALSE.
- * 
- */
-static bool
-match_enum(char **choices, unsigned num_choices, bool ignore_case,
-	   bool exact, char *this, unsigned *match_num)
-{
-	unsigned i, start, end, enum_start, blen, elen, enum_end;
-	bool cur_match;
-
-	start = _formi_skip_blanks(this, 0);
-	end = trim_blanks(this);
-
-	if (end >= start)
-		blen = (unsigned) (strlen(&this[start])
-				   - strlen(&this[end]) + 1);
-	else
-		blen = 0;
-
-#ifdef DEBUG
-	fprintf(dbg, "match_enum: start %d, blen %d\n", start, blen);
-#endif
-	for (i = 0; i < num_choices; i++) {
-		enum_start = _formi_skip_blanks(choices[i], 0);
-		enum_end = trim_blanks(choices[i]);
-
-		if (enum_end >= enum_start)
-			elen = (unsigned) (strlen(&choices[i][enum_start])
-				- strlen(&choices[i][enum_end]) + 1);
-		else
-			elen = 0;
-		
-#ifdef DEBUG
-		fprintf(dbg, "match_enum: checking choice \'%s\'\n",
-			choices[i]);
-		fprintf(dbg, "match_enum: enum_start %d, elen %d\n",
-			enum_start, elen);
-#endif
-		
-		  /* don't bother if we are after an exact match
-		   * and the test length is not equal to the enum
-		   * in question - it will never match.
-		   */
-		if ((exact == TRUE) && (blen != elen))
-			continue;
-
-		  /*
-		   * If the test length is longer than the enum
-		   * length then there is no chance of a match
-		   * so we skip.
-		   */
-		if ((exact != TRUE) && (blen > elen))
-			continue;
-		
-		if (ignore_case)
-			cur_match = (strncasecmp(&choices[i][enum_start],
-						 &this[start],
-						 (size_t)blen) == 0) ?
-				TRUE : FALSE;
-		else
-			cur_match = (strncmp(&choices[i][enum_start],
-					     &this[start],
-					     (size_t) blen) == 0) ?
-				TRUE : FALSE;
-
-#ifdef DEBUG
-		fprintf(dbg, "match_enum: curmatch is %s\n",
-			(cur_match == TRUE)? "TRUE" : "FALSE");
-#endif
-		
-		if (cur_match == TRUE) {
-			*match_num = i;
-			return TRUE;
-		}
-
-	}
-
-#ifdef DEBUG
-	fprintf(dbg, "match_enum: no match found\n");
-#endif
-	return FALSE;
-}
-
-/*
- * Check the contents of the field buffer match one of the enum strings only.
- */
-static int
-enum_check_field(FIELD *field, char *args)
-{
-	enum_args *ta;
-	unsigned match_num;
-
-	if (args == NULL)
-		return FALSE;
-	
-	ta = (enum_args *) (void *) field->args;
-	
-	if (match_enum(ta->choices, ta->num_choices, ta->ignore_case,
-		       ta->exact, args, &match_num) == TRUE) {
-#ifdef DEBUG
-		fprintf(dbg, "enum_check_field: We matched, match_num %d\n",
-			match_num);
-		fprintf(dbg, "enum_check_field: buffer is \'%s\'\n",
-			ta->choices[match_num]);
-#endif
-		set_field_buffer(field, 0, ta->choices[match_num]);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/*
- * Get the next enum in the list of choices.
- */
-static int
-next_enum(FIELD *field, char *args)
-{
-	enum_args *ta;
-	unsigned cur_choice;
-
-	if (args == NULL)
-		return FALSE;
-	
-	ta = (enum_args *) (void *) field->args;
-
-#ifdef DEBUG
-	fprintf(dbg, "next_enum: attempt to match \'%s\'\n", args);
-#endif
-
-	if (match_enum(ta->choices, ta->num_choices, ta->ignore_case,
-		       ta->exact, args, &cur_choice) == FALSE) {
-#ifdef DEBUG
-		fprintf(dbg, "next_enum: match failed\n");
-#endif
-		return FALSE;
-	}
-	
-#ifdef DEBUG
-	fprintf(dbg, "next_enum: cur_choice is %d\n", cur_choice);
-#endif
-	
-	cur_choice++;
-	
-	if (cur_choice >= ta->num_choices)
-		cur_choice = 0;
-
-#ifdef DEBUG
-	fprintf(dbg, "next_enum: cur_choice is %d on exit\n",
-		cur_choice);
-#endif
-	
-	set_field_buffer(field, 0, ta->choices[cur_choice]);
-	return TRUE;
-}
-
-/*
- * Get the previous enum in the list of choices.
- */
-static int
-prev_enum(FIELD *field, char *args)
-{
-	enum_args *ta;
-	unsigned cur_choice;
-
-	if (args == NULL)
-		return FALSE;
-	
-	ta = (enum_args *) (void *) field->args;
-	
-#ifdef DEBUG
-	fprintf(dbg, "prev_enum: attempt to match \'%s\'\n", args);
-#endif
-
-	if (match_enum(ta->choices, ta->num_choices, ta->ignore_case,
-		       ta->exact, args, &cur_choice) == FALSE) {
-#ifdef DEBUG
-		fprintf(dbg, "prev_enum: match failed\n");
-#endif
-		return FALSE;
-	}
-
-#ifdef DEBUG
-	fprintf(dbg, "prev_enum: cur_choice is %d\n", cur_choice);
-#endif
-	if (cur_choice == 0)
-		cur_choice = ta->num_choices - 1;
-	else
-		cur_choice--;
-	
-#ifdef DEBUG
-	fprintf(dbg, "prev_enum: cur_choice is %d on exit\n", cur_choice);
-#endif
-
-	set_field_buffer(field, 0, ta->choices[cur_choice]);
-	return TRUE;
-}
-
-
-static FIELDTYPE builtin_enum = {
-	_TYPE_HAS_ARGS | _TYPE_IS_BUILTIN,  /* flags */
-	0,                                  /* refcount */
-	NULL,                               /* link */
-	create_enum_args,                  /* make_args */
-	copy_enum_args,                    /* copy_args */
-	free_enum_args,                    /* free_args */
-	enum_check_field,                  /* field_check */
-	NULL,                              /* char_check */
-	next_enum,                         /* next_choice */
-	prev_enum                          /* prev_choice */
-};
-
-FIELDTYPE *TYPE_ENUM = &builtin_enum;
-
-
diff --git a/lib/libform/type_integer.c b/lib/libform/type_integer.c
deleted file mode 100644
index 64d5be9cd..000000000
--- a/lib/libform/type_integer.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*	$NetBSD: type_integer.c,v 1.8 2004/10/28 21:14:52 dsl Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: type_integer.c,v 1.8 2004/10/28 21:14:52 dsl Exp $");
-
-#include <stdlib.h>
-#include <strings.h>
-#include <ctype.h>
-#include "form.h"
-#include "internals.h"
-
-/*
- * The integer type handling.
- */
-
-typedef struct 
-{
-	unsigned precision;
-	long min;
-	long max;
-} integer_args;
-
-/*
- * Create the integer arguments structure from the given args.  Return NULL
- * if the call fails, otherwise return a pointer to the structure allocated.
- */
-static char *
-create_integer_args(va_list *args)
-{
-	integer_args *new;
-
-	new = (integer_args *) malloc(sizeof(integer_args));
-
-	if (new != NULL) {
-		new->precision = va_arg(*args, unsigned);
-		new->min = va_arg(*args, long);
-		new->max = va_arg(*args, long);
-	}
-
-	return (void *) new;
-}
-
-/*
- * Copy the integer argument structure.
- */
-static char *
-copy_integer_args(char *args)
-{
-	integer_args *new;
-
-	new = (integer_args *) malloc(sizeof(integer_args));
-
-	if (new != NULL)
-		bcopy(args, new, sizeof(integer_args));
-
-	return (void *) new;
-}
-
-/*
- * Free the allocated storage associated with the type arguments.
- */
-static void
-free_integer_args(char *args)
-{
-	if (args != NULL)
-		free(args);
-}
-
-/*
- * Check the contents of the field buffer are digits only.
- */
-static int
-integer_check_field(FIELD *field, char *args)
-{
-	int cur;
-	long number, max, min;
-	int precision;
-	char *buf, *new_buf;
-
-	if (args == NULL)
-		return FALSE;
-	
-	precision = ((integer_args *) (void *) field->args)->precision;
-	min = ((integer_args *) (void *) field->args)->min;
-	max = ((integer_args *) (void *) field->args)->max;
-	
-	buf = args;
-	cur = 0;
-
-	  /* skip leading white space */
-	while ((buf[cur] != '\0')
-	       && ((buf[cur] == ' ') || (buf[cur] == '\t')))
-		cur++;
-
-	  /* no good if we have hit the end */
-	if (buf[cur] == '\0')
-		return FALSE;
-
-	  /* find the end of the digits but allow a leading + or - sign */
-	if ((buf[cur] == '-') || (buf[cur] == '+'))
-		cur++;
-	
-	while(isdigit((unsigned char)buf[cur]))
-		cur++;
-
-	  /* check there is only trailing whitespace */
-	while ((buf[cur] != '\0')
-	       && ((buf[cur] == ' ') || (buf[cur] == '\t')))
-		cur++;
-
-	  /* no good if we are not at the end of the string */
-	if (buf[cur] != '\0')
-		return FALSE;
-
-	  /* convert and range check the number...*/
-	number = atol(buf);
-	if ((min > max) || ((number < min) || (number > max)))
-		return FALSE;
-
-	if (asprintf(&new_buf, "%.*ld", precision, number) < 0)
-		return FALSE;
-
-	  /* re-set the field buffer to be the reformatted numeric */
-	set_field_buffer(field, 0, new_buf);
-
-	free(new_buf);
-	
-	  /* otherwise all was ok */
-	return TRUE;
-}
-
-/*
- * Check the given character is numeric, return TRUE if it is.
- */
-static int
-integer_check_char(/* ARGSUSED1 */ int c, char *args)
-{
-	return ((isdigit(c) || (c == '-') || (c == '+')) ? TRUE : FALSE);
-}
-
-static FIELDTYPE builtin_integer = {
-	_TYPE_HAS_ARGS | _TYPE_IS_BUILTIN,  /* flags */
-	0,                                  /* refcount */
-	NULL,                               /* link */
-	create_integer_args,                  /* make_args */
-	copy_integer_args,                    /* copy_args */
-	free_integer_args,                    /* free_args */
-	integer_check_field,                  /* field_check */
-	integer_check_char,                   /* char_check */
-	NULL,                               /* next_choice */
-	NULL                                /* prev_choice */
-};
-
-FIELDTYPE *TYPE_INTEGER = &builtin_integer;
-
-
diff --git a/lib/libform/type_ipv4.c b/lib/libform/type_ipv4.c
deleted file mode 100644
index da1dd6a28..000000000
--- a/lib/libform/type_ipv4.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*	$NetBSD: type_ipv4.c,v 1.10 2007/01/17 23:24:22 hubertf Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: type_ipv4.c,v 1.10 2007/01/17 23:24:22 hubertf Exp $");
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include "form.h"
-#include "internals.h"
-
-/*
- * The IP v4 address type handling.
- */
-
-/*
- * define the styles of address we can have, they are:
- *    FORMI_DOTTED_QUAD    address of form aaa.bbb.ccc.ddd
- *    FORMI_HEX            address of form 0xaabbccdd
- *    FORMI_CLASSLESS      address of form aaa.bbb.ccc.ddd/ee
- */
-#define FORMI_DOTTED_QUAD  0
-#define FORMI_HEX          1
-#define FORMI_CLASSLESS    2
-
-/*
- * Check the contents of the field buffer are a valid IPv4 address only.
- */
-static int
-ipv4_check_field(FIELD *field, char *args)
-{
-	char *buf, *buf1, *keeper, *p, *slash;
-	unsigned int vals[4], style, start, mask;
-	unsigned long hex_val, working;
-	int i;
-
-	if (args == NULL)
-		return FALSE;
-	
-	if (asprintf(&keeper, "%s", args) < 0)
-		return FALSE;
-
-#ifdef DEBUG
-	fprintf(dbg, "ipv4_check_field: enter with args of %s\n", keeper);
-#endif
-	style = FORMI_DOTTED_QUAD;
-	buf = keeper;
-	hex_val = 0;
-	mask = 0;
-	
-	if ((slash = index(buf, '/')) != NULL)
-		style = FORMI_CLASSLESS;
-	else {
-		start = _formi_skip_blanks(buf, 0);
-		if ((buf[start] != '\0') && (buf[start + 1] != '\0') &&
-		    (buf[start] == '0') && ((buf[start + 1] == 'x') ||
-					    (buf[start + 1] == 'X')))
-			style = FORMI_HEX;
-	}
-
-	switch (style) {
-	case FORMI_CLASSLESS:
-		*slash = '\0';
-		slash++;
-		mask = atoi(slash);
-		if (mask > 32)
-			goto FAIL;
-		  /* FALLTHROUGH */
-		
-	case FORMI_DOTTED_QUAD:
-		for (i = 0; i < 4; i++) {
-			p = strsep(&buf, ".");
-			if ((p == NULL) || (*p == '\0'))
-				goto FAIL;
-			vals[i] = atoi(p);
-			if (vals[i] > 255)
-				goto FAIL;
-		}
-		break;
-
-		
-	case FORMI_HEX:
-		errno = 0;
-		hex_val = strtoul(buf, NULL, 16);
-		if ((hex_val == ULONG_MAX) && (errno == ERANGE))
-			goto FAIL;
-		
-		working = hex_val;
-		for (i = 3; i >= 0; i--) {
-			vals[i] = (unsigned int)(working & 0xffUL);
-			working = working >> 8;
-		}
-		break;
-
-	}
-	
-	free(keeper);
-
-	buf1 = NULL;
-	
-	switch (style) {
-	case FORMI_DOTTED_QUAD:
-		if (asprintf(&buf, "%d.%d.%d.%d", vals[0], vals[1], vals[2],
-			     vals[3]) < 0)
-			return FALSE;
-		if (asprintf(&buf1, "%d.%d.%d.%d", vals[0], vals[1],
-			     vals[2], vals[3]) < 0)
-			return FALSE;
-		break;
-
-	case FORMI_CLASSLESS:
-		if (asprintf(&buf, "%d.%d.%d.%d/%d", vals[0], vals[1],
-			     vals[2], vals[3], mask) < 0)
-			return FALSE;
-		if (asprintf(&buf1, "%d.%d.%d.%d", vals[0], vals[1],
-			     vals[2], vals[3]) < 0)
-			return FALSE;
-		break;
-
-	case FORMI_HEX:
-		if (asprintf(&buf, "0x%.8lx", hex_val) < 0)
-			return FALSE;
-		if (asprintf(&buf1, "%d.%d.%d.%d", vals[0], vals[1],
-			     vals[2], vals[3]) < 0)
-			return FALSE;
-		break;
-	}
-	
-	  /* re-set the field buffer to be the reformatted IPv4 address */
-	set_field_buffer(field, 0, buf);
-
-	  /*
-	   * Set the field buffer 1 to the dotted quad format regardless
-	   * of the input format, only if buffer 1 exists.
-	   */
-	if (field->nbuf > 1)
-		set_field_buffer(field, 1, buf1);
-
-#ifdef DEBUG
-	fprintf(dbg, "ipv4_check_field: buf0 set to %s\n", buf);
-	fprintf(dbg, "ipv4_check_field: buf1 set to %s\n", buf1);
-#endif
-	free(buf);
-	free(buf1);
-	
-	return TRUE;
-
-	  /* bail out point if we got a bad entry */
-  FAIL:
-	free(keeper);
-	return FALSE;
-	
-}
-
-/*
- * Check the given character is numeric, return TRUE if it is.
- */
-static int
-ipv4_check_char(/* ARGSUSED1 */ int c, char *args)
-{
-	return (isxdigit(c) || (c == '.') || (tolower(c) == 'x') ||
-		(c == '/'))? TRUE : FALSE;
-}
-
-static FIELDTYPE builtin_ipv4 = {
-	_TYPE_IS_BUILTIN,                   /* flags */
-	0,                                  /* refcount */
-	NULL,                               /* link */
-	NULL,                               /* make_args */
-	NULL,                               /* copy_args */
-	NULL,                               /* free_args */
-	ipv4_check_field,                   /* field_check */
-	ipv4_check_char,                    /* char_check */
-	NULL,                               /* next_choice */
-	NULL                                /* prev_choice */
-};
-
-FIELDTYPE *TYPE_IPV4 = &builtin_ipv4;
-
-
diff --git a/lib/libform/type_ipv6.c b/lib/libform/type_ipv6.c
deleted file mode 100644
index cb3b0ddcf..000000000
--- a/lib/libform/type_ipv6.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*	$NetBSD: type_ipv6.c,v 1.10 2004/11/24 11:57:09 blymn Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software 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.
- *
- * Many thanks to Jun-ichiro itojun Hagino <itojun@NetBSD.org> for providing
- * the sample code for the check field function, this function is 99.999%
- * his code.
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: type_ipv6.c,v 1.10 2004/11/24 11:57:09 blymn Exp $");
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <ctype.h>
-#include <netdb.h>
-#include <string.h> 
-#include "form.h"
-#include "internals.h"
-
-/*
- * The IP v6 address type handling.
- */
-
-/*
- * Check the contents of the field buffer are a valid Ipv6 address only.
- */
-static int
-ipv6_check_field(FIELD *field, char *args)
-{
-	char cleaned[NI_MAXHOST];
-	struct addrinfo hints, *res;
-	const int niflags = NI_NUMERICHOST;
-
-	if (args == NULL)
-		return FALSE;
-	
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = AF_INET6;
-	hints.ai_socktype = SOCK_DGRAM;	/* dummy */
-	hints.ai_flags = AI_NUMERICHOST;
-
-	if (getaddrinfo(args, "0", &hints, &res) != 0) {
-		  /* no it is not an IPv6 address */
-		return FALSE;
-	}
-	
-	if (res->ai_next) {
-		  /* somehow the address resolved to multiple
-		   *  addresses - strange
-		   */
-		freeaddrinfo(res);
-		return FALSE;
-	}
-
-	if (getnameinfo(res->ai_addr, res->ai_addrlen, cleaned,
-			(socklen_t) sizeof(cleaned), NULL, 0, niflags) != 0) {
-		freeaddrinfo(res);
-		return FALSE;
-	}
-
-	freeaddrinfo(res);
-
-	  /*
-	   * now we are sure host is an IPv6 address literal, and "cleaned"
-	   * has the uniformly-formatted IPv6 address literal.  Re-set the
-	   * field buffer to be the reformatted IPv6 address
-	   */
-	set_field_buffer(field, 0, cleaned);
-
-	return TRUE;		
-}
-
-/*
- * Check the given character is numeric, return TRUE if it is.
- */
-static int
-ipv6_check_char(/* ARGSUSED1 */ int c, char *args)
-{
-	return (isxdigit(c) || (c == '.') || (c == ':')) ? TRUE : FALSE;
-}
-
-static FIELDTYPE builtin_ipv6 = {
-	_TYPE_IS_BUILTIN,                   /* flags */
-	0,                                  /* refcount */
-	NULL,                               /* link */
-	NULL,                               /* make_args */
-	NULL,                               /* copy_args */
-	NULL,                               /* free_args */
-	ipv6_check_field,                   /* field_check */
-	ipv6_check_char,                    /* char_check */
-	NULL,                               /* next_choice */
-	NULL                                /* prev_choice */
-};
-
-FIELDTYPE *TYPE_IPV6 = &builtin_ipv6;
-
-
diff --git a/lib/libform/type_numeric.c b/lib/libform/type_numeric.c
deleted file mode 100644
index 2e2497386..000000000
--- a/lib/libform/type_numeric.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*	$NetBSD: type_numeric.c,v 1.8 2004/10/28 21:14:52 dsl Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: type_numeric.c,v 1.8 2004/10/28 21:14:52 dsl Exp $");
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "form.h"
-#include "internals.h"
-
-/*
- * The numeric type handling.
- */
-
-typedef struct 
-{
-	unsigned precision;
-	double min;
-	double max;
-} numeric_args;
-
-/*
- * Create the numeric arguments structure from the given args.  Return NULL
- * if the call fails, otherwise return a pointer to the structure allocated.
- */
-static char *
-create_numeric_args(va_list *args)
-{
-	numeric_args *new;
-
-	new = (numeric_args *) malloc(sizeof(numeric_args));
-
-	if (new != NULL) {
-		new->precision = va_arg(*args, unsigned);
-		new->min = va_arg(*args, double);
-		new->max = va_arg(*args, double);
-	}
-
-	return (void *) new;
-}
-
-/*
- * Copy the numeric argument structure.
- */
-static char *
-copy_numeric_args(char *args)
-{
-	numeric_args *new;
-
-	new = (numeric_args *) malloc(sizeof(numeric_args));
-
-	if (new != NULL)
-		bcopy(args, new, sizeof(numeric_args));
-
-	return (void *) new;
-}
-
-/*
- * Free the allocated storage associated with the type arguments.
- */
-static void
-free_numeric_args(char *args)
-{
-	if (args != NULL)
-		free(args);
-}
-
-/*
- * Check the contents of the field buffer are numeric only.  A valid
- * number is of the form nnnn[.mmmmm][Ee[+-]ddd]
- */
-static int
-numeric_check_field(FIELD *field, char *args)
-{
-	int cur;
-	double number, max, min;
-	int precision;
-	char *buf, *new_buf;
-
-	if (args == NULL)
-		return FALSE;
-	
-	precision = ((numeric_args *) (void *) field->args)->precision;
-	min = ((numeric_args *) (void *) field->args)->min;
-	max = ((numeric_args *) (void *) field->args)->max;
-	
-	buf = args;
-	cur = 0;
-
-	  /* skip leading white space */
-	while ((buf[cur] != '\0')
-	       && ((buf[cur] == ' ') || (buf[cur] == '\t')))
-		cur++;
-
-	  /* no good if we have hit the end */
-	if (buf[cur] == '\0')
-		return FALSE;
-
-	  /* find the end of the digits but allow a leading + or - sign, and
-	   * a decimal point.
-	   */
-	if ((buf[cur] == '-') || (buf[cur] == '+'))
-		cur++;
-	
-	while(isdigit((unsigned char)buf[cur]))
-		cur++;
-
-	  /* if not at end of string then check for decimal... */
-	if ((buf[cur] != '\0') && (buf[cur] == '.')) {
-		cur++;
-		  /* check for more digits now.... */
-		while(isdigit((unsigned char)buf[cur]))
-			cur++;
-	}
-	
-	  /* check for an exponent */
-	if ((buf[cur] != '\0') &&
-	    ((buf[cur] == 'E') || (buf[cur] == 'e'))) {
-		cur++;
-		if (buf[cur] == '\0')
-			return FALSE;
-			
-		  /* allow a + or a - for exponent */
-		if ((buf[cur] == '+') || (buf[cur] == '-'))
-			cur++;
-
-		if (buf[cur] == '\0')
-			return FALSE;
-			
-		  /* we expect a digit now */
-		if (!isdigit((unsigned char)buf[cur]))
-			return FALSE;
-			
-		  /* skip digits for the final time */
-		while(isdigit((unsigned char)buf[cur]))
-			cur++;
-	}
-			
-	  /* check there is only trailing whitespace */
-	while ((buf[cur] != '\0')
-	       && ((buf[cur] == ' ') || (buf[cur] == '\t')))
-		cur++;
-
-	  /* no good if we are not at the end of the string */
-	if (buf[cur] != '\0')
-		return FALSE;
-
-	  /* convert and range check the number...*/
-	number = atof(buf);
-	if ((min < max) && ((number < min) || (number > max)))
-		return FALSE;
-
-	if (asprintf(&new_buf, "%.*f", precision, number) < 0)
-		return FALSE;
-
-	  /* re-set the field buffer to be the reformatted numeric */
-	set_field_buffer(field, 0, new_buf);
-
-	free(new_buf);
-	
-	  /* otherwise all was ok */
-	return TRUE;
-}
-
-/*
- * Check the given character is numeric, return TRUE if it is.
- */
-static int
-numeric_check_char(/* ARGSUSED1 */ int c, char *args)
-{
-	return ((isdigit(c) || (c == '-') || (c == '+')
-		 || (c == '.') || (c == 'e') || (c == 'E')) ? TRUE : FALSE);
-}
-
-static FIELDTYPE builtin_numeric = {
-	_TYPE_HAS_ARGS | _TYPE_IS_BUILTIN,  /* flags */
-	0,                                  /* refcount */
-	NULL,                               /* link */
-	create_numeric_args,                  /* make_args */
-	copy_numeric_args,                    /* copy_args */
-	free_numeric_args,                    /* free_args */
-	numeric_check_field,                  /* field_check */
-	numeric_check_char,                   /* char_check */
-	NULL,                               /* next_choice */
-	NULL                                /* prev_choice */
-};
-
-FIELDTYPE *TYPE_NUMERIC = &builtin_numeric;
-
-
diff --git a/lib/libform/type_regex.c b/lib/libform/type_regex.c
deleted file mode 100644
index 866f59004..000000000
--- a/lib/libform/type_regex.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*	$NetBSD: type_regex.c,v 1.7 2004/11/24 11:57:09 blymn Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn
- *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
- * All rights reserved.
- *
- * This code has been donated to The NetBSD Foundation by the Author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: type_regex.c,v 1.7 2004/11/24 11:57:09 blymn Exp $");
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <regex.h>
-#include "form.h"
-#include "internals.h"
-
-/*
- * The regex type handling.
- */
-
-typedef struct 
-{
-	regex_t compiled;
-	unsigned references;
-} regex_args;
-
-/*
- * Create the regex arguments structure from the given args.  Return NULL
- * if the call fails, otherwise return a pointer to the structure allocated.
- */
-static char *
-create_regex_args(va_list *args)
-{
-	regex_args *new;
-	char *expression;
-
-	new = (regex_args *) malloc(sizeof(regex_args));
-
-	if (new != NULL) {
-		new->references = 1;
-		expression = va_arg(*args, char *);
-		if ((regcomp(&new->compiled, expression,
-			     (REG_EXTENDED | REG_NOSUB | REG_NEWLINE))) != 0) {
-			free(new);
-			return NULL;
-		}
-	}
-
-	return (void *) new;
-}
-
-/*
- * Copy the regex argument structure.
- */
-static char *
-copy_regex_args(char *args)
-{
-	((regex_args *) (void *) args)->references++;
-	
-	return (void *) args;
-}
-
-/*
- * Free the allocated storage associated with the type arguments.
- */
-static void
-free_regex_args(char *args)
-{
-	if (args != NULL) {
-		((regex_args *) (void *) args)->references--;
-		if (((regex_args *) (void *) args)->references == 0)
-			free(args);
-	}
-}
-
-/*
- * Check the contents of the field buffer match the regex.
- */
-static int
-regex_check_field(FIELD *field, char *args)
-{
-	if ((args != NULL) &&
-	    (regexec(&((regex_args *) (void *) field->args)->compiled,
-		   args, (size_t) 0, NULL, 0) == 0))
-		return TRUE;
-
-	return FALSE;
-}
-
-static FIELDTYPE builtin_regex = {
-	_TYPE_HAS_ARGS | _TYPE_IS_BUILTIN,  /* flags */
-	0,                                  /* refcount */
-	NULL,                               /* link */
-	create_regex_args,                  /* make_args */
-	copy_regex_args,                    /* copy_args */
-	free_regex_args,                    /* free_args */
-	regex_check_field,                  /* field_check */
-	NULL,                               /* char_check */
-	NULL,                               /* next_choice */
-	NULL                                /* prev_choice */
-};
-
-FIELDTYPE *TYPE_REGEXP = &builtin_regex;
-
-
diff --git a/lib/libintl/Makefile b/lib/libintl/Makefile
deleted file mode 100644
index 8f76d9884..000000000
--- a/lib/libintl/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-#	$NetBSD: Makefile,v 1.6 2005/05/14 17:58:56 tshiozak Exp $
-
-.include <bsd.own.mk>
-
-LIB=	intl
-SRCS=	gettext.c textdomain.c gettext_iconv.c gettext_dummy.c strhash.c \
-	sysdep.c plural_parser.c
-INCS=	libintl.h
-INCSDIR=/usr/include
-
-#CFLAGS+=-g
-CPPFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libc
-
-MAN=	gettext.3
-MLINKS=	gettext.3 dgettext.3 gettext.3 dcgettext.3 \
-	gettext.3 ngettext.3 gettext.3 dngettext.3 \
-	gettext.3 dcngettext.3 gettext.3 textdomain.3 \
-	gettext.3 bindtextdomain.3 gettext.3 bind_textdomain_codeset.3
-
-.include <bsd.lib.mk>
diff --git a/lib/libintl/gettext.3 b/lib/libintl/gettext.3
deleted file mode 100644
index 7d059052d..000000000
--- a/lib/libintl/gettext.3
+++ /dev/null
@@ -1,407 +0,0 @@
-.\"	$NetBSD: gettext.3,v 1.12 2009/11/12 00:43:52 joerg Exp $
-.\"
-.\" Copyright (c) 2000 Citrus Project,
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd November 10, 2004
-.Dt GETTEXT 3
-.Os
-.Sh NAME
-.Nm gettext ,
-.Nm dgettext ,
-.Nm ngettext ,
-.Nm dngettext ,
-.Nm textdomain ,
-.Nm bindtextdomain ,
-.Nm bind_textdomain_codeset ,
-.Nm dcgettext ,
-.Nm dcngettext
-.Nd message handling functions
-.Sh LIBRARY
-.Lb libintl
-.Sh SYNOPSIS
-.In libintl.h
-.Ft char *
-.Fn gettext "const char *msgid"
-.Ft char *
-.Fn dgettext "const char *domainname" "const char *msgid"
-.Ft char *
-.Fn ngettext "const char *msgid1" "const char *msgid2" "unsigned long int n"
-.Ft char *
-.Fn dngettext "const char *domainname" "const char *msgid1" "const char *msgid2" "unsigned long int n"
-.Ft char *
-.Fn textdomain "const char *domainname"
-.Ft char *
-.Fn bindtextdomain "const char *domainname" "const char *dirname"
-.Ft char *
-.Fn bind_textdomain_codeset "const char *domainname" "const char *codeset"
-.In libintl.h
-.In locale.h
-.Ft char *
-.Fn dcgettext "const char *domainname" "const char *msgid" "int category"
-.Ft char *
-.Fn dcngettext "const char *domainname" "const char *msgid1" "const char *msgid2" "unsigned long int n" "int category"
-.Sh DESCRIPTION
-The
-.Fn gettext ,
-.Fn dgettext ,
-and
-.Fn dcgettext
-functions attempt to retrieve a
-target string based on the specified
-.Fa msgid
-argument within the context of a
-specific domain and the current locale.
-The length of strings returned by
-.Fn gettext ,
-.Fn dgettext ,
-and
-.Fn dcgettext
-is undetermined until the function is
-called.
-The
-.Fa msgid
-argument is a nul-terminated string.
-.Pp
-The
-.Fn ngettext ,
-.Fn dngettext ,
-and
-.Fn dcngettext
-functions are equivalent to
-.Fn gettext ,
-.Fn dgettext ,
-and
-.Fn dcgettext ,
-respectively, except for the handling of
-plural forms.
-The
-.Fn ngettext ,
-.Fn dngettext ,
-and
-.Fn dcngettext
-functions search for the
-message string using the
-.Fa msgid1
-argument as the key, using the argument
-.Fa n
-to
-determine the plural form.
-If no message catalogs are found,
-.Fa msgid1
-is returned
-if
-.Fa n Li == 1 ,
-otherwise
-.Fa msgid2
-is returned.
-.Pp
-The
-.Dv LANGUAGE
-environment variable is examined first to determine the message
-catalogs to be used.
-The value of the
-.Dv LANGUAGE
-environment variable is a list
-of locale names separated by colon (:) character.
-If the
-.Dv LANGUAGE
-environment
-variable is defined, each locale name is tried in the specified order and if a
-message catalog containing the requested message is found, the message is
-returned.
-If the
-.Dv LANGUAGE
-environment variable is defined but failed to locate
-a message catalog, the
-.Fa msgid
-string will be returned.
-.Pp
-If the
-.Dv LANGUAGE
-environment variable is not defined,
-.Dv LC_ALL ,
-.Dv LC_xxx ,
-and
-.Dv LANG
-environment variables are examined to locate the message catalog,
-following the convention used by the
-.Xr setlocale 3
-function.
-.Pp
-The pathname used to locate the message catalog is
-.Pa dirname/locale/category/domainname.mo ,
-where dirname is the directory specified by
-.Fn bindtextdomain ,
-locale is a locale name determined by the definition of environment variables,
-.Fa category
-is
-.Dv LC_MESSAGES
-if
-.Fn gettext ,
-.Fn ngettext ,
-.Fn dgettext ,
-or
-.Fn dngettext
-is
-called, otherwise
-.Dv LC_xxx
-where the name is the same as the locale category name
-specified by the
-.Fa category
-argument of
-.Fn dcgettext
-or
-.Fn dcngettext .
-.Fa domainname
-is the name of the domain specified by
-.Fn textdomain
-or the
-.Fa domainname
-argument of
-.Fn dgettext ,
-.Fn dngettext ,
-.Fn dcgettext ,
-or
-.Fn dcngettext .
-.Pp
-For
-.Fn gettext
-and
-.Fn ngettext ,
-the domain used is set by the last valid call to
-.Fn textdomain .
-If a valid call to
-.Fn textdomain
-has not been made, the default
-domain (called messages) is used.
-.Pp
-For
-.Fn dgettext ,
-.Fn dngettext ,
-.Fn dcgettext ,
-and
-.Fn dcngettext ,
-the domain used is
-specified by the
-.Fa domainname
-argument.
-The
-.Fa domainname
-argument is equivalent in
-syntax and meaning to the
-.Fa domainname
-argument to
-.Fn textdomain ,
-except that the
-selection of the domain is valid only for the duration of the
-.Fn dgettext ,
-.Fn dngettext ,
-.Fn dcgettext ,
-or
-.Fn dcngettext
-function call.
-.Pp
-The
-.Fn dcgettext
-and
-.Fn dcngettext
-functions require additional argument
-.Fa category
-for retrieving message string for other than
-.Dv LC_MESSAGES
-category.
-Available value for the
-.Fa category
-argument are
-.Dv LC_CTYPE ,
-.Dv LC_COLLATE ,
-.Dv LC_MESSAGES ,
-.Dv LC_MONETARY ,
-.Dv LC_NUMERIC ,
-and
-.Dv LC_TIME .
-The call of
-.Fn dcgettext "domainname" "msgid" "LC_MESSAGES"
-is equivalent to
-.Fn dgettext "domainname" "msgid" .
-Note that
-.Dv LC_ALL
-must not be used.
-.Pp
-The
-.Fn textdomain
-function sets or queries the name of the current domain of the
-active
-.Dv LC_MESSAGES
-locale category.
-The
-.Fa domainname
-argument is a
-nul-terminated string that can contain only the characters allowed in legal
-filenames.
-.Pp
-The
-.Fa domainname
-argument is the unique name of a domain on the system.
-If there
-are multiple versions of the same domain on one system, namespace collisions
-can be avoided by using
-.Fn bindtextdomain .
-If
-.Fn textdomain
-is not called, a
-default domain is selected.
-The setting of domain made by the last valid call
-to
-.Fn textdomain
-remains valid across subsequent calls to
-.Xr setlocale 3 ,
-and
-.Fn gettext .
-.Pp
-The
-.Fa domainname
-argument is applied to the currently active LC_MESSAGES locale.
-.Pp
-The current setting of the domain can be queried without affecting the current
-state of the domain by calling
-.Fn textdomain
-with
-.Fa domainname
-set to the
-.Dv NULL
-pointer.
-Calling
-.Fn textdomain
-with a
-.Fa domainname
-argument of a
-.Dv NULL
-string sets
-the domain to the default domain
-.Pq messages .
-.Pp
-The
-.Fn bindtextdomain
-function binds the path predicate for a message domain
-.Fa domainname
-to the value contained in dirname.
-If
-.Fa domainname
-is a non-empty
-string and has not been bound previously,
-.Fn bindtextdomain
-binds
-.Fa domainname
-with
-.Fa dirname .
-.Pp
-If
-.Fa domainname
-is a non-empty string and has been bound previously,
-.Fn bindtextdomain
-replaces the old binding with dirname.
-The dirname argument
-can be an absolute pathname being resolved when
-.Fn gettext ,
-.Fn ngettext ,
-.Fn dgettext ,
-.Fn dngettext ,
-.Fn dcgettext ,
-or
-.Fn dcngettext
-are called.
-If
-.Fa domainname
-is a
-.Dv NULL
-pointer or an empty string,
-.Fn bindtextdomain
-returns a
-.Dv NULL
-pointer.
-If
-.Fn bindtextdomain
-is not called, implementation-defined default directory is used.
-.Pp
-The
-.Fn bind_textdomain_codeset
-function can be used to specify the output
-.Fa codeset
-for message catalogs for domain
-.Fa domainname .
-The
-.Fa codeset
-argument must
-be a valid codeset name which can be used for the
-.Xr iconv_open 3
-function.
-.Pp
-If the
-.Fa codeset
-argument is the
-.Dv NULL
-pointer,
-.Fn bind_textdomain_codeset
-returns the currently selected
-.Fa codeset
-for the domain with the name
-.Fa domainname .
-It returns a
-.Dv NULL
-pointer if no
-.Fa codeset
-has yet been selected.
-.Pp
-The
-.Fn bind_textdomain_codeset
-function can be used several times.
-If used multiple times, with the same
-.Fa domainname
-argument,
-the later call overrides the
-settings made by the earlier one.
-.Pp
-The
-.Fn bind_textdomain_codeset
-function returns a pointer to a string containing
-the name of the selected
-.Fa codeset .
-.\".Sh "RETURN VALUES"
-.\".Sh EXAMPLES
-.Sh SEE ALSO
-.Xr setlocale 3 ,
-.Xr nls 7
-.\".Sh STANDARDS
-.Sh HISTORY
-The functions are implemented by Citrus project,
-based on the documentations for GNU gettext.
-.Sh BUGS
-.\" The text was ripped off from Annex C of
-.\" .Dq LI18NUX 2000 Globalization Specification Version 1.0 .
-.\" .Pp
-.Fn bind_textdomain_codeset
-does not work at this moment
-.Pq it always fails .
diff --git a/lib/libintl/gettext.c b/lib/libintl/gettext.c
deleted file mode 100644
index 71331fa2b..000000000
--- a/lib/libintl/gettext.c
+++ /dev/null
@@ -1,1054 +0,0 @@
-/*	$NetBSD: gettext.c,v 1.29 2015/05/29 12:26:28 christos Exp $	*/
-
-/*-
- * Copyright (c) 2000, 2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Citrus: xpg4dl/FreeBSD/lib/libintl/gettext.c,v 1.31 2001/09/27 15:18:45 yamt Exp $
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: gettext.c,v 1.29 2015/05/29 12:26:28 christos Exp $");
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/uio.h>
-
-#include <assert.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#if 0
-#include <util.h>
-#endif
-#include <libintl.h>
-#include <locale.h>
-#include "libintl_local.h"
-#include "plural_parser.h"
-#include "pathnames.h"
-
-/* GNU gettext added a hack to add some context to messages. If a message is
- * used in multiple locations, it needs some amount of context to make the
- * translation clear to translators. GNU gettext, rather than modifying the
- * message format, concatenates the context, \004 and the message id.
- */
-#define	MSGCTXT_ID_SEPARATOR	'\004'
-
-static const char *pgettext_impl(const char *, const char *, const char *,
-				const char *, unsigned long int, int);
-static char *concatenate_ctxt_id(const char *, const char *);
-static const char *lookup_category(int);
-static const char *split_locale(const char *);
-static const char *lookup_mofile(char *, size_t, const char *, const char *,
-				 const char *, const char *,
-				 struct domainbinding *);
-static uint32_t flip(uint32_t, uint32_t);
-static int validate(void *, struct mohandle *);
-static int mapit(const char *, struct domainbinding *);
-static int unmapit(struct domainbinding *);
-static const char *lookup_hash(const char *, struct domainbinding *, size_t *);
-static const char *lookup_bsearch(const char *, struct domainbinding *,
-				  size_t *);
-static const char *lookup(const char *, struct domainbinding *, size_t *);
-static const char *get_lang_env(const char *);
-
-/*
- * shortcut functions.  the main implementation resides in dcngettext().
- */
-char *
-gettext(const char *msgid)
-{
-
-	return dcngettext(NULL, msgid, NULL, 1UL, LC_MESSAGES);
-}
-
-char *
-dgettext(const char *domainname, const char *msgid)
-{
-
-	return dcngettext(domainname, msgid, NULL, 1UL, LC_MESSAGES);
-}
-
-char *
-dcgettext(const char *domainname, const char *msgid, int category)
-{
-
-	return dcngettext(domainname, msgid, NULL, 1UL, category);
-}
-
-char *
-ngettext(const char *msgid1, const char *msgid2, unsigned long int n)
-{
-
-	return dcngettext(NULL, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-char *
-dngettext(const char *domainname, const char *msgid1, const char *msgid2,
-	  unsigned long int n)
-{
-
-	return dcngettext(domainname, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-const char *
-pgettext(const char *msgctxt, const char *msgid)
-{
-
-	return pgettext_impl(NULL, msgctxt, msgid, NULL, 1UL, LC_MESSAGES);
-}
-
-const char *
-dpgettext(const char *domainname, const char *msgctxt, const char *msgid)
-{
-
-	return pgettext_impl(domainname, msgctxt, msgid, NULL, 1UL, LC_MESSAGES);
-}
-
-const char *
-dcpgettext(const char *domainname, const char *msgctxt, const char *msgid,
-	int category)
-{
-
-	return pgettext_impl(domainname, msgctxt, msgid, NULL, 1UL, category);
-}
-
-const char *
-npgettext(const char *msgctxt, const char *msgid1, const char *msgid2,
-	unsigned long int n)
-{
-
-	return pgettext_impl(NULL, msgctxt, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-const char *
-dnpgettext(const char *domainname, const char *msgctxt, const char *msgid1,
-	const char *msgid2, unsigned long int n)
-{
-
-	return pgettext_impl(domainname, msgctxt, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-const char *
-dcnpgettext(const char *domainname, const char *msgctxt, const char *msgid1,
-	const char *msgid2, unsigned long int n, int category)
-{
-
-	return pgettext_impl(domainname, msgctxt, msgid1, msgid2, n, category);
-}
-
-static const char *
-pgettext_impl(const char *domainname, const char *msgctxt, const char *msgid1,
-	const char *msgid2, unsigned long int n, int category)
-{
-	char *msgctxt_id;
-	char *translation;
-	char *p;
-
-	if ((msgctxt_id = concatenate_ctxt_id(msgctxt, msgid1)) == NULL)
-		return msgid1;
-
-	translation = dcngettext(domainname, msgctxt_id,
-		msgid2, n, category);
-	free(msgctxt_id);
-
-	p = strchr(translation, '\004');
-	if (p)
-		return p + 1;
-	return translation;
-}
-
-/*
- * dcngettext() -
- * lookup internationalized message on database locale/category/domainname
- * (like ja_JP.eucJP/LC_MESSAGES/domainname).
- * if n equals to 1, internationalized message will be looked up for msgid1.
- * otherwise, message will be looked up for msgid2.
- * if the lookup fails, the function will return msgid1 or msgid2 as is.
- *
- * Even though the return type is "char *", caller should not rewrite the
- * region pointed to by the return value (should be "const char *", but can't
- * change it for compatibility with other implementations).
- *
- * by default (if domainname == NULL), domainname is taken from the value set
- * by textdomain().  usually name of the application (like "ls") is used as
- * domainname.  category is usually LC_MESSAGES.
- *
- * the code reads in *.mo files generated by GNU gettext.  *.mo is a host-
- * endian encoded file.  both endians are supported here, as the files are in
- * /usr/share/locale! (or we should move those files into /usr/libdata)
- */
-
-static char *
-concatenate_ctxt_id(const char *msgctxt, const char *msgid)
-{
-	char *ret;
-
-	if (asprintf(&ret, "%s%c%s", msgctxt, MSGCTXT_ID_SEPARATOR, msgid) == -1)
-		return NULL;
-
-	return ret;
-}
-
-static const char *
-lookup_category(int category)
-{
-
-	switch (category) {
-	case LC_COLLATE:	return "LC_COLLATE";
-	case LC_CTYPE:		return "LC_CTYPE";
-	case LC_MONETARY:	return "LC_MONETARY";
-	case LC_NUMERIC:	return "LC_NUMERIC";
-	case LC_TIME:		return "LC_TIME";
-	case LC_MESSAGES:	return "LC_MESSAGES";
-	}
-	return NULL;
-}
-
-/*
- * XPG syntax: language[_territory[.codeset]][@modifier]
- * XXX boundary check on "result" is lacking
- */
-static const char *
-split_locale(const char *lname)
-{
-	char buf[BUFSIZ], tmp[BUFSIZ];
-	char *l, *t, *c, *m;
-	static char result[BUFSIZ];
-
-	memset(result, 0, sizeof(result));
-
-	if (strlen(lname) + 1 > sizeof(buf)) {
-fail:
-		return lname;
-	}
-
-	strlcpy(buf, lname, sizeof(buf));
-	m = strrchr(buf, '@');
-	if (m)
-		*m++ = '\0';
-	c = strrchr(buf, '.');
-	if (c)
-		*c++ = '\0';
-	t = strrchr(buf, '_');
-	if (t)
-		*t++ = '\0';
-	l = buf;
-	if (strlen(l) == 0)
-		goto fail;
-	if (c && !t)
-		goto fail;
-
-	if (m) {
-		if (t) {
-			if (c) {
-				snprintf(tmp, sizeof(tmp), "%s_%s.%s@%s",
-				    l, t, c, m);
-				strlcat(result, tmp, sizeof(result));
-				strlcat(result, ":", sizeof(result));
-			}
-			snprintf(tmp, sizeof(tmp), "%s_%s@%s", l, t, m);
-			strlcat(result, tmp, sizeof(result));
-			strlcat(result, ":", sizeof(result));
-		}
-		snprintf(tmp, sizeof(tmp), "%s@%s", l, m);
-		strlcat(result, tmp, sizeof(result));
-		strlcat(result, ":", sizeof(result));
-	}
-	if (t) {
-		if (c) {
-			snprintf(tmp, sizeof(tmp), "%s_%s.%s", l, t, c);
-			strlcat(result, tmp, sizeof(result));
-			strlcat(result, ":", sizeof(result));
-		}
-		snprintf(tmp, sizeof(tmp), "%s_%s", l, t);
-		strlcat(result, tmp, sizeof(result));
-		strlcat(result, ":", sizeof(result));
-	}
-	strlcat(result, l, sizeof(result));
-
-	return result;
-}
-
-static const char *
-lookup_mofile(char *buf, size_t len, const char *dir, const char *lpath,
-	      const char *category, const char *domainname,
-	      struct domainbinding *db)
-{
-	struct stat st;
-	char *p, *q;
-	char lpath_tmp[BUFSIZ];
-
-	/*
-	 * LANGUAGE is a colon separated list of locale names.
-	 */
-
-	strlcpy(lpath_tmp, lpath, sizeof(lpath_tmp));
-	q = lpath_tmp;
-	/* CONSTCOND */
-	while (1) {
-		p = strsep(&q, ":");
-		if (!p)
-			break;
-		if (!*p)
-			continue;
-
-		/* don't mess with default locales */
-		if (strcmp(p, "C") == 0 || strcmp(p, "POSIX") == 0)
-			return NULL;
-
-		/* validate pathname */
-		if (strchr(p, '/') || strchr(category, '/'))
-			continue;
-#if 1	/*?*/
-		if (strchr(domainname, '/'))
-			continue;
-#endif
-
-		snprintf(buf, len, "%s/%s/%s/%s.mo", dir, p,
-		    category, domainname);
-		if (stat(buf, &st) < 0)
-			continue;
-		if ((st.st_mode & S_IFMT) != S_IFREG)
-			continue;
-
-		if (mapit(buf, db) == 0)
-			return buf;
-	}
-
-	return NULL;
-}
-
-static uint32_t
-flip(uint32_t v, uint32_t magic)
-{
-
-	if (magic == MO_MAGIC)
-		return v;
-	else if (magic == MO_MAGIC_SWAPPED) {
-		v = ((v >> 24) & 0xff) | ((v >> 8) & 0xff00) |
-		    ((v << 8) & 0xff0000) | ((v << 24) & 0xff000000);
-		return v;
-	} else {
-		abort();
-		/*NOTREACHED*/
-	}
-}
-
-static int
-validate(void *arg, struct mohandle *mohandle)
-{
-	char *p;
-
-	p = (char *)arg;
-	if (p < (char *)mohandle->addr ||
-	    p > (char *)mohandle->addr + mohandle->len)
-		return 0;
-	else
-		return 1;
-}
-
-/*
- * calculate the step value if the hash value is conflicted.
- */
-static __inline uint32_t
-calc_collision_step(uint32_t hashval, uint32_t hashsize)
-{
-	_DIAGASSERT(hashsize>2);
-	return (hashval % (hashsize - 2)) + 1;
-}
-
-/*
- * calculate the next index while conflicting.
- */
-static __inline uint32_t
-calc_next_index(uint32_t curidx, uint32_t hashsize, uint32_t step)
-{
-	return curidx+step - (curidx >= hashsize-step ? hashsize : 0);
-}
-
-static int
-get_sysdep_string_table(struct mosysdepstr_h **table_h, uint32_t *ofstable,
-			uint32_t nstrings, uint32_t magic, char *base)
-{
-	unsigned int i;
-	int j, count;
-	size_t l;
-	struct mosysdepstr *table;
-
-	for (i=0; i<nstrings; i++) {
-		/* get mosysdepstr record */
-		/* LINTED: ignore the alignment problem. */
-		table = (struct mosysdepstr *)(base + flip(ofstable[i], magic));
-		/* count number of segments */
-		count = 0;
-		while (flip(table->segs[count++].ref, magic) != MO_LASTSEG)
-			;
-		/* get table */
-		l = sizeof(struct mosysdepstr_h) +
-		    sizeof(struct mosysdepsegentry_h) * (count-1);
-		table_h[i] = (struct mosysdepstr_h *)malloc(l);
-		if (!table_h[i])
-			return -1;
-		memset(table_h[i], 0, l);
-		table_h[i]->off = (const char *)(base + flip(table->off, magic));
-		for (j=0; j<count; j++) {
-			table_h[i]->segs[j].len =
-			    flip(table->segs[j].len, magic);
-			table_h[i]->segs[j].ref =
-			    flip(table->segs[j].ref, magic);
-		}
-		/* LINTED: ignore the alignment problem. */
-		table = (struct mosysdepstr *)&table->segs[count];
-	}
-	return 0;
-}
-
-static int
-expand_sysdep(struct mohandle *mohandle, struct mosysdepstr_h *str)
-{
-	int i;
-	const char *src;
-	char *dst;
-
-	/* check whether already expanded */
-	if (str->expanded)
-		return 0;
-
-	/* calc total length */
-	str->expanded_len = 1;
-	for (i=0; /*CONSTCOND*/1; i++) {
-		str->expanded_len += str->segs[i].len;
-		if (str->segs[i].ref == MO_LASTSEG)
-			break;
-		str->expanded_len +=
-		    mohandle->mo.mo_sysdep_segs[str->segs[i].ref].len;
-	}
-	/* expand */
-	str->expanded = malloc(str->expanded_len);
-	if (!str->expanded)
-		return -1;
-	src = str->off;
-	dst = str->expanded;
-	for (i=0; /*CONSTCOND*/1; i++) {
-		memcpy(dst, src, str->segs[i].len);
-		src += str->segs[i].len;
-		dst += str->segs[i].len;
-		if (str->segs[i].ref == MO_LASTSEG)
-			break;
-		memcpy(dst, mohandle->mo.mo_sysdep_segs[str->segs[i].ref].str,
-		       mohandle->mo.mo_sysdep_segs[str->segs[i].ref].len);
-		dst += mohandle->mo.mo_sysdep_segs[str->segs[i].ref].len;
-	}
-	*dst = '\0';
-
-	return 0;
-}
-
-static void
-insert_to_hash(uint32_t *htable, uint32_t hsize, const char *str, uint32_t ref)
-{
-	uint32_t hashval, idx, step;
-
-	hashval = __intl_string_hash(str);
-	step = calc_collision_step(hashval, hsize);
-	idx = hashval % hsize;
-
-	while (htable[idx])
-		idx = calc_next_index(idx, hsize, step);
-
-	htable[idx] = ref;
-}
-
-static int
-setup_sysdep_stuffs(struct mo *mo, struct mohandle *mohandle, char *base)
-{
-	uint32_t magic;
-	struct moentry *stable;
-	size_t l;
-	unsigned int i;
-	char *v;
-	uint32_t *ofstable;
-
-	magic = mo->mo_magic;
-
-	mohandle->mo.mo_sysdep_nsegs = flip(mo->mo_sysdep_nsegs, magic);
-	mohandle->mo.mo_sysdep_nstring = flip(mo->mo_sysdep_nstring, magic);
-
-	if (mohandle->mo.mo_sysdep_nstring == 0)
-		return 0;
-
-	/* check hash size */
-	if (mohandle->mo.mo_hsize <= 2 ||
-	    mohandle->mo.mo_hsize <
-	    (mohandle->mo.mo_nstring + mohandle->mo.mo_sysdep_nstring))
-		return -1;
-
-	/* get sysdep segments */
-	l = sizeof(struct mosysdepsegs_h) * mohandle->mo.mo_sysdep_nsegs;
-	mohandle->mo.mo_sysdep_segs = (struct mosysdepsegs_h *)malloc(l);
-	if (!mohandle->mo.mo_sysdep_segs)
-		return -1;
-	/* LINTED: ignore the alignment problem. */
-	stable = (struct moentry *)(base + flip(mo->mo_sysdep_segoff, magic));
-	for (i=0; i<mohandle->mo.mo_sysdep_nsegs; i++) {
-		v = base + flip(stable[i].off, magic);
-		mohandle->mo.mo_sysdep_segs[i].str =
-		    __intl_sysdep_get_string_by_tag(
-			    v,
-			    &mohandle->mo.mo_sysdep_segs[i].len);
-	}
-
-	/* get sysdep string table */
-	mohandle->mo.mo_sysdep_otable =
-	    (struct mosysdepstr_h **)calloc(mohandle->mo.mo_sysdep_nstring,
-					    sizeof(struct mosysdepstr_h *));
-	if (!mohandle->mo.mo_sysdep_otable)
-		return -1;
-	/* LINTED: ignore the alignment problem. */
-	ofstable = (uint32_t *)(base + flip(mo->mo_sysdep_otable, magic));
-	if (get_sysdep_string_table(mohandle->mo.mo_sysdep_otable, ofstable,
-				    mohandle->mo.mo_sysdep_nstring, magic,
-				    base))
-		return -1;
-	mohandle->mo.mo_sysdep_ttable =
-	    (struct mosysdepstr_h **)calloc(mohandle->mo.mo_sysdep_nstring,
-					    sizeof(struct mosysdepstr_h *));
-	if (!mohandle->mo.mo_sysdep_ttable)
-		return -1;
-	/* LINTED: ignore the alignment problem. */
-	ofstable = (uint32_t *)(base + flip(mo->mo_sysdep_ttable, magic));
-	if (get_sysdep_string_table(mohandle->mo.mo_sysdep_ttable, ofstable,
-				    mohandle->mo.mo_sysdep_nstring, magic,
-				    base))
-		return -1;
-
-	/* update hash */
-	for (i=0; i<mohandle->mo.mo_sysdep_nstring; i++) {
-		if (expand_sysdep(mohandle, mohandle->mo.mo_sysdep_otable[i]))
-			return -1;
-		insert_to_hash(mohandle->mo.mo_htable,
-			       mohandle->mo.mo_hsize,
-			       mohandle->mo.mo_sysdep_otable[i]->expanded,
-			       (i+1) | MO_HASH_SYSDEP_MASK);
-	}
-
-	return 0;
-}
-
-int
-mapit(const char *path, struct domainbinding *db)
-{
-	int fd;
-	struct stat st;
-	char *base;
-	uint32_t magic, revision, flags = 0;
-	struct moentry *otable, *ttable;
-	const uint32_t *htable;
-	struct moentry_h *p;
-	struct mo *mo;
-	size_t l, headerlen;
-	unsigned int i;
-	char *v;
-	struct mohandle *mohandle = &db->mohandle;
-
-	if (mohandle->addr && mohandle->addr != MAP_FAILED &&
-	    mohandle->mo.mo_magic)
-		return 0;	/*already opened*/
-
-	unmapit(db);
-
-#if 0
-	if (secure_path(path) != 0)
-		goto fail;
-#endif
-	if (stat(path, &st) < 0)
-		goto fail;
-	if ((st.st_mode & S_IFMT) != S_IFREG || st.st_size > GETTEXT_MMAP_MAX)
-		goto fail;
-	fd = open(path, O_RDONLY);
-	if (fd < 0)
-		goto fail;
-	if (read(fd, &magic, sizeof(magic)) != sizeof(magic) ||
-	    (magic != MO_MAGIC && magic != MO_MAGIC_SWAPPED)) {
-		close(fd);
-		goto fail;
-	}
-	if (read(fd, &revision, sizeof(revision)) != sizeof(revision)) {
-		close(fd);
-		goto fail;
-	}
-	switch (flip(revision, magic)) {
-	case MO_MAKE_REV(0, 0):
-		break;
-	case MO_MAKE_REV(0, 1):
-	case MO_MAKE_REV(1, 1):
-		flags |= MO_F_SYSDEP;
-		break;
-	default:
-		close(fd);
-		goto fail;
-	}
-	mohandle->addr = mmap(NULL, (size_t)st.st_size, PROT_READ,
-	    MAP_FILE | MAP_SHARED, fd, (off_t)0);
-	if (!mohandle->addr || mohandle->addr == MAP_FAILED) {
-		close(fd);
-		goto fail;
-	}
-	close(fd);
-	mohandle->len = (size_t)st.st_size;
-
-	base = mohandle->addr;
-	mo = (struct mo *)mohandle->addr;
-
-	/* flip endian.  do not flip magic number! */
-	mohandle->mo.mo_magic = mo->mo_magic;
-	mohandle->mo.mo_revision = flip(mo->mo_revision, magic);
-	mohandle->mo.mo_nstring = flip(mo->mo_nstring, magic);
-	mohandle->mo.mo_hsize = flip(mo->mo_hsize, magic);
-	mohandle->mo.mo_flags = flags;
-
-	/* validate otable/ttable */
-	/* LINTED: ignore the alignment problem. */
-	otable = (struct moentry *)(base + flip(mo->mo_otable, magic));
-	/* LINTED: ignore the alignment problem. */
-	ttable = (struct moentry *)(base + flip(mo->mo_ttable, magic));
-	if (!validate(otable, mohandle) ||
-	    !validate(&otable[mohandle->mo.mo_nstring], mohandle)) {
-		unmapit(db);
-		goto fail;
-	}
-	if (!validate(ttable, mohandle) ||
-	    !validate(&ttable[mohandle->mo.mo_nstring], mohandle)) {
-		unmapit(db);
-		goto fail;
-	}
-
-	/* allocate [ot]table, and convert to normal pointer representation. */
-	l = sizeof(struct moentry_h) * mohandle->mo.mo_nstring;
-	mohandle->mo.mo_otable = (struct moentry_h *)malloc(l);
-	if (!mohandle->mo.mo_otable) {
-		unmapit(db);
-		goto fail;
-	}
-	mohandle->mo.mo_ttable = (struct moentry_h *)malloc(l);
-	if (!mohandle->mo.mo_ttable) {
-		unmapit(db);
-		goto fail;
-	}
-	p = mohandle->mo.mo_otable;
-	for (i = 0; i < mohandle->mo.mo_nstring; i++) {
-		p[i].len = flip(otable[i].len, magic);
-		p[i].off = base + flip(otable[i].off, magic);
-
-		if (!validate(p[i].off, mohandle) ||
-		    !validate(p[i].off + p[i].len + 1, mohandle)) {
-			unmapit(db);
-			goto fail;
-		}
-	}
-	p = mohandle->mo.mo_ttable;
-	for (i = 0; i < mohandle->mo.mo_nstring; i++) {
-		p[i].len = flip(ttable[i].len, magic);
-		p[i].off = base + flip(ttable[i].off, magic);
-
-		if (!validate(p[i].off, mohandle) ||
-		    !validate(p[i].off + p[i].len + 1, mohandle)) {
-			unmapit(db);
-			goto fail;
-		}
-	}
-	/* allocate htable, and convert it to the host order. */
-	if (mohandle->mo.mo_hsize > 2) {
-		l = sizeof(uint32_t) * mohandle->mo.mo_hsize;
-		mohandle->mo.mo_htable = (uint32_t *)malloc(l);
-		if (!mohandle->mo.mo_htable) {
-			unmapit(db);
-			goto fail;
-		}
-		/* LINTED: ignore the alignment problem. */
-		htable = (const uint32_t *)(base+flip(mo->mo_hoffset, magic));
-		for (i=0; i < mohandle->mo.mo_hsize; i++) {
-			mohandle->mo.mo_htable[i] = flip(htable[i], magic);
-			if (mohandle->mo.mo_htable[i] >=
-			    mohandle->mo.mo_nstring+1) {
-				/* illegal string number. */
-				unmapit(db);
-				goto fail;
-			}
-		}
-	}
-	/* grab MIME-header and charset field */
-	mohandle->mo.mo_header = lookup("", db, &headerlen);
-	if (mohandle->mo.mo_header)
-		v = strstr(mohandle->mo.mo_header, "charset=");
-	else
-		v = NULL;
-	if (v) {
-		mohandle->mo.mo_charset = strdup(v + 8);
-		if (!mohandle->mo.mo_charset)
-			goto fail;
-		v = strchr(mohandle->mo.mo_charset, '\n');
-		if (v)
-			*v = '\0';
-	}
-	if (!mohandle->mo.mo_header ||
-	    _gettext_parse_plural(&mohandle->mo.mo_plural,
-				  &mohandle->mo.mo_nplurals,
-				  mohandle->mo.mo_header, headerlen))
-		mohandle->mo.mo_plural = NULL;
-
-	/*
-	 * XXX check charset, reject it if we are unable to support the charset
-	 * with the current locale.
-	 * for example, if we are using euc-jp locale and we are looking at
-	 * *.mo file encoded by euc-kr (charset=euc-kr), we should reject
-	 * the *.mo file as we cannot support it.
-	 */
-
-	/* system dependent string support */
-	if ((mohandle->mo.mo_flags & MO_F_SYSDEP) != 0) {
-		if (setup_sysdep_stuffs(mo, mohandle, base)) {
-			unmapit(db);
-			goto fail;
-		}
-	}
-
-	return 0;
-
-fail:
-	return -1;
-}
-
-static void
-free_sysdep_table(struct mosysdepstr_h **table, uint32_t nstring)
-{
-
-	if (! table)
-		return;
-
-	for (uint32_t i = 0; i < nstring; i++) {
-		if (table[i]) {
-			free(table[i]->expanded);
-			free(table[i]);
-		}
-	}
-	free(table);
-}
-
-static int
-unmapit(struct domainbinding *db)
-{
-	struct mohandle *mohandle = &db->mohandle;
-
-	/* unmap if there's already mapped region */
-	if (mohandle->addr && mohandle->addr != MAP_FAILED)
-		munmap(mohandle->addr, mohandle->len);
-	mohandle->addr = NULL;
-	free(mohandle->mo.mo_otable);
-	free(mohandle->mo.mo_ttable);
-	free(mohandle->mo.mo_charset);
-	free(mohandle->mo.mo_htable);
-	free(mohandle->mo.mo_sysdep_segs);
-	free_sysdep_table(mohandle->mo.mo_sysdep_otable,
-	    mohandle->mo.mo_sysdep_nstring);
-	free_sysdep_table(mohandle->mo.mo_sysdep_ttable,
-	    mohandle->mo.mo_sysdep_nstring);
-	_gettext_free_plural(mohandle->mo.mo_plural);
-	memset(&mohandle->mo, 0, sizeof(mohandle->mo));
-	return 0;
-}
-
-/* ARGSUSED */
-static const char *
-lookup_hash(const char *msgid, struct domainbinding *db, size_t *rlen)
-{
-	struct mohandle *mohandle = &db->mohandle;
-	uint32_t idx, hashval, step, strno;
-	size_t len;
-	struct mosysdepstr_h *sysdep_otable, *sysdep_ttable;
-
-	if (mohandle->mo.mo_hsize <= 2 || mohandle->mo.mo_htable == NULL)
-		return NULL;
-
-	hashval = __intl_string_hash(msgid);
-	step = calc_collision_step(hashval, mohandle->mo.mo_hsize);
-	idx = hashval % mohandle->mo.mo_hsize;
-	len = strlen(msgid);
-	while (/*CONSTCOND*/1) {
-		strno = mohandle->mo.mo_htable[idx];
-		if (strno == 0) {
-			/* unexpected miss */
-			return NULL;
-		}
-		strno--;
-		if ((strno & MO_HASH_SYSDEP_MASK) == 0) {
-			/* system independent strings */
-			if (len <= mohandle->mo.mo_otable[strno].len &&
-			    !strcmp(msgid, mohandle->mo.mo_otable[strno].off)) {
-				/* hit */
-				if (rlen)
-					*rlen =
-					    mohandle->mo.mo_ttable[strno].len;
-				return mohandle->mo.mo_ttable[strno].off;
-			}
-		} else {
-			/* system dependent strings */
-			strno &= ~MO_HASH_SYSDEP_MASK;
-			sysdep_otable = mohandle->mo.mo_sysdep_otable[strno];
-			sysdep_ttable = mohandle->mo.mo_sysdep_ttable[strno];
-			if (len <= sysdep_otable->expanded_len &&
-			    !strcmp(msgid, sysdep_otable->expanded)) {
-				/* hit */
-				if (expand_sysdep(mohandle, sysdep_ttable))
-					/* memory exhausted */
-					return NULL;
-				if (rlen)
-					*rlen = sysdep_ttable->expanded_len;
-				return sysdep_ttable->expanded;
-			}
-		}
-		idx = calc_next_index(idx, mohandle->mo.mo_hsize, step);
-	}
-	/*NOTREACHED*/
-}
-
-static const char *
-lookup_bsearch(const char *msgid, struct domainbinding *db, size_t *rlen)
-{
-	int top, bottom, middle, omiddle;
-	int n;
-	struct mohandle *mohandle = &db->mohandle;
-
-	top = 0;
-	bottom = mohandle->mo.mo_nstring;
-	omiddle = -1;
-	/* CONSTCOND */
-	while (1) {
-		if (top > bottom)
-			break;
-		middle = (top + bottom) / 2;
-		/* avoid possible infinite loop, when the data is not sorted */
-		if (omiddle == middle)
-			break;
-		if ((size_t)middle >= mohandle->mo.mo_nstring)
-			break;
-
-		n = strcmp(msgid, mohandle->mo.mo_otable[middle].off);
-		if (n == 0) {
-			if (rlen)
-				*rlen = mohandle->mo.mo_ttable[middle].len;
-			return (const char *)mohandle->mo.mo_ttable[middle].off;
-		}
-		else if (n < 0)
-			bottom = middle;
-		else
-			top = middle;
-		omiddle = middle;
-	}
-
-	return NULL;
-}
-
-static const char *
-lookup(const char *msgid, struct domainbinding *db, size_t *rlen)
-{
-	const char *v;
-
-	v = lookup_hash(msgid, db, rlen);
-	if (v)
-		return v;
-
-	return lookup_bsearch(msgid, db, rlen);
-}
-
-static const char *
-get_lang_env(const char *category_name)
-{
-	const char *lang;
-
-	/*
-	 * 1. see LANGUAGE variable first.
-	 *
-	 * LANGUAGE is a GNU extension.
-	 * It's a colon separated list of locale names.
-	 */
-	lang = getenv("LANGUAGE");
-	if (lang)
-		return lang;
-
-	/*
-	 * 2. if LANGUAGE isn't set, see LC_ALL, LC_xxx, LANG.
-	 *
-	 * It's essentially setlocale(LC_xxx, NULL).
-	 */
-	lang = getenv("LC_ALL");
-	if (!lang)
-		lang = getenv(category_name);
-	if (!lang)
-		lang = getenv("LANG");
-
-	if (!lang)
-		return 0; /* error */
-
-	return split_locale(lang);
-}
-
-static const char *
-get_indexed_string(const char *str, size_t len, unsigned long idx)
-{
-	while (idx > 0) {
-		if (len <= 1)
-			return str;
-		if (*str == '\0')
-			idx--;
-		if (len > 0) {
-			str++;
-			len--;
-		}
-	}
-	return str;
-}
-
-#define	_NGETTEXT_DEFAULT(msgid1, msgid2, n)	\
-	((char *)__UNCONST((n) == 1 ? (msgid1) : (msgid2)))
-
-char *
-dcngettext(const char *domainname, const char *msgid1, const char *msgid2,
-	   unsigned long int n, int category)
-{
-	const char *msgid;
-	char path[PATH_MAX];
-	const char *lpath;
-	static char olpath[PATH_MAX];
-	const char *cname = NULL;
-	const char *v;
-	static char *ocname = NULL;
-	static char *odomainname = NULL;
-	struct domainbinding *db;
-	unsigned long plural_index = 0;
-	size_t len;
-
-	if (!domainname)
-		domainname = __current_domainname;
-	cname = lookup_category(category);
-	if (!domainname || !cname)
-		goto fail;
-
-	lpath = get_lang_env(cname);
-	if (!lpath)
-		goto fail;
-
-	for (db = __bindings; db; db = db->next)
-		if (strcmp(db->domainname, domainname) == 0)
-			break;
-	if (!db) {
-		if (!bindtextdomain(domainname, _PATH_TEXTDOMAIN))
-			goto fail;
-		db = __bindings;
-	}
-
-	/* resolve relative path */
-	/* XXX not necessary? */
-	if (db->path[0] != '/') {
-		char buf[PATH_MAX];
-
-		if (getcwd(buf, sizeof(buf)) == 0)
-			goto fail;
-		if (strlcat(buf, "/", sizeof(buf)) >= sizeof(buf))
-			goto fail;
-		if (strlcat(buf, db->path, sizeof(buf)) >= sizeof(buf))
-			goto fail;
-		strlcpy(db->path, buf, sizeof(db->path));
-	}
-
-	/* don't bother looking it up if the values are the same */
-	if (odomainname && strcmp(domainname, odomainname) == 0 &&
-	    ocname && strcmp(cname, ocname) == 0 && strcmp(lpath, olpath) == 0 &&
-	    db->mohandle.mo.mo_magic)
-		goto found;
-
-	/* try to find appropriate file, from $LANGUAGE */
-	if (lookup_mofile(path, sizeof(path), db->path, lpath, cname,
-	    domainname, db) == NULL)
-		goto fail;
-
-	free(odomainname);
-	free(ocname);
-
-	odomainname = strdup(domainname);
-	ocname = strdup(cname);
-	if (!odomainname || !ocname) {
-		free(odomainname);
-		free(ocname);
-
-		odomainname = ocname = NULL;
-	}
-	else
-		strlcpy(olpath, lpath, sizeof(olpath));
-
-found:
-	if (db->mohandle.mo.mo_plural) {
-		plural_index =
-		    _gettext_calculate_plural(db->mohandle.mo.mo_plural, n);
-		if (plural_index >= db->mohandle.mo.mo_nplurals)
-			plural_index = 0;
-		msgid = msgid1;
-	} else
-		msgid = _NGETTEXT_DEFAULT(msgid1, msgid2, n);
-
-	if (msgid == NULL)
-		return NULL;
-
-	v = lookup(msgid, db, &len);
-	if (v) {
-		if (db->mohandle.mo.mo_plural)
-			v = get_indexed_string(v, len, plural_index);
-		/*
-		 * convert the translated message's encoding.
-		 *
-		 * special case:
-		 *	a result of gettext("") shouldn't need any conversion.
-		 */
-		if (msgid[0])
-			v = __gettext_iconv(v, db);
-
-		/*
-		 * Given the amount of printf-format security issues, it may
-		 * be a good idea to validate if the original msgid and the
-		 * translated message format string carry the same printf-like
-		 * format identifiers.
-		 */
-
-		msgid = v;
-	}
-
-	return (char *)__UNCONST(msgid);
-
-fail:
-	return _NGETTEXT_DEFAULT(msgid1, msgid2, n);
-}
diff --git a/lib/libintl/gettext_dummy.c b/lib/libintl/gettext_dummy.c
deleted file mode 100644
index 47dd40daa..000000000
--- a/lib/libintl/gettext_dummy.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: gettext_dummy.c,v 1.3 2007/09/25 08:16:08 junyoung Exp $	*/
-
-/*-
- * Copyright (c) 2000 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: gettext_dummy.c,v 1.3 2007/09/25 08:16:08 junyoung Exp $");
-
-/*
- * The symbol is referenced by gettext.m4 (autoconf m4 macro fragment
- * that ships with GNU gettext), to check if libintl is GNU origin or not.
- * Since we are trying to mimic GNU gettext, we supply the symbol just to
- * make gettext.m4 happy.
- *
- * If we do not provide this symbol, as a result of gettext.m4, *.mo will be
- * installed into /usr/lib/locale, not /usr/share/locale.  It is not desirable.
- *
- * Yes, I understand this is a dirty hack.  gettext.m4 is doing something
- * very wrong here and I have no other choice.
- */
-int _nl_msg_cat_cntr;
diff --git a/lib/libintl/gettext_iconv.c b/lib/libintl/gettext_iconv.c
deleted file mode 100644
index 94e6e12af..000000000
--- a/lib/libintl/gettext_iconv.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*	$NetBSD: gettext_iconv.c,v 1.8 2009/02/18 13:08:22 yamt Exp $	*/
-
-/*-
- * Copyright (c) 2004 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Citrus$
- */
-
-
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <errno.h>
-#include <iconv.h>
-#include <libintl.h>
-#include <langinfo.h>
-#include <search.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "libintl_local.h"
-
-struct cache {
-	const char *c_origmsg;
-	const char *c_resultmsg;
-};
-
-static const struct cache *cache_find(const char *, struct domainbinding *);
-static int cache_enter(const char *, const char *);
-static int cache_cmp(const void *, const void *);
-
-static void *cacheroot;
-
-/* ARGSUSED1 */
-static const struct cache *
-cache_find(const char *msg, struct domainbinding *db)
-{
-	struct cache key;
-	struct cache **c;
-
-	key.c_origmsg = msg;
-	c = tfind(&key, &cacheroot, cache_cmp);
-
-	return c ? *c : NULL;
-}
-
-static int
-cache_enter(const char *origmsg, const char *resultmsg)
-{
-	struct cache *c;
-
-	c = malloc(sizeof(*c));
-	if (c == NULL)
-		return -1;
-
-	c->c_origmsg = origmsg;
-	c->c_resultmsg = resultmsg;
-
-	if (tsearch(c, &cacheroot, cache_cmp) == NULL) {
-		free(c);
-		return -1;
-	}
-
-	return 0;
-}
-
-static int
-cache_cmp(const void *va, const void *vb)
-{
-	const struct cache *a = va;
-	const struct cache *b = vb;
-	int result;
-
-	if (a->c_origmsg > b->c_origmsg) {
-		result = 1;
-	} else if (a->c_origmsg < b->c_origmsg) {
-		result = -1;
-	} else {
-		result = 0;
-	}
-
-	return result;
-}
-
-#define	GETTEXT_ICONV_MALLOC_CHUNK	(16 * 1024)
-
-const char *
-__gettext_iconv(const char *origmsg, struct domainbinding *db)
-{
-	const char *tocode;
-	const char *fromcode = db->mohandle.mo.mo_charset;
-	const struct cache *cache;
-	const char *result;
-	iconv_t cd;
-	const char *src;
-	char *dst;
-	size_t origlen;
-	size_t srclen;
-	size_t dstlen;
-	size_t nvalid;
-	int savederrno = errno;
-
-	/*
-	 * static buffer for converted texts.
-	 *
-	 * note:
-	 * we never free buffers once returned to callers.
-	 * because of interface design of gettext, we can't know
-	 * the lifetime of them.
-	 */
-	static char *buffer;
-	static size_t bufferlen;
-
-	/*
-	 * don't convert message if *.mo doesn't specify codeset.
-	 */
-	if (fromcode == NULL)
-		return origmsg;
-
-	tocode = db->codeset;
-	if (tocode == NULL) {
-		/*
-		 * codeset isn't specified explicitly by
-		 * bind_textdomain_codeset().
-		 * use current locale(LC_CTYPE)'s codeset.
-		 *
-		 * XXX maybe wrong; it can mismatch with
-		 * environment variable setting.
-		 */
-		tocode = nl_langinfo(CODESET);
-	}
-
-	/*
-	 * shortcut if possible.
-	 * XXX should handle aliases
-	 */
-	if (!strcasecmp(tocode, fromcode))
-		return origmsg;
-
-	/* XXX LOCK */
-
-	/* XXX should detect change of tocode and purge caches? */
-
-	/*
-	 * see if we have already converted this message.
-	 */
-	cache = cache_find(origmsg, db);
-	if (cache) {
-		result = cache->c_resultmsg;
-		goto out;
-	}
-
-	origlen = strlen(origmsg) + 1;
-again:
-	cd = iconv_open(tocode, fromcode);
-	if (cd == (iconv_t)-1) {
-		result = origmsg;
-		goto out;
-	}
-
-	src = origmsg;
-	srclen = origlen;
-	dst = buffer;
-	dstlen = bufferlen;
-	nvalid = iconv(cd, &src, &srclen, &dst, &dstlen);
-	iconv_close(cd);
-
-	if (nvalid == (size_t)-1) {
-		/*
-		 * try to allocate a new buffer.
-		 *
-		 * just give up if GETTEXT_ICONV_MALLOC_CHUNK was not enough.
-		 */
-		if (errno == E2BIG &&
-		    bufferlen != GETTEXT_ICONV_MALLOC_CHUNK) {
-			buffer = malloc(GETTEXT_ICONV_MALLOC_CHUNK);
-			if (buffer) {
-				bufferlen = GETTEXT_ICONV_MALLOC_CHUNK;
-				goto again;
-			}
-		}
-
-		result = origmsg;
-	} else if (cache_enter(origmsg, buffer)) {
-		/*
-		 * failed to enter cache.  give up.
-		 */
-		result = origmsg;
-	} else {
-		size_t resultlen = dst - buffer;
-
-		result = buffer;
-		bufferlen -= resultlen;
-		buffer += resultlen;
-	}
-
-out:
-	/* XXX UNLOCK */
-	errno = savederrno;
-
-	return result;
-}
diff --git a/lib/libintl/libintl.h b/lib/libintl/libintl.h
deleted file mode 100644
index 4f73f7878..000000000
--- a/lib/libintl/libintl.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: libintl.h,v 1.8 2015/06/08 15:04:20 christos Exp $	*/
-
-/*-
- * Copyright (c) 2000 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _LIBINTL_H_
-#define _LIBINTL_H_
-
-#include <sys/cdefs.h>
-
-#ifndef _LIBGETTEXT_H
-/*
- * Avoid defining these if the GNU gettext compatibility header includes
- * us, since it re-defines those unconditionally and creates inline functions
- * for some of them. This is horrible.
- */
-#define pgettext_expr(msgctxt, msgid) pgettext((msgctxt), (msgid))
-#define dpgettext_expr(domainname, msgctxt, msgid) \
-    dpgettext((domainname), (msgctxt), (msgid))
-#define dcpgettext_expr(domainname, msgctxt, msgid, category) \
-    dcpgettext((domainname), (msgctxt), (msgid), (category))
-#define npgettext_expr(msgctxt, msgid1, msgid2, n) \
-    npgettext((msgctxt), (msgid1), (msgid2), (n))
-#define dnpgettext_expr(domainname, msgctxt, msgid1, n) \
-    dnpgettext((domainname), (msgctxt), (msgid1), (msgid2), (n))
-#define dcnpgettext_expr(domainname, msgctxt, msgid1, msgid2, n, category) \
-    dcnpgettext((domainname), (msgctxt), (msgid1), (msgid2), (n), (category))
-#endif
-
-__BEGIN_DECLS
-char *gettext(const char *) __format_arg(1);
-char *dgettext(const char *, const char *) __format_arg(2);
-char *dcgettext(const char *, const char *, int) __format_arg(2);
-char *ngettext(const char *, const char *, unsigned long int)
-	       __format_arg(1) __format_arg(2);
-char *dngettext(const char *, const char *, const char *, unsigned long int)
-		__format_arg(2) __format_arg(3);
-char *dcngettext(const char *, const char *, const char *, unsigned long int,
-		 int) __format_arg(2) __format_arg(3);
-const char *pgettext(const char *, const char *) __format_arg(2);
-const char *dpgettext(const char *, const char *, const char *)
-		      __format_arg(3);
-const char *dcpgettext(const char *, const char *, const char *, int)
-		       __format_arg(3);
-const char *npgettext(const char *, const char *, const char *,
-		      unsigned long int) __format_arg(2) __format_arg(3);
-const char *dnpgettext(const char *, const char *, const char *,
-		       const char *, unsigned long int) __format_arg(3)
-		       __format_arg(4);
-const char *dcnpgettext(const char *, const char *, const char *,
-			const char *, unsigned long int, int) __format_arg(3)
-			__format_arg(4);
-
-char *textdomain(const char *);
-char *bindtextdomain(const char *, const char *);
-char *bind_textdomain_codeset(const char *, const char *);
-
-__END_DECLS
-
-#endif /* _LIBINTL_H_ */
diff --git a/lib/libintl/libintl_local.h b/lib/libintl/libintl_local.h
deleted file mode 100644
index 6260e49e2..000000000
--- a/lib/libintl/libintl_local.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*	$NetBSD: libintl_local.h,v 1.12 2007/09/25 08:22:44 junyoung Exp $	*/
-
-/*-
- * Copyright (c) 2000, 2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Citrus: xpg4dl/FreeBSD/lib/libintl/libintl_local.h,v 1.13 2001/09/27 15:18:45 yamt Exp $
- */
-
-#define MO_MAGIC		0x950412de
-#define MO_MAGIC_SWAPPED	0xde120495
-#define MO_GET_REV_MAJOR(r)	(((r) >> 16) & 0xFFFF)
-#define MO_GET_REV_MINOR(r)	((r) & 0xFFFF)
-#define MO_MAKE_REV(maj, min)	(((maj) << 16) | (min))
-
-#define GETTEXT_MMAP_MAX	(1024 * 1024)	/*XXX*/
-
-#define DEFAULT_DOMAINNAME	"messages"
-
-/* *.mo file format */
-struct mo {
-	uint32_t mo_magic;	/* determines endian */
-	uint32_t mo_revision;	/* file format revision: 0 */
-	uint32_t mo_nstring;	/* N: number of strings */
-	uint32_t mo_otable;	/* O: original text table offset */
-	uint32_t mo_ttable;	/* T: translated text table offset */
-	uint32_t mo_hsize;	/* S: size of hashing table */
-	uint32_t mo_hoffset;	/* H: offset of hashing table */
-	/* rev 0.1 / 1.1 */
-	/* system dependent string support */
-	uint32_t mo_sysdep_nsegs;	/* number of sysdep segments */
-	uint32_t mo_sysdep_segoff;	/* offset of sysdep segment table */
-	uint32_t mo_sysdep_nstring;	/* number of strings */
-	uint32_t mo_sysdep_otable;	/* offset of original text table */
-	uint32_t mo_sysdep_ttable;	/* offset of translated text table */
-} __packed;
-
-struct moentry {
-	uint32_t len;		/* strlen(str), so region will be len + 1 */
-	uint32_t off;		/* offset of \0-terminated string */
-} __packed;
-
-struct mosysdepsegentry {
-	uint32_t len;		/* length of this part */
-	uint32_t ref;		/* reference number of the sysdep string,
-				 * concatenated just after this segment.
-				 */
-} __packed;
-#define MO_LASTSEG		(0xFFFFFFFF)
-
-struct mosysdepstr {
-	uint32_t off;				/* offset of seed text */
-	struct mosysdepsegentry segs[1];	/* text segments */
-} __packed;
-
-/* libintl internal data format */
-struct moentry_h {
-	size_t len;		/* strlen(str), so region will be len + 1 */
-	char *off;		/* offset of \0-terminated string */
-};
-
-struct mosysdepsegs_h {
-	const char *str;
-	size_t len;
-};
-
-struct mosysdepsegentry_h {
-	uint32_t len;
-	uint32_t ref;
-};
-
-struct mosysdepstr_h {
-	const char *off;			/* offset of the base string */
-	char *expanded;				/* expanded string */
-	size_t expanded_len;			/* length of expanded string */
-	struct mosysdepsegentry_h segs[1];	/* text segments */
-};
-
-struct gettext_plural;
-struct mo_h {
-	uint32_t mo_magic;	/* determines endian */
-	uint32_t mo_revision;	/* file format revision: 0 */
-	uint32_t mo_nstring;	/* N: number of strings */
-	struct moentry_h *mo_otable;	/* O: original text table offset */
-	struct moentry_h *mo_ttable;	/* T: translated text table offset */
-	const char *mo_header;
-	struct gettext_plural *mo_plural;
-	unsigned long mo_nplurals;
-	char *mo_charset;
-	uint32_t mo_hsize;	/* S: size of hashing table */
-	uint32_t *mo_htable;	/* H: hashing table */
-#define MO_HASH_SYSDEP_MASK	0x80000000	/* means sysdep entry */
-
-	uint32_t mo_flags;
-#define MO_F_SYSDEP	0x00000001	/* enable sysdep string support */
-
-	/* system dependent string support */
-	uint32_t mo_sysdep_nsegs;	/* number of sysdep segments */
-	uint32_t mo_sysdep_nstring;	/* number of sysdep strings */
-	struct mosysdepsegs_h *mo_sysdep_segs;	/* sysdep segment table */
-	struct mosysdepstr_h **mo_sysdep_otable;	/* original text */
-	struct mosysdepstr_h **mo_sysdep_ttable;	/* translated text */
-};
-
-
-struct mohandle {
-	void *addr;		/* mmap'ed region */
-	size_t len;
-	struct mo_h mo;		/* endian-flipped mo file header */
-};
-
-struct domainbinding {
-	struct domainbinding *next;
-	char domainname[PATH_MAX];
-	char path[PATH_MAX];
-	char *codeset;
-	struct mohandle mohandle;
-};
-
-extern struct domainbinding *__bindings;
-extern char __current_domainname[PATH_MAX];
-
-__BEGIN_DECLS
-const char *__gettext_iconv(const char *, struct domainbinding *);
-uint32_t __intl_string_hash(const char *);
-const char *__intl_sysdep_get_string_by_tag(const char *, size_t *);
-__END_DECLS
diff --git a/lib/libintl/pathnames.h b/lib/libintl/pathnames.h
deleted file mode 100644
index ce6bb4081..000000000
--- a/lib/libintl/pathnames.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*	$NetBSD: pathnames.h,v 1.1.1.1 2000/10/31 10:45:04 itojun Exp $	*/
-
-/*-
- * Copyright (c) 2000 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#define	_PATH_TEXTDOMAIN	"/usr/share/locale"
diff --git a/lib/libintl/plural_parser.c b/lib/libintl/plural_parser.c
deleted file mode 100644
index b673e1705..000000000
--- a/lib/libintl/plural_parser.c
+++ /dev/null
@@ -1,1119 +0,0 @@
-/*	$NetBSD: plural_parser.c,v 1.2 2007/01/17 23:24:22 hubertf Exp $	*/
-
-/*-
- * Copyright (c) 2005 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: plural_parser.c,v 1.2 2007/01/17 23:24:22 hubertf Exp $");
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <citrus/citrus_namespace.h>
-#include <citrus/citrus_region.h>
-#include <citrus/citrus_memstream.h>
-#include <citrus/citrus_bcs.h>
-#include "plural_parser.h"
-
-#if defined(TEST_TOKENIZER) || defined(TEST_PARSER)
-#define ALLOW_EMPTY
-#define ALLOW_ARBITRARY_IDENTIFIER
-#endif
-
-#define MAX_LEN_ATOM		10
-#define MAX_NUM_OPERANDS	3
-
-#define T_EOF			EOF
-#define T_NONE			0x100
-#define T_LAND			0x101	/* && */
-#define T_LOR			0x102	/* || */
-#define T_EQUALITY		0x103	/* == or != */
-#define T_RELATIONAL		0x104	/* <, >, <= or >= */
-#define T_ADDITIVE		0x105	/* + or - */
-#define T_MULTIPLICATIVE	0x106	/* *, / or % */
-#define T_IDENTIFIER		0x200
-#define T_CONSTANT		0x201
-#define T_ILCHAR		0x300
-#define T_TOOLONG		0x301
-#define T_ILTOKEN		0x302
-#define T_ILEND			0x303
-#define T_NOMEM			0x304
-#define T_NOTFOUND		0x305
-#define T_ILPLURAL		0x306
-#define T_IS_OPERATOR(t)	((t) < 0x200)
-#define T_IS_ERROR(t)		((t) >= 0x300)
-
-#define OP_EQ			('='+'=')
-#define OP_NEQ			('!'+'=')
-#define OP_LTEQ			('<'+'=')
-#define OP_GTEQ			('>'+'=')
-
-#define PLURAL_NUMBER_SYMBOL	"n"
-#define NPLURALS_SYMBOL		"nplurals"
-#define LEN_NPLURAL_SYMBOL	(sizeof (NPLURALS_SYMBOL) -1)
-#define PLURAL_SYMBOL		"plural"
-#define LEN_PLURAL_SYMBOL	(sizeof (PLURAL_SYMBOL) -1)
-#define PLURAL_FORMS		"Plural-Forms:"
-#define LEN_PLURAL_FORMS	(sizeof (PLURAL_FORMS) -1)
-
-/* ----------------------------------------------------------------------
- * tokenizer part
- */
-
-union token_data
-{
-	unsigned long constant;
-#ifdef ALLOW_ARBITRARY_IDENTIFIER
-	char identifier[MAX_LEN_ATOM+1];
-#endif
-	char op;
-};
-
-struct tokenizer_context
-{
-	struct _memstream memstream;
-	struct {
-		int token;
-		union token_data token_data;
-	} token0;
-};
-
-/* initialize a tokenizer context */
-static void
-init_tokenizer_context(struct tokenizer_context *tcx)
-{
-	tcx->token0.token = T_NONE;
-}
-
-/* get an atom (identifier or constant) */
-static int
-tokenize_atom(struct tokenizer_context *tcx, union token_data *token_data)
-{
-	int ch, len;
-	char buf[MAX_LEN_ATOM+1];
-
-	len = 0;
-	while (/*CONSTCOND*/1) {
-		ch = _memstream_getc(&tcx->memstream);
-		if (!(_bcs_isalnum(ch) || ch == '_')) {
-			_memstream_ungetc(&tcx->memstream, ch);
-			break;
-		}
-		if (len == MAX_LEN_ATOM)
-			return T_TOOLONG;
-		buf[len++] = ch;
-	}
-	buf[len] = '\0';
-	if (len == 0)
-		return T_ILCHAR;
-
-	if (_bcs_isdigit((int)(unsigned char)buf[0])) {
-		unsigned long ul;
-		char *post;
-		ul = strtoul(buf, &post, 0);
-		if (buf+len != post)
-			return T_ILCHAR;
-		token_data->constant = ul;
-		return T_CONSTANT;
-	}
-
-#ifdef ALLOW_ARBITRARY_IDENTIFIER
-	strcpy(token_data->identifier, buf);
-	return T_IDENTIFIER;
-#else
-	if (!strcmp(buf, PLURAL_NUMBER_SYMBOL))
-		return T_IDENTIFIER;
-	return T_ILCHAR;
-#endif
-}
-
-/* tokenizer main routine */
-static int
-tokenize(struct tokenizer_context *tcx, union token_data *token_data)
-{
-	int ch, prevch;
-
-retry:
-	ch = _memstream_getc(&tcx->memstream);
-	if (_bcs_isspace(ch))
-		goto retry;
-
-	switch (ch) {
-	case T_EOF:
-		return ch;
-	case '+': case '-':
-		token_data->op = ch;
-		return T_ADDITIVE;
-	case '*': case '/': case '%':
-		token_data->op = ch;
-		return T_MULTIPLICATIVE;
-	case '?': case ':': case '(': case ')':
-		token_data->op = ch;
-		return ch;
-	case '&': case '|':
-		prevch = ch;
-		ch = _memstream_getc(&tcx->memstream);
-		if (ch != prevch) {
-			_memstream_ungetc(&tcx->memstream, ch);
-			return T_ILCHAR;
-		}
-		token_data->op = ch;
-		switch (ch) {
-		case '&':
-			return T_LAND;
-		case '|':
-			return T_LOR;
-		}
-		/*NOTREACHED*/
-	case '=': case '!': case '<': case '>':
-		prevch = ch;
-		ch = _memstream_getc(&tcx->memstream);
-		if (ch != '=') {
-			_memstream_ungetc(&tcx->memstream, ch);
-			switch (prevch) {
-			case '=':
-				return T_ILCHAR;
-			case '!':
-				return '!';
-			case '<':
-			case '>':
-				token_data->op = prevch; /* OP_LT or OP_GT */
-				return T_RELATIONAL;
-			}
-		}
-		/* '==', '!=', '<=' or '>=' */
-		token_data->op = ch+prevch;
-		switch (prevch) {
-		case '=':
-		case '!':
-			return T_EQUALITY;
-		case '<':
-		case '>':
-			return T_RELATIONAL;
-		}
-		/*NOTREACHED*/
-	}
-
-	_memstream_ungetc(&tcx->memstream, ch);
-	return tokenize_atom(tcx, token_data);
-}
-
-/* get the next token */
-static int
-get_token(struct tokenizer_context *tcx, union token_data *token_data)
-{
-	if (tcx->token0.token != T_NONE) {
-		int token = tcx->token0.token;
-		tcx->token0.token = T_NONE;
-		*token_data = tcx->token0.token_data;
-		return token;
-	}
-	return tokenize(tcx, token_data);
-}
-
-/* push back the last token */
-static void
-unget_token(struct tokenizer_context *tcx,
-	    int token, union token_data *token_data)
-{
-	tcx->token0.token = token;
-	tcx->token0.token_data = *token_data;
-}
-
-#ifdef TEST_TOKENIZER
-
-int
-main(int argc, char **argv)
-{
-	struct tokenizer_context tcx;
-	union token_data token_data;
-	int token;
-
-	if (argc != 2) {
-		fprintf(stderr, "usage: %s <expression>\n", argv[0]);
-		return EXIT_FAILURE;
-	}
-
-	init_tokenizer_context(&tcx);
-	_memstream_bind_ptr(&tcx.memstream, argv[1], strlen(argv[1]));
-
-	while (1) {
-		token = get_token(&tcx, &token_data);
-		switch (token) {
-		case T_EOF:
-			goto quit;
-		case T_ILCHAR:
-			printf("illegal character.\n");
-			goto quit;
-		case T_TOOLONG:
-			printf("too long atom.\n");
-			goto quit;
-		case T_CONSTANT:
-			printf("constant: %lu\n", token_data.constant);
-			break;
-		case T_IDENTIFIER:
-			printf("symbol: %s\n", token_data.identifier);
-			break;
-		default:
-			printf("operator: ");
-			switch (token) {
-			case T_LAND:
-				printf("&&\n");
-				break;
-			case T_LOR:
-				printf("||\n");
-				break;
-			case T_EQUALITY:
-				printf("%c=\n", token_data.op-'=');
-				break;
-			case T_RELATIONAL:
-				switch(token_data.op) {
-				case OP_LTEQ:
-				case OP_GTEQ:
-					printf("%c=\n", token_data.op-'=');
-					break;
-				default:
-					printf("%c\n", token_data.op);
-					break;
-				}
-				break;
-			case T_ADDITIVE:
-			case T_MULTIPLICATIVE:
-				printf("%c\n", token_data.op);
-				break;
-			default:
-				printf("operator: %c\n", token);
-			}
-		}
-	}
-quit:
-	return 0;
-}
-#endif /* TEST_TOKENIZER */
-
-
-/* ----------------------------------------------------------------------
- * parser part
- *
- * exp := cond
- *
- * cond := lor | lor '?' cond ':' cond
- *
- * lor := land ( '||' land )*
- *
- * land := equality ( '&&' equality )*
- *
- * equality := relational ( equalityops relational )*
- * equalityops := '==' | '!='
- *
- * relational := additive ( relationalops additive )*
- * relationalops := '<' | '>' | '<=' | '>='
- *
- * additive := multiplicative ( additiveops multiplicative )*
- * additiveops := '+' | '-'
- *
- * multiplicative := lnot ( multiplicativeops lnot )*
- * multiplicativeops := '*' | '/' | '%'
- *
- * lnot := '!' lnot | term
- *
- * term := literal | identifier | '(' exp ')'
- *
- */
-
-#define T_ENSURE_OK(token, label)					      \
-do {									      \
-	if (T_IS_ERROR(token))						      \
-		goto label;						      \
-} while (/*CONSTCOND*/0)
-#define T_ENSURE_SOMETHING(token, label)				      \
-do {									      \
-	if ((token) == T_EOF) {						      \
-		token = T_ILEND;					      \
-		goto label;						      \
-	} else if (T_IS_ERROR(token))					      \
-		goto label;						      \
-} while (/*CONSTCOND*/0)
-
-#define parser_element	plural_element
-
-struct parser_element;
-struct parser_op
-{
-	char op;
-	struct parser_element *operands[MAX_NUM_OPERANDS];
-};
-struct parser_element
-{
-	int kind;
-	union
-	{
-		struct parser_op parser_op;
-		union token_data token_data;
-	} u;
-};
-
-struct parser_op2_transition
-{
-	int					kind;
-	const struct parser_op2_transition	*next;
-};
-
-/* prototypes */
-static int parse_cond(struct tokenizer_context *, struct parser_element *);
-
-
-/* transition table for the 2-operand operators */
-#define DEF_TR(t, k, n)							      \
-static struct parser_op2_transition exp_tr_##t = {			      \
-	k, &exp_tr_##n							      \
-}
-#define DEF_TR0(t, k)							      \
-static struct parser_op2_transition exp_tr_##t = {			      \
-	k, NULL /* expect lnot */					      \
-}
-
-DEF_TR0(multiplicative, T_MULTIPLICATIVE);
-DEF_TR(additive, T_ADDITIVE, multiplicative);
-DEF_TR(relational, T_RELATIONAL, additive);
-DEF_TR(equality, T_EQUALITY, relational);
-DEF_TR(land, T_LAND, equality);
-DEF_TR(lor, T_LOR, land);
-
-/* init a parser element structure */
-static void
-init_parser_element(struct parser_element *pe)
-{
-	int i;
-
-	pe->kind = T_NONE;
-	for (i=0; i<MAX_NUM_OPERANDS; i++)
-		pe->u.parser_op.operands[i] = NULL;
-}
-
-/* uninitialize a parser element structure with freeing children */
-static void free_parser_element(struct parser_element *);
-static void
-uninit_parser_element(struct parser_element *pe)
-{
-	int i;
-
-	if (T_IS_OPERATOR(pe->kind))
-		for (i=0; i<MAX_NUM_OPERANDS; i++)
-			if (pe->u.parser_op.operands[i])
-				free_parser_element(
-					pe->u.parser_op.operands[i]);
-}
-
-/* free a parser element structure with freeing children */
-static void
-free_parser_element(struct parser_element *pe)
-{
-	if (pe) {
-		uninit_parser_element(pe);
-		free(pe);
-	}
-}
-
-
-/* copy a parser element structure shallowly */
-static void
-copy_parser_element(struct parser_element *dpe,
-		    const struct parser_element *spe)
-{
-	memcpy(dpe, spe, sizeof *dpe);
-}
-
-/* duplicate a parser element structure shallowly */
-static struct parser_element *
-dup_parser_element(const struct parser_element *pe)
-{
-	struct parser_element *dpe = malloc(sizeof *dpe);
-	if (dpe)
-		copy_parser_element(dpe, pe);
-	return dpe;
-}
-
-/* term := identifier | constant | '(' exp ')' */
-static int
-parse_term(struct tokenizer_context *tcx, struct parser_element *pelem)
-{
-	struct parser_element pe0;
-	int token;
-	union token_data token_data;
-
-	token = get_token(tcx, &token_data);
-	switch (token) {
-	case '(':
-		/* '(' exp ')' */
-		init_parser_element(&pe0);
-		/* expect exp */
-		token = parse_cond(tcx, &pe0);
-		T_ENSURE_OK(token, err);
-		/* expect ')' */
-		token = get_token(tcx, &token_data);
-		T_ENSURE_SOMETHING(token, err);
-		if (token != ')') {
-			unget_token(tcx, token, &token_data);
-			token = T_ILTOKEN;
-			goto err;
-		}
-		copy_parser_element(pelem, &pe0);
-		return token;
-err:
-		uninit_parser_element(&pe0);
-		return token;
-	case T_IDENTIFIER:
-	case T_CONSTANT:
-		pelem->kind = token;
-		pelem->u.token_data = token_data;
-		return token;
-	case T_EOF:
-		return T_ILEND;
-	default:
-		return T_ILTOKEN;
-	}
-}
-
-/* lnot := '!' lnot | term */
-static int
-parse_lnot(struct tokenizer_context *tcx, struct parser_element *pelem)
-{
-	struct parser_element pe0;
-	int token;
-	union token_data token_data;
-
-	init_parser_element(&pe0);
-
-	/* '!' or not */
-	token = get_token(tcx, &token_data);
-	if (token != '!') {
-		/* stop: term */
-		unget_token(tcx, token, &token_data);
-		return parse_term(tcx, pelem);
-	}
-
-	/* '!' term */
-	token = parse_lnot(tcx, &pe0);
-	T_ENSURE_OK(token, err);
-
-	pelem->kind = '!';
-	pelem->u.parser_op.operands[0] = dup_parser_element(&pe0);
-	return pelem->kind;
-err:
-	uninit_parser_element(&pe0);
-	return token;
-}
-
-/* ext_op := ext_next ( op ext_next )* */
-static int
-parse_op2(struct tokenizer_context *tcx, struct parser_element *pelem,
-	  const struct parser_op2_transition *tr)
-{
-	struct parser_element pe0, pe1, peop;
-	int token;
-	union token_data token_data;
-	char op;
-
-	/* special case: expect lnot */
-	if (tr == NULL)
-		return parse_lnot(tcx, pelem);
-
-	init_parser_element(&pe0);
-	init_parser_element(&pe1);
-	token = parse_op2(tcx, &pe0, tr->next);
-	T_ENSURE_OK(token, err);
-
-	while (/*CONSTCOND*/1) {
-		/* expect op or empty */
-		token = get_token(tcx, &token_data);
-		if (token != tr->kind) {
-			/* stop */
-			unget_token(tcx, token, &token_data);
-			copy_parser_element(pelem, &pe0);
-			break;
-		}
-		op = token_data.op;
-		/* right hand */
-		token = parse_op2(tcx, &pe1, tr->next);
-		T_ENSURE_OK(token, err);
-
-		init_parser_element(&peop);
-		peop.kind = tr->kind;
-		peop.u.parser_op.op = op;
-		peop.u.parser_op.operands[0] = dup_parser_element(&pe0);
-		init_parser_element(&pe0);
-		peop.u.parser_op.operands[1] = dup_parser_element(&pe1);
-		init_parser_element(&pe1);
-		copy_parser_element(&pe0, &peop);
-	}
-	return pelem->kind;
-err:
-	uninit_parser_element(&pe1);
-	uninit_parser_element(&pe0);
-	return token;
-}
-
-/* cond := lor | lor '?' cond ':' cond */
-static int
-parse_cond(struct tokenizer_context *tcx, struct parser_element *pelem)
-{
-	struct parser_element pe0, pe1, pe2;
-	int token;
-	union token_data token_data;
-
-	init_parser_element(&pe0);
-	init_parser_element(&pe1);
-	init_parser_element(&pe2);
-
-	/* expect lor or empty */
-	token = parse_op2(tcx, &pe0, &exp_tr_lor);
-	T_ENSURE_OK(token, err);
-
-	/* '?' or not */
-	token = get_token(tcx, &token_data);
-	if (token != '?') {
-		/* stop: lor */
-		unget_token(tcx, token, &token_data);
-		copy_parser_element(pelem, &pe0);
-		return pe0.kind;
-	}
-
-	/* lor '?' cond ':' cond */
-	/* expect cond */
-	token = parse_cond(tcx, &pe1);
-	T_ENSURE_OK(token, err);
-
-	/* expect ':' */
-	token = get_token(tcx, &token_data);
-	T_ENSURE_OK(token, err);
-	if (token != ':') {
-		unget_token(tcx, token, &token_data);
-		token = T_ILTOKEN;
-		goto err;
-	}
-
-	/* expect cond */
-	token = parse_cond(tcx, &pe2);
-	T_ENSURE_OK(token, err);
-
-	pelem->kind = '?';
-	pelem->u.parser_op.operands[0] = dup_parser_element(&pe0);
-	pelem->u.parser_op.operands[1] = dup_parser_element(&pe1);
-	pelem->u.parser_op.operands[2] = dup_parser_element(&pe2);
-	return pelem->kind;
-err:
-	uninit_parser_element(&pe2);
-	uninit_parser_element(&pe1);
-	uninit_parser_element(&pe0);
-	return token;
-}
-
-static int
-parse_exp(struct tokenizer_context *tcx, struct parser_element *pelem)
-{
-	int token, token1;
-	union token_data token_data;
-
-#ifdef ALLOW_EMPTY
-	/* empty check */
-	token = get_token(tcx, &token_data);
-	if (token == T_EOF)
-		return token;
-	unget_token(tcx, token, &token_data);
-#endif
-
-	token = parse_cond(tcx, pelem);
-	if (!T_IS_ERROR(token)) {
-		/* termination check */
-		token1 = get_token(tcx, &token_data);
-		if (token1 == T_EOF)
-			return token;
-		else if (!T_IS_ERROR(token))
-			 unget_token(tcx, token1, &token_data);
-		return T_ILTOKEN;
-	}
-	return token;
-}
-
-
-#if defined(TEST_PARSER) || defined(TEST_PARSE_PLURAL)
-#include <stdio.h>
-
-static void dump_elem(struct parser_element *);
-
-static void
-dump_op2(struct parser_element *pelem)
-{
-	dump_elem(pelem->u.parser_op.operands[0]);
-	printf(" ");
-	dump_elem(pelem->u.parser_op.operands[1]);
-	printf(")");
-}
-
-static void
-dump_op3(struct parser_element *pelem)
-{
-	dump_elem(pelem->u.parser_op.operands[0]);
-	printf(" ");
-	dump_elem(pelem->u.parser_op.operands[1]);
-	printf(" ");
-	dump_elem(pelem->u.parser_op.operands[2]);
-	printf(")");
-}
-
-static void
-dump_elem(struct parser_element *pelem)
-{
-	switch (pelem->kind) {
-	case T_LAND:
-		printf("(&& ");
-		dump_op2(pelem);
-		break;
-	case T_LOR:
-		printf("(|| ");
-		dump_op2(pelem);
-		break;
-	case T_EQUALITY:
-		switch (pelem->u.parser_op.op) {
-		case OP_EQ:
-			printf("(== ");
-			break;
-		case OP_NEQ:
-			printf("(!= ");
-			break;
-		}
-		dump_op2(pelem);
-		break;
-	case T_RELATIONAL:
-		switch (pelem->u.parser_op.op) {
-		case '<':
-		case '>':
-			printf("(%c ", pelem->u.parser_op.op);
-			break;
-		case OP_LTEQ:
-		case OP_GTEQ:
-			printf("(%c= ", pelem->u.parser_op.op-'=');
-			break;
-		}
-		dump_op2(pelem);
-		break;
-	case T_ADDITIVE:
-	case T_MULTIPLICATIVE:
-		printf("(%c ", pelem->u.parser_op.op);
-		dump_op2(pelem);
-		break;
-	case '!':
-		printf("(! ");
-		dump_elem(pelem->u.parser_op.operands[0]);
-		printf(")");
-		break;
-	case '?':
-		printf("(? ");
-		dump_op3(pelem);
-		break;
-	case T_CONSTANT:
-		printf("%d", pelem->u.token_data.constant);
-		break;
-	case T_IDENTIFIER:
-#ifdef ALLOW_ARBITRARY_IDENTIFIER
-		printf("%s", pelem->u.token_data.identifier);
-#else
-		printf(PLURAL_NUMBER_SYMBOL);
-#endif
-		break;
-	}
-}
-#endif
-#ifdef TEST_PARSER
-int
-main(int argc, char **argv)
-{
-	struct tokenizer_context tcx;
-	struct parser_element pelem;
-	int token;
-
-	if (argc != 2) {
-		fprintf(stderr, "usage: %s <expression>\n", argv[0]);
-		return EXIT_FAILURE;
-	}
-
-	init_tokenizer_context(&tcx);
-	_memstream_bind_ptr(&tcx.memstream, argv[1], strlen(argv[1]));
-
-	init_parser_element(&pelem);
-	token = parse_exp(&tcx, &pelem);
-
-	if (token == T_EOF)
-		printf("none");
-	else if (T_IS_ERROR(token))
-		printf("error: 0x%X", token);
-	else
-		dump_elem(&pelem);
-	printf("\n");
-
-	uninit_parser_element(&pelem);
-
-	return EXIT_SUCCESS;
-}
-#endif /* TEST_PARSER */
-
-/* ----------------------------------------------------------------------
- * calcurate plural number
- */
-static unsigned long
-calculate_plural(const struct parser_element *pe, unsigned long n)
-{
-	unsigned long val0, val1;
-	switch (pe->kind) {
-	case T_IDENTIFIER:
-		return n;
-	case T_CONSTANT:
-		return pe->u.token_data.constant;
-	case '?':
-		val0 = calculate_plural(pe->u.parser_op.operands[0], n);
-		if (val0)
-			val1=calculate_plural(pe->u.parser_op.operands[1], n);
-		else
-			val1=calculate_plural(pe->u.parser_op.operands[2], n);
-		return val1;
-	case '!':
-		return !calculate_plural(pe->u.parser_op.operands[0], n);
-	case T_MULTIPLICATIVE:
-	case T_ADDITIVE:
-	case T_RELATIONAL:
-	case T_EQUALITY:
-	case T_LOR:
-	case T_LAND:
-		val0 = calculate_plural(pe->u.parser_op.operands[0], n);
-		val1 = calculate_plural(pe->u.parser_op.operands[1], n);
-		switch (pe->u.parser_op.op) {
-		case '*':
-			return val0*val1;
-		case '/':
-			return val0/val1;
-		case '%':
-			return val0%val1;
-		case '+':
-			return val0+val1;
-		case '-':
-			return val0-val1;
-		case '<':
-			return val0<val1;
-		case '>':
-			return val0>val1;
-		case OP_LTEQ:
-			return val0<=val1;
-		case OP_GTEQ:
-			return val0>=val1;
-		case OP_EQ:
-			return val0==val1;
-		case OP_NEQ:
-			return val0!=val1;
-		case '|':
-			return val0||val1;
-		case '&':
-			return val0&&val1;
-		}
-	}
-	return 0;
-}
-
-#ifdef TEST_CALC_PLURAL
-#include <stdio.h>
-
-int
-main(int argc, char **argv)
-{
-	struct tokenizer_context tcx;
-	struct parser_element pelem;
-	int token;
-
-	if (argc != 3) {
-		fprintf(stderr, "usage: %s <expression> <n>\n", argv[0]);
-		return EXIT_FAILURE;
-	}
-
-	init_tokenizer_context(&tcx);
-	_memstream_bind_ptr(&tcx.memstream, argv[1], strlen(argv[1]));
-
-	init_parser_element(&pelem);
-	token = parse_exp(&tcx, &pelem);
-
-	if (token == T_EOF)
-		printf("none");
-	else if (T_IS_ERROR(token))
-		printf("error: 0x%X", token);
-	else {
-		printf("plural = %lu",
-		       calculate_plural(&pelem, atoi(argv[2])));
-	}
-	printf("\n");
-
-	uninit_parser_element(&pelem);
-
-	return EXIT_SUCCESS;
-}
-#endif /* TEST_CALC_PLURAL */
-
-
-/* ----------------------------------------------------------------------
- * parse plural forms
- */
-
-static void
-region_skip_ws(struct _region *r)
-{
-	const char *str = _region_head(r);
-	size_t len = _region_size(r);
-
-	str = _bcs_skip_ws_len(str, &len);
-	_region_init(r, __UNCONST(str), len);
-}
-
-static void
-region_trunc_rws(struct _region *r)
-{
-	const char *str = _region_head(r);
-	size_t len = _region_size(r);
-
-	_bcs_trunc_rws_len(str, &len);
-	_region_init(r, __UNCONST(str), len);
-}
-
-static int
-region_check_prefix(struct _region *r, const char *pre, size_t prelen,
-		    int ignorecase)
-{
-	if (_region_size(r) < prelen)
-		return -1;
-
-	if (ignorecase) {
-		if (_bcs_strncasecmp(_region_head(r), pre, prelen))
-			return -1;
-	} else {
-		if (memcmp(_region_head(r), pre, prelen))
-			return -1;
-	}
-	return 0;
-}
-
-static int
-cut_trailing_semicolon(struct _region *r)
-{
-
-	region_trunc_rws(r);
-	if (_region_size(r) == 0 || _region_peek8(r, _region_size(r)-1) != ';')
-		return -1;
-	_region_get_subregion(r, r, 0, _region_size(r)-1);
-	return 0;
-}
-
-static int
-find_plural_forms(struct _region *r)
-{
-	struct _memstream ms;
-	struct _region rr;
-
-	_memstream_bind(&ms, r);
-
-	while (!_memstream_getln_region(&ms, &rr)) {
-		if (!region_check_prefix(&rr,
-					 PLURAL_FORMS, LEN_PLURAL_FORMS, 1)) {
-			_region_get_subregion(
-				r, &rr, LEN_PLURAL_FORMS,
-				_region_size(&rr)-LEN_PLURAL_FORMS);
-			region_skip_ws(r);
-			region_trunc_rws(r);
-			return 0;
-		}
-	}
-	return -1;
-}
-
-static int
-skip_assignment(struct _region *r, const char *sym, size_t symlen)
-{
-	region_skip_ws(r);
-	if (region_check_prefix(r, sym, symlen, 0))
-		return -1;
-	_region_get_subregion(r, r, symlen, _region_size(r)-symlen);
-	region_skip_ws(r);
-	if (_region_size(r) == 0 || _region_peek8(r, 0) != '=')
-		return -1;
-	_region_get_subregion(r, r, 1, _region_size(r)-1);
-	region_skip_ws(r);
-	return 0;
-}
-
-static int
-skip_nplurals(struct _region *r, unsigned long *rnp)
-{
-	unsigned long np;
-	char buf[MAX_LEN_ATOM+2], *endptr;
-	const char *endptrconst;
-	size_t ofs;
-
-	if (skip_assignment(r, NPLURALS_SYMBOL, LEN_NPLURAL_SYMBOL))
-		return -1;
-	if (_region_size(r) == 0 || !_bcs_isdigit(_region_peek8(r, 0)))
-		return -1;
-	strlcpy(buf, _region_head(r), sizeof (buf));
-	np = strtoul(buf, &endptr, 0);
-	endptrconst = _bcs_skip_ws(endptr);
-	if (*endptrconst != ';')
-		return -1;
-	ofs = endptrconst+1-buf;
-	if (_region_get_subregion(r, r, ofs, _region_size(r)-ofs))
-		return -1;
-	if (rnp)
-		*rnp = np;
-	return 0;
-}
-
-static int
-parse_plural_body(struct _region *r, struct parser_element **rpe)
-{
-	int token;
-	struct tokenizer_context tcx;
-	struct parser_element pelem, *ppe;
-
-	init_tokenizer_context(&tcx);
-	_memstream_bind(&tcx.memstream, r);
-
-	init_parser_element(&pelem);
-	token = parse_exp(&tcx, &pelem);
-	if (T_IS_ERROR(token))
-		return token;
-
-	ppe = dup_parser_element(&pelem);
-	if (ppe == NULL) {
-		uninit_parser_element(&pelem);
-		return T_NOMEM;
-	}
-
-	*rpe = ppe;
-
-	return 0;
-}
-
-static int
-parse_plural(struct parser_element **rpe, unsigned long *rnp,
-	     const char *str, size_t len)
-{
-	struct _region r;
-
-	_region_init(&r, __UNCONST(str), len);
-
-	if (find_plural_forms(&r))
-		return T_NOTFOUND;
-	if (skip_nplurals(&r, rnp))
-		return T_ILPLURAL;
-	if (skip_assignment(&r, PLURAL_SYMBOL, LEN_PLURAL_SYMBOL))
-		return T_ILPLURAL;
-	if (cut_trailing_semicolon(&r))
-		return T_ILPLURAL;
-	return parse_plural_body(&r, rpe);
-}
-
-#ifdef TEST_PARSE_PLURAL
-int
-main(int argc, char **argv)
-{
-	int ret;
-	struct parser_element *pelem;
-	unsigned long np;
-
-	if (argc != 2 && argc != 3) {
-		fprintf(stderr, "usage: %s <mime-header> [n]\n", argv[0]);
-		return EXIT_FAILURE;
-	}
-
-	ret = parse_plural(&pelem, &np, argv[1], strlen(argv[1]));
-
-	if (ret == T_EOF)
-		printf("none");
-	else if (T_IS_ERROR(ret))
-		printf("error: 0x%X", ret);
-	else {
-		printf("syntax tree: ");
-		dump_elem(pelem);
-		printf("\nnplurals = %lu", np);
-		if (argv[2])
-			printf(", plural = %lu",
-			       calculate_plural(pelem, atoi(argv[2])));
-		free_parser_element(pelem);
-	}
-	printf("\n");
-
-
-	return EXIT_SUCCESS;
-}
-#endif /* TEST_PARSE_PLURAL */
-
-/*
- * external interface
- */
-
-int
-_gettext_parse_plural(struct gettext_plural **rpe, unsigned long *rnp,
-		      const char *str, size_t len)
-{
-	return parse_plural((struct parser_element **)rpe, rnp, str, len);
-}
-
-unsigned long
-_gettext_calculate_plural(const struct gettext_plural *pe, unsigned long n)
-{
-	return calculate_plural((void *)__UNCONST(pe), n);
-}
-
-void
-_gettext_free_plural(struct gettext_plural *pe)
-{
-	free_parser_element((void *)pe);
-}
-
-#ifdef TEST_PLURAL
-#include <libintl.h>
-#include <locale.h>
-
-#define PR(n)	printf("n=%d: \"%s\"\n", n, dngettext("test", "1", "2", n))
-
-int
-main(void)
-{
-	bindtextdomain("test", "."); /* ./LANG/LC_MESSAGES/test.mo */
-	PR(1);
-	PR(2);
-	PR(3);
-	PR(4);
-
-	return 0;
-}
-#endif
diff --git a/lib/libintl/plural_parser.h b/lib/libintl/plural_parser.h
deleted file mode 100644
index 74dff9090..000000000
--- a/lib/libintl/plural_parser.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$NetBSD: plural_parser.h,v 1.2 2007/09/25 08:19:09 junyoung Exp $	*/
-
-/*-
- * Copyright (c) 2005 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef PLURAL_PARSER_H_
-#define PLURAL_PARSER_H_
-
-struct gettext_plural;
-
-__BEGIN_DECLS
-int _gettext_parse_plural(struct gettext_plural **, unsigned long *,
-			  const char *, size_t);
-unsigned long _gettext_calculate_plural(const struct gettext_plural *,
-					unsigned long);
-void _gettext_free_plural(struct gettext_plural *);
-__END_DECLS
-
-#endif
diff --git a/lib/libintl/shlib_version b/lib/libintl/shlib_version
deleted file mode 100644
index dc5f5a463..000000000
--- a/lib/libintl/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.3 2015/05/29 12:27:03 christos Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=1
-minor=1
diff --git a/lib/libintl/strhash.c b/lib/libintl/strhash.c
deleted file mode 100644
index 883556985..000000000
--- a/lib/libintl/strhash.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: strhash.c,v 1.3 2007/09/25 08:19:09 junyoung Exp $	*/
-
-/*-
- * Copyright (c)2003, 2004 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strhash.c,v 1.3 2007/09/25 08:19:09 junyoung Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/types.h>
-
-#include "libintl_local.h"
-
-/*
- * string hash function by P.J.Weinberger.
- * this implementation is derived from src/lib/libc/citrus/citrus_db_hash.c.
- */
-uint32_t
-/*ARGSUSED*/
-__intl_string_hash(const char *str)
-{
-	const uint8_t *p;
-	uint32_t hash = 0, tmp;
-
-	for (p = (const uint8_t *)str; *p; p++) {
-		hash <<= 4;
-		hash += *p;
-		tmp = hash & 0xF0000000;
-		if (tmp != 0) {
-			hash ^= tmp;
-			hash ^= tmp >> 24;
-		}
-	}
-	return hash;
-}
diff --git a/lib/libintl/sysdep.c b/lib/libintl/sysdep.c
deleted file mode 100644
index 48b9d814e..000000000
--- a/lib/libintl/sysdep.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/*	$NetBSD: sysdep.c,v 1.2 2005/04/27 09:50:26 yamt Exp $	*/
-
-/*-
- * Copyright (c)2004 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sysdep.c,v 1.2 2005/04/27 09:50:26 yamt Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/types.h>
-
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "libintl_local.h"
-
-struct sysdep_pair
-{
-	const char *tag;
-	const char *string;
-	size_t len;
-};
-
-#define T_(tag)		{ #tag, tag, sizeof (tag)-1 }
-#define numof(a)	(sizeof (a) / sizeof ((a)[0]))
-
-const struct sysdep_pair sysdep_pair_table[] = {
-	/* this table must be sorted in the dictionary order. */
-	T_(PRIX16),
-	T_(PRIX32),
-	T_(PRIX64),
-	T_(PRIX8),
-	T_(PRIXFAST16),
-	T_(PRIXFAST32),
-	T_(PRIXFAST64),
-	T_(PRIXFAST8),
-	T_(PRIXLEAST16),
-	T_(PRIXLEAST32),
-	T_(PRIXLEAST64),
-	T_(PRIXLEAST8),
-	T_(PRIXMAX),
-	T_(PRIXPTR),
-	T_(PRId16),
-	T_(PRId32),
-	T_(PRId64),
-	T_(PRId8),
-	T_(PRIdFAST16),
-	T_(PRIdFAST32),
-	T_(PRIdFAST64),
-	T_(PRIdFAST8),
-	T_(PRIdLEAST16),
-	T_(PRIdLEAST32),
-	T_(PRIdLEAST64),
-	T_(PRIdLEAST8),
-	T_(PRIdMAX),
-	T_(PRIdPTR),
-	T_(PRIi16),
-	T_(PRIi32),
-	T_(PRIi64),
-	T_(PRIi8),
-	T_(PRIiFAST16),
-	T_(PRIiFAST32),
-	T_(PRIiFAST64),
-	T_(PRIiFAST8),
-	T_(PRIiLEAST16),
-	T_(PRIiLEAST32),
-	T_(PRIiLEAST64),
-	T_(PRIiLEAST8),
-	T_(PRIiMAX),
-	T_(PRIiPTR),
-	T_(PRIo16),
-	T_(PRIo32),
-	T_(PRIo64),
-	T_(PRIo8),
-	T_(PRIoFAST16),
-	T_(PRIoFAST32),
-	T_(PRIoFAST64),
-	T_(PRIoFAST8),
-	T_(PRIoLEAST16),
-	T_(PRIoLEAST32),
-	T_(PRIoLEAST64),
-	T_(PRIoLEAST8),
-	T_(PRIoMAX),
-	T_(PRIoPTR),
-	T_(PRIu16),
-	T_(PRIu32),
-	T_(PRIu64),
-	T_(PRIu8),
-	T_(PRIuFAST16),
-	T_(PRIuFAST32),
-	T_(PRIuFAST64),
-	T_(PRIuFAST8),
-	T_(PRIuLEAST16),
-	T_(PRIuLEAST32),
-	T_(PRIuLEAST64),
-	T_(PRIuLEAST8),
-	T_(PRIuMAX),
-	T_(PRIuPTR),
-	T_(PRIx16),
-	T_(PRIx32),
-	T_(PRIx64),
-	T_(PRIx8),
-	T_(PRIxFAST16),
-	T_(PRIxFAST32),
-	T_(PRIxFAST64),
-	T_(PRIxFAST8),
-	T_(PRIxLEAST16),
-	T_(PRIxLEAST32),
-	T_(PRIxLEAST64),
-	T_(PRIxLEAST8),
-	T_(PRIxMAX),
-	T_(PRIxPTR),
-	T_(SCNd16),
-	T_(SCNd32),
-	T_(SCNd64),
-	T_(SCNd8),
-	T_(SCNdFAST16),
-	T_(SCNdFAST32),
-	T_(SCNdFAST64),
-	T_(SCNdFAST8),
-	T_(SCNdLEAST16),
-	T_(SCNdLEAST32),
-	T_(SCNdLEAST64),
-	T_(SCNdLEAST8),
-	T_(SCNdMAX),
-	T_(SCNdPTR),
-	T_(SCNi16),
-	T_(SCNi32),
-	T_(SCNi64),
-	T_(SCNi8),
-	T_(SCNiFAST16),
-	T_(SCNiFAST32),
-	T_(SCNiFAST64),
-	T_(SCNiFAST8),
-	T_(SCNiLEAST16),
-	T_(SCNiLEAST32),
-	T_(SCNiLEAST64),
-	T_(SCNiLEAST8),
-	T_(SCNiMAX),
-	T_(SCNiPTR),
-	T_(SCNo16),
-	T_(SCNo32),
-	T_(SCNo64),
-	T_(SCNo8),
-	T_(SCNoFAST16),
-	T_(SCNoFAST32),
-	T_(SCNoFAST64),
-	T_(SCNoFAST8),
-	T_(SCNoLEAST16),
-	T_(SCNoLEAST32),
-	T_(SCNoLEAST64),
-	T_(SCNoLEAST8),
-	T_(SCNoMAX),
-	T_(SCNoPTR),
-	T_(SCNu16),
-	T_(SCNu32),
-	T_(SCNu64),
-	T_(SCNu8),
-	T_(SCNuFAST16),
-	T_(SCNuFAST32),
-	T_(SCNuFAST64),
-	T_(SCNuFAST8),
-	T_(SCNuLEAST16),
-	T_(SCNuLEAST32),
-	T_(SCNuLEAST64),
-	T_(SCNuLEAST8),
-	T_(SCNuMAX),
-	T_(SCNuPTR),
-	T_(SCNx16),
-	T_(SCNx32),
-	T_(SCNx64),
-	T_(SCNx8),
-	T_(SCNxFAST16),
-	T_(SCNxFAST32),
-	T_(SCNxFAST64),
-	T_(SCNxFAST8),
-	T_(SCNxLEAST16),
-	T_(SCNxLEAST32),
-	T_(SCNxLEAST64),
-	T_(SCNxLEAST8),
-	T_(SCNxMAX),
-	T_(SCNxPTR)
-};
-
-static int
-cmp_sysdep_tag(const void *tag, const void *elem)
-{
-	const struct sysdep_pair *pair = elem;
-
-	return strcmp(tag, pair->tag);
-}
-
-const char *
-__intl_sysdep_get_string_by_tag(const char *tag, size_t *rlen)
-{
-	const struct sysdep_pair *found;
-
-	found = bsearch(tag, sysdep_pair_table, numof(sysdep_pair_table),
-			sizeof(sysdep_pair_table[0]), &cmp_sysdep_tag);
-
-	if (found) {
-		if (rlen)
-			*rlen = found->len;
-		return found->string;
-	}
-
-	if (rlen)
-		*rlen = 0;
-	return "";
-}
diff --git a/lib/libintl/textdomain.c b/lib/libintl/textdomain.c
deleted file mode 100644
index a9c135483..000000000
--- a/lib/libintl/textdomain.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*	$NetBSD: textdomain.c,v 1.14 2015/05/29 12:26:28 christos Exp $	*/
-
-/*-
- * Copyright (c) 2000, 2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: textdomain.c,v 1.14 2015/05/29 12:26:28 christos Exp $");
-
-#include <sys/param.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <libintl.h>
-#include "libintl_local.h"
-#include "pathnames.h"
-
-static struct domainbinding __default_binding = {
-	.path = { _PATH_TEXTDOMAIN },
-	.domainname = { DEFAULT_DOMAINNAME },
-};
-struct domainbinding *__bindings = &__default_binding;
-char __current_domainname[PATH_MAX] = DEFAULT_DOMAINNAME;
-
-static struct domainbinding *domainbinding_lookup(const char *, int);
-
-/*
- * set the default domainname for dcngettext() and friends.
- */
-char *
-textdomain(const char *domainname)
-{
-
-	/* NULL pointer gives the current setting */
-	if (!domainname)
-		return __current_domainname;
-
-	/* empty string sets the value back to the default */
-	if (!*domainname) {
-		strlcpy(__current_domainname, DEFAULT_DOMAINNAME,
-		    sizeof(__current_domainname));
-	} else {
-		strlcpy(__current_domainname, domainname,
-		    sizeof(__current_domainname));
-	}
-	return __current_domainname;
-}
-
-char *
-bindtextdomain(const char *domainname, const char *dirname)
-{
-	struct domainbinding *p;
-
-	/* NULL pointer or empty string returns NULL with no operation */
-	if (!domainname || !*domainname)
-		return NULL;
-
-	if (dirname && (strlen(dirname) + 1 > sizeof(p->path)))
-		return NULL;
-
-#if 0
-	/* disallow relative path */
-	if (dirname[0] != '/')
-		return NULL;
-#endif
-
-	if (strlen(domainname) + 1 > sizeof(p->domainname))
-		return NULL;
-
-	p = domainbinding_lookup(domainname, (dirname != NULL));
-
-	if (!dirname) {
-		if (p)
-			return (p->path);
-		else
-			return (char *)__UNCONST(_PATH_TEXTDOMAIN);
-	}
-
-	strlcpy(p->path, dirname, sizeof(p->path));
-	p->mohandle.mo.mo_magic = 0; /* invalidate current mapping */
-
-	return (p->path);
-}
-
-char *
-bind_textdomain_codeset(const char *domainname, const char *codeset)
-{
-	struct domainbinding *p;
-
-	p = domainbinding_lookup(domainname, (codeset != NULL));
-	if (p == NULL)
-		return NULL;
-
-	if (codeset) {
-		free(p->codeset);
-		p->codeset = strdup(codeset);
-	}
-
-	return p->codeset;
-}
-
-/*
- * lookup binding for the domainname
- */
-static struct domainbinding *
-domainbinding_lookup(const char *domainname, int alloc)
-{
-	struct domainbinding *p;
-
-	for (p = __bindings; p; p = p->next)
-		if (strcmp(p->domainname, domainname) == 0)
-			break;
-
-	if (!p && alloc) {
-		p = (struct domainbinding *)malloc(sizeof(*p));
-		if (!p)
-			return NULL;
-		memset(p, 0, sizeof(*p));
-		p->next = __bindings;
-		strlcpy(p->domainname, domainname, sizeof(p->domainname));
-		__bindings = p;
-	}
-
-	return p;
-}
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
deleted file mode 100644
index 2678c1101..000000000
--- a/lib/libkvm/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-#	$NetBSD: Makefile,v 1.50 2014/08/10 23:39:08 matt Exp $
-#	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-
-WARNS=	3
-
-USE_FORT?= yes	# used primarily by setgid programs
-
-USE_SHLIBDIR=	yes
-
-LIB=	kvm
-CPPFLAGS+=-DLIBC_SCCS -I${NETBSDSRCDIR}/sys -D_KMEMUSER
-
-SRCS=	kvm.c kvm_file.c kvm_getloadavg.c kvm_proc.c
-
-# This library should compile to the same thing on all variants of
-# ${MACHINE} with the same ${MACHINE_ARCH} so shared /usr works.
-# If it is necessary to run different code based on ${MACHINE} then
-# the dispatch on ${MACHINE} should be done at run time (see m68k).
-
-.include <bsd.own.mk>
-.if exists(kvm_${KVM_MACHINE_ARCH}.c)
-SRCS+=	kvm_${KVM_MACHINE_ARCH}.c
-.elif exists(kvm_${KVM_MACHINE_CPU}.c)
-SRCS+=	kvm_${KVM_MACHINE_CPU}.c
-.elif exists(kvm_${MACHINE_ARCH}.c)
-SRCS+=	kvm_${MACHINE_ARCH}.c
-.elif  exists(kvm_${MACHINE_CPU}.c)
-SRCS+=	kvm_${MACHINE_CPU}.c
-.else
-.BEGIN:
-	@echo no kvm_xx.c for ${MACHINE_ARCH} nor ${MACHINE_CPU}
-	@false
-.endif
-
-.if ${MACHINE_ARCH} == "i386"
-LINTFLAGS+=-w
-SRCS+=	kvm_i386pae.c # Hook PAE support in the i386 build
-.endif
-
-# Additional modules needed for m68k
-.if (${MACHINE_ARCH} == "m68k" || ${MACHINE_CPU} == "m68k")
-SRCS+=	kvm_m68k_cmn.c kvm_sun2.c kvm_sun3.c kvm_sun3x.c
-.endif
-
-MAN=	kvm.3 kvm_dump.3 kvm_geterr.3 kvm_getfiles.3 kvm_getloadavg.3 \
-	kvm_getkernelname.3 \
-	kvm_getprocs.3 kvm_nlist.3 kvm_open.3 kvm_read.3 kvm_getlwps.3
-
-MLINKS+=kvm_getprocs.3 kvm_getargv.3 kvm_getprocs.3 kvm_getenvv.3
-MLINKS+=kvm_getprocs.3 kvm_getproc2.3
-MLINKS+=kvm_getprocs.3 kvm_getargv2.3 kvm_getprocs.3 kvm_getenvv2.3
-MLINKS+=kvm_open.3 kvm_openfiles.3 kvm_open.3 kvm_close.3
-MLINKS+=kvm_read.3 kvm_write.3
-MLINKS+=kvm_dump.3 kvm_dump_mkheader.3 kvm_dump.3 kvm_dump_wrtheader.3
-MLINKS+=kvm_dump.3 kvm_dump_inval.3
-
-# This fixes building with MACHINE==sparc64, MACHINE_ARCH==sparc
-# XXX:	this is a hack, but until the sparc MD headers are separated
-#	out from the sparc AD headers, it's the easiest solution.
-#
-.if (${MACHINE_ARCH} == "sparc")	# {
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
-	@([ -h machine ] || \
-	    ln -fs ${NETBSDSRCDIR}/sys/arch/sparc/include machine)
-	@([ -h sparc ] || ln -fs ${NETBSDSRCDIR}/sys/arch/sparc/include sparc)
-.NOPATH: machine sparc
-.endif
-CLEANFILES+=	machine sparc
-CPPFLAGS+=	-I.
-.endif					# }
-
-
-.include <bsd.lib.mk>
diff --git a/lib/libkvm/kvm.3 b/lib/libkvm/kvm.3
deleted file mode 100644
index acf2f4a44..000000000
--- a/lib/libkvm/kvm.3
+++ /dev/null
@@ -1,110 +0,0 @@
-.\"	$NetBSD: kvm.3,v 1.13 2011/09/13 08:53:15 wiz Exp $
-.\"
-.\" Copyright (c) 1992, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software 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.
-.\" 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.
-.\"
-.\"     @(#)kvm.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd September 14, 2011
-.Dt KVM 3
-.Os
-.Sh NAME
-.Nm kvm
-.Nd kernel memory interface
-.Sh LIBRARY
-.Lb libkvm
-.Sh DESCRIPTION
-The
-.Nm
-library provides a uniform interface for accessing kernel virtual memory
-images, including live systems and crash dumps.
-Access to live systems is via
-.Pa /dev/mem
-while crash dumps can be examined via the core file generated by
-.Xr savecore 8 .
-The interface behaves identically in both cases.
-Memory can be read and written, kernel symbol addresses can be
-looked up efficiently, and information about user processes can
-be gathered.
-.Pp
-.Fn kvm_open
-is first called to obtain a descriptor for all subsequent calls.
-.Sh FILES
-.Bl -tag -width /dev/mem -compact
-.It Pa /dev/mem
-interface to physical memory
-.El
-.Sh COMPATIBILITY
-The kvm interface was first introduced in SunOS.
-A considerable number of programs have been developed that use this
-interface, making backward compatibility highly desirable.
-In most respects, the Sun kvm interface is consistent and clean.
-Accordingly, the generic portion of the interface (i.e.,
-.Fn kvm_open ,
-.Fn kvm_close ,
-.Fn kvm_read ,
-.Fn kvm_write ,
-and
-.Fn kvm_nlist )
-has been incorporated into the
-.Bx
-interface.
-Indeed, many kvm applications (i.e., debuggers and statistical monitors)
-use only this subset of the interface.
-.Pp
-The process interface was not kept.
-This is not a portability issue since any code that manipulates
-processes is inherently machine dependent.
-.Pp
-Finally, the Sun kvm error reporting semantics are poorly defined.
-The library can be configured either to print errors to stderr automatically,
-or to print no error messages at all.
-In the latter case, the nature of the error cannot be determined.
-To overcome this, the
-.Bx
-interface includes a routine,
-.Xr kvm_geterr 3 ,
-to return (not print out) the error message corresponding to the most
-recent error condition on the given descriptor.
-.Sh SEE ALSO
-.Xr kvm_close 3 ,
-.Xr kvm_getargv 3 ,
-.Xr kvm_getenvv 3 ,
-.Xr kvm_geterr 3 ,
-.Xr kvm_getkernelname 3 ,
-.Xr kvm_getloadavg 3 ,
-.Xr kvm_getlwps 3 ,
-.Xr kvm_getprocs 3 ,
-.Xr kvm_nlist 3 ,
-.Xr kvm_open 3 ,
-.Xr kvm_openfiles 3 ,
-.Xr kvm_read 3 ,
-.Xr kvm_write 3
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
deleted file mode 100644
index a6e27b5a7..000000000
--- a/lib/libkvm/kvm.c
+++ /dev/null
@@ -1,930 +0,0 @@
-/*	$NetBSD: kvm.c,v 1.101 2014/02/19 20:21:22 dsl Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm.c	8.2 (Berkeley) 2/13/94";
-#else
-__RCSID("$NetBSD: kvm.c,v 1.101 2014/02/19 20:21:22 dsl Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/lwp.h>
-#include <sys/proc.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/sysctl.h>
-
-#include <sys/core.h>
-#include <sys/exec.h>
-#include <sys/kcore.h>
-#include <sys/ksyms.h>
-#include <sys/types.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <machine/cpu.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <nlist.h>
-#include <paths.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <kvm.h>
-
-#include "kvm_private.h"
-
-static int	_kvm_get_header(kvm_t *);
-static kvm_t	*_kvm_open(kvm_t *, const char *, const char *,
-		    const char *, int, char *);
-static int	clear_gap(kvm_t *, bool (*)(void *, const void *, size_t),
-		    void *, size_t);
-static off_t	Lseek(kvm_t *, int, off_t, int);
-static ssize_t	Pread(kvm_t *, int, void *, size_t, off_t);
-
-char *
-kvm_geterr(kvm_t *kd)
-{
-	return (kd->errbuf);
-}
-
-const char *
-kvm_getkernelname(kvm_t *kd)
-{
-	return kd->kernelname;
-}
-
-/*
- * Report an error using printf style arguments.  "program" is kd->program
- * on hard errors, and 0 on soft errors, so that under sun error emulation,
- * only hard errors are printed out (otherwise, programs like gdb will
- * generate tons of error messages when trying to access bogus pointers).
- */
-void
-_kvm_err(kvm_t *kd, const char *program, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	if (program != NULL) {
-		(void)fprintf(stderr, "%s: ", program);
-		(void)vfprintf(stderr, fmt, ap);
-		(void)fputc('\n', stderr);
-	} else
-		(void)vsnprintf(kd->errbuf,
-		    sizeof(kd->errbuf), fmt, ap);
-
-	va_end(ap);
-}
-
-void
-_kvm_syserr(kvm_t *kd, const char *program, const char *fmt, ...)
-{
-	va_list ap;
-	size_t n;
-
-	va_start(ap, fmt);
-	if (program != NULL) {
-		(void)fprintf(stderr, "%s: ", program);
-		(void)vfprintf(stderr, fmt, ap);
-		(void)fprintf(stderr, ": %s\n", strerror(errno));
-	} else {
-		char *cp = kd->errbuf;
-
-		(void)vsnprintf(cp, sizeof(kd->errbuf), fmt, ap);
-		n = strlen(cp);
-		(void)snprintf(&cp[n], sizeof(kd->errbuf) - n, ": %s",
-		    strerror(errno));
-	}
-	va_end(ap);
-}
-
-void *
-_kvm_malloc(kvm_t *kd, size_t n)
-{
-	void *p;
-
-	if ((p = malloc(n)) == NULL)
-		_kvm_err(kd, kd->program, "%s", strerror(errno));
-	return (p);
-}
-
-/*
- * Wrapper around the lseek(2) system call; calls _kvm_syserr() for us
- * in the event of emergency.
- */
-static off_t
-Lseek(kvm_t *kd, int fd, off_t offset, int whence)
-{
-	off_t off;
-
-	errno = 0;
-
-	if ((off = lseek(fd, offset, whence)) == -1 && errno != 0) {
-		_kvm_syserr(kd, kd->program, "Lseek");
-		return ((off_t)-1);
-	}
-	return (off);
-}
-
-ssize_t
-_kvm_pread(kvm_t *kd, int fd, void *buf, size_t size, off_t off)
-{
-	ptrdiff_t moff;
-	void *newbuf;
-	size_t dsize;
-	ssize_t rv;
-	off_t doff;
-
-	/* If aligned nothing to do. */
- 	if (((off % kd->fdalign) | (size % kd->fdalign)) == 0) {
-		return pread(fd, buf, size, off);
- 	}
-
-	/*
-	 * Otherwise must buffer.  We can't tolerate short reads in this
-	 * case (lazy bum).
-	 */
-	moff = (ptrdiff_t)off % kd->fdalign;
-	doff = off - moff;
-	dsize = moff + size + kd->fdalign - 1;
-	dsize -= dsize % kd->fdalign;
-	if (kd->iobufsz < dsize) {
-		newbuf = realloc(kd->iobuf, dsize);
-		if (newbuf == NULL) {
-			_kvm_syserr(kd, 0, "cannot allocate I/O buffer");
-			return (-1);
-		}
-		kd->iobuf = newbuf;
-		kd->iobufsz = dsize;
-	}
-	rv = pread(fd, kd->iobuf, dsize, doff);
-	if (rv < size + moff)
-		return -1;
-	memcpy(buf, kd->iobuf + moff, size);
-	return size;
-}
-
-/*
- * Wrapper around the pread(2) system call; calls _kvm_syserr() for us
- * in the event of emergency.
- */
-static ssize_t
-Pread(kvm_t *kd, int fd, void *buf, size_t nbytes, off_t offset)
-{
-	ssize_t rv;
-
-	errno = 0;
-
-	if ((rv = _kvm_pread(kd, fd, buf, nbytes, offset)) != nbytes &&
-	    errno != 0)
-		_kvm_syserr(kd, kd->program, "Pread");
-	return (rv);
-}
-
-static kvm_t *
-_kvm_open(kvm_t *kd, const char *uf, const char *mf, const char *sf, int flag,
-    char *errout)
-{
-	struct stat st;
-	int ufgiven;
-
-	kd->pmfd = -1;
-	kd->vmfd = -1;
-	kd->swfd = -1;
-	kd->nlfd = -1;
-	kd->alive = KVM_ALIVE_DEAD;
-	kd->procbase = NULL;
-	kd->procbase_len = 0;
-	kd->procbase2 = NULL;
-	kd->procbase2_len = 0;
-	kd->lwpbase = NULL;
-	kd->lwpbase_len = 0;
-	kd->nbpg = getpagesize();
-	kd->swapspc = NULL;
-	kd->argspc = NULL;
-	kd->argspc_len = 0;
-	kd->argbuf = NULL;
-	kd->argv = NULL;
-	kd->vmst = NULL;
-	kd->vm_page_buckets = NULL;
-	kd->kcore_hdr = NULL;
-	kd->cpu_dsize = 0;
-	kd->cpu_data = NULL;
-	kd->dump_off = 0;
-	kd->fdalign = 1;
-	kd->iobuf = NULL;
-	kd->iobufsz = 0;
-
-	if (flag & KVM_NO_FILES) {
-		kd->alive = KVM_ALIVE_SYSCTL;
-		return(kd);
-	}
-
-	/*
-	 * Call the MD open hook.  This sets:
-	 *	usrstack, min_uva, max_uva
-	 */
-	if (_kvm_mdopen(kd)) {
-		_kvm_err(kd, kd->program, "md init failed");
-		goto failed;
-	}
-
-	ufgiven = (uf != NULL);
-	if (!ufgiven) {
-#ifdef CPU_BOOTED_KERNEL
-		/* 130 is 128 + '/' + '\0' */
-		static char booted_kernel[130];
-		int mib[2], rc;
-		size_t len;
-
-		mib[0] = CTL_MACHDEP;
-		mib[1] = CPU_BOOTED_KERNEL;
-		booted_kernel[0] = '/';
-		booted_kernel[1] = '\0';
-		len = sizeof(booted_kernel) - 2;
-		rc = sysctl(&mib[0], 2, &booted_kernel[1], &len, NULL, 0);
-		booted_kernel[sizeof(booted_kernel) - 1] = '\0';
-		uf = (booted_kernel[1] == '/') ?
-		    &booted_kernel[1] : &booted_kernel[0];
-		if (rc != -1)
-			rc = stat(uf, &st);
-		if (rc != -1 && !S_ISREG(st.st_mode))
-			rc = -1;
-		if (rc == -1)
-#endif /* CPU_BOOTED_KERNEL */
-			uf = _PATH_UNIX;
-	}
-	else if (strlen(uf) >= MAXPATHLEN) {
-		_kvm_err(kd, kd->program, "exec file name too long");
-		goto failed;
-	}
-	if (flag & ~O_RDWR) {
-		_kvm_err(kd, kd->program, "bad flags arg");
-		goto failed;
-	}
-	if (mf == 0)
-		mf = _PATH_MEM;
-	if (sf == 0)
-		sf = _PATH_DRUM;
-
-	/*
-	 * Open the kernel namelist.  If /dev/ksyms doesn't
-	 * exist, open the current kernel.
-	 */
-	if (ufgiven == 0)
-		kd->nlfd = open(_PATH_KSYMS, O_RDONLY | O_CLOEXEC, 0);
-	if (kd->nlfd < 0) {
-		if ((kd->nlfd = open(uf, O_RDONLY | O_CLOEXEC, 0)) < 0) {
-			_kvm_syserr(kd, kd->program, "%s", uf);
-			goto failed;
-		}
-		strlcpy(kd->kernelname, uf, sizeof(kd->kernelname));
-	} else {
-		strlcpy(kd->kernelname, _PATH_KSYMS, sizeof(kd->kernelname));
-		/*
-		 * We're here because /dev/ksyms was opened
-		 * successfully.  However, we don't want to keep it
-		 * open, so we close it now.  Later, we will open
-		 * it again, since it will be the only case where
-		 * kd->nlfd is negative.
-		 */
-		close(kd->nlfd);
-		kd->nlfd = -1;
-	}
-
-	if ((kd->pmfd = open(mf, flag | O_CLOEXEC, 0)) < 0) {
-		_kvm_syserr(kd, kd->program, "%s", mf);
-		goto failed;
-	}
-	if (fstat(kd->pmfd, &st) < 0) {
-		_kvm_syserr(kd, kd->program, "%s", mf);
-		goto failed;
-	}
-	if (S_ISCHR(st.st_mode) && strcmp(mf, _PATH_MEM) == 0) {
-		/*
-		 * If this is /dev/mem, open kmem too.  (Maybe we should
-		 * make it work for either /dev/mem or /dev/kmem -- in either
-		 * case you're working with a live kernel.)
-		 */
-		if ((kd->vmfd = open(_PATH_KMEM, flag | O_CLOEXEC, 0)) < 0) {
-			_kvm_syserr(kd, kd->program, "%s", _PATH_KMEM);
-			goto failed;
-		}
-		kd->alive = KVM_ALIVE_FILES;
-		if ((kd->swfd = open(sf, flag | O_CLOEXEC, 0)) < 0) {
-			if (errno != ENXIO) {
-				_kvm_syserr(kd, kd->program, "%s", sf);
-				goto failed;
-			}
-			/* swap is not configured?  not fatal */
-		}
-	} else {
-		kd->fdalign = DEV_BSIZE;	/* XXX */
-		/*
-		 * This is a crash dump.
-		 * Initialize the virtual address translation machinery.
-		 *
-		 * If there is no valid core header, fail silently here.
-		 * The address translations however will fail without
-		 * header. Things can be made to run by calling
-		 * kvm_dump_mkheader() before doing any translation.
-		 */
-		if (_kvm_get_header(kd) == 0) {
-			if (_kvm_initvtop(kd) < 0)
-				goto failed;
-		}
-	}
-	return (kd);
-failed:
-	/*
-	 * Copy out the error if doing sane error semantics.
-	 */
-	if (errout != 0)
-		(void)strlcpy(errout, kd->errbuf, _POSIX2_LINE_MAX);
-	(void)kvm_close(kd);
-	return (0);
-}
-
-/*
- * The kernel dump file (from savecore) contains:
- *    kcore_hdr_t kcore_hdr;
- *    kcore_seg_t cpu_hdr;
- *    (opaque)    cpu_data; (size is cpu_hdr.c_size)
- *	  kcore_seg_t mem_hdr;
- *    (memory)    mem_data; (size is mem_hdr.c_size)
- *
- * Note: khdr is padded to khdr.c_hdrsize;
- * cpu_hdr and mem_hdr are padded to khdr.c_seghdrsize
- */
-static int
-_kvm_get_header(kvm_t *kd)
-{
-	kcore_hdr_t	kcore_hdr;
-	kcore_seg_t	cpu_hdr;
-	kcore_seg_t	mem_hdr;
-	size_t		offset;
-	ssize_t		sz;
-
-	/*
-	 * Read the kcore_hdr_t
-	 */
-	sz = Pread(kd, kd->pmfd, &kcore_hdr, sizeof(kcore_hdr), (off_t)0);
-	if (sz != sizeof(kcore_hdr))
-		return (-1);
-
-	/*
-	 * Currently, we only support dump-files made by the current
-	 * architecture...
-	 */
-	if ((CORE_GETMAGIC(kcore_hdr) != KCORE_MAGIC) ||
-	    (CORE_GETMID(kcore_hdr) != MID_MACHINE))
-		return (-1);
-
-	/*
-	 * Currently, we only support exactly 2 segments: cpu-segment
-	 * and data-segment in exactly that order.
-	 */
-	if (kcore_hdr.c_nseg != 2)
-		return (-1);
-
-	/*
-	 * Save away the kcore_hdr.  All errors after this
-	 * should do a to "goto fail" to deallocate things.
-	 */
-	kd->kcore_hdr = _kvm_malloc(kd, sizeof(kcore_hdr));
-	memcpy(kd->kcore_hdr, &kcore_hdr, sizeof(kcore_hdr));
-	offset = kcore_hdr.c_hdrsize;
-
-	/*
-	 * Read the CPU segment header
-	 */
-	sz = Pread(kd, kd->pmfd, &cpu_hdr, sizeof(cpu_hdr), (off_t)offset);
-	if (sz != sizeof(cpu_hdr))
-		goto fail;
-	if ((CORE_GETMAGIC(cpu_hdr) != KCORESEG_MAGIC) ||
-	    (CORE_GETFLAG(cpu_hdr) != CORE_CPU))
-		goto fail;
-	offset += kcore_hdr.c_seghdrsize;
-
-	/*
-	 * Read the CPU segment DATA.
-	 */
-	kd->cpu_dsize = cpu_hdr.c_size;
-	kd->cpu_data = _kvm_malloc(kd, cpu_hdr.c_size);
-	if (kd->cpu_data == NULL)
-		goto fail;
-	sz = Pread(kd, kd->pmfd, kd->cpu_data, cpu_hdr.c_size, (off_t)offset);
-	if (sz != cpu_hdr.c_size)
-		goto fail;
-	offset += cpu_hdr.c_size;
-
-	/*
-	 * Read the next segment header: data segment
-	 */
-	sz = Pread(kd, kd->pmfd, &mem_hdr, sizeof(mem_hdr), (off_t)offset);
-	if (sz != sizeof(mem_hdr))
-		goto fail;
-	offset += kcore_hdr.c_seghdrsize;
-
-	if ((CORE_GETMAGIC(mem_hdr) != KCORESEG_MAGIC) ||
-	    (CORE_GETFLAG(mem_hdr) != CORE_DATA))
-		goto fail;
-
-	kd->dump_off = offset;
-	return (0);
-
-fail:
-	if (kd->kcore_hdr != NULL) {
-		free(kd->kcore_hdr);
-		kd->kcore_hdr = NULL;
-	}
-	if (kd->cpu_data != NULL) {
-		free(kd->cpu_data);
-		kd->cpu_data = NULL;
-		kd->cpu_dsize = 0;
-	}
-	return (-1);
-}
-
-/*
- * The format while on the dump device is: (new format)
- *	kcore_seg_t cpu_hdr;
- *	(opaque)    cpu_data; (size is cpu_hdr.c_size)
- *	kcore_seg_t mem_hdr;
- *	(memory)    mem_data; (size is mem_hdr.c_size)
- */
-int
-kvm_dump_mkheader(kvm_t *kd, off_t dump_off)
-{
-	kcore_seg_t	cpu_hdr;
-	size_t hdr_size;
-	ssize_t sz;
-
-	if (kd->kcore_hdr != NULL) {
-	    _kvm_err(kd, kd->program, "already has a dump header");
-	    return (-1);
-	}
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, kd->program, "don't use on live kernel");
-		return (-1);
-	}
-
-	/*
-	 * Validate new format crash dump
-	 */
-	sz = Pread(kd, kd->pmfd, &cpu_hdr, sizeof(cpu_hdr), dump_off);
-	if (sz != sizeof(cpu_hdr)) {
-		_kvm_err(kd, 0, "read %zx bytes at offset %"PRIx64
-		    " for cpu_hdr instead of requested %zu",
-		    sz, dump_off, sizeof(cpu_hdr));
-		return (-1);
-	}
-	if ((CORE_GETMAGIC(cpu_hdr) != KCORE_MAGIC)
-		|| (CORE_GETMID(cpu_hdr) != MID_MACHINE)) {
-		_kvm_err(kd, 0, "invalid magic in cpu_hdr");
-		return (0);
-	}
-	hdr_size = ALIGN(sizeof(cpu_hdr));
-
-	/*
-	 * Read the CPU segment.
-	 */
-	kd->cpu_dsize = cpu_hdr.c_size;
-	kd->cpu_data = _kvm_malloc(kd, kd->cpu_dsize);
-	if (kd->cpu_data == NULL) {
-		_kvm_err(kd, kd->program, "no cpu_data");
-		goto fail;
-	}
-	sz = Pread(kd, kd->pmfd, kd->cpu_data, cpu_hdr.c_size,
-	    dump_off + hdr_size);
-	if (sz != cpu_hdr.c_size) {
-		_kvm_err(kd, kd->program, "size %zu != cpu_hdr.csize %"PRIu32,
-		    sz, cpu_hdr.c_size);
-		goto fail;
-	}
-	hdr_size += kd->cpu_dsize;
-
-	/*
-	 * Leave phys mem pointer at beginning of memory data
-	 */
-	kd->dump_off = dump_off + hdr_size;
-	if (Lseek(kd, kd->pmfd, kd->dump_off, SEEK_SET) == -1) {
-		_kvm_err(kd, kd->program, "failed to seek to %" PRId64,
-		    (int64_t)kd->dump_off);
-		goto fail;
-	}
-
-	/*
-	 * Create a kcore_hdr.
-	 */
-	kd->kcore_hdr = _kvm_malloc(kd, sizeof(kcore_hdr_t));
-	if (kd->kcore_hdr == NULL) {
-		_kvm_err(kd, kd->program, "failed to allocate header");
-		goto fail;
-	}
-
-	kd->kcore_hdr->c_hdrsize    = ALIGN(sizeof(kcore_hdr_t));
-	kd->kcore_hdr->c_seghdrsize = ALIGN(sizeof(kcore_seg_t));
-	kd->kcore_hdr->c_nseg       = 2;
-	CORE_SETMAGIC(*(kd->kcore_hdr), KCORE_MAGIC, MID_MACHINE,0);
-
-	/*
-	 * Now that we have a valid header, enable translations.
-	 */
-	if (_kvm_initvtop(kd) == 0)
-		/* Success */
-		return (hdr_size);
-
-fail:
-	if (kd->kcore_hdr != NULL) {
-		free(kd->kcore_hdr);
-		kd->kcore_hdr = NULL;
-	}
-	if (kd->cpu_data != NULL) {
-		free(kd->cpu_data);
-		kd->cpu_data = NULL;
-		kd->cpu_dsize = 0;
-	}
-	return (-1);
-}
-
-static int
-clear_gap(kvm_t *kd, bool (*write_buf)(void *, const void *, size_t),
-    void *cookie, size_t size)
-{
-	char buf[1024];
-	size_t len;
-
-	(void)memset(buf, 0, size > sizeof(buf) ? sizeof(buf) : size);
-
-	while (size > 0) {
-		len = size > sizeof(buf) ? sizeof(buf) : size;
-		if (!(*write_buf)(cookie, buf, len)) {
-			_kvm_syserr(kd, kd->program, "clear_gap");
-			return -1;
-		}
-		size -= len;
-	} 
-
-	return 0;
-}
-
-/*
- * Write the dump header by calling write_buf with cookie as first argument.
- */
-int
-kvm_dump_header(kvm_t *kd, bool (*write_buf)(void *, const void *, size_t),
-    void *cookie, int dumpsize)
-{
-	kcore_seg_t	seghdr;
-	long		offset;
-	size_t		gap;
-
-	if (kd->kcore_hdr == NULL || kd->cpu_data == NULL) {
-		_kvm_err(kd, kd->program, "no valid dump header(s)");
-		return (-1);
-	}
-
-	/*
-	 * Write the generic header
-	 */
-	offset = 0;
-	if (!(*write_buf)(cookie, kd->kcore_hdr, sizeof(kcore_hdr_t))) {
-		_kvm_syserr(kd, kd->program, "kvm_dump_header");
-		return (-1);
-	}
-	offset += kd->kcore_hdr->c_hdrsize;
-	gap     = kd->kcore_hdr->c_hdrsize - sizeof(kcore_hdr_t);
-	if (clear_gap(kd, write_buf, cookie, gap) == -1)
-		return (-1);
-
-	/*
-	 * Write the CPU header
-	 */
-	CORE_SETMAGIC(seghdr, KCORESEG_MAGIC, 0, CORE_CPU);
-	seghdr.c_size = ALIGN(kd->cpu_dsize);
-	if (!(*write_buf)(cookie, &seghdr, sizeof(seghdr))) {
-		_kvm_syserr(kd, kd->program, "kvm_dump_header");
-		return (-1);
-	}
-	offset += kd->kcore_hdr->c_seghdrsize;
-	gap     = kd->kcore_hdr->c_seghdrsize - sizeof(seghdr);
-	if (clear_gap(kd, write_buf, cookie, gap) == -1)
-		return (-1);
-
-	if (!(*write_buf)(cookie, kd->cpu_data, kd->cpu_dsize)) {
-		_kvm_syserr(kd, kd->program, "kvm_dump_header");
-		return (-1);
-	}
-	offset += seghdr.c_size;
-	gap     = seghdr.c_size - kd->cpu_dsize;
-	if (clear_gap(kd, write_buf, cookie, gap) == -1)
-		return (-1);
-
-	/*
-	 * Write the actual dump data segment header
-	 */
-	CORE_SETMAGIC(seghdr, KCORESEG_MAGIC, 0, CORE_DATA);
-	seghdr.c_size = dumpsize;
-	if (!(*write_buf)(cookie, &seghdr, sizeof(seghdr))) {
-		_kvm_syserr(kd, kd->program, "kvm_dump_header");
-		return (-1);
-	}
-	offset += kd->kcore_hdr->c_seghdrsize;
-	gap     = kd->kcore_hdr->c_seghdrsize - sizeof(seghdr);
-	if (clear_gap(kd, write_buf, cookie, gap) == -1)
-		return (-1);
-
-	return (int)offset;
-}
-
-static bool
-kvm_dump_header_stdio(void *cookie, const void *buf, size_t len)
-{
-	return fwrite(buf, len, 1, (FILE *)cookie) == 1;
-}
-
-int
-kvm_dump_wrtheader(kvm_t *kd, FILE *fp, int dumpsize)
-{
-	return kvm_dump_header(kd, kvm_dump_header_stdio, fp, dumpsize);
-}
-
-kvm_t *
-kvm_openfiles(const char *uf, const char *mf, const char *sf,
-    int flag, char *errout)
-{
-	kvm_t *kd;
-
-	if ((kd = malloc(sizeof(*kd))) == NULL) {
-		(void)strlcpy(errout, strerror(errno), _POSIX2_LINE_MAX);
-		return (0);
-	}
-	kd->program = 0;
-	return (_kvm_open(kd, uf, mf, sf, flag, errout));
-}
-
-kvm_t *
-kvm_open(const char *uf, const char *mf, const char *sf, int flag,
-    const char *program)
-{
-	kvm_t *kd;
-
-	if ((kd = malloc(sizeof(*kd))) == NULL) {
-		(void)fprintf(stderr, "%s: %s\n",
-		    program ? program : getprogname(), strerror(errno));
-		return (0);
-	}
-	kd->program = program;
-	return (_kvm_open(kd, uf, mf, sf, flag, NULL));
-}
-
-int
-kvm_close(kvm_t *kd)
-{
-	int error = 0;
-
-	if (kd->pmfd >= 0)
-		error |= close(kd->pmfd);
-	if (kd->vmfd >= 0)
-		error |= close(kd->vmfd);
-	if (kd->nlfd >= 0)
-		error |= close(kd->nlfd);
-	if (kd->swfd >= 0)
-		error |= close(kd->swfd);
-	if (kd->vmst)
-		_kvm_freevtop(kd);
-	kd->cpu_dsize = 0;
-	if (kd->cpu_data != NULL)
-		free(kd->cpu_data);
-	if (kd->kcore_hdr != NULL)
-		free(kd->kcore_hdr);
-	if (kd->procbase != 0)
-		free(kd->procbase);
-	if (kd->procbase2 != 0)
-		free(kd->procbase2);
-	if (kd->lwpbase != 0)
-		free(kd->lwpbase);
-	if (kd->swapspc != 0)
-		free(kd->swapspc);
-	if (kd->argspc != 0)
-		free(kd->argspc);
-	if (kd->argbuf != 0)
-		free(kd->argbuf);
-	if (kd->argv != 0)
-		free(kd->argv);
-	if (kd->iobuf != 0)
-		free(kd->iobuf);
-	free(kd);
-
-	return (error);
-}
-
-int
-kvm_nlist(kvm_t *kd, struct nlist *nl)
-{
-	int rv, nlfd;
-
-	/*
-	 * kd->nlfd might be negative when we get here, and in that
-	 * case that means that we're using /dev/ksyms.
-	 * So open it again, just for the time we retrieve the list.
-	 */
-	if (kd->nlfd < 0) {
-		nlfd = open(_PATH_KSYMS, O_RDONLY | O_CLOEXEC, 0);
-		if (nlfd < 0) {
-			_kvm_err(kd, 0, "failed to open %s", _PATH_KSYMS);
-			return (nlfd);
-		}
-	} else
-		nlfd = kd->nlfd;
-
-	/*
-	 * Call the nlist(3) routines to retrieve the given namelist.
-	 */
-	rv = __fdnlist(nlfd, nl);
-
-	if (rv == -1)
-		_kvm_err(kd, 0, "bad namelist");
-
-	if (kd->nlfd < 0)
-		close(nlfd);
-
-	return (rv);
-}
-
-int
-kvm_dump_inval(kvm_t *kd)
-{
-	struct nlist	nl[2];
-	paddr_t		pa;
-	size_t		dsize;
-	off_t		doff;
-	void		*newbuf;
-
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, kd->program, "clearing dump on live kernel");
-		return (-1);
-	}
-	nl[0].n_name = "_dumpmag";
-	nl[1].n_name = NULL;
-
-	if (kvm_nlist(kd, nl) == -1) {
-		_kvm_err(kd, 0, "bad namelist");
-		return (-1);
-	}
-	if (_kvm_kvatop(kd, (vaddr_t)nl[0].n_value, &pa) == 0)
-		return (-1);
-
-	errno = 0;
-	dsize = MAX(kd->fdalign, sizeof(u_long));
-	if (kd->iobufsz < dsize) {
-		newbuf = realloc(kd->iobuf, dsize);
-		if (newbuf == NULL) {
-			_kvm_syserr(kd, 0, "cannot allocate I/O buffer");
-			return (-1);
-		}
-		kd->iobuf = newbuf;
-		kd->iobufsz = dsize;
-	}
-	memset(kd->iobuf, 0, dsize);
-	doff = _kvm_pa2off(kd, pa);
-	doff -= doff % kd->fdalign;
-	if (pwrite(kd->pmfd, kd->iobuf, dsize, doff) == -1) {
-		_kvm_syserr(kd, 0, "cannot invalidate dump - pwrite");
-		return (-1);
-	}
-	return (0);
-}
-
-ssize_t
-kvm_read(kvm_t *kd, u_long kva, void *buf, size_t len)
-{
-	int cc;
-	void *cp;
-
-	if (ISKMEM(kd)) {
-		/*
-		 * We're using /dev/kmem.  Just read straight from the
-		 * device and let the active kernel do the address translation.
-		 */
-		errno = 0;
-		cc = _kvm_pread(kd, kd->vmfd, buf, len, (off_t)kva);
-		if (cc < 0) {
-			_kvm_syserr(kd, 0, "kvm_read");
-			return (-1);
-		} else if (cc < len)
-			_kvm_err(kd, kd->program, "short read");
-		return (cc);
-	} else if (ISSYSCTL(kd)) {
-		_kvm_err(kd, kd->program, "kvm_open called with KVM_NO_FILES, "
-		    "can't use kvm_read");
-		return (-1);
-	} else {
-		if ((kd->kcore_hdr == NULL) || (kd->cpu_data == NULL)) {
-			_kvm_err(kd, kd->program, "no valid dump header");
-			return (-1);
-		}
-		cp = buf;
-		while (len > 0) {
-			paddr_t	pa;
-			off_t	foff;
-
-			cc = _kvm_kvatop(kd, (vaddr_t)kva, &pa);
-			if (cc == 0)
-				return (-1);
-			if (cc > len)
-				cc = len;
-			foff = _kvm_pa2off(kd, pa);
-			errno = 0;
-			cc = _kvm_pread(kd, kd->pmfd, cp, (size_t)cc, foff);
-			if (cc < 0) {
-				_kvm_syserr(kd, kd->program, "kvm_read");
-				break;
-			}
-			/*
-			 * If kvm_kvatop returns a bogus value or our core
-			 * file is truncated, we might wind up seeking beyond
-			 * the end of the core file in which case the read will
-			 * return 0 (EOF).
-			 */
-			if (cc == 0)
-				break;
-			cp = (char *)cp + cc;
-			kva += cc;
-			len -= cc;
-		}
-		return ((char *)cp - (char *)buf);
-	}
-	/* NOTREACHED */
-}
-
-ssize_t
-kvm_write(kvm_t *kd, u_long kva, const void *buf, size_t len)
-{
-	int cc;
-
-	if (ISKMEM(kd)) {
-		/*
-		 * Just like kvm_read, only we write.
-		 */
-		errno = 0;
-		cc = pwrite(kd->vmfd, buf, len, (off_t)kva);
-		if (cc < 0) {
-			_kvm_syserr(kd, 0, "kvm_write");
-			return (-1);
-		} else if (cc < len)
-			_kvm_err(kd, kd->program, "short write");
-		return (cc);
-	} else if (ISSYSCTL(kd)) {
-		_kvm_err(kd, kd->program, "kvm_open called with KVM_NO_FILES, "
-		    "can't use kvm_write");
-		return (-1);
-	} else {
-		_kvm_err(kd, kd->program,
-		    "kvm_write not implemented for dead kernels");
-		return (-1);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libkvm/kvm_aarch64.c b/lib/libkvm/kvm_aarch64.c
deleted file mode 100644
index 593ecd76e..000000000
--- a/lib/libkvm/kvm_aarch64.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/* $NetBSD: kvm_aarch64.c,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#include <sys/user.h>
-#include <sys/proc.h>
-#include <sys/stat.h>
-#include <sys/kcore.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <nlist.h>
-#include <kvm.h>
-
-#include <machine/kcore.h>
-#include <machine/pte.h>
-#include <machine/vmparam.h>
-
-#include <limits.h>
-#include <db.h>
-#include <stdlib.h>
-
-#include "kvm_private.h"
-
-__RCSID("$NetBSD: kvm_aarch64.c,v 1.1 2014/08/10 05:47:37 matt Exp $");
-
-/*ARGSUSED*/
-void
-_kvm_freevtop(kvm_t *kd)
-{
-	return;
-}
-
-/*ARGSUSED*/
-int
-_kvm_initvtop(kvm_t *kd)
-{
-	return (0);
-}
-
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-        if (ISALIVE(kd)) {
-                _kvm_err(kd, 0, "vatop called in live kernel!");
-                return(0);
-        }
-
-	if ((va & AARCH64_KSEG_MASK) != AARCH64_KSEG_START) {
-		/*
-		 * Bogus address (not in KV space): punt.
-		 */
-		_kvm_err(kd, 0, "invalid kernel virtual address");
-lose:
-		*pa = -1;
-		return 0;
-	}
-
-	const cpu_kcore_hdr_t * const cpu_kh = kd->cpu_data;
-	const u_int tg1 =__SHIFTOUT(cpu_kh->kh_tcr1, TCR_TG1); 
-	const u_int t1siz = __SHIFTOUT(cpu_kh->kh_tcr1, TCR_T1SZ);
-
-	/*
-	 * Real kernel virtual address: do the translation.
-	 */
-
-	u_int va_bits;
-	u_int page_shift;
-
-	switch (tg1) {
-	case TCR_TG_4KB:
-		va_bits = t1siz + 36;
-		page_shift = 12;
-		break;
-	case TCR_TG_16KB:
-		va_bits = 48;
-		page_shift = 14;
-		break;
-	case TCR_TG_64KB:
-		va_bits = t1siz + 38;
-		page_shift = 16;
-		break;
-	default:
-		goto lose;
-	}
-
-	const size_t page_size = 1 << page_shift;
-	const uint64_t page_mask = (page_size - 1);
-	const uint64_t page_addr = __BITS(47, 0) & ~page_mask;
-	const uint64_t pte_mask = page_mask >> 3;
-	const u_int pte_shift = page_shift - 3;
-
-	/* how many level of page tables do we have? */
-	u_int level = (48 + page_shift - 1) / page_shift;
-
-	/* restrict va to the valid VA bits */
-	va &= (1LL << va_bits) - 1;
-
-	u_int addr_shift = page_shift + (level - 1) * pte_shift;
-
-	/* clear out the unused low bits of the table address */
-	paddr_t pte_addr = (cpu_kh->kh_ttbr1 & TTBR_BADDR);
-	pte_addr &= ~((8L << (va_bits - addr_shift)) - 1);
-
-	for (;;) {
-		pt_entry_t pte;
-
-		/* now index into the pte table */
-		pte_addr += 8 * ((va >> addr_shift) & pte_mask);
-
-		/* Find and read the PTE. */
-		if (_kvm_pread(kd, kd->pmfd, &pte, sizeof(pte),
-		    _kvm_pa2off(kd, pte_addr)) != sizeof(pte)) {
-			_kvm_syserr(kd, 0, "could not read pte");
-			goto lose;
-		}
-
-		/* Find and read the L2 PTE. */
-		if ((pte & LX_VALID) == 0) {
-			_kvm_err(kd, 0, "invalid translation (invalid pte)");
-			goto lose;
-		}
-
-		if ((pte & LX_TYPE) == LX_TYPE_BLK) {
-			const paddr_t blk_mask = ((1L << addr_shift) - 1);
-
-			*pa = (pte & page_addr & ~blk_mask) | (va & blk_mask);
-			return 0;
-		}
-
-		if (level == page_shift) {
-			*pa = (pte & page_addr) | (va & page_mask);
-			return 0;
-		}
-
-		/*
-		 * Read next level of page table
-		 */
-
-		pte_addr = pte & page_addr;
-		addr_shift -= pte_shift;
-	}
-}
-
-/*
- * Translate a physical address to a file-offset in the crash dump.
- */
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-	const cpu_kcore_hdr_t * const cpu_kh = kd->cpu_data;
-	off_t off = 0;
-
-	for (const phys_ram_seg_t *ramsegs = cpu_kh->kh_ramsegs;
-	     ramsegs->size != 0; ramsegs++) {
-		if (pa >= ramsegs->start
-		    && pa < ramsegs->start + ramsegs->size) {
-			off += pa - ramsegs->start;
-			break;
-		}
-		off += ramsegs->size;
-	}
-
-	return kd->dump_off + off;
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-
-	kd->usrstack = USRSTACK;
-	kd->min_uva = VM_MIN_ADDRESS;
-	kd->max_uva = VM_MAXUSER_ADDRESS;
-
-	return (0);
-}
diff --git a/lib/libkvm/kvm_alpha.c b/lib/libkvm/kvm_alpha.c
deleted file mode 100644
index 03e6378e7..000000000
--- a/lib/libkvm/kvm_alpha.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* $NetBSD: kvm_alpha.c,v 1.27 2014/02/19 20:21:22 dsl 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.
- */
-
-#define	__KVM_ALPHA_PRIVATE		/* see <machine/pte.h> */
-
-#include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/stat.h>
-#include <sys/kcore.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <nlist.h>
-#include <kvm.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <machine/kcore.h>
-#include <machine/pmap.h>
-#include <machine/vmparam.h>
-
-#include <limits.h>
-#include <db.h>
-#include <stdlib.h>
-
-#include "kvm_private.h"
-
-__RCSID("$NetBSD: kvm_alpha.c,v 1.27 2014/02/19 20:21:22 dsl Exp $");
-
-/*ARGSUSED*/
-void
-_kvm_freevtop(kvm_t *kd)
-{
-	return;
-}
-
-/*ARGSUSED*/
-int
-_kvm_initvtop(kvm_t *kd)
-{
-	return (0);
-}
-
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-	cpu_kcore_hdr_t *cpu_kh;
-	alpha_pt_entry_t pte;
-	u_long pteoff, page_off;
-	int rv;
-
-        if (ISALIVE(kd)) {
-                _kvm_err(kd, 0, "vatop called in live kernel!");
-                return(0);
-        }
-
-	cpu_kh = kd->cpu_data;
-	page_off = va & (cpu_kh->page_size - 1);
-
-	if (va >= ALPHA_K0SEG_BASE && va <= ALPHA_K0SEG_END) {
-		/*
-		 * Direct-mapped address: just convert it.
-		 */
-
-		*pa = ALPHA_K0SEG_TO_PHYS(va);
-		rv = cpu_kh->page_size - page_off;
-	} else if (va >= ALPHA_K1SEG_BASE && va <= ALPHA_K1SEG_END) {
-		/*
-		 * Real kernel virtual address: do the translation.
-		 */
-
-		/* Find and read the L1 PTE. */
-		pteoff = cpu_kh->lev1map_pa +
-		    l1pte_index(va) * sizeof(alpha_pt_entry_t);
-		if (_kvm_pread(kd, kd->pmfd, &pte, sizeof(pte),
-		    _kvm_pa2off(kd, pteoff)) != sizeof(pte)) {
-			_kvm_syserr(kd, 0, "could not read L1 PTE");
-			goto lose;
-		}
-
-		/* Find and read the L2 PTE. */
-		if ((pte & ALPHA_PTE_VALID) == 0) {
-			_kvm_err(kd, 0, "invalid translation (invalid L1 PTE)");
-			goto lose;
-		}
-		pteoff = ALPHA_PTE_TO_PFN(pte) * cpu_kh->page_size +
-		    l2pte_index(va) * sizeof(alpha_pt_entry_t);
-		if (_kvm_pread(kd, kd->pmfd, &pte, sizeof(pte),
-		    _kvm_pa2off(kd, pteoff)) != sizeof(pte)) {
-			_kvm_syserr(kd, 0, "could not read L2 PTE");
-			goto lose;
-		}
-
-		/* Find and read the L3 PTE. */
-		if ((pte & ALPHA_PTE_VALID) == 0) {
-			_kvm_err(kd, 0, "invalid translation (invalid L2 PTE)");
-			goto lose;
-		}
-		pteoff = ALPHA_PTE_TO_PFN(pte) * cpu_kh->page_size +
-		    l3pte_index(va) * sizeof(alpha_pt_entry_t);
-		if (_kvm_pread(kd, kd->pmfd, &pte, sizeof(pte),
-		    _kvm_pa2off(kd, pteoff)) != sizeof(pte)) {
-			_kvm_syserr(kd, 0, "could not read L3 PTE");
-			goto lose;
-		}
-
-		/* Fill in the PA. */
-		if ((pte & ALPHA_PTE_VALID) == 0) {
-			_kvm_err(kd, 0, "invalid translation (invalid L3 PTE)");
-			goto lose;
-		}
-		*pa = ALPHA_PTE_TO_PFN(pte) * cpu_kh->page_size + page_off;
-		rv = cpu_kh->page_size - page_off;
-	} else {
-		/*
-		 * Bogus address (not in KV space): punt.
-		 */
-
-		_kvm_err(kd, 0, "invalid kernel virtual address");
-lose:
-		*pa = -1;
-		rv = 0;
-	}
-
-	return (rv);
-}
-
-/*
- * Translate a physical address to a file-offset in the crash dump.
- */
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-	cpu_kcore_hdr_t *cpu_kh;
-	phys_ram_seg_t *ramsegs;
-	off_t off;
-	int i;
-
-	cpu_kh = kd->cpu_data;
-	ramsegs = (phys_ram_seg_t *)((char *)cpu_kh + ALIGN(sizeof *cpu_kh));
-
-	off = 0;
-	for (i = 0; i < cpu_kh->nmemsegs; i++) {
-		if (pa >= ramsegs[i].start &&
-		    (pa - ramsegs[i].start) < ramsegs[i].size) {
-			off += (pa - ramsegs[i].start);
-			break;
-		}
-		off += ramsegs[i].size;
-	}
-
-	return (kd->dump_off + off);
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-
-	kd->usrstack = USRSTACK;
-	kd->min_uva = VM_MIN_ADDRESS;
-	kd->max_uva = VM_MAXUSER_ADDRESS;
-
-	return (0);
-}
diff --git a/lib/libkvm/kvm_arm.c b/lib/libkvm/kvm_arm.c
deleted file mode 100644
index f5d984f16..000000000
--- a/lib/libkvm/kvm_arm.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/* $NetBSD: kvm_arm.c,v 1.6 2010/09/20 23:23:16 jym Exp $	 */
-
-/*-
- * Copyright (C) 1996 Wolfgang Solfrank.
- * Copyright (C) 1996 TooLs GmbH.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	from: kvm_powerpc.c,v 1.3 1997/09/19 04:00:23 thorpej Exp
- */
-
-/*
- * arm32 machine dependent routines for kvm.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: kvm_arm.c,v 1.6 2010/09/20 23:23:16 jym Exp $");
-#endif				/* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/exec.h>
-#include <sys/kcore.h>
-#include <sys/types.h>
-
-#include <arm/kcore.h>
-#include <arm/arm32/pte.h>
-
-#include <stdlib.h>
-#include <db.h>
-#include <limits.h>
-#include <kvm.h>
-
-#include <unistd.h>
-
-#include "kvm_private.h"
-
-void
-_kvm_freevtop(kvm_t * kd)
-{
-	if (kd->vmst != 0)
-		free(kd->vmst);
-}
-
-int
-_kvm_initvtop(kvm_t * kd)
-{
-	return 0;
-}
-
-int
-_kvm_kvatop(kvm_t * kd, vaddr_t va, paddr_t *pa)
-{
-	cpu_kcore_hdr_t *cpu_kh;
-	pd_entry_t      pde;
-	pt_entry_t      pte;
-	paddr_t		pde_pa, pte_pa;
-
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, 0, "vatop called in live kernel!");
-		return (0);
-	}
-	cpu_kh = kd->cpu_data;
-
-	if (cpu_kh->version != 1) {
-		_kvm_err(kd, 0, "unsupported kcore structure version");
-		return 0;
-	}
-	if (cpu_kh->flags != 0) {
-		_kvm_err(kd, 0, "kcore flags not supported");
-		return 0;
-	}
-	/*
-	 * work out which L1 table we need
-	 */
-	if (va >= (cpu_kh->UserL1TableSize << 17))
-		pde_pa = cpu_kh->PAKernelL1Table;
-	else
-		pde_pa = cpu_kh->PAUserL1Table;
-
-	/*
-	 * work out the offset into the L1 Table
-	 */
-	pde_pa += ((va >> 20) * sizeof(pd_entry_t));
-
-	if (_kvm_pread(kd, kd->pmfd, (void *) &pde, sizeof(pd_entry_t),
-		  _kvm_pa2off(kd, pde_pa)) != sizeof(pd_entry_t)) {
-		_kvm_syserr(kd, 0, "could not read L1 entry");
-		return (0);
-	}
-	/*
-	 * next work out what kind of record it is
-	 */
-	switch (pde & L1_TYPE_MASK) {
-	case L1_TYPE_S:
-		*pa = (pde & L1_S_FRAME) | (va & L1_S_OFFSET);
-		return L1_S_SIZE - (va & L1_S_OFFSET);
-	case L1_TYPE_C:
-		pte_pa = (pde & L1_C_ADDR_MASK)
-			| ((va & 0xff000) >> 10);
-		break;
-	case L1_TYPE_F:
-		pte_pa = (pde & L1_S_ADDR_MASK)
-			| ((va & 0xffc00) >> 8);
-		break;
-	default:
-		_kvm_syserr(kd, 0, "L1 entry is invalid");
-		return (0);
-	}
-
-	/*
-	 * locate the pte and load it
-	 */
-	if (_kvm_pread(kd, kd->pmfd, (void *) &pte, sizeof(pt_entry_t),
-		  _kvm_pa2off(kd, pte_pa)) != sizeof(pt_entry_t)) {
-		_kvm_syserr(kd, 0, "could not read L2 entry");
-		return (0);
-	}
-	switch (pte & L2_TYPE_MASK) {
-	case L2_TYPE_L:
-		*pa = (pte & L2_L_FRAME) | (va & L2_L_OFFSET);
-		return (L2_L_SIZE - (va & L2_L_OFFSET));
-	case L2_TYPE_S:
-		*pa = (pte & L2_S_FRAME) | (va & L2_S_OFFSET);
-		return (L2_S_SIZE - (va & L2_S_OFFSET));
-	case L2_TYPE_T:
-		*pa = (pte & L2_T_FRAME) | (va & L2_T_OFFSET);
-		return (L2_T_SIZE - (va & L2_T_OFFSET));
-	default:
-		_kvm_syserr(kd, 0, "L2 entry is invalid");
-		return (0);
-	}
-
-	_kvm_err(kd, 0, "vatop not yet implemented!");
-	return 0;
-}
-
-off_t
-_kvm_pa2off(kvm_t * kd, u_long pa)
-{
-	cpu_kcore_hdr_t *cpu_kh;
-	phys_ram_seg_t *ramsegs;
-	off_t           off;
-	int             i;
-
-	cpu_kh = kd->cpu_data;
-	ramsegs = (void *) ((char *) (void *) cpu_kh + cpu_kh->omemsegs);
-
-	off = 0;
-	for (i = 0; i < cpu_kh->nmemsegs; i++) {
-		if (pa >= ramsegs[i].start &&
-		    (pa - ramsegs[i].start) < ramsegs[i].size) {
-			off += (pa - ramsegs[i].start);
-			break;
-		}
-		off += ramsegs[i].size;
-	}
-	return (kd->dump_off + off);
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. arm)
- */
-int
-_kvm_mdopen(kvm_t * kd)
-{
-	uintptr_t       max_uva;
-	extern struct ps_strings *__ps_strings;
-
-#if 0				/* XXX - These vary across arm machines... */
-	kd->usrstack = USRSTACK;
-	kd->min_uva = VM_MIN_ADDRESS;
-	kd->max_uva = VM_MAXUSER_ADDRESS;
-#endif
-	/* This is somewhat hack-ish, but it works. */
-	max_uva = (uintptr_t) (__ps_strings + 1);
-	kd->usrstack = max_uva;
-	kd->max_uva = max_uva;
-	kd->min_uva = 0;
-
-	return (0);
-}
diff --git a/lib/libkvm/kvm_dump.3 b/lib/libkvm/kvm_dump.3
deleted file mode 100644
index 7309fa971..000000000
--- a/lib/libkvm/kvm_dump.3
+++ /dev/null
@@ -1,109 +0,0 @@
-.\"	$NetBSD: kvm_dump.3,v 1.15 2009/10/20 19:10:09 snj Exp $
-.\"
-.\" Copyright (c) 1996 Leo Weppelman
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list 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.
-.\"
-.\"
-.Dd March 17, 1996
-.Dt KVM_DUMP 3
-.Os
-.Sh NAME
-.Nm kvm_dump_mkheader ,
-.Nm kvm_dump_wrtheader ,
-.Nm kvm_dump_inval
-.Nd crash dump support functions
-.Sh LIBRARY
-.Lb libkvm
-.Sh SYNOPSIS
-.In kvm.h
-.Ft int
-.Fn kvm_dump_mkheader "kvm_t *kd" "off_t dump_off"
-.Ft int
-.Fn kvm_dump_wrtheader "kvm_t *kd" "FILE *fp" "int dumpsize"
-.Ft int
-.Fn kvm_dump_inval "kvm_t *kd"
-.Sh DESCRIPTION
-First note that the functions described here were designed to be used by
-.Xr savecore 8 .
-.Pp
-The function
-.Fn kvm_dump_mkheader
-checks if the physical memory file associated with
-.Fa kd
-contains a valid crash dump header as generated by a dumping kernel.
-When a valid header is found,
-.Fn kvm_dump_mkheader
-initializes the internal kvm data structures as if a crash dump generated by
-the
-.Xr savecore 8
-program was opened.
-This has the intentional side effect of enabling the
-address translation machinery.
-.Pp
-A call to
-.Fn kvm_dump_mkheader
-will most likely be followed by a call to
-.Fn kvm_dump_wrtheader .
-This function takes care of generating the generic header, the CORE_CPU
-section and the section header of the CORE_DATA section.
-The data is written to the file pointed at by
-.Fa fp .
-The
-.Fa dumpsize
-argument is only used to properly the set the segment size of the CORE_DATA
-section.
-Note that this function assumes that
-.Fa fp
-is positioned at file location 0.
-This function will not seek and therefore allows
-.Fa fp
-to be a file pointer obtained by
-.Fn zopen .
-.Pp
-The
-.Fn kvm_dump_inval
-function clears the magic number in the physical memory file associated with
-.Fa kd .
-The address translations must be enabled for this to work (thus assuming
-that
-.Fn kvm_dump_mkheader
-was called earlier in the sequence).
-.Sh RETURN VALUES
-All functions except
-.Fn kvm_dump_mkheader
-return 0 on success, -1 on failure.
-The function
-.Fn kvm_dump_mkheader
-returns the size of the headers present before the actual dumpdata starts.
-If no valid headers were found but no fatal errors occurred, 0 is returned.
-On fatal errors the return value is -1.
-.Pp
-In the case of failure,
-.Xr kvm_geterr 3
-can be used to retrieve the cause of the error.
-.Sh SEE ALSO
-.Xr kvm 3 ,
-.Xr kvm_open 3
-.Sh HISTORY
-These functions first appeared in
-.Nx 1.2 .
diff --git a/lib/libkvm/kvm_file.c b/lib/libkvm/kvm_file.c
deleted file mode 100644
index 6e9877994..000000000
--- a/lib/libkvm/kvm_file.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*	$NetBSD: kvm_file.c,v 1.29 2014/02/19 20:21:22 dsl Exp $	*/
-
-/*-
- * Copyright (c) 1989, 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_file.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: kvm_file.c,v 1.29 2014/02/19 20:21:22 dsl Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * File list interface for kvm.  pstat, fstat and netstat are
- * users of this code, so we've factored it out into a separate module.
- * Thus, we keep this grunge out of the other kvm applications (i.e.,
- * most other applications are interested only in open/close/read/nlist).
- */
-
-#define _KERNEL
-#include <sys/types.h>
-#undef _KERNEL
-#include <sys/param.h>
-#include <sys/lwp.h>
-#include <sys/proc.h>
-#include <sys/exec.h>
-#define _KERNEL
-#include <sys/file.h>
-#undef _KERNEL
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <nlist.h>
-#include <kvm.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <sys/sysctl.h>
-
-#include <limits.h>
-#include <ndbm.h>
-#include <paths.h>
-#include <string.h>
-
-#include "kvm_private.h"
-
-static int
-kvm_deadfiles(kvm_t *, int, int, long, int);
-
-/*
- * Get file structures.
- */
-/*ARGSUSED*/
-static int
-kvm_deadfiles(kvm_t *kd, int op, int arg, long ofhead, int numfiles)
-{
-	size_t buflen = kd->argspc_len, n = 0;
-	struct file *fp;
-	struct filelist fhead;
-	char *where = kd->argspc;
-
-	/*
-	 * first copyout filehead
-	 */
-	if (buflen < sizeof(fhead) ||
-	    KREAD(kd, (u_long)ofhead, &fhead)) {
-		_kvm_err(kd, kd->program, "can't read filehead");
-		return (0);
-	}
-	buflen -= sizeof(fhead);
-	where += sizeof(fhead);
-	(void)memcpy(kd->argspc, &fhead, sizeof(fhead));
-
-	/*
-	 * followed by an array of file structures
-	 */
-	for (fp = fhead.lh_first; fp != 0; fp = fp->f_list.le_next) {
-		if (buflen > sizeof(struct file)) {
-			if (KREAD(kd, (u_long)fp,
-			    ((struct file *)(void *)where))) {
-				_kvm_err(kd, kd->program, "can't read kfp");
-				return (0);
-			}
-			buflen -= sizeof(struct file);
-			fp = (struct file *)(void *)where;
-			where += sizeof(struct file);
-			n++;
-		}
-	}
-	if (n != numfiles) {
-		_kvm_err(kd, kd->program, "inconsistent nfiles");
-		return (0);
-	}
-	return (numfiles);
-}
-
-char *
-kvm_getfiles(kvm_t *kd, int op, int arg, int *cnt)
-{
-	size_t size;
-	int mib[2], st;
-	int numfiles;
-	struct file *fp, *fplim;
-	struct filelist fhead;
-
-	if (ISSYSCTL(kd)) {
-		size = 0;
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_FILE;
-		st = sysctl(mib, 2, NULL, &size, NULL, 0);
-		if (st == -1) {
-			_kvm_syserr(kd, kd->program, "kvm_getprocs");
-			return (0);
-		}
-		KVM_ALLOC(kd, argspc, size);
-		st = sysctl(mib, 2, kd->argspc, &size, NULL, 0);
-		if (st == -1 || size < sizeof(fhead)) {
-			_kvm_syserr(kd, kd->program, "kvm_getfiles");
-			return (0);
-		}
-		(void)memcpy(&fhead, kd->argspc, sizeof(fhead));
-		fp = (struct file *)(void *)(kd->argspc + sizeof(fhead));
-		fplim = (struct file *)(void *)(kd->argspc + size);
-		for (numfiles = 0; fhead.lh_first && (fp < fplim);
-		    numfiles++, fp++)
-			fhead.lh_first = fp->f_list.le_next;
-	} else {
-		struct nlist nl[3], *p;
-
-		nl[0].n_name = "_nfiles";
-		nl[1].n_name = "_filehead";
-		nl[2].n_name = 0;
-
-		if (kvm_nlist(kd, nl) != 0) {
-			for (p = nl; p->n_type != 0; ++p)
-				;
-			_kvm_err(kd, kd->program,
-				 "%s: no such symbol", p->n_name);
-			return (0);
-		}
-		if (KREAD(kd, nl[0].n_value, &numfiles)) {
-			_kvm_err(kd, kd->program, "can't read numfiles");
-			return (0);
-		}
-		size = sizeof(fhead) + (numfiles + 10) * sizeof(struct file);
-		KVM_ALLOC(kd, argspc, size);
-		numfiles = kvm_deadfiles(kd, op, arg, (long)nl[1].n_value,
-		    numfiles);
-		if (numfiles == 0)
-			return (0);
-	}
-	*cnt = numfiles;
-	return (kd->argspc);
-}
diff --git a/lib/libkvm/kvm_geterr.3 b/lib/libkvm/kvm_geterr.3
deleted file mode 100644
index 6f646c07d..000000000
--- a/lib/libkvm/kvm_geterr.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"	$NetBSD: kvm_geterr.3,v 1.9 2009/03/10 23:49:07 joerg Exp $
-.\"
-.\" Copyright (c) 1992, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software 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.
-.\" 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.
-.\"
-.\"     @(#)kvm_geterr.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt KVM_GETERR 3
-.Os
-.Sh NAME
-.Nm kvm_geterr
-.Nd get error message on kvm descriptor
-.Sh LIBRARY
-.Lb libkvm
-.Sh SYNOPSIS
-.In kvm.h
-.Ft char *
-.Fn kvm_geterr "kvm_t *kd"
-.Sh DESCRIPTION
-This function returns a string describing the most recent error condition
-on the descriptor
-.Fa kd .
-The results are undefined if the most recent
-.Xr kvm 3
-library call did not produce an error.
-The string returned is stored in memory owned by
-.Xr kvm 3
-so the message should be copied out and saved elsewhere if necessary.
-.Sh SEE ALSO
-.Xr kvm 3 ,
-.Xr kvm_close 3 ,
-.Xr kvm_getargv 3 ,
-.Xr kvm_getenvv 3 ,
-.Xr kvm_getprocs 3 ,
-.Xr kvm_nlist 3 ,
-.Xr kvm_open 3 ,
-.Xr kvm_openfiles 3 ,
-.Xr kvm_read 3 ,
-.Xr kvm_write 3
-.Sh BUGS
-This routine cannot be used to access error conditions due to a failed
-.Fn kvm_openfiles
-call, since failure is indicated by returning a
-.Dv NULL
-descriptor.
-Therefore, errors on open are output to the special error buffer
-passed to
-.Fn kvm_openfiles .
-This option is not available to
-.Fn kvm_open .
diff --git a/lib/libkvm/kvm_getfiles.3 b/lib/libkvm/kvm_getfiles.3
deleted file mode 100644
index c6a336291..000000000
--- a/lib/libkvm/kvm_getfiles.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\"	$NetBSD: kvm_getfiles.3,v 1.11 2009/03/10 23:49:07 joerg Exp $
-.\"
-.\" Copyright (c) 1992, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software 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.
-.\" 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.
-.\"
-.\"     @(#)kvm_getfiles.3	8.2 (Berkeley) 4/19/94
-.\"
-.Dd April 19, 1994
-.Dt KVM_GETFILES 3
-.Os
-.Sh NAME
-.Nm kvm_getfiles
-.Nd survey open files
-.Sh LIBRARY
-.Lb libkvm
-.Sh SYNOPSIS
-.In kvm.h
-.In sys/kinfo.h
-.Fd #define _KERNEL
-.In sys/file.h
-.Fd #undef _KERNEL
-.\" .Fa kvm_t *kd
-.Ft char *
-.Fn kvm_getfiles "kvm_t *kd" "int op" "int arg" "int *cnt"
-.Sh DESCRIPTION
-.Fn kvm_getfiles
-returns a (sub-)set of the open files in the kernel indicated by
-.Fa kd .
-The
-.Fa op
-and
-.Fa arg
-arguments constitute a predicate which limits the set of files
-returned.
-No predicates are currently defined.
-.Pp
-The number of processes found is returned in the reference parameter
-.Fa cnt .
-The files are returned as a contiguous array of file structures,
-preceded by the address of the first file entry in the kernel.
-This memory is owned by kvm and is not guaranteed to be persistent across
-subsequent kvm library calls.
-Data should be copied out if it needs to be saved.
-.Sh RETURN VALUES
-.Fn kvm_getfiles
-will return
-.Dv NULL
-on failure.
-.Sh SEE ALSO
-.Xr kvm 3 ,
-.Xr kvm_close 3 ,
-.Xr kvm_geterr 3 ,
-.Xr kvm_nlist 3 ,
-.Xr kvm_open 3 ,
-.Xr kvm_openfiles 3 ,
-.Xr kvm_read 3 ,
-.Xr kvm_write 3
-.Sh BUGS
-This routine does not belong in the kvm interface.
diff --git a/lib/libkvm/kvm_getkernelname.3 b/lib/libkvm/kvm_getkernelname.3
deleted file mode 100644
index f83d7ecbe..000000000
--- a/lib/libkvm/kvm_getkernelname.3
+++ /dev/null
@@ -1,67 +0,0 @@
-.\"	$NetBSD: kvm_getkernelname.3,v 1.2 2011/09/13 08:53:10 wiz Exp $
-.\"
-.\"
-.\" Copyright (c) 2011 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"        This product includes software developed by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 14, 2011
-.Dt KVM_GETKERNELNAME 3
-.Os
-.Sh NAME
-.Nm kvm_getkernelname
-.Nd get kernel name of opened kvm descriptor
-.Sh LIBRARY
-.Lb libkvm
-.Sh SYNOPSIS
-.In kvm.h
-.Ft const char *
-.Fn kvm_getkernelname "kvm_t *kd"
-.Sh DESCRIPTION
-This function returns a string containing the kernel name used from the kvm
-descriptor obtained by a previous
-.Xr kvm_open 3
-or
-.Xr kvm_openfiles 3
-call.
-.Sh SEE ALSO
-.Xr kvm 3 ,
-.Xr kvm_close 3 ,
-.Xr kvm_getargv 3 ,
-.Xr kvm_getenvv 3 ,
-.Xr kvm_getprocs 3 ,
-.Xr kvm_nlist 3 ,
-.Xr kvm_open 3 ,
-.Xr kvm_openfiles 3 ,
-.Xr kvm_read 3 ,
-.Xr kvm_write 3
diff --git a/lib/libkvm/kvm_getloadavg.3 b/lib/libkvm/kvm_getloadavg.3
deleted file mode 100644
index 1498b0a02..000000000
--- a/lib/libkvm/kvm_getloadavg.3
+++ /dev/null
@@ -1,66 +0,0 @@
-.\"	$NetBSD: kvm_getloadavg.3,v 1.11 2009/03/10 23:49:07 joerg Exp $
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)kvm_getloadavg.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd August 18, 2002
-.Dt KVM_GETLOADAVG 3
-.Os
-.Sh NAME
-.Nm kvm_getloadavg
-.Nd get system load averages
-.Sh LIBRARY
-.Lb libkvm
-.Sh SYNOPSIS
-.In sys/resource.h
-.In kvm.h
-.Ft int
-.Fn kvm_getloadavg "kvm_t *kd" "double loadavg[]" "int nelem"
-.Sh DESCRIPTION
-The
-.Fn kvm_getloadavg
-function returns the number of processes in the system run queue
-of the kernel indicated by
-.Fa kd ,
-averaged over various periods of time.
-Up to
-.Fa nelem
-samples are retrieved and assigned to successive elements of
-.Fa loadavg Ns Bq .
-The system imposes a maximum of 3 samples, representing averages
-over the last 1, 5, and 15 minutes, respectively.
-.Sh RETURN VALUES
-If the load average was unobtainable, \-1 is returned; otherwise,
-the number of samples actually retrieved is returned.
-.Sh SEE ALSO
-.Xr uptime 1 ,
-.Xr getloadavg 3 ,
-.Xr kvm 3 ,
-.Xr kvm_open 3 ,
-.Xr sysctl 3
diff --git a/lib/libkvm/kvm_getloadavg.c b/lib/libkvm/kvm_getloadavg.c
deleted file mode 100644
index c2f48948c..000000000
--- a/lib/libkvm/kvm_getloadavg.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*	$NetBSD: kvm_getloadavg.c,v 1.11 2012/03/21 10:10:36 matt Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_getloadavg.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: kvm_getloadavg.c,v 1.11 2012/03/21 10:10:36 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/lwp.h>
-#include <sys/proc.h>
-#include <sys/sysctl.h>
-#include <uvm/uvm_param.h>
-
-#include <db.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <nlist.h>
-#include <kvm.h>
-#include <stdlib.h>
-
-#include "kvm_private.h"
-
-static struct nlist nl[] = {
-	{ .n_name = "_averunnable" },
-#define	X_AVERUNNABLE	0
-	{ .n_name = "_fscale" },
-#define	X_FSCALE	1
-	{ .n_name = "" },
-};
-
-/*
- * kvm_getloadavg() -- Get system load averages, from live or dead kernels.
- *
- * Put `nelem' samples into `loadavg' array.
- * Return number of samples retrieved, or -1 on error.
- */
-int
-kvm_getloadavg(kvm_t *kd, double loadavg[], int nelem)
-{
-	struct loadavg loadinfo;
-	struct nlist *p;
-	int fscale, i;
-
-	if (ISALIVE(kd))
-		return (getloadavg(loadavg, nelem));
-
-	if (kvm_nlist(kd, nl) != 0) {
-		for (p = nl; p->n_type != 0; ++p);
-		_kvm_err(kd, kd->program,
-		    "%s: no such symbol", p->n_name);
-		return (-1);
-	}
-
-	if (KREAD(kd, nl[X_AVERUNNABLE].n_value, &loadinfo)) {
-		_kvm_err(kd, kd->program, "can't read averunnable");
-		return (-1);
-	}
-
-	/*
-	 * Old kernels have fscale separately; if not found assume
-	 * running new format.
-	 */
-	if (!KREAD(kd, nl[X_FSCALE].n_value, &fscale))
-		loadinfo.fscale = fscale;
-
-	nelem = MIN(nelem, sizeof(loadinfo.ldavg) / sizeof(fixpt_t));
-	for (i = 0; i < nelem; i++)
-		loadavg[i] = (double) loadinfo.ldavg[i] / loadinfo.fscale;
-	return (nelem);
-}
diff --git a/lib/libkvm/kvm_getlwps.3 b/lib/libkvm/kvm_getlwps.3
deleted file mode 100644
index 7c2e20c9f..000000000
--- a/lib/libkvm/kvm_getlwps.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\"	$NetBSD: kvm_getlwps.3,v 1.6 2009/03/10 23:49:07 joerg Exp $
-.\"
-.\"Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\"All rights reserved.
-.\"
-.\"This code is derived from software contributed to The NetBSD Foundation
-.\"by Nathan J. Williams.
-.\"
-.\"Redistribution and use in source and binary forms, with or without
-.\"modification, are permitted provided that the following conditions
-.\"are met:
-.\"1. Redistributions of source code must retain the above copyright
-.\"   notice, this list of conditions and the following disclaimer.
-.\"2. Redistributions in binary form must reproduce the above copyright
-.\"   notice, this list of conditions and the following disclaimer in the
-.\"   documentation and/or other materials provided with the distribution.
-.\"
-.\"THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\"``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\"TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\"PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\"BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\"CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\"SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\"INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\"CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\"ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\"POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd February 10, 2004
-.Dt KVM_GETLWPS 3
-.Os
-.Sh NAME
-.Nm kvm_getlwps
-.Nd access state of LWPs belonging to a user process
-.Sh LIBRARY
-.Lb libkvm
-.Sh SYNOPSIS
-.In kvm.h
-.In sys/param.h
-.In sys/sysctl.h
-.\" .Fa kvm_t *kd
-.Ft struct kinfo_lwp *
-.Fn kvm_getlwps "kvm_t *kd" "int pid" "u_long procaddr" "int *elemsize" "int *cnt"
-.Sh DESCRIPTION
-.Fn kvm_getlwps
-returns the set of LWPs belonging to the process specified by
-.Fa pid
-or
-.Fa procaddr
-in the kernel indicated by
-.Fa kd .
-The number of LWPs found is returned in the reference parameter
-.Fa cnt .
-The LWPs are returned as a contiguous array of
-.Sy kinfo_lwp
-structures.
-This memory is locally allocated, and subsequent calls to
-.Fn kvm_getlwps
-and
-.Fn kvm_close
-will overwrite this storage.
-.Pp
-Only the first
-.Fa elemsize
-bytes of each array entry are returned.
-If the size of the
-.Sy kinfo_lwp
-structure increases in size in a future release of
-.Nx
-the kernel will only return the requested amount of data for
-each array entry and programs that use
-.Fn kvm_getlwps
-will continue to function without the need for recompilation.
-.Pp
-If called against an active kernel, the
-.Fn kvm_getlwps
-function will use the
-.Xr sysctl 3
-interface and return information about the process identified by
-.Fa pid ;
-otherwise the kernel memory device file or swap device will be
-accessed and the process is identified by the location passed in
-.Fa paddr .
-.Sh RETURN VALUES
-.Fn kvm_getlwps
-returns
-.Dv NULL
-on failure.
-.Sh SEE ALSO
-.Xr kvm 3 ,
-.Xr kvm_close 3 ,
-.Xr kvm_geterr 3 ,
-.Xr kvm_getproc2 3 ,
-.Xr kvm_getprocs 3 ,
-.Xr kvm_nlist 3 ,
-.Xr kvm_open 3 ,
-.Xr kvm_openfiles 3 ,
-.Xr kvm_read 3 ,
-.Xr kvm_write 3
-.Sh BUGS
-These routines do not belong in the kvm interface.
diff --git a/lib/libkvm/kvm_getprocs.3 b/lib/libkvm/kvm_getprocs.3
deleted file mode 100644
index 24a6f4ab8..000000000
--- a/lib/libkvm/kvm_getprocs.3
+++ /dev/null
@@ -1,236 +0,0 @@
-.\"	$NetBSD: kvm_getprocs.3,v 1.15 2009/03/10 23:49:07 joerg Exp $
-.\"
-.\" Copyright (c) 1992, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software 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.
-.\" 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.
-.\"
-.\"     @(#)kvm_getprocs.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd February 10, 2004
-.Dt KVM_GETPROCS 3
-.Os
-.Sh NAME
-.Nm kvm_getprocs ,
-.Nm kvm_getargv ,
-.Nm kvm_getenvv
-.Nd access user process state
-.Sh LIBRARY
-.Lb libkvm
-.Sh SYNOPSIS
-.In kvm.h
-.In sys/param.h
-.In sys/sysctl.h
-.\" .Fa kvm_t *kd
-.Ft struct kinfo_proc *
-.Fn kvm_getprocs "kvm_t *kd" "int op" "int arg" "int *cnt"
-.Ft char **
-.Fn kvm_getargv "kvm_t *kd" "const struct kinfo_proc *p" "int nchr"
-.Ft char **
-.Fn kvm_getenvv "kvm_t *kd" "const struct kinfo_proc *p" "int nchr"
-.Ft struct kinfo_proc2 *
-.Fn kvm_getproc2 "kvm_t *kd" "int op" "int arg" "int elemsize" "int *cnt"
-.Ft char **
-.Fn kvm_getargv2 "kvm_t *kd" "const struct kinfo_proc2 *p" "int nchr"
-.Ft char **
-.Fn kvm_getenvv2 "kvm_t *kd" "const struct kinfo_proc2 *p" "int nchr"
-.Sh DESCRIPTION
-.Fn kvm_getprocs
-returns a (sub-)set of active processes in the kernel indicated by
-.Fa kd .
-The
-.Fa op
-and
-.Fa arg
-arguments constitute a predicate
-which limits the set of processes returned.
-The value of
-.Fa op
-describes the filtering predicate as follows:
-.Pp
-.Bl -tag -width 20n -offset indent -compact
-.It Sy KERN_PROC_ALL
-all processes
-.It Sy KERN_PROC_PID
-processes with process id
-.Fa arg
-.It Sy KERN_PROC_PGRP
-processes with process group
-.Fa arg
-.It Sy KERN_PROC_SESSION
-processes with session id
-.Fa arg
-.It Sy KERN_PROC_TTY
-processes with tty device
-.Fa arg
-.It Sy KERN_PROC_UID
-processes with effective user id
-.Fa arg
-.It Sy KERN_PROC_RUID
-processes with real user id
-.Fa arg
-.It Sy KERN_PROC_GID
-processes with effective group id
-.Fa arg
-.It Sy KERN_PROC_RGID
-processes with real group id
-.Fa arg
-.El
-.Pp
-The number of processes found is returned in the reference parameter
-.Fa cnt .
-The processes are returned as a contiguous array of
-.Sy kinfo_proc
-structures.
-This memory is locally allocated, and subsequent calls to
-.Fn kvm_getprocs
-and
-.Fn kvm_close
-will overwrite this storage.
-.Pp
-If the
-.Fa op
-argument for
-.Fn kvm_getprocs
-is
-.Sy KERN_PROC_TTY ,
-.Fa arg
-can also be
-.Sy KERN_PROC_TTY_NODEV
-to select processes with no controlling tty and
-.Sy KERN_PROC_TTY_REVOKE
-to select processes which have had their controlling tty
-revoked.
-.Pp
-.Fn kvm_getargv
-returns a null-terminated argument vector that corresponds to the
-command line arguments passed to process indicated by
-.Fa p .
-Most likely, these arguments correspond to the values passed to
-.Xr exec 3
-on process creation.
-This information is, however,
-deliberately under control of the process itself.
-Note that the original command name can be found, unaltered,
-in the p_comm field of the process structure returned by
-.Fn kvm_getprocs .
-.Pp
-The
-.Fa nchr
-argument indicates the maximum number of characters, including null bytes,
-to use in building the strings.
-If this amount is exceeded, the string
-causing the overflow is truncated and the partial result is returned.
-This is handy for programs like
-.Xr ps 1
-and
-.Xr w 1
-that print only a one line summary of a command and should not copy
-out large amounts of text only to ignore it.
-If
-.Fa nchr
-is zero, no limit is imposed and all argument strings are returned in
-their entirety.
-.Pp
-The memory allocated to the argv pointers and string storage
-is owned by the kvm library.
-Subsequent
-.Fn kvm_getprocs
-and
-.Xr kvm_close 3
-calls will clobber this storage.
-.Pp
-The
-.Fn kvm_getenvv
-function is similar to
-.Fn kvm_getargv
-but returns the vector of environment strings.
-This data is also alterable by the process.
-.Pp
-.Fn kvm_getproc2
-is similar to
-.Fn kvm_getprocs
-but returns an array of
-.Sy kinfo_proc2
-structures.
-Additionally, only the first
-.Fa elemsize
-bytes of each array entry are returned.
-If the size of the
-.Sy kinfo_proc2
-structure increases in size in a future release of
-.Nx
-the kernel will only return the requested amount of data for
-each array entry and programs that use
-.Fn kvm_getproc2
-will continue to function without the need for recompilation.
-.Pp
-The
-.Fn kvm_getargv2
-and
-.Fn kvm_getenvv2
-are equivalents to the
-.Fn kvm_getargv
-and
-.Fn kvm_getenvv
-functions but use a
-.Sy kinfo_proc2
-structure to specify the process.
-.Pp
-If called against an active kernel, the
-.Fn kvm_getproc2 ,
-.Fn kvm_getargv2 ,
-and
-.Fn kvm_getenvv2
-functions will use the
-.Xr sysctl 3
-interface and do not require access to the kernel memory device
-file or swap device.
-.Sh RETURN VALUES
-.Fn kvm_getprocs ,
-.Fn kvm_getargv ,
-.Fn kvm_getenvv ,
-.Fn kvm_getproc2 ,
-.Fn kvm_getargv2 ,
-and
-.Fn kvm_getenvv2
-all return
-.Dv NULL
-on failure.
-.Sh SEE ALSO
-.Xr kvm 3 ,
-.Xr kvm_close 3 ,
-.Xr kvm_geterr 3 ,
-.Xr kvm_nlist 3 ,
-.Xr kvm_open 3 ,
-.Xr kvm_openfiles 3 ,
-.Xr kvm_read 3 ,
-.Xr kvm_write 3
-.Sh BUGS
-These routines do not belong in the kvm interface.
diff --git a/lib/libkvm/kvm_hppa.c b/lib/libkvm/kvm_hppa.c
deleted file mode 100644
index 6188446a4..000000000
--- a/lib/libkvm/kvm_hppa.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*	$NetBSD: kvm_hppa.c,v 1.7 2014/02/19 20:21:22 dsl Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: kvm_hppa.c,v 1.7 2014/02/19 20:21:22 dsl Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * hppa machine dependent routines for kvm.
- * XXX fredette - largely unimplemented so far.  what is here
- * is lifted and disabled.
- */
-
-#include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/stat.h>
-#include <sys/kcore.h>
-#include <sys/types.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <nlist.h>
-#include <kvm.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <limits.h>
-#include <db.h>
-
-#include "kvm_private.h"
-
-#include <machine/kcore.h>
-#include <machine/pmap.h>
-#include <machine/pte.h>
-#include <machine/vmparam.h>
-
-#ifndef btop
-#define	btop(x)		(((unsigned)(x)) >> PGSHIFT)	/* XXX */
-#define	ptob(x)		((caddr_t)((x) << PGSHIFT))	/* XXX */
-#endif
-
-void
-_kvm_freevtop(kvm_t *kd)
-{
-
-	/* Not actually used for anything right now, but safe. */
-	if (kd->vmst != 0)
-		free(kd->vmst);
-}
-
-/*ARGSUSED*/
-int
-_kvm_initvtop(kvm_t *kd)
-{
-
-	return 0;
-}
-
-/*
- * Translate a kernel virtual address to a physical address.
- */
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-#if 0
-	cpu_kcore_hdr_t *cpu_kh;
-	u_long page_off;
-	pd_entry_t pde;
-	pt_entry_t pte;
-	u_long pde_pa, pte_pa;
-#endif
-
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, 0, "vatop called in live kernel!");
-		return 0;
-	}
-
-	_kvm_syserr(kd, 0, "could not read PTE");
-
-#if 0
-	cpu_kh = kd->cpu_data;
-	page_off = va & PGOFSET;
-
-	/*
-	 * Find and read the page directory entry.
-	 */
-	pde_pa = cpu_kh->ptdpaddr + (pdei(va) * sizeof(pd_entry_t));
-	if (_kvm_pread(kd, kd->pmfd, (void *)&pde, sizeof(pde),
-	    _kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {
-		_kvm_syserr(kd, 0, "could not read PDE");
-		goto lose;
-	}
-
-	/*
-	 * Find and read the page table entry.
-	 */
-	if ((pde & PG_V) == 0) {
-		_kvm_err(kd, 0, "invalid translation (invalid PDE)");
-		goto lose;
-	}
-	pte_pa = (pde & PG_FRAME) + (ptei(va) * sizeof(pt_entry_t));
-	if (_kvm_pread(kd, kd->pmfd, (void *) &pte, sizeof(pte),
-	    _kvm_pa2off(kd, pte_pa)) != sizeof(pte)) {
-		_kvm_syserr(kd, 0, "could not read PTE");
-		goto lose;
-	}
-
-	/*
-	 * Validate the PTE and return the physical address.
-	 */
-	if ((pte & PG_V) == 0) {
-		_kvm_err(kd, 0, "invalid translation (invalid PTE)");
-		goto lose;
-	}
-	*pa = (pte & PG_FRAME) + page_off;
-	return (int)(NBPG - page_off);
-
- lose:
-#endif
-	*pa = (u_long)~0L;
-	return 0;
-}
-
-/*
- * Translate a physical address to a file-offset in the crash dump.
- */
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-#if 0
-	cpu_kcore_hdr_t *cpu_kh;
-	phys_ram_seg_t *ramsegs;
-	off_t off;
-	int i;
-
-	cpu_kh = kd->cpu_data;
-	ramsegs = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh));
-
-	off = 0;
-	for (i = 0; i < cpu_kh->nmemsegs; i++) {
-		if (pa >= ramsegs[i].start &&
-		    (pa - ramsegs[i].start) < ramsegs[i].size) {
-			off += (pa - ramsegs[i].start);
-			break;
-		}
-		off += ramsegs[i].size;
-	}
-
-	return kd->dump_off + off;
-#endif
-	return 0;
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-
-	kd->usrstack = USRSTACK;
-	kd->min_uva = VM_MIN_ADDRESS;
-	kd->max_uva = VM_MAXUSER_ADDRESS;
-
-	return 0;
-}
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c
deleted file mode 100644
index a317cc099..000000000
--- a/lib/libkvm/kvm_i386.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/*	$NetBSD: kvm_i386.c,v 1.30 2014/02/19 20:21:22 dsl Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: kvm_i386.c,v 1.30 2014/02/19 20:21:22 dsl Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * i386 machine dependent routines for kvm.
- */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/kcore.h>
-#include <sys/types.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <nlist.h>
-#include <kvm.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <limits.h>
-#include <db.h>
-
-#include "kvm_private.h"
-
-#include <i386/kcore.h>
-#include <i386/pmap.h>
-#include <i386/pte.h>
-#include <i386/vmparam.h>
-
-#ifndef btop
-#define	btop(x)		(((unsigned)(x)) >> PGSHIFT)	/* XXX */
-#define	ptob(x)		((caddr_t)((x) << PGSHIFT))	/* XXX */
-#endif
-
-/*
- * Indicates whether PAE is in use for the kernel image
- * 0: native i386 memory mappings
- * 1: i386 PAE mappings
- */
-static int i386_use_pae;
-
-int _kvm_kvatop_i386(kvm_t *, vaddr_t, paddr_t *);
-int _kvm_kvatop_i386pae(kvm_t *, vaddr_t, paddr_t *);
-
-void
-_kvm_freevtop(kvm_t *kd)
-{
-
-	/* Not actually used for anything right now, but safe. */
-	if (kd->vmst != 0)
-		free(kd->vmst);
-}
-
-/*ARGSUSED*/
-int
-_kvm_initvtop(kvm_t *kd)
-{
-	cpu_kcore_hdr_t *cpu_kh = kd->cpu_data;
-
-	i386_use_pae = 0; /* default: non PAE mode */
-	if ((cpu_kh->pdppaddr & I386_KCORE_PAE) == I386_KCORE_PAE)
-		i386_use_pae = 1;
-
-	return 0;
-}
-
-/*
- * Translate a kernel virtual address to a physical address.
- */
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, 0, "vatop called in live kernel!");
-		return 0;
-	}
-
-	switch (i386_use_pae) {
-	default:
-	case 0:
-		return _kvm_kvatop_i386(kd, va, pa);
-	case 1:
-		return _kvm_kvatop_i386pae(kd, va, pa);
-	}
-	
-}
-
-/*
- * Used to translate a virtual address to a physical address for systems
- * with PAE mode disabled. Only two levels of virtual memory pages are
- * dereferenced (L2 PDEs, then L1 PTEs).
- */
-int
-_kvm_kvatop_i386(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-	cpu_kcore_hdr_t *cpu_kh;
-	u_long page_off;
-	pd_entry_t pde;
-	pt_entry_t pte;
-	paddr_t pde_pa, pte_pa;
-
-	cpu_kh = kd->cpu_data;
-	page_off = va & PGOFSET;
-
-	/*
-	 * Find and read the page directory entry.
-	 * pdppaddr being PAGE_SIZE aligned, we mask the option bits.
-	 */
-	pde_pa = (cpu_kh->pdppaddr & PG_FRAME) + (pl2_pi(va) * sizeof(pde));
-	if (_kvm_pread(kd, kd->pmfd, (void *)&pde, sizeof(pde),
-	    _kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {
-		_kvm_syserr(kd, 0, "could not read PDE");
-		goto lose;
-	}
-
-	/*
-	 * Find and read the page table entry.
-	 */
-	if ((pde & PG_V) == 0) {
-		_kvm_err(kd, 0, "invalid translation (invalid PDE)");
-		goto lose;
-	}
-	if ((pde & PG_PS) != 0) {
-		/*
-		 * This is a 4MB page.
-		 */
-		page_off = va & ~PG_LGFRAME;
-		*pa = (pde & PG_LGFRAME) + page_off;
-		return (int)(NBPD_L2 - page_off);
-	}
-	pte_pa = (pde & PG_FRAME) + (pl1_pi(va) * sizeof(pt_entry_t));
-	if (_kvm_pread(kd, kd->pmfd, (void *) &pte, sizeof(pte),
-	    _kvm_pa2off(kd, pte_pa)) != sizeof(pte)) {
-		_kvm_syserr(kd, 0, "could not read PTE");
-		goto lose;
-	}
-
-	/*
-	 * Validate the PTE and return the physical address.
-	 */
-	if ((pte & PG_V) == 0) {
-		_kvm_err(kd, 0, "invalid translation (invalid PTE)");
-		goto lose;
-	}
-	*pa = (pte & PG_FRAME) + page_off;
-	return (int)(NBPG - page_off);
-
- lose:
-	*pa = (paddr_t)~0L;
-	return 0;
-}
-
-/*
- * Translate a physical address to a file-offset in the crash dump.
- */
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-	cpu_kcore_hdr_t *cpu_kh;
-	phys_ram_seg_t *ramsegs;
-	off_t off;
-	int i;
-
-	cpu_kh = kd->cpu_data;
-	ramsegs = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh));
-
-	off = 0;
-	for (i = 0; i < cpu_kh->nmemsegs; i++) {
-		if (pa >= ramsegs[i].start &&
-		    (pa - ramsegs[i].start) < ramsegs[i].size) {
-			off += (pa - ramsegs[i].start);
-			break;
-		}
-		off += ramsegs[i].size;
-	}
-
-	return (kd->dump_off + off);
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-
-	kd->usrstack = USRSTACK;
-	kd->min_uva = VM_MIN_ADDRESS;
-	kd->max_uva = VM_MAXUSER_ADDRESS;
-
-	return 0;
-}
diff --git a/lib/libkvm/kvm_i386pae.c b/lib/libkvm/kvm_i386pae.c
deleted file mode 100644
index 20226cc66..000000000
--- a/lib/libkvm/kvm_i386pae.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* $NetBSD: kvm_i386pae.c,v 1.2 2014/02/19 20:21:22 dsl Exp $ */
-
-/*
- * Copyright (c) 2010 Jean-Yves Migeon.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: kvm_i386pae.c,v 1.2 2014/02/19 20:21:22 dsl Exp $");
-
-/*
- * This will expose PAE functions, macros, definitions and constants.
- * Note: this affects all virtual memory related functions. Only their
- * PAE versions can be used below.
- */
-#define PAE
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/kcore.h>
-#include <sys/types.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <nlist.h>
-#include <kvm.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <limits.h>
-#include <db.h>
-
-#include "kvm_private.h"
-
-#include <i386/kcore.h>
-#include <i386/pmap.h>
-#include <i386/pte.h>
-#include <i386/vmparam.h>
-
-int _kvm_kvatop_i386pae(kvm_t *, vaddr_t, paddr_t *);
-
-/*
- * Used to translate a virtual address to a physical address for systems
- * running under PAE mode. Three levels of virtual memory pages are handled
- * here: the per-CPU L3 page, the 4 L2 PDs and the PTs.
- */
-int
-_kvm_kvatop_i386pae(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-	cpu_kcore_hdr_t *cpu_kh;
-	u_long page_off;
-	pd_entry_t pde;
-	pt_entry_t pte;
-	paddr_t pde_pa, pte_pa;
-
-	cpu_kh = kd->cpu_data;
-	page_off = va & PGOFSET;
-	
-	/*
-	 * Find and read the PDE. Ignore the L3, as it is only a per-CPU
-	 * page, not needed for kernel VA => PA translations.
-	 * Remember that the 4 L2 pages are contiguous, so it is safe
-	 * to increment pdppaddr to compute the address of the PDE.
-	 * pdppaddr being PAGE_SIZE aligned, we mask the option bits.
-	 */
-	pde_pa = (cpu_kh->pdppaddr & PG_FRAME) + (pl2_pi(va) * sizeof(pde));
-	if (_kvm_pread(kd, kd->pmfd, (void *)&pde, sizeof(pde),
-	    _kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {
-		_kvm_syserr(kd, 0, "could not read PDE");
-		goto lose;
-	}
-
-	/*
-	 * Find and read the page table entry.
-	 */
-	if ((pde & PG_V) == 0) {
-		_kvm_err(kd, 0, "invalid translation (invalid PDE)");
-		goto lose;
-	}
-	if ((pde & PG_PS) != 0) {
-		/*
-		 * This is a 2MB page.
-		 */
-		page_off = va & ((vaddr_t)~PG_LGFRAME);
-		*pa = (pde & PG_LGFRAME) + page_off;
-		return (int)(NBPD_L2 - page_off);
-	}
-
-	pte_pa = (pde & PG_FRAME) + (pl1_pi(va) * sizeof(pt_entry_t));
-	if (_kvm_pread(kd, kd->pmfd, (void *) &pte, sizeof(pte),
-	    _kvm_pa2off(kd, pte_pa)) != sizeof(pte)) {
-		_kvm_syserr(kd, 0, "could not read PTE");
-		goto lose;
-	}
-
-	/*
-	 * Validate the PTE and return the physical address.
-	 */
-	if ((pte & PG_V) == 0) {
-		_kvm_err(kd, 0, "invalid translation (invalid PTE)");
-		goto lose;
-	}
-	*pa = (pte & PG_FRAME) + page_off;
-	return (int)(NBPG - page_off);
-
-lose:
-	*pa = (paddr_t)~0L;
-	return 0;
-
-}
diff --git a/lib/libkvm/kvm_ia64.c b/lib/libkvm/kvm_ia64.c
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/libkvm/kvm_m68k.c b/lib/libkvm/kvm_m68k.c
deleted file mode 100644
index de95e1691..000000000
--- a/lib/libkvm/kvm_m68k.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*	$NetBSD: kvm_m68k.c,v 1.19 2014/01/27 21:00:01 matt Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Gordon W. Ross and Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Run-time kvm dispatcher for m68k machines.
- * The actual MD code is in the files:
- * kvm_m68k_cmn.c kvm_sun3.c ...
- *
- * Note: This file has to build on ALL m68k machines,
- * so do NOT include any <machine/[*].h> files here.
- */
-
-#include <sys/param.h>
-#include <sys/exec.h>
-#include <sys/kcore.h>
-#include <sys/sysctl.h>
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <unistd.h>
-#include <limits.h>
-#include <nlist.h>
-#include <kvm.h>
-#include <db.h>
-
-#include <m68k/kcore.h>
-
-#include "kvm_private.h"
-#include "kvm_m68k.h"
-
-__RCSID("$NetBSD: kvm_m68k.c,v 1.19 2014/01/27 21:00:01 matt Exp $");
-
-struct name_ops {
-	const char *name;
-	struct kvm_ops *ops;
-};
-
-/*
- * Match specific kcore types first, falling into a default.
- */
-static struct name_ops optbl[] = {
-	{ "sun2",	&_kvm_ops_sun2 },
-	{ "sun3",	&_kvm_ops_sun3 },
-	{ "sun3x",	&_kvm_ops_sun3x },
-	{ NULL,		&_kvm_ops_cmn },
-};
-
-/*
- * Prepare for translation of kernel virtual addresses into offsets
- * into crash dump files.  This is where we do the dispatch work.
- */
-int
-_kvm_initvtop(kvm_t *kd)
-{
-	cpu_kcore_hdr_t *h;
-	struct name_ops *nop;
-	struct vmstate *vm;
-
-	vm = (struct vmstate *)_kvm_malloc(kd, sizeof (*vm));
-	if (vm == 0)
-		return (-1);
-
-	kd->vmst = vm;
-
-	/*
-	 * Use the machine name in the kcore header to determine
-	 * our ops vector.  When we reach an ops vector with
-	 * no name, we've found a default.
-	 */
-	h = kd->cpu_data;
-	h->name[sizeof(h->name) - 1] = '\0';	/* sanity */
-	for (nop = optbl; nop->name != NULL; nop++)
-		if (strcmp(nop->name, h->name) == 0)
-			break;
-
-	vm->ops = nop->ops;
-
-	/*
-	 * Compute pgshift and pgofset.
-	 */
-	for (vm->pgshift = 0; (1 << vm->pgshift) < h->page_size; vm->pgshift++)
-		/* nothing */ ;
-	if ((1 << vm->pgshift) != h->page_size)
-		goto bad;
-	vm->pgofset = h->page_size - 1;
-
-	if ((vm->ops->initvtop)(kd) < 0)
-		goto bad;
-
-	return (0);
-
- bad:
-	kd->vmst = NULL;
-	free(vm);
-	return (-1);
-}
-
-void
-_kvm_freevtop(kvm_t *kd)
-{
-	(kd->vmst->ops->freevtop)(kd);
-	free(kd->vmst);
-}
-
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pap)
-{
-	return ((kd->vmst->ops->kvatop)(kd, va, pap));
-}
-
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-	return ((kd->vmst->ops->pa2off)(kd, pa));
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-	u_long max_uva;
-	extern struct ps_strings *__ps_strings;
-
-#if 0	/* XXX - These vary across m68k machines... */
-	kd->usrstack = USRSTACK;
-	kd->min_uva = VM_MIN_ADDRESS;
-	kd->max_uva = VM_MAXUSER_ADDRESS;
-#endif
-	/* This is somewhat hack-ish, but it works. */
-	max_uva = (u_long) (__ps_strings + 1);
-	kd->usrstack = max_uva;
-	kd->max_uva  = max_uva;
-	kd->min_uva  = 0;
-
-	return (0);
-}
diff --git a/lib/libkvm/kvm_m68k.h b/lib/libkvm/kvm_m68k.h
deleted file mode 100644
index b0c1e59c3..000000000
--- a/lib/libkvm/kvm_m68k.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: kvm_m68k.h,v 1.6 2010/09/20 23:23:16 jym Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Gordon W. Ross and Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-struct kvm_ops {
-	int   (*initvtop)(kvm_t *);
-	void  (*freevtop)(kvm_t *);
-	int   (*kvatop)  (kvm_t *, vaddr_t, paddr_t *);
-	off_t (*pa2off)  (kvm_t *, paddr_t);
-};
-
-struct vmstate {
-	struct kvm_ops *ops;	/* ops vector */
-	u_int32_t pgshift;	/* log2(page_size) */
-	u_int32_t pgofset;	/* mask to find offset into page */
-	void *private;		/* private to the bottom layer */
-};
-
-extern struct kvm_ops _kvm_ops_cmn;
-extern struct kvm_ops _kvm_ops_sun2;
-extern struct kvm_ops _kvm_ops_sun3;
-extern struct kvm_ops _kvm_ops_sun3x;
diff --git a/lib/libkvm/kvm_m68k_cmn.c b/lib/libkvm/kvm_m68k_cmn.c
deleted file mode 100644
index ae2254359..000000000
--- a/lib/libkvm/kvm_m68k_cmn.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*	$NetBSD: kvm_m68k_cmn.c,v 1.18 2014/03/04 06:38:08 matt Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software 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.
- * 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.
- */
-
-/*-
- * Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
- *
- * This code is derived from software 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: kvm_m68k_cmn.c,v 1.18 2014/03/04 06:38:08 matt Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Common m68k machine dependent routines for kvm.
- *
- * Note: This file has to build on ALL m68k machines,
- * so do NOT include any <machine / *.h> files here.
- */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/kcore.h>
-
-#include <unistd.h>
-#include <limits.h>
-#include <nlist.h>
-#include <kvm.h>
-#include <db.h>
-
-#include <m68k/cpu.h>
-#include <m68k/kcore.h>
-#include <m68k/m68k.h>
-
-#include "kvm_private.h"
-#include "kvm_m68k.h"
-
-int   _kvm_cmn_initvtop(kvm_t *);
-void  _kvm_cmn_freevtop(kvm_t *);
-int   _kvm_cmn_kvatop(kvm_t *, vaddr_t, paddr_t *);
-off_t _kvm_cmn_pa2off(kvm_t *, paddr_t);
-
-struct kvm_ops _kvm_ops_cmn = {
-	_kvm_cmn_initvtop,
-	_kvm_cmn_freevtop,
-	_kvm_cmn_kvatop,
-	_kvm_cmn_pa2off };
-
-static int vatop_030(kvm_t *, uint32_t, vaddr_t, paddr_t *);
-static int vatop_040(kvm_t *, uint32_t, vaddr_t, paddr_t *);
-
-#define	_kvm_btop(v, a)	(((unsigned)(a)) >> (v)->pgshift)
-
-void
-_kvm_cmn_freevtop(kvm_t *kd)
-{
-	/* No private state information to keep. */
-}
-
-int
-_kvm_cmn_initvtop(kvm_t *kd)
-{
-	/* No private state information to keep. */
-	return (0);
-}
-
-int
-_kvm_cmn_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-	cpu_kcore_hdr_t *h = kd->cpu_data;
-	struct m68k_kcore_hdr *m = &h->un._m68k;
-	int (*vtopf)(kvm_t *, uint32_t, vaddr_t, paddr_t *);
-
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, 0, "vatop called in live kernel!");
-		return (0);
-	}
-
-	/*
-	 * 68040 and 68060 use same translation functions,
-	 * as do 68030, 68851, HP MMU.
-	 */
-	if (m->mmutype == MMU_68040 || m->mmutype == MMU_68060)
-		vtopf = vatop_040;
-	else
-		vtopf = vatop_030;
-
-	return ((*vtopf)(kd, m->sysseg_pa, va, pa));
-}
-
-/*
- * Translate a physical address to a file-offset in the crash dump.
- */
-off_t
-_kvm_cmn_pa2off(kvm_t *kd, u_long pa)
-{
-	cpu_kcore_hdr_t *h = kd->cpu_data;
-	struct m68k_kcore_hdr *m = &h->un._m68k;
-	phys_ram_seg_t *rsp;
-	off_t off;
-	int i;
-
-	off = 0;
-	rsp = m->ram_segs;
-	for (i = 0; i < M68K_NPHYS_RAM_SEGS && rsp[i].size != 0; i++) {
-		if (pa >= rsp[i].start &&
-		    pa < (rsp[i].start + rsp[i].size)) {
-			pa -= rsp[i].start;
-			break;
-		}
-		off += rsp[i].size;
-	}
-	return (kd->dump_off + off + pa);
-}
-
-/*****************************************************************
- * Local stuff...
- */
-
-static int
-vatop_030(kvm_t *kd, uint32_t stpa, vaddr_t va, paddr_t *pa)
-{
-	cpu_kcore_hdr_t *h = kd->cpu_data;
-	struct m68k_kcore_hdr *m = &h->un._m68k;
-	struct vmstate *vm = kd->vmst;
-	paddr_t addr;
-	uint32_t ste, pte;
-	u_int p, offset;
-
-	offset = va & vm->pgofset;
-
-	/*
-	 * We may be called before address translation is initialized.
-	 * This is typically used to find the dump magic number.  This
-	 * means we do not yet have the kernel page tables available,
-	 * so we must to a simple relocation.
-	 */
-	if (va < m->relocend) {
-		*pa = (va - h->kernbase) + m->reloc;
-		return (h->page_size - offset);
-	}
-
-	addr = stpa + ((va >> m->sg_ishift) * sizeof(u_int32_t));
-
-	/*
-	 * Can't use KREAD to read kernel segment table entries.
-	 * Fortunately it is 1-to-1 mapped so we don't have to.
-	 */
-	if (stpa == m->sysseg_pa) {
-		if (_kvm_pread(kd, kd->pmfd, &ste, sizeof(ste),
-		    _kvm_cmn_pa2off(kd, addr)) != sizeof(ste))
-			goto invalid;
-	} else if (KREAD(kd, addr, &ste))
-		goto invalid;
-	if ((ste & m->sg_v) == 0) {
-		_kvm_err(kd, 0, "invalid segment (%x)", ste);
-		return(0);
-	}
-	p = _kvm_btop(vm, va & m->sg_pmask);
-	addr = (ste & m->sg_frame) + (p * sizeof(u_int32_t));
-
-	/*
-	 * Address from STE is a physical address so don't use kvm_read.
-	 */
-	if (_kvm_pread(kd, kd->pmfd, &pte, sizeof(pte),
-	    _kvm_cmn_pa2off(kd, addr)) != sizeof(pte))
-		goto invalid;
-	addr = pte & m->pg_frame;
-	if ((pte & m->pg_v) == 0) {
-		_kvm_err(kd, 0, "page not valid");
-		return (0);
-	}
-	*pa = addr + offset;
-
-	return (h->page_size - offset);
-invalid:
-	_kvm_err(kd, 0, "invalid address (%lx)", va);
-	return (0);
-}
-
-static int
-vatop_040(kvm_t *kd, uint32_t stpa, vaddr_t va, paddr_t *pa)
-{
-	cpu_kcore_hdr_t *h = kd->cpu_data;
-	struct m68k_kcore_hdr *m = &h->un._m68k;
-	struct vmstate *vm = kd->vmst;
-	paddr_t addr;
-	uint32_t stpa2;
-	uint32_t ste, pte;
-	u_int offset;
-
-	offset = va & vm->pgofset;
-
-	/*
-	 * We may be called before address translation is initialized.
-	 * This is typically used to find the dump magic number.  This
-	 * means we do not yet have the kernel page tables available,
-	 * so we must to a simple relocation.
-	 */
-	if (va < m->relocend) {
-		*pa = (va - h->kernbase) + m->reloc;
-		return (h->page_size - offset);
-	}
-
-	addr = stpa + ((va >> m->sg40_shift1) * sizeof(u_int32_t));
-
-	/*
-	 * Can't use KREAD to read kernel segment table entries.
-	 * Fortunately it is 1-to-1 mapped so we don't have to.
-	 */
-	if (stpa == m->sysseg_pa) {
-		if (_kvm_pread(kd, kd->pmfd, &ste, sizeof(ste),
-		    _kvm_cmn_pa2off(kd, addr)) != sizeof(ste))
-			goto invalid;
-	} else if (KREAD(kd, addr, &ste))
-		goto invalid;
-	if ((ste & m->sg_v) == 0) {
-		_kvm_err(kd, 0, "invalid level 1 descriptor (%x)",
-				 ste);
-		return((off_t)0);
-	}
-	stpa2 = (ste & m->sg40_addr1);
-	addr = stpa2 + (((va & m->sg40_mask2) >> m->sg40_shift2) *
-	    sizeof(u_int32_t));
-
-	/*
-	 * Address from level 1 STE is a physical address,
-	 * so don't use kvm_read.
-	 */
-	if (_kvm_pread(kd, kd->pmfd, &ste, sizeof(ste),
-	    _kvm_cmn_pa2off(kd, addr)) != sizeof(ste))
-		goto invalid;
-	if ((ste & m->sg_v) == 0) {
-		_kvm_err(kd, 0, "invalid level 2 descriptor (%x)",
-				 ste);
-		return((off_t)0);
-	}
-	stpa2 = (ste & m->sg40_addr2);
-	addr = stpa2 + (((va & m->sg40_mask3) >> m->sg40_shift3) *
-	    sizeof(u_int32_t));
-
-	/*
-	 * Address from STE is a physical address so don't use kvm_read.
-	 */
-	if (_kvm_pread(kd, kd->pmfd, &pte, sizeof(pte),
-	    _kvm_cmn_pa2off(kd, addr)) != sizeof(pte))
-		goto invalid;
-	addr = pte & m->pg_frame;
-	if ((pte & m->pg_v) == 0) {
-		_kvm_err(kd, 0, "page not valid");
-		return (0);
-	}
-	*pa = addr + offset;
-
-	return (h->page_size - offset);
-
-invalid:
-	_kvm_err(kd, 0, "invalid address (%lx)", va);
-	return (0);
-}
diff --git a/lib/libkvm/kvm_mips.c b/lib/libkvm/kvm_mips.c
deleted file mode 100644
index 5ab664d70..000000000
--- a/lib/libkvm/kvm_mips.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* $NetBSD: kvm_mips.c,v 1.22 2014/02/19 20:21:22 dsl 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.
- */
-
-/*
- * Modified for NetBSD/mips by Jason R. Thorpe, Numerical Aerospace
- * Simulation Facility, NASA Ames Research Center.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: kvm_mips.c,v 1.22 2014/02/19 20:21:22 dsl Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * MIPS machine dependent routines for kvm.
- */
-
-#include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/stat.h>
-#include <sys/kcore.h>
-#include <sys/types.h>
-
-#include <machine/kcore.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <nlist.h>
-#include <kvm.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <limits.h>
-#include <db.h>
-
-#include "kvm_private.h"
-
-#include <mips/cpuregs.h>
-#include <mips/vmparam.h>
-
-void
-_kvm_freevtop(kvm_t *kd)
-{
-
-	/* Not actually used for anything right now, but safe. */
-	if (kd->vmst != 0)
-		free(kd->vmst);
-}
-
-int
-_kvm_initvtop(kvm_t *kd)
-{
-
-	return (0);
-}
-
-/*
- * Translate a kernel virtual address to a physical address.
- */
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-	cpu_kcore_hdr_t *cpu_kh;
-	int page_off;
-	u_int pte;
-	paddr_t pte_pa;
-
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, 0, "vatop called in live kernel!");
-		return((off_t)0);
-	}
-
-	cpu_kh = kd->cpu_data;
-	page_off = va & PGOFSET;
-
-#ifdef _LP64
-	if (MIPS_XKPHYS_P(va)) {
-		/*
-		 * Direct-mapped cached address: just convert it.
-		 */
-		*pa = MIPS_XKPHYS_TO_PHYS(va);
-		return (NBPG - page_off);
-	}
-
-	if (va < MIPS_XKPHYS_START) {
-		/*
-		 * XUSEG (user virtual address space) - invalid.
-		 */
-		_kvm_err(kd, 0, "invalid kernel virtual address");
-		goto lose;
-	}
-#else
-	if (va < MIPS_KSEG0_START) {
-		/*
-		 * KUSEG (user virtual address space) - invalid.
-		 */
-		_kvm_err(kd, 0, "invalid kernel virtual address");
-		goto lose;
-	}
-#endif
-
-	if (MIPS_KSEG0_P(va)) {
-		/*
-		 * Direct-mapped cached address: just convert it.
-		 */
-		*pa = MIPS_KSEG0_TO_PHYS(va);
-		return (NBPG - page_off);
-	}
-
-	if (MIPS_KSEG1_P(va)) {
-		/*
-		 * Direct-mapped uncached address: just convert it.
-		 */
-		*pa = MIPS_KSEG1_TO_PHYS(va);
-		return (NBPG - page_off);
-	}
-
-#ifdef _LP64
-	if (va >= MIPS_KSEG2_START) {
-		/*
-		 * KUSEG (user virtual address space) - invalid.
-		 */
-		_kvm_err(kd, 0, "invalid kernel virtual address");
-		goto lose;
-	}
-#endif
-
-	/*
-	 * We now know that we're a KSEG2 (kernel virtually mapped)
-	 * address.  Translate the address using the pmap's kernel
-	 * page table.
-	 */
-
-	/*
-	 * Step 1: Make sure the kernel page table has a translation
-	 * for the address.
-	 */
-#ifdef _LP64
-	if (va >= (MIPS_XKSEG_START + (cpu_kh->sysmapsize * NBPG))) {
-		_kvm_err(kd, 0, "invalid XKSEG address");
-		goto lose;
-	}
-#else
-	if (va >= (MIPS_KSEG2_START + (cpu_kh->sysmapsize * NBPG))) {
-		_kvm_err(kd, 0, "invalid KSEG2 address");
-		goto lose;
-	}
-#endif
-
-	/*
-	 * Step 2: Locate and read the PTE.
-	 */
-	pte_pa = cpu_kh->sysmappa +
-	    (((va - MIPS_KSEG2_START) >> PGSHIFT) * sizeof(u_int));
-	if (_kvm_pread(kd, kd->pmfd, &pte, sizeof(pte),
-	    _kvm_pa2off(kd, pte_pa)) != sizeof(pte)) {
-		_kvm_syserr(kd, 0, "could not read PTE");
-		goto lose;
-	}
-
-	/*
-	 * Step 3: Validate the PTE and return the physical address.
-	 */
-	if ((pte & cpu_kh->pg_v) == 0) {
-		_kvm_err(kd, 0, "invalid translation (invalid PTE)");
-		goto lose;
-	}
-	*pa = (((pte & cpu_kh->pg_frame) >> cpu_kh->pg_shift) << PGSHIFT) +
-	    page_off;
-	return (NBPG - page_off);
-
- lose:
-	*pa = -1;
-	return (0);
-}
-
-/*
- * Translate a physical address to a file-offset in the crash dump.
- */
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-	cpu_kcore_hdr_t *cpu_kh;
-	phys_ram_seg_t *ramsegs;
-	off_t off;
-	int i;
-
-	cpu_kh = kd->cpu_data;
-	ramsegs = (phys_ram_seg_t *)((char *)cpu_kh + ALIGN(sizeof *cpu_kh));
-
-	off = 0;
-	for (i = 0; i < cpu_kh->nmemsegs; i++) {
-		if (pa >= ramsegs[i].start &&
-		    (pa - ramsegs[i].start) < ramsegs[i].size) {
-			off += (pa - ramsegs[i].start);
-			break;
-		}
-		off += ramsegs[i].size;
-	}
-
-	return (kd->dump_off + off);
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-
-	kd->usrstack = USRSTACK;
-	kd->min_uva = VM_MIN_ADDRESS;
-	kd->max_uva = VM_MAXUSER_ADDRESS;
-
-	return (0);
-}
diff --git a/lib/libkvm/kvm_nlist.3 b/lib/libkvm/kvm_nlist.3
deleted file mode 100644
index 4ff4ae0f3..000000000
--- a/lib/libkvm/kvm_nlist.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\"	$NetBSD: kvm_nlist.3,v 1.11 2003/08/07 16:44:37 agc Exp $
-.\"
-.\" Copyright (c) 1992, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software 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.
-.\" 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.
-.\"
-.\"     @(#)kvm_nlist.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd May 11, 2003
-.Dt KVM_NLIST 3
-.Os
-.Sh NAME
-.Nm kvm_nlist
-.Nd retrieve symbol table names from a kernel image
-.Sh LIBRARY
-.Lb libkvm
-.Sh SYNOPSIS
-.In kvm.h
-.In nlist.h
-.Ft int
-.Fn kvm_nlist "kvm_t *kd" "struct nlist *nl"
-.Sh DESCRIPTION
-.Fn kvm_nlist
-retrieves the symbol table entries indicated by the name list argument
-.Fa \&nl .
-This argument points to an array of nlist structures, terminated by
-an entry whose n_name field is
-.Dv NULL
-(see
-.Xr nlist 3 ) .
-Each symbol is looked up using the n_name field, and if found, the
-corresponding n_type and n_value fields are filled in.
-These fields are set to 0 if the symbol is not found.
-.Pp
-If
-.Fa \&kd
-was created by a call to
-.Fn kvm_open
-with a
-.Dv NULL
-executable image name,
-.Fn kvm_nlist
-will use
-.Pa /dev/ksyms
-to retrieve the kernel symbol table.
-.Sh RETURN VALUES
-The
-.Fn kvm_nlist
-function returns the number of invalid entries found.
-If the kernel symbol table was unreadable, -1 is returned.
-.Sh FILES
-.Bl -tag -width /dev/ksyms -compact
-.It Pa /dev/ksyms
-.El
-.Sh SEE ALSO
-.Xr kvm 3 ,
-.Xr kvm_close 3 ,
-.Xr kvm_getargv 3 ,
-.Xr kvm_getenvv 3 ,
-.Xr kvm_geterr 3 ,
-.Xr kvm_getprocs 3 ,
-.Xr kvm_open 3 ,
-.Xr kvm_openfiles 3 ,
-.Xr kvm_read 3 ,
-.Xr kvm_write 3 ,
-.Xr ksyms 4
diff --git a/lib/libkvm/kvm_open.3 b/lib/libkvm/kvm_open.3
deleted file mode 100644
index 55f4a673e..000000000
--- a/lib/libkvm/kvm_open.3
+++ /dev/null
@@ -1,237 +0,0 @@
-.\"	$NetBSD: kvm_open.3,v 1.18 2011/09/12 21:11:32 christos Exp $
-.\"
-.\" Copyright (c) 1992, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software 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.
-.\" 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.
-.\"
-.\"     @(#)kvm_open.3	8.3 (Berkeley) 4/19/94
-.\"
-.Dd September 14, 2011
-.Dt KVM_OPEN 3
-.Os
-.Sh NAME
-.Nm kvm_open ,
-.Nm kvm_openfiles ,
-.Nm kvm_close
-.Nd initialize kernel virtual memory access
-.Sh LIBRARY
-.Lb libkvm
-.Sh SYNOPSIS
-.In fcntl.h
-.In kvm.h
-.Ft kvm_t *
-.Fn kvm_open "const char *execfile" "const char *corefile" "char *swapfile" "int flags" "const char *errstr"
-.Ft kvm_t *
-.Fn kvm_openfiles "const char *execfile" "const char *corefile" "char *swapfile" "int flags" "char *errbuf"
-.Ft int
-.Fn kvm_close "kvm_t *kd"
-.Sh DESCRIPTION
-The functions
-.Fn kvm_open
-and
-.Fn kvm_openfiles
-return a descriptor used to access kernel virtual memory
-via the
-.Xr kvm 3
-library routines.
-Both active kernels and crash dumps are accessible
-through this interface.
-.Pp
-.Fa execfile
-is the executable image of the kernel being examined.
-This file must contain a symbol table.
-If this argument is
-.Dv NULL ,
-the currently running system is assumed; in this case, the functions will
-attempt to use the
-.Xr ksyms 4
-device indicated by
-.Dv _PATH_KSYMS
-in
-.In paths.h ;
-if that fails, then they will use the file indicated by the
-.Xr sysctl 3
-variable
-.Va machdep.booted_kernel ,
-or (if the sysctl information is not available)
-the default kernel path indicated by
-.Dv _PATH_UNIX
-in
-.In paths.h .
-.Pp
-.Fa corefile
-is the kernel memory device file.
-It can be either
-.Pa /dev/mem
-or a crash dump core generated by
-.Xr savecore 8 .
-If
-.Fa corefile
-is
-.Dv NULL ,
-the default indicated by
-.Dv _PATH_MEM
-from
-.In paths.h
-is used.
-.Pp
-.Fa swapfile
-should indicate the swap device.
-If
-.Dv NULL ,
-.Dv _PATH_DRUM
-from
-.In paths.h
-is used.
-.Pp
-The
-.Fa flags
-argument indicates read/write access as in
-.Xr open 2
-and applies only to the core file.
-The only permitted flags from
-.Xr open 2
-are
-.Dv O_RDONLY ,
-.Dv O_WRONLY ,
-and
-.Dv O_RDWR .
-.Pp
-As a special case, a
-.Fa flags
-argument of
-.Dv KVM_NO_FILES
-will initialize the
-.Xr kvm 3
-library for use on active kernels only using
-.Xr sysctl 3
-for retrieving kernel data and ignores the
-.Fa execfile ,
-.Fa corefile
-and
-.Fa swapfile
-arguments.
-Only a small subset of the
-.Xr kvm 3
-library functions are available using this method.
-These are currently
-.Xr kvm_getproc2 3 ,
-.Xr kvm_getargv2 3
-and
-.Xr kvm_getenvv2 3 .
-.Pp
-There are two open routines which differ only with respect to
-the error mechanism.
-One provides backward compatibility with the SunOS kvm library, while the
-other provides an improved error reporting framework.
-.Pp
-The
-.Fn kvm_open
-function is the Sun kvm compatible open call.
-Here, the
-.Fa errstr
-argument indicates how errors should be handled.
-If it is
-.Dv NULL ,
-no errors are reported and the application cannot know the
-specific nature of the failed kvm call.
-If it is not
-.Dv NULL ,
-errors are printed to stderr with
-.Fa errstr
-prepended to the message, as in
-.Xr perror 3 .
-Normally, the name of the program is used here.
-The string is assumed to persist at least until the corresponding
-.Fn kvm_close
-call.
-.Pp
-The
-.Fn kvm_openfiles
-function provides
-.Bx
-style error reporting.
-Here, error messages are not printed out by the library.
-Instead, the application obtains the error message
-corresponding to the most recent kvm library call using
-.Fn kvm_geterr
-(see
-.Xr kvm_geterr 3 ) .
-The results are undefined if the most recent kvm call did not produce
-an error.
-Since
-.Fn kvm_geterr
-requires a kvm descriptor, but the open routines return
-.Dv NULL
-on failure,
-.Fn kvm_geterr
-cannot be used to get the error message if open fails.
-Thus,
-.Fn kvm_openfiles
-will place any error message in the
-.Fa errbuf
-argument.
-This buffer should be _POSIX2_LINE_MAX characters large (from
-.In limits.h ) .
-.Sh RETURN VALUES
-The
-.Fn kvm_open
-and
-.Fn kvm_openfiles
-functions both return a descriptor to be used
-in all subsequent kvm library calls.
-The library is fully re-entrant.
-On failure,
-.Dv NULL
-is returned, in which case
-.Fn kvm_openfiles
-writes the error message into
-.Fa errbuf .
-.Pp
-The
-.Fn kvm_close
-function returns 0 on success and -1 on failure.
-.Sh SEE ALSO
-.Xr open 2 ,
-.Xr kvm 3 ,
-.Xr kvm_getargv 3 ,
-.Xr kvm_getenvv 3 ,
-.Xr kvm_geterr 3 ,
-.Xr kvm_getkernelname 3 ,
-.Xr kvm_getprocs 3 ,
-.Xr kvm_nlist 3 ,
-.Xr kvm_read 3 ,
-.Xr kvm_write 3
-.Sh BUGS
-There should not be two open calls.
-The ill-defined error semantics of the Sun library
-and the desire to have a backward-compatible library for
-.Bx
-left little choice.
diff --git a/lib/libkvm/kvm_or1k.c b/lib/libkvm/kvm_or1k.c
deleted file mode 100644
index 3306eb710..000000000
--- a/lib/libkvm/kvm_or1k.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*	$NetBSD: kvm_or1k.c,v 1.1 2014/09/03 19:34:26 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * OR1K machine dependent routines for kvm.
- */
-
-#include <sys/param.h>
-#include <sys/exec.h>
-#include <sys/types.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <db.h>
-#include <limits.h>
-#include <kvm.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "kvm_private.h"
-
-#include <sys/kcore.h>
-#include <machine/kcore.h>
-#include <machine/vmparam.h>
-
-__RCSID("$NetBSD: kvm_or1k.c,v 1.1 2014/09/03 19:34:26 matt Exp $");
-
-void
-_kvm_freevtop(kvm_t *kd)
-{
-	if (kd->vmst != 0)
-		free(kd->vmst);
-}
-
-/*ARGSUSED*/
-int
-_kvm_initvtop(kvm_t *kd)
-{
-
-	return 0;
-}
-
-/*
- * Translate a KVA to a PA
- */
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-//	cpu_kcore_hdr_t	*cpu_kh;
-
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, 0, "vatop called in live kernel!");
-		return 0;
-	}
-
-	/* No hit -- no translation */
-	*pa = (u_long)~0UL;
-	return 0;
-}
-
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-	cpu_kcore_hdr_t	*cpu_kh;
-	phys_ram_seg_t	*ram;
-	off_t		off;
-	void		*e;
-
-	cpu_kh = kd->cpu_data;
-	e = (char *) kd->cpu_data + kd->cpu_dsize;
-        ram = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh));
-	off = kd->dump_off;
-	do {
-		if (pa >= ram->start && (pa - ram->start) < ram->size) {
-			return off + (pa - ram->start);
-		}
-		ram++;
-		off += ram->size;
-	} while ((void *) ram < e && ram->size);
-
-	_kvm_err(kd, 0, "pa2off failed for pa %#" PRIxPADDR "\n", pa);
-	return (off_t) -1;
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-	kd->usrstack = USRSTACK;
-	kd->min_uva = VM_MIN_ADDRESS;
-	kd->max_uva = VM_MAXUSER_ADDRESS;
-
-	return (0);
-}
diff --git a/lib/libkvm/kvm_powerpc.c b/lib/libkvm/kvm_powerpc.c
deleted file mode 100644
index f8c5eb9e7..000000000
--- a/lib/libkvm/kvm_powerpc.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/*	$NetBSD: kvm_powerpc.c,v 1.13 2014/01/27 21:00:01 matt Exp $	*/
-
-/*
- * Copyright (c) 2005 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Allen Briggs for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-/*-
- * Copyright (C) 1996 Wolfgang Solfrank.
- * Copyright (C) 1996 TooLs GmbH.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * PowerPC machine dependent routines for kvm.
- */
-
-#include <sys/param.h>
-#include <sys/exec.h>
-#include <sys/types.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <db.h>
-#include <limits.h>
-#include <kvm.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "kvm_private.h"
-
-#include <sys/kcore.h>
-#include <machine/kcore.h>
-
-#include <powerpc/spr.h>
-#include <powerpc/oea/spr.h>
-#include <powerpc/oea/bat.h>
-#include <powerpc/oea/pte.h>
-
-__RCSID("$NetBSD: kvm_powerpc.c,v 1.13 2014/01/27 21:00:01 matt Exp $");
-
-static int	_kvm_match_601bat(kvm_t *, vaddr_t, paddr_t *, int *);
-static int	_kvm_match_bat(kvm_t *, vaddr_t, paddr_t *, int *);
-static int	_kvm_match_sr(kvm_t *, vaddr_t, paddr_t *, int *);
-static struct pte *_kvm_scan_pteg(struct pteg *, uint32_t, uint32_t, int);
-
-void
-_kvm_freevtop(kvm_t *kd)
-{
-	if (kd->vmst != 0)
-		free(kd->vmst);
-}
-
-/*ARGSUSED*/
-int
-_kvm_initvtop(kvm_t *kd)
-{
-
-	return 0;
-}
-
-#define BAT601_SIZE(b)  ((((b) << 17) | ~BAT601_BLPI) + 1)
-
-static int
-_kvm_match_601bat(kvm_t *kd, vaddr_t va, paddr_t *pa, int *off)
-{
-	cpu_kcore_hdr_t	*cpu_kh;
-	u_long		pgoff;
-	size_t		size;
-	int		i, nbat;
-
-	cpu_kh = kd->cpu_data;
-	nbat = 4;
-	for (i=0 ; i<nbat ; i++) {
-		if (!BAT601_VALID_P(cpu_kh->dbatu[i]))
-			continue;
-		if (BAT601_VA_MATCH_P(cpu_kh->dbatu[i], cpu_kh->dbatl[i], va)) {
-			size = BAT601_SIZE(cpu_kh->dbatu[i] & BAT601_BSM);
-			pgoff = va & (size-1);
-			*pa = (cpu_kh->dbatl[i] & BAT601_PBN) + pgoff;
-			*off = size - pgoff;
-			return 1;
-		}
-	}
-	return 0;
-}
-
-#undef BAT601_SIZE
-
-#define BAT_SIZE(b)     ((((b) << 15) | ~BAT_EPI) + 1)
-
-static int
-_kvm_match_bat(kvm_t *kd, vaddr_t va, paddr_t *pa, int *off)
-{
-	cpu_kcore_hdr_t	*cpu_kh;
-	u_long		pgoff;
-	size_t		size;
-	int		i, nbat;
-
-	cpu_kh = kd->cpu_data;
-	/*
-	 * Assume that we're looking for data and check only the dbats.
-	 */
-	nbat = 8;
-	for (i=0 ; i<nbat ; i++) {
-		if (   ((cpu_kh->dbatu[i] & BAT_Vs) != 0)
-		    && (BAT_VA_MATCH_P(cpu_kh->dbatu[i], va))) {
-			size = BAT_SIZE(cpu_kh->dbatu[i] & BAT_BL);
-			pgoff = va & (size-1);
-			*pa = (cpu_kh->dbatl[i] & BAT_RPN) + pgoff;
-			*off = size - pgoff;
-			return 1;
-		}
-	}
-	return 0;
-}
-
-#undef BAT_SIZE
-
-#define SR_VSID_HASH_MASK	0x0007ffff
-
-static struct pte *
-_kvm_scan_pteg(struct pteg *pteg, uint32_t vsid, uint32_t api, int secondary)
-{
-	struct pte	*pte;
-	u_long		ptehi;
-	int		i;
-
-	for (i=0 ; i<8 ; i++) {
-		pte = &pteg->pt[i];
-		ptehi = (u_long) pte->pte_hi;
-		if ((ptehi & PTE_VALID) == 0)
-			continue;
-		if ((ptehi & PTE_HID) != secondary)
-			continue;
-		if (((ptehi & PTE_VSID) >> PTE_VSID_SHFT) != vsid)
-			continue;
-		if (((ptehi & PTE_API) >> PTE_API_SHFT) != api)
-			continue;
-		return pte;
-	}
-	return NULL;
-}
-
-#define HASH_MASK	0x0007ffff
-
-static int
-_kvm_match_sr(kvm_t *kd, vaddr_t va, paddr_t *pa, int *off)
-{
-	cpu_kcore_hdr_t	*cpu_kh;
-	struct pteg	pteg;
-	struct pte	*pte;
-	uint32_t	sr, pgoff, vsid, pgidx, api, hash;
-	uint32_t	htaborg, htabmask, mhash;
-	paddr_t		pteg_vaddr;
-
-	cpu_kh = kd->cpu_data;
-
-	sr = cpu_kh->sr[(va >> 28) & 0xf];
-	if ((sr & SR_TYPE) != 0) {
-		/* Direct-store segment (shouldn't be) */
-		return 0;
-	}
-
-	pgoff = va & ADDR_POFF;
-	vsid = sr & SR_VSID;
-	pgidx = (va & ADDR_PIDX) >> ADDR_PIDX_SHFT;
-	api = pgidx >> 10;
-	hash = (vsid & HASH_MASK) ^ pgidx;
-
-	htaborg = cpu_kh->sdr1 & 0xffff0000;
-	htabmask = cpu_kh->sdr1 & 0x1ff;
-
-	mhash = (hash >> 10) & htabmask;
-
-	pteg_vaddr = ( htaborg & 0xfe000000) | ((hash & 0x3ff) << 6)
-		   | ((htaborg & 0x01ff0000) | (mhash << 16));
-
-	if (_kvm_pread(kd, kd->pmfd, (void *) &pteg, sizeof(pteg),
-		  _kvm_pa2off(kd, pteg_vaddr)) != sizeof(pteg)) {
-		_kvm_syserr(kd, 0, "could not read primary PTEG");
-		return 0;
-	}
-
-	if ((pte = _kvm_scan_pteg(&pteg, vsid, api, 0)) != NULL) {
-		*pa = (pte->pte_lo & PTE_RPGN) | pgoff;
-		*off = NBPG - pgoff;
-		return 1;
-	}
-
-	hash = (~hash) & HASH_MASK;
-	mhash = (hash >> 10) & htabmask;
-
-	pteg_vaddr = ( htaborg & 0xfe000000) | ((hash & 0x3ff) << 6)
-		   | ((htaborg & 0x01ff0000) | (mhash << 16));
-
-	if (_kvm_pread(kd, kd->pmfd, (void *) &pteg, sizeof(pteg),
-		  _kvm_pa2off(kd, pteg_vaddr)) != sizeof(pteg)) {
-		_kvm_syserr(kd, 0, "could not read secondary PTEG");
-		return 0;
-	}
-
-	if ((pte = _kvm_scan_pteg(&pteg, vsid, api, 0)) != NULL) {
-		*pa = (pte->pte_lo & PTE_RPGN) | pgoff;
-		*off = NBPG - pgoff;
-		return 1;
-	}
-
-	return 0;
-}
-
-/*
- * Translate a KVA to a PA
- */
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-	cpu_kcore_hdr_t	*cpu_kh;
-	int		offs;
-	uint32_t	pvr;
-
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, 0, "vatop called in live kernel!");
-		return 0;
-	}
-
-	cpu_kh = kd->cpu_data;
-
-	pvr = (cpu_kh->pvr >> 16);
-	if (MPC745X_P(pvr))
-		pvr = MPC7450;
-
-	switch (pvr) {
-	case MPC601:
-		/* Check for a BAT hit first */
-		if (_kvm_match_601bat(kd, va, pa, &offs)) {
-			return offs;
-		}
-
-		/* No BAT hit; check page tables */
-		if (_kvm_match_sr(kd, va, pa, &offs)) {
-			return offs;
-		}
-		break;
-
-	case MPC603:
-	case MPC603e:
-	case MPC603ev:
-	case MPC604:
-	case MPC604ev:
-	case MPC750:
-	case IBM750FX:
-	case MPC7400:
-	case MPC7450:
-	case MPC7410:
-	case MPC8240:
-	case MPC8245:
-		/* Check for a BAT hit first */
-		if (_kvm_match_bat(kd, va, pa, &offs)) {
-			return offs;
-		}
-
-		/* No BAT hit; check page tables */
-		if (_kvm_match_sr(kd, va, pa, &offs)) {
-			return offs;
-		}
-		break;
-
-	default:
-		_kvm_err(kd, 0, "Unsupported CPU type (pvr 0x%08lx)!",
-		    (unsigned long) cpu_kh->pvr);
-		break;
-	}
-
-	/* No hit -- no translation */
-	*pa = (paddr_t)~0UL;
-	return 0;
-}
-
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-	cpu_kcore_hdr_t	*cpu_kh;
-	phys_ram_seg_t	*ram;
-	off_t		off;
-	void		*e;
-
-	cpu_kh = kd->cpu_data;
-	e = (char *) kd->cpu_data + kd->cpu_dsize;
-        ram = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh));
-	off = kd->dump_off;
-	do {
-		if (pa >= ram->start && (pa - ram->start) < ram->size) {
-			return off + (pa - ram->start);
-		}
-		ram++;
-		off += ram->size;
-	} while ((void *) ram < e && ram->size);
-
-	_kvm_err(kd, 0, "pa2off failed for pa %#" PRIxPADDR "\n", pa);
-	return (off_t) -1;
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-	uintptr_t max_uva;
-	extern struct ps_strings *__ps_strings;
-
-#if 0   /* XXX - These vary across powerpc machines... */
-	kd->usrstack = USRSTACK;
-	kd->min_uva = VM_MIN_ADDRESS;
-	kd->max_uva = VM_MAXUSER_ADDRESS;
-#endif
-	/* This is somewhat hack-ish, but it works. */
-	max_uva = (uintptr_t) (__ps_strings + 1);
-	kd->usrstack = max_uva;
-	kd->max_uva  = max_uva;
-	kd->min_uva  = 0;
-
-	return (0);
-}
diff --git a/lib/libkvm/kvm_powerpc64.c b/lib/libkvm/kvm_powerpc64.c
deleted file mode 100644
index 6ac7fc86d..000000000
--- a/lib/libkvm/kvm_powerpc64.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*	$NetBSD: kvm_powerpc64.c,v 1.6 2014/08/23 02:25:23 matt Exp $	*/
-
-/*
- * Copyright (c) 2005 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Allen Briggs for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-/*-
- * Copyright (C) 1996 Wolfgang Solfrank.
- * Copyright (C) 1996 TooLs GmbH.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * PowerPC machine dependent routines for kvm.
- */
-
-#include <sys/param.h>
-#include <sys/exec.h>
-#include <sys/types.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <db.h>
-#include <limits.h>
-#include <kvm.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "kvm_private.h"
-
-#include <sys/kcore.h>
-#include <machine/kcore.h>
-
-#include <powerpc/spr.h>
-#include <powerpc/oea/bat.h>
-#include <powerpc/oea/pte.h>
-
-__RCSID("$NetBSD: kvm_powerpc64.c,v 1.6 2014/08/23 02:25:23 matt Exp $");
-
-void
-_kvm_freevtop(kvm_t *kd)
-{
-	if (kd->vmst != 0)
-		free(kd->vmst);
-}
-
-/*ARGSUSED*/
-int
-_kvm_initvtop(kvm_t *kd)
-{
-
-	return 0;
-}
-
-#define SR_VSID_HASH_MASK	0x0007ffff
-
-#define HASH_MASK	0x0007ffff
-
-/*
- * Translate a KVA to a PA
- */
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, 0, "vatop called in live kernel!");
-		return 0;
-	}
-
-#if 0
-	cpu_kcore_hdr_t	*cpu_kh = kd->cpu_data;
-	uint32_t pvr = (cpu_kh->pvr >> 16);
-#endif
-
-
-	/* No hit -- no translation */
-	*pa = (u_long)~0UL;
-	return 0;
-}
-
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-	cpu_kcore_hdr_t	*cpu_kh;
-	phys_ram_seg_t	*ram;
-	off_t		off;
-	void		*e;
-
-	cpu_kh = kd->cpu_data;
-	e = (char *) kd->cpu_data + kd->cpu_dsize;
-        ram = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh));
-	off = kd->dump_off;
-	do {
-		if (pa >= ram->start && (pa - ram->start) < ram->size) {
-			return off + (pa - ram->start);
-		}
-		ram++;
-		off += ram->size;
-	} while ((void *) ram < e && ram->size);
-
-	_kvm_err(kd, 0, "pa2off failed for pa 0x%08lx\n", pa);
-	return (off_t) -1;
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-	uintptr_t max_uva;
-	extern struct ps_strings *__ps_strings;
-
-#if 0   /* XXX - These vary across powerpc machines... */
-	kd->usrstack = USRSTACK;
-	kd->min_uva = VM_MIN_ADDRESS;
-	kd->max_uva = VM_MAXUSER_ADDRESS;
-#endif
-	/* This is somewhat hack-ish, but it works. */
-	max_uva = (uintptr_t) (__ps_strings + 1);
-	kd->usrstack = max_uva;
-	kd->max_uva  = max_uva;
-	kd->min_uva  = 0;
-
-	return (0);
-}
diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h
deleted file mode 100644
index ea00b5a86..000000000
--- a/lib/libkvm/kvm_private.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*	$NetBSD: kvm_private.h,v 1.20 2011/09/12 21:11:32 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software 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.
- * 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.
- *
- *	@(#)kvm_private.h	8.1 (Berkeley) 6/4/93
- */
-
-struct __kvm {
-	/*
-	 * a string to be prepended to error messages
-	 * provided for compatibility with sun's interface
-	 * if this value is null, errors are saved in errbuf[]
-	 */
-	const char *program;
-	char	*errp;		/* XXX this can probably go away */
-	char	errbuf[_POSIX2_LINE_MAX];
-	int	pmfd;		/* physical memory file (or crash dump) */
-	int	vmfd;		/* virtual memory file (-1 if crash dump) */
-	int	swfd;		/* swap file (e.g., /dev/drum) */
-	int	nlfd;		/* namelist file (e.g., /vmunix) */
-	char	alive;		/* live kernel? */
-	struct kinfo_proc *procbase;
-	struct kinfo_proc2 *procbase2;
-	struct kinfo_lwp *lwpbase;
-	size_t  procbase_len;
-	size_t  procbase2_len;
-	size_t  lwpbase_len;
-	u_long	usrstack;		/* address of end of user stack */
-	u_long	min_uva, max_uva;	/* min/max user virtual address */
-	int	nbpg;		/* page size */
-	char	*swapspc;	/* (dynamic) storage for swapped pages */
-	char	*argspc, *argbuf; /* (dynamic) storage for argv strings */
-	size_t	argspc_len;	/* length of the above */
-	char	**argv;		/* (dynamic) storage for argv pointers */
-	int	argc;		/* length of above (not actual # present) */
-
-	/*
-	 * Header structures for kernel dumps. Only gets filled in for
-	 * dead kernels.
-	 */
-	struct kcore_hdr	*kcore_hdr;
-	size_t	cpu_dsize;
-	void	*cpu_data;
-	off_t	dump_off;	/* Where the actual dump starts	*/
-
-	/*
-	 * Kernel virtual address translation state.  This only gets filled
-	 * in for dead kernels; otherwise, the running kernel (i.e. kmem)
-	 * will do the translations for us.  It could be big, so we
-	 * only allocate it if necessary.
-	 */
-	struct vmstate *vmst; /* XXX: should become obsoleted */
-	/*
-	 * These kernel variables are used for looking up user addresses,
-	 * and are cached for efficiency.
-	 */
-	struct pglist *vm_page_buckets;
-	int vm_page_hash_mask;
-	/* Buffer for raw disk I/O. */
-	size_t fdalign;
-	uint8_t *iobuf;
-	size_t iobufsz;
-	char kernelname[MAXPATHLEN];
-};
-
-/* Levels of aliveness */
-#define	KVM_ALIVE_DEAD		0	/* dead, working from core file */
-#define	KVM_ALIVE_FILES		1	/* alive, working from open kmem/drum */
-#define	KVM_ALIVE_SYSCTL	2	/* alive, sysctl-type calls only */
-
-#define	ISALIVE(kd)	((kd)->alive != KVM_ALIVE_DEAD)
-#define	ISKMEM(kd)	((kd)->alive == KVM_ALIVE_FILES)
-#define	ISSYSCTL(kd)	((kd)->alive == KVM_ALIVE_SYSCTL || ISKMEM(kd))
-
-/*
- * Functions used internally by kvm, but across kvm modules.
- */
-void	 _kvm_err(kvm_t *, const char *, const char *, ...)
-	    __attribute__((__format__(__printf__, 3, 4)));
-int	 _kvm_dump_mkheader(kvm_t *, kvm_t *);
-void	 _kvm_freeprocs(kvm_t *);
-void	 _kvm_freevtop(kvm_t *);
-int	 _kvm_mdopen(kvm_t *);
-int	 _kvm_initvtop(kvm_t *);
-int	 _kvm_kvatop(kvm_t *, vaddr_t, paddr_t *);
-void	*_kvm_malloc(kvm_t *, size_t);
-off_t	 _kvm_pa2off(kvm_t *, paddr_t);
-void	*_kvm_realloc(kvm_t *, void *, size_t);
-void	 _kvm_syserr(kvm_t *, const char *, const char *, ...)
-	    __attribute__((__format__(__printf__, 3, 4)));
-ssize_t	_kvm_pread(kvm_t *, int, void *, size_t, off_t);
-
-#define KREAD(kd, addr, obj) \
-	(kvm_read(kd, addr, (obj), sizeof(*obj)) != sizeof(*obj))
-
-#define KVM_ALLOC(kd, member, size) \
-    do { \
-	if (kd->member == NULL)	\
-		kd->member = _kvm_malloc(kd, kd->member ## _len = size); \
-	else if (kd->member ## _len < size) \
-		kd->member = _kvm_realloc(kd, kd->member, \
-		    kd->member ## _len = size); \
-	if (kd->member == NULL) { \
-		kd->member ## _len = 0; \
-		return (NULL); \
-	} \
-    } while (/*CONSTCOND*/0)
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
deleted file mode 100644
index 4b7c8c4d1..000000000
--- a/lib/libkvm/kvm_proc.c
+++ /dev/null
@@ -1,1238 +0,0 @@
-/*	$NetBSD: kvm_proc.c,v 1.90 2014/02/19 20:21:22 dsl Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (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) 1989, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93";
-#else
-__RCSID("$NetBSD: kvm_proc.c,v 1.90 2014/02/19 20:21:22 dsl Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Proc traversal interface for kvm.  ps and w are (probably) the exclusive
- * users of this code, so we've factored it out into a separate module.
- * Thus, we keep this grunge out of the other kvm applications (i.e.,
- * most other applications are interested only in open/close/read/nlist).
- */
-
-#include <sys/param.h>
-#include <sys/lwp.h>
-#include <sys/proc.h>
-#include <sys/exec.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/tty.h>
-#include <sys/resourcevar.h>
-#include <sys/mutex.h>
-#include <sys/specificdata.h>
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <unistd.h>
-#include <nlist.h>
-#include <kvm.h>
-
-#include <uvm/uvm_extern.h>
-#include <uvm/uvm_param.h>
-#include <uvm/uvm_amap.h>
-#include <uvm/uvm_page.h>
-
-#include <sys/sysctl.h>
-
-#include <limits.h>
-#include <db.h>
-#include <paths.h>
-
-#include "kvm_private.h"
-
-/*
- * Common info from kinfo_proc and kinfo_proc2 used by helper routines.
- */
-struct miniproc {
-	struct	vmspace *p_vmspace;
-	char	p_stat;
-	struct	proc *p_paddr;
-	pid_t	p_pid;
-};
-
-/*
- * Convert from struct proc and kinfo_proc{,2} to miniproc.
- */
-#define PTOMINI(kp, p) \
-	do { \
-		(p)->p_stat = (kp)->p_stat; \
-		(p)->p_pid = (kp)->p_pid; \
-		(p)->p_paddr = NULL; \
-		(p)->p_vmspace = (kp)->p_vmspace; \
-	} while (/*CONSTCOND*/0);
-
-#define KPTOMINI(kp, p) \
-	do { \
-		(p)->p_stat = (kp)->kp_proc.p_stat; \
-		(p)->p_pid = (kp)->kp_proc.p_pid; \
-		(p)->p_paddr = (kp)->kp_eproc.e_paddr; \
-		(p)->p_vmspace = (kp)->kp_proc.p_vmspace; \
-	} while (/*CONSTCOND*/0);
-
-#define KP2TOMINI(kp, p) \
-	do { \
-		(p)->p_stat = (kp)->p_stat; \
-		(p)->p_pid = (kp)->p_pid; \
-		(p)->p_paddr = (void *)(long)(kp)->p_paddr; \
-		(p)->p_vmspace = (void *)(long)(kp)->p_vmspace; \
-	} while (/*CONSTCOND*/0);
-
-/*
- * NetBSD uses kauth(9) to manage credentials, which are stored in kauth_cred_t,
- * a kernel-only opaque type. This is an embedded version which is *INTERNAL* to
- * kvm(3) so dumps can be read properly.
- *
- * Whenever NetBSD starts exporting credentials to userland consistently (using
- * 'struct uucred', or something) this will have to be updated again.
- */
-struct kvm_kauth_cred {
-	u_int cr_refcnt;		/* reference count */
-	uint8_t cr_pad[CACHE_LINE_SIZE - sizeof(u_int)];
-	uid_t cr_uid;			/* user id */
-	uid_t cr_euid;			/* effective user id */
-	uid_t cr_svuid;			/* saved effective user id */
-	gid_t cr_gid;			/* group id */
-	gid_t cr_egid;			/* effective group id */
-	gid_t cr_svgid;			/* saved effective group id */
-	u_int cr_ngroups;		/* number of groups */
-	gid_t cr_groups[NGROUPS];	/* group memberships */
-	specificdata_reference cr_sd;	/* specific data */
-};
-
-/* XXX: What uses these two functions? */
-char		*_kvm_uread(kvm_t *, const struct proc *, u_long, u_long *);
-ssize_t		kvm_uread(kvm_t *, const struct proc *, u_long, char *,
-		    size_t);
-
-static char	*_kvm_ureadm(kvm_t *, const struct miniproc *, u_long,
-		    u_long *);
-static ssize_t	kvm_ureadm(kvm_t *, const struct miniproc *, u_long,
-		    char *, size_t);
-
-static char	**kvm_argv(kvm_t *, const struct miniproc *, u_long, int, int);
-static int	kvm_deadprocs(kvm_t *, int, int, u_long, u_long, int);
-static char	**kvm_doargv(kvm_t *, const struct miniproc *, int,
-		    void (*)(struct ps_strings *, u_long *, int *));
-static char	**kvm_doargv2(kvm_t *, pid_t, int, int);
-static int	kvm_proclist(kvm_t *, int, int, struct proc *,
-		    struct kinfo_proc *, int);
-static int	proc_verify(kvm_t *, u_long, const struct miniproc *);
-static void	ps_str_a(struct ps_strings *, u_long *, int *);
-static void	ps_str_e(struct ps_strings *, u_long *, int *);
-
-
-static char *
-_kvm_ureadm(kvm_t *kd, const struct miniproc *p, u_long va, u_long *cnt)
-{
-	u_long addr, head;
-	u_long offset;
-	struct vm_map_entry vme;
-	struct vm_amap amap;
-	struct vm_anon *anonp, anon;
-	struct vm_page pg;
-	u_long slot;
-
-	if (kd->swapspc == NULL) {
-		kd->swapspc = _kvm_malloc(kd, (size_t)kd->nbpg);
-		if (kd->swapspc == NULL)
-			return (NULL);
-	}
-
-	/*
-	 * Look through the address map for the memory object
-	 * that corresponds to the given virtual address.
-	 * The header just has the entire valid range.
-	 */
-	head = (u_long)&p->p_vmspace->vm_map.header;
-	addr = head;
-	for (;;) {
-		if (KREAD(kd, addr, &vme))
-			return (NULL);
-
-		if (va >= vme.start && va < vme.end &&
-		    vme.aref.ar_amap != NULL)
-			break;
-
-		addr = (u_long)vme.next;
-		if (addr == head)
-			return (NULL);
-	}
-
-	/*
-	 * we found the map entry, now to find the object...
-	 */
-	if (vme.aref.ar_amap == NULL)
-		return (NULL);
-
-	addr = (u_long)vme.aref.ar_amap;
-	if (KREAD(kd, addr, &amap))
-		return (NULL);
-
-	offset = va - vme.start;
-	slot = offset / kd->nbpg + vme.aref.ar_pageoff;
-	/* sanity-check slot number */
-	if (slot > amap.am_nslot)
-		return (NULL);
-
-	addr = (u_long)amap.am_anon + (offset / kd->nbpg) * sizeof(anonp);
-	if (KREAD(kd, addr, &anonp))
-		return (NULL);
-
-	addr = (u_long)anonp;
-	if (KREAD(kd, addr, &anon))
-		return (NULL);
-
-	addr = (u_long)anon.an_page;
-	if (addr) {
-		if (KREAD(kd, addr, &pg))
-			return (NULL);
-
-		if (_kvm_pread(kd, kd->pmfd, kd->swapspc, (size_t)kd->nbpg,
-		    (off_t)pg.phys_addr) != kd->nbpg)
-			return (NULL);
-	} else {
-		if (kd->swfd < 0 ||
-		    _kvm_pread(kd, kd->swfd, kd->swapspc, (size_t)kd->nbpg,
-		    (off_t)(anon.an_swslot * kd->nbpg)) != kd->nbpg)
-			return (NULL);
-	}
-
-	/* Found the page. */
-	offset %= kd->nbpg;
-	*cnt = kd->nbpg - offset;
-	return (&kd->swapspc[(size_t)offset]);
-}
-
-char *
-_kvm_uread(kvm_t *kd, const struct proc *p, u_long va, u_long *cnt)
-{
-	struct miniproc mp;
-
-	PTOMINI(p, &mp);
-	return (_kvm_ureadm(kd, &mp, va, cnt));
-}
-
-/*
- * Convert credentials located in kernel space address 'cred' and store
- * them in the appropriate members of 'eproc'.
- */
-static int
-_kvm_convertcred(kvm_t *kd, u_long cred, struct eproc *eproc)
-{
-	struct kvm_kauth_cred kauthcred;
-	struct ki_pcred *pc = &eproc->e_pcred;
-	struct ki_ucred *uc = &eproc->e_ucred;
-
-	if (KREAD(kd, cred, &kauthcred) != 0)
-		return (-1);
-
-	/* inlined version of kauth_cred_to_pcred, see kauth(9). */
-	pc->p_ruid = kauthcred.cr_uid;
-	pc->p_svuid = kauthcred.cr_svuid;
-	pc->p_rgid = kauthcred.cr_gid;
-	pc->p_svgid = kauthcred.cr_svgid;
-	pc->p_refcnt = kauthcred.cr_refcnt;
-	pc->p_pad = NULL;
-
-	/* inlined version of kauth_cred_to_ucred(), see kauth(9). */
-	uc->cr_ref = kauthcred.cr_refcnt;
-	uc->cr_uid = kauthcred.cr_euid;
-	uc->cr_gid = kauthcred.cr_egid;
-	uc->cr_ngroups = (uint32_t)MIN(kauthcred.cr_ngroups,
-	    sizeof(uc->cr_groups) / sizeof(uc->cr_groups[0]));
-	memcpy(uc->cr_groups, kauthcred.cr_groups,
-	    uc->cr_ngroups * sizeof(uc->cr_groups[0]));
-
-	return (0);
-}
-
-/*
- * Read proc's from memory file into buffer bp, which has space to hold
- * at most maxcnt procs.
- */
-static int
-kvm_proclist(kvm_t *kd, int what, int arg, struct proc *p,
-	     struct kinfo_proc *bp, int maxcnt)
-{
-	int cnt = 0;
-	int nlwps;
-	struct kinfo_lwp *kl;
-	struct eproc eproc;
-	struct pgrp pgrp;
-	struct session sess;
-	struct tty tty;
-	struct proc proc;
-
-	for (; cnt < maxcnt && p != NULL; p = proc.p_list.le_next) {
-		if (KREAD(kd, (u_long)p, &proc)) {
-			_kvm_err(kd, kd->program, "can't read proc at %p", p);
-			return (-1);
-		}
-		if (_kvm_convertcred(kd, (u_long)proc.p_cred, &eproc) != 0) {
-			_kvm_err(kd, kd->program,
-			    "can't read proc credentials at %p", p);
-			return (-1);
-		}
-
-		switch (what) {
-
-		case KERN_PROC_PID:
-			if (proc.p_pid != (pid_t)arg)
-				continue;
-			break;
-
-		case KERN_PROC_UID:
-			if (eproc.e_ucred.cr_uid != (uid_t)arg)
-				continue;
-			break;
-
-		case KERN_PROC_RUID:
-			if (eproc.e_pcred.p_ruid != (uid_t)arg)
-				continue;
-			break;
-		}
-		/*
-		 * We're going to add another proc to the set.  If this
-		 * will overflow the buffer, assume the reason is because
-		 * nprocs (or the proc list) is corrupt and declare an error.
-		 */
-		if (cnt >= maxcnt) {
-			_kvm_err(kd, kd->program, "nprocs corrupt");
-			return (-1);
-		}
-		/*
-		 * gather eproc
-		 */
-		eproc.e_paddr = p;
-		if (KREAD(kd, (u_long)proc.p_pgrp, &pgrp)) {
-			_kvm_err(kd, kd->program, "can't read pgrp at %p",
-			    proc.p_pgrp);
-			return (-1);
-		}
-		eproc.e_sess = pgrp.pg_session;
-		eproc.e_pgid = pgrp.pg_id;
-		eproc.e_jobc = pgrp.pg_jobc;
-		if (KREAD(kd, (u_long)pgrp.pg_session, &sess)) {
-			_kvm_err(kd, kd->program, "can't read session at %p",
-			    pgrp.pg_session);
-			return (-1);
-		}
-		if ((proc.p_lflag & PL_CONTROLT) && sess.s_ttyp != NULL) {
-			if (KREAD(kd, (u_long)sess.s_ttyp, &tty)) {
-				_kvm_err(kd, kd->program,
-				    "can't read tty at %p", sess.s_ttyp);
-				return (-1);
-			}
-			eproc.e_tdev = (uint32_t)tty.t_dev;
-			eproc.e_tsess = tty.t_session;
-			if (tty.t_pgrp != NULL) {
-				if (KREAD(kd, (u_long)tty.t_pgrp, &pgrp)) {
-					_kvm_err(kd, kd->program,
-					    "can't read tpgrp at %p",
-					    tty.t_pgrp);
-					return (-1);
-				}
-				eproc.e_tpgid = pgrp.pg_id;
-			} else
-				eproc.e_tpgid = -1;
-		} else
-			eproc.e_tdev = (uint32_t)NODEV;
-		eproc.e_flag = sess.s_ttyvp ? EPROC_CTTY : 0;
-		eproc.e_sid = sess.s_sid;
-		if (sess.s_leader == p)
-			eproc.e_flag |= EPROC_SLEADER;
-		/*
-		 * Fill in the old-style proc.p_wmesg by copying the wmesg
-		 * from the first available LWP.
-		 */
-		kl = kvm_getlwps(kd, proc.p_pid,
-		    (u_long)PTRTOUINT64(eproc.e_paddr),
-		    sizeof(struct kinfo_lwp), &nlwps);
-		if (kl) {
-			if (nlwps > 0) {
-				strcpy(eproc.e_wmesg, kl[0].l_wmesg);
-			}
-		}
-		(void)kvm_read(kd, (u_long)proc.p_vmspace, &eproc.e_vm,
-		    sizeof(eproc.e_vm));
-
-		eproc.e_xsize = eproc.e_xrssize = 0;
-		eproc.e_xccount = eproc.e_xswrss = 0;
-
-		switch (what) {
-
-		case KERN_PROC_PGRP:
-			if (eproc.e_pgid != (pid_t)arg)
-				continue;
-			break;
-
-		case KERN_PROC_TTY:
-			if ((proc.p_lflag & PL_CONTROLT) == 0 ||
-			    eproc.e_tdev != (dev_t)arg)
-				continue;
-			break;
-		}
-		memcpy(&bp->kp_proc, &proc, sizeof(proc));
-		memcpy(&bp->kp_eproc, &eproc, sizeof(eproc));
-		++bp;
-		++cnt;
-	}
-	return (cnt);
-}
-
-/*
- * Build proc info array by reading in proc list from a crash dump.
- * Return number of procs read.  maxcnt is the max we will read.
- */
-static int
-kvm_deadprocs(kvm_t *kd, int what, int arg, u_long a_allproc,
-	      u_long a_zombproc, int maxcnt)
-{
-	struct kinfo_proc *bp = kd->procbase;
-	int acnt, zcnt;
-	struct proc *p;
-
-	if (KREAD(kd, a_allproc, &p)) {
-		_kvm_err(kd, kd->program, "cannot read allproc");
-		return (-1);
-	}
-	acnt = kvm_proclist(kd, what, arg, p, bp, maxcnt);
-	if (acnt < 0)
-		return (acnt);
-
-	if (KREAD(kd, a_zombproc, &p)) {
-		_kvm_err(kd, kd->program, "cannot read zombproc");
-		return (-1);
-	}
-	zcnt = kvm_proclist(kd, what, arg, p, bp + acnt,
-	    maxcnt - acnt);
-	if (zcnt < 0)
-		zcnt = 0;
-
-	return (acnt + zcnt);
-}
-
-struct kinfo_proc2 *
-kvm_getproc2(kvm_t *kd, int op, int arg, size_t esize, int *cnt)
-{
-	size_t size;
-	int mib[6], st, nprocs;
-	struct pstats pstats;
-
-	if (ISSYSCTL(kd)) {
-		size = 0;
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_PROC2;
-		mib[2] = op;
-		mib[3] = arg;
-		mib[4] = (int)esize;
-again:
-		mib[5] = 0;
-		st = sysctl(mib, 6, NULL, &size, NULL, (size_t)0);
-		if (st == -1) {
-			_kvm_syserr(kd, kd->program, "kvm_getproc2");
-			return (NULL);
-		}
-
-		mib[5] = (int) (size / esize);
-		KVM_ALLOC(kd, procbase2, size);
-		st = sysctl(mib, 6, kd->procbase2, &size, NULL, (size_t)0);
-		if (st == -1) {
-			if (errno == ENOMEM) {
-				goto again;
-			}
-			_kvm_syserr(kd, kd->program, "kvm_getproc2");
-			return (NULL);
-		}
-		nprocs = (int) (size / esize);
-	} else {
-		char *kp2c;
-		struct kinfo_proc *kp;
-		struct kinfo_proc2 kp2, *kp2p;
-		struct kinfo_lwp *kl;
-		int i, nlwps;
-
-		kp = kvm_getprocs(kd, op, arg, &nprocs);
-		if (kp == NULL)
-			return (NULL);
-
-		size = nprocs * esize;
-		KVM_ALLOC(kd, procbase2, size);
-		kp2c = (char *)(void *)kd->procbase2;
-		kp2p = &kp2;
-		for (i = 0; i < nprocs; i++, kp++) {
-			struct timeval tv;
-
-			kl = kvm_getlwps(kd, kp->kp_proc.p_pid,
-			    (u_long)PTRTOUINT64(kp->kp_eproc.e_paddr),
-			    sizeof(struct kinfo_lwp), &nlwps);
-
-			if (kl == NULL) {
-				_kvm_syserr(kd, NULL,
-					"kvm_getlwps() failed on process %u\n",
-					kp->kp_proc.p_pid);
-				if (nlwps == 0)
-					return NULL;
-				else
-					continue;
-			}
-
-			/* We use kl[0] as the "representative" LWP */
-			memset(kp2p, 0, sizeof(kp2));
-			kp2p->p_forw = kl[0].l_forw;
-			kp2p->p_back = kl[0].l_back;
-			kp2p->p_paddr = PTRTOUINT64(kp->kp_eproc.e_paddr);
-			kp2p->p_addr = kl[0].l_addr;
-			kp2p->p_fd = PTRTOUINT64(kp->kp_proc.p_fd);
-			kp2p->p_cwdi = PTRTOUINT64(kp->kp_proc.p_cwdi);
-			kp2p->p_stats = PTRTOUINT64(kp->kp_proc.p_stats);
-			kp2p->p_limit = PTRTOUINT64(kp->kp_proc.p_limit);
-			kp2p->p_vmspace = PTRTOUINT64(kp->kp_proc.p_vmspace);
-			kp2p->p_sigacts = PTRTOUINT64(kp->kp_proc.p_sigacts);
-			kp2p->p_sess = PTRTOUINT64(kp->kp_eproc.e_sess);
-			kp2p->p_tsess = 0;
-#if 1 /* XXX: dsl - p_ru was only ever non-zero for zombies */
-			kp2p->p_ru = 0;
-#else
-			kp2p->p_ru = PTRTOUINT64(pstats.p_ru);
-#endif
-
-			kp2p->p_eflag = 0;
-			kp2p->p_exitsig = kp->kp_proc.p_exitsig;
-			kp2p->p_flag = kp->kp_proc.p_flag;
-
-			kp2p->p_pid = kp->kp_proc.p_pid;
-
-			kp2p->p_ppid = kp->kp_eproc.e_ppid;
-			kp2p->p_sid = kp->kp_eproc.e_sid;
-			kp2p->p__pgid = kp->kp_eproc.e_pgid;
-
-			kp2p->p_tpgid = -1 /* XXX NO_PGID! */;
-
-			kp2p->p_uid = kp->kp_eproc.e_ucred.cr_uid;
-			kp2p->p_ruid = kp->kp_eproc.e_pcred.p_ruid;
-			kp2p->p_svuid = kp->kp_eproc.e_pcred.p_svuid;
-			kp2p->p_gid = kp->kp_eproc.e_ucred.cr_gid;
-			kp2p->p_rgid = kp->kp_eproc.e_pcred.p_rgid;
-			kp2p->p_svgid = kp->kp_eproc.e_pcred.p_svgid;
-
-			/*CONSTCOND*/
-			memcpy(kp2p->p_groups, kp->kp_eproc.e_ucred.cr_groups,
-			    MIN(sizeof(kp2p->p_groups),
-			    sizeof(kp->kp_eproc.e_ucred.cr_groups)));
-			kp2p->p_ngroups = kp->kp_eproc.e_ucred.cr_ngroups;
-
-			kp2p->p_jobc = kp->kp_eproc.e_jobc;
-			kp2p->p_tdev = kp->kp_eproc.e_tdev;
-			kp2p->p_tpgid = kp->kp_eproc.e_tpgid;
-			kp2p->p_tsess = PTRTOUINT64(kp->kp_eproc.e_tsess);
-
-			kp2p->p_estcpu = 0;
-			bintime2timeval(&kp->kp_proc.p_rtime, &tv);
-			kp2p->p_rtime_sec = (uint32_t)tv.tv_sec;
-			kp2p->p_rtime_usec = (uint32_t)tv.tv_usec;
-			kp2p->p_cpticks = kl[0].l_cpticks;
-			kp2p->p_pctcpu = kp->kp_proc.p_pctcpu;
-			kp2p->p_swtime = kl[0].l_swtime;
-			kp2p->p_slptime = kl[0].l_slptime;
-#if 0 /* XXX thorpej */
-			kp2p->p_schedflags = kp->kp_proc.p_schedflags;
-#else
-			kp2p->p_schedflags = 0;
-#endif
-
-			kp2p->p_uticks = kp->kp_proc.p_uticks;
-			kp2p->p_sticks = kp->kp_proc.p_sticks;
-			kp2p->p_iticks = kp->kp_proc.p_iticks;
-
-			kp2p->p_tracep = PTRTOUINT64(kp->kp_proc.p_tracep);
-			kp2p->p_traceflag = kp->kp_proc.p_traceflag;
-
-			kp2p->p_holdcnt = kl[0].l_holdcnt;
-
-			memcpy(&kp2p->p_siglist,
-			    &kp->kp_proc.p_sigpend.sp_set,
-			    sizeof(ki_sigset_t));
-			memset(&kp2p->p_sigmask, 0,
-			    sizeof(ki_sigset_t));
-			memcpy(&kp2p->p_sigignore,
-			    &kp->kp_proc.p_sigctx.ps_sigignore,
-			    sizeof(ki_sigset_t));
-			memcpy(&kp2p->p_sigcatch,
-			    &kp->kp_proc.p_sigctx.ps_sigcatch,
-			    sizeof(ki_sigset_t));
-
-			kp2p->p_stat = kl[0].l_stat;
-			kp2p->p_priority = kl[0].l_priority;
-			kp2p->p_usrpri = kl[0].l_priority;
-			kp2p->p_nice = kp->kp_proc.p_nice;
-
-			kp2p->p_xstat = kp->kp_proc.p_xstat;
-			kp2p->p_acflag = kp->kp_proc.p_acflag;
-
-			/*CONSTCOND*/
-			strncpy(kp2p->p_comm, kp->kp_proc.p_comm,
-			    MIN(sizeof(kp2p->p_comm),
-			    sizeof(kp->kp_proc.p_comm)));
-
-			strncpy(kp2p->p_wmesg, kp->kp_eproc.e_wmesg,
-			    sizeof(kp2p->p_wmesg));
-			kp2p->p_wchan = kl[0].l_wchan;
-			strncpy(kp2p->p_login, kp->kp_eproc.e_login,
-			    sizeof(kp2p->p_login));
-
-			kp2p->p_vm_rssize = kp->kp_eproc.e_xrssize;
-			kp2p->p_vm_tsize = kp->kp_eproc.e_vm.vm_tsize;
-			kp2p->p_vm_dsize = kp->kp_eproc.e_vm.vm_dsize;
-			kp2p->p_vm_ssize = kp->kp_eproc.e_vm.vm_ssize;
-			kp2p->p_vm_vsize = kp->kp_eproc.e_vm.vm_map.size
-			    / kd->nbpg;
-			/* Adjust mapped size */
-			kp2p->p_vm_msize =
-			    (kp->kp_eproc.e_vm.vm_map.size / kd->nbpg) -
-			    kp->kp_eproc.e_vm.vm_issize +
-			    kp->kp_eproc.e_vm.vm_ssize;
-
-			kp2p->p_eflag = (int32_t)kp->kp_eproc.e_flag;
-
-			kp2p->p_realflag = kp->kp_proc.p_flag;
-			kp2p->p_nlwps = kp->kp_proc.p_nlwps;
-			kp2p->p_nrlwps = kp->kp_proc.p_nrlwps;
-			kp2p->p_realstat = kp->kp_proc.p_stat;
-
-			if (P_ZOMBIE(&kp->kp_proc) ||
-			    kp->kp_proc.p_stats == NULL ||
-			    KREAD(kd, (u_long)kp->kp_proc.p_stats, &pstats)) {
-				kp2p->p_uvalid = 0;
-			} else {
-				kp2p->p_uvalid = 1;
-
-				kp2p->p_ustart_sec = (u_int32_t)
-				    pstats.p_start.tv_sec;
-				kp2p->p_ustart_usec = (u_int32_t)
-				    pstats.p_start.tv_usec;
-
-				kp2p->p_uutime_sec = (u_int32_t)
-				    pstats.p_ru.ru_utime.tv_sec;
-				kp2p->p_uutime_usec = (u_int32_t)
-				    pstats.p_ru.ru_utime.tv_usec;
-				kp2p->p_ustime_sec = (u_int32_t)
-				    pstats.p_ru.ru_stime.tv_sec;
-				kp2p->p_ustime_usec = (u_int32_t)
-				    pstats.p_ru.ru_stime.tv_usec;
-
-				kp2p->p_uru_maxrss = pstats.p_ru.ru_maxrss;
-				kp2p->p_uru_ixrss = pstats.p_ru.ru_ixrss;
-				kp2p->p_uru_idrss = pstats.p_ru.ru_idrss;
-				kp2p->p_uru_isrss = pstats.p_ru.ru_isrss;
-				kp2p->p_uru_minflt = pstats.p_ru.ru_minflt;
-				kp2p->p_uru_majflt = pstats.p_ru.ru_majflt;
-				kp2p->p_uru_nswap = pstats.p_ru.ru_nswap;
-				kp2p->p_uru_inblock = pstats.p_ru.ru_inblock;
-				kp2p->p_uru_oublock = pstats.p_ru.ru_oublock;
-				kp2p->p_uru_msgsnd = pstats.p_ru.ru_msgsnd;
-				kp2p->p_uru_msgrcv = pstats.p_ru.ru_msgrcv;
-				kp2p->p_uru_nsignals = pstats.p_ru.ru_nsignals;
-				kp2p->p_uru_nvcsw = pstats.p_ru.ru_nvcsw;
-				kp2p->p_uru_nivcsw = pstats.p_ru.ru_nivcsw;
-
-				kp2p->p_uctime_sec = (u_int32_t)
-				    (pstats.p_cru.ru_utime.tv_sec +
-				    pstats.p_cru.ru_stime.tv_sec);
-				kp2p->p_uctime_usec = (u_int32_t)
-				    (pstats.p_cru.ru_utime.tv_usec +
-				    pstats.p_cru.ru_stime.tv_usec);
-			}
-
-			memcpy(kp2c, &kp2, esize);
-			kp2c += esize;
-		}
-	}
-	*cnt = nprocs;
-	return (kd->procbase2);
-}
-
-struct kinfo_lwp *
-kvm_getlwps(kvm_t *kd, int pid, u_long paddr, size_t esize, int *cnt)
-{
-	size_t size;
-	int mib[5], nlwps;
-	ssize_t st;
-	struct kinfo_lwp *kl;
-
-	if (ISSYSCTL(kd)) {
-		size = 0;
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_LWP;
-		mib[2] = pid;
-		mib[3] = (int)esize;
-		mib[4] = 0;
-again:
-		st = sysctl(mib, 5, NULL, &size, NULL, (size_t)0);
-		if (st == -1) {
-			switch (errno) {
-			case ESRCH: /* Treat this as a soft error; see kvm.c */
-				_kvm_syserr(kd, NULL, "kvm_getlwps");
-				return NULL;
-			default:
-				_kvm_syserr(kd, kd->program, "kvm_getlwps");
-				return NULL;
-			}
-		}
-		mib[4] = (int) (size / esize);
-		KVM_ALLOC(kd, lwpbase, size);
-		st = sysctl(mib, 5, kd->lwpbase, &size, NULL, (size_t)0);
-		if (st == -1) {
-			switch (errno) {
-			case ESRCH: /* Treat this as a soft error; see kvm.c */
-				_kvm_syserr(kd, NULL, "kvm_getlwps");
-				return NULL;
-			case ENOMEM:
-				goto again;
-			default:
-				_kvm_syserr(kd, kd->program, "kvm_getlwps");
-				return NULL;
-			}
-		}
-		nlwps = (int) (size / esize);
-	} else {
-		/* grovel through the memory image */
-		struct proc p;
-		struct lwp l;
-		u_long laddr;
-		void *back;
-		int i;
-
-		st = kvm_read(kd, paddr, &p, sizeof(p));
-		if (st == -1) {
-			_kvm_syserr(kd, kd->program, "kvm_getlwps");
-			return (NULL);
-		}
-
-		nlwps = p.p_nlwps;
-		size = nlwps * sizeof(*kd->lwpbase);
-		KVM_ALLOC(kd, lwpbase, size);
-		laddr = (u_long)PTRTOUINT64(p.p_lwps.lh_first);
-		for (i = 0; (i < nlwps) && (laddr != 0); i++) {
-			st = kvm_read(kd, laddr, &l, sizeof(l));
-			if (st == -1) {
-				_kvm_syserr(kd, kd->program, "kvm_getlwps");
-				return (NULL);
-			}
-			kl = &kd->lwpbase[i];
-			kl->l_laddr = laddr;
-			kl->l_forw = PTRTOUINT64(l.l_runq.tqe_next);
-			laddr = (u_long)PTRTOUINT64(l.l_runq.tqe_prev);
-			st = kvm_read(kd, laddr, &back, sizeof(back));
-			if (st == -1) {
-				_kvm_syserr(kd, kd->program, "kvm_getlwps");
-				return (NULL);
-			}
-			kl->l_back = PTRTOUINT64(back);
-			kl->l_addr = PTRTOUINT64(l.l_addr);
-			kl->l_lid = l.l_lid;
-			kl->l_flag = l.l_flag;
-			kl->l_swtime = l.l_swtime;
-			kl->l_slptime = l.l_slptime;
-			kl->l_schedflags = 0; /* XXX */
-			kl->l_holdcnt = 0;
-			kl->l_priority = l.l_priority;
-			kl->l_usrpri = l.l_priority;
-			kl->l_stat = l.l_stat;
-			kl->l_wchan = PTRTOUINT64(l.l_wchan);
-			if (l.l_wmesg)
-				(void)kvm_read(kd, (u_long)l.l_wmesg,
-				    kl->l_wmesg, (size_t)WMESGLEN);
-			kl->l_cpuid = KI_NOCPU;
-			laddr = (u_long)PTRTOUINT64(l.l_sibling.le_next);
-		}
-	}
-
-	*cnt = nlwps;
-	return (kd->lwpbase);
-}
-
-struct kinfo_proc *
-kvm_getprocs(kvm_t *kd, int op, int arg, int *cnt)
-{
-	size_t size;
-	int mib[4], st, nprocs;
-
-	if (ISALIVE(kd)) {
-		size = 0;
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_PROC;
-		mib[2] = op;
-		mib[3] = arg;
-		st = sysctl(mib, 4, NULL, &size, NULL, (size_t)0);
-		if (st == -1) {
-			_kvm_syserr(kd, kd->program, "kvm_getprocs");
-			return (NULL);
-		}
-		KVM_ALLOC(kd, procbase, size);
-		st = sysctl(mib, 4, kd->procbase, &size, NULL, (size_t)0);
-		if (st == -1) {
-			_kvm_syserr(kd, kd->program, "kvm_getprocs");
-			return (NULL);
-		}
-		if (size % sizeof(struct kinfo_proc) != 0) {
-			_kvm_err(kd, kd->program,
-			    "proc size mismatch (%lu total, %lu chunks)",
-			    (u_long)size, (u_long)sizeof(struct kinfo_proc));
-			return (NULL);
-		}
-		nprocs = (int) (size / sizeof(struct kinfo_proc));
-	} else {
-		struct nlist nl[4], *p;
-
-		(void)memset(nl, 0, sizeof(nl));
-		nl[0].n_name = "_nprocs";
-		nl[1].n_name = "_allproc";
-		nl[2].n_name = "_zombproc";
-		nl[3].n_name = NULL;
-
-		if (kvm_nlist(kd, nl) != 0) {
-			for (p = nl; p->n_type != 0; ++p)
-				continue;
-			_kvm_err(kd, kd->program,
-			    "%s: no such symbol", p->n_name);
-			return (NULL);
-		}
-		if (KREAD(kd, nl[0].n_value, &nprocs)) {
-			_kvm_err(kd, kd->program, "can't read nprocs");
-			return (NULL);
-		}
-		size = nprocs * sizeof(*kd->procbase);
-		KVM_ALLOC(kd, procbase, size);
-		nprocs = kvm_deadprocs(kd, op, arg, nl[1].n_value,
-		    nl[2].n_value, nprocs);
-		if (nprocs < 0)
-			return (NULL);
-#ifdef notdef
-		size = nprocs * sizeof(struct kinfo_proc);
-		(void)realloc(kd->procbase, size);
-#endif
-	}
-	*cnt = nprocs;
-	return (kd->procbase);
-}
-
-void *
-_kvm_realloc(kvm_t *kd, void *p, size_t n)
-{
-	void *np = realloc(p, n);
-
-	if (np == NULL)
-		_kvm_err(kd, kd->program, "out of memory");
-	return (np);
-}
-
-/*
- * Read in an argument vector from the user address space of process p.
- * addr if the user-space base address of narg null-terminated contiguous
- * strings.  This is used to read in both the command arguments and
- * environment strings.  Read at most maxcnt characters of strings.
- */
-static char **
-kvm_argv(kvm_t *kd, const struct miniproc *p, u_long addr, int narg,
-	 int maxcnt)
-{
-	char *np, *cp, *ep, *ap;
-	u_long oaddr = (u_long)~0L;
-	u_long len;
-	size_t cc;
-	char **argv;
-
-	/*
-	 * Check that there aren't an unreasonable number of arguments,
-	 * and that the address is in user space.
-	 */
-	if (narg > ARG_MAX || addr < kd->min_uva || addr >= kd->max_uva)
-		return (NULL);
-
-	if (kd->argv == NULL) {
-		/*
-		 * Try to avoid reallocs.
-		 */
-		kd->argc = MAX(narg + 1, 32);
-		kd->argv = _kvm_malloc(kd, kd->argc * sizeof(*kd->argv));
-		if (kd->argv == NULL)
-			return (NULL);
-	} else if (narg + 1 > kd->argc) {
-		kd->argc = MAX(2 * kd->argc, narg + 1);
-		kd->argv = _kvm_realloc(kd, kd->argv, kd->argc *
-		    sizeof(*kd->argv));
-		if (kd->argv == NULL)
-			return (NULL);
-	}
-	if (kd->argspc == NULL) {
-		kd->argspc = _kvm_malloc(kd, (size_t)kd->nbpg);
-		if (kd->argspc == NULL)
-			return (NULL);
-		kd->argspc_len = kd->nbpg;
-	}
-	if (kd->argbuf == NULL) {
-		kd->argbuf = _kvm_malloc(kd, (size_t)kd->nbpg);
-		if (kd->argbuf == NULL)
-			return (NULL);
-	}
-	cc = sizeof(char *) * narg;
-	if (kvm_ureadm(kd, p, addr, (void *)kd->argv, cc) != cc)
-		return (NULL);
-	ap = np = kd->argspc;
-	argv = kd->argv;
-	len = 0;
-	/*
-	 * Loop over pages, filling in the argument vector.
-	 */
-	while (argv < kd->argv + narg && *argv != NULL) {
-		addr = (u_long)*argv & ~(kd->nbpg - 1);
-		if (addr != oaddr) {
-			if (kvm_ureadm(kd, p, addr, kd->argbuf,
-			    (size_t)kd->nbpg) != kd->nbpg)
-				return (NULL);
-			oaddr = addr;
-		}
-		addr = (u_long)*argv & (kd->nbpg - 1);
-		cp = kd->argbuf + (size_t)addr;
-		cc = kd->nbpg - (size_t)addr;
-		if (maxcnt > 0 && cc > (size_t)(maxcnt - len))
-			cc = (size_t)(maxcnt - len);
-		ep = memchr(cp, '\0', cc);
-		if (ep != NULL)
-			cc = ep - cp + 1;
-		if (len + cc > kd->argspc_len) {
-			ptrdiff_t off;
-			char **pp;
-			char *op = kd->argspc;
-
-			kd->argspc_len *= 2;
-			kd->argspc = _kvm_realloc(kd, kd->argspc,
-			    kd->argspc_len);
-			if (kd->argspc == NULL)
-				return (NULL);
-			/*
-			 * Adjust argv pointers in case realloc moved
-			 * the string space.
-			 */
-			off = kd->argspc - op;
-			for (pp = kd->argv; pp < argv; pp++)
-				*pp += off;
-			ap += off;
-			np += off;
-		}
-		memcpy(np, cp, cc);
-		np += cc;
-		len += cc;
-		if (ep != NULL) {
-			*argv++ = ap;
-			ap = np;
-		} else
-			*argv += cc;
-		if (maxcnt > 0 && len >= maxcnt) {
-			/*
-			 * We're stopping prematurely.  Terminate the
-			 * current string.
-			 */
-			if (ep == NULL) {
-				*np = '\0';
-				*argv++ = ap;
-			}
-			break;
-		}
-	}
-	/* Make sure argv is terminated. */
-	*argv = NULL;
-	return (kd->argv);
-}
-
-static void
-ps_str_a(struct ps_strings *p, u_long *addr, int *n)
-{
-
-	*addr = (u_long)p->ps_argvstr;
-	*n = p->ps_nargvstr;
-}
-
-static void
-ps_str_e(struct ps_strings *p, u_long *addr, int *n)
-{
-
-	*addr = (u_long)p->ps_envstr;
-	*n = p->ps_nenvstr;
-}
-
-/*
- * Determine if the proc indicated by p is still active.
- * This test is not 100% foolproof in theory, but chances of
- * being wrong are very low.
- */
-static int
-proc_verify(kvm_t *kd, u_long kernp, const struct miniproc *p)
-{
-	struct proc kernproc;
-
-	/*
-	 * Just read in the whole proc.  It's not that big relative
-	 * to the cost of the read system call.
-	 */
-	if (kvm_read(kd, kernp, &kernproc, sizeof(kernproc)) !=
-	    sizeof(kernproc))
-		return (0);
-	return (p->p_pid == kernproc.p_pid &&
-	    (kernproc.p_stat != SZOMB || p->p_stat == SZOMB));
-}
-
-static char **
-kvm_doargv(kvm_t *kd, const struct miniproc *p, int nchr,
-	   void (*info)(struct ps_strings *, u_long *, int *))
-{
-	char **ap;
-	u_long addr;
-	int cnt;
-	struct ps_strings arginfo;
-
-	/*
-	 * Pointers are stored at the top of the user stack.
-	 */
-	if (p->p_stat == SZOMB)
-		return (NULL);
-	cnt = (int)kvm_ureadm(kd, p, kd->usrstack - sizeof(arginfo),
-	    (void *)&arginfo, sizeof(arginfo));
-	if (cnt != sizeof(arginfo))
-		return (NULL);
-
-	(*info)(&arginfo, &addr, &cnt);
-	if (cnt == 0)
-		return (NULL);
-	ap = kvm_argv(kd, p, addr, cnt, nchr);
-	/*
-	 * For live kernels, make sure this process didn't go away.
-	 */
-	if (ap != NULL && ISALIVE(kd) &&
-	    !proc_verify(kd, (u_long)p->p_paddr, p))
-		ap = NULL;
-	return (ap);
-}
-
-/*
- * Get the command args.  This code is now machine independent.
- */
-char **
-kvm_getargv(kvm_t *kd, const struct kinfo_proc *kp, int nchr)
-{
-	struct miniproc p;
-
-	KPTOMINI(kp, &p);
-	return (kvm_doargv(kd, &p, nchr, ps_str_a));
-}
-
-char **
-kvm_getenvv(kvm_t *kd, const struct kinfo_proc *kp, int nchr)
-{
-	struct miniproc p;
-
-	KPTOMINI(kp, &p);
-	return (kvm_doargv(kd, &p, nchr, ps_str_e));
-}
-
-static char **
-kvm_doargv2(kvm_t *kd, pid_t pid, int type, int nchr)
-{
-	size_t bufs;
-	int narg, mib[4];
-	size_t newargspc_len;
-	char **ap, *bp, *endp;
-
-	/*
-	 * Check that there aren't an unreasonable number of arguments.
-	 */
-	if (nchr > ARG_MAX)
-		return (NULL);
-
-	if (nchr == 0)
-		nchr = ARG_MAX;
-
-	/* Get number of strings in argv */
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_PROC_ARGS;
-	mib[2] = pid;
-	mib[3] = type == KERN_PROC_ARGV ? KERN_PROC_NARGV : KERN_PROC_NENV;
-	bufs = sizeof(narg);
-	if (sysctl(mib, 4, &narg, &bufs, NULL, (size_t)0) == -1)
-		return (NULL);
-
-	if (kd->argv == NULL) {
-		/*
-		 * Try to avoid reallocs.
-		 */
-		kd->argc = MAX(narg + 1, 32);
-		kd->argv = _kvm_malloc(kd, kd->argc * sizeof(*kd->argv));
-		if (kd->argv == NULL)
-			return (NULL);
-	} else if (narg + 1 > kd->argc) {
-		kd->argc = MAX(2 * kd->argc, narg + 1);
-		kd->argv = _kvm_realloc(kd, kd->argv, kd->argc *
-		    sizeof(*kd->argv));
-		if (kd->argv == NULL)
-			return (NULL);
-	}
-
-	newargspc_len = MIN(nchr, ARG_MAX);
-	KVM_ALLOC(kd, argspc, newargspc_len);
-	memset(kd->argspc, 0, (size_t)kd->argspc_len);	/* XXX necessary? */
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_PROC_ARGS;
-	mib[2] = pid;
-	mib[3] = type;
-	bufs = kd->argspc_len;
-	if (sysctl(mib, 4, kd->argspc, &bufs, NULL, (size_t)0) == -1)
-		return (NULL);
-
-	bp = kd->argspc;
-	bp[kd->argspc_len-1] = '\0';	/* make sure the string ends with nul */
-	ap = kd->argv;
-	endp = bp + MIN(nchr, bufs);
-
-	while (bp < endp) {
-		*ap++ = bp;
-		/*
-		 * XXX: don't need following anymore, or stick check
-		 * for max argc in above while loop?
-		 */
-		if (ap >= kd->argv + kd->argc) {
-			kd->argc *= 2;
-			kd->argv = _kvm_realloc(kd, kd->argv,
-			    kd->argc * sizeof(*kd->argv));
-			ap = kd->argv;
-		}
-		bp += strlen(bp) + 1;
-	}
-	*ap = NULL;
-
-	return (kd->argv);
-}
-
-char **
-kvm_getargv2(kvm_t *kd, const struct kinfo_proc2 *kp, int nchr)
-{
-
-	return (kvm_doargv2(kd, kp->p_pid, KERN_PROC_ARGV, nchr));
-}
-
-char **
-kvm_getenvv2(kvm_t *kd, const struct kinfo_proc2 *kp, int nchr)
-{
-
-	return (kvm_doargv2(kd, kp->p_pid, KERN_PROC_ENV, nchr));
-}
-
-/*
- * Read from user space.  The user context is given by p.
- */
-static ssize_t
-kvm_ureadm(kvm_t *kd, const struct miniproc *p, u_long uva,
-	   char *buf, size_t len)
-{
-	char *cp;
-
-	cp = buf;
-	while (len > 0) {
-		size_t cc;
-		char *dp;
-		u_long cnt;
-
-		dp = _kvm_ureadm(kd, p, uva, &cnt);
-		if (dp == NULL) {
-			_kvm_err(kd, 0, "invalid address (%lx)", uva);
-			return (0);
-		}
-		cc = (size_t)MIN(cnt, len);
-		memcpy(cp, dp, cc);
-		cp += cc;
-		uva += cc;
-		len -= cc;
-	}
-	return (ssize_t)(cp - buf);
-}
-
-ssize_t
-kvm_uread(kvm_t *kd, const struct proc *p, u_long uva, char *buf, size_t len)
-{
-	struct miniproc mp;
-
-	PTOMINI(p, &mp);
-	return (kvm_ureadm(kd, &mp, uva, buf, len));
-}
diff --git a/lib/libkvm/kvm_read.3 b/lib/libkvm/kvm_read.3
deleted file mode 100644
index 4078ce224..000000000
--- a/lib/libkvm/kvm_read.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\"	$NetBSD: kvm_read.3,v 1.8 2003/08/07 16:44:39 agc Exp $
-.\"
-.\" Copyright (c) 1992, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software 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.
-.\" 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.
-.\"
-.\"     @(#)kvm_read.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt KVM_READ 3
-.Os
-.Sh NAME
-.Nm kvm_read ,
-.Nm kvm_write
-.Nd read or write kernel virtual memory
-.Sh LIBRARY
-.Lb libkvm
-.Sh SYNOPSIS
-.In kvm.h
-.Ft ssize_t
-.Fn kvm_read "kvm_t *kd" "u_long addr" "void *buf" "size_t nbytes"
-.Ft ssize_t
-.Fn kvm_write "kvm_t *kd" "u_long addr" "const void *buf" "size_t nbytes"
-.Sh DESCRIPTION
-The
-.Fn kvm_read
-and
-.Fn kvm_write
-functions are used to read and write kernel virtual memory (or a crash
-dump file).
-See
-.Fn kvm_open 3
-or
-.Fn kvm_openfiles 3
-for information regarding opening kernel virtual memory and crash dumps.
-.Pp
-The
-.Fn kvm_read
-function transfers
-.Fa nbytes
-bytes of data from
-the kernel space address
-.Fa addr
-to
-.Fa buf .
-Conversely,
-.Fn kvm_write
-transfers data from
-.Fa buf
-to
-.Fa addr .
-Unlike their SunOS counterparts, these functions cannot be used to
-read or write process address spaces.
-.Sh RETURN VALUES
-Upon success, the number of bytes actually transferred is returned.
-Otherwise, -1 is returned.
-.Sh SEE ALSO
-.Xr kvm 3 ,
-.Xr kvm_close 3 ,
-.Xr kvm_getargv 3 ,
-.Xr kvm_getenvv 3 ,
-.Xr kvm_geterr 3 ,
-.Xr kvm_getprocs 3 ,
-.Xr kvm_nlist 3 ,
-.Xr kvm_open 3 ,
-.Xr kvm_openfiles 3
diff --git a/lib/libkvm/kvm_riscv.c b/lib/libkvm/kvm_riscv.c
deleted file mode 100644
index b41bc90cd..000000000
--- a/lib/libkvm/kvm_riscv.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*	$NetBSD: kvm_riscv.c,v 1.1 2014/09/19 17:36:25 matt Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * OR1K machine dependent routines for kvm.
- */
-
-#include <sys/param.h>
-#include <sys/exec.h>
-#include <sys/types.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <db.h>
-#include <limits.h>
-#include <kvm.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "kvm_private.h"
-
-#include <sys/kcore.h>
-#include <machine/kcore.h>
-#include <machine/vmparam.h>
-
-__RCSID("$NetBSD: kvm_riscv.c,v 1.1 2014/09/19 17:36:25 matt Exp $");
-
-void
-_kvm_freevtop(kvm_t *kd)
-{
-	if (kd->vmst != 0)
-		free(kd->vmst);
-}
-
-/*ARGSUSED*/
-int
-_kvm_initvtop(kvm_t *kd)
-{
-
-	return 0;
-}
-
-/*
- * Translate a KVA to a PA
- */
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-//	cpu_kcore_hdr_t	*cpu_kh;
-
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, 0, "vatop called in live kernel!");
-		return 0;
-	}
-
-	/* No hit -- no translation */
-	*pa = (u_long)~0UL;
-	return 0;
-}
-
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-	cpu_kcore_hdr_t	*cpu_kh;
-	phys_ram_seg_t	*ram;
-	off_t		off;
-	void		*e;
-
-	cpu_kh = kd->cpu_data;
-	e = (char *) kd->cpu_data + kd->cpu_dsize;
-        ram = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh));
-	off = kd->dump_off;
-	do {
-		if (pa >= ram->start && (pa - ram->start) < ram->size) {
-			return off + (pa - ram->start);
-		}
-		ram++;
-		off += ram->size;
-	} while ((void *) ram < e && ram->size);
-
-	_kvm_err(kd, 0, "pa2off failed for pa %#" PRIxPADDR "\n", pa);
-	return (off_t) -1;
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-	kd->usrstack = USRSTACK;
-	kd->min_uva = VM_MIN_ADDRESS;
-	kd->max_uva = VM_MAXUSER_ADDRESS;
-
-	return (0);
-}
diff --git a/lib/libkvm/kvm_sh3.c b/lib/libkvm/kvm_sh3.c
deleted file mode 100644
index 0726a503b..000000000
--- a/lib/libkvm/kvm_sh3.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*	$NetBSD: kvm_sh3.c,v 1.9 2014/02/19 20:21:22 dsl Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: kvm_sh3.c,v 1.9 2014/02/19 20:21:22 dsl Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * SH3 machine dependent routines for kvm.
- */
-
-#include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/stat.h>
-#include <sys/kcore.h>
-#include <sys/types.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <nlist.h>
-#include <kvm.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <limits.h>
-#include <db.h>
-
-#include "kvm_private.h"
-
-#include <machine/pte.h>
-#include <machine/vmparam.h>
-
-#ifndef btop
-#define	btop(x)		(((unsigned)(x)) >> PGSHIFT)	/* XXX */
-#define	ptob(x)		((caddr_t)((x) << PGSHIFT))	/* XXX */
-#endif
-
-void
-_kvm_freevtop(kvm_t *kd)
-{
-
-	/* Not actually used for anything right now, but safe. */
-	if (kd->vmst != 0)
-		free(kd->vmst);
-}
-
-/*ARGSUSED*/
-int
-_kvm_initvtop(kvm_t *kd)
-{
-
-	return (0);
-}
-
-/*
- * Translate a kernel virtual address to a physical address.
- */
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-	_kvm_err(kd, 0, "vatop not yet implemented!");
-	return 0;
-}
-
-/*
- * Translate a physical address to a file-offset in the crash dump.
- */
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-	_kvm_err(kd, 0, "pa2off not yet implemented!");
-	return 0;
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-
-	kd->usrstack = USRSTACK;
-	kd->min_uva = VM_MIN_ADDRESS;
-	kd->max_uva = VM_MAXUSER_ADDRESS;
-
-	return (0);
-}
diff --git a/lib/libkvm/kvm_sparc.c b/lib/libkvm/kvm_sparc.c
deleted file mode 100644
index 55f19c3cb..000000000
--- a/lib/libkvm/kvm_sparc.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/*	$NetBSD: kvm_sparc.c,v 1.34 2015/10/07 11:56:41 martin Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_sparc.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: kvm_sparc.c,v 1.34 2015/10/07 11:56:41 martin Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Sparc machine dependent routines for kvm.  Hopefully, the forthcoming
- * vm code will one day obsolete this module.
- */
-
-#include <sys/param.h>
-#include <sys/exec.h>
-#include <sys/proc.h>
-#include <sys/stat.h>
-#include <sys/core.h>
-#include <sys/kcore.h>
-#include <unistd.h>
-#include <nlist.h>
-#include <kvm.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <sparc/pmap.h>
-#include <sparc/kcore.h>
-
-#include <limits.h>
-#include <db.h>
-
-#include "kvm_private.h"
-
-
-static int cputyp = -1;
-static int pgshift;
-static int nptesg;	/* [sun4/sun4c] only */
-
-#undef VA_VPG
-#define VA_VPG(va)	((cputyp == CPU_SUN4C || cputyp == CPU_SUN4M) \
-				? VA_SUN4C_VPG(va) \
-				: VA_SUN4_VPG(va))
-
-#undef VA_OFF
-#define VA_OFF(va) (va & (kd->nbpg - 1))
-
-int _kvm_kvatop44c(kvm_t *, vaddr_t, paddr_t *);
-int _kvm_kvatop4m (kvm_t *, vaddr_t, paddr_t *);
-int _kvm_kvatop4u (kvm_t *, vaddr_t, paddr_t *);
-
-/*
- * XXX
- * taken from /sys/arch/sparc64/include/kcore.h.
- * this is the same as the sparc one, except for the kphys addition,
- * so luckily we can use this here...
- */
-typedef struct sparc64_cpu_kcore_hdr {
-	int	cputype;		/* CPU type associated with this dump */
-	u_long	kernbase;		/* copy of KERNBASE goes here */
-	int	nmemseg;		/* # of physical memory segments */
-	u_long	memsegoffset;		/* start of memseg array (relative */
-					/*  to the start of this header) */
-	int	nsegmap;		/* # of segmaps following */
-	u_long	segmapoffset;		/* start of segmap array (relative */
-					/*  to the start of this header) */
-	int	npmeg;			/* # of PMEGs; [sun4/sun4c] only */
-	u_long	pmegoffset;		/* start of pmeg array (relative */
-					/*  to the start of this header) */
-/* SPARC64 stuff */
-	paddr_t	kphys;			/* Physical address of 4MB locked TLB */
-} sparc64_cpu_kcore_hdr_t;
-
-void
-_kvm_freevtop(kvm_t *kd)
-{
-	if (kd->vmst != 0) {
-		_kvm_err(kd, kd->program, "_kvm_freevtop: internal error");
-		kd->vmst = 0;
-	}
-}
-
-/*
- * Prepare for translation of kernel virtual addresses into offsets
- * into crash dump files. We use the MMU specific goop written at the
- * front of the crash dump by pmap_dumpmmu().
- */
-int
-_kvm_initvtop(kvm_t *kd)
-{
-	sparc64_cpu_kcore_hdr_t *cpup = kd->cpu_data;
-
-	switch (cputyp = cpup->cputype) {
-	case CPU_SUN4:
-	case CPU_SUN4U:
-		kd->nbpg = 8196;
-		pgshift = 13;
-		break;
-	case CPU_SUN4C:
-	case CPU_SUN4M:
-		kd->nbpg = 4096;
-		pgshift = 12;
-		break;
-	default:
-		_kvm_err(kd, kd->program, "Unsupported CPU type");
-		return (-1);
-	}
-	nptesg = NBPSG / kd->nbpg;
-	return (0);
-}
-
-/*
- * Translate a kernel virtual address to a physical address using the
- * mapping information in kd->vm.  Returns the result in pa, and returns
- * the number of bytes that are contiguously available from this
- * physical address.  This routine is used only for crash dumps.
- */
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-	if (cputyp == -1)
-		if (_kvm_initvtop(kd) != 0)
-			return (-1);
-
-	switch (cputyp) {
-	case CPU_SUN4:
-	case CPU_SUN4C:
-		return _kvm_kvatop44c(kd, va, pa);
-		break;
-	case CPU_SUN4M:
-		return _kvm_kvatop4m(kd, va, pa);
-		break;
-	case CPU_SUN4U:
-	default:
-		return _kvm_kvatop4u(kd, va, pa);
-	}
-}
-
-/*
- * (note: sun4 3-level MMU not yet supported)
- */
-int
-_kvm_kvatop44c(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-	int vr, vs, pte;
-	sparc64_cpu_kcore_hdr_t *cpup = kd->cpu_data;
-	struct segmap *sp, *segmaps;
-	int *ptes;
-	int nkreg, nureg;
-	u_long kernbase = cpup->kernbase;
-
-	if (va < kernbase)
-		goto err;
-
-	/*
-	 * Layout of CPU segment:
-	 *	cpu_kcore_hdr_t;
-	 *	[alignment]
-	 *	phys_ram_seg_t[cpup->nmemseg];
-	 *	segmap[cpup->nsegmap];
-	 *	ptes[cpup->npmegs];
-	 */
-	segmaps = (struct segmap *)((long)kd->cpu_data + cpup->segmapoffset);
-	ptes = (int *)((int)kd->cpu_data + cpup->pmegoffset);
-	nkreg = ((int)((-(unsigned)kernbase) / NBPRG));
-	nureg = 256 - nkreg;
-
-	vr = VA_VREG(va);
-	vs = VA_VSEG(va);
-
-	sp = &segmaps[(vr-nureg)*NSEGRG + vs];
-	if (sp->sg_npte == 0)
-		goto err;
-	if (sp->sg_pmeg == cpup->npmeg - 1) /* =seginval */
-		goto err;
-	pte = ptes[sp->sg_pmeg * nptesg + VA_VPG(va)];
-	if ((pte & PG_V) != 0) {
-		paddr_t p, off = VA_OFF(va);
-
-		p = (pte & PG_PFNUM) << pgshift;
-		*pa = p + off;
-		return (kd->nbpg - off);
-	}
-err:
-	_kvm_err(kd, 0, "invalid address (%#"PRIxVADDR")", va);
-	return (0);
-}
-
-int
-_kvm_kvatop4m(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-	sparc64_cpu_kcore_hdr_t *cpup = kd->cpu_data;
-	int vr, vs;
-	int pte;
-	off_t foff;
-	struct segmap *sp, *segmaps;
-	int nkreg, nureg;
-	u_long kernbase = cpup->kernbase;
-
-	if (va < kernbase)
-		goto err;
-
-	/*
-	 * Layout of CPU segment:
-	 *	cpu_kcore_hdr_t;
-	 *	[alignment]
-	 *	phys_ram_seg_t[cpup->nmemseg];
-	 *	segmap[cpup->nsegmap];
-	 */
-	segmaps = (struct segmap *)((long)kd->cpu_data + cpup->segmapoffset);
-	nkreg = ((int)((-(unsigned)kernbase) / NBPRG));
-	nureg = 256 - nkreg;
-
-	vr = VA_VREG(va);
-	vs = VA_VSEG(va);
-
-	sp = &segmaps[(vr-nureg)*NSEGRG + vs];
-	if (sp->sg_npte == 0)
-		goto err;
-
-	/* XXX - assume page tables in initial kernel DATA or BSS. */
-	foff = _kvm_pa2off(kd, (u_long)&sp->sg_pte[VA_VPG(va)] - kernbase);
-	if (foff == (off_t)-1)
-		return (0);
-
-	if (_kvm_pread(kd, kd->pmfd, &pte, sizeof(pte), foff) != sizeof(pte)) {
-		_kvm_syserr(kd, kd->program, "cannot read pte for "
-		    "%#" PRIxVADDR, va);
-		return (0);
-	}
-
-	if ((pte & SRMMU_TETYPE) == SRMMU_TEPTE) {
-		long p, off = VA_OFF(va);
-
-		p = (pte & SRMMU_PPNMASK) << SRMMU_PPNPASHIFT;
-		*pa = p + off;
-		return (kd->nbpg - off);
-	}
-err:
-	_kvm_err(kd, 0, "invalid address (%#"PRIxVADDR")", va);
-	return (0);
-}
-
-/*
- * sparc64 pmap's 32-bit page table format
- */
-int
-_kvm_kvatop4u(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-	sparc64_cpu_kcore_hdr_t *cpup = kd->cpu_data;
-	int64_t **segmaps;
-	int64_t *ptes;
-	int64_t pte;
-	int64_t kphys = cpup->kphys;
-	u_long kernbase = cpup->kernbase;
-
-	if (va < kernbase)
-		goto err;
-
-	/*
-	 * Kernel layout:
-	 *
-	 * kernbase:
-	 *	4MB locked TLB (text+data+BSS)
-	 *	Random other stuff.
-	 */
-	if (va >= kernbase && va < kernbase + 4*1024*1024)
-		return (va - kernbase) + kphys;
-
-/* XXX: from sparc64/include/pmap.h */
-#define	SPARC64_PTSZ		(kd->nbpg/8)
-#define	SPARC64_STSZ		(SPARC64_PTSZ)
-#define	SPARC64_PTMASK		(SPARC64_PTSZ-1)
-#define	SPARC64_PTSHIFT		(13)
-#define	SPARC64_PDSHIFT		(10+SPARC64_PTSHIFT)
-#define	SPARC64_STSHIFT		(10+SPARC64_PDSHIFT)
-#define	SPARC64_STMASK		(SPARC64_STSZ-1)
-#define	sparc64_va_to_seg(v)	(int)((((int64_t)(v))>>SPARC64_STSHIFT)&SPARC64_STMASK)
-#define	sparc64_va_to_pte(v)	(int)((((int64_t)(v))>>SPARC64_PTSHIFT)&SPARC64_PTMASK)
-
-/* XXX: from sparc64/include/pte.h */
-#define	SPARC64_TLB_V			0x8000000000000000LL
-#define	SPARC64_TLB_PA_MASK		0x000001ffffffe000LL
-
-	/*
-	 * Layout of CPU segment:
-	 *	cpu_kcore_hdr_t;
-	 *	[alignment]
-	 *	phys_ram_seg_t[cpup->nmemseg];
-	 *	segmap[cpup->nsegmap];
-	 */
-	segmaps = (int64_t **)((long)kd->cpu_data + cpup->segmapoffset);
-	ptes = (int64_t *)(intptr_t)_kvm_pa2off(kd,
-	    (paddr_t)(intptr_t)segmaps[sparc64_va_to_seg(va)]);
-	pte = ptes[sparc64_va_to_pte(va)];
-	if ((pte & SPARC64_TLB_V) != 0)
-		return ((pte & SPARC64_TLB_PA_MASK) | (va & (kd->nbpg - 1)));
-err:
-	_kvm_err(kd, 0, "invalid address (%#"PRIxVADDR")", va);
-	return (0);
-}
-
-
-/*
- * Translate a physical address to a file-offset in the crash dump.
- */
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-	sparc64_cpu_kcore_hdr_t *cpup = kd->cpu_data;
-	phys_ram_seg_t *mp;
-	off_t off;
-	int nmem;
-
-	/*
-	 * Layout of CPU segment:
-	 *	cpu_kcore_hdr_t;
-	 *	[alignment]
-	 *	phys_ram_seg_t[cpup->nmemseg];
-	 */
-	mp = (phys_ram_seg_t *)((int)kd->cpu_data + cpup->memsegoffset);
-	off = 0;
-
-	/* Translate (sparse) pfnum to (packed) dump offset */
-	for (nmem = cpup->nmemseg; --nmem >= 0; mp++) {
-		if (mp->start <= pa && pa < mp->start + mp->size)
-			break;
-		off += mp->size;
-	}
-	if (nmem < 0) {
-		_kvm_err(kd, 0, "invalid address (%lx)", (unsigned long)pa);
-		return (-1);
-	}
-
-	return (kd->dump_off + off + pa - mp->start);
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-	u_long max_uva;
-	extern struct ps_strings *__ps_strings;
-
-	max_uva = (u_long) (__ps_strings + 1);
-	kd->usrstack = max_uva;
-	kd->max_uva  = max_uva;
-	kd->min_uva  = 0;
-
-	return (0);
-}
diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c
deleted file mode 100644
index abfb84b3e..000000000
--- a/lib/libkvm/kvm_sparc64.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/*	$NetBSD: kvm_sparc64.c,v 1.17 2014/02/21 18:00:09 palle Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_sparc.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: kvm_sparc64.c,v 1.17 2014/02/21 18:00:09 palle Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Sparc machine dependent routines for kvm.  Hopefully, the forthcoming
- * vm code will one day obsolete this module.
- */
-
-#include <sys/param.h>
-#include <sys/exec.h>
-#include <sys/proc.h>
-#include <sys/stat.h>
-#include <sys/core.h>
-#include <sys/kcore.h>
-#include <sys/types.h>
-
-#include <unistd.h>
-#include <nlist.h>
-#include <kvm.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <machine/pmap.h>
-#include <machine/kcore.h>
-#include <machine/vmparam.h>
-#include <machine/param.h>
-
-#include <limits.h>
-#include <db.h>
-
-#include "kvm_private.h"
-
-void
-_kvm_freevtop(kvm_t *kd)
-{
-	if (kd->vmst != 0) {
-		_kvm_err(kd, kd->program, "_kvm_freevtop: internal error");
-		kd->vmst = 0;
-	}
-}
-
-/*
- * Prepare for translation of kernel virtual addresses into offsets
- * into crash dump files. We use the MMU specific goop written at the
- * front of the crash dump by pmap_dumpmmu().
- *
- * We should read in and cache the ksegs here to speed up operations...
- */
-int
-_kvm_initvtop(kvm_t *kd)
-{
-	kd->nbpg = 0x2000;
-
-	return (0);
-}
-
-/*
- * Translate a kernel virtual address to a physical address using the
- * mapping information in kd->vm.  Returns the result in pa, and returns
- * the number of bytes that are contiguously available from this
- * physical address.  This routine is used only for crash dumps.
- */
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-	cpu_kcore_hdr_t *cpup = kd->cpu_data;
-	u_long kernbase = cpup->kernbase;
-	uint64_t *pseg, *pdir, *ptbl;
-	struct cpu_kcore_4mbseg *ktlb;
-	int64_t data;
-	int i;
-
-	if (va < kernbase)
-		goto lose;
-
-	/* Handle the wired 4MB TTEs and per-CPU mappings */
-	if (cpup->memsegoffset > sizeof(cpu_kcore_hdr_t) &&
-	    cpup->newmagic == SPARC64_KCORE_NEWMAGIC) {
-		/*
-		 * new format: we have a list of 4 MB mappings
-		 */
-		ktlb = (struct cpu_kcore_4mbseg *)
-			((uintptr_t)kd->cpu_data + cpup->off4mbsegs);
-		for (i = 0; i < cpup->num4mbsegs; i++) {
-			uint64_t start = ktlb[i].va;
-			if (va < start || va >= start+PAGE_SIZE_4M)
-				continue;
-			*pa = ktlb[i].pa + va - start;
-			return (int)(start+PAGE_SIZE_4M - va);
-		}
-
-		if (cpup->numcpuinfos > 0) {
-			/* we have per-CPU mapping info */
-			uint64_t start, base;
-
-			base = cpup->cpubase - 32*1024;
-			if (va >= base && va < (base + cpup->percpusz)) {
-				start = va - base;
-				*pa = cpup->cpusp
-				    + cpup->thiscpu*cpup->percpusz
-				    + start;
-				return cpup->percpusz - start;
-			}
-		}
-	} else {
-		/*
-		 * old format: just a textbase/size and database/size
-		 */
-		if (va > cpup->ktextbase && va < 
-		    (cpup->ktextbase + cpup->ktextsz)) {
-			u_long vaddr;
-
-			vaddr = va - cpup->ktextbase;
-			*pa = cpup->ktextp + vaddr;
-			return (int)(cpup->ktextsz - vaddr);
-		}
-		if (va > cpup->kdatabase && va < 
-		    (cpup->kdatabase + cpup->kdatasz)) {
-			u_long vaddr;
-
-			vaddr = va - cpup->kdatabase;
-			*pa = cpup->kdatap + vaddr;
-			return (int)(cpup->kdatasz - vaddr);
-		}
-	}
-
-	/*
-	 * Parse kernel page table.
-	 */
-	pseg = (uint64_t *)(u_long)cpup->segmapoffset;
-	if (_kvm_pread(kd, kd->pmfd, &pdir, sizeof(pdir),
-		_kvm_pa2off(kd, (paddr_t)&pseg[va_to_seg(va)])) 
-		!= sizeof(pdir)) {
-		_kvm_syserr(kd, 0, "could not read L1 PTE");
-		goto lose;
-	}
-
-	if (!pdir) {
-		_kvm_err(kd, 0, "invalid L1 PTE");
-		goto lose;
-	}
-
-	if (_kvm_pread(kd, kd->pmfd, &ptbl, sizeof(ptbl),
-		_kvm_pa2off(kd, (paddr_t)&pdir[va_to_dir(va)])) 
-		!= sizeof(ptbl)) {
-		_kvm_syserr(kd, 0, "could not read L2 PTE");
-		goto lose;
-	}
-
-	if (!ptbl) {
-		_kvm_err(kd, 0, "invalid L2 PTE");
-		goto lose;
-	}
-
-	if (_kvm_pread(kd, kd->pmfd, &data, sizeof(data),
-		_kvm_pa2off(kd, (paddr_t)&ptbl[va_to_pte(va)])) 
-		!= sizeof(data)) {
-		_kvm_syserr(kd, 0, "could not read TTE");
-		goto lose;
-	}
-
-	if (data >= 0) {
-		_kvm_err(kd, 0, "invalid L2 TTE");
-		goto lose;
-	}
-	
-	/* 
-	 * Calculate page offsets and things.
-	 *
-	 * XXXX -- We could support multiple page sizes.
-	 */
-	va = va & (kd->nbpg - 1);
-	data &= SUN4U_TLB_PA_MASK; /* XXX handle sun4u/sun4v */
-	*pa = data + va;
-
-	/*
-	 * Parse and trnslate our TTE.
-	 */
-
-	return (int)(kd->nbpg - va);
-
-lose:
-	*pa = (u_long)-1;
-	_kvm_err(kd, 0, "invalid address (%#"PRIxVADDR")", va);
-	return (0);
-}
-
-
-/*
- * Translate a physical address to a file-offset in the crash dump.
- */
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-	cpu_kcore_hdr_t *cpup = kd->cpu_data;
-	phys_ram_seg_t *mp;
-	off_t off;
-	int nmem;
-
-	/*
-	 * Layout of CPU segment:
-	 *	cpu_kcore_hdr_t;
-	 *	[alignment]
-	 *	phys_ram_seg_t[cpup->nmemseg];
-	 */
-	mp = (phys_ram_seg_t *)((long)kd->cpu_data + cpup->memsegoffset);
-	off = 0;
-
-	/* Translate (sparse) pfnum to (packed) dump offset */
-	for (nmem = cpup->nmemseg; --nmem >= 0; mp++) {
-		if (mp->start <= pa && pa < mp->start + mp->size)
-			break;
-		off += mp->size;
-	}
-	if (nmem < 0) {
-		_kvm_err(kd, 0, "invalid address (%#"PRIxPADDR")", pa);
-		return (-1);
-	}
-
-	return (kd->dump_off + off + pa - mp->start);
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-	u_long max_uva;
-	extern struct ps_strings *__ps_strings;
-
-	max_uva = (u_long) (__ps_strings + 1);
-	kd->usrstack = max_uva;
-	kd->max_uva  = max_uva;
-	kd->min_uva  = 0;
-
-	return (0);
-}
diff --git a/lib/libkvm/kvm_sun2.c b/lib/libkvm/kvm_sun2.c
deleted file mode 100644
index bbd1b56b3..000000000
--- a/lib/libkvm/kvm_sun2.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*	$NetBSD: kvm_sun2.c,v 1.6 2011/09/14 12:37:55 christos Exp $ */
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_sparc.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: kvm_sun2.c,v 1.6 2011/09/14 12:37:55 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Sun2 machine dependent routines for kvm.
- *
- * Note: This file has to build on ALL m68000 machines,
- * so do NOT include any <machine / *.h> files here.
- */
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/kcore.h>
-
-#include <unistd.h>
-#include <limits.h>
-#include <nlist.h>
-#include <kvm.h>
-#include <db.h>
-
-#include <m68k/kcore.h>
-
-#include "kvm_private.h"
-#include "kvm_m68k.h"
-
-int   _kvm_sun2_initvtop(kvm_t *);
-void  _kvm_sun2_freevtop(kvm_t *);
-int   _kvm_sun2_kvatop  (kvm_t *, vaddr_t, paddr_t *);
-off_t _kvm_sun2_pa2off  (kvm_t *, paddr_t);
-
-struct kvm_ops _kvm_ops_sun2 = {
-	_kvm_sun2_initvtop,
-	_kvm_sun2_freevtop,
-	_kvm_sun2_kvatop,
-	_kvm_sun2_pa2off };
-
-#define	_kvm_pg_pa(v, s, pte)	\
-	(((pte) & (s)->pg_frame) << (v)->pgshift)
-
-#define	_kvm_va_segnum(s, x)	\
-	((u_int)(x) >> (s)->segshift)
-#define	_kvm_pte_num_mask(v)	\
-	(0xf << (v)->pgshift)
-#define	_kvm_va_pte_num(v, va)	\
-	(((va) & _kvm_pte_num_mask((v))) >> (v)->pgshift)
-
-/*
- * XXX Re-define these here, no other place for them.
- */
-#define	NKSEG		512	/* kernel segmap entries */
-#define	NPAGSEG		16	/* pages per segment */
-
-/* Finally, our local stuff... */
-struct private_vmstate {
-	/* Page Map Entry Group (PMEG) */
-	int   pmeg[NKSEG][NPAGSEG];
-};
-
-/*
- * Prepare for translation of kernel virtual addresses into offsets
- * into crash dump files. We use the MMU specific goop written at the
- * beginning of a crash dump by dumpsys()
- * Note: sun2 MMU specific!
- */
-int
-_kvm_sun2_initvtop(kvm_t *kd)
-{
-	cpu_kcore_hdr_t *h = kd->cpu_data;
-	char *p;
-
-	p = kd->cpu_data;
-	p += (h->page_size - sizeof(kcore_seg_t));
-	kd->vmst->private = p;
-
-	return (0);
-}
-
-void
-_kvm_sun2_freevtop(kvm_t *kd)
-{
-	/* This was set by pointer arithmetic, not allocation. */
-	kd->vmst->private = (void*)0;
-}
-
-/*
- * Translate a kernel virtual address to a physical address using the
- * mapping information in kd->vm.  Returns the result in pa, and returns
- * the number of bytes that are contiguously available from this
- * physical address.  This routine is used only for crash dumps.
- */
-int
-_kvm_sun2_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pap)
-{
-	cpu_kcore_hdr_t *h = kd->cpu_data;
-	struct sun2_kcore_hdr *s = &h->un._sun2;
-	struct vmstate *v = kd->vmst;
-	struct private_vmstate *pv = v->private;
-	int pte, offset;
-	u_int segnum, sme, ptenum;
-	paddr_t pa;
-
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, 0, "vatop called in live kernel!");
-		return(0);
-	}
-
-	if (va < h->kernbase) {
-		_kvm_err(kd, 0, "not a kernel address");
-		return(0);
-	}
-
-	/*
-	 * Get the segmap entry (sme) from the kernel segmap.
-	 * Note: only have segmap entries from KERNBASE to end.
-	 */
-	segnum = _kvm_va_segnum(s, va - h->kernbase);
-	ptenum = _kvm_va_pte_num(v, va);
-	offset = va & v->pgofset;
-
-	/* The segmap entry selects a PMEG. */
-	sme = s->ksegmap[segnum];
-	pte = pv->pmeg[sme][ptenum];
-
-	if ((pte & (s)->pg_valid) == 0) {
-		_kvm_err(kd, 0, "page not valid (VA=0x%lx)", va);
-		return (0);
-	}
-	pa = _kvm_pg_pa(v, s, pte) + offset;
-
-	*pap = pa;
-	return (h->page_size - offset);
-}
-
-/*
- * Translate a physical address to a file-offset in the crash dump.
- */
-off_t
-_kvm_sun2_pa2off(kvm_t *kd, paddr_t pa)
-{
-	return(kd->dump_off + pa);
-}
diff --git a/lib/libkvm/kvm_sun3.c b/lib/libkvm/kvm_sun3.c
deleted file mode 100644
index 298e338bf..000000000
--- a/lib/libkvm/kvm_sun3.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*	$NetBSD: kvm_sun3.c,v 1.15 2011/09/14 12:37:55 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_sparc.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: kvm_sun3.c,v 1.15 2011/09/14 12:37:55 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Sun3 machine dependent routines for kvm.
- *
- * Note: This file has to build on ALL m68k machines,
- * so do NOT include any <machine / *.h> files here.
- */
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/kcore.h>
-
-#include <unistd.h>
-#include <limits.h>
-#include <nlist.h>
-#include <kvm.h>
-#include <db.h>
-
-#include <m68k/kcore.h>
-
-#include "kvm_private.h"
-#include "kvm_m68k.h"
-
-int   _kvm_sun3_initvtop(kvm_t *);
-void  _kvm_sun3_freevtop(kvm_t *);
-int   _kvm_sun3_kvatop  (kvm_t *, vaddr_t, paddr_t *);
-off_t _kvm_sun3_pa2off  (kvm_t *, paddr_t);
-
-struct kvm_ops _kvm_ops_sun3 = {
-	_kvm_sun3_initvtop,
-	_kvm_sun3_freevtop,
-	_kvm_sun3_kvatop,
-	_kvm_sun3_pa2off };
-
-#define	_kvm_pg_pa(v, s, pte)	\
-	(((pte) & (s)->pg_frame) << (v)->pgshift)
-
-#define	_kvm_va_segnum(s, x)	\
-	((u_int)(x) >> (s)->segshift)
-#define	_kvm_pte_num_mask(v)	\
-	(0xf << (v)->pgshift)
-#define	_kvm_va_pte_num(v, va)	\
-	(((va) & _kvm_pte_num_mask((v))) >> (v)->pgshift)
-
-/*
- * XXX Re-define these here, no other place for them.
- */
-#define	NKSEG		256	/* kernel segmap entries */
-#define	NPAGSEG		16	/* pages per segment */
-
-/* Finally, our local stuff... */
-struct private_vmstate {
-	/* Page Map Entry Group (PMEG) */
-	int   pmeg[NKSEG][NPAGSEG];
-};
-
-/*
- * Prepare for translation of kernel virtual addresses into offsets
- * into crash dump files. We use the MMU specific goop written at the
- * beginning of a crash dump by dumpsys()
- * Note: sun3 MMU specific!
- */
-int
-_kvm_sun3_initvtop(kvm_t *kd)
-{
-	cpu_kcore_hdr_t *h = kd->cpu_data;
-	char *p;
-
-	p = kd->cpu_data;
-	p += (h->page_size - sizeof(kcore_seg_t));
-	kd->vmst->private = p;
-
-	return (0);
-}
-
-void
-_kvm_sun3_freevtop(kvm_t *kd)
-{
-	/* This was set by pointer arithmetic, not allocation. */
-	kd->vmst->private = (void*)0;
-}
-
-/*
- * Translate a kernel virtual address to a physical address using the
- * mapping information in kd->vm.  Returns the result in pa, and returns
- * the number of bytes that are contiguously available from this
- * physical address.  This routine is used only for crash dumps.
- */
-int
-_kvm_sun3_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pap)
-{
-	cpu_kcore_hdr_t *h = kd->cpu_data;
-	struct sun3_kcore_hdr *s = &h->un._sun3;
-	struct vmstate *v = kd->vmst;
-	struct private_vmstate *pv = v->private;
-	int pte, offset;
-	u_int segnum, sme, ptenum;
-	paddr_t pa;
-
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, 0, "vatop called in live kernel!");
-		return(0);
-	}
-
-	if (va < h->kernbase) {
-		_kvm_err(kd, 0, "not a kernel address");
-		return(0);
-	}
-
-	/*
-	 * Get the segmap entry (sme) from the kernel segmap.
-	 * Note: only have segmap entries from KERNBASE to end.
-	 */
-	segnum = _kvm_va_segnum(s, va - h->kernbase);
-	ptenum = _kvm_va_pte_num(v, va);
-	offset = va & v->pgofset;
-
-	/* The segmap entry selects a PMEG. */
-	sme = s->ksegmap[segnum];
-	pte = pv->pmeg[sme][ptenum];
-
-	if ((pte & (s)->pg_valid) == 0) {
-		_kvm_err(kd, 0, "page not valid (VA=%#"PRIxVADDR")", va);
-		return (0);
-	}
-	pa = _kvm_pg_pa(v, s, pte) + offset;
-
-	*pap = pa;
-	return (h->page_size - offset);
-}
-
-/*
- * Translate a physical address to a file-offset in the crash dump.
- */
-off_t
-_kvm_sun3_pa2off(kvm_t *kd, paddr_t pa)
-{
-	return(kd->dump_off + pa);
-}
diff --git a/lib/libkvm/kvm_sun3x.c b/lib/libkvm/kvm_sun3x.c
deleted file mode 100644
index c7539d152..000000000
--- a/lib/libkvm/kvm_sun3x.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*	$NetBSD: kvm_sun3x.c,v 1.12 2011/09/14 12:37:55 christos Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Gordon W. Ross.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_sparc.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: kvm_sun3x.c,v 1.12 2011/09/14 12:37:55 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Sun3x machine dependent routines for kvm.
- *
- * Note: This file has to build on ALL m68k machines,
- * so do NOT include any <machine / *.h> files here.
- */
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/kcore.h>
-
-#include <unistd.h>
-#include <limits.h>
-#include <nlist.h>
-#include <kvm.h>
-#include <db.h>
-
-#include <m68k/kcore.h>
-
-#include "kvm_private.h"
-#include "kvm_m68k.h"
-
-int   _kvm_sun3x_initvtop(kvm_t *);
-void  _kvm_sun3x_freevtop(kvm_t *);
-int   _kvm_sun3x_kvatop  (kvm_t *, vaddr_t, paddr_t *);
-off_t _kvm_sun3x_pa2off  (kvm_t *, paddr_t);
-
-struct kvm_ops _kvm_ops_sun3x = {
-	_kvm_sun3x_initvtop,
-	_kvm_sun3x_freevtop,
-	_kvm_sun3x_kvatop,
-	_kvm_sun3x_pa2off };
-
-#define	_kvm_kvas_size(h)	\
-	(-((h)->kernbase))
-#define	_kvm_nkptes(h, v)	\
-	(_kvm_kvas_size((h)) >> (v)->pgshift)
-#define	_kvm_pg_pa(pte, h)	\
-	((pte) & (h)->pg_frame)
-
-/*
- * Prepare for translation of kernel virtual addresses into offsets
- * into crash dump files.  Nothing to do here.
- */
-int
-_kvm_sun3x_initvtop(kvm_t *kd)
-{
-	return 0;
-}
-
-void
-_kvm_sun3x_freevtop(kvm_t *kd)
-{
-}
-
-/*
- * Translate a kernel virtual address to a physical address using the
- * mapping information in kd->vm.  Returns the result in pa, and returns
- * the number of bytes that are contiguously available from this
- * physical address.  This routine is used only for crash dumps.
- */
-int
-_kvm_sun3x_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pap)
-{
-	cpu_kcore_hdr_t *h = kd->cpu_data;
-	struct sun3x_kcore_hdr *s = &h->un._sun3x;
-	struct vmstate *v = kd->vmst;
-	int idx, len, offset, pte;
-	u_long pteva, pa;
-
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, 0, "vatop called in live kernel!");
-		return(0);
-	}
-
-	if (va < h->kernbase) {
-		_kvm_err(kd, 0, "not a kernel address");
-		return(0);
-	}
-
-	/*
-	 * If this VA is in the contiguous range, short-cut.
-	 * Note that this ends our recursion when we call
-	 * kvm_read to access the kernel page table, which
-	 * is guaranteed to be in the contiguous range.
-	 */
-	if (va < s->contig_end) {
-		len = s->contig_end - va;
-		pa = va - h->kernbase;
-		goto done;
-	}
-
-	/*
-	 * The KVA is beyond the contiguous range, so we must
-	 * read the PTE for this KVA from the page table.
-	 */
-	idx = ((va - h->kernbase) >> v->pgshift);
-	pteva = s->kernCbase + (idx * 4);
-	if (kvm_read(kd, pteva, &pte, 4) != 4) {
-		_kvm_err(kd, 0, "can not read PTE!");
-		return (0);
-	}
-	if ((pte & s->pg_valid) == 0) {
-		_kvm_err(kd, 0, "page not valid (VA=0x%lx)", va);
-		return (0);
-	}
-	offset = va & v->pgofset;
-	len = (h->page_size - offset);
-	pa = _kvm_pg_pa(pte, s) + offset;
-
-done:
-	*pap = pa;
-	return (len);
-}
-
-/*
- * Translate a physical address to a file-offset in the crash dump.
- */
-off_t
-_kvm_sun3x_pa2off(kvm_t *kd, paddr_t pa)
-{
-	off_t		off;
-	phys_ram_seg_t	*rsp;
-	cpu_kcore_hdr_t *h = kd->cpu_data;
-	struct sun3x_kcore_hdr *s = &h->un._sun3x;
-
-	off = 0;
-	for (rsp = s->ram_segs; rsp->size; rsp++) {
-		if (pa >= rsp->start && pa < rsp->start + rsp->size) {
-			pa -= rsp->start;
-			break;
-		}
-		off += rsp->size;
-	}
-	return (kd->dump_off + off + pa);
-}
-
diff --git a/lib/libkvm/kvm_vax.c b/lib/libkvm/kvm_vax.c
deleted file mode 100644
index d6b9ebe59..000000000
--- a/lib/libkvm/kvm_vax.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*	$NetBSD: kvm_vax.c,v 1.20 2014/02/19 20:21:22 dsl Exp $ */
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software 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.
- * 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.
- */
-
-/*
- * VAX machine dependent routines for kvm.  Hopefully, the forthcoming
- * vm code will one day obsolete this module.  Furthermore, I hope it
- * gets here soon, because this basically is an error stub! (sorry)
- * This code may not work anyway.
- */
-
-#include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <unistd.h>
-#include <nlist.h>
-#include <stdlib.h>
-#include <kvm.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <machine/vmparam.h>
-
-#include <limits.h>
-#include <db.h>
-
-#include "kvm_private.h"
-
-__RCSID("$NetBSD: kvm_vax.c,v 1.20 2014/02/19 20:21:22 dsl Exp $");
-
-struct vmstate {
-	u_long end;
-};
-
-void
-_kvm_freevtop(kvm_t *kd)
-{
-	if (kd->vmst != 0)
-		free(kd->vmst);
-}
-
-int
-_kvm_initvtop(kvm_t *kd)
-{
-	struct vmstate *vm;
-	struct stat st;
-	struct nlist nl[2];
-
-	vm = (struct vmstate *)_kvm_malloc(kd, sizeof(*vm));
-	if (vm == 0)
-		return (-1);
-
-	kd->vmst = vm;
-
-	if (fstat(kd->pmfd, &st) < 0)
-		return (-1);
-
-	/* Get end of kernel address */
-	nl[0].n_name = "_end";
-	nl[1].n_name = 0;
-	if (kvm_nlist(kd, nl) != 0) {
-		_kvm_err(kd, kd->program, "pmap_stod: no such symbol");
-		return (-1);
-	}
-	vm->end = (u_long)nl[0].n_value;
-
-	return (0);
-}
-
-#define VA_OFF(va) (va & (NBPG - 1))
-
-/*
- * Translate a kernel virtual address to a physical address using the
- * mapping information in kd->vm.  Returns the result in pa, and returns
- * the number of bytes that are contiguously available from this
- * physical address.  This routine is used only for crash dumps.
- */
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-	u_long end;
-
-	if (va < (u_long) KERNBASE) {
-		_kvm_err(kd, 0, "invalid address (%#"PRIxVADDR"<%lx)", va,
-		    (u_long)KERNBASE);
-		return (0);
-	}
-
-	end = kd->vmst->end;
-	if (va >= end) {
-		_kvm_err(kd, 0, "invalid address (%#"PRIxVADDR"<%lx)", va,
-		    end);
-		return (0);
-	}
-
-	*pa = (va - (u_long) KERNBASE);
-	return (end - va);
-}
-
-/*
- * Translate a physical address to a file-offset in the crash dump.
- * XXX - crash dump doesn't work anyway.
- */
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-	return(kd->dump_off + pa);
-}
-
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-
-	kd->usrstack = USRSTACK;
-	kd->min_uva = VM_MIN_ADDRESS;
-	kd->max_uva = VM_MAXUSER_ADDRESS;
-
-	return (0);
-}
diff --git a/lib/libkvm/kvm_x86_64.c b/lib/libkvm/kvm_x86_64.c
deleted file mode 100644
index f902f9482..000000000
--- a/lib/libkvm/kvm_x86_64.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*	$NetBSD: kvm_x86_64.c,v 1.10 2014/02/19 20:21:22 dsl Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: kvm_x86_64.c,v 1.10 2014/02/19 20:21:22 dsl Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * x86-64 machine dependent routines for kvm.
- */
-
-#include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/stat.h>
-#include <sys/kcore.h>
-#include <sys/types.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <nlist.h>
-#include <kvm.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <limits.h>
-#include <db.h>
-
-#include "kvm_private.h"
-
-#include <machine/kcore.h>
-#include <machine/pmap.h>
-#include <machine/pte.h>
-#include <machine/vmparam.h>
-
-void
-_kvm_freevtop(kvm_t *kd)
-{
-
-	/* Not actually used for anything right now, but safe. */
-	if (kd->vmst != 0)
-		free(kd->vmst);
-}
-
-/*ARGSUSED*/
-int
-_kvm_initvtop(kvm_t *kd)
-{
-
-	return (0);
-}
-
-/*
- * Translate a kernel virtual address to a physical address.
- */
-int
-_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
-{
-	cpu_kcore_hdr_t *cpu_kh;
-	u_long page_off;
-	pd_entry_t pde;
-	pt_entry_t pte;
-	paddr_t pde_pa, pte_pa;
-
-	if (ISALIVE(kd)) {
-		_kvm_err(kd, 0, "vatop called in live kernel!");
-		return (0);
-	}
-
-	cpu_kh = kd->cpu_data;
-
-	/*
-	 * Find and read all entries to get to the pa.
-	 */
-
-	/*
-	 * Level 4.
-	 */
-	pde_pa = cpu_kh->ptdpaddr + (pl4_pi(va) * sizeof(pd_entry_t));
-	if (_kvm_pread(kd, kd->pmfd, (void *)&pde, sizeof(pde),
-	    _kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {
-		_kvm_syserr(kd, 0, "could not read PT level 4 entry");
-		goto lose;
-	}
-	if ((pde & PG_V) == 0) {
-		_kvm_err(kd, 0, "invalid translation (invalid level 4 PDE)");
-		goto lose;
-	}
-
-	/*
-	 * Level 3.
-	 */
-	pde_pa = (pde & PG_FRAME) + (pl3_pi(va) * sizeof(pd_entry_t));
-	if (_kvm_pread(kd, kd->pmfd, (void *)&pde, sizeof(pde),
-	    _kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {
-		_kvm_syserr(kd, 0, "could not read PT level 3 entry");
-		goto lose;
-	}
-	if ((pde & PG_V) == 0) {
-		_kvm_err(kd, 0, "invalid translation (invalid level 3 PDE)");
-		goto lose;
-	}
-	if (pde & PG_PS) {
-		page_off = va & (NBPD_L3 - 1);
-		*pa = (pde & PG_1GFRAME) + page_off;
-		return (int)(NBPD_L3 - page_off);
-	}
-
-	/*
-	 * Level 2.
-	 */
-	pde_pa = (pde & PG_FRAME) + (pl2_pi(va) * sizeof(pd_entry_t));
-	if (_kvm_pread(kd, kd->pmfd, (void *)&pde, sizeof(pde),
-	    _kvm_pa2off(kd, pde_pa)) != sizeof(pde)) {
-		_kvm_syserr(kd, 0, "could not read PT level 2 entry");
-		goto lose;
-	}
-	if ((pde & PG_V) == 0) {
-		_kvm_err(kd, 0, "invalid translation (invalid level 2 PDE)");
-		goto lose;
-	}
-	if (pde & PG_PS) {
-		page_off = va & (NBPD_L2 - 1);
-		*pa = (pde & PG_2MFRAME) + page_off;
-		return (int)(NBPD_L2 - page_off);
-	}
-
-	/*
-	 * Level 1.
-	 */
-	pte_pa = (pde & PG_FRAME) + (pl1_pi(va) * sizeof(pt_entry_t));
-	if (_kvm_pread(kd, kd->pmfd, (void *) &pte, sizeof(pte),
-	    _kvm_pa2off(kd, pte_pa)) != sizeof(pte)) {
-		_kvm_syserr(kd, 0, "could not read PTE");
-		goto lose;
-	}
-	/*
-	 * Validate the PTE and return the physical address.
-	 */
-	if ((pte & PG_V) == 0) {
-		_kvm_err(kd, 0, "invalid translation (invalid PTE)");
-		goto lose;
-	}
-	page_off = va & PGOFSET;
-	*pa = (pte & PG_FRAME) + page_off;
-	return (int)(NBPG - page_off);
-
- lose:
-	*pa = (u_long)~0L;
-	return (0);
-}
-
-/*
- * Translate a physical address to a file-offset in the crash dump.
- */
-off_t
-_kvm_pa2off(kvm_t *kd, paddr_t pa)
-{
-	cpu_kcore_hdr_t *cpu_kh;
-	phys_ram_seg_t *ramsegs;
-	off_t off;
-	int i;
-
-	cpu_kh = kd->cpu_data;
-	ramsegs = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh));
-
-	off = 0;
-	for (i = 0; i < cpu_kh->nmemsegs; i++) {
-		if (pa >= ramsegs[i].start &&
-		    (pa - ramsegs[i].start) < ramsegs[i].size) {
-			off += (pa - ramsegs[i].start);
-			break;
-		}
-		off += ramsegs[i].size;
-	}
-
-	return (kd->dump_off + off);
-}
-
-/*
- * Machine-dependent initialization for ALL open kvm descriptors,
- * not just those for a kernel crash dump.  Some architectures
- * have to deal with these NOT being constants!  (i.e. m68k)
- */
-int
-_kvm_mdopen(kvm_t *kd)
-{
-
-	kd->usrstack = USRSTACK;
-	kd->min_uva = VM_MIN_ADDRESS;
-	kd->max_uva = VM_MAXUSER_ADDRESS;
-
-	return (0);
-}
diff --git a/lib/libkvm/shlib_version b/lib/libkvm/shlib_version
deleted file mode 100644
index 1ce12ce34..000000000
--- a/lib/libkvm/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.12 2009/01/11 03:07:48 christos Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=6
-minor=0
diff --git a/lib/libm/Makefile b/lib/libm/Makefile
deleted file mode 100644
index dc964266d..000000000
--- a/lib/libm/Makefile
+++ /dev/null
@@ -1,393 +0,0 @@
-#  $NetBSD: Makefile,v 1.170 2015/09/13 10:58:30 he Exp $
-#
-#  @(#)Makefile 5.1beta 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.
-#  ====================================================
-#
-#
-
-#
-# There are two options in making libm at fdlibm compile time:
-# 	_IEEE_LIBM 	--- IEEE libm; smaller, and somewhat faster
-#	_MULTI_LIBM	--- Support multi-standard at runtime by
-#			    imposing wrapper functions defined in
-#			    fdlibm.h:
-#				_IEEE_MODE 	-- IEEE
-#				_XOPEN_MODE 	-- X/OPEN
-#				_POSIX_MODE 	-- POSIX/ANSI
-#				_SVID3_MODE 	-- SVID
-#
-# Here is how to set up CPPFLAGS to create the desired libm at
-# compile time:
-#
-# 	CPPFLAGS = -D_IEEE_LIBM		... IEEE libm (recommended)
-#	CPPFLAGS = -D_SVID3_MODE	... Multi-standard supported
-#					    libm with SVID as the
-#					    default standard
-#	CPPFLAGS = -D_XOPEN_MODE	... Multi-standard supported
-#					    libm with XOPEN as the
-#					    default standard
-#	CPPFLAGS = -D_POSIX_MODE	... Multi-standard supported
-#					    libm with POSIX as the
-#					    default standard
-#	CPPFLAGS = 			... Multi-standard supported
-#					    libm with IEEE as the
-#					    default standard
-#
-
-USE_SHLIBDIR=	yes
-
-# require this for the value of I387_LIBM from mk.conf, if set.
-.include <bsd.own.mk>
-
-LIBC_MACHINE_ARCH?=	${MACHINE_ARCH}
-LIBC_MACHINE_CPU?=	${MACHINE_CPU}
-
-# compiler_rt uses typeof() and __extension__
-LINTFLAGS += -g
-
-.if (${LIBC_MACHINE_CPU} == "aarch64")
-.PATH: ${.CURDIR}/arch/aarch64
-ARCH_SRCS = e_sqrt.S e_sqrtf.S s_fabsf.S
-ARCH_SRCS+= s_fma.S s_fmaf.S s_fmax.S s_fmaxf.S s_fmin.S s_fminf.S
-COPTS.e_sqrtl.c += -DHAVE_FENV_H
-COMMON_SRCS+= fenv.c
-COMMON_SRCS+= e_sqrtl.c
-COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
-.elif (${LIBC_MACHINE_ARCH} == "alpha")
-.PATH: ${.CURDIR}/arch/alpha
-ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
-COPTS+=	-mfloat-ieee -mieee-with-inexact -mfp-trap-mode=sui -mtrap-precision=i
-.elif (${LIBC_MACHINE_CPU} == "arm")
-.PATH.c: ${.CURDIR}/arch/arm
-COMMON_SRCS+= fenv.c s_nexttowardf.c \
-	s_nearbyint.c s_rintl.c
-COPTS.e_sqrtl.c += -DHAVE_FENV_H
-COPTS.fenv.c+=	-mfpu=vfp
-.if (${MKSOFTFLOAT} == "no")
-.PATH.S: ${.CURDIR}/arch/arm
-ARCH_SRCS = e_sqrt.S e_sqrtf.S lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
-.endif
-.elif (${LIBC_MACHINE_ARCH} == "hppa")
-.PATH.c: ${.CURDIR}/arch/hppa
-COMMON_SRCS+= fenv.c s_nexttowardf.c \
-	s_nearbyint.c s_rintl.c
-COPTS.e_sqrtl.c += -DHAVE_FENV_H
-.elif (${LIBC_MACHINE_ARCH} == "sparc")
-.PATH: ${.CURDIR}/arch/sparc
-COMMON_SRCS+= fenv.c
-COPTS.e_sqrtl.c += -DHAVE_FENV_H
-COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
-.elif (${LIBC_MACHINE_ARCH} == "sparc64")
-.PATH: ${.CURDIR}/arch/sparc64
-COMMON_SRCS+= fenv.c s_nexttowardf.c \
-	s_nearbyint.c s_rintl.c
-COPTS.e_sqrtl.c += -DHAVE_FENV_H
-.ifndef _COMPAT_M32_MK_
-COMMON_SRCS+= s_nexttoward.c
-.endif
-COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
-.elif ((${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64"))
-
-# XXX consider making this LIBC_MACHINE_ARCH?
-.if (${MACHINE_ARCH} == "x86_64")
-.PATH: ${.CURDIR}/arch/x86_64
-.endif
-.PATH:	${.CURDIR}/arch/i387
-
-COMMON_SRCS+= fenv.c s_nexttoward.c s_nexttowardf.c \
-	s_nearbyint.c s_rintl.c
-COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
-COPTS.e_sqrtl.c += -DHAVE_FENV_H
-
-ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_expf.S e_fmod.S e_log.S \
-	    e_logf.S e_log10.S e_log10f.S e_log2.S e_log2f.S e_remainder.S \
-	    e_remainderf.S e_scalb.S e_scalbf.S e_sqrt.S e_sqrtf.S s_atan.S \
-	    s_atanf.S s_ceil.S s_ceilf.S s_copysign.S s_copysignf.S s_cos.S \
-	    s_cosf.S s_finite.S s_finitef.S s_floor.S s_floorf.S \
-	    s_ilogb.S s_ilogbf.S s_ilogbl.S s_log1p.S s_log1pf.S \
-	    s_logb.S s_logbf.S s_logbl.S \
-	    s_rint.S s_rintf.S s_scalbn.S s_scalbnf.S s_significand.S \
-	    s_significandf.S s_sin.S s_sinf.S s_tan.S s_tanf.S lrint.S 
-# do not pick up the i387 asm version, it is incorrect
-s_modf.o s_modf.pico s_modf.po s_modf.d: s_modf.c
-
-.if (${MACHINE_ARCH} == "i386")
-SUBDIR=arch/i387
-.endif
-.elif (${LIBC_MACHINE_ARCH} == "m68k")
-.if defined(M68060)
-.PATH:	${.CURDIR}/arch/m68060
-.include "${.CURDIR}/arch/m68060/Makefile.list"
-COPTS+=-m68060
-.PATH:	${.CURDIR}/arch/m68k
-ARCH_SRCS += s_ceil.S s_copysign.S s_finite.S s_floor.S s_rint.S
-.elif defined(M68040)
-.PATH: ${.CURDIR}/arch/m68k
-COPTS+=-m68040
-ARCH_SRCS = s_copysign.S s_finite.S
-.else
-.if (${MKSOFTFLOAT} != "yes")
-.PATH:	${.CURDIR}/arch/mc68881 ${.CURDIR}/arch/m68k
-ARCH_SRCS = e_acos.S e_asin.S e_atanh.S e_cosh.S e_exp.S e_fmod.S e_log.S \
-	    e_log10.S e_remainder.S e_scalb.S e_sinh.S e_sqrt.S s_atan.S \
-	    s_ceil.S s_copysign.S s_cos.S s_expm1.S s_finite.S s_floor.S \
-	    s_log1p.S s_logb.S s_rint.S s_scalbn.S s_sin.S s_tan.S s_tanh.S
-.endif
-.endif
-# end of m68k
-.elif (${LIBC_MACHINE_ARCH} == "vax")
-.PATH:	${.CURDIR}/arch/vax
-
-#NOIEEE_ARCH+= s_fmax.c s_fmaxf.c s_fmaxl.c
-#NOIEEE_ARCH+= n_infnan.S n_argred.S n_sqrt.S
-#ARCH_SRCS = n_atan2.S n_cabs.S n_cbrt.S n_support.S n_sincos.S n_tan.S
-# XXX - ripped out due to lack of the insn polyd in the Mariah chip,
-# and emulation code isn't written yet.
-ARCH_SRCS = n_scalbn.S
-WARNS?=5
-.elif (${LIBC_MACHINE_CPU} == "riscv")
-.PATH:	${.CURDIR}/arch/riscv
-
-COMMON_SRCS += fenv.c
-
-.if ${MKSOFTFLOAT} == "no"
-ARCH_SRCS = e_sqrt.S e_sqrtf.S
-ARCH_SRCS += s_copysign.S s_copysignf.S
-ARCH_SRCS += s_fabs.S s_fabsf.S
-ARCH_SRCS += s_fma.S s_fmaf.S
-ARCH_SRCS += s_fmax.S s_fmaxf.S
-ARCH_SRCS += s_fmin.S s_fminf.S
-.endif
-.endif
-
-WARNS?=5
-
-.PATH:	${.CURDIR}/man
-.PATH:	${.CURDIR}/src
-.PATH:	${.CURDIR}/noieee_src
-
-.if (${LIBC_MACHINE_ARCH} == "alpha")
-COPTS+= -mfp-rounding-mode=d
-.endif
-
-.if (${LIBC_MACHINE_ARCH} != "vax")
-CPPFLAGS+= -D_MULTI_LIBM -D_POSIX_MODE
-# XXX noieee libm is gross
-COPTS+=	-fno-strict-aliasing
-.endif
-CPPFLAGS+=-DLIBM_SCCS
-
-LIB=	m
-COMMON_SRCS+= b_exp.c b_log.c b_tgamma.c \
-	e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \
-	e_atan2.c e_atan2f.c e_atanh.c e_atanhf.c e_cosh.c e_coshf.c e_exp.c \
-	e_expf.c e_fmod.c e_fmodf.c e_fmodl.c e_hypot.c e_hypotf.c \
-	e_j0.c e_j0f.c \
-	e_j1.c e_j1f.c e_jn.c e_jnf.c e_lgamma_r.c e_lgammaf_r.c e_log.c \
-	e_log2.c e_log10.c e_log10f.c e_log2f.c e_logf.c e_pow.c e_powf.c \
-	e_rem_pio2.c e_rem_pio2f.c e_remainder.c e_remainderf.c e_scalb.c \
-	e_scalbf.c e_sinh.c e_sinhf.c e_sqrt.c e_sqrtf.c e_sqrtl.c \
-	k_cos.c k_cosf.c k_rem_pio2.c k_rem_pio2f.c k_sin.c k_sinf.c \
-	k_standard.c k_tan.c k_tanf.c \
-	ldbl_dummy.c \
-	s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_cbrt.c s_cbrtf.c s_cbrtl.c \
-	s_ceil.c s_ceilf.c s_ceill.c s_copysign.c s_copysignf.c s_copysignl.c \
-	s_cos.c s_cosf.c s_erf.c \
-	s_erff.c s_exp2.c s_exp2f.c s_expm1.c s_expm1f.c s_fabsf.c s_fabsl.c \
-	s_finite.c s_finitef.c \
-	s_floor.c s_floorf.c s_floorl.c s_frexpf.c \
-	s_ilogb.c s_ilogbf.c s_ilogbl.c \
-	s_isinff.c s_isnanf.c s_lib_version.c s_log1p.c \
-	s_log1pf.c s_logb.c s_logbf.c s_logbl.c \
-	s_matherr.c s_modff.c s_modfl.c s_nextafter.c s_nextafterl.c \
-	s_nextafterf.c s_remquo.c s_remquof.c s_rint.c s_rintf.c \
-	s_round.c s_roundf.c s_roundl.c s_scalbn.c \
-	s_scalbnf.c s_scalbnl.c s_signgam.c s_significand.c s_significandf.c s_sin.c \
-	s_sinf.c s_tan.c s_tanf.c s_tanh.c s_tanhf.c s_tgammaf.c \
-	s_trunc.c s_truncf.c s_truncl.c \
-	w_acos.c w_acosf.c w_acosh.c w_acoshf.c w_asin.c w_asinf.c w_atan2.c \
-	w_atan2f.c w_atanh.c w_atanhf.c w_cosh.c w_coshf.c \
-	w_drem.c w_dremf.c w_exp.c w_expf.c w_fmod.c w_fmodf.c w_fmodl.c \
-	w_gamma.c w_gamma_r.c w_gammaf.c w_gammaf_r.c w_hypot.c w_hypotf.c \
-	w_j0.c \
-	w_j0f.c w_j1.c w_j1f.c w_jn.c w_jnf.c w_lgamma.c w_lgamma_r.c \
-	w_lgammaf.c w_lgammaf_r.c w_log.c w_log10.c w_log10f.c w_log2.c \
-	w_log2f.c w_logf.c \
-	w_pow.c w_powf.c w_remainder.c w_remainderf.c w_scalb.c w_scalbf.c \
-	w_sinh.c w_sinhf.c w_sqrt.c w_sqrtf.c w_sqrtl.c \
-	lrint.c lrintf.c llrint.c llrintf.c lround.c lroundf.c llround.c \
-	llroundf.c s_frexp.c s_frexpl.c s_modf.c \
-	s_fmax.c s_fmaxf.c s_fmaxl.c \
-	s_fmin.c s_fminf.c s_fminl.c s_fdim.c
-
-.PATH:	${.CURDIR}/compat
-COMMON_SRCS+= compat_cabs.c compat_cabsf.c
-# XXX our compatibility cabs() is different!
-COPTS.compat_cabs.c=	${${ACTIVE_CC} == "gcc":? -fno-builtin-cabs :}
-COPTS.compat_cabsf.c=	${${ACTIVE_CC} == "gcc":? -fno-builtin-cabsf :}
-
-# math routines for non-IEEE architectures.
-NOIEEE_SRCS = n_asincos.c n_acosh.c n_asinh.c n_atan.c n_atanh.c n_cosh.c \
-	n_erf.c n_exp.c n_exp2.c n_exp2f.c n_exp__E.c n_expm1.c n_floor.c \
-	n_fmod.c n_gamma.c \
-	n_lgamma.c n_j0.c n_j1.c n_jn.c n_log.c n_log10.c n_log1p.c \
-	n_log2.c n_log__L.c n_pow.c n_sinh.c n_tanh.c \
-	n_sincos.c n_tan.c \
-	n_round.c n_roundf.c n_lround.c n_lroundf.c \
-	n_fmax.c n_fmaxf.c n_fmin.c n_fminf.c
-#	n_sqrt.c n_argred.c n_infnan.c n_atan2.c n_cabs.c n_cbrt.c n_support.c
-
-
-# NetBSD's C library supplies these functions:
-#COMMON_SRCS+=	s_fabs.c s_frexp.c s_isinf.c s_isnan.c s_ldexp.c s_modf.c
-
-.if (${LIBC_MACHINE_ARCH} == "vax")
-SRCS=	${NOIEEE_SRCS} ${NOIEEE_ARCH}
-.else
-SRCS=	${COMMON_SRCS}
-.endif
-
-.ifdef ARCH_ADDS
-SRCS+= ${ARCH_ADDS}
-.endif
-
-# Substitute common sources with any arch specific sources
-.for i in ${ARCH_SRCS} ${NOIEEE_ARCH}
-    SRCS:=${SRCS:S/^${i:S/.S/.c/}/$i/}
-.endfor
-
-.if (${LIBC_MACHINE_ARCH} == "vax") # XXX until POLYD is written.
-.PATH:	${.CURDIR}/arch/vax
-SRCS:=${SRCS} n_sqrt.S n_argred.S n_infnan.S n_atan2.S n_cabs.S n_cbrt.S \
-	n_support.S n_scalbn.S
-.endif
-
-.if (${LIBC_MACHINE_ARCH} == "i386")
-# XXX this gets miscompiled. There should be a better fix.
-COPTS.s_tanh.c+= -O0
-.endif
-
-MAN+=	acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 \
-	ceil.3 copysign.3 cos.3 cosh.3 \
-	erf.3 exp.3 \
-	fabs.3 finite.3 fmod.3 frexp.3 hypot.3 \
-	ieee_test.3 ilogb.3 isinff.3 j0.3 ldexp.3 lgamma.3 log.3 lrint.3 \
-	math.3 modf.3 nextafter.3 pow.3 \
-	remainder.3 rint.3 round.3 \
-	scalbn.3 sin.3 sinh.3 sqrt.3 \
-	tan.3 tanh.3 trunc.3 fmax.3 fdim.3
-
-# fenv.h interface
-MAN+=	feclearexcept.3 feenableexcept.3 fegetenv.3 fegetround.3 fenv.3
-MLINKS+=feclearexcept.3 fegetexceptflag.3	\
-	feclearexcept.3 feraiseexcept.3		\
-	feclearexcept.3 fesetexceptflag.3	\
-	feclearexcept.3 fetestexcept.3
-MLINKS+=feenableexcept.3 fedisableexcept.3	\
-	feenableexcept.3 fegetexcept.3
-MLINKS+=fegetenv.3 feholdexcept.3		\
-	fegetenv.3 fesetenv.3			\
-	fegetenv.3 feupdateenv.3
-MLINKS+=fegetround.3 fesetround.3
-
-MLINKS+=acos.3 acosf.3
-MLINKS+=acosh.3 acoshf.3
-MLINKS+=asin.3 asinf.3
-MLINKS+=asinh.3 asinhf.3
-MLINKS+=atan.3 atanf.3
-MLINKS+=atan2.3 atan2f.3
-MLINKS+=atanh.3 atanhf.3
-MLINKS+=ceil.3 ceilf.3 \
-	ceil.3 ceill.3 \
-	ceil.3 floor.3 \
-	ceil.3 floorf.3 \
-	ceil.3 floorl.3
-MLINKS+=copysign.3 copysignf.3 \
-	copysign.3 copysignl.3
-MLINKS+=cos.3 cosf.3
-MLINKS+=cosh.3 coshf.3
-MLINKS+=erf.3 erff.3 \
-	erf.3 erfl.3 \
-	erf.3 erfc.3 \
-	erf.3 erfcf.3 \
-	erf.3 erfcl.3
-MLINKS+=exp.3 expf.3 exp.3 expm1.3 exp.3 expm1f.3 			\
-	exp.3 exp2.3 exp.3 exp2f.3
-MLINKS+=log.3 logf.3 \
-	log.3 log10.3 \
-	log.3 log10f.3 \
-	log.3 log1p.3 \
-	log.3 log1pf.3 \
-	log.3 log2.3 \
-	log.3 log2f.3
-MLINKS+=pow.3 powf.3
-MLINKS+=fabs.3 fabsf.3
-MLINKS+=finite.3 finitef.3
-MLINKS+=fmod.3 fmodf.3 \
-	fmod.3 fmodl.3
-MLINKS+=hypot.3 hypotf.3
-MLINKS+=ieee_test.3 logb.3 ieee_test.3 logbf.3 ieee_test.3 logbl.3
-MLINKS+=ieee_test.3 scalb.3 ieee_test.3 scalbf.3
-MLINKS+=ieee_test.3 significand.3 ieee_test.3 significandf.3
-MLINKS+=ilogb.3 ilogbf.3 ilogb.3 ilogbl.3
-MLINKS+=isinff.3 isnanf.3
-MLINKS+=j0.3 j0f.3 j0.3 j1.3 j0.3 j1f.3 j0.3 jn.3 j0.3 jnf.3 \
-	j0.3 y0.3 j0.3 y0f.3 j0.3 y1.3 j0.3 y1f.3 j0.3 yn.3 j0.3 ynf.3
-MLINKS+=lgamma.3 lgammaf.3 lgamma.3 lgamma_r.3 lgamma.3 lgammaf_r.3 \
-	lgamma.3 gamma.3 lgamma.3 gammaf.3 lgamma.3 gamma_r.3 \
-	lgamma.3 gammaf_r.3 lgamma.3 tgamma.3 lgamma.3 tgammaf.3
-MLINKS+=modf.3 modff.3 \
-	modf.3 modfl.3
-MLINKS+=nextafter.3 nextafterf.3 \
-	nextafter.3 nextafterl.3 \
-	nextafter.3 nexttoward.3 \
-	nextafter.3 nexttowardf.3
-MLINKS+=lrint.3 lrintf.3 lrint.3 llrint.3 lrint.3 llrintf.3
-MLINKS+=remainder.3 remainderf.3 \
-	remainder.3 remquo.3 \
-	remainder.3 remquof.3
-MLINKS+=rint.3 rintf.3 \
-	rint.3 rintl.3 \
-	rint.3 nearbyint.3 \
-	rint.3 nearbyintf.3 \
-	rint.3 nearbyintl.3
-MLINKS+=scalbn.3 scalbnf.3 \
-	scalbn.3 scalbnl.3
-MLINKS+=sin.3 sinf.3
-MLINKS+=sin.3 sinhf.3
-MLINKS+=sqrt.3 sqrtf.3 sqrt.3 sqrtl.3 \
-	sqrt.3 cbrt.3 sqrt.3 cbrtf.3 sqrt.3 cbrtl.3
-MLINKS+=tan.3 tanf.3
-MLINKS+=tanh.3 tanhf.3
-MLINKS+=round.3 roundf.3 \
-	round.3 roundl.3
-MLINKS+=trunc.3 truncf.3 \
-	trunc.3 truncl.3
-MLINKS+=fmax.3 fmaxl.3
-MLINKS+=fmax.3 fmaxf.3
-MLINKS+=fmax.3 fmin.3
-MLINKS+=fmax.3 fminl.3
-MLINKS+=fmax.3 fminf.3
-MLINKS+=fdim.3 fdiml.3
-MLINKS+=fdim.3 fdimf.3
-
-.if (${MKCOMPLEX} != "no")
-.include "${.CURDIR}/complex/Makefile.inc"
-.endif
-
-COPTS.compat_cabs.c+=	${${ACTIVE_CC} == "clang":? -Wno-incompatible-library-redeclaration :}
-COPTS.compat_cabsf.c+=	${${ACTIVE_CC} == "clang":? -Wno-incompatible-library-redeclaration :}
-
-.include "${.CURDIR}/compiler_rt/Makefile.inc"
-.include "${.CURDIR}/gen/Makefile.inc"
-
-.include <bsd.lib.mk>
-.include <bsd.subdir.mk>
diff --git a/lib/libm/arch/aarch64/e_sqrt.S b/lib/libm/arch/aarch64/e_sqrt.S
deleted file mode 100644
index 028b4c1e9..000000000
--- a/lib/libm/arch/aarch64/e_sqrt.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $NetBSD: e_sqrt.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <aarch64/asm.h>
-
-RCSID("$NetBSD: e_sqrt.S,v 1.1 2014/08/10 05:47:37 matt Exp $")
-
-ENTRY(__ieee754_sqrt)
-	fsqrt	d0, d0
-	ret
-END(__ieee754_sqrt)
diff --git a/lib/libm/arch/aarch64/e_sqrtf.S b/lib/libm/arch/aarch64/e_sqrtf.S
deleted file mode 100644
index 3cde314c1..000000000
--- a/lib/libm/arch/aarch64/e_sqrtf.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $NetBSD: e_sqrtf.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: e_sqrtf.S,v 1.1 2014/08/10 05:47:37 matt Exp $")
-
-ENTRY(__ieee754_sqrtf)
-	fsqrt	s0, s0
-	ret
-END(__ieee754_sqrtf)
diff --git a/lib/libm/arch/aarch64/fenv.c b/lib/libm/arch/aarch64/fenv.c
deleted file mode 100644
index af9faa064..000000000
--- a/lib/libm/arch/aarch64/fenv.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/* $NetBSD: fenv.c,v 1.2 2014/12/27 17:52:45 martin Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: fenv.c,v 1.2 2014/12/27 17:52:45 martin Exp $");
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <fenv.h>
-#include <string.h>
-#include <unistd.h>
-#include <inttypes.h>
-
-#include <aarch64/armreg.h>
-
-const fenv_t __fe_dfl_env = {
-	.__fpsr = 0,
-	.__fpcr = FPCR_FZ|FPCR_DN|FPCR_RN,
-};
-
-/*
- * The feclearexcept() function shall attempt to clear the supported
- * floating-point exceptions represented by excepts.
- */
-int
-feclearexcept(int excepts)
-{
-#ifndef lint
-	_DIAGASSERT((except & ~FE_ALL_EXCEPT) == 0);
-#endif
-	unsigned int tmp = reg_fpsr_read() & ~__SHIFTIN(excepts, FPSR_CSUM);
-	reg_fpsr_write(tmp);
-	return 0;
-}
-
-/*
- * The fegetexceptflag() function shall attempt to store an
- * implementation-defined representation of the states of the floating-point
- * status flags indicated by the argument excepts in the object pointed to by
- * the argument flagp.
- */
-int
-fegetexceptflag(fexcept_t *flagp, int excepts)
-{
-	_DIAGASSERT((except & ~FE_ALL_EXCEPT) == 0);
-	*flagp = __SHIFTOUT(reg_fpsr_read(), FPSR_CSUM) & excepts;
-	return 0;
-}
-
-/*
- * The feraiseexcept() function shall attempt to raise the supported
- * floating-point exceptions represented by the argument excepts. The order
- * in which these floating-point exceptions are raised is unspecified. 
- */
-int
-feraiseexcept(int excepts)
-{
-#ifndef lint
-	_DIAGASSERT((except & ~FE_ALL_EXCEPT) == 0);
-#endif
-#ifdef __SOFTFP__
-	excepts &= fpgetsticky();
-
-	if (excepts) {
-		siginfo_t info;
-		memset(&info, 0, sizeof info);
-		info.si_signo = SIGFPE;
-		info.si_pid = getpid();
-		info.si_uid = geteuid();
-		if (excepts & FE_UNDERFLOW)
-			info.si_code = FPE_FLTUND;
-		else if (excepts & FE_OVERFLOW)
-			info.si_code = FPE_FLTOVF;
-		else if (excepts & FE_DIVBYZERO)
-			info.si_code = FPE_FLTDIV;
-		else if (excepts & FE_INVALID)
-			info.si_code = FPE_FLTINV;
-		else if (excepts & FE_INEXACT)
-			info.si_code = FPE_FLTRES;
-		sigqueueinfo(getpid(), &info);
-	}
-#else
-	unsigned int fpsr = reg_fpsr_read();
-	fpsr = (fpsr & ~FPSR_CSUM) | __SHIFTIN(excepts, FPSR_CSUM);
-	reg_fpsr_write(fpsr);
-	unsigned int fpcr = reg_fpcr_read();
-	fpcr = (fpcr & ~FPCR_ESUM) | __SHIFTIN(excepts, FPCR_ESUM);
-	reg_fpcr_write(fpcr);
-#endif
-	return 0;
-}
-
-/*
- * The fesetexceptflag() function shall attempt to set the floating-point
- * status flags indicated by the argument excepts to the states stored in the
- * object pointed to by flagp. The value pointed to by flagp shall have been
- * set by a previous call to fegetexceptflag() whose second argument
- * represented at least those floating-point exceptions represented by the
- * argument excepts. This function does not raise floating-point exceptions,
- * but only sets the state of the flags.
- */
-int
-fesetexceptflag(const fexcept_t *flagp, int excepts)
-{
-#ifndef lint
-	_DIAGASSERT((except & ~FE_ALL_EXCEPT) == 0);
-#endif
-	unsigned int fpsr = reg_fpsr_read();
-	fpsr &= ~__SHIFTIN(excepts, FPSR_CSUM);
-	fpsr |= __SHIFTIN((*flagp & excepts), FPSR_CSUM);
-	reg_fpsr_write(fpsr);
-	return 0;
-}
-
-/*
- * The fetestexcept() function shall determine which of a specified subset of
- * the floating-point exception flags are currently set. The excepts argument
- * specifies the floating-point status flags to be queried.
- */
-int
-fetestexcept(int excepts)
-{
-	_DIAGASSERT((except & ~FE_ALL_EXCEPT) == 0);
-	return __SHIFTOUT(reg_fpsr_read(), FPSR_CSUM) & excepts;
-}
-
-/*
- * The fegetround() function shall get the current rounding direction.
- */
-int
-fegetround(void)
-{
-	return __SHIFTOUT(reg_fpcr_read(), FPCR_RMODE);
-}
-
-/*
- * The fesetround() function shall establish the rounding direction represented
- * by its argument round. If the argument is not equal to the value of a
- * rounding direction macro, the rounding direction is not changed.
- */
-int
-fesetround(int round)
-{
-#ifndef lint
-	_DIAGASSERT(!(round & ~__SHIFTOUT(FPCR_RMODE, FPCR_RMODE)));
-#endif
-	unsigned int fpcr = reg_fpcr_read() & ~FPCR_RMODE;
-	fpcr |= __SHIFTIN(round, FPCR_RMODE);
-	reg_fpcr_write(fpcr);
-	return 0;
-}
-
-/*
- * The fegetenv() function shall attempt to store the current floating-point
- * environment in the object pointed to by envp.
- */
-int
-fegetenv(fenv_t *envp)
-{
-	envp->__fpcr = reg_fpcr_read();
-	envp->__fpsr = reg_fpsr_read();
-	return 0;
-}
-
-/*
- * The feholdexcept() function shall save the current floating-point
- * environment in the object pointed to by envp, clear the floating-point
- * status flags, and then install a non-stop (continue on floating-point
- * exceptions) mode, if available, for all floating-point exceptions.
- */
-int
-feholdexcept(fenv_t *envp)
-{
-	envp->__fpsr = reg_fpsr_read();
-	envp->__fpcr = reg_fpcr_read();
-	reg_fpsr_write(envp->__fpsr & ~FPSR_CSUM);
-	reg_fpcr_write(envp->__fpcr & ~FPCR_ESUM);
-	return 0;
-}
-
-/*
- * The fesetenv() function shall attempt to establish the floating-point
- * environment represented by the object pointed to by envp. The fesetenv()
- * function does not raise floating-point exceptions, but only installs the
- * state of the floating-point status flags represented through its argument.
- */
-int
-fesetenv(const fenv_t *envp)
-{
-	reg_fpsr_write(envp->__fpsr);
-	return 0;
-}
-
-/*
- * The feupdateenv() function shall attempt to save the currently raised
- * floating-point exceptions in its automatic storage, attempt to install the
- * floating-point environment represented by the object pointed to by envp,
- * and then attempt to raise the saved floating-point exceptions. 
- */
-int
-feupdateenv(const fenv_t *envp)
-{
-#ifndef lint
-	_DIAGASSERT(envp != NULL);
-#endif
-	reg_fpsr_write(envp->__fpsr);
-	reg_fpcr_write(envp->__fpcr);
-
-	/* Success */
-	return 0;
-}
-
-int
-feenableexcept(int excepts)
-{
-	const uint32_t __fpcr = reg_fpcr_read();
-	reg_fpcr_write((__fpcr & ~FPCR_ESUM) | __SHIFTIN(excepts, FPCR_ESUM));
-	return __SHIFTOUT(__fpcr, FPCR_ESUM);
-}
-
-int
-fedisableexcept(int excepts)
-{
-	const uint32_t __fpcr = reg_fpcr_read();
-	reg_fpcr_write(__fpcr & ~__SHIFTIN(excepts, FPCR_ESUM));
-	return __SHIFTOUT(__fpcr, FPCR_ESUM);
-}
-
-int
-fegetexcept(void)
-{
-	const uint32_t __fpcr = reg_fpcr_read();
-	return __SHIFTOUT(__fpcr, FPCR_ESUM);
-}
diff --git a/lib/libm/arch/aarch64/s_fabsf.S b/lib/libm/arch/aarch64/s_fabsf.S
deleted file mode 100644
index 9af7d7eeb..000000000
--- a/lib/libm/arch/aarch64/s_fabsf.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $NetBSD: s_fabsf.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_fabsf.S,v 1.1 2014/08/10 05:47:37 matt Exp $")
-
-ENTRY(fabsf)
-	fabs	s0, s0
-	ret
-END(fabsf)
diff --git a/lib/libm/arch/aarch64/s_fma.S b/lib/libm/arch/aarch64/s_fma.S
deleted file mode 100644
index 10cce5e0e..000000000
--- a/lib/libm/arch/aarch64/s_fma.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: s_fma.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_fma.S,v 1.1 2014/08/10 05:47:37 matt Exp $")
-
-WEAK_ALIAS(fma, _fma)
-
-ENTRY(_fma)
-	fmadd	d0, d0, d1, d2
-	ret
-END(_fma)
diff --git a/lib/libm/arch/aarch64/s_fmaf.S b/lib/libm/arch/aarch64/s_fmaf.S
deleted file mode 100644
index 6a2c31378..000000000
--- a/lib/libm/arch/aarch64/s_fmaf.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: s_fmaf.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_fmaf.S,v 1.1 2014/08/10 05:47:37 matt Exp $")
-
-WEAK_ALIAS(fmaf, _fmaf)
-
-ENTRY(_fmaf)
-	fmadd	s0, s0, s1, s2
-	ret
-END(_fmaf)
diff --git a/lib/libm/arch/aarch64/s_fmax.S b/lib/libm/arch/aarch64/s_fmax.S
deleted file mode 100644
index 0dd6fa95e..000000000
--- a/lib/libm/arch/aarch64/s_fmax.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: s_fmax.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_fmax.S,v 1.1 2014/08/10 05:47:37 matt Exp $")
-
-WEAK_ALIAS(fmax, _fmax)
-
-ENTRY(_fmax)
-	fmax	d0, d0, d1
-	ret
-END(_fmax)
diff --git a/lib/libm/arch/aarch64/s_fmaxf.S b/lib/libm/arch/aarch64/s_fmaxf.S
deleted file mode 100644
index 57bdbba64..000000000
--- a/lib/libm/arch/aarch64/s_fmaxf.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: s_fmaxf.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_fmaxf.S,v 1.1 2014/08/10 05:47:37 matt Exp $")
-
-WEAK_ALIAS(fmaxf, _fmaxf)
-
-ENTRY(_fmaxf)
-	fmax	s0, s0, s1
-	ret
-END(_fmaxf)
diff --git a/lib/libm/arch/aarch64/s_fmin.S b/lib/libm/arch/aarch64/s_fmin.S
deleted file mode 100644
index 2f8661e05..000000000
--- a/lib/libm/arch/aarch64/s_fmin.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: s_fmin.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_fmin.S,v 1.1 2014/08/10 05:47:37 matt Exp $")
-
-WEAK_ALIAS(fmin, _fmin)
-
-ENTRY(_fmin)
-	fmin	d0, d0, d1
-	ret
-END(_fmin)
diff --git a/lib/libm/arch/aarch64/s_fminf.S b/lib/libm/arch/aarch64/s_fminf.S
deleted file mode 100644
index 7048161dc..000000000
--- a/lib/libm/arch/aarch64/s_fminf.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: s_fminf.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_fminf.S,v 1.1 2014/08/10 05:47:37 matt Exp $")
-
-WEAK_ALIAS(fminf, _fminf)
-
-ENTRY(_fminf)
-	fmin	s0, s0, s1
-	ret
-END(_fminf)
diff --git a/lib/libm/arch/alpha/lrint.S b/lib/libm/arch/alpha/lrint.S
deleted file mode 100644
index 2ab062e86..000000000
--- a/lib/libm/arch/alpha/lrint.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: lrint.S,v 1.3 2004/10/13 15:18:31 drochner Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-LEAF(lrint, 1)
-	cvttq fa0,ft0
-#if 0
-	ftoit ft0,v0
-#else
-	lda sp,-8(sp)
-	stt ft0,0(sp)
-	ldq v0,0(sp)
-	lda sp,8(sp)
-#endif
-	ret
-END(lrint)
diff --git a/lib/libm/arch/alpha/s_copysign.S b/lib/libm/arch/alpha/s_copysign.S
deleted file mode 100644
index 140349d3f..000000000
--- a/lib/libm/arch/alpha/s_copysign.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*	$NetBSD: s_copysign.S,v 1.7 2014/11/15 21:07:01 joerg Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-
-STRONG_ALIAS(_copysignl, copysign)
-WEAK_ALIAS(copysignl, _copysignl)
-
-LEAF(copysign, 2)
-	cpys	fa1, fa0, fv0
-	RET
-END(copysign)
diff --git a/lib/libm/arch/alpha/s_copysignf.S b/lib/libm/arch/alpha/s_copysignf.S
deleted file mode 100644
index 9ba8f58d7..000000000
--- a/lib/libm/arch/alpha/s_copysignf.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: s_copysignf.S,v 1.4 2008/04/28 20:23:01 martin Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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>
-
-LEAF(copysignf, 2)
-	cpys	fa1, fa0, fv0
-	RET
-END(copysignf)
diff --git a/lib/libm/arch/arm/e_sqrt.S b/lib/libm/arch/arm/e_sqrt.S
deleted file mode 100644
index 7b28372a7..000000000
--- a/lib/libm/arch/arm/e_sqrt.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-
-RCSID("$NetBSD: e_sqrt.S,v 1.1 2013/02/03 07:13:07 matt Exp $")
-
-	.fpu	vfp
-
-ENTRY(__ieee754_sqrt)
-	vsqrt.f64	d0, d0
-	RET
-END(__ieee754_sqrt)
diff --git a/lib/libm/arch/arm/e_sqrtf.S b/lib/libm/arch/arm/e_sqrtf.S
deleted file mode 100644
index 21fba1cae..000000000
--- a/lib/libm/arch/arm/e_sqrtf.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-
-RCSID("$NetBSD: e_sqrtf.S,v 1.1 2013/02/03 07:13:07 matt Exp $")
-
-	.fpu	vfp
-
-ENTRY(__ieee754_sqrtf)
-	vsqrt.f32	s0, s0
-	RET
-END(__ieee754_sqrtf)
diff --git a/lib/libm/arch/arm/fenv.c b/lib/libm/arch/arm/fenv.c
deleted file mode 100644
index bf4260554..000000000
--- a/lib/libm/arch/arm/fenv.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: fenv.c,v 1.6 2014/12/29 19:11:13 martin Exp $");
-
-#include <sys/types.h>
-#include <assert.h>
-#include <fenv.h>
-#include <string.h>
-#include <unistd.h>
-#include <inttypes.h>
-
-#ifdef __SOFTFP__
-#include <ieeefp.h>
-#include <sys/signal.h>
-#include <sys/siginfo.h>
-#else
-#include <arm/armreg.h>
-#endif
-
-#include <arm/vfpreg.h>
-
-const fenv_t __fe_dfl_env = VFP_FPSCR_FZ|VFP_FPSCR_DN|VFP_FPSCR_RN;
-
-/*
- * The feclearexcept() function shall attempt to clear the supported
- * floating-point exceptions represented by excepts.
- */
-int
-feclearexcept(int excepts)
-{
-#ifndef lint
-	_DIAGASSERT((except & ~FE_ALL_EXCEPT) == 0);
-#endif
-#ifdef __SOFTFP__
-	fpsetsticky(fpgetsticky() & ~excepts);
-	return 0;
-#else
-	int tmp = armreg_fpscr_read() & ~__SHIFTIN(excepts, VFP_FPSCR_CSUM);
-	armreg_fpscr_write(tmp);
-	return 0;
-#endif
-}
-
-/*
- * The fegetexceptflag() function shall attempt to store an
- * implementation-defined representation of the states of the floating-point
- * status flags indicated by the argument excepts in the object pointed to by
- * the argument flagp.
- */
-int
-fegetexceptflag(fexcept_t *flagp, int excepts)
-{
-	_DIAGASSERT((except & ~FE_ALL_EXCEPT) == 0);
-#ifdef __SOFTFP__
-	*flagp = fpgetsticky() & excepts;
-#else
-	*flagp = __SHIFTOUT(armreg_fpscr_read(), VFP_FPSCR_CSUM) & excepts;
-#endif
-	return 0;
-}
-
-/*
- * The feraiseexcept() function shall attempt to raise the supported
- * floating-point exceptions represented by the argument excepts. The order
- * in which these floating-point exceptions are raised is unspecified. 
- */
-int
-feraiseexcept(int excepts)
-{
-#ifndef lint
-	_DIAGASSERT((except & ~FE_ALL_EXCEPT) == 0);
-#endif
-#if !defined(__minix) /* LSC: No sigqueueinfo on Minix. */
-#ifdef __SOFTFP__
-	excepts &= fpgetsticky();
-
-	if (excepts) {
-		siginfo_t info;
-		memset(&info, 0, sizeof info);
-		info.si_signo = SIGFPE;
-		info.si_pid = getpid();
-		info.si_uid = geteuid();
-		if (excepts & FE_UNDERFLOW)
-			info.si_code = FPE_FLTUND;
-		else if (excepts & FE_OVERFLOW)
-			info.si_code = FPE_FLTOVF;
-		else if (excepts & FE_DIVBYZERO)
-			info.si_code = FPE_FLTDIV;
-		else if (excepts & FE_INVALID)
-			info.si_code = FPE_FLTINV;
-		else if (excepts & FE_INEXACT)
-			info.si_code = FPE_FLTRES;
-		sigqueueinfo(getpid(), &info);
-	}
-#else
-	int fpscr = armreg_fpscr_read();
-	fpscr = (fpscr & ~VFP_FPSCR_ESUM) | __SHIFTIN(excepts, VFP_FPSCR_ESUM);
-	armreg_fpscr_write(fpscr);
-#endif
-#endif /* !defined(__minix) */
-	return 0;
-}
-
-/*
- * The fesetexceptflag() function shall attempt to set the floating-point
- * status flags indicated by the argument excepts to the states stored in the
- * object pointed to by flagp. The value pointed to by flagp shall have been
- * set by a previous call to fegetexceptflag() whose second argument
- * represented at least those floating-point exceptions represented by the
- * argument excepts. This function does not raise floating-point exceptions,
- * but only sets the state of the flags.
- */
-int
-fesetexceptflag(const fexcept_t *flagp, int excepts)
-{
-#ifndef lint
-	_DIAGASSERT((except & ~FE_ALL_EXCEPT) == 0);
-#endif
-#ifdef __SOFTFP__
-	fpsetsticky((fpgetsticky() & ~excepts) | (excepts & *flagp));
-#else
-	int fpscr = armreg_fpscr_read();
-	fpscr &= ~__SHIFTIN(excepts, VFP_FPSCR_CSUM);
-	fpscr |= __SHIFTIN((*flagp & excepts), VFP_FPSCR_CSUM);
-	armreg_fpscr_write(fpscr);
-#endif
-	return 0;
-}
-
-int
-feenableexcept(int excepts)
-{
-#ifndef lint
-	_DIAGASSERT((except & ~FE_ALL_EXCEPT) == 0);
-#endif
-#ifdef __SOFTFP__
-	int old = fpgetmask();
-	fpsetmask(old | excepts);
-	return old;
-#else
-	int fpscr = armreg_fpscr_read();
-	armreg_fpscr_write(fpscr | __SHIFTIN((excepts), VFP_FPSCR_ESUM));
-	return __SHIFTOUT(fpscr, VFP_FPSCR_ESUM) & FE_ALL_EXCEPT;
-#endif
-}
-
-int
-fedisableexcept(int excepts)
-{
-#ifndef lint
-	_DIAGASSERT((except & ~FE_ALL_EXCEPT) == 0);
-#endif
-#ifdef __SOFTFP__
-	int old = fpgetmask();
-	fpsetmask(old & ~excepts);
-	return old;
-#else
-	int fpscr = armreg_fpscr_read();
-	armreg_fpscr_write(fpscr & ~__SHIFTIN((excepts), VFP_FPSCR_ESUM));
-	return __SHIFTOUT(fpscr, VFP_FPSCR_ESUM) & FE_ALL_EXCEPT;
-#endif
-}
-
-/*
- * The fetestexcept() function shall determine which of a specified subset of
- * the floating-point exception flags are currently set. The excepts argument
- * specifies the floating-point status flags to be queried.
- */
-int
-fetestexcept(int excepts)
-{
-	_DIAGASSERT((except & ~FE_ALL_EXCEPT) == 0);
-#ifdef __SOFTFP__
-	return fpgetsticky() & excepts;
-#else
-	return __SHIFTOUT(armreg_fpscr_read(), VFP_FPSCR_CSUM) & excepts;
-#endif
-}
-
-int     
-fegetexcept(void)
-{
-#ifdef __SOFTFP__
-	return fpgetmask();
-#else
-	return __SHIFTOUT(armreg_fpscr_read(), VFP_FPSCR_ESUM);
-#endif
-}
-
-/*
- * The fegetround() function shall get the current rounding direction.
- */
-int
-fegetround(void)
-{
-#ifdef __SOFTFP__
-	return fpgetround();
-#else
-	return __SHIFTOUT(armreg_fpscr_read(), VFP_FPSCR_RMODE);
-#endif
-}
-
-/*
- * The fesetround() function shall establish the rounding direction represented
- * by its argument round. If the argument is not equal to the value of a
- * rounding direction macro, the rounding direction is not changed.
- */
-int
-fesetround(int round)
-{
-#ifndef lint
-	_DIAGASSERT(!(round & ~__SHIFTOUT(VFP_FPSCR_RMODE, VFP_FPSCR_RMODE)));
-#endif
-#ifdef __SOFTFP__
-	(void)fpsetround(round);
-#else
-	int fpscr = armreg_fpscr_read() & ~VFP_FPSCR_RMODE;
-	fpscr |= __SHIFTIN(round, VFP_FPSCR_RMODE);
-	armreg_fpscr_write(fpscr);
-#endif
-	return 0;
-}
-
-/*
- * The fegetenv() function shall attempt to store the current floating-point
- * environment in the object pointed to by envp.
- */
-int
-fegetenv(fenv_t *envp)
-{
-#ifdef __SOFTFP__
-	*envp = __SHIFTIN(fpgetround(), VFP_FPSCR_RMODE)
-	    | __SHIFTIN(fpgetmask(), VFP_FPSCR_ESUM)
-	    | __SHIFTIN(fpgetsticky(), VFP_FPSCR_CSUM);
-#else
-	*envp = armreg_fpscr_read();
-#endif
-	return 0;
-}
-
-/*
- * The feholdexcept() function shall save the current floating-point
- * environment in the object pointed to by envp, clear the floating-point
- * status flags, and then install a non-stop (continue on floating-point
- * exceptions) mode, if available, for all floating-point exceptions.
- */
-int
-feholdexcept(fenv_t *envp)
-{
-#ifdef __SOFTFP__
-	*envp = __SHIFTIN(fpgetround(), VFP_FPSCR_RMODE)
-	    | __SHIFTIN(fpgetmask(), VFP_FPSCR_ESUM)
-	    | __SHIFTIN(fpgetsticky(), VFP_FPSCR_CSUM);
-	fpsetmask(0);
-	fpsetsticky(0);
-#else
-	*envp = armreg_fpscr_read();
-	armreg_fpscr_write((*envp) & ~(VFP_FPSCR_ESUM|VFP_FPSCR_CSUM));
-#endif
-	return 0;
-}
-
-/*
- * The fesetenv() function shall attempt to establish the floating-point
- * environment represented by the object pointed to by envp. The fesetenv()
- * function does not raise floating-point exceptions, but only installs the
- * state of the floating-point status flags represented through its argument.
- */
-int
-fesetenv(const fenv_t *envp)
-{
-#ifdef __SOFTFP__
-	(void)fpsetround(__SHIFTIN(*envp, VFP_FPSCR_RMODE));
-	(void)fpsetmask(__SHIFTOUT(*envp, VFP_FPSCR_ESUM));
-	(void)fpsetsticky(__SHIFTOUT(*envp, VFP_FPSCR_CSUM));
-#else
-	armreg_fpscr_write(*envp);
-#endif
-	return 0;
-}
-
-/*
- * The feupdateenv() function shall attempt to save the currently raised
- * floating-point exceptions in its automatic storage, attempt to install the
- * floating-point environment represented by the object pointed to by envp,
- * and then attempt to raise the saved floating-point exceptions. 
- */
-int
-feupdateenv(const fenv_t *envp)
-{
-#ifndef lint
-	_DIAGASSERT(envp != NULL);
-#endif
-#ifdef __SOFTFP__
-	(void)fpsetround(__SHIFTIN(*envp, VFP_FPSCR_RMODE));
-	(void)fpsetmask(fpgetmask() | __SHIFTOUT(*envp, VFP_FPSCR_ESUM));
-	(void)fpsetsticky(fpgetsticky() | __SHIFTOUT(*envp, VFP_FPSCR_CSUM));
-#else
-	int fpscr = armreg_fpscr_read() & ~(VFP_FPSCR_ESUM|VFP_FPSCR_CSUM);
-	fpscr |= *envp;
-	armreg_fpscr_write(fpscr);
-#endif
-
-	/* Success */
-	return 0;
-}
diff --git a/lib/libm/arch/arm/lrint.S b/lib/libm/arch/arm/lrint.S
deleted file mode 100644
index 54d873cd7..000000000
--- a/lib/libm/arch/arm/lrint.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-
-RCSID("$NetBSD: lrint.S,v 1.1 2013/02/11 12:43:03 matt Exp $")
-
-STRONG_ALIAS(_lrintl, _lrint)
-WEAK_ALIAS(lrintl, _lrintl)
-WEAK_ALIAS(lrint, _lrint)
-
-ENTRY(_lrint)
-	vcvt.s32.f64	s0, d0
-	vmov		r0, s0
-	RET
-END(_lrint)
diff --git a/lib/libm/arch/arm/lrintf.S b/lib/libm/arch/arm/lrintf.S
deleted file mode 100644
index 620bd8903..000000000
--- a/lib/libm/arch/arm/lrintf.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-
-RCSID("$NetBSD: lrintf.S,v 1.1 2013/02/11 12:43:03 matt Exp $")
-
-WEAK_ALIAS(lrintf, _lrintf)
-
-ENTRY(_lrintf)
-	vcvt.s32.f32	s0, s0
-	vmov		r0, s0
-	RET
-END(_lrintf)
diff --git a/lib/libm/arch/arm/s_fabsf.S b/lib/libm/arch/arm/s_fabsf.S
deleted file mode 100644
index e8c9a8c70..000000000
--- a/lib/libm/arch/arm/s_fabsf.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-
-RCSID("$NetBSD: s_fabsf.S,v 1.2 2013/02/14 09:27:26 matt Exp $")
-
-ENTRY(fabsf)
-	vabs.f32	s0, s0
-	RET
-END(fabsf)
diff --git a/lib/libm/arch/arm/s_fma.S b/lib/libm/arch/arm/s_fma.S
deleted file mode 100644
index 07674efa4..000000000
--- a/lib/libm/arch/arm/s_fma.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-
-RCSID("$NetBSD: s_fma.S,v 1.1 2013/02/11 17:41:13 matt Exp $")
-
-STRONG_ALIAS(_fmal, _fma)
-WEAK_ALIAS(fmal, _fmal)
-WEAK_ALIAS(fma, _fma)
-
-ENTRY(_fma)
-	vmla.f64	d2, d0, d1
-	vmov.f64	d0, d2
-	RET
-END(_fma)
diff --git a/lib/libm/arch/arm/s_fmaf.S b/lib/libm/arch/arm/s_fmaf.S
deleted file mode 100644
index a7668910a..000000000
--- a/lib/libm/arch/arm/s_fmaf.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <arm/asm.h>
-
-RCSID("$NetBSD: s_fmaf.S,v 1.1 2013/02/11 17:41:13 matt Exp $")
-
-WEAK_ALIAS(fmaf, _fmaf)
-
-ENTRY(_fmaf)
-	vmla.f32	s2, s0, s1
-	vmov.f32	s0, s2
-	RET
-END(_fmaf)
diff --git a/lib/libm/arch/hppa/fenv.c b/lib/libm/arch/hppa/fenv.c
deleted file mode 100644
index 59ecddf3a..000000000
--- a/lib/libm/arch/hppa/fenv.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/*	$NetBSD: fenv.c,v 1.2 2015/01/13 11:16:06 martin Exp $	*/
-
-/*-
- * 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
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: fenv.c,v 1.2 2015/01/13 11:16:06 martin Exp $");
-
-#include <assert.h>
-#include <fenv.h>
-
-/*
- * Convert from exception flags (__BITS(27,32)) to exception enable bits
- * (__BITS(5,0)) by right-shifting this much:
- */
-#define	FE_FLAGS_SHIFT		27
-
-/*
- * Mask all rounding mode bits
- */
-#define FE_ROUND_MASK	(FE_TONEAREST | FE_DOWNWARD | \
-			FE_UPWARD | FE_TOWARDZERO)
-
-/* Load lower 32 bits from floating-point state register */
-static inline uint32_t
-readfpsr(void)
-{
-	uint32_t rv;
-
-	__asm__	__volatile__ ("fstws	%%fr0, %0" : "=m"(rv));
-	return rv;
-}
-
-/* Save floating-point state register */
-static inline void
-writefpsr(uint32_t val)
-{
-	__asm__	__volatile__("fldws	%0,%%fr0" : : "m"(val));
-}
-
-/*
- * The feclearexcept() function clears the supported floating-point exceptions
- * represented by `excepts'.
- */
-int
-feclearexcept(int excepts)
-{
-	fexcept_t r;
-	int ex;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = (excepts & FE_ALL_EXCEPT) << FE_FLAGS_SHIFT;
-
-	r = readfpsr();
-	r &= ~ex;
-	writefpsr(r);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The fegetexceptflag() function stores an implementation-defined
- * representation of the states of the floating-point status flags indicated
- * by the argument excepts in the object pointed to by the argument flagp.
- */
-int
-fegetexceptflag(fexcept_t *flagp, int excepts)
-{
-	fexcept_t r;
-	int ex;
-
-	_DIAGASSERT(flagp != NULL);
-	_DIAGASSERT((excepts & ~_FE_ALL_EXCEPT) == 0);
-
-	ex = (excepts & FE_ALL_EXCEPT) << FE_FLAGS_SHIFT;
-
-	r = readfpsr();
-	*flagp = (r & ex) >> FE_FLAGS_SHIFT;
-
-	/* Success */
-	return 0;
-}
-
-
-/*
- * This function sets the floating-point status flags indicated by the argument
- * `excepts' to the states stored in the object pointed to by `flagp'. It does
- * NOT raise any floating-point exceptions, but only sets the state of the flags.
- */
-int
-fesetexceptflag(const fexcept_t *flagp, int excepts)
-{
-	fexcept_t r;
-	int ex;
-
-	_DIAGASSERT(flagp != NULL);
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = (excepts & FE_ALL_EXCEPT) << FE_FLAGS_SHIFT;
-
-	r = readfpsr();
-	r &= ~ex;
-	r |= (*flagp << FE_FLAGS_SHIFT) & ex;
-	writefpsr(r);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The feraiseexcept() function raises the supported floating-point exceptions
- * represented by the argument `excepts'.
- *
- * The order in which these floating-point exceptions are raised is unspecified
- * (by the standard).
- */
-int
-feraiseexcept(int excepts)
-{
-	volatile double d;
-	int ex;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	/*
-	 * 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 (ex & FE_INVALID) {
-		d = 0.0;
-		d = 0.0 / d;
-	}
-	if (ex & FE_DIVBYZERO) {
-		d = 0.0;
-		d = 1.0 / d;
-	}
-	if (ex & FE_OVERFLOW) {
-		d = 0x1.ffp1023;
-		d *= 2.0;
-	}
-	if (ex & FE_UNDERFLOW) {
-		d = 0x1p-1022;
-		d /= 0x1p1023;
-	}
-	if (ex & FE_INEXACT) {
-		d = 0x1p-1022;
-		d += 1.0;
-	}
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The fetestexcept() function determines which of a specified subset of the
- * floating-point exception flags are currently set. The `excepts' argument
- * specifies the floating-point status flags to be queried.
- */
-int
-fetestexcept(int excepts)
-{
-	fexcept_t r;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	r = readfpsr();
-
-	return (r >> FE_FLAGS_SHIFT) & (excepts & FE_ALL_EXCEPT);
-}
-
-/*
- * The fegetround() function gets the current rounding direction.
- */
-int
-fegetround(void)
-{
-	fenv_t r;
-
-	r = readfpsr();
-
-	return r & FE_ROUND_MASK;
-}
-
-/*
- * The fesetround() function establishes the rounding direction represented by
- * its argument `round'. If the argument is not equal to the value of a rounding
- * direction macro, the rounding direction is not changed.
- */
-int
-fesetround(int round)
-{
-	fenv_t r;
-
-	_DIAGASSERT((round & ~FE_ROUND_MASK) == 0);
-	if (round & ~FE_ROUND_MASK)
-		return -1;
-
-	r = readfpsr();
-	r &= ~FE_ROUND_MASK;
-	r |= round;
-	writefpsr(r);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The fegetenv() function attempts to store the current floating-point
- * environment in the object pointed to by envp.
- */
-int
-fegetenv(fenv_t *envp)
-{
-	_DIAGASSERT(envp != NULL);
-
-	*envp = readfpsr();
-
-	/* Success */
-	return 0;
-}
-
-
-/*
- * The feholdexcept() function saves the current floating-point environment
- * in the object pointed to by envp, clears the floating-point status flags, and
- * then installs a non-stop (continue on floating-point exceptions) mode, if
- * available, for all floating-point exceptions.
- */
-int
-feholdexcept(fenv_t *envp)
-{
-	fenv_t r;
-
-	_DIAGASSERT(envp != NULL);
-
-	r = readfpsr();
-	*envp = r;
-	r &= ~FE_ALL_EXCEPT;
-	writefpsr(r);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The fesetenv() function attempts to establish the floating-point environment
- * represented by the object pointed to by envp. The argument `envp' points
- * to an object set by a call to fegetenv() or feholdexcept(), or equal a
- * floating-point environment macro. The fesetenv() function does not raise
- * floating-point exceptions, but only installs the state of the floating-point
- * status flags represented through its argument.
- */
-int
-fesetenv(const fenv_t *envp)
-{
-	_DIAGASSERT(envp != NULL);
-
-	writefpsr(*envp);
-
-	/* Success */
-	return 0;
-}
-
-
-/*
- * The feupdateenv() function saves the currently raised floating-point
- * exceptions in its automatic storage, installs the floating-point environment
- * represented by the object pointed to by `envp', and then raises the saved
- * floating-point exceptions. The argument `envp' shall point to an object set
- * by a call to feholdexcept() or fegetenv(), or equal a floating-point
- * environment macro.
- */
-int
-feupdateenv(const fenv_t *envp)
-{
-	fexcept_t r;
-
-	_DIAGASSERT(envp != NULL);
-
-	r = readfpsr();
-	writefpsr(*envp);
-
-	_DIAGASSERT((r & ~FE_ALL_EXCEPT) == 0);
-	feraiseexcept(r & FE_ALL_EXCEPT);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The following functions are extentions to the standard
- */
-int
-feenableexcept(int mask)
-{
-	fenv_t old_r, new_r;
-
-	old_r = readfpsr();
-	new_r = old_r | (mask & FE_ALL_EXCEPT);
-	writefpsr(new_r);
-
-	return old_r & FE_ALL_EXCEPT;
-}
-
-int
-fedisableexcept(int mask)
-{
-	fenv_t old_r, new_r;
-
-	old_r = readfpsr();
-	new_r = old_r & ~(mask & FE_ALL_EXCEPT);
-	writefpsr(new_r);
-
-	return old_r & FE_ALL_EXCEPT;
-}
-
-int
-fegetexcept(void)
-{
-	fenv_t r;
-
-	r = readfpsr();
-	return r & FE_ALL_EXCEPT;
-}
diff --git a/lib/libm/arch/i387/Makefile b/lib/libm/arch/i387/Makefile
deleted file mode 100644
index f69310126..000000000
--- a/lib/libm/arch/i387/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#  $NetBSD: Makefile,v 1.11 2008/06/06 13:35:06 ad Exp $
-#
-
-USE_SHLIBDIR=	yes
-
-LIB=		m387
-
-SRCS=empty.S
-
-.include <bsd.lib.mk>
diff --git a/lib/libm/arch/i387/abi.h b/lib/libm/arch/i387/abi.h
deleted file mode 100644
index 98c688b43..000000000
--- a/lib/libm/arch/i387/abi.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*	$NetBSD: abi.h,v 1.8 2013/09/12 15:36:16 joerg Exp $	*/
-
-/*
- * Written by Frank van der Linden (fvdl@wasabisystems.com)
- */
-
-/*
- * The x86-64 ABI specifies that float and double arguments
- * are passed in SSE2 (xmm) registers. Unfortunately,
- * there is no way to push those on to the FP stack, which is
- * where the fancier instructions get their arguments from.
- *
- * Define some prologues and epilogues to store and retrieve
- * xmm regs to local variables.
- */
-
-#ifdef __x86_64__
-
-#define ARG_LONG_DOUBLE_ONE	8(%rsp)
-#define ARG_LONG_DOUBLE_TWO	24(%rsp)
-#define ARG_DOUBLE_ONE		-8(%rsp)
-#define ARG_DOUBLE_ONE_LSW	-8(%rsp)
-#define ARG_DOUBLE_ONE_MSW	-4(%rsp)
-#define ARG_DOUBLE_TWO		-16(%rsp)
-#define ARG_FLOAT_ONE		-4(%rsp)
-#define ARG_FLOAT_TWO		-8(%rsp)
-
-#define XMM_ONE_ARG_DOUBLE_PROLOGUE \
-	movsd	%xmm0, ARG_DOUBLE_ONE
-	
-#define XMM_TWO_ARG_DOUBLE_PROLOGUE \
-	movsd	%xmm0, ARG_DOUBLE_ONE ; \
-	movsd	%xmm1, ARG_DOUBLE_TWO
-
-#define XMM_ONE_ARG_FLOAT_PROLOGUE \
-	movss	%xmm0, ARG_FLOAT_ONE
-
-#define XMM_TWO_ARG_FLOAT_PROLOGUE \
-	movss	%xmm0, ARG_FLOAT_ONE ; \
-	movss	%xmm1, ARG_FLOAT_TWO
-
-#define XMM_DOUBLE_EPILOGUE \
-	fstpl ARG_DOUBLE_ONE ; \
-	movsd ARG_DOUBLE_ONE, %xmm0
-
-#define XMM_FLOAT_EPILOGUE \
-	fstps ARG_FLOAT_ONE ; \
-	movss ARG_FLOAT_ONE, %xmm0
-
-#define FLDL_VAR(x)	fldl x(%rip)
-
-#else
-
-#define ARG_LONG_DOUBLE_ONE	4(%esp)
-#define ARG_LONG_DOUBLE_TWO	16(%esp)
-#define ARG_DOUBLE_ONE		4(%esp)
-#define ARG_DOUBLE_ONE_LSW	4(%esp)
-#define ARG_DOUBLE_ONE_MSW	8(%esp)
-#define ARG_DOUBLE_TWO		12(%esp)
-#define ARG_FLOAT_ONE		4(%esp)
-#define ARG_FLOAT_TWO		8(%esp)
-
-#define XMM_ONE_ARG_DOUBLE_PROLOGUE
-#define XMM_TWO_ARG_DOUBLE_PROLOGUE
-#define XMM_ONE_ARG_FLOAT_PROLOGUE
-#define XMM_TWO_ARG_FLOAT_PROLOGUE
-
-#define XMM_DOUBLE_EPILOGUE
-#define XMM_FLOAT_EPILOGUE
-
-#ifdef __PIC__
-#define FLDL_VAR(x) \
-	PIC_PROLOGUE ; \
-	fldl PIC_GOTOFF(x) ; \
-	PIC_EPILOGUE
-#else
-#define FLDL_VAR(x) \
-	fldl x
-
-#endif
-#endif
diff --git a/lib/libm/arch/i387/e_acos.S b/lib/libm/arch/i387/e_acos.S
deleted file mode 100644
index 626021ff0..000000000
--- a/lib/libm/arch/i387/e_acos.S
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_acos.S,v 1.9 2014/03/03 08:00:50 dsl Exp $")
-
-/* acos = atan (sqrt(1 - x^2) / x) */
-ENTRY(__ieee754_acos)
-	XMM_ONE_ARG_DOUBLE_PROLOGUE
-	fldl	ARG_DOUBLE_ONE		/* x */
-	fld	%st(0)
-	fmul	%st(0)			/* x^2 */
-	fld1
-	fsubp				/* 1 - x^2 */
-	fsqrt				/* sqrt (1 - x^2) */
-	fabs				/* Change -0.0 to +0.0 */
-	fxch	%st(1)
-	fpatan
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_asin.S b/lib/libm/arch/i387/e_asin.S
deleted file mode 100644
index 43bea55a2..000000000
--- a/lib/libm/arch/i387/e_asin.S
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_asin.S,v 1.7 2003/07/26 19:24:58 salo Exp $")
-
-/* asin = atan (x / sqrt(1 - x^2)) */
-ENTRY(__ieee754_asin)
-	XMM_ONE_ARG_DOUBLE_PROLOGUE
-	fldl	ARG_DOUBLE_ONE		/* x */
-	fld	%st(0)
-	fmul	%st(0)			/* x^2 */
-	fld1
-	fsubp				/* 1 - x^2 */
-	fsqrt				/* sqrt (1 - x^2) */
-	fpatan
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_atan2.S b/lib/libm/arch/i387/e_atan2.S
deleted file mode 100644
index d6d9fa242..000000000
--- a/lib/libm/arch/i387/e_atan2.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_atan2.S,v 1.6 2003/07/26 19:24:58 salo Exp $")
-
-ENTRY(__ieee754_atan2)
-	XMM_TWO_ARG_DOUBLE_PROLOGUE
-	fldl	ARG_DOUBLE_ONE
-	fldl	ARG_DOUBLE_TWO
-	fpatan
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_atan2f.S b/lib/libm/arch/i387/e_atan2f.S
deleted file mode 100644
index 3aed18835..000000000
--- a/lib/libm/arch/i387/e_atan2f.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_atan2f.S,v 1.3 2003/07/26 19:24:58 salo Exp $")
-
-ENTRY(__ieee754_atan2f)
-	XMM_TWO_ARG_FLOAT_PROLOGUE
-	flds	ARG_FLOAT_ONE
-	flds	ARG_FLOAT_TWO
-	fpatan
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_exp.S b/lib/libm/arch/i387/e_exp.S
deleted file mode 100644
index e5692fda1..000000000
--- a/lib/libm/arch/i387/e_exp.S
+++ /dev/null
@@ -1,108 +0,0 @@
-/*	$NetBSD: e_exp.S,v 1.14 2008/06/23 10:24:13 drochner Exp $	*/
-
-/*
- * Copyright (c) 1993,94 Winning Strategies, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Winning Strategies, Inc.
- * 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.
- */
-
-/*
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_exp.S,v 1.14 2008/06/23 10:24:13 drochner Exp $")
-#if 0
-RCSID("$FreeBSD: src/lib/msun/i387/e_exp.S,v 1.8.2.1 2000/07/10 09:16:28 obrien Exp $")
-#endif
-
-/* e^x = 2^(x * log2(e)) */
-ENTRY(__ieee754_exp)
-	XMM_ONE_ARG_DOUBLE_PROLOGUE
-	/*
-	 * If x is +-Inf, then the subtraction would give Inf-Inf = NaN.
-	 * Avoid this.  Also avoid it if x is NaN for convenience.
-	 */
-	movl	ARG_DOUBLE_ONE_MSW, %eax
-	andl	$0x7fffffff, %eax
-	cmpl	$0x7ff00000, %eax
-	jae	x_Inf_or_NaN
-
-	fldl	ARG_DOUBLE_ONE
-
-	/*
-	 * Ensure that the rounding mode is to nearest (to give the smallest
-	 * possible fraction) and that the precision is as high as possible.
-	 * We may as well mask interrupts if we switch the mode.
-	 */
-#define CWSTORE_SAV ARG_DOUBLE_ONE_LSW /* XXX overwrites the argument */
-#define CWSTORE_TMP ARG_DOUBLE_ONE_MSW
-	fstcw	CWSTORE_SAV
-	movl	CWSTORE_SAV, %eax
-	andl	$0x0f00, %eax
-	cmpl	$0x0300, %eax		/* RC == 0 && PC == 3? */
-	je	1f			/* jump if mode is good */
-	movl	$0x137f, CWSTORE_TMP
-	fldcw	CWSTORE_TMP
-1:
-	fldl2e
-	fmulp				/* x * log2(e) */
-	fst	%st(1)
-	frndint				/* int(x * log2(e)) */
-	fst	%st(2)
-	fsubrp				/* fract(x * log2(e)) */
-	f2xm1				/* 2^(fract(x * log2(e))) - 1 */ 
-	fld1
-	faddp				/* 2^(fract(x * log2(e))) */
-	fscale				/* e^x */
-	fstp	%st(1)
-	je	1f
-	fldcw	CWSTORE_SAV
-1:
-	XMM_DOUBLE_EPILOGUE
-	ret
-x_Inf_or_NaN:
-	/*
-	 * Return 0 if x is -Inf.  Otherwise just return x, although the
-	 * C version would return (x + x) (Real Indefinite) if x is a NaN.
-	 */
-	cmpl	$0xfff00000, ARG_DOUBLE_ONE_MSW
-	jne	x_not_minus_Inf
-	cmpl	$0, ARG_DOUBLE_ONE_LSW
-	jne	x_not_minus_Inf
-	fldz
-	XMM_DOUBLE_EPILOGUE
-	ret
-
-x_not_minus_Inf:
-	fldl	ARG_DOUBLE_ONE
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_expf.S b/lib/libm/arch/i387/e_expf.S
deleted file mode 100644
index 540b97d89..000000000
--- a/lib/libm/arch/i387/e_expf.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-
-RCSID("$NetBSD: e_expf.S,v 1.6 2008/06/24 17:27:56 drochner Exp $")
-
-/* e^x = 2^(x * log2(e)) */
-ENTRY(__ieee754_expf)
-	XMM_ONE_ARG_FLOAT_PROLOGUE
-
-	/*
-	 * catch +/-Inf and NaN arguments
-	 */
-	movl	ARG_FLOAT_ONE,%eax
-	andl	$0x7fffffff,%eax
-	cmpl	$0x7f800000,%eax
-	jae	x_Inf_or_NaN
-
-	flds	ARG_FLOAT_ONE
-	fldl2e
-	fmulp				/* x * log2(e) */
-	fld	%st(0)
-	frndint				/* int(x * log2(e)) */
-	fsubr	%st(0),%st(1)		/* fract(x * log2(e)) */
-	fxch
-	f2xm1				/* 2^(fract(x * log2(e))) - 1 */
-	fld1
-	faddp				/* 2^(fract(x * log2(e))) */
-	fscale				/* e^x */
-	fstp	%st(1)
-	XMM_FLOAT_EPILOGUE
-	ret
-
-x_Inf_or_NaN:
-	/*
-	 * Return 0 if x is -Inf.  Otherwise just return x, although the
-	 * C version would return (x + x) (Real Indefinite) if x is a NaN.
-	 */
-	movl	ARG_FLOAT_ONE,%eax
-	cmpl	$0xff800000,%eax
-	jne	x_not_minus_Inf
-	fldz
-	XMM_FLOAT_EPILOGUE
-	ret
-
-x_not_minus_Inf:
-	flds	ARG_FLOAT_ONE
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_fmod.S b/lib/libm/arch/i387/e_fmod.S
deleted file mode 100644
index 4987f9e35..000000000
--- a/lib/libm/arch/i387/e_fmod.S
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-
-RCSID("$NetBSD: e_fmod.S,v 1.7 2003/07/26 19:24:58 salo Exp $")
-
-ENTRY(__ieee754_fmod)
-	XMM_TWO_ARG_DOUBLE_PROLOGUE
-	fldl	ARG_DOUBLE_TWO
-	fldl	ARG_DOUBLE_ONE
-1:	fprem
-	fstsw	%ax
-	btw	$10,%ax
-	jc	1b
-	fstp	%st(1)
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_log.S b/lib/libm/arch/i387/e_log.S
deleted file mode 100644
index 2d7732555..000000000
--- a/lib/libm/arch/i387/e_log.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_log.S,v 1.6 2003/07/26 19:24:58 salo Exp $")
-
-ENTRY(__ieee754_log)
-	XMM_ONE_ARG_DOUBLE_PROLOGUE
-	fldln2
-	fldl	ARG_DOUBLE_ONE
-	fyl2x
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_log10.S b/lib/libm/arch/i387/e_log10.S
deleted file mode 100644
index ce8e3b93a..000000000
--- a/lib/libm/arch/i387/e_log10.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_log10.S,v 1.6 2003/07/26 19:24:59 salo Exp $")
-
-ENTRY(__ieee754_log10)
-	XMM_ONE_ARG_DOUBLE_PROLOGUE
-	fldlg2
-	fldl	ARG_DOUBLE_ONE
-	fyl2x
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_log10f.S b/lib/libm/arch/i387/e_log10f.S
deleted file mode 100644
index 76b95579e..000000000
--- a/lib/libm/arch/i387/e_log10f.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_log10f.S,v 1.3 2003/07/26 19:24:59 salo Exp $")
-
-ENTRY(__ieee754_log10f)
-	XMM_ONE_ARG_FLOAT_PROLOGUE
-	fldlg2
-	flds	ARG_FLOAT_ONE
-	fyl2x
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_log2.S b/lib/libm/arch/i387/e_log2.S
deleted file mode 100644
index 13e66f705..000000000
--- a/lib/libm/arch/i387/e_log2.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by Rui Paulo <rpaulo@NetBSD.org>, based on e_log.S.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_log2.S,v 1.1 2005/07/21 20:58:21 rpaulo Exp $")
-
-ENTRY(__ieee754_log2)
-	XMM_ONE_ARG_DOUBLE_PROLOGUE
-	fld1
-	fldl	ARG_DOUBLE_ONE
-	fyl2x
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_log2f.S b/lib/libm/arch/i387/e_log2f.S
deleted file mode 100644
index d362aae26..000000000
--- a/lib/libm/arch/i387/e_log2f.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by Rui Paulo <rpaulo@NetBSD.org>, based on e_logf.S.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_log2f.S,v 1.1 2005/07/21 20:58:21 rpaulo Exp $")
-
-ENTRY(__ieee754_log2f)
-	XMM_ONE_ARG_FLOAT_PROLOGUE
-	fld1
-	flds	ARG_FLOAT_ONE
-	fyl2x
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_logf.S b/lib/libm/arch/i387/e_logf.S
deleted file mode 100644
index e3d2e8dfb..000000000
--- a/lib/libm/arch/i387/e_logf.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_logf.S,v 1.4 2003/07/26 19:24:59 salo Exp $")
-
-ENTRY(__ieee754_logf)
-	XMM_ONE_ARG_FLOAT_PROLOGUE
-	fldln2
-	flds	ARG_FLOAT_ONE
-	fyl2x
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_remainder.S b/lib/libm/arch/i387/e_remainder.S
deleted file mode 100644
index 70223b2ad..000000000
--- a/lib/libm/arch/i387/e_remainder.S
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_remainder.S,v 1.7 2003/07/26 19:24:59 salo Exp $")
-
-ENTRY(__ieee754_remainder)
-	XMM_TWO_ARG_DOUBLE_PROLOGUE
-	fldl	ARG_DOUBLE_TWO
-	fldl	ARG_DOUBLE_ONE
-1:	fprem1
-	fstsw	%ax
-	btw	$10,%ax
-	jc	1b
-	fstp	%st(1)
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_remainderf.S b/lib/libm/arch/i387/e_remainderf.S
deleted file mode 100644
index aaee4aab0..000000000
--- a/lib/libm/arch/i387/e_remainderf.S
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_remainderf.S,v 1.5 2003/07/26 19:24:59 salo Exp $")
-
-ENTRY(__ieee754_remainderf)
-	XMM_TWO_ARG_FLOAT_PROLOGUE
-	flds	ARG_FLOAT_TWO
-	flds	ARG_FLOAT_ONE
-1:	fprem1
-	fstsw	%ax
-	btw	$10,%ax
-	jc	1b
-	fstp	%st(1)
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_scalb.S b/lib/libm/arch/i387/e_scalb.S
deleted file mode 100644
index 8717aa7cb..000000000
--- a/lib/libm/arch/i387/e_scalb.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_scalb.S,v 1.7 2003/07/26 19:25:00 salo Exp $")
-
-ENTRY(__ieee754_scalb)
-	XMM_TWO_ARG_DOUBLE_PROLOGUE
-	fldl	ARG_DOUBLE_TWO
-	fldl	ARG_DOUBLE_ONE
-	fscale
-	fstp	%st(1)			/* bug fix for fp stack overflow */
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_scalbf.S b/lib/libm/arch/i387/e_scalbf.S
deleted file mode 100644
index be3b569cb..000000000
--- a/lib/libm/arch/i387/e_scalbf.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: e_scalbf.S,v 1.3 2003/07/26 19:25:00 salo Exp $")
-
-ENTRY(__ieee754_scalbf)
-	XMM_TWO_ARG_FLOAT_PROLOGUE
-	flds	ARG_FLOAT_TWO
-	flds	ARG_FLOAT_ONE
-	fscale
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/e_sqrt.S b/lib/libm/arch/i387/e_sqrt.S
deleted file mode 100644
index afae87ffc..000000000
--- a/lib/libm/arch/i387/e_sqrt.S
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: e_sqrt.S,v 1.6 2003/07/26 19:25:00 salo Exp $")
-
-ENTRY(__ieee754_sqrt)
-#ifdef __i386__
-	fldl	4(%esp)
-	fsqrt
-#else
-	sqrtsd	%xmm0,%xmm0
-#endif
-	ret
diff --git a/lib/libm/arch/i387/e_sqrtf.S b/lib/libm/arch/i387/e_sqrtf.S
deleted file mode 100644
index f9163bab5..000000000
--- a/lib/libm/arch/i387/e_sqrtf.S
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: e_sqrtf.S,v 1.4 2003/07/26 19:25:00 salo Exp $")
-
-ENTRY(__ieee754_sqrtf)
-#ifdef __i386__
-	flds	4(%esp)
-	fsqrt
-#else
-	sqrtss	%xmm0,%xmm0
-#endif
-	ret
diff --git a/lib/libm/arch/i387/empty.S b/lib/libm/arch/i387/empty.S
deleted file mode 100644
index 8b1378917..000000000
--- a/lib/libm/arch/i387/empty.S
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/lib/libm/arch/i387/fenv.c b/lib/libm/arch/i387/fenv.c
deleted file mode 100644
index eb1a3f99e..000000000
--- a/lib/libm/arch/i387/fenv.c
+++ /dev/null
@@ -1,523 +0,0 @@
-/* $NetBSD: fenv.c,v 1.6 2013/11/11 00:31:51 joerg Exp $ */
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: fenv.c,v 1.6 2013/11/11 00:31:51 joerg Exp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <assert.h>
-#include <fenv.h>
-#include <stddef.h>
-#include <string.h>
-
-/* Load x87 Control Word */
-#define	__fldcw(__cw)		__asm__ __volatile__	\
-	("fldcw %0" : : "m" (__cw))
-
-/* No-Wait Store Control Word */
-#define	__fnstcw(__cw)		__asm__ __volatile__	\
-	("fnstcw %0" : "=m" (*(__cw)))
-
-/* No-Wait Store Status Word */
-#define	__fnstsw(__sw)		__asm__ __volatile__	\
-	("fnstsw %0" : "=am" (*(__sw)))
-
-/* No-Wait Clear Exception Flags */
-#define	__fnclex()		__asm__ __volatile__	\
-	("fnclex")
-
-/* Load x87 Environment */
-#define	__fldenv(__env)		__asm__ __volatile__	\
-	("fldenv %0" : : "m" (__env))
-
-/* No-Wait Store x87 environment */
-#define	__fnstenv(__env)	__asm__ __volatile__	\
-	("fnstenv %0" : "=m" (*(__env)))
-
-/* Check for and handle pending unmasked x87 pending FPU exceptions */
-#define	__fwait(__env)		__asm__	__volatile__	\
-	("fwait")
-
-/* Load the MXCSR register */
-#define	__ldmxcsr(__mxcsr)	__asm__ __volatile__	\
-	("ldmxcsr %0" : : "m" (__mxcsr))
-
-/* Store the MXCSR register state */
-#define	__stmxcsr(__mxcsr)	__asm__ __volatile__	\
-	("stmxcsr %0" : "=m" (*(__mxcsr)))
-
-/*
- * The following constant represents the default floating-point environment
- * (that is, the one installed at program startup) and has type pointer to
- * const-qualified fenv_t.
- *
- * It can be used as an argument to the functions within the <fenv.h> header
- * that manage the floating-point environment, namely fesetenv() and
- * feupdateenv().
- *
- * x87 fpu registers are 16bit wide. The upper bits, 31-16, are marked as
- * RESERVED. We provide a partial floating-point environment, where we
- * define only the lower bits. The reserved bits are extracted and set by the
- * consumers of FE_DFL_ENV, during runtime.
- */
-fenv_t __fe_dfl_env = {
-	{
-		__NetBSD_NPXCW__,       /* Control word register */
-		0x0,			/* Unused */
-		0x0000,                 /* Status word register */
-		0x0,			/* Unused */
-		0x0000ffff,             /* Tag word register */
-		0x0,			/* Unused */
-		{
-			0x0000, 0x0000,
-			0x0000, 0xffff
-		}
-	},
-	__INITIAL_MXCSR__		/* MXCSR register */
-};
-
-/*
- * Test for SSE support on this processor.
- *
- * We need to use ldmxcsr/stmxcsr to get correct results if any part
- * of the program was compiled to use SSE floating-point, but we can't
- * use SSE on older processors.
- *
- * In order to do so, we need to query the processor capabilities via the CPUID
- * instruction. We can make it even simpler though, by querying the machdep.sse
- * sysctl.
- */
-static int __HAS_SSE = 0;
-
-static void __init_libm(void) __attribute__ ((constructor, used));
-
-static void __init_libm(void)
-{
-#if !defined(__minix)
-	size_t oldlen = sizeof(__HAS_SSE);
-	int rv;
-	uint16_t control;
-
-	rv = sysctlbyname("machdep.sse", &__HAS_SSE, &oldlen, NULL, 0);
-	if (rv == -1)
-		__HAS_SSE = 0;
-#else
-	uint16_t control;
-	__HAS_SSE = 0;
-#endif /* !defined(__minix) */
-
-	__fnstcw(&control);
-	__fe_dfl_env.x87.control = control;
-}
-
-/*
- * The feclearexcept() function clears the supported floating-point exceptions
- * represented by `excepts'.
- */
-int
-feclearexcept(int excepts)
-{
-	fenv_t env;
-	uint32_t mxcsr;
-	int ex;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	/* It's ~3x faster to call fnclex, than store/load fp env */
-	if (ex == FE_ALL_EXCEPT) {
-		__fnclex();
-	} else {
-		__fnstenv(&env);
-		env.x87.status &= ~ex;
-		__fldenv(env);
-	}
-
-	if (__HAS_SSE) {
-		__stmxcsr(&mxcsr);
-		mxcsr &= ~ex;
-		__ldmxcsr(mxcsr);
-	}
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The fegetexceptflag() function stores an implementation-defined
- * representation of the states of the floating-point status flags indicated by
- * the argument excepts in the object pointed to by the argument flagp.
- */
-int
-fegetexceptflag(fexcept_t *flagp, int excepts)
-{
-	uint32_t mxcsr;
-	uint16_t status;
-	int ex;
-
-	_DIAGASSERT(flagp != NULL);
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	__fnstsw(&status);
-	if (__HAS_SSE)
-		__stmxcsr(&mxcsr);
-	else
-		mxcsr = 0;
-
-	*flagp = (mxcsr | status) & ex;
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The feraiseexcept() function raises the supported floating-point exceptions
- * represented by the argument `excepts'.
- *
- * The standard explicitly allows us to execute an instruction that has the
- * exception as a side effect, but we choose to manipulate the status register
- * directly.
- *
- * The validation of input is being deferred to fesetexceptflag().
- */
-int
-feraiseexcept(int excepts)
-{
-	fexcept_t ex;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-	fesetexceptflag(&ex, excepts);
-	__fwait();
-
-	/* Success */
-	return (0);
-}
-
-/*
- * This function sets the floating-point status flags indicated by the argument
- * `excepts' to the states stored in the object pointed to by `flagp'. It does
- * NOT raise any floating-point exceptions, but only sets the state of the flags.
- */
-int
-fesetexceptflag(const fexcept_t *flagp, int excepts)
-{
-	fenv_t env;
-	uint32_t mxcsr;
-	int ex;
-
-	_DIAGASSERT(flagp != NULL);
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	__fnstenv(&env);
-	env.x87.status &= ~ex;
-	env.x87.status |= *flagp & ex;
-	__fldenv(env);
-
-	if (__HAS_SSE) {
-		__stmxcsr(&mxcsr);
-		mxcsr &= ~ex;
-		mxcsr |= *flagp & ex;
-		__ldmxcsr(mxcsr);
-	}
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The fetestexcept() function determines which of a specified subset of the
- * floating-point exception flags are currently set. The `excepts' argument
- * specifies the floating-point status flags to be queried.
- */
-int
-fetestexcept(int excepts)
-{
-	uint32_t mxcsr;
-	uint16_t status;
-	int ex;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	__fnstsw(&status);
-	if (__HAS_SSE)
-		__stmxcsr(&mxcsr);
-	else
-		mxcsr = 0;
-
-	return ((status | mxcsr) & ex);
-}
-
-int
-fegetround(void)
-{
-	uint16_t control;
-
-	/*
-	 * We assume that the x87 and the SSE unit agree on the
-	 * rounding mode.  Reading the control word on the x87 turns
-	 * out to be about 5 times faster than reading it on the SSE
-	 * unit on an Opteron 244.
-	 */
-	__fnstcw(&control);
-
-	return (control & __X87_ROUND_MASK);
-}
-
-/*
- * The fesetround() function shall establish the rounding direction represented
- * by its argument round. If the argument is not equal to the value of a
- * rounding direction macro, the rounding direction is not changed.
- */
-int
-fesetround(int round)
-{
-	uint32_t mxcsr;
-	uint16_t control;
-
-	if (round & ~__X87_ROUND_MASK) {
-		/* Failure */
-		return (-1);
-	}
-
-	__fnstcw(&control);
-	control &= ~__X87_ROUND_MASK;
-	control |= round;
-	__fldcw(control);
-
-	if (__HAS_SSE) {
-		__stmxcsr(&mxcsr);
-		mxcsr &= ~(__X87_ROUND_MASK << __SSE_ROUND_SHIFT);
-		mxcsr |= round << __SSE_ROUND_SHIFT;
-		__ldmxcsr(mxcsr);
-	}
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The fegetenv() function attempts to store the current floating-point
- * environment in the object pointed to by envp.
- */
-int
-fegetenv(fenv_t *envp)
-{
-	uint32_t mxcsr;
-
-	_DIAGASSERT(flagp != NULL);
-
-	/*
-	 * fnstenv masks all exceptions, so we need to restore the old control
-	 * word to avoid this side effect.
-	 */
-	__fnstenv(envp);
-	__fldcw(envp->x87.control);
-	if (__HAS_SSE) {
-		__stmxcsr(&mxcsr);
-		envp->mxcsr = mxcsr;
-	}
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The feholdexcept() function saves the current floating-point environment in
- * the object pointed to by envp, clears the floating-point status flags, and
- * then installs a non-stop (continue on floating-point exceptions) mode, if
- * available, for all floating-point exceptions.
- */
-int
-feholdexcept(fenv_t *envp)
-{
-	uint32_t mxcsr;
-
-	_DIAGASSERT(envp != NULL);
-
-	__fnstenv(envp);
-	__fnclex();
-	if (__HAS_SSE) {
-		__stmxcsr(&mxcsr);
-		envp->mxcsr = mxcsr;
-		mxcsr &= ~FE_ALL_EXCEPT;
-		mxcsr |= FE_ALL_EXCEPT << __SSE_EMASK_SHIFT;
-		__ldmxcsr(mxcsr);
-	}
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The fesetenv() function attempts to establish the floating-point environment
- * represented by the object pointed to by envp. The argument `envp' points
- * to an object set by a call to fegetenv() or feholdexcept(), or equal a
- * floating-point environment macro. The fesetenv() function does not raise
- * floating-point exceptions, but only installs the state of the floating-point
- * status flags represented through its argument.
- */
-int
-fesetenv(const fenv_t *envp)
-{
-	fenv_t env;
-
-	_DIAGASSERT(envp != NULL);
-
-	/* Store the x87 floating-point environment */
-	memset(&env, 0, sizeof(env));
-	__fnstenv(&env);
-
-	__fe_dfl_env.x87.unused1 = env.x87.unused1;
-	__fe_dfl_env.x87.unused2 = env.x87.unused2;
-	__fe_dfl_env.x87.unused3 = env.x87.unused3;
-	memcpy(__fe_dfl_env.x87.others,
-	       env.x87.others,
-	       sizeof(__fe_dfl_env.x87.others) / sizeof(uint32_t));
-
-	__fldenv(envp->x87);
-	if (__HAS_SSE)
-		__ldmxcsr(envp->mxcsr);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The feupdateenv() function saves the currently raised floating-point
- * exceptions in its automatic storage, installs the floating-point environment
- * represented by the object pointed to by `envp', and then raises the saved
- * floating-point exceptions. The argument `envp' shall point to an object set
- * by a call to feholdexcept() or fegetenv(), or equal a floating-point
- * environment macro.
- */
-int
-feupdateenv(const fenv_t *envp)
-{
-	fenv_t env;
-	uint32_t mxcsr;
-	uint16_t status;
-
-	_DIAGASSERT(envp != NULL);
-
-	/* Store the x87 floating-point environment */
-	memset(&env, 0, sizeof(env));
-	__fnstenv(&env);
-
-	__fe_dfl_env.x87.unused1 = env.x87.unused1;
-	__fe_dfl_env.x87.unused2 = env.x87.unused2;
-	__fe_dfl_env.x87.unused3 = env.x87.unused3;
-	memcpy(__fe_dfl_env.x87.others,
-	       env.x87.others,
-	       sizeof(__fe_dfl_env.x87.others) / sizeof(uint32_t));
-
-	__fnstsw(&status);
-	if (__HAS_SSE)
-		__stmxcsr(&mxcsr);
-	else
-		mxcsr = 0;
-	fesetenv(envp);
-	feraiseexcept((mxcsr | status) & FE_ALL_EXCEPT);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The following functions are extentions to the standard
- */
-int
-feenableexcept(int mask)
-{
-	uint32_t mxcsr, omask;
-	uint16_t control;
-
-	mask &= FE_ALL_EXCEPT;
-	__fnstcw(&control);
-	if (__HAS_SSE)
-		__stmxcsr(&mxcsr);
-	else
-		mxcsr = 0;
-
-	omask = (control | mxcsr >> __SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
-	control &= ~mask;
-	__fldcw(control);
-	if (__HAS_SSE) {
-		mxcsr &= ~(mask << __SSE_EMASK_SHIFT);
-		__ldmxcsr(mxcsr);
-	}
-
-	return (FE_ALL_EXCEPT & ~omask);
-}
-
-int
-fedisableexcept(int mask)
-{
-	uint32_t mxcsr, omask;
-	uint16_t control;
-
-	mask &= FE_ALL_EXCEPT;
-	__fnstcw(&control);
-	if (__HAS_SSE)
-		__stmxcsr(&mxcsr);
-	else
-		mxcsr = 0;
-
-	omask = (control | mxcsr >> __SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
-	control |= mask;
-	__fldcw(control);
-	if (__HAS_SSE) {
-		mxcsr |= mask << __SSE_EMASK_SHIFT;
-		__ldmxcsr(mxcsr);
-	}
-
-	return (FE_ALL_EXCEPT & ~omask);
-}
-
-int
-fegetexcept(void)
-{
-	uint16_t control;
-
-	/*
-	 * We assume that the masks for the x87 and the SSE unit are
-	 * the same.
-	 */
-	__fnstcw(&control);
-
-	return (~control & FE_ALL_EXCEPT);
-}
diff --git a/lib/libm/arch/i387/lrint.S b/lib/libm/arch/i387/lrint.S
deleted file mode 100644
index 1ae8c8885..000000000
--- a/lib/libm/arch/i387/lrint.S
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $NetBSD: lrint.S,v 1.2 2004/10/13 15:18:32 drochner Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-ENTRY(lrint)
-#ifdef __i386__
-	pushl   %ebp
-	movl    %esp,%ebp
-	subl    $4,%esp
-	fldl	8(%ebp)
-	fistpl	(%esp)
-	movl	(%esp),%eax
-	leave
-	ret
-#else
-	cvtsd2siq %xmm0,%rax
-	ret
-#endif
diff --git a/lib/libm/arch/i387/s_atan.S b/lib/libm/arch/i387/s_atan.S
deleted file mode 100644
index 61a093309..000000000
--- a/lib/libm/arch/i387/s_atan.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_atan.S,v 1.6 2003/07/26 19:25:00 salo Exp $")
-
-ENTRY(atan)
-	XMM_ONE_ARG_DOUBLE_PROLOGUE
-	fldl	ARG_DOUBLE_ONE
-	fld1
-	fpatan
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_atanf.S b/lib/libm/arch/i387/s_atanf.S
deleted file mode 100644
index 6eec1944c..000000000
--- a/lib/libm/arch/i387/s_atanf.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_atanf.S,v 1.5 2003/07/26 19:25:00 salo Exp $")
-
-ENTRY(atanf)
-	XMM_ONE_ARG_FLOAT_PROLOGUE
-	flds	ARG_FLOAT_ONE
-	fld1
-	fpatan
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_ceil.S b/lib/libm/arch/i387/s_ceil.S
deleted file mode 100644
index 528ab0b11..000000000
--- a/lib/libm/arch/i387/s_ceil.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_ceil.S,v 1.8 2011/06/18 21:24:51 joerg Exp $")
-
-ENTRY(ceil)
-#ifdef __i386__
-	pushl	%ebp
-	movl	%esp,%ebp
-	subl	$8,%esp
-
-	fstcw	-4(%ebp)		/* store fpu control word */
-	movw	-4(%ebp),%dx
-	orw	$0x0800,%dx		/* round towards +oo */
-	andw	$0xfbff,%dx
-	movw	%dx,-8(%ebp)
-	fldcw	-8(%ebp)		/* load modfied control word */
-
-	fldl	8(%ebp)			/* round */
-	frndint
-
-	fldcw	-4(%ebp)		/* restore original control word */
-
-	leave
-#else
-	fstcw	-12(%rsp)
-	movw	-12(%rsp),%dx
-	orw	$0x0800,%dx
-	andw	$0xfbff,%dx
-	movw	%dx,-16(%rsp)
-	fldcw	-16(%rsp)
-	movsd	%xmm0,-8(%rsp)
-	fldl	-8(%rsp)
-	frndint
-	fldcw	-12(%rsp)
-	fstpl	-8(%rsp)
-	movsd	-8(%rsp),%xmm0
-#endif
-	ret
diff --git a/lib/libm/arch/i387/s_ceilf.S b/lib/libm/arch/i387/s_ceilf.S
deleted file mode 100644
index 264054679..000000000
--- a/lib/libm/arch/i387/s_ceilf.S
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_ceilf.S,v 1.9 2011/06/18 21:24:51 joerg Exp $")
-
-ENTRY(ceilf)
-#ifdef __i386__
-	pushl	%ebp
-	movl	%esp,%ebp
-	subl	$8,%esp
-
-	fstcw	-4(%ebp)		/* store fpu control word */
-	movw	-4(%ebp),%dx
-	orw	$0x0800,%dx		/* round towards +oo */
-	andw	$0xfbff,%dx
-	movw	%dx,-8(%ebp)
-	fldcw	-8(%ebp)		/* load modfied control word */
-
-	flds	8(%ebp)			/* round */
-	frndint
-
-	fldcw	-4(%ebp)		/* restore original control word */
-
-	leave
-#else
-	fstcw	-8(%rsp)
-	movw	-8(%rsp),%dx
-	orw	$0x0800,%dx
-	andw	$0xfbff,%dx
-	movw	%dx,-12(%rsp)
-	fldcw	-12(%rsp)
-	movss	%xmm0,-4(%rsp)
-	flds	-4(%rsp)
-	frndint
-	fldcw	-8(%rsp)
-	fstps	-4(%rsp)
-	movss	-4(%rsp),%xmm0
-#endif
-	ret
diff --git a/lib/libm/arch/i387/s_copysign.S b/lib/libm/arch/i387/s_copysign.S
deleted file mode 100644
index 3f3ba45ed..000000000
--- a/lib/libm/arch/i387/s_copysign.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-/*
- * XXXfvdl might as well split this file.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_copysign.S,v 1.7 2011/06/18 20:49:26 joerg Exp $")
-
-#ifdef __x86_64__
-.Lpos:
-	.quad	0x8000000000000000
-.Lneg:
-	.quad	0x7fffffffffffffff
-#endif
-
-
-ENTRY(copysign)
-#ifdef __i386__
-	movl	16(%esp),%edx
-	andl	$0x80000000,%edx
-	movl	8(%esp),%eax
-	andl	$0x7fffffff,%eax
-	orl	%edx,%eax
-	movl	%eax,8(%esp)
-	fldl	4(%esp)
-#else
-	movq	.Lpos(%rip),%xmm2
-	movq	.Lneg(%rip),%xmm3
-	pand	%xmm2,%xmm1
-	pand	%xmm3,%xmm0
-	por	%xmm1,%xmm0
-#endif
-	ret
diff --git a/lib/libm/arch/i387/s_copysignf.S b/lib/libm/arch/i387/s_copysignf.S
deleted file mode 100644
index 470d3ff82..000000000
--- a/lib/libm/arch/i387/s_copysignf.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-/*
- * XXXfvdl split this file.
- */
-
-RCSID("$NetBSD: s_copysignf.S,v 1.7 2011/06/21 21:52:49 joerg Exp $")
-
-#ifdef __x86_64__
-.Lneg:
-	.long 0x7fffffff
-.Lpos:
-	.long 0x80000000
-#endif
-
-ENTRY(copysignf)
-#ifdef __i386__
-	movl	8(%esp),%edx
-	andl	$0x80000000,%edx
-	movl	4(%esp),%eax
-	andl	$0x7fffffff,%eax
-	orl	%edx,%eax
-	movl	%eax,4(%esp)
-	flds	4(%esp)
-#else
-	movss	.Lpos(%rip),%xmm2
-	movss	.Lneg(%rip),%xmm3
-	pand	%xmm2,%xmm1
-	pand	%xmm3,%xmm0
-	por	%xmm1,%xmm0
-#endif
-	ret
diff --git a/lib/libm/arch/i387/s_cos.S b/lib/libm/arch/i387/s_cos.S
deleted file mode 100644
index 2788a7cc8..000000000
--- a/lib/libm/arch/i387/s_cos.S
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_cos.S,v 1.8 2003/07/26 19:25:01 salo Exp $")
-
-ENTRY(cos)
-	XMM_ONE_ARG_DOUBLE_PROLOGUE
-	fldl	ARG_DOUBLE_ONE
-	fcos
-	fnstsw	%ax
-	andw	$0x400,%ax
-	jnz	1f
-	XMM_DOUBLE_EPILOGUE
-	ret
-1:	fldpi
-	fadd	%st(0)
-	fxch	%st(1)
-2:	fprem1
-	fnstsw	%ax
-	andw	$0x400,%ax
-	jnz	2b
-	fstp	%st(1)
-	fcos
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_cosf.S b/lib/libm/arch/i387/s_cosf.S
deleted file mode 100644
index 0f9ead601..000000000
--- a/lib/libm/arch/i387/s_cosf.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_cosf.S,v 1.6 2003/07/26 19:25:01 salo Exp $")
-
-/* A float's domain isn't large enough to require argument reduction. */
-ENTRY(cosf)
-	XMM_ONE_ARG_FLOAT_PROLOGUE
-	flds	ARG_FLOAT_ONE
-	fcos
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_finite.S b/lib/libm/arch/i387/s_finite.S
deleted file mode 100644
index 73d9cde38..000000000
--- a/lib/libm/arch/i387/s_finite.S
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_finite.S,v 1.7 2003/07/26 19:25:01 salo Exp $")
-
-ENTRY(finite)
-#ifdef __i386__
-	movl	8(%esp),%eax
-	andl	$0x7ff00000, %eax
-	cmpl	$0x7ff00000, %eax
-	setne	%al
-	andl	$0x000000ff, %eax
-#else
-	xorl	%eax,%eax
-	movq	$0x7ff0000000000000,%rsi
-	movq	%rsi,%rdi
-	movsd	%xmm0,-8(%rsp)
-	andq	-8(%rsp),%rsi
-	cmpq	%rdi,%rsi
-	setne	%al
-#endif
-	ret
diff --git a/lib/libm/arch/i387/s_finitef.S b/lib/libm/arch/i387/s_finitef.S
deleted file mode 100644
index 81bf3bd39..000000000
--- a/lib/libm/arch/i387/s_finitef.S
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_finitef.S,v 1.6 2003/07/26 19:25:01 salo Exp $")
-
-ENTRY(finitef)
-#ifdef __i386__
-	movl	4(%esp),%eax
-	andl	$0x7f800000, %eax
-	cmpl	$0x7f800000, %eax
-	setne	%al
-	andl	$0x000000ff, %eax
-#else
-	xorl	%eax,%eax
-	movl	$0x7ff00000,%esi
-	movss	%xmm0,-4(%rsp)
-	andl	-4(%rsp),%esi
-	cmpl	$0x7ff00000,%esi
-	setne	%al
-#endif
-	ret
diff --git a/lib/libm/arch/i387/s_floor.S b/lib/libm/arch/i387/s_floor.S
deleted file mode 100644
index e90793e76..000000000
--- a/lib/libm/arch/i387/s_floor.S
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_floor.S,v 1.9 2011/06/18 21:24:51 joerg Exp $")
-
-ENTRY(floor)
-#ifdef __i386__
-	pushl	%ebp
-	movl	%esp,%ebp
-	subl	$8,%esp
-
-	fstcw	-4(%ebp)		/* store fpu control word */
-	movw	-4(%ebp),%dx
-	orw	$0x0400,%dx		/* round towards -oo */
-	andw	$0xf7ff,%dx
-	movw	%dx,-8(%ebp)
-	fldcw	-8(%ebp)		/* load modfied control word */
-
-	fldl	8(%ebp)			/* round */
-	frndint
-
-	fldcw	-4(%ebp)		/* restore original control word */
-
-	leave
-#else
-	movsd	%xmm0, -8(%rsp)
-	fstcw	-12(%rsp)
-	movw	-12(%rsp),%dx
-	orw	$0x0400,%dx
-	andw	$0xf7ff,%dx
-	movw	%dx,-16(%rsp)
-	fldcw	-16(%rsp)
-	fldl	-8(%rsp)
-	frndint
-	fldcw	-12(%rsp)
-	fstpl	-8(%rsp)
-	movsd	-8(%rsp),%xmm0
-#endif
-	ret
diff --git a/lib/libm/arch/i387/s_floorf.S b/lib/libm/arch/i387/s_floorf.S
deleted file mode 100644
index a8336aa39..000000000
--- a/lib/libm/arch/i387/s_floorf.S
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_floorf.S,v 1.8 2011/06/18 21:24:51 joerg Exp $")
-
-ENTRY(floorf)
-#ifdef __i386__
-	pushl	%ebp
-	movl	%esp,%ebp
-	subl	$8,%esp
-
-	fstcw	-4(%ebp)		/* store fpu control word */
-	movw	-4(%ebp),%dx
-	orw	$0x0400,%dx		/* round towards -oo */
-	andw	$0xf7ff,%dx
-	movw	%dx,-8(%ebp)
-	fldcw	-8(%ebp)		/* load modfied control word */
-
-	flds	8(%ebp)			/* round */
-	frndint
-
-	fldcw	-4(%ebp)		/* restore original control word */
-
-	leave
-#else
-	movss	%xmm0, -4(%rsp)
-	fstcw	-8(%rsp)
-	movw	-8(%rsp),%dx
-	orw	$0x0400,%dx
-	andw	$0xf7ff,%dx  
-	movw	%dx,-12(%rsp)
-	fldcw	-12(%rsp)
-	flds	-4(%rsp)
-	frndint
-	fldcw	-8(%rsp)
-	fstps	-4(%rsp)
-	movss	-4(%rsp),%xmm0
-#endif
-	ret
diff --git a/lib/libm/arch/i387/s_ilogb.S b/lib/libm/arch/i387/s_ilogb.S
deleted file mode 100644
index 4bf7da029..000000000
--- a/lib/libm/arch/i387/s_ilogb.S
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_ilogb.S,v 1.7 2003/07/26 19:25:02 salo Exp $")
-
-ENTRY(ilogb)
-#ifdef __i386__
-	pushl	%ebp
-	movl	%esp,%ebp
-	subl	$4,%esp
-
-	fldl	8(%ebp)
-	fxtract
-	fstp	%st
-
-	fistpl	-4(%ebp)
-	movl	-4(%ebp),%eax
-
-	leave
-#else
-	movsd	%xmm0,-8(%rsp)
-	fldl	-8(%rsp)
-	fxtract
-	fstp	%st
-	fistpl	-8(%rsp)
-	movl	-8(%rsp),%eax
-#endif
-	ret
diff --git a/lib/libm/arch/i387/s_ilogbf.S b/lib/libm/arch/i387/s_ilogbf.S
deleted file mode 100644
index 74e8a9233..000000000
--- a/lib/libm/arch/i387/s_ilogbf.S
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_ilogbf.S,v 1.6 2003/07/26 19:25:02 salo Exp $")
-
-ENTRY(ilogbf)
-#ifdef __i386__
-	pushl	%ebp
-	movl	%esp,%ebp
-	subl	$4,%esp
-
-	flds	8(%ebp)
-	fxtract
-	fstp	%st
-
-	fistpl	-4(%ebp)
-	movl	-4(%ebp),%eax
-
-	leave
-#else
-	movss	%xmm0,-4(%rsp)
-	flds	-4(%rsp)
-	fxtract
-	fstp	%st
-	fistpl	-4(%rsp)
-	movl	-4(%rsp),%eax
-#endif
-	ret
diff --git a/lib/libm/arch/i387/s_ilogbl.S b/lib/libm/arch/i387/s_ilogbl.S
deleted file mode 100644
index 3932dc491..000000000
--- a/lib/libm/arch/i387/s_ilogbl.S
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_ilogbl.S,v 1.1 2011/07/28 22:32:28 joerg Exp $")
-
-#include "abi.h"
-
-ENTRY(ilogbl)
-	fldt	ARG_LONG_DOUBLE_ONE
-	fxtract
-	fstp	%st
-#ifdef __i386__
-	pushl	%eax
-	fistpl	0(%esp)
-	popl	%eax
-#else
-	fistpl	-4(%rsp)
-	movl	-4(%rsp), %eax
-#endif
-	ret
diff --git a/lib/libm/arch/i387/s_log1p.S b/lib/libm/arch/i387/s_log1p.S
deleted file mode 100644
index 93ab11436..000000000
--- a/lib/libm/arch/i387/s_log1p.S
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-/*
- * Modified by Lex Wennmacher <wennmach@NetBSD.org>
- * Still public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_log1p.S,v 1.13 2003/09/16 18:17:11 wennmach Exp $")
-
-/*
- * The log1p() function is provided to compute an accurate value of
- * log(1 + x), even for tiny values of x. The i387 FPU provides the
- * fyl2xp1 instruction for this purpose. However, the range of this
- * instruction is limited to:
- * 		-(1 - (sqrt(2) / 2)) <= x <= sqrt(2) - 1
- *                         -0.292893 <= x <= 0.414214
- * at least on older processor versions.
- *
- * log1p() is implemented by testing the range of the argument.
- * If it is appropriate for fyl2xp1, this instruction is used.
- * Else, we compute log1p(x) = ln(2)*ld(1 + x) the traditional way
- * (using fyl2x).
- *
- * The range testing costs speed, but as the rationale for the very
- * existence of this function is accuracy, we accept that.
- *
- * In order to reduce the cost for testing the range, we check if
- * the argument is in the range
- *                             -0.25 <= x <= 0.25
- * which can be done with just one conditional branch. If x is
- * inside this range, we use fyl2xp1. Outside of this range,
- * the use of fyl2x is accurate enough.
- * 
- */
-
-.text
-	.align	4
-ENTRY(log1p)
-	XMM_ONE_ARG_DOUBLE_PROLOGUE
-	fldl	ARG_DOUBLE_ONE
-	fabs
-	fld1				/* ... x 1 */
-	fadd	%st(0)			/* ... x 2 */
-	fadd	%st(0)			/* ... x 4 */
-	fld1				/* ... 4 1 */
-	fdivp				/* ... x 0.25 */
-	fcompp
-	fnstsw	%ax
-	andb	$69,%ah
-	jne	use_fyl2x
-	jmp	use_fyl2xp1
-
-	.align	4
-use_fyl2x:
-	fldln2
-        fldl	ARG_DOUBLE_ONE
-        fld1
-        faddp
-        fyl2x
-	XMM_DOUBLE_EPILOGUE
-        ret
-
-	.align	4
-use_fyl2xp1:
-	fldln2
-	fldl	ARG_DOUBLE_ONE
-	fyl2xp1
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_log1pf.S b/lib/libm/arch/i387/s_log1pf.S
deleted file mode 100644
index 3ec415983..000000000
--- a/lib/libm/arch/i387/s_log1pf.S
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-/*
- * Modified by Lex Wennmacher <wennmach@NetBSD.org>
- * Still public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_log1pf.S,v 1.10 2003/09/16 18:17:11 wennmach Exp $")
-
-/*
- * The log1pf() function is provided to compute an accurate value of
- * log(1 + x), even for tiny values of x. The i387 FPU provides the
- * fyl2xp1 instruction for this purpose. However, the range of this
- * instruction is limited to:
- * 		-(1 - (sqrt(2) / 2)) <= x <= sqrt(2) - 1
- *                         -0.292893 <= x <= 0.414214
- * at least on older processor versions.
- *
- * log1pf() is implemented by testing the range of the argument.
- * If it is appropriate for fyl2xp1, this instruction is used.
- * Else, we compute log1pf(x) = ln(2)*ld(1 + x) the traditional way
- * (using fyl2x).
- *
- * The range testing costs speed, but as the rationale for the very
- * existence of this function is accuracy, we accept that.
- *
- * In order to reduce the cost for testing the range, we check if
- * the argument is in the range
- *                             -0.25 <= x <= 0.25
- * which can be done with just one conditional branch. If x is
- * inside this range, we use fyl2xp1. Outside of this range,
- * the use of fyl2x is accurate enough.
- * 
- */
-
-.text
-	.align	4
-ENTRY(log1pf)
-	XMM_ONE_ARG_FLOAT_PROLOGUE
-	flds	ARG_FLOAT_ONE
-	fabs
-	fld1				/* ... x 1 */
-	fadd	%st(0)			/* ... x 2 */
-	fadd	%st(0)			/* ... x 4 */
-	fld1				/* ... 4 1 */
-	fdivp				/* ... x 0.25 */
-	fcompp
-	fnstsw	%ax
-	andb	$69,%ah
-	jne	use_fyl2x
-	jmp	use_fyl2xp1
-
-	.align	4
-use_fyl2x:
-	fldln2
-        flds	ARG_FLOAT_ONE
-        fld1
-        faddp
-        fyl2x
-	XMM_FLOAT_EPILOGUE
-        ret
-
-	.align	4
-use_fyl2xp1:
-	fldln2
-	flds	ARG_FLOAT_ONE
-	fyl2xp1
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_logb.S b/lib/libm/arch/i387/s_logb.S
deleted file mode 100644
index f520248c6..000000000
--- a/lib/libm/arch/i387/s_logb.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_logb.S,v 1.6 2003/07/26 19:25:02 salo Exp $")
-
-ENTRY(logb)
-	XMM_ONE_ARG_DOUBLE_PROLOGUE
-	fldl	ARG_DOUBLE_ONE
-	fxtract
-	fstp	%st
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_logbf.S b/lib/libm/arch/i387/s_logbf.S
deleted file mode 100644
index d66abc21f..000000000
--- a/lib/libm/arch/i387/s_logbf.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_logbf.S,v 1.5 2003/07/26 19:25:02 salo Exp $")
-
-ENTRY(logbf)
-	XMM_ONE_ARG_FLOAT_PROLOGUE
-	flds	ARG_FLOAT_ONE
-	fxtract
-	fstp	%st
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_logbl.S b/lib/libm/arch/i387/s_logbl.S
deleted file mode 100644
index 2048a967e..000000000
--- a/lib/libm/arch/i387/s_logbl.S
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_logbl.S,v 1.1 2011/08/03 14:13:07 joerg Exp $")
-
-ENTRY(logbl)
-	fldt	ARG_LONG_DOUBLE_ONE
-	fxtract
-	fstp	%st
-	ret
diff --git a/lib/libm/arch/i387/s_modf.S b/lib/libm/arch/i387/s_modf.S
deleted file mode 100644
index 36d4c7998..000000000
--- a/lib/libm/arch/i387/s_modf.S
+++ /dev/null
@@ -1,106 +0,0 @@
-/*	$NetBSD: s_modf.S,v 1.1 2006/03/22 20:45:58 drochner Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * 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. 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: @(#)modf.s	5.5 (Berkeley) 3/18/91
- */
-
-#include <machine/asm.h>
-#if defined(LIBC_SCCS)
-	RCSID("$NetBSD: s_modf.S,v 1.1 2006/03/22 20:45:58 drochner Exp $")
-#endif
-
-/*
- * modf(value, iptr): return fractional part of value, and stores the
- * integral part into iptr (a pointer to double).
- *
- * Written by Sean Eric Fagan (sef@kithrup.COM)
- * Sun Mar 11 20:27:30 PST 1990
- */
-
-/* With CHOP mode on, frndint behaves as TRUNC does.  Useful. */
-ENTRY(modf)
-#ifdef __x86_64__
-	pushq	%rbp
-	movq	%rsp,%rbp
-	subq	$24,%rsp
-
-	/* Set chop mode. */
-	fnstcw	-12(%rbp)
-	movw	-12(%rbp),%dx
-	orw	$3072,%dx
-	movw	%dx,-16(%rbp)
-	fldcw	-16(%rbp)
-
-	/* Get integral part. */
-	movsd	%xmm0,-24(%rbp)
-	fldl	-24(%rbp)
-	frndint
-	fstpl	-8(%rbp)
-
-	/* Restore control word. */
-	fldcw	-12(%rbp)
-
-	/* Store integral part. */
-	movsd	-8(%rbp),%xmm0
-	movsd	%xmm0,(%rdi)
-
-	/* Get fractional part and return it. */
-	fldl	-24(%rbp)
-	fsubl	-8(%rbp)
-	fstpl	-24(%rbp)
-	movsd	-24(%rbp),%xmm0
-#else
-	pushl	%ebp
-	movl	%esp,%ebp
-	subl	$16,%esp
-	fnstcw	-12(%ebp)
-	movw	-12(%ebp),%dx
-	orw	$3072,%dx
-	movw	%dx,-16(%ebp)
-	fldcw	-16(%ebp)
-	fldl	8(%ebp)
-	frndint
-	fstpl	-8(%ebp)
-	fldcw	-12(%ebp)
-	movl	16(%ebp),%eax
-	movl	-8(%ebp),%edx
-	movl	-4(%ebp),%ecx
-	movl	%edx,(%eax)
-	movl	%ecx,4(%eax)
-	fldl	8(%ebp)
-	fsubl	-8(%ebp)
-	jmp	L1
-L1:
-#endif
-	leave
-	ret
diff --git a/lib/libm/arch/i387/s_rint.S b/lib/libm/arch/i387/s_rint.S
deleted file mode 100644
index c5300d04d..000000000
--- a/lib/libm/arch/i387/s_rint.S
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_rint.S,v 1.6 2003/07/26 19:25:03 salo Exp $")
-
-ENTRY(rint)
-	XMM_ONE_ARG_DOUBLE_PROLOGUE
-	fldl	ARG_DOUBLE_ONE
-	frndint
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_rintf.S b/lib/libm/arch/i387/s_rintf.S
deleted file mode 100644
index 4ac746fba..000000000
--- a/lib/libm/arch/i387/s_rintf.S
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_rintf.S,v 1.5 2003/07/26 19:25:03 salo Exp $")
-
-ENTRY(rintf)
-	XMM_ONE_ARG_FLOAT_PROLOGUE
-	flds	ARG_FLOAT_ONE
-	frndint
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_scalbn.S b/lib/libm/arch/i387/s_scalbn.S
deleted file mode 100644
index cbbb5d95f..000000000
--- a/lib/libm/arch/i387/s_scalbn.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_scalbn.S,v 1.14 2013/05/20 19:40:09 joerg Exp $")
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(scalbn,_scalbn)
-WEAK_ALIAS(scalbln,_scalbln)
-WEAK_ALIAS(ldexp,_scalbn)
-#endif
-#ifdef __x86_64__
-ENTRY(_scalbn)
-	movl %edi,-12(%rsp)
-	fildl -12(%rsp)
-	movsd %xmm0,-8(%rsp)
-	fldl -8(%rsp)
-	fscale
-	fstpl -8(%rsp)
-	movsd -8(%rsp),%xmm0
-	fstp %st(0)
-	ret
-#elif defined(STRONG_ALIAS)
-STRONG_ALIAS(_scalbn, scalbln)
-#endif
-
-ENTRY(_scalbln)
-#ifdef __x86_64__
-	movq %rdi,-16(%rsp)
-	fildq -16(%rsp)
-	movsd %xmm0,-8(%rsp)
-	fldl -8(%rsp)
-	fscale
-	fstpl -8(%rsp)
-	movsd -8(%rsp),%xmm0
-	fstp %st(0)
-#else
-	fildl 12(%esp)
-	fldl 4(%esp)
-	fscale
-	fstp %st(1)		/* clean up stack */
-#endif
-	ret
diff --git a/lib/libm/arch/i387/s_scalbnf.S b/lib/libm/arch/i387/s_scalbnf.S
deleted file mode 100644
index ea77b93ce..000000000
--- a/lib/libm/arch/i387/s_scalbnf.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_scalbnf.S,v 1.14 2013/05/20 20:27:43 mlelstv Exp $")
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(scalbnf,_scalbnf)
-WEAK_ALIAS(scalblnf,_scalblnf)
-WEAK_ALIAS(ldexpf,_scalbnf)
-#endif
-
-#ifdef __x86_64__
-ENTRY(_scalbnf)
-	movl %edi,-8(%rsp)
-	fildl -8(%rsp)
-	movss %xmm0,-4(%rsp)
-	flds -4(%rsp)
-	fscale
-	fstps -4(%rsp)
-	movss -4(%rsp),%xmm0
-	fstp %st(0)
-	ret
-#elif defined(STRONG_ALIAS)
-STRONG_ALIAS(_scalbnf,_scalblnf)
-#endif
-
-ENTRY(_scalblnf)
-#ifdef __x86_64__
-	movq %rdi,-16(%rsp)
-	fildq -16(%rsp)
-	movss %xmm0,-4(%rsp)
-	flds -4(%rsp)
-	fscale
-	fstps -4(%rsp)
-	movss -4(%rsp),%xmm0
-	fstp %st(0)
-#else
-	fildl 8(%esp)
-	flds 4(%esp)
-	fscale
-	fstp %st(1)		/* clean up stack */
-#endif
-	ret
diff --git a/lib/libm/arch/i387/s_scalbnl.S b/lib/libm/arch/i387/s_scalbnl.S
deleted file mode 100644
index f920cbe27..000000000
--- a/lib/libm/arch/i387/s_scalbnl.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: s_scalbnl.S,v 1.5 2013/05/20 20:27:43 mlelstv Exp $")
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(scalbnl,_scalbnl)
-WEAK_ALIAS(scalblnl,_scalblnl)
-WEAK_ALIAS(ldexpl,_scalbnl)
-#endif
-
-#ifdef __x86_64__
-ENTRY(_scalbnl)
-	movl	%edi,-4(%rsp)
-	fildl	-4(%rsp)
-	fldt	8(%rsp)
-	fscale
-	fstp	%st(1)
-	ret
-#elif defined(STRONG_ALIAS)
-STRONG_ALIAS(_scalbnl,_scalblnl)
-#endif
-
-ENTRY(_scalblnl)
-#ifdef __x86_64__
-	movq	%rdi,-8(%rsp)
-	fildq	-8(%rsp)
-	fldt	8(%rsp)
-	fscale
-	fstp	%st(1)
-#else
-	fildl 16(%esp)
-	fldt 4(%esp)
-	fscale
-	fstp %st(1)		/* clean up stack */
-#endif
-	ret
diff --git a/lib/libm/arch/i387/s_significand.S b/lib/libm/arch/i387/s_significand.S
deleted file mode 100644
index e85763a95..000000000
--- a/lib/libm/arch/i387/s_significand.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_significand.S,v 1.6 2003/07/26 19:25:03 salo Exp $")
-
-ENTRY(significand)
-	XMM_ONE_ARG_DOUBLE_PROLOGUE
-	fldl	ARG_DOUBLE_ONE
-	fxtract
-	fstp	%st(1)
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_significandf.S b/lib/libm/arch/i387/s_significandf.S
deleted file mode 100644
index 126fda10a..000000000
--- a/lib/libm/arch/i387/s_significandf.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_significandf.S,v 1.5 2003/07/26 19:25:03 salo Exp $")
-
-ENTRY(significandf)
-	XMM_ONE_ARG_FLOAT_PROLOGUE
-	flds	ARG_FLOAT_ONE
-	fxtract
-	fstp	%st(1)
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_sin.S b/lib/libm/arch/i387/s_sin.S
deleted file mode 100644
index fa6c155da..000000000
--- a/lib/libm/arch/i387/s_sin.S
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_sin.S,v 1.7 2003/07/26 19:25:03 salo Exp $")
-
-ENTRY(sin)
-	XMM_ONE_ARG_DOUBLE_PROLOGUE
-	fldl	ARG_DOUBLE_ONE
-	fsin
-	fnstsw	%ax
-	andw	$0x400,%ax
-	jnz	1f
-	XMM_DOUBLE_EPILOGUE
-	ret
-1:	fldpi
-	fadd	%st(0)
-	fxch	%st(1)
-2:	fprem1
-	fnstsw	%ax
-	andw	$0x400,%ax
-	jnz	2b
-	fstp	%st(1)
-	fsin
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_sinf.S b/lib/libm/arch/i387/s_sinf.S
deleted file mode 100644
index f2cb587ae..000000000
--- a/lib/libm/arch/i387/s_sinf.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_sinf.S,v 1.5 2003/07/26 19:25:04 salo Exp $")
-
-/* A float's domain isn't large enough to require argument reduction. */
-ENTRY(sinf)
-	XMM_ONE_ARG_FLOAT_PROLOGUE
-	flds	ARG_FLOAT_ONE
-	fsin
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_tan.S b/lib/libm/arch/i387/s_tan.S
deleted file mode 100644
index a5bed7b0b..000000000
--- a/lib/libm/arch/i387/s_tan.S
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_tan.S,v 1.7 2003/07/26 19:25:04 salo Exp $")
-
-ENTRY(tan)
-	XMM_ONE_ARG_DOUBLE_PROLOGUE
-	fldl	ARG_DOUBLE_ONE
-	fptan
-	fnstsw	%ax
-	andw	$0x400,%ax
-	jnz	1f
-	fstp	%st(0)
-	XMM_DOUBLE_EPILOGUE
-	ret
-1:	fldpi
-	fadd	%st(0)
-	fxch	%st(1)
-2:	fprem1
-	fstsw	%ax
-	andw	$0x400,%ax
-	jnz	2b
-	fstp	%st(1)
-	fptan
-	fstp	%st(0)
-	XMM_DOUBLE_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/s_tanf.S b/lib/libm/arch/i387/s_tanf.S
deleted file mode 100644
index a6d6c5b35..000000000
--- a/lib/libm/arch/i387/s_tanf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-#include "abi.h"
-
-RCSID("$NetBSD: s_tanf.S,v 1.5 2003/07/26 19:25:04 salo Exp $")
-
-/* A float's domain isn't large enough to require argument reduction. */
-ENTRY(tanf)
-	XMM_ONE_ARG_FLOAT_PROLOGUE
-	flds	ARG_FLOAT_ONE
-	fptan
-	fstp	%st(0)
-	XMM_FLOAT_EPILOGUE
-	ret
diff --git a/lib/libm/arch/i387/shlib_version b/lib/libm/arch/i387/shlib_version
deleted file mode 100644
index f077acaaf..000000000
--- a/lib/libm/arch/i387/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.2 2005/07/21 22:49:16 rpaulo Exp $
-#	Remember to update distrib/sets/lists/base/md.i386 when changing
-#
-major=0
-minor=1
diff --git a/lib/libm/arch/m68060/Makefile b/lib/libm/arch/m68060/Makefile
deleted file mode 100644
index eb9e64b21..000000000
--- a/lib/libm/arch/m68060/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/10/26 07:25:34 lukem Exp $
-
-.include <bsd.own.mk>
-.include <bsd.sys.mk>		# for HOST_SH
-
-M060SP=		${NETBSDSRCDIR}/sys/arch/m68k/060sp
-ASM2GAS=	${M060SP}/asm2gas
-FPLSP_SA=	${M060SP}/dist/fplsp.sa
-
-all: fplsp.hex fplsp_wrap.S
-
-fplsp_wrap.S Makefile.list: makeas.sh
-	${HOST_SH} makeas.sh
-
-fplsp.hex: ${FPLSP_SA} ${ASM2GAS} makeoffs.awk
-	${HOST_SH} ${ASM2GAS} ${FPLSP_SA} | awk -f makeoffs.awk > fplsp.hex
-
-.if exists(Makefile.list)
-.include "Makefile.list"
-.endif
-
-clean:
-	-rm ${ARCH_SRCS} ${ARCH_ADDS} fplsp.hex Makefile.list
diff --git a/lib/libm/arch/m68060/Makefile.list b/lib/libm/arch/m68060/Makefile.list
deleted file mode 100644
index d98207b45..000000000
--- a/lib/libm/arch/m68060/Makefile.list
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile.list,v 1.6 2010/01/06 14:11:53 phx Exp $
-
-#
-# list of M68060 architecture dependent files for libm.
-#
-# Created by a script. Do not edit manually!
-#
-
-ARCH_SRCS =  e_acosf.S  e_acos.S  e_asinf.S  e_asin.S \
-	  s_atanf.S  s_atan.S  e_atanhf.S  e_atanh.S \
-	  s_cosf.S  s_cos.S  e_coshf.S  e_cosh.S \
-	  e_expf.S  e_exp.S  s_expm1f.S  s_expm1.S \
-	  e_log10f.S  e_log10.S  s_logbf.S  s_logb.S \
-	  e_logf.S  e_log.S  s_log1pf.S  s_log1p.S \
-	  s_sinf.S  s_sin.S  e_sinhf.S  e_sinh.S \
-	  s_tanf.S  k_tanf.S  s_tan.S  k_tan.S  s_tanhf.S  s_tanh.S \
-	  e_sqrtf.S  e_sqrt.S
-ARCH_ADDS = fplsp_wrap.S
diff --git a/lib/libm/arch/m68060/e_acos.S b/lib/libm/arch/m68060/e_acos.S
deleted file mode 100644
index 6def75ea2..000000000
--- a/lib/libm/arch/m68060/e_acos.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: e_acos.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_acos
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_acos)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0008))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0008))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_acosf.S b/lib/libm/arch/m68060/e_acosf.S
deleted file mode 100644
index 436da2abb..000000000
--- a/lib/libm/arch/m68060/e_acosf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: e_acosf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_acosf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_acosf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0000))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0000))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_asin.S b/lib/libm/arch/m68060/e_asin.S
deleted file mode 100644
index 87161f620..000000000
--- a/lib/libm/arch/m68060/e_asin.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: e_asin.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_asin
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_asin)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0020))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0020))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_asinf.S b/lib/libm/arch/m68060/e_asinf.S
deleted file mode 100644
index e2f56141c..000000000
--- a/lib/libm/arch/m68060/e_asinf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: e_asinf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_asinf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_asinf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0018))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0018))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_atanh.S b/lib/libm/arch/m68060/e_atanh.S
deleted file mode 100644
index ad5a68e1a..000000000
--- a/lib/libm/arch/m68060/e_atanh.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: e_atanh.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_atanh
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_atanh)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0050))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0050))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_atanhf.S b/lib/libm/arch/m68060/e_atanhf.S
deleted file mode 100644
index af6780979..000000000
--- a/lib/libm/arch/m68060/e_atanhf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: e_atanhf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_atanhf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_atanhf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0048))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0048))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_cosh.S b/lib/libm/arch/m68060/e_cosh.S
deleted file mode 100644
index bafd8ce76..000000000
--- a/lib/libm/arch/m68060/e_cosh.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: e_cosh.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_cosh
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_cosh)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0080))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0080))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_coshf.S b/lib/libm/arch/m68060/e_coshf.S
deleted file mode 100644
index f17630604..000000000
--- a/lib/libm/arch/m68060/e_coshf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: e_coshf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_coshf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_coshf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0078))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0078))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_exp.S b/lib/libm/arch/m68060/e_exp.S
deleted file mode 100644
index 613ccc100..000000000
--- a/lib/libm/arch/m68060/e_exp.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: e_exp.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_exp
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_exp)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0098))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0098))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_expf.S b/lib/libm/arch/m68060/e_expf.S
deleted file mode 100644
index e40b60da1..000000000
--- a/lib/libm/arch/m68060/e_expf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: e_expf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_expf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_expf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0090))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0090))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_log.S b/lib/libm/arch/m68060/e_log.S
deleted file mode 100644
index f16e44b76..000000000
--- a/lib/libm/arch/m68060/e_log.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: e_log.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_log
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_log)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0128))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0128))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_log10.S b/lib/libm/arch/m68060/e_log10.S
deleted file mode 100644
index 174a14568..000000000
--- a/lib/libm/arch/m68060/e_log10.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: e_log10.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_log10
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_log10)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_00f8))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_00f8))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_log10f.S b/lib/libm/arch/m68060/e_log10f.S
deleted file mode 100644
index 030d0c2d9..000000000
--- a/lib/libm/arch/m68060/e_log10f.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: e_log10f.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_log10f
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_log10f)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_00f0))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_00f0))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_logf.S b/lib/libm/arch/m68060/e_logf.S
deleted file mode 100644
index 027bdad56..000000000
--- a/lib/libm/arch/m68060/e_logf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: e_logf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_logf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_logf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0120))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0120))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_sinh.S b/lib/libm/arch/m68060/e_sinh.S
deleted file mode 100644
index 06e3bfbbf..000000000
--- a/lib/libm/arch/m68060/e_sinh.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: e_sinh.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_sinh
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_sinh)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_01d0))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_01d0))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_sinhf.S b/lib/libm/arch/m68060/e_sinhf.S
deleted file mode 100644
index 9da3391a7..000000000
--- a/lib/libm/arch/m68060/e_sinhf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: e_sinhf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_sinhf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_sinhf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_01c8))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_01c8))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_sqrt.S b/lib/libm/arch/m68060/e_sqrt.S
deleted file mode 100644
index 8a75787af..000000000
--- a/lib/libm/arch/m68060/e_sqrt.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: e_sqrt.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_sqrt
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_sqrt)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_02f0))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_02f0))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/e_sqrtf.S b/lib/libm/arch/m68060/e_sqrtf.S
deleted file mode 100644
index 17134ad23..000000000
--- a/lib/libm/arch/m68060/e_sqrtf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: e_sqrtf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for __ieee754_sqrtf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_sqrtf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_02e8))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_02e8))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/fplsp.hex b/lib/libm/arch/m68060/fplsp.hex
deleted file mode 100644
index b4d712412..000000000
--- a/lib/libm/arch/m68060/fplsp.hex
+++ /dev/null
@@ -1,2047 +0,0 @@
-|#
-|# $NetBSD: fplsp.hex,v 1.4 2000/05/16 19:07:35 is Exp $
-|#
-
-|#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-|# MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
-|# M68000 Hi-Performance Microprocessor Division
-|# M68060 Software Package Production Release 
-|# 
-|# M68060 Software Package Copyright (C) 1993, 1994, 1995, 1996 Motorola Inc.
-|# All rights reserved.
-|# 
-|# THE SOFTWARE is provided on an "AS IS" basis and without warranty.
-|# To the maximum extent permitted by applicable law,
-|# MOTOROLA DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED,
-|# INCLUDING IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS
-|# FOR A PARTICULAR PURPOSE and any warranty against infringement with
-|# regard to the SOFTWARE (INCLUDING ANY MODIFIED VERSIONS THEREOF)
-|# and any accompanying written materials. 
-|# 
-|# To the maximum extent permitted by applicable law,
-|# IN NO EVENT SHALL MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER
-|# (INCLUDING WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS,
-|# BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY LOSS)
-|# ARISING OF THE USE OR INABILITY TO USE THE SOFTWARE.
-|# 
-|# Motorola assumes no responsibility for the maintenance and support
-|# of the SOFTWARE.  
-|# 
-|# You are hereby granted a copyright license to use, modify, and distribute the
-|# SOFTWARE so long as this entire notice is retained without alteration
-|# in any modified and/or redistributed versions, and that such modified
-|# versions are clearly identified as such.
-|# No licenses are granted by implication, estoppel or otherwise under any
-|# patents or trademarks of Motorola, Inc.
-|#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-ENTRY_NOPROFILE(__fplsp060_0000) 	.long	0x60ff0000,0x238e0000
-ENTRY_NOPROFILE(__fplsp060_0008) 	.long	0x60ff0000,0x24200000
-ENTRY_NOPROFILE(__fplsp060_0010) 	.long	0x60ff0000,0x24b60000
-ENTRY_NOPROFILE(__fplsp060_0018) 	.long	0x60ff0000,0x11060000
-ENTRY_NOPROFILE(__fplsp060_0020) 	.long	0x60ff0000,0x11980000
-ENTRY_NOPROFILE(__fplsp060_0028) 	.long	0x60ff0000,0x122e0000
-ENTRY_NOPROFILE(__fplsp060_0030) 	.long	0x60ff0000,0x0f160000
-ENTRY_NOPROFILE(__fplsp060_0038) 	.long	0x60ff0000,0x0fa80000
-ENTRY_NOPROFILE(__fplsp060_0040) 	.long	0x60ff0000,0x103e0000
-ENTRY_NOPROFILE(__fplsp060_0048) 	.long	0x60ff0000,0x12ae0000
-ENTRY_NOPROFILE(__fplsp060_0050) 	.long	0x60ff0000,0x13400000
-ENTRY_NOPROFILE(__fplsp060_0058) 	.long	0x60ff0000,0x13d60000
-ENTRY_NOPROFILE(__fplsp060_0060) 	.long	0x60ff0000,0x05ae0000
-ENTRY_NOPROFILE(__fplsp060_0068) 	.long	0x60ff0000,0x06400000
-ENTRY_NOPROFILE(__fplsp060_0070) 	.long	0x60ff0000,0x06d60000
-ENTRY_NOPROFILE(__fplsp060_0078) 	.long	0x60ff0000,0x213e0000
-ENTRY_NOPROFILE(__fplsp060_0080) 	.long	0x60ff0000,0x21d00000
-ENTRY_NOPROFILE(__fplsp060_0088) 	.long	0x60ff0000,0x22660000
-ENTRY_NOPROFILE(__fplsp060_0090) 	.long	0x60ff0000,0x16160000
-ENTRY_NOPROFILE(__fplsp060_0098) 	.long	0x60ff0000,0x16a80000
-ENTRY_NOPROFILE(__fplsp060_00a0) 	.long	0x60ff0000,0x173e0000
-ENTRY_NOPROFILE(__fplsp060_00a8) 	.long	0x60ff0000,0x0aee0000
-ENTRY_NOPROFILE(__fplsp060_00b0) 	.long	0x60ff0000,0x0b800000
-ENTRY_NOPROFILE(__fplsp060_00b8) 	.long	0x60ff0000,0x0c160000
-ENTRY_NOPROFILE(__fplsp060_00c0) 	.long	0x60ff0000,0x24a60000
-ENTRY_NOPROFILE(__fplsp060_00c8) 	.long	0x60ff0000,0x25380000
-ENTRY_NOPROFILE(__fplsp060_00d0) 	.long	0x60ff0000,0x25ce0000
-ENTRY_NOPROFILE(__fplsp060_00d8) 	.long	0x60ff0000,0x26660000
-ENTRY_NOPROFILE(__fplsp060_00e0) 	.long	0x60ff0000,0x26f80000
-ENTRY_NOPROFILE(__fplsp060_00e8) 	.long	0x60ff0000,0x278e0000
-ENTRY_NOPROFILE(__fplsp060_00f0) 	.long	0x60ff0000,0x1d160000
-ENTRY_NOPROFILE(__fplsp060_00f8) 	.long	0x60ff0000,0x1da80000
-ENTRY_NOPROFILE(__fplsp060_0100) 	.long	0x60ff0000,0x1e3e0000
-ENTRY_NOPROFILE(__fplsp060_0108) 	.long	0x60ff0000,0x1ed60000
-ENTRY_NOPROFILE(__fplsp060_0110) 	.long	0x60ff0000,0x1f680000
-ENTRY_NOPROFILE(__fplsp060_0118) 	.long	0x60ff0000,0x1ffe0000
-ENTRY_NOPROFILE(__fplsp060_0120) 	.long	0x60ff0000,0x1b0e0000
-ENTRY_NOPROFILE(__fplsp060_0128) 	.long	0x60ff0000,0x1ba00000
-ENTRY_NOPROFILE(__fplsp060_0130) 	.long	0x60ff0000,0x1c360000
-ENTRY_NOPROFILE(__fplsp060_0138) 	.long	0x60ff0000,0x08860000
-ENTRY_NOPROFILE(__fplsp060_0140) 	.long	0x60ff0000,0x09180000
-ENTRY_NOPROFILE(__fplsp060_0148) 	.long	0x60ff0000,0x09ae0000
-ENTRY_NOPROFILE(__fplsp060_0150) 	.long	0x60ff0000,0x2bf00000
-ENTRY_NOPROFILE(__fplsp060_0158) 	.long	0x60ff0000,0x2ca40000
-ENTRY_NOPROFILE(__fplsp060_0160) 	.long	0x60ff0000,0x2d580000
-ENTRY_NOPROFILE(__fplsp060_0168) 	.long	0x60ff0000,0x29980000
-ENTRY_NOPROFILE(__fplsp060_0170) 	.long	0x60ff0000,0x2a4c0000
-ENTRY_NOPROFILE(__fplsp060_0178) 	.long	0x60ff0000,0x2b000000
-ENTRY_NOPROFILE(__fplsp060_0180) 	.long	0x60ff0000,0x2e000000
-ENTRY_NOPROFILE(__fplsp060_0188) 	.long	0x60ff0000,0x2eb40000
-ENTRY_NOPROFILE(__fplsp060_0190) 	.long	0x60ff0000,0x2f680000
-ENTRY_NOPROFILE(__fplsp060_0198) 	.long	0x60ff0000,0x029e0000
-ENTRY_NOPROFILE(__fplsp060_01a0) 	.long	0x60ff0000,0x03300000
-ENTRY_NOPROFILE(__fplsp060_01a8) 	.long	0x60ff0000,0x03c60000
-ENTRY_NOPROFILE(__fplsp060_01b0) 	.long	0x60ff0000,0x27660000
-ENTRY_NOPROFILE(__fplsp060_01b8) 	.long	0x60ff0000,0x27fe0000
-ENTRY_NOPROFILE(__fplsp060_01c0) 	.long	0x60ff0000,0x289a0000
-ENTRY_NOPROFILE(__fplsp060_01c8) 	.long	0x60ff0000,0x061e0000
-ENTRY_NOPROFILE(__fplsp060_01d0) 	.long	0x60ff0000,0x06b00000
-ENTRY_NOPROFILE(__fplsp060_01d8) 	.long	0x60ff0000,0x07460000
-ENTRY_NOPROFILE(__fplsp060_01e0) 	.long	0x60ff0000,0x12ee0000
-ENTRY_NOPROFILE(__fplsp060_01e8) 	.long	0x60ff0000,0x13800000
-ENTRY_NOPROFILE(__fplsp060_01f0) 	.long	0x60ff0000,0x14160000
-ENTRY_NOPROFILE(__fplsp060_01f8) 	.long	0x60ff0000,0x0b760000
-ENTRY_NOPROFILE(__fplsp060_0200) 	.long	0x60ff0000,0x0c080000
-ENTRY_NOPROFILE(__fplsp060_0208) 	.long	0x60ff0000,0x0c9e0000
-ENTRY_NOPROFILE(__fplsp060_0210) 	.long	0x60ff0000,0x18460000
-ENTRY_NOPROFILE(__fplsp060_0218) 	.long	0x60ff0000,0x18d80000
-ENTRY_NOPROFILE(__fplsp060_0220) 	.long	0x60ff0000,0x196e0000
-ENTRY_NOPROFILE(__fplsp060_0228) 	.long	0x60ff0000,0x16560000
-ENTRY_NOPROFILE(__fplsp060_0230) 	.long	0x60ff0000,0x16e80000
-ENTRY_NOPROFILE(__fplsp060_0238) 	.long	0x60ff0000,0x177e0000
-ENTRY_NOPROFILE(__fplsp060_0240) 	.long	0x60ff0000,0x72fe0000
-ENTRY_NOPROFILE(__fplsp060_0248) 	.long	0x60ff0000,0x72fe0000
-ENTRY_NOPROFILE(__fplsp060_0250) 	.long	0x60ff0000,0x72fe0000
-ENTRY_NOPROFILE(__fplsp060_0258) 	.long	0x60ff0000,0x71be0000
-ENTRY_NOPROFILE(__fplsp060_0260) 	.long	0x60ff0000,0x71d40000
-ENTRY_NOPROFILE(__fplsp060_0268) 	.long	0x60ff0000,0x71ea0000
-ENTRY_NOPROFILE(__fplsp060_0270) 	.long	0x60ff0000,0x72840000
-ENTRY_NOPROFILE(__fplsp060_0278) 	.long	0x60ff0000,0x729a0000
-ENTRY_NOPROFILE(__fplsp060_0280) 	.long	0x60ff0000,0x72b00000
-ENTRY_NOPROFILE(__fplsp060_0288) 	.long	0x60ff0000,0x72fe0000
-ENTRY_NOPROFILE(__fplsp060_0290) 	.long	0x60ff0000,0x72fe0000
-ENTRY_NOPROFILE(__fplsp060_0298) 	.long	0x60ff0000,0x72fe0000
-ENTRY_NOPROFILE(__fplsp060_02a0) 	.long	0x60ff0000,0x72fe0000
-ENTRY_NOPROFILE(__fplsp060_02a8) 	.long	0x60ff0000,0x72fe0000
-ENTRY_NOPROFILE(__fplsp060_02b0) 	.long	0x60ff0000,0x72fe0000
-ENTRY_NOPROFILE(__fplsp060_02b8) 	.long	0x60ff0000,0x71f20000
-ENTRY_NOPROFILE(__fplsp060_02c0) 	.long	0x60ff0000,0x72080000
-ENTRY_NOPROFILE(__fplsp060_02c8) 	.long	0x60ff0000,0x721e0000
-ENTRY_NOPROFILE(__fplsp060_02d0) 	.long	0x60ff0000,0x72860000
-ENTRY_NOPROFILE(__fplsp060_02d8) 	.long	0x60ff0000,0x72860000
-ENTRY_NOPROFILE(__fplsp060_02e0) 	.long	0x60ff0000,0x72860000
-ENTRY_NOPROFILE(__fplsp060_02e8) 	.long	0x60ff0000,0x72860000
-ENTRY_NOPROFILE(__fplsp060_02f0) 	.long	0x60ff0000,0x72860000
-ENTRY_NOPROFILE(__fplsp060_02f8) 	.long	0x60ff0000,0x72860000
-ENTRY_NOPROFILE(__fplsp060_0300) 	.long	0x60ff0000,0x71600000
-ENTRY_NOPROFILE(__fplsp060_0308) 	.long	0x60ff0000,0x71760000
-ENTRY_NOPROFILE(__fplsp060_0310) 	.long	0x60ff0000,0x718c0000
-ENTRY_NOPROFILE(__fplsp060_0318) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0320) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0328) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0330) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0338) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0340) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0348) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0350) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0358) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0360) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0368) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0370) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0378) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0380) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0388) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0390) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_0398) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_03a0) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_03a8) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_03b0) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_03b8) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_03c0) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_03c8) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_03d0) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_03d8) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_03e0) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_03e8) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_03f0) 	.long	0x51fc51fc,0x51fc51fc
-ENTRY_NOPROFILE(__fplsp060_03f8) 	.long	0x51fc51fc,0x51fc51fc
-	.long	0x40c62d38,0xd3d64634,0x3d6f90ae,0xb1e75cc7
-	.long	0x40000000,0xc90fdaa2,0x2168c235,0x00000000
-	.long	0x3fff0000,0xc90fdaa2,0x2168c235,0x00000000
-	.long	0x3fe45f30,0x6dc9c883,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x0000f22e,0x44000008,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x00006c76,0x1d40ff4e
-	.long	0x120002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x4a016608,0x61ff0000,0x2ddc6030,0x0c010001
-	.long	0x660861ff,0x00007124,0x60220c01,0x00026608
-	.long	0x61ff0000,0x6d226014,0x0c010003,0x660861ff
-	.long	0x00006f4c,0x600661ff,0x00002f8e,0x4cee0303
-	.long	0xff9cf22e,0x9800ff60,0xf22ed040,0xffe84e5e
-	.long	0x4e754e56,0xff4048ee,0x0303ff9c,0xf22eb800
-	.long	0xff60f22e,0xf0c0ffdc,0xf23c9000,0x00000000
-	.long	0xf22e5400,0x0008f22e,0x6800ff6c,0x41eeff6c
-	.long	0x61ff0000,0x6bdc1d40,0xff4e1200,0x02ae00ff
-	.long	0x00ffff64,0x4280102e,0xff631d41,0xff4e4a01
-	.long	0x660861ff,0x00002d3e,0x60300c01,0x00016608
-	.long	0x61ff0000,0x70866022,0x0c010002,0x660861ff
-	.long	0x00006c84,0x60140c01,0x00036608,0x61ff0000
-	.long	0x6eae6006,0x61ff0000,0x2ef04cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x000041ee
-	.long	0xff6c216e,0x00080000,0x216e000c,0x0004216e
-	.long	0x00100008,0x61ff0000,0x6b381d40,0xff4e1200
-	.long	0x02ae00ff,0x00ffff64,0x4280102e,0xff634a01
-	.long	0x660861ff,0x00002c9e,0x60300c01,0x00016608
-	.long	0x61ff0000,0x6fe66022,0x0c010002,0x660861ff
-	.long	0x00006be4,0x60140c01,0x00036608,0x61ff0000
-	.long	0x6e0e6006,0x61ff0000,0x2e504cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x0000f22e
-	.long	0x44000008,0xf22e6800,0xff6c41ee,0xff6c61ff
-	.long	0x00006a9e,0x1d40ff4e,0x120002ae,0x00ff00ff
-	.long	0xff644280,0x102eff63,0x4a016608,0x61ff0000
-	.long	0x2c0e6030,0x0c010001,0x660861ff,0x00006fc8
-	.long	0x60220c01,0x00026608,0x61ff0000,0x6b4a6014
-	.long	0x0c010003,0x660861ff,0x00006d74,0x600661ff
-	.long	0x00002dbc,0x4cee0303,0xff9cf22e,0x9800ff60
-	.long	0xf22ed040,0xffe84e5e,0x4e754e56,0xff4048ee
-	.long	0x0303ff9c,0xf22eb800,0xff60f22e,0xf0c0ffdc
-	.long	0xf23c9000,0x00000000,0xf22e5400,0x0008f22e
-	.long	0x6800ff6c,0x41eeff6c,0x61ff0000,0x6a041d40
-	.long	0xff4e1200,0x02ae00ff,0x00ffff64,0x4280102e
-	.long	0xff631d41,0xff4e4a01,0x660861ff,0x00002b70
-	.long	0x60300c01,0x00016608,0x61ff0000,0x6f2a6022
-	.long	0x0c010002,0x660861ff,0x00006aac,0x60140c01
-	.long	0x00036608,0x61ff0000,0x6cd66006,0x61ff0000
-	.long	0x2d1e4cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x000041ee,0xff6c216e,0x00080000
-	.long	0x216e000c,0x0004216e,0x00100008,0x61ff0000
-	.long	0x69601d40,0xff4e1200,0x02ae00ff,0x00ffff64
-	.long	0x4280102e,0xff634a01,0x660861ff,0x00002ad0
-	.long	0x60300c01,0x00016608,0x61ff0000,0x6e8a6022
-	.long	0x0c010002,0x660861ff,0x00006a0c,0x60140c01
-	.long	0x00036608,0x61ff0000,0x6c366006,0x61ff0000
-	.long	0x2c7e4cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x0000f22e,0x44000008,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x000068c6,0x1d40ff4e
-	.long	0x120002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x4a016608,0x61ff0000,0x4e686030,0x0c010001
-	.long	0x660861ff,0x00006d74,0x60220c01,0x00026608
-	.long	0x61ff0000,0x6d946014,0x0c010003,0x660861ff
-	.long	0x00006b9c,0x600661ff,0x00004f14,0x4cee0303
-	.long	0xff9cf22e,0x9800ff60,0xf22ed040,0xffe84e5e
-	.long	0x4e754e56,0xff4048ee,0x0303ff9c,0xf22eb800
-	.long	0xff60f22e,0xf0c0ffdc,0xf23c9000,0x00000000
-	.long	0xf22e5400,0x0008f22e,0x6800ff6c,0x41eeff6c
-	.long	0x61ff0000,0x682c1d40,0xff4e1200,0x02ae00ff
-	.long	0x00ffff64,0x4280102e,0xff631d41,0xff4e4a01
-	.long	0x660861ff,0x00004dca,0x60300c01,0x00016608
-	.long	0x61ff0000,0x6cd66022,0x0c010002,0x660861ff
-	.long	0x00006cf6,0x60140c01,0x00036608,0x61ff0000
-	.long	0x6afe6006,0x61ff0000,0x4e764cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x000041ee
-	.long	0xff6c216e,0x00080000,0x216e000c,0x0004216e
-	.long	0x00100008,0x61ff0000,0x67881d40,0xff4e1200
-	.long	0x02ae00ff,0x00ffff64,0x4280102e,0xff634a01
-	.long	0x660861ff,0x00004d2a,0x60300c01,0x00016608
-	.long	0x61ff0000,0x6c366022,0x0c010002,0x660861ff
-	.long	0x00006c56,0x60140c01,0x00036608,0x61ff0000
-	.long	0x6a5e6006,0x61ff0000,0x4dd64cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x0000f22e
-	.long	0x44000008,0xf22e6800,0xff6c41ee,0xff6c61ff
-	.long	0x000066ee,0x1d40ff4e,0x120002ae,0x00ff00ff
-	.long	0xff644280,0x102eff63,0x4a016608,0x61ff0000
-	.long	0x59b26030,0x0c010001,0x660861ff,0x00006b9c
-	.long	0x60220c01,0x00026608,0x61ff0000,0x6bf26014
-	.long	0x0c010003,0x660861ff,0x000069c4,0x600661ff
-	.long	0x00005ad4,0x4cee0303,0xff9cf22e,0x9800ff60
-	.long	0xf22ed040,0xffe84e5e,0x4e754e56,0xff4048ee
-	.long	0x0303ff9c,0xf22eb800,0xff60f22e,0xf0c0ffdc
-	.long	0xf23c9000,0x00000000,0xf22e5400,0x0008f22e
-	.long	0x6800ff6c,0x41eeff6c,0x61ff0000,0x66541d40
-	.long	0xff4e1200,0x02ae00ff,0x00ffff64,0x4280102e
-	.long	0xff631d41,0xff4e4a01,0x660861ff,0x00005914
-	.long	0x60300c01,0x00016608,0x61ff0000,0x6afe6022
-	.long	0x0c010002,0x660861ff,0x00006b54,0x60140c01
-	.long	0x00036608,0x61ff0000,0x69266006,0x61ff0000
-	.long	0x5a364cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x000041ee,0xff6c216e,0x00080000
-	.long	0x216e000c,0x0004216e,0x00100008,0x61ff0000
-	.long	0x65b01d40,0xff4e1200,0x02ae00ff,0x00ffff64
-	.long	0x4280102e,0xff634a01,0x660861ff,0x00005874
-	.long	0x60300c01,0x00016608,0x61ff0000,0x6a5e6022
-	.long	0x0c010002,0x660861ff,0x00006ab4,0x60140c01
-	.long	0x00036608,0x61ff0000,0x68866006,0x61ff0000
-	.long	0x59964cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x0000f22e,0x44000008,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x00006516,0x1d40ff4e
-	.long	0x120002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x4a016608,0x61ff0000,0x46c46030,0x0c010001
-	.long	0x660861ff,0x000069c4,0x60220c01,0x00026608
-	.long	0x61ff0000,0x6a246014,0x0c010003,0x660861ff
-	.long	0x000067ec,0x600661ff,0x00004948,0x4cee0303
-	.long	0xff9cf22e,0x9800ff60,0xf22ed040,0xffe84e5e
-	.long	0x4e754e56,0xff4048ee,0x0303ff9c,0xf22eb800
-	.long	0xff60f22e,0xf0c0ffdc,0xf23c9000,0x00000000
-	.long	0xf22e5400,0x0008f22e,0x6800ff6c,0x41eeff6c
-	.long	0x61ff0000,0x647c1d40,0xff4e1200,0x02ae00ff
-	.long	0x00ffff64,0x4280102e,0xff631d41,0xff4e4a01
-	.long	0x660861ff,0x00004626,0x60300c01,0x00016608
-	.long	0x61ff0000,0x69266022,0x0c010002,0x660861ff
-	.long	0x00006986,0x60140c01,0x00036608,0x61ff0000
-	.long	0x674e6006,0x61ff0000,0x48aa4cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x000041ee
-	.long	0xff6c216e,0x00080000,0x216e000c,0x0004216e
-	.long	0x00100008,0x61ff0000,0x63d81d40,0xff4e1200
-	.long	0x02ae00ff,0x00ffff64,0x4280102e,0xff634a01
-	.long	0x660861ff,0x00004586,0x60300c01,0x00016608
-	.long	0x61ff0000,0x68866022,0x0c010002,0x660861ff
-	.long	0x000068e6,0x60140c01,0x00036608,0x61ff0000
-	.long	0x66ae6006,0x61ff0000,0x480a4cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x0000f22e
-	.long	0x44000008,0xf22e6800,0xff6c41ee,0xff6c61ff
-	.long	0x0000633e,0x1d40ff4e,0x120002ae,0x00ff00ff
-	.long	0xff644280,0x102eff63,0x4a016608,0x61ff0000
-	.long	0x49c46030,0x0c010001,0x660861ff,0x000067ec
-	.long	0x60220c01,0x00026608,0x61ff0000,0x68546014
-	.long	0x0c010003,0x660861ff,0x00006614,0x600661ff
-	.long	0x00004afa,0x4cee0303,0xff9cf22e,0x9800ff60
-	.long	0xf22ed040,0xffe84e5e,0x4e754e56,0xff4048ee
-	.long	0x0303ff9c,0xf22eb800,0xff60f22e,0xf0c0ffdc
-	.long	0xf23c9000,0x00000000,0xf22e5400,0x0008f22e
-	.long	0x6800ff6c,0x41eeff6c,0x61ff0000,0x62a41d40
-	.long	0xff4e1200,0x02ae00ff,0x00ffff64,0x4280102e
-	.long	0xff631d41,0xff4e4a01,0x660861ff,0x00004926
-	.long	0x60300c01,0x00016608,0x61ff0000,0x674e6022
-	.long	0x0c010002,0x660861ff,0x000067b6,0x60140c01
-	.long	0x00036608,0x61ff0000,0x65766006,0x61ff0000
-	.long	0x4a5c4cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x000041ee,0xff6c216e,0x00080000
-	.long	0x216e000c,0x0004216e,0x00100008,0x61ff0000
-	.long	0x62001d40,0xff4e1200,0x02ae00ff,0x00ffff64
-	.long	0x4280102e,0xff634a01,0x660861ff,0x00004886
-	.long	0x60300c01,0x00016608,0x61ff0000,0x66ae6022
-	.long	0x0c010002,0x660861ff,0x00006716,0x60140c01
-	.long	0x00036608,0x61ff0000,0x64d66006,0x61ff0000
-	.long	0x49bc4cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x0000f22e,0x44000008,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x00006166,0x1d40ff4e
-	.long	0x120002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x4a016608,0x61ff0000,0x391c6030,0x0c010001
-	.long	0x660861ff,0x00006614,0x60220c01,0x00026608
-	.long	0x61ff0000,0x66b86014,0x0c010003,0x660861ff
-	.long	0x0000643c,0x600661ff,0x00003b28,0x4cee0303
-	.long	0xff9cf22e,0x9800ff60,0xf22ed040,0xffe84e5e
-	.long	0x4e754e56,0xff4048ee,0x0303ff9c,0xf22eb800
-	.long	0xff60f22e,0xf0c0ffdc,0xf23c9000,0x00000000
-	.long	0xf22e5400,0x0008f22e,0x6800ff6c,0x41eeff6c
-	.long	0x61ff0000,0x60cc1d40,0xff4e1200,0x02ae00ff
-	.long	0x00ffff64,0x4280102e,0xff631d41,0xff4e4a01
-	.long	0x660861ff,0x0000387e,0x60300c01,0x00016608
-	.long	0x61ff0000,0x65766022,0x0c010002,0x660861ff
-	.long	0x0000661a,0x60140c01,0x00036608,0x61ff0000
-	.long	0x639e6006,0x61ff0000,0x3a8a4cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x000041ee
-	.long	0xff6c216e,0x00080000,0x216e000c,0x0004216e
-	.long	0x00100008,0x61ff0000,0x60281d40,0xff4e1200
-	.long	0x02ae00ff,0x00ffff64,0x4280102e,0xff634a01
-	.long	0x660861ff,0x000037de,0x60300c01,0x00016608
-	.long	0x61ff0000,0x64d66022,0x0c010002,0x660861ff
-	.long	0x0000657a,0x60140c01,0x00036608,0x61ff0000
-	.long	0x62fe6006,0x61ff0000,0x39ea4cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x0000f22e
-	.long	0x44000008,0xf22e6800,0xff6c41ee,0xff6c61ff
-	.long	0x00005f8e,0x1d40ff4e,0x120002ae,0x00ff00ff
-	.long	0xff644280,0x102eff63,0x4a016608,0x61ff0000
-	.long	0x39886030,0x0c010001,0x660861ff,0x0000643c
-	.long	0x60220c01,0x00026608,0x61ff0000,0x603a6014
-	.long	0x0c010003,0x660861ff,0x00006264,0x600661ff
-	.long	0x00003a04,0x4cee0303,0xff9cf22e,0x9800ff60
-	.long	0xf22ed040,0xffe84e5e,0x4e754e56,0xff4048ee
-	.long	0x0303ff9c,0xf22eb800,0xff60f22e,0xf0c0ffdc
-	.long	0xf23c9000,0x00000000,0xf22e5400,0x0008f22e
-	.long	0x6800ff6c,0x41eeff6c,0x61ff0000,0x5ef41d40
-	.long	0xff4e1200,0x02ae00ff,0x00ffff64,0x4280102e
-	.long	0xff631d41,0xff4e4a01,0x660861ff,0x000038ea
-	.long	0x60300c01,0x00016608,0x61ff0000,0x639e6022
-	.long	0x0c010002,0x660861ff,0x00005f9c,0x60140c01
-	.long	0x00036608,0x61ff0000,0x61c66006,0x61ff0000
-	.long	0x39664cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x000041ee,0xff6c216e,0x00080000
-	.long	0x216e000c,0x0004216e,0x00100008,0x61ff0000
-	.long	0x5e501d40,0xff4e1200,0x02ae00ff,0x00ffff64
-	.long	0x4280102e,0xff634a01,0x660861ff,0x0000384a
-	.long	0x60300c01,0x00016608,0x61ff0000,0x62fe6022
-	.long	0x0c010002,0x660861ff,0x00005efc,0x60140c01
-	.long	0x00036608,0x61ff0000,0x61266006,0x61ff0000
-	.long	0x38c64cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x0000f22e,0x44000008,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x00005db6,0x1d40ff4e
-	.long	0x120002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x4a016608,0x61ff0000,0x51d46030,0x0c010001
-	.long	0x660861ff,0x00006264,0x60220c01,0x00026608
-	.long	0x61ff0000,0x5e626014,0x0c010003,0x660861ff
-	.long	0x0000608c,0x600661ff,0x00005224,0x4cee0303
-	.long	0xff9cf22e,0x9800ff60,0xf22ed040,0xffe84e5e
-	.long	0x4e754e56,0xff4048ee,0x0303ff9c,0xf22eb800
-	.long	0xff60f22e,0xf0c0ffdc,0xf23c9000,0x00000000
-	.long	0xf22e5400,0x0008f22e,0x6800ff6c,0x41eeff6c
-	.long	0x61ff0000,0x5d1c1d40,0xff4e1200,0x02ae00ff
-	.long	0x00ffff64,0x4280102e,0xff631d41,0xff4e4a01
-	.long	0x660861ff,0x00005136,0x60300c01,0x00016608
-	.long	0x61ff0000,0x61c66022,0x0c010002,0x660861ff
-	.long	0x00005dc4,0x60140c01,0x00036608,0x61ff0000
-	.long	0x5fee6006,0x61ff0000,0x51864cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x000041ee
-	.long	0xff6c216e,0x00080000,0x216e000c,0x0004216e
-	.long	0x00100008,0x61ff0000,0x5c781d40,0xff4e1200
-	.long	0x02ae00ff,0x00ffff64,0x4280102e,0xff634a01
-	.long	0x660861ff,0x00005096,0x60300c01,0x00016608
-	.long	0x61ff0000,0x61266022,0x0c010002,0x660861ff
-	.long	0x00005d24,0x60140c01,0x00036608,0x61ff0000
-	.long	0x5f4e6006,0x61ff0000,0x50e64cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x0000f22e
-	.long	0x44000008,0xf22e6800,0xff6c41ee,0xff6c61ff
-	.long	0x00005bde,0x1d40ff4e,0x120002ae,0x00ff00ff
-	.long	0xff644280,0x102eff63,0x4a016608,0x61ff0000
-	.long	0x28066030,0x0c010001,0x660861ff,0x0000608c
-	.long	0x60220c01,0x00026608,0x61ff0000,0x5c8a6014
-	.long	0x0c010003,0x660861ff,0x00005eb4,0x600661ff
-	.long	0x00002938,0x4cee0303,0xff9cf22e,0x9800ff60
-	.long	0xf22ed040,0xffe84e5e,0x4e754e56,0xff4048ee
-	.long	0x0303ff9c,0xf22eb800,0xff60f22e,0xf0c0ffdc
-	.long	0xf23c9000,0x00000000,0xf22e5400,0x0008f22e
-	.long	0x6800ff6c,0x41eeff6c,0x61ff0000,0x5b441d40
-	.long	0xff4e1200,0x02ae00ff,0x00ffff64,0x4280102e
-	.long	0xff631d41,0xff4e4a01,0x660861ff,0x00002768
-	.long	0x60300c01,0x00016608,0x61ff0000,0x5fee6022
-	.long	0x0c010002,0x660861ff,0x00005bec,0x60140c01
-	.long	0x00036608,0x61ff0000,0x5e166006,0x61ff0000
-	.long	0x289a4cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x000041ee,0xff6c216e,0x00080000
-	.long	0x216e000c,0x0004216e,0x00100008,0x61ff0000
-	.long	0x5aa01d40,0xff4e1200,0x02ae00ff,0x00ffff64
-	.long	0x4280102e,0xff634a01,0x660861ff,0x000026c8
-	.long	0x60300c01,0x00016608,0x61ff0000,0x5f4e6022
-	.long	0x0c010002,0x660861ff,0x00005b4c,0x60140c01
-	.long	0x00036608,0x61ff0000,0x5d766006,0x61ff0000
-	.long	0x27fa4cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x0000f22e,0x44000008,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x00005a06,0x1d40ff4e
-	.long	0x120002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x4a016608,0x61ff0000,0x39e46030,0x0c010001
-	.long	0x660861ff,0x00005f30,0x60220c01,0x00026608
-	.long	0x61ff0000,0x5f026014,0x0c010003,0x660861ff
-	.long	0x00005cdc,0x600661ff,0x00003b5e,0x4cee0303
-	.long	0xff9cf22e,0x9800ff60,0xf22ed040,0xffe84e5e
-	.long	0x4e754e56,0xff4048ee,0x0303ff9c,0xf22eb800
-	.long	0xff60f22e,0xf0c0ffdc,0xf23c9000,0x00000000
-	.long	0xf22e5400,0x0008f22e,0x6800ff6c,0x41eeff6c
-	.long	0x61ff0000,0x596c1d40,0xff4e1200,0x02ae00ff
-	.long	0x00ffff64,0x4280102e,0xff631d41,0xff4e4a01
-	.long	0x660861ff,0x00003946,0x60300c01,0x00016608
-	.long	0x61ff0000,0x5e926022,0x0c010002,0x660861ff
-	.long	0x00005e64,0x60140c01,0x00036608,0x61ff0000
-	.long	0x5c3e6006,0x61ff0000,0x3ac04cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x000041ee
-	.long	0xff6c216e,0x00080000,0x216e000c,0x0004216e
-	.long	0x00100008,0x61ff0000,0x58c81d40,0xff4e1200
-	.long	0x02ae00ff,0x00ffff64,0x4280102e,0xff634a01
-	.long	0x660861ff,0x000038a6,0x60300c01,0x00016608
-	.long	0x61ff0000,0x5df26022,0x0c010002,0x660861ff
-	.long	0x00005dc4,0x60140c01,0x00036608,0x61ff0000
-	.long	0x5b9e6006,0x61ff0000,0x3a204cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x0000f22e
-	.long	0x44000008,0xf22e6800,0xff6c41ee,0xff6c61ff
-	.long	0x0000582e,0x1d40ff4e,0x120002ae,0x00ff00ff
-	.long	0xff644280,0x102eff63,0x4a016608,0x61ff0000
-	.long	0x522e6030,0x0c010001,0x660861ff,0x00005d58
-	.long	0x60220c01,0x00026608,0x61ff0000,0x5d2a6014
-	.long	0x0c010003,0x660861ff,0x00005b04,0x600661ff
-	.long	0x000052d6,0x4cee0303,0xff9cf22e,0x9800ff60
-	.long	0xf22ed040,0xffe84e5e,0x4e754e56,0xff4048ee
-	.long	0x0303ff9c,0xf22eb800,0xff60f22e,0xf0c0ffdc
-	.long	0xf23c9000,0x00000000,0xf22e5400,0x0008f22e
-	.long	0x6800ff6c,0x41eeff6c,0x61ff0000,0x57941d40
-	.long	0xff4e1200,0x02ae00ff,0x00ffff64,0x4280102e
-	.long	0xff631d41,0xff4e4a01,0x660861ff,0x00005190
-	.long	0x60300c01,0x00016608,0x61ff0000,0x5cba6022
-	.long	0x0c010002,0x660861ff,0x00005c8c,0x60140c01
-	.long	0x00036608,0x61ff0000,0x5a666006,0x61ff0000
-	.long	0x52384cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x000041ee,0xff6c216e,0x00080000
-	.long	0x216e000c,0x0004216e,0x00100008,0x61ff0000
-	.long	0x56f01d40,0xff4e1200,0x02ae00ff,0x00ffff64
-	.long	0x4280102e,0xff634a01,0x660861ff,0x000050f0
-	.long	0x60300c01,0x00016608,0x61ff0000,0x5c1a6022
-	.long	0x0c010002,0x660861ff,0x00005bec,0x60140c01
-	.long	0x00036608,0x61ff0000,0x59c66006,0x61ff0000
-	.long	0x51984cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x0000f22e,0x44000008,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x00005656,0x1d40ff4e
-	.long	0x120002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x4a016608,0x61ff0000,0x514e6030,0x0c010001
-	.long	0x660861ff,0x00005b80,0x60220c01,0x00026608
-	.long	0x61ff0000,0x5b526014,0x0c010003,0x660861ff
-	.long	0x0000592c,0x600661ff,0x0000524c,0x4cee0303
-	.long	0xff9cf22e,0x9800ff60,0xf22ed040,0xffe84e5e
-	.long	0x4e754e56,0xff4048ee,0x0303ff9c,0xf22eb800
-	.long	0xff60f22e,0xf0c0ffdc,0xf23c9000,0x00000000
-	.long	0xf22e5400,0x0008f22e,0x6800ff6c,0x41eeff6c
-	.long	0x61ff0000,0x55bc1d40,0xff4e1200,0x02ae00ff
-	.long	0x00ffff64,0x4280102e,0xff631d41,0xff4e4a01
-	.long	0x660861ff,0x000050b0,0x60300c01,0x00016608
-	.long	0x61ff0000,0x5ae26022,0x0c010002,0x660861ff
-	.long	0x00005ab4,0x60140c01,0x00036608,0x61ff0000
-	.long	0x588e6006,0x61ff0000,0x51ae4cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x000041ee
-	.long	0xff6c216e,0x00080000,0x216e000c,0x0004216e
-	.long	0x00100008,0x61ff0000,0x55181d40,0xff4e1200
-	.long	0x02ae00ff,0x00ffff64,0x4280102e,0xff634a01
-	.long	0x660861ff,0x00005010,0x60300c01,0x00016608
-	.long	0x61ff0000,0x5a426022,0x0c010002,0x660861ff
-	.long	0x00005a14,0x60140c01,0x00036608,0x61ff0000
-	.long	0x57ee6006,0x61ff0000,0x510e4cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x0000f22e
-	.long	0x44000008,0xf22e6800,0xff6c41ee,0xff6c61ff
-	.long	0x0000547e,0x1d40ff4e,0x120002ae,0x00ff00ff
-	.long	0xff644280,0x102eff63,0x4a016608,0x61ff0000
-	.long	0x45026030,0x0c010001,0x660861ff,0x000054c8
-	.long	0x60220c01,0x00026608,0x61ff0000,0x59826014
-	.long	0x0c010003,0x660861ff,0x00005754,0x600661ff
-	.long	0x00004682,0x4cee0303,0xff9cf22e,0x9800ff60
-	.long	0xf22ed040,0xffe84e5e,0x4e754e56,0xff4048ee
-	.long	0x0303ff9c,0xf22eb800,0xff60f22e,0xf0c0ffdc
-	.long	0xf23c9000,0x00000000,0xf22e5400,0x0008f22e
-	.long	0x6800ff6c,0x41eeff6c,0x61ff0000,0x53e41d40
-	.long	0xff4e1200,0x02ae00ff,0x00ffff64,0x4280102e
-	.long	0xff631d41,0xff4e4a01,0x660861ff,0x00004464
-	.long	0x60300c01,0x00016608,0x61ff0000,0x542a6022
-	.long	0x0c010002,0x660861ff,0x000058e4,0x60140c01
-	.long	0x00036608,0x61ff0000,0x56b66006,0x61ff0000
-	.long	0x45e44cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x000041ee,0xff6c216e,0x00080000
-	.long	0x216e000c,0x0004216e,0x00100008,0x61ff0000
-	.long	0x53401d40,0xff4e1200,0x02ae00ff,0x00ffff64
-	.long	0x4280102e,0xff634a01,0x660861ff,0x000043c4
-	.long	0x60300c01,0x00016608,0x61ff0000,0x538a6022
-	.long	0x0c010002,0x660861ff,0x00005844,0x60140c01
-	.long	0x00036608,0x61ff0000,0x56166006,0x61ff0000
-	.long	0x45444cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x0000f22e,0x44000008,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x000052a6,0x1d40ff4e
-	.long	0x120002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x4a016608,0x61ff0000,0x476c6030,0x0c010001
-	.long	0x660861ff,0x000052f0,0x60220c01,0x00026608
-	.long	0x61ff0000,0x57aa6014,0x0c010003,0x660861ff
-	.long	0x0000557c,0x600661ff,0x0000476a,0x4cee0303
-	.long	0xff9cf22e,0x9800ff60,0xf22ed040,0xffe84e5e
-	.long	0x4e754e56,0xff4048ee,0x0303ff9c,0xf22eb800
-	.long	0xff60f22e,0xf0c0ffdc,0xf23c9000,0x00000000
-	.long	0xf22e5400,0x0008f22e,0x6800ff6c,0x41eeff6c
-	.long	0x61ff0000,0x520c1d40,0xff4e1200,0x02ae00ff
-	.long	0x00ffff64,0x4280102e,0xff631d41,0xff4e4a01
-	.long	0x660861ff,0x000046ce,0x60300c01,0x00016608
-	.long	0x61ff0000,0x52526022,0x0c010002,0x660861ff
-	.long	0x0000570c,0x60140c01,0x00036608,0x61ff0000
-	.long	0x54de6006,0x61ff0000,0x46cc4cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x000041ee
-	.long	0xff6c216e,0x00080000,0x216e000c,0x0004216e
-	.long	0x00100008,0x61ff0000,0x51681d40,0xff4e1200
-	.long	0x02ae00ff,0x00ffff64,0x4280102e,0xff634a01
-	.long	0x660861ff,0x0000462e,0x60300c01,0x00016608
-	.long	0x61ff0000,0x51b26022,0x0c010002,0x660861ff
-	.long	0x0000566c,0x60140c01,0x00036608,0x61ff0000
-	.long	0x543e6006,0x61ff0000,0x462c4cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x0000f22e
-	.long	0x44000008,0xf22e6800,0xff6c41ee,0xff6c61ff
-	.long	0x000050ce,0x1d40ff4e,0x120002ae,0x00ff00ff
-	.long	0xff644280,0x102eff63,0x4a016608,0x61ff0000
-	.long	0x45e46030,0x0c010001,0x660861ff,0x00005118
-	.long	0x60220c01,0x00026608,0x61ff0000,0x55d26014
-	.long	0x0c010003,0x660861ff,0x000053a4,0x600661ff
-	.long	0x0000460c,0x4cee0303,0xff9cf22e,0x9800ff60
-	.long	0xf22ed040,0xffe84e5e,0x4e754e56,0xff4048ee
-	.long	0x0303ff9c,0xf22eb800,0xff60f22e,0xf0c0ffdc
-	.long	0xf23c9000,0x00000000,0xf22e5400,0x0008f22e
-	.long	0x6800ff6c,0x41eeff6c,0x61ff0000,0x50341d40
-	.long	0xff4e1200,0x02ae00ff,0x00ffff64,0x4280102e
-	.long	0xff631d41,0xff4e4a01,0x660861ff,0x00004546
-	.long	0x60300c01,0x00016608,0x61ff0000,0x507a6022
-	.long	0x0c010002,0x660861ff,0x00005534,0x60140c01
-	.long	0x00036608,0x61ff0000,0x53066006,0x61ff0000
-	.long	0x456e4cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x000041ee,0xff6c216e,0x00080000
-	.long	0x216e000c,0x0004216e,0x00100008,0x61ff0000
-	.long	0x4f901d40,0xff4e1200,0x02ae00ff,0x00ffff64
-	.long	0x4280102e,0xff634a01,0x660861ff,0x000044a6
-	.long	0x60300c01,0x00016608,0x61ff0000,0x4fda6022
-	.long	0x0c010002,0x660861ff,0x00005494,0x60140c01
-	.long	0x00036608,0x61ff0000,0x52666006,0x61ff0000
-	.long	0x44ce4cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x0000f22e,0x44000008,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x00004ef6,0x1d40ff4e
-	.long	0x120002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x4a016608,0x61ff0000,0x33da6030,0x0c010001
-	.long	0x660861ff,0x00005420,0x60220c01,0x00026608
-	.long	0x61ff0000,0x53ca6014,0x0c010003,0x660861ff
-	.long	0x000051cc,0x600661ff,0x0000344c,0x4cee0303
-	.long	0xff9cf22e,0x9800ff60,0xf22ed040,0xffe84e5e
-	.long	0x4e754e56,0xff4048ee,0x0303ff9c,0xf22eb800
-	.long	0xff60f22e,0xf0c0ffdc,0xf23c9000,0x00000000
-	.long	0xf22e5400,0x0008f22e,0x6800ff6c,0x41eeff6c
-	.long	0x61ff0000,0x4e5c1d40,0xff4e1200,0x02ae00ff
-	.long	0x00ffff64,0x4280102e,0xff631d41,0xff4e4a01
-	.long	0x660861ff,0x0000333c,0x60300c01,0x00016608
-	.long	0x61ff0000,0x53826022,0x0c010002,0x660861ff
-	.long	0x0000532c,0x60140c01,0x00036608,0x61ff0000
-	.long	0x512e6006,0x61ff0000,0x33ae4cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x000041ee
-	.long	0xff6c216e,0x00080000,0x216e000c,0x0004216e
-	.long	0x00100008,0x61ff0000,0x4db81d40,0xff4e1200
-	.long	0x02ae00ff,0x00ffff64,0x4280102e,0xff634a01
-	.long	0x660861ff,0x0000329c,0x60300c01,0x00016608
-	.long	0x61ff0000,0x52e26022,0x0c010002,0x660861ff
-	.long	0x0000528c,0x60140c01,0x00036608,0x61ff0000
-	.long	0x508e6006,0x61ff0000,0x330e4cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x0000f22e
-	.long	0x44000008,0xf22e6800,0xff6c41ee,0xff6c61ff
-	.long	0x00004d1e,0x1d40ff4e,0x120002ae,0x00ff00ff
-	.long	0xff644280,0x102eff63,0x4a016608,0x61ff0000
-	.long	0x27cc6030,0x0c010001,0x660861ff,0x00005284
-	.long	0x60220c01,0x00026608,0x61ff0000,0x4dca6014
-	.long	0x0c010003,0x660861ff,0x00004ff4,0x600661ff
-	.long	0x0000282a,0x4cee0303,0xff9cf22e,0x9800ff60
-	.long	0xf22ed040,0xffe84e5e,0x4e754e56,0xff4048ee
-	.long	0x0303ff9c,0xf22eb800,0xff60f22e,0xf0c0ffdc
-	.long	0xf23c9000,0x00000000,0xf22e5400,0x0008f22e
-	.long	0x6800ff6c,0x41eeff6c,0x61ff0000,0x4c841d40
-	.long	0xff4e1200,0x02ae00ff,0x00ffff64,0x4280102e
-	.long	0xff631d41,0xff4e4a01,0x660861ff,0x0000272e
-	.long	0x60300c01,0x00016608,0x61ff0000,0x51e66022
-	.long	0x0c010002,0x660861ff,0x00004d2c,0x60140c01
-	.long	0x00036608,0x61ff0000,0x4f566006,0x61ff0000
-	.long	0x278c4cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x000041ee,0xff6c216e,0x00080000
-	.long	0x216e000c,0x0004216e,0x00100008,0x61ff0000
-	.long	0x4be01d40,0xff4e1200,0x02ae00ff,0x00ffff64
-	.long	0x4280102e,0xff634a01,0x660861ff,0x0000268e
-	.long	0x60300c01,0x00016608,0x61ff0000,0x51466022
-	.long	0x0c010002,0x660861ff,0x00004c8c,0x60140c01
-	.long	0x00036608,0x61ff0000,0x4eb66006,0x61ff0000
-	.long	0x26ec4cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x0000f22e,0x44000008,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x00004b46,0x1d40ff4e
-	.long	0x120002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x4a016608,0x61ff0000,0x2fb06030,0x0c010001
-	.long	0x660861ff,0x00004ff4,0x60220c01,0x00026608
-	.long	0x61ff0000,0x4bf26014,0x0c010003,0x660861ff
-	.long	0x00004e1c,0x600661ff,0x00002f9a,0x4cee0303
-	.long	0xff9cf22e,0x9800ff60,0xf22ed040,0xffe84e5e
-	.long	0x4e754e56,0xff4048ee,0x0303ff9c,0xf22eb800
-	.long	0xff60f22e,0xf0c0ffdc,0xf23c9000,0x00000000
-	.long	0xf22e5400,0x0008f22e,0x6800ff6c,0x41eeff6c
-	.long	0x61ff0000,0x4aac1d40,0xff4e1200,0x02ae00ff
-	.long	0x00ffff64,0x4280102e,0xff631d41,0xff4e4a01
-	.long	0x660861ff,0x00002f12,0x60300c01,0x00016608
-	.long	0x61ff0000,0x4f566022,0x0c010002,0x660861ff
-	.long	0x00004b54,0x60140c01,0x00036608,0x61ff0000
-	.long	0x4d7e6006,0x61ff0000,0x2efc4cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x000041ee
-	.long	0xff6c216e,0x00080000,0x216e000c,0x0004216e
-	.long	0x00100008,0x61ff0000,0x4a081d40,0xff4e1200
-	.long	0x02ae00ff,0x00ffff64,0x4280102e,0xff634a01
-	.long	0x660861ff,0x00002e72,0x60300c01,0x00016608
-	.long	0x61ff0000,0x4eb66022,0x0c010002,0x660861ff
-	.long	0x00004ab4,0x60140c01,0x00036608,0x61ff0000
-	.long	0x4cde6006,0x61ff0000,0x2e5c4cee,0x0303ff9c
-	.long	0xf22e9800,0xff60f22e,0xd040ffe8,0x4e5e4e75
-	.long	0x4e56ff40,0x48ee0303,0xff9cf22e,0xb800ff60
-	.long	0xf22ef0c0,0xffdcf23c,0x90000000,0x0000f22e
-	.long	0x44000008,0xf22e6800,0xff6c41ee,0xff6c61ff
-	.long	0x0000496e,0x1d40ff4e,0x120002ae,0x00ff00ff
-	.long	0xff644280,0x102eff63,0x4a016608,0x61ff0000
-	.long	0x2e0c6030,0x0c010001,0x660861ff,0x00004e1c
-	.long	0x60220c01,0x00026608,0x61ff0000,0x4a1a6014
-	.long	0x0c010003,0x660861ff,0x00004c44,0x600661ff
-	.long	0x00002e08,0x4cee0303,0xff9cf22e,0x9800ff60
-	.long	0xf22ed040,0xffe84e5e,0x4e754e56,0xff4048ee
-	.long	0x0303ff9c,0xf22eb800,0xff60f22e,0xf0c0ffdc
-	.long	0xf23c9000,0x00000000,0xf22e5400,0x0008f22e
-	.long	0x6800ff6c,0x41eeff6c,0x61ff0000,0x48d41d40
-	.long	0xff4e1200,0x02ae00ff,0x00ffff64,0x4280102e
-	.long	0xff631d41,0xff4e4a01,0x660861ff,0x00002d6e
-	.long	0x60300c01,0x00016608,0x61ff0000,0x4d7e6022
-	.long	0x0c010002,0x660861ff,0x0000497c,0x60140c01
-	.long	0x00036608,0x61ff0000,0x4ba66006,0x61ff0000
-	.long	0x2d6a4cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x000041ee,0xff6c216e,0x00080000
-	.long	0x216e000c,0x0004216e,0x00100008,0x61ff0000
-	.long	0x48301d40,0xff4e1200,0x02ae00ff,0x00ffff64
-	.long	0x4280102e,0xff634a01,0x660861ff,0x00002cce
-	.long	0x60300c01,0x00016608,0x61ff0000,0x4cde6022
-	.long	0x0c010002,0x660861ff,0x000048dc,0x60140c01
-	.long	0x00036608,0x61ff0000,0x4b066006,0x61ff0000
-	.long	0x2cca4cee,0x0303ff9c,0xf22e9800,0xff60f22e
-	.long	0xd040ffe8,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x0000f22e,0x44000008,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x00004796,0x1d40ff4e
-	.long	0x120002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x4a016608,0x61ff0000,0x0af46030,0x0c010001
-	.long	0x660861ff,0x00004d18,0x60220c01,0x00026608
-	.long	0x61ff0000,0x4d386014,0x0c010003,0x660861ff
-	.long	0x00004d34,0x600661ff,0x00000d58,0x4cee0303
-	.long	0xff9cf22e,0x9800ff60,0xf227e003,0xf21fd040
-	.long	0xf21fd080,0x4e5e4e75,0x4e56ff40,0x48ee0303
-	.long	0xff9cf22e,0xb800ff60,0xf22ef0c0,0xffdcf23c
-	.long	0x90000000,0x0000f22e,0x54000008,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x000046f6,0x1d40ff4e
-	.long	0x120002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x1d41ff4e,0x4a016608,0x61ff0000,0x0a506030
-	.long	0x0c010001,0x660861ff,0x00004c74,0x60220c01
-	.long	0x00026608,0x61ff0000,0x4c946014,0x0c010003
-	.long	0x660861ff,0x00004c90,0x600661ff,0x00000cb4
-	.long	0x4cee0303,0xff9cf22e,0x9800ff60,0xf227e003
-	.long	0xf21fd040,0xf21fd080,0x4e5e4e75,0x4e56ff40
-	.long	0x48ee0303,0xff9cf22e,0xb800ff60,0xf22ef0c0
-	.long	0xffdcf23c,0x90000000,0x000041ee,0xff6c216e
-	.long	0x00080000,0x216e000c,0x0004216e,0x00100008
-	.long	0x61ff0000,0x464c1d40,0xff4e1200,0x02ae00ff
-	.long	0x00ffff64,0x4280102e,0xff634a01,0x660861ff
-	.long	0x000009aa,0x60300c01,0x00016608,0x61ff0000
-	.long	0x4bce6022,0x0c010002,0x660861ff,0x00004bee
-	.long	0x60140c01,0x00036608,0x61ff0000,0x4bea6006
-	.long	0x61ff0000,0x0c0e4cee,0x0303ff9c,0xf22e9800
-	.long	0xff60f227,0xe003f21f,0xd040f21f,0xd0804e5e
-	.long	0x4e754e56,0xff4048ee,0x0303ff9c,0xf22eb800
-	.long	0xff60f22e,0xf0c0ffdc,0xf23c9000,0x00000000
-	.long	0xf22e4400,0x0008f22e,0x6800ff78,0x41eeff78
-	.long	0x61ff0000,0x45ac1d40,0xff4ff22e,0x4400000c
-	.long	0xf22e6800,0xff6c41ee,0xff6c61ff,0x00004592
-	.long	0x1d40ff4e,0x220002ae,0x00ff00ff,0xff644280
-	.long	0x102eff63,0x41eeff6c,0x43eeff78,0x4a016608
-	.long	0x61ff0000,0x4c466030,0x0c010001,0x660861ff
-	.long	0x00004c64,0x60220c01,0x00026608,0x61ff0000
-	.long	0x4c846014,0x0c010003,0x660861ff,0x00004d16
-	.long	0x600661ff,0x00004c14,0x4cee0303,0xff9cf22e
-	.long	0x9800ff60,0xf22ed040,0xffe84e5e,0x4e754e56
-	.long	0xff4048ee,0x0303ff9c,0xf22eb800,0xff60f22e
-	.long	0xf0c0ffdc,0xf23c9000,0x00000000,0xf22e5400
-	.long	0x0008f22e,0x6800ff78,0x41eeff78,0x61ff0000
-	.long	0x44f01d40,0xff4ff22e,0x54000010,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x000044d6,0x1d40ff4e
-	.long	0x220002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x41eeff6c,0x43eeff78,0x4a016608,0x61ff0000
-	.long	0x4b8a6030,0x0c010001,0x660861ff,0x00004ba8
-	.long	0x60220c01,0x00026608,0x61ff0000,0x4bc86014
-	.long	0x0c010003,0x660861ff,0x00004c5a,0x600661ff
-	.long	0x00004b58,0x4cee0303,0xff9cf22e,0x9800ff60
-	.long	0xf22ed040,0xffe84e5e,0x4e754e56,0xff4048ee
-	.long	0x0303ff9c,0xf22eb800,0xff60f22e,0xf0c0ffdc
-	.long	0xf23c9000,0x00000000,0x41eeff78,0x216e0008
-	.long	0x0000216e,0x000c0004,0x216e0010,0x000861ff
-	.long	0x0000442e,0x1d40ff4f,0x41eeff6c,0x216e0014
-	.long	0x0000216e,0x00180004,0x216e001c,0x000861ff
-	.long	0x0000440e,0x1d40ff4e,0x220002ae,0x00ff00ff
-	.long	0xff644280,0x102eff63,0x41eeff6c,0x43eeff78
-	.long	0x4a016608,0x61ff0000,0x4ac26030,0x0c010001
-	.long	0x660861ff,0x00004ae0,0x60220c01,0x00026608
-	.long	0x61ff0000,0x4b006014,0x0c010003,0x660861ff
-	.long	0x00004b92,0x600661ff,0x00004a90,0x4cee0303
-	.long	0xff9cf22e,0x9800ff60,0xf22ed040,0xffe84e5e
-	.long	0x4e754e56,0xff4048ee,0x0303ff9c,0xf22eb800
-	.long	0xff60f22e,0xf0c0ffdc,0xf23c9000,0x00000000
-	.long	0xf22e4400,0x0008f22e,0x6800ff78,0x41eeff78
-	.long	0x61ff0000,0x436c1d40,0xff4ff22e,0x4400000c
-	.long	0xf22e6800,0xff6c41ee,0xff6c61ff,0x00004352
-	.long	0x1d40ff4e,0x220002ae,0x00ff00ff,0xff644280
-	.long	0x102eff63,0x41eeff6c,0x43eeff78,0x4a016608
-	.long	0x61ff0000,0x491c6030,0x0c010001,0x660861ff
-	.long	0x0000493a,0x60220c01,0x00026608,0x61ff0000
-	.long	0x495a6014,0x0c010003,0x660861ff,0x00004ad6
-	.long	0x600661ff,0x000048ea,0x4cee0303,0xff9cf22e
-	.long	0x9800ff60,0xf22ed040,0xffe84e5e,0x4e754e56
-	.long	0xff4048ee,0x0303ff9c,0xf22eb800,0xff60f22e
-	.long	0xf0c0ffdc,0xf23c9000,0x00000000,0xf22e5400
-	.long	0x0008f22e,0x6800ff78,0x41eeff78,0x61ff0000
-	.long	0x42b01d40,0xff4ff22e,0x54000010,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x00004296,0x1d40ff4e
-	.long	0x220002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x41eeff6c,0x43eeff78,0x4a016608,0x61ff0000
-	.long	0x48606030,0x0c010001,0x660861ff,0x0000487e
-	.long	0x60220c01,0x00026608,0x61ff0000,0x489e6014
-	.long	0x0c010003,0x660861ff,0x00004a1a,0x600661ff
-	.long	0x0000482e,0x4cee0303,0xff9cf22e,0x9800ff60
-	.long	0xf22ed040,0xffe84e5e,0x4e754e56,0xff4048ee
-	.long	0x0303ff9c,0xf22eb800,0xff60f22e,0xf0c0ffdc
-	.long	0xf23c9000,0x00000000,0x41eeff78,0x216e0008
-	.long	0x0000216e,0x000c0004,0x216e0010,0x000861ff
-	.long	0x000041ee,0x1d40ff4f,0x41eeff6c,0x216e0014
-	.long	0x0000216e,0x00180004,0x216e001c,0x000861ff
-	.long	0x000041ce,0x1d40ff4e,0x220002ae,0x00ff00ff
-	.long	0xff644280,0x102eff63,0x41eeff6c,0x43eeff78
-	.long	0x4a016608,0x61ff0000,0x47986030,0x0c010001
-	.long	0x660861ff,0x000047b6,0x60220c01,0x00026608
-	.long	0x61ff0000,0x47d66014,0x0c010003,0x660861ff
-	.long	0x00004952,0x600661ff,0x00004766,0x4cee0303
-	.long	0xff9cf22e,0x9800ff60,0xf22ed040,0xffe84e5e
-	.long	0x4e754e56,0xff4048ee,0x0303ff9c,0xf22eb800
-	.long	0xff60f22e,0xf0c0ffdc,0xf23c9000,0x00000000
-	.long	0xf22e4400,0x0008f22e,0x6800ff78,0x41eeff78
-	.long	0x61ff0000,0x412c1d40,0xff4ff22e,0x4400000c
-	.long	0xf22e6800,0xff6c41ee,0xff6c61ff,0x00004112
-	.long	0x1d40ff4e,0x220002ae,0x00ff00ff,0xff644280
-	.long	0x102eff63,0x41eeff6c,0x43eeff78,0x4a016608
-	.long	0x61ff0000,0x484a6030,0x0c010001,0x660861ff
-	.long	0x0000486a,0x60220c01,0x00026608,0x61ff0000
-	.long	0x488a6014,0x0c010003,0x660861ff,0x00004896
-	.long	0x600661ff,0x00004818,0x4cee0303,0xff9cf22e
-	.long	0x9800ff60,0xf22ed040,0xffe84e5e,0x4e754e56
-	.long	0xff4048ee,0x0303ff9c,0xf22eb800,0xff60f22e
-	.long	0xf0c0ffdc,0xf23c9000,0x00000000,0xf22e5400
-	.long	0x0008f22e,0x6800ff78,0x41eeff78,0x61ff0000
-	.long	0x40701d40,0xff4ff22e,0x54000010,0xf22e6800
-	.long	0xff6c41ee,0xff6c61ff,0x00004056,0x1d40ff4e
-	.long	0x220002ae,0x00ff00ff,0xff644280,0x102eff63
-	.long	0x41eeff6c,0x43eeff78,0x4a016608,0x61ff0000
-	.long	0x478e6030,0x0c010001,0x660861ff,0x000047ae
-	.long	0x60220c01,0x00026608,0x61ff0000,0x47ce6014
-	.long	0x0c010003,0x660861ff,0x000047da,0x600661ff
-	.long	0x0000475c,0x4cee0303,0xff9cf22e,0x9800ff60
-	.long	0xf22ed040,0xffe84e5e,0x4e754e56,0xff4048ee
-	.long	0x0303ff9c,0xf22eb800,0xff60f22e,0xf0c0ffdc
-	.long	0xf23c9000,0x00000000,0x41eeff78,0x216e0008
-	.long	0x0000216e,0x000c0004,0x216e0010,0x000861ff
-	.long	0x00003fae,0x1d40ff4f,0x41eeff6c,0x216e0014
-	.long	0x0000216e,0x00180004,0x216e001c,0x000861ff
-	.long	0x00003f8e,0x1d40ff4e,0x220002ae,0x00ff00ff
-	.long	0xff644280,0x102eff63,0x41eeff6c,0x43eeff78
-	.long	0x4a016608,0x61ff0000,0x46c66030,0x0c010001
-	.long	0x660861ff,0x000046e6,0x60220c01,0x00026608
-	.long	0x61ff0000,0x47066014,0x0c010003,0x660861ff
-	.long	0x00004712,0x600661ff,0x00004694,0x4cee0303
-	.long	0xff9cf22e,0x9800ff60,0xf22ed040,0xffe84e5e
-	.long	0x4e75bd6a,0xaa77ccc9,0x94f53de6,0x12097aae
-	.long	0x8da1be5a,0xe6452a11,0x8ae43ec7,0x1de3a534
-	.long	0x1531bf2a,0x01a01a01,0x8b590000,0x00000000
-	.long	0x00003ff8,0x00008888,0x88888888,0x59af0000
-	.long	0x0000bffc,0x0000aaaa,0xaaaaaaaa,0xaa990000
-	.long	0x00003d2a,0xc4d0d601,0x1ee3bda9,0x396f9f45
-	.long	0xac193e21,0xeed90612,0xc972be92,0x7e4fb79d
-	.long	0x9fcf3efa,0x01a01a01,0xd4230000,0x00000000
-	.long	0x0000bff5,0x0000b60b,0x60b60b61,0xd4380000
-	.long	0x00003ffa,0x0000aaaa,0xaaaaaaaa,0xab5ebf00
-	.long	0x00002d7c,0x00000000,0xff5c6008,0x2d7c0000
-	.long	0x0001ff5c,0xf2104800,0xf22e6800,0xff842210
-	.long	0x32280004,0x02817fff,0xffff0c81,0x3fd78000
-	.long	0x6c046000,0x01780c81,0x4004bc7e,0x6d046000
-	.long	0x0468f200,0x0080f23a,0x54a3d186,0x43fb0170
-	.long	0x00000866,0xf22e6080,0xff58222e,0xff58e981
-	.long	0xd3c1f219,0x4828f211,0x4428222e,0xff58d2ae
-	.long	0xff5ce299,0x0c810000,0x00006d00,0x0088f227
-	.long	0xe00cf22e,0x6800ff84,0xf2000023,0xf23a5580
-	.long	0xfed2f23a,0x5500fed4,0xf2000080,0xf20004a3
-	.long	0xe2990281,0x80000000,0xb3aeff84,0xf20005a3
-	.long	0xf2000523,0xf23a55a2,0xfebaf23a,0x5522febc
-	.long	0xf20005a3,0xf2000523,0xf23a55a2,0xfeb6f23a
-	.long	0x4922fec0,0xf2000ca3,0xf2000123,0xf23a48a2
-	.long	0xfec2f22e,0x4823ff84,0xf20008a2,0xf2000423
-	.long	0xf21fd030,0xf2009000,0xf22e4822,0xff8460ff
-	.long	0x00004006,0xf227e00c,0xf2000023,0xf23a5500
-	.long	0xfea2f23a,0x5580fea4,0xf2000080,0xf20004a3
-	.long	0xf22e6800,0xff84e299,0x02818000,0x0000f200
-	.long	0x0523b3ae,0xff840281,0x80000000,0xf20005a3
-	.long	0x00813f80,0x00002d41,0xff54f23a,0x5522fe74
-	.long	0xf23a55a2,0xfe76f200,0x0523f200,0x05a3f23a
-	.long	0x5522fe70,0xf23a49a2,0xfe7af200,0x0523f200
-	.long	0x0ca3f23a,0x4922fe7c,0xf23a44a2,0xfe82f200
-	.long	0x0823f200,0x0422f22e,0x4823ff84,0xf21fd030
-	.long	0xf2009000,0xf22e4422,0xff5460ff,0x00003f6a
-	.long	0x0c813fff,0x80006eff,0x00000300,0x222eff5c
-	.long	0x0c810000,0x00006e14,0xf2009000,0x123c0003
-	.long	0xf22e4800,0xff8460ff,0x00003f36,0xf23c4400
-	.long	0x3f800000,0xf2009000,0xf23c4422,0x80800000
-	.long	0x60ff0000,0x3f2c60ff,0x00003f64,0xf23c4400
-	.long	0x3f800000,0x60ff0000,0x3f182d7c,0x00000004
-	.long	0xff5cf210,0x4800f22e,0x6800ff84,0x22103228
-	.long	0x00040281,0x7fffffff,0x0c813fd7,0x80006c04
-	.long	0x60000240,0x0c814004,0xbc7e6d04,0x6000027a
-	.long	0xf2000080,0xf23a54a3,0xcf9843fb,0x01700000
-	.long	0x0678f22e,0x6080ff58,0x222eff58,0xe981d3c1
-	.long	0xf2194828,0xf2114428,0x222eff58,0xe2990c81
-	.long	0x00000000,0x6c000106,0xf227e004,0xf22e6800
-	.long	0xff84f200,0x0023f23a,0x5480fce8,0xf23a5500
-	.long	0xfd32f200,0x00a3f200,0x01232f02,0x2401e29a
-	.long	0x02828000,0x0000b382,0x02828000,0x0000f23a
-	.long	0x54a2fcc8,0xf23a5522,0xfd12f200,0x00a3b5ae
-	.long	0xff84241f,0xf2000123,0xe2990281,0x80000000
-	.long	0x2d7c3f80,0x0000ff54,0xb3aeff54,0xf23a54a2
-	.long	0xfca2f23a,0x5522fcec,0xf20000a3,0xf2000123
-	.long	0xf22e6800,0xff90f23a,0x54a2fc90,0xb3aeff90
-	.long	0xf23a5522,0xfcd6f200,0x00a3f200,0x0123f23a
-	.long	0x54a2fc80,0xf23a5522,0xfccaf200,0x00a3f200
-	.long	0x0123f23a,0x48a2fc7c,0xf23a4922,0xfcc6f200
-	.long	0x00a3f200,0x0123f23a,0x48a2fc78,0xf23a4922
-	.long	0xfcc2f200,0x00a3f200,0x0823f22e,0x48a3ff84
-	.long	0xf23a4422,0xfcbaf22e,0x4823ff90,0xf21fd020
-	.long	0xf2009000,0xf22e48a2,0xff8461ff,0x00003e22
-	.long	0xf22e4422,0xff5460ff,0x00003d9e,0xf227e004
-	.long	0xf22e6800,0xff84f200,0x0023f23a,0x5480fc34
-	.long	0xf23a5500,0xfbdef200,0x00a3f22e,0x6800ff90
-	.long	0xf2000123,0xe2990281,0x80000000,0xf23a54a2
-	.long	0xfc1af23a,0x5522fbc4,0xb3aeff84,0xb3aeff90
-	.long	0xf20000a3,0x00813f80,0x00002d41,0xff54f200
-	.long	0x0123f23a,0x54a2fbfc,0xf23a5522,0xfba6f200
-	.long	0x00a3f200,0x0123f23a,0x54a2fbf0,0xf23a5522
-	.long	0xfb9af200,0x00a3f200,0x0123f23a,0x54a2fbe4
-	.long	0xf23a5522,0xfb8ef200,0x00a3f200,0x0123f23a
-	.long	0x48a2fbe0,0xf23a4922,0xfb8af200,0x00a3f200
-	.long	0x0123f23a,0x48a2fbdc,0xf23a4922,0xfb86f200
-	.long	0x00a3f200,0x0823f23a,0x44a2fbd4,0xf22e4823
-	.long	0xff84f22e,0x48a3ff90,0xf21fd020,0xf2009000
-	.long	0xf22e44a2,0xff5461ff,0x00003d36,0xf22e4822
-	.long	0xff8460ff,0x00003cb2,0x0c813fff,0x80006e00
-	.long	0x0048f23c,0x44803f80,0x0000f200,0x9000f23c
-	.long	0x44a80080,0x000061ff,0x00003d06,0xf200b000
-	.long	0x123c0003,0xf22e4800,0xff8460ff,0x00003c72
-	.long	0x2f00f23c,0x44803f80,0x000061ff,0x00003ce2
-	.long	0x201f60ff,0x00003ca8,0xf227e03c,0x2f02f23c
-	.long	0x44800000,0x00000c81,0x7ffeffff,0x66523d7c
-	.long	0x7ffeff84,0x2d7cc90f,0xdaa2ff88,0x42aeff8c
-	.long	0x3d7c7fdc,0xff902d7c,0x85a308d3,0xff9442ae
-	.long	0xff98f200,0x003af294,0x000e002e,0x0080ff84
-	.long	0x002e0080,0xff90f22e,0x4822ff84,0xf2000080
-	.long	0xf22e4822,0xff90f200,0x00a8f22e,0x48a2ff90
-	.long	0xf22e6800,0xff84322e,0xff842241,0x02810000
-	.long	0x7fff0481,0x00003fff,0x0c810000,0x001c6f0e
-	.long	0x04810000,0x001b1d7c,0x0000ff58,0x60084281
-	.long	0x1d7c0001,0xff58243c,0x00003ffe,0x94812d7c
-	.long	0xa2f9836e,0xff882d7c,0x4e44152a,0xff8c3d42
-	.long	0xff84f200,0x0100f22e,0x4923ff84,0x24094842
-	.long	0x02828000,0x00000082,0x5f000000,0x2d42ff54
-	.long	0xf22e4522,0xff54f22e,0x4528ff54,0x24010682
-	.long	0x00003fff,0x3d42ff84,0x2d7cc90f,0xdaa2ff88
-	.long	0x42aeff8c,0x06810000,0x3fdd3d41,0xff902d7c
-	.long	0x85a308d3,0xff9442ae,0xff98122e,0xff58f200
-	.long	0x0a00f22e,0x4a23ff84,0xf2000a80,0xf22e4aa3
-	.long	0xff90f200,0x1180f200,0x15a2f200,0x0e28f200
-	.long	0x0c28f200,0x1622f200,0x0180f200,0x10a8f200
-	.long	0x04220c01,0x00006e00,0x000ef200,0x01a8f200
-	.long	0x0ca26000,0xff0cf22e,0x6100ff58,0x241ff21f
-	.long	0xd03c222e,0xff5c0c81,0x00000004,0x6d00fa4c
-	.long	0x6000fc36,0x3ea0b759,0xf50f8688,0xbef2baa5
-	.long	0xa8924f04,0xbf346f59,0xb39ba65f,0x00000000
-	.long	0x00000000,0x3ff60000,0xe073d3fc,0x199c4a00
-	.long	0x00000000,0x3ff90000,0xd23cd684,0x15d95fa1
-	.long	0x00000000,0xbffc0000,0x8895a6c5,0xfb423bca
-	.long	0x00000000,0xbffd0000,0xeef57e0d,0xa84bc8ce
-	.long	0x00000000,0x3ffc0000,0xa2f9836e,0x4e44152a
-	.long	0x00000000,0x40010000,0xc90fdaa2,0x00000000
-	.long	0x00000000,0x3fdf0000,0x85a308d4,0x00000000
-	.long	0x00000000,0xc0040000,0xc90fdaa2,0x2168c235
-	.long	0x21800000,0xc0040000,0xc2c75bcd,0x105d7c23
-	.long	0xa0d00000,0xc0040000,0xbc7edcf7,0xff523611
-	.long	0xa1e80000,0xc0040000,0xb6365e22,0xee46f000
-	.long	0x21480000,0xc0040000,0xafeddf4d,0xdd3ba9ee
-	.long	0xa1200000,0xc0040000,0xa9a56078,0xcc3063dd
-	.long	0x21fc0000,0xc0040000,0xa35ce1a3,0xbb251dcb
-	.long	0x21100000,0xc0040000,0x9d1462ce,0xaa19d7b9
-	.long	0xa1580000,0xc0040000,0x96cbe3f9,0x990e91a8
-	.long	0x21e00000,0xc0040000,0x90836524,0x88034b96
-	.long	0x20b00000,0xc0040000,0x8a3ae64f,0x76f80584
-	.long	0xa1880000,0xc0040000,0x83f2677a,0x65ecbf73
-	.long	0x21c40000,0xc0030000,0xfb53d14a,0xa9c2f2c2
-	.long	0x20000000,0xc0030000,0xeec2d3a0,0x87ac669f
-	.long	0x21380000,0xc0030000,0xe231d5f6,0x6595da7b
-	.long	0xa1300000,0xc0030000,0xd5a0d84c,0x437f4e58
-	.long	0x9fc00000,0xc0030000,0xc90fdaa2,0x2168c235
-	.long	0x21000000,0xc0030000,0xbc7edcf7,0xff523611
-	.long	0xa1680000,0xc0030000,0xafeddf4d,0xdd3ba9ee
-	.long	0xa0a00000,0xc0030000,0xa35ce1a3,0xbb251dcb
-	.long	0x20900000,0xc0030000,0x96cbe3f9,0x990e91a8
-	.long	0x21600000,0xc0030000,0x8a3ae64f,0x76f80584
-	.long	0xa1080000,0xc0020000,0xfb53d14a,0xa9c2f2c2
-	.long	0x1f800000,0xc0020000,0xe231d5f6,0x6595da7b
-	.long	0xa0b00000,0xc0020000,0xc90fdaa2,0x2168c235
-	.long	0x20800000,0xc0020000,0xafeddf4d,0xdd3ba9ee
-	.long	0xa0200000,0xc0020000,0x96cbe3f9,0x990e91a8
-	.long	0x20e00000,0xc0010000,0xfb53d14a,0xa9c2f2c2
-	.long	0x1f000000,0xc0010000,0xc90fdaa2,0x2168c235
-	.long	0x20000000,0xc0010000,0x96cbe3f9,0x990e91a8
-	.long	0x20600000,0xc0000000,0xc90fdaa2,0x2168c235
-	.long	0x1f800000,0xbfff0000,0xc90fdaa2,0x2168c235
-	.long	0x1f000000,0x00000000,0x00000000,0x00000000
-	.long	0x00000000,0x3fff0000,0xc90fdaa2,0x2168c235
-	.long	0x9f000000,0x40000000,0xc90fdaa2,0x2168c235
-	.long	0x9f800000,0x40010000,0x96cbe3f9,0x990e91a8
-	.long	0xa0600000,0x40010000,0xc90fdaa2,0x2168c235
-	.long	0xa0000000,0x40010000,0xfb53d14a,0xa9c2f2c2
-	.long	0x9f000000,0x40020000,0x96cbe3f9,0x990e91a8
-	.long	0xa0e00000,0x40020000,0xafeddf4d,0xdd3ba9ee
-	.long	0x20200000,0x40020000,0xc90fdaa2,0x2168c235
-	.long	0xa0800000,0x40020000,0xe231d5f6,0x6595da7b
-	.long	0x20b00000,0x40020000,0xfb53d14a,0xa9c2f2c2
-	.long	0x9f800000,0x40030000,0x8a3ae64f,0x76f80584
-	.long	0x21080000,0x40030000,0x96cbe3f9,0x990e91a8
-	.long	0xa1600000,0x40030000,0xa35ce1a3,0xbb251dcb
-	.long	0xa0900000,0x40030000,0xafeddf4d,0xdd3ba9ee
-	.long	0x20a00000,0x40030000,0xbc7edcf7,0xff523611
-	.long	0x21680000,0x40030000,0xc90fdaa2,0x2168c235
-	.long	0xa1000000,0x40030000,0xd5a0d84c,0x437f4e58
-	.long	0x1fc00000,0x40030000,0xe231d5f6,0x6595da7b
-	.long	0x21300000,0x40030000,0xeec2d3a0,0x87ac669f
-	.long	0xa1380000,0x40030000,0xfb53d14a,0xa9c2f2c2
-	.long	0xa0000000,0x40040000,0x83f2677a,0x65ecbf73
-	.long	0xa1c40000,0x40040000,0x8a3ae64f,0x76f80584
-	.long	0x21880000,0x40040000,0x90836524,0x88034b96
-	.long	0xa0b00000,0x40040000,0x96cbe3f9,0x990e91a8
-	.long	0xa1e00000,0x40040000,0x9d1462ce,0xaa19d7b9
-	.long	0x21580000,0x40040000,0xa35ce1a3,0xbb251dcb
-	.long	0xa1100000,0x40040000,0xa9a56078,0xcc3063dd
-	.long	0xa1fc0000,0x40040000,0xafeddf4d,0xdd3ba9ee
-	.long	0x21200000,0x40040000,0xb6365e22,0xee46f000
-	.long	0xa1480000,0x40040000,0xbc7edcf7,0xff523611
-	.long	0x21e80000,0x40040000,0xc2c75bcd,0x105d7c23
-	.long	0x20d00000,0x40040000,0xc90fdaa2,0x2168c235
-	.long	0xa1800000,0xf2104800,0x22103228,0x00040281
-	.long	0x7fffffff,0x0c813fd7,0x80006c04,0x60000134
-	.long	0x0c814004,0xbc7e6d04,0x60000144,0xf2000080
-	.long	0xf23a54a3,0xc6dc43fa,0xfdbcf201,0x6080e981
-	.long	0xd3c1f219,0x4828f211,0x4428ea99,0x02818000
-	.long	0x0000f227,0xe00c0c81,0x00000000,0x6d000072
-	.long	0xf2000080,0xf20004a3,0xf23a5580,0xfaf8f23a
-	.long	0x5500fafa,0xf20005a3,0xf2000523,0xf23a55a2
-	.long	0xfaf4f23a,0x4922fafe,0xf20005a3,0xf2000523
-	.long	0xf23a49a2,0xfb00f23a,0x4922fb0a,0xf20005a3
-	.long	0xf2000523,0xf23a49a2,0xfb0cf200,0x0123f200
-	.long	0x0ca3f200,0x0822f23c,0x44a23f80,0x0000f21f
-	.long	0xd030f200,0x9000f200,0x042060ff,0x0000357a
-	.long	0xf2000080,0xf2000023,0xf23a5580,0xfa88f23a
-	.long	0x5500fa8a,0xf20001a3,0xf2000123,0xf23a55a2
-	.long	0xfa84f23a,0x4922fa8e,0xf20001a3,0xf2000123
-	.long	0xf23a49a2,0xfa90f23a,0x4922fa9a,0xf20001a3
-	.long	0xf2000123,0xf23a49a2,0xfa9cf200,0x0523f200
-	.long	0x0c23f200,0x08a2f23c,0x44223f80,0x0000f21f
-	.long	0xd030f227,0x68800a97,0x80000000,0xf2009000
-	.long	0xf21f4820,0x60ff0000,0x35000c81,0x3fff8000
-	.long	0x6e1cf227,0x6800f200,0x9000123c,0x0003f21f
-	.long	0x480060ff,0x000034da,0x60ff0000,0x3522f227
-	.long	0xe03c2f02,0xf23c4480,0x00000000,0x0c817ffe
-	.long	0xffff6652,0x3d7c7ffe,0xff842d7c,0xc90fdaa2
-	.long	0xff8842ae,0xff8c3d7c,0x7fdcff90,0x2d7c85a3
-	.long	0x08d3ff94,0x42aeff98,0xf200003a,0xf294000e
-	.long	0x002e0080,0xff84002e,0x0080ff90,0xf22e4822
-	.long	0xff84f200,0x0080f22e,0x4822ff90,0xf20000a8
-	.long	0xf22e48a2,0xff90f22e,0x6800ff84,0x322eff84
-	.long	0x22410281,0x00007fff,0x04810000,0x3fff0c81
-	.long	0x0000001c,0x6f0e0481,0x0000001b,0x1d7c0000
-	.long	0xff586008,0x42811d7c,0x0001ff58,0x243c0000
-	.long	0x3ffe9481,0x2d7ca2f9,0x836eff88,0x2d7c4e44
-	.long	0x152aff8c,0x3d42ff84,0xf2000100,0xf22e4923
-	.long	0xff842409,0x48420282,0x80000000,0x00825f00
-	.long	0x00002d42,0xff54f22e,0x4522ff54,0xf22e4528
-	.long	0xff542401,0x06820000,0x3fff3d42,0xff842d7c
-	.long	0xc90fdaa2,0xff8842ae,0xff8c0681,0x00003fdd
-	.long	0x3d41ff90,0x2d7c85a3,0x08d3ff94,0x42aeff98
-	.long	0x122eff58,0xf2000a00,0xf22e4a23,0xff84f200
-	.long	0x0a80f22e,0x4aa3ff90,0xf2001180,0xf20015a2
-	.long	0xf2000e28,0xf2000c28,0xf2001622,0xf2000180
-	.long	0xf20010a8,0xf2000422,0x0c010000,0x6e00000e
-	.long	0xf20001a8,0xf2000ca2,0x6000ff0c,0xf22e6100
-	.long	0xff54241f,0xf21fd03c,0x222eff54,0xe2996000
-	.long	0xfd72bff6,0x687e3149,0x87d84002,0xac6934a2
-	.long	0x6db3bfc2,0x476f4e1d,0xa28e3fb3,0x44447f87
-	.long	0x6989bfb7,0x44ee7faf,0x45db3fbc,0x71c64694
-	.long	0x0220bfc2,0x49249218,0x72f93fc9,0x99999999
-	.long	0x8fa9bfd5,0x55555555,0x5555bfb7,0x0bf39853
-	.long	0x9e6a3fbc,0x7187962d,0x1d7dbfc2,0x49248271
-	.long	0x07b83fc9,0x99999996,0x263ebfd5,0x55555555
-	.long	0x55363fff,0x0000c90f,0xdaa22168,0xc2350000
-	.long	0x0000bfff,0x0000c90f,0xdaa22168,0xc2350000
-	.long	0x00000001,0x00008000,0x00000000,0x00000000
-	.long	0x00008001,0x00008000,0x00000000,0x00000000
-	.long	0x00003ffb,0x000083d1,0x52c5060b,0x7a510000
-	.long	0x00003ffb,0x00008bc8,0x54456549,0x8b8b0000
-	.long	0x00003ffb,0x000093be,0x40601762,0x6b0d0000
-	.long	0x00003ffb,0x00009bb3,0x078d35ae,0xc2020000
-	.long	0x00003ffb,0x0000a3a6,0x9a525ddc,0xe7de0000
-	.long	0x00003ffb,0x0000ab98,0xe9436276,0x56190000
-	.long	0x00003ffb,0x0000b389,0xe502f9c5,0x98620000
-	.long	0x00003ffb,0x0000bb79,0x7e436b09,0xe6fb0000
-	.long	0x00003ffb,0x0000c367,0xa5c739e5,0xf4460000
-	.long	0x00003ffb,0x0000cb54,0x4c61cff7,0xd5c60000
-	.long	0x00003ffb,0x0000d33f,0x62f82488,0x533e0000
-	.long	0x00003ffb,0x0000db28,0xda816240,0x4c770000
-	.long	0x00003ffb,0x0000e310,0xa4078ad3,0x4f180000
-	.long	0x00003ffb,0x0000eaf6,0xb0a8188e,0xe1eb0000
-	.long	0x00003ffb,0x0000f2da,0xf1949dbe,0x79d50000
-	.long	0x00003ffb,0x0000fabd,0x581361d4,0x7e3e0000
-	.long	0x00003ffc,0x00008346,0xac210959,0xecc40000
-	.long	0x00003ffc,0x00008b23,0x2a083042,0x82d80000
-	.long	0x00003ffc,0x000092fb,0x70b8d29a,0xe2f90000
-	.long	0x00003ffc,0x00009acf,0x476f5ccd,0x1cb40000
-	.long	0x00003ffc,0x0000a29e,0x76304954,0xf23f0000
-	.long	0x00003ffc,0x0000aa68,0xc5d08ab8,0x52300000
-	.long	0x00003ffc,0x0000b22d,0xfffd9d53,0x9f830000
-	.long	0x00003ffc,0x0000b9ed,0xef453e90,0x0ea50000
-	.long	0x00003ffc,0x0000c1a8,0x5f1cc75e,0x3ea50000
-	.long	0x00003ffc,0x0000c95d,0x1be82813,0x8de60000
-	.long	0x00003ffc,0x0000d10b,0xf300840d,0x2de40000
-	.long	0x00003ffc,0x0000d8b4,0xb2ba6bc0,0x5e7a0000
-	.long	0x00003ffc,0x0000e057,0x2a6bb423,0x35f60000
-	.long	0x00003ffc,0x0000e7f3,0x2a70ea9c,0xaa8f0000
-	.long	0x00003ffc,0x0000ef88,0x843264ec,0xefaa0000
-	.long	0x00003ffc,0x0000f717,0x0a28ecc0,0x66660000
-	.long	0x00003ffd,0x0000812f,0xd288332d,0xad320000
-	.long	0x00003ffd,0x000088a8,0xd1b1218e,0x4d640000
-	.long	0x00003ffd,0x00009012,0xab3f23e4,0xaee80000
-	.long	0x00003ffd,0x0000976c,0xc3d411e7,0xf1b90000
-	.long	0x00003ffd,0x00009eb6,0x89493889,0xa2270000
-	.long	0x00003ffd,0x0000a5ef,0x72c34487,0x361b0000
-	.long	0x00003ffd,0x0000ad17,0x00baf07a,0x72270000
-	.long	0x00003ffd,0x0000b42c,0xbcfafd37,0xefb70000
-	.long	0x00003ffd,0x0000bb30,0x3a940ba8,0x0f890000
-	.long	0x00003ffd,0x0000c221,0x15c6fcae,0xbbaf0000
-	.long	0x00003ffd,0x0000c8fe,0xf3e68633,0x12210000
-	.long	0x00003ffd,0x0000cfc9,0x8330b400,0x0c700000
-	.long	0x00003ffd,0x0000d680,0x7aa1102c,0x5bf90000
-	.long	0x00003ffd,0x0000dd23,0x99bc3125,0x2aa30000
-	.long	0x00003ffd,0x0000e3b2,0xa8556b8f,0xc5170000
-	.long	0x00003ffd,0x0000ea2d,0x764f6431,0x59890000
-	.long	0x00003ffd,0x0000f3bf,0x5bf8bad1,0xa21d0000
-	.long	0x00003ffe,0x0000801c,0xe39e0d20,0x5c9a0000
-	.long	0x00003ffe,0x00008630,0xa2dada1e,0xd0660000
-	.long	0x00003ffe,0x00008c1a,0xd445f3e0,0x9b8c0000
-	.long	0x00003ffe,0x000091db,0x8f1664f3,0x50e20000
-	.long	0x00003ffe,0x00009773,0x1420365e,0x538c0000
-	.long	0x00003ffe,0x00009ce1,0xc8e6a0b8,0xcdba0000
-	.long	0x00003ffe,0x0000a228,0x32dbcada,0xae090000
-	.long	0x00003ffe,0x0000a746,0xf2ddb760,0x22940000
-	.long	0x00003ffe,0x0000ac3e,0xc0fb997d,0xd6a20000
-	.long	0x00003ffe,0x0000b110,0x688aebdc,0x6f6a0000
-	.long	0x00003ffe,0x0000b5bc,0xc49059ec,0xc4b00000
-	.long	0x00003ffe,0x0000ba44,0xbc7dd470,0x782f0000
-	.long	0x00003ffe,0x0000bea9,0x4144fd04,0x9aac0000
-	.long	0x00003ffe,0x0000c2eb,0x4abb6616,0x28b60000
-	.long	0x00003ffe,0x0000c70b,0xd54ce602,0xee140000
-	.long	0x00003ffe,0x0000cd00,0x0549adec,0x71590000
-	.long	0x00003ffe,0x0000d484,0x57d2d8ea,0x4ea30000
-	.long	0x00003ffe,0x0000db94,0x8da712de,0xce3b0000
-	.long	0x00003ffe,0x0000e238,0x55f969e8,0x096a0000
-	.long	0x00003ffe,0x0000e877,0x1129c435,0x32590000
-	.long	0x00003ffe,0x0000ee57,0xc16e0d37,0x9c0d0000
-	.long	0x00003ffe,0x0000f3e1,0x0211a87c,0x37790000
-	.long	0x00003ffe,0x0000f919,0x039d758b,0x8d410000
-	.long	0x00003ffe,0x0000fe05,0x8b8f6493,0x5fb30000
-	.long	0x00003fff,0x00008155,0xfb497b68,0x5d040000
-	.long	0x00003fff,0x00008388,0x9e3549d1,0x08e10000
-	.long	0x00003fff,0x0000859c,0xfa76511d,0x724b0000
-	.long	0x00003fff,0x00008795,0x2ecfff81,0x31e70000
-	.long	0x00003fff,0x00008973,0x2fd19557,0x641b0000
-	.long	0x00003fff,0x00008b38,0xcad10193,0x2a350000
-	.long	0x00003fff,0x00008ce7,0xa8d8301e,0xe6b50000
-	.long	0x00003fff,0x00008f46,0xa39e2eae,0x52810000
-	.long	0x00003fff,0x0000922d,0xa7d79188,0x84870000
-	.long	0x00003fff,0x000094d1,0x9fcbdedf,0x52410000
-	.long	0x00003fff,0x0000973a,0xb94419d2,0xa08b0000
-	.long	0x00003fff,0x0000996f,0xf00e08e1,0x0b960000
-	.long	0x00003fff,0x00009b77,0x3f951232,0x1da70000
-	.long	0x00003fff,0x00009d55,0xcc320f93,0x56240000
-	.long	0x00003fff,0x00009f10,0x0575006c,0xc5710000
-	.long	0x00003fff,0x0000a0a9,0xc290d97c,0xc06c0000
-	.long	0x00003fff,0x0000a226,0x59ebebc0,0x630a0000
-	.long	0x00003fff,0x0000a388,0xb4aff6ef,0x0ec90000
-	.long	0x00003fff,0x0000a4d3,0x5f1061d2,0x92c40000
-	.long	0x00003fff,0x0000a608,0x95dcfbe3,0x187e0000
-	.long	0x00003fff,0x0000a72a,0x51dc7367,0xbeac0000
-	.long	0x00003fff,0x0000a83a,0x51530956,0x168f0000
-	.long	0x00003fff,0x0000a93a,0x20077539,0x546e0000
-	.long	0x00003fff,0x0000aa9e,0x7245023b,0x26050000
-	.long	0x00003fff,0x0000ac4c,0x84ba6fe4,0xd58f0000
-	.long	0x00003fff,0x0000adce,0x4a4a606b,0x97120000
-	.long	0x00003fff,0x0000af2a,0x2dcd8d26,0x3c9c0000
-	.long	0x00003fff,0x0000b065,0x6f81f222,0x65c70000
-	.long	0x00003fff,0x0000b184,0x65150f71,0x496a0000
-	.long	0x00003fff,0x0000b28a,0xaa156f9a,0xda350000
-	.long	0x00003fff,0x0000b37b,0x44ff3766,0xb8950000
-	.long	0x00003fff,0x0000b458,0xc3dce963,0x04330000
-	.long	0x00003fff,0x0000b525,0x529d5622,0x46bd0000
-	.long	0x00003fff,0x0000b5e2,0xcca95f9d,0x88cc0000
-	.long	0x00003fff,0x0000b692,0xcada7aca,0x1ada0000
-	.long	0x00003fff,0x0000b736,0xaea7a692,0x58380000
-	.long	0x00003fff,0x0000b7cf,0xab287e9f,0x7b360000
-	.long	0x00003fff,0x0000b85e,0xcc66cb21,0x98350000
-	.long	0x00003fff,0x0000b8e4,0xfd5a20a5,0x93da0000
-	.long	0x00003fff,0x0000b99f,0x41f64aff,0x9bb50000
-	.long	0x00003fff,0x0000ba7f,0x1e17842b,0xbe7b0000
-	.long	0x00003fff,0x0000bb47,0x12857637,0xe17d0000
-	.long	0x00003fff,0x0000bbfa,0xbe8a4788,0xdf6f0000
-	.long	0x00003fff,0x0000bc9d,0x0fad2b68,0x9d790000
-	.long	0x00003fff,0x0000bd30,0x6a39471e,0xcd860000
-	.long	0x00003fff,0x0000bdb6,0xc731856a,0xf18a0000
-	.long	0x00003fff,0x0000be31,0xcac502e8,0x0d700000
-	.long	0x00003fff,0x0000bea2,0xd55ce331,0x94e20000
-	.long	0x00003fff,0x0000bf0b,0x10b7c031,0x28f00000
-	.long	0x00003fff,0x0000bf6b,0x7a18dacb,0x778d0000
-	.long	0x00003fff,0x0000bfc4,0xea4663fa,0x18f60000
-	.long	0x00003fff,0x0000c018,0x1bde8b89,0xa4540000
-	.long	0x00003fff,0x0000c065,0xb066cfbf,0x64390000
-	.long	0x00003fff,0x0000c0ae,0x345f5634,0x0ae60000
-	.long	0x00003fff,0x0000c0f2,0x22919cb9,0xe6a70000
-	.long	0x0000f210,0x48002210,0x32280004,0xf22e6800
-	.long	0xff840281,0x7fffffff,0x0c813ffb,0x80006c04
-	.long	0x600000d0,0x0c814002,0xffff6f04,0x6000014c
-	.long	0x02aef800,0x0000ff88,0x00ae0400,0x0000ff88
-	.long	0x2d7c0000,0x0000ff8c,0xf2000080,0xf22e48a3
-	.long	0xff84f22e,0x4828ff84,0xf23c44a2,0x3f800000
-	.long	0xf2000420,0x2f022401,0x02810000,0x78000282
-	.long	0x7fff0000,0x04823ffb,0x0000e282,0xd282ee81
-	.long	0x43faf780,0xd3c12d59,0xff902d59,0xff942d59
-	.long	0xff98222e,0xff840281,0x80000000,0x83aeff90
-	.long	0x241ff227,0xe004f200,0x0080f200,0x04a3f23a
-	.long	0x5500f6a0,0xf2000522,0xf2000523,0xf20000a3
-	.long	0xf23a5522,0xf696f23a,0x54a3f698,0xf20008a3
-	.long	0xf2000422,0xf21fd020,0xf2009000,0xf22e4822
-	.long	0xff9060ff,0x000029d2,0x0c813fff,0x80006e00
-	.long	0x008a0c81,0x3fd78000,0x6d00006c,0xf227e00c
-	.long	0xf2000023,0xf2000080,0xf20004a3,0xf23a5500
-	.long	0xf65af23a,0x5580f65c,0xf2000523,0xf20005a3
-	.long	0xf23a5522,0xf656f23a,0x55a2f658,0xf2000523
-	.long	0xf2000ca3,0xf23a5522,0xf652f23a,0x54a2f654
-	.long	0xf2000123,0xf22e4823,0xff84f200,0x08a2f200
-	.long	0x0423f21f,0xd030f200,0x9000f22e,0x4822ff84
-	.long	0x60ff0000,0x2954f200,0x9000123c,0x0003f22e
-	.long	0x4800ff84,0x60ff0000,0x29380c81,0x40638000
-	.long	0x6e00008e,0xf227e00c,0xf23c4480,0xbf800000
-	.long	0xf20000a0,0xf2000400,0xf2000023,0xf22e6880
-	.long	0xff84f200,0x0080f200,0x04a3f23a,0x5580f5ec
-	.long	0xf23a5500,0xf5eef200,0x05a3f200,0x0523f23a
-	.long	0x55a2f5e8,0xf23a5522,0xf5eaf200,0x0ca3f200
-	.long	0x0123f23a,0x54a2f5e4,0xf22e4823,0xff84f200
-	.long	0x08a2f200,0x0423f22e,0x4822ff84,0xf21fd030
-	.long	0xf2009000,0x4a106a0c,0xf23a4822,0xf5d660ff
-	.long	0x000028c6,0xf23a4822,0xf5ba60ff,0x000028b2
-	.long	0x4a106a16,0xf23a4800,0xf5baf200,0x9000f23a
-	.long	0x4822f5c0,0x60ff0000,0x28a0f23a,0x4800f594
-	.long	0xf2009000,0xf23a4822,0xf5ba60ff,0x00002882
-	.long	0x60ff0000,0x28baf210,0x48002210,0x32280004
-	.long	0x02817fff,0xffff0c81,0x3fff8000,0x6c4e0c81
-	.long	0x3fd78000,0x6d00007c,0xf23c4480,0x3f800000
-	.long	0xf20000a8,0xf227e004,0xf23c4500,0x3f800000
-	.long	0xf2000122,0xf20008a3,0xf21fd020,0xf2000484
-	.long	0xf2000420,0xf227e001,0x41d761ff,0xfffffd66
-	.long	0xdffc0000,0x000c60ff,0x0000280e,0xf2000018
-	.long	0xf23c4438,0x3f800000,0xf2d20000,0x265af23a
-	.long	0x4800b8ae,0x22100281,0x80000000,0x00813f80
-	.long	0x00002f01,0xf2009000,0xf21f4423,0x60ff0000
-	.long	0x27d8f200,0x9000123c,0x0003f210,0x480060ff
-	.long	0x000027be,0x60ff0000,0x2806f210,0x48002210
-	.long	0x32280004,0x02817fff,0xffff0c81,0x3fff8000
-	.long	0x6c44f23c,0x44803f80,0x0000f200,0x00a2f200
-	.long	0x001af23c,0x44223f80,0x0000f200,0x0420f200
-	.long	0x00042f00,0x4280f227,0xe00141d7,0x61ffffff
-	.long	0xfcc4dffc,0x0000000c,0xf21f9000,0xf2000022
-	.long	0x60ff0000,0x276cf200,0x0018f23c,0x44383f80
-	.long	0x0000f2d2,0x000025b0,0x4a106a18,0xf23a4800
-	.long	0xb7f0f200,0x9000f23c,0x44220080,0x000060ff
-	.long	0x0000273e,0x60ff0000,0x2988f200,0x9000f23a
-	.long	0x4800b7de,0x60ff0000,0x27283fdc,0x000082e3
-	.long	0x08654361,0xc4c60000,0x00003fa5,0x55555555
-	.long	0x4cc13fc5,0x55555555,0x4a543f81,0x11111117
-	.long	0x43853fa5,0x55555555,0x4f5a3fc5,0x55555555
-	.long	0x55550000,0x00000000,0x00003ec7,0x1de3a577
-	.long	0x46823efa,0x01a019d7,0xcb683f2a,0x01a01a01
-	.long	0x9df33f56,0xc16c16c1,0x70e23f81,0x11111111
-	.long	0x11113fa5,0x55555555,0x55553ffc,0x0000aaaa
-	.long	0xaaaaaaaa,0xaaab0000,0x000048b0,0x00000000
-	.long	0x00003730,0x00000000,0x00003fff,0x00008000
-	.long	0x00000000,0x00000000,0x00003fff,0x00008164
-	.long	0xd1f3bc03,0x07749f84,0x1a9b3fff,0x000082cd
-	.long	0x8698ac2b,0xa1d89fc1,0xd5b93fff,0x0000843a
-	.long	0x28c3acde,0x4048a072,0x83693fff,0x000085aa
-	.long	0xc367cc48,0x7b141fc5,0xc95c3fff,0x0000871f
-	.long	0x61969e8d,0x10101ee8,0x5c9f3fff,0x00008898
-	.long	0x0e8092da,0x85289fa2,0x07293fff,0x00008a14
-	.long	0xd575496e,0xfd9ca07b,0xf9af3fff,0x00008b95
-	.long	0xc1e3ea8b,0xd6e8a002,0x0dcf3fff,0x00008d1a
-	.long	0xdf5b7e5b,0xa9e4205a,0x63da3fff,0x00008ea4
-	.long	0x398b45cd,0x53c01eb7,0x00513fff,0x00009031
-	.long	0xdc431466,0xb1dc1f6e,0xb0293fff,0x000091c3
-	.long	0xd373ab11,0xc338a078,0x14943fff,0x0000935a
-	.long	0x2b2f13e6,0xe92c9eb3,0x19b03fff,0x000094f4
-	.long	0xefa8fef7,0x09602017,0x457d3fff,0x00009694
-	.long	0x2d372018,0x5a001f11,0xd5373fff,0x00009837
-	.long	0xf0518db8,0xa9709fb9,0x52dd3fff,0x000099e0
-	.long	0x459320b7,0xfa641fe4,0x30873fff,0x00009b8d
-	.long	0x39b9d54e,0x55381fa2,0xa8183fff,0x00009d3e
-	.long	0xd9a72cff,0xb7501fde,0x494d3fff,0x00009ef5
-	.long	0x326091a1,0x11ac2050,0x48903fff,0x0000a0b0
-	.long	0x510fb971,0x4fc4a073,0x691c3fff,0x0000a270
-	.long	0x43030c49,0x68181f9b,0x7a053fff,0x0000a435
-	.long	0x15ae09e6,0x80a0a079,0x71263fff,0x0000a5fe
-	.long	0xd6a9b151,0x38eca071,0xa1403fff,0x0000a7cd
-	.long	0x93b4e965,0x3568204f,0x62da3fff,0x0000a9a1
-	.long	0x5ab4ea7c,0x0ef81f28,0x3c4a3fff,0x0000ab7a
-	.long	0x39b5a93e,0xd3389f9a,0x7fdc3fff,0x0000ad58
-	.long	0x3eea42a1,0x4ac8a05b,0x3fac3fff,0x0000af3b
-	.long	0x78ad690a,0x43741fdf,0x26103fff,0x0000b123
-	.long	0xf581d2ac,0x25909f70,0x5f903fff,0x0000b311
-	.long	0xc412a911,0x2488201f,0x678a3fff,0x0000b504
-	.long	0xf333f9de,0x64841f32,0xfb133fff,0x0000b6fd
-	.long	0x91e328d1,0x77902003,0x8b303fff,0x0000b8fb
-	.long	0xaf4762fb,0x9ee8200d,0xc3cc3fff,0x0000baff
-	.long	0x5ab2133e,0x45fc9f8b,0x2ae63fff,0x0000bd08
-	.long	0xa39f580c,0x36c0a02b,0xbf703fff,0x0000bf17
-	.long	0x99b67a73,0x1084a00b,0xf5183fff,0x0000c12c
-	.long	0x4cca6670,0x9458a041,0xdd413fff,0x0000c346
-	.long	0xccda2497,0x64089fdf,0x137b3fff,0x0000c567
-	.long	0x2a115506,0xdadc201f,0x15683fff,0x0000c78d
-	.long	0x74c8abb9,0xb15c1fc1,0x3a2e3fff,0x0000c9b9
-	.long	0xbd866e2f,0x27a4a03f,0x8f033fff,0x0000cbec
-	.long	0x14fef272,0x7c5c1ff4,0x907d3fff,0x0000ce24
-	.long	0x8c151f84,0x80e49e6e,0x53e43fff,0x0000d063
-	.long	0x33daef2b,0x25941fd6,0xd45c3fff,0x0000d2a8
-	.long	0x1d91f12a,0xe45ca076,0xedb93fff,0x0000d4f3
-	.long	0x5aabcfed,0xfa209fa6,0xde213fff,0x0000d744
-	.long	0xfccad69d,0x6af41ee6,0x9a2f3fff,0x0000d99d
-	.long	0x15c278af,0xd7b4207f,0x439f3fff,0x0000dbfb
-	.long	0xb797daf2,0x3754201e,0xc2073fff,0x0000de60
-	.long	0xf4825e0e,0x91249e8b,0xe1753fff,0x0000e0cc
-	.long	0xdeec2a94,0xe1102003,0x2c4b3fff,0x0000e33f
-	.long	0x8972be8a,0x5a502004,0xdff53fff,0x0000e5b9
-	.long	0x06e77c83,0x48a81e72,0xf47a3fff,0x0000e839
-	.long	0x6a503c4b,0xdc681f72,0x2f223fff,0x0000eac0
-	.long	0xc6e7dd24,0x3930a017,0xe9453fff,0x0000ed4f
-	.long	0x301ed994,0x2b841f40,0x1a5b3fff,0x0000efe4
-	.long	0xb99bdcda,0xf5cc9fb9,0xa9e33fff,0x0000f281
-	.long	0x773c59ff,0xb1382074,0x4c053fff,0x0000f525
-	.long	0x7d152486,0xcc2c1f77,0x3a193fff,0x0000f7d0
-	.long	0xdf730ad1,0x3bb81ffe,0x90d53fff,0x0000fa83
-	.long	0xb2db722a,0x033ca041,0xed223fff,0x0000fd3e
-	.long	0x0c0cf486,0xc1741f85,0x3f3a2210,0x02817fff
-	.long	0x00000c81,0x3fbe0000,0x6c0660ff,0x00000108
-	.long	0x32280004,0x0c81400c,0xb1676d06,0x60ff0000
-	.long	0x010cf210,0x4800f200,0x0080f23c,0x442342b8
-	.long	0xaa3bf227,0xe00c2d7c,0x00000000,0xff58f201
-	.long	0x600043fa,0xfbb6f201,0x40002d41,0xff540281
-	.long	0x0000003f,0xe989d3c1,0x222eff54,0xec810641
-	.long	0x3fff3d7a,0xfb06ff54,0xf2000100,0xf23c4423
-	.long	0xbc317218,0xf23a4923,0xfaf2f200,0x0422f200
-	.long	0x0822f200,0x0080f200,0x04a3f23c,0x45003ab6
-	.long	0x0b70f200,0x0523f200,0x0580f23c,0x45a33c08
-	.long	0x8895f23a,0x5522fad4,0xf23a55a2,0xfad6f200
-	.long	0x05233d41,0xff842d7c,0x80000000,0xff8842ae
-	.long	0xff8cf200,0x05a3f23c,0x45223f00,0x0000f200
-	.long	0x01a3f200,0x0523f200,0x0c22f219,0x4880f200
-	.long	0x0822f200,0x0423f21f,0xd030f211,0x4422f200
-	.long	0x0422222e,0xff584a81,0x6706f22e,0x4823ff90
-	.long	0xf2009000,0x123c0000,0xf22e4823,0xff8460ff
-	.long	0x0000216e,0xf210d080,0xf2009000,0xf23c4422
-	.long	0x3f800000,0x60ff0000,0x21680c81,0x400cb27c
-	.long	0x6e66f210,0x4800f200,0x0080f23c,0x442342b8
-	.long	0xaa3bf227,0xe00c2d7c,0x00000001,0xff58f201
-	.long	0x600043fa,0xfaa6f201,0x40002d41,0xff540281
-	.long	0x0000003f,0xe989d3c1,0x222eff54,0xec812d41
-	.long	0xff54e281,0x93aeff54,0x06413fff,0x3d41ff90
-	.long	0x2d7c8000,0x0000ff94,0x42aeff98,0x222eff54
-	.long	0x06413fff,0x6000fed2,0x4a106bff,0x00001fbc
-	.long	0x60ff0000,0x20ae2f10,0x02978000,0x00000097
-	.long	0x00800000,0xf23c4400,0x3f800000,0xf2009000
-	.long	0xf21f4422,0x60ff0000,0x20c82210,0x02817fff
-	.long	0x00000c81,0x3ffd0000,0x6c0660ff,0x0000015e
-	.long	0x32280004,0x0c814004,0xc2156f06,0x60ff0000
-	.long	0x026cf210,0x4800f200,0x0080f23c,0x442342b8
-	.long	0xaa3bf227,0xe00cf201,0x600043fa,0xf9eef201
-	.long	0x40002d41,0xff540281,0x0000003f,0xe989d3c1
-	.long	0x222eff54,0xec812d41,0xff54f200,0x0100f23c
-	.long	0x4423bc31,0x7218f23a,0x4923f930,0xf2000422
-	.long	0xf2000822,0x06413fff,0xf2000080,0xf20004a3
-	.long	0xf23c4500,0x3950097b,0xf2000523,0xf2000580
-	.long	0xf23c45a3,0x3ab60b6a,0xf23a5522,0xf91ef23a
-	.long	0x55a2f920,0x3d41ff84,0x2d7c8000,0x0000ff88
-	.long	0x42aeff8c,0xf2000523,0x222eff54,0x4441f200
-	.long	0x05a30641,0x3ffff23a,0x5522f900,0xf23c45a2
-	.long	0x3f000000,0xf2000523,0x00418000,0x3d41ff90
-	.long	0x2d7c8000,0x0000ff94,0x42aeff98,0xf2000ca3
-	.long	0xf2000123,0xf2000422,0xf2000822,0xf21fd030
-	.long	0xf2114823,0x222eff54,0x0c810000,0x003f6f1a
-	.long	0xf2294480,0x000cf22e,0x48a2ff90,0xf2000422
-	.long	0xf2114822,0x60ff0000,0x00340c81,0xfffffffd
-	.long	0x6c16f229,0x4422000c,0xf2114822,0xf22e4822
-	.long	0xff9060ff,0x00000016,0xf2194880,0xf2114422
-	.long	0xf22e48a2,0xff90f200,0x0422f200,0x9000f22e
-	.long	0x4823ff84,0x60ff0000,0x1f500c81,0x3fbe0000
-	.long	0x6c6c0c81,0x00330000,0x6d2c2d7c,0x80010000
-	.long	0xff842d7c,0x80000000,0xff8842ae,0xff8cf210
-	.long	0x4800f200,0x9000123c,0x0002f22e,0x4822ff84
-	.long	0x60ff0000,0x1f0cf210,0x4800f23a,0x5423f86c
-	.long	0x2d7c8001,0x0000ff84,0x2d7c8000,0x0000ff88
-	.long	0x42aeff8c,0xf22e4822,0xff84f200,0x9000123c
-	.long	0x0000f23a,0x5423f84c,0x60ff0000,0x1ed4f210
-	.long	0x4800f200,0x0023f227,0xe00cf23c,0x44802f30
-	.long	0xcaa8f200,0x00a3f23c,0x4500310f,0x8290f23c
-	.long	0x44a232d7,0x3220f200,0x0123f200,0x00a3f23c
-	.long	0x45223493,0xf281f23a,0x54a2f7c0,0xf2000123
-	.long	0xf20000a3,0xf23a5522,0xf7baf23a,0x54a2f7bc
-	.long	0xf2000123,0xf20000a3,0xf23a5522,0xf7b6f23a
-	.long	0x54a2f7b8,0xf2000123,0xf20000a3,0xf23a5522
-	.long	0xf7b2f23a,0x48a2f7b4,0xf2000123,0xf20000a3
-	.long	0xf2000123,0xf21048a3,0xf23c4423,0x3f000000
-	.long	0xf20008a2,0xf21fd030,0xf2000422,0xf2009000
-	.long	0xf2104822,0x60ff0000,0x1e302210,0x0c810000
-	.long	0x00006e00,0xfbacf23c,0x4400bf80,0x0000f200
-	.long	0x9000f23c,0x44220080,0x000060ff,0x00001e1a
-	.long	0x60ff0000,0x1e4a3028,0x00000880,0x000f0440
-	.long	0x3ffff200,0x50006d02,0x4e751d7c,0x0008ff64
-	.long	0x4e7561ff,0x00002342,0x44400440,0x3ffff200
-	.long	0x50001d7c,0x0008ff64,0x4e753028,0x00000040
-	.long	0x7fff0880,0x000e2d68,0x0004ff88,0x2d680008
-	.long	0xff8c3d40,0xff84f22e,0x4800ff84,0x6b024e75
-	.long	0x1d7c0008,0xff644e75,0x61ff0000,0x22fc60ca
-	.long	0x7ffb0000,0x80000000,0x00000000,0x00000000
-	.long	0xf2104800,0x22103228,0x00040281,0x7fffffff
-	.long	0x0c81400c,0xb1676e42,0xf2000018,0x2f004280
-	.long	0xf227e001,0x41d761ff,0xfffffad2,0xdffc0000
-	.long	0x000cf23c,0x44233f00,0x0000201f,0xf23c4480
-	.long	0x3e800000,0xf20000a0,0xf2009000,0x123c0002
-	.long	0xf2000422,0x60ff0000,0x1d280c81,0x400cb2b3
-	.long	0x6e3cf200,0x0018f23a,0x5428adb6,0xf23a5428
-	.long	0xadb82f00,0x4280f227,0xe00141d7,0x61ffffff
-	.long	0xfa7cdffc,0x0000000c,0x201ff200,0x9000123c
-	.long	0x0000f23a,0x4823ff5a,0x60ff0000,0x1ce460ff
-	.long	0x00001cb0,0xf23c4400,0x3f800000,0xf2009000
-	.long	0xf23c4422,0x00800000,0x60ff0000,0x1cd4f210
-	.long	0x48002210,0x32280004,0x22410281,0x7fffffff
-	.long	0x0c81400c,0xb1676e62,0xf2000018,0x48e78040
-	.long	0xf227e001,0x41d74280,0x61ffffff,0xfbe0dffc
-	.long	0x0000000c,0xf23c9000,0x00000000,0x4cdf0201
-	.long	0xf2000080,0xf23c44a2,0x3f800000,0xf2276800
-	.long	0xf2000420,0x22090281,0x80000000,0x00813f00
-	.long	0x0000f21f,0x48222f01,0xf2009000,0x123c0000
-	.long	0xf21f4423,0x60ff0000,0x1c480c81,0x400cb2b3
-	.long	0x6eff0000,0x1bc2f200,0x0018f23a,0x5428acd2
-	.long	0x2f3c0000,0x00002f3c,0x80000000,0x22090281
-	.long	0x80000000,0x00817ffb,0x00002f01,0xf23a5428
-	.long	0xacb82f00,0x4280f227,0xe00141d7,0x61ffffff
-	.long	0xf97cdffc,0x0000000c,0x201ff200,0x9000123c
-	.long	0x0000f21f,0x482360ff,0x00001be6,0x60ff0000
-	.long	0x1c2ef210,0x4800f22e,0x6800ff84,0x22103228
-	.long	0x00042d41,0xff840281,0x7fffffff,0x0c813fd7
-	.long	0x80006d00,0x00740c81,0x3fffddce,0x6e00006a
-	.long	0x222eff84,0x2d41ff5c,0x02817fff,0x00000681
-	.long	0x00010000,0x2d41ff84,0x02ae8000,0x0000ff5c
-	.long	0xf22e4800,0xff842f00,0x4280f227,0xe00141d7
-	.long	0x61ffffff,0xfac8dffc,0x0000000c,0x201ff200
-	.long	0x0080f23c,0x44a24000,0x0000222e,0xff5cf22e
-	.long	0x6880ff84,0xb3aeff84,0xf2009000,0xf22e4820
-	.long	0xff8460ff,0x00001b52,0x0c813fff,0x80006d00
-	.long	0x00880c81,0x40048aa1,0x6e000092,0x222eff84
-	.long	0x2d41ff5c,0x02817fff,0x00000681,0x00010000
-	.long	0x2d41ff84,0x02ae8000,0x0000ff5c,0x222eff5c
-	.long	0xf22e4800,0xff842f00,0x4280f227,0xe00141d7
-	.long	0x61ffffff,0xf878dffc,0x0000000c,0x201f222e
-	.long	0xff5cf23c,0x44223f80,0x00000a81,0xc0000000
-	.long	0xf2014480,0xf20000a0,0x222eff5c,0x00813f80
-	.long	0x0000f201,0x4400f200,0x9000123c,0x0002f200
-	.long	0x042260ff,0x00001ac2,0xf2009000,0x123c0003
-	.long	0xf22e4800,0xff8460ff,0x00001aa6,0x222eff84
-	.long	0x02818000,0x00000081,0x3f800000,0xf2014400
-	.long	0x02818000,0x00000a81,0x80800000,0xf2009000
-	.long	0xf2014422,0x60ff0000,0x1a8060ff,0x00001ac0
-	.long	0x3ffe0000,0xb17217f7,0xd1cf79ac,0x00000000
-	.long	0x3f800000,0x00000000,0x7f800000,0xbf800000
-	.long	0x3fc2499a,0xb5e4040b,0xbfc555b5,0x848cb7db
-	.long	0x3fc99999,0x987d8730,0xbfcfffff,0xff6f7e97
-	.long	0x3fd55555,0x555555a4,0xbfe00000,0x00000008
-	.long	0x3f175496,0xadd7dad6,0x3f3c71c2,0xfe80c7e0
-	.long	0x3f624924,0x928bccff,0x3f899999,0x999995ec
-	.long	0x3fb55555,0x55555555,0x40000000,0x00000000
-	.long	0x3f990000,0x80000000,0x00000000,0x00000000
-	.long	0x3ffe0000,0xfe03f80f,0xe03f80fe,0x00000000
-	.long	0x3ff70000,0xff015358,0x833c47e2,0x00000000
-	.long	0x3ffe0000,0xfa232cf2,0x52138ac0,0x00000000
-	.long	0x3ff90000,0xbdc8d83e,0xad88d549,0x00000000
-	.long	0x3ffe0000,0xf6603d98,0x0f6603da,0x00000000
-	.long	0x3ffa0000,0x9cf43dcf,0xf5eafd48,0x00000000
-	.long	0x3ffe0000,0xf2b9d648,0x0f2b9d65,0x00000000
-	.long	0x3ffa0000,0xda16eb88,0xcb8df614,0x00000000
-	.long	0x3ffe0000,0xef2eb71f,0xc4345238,0x00000000
-	.long	0x3ffb0000,0x8b29b775,0x1bd70743,0x00000000
-	.long	0x3ffe0000,0xebbdb2a5,0xc1619c8c,0x00000000
-	.long	0x3ffb0000,0xa8d839f8,0x30c1fb49,0x00000000
-	.long	0x3ffe0000,0xe865ac7b,0x7603a197,0x00000000
-	.long	0x3ffb0000,0xc61a2eb1,0x8cd907ad,0x00000000
-	.long	0x3ffe0000,0xe525982a,0xf70c880e,0x00000000
-	.long	0x3ffb0000,0xe2f2a47a,0xde3a18af,0x00000000
-	.long	0x3ffe0000,0xe1fc780e,0x1fc780e2,0x00000000
-	.long	0x3ffb0000,0xff64898e,0xdf55d551,0x00000000
-	.long	0x3ffe0000,0xdee95c4c,0xa037ba57,0x00000000
-	.long	0x3ffc0000,0x8db956a9,0x7b3d0148,0x00000000
-	.long	0x3ffe0000,0xdbeb61ee,0xd19c5958,0x00000000
-	.long	0x3ffc0000,0x9b8fe100,0xf47ba1de,0x00000000
-	.long	0x3ffe0000,0xd901b203,0x6406c80e,0x00000000
-	.long	0x3ffc0000,0xa9372f1d,0x0da1bd17,0x00000000
-	.long	0x3ffe0000,0xd62b80d6,0x2b80d62c,0x00000000
-	.long	0x3ffc0000,0xb6b07f38,0xce90e46b,0x00000000
-	.long	0x3ffe0000,0xd3680d36,0x80d3680d,0x00000000
-	.long	0x3ffc0000,0xc3fd0329,0x06488481,0x00000000
-	.long	0x3ffe0000,0xd0b69fcb,0xd2580d0b,0x00000000
-	.long	0x3ffc0000,0xd11de0ff,0x15ab18ca,0x00000000
-	.long	0x3ffe0000,0xce168a77,0x25080ce1,0x00000000
-	.long	0x3ffc0000,0xde1433a1,0x6c66b150,0x00000000
-	.long	0x3ffe0000,0xcb8727c0,0x65c393e0,0x00000000
-	.long	0x3ffc0000,0xeae10b5a,0x7ddc8add,0x00000000
-	.long	0x3ffe0000,0xc907da4e,0x871146ad,0x00000000
-	.long	0x3ffc0000,0xf7856e5e,0xe2c9b291,0x00000000
-	.long	0x3ffe0000,0xc6980c69,0x80c6980c,0x00000000
-	.long	0x3ffd0000,0x82012ca5,0xa68206d7,0x00000000
-	.long	0x3ffe0000,0xc4372f85,0x5d824ca6,0x00000000
-	.long	0x3ffd0000,0x882c5fcd,0x7256a8c5,0x00000000
-	.long	0x3ffe0000,0xc1e4bbd5,0x95f6e947,0x00000000
-	.long	0x3ffd0000,0x8e44c60b,0x4ccfd7de,0x00000000
-	.long	0x3ffe0000,0xbfa02fe8,0x0bfa02ff,0x00000000
-	.long	0x3ffd0000,0x944ad09e,0xf4351af6,0x00000000
-	.long	0x3ffe0000,0xbd691047,0x07661aa3,0x00000000
-	.long	0x3ffd0000,0x9a3eecd4,0xc3eaa6b2,0x00000000
-	.long	0x3ffe0000,0xbb3ee721,0xa54d880c,0x00000000
-	.long	0x3ffd0000,0xa0218434,0x353f1de8,0x00000000
-	.long	0x3ffe0000,0xb92143fa,0x36f5e02e,0x00000000
-	.long	0x3ffd0000,0xa5f2fcab,0xbbc506da,0x00000000
-	.long	0x3ffe0000,0xb70fbb5a,0x19be3659,0x00000000
-	.long	0x3ffd0000,0xabb3b8ba,0x2ad362a5,0x00000000
-	.long	0x3ffe0000,0xb509e68a,0x9b94821f,0x00000000
-	.long	0x3ffd0000,0xb1641795,0xce3ca97b,0x00000000
-	.long	0x3ffe0000,0xb30f6352,0x8917c80b,0x00000000
-	.long	0x3ffd0000,0xb7047551,0x5d0f1c61,0x00000000
-	.long	0x3ffe0000,0xb11fd3b8,0x0b11fd3c,0x00000000
-	.long	0x3ffd0000,0xbc952afe,0xea3d13e1,0x00000000
-	.long	0x3ffe0000,0xaf3addc6,0x80af3ade,0x00000000
-	.long	0x3ffd0000,0xc2168ed0,0xf458ba4a,0x00000000
-	.long	0x3ffe0000,0xad602b58,0x0ad602b6,0x00000000
-	.long	0x3ffd0000,0xc788f439,0xb3163bf1,0x00000000
-	.long	0x3ffe0000,0xab8f69e2,0x8359cd11,0x00000000
-	.long	0x3ffd0000,0xccecac08,0xbf04565d,0x00000000
-	.long	0x3ffe0000,0xa9c84a47,0xa07f5638,0x00000000
-	.long	0x3ffd0000,0xd2420487,0x2dd85160,0x00000000
-	.long	0x3ffe0000,0xa80a80a8,0x0a80a80b,0x00000000
-	.long	0x3ffd0000,0xd7894992,0x3bc3588a,0x00000000
-	.long	0x3ffe0000,0xa655c439,0x2d7b73a8,0x00000000
-	.long	0x3ffd0000,0xdcc2c4b4,0x9887dacc,0x00000000
-	.long	0x3ffe0000,0xa4a9cf1d,0x96833751,0x00000000
-	.long	0x3ffd0000,0xe1eebd3e,0x6d6a6b9e,0x00000000
-	.long	0x3ffe0000,0xa3065e3f,0xae7cd0e0,0x00000000
-	.long	0x3ffd0000,0xe70d785c,0x2f9f5bdc,0x00000000
-	.long	0x3ffe0000,0xa16b312e,0xa8fc377d,0x00000000
-	.long	0x3ffd0000,0xec1f392c,0x5179f283,0x00000000
-	.long	0x3ffe0000,0x9fd809fd,0x809fd80a,0x00000000
-	.long	0x3ffd0000,0xf12440d3,0xe36130e6,0x00000000
-	.long	0x3ffe0000,0x9e4cad23,0xdd5f3a20,0x00000000
-	.long	0x3ffd0000,0xf61cce92,0x346600bb,0x00000000
-	.long	0x3ffe0000,0x9cc8e160,0xc3fb19b9,0x00000000
-	.long	0x3ffd0000,0xfb091fd3,0x8145630a,0x00000000
-	.long	0x3ffe0000,0x9b4c6f9e,0xf03a3caa,0x00000000
-	.long	0x3ffd0000,0xffe97042,0xbfa4c2ad,0x00000000
-	.long	0x3ffe0000,0x99d722da,0xbde58f06,0x00000000
-	.long	0x3ffe0000,0x825efced,0x49369330,0x00000000
-	.long	0x3ffe0000,0x9868c809,0x868c8098,0x00000000
-	.long	0x3ffe0000,0x84c37a7a,0xb9a905c9,0x00000000
-	.long	0x3ffe0000,0x97012e02,0x5c04b809,0x00000000
-	.long	0x3ffe0000,0x87224c2e,0x8e645fb7,0x00000000
-	.long	0x3ffe0000,0x95a02568,0x095a0257,0x00000000
-	.long	0x3ffe0000,0x897b8cac,0x9f7de298,0x00000000
-	.long	0x3ffe0000,0x94458094,0x45809446,0x00000000
-	.long	0x3ffe0000,0x8bcf55de,0xc4cd05fe,0x00000000
-	.long	0x3ffe0000,0x92f11384,0x0497889c,0x00000000
-	.long	0x3ffe0000,0x8e1dc0fb,0x89e125e5,0x00000000
-	.long	0x3ffe0000,0x91a2b3c4,0xd5e6f809,0x00000000
-	.long	0x3ffe0000,0x9066e68c,0x955b6c9b,0x00000000
-	.long	0x3ffe0000,0x905a3863,0x3e06c43b,0x00000000
-	.long	0x3ffe0000,0x92aade74,0xc7be59e0,0x00000000
-	.long	0x3ffe0000,0x8f1779d9,0xfdc3a219,0x00000000
-	.long	0x3ffe0000,0x94e9bff6,0x15845643,0x00000000
-	.long	0x3ffe0000,0x8dda5202,0x37694809,0x00000000
-	.long	0x3ffe0000,0x9723a1b7,0x20134203,0x00000000
-	.long	0x3ffe0000,0x8ca29c04,0x6514e023,0x00000000
-	.long	0x3ffe0000,0x995899c8,0x90eb8990,0x00000000
-	.long	0x3ffe0000,0x8b70344a,0x139bc75a,0x00000000
-	.long	0x3ffe0000,0x9b88bdaa,0x3a3dae2f,0x00000000
-	.long	0x3ffe0000,0x8a42f870,0x5669db46,0x00000000
-	.long	0x3ffe0000,0x9db4224f,0xffe1157c,0x00000000
-	.long	0x3ffe0000,0x891ac73a,0xe9819b50,0x00000000
-	.long	0x3ffe0000,0x9fdadc26,0x8b7a12da,0x00000000
-	.long	0x3ffe0000,0x87f78087,0xf78087f8,0x00000000
-	.long	0x3ffe0000,0xa1fcff17,0xce733bd4,0x00000000
-	.long	0x3ffe0000,0x86d90544,0x7a34acc6,0x00000000
-	.long	0x3ffe0000,0xa41a9e8f,0x5446fb9f,0x00000000
-	.long	0x3ffe0000,0x85bf3761,0x2cee3c9b,0x00000000
-	.long	0x3ffe0000,0xa633cd7e,0x6771cd8b,0x00000000
-	.long	0x3ffe0000,0x84a9f9c8,0x084a9f9d,0x00000000
-	.long	0x3ffe0000,0xa8489e60,0x0b435a5e,0x00000000
-	.long	0x3ffe0000,0x83993052,0x3fbe3368,0x00000000
-	.long	0x3ffe0000,0xaa59233c,0xcca4bd49,0x00000000
-	.long	0x3ffe0000,0x828cbfbe,0xb9a020a3,0x00000000
-	.long	0x3ffe0000,0xac656dae,0x6bcc4985,0x00000000
-	.long	0x3ffe0000,0x81848da8,0xfaf0d277,0x00000000
-	.long	0x3ffe0000,0xae6d8ee3,0x60bb2468,0x00000000
-	.long	0x3ffe0000,0x80808080,0x80808081,0x00000000
-	.long	0x3ffe0000,0xb07197a2,0x3c46c654,0x00000000
-	.long	0xf2104800,0x2d7c0000,0x0000ff54,0x22103228
-	.long	0x00042d50,0xff842d68,0x0004ff88,0x2d680008
-	.long	0xff8c0c81,0x00000000,0x6d000182,0x0c813ffe
-	.long	0xf07d6d0a,0x0c813fff,0x88416f00,0x00e2e081
-	.long	0xe0810481,0x00003fff,0xd2aeff54,0x41faf7b2
-	.long	0xf2014080,0x2d7c3fff,0x0000ff84,0x2d6eff88
-	.long	0xff9402ae,0xfe000000,0xff9400ae,0x01000000
-	.long	0xff94222e,0xff940281,0x7e000000,0xe081e081
-	.long	0xe881d1c1,0xf22e4800,0xff842d7c,0x3fff0000
-	.long	0xff9042ae,0xff98f22e,0x4828ff90,0xf227e00c
-	.long	0xf2104823,0xf23a48a3,0xf6c8f200,0x0100f200
-	.long	0x0923f22e,0x6880ff84,0xf2000980,0xf2000880
-	.long	0xf23a54a3,0xf6ccf23a,0x5523f6ce,0xf23a54a2
-	.long	0xf6d0f23a,0x5522f6d2,0xf2000ca3,0xf2000d23
-	.long	0xf23a54a2,0xf6ccf23a,0x5522f6ce,0xf2000ca3
-	.long	0xd1fc0000,0x0010f200,0x0d23f200,0x00a3f200
-	.long	0x0822f210,0x48a2f21f,0xd030f200,0x0422f200
-	.long	0x9000f22e,0x4822ff84,0x60ff0000,0x10ccf23c
-	.long	0x58380001,0xf2c10000,0x1318f200,0x0080f23a
-	.long	0x44a8f64e,0xf23a4422,0xf648f200,0x04a2f200
-	.long	0x00a0f227,0xe00cf200,0x0400f200,0x0023f22e
-	.long	0x6880ff84,0xf2000080,0xf20004a3,0xf23a5580
-	.long	0xf660f23a,0x5500f662,0xf20005a3,0xf2000523
-	.long	0xf23a55a2,0xf65cf23a,0x5522f65e,0xf2000ca3
-	.long	0xf2000123,0xf23a54a2,0xf658f22e,0x4823ff84
-	.long	0xf20008a2,0xf21fd030,0xf2000423,0xf2009000
-	.long	0xf22e4822,0xff8460ff,0x0000103e,0x60ff0000
-	.long	0x0e962d7c,0xffffff9c,0xff5448e7,0x3f002610
-	.long	0x28280004,0x2a280008,0x42824a84,0x66342805
-	.long	0x42857420,0x4286edc4,0x6000edac,0xd4862d43
-	.long	0xff842d44,0xff882d45,0xff8c4482,0x2d42ff54
-	.long	0xf22e4800,0xff844cdf,0x00fc41ee,0xff846000
-	.long	0xfe0c4286,0xedc46000,0x2406edac,0x2e05edad
-	.long	0x44860686,0x00000020,0xecaf8887,0x2d43ff84
-	.long	0x2d44ff88,0x2d45ff8c,0x44822d42,0xff54f22e
-	.long	0x4800ff84,0x4cdf00fc,0x41eeff84,0x6000fdce
-	.long	0xf2104800,0xf2000018,0xf23a4838,0xf5a4f292
-	.long	0x0014f200,0x9000123c,0x0003f210,0x480060ff
-	.long	0x00000f7e,0xf2104800,0x2d7c0000,0x0000ff54
-	.long	0xf2000080,0xf23a4422,0xf508f22e,0x6800ff84
-	.long	0x3d6eff88,0xff86222e,0xff840c81,0x00000000
-	.long	0x6f0000da,0x0c813ffe,0x80006d00,0xfda20c81
-	.long	0x3fffc000,0x6e00fd98,0x0c813ffe,0xf07d6d00
-	.long	0x001a0c81,0x3fff8841,0x6e000010,0xf20004a2
-	.long	0xf23a4422,0xf4bc6000,0xfe762d6e,0xff88ff94
-	.long	0x02aefe00,0x0000ff94,0x00ae0100,0x0000ff94
-	.long	0x0c813fff,0x80006c44,0xf23a4400,0xf4fc2d7c
-	.long	0x3fff0000,0xff9042ae,0xff98f22e,0x4828ff90
-	.long	0x222eff94,0x02817e00,0x0000e081,0xe081e881
-	.long	0xf20004a2,0xf227e00c,0xf2000422,0x41faf4e2
-	.long	0xd1c1f23a,0x4480f466,0x6000fd76,0xf23a4400
-	.long	0xf4502d7c,0x3fff0000,0xff9042ae,0xff98f22e
-	.long	0x4828ff90,0x222eff94,0x02817e00,0x0000e081
-	.long	0xe081e881,0xf2000422,0xf227e00c,0x41faf4a2
-	.long	0xd1c1f23a,0x4480f41e,0x6000fd36,0x0c810000
-	.long	0x00006d10,0xf23a4400,0xf414f200,0x900060ff
-	.long	0x00000c4e,0xf23a4400,0xf3fcf200,0x900060ff
-	.long	0x00000cb4,0x60ff0000,0x0e962210,0x32280004
-	.long	0x02817fff,0xffff0c81,0x3fff8000,0x6c56f210
-	.long	0x4818f200,0x0080f200,0x049af200,0x0022f23c
-	.long	0x44a23f80,0x0000f200,0x04202210,0x02818000
-	.long	0x00000081,0x3f000000,0x2f012f00,0x4280f227
-	.long	0xe00141d7,0x61ffffff,0xfe5adffc,0x0000000c
-	.long	0x201ff200,0x9000123c,0x0000f21f,0x442360ff
-	.long	0x00000dde,0xf2104818,0xf23c4438,0x3f800000
-	.long	0xf2d20000,0x0c3260ff,0x00000bb6,0x60ff0000
-	.long	0x0e0e3ffd,0x0000de5b,0xd8a93728,0x71950000
-	.long	0x00003fff,0x0000b8aa,0x3b295c17,0xf0bc0000
-	.long	0x0000f23c,0x58000001,0xf2104838,0xf2c10000
-	.long	0x0ff02210,0x6d000090,0x2f004280,0x61ffffff
-	.long	0xfba2f21f,0x9000f23a,0x4823ffb8,0x60ff0000
-	.long	0x0d782210,0x6d000070,0x2f004280,0x61ffffff
-	.long	0xfd34f21f,0x9000f23a,0x4823ff98,0x60ff0000
-	.long	0x0d682210,0x6d000050,0x22280008,0x662e2228
-	.long	0x00040281,0x7fffffff,0x66223210,0x02810000
-	.long	0x7fff0481,0x00003fff,0x67ff0000,0x0f84f200
-	.long	0x9000f201,0x400060ff,0x00000d1e,0x2f004280
-	.long	0x61ffffff,0xfb2ef21f,0x9000f23a,0x4823ff54
-	.long	0x60ff0000,0x0d0460ff,0x00000b5c,0x22106d00
-	.long	0xfff62f00,0x428061ff,0xfffffcba,0xf21f9000
-	.long	0xf23a4823,0xff2e60ff,0x00000cee,0x406a934f
-	.long	0x0979a371,0x3f734413,0x509f8000,0xbfcd0000
-	.long	0xc0219dc1,0xda994fd2,0x00000000,0x40000000
-	.long	0x935d8ddd,0xaaa8ac17,0x00000000,0x3ffe0000
-	.long	0xb17217f7,0xd1cf79ac,0x00000000,0x3f56c16d
-	.long	0x6f7bd0b2,0x3f811112,0x302c712c,0x3fa55555
-	.long	0x55554cc1,0x3fc55555,0x55554a54,0x3fe00000
-	.long	0x00000000,0x00000000,0x00000000,0x3fff0000
-	.long	0x80000000,0x00000000,0x3f738000,0x3fff0000
-	.long	0x8164d1f3,0xbc030773,0x3fbef7ca,0x3fff0000
-	.long	0x82cd8698,0xac2ba1d7,0x3fbdf8a9,0x3fff0000
-	.long	0x843a28c3,0xacde4046,0x3fbcd7c9,0x3fff0000
-	.long	0x85aac367,0xcc487b15,0xbfbde8da,0x3fff0000
-	.long	0x871f6196,0x9e8d1010,0x3fbde85c,0x3fff0000
-	.long	0x88980e80,0x92da8527,0x3fbebbf1,0x3fff0000
-	.long	0x8a14d575,0x496efd9a,0x3fbb80ca,0x3fff0000
-	.long	0x8b95c1e3,0xea8bd6e7,0xbfba8373,0x3fff0000
-	.long	0x8d1adf5b,0x7e5ba9e6,0xbfbe9670,0x3fff0000
-	.long	0x8ea4398b,0x45cd53c0,0x3fbdb700,0x3fff0000
-	.long	0x9031dc43,0x1466b1dc,0x3fbeeeb0,0x3fff0000
-	.long	0x91c3d373,0xab11c336,0x3fbbfd6d,0x3fff0000
-	.long	0x935a2b2f,0x13e6e92c,0xbfbdb319,0x3fff0000
-	.long	0x94f4efa8,0xfef70961,0x3fbdba2b,0x3fff0000
-	.long	0x96942d37,0x20185a00,0x3fbe91d5,0x3fff0000
-	.long	0x9837f051,0x8db8a96f,0x3fbe8d5a,0x3fff0000
-	.long	0x99e04593,0x20b7fa65,0xbfbcde7b,0x3fff0000
-	.long	0x9b8d39b9,0xd54e5539,0xbfbebaaf,0x3fff0000
-	.long	0x9d3ed9a7,0x2cffb751,0xbfbd86da,0x3fff0000
-	.long	0x9ef53260,0x91a111ae,0xbfbebedd,0x3fff0000
-	.long	0xa0b0510f,0xb9714fc2,0x3fbcc96e,0x3fff0000
-	.long	0xa2704303,0x0c496819,0xbfbec90b,0x3fff0000
-	.long	0xa43515ae,0x09e6809e,0x3fbbd1db,0x3fff0000
-	.long	0xa5fed6a9,0xb15138ea,0x3fbce5eb,0x3fff0000
-	.long	0xa7cd93b4,0xe965356a,0xbfbec274,0x3fff0000
-	.long	0xa9a15ab4,0xea7c0ef8,0x3fbea83c,0x3fff0000
-	.long	0xab7a39b5,0xa93ed337,0x3fbecb00,0x3fff0000
-	.long	0xad583eea,0x42a14ac6,0x3fbe9301,0x3fff0000
-	.long	0xaf3b78ad,0x690a4375,0xbfbd8367,0x3fff0000
-	.long	0xb123f581,0xd2ac2590,0xbfbef05f,0x3fff0000
-	.long	0xb311c412,0xa9112489,0x3fbdfb3c,0x3fff0000
-	.long	0xb504f333,0xf9de6484,0x3fbeb2fb,0x3fff0000
-	.long	0xb6fd91e3,0x28d17791,0x3fbae2cb,0x3fff0000
-	.long	0xb8fbaf47,0x62fb9ee9,0x3fbcdc3c,0x3fff0000
-	.long	0xbaff5ab2,0x133e45fb,0x3fbee9aa,0x3fff0000
-	.long	0xbd08a39f,0x580c36bf,0xbfbeaefd,0x3fff0000
-	.long	0xbf1799b6,0x7a731083,0xbfbcbf51,0x3fff0000
-	.long	0xc12c4cca,0x66709456,0x3fbef88a,0x3fff0000
-	.long	0xc346ccda,0x24976407,0x3fbd83b2,0x3fff0000
-	.long	0xc5672a11,0x5506dadd,0x3fbdf8ab,0x3fff0000
-	.long	0xc78d74c8,0xabb9b15d,0xbfbdfb17,0x3fff0000
-	.long	0xc9b9bd86,0x6e2f27a3,0xbfbefe3c,0x3fff0000
-	.long	0xcbec14fe,0xf2727c5d,0xbfbbb6f8,0x3fff0000
-	.long	0xce248c15,0x1f8480e4,0xbfbcee53,0x3fff0000
-	.long	0xd06333da,0xef2b2595,0xbfbda4ae,0x3fff0000
-	.long	0xd2a81d91,0xf12ae45a,0x3fbc9124,0x3fff0000
-	.long	0xd4f35aab,0xcfedfa1f,0x3fbeb243,0x3fff0000
-	.long	0xd744fcca,0xd69d6af4,0x3fbde69a,0x3fff0000
-	.long	0xd99d15c2,0x78afd7b6,0xbfb8bc61,0x3fff0000
-	.long	0xdbfbb797,0xdaf23755,0x3fbdf610,0x3fff0000
-	.long	0xde60f482,0x5e0e9124,0xbfbd8be1,0x3fff0000
-	.long	0xe0ccdeec,0x2a94e111,0x3fbacb12,0x3fff0000
-	.long	0xe33f8972,0xbe8a5a51,0x3fbb9bfe,0x3fff0000
-	.long	0xe5b906e7,0x7c8348a8,0x3fbcf2f4,0x3fff0000
-	.long	0xe8396a50,0x3c4bdc68,0x3fbef22f,0x3fff0000
-	.long	0xeac0c6e7,0xdd24392f,0xbfbdbf4a,0x3fff0000
-	.long	0xed4f301e,0xd9942b84,0x3fbec01a,0x3fff0000
-	.long	0xefe4b99b,0xdcdaf5cb,0x3fbe8cac,0x3fff0000
-	.long	0xf281773c,0x59ffb13a,0xbfbcbb3f,0x3fff0000
-	.long	0xf5257d15,0x2486cc2c,0x3fbef73a,0x3fff0000
-	.long	0xf7d0df73,0x0ad13bb9,0xbfb8b795,0x3fff0000
-	.long	0xfa83b2db,0x722a033a,0x3fbef84b,0x3fff0000
-	.long	0xfd3e0c0c,0xf486c175,0xbfbef581,0xf210d080
-	.long	0x22103228,0x0004f22e,0x6800ff84,0x02817fff
-	.long	0xffff0c81,0x3fb98000,0x6c046000,0x00880c81
-	.long	0x400d80c0,0x6f046000,0x007cf200,0x0080f23c
-	.long	0x44a34280,0x0000f22e,0x6080ff54,0x2f0243fa
-	.long	0xfbbcf22e,0x4080ff54,0x222eff54,0x24010281
-	.long	0x0000003f,0xe981d3c1,0xec822202,0xe2819481
-	.long	0x06820000,0x3ffff227,0xe00cf23c,0x44a33c80
-	.long	0x00002d59,0xff842d59,0xff882d59,0xff8c3d59
-	.long	0xff90f200,0x04283d59,0xff94426e,0xff9642ae
-	.long	0xff98d36e,0xff84f23a,0x4823fb22,0xd36eff90
-	.long	0x60000100,0x0c813fff,0x80006e12,0xf2009000
-	.long	0xf23c4422,0x3f800000,0x60ff0000,0x07b4222e
-	.long	0xff840c81,0x00000000,0x6d0660ff,0x00000764
-	.long	0x60ff0000,0x0666f200,0x9000f23c,0x44003f80
-	.long	0x00002210,0x00810080,0x0001f201,0x442260ff
-	.long	0x0000077e,0xf210d080,0x22103228,0x0004f22e
-	.long	0x6800ff84,0x02817fff,0xffff0c81,0x3fb98000
-	.long	0x6c046000,0xff900c81,0x400b9b07,0x6f046000
-	.long	0xff84f200,0x0080f23a,0x54a3fa62,0xf22e6080
-	.long	0xff542f02,0x43fafac6,0xf22e4080,0xff54222e
-	.long	0xff542401,0x02810000,0x003fe981,0xd3c1ec82
-	.long	0x2202e281,0x94810682,0x00003fff,0xf227e00c
-	.long	0xf2000500,0xf23a54a3,0xfa2c2d59,0xff84f23a
-	.long	0x4923fa2a,0x2d59ff88,0x2d59ff8c,0xf2000428
-	.long	0x3d59ff90,0xf2000828,0x3d59ff94,0x426eff96
-	.long	0x42aeff98,0xf23a4823,0xfa14d36e,0xff84d36e
-	.long	0xff90f200,0x0080f200,0x04a3f23a,0x5500fa1e
-	.long	0xf23a5580,0xfa20f200,0x0523f200,0x05a3f23a
-	.long	0x5522fa1a,0xf23a55a2,0xfa1cf200,0x0523f200
-	.long	0x05a3f23a,0x5522fa16,0xf20001a3,0xf2000523
-	.long	0xf2000c22,0xf2000822,0xf21fd030,0xf22e4823
-	.long	0xff84f22e,0x4822ff90,0xf22e4822,0xff84f200
-	.long	0x90003d42,0xff84241f,0x2d7c8000,0x0000ff88
-	.long	0x42aeff8c,0x123c0000,0xf22e4823,0xff8460ff
-	.long	0x0000063e,0xf2009000,0xf23c4400,0x3f800000
-	.long	0x22100081,0x00800001,0xf2014422,0x60ff0000
-	.long	0x06302f00,0x32290000,0x5beeff54,0x02810000
-	.long	0x7fff3028,0x00000240,0x7fff0c40,0x3fff6d00
-	.long	0x00c00c40,0x400c6e00,0x00a4f228,0x48030000
-	.long	0xf2006000,0xf23c8800,0x00000000,0x4a290004
-	.long	0x6b5e2f00,0x3d690000,0xff842d69,0x0004ff88
-	.long	0x2d690008,0xff8c41ee,0xff8461ff,0x00000b2a
-	.long	0x4480d09f,0xf22ed080,0xff840c40,0xc0016c36
-	.long	0xf21f9000,0x223c8000,0x00000480,0xffffc001
-	.long	0x44800c00,0x00206c0a,0xe0a942a7,0x2f0142a7
-	.long	0x60280400,0x0020e0a9,0x2f0142a7,0x42a7601a
-	.long	0xf229d080,0x0000f21f,0x90000640,0x3fff4840
-	.long	0x42a72f3c,0x80000000,0x2f00f200,0xb000123c
-	.long	0x0000f21f,0x482360ff,0x0000054c,0x201fc149
-	.long	0x4a290000,0x6bff0000,0x041c60ff,0x00000464
-	.long	0x4a290004,0x6a16201f,0xf2009000,0x123c0003
-	.long	0xf2294800,0x000060ff,0x0000051c,0x201f2049
-	.long	0x60ff0000,0x05860001,0x00008000,0x00000000
-	.long	0x00000000,0x0000422e,0xff652f00,0x422eff5c
-	.long	0x600c422e,0xff652f00,0x1d7c0001,0xff5c48e7
-	.long	0x3f003628,0x00003d43,0xff580283,0x00007fff
-	.long	0x28280004,0x2a280008,0x4a83663c,0x263c0000
-	.long	0x3ffe4a84,0x66162805,0x42850483,0x00000020
-	.long	0x4286edc4,0x6000edac,0x96866022,0x4286edc4
-	.long	0x60009686,0xedac2e05,0xedad4486,0x06860000
-	.long	0x0020ecaf,0x88876006,0x06830000,0x3ffe3029
-	.long	0x00003d40,0xff5a322e,0xff58b181,0x02810000
-	.long	0x80003d41,0xff5e0280,0x00007fff,0x22290004
-	.long	0x24290008,0x4a80663c,0x203c0000,0x3ffe4a81
-	.long	0x66162202,0x42820480,0x00000020,0x4286edc1
-	.long	0x6000eda9,0x90866022,0x4286edc1,0x60009086
-	.long	0xeda92e02,0xedaa4486,0x06860000,0x0020ecaf
-	.long	0x82876006,0x06800000,0x3ffe2d43,0xff542f00
-	.long	0x90834286,0x4283227c,0x00000000,0x4a806c06
-	.long	0x201f6000,0x006a588f,0x4a866e0e,0xb2846608
-	.long	0xb4856604,0x60000136,0x65089485,0x93844286
-	.long	0x52834a80,0x670ed683,0xd482e391,0x55c65289
-	.long	0x538060d4,0x202eff54,0x4a816616,0x22024282
-	.long	0x04800000,0x00204286,0xedc16000,0xeda99086
-	.long	0x601c4286,0xedc16000,0x6b149086,0xeda92e02
-	.long	0xedaa4486,0x06860000,0x0020ecaf,0x82870c80
-	.long	0x000041fe,0x6c2a3d40,0xff902d41,0xff942d42
-	.long	0xff982c2e,0xff543d46,0xff842d44,0xff882d45
-	.long	0xff8cf22e,0x4800ff90,0x1d7c0001,0xff5d6036
-	.long	0x2d41ff94,0x2d42ff98,0x04800000,0x3ffe3d40
-	.long	0xff902c2e,0xff540486,0x00003ffe,0x2d46ff54
-	.long	0xf22e4800,0xff903d46,0xff842d44,0xff882d45
-	.long	0xff8c422e,0xff5d4a2e,0xff5c6722,0x2c2eff54
-	.long	0x5386b086,0x6d186e0e,0xb2846608,0xb4856604
-	.long	0x6000007a,0x6508f22e,0x4828ff84,0x52833c2e
-	.long	0xff5a6c04,0xf200001a,0x42863c2e,0xff5e7e08
-	.long	0xeeae0283,0x0000007f,0x86861d43,0xff654cdf
-	.long	0x00fc201f,0xf2009000,0x4a2eff5d,0x6710123c
-	.long	0x0000f23a,0x4823fdc0,0x60ff0000,0x02ca123c
-	.long	0x0003f200,0x000060ff,0x000002bc,0x52830c80
-	.long	0x00000008,0x6c04e1ab,0x60024283,0xf23c4400
-	.long	0x00000000,0x422eff5d,0x6000ff94,0x2c030286
-	.long	0x00000001,0x4a866700,0xff865283,0x3c2eff5a
-	.long	0x0a860000,0x80003d46,0xff5a6000,0xff723028
-	.long	0x00000240,0x7fff0c40,0x7fff6738,0x08280007
-	.long	0x00046706,0x103c0000,0x4e754a40,0x66184aa8
-	.long	0x0004660c,0x4aa80008,0x6606103c,0x00014e75
-	.long	0x103c0004,0x4e7561ff,0x000007f6,0x4e75103c
-	.long	0x00064e75,0x4aa80008,0x66122028,0x00040280
-	.long	0x7fffffff,0x6606103c,0x00024e75,0x103c0003
-	.long	0x4e757fff,0x0000ffff,0xffffffff,0xffff4a28
-	.long	0x00006a38,0x00ae0a00,0x0410ff64,0x082e0002
-	.long	0xff62660a,0xf23c4400,0xff800000,0x4e75f22e
-	.long	0xd080ffdc,0xf22e9000,0xff60f23c,0x4480bf80
-	.long	0x0000f23c,0x44a00000,0x00004e75,0x00ae0200
-	.long	0x0410ff64,0x082e0002,0xff62660a,0xf23c4400
-	.long	0x7f800000,0x4e75f22e,0xd080ffdc,0xf22e9000
-	.long	0xff60f23c,0x44803f80,0x0000f23c,0x44a00000
-	.long	0x00004e75,0x00ae0100,0x2080ff64,0x082e0005
-	.long	0xff626608,0xf23ad080,0xff6a4e75,0xf22ed080
-	.long	0xffdcf22e,0x9000ff60,0xf227e004,0xf23c4500
-	.long	0x7f800000,0xf23c4523,0x00000000,0xf21fd020
-	.long	0x4e757ffe,0x0000ffff,0xffffffff,0xfffffffe
-	.long	0x0000ffff,0xffffffff,0xffff0000,0x00008000
-	.long	0x00000000,0x00008000,0x00008000,0x00000000
-	.long	0x00004a28,0x00006a26,0x00ae0800,0x0a28ff64
-	.long	0xf22e9000,0xff60f23a,0xd080ffdc,0xf23a4823
-	.long	0xffcaf200,0xa800e198,0x1d40ff64,0x4e75006e
-	.long	0x0a28ff66,0xf22e9000,0xff60f23a,0xd080ffac
-	.long	0xf2000023,0xf200a800,0xe1981d40,0xff644e75
-	.long	0x00ae0000,0x1048ff64,0x12000201,0x00c06700
-	.long	0x005a3d68,0x0000ff84,0x2d680004,0xff882d68
-	.long	0x0008ff8c,0x41eeff84,0x48e7c080,0x61ff0000
-	.long	0x06184cdf,0x01030c01,0x00406610,0x4aa80008
-	.long	0x66184a28,0x00076612,0x60000020,0x22280008
-	.long	0x02810000,0x07ff6700,0x001200ae,0x00000200
-	.long	0xff646006,0x006e1248,0xff664a28,0x00006a22
-	.long	0xf22e9000,0xff60f23a,0xd080ff14,0xf23a4823
-	.long	0xff02f200,0xa800e198,0x00000000,0x1d40ff64
-	.long	0x4e75f22e,0x9000ff60,0xf23ad080,0xfee6f23a
-	.long	0x4823fee0,0xf200a800,0xe1981d40,0xff644e75
-	.long	0x006e1248,0xff66f22e,0x9000ff60,0xf23ad080
-	.long	0xfec2f23a,0x4823febc,0xf200a800,0xe1981d40
-	.long	0xff644e75,0xf200a800,0x81aeff64,0x6020f200
-	.long	0xa80081ae,0xff64f294,0x000ef281,0x0032006e
-	.long	0x0208ff66,0x600800ae,0x08000208,0xff64082e
-	.long	0x0001ff62,0x66024e75,0xf22e9000,0xff60f23c
-	.long	0x44803f80,0x0000f23a,0x48a2fe80,0x4e751d7c
-	.long	0x0004ff64,0x006e0208,0xff664e75,0xf22e9000
-	.long	0xff60f228,0x48000000,0xf200a800,0x00800000
-	.long	0x0a2881ae,0xff644e75,0xf22e9000,0xff60f228
-	.long	0x48000000,0xf200a800,0x81aeff64,0x4e754e75
-	.long	0xf2294800,0x00004a29,0x00006b08,0x1d7c0001
-	.long	0xff644e75,0x1d7c0009,0xff644e75,0xf2284800
-	.long	0x00004a28,0x00006b08,0x1d7c0001,0xff644e75
-	.long	0x1d7c0009,0xff644e75,0xf227b000,0xf23c9000
-	.long	0x00000000,0xf22f4400,0x0008f21f,0x9000f22f
-	.long	0x44220008,0x4e75f227,0xb000f23c,0x90000000
-	.long	0x0000f22f,0x54000008,0xf21f9000,0xf22f5422
-	.long	0x000c4e75,0xf22fd080,0x0004f22f,0x48220010
-	.long	0x4e75f227,0xb000f23c,0x90000000,0x0000f22f
-	.long	0x44000008,0xf21f9000,0xf22f4428,0x00084e75
-	.long	0xf227b000,0xf23c9000,0x00000000,0xf22f5400
-	.long	0x0008f21f,0x9000f22f,0x5428000c,0x4e75f22f
-	.long	0xd0800004,0xf22f4828,0x00104e75,0xf227b000
-	.long	0xf23c9000,0x00000000,0xf22f4400,0x0008f21f
-	.long	0x9000f22f,0x44230008,0x4e75f227,0xb000f23c
-	.long	0x90000000,0x0000f22f,0x54000008,0xf21f9000
-	.long	0xf22f5423,0x000c4e75,0xf22fd080,0x0004f22f
-	.long	0x48230010,0x4e75f227,0xb000f23c,0x90000000
-	.long	0x0000f22f,0x44000008,0xf21f9000,0xf22f4420
-	.long	0x00084e75,0xf227b000,0xf23c9000,0x00000000
-	.long	0xf22f5400,0x0008f21f,0x9000f22f,0x5420000c
-	.long	0x4e75f22f,0xd0800004,0xf22f4820,0x00104e75
-	.long	0xf22f4418,0x00044e75,0xf22f5418,0x00044e75
-	.long	0xf22f4818,0x00044e75,0xf22f441a,0x00044e75
-	.long	0xf22f541a,0x00044e75,0xf22f481a,0x00044e75
-	.long	0xf22f4404,0x00044e75,0xf22f5404,0x00044e75
-	.long	0xf22f4804,0x00044e75,0xf22f4401,0x00044e75
-	.long	0xf22f5401,0x00044e75,0xf22f4801,0x00044e75
-	.long	0xf22f4403,0x00044e75,0xf22f5403,0x00044e75
-	.long	0xf22f4803,0x00044e75,0x4a280000,0x6b10f23c
-	.long	0x44000000,0x00001d7c,0x0004ff64,0x4e75f23c
-	.long	0x44008000,0x00001d7c,0x000cff64,0x4e754a29
-	.long	0x00006bea,0x60d84a28,0x00006b10,0xf23c4400
-	.long	0x7f800000,0x1d7c0002,0xff644e75,0xf23c4400
-	.long	0xff800000,0x1d7c000a,0xff644e75,0x4a290000
-	.long	0x6bea60d8,0x4a280000,0x6ba460d0,0x4a280000
-	.long	0x6b00fba2,0x60c64a28,0x00006b16,0x60be4a28
-	.long	0x00006b0e,0xf23c4400,0x3f800000,0x422eff64
-	.long	0x4e75f23c,0x4400bf80,0x00001d7c,0x0008ff64
-	.long	0x4e753fff,0x0000c90f,0xdaa22168,0xc235bfff
-	.long	0x0000c90f,0xdaa22168,0xc2354a28,0x00006b0e
-	.long	0xf2009000,0xf23a4800,0xffda6000,0xfcf2f200
-	.long	0x9000f23a,0x4800ffd8,0x6000fcec,0xf23c4480
-	.long	0x3f800000,0x4a280000,0x6a10f23c,0x44008000
-	.long	0x00001d7c,0x000cff64,0x4e75f23c,0x44000000
-	.long	0x00001d7c,0x0004ff64,0x4e75f23a,0x4880fa84
-	.long	0x6000fb02,0xf2284880,0x00006000,0xfd30122e
-	.long	0xff4f67ff,0xfffff782,0x0c010001,0x67000078
-	.long	0x0c010002,0x67ffffff,0xfade0c01,0x000467ff
-	.long	0xfffff766,0x60ffffff,0xfcea122e,0xff4f67ff
-	.long	0xfffffac4,0x0c010001,0x67ffffff,0xfaba0c01
-	.long	0x000267ff,0xfffffab0,0x0c010004,0x67ffffff
-	.long	0xfaa660ff,0xfffffcbc,0x122eff4f,0x67ff0000
-	.long	0x00440c01,0x000167ff,0x0000001e,0x0c010002
-	.long	0x67ffffff,0xfa820c01,0x000467ff,0x00000026
-	.long	0x60ffffff,0xfc8e1228,0x00001029,0x0000b101
-	.long	0x02010080,0x1d41ff65,0x4a006a00,0xfe526000
-	.long	0xfe5e422e,0xff652f00,0x12280000,0x10290000
-	.long	0xb1010201,0x00801d41,0xff650c2e,0x0004ff4f
-	.long	0x660c41e9,0x0000201f,0x60ffffff,0xfc2ef21f
-	.long	0x9000f229,0x48000000,0x4a290000,0x6b024e75
-	.long	0x1d7c0008,0xff644e75,0x122eff4f,0x67ffffff
-	.long	0xf6a40c01,0x00016700,0xff8e0c01,0x000267ff
-	.long	0xfffff9f4,0x0c010004,0x67ffffff,0xf68860ff
-	.long	0xfffffc00,0x122eff4f,0x67ffffff,0xf9da0c01
-	.long	0x000167ff,0xfffff9d0,0x0c010002,0x67ffffff
-	.long	0xf9c60c01,0x000467ff,0xfffff9bc,0x60ffffff
-	.long	0xfbd2122e,0xff4f6700,0xff5a0c01,0x00016700
-	.long	0xff360c01,0x000267ff,0xfffff99c,0x0c010004
-	.long	0x67ffffff,0xff4060ff,0xfffffba8,0x122eff4f
-	.long	0x67ffffff,0xf5000c01,0x000167ff,0xfffffd92
-	.long	0x0c010002,0x67ffffff,0xfdb60c01,0x000467ff
-	.long	0xfffff4e2,0x60ffffff,0xfb7a122e,0xff4f67ff
-	.long	0xfffff4d2,0x0c010001,0x67ffffff,0xfd640c01
-	.long	0x000267ff,0xfffffd88,0x0c010004,0x67ffffff
-	.long	0xf4b460ff,0xfffffb4c,0x122eff4f,0x67ffffff
-	.long	0xf9260c01,0x000367ff,0xfffffb38,0x60ffffff
-	.long	0xf916122e,0xff4f0c01,0x000367ff,0xfffffb24
-	.long	0x60ffffff,0xfb3a2f02,0x2f032028,0x00042228
-	.long	0x0008edc0,0x2000671a,0xe5a8e9c1,0x30228083
-	.long	0xe5a92140,0x00042141,0x00082002,0x261f241f
-	.long	0x4e75edc1,0x2000e5a9,0x06820000,0x00202141
-	.long	0x000442a8,0x00082002,0x261f241f,0x4e75ede8
-	.long	0x00000004,0x660eede8,0x00000008,0x67000074
-	.long	0x06400020,0x42813228,0x00000241,0x7fffb041
-	.long	0x6e1c9240,0x30280000,0x02408000,0x82403141
-	.long	0x000061ff,0xffffff82,0x103c0000,0x4e750c01
-	.long	0x00206e20,0xe9e80840,0x00042140,0x00042028
-	.long	0x0008e3a8,0x21400008,0x02688000,0x0000103c
-	.long	0x00044e75,0x04410020,0x20280008,0xe3a82140
-	.long	0x000442a8,0x00080268,0x80000000,0x103c0004
-	.long	0x4e750268,0x80000000,0x103c0001,0x4e7551fc
diff --git a/lib/libm/arch/m68060/fplsp_wrap.S b/lib/libm/arch/m68060/fplsp_wrap.S
deleted file mode 100644
index 4dd9552be..000000000
--- a/lib/libm/arch/m68060/fplsp_wrap.S
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $NetBSD: fplsp_wrap.S,v 1.7 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper.
- *
- * DO NOT EDIT - this file is automatically generated!
- */
-
-#include <machine/asm.h>
-
-
-L060FPLSP_BASE:
-#include "fplsp.hex"
diff --git a/lib/libm/arch/m68060/k_tan.S b/lib/libm/arch/m68060/k_tan.S
deleted file mode 100644
index 5e490aafb..000000000
--- a/lib/libm/arch/m68060/k_tan.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $NetBSD: k_tan.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * Dummy file. Real code is elsewhere.
- *
- * DO NOT EDIT - this file is automatically generated.
- *
- */
diff --git a/lib/libm/arch/m68060/k_tanf.S b/lib/libm/arch/m68060/k_tanf.S
deleted file mode 100644
index 533da0563..000000000
--- a/lib/libm/arch/m68060/k_tanf.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $NetBSD: k_tanf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * Dummy file. Real code is elsewhere.
- *
- * DO NOT EDIT - this file is automatically generated.
- *
- */
diff --git a/lib/libm/arch/m68060/makeas.sh b/lib/libm/arch/m68060/makeas.sh
deleted file mode 100644
index 145a24855..000000000
--- a/lib/libm/arch/m68060/makeas.sh
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/bin/sh
-
-# $NetBSD: makeas.sh,v 1.8 2010/01/06 14:10:57 phx Exp $
-
-# Copyright (c) 1999, 2000 Ignatios Souvatzis
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list 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.
-
-
-
-REALCODE=fplsp_wrap.S
-FILELIST=Makefile.list
-
-dummy () {
-while [ X$1 != X ]; do
-/bin/cat > $1.S << EOM
-/* \$NetBSD\$ */
-
-/*
- * Dummy file. Real code is elsewhere.
- *
- * DO NOT EDIT - this file is automatically generated.
- *
- */
-EOM
-echo -n " " $1.S >> $FILELIST
-shift
-done
-}
-
-linebreak () {
-	echo " \\" >> ${FILELIST}
-	echo -n "	" >> ${FILELIST}
-}
-
-mk () {
-NAME=$1
-OFFS=$2
-THESRC=$3.S
-shift; shift; shift
-
-echo -n " " ${THESRC} >> $FILELIST
-/bin/cat > ${THESRC} << EOJ
-/* \$NetBSD\$ */
-
-/*
- * FPLSP wrapper for $NAME
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY($NAME)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_$OFFS))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_$OFFS))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
-EOJ
-dummy $*
-}
-
-mks () {
-NAME=$1
-OFFS=$2
-THESRC=$3.S
-shift; shift; shift
-
-echo -n " " ${THESRC} >> $FILELIST
-/bin/cat > ${THESRC} << EOJ
-/* \$NetBSD\$ */
-
-/*
- * FPLSP wrapper for $NAME
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY($NAME)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_$OFFS))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_$OFFS))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
-EOJ
-dummy $*
-}
-
-/bin/cat > ${REALCODE} << EOJ
-/* \$NetBSD\$ */
-
-/*
- * FPLSP wrapper.
- *
- * DO NOT EDIT - this file is automatically generated!
- */
-
-#include <machine/asm.h>
-
-EOJ
-
-/bin/cat > ${FILELIST} << EOJ
-# \$NetBSD\$
-
-#
-# list of M68060 architecture dependent files for libm.
-#
-# Created by a script. Do not edit manually!
-#
-
-EOJ
-
-echo -n ARCH_SRCS = >> $FILELIST
-
-mks	__ieee754_acosf		0000	e_acosf
-mk	__ieee754_acos		0008	e_acos
-mks	__ieee754_asinf		0018	e_asinf
-mk	__ieee754_asin		0020	e_asin
-linebreak
-mks	atanf			0030	s_atanf
-mk	atan			0038	s_atan
-mks	__ieee754_atanhf	0048	e_atanhf
-mk	__ieee754_atanh		0050	e_atanh
-linebreak
-mks	cosf			0060	s_cosf
-mk	cos			0068	s_cos
-mks	__ieee754_coshf		0078	e_coshf
-mk	__ieee754_cosh		0080	e_cosh
-linebreak
-mks	__ieee754_expf		0090	e_expf
-mk	__ieee754_exp		0098	e_exp
-mks	expm1f			00a8	s_expm1f
-mk	expm1			00b0	s_expm1
-linebreak
-mks	__ieee754_log10f	00f0	e_log10f
-mk	__ieee754_log10		00f8	e_log10
-mks	logbf			0108	s_logbf
-mk	logb			0110	s_logb
-linebreak
-mks	__ieee754_logf		0120	e_logf
-mk	__ieee754_log		0128	e_log
-mks	log1pf			0138	s_log1pf
-mk	log1p			0140	s_log1p
-linebreak
-mks	sinf			0198	s_sinf
-mk	sin			01a0	s_sin
-mks	__ieee754_sinhf		01c8	e_sinhf
-mk	__ieee754_sinh		01d0	e_sinh
-linebreak
-mks	tanf			01e0	s_tanf k_tanf
-mk	tan			01e8	s_tan k_tan
-mks	tanhf			01f8	s_tanhf
-mk	tanh			0200	s_tanh
-linebreak
-mks	__ieee754_sqrtf		02e8	e_sqrtf
-mk	__ieee754_sqrt		02f0	e_sqrt
-
-/bin/cat >> ${REALCODE} << EOJ
-
-L060FPLSP_BASE:
-#include "fplsp.hex"
-EOJ
-
-echo ""	>> ${FILELIST}
-echo ARCH_ADDS = ${REALCODE} >> ${FILELIST}
diff --git a/lib/libm/arch/m68060/makeoffs.awk b/lib/libm/arch/m68060/makeoffs.awk
deleted file mode 100644
index 47605a23f..000000000
--- a/lib/libm/arch/m68060/makeoffs.awk
+++ /dev/null
@@ -1,9 +0,0 @@
-BEGIN{FS=",";s = -16;}
-/\.long/{s += 16;}
-s<0 || s>1023{print $0}
-s>=0 && s<1024{\
-	printf "ENTRY_NOPROFILE(__fplsp060_%04x) ", s;\
-	print $1 "," $2;\
-	printf "ENTRY_NOPROFILE(__fplsp060_%04x) ", s+8;\
-	print "	.long	" $3 "," $4;\
-}
diff --git a/lib/libm/arch/m68060/s_atan.S b/lib/libm/arch/m68060/s_atan.S
deleted file mode 100644
index 6779fde4b..000000000
--- a/lib/libm/arch/m68060/s_atan.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: s_atan.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for atan
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(atan)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0038))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0038))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_atanf.S b/lib/libm/arch/m68060/s_atanf.S
deleted file mode 100644
index 9d2d6b367..000000000
--- a/lib/libm/arch/m68060/s_atanf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: s_atanf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for atanf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(atanf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0030))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0030))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_cos.S b/lib/libm/arch/m68060/s_cos.S
deleted file mode 100644
index 49828f0f5..000000000
--- a/lib/libm/arch/m68060/s_cos.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: s_cos.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for cos
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(cos)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0068))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0068))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_cosf.S b/lib/libm/arch/m68060/s_cosf.S
deleted file mode 100644
index a7463b68e..000000000
--- a/lib/libm/arch/m68060/s_cosf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: s_cosf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for cosf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(cosf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0060))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0060))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_expm1.S b/lib/libm/arch/m68060/s_expm1.S
deleted file mode 100644
index a98397bdf..000000000
--- a/lib/libm/arch/m68060/s_expm1.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: s_expm1.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for expm1
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(expm1)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_00b0))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_00b0))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_expm1f.S b/lib/libm/arch/m68060/s_expm1f.S
deleted file mode 100644
index 27867c384..000000000
--- a/lib/libm/arch/m68060/s_expm1f.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: s_expm1f.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for expm1f
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(expm1f)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_00a8))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_00a8))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_log1p.S b/lib/libm/arch/m68060/s_log1p.S
deleted file mode 100644
index a4f0bcc20..000000000
--- a/lib/libm/arch/m68060/s_log1p.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: s_log1p.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for log1p
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(log1p)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0140))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0140))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_log1pf.S b/lib/libm/arch/m68060/s_log1pf.S
deleted file mode 100644
index 93c7b55d3..000000000
--- a/lib/libm/arch/m68060/s_log1pf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: s_log1pf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for log1pf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(log1pf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0138))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0138))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_logb.S b/lib/libm/arch/m68060/s_logb.S
deleted file mode 100644
index d6d084ee7..000000000
--- a/lib/libm/arch/m68060/s_logb.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: s_logb.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for logb
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(logb)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0110))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0110))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_logbf.S b/lib/libm/arch/m68060/s_logbf.S
deleted file mode 100644
index 169e46f2b..000000000
--- a/lib/libm/arch/m68060/s_logbf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: s_logbf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for logbf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(logbf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0108))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0108))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_sin.S b/lib/libm/arch/m68060/s_sin.S
deleted file mode 100644
index 2b38f1118..000000000
--- a/lib/libm/arch/m68060/s_sin.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: s_sin.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for sin
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(sin)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_01a0))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_01a0))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_sinf.S b/lib/libm/arch/m68060/s_sinf.S
deleted file mode 100644
index a43532b83..000000000
--- a/lib/libm/arch/m68060/s_sinf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: s_sinf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for sinf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(sinf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0198))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0198))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_tan.S b/lib/libm/arch/m68060/s_tan.S
deleted file mode 100644
index 3174c83e9..000000000
--- a/lib/libm/arch/m68060/s_tan.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: s_tan.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for tan
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(tan)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_01e8))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_01e8))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_tanf.S b/lib/libm/arch/m68060/s_tanf.S
deleted file mode 100644
index 7ec23080e..000000000
--- a/lib/libm/arch/m68060/s_tanf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: s_tanf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for tanf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(tanf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_01e0))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_01e0))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_tanh.S b/lib/libm/arch/m68060/s_tanh.S
deleted file mode 100644
index ab3b5d973..000000000
--- a/lib/libm/arch/m68060/s_tanh.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $NetBSD: s_tanh.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for tanh
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(tanh)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_0200))
-#else
-	movel %sp@(8),%sp@-
-	movel %sp@(8),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_0200))
-	fmoved %fp0,%sp@
-	movel %sp@+,%d0
-	movel %sp@+,%d1
-	rts
-#endif
diff --git a/lib/libm/arch/m68060/s_tanhf.S b/lib/libm/arch/m68060/s_tanhf.S
deleted file mode 100644
index d98b094df..000000000
--- a/lib/libm/arch/m68060/s_tanhf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: s_tanhf.S,v 1.6 2010/01/06 14:11:53 phx Exp $ */
-
-/*
- * FPLSP wrapper for tanhf
- * DO NOT EDIT - this file is automatically generated.
- */
-
-#include <machine/asm.h>
-
-ENTRY(tanhf)
-#ifdef __SVR4_ABI__
-	bral PIC_PLT(_C_LABEL(__fplsp060_01f8))
-#else
-	movel %sp@(4),%sp@-
-	bsrl PIC_PLT(_C_LABEL(__fplsp060_01f8))
-	fmoves %fp0,%sp@
-	movel %sp@+,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68k/s_ceil.S b/lib/libm/arch/m68k/s_ceil.S
deleted file mode 100644
index c9f9c565a..000000000
--- a/lib/libm/arch/m68k/s_ceil.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: s_ceil.S,v 1.9 2014/08/10 13:30:43 isaki Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)floor.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: s_ceil.S,v 1.9 2014/08/10 13:30:43 isaki Exp $")
-
-| ceil(x)
-ENTRY(ceil)
-	fmovel	%fpcr,%d0	| save old FPCR
-	fmoved	%sp@(4),%fp0	| get argument
-	fbun	Lret		| if NaN, return NaN
-	fmovel	#0x30,%fpcr	| round to +inf
-	fintx	%fp0		| truncate
-	fmovel	%d0,%fpcr	| restore old FPCR
-Lret:
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/m68k/s_copysign.S b/lib/libm/arch/m68k/s_copysign.S
deleted file mode 100644
index ca14860a5..000000000
--- a/lib/libm/arch/m68k/s_copysign.S
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: s_copysign.S,v 1.10 2014/11/16 16:11:33 joerg Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-#include <machine/math.h>
-
-;_sccsid:
-;.asciz	"from: @(#)support.s	5.2 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: s_copysign.S,v 1.10 2014/11/16 16:11:33 joerg Exp $")
-
-#if !defined(__HAVE_LONG_DOUBLE)
-STRONG_ALIAS(_copysignl, copysign)
-WEAK_ALIAS(copysignl, _copysignl)
-#endif
-
-| copysign(x,y)
-| returns x with the sign of y.
-ENTRY(copysign)
-#ifdef __SVR4_ABI__
-	tstw	%sp@(12)
-	jmi	Lneg
-	bclr	#31,%sp@(4)
-	fmoved	%sp@(4),%fp0
-	rts
-Lneg:
-	bset	#31,%sp@(4)
-	fmoved	%sp@(4),%fp0
-	rts
-#else
-	movl	%sp@(4),%d0
-	movl	%sp@(8),%d1
-	tstw	%sp@(12)
-	jmi	Lneg
-	bclr	#31,%d0
-	rts
-Lneg:
-	bset	#31,%d0
-	rts
-#endif
diff --git a/lib/libm/arch/m68k/s_finite.S b/lib/libm/arch/m68k/s_finite.S
deleted file mode 100644
index bc38c5079..000000000
--- a/lib/libm/arch/m68k/s_finite.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: s_finite.S,v 1.7 2003/08/07 16:44:41 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)support.s	5.2 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: s_finite.S,v 1.7 2003/08/07 16:44:41 agc Exp $")
-
-| finite(x)
-| returns the value TRUE if -INF < x < +INF and returns FALSE otherwise.
-ENTRY(finite)
-	movw	%sp@(4),%d0
-	movw	#0x7FF0,%d1
-	andw	%d1,%d0
-	cmpw	%d1,%d0
-	sne	%d0
-	extbl	%d0
-	negl	%d0
-	rts
diff --git a/lib/libm/arch/m68k/s_floor.S b/lib/libm/arch/m68k/s_floor.S
deleted file mode 100644
index 36cc67ba9..000000000
--- a/lib/libm/arch/m68k/s_floor.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: s_floor.S,v 1.9 2014/08/10 13:30:43 isaki Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)floor.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: s_floor.S,v 1.9 2014/08/10 13:30:43 isaki Exp $")
-
-| floor(x)
-| the largest integer no larger than x
-ENTRY(floor)
-	fmovel	%fpcr,%d0	| save old FPCR
-	fmoved	%sp@(4),%fp0	| get argument
-	fbun	Lret		| if NaN, return NaN
-	fmovel	#0x20,%fpcr	| round to -inf
-	fintx	%fp0		| truncate
-	fmovel	%d0,%fpcr	| restore old FPCR
-Lret:
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/m68k/s_rint.S b/lib/libm/arch/m68k/s_rint.S
deleted file mode 100644
index efb4a6415..000000000
--- a/lib/libm/arch/m68k/s_rint.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: s_rint.S,v 1.7 2003/08/07 16:44:41 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)floor.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: s_rint.S,v 1.7 2003/08/07 16:44:41 agc Exp $")
-
-| rint(x)
-| delivers integer nearest x in direction of prevailing rounding mode
-ENTRY(rint)
-	fintd	%sp@(4),%fp0	| use prevailing rounding mode
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/e_acos.S b/lib/libm/arch/mc68881/e_acos.S
deleted file mode 100644
index 4e482d125..000000000
--- a/lib/libm/arch/mc68881/e_acos.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: e_acos.S,v 1.6 2003/08/07 16:44:42 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)asincos.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: e_acos.S,v 1.6 2003/08/07 16:44:42 agc Exp $")
-
-ENTRY(__ieee754_acos)
-	facosd	%sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/e_asin.S b/lib/libm/arch/mc68881/e_asin.S
deleted file mode 100644
index 591bdba69..000000000
--- a/lib/libm/arch/mc68881/e_asin.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: e_asin.S,v 1.6 2003/08/07 16:44:42 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)asincos.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: e_asin.S,v 1.6 2003/08/07 16:44:42 agc Exp $")
-
-ENTRY(__ieee754_asin)
-	fasind	%sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/e_atanh.S b/lib/libm/arch/mc68881/e_atanh.S
deleted file mode 100644
index 8e6002e95..000000000
--- a/lib/libm/arch/mc68881/e_atanh.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: e_atanh.S,v 1.6 2003/08/07 16:44:42 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)atanh.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: e_atanh.S,v 1.6 2003/08/07 16:44:42 agc Exp $")
-
-ENTRY(__ieee754_atanh)
-	fatanhd	%sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/e_cosh.S b/lib/libm/arch/mc68881/e_cosh.S
deleted file mode 100644
index 4165faf3f..000000000
--- a/lib/libm/arch/mc68881/e_cosh.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: e_cosh.S,v 1.6 2003/08/07 16:44:42 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)cosh.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: e_cosh.S,v 1.6 2003/08/07 16:44:42 agc Exp $")
-
-ENTRY(__ieee754_cosh)
-	fcoshd	%sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/e_exp.S b/lib/libm/arch/mc68881/e_exp.S
deleted file mode 100644
index 3ef921dd4..000000000
--- a/lib/libm/arch/mc68881/e_exp.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: e_exp.S,v 1.6 2003/08/07 16:44:42 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)exp.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: e_exp.S,v 1.6 2003/08/07 16:44:42 agc Exp $")
-
-ENTRY(__ieee754_exp)
-	fetoxd	%sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/e_fmod.S b/lib/libm/arch/mc68881/e_fmod.S
deleted file mode 100644
index f0d5dc7be..000000000
--- a/lib/libm/arch/mc68881/e_fmod.S
+++ /dev/null
@@ -1,20 +0,0 @@
-/*	$NetBSD: e_fmod.S,v 1.4 2003/07/26 19:25:04 salo Exp $	*/
-
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: e_fmod.S,v 1.4 2003/07/26 19:25:04 salo Exp $")
-
-ENTRY(__ieee754_fmod)
-	fmoved	%sp@(4),%fp0
-	fmodd	%sp@(12),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/e_log.S b/lib/libm/arch/mc68881/e_log.S
deleted file mode 100644
index 2e9410284..000000000
--- a/lib/libm/arch/mc68881/e_log.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: e_log.S,v 1.6 2003/08/07 16:44:42 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)log.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: e_log.S,v 1.6 2003/08/07 16:44:42 agc Exp $")
-
-ENTRY(__ieee754_log)
-	flognd	%sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/e_log10.S b/lib/libm/arch/mc68881/e_log10.S
deleted file mode 100644
index dda9a6047..000000000
--- a/lib/libm/arch/mc68881/e_log10.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: e_log10.S,v 1.6 2003/08/07 16:44:42 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)log10.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: e_log10.S,v 1.6 2003/08/07 16:44:42 agc Exp $")
-
-ENTRY(__ieee754_log10)
-	flog10d	%sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/e_remainder.S b/lib/libm/arch/mc68881/e_remainder.S
deleted file mode 100644
index 62ae706fd..000000000
--- a/lib/libm/arch/mc68881/e_remainder.S
+++ /dev/null
@@ -1,20 +0,0 @@
-/*	$NetBSD: e_remainder.S,v 1.6 2003/07/26 19:25:04 salo Exp $	*/
-
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: e_remainder.S,v 1.6 2003/07/26 19:25:04 salo Exp $")
-
-ENTRY(__ieee754_remainder)
-	fmoved	%sp@(4),%fp0
-	fremd	%sp@(12),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/e_scalb.S b/lib/libm/arch/mc68881/e_scalb.S
deleted file mode 100644
index f57df002c..000000000
--- a/lib/libm/arch/mc68881/e_scalb.S
+++ /dev/null
@@ -1,20 +0,0 @@
-/*	$NetBSD: e_scalb.S,v 1.9 2003/07/26 19:25:05 salo Exp $	*/
-
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: e_scalb.S,v 1.9 2003/07/26 19:25:05 salo Exp $")
-
-ENTRY(__ieee754_scalb)
-	fmoved	%sp@(4),%fp0
-	fscaled	%sp@(12),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/e_sinh.S b/lib/libm/arch/mc68881/e_sinh.S
deleted file mode 100644
index ef3d4dd2a..000000000
--- a/lib/libm/arch/mc68881/e_sinh.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: e_sinh.S,v 1.6 2003/08/07 16:44:42 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)sinh.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: e_sinh.S,v 1.6 2003/08/07 16:44:42 agc Exp $")
-
-ENTRY(__ieee754_sinh)
-	fsinhd	%sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/e_sqrt.S b/lib/libm/arch/mc68881/e_sqrt.S
deleted file mode 100644
index d84ba924d..000000000
--- a/lib/libm/arch/mc68881/e_sqrt.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: e_sqrt.S,v 1.7 2003/08/07 16:44:43 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)sqrt.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: e_sqrt.S,v 1.7 2003/08/07 16:44:43 agc Exp $")
-
-/*
- * sqrt(x)
- * returns the square root of x correctly rounded according
- * to the rounding mode.
- */
-
-ENTRY(__ieee754_sqrt)
-	fsqrtd	%sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/s_atan.S b/lib/libm/arch/mc68881/s_atan.S
deleted file mode 100644
index 9113a158c..000000000
--- a/lib/libm/arch/mc68881/s_atan.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: s_atan.S,v 1.6 2003/08/07 16:44:43 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)atan.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: s_atan.S,v 1.6 2003/08/07 16:44:43 agc Exp $")
-
-ENTRY(atan)
-	fatand	%sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/s_cos.S b/lib/libm/arch/mc68881/s_cos.S
deleted file mode 100644
index 5e633e5bd..000000000
--- a/lib/libm/arch/mc68881/s_cos.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: s_cos.S,v 1.6 2003/08/07 16:44:43 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)sincos.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: s_cos.S,v 1.6 2003/08/07 16:44:43 agc Exp $")
-
-ENTRY(cos)
-	fcosd	%sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/s_expm1.S b/lib/libm/arch/mc68881/s_expm1.S
deleted file mode 100644
index 49284494b..000000000
--- a/lib/libm/arch/mc68881/s_expm1.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: s_expm1.S,v 1.6 2003/08/07 16:44:43 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)expm1.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: s_expm1.S,v 1.6 2003/08/07 16:44:43 agc Exp $")
-
-ENTRY(expm1)
-	fetoxm1d %sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/s_log1p.S b/lib/libm/arch/mc68881/s_log1p.S
deleted file mode 100644
index affcaf57a..000000000
--- a/lib/libm/arch/mc68881/s_log1p.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: s_log1p.S,v 1.6 2003/08/07 16:44:43 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)log1p.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: s_log1p.S,v 1.6 2003/08/07 16:44:43 agc Exp $")
-
-ENTRY(log1p)
-	flognp1d %sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/s_logb.S b/lib/libm/arch/mc68881/s_logb.S
deleted file mode 100644
index 91246ab1f..000000000
--- a/lib/libm/arch/mc68881/s_logb.S
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: s_logb.S,v 1.7 2003/08/07 16:44:43 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)support.s	5.2 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: s_logb.S,v 1.7 2003/08/07 16:44:43 agc Exp $")
-
-| logb(x)
-| returns the unbiased exponent of x, a signed integer in double precision,
-| except that logb(0) is -INF, logb(INF) is +INF, and logb(NAN) is that NAN.
-ENTRY(logb)
-	movw	%sp@(4),%d0
-	movw	#0x7FF0,%d1	| exponent bits
-	andw	%d1,%d0		| mask off all else
-	cmpw	%d1,%d0		| max exponent?
-	bne	Lfinite		| no, is finite
-	fmoved	%sp@(4),%fp0	| yes, infinite or NaN
-	fbun	Ldone		| NaN returns NaN
-	fabsx	%fp0		| +-inf returns inf
-	jra	Ldone
-Lfinite:
-	fmoved	%sp@(4),%fp0	| get entire number
-	fbne	Lnonz		| zero?
-	flog2x	%fp0		| yes, log(0) a convenient source of -inf
-	jra	Ldone
-Lnonz:
-	fgetexpx %fp0		| get exponent
-Ldone:
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/s_scalbn.S b/lib/libm/arch/mc68881/s_scalbn.S
deleted file mode 100644
index 2d62343ff..000000000
--- a/lib/libm/arch/mc68881/s_scalbn.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: s_scalbn.S,v 1.11 2013/05/20 20:27:43 mlelstv Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)support.s	5.2 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: s_scalbn.S,v 1.11 2013/05/20 20:27:43 mlelstv Exp $")
-
-WEAK_ALIAS(scalbn,_scalbn)
-WEAK_ALIAS(ldexp,_scalbn)
-STRONG_ALIAS(_scalbln,_scalbn)
-WEAK_ALIAS(scalbln,_scalbln)
-
-| scalbn(x, N)
-| returns  x * (2**N), for integer values N.
-ENTRY(_scalbn)
-	fmoved	%sp@(4),%fp0
-	fscalel	%sp@(12),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/s_sin.S b/lib/libm/arch/mc68881/s_sin.S
deleted file mode 100644
index b3c370b67..000000000
--- a/lib/libm/arch/mc68881/s_sin.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: s_sin.S,v 1.6 2003/08/07 16:44:43 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)sincos.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: s_sin.S,v 1.6 2003/08/07 16:44:43 agc Exp $")
-
-ENTRY(sin)
-	fsind	%sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/s_tan.S b/lib/libm/arch/mc68881/s_tan.S
deleted file mode 100644
index 4c15029d0..000000000
--- a/lib/libm/arch/mc68881/s_tan.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: s_tan.S,v 1.6 2003/08/07 16:44:44 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)tan.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: s_tan.S,v 1.6 2003/08/07 16:44:44 agc Exp $")
-
-ENTRY(tan)
-	ftand	%sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/mc68881/s_tanh.S b/lib/libm/arch/mc68881/s_tanh.S
deleted file mode 100644
index 3c257a43b..000000000
--- a/lib/libm/arch/mc68881/s_tanh.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: s_tanh.S,v 1.6 2003/08/07 16:44:44 agc Exp $	*/
-
-/*-
- * Copyright (c) 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 <machine/asm.h>
-
-;_sccsid:
-;.asciz	"from: @(#)tanh.s	5.1 (Berkeley) 5/17/90"
-
-RCSID("$NetBSD: s_tanh.S,v 1.6 2003/08/07 16:44:44 agc Exp $")
-
-ENTRY(tanh)
-	ftanhd	%sp@(4),%fp0
-#ifndef __SVR4_ABI__
-	fmoved	%fp0,%sp@-
-	movel	%sp@+,%d0
-	movel	%sp@+,%d1
-#endif
-	rts
diff --git a/lib/libm/arch/riscv/e_sqrt.S b/lib/libm/arch/riscv/e_sqrt.S
deleted file mode 100644
index 37240af7d..000000000
--- a/lib/libm/arch/riscv/e_sqrt.S
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $NetBSD: e_sqrt.S,v 1.2 2015/03/27 23:35:40 matt Exp $ */
-
-/* The contents of this file are in the public domain. */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_sqrt)
-	fsqrt.d	fa0, fa0
-	ret
-END(__ieee754_sqrt)
diff --git a/lib/libm/arch/riscv/e_sqrtf.S b/lib/libm/arch/riscv/e_sqrtf.S
deleted file mode 100644
index 3e8c0eee9..000000000
--- a/lib/libm/arch/riscv/e_sqrtf.S
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $NetBSD: e_sqrtf.S,v 1.2 2015/03/27 23:35:40 matt Exp $ */
-
-/* The contents of this file are in the public domain. */
-
-#include <machine/asm.h>
-
-ENTRY(__ieee754_sqrtf)
-	fsqrt.s	fa0, fa0
-	ret
-END(__ieee754_sqrtf)
diff --git a/lib/libm/arch/riscv/fenv.c b/lib/libm/arch/riscv/fenv.c
deleted file mode 100644
index 6bc5fc425..000000000
--- a/lib/libm/arch/riscv/fenv.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* $NetBSD: fenv.c,v 1.1 2014/09/19 17:36:25 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: fenv.c,v 1.1 2014/09/19 17:36:25 matt Exp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <assert.h>
-#include <fenv.h>
-#include <stddef.h>
-#include <string.h>
-
-#include <riscv/sysreg.h>
-
-/*
- * The following constant represents the default floating-point environment
- * (that is, the one installed at program startup) and has type pointer to
- * const-qualified fenv_t.
- *
- * It can be used as an argument to the functions within the <fenv.h> header
- * that manage the floating-point environment, namely fesetenv() and
- * feupdateenv().
- */
-fenv_t __fe_dfl_env = __SHIFTIN(FCSR_FRM_RNE, FCSR_FRM);
-
-/*
- * The feclearexcept() function clears the supported floating-point exceptions
- * represented by `excepts'.
- */
-int
-feclearexcept(int excepts)
-{
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	int fflags = riscvreg_fcsr_read_fflags();
-
-	fflags &= ~(excepts & FE_ALL_EXCEPT);
-
-	riscvreg_fcsr_write_fflags(fflags);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The fegetexceptflag() function stores an implementation-defined
- * representation of the states of the floating-point status flags indicated by
- * the argument excepts in the object pointed to by the argument flagp.
- */
-int
-fegetexceptflag(fexcept_t *flagp, int excepts)
-{
-	_DIAGASSERT(flagp != NULL);
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	*flagp = riscvreg_fcsr_read_fflags() & excepts;
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The feraiseexcept() function raises the supported floating-point exceptions
- * represented by the argument `excepts'.
- *
- * The standard explicitly allows us to execute an instruction that has the
- * exception as a side effect, but we choose to manipulate the status register
- * directly.
- *
- * The validation of input is being deferred to fesetexceptflag().
- */
-int
-feraiseexcept(int excepts)
-{
-	fexcept_t ex = 0;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	excepts &= FE_ALL_EXCEPT;
-	fesetexceptflag(&ex, excepts);
-	/* XXX exception magic XXX */
-
-	/* Success */
-	return (0);
-}
-
-/*
- * This function sets the floating-point status flags indicated by the argument
- * `excepts' to the states stored in the object pointed to by `flagp'. It does
- * NOT raise any floating-point exceptions, but only sets the state of the flags.
- */
-int
-fesetexceptflag(const fexcept_t *flagp, int excepts)
-{
-	_DIAGASSERT(flagp != NULL);
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	excepts &= FE_ALL_EXCEPT;
-
-	int fflags = riscvreg_fcsr_read_fflags();
-
-	fflags = (fflags & ~excepts) | (*flagp & excepts);
-
-	riscvreg_fcsr_write_fflags(fflags);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The fetestexcept() function determines which of a specified subset of the
- * floating-point exception flags are currently set. The `excepts' argument
- * specifies the floating-point status flags to be queried.
- */
-int
-fetestexcept(int excepts)
-{
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	return riscvreg_fcsr_read_fflags() & excepts & FE_ALL_EXCEPT;
-}
-
-int
-fegetround(void)
-{
-	return riscvreg_fcsr_read_frm();
-}
-
-/*
- * The fesetround() function shall establish the rounding direction represented
- * by its argument round. If the argument is not equal to the value of a
- * rounding direction macro, the rounding direction is not changed.
- */
-int
-fesetround(int round)
-{
-	if ((unsigned int)round > FCSR_FRM_RMM) {
-		/* Failure */
-		return (-1);
-	}
-
-	riscvreg_fcsr_write_frm(round);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The fegetenv() function attempts to store the current floating-point
- * environment in the object pointed to by envp.
- */
-int
-fegetenv(fenv_t *envp)
-{
-	_DIAGASSERT(envp != NULL);
-
-	*envp = riscvreg_fcsr_read();
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The feholdexcept() function saves the current floating-point environment in
- * the object pointed to by envp, clears the floating-point status flags, and
- * then installs a non-stop (continue on floating-point exceptions) mode, if
- * available, for all floating-point exceptions.
- */
-int
-feholdexcept(fenv_t *envp)
-{
-	_DIAGASSERT(envp != NULL);
-
-	*envp = riscvreg_fcsr_read();
-
-	riscvreg_fcsr_write_fflags(0);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The fesetenv() function attempts to establish the floating-point environment
- * represented by the object pointed to by envp. The argument `envp' points
- * to an object set by a call to fegetenv() or feholdexcept(), or equal a
- * floating-point environment macro. The fesetenv() function does not raise
- * floating-point exceptions, but only installs the state of the floating-point
- * status flags represented through its argument.
- */
-int
-fesetenv(const fenv_t *envp)
-{
-
-	_DIAGASSERT(envp != NULL);
-
-	fenv_t env = *envp;
-
-	if ((env & ~(FCSR_FRM|FCSR_FFLAGS)
-	    || __SHIFTOUT(env, FCSR_FRM) > FCSR_FRM_RMM)) {
-		return -1;
-	}
-
-	riscvreg_fcsr_write(env);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The feupdateenv() function saves the currently raised floating-point
- * exceptions in its automatic storage, installs the floating-point environment
- * represented by the object pointed to by `envp', and then raises the saved
- * floating-point exceptions. The argument `envp' shall point to an object set
- * by a call to feholdexcept() or fegetenv(), or equal a floating-point
- * environment macro.
- */
-int
-feupdateenv(const fenv_t *envp)
-{
-	_DIAGASSERT(envp != NULL);
-
-	int fflags = riscvreg_fcsr_read_fflags();
-
-	fesetenv(envp);
-	feraiseexcept(fflags);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The following functions are extentions to the standard
- */
-int
-feenableexcept(int nmask)
-{
-	return 0;
-}
-
-int
-fedisableexcept(int nmask)
-{
-	return 0;
-}
-
-int
-fegetexcept(void)
-{
-	return 0;
-}
diff --git a/lib/libm/arch/riscv/lrint.S b/lib/libm/arch/riscv/lrint.S
deleted file mode 100644
index 4558785f5..000000000
--- a/lib/libm/arch/riscv/lrint.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: lrint.S,v 1.2 2015/03/27 23:35:40 matt Exp $ */
-
-/* The contents of this file are in the public domain. */
-
-#include <machine/asm.h>
-
-#ifdef _LP64_X
-STRONG_ALIAS(llrint,lrint)
-#endif
-
-ENTRY(lrint)
-#ifdef _LP64
-	fcvt.l.d	a0, fa0
-#else
-	fcvt.w.d	a0, fa0
-#endif
-	ret
-END(lrint)
diff --git a/lib/libm/arch/riscv/lrintf.S b/lib/libm/arch/riscv/lrintf.S
deleted file mode 100644
index 15201fde5..000000000
--- a/lib/libm/arch/riscv/lrintf.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $NetBSD: lrintf.S,v 1.2 2015/03/27 23:35:40 matt Exp $ */
-
-/* The contents of this file are in the public domain. */
-
-#include <machine/asm.h>
-
-#ifdef _LP64_X
-STRONG_ALIAS(llrintf,lrintf)
-#endif
-
-ENTRY(lrintf)
-#ifdef _LP64
-	fcvt.l.s	a0, fa0
-#else
-	fcvt.w.s	a0, fa0
-#endif
-	ret
-END(lrintf)
diff --git a/lib/libm/arch/riscv/s_copysign.S b/lib/libm/arch/riscv/s_copysign.S
deleted file mode 100644
index 70ca71b77..000000000
--- a/lib/libm/arch/riscv/s_copysign.S
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $NetBSD: s_copysign.S,v 1.4 2015/03/27 23:35:40 matt Exp $ */
-
-/* The contents of this file are in the public domain. */
-
-#include <machine/asm.h>
-
-STRONG_ALIAS(_copysignl, copysign)
-WEAK_ALIAS(copysignl, _copysignl)
-
-ENTRY(copysign)
-	fsgnj.d	fa0, fa0, fa1
-	ret
-END(copysign)
diff --git a/lib/libm/arch/riscv/s_copysignf.S b/lib/libm/arch/riscv/s_copysignf.S
deleted file mode 100644
index 75ba3a233..000000000
--- a/lib/libm/arch/riscv/s_copysignf.S
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $NetBSD: s_copysignf.S,v 1.2 2015/03/27 23:35:40 matt Exp $ */
-
-/* The contents of this file are in the public domain. */
-
-#include <machine/asm.h>
-
-ENTRY(copysignf)
-	fsgnj.s	fa0, fa0, fa1
-	ret
-END(copysignf)
diff --git a/lib/libm/arch/riscv/s_fabs.S b/lib/libm/arch/riscv/s_fabs.S
deleted file mode 100644
index 5d477c7c7..000000000
--- a/lib/libm/arch/riscv/s_fabs.S
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $NetBSD: s_fabs.S,v 1.2 2015/03/27 23:35:40 matt Exp $ */
-
-/* The contents of this file are in the public domain. */
-
-#include <machine/asm.h>
-
-ENTRY(fabs)
-	fabs.d	fa0, fa0
-	ret
-END(fabs)
diff --git a/lib/libm/arch/riscv/s_fabsf.S b/lib/libm/arch/riscv/s_fabsf.S
deleted file mode 100644
index a6ce87ba0..000000000
--- a/lib/libm/arch/riscv/s_fabsf.S
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $NetBSD: s_fabsf.S,v 1.2 2015/03/27 23:35:40 matt Exp $ */
-
-/* The contents of this file are in the public domain. */
-
-#include <machine/asm.h>
-
-ENTRY(fabsf)
-	fabs.s	fa0, fa0
-	ret
-END(fabsf)
diff --git a/lib/libm/arch/riscv/s_fma.S b/lib/libm/arch/riscv/s_fma.S
deleted file mode 100644
index 1de6da495..000000000
--- a/lib/libm/arch/riscv/s_fma.S
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $NetBSD: s_fma.S,v 1.2 2015/03/27 23:35:40 matt Exp $ */
-
-/* The contents of this file are in the public domain. */
-
-#include <machine/asm.h>
-
-ENTRY(fma)
-	fmadd.d	fa0, fa0, fa1, fa2
-	ret
-END(fma)
diff --git a/lib/libm/arch/riscv/s_fmaf.S b/lib/libm/arch/riscv/s_fmaf.S
deleted file mode 100644
index 1954a2365..000000000
--- a/lib/libm/arch/riscv/s_fmaf.S
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $NetBSD: s_fmaf.S,v 1.2 2015/03/27 23:35:40 matt Exp $ */
-
-/* The contents of this file are in the public domain. */
-
-#include <machine/asm.h>
-
-ENTRY(fmaddf)
-	fmadd.s	fa0, fa0, fa1, fa2
-	ret
-END(fmaddf)
diff --git a/lib/libm/arch/riscv/s_fmax.S b/lib/libm/arch/riscv/s_fmax.S
deleted file mode 100644
index d0e90495b..000000000
--- a/lib/libm/arch/riscv/s_fmax.S
+++ /dev/null
@@ -1,15 +0,0 @@
-/* $NetBSD: s_fmax.S,v 1.2 2015/03/27 23:35:40 matt Exp $ */
-
-/* The contents of this file are in the public domain. */
-
-#include <machine/asm.h>
-#include <machine/math.h>
-
-#ifndef __HAVE_LONG_DOUBLE
-STRONG_ALIAS(fmaxl, fmax)
-#endif
-
-ENTRY(fmax)
-	fmax.d	fa0, fa0, fa1
-	ret
-END(fmax)
diff --git a/lib/libm/arch/riscv/s_fmaxf.S b/lib/libm/arch/riscv/s_fmaxf.S
deleted file mode 100644
index babcd28c3..000000000
--- a/lib/libm/arch/riscv/s_fmaxf.S
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $NetBSD: s_fmaxf.S,v 1.2 2015/03/27 23:35:40 matt Exp $ */
-
-/* The contents of this file are in the public domain. */
-
-#include <machine/asm.h>
-
-ENTRY(fmaxf)
-	fmax.s	fa0, fa0, fa1
-	ret
-END(fmaxf)
diff --git a/lib/libm/arch/riscv/s_fmin.S b/lib/libm/arch/riscv/s_fmin.S
deleted file mode 100644
index 3191f9972..000000000
--- a/lib/libm/arch/riscv/s_fmin.S
+++ /dev/null
@@ -1,15 +0,0 @@
-/* $NetBSD: s_fmin.S,v 1.2 2015/03/27 23:35:40 matt Exp $ */
-
-/* The contents of this file are in the public domain. */
-
-#include <machine/asm.h>
-#include <machine/math.h>
-
-#ifndef __HAVE_LONG_DOUBLE
-STRONG_ALIAS(fminl, fmin)
-#endif
-
-ENTRY(fmin)
-	fmin.d	fa0, fa0, fa1
-	ret
-END(fmin)
diff --git a/lib/libm/arch/riscv/s_fminf.S b/lib/libm/arch/riscv/s_fminf.S
deleted file mode 100644
index 5120dbc92..000000000
--- a/lib/libm/arch/riscv/s_fminf.S
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $NetBSD: s_fminf.S,v 1.2 2015/03/27 23:35:40 matt Exp $ */
-
-/* The contents of this file are in the public domain. */
-
-#include <machine/asm.h>
-
-ENTRY(fminf)
-	fmin.s	fa0, fa0, fa1
-	ret
-END(fminf)
diff --git a/lib/libm/arch/sparc/fenv.c b/lib/libm/arch/sparc/fenv.c
deleted file mode 100644
index 6d202146c..000000000
--- a/lib/libm/arch/sparc/fenv.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*	$NetBSD: fenv.c,v 1.1 2011/05/20 21:42:49 nakayama Exp $	*/
-
-/*-
- * 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
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: fenv.c,v 1.1 2011/05/20 21:42:49 nakayama Exp $");
-
-#include <assert.h>
-#include <fenv.h>
-
-/* Load floating-point state register (32bits) */
-#define	__ldfsr(__r)	__asm__	__volatile__		\
-	("ld %0, %%fsr" : : "m" (__r))
-
-/* Save floating-point state register (32bits) */
-#define	__stfsr(__r)	__asm__	__volatile__		\
-	("st %%fsr, %0" : "=m" (*(__r)))
-
-/*
- * The feclearexcept() function clears the supported floating-point exceptions
- * represented by `excepts'.
- */
-int
-feclearexcept(int excepts)
-{
-	fexcept_t r;
-	int ex;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	__stfsr(&r);
-	r &= ~ex;
-	__ldfsr(r);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The fegetexceptflag() function stores an implementation-defined
- * representation of the states of the floating-point status flags indicated
- * by the argument excepts in the object pointed to by the argument flagp.
- */
-int
-fegetexceptflag(fexcept_t *flagp, int excepts)
-{
-	fexcept_t r;
-	int ex;
-
-	_DIAGASSERT(flagp != NULL);
-	_DIAGASSERT((excepts & ~_FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	__stfsr(&r);
-	*flagp = r & ex;
-
-	/* Success */
-	return 0;
-}
-
-
-/*
- * This function sets the floating-point status flags indicated by the argument
- * `excepts' to the states stored in the object pointed to by `flagp'. It does
- * NOT raise any floating-point exceptions, but only sets the state of the flags.
- */
-int
-fesetexceptflag(const fexcept_t *flagp, int excepts)
-{
-	fexcept_t r;
-	int ex;
-
-	_DIAGASSERT(flagp != NULL);
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	__stfsr(&r);
-	r &= ~ex;
-	r |= *flagp & ex;
-	__ldfsr(r);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The feraiseexcept() function raises the supported floating-point exceptions
- * represented by the argument `excepts'.
- *
- * The order in which these floating-point exceptions are raised is unspecified
- * (by the standard).
- */
-int
-feraiseexcept(int excepts)
-{
-	volatile double d;
-	int ex;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	/*
-	 * 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 (ex & FE_INVALID) {
-		d = 0.0;
-		d = 0.0 / d;
-	}
-	if (ex & FE_DIVBYZERO) {
-		d = 0.0;
-		d = 1.0 / d;
-	}
-	if (ex & FE_OVERFLOW) {
-		d = 0x1.ffp1023;
-		d *= 2.0;
-	}
-	if (ex & FE_UNDERFLOW) {
-		d = 0x1p-1022;
-		d /= 0x1p1023;
-	}
-	if (ex & FE_INEXACT) {
-		d = 0x1p-1022;
-		d += 1.0;
-	}
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The fetestexcept() function determines which of a specified subset of the
- * floating-point exception flags are currently set. The `excepts' argument
- * specifies the floating-point status flags to be queried.
- */
-int
-fetestexcept(int excepts)
-{
-	fexcept_t r;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	__stfsr(&r);
-
-	return r & (excepts & FE_ALL_EXCEPT);
-}
-
-/*
- * The fegetround() function gets the current rounding direction.
- */
-int
-fegetround(void)
-{
-	fenv_t r;
-
-	__stfsr(&r);
-
-	return (r >> _ROUND_SHIFT) & _ROUND_MASK;
-}
-
-/*
- * The fesetround() function establishes the rounding direction represented by
- * its argument `round'. If the argument is not equal to the value of a rounding
- * direction macro, the rounding direction is not changed.
- */
-int
-fesetround(int round)
-{
-	fenv_t r;
-
-	_DIAGASSERT((round & ~_ROUND_MASK) == 0);
-	if (round & ~_ROUND_MASK)
-		return -1;
-
-	__stfsr(&r);
-	r &= ~(_ROUND_MASK << _ROUND_SHIFT);
-	r |= round << _ROUND_SHIFT;
-	__ldfsr(r);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The fegetenv() function attempts to store the current floating-point
- * environment in the object pointed to by envp.
- */
-int
-fegetenv(fenv_t *envp)
-{
-	_DIAGASSERT(envp != NULL);
-
-	__stfsr(envp);
-
-	/* Success */
-	return 0;
-}
-
-
-/*
- * The feholdexcept() function saves the current floating-point environment
- * in the object pointed to by envp, clears the floating-point status flags, and
- * then installs a non-stop (continue on floating-point exceptions) mode, if
- * available, for all floating-point exceptions.
- */
-int
-feholdexcept(fenv_t *envp)
-{
-	fenv_t r;
-
-	_DIAGASSERT(envp != NULL);
-
-	__stfsr(&r);
-	*envp = r;
-	r &= ~(FE_ALL_EXCEPT | _ENABLE_MASK);
-	__ldfsr(r);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The fesetenv() function attempts to establish the floating-point environment
- * represented by the object pointed to by envp. The argument `envp' points
- * to an object set by a call to fegetenv() or feholdexcept(), or equal a
- * floating-point environment macro. The fesetenv() function does not raise
- * floating-point exceptions, but only installs the state of the floating-point
- * status flags represented through its argument.
- */
-int
-fesetenv(const fenv_t *envp)
-{
-	_DIAGASSERT(envp != NULL);
-
-	__ldfsr(*envp);
-
-	/* Success */
-	return 0;
-}
-
-
-/*
- * The feupdateenv() function saves the currently raised floating-point
- * exceptions in its automatic storage, installs the floating-point environment
- * represented by the object pointed to by `envp', and then raises the saved
- * floating-point exceptions. The argument `envp' shall point to an object set
- * by a call to feholdexcept() or fegetenv(), or equal a floating-point
- * environment macro.
- */
-int
-feupdateenv(const fenv_t *envp)
-{
-	fexcept_t r;
-
-	_DIAGASSERT(envp != NULL);
-
-	__stfsr(&r);
-	__ldfsr(*envp);
-
-	_DIAGASSERT((r & ~FE_ALL_EXCEPT) == 0);
-	feraiseexcept(r & FE_ALL_EXCEPT);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The following functions are extentions to the standard
- */
-int
-feenableexcept(int mask)
-{
-	fenv_t old_r, new_r;
-
-	__stfsr(&old_r);
-	new_r = old_r | ((mask & FE_ALL_EXCEPT) << _FPUSW_SHIFT);
-	__ldfsr(new_r);
-
-	return (old_r >> _FPUSW_SHIFT) & FE_ALL_EXCEPT;
-}
-
-int
-fedisableexcept(int mask)
-{
-	fenv_t old_r, new_r;
-
-	__stfsr(&old_r);
-	new_r = old_r & ~((mask & FE_ALL_EXCEPT) << _FPUSW_SHIFT);
-	__ldfsr(new_r);
-
-	return (old_r >> _FPUSW_SHIFT) & FE_ALL_EXCEPT;
-}
-
-int
-fegetexcept(void)
-{
-	fenv_t r;
-
-	__stfsr(&r);
-	return (r & _ENABLE_MASK) >> _FPUSW_SHIFT;
-}
diff --git a/lib/libm/arch/sparc64/fenv.c b/lib/libm/arch/sparc64/fenv.c
deleted file mode 100644
index c6991ce26..000000000
--- a/lib/libm/arch/sparc64/fenv.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/*	$NetBSD: fenv.c,v 1.2 2011/05/20 21:42:49 nakayama Exp $	*/
-
-/*-
- * 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
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: fenv.c,v 1.2 2011/05/20 21:42:49 nakayama Exp $");
-
-#include <assert.h>
-#include <fenv.h>
-
-#ifdef __arch64__
-
-/* Load floating-point state register (all 64bits) */
-#define	__ldxfsr(__r)	__asm__	__volatile__		\
-	("ldx %0, %%fsr" : : "m" (__r))
-
-/* Save floating-point state register (all 64bits) */
-#define	__stxfsr(__r)	__asm__	__volatile__		\
-	("stx %%fsr, %0" : "=m" (*(__r)))
-
-#else /* !__arch64__ */
-
-/* Load floating-point state register (32bits) */
-#define	__ldxfsr(__r)	__asm__	__volatile__		\
-	("ld %0, %%fsr" : : "m" (__r))
-
-/* Save floating-point state register (32bits) */
-#define	__stxfsr(__r)	__asm__	__volatile__		\
-	("st %%fsr, %0" : "=m" (*(__r)))
-
-#endif /* __arch64__ */
-
-/*
- * The feclearexcept() function clears the supported floating-point exceptions
- * represented by `excepts'.
- */
-int
-feclearexcept(int excepts)
-{
-	fexcept_t r;
-	int ex;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	__stxfsr(&r);
-	r &= ~ex;
-	__ldxfsr(r);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The fegetexceptflag() function stores an implementation-defined
- * representation of the states of the floating-point status flags indicated
- * by the argument excepts in the object pointed to by the argument flagp.
- */
-int
-fegetexceptflag(fexcept_t *flagp, int excepts)
-{
-	fexcept_t r;
-	int ex;
-
-	_DIAGASSERT(flagp != NULL);
-	_DIAGASSERT((excepts & ~_FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	__stxfsr(&r);
-	*flagp = r & ex;
-
-	/* Success */
-	return 0;
-}
-
-
-/*
- * This function sets the floating-point status flags indicated by the argument
- * `excepts' to the states stored in the object pointed to by `flagp'. It does
- * NOT raise any floating-point exceptions, but only sets the state of the flags.
- */
-int
-fesetexceptflag(const fexcept_t *flagp, int excepts)
-{
-	fexcept_t r;
-	int ex;
-
-	_DIAGASSERT(flagp != NULL);
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	__stxfsr(&r);
-	r &= ~ex;
-	r |= *flagp & ex;
-	__ldxfsr(r);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The feraiseexcept() function raises the supported floating-point exceptions
- * represented by the argument `excepts'.
- *
- * The order in which these floating-point exceptions are raised is unspecified
- * (by the standard).
- */
-int
-feraiseexcept(int excepts)
-{
-	volatile double d;
-	int ex;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	/*
-	 * 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 (ex & FE_INVALID) {
-		d = 0.0;
-		d = 0.0 / d;
-	}
-	if (ex & FE_DIVBYZERO) {
-		d = 0.0;
-		d = 1.0 / d;
-	}
-	if (ex & FE_OVERFLOW) {
-		d = 0x1.ffp1023;
-		d *= 2.0;
-	}
-	if (ex & FE_UNDERFLOW) {
-		d = 0x1p-1022;
-		d /= 0x1p1023;
-	}
-	if (ex & FE_INEXACT) {
-		d = 0x1p-1022;
-		d += 1.0;
-	}
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The fetestexcept() function determines which of a specified subset of the
- * floating-point exception flags are currently set. The `excepts' argument
- * specifies the floating-point status flags to be queried.
- */
-int
-fetestexcept(int excepts)
-{
-	fexcept_t r;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	__stxfsr(&r);
-
-	return r & (excepts & FE_ALL_EXCEPT);
-}
-
-/*
- * The fegetround() function gets the current rounding direction.
- */
-int
-fegetround(void)
-{
-	fenv_t r;
-
-	__stxfsr(&r);
-
-	return (r >> _ROUND_SHIFT) & _ROUND_MASK;
-}
-
-/*
- * The fesetround() function establishes the rounding direction represented by
- * its argument `round'. If the argument is not equal to the value of a rounding
- * direction macro, the rounding direction is not changed.
- */
-int
-fesetround(int round)
-{
-	fenv_t r;
-
-	_DIAGASSERT((round & ~_ROUND_MASK) == 0);
-	if (round & ~_ROUND_MASK)
-		return -1;
-
-	__stxfsr(&r);
-	r &= ~(_ROUND_MASK << _ROUND_SHIFT);
-	r |= round << _ROUND_SHIFT;
-	__ldxfsr(r);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The fegetenv() function attempts to store the current floating-point
- * environment in the object pointed to by envp.
- */
-int
-fegetenv(fenv_t *envp)
-{
-	_DIAGASSERT(envp != NULL);
-
-	__stxfsr(envp);
-
-	/* Success */
-	return 0;
-}
-
-
-/*
- * The feholdexcept() function saves the current floating-point environment
- * in the object pointed to by envp, clears the floating-point status flags, and
- * then installs a non-stop (continue on floating-point exceptions) mode, if
- * available, for all floating-point exceptions.
- */
-int
-feholdexcept(fenv_t *envp)
-{
-	fenv_t r;
-
-	_DIAGASSERT(envp != NULL);
-
-	__stxfsr(&r);
-	*envp = r;
-	r &= ~(FE_ALL_EXCEPT | _ENABLE_MASK);
-	__ldxfsr(r);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The fesetenv() function attempts to establish the floating-point environment
- * represented by the object pointed to by envp. The argument `envp' points
- * to an object set by a call to fegetenv() or feholdexcept(), or equal a
- * floating-point environment macro. The fesetenv() function does not raise
- * floating-point exceptions, but only installs the state of the floating-point
- * status flags represented through its argument.
- */
-int
-fesetenv(const fenv_t *envp)
-{
-	_DIAGASSERT(envp != NULL);
-
-	__ldxfsr(*envp);
-
-	/* Success */
-	return 0;
-}
-
-
-/*
- * The feupdateenv() function saves the currently raised floating-point
- * exceptions in its automatic storage, installs the floating-point environment
- * represented by the object pointed to by `envp', and then raises the saved
- * floating-point exceptions. The argument `envp' shall point to an object set
- * by a call to feholdexcept() or fegetenv(), or equal a floating-point
- * environment macro.
- */
-int
-feupdateenv(const fenv_t *envp)
-{
-	fexcept_t r;
-
-	_DIAGASSERT(envp != NULL);
-
-	__stxfsr(&r);
-	__ldxfsr(*envp);
-
-	_DIAGASSERT((r & ~FE_ALL_EXCEPT) == 0);
-	feraiseexcept(r & FE_ALL_EXCEPT);
-
-	/* Success */
-	return 0;
-}
-
-/*
- * The following functions are extentions to the standard
- */
-int
-feenableexcept(int mask)
-{
-	fenv_t old_r, new_r;
-
-	__stxfsr(&old_r);
-	new_r = old_r | ((mask & FE_ALL_EXCEPT) << _FPUSW_SHIFT);
-	__ldxfsr(new_r);
-
-	return (old_r >> _FPUSW_SHIFT) & FE_ALL_EXCEPT;
-}
-
-int
-fedisableexcept(int mask)
-{
-	fenv_t old_r, new_r;
-
-	__stxfsr(&old_r);
-	new_r = old_r & ~((mask & FE_ALL_EXCEPT) << _FPUSW_SHIFT);
-	__ldxfsr(new_r);
-
-	return (old_r >> _FPUSW_SHIFT) & FE_ALL_EXCEPT;
-}
-
-int
-fegetexcept(void)
-{
-	fenv_t r;
-
-	__stxfsr(&r);
-	return (r & _ENABLE_MASK) >> _FPUSW_SHIFT;
-}
diff --git a/lib/libm/arch/vax/n_argred.S b/lib/libm/arch/vax/n_argred.S
deleted file mode 100644
index 44ac5e06b..000000000
--- a/lib/libm/arch/vax/n_argred.S
+++ /dev/null
@@ -1,799 +0,0 @@
-/*	$NetBSD: n_argred.S,v 1.9 2007/04/19 00:37:20 matt Exp $	*/
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)argred.s	8.1 (Berkeley) 6/4/93
- */
-
-#include <machine/asm.h>
-
-/*
- *  libm$argred implements Bob Corbett's argument reduction and
- *  libm$sincos implements Peter Tang's double precision sin/cos.
- *
- *  Note: The two entry points libm$argred and libm$sincos are meant
- *        to be used only by _sin, _cos and _tan.
- *
- * method: true range reduction to [-pi/4,pi/4], P. Tang  &  B. Corbett
- * S. McDonald, April 4,  1985
- */
-
-	.hidden	__libm_argred
-ENTRY(__libm_argred, 0)
-/*
- *  Compare the argument with the largest possible that can
- *  be reduced by table lookup.  %r3 := |x|  will be used in  table_lookup .
- */
-	movd	%r0,%r3
-	bgeq	abs1
-	mnegd	%r3,%r3
-abs1:
-	cmpd	%r3,$0d+4.55530934770520019583e+01
-	blss	small_arg
-	jsb	trigred
-	rsb
-small_arg:
-	jsb	table_lookup
-	rsb
-/*
- *  At this point,
- *	   %r0  contains the quadrant number, 0, 1, 2, or 3;
- *	%r2/%r1  contains the reduced argument as a D-format number;
- *  	   %r3  contains a F-format extension to the reduced argument;
- *          %r4  contains a  0 or 1  corresponding to a  sin or cos  entry.
- */
-
-	.hidden	__libm_sincos
-ENTRY(__libm_sincos, 0)
-/*
- *  Compensate for a cosine entry by adding one to the quadrant number.
- */
-	addl2	%r4,%r0
-/*
- *  Polyd clobbers  %r5-%r0 ;  save  X  in  %r7/%r6 .
- *  This can be avoided by rewriting  trigred .
- */
-	movd	%r1,%r6
-/*
- *  Likewise, save  alpha  in  %r8 .
- *  This can be avoided by rewriting  trigred .
- */
-	movf	%r3,%r8
-/*
- *  Odd or even quadrant?  cosine if odd, sine otherwise.
- *  Save  floor(quadrant/2) in  %r9  ; it determines the final sign.
- */
-	rotl	$-1,%r0,%r9
-	blss	cosine
-sine:
-	muld2	%r1,%r1		# Xsq = X * X
-	cmpw	$0x2480,%r1	# [zl] Xsq > 2^-56?
-	blss	1f		# [zl] yes, go ahead and do polyd
-	clrq	%r1		# [zl] work around 11/780 FPA polyd bug
-1:
-	polyd	%r1,$7,sin_coef	# Q = P(Xsq) , of deg 7
-	mulf3	$0f3.0,%r8,%r4	# beta = 3 * alpha
-	mulf2	%r0,%r4		# beta = Q * beta
-	addf2	%r8,%r4		# beta = alpha + beta
-	muld2	%r6,%r0		# S(X) = X * Q
-/*	cvtfd	%r4,%r4		... %r5 = 0 after a polyd. */
-	addd2	%r4,%r0		# S(X) = beta + S(X)
-	addd2	%r6,%r0		# S(X) = X + S(X)
-	jbr	done
-cosine:
-	muld2	%r6,%r6		# Xsq = X * X
-	beql	zero_arg
-	mulf2	%r1,%r8		# beta = X * alpha
-	polyd	%r6,$7,cos_coef	/* Q = P'(Xsq) , of deg 7 */
-	subd3	%r0,%r8,%r0	# beta = beta - Q
-	subw2	$0x80,%r6	# Xsq = Xsq / 2
-	addd2	%r0,%r6		# Xsq = Xsq + beta
-zero_arg:
-	subd3	%r6,$0d1.0,%r0	# C(X) = 1 - Xsq
-done:
-	blbc	%r9,even
-	mnegd	%r0,%r0
-even:
-	rsb
-
-#ifdef __ELF__
-	.section .rodata
-#else
-	.text
-#endif
-	_ALIGN_TEXT
-
-sin_coef:
-	.double	0d-7.53080332264191085773e-13	# s7 = 2^-29 -1.a7f2504ffc49f8..
-	.double	0d+1.60573519267703489121e-10	# s6 = 2^-21  1.611adaede473c8..
-	.double	0d-2.50520965150706067211e-08	# s5 = 2^-1a -1.ae644921ed8382..
-	.double	0d+2.75573191800593885716e-06	# s4 = 2^-13  1.71de3a4b884278..
-	.double	0d-1.98412698411850507950e-04	# s3 = 2^-0d -1.a01a01a0125e7d..
-	.double	0d+8.33333333333325688985e-03	# s2 = 2^-07  1.11111111110e50
-	.double	0d-1.66666666666666664354e-01	# s1 = 2^-03 -1.55555555555554
-	.double	0d+0.00000000000000000000e+00	# s0 = 0
-
-cos_coef:
-	.double	0d-1.13006966202629430300e-11	# s7 = 2^-25 -1.8D9BA04D1374BE..
-	.double	0d+2.08746646574796004700e-09	# s6 = 2^-1D  1.1EE632650350BA..
-	.double	0d-2.75573073031284417300e-07	# s5 = 2^-16 -1.27E4F31411719E..
-	.double	0d+2.48015872682668025200e-05	# s4 = 2^-10  1.A01A0196B902E8..
-	.double	0d-1.38888888888464709200e-03	# s3 = 2^-0A -1.6C16C16C11FACE..
-	.double	0d+4.16666666666664761400e-02	# s2 = 2^-05  1.5555555555539E
-	.double	0d+0.00000000000000000000e+00	# s1 = 0
-	.double	0d+0.00000000000000000000e+00	# s0 = 0
-
-/*
- *  Multiples of  pi/2  expressed as the sum of three doubles,
- *
- *  trailing:	n * pi/2 ,  n = 0, 1, 2, ..., 29
- *			trailing[n] ,
- *
- *  middle:	n * pi/2 ,  n = 0, 1, 2, ..., 29
- *			middle[n]   ,
- *
- *  leading:	n * pi/2 ,  n = 0, 1, 2, ..., 29
- *			leading[n]  ,
- *
- *	where
- *		leading[n]  := (n * pi/2)  rounded,
- *		middle[n]   := (n * pi/2  -  leading[n])  rounded,
- *		trailing[n] := (( n * pi/2 - leading[n]) - middle[n])  rounded .
- */
-trailing:
-	.double	0d+0.00000000000000000000e+00	#  0 * pi/2  trailing
-	.double	0d+4.33590506506189049611e-35	#  1 * pi/2  trailing
-	.double	0d+8.67181013012378099223e-35	#  2 * pi/2  trailing
-	.double	0d+1.30077151951856714215e-34	#  3 * pi/2  trailing
-	.double	0d+1.73436202602475619845e-34	#  4 * pi/2  trailing
-	.double	0d-1.68390735624352669192e-34	#  5 * pi/2  trailing
-	.double	0d+2.60154303903713428430e-34	#  6 * pi/2  trailing
-	.double	0d-8.16726343231148352150e-35	#  7 * pi/2  trailing
-	.double	0d+3.46872405204951239689e-34	#  8 * pi/2  trailing
-	.double	0d+3.90231455855570147991e-34	#  9 * pi/2  trailing
-	.double	0d-3.36781471248705338384e-34	# 10 * pi/2  trailing
-	.double	0d-1.06379439835298071785e-33	# 11 * pi/2  trailing
-	.double	0d+5.20308607807426856861e-34	# 12 * pi/2  trailing
-	.double	0d+5.63667658458045770509e-34	# 13 * pi/2  trailing
-	.double	0d-1.63345268646229670430e-34	# 14 * pi/2  trailing
-	.double	0d-1.19986217995610764801e-34	# 15 * pi/2  trailing
-	.double	0d+6.93744810409902479378e-34	# 16 * pi/2  trailing
-	.double	0d-8.03640094449267300110e-34	# 17 * pi/2  trailing
-	.double	0d+7.80462911711140295982e-34	# 18 * pi/2  trailing
-	.double	0d-7.16921993148029483506e-34	# 19 * pi/2  trailing
-	.double	0d-6.73562942497410676769e-34	# 20 * pi/2  trailing
-	.double	0d-6.30203891846791677593e-34	# 21 * pi/2  trailing
-	.double	0d-2.12758879670596143570e-33	# 22 * pi/2  trailing
-	.double	0d+2.53800212047402350390e-33	# 23 * pi/2  trailing
-	.double	0d+1.04061721561485371372e-33	# 24 * pi/2  trailing
-	.double	0d+6.11729905311472319056e-32	# 25 * pi/2  trailing
-	.double	0d+1.12733531691609154102e-33	# 26 * pi/2  trailing
-	.double	0d-3.70049587943078297272e-34	# 27 * pi/2  trailing
-	.double	0d-3.26690537292459340860e-34	# 28 * pi/2  trailing
-	.double	0d-1.14812616507957271361e-34	# 29 * pi/2  trailing
-
-middle:
-	.double	0d+0.00000000000000000000e+00	#  0 * pi/2  middle
-	.double	0d+5.72118872610983179676e-18	#  1 * pi/2  middle
-	.double	0d+1.14423774522196635935e-17	#  2 * pi/2  middle
-	.double	0d-3.83475850529283316309e-17	#  3 * pi/2  middle
-	.double	0d+2.28847549044393271871e-17	#  4 * pi/2  middle
-	.double	0d-2.69052076007086676522e-17	#  5 * pi/2  middle
-	.double	0d-7.66951701058566632618e-17	#  6 * pi/2  middle
-	.double	0d-1.54628301484890040587e-17	#  7 * pi/2  middle
-	.double	0d+4.57695098088786543741e-17	#  8 * pi/2  middle
-	.double	0d+1.07001849766246313192e-16	#  9 * pi/2  middle
-	.double	0d-5.38104152014173353044e-17	# 10 * pi/2  middle
-	.double	0d-2.14622680169080983801e-16	# 11 * pi/2  middle
-	.double	0d-1.53390340211713326524e-16	# 12 * pi/2  middle
-	.double	0d-9.21580002543456677056e-17	# 13 * pi/2  middle
-	.double	0d-3.09256602969780081173e-17	# 14 * pi/2  middle
-	.double	0d+3.03066796603896507006e-17	# 15 * pi/2  middle
-	.double	0d+9.15390196177573087482e-17	# 16 * pi/2  middle
-	.double	0d+1.52771359575124969107e-16	# 17 * pi/2  middle
-	.double	0d+2.14003699532492626384e-16	# 18 * pi/2  middle
-	.double	0d-1.68853170360202329427e-16	# 19 * pi/2  middle
-	.double	0d-1.07620830402834670609e-16	# 20 * pi/2  middle
-	.double	0d+3.97700719404595604379e-16	# 21 * pi/2  middle
-	.double	0d-4.29245360338161967602e-16	# 22 * pi/2  middle
-	.double	0d-3.68013020380794313406e-16	# 23 * pi/2  middle
-	.double	0d-3.06780680423426653047e-16	# 24 * pi/2  middle
-	.double	0d-2.45548340466059054318e-16	# 25 * pi/2  middle
-	.double	0d-1.84316000508691335411e-16	# 26 * pi/2  middle
-	.double	0d-1.23083660551323675053e-16	# 27 * pi/2  middle
-	.double	0d-6.18513205939560162346e-17	# 28 * pi/2  middle
-	.double	0d-6.18980636588357585202e-19	# 29 * pi/2  middle
-
-leading:
-	.double	0d+0.00000000000000000000e+00	#  0 * pi/2  leading
-	.double	0d+1.57079632679489661351e+00	#  1 * pi/2  leading
-	.double	0d+3.14159265358979322702e+00	#  2 * pi/2  leading
-	.double	0d+4.71238898038468989604e+00	#  3 * pi/2  leading
-	.double	0d+6.28318530717958645404e+00	#  4 * pi/2  leading
-	.double	0d+7.85398163397448312306e+00	#  5 * pi/2  leading
-	.double	0d+9.42477796076937979208e+00	#  6 * pi/2  leading
-	.double	0d+1.09955742875642763501e+01	#  7 * pi/2  leading
-	.double	0d+1.25663706143591729081e+01	#  8 * pi/2  leading
-	.double	0d+1.41371669411540694661e+01	#  9 * pi/2  leading
-	.double	0d+1.57079632679489662461e+01	# 10 * pi/2  leading
-	.double	0d+1.72787595947438630262e+01	# 11 * pi/2  leading
-	.double	0d+1.88495559215387595842e+01	# 12 * pi/2  leading
-	.double	0d+2.04203522483336561422e+01	# 13 * pi/2  leading
-	.double	0d+2.19911485751285527002e+01	# 14 * pi/2  leading
-	.double	0d+2.35619449019234492582e+01	# 15 * pi/2  leading
-	.double	0d+2.51327412287183458162e+01	# 16 * pi/2  leading
-	.double	0d+2.67035375555132423742e+01	# 17 * pi/2  leading
-	.double	0d+2.82743338823081389322e+01	# 18 * pi/2  leading
-	.double	0d+2.98451302091030359342e+01	# 19 * pi/2  leading
-	.double	0d+3.14159265358979324922e+01	# 20 * pi/2  leading
-	.double	0d+3.29867228626928286062e+01	# 21 * pi/2  leading
-	.double	0d+3.45575191894877260523e+01	# 22 * pi/2  leading
-	.double	0d+3.61283155162826226103e+01	# 23 * pi/2  leading
-	.double	0d+3.76991118430775191683e+01	# 24 * pi/2  leading
-	.double	0d+3.92699081698724157263e+01	# 25 * pi/2  leading
-	.double	0d+4.08407044966673122843e+01	# 26 * pi/2  leading
-	.double	0d+4.24115008234622088423e+01	# 27 * pi/2  leading
-	.double	0d+4.39822971502571054003e+01	# 28 * pi/2  leading
-	.double	0d+4.55530934770520019583e+01	# 29 * pi/2  leading
-
-twoOverPi:
-	.double	0d+6.36619772367581343076e-01
-
-	.text
-	_ALIGN_TEXT
-
-table_lookup:
-	muld3	%r3,twoOverPi,%r0
-	cvtrdl	%r0,%r0			# n = nearest int to ((2/pi)*|x|) rnded
-	subd2	leading[%r0],%r3		# p = (|x| - leading n*pi/2) exactly
-	subd3	middle[%r0],%r3,%r1	# q = (p - middle  n*pi/2) rounded
-	subd2	%r1,%r3			# r = (p - q)
-	subd2	middle[%r0],%r3		# r =  r - middle  n*pi/2
-	subd2	trailing[%r0],%r3		# r =  r - trailing n*pi/2  rounded
-/*
- *  If the original argument was negative,
- *  negate the reduce argument and
- *  adjust the octant/quadrant number.
- */
-	tstw	4(%ap)
-	bgeq	abs2
-	mnegf	%r1,%r1
-	mnegf	%r3,%r3
-/*	subb3	%r0,$8,%r0	...used for  pi/4  reduction -S.McD */
-	subb3	%r0,$4,%r0
-abs2:
-/*
- *  Clear all unneeded octant/quadrant bits.
- */
-/*	bicb2	$0xf8,%r0	...used for  pi/4  reduction -S.McD */
-	bicb2	$0xfc,%r0
-	rsb
-/*
- *						p.0
- */
-#ifdef __ELF__
-	.section .rodata
-#else
-	.text
-#endif
-	_ALIGN_TEXT
-/*
- * Only 256 (actually 225) bits of 2/pi are needed for VAX double
- * precision; this was determined by enumerating all the nearest
- * machine integer multiples of pi/2 using continued fractions.
- * (8a8d3673775b7ff7 required the most bits.)		-S.McD
- */
-	.long	0
-	.long	0
-	.long	0xaef1586d
-	.long	0x9458eaf7
-	.long	0x10e4107f
-	.long	0xd8a5664f
-	.long	0x4d377036
-	.long	0x09d5f47d
-	.long	0x91054a7f
-	.long	0xbe60db93
-bits2opi:
-	.long	0x00000028
-	.long	0
-/*
- *  Note: wherever you see the word `octant', read `quadrant'.
- *  Currently this code is set up for  pi/2  argument reduction.
- *  By uncommenting/commenting the appropriate lines, it will
- *  also serve as a  pi/4  argument reduction code.
- */
-	.text
-
-/*						p.1
- *  Trigred  preforms argument reduction
- *  for the trigonometric functions.  It
- *  takes one input argument, a D-format
- *  number in  %r1/%r0 .  The magnitude of
- *  the input argument must be greater
- *  than or equal to  1/2 .  Trigred produces
- *  three results:  the number of the octant
- *  occupied by the argument, the reduced
- *  argument, and an extension of the
- *  reduced argument.  The octant number is
- *  returned in  %r0 .  The reduced argument
- *  is returned as a D-format number in
- *  %r2/%r1 .  An 8 bit extension of the
- *  reduced argument is returned as an
- *  F-format number in %r3.
- *						p.2
- */
-trigred:
-/*
- *  Save the sign of the input argument.
- */
-	movw	%r0,-(%sp)
-/*
- *  Extract the exponent field.
- */
-	extzv	$7,$7,%r0,%r2
-/*
- *  Convert the fraction part of the input
- *  argument into a quadword integer.
- */
-	bicw2	$0xff80,%r0
-	bisb2	$0x80,%r0	# -S.McD
-	rotl	$16,%r0,%r0
-	rotl	$16,%r1,%r1
-/*
- *  If  %r1  is negative, add  1  to  %r0 .  This
- *  adjustment is made so that the two's
- *  complement multiplications done later
- *  will produce unsigned results.
- */
-	bgeq	posmid
-	incl	%r0
-posmid:
-/*						p.3
- *
- *  Set  %r3  to the address of the first quadword
- *  used to obtain the needed portion of  2/pi .
- *  The address is longword aligned to ensure
- *  efficient access.
- */
-	ashl	$-3,%r2,%r3
-	bicb2	$3,%r3
-	mnegl	%r3,%r3
-	movab	bits2opi[%r3],%r3
-/*
- *  Set  %r2  to the size of the shift needed to
- *  obtain the correct portion of  2/pi .
- */
-	bicb2	$0xe0,%r2
-/*						p.4
- *
- *  Move the needed  128  bits of  2/pi  into
- *  %r11 - %r8 .  Adjust the numbers to allow
- *  for unsigned multiplication.
- */
-	ashq	%r2,(%r3),%r10
-
-	subl2	$4,%r3
-	ashq	%r2,(%r3),%r9
-	bgeq	signoff1
-	incl	%r11
-signoff1:
-	subl2	$4,%r3
-	ashq	%r2,(%r3),%r8
-	bgeq	signoff2
-	incl	%r10
-signoff2:
-	subl2	$4,%r3
-	ashq	%r2,(%r3),%r7
-	bgeq	signoff3
-	incl	%r9
-signoff3:
-/*						p.5
- *
- *  Multiply the contents of  %r0/%r1  by the
- *  slice of  2/pi  in  %r11 - %r8 .
- */
-	emul	%r0,%r8,$0,%r4
-	emul	%r0,%r9,%r5,%r5
-	emul	%r0,%r10,%r6,%r6
-
-	emul	%r1,%r8,$0,%r7
-	emul	%r1,%r9,%r8,%r8
-	emul	%r1,%r10,%r9,%r9
-	emul	%r1,%r11,%r10,%r10
-
-	addl2	%r4,%r8
-	adwc	%r5,%r9
-	adwc	%r6,%r10
-/*						p.6
- *
- *  If there are more than five leading zeros
- *  after the first two quotient bits or if there
- *  are more than five leading ones after the first
- *  two quotient bits, generate more fraction bits.
- *  Otherwise, branch to code to produce the result.
- */
-	bicl3	$0xc1ffffff,%r10,%r4
-	beql	more1
-	cmpl	$0x3e000000,%r4
-	bneq	result
-more1:
-/*						p.7
- *
- *  generate another  32  result bits.
- */
-	subl2	$4,%r3
-	ashq	%r2,(%r3),%r5
-	bgeq	signoff4
-
-	emul	%r1,%r6,$0,%r4
-	addl2	%r1,%r5
-	emul	%r0,%r6,%r5,%r5
-	addl2	%r0,%r6
-	jbr	addbits1
-
-signoff4:
-	emul	%r1,%r6,$0,%r4
-	emul	%r0,%r6,%r5,%r5
-
-addbits1:
-	addl2	%r5,%r7
-	adwc	%r6,%r8
-	adwc	$0,%r9
-	adwc	$0,%r10
-/*						p.8
- *
- *  Check for massive cancellation.
- */
-	bicl3	$0xc0000000,%r10,%r6
-/*	bneq	more2			-S.McD  Test was backwards */
-	beql	more2
-	cmpl	$0x3fffffff,%r6
-	bneq	result
-more2:
-/*						p.9
- *
- *  If massive cancellation has occurred,
- *  generate another  24  result bits.
- *  Testing has shown there will always be
- *  enough bits after this point.
- */
-	subl2	$4,%r3
-	ashq	%r2,(%r3),%r5
-	bgeq	signoff5
-
-	emul	%r0,%r6,%r4,%r5
-	addl2	%r0,%r6
-	jbr	addbits2
-
-signoff5:
-	emul	%r0,%r6,%r4,%r5
-
-addbits2:
-	addl2	%r6,%r7
-	adwc	$0,%r8
-	adwc	$0,%r9
-	adwc	$0,%r10
-/*						p.10
- *
- *  The following code produces the reduced
- *  argument from the product bits contained
- *  in  %r10 - %r7 .
- */
-result:
-/*
- *  Extract the octant number from  %r10 .
- */
-/*	extzv	$29,$3,%r10,%r0	...used for  pi/4  reduction -S.McD */
-	extzv	$30,$2,%r10,%r0
-/*
- *  Clear the octant bits in  %r10 .
- */
-/*	bicl2	$0xe0000000,%r10	...used for  pi/4  reduction -S.McD */
-	bicl2	$0xc0000000,%r10
-/*
- *  Zero the sign flag.
- */
-	clrl	%r5
-/*						p.11
- *
- *  Check to see if the fraction is greater than
- *  or equal to one-half.  If it is, add one
- *  to the octant number, set the sign flag
- *  on, and replace the fraction with  1 minus
- *  the fraction.
- */
-/*	bitl	$0x10000000,%r10		...used for  pi/4  reduction -S.McD */
-	bitl	$0x20000000,%r10
-	beql	small
-	incl	%r0
-	incl	%r5
-/*	subl3	%r10,$0x1fffffff,%r10	...used for  pi/4  reduction -S.McD */
-	subl3	%r10,$0x3fffffff,%r10
-	mcoml	%r9,%r9
-	mcoml	%r8,%r8
-	mcoml	%r7,%r7
-small:
-/*						p.12
- *
- *  Test whether the first  29  bits of the ...used for  pi/4  reduction -S.McD
- *  Test whether the first  30  bits of the
- *  fraction are zero.
- */
-	tstl	%r10
-	beql	tiny
-/*
- *  Find the position of the first one bit in  %r10 .
- */
-	cvtld	%r10,%r1
-	extzv	$7,$7,%r1,%r1
-/*
- *  Compute the size of the shift needed.
- */
-	subl3	%r1,$32,%r6
-/*
- *  Shift up the high order  64  bits of the
- *  product.
- */
-	ashq	%r6,%r9,%r10
-	ashq	%r6,%r8,%r9
-	jbr	mult
-/*						p.13
- *
- *  Test to see if the sign bit of  %r9  is on.
- */
-tiny:
-	tstl	%r9
-	bgeq	tinier
-/*
- *  If it is, shift the product bits up  32  bits.
- */
-	movl	$32,%r6
-	movq	%r8,%r10
-	tstl	%r10
-	jbr	mult
-/*						p.14
- *
- *  Test whether  %r9  is zero.  It is probably
- *  impossible for both  %r10  and  %r9  to be
- *  zero, but until proven to be so, the test
- *  must be made.
- */
-tinier:
-	beql	zero
-/*
- *  Find the position of the first one bit in  %r9 .
- */
-	cvtld	%r9,%r1
-	extzv	$7,$7,%r1,%r1
-/*
- *  Compute the size of the shift needed.
- */
-	subl3	%r1,$32,%r1
-	addl3	$32,%r1,%r6
-/*
- *  Shift up the high order  64  bits of the
- *  product.
- */
-	ashq	%r1,%r8,%r10
-	ashq	%r1,%r7,%r9
-	jbr	mult
-/*						p.15
- *
- *  The following code sets the reduced
- *  argument to zero.
- */
-zero:
-	clrl	%r1
-	clrl	%r2
-	clrl	%r3
-	jbr	return
-/*						p.16
- *
- *  At this point,  %r0  contains the octant number,
- *  %r6  indicates the number of bits the fraction
- *  has been shifted,  %r5  indicates the sign of
- *  the fraction,  %r11/%r10  contain the high order
- *  64  bits of the fraction, and the condition
- *  codes indicate where the sign bit of  %r10
- *  is on.  The following code multiplies the
- *  fraction by  pi/2 .
- */
-mult:
-/*
- *  Save  %r11/%r10  in  %r4/%r1 .		-S.McD
- */
-	movl	%r11,%r4
-	movl	%r10,%r1
-/*
- *  If the sign bit of  %r10  is on, add  1  to  %r11 .
- */
-	bgeq	signoff6
-	incl	%r11
-signoff6:
-/*						p.17
- *
- *  Move  pi/2  into  %r3/%r2 .
- */
-	movq	$0xc90fdaa22168c235,%r2
-/*
- *  Multiply the fraction by the portion of  pi/2
- *  in  %r2 .
- */
-	emul	%r2,%r10,$0,%r7
-	emul	%r2,%r11,%r8,%r7
-/*
- *  Multiply the fraction by the portion of  pi/2
- *  in  %r3 .
- */
-	emul	%r3,%r10,$0,%r9
-	emul	%r3,%r11,%r10,%r10
-/*
- *  Add the product bits together.
- */
-	addl2	%r7,%r9
-	adwc	%r8,%r10
-	adwc	$0,%r11
-/*
- *  Compensate for not sign extending  %r8  above.-S.McD
- */
-	tstl	%r8
-	bgeq	signoff6a
-	decl	%r11
-signoff6a:
-/*
- *  Compensate for  %r11/%r10  being unsigned.	-S.McD
- */
-	addl2	%r2,%r10
-	adwc	%r3,%r11
-/*
- *  Compensate for  %r3/%r2  being unsigned.	-S.McD
- */
-	addl2	%r1,%r10
-	adwc	%r4,%r11
-/*						p.18
- *
- *  If the sign bit of  %r11  is zero, shift the
- *  product bits up one bit and increment  %r6 .
- */
-	blss	signon
-	incl	%r6
-	ashq	$1,%r10,%r10
-	tstl	%r9
-	bgeq	signoff7
-	incl	%r10
-signoff7:
-signon:
-/*						p.19
- *
- *  Shift the  56  most significant product
- *  bits into  %r9/%r8 .  The sign extension
- *  will be handled later.
- */
-	ashq	$-8,%r10,%r8
-/*
- *  Convert the low order  8  bits of  %r10
- *  into an F-format number.
- */
-	cvtbf	%r10,%r3
-/*
- *  If the result of the conversion was
- *  negative, add  1  to  %r9/%r8 .
- */
-	bgeq	chop
-	incl	%r8
-	adwc	$0,%r9
-/*
- *  If  %r9  is now zero, branch to special
- *  code to handle that possibility.
- */
-	beql	carryout
-chop:
-/*						p.20
- *
- *  Convert the number in  %r9/%r8  into
- *  D-format number in  %r2/%r1 .
- */
-	rotl	$16,%r8,%r2
-	rotl	$16,%r9,%r1
-/*
- *  Set the exponent field to the appropriate
- *  value.  Note that the extra bits created by
- *  sign extension are now eliminated.
- */
-	subw3	%r6,$131,%r6
-	insv	%r6,$7,$9,%r1
-/*
- *  Set the exponent field of the F-format
- *  number in  %r3  to the appropriate value.
- */
-	tstf	%r3
-	beql	return
-/*	extzv	$7,$8,%r3,%r4	-S.McD */
-	extzv	$7,$7,%r3,%r4
-	addw2	%r4,%r6
-/*	subw2	$217,%r6		-S.McD */
-	subw2	$64,%r6
-	insv	%r6,$7,$8,%r3
-	jbr	return
-/*						p.21
- *
- *  The following code generates the appropriate
- *  result for the unlikely possibility that
- *  rounding the number in  %r9/%r8  resulted in
- *  a carry out.
- */
-carryout:
-	clrl	%r1
-	clrl	%r2
-	subw3	%r6,$132,%r6
-	insv	%r6,$7,$9,%r1
-	tstf	%r3
-	beql	return
-	extzv	$7,$8,%r3,%r4
-	addw2	%r4,%r6
-	subw2	$218,%r6
-	insv	%r6,$7,$8,%r3
-/*						p.22
- *
- *  The following code makes an needed
- *  adjustments to the signs of the
- *  results or to the octant number, and
- *  then returns.
- */
-return:
-/*
- *  Test if the fraction was greater than or
- *  equal to  1/2 .  If so, negate the reduced
- *  argument.
- */
-	blbc	%r5,signoff8
-	mnegf	%r1,%r1
-	mnegf	%r3,%r3
-signoff8:
-/*						p.23
- *
- *  If the original argument was negative,
- *  negate the reduce argument and
- *  adjust the octant number.
- */
-	tstw	(%sp)+
-	bgeq	signoff9
-	mnegf	%r1,%r1
-	mnegf	%r3,%r3
-/*	subb3	%r0,$8,%r0	...used for  pi/4  reduction -S.McD */
-	subb3	%r0,$4,%r0
-signoff9:
-/*
- *  Clear all unneeded octant bits.
- *
- *	bicb2	$0xf8,%r0	...used for  pi/4  reduction -S.McD */
-	bicb2	$0xfc,%r0
-/*
- *  Return.
- */
-	rsb
diff --git a/lib/libm/arch/vax/n_atan2.S b/lib/libm/arch/vax/n_atan2.S
deleted file mode 100644
index a6d1fe8fd..000000000
--- a/lib/libm/arch/vax/n_atan2.S
+++ /dev/null
@@ -1,229 +0,0 @@
-/*	$NetBSD: n_atan2.S,v 1.9 2014/10/10 20:58:09 martin Exp $	*/
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)atan2.s	8.1 (Berkeley) 6/4/93
- */
-
-#include <machine/asm.h>
-
-/*
- * ATAN2(Y,X)
- * RETURN ARG (X+iY)
- * VAX D FORMAT (56 BITS PRECISION)
- * CODED IN VAX ASSEMBLY LANGUAGE BY K.C. NG, 4/16/85;
- *
- *
- * Method :
- *	1. Reduce y to positive by atan2(y,x)=-atan2(-y,x).
- *	2. Reduce x to positive by (if x and y are unexceptional):
- *		ARG (x+iy) = arctan(y/x)   	   ... if x > 0,
- *		ARG (x+iy) = pi - arctan[y/(-x)]   ... if x < 0,
- *	3. According to the integer k=4t+0.25 truncated , t=y/x, the argument
- *	   is further reduced to one of the following intervals and the
- *	   arctangent of y/x is evaluated by the corresponding formula:
- *
- *          [0,7/16]	   atan(y/x) = t - t^3*(a1+t^2*(a2+...(a10+t^2*a11)...)
- *	   [7/16,11/16]    atan(y/x) = atan(1/2) + atan( (y-x/2)/(x+y/2) )
- *	   [11/16.19/16]   atan(y/x) = atan( 1 ) + atan( (y-x)/(x+y) )
- *	   [19/16,39/16]   atan(y/x) = atan(3/2) + atan( (y-1.5x)/(x+1.5y) )
- *	   [39/16,INF]     atan(y/x) = atan(INF) + atan( -x/y )
- *
- * Special cases:
- * Notations: atan2(y,x) == ARG (x+iy) == ARG(x,y).
- *
- *	ARG( NAN , (anything) ) is NaN;
- *	ARG( (anything), NaN ) is NaN;
- *	ARG(+(anything but NaN), +-0) is +-0  ;
- *	ARG(-(anything but NaN), +-0) is +-PI ;
- *	ARG( 0, +-(anything but 0 and NaN) ) is +-PI/2;
- *	ARG( +INF,+-(anything but INF and NaN) ) is +-0 ;
- *	ARG( -INF,+-(anything but INF and NaN) ) is +-PI;
- *	ARG( +INF,+-INF ) is +-PI/4 ;
- *	ARG( -INF,+-INF ) is +-3PI/4;
- *	ARG( (anything but,0,NaN, and INF),+-INF ) is +-PI/2;
- *
- * Accuracy:
- *	atan2(y,x) returns the exact ARG(x+iy) nearly rounded.
- */
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(atan2f, _atan2f)
-#endif
-
-ENTRY(_atan2f, 0)
-	cvtfd	4(%ap),-(%sp)
-	calls	$2,_C_LABEL(_atan2)
-	cvtdf	%r0,%r0
-	ret
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(atan2, _atan2)
-WEAK_ALIAS(_atan2l, _atan2)
-#endif
-
-ENTRY(_atan2, 0x0fc0)
-	movq	4(%ap),%r2		# %r2 = y
-	movq	12(%ap),%r4		# %r4 = x
-	bicw3	$0x7f,%r2,%r0
-	bicw3	$0x7f,%r4,%r1
-	cmpw	%r0,$0x8000		# y is the reserved operand
-	jeql	resop
-	cmpw	%r1,$0x8000		# x is the reserved operand
-	jeql	resop
-	subl2	$8,%sp
-	bicw3	$0x7fff,%r2,-4(%fp)	# copy y sign bit to -4(%fp)
-	bicw3	$0x7fff,%r4,-8(%fp)	# copy x sign bit to -8(%fp)
-	cmpd	%r4,$0x4080		# x = 1.0 ?
-	bneq	xnot1
-	movq	%r2,%r0
-	bicw2	$0x8000,%r0		# t = |y|
-	movq	%r0,%r2			# y = |y|
-	jbr	begin
-xnot1:
-	bicw3	$0x807f,%r2,%r11		# yexp
-	jeql	yeq0			# if y=0 goto yeq0
-	bicw3	$0x807f,%r4,%r10		# xexp
-	jeql	pio2			# if x=0 goto pio2
-	subw2	%r10,%r11			# k = yexp - xexp
-	cmpw	%r11,$0x2000		# k >= 64 (exp) ?
-	jgeq	pio2			# atan2 = +-pi/2
-	divd3	%r4,%r2,%r0		# t = y/x  never overflow
-	bicw2	$0x8000,%r0		# t > 0
-	bicw2	$0xff80,%r2		# clear the exponent of y
-	bicw2	$0xff80,%r4		# clear the exponent of x
-	bisw2	$0x4080,%r2		# normalize y to [1,2)
-	bisw2	$0x4080,%r4		# normalize x to [1,2)
-	subw2	%r11,%r4			# scale x so that yexp-xexp=k
-begin:
-	cmpw	%r0,$0x411c		# t : 39/16
-	jgeq	L50
-	addl3	$0x180,%r0,%r10		# 8*t
-	cvtrfl	%r10,%r10			# [8*t] rounded to int
-	ashl	$-1,%r10,%r10		# [8*t]/2
-	casel	%r10,$0,$4
-L1:
-	.word	L20-L1
-	.word	L20-L1
-	.word	L30-L1
-	.word	L40-L1
-	.word	L40-L1
-L10:
-	movq	$0xb4d9940f985e407b,%r6	# Hi=.98279372324732906796d0
-	movq	$0x21b1879a3bc2a2fc,%r8	# Lo=-.17092002525602665777d-17
-	subd3	%r4,%r2,%r0		# y-x
-	addw2	$0x80,%r0		# 2(y-x)
-	subd2	%r4,%r0			# 2(y-x)-x
-	addw2	$0x80,%r4		# 2x
-	movq	%r2,%r10
-	addw2	$0x80,%r10		# 2y
-	addd2	%r10,%r2			# 3y
-	addd2	%r4,%r2			# 3y+2x
-	divd2	%r2,%r0			# (2y-3x)/(2x+3y)
-	jbr	L60
-L20:
-	cmpw	%r0,$0x3280		# t : 2**(-28)
-	jlss	L80
-	clrq	%r6			# Hi=%r6=0, Lo=%r8=0
-	clrq	%r8
-	jbr	L60
-L30:
-	movq	$0xda7b2b0d63383fed,%r6	# Hi=.46364760900080611433d0
-	movq	$0xf0ea17b2bf912295,%r8	# Lo=.10147340032515978826d-17
-	movq	%r2,%r0
-	addw2	$0x80,%r0		# 2y
-	subd2	%r4,%r0			# 2y-x
-	addw2	$0x80,%r4		# 2x
-	addd2	%r2,%r4			# 2x+y
-	divd2	%r4,%r0 			# (2y-x)/(2x+y)
-	jbr	L60
-L50:
-	movq	$0x68c2a2210fda40c9,%r6	# Hi=1.5707963267948966135d1
-	movq	$0x06e0145c26332326,%r8	# Lo=.22517417741562176079d-17
-	cmpw	%r0,$0x5100		# y : 2**57
-	bgeq	L90
-	divd3	%r2,%r4,%r0
-	bisw2	$0x8000,%r0 		# -x/y
-	jbr	L60
-L40:
-	movq	$0x68c2a2210fda4049,%r6	# Hi=.78539816339744830676d0
-	movq	$0x06e0145c263322a6,%r8	# Lo=.11258708870781088040d-17
-	subd3	%r4,%r2,%r0		# y-x
-	addd2	%r4,%r2			# y+x
-	divd2	%r2,%r0			# (y-x)/(y+x)
-L60:
-	movq	%r0,%r10
-	muld2	%r0,%r0
-	polyd	%r0,$12,ptable
-	muld2	%r10,%r0
-	subd2	%r0,%r8
-	addd3	%r8,%r10,%r0
-	addd2	%r6,%r0
-L80:
-	movw	-8(%fp),%r2
-	bneq	pim
-	bisw2	-4(%fp),%r0		# return sign(y)*%r0
-	ret
-L90:					# x >= 2**25
-	movq	%r6,%r0
-	jbr	L80
-pim:
-	subd3	%r0,$0x68c2a2210fda4149,%r0	# pi-t
-	bisw2	-4(%fp),%r0
-	ret
-yeq0:
-	movw	-8(%fp),%r2
-	beql	zero			# if sign(x)=1 return pi
-	movq	$0x68c2a2210fda4149,%r0	# pi=3.1415926535897932270d1
-	ret
-zero:
-	clrq	%r0			# return 0
-	ret
-pio2:
-	movq	$0x68c2a2210fda40c9,%r0	# pi/2=1.5707963267948966135d1
-	bisw2	-4(%fp),%r0		# return sign(y)*pi/2
-	ret
-resop:
-	movq	$0x8000,%r0		# propagate the reserved operand
-	ret
-
-	_ALIGN_TEXT
-ptable:
-	.quad	0xb50f5ce96e7abd60
-	.quad	0x51e44a42c1073e02
-	.quad	0x3487e3289643be35
-	.quad	0xdb62066dffba3e54
-	.quad	0xcf8e2d5199abbe70
-	.quad	0x26f39cb884883e88
-	.quad	0x135117d18998be9d
-	.quad	0x602ce9742e883eba
-	.quad	0xa35ad0be8e38bee3
-	.quad	0xffac922249243f12
-	.quad	0x7f14ccccccccbf4c
-	.quad	0xaa8faaaaaaaa3faa
-	.quad	0x0000000000000000
diff --git a/lib/libm/arch/vax/n_cabs.S b/lib/libm/arch/vax/n_cabs.S
deleted file mode 100644
index a61bab0bb..000000000
--- a/lib/libm/arch/vax/n_cabs.S
+++ /dev/null
@@ -1,140 +0,0 @@
-/*	$NetBSD: n_cabs.S,v 1.7 2014/10/10 20:58:09 martin Exp $	*/
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)cabs.s	8.1 (Berkeley) 6/4/93
- */
-
-#include <machine/asm.h>
-
-	.globl	_C_LABEL(__libm_dsqrt_r5)
-/*
- * double precision complex absolute value
- * CABS by W. Kahan, 9/7/80.
- * Revised for reserved operands by E. LeBlanc, 8/18/82
- * argument for complex absolute value by reference, *4(%ap)
- * argument for cabs and hypot (C fcns) by value, 4(%ap)
- * output is in %r0:%r1 (error less than 0.86 ulps)
- */
-
-/*	entry for c functions cabs and hypot */
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(hypotf, _hypotf)
-#endif
-
-ENTRY(_hypotf, 0)
-	cvtfd	4(%ap),-(%sp)
-	calls	$2,_C_LABEL(_hypot)
-	cvtdf	%r0,%r0
-	ret
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(hypot, _hypot)
-WEAK_ALIAS(hypotl, _hypot)
-WEAK_ALIAS(_hypotl, _hypot)
-#endif
-
-ALTENTRY(cabs)
-ENTRY(_hypot, 0x8040) 		# save %r6, enable floating overflow
-	movq	4(%ap),%r0	# %r0:1 = x
-	movq	12(%ap),%r2	# %r2:3 = y
-	jbr	cabs2
-
-/*	entry for Fortran use, call by:   d = abs(z) */
-ENTRY(z_abs, 0x8040)		# save %r6, enable floating overflow
-	movl	4(%ap),%r2	# indirect addressing is necessary here
-	movq	(%r2)+,%r0	# %r0:1 = x
-	movq	(%r2),%r2		# %r2:3 = y
-
-cabs2:
-	bicw3	$0x7f,%r0,%r4	# %r4 has signed biased exp of x
-	cmpw	$0x8000,%r4
-	jeql	return		# x is a reserved operand, so return it
-	bicw3	$0x7f,%r2,%r5	# %r5 has signed biased exp of y
-	cmpw	$0x8000,%r5
-	jneq	cont		/* y isn't a reserved operand */
-	movq	%r2,%r0		/* return y if it's reserved */
-	ret
-
-cont:
-	bsbb	regs_set	# %r0:1 = dsqrt(x^2+y^2)/2^%r6
-	addw2	%r6,%r0		# unscaled cdabs in %r0:1
-	jvc	return		# unless it overflows
-	subw2	$0x80,%r0	# halve %r0 to get meaningful overflow
-	addd2	%r0,%r0		# overflow; %r0 is half of true abs value
-return:
-	ret
-
-ENTRY(__libm_cdabs_r6,0)	# ENTRY POINT for cdsqrt
-				# calculates a scaled (factor in %r6)
-				# complex absolute value
-
-	movq	(%r4)+,%r0	# %r0:%r1 = x via indirect addressing
-	movq	(%r4),%r2		# %r2:%r3 = y via indirect addressing
-
-	bicw3	$0x7f,%r0,%r5	# %r5 has signed biased exp of x
-	cmpw	$0x8000,%r5
-	jeql	cdreserved	# x is a reserved operand
-	bicw3	$0x7f,%r2,%r5	# %r5 has signed biased exp of y
-	cmpw	$0x8000,%r5
-	jneq	regs_set	/* y isn't a reserved operand either? */
-
-cdreserved:
-	movl	*4(%ap),%r4	# %r4 -> (u,v), if x or y is reserved
-	movq	%r0,(%r4)+	# copy u and v as is and return
-	movq	%r2,(%r4)		# (again addressing is indirect)
-	ret
-
-regs_set:
-	bicw2	$0x8000,%r0	# %r0:%r1 = dabs(x)
-	bicw2	$0x8000,%r2	# %r2:%r3 = dabs(y)
-	cmpw	%r0,%r2
-	jgeq	ordered
-	movq	%r0,%r4
-	movq	%r2,%r0
-	movq	%r4,%r2		# force y's exp <= x's exp
-ordered:
-	bicw3	$0x7f,%r0,%r6	# %r6 = exponent(x) + bias(129)
-	jeql	retsb		# if x = y = 0 then cdabs(x,y) = 0
-	subw2	$0x4780,%r6	# %r6 = exponent(x) - 14
-	subw2	%r6,%r0		# 2^14 <= scaled x < 2^15
-	bitw	$0xff80,%r2
-	jeql	retsb		# if y = 0 return dabs(x)
-	subw2	%r6,%r2
-	cmpw	$0x3780,%r2	# if scaled y < 2^-18
-	jgtr	retsb		#   return dabs(x)
-	emodd	%r0,$0,%r0,%r4,%r0	# %r4 + %r0:1 = scaled x^2
-	emodd	%r2,$0,%r2,%r5,%r2	# %r5 + %r2:3 = scaled y^2
-	addd2	%r2,%r0
-	addl2	%r5,%r4
-	cvtld	%r4,%r2
-	addd2	%r2,%r0		# %r0:1 = scaled x^2 + y^2
-	jmp	_C_LABEL(__libm_dsqrt_r5)+2
-				# %r0:1 = dsqrt(x^2+y^2)/2^%r6
-retsb:
-	rsb			# error < 0.86 ulp
diff --git a/lib/libm/arch/vax/n_cbrt.S b/lib/libm/arch/vax/n_cbrt.S
deleted file mode 100644
index 30207ed95..000000000
--- a/lib/libm/arch/vax/n_cbrt.S
+++ /dev/null
@@ -1,100 +0,0 @@
-/*	$NetBSD: n_cbrt.S,v 1.7 2013/11/24 15:12:10 martin Exp $	*/
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)cbrt.s	8.1 (Berkeley) 6/4/93
- */
-
-#include <machine/asm.h>
-
-/*
- * double cbrt(double arg)
- * W. Kahan, 10/13/80. revised 1/13/84 for keeping sign symmetry
- * error check by E LeBlanc, 8/18/82
- * Revised and tested by K.C. Ng, 5/2/85
- * Max error less than 0.667 ulps (unit in the last places)
- */
-
-ENTRY(cbrtf, 0)
-	cvtfd	4(%ap),-(%sp)
-	calls	$2,_C_LABEL(cbrt)
-	cvtdf	%r0,%r0
-	ret
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(cbrtl, cbrt)
-#endif
-
-ALTENTRY(cbrt)
-ENTRY(d_cbrt, 0x00c0)		# save %r6 & %r7
-	movq	4(%ap),%r0	# %r0 = argument x
-	jbr 	dcbrt2
-
-ENTRY(dcbrt_, 0x00c0)		# save %r6 & %r7
-	movq	*4(%ap),%r0	# %r0 = argument x
-
-dcbrt2:	bicw3	$0x807f,%r0,%r2	# biased exponent of x
-	jeql	return		# dcbrt(0)=0  dcbrt(res)=res. operand
-	bicw3	$0x7fff,%r0,%ap	# ap has sign(x)
-	xorw2	%ap,%r0		# %r0 is abs(x)
-	movl	%r0,%r2		# %r2 has abs(x)
-	rotl	$16,%r2,%r2	# %r2 = |x| with bits unscrambled
-	divl2	$3,%r2		# rough dcbrt with bias/3
-	addl2	B,%r2		# restore bias, diminish fraction
-	rotl	$16,%r2,%r2	# %r2=|q|=|dcbrt| to 5 bits
-	mulf3	%r2,%r2,%r3	# %r3 =qq
-	divf2	%r0,%r3		# %r3 = qq/x
-	mulf2	%r2,%r3
-	addf2	C,%r3		# %r3 = s = C + qqq/x
-	divf3	%r3,D,%r4		# %r4 = D/s
-	addf2	E,%r4
-	addf2	%r4,%r3		# %r3 = s + E + D/s
-	divf3	%r3,F,%r3		# %r3 = F / (s + E + D/s)
-	addf2	G,%r3		# %r3 = G + F / (s + E + D/s)
-	mulf2	%r3,%r2		# %r2 = q%r3 = new q to 23 bits
-	clrl	%r3		# %r2:%r3 = q as double float
-	muld3	%r2,%r2,%r4	# %r4:%r5 = qq exactly
-	divd2	%r4,%r0		# %r0:%r1 = x/(q*q) rounded
-	subd3	%r2,%r0,%r6	# %r6:%r7 = x/(q*q) - q exactly
-	movq    %r2,%r4		# %r4:%r5 = q
-	addw2	$0x80,%r4	# %r4:%r5 = 2 * q
-	addd2	%r0,%r4		# %r4:%r5 = 2*q + x/(q*q)
-	divd2	%r4,%r6		# %r6:%r7 = (x/(q*q)-q)/(2*q+x/(q*q))
-	muld2	%r2,%r6		# %r6:%r7 = q*(x/(q*q)-q)/(2*q+x/(q*q))
-	addd3	%r6,%r2,%r0	# %r0:%r1 = q + %r6:%r7
-	bisw2	%ap,%r0		# restore the sign bit
-return:
-	ret			# error less than 0.667 ulps
-
-	_ALIGN_TEXT
-B :	.long		 721142941		# (86-0.03306235651)*(2^23)
-C :	.float		0f0.5428571429		# 19/35
-D :	.float		0f-0.7053061224		# -864/1225
-E :	.float		0f1.414285714		# 99/70
-F :	.float		0f1.607142857		# 45/28
-G :	.float		0f0.3571428571		# 5/14
diff --git a/lib/libm/arch/vax/n_infnan.S b/lib/libm/arch/vax/n_infnan.S
deleted file mode 100644
index 73af21895..000000000
--- a/lib/libm/arch/vax/n_infnan.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*      $NetBSD: n_infnan.S,v 1.6 2003/08/07 16:44:45 agc Exp $ */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)infnan.s	8.1 (Berkeley) 6/4/93
- */
-#include <machine/asm.h>
-
-	.text
-_sccsid:
-	.asciz	"@(#)infnan.s\t1.1 (Berkeley) 8/21/85; 8.1 (ucb.elefunt) 6/4/93"
-
-/*
- * infnan(arg) int arg;
- * where arg :=    EDOM	if result is  NaN
- *	     :=  ERANGE	if result is +INF
- *	     := -ERANGE if result is -INF
- *
- * The Reserved Operand Fault is generated inside of this routine.
- */
-	.set	EDOM,33
-	.set	ERANGE,34
-
-ENTRY(infnan, 0)
-	cmpl	4(%ap),$ERANGE
-	bneq	1f
-	movl	$ERANGE,_C_LABEL(errno)
-	brb	2f
-1:	movl	$EDOM,_C_LABEL(errno)
-2:	emodd	$0,$0,$0x8000,%r0,%r0	# generates the reserved operand fault
-	ret
diff --git a/lib/libm/arch/vax/n_scalbn.S b/lib/libm/arch/vax/n_scalbn.S
deleted file mode 100644
index 5a071c0ca..000000000
--- a/lib/libm/arch/vax/n_scalbn.S
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-#include <sys/errno.h>
-
-RCSID("$NetBSD: n_scalbn.S,v 1.5 2014/02/03 21:22:21 martin Exp $")
-
-WEAK_ALIAS(scalbn,_scalbn)
-WEAK_ALIAS(scalbnl,_scalbnl)
-WEAK_ALIAS(scalbnf,_scalbnf)
-WEAK_ALIAS(ldexp,_scalbn)
-WEAK_ALIAS(ldexpf,_scalbnf)
-WEAK_ALIAS(ldexpl,_scalbnl)
-
-ENTRY(_scalbnf, 0)
-	cvtfd	4(%ap), %r0
-	movl	8(%ap), %r2
-	jr	1f
-
-ALTENTRY(_scalbnl)
-ENTRY(_scalbn, 0)
-	movd	4(%ap), %r0
-	movl	12(%ap), %r2
-
-	/*
-	 * First see if the result will be within bounds
-	 */
-1:	cmpl	%r2,$(256+55)
-	jgeq	overflow
-	cmpl	%r2,$-(256+55)
-	jleq	underflow
-
-	extzv	$7, $9, %r0, %r3	/* extract exponent */
-	jneq	5f			/* 0 * N is still 0 */
-	cmpw	%r3, $-256		/* is this a NAN? */
-	jgtr	2f			/*    nope */
-	ret
-
-2:	movzbl	%r3, %r3		/* clear sign bit */
-	addl2	%r2, %r3		/* add to exponent */
-	jleq	underflow		/*   <= 0? */
-
-3:	jbs	$8, %r3, overflow	/* did exponent overflow? */
-	insv	$7, $8, %r3, %r0	/* replace exponent */
-	ret
-
-underflow:
-	clrq	%r0			/* return 0.0 */
-	jr	copysign		/* or mabye -0.0 */
-overflow:
-	pushl	$ERANGE			/* overflow */
-	calls	$1, _C_LABEL(infnan)	/* possibly signal */
-copysign:
-	jbc	$15, 4(%ap), 5f		/* if clear, don't set sign-bit */
-	bisw2	$0x8000, %r0		/* preserve sign-bit */
-5:
-	ret
diff --git a/lib/libm/arch/vax/n_sincos.S b/lib/libm/arch/vax/n_sincos.S
deleted file mode 100644
index 44646d120..000000000
--- a/lib/libm/arch/vax/n_sincos.S
+++ /dev/null
@@ -1,119 +0,0 @@
-/*	$NetBSD: n_sincos.S,v 1.9 2014/10/10 22:06:33 martin Exp $	*/
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)sincos.s	8.1 (Berkeley) 6/4/93
- */
-
-/*
- *  This is the implementation of Peter Tang's double precision
- *  sine and cosine for the VAX using Bob Corbett's argument reduction.
- *
- *  Notes:
- *       under 1,024,000 random arguments testing on [0,2*pi]
- *       sin() observed maximum error = 0.814 ulps
- *       cos() observed maximum error = 0.792 ulps
- *
- * double sin(arg)
- * double arg;
- * method: true range reduction to [-pi/4,pi/4], P. Tang  &  B. Corbett
- * S. McDonald, April 4,  1985
- */
-#include <machine/asm.h>
-
-ENTRY(sinf, 0)
-	cvtfd	4(%ap),-(%sp)
-	calls	$2,_C_LABEL(sin)
-	cvtdf	%r0,%r0
-	ret
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(_sinl, sin)
-#endif
-
-ENTRY(sin, 0xfc0)
-	movq	4(%ap),%r0
-	bicw3	$0x807f,%r0,%r2
-	beql	1f		# if x is zero or reserved operand then return x
-/*
- * Save the PSL's IV & FU bits on the stack.
- */
-	movpsl	%r2
-	bicw3	$0xff9f,%r2,-(%sp)
-/*
- * Clear the IV & FU bits.
- */
-	bicpsw	$0x0060
-/*
- *  Entered by  sine    ; save  0  in  %r4 .
- */
-	jsb	_C_LABEL(__libm_argred)+2
-	movl	$0,%r4
-	jsb	_C_LABEL(__libm_sincos)+2
-	bispsw	(%sp)+
-1:	ret
-
-/*
- * double cos(arg)
- * double arg;
- * method: true range reduction to [-pi/4,pi/4], P. Tang  &  B. Corbett
- * S. McDonald, April 4,  1985
- */
-
-ENTRY(cosf, 0)
-	cvtfd	4(%ap),-(%sp)
-	calls	$2,_C_LABEL(cos)
-	cvtdf	%r0,%r0
-	ret
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(_cosl, cos)
-#endif
-
-ENTRY(cos, 0x0fc0)
-	movq	4(%ap),%r0
-	bicw3	$0x7f,%r0,%r2
-	cmpw	$0x8000,%r2
-	beql	1f		# if x is reserved operand then return x
-/*
- * Save the PSL's IV & FU bits on the stack.
- */
-	movpsl	%r2
-	bicw3	$0xff9f,%r2,-(%sp)
-/*
- * Clear the IV & FU bits.
- */
-	bicpsw	$0x0060
-/*
- *  Entered by  cosine  ; save  1  in  %r4 .
- */
-	jsb	_C_LABEL(__libm_argred)+2
-	movl	$1,%r4
-	jsb	_C_LABEL(__libm_sincos)+2
-	bispsw	(%sp)+
-1:	ret
diff --git a/lib/libm/arch/vax/n_sqrt.S b/lib/libm/arch/vax/n_sqrt.S
deleted file mode 100644
index d1681fd52..000000000
--- a/lib/libm/arch/vax/n_sqrt.S
+++ /dev/null
@@ -1,130 +0,0 @@
-/*	$NetBSD: n_sqrt.S,v 1.11 2014/10/11 06:59:29 martin Exp $	*/
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)sqrt.s	8.1 (Berkeley) 6/4/93
- */
-
-#include <machine/asm.h>
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(_sqrtl, sqrt)
-WEAK_ALIAS(sqrtl, sqrt)
-#endif
-
-/*
- * double sqrt(arg)   revised August 15,1982
- * double arg;
- * if(arg<0.0) { _errno = EDOM; return(<a reserved operand>); }
- * if arg is a reserved operand it is returned as it is
- * W. Kahan's magic square root
- * coded by Heidi Stettner and revised by Emile LeBlanc 8/18/82
- *
- * entry points:_d_sqrt		address of double arg is on the stack
- *		_sqrt		double arg is on the stack
- */
-	.set	EDOM,33
-
-ENTRY(d_sqrt, 0x003c)		# save %r5,%r4,%r3,%r2
-	movq	*4(%ap),%r0
-	jbr  	dsqrt2
-
-ENTRY(sqrt, 0x003c)		# save %r5,%r4,%r3,%r2
-	movq    4(%ap),%r0
-
-dsqrt2:	bicw3	$0x807f,%r0,%r2	# check exponent of input
-	jeql	noexp		# biased exponent is zero -> 0.0 or reserved
-	bsbb	__libm_dsqrt_r5_lcl
-noexp:	ret
-
-/* **************************** internal procedure */
-
-	.hidden __libm_dsqrt_r5
-ALTENTRY(__libm_dsqrt_r5)
-	halt
-	halt
-__libm_dsqrt_r5_lcl:
-				/* ENTRY POINT FOR cdabs and cdsqrt	*/
-				/* returns double square root scaled by	*/
-				/* 2^%r6	*/
-
-	movd	%r0,%r4
-	jleq	nonpos		# argument is not positive
-	movzwl	%r4,%r2
-	ashl	$-1,%r2,%r0
-	addw2	$0x203c,%r0	# %r0 has magic initial approximation
-/*
- * Do two steps of Heron's rule
- * ((arg/guess) + guess) / 2 = better guess
- */
-	divf3	%r0,%r4,%r2
-	addf2	%r2,%r0
-	subw2	$0x80,%r0	# divide by two
-
-	divf3	%r0,%r4,%r2
-	addf2	%r2,%r0
-	subw2	$0x80,%r0	# divide by two
-
-/* Scale argument and approximation to prevent over/underflow */
-
-	bicw3	$0x807f,%r4,%r1
-	subw2	$0x4080,%r1		# %r1 contains scaling factor
-	subw2	%r1,%r4
-	movl	%r0,%r2
-	subw2	%r1,%r2
-
-/* Cubic step
- *
- * b = a + 2*a*(n-a*a)/(n+3*a*a) where b is better approximation,
- * a is approximation, and n is the original argument.
- * (let s be scale factor in the following comments)
- */
-	clrl	%r1
-	clrl	%r3
-	muld2	%r0,%r2			# %r2:%r3 = a*a/s
-	subd2	%r2,%r4			# %r4:%r5 = n/s - a*a/s
-	addw2	$0x100,%r2		# %r2:%r3 = 4*a*a/s
-	addd2	%r4,%r2			# %r2:%r3 = n/s + 3*a*a/s
-	muld2	%r0,%r4			# %r4:%r5 = a*n/s - a*a*a/s
-	divd2	%r2,%r4			# %r4:%r5 = a*(n-a*a)/(n+3*a*a)
-	addw2	$0x80,%r4		# %r4:%r5 = 2*a*(n-a*a)/(n+3*a*a)
-	addd2	%r4,%r0			# %r0:%r1 = a + 2*a*(n-a*a)/(n+3*a*a)
-	rsb				# DONE!
-nonpos:
-	jneq	negarg
-	ret				# argument and root are zero
-negarg:
-	pushl	$EDOM
-	calls	$1,_C_LABEL(infnan)	# generate the reserved op fault
-	ret
-
-ENTRY(sqrtf, 0)
-	cvtfd	4(%ap),-(%sp)
-	calls	$2,_C_LABEL(sqrt)
-	cvtdf	%r0,%r0
-	ret
diff --git a/lib/libm/arch/vax/n_support.S b/lib/libm/arch/vax/n_support.S
deleted file mode 100644
index f0b7100ad..000000000
--- a/lib/libm/arch/vax/n_support.S
+++ /dev/null
@@ -1,247 +0,0 @@
-/*	$NetBSD: n_support.S,v 1.10 2014/11/14 14:53:17 joerg Exp $	*/
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)support.s	8.1 (Berkeley) 6/4/93
- */
-#include <machine/asm.h>
-
-WEAK_ALIAS(logbl,logb)
-WEAK_ALIAS(copysignl, _copysignl)
-WEAK_ALIAS(_copysignl, copysign)
-
-	.text
-_sccsid:
-	.asciz "@(#)support.s\t1.3 (Berkeley) 8/21/85; 8.1 (ucb.elefunt) 6/4/93"
-
-/*
- * copysign(x,y),
- * logb(x),
- * scalb(x,N),
- * finite(x),
- * drem(x,y),
- * Coded in vax assembly language by K.C. Ng,  3/14/85.
- * Revised by K.C. Ng on 4/9/85.
- */
-
-/*
- * double copysign(double x,double y)
- */
-
-ENTRY(copysign, 0)
-	movq	4(%ap),%r0		# load x into %r0
-	bicw3	$0x807f,%r0,%r2		# mask off the exponent of x
-	beql	Lz			# if zero or reserved op then return x
-	bicw3	$0x7fff,12(%ap),%r2	# copy the sign bit of y into %r2
-	bicw2	$0x8000,%r0		# replace x by |x|
-	bisw2	%r2,%r0			# copy the sign bit of y to x
-Lz:	ret
-
-ENTRY(copysignf, 0)
-	movl	4(%ap),%r0		# load x into %r0
-	bicw3	$0x807f,%r0,%r2		# mask off the exponent of x
-	beql	1f			# if zero or reserved op then return x
-	bicw3	$0x7fff,8(%ap),%r2	# copy the sign bit of y into %r2
-	bicw2	$0x8000,%r0		# replace x by |x|
-	bisw2	%r2,%r0			# copy the sign bit of y to x
-1:	ret
-
-/*
- * float logbf(float x);
- */
-ENTRY(logbf, 0)
-	cvtfd   4(%ap),-(%sp)
-	calls   $2,_C_LABEL(logb)
-	cvtdf   %r0,%r0
-	ret
-
-/*
- * double logb(double x);
- */
-ENTRY(logb, 0)
-	bicl3	$0xffff807f,4(%ap),%r0	# mask off the exponent of x
-	beql    Ln
-	ashl	$-7,%r0,%r0		# get the bias exponent
-	subl2	$129,%r0			# get the unbias exponent
-	cvtld	%r0,%r0			# return the answer in double
-	ret
-Ln:	movq	4(%ap),%r0		# %r0:1 = x (zero or reserved op)
-	bneq	1f			# simply return if reserved op
-	movq 	$0x0000fe00ffffcfff,%r0  # -2147483647.0
-1:	ret
-
-/*
- * long finite(double x);
- */
-#ifndef __GFLOAT__
-	.globl finitef
-finitef = finite
-#endif
-ENTRY(finite, 0)
-	bicw3	$0x7f,4(%ap),%r0	# mask off the mantissa
-	cmpw	%r0,$0x8000		# to see if x is the reserved op
-	beql	1f			# if so, return FALSE (0)
-	movl	$1,%r0			# else return TRUE (1)
-	ret
-1:	clrl	%r0
-	ret
-
-/* int isnan(double x);
- */
-#if 0
-ENTRY(isnan, 0)
-	clrl	%r0
-	ret
-#endif
-
-/* int isnanf(float x);
- */
-ENTRY(isnanf, 0)
-	clrl	%r0
-	ret
-
-/*
- * double scalb(x,N)
- * double x; double N;
- */
-	.set	ERANGE,34
-
-ENTRY(scalb, 0)
-	movq	4(%ap),%r0
-	bicl3	$0xffff807f,%r0,%r3
-	beql	ret1			# 0 or reserved operand
-	movq	12(%ap),%r4
-	cvtdl	%r4, %r2
-	cmpl	%r2,$0x12c
-	bgeq	ovfl
-	cmpl	%r2,$-0x12c
-	bleq	unfl
-	ashl	$7,%r2,%r2
-	addl2	%r2,%r3
-	bleq	unfl
-	cmpl	%r3,$0x8000
-	bgeq	ovfl
-	addl2	%r2,%r0
-	ret
-ovfl:	pushl	$ERANGE
-	calls	$1,_C_LABEL(infnan)	# if it returns
-	bicw3	$0x7fff,4(%ap),%r2	# get the sign of input arg
-	bisw2	%r2,%r0			# re-attach the sign to %r0/1
-	ret
-unfl:	movq	$0,%r0
-ret1:	ret
-
-/*
- * DREM(X,Y)
- * RETURN X REM Y =X-N*Y, N=[X/Y] ROUNDED (ROUNDED TO EVEN IN THE HALF WAY CASE)
- * DOUBLE PRECISION (VAX D format 56 bits)
- * CODED IN VAX ASSEMBLY LANGUAGE BY K.C. NG, 4/8/85.
- */
-	.set	EDOM,33
-
-ENTRY(drem, 0x0fc0)
-	subl2	$12,%sp
-	movq	4(%ap),%r0		#%r0=x
-	movq	12(%ap),%r2		#%r2=y
-	jeql	Rop			#if y=0 then generate reserved op fault
-	bicw3	$0x007f,%r0,%r4		#check if x is Rop
-	cmpw	%r4,$0x8000
-	jeql	Ret			#if x is Rop then return Rop
-	bicl3	$0x007f,%r2,%r4		#check if y is Rop
-	cmpw	%r4,$0x8000
-	jeql	Ret			#if y is Rop then return Rop
-	bicw2	$0x8000,%r2		#y  := |y|
-	movw	$0,-4(%fp)		#-4(%fp) = nx := 0
-	cmpw	%r2,$0x1c80		#yexp ? 57
-	bgtr	C1			#if yexp > 57 goto C1
-	addw2	$0x1c80,%r2		#scale up y by 2**57
-	movw	$0x1c80,-4(%fp)		#nx := 57 (exponent field)
-C1:
-	movw	-4(%fp),-8(%fp)		#-8(%fp) = nf := nx
-	bicw3	$0x7fff,%r0,-12(%fp)	#-12(%fp) = sign of x
-	bicw2	$0x8000,%r0		#x  := |x|
-	movq	%r2,%r10			#y1 := y
-	bicl2	$0xffff07ff,%r11		#clear the last 27 bits of y1
-loop:
-	cmpd	%r0,%r2			#x ? y
-	bleq	E1			#if x <= y goto E1
- /* begin argument reduction */
-	movq	%r2,%r4			#t =y
-	movq	%r10,%r6			#t1=y1
-	bicw3	$0x807f,%r0,%r8		#xexp= exponent of x
-	bicw3	$0x807f,%r2,%r9		#yexp= exponent fo y
-	subw2	%r9,%r8			#xexp-yexp
-	subw2	$0x0c80,%r8		#k=xexp-yexp-25(exponent bit field)
-	blss	C2			#if k<0 goto C2
-	addw2	%r8,%r4			#t +=k
-	addw2	%r8,%r6			#t1+=k, scale up t and t1
-C2:
-	divd3	%r4,%r0,%r8		#x/t
-	cvtdl	%r8,%r8			#n=[x/t] truncated
-	cvtld	%r8,%r8			#float(n)
-	subd2	%r6,%r4			#t:=t-t1
-	muld2	%r8,%r4			#n*(t-t1)
-	muld2	%r8,%r6			#n*t1
-	subd2	%r6,%r0			#x-n*t1
-	subd2	%r4,%r0			#(x-n*t1)-n*(t-t1)
-	jbr	loop
-E1:
-	movw	-4(%fp),%r6		#%r6=nx
-	beql	C3			#if nx=0 goto C3
-	addw2	%r6,%r0			#x:=x*2**57 scale up x by nx
-	movw	$0,-4(%fp)		#clear nx
-	jbr	loop
-C3:
-	movq	%r2,%r4			#%r4 = y
-	subw2	$0x80,%r4		#%r4 = y/2
-	cmpd	%r0,%r4			#x:y/2
-	blss	E2			#if x < y/2 goto E2
-	bgtr	C4			#if x > y/2 goto C4
-	cvtdl	%r8,%r8			#ifix(float(n))
-	blbc	%r8,E2			#if the last bit is zero, goto E2
-C4:
-	subd2	%r2,%r0			#x-y
-E2:
-	xorw2	-12(%fp),%r0		#x^sign (exclusive or)
-	movw	-8(%fp),%r6		#%r6=nf
-	bicw3	$0x807f,%r0,%r8		#%r8=exponent of x
-	bicw2	$0x7f80,%r0		#clear the exponent of x
-	subw2	%r6,%r8			#%r8=xexp-nf
-	bgtr	C5			#if xexp-nf is positive goto C5
-	movw	$0,%r8			#clear %r8
-	movq	$0,%r0			#x underflow to zero
-C5:
-	bisw2	%r8,%r0			/* put %r8 into x's exponent field */
-	ret
-Rop:					#Reserved operand
-	pushl	$EDOM
-	calls	$1,_C_LABEL(infnan)	#generate reserved op fault
-	ret
-Ret:
-	movq	$0x8000,%r0		#propagate reserved op
-	ret
diff --git a/lib/libm/arch/vax/n_tan.S b/lib/libm/arch/vax/n_tan.S
deleted file mode 100644
index c03d97604..000000000
--- a/lib/libm/arch/vax/n_tan.S
+++ /dev/null
@@ -1,97 +0,0 @@
-/*	$NetBSD: n_tan.S,v 1.7 2014/03/06 10:59:52 martin Exp $	*/
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)tan.s	8.1 (Berkeley) 6/4/93
- */
-
-#include <machine/asm.h>
-
-/*  This is the implementation of Peter Tang's double precision
- *  tangent for the VAX using Bob Corbett's argument reduction.
- *
- *  Notes:
- *       under 1,024,000 random arguments testing on [0,2*pi]
- *       tan() observed maximum error = 2.15 ulps
- *
- * double tan(arg)
- * double arg;
- * method: true range reduction to [-pi/4,pi/4], P. Tang  &  B. Corbett
- * S. McDonald, April 4,  1985
- */
-ENTRY(tan, 0x0fc0)		# save %r6-%r11
-	movq	4(%ap),%r0
-	bicw3	$0x807f,%r0,%r2
-	beql	1f		# if x is zero or reserved operand then return x
-/*
- * Save the PSL's IV & FU bits on the stack.
- */
-	movpsl	%r2
-	bicw3	$0xff9f,%r2,-(%sp)
-/*
- *  Clear the IV & FU bits.
- */
-	bicpsw	$0x0060
-	jsb	_C_LABEL(__libm_argred)+2
-/*
- *  At this point,
- *	   %r0  contains the quadrant number, 0, 1, 2, or 3;
- *	%r2/%r1  contains the reduced argument as a D-format number;
- *  	   %r3  contains a F-format extension to the reduced argument;
- *
- *  Save  %r3/%r0  so that we can call cosine after calling sine.
- */
-	movq	%r2,-(%sp)
-	movq	%r0,-(%sp)
-/*
- *  Call sine.  %r4 = 0  implies sine.
- */
-	movl	$0,%r4
-	jsb	_C_LABEL(__libm_sincos)+2
-/*
- *  Save  sin(x)  in  %r11/%r10 .
- */
-	movd	%r0,%r10
-/*
- *  Call cosine.  %r4 = 1  implies cosine.
- */
-	movq	(%sp)+,%r0
-	movq	(%sp)+,%r2
-	movl	$1,%r4
-	jsb	_C_LABEL(__libm_sincos)+2
-	divd3	%r0,%r10,%r0
-	bispsw	(%sp)+
-1:	ret
-
-
-ENTRY(tanf, 0)
-	cvtfd	4(%ap),-(%sp)
-	calls	$2,_C_LABEL(tan)
-	cvtdf	%r0,%r0
-	ret
-
diff --git a/lib/libm/arch/x86_64/fenv.c b/lib/libm/arch/x86_64/fenv.c
deleted file mode 100644
index b5309321f..000000000
--- a/lib/libm/arch/x86_64/fenv.c
+++ /dev/null
@@ -1,539 +0,0 @@
-/* $NetBSD: fenv.c,v 1.6 2013/11/11 00:31:51 joerg Exp $ */
-
-/*-
- * Copyright (c) 2004-2005 David Schultz <das (at) 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>
-__RCSID("$NetBSD: fenv.c,v 1.6 2013/11/11 00:31:51 joerg Exp $");
-
-#include <assert.h>
-#include <fenv.h>
-#include <stddef.h>
-#include <string.h>
-
-/* Load x87 Control Word */
-#define	__fldcw(__cw)		__asm__ __volatile__ \
-	("fldcw %0" : : "m" (__cw))
-
-/* No-Wait Store Control Word */
-#define	__fnstcw(__cw)		__asm__ __volatile__ \
-	("fnstcw %0" : "=m" (*(__cw)))
-
-/* No-Wait Store Status Word */
-#define	__fnstsw(__sw)		__asm__ __volatile__ \
-	("fnstsw %0" : "=am" (*(__sw)))
-
-/* No-Wait Clear Exception Flags */
-#define	__fnclex()		__asm__ __volatile__ \
-	("fnclex")
-
-/* Load x87 Environment */
-#define	__fldenv(__env)		__asm__ __volatile__ \
-	("fldenv %0" : : "m" (__env))
-
-/* No-Wait Store x87 environment */
-#define	__fnstenv(__env)	__asm__ __volatile__ \
-	("fnstenv %0" : "=m" (*(__env)))
-
-/* Check for and handle pending unmasked x87 pending FPU exceptions */
-#define	__fwait(__env)		__asm__	__volatile__	\
-	("fwait")
-
-/* Load the MXCSR register */
-#define	__ldmxcsr(__mxcsr)	__asm__ __volatile__ \
-	("ldmxcsr %0" : : "m" (__mxcsr))
-
-/* Store the MXCSR register state */
-#define	__stmxcsr(__mxcsr)	__asm__ __volatile__ \
-	("stmxcsr %0" : "=m" (*(__mxcsr)))
-
-/*
- * The following constant represents the default floating-point environment
- * (that is, the one installed at program startup) and has type pointer to
- * const-qualified fenv_t.
- *
- * It can be used as an argument to the functions within the <fenv.h> header
- * that manage the floating-point environment, namely fesetenv() and
- * feupdateenv().
- *
- * x87 fpu registers are 16bit wide. The upper bits, 31-16, are marked as
- * RESERVED. We provide a partial floating-point environment, where we
- * define only the lower bits. The reserved bits are extracted and set by
- * the consumers of FE_DFL_ENV, during runtime.
- */
-fenv_t __fe_dfl_env = {
-	{
-		__NetBSD_NPXCW__,	/* Control word register */
-		0x00000000,		/* Status word register */
-		0x0000ffff,		/* Tag word register */
-		{
-			0x00000000,
-			0x00000000,
-			0x00000000,
-			0x00000000,
-		},
-	},
-	__INITIAL_MXCSR__       /* MXCSR register */
-};
-#define FE_DFL_ENV      ((const fenv_t *) &__fe_dfl_env)
-
-static void __init_libm(void) __attribute__ ((constructor, used));
-
-static void __init_libm(void)
-{
-	uint16_t control;
-
-	__fnstcw(&control);
-	__fe_dfl_env.x87.control = control;
-}
-
-
-/*
- * The feclearexcept() function clears the supported floating-point exceptions
- * represented by `excepts'.
- */
-int
-feclearexcept(int excepts)
-{
-	fenv_t fenv;
-	int ex;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	/* Store the current x87 floating-point environment */
-	__fnstenv(&fenv);
-
-	/* Clear the requested floating-point exceptions */
-	fenv.x87.status &= ~ex;
-
-	/* Load the x87 floating-point environent */
-	__fldenv(fenv);
-
-	/* Same for SSE environment */
-	__stmxcsr(&fenv.mxcsr);
-	fenv.mxcsr &= ~ex;
-	__ldmxcsr(fenv.mxcsr);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The fegetexceptflag() function stores an implementation-defined
- * representation of the states of the floating-point status flags indicated by
- * the argument excepts in the object pointed to by the argument flagp.
- */
-int
-fegetexceptflag(fexcept_t *flagp, int excepts)
-{
-	uint32_t mxcsr;
-	uint16_t x87_status;
-	int ex;
-
-	_DIAGASSERT(flagp != NULL);
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	/* Store the current x87 status register */
-	__fnstsw(&x87_status);
-
-	/* Store the MXCSR register */
-	__stmxcsr(&mxcsr);
-
-	/* Store the results in flagp */
-	*flagp = (x87_status | mxcsr) & ex;
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The feraiseexcept() function raises the supported floating-point exceptions
- * represented by the argument `excepts'.
- *
- * The standard explicitly allows us to execute an instruction that has the
- * exception as a side effect, but we choose to manipulate the status register
- * directly.
- *
- * The validation of input is being deferred to fesetexceptflag().
- */
-int
-feraiseexcept(int excepts)
-{
-	int ex;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-	fesetexceptflag((unsigned int *)&ex, ex);
-	__fwait();
-
-	/* Success */
-	return (0);
-}
-
-/*
- * This function sets the floating-point status flags indicated by the argument
- * `excepts' to the states stored in the object pointed to by `flagp'. It does
- * NOT raise any floating-point exceptions, but only sets the state of the flags.
- */
-int
-fesetexceptflag(const fexcept_t *flagp, int excepts)
-{
-	fenv_t fenv;
-	int ex;
-
-	_DIAGASSERT(flagp != NULL);
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	/* Store the current x87 floating-point environment */
-	__fnstenv(&fenv);
-
-	/* Set the requested status flags */
-	fenv.x87.status |= *flagp & ex;
-
-	/* Load the x87 floating-point environent */
-	__fldenv(fenv);
-
-	/* Same for SSE environment */
-	__stmxcsr(&fenv.mxcsr);
-	fenv.mxcsr |= *flagp & ex;
-	__ldmxcsr(fenv.mxcsr);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The fetestexcept() function determines which of a specified subset of the
- * floating-point exception flags are currently set. The `excepts' argument
- * specifies the floating-point status flags to be queried.
- */
-int
-fetestexcept(int excepts)
-{
-	fenv_t fenv;
-	uint32_t mxcsr;
-	uint16_t status;
-	int ex;
-
-	_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
-
-	ex = excepts & FE_ALL_EXCEPT;
-
-	/* Store the current x87 floating-point environment */
-	memset(&fenv, 0, sizeof(fenv));
-
-	__fnstenv(&fenv);
-	__fnstsw(&status);
-
-	/* Store the MXCSR register state */
-	__stmxcsr(&fenv.mxcsr);
-	__stmxcsr(&mxcsr);
-
-	return ((fenv.x87.status | fenv.mxcsr) & ex);
-}
-
-/*
- * The fegetround() function gets the current rounding direction.
- */
-int
-fegetround(void)
-{
-	uint32_t mxcsr;
-	uint16_t control;
-
-	/*
-	 * We check both the x87 floating-point unit _and_ the SSE unit.
-	 * Normally, those two must agree with respect to each other. If they
-	 * don't, it's not our fault and the result is non-determinable, in
-	 * which case POSIX says that a negative value should be returned.
-	 */
-	__fnstcw(&control);
-	__stmxcsr(&mxcsr);
-
-	if ((control & _X87_ROUNDING_MASK)
-	    != ((mxcsr & _SSE_ROUNDING_MASK) >> 3)) {
-		return (-1);
-	}
-
-	return (control & _X87_ROUNDING_MASK);
-}
-
-/*
- * The fesetround() function establishes the rounding direction represented by
- * its argument `round'. If the argument is not equal to the value of a rounding
- * direction macro, the rounding direction is not changed.
- */
-int
-fesetround(int round)
-{
-	uint32_t  mxcsr;
-	uint16_t control;
-
-	/* Check whether requested rounding direction is supported */
-	if (round & (~_X87_ROUNDING_MASK))
-		return (-1);
-
-	/* Store the current x87 control word register  */
-	__fnstcw(&control);
-
-	/*
-	 * Set the rounding direction
-	 * Rounding Control is bits 10-11, so shift appropriately
-	 */
-	control &= ~_X87_ROUNDING_MASK;
-	control |= round;
-
-	/* Load the x87 control word register */
-	__fldcw(control);
-
-	/*
-	 * Same for the SSE environment
-	 * Rounding Control is bits 13-14, so shift appropriately
-	 */
-	__stmxcsr(&mxcsr);
-	mxcsr &= ~_SSE_ROUNDING_MASK;
-	mxcsr |= (round << _SSE_ROUND_SHIFT);
-	__ldmxcsr(mxcsr);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The fegetenv() function attempts to store the current floating-point
- * environment in the object pointed to by envp.
- */
-int
-fegetenv(fenv_t *envp)
-{
-	_DIAGASSERT(envp != NULL);
-
-	/* Store the current x87 floating-point environment */
-	__fnstenv(envp);
-
-	/* Store the MXCSR register state */
-	__stmxcsr(&envp->mxcsr);
-
-     /*
-      * When an FNSTENV instruction is executed, all pending exceptions are
-      * essentially lost (either the x87 FPU status register is cleared or all
-      * exceptions are masked).
-      *
-      * 8.6 X87 FPU EXCEPTION SYNCHRONIZATION -
-      * Intel(R) 64 and IA-32 Architectures Softare Developer's Manual - Vol 1
-      *
-      */
-	__fldcw(envp->x87.control);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The feholdexcept() function saves the current floating-point environment
- * in the object pointed to by envp, clears the floating-point status flags, and
- * then installs a non-stop (continue on floating-point exceptions) mode, if
- * available, for all floating-point exceptions.
- */
-int
-feholdexcept(fenv_t *envp)
-{
-	uint32_t mxcsr;
-
-	_DIAGASSERT(envp != NULL);
-
-	/* Store the current x87 floating-point environment */
-	__fnstenv(envp);
-
-	/* Clear all exception flags in FPU */
-	__fnclex();
-
-	/* Store the MXCSR register state */
-	__stmxcsr(&envp->mxcsr);
-
-	/* Clear exception flags in MXCSR XXX */
-	mxcsr = envp->mxcsr;
-	mxcsr &= ~FE_ALL_EXCEPT;
-
-	/* Mask all exceptions */
-	mxcsr |= FE_ALL_EXCEPT << _SSE_EMASK_SHIFT;
-
-	__ldmxcsr(mxcsr);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The fesetenv() function attempts to establish the floating-point environment
- * represented by the object pointed to by envp. The argument `envp' points
- * to an object set by a call to fegetenv() or feholdexcept(), or equal a
- * floating-point environment macro. The fesetenv() function does not raise
- * floating-point exceptions, but only installs the state of the floating-point
- * status flags represented through its argument.
- */
-int
-fesetenv(const fenv_t *envp)
-{
-	fenv_t fenv;
-
-	_DIAGASSERT(envp != NULL);
-
-	/* Store the x87 floating-point environment */
-	memset(&fenv, 0, sizeof fenv);
-	__fnstenv(&fenv);
-
-	__fe_dfl_env.x87.control = (fenv.x87.control & 0xffff0000)
-	    | (__fe_dfl_env.x87.control & 0x0000ffff);
-	__fe_dfl_env.x87.status = (fenv.x87.status & 0xffff0000)
-	    | (__fe_dfl_env.x87.status & 0x0000ffff);
-	__fe_dfl_env.x87.tag = (fenv.x87.tag & 0xffff0000)
-	    | (__fe_dfl_env.x87.tag & 0x0000ffff);
-	__fe_dfl_env.x87.others[3] = (fenv.x87.others[3] & 0xffff0000)
-	    | (__fe_dfl_env.x87.others[3] & 0x0000ffff);
-	__fldenv(*envp);
-
-	/* Store the MXCSR register */
-	__ldmxcsr(envp->mxcsr);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The feupdateenv() function saves the currently raised floating-point
- * exceptions in its automatic storage, installs the floating-point environment
- * represented by the object pointed to by `envp', and then raises the saved
- * floating-point exceptions. The argument `envp' shall point to an object set
- * by a call to feholdexcept() or fegetenv(), or equal a floating-point
- * environment macro.
- */
-int
-feupdateenv(const fenv_t *envp)
-{
-	fenv_t fenv;
-	uint32_t mxcsr;
-	uint16_t sw;
-
-	_DIAGASSERT(envp != NULL);
-
-	/* Store the x87 floating-point environment */
-	memset(&fenv, 0, sizeof(fenv));
-	__fnstenv(&fenv);
-
-	__fe_dfl_env.x87.control = (fenv.x87.control & 0xffff0000)
-	    | (__fe_dfl_env.x87.control & 0x0000ffff);
-	__fe_dfl_env.x87.status = (fenv.x87.status & 0xffff0000)
-	    | (__fe_dfl_env.x87.status & 0x0000ffff);
-	__fe_dfl_env.x87.tag = (fenv.x87.tag & 0xffff0000)
-	    | (__fe_dfl_env.x87.tag & 0x0000ffff);
-	__fe_dfl_env.x87.others[3] = (fenv.x87.others[3] & 0xffff0000)
-	    | (__fe_dfl_env.x87.others[3] & 0x0000ffff);
-
-	/* Store the x87 status register */
-	__fnstsw(&sw);
-
-	/* Store the MXCSR register */
-	__stmxcsr(&mxcsr);
-
-	/* Install new floating-point environment */
-	fesetenv(envp);
-
-	/* Raise any previously accumulated exceptions */
-	feraiseexcept((sw | mxcsr) & FE_ALL_EXCEPT);
-
-	/* Success */
-	return (0);
-}
-
-/*
- * The following functions are extentions to the standard
- */
-int
-feenableexcept(int mask)
-{
-	uint32_t mxcsr, omask;
-	uint16_t control;
-
-	_DIAGASSERT((mask & ~FE_ALL_EXCEPT) == 0);
-	mask &= FE_ALL_EXCEPT;
-
-	__fnstcw(&control);
-	__stmxcsr(&mxcsr);
-
-	omask = (control | mxcsr >> _SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
-	control &= ~mask;
-	__fldcw(control);
-
-	mxcsr &= ~(mask << _SSE_EMASK_SHIFT);
-	__ldmxcsr(mxcsr);
-
-	return (FE_ALL_EXCEPT & ~omask);
-
-}
-
-int
-fedisableexcept(int mask)
-{
-	uint32_t mxcsr, omask;
-	uint16_t control;
-
-	_DIAGASSERT((mask & ~FE_ALL_EXCEPT) == 0);
-
-	__fnstcw(&control);
-	__stmxcsr(&mxcsr);
-
-	omask = (control | mxcsr >> _SSE_EMASK_SHIFT) & FE_ALL_EXCEPT;
-	control |= mask;
-	__fldcw(control);
-
-	mxcsr |= mask << _SSE_EMASK_SHIFT;
-	__ldmxcsr(mxcsr);
-
-	return (FE_ALL_EXCEPT & ~omask);
-}
-
-int
-fegetexcept(void)
-{
-	uint16_t control;
-
-	/*
-	 * We assume that the masks for the x87 and the SSE unit are
-	 * the same.
-	 */
-	__fnstcw(&control);
-
-	return (~control & FE_ALL_EXCEPT);
-}
-
diff --git a/lib/libm/compat/compat_cabs.c b/lib/libm/compat/compat_cabs.c
deleted file mode 100644
index af6c45729..000000000
--- a/lib/libm/compat/compat_cabs.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * cabs() wrapper for hypot().
- *
- * Written by J.T. Conklin, <jtc@wimsey.com>
- * Placed into the Public Domain, 1994.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_cabs.c,v 1.2 2007/08/10 21:20:35 drochner Exp $");
-#endif
-
-#include "../src/namespace.h"
-#include <math.h>
-
-struct complex {
-	double x;
-	double y;
-};
-
-double cabs(struct complex);
-__warn_references(cabs, "warning: reference to compatibility cabs()");
-
-double
-cabs(struct complex z)
-{
-
-	return hypot(z.x, z.y);
-}
diff --git a/lib/libm/compat/compat_cabsf.c b/lib/libm/compat/compat_cabsf.c
deleted file mode 100644
index fad6283e9..000000000
--- a/lib/libm/compat/compat_cabsf.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * cabsf() wrapper for hypotf().
- *
- * Written by J.T. Conklin, <jtc@wimsey.com>
- * Placed into the Public Domain, 1994.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_cabsf.c,v 1.2 2007/08/10 21:20:35 drochner Exp $");
-#endif
-
-#include "../src/namespace.h"
-#include <math.h>
-
-struct complex {
-	float x;
-	float y;
-};
-
-float cabsf __P((struct complex));
-__warn_references(cabsf, "warning: reference to compatibility cabsf()");
-
-float
-cabsf(struct complex z)
-{
-
-	return hypotf(z.x, z.y);
-}
diff --git a/lib/libm/compiler_rt/Makefile.inc b/lib/libm/compiler_rt/Makefile.inc
deleted file mode 100644
index 38852d2c3..000000000
--- a/lib/libm/compiler_rt/Makefile.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.9 2014/10/22 10:33:27 joerg Exp $
-
-COMPILER_RT_SRCDIR=	${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
-.if ${MACHINE_CPU} == "powerpc"
-COMPILER_RT_CPU_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/ppc
-COMPILER_RT_ARCH_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/ppc
-.else
-COMPILER_RT_CPU_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_CPU}
-COMPILER_RT_ARCH_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_ARCH}
-.endif
-
-.if !defined(__MINIX)
-.PATH: ${COMPILER_RT_CPU_DIR}
-.PATH: ${COMPILER_RT_ARCH_DIR}
-.endif # !defined(__MINIX)
-.PATH: ${COMPILER_RT_SRCDIR}/lib/builtins
-
-# Needs scaling support
-GENERIC_SRCS+= \
-	muldc3.c \
-	mulsc3.c \
-	mulxc3.c \
-	divdc3.c \
-	divsc3.c \
-	divxc3.c
-
-.if ${MACHINE_CPU} == "powerpc"
-GENERIC_SRCS+= \
-	divtc3.c \
-	multc3.c
-.endif
-
-.if !defined(__MINIX)
-.for src in ${GENERIC_SRCS}
-.  if exists(${COMPILER_RT_CPU_DIR}/${src:R}.S) || \
-      exists(${COMPILER_RT_ARCH_DIR}/${src:R}.S)
-SRCS+=	${src:R}.S
-.  else
-SRCS+=	${src}
-COPTS.${src}+=	-Wno-error=missing-prototypes
-.  endif
-.endfor
-.else
-# For MINIX: do not pull in the assembly symbols, as they are not PIC ready
-.for src in ${GENERIC_SRCS}
-SRCS+=	${src}
-COPTS.${src}+=	-Wno-error=missing-prototypes
-.endfor
-.endif # !defined(__MINIX)
diff --git a/lib/libm/complex/Makefile.inc b/lib/libm/complex/Makefile.inc
deleted file mode 100644
index b742b7cb2..000000000
--- a/lib/libm/complex/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.8 2014/10/10 12:43:07 christos Exp $
-
-.PATH: ${.CURDIR}/complex
-
-COMPLEX_SRCS = cabs.c cacos.c cacosh.c carg.c casin.c casinh.c catan.c \
-	ccos.c ccosh.c cephes_subr.c cexp.c clog.c conj.c cpow.c cproj.c \
-	cimag.c creal.c csin.c csinh.c csqrt.c ctan.c ctanh.c catanh.c
-
-.for i in ${COMPLEX_SRCS}
-SRCS+=	$i ${i:S/.c/f.c/} ${i:S/.c/l.c/}
-MAN+= ${i:Ncephes_*:S/.c/.3/}
-MLINKS+= ${i:Ncephes_*:S/.c/.3/} ${i:Ncephes_*:S/.c/f.3/}
-MLINKS+= ${i:Ncephes_*:S/.c/.3/} ${i:Ncephes_*:S/.c/l.3/}
-.endfor
diff --git a/lib/libm/complex/cabs.3 b/lib/libm/complex/cabs.3
deleted file mode 100644
index 1977b90d5..000000000
--- a/lib/libm/complex/cabs.3
+++ /dev/null
@@ -1,41 +0,0 @@
-.\" $NetBSD: cabs.3,v 1.3 2013/01/29 02:05:08 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CABS 3
-.Os
-.Sh NAME
-.Nm cabs ,
-.Nm cabsf ,
-.Nm cabsl
-.Nd return a complex absolute value
-.Sh SYNOPSIS
-.In complex.h
-.Ft double
-.Fn cabs "double complex z"
-.Ft float
-.Fn cabsf "float complex z"
-.Ft long double
-.Fn cabsl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex absolute value (also called
-norm, modulus, or magnitude) of
-.Ar z .
-.Sh RETURN VALUES
-These functions return the complex absolute value.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/cabs.c b/lib/libm/complex/cabs.c
deleted file mode 100644
index 5718bdd8f..000000000
--- a/lib/libm/complex/cabs.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: cabs.c,v 1.1 2007/08/20 16:01:30 drochner Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-double
-cabs(double complex z)
-{
-
-	return hypot(__real__ z, __imag__ z);
-}
diff --git a/lib/libm/complex/cabsf.c b/lib/libm/complex/cabsf.c
deleted file mode 100644
index fda7bc7c4..000000000
--- a/lib/libm/complex/cabsf.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: cabsf.c,v 1.1 2007/08/20 16:01:30 drochner Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-float
-cabsf(float complex z)
-{
-
-	return hypotf(__real__ z, __imag__ z);
-}
diff --git a/lib/libm/complex/cabsl.c b/lib/libm/complex/cabsl.c
deleted file mode 100644
index a627c29ac..000000000
--- a/lib/libm/complex/cabsl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: cabsl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*
- * Public domain.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-long double
-cabsl(long double complex z)
-{
-
-	return hypotl(__real__ z, __imag__ z);
-}
diff --git a/lib/libm/complex/cacos.3 b/lib/libm/complex/cacos.3
deleted file mode 100644
index 5672244e7..000000000
--- a/lib/libm/complex/cacos.3
+++ /dev/null
@@ -1,45 +0,0 @@
-.\" $NetBSD: cacos.3,v 1.3 2013/01/29 02:05:08 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CACOS 3
-.Os
-.Sh NAME
-.Nm cacos ,
-.Nm cacosf ,
-.Nm cacosl
-.Nd complex arc cosine functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn cacos "double complex z"
-.Ft float complex
-.Fn cacosf "float complex z"
-.Ft long double complex
-.Fn cacosl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex arc cosine of
-.Ar z ,
-with branch cuts outside the interval [\-1,\ +1] along the
-real axis.
-.Sh RETURN VALUES
-These functions return the complex arc cosine value, in the
-range of a strip mathematically unbounded along the imaginary
-axis and in the interval [0,\ pi] along the real axis.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr ccos 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/cacos.c b/lib/libm/complex/cacos.c
deleted file mode 100644
index 5fe13e9d4..000000000
--- a/lib/libm/complex/cacos.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $NetBSD: cacos.c,v 1.1 2007/08/20 16:01:30 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-double complex
-cacos(double complex z)
-{
-	double complex w;
-
-	w = casin(z);
-	w = (M_PI_2 - creal(w)) - cimag(w) * I;
-	return w;
-}
diff --git a/lib/libm/complex/cacosf.c b/lib/libm/complex/cacosf.c
deleted file mode 100644
index e3c88557b..000000000
--- a/lib/libm/complex/cacosf.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $NetBSD: cacosf.c,v 1.1 2007/08/20 16:01:30 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-float complex
-cacosf(float complex z)
-{
-	float complex w;
-
-	w = casinf(z);
-	w = ((float)M_PI_2 - crealf(w)) - cimagf(w) * I;
-	return w;
-}
diff --git a/lib/libm/complex/cacosh.3 b/lib/libm/complex/cacosh.3
deleted file mode 100644
index 27bdbf86b..000000000
--- a/lib/libm/complex/cacosh.3
+++ /dev/null
@@ -1,45 +0,0 @@
-.\" $NetBSD: cacosh.3,v 1.4 2013/03/14 19:15:34 njoly Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CACOSH 3
-.Os
-.Sh NAME
-.Nm cacosh ,
-.Nm cacoshf ,
-.Nm cacoshl
-.Nd complex arc hyperbolic cosine functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn cacosh "double complex z"
-.Ft float complex
-.Fn cacoshf "float complex z"
-.Ft long double complex
-.Fn cacoshl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex arc hyperbolic cosine of
-.Ar z ,
-with a branch cut at values less than 1 along the real axis.
-.Sh RETURN VALUES
-These functions return the complex arc hyperbolic cosine value,
-in the range of a half-strip of non-negative values along
-the real axis and in the interval [\-i pi,\ +i pi] along
-the imaginary axis.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr ccosh 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/cacosh.c b/lib/libm/complex/cacosh.c
deleted file mode 100644
index fcfb365be..000000000
--- a/lib/libm/complex/cacosh.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: cacosh.c,v 1.2 2009/08/03 19:41:32 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <complex.h>
-
-double complex
-cacosh(double complex z)
-{
-	double complex w;
-
-#if 0 /* does not give the principal value */
-	w = I * cacos(z);
-#else
-	w = clog(z + csqrt(z + 1) * csqrt(z - 1));
-#endif
-	return w;
-}
diff --git a/lib/libm/complex/cacoshf.c b/lib/libm/complex/cacoshf.c
deleted file mode 100644
index 76295d597..000000000
--- a/lib/libm/complex/cacoshf.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: cacoshf.c,v 1.2 2009/08/03 19:41:32 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <complex.h>
-
-float complex
-cacoshf(float complex z)
-{
-	float complex w;
-
-#if 0 /* does not give the principal value */
-	w = I * cacosf(z);
-#else
-	w = clogf(z + csqrtf(z + 1) * csqrtf(z - 1));
-#endif
-	return w;
-}
diff --git a/lib/libm/complex/cacoshl.c b/lib/libm/complex/cacoshl.c
deleted file mode 100644
index 4e4e006b9..000000000
--- a/lib/libm/complex/cacoshl.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: cacoshl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <complex.h>
-
-long double complex
-cacoshl(long double complex z)
-{
-	long double complex w;
-
-#if 0 /* does not give the principal value */
-	w = I * cacosl(z);
-#else
-	w = clogl(z + csqrtl(z + 1) * csqrtl(z - 1));
-#endif
-	return w;
-}
diff --git a/lib/libm/complex/cacosl.c b/lib/libm/complex/cacosl.c
deleted file mode 100644
index e48115820..000000000
--- a/lib/libm/complex/cacosl.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: cacosl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include "cephes_subrl.h"
-
-long double complex
-cacosl(long double complex z)
-{
-	long double complex w;
-
-	w = casinl(z);
-	w = (M_PI_2L - creall(w)) - cimagl(w) * I;
-	return w;
-}
diff --git a/lib/libm/complex/carg.3 b/lib/libm/complex/carg.3
deleted file mode 100644
index 57c2fc80d..000000000
--- a/lib/libm/complex/carg.3
+++ /dev/null
@@ -1,46 +0,0 @@
-.\" $NetBSD: carg.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CARG 3
-.Os
-.Sh NAME
-.Nm carg ,
-.Nm cargf ,
-.Nm cargl
-.Nd complex argument functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double
-.Fn carg "double complex z"
-.Ft float
-.Fn cargf "float complex z"
-.Ft long double
-.Fn cargl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the argument (also called phase angle)
-of
-.Ar z ,
-with a branch cut along the negative real axis.
-.Sh RETURN VALUES
-These functions return the value of the argument in the interval
-[\-pi,\ +pi].
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr cimag 3 ,
-.Xr conj 3 ,
-.Xr cproj 3 ,
-.St -p1003.1-2001
-.Aq Pa complex .h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/carg.c b/lib/libm/complex/carg.c
deleted file mode 100644
index ace234ef4..000000000
--- a/lib/libm/complex/carg.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: carg.c,v 1.1 2007/08/20 16:01:31 drochner Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-double
-carg(double complex z)
-{
-
-	return atan2(__imag__ z, __real__ z);
-}
diff --git a/lib/libm/complex/cargf.c b/lib/libm/complex/cargf.c
deleted file mode 100644
index 2dcb053e0..000000000
--- a/lib/libm/complex/cargf.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: cargf.c,v 1.1 2007/08/20 16:01:31 drochner Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-float
-cargf(float complex z)
-{
-
-	return atan2f(__imag__ z, __real__ z);
-}
diff --git a/lib/libm/complex/cargl.c b/lib/libm/complex/cargl.c
deleted file mode 100644
index 20b5a9169..000000000
--- a/lib/libm/complex/cargl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $NetBSD: cargl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*
- * Public domain.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-long double
-cargl(long double complex z)
-{
-
-	return atan2l(__imag__ z, __real__ z);
-}
diff --git a/lib/libm/complex/casin.3 b/lib/libm/complex/casin.3
deleted file mode 100644
index f718866e0..000000000
--- a/lib/libm/complex/casin.3
+++ /dev/null
@@ -1,46 +0,0 @@
-.\" $NetBSD: casin.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CASIN 3
-.Os
-.Sh NAME
-.Nm casin ,
-.Nm casinf ,
-.Nm casinl
-.Nd complex arc sine functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn casin "double complex z"
-.Ft float complex
-.Fn casinf "float complex z"
-.Ft long double complex
-.Fn casinl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex arc sine of
-.Ar z ,
-with branch cuts outside the interval [\-1,\ +1] along the
-real axis.
-.Sh RETURN VALUES
-These functions return the complex arc sine value, in the range
-of a strip mathematically unbounded along the imaginary
-axis and in the interval [\-pi/2,\ +pi/2] along the
-real axis.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr csin 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/casin.c b/lib/libm/complex/casin.c
deleted file mode 100644
index d58002227..000000000
--- a/lib/libm/complex/casin.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* $NetBSD: casin.c,v 1.1 2007/08/20 16:01:31 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-#ifdef __weak_alias
-__weak_alias(casin, _casin)
-#endif
-
-double complex
-casin(double complex z)
-{
-	double complex w;
-	double complex ca, ct, zz, z2;
-	double x, y;
-
-	x = creal(z);
-	y = cimag(z);
-
-#if 0 /* MD: test is incorrect, casin(>1) is defined */
-	if (y == 0.0) {
-		if (fabs(x) > 1.0) {
-			w = M_PI_2 + 0.0 * I;
-#if 0
-			mtherr ("casin", DOMAIN);
-#endif
-		} else {
-			w = asin(x) + 0.0 * I;
-		}
-		return w;
-	}
-#endif
-
-/* Power series expansion */
-/*
-b = cabs(z);
-if( b < 0.125 )
-{
-z2.r = (x - y) * (x + y);
-z2.i = 2.0 * x * y;
-
-cn = 1.0;
-n = 1.0;
-ca.r = x;
-ca.i = y;
-sum.r = x;
-sum.i = y;
-do
-	{
-	ct.r = z2.r * ca.r  -  z2.i * ca.i;
-	ct.i = z2.r * ca.i  +  z2.i * ca.r;
-	ca.r = ct.r;
-	ca.i = ct.i;
-
-	cn *= n;
-	n += 1.0;
-	cn /= n;
-	n += 1.0;
-	b = cn/n;
-
-	ct.r *= b;
-	ct.i *= b;
-	sum.r += ct.r;
-	sum.i += ct.i;
-	b = fabs(ct.r) + fabs(ct.i);
-	}
-while( b > MACHEP );
-w->r = sum.r;
-w->i = sum.i;
-return;
-}
-*/
-
-
-	ca = x + y * I;
-	ct = ca * I;
-	/* sqrt( 1 - z*z) */
-	/* cmul( &ca, &ca, &zz ) */
-	/*x * x  -  y * y */
-	zz = (x - y) * (x + y) + (2.0 * x * y) * I;
-
-	zz = 1.0 - creal(zz) - cimag(zz) * I;
-	z2 = csqrt(zz);
-
-	zz = ct + z2;
-	zz = clog(zz);
-	/* multiply by 1/i = -i */
-	w = zz * (-1.0 * I);
-	return w;
-}
diff --git a/lib/libm/complex/casinf.c b/lib/libm/complex/casinf.c
deleted file mode 100644
index 3bd0b06c9..000000000
--- a/lib/libm/complex/casinf.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* $NetBSD: casinf.c,v 1.1 2007/08/20 16:01:31 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-#ifdef __weak_alias
-__weak_alias(casinf, _casinf)
-#endif
-
-float complex
-casinf(float complex z)
-{
-	float complex w;
-	float complex ca, ct, zz, z2;
-	float x, y;
-
-	x = crealf(z);
-	y = cimagf(z);
-
-#if 0 /* MD: test is incorrect, casin(>1) is defined */
-	if (y == 0.0f) {
-		if (fabsf(x) > 1.0) {
-			w = M_PI_2 + 0.0f * I;
-#if 0
-			mtherr ("casin", DOMAIN);
-#endif
-		} else {
-			w = asinf(x) + 0.0f * I;
-		}
-		return w;
-	}
-#endif
-
-/* Power series expansion */
-/*
-b = cabsf(z);
-if( b < 0.125 )
-{
-z2.r = (x - y) * (x + y);
-z2.i = 2.0 * x * y;
-
-cn = 1.0;
-n = 1.0;
-ca.r = x;
-ca.i = y;
-sum.r = x;
-sum.i = y;
-do
-	{
-	ct.r = z2.r * ca.r  -  z2.i * ca.i;
-	ct.i = z2.r * ca.i  +  z2.i * ca.r;
-	ca.r = ct.r;
-	ca.i = ct.i;
-
-	cn *= n;
-	n += 1.0;
-	cn /= n;
-	n += 1.0;
-	b = cn/n;
-
-	ct.r *= b;
-	ct.i *= b;
-	sum.r += ct.r;
-	sum.i += ct.i;
-	b = fabsf(ct.r) + fabsf(ct.i);
-	}
-while( b > MACHEP );
-w->r = sum.r;
-w->i = sum.i;
-return;
-}
-*/
-
-
-	ca = x + y * I;
-	ct = ca * I;
-	/* sqrt( 1 - z*z) */
-	/* cmul( &ca, &ca, &zz ) */
-	/*x * x  -  y * y */
-	zz = (x - y) * (x + y) + (2.0f * x * y) * I;
-
-	zz = 1.0f - crealf(zz) - cimagf(zz) * I;
-	z2 = csqrtf(zz);
-
-	zz = ct + z2;
-	zz = clogf(zz);
-	/* multiply by 1/i = -i */
-	w = zz * (-1.0f * I);
-	return w;
-}
diff --git a/lib/libm/complex/casinh.3 b/lib/libm/complex/casinh.3
deleted file mode 100644
index e8da9b262..000000000
--- a/lib/libm/complex/casinh.3
+++ /dev/null
@@ -1,46 +0,0 @@
-.\" $NetBSD: casinh.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CASINH 3
-.Os
-.Sh NAME
-.Nm casinh ,
-.Nm casinhf ,
-.Nm casinhl
-.Nd complex arc hyperbolic sine functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn casinh "double complex z"
-.Ft float complex
-.Fn casinhf "float complex z"
-.Ft long double complex
-.Fn casinhl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex arc hyperbolic sine of
-.Ar z ,
-with branch cuts outside the interval
-[\-i,\ +i] along the imaginary axis.
-.Sh RETURN VALUES
-These functions return the complex arc hyperbolic sine value,
-in the range of a strip mathematically unbounded along the
-real axis and in the interval [\-i pi/2,\ +i pi/2] along
-the imaginary axis.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr csinh 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/casinh.c b/lib/libm/complex/casinh.c
deleted file mode 100644
index 73a3c32aa..000000000
--- a/lib/libm/complex/casinh.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $NetBSD: casinh.c,v 1.1 2007/08/20 16:01:31 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-
-double complex
-casinh(double complex z)
-{
-	double complex w;
-
-	w = -1.0 * I * casin(z * I);
-	return w;
-}
diff --git a/lib/libm/complex/casinhf.c b/lib/libm/complex/casinhf.c
deleted file mode 100644
index 1a9a051dc..000000000
--- a/lib/libm/complex/casinhf.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $NetBSD: casinhf.c,v 1.1 2007/08/20 16:01:32 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-
-float complex
-casinhf(float complex z)
-{
-	float complex w;
-
-	w = -1.0f * I * casinf(z * I);
-	return w;
-}
diff --git a/lib/libm/complex/casinhl.c b/lib/libm/complex/casinhl.c
deleted file mode 100644
index 9f74ee9bd..000000000
--- a/lib/libm/complex/casinhl.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $NetBSD: casinhl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-
-long double complex
-casinhl(long double complex z)
-{
-	long double complex w;
-
-	w = -1.0L * I * casinl(z * I);
-	return w;
-}
diff --git a/lib/libm/complex/casinl.c b/lib/libm/complex/casinl.c
deleted file mode 100644
index 986a8c0c9..000000000
--- a/lib/libm/complex/casinl.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* $NetBSD: casinl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-#ifdef __weak_alias
-__weak_alias(casinl, _casinl)
-#endif
-
-long double complex
-casinl(long double complex z)
-{
-	long double complex w;
-	long double complex ca, ct, zz, z2;
-	long double x, y;
-
-	x = creall(z);
-	y = cimagl(z);
-
-#if 0 /* MD: test is incorrect, casin(>1) is defined */
-	if (y == 0.0L) {
-		if (fabsl(x) > 1.0L) {
-			w = M_PI_2L + 0.0L * I;
-#if 0
-			mtherr ("casinl", DOMAIN);
-#endif
-		} else {
-			w = asinl(x) + 0.0L * I;
-		}
-		return w;
-	}
-#endif
-
-/* Power series expansion */
-/*
-b = cabsl(z);
-if( b < 0.125L )
-{
-z2.r = (x - y) * (x + y);
-z2.i = 2.0L * x * y;
-
-cn = 1.0L;
-n = 1.0L;
-ca.r = x;
-ca.i = y;
-sum.r = x;
-sum.i = y;
-do
-	{
-	ct.r = z2.r * ca.r  -  z2.i * ca.i;
-	ct.i = z2.r * ca.i  +  z2.i * ca.r;
-	ca.r = ct.r;
-	ca.i = ct.i;
-
-	cn *= n;
-	n += 1.0;
-	cn /= n;
-	n += 1.0;
-	b = cn/n;
-
-	ct.r *= b;
-	ct.i *= b;
-	sum.r += ct.r;
-	sum.i += ct.i;
-	b = fabsl(ct.r) + fabsl(ct.i);
-	}
-while( b > MACHEPL );
-w->r = sum.r;
-w->i = sum.i;
-return;
-}
-*/
-
-
-	ca = x + y * I;
-	ct = ca * I;
-	/* sqrtl( 1 - z*z) */
-	/* cmull( &ca, &ca, &zz ) */
-	/*x * x  -  y * y */
-	zz = (x - y) * (x + y) + (2.0L * x * y) * I;
-
-	zz = 1.0L - creall(zz) - cimagl(zz) * I;
-	z2 = csqrtl(zz);
-
-	zz = ct + z2;
-	zz = clogl(zz);
-	/* multiply by 1/i = -i */
-	w = zz * (-1.0L * I);
-	return w;
-}
diff --git a/lib/libm/complex/catan.3 b/lib/libm/complex/catan.3
deleted file mode 100644
index e304db5a5..000000000
--- a/lib/libm/complex/catan.3
+++ /dev/null
@@ -1,46 +0,0 @@
-.\" $NetBSD: catan.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CATAN 3
-.Os
-.Sh NAME
-.Nm catan ,
-.Nm catanf ,
-.Nm catanl
-.Nd complex arc tangent functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn catan "double complex z"
-.Ft float complex
-.Fn catanf "float complex z"
-.Ft long double complex
-.Fn catanl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex arc tangent of
-.Ar z ,
-with branch cuts outside the interval
-[\- i,\ +i] along the imaginary axis.
-.Sh RETURN VALUES
-These functions return the complex arc tangent value, in the
-range of a strip mathematically unbounded along the imaginary
-axis and in the interval [-pi/2,\ +pi/2] along the
-real axis.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr ctan 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/catan.c b/lib/libm/complex/catan.c
deleted file mode 100644
index fd542e2f0..000000000
--- a/lib/libm/complex/catan.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* $NetBSD: catan.c,v 1.2 2011/07/03 06:45:24 mrg Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include <float.h>
-#include "cephes_subr.h"
-
-#ifdef __weak_alias
-__weak_alias(catan, _catan)
-#endif
-
-#define MAXNUM DBL_MAX
-
-double complex
-catan(double complex z)
-{
-	double complex w;
-	double a, t, x, x2, y;
-
-	x = creal(z);
-	y = cimag(z);
-
-	if ((x == 0.0) && (y > 1.0))
-		goto ovrf;
-
-	x2 = x * x;
-	a = 1.0 - x2 - (y * y);
-	if (a == 0.0)
-		goto ovrf;
-
-	t = 0.5 * atan2(2.0 * x, a);
-	w = _redupi(t);
-
-	t = y - 1.0;
-	a = x2 + (t * t);
-	if (a == 0.0)
-		goto ovrf;
-
-	t = y + 1.0;
-	a = (x2 + (t * t))/a;
-	w = w + (0.25 * log(a)) * I;
-	return w;
-
-ovrf:
-#if 0
-	mtherr ("catan", OVERFLOW);
-#endif
-	w = MAXNUM + MAXNUM * I;
-	return w;
-}
diff --git a/lib/libm/complex/catanf.c b/lib/libm/complex/catanf.c
deleted file mode 100644
index a350875d1..000000000
--- a/lib/libm/complex/catanf.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* $NetBSD: catanf.c,v 1.2 2011/07/03 06:45:24 mrg Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include <float.h>
-#include "cephes_subrf.h"
-
-#ifdef __weak_alias
-__weak_alias(catanf, _catanf)
-#endif
-
-#define MAXNUMF FLT_MAX
-
-float complex
-catanf(float complex z)
-{
-	float complex w;
-	float a, t, x, x2, y;
-
-	x = crealf(z);
-	y = cimagf(z);
-
-	if ((x == 0.0f) && (y > 1.0f))
-		goto ovrf;
-
-	x2 = x * x;
-	a = 1.0f - x2 - (y * y);
-	if (a == 0.0f)
-		goto ovrf;
-
-	t = 0.5f * atan2f(2.0f * x, a);
-	w = _redupif(t);
-
-	t = y - 1.0f;
-	a = x2 + (t * t);
-	if (a == 0.0f)
-		goto ovrf;
-
-	t = y + 1.0f;
-	a = (x2 + (t * t))/a;
-	w = w + (0.25f * logf(a)) * I;
-	return w;
-
-ovrf:
-#if 0
-	mtherr ("catan", OVERFLOW);
-#endif
-	w = MAXNUMF + MAXNUMF * I;
-	return w;
-}
diff --git a/lib/libm/complex/catanh.3 b/lib/libm/complex/catanh.3
deleted file mode 100644
index 64269b954..000000000
--- a/lib/libm/complex/catanh.3
+++ /dev/null
@@ -1,46 +0,0 @@
-.\" $NetBSD: catanh.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CATANH 3
-.Os
-.Sh NAME
-.Nm catanh ,
-.Nm catanhf ,
-.Nm catanhl
-.Nd complex arc hyperbolic tangent functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn catanh "double complex z"
-.Ft float complex
-.Fn catanhf "float complex z"
-.Ft long double complex
-.Fn catanhl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex arc hyperbolic tangent of
-.Ar z ,
-with branch cuts outside the interval
-[\-1,\ +1] along the real axis.
-.Sh RETURN VALUES
-These functions return the complex arc hyperbolic tangent value,
-in the range of a strip mathematically unbounded along
-the real axis and in the interval [\-i pi/2,\ +i pi/2] along
-the imaginary axis.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr ctanh 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/catanh.c b/lib/libm/complex/catanh.c
deleted file mode 100644
index 16ed59b1d..000000000
--- a/lib/libm/complex/catanh.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $NetBSD: catanh.c,v 1.1 2007/08/20 16:01:32 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-
-double complex
-catanh(double complex z)
-{
-	double complex w;
-
-	w = -1.0 * I * catan(z * I);
-	return w;
-}
diff --git a/lib/libm/complex/catanhf.c b/lib/libm/complex/catanhf.c
deleted file mode 100644
index 2a6db0a17..000000000
--- a/lib/libm/complex/catanhf.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $NetBSD: catanhf.c,v 1.1 2007/08/20 16:01:32 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-
-float complex
-catanhf(float complex z)
-{
-	float complex w;
-
-	w = -1.0f * I * catanf(z * I);
-	return w;
-}
diff --git a/lib/libm/complex/catanhl.c b/lib/libm/complex/catanhl.c
deleted file mode 100644
index 4969b7029..000000000
--- a/lib/libm/complex/catanhl.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $NetBSD: catanhl.c,v 1.3 2014/10/10 12:43:15 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-
-long double complex
-catanhl(long double complex z)
-{
-	long double complex w;
-
-	w = -1.0L * I * catanl(z * I);
-	return w;
-}
diff --git a/lib/libm/complex/catanl.c b/lib/libm/complex/catanl.c
deleted file mode 100644
index bdff23f46..000000000
--- a/lib/libm/complex/catanl.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* $NetBSD: catanl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include <float.h>
-#include "cephes_subrl.h"
-
-#ifdef __weak_alias
-__weak_alias(catanl, _catanl)
-#endif
-
-#define MAXNUM LDBL_MAX
-
-long double complex
-catanl(long double complex z)
-{
-	long double complex w;
-	long double a, t, x, x2, y;
-
-	x = creall(z);
-	y = cimagl(z);
-
-	if ((x == 0.0L) && (y > 1.0L))
-		goto ovrf;
-
-	x2 = x * x;
-	a = 1.0L - x2 - (y * y);
-	if (a == 0.0)
-		goto ovrf;
-
-	t = 0.5L * atan2l(2.0L * x, a);
-	w = _redupil(t);
-
-	t = y - 1.0L;
-	a = x2 + (t * t);
-	if (a == 0.0L)
-		goto ovrf;
-
-	t = y + 1.0L;
-	a = (x2 + (t * t))/a;
-	w = w + (0.25L * logl(a)) * I;
-	return w;
-
-ovrf:
-#if 0
-	mtherr ("catanl", OVERFLOW);
-#endif
-	w = MAXNUM + MAXNUM * I;
-	return w;
-}
diff --git a/lib/libm/complex/ccos.3 b/lib/libm/complex/ccos.3
deleted file mode 100644
index 6d3c51cf6..000000000
--- a/lib/libm/complex/ccos.3
+++ /dev/null
@@ -1,41 +0,0 @@
-.\" $NetBSD: ccos.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CCOS 3
-.Os
-.Sh NAME
-.Nm ccos ,
-.Nm ccosf ,
-.Nm ccosl
-.Nd complex cosine functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn ccos "double complex z"
-.Ft float complex
-.Fn ccosf "float complex z"
-.Ft long double complex
-.Fn ccosl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex cosine of
-.Ar z .
-.Sh RETURN VALUES
-These functions return the complex cosine value.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr cacos 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/ccos.c b/lib/libm/complex/ccos.c
deleted file mode 100644
index 755d712ac..000000000
--- a/lib/libm/complex/ccos.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: ccos.c,v 1.1 2007/08/20 16:01:32 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include "cephes_subr.h"
-
-double complex
-ccos(double complex z)
-{
-	double complex w;
-	double ch, sh;
-
-	_cchsh(cimag(z), &ch, &sh);
-	w = cos(creal(z)) * ch - (sin(creal(z)) * sh) * I;
-	return w;
-}
diff --git a/lib/libm/complex/ccosf.c b/lib/libm/complex/ccosf.c
deleted file mode 100644
index 4b6feb0e7..000000000
--- a/lib/libm/complex/ccosf.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: ccosf.c,v 1.1 2007/08/20 16:01:33 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include "cephes_subrf.h"
-
-float complex
-ccosf(float complex z)
-{
-	float complex w;
-	float ch, sh;
-
-	_cchshf(cimagf(z), &ch, &sh);
-	w = cosf(crealf(z)) * ch - (sinf(crealf(z)) * sh) * I;
-	return w;
-}
diff --git a/lib/libm/complex/ccosh.3 b/lib/libm/complex/ccosh.3
deleted file mode 100644
index e003fac63..000000000
--- a/lib/libm/complex/ccosh.3
+++ /dev/null
@@ -1,41 +0,0 @@
-.\" $NetBSD: ccosh.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CCOSH 3
-.Os
-.Sh NAME
-.Nm ccosh ,
-.Nm ccoshf ,
-.Nm ccoshl
-.Nd complex hyperbolic cosine functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn ccosh "double complex z"
-.Ft float complex
-.Fn ccoshf "float complex z"
-.Ft long double complex
-.Fn ccoshl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex hyperbolic cosine of
-.Ar z .
-.Sh RETURN VALUES
-These functions return the complex hyperbolic cosine value.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr cacosh 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/ccosh.c b/lib/libm/complex/ccosh.c
deleted file mode 100644
index e05516543..000000000
--- a/lib/libm/complex/ccosh.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: ccosh.c,v 1.1 2007/08/20 16:01:33 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-double complex
-ccosh(double complex z)
-{
-	double complex w;
-	double x, y;
-
-	x = creal(z);
-	y = cimag(z);
-	w = cosh(x) * cos(y) + (sinh(x) * sin(y)) * I;
-	return w;
-}
diff --git a/lib/libm/complex/ccoshf.c b/lib/libm/complex/ccoshf.c
deleted file mode 100644
index 66b3eaff7..000000000
--- a/lib/libm/complex/ccoshf.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: ccoshf.c,v 1.1 2007/08/20 16:01:33 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-float complex
-ccoshf(float complex z)
-{
-	float complex w;
-	float x, y;
-
-	x = crealf(z);
-	y = cimagf(z);
-	w = coshf(x) * cosf(y) + (sinhf(x) * sinf(y)) * I;
-	return w;
-}
diff --git a/lib/libm/complex/ccoshl.c b/lib/libm/complex/ccoshl.c
deleted file mode 100644
index 4c33f9de3..000000000
--- a/lib/libm/complex/ccoshl.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: ccoshl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-long double complex
-ccoshl(long double complex z)
-{
-	long double complex w;
-	long double x, y;
-
-	x = creall(z);
-	y = cimagl(z);
-	w = coshl(x) * cosl(y) + (sinhl(x) * sinl(y)) * I;
-	return w;
-}
diff --git a/lib/libm/complex/ccosl.c b/lib/libm/complex/ccosl.c
deleted file mode 100644
index 6ce5661a1..000000000
--- a/lib/libm/complex/ccosl.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: ccosl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include "cephes_subrl.h"
-
-long double complex
-ccosl(long double complex z)
-{
-	long double complex w;
-	long double ch, sh;
-
-	_cchshl(cimagl(z), &ch, &sh);
-	w = cosl(creall(z)) * ch - (sinl(creall(z)) * sh) * I;
-	return w;
-}
diff --git a/lib/libm/complex/cephes_subr.c b/lib/libm/complex/cephes_subr.c
deleted file mode 100644
index afbc0075c..000000000
--- a/lib/libm/complex/cephes_subr.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* $NetBSD: cephes_subr.c,v 1.1 2007/08/20 16:01:33 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include "cephes_subr.h"
-
-/* calculate cosh and sinh */
-
-void
-_cchsh(double x, double *c, double *s)
-{
-	double e, ei;
-
-	if (fabs(x) <= 0.5) {
-		*c = cosh(x);
-		*s = sinh(x);
-	} else {
-		e = exp(x);
-		ei = 0.5 / e;
-		e = 0.5 * e;
-		*s = e - ei;
-		*c = e + ei;
-	}
-}
-
-/* Program to subtract nearest integer multiple of PI */
-
-/* extended precision value of PI: */
-static const double DP1 = 3.14159265160560607910E0;
-static const double DP2 = 1.98418714791870343106E-9;
-static const double DP3 = 1.14423774522196636802E-17;
-#define MACHEP 1.1e-16
-
-double
-_redupi(double x)
-{
-	double t;
-	long i;
-
-	t = x / M_PI;
-	if (t >= 0.0)
-		t += 0.5;
-	else
-		t -= 0.5;
-
-	i = t;	/* the multiple */
-	t = i;
-	t = ((x - t * DP1) - t * DP2) - t * DP3;
-	return t;
-}
-
-/* Taylor series expansion for cosh(2y) - cos(2x) */
-
-double
-_ctans(double complex z)
-{
-	double f, x, x2, y, y2, rn, t;
-	double d;
-
-	x = fabs(2.0 * creal(z));
-	y = fabs(2.0 * cimag(z));
-
-	x = _redupi(x);
-
-	x = x * x;
-	y = y * y;
-	x2 = 1.0;
-	y2 = 1.0;
-	f = 1.0;
-	rn = 0.0;
-	d = 0.0;
-	do {
-		rn += 1.0;
-		f *= rn;
-		rn += 1.0;
-		f *= rn;
-		x2 *= x;
-		y2 *= y;
-		t = y2 + x2;
-		t /= f;
-		d += t;
-
-		rn += 1.0;
-		f *= rn;
-		rn += 1.0;
-		f *= rn;
-		x2 *= x;
-		y2 *= y;
-		t = y2 - x2;
-		t /= f;
-		d += t;
-	} while (fabs(t/d) > MACHEP);
-	return d;
-}
diff --git a/lib/libm/complex/cephes_subr.h b/lib/libm/complex/cephes_subr.h
deleted file mode 100644
index 7d230525f..000000000
--- a/lib/libm/complex/cephes_subr.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $NetBSD: cephes_subr.h,v 1.1 2007/08/20 16:01:33 drochner Exp $ */
-
-void _cchsh(double, double *, double *);
-double _redupi(double);
-double _ctans(double complex);
diff --git a/lib/libm/complex/cephes_subrf.c b/lib/libm/complex/cephes_subrf.c
deleted file mode 100644
index da61f106f..000000000
--- a/lib/libm/complex/cephes_subrf.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* $NetBSD: cephes_subrf.c,v 1.1 2007/08/20 16:01:34 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include "cephes_subrf.h"
-
-/* calculate cosh and sinh */
-
-void
-_cchshf(float x, float *c, float *s)
-{
-	float e, ei;
-
-	if (fabsf(x) <= 0.5f) {
-		*c = coshf(x);
-		*s = sinhf(x);
-	} else {
-		e = expf(x);
-		ei = 0.5f / e;
-		e = 0.5f * e;
-		*s = e - ei;
-		*c = e + ei;
-	}
-}
-
-/* Program to subtract nearest integer multiple of PI */
-
-/* extended precision value of PI: */
-static const double DP1 =  3.140625;
-static const double DP2 =  9.67502593994140625E-4;
-static const double DP3 =  1.509957990978376432E-7;
-#define MACHEPF 3.0e-8
-
-float
-_redupif(float x)
-{
-	float t;
-	long i;
-
-	t = x / (float)M_PI;
-	if (t >= 0.0f)
-		t += 0.5f;
-	else
-		t -= 0.5f;
-
-	i = t;	/* the multiple */
-	t = i;
-	t = ((x - t * DP1) - t * DP2) - t * DP3;
-	return t;
-}
-
-/* Taylor series expansion for cosh(2y) - cos(2x) */
-
-float
-_ctansf(float complex z)
-{
-	float f, x, x2, y, y2, rn, t, d;
-
-	x = fabsf(2.0f * crealf(z));
-	y = fabsf(2.0f * cimagf(z));
-
-	x = _redupif(x);
-
-	x = x * x;
-	y = y * y;
-	x2 = 1.0f;
-	y2 = 1.0f;
-	f = 1.0f;
-	rn = 0.0f;
-	d = 0.0f;
-	do {
-		rn += 1.0f;
-		f *= rn;
-		rn += 1.0f;
-		f *= rn;
-		x2 *= x;
-		y2 *= y;
-		t = y2 + x2;
-		t /= f;
-		d += t;
-
-		rn += 1.0f;
-		f *= rn;
-		rn += 1.0f;
-		f *= rn;
-		x2 *= x;
-		y2 *= y;
-		t = y2 - x2;
-		t /= f;
-		d += t;
-	} while (fabsf(t/d) > MACHEPF);
-	return d;
-}
diff --git a/lib/libm/complex/cephes_subrf.h b/lib/libm/complex/cephes_subrf.h
deleted file mode 100644
index 81aec4630..000000000
--- a/lib/libm/complex/cephes_subrf.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $NetBSD: cephes_subrf.h,v 1.1 2007/08/20 16:01:34 drochner Exp $ */
-
-void _cchshf(float, float *, float *);
-float _redupif(float);
-float _ctansf(float complex);
diff --git a/lib/libm/complex/cephes_subrl.c b/lib/libm/complex/cephes_subrl.c
deleted file mode 100644
index 90dbd869a..000000000
--- a/lib/libm/complex/cephes_subrl.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* $NetBSD: cephes_subrl.c,v 1.2 2014/10/10 14:06:40 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include "cephes_subrl.h"
-
-/* calculate cosh and sinh */
-
-void
-_cchshl(long double x, long double *c, long double *s)
-{
-	long double e, ei;
-
-	if (fabsl(x) <= 0.5L) {
-		*c = coshl(x);
-		*s = sinhl(x);
-	} else {
-		e = expl(x);
-		ei = 0.5L / e;
-		e = 0.5L * e;
-		*s = e - ei;
-		*c = e + ei;
-	}
-}
-
-/* Program to subtract nearest integer multiple of PI */
-
-/* extended precision value of PI: */
-static const long double DP1 = 3.14159265358979323829596852490908531763125L;
-static const long double DP2 = 1.6667485837041756656403424829301998703007e-19L;
-#ifndef __vax__
-static const long double DP3 = 1.8830410776607851167459095484560349402753e-39L;
-#define MACHEPL 1.1e-38L
-#else
-static const long double DP3 = 0L;
-#define MACHEPL 1.1e-19L
-#endif
-
-long double
-_redupil(long double x)
-{
-	long double t;
-	long long i;
-
-	t = x / M_PIL;
-	if (t >= 0.0L)
-		t += 0.5L;
-	else
-		t -= 0.5L;
-
-	i = t;	/* the multiple */
-	t = i;
-	t = ((x - t * DP1) - t * DP2) - t * DP3;
-	return t;
-}
-
-/* Taylor series expansion for cosh(2y) - cos(2x) */
-
-long double
-_ctansl(long double complex z)
-{
-	long double f, x, x2, y, y2, rn, t;
-	long double d;
-
-	x = fabsl(2.0L * creall(z));
-	y = fabsl(2.0L * cimagl(z));
-
-	x = _redupil(x);
-
-	x = x * x;
-	y = y * y;
-	x2 = 1.0;
-	y2 = 1.0;
-	f = 1.0;
-	rn = 0.0;
-	d = 0.0;
-	do {
-		rn += 1.0L;
-		f *= rn;
-		rn += 1.0L;
-		f *= rn;
-		x2 *= x;
-		y2 *= y;
-		t = y2 + x2;
-		t /= f;
-		d += t;
-
-		rn += 1.0L;
-		f *= rn;
-		rn += 1.0L;
-		f *= rn;
-		x2 *= x;
-		y2 *= y;
-		t = y2 - x2;
-		t /= f;
-		d += t;
-	} while (fabsl(t/d) > MACHEPL);
-	return d;
-}
diff --git a/lib/libm/complex/cephes_subrl.h b/lib/libm/complex/cephes_subrl.h
deleted file mode 100644
index 6354b23a7..000000000
--- a/lib/libm/complex/cephes_subrl.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* $NetBSD: cephes_subrl.h,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-void _cchshl(long double, long double *, long double *);
-long double _redupil(long double);
-long double _ctansl(long double complex);
-
-#define	M_PIL	3.14159265358979323846264338327950280e+00L
-#define	M_PI_2L	1.57079632679489661923132169163975140e+00L
-
diff --git a/lib/libm/complex/cexp.3 b/lib/libm/complex/cexp.3
deleted file mode 100644
index e4f6b282e..000000000
--- a/lib/libm/complex/cexp.3
+++ /dev/null
@@ -1,43 +0,0 @@
-.\" $NetBSD: cexp.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CEXP 3
-.Os
-.Sh NAME
-.Nm cexp ,
-.Nm cexpf ,
-.Nm cexpl
-.Nd complex exponential functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn cexp "double complex z"
-.Ft float complex
-.Fn cexpf "float complex z"
-.Ft long double complex
-.Fn cexpl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex exponent of
-.Ar z ,
-defined as e**z.
-.Sh RETURN VALUES
-These functions return the complex exponential value of
-.Ar z .
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr clog 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/cexp.c b/lib/libm/complex/cexp.c
deleted file mode 100644
index 3ea768ab0..000000000
--- a/lib/libm/complex/cexp.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $NetBSD: cexp.c,v 1.1 2007/08/20 16:01:34 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-double complex
-cexp(double complex z)
-{
-	double complex w;
-	double r, x, y;
-
-	x = creal(z);
-	y = cimag(z);
-	r = exp(x);
-	w = r * cos(y) + r * sin(y) * I;
-	return w;
-}
diff --git a/lib/libm/complex/cexpf.c b/lib/libm/complex/cexpf.c
deleted file mode 100644
index e4dec4a4b..000000000
--- a/lib/libm/complex/cexpf.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $NetBSD: cexpf.c,v 1.1 2007/08/20 16:01:34 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-float complex
-cexpf(float complex z)
-{
-	float complex w;
-	float r, x, y;
-
-	x = crealf(z);
-	y = cimagf(z);
-	r = expf(x);
-	w = r * cosf(y) + r * sinf(y) * I;
-	return w;
-}
diff --git a/lib/libm/complex/cexpl.c b/lib/libm/complex/cexpl.c
deleted file mode 100644
index a1e2235bf..000000000
--- a/lib/libm/complex/cexpl.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $NetBSD: cexpl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-long double complex
-cexpl(long double complex z)
-{
-	long double complex w;
-	long double r, x, y;
-
-	x = creall(z);
-	y = cimagl(z);
-	r = expl(x);
-	w = r * cosl(y) + r * sinl(y) * I;
-	return w;
-}
diff --git a/lib/libm/complex/cimag.3 b/lib/libm/complex/cimag.3
deleted file mode 100644
index 39dca4cc3..000000000
--- a/lib/libm/complex/cimag.3
+++ /dev/null
@@ -1,51 +0,0 @@
-.\" $NetBSD: cimag.3,v 1.4 2012/12/27 21:34:10 wiz Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd December 27, 2012
-.Dt CIMAG 3
-.Os
-.Sh NAME
-.Nm cimag ,
-.Nm cimagf ,
-.Nm cimagl
-.Nd complex imaginary functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double
-.Fn cimag "double complex z"
-.Ft float
-.Fn cimagf "float complex z"
-.Ft long double
-.Fn cimagl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the imaginary part of
-.Ar z .
-.Sh RETURN VALUES
-These functions return the imaginary part value (as a real).
-.Sh ERRORS
-No errors are defined.
-.Sh APPLICATION USAGE
-For a variable
-.Ar z
-of complex type:
-.Bd -literal -offset indent
-z = creal(z) + cimag(z)*I
-.Ed
-.Sh SEE ALSO
-.Xr carg 3 ,
-.Xr conj 3 ,
-.Xr cproj 3 ,
-.Xr creal 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/cimag.c b/lib/libm/complex/cimag.c
deleted file mode 100644
index 5e98447c4..000000000
--- a/lib/libm/complex/cimag.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: cimag.c,v 1.2 2010/09/15 16:11:29 christos Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#include <complex.h>
-#include "../src/math_private.h"
-
-double
-cimag(double complex z)
-{
-	double_complex w = { .z = z };
-
-	return (IMAG_PART(w));
-}
diff --git a/lib/libm/complex/cimagf.c b/lib/libm/complex/cimagf.c
deleted file mode 100644
index a82d696fb..000000000
--- a/lib/libm/complex/cimagf.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: cimagf.c,v 1.2 2010/09/15 16:11:29 christos Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#include <complex.h>
-#include "../src/math_private.h"
-
-float
-cimagf(float complex z)
-{
-	float_complex w = { .z = z };
-
-	return (IMAG_PART(w));
-}
diff --git a/lib/libm/complex/cimagl.c b/lib/libm/complex/cimagl.c
deleted file mode 100644
index 75897907b..000000000
--- a/lib/libm/complex/cimagl.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: cimagl.c,v 1.3 2010/09/20 16:55:20 christos Exp $	*/
-
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: cimagl.c,v 1.3 2010/09/20 16:55:20 christos Exp $");
-
-#include <complex.h>
-#include "../src/math_private.h"
-
-/*
- * cimagl(long double complex z)
- * This function returns the imaginary part value (as a real) of z.
- */
-long double
-cimagl(long double complex z)
-{
-	long_double_complex w = { .z = z };
-
-	return (IMAG_PART(w));
-}
diff --git a/lib/libm/complex/clog.3 b/lib/libm/complex/clog.3
deleted file mode 100644
index ce431e5a4..000000000
--- a/lib/libm/complex/clog.3
+++ /dev/null
@@ -1,46 +0,0 @@
-.\" $NetBSD: clog.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CLOG 3
-.Os
-.Sh NAME
-.Nm clog ,
-.Nm clogf ,
-.Nm clogl
-.Nd complex natural logarithm functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn clog "double complex z"
-.Ft float complex
-.Fn clogf "float complex z"
-.Ft long double complex
-.Fn clogl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex natural (base e) logarithm
-of
-.Ar z ,
-with a branch cut along the negative real axis.
-.Sh RETURN VALUES
-These functions return the complex natural logarithm value,
-in the range of a strip mathematically unbounded along the
-real axis and in the interval [\-i pi,\ +i pi] along the
-imaginary axis.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr cexp 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/clog.c b/lib/libm/complex/clog.c
deleted file mode 100644
index 6362c4456..000000000
--- a/lib/libm/complex/clog.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $NetBSD: clog.c,v 1.1 2007/08/20 16:01:35 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-double complex
-clog(double complex z)
-{
-	double complex w;
-	double p, rr;
-
-	rr = cabs(z);
-	p = log(rr);
-	rr = atan2(cimag(z), creal(z));
-	w = p + rr * I;
-	return w;
-}
diff --git a/lib/libm/complex/clogf.c b/lib/libm/complex/clogf.c
deleted file mode 100644
index c3cdad07f..000000000
--- a/lib/libm/complex/clogf.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $NetBSD: clogf.c,v 1.1 2007/08/20 16:01:35 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-float complex
-clogf(float complex z)
-{
-	float complex w;
-	float p, rr;
-
-	rr = cabsf(z);
-	p = logf(rr);
-	rr = atan2f(cimagf(z), crealf(z));
-	w = p + rr * I;
-	return w;
-}
diff --git a/lib/libm/complex/clogl.c b/lib/libm/complex/clogl.c
deleted file mode 100644
index 11e7a1508..000000000
--- a/lib/libm/complex/clogl.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $NetBSD: clogl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-long double complex
-clogl(long double complex z)
-{
-	long double complex w;
-	long double p, rr;
-
-	rr = cabsl(z);
-	p = logl(rr);
-	rr = atan2l(cimagl(z), creall(z));
-	w = p + rr * I;
-	return w;
-}
diff --git a/lib/libm/complex/conj.3 b/lib/libm/complex/conj.3
deleted file mode 100644
index 1bc43c612..000000000
--- a/lib/libm/complex/conj.3
+++ /dev/null
@@ -1,45 +0,0 @@
-.\" $NetBSD: conj.3,v 1.4 2012/12/27 21:34:10 wiz Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd December 27, 2012
-.Dt CONJ 3
-.Os
-.Sh NAME
-.Nm conj ,
-.Nm conjf ,
-.Nm conjl
-.Nd complex conjugate functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn conj "double complex z"
-.Ft float complex
-.Fn conjf "float complex z"
-.Ft long double complex
-.Fn conjl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex conjugate of
-.Ar z ,
-by reversing the sign of its imaginary part.
-.Sh RETURN VALUES
-These functions return the complex conjugate value.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr carg 3 ,
-.Xr cimag 3 ,
-.Xr cproj 3 ,
-.Xr creal 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/conj.c b/lib/libm/complex/conj.c
deleted file mode 100644
index ba8713dda..000000000
--- a/lib/libm/complex/conj.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: conj.c,v 1.2 2010/09/15 16:11:29 christos Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#include <complex.h>
-#include "../src/math_private.h"
-
-double complex
-conj(double complex z)
-{
-	double_complex w = { .z = z };
-
-	IMAG_PART(w) = -IMAG_PART(w);
-
-	return (w.z);
-}
diff --git a/lib/libm/complex/conjf.c b/lib/libm/complex/conjf.c
deleted file mode 100644
index 4b7dacb4f..000000000
--- a/lib/libm/complex/conjf.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $NetBSD: conjf.c,v 1.2 2010/09/15 16:11:29 christos Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#include <complex.h>
-#include "../src/math_private.h"
-
-float complex
-conjf(float complex z)
-{
-	float_complex w = { .z = z };
-
-	IMAG_PART(w) = -IMAG_PART(w);
-
-	return (w.z);
-}
diff --git a/lib/libm/complex/conjl.c b/lib/libm/complex/conjl.c
deleted file mode 100644
index 5c894a380..000000000
--- a/lib/libm/complex/conjl.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: conjl.c,v 1.4 2010/09/20 16:55:20 christos Exp $	*/
-
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: conjl.c,v 1.4 2010/09/20 16:55:20 christos Exp $");
-
-#include <complex.h>
-#include <math.h>
-
-#include "../src/math_private.h"
-
-/*
- * conjl(long double complex z)
- * This function returns the complex conjugate value of its argument, z.
- */
-long double complex
-conjl(long double complex z)
-{
-	long_double_complex w = { .z = z };
-
-	IMAG_PART(w) = -IMAG_PART(w);
-
-	return (w.z);
-}
diff --git a/lib/libm/complex/cpow.3 b/lib/libm/complex/cpow.3
deleted file mode 100644
index 30c671fab..000000000
--- a/lib/libm/complex/cpow.3
+++ /dev/null
@@ -1,43 +0,0 @@
-.\" $NetBSD: cpow.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CPOW 3
-.Os
-.Sh NAME
-.Nm cpow ,
-.Nm cpowf ,
-.Nm cpowl
-.Nd complex power functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn cpow "double complex x" "double complex y"
-.Ft float complex
-.Fn cpowf "float complex x" "float complex y"
-.Ft long double complex
-.Fn cpowl "long double complex x" "long double complex y"
-.Sh DESCRIPTION
-These functions compute the complex power function x**y,
-with a branch cut for the first
-parameter along the negative real axis.
-.Sh RETURN VALUES
-These functions return the complex power function value.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr cabs 3 ,
-.Xr csqrt 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/cpow.c b/lib/libm/complex/cpow.c
deleted file mode 100644
index 5bc8d3f60..000000000
--- a/lib/libm/complex/cpow.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $NetBSD: cpow.c,v 1.1 2007/08/20 16:01:35 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-double complex
-cpow(double complex a, double complex z)
-{
-	double complex w;
-	double x, y, r, theta, absa, arga;
-
-	x = creal(z);
-	y = cimag(z);
-	absa = cabs(a);
-	if (absa == 0.0) {
-		return (0.0 + 0.0 * I);
-	}
-	arga = carg(a);
-	r = pow(absa, x);
-	theta = x * arga;
-	if (y != 0.0) {
-		r = r * exp(-y * arga);
-		theta = theta + y * log(absa);
-	}
-	w = r * cos(theta) + (r * sin(theta)) * I;
-	return w;
-}
diff --git a/lib/libm/complex/cpowf.c b/lib/libm/complex/cpowf.c
deleted file mode 100644
index f7af10ae7..000000000
--- a/lib/libm/complex/cpowf.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $NetBSD: cpowf.c,v 1.1 2007/08/20 16:01:36 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-float complex
-cpowf(float complex a, float complex z)
-{
-	float complex w;
-	float x, y, r, theta, absa, arga;
-
-	x = crealf(z);
-	y = cimagf(z);
-	absa = cabsf(a);
-	if (absa == 0.0f) {
-		return (0.0f + 0.0f * I);
-	}
-	arga = cargf(a);
-	r = powf(absa, x);
-	theta = x * arga;
-	if (y != 0.0f) {
-		r = r * expf(-y * arga);
-		theta = theta + y * logf(absa);
-	}
-	w = r * cosf(theta) + (r * sinf(theta)) * I;
-	return w;
-}
diff --git a/lib/libm/complex/cpowl.c b/lib/libm/complex/cpowl.c
deleted file mode 100644
index 39336ead6..000000000
--- a/lib/libm/complex/cpowl.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $NetBSD: cpowl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-long double complex
-cpowl(long double complex a, long double complex z)
-{
-	long double complex w;
-	long double x, y, r, theta, absa, arga;
-
-	x = creall(z);
-	y = cimagl(z);
-	absa = cabsl(a);
-	if (absa == 0.0L) {
-		return (0.0L + 0.0L * I);
-	}
-	arga = cargl(a);
-	r = powl(absa, x);
-	theta = x * arga;
-	if (y != 0.0L) {
-		r = r * expl(-y * arga);
-		theta = theta + y * logl(absa);
-	}
-	w = r * cosl(theta) + (r * sinl(theta)) * I;
-	return w;
-}
diff --git a/lib/libm/complex/cproj.3 b/lib/libm/complex/cproj.3
deleted file mode 100644
index 262211d71..000000000
--- a/lib/libm/complex/cproj.3
+++ /dev/null
@@ -1,59 +0,0 @@
-.\" $NetBSD: cproj.3,v 1.4 2012/12/27 21:34:10 wiz Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd December 27, 2012
-.Dt CPROJ 3
-.Os
-.Sh NAME
-.Nm cproj ,
-.Nm cprojf ,
-.Nm cprojl
-.Nd complex projection functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double
-.Fn cproj "double complex z"
-.Ft float
-.Fn cprojf "float complex z"
-.Ft long double
-.Fn cprojl "long double complex z"
-.Sh DESCRIPTION
-These functions compute a projection of
-.Ar z
-onto the Riemann sphere:
-.Ar z
-projects to
-.Ar z ,
-except that all complex infinities (even those
-with one infinite part and one NaN part) project to positive infinity on the
-real axis.
-If
-.Ar z
-has an infinite part, then
-.Fn cproj
-shall be equivalent to:
-.Bd -literal -offset indent
-INFINITY + I * copysign(0.0, cimag(z))
-.Ed
-.Sh RETURN VALUES
-These functions return the value of the projection onto the Riemann sphere.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr carg 3 ,
-.Xr cimag 3 ,
-.Xr conj 3 ,
-.Xr creal 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/cproj.c b/lib/libm/complex/cproj.c
deleted file mode 100644
index 6f72efc3f..000000000
--- a/lib/libm/complex/cproj.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: cproj.c,v 1.5 2011/11/02 02:34:56 christos Exp $	*/
-
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: cproj.c,v 1.5 2011/11/02 02:34:56 christos Exp $");
-
-#include <complex.h>
-#include <math.h>
-
-#include "../src/math_private.h"
-
-/*
- * cproj(double complex z)
- *
- * These functions return the value of the projection (not stereographic!)
- * onto the Riemann sphere.
- *
- * z projects to z, except that all complex infinities (even those with one
- * infinite part and one NaN part) project to positive infinity on the real axis.
- * If z has an infinite part, then cproj(z) shall be equivalent to:
- *
- * INFINITY + I * copysign(0.0, cimag(z))
- */
-double complex
-cproj(double complex z)
-{
-	double_complex w = { .z = z };
-
-	/*CONSTCOND*/
-	if (isinf(creal(z)) || isinf(cimag(z))) {
-#ifdef __INFINITY
-		REAL_PART(w) = HUGE_VAL;
-#else
-		REAL_PART(w) = INFINITY;
-#endif
-		IMAG_PART(w) = copysign(0.0, cimag(z));
-	}
-
-	return (w.z);
-}
diff --git a/lib/libm/complex/cprojf.c b/lib/libm/complex/cprojf.c
deleted file mode 100644
index bc9abf8b3..000000000
--- a/lib/libm/complex/cprojf.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: cprojf.c,v 1.5 2011/11/02 02:34:56 christos Exp $	*/
-
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: cprojf.c,v 1.5 2011/11/02 02:34:56 christos Exp $");
-
-#include <complex.h>
-#include <math.h>
-
-#include "../src/math_private.h"
-
-/*
- * cprojf(float complex z)
- *
- * These functions return the value of the projection (not stereographic!)
- * onto the Riemann sphere.
- *
- * z projects to z, except that all complex infinities (even those with one
- * infinite part and one NaN part) project to positive infinity on the real axis.
- * If z has an infinite part, then cproj(z) shall be equivalent to:
- *
- * INFINITY + I * copysign(0.0, cimag(z))
- */
-
-float complex
-cprojf(float complex z)
-{
-	float_complex w = { .z = z };
-
-	/*CONSTCOND*/
-	if (isinf(crealf(z)) || isinf(cimagf(z))) {
-#ifdef __INFINITY
-		REAL_PART(w) = HUGE_VAL;
-#else
-		REAL_PART(w) = INFINITY;
-#endif
-		IMAG_PART(w) = copysignf(0.0, cimagf(z));
-	}
-
-	return (w.z);
-}
diff --git a/lib/libm/complex/cprojl.c b/lib/libm/complex/cprojl.c
deleted file mode 100644
index 43234d1d5..000000000
--- a/lib/libm/complex/cprojl.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: cprojl.c,v 1.7 2014/10/10 00:48:18 christos Exp $	*/
-
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: cprojl.c,v 1.7 2014/10/10 00:48:18 christos Exp $");
-
-#include <complex.h>
-#include <math.h>
-
-#include "../src/math_private.h"
-
-/*
- * cprojl(long double complex z)
- *
- * These functions return the value of the projection (not stereographic!)
- * onto the Riemann sphere.
- *
- * z projects to z, except that all complex infinities (even those with one
- * infinite part and one NaN part) project to positive infinity on the real axis.
- * If z has an infinite part, then cproj(z) shall be equivalent to:
- *
- * INFINITY + I * copysign(0.0, cimag(z))
- */
-long double complex
-cprojl(long double complex z)
-{
-	long_double_complex w = { .z = z };
-
-	/*CONSTCOND*/
-	if (isinf(creall(z)) || isinf(cimagl(z))) {
-#ifdef __INFINITY
-		REAL_PART(w) = HUGE_VAL;
-#else
-		REAL_PART(w) = INFINITY;
-#endif
-		IMAG_PART(w) = copysignl(0.0L, cimagl(z));
-	}
-
-	return (w.z);
-}
diff --git a/lib/libm/complex/creal.3 b/lib/libm/complex/creal.3
deleted file mode 100644
index ca8ed6273..000000000
--- a/lib/libm/complex/creal.3
+++ /dev/null
@@ -1,52 +0,0 @@
-.\" $NetBSD: creal.3,v 1.4 2012/12/27 21:34:10 wiz Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd December 27, 2012
-.Dt CREAL 3
-.Os
-.Sh NAME
-.Nm creal ,
-.Nm crealf ,
-.Nm creall
-.Nd complex real functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double
-.Fn creal "double complex z"
-.Ft float
-.Fn crealf "float complex z"
-.Ft long double
-.Fn creall "long double complex z"
-.Sh DESCRIPTION
-These functions compute the real part of
-.Ar z .
-.Sh RETURN VALUES
-These functions return the real part value.
-.Sh ERRORS
-No errors are defined.
-.Sh APPLICATION USAGE
-For a variable
-.Ar z
-of type
-.Vt complex :
-.Bd -literal -offset indent
-z == creal(z) + cimag(z)*I
-.Ed
-.Sh SEE ALSO
-.Xr carg 3 ,
-.Xr cimag 3 ,
-.Xr conj 3 ,
-.Xr cproj 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/creal.c b/lib/libm/complex/creal.c
deleted file mode 100644
index 98c5cb5a1..000000000
--- a/lib/libm/complex/creal.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: creal.c,v 1.2 2010/09/15 16:11:29 christos Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#include <complex.h>
-#include "../src/math_private.h"
-
-double
-creal(double complex z)
-{
-	double_complex w = { .z = z };
-
-	return (REAL_PART(w));
-}
diff --git a/lib/libm/complex/crealf.c b/lib/libm/complex/crealf.c
deleted file mode 100644
index 5499c8de9..000000000
--- a/lib/libm/complex/crealf.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* $NetBSD: crealf.c,v 1.2 2010/09/15 16:11:29 christos Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#include <complex.h>
-#include "../src/math_private.h"
-
-float
-crealf(float complex z)
-{
-	float_complex w = { .z = z };
-
-	return (REAL_PART(w));
-}
diff --git a/lib/libm/complex/creall.c b/lib/libm/complex/creall.c
deleted file mode 100644
index 1eafd6aec..000000000
--- a/lib/libm/complex/creall.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: creall.c,v 1.3 2010/09/20 16:55:20 christos Exp $	*/
-
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: creall.c,v 1.3 2010/09/20 16:55:20 christos Exp $");
-
-#include <complex.h>
-#include "../src/math_private.h"
-
-/*
- * creall(long double complex z)
- * This function returns the real part value of z.
- */
-long double
-creall(long double complex z)
-{
-	long_double_complex w = { .z = z };
-
-	return (REAL_PART(w));
-}
diff --git a/lib/libm/complex/csin.3 b/lib/libm/complex/csin.3
deleted file mode 100644
index 377f518b3..000000000
--- a/lib/libm/complex/csin.3
+++ /dev/null
@@ -1,41 +0,0 @@
-.\" $NetBSD: csin.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CSIN 3
-.Os
-.Sh NAME
-.Nm csin ,
-.Nm csinf ,
-.Nm csinl
-.Nd complex sine functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn csin "double complex z"
-.Ft float complex
-.Fn csinf "float complex z"
-.Ft long double complex
-.Fn csinl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex sine of
-.Ar z .
-.Sh RETURN VALUES
-These functions return the complex sine value.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr casin 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/csin.c b/lib/libm/complex/csin.c
deleted file mode 100644
index d5b01fd32..000000000
--- a/lib/libm/complex/csin.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: csin.c,v 1.1 2007/08/20 16:01:36 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include "cephes_subr.h"
-
-double complex
-csin(double complex z)
-{
-	double complex w;
-	double ch, sh;
-
-	_cchsh(cimag(z), &ch, &sh);
-	w = sin(creal(z)) * ch + (cos(creal(z)) * sh) * I;
-	return w;
-}
diff --git a/lib/libm/complex/csinf.c b/lib/libm/complex/csinf.c
deleted file mode 100644
index 76882a02a..000000000
--- a/lib/libm/complex/csinf.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: csinf.c,v 1.1 2007/08/20 16:01:36 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include "cephes_subrf.h"
-
-float complex
-csinf(float complex z)
-{
-	float complex w;
-	float ch, sh;
-
-	_cchshf(cimagf(z), &ch, &sh);
-	w = sinf(crealf(z)) * ch + (cosf(crealf(z)) * sh) * I;
-	return w;
-}
diff --git a/lib/libm/complex/csinh.3 b/lib/libm/complex/csinh.3
deleted file mode 100644
index 9e4dc219d..000000000
--- a/lib/libm/complex/csinh.3
+++ /dev/null
@@ -1,41 +0,0 @@
-.\" $NetBSD: csinh.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CSINH 3
-.Os
-.Sh NAME
-.Nm csinh ,
-.Nm csinhf ,
-.Nm csinhl
-.Nd complex hyperbolic sine functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn csinh "double complex z"
-.Ft float complex
-.Fn csinhf "float complex z"
-.Ft long double complex
-.Fn csinhl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex hyperbolic sine of
-.Ar z .
-.Sh RETURN VALUES
-These functions return the complex hyperbolic sine value.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr casinh 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/csinh.c b/lib/libm/complex/csinh.c
deleted file mode 100644
index 593664f3b..000000000
--- a/lib/libm/complex/csinh.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: csinh.c,v 1.1 2007/08/20 16:01:36 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-double complex
-csinh(double complex z)
-{
-	double complex w;
-	double x, y;
-
-	x = creal(z);
-	y = cimag(z);
-	w = sinh(x) * cos(y) + (cosh(x) * sin(y)) * I;
-	return w;
-}
diff --git a/lib/libm/complex/csinhf.c b/lib/libm/complex/csinhf.c
deleted file mode 100644
index 161b00b70..000000000
--- a/lib/libm/complex/csinhf.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: csinhf.c,v 1.1 2007/08/20 16:01:37 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-float complex
-csinhf(float complex z)
-{
-	float complex w;
-	float x, y;
-
-	x = crealf(z);
-	y = cimagf(z);
-	w = sinhf(x) * cosf(y) + (coshf(x) * sinf(y)) * I;
-	return w;
-}
diff --git a/lib/libm/complex/csinhl.c b/lib/libm/complex/csinhl.c
deleted file mode 100644
index b78f7f1c8..000000000
--- a/lib/libm/complex/csinhl.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: csinhl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-long double complex
-csinhl(long double complex z)
-{
-	long double complex w;
-	long double x, y;
-
-	x = creall(z);
-	y = cimagl(z);
-	w = sinhl(x) * cosl(y) + (coshl(x) * sinl(y)) * I;
-	return w;
-}
diff --git a/lib/libm/complex/csinl.c b/lib/libm/complex/csinl.c
deleted file mode 100644
index c86847be9..000000000
--- a/lib/libm/complex/csinl.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $NetBSD: csinl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include "cephes_subrl.h"
-
-long double complex
-csinl(long double complex z)
-{
-	long double complex w;
-	long double ch, sh;
-
-	_cchshl(cimagl(z), &ch, &sh);
-	w = sinl(creall(z)) * ch + (cosl(creall(z)) * sh) * I;
-	return w;
-}
diff --git a/lib/libm/complex/csqrt.3 b/lib/libm/complex/csqrt.3
deleted file mode 100644
index ecba17916..000000000
--- a/lib/libm/complex/csqrt.3
+++ /dev/null
@@ -1,44 +0,0 @@
-.\" $NetBSD: csqrt.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CSQRT 3
-.Os
-.Sh NAME
-.Nm csqrt ,
-.Nm csqrtf ,
-.Nm csqrtl
-.Nd complex square root functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn csqrt "double complex z"
-.Ft float complex
-.Fn csqrtf "float complex z"
-.Ft long double complex
-.Fn csqrtl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex square root of
-.Ar z ,
-with a branch cut along the negative real axis.
-.Sh RETURN VALUES
-These functions return the complex square root value, in the
-range of the right half-plane (including the imaginary axis).
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr cabs 3 ,
-.Xr cpow 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/csqrt.c b/lib/libm/complex/csqrt.c
deleted file mode 100644
index f9267ec13..000000000
--- a/lib/libm/complex/csqrt.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* $NetBSD: csqrt.c,v 1.1 2007/08/20 16:01:37 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <complex.h>
-#include <math.h>
-
-double complex
-csqrt(double complex z)
-{
-	double complex w;
-	double x, y, r, t, scale;
-
-	x = creal (z);
-	y = cimag (z);
-
-	if (y == 0.0) {
-		if (x == 0.0) {
-			w = 0.0 + y * I;
-		} else {
-			r = fabs(x);
-			r = sqrt(r);
-			if (x < 0.0) {
-				w = 0.0 + r * I;
-			} else {
-				w = r + y * I;
-			}
-		}
-		return w;
-	}
-	if (x == 0.0) {
-		r = fabs(y);
-		r = sqrt(0.5 * r);
-		if (y > 0)
-			w = r + r * I;
-		else
-			w = r - r * I;
-		return w;
-	}
-	/* Rescale to avoid internal overflow or underflow.  */
-	if ((fabs(x) > 4.0) || (fabs(y) > 4.0)) {
-		x *= 0.25;
-		y *= 0.25;
-		scale = 2.0;
-	} else {
-#if 1
-		x *= 1.8014398509481984e16;  /* 2^54 */
-		y *= 1.8014398509481984e16;
-		scale = 7.450580596923828125e-9; /* 2^-27 */
-#else
-		x *= 4.0;
-		y *= 4.0;
-		scale = 0.5;
-#endif
-	}
-	w = x + y * I;
-	r = cabs(w);
-	if (x > 0) {
-		t = sqrt(0.5 * r + 0.5 * x);
-		r = scale * fabs((0.5 * y) / t );
-		t *= scale;
-	} else {
-		r = sqrt(0.5 * r - 0.5 * x);
-		t = scale * fabs((0.5 * y) / r);
-		r *= scale;
-	}
-	if (y < 0)
-		w = t - r * I;
-	else
-		w = t + r * I;
-	return w;
-}
diff --git a/lib/libm/complex/csqrtf.c b/lib/libm/complex/csqrtf.c
deleted file mode 100644
index a230430a8..000000000
--- a/lib/libm/complex/csqrtf.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* $NetBSD: csqrtf.c,v 1.1 2007/08/20 16:01:37 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <complex.h>
-#include <math.h>
-
-float complex
-csqrtf(float complex z)
-{
-	float complex w;
-	float x, y, r, t, scale;
-
-	x = crealf (z);
-	y = cimagf (z);
-
-	if (y == 0.0f) {
-		if (x < 0.0f) {
-			w = 0.0f + sqrtf(-x) * I;
-			return w;
-		} else if (x == 0.0f) {
-			return (0.0f + y * I);
-		} else {
-			w = sqrtf(x) + y * I;
-			return w;
-		}
-	}
-
-	if (x == 0.0f) {
-		r = fabsf(y);
-		r = sqrtf(0.5f * r);
-		if (y > 0)
-			w = r + r * I;
-		else
-			w = r - r * I;
-		return w;
-	}
-
-	/* Rescale to avoid internal overflow or underflow.  */
-	if ((fabsf(x) > 4.0f) || (fabsf(y) > 4.0f)) {
-		x *= 0.25f;
-		y *= 0.25f;
-		scale = 2.0f;
-	} else {
-#if 1
-		x *= 6.7108864e7f; /* 2^26 */
-		y *= 6.7108864e7f;
-		scale = 1.220703125e-4f; /* 2^-13 */
-#else
-		x *= 4.0f;
-		y *= 4.0f;
-		scale = 0.5f;
-#endif
-	}
-	w = x + y * I;
-	r = cabsf(w);
-	if( x > 0 ) {
-		t = sqrtf(0.5f * r + 0.5f * x);
-		r = scale * fabsf((0.5f * y) / t);
-		t *= scale;
-	} else {
-		r = sqrtf(0.5f * r - 0.5f * x);
-		t = scale * fabsf((0.5f * y) / r);
-		r *= scale;
-	}
-
-	if (y < 0)
-		w = t - r * I;
-	else
-		w = t + r * I;
-	return w;
-}
diff --git a/lib/libm/complex/csqrtl.c b/lib/libm/complex/csqrtl.c
deleted file mode 100644
index 82529221a..000000000
--- a/lib/libm/complex/csqrtl.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*-
- * Copyright (c) 2007-2008 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 <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: head/lib/msun/src/s_csqrtl.c 181402 2008-08-08 00:15:16Z das $");
-#else
-__RCSID("$NetBSD: csqrtl.c,v 1.2 2014/10/11 00:43:51 christos Exp $");
-#endif
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <float.h>
-#include <math.h>
-#include <stdbool.h>
-
-/*
- * gcc doesn't implement complex multiplication or division correctly,
- * so we need to handle infinities specially. We turn on this pragma to
- * notify conforming c99 compilers that the fast-but-incorrect code that
- * gcc generates is acceptable, since the special cases have already been
- * handled.
- */
-// #pragma	STDC CX_LIMITED_RANGE	ON
-
-/* We risk spurious overflow for components >= LDBL_MAX / (1 + sqrt(2)). */
-#define	THRESH	(LDBL_MAX / 2.414213562373095048801688724209698L)
-
-#define cpackl(r, i) ((r) + (i) * I)
-
-long double complex
-csqrtl(long double complex z)
-{
-	long double complex result;
-	long double a, b;
-	long double t;
-	bool scale;
-
-	a = creall(z);
-	b = cimagl(z);
-
-	/* Handle special cases. */
-	if (z == 0.0L)
-		return (cpackl(0.0L, b));
-	if (isinf(b))
-		return (cpackl(INFINITY, b));
-	if (isnan(a)) {
-		t = (b - b) / (b - b);	/* raise invalid if b is not a NaN */
-		return (cpackl(a, t));	/* return NaN + NaN i */
-	}
-	if (isinf(a)) {
-		/*
-		 * csqrt(inf + NaN i)  = inf +  NaN i
-		 * csqrt(inf + y i)    = inf +  0 i
-		 * csqrt(-inf + NaN i) = NaN +- inf i
-		 * csqrt(-inf + y i)   = 0   +  inf i
-		 */
-		if (signbit(a))
-			return (cpackl(fabsl(b - b), copysignl(a, b)));
-		else
-			return (cpackl(a, copysignl(b - b, b)));
-	}
-	/*
-	 * The remaining special case (b is NaN) is handled just fine by
-	 * the normal code path below.
-	 */
-
-	/* Scale to avoid overflow. */
-	if (fabsl(a) >= THRESH || fabsl(b) >= THRESH) {
-		a *= 0.25L;
-		b *= 0.25L;
-		scale = true;
-	} else {
-		scale = false;
-	}
-
-	/* Algorithm 312, CACM vol 10, Oct 1967. */
-	if (a >= 0L) {
-		t = sqrtl((a + hypotl(a, b)) * 0.5L);
-		result = cpackl(t, b / (2.0L * t));
-	} else {
-		t = sqrtl((-a + hypotl(a, b)) * 0.5L);
-		result = cpackl(fabsl(b) / (2.0L * t), copysignl(t, b));
-	}
-
-	/* Rescale. */
-	if (scale)
-		return (result * 2.0L);
-	else
-		return (result);
-}
diff --git a/lib/libm/complex/ctan.3 b/lib/libm/complex/ctan.3
deleted file mode 100644
index b988d5bf2..000000000
--- a/lib/libm/complex/ctan.3
+++ /dev/null
@@ -1,41 +0,0 @@
-.\" $NetBSD: ctan.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CTAN 3
-.Os
-.Sh NAME
-.Nm ctan ,
-.Nm ctanf ,
-.Nm ctanl
-.Nd complex tangent functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn ctan "double complex z"
-.Ft float complex
-.Fn ctanf "float complex z"
-.Ft long double complex
-.Fn ctanl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex tangent of
-.Ar z .
-.Sh RETURN VALUES
-These functions return the complex tangent value.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr catan 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/ctan.c b/lib/libm/complex/ctan.c
deleted file mode 100644
index 9286e24a9..000000000
--- a/lib/libm/complex/ctan.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $NetBSD: ctan.c,v 1.2 2011/07/03 06:45:24 mrg Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include <float.h>
-#include "cephes_subr.h"
-
-#define MAXNUM DBL_MAX
-
-double complex
-ctan(double complex z)
-{
-	double complex w;
-	double d;
-
-	d = cos(2.0 * creal(z)) + cosh(2.0 * cimag(z));
-
-	if (fabs(d) < 0.25)
-		d = _ctans(z);
-
-	if (d == 0.0) {
-		/* mtherr ("ctan", OVERFLOW); */
-		w = MAXNUM + MAXNUM * I;
-		return w;
-	}
-
-	w = sin(2.0 * creal(z)) / d + (sinh(2.0 * cimag(z)) / d) * I;
-	return w;
-}
diff --git a/lib/libm/complex/ctanf.c b/lib/libm/complex/ctanf.c
deleted file mode 100644
index 0d4024e84..000000000
--- a/lib/libm/complex/ctanf.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $NetBSD: ctanf.c,v 1.2 2011/07/03 06:45:24 mrg Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include <float.h>
-#include "cephes_subrf.h"
-
-#define MAXNUMF FLT_MAX
-
-float complex
-ctanf(float complex z)
-{
-	float complex w;
-	float d;
-
-	d = cosf(2.0f * crealf(z)) + coshf(2.0f * cimagf(z));
-
-	if (fabsf(d) < 0.25f)
-		d = _ctansf(z);
-
-	if (d == 0.0f) {
-		/* mtherr ("ctan", OVERFLOW); */
-		w = MAXNUMF + MAXNUMF * I;
-		return w;
-	}
-
-	w = sinf(2.0f * crealf(z)) / d + (sinhf(2.0f * cimagf(z)) / d) * I;
-	return w;
-}
diff --git a/lib/libm/complex/ctanh.3 b/lib/libm/complex/ctanh.3
deleted file mode 100644
index c4ff01cba..000000000
--- a/lib/libm/complex/ctanh.3
+++ /dev/null
@@ -1,41 +0,0 @@
-.\" $NetBSD: ctanh.3,v 1.3 2013/01/29 02:05:09 matt Exp $
-.\" Copyright (c) 2001-2003 The Open Group, All Rights Reserved
-.Dd January 29, 2013
-.Dt CTANH 3
-.Os
-.Sh NAME
-.Nm ctanh ,
-.Nm ctanhf ,
-.Nm ctanhl
-.Nd complex hyperbolic tangent functions
-.Sh SYNOPSIS
-.In complex.h
-.Ft double complex
-.Fn ctanh "double complex z"
-.Ft float complex
-.Fn ctanhf "float complex z"
-.Ft long double complex
-.Fn ctanhl "long double complex z"
-.Sh DESCRIPTION
-These functions compute the complex hyperbolic tangent of
-.Ar z .
-.Sh RETURN VALUES
-These functions return the complex hyperbolic tangent value.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr catanh 3 ,
-.St -p1003.1-2001
-.Aq Pa complex.h
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2003 Edition, Standard for Information Technology
--- Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2003 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.
-In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard
-is the referee document.
-The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html .
diff --git a/lib/libm/complex/ctanh.c b/lib/libm/complex/ctanh.c
deleted file mode 100644
index c1aaeec10..000000000
--- a/lib/libm/complex/ctanh.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $NetBSD: ctanh.c,v 1.1 2007/08/20 16:01:38 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-double complex
-ctanh(double complex z)
-{
-	double complex w;
-	double x, y, d;
-
-	x = creal(z);
-	y = cimag(z);
-	d = cosh(2.0 * x) + cos(2.0 * y);
-	w = sinh(2.0 * x) / d  +  (sin(2.0 * y) / d) * I;
-
-	return w;
-}
diff --git a/lib/libm/complex/ctanhf.c b/lib/libm/complex/ctanhf.c
deleted file mode 100644
index 26bcd59c5..000000000
--- a/lib/libm/complex/ctanhf.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $NetBSD: ctanhf.c,v 1.1 2007/08/20 16:01:38 drochner Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-float complex
-ctanhf(float complex z)
-{
-	float complex w;
-	float x, y, d;
-
-	x = crealf(z);
-	y = cimagf(z);
-	d = coshf(2.0f * x) + cosf(2.0f * y);
-	w = sinhf(2.0f * x) / d  +  (sinf(2.0f * y) / d) * I;
-
-	return w;
-}
diff --git a/lib/libm/complex/ctanhl.c b/lib/libm/complex/ctanhl.c
deleted file mode 100644
index 0894dd00d..000000000
--- a/lib/libm/complex/ctanhl.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $NetBSD: ctanhl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-
-long double complex
-ctanhl(long double complex z)
-{
-	long double complex w;
-	long double x, y, d;
-
-	x = creall(z);
-	y = cimagl(z);
-	d = coshl(2.0L * x) + cosl(2.0L * y);
-	w = sinhl(2.0L * x) / d  +  (sinl(2.0L * y) / d) * I;
-
-	return w;
-}
diff --git a/lib/libm/complex/ctanl.c b/lib/libm/complex/ctanl.c
deleted file mode 100644
index 7932aefe9..000000000
--- a/lib/libm/complex/ctanl.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $NetBSD: ctanl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software written by Stephen L. Moshier.
- * It is redistributed by the NetBSD Foundation by permission of the author.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "../src/namespace.h"
-#include <complex.h>
-#include <math.h>
-#include <float.h>
-#include "cephes_subrl.h"
-
-#define MAXNUM LDBL_MAX
-
-long double complex
-ctanl(long double complex z)
-{
-	long double complex w;
-	long double d;
-
-	d = cosl(2.0L * creall(z)) + coshl(2.0L * cimagl(z));
-
-	if (fabsl(d) < 0.25L)
-		d = _ctansl(z);
-
-	if (d == 0.0L) {
-		/* mtherr ("ctan", OVERFLOW); */
-		w = MAXNUM + MAXNUM * I;
-		return w;
-	}
-
-	w = sinl(2.0L * creall(z)) / d + (sinhl(2.0L * cimagl(z)) / d) * I;
-	return w;
-}
diff --git a/lib/libm/gen/Makefile.inc b/lib/libm/gen/Makefile.inc
deleted file mode 100644
index b16498f91..000000000
--- a/lib/libm/gen/Makefile.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/03/15 22:07:09 kleink Exp $
-
-# gen sources
-.PATH:	${.CURDIR}/gen
-CPPFLAGS+=-I${.CURDIR}/gen
-
-SRCS+=	nan.c nanf.c nanl.c
-
-MAN+=	nan.3
-
-MLINKS+=nan.3 nanf.3 \
-	nan.3 nanl.3
diff --git a/lib/libm/gen/nan.3 b/lib/libm/gen/nan.3
deleted file mode 100644
index 3606f19c0..000000000
--- a/lib/libm/gen/nan.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\"	$NetBSD: nan.3,v 1.4 2011/06/10 14:10:18 njoly Exp $
-.\"
-.\" Copyright (c) 2006 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.
-.\"
-.Dd March 15, 2006
-.Dt NAN 3
-.Os
-.Sh NAME
-.Nm nan ,
-.Nm nanf ,
-.Nm nanl
-.Nd return quiet NaN
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn nan "const char *tagp"
-.Ft float
-.Fn nanf "const char *tagp"
-.Ft long double
-.Fn nanl "const char *tagp"
-.Sh DESCRIPTION
-The call
-.Fn nan "\*qn-char-sequence\*q"
-is equivalent to the call
-.Fn strod "\*qNAN(n-char-sequence)\*q" "NULL" .
-The call
-.Fn nan "\*q\*q"
-is equivalent to the call
-.Fn strod "\*qNAN()\*q" "NULL" .
-.Pp
-The
-.Fn nanf
-and
-.Fn nanl
-functions are equivalent to
-.Fn nan
-but substituting
-.Fn strtof
-and
-.Fn strtold ,
-respectively.
-.Sh RETURN VALUES
-.Ss IEEE 754
-The
-.Fn nan ,
-.Fn nanf ,
-and
-.Fn nanl
-functions return a quiet NaN as specified by
-.Fa tagp .
-.Ss VAX
-The
-.Fn nan ,
-.Fn nanf ,
-and
-.Fn nanl
-functions return zero.
-.Sh SEE ALSO
-.Xr math 3 ,
-.Xr strtod 3
-.Sh STANDARDS
-The
-.Fn nan ,
-.Fn nanf ,
-and
-.Fn nanl
-functions conform to
-.St -isoC-99 .
diff --git a/lib/libm/gen/nan.c b/lib/libm/gen/nan.c
deleted file mode 100644
index 5028a13ef..000000000
--- a/lib/libm/gen/nan.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* $NetBSD: nan.c,v 1.2 2008/04/28 20:23:01 martin Exp $ */
-
-/*-
- * Copyright (c) 2006 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint) && !defined(NAN_FUNCTION)
-__RCSID("$NetBSD: nan.c,v 1.2 2008/04/28 20:23:01 martin Exp $");
-#endif /* LIBM_SCCS and not lint */
-
-#include <assert.h>
-#include <math.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-#ifndef NAN_FUNCTION
-#define	NAN_FUNCTION	nan
-#define	NAN_TYPE	double
-#define	NAN_STRTOD	strtod
-#endif
-
-NAN_TYPE
-NAN_FUNCTION(const char *tagp)
-{
-	const char *nstr;
-	char *buf;
-	NAN_TYPE res;
-
-	_DIAGASSERT(tagp != NULL);
-
-	nstr = "NAN()";
-	buf = NULL;
-
-	if (tagp[0] != '\0') {
-		size_t l;
-
-		l = strlen(tagp);
-		buf = malloc(5 + l + 1);
-
-		if (buf != NULL) {
-			/* Avoiding stdio in libm. */
-			memcpy(buf,		"NAN(",	4);
-			memcpy(buf + 4,		tagp,	l);
-			memcpy(buf + 4 + l,	")",	2);
-			nstr = buf;
-		} else {
-			/* Best effort: Fall back to "NAN()". */
-		}
-	}
-
-	res = NAN_STRTOD(nstr, NULL);
-
-	if (buf != NULL)
-		free(buf);
-
-	return res;
-}
diff --git a/lib/libm/gen/nanf.c b/lib/libm/gen/nanf.c
deleted file mode 100644
index 5ff2cd9c6..000000000
--- a/lib/libm/gen/nanf.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: nanf.c,v 1.2 2008/04/28 20:23:01 martin Exp $ */
-
-/*-
- * Copyright (c) 2006 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanf.c,v 1.2 2008/04/28 20:23:01 martin Exp $");
-#endif /* LIBM_SCCS and not lint */
-
-#define	NAN_FUNCTION	nanf
-#define	NAN_TYPE	float
-#define	NAN_STRTOD	strtof
-
-#include "nan.c"
diff --git a/lib/libm/gen/nanl.c b/lib/libm/gen/nanl.c
deleted file mode 100644
index ca96b82cd..000000000
--- a/lib/libm/gen/nanl.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $NetBSD: nanl.c,v 1.2 2008/04/28 20:23:01 martin Exp $ */
-
-/*-
- * Copyright (c) 2006 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nanl.c,v 1.2 2008/04/28 20:23:01 martin Exp $");
-#endif /* LIBM_SCCS and not lint */
-
-#define	NAN_FUNCTION	nanl
-#define	NAN_TYPE	long double
-#define	NAN_STRTOD	strtold
-
-#include "nan.c"
diff --git a/lib/libm/man/acos.3 b/lib/libm/man/acos.3
deleted file mode 100644
index d8f50f99c..000000000
--- a/lib/libm/man/acos.3
+++ /dev/null
@@ -1,88 +0,0 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     from: @(#)acos.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: acos.3,v 1.17 2013/01/29 02:54:30 matt Exp $
-.\"
-.Dd January 29, 2013
-.Dt ACOS 3
-.Os
-.Sh NAME
-.Nm acos ,
-.Nm acosf ,
-.Nm acosl
-.Nd arc cosine function
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn acos "double x"
-.Ft float
-.Fn acosf "float x"
-.Ft long double
-.Fn acosl "long double x"
-.Sh DESCRIPTION
-The
-.Fn acos ,
-.Fn acosf ,
-and
-.Fn acosl
-functions compute the principal value of the arc cosine of
-.Fa x
-in the range
-.Bq 0 , \*(Pi .
-.Sh RETURN VALUES
-If |x|\*[Gt]1,
-.Fn acos "x" ,
-.Fn acosf "x" ,
-and
-.Fn acosl "x"
-.\" POSIX_MODE
-set the global variable
-.Va errno
-to EDOM.
-.\" SYSV_MODE
-.\" call
-.\" .Xr matherr 3 .
-.Sh SEE ALSO
-.Xr asin 3 ,
-.Xr atan 3 ,
-.Xr atan2 3 ,
-.Xr cos 3 ,
-.Xr cosh 3 ,
-.Xr math 3 ,
-.Xr sin 3 ,
-.Xr sinh 3 ,
-.Xr tan 3 ,
-.Xr tanh 3
-.\" .Xr matherr 3
-.Sh STANDARDS
-The
-.Fn acos
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libm/man/acosh.3 b/lib/libm/man/acosh.3
deleted file mode 100644
index f809b7fc2..000000000
--- a/lib/libm/man/acosh.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" Copyright (c) 1991 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.
-.\"
-.\"     from: @(#)acosh.3	5.2 (Berkeley) 5/6/91
-.\"	$NetBSD: acosh.3,v 1.17 2014/09/19 16:02:58 wiz Exp $
-.\"
-.Dd January 29, 2013
-.Dt ACOSH 3
-.Os
-.Sh NAME
-.Nm acosh ,
-.Nm acoshf ,
-.Nm acoshl
-.Nd inverse hyperbolic cosine function
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn acosh "double x"
-.Ft float
-.Fn acoshf "float x"
-.Ft long double
-.Fn acoshl "long double x"
-.Sh DESCRIPTION
-The
-.Fn acosh ,
-.Fn acoshf ,
-and
-.Fn acoshl
-functions compute the inverse hyperbolic cosine
-of the real
-argument
-.Ar x .
-.Sh RETURN VALUES
-.\" POSIX_MODE
-If x is less than one,
-.Fn acosh "x" ,
-.Fn acoshf "x" ,
-and
-.Fn acoshl "x"
-return NaN and set the global variable
-.Va errno
-to EDOM.
-.\" SVR4_MODE
-.\" call
-.\" .Xr matherr 3 .
-.Sh SEE ALSO
-.Xr asinh 3 ,
-.Xr atanh 3 ,
-.Xr exp 3 ,
-.Xr math 3
-.\" .Xr matherr 3
-.Sh STANDARDS
-The
-.Fn acosh
-function conforms to
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn acosh
-function appeared in
-.Bx 4.3 .
diff --git a/lib/libm/man/asin.3 b/lib/libm/man/asin.3
deleted file mode 100644
index 9ff835132..000000000
--- a/lib/libm/man/asin.3
+++ /dev/null
@@ -1,90 +0,0 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     from: @(#)asin.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: asin.3,v 1.17 2013/01/29 02:54:30 matt Exp $
-.\"
-.Dd January 29, 2013
-.Dt ASIN 3
-.Os
-.Sh NAME
-.Nm asin ,
-.Nm asinf ,
-.Nm asinl
-.Nd arc sine function
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn asin "double x"
-.Ft float
-.Fn asinf "float x"
-.Ft long double
-.Fn asinl "long double x"
-.Sh DESCRIPTION
-The
-.Fn asin ,
-.Fn asinf ,
-and
-.Fn asinl
-functions compute the principal value of the arc sine of
-.Fa x
-in the range
-.Bk -words
-.Bq -\*(Pi/2, +\*(Pi/2 .
-.Ek
-.Sh RETURN VALUES
-.\" POSIX_MODE
-If |x|\*[Gt]1,
-.Fn asin "x" ,
-.Fn asinf "x" ,
-and
-.Fn asinl "x"
-return NaN and set the global variable
-.Va errno
-to EDOM.
-.\" SYSV_MODE
-.\" call
-.\" .Xr matherr 3 .
-.Sh SEE ALSO
-.Xr acos 3 ,
-.Xr atan 3 ,
-.Xr atan2 3 ,
-.Xr cos 3 ,
-.Xr cosh 3 ,
-.Xr math 3 ,
-.Xr sin 3 ,
-.Xr sinh 3 ,
-.Xr tan 3 ,
-.Xr tanh 3
-.\" .Xr matherr 3
-.Sh STANDARDS
-The
-.Fn asin
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libm/man/asinh.3 b/lib/libm/man/asinh.3
deleted file mode 100644
index 14d58e658..000000000
--- a/lib/libm/man/asinh.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\" Copyright (c) 1985, 1991 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.
-.\"
-.\"     from: @(#)asinh.3	6.4 (Berkeley) 5/6/91
-.\"	$NetBSD: asinh.3,v 1.17 2014/09/19 16:02:58 wiz Exp $
-.\"
-.Dd January 29, 2013
-.Dt ASINH 3
-.Os
-.Sh NAME
-.Nm asinh ,
-.Nm asinhf ,
-.Nm asinhl
-.Nd inverse hyperbolic sine function
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn asinh "double x"
-.Ft float
-.Fn asinhf "float x"
-.Ft long double
-.Fn asinhl "long double x"
-.Sh DESCRIPTION
-The
-.Fn asinh ,
-.Fn asinhf ,
-and
-.Fn asinhl
-functions compute the inverse hyperbolic sine
-of the real
-argument
-.Sh RETURN VALUES
-The
-.Fn asinh ,
-.Fn asinhf ,
-and
-.Fn asinhl
-functions return the inverse hyperbolic sine of
-.Ar x .
-.\" SYSV_MODE
-.\" .Sh RETURN VALUES
-.\" Exceptional cases are handled by
-.\" .Xr matherr 3 .
-.Sh SEE ALSO
-.Xr acosh 3 ,
-.Xr atanh 3 ,
-.Xr exp 3 ,
-.Xr math 3
-.\" .Xr matherr 3
-.Sh STANDARDS
-The
-.Fn asinh
-function conforms to
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn asinh
-function appeared in
-.Bx 4.3 .
diff --git a/lib/libm/man/atan.3 b/lib/libm/man/atan.3
deleted file mode 100644
index 59d456b4e..000000000
--- a/lib/libm/man/atan.3
+++ /dev/null
@@ -1,81 +0,0 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     from: @(#)atan.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: atan.3,v 1.17 2013/01/29 02:54:30 matt Exp $
-.\"
-.Dd January 29, 2013
-.Dt ATAN 3
-.Os
-.Sh NAME
-.Nm atan ,
-.Nm atanf ,
-.Nm atanl
-.Nd arc tangent function of one variable
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn atan "double x"
-.Ft float
-.Fn atanf "float x"
-.Ft long double
-.Fn atanl "long double x"
-.Sh DESCRIPTION
-The
-.Fn atan ,
-.Fn atanf ,
-and
-.Fn atanl
-functions compute the principal value of the arc tangent of
-.Fa x
-in the range
-.Bk -words
-.Bq -\*(Pi/2 , +\*(Pi/2 .
-.Ek
-.\" SYSV_MODE
-.\" .Sh RETURN VALUES
-.\" Exceptional cases are handled by
-.\" .Xr matherr 3 .
-.Sh SEE ALSO
-.Xr acos 3 ,
-.Xr asin 3 ,
-.Xr atan2 3 ,
-.Xr cos 3 ,
-.Xr cosh 3 ,
-.Xr math 3 ,
-.Xr sin 3 ,
-.Xr sinh 3 ,
-.Xr tan 3 ,
-.Xr tanh 3
-.\" .Xr matherr 3
-.Sh STANDARDS
-The
-.Fn atan
-functions conforms to
-.St -isoC-99 .
diff --git a/lib/libm/man/atan2.3 b/lib/libm/man/atan2.3
deleted file mode 100644
index b69a46cd2..000000000
--- a/lib/libm/man/atan2.3
+++ /dev/null
@@ -1,196 +0,0 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     from: @(#)atan2.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: atan2.3,v 1.18 2013/04/26 18:18:22 njoly Exp $
-.\"
-.Dd January 29, 2013
-.Dt ATAN2 3
-.Os
-.Sh NAME
-.Nm atan2 ,
-.Nm atan2f ,
-.Nm atan2l
-.Nd arc tangent function of two variables
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn atan2 "double y" "double x"
-.Ft float
-.Fn atan2f "float y" "float x"
-.Ft long double
-.Fn atan2l "long double y" "long double x"
-.Sh DESCRIPTION
-The
-.Fn atan2 ,
-.Fn atan2f ,
-and
-.Fn atan2l
-functions compute the principal value of the arc tangent of
-.Ar y/ Ns Ar x ,
-using the signs of both arguments to determine the quadrant of
-the return value.
-.Sh RETURN VALUES
-The
-.Fn atan2
-function, if successful,
-returns the arc tangent of
-.Ar y/ Ns Ar x
-in the range
-.Bk -words
-.Bq \&- Ns \*(Pi , \&+ Ns \*(Pi
-.Ek
-radians.
-If both
-.Ar x
-and
-.Ar y
-are zero, the global variable
-.Va errno
-is set to
-.Er EDOM .
-On the
-.Tn VAX :
-.Bl -column atan_(y,x)_:=____  sign(y)_(Pi_atan2(Xy_xX))___
-.It Fn atan2 y x No := Ta
-.Fn atan y/x Ta
-if
-.Ar x
-\*[Gt] 0,
-.It Ta sign( Ns Ar y Ns )*(\*(Pi -
-.Fn atan "\*(Bay/x\*(Ba" ) Ta
-if
-.Ar x
-\*[Lt] 0,
-.It Ta
-.No 0 Ta
-if x = y = 0, or
-.It Ta
-.Pf sign( Ar y Ns )*\*(Pi/2 Ta
-if
-.Ar x
-= 0 \*(!=
-.Ar y .
-.El
-.Sh NOTES
-The function
-.Fn atan2
-defines "if x \*[Gt] 0,"
-.Fn atan2 0 0
-= 0 on a
-.Tn VAX
-despite that previously
-.Fn atan2 0 0
-may have generated an error message.
-The reasons for assigning a value to
-.Fn atan2 0 0
-are these:
-.Bl -enum -offset indent
-.It
-Programs that test arguments to avoid computing
-.Fn atan2 0 0
-must be indifferent to its value.
-Programs that require it to be invalid are vulnerable
-to diverse reactions to that invalidity on diverse computer systems.
-.It
-The
-.Fn atan2
-function is used mostly to convert from rectangular (x,y)
-to polar
-.if n\
-(r,theta)
-.if t\
-(r,\(*h)
-coordinates that must satisfy x =
-.if n\
-r\(**cos theta
-.if t\
-r\(**cos\(*h
-and y =
-.if n\
-r\(**sin theta.
-.if t\
-r\(**sin\(*h.
-These equations are satisfied when (x=0,y=0)
-is mapped to
-.if n \
-(r=0,theta=0)
-.if t \
-(r=0,\(*h=0)
-on a VAX.
-In general, conversions to polar coordinates should be computed thus:
-.Bd -unfilled -offset indent
-.if n \{\
-r	:= hypot(x,y);  ... := sqrt(x\(**x+y\(**y)
-theta	:= atan2(y,x).
-.\}
-.if t \{\
-r	:= hypot(x,y);  ... := \(sr(x\u\s82\s10\d+y\u\s82\s10\d)
-\(*h	:= atan2(y,x).
-.\}
-.Ed
-.It
-The foregoing formulas need not be altered to cope in a
-reasonable way with signed zeros and infinities
-on a machine that conforms to
-.Tn IEEE 754 ;
-the versions of
-.Xr hypot 3
-and
-.Fn atan2
-provided for
-such a machine are designed to handle all cases.
-That is why
-.Fn atan2 \(+-0 \-0
-= \(+-\*(Pi
-for instance.
-In general the formulas above are equivalent to these:
-.Bd -unfilled -offset indent
-.if n \
-r := sqrt(x\(**x+y\(**y); if r = 0 then x := copysign(1,x);
-.if t \
-r := \(sr(x\(**x+y\(**y);\0\0if r = 0 then x := copysign(1,x);
-.Ed
-.El
-.Sh SEE ALSO
-.Xr acos 3 ,
-.Xr asin 3 ,
-.Xr atan 3 ,
-.Xr cos 3 ,
-.Xr cosh 3 ,
-.Xr math 3 ,
-.Xr sin 3 ,
-.Xr sinh 3 ,
-.Xr tan 3 ,
-.Xr tanh 3
-.Sh STANDARDS
-The
-.Fn atan2
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libm/man/atanh.3 b/lib/libm/man/atanh.3
deleted file mode 100644
index 6179d062d..000000000
--- a/lib/libm/man/atanh.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" Copyright (c) 1985, 1991 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.
-.\"
-.\"     from: @(#)atanh.3	5.2 (Berkeley) 5/6/91
-.\"	$NetBSD: atanh.3,v 1.17 2014/09/19 16:02:58 wiz Exp $
-.\"
-.Dd January 29, 2013
-.Dt ATANH 3
-.Os
-.Sh NAME
-.Nm atanh ,
-.Nm atanhf ,
-.Nm atanhl
-.Nd inverse hyperbolic tangent function
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn atanh "double x"
-.Ft float
-.Fn atanhf "float x"
-.Ft long double
-.Fn atanhl "long double x"
-.Sh DESCRIPTION
-The
-.Fn atanh ,
-.Fn atanhf ,
-and
-.Fn atanhl
-functions compute the inverse hyperbolic tangent
-of the real
-argument
-.Ar x .
-.Sh RETURN VALUES
-If |x|\*[Ge]1,
-.Fn atanh "x" ,
-.Fn atanhf "x" ,
-and
-.Fn atanhl "x"
-.\" POSIX_MODE
-return +inf, -inf or NaN, and sets the global variable
-.Va errno
-to EDOM.
-.\" SYSV_MODE
-.\" call
-.\" .Xr matherr 3 .
-.Sh SEE ALSO
-.Xr acosh 3 ,
-.Xr asinh 3 ,
-.Xr exp 3 ,
-.Xr math 3
-.\" .Xr matherr 3
-.Sh STANDARDS
-The
-.Fn atanh
-function conforms to
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn atanh
-function appeared in
-.Bx 4.3 .
diff --git a/lib/libm/man/ceil.3 b/lib/libm/man/ceil.3
deleted file mode 100644
index d210eaad7..000000000
--- a/lib/libm/man/ceil.3
+++ /dev/null
@@ -1,83 +0,0 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     from: @(#)ceil.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: ceil.3,v 1.20 2013/11/12 00:10:29 joerg Exp $
-.\"
-.Dd November 12, 2013
-.Dt CEIL 3
-.Os
-.Sh NAME
-.Nm ceil ,
-.Nm ceilf ,
-.Nm ceill ,
-.Nm floor ,
-.Nm floorf
-.Nm floorl
-.Nd ceiling and floor
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn ceil "double x"
-.Ft float
-.Fn ceilf "float x"
-.Ft long double
-.Fn ceill "long double x"
-.Ft double
-.Fn floor "double x"
-.Ft float
-.Fn floorf "float x"
-.Ft long double
-.Fn floorl "long double x"
-.Sh DESCRIPTION
-The
-.Fn ceil ,
-.Fn ceilf ,
-and
-.Fn ceill
-functions return the smallest integral value
-greater than or equal to
-.Fa x .
-Conversely, the
-.Fn floor ,
-.Fn floorf ,
-and
-.Fn floorl
-functions return the largest integral value
-less than or equal to
-.Fa x .
-.Sh SEE ALSO
-.Xr abs 3 ,
-.Xr fabs 3 ,
-.Xr math 3 ,
-.Xr nextafter 3 ,
-.Xr rint 3
-.Sh STANDARDS
-The described functions conform to
-.St -isoC-99 .
diff --git a/lib/libm/man/copysign.3 b/lib/libm/man/copysign.3
deleted file mode 100644
index 39c7c2d68..000000000
--- a/lib/libm/man/copysign.3
+++ /dev/null
@@ -1,90 +0,0 @@
-.\" $NetBSD: copysign.3,v 1.1 2011/04/13 04:57:10 jruoho Exp $
-.\"
-.\" Copyright (c) 2011 Jukka Ruohonen <jruohonen@iki.fi>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd April 13, 2011
-.Dt COPYSIGN 3
-.Os
-.Sh NAME
-.Nm copysign ,
-.Nm copysignf ,
-.Nm copysignl
-.Nd functions to manipulate signs
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn copysign "double x" "double y"
-.Ft float
-.Fn copysignf "float x" "float y"
-.Ft long double
-.Fn copysignl "long double x" "long double y"
-.Sh DESCRIPTION
-The
-.Fn copysign ,
-.Fn copysignf ,
-and
-.Fn copysignl
-functions return a value whose absolute value matches
-.Fa x ,
-but whose sign bit is taken from
-.Fa y .
-.Sh RETURN VALUES
-Upon successful completion,
-all three functions return a value with the magnitude of
-.Fa x
-and the sign of
-.Fa y .
-If
-.Fa x
-is
-\*(Na ,
-the functions return a
-\*(Na
-with the sign of
-.Fa y .
-.Sh SEE ALSO
-.Xr math 3 ,
-.Xr signbit 3
-.Sh STANDARDS
-The described functions conform to
-.St -isoC-99 .
-.\"
-.\" XXX: Verify this.
-.\"
-.\" The functions are also recommended by
-.\" .St -ieee754
-.\"
-.\" .Sh HISTORY
-.\"
-.\" XXX: Fill this.
-.\"
-.\" These functions first appeared in ???.
-.\"
-.Sh CAVEATS
-Note that on implementations that represent a signed zero
-but do not treat negative zero consistently in arithmetic operations,
-these functions may regard the sign of zero as positive.
diff --git a/lib/libm/man/cos.3 b/lib/libm/man/cos.3
deleted file mode 100644
index e88719056..000000000
--- a/lib/libm/man/cos.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     from: @(#)cos.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: cos.3,v 1.15 2003/08/07 16:44:47 agc Exp $
-.\"
-.Dd May 2, 1991
-.Dt COS 3
-.Os
-.Sh NAME
-.Nm cos ,
-.Nm cosf
-.Nd cosine function
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn cos "double x"
-.Ft float
-.Fn cosf "float x"
-.Sh DESCRIPTION
-The
-.Fn cos
-and
-.Fn cosf
-functions compute the cosine of
-.Fa x
-(measured in radians).
-A large magnitude argument may yield a result with little or no
-significance.
-For a discussion of error due to roundoff, see
-.Xr math 3 .
-.Sh RETURN VALUES
-The
-.Fn cos
-function returns the cosine value.
-.Sh SEE ALSO
-.Xr acos 3 ,
-.Xr asin 3 ,
-.Xr atan 3 ,
-.Xr atan2 3 ,
-.Xr cosh 3 ,
-.Xr math 3 ,
-.Xr sin 3 ,
-.Xr sinh 3 ,
-.Xr tan 3 ,
-.Xr tanh 3
-.Sh STANDARDS
-The
-.Fn cos
-function conforms to
-.St -ansiC .
diff --git a/lib/libm/man/cosh.3 b/lib/libm/man/cosh.3
deleted file mode 100644
index 3e9832d16..000000000
--- a/lib/libm/man/cosh.3
+++ /dev/null
@@ -1,81 +0,0 @@
-.\" Copyright (c) 1989, 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     from: @(#)cosh.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: cosh.3,v 1.15 2003/08/07 16:44:47 agc Exp $
-.\"
-.Dd May 2, 1991
-.Dt COSH 3
-.Os
-.Sh NAME
-.Nm cosh ,
-.Nm coshf
-.Nd hyperbolic cosine function
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn cosh "double x"
-.Ft float
-.Fn coshf "float x"
-.Sh DESCRIPTION
-The
-.Fn cosh
-and
-.Fn coshf
-functions compute the hyperbolic cosine of
-.Fa x .
-.Sh RETURN VALUES
-If the magnitude of x is too large,
-.Fn cosh "x"
-and
-.Fn coshf "x"
-.\" POSIX_MODE
-return Inf and sets the global variable
-.Va errno
-to ERANGE.
-.\" SYSV_MODE
-.\" call
-.\" .Xr matherr 3 .
-.Sh SEE ALSO
-.Xr acos 3 ,
-.Xr asin 3 ,
-.Xr atan 3 ,
-.Xr atan2 3 ,
-.Xr cos 3 ,
-.Xr math 3 ,
-.Xr sin 3 ,
-.Xr sinh 3 ,
-.Xr tan 3 ,
-.Xr tanh 3
-.\" .Xr matherr 3
-.Sh STANDARDS
-The
-.Fn cosh
-function conforms to
-.St -ansiC .
diff --git a/lib/libm/man/erf.3 b/lib/libm/man/erf.3
deleted file mode 100644
index c86c77217..000000000
--- a/lib/libm/man/erf.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\" Copyright (c) 1985, 1991 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.
-.\"
-.\"     from: @(#)erf.3	6.4 (Berkeley) 4/20/91
-.\"	$NetBSD: erf.3,v 1.13 2014/11/17 16:53:23 christos Exp $
-.\"
-.Dd November 17, 2014
-.Dt ERF 3
-.Os
-.Sh NAME
-.Nm erf ,
-.Nm erff ,
-.Nm erfl ,
-.Nm erfc ,
-.Nm erfcf ,
-.Nm erfcl
-.Nd error function operators
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn erf "double x"
-.Ft float
-.Fn erff "float x"
-.Ft long double
-.Fn erff "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
-calculates the error function of x; where
-.Bd -filled -offset indent
-.if n \{\
-erf(x) = 2/sqrt(pi)\(**\|integral from 0 to x of exp(\-t\(**t) dt. \}
-.if t \{\
-erf\|(x) :=
-(2/\(sr\(*p)\|\(is\d\s8\z0\s10\u\u\s8x\s10\d\|exp(\-t\u\s82\s10\d)\|dt. \}
-.Ed
-.Pp
-The
-.Fn erfc
-function calculates the complementary error function of
-.Fa x ;
-that is
-.Fn erfc
-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
-The
-.Fn erf
-and
-.Fn erfc
-functions appeared in
-.Bx 4.3 .
diff --git a/lib/libm/man/exp.3 b/lib/libm/man/exp.3
deleted file mode 100644
index 6caa216b9..000000000
--- a/lib/libm/man/exp.3
+++ /dev/null
@@ -1,127 +0,0 @@
-.\" Copyright (c) 1985, 1991 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.
-.\"
-.\"     from: @(#)exp.3	6.12 (Berkeley) 7/31/91
-.\" $FreeBSD: src/lib/msun/man/exp.3,v 1.24 2008/01/18 21:43:00 das Exp $
-.\"	$NetBSD: exp.3,v 1.29 2012/11/06 21:43:37 dholland Exp $
-.\"
-.Dd September 13, 2011
-.Dt EXP 3
-.Os
-.Sh NAME
-.Nm exp ,
-.Nm expf ,
-.\" The sorting error is intentional.  exp and expf should be adjacent.
-.Nm exp2 ,
-.Nm exp2f ,
-.\" .Nm exp2l ,
-.Nm expm1 ,
-.Nm expm1f ,
-.Nd exponential functions
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn exp "double x"
-.Ft float
-.Fn expf "float x"
-.Ft double
-.Fn exp2 "double x"
-.Ft float
-.Fn exp2f "float x"
-.\" .Ft long double
-.\" .Fn exp2l "long double x"
-.Ft double
-.Fn expm1 "double x"
-.Ft float
-.Fn expm1f "float x"
-.Sh DESCRIPTION
-The
-.Fn exp
-and
-.Fn expf
-functions compute the base
-.Ms e
-exponential value of the given argument
-.Fa x .
-.Pp
-The
-.Fn exp2
-and
-.Fn exp2f
-.\" .Fn exp2f ,
-.\" and
-.\" .Fn exp2l
-functions compute the base 2 exponential of the given argument
-.Fa x .
-.Pp
-The
-.Fn expm1
-and
-.Fn expm1f
-functions compute the value exp(x)\-1 accurately even for tiny argument
-.Fa x .
-.Sh RETURN VALUES
-These functions will return the appropriate computation unless an error
-occurs or an argument is out of range.
-The functions
-.Fn exp
-and
-.Fn expm1
-detect if the computed value will overflow,
-set the global variable
-.Va errno
-to
-.Er ERANGE
-and cause a reserved operand fault on a
-.Tn VAX .
-.Sh SEE ALSO
-.Xr math 3
-.Sh STANDARDS
-The
-.Fn exp
-functions conform to
-.St -ansiC .
-The
-.Fn exp2 ,
-.Fn exp2f ,
-.Fn expf ,
-.Fn expm1 ,
-and
-.Fn expm1f
-functions conform to
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn exp
-functions appeared in
-.At v6 .
-The
-.Fn expm1
-function appeared in
-.Bx 4.3 .
diff --git a/lib/libm/man/fabs.3 b/lib/libm/man/fabs.3
deleted file mode 100644
index 4590ef7b6..000000000
--- a/lib/libm/man/fabs.3
+++ /dev/null
@@ -1,68 +0,0 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     from: @(#)fabs.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: fabs.3,v 1.15 2011/09/13 07:11:43 njoly Exp $
-.\"
-.Dd May 2, 1991
-.Dt FABS 3
-.Os
-.Sh NAME
-.Nm fabs ,
-.Nm fabsf
-.Nd floating-point absolute value function
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn fabs "double x"
-.Ft float
-.Fn fabsf "float x"
-.Sh DESCRIPTION
-The
-.Fn fabs
-and
-.Fn fabsf
-functions compute the absolute value of a floating-point number
-.Fa x .
-.Sh RETURN VALUES
-The
-.Fn fabs
-function returns the absolute value of
-.Fa x .
-.Sh SEE ALSO
-.Xr abs 3 ,
-.Xr ceil 3 ,
-.Xr floor 3 ,
-.Xr math 3 ,
-.Xr rint 3
-.Sh STANDARDS
-The
-.Fn fabs
-function conforms to
-.St -ansiC .
diff --git a/lib/libm/man/fdim.3 b/lib/libm/man/fdim.3
deleted file mode 100644
index f80318163..000000000
--- a/lib/libm/man/fdim.3
+++ /dev/null
@@ -1,89 +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: src/lib/msun/man/fdim.3,v 1.1 2004/06/30 07:04:01 das Exp $
-.\" $NetBSD$
-.\"
-.Dd June 29, 2004
-.Dt FDIM 3
-.Os
-.Sh NAME
-.Nm fdim ,
-.Nm fdimf ,
-.Nm fdiml
-.Nd positive difference functions
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn fdim "double x" "double y"
-.Ft float
-.Fn fdimf "float x" "float y"
-.Ft long double
-.Fn fdiml "long double x" "long double y"
-.Sh DESCRIPTION
-The
-.Fn fdim ,
-.Fn fdimf ,
-and
-.Fn fdiml
-functions return the positive difference between
-.Fa x
-and
-.Fa y .
-That is, if
-.Fa x\- Ns Fa y
-is positive, then
-.Fa x\- Ns Fa y
-is returned.
-If either
-.Fa x
-or
-.Fa y
-is an \*(Na, then an \*(Na is returned.
-Otherwise, the result is
-.Li +0.0 .
-.Pp
-Overflow or underflow may occur iff the exact result is not
-representable in the return type.
-No other exceptions are raised.
-.Sh SEE ALSO
-.Xr fabs 3 ,
-.Xr fmax 3 ,
-.Xr fmin 3 ,
-.Xr math 3
-.Sh STANDARDS
-The
-.Fn fdim ,
-.Fn fdimf ,
-and
-.Fn fdiml
-functions conform to
-.St -isoC-99 .
-.Sh HISTORY
-These routines first appeared in
-.Fx 5.3
-and
-.Nx 5.1 .
diff --git a/lib/libm/man/feclearexcept.3 b/lib/libm/man/feclearexcept.3
deleted file mode 100644
index 5e2a60416..000000000
--- a/lib/libm/man/feclearexcept.3
+++ /dev/null
@@ -1,139 +0,0 @@
-.\"	$NetBSD: feclearexcept.3,v 1.2 2010/08/07 18:13:12 wiz Exp $
-.\" 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.
-.\"
-.Dd May 8, 2004
-.Dt FECLEAREXCEPT 3
-.Os
-.Sh NAME
-.Nm feclearexcept ,
-.Nm fegetexceptflag ,
-.Nm feraiseexcept ,
-.Nm fesetexceptflag ,
-.Nm fetestexcept
-.Nd floating-point exception flag manipulation
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In fenv.h
-.Fd "#pragma STDC FENV_ACCESS ON"
-.Ft int
-.Fn feclearexcept "int excepts"
-.Ft int
-.Fn fegetexceptflag "fexcept_t *flagp" "int excepts"
-.Ft int
-.Fn feraiseexcept "int excepts"
-.Ft int
-.Fn fesetexceptflag "const fexcept_t *flagp" "int excepts"
-.Ft int
-.Fn fetestexcept "int excepts"
-.Sh DESCRIPTION
-The
-.Fn feclearexcept
-routine clears the floating-point exception flags specified by
-.Fa excepts ,
-whereas
-.Fn feraiseexcept
-raises the specified exceptions.
-Raising an exception causes the corresponding flag to be set,
-and a
-.Dv SIGFPE
-is delivered to the process if the exception is unmasked.
-.Pp
-The
-.Fn fetestexcept
-function determines which flags are currently set, of those specified by
-.Fa excepts .
-.Pp
-The
-.Fn fegetexceptflag
-function stores the state of the exception flags specified in
-.Fa excepts
-in the opaque object pointed to by
-.Fa flagp .
-Similarly,
-.Fn fesetexceptflag
-changes the specified exception flags to reflect the state stored in
-the object pointed to by
-.Fa flagp .
-Note that the flags restored with
-.Fn fesetexceptflag
-must be a (not necessarily proper) subset of the flags recorded by
-a prior call to
-.Fn fegetexceptflag .
-.Pp
-For all of these functions, the possible types of exceptions
-include those described in
-.Xr fenv 3 .
-Some architectures may define other types of floating-point exceptions.
-.Sh IMPLEMENTATION NOTES
-On some architectures, raising an overflow or underflow exception
-also causes an inexact exception to be raised.
-In these cases, the overflow or underflow will be raised first.
-.Pp
-The
-.Fn fegetexceptflag
-and
-.Fn fesetexceptflag
-routines are preferred to
-.Fn fetestexcept
-and
-.Fn feraiseexcept ,
-respectively, for saving and restoring exception flags.
-The latter do not re-raise exceptions and may preserve
-architecture-specific information such as addresses where
-exceptions occurred.
-.Sh RETURN VALUES
-The
-.Fn feclearexcept ,
-.Fn fegetexceptflag ,
-.Fn feraiseexcept ,
-and
-.Fn fesetexceptflag
-functions return 0 upon success, and non-zero otherwise.
-The
-.Fn fetestexcept
-function returns the bitwise OR of the values of the current exception
-flags that were requested.
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr feholdexcept 3 ,
-.Xr fenv 3 ,
-.Xr feupdateenv 3 ,
-.Xr fpgetsticky 3
-.Sh STANDARDS
-The
-.Fn feclearexcept ,
-.Fn fegetexceptflag ,
-.Fn feraiseexcept ,
-.Fn fesetexceptflag ,
-and
-.Fn fetestexcept
-routines conform to
-.St -isoC-99 .
-.Sh HISTORY
-These functions first appeared in
-.Fx 5.3
-and
-.Nx 6.0 .
diff --git a/lib/libm/man/feenableexcept.3 b/lib/libm/man/feenableexcept.3
deleted file mode 100644
index 06bb28b29..000000000
--- a/lib/libm/man/feenableexcept.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\"	$NetBSD: feenableexcept.3,v 1.1 2010/07/31 21:47:53 joerg Exp $
-.\" 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.
-.\"
-.Dd March 16, 2005
-.Dt FEENABLEEXCEPT 3
-.Os
-.Sh NAME
-.Nm feenableexcept ,
-.Nm fedisableexcept ,
-.Nm fegetexcept
-.Nd floating-point exception masking
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In fenv.h
-.Fd "#pragma STDC FENV_ACCESS ON"
-.Ft int
-.Fn feenableexcept "int excepts"
-.Ft int
-.Fn fedisableexcept "int excepts"
-.Ft int
-.Fn fegetexcept "void"
-.Sh DESCRIPTION
-The
-.Fn feenableexcept
-and
-.Fn fedisableexcept
-functions
-unmask and mask (respectively) exceptions specified in
-.Fa excepts .
-The
-.Fn fegetexcept
-function
-returns the current exception mask.
-All exceptions are masked by default.
-.Pp
-Floating-point operations that produce unmasked exceptions will trap, and a
-.Dv SIGFPE
-will be delivered to the process.
-By installing a signal handler for
-.Dv SIGFPE ,
-applications can take appropriate action immediately without
-testing the exception flags after every operation.
-Note that the trap may not be immediate, but it should occur
-before the next floating-point instruction is executed.
-.Pp
-For all of these functions, the possible types of exceptions
-include those described in
-.Xr fenv 3 .
-Some architectures may define other types of floating-point exceptions.
-.Sh RETURN VALUES
-The
-.Fn feenableexcept ,
-.Fn fedisableexcept ,
-and
-.Fn fegetexcept
-functions return a bitmap of the exceptions that were unmasked
-prior to the call.
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr feclearexcept 3 ,
-.Xr feholdexcept 3 ,
-.Xr fenv 3 ,
-.Xr feupdateenv 3
-.Sh BUGS
-Functions in the standard library may trigger exceptions multiple
-times as a result of intermediate computations;
-however, they generally do not trigger spurious exceptions.
-.Pp
-No interface is provided to permit exceptions to be handled in
-nontrivial ways.
-There is no uniform way for an exception handler to access
-information about the exception-causing instruction, or
-to determine whether that instruction should be reexecuted
-after returning from the handler.
diff --git a/lib/libm/man/fegetenv.3 b/lib/libm/man/fegetenv.3
deleted file mode 100644
index c163b72cd..000000000
--- a/lib/libm/man/fegetenv.3
+++ /dev/null
@@ -1,114 +0,0 @@
-.\"	$NetBSD: fegetenv.3,v 1.2 2010/08/04 18:58:18 wiz Exp $
-.\" 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.
-.\"
-.Dd May 8, 2004
-.Dt FEGETENV 3
-.Os
-.Sh NAME
-.Nm fegetenv ,
-.Nm feholdexcept ,
-.Nm fesetenv ,
-.Nm feupdateenv
-.Nd floating-point environment save and restore
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In fenv.h
-.Fd "#pragma STDC FENV_ACCESS ON"
-.Ft int
-.Fn fegetenv "fenv_t *envp"
-.Ft int
-.Fn feholdexcept "fenv_t *envp"
-.Ft int
-.Fn fesetenv "const fenv_t *envp"
-.Ft int
-.Fn feupdateenv "const fenv_t *envp"
-.Sh DESCRIPTION
-The floating-point environment includes exception flags and masks, the
-current rounding mode, and other architecture-specific settings.
-However, it does not include the floating-point register file.
-.Pp
-The
-.Fn fegetenv
-function stores the current floating-point environment in the object
-pointed to by
-.Fa envp ,
-whereas
-.Fn feholdexcept
-saves the current environment, then clears all exception flags
-and masks all floating-point exceptions.
-.Pp
-The
-.Fn fesetenv
-function restores a previously saved environment.
-The
-.Fn feupdateenv
-function restores a saved environment as well, but it also
-raises any exceptions that were set in the environment it
-replaces.
-.Pp
-The
-.Fn feholdexcept
-function is often used with
-.Fn feupdateenv
-or
-.Fn fesetenv
-to suppress spurious exceptions that occur as a result of
-intermediate computations.
-An example in
-.Xr fenv 3
-demonstrates how to do this.
-.Sh RETURN VALUES
-The
-.Fn fegetenv ,
-.Fn feholdexcept ,
-.Fn fesetenv ,
-and
-.Fn feupdateenv
-functions return 0 if they succeed, and non-zero otherwise.
-.Sh SEE ALSO
-.Xr feclearexcept 3 ,
-.Xr fenv 3 ,
-.Xr feraiseexcept 3 ,
-.Xr fesetenv 3 ,
-.Xr fetestexcept 3 ,
-.Xr fpgetmask 3 ,
-.\"Xr fpgetprec 3 ,
-.Xr fpsetmask 3
-.\"Xr fpsetprec 3
-.Sh STANDARDS
-The
-.Fn fegetenv ,
-.Fn feholdexcept ,
-.Fn fesetenv ,
-and
-.Fn feupdateenv
-functions conform to
-.St -isoC-99 .
-.Sh HISTORY
-These routines first appeared in
-.Fx 5.3
-and
-.Nx 6.0 .
diff --git a/lib/libm/man/fegetround.3 b/lib/libm/man/fegetround.3
deleted file mode 100644
index 6fd9d779f..000000000
--- a/lib/libm/man/fegetround.3
+++ /dev/null
@@ -1,84 +0,0 @@
-.\"	$NetBSD: fegetround.3,v 1.1 2010/07/31 21:47:53 joerg Exp $
-.\" 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.
-.\"
-.Dd May 8, 2004
-.Dt FEGETROUND 3
-.Os
-.Sh NAME
-.Nm fegetround ,
-.Nm fesetround
-.Nd floating-point rounding control
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In fenv.h
-.Fd "#pragma STDC FENV_ACCESS ON"
-.Ft int
-.Fn fegetround void
-.Ft int
-.Fn fesetround "int round"
-.Sh DESCRIPTION
-The
-.Fn fegetround
-function determines the current floating-point rounding mode,
-and the
-.Fn fesetround
-function sets the current rounding mode to
-.Fa round .
-The rounding mode is one of
-.Dv FE_TONEAREST , FE_DOWNWARD , FE_UPWARD ,
-or
-.Dv FE_TOWARDZERO ,
-as described in
-.Xr fenv 3 .
-.Sh RETURN VALUES
-The
-.Fn fegetround
-routine returns the current rounding mode.
-The
-.Fn fesetround
-function returns 0 on success and non-zero otherwise;
-however, the present implementation always succeeds.
-.Sh SEE ALSO
-.Xr fenv 3 ,
-.Xr fpgetround 3 ,
-.Xr fpsetround 3
-.Sh STANDARDS
-The
-.Fn fegetround
-and
-.Fn fesetround
-functions conform to
-.St -isoC-99 .
-.Sh HISTORY
-These routines first appeared in
-.Fx 5.3
-and
-.Nx 6.0 .
-They supersede the non-standard
-.Xr fpgetround 3
-and
-.Xr fpsetround 3
-functions.
diff --git a/lib/libm/man/fenv.3 b/lib/libm/man/fenv.3
deleted file mode 100644
index c77a9f9c4..000000000
--- a/lib/libm/man/fenv.3
+++ /dev/null
@@ -1,283 +0,0 @@
-.\"	$NetBSD: fenv.3,v 1.2 2010/08/04 18:58:28 wiz Exp $
-.\" 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.
-.\"
-.Dd March 16, 2005
-.Dt FENV 3
-.Os
-.Sh NAME
-.Nm feclearexcept ,
-.Nm fegetexceptflag ,
-.Nm feraiseexcept ,
-.Nm fesetexceptflag ,
-.Nm fetestexcept ,
-.Nm fegetround ,
-.Nm fesetround ,
-.Nm fegetenv ,
-.Nm feholdexcept ,
-.Nm fesetenv ,
-.Nm feupdateenv ,
-.Nm feenableexcept ,
-.Nm fedisableexcept ,
-.Nm fegetexcept
-.Nd floating-point environment control
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In fenv.h
-.Fd "#pragma STDC FENV_ACCESS ON"
-.Ft int
-.Fn feclearexcept "int excepts"
-.Ft int
-.Fn fegetexceptflag "fexcept_t *flagp" "int excepts"
-.Ft int
-.Fn feraiseexcept "int excepts"
-.Ft int
-.Fn fesetexceptflag "const fexcept_t *flagp" "int excepts"
-.Ft int
-.Fn fetestexcept "int excepts"
-.Ft int
-.Fn fegetround void
-.Ft int
-.Fn fesetround "int round"
-.Ft int
-.Fn fegetenv "fenv_t *envp"
-.Ft int
-.Fn feholdexcept "fenv_t *envp"
-.Ft int
-.Fn fesetenv "const fenv_t *envp"
-.Ft int
-.Fn feupdateenv "const fenv_t *envp"
-.Ft int
-.Fn feenableexcept "int excepts"
-.Ft int
-.Fn fedisableexcept "int excepts"
-.Ft int
-.Fn fegetexcept void
-.Sh DESCRIPTION
-The
-.In fenv.h
-routines manipulate the floating-point environment,
-which includes the exception flags and rounding modes defined in
-.St -ieee754 .
-.Ss Exceptions
-Exception flags are set as side-effects of floating-point arithmetic
-operations and math library routines, and they remain set until
-explicitly cleared.
-The following macros expand to bit flags of type
-.Vt int
-representing the five standard floating-point exceptions.
-.Bl -tag -width ".Dv FE_DIVBYZERO"
-.It Dv FE_DIVBYZERO
-A divide-by-zero exception occurs when the program attempts to
-divide a finite non-zero number by zero.
-.It Dv FE_INEXACT
-An inexact exception is raised whenever there is a loss of precision
-due to rounding.
-.It Dv FE_INVALID
-Invalid operation exceptions occur when a program attempts to
-perform calculations for which there is no reasonable representable
-answer.
-For instance, subtraction of infinities, division of zero by zero,
-ordered comparison involving \*(Nas, and taking the square root of a
-negative number are all invalid operations.
-.It Dv FE_OVERFLOW
-An overflow exception occurs when the magnitude of the result of a
-computation is too large to fit in the destination type.
-.It Dv FE_UNDERFLOW
-Underflow occurs when the result of a computation is too close to zero
-to be represented as a non-zero value in the destination type.
-.El
-.Pp
-Additionally, the
-.Dv FE_ALL_EXCEPT
-macro expands to the bitwise OR of the above flags and any
-architecture-specific flags.
-Combinations of these flags are passed to the
-.Fn feclearexcept ,
-.Fn fegetexceptflag ,
-.Fn feraiseexcept ,
-.Fn fesetexceptflag ,
-and
-.Fn fetestexcept
-functions to clear, save, raise, restore, and examine the
-processor's floating-point exception flags, respectively.
-.Pp
-Exceptions may be
-.Em unmasked
-with
-.Fn feenableexcept
-and masked with
-.Fn fedisableexcept .
-Unmasked exceptions cause a trap when they are produced, and
-all exceptions are masked by default.
-The current mask can be tested with
-.Fn fegetexcept .
-.Ss Rounding Modes
-.St -ieee754
-specifies four rounding modes.
-These modes control the direction in which results are rounded
-from their exact values in order to fit them into binary
-floating-point variables.
-The four modes correspond with the following symbolic constants.
-.Bl -tag -width ".Dv FE_TOWARDZERO"
-.It Dv FE_TONEAREST
-Results are rounded to the closest representable value.
-If the exact result is exactly half way between two representable
-values, the value whose last binary digit is even (zero) is chosen.
-This is the default mode.
-.It Dv FE_DOWNWARD
-Results are rounded towards negative \*[If].
-.It Dv FE_UPWARD
-Results are rounded towards positive \*[If].
-.It Dv FE_TOWARDZERO
-Results are rounded towards zero.
-.El
-.Pp
-The
-.Fn fegetround
-and
-.Fn fesetround
-functions query and set the rounding mode.
-.Ss Environment Control
-The
-.Fn fegetenv
-and
-.Fn fesetenv
-functions save and restore the floating-point environment,
-which includes exception flags, the current exception mask,
-the rounding mode, and possibly other implementation-specific
-state.
-The
-.Fn feholdexcept
-function behaves like
-.Fn fegetenv ,
-but with the additional effect of clearing the exception flags and
-installing a
-.Em non-stop
-mode.
-In non-stop mode, floating-point operations will set exception flags
-as usual, but no
-.Dv SIGFPE
-signals will be generated as a result.
-Non-stop mode is the default, but it may be altered by
-non-standard mechanisms.
-.\" XXX Mention fe[gs]etmask() here after the interface is finalized
-.\" XXX and ready to be officially documented.
-The
-.Fn feupdateenv
-function restores a saved environment similarly to
-.Fn fesetenv ,
-but it also re-raises any floating-point exceptions from the old
-environment.
-.Pp
-The macro
-.Dv FE_DFL_ENV
-expands to a pointer to the default environment.
-.Sh EXAMPLES
-The following routine computes the square root function.
-It explicitly raises an invalid exception on appropriate inputs using
-.Fn feraiseexcept .
-It also defers inexact exceptions while it computes intermediate
-values, and then it allows an inexact exception to be raised only if
-the final answer is inexact.
-.Bd -literal -offset indent
-#pragma STDC FENV_ACCESS ON
-double sqrt(double n) {
-	double x = 1.0;
-	fenv_t env;
-
-	if (isnan(n) || n \*[Lt] 0.0) {
-		feraiseexcept(FE_INVALID);
-		return (NAN);
-	}
-	if (isinf(n) || n == 0.0)
-		return (n);
-	feholdexcept(\*[Am]env);
-	while (fabs((x * x) - n) \*[Gt] DBL_EPSILON * 2 * x)
-		x = (x / 2) + (n / (2 * x));
-	if (x * x == n)
-		feclearexcept(FE_INEXACT);
-	feupdateenv(\*[Am]env);
-	return (x);
-}
-.Ed
-.Sh SEE ALSO
-.Xr c99 1 ,
-.Xr feclearexcept 3 ,
-.Xr fedisableexcept 3 ,
-.Xr feenableexcept 3 ,
-.Xr fegetenv 3 ,
-.Xr fegetexcept 3 ,
-.Xr fegetexceptflag 3 ,
-.Xr fegetround 3 ,
-.Xr feholdexcept 3 ,
-.Xr feraiseexcept 3 ,
-.Xr fesetenv 3 ,
-.Xr fesetexceptflag 3 ,
-.Xr fesetround 3 ,
-.Xr fetestexcept 3 ,
-.Xr feupdateenv 3
-.\"Xr fpgetprec 3 ,
-.\"Xr fpsetprec 3
-.Sh STANDARDS
-Except as noted below,
-.In fenv.h
-conforms to
-.St -isoC-99 .
-The
-.Fn feenableexcept ,
-.Fn fedisableexcept ,
-and
-.Fn fegetexcept
-routines are extensions.
-.Sh HISTORY
-The
-.In fenv.h
-header first appeared in
-.Fx 5.3
-and
-.Nx 6.0 .
-It supersedes the non-standard routines defined in
-.In ieeefp.h
-and documented in
-.Xr fpgetround 3 .
-.Sh CAVEATS
-The FENV_ACCESS pragma can be enabled with
-.Dl "#pragma STDC FENV_ACCESS ON"
-and disabled with the
-.Dl "#pragma STDC FENV_ACCESS OFF"
-directive.
-This lexically-scoped annotation tells the compiler that the program
-may access the floating-point environment, so optimizations that would
-violate strict IEEE-754 semantics are disabled.
-If execution reaches a block of code for which
-.Dv FENV_ACCESS
-is off, the floating-point environment will become undefined.
-.Sh BUGS
-The
-.Dv FENV_ACCESS
-pragma is unimplemented in the system compiler.
-However, non-constant expressions generally produce the correct
-side-effects at low optimization levels.
diff --git a/lib/libm/man/finite.3 b/lib/libm/man/finite.3
deleted file mode 100644
index 6b122374f..000000000
--- a/lib/libm/man/finite.3
+++ /dev/null
@@ -1,82 +0,0 @@
-.\" Copyright (c) 1985, 1991 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.
-.\"
-.\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\"	$NetBSD: finite.3,v 1.2 2011/08/06 11:09:22 wiz Exp $
-.\"
-.Dd July 28, 2011
-.Dt FINITE 3
-.Os
-.Sh NAME
-.Nm finite ,
-.Nm finitef
-.Nd tests for finite values
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft int
-.Fn finite "double x"
-.Ft int
-.Fn finitef "float x"
-.Sh DESCRIPTION
-The
-.Fn finite
-function returns the value 1 when
-.Bd -ragged -offset indent
-\-\*(If \*(Lt
-.Fa x
-\*(Lt +\*(If.
-.Ed
-.Pp
-Otherwise a zero is returned
-(that is,
-.Pf \*(Ba Ns Fa x Ns \*(Ba
-= \*(If or
-.Fa x
-is \*(Na).
-.Sh SEE ALSO
-.Xr isfinite 3 ,
-.Xr math 3
-.Sh STANDARDS
-The described functions conform to
-.St -ieee754 .
-Note that unlike
-.Xr isfinite 3 ,
-neither function is present in the
-.Dv ISO
-C-language standards or in the
-.Dv IEEE
-.Dv POSIX
-standards.
-.Sh HISTORY
-The
-.Nm finite
-and
-.Fn finitef
-functions first appeared in
-.Bx 4.3 .
diff --git a/lib/libm/man/fmax.3 b/lib/libm/man/fmax.3
deleted file mode 100644
index 1124d624e..000000000
--- a/lib/libm/man/fmax.3
+++ /dev/null
@@ -1,100 +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: src/lib/msun/man/fmax.3,v 1.2 2005/01/14 09:12:05 ru Exp $
-.\" $NetBSD$
-.\"
-.Dd June 29, 2004
-.Dt FMAX 3
-.Os
-.Sh NAME
-.Nm fmax ,
-.Nm fmaxf ,
-.Nm fmaxl ,
-.Nm fmin ,
-.Nm fminf ,
-.Nm fminl
-.Nd floating-point maximum and minimum functions
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn fmax "double x" "double y"
-.Ft float
-.Fn fmaxf "float x" "float y"
-.Ft "long double"
-.Fn fmaxl "long double x" "long double y"
-.Ft double
-.Fn fmin "double x" "double y"
-.Ft float
-.Fn fminf "float x" "float y"
-.Ft "long double"
-.Fn fminl "long double x" "long double y"
-.Sh DESCRIPTION
-The
-.Fn fmax ,
-.Fn fmaxf ,
-and
-.Fn fmaxl
-functions return the larger of
-.Fa x
-and
-.Fa y ,
-and likewise, the
-.Fn fmin ,
-.Fn fminf ,
-and
-.Fn fminl
-functions return the smaller of
-.Fa x
-and
-.Fa y .
-They treat
-.Li +0.0
-as being larger than
-.Li -0.0 .
-If one argument is an \*(Na, then the other argument is returned.
-If both arguments are \*(Nas, then the result is an \*(Na.
-These routines do not raise any floating-point exceptions.
-.Sh SEE ALSO
-.Xr fabs 3 ,
-.Xr fdim 3 ,
-.Xr math 3
-.Sh STANDARDS
-The
-.Fn fmax ,
-.Fn fmaxf ,
-.Fn fmaxl ,
-.Fn fmin ,
-.Fn fminf ,
-and
-.Fn fminl
-functions conform to
-.St -isoC-99 .
-.Sh HISTORY
-These routines first appeared in
-.Fx 5.3
-and
-.Nx 5.1 .
diff --git a/lib/libm/man/fmod.3 b/lib/libm/man/fmod.3
deleted file mode 100644
index ba2aeeec5..000000000
--- a/lib/libm/man/fmod.3
+++ /dev/null
@@ -1,83 +0,0 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     from: @(#)fmod.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: fmod.3,v 1.12 2013/11/12 16:48:39 joerg Exp $
-.\"
-.Dd November 12, 2013
-.Dt FMOD 3
-.Os
-.Sh NAME
-.Nm fmod ,
-.Nm fmodf ,
-.Nm fmodl
-.Nd floating-point remainder function
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn fmod "double x" "double y"
-.Ft float
-.Fn fmodf "float x" "float y"
-.Ft long double
-.Fn fmodl "long double x" "long double y"
-.Sh DESCRIPTION
-The
-.Fn fmod
-function computes the floating-point remainder of
-.Fa x Ns / Fa y .
-.Sh RETURN VALUES
-The
-.Fn fmod ,
-.Fn fmodf ,
-and
-.Fn fmodl
-functions return the value
-.Sm off
-.Fa x - Em i * Fa y ,
-.Sm on
-for some integer
-.Em i
-such that, if
-.Fa y
-is non-zero, the result has the same sign as
-.Fa x
-and magnitude less than the magnitude of
-.Fa y .
-If
-.Fa y
-is zero, whether a domain error occurs or the
-.Fn fmod
-function returns zero is implementation-defined.
-.Sh SEE ALSO
-.Xr math 3
-.Sh STANDARDS
-The
-.Fn fmod
-function conforms to
-.St -ansiC .
diff --git a/lib/libm/man/frexp.3 b/lib/libm/man/frexp.3
deleted file mode 100644
index d9a6cda20..000000000
--- a/lib/libm/man/frexp.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\"	$NetBSD: frexp.3,v 1.4 2015/09/10 12:30:08 wiz Exp $
-.\"
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)frexp.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd September 10, 2015
-.Dt FREXP 3
-.Os
-.Sh NAME
-.Nm frexp
-.Nd convert floating-point number to fractional and integral components
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn frexp "double value" "int *exp"
-.Ft float
-.Fn frexpf "float value" "int *exp"
-.Ft long double
-.Fn frexpl "long double value" "int *exp"
-.Sh DESCRIPTION
-The
-.Fn frexp
-function breaks a floating-point number into a normalized
-fraction and an integral power of 2.
-It stores the integer in the
-.Em int
-object pointed to by
-.Fa exp .
-.Sh RETURN VALUES
-The
-.Fn frexp
-function returns the value
-.Em x ,
-such that
-.Em x
-is a
-.Em double
-with magnitude in the interval [1/2, 1) or zero, and
-.Fa value
-equals
-.Em x
-times 2 raised to the power
-.Fa *exp .
-If
-.Fa value
-is zero, both parts of the result are zero.
-.Sh SEE ALSO
-.Xr ldexp 3 ,
-.Xr math 3 ,
-.Xr modf 3
-.Sh STANDARDS
-The
-.Fn frexp
-function conforms to
-.St -ansiC .
diff --git a/lib/libm/man/hypot.3 b/lib/libm/man/hypot.3
deleted file mode 100644
index 67d650ae1..000000000
--- a/lib/libm/man/hypot.3
+++ /dev/null
@@ -1,124 +0,0 @@
-.\" Copyright (c) 1985, 1991 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.
-.\"
-.\"     from: @(#)hypot.3	6.7 (Berkeley) 5/6/91
-.\"	$NetBSD: hypot.3,v 1.17 2007/02/22 22:08:20 drochner Exp $
-.\"
-.Dd February 12, 2007
-.Dt HYPOT 3
-.Os
-.Sh NAME
-.Nm hypot ,
-.Nm hypotf
-.Nd Euclidean distance and complex absolute value functions
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn hypot "double x" "double y"
-.Ft float
-.Fn hypotf "float x" "float y"
-.Sh DESCRIPTION
-The
-.Fn hypot
-functions
-compute the
-sqrt(x*x+y*y)
-in such a way that underflow will not happen, and overflow
-occurs only if the final result deserves it.
-.Pp
-.Fn hypot "\*(If" "v"
-=
-.Fn hypot "v" "\*(If"
-= +\*(If for all
-.Ar v ,
-including \*(Na.
-.Sh ERRORS
-Below 0.97
-.Em ulps .
-Consequently
-.Fn hypot "5.0" "12.0"
-= 13.0
-exactly;
-in general, hypot returns an integer whenever an
-integer might be expected.
-.Pp
-The same cannot be said for the shorter and faster version of hypot
-that is provided in the comments in cabs.c; its error can
-exceed 1.2
-.Em ulps .
-.Sh NOTES
-As might be expected,
-.Fn hypot "v" "\*(Na"
-and
-.Fn hypot "\*(Na" "v"
-are \*(Na for all
-.Em finite
-.Ar v ;
-with "reserved operand" in place of "\*(Na", the
-same is true on a
-.Tn VAX .
-But programmers on machines other than a
-.Tn VAX
-(it has no \*(If)
-might be surprised at first to discover that
-.Fn hypot "\(+-\*(If" "\*(Na"
-= +\*(If.
-This is intentional; it happens because
-.Fn hypot "\*(If" "v"
-= +\*(If
-for
-.Em all
-.Ar v ,
-finite or infinite.
-Hence
-.Fn hypot "\*(If" "v"
-is independent of
-.Ar v .
-Unlike the reserved operand fault on a
-.Tn VAX ,
-the
-.Tn IEEE
-\*(Na is designed to
-disappear when it turns out to be irrelevant, as it does in
-.Fn hypot "\*(If" "\*(Na" .
-.Sh SEE ALSO
-.Xr math 3 ,
-.Xr sqrt 3
-.Sh HISTORY
-Both a
-.Fn hypot
-function and a
-.Fn cabs
-function
-appeared in
-.At v7 .
-.Fn cabs
-was removed from public namespace in
-.Nx 5.0
-to avoid conflicts with the complex function in C99.
diff --git a/lib/libm/man/ieee_test.3 b/lib/libm/man/ieee_test.3
deleted file mode 100644
index 0dbe2cbc5..000000000
--- a/lib/libm/man/ieee_test.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\" Copyright (c) 1985, 1991 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.
-.\"
-.\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\"	$NetBSD: ieee_test.3,v 1.12 2011/09/13 07:11:43 njoly Exp $
-.\"
-.Dd August 3, 2011
-.Dt IEEE_TEST 3
-.Os
-.Sh NAME
-.Nm logb ,
-.Nm logbf ,
-.Nm logbl ,
-.Nm scalb ,
-.Nm scalbf ,
-.Nm significand ,
-.Nm significandf
-.Nd IEEE test functions
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn logb "double x"
-.Ft float
-.Fn logbf "float x"
-.Ft long double
-.Fn logbl "long double x"
-.Ft double
-.Fn scalb "double x" "double n"
-.Ft float
-.Fn scalbf "float x" "float n"
-.Ft double
-.Fn significand "double x"
-.Ft float
-.Fn significandf "float x"
-.Sh DESCRIPTION
-These functions allow users to test conformance to
-.St -ieee754 .
-Their use is not otherwise recommended.
-.Pp
-.Fn logb x
-returns
-.Fa x Ns 's exponent
-.Fa n ,
-a signed integer converted to double\-precision floating\-point.
-.Fn logb \*(Pm\*(If
-= +\*(If;
-.Fn logb 0
-= -\*(If with a division by zero exception.
-.Pp
-.Fn scalbn x n
-returns
-.Fa x Ns \(**(2** Ns Fa n )
-computed by exponent manipulation.
-.Pp
-.Fn significand x
-returns
-.Fa sig ,
-where
-.Fa x
-:=
-.Fa sig No \(** 2** Ns Fa n
-with 1 \*[Le]
-.Fa sig
-\*[Lt] 2.
-.Fn significand x
-is not defined when
-.Fa x
-is 0, \*(Pm\*(If, or \*(Na.
-.Sh SEE ALSO
-.Xr math 3
-.Sh STANDARDS
-.St -ieee754
diff --git a/lib/libm/man/ilogb.3 b/lib/libm/man/ilogb.3
deleted file mode 100644
index 1f766abac..000000000
--- a/lib/libm/man/ilogb.3
+++ /dev/null
@@ -1,111 +0,0 @@
-.\" $NetBSD: ilogb.3,v 1.3 2011/08/02 10:15:03 wiz Exp $
-.\"
-.\" Copyright (c) 2011 Jukka Ruohonen <jruohonen@iki.fi>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd July 29, 2011
-.Dt ILOGB 3
-.Os
-.Sh NAME
-.Nm ilogb ,
-.Nm ilogbf ,
-.Nm ilogbl
-.Nd an unbiased exponent
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft int
-.Fn ilogb "double x"
-.Ft int
-.Fn ilogbf "float x"
-.Ft int
-.Fn ilogbl "long double x"
-.Sh DESCRIPTION
-The
-.Fn ilogb ,
-.Fn ilogbf ,
-and
-.Fn ilogbl
-functions return the exponent of the non-zero real floating-point number
-.Fa x
-as a signed integer value.
-Formally the return value is the integral part of
-.Bd -ragged -offset indent
-log_r |
-.Va x | ,
-.Ed
-.Pp
-where
-.Fa r
-is the radix of the machine's floating-point arithmetic defined by the
-.Dv FLT_RADIX
-constant in
-.In float.h .
-.Sh RETURN VALUES
-As described above, upon successful completion,
-the functions return the exponent.
-Functionally this is the same as calling the corresponding
-.Xr logb 3
-function and casting the return value to
-.Vt int .
-.Pp
-The following special cases may occur:
-.Bl -enum -offset indent
-.It
-If
-.Fa x
-is zero, the value of
-.Dv FP_ILOGB0
-is returned and a domain error occurs.
-.It
-If
-.Fa x
-is infinite, a domain error occurs and the value of
-.Dv INT_MAX
-is returned.
-.It
-If
-.Fa x
-is \*(Na, a domain error is raised and the value of
-.Dv FP_ILOGBNAN
-is returned.
-.It
-If the correct value is outside the range of the return type,
-a domain error occurs but an unspecified value is returned.
-.El
-.Sh SEE ALSO
-.Xr ilog2 3 ,
-.Xr logb 3 ,
-.Xr math 3
-.Sh STANDARDS
-The described functions conform to
-.St -isoC-99 .
-.Sh BUGS
-Neither
-.Dv FP_ILOGB0
-nor
-.Dv FP_ILOGBNAN
-is defined currently in
-.Nx .
diff --git a/lib/libm/man/isinff.3 b/lib/libm/man/isinff.3
deleted file mode 100644
index 189bda2e8..000000000
--- a/lib/libm/man/isinff.3
+++ /dev/null
@@ -1,76 +0,0 @@
-.\"	$NetBSD: isinff.3,v 1.6 2010/05/14 03:10:24 joerg Exp $
-.\"
-.\" 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. 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: @(#)isinf.3	8.2 (Berkeley) 1/29/94
-.\"	from: NetBSD: isinf.3,v 1.5 1998/08/02 04:52:54 mycroft Exp
-.\"
-.Dd August 16, 1999
-.Dt ISINFF 3
-.Os
-.Sh NAME
-.Nm isinff ,
-.Nm isnanf
-.Nd test for infinity or not-a-number
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft int
-.Fn isinff float
-.Ft int
-.Fn isnanf float
-.Sh DESCRIPTION
-The
-.Fn isinff
-function
-returns 1 if the number is
-.Dq \*(If ,
-otherwise 0.
-.Pp
-The
-.Fn isnanf
-function
-returns 1 if the number is
-.Dq not-a-number ,
-otherwise 0.
-.Sh SEE ALSO
-.Xr isinf 3 ,
-.Xr isnan 3 ,
-.Xr math 3
-.Rs
-.%T "IEEE Standard for Binary Floating-Point Arithmetic"
-.%Q ANSI
-.%R Std 754-1985
-.Re
-.Sh BUGS
-Neither the
-.Tn VAX
-nor the Tahoe floating point have distinguished values
-for either infinity or not-a-number.
-These routines always return 0 on those architectures.
diff --git a/lib/libm/man/j0.3 b/lib/libm/man/j0.3
deleted file mode 100644
index 85604ed77..000000000
--- a/lib/libm/man/j0.3
+++ /dev/null
@@ -1,153 +0,0 @@
-.\" Copyright (c) 1985, 1991 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.
-.\"
-.\"     from: @(#)j0.3	6.7 (Berkeley) 4/19/91
-.\"	$NetBSD: j0.3,v 1.16 2003/08/07 16:44:48 agc Exp $
-.\"
-.Dd April 19, 1991
-.Dt J0 3
-.Os
-.Sh NAME
-.Nm j0 ,
-.Nm j0f ,
-.Nm j1 ,
-.Nm j1f ,
-.Nm jn ,
-.Nm jnf ,
-.Nm y0 ,
-.Nm y0f ,
-.Nm y1 ,
-.Nm y1f ,
-.Nm yn ,
-.Nm ynf
-.Nd Bessel functions of first and second kind
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn j0 "double x"
-.Ft float
-.Fn j0f "float x"
-.Ft double
-.Fn j1 "double x"
-.Ft float
-.Fn j1f "float x"
-.Ft double
-.Fn jn "int n" "double x"
-.Ft float
-.Fn jnf "int n" "float x"
-.Ft double
-.Fn y0 "double x"
-.Ft float
-.Fn y0f "float x"
-.Ft double
-.Fn y1 "double x"
-.Ft float
-.Fn y1f "float x"
-.Ft double
-.Fn yn "int n" "double x"
-.Ft float
-.Fn ynf "int n" "float x"
-.Sh DESCRIPTION
-The functions
-.Fn j0 ,
-.Fn j0f ,
-.Fn j1
-and
-.Fn j1f
-compute the
-.Em Bessel function of the first kind of the order
-0 and the
-.Em order
-1, respectively,
-for the
-real value
-.Fa x ;
-the functions
-.Fn jn
-and
-.Fn jnf
-compute the
-.Em Bessel function of the first kind of the integer order
-.Fa n
-for the real value
-.Fa x .
-.Pp
-The functions
-.Fn y0 ,
-.Fn y0f ,
-.Fn y1
-and
-.Fn y1f
-compute the linearly independent
-.Em Bessel function of the second kind of the order
-0 and the
-.Em order
-1, respectively,
-for the
-positive
-.Em integer
-value
-.Fa x
-(expressed as a double);
-the functions
-.Fn yn
-and
-.Fn ynf
-compute the
-.Em Bessel function of the second kind for the integer order
-.Fa n
-for the positive
-.Em integer
-value
-.Fa x
-(expressed as a double).
-.Sh RETURN VALUES
-If these functions are successful,
-the computed value is returned, otherwise
-the global
-variable
-.Va errno
-is set to
-.Er EDOM
-and a reserve operand fault is generated.
-.\" On the
-.\" .Tn VAX
-.\" and
-.\" .Tn Tahoe
-.\" architectures, a negative
-.\" .Fa x
-.\" value
-.\" results in an error.
-.Sh SEE ALSO
-.Xr math 3
-.\" .Xr matherr 3
-.Sh HISTORY
-This set of functions
-appeared in
-.At v7 .
diff --git a/lib/libm/man/ldexp.3 b/lib/libm/man/ldexp.3
deleted file mode 100644
index 2681d337c..000000000
--- a/lib/libm/man/ldexp.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\"	$NetBSD: ldexp.3,v 1.4 2011/09/18 05:33:13 jruoho Exp $
-.\"
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)ldexp.3	8.2 (Berkeley) 4/19/94
-.\"
-.Dd September 18, 2011
-.Dt LDEXP 3
-.Os
-.Sh NAME
-.Nm ldexp ,
-.Nm ldexpf
-.Nd multiply floating-point number by integral power of 2
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn ldexp "double x" "int exp"
-.Ft float
-.Fn ldexpf "float x" "int exp"
-.Sh DESCRIPTION
-The
-.Fn ldexp
-family of functions compute
-.Bd -ragged -offset indent
-.Va x
-*
-2^\fIexp\fR
-.Ed
-.Pp
-for a real floating-point number
-.Fa x .
-.Sh RETURN VALUES
-The functions return the value of
-.Fa x
-times 2 raised to the power
-.Fa exp .
-Otherwise the following may occur:
-.Bl -enum -offset indent
-.It
-If
-.Fa x
-is \*(Na, a \*(Na is returned.
-.It
-If
-.Fa exp
-is zero or
-.Fa x
-is either \*(Pm 0 or \*(Pm\[if],
-.Fa x
-is returned.
-.It
-If the call would cause an overflow, a range error occurs and either
-.Dv \*(Pm\*HHUGE_VAL ,
-.Dv  \*(Pm\*HHUGE_VALF ,
-or
-.Dv  \*(Pm\*HHUGE_VALL
-is returned, depending on the sign of
-.Fa x
-and the type of the return value.
-.It
-If an underflow would be caused by the correct value,
-and the value is not representable, either 0.0 or
-an implementation-defined value is returned.
-.El
-.Sh SEE ALSO
-.Xr frexp 3 ,
-.Xr math 3 ,
-.Xr modf 3
-.Sh STANDARDS
-The described functions conform to
-.St -isoC-99 .
diff --git a/lib/libm/man/lgamma.3 b/lib/libm/man/lgamma.3
deleted file mode 100644
index 79d4239e6..000000000
--- a/lib/libm/man/lgamma.3
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" Copyright (c) 1985, 1991 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.
-.\"
-.\"     from: @(#)lgamma.3	6.6 (Berkeley) 12/3/92
-.\"	$NetBSD: lgamma.3,v 1.22 2012/05/05 17:54:13 christos Exp $
-.\"
-.Dd May 4, 2012
-.Dt LGAMMA 3
-.Os
-.Sh NAME
-.Nm lgamma ,
-.Nm lgammaf ,
-.Nm lgamma_r ,
-.Nm lgammaf_r ,
-.Nm gamma ,
-.Nm gammaf ,
-.Nm gamma_r ,
-.Nm gammaf_r ,
-.Nm tgamma ,
-.Nm tgammaf
-.Nd log gamma function
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft extern int
-.Fa signgam ;
-.sp
-.Ft double
-.Fn lgamma "double x"
-.Ft float
-.Fn lgammaf "float x"
-.Ft double
-.Fn lgamma_r "double x" "int *sign"
-.Ft float
-.Fn lgammaf_r "float x" "int *sign"
-.Ft double
-.Fn gamma "double x"
-.Ft float
-.Fn gammaf "float x"
-.Ft double
-.Fn gamma_r "double x" "int *sign"
-.Ft float
-.Fn gammaf_r "float x" "int *sign"
-.Ft double
-.Fn tgamma "double x"
-.Ft float
-.Fn tgammaf "float x"
-.Sh DESCRIPTION
-.Fn lgamma x
-.if t \{\
-returns ln\||\(*G(x)| where
-.Bd -unfilled -offset indent
-\(*G(x) = \(is\d\s8\z0\s10\u\u\s8\(if\s10\d t\u\s8x\-1\s10\d e\u\s8\-t\s10\d dt	for x \*[Gt] 0 and
-.br
-\(*G(x) = \(*p/(\(*G(1\-x)\|sin(\(*px))	for x \*[Lt] 1.
-.Ed
-.\}
-.if n \
-returns ln\||\(*G(x)|.
-.Pp
-The external integer
-.Fa signgam
-returns the sign of \(*G(x).
-.Pp
-.Fn lgamma_r
-is a reentrant interface that performs identically to
-.Fn lgamma ,
-differing in that the sign of \(*G(x) is stored in the location
-pointed to by the
-.Fa sign
-argument and
-.Fa signgam
-is not modified.
-.Pp
-The
-.Fn tgamma x
-and
-.Fn tgammaf x
-functions return \(*G(x), with no effect on
-.Fa signgam .
-.Pp
-.Fn gamma ,
-.Fn gammaf ,
-.Fn gamma_r ,
-and
-.Fn gammaf_r
-are deprecated aliases for
-.Fn lgamma ,
-.Fn lgammaf ,
-.Fn lgamma_r ,
-and
-.Fn lgammaf_r ,
-respectively.
-.Sh IDIOSYNCRASIES
-Do not use the expression
-.Dq Li signgam\(**exp(lgamma(x))
-to compute g := \(*G(x).
-Instead use a program like this (in C):
-.Bd -literal -offset indent
-lg = lgamma(x); g = signgam\(**exp(lg);
-.Ed
-.Pp
-Only after
-.Fn lgamma
-has returned can signgam be correct.
-.Sh RETURN VALUES
-.Fn lgamma
-returns appropriate values unless an argument is out of range.
-Overflow will occur for sufficiently large positive values, and
-non-positive integers.
-For large non-integer negative values,
-.Fn tgamma
-will underflow.
-On the
-.Tn VAX ,
-the reserved operator is returned,
-and
-.Va errno
-is set to
-.Er ERANGE .
-.Sh SEE ALSO
-.Xr math 3
-.Sh HISTORY
-The
-.Nm lgamma
-function appeared in
-.Bx 4.3 .
-The
-.Fn tgamma
-function appeared in
-.Nx 6.0 .
diff --git a/lib/libm/man/log.3 b/lib/libm/man/log.3
deleted file mode 100644
index 3a0ae493b..000000000
--- a/lib/libm/man/log.3
+++ /dev/null
@@ -1,170 +0,0 @@
-.\" $NetBSD: log.3,v 1.3 2011/09/13 08:51:32 wiz Exp $
-.\"
-.\" Copyright (c) 2011 Jukka Ruohonen <jruohonen@iki.fi>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 13, 2011
-.Dt LOG 3
-.Os
-.Sh NAME
-.Nm log ,
-.Nm logf ,
-.Nm log10 ,
-.Nm log10f ,
-.Nm log1p ,
-.Nm log1pf
-.Nm log2 ,
-.Nm log2f ,
-.Nd logarithm functions
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn log "double x"
-.Ft float
-.Fn logf "float x"
-.Ft double
-.Fn log10 "double x"
-.Ft float
-.Fn log10f "float x"
-.Ft double
-.Fn log1p "double x"
-.Ft float
-.Fn log1pf "float x"
-.Ft double
-.Fn log2 "double x"
-.Ft float
-.Fn log2f "float x"
-.Sh DESCRIPTION
-The following functions compute logarithms:
-.Bl -bullet -offset 2n
-.It
-The
-.Fn log
-and
-.Fn logf
-functions return the natural logarithm.
-.It
-The
-.Fn log10
-and
-.Fn log10f
-functions return the base 10 logarithm.
-.It
-The
-.Fn log1p
-and
-.Fn log1pf
-functions return the natural logarithm of (1.0 +
-.Fa x )
-accurately even for very small values of
-.Fa x .
-.It
-The
-.Fn log2
-and
-.Fn log2f
-functions return the base 2 logarithm.
-.El
-.Sh RETURN VALUES
-Upon successful completion, the functions return the logarithm of
-.Fa x
-as descibed above.
-Otherwise the following may occur:
-.Bl -enum -offset indent
-.It
-If
-.Fa x
-is \*(Na, all functions return \*(Na.
-.It
-If
-.Fa x
-is positive infinity, all functions return
-.Fa x .
-If
-.Fa x
-is negative infinity, all functions return \*(Na.
-.It
-If
-.Fa x
-is +0.0 or -0.0, the
-.Fn log ,
-.Fn log10 ,
-and
-.Fn log2
-families return either
-.Dv -HUGE_VAL ,
-.Dv -HUGE_VALF ,
-or
-.Dv -HUGE_VALL ,
-whereas the
-.Fn log1p
-family returns
-.Fa x .
-.It
-If
-.Fa x
-is +1.0, the
-.Fn log ,
-.Fn log10 ,
-and
-.Fn log2
-families return +0.0.
-If
-.Fa x
-is -1.0, the
-.Fn log1p
-family returns
-.Dv -HUGE_VAL ,
-.Dv -HUGE_VALF ,
-or
-.Dv -HUGE_VALL .
-.El
-.Pp
-In addition, on a
-.Tn VAX ,
-.Va errno
-is set to
-.Er EDOM
-and the reserved operand is returned
-by
-.Fn log
-unless
-.Fa x
-\*[Gt] 0, by
-.Fn log1p
-unless
-.Fa x
-\*[Gt] \-1.
-.Sh SEE ALSO
-.Xr exp 3 ,
-.Xr ilogb 3 ,
-.Xr math 3
-.Sh STANDARDS
-The described functions conform to
-.St -isoC-99 .
-.Sh HISTORY
-The history of the logarithm functions dates back to
-.At v6 .
diff --git a/lib/libm/man/lrint.3 b/lib/libm/man/lrint.3
deleted file mode 100644
index b29dfffcd..000000000
--- a/lib/libm/man/lrint.3
+++ /dev/null
@@ -1,103 +0,0 @@
-.\" $NetBSD: lrint.3,v 1.1 2005/09/16 15:26:47 wiz Exp $
-.\"
-.\" 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.
-.\"
-.\" $FreeBSD: /repoman/r/ncvs/src/lib/msun/man/lrint.3,v 1.2.2.2 2005/03/01 16:18:39 brueffer Exp $
-.\"
-.Dd January 11, 2005
-.Dt LRINT 3
-.Os
-.Sh NAME
-.Nm llrint ,
-.Nm llrintf ,
-.Nm lrint ,
-.Nm lrintf
-.Nd convert to integer
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft long long
-.Fn llrint "double x"
-.Ft long long
-.Fn llrintf "float x"
-.Ft long
-.Fn lrint "double x"
-.Ft long
-.Fn lrintf "float x"
-.Sh DESCRIPTION
-The
-.Fn lrint
-function returns the integer nearest to its argument
-.Fa x
-according to the current rounding mode.
-.Pp
-The
-.Fn llrint ,
-.Fn llrintf ,
-and
-.Fn lrintf
-functions differ from
-.Fn lrint
-only in their input and output types.
-.Sh RETURN VALUES
-The
-.Nm llrint ,
-.Nm llrintf ,
-.Nm lrint ,
-and
-.Nm lrintf
-functions return the integer nearest to their argument
-.Fa x
-according to the current rounding mode.
-If the rounded result is too large to be represented as a
-.Vt long long
-or
-.Vt long
-value, respectively,
-.\" an invalid exception is raised and
-the return value is undefined.
-.\" Otherwise, if
-.\" .Fa x
-.\" is not an integer,
-.\" .Fn lrint
-.\" raises an inexact exception.
-.\" If
-.\" .Fa x
-.\" is too large, a range error may occur.
-.Sh SEE ALSO
-.\" .Xr lround 3 ,
-.Xr math 3 ,
-.Xr rint 3 ,
-.Xr round 3
-.Sh STANDARDS
-The
-.Fn llrint ,
-.Fn llrintf ,
-.Fn lrint ,
-and
-.Fn lrintf
-functions conform to
-.St -isoC-99 .
diff --git a/lib/libm/man/math.3 b/lib/libm/man/math.3
deleted file mode 100644
index 544e27671..000000000
--- a/lib/libm/man/math.3
+++ /dev/null
@@ -1,582 +0,0 @@
-.\"	$NetBSD: math.3,v 1.26 2012/11/10 15:59:58 njoly Exp $
-.\"
-.\" Copyright (c) 1985 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.
-.\"
-.\"	from: @(#)math.3	6.10 (Berkeley) 5/6/91
-.\"
-.Dd February 23, 2007
-.Dt MATH 3
-.Os
-.Sh NAME
-.Nm math
-.Nd introduction to mathematical library functions
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Sh DESCRIPTION
-These functions constitute the C
-.Lb libm .
-Declarations for these functions may be obtained from the include file
-.In math.h .
-.\" The Fortran math library is described in ``man 3f intro''.
-.Ss List of Functions
-.Bl -column "copysignX" "gammaX3XX" "inverse trigonometric funcX"
-.It Sy Name Ta Sy Man page Ta Sy Description Ta Sy Error Bound Dv ( ULP Ns No s)
-.It acos Ta Xr acos 3 Ta inverse trigonometric function Ta 3
-.It acosh Ta Xr acosh 3 Ta inverse hyperbolic function Ta 3
-.It asin Ta Xr asin 3 Ta inverse trigonometric function Ta 3
-.It asinh Ta Xr asinh 3 Ta inverse hyperbolic function Ta 3
-.It atan Ta Xr atan 3 Ta inverse trigonometric function Ta 1
-.It atanh Ta Xr atanh 3 Ta inverse hyperbolic function Ta 3
-.It atan2 Ta Xr atan2 3 Ta inverse trigonometric function Ta 2
-.It cbrt Ta Xr sqrt 3 Ta cube root Ta 1
-.It ceil Ta Xr ceil 3 Ta integer no less than Ta 0
-.It copysign Ta Xr copysign 3 Ta copy sign bit Ta 0
-.It cos Ta Xr cos 3 Ta trigonometric function Ta 1
-.It cosh Ta Xr cosh 3 Ta hyperbolic function Ta 3
-.It erf Ta Xr erf 3 Ta error function Ta ???
-.It erfc Ta Xr erf 3 Ta complementary error function Ta ???
-.It exp Ta Xr exp 3 Ta exponential Ta 1
-.It expm1 Ta Xr exp 3 Ta exp(x)\-1 Ta 1
-.It fabs Ta Xr fabs 3 Ta absolute value Ta 0
-.It finite Ta Xr finite 3 Ta test for finity Ta 0
-.It floor Ta Xr floor 3 Ta integer no greater than Ta 0
-.It fmod Ta Xr fmod 3 Ta remainder Ta ???
-.It hypot Ta Xr hypot 3 Ta Euclidean distance Ta 1
-.It ilogb Ta Xr ilogb 3 Ta exponent extraction Ta 0
-.It isinf Ta Xr isinf 3 Ta test for infinity Ta 0
-.It isnan Ta Xr isnan 3 Ta test for not-a-number Ta 0
-.It j0 Ta Xr j0 3 Ta Bessel function Ta ???
-.It j1 Ta Xr j0 3 Ta Bessel function Ta ???
-.It jn Ta Xr j0 3 Ta Bessel function Ta ???
-.It lgamma Ta Xr lgamma 3 Ta log gamma function Ta ???
-.It log Ta Xr log 3 Ta natural logarithm Ta 1
-.It log10 Ta Xr log 3 Ta logarithm to base 10 Ta 3
-.It log1p Ta Xr log 3 Ta log(1+x) Ta 1
-.It nan Ta Xr nan 3 Ta return quiet \*(Na Ta 0
-.It nextafter Ta Xr nextafter 3 Ta next representable number Ta 0
-.It pow Ta Xr pow 3 Ta exponential x**y Ta 60\-500
-.It remainder Ta Xr remainder 3 Ta remainder Ta 0
-.It rint Ta Xr rint 3 Ta round to nearest integer Ta 0
-.It scalbn Ta Xr scalbn 3 Ta exponent adjustment Ta 0
-.It sin Ta Xr sin 3 Ta trigonometric function Ta 1
-.It sinh Ta Xr sinh 3 Ta hyperbolic function Ta 3
-.It sqrt Ta Xr sqrt 3 Ta square root Ta 1
-.It tan Ta Xr tan 3 Ta trigonometric function Ta 3
-.It tanh Ta Xr tanh 3 Ta hyperbolic function Ta 3
-.It trunc Ta Xr trunc 3 Ta nearest integral value Ta 3
-.It y0 Ta Xr j0 3 Ta Bessel function Ta ???
-.It y1 Ta Xr j0 3 Ta Bessel function Ta ???
-.It yn Ta Xr j0 3 Ta Bessel function Ta ???
-.El
-.Ss List of Defined Values
-.Bl -column "M_2_SQRTPIXX" "1.12837916709551257390XX" "2/sqrt(pi)XXX"
-.It Sy Name Ta Sy Value Ta Sy Description
-.It M_E	2.7182818284590452354	e
-.It M_LOG2E	1.4426950408889634074	log 2e
-.It M_LOG10E	0.43429448190325182765	log 10e
-.It M_LN2	0.69314718055994530942	log e2
-.It M_LN10	2.30258509299404568402	log e10
-.It M_PI	3.14159265358979323846	pi
-.It M_PI_2	1.57079632679489661923	pi/2
-.It M_PI_4	0.78539816339744830962	pi/4
-.It M_1_PI	0.31830988618379067154	1/pi
-.It M_2_PI	0.63661977236758134308	2/pi
-.It M_2_SQRTPI	1.12837916709551257390	2/sqrt(pi)
-.It M_SQRT2	1.41421356237309504880	sqrt(2)
-.It M_SQRT1_2	0.70710678118654752440	1/sqrt(2)
-.El
-.Sh NOTES
-In 4.3 BSD, distributed from the University of California
-in late 1985, most of the foregoing functions come in two
-versions, one for the double\-precision "D" format in the
-DEC VAX\-11 family of computers, another for double\-precision
-arithmetic conforming to the IEEE Standard 754 for Binary
-Floating\-Point Arithmetic.
-The two versions behave very
-similarly, as should be expected from programs more accurate
-and robust than was the norm when UNIX was born.
-For instance, the programs are accurate to within the numbers
-of
-.Dv ULPs
-tabulated above; an
-.Dv ULP
-is one Unit in the Last Place.
-And the programs have been cured of anomalies that
-afflicted the older math library
-in which incidents like
-the following had been reported:
-.Bd -literal -offset indent
-sqrt(\-1.0) = 0.0 and log(\-1.0) = \-1.7e38.
-cos(1.0e\-11) \*[Gt] cos(0.0) \*[Gt] 1.0.
-pow(x,1.0) \(!= x when x = 2.0, 3.0, 4.0, ..., 9.0.
-pow(\-1.0,1.0e10) trapped on Integer Overflow.
-sqrt(1.0e30) and sqrt(1.0e\-30) were very slow.
-.Ed
-However the two versions do differ in ways that have to be
-explained, to which end the following notes are provided.
-.Ss DEC VAX\-11 D_floating\-point
-This is the format for which the original math library
-was developed, and to which this manual is still principally dedicated.
-It is
-.Em the
-double\-precision format for the PDP\-11
-and the earlier VAX\-11 machines; VAX\-11s after 1983 were
-provided with an optional "G" format closer to the IEEE
-double\-precision format.
-The earlier DEC MicroVAXs have no D format, only G double\-precision.
-(Why?
-Why not?)
-.Pp
-Properties of D_floating\-point:
-.Bl -hang -offset indent
-.It Wordsize :
-64 bits, 8 bytes.
-.It Radix :
-Binary.
-.It Precision :
-56 significant bits, roughly like 17 significant decimals.
-If x and x' are consecutive positive D_floating\-point
-numbers (they differ by 1
-.Dv ULP ) ,
-then
-.Dl 1.3e\-17 \*[Lt] 0.5**56 \*[Lt] (x'\-x)/x \*[Le] 0.5**55 \*[Lt] 2.8e\-17.
-.It Range :
-.Bl -column "Underflow thresholdX" "2.0**127X"
-.It Overflow threshold	= 2.0**127	= 1.7e38.
-.It Underflow threshold	= 0.5**128	= 2.9e\-39.
-.El
-.Em NOTE: THIS RANGE IS COMPARATIVELY NARROW.
-.Pp
-Overflow customarily stops computation.
-Underflow is customarily flushed quietly to zero.
-.Em CAUTION :
-It is possible to have x
-\(!=
-y and yet x\-y = 0 because of underflow.
-Similarly x \*[Gt] y \*[Gt] 0 cannot prevent either x\(**y = 0
-or y/x = 0 from happening without warning.
-.It Zero is represented ambiguously :
-Although 2**55 different representations of zero are accepted by
-the hardware, only the obvious representation is ever produced.
-There is no \-0 on a VAX.
-.It \*(If is not part of the VAX architecture .
-.It Reserved operands :
-of the 2**55 that the hardware
-recognizes, only one of them is ever produced.
-Any floating\-point operation upon a reserved
-operand, even a MOVF or MOVD, customarily stops
-computation, so they are not much used.
-.It Exceptions :
-Divisions by zero and operations that
-overflow are invalid operations that customarily
-stop computation or, in earlier machines, produce
-reserved operands that will stop computation.
-.It Rounding :
-Every rational operation  (+, \-, \(**, /) on a
-VAX (but not necessarily on a PDP\-11), if not an
-over/underflow nor division by zero, is rounded to
-within half an
-.Dv ULP ,
-and when the rounding error is
-exactly half an
-.Dv ULP
-then rounding is away from 0.
-.El
-.Pp
-Except for its narrow range, D_floating\-point is one of the
-better computer arithmetics designed in the 1960's.
-Its properties are reflected fairly faithfully in the elementary
-functions for a VAX distributed in 4.3 BSD.
-They over/underflow only if their results have to lie out of range
-or very nearly so, and then they behave much as any rational
-arithmetic operation that over/underflowed would behave.
-Similarly, expressions like log(0) and atanh(1) behave
-like 1/0; and sqrt(\-3) and acos(3) behave like 0/0;
-they all produce reserved operands and/or stop computation!
-The situation is described in more detail in manual pages.
-.Pp
-.Em This response seems excessively punitive, so it is destined
-.Em to be replaced at some time in the foreseeable future by a
-.Em more flexible but still uniform scheme being developed to
-.Em handle all floating\-point arithmetic exceptions neatly.
-.Pp
-How do the functions in 4.3 BSD's new math library for UNIX
-compare with their counterparts in DEC's VAX/VMS library?
-Some of the VMS functions are a little faster, some are
-a little more accurate, some are more puritanical about
-exceptions (like pow(0.0,0.0) and atan2(0.0,0.0)),
-and most occupy much more memory than their counterparts in
-libm.
-The VMS codes interpolate in large table to achieve
-speed and accuracy; the libm codes use tricky formulas
-compact enough that all of them may some day fit into a ROM.
-.Pp
-More important, DEC regards the VMS codes as proprietary
-and guards them zealously against unauthorized use.
-But the libm codes in 4.3 BSD are intended for the public domain;
-they may be copied freely provided their provenance is always
-acknowledged, and provided users assist the authors in their
-researches by reporting experience with the codes.
-Therefore no user of UNIX on a machine whose arithmetic resembles
-VAX D_floating\-point need use anything worse than the new libm.
-.Ss IEEE STANDARD 754 Floating\-Point Arithmetic
-This standard is on its way to becoming more widely adopted
-than any other design for computer arithmetic.
-VLSI chips that conform to some version of that standard have been
-produced by a host of manufacturers, among them ...
-.Bl -column "Intel i8070, i80287XX"
-.It Intel i8087, i80287	National Semiconductor  32081
-.It 68881	Weitek WTL-1032, ... , -1165
-.It Zilog Z8070	Western Electric (AT\*[Am]T) WE32106.
-.El
-Other implementations range from software, done thoroughly
-in the Apple Macintosh, through VLSI in the Hewlett\-Packard
-9000 series, to the ELXSI 6400 running ECL at 3 Megaflops.
-Several other companies have adopted the formats
-of IEEE 754 without, alas, adhering to the standard's way
-of handling rounding and exceptions like over/underflow.
-The DEC VAX G_floating\-point format is very similar to the IEEE
-754 Double format, so similar that the C programs for the
-IEEE versions of most of the elementary functions listed
-above could easily be converted to run on a MicroVAX, though
-nobody has volunteered to do that yet.
-.Pp
-The codes in 4.3 BSD's libm for machines that conform to
-IEEE 754 are intended primarily for the National Semiconductor 32081
-and WTL 1164/65.
-To use these codes with the Intel or Zilog
-chips, or with the Apple Macintosh or ELXSI 6400, is to
-forego the use of better codes provided (perhaps freely) by
-those companies and designed by some of the authors of the
-codes above.
-Except for
-.Fn atan ,
-.Fn cbrt ,
-.Fn erf ,
-.Fn erfc ,
-.Fn hypot ,
-.Fn j0-jn ,
-.Fn lgamma ,
-.Fn pow ,
-and
-.Fn y0\-yn ,
-the Motorola 68881 has all the functions in libm on chip,
-and faster and more accurate;
-it, Apple, the i8087, Z8070 and WE32106 all use 64 significant bits.
-The main virtue of 4.3 BSD's
-libm codes is that they are intended for the public domain;
-they may be copied freely provided their provenance is always
-acknowledged, and provided users assist the authors in their
-researches by reporting experience with the codes.
-Therefore no user of UNIX on a machine that conforms to
-IEEE 754 need use anything worse than the new libm.
-.Pp
-Properties of IEEE 754 Double\-Precision:
-.Bl -hang -offset indent
-.It Wordsize :
-64 bits, 8 bytes.
-.It Radix :
-Binary.
-.It Precision :
-53 significant bits, roughly like 16 significant decimals.
-If x and x' are consecutive positive Double\-Precision
-numbers (they differ by 1
-.Dv ULP ) ,
-then
-.Dl 1.1e\-16 \*[Lt] 0.5**53 \*[Lt] (x'\-x)/x \*[Le] 0.5**52 \*[Lt] 2.3e\-16.
-.It Range :
-.Bl -column "Underflow thresholdX" "2.0**1024X"
-.It Overflow threshold	= 2.0**1024	= 1.8e308
-.It Underflow threshold	= 0.5**1022	= 2.2e\-308
-.El
-Overflow goes by default to a signed \*(If.
-Underflow is
-.Sy Gradual ,
-rounding to the nearest
-integer multiple of 0.5**1074 = 4.9e\-324.
-.It Zero is represented ambiguously as +0 or \-0:
-Its sign transforms correctly through multiplication or
-division, and is preserved by addition of zeros
-with like signs; but x\-x yields +0 for every
-finite x.
-The only operations that reveal zero's
-sign are division by zero and copysign(x,\(+-0).
-In particular, comparison (x \*[Gt] y, x \*[Ge] y, etc.)
-cannot be affected by the sign of zero; but if
-finite x = y then \*(If
-\&= 1/(x\-y)
-\(!=
-\-1/(y\-x) =
-\- \*(If .
-.It \*(If is signed :
-it persists when added to itself
-or to any finite number.
-Its sign transforms
-correctly through multiplication and division, and
-\*(If (finite)/\(+- \0=\0\(+-0
-(nonzero)/0 =
-\(+- \*(If.
-But
-\(if\-\(if, \(if\(**0 and \(if/\(if
-are, like 0/0 and sqrt(\-3),
-invalid operations that produce \*(Na.
-.It Reserved operands :
-there are 2**53\-2 of them, all
-called \*(Na (Not A Number).
-Some, called Signaling \*[Na]s, trap any floating\-point operation
-performed upon them; they are used to mark missing
-or uninitialized values, or nonexistent elements of arrays.
-The rest are Quiet \*[Na]s; they are
-the default results of Invalid Operations, and
-propagate through subsequent arithmetic operations.
-If x
-\(!=
-x then x is \*(Na; every other predicate
-(x \*[Gt] y, x = y, x \*[Lt] y, ...) is FALSE if \*(Na is involved.
-.Pp
-.Em NOTE :
-Trichotomy is violated by \*(Na.
-Besides being FALSE, predicates that entail ordered
-comparison, rather than mere (in)equality,
-signal Invalid Operation when \*(Na is involved.
-.It Rounding :
-Every algebraic operation (+, \-, \(**, /,
-\(sr)
-is rounded by default to within half an
-.Dv ULP ,
-and when the rounding error is exactly half an
-.Dv ULP
-then the rounded value's least significant bit is zero.
-This kind of rounding is usually the best kind,
-sometimes provably so; for instance, for every
-x = 1.0, 2.0, 3.0, 4.0, ..., 2.0**52, we find
-(x/3.0)\(**3.0 == x and (x/10.0)\(**10.0 == x and ...
-despite that both the quotients and the products
-have been rounded.
-Only rounding like IEEE 754 can do that.
-But no single kind of rounding can be
-proved best for every circumstance, so IEEE 754
-provides rounding towards zero or towards
-+\*(If
-or towards
-\-\*(If
-at the programmer's option.
-And the same kinds of rounding are specified for
-Binary\-Decimal Conversions, at least for magnitudes
-between roughly 1.0e\-10 and 1.0e37.
-.It Exceptions :
-IEEE 754 recognizes five kinds of floating\-point exceptions,
-listed below in declining order of probable importance.
-.Bl -column "Invalid OperationX" "Gradual OverflowX"
-.It Sy Exception Ta Sy Default Result
-.It Invalid Operation	\*(Na, or FALSE
-.It Overflow	\(+-\(if
-.It Divide by Zero	\(+-\(if \}
-.It Underflow	Gradual Underflow
-.It Inexact	Rounded value
-.El
-.Pp
-.Em NOTE :
-An Exception is not an Error unless handled badly.
-What makes a class of exceptions exceptional
-is that no single default response can be satisfactory
-in every instance.
-On the other hand, if a default
-response will serve most instances satisfactorily,
-the unsatisfactory instances cannot justify aborting
-computation every time the exception occurs.
-.El
-.Pp
-For each kind of floating\-point exception, IEEE 754
-provides a Flag that is raised each time its exception
-is signaled, and stays raised until the program resets it.
-Programs may also test, save and restore a flag.
-Thus, IEEE 754 provides three ways by which programs
-may cope with exceptions for which the default result
-might be unsatisfactory:
-.Bl -enum
-.It
-Test for a condition that might cause an exception
-later, and branch to avoid the exception.
-.It
-Test a flag to see whether an exception has occurred
-since the program last reset its flag.
-.It
-Test a result to see whether it is a value that only
-an exception could have produced.
-.Em CAUTION :
-The only reliable ways to discover
-whether Underflow has occurred are to test whether
-products or quotients lie closer to zero than the
-underflow threshold, or to test the Underflow flag.
-(Sums and differences cannot underflow in
-IEEE 754; if x
-\(!=
-y then x\-y is correct to
-full precision and certainly nonzero regardless of
-how tiny it may be.)
-Products and quotients that
-underflow gradually can lose accuracy gradually
-without vanishing, so comparing them with zero
-(as one might on a VAX) will not reveal the loss.
-Fortunately, if a gradually underflowed value is
-destined to be added to something bigger than the
-underflow threshold, as is almost always the case,
-digits lost to gradual underflow will not be missed
-because they would have been rounded off anyway.
-So gradual underflows are usually
-.Em provably
-ignorable.
-The same cannot be said of underflows flushed to 0.
-.Pp
-At the option of an implementor conforming to IEEE 754,
-other ways to cope with exceptions may be provided:
-.It
-ABORT.
-This mechanism classifies an exception in
-advance as an incident to be handled by means
-traditionally associated with error\-handling
-statements like "ON ERROR GO TO ...".
-Different languages offer different forms of this statement,
-but most share the following characteristics:
-.Bl -dash
-.It
-No means is provided to substitute a value for
-the offending operation's result and resume
-computation from what may be the middle of an expression.
-An exceptional result is abandoned.
-.It
-In a subprogram that lacks an error\-handling
-statement, an exception causes the subprogram to
-abort within whatever program called it, and so
-on back up the chain of calling subprograms until
-an error\-handling statement is encountered or the
-whole task is aborted and memory is dumped.
-.El
-.It
-STOP.
-This mechanism, requiring an interactive
-debugging environment, is more for the programmer
-than the program.
-It classifies an exception in
-advance as a symptom of a programmer's error; the
-exception suspends execution as near as it can to
-the offending operation so that the programmer can
-look around to see how it happened.
-Quite often
-the first several exceptions turn out to be quite
-unexceptionable, so the programmer ought ideally
-to be able to resume execution after each one as if
-execution had not been stopped.
-.It
-\&... Other ways lie beyond the scope of this document.
-.El
-.Pp
-The crucial problem for exception handling is the problem of
-Scope, and the problem's solution is understood, but not
-enough manpower was available to implement it fully in time
-to be distributed in 4.3 BSD's libm.
-Ideally, each elementary function should act
-as if it were indivisible, or atomic, in the sense that ...
-.Bl -enum
-.It
-No exception should be signaled that is not deserved by
-the data supplied to that function.
-.It
-Any exception signaled should be identified with that
-function rather than with one of its subroutines.
-.It
-The internal behavior of an atomic function should not
-be disrupted when a calling program changes from
-one to another of the five or so ways of handling
-exceptions listed above, although the definition
-of the function may be correlated intentionally
-with exception handling.
-.El
-.Pp
-Ideally, every programmer should be able
-.Em conveniently
-to turn a debugged subprogram into one that appears atomic to
-its users.
-But simulating all three characteristics of an
-atomic function is still a tedious affair, entailing hosts
-of tests and saves\-restores; work is under way to ameliorate
-the inconvenience.
-.Pp
-Meanwhile, the functions in libm are only approximately atomic.
-They signal no inappropriate exception except possibly ...
-.Bl -ohang -offset indent
-.It Over/Underflow
-when a result, if properly computed, might have lain barely within range, and
-.It Inexact in Fn cbrt , Fn hypot , Fn log10 No and Fn pow
-when it happens to be exact, thanks to fortuitous cancellation of errors.
-.El
-Otherwise, ...
-.Bl -ohang -offset indent
-.It Invalid Operation is signaled only when
-any result but \*(Na would probably be misleading.
-.It Overflow is signaled only when
-the exact result would be finite but beyond the overflow threshold.
-.It Divide\-by\-Zero is signaled only when
-a function takes exactly infinite values at finite operands.
-.It Underflow is signaled only when
-the exact result would be nonzero but tinier than the underflow threshold.
-.It Inexact is signaled only when
-greater range or precision would be needed to represent the exact result.
-.El
-.\" .Sh FILES
-.\" .Bl -tag -width /usr/lib/libm_p.a -compact
-.\" .It Pa /usr/lib/libm.a
-.\" the static math library
-.\" .It Pa /usr/lib/libm.so
-.\" the dynamic math library
-.\" .It Pa /usr/lib/libm_p.a
-.\" the static math library compiled for profiling
-.\" .El
-.Sh SEE ALSO
-An explanation of IEEE 754 and its proposed extension p854
-was published in the IEEE magazine MICRO in August 1984 under
-the title "A Proposed Radix\- and Word\-length\-independent
-Standard for Floating\-point Arithmetic" by W. J. Cody et al.
-The manuals for Pascal, C and BASIC on the Apple Macintosh
-document the features of IEEE 754 pretty well.
-Articles in the IEEE magazine COMPUTER vol. 14 no. 3 (Mar. 1981),
-and in the ACM SIGNUM Newsletter Special Issue of
-Oct. 1979, may be helpful although they pertain to
-superseded drafts of the standard.
-.Sh BUGS
-When signals are appropriate, they are emitted by certain
-operations within the codes, so a subroutine\-trace may be
-needed to identify the function with its signal in case
-method 5) above is in use.
-And the codes all take the
-IEEE 754 defaults for granted; this means that a decision to
-trap all divisions by zero could disrupt a code that would
-otherwise get correct results despite division by zero.
diff --git a/lib/libm/man/modf.3 b/lib/libm/man/modf.3
deleted file mode 100644
index 6e362964d..000000000
--- a/lib/libm/man/modf.3
+++ /dev/null
@@ -1,74 +0,0 @@
-.\"	$NetBSD: modf.3,v 1.1 2006/07/03 16:03:56 drochner Exp $
-.\"
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.\"     @(#)modf.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd March 21, 2006
-.Dt MODF 3
-.Os
-.Sh NAME
-.Nm modf
-.Nd extract signed integral and fractional values from floating-point number
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn modf "double value" "double *iptr"
-.Ft float
-.Fn modff "float value" "float *iptr"
-.Sh DESCRIPTION
-The
-.Fn modf
-function breaks the argument
-.Fa value
-into integral and fractional parts, each of which has the
-same sign as the argument.
-It stores the integral part as a
-.Em double
-in the object pointed to by
-.Fa iptr .
-.Sh RETURN VALUES
-The
-.Fn modf
-function returns the signed fractional part of
-.Fa value .
-.Sh SEE ALSO
-.Xr frexp 3 ,
-.Xr ldexp 3 ,
-.Xr math 3
-.Sh STANDARDS
-The
-.Fn modf
-function conforms to
-.St -ansiC .
diff --git a/lib/libm/man/nextafter.3 b/lib/libm/man/nextafter.3
deleted file mode 100644
index 3b8b51c58..000000000
--- a/lib/libm/man/nextafter.3
+++ /dev/null
@@ -1,130 +0,0 @@
-.\" $NetBSD: nextafter.3,v 1.5 2015/09/13 10:58:30 he Exp $
-.\"
-.\" Copyright (c) 2011 Jukka Ruohonen <jruohonen@iki.fi>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 13, 2015
-.Dt NEXTAFTER 3
-.Os
-.Sh NAME
-.Nm nextafter ,
-.Nm nextafterf ,
-.Nm nextafterl ,
-.Nm nexttoward ,
-.Nm nexttowardf
-.\"
-.\" XXX: Not yet implemented.
-.\"
-.\" .Nm nexttowardl
-.\"
-.Nd next representable floating-point number
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn nextafter "double x" "double y"
-.Ft float
-.Fn nextafterf "float x" "float y"
-.Ft long double
-.Fn nextafterl "long double x" "long double y"
-.Ft double
-.Fn nexttoward "double x" "long double y"
-.Ft float
-.Fn nexttowardf "float x" "long double y"
-.Sh DESCRIPTION
-The
-.Fn nextafter ,
-.Fn nextafterf ,
-and
-.Fn nextafterl
-functions return the next machine representable number from
-.Fa x
-in direction of
-.Fa y .
-In other words, if
-.Fa y
-is less than
-.Fa x ,
-the functions return the largest representable floating-point number less than
-.Fa x .
-When
-.Fa x
-equals
-.Fa y ,
-the value of
-.Fa y
-is returned.
-The three functions differ only in the type of the return value and
-.Fa x .
-.Pp
-The
-.Fn nexttoward
-and
-.Fn nexttowardf
-functions are equivalent to the
-.Fn nextafter
-family of functions with two exceptions:
-.Bl -enum -offset indent
-.It
-The second parameter has a type
-.Vt long double .
-.It
-The return value is
-.Fa y
-converted to the type of the function, provided that
-.Fa x
-equals
-.Fa y .
-.El
-.Sh RETURN VALUES
-Upon successful completion, the described functions return
-the next representable floating-point value as described above.
-If
-.Fa x
-is finite but an overflow would occur,
-a range error follows and the functions return
-.Dv \*(Pm\*HHUGE_VAL ,
-.Dv  \*(Pm\*HHUGE_VALF ,
-or
-.Dv  \*(Pm\*HHUGE_VALL
-with the same sign as
-.Fa x .
-When either
-.Fa x
-or
-.Fa y
-is \*(Na, a \*(Na is returned.
-When
-.Fa x
-is not
-.Fa y
-but the function value is subnormal, zero, or underflows,
-a range error occurs, and either 0.0 or the correct function
-value (if representable) is returned.
-.Sh SEE ALSO
-.Xr math 3
-.Sh STANDARDS
-The described functions conform to
-.St -isoC-99 .
diff --git a/lib/libm/man/pow.3 b/lib/libm/man/pow.3
deleted file mode 100644
index 8c6ed50c7..000000000
--- a/lib/libm/man/pow.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\" $NetBSD: pow.3,v 1.1 2011/09/17 10:51:53 jruoho Exp $
-.\"
-.\" Copyright (c) 2011 Jukka Ruohonen <jruohonen@iki.fi>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 13, 2011
-.Dt POW 3
-.Os
-.Sh NAME
-.Nm pow ,
-.Nm powf
-.Nd power functions
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn pow "double x" "double y"
-.Ft float
-.Fn powf "float x" "float y"
-.Sh DESCRIPTION
-The
-.Fn pow
-family of functions return
-.Fa x
-raised to the power of
-.Fa y .
-.Pp
-If
-.Fa x
-is negative and
-.Fa y
-is not an integer, the global variable
-.Va errno
-is set to
-.Er EDOM ,
-and on
-.Tn VAX
-a reserved operand fault is generated.
-A portable application should nevertheless ensure that
-.Fa y
-is an integer value whenever
-.Fa x
-is negative.
-.Sh RETURN VALUES
-.\"
-.\" XXX: List also the special return values?
-.\"
-Upon successful completion, the described functions return
-.Fa x^y .
-.Sh SEE ALSO
-.Xr exp 3 ,
-.Xr log 3
-.Sh STANDARDS
-The described functions conform to
-.St -isoC-99 .
-.Sh HISTORY
-The history of the power functions dates back to
-.At v6 .
diff --git a/lib/libm/man/remainder.3 b/lib/libm/man/remainder.3
deleted file mode 100644
index 9a3a05df9..000000000
--- a/lib/libm/man/remainder.3
+++ /dev/null
@@ -1,144 +0,0 @@
-.\" $NetBSD: remainder.3,v 1.2 2011/09/18 05:33:14 jruoho Exp $
-.\"
-.\" Copyright (c) 2011 Jukka Ruohonen <jruohonen@iki.fi>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 18, 2011
-.Dt REMAINDER 3
-.Os
-.Sh NAME
-.Nm remainder ,
-.Nm remainderf ,
-.Nm remquo ,
-.Nm remquof
-.Nd remainder functions
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn remainder "double x" "double y"
-.Ft float
-.Fn remainderf "float x" "float y"
-.Ft double
-.Fn remquo "double x" "double y" "int *quo"
-.Ft float
-.Fn remquof "float x" "float y" "int *quo"
-.Sh DESCRIPTION
-Provided that
-.Fa y
-\*(Ne 0 ,
-the
-.Fn remainder
-and
-.Fn remainderf
-functions calculate the floating-point remainder
-.Fa r
-of
-.Bd -ragged -offset indent
-.Va r
-=
-.Va x - ny ,
-.Ed
-.Pp
-where
-.Fa n
-is the integral value nearest to the exact value of
-.Fa x
-/
-.Fa y .
-If
-.Bd -ragged -offset indent
-.Va | n
--
-.Va x / y |
-= 1/2 ,
-.Ed
-.Pp
-the value
-.Fa n
-is chosen to be even.
-Consequently, the remainder is computed exactly and
-.Va | r |
-\*(Le
-.Fa | y |
-/ 2 .
-.Pp
-Also the
-.Fn remquo
-and
-.Fn remquof
-functions calculate the remainder as described above.
-But these additionally use
-.Fa quo
-to store a value whose sign is the sign of
-.Va x / y
-and whose magnitude is congruent modulo
-.Va 2^k
-to the magnitude of the integral quotient of
-.Va x / y ,
-where
-.Fa k
-is an implementation-defined integer greater than or equal to 3.
-.Pp
-The rationale of the
-.Fn remquo
-family of functions relates to situations where
-only few bits of the quotient are required.
-The exact representation of the quotient may not be meaningful when
-.Fa x
-is large in magnitude compared to
-.Fa y .
-.Sh RETURN VALUES
-The functions return the remainder independent of the rounding mode.
-If
-.Fa y
-is zero ,
-\*(Na
-is returned and a domain error occurs.
-A domain error occurs and a
-\*(Na
-is returned also when
-.Fa x
-is infinite but
-.Fa y
-is not a
-\*(Na.
-If either
-.Fa x
-or
-.Fa y
-is
-\*(Na,
-a
-\*(Na
-is always returned.
-.Sh SEE ALSO
-.Xr div 3 ,
-.Xr fast_remainder32 3 ,
-.Xr fmod 3 ,
-.Xr math 3
-.Sh STANDARDS
-The described functions conform to
-.St -isoC-99 .
diff --git a/lib/libm/man/rint.3 b/lib/libm/man/rint.3
deleted file mode 100644
index f7635b261..000000000
--- a/lib/libm/man/rint.3
+++ /dev/null
@@ -1,90 +0,0 @@
-.\" Copyright (c) 1985, 1991 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.
-.\"
-.\"     from: @(#)rint.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: rint.3,v 1.15 2015/09/13 10:46:41 wiz Exp $
-.\"
-.Dd September 13, 2015
-.Dt RINT 3
-.Os
-.Sh NAME
-.Nm nearbyint ,
-.Nm nearbyintf ,
-.Nm nearbyintl ,
-.Nm rint ,
-.Nm rintf ,
-.Nm rintl
-.Nd round to integral value in floating-point format
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn nearbyint "double x"
-.Ft float
-.Fn nearbyintf "float x"
-.Ft long double
-.Fn nearbyintl "long double x"
-.Ft double
-.Fn rint "double x"
-.Ft float
-.Fn rintf "float x"
-.Ft long double
-.Fn rintl "long double x"
-.Sh DESCRIPTION
-The
-.Fn rint ,
-.Fn rintf ,
-and
-.Fn rintl
-functions return the integral value nearest to
-.Fa x
-according to the prevailing rounding mode.
-These functions raise an inexact exception when the original argument
-is not an exact integer.
-.Pp
-The
-.Fn nearbyint ,
-.Fn nearbyintf ,
-and
-.Fn nearbyintl
-functions perform the same operation, except that they do not raise
-an inexact exception.
-.Sh SEE ALSO
-.Xr abs 3 ,
-.Xr ceil 3 ,
-.Xr fabs 3 ,
-.Xr fenv 3 ,
-.Xr floor 3 ,
-.Xr lrint 3 ,
-.Xr math 3 ,
-.Xr round 3
-.Sh HISTORY
-A
-.Fn rint
-function appeared in
-.At v6 .
diff --git a/lib/libm/man/round.3 b/lib/libm/man/round.3
deleted file mode 100644
index a3c07fc11..000000000
--- a/lib/libm/man/round.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\" $NetBSD: round.3,v 1.7 2013/11/12 00:10:29 joerg Exp $
-.\"
-.\" Copyright (c) 2003, Steven G. Kargl
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" 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: src/lib/msun/man/round.3,v 1.2 2004/06/20 09:27:17 das Exp $
-.\"
-.Dd November 12, 2013
-.Dt ROUND 3
-.Os
-.Sh NAME
-.Nm round ,
-.Nm roundf ,
-.Nm roundl
-.Nd round to nearest integral value
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn round "double x"
-.Ft float
-.Fn roundf "float x"
-.Ft long double
-.Fn roundl "long double x"
-.Sh DESCRIPTION
-The
-.Fn round ,
-.Fn roundf ,
-and
-.Fn roundl
-functions return the nearest integral value to
-.Fa x ;
-if
-.Fa x
-lies halfway between two integral values, then these
-functions return the integral value with the larger
-absolute value (i.e., they round away from zero).
-.Sh SEE ALSO
-.Xr ceil 3 ,
-.Xr floor 3 ,
-.Xr math 3 ,
-.Xr rint 3 ,
-.Xr trunc 3
-.Sh STANDARDS
-The
-.Fn round
-and
-.Fn roundf
-functions conform to
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn round
-and
-.Fn roundf
-functions appeared in
-.Nx 2.0 .
diff --git a/lib/libm/man/scalbn.3 b/lib/libm/man/scalbn.3
deleted file mode 100644
index fcf0a078c..000000000
--- a/lib/libm/man/scalbn.3
+++ /dev/null
@@ -1,108 +0,0 @@
-.\" $NetBSD: scalbn.3,v 1.2 2011/09/18 05:33:14 jruoho Exp $
-.\"
-.\" Copyright (c) 2011 Jukka Ruohonen <jruohonen@iki.fi>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 18, 2011
-.Dt SCALBN 3
-.Os
-.Sh NAME
-.Nm scalbn ,
-.Nm scalbnf ,
-.Nm scalbnl
-.Nd exponent using FLT_RADIX
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn scalbn "double x" "int n"
-.Ft float
-.Fn scalbnf "float x" "int n"
-.Ft long double
-.Fn scalbnl "long double x" "int n"
-.Sh DESCRIPTION
-The
-.Fn scalbn ,
-.Fn scalbnf ,
-and
-.Fn scalbnl
-functions compute
-.Fa x
-*
-.Fa r^n ,
-where
-.Fa r
-is the radix of the machine's floating point arithmetic, defined by the
-.Dv FLT_RADIX
-constant in
-.In float.h .
-The rationale is efficiency;
-.Fa r^n
-is not computed explicitly.
-.Sh RETURN VALUES
-As described above, upon successful completion, the described functions return
-the exponent computed using
-.Dv FLT_RADIX .
-Otherwise the following may occur:
-.Pp
-.Bl -enum -offset indent
-.It
-When the result would cause an overflow, a range error occurs and
-.Dv \*(Pm\*HHUGE_VAL ,
-.Dv \*(Pm\*HHUGE_VALF ,
-or
-.Dv \*(Pm\*HHUGE_VALL
-is returned according to the sign of
-.Fa x
-and the return type of the corresponding function.
-.It
-When the correct value would cause an underflow
-and it is not representable, a range error occurs and
-either 0.0 or an implementation-defined value is returned.
-When an underflow occurs but the correct value is representable,
-a range error occurs but the correct value is returned.
-.It
-If
-.Fa x
-is \*(Pm0 or \*(Pm\Inf,
-.Fa x
-is returned.
-Likewise, if
-.Fa n
-is zero,
-.Fa x
-is returned.
-If
-.Fa x
-is \*(Na, \*(Na is returned.
-.El
-.Sh SEE ALSO
-.Xr exp 3 ,
-.Xr frexp 3 ,
-.Xr ldexp 3 ,
-.Xr math 3
-.Sh STANDARDS
-The described functions conform to
-.St -isoC-99 .
diff --git a/lib/libm/man/sin.3 b/lib/libm/man/sin.3
deleted file mode 100644
index dd37a33b6..000000000
--- a/lib/libm/man/sin.3
+++ /dev/null
@@ -1,73 +0,0 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     from: @(#)sin.3	6.7 (Berkeley) 4/19/91
-.\"	$NetBSD: sin.3,v 1.14 2003/08/07 16:44:49 agc Exp $
-.\"
-.Dd April 19, 1991
-.Dt SIN 3
-.Os
-.Sh NAME
-.Nm sin ,
-.Nm sinf
-.Nd sine function
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn sin "double x"
-.Ft float
-.Fn sinf "float x"
-.Sh DESCRIPTION
-The
-.Fn sin
-function computes the sine of
-.Fa x
-(measured in radians).
-A large magnitude argument may yield a result with little
-or no significance.
-.Sh RETURN VALUES
-The
-.Fn sin
-function returns the sine value.
-.Sh SEE ALSO
-.Xr acos 3 ,
-.Xr asin 3 ,
-.Xr atan 3 ,
-.Xr atan2 3 ,
-.Xr cos 3 ,
-.Xr cosh 3 ,
-.Xr math 3 ,
-.Xr sinh 3 ,
-.Xr tan 3 ,
-.Xr tanh 3
-.Sh STANDARDS
-The
-.Fn sin
-function conforms to
-.St -ansiC .
diff --git a/lib/libm/man/sinh.3 b/lib/libm/man/sinh.3
deleted file mode 100644
index 1059668ba..000000000
--- a/lib/libm/man/sinh.3
+++ /dev/null
@@ -1,75 +0,0 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"	from: @(#)sinh.3	6.6 (Berkeley) 4/19/91
-.\"	$NetBSD: sinh.3,v 1.14 2003/08/07 16:44:49 agc Exp $
-.Dd April 19, 1991
-.Dt SINH 3
-.Os
-.Sh NAME
-.Nm sinh ,
-.Nm sinhf
-.Nd hyperbolic sine function
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn sinh "double x"
-.Ft float
-.Fn sinhf "float x"
-.Sh DESCRIPTION
-The
-.Fn sinh
-function computes the hyperbolic sine of
-.Fa x .
-.Sh RETURN VALUES
-The
-.Fn sinh
-function returns the hyperbolic sine value unless
-the magnitude of
-.Fa x
-is too large; in this event, the global variable
-.Va errno
-is set to
-.Er ERANGE .
-.Sh SEE ALSO
-.Xr acos 3 ,
-.Xr asin 3 ,
-.Xr atan 3 ,
-.Xr atan2 3 ,
-.Xr cos 3 ,
-.Xr cosh 3 ,
-.Xr math 3 ,
-.Xr sin 3 ,
-.Xr tan 3 ,
-.Xr tanh 3
-.Sh STANDARDS
-The
-.Fn sinh
-function conforms to
-.St -ansiC .
diff --git a/lib/libm/man/sqrt.3 b/lib/libm/man/sqrt.3
deleted file mode 100644
index d01ea26be..000000000
--- a/lib/libm/man/sqrt.3
+++ /dev/null
@@ -1,100 +0,0 @@
-.\" Copyright (c) 1985, 1991 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.
-.\"
-.\"     from: @(#)sqrt.3	6.4 (Berkeley) 5/6/91
-.\"	$NetBSD: sqrt.3,v 1.14 2013/11/19 19:24:33 joerg Exp $
-.\"
-.Dd November 19, 2013
-.Dt SQRT 3
-.Os
-.Sh NAME
-.Nm cbrt ,
-.Nm cbrtf ,
-.Nm cbrtl ,
-.Nm sqrt ,
-.Nm sqrtf ,
-.Nm sqrtl
-.Nd cube root and square root functions
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn cbrt "double x"
-.Ft float
-.Fn cbrtf "float x"
-.Ft long double
-.Fn cbrtl "long double x"
-.Ft double
-.Fn sqrt "double x"
-.Ft float
-.Fn sqrtf "float x"
-.Ft long double
-.Fn sqrtl "long double x"
-.Sh DESCRIPTION
-The
-.Fn cbrt ,
-.Fn cbrtf
-and
-.Fn cbrtl
-functions compute
-the cube root of
-.Ar x .
-.Pp
-The
-.Fn sqrt ,
-.Fn sqrtf
-and
-.Fn sqrtl
-functions compute
-the non-negative square root of x.
-.Sh RETURN VALUES
-If x is negative,
-.Fn sqrt "x" ,
-.Fn sqrtf "x"
-and
-.Fn sqrtl "x"
-.\" POSIX_MODE
-set the global variable
-.Va errno
-to EDOM.
-.\" SYSV_MODE
-.\" call
-.\" .Xr matherr 3 .
-.Sh SEE ALSO
-.Xr math 3
-.\" .Xr matherr 3
-.Sh STANDARDS
-The
-.Fn sqrt
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn cbrt
-function appeared in
-.Bx 4.3 .
diff --git a/lib/libm/man/tan.3 b/lib/libm/man/tan.3
deleted file mode 100644
index 05afbf007..000000000
--- a/lib/libm/man/tan.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     from: @(#)tan.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: tan.3,v 1.13 2003/08/07 16:44:49 agc Exp $
-.\"
-.Dd May 2, 1991
-.Dt TAN 3
-.Os
-.Sh NAME
-.Nm tan ,
-.Nm tanf
-.Nd tangent function
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn tan "double x"
-.Ft float
-.Fn tanf "float x"
-.Sh DESCRIPTION
-The
-.Fn tan
-and
-.Fn tanf
-functions compute the tangent of
-.Fa x
-(measured in radians).
-A large magnitude argument may yield a result
-with little or no significance.
-For a discussion of error due to roundoff, see
-.Xr math 3 .
-.Sh RETURN VALUES
-The
-.Fn tan
-function returns the tangent value.
-.Sh SEE ALSO
-.Xr acos 3 ,
-.Xr asin 3 ,
-.Xr atan 3 ,
-.Xr atan2 3 ,
-.Xr cos 3 ,
-.Xr cosh 3 ,
-.Xr math 3 ,
-.Xr sin 3 ,
-.Xr sinh 3 ,
-.Xr tanh 3
-.Sh STANDARDS
-The
-.Fn tan
-function conforms to
-.St -ansiC .
diff --git a/lib/libm/man/tanh.3 b/lib/libm/man/tanh.3
deleted file mode 100644
index cb79ba4e2..000000000
--- a/lib/libm/man/tanh.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 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.
-.\"
-.\"     from: @(#)tanh.3	5.1 (Berkeley) 5/2/91
-.\"	$NetBSD: tanh.3,v 1.15 2011/11/17 23:46:32 wiz Exp $
-.\"
-.Dd September 18, 2011
-.Dt TANH 3
-.Os
-.Sh NAME
-.Nm tanh ,
-.Nm tanhf
-.Nd hyperbolic tangent function
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn tanh "double x"
-.Ft float
-.Fn tanhf "float x"
-.Sh DESCRIPTION
-The
-.Fn tanh
-and
-.Fn tanhf
-functions compute the hyperbolic tangent of
-.Fa x .
-For a discussion of error due to roundoff, see
-.Xr math 3 .
-.Sh RETURN VALUES
-Upon successful completion,
-these functions return the hyperbolic tangent value.
-The following may also occur:
-.Bl -enum -offset indent
-.It
-If
-.Fa x
-is \*(Pm 0,
-.Fa x
-is returned.
-.It
-If
-.Fa x
-is \*(Na, a \*(Na is returned.
-.It
-If
-.Fa x
-is positive infinity, a value 1 is returned;
-if
-.Fa x
-is negative infinity, -1 is returned.
-.It
-If
-.Fa x
-is subnormal, a range error can occur and
-.Fa x
-is returned.
-.El
-.Sh SEE ALSO
-.Xr acos 3 ,
-.Xr asin 3 ,
-.Xr atan 3 ,
-.Xr atan2 3 ,
-.Xr cos 3 ,
-.Xr cosh 3 ,
-.Xr math 3 ,
-.Xr sin 3 ,
-.Xr sinh 3 ,
-.Xr tan 3
-.Sh STANDARDS
-The described functions conform to
-.St -isoC-99 .
diff --git a/lib/libm/man/trunc.3 b/lib/libm/man/trunc.3
deleted file mode 100644
index 9d28520e0..000000000
--- a/lib/libm/man/trunc.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"	$NetBSD: trunc.3,v 1.7 2013/11/13 22:11:52 wiz Exp $
-.\"
-.\" 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: src/lib/msun/man/trunc.3,v 1.3 2005/06/15 19:04:04 ru Exp $
-.\"
-.Dd November 13, 2013
-.Dt TRUNC 3
-.Os
-.Sh NAME
-.Nm trunc ,
-.Nm truncf ,
-.Nm truncl
-.Nd "nearest integral value with magnitude less than or equal to |x|"
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn trunc "double x"
-.Ft float
-.Fn truncf "float x"
-.Ft "long double"
-.Fn truncl "long double x"
-.Sh DESCRIPTION
-The
-.Fn trunc ,
-.Fn truncf ,
-and
-.Fn truncl
-functions return the nearest integral value with magnitude less than
-or equal to
-.Pf | Fa x Ns | .
-They are equivalent to
-.Fn rint ,
-.Fn rintf ,
-and
-.Fn rintl
-respectively, in the
-.Dv FP_RZ
-rounding mode.
-.Sh SEE ALSO
-.Xr ceil 3 ,
-.Xr floor 3 ,
-.Xr fpsetround 3 ,
-.Xr math 3 ,
-.Xr nextafter 3 ,
-.Xr rint 3 ,
-.Xr round 3
-.Sh STANDARDS
-The
-.Fn trunc ,
-.Fn truncf ,
-and
-.Fn truncl
-functions conform to
-.St -isoC-99 .
diff --git a/lib/libm/noieee_src/mathimpl.h b/lib/libm/noieee_src/mathimpl.h
deleted file mode 100644
index d716f1591..000000000
--- a/lib/libm/noieee_src/mathimpl.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*	$NetBSD: mathimpl.h,v 1.10 2011/11/02 02:34:56 christos 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.
- * 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.
- *
- *	@(#)mathimpl.h	8.1 (Berkeley) 6/4/93
- */
-#ifndef _NOIEEE_SRC_MATHIMPL_H_
-#define _NOIEEE_SRC_MATHIMPL_H_
-
-#include <sys/cdefs.h>
-#include <math.h>
-#include <stdint.h>
-
-#if defined(__vax__) || defined(tahoe)
-
-/* Deal with different ways to concatenate in cpp */
-#define cat3(a,b,c)	a ## b ## c
-
-/* Deal with vax/tahoe byte order issues */
-#  ifdef __vax__
-#    define	cat3t(a,b,c) cat3(a,b,c)
-#  else
-#    define	cat3t(a,b,c) cat3(a,c,b)
-#  endif
-
-#  define vccast(name) (cat3(__,name,x).d)
-
-   /*
-    * Define a constant to high precision on a Vax or Tahoe.
-    *
-    * Args are the name to define, the decimal floating point value,
-    * four 16-bit chunks of the float value in hex
-    * (because the vax and tahoe differ in float format!), the power
-    * of 2 of the hex-float exponent, and the hex-float mantissa.
-    * Most of these arguments are not used at compile time; they are
-    * used in a post-check to make sure the constants were compiled
-    * correctly.
-    *
-    * People who want to use the constant will have to do their own
-    *     #define foo vccast(foo)
-    * since CPP cannot do this for them from inside another macro (sigh).
-    * We define "vccast" if this needs doing.
-    */
-#ifdef _LIBM_DECLARE
-#  define vc(name, value, x1,x2,x3,x4, bexp, xval) \
-    const union { uint32_t l[2]; double d; } cat3(__,name,x) = { \
-	.l = { [0] = cat3t(0x,x1,x2), [1] = cat3t(0x,x3,x4) } };
-#elif defined(_LIBM_STATIC)
-#  define vc(name, value, x1,x2,x3,x4, bexp, xval) \
-    static const union { uint32_t l[2]; double d; } cat3(__,name,x) = { \
-	.l = { [0] = cat3t(0x,x1,x2), [1] = cat3t(0x,x3,x4) } };
-#else
-#  define vc(name, value, x1,x2,x3,x4, bexp, xval) \
-	extern const union { uint32_t l[2]; double d; } cat3(__,name,x);
-#endif
-#  define ic(name, value, bexp, xval) 
-
-#else	/* __vax__ or tahoe */
-
-   /* Hooray, we have an IEEE machine */
-#  undef vccast
-#  define vc(name, value, x1,x2,x3,x4, bexp, xval) 
-
-#ifdef _LIBM_DECLARE
-#  define ic(name, value, bexp, xval) \
-	const double __CONCAT(__,name) = value;
-#elif _LIBM_STATIC
-#  define ic(name, value, bexp, xval) \
-	static const double __CONCAT(__,name) = value;
-#else
-#  define ic(name, value, bexp, xval) \
-	extern const double __CONCAT(__,name);
-#endif
-
-#endif	/* defined(__vax__)||defined(tahoe) */
-
-#ifdef __vax__
-#include <machine/float.h>
-#define _TINY	DBL_EPSILON
-#define _TINYER	DBL_EPSILON
-#define _HUGE	DBL_MAX
-#else
-#define _TINY	1e-300
-#define _TINYER	1e-308
-#define _HUGE	1e+300
-#endif
-
-
-/*
- * Functions internal to the math package, yet not static.
- */
-extern double	__exp__E(double, double);
-extern double	__log__L(double);
-extern int	infnan(int);
-
-struct Double {double a, b;};
-double __exp__D(double, double);
-struct Double __log__D(double);
-
-#endif /* _NOIEEE_SRC_MATHIMPL_H_ */
diff --git a/lib/libm/noieee_src/n_acosh.c b/lib/libm/noieee_src/n_acosh.c
deleted file mode 100644
index 7b553480d..000000000
--- a/lib/libm/noieee_src/n_acosh.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*	$NetBSD: n_acosh.c,v 1.6 2003/08/07 16:44:50 agc Exp $	*/
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)acosh.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* ACOSH(X)
- * RETURN THE INVERSE HYPERBOLIC COSINE OF X
- * DOUBLE PRECISION (VAX D FORMAT 56 BITS, IEEE DOUBLE 53 BITS)
- * CODED IN C BY K.C. NG, 2/16/85;
- * REVISED BY K.C. NG on 3/6/85, 3/24/85, 4/16/85, 8/17/85.
- *
- * Required system supported functions :
- *	sqrt(x)
- *
- * Required kernel function:
- *	log1p(x) 		...return log(1+x)
- *
- * Method :
- *	Based on
- *		acosh(x) = log [ x + sqrt(x*x-1) ]
- *	we have
- *		acosh(x) := log1p(x)+ln2,	if (x > 1.0E20); else
- *		acosh(x) := log1p( sqrt(x-1) * (sqrt(x-1) + sqrt(x+1)) ) .
- *	These formulae avoid the over/underflow complication.
- *
- * Special cases:
- *	acosh(x) is NaN with signal if x<1.
- *	acosh(NaN) is NaN without signal.
- *
- * Accuracy:
- *	acosh(x) returns the exact inverse hyperbolic cosine of x nearly
- *	rounded. In a test run with 512,000 random arguments on a VAX, the
- *	maximum observed error was 3.30 ulps (units of the last place) at
- *	x=1.0070493753568216 .
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-
-#define _LIBM_STATIC
-#include "mathimpl.h"
-
-vc(ln2hi, 6.9314718055829871446E-1  ,7217,4031,0000,f7d0,   0, .B17217F7D00000)
-vc(ln2lo, 1.6465949582897081279E-12 ,bcd5,2ce7,d9cc,e4f1, -39, .E7BCD5E4F1D9CC)
-
-ic(ln2hi, 6.9314718036912381649E-1,  -1, 1.62E42FEE00000)
-ic(ln2lo, 1.9082149292705877000E-10,-33, 1.A39EF35793C76)
-
-#ifdef vccast
-#define    ln2hi    vccast(ln2hi)
-#define    ln2lo    vccast(ln2lo)
-#endif
-
-double
-acosh(double x)
-{
-	double t,big=1.E20; /* big+1==big */
-
-#if !defined(__vax__)&&!defined(tahoe)
-	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-
-    /* return log1p(x) + log(2) if x is large */
-	if(x>big) {t=log1p(x)+ln2lo; return(t+ln2hi);}
-
-	t=sqrt(x-1.0);
-	return(log1p(t*(t+sqrt(x+1.0))));
-}
diff --git a/lib/libm/noieee_src/n_asincos.c b/lib/libm/noieee_src/n_asincos.c
deleted file mode 100644
index 53cd3077a..000000000
--- a/lib/libm/noieee_src/n_asincos.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*	$NetBSD: n_asincos.c,v 1.8 2013/11/24 14:41:53 martin Exp $	*/
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)asincos.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* ASIN(X)
- * RETURNS ARC SINE OF X
- * DOUBLE PRECISION (IEEE DOUBLE 53 bits, VAX D FORMAT 56 bits)
- * CODED IN C BY K.C. NG, 4/16/85, REVISED ON 6/10/85.
- *
- * Required system supported functions:
- *	copysign(x,y)
- *	sqrt(x)
- *
- * Required kernel function:
- *	atan2(y,x)
- *
- * Method :
- *	asin(x) = atan2(x,sqrt(1-x*x)); for better accuracy, 1-x*x is
- *		  computed as follows
- *			1-x*x                     if x <  0.5,
- *			2*(1-|x|)-(1-|x|)*(1-|x|) if x >= 0.5.
- *
- * Special cases:
- *	if x is NaN, return x itself;
- *	if |x|>1, return NaN.
- *
- * Accuracy:
- * 1)  If atan2() uses machine PI, then
- *
- *	asin(x) returns (PI/pi) * (the exact arc sine of x) nearly rounded;
- *	and PI is the exact pi rounded to machine precision (see atan2 for
- *      details):
- *
- *	in decimal:
- *		pi = 3.141592653589793 23846264338327 .....
- *    53 bits   PI = 3.141592653589793 115997963 ..... ,
- *    56 bits   PI = 3.141592653589793 227020265 ..... ,
- *
- *	in hexadecimal:
- *		pi = 3.243F6A8885A308D313198A2E....
- *    53 bits   PI = 3.243F6A8885A30  =  2 * 1.921FB54442D18	error=.276ulps
- *    56 bits   PI = 3.243F6A8885A308 =  4 * .C90FDAA22168C2    error=.206ulps
- *
- *	In a test run with more than 200,000 random arguments on a VAX, the
- *	maximum observed error in ulps (units in the last place) was
- *	2.06 ulps.      (comparing against (PI/pi)*(exact asin(x)));
- *
- * 2)  If atan2() uses true pi, then
- *
- *	asin(x) returns the exact asin(x) with error below about 2 ulps.
- *
- *	In a test run with more than 1,024,000 random arguments on a VAX, the
- *	maximum observed error in ulps (units in the last place) was
- *      1.99 ulps.
- */
-
-#include "mathimpl.h"
-
-double
-asin(double x)
-{
-	double s,t,one=1.0;
-#if !defined(__vax__)&&!defined(tahoe)
-	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-	s=copysign(x,one);
-	if(s <= 0.5)
-	    return(atan2(x,sqrt(one-x*x)));
-	else
-	    { t=one-s; s=t+t; return(atan2(x,sqrt(s-t*t))); }
-
-}
-
-float
-asinf(float x)
-{
-	return (float)asin(x);
-}
-
-/* ACOS(X)
- * RETURNS ARC COS OF X
- * DOUBLE PRECISION (IEEE DOUBLE 53 bits, VAX D FORMAT 56 bits)
- * CODED IN C BY K.C. NG, 4/16/85, REVISED ON 6/10/85.
- *
- * Required system supported functions:
- *	copysign(x,y)
- *	sqrt(x)
- *
- * Required kernel function:
- *	atan2(y,x)
- *
- * Method :
- *			      ________
- *                           / 1 - x
- *	acos(x) = 2*atan2(  / -------- , 1 ) .
- *                        \/   1 + x
- *
- * Special cases:
- *	if x is NaN, return x itself;
- *	if |x|>1, return NaN.
- *
- * Accuracy:
- * 1)  If atan2() uses machine PI, then
- *
- *	acos(x) returns (PI/pi) * (the exact arc cosine of x) nearly rounded;
- *	and PI is the exact pi rounded to machine precision (see atan2 for
- *      details):
- *
- *	in decimal:
- *		pi = 3.141592653589793 23846264338327 .....
- *    53 bits   PI = 3.141592653589793 115997963 ..... ,
- *    56 bits   PI = 3.141592653589793 227020265 ..... ,
- *
- *	in hexadecimal:
- *		pi = 3.243F6A8885A308D313198A2E....
- *    53 bits   PI = 3.243F6A8885A30  =  2 * 1.921FB54442D18	error=.276ulps
- *    56 bits   PI = 3.243F6A8885A308 =  4 * .C90FDAA22168C2    error=.206ulps
- *
- *	In a test run with more than 200,000 random arguments on a VAX, the
- *	maximum observed error in ulps (units in the last place) was
- *	2.07 ulps.      (comparing against (PI/pi)*(exact acos(x)));
- *
- * 2)  If atan2() uses true pi, then
- *
- *	acos(x) returns the exact acos(x) with error below about 2 ulps.
- *
- *	In a test run with more than 1,024,000 random arguments on a VAX, the
- *	maximum observed error in ulps (units in the last place) was
- *	2.15 ulps.
- */
-
-double
-acos(double x)
-{
-	double t,one=1.0;
-#if !defined(__vax__)&&!defined(tahoe)
-	if(x!=x) return(x);
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-	if( x != -1.0)
-	    t=atan2(sqrt((one-x)/(one+x)),one);
-	else
-	    t=atan2(one,0.0);	/* t = PI/2 */
-	return(t+t);
-}
-
-float
-acosf(float x)
-{
-	return (float)acos(x);
-}
diff --git a/lib/libm/noieee_src/n_asinh.c b/lib/libm/noieee_src/n_asinh.c
deleted file mode 100644
index bbf48e02d..000000000
--- a/lib/libm/noieee_src/n_asinh.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*	$NetBSD: n_asinh.c,v 1.7 2008/04/29 15:10:02 uwe Exp $	*/
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)asinh.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* ASINH(X)
- * RETURN THE INVERSE HYPERBOLIC SINE OF X
- * DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
- * CODED IN C BY K.C. NG, 2/16/85;
- * REVISED BY K.C. NG on 3/7/85, 3/24/85, 4/16/85.
- *
- * Required system supported functions :
- *	copysign(x,y)
- *	sqrt(x)
- *
- * Required kernel function:
- *	log1p(x) 		...return log(1+x)
- *
- * Method :
- *	Based on
- *		asinh(x) = sign(x) * log [ |x| + sqrt(x*x+1) ]
- *	we have
- *	asinh(x) := x  if  1+x*x=1,
- *		 := sign(x)*(log1p(x)+ln2))	 if sqrt(1+x*x)=x, else
- *		 := sign(x)*log1p(|x| + |x|/(1/|x| + sqrt(1+(1/|x|)^2)) )
- *
- * Accuracy:
- *	asinh(x) returns the exact inverse hyperbolic sine of x nearly rounded.
- *	In a test run with 52,000 random arguments on a VAX, the maximum
- *	observed error was 1.58 ulps (units in the last place).
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-#define _LIBM_STATIC
-#include "mathimpl.h"
-
-vc(ln2hi, 6.9314718055829871446E-1  ,7217,4031,0000,f7d0,   0, .B17217F7D00000)
-vc(ln2lo, 1.6465949582897081279E-12 ,bcd5,2ce7,d9cc,e4f1, -39, .E7BCD5E4F1D9CC)
-
-ic(ln2hi, 6.9314718036912381649E-1,   -1, 1.62E42FEE00000)
-ic(ln2lo, 1.9082149292705877000E-10, -33, 1.A39EF35793C76)
-
-#ifdef vccast
-#define    ln2hi    vccast(ln2hi)
-#define    ln2lo    vccast(ln2lo)
-#endif
-
-double
-asinh(double x)
-{
-	double t,s;
-	static const double	small=1.0E-10,	/* fl(1+small*small) == 1 */
-				big  =1.0E20,	/* fl(1+big) == big */
-				one  =1.0   ;
-
-#if !defined(__vax__)&&!defined(tahoe)
-	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-	if((t=copysign(x,one))>small)
-	    if(t<big) {
-	     	s=one/t; return(copysign(log1p(t+t/(s+sqrt(one+s*s))),x)); }
-	    else	/* if |x| > big */
-		{s=log1p(t)+ln2lo; return(copysign(s+ln2hi,x));}
-	else	/* if |x| < small */
-	    return(x);
-}
diff --git a/lib/libm/noieee_src/n_atan.c b/lib/libm/noieee_src/n_atan.c
deleted file mode 100644
index 9904cd87e..000000000
--- a/lib/libm/noieee_src/n_atan.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*	$NetBSD: n_atan.c,v 1.6 2013/11/24 14:41:53 martin Exp $	*/
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)atan.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* ATAN(X)
- * RETURNS ARC TANGENT OF X
- * DOUBLE PRECISION (IEEE DOUBLE 53 bits, VAX D FORMAT 56 bits)
- * CODED IN C BY K.C. NG, 4/16/85, REVISED ON 6/10/85.
- *
- * Required kernel function:
- *	atan2(y,x)
- *
- * Method:
- *	atan(x) = atan2(x,1.0).
- *
- * Special case:
- *	if x is NaN, return x itself.
- *
- * Accuracy:
- * 1)  If atan2() uses machine PI, then
- *
- *	atan(x) returns (PI/pi) * (the exact arc tangent of x) nearly rounded;
- *	and PI is the exact pi rounded to machine precision (see atan2 for
- *      details):
- *
- *	in decimal:
- *		pi = 3.141592653589793 23846264338327 .....
- *    53 bits   PI = 3.141592653589793 115997963 ..... ,
- *    56 bits   PI = 3.141592653589793 227020265 ..... ,
- *
- *	in hexadecimal:
- *		pi = 3.243F6A8885A308D313198A2E....
- *    53 bits   PI = 3.243F6A8885A30  =  2 * 1.921FB54442D18	error=.276ulps
- *    56 bits   PI = 3.243F6A8885A308 =  4 * .C90FDAA22168C2    error=.206ulps
- *
- *	In a test run with more than 200,000 random arguments on a VAX, the
- *	maximum observed error in ulps (units in the last place) was
- *	0.86 ulps.      (comparing against (PI/pi)*(exact atan(x))).
- *
- * 2)  If atan2() uses true pi, then
- *
- *	atan(x) returns the exact atan(x) with error below about 2 ulps.
- *
- *	In a test run with more than 1,024,000 random arguments on a VAX, the
- *	maximum observed error in ulps (units in the last place) was
- *	0.85 ulps.
- */
-#include "mathimpl.h"
-
-double
-atan(double x)
-{
-	double one=1.0;
-	return(atan2(x,one));
-}
-
-float
-atanf(float x)
-{
-	float one=1.0;
-	return (float)atan2(x,one);
-}
-
diff --git a/lib/libm/noieee_src/n_atan2.c b/lib/libm/noieee_src/n_atan2.c
deleted file mode 100644
index 996cee516..000000000
--- a/lib/libm/noieee_src/n_atan2.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*      $NetBSD: n_atan2.c,v 1.7 2014/10/10 20:58:09 martin Exp $        */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)atan2.c	8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
-/* ATAN2(Y,X)
- * RETURN ARG (X+iY)
- * DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
- * CODED IN C BY K.C. NG, 1/8/85;
- * REVISED BY K.C. NG on 2/7/85, 2/13/85, 3/7/85, 3/30/85, 6/29/85.
- *
- * Required system supported functions :
- *	copysign(x,y)
- *	scalb(x,y)
- *	logb(x)
- *
- * Method :
- *	1. Reduce y to positive by atan2(y,x)=-atan2(-y,x).
- *	2. Reduce x to positive by (if x and y are unexceptional):
- *		ARG (x+iy) = arctan(y/x)   	   ... if x > 0,
- *		ARG (x+iy) = pi - arctan[y/(-x)]   ... if x < 0,
- *	3. According to the integer k=4t+0.25 truncated , t=y/x, the argument
- *	   is further reduced to one of the following intervals and the
- *	   arctangent of y/x is evaluated by the corresponding formula:
- *
- *         [0,7/16]	   atan(y/x) = t - t^3*(a1+t^2*(a2+...(a10+t^2*a11)...)
- *	   [7/16,11/16]    atan(y/x) = atan(1/2) + atan( (y-x/2)/(x+y/2) )
- *	   [11/16.19/16]   atan(y/x) = atan( 1 ) + atan( (y-x)/(x+y) )
- *	   [19/16,39/16]   atan(y/x) = atan(3/2) + atan( (y-1.5x)/(x+1.5y) )
- *	   [39/16,INF]     atan(y/x) = atan(INF) + atan( -x/y )
- *
- * Special cases:
- * Notations: atan2(y,x) == ARG (x+iy) == ARG(x,y).
- *
- *	ARG( NAN , (anything) ) is NaN;
- *	ARG( (anything), NaN ) is NaN;
- *	ARG(+(anything but NaN), +-0) is +-0  ;
- *	ARG(-(anything but NaN), +-0) is +-PI ;
- *	ARG( 0, +-(anything but 0 and NaN) ) is +-PI/2;
- *	ARG( +INF,+-(anything but INF and NaN) ) is +-0 ;
- *	ARG( -INF,+-(anything but INF and NaN) ) is +-PI;
- *	ARG( +INF,+-INF ) is +-PI/4 ;
- *	ARG( -INF,+-INF ) is +-3PI/4;
- *	ARG( (anything but,0,NaN, and INF),+-INF ) is +-PI/2;
- *
- * Accuracy:
- *	atan2(y,x) returns (PI/pi) * the exact ARG (x+iy) nearly rounded,
- *	where
- *
- *	in decimal:
- *		pi = 3.141592653589793 23846264338327 .....
- *    53 bits   PI = 3.141592653589793 115997963 ..... ,
- *    56 bits   PI = 3.141592653589793 227020265 ..... ,
- *
- *	in hexadecimal:
- *		pi = 3.243F6A8885A308D313198A2E....
- *    53 bits   PI = 3.243F6A8885A30  =  2 * 1.921FB54442D18	error=.276ulps
- *    56 bits   PI = 3.243F6A8885A308 =  4 * .C90FDAA22168C2    error=.206ulps
- *
- *	In a test run with 356,000 random argument on [-1,1] * [-1,1] on a
- *	VAX, the maximum observed error was 1.41 ulps (units of the last place)
- *	compared with (PI/pi)*(the exact ARG(x+iy)).
- *
- * Note:
- *	We use machine PI (the true pi rounded) in place of the actual
- *	value of pi for all the trig and inverse trig functions. In general,
- *	if trig is one of sin, cos, tan, then computed trig(y) returns the
- *	exact trig(y*pi/PI) nearly rounded; correspondingly, computed arctrig
- *	returns the exact arctrig(y)*PI/pi nearly rounded. These guarantee the
- *	trig functions have period PI, and trig(arctrig(x)) returns x for
- *	all critical values x.
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-
-#define _LIBM_STATIC
-#include "mathimpl.h"
-
-vc(athfhi, 4.6364760900080611433E-1  ,6338,3fed,da7b,2b0d,  -1, .ED63382B0DDA7B)
-vc(athflo, 1.9338828231967579916E-19 ,5005,2164,92c0,9cfe, -62, .E450059CFE92C0)
-vc(PIo4,   7.8539816339744830676E-1  ,0fda,4049,68c2,a221,   0, .C90FDAA22168C2)
-vc(at1fhi, 9.8279372324732906796E-1  ,985e,407b,b4d9,940f,   0, .FB985E940FB4D9)
-vc(at1flo,-3.5540295636764633916E-18 ,1edc,a383,eaea,34d6, -57,-.831EDC34D6EAEA)
-vc(PIo2,   1.5707963267948966135E0   ,0fda,40c9,68c2,a221,   1, .C90FDAA22168C2)
-vc(PI,     3.1415926535897932270E0   ,0fda,4149,68c2,a221,   2, .C90FDAA22168C2)
-vc(a1,     3.3333333333333473730E-1  ,aaaa,3faa,ab75,aaaa,  -1, .AAAAAAAAAAAB75)
-vc(a2,    -2.0000000000017730678E-1  ,cccc,bf4c,946e,cccd,  -2,-.CCCCCCCCCD946E)
-vc(a3,     1.4285714286694640301E-1  ,4924,3f12,4262,9274,  -2, .92492492744262)
-vc(a4,    -1.1111111135032672795E-1  ,8e38,bee3,6292,ebc6,  -3,-.E38E38EBC66292)
-vc(a5,     9.0909091380563043783E-2  ,2e8b,3eba,d70c,b31b,  -3, .BA2E8BB31BD70C)
-vc(a6,    -7.6922954286089459397E-2  ,89c8,be9d,7f18,27c3,  -3,-.9D89C827C37F18)
-vc(a7,     6.6663180891693915586E-2  ,86b4,3e88,9e58,ae37,  -3, .8886B4AE379E58)
-vc(a8,    -5.8772703698290408927E-2  ,bba5,be70,a942,8481,  -4,-.F0BBA58481A942)
-vc(a9,     5.2170707402812969804E-2  ,b0f3,3e55,13ab,a1ab,  -4, .D5B0F3A1AB13AB)
-vc(a10,   -4.4895863157820361210E-2  ,e4b9,be37,048f,7fd1,  -4,-.B7E4B97FD1048F)
-vc(a11,    3.3006147437343875094E-2  ,3174,3e07,2d87,3cf7,  -4, .8731743CF72D87)
-vc(a12,   -1.4614844866464185439E-2  ,731a,bd6f,76d9,2f34,  -6,-.EF731A2F3476D9)
-
-ic(athfhi, 4.6364760900080609352E-1  ,  -2,  1.DAC670561BB4F)
-ic(athflo, 4.6249969567426939759E-18 , -58,  1.5543B8F253271)
-ic(PIo4,   7.8539816339744827900E-1  ,  -1,  1.921FB54442D18)
-ic(at1fhi, 9.8279372324732905408E-1  ,  -1,  1.F730BD281F69B)
-ic(at1flo,-2.4407677060164810007E-17 , -56, -1.C23DFEFEAE6B5)
-ic(PIo2,   1.5707963267948965580E0   ,   0,  1.921FB54442D18)
-ic(PI,     3.1415926535897931160E0   ,   1,  1.921FB54442D18)
-ic(a1,     3.3333333333333942106E-1  ,  -2,  1.55555555555C3)
-ic(a2,    -1.9999999999979536924E-1  ,  -3, -1.9999999997CCD)
-ic(a3,     1.4285714278004377209E-1  ,  -3,  1.24924921EC1D7)
-ic(a4,    -1.1111110579344973814E-1  ,  -4, -1.C71C7059AF280)
-ic(a5,     9.0908906105474668324E-2  ,  -4,  1.745CE5AA35DB2)
-ic(a6,    -7.6919217767468239799E-2  ,  -4, -1.3B0FA54BEC400)
-ic(a7,     6.6614695906082474486E-2  ,  -4,  1.10DA924597FFF)
-ic(a8,    -5.8358371008508623523E-2  ,  -5, -1.DE125FDDBD793)
-ic(a9,     4.9850617156082015213E-2  ,  -5,  1.9860524BDD807)
-ic(a10,   -3.6700606902093604877E-2  ,  -5, -1.2CA6C04C6937A)
-ic(a11,    1.6438029044759730479E-2  ,  -6,  1.0D52174A1BB54)
-
-#ifdef vccast
-#define	athfhi	vccast(athfhi)
-#define	athflo	vccast(athflo)
-#define	PIo4	vccast(PIo4)
-#define	at1fhi	vccast(at1fhi)
-#define	at1flo	vccast(at1flo)
-#define	PIo2	vccast(PIo2)
-#define	PI	vccast(PI)
-#define	a1	vccast(a1)
-#define	a2	vccast(a2)
-#define	a3	vccast(a3)
-#define	a4	vccast(a4)
-#define	a5	vccast(a5)
-#define	a6	vccast(a6)
-#define	a7	vccast(a7)
-#define	a8	vccast(a8)
-#define	a9	vccast(a9)
-#define	a10	vccast(a10)
-#define	a11	vccast(a11)
-#define	a12	vccast(a12)
-#endif
-
-#ifdef __weak_alias
-__weak_alias(_atan2l, atan2);
-#endif
-
-double
-atan2(double y, double x)
-{
-	static const double zero=0, one=1, small=1.0E-9, big=1.0E18;
-	double t,z,signy,signx,hi,lo;
-	int k,m;
-
-#if !defined(__vax__)&&!defined(tahoe)
-    /* if x or y is NAN */
-	if(x!=x) return(x); if(y!=y) return(y);
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-
-    /* copy down the sign of y and x */
-	signy = copysign(one,y) ;
-	signx = copysign(one,x) ;
-
-    /* if x is 1.0, goto begin */
-	if(x==1) { y=copysign(y,one); t=y; if(finite(t)) goto begin;}
-
-    /* when y = 0 */
-	if(y==zero) return((signx==one)?y:copysign(PI,signy));
-
-    /* when x = 0 */
-	if(x==zero) return(copysign(PIo2,signy));
-
-    /* when x is INF */
-	if(!finite(x))
-	    if(!finite(y))
-		return(copysign((signx==one)?PIo4:3*PIo4,signy));
-	    else
-		return(copysign((signx==one)?zero:PI,signy));
-
-    /* when y is INF */
-	if(!finite(y)) return(copysign(PIo2,signy));
-
-    /* compute y/x */
-	x=copysign(x,one);
-	y=copysign(y,one);
-	if((m=(k=logb(y))-logb(x)) > 60) t=big+big;
-	    else if(m < -80 ) t=y/x;
-	    else { t = y/x ; y = scalb(y,-k); x=scalb(x,-k); }
-
-    /* begin argument reduction */
-begin:
-	if (t < 2.4375) {
-
-	/* truncate 4(t+1/16) to integer for branching */
-	    k = 4 * (t+0.0625);
-	    switch (k) {
-
-	    /* t is in [0,7/16] */
-	    case 0:
-	    case 1:
-		if (t < small)
-		    { big + small ;  /* raise inexact flag */
-		      return (copysign((signx>zero)?t:PI-t,signy)); }
-
-		hi = zero;  lo = zero;  break;
-
-	    /* t is in [7/16,11/16] */
-	    case 2:
-		hi = athfhi; lo = athflo;
-		z = x+x;
-		t = ( (y+y) - x ) / ( z +  y ); break;
-
-	    /* t is in [11/16,19/16] */
-	    case 3:
-	    case 4:
-		hi = PIo4; lo = zero;
-		t = ( y - x ) / ( x + y ); break;
-
-	    /* t is in [19/16,39/16] */
-	    default:
-		hi = at1fhi; lo = at1flo;
-		z = y-x; y=y+y+y; t = x+x;
-		t = ( (z+z)-x ) / ( t + y ); break;
-	    }
-	}
-	/* end of if (t < 2.4375) */
-
-	else
-	{
-	    hi = PIo2; lo = zero;
-
-	    /* t is in [2.4375, big] */
-	    if (t <= big)  t = - x / y;
-
-	    /* t is in [big, INF] */
-	    else
-	      { big+small;	/* raise inexact flag */
-		t = zero; }
-	}
-    /* end of argument reduction */
-
-    /* compute atan(t) for t in [-.4375, .4375] */
-	z = t*t;
-#if defined(__vax__)||defined(tahoe)
-	z = t*(z*(a1+z*(a2+z*(a3+z*(a4+z*(a5+z*(a6+z*(a7+z*(a8+
-			z*(a9+z*(a10+z*(a11+z*a12))))))))))));
-#else	/* defined(__vax__)||defined(tahoe) */
-	z = t*(z*(a1+z*(a2+z*(a3+z*(a4+z*(a5+z*(a6+z*(a7+z*(a8+
-			z*(a9+z*(a10+z*a11)))))))))));
-#endif	/* defined(__vax__)||defined(tahoe) */
-	z = lo - z; z += t; z += hi;
-
-	return(copysign((signx>zero)?z:PI-z,signy));
-}
diff --git a/lib/libm/noieee_src/n_atanh.c b/lib/libm/noieee_src/n_atanh.c
deleted file mode 100644
index 6498ee844..000000000
--- a/lib/libm/noieee_src/n_atanh.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*      $NetBSD: n_atanh.c,v 1.7 2003/08/07 16:44:50 agc Exp $ */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)atanh.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* ATANH(X)
- * RETURN THE HYPERBOLIC ARC TANGENT OF X
- * DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
- * CODED IN C BY K.C. NG, 1/8/85;
- * REVISED BY K.C. NG on 2/7/85, 3/7/85, 8/18/85.
- *
- * Required kernel function:
- *	log1p(x) 	...return log(1+x)
- *
- * Method :
- *	Return
- *                          1              2x                          x
- *		atanh(x) = --- * log(1 + -------) = 0.5 * log1p(2 * --------)
- *                          2             1 - x                      1 - x
- *
- * Special cases:
- *	atanh(x) is NaN if |x| > 1 with signal;
- *	atanh(NaN) is that NaN with no signal;
- *	atanh(+-1) is +-INF with signal.
- *
- * Accuracy:
- *	atanh(x) returns the exact hyperbolic arc tangent of x nearly rounded.
- *	In a test run with 512,000 random arguments on a VAX, the maximum
- *	observed error was 1.87 ulps (units in the last place) at
- *	x= -3.8962076028810414000e-03.
- */
-#include "mathimpl.h"
-
-#if defined(__vax__)||defined(tahoe)
-#include <errno.h>
-#endif	/* defined(__vax__)||defined(tahoe) */
-
-double
-atanh(double x)
-{
-	double z;
-	z = copysign(0.5,x);
-	x = copysign(x,1.0);
-#if defined(__vax__)||defined(tahoe)
-	if (x == 1.0) {
-	    return(copysign(1.0,z)*infnan(ERANGE));	/* sign(x)*INF */
-	}
-#endif	/* defined(__vax__)||defined(tahoe) */
-	x = x/(1.0-x);
-	return( z*log1p(x+x) );
-}
diff --git a/lib/libm/noieee_src/n_cabs.c b/lib/libm/noieee_src/n_cabs.c
deleted file mode 100644
index d21b543e4..000000000
--- a/lib/libm/noieee_src/n_cabs.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*      $NetBSD: n_cabs.c,v 1.5 2003/08/07 16:44:50 agc Exp $ */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)cabs.c	8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
-/* HYPOT(X,Y)
- * RETURN THE SQUARE ROOT OF X^2 + Y^2  WHERE Z=X+iY
- * DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
- * CODED IN C BY K.C. NG, 11/28/84;
- * REVISED BY K.C. NG, 7/12/85.
- *
- * Required system supported functions :
- *	copysign(x,y)
- *	finite(x)
- *	scalb(x,N)
- *	sqrt(x)
- *
- * Method :
- *	1. replace x by |x| and y by |y|, and swap x and
- *	   y if y > x (hence x is never smaller than y).
- *	2. Hypot(x,y) is computed by:
- *	   Case I, x/y > 2
- *
- *				       y
- *		hypot = x + -----------------------------
- *			 		    2
- *			    sqrt ( 1 + [x/y]  )  +  x/y
- *
- *	   Case II, x/y <= 2
- *				                   y
- *		hypot = x + --------------------------------------------------
- *				          		     2
- *				     			[x/y]   -  2
- *			   (sqrt(2)+1) + (x-y)/y + -----------------------------
- *			 		    			  2
- *			    			  sqrt ( 1 + [x/y]  )  + sqrt(2)
- *
- *
- *
- * Special cases:
- *	hypot(x,y) is INF if x or y is +INF or -INF; else
- *	hypot(x,y) is NAN if x or y is NAN.
- *
- * Accuracy:
- * 	hypot(x,y) returns the sqrt(x^2+y^2) with error less than 1 ulps (units
- *	in the last place). See Kahan's "Interval Arithmetic Options in the
- *	Proposed IEEE Floating Point Arithmetic Standard", Interval Mathematics
- *      1980, Edited by Karl L.E. Nickel, pp 99-128. (A faster but less accurate
- *	code follows in	comments.) In a test run with 500,000 random arguments
- *	on a VAX, the maximum observed error was .959 ulps.
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-#define _LIBM_STATIC
-#include "mathimpl.h"
-
-vc(r2p1hi, 2.4142135623730950345E0   ,8279,411a,ef32,99fc,   2, .9A827999FCEF32)
-vc(r2p1lo, 1.4349369327986523769E-17 ,597d,2484,754b,89b3, -55, .84597D89B3754B)
-vc(sqrt2,  1.4142135623730950622E0   ,04f3,40b5,de65,33f9,   1, .B504F333F9DE65)
-
-ic(r2p1hi, 2.4142135623730949234E0   ,   1, 1.3504F333F9DE6)
-ic(r2p1lo, 1.2537167179050217666E-16 , -53, 1.21165F626CDD5)
-ic(sqrt2,  1.4142135623730951455E0   ,   0, 1.6A09E667F3BCD)
-
-#ifdef vccast
-#define	r2p1hi	vccast(r2p1hi)
-#define	r2p1lo	vccast(r2p1lo)
-#define	sqrt2	vccast(sqrt2)
-#endif
-
-double
-hypot(double x, double y)
-{
-	static const double zero=0, one=1,
-		      small=1.0E-18;	/* fl(1+small)==1 */
-	static const ibig=30;	/* fl(1+2**(2*ibig))==1 */
-	double t,r;
-	int exp;
-
-	if(finite(x))
-	    if(finite(y))
-	    {
-		x=copysign(x,one);
-		y=copysign(y,one);
-		if(y > x)
-		    { t=x; x=y; y=t; }
-		if(x == zero) return(zero);
-		if(y == zero) return(x);
-		exp= logb(x);
-		if(exp-(int)logb(y) > ibig )
-			/* raise inexact flag and return |x| */
-		   { one+small; return(x); }
-
-	    /* start computing sqrt(x^2 + y^2) */
-		r=x-y;
-		if(r>y) { 	/* x/y > 2 */
-		    r=x/y;
-		    r=r+sqrt(one+r*r); }
-		else {		/* 1 <= x/y <= 2 */
-		    r/=y; t=r*(r+2.0);
-		    r+=t/(sqrt2+sqrt(2.0+t));
-		    r+=r2p1lo; r+=r2p1hi; }
-
-		r=y/r;
-		return(x+r);
-
-	    }
-
-	    else if(y==y)   	   /* y is +-INF */
-		     return(copysign(y,one));
-	    else
-		     return(y);	   /* y is NaN and x is finite */
-
-	else if(x==x) 		   /* x is +-INF */
-	         return (copysign(x,one));
-	else if(finite(y))
-	         return(x);		   /* x is NaN, y is finite */
-#if !defined(__vax__)&&!defined(tahoe)
-	else if(y!=y) return(y);  /* x and y is NaN */
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-	else return(copysign(y,one));   /* y is INF */
-}
-
-/* CABS(Z)
- * RETURN THE ABSOLUTE VALUE OF THE COMPLEX NUMBER  Z = X + iY
- * DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
- * CODED IN C BY K.C. NG, 11/28/84.
- * REVISED BY K.C. NG, 7/12/85.
- *
- * Required kernel function :
- *	hypot(x,y)
- *
- * Method :
- *	cabs(z) = hypot(x,y) .
- */
-
-struct complex { double x, y; };
-
-double
-cabs(z)
-struct complex z;
-{
-	return hypot(z.x,z.y);
-}
-
-double
-z_abs(z)
-struct complex *z;
-{
-	return hypot(z->x,z->y);
-}
-
-/* A faster but less accurate version of cabs(x,y) */
-#if 0
-double hypot(x,y)
-double x, y;
-{
-	static const double zero=0, one=1;
-		      small=1.0E-18;	/* fl(1+small)==1 */
-	static const ibig=30;	/* fl(1+2**(2*ibig))==1 */
-	double temp;
-	int exp;
-
-	if(finite(x))
-	    if(finite(y))
-	    {
-		x=copysign(x,one);
-		y=copysign(y,one);
-		if(y > x)
-		    { temp=x; x=y; y=temp; }
-		if(x == zero) return(zero);
-		if(y == zero) return(x);
-		exp= logb(x);
-		x=scalb(x,-exp);
-		if(exp-(int)logb(y) > ibig )
-			/* raise inexact flag and return |x| */
-		   { one+small; return(scalb(x,exp)); }
-		else y=scalb(y,-exp);
-		return(scalb(sqrt(x*x+y*y),exp));
-	    }
-
-	    else if(y==y)   	   /* y is +-INF */
-		     return(copysign(y,one));
-	    else
-		     return(y);	   /* y is NaN and x is finite */
-
-	else if(x==x) 		   /* x is +-INF */
-	         return (copysign(x,one));
-	else if(finite(y))
-	         return(x);		   /* x is NaN, y is finite */
-	else if(y!=y) return(y);  	/* x and y is NaN */
-	else return(copysign(y,one));   /* y is INF */
-}
-#endif
diff --git a/lib/libm/noieee_src/n_cbrt.c b/lib/libm/noieee_src/n_cbrt.c
deleted file mode 100644
index 5bedff1bf..000000000
--- a/lib/libm/noieee_src/n_cbrt.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*	$NetBSD: n_cbrt.c,v 1.6 2013/11/24 14:49:00 martin Exp $	*/
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)cbrt.c	8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
-#include <sys/cdefs.h>
-
-/* kahan's cube root (53 bits IEEE double precision)
- * for IEEE machines only
- * coded in C by K.C. Ng, 4/30/85
- *
- * Accuracy:
- *	better than 0.667 ulps according to an error analysis. Maximum
- * error observed was 0.666 ulps in an 1,000,000 random arguments test.
- *
- * Warning: this code is semi machine dependent; the ordering of words in
- * a floating point number must be known in advance. I assume that the
- * long interger at the address of a floating point number will be the
- * leading 32 bits of that floating point number (i.e., sign, exponent,
- * and the 20 most significant bits).
- * On a National machine, it has different ordering; therefore, this code
- * must be compiled with flag -DNATIONAL.
- */
-#if !defined(__vax__)&&!defined(tahoe)
-
-static const unsigned long
-		     B1 = 715094163, /* B1 = (682-0.03306235651)*2**20 */
-	             B2 = 696219795; /* B2 = (664-0.03306235651)*2**20 */
-static const double
-	    C= 19./35.,
-	    D= -864./1225.,
-	    E= 99./70.,
-	    F= 45./28.,
-	    G= 5./14.;
-
-float
-cbrtf(float x)
-{
-	return (float)cbrt(x);
-}
-
-long double
-cbrtl(long double x)
-{
-	return cbrt((double)x);
-}
-
-double
-cbrt(double x)
-{
-	double r,s,t=0.0,w;
-	unsigned long *px = (unsigned long *) &x,
-	              *pt = (unsigned long *) &t,
-		      mexp,sign;
-
-#ifdef national /* ordering of words in a floating points number */
-	const int n0=1,n1=0;
-#else	/* national */
-	const int n0=0,n1=1;
-#endif	/* national */
-
-	mexp=px[n0]&0x7ff00000;
-	if(mexp==0x7ff00000) return(x); /* cbrt(NaN,INF) is itself */
-	if(x==0.0) return(x);		/* cbrt(0) is itself */
-
-	sign=px[n0]&0x80000000; /* sign= sign(x) */
-	px[n0] ^= sign;		/* x=|x| */
-
-
-    /* rough cbrt to 5 bits */
-	if(mexp==0) 		/* subnormal number */
-	  {pt[n0]=0x43500000; 	/* set t= 2**54 */
-	   t*=x; pt[n0]=pt[n0]/3+B2;
-	  }
-	else
-	  pt[n0]=px[n0]/3+B1;
-
-
-    /* new cbrt to 23 bits, may be implemented in single precision */
-	r=t*t/x;
-	s=C+r*t;
-	t*=G+F/(s+E+D/s);
-
-    /* chopped to 20 bits and make it larger than cbrt(x) */
-	pt[n1]=0; pt[n0]+=0x00000001;
-
-
-    /* one step newton iteration to 53 bits with error less than 0.667 ulps */
-	s=t*t;		/* t*t is exact */
-	r=x/s;
-	w=t+t;
-	r=(r-t)/(w+r);	/* r-t is exact */
-	t=t+t*r;
-
-
-    /* retore the sign bit */
-	pt[n0] |= sign;
-	return(t);
-}
-#endif
diff --git a/lib/libm/noieee_src/n_cosh.c b/lib/libm/noieee_src/n_cosh.c
deleted file mode 100644
index 66c1086d9..000000000
--- a/lib/libm/noieee_src/n_cosh.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*      $NetBSD: n_cosh.c,v 1.9 2014/10/10 20:58:09 martin Exp $ */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cosh.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* COSH(X)
- * RETURN THE HYPERBOLIC COSINE OF X
- * DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
- * CODED IN C BY K.C. NG, 1/8/85;
- * REVISED BY K.C. NG on 2/8/85, 2/23/85, 3/7/85, 3/29/85, 4/16/85.
- *
- * Required system supported functions :
- *	copysign(x,y)
- *	scalb(x,N)
- *
- * Required kernel function:
- *	exp(x)
- *	exp__E(x,c)	...return exp(x+c)-1-x for |x|<0.3465
- *
- * Method :
- *	1. Replace x by |x|.
- *	2.
- *		                                        [ exp(x) - 1 ]^2
- *	    0        <= x <= 0.3465  :  cosh(x) := 1 + -------------------
- *			       			           2*exp(x)
- *
- *		                                   exp(x) +  1/exp(x)
- *	    0.3465   <= x <= 22      :  cosh(x) := -------------------
- *			       			           2
- *	    22       <= x <= lnovfl  :  cosh(x) := exp(x)/2
- *	    lnovfl   <= x <= lnovfl+log(2)
- *				     :  cosh(x) := exp(x)/2 (avoid overflow)
- *	    log(2)+lnovfl <  x <  INF:  overflow to INF
- *
- *	Note: .3465 is a number near one half of ln2.
- *
- * Special cases:
- *	cosh(x) is x if x is +INF, -INF, or NaN.
- *	only cosh(0)=1 is exact for finite x.
- *
- * Accuracy:
- *	cosh(x) returns the exact hyperbolic cosine of x nearly rounded.
- *	In a test run with 768,000 random arguments on a VAX, the maximum
- *	observed error was 1.23 ulps (units in the last place).
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-
-#define _LIBM_STATIC
-#include "../src/namespace.h"
-#include "mathimpl.h"
-
-#ifdef __weak_alias
-__weak_alias(cosh, _cosh);
-__weak_alias(_coshl, _cosh);
-__weak_alias(coshf, _coshf);
-#endif
-
-vc(mln2hi, 8.8029691931113054792E1   ,0f33,43b0,2bdb,c7e2,   7, .B00F33C7E22BDB)
-vc(mln2lo,-4.9650192275318476525E-16 ,1b60,a70f,582a,279e, -50,-.8F1B60279E582A)
-vc(lnovfl, 8.8029691931113053016E1   ,0f33,43b0,2bda,c7e2,   7, .B00F33C7E22BDA)
-
-ic(mln2hi, 7.0978271289338397310E2,    10, 1.62E42FEFA39EF)
-ic(mln2lo, 2.3747039373786107478E-14, -45, 1.ABC9E3B39803F)
-ic(lnovfl, 7.0978271289338397310E2,     9, 1.62E42FEFA39EF)
-
-#ifdef vccast
-#define   mln2hi    vccast(mln2hi)
-#define   mln2lo    vccast(mln2lo)
-#define   lnovfl    vccast(lnovfl)
-#endif
-
-#if defined(__vax__)||defined(tahoe)
-#define EXPMAX 126
-#else
-#define EXPMAX 1023
-#endif	/* defined(__vax__)||defined(tahoe) */
-
-double
-cosh(double x)
-{
-	static const double half=1.0/2.0,
-		one=1.0, small=1.0E-18; /* fl(1+small)==1 */
-	double t;
-
-#if !defined(__vax__)&&!defined(tahoe)
-	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-	if((x=copysign(x,one)) <= 22) {
-	    if(x<0.3465) {
-		if(x<small) { return(one+x); }
-		else {t=x+__exp__E(x,0.0);x=t+t; return(one+t*t/(2.0+x)); }
-
-	    } else /* for x lies in [0.3465,22] */
-	        { t=exp(x); return((t+one/t)*half); }
-	}
-
-	if( lnovfl <= x && x <= (lnovfl+0.7))
-        /* for x lies in [lnovfl, lnovfl+ln2], decrease x by ln(2^(EXPMAX+1))
-         * and return 2^EXPMAX*exp(x) to avoid unnecessary overflow
-         */
-	    return(scalb(exp((x-mln2hi)-mln2lo), EXPMAX));
-
-	else
-	    return(exp(x)*half);	/* for large x,  cosh(x)=exp(x)/2 */
-}
-
-float
-coshf(float x)
-{
-	return(cosh((double)x));
-}
diff --git a/lib/libm/noieee_src/n_erf.c b/lib/libm/noieee_src/n_erf.c
deleted file mode 100644
index a100c26ba..000000000
--- a/lib/libm/noieee_src/n_erf.c
+++ /dev/null
@@ -1,412 +0,0 @@
-/*	$NetBSD: n_erf.c,v 1.9 2013/11/24 15:16:49 martin Exp $	*/
-/*-
- * 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.
- * 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)erf.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-#include "mathimpl.h"
-
-/* Modified Nov 30, 1992 P. McILROY:
- *	Replaced expansions for x >= 1.25 (error 1.7ulp vs ~6ulp)
- * Replaced even+odd with direct calculation for x < .84375,
- * to avoid destructive cancellation.
- *
- * Performance of erfc(x):
- * In 300000 trials in the range [.83, .84375] the
- * maximum observed error was 3.6ulp.
- *
- * In [.84735,1.25] the maximum observed error was <2.5ulp in
- * 100000 runs in the range [1.2, 1.25].
- *
- * In [1.25,26] (Not including subnormal results)
- * the error is < 1.7ulp.
- */
-
-/* double erf(double x)
- * double erfc(double x)
- *			     x
- *		      2      |\
- *     erf(x)  =  ---------  | exp(-t*t)dt
- *		   sqrt(pi) \|
- *			     0
- *
- *     erfc(x) =  1-erf(x)
- *
- * Method:
- *      1. Reduce x to |x| by erf(-x) = -erf(x)
- *	2. For x in [0, 0.84375]
- *	    erf(x)  = x + x*P(x^2)
- *          erfc(x) = 1 - erf(x)           if x<=0.25
- *                  = 0.5 + ((0.5-x)-x*P)  if x in [0.25,0.84375]
- *	   where
- *			2		 2	  4		  20
- *              P =  P(x ) = (p0 + p1 * x + p2 * x + ... + p10 * x  )
- * 	   is an approximation to (erf(x)-x)/x with precision
- *
- *						 -56.45
- *			| P - (erf(x)-x)/x | <= 2
- *
- *
- *	   Remark. The formula is derived by noting
- *          erf(x) = (2/sqrt(pi))*(x - x^3/3 + x^5/10 - x^7/42 + ....)
- *	   and that
- *          2/sqrt(pi) = 1.128379167095512573896158903121545171688
- *	   is close to one. The interval is chosen because the fixed
- *	   point of erf(x) is near 0.6174 (i.e., erf(x)=x when x is
- *	   near 0.6174), and by some experiment, 0.84375 is chosen to
- * 	   guarantee the error is less than one ulp for erf.
- *
- *      3. For x in [0.84375,1.25], let s = x - 1, and
- *         c = 0.84506291151 rounded to single (24 bits)
- *         	erf(x)  = c  + P1(s)/Q1(s)
- *         	erfc(x) = (1-c)  - P1(s)/Q1(s)
- *         	|P1/Q1 - (erf(x)-c)| <= 2**-59.06
- *	   Remark: here we use the taylor series expansion at x=1.
- *		erf(1+s) = erf(1) + s*Poly(s)
- *			 = 0.845.. + P1(s)/Q1(s)
- *	   That is, we use rational approximation to approximate
- *			erf(1+s) - (c = (single)0.84506291151)
- *	   Note that |P1/Q1|< 0.078 for x in [0.84375,1.25]
- *	   where
- *		P1(s) = degree 6 poly in s
- *		Q1(s) = degree 6 poly in s
- *
- *	4. For x in [1.25, 2]; [2, 4]
- *         	erf(x)  = 1.0 - tiny
- *		erfc(x)	= (1/x)exp(-x*x-(.5*log(pi) -.5z + R(z)/S(z))
- *
- *	Where z = 1/(x*x), R is degree 9, and S is degree 3;
- *
- *      5. For x in [4,28]
- *         	erf(x)  = 1.0 - tiny
- *		erfc(x)	= (1/x)exp(-x*x-(.5*log(pi)+eps + zP(z))
- *
- *	Where P is degree 14 polynomial in 1/(x*x).
- *
- *      Notes:
- *	   Here 4 and 5 make use of the asymptotic series
- *			  exp(-x*x)
- *		erfc(x) ~ ---------- * ( 1 + Poly(1/x^2) );
- *			  x*sqrt(pi)
- *
- *		where for z = 1/(x*x)
- *		P(z) ~ z/2*(-1 + z*3/2*(1 + z*5/2*(-1 + z*7/2*(1 +...))))
- *
- *	   Thus we use rational approximation to approximate
- *              erfc*x*exp(x*x) ~ 1/sqrt(pi);
- *
- *		The error bound for the target function, G(z) for
- *		the interval
- *		[4, 28]:
- * 		|eps + 1/(z)P(z) - G(z)| < 2**(-56.61)
- *		for [2, 4]:
- *      	|R(z)/S(z) - G(z)|	 < 2**(-58.24)
- *		for [1.25, 2]:
- *		|R(z)/S(z) - G(z)|	 < 2**(-58.12)
- *
- *      6. For inf > x >= 28
- *         	erf(x)  = 1 - tiny  (raise inexact)
- *         	erfc(x) = tiny*tiny (raise underflow)
- *
- *      7. Special cases:
- *         	erf(0)  = 0, erf(inf)  = 1, erf(-inf) = -1,
- *         	erfc(0) = 1, erfc(inf) = 0, erfc(-inf) = 2,
- *	   	erfc/erf(NaN) is NaN
- */
-
-#if defined(__vax__) || defined(tahoe)
-#define _IEEE	0
-#define TRUNC(x) (x) = (float)(x)
-#else
-#define _IEEE	1
-#define TRUNC(x) *(((int *) &x) + 1) &= 0xf8000000
-#define infnan(x) 0.0
-#endif
-
-#ifdef _IEEE_LIBM
-/*
- * redefining "___function" to "function" in _IEEE_LIBM mode
- */
-#include "ieee_libm.h"
-#endif
-
-static const double
-tiny	    = _TINY,
-half	    = 0.5,
-one	    = 1.0,
-two	    = 2.0,
-c 	    = 8.45062911510467529297e-01, /* (float)0.84506291151 */
-/*
- * Coefficients for approximation to erf in [0,0.84375]
- */
-p0t8 = 1.02703333676410051049867154944018394163280,
-p0 =   1.283791670955125638123339436800229927041e-0001,
-p1 =  -3.761263890318340796574473028946097022260e-0001,
-p2 =   1.128379167093567004871858633779992337238e-0001,
-p3 =  -2.686617064084433642889526516177508374437e-0002,
-p4 =   5.223977576966219409445780927846432273191e-0003,
-p5 =  -8.548323822001639515038738961618255438422e-0004,
-p6 =   1.205520092530505090384383082516403772317e-0004,
-p7 =  -1.492214100762529635365672665955239554276e-0005,
-p8 =   1.640186161764254363152286358441771740838e-0006,
-p9 =  -1.571599331700515057841960987689515895479e-0007,
-p10=   1.073087585213621540635426191486561494058e-0008;
-/*
- * Coefficients for approximation to erf in [0.84375,1.25]
- */
-static const double
-pa0 =  -2.362118560752659485957248365514511540287e-0003,
-pa1 =   4.148561186837483359654781492060070469522e-0001,
-pa2 =  -3.722078760357013107593507594535478633044e-0001,
-pa3 =   3.183466199011617316853636418691420262160e-0001,
-pa4 =  -1.108946942823966771253985510891237782544e-0001,
-pa5 =   3.547830432561823343969797140537411825179e-0002,
-pa6 =  -2.166375594868790886906539848893221184820e-0003,
-qa1 =   1.064208804008442270765369280952419863524e-0001,
-qa2 =   5.403979177021710663441167681878575087235e-0001,
-qa3 =   7.182865441419627066207655332170665812023e-0002,
-qa4 =   1.261712198087616469108438860983447773726e-0001,
-qa5 =   1.363708391202905087876983523620537833157e-0002,
-qa6 =   1.198449984679910764099772682882189711364e-0002;
-/*
- * log(sqrt(pi)) for large x expansions.
- * The tail (lsqrtPI_lo) is included in the rational
- * approximations.
-*/
-static const double
-   lsqrtPI_hi = .5723649429247000819387380943226;
-/*
- * lsqrtPI_lo = .000000000000000005132975581353913;
- *
- * Coefficients for approximation to erfc in [2, 4]
-*/
-static const double
-rb0  =	-1.5306508387410807582e-010,	/* includes lsqrtPI_lo */
-rb1  =	 2.15592846101742183841910806188e-008,
-rb2  =	 6.24998557732436510470108714799e-001,
-rb3  =	 8.24849222231141787631258921465e+000,
-rb4  =	 2.63974967372233173534823436057e+001,
-rb5  =	 9.86383092541570505318304640241e+000,
-rb6  =	-7.28024154841991322228977878694e+000,
-rb7  =	 5.96303287280680116566600190708e+000,
-rb8  =	-4.40070358507372993983608466806e+000,
-rb9  =	 2.39923700182518073731330332521e+000,
-rb10 =	-6.89257464785841156285073338950e-001,
-sb1  =	 1.56641558965626774835300238919e+001,
-sb2  =	 7.20522741000949622502957936376e+001,
-sb3  =	 9.60121069770492994166488642804e+001;
-/*
- * Coefficients for approximation to erfc in [1.25, 2]
-*/
-static const double
-rc0  =	-2.47925334685189288817e-007,	/* includes lsqrtPI_lo */
-rc1  =	 1.28735722546372485255126993930e-005,
-rc2  =	 6.24664954087883916855616917019e-001,
-rc3  =	 4.69798884785807402408863708843e+000,
-rc4  =	 7.61618295853929705430118701770e+000,
-rc5  =	 9.15640208659364240872946538730e-001,
-rc6  =	-3.59753040425048631334448145935e-001,
-rc7  =	 1.42862267989304403403849619281e-001,
-rc8  =	-4.74392758811439801958087514322e-002,
-rc9  =	 1.09964787987580810135757047874e-002,
-rc10 =	-1.28856240494889325194638463046e-003,
-sc1  =	 9.97395106984001955652274773456e+000,
-sc2  =	 2.80952153365721279953959310660e+001,
-sc3  =	 2.19826478142545234106819407316e+001;
-/*
- * Coefficients for approximation to  erfc in [4,28]
- */
-static const double
-rd0  =	-2.1491361969012978677e-016,	/* includes lsqrtPI_lo */
-rd1  =	-4.99999999999640086151350330820e-001,
-rd2  =	 6.24999999772906433825880867516e-001,
-rd3  =	-1.54166659428052432723177389562e+000,
-rd4  =	 5.51561147405411844601985649206e+000,
-rd5  =	-2.55046307982949826964613748714e+001,
-rd6  =	 1.43631424382843846387913799845e+002,
-rd7  =	-9.45789244999420134263345971704e+002,
-rd8  =	 6.94834146607051206956384703517e+003,
-rd9  =	-5.27176414235983393155038356781e+004,
-rd10 =	 3.68530281128672766499221324921e+005,
-rd11 =	-2.06466642800404317677021026611e+006,
-rd12 =	 7.78293889471135381609201431274e+006,
-rd13 =	-1.42821001129434127360582351685e+007;
-
-double
-erf(double x)
-{
-	double R,S,P,Q,ax,s,y,z,r;
-	if(!finite(x)) {		/* erf(nan)=nan */
-	    if (isnan(x))
-		return(x);
-	    return (x > 0 ? one : -one); /* erf(+/-inf)= +/-1 */
-	}
-	if ((ax = x) < 0)
-		ax = - ax;
-	if (ax < .84375) {
-	    if (ax < 3.7e-09) {
-		if (ax < _TINYER)
-		    return 0.125*(8.0*x+p0t8*x);  /*avoid underflow */
-		return x + p0*x;
-	    }
-	    y = x*x;
-	    r = y*(p1+y*(p2+y*(p3+y*(p4+y*(p5+
-			y*(p6+y*(p7+y*(p8+y*(p9+y*p10)))))))));
-	    return x + x*(p0+r);
-	}
-	if (ax < 1.25) {		/* 0.84375 <= |x| < 1.25 */
-	    s = fabs(x)-one;
-	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*pa6)))));
-	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*qa6)))));
-	    if (x>=0)
-		return (c + P/Q);
-	    else
-		return (-c - P/Q);
-	}
-	if (ax >= 6.0) {		/* inf>|x|>=6 */
-	    if (x >= 0.0)
-		return (one-tiny);
-	    else
-		return (tiny-one);
-	}
-    /* 1.25 <= |x| < 6 */
-	z = -ax*ax;
-	s = -one/z;
-	if (ax < 2.0) {
-		R = rc0+s*(rc1+s*(rc2+s*(rc3+s*(rc4+s*(rc5+
-			s*(rc6+s*(rc7+s*(rc8+s*(rc9+s*rc10)))))))));
-		S = one+s*(sc1+s*(sc2+s*sc3));
-	} else {
-		R = rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(rb5+
-			s*(rb6+s*(rb7+s*(rb8+s*(rb9+s*rb10)))))))));
-		S = one+s*(sb1+s*(sb2+s*sb3));
-	}
-	y = (R/S -.5*s) - lsqrtPI_hi;
-	z += y;
-	z = exp(z)/ax;
-	if (x >= 0)
-		return (one-z);
-	else
-		return (z-one);
-}
-
-float
-erff(float x)
-{
-	return (float)erf(x);
-}
-
-double
-erfc(double x)
-{
-	double R,S,P,Q,s,ax,y,z,r;
-	if (!finite(x)) {
-		if (isnan(x))		/* erfc(NaN) = NaN */
-			return(x);
-		else if (x > 0)		/* erfc(+-inf)=0,2 */
-			return 0.0;
-		else
-			return 2.0;
-	}
-	if ((ax = x) < 0)
-		ax = -ax;
-	if (ax < .84375) {			/* |x|<0.84375 */
-	    if (ax < 1.38777878078144568e-17)  	/* |x|<2**-56 */
-		return one-x;
-	    y = x*x;
-	    r = y*(p1+y*(p2+y*(p3+y*(p4+y*(p5+
-			y*(p6+y*(p7+y*(p8+y*(p9+y*p10)))))))));
-	    if (ax < .0625) {  	/* |x|<2**-4 */
-		return (one-(x+x*(p0+r)));
-	    } else {
-		r = x*(p0+r);
-		r += (x-half);
-	        return (half - r);
-	    }
-	}
-	if (ax < 1.25) {		/* 0.84375 <= |x| < 1.25 */
-	    s = ax-one;
-	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*pa6)))));
-	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*qa6)))));
-	    if (x>=0) {
-	        z  = one-c; return z - P/Q;
-	    } else {
-		z = c+P/Q; return one+z;
-	    }
-	}
-	if (ax >= 28) {	/* Out of range */
- 		if (x>0)
-			return (tiny*tiny);
-		else
-			return (two-tiny);
-	}
-	z = ax;
-	TRUNC(z);
-	y = z - ax; y *= (ax+z);
-	z *= -z;			/* Here z + y = -x^2 */
-		s = one/(-z-y);		/* 1/(x*x) */
-	if (ax >= 4) {			/* 6 <= ax */
-		R = s*(rd1+s*(rd2+s*(rd3+s*(rd4+s*(rd5+
-			s*(rd6+s*(rd7+s*(rd8+s*(rd9+s*(rd10
-			+s*(rd11+s*(rd12+s*rd13))))))))))));
-		y += rd0;
-	} else if (ax >= 2) {
-		R = rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(rb5+
-			s*(rb6+s*(rb7+s*(rb8+s*(rb9+s*rb10)))))))));
-		S = one+s*(sb1+s*(sb2+s*sb3));
-		y += R/S;
-		R = -.5*s;
-	} else {
-		R = rc0+s*(rc1+s*(rc2+s*(rc3+s*(rc4+s*(rc5+
-			s*(rc6+s*(rc7+s*(rc8+s*(rc9+s*rc10)))))))));
-		S = one+s*(sc1+s*(sc2+s*sc3));
-		y += R/S;
-		R = -.5*s;
-	}
-	/* return exp(-x^2 - lsqrtPI_hi + R + y)/x;	*/
-	s = ((R + y) - lsqrtPI_hi) + z;
-	y = (((z-s) - lsqrtPI_hi) + R) + y;
-	r = __exp__D(s, y)/x;
-	if (x>0)
-		return r;
-	else
-		return two-r;
-}
-
-float
-erfcf(float x)
-{
-	return (float)erfc(x);
-}
-
-
diff --git a/lib/libm/noieee_src/n_exp.c b/lib/libm/noieee_src/n_exp.c
deleted file mode 100644
index 21c5874bb..000000000
--- a/lib/libm/noieee_src/n_exp.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*      $NetBSD: n_exp.c,v 1.9 2014/10/10 20:58:09 martin Exp $ */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)exp.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* EXP(X)
- * RETURN THE EXPONENTIAL OF X
- * DOUBLE PRECISION (IEEE 53 bits, VAX D FORMAT 56 BITS)
- * CODED IN C BY K.C. NG, 1/19/85;
- * REVISED BY K.C. NG on 2/6/85, 2/15/85, 3/7/85, 3/24/85, 4/16/85, 6/14/86.
- *
- * Required system supported functions:
- *	scalb(x,n)
- *	copysign(x,y)
- *	finite(x)
- *
- * Method:
- *	1. Argument Reduction: given the input x, find r and integer k such
- *	   that
- *	                   x = k*ln2 + r,  |r| <= 0.5*ln2 .
- *	   r will be represented as r := z+c for better accuracy.
- *
- *	2. Compute exp(r) by
- *
- *		exp(r) = 1 + r + r*R1/(2-R1),
- *	   where
- *		R1 = x - x^2*(p1+x^2*(p2+x^2*(p3+x^2*(p4+p5*x^2)))).
- *
- *	3. exp(x) = 2^k * exp(r) .
- *
- * Special cases:
- *	exp(INF) is INF, exp(NaN) is NaN;
- *	exp(-INF)=  0;
- *	for finite argument, only exp(0)=1 is exact.
- *
- * Accuracy:
- *	exp(x) returns the exponential of x nearly rounded. In a test run
- *	with 1,156,000 random arguments on a VAX, the maximum observed
- *	error was 0.869 ulps (units in the last place).
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-
-#define _LIBM_STATIC
-#include "../src/namespace.h"
-#include "mathimpl.h"
-
-#ifdef __weak_alias
-__weak_alias(exp, _exp);
-__weak_alias(_expl, _exp);
-__weak_alias(expf, _expf);
-#endif
-
-vc(ln2hi,  6.9314718055829871446E-1  ,7217,4031,0000,f7d0,   0, .B17217F7D00000)
-vc(ln2lo,  1.6465949582897081279E-12 ,bcd5,2ce7,d9cc,e4f1, -39, .E7BCD5E4F1D9CC)
-vc(lnhuge, 9.4961163736712506989E1   ,ec1d,43bd,9010,a73e,   7, .BDEC1DA73E9010)
-vc(lntiny,-9.5654310917272452386E1   ,4f01,c3bf,33af,d72e,   7,-.BF4F01D72E33AF)
-vc(invln2, 1.4426950408889634148E0   ,aa3b,40b8,17f1,295c,   1, .B8AA3B295C17F1)
-vc(p1,     1.6666666666666602251E-1  ,aaaa,3f2a,a9f1,aaaa,  -2, .AAAAAAAAAAA9F1)
-vc(p2,    -2.7777777777015591216E-3  ,0b60,bc36,ec94,b5f5,  -8,-.B60B60B5F5EC94)
-vc(p3,     6.6137563214379341918E-5  ,b355,398a,f15f,792e, -13, .8AB355792EF15F)
-vc(p4,    -1.6533902205465250480E-6  ,ea0e,b6dd,5f84,2e93, -19,-.DDEA0E2E935F84)
-vc(p5,     4.1381367970572387085E-8  ,bb4b,3431,2683,95f5, -24, .B1BB4B95F52683)
-
-#ifdef vccast
-#define    ln2hi    vccast(ln2hi)
-#define    ln2lo    vccast(ln2lo)
-#define   lnhuge    vccast(lnhuge)
-#define   lntiny    vccast(lntiny)
-#define   invln2    vccast(invln2)
-#define       p1    vccast(p1)
-#define       p2    vccast(p2)
-#define       p3    vccast(p3)
-#define       p4    vccast(p4)
-#define       p5    vccast(p5)
-#endif
-
-ic(p1,     1.6666666666666601904E-1,  -3,  1.555555555553E)
-ic(p2,    -2.7777777777015593384E-3,  -9, -1.6C16C16BEBD93)
-ic(p3,     6.6137563214379343612E-5, -14,  1.1566AAF25DE2C)
-ic(p4,    -1.6533902205465251539E-6, -20, -1.BBD41C5D26BF1)
-ic(p5,     4.1381367970572384604E-8, -25,  1.6376972BEA4D0)
-ic(ln2hi,  6.9314718036912381649E-1,  -1,  1.62E42FEE00000)
-ic(ln2lo,  1.9082149292705877000E-10,-33,  1.A39EF35793C76)
-ic(lnhuge, 7.1602103751842355450E2,    9,  1.6602B15B7ECF2)
-ic(lntiny,-7.5137154372698068983E2,    9, -1.77AF8EBEAE354)
-ic(invln2, 1.4426950408889633870E0,    0,  1.71547652B82FE)
-
-double
-exp(double x)
-{
-	double  z,hi,lo,c;
-	int k;
-
-#if !defined(__vax__)&&!defined(tahoe)
-	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-	if( x <= lnhuge ) {
-		if( x >= lntiny ) {
-
-		    /* argument reduction : x --> x - k*ln2 */
-
-			k=invln2*x+copysign(0.5,x);	/* k=NINT(x/ln2) */
-
-		    /* express x-k*ln2 as hi-lo and let x=hi-lo rounded */
-
-			hi=x-k*ln2hi;
-			x=hi-(lo=k*ln2lo);
-
-		    /* return 2^k*[1+x+x*c/(2+c)]  */
-			z=x*x;
-			c= x - z*(p1+z*(p2+z*(p3+z*(p4+z*p5))));
-			return  scalb(1.0+(hi-(lo-(x*c)/(2.0-c))),k);
-
-		}
-		/* end of x > lntiny */
-
-		else
-		     /* exp(-big#) underflows to zero */
-		     if(finite(x))  return(scalb(1.0,-5000));
-
-		     /* exp(-INF) is zero */
-		     else return(0.0);
-	}
-	/* end of x < lnhuge */
-
-	else
-	/* exp(INF) is INF, exp(+big#) overflows to INF */
-	    return( finite(x) ?  scalb(1.0,5000)  : x);
-}
-
-float
-expf(float x)
-{
-	return(exp((double)x));
-}
-
-/* returns exp(r = x + c) for |c| < |x| with no overlap.  */
-
-double
-__exp__D(double x, double c)
-{
-	double  z,hi,lo;
-	int k;
-
-#if !defined(__vax__)&&!defined(tahoe)
-	if (x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-	if ( x <= lnhuge ) {
-		if ( x >= lntiny ) {
-
-		    /* argument reduction : x --> x - k*ln2 */
-			z = invln2*x;
-			k = z + copysign(.5, x);
-
-		    /* express (x+c)-k*ln2 as hi-lo and let x=hi-lo rounded */
-
-			hi=(x-k*ln2hi);			/* Exact. */
-			x= hi - (lo = k*ln2lo-c);
-		    /* return 2^k*[1+x+x*c/(2+c)]  */
-			z=x*x;
-			c= x - z*(p1+z*(p2+z*(p3+z*(p4+z*p5))));
-			c = (x*c)/(2.0-c);
-
-			return  scalb(1.+(hi-(lo - c)), k);
-		}
-		/* end of x > lntiny */
-
-		else
-		     /* exp(-big#) underflows to zero */
-		     if(finite(x))  return(scalb(1.0,-5000));
-
-		     /* exp(-INF) is zero */
-		     else return(0.0);
-	}
-	/* end of x < lnhuge */
-
-	else
-	/* exp(INF) is INF, exp(+big#) overflows to INF */
-	    return( finite(x) ?  scalb(1.0,5000)  : x);
-}
diff --git a/lib/libm/noieee_src/n_exp2.c b/lib/libm/noieee_src/n_exp2.c
deleted file mode 100644
index fbe15a101..000000000
--- a/lib/libm/noieee_src/n_exp2.c
+++ /dev/null
@@ -1,395 +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 <sys/cdefs.h>
-__RCSID("$NetBSD: n_exp2.c,v 1.3 2014/03/23 15:26:47 martin Exp $");
-#ifdef __FBSDID
-__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2.c,v 1.7 2008/02/22 02:27:34 das Exp $");
-#endif
-
-#include <stdint.h>
-#include <float.h>
-#include <string.h>
-
-#include "math.h"
-
-#define	TBLBITS	8
-#define	TBLSIZE	(1 << TBLBITS)
-
-static const double
-    huge     = 0x1p126,
-    redux    = 0x1.8p52 / TBLSIZE,
-    P1	     = 0x1.62e42fefa39efp-1,
-    P2	     = 0x1.ebfbdff82c575p-3,
-    P3	     = 0x1.c6b08d704a0a6p-5,
-    P4	     = 0x1.3b2ab88f70400p-7,
-    P5	     = 0x1.5d88003875c74p-10;
-
-static volatile double twom1000 = 0x1p-100;
-
-static const double tbl[TBLSIZE * 2] = {
-/*	exp2(z + eps)		eps	*/
-	0x1.6a09e667f3d5dp-1,	 0x1.9880p-44,
-	0x1.6b052fa751744p-1,	 0x1.8000p-50,
-	0x1.6c012750bd9fep-1,	-0x1.8780p-45,
-	0x1.6cfdcddd476bfp-1,	 0x1.ec00p-46,
-	0x1.6dfb23c651a29p-1,	-0x1.8000p-50,
-	0x1.6ef9298593ae3p-1,	-0x1.c000p-52,
-	0x1.6ff7df9519386p-1,	-0x1.fd80p-45,
-	0x1.70f7466f42da3p-1,	-0x1.c880p-45,
-	0x1.71f75e8ec5fc3p-1,	 0x1.3c00p-46,
-	0x1.72f8286eacf05p-1,	-0x1.8300p-44,
-	0x1.73f9a48a58152p-1,	-0x1.0c00p-47,
-	0x1.74fbd35d7ccfcp-1,	 0x1.f880p-45,
-	0x1.75feb564267f1p-1,	 0x1.3e00p-47,
-	0x1.77024b1ab6d48p-1,	-0x1.7d00p-45,
-	0x1.780694fde5d38p-1,	-0x1.d000p-50,
-	0x1.790b938ac1d00p-1,	 0x1.3000p-49,
-	0x1.7a11473eb0178p-1,	-0x1.d000p-49,
-	0x1.7b17b0976d060p-1,	 0x1.0400p-45,
-	0x1.7c1ed0130c133p-1,	 0x1.0000p-53,
-	0x1.7d26a62ff8636p-1,	-0x1.6900p-45,
-	0x1.7e2f336cf4e3bp-1,	-0x1.2e00p-47,
-	0x1.7f3878491c3e8p-1,	-0x1.4580p-45,
-	0x1.80427543e1b4ep-1,	 0x1.3000p-44,
-	0x1.814d2add1071ap-1,	 0x1.f000p-47,
-	0x1.82589994ccd7ep-1,	-0x1.1c00p-45,
-	0x1.8364c1eb942d0p-1,	 0x1.9d00p-45,
-	0x1.8471a4623cab5p-1,	 0x1.7100p-43,
-	0x1.857f4179f5bbcp-1,	 0x1.2600p-45,
-	0x1.868d99b4491afp-1,	-0x1.2c40p-44,
-	0x1.879cad931a395p-1,	-0x1.3000p-45,
-	0x1.88ac7d98a65b8p-1,	-0x1.a800p-45,
-	0x1.89bd0a4785800p-1,	-0x1.d000p-49,
-	0x1.8ace5422aa223p-1,	 0x1.3280p-44,
-	0x1.8be05bad619fap-1,	 0x1.2b40p-43,
-	0x1.8cf3216b54383p-1,	-0x1.ed00p-45,
-	0x1.8e06a5e08664cp-1,	-0x1.0500p-45,
-	0x1.8f1ae99157807p-1,	 0x1.8280p-45,
-	0x1.902fed0282c0ep-1,	-0x1.cb00p-46,
-	0x1.9145b0b91ff96p-1,	-0x1.5e00p-47,
-	0x1.925c353aa2ff9p-1,	 0x1.5400p-48,
-	0x1.93737b0cdc64ap-1,	 0x1.7200p-46,
-	0x1.948b82b5f98aep-1,	-0x1.9000p-47,
-	0x1.95a44cbc852cbp-1,	 0x1.5680p-45,
-	0x1.96bdd9a766f21p-1,	-0x1.6d00p-44,
-	0x1.97d829fde4e2ap-1,	-0x1.1000p-47,
-	0x1.98f33e47a23a3p-1,	 0x1.d000p-45,
-	0x1.9a0f170ca0604p-1,	-0x1.8a40p-44,
-	0x1.9b2bb4d53ff89p-1,	 0x1.55c0p-44,
-	0x1.9c49182a3f15bp-1,	 0x1.6b80p-45,
-	0x1.9d674194bb8c5p-1,	-0x1.c000p-49,
-	0x1.9e86319e3238ep-1,	 0x1.7d00p-46,
-	0x1.9fa5e8d07f302p-1,	 0x1.6400p-46,
-	0x1.a0c667b5de54dp-1,	-0x1.5000p-48,
-	0x1.a1e7aed8eb8f6p-1,	 0x1.9e00p-47,
-	0x1.a309bec4a2e27p-1,	 0x1.ad80p-45,
-	0x1.a42c980460a5dp-1,	-0x1.af00p-46,
-	0x1.a5503b23e259bp-1,	 0x1.b600p-47,
-	0x1.a674a8af46213p-1,	 0x1.8880p-44,
-	0x1.a799e1330b3a7p-1,	 0x1.1200p-46,
-	0x1.a8bfe53c12e8dp-1,	 0x1.6c00p-47,
-	0x1.a9e6b5579fcd2p-1,	-0x1.9b80p-45,
-	0x1.ab0e521356fb8p-1,	 0x1.b700p-45,
-	0x1.ac36bbfd3f381p-1,	 0x1.9000p-50,
-	0x1.ad5ff3a3c2780p-1,	 0x1.4000p-49,
-	0x1.ae89f995ad2a3p-1,	-0x1.c900p-45,
-	0x1.afb4ce622f367p-1,	 0x1.6500p-46,
-	0x1.b0e07298db790p-1,	 0x1.fd40p-45,
-	0x1.b20ce6c9a89a9p-1,	 0x1.2700p-46,
-	0x1.b33a2b84f1a4bp-1,	 0x1.d470p-43,
-	0x1.b468415b747e7p-1,	-0x1.8380p-44,
-	0x1.b59728de5593ap-1,	 0x1.8000p-54,
-	0x1.b6c6e29f1c56ap-1,	 0x1.ad00p-47,
-	0x1.b7f76f2fb5e50p-1,	 0x1.e800p-50,
-	0x1.b928cf22749b2p-1,	-0x1.4c00p-47,
-	0x1.ba5b030a10603p-1,	-0x1.d700p-47,
-	0x1.bb8e0b79a6f66p-1,	 0x1.d900p-47,
-	0x1.bcc1e904bc1ffp-1,	 0x1.2a00p-47,
-	0x1.bdf69c3f3a16fp-1,	-0x1.f780p-46,
-	0x1.bf2c25bd71db8p-1,	-0x1.0a00p-46,
-	0x1.c06286141b2e9p-1,	-0x1.1400p-46,
-	0x1.c199bdd8552e0p-1,	 0x1.be00p-47,
-	0x1.c2d1cd9fa64eep-1,	-0x1.9400p-47,
-	0x1.c40ab5fffd02fp-1,	-0x1.ed00p-47,
-	0x1.c544778fafd15p-1,	 0x1.9660p-44,
-	0x1.c67f12e57d0cbp-1,	-0x1.a100p-46,
-	0x1.c7ba88988c1b6p-1,	-0x1.8458p-42,
-	0x1.c8f6d9406e733p-1,	-0x1.a480p-46,
-	0x1.ca3405751c4dfp-1,	 0x1.b000p-51,
-	0x1.cb720dcef9094p-1,	 0x1.1400p-47,
-	0x1.ccb0f2e6d1689p-1,	 0x1.0200p-48,
-	0x1.cdf0b555dc412p-1,	 0x1.3600p-48,
-	0x1.cf3155b5bab3bp-1,	-0x1.6900p-47,
-	0x1.d072d4a0789bcp-1,	 0x1.9a00p-47,
-	0x1.d1b532b08c8fap-1,	-0x1.5e00p-46,
-	0x1.d2f87080d8a85p-1,	 0x1.d280p-46,
-	0x1.d43c8eacaa203p-1,	 0x1.1a00p-47,
-	0x1.d5818dcfba491p-1,	 0x1.f000p-50,
-	0x1.d6c76e862e6a1p-1,	-0x1.3a00p-47,
-	0x1.d80e316c9834ep-1,	-0x1.cd80p-47,
-	0x1.d955d71ff6090p-1,	 0x1.4c00p-48,
-	0x1.da9e603db32aep-1,	 0x1.f900p-48,
-	0x1.dbe7cd63a8325p-1,	 0x1.9800p-49,
-	0x1.dd321f301b445p-1,	-0x1.5200p-48,
-	0x1.de7d5641c05bfp-1,	-0x1.d700p-46,
-	0x1.dfc97337b9aecp-1,	-0x1.6140p-46,
-	0x1.e11676b197d5ep-1,	 0x1.b480p-47,
-	0x1.e264614f5a3e7p-1,	 0x1.0ce0p-43,
-	0x1.e3b333b16ee5cp-1,	 0x1.c680p-47,
-	0x1.e502ee78b3fb4p-1,	-0x1.9300p-47,
-	0x1.e653924676d68p-1,	-0x1.5000p-49,
-	0x1.e7a51fbc74c44p-1,	-0x1.7f80p-47,
-	0x1.e8f7977cdb726p-1,	-0x1.3700p-48,
-	0x1.ea4afa2a490e8p-1,	 0x1.5d00p-49,
-	0x1.eb9f4867ccae4p-1,	 0x1.61a0p-46,
-	0x1.ecf482d8e680dp-1,	 0x1.5500p-48,
-	0x1.ee4aaa2188514p-1,	 0x1.6400p-51,
-	0x1.efa1bee615a13p-1,	-0x1.e800p-49,
-	0x1.f0f9c1cb64106p-1,	-0x1.a880p-48,
-	0x1.f252b376bb963p-1,	-0x1.c900p-45,
-	0x1.f3ac948dd7275p-1,	 0x1.a000p-53,
-	0x1.f50765b6e4524p-1,	-0x1.4f00p-48,
-	0x1.f6632798844fdp-1,	 0x1.a800p-51,
-	0x1.f7bfdad9cbe38p-1,	 0x1.abc0p-48,
-	0x1.f91d802243c82p-1,	-0x1.4600p-50,
-	0x1.fa7c1819e908ep-1,	-0x1.b0c0p-47,
-	0x1.fbdba3692d511p-1,	-0x1.0e00p-51,
-	0x1.fd3c22b8f7194p-1,	-0x1.0de8p-46,
-	0x1.fe9d96b2a23eep-1,	 0x1.e430p-49,
-	0x1.0000000000000p+0,	 0x0.0000p+0,
-	0x1.00b1afa5abcbep+0,	-0x1.3400p-52,
-	0x1.0163da9fb3303p+0,	-0x1.2170p-46,
-	0x1.02168143b0282p+0,	 0x1.a400p-52,
-	0x1.02c9a3e77806cp+0,	 0x1.f980p-49,
-	0x1.037d42e11bbcap+0,	-0x1.7400p-51,
-	0x1.04315e86e7f89p+0,	 0x1.8300p-50,
-	0x1.04e5f72f65467p+0,	-0x1.a3f0p-46,
-	0x1.059b0d315855ap+0,	-0x1.2840p-47,
-	0x1.0650a0e3c1f95p+0,	 0x1.1600p-48,
-	0x1.0706b29ddf71ap+0,	 0x1.5240p-46,
-	0x1.07bd42b72a82dp+0,	-0x1.9a00p-49,
-	0x1.0874518759bd0p+0,	 0x1.6400p-49,
-	0x1.092bdf66607c8p+0,	-0x1.0780p-47,
-	0x1.09e3ecac6f383p+0,	-0x1.8000p-54,
-	0x1.0a9c79b1f3930p+0,	 0x1.fa00p-48,
-	0x1.0b5586cf988fcp+0,	-0x1.ac80p-48,
-	0x1.0c0f145e46c8ap+0,	 0x1.9c00p-50,
-	0x1.0cc922b724816p+0,	 0x1.5200p-47,
-	0x1.0d83b23395dd8p+0,	-0x1.ad00p-48,
-	0x1.0e3ec32d3d1f3p+0,	 0x1.bac0p-46,
-	0x1.0efa55fdfa9a6p+0,	-0x1.4e80p-47,
-	0x1.0fb66affed2f0p+0,	-0x1.d300p-47,
-	0x1.1073028d7234bp+0,	 0x1.1500p-48,
-	0x1.11301d0125b5bp+0,	 0x1.c000p-49,
-	0x1.11edbab5e2af9p+0,	 0x1.6bc0p-46,
-	0x1.12abdc06c31d5p+0,	 0x1.8400p-49,
-	0x1.136a814f2047dp+0,	-0x1.ed00p-47,
-	0x1.1429aaea92de9p+0,	 0x1.8e00p-49,
-	0x1.14e95934f3138p+0,	 0x1.b400p-49,
-	0x1.15a98c8a58e71p+0,	 0x1.5300p-47,
-	0x1.166a45471c3dfp+0,	 0x1.3380p-47,
-	0x1.172b83c7d5211p+0,	 0x1.8d40p-45,
-	0x1.17ed48695bb9fp+0,	-0x1.5d00p-47,
-	0x1.18af9388c8d93p+0,	-0x1.c880p-46,
-	0x1.1972658375d66p+0,	 0x1.1f00p-46,
-	0x1.1a35beb6fcba7p+0,	 0x1.0480p-46,
-	0x1.1af99f81387e3p+0,	-0x1.7390p-43,
-	0x1.1bbe084045d54p+0,	 0x1.4e40p-45,
-	0x1.1c82f95281c43p+0,	-0x1.a200p-47,
-	0x1.1d4873168b9b2p+0,	 0x1.3800p-49,
-	0x1.1e0e75eb44031p+0,	 0x1.ac00p-49,
-	0x1.1ed5022fcd938p+0,	 0x1.1900p-47,
-	0x1.1f9c18438cdf7p+0,	-0x1.b780p-46,
-	0x1.2063b88628d8fp+0,	 0x1.d940p-45,
-	0x1.212be3578a81ep+0,	 0x1.8000p-50,
-	0x1.21f49917ddd41p+0,	 0x1.b340p-45,
-	0x1.22bdda2791323p+0,	 0x1.9f80p-46,
-	0x1.2387a6e7561e7p+0,	-0x1.9c80p-46,
-	0x1.2451ffb821427p+0,	 0x1.2300p-47,
-	0x1.251ce4fb2a602p+0,	-0x1.3480p-46,
-	0x1.25e85711eceb0p+0,	 0x1.2700p-46,
-	0x1.26b4565e27d16p+0,	 0x1.1d00p-46,
-	0x1.2780e341de00fp+0,	 0x1.1ee0p-44,
-	0x1.284dfe1f5633ep+0,	-0x1.4c00p-46,
-	0x1.291ba7591bb30p+0,	-0x1.3d80p-46,
-	0x1.29e9df51fdf09p+0,	 0x1.8b00p-47,
-	0x1.2ab8a66d10e9bp+0,	-0x1.27c0p-45,
-	0x1.2b87fd0dada3ap+0,	 0x1.a340p-45,
-	0x1.2c57e39771af9p+0,	-0x1.0800p-46,
-	0x1.2d285a6e402d9p+0,	-0x1.ed00p-47,
-	0x1.2df961f641579p+0,	-0x1.4200p-48,
-	0x1.2ecafa93e2ecfp+0,	-0x1.4980p-45,
-	0x1.2f9d24abd8822p+0,	-0x1.6300p-46,
-	0x1.306fe0a31b625p+0,	-0x1.2360p-44,
-	0x1.31432edeea50bp+0,	-0x1.0df8p-40,
-	0x1.32170fc4cd7b8p+0,	-0x1.2480p-45,
-	0x1.32eb83ba8e9a2p+0,	-0x1.5980p-45,
-	0x1.33c08b2641766p+0,	 0x1.ed00p-46,
-	0x1.3496266e3fa27p+0,	-0x1.c000p-50,
-	0x1.356c55f929f0fp+0,	-0x1.0d80p-44,
-	0x1.36431a2de88b9p+0,	 0x1.2c80p-45,
-	0x1.371a7373aaa39p+0,	 0x1.0600p-45,
-	0x1.37f26231e74fep+0,	-0x1.6600p-46,
-	0x1.38cae6d05d838p+0,	-0x1.ae00p-47,
-	0x1.39a401b713ec3p+0,	-0x1.4720p-43,
-	0x1.3a7db34e5a020p+0,	 0x1.8200p-47,
-	0x1.3b57fbfec6e95p+0,	 0x1.e800p-44,
-	0x1.3c32dc313a8f2p+0,	 0x1.f800p-49,
-	0x1.3d0e544ede122p+0,	-0x1.7a00p-46,
-	0x1.3dea64c1234bbp+0,	 0x1.6300p-45,
-	0x1.3ec70df1c4eccp+0,	-0x1.8a60p-43,
-	0x1.3fa4504ac7e8cp+0,	-0x1.cdc0p-44,
-	0x1.40822c367a0bbp+0,	 0x1.5b80p-45,
-	0x1.4160a21f72e95p+0,	 0x1.ec00p-46,
-	0x1.423fb27094646p+0,	-0x1.3600p-46,
-	0x1.431f5d950a920p+0,	 0x1.3980p-45,
-	0x1.43ffa3f84b9ebp+0,	 0x1.a000p-48,
-	0x1.44e0860618919p+0,	-0x1.6c00p-48,
-	0x1.45c2042a7d201p+0,	-0x1.bc00p-47,
-	0x1.46a41ed1d0016p+0,	-0x1.2800p-46,
-	0x1.4786d668b3326p+0,	 0x1.0e00p-44,
-	0x1.486a2b5c13c00p+0,	-0x1.d400p-45,
-	0x1.494e1e192af04p+0,	 0x1.c200p-47,
-	0x1.4a32af0d7d372p+0,	-0x1.e500p-46,
-	0x1.4b17dea6db801p+0,	 0x1.7800p-47,
-	0x1.4bfdad53629e1p+0,	-0x1.3800p-46,
-	0x1.4ce41b817c132p+0,	 0x1.0800p-47,
-	0x1.4dcb299fddddbp+0,	 0x1.c700p-45,
-	0x1.4eb2d81d8ab96p+0,	-0x1.ce00p-46,
-	0x1.4f9b2769d2d02p+0,	 0x1.9200p-46,
-	0x1.508417f4531c1p+0,	-0x1.8c00p-47,
-	0x1.516daa2cf662ap+0,	-0x1.a000p-48,
-	0x1.5257de83f51eap+0,	 0x1.a080p-43,
-	0x1.5342b569d4edap+0,	-0x1.6d80p-45,
-	0x1.542e2f4f6ac1ap+0,	-0x1.2440p-44,
-	0x1.551a4ca5d94dbp+0,	 0x1.83c0p-43,
-	0x1.56070dde9116bp+0,	 0x1.4b00p-45,
-	0x1.56f4736b529dep+0,	 0x1.15a0p-43,
-	0x1.57e27dbe2c40ep+0,	-0x1.9e00p-45,
-	0x1.58d12d497c76fp+0,	-0x1.3080p-45,
-	0x1.59c0827ff0b4cp+0,	 0x1.dec0p-43,
-	0x1.5ab07dd485427p+0,	-0x1.4000p-51,
-	0x1.5ba11fba87af4p+0,	 0x1.0080p-44,
-	0x1.5c9268a59460bp+0,	-0x1.6c80p-45,
-	0x1.5d84590998e3fp+0,	 0x1.69a0p-43,
-	0x1.5e76f15ad20e1p+0,	-0x1.b400p-46,
-	0x1.5f6a320dcebcap+0,	 0x1.7700p-46,
-	0x1.605e1b976dcb8p+0,	 0x1.6f80p-45,
-	0x1.6152ae6cdf715p+0,	 0x1.1000p-47,
-	0x1.6247eb03a5531p+0,	-0x1.5d00p-46,
-	0x1.633dd1d1929b5p+0,	-0x1.2d00p-46,
-	0x1.6434634ccc313p+0,	-0x1.a800p-49,
-	0x1.652b9febc8efap+0,	-0x1.8600p-45,
-	0x1.6623882553397p+0,	 0x1.1fe0p-40,
-	0x1.671c1c708328ep+0,	-0x1.7200p-44,
-	0x1.68155d44ca97ep+0,	 0x1.6800p-49,
-	0x1.690f4b19e9471p+0,	-0x1.9780p-45,
-};
-
-/*
- * exp2(x): compute the base 2 exponential of x
- *
- * Accuracy: Peak error < 0.503 ulp for normalized results.
- *
- * Method: (accurate tables)
- *
- *   Reduce x:
- *     x = 2**k + y, for integer k and |y| <= 1/2.
- *     Thus we have exp2(x) = 2**k * exp2(y).
- *
- *   Reduce y:
- *     y = i/TBLSIZE + z - eps[i] for integer i near y * TBLSIZE.
- *     Thus we have exp2(y) = exp2(i/TBLSIZE) * exp2(z - eps[i]),
- *     with |z - eps[i]| <= 2**-9 + 2**-39 for the table used.
- *
- *   We compute exp2(i/TBLSIZE) via table lookup and exp2(z - eps[i]) via
- *   a degree-5 minimax polynomial with maximum error under 1.3 * 2**-61.
- *   The values in exp2t[] and eps[] are chosen such that
- *   exp2t[i] = exp2(i/TBLSIZE + eps[i]), and eps[i] is a small offset such
- *   that exp2t[i] is accurate to 2**-64.
- *
- *   Note that the range of i is +-TBLSIZE/2, so we actually index the tables
- *   by i0 = i + TBLSIZE/2.  For cache efficiency, exp2t[] and eps[] are
- *   virtual tables, interleaved in the real table tbl[].
- *
- *   This method is due to Gal, with many details due to Gal and Bachelis:
- *
- *	Gal, S. and Bachelis, B.  An Accurate Elementary Mathematical Library
- *	for the IEEE Floating Point Standard.  TOMS 17(1), 26-46 (1991).
- */
-double
-exp2(double x)
-{
-	double r, t, twopk, z;
-	uint32_t hx, ix, i0, temp;
-	int k, big;
-
-	/* Filter out exceptional cases. */
-	memcpy(&hx, &x, sizeof(hx));
-	ix = hx & 0x7fffffff;		/* high word of |x| */
-	if(ix >= 0x40900000) {			/* |x| >= 1024 */
-		if(x >= 0x1.0p10)
-			return (huge * huge); /* overflow */
-		if(x <= -0x1.0ccp10)
-			return (twom1000 * twom1000); /* underflow */
-	} else if (ix < 0x3c900000) {		/* |x| < 0x1p-54 */
-		return (1.0 + x);
-	}
-
-	/* Reduce x, computing z, i0, and k. */
-	(*(volatile double*)&t) = x + redux;
-	i0 = ((uint32_t*)&t)[1];
-	i0 += TBLSIZE / 2;
-	k = (i0 >> TBLBITS) << 20;
-	i0 = (i0 & (TBLSIZE - 1)) << 1;
-	t -= redux;
-	z = x - t;
-
-	/* Compute r = exp2(y) = exp2t[i0] * p(z - eps[i]). */
-	t = tbl[i0];		/* exp2t[i0] */
-	z -= tbl[i0 + 1];	/* eps[i0]   */
-	big = k >= -1021 << 20;
-	if (big) {
-		temp = 0x3ff00000+k;
-		twopk = 0.0;
-		memcpy(&twopk, &temp, sizeof(temp));
-	} else {
-		temp =  0x3ff00000+k + (1000 << 20);
-		twopk = 0.0;
-		memcpy(&twopk, &temp, sizeof(temp));
-	}
-	r = t + t * z * (P1 + z * (P2 + z * (P3 + z * (P4 + z * P5))));
-
-	/* Scale by 2**(k>>20). */
-	if (big) {
-		/*if (k == 1024 << 20)
-			return (r * 2.0 * 0x1p1023); */
-		return (r * twopk);
-	} else {
-		return (r * twopk * twom1000);
-	}
-}
diff --git a/lib/libm/noieee_src/n_exp2f.c b/lib/libm/noieee_src/n_exp2f.c
deleted file mode 100644
index 52e7b84a3..000000000
--- a/lib/libm/noieee_src/n_exp2f.c
+++ /dev/null
@@ -1,136 +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 <sys/cdefs.h>
-__RCSID("$NetBSD: n_exp2f.c,v 1.2 2014/03/23 15:26:47 martin Exp $");
-#ifdef __FBSDID
-__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2f.c,v 1.9 2008/02/22 02:27:34 das Exp $");
-#endif
-
-#include <stdint.h>
-#include <float.h>
-#include <string.h>
-
-#include "math.h"
-
-#define	TBLBITS	4
-#define	TBLSIZE	(1 << TBLBITS)
-
-static const float
-    huge    = 0x1p100f,
-    redux   = 0x1.8p23f / TBLSIZE,
-    P1	    = 0x1.62e430p-1f,
-    P2	    = 0x1.ebfbe0p-3f,
-    P3	    = 0x1.c6b348p-5f,
-    P4	    = 0x1.3b2c9cp-7f;
-
-static volatile float twom100 = 0x1p-100f;
-
-static const double exp2ft[TBLSIZE] = {
-	0x1.6a09e667f3bcdp-1,
-	0x1.7a11473eb0187p-1,
-	0x1.8ace5422aa0dbp-1,
-	0x1.9c49182a3f090p-1,
-	0x1.ae89f995ad3adp-1,
-	0x1.c199bdd85529cp-1,
-	0x1.d5818dcfba487p-1,
-	0x1.ea4afa2a490dap-1,
-	0x1.0000000000000p+0,
-	0x1.0b5586cf9890fp+0,
-	0x1.172b83c7d517bp+0,
-	0x1.2387a6e756238p+0,
-	0x1.306fe0a31b715p+0,
-	0x1.3dea64c123422p+0,
-	0x1.4bfdad5362a27p+0,
-	0x1.5ab07dd485429p+0,
-};
-	
-/*
- * exp2f(x): compute the base 2 exponential of x
- *
- * Accuracy: Peak error < 0.501 ulp; location of peak: -0.030110927.
- *
- * Method: (equally-spaced tables)
- *
- *   Reduce x:
- *     x = 2**k + y, for integer k and |y| <= 1/2.
- *     Thus we have exp2f(x) = 2**k * exp2(y).
- *
- *   Reduce y:
- *     y = i/TBLSIZE + z for integer i near y * TBLSIZE.
- *     Thus we have exp2(y) = exp2(i/TBLSIZE) * exp2(z),
- *     with |z| <= 2**-(TBLSIZE+1).
- *
- *   We compute exp2(i/TBLSIZE) via table lookup and exp2(z) via a
- *   degree-4 minimax polynomial with maximum error under 1.4 * 2**-33.
- *   Using double precision for everything except the reduction makes
- *   roundoff error insignificant and simplifies the scaling step.
- *
- *   This method is due to Tang, but I do not use his suggested parameters:
- *
- *	Tang, P.  Table-driven Implementation of the Exponential Function
- *	in IEEE Floating-Point Arithmetic.  TOMS 15(2), 144-157 (1989).
- */
-float
-exp2f(float x)
-{
-	double tv, twopk, u, z;
-	float t;
-	uint32_t hx, ix, i0;
-	int32_t k, temp;
-
-	/* Filter out exceptional cases. */
-	memcpy(&hx, &x, sizeof(hx));
-	ix = hx & 0x7fffffff;		/* high word of |x| */
-	if(ix >= 0x43000000) {			/* |x| >= 128 */
-		if(x >= 0x1.0p7f)
-			return (huge * huge);	/* overflow */
-		if(x <= -0x1.2cp7f)
-			return (twom100 * twom100); /* underflow */
-	} else if (ix <= 0x33000000) {		/* |x| <= 0x1p-25 */
-		return (1.0f + x);
-	}
-
-	/* Reduce x, computing z, i0, and k. */
-	i0 = x + redux;
-	memcpy(&t, &i0, sizeof(t));
-	i0 += TBLSIZE / 2;
-	k = (i0 >> TBLBITS) << 20;
-	i0 &= TBLSIZE - 1;
-	t -= redux;
-	z = x - t;
-	temp = 0x3ff00000+k;
-	twopk = 0.0;
-	memcpy(&twopk, &temp, sizeof(temp));
-
-	/* Compute r = exp2(y) = exp2ft[i0] * p(z). */
-	tv = exp2ft[i0];
-	u = tv * z;
-	tv = tv + u * (P1 + z * P2) + u * (z * z) * (P3 + z * P4);
-
-	/* Scale by 2**(k>>20). */
-	return (tv * twopk);
-}
diff --git a/lib/libm/noieee_src/n_exp__E.c b/lib/libm/noieee_src/n_exp__E.c
deleted file mode 100644
index ed99a0e29..000000000
--- a/lib/libm/noieee_src/n_exp__E.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*      $NetBSD: n_exp__E.c,v 1.7 2008/04/29 15:10:02 uwe Exp $ */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)exp__E.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* exp__E(x,c)
- * ASSUMPTION: c << x  SO THAT  fl(x+c)=x.
- * (c is the correction term for x)
- * exp__E RETURNS
- *
- *			 /  exp(x+c) - 1 - x ,  1E-19 < |x| < .3465736
- *       exp__E(x,c) = 	|
- *			 \  0 ,  |x| < 1E-19.
- *
- * DOUBLE PRECISION (IEEE 53 bits, VAX D FORMAT 56 BITS)
- * KERNEL FUNCTION OF EXP, EXPM1, POW FUNCTIONS
- * CODED IN C BY K.C. NG, 1/31/85;
- * REVISED BY K.C. NG on 3/16/85, 4/16/85.
- *
- * Required system supported function:
- *	copysign(x,y)
- *
- * Method:
- *	1. Rational approximation. Let r=x+c.
- *	   Based on
- *                                   2 * sinh(r/2)
- *                exp(r) - 1 =   ----------------------   ,
- *                               cosh(r/2) - sinh(r/2)
- *	   exp__E(r) is computed using
- *                   x*x            (x/2)*W - ( Q - ( 2*P  + x*P ) )
- *                   --- + (c + x*[---------------------------------- + c ])
- *                    2                          1 - W
- * 	   where  P := p1*x^2 + p2*x^4,
- *	          Q := q1*x^2 + q2*x^4 (for 56 bits precision, add q3*x^6)
- *	          W := x/2-(Q-x*P),
- *
- *	   (See the listing below for the values of p1,p2,q1,q2,q3. The poly-
- *	    nomials P and Q may be regarded as the approximations to sinh
- *	    and cosh :
- *		sinh(r/2) =  r/2 + r * P  ,  cosh(r/2) =  1 + Q . )
- *
- *         The coefficients were obtained by a special Remez algorithm.
- *
- * Approximation error:
- *
- *   |	exp(x) - 1			   |        2**(-57),  (IEEE double)
- *   | ------------  -  (exp__E(x,0)+x)/x  |  <=
- *   |	     x			           |	    2**(-69).  (VAX D)
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-
-#define _LIBM_STATIC
-#include "mathimpl.h"
-
-vc(p1, 1.5150724356786683059E-2 ,3abe,3d78,066a,67e1,  -6, .F83ABE67E1066A)
-vc(p2, 6.3112487873718332688E-5 ,5b42,3984,0173,48cd, -13, .845B4248CD0173)
-vc(q1, 1.1363478204690669916E-1 ,b95a,3ee8,ec45,44a2,  -3, .E8B95A44A2EC45)
-vc(q2, 1.2624568129896839182E-3 ,7905,3ba5,f5e7,72e4,  -9, .A5790572E4F5E7)
-vc(q3, 1.5021856115869022674E-6 ,9eb4,36c9,c395,604a, -19, .C99EB4604AC395)
-
-ic(p1, 1.3887401997267371720E-2,  -7, 1.C70FF8B3CC2CF)
-ic(p2, 3.3044019718331897649E-5, -15, 1.15317DF4526C4)
-ic(q1, 1.1110813732786649355E-1,  -4, 1.C719538248597)
-ic(q2, 9.9176615021572857300E-4, -10, 1.03FC4CB8C98E8)
-
-#ifdef vccast
-#define       p1    vccast(p1)
-#define       p2    vccast(p2)
-#define       q1    vccast(q1)
-#define       q2    vccast(q2)
-#define       q3    vccast(q3)
-#endif
-
-double
-__exp__E(double x, double c)
-{
-	static const double zero=0.0, one=1.0, half=1.0/2.0, small=1.0E-19;
-	double z,p,q,xp,xh,w;
-	if(copysign(x,one)>small) {
-           z = x*x  ;
-	   p = z*( p1 +z* p2 );
-#if defined(__vax__)||defined(tahoe)
-           q = z*( q1 +z*( q2 +z* q3 ));
-#else	/* defined(__vax__)||defined(tahoe) */
-           q = z*( q1 +z*  q2 );
-#endif	/* defined(__vax__)||defined(tahoe) */
-           xp= x*p     ;
-	   xh= x*half  ;
-           w = xh-(q-xp)  ;
-	   p = p+p;
-	   c += x*((xh*w-(q-(p+xp)))/(one-w)+c);
-	   return(z*half+c);
-	}
-	/* end of |x| > small */
-
-	else {
-	    if(x!=zero) w=one+small;	/* raise the inexact flag ??? -ragge */
-	    return(copysign(zero,x));
-	}
-}
diff --git a/lib/libm/noieee_src/n_expm1.c b/lib/libm/noieee_src/n_expm1.c
deleted file mode 100644
index f48845456..000000000
--- a/lib/libm/noieee_src/n_expm1.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*      $NetBSD: n_expm1.c,v 1.8 2013/11/24 18:50:58 martin Exp $ */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)expm1.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* EXPM1(X)
- * RETURN THE EXPONENTIAL OF X MINUS ONE
- * DOUBLE PRECISION (IEEE 53 BITS, VAX D FORMAT 56 BITS)
- * CODED IN C BY K.C. NG, 1/19/85;
- * REVISED BY K.C. NG on 2/6/85, 3/7/85, 3/21/85, 4/16/85.
- *
- * Required system supported functions:
- *	scalb(x,n)
- *	copysign(x,y)
- *	finite(x)
- *
- * Kernel function:
- *	exp__E(x,c)
- *
- * Method:
- *	1. Argument Reduction: given the input x, find r and integer k such
- *	   that
- *	                   x = k*ln2 + r,  |r| <= 0.5*ln2 .
- *	   r will be represented as r := z+c for better accuracy.
- *
- *	2. Compute EXPM1(r)=exp(r)-1 by
- *
- *			EXPM1(r=z+c) := z + exp__E(z,c)
- *
- *	3. EXPM1(x) =  2^k * ( EXPM1(r) + 1-2^-k ).
- *
- * 	Remarks:
- *	   1. When k=1 and z < -0.25, we use the following formula for
- *	      better accuracy:
- *			EXPM1(x) = 2 * ( (z+0.5) + exp__E(z,c) )
- *	   2. To avoid rounding error in 1-2^-k where k is large, we use
- *			EXPM1(x) = 2^k * { [z+(exp__E(z,c)-2^-k )] + 1 }
- *	      when k>56.
- *
- * Special cases:
- *	EXPM1(INF) is INF, EXPM1(NaN) is NaN;
- *	EXPM1(-INF)= -1;
- *	for finite argument, only EXPM1(0)=0 is exact.
- *
- * Accuracy:
- *	EXPM1(x) returns the exact (exp(x)-1) nearly rounded. In a test run with
- *	1,166,000 random arguments on a VAX, the maximum observed error was
- *	.872 ulps (units of the last place).
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-
-#define _LIBM_STATIC
-#include "mathimpl.h"
-
-vc(ln2hi,  6.9314718055829871446E-1  ,7217,4031,0000,f7d0,   0, .B17217F7D00000)
-vc(ln2lo,  1.6465949582897081279E-12 ,bcd5,2ce7,d9cc,e4f1, -39, .E7BCD5E4F1D9CC)
-vc(lnhuge, 9.4961163736712506989E1   ,ec1d,43bd,9010,a73e,   7, .BDEC1DA73E9010)
-vc(invln2, 1.4426950408889634148E0   ,aa3b,40b8,17f1,295c,   1, .B8AA3B295C17F1)
-
-ic(ln2hi,  6.9314718036912381649E-1,   -1, 1.62E42FEE00000)
-ic(ln2lo,  1.9082149292705877000E-10, -33, 1.A39EF35793C76)
-ic(lnhuge, 7.1602103751842355450E2,     9, 1.6602B15B7ECF2)
-ic(invln2, 1.4426950408889633870E0,     0, 1.71547652B82FE)
-
-#ifdef vccast
-#define	ln2hi	vccast(ln2hi)
-#define	ln2lo	vccast(ln2lo)
-#define	lnhuge	vccast(lnhuge)
-#define	invln2	vccast(invln2)
-#endif
-
-#if defined(__vax__)||defined(tahoe)
-#define PREC	56
-#else	/* defined(__vax__)||defined(tahoe) */
-#define PREC	53
-#endif	/* defined(__vax__)||defined(tahoe) */
-
-float
-expm1f(float x)
-{
-	return (float)expm1(x);
-}
-
-double
-expm1(double x)
-{
-	static const double one=1.0, half=1.0/2.0;
-	double  z,hi,lo,c;
-	int k;
-
-#if !defined(__vax__)&&!defined(tahoe)
-	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-
-	if( x <= lnhuge ) {
-		if( x >= -40.0 ) {
-
-		    /* argument reduction : x - k*ln2 */
-			k= invln2 *x+copysign(0.5,x);	/* k=NINT(x/ln2) */
-			hi=x-k*ln2hi ;
-			z=hi-(lo=k*ln2lo);
-			c=(hi-z)-lo;
-
-			if(k==0) return(z+__exp__E(z,c));
-			if(k==1)
-			    if(z< -0.25)
-				{x=z+half;x +=__exp__E(z,c); return(x+x);}
-			    else
-				{z+=__exp__E(z,c); x=half+z; return(x+x);}
-		    /* end of k=1 */
-
-			else {
-			    if(k<=PREC)
-			      { x=one-scalb(one,-k); z += __exp__E(z,c);}
-			    else if(k<100)
-			      { x = __exp__E(z,c)-scalb(one,-k); x+=z; z=one;}
-			    else
-			      { x = __exp__E(z,c)+z; z=one;}
-
-			    return (scalb(x+z,k));
-			}
-		}
-		/* end of x > lnunfl */
-
-		else
-		     /* expm1(-big#) rounded to -1 (inexact) */
-		     if(finite(x))
-			 { c=ln2hi+ln2lo; return(-one);} /* ??? -ragge */
-
-		     /* expm1(-INF) is -1 */
-		     else return(-one);
-	}
-	/* end of x < lnhuge */
-
-	else
-	/*  expm1(INF) is INF, expm1(+big#) overflows to INF */
-	    return( finite(x) ?  scalb(one,5000) : x);
-}
diff --git a/lib/libm/noieee_src/n_floor.c b/lib/libm/noieee_src/n_floor.c
deleted file mode 100644
index 73debb386..000000000
--- a/lib/libm/noieee_src/n_floor.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/*      $NetBSD: n_floor.c,v 1.8 2014/03/16 09:51:39 martin Exp $ */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)floor.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-#define _LIBM_STATIC
-#include "mathimpl.h"
-
-vc(L, 4503599627370496.0E0 ,0000,5c00,0000,0000, 55, 1.0) /* 2**55 */
-
-ic(L, 4503599627370496.0E0, 52, 1.0)			  /* 2**52 */
-
-#ifdef vccast
-#define	L	vccast(L)
-#endif
-
-#ifdef __weak_alias
-__weak_alias(ceill, ceil);
-__weak_alias(floorl, floor);
-__weak_alias(truncl, trunc);
-#endif
-
-/*
- * floor(x) := the largest integer no larger than x;
- * ceil(x) := -floor(-x), for all real x.
- *
- * Note: Inexact will be signaled if x is not an integer, as is
- *	customary for IEEE 754.  No other signal can be emitted.
- */
-double
-floor(double x)
-{
-	volatile double y;
-
-	if (
-#if !defined(__vax__)&&!defined(tahoe)
-		x != x ||	/* NaN */
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-		x >= L)		/* already an even integer */
-		return x;
-	else if (x < (double)0)
-		return -ceil(-x);
-	else {			/* now 0 <= x < L */
-		y = L+x;		/* destructive store must be forced */
-		y -= L;			/* an integer, and |x-y| < 1 */
-		return x < y ? y-(double)1 : y;
-	}
-}
-
-float
-floorf(float x)
-{
-	return floor((double)x);
-}
-
-double
-ceil(double x)
-{
-	volatile double y;
-
-	if (
-#if !defined(__vax__)&&!defined(tahoe)
-		x != x ||	/* NaN */
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-		x >= L)		/* already an even integer */
-		return x;
-	else if (x < (double)0)
-		return -floor(-x);
-	else {			/* now 0 <= x < L */
-		y = L+x;		/* destructive store must be forced */
-		y -= L;			/* an integer, and |x-y| < 1 */
-		return x > y ? y+(double)1 : y;
-	}
-}
-
-float
-ceilf(float x)
-{
-	return ceil((double)x);
-}
-
-#ifndef ns32000			/* rint() is in ./NATIONAL/support.s */
-/*
- * algorithm for rint(x) in pseudo-pascal form ...
- *
- * real rint(x): real x;
- *	... delivers integer nearest x in direction of prevailing rounding
- *	... mode
- * const	L = (last consecutive integer)/2
- * 	  = 2**55; for VAX D
- * 	  = 2**52; for IEEE 754 Double
- * real	s,t;
- * begin
- * 	if x != x then return x;		... NaN
- * 	if |x| >= L then return x;		... already an integer
- * 	s := copysign(L,x);
- * 	t := x + s;				... = (x+s) rounded to integer
- * 	return t - s
- * end;
- *
- * Note: Inexact will be signaled if x is not an integer, as is
- *	customary for IEEE 754.  No other signal can be emitted.
- */
-double
-rint(double x)
-{
-	double s;
-	volatile double t;
-	const double one = 1.0;
-
-#if !defined(__vax__)&&!defined(tahoe)
-	if (x != x)				/* NaN */
-		return (x);
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-	if (copysign(x,one) >= L)		/* already an integer */
-	    return (x);
-	s = copysign(L,x);
-	t = x + s;				/* x+s rounded to integer */
-	return (t - s);
-}
-#endif	/* not national */
-
-long
-lrint(double x)
-{
-	double s;
-	volatile double t;
-	const double one = 1.0;
-
-#if !defined(__vax__)&&!defined(tahoe)
-	if (x != x)				/* NaN */
-		return (x);
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-	if (copysign(x,one) >= L)		/* already an integer */
-	    return (x);
-	s = copysign(L,x);
-	t = x + s;				/* x+s rounded to integer */
-	return (t - s);
-}
-
-long long
-llrint(double x)
-{
-	double s;
-	volatile double t;
-	const double one = 1.0;
-
-#if !defined(__vax__)&&!defined(tahoe)
-	if (x != x)				/* NaN */
-		return (x);
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-	if (copysign(x,one) >= L)		/* already an integer */
-	    return (x);
-	s = copysign(L,x);
-	t = x + s;				/* x+s rounded to integer */
-	return (t - s);
-}
-
-long
-lrintf(float x)
-{
-	float s;
-	volatile float t;
-	const float one = 1.0;
-
-#if !defined(__vax__)&&!defined(tahoe)
-	if (x != x)				/* NaN */
-		return (x);
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-	if (copysign(x,one) >= L)		/* already an integer */
-	    return (x);
-	s = copysign(L,x);
-	t = x + s;				/* x+s rounded to integer */
-	return (t - s);
-}
-
-long long
-llrintf(float x)
-{
-	float s;
-	volatile float t;
-	const float one = 1.0;
-
-#if !defined(__vax__)&&!defined(tahoe)
-	if (x != x)				/* NaN */
-		return (x);
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-	if (copysign(x,one) >= L)		/* already an integer */
-	    return (x);
-	s = copysign(L,x);
-	t = x + s;				/* x+s rounded to integer */
-	return (t - s);
-}
-
-double
-trunc(double x)
-{
-	return x < 0 ? ceil(x) : floor(x);
-}
-
-float
-truncf(float x)
-{
-	return x < 0 ? ceilf(x) : floorf(x);
-}
diff --git a/lib/libm/noieee_src/n_fmax.c b/lib/libm/noieee_src/n_fmax.c
deleted file mode 100644
index df6b63edc..000000000
--- a/lib/libm/noieee_src/n_fmax.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2011 Jonathan A. Kollasch
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: n_fmax.c,v 1.2 2014/02/03 21:22:21 martin Exp $");
-#endif
-
-#include <math.h>
-
-#ifdef __weak_alias
-__weak_alias(fmaxl, fmax);
-#endif
-
-double
-fmax(double x, double y)
-{
-	return x > y ? x : y;
-}
diff --git a/lib/libm/noieee_src/n_fmaxf.c b/lib/libm/noieee_src/n_fmaxf.c
deleted file mode 100644
index de27d4e9e..000000000
--- a/lib/libm/noieee_src/n_fmaxf.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2011 Jonathan A. Kollasch
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: n_fmaxf.c,v 1.1 2011/01/09 02:32:13 jakllsch Exp $");
-#endif
-
-#include <math.h>
-
-float
-fmaxf(float x, float y)
-{
-	return x > y ? x : y;
-}
diff --git a/lib/libm/noieee_src/n_fmin.c b/lib/libm/noieee_src/n_fmin.c
deleted file mode 100644
index 823b239d4..000000000
--- a/lib/libm/noieee_src/n_fmin.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2011 Jonathan A. Kollasch
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: n_fmin.c,v 1.1 2011/01/09 02:32:13 jakllsch Exp $");
-#endif
-
-#include <math.h>
-
-double
-fmin(double x, double y)
-{
-	return x < y ? x : y;
-}
diff --git a/lib/libm/noieee_src/n_fminf.c b/lib/libm/noieee_src/n_fminf.c
deleted file mode 100644
index 510e8f378..000000000
--- a/lib/libm/noieee_src/n_fminf.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2011 Jonathan A. Kollasch
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: n_fminf.c,v 1.1 2011/01/09 02:32:13 jakllsch Exp $");
-#endif
-
-#include <math.h>
-
-float
-fminf(float x, float y)
-{
-	return x < y ? x : y;
-}
diff --git a/lib/libm/noieee_src/n_fmod.c b/lib/libm/noieee_src/n_fmod.c
deleted file mode 100644
index c6879cf8c..000000000
--- a/lib/libm/noieee_src/n_fmod.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*	$NetBSD: n_fmod.c,v 1.7 2013/11/22 10:59:31 martin Exp $	*/
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)fmod.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-#include "mathimpl.h"
-
-/* fmod.c
- *
- * SYNOPSIS
- *
- *    #include <math.h>
- *    double fmod(double x, double y)
- *
- * DESCRIPTION
- *
- *    The fmod function computes the floating-point remainder of x/y.
- *
- * RETURNS
- *
- *    The fmod function returns the value x-i*y, for some integer i
- * such that, if y is nonzero, the result has the same sign as x and
- * magnitude less than the magnitude of y.
- *
- * On a VAX or CCI,
- *
- *    fmod(x,0) traps/faults on floating-point divided-by-zero.
- *
- * On IEEE-754 conforming machines with "isnan()" primitive,
- *
- *    fmod(x,0), fmod(INF,y) are invalid operations and NaN is returned.
- *
- */
-#if !defined(__vax__) && !defined(tahoe)
-extern int isnan(),finite();
-#endif	/* !defined(__vax__) && !defined(tahoe) */
-
-#if DBL_MANT_DIG == LDBL_MANT_DIG && DBL_MIN_EXP == LDBL_MIN_EXP \
-	 && DBL_MIN_EXP == LDBL_MIN_EXP
-#ifdef __weak_alias
-__weak_alias(fmodl, fmod);
-#endif
-#endif
-
-#ifdef TEST_FMOD
-static double
-_fmod(double x, double y)
-#else	/* TEST_FMOD */
-double
-fmod(double x, double y)
-#endif	/* TEST_FMOD */
-{
-	int ir,iy;
-	double r,w;
-
-	if (y == (double)0
-#if !defined(__vax__) && !defined(tahoe)	/* per "fmod" manual entry, SunOS 4.0 */
-		|| isnan(y) || !finite(x)
-#endif	/* !defined(__vax__) && !defined(tahoe) */
-	    )
-	    return (x*y)/(x*y);
-
-	r = fabs(x);
-	y = fabs(y);
-	(void)frexp(y,&iy);
-	while (r >= y) {
-		(void)frexp(r,&ir);
-		w = ldexp(y,ir-iy);
-		r -= w <= r ? w : w*(double)0.5;
-	}
-	return x >= (double)0 ? r : -r;
-}
-
-float
-fmodf(float x, float y)
-{
-	return fmod(x, y);
-}
-
-#ifdef TEST_FMOD
-extern long random();
-extern double fmod();
-
-#define	NTEST	10000
-#define	NCASES	3
-
-static int nfail = 0;
-
-static void
-doit(double x, double y)
-{
-	double ro = fmod(x,y),rn = _fmod(x,y);
-	if (ro != rn) {
-		(void)printf(" x    = 0x%08.8x %08.8x (%24.16e)\n",x,x);
-		(void)printf(" y    = 0x%08.8x %08.8x (%24.16e)\n",y,y);
-		(void)printf(" fmod = 0x%08.8x %08.8x (%24.16e)\n",ro,ro);
-		(void)printf("_fmod = 0x%08.8x %08.8x (%24.16e)\n",rn,rn);
-		(void)printf("\n");
-	}
-}
-
-int
-main(int argc, char **argv)
-{
-	int i,cases;
-	double x,y;
-
-	srandom(12345);
-	for (i = 0; i < NTEST; i++) {
-		x = (double)random();
-		y = (double)random();
-		for (cases = 0; cases < NCASES; cases++) {
-			switch (cases) {
-			case 0:
-				break;
-			case 1:
-				y = (double)1/y; break;
-			case 2:
-				x = (double)1/x; break;
-			default:
-				abort(); break;
-			}
-			doit(x,y);
-			doit(x,-y);
-			doit(-x,y);
-			doit(-x,-y);
-		}
-	}
-	if (nfail)
-		(void)printf("Number of failures: %d (out of a total of %d)\n",
-			nfail,NTEST*NCASES*4);
-	else
-		(void)printf("No discrepancies were found\n");
-	exit(0);
-}
-#endif	/* TEST_FMOD */
diff --git a/lib/libm/noieee_src/n_gamma.c b/lib/libm/noieee_src/n_gamma.c
deleted file mode 100644
index fc0d3d056..000000000
--- a/lib/libm/noieee_src/n_gamma.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/*      $NetBSD: n_gamma.c,v 1.9 2013/11/09 21:41:03 christos Exp $ */
-/*-
- * 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.
- * 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)gamma.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/*
- * This code by P. McIlroy, Oct 1992;
- *
- * The financial support of UUNET Communications Services is gratefully
- * acknowledged.
- */
-
-#include <math.h>
-#include "mathimpl.h"
-#include <errno.h>
-
-/* METHOD:
- * x < 0: Use reflection formula, G(x) = pi/(sin(pi*x)*x*G(x))
- * 	At negative integers, return +Inf, and set errno.
- *
- * x < 6.5:
- *	Use argument reduction G(x+1) = xG(x) to reach the
- *	range [1.066124,2.066124].  Use a rational
- *	approximation centered at the minimum (x0+1) to
- *	ensure monotonicity.
- *
- * x >= 6.5: Use the asymptotic approximation (Stirling's formula)
- *	adjusted for equal-ripples:
- *
- *	log(G(x)) ~= (x-.5)*(log(x)-1) + .5(log(2*pi)-1) + 1/x*P(1/(x*x))
- *
- *	Keep extra precision in multiplying (x-.5)(log(x)-1), to
- *	avoid premature round-off.
- *
- * Special values:
- *	non-positive integer:	Set overflow trap; return +Inf;
- *	x > 171.63:		Set overflow trap; return +Inf;
- *	NaN: 			Set invalid trap;  return NaN
- *
- * Accuracy: Gamma(x) is accurate to within
- *	x > 0:  error provably < 0.9ulp.
- *	Maximum observed in 1,000,000 trials was .87ulp.
- *	x < 0:
- *	Maximum observed error < 4ulp in 1,000,000 trials.
- */
-
-static double neg_gam (double);
-static double small_gam (double);
-static double smaller_gam (double);
-static struct Double large_gam (double);
-static struct Double ratfun_gam (double, double);
-
-/*
- * Rational approximation, A0 + x*x*P(x)/Q(x), on the interval
- * [1.066.., 2.066..] accurate to 4.25e-19.
- */
-#define LEFT -.3955078125	/* left boundary for rat. approx */
-#define x0 .461632144968362356785	/* xmin - 1 */
-
-#define a0_hi 0.88560319441088874992
-#define a0_lo -.00000000000000004996427036469019695
-#define P0	 6.21389571821820863029017800727e-01
-#define P1	 2.65757198651533466104979197553e-01
-#define P2	 5.53859446429917461063308081748e-03
-#define P3	 1.38456698304096573887145282811e-03
-#define P4	 2.40659950032711365819348969808e-03
-#define Q0	 1.45019531250000000000000000000e+00
-#define Q1	 1.06258521948016171343454061571e+00
-#define Q2	-2.07474561943859936441469926649e-01
-#define Q3	-1.46734131782005422506287573015e-01
-#define Q4	 3.07878176156175520361557573779e-02
-#define Q5	 5.12449347980666221336054633184e-03
-#define Q6	-1.76012741431666995019222898833e-03
-#define Q7	 9.35021023573788935372153030556e-05
-#define Q8	 6.13275507472443958924745652239e-06
-/*
- * Constants for large x approximation (x in [6, Inf])
- * (Accurate to 2.8*10^-19 absolute)
- */
-#define lns2pi_hi 0.418945312500000
-#define lns2pi_lo -.000006779295327258219670263595
-#define Pa0	 8.33333333333333148296162562474e-02
-#define Pa1	-2.77777777774548123579378966497e-03
-#define Pa2	 7.93650778754435631476282786423e-04
-#define Pa3	-5.95235082566672847950717262222e-04
-#define Pa4	 8.41428560346653702135821806252e-04
-#define Pa5	-1.89773526463879200348872089421e-03
-#define Pa6	 5.69394463439411649408050664078e-03
-#define Pa7	-1.44705562421428915453880392761e-02
-
-static const double zero = 0., one = 1.0, tiny = _TINY;
-/*
- * TRUNC sets trailing bits in a floating-point number to zero.
- * is a temporary variable.
- */
-#if defined(__vax__) || defined(tahoe)
-#define _IEEE		0
-#define TRUNC(x)	x = (double) (float) (x)
-#else
-static int endian;
-#define _IEEE		1
-#define TRUNC(x)	*(((int *) &x) + endian) &= 0xf8000000
-#define infnan(x)	0.0
-#endif
-
-double
-gamma(double x)
-{
-	double b;
-	struct Double u;
-#if _IEEE
-	int endian = (*(int *) &one) ? 1 : 0;
-#endif
-
-	if (x >= 6) {
-		if(x > 171.63)
-			return(one/zero);
-		u = large_gam(x);
-		return(__exp__D(u.a, u.b));
-	} else if (x >= 1.0 + LEFT + x0) {
-		return (small_gam(x));
-	} else if (x > 1.e-17) {
-		return (smaller_gam(x));
-	} else if (x > -1.e-17) {
-		if (x == 0.0) {
-			if (!_IEEE) return (infnan(ERANGE));
-			else return (one/x);
-		}
-		b =one+1e-20;		/* Raise inexact flag. ??? -ragge */
-		__USE(b);
-		return (one/x);
-	} else if (!finite(x)) {
-		if (_IEEE)		/* x = NaN, -Inf */
-			return (x*x);
-		else
-			return (infnan(EDOM));
-	 } else
-		return (neg_gam(x));
-}
-/*
- * Accurate to max(ulp(1/128) absolute, 2^-66 relative) error.
- */
-static struct Double
-large_gam(double x)
-{
-	double z, p;
-	struct Double t, u, v;
-
-	z = one/(x*x);
-	p = Pa0+z*(Pa1+z*(Pa2+z*(Pa3+z*(Pa4+z*(Pa5+z*(Pa6+z*Pa7))))));
-	p = p/x;
-
-	u = __log__D(x);
-	u.a -= one;
-	v.a = (x -= .5);
-	TRUNC(v.a);
-	v.b = x - v.a;
-	t.a = v.a*u.a;			/* t = (x-.5)*(log(x)-1) */
-	t.b = v.b*u.a + x*u.b;
-	/* return t.a + t.b + lns2pi_hi + lns2pi_lo + p */
-	t.b += lns2pi_lo; t.b += p;
-	u.a = lns2pi_hi + t.b; u.a += t.a;
-	u.b = t.a - u.a;
-	u.b += lns2pi_hi; u.b += t.b;
-	return (u);
-}
-/*
- * Good to < 1 ulp.  (provably .90 ulp; .87 ulp on 1,000,000 runs.)
- * It also has correct monotonicity.
- */
-static double
-small_gam(double x)
-{
-	double y, ym1, t;
-	struct Double yy, r;
-	y = x - one;
-	ym1 = y - one;
-	if (y <= 1.0 + (LEFT + x0)) {
-		yy = ratfun_gam(y - x0, 0);
-		return (yy.a + yy.b);
-	}
-	r.a = y;
-	TRUNC(r.a);
-	yy.a = r.a - one;
-	y = ym1;
-	yy.b = r.b = y - yy.a;
-	/* Argument reduction: G(x+1) = x*G(x) */
-	for (ym1 = y-one; ym1 > LEFT + x0; y = ym1--, yy.a--) {
-		t = r.a*yy.a;
-		r.b = r.a*yy.b + y*r.b;
-		r.a = t;
-		TRUNC(r.a);
-		r.b += (t - r.a);
-	}
-	/* Return r*gamma(y). */
-	yy = ratfun_gam(y - x0, 0);
-	y = r.b*(yy.a + yy.b) + r.a*yy.b;
-	y += yy.a*r.a;
-	return (y);
-}
-/*
- * Good on (0, 1+x0+LEFT].  Accurate to 1ulp.
- */
-static double
-smaller_gam(double x)
-{
-	double t, d;
-	struct Double r, xx;
-	if (x < x0 + LEFT) {
-		t = x, TRUNC(t);
-		d = (t+x)*(x-t);
-		t *= t;
-		xx.a = (t + x), TRUNC(xx.a);
-		xx.b = x - xx.a; xx.b += t; xx.b += d;
-		t = (one-x0); t += x;
-		d = (one-x0); d -= t; d += x;
-		x = xx.a + xx.b;
-	} else {
-		xx.a =  x, TRUNC(xx.a);
-		xx.b = x - xx.a;
-		t = x - x0;
-		d = (-x0 -t); d += x;
-	}
-	r = ratfun_gam(t, d);
-	d = r.a/x, TRUNC(d);
-	r.a -= d*xx.a; r.a -= d*xx.b; r.a += r.b;
-	return (d + r.a/x);
-}
-/*
- * returns (z+c)^2 * P(z)/Q(z) + a0
- */
-static struct Double
-ratfun_gam(double z, double c)
-{
-	double p, q;
-	struct Double r, t;
-
-	q = Q0 +z*(Q1+z*(Q2+z*(Q3+z*(Q4+z*(Q5+z*(Q6+z*(Q7+z*Q8)))))));
-	p = P0 + z*(P1 + z*(P2 + z*(P3 + z*P4)));
-
-	/* return r.a + r.b = a0 + (z+c)^2*p/q, with r.a truncated to 26 bits. */
-	p = p/q;
-	t.a = z, TRUNC(t.a);		/* t ~= z + c */
-	t.b = (z - t.a) + c;
-	t.b *= (t.a + z);
-	q = (t.a *= t.a);		/* t = (z+c)^2 */
-	TRUNC(t.a);
-	t.b += (q - t.a);
-	r.a = p, TRUNC(r.a);		/* r = P/Q */
-	r.b = p - r.a;
-	t.b = t.b*p + t.a*r.b + a0_lo;
-	t.a *= r.a;			/* t = (z+c)^2*(P/Q) */
-	r.a = t.a + a0_hi, TRUNC(r.a);
-	r.b = ((a0_hi-r.a) + t.a) + t.b;
-	return (r);			/* r = a0 + t */
-}
-
-static double
-neg_gam(double x)
-{
-	int sgn = 1;
-	struct Double lg, lsine;
-	double y, z;
-
-	y = floor(x + .5);
-	if (y == x) {		/* Negative integer. */
-		if(!_IEEE)
-			return (infnan(ERANGE));
-		else
-			return (one/zero);
-	}
-	z = fabs(x - y);
-	y = .5*ceil(x);
-	if (y == ceil(y))
-		sgn = -1;
-	if (z < .25)
-		z = sin(M_PI*z);
-	else
-		z = cos(M_PI*(0.5-z));
-	/* Special case: G(1-x) = Inf; G(x) may be nonzero. */
-	if (x < -170) {
-		if (x < -190)
-			return ((double)sgn*tiny*tiny);
-		y = one - x;		/* exact: 128 < |x| < 255 */
-		lg = large_gam(y);
-		lsine = __log__D(M_PI/z);	/* = TRUNC(log(u)) + small */
-		lg.a -= lsine.a;		/* exact (opposite signs) */
-		lg.b -= lsine.b;
-		y = -(lg.a + lg.b);
-		z = (y + lg.a) + lg.b;
-		y = __exp__D(y, z);
-		if (sgn < 0) y = -y;
-		return (y);
-	}
-	y = one-x;
-	if (one-y == x)
-		y = gamma(y);
-	else		/* 1-x is inexact */
-		y = -x*gamma(-x);
-	if (sgn < 0) y = -y;
-	return (M_PI / (y*z));
-}
diff --git a/lib/libm/noieee_src/n_j0.c b/lib/libm/noieee_src/n_j0.c
deleted file mode 100644
index 7221eaef3..000000000
--- a/lib/libm/noieee_src/n_j0.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/*	$NetBSD: n_j0.c,v 1.7 2011/11/02 02:34:56 christos Exp $	*/
-/*-
- * 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.
- * 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)j0.c	8.2 (Berkeley) 11/30/93";
-#endif
-#endif /* not lint */
-
-/*
- * 16 December 1992
- * Minor modifications by Peter McIlroy to adapt non-IEEE architecture.
- */
-
-/*
- * ====================================================
- * Copyright (C) 1992 by Sun Microsystems, Inc.
- *
- * 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.
- * ====================================================
- *
- * ******************* WARNING ********************
- * This is an alpha version of SunPro's FDLIBM (Freely
- * Distributable Math Library) for IEEE double precision
- * arithmetic. FDLIBM is a basic math library written
- * in C that runs on machines that conform to IEEE
- * Standard 754/854. This alpha version is distributed
- * for testing purpose. Those who use this software
- * should report any bugs to
- *
- *		fdlibm-comments@sunpro.eng.sun.com
- *
- * -- K.C. Ng, Oct 12, 1992
- * ************************************************
- */
-
-/* double j0(double x), y0(double x)
- * Bessel function of the first and second kinds of order zero.
- * Method -- j0(x):
- *	1. For tiny x, we use j0(x) = 1 - x^2/4 + x^4/64 - ...
- *	2. Reduce x to |x| since j0(x)=j0(-x),  and
- *	   for x in (0,2)
- *		j0(x) = 1-z/4+ z^2*R0/S0,  where z = x*x;
- *	   (precision:  |j0-1+z/4-z^2R0/S0 |<2**-63.67 )
- *	   for x in (2,inf)
- * 		j0(x) = sqrt(2/(pi*x))*(p0(x)*cos(x0)-q0(x)*sin(x0))
- * 	   where x0 = x-pi/4. It is better to compute sin(x0),cos(x0)
- *	   as follow:
- *		cos(x0) = cos(x)cos(pi/4)+sin(x)sin(pi/4)
- *			= 1/sqrt(2) * (cos(x) + sin(x))
- *		sin(x0) = sin(x)cos(pi/4)-cos(x)sin(pi/4)
- *			= 1/sqrt(2) * (sin(x) - cos(x))
- * 	   (To avoid cancellation, use
- *		sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
- * 	    to compute the worse one.)
- *
- *	3 Special cases
- *		j0(nan)= nan
- *		j0(0) = 1
- *		j0(inf) = 0
- *
- * Method -- y0(x):
- *	1. For x<2.
- *	   Since
- *		y0(x) = 2/pi*(j0(x)*(ln(x/2)+Euler) + x^2/4 - ...)
- *	   therefore y0(x)-2/pi*j0(x)*ln(x) is an even function.
- *	   We use the following function to approximate y0,
- *		y0(x) = U(z)/V(z) + (2/pi)*(j0(x)*ln(x)), z= x^2
- *	   where
- *		U(z) = u0 + u1*z + ... + u6*z^6
- *		V(z) = 1  + v1*z + ... + v4*z^4
- *	   with absolute approximation error bounded by 2**-72.
- *	   Note: For tiny x, U/V = u0 and j0(x)~1, hence
- *		y0(tiny) = u0 + (2/pi)*ln(tiny), (choose tiny<2**-27)
- *	2. For x>=2.
- * 		y0(x) = sqrt(2/(pi*x))*(p0(x)*cos(x0)+q0(x)*sin(x0))
- * 	   where x0 = x-pi/4. It is better to compute sin(x0),cos(x0)
- *	   by the method mentioned above.
- *	3. Special cases: y0(0)=-inf, y0(x<0)=NaN, y0(inf)=0.
- */
-
-#include "mathimpl.h"
-#include <float.h>
-#include <errno.h>
-
-#if defined(__vax__) || defined(tahoe)
-#define _IEEE	0
-#else
-#define _IEEE	1
-#define infnan(x) (0.0)
-#endif
-
-static double pzero (double), qzero (double);
-
-static const double
-huge 	= _HUGE,
-zero    = 0.0,
-one	= 1.0,
-invsqrtpi= 5.641895835477562869480794515607725858441e-0001,
-tpi	= 0.636619772367581343075535053490057448,
- 		/* R0/S0 on [0, 2.00] */
-r02 =   1.562499999999999408594634421055018003102e-0002,
-r03 =  -1.899792942388547334476601771991800712355e-0004,
-r04 =   1.829540495327006565964161150603950916854e-0006,
-r05 =  -4.618326885321032060803075217804816988758e-0009,
-s01 =   1.561910294648900170180789369288114642057e-0002,
-s02 =   1.169267846633374484918570613449245536323e-0004,
-s03 =   5.135465502073181376284426245689510134134e-0007,
-s04 =   1.166140033337900097836930825478674320464e-0009;
-
-double
-j0(double x)
-{
-	double z, s,c,ss,cc,r,u,v;
-
-	if (!finite(x)) {
-#if _IEEE
-		return one/(x*x);
-#else
-		return (0);
-#endif
-	}
-	x = fabs(x);
-	if (x >= 2.0) {	/* |x| >= 2.0 */
-		s = sin(x);
-		c = cos(x);
-		ss = s-c;
-		cc = s+c;
-		if (x < .5 * DBL_MAX) {  /* make sure x+x not overflow */
-		    z = -cos(x+x);
-		    if ((s*c)<zero) cc = z/ss;
-		    else 	    ss = z/cc;
-		}
-	/*
-	 * j0(x) = 1/sqrt(pi) * (P(0,x)*cc - Q(0,x)*ss) / sqrt(x)
-	 * y0(x) = 1/sqrt(pi) * (P(0,x)*ss + Q(0,x)*cc) / sqrt(x)
-	 */
-#if _IEEE
-		if (x > 6.80564733841876927e+38) /* 2^129 */
-			z = (invsqrtpi*cc)/sqrt(x);
-		else
-#endif
-		{
-		    u = pzero(x); v = qzero(x);
-		    z = invsqrtpi*(u*cc-v*ss)/sqrt(x);
-		}
-		return z;
-	}
-	if (x < 1.220703125e-004) {		   /* |x| < 2**-13 */
-	    if (huge+x > one) {			   /* raise inexact if x != 0 */
-	        if (x < 7.450580596923828125e-009) /* |x|<2**-27 */
-			return one;
-	        else return (one - 0.25*x*x);
-	    }
-	}
-	z = x*x;
-	r =  z*(r02+z*(r03+z*(r04+z*r05)));
-	s =  one+z*(s01+z*(s02+z*(s03+z*s04)));
-	if (x < one) {			/* |x| < 1.00 */
-	    return (one + z*(-0.25+(r/s)));
-	} else {
-	    u = 0.5*x;
-	    return ((one+u)*(one-u)+z*(r/s));
-	}
-}
-
-static const double
-u00 =  -7.380429510868722527422411862872999615628e-0002,
-u01 =   1.766664525091811069896442906220827182707e-0001,
-u02 =  -1.381856719455968955440002438182885835344e-0002,
-u03 =   3.474534320936836562092566861515617053954e-0004,
-u04 =  -3.814070537243641752631729276103284491172e-0006,
-u05 =   1.955901370350229170025509706510038090009e-0008,
-u06 =  -3.982051941321034108350630097330144576337e-0011,
-v01 =   1.273048348341237002944554656529224780561e-0002,
-v02 =   7.600686273503532807462101309675806839635e-0005,
-v03 =   2.591508518404578033173189144579208685163e-0007,
-v04 =   4.411103113326754838596529339004302243157e-0010;
-
-double
-y0(double x)
-{
-	double z, s, c, ss, cc, u, v;
-    /* Y0(NaN) is NaN, y0(-inf) is Nan, y0(inf) is 0  */
-	if (!finite(x)) {
-#if _IEEE
-			return (one/(x+x*x));
-#else
-			return (0);
-#endif
-	}
-        if (x == 0) {
-#if _IEEE
-		return (-one/zero);
-#else
-		return(infnan(-ERANGE));
-#endif
-	}
-        if (x<0) {
-#if _IEEE
-		return (zero/zero);
-#else
-		return (infnan(EDOM));
-#endif
-	}
-        if (x >= 2.00) {	/* |x| >= 2.0 */
-        /* y0(x) = sqrt(2/(pi*x))*(p0(x)*sin(x0)+q0(x)*cos(x0))
-         * where x0 = x-pi/4
-         *      Better formula:
-         *              cos(x0) = cos(x)cos(pi/4)+sin(x)sin(pi/4)
-         *                      =  1/sqrt(2) * (sin(x) + cos(x))
-         *              sin(x0) = sin(x)cos(3pi/4)-cos(x)sin(3pi/4)
-         *                      =  1/sqrt(2) * (sin(x) - cos(x))
-         * To avoid cancellation, use
-         *              sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
-         * to compute the worse one.
-         */
-                s = sin(x);
-                c = cos(x);
-                ss = s-c;
-                cc = s+c;
-	/*
-	 * j0(x) = 1/sqrt(pi) * (P(0,x)*cc - Q(0,x)*ss) / sqrt(x)
-	 * y0(x) = 1/sqrt(pi) * (P(0,x)*ss + Q(0,x)*cc) / sqrt(x)
-	 */
-                if (x < .5 * DBL_MAX) {  /* make sure x+x not overflow */
-                    z = -cos(x+x);
-                    if ((s*c)<zero) cc = z/ss;
-                    else            ss = z/cc;
-                }
-#if _IEEE
-                if (x > 6.80564733841876927e+38) /* > 2^129 */
-			z = (invsqrtpi*ss)/sqrt(x);
-                else
-#endif
-		{
-                    u = pzero(x); v = qzero(x);
-                    z = invsqrtpi*(u*ss+v*cc)/sqrt(x);
-                }
-                return z;
-	}
-	if (x <= 7.450580596923828125e-009) {		/* x < 2**-27 */
-	    return (u00 + tpi*log(x));
-	}
-	z = x*x;
-	u = u00+z*(u01+z*(u02+z*(u03+z*(u04+z*(u05+z*u06)))));
-	v = one+z*(v01+z*(v02+z*(v03+z*v04)));
-	return (u/v + tpi*(j0(x)*log(x)));
-}
-
-/* The asymptotic expansions of pzero is
- *	1 - 9/128 s^2 + 11025/98304 s^4 - ...,	where s = 1/x.
- * For x >= 2, We approximate pzero by
- * 	pzero(x) = 1 + (R/S)
- * where  R = pr0 + pr1*s^2 + pr2*s^4 + ... + pr5*s^10
- * 	  S = 1 + ps0*s^2 + ... + ps4*s^10
- * and
- *	| pzero(x)-1-R/S | <= 2  ** ( -60.26)
- */
-static const double pr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-   0.0,
-  -7.031249999999003994151563066182798210142e-0002,
-  -8.081670412753498508883963849859423939871e+0000,
-  -2.570631056797048755890526455854482662510e+0002,
-  -2.485216410094288379417154382189125598962e+0003,
-  -5.253043804907295692946647153614119665649e+0003,
-};
-static const double ps8[5] = {
-   1.165343646196681758075176077627332052048e+0002,
-   3.833744753641218451213253490882686307027e+0003,
-   4.059785726484725470626341023967186966531e+0004,
-   1.167529725643759169416844015694440325519e+0005,
-   4.762772841467309430100106254805711722972e+0004,
-};
-
-static const double pr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-  -1.141254646918944974922813501362824060117e-0011,
-  -7.031249408735992804117367183001996028304e-0002,
-  -4.159610644705877925119684455252125760478e+0000,
-  -6.767476522651671942610538094335912346253e+0001,
-  -3.312312996491729755731871867397057689078e+0002,
-  -3.464333883656048910814187305901796723256e+0002,
-};
-static const double ps5[5] = {
-   6.075393826923003305967637195319271932944e+0001,
-   1.051252305957045869801410979087427910437e+0003,
-   5.978970943338558182743915287887408780344e+0003,
-   9.625445143577745335793221135208591603029e+0003,
-   2.406058159229391070820491174867406875471e+0003,
-};
-
-static const double pr3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */
-  -2.547046017719519317420607587742992297519e-0009,
-  -7.031196163814817199050629727406231152464e-0002,
-  -2.409032215495295917537157371488126555072e+0000,
-  -2.196597747348830936268718293366935843223e+0001,
-  -5.807917047017375458527187341817239891940e+0001,
-  -3.144794705948885090518775074177485744176e+0001,
-};
-static const double ps3[5] = {
-   3.585603380552097167919946472266854507059e+0001,
-   3.615139830503038919981567245265266294189e+0002,
-   1.193607837921115243628631691509851364715e+0003,
-   1.127996798569074250675414186814529958010e+0003,
-   1.735809308133357510239737333055228118910e+0002,
-};
-
-static const double pr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-  -8.875343330325263874525704514800809730145e-0008,
-  -7.030309954836247756556445443331044338352e-0002,
-  -1.450738467809529910662233622603401167409e+0000,
-  -7.635696138235277739186371273434739292491e+0000,
-  -1.119316688603567398846655082201614524650e+0001,
-  -3.233645793513353260006821113608134669030e+0000,
-};
-static const double ps2[5] = {
-   2.222029975320888079364901247548798910952e+0001,
-   1.362067942182152109590340823043813120940e+0002,
-   2.704702786580835044524562897256790293238e+0002,
-   1.538753942083203315263554770476850028583e+0002,
-   1.465761769482561965099880599279699314477e+0001,
-};
-
-static double
-pzero(double x)
-{
-	const double *p,*q;
-	double z,r,s;
-	if (x >= 8.00)			   {p = pr8; q= ps8;}
-	else if (x >= 4.54545211791992188) {p = pr5; q= ps5;}
-	else if (x >= 2.85714149475097656) {p = pr3; q= ps3;}
-	else /* if (x >= 2.00) */	   {p = pr2; q= ps2;}
-	z = one/(x*x);
-	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*q[4]))));
-	return one+ r/s;
-}
-
-
-/* For x >= 8, the asymptotic expansions of qzero is
- *	-1/8 s + 75/1024 s^3 - ..., where s = 1/x.
- * We approximate pzero by
- * 	qzero(x) = s*(-1.25 + (R/S))
- * where  R = qr0 + qr1*s^2 + qr2*s^4 + ... + qr5*s^10
- * 	  S = 1 + qs0*s^2 + ... + qs5*s^12
- * and
- *	| qzero(x)/s +1.25-R/S | <= 2  ** ( -61.22)
- */
-static const double qr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-   0.0,
-   7.324218749999350414479738504551775297096e-0002,
-   1.176820646822526933903301695932765232456e+0001,
-   5.576733802564018422407734683549251364365e+0002,
-   8.859197207564685717547076568608235802317e+0003,
-   3.701462677768878501173055581933725704809e+0004,
-};
-static const double qs8[6] = {
-   1.637760268956898345680262381842235272369e+0002,
-   8.098344946564498460163123708054674227492e+0003,
-   1.425382914191204905277585267143216379136e+0005,
-   8.033092571195144136565231198526081387047e+0005,
-   8.405015798190605130722042369969184811488e+0005,
-  -3.438992935378666373204500729736454421006e+0005,
-};
-
-static const double qr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-   1.840859635945155400568380711372759921179e-0011,
-   7.324217666126847411304688081129741939255e-0002,
-   5.835635089620569401157245917610984757296e+0000,
-   1.351115772864498375785526599119895942361e+0002,
-   1.027243765961641042977177679021711341529e+0003,
-   1.989977858646053872589042328678602481924e+0003,
-};
-static const double qs5[6] = {
-   8.277661022365377058749454444343415524509e+0001,
-   2.077814164213929827140178285401017305309e+0003,
-   1.884728877857180787101956800212453218179e+0004,
-   5.675111228949473657576693406600265778689e+0004,
-   3.597675384251145011342454247417399490174e+0004,
-  -5.354342756019447546671440667961399442388e+0003,
-};
-
-static const double qr3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */
-   4.377410140897386263955149197672576223054e-0009,
-   7.324111800429115152536250525131924283018e-0002,
-   3.344231375161707158666412987337679317358e+0000,
-   4.262184407454126175974453269277100206290e+0001,
-   1.708080913405656078640701512007621675724e+0002,
-   1.667339486966511691019925923456050558293e+0002,
-};
-static const double qs3[6] = {
-   4.875887297245871932865584382810260676713e+0001,
-   7.096892210566060535416958362640184894280e+0002,
-   3.704148226201113687434290319905207398682e+0003,
-   6.460425167525689088321109036469797462086e+0003,
-   2.516333689203689683999196167394889715078e+0003,
-  -1.492474518361563818275130131510339371048e+0002,
-};
-
-static const double qr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-   1.504444448869832780257436041633206366087e-0007,
-   7.322342659630792930894554535717104926902e-0002,
-   1.998191740938159956838594407540292600331e+0000,
-   1.449560293478857407645853071687125850962e+0001,
-   3.166623175047815297062638132537957315395e+0001,
-   1.625270757109292688799540258329430963726e+0001,
-};
-static const double qs2[6] = {
-   3.036558483552191922522729838478169383969e+0001,
-   2.693481186080498724211751445725708524507e+0002,
-   8.447837575953201460013136756723746023736e+0002,
-   8.829358451124885811233995083187666981299e+0002,
-   2.126663885117988324180482985363624996652e+0002,
-  -5.310954938826669402431816125780738924463e+0000,
-};
-
-static double
-qzero(double x)
-{
-	const double *p,*q;
-	double s,r,z;
-	if (x >= 8.00)			   {p = qr8; q= qs8;}
-	else if (x >= 4.54545211791992188) {p = qr5; q= qs5;}
-	else if (x >= 2.85714149475097656) {p = qr3; q= qs3;}
-	else /* if (x >= 2.00) */	   {p = qr2; q= qs2;}
-	z = one/(x*x);
-	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*(q[4]+z*q[5])))));
-	return (-.125 + r/s)/x;
-}
diff --git a/lib/libm/noieee_src/n_j1.c b/lib/libm/noieee_src/n_j1.c
deleted file mode 100644
index b0d59ea9c..000000000
--- a/lib/libm/noieee_src/n_j1.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/*	$NetBSD: n_j1.c,v 1.7 2011/11/02 02:34:56 christos Exp $	*/
-/*-
- * 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.
- * 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)j1.c	8.2 (Berkeley) 11/30/93";
-#endif
-#endif /* not lint */
-
-/*
- * 16 December 1992
- * Minor modifications by Peter McIlroy to adapt non-IEEE architecture.
- */
-
-/*
- * ====================================================
- * Copyright (C) 1992 by Sun Microsystems, Inc.
- *
- * 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.
- * ====================================================
- *
- * ******************* WARNING ********************
- * This is an alpha version of SunPro's FDLIBM (Freely
- * Distributable Math Library) for IEEE double precision
- * arithmetic. FDLIBM is a basic math library written
- * in C that runs on machines that conform to IEEE
- * Standard 754/854. This alpha version is distributed
- * for testing purpose. Those who use this software
- * should report any bugs to
- *
- *		fdlibm-comments@sunpro.eng.sun.com
- *
- * -- K.C. Ng, Oct 12, 1992
- * ************************************************
- */
-
-/* double j1(double x), y1(double x)
- * Bessel function of the first and second kinds of order zero.
- * Method -- j1(x):
- *	1. For tiny x, we use j1(x) = x/2 - x^3/16 + x^5/384 - ...
- *	2. Reduce x to |x| since j1(x)=-j1(-x),  and
- *	   for x in (0,2)
- *		j1(x) = x/2 + x*z*R0/S0,  where z = x*x;
- *	   (precision:  |j1/x - 1/2 - R0/S0 |<2**-61.51 )
- *	   for x in (2,inf)
- * 		j1(x) = sqrt(2/(pi*x))*(p1(x)*cos(x1)-q1(x)*sin(x1))
- * 		y1(x) = sqrt(2/(pi*x))*(p1(x)*sin(x1)+q1(x)*cos(x1))
- * 	   where x1 = x-3*pi/4. It is better to compute sin(x1),cos(x1)
- *	   as follows:
- *		cos(x1) =  cos(x)cos(3pi/4)+sin(x)sin(3pi/4)
- *			=  1/sqrt(2) * (sin(x) - cos(x))
- *		sin(x1) =  sin(x)cos(3pi/4)-cos(x)sin(3pi/4)
- *			= -1/sqrt(2) * (sin(x) + cos(x))
- * 	   (To avoid cancellation, use
- *		sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
- * 	    to compute the worse one.)
- *
- *	3 Special cases
- *		j1(nan)= nan
- *		j1(0) = 0
- *		j1(inf) = 0
- *
- * Method -- y1(x):
- *	1. screen out x<=0 cases: y1(0)=-inf, y1(x<0)=NaN
- *	2. For x<2.
- *	   Since
- *		y1(x) = 2/pi*(j1(x)*(ln(x/2)+Euler)-1/x-x/2+5/64*x^3-...)
- *	   therefore y1(x)-2/pi*j1(x)*ln(x)-1/x is an odd function.
- *	   We use the following function to approximate y1,
- *		y1(x) = x*U(z)/V(z) + (2/pi)*(j1(x)*ln(x)-1/x), z= x^2
- *	   where for x in [0,2] (abs err less than 2**-65.89)
- *		U(z) = u0 + u1*z + ... + u4*z^4
- *		V(z) = 1  + v1*z + ... + v5*z^5
- *	   Note: For tiny x, 1/x dominate y1 and hence
- *		y1(tiny) = -2/pi/tiny, (choose tiny<2**-54)
- *	3. For x>=2.
- * 		y1(x) = sqrt(2/(pi*x))*(p1(x)*sin(x1)+q1(x)*cos(x1))
- * 	   where x1 = x-3*pi/4. It is better to compute sin(x1),cos(x1)
- *	   by method mentioned above.
- */
-
-#include "mathimpl.h"
-#include <float.h>
-#include <errno.h>
-
-#if defined(__vax__) || defined(tahoe)
-#define _IEEE	0
-#else
-#define _IEEE	1
-#define infnan(x) (0.0)
-#endif
-
-static double pone (double), qone (double);
-
-static const double
-huge    = _HUGE,
-zero    = 0.0,
-one	= 1.0,
-invsqrtpi= 5.641895835477562869480794515607725858441e-0001,
-tpi	= 0.636619772367581343075535053490057448,
-
-	/* R0/S0 on [0,2] */
-r00 =  -6.250000000000000020842322918309200910191e-0002,
-r01 =   1.407056669551897148204830386691427791200e-0003,
-r02 =  -1.599556310840356073980727783817809847071e-0005,
-r03 =   4.967279996095844750387702652791615403527e-0008,
-s01 =   1.915375995383634614394860200531091839635e-0002,
-s02 =   1.859467855886309024045655476348872850396e-0004,
-s03 =   1.177184640426236767593432585906758230822e-0006,
-s04 =   5.046362570762170559046714468225101016915e-0009,
-s05 =   1.235422744261379203512624973117299248281e-0011;
-
-#define two_129	6.80564733841876926e+038	/* 2^129 */
-#define two_m54	5.55111512312578270e-017	/* 2^-54 */
-
-double
-j1(double x)
-{
-	double z, s,c,ss,cc,r,u,v,y;
-	y = fabs(x);
-	if (!finite(x)) {		/* Inf or NaN */
-#if _IEEE
-		if (x != x)
-			return(x);
-		else
-#endif
-			return (copysign(x, zero));
-	}
-	y = fabs(x);
-	if (y >= 2) {			/* |x| >= 2.0 */
-		s = sin(y);
-		c = cos(y);
-		ss = -s-c;
-		cc = s-c;
-		if (y < .5*DBL_MAX) {  	/* make sure y+y not overflow */
-		    z = cos(y+y);
-		    if ((s*c)<zero) cc = z/ss;
-		    else 	    ss = z/cc;
-		}
-	/*
-	 * j1(x) = 1/sqrt(pi) * (P(1,x)*cc - Q(1,x)*ss) / sqrt(x)
-	 * y1(x) = 1/sqrt(pi) * (P(1,x)*ss + Q(1,x)*cc) / sqrt(x)
-	 */
-#if !defined(__vax__) && !defined(tahoe)
-		if (y > two_129)	 /* x > 2^129 */
-			z = (invsqrtpi*cc)/sqrt(y);
-		else
-#endif /* defined(__vax__) || defined(tahoe) */
-		{
-		    u = pone(y); v = qone(y);
-		    z = invsqrtpi*(u*cc-v*ss)/sqrt(y);
-		}
-		if (x < 0) return -z;
-		else  	 return  z;
-	}
-	if (y < 7.450580596923828125e-009) {	/* |x|<2**-27 */
-	    if(huge+x>one) return 0.5*x;/* inexact if x!=0 necessary */
-	}
-	z = x*x;
-	r =  z*(r00+z*(r01+z*(r02+z*r03)));
-	s =  one+z*(s01+z*(s02+z*(s03+z*(s04+z*s05))));
-	r *= x;
-	return (x*0.5+r/s);
-}
-
-static const double u0[5] = {
-  -1.960570906462389484206891092512047539632e-0001,
-   5.044387166398112572026169863174882070274e-0002,
-  -1.912568958757635383926261729464141209569e-0003,
-   2.352526005616105109577368905595045204577e-0005,
-   -9.190991580398788465315411784276789663849e-0008,
-};
-static const double v0[5] = {
-   1.991673182366499064031901734535479833387e-0002,
-   2.025525810251351806268483867032781294682e-0004,
-   1.356088010975162198085369545564475416398e-0006,
-   6.227414523646214811803898435084697863445e-0009,
-   1.665592462079920695971450872592458916421e-0011,
-};
-
-double
-y1(double x)
-{
-	double z, s, c, ss, cc, u, v;
-    /* if Y1(NaN) is NaN, Y1(-inf) is NaN, Y1(inf) is 0 */
-	if (!finite(x)) {
-#if _IEEE
-		if (x < 0)
-			return(zero/zero);
-		else if (x > 0)
-			return (0);
-		else
-			return(x);
-#else
-		return (infnan(EDOM));
-#endif
-	}
-	if (x <= 0) {
-#if _IEEE
-		if (x == 0) return -one/zero;
-#endif
-		if(x == 0) return(infnan(-ERANGE));
-#if _IEEE
-		return (zero/zero);
-#else
-		return(infnan(EDOM));
-#endif
-	}
-        if (x >= 2) {			 /* |x| >= 2.0 */
-                s = sin(x);
-                c = cos(x);
-                ss = -s-c;
-                cc = s-c;
-		if (x < .5 * DBL_MAX) {	/* make sure x+x not overflow */
-                    z = cos(x+x);
-                    if ((s*c)>zero) cc = z/ss;
-                    else            ss = z/cc;
-                }
-        /* y1(x) = sqrt(2/(pi*x))*(p1(x)*sin(x0)+q1(x)*cos(x0))
-         * where x0 = x-3pi/4
-         *      Better formula:
-         *              cos(x0) = cos(x)cos(3pi/4)+sin(x)sin(3pi/4)
-         *                      =  1/sqrt(2) * (sin(x) - cos(x))
-         *              sin(x0) = sin(x)cos(3pi/4)-cos(x)sin(3pi/4)
-         *                      = -1/sqrt(2) * (cos(x) + sin(x))
-         * To avoid cancellation, use
-         *              sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
-         * to compute the worse one.
-         */
-#if _IEEE
-                if (x>two_129) {
-			z = (invsqrtpi*ss)/sqrt(x);
-                } else
-#endif
-		{
-                    u = pone(x); v = qone(x);
-                    z = invsqrtpi*(u*ss+v*cc)/sqrt(x);
-                }
-                return z;
-        }
-        if (x <= two_m54) {    /* x < 2**-54 */
-            return (-tpi/x);
-        }
-        z = x*x;
-        u = u0[0]+z*(u0[1]+z*(u0[2]+z*(u0[3]+z*u0[4])));
-        v = one+z*(v0[0]+z*(v0[1]+z*(v0[2]+z*(v0[3]+z*v0[4]))));
-        return (x*(u/v) + tpi*(j1(x)*log(x)-one/x));
-}
-
-/* For x >= 8, the asymptotic expansions of pone is
- *	1 + 15/128 s^2 - 4725/2^15 s^4 - ...,	where s = 1/x.
- * We approximate pone by
- * 	pone(x) = 1 + (R/S)
- * where  R = pr0 + pr1*s^2 + pr2*s^4 + ... + pr5*s^10
- * 	  S = 1 + ps0*s^2 + ... + ps4*s^10
- * and
- *	| pone(x)-1-R/S | <= 2  ** ( -60.06)
- */
-
-static const double pr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-   0.0,
-   1.171874999999886486643746274751925399540e-0001,
-   1.323948065930735690925827997575471527252e+0001,
-   4.120518543073785433325860184116512799375e+0002,
-   3.874745389139605254931106878336700275601e+0003,
-   7.914479540318917214253998253147871806507e+0003,
-};
-static const double ps8[5] = {
-   1.142073703756784104235066368252692471887e+0002,
-   3.650930834208534511135396060708677099382e+0003,
-   3.695620602690334708579444954937638371808e+0004,
-   9.760279359349508334916300080109196824151e+0004,
-   3.080427206278887984185421142572315054499e+0004,
-};
-
-static const double pr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-   1.319905195562435287967533851581013807103e-0011,
-   1.171874931906140985709584817065144884218e-0001,
-   6.802751278684328781830052995333841452280e+0000,
-   1.083081829901891089952869437126160568246e+0002,
-   5.176361395331997166796512844100442096318e+0002,
-   5.287152013633375676874794230748055786553e+0002,
-};
-static const double ps5[5] = {
-   5.928059872211313557747989128353699746120e+0001,
-   9.914014187336144114070148769222018425781e+0002,
-   5.353266952914879348427003712029704477451e+0003,
-   7.844690317495512717451367787640014588422e+0003,
-   1.504046888103610723953792002716816255382e+0003,
-};
-
-static const double pr3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */
-   3.025039161373736032825049903408701962756e-0009,
-   1.171868655672535980750284752227495879921e-0001,
-   3.932977500333156527232725812363183251138e+0000,
-   3.511940355916369600741054592597098912682e+0001,
-   9.105501107507812029367749771053045219094e+0001,
-   4.855906851973649494139275085628195457113e+0001,
-};
-static const double ps3[5] = {
-   3.479130950012515114598605916318694946754e+0001,
-   3.367624587478257581844639171605788622549e+0002,
-   1.046871399757751279180649307467612538415e+0003,
-   8.908113463982564638443204408234739237639e+0002,
-   1.037879324396392739952487012284401031859e+0002,
-};
-
-static const double pr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-   1.077108301068737449490056513753865482831e-0007,
-   1.171762194626833490512746348050035171545e-0001,
-   2.368514966676087902251125130227221462134e+0000,
-   1.224261091482612280835153832574115951447e+0001,
-   1.769397112716877301904532320376586509782e+0001,
-   5.073523125888185399030700509321145995160e+0000,
-};
-static const double ps2[5] = {
-   2.143648593638214170243114358933327983793e+0001,
-   1.252902271684027493309211410842525120355e+0002,
-   2.322764690571628159027850677565128301361e+0002,
-   1.176793732871470939654351793502076106651e+0002,
-   8.364638933716182492500902115164881195742e+0000,
-};
-
-static double
-pone(double x)
-{
-	const double *p,*q;
-	double z,r,s;
-	if (x >= 8.0) 			   {p = pr8; q= ps8;}
-	else if (x >= 4.54545211791992188) {p = pr5; q= ps5;}
-	else if (x >= 2.85714149475097656) {p = pr3; q= ps3;}
-	else /* if (x >= 2.0) */	   {p = pr2; q= ps2;}
-	z = one/(x*x);
-	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*q[4]))));
-	return (one + r/s);
-}
-
-
-/* For x >= 8, the asymptotic expansions of qone is
- *	3/8 s - 105/1024 s^3 - ..., where s = 1/x.
- * We approximate pone by
- * 	qone(x) = s*(0.375 + (R/S))
- * where  R = qr1*s^2 + qr2*s^4 + ... + qr5*s^10
- * 	  S = 1 + qs1*s^2 + ... + qs6*s^12
- * and
- *	| qone(x)/s -0.375-R/S | <= 2  ** ( -61.13)
- */
-
-static const double qr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-   0.0,
-  -1.025390624999927207385863635575804210817e-0001,
-  -1.627175345445899724355852152103771510209e+0001,
-  -7.596017225139501519843072766973047217159e+0002,
-  -1.184980667024295901645301570813228628541e+0004,
-  -4.843851242857503225866761992518949647041e+0004,
-};
-static const double qs8[6] = {
-   1.613953697007229231029079421446916397904e+0002,
-   7.825385999233484705298782500926834217525e+0003,
-   1.338753362872495800748094112937868089032e+0005,
-   7.196577236832409151461363171617204036929e+0005,
-   6.666012326177764020898162762642290294625e+0005,
-  -2.944902643038346618211973470809456636830e+0005,
-};
-
-static const double qr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-  -2.089799311417640889742251585097264715678e-0011,
-  -1.025390502413754195402736294609692303708e-0001,
-  -8.056448281239359746193011295417408828404e+0000,
-  -1.836696074748883785606784430098756513222e+0002,
-  -1.373193760655081612991329358017247355921e+0003,
-  -2.612444404532156676659706427295870995743e+0003,
-};
-static const double qs5[6] = {
-   8.127655013843357670881559763225310973118e+0001,
-   1.991798734604859732508048816860471197220e+0003,
-   1.746848519249089131627491835267411777366e+0004,
-   4.985142709103522808438758919150738000353e+0004,
-   2.794807516389181249227113445299675335543e+0004,
-  -4.719183547951285076111596613593553911065e+0003,
-};
-
-static const double qr3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */
-  -5.078312264617665927595954813341838734288e-0009,
-  -1.025378298208370901410560259001035577681e-0001,
-  -4.610115811394734131557983832055607679242e+0000,
-  -5.784722165627836421815348508816936196402e+0001,
-  -2.282445407376317023842545937526967035712e+0002,
-  -2.192101284789093123936441805496580237676e+0002,
-};
-static const double qs3[6] = {
-   4.766515503237295155392317984171640809318e+0001,
-   6.738651126766996691330687210949984203167e+0002,
-   3.380152866795263466426219644231687474174e+0003,
-   5.547729097207227642358288160210745890345e+0003,
-   1.903119193388108072238947732674639066045e+0003,
-  -1.352011914443073322978097159157678748982e+0002,
-};
-
-static const double qr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-  -1.783817275109588656126772316921194887979e-0007,
-  -1.025170426079855506812435356168903694433e-0001,
-  -2.752205682781874520495702498875020485552e+0000,
-  -1.966361626437037351076756351268110418862e+0001,
-  -4.232531333728305108194363846333841480336e+0001,
-  -2.137192117037040574661406572497288723430e+0001,
-};
-static const double qs2[6] = {
-   2.953336290605238495019307530224241335502e+0001,
-   2.529815499821905343698811319455305266409e+0002,
-   7.575028348686454070022561120722815892346e+0002,
-   7.393932053204672479746835719678434981599e+0002,
-   1.559490033366661142496448853793707126179e+0002,
-  -4.959498988226281813825263003231704397158e+0000,
-};
-
-static double
-qone(double x)
-{
-	const double *p,*q;
-	double s,r,z;
-	if (x >= 8.0)			   {p = qr8; q= qs8;}
-	else if (x >= 4.54545211791992188) {p = qr5; q= qs5;}
-	else if (x >= 2.85714149475097656) {p = qr3; q= qs3;}
-	else /* if (x >= 2.0) */	   {p = qr2; q= qs2;}
-	z = one/(x*x);
-	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*(q[4]+z*q[5])))));
-	return (.375 + r/s)/x;
-}
diff --git a/lib/libm/noieee_src/n_jn.c b/lib/libm/noieee_src/n_jn.c
deleted file mode 100644
index ae202b33b..000000000
--- a/lib/libm/noieee_src/n_jn.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/*	$NetBSD: n_jn.c,v 1.7 2011/11/02 02:34:56 christos Exp $	*/
-/*-
- * 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.
- * 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)jn.c	8.2 (Berkeley) 11/30/93";
-#endif
-#endif /* not lint */
-
-/*
- * 16 December 1992
- * Minor modifications by Peter McIlroy to adapt non-IEEE architecture.
- */
-
-/*
- * ====================================================
- * Copyright (C) 1992 by Sun Microsystems, Inc.
- *
- * 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.
- * ====================================================
- *
- * ******************* WARNING ********************
- * This is an alpha version of SunPro's FDLIBM (Freely
- * Distributable Math Library) for IEEE double precision
- * arithmetic. FDLIBM is a basic math library written
- * in C that runs on machines that conform to IEEE
- * Standard 754/854. This alpha version is distributed
- * for testing purpose. Those who use this software
- * should report any bugs to
- *
- *		fdlibm-comments@sunpro.eng.sun.com
- *
- * -- K.C. Ng, Oct 12, 1992
- * ************************************************
- */
-
-/*
- * jn(int n, double x), yn(int n, double x)
- * floating point Bessel's function of the 1st and 2nd kind
- * of order n
- *
- * Special cases:
- *	y0(0)=y1(0)=yn(n,0) = -inf with division by zero signal;
- *	y0(-ve)=y1(-ve)=yn(n,-ve) are NaN with invalid signal.
- * Note 2. About jn(n,x), yn(n,x)
- *	For n=0, j0(x) is called,
- *	for n=1, j1(x) is called,
- *	for n<x, forward recursion us used starting
- *	from values of j0(x) and j1(x).
- *	for n>x, a continued fraction approximation to
- *	j(n,x)/j(n-1,x) is evaluated and then backward
- *	recursion is used starting from a supposed value
- *	for j(n,x). The resulting value of j(0,x) is
- *	compared with the actual value to correct the
- *	supposed value of j(n,x).
- *
- *	yn(n,x) is similar in all respects, except
- *	that forward recursion is used for all
- *	values of n>1.
- *
- */
-
-#include "mathimpl.h"
-#include <float.h>
-#include <errno.h>
-
-#if defined(__vax__) || defined(tahoe)
-#define _IEEE	0
-#else
-#define _IEEE	1
-#define infnan(x) (0.0)
-#endif
-
-static const double
-invsqrtpi= 5.641895835477562869480794515607725858441e-0001,
-two  = 2.0,
-zero = 0.0,
-one  = 1.0;
-
-double
-jn(int n, double x)
-{
-	int i, sgn;
-	double a, b, temp;
-	double z, w;
-
-    /* J(-n,x) = (-1)^n * J(n, x), J(n, -x) = (-1)^n * J(n, x)
-     * Thus, J(-n,x) = J(n,-x)
-     */
-    /* if J(n,NaN) is NaN */
-#if _IEEE
-	if (snan(x)) return x+x;
-#endif
-	if (n<0){
-		n = -n;
-		x = -x;
-	}
-	if (n==0) return(j0(x));
-	if (n==1) return(j1(x));
-	sgn = (n&1)&(x < zero);		/* even n -- 0, odd n -- sign(x) */
-	x = fabs(x);
-	if (x == 0 || !finite (x)) 	/* if x is 0 or inf */
-	    b = zero;
-	else if ((double) n <= x) {
-			/* Safe to use J(n+1,x)=2n/x *J(n,x)-J(n-1,x) */
-#if _IEEE
-	    if (x >= 8.148143905337944345e+090) {
-					/* x >= 2**302 */
-    /* (x >> n**2)
-     *	    Jn(x) = cos(x-(2n+1)*pi/4)*sqrt(2/x*pi)
-     *	    Yn(x) = sin(x-(2n+1)*pi/4)*sqrt(2/x*pi)
-     *	    Let s=sin(x), c=cos(x),
-     *		xn=x-(2n+1)*pi/4, sqt2 = sqrt(2),then
-     *
-     *		   n	sin(xn)*sqt2	cos(xn)*sqt2
-     *		----------------------------------
-     *		   0	 s-c		 c+s
-     *		   1	-s-c 		-c+s
-     *		   2	-s+c		-c-s
-     *		   3	 s+c		 c-s
-     */
-		switch(n&3) {
-		    case 0: temp =  cos(x)+sin(x); break;
-		    case 1: temp = -cos(x)+sin(x); break;
-		    case 2: temp = -cos(x)-sin(x); break;
-		    case 3: temp =  cos(x)-sin(x); break;
-		}
-		b = invsqrtpi*temp/sqrt(x);
-	    } else
-#endif
-	    {
-	        a = j0(x);
-	        b = j1(x);
-	        for(i=1;i<n;i++){
-		    temp = b;
-		    b = b*((double)(i+i)/x) - a; /* avoid underflow */
-		    a = temp;
-	        }
-	    }
-	} else {
-	    if (x < 1.86264514923095703125e-009) { /* x < 2**-29 */
-    /* x is tiny, return the first Taylor expansion of J(n,x)
-     * J(n,x) = 1/n!*(x/2)^n  - ...
-     */
-		if (n > 33)	/* underflow */
-		    b = zero;
-		else {
-		    temp = x*0.5; b = temp;
-		    for (a=one,i=2;i<=n;i++) {
-			a *= (double)i;		/* a = n! */
-			b *= temp;		/* b = (x/2)^n */
-		    }
-		    b = b/a;
-		}
-	    } else {
-		/* use backward recurrence */
-		/* 			x      x^2      x^2
-		 *  J(n,x)/J(n-1,x) =  ----   ------   ------   .....
-		 *			2n  - 2(n+1) - 2(n+2)
-		 *
-		 * 			1      1        1
-		 *  (for large x)   =  ----  ------   ------   .....
-		 *			2n   2(n+1)   2(n+2)
-		 *			-- - ------ - ------ -
-		 *			 x     x         x
-		 *
-		 * Let w = 2n/x and h=2/x, then the above quotient
-		 * is equal to the continued fraction:
-		 *		    1
-		 *	= -----------------------
-		 *		       1
-		 *	   w - -----------------
-		 *			  1
-		 * 	        w+h - ---------
-		 *		       w+2h - ...
-		 *
-		 * To determine how many terms needed, let
-		 * Q(0) = w, Q(1) = w(w+h) - 1,
-		 * Q(k) = (w+k*h)*Q(k-1) - Q(k-2),
-		 * When Q(k) > 1e4	good for single
-		 * When Q(k) > 1e9	good for double
-		 * When Q(k) > 1e17	good for quadruple
-		 */
-	    /* determine k */
-		double t,v;
-		double q0,q1,h,tmp; int k,m;
-		w  = (n+n)/(double)x; h = 2.0/(double)x;
-		q0 = w;  z = w+h; q1 = w*z - 1.0; k=1;
-		while (q1<1.0e9) {
-			k += 1; z += h;
-			tmp = z*q1 - q0;
-			q0 = q1;
-			q1 = tmp;
-		}
-		m = n+n;
-		for(t=zero, i = 2*(n+k); i>=m; i -= 2) t = one/(i/x-t);
-		a = t;
-		b = one;
-		/*  estimate log((2/x)^n*n!) = n*log(2/x)+n*ln(n)
-		 *  Hence, if n*(log(2n/x)) > ...
-		 *  single 8.8722839355e+01
-		 *  double 7.09782712893383973096e+02
-		 *  long double 1.1356523406294143949491931077970765006170e+04
-		 *  then recurrent value may overflow and the result will
-		 *  likely underflow to zero
-		 */
-		tmp = n;
-		v = two/x;
-		tmp = tmp*log(fabs(v*tmp));
-	    	for (i=n-1;i>0;i--){
-		        temp = b;
-		        b = ((i+i)/x)*b - a;
-		        a = temp;
-		    /* scale b to avoid spurious overflow */
-#			if defined(__vax__) || defined(tahoe)
-#				define BMAX 1e13
-#			else
-#				define BMAX 1e100
-#			endif /* defined(__vax__) || defined(tahoe) */
-			if (b > BMAX) {
-				a /= b;
-				t /= b;
-				b = one;
-			}
-		}
-	    	b = (t*j0(x)/b);
-	    }
-	}
-	return ((sgn == 1) ? -b : b);
-}
-
-double
-yn(int n, double x)
-{
-	int i, sign;
-	double a, b, temp;
-
-    /* Y(n,NaN), Y(n, x < 0) is NaN */
-	if (x <= 0 || (_IEEE && x != x))
-		if (_IEEE && x < 0) return zero/zero;
-		else if (x < 0)     return (infnan(EDOM));
-		else if (_IEEE)     return -one/zero;
-		else		    return(infnan(-ERANGE));
-	else if (!finite(x)) return(0);
-	sign = 1;
-	if (n<0){
-		n = -n;
-		sign = 1 - ((n&1)<<2);
-	}
-	if (n == 0) return(y0(x));
-	if (n == 1) return(sign*y1(x));
-#if _IEEE
-	if(x >= 8.148143905337944345e+090) { /* x > 2**302 */
-    /* (x >> n**2)
-     *	    Jn(x) = cos(x-(2n+1)*pi/4)*sqrt(2/x*pi)
-     *	    Yn(x) = sin(x-(2n+1)*pi/4)*sqrt(2/x*pi)
-     *	    Let s=sin(x), c=cos(x),
-     *		xn=x-(2n+1)*pi/4, sqt2 = sqrt(2),then
-     *
-     *		   n	sin(xn)*sqt2	cos(xn)*sqt2
-     *		----------------------------------
-     *		   0	 s-c		 c+s
-     *		   1	-s-c 		-c+s
-     *		   2	-s+c		-c-s
-     *		   3	 s+c		 c-s
-     */
-		switch (n&3) {
-		    case 0: temp =  sin(x)-cos(x); break;
-		    case 1: temp = -sin(x)-cos(x); break;
-		    case 2: temp = -sin(x)+cos(x); break;
-		    case 3: temp =  sin(x)+cos(x); break;
-		}
-		b = invsqrtpi*temp/sqrt(x);
-	} else
-#endif
-	{
-	    a = y0(x);
-	    b = y1(x);
-	/* quit if b is -inf */
-	    for (i = 1; i < n && !finite(b); i++){
-		temp = b;
-		b = ((double)(i+i)/x)*b - a;
-		a = temp;
-	    }
-	}
-	if (!_IEEE && !finite(b))
-		return (infnan(-sign * ERANGE));
-	return ((sign > 0) ? b : -b);
-}
diff --git a/lib/libm/noieee_src/n_lgamma.c b/lib/libm/noieee_src/n_lgamma.c
deleted file mode 100644
index b5740c43a..000000000
--- a/lib/libm/noieee_src/n_lgamma.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/*      $NetBSD: n_lgamma.c,v 1.6 2006/11/24 21:15:54 wiz Exp $ */
-/*-
- * 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.
- * 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lgamma.c	8.2 (Berkeley) 11/30/93";
-#endif
-#endif /* not lint */
-
-/*
- * Coded by Peter McIlroy, Nov 1992;
- *
- * The financial support of UUNET Communications Services is gratefully
- * acknowledged.
- */
-
-#include <math.h>
-#include <errno.h>
-
-#include "mathimpl.h"
-
-/* Log gamma function.
- * Error:  x > 0 error < 1.3ulp.
- *	   x > 4, error < 1ulp.
- *	   x > 9, error < .6ulp.
- * 	   x < 0, all bets are off. (When G(x) ~ 1, log(G(x)) ~ 0)
- * Method:
- *	x > 6:
- *		Use the asymptotic expansion (Stirling's Formula)
- *	0 < x < 6:
- *		Use gamma(x+1) = x*gamma(x) for argument reduction.
- *		Use rational approximation in
- *		the range 1.2, 2.5
- *		Two approximations are used, one centered at the
- *		minimum to ensure monotonicity; one centered at 2
- *		to maintain small relative error.
- *	x < 0:
- *		Use the reflection formula,
- *		G(1-x)G(x) = PI/sin(PI*x)
- * Special values:
- *	non-positive integer	returns +Inf.
- *	NaN			returns NaN
-*/
-#if defined(__vax__) || defined(tahoe)
-#define _IEEE		0
-/* double and float have same size exponent field */
-#define TRUNC(x)	x = (double) (float) (x)
-#else
-static int endian;
-#define _IEEE		1
-#define TRUNC(x)	*(((int *) &x) + endian) &= 0xf8000000
-#define infnan(x)	0.0
-#endif
-
-static double small_lgam(double);
-static double large_lgam(double);
-static double neg_lgam(double);
-static const double one = 1.0;
-int signgam;
-
-#define UNDERFL (1e-1020 * 1e-1020)
-
-#define LEFT	(1.0 - (x0 + .25))
-#define RIGHT	(x0 - .218)
-/*
- * Constants for approximation in [1.244,1.712]
-*/
-#define x0	0.461632144968362356785
-#define x0_lo	-.000000000000000015522348162858676890521
-#define a0_hi	-0.12148629128932952880859
-#define a0_lo	.0000000007534799204229502
-#define r0	-2.771227512955130520e-002
-#define r1	-2.980729795228150847e-001
-#define r2	-3.257411333183093394e-001
-#define r3	-1.126814387531706041e-001
-#define r4	-1.129130057170225562e-002
-#define r5	-2.259650588213369095e-005
-#define s0	 1.714457160001714442e+000
-#define s1	 2.786469504618194648e+000
-#define s2	 1.564546365519179805e+000
-#define s3	 3.485846389981109850e-001
-#define s4	 2.467759345363656348e-002
-/*
- * Constants for approximation in [1.71, 2.5]
-*/
-#define a1_hi	4.227843350984671344505727574870e-01
-#define a1_lo	4.670126436531227189e-18
-#define p0	3.224670334241133695662995251041e-01
-#define p1	3.569659696950364669021382724168e-01
-#define p2	1.342918716072560025853732668111e-01
-#define p3	1.950702176409779831089963408886e-02
-#define p4	8.546740251667538090796227834289e-04
-#define q0	1.000000000000000444089209850062e+00
-#define q1	1.315850076960161985084596381057e+00
-#define q2	6.274644311862156431658377186977e-01
-#define q3	1.304706631926259297049597307705e-01
-#define q4	1.102815279606722369265536798366e-02
-#define q5	2.512690594856678929537585620579e-04
-#define q6	-1.003597548112371003358107325598e-06
-/*
- * Stirling's Formula, adjusted for equal-ripple. x in [6,Inf].
-*/
-#define lns2pi	.418938533204672741780329736405
-#define pb0	 8.33333333333333148296162562474e-02
-#define pb1	-2.77777777774548123579378966497e-03
-#define pb2	 7.93650778754435631476282786423e-04
-#define pb3	-5.95235082566672847950717262222e-04
-#define pb4	 8.41428560346653702135821806252e-04
-#define pb5	-1.89773526463879200348872089421e-03
-#define pb6	 5.69394463439411649408050664078e-03
-#define pb7	-1.44705562421428915453880392761e-02
-
-__pure double
-lgamma(double x)
-{
-	double r;
-
-	signgam = 1;
-#if _IEEE
-	endian = ((*(int *) &one)) ? 1 : 0;
-#endif
-
-	if (!finite(x)) {
-		if (_IEEE)
-			return (x+x);
-		else return (infnan(EDOM));
-	}
-
-	if (x > 6 + RIGHT) {
-		r = large_lgam(x);
-		return (r);
-	} else if (x > 1e-16)
-		return (small_lgam(x));
-	else if (x > -1e-16) {
-		if (x < 0)
-			signgam = -1, x = -x;
-		return (-log(x));
-	} else
-		return (neg_lgam(x));
-}
-
-static double
-large_lgam(double x)
-{
-	double z, p, x1;
-	struct Double t, u, v;
-	u = __log__D(x);
-	u.a -= 1.0;
-	if (x > 1e15) {
-		v.a = x - 0.5;
-		TRUNC(v.a);
-		v.b = (x - v.a) - 0.5;
-		t.a = u.a*v.a;
-		t.b = x*u.b + v.b*u.a;
-		if (_IEEE == 0 && !finite(t.a))
-			return(infnan(ERANGE));
-		return(t.a + t.b);
-	}
-	x1 = 1./x;
-	z = x1*x1;
-	p = pb0+z*(pb1+z*(pb2+z*(pb3+z*(pb4+z*(pb5+z*(pb6+z*pb7))))));
-					/* error in approximation = 2.8e-19 */
-
-	p = p*x1;			/* error < 2.3e-18 absolute */
-					/* 0 < p < 1/64 (at x = 5.5) */
-	v.a = x = x - 0.5;
-	TRUNC(v.a);			/* truncate v.a to 26 bits. */
-	v.b = x - v.a;
-	t.a = v.a*u.a;			/* t = (x-.5)*(log(x)-1) */
-	t.b = v.b*u.a + x*u.b;
-	t.b += p; t.b += lns2pi;	/* return t + lns2pi + p */
-	return (t.a + t.b);
-}
-
-static double
-small_lgam(double x)
-{
-	int x_int;
-	double y, z, t, r = 0, p, q, hi, lo;
-	struct Double rr;
-	x_int = (x + .5);
-	y = x - x_int;
-	if (x_int <= 2 && y > RIGHT) {
-		t = y - x0;
-		y--; x_int++;
-		goto CONTINUE;
-	} else if (y < -LEFT) {
-		t = y +(1.0-x0);
-CONTINUE:
-		z = t - x0_lo;
-		p = r0+z*(r1+z*(r2+z*(r3+z*(r4+z*r5))));
-		q = s0+z*(s1+z*(s2+z*(s3+z*s4)));
-		r = t*(z*(p/q) - x0_lo);
-		t = .5*t*t;
-		z = 1.0;
-		switch (x_int) {
-		case 6:	z  = (y + 5);
-		case 5:	z *= (y + 4);
-		case 4:	z *= (y + 3);
-		case 3:	z *= (y + 2);
-			rr = __log__D(z);
-			rr.b += a0_lo; rr.a += a0_hi;
-			return(((r+rr.b)+t+rr.a));
-		case 2: return(((r+a0_lo)+t)+a0_hi);
-		case 0: r -= log1p(x);
-		default: rr = __log__D(x);
-			rr.a -= a0_hi; rr.b -= a0_lo;
-			return(((r - rr.b) + t) - rr.a);
-		}
-	} else {
-		p = p0+y*(p1+y*(p2+y*(p3+y*p4)));
-		q = q0+y*(q1+y*(q2+y*(q3+y*(q4+y*(q5+y*q6)))));
-		p = p*(y/q);
-		t = (double)(float) y;
-		z = y-t;
-		hi = (double)(float) (p+a1_hi);
-		lo = a1_hi - hi; lo += p; lo += a1_lo;
-		r = lo*y + z*hi;	/* q + r = y*(a0+p/q) */
-		q = hi*t;
-		z = 1.0;
-		switch (x_int) {
-		case 6:	z  = (y + 5);
-		case 5:	z *= (y + 4);
-		case 4:	z *= (y + 3);
-		case 3:	z *= (y + 2);
-			rr = __log__D(z);
-			r += rr.b; r += q;
-			return(rr.a + r);
-		case 2:	return (q+ r);
-		case 0: rr = __log__D(x);
-			r -= rr.b; r -= log1p(x);
-			r += q; r-= rr.a;
-			return(r);
-		default: rr = __log__D(x);
-			r -= rr.b;
-			q -= rr.a;
-			return (r+q);
-		}
-	}
-}
-
-static double
-neg_lgam(double x)
-{
-	int xi;
-	double y, z, zero = 0.0;
-
-	/* avoid destructive cancellation as much as possible */
-	if (x > -170) {
-		xi = x;
-		if (xi == x) {
-			if (_IEEE)
-				return(one/zero);
-			else
-				return(infnan(ERANGE));
-		}
-		y = gamma(x);
-		if (y < 0)
-			y = -y, signgam = -1;
-		return (log(y));
-	}
-	z = floor(x + .5);
-	if (z == x) {		/* convention: G(-(integer)) -> +Inf */
-		if (_IEEE)
-			return (one/zero);
-		else
-			return (infnan(ERANGE));
-	}
-	y = .5*ceil(x);
-	if (y == ceil(y))
-		signgam = -1;
-	x = -x;
-	z = fabs(x + z);	/* 0 < z <= .5 */
-	if (z < .25)
-		z = sin(M_PI*z);
-	else
-		z = cos(M_PI*(0.5-z));
-	z = log(M_PI/(z*x));
-	y = large_lgam(x);
-	return (z - y);
-}
diff --git a/lib/libm/noieee_src/n_log.c b/lib/libm/noieee_src/n_log.c
deleted file mode 100644
index e5ed63ede..000000000
--- a/lib/libm/noieee_src/n_log.c
+++ /dev/null
@@ -1,492 +0,0 @@
-/*      $NetBSD: n_log.c,v 1.8 2014/10/10 20:58:09 martin Exp $ */
-/*
- * 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.
- * 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)log.c	8.2 (Berkeley) 11/30/93";
-#endif
-#endif /* not lint */
-
-#include "../src/namespace.h"
-
-#include <math.h>
-#include <errno.h>
-
-#include "mathimpl.h"
-
-#ifdef __weak_alias
-__weak_alias(log, _log);
-__weak_alias(_logl, _log);
-__weak_alias(logf, _logf);
-#endif
-
-/* Table-driven natural logarithm.
- *
- * This code was derived, with minor modifications, from:
- *	Peter Tang, "Table-Driven Implementation of the
- *	Logarithm in IEEE Floating-Point arithmetic." ACM Trans.
- *	Math Software, vol 16. no 4, pp 378-400, Dec 1990).
- *
- * Calculates log(2^m*F*(1+f/F)), |f/j| <= 1/256,
- * where F = j/128 for j an integer in [0, 128].
- *
- * log(2^m) = log2_hi*m + log2_tail*m
- * since m is an integer, the dominant term is exact.
- * m has at most 10 digits (for subnormal numbers),
- * and log2_hi has 11 trailing zero bits.
- *
- * log(F) = logF_hi[j] + logF_lo[j] is in tabular form in log_table.h
- * logF_hi[] + 512 is exact.
- *
- * log(1+f/F) = 2*f/(2*F + f) + 1/12 * (2*f/(2*F + f))**3 + ...
- * the leading term is calculated to extra precision in two
- * parts, the larger of which adds exactly to the dominant
- * m and F terms.
- * There are two cases:
- *	1. when m, j are non-zero (m | j), use absolute
- *	   precision for the leading term.
- *	2. when m = j = 0, |1-x| < 1/256, and log(x) ~= (x-1).
- *	   In this case, use a relative precision of 24 bits.
- * (This is done differently in the original paper)
- *
- * Special cases:
- *	0	return signalling -Inf
- *	neg	return signalling NaN
- *	+Inf	return +Inf
-*/
-
-#if defined(__vax__) || defined(tahoe)
-#define _IEEE		0
-#define TRUNC(x)	x = (double) (float) (x)
-#else
-#define _IEEE		1
-#define endian		(((*(int *) &one)) ? 1 : 0)
-#define TRUNC(x)	*(((int *) &x) + endian) &= 0xf8000000
-#define infnan(x)	0.0
-#endif
-
-#define N 128
-
-/* Table of log(Fj) = logF_head[j] + logF_tail[j], for Fj = 1+j/128.
- * Used for generation of extend precision logarithms.
- * The constant 35184372088832 is 2^45, so the divide is exact.
- * It ensures correct reading of logF_head, even for inaccurate
- * decimal-to-binary conversion routines.  (Everybody gets the
- * right answer for integers less than 2^53.)
- * Values for log(F) were generated using error < 10^-57 absolute
- * with the bc -l package.
-*/
-static const double	A1 = 	  .08333333333333178827;
-static const double	A2 = 	  .01250000000377174923;
-static const double	A3 =	 .002232139987919447809;
-static const double	A4 =	.0004348877777076145742;
-
-static const double logF_head[N+1] = {
-	0.,
-	.007782140442060381246,
-	.015504186535963526694,
-	.023167059281547608406,
-	.030771658666765233647,
-	.038318864302141264488,
-	.045809536031242714670,
-	.053244514518837604555,
-	.060624621816486978786,
-	.067950661908525944454,
-	.075223421237524235039,
-	.082443669210988446138,
-	.089612158689760690322,
-	.096729626458454731618,
-	.103796793681567578460,
-	.110814366340264314203,
-	.117783035656430001836,
-	.124703478501032805070,
-	.131576357788617315236,
-	.138402322859292326029,
-	.145182009844575077295,
-	.151916042025732167530,
-	.158605030176659056451,
-	.165249572895390883786,
-	.171850256926518341060,
-	.178407657472689606947,
-	.184922338493834104156,
-	.191394852999565046047,
-	.197825743329758552135,
-	.204215541428766300668,
-	.210564769107350002741,
-	.216873938300523150246,
-	.223143551314024080056,
-	.229374101064877322642,
-	.235566071312860003672,
-	.241719936886966024758,
-	.247836163904594286577,
-	.253915209980732470285,
-	.259957524436686071567,
-	.265963548496984003577,
-	.271933715484010463114,
-	.277868451003087102435,
-	.283768173130738432519,
-	.289633292582948342896,
-	.295464212893421063199,
-	.301261330578199704177,
-	.307025035294827830512,
-	.312755710004239517729,
-	.318453731118097493890,
-	.324119468654316733591,
-	.329753286372579168528,
-	.335355541920762334484,
-	.340926586970454081892,
-	.346466767346100823488,
-	.351976423156884266063,
-	.357455888922231679316,
-	.362905493689140712376,
-	.368325561158599157352,
-	.373716409793814818840,
-	.379078352934811846353,
-	.384411698910298582632,
-	.389716751140440464951,
-	.394993808240542421117,
-	.400243164127459749579,
-	.405465108107819105498,
-	.410659924985338875558,
-	.415827895143593195825,
-	.420969294644237379543,
-	.426084395310681429691,
-	.431173464818130014464,
-	.436236766774527495726,
-	.441274560805140936281,
-	.446287102628048160113,
-	.451274644139630254358,
-	.456237433481874177232,
-	.461175715122408291790,
-	.466089729924533457960,
-	.470979715219073113985,
-	.475845904869856894947,
-	.480688529345570714212,
-	.485507815781602403149,
-	.490303988045525329653,
-	.495077266798034543171,
-	.499827869556611403822,
-	.504556010751912253908,
-	.509261901790523552335,
-	.513945751101346104405,
-	.518607764208354637958,
-	.523248143765158602036,
-	.527867089620485785417,
-	.532464798869114019908,
-	.537041465897345915436,
-	.541597282432121573947,
-	.546132437597407260909,
-	.550647117952394182793,
-	.555141507540611200965,
-	.559615787935399566777,
-	.564070138285387656651,
-	.568504735352689749561,
-	.572919753562018740922,
-	.577315365035246941260,
-	.581691739635061821900,
-	.586049045003164792433,
-	.590387446602107957005,
-	.594707107746216934174,
-	.599008189645246602594,
-	.603290851438941899687,
-	.607555250224322662688,
-	.611801541106615331955,
-	.616029877215623855590,
-	.620240409751204424537,
-	.624433288012369303032,
-	.628608659422752680256,
-	.632766669570628437213,
-	.636907462236194987781,
-	.641031179420679109171,
-	.645137961373620782978,
-	.649227946625615004450,
-	.653301272011958644725,
-	.657358072709030238911,
-	.661398482245203922502,
-	.665422632544505177065,
-	.669430653942981734871,
-	.673422675212350441142,
-	.677398823590920073911,
-	.681359224807238206267,
-	.685304003098281100392,
-	.689233281238557538017,
-	.693147180560117703862
-};
-
-static const double logF_tail[N+1] = {
-	0.,
-	-.00000000000000543229938420049,
-	 .00000000000000172745674997061,
-	-.00000000000001323017818229233,
-	-.00000000000001154527628289872,
-	-.00000000000000466529469958300,
-	 .00000000000005148849572685810,
-	-.00000000000002532168943117445,
-	-.00000000000005213620639136504,
-	-.00000000000001819506003016881,
-	 .00000000000006329065958724544,
-	 .00000000000008614512936087814,
-	-.00000000000007355770219435028,
-	 .00000000000009638067658552277,
-	 .00000000000007598636597194141,
-	 .00000000000002579999128306990,
-	-.00000000000004654729747598444,
-	-.00000000000007556920687451336,
-	 .00000000000010195735223708472,
-	-.00000000000017319034406422306,
-	-.00000000000007718001336828098,
-	 .00000000000010980754099855238,
-	-.00000000000002047235780046195,
-	-.00000000000008372091099235912,
-	 .00000000000014088127937111135,
-	 .00000000000012869017157588257,
-	 .00000000000017788850778198106,
-	 .00000000000006440856150696891,
-	 .00000000000016132822667240822,
-	-.00000000000007540916511956188,
-	-.00000000000000036507188831790,
-	 .00000000000009120937249914984,
-	 .00000000000018567570959796010,
-	-.00000000000003149265065191483,
-	-.00000000000009309459495196889,
-	 .00000000000017914338601329117,
-	-.00000000000001302979717330866,
-	 .00000000000023097385217586939,
-	 .00000000000023999540484211737,
-	 .00000000000015393776174455408,
-	-.00000000000036870428315837678,
-	 .00000000000036920375082080089,
-	-.00000000000009383417223663699,
-	 .00000000000009433398189512690,
-	 .00000000000041481318704258568,
-	-.00000000000003792316480209314,
-	 .00000000000008403156304792424,
-	-.00000000000034262934348285429,
-	 .00000000000043712191957429145,
-	-.00000000000010475750058776541,
-	-.00000000000011118671389559323,
-	 .00000000000037549577257259853,
-	 .00000000000013912841212197565,
-	 .00000000000010775743037572640,
-	 .00000000000029391859187648000,
-	-.00000000000042790509060060774,
-	 .00000000000022774076114039555,
-	 .00000000000010849569622967912,
-	-.00000000000023073801945705758,
-	 .00000000000015761203773969435,
-	 .00000000000003345710269544082,
-	-.00000000000041525158063436123,
-	 .00000000000032655698896907146,
-	-.00000000000044704265010452446,
-	 .00000000000034527647952039772,
-	-.00000000000007048962392109746,
-	 .00000000000011776978751369214,
-	-.00000000000010774341461609578,
-	 .00000000000021863343293215910,
-	 .00000000000024132639491333131,
-	 .00000000000039057462209830700,
-	-.00000000000026570679203560751,
-	 .00000000000037135141919592021,
-	-.00000000000017166921336082431,
-	-.00000000000028658285157914353,
-	-.00000000000023812542263446809,
-	 .00000000000006576659768580062,
-	-.00000000000028210143846181267,
-	 .00000000000010701931762114254,
-	 .00000000000018119346366441110,
-	 .00000000000009840465278232627,
-	-.00000000000033149150282752542,
-	-.00000000000018302857356041668,
-	-.00000000000016207400156744949,
-	 .00000000000048303314949553201,
-	-.00000000000071560553172382115,
-	 .00000000000088821239518571855,
-	-.00000000000030900580513238244,
-	-.00000000000061076551972851496,
-	 .00000000000035659969663347830,
-	 .00000000000035782396591276383,
-	-.00000000000046226087001544578,
-	 .00000000000062279762917225156,
-	 .00000000000072838947272065741,
-	 .00000000000026809646615211673,
-	-.00000000000010960825046059278,
-	 .00000000000002311949383800537,
-	-.00000000000058469058005299247,
-	-.00000000000002103748251144494,
-	-.00000000000023323182945587408,
-	-.00000000000042333694288141916,
-	-.00000000000043933937969737844,
-	 .00000000000041341647073835565,
-	 .00000000000006841763641591466,
-	 .00000000000047585534004430641,
-	 .00000000000083679678674757695,
-	-.00000000000085763734646658640,
-	 .00000000000021913281229340092,
-	-.00000000000062242842536431148,
-	-.00000000000010983594325438430,
-	 .00000000000065310431377633651,
-	-.00000000000047580199021710769,
-	-.00000000000037854251265457040,
-	 .00000000000040939233218678664,
-	 .00000000000087424383914858291,
-	 .00000000000025218188456842882,
-	-.00000000000003608131360422557,
-	-.00000000000050518555924280902,
-	 .00000000000078699403323355317,
-	-.00000000000067020876961949060,
-	 .00000000000016108575753932458,
-	 .00000000000058527188436251509,
-	-.00000000000035246757297904791,
-	-.00000000000018372084495629058,
-	 .00000000000088606689813494916,
-	 .00000000000066486268071468700,
-	 .00000000000063831615170646519,
-	 .00000000000025144230728376072,
-	-.00000000000017239444525614834
-};
-
-double
-log(double x)
-{
-	int m, j;
-	double F, f, g, q, u, u2, v, zero = 0.0, one = 1.0;
-	volatile double u1;
-
-	/* Catch special cases */
-	if (x <= 0) {
-		if (_IEEE && x == zero)	/* log(0) = -Inf */
-			return (-one/zero);
-		else if (_IEEE)		/* log(neg) = NaN */
-			return (zero/zero);
-		else if (x == zero)	/* NOT REACHED IF _IEEE */
-			return (infnan(-ERANGE));
-		else
-			return (infnan(EDOM));
-	} else if (!finite(x)) {
-		if (_IEEE)		/* x = NaN, Inf */
-			return (x+x);
-		else
-			return (infnan(ERANGE));
-	}
-
-	/* Argument reduction: 1 <= g < 2; x/2^m = g;	*/
-	/* y = F*(1 + f/F) for |f| <= 2^-8		*/
-
-	m = logb(x);
-	g = ldexp(x, -m);
-	if (_IEEE && m == -1022) {
-		j = logb(g), m += j;
-		g = ldexp(g, -j);
-	}
-	j = N*(g-1) + .5;
-	F = (1.0/N) * j + 1;	/* F*128 is an integer in [128, 512] */
-	f = g - F;
-
-	/* Approximate expansion for log(1+f/F) ~= u + q */
-	g = 1/(2*F+f);
-	u = 2*f*g;
-	v = u*u;
-	q = u*v*(A1 + v*(A2 + v*(A3 + v*A4)));
-
-    /* case 1: u1 = u rounded to 2^-43 absolute.  Since u < 2^-8,
-     * 	       u1 has at most 35 bits, and F*u1 is exact, as F has < 8 bits.
-     *         It also adds exactly to |m*log2_hi + log_F_head[j] | < 750
-    */
-	if (m | j)
-		u1 = u + 513, u1 -= 513;
-
-    /* case 2:	|1-x| < 1/256. The m- and j- dependent terms are zero;
-     * 		u1 = u to 24 bits.
-    */
-	else
-		u1 = u, TRUNC(u1);
-	u2 = (2.0*(f - F*u1) - u1*f) * g;
-			/* u1 + u2 = 2f/(2F+f) to extra precision.	*/
-
-	/* log(x) = log(2^m*F*(1+f/F)) =				*/
-	/* (m*log2_hi+logF_head[j]+u1) + (m*log2_lo+logF_tail[j]+q);	*/
-	/* (exact) + (tiny)						*/
-
-	u1 += m*logF_head[N] + logF_head[j];		/* exact */
-	u2 = (u2 + logF_tail[j]) + q;			/* tiny */
-	u2 += logF_tail[N]*m;
-	return (u1 + u2);
-}
-
-/*
- * Extra precision variant, returning struct {double a, b;};
- * log(x) = a+b to 63 bits, with a is rounded to 26 bits.
- */
-struct Double
-__log__D(double x)
-{
-	int m, j;
-	double F, f, g, q, u, v, u2;
-	volatile double u1;
-	struct Double r;
-
-	/* Argument reduction: 1 <= g < 2; x/2^m = g;	*/
-	/* y = F*(1 + f/F) for |f| <= 2^-8		*/
-
-	m = logb(x);
-	g = ldexp(x, -m);
-	if (_IEEE && m == -1022) {
-		j = logb(g), m += j;
-		g = ldexp(g, -j);
-	}
-	j = N*(g-1) + .5;
-	F = (1.0/N) * j + 1;
-	f = g - F;
-
-	g = 1/(2*F+f);
-	u = 2*f*g;
-	v = u*u;
-	q = u*v*(A1 + v*(A2 + v*(A3 + v*A4)));
-	if (m | j)
-		u1 = u + 513, u1 -= 513;
-	else
-		u1 = u, TRUNC(u1);
-	u2 = (2.0*(f - F*u1) - u1*f) * g;
-
-	u1 += m*logF_head[N] + logF_head[j];
-
-	u2 +=  logF_tail[j]; u2 += q;
-	u2 += logF_tail[N]*m;
-	r.a = u1 + u2;			/* Only difference is here */
-	TRUNC(r.a);
-	r.b = (u1 - r.a) + u2;
-	return (r);
-}
-
-float
-logf(float x)
-{
-	return(log((double)x));
-}
diff --git a/lib/libm/noieee_src/n_log10.c b/lib/libm/noieee_src/n_log10.c
deleted file mode 100644
index 4b3987e0c..000000000
--- a/lib/libm/noieee_src/n_log10.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*      $NetBSD: n_log10.c,v 1.7 2014/03/06 10:57:44 martin Exp $ */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)log10.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* LOG10(X)
- * RETURN THE BASE 10 LOGARITHM OF x
- * DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
- * CODED IN C BY K.C. NG, 1/20/85;
- * REVISED BY K.C. NG on 1/23/85, 3/7/85, 4/16/85.
- *
- * Required kernel function:
- *	log(x)
- *
- * Method :
- *			     log(x)
- *		log10(x) = ---------  or  [1/log(10)]*log(x)
- *			    log(10)
- *
- *    Note:
- *	  [log(10)]   rounded to 56 bits has error  .0895  ulps,
- *	  [1/log(10)] rounded to 53 bits has error  .198   ulps;
- *	  therefore, for better accuracy, in VAX D format, we divide
- *	  log(x) by log(10), but in IEEE Double format, we multiply
- *	  log(x) by [1/log(10)].
- *
- * Special cases:
- *	log10(x) is NaN with signal if x < 0;
- *	log10(+INF) is +INF with no signal; log10(0) is -INF with signal;
- *	log10(NaN) is that NaN with no signal.
- *
- * Accuracy:
- *	log10(X) returns the exact log10(x) nearly rounded. In a test run
- *	with 1,536,000 random arguments on a VAX, the maximum observed
- *	error was 1.74 ulps (units in the last place).
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-
-#define _LIBM_STATIC
-#include "mathimpl.h"
-
-vc(ln10hi, 2.3025850929940456790E0 ,5d8d,4113,a8ac,ddaa, 2, .935D8DDDAAA8AC)
-
-ic(ivln10, 4.3429448190325181667E-1, -2, 1.BCB7B1526E50E)
-
-#ifdef vccast
-#define	ln10hi	vccast(ln10hi)
-#endif
-
-
-double
-log10(double x)
-{
-#if defined(__vax__)||defined(tahoe)
-	return(log(x)/ln10hi);
-#else	/* defined(__vax__)||defined(tahoe) */
-	return(ivln10*log(x));
-#endif	/* defined(__vax__)||defined(tahoe) */
-}
-
-float
-log10f(float x)
-{
-#if defined(__vax__)||defined(tahoe)
-	return(logf(x)/ln10hi);
-#else	/* defined(__vax__)||defined(tahoe) */
-	return(ivln10*log(x));
-#endif	/* defined(__vax__)||defined(tahoe) */
-}
diff --git a/lib/libm/noieee_src/n_log1p.c b/lib/libm/noieee_src/n_log1p.c
deleted file mode 100644
index 64a7773de..000000000
--- a/lib/libm/noieee_src/n_log1p.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*      $NetBSD: n_log1p.c,v 1.8 2014/03/06 10:58:26 martin Exp $ */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)log1p.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* LOG1P(x)
- * RETURN THE LOGARITHM OF 1+x
- * DOUBLE PRECISION (VAX D FORMAT 56 bits, IEEE DOUBLE 53 BITS)
- * CODED IN C BY K.C. NG, 1/19/85;
- * REVISED BY K.C. NG on 2/6/85, 3/7/85, 3/24/85, 4/16/85.
- *
- * Required system supported functions:
- *	scalb(x,n)
- *	copysign(x,y)
- *	logb(x)
- *	finite(x)
- *
- * Required kernel function:
- *	log__L(z)
- *
- * Method :
- *	1. Argument Reduction: find k and f such that
- *			1+x  = 2^k * (1+f),
- *	   where  sqrt(2)/2 < 1+f < sqrt(2) .
- *
- *	2. Let s = f/(2+f) ; based on log(1+f) = log(1+s) - log(1-s)
- *		 = 2s + 2/3 s**3 + 2/5 s**5 + .....,
- *	   log(1+f) is computed by
- *
- *	     		log(1+f) = 2s + s*log__L(s*s)
- *	   where
- *		log__L(z) = z*(L1 + z*(L2 + z*(... (L6 + z*L7)...)))
- *
- *	   See log__L() for the values of the coefficients.
- *
- *	3. Finally,  log(1+x) = k*ln2 + log(1+f).
- *
- *	Remarks 1. In step 3 n*ln2 will be stored in two floating point numbers
- *		   n*ln2hi + n*ln2lo, where ln2hi is chosen such that the last
- *		   20 bits (for VAX D format), or the last 21 bits ( for IEEE
- *		   double) is 0. This ensures n*ln2hi is exactly representable.
- *		2. In step 1, f may not be representable. A correction term c
- *	 	   for f is computed. It follows that the correction term for
- *		   f - t (the leading term of log(1+f) in step 2) is c-c*x. We
- *		   add this correction term to n*ln2lo to attenuate the error.
- *
- *
- * Special cases:
- *	log1p(x) is NaN with signal if x < -1; log1p(NaN) is NaN with no signal;
- *	log1p(INF) is +INF; log1p(-1) is -INF with signal;
- *	only log1p(0)=0 is exact for finite argument.
- *
- * Accuracy:
- *	log1p(x) returns the exact log(1+x) nearly rounded. In a test run
- *	with 1,536,000 random arguments on a VAX, the maximum observed
- *	error was .846 ulps (units in the last place).
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-
-#include <errno.h>
-#define _LIBM_STATIC
-#include "mathimpl.h"
-
-vc(ln2hi, 6.9314718055829871446E-1  ,7217,4031,0000,f7d0,   0, .B17217F7D00000)
-vc(ln2lo, 1.6465949582897081279E-12 ,bcd5,2ce7,d9cc,e4f1, -39, .E7BCD5E4F1D9CC)
-vc(sqrt2, 1.4142135623730950622E0   ,04f3,40b5,de65,33f9,   1, .B504F333F9DE65)
-
-ic(ln2hi, 6.9314718036912381649E-1,   -1, 1.62E42FEE00000)
-ic(ln2lo, 1.9082149292705877000E-10, -33, 1.A39EF35793C76)
-ic(sqrt2, 1.4142135623730951455E0,     0, 1.6A09E667F3BCD)
-
-#ifdef vccast
-#define	ln2hi	vccast(ln2hi)
-#define	ln2lo	vccast(ln2lo)
-#define	sqrt2	vccast(sqrt2)
-#endif
-
-double
-log1p(double x)
-{
-	static const double zero=0.0, negone= -1.0, one=1.0,
-		      half=1.0/2.0, small=1.0E-20;   /* 1+small == 1 */
-	double z,s,t,c;
-	int k;
-
-#if !defined(__vax__)&&!defined(tahoe)
-	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-
-	if(finite(x)) {
-	   if( x > negone ) {
-
-	   /* argument reduction */
-	      if(copysign(x,one)<small) return(x);
-	      k=logb(one+x); z=scalb(x,-k); t=scalb(one,-k);
-	      if(z+t >= sqrt2 )
-		  { k += 1 ; z *= half; t *= half; }
-	      t += negone; x = z + t;
-	      c = (t-x)+z ;		/* correction term for x */
-
- 	   /* compute log(1+x)  */
-              s = x/(2+x); t = x*x*half;
-	      c += (k*ln2lo-c*x);
-	      z = c+s*(t+__log__L(s*s));
-	      x += (z - t) ;
-
-	      return(k*ln2hi+x);
-	   }
-	/* end of if (x > negone) */
-
-	    else {
-#if defined(__vax__)||defined(tahoe)
-		if ( x == negone )
-		    return (infnan(-ERANGE));	/* -INF */
-		else
-		    return (infnan(EDOM));	/* NaN */
-#else	/* defined(__vax__)||defined(tahoe) */
-		/* x = -1, return -INF with signal */
-		if ( x == negone ) return( negone/zero );
-
-		/* negative argument for log, return NaN with signal */
-	        else return ( zero / zero );
-#endif	/* defined(__vax__)||defined(tahoe) */
-	    }
-	}
-    /* end of if (finite(x)) */
-
-    /* log(-INF) is NaN */
-	else if(x<0)
-	     return(zero/zero);
-
-    /* log(+INF) is INF */
-	else return(x);
-}
-
-float
-log1pf(float x)
-{
-	return log1p(x);
-}
diff --git a/lib/libm/noieee_src/n_log2.c b/lib/libm/noieee_src/n_log2.c
deleted file mode 100644
index 73e3539fd..000000000
--- a/lib/libm/noieee_src/n_log2.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*      $NetBSD: n_log2.c,v 1.1 2014/03/06 10:57:01 martin Exp $ */
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Martin Husemann <martin@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* LOG2(X)
- * RETURN THE BASE 10 LOGARITHM OF x
- *
- * Required kernel function:
- *	log(x)
- *
- * Method :
- *			    log(x)
- *		log2(x) =  ---------
- *			    log(2)
- */
-
-#define _LIBM_STATIC
-#include "mathimpl.h"
-
-
-static const double ln2 = .6931471805599453094172321214581765680755;
-
-double
-log2(double x)
-{
-	return log(x)/ln2;
-}
-
-float
-log2f(float x)
-{
-	return logf(x)/ln2;
-}
diff --git a/lib/libm/noieee_src/n_log__L.c b/lib/libm/noieee_src/n_log__L.c
deleted file mode 100644
index 2c52242d7..000000000
--- a/lib/libm/noieee_src/n_log__L.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*      $NetBSD: n_log__L.c,v 1.6 2003/08/07 16:44:52 agc Exp $ */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)log__L.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* log__L(Z)
- *		LOG(1+X) - 2S			       X
- * RETURN      ---------------  WHERE Z = S*S,  S = ------- , 0 <= Z <= .0294...
- *		      S				     2 + X
- *
- * DOUBLE PRECISION (VAX D FORMAT 56 bits or IEEE DOUBLE 53 BITS)
- * KERNEL FUNCTION FOR LOG; TO BE USED IN LOG1P, LOG, AND POW FUNCTIONS
- * CODED IN C BY K.C. NG, 1/19/85;
- * REVISED BY K.C. Ng, 2/3/85, 4/16/85.
- *
- * Method :
- *	1. Polynomial approximation: let s = x/(2+x).
- *	   Based on log(1+x) = log(1+s) - log(1-s)
- *		 = 2s + 2/3 s**3 + 2/5 s**5 + .....,
- *
- *	   (log(1+x) - 2s)/s is computed by
- *
- *	       z*(L1 + z*(L2 + z*(... (L7 + z*L8)...)))
- *
- *	   where z=s*s. (See the listing below for Lk's values.) The
- *	   coefficients are obtained by a special Remez algorithm.
- *
- * Accuracy:
- *	Assuming no rounding error, the maximum magnitude of the approximation
- *	error (absolute) is 2**(-58.49) for IEEE double, and 2**(-63.63)
- *	for VAX D format.
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-
-#define _LIBM_STATIC
-#include "mathimpl.h"
-
-vc(L1, 6.6666666666666703212E-1 ,aaaa,402a,aac5,aaaa,  0, .AAAAAAAAAAAAC5)
-vc(L2, 3.9999999999970461961E-1 ,cccc,3fcc,2684,cccc, -1, .CCCCCCCCCC2684)
-vc(L3, 2.8571428579395698188E-1 ,4924,3f92,5782,92f8, -1, .92492492F85782)
-vc(L4, 2.2222221233634724402E-1 ,8e38,3f63,af2c,39b7, -2, .E38E3839B7AF2C)
-vc(L5, 1.8181879517064680057E-1 ,2eb4,3f3a,655e,cc39, -2, .BA2EB4CC39655E)
-vc(L6, 1.5382888777946145467E-1 ,8551,3f1d,781d,e8c5, -2, .9D8551E8C5781D)
-vc(L7, 1.3338356561139403517E-1 ,95b3,3f08,cd92,907f, -2, .8895B3907FCD92)
-vc(L8, 1.2500000000000000000E-1 ,0000,3f00,0000,0000, -2, .80000000000000)
-
-ic(L1, 6.6666666666667340202E-1, -1, 1.5555555555592)
-ic(L2, 3.9999999999416702146E-1, -2, 1.999999997FF24)
-ic(L3, 2.8571428742008753154E-1, -2, 1.24924941E07B4)
-ic(L4, 2.2222198607186277597E-1, -3, 1.C71C52150BEA6)
-ic(L5, 1.8183562745289935658E-1, -3, 1.74663CC94342F)
-ic(L6, 1.5314087275331442206E-1, -3, 1.39A1EC014045B)
-ic(L7, 1.4795612545334174692E-1, -3, 1.2F039F0085122)
-
-#ifdef vccast
-#define	L1	vccast(L1)
-#define	L2	vccast(L2)
-#define	L3	vccast(L3)
-#define	L4	vccast(L4)
-#define	L5	vccast(L5)
-#define	L6	vccast(L6)
-#define	L7	vccast(L7)
-#define	L8	vccast(L8)
-#endif
-
-double
-__log__L(double z)
-{
-#if defined(__vax__)||defined(tahoe)
-    return(z*(L1+z*(L2+z*(L3+z*(L4+z*(L5+z*(L6+z*(L7+z*L8))))))));
-#else	/* defined(__vax__)||defined(tahoe) */
-    return(z*(L1+z*(L2+z*(L3+z*(L4+z*(L5+z*(L6+z*L7)))))));
-#endif	/* defined(__vax__)||defined(tahoe) */
-}
diff --git a/lib/libm/noieee_src/n_lround.c b/lib/libm/noieee_src/n_lround.c
deleted file mode 100644
index bc35c891a..000000000
--- a/lib/libm/noieee_src/n_lround.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2003, Steven G. Kargl
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: n_lround.c,v 1.1 2010/12/09 22:52:59 abs Exp $");
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_round.c,v 1.1 2004/06/07 08:05:36 das Exp $");
-#endif
-#endif
-
-#include <math.h>
-
-long
-lround(double x)
-{
-	long t;
-
-	if (x >= 0.0) {
-		t = ceil(x);
-		if (t - x > 0.5)
-			t -= 1.0;
-		return (t);
-	} else {
-		t = ceil(-x);
-		if (t + x > 0.5)
-			t -= 1.0;
-		return (-t);
-	}
-}
diff --git a/lib/libm/noieee_src/n_lroundf.c b/lib/libm/noieee_src/n_lroundf.c
deleted file mode 100644
index 4bf4ec1e5..000000000
--- a/lib/libm/noieee_src/n_lroundf.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2003, Steven G. Kargl
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: n_lroundf.c,v 1.1 2010/12/09 22:52:59 abs Exp $");
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_roundf.c,v 1.1 2004/06/07 08:05:36 das Exp $");
-#endif
-#endif
-
-#include <math.h>
-
-long
-lroundf(float x)
-{
-	long t;
-
-	if (x >= 0.0) {
-		t = ceilf(x);
-		if (t - x > 0.5)
-			t -= 1.0;
-		return (t);
-	} else {
-		t = ceilf(-x);
-		if (t + x > 0.5)
-			t -= 1.0;
-		return (-t);
-	}
-}
diff --git a/lib/libm/noieee_src/n_pow.c b/lib/libm/noieee_src/n_pow.c
deleted file mode 100644
index e7850c232..000000000
--- a/lib/libm/noieee_src/n_pow.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*      $NetBSD: n_pow.c,v 1.11 2014/10/11 07:19:27 martin Exp $ */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pow.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* POW(X,Y)
- * RETURN X**Y
- * DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
- * CODED IN C BY K.C. NG, 1/8/85;
- * REVISED BY K.C. NG on 7/10/85.
- * KERNEL pow_P() REPLACED BY P. McILROY 7/22/92.
- * Required system supported functions:
- *      scalb(x,n)
- *      logb(x)
- *	copysign(x,y)
- *	finite(x)
- *	drem(x,y)
- *
- * Required kernel functions:
- *	exp__D(a,c)			exp(a + c) for |a| << |c|
- *	struct d_double dlog(x)		r.a + r.b, |r.b| < |r.a|
- *
- * Method
- *	1. Compute and return log(x) in three pieces:
- *		log(x) = n*ln2 + hi + lo,
- *	   where n is an integer.
- *	2. Perform y*log(x) by simulating muti-precision arithmetic and
- *	   return the answer in three pieces:
- *		y*log(x) = m*ln2 + hi + lo,
- *	   where m is an integer.
- *	3. Return x**y = exp(y*log(x))
- *		= 2^m * ( exp(hi+lo) ).
- *
- * Special cases:
- *	(anything) ** 0  is 1 ;
- *	(anything) ** 1  is itself;
- *	(anything) ** NaN is NaN;
- *	NaN ** (anything except 0) is NaN;
- *	+(anything > 1) ** +INF is +INF;
- *	-(anything > 1) ** +INF is NaN;
- *	+-(anything > 1) ** -INF is +0;
- *	+-(anything < 1) ** +INF is +0;
- *	+(anything < 1) ** -INF is +INF;
- *	-(anything < 1) ** -INF is NaN;
- *	+-1 ** +-INF is NaN and signal INVALID;
- *	+0 ** +(anything except 0, NaN)  is +0;
- *	-0 ** +(anything except 0, NaN, odd integer)  is +0;
- *	+0 ** -(anything except 0, NaN)  is +INF and signal DIV-BY-ZERO;
- *	-0 ** -(anything except 0, NaN, odd integer)  is +INF with signal;
- *	-0 ** (odd integer) = -( +0 ** (odd integer) );
- *	+INF ** +(anything except 0,NaN) is +INF;
- *	+INF ** -(anything except 0,NaN) is +0;
- *	-INF ** (odd integer) = -( +INF ** (odd integer) );
- *	-INF ** (even integer) = ( +INF ** (even integer) );
- *	-INF ** -(anything except integer,NaN) is NaN with signal;
- *	-(x=anything) ** (k=integer) is (-1)**k * (x ** k);
- *	-(anything except 0) ** (non-integer) is NaN with signal;
- *
- * Accuracy:
- *	pow(x,y) returns x**y nearly rounded. In particular, on a SUN, a VAX,
- *	and a Zilog Z8000,
- *			pow(integer,integer)
- *	always returns the correct integer provided it is representable.
- *	In a test run with 100,000 random arguments with 0 < x, y < 20.0
- *	on a VAX, the maximum observed error was 1.79 ulps (units in the
- *	last place).
- *
- * Constants :
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-
-#include <errno.h>
-#include <math.h>
-
-#include "mathimpl.h"
-
-#if (defined(__vax__) || defined(tahoe))
-#define TRUNC(x)	x = (double) (float) x
-#define _IEEE		0
-#else
-#define _IEEE		1
-#define endian		(((*(int *) &one)) ? 1 : 0)
-#define TRUNC(x) 	*(((int *) &x)+endian) &= 0xf8000000
-#define infnan(x)	0.0
-#endif		/* __vax__ or tahoe */
-
-static const double zero=0.0, one=1.0, two=2.0, negone= -1.0;
-
-static double pow_P (double, double);
-
-#ifdef __weak_alias
-__weak_alias(_powf, powf);
-__weak_alias(_pow, pow);
-__weak_alias(_powl, pow);
-__weak_alias(powl, pow);
-#endif
-
-float
-powf(float x, float y)
-{
-   return pow((double) x, (double) (y));
-}
-
-double
-pow(double x, double y)
-{
-	double t;
-	if (y==zero)
-		return (one);
-	else if (y==one || (_IEEE && x != x))
-		return (x);		/* if x is NaN or y=1 */
-	else if (_IEEE && y!=y)		/* if y is NaN */
-		return (y);
-	else if (!finite(y))		/* if y is INF */
-		if ((t=fabs(x))==one)	/* +-1 ** +-INF is NaN */
-			return (y - y);
-		else if (t>one)
-			return ((y<0)? zero : ((x<zero)? y-y : y));
-		else
-			return ((y>0)? zero : ((x<0)? y-y : -y));
-	else if (y==two)
-		return (x*x);
-	else if (y==negone)
-		return (one/x);
-    /* x > 0, x == +0 */
-	else if (copysign(one, x) == one)
-		return (pow_P(x, y));
-
-    /* sign(x)= -1 */
-	/* if y is an even integer */
-	else if ( (t=drem(y,two)) == zero)
-		return (pow_P(-x, y));
-
-	/* if y is an odd integer */
-	else if (copysign(t,one) == one)
-		return (-pow_P(-x, y));
-
-	/* Henceforth y is not an integer */
-	else if (x==zero)	/* x is -0 */
-		return ((y>zero)? -x : one/(-x));
-	else if (_IEEE)
-		return (zero/zero);
-	else
-		return (infnan(EDOM));
-}
-
-/* kernel function for x >= 0 */
-static double
-pow_P(double x, double y)
-{
-	struct Double s, t;
-	double  huge = _HUGE, tiny = _TINY;
-
-	if (x == zero) {
-		if (y > zero)
-			return (zero);
-		else if (_IEEE)
-			return (huge*huge);
-		else
-			return (infnan(ERANGE));
-	}
-	if (x == one)
-		return (one);
-	if (!finite(x)) {
-		if (y < zero)
-			return (zero);
-		else if (_IEEE)
-			return (huge*huge);
-		else
-			return (infnan(ERANGE));
-	}
-	if (y >= 7e18) {	/* infinity */
-		if (x < 1)
-			return(tiny*tiny);
-		else if (_IEEE)
-			return (huge*huge);
-		else
-			return (infnan(ERANGE));
-	}
-
-	/* Return exp(y*log(x)), using simulated extended */
-	/* precision for the log and the multiply.	  */
-
-	s = __log__D(x);
-	t.a = y;
-	TRUNC(t.a);
-	t.b = y - t.a;
-	t.b = s.b*y + t.b*s.a;
-	t.a *= s.a;
-	s.a = t.a + t.b;
-	s.b = (t.a - s.a) + t.b;
-	return (__exp__D(s.a, s.b));
-}
diff --git a/lib/libm/noieee_src/n_round.c b/lib/libm/noieee_src/n_round.c
deleted file mode 100644
index 2856e2932..000000000
--- a/lib/libm/noieee_src/n_round.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 2003, Steven G. Kargl
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: n_round.c,v 1.2 2014/03/16 10:02:27 martin Exp $");
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_round.c,v 1.1 2004/06/07 08:05:36 das Exp $");
-#endif
-#endif
-
-#include <math.h>
-
-#ifdef __weak_alias
-__weak_alias(roundl, round);
-#endif
-
-double
-round(double x)
-{
-	double t;
-
-	if (x >= 0.0) {
-		t = ceil(x);
-		if (t - x > 0.5)
-			t -= 1.0;
-		return (t);
-	} else {
-		t = ceil(-x);
-		if (t + x > 0.5)
-			t -= 1.0;
-		return (-t);
-	}
-}
diff --git a/lib/libm/noieee_src/n_roundf.c b/lib/libm/noieee_src/n_roundf.c
deleted file mode 100644
index 81a234ddb..000000000
--- a/lib/libm/noieee_src/n_roundf.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2003, Steven G. Kargl
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: n_roundf.c,v 1.1 2006/01/17 13:16:08 is Exp $");
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_roundf.c,v 1.1 2004/06/07 08:05:36 das Exp $");
-#endif
-#endif
-
-#include <math.h>
-
-float
-roundf(float x)
-{
-	float t;
-
-	if (x >= 0.0) {
-		t = ceilf(x);
-		if (t - x > 0.5)
-			t -= 1.0;
-		return (t);
-	} else {
-		t = ceilf(-x);
-		if (t + x > 0.5)
-			t -= 1.0;
-		return (-t);
-	}
-}
diff --git a/lib/libm/noieee_src/n_sincos.c b/lib/libm/noieee_src/n_sincos.c
deleted file mode 100644
index 07675e708..000000000
--- a/lib/libm/noieee_src/n_sincos.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*	$NetBSD: n_sincos.c,v 1.7 2014/10/10 20:58:09 martin Exp $	*/
-/*
- * Copyright (c) 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.
- * 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)sincos.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-#define _LIBM_DECLARE
-#include "mathimpl.h"
-#include "trig.h"
-
-#ifdef __weak_alias
-__weak_alias(_sinl, sin);
-__weak_alias(_cosl, cos);
-#endif
-
-double
-sin(double x)
-{
-	double a,c,z;
-
-        if(!finite(x))		/* sin(NaN) and sin(INF) must be NaN */
-		return x-x;
-	x=drem(x,PI2);		/* reduce x into [-PI,PI] */
-	a=copysign(x,__one);
-	if (a >= PIo4) {
-		if(a >= PI3o4)		/* ... in [3PI/4,PI] */
-			x = copysign((a = PI-a),x);
-		else {			/* ... in [PI/4,3PI/4]  */
-			a = PIo2-a;		/* rtn. sign(x)*C(PI/2-|x|) */
-			z = a*a;
-			c = cos__C(z);
-			z *= __half;
-			a = (z >= thresh ? __half-((z-__half)-c) : __one-(z-c));
-			return copysign(a,x);
-		}
-	}
-
-	if (a < __small) {		/* rtn. S(x) */
-		z = __big+a;
-		return x;
-	}
-	return x+x*sin__S(x*x);
-}
-
-float
-sinf(float x)
-{
-	return sin(x);
-}
-
-double
-cos(double x)
-{
-	double a,c,z,s = 1.0;
-
-	if(!finite(x))		/* cos(NaN) and cos(INF) must be NaN */
-		return x-x;
-	x=drem(x,PI2);		/* reduce x into [-PI,PI] */
-	a=copysign(x,__one);
-	if (a >= PIo4) {
-		if (a >= PI3o4) {	/* ... in [3PI/4,PI] */
-			a = PI-a;
-			s = __negone;
-		}
-		else {			/* ... in [PI/4,3PI/4] */
-			a = PIo2-a;
-			return a+a*sin__S(a*a);	/* rtn. S(PI/2-|x|) */
-		}
-	}
-	if (a < __small) {
-		z = __big+a;
-		return s;		/* rtn. s*C(a) */
-	}
-	z = a*a;
-	c = cos__C(z);
-	z *= __half;
-	a = (z >= thresh ? __half-((z-__half)-c) : __one-(z-c));
-	return copysign(a,s);
-}
-
-float
-cosf(float x)
-{
-	return cos(x);
-}
diff --git a/lib/libm/noieee_src/n_sinh.c b/lib/libm/noieee_src/n_sinh.c
deleted file mode 100644
index eb2820cdd..000000000
--- a/lib/libm/noieee_src/n_sinh.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*      $NetBSD: n_sinh.c,v 1.8 2014/10/10 20:58:09 martin Exp $ */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)sinh.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* SINH(X)
- * RETURN THE HYPERBOLIC SINE OF X
- * DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
- * CODED IN C BY K.C. NG, 1/8/85;
- * REVISED BY K.C. NG on 2/8/85, 3/7/85, 3/24/85, 4/16/85.
- *
- * Required system supported functions :
- *	copysign(x,y)
- *	scalb(x,N)
- *
- * Required kernel functions:
- *	expm1(x)	...return exp(x)-1
- *
- * Method :
- *	1. reduce x to non-negative by sinh(-x) = - sinh(x).
- *	2.
- *
- *	                                      expm1(x) + expm1(x)/(expm1(x)+1)
- *	    0 <= x <= lnovfl     : sinh(x) := --------------------------------
- *			       		                      2
- *     lnovfl <= x <= lnovfl+ln2 : sinh(x) := expm1(x)/2 (avoid overflow)
- * lnovfl+ln2 <  x <  INF        :  overflow to INF
- *
- *
- * Special cases:
- *	sinh(x) is x if x is +INF, -INF, or NaN.
- *	only sinh(0)=0 is exact for finite argument.
- *
- * Accuracy:
- *	sinh(x) returns the exact hyperbolic sine of x nearly rounded. In
- *	a test run with 1,024,000 random arguments on a VAX, the maximum
- *	observed error was 1.93 ulps (units in the last place).
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-
-#define _LIBM_STATIC
-#include "../src/namespace.h"
-#include "mathimpl.h"
-
-#ifdef __weak_alias
-__weak_alias(sinh, _sinh);
-__weak_alias(_sinhl, _sinh);
-__weak_alias(sinhf, _sinhf);
-#endif
-
-vc(mln2hi, 8.8029691931113054792E1   ,0f33,43b0,2bdb,c7e2,   7, .B00F33C7E22BDB)
-vc(mln2lo,-4.9650192275318476525E-16 ,1b60,a70f,582a,279e, -50,-.8F1B60279E582A)
-vc(lnovfl, 8.8029691931113053016E1   ,0f33,43b0,2bda,c7e2,   7, .B00F33C7E22BDA)
-
-ic(mln2hi, 7.0978271289338397310E2,    10, 1.62E42FEFA39EF)
-ic(mln2lo, 2.3747039373786107478E-14, -45, 1.ABC9E3B39803F)
-ic(lnovfl, 7.0978271289338397310E2,     9, 1.62E42FEFA39EF)
-
-#ifdef vccast
-#define	mln2hi	vccast(mln2hi)
-#define	mln2lo	vccast(mln2lo)
-#define	lnovfl	vccast(lnovfl)
-#endif
-
-#if defined(__vax__)||defined(tahoe)
-static const int max = 126                      ;
-#else	/* defined(__vax__)||defined(tahoe) */
-static const int max = 1023                     ;
-#endif	/* defined(__vax__)||defined(tahoe) */
-
-
-double
-sinh(double x)
-{
-	static const double  one=1.0, half=1.0/2.0 ;
-	double t, sign;
-#if !defined(__vax__)&&!defined(tahoe)
-	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-	sign=copysign(one,x);
-	x=copysign(x,one);
-	if(x<lnovfl)
-	    {t=expm1(x); return(copysign((t+t/(one+t))*half,sign));}
-
-	else if(x <= lnovfl+0.7)
-		/* subtract x by ln(2^(max+1)) and return 2^max*exp(x)
-	    		to avoid unnecessary overflow */
-	    return(copysign(scalb(one+expm1((x-mln2hi)-mln2lo),max),sign));
-
-	else  /* sinh(+-INF) = +-INF, sinh(+-big no.) overflow to +-INF */
-	    return( expm1(x)*sign );
-}
-
-float
-sinhf(float x)
-{
-	return(sinh((double)x));
-}
diff --git a/lib/libm/noieee_src/n_support.c b/lib/libm/noieee_src/n_support.c
deleted file mode 100644
index b37c74f3d..000000000
--- a/lib/libm/noieee_src/n_support.c
+++ /dev/null
@@ -1,520 +0,0 @@
-/*      $NetBSD: n_support.c,v 1.5 2003/08/07 16:44:52 agc Exp $ */
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)support.c	8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
-/*
- * Some IEEE standard 754 recommended functions and remainder and sqrt for
- * supporting the C elementary functions.
- ******************************************************************************
- * WARNING:
- *      These codes are developed (in double) to support the C elementary
- * functions temporarily. They are not universal, and some of them are very
- * slow (in particular, drem and sqrt is extremely inefficient). Each
- * computer system should have its implementation of these functions using
- * its own assembler.
- ******************************************************************************
- *
- * IEEE 754 required operations:
- *     drem(x,p)
- *              returns  x REM y  =  x - [x/y]*y , where [x/y] is the integer
- *              nearest x/y; in half way case, choose the even one.
- *     sqrt(x)
- *              returns the square root of x correctly rounded according to
- *		the rounding mod.
- *
- * IEEE 754 recommended functions:
- * (a) copysign(x,y)
- *              returns x with the sign of y.
- * (b) scalb(x,N)
- *              returns  x * (2**N), for integer values N.
- * (c) logb(x)
- *              returns the unbiased exponent of x, a signed integer in
- *              double precision, except that logb(0) is -INF, logb(INF)
- *              is +INF, and logb(NAN) is that NAN.
- * (d) finite(x)
- *              returns the value TRUE if -INF < x < +INF and returns
- *              FALSE otherwise.
- *
- *
- * CODED IN C BY K.C. NG, 11/25/84;
- * REVISED BY K.C. NG on 1/22/85, 2/13/85, 3/24/85.
- */
-
-#include "mathimpl.h"
-#include "trig.h"
-
-#if defined(__vax__)||defined(tahoe)      /* VAX D format */
-#include <errno.h>
-    static const unsigned short msign=0x7fff , mexp =0x7f80 ;
-    static const short  prep1=57, gap=7, bias=129           ;
-    static const double novf=1.7E38, nunf=3.0E-39 ;
-#else	/* defined(__vax__)||defined(tahoe) */
-    static const unsigned short msign=0x7fff, mexp =0x7ff0  ;
-    static const short prep1=54, gap=4, bias=1023           ;
-    static const double novf=1.7E308, nunf=3.0E-308;
-#endif	/* defined(__vax__)||defined(tahoe) */
-
-double
-scalb(double x, int N)
-{
-        int k;
-
-#ifdef national
-        unsigned short *px=(unsigned short *) &x + 3;
-#else	/* national */
-        unsigned short *px=(unsigned short *) &x;
-#endif	/* national */
-
-        if( x == __zero )  return(x);
-
-#if defined(__vax__)||defined(tahoe)
-        if( (k= *px & mexp ) != ~msign ) {
-            if (N < -260)
-		return(nunf*nunf);
-	    else if (N > 260) {
-		return(copysign(infnan(ERANGE),x));
-	    }
-#else	/* defined(__vax__)||defined(tahoe) */
-        if( (k= *px & mexp ) != mexp ) {
-            if( N<-2100) return(nunf*nunf); else if(N>2100) return(novf+novf);
-            if( k == 0 ) {
-                 x *= scalb(1.0,(int)prep1);  N -= prep1; return(scalb(x,N));}
-#endif	/* defined(__vax__)||defined(tahoe) */
-
-            if((k = (k>>gap)+ N) > 0 )
-                if( k < (mexp>>gap) ) *px = (*px&~mexp) | (k<<gap);
-                else x=novf+novf;               /* overflow */
-            else
-                if( k > -prep1 )
-                                        /* gradual underflow */
-                    {*px=(*px&~mexp)|(short)(1<<gap); x *= scalb(1.0,k-1);}
-                else
-                return(nunf*nunf);
-            }
-        return(x);
-}
-
-
-double
-copysign(double x, double y)
-{
-#ifdef national
-        unsigned short  *px=(unsigned short *) &x+3,
-                        *py=(unsigned short *) &y+3;
-#else	/* national */
-        unsigned short  *px=(unsigned short *) &x,
-                        *py=(unsigned short *) &y;
-#endif	/* national */
-
-#if defined(__vax__)||defined(tahoe)
-        if ( (*px & mexp) == 0 ) return(x);
-#endif	/* defined(__vax__)||defined(tahoe) */
-
-        *px = ( *px & msign ) | ( *py & ~msign );
-        return(x);
-}
-
-double
-logb(double x)
-{
-
-#ifdef national
-        short *px=(short *) &x+3, k;
-#else	/* national */
-        short *px=(short *) &x, k;
-#endif	/* national */
-
-#if defined(__vax__)||defined(tahoe)
-        return (int)(((*px&mexp)>>gap)-bias);
-#else	/* defined(__vax__)||defined(tahoe) */
-        if( (k= *px & mexp ) != mexp )
-            if ( k != 0 )
-                return ( (k>>gap) - bias );
-            else if( x != __zero)
-                return ( -1022.0 );
-            else
-                return(-(1.0/__zero));
-        else if(x != x)
-            return(x);
-        else
-            {*px &= msign; return(x);}
-#endif	/* defined(__vax__)||defined(tahoe) */
-}
-
-int
-finite(double x)
-{
-#if defined(__vax__)||defined(tahoe)
-        return(1);
-#else	/* defined(__vax__)||defined(tahoe) */
-#ifdef national
-        return( (*((short *) &x+3 ) & mexp ) != mexp );
-#else	/* national */
-        return( (*((short *) &x ) & mexp ) != mexp );
-#endif	/* national */
-#endif	/* defined(__vax__)||defined(tahoe) */
-}
-
-double
-drem(double x, double p)
-{
-        short sign;
-        double hp,dp,tmp;
-        unsigned short  k;
-#ifdef national
-        unsigned short
-              *px=(unsigned short *) &x  +3,
-              *pp=(unsigned short *) &p  +3,
-              *pd=(unsigned short *) &dp +3,
-              *pt=(unsigned short *) &tmp+3;
-#else	/* national */
-        unsigned short
-              *px=(unsigned short *) &x  ,
-              *pp=(unsigned short *) &p  ,
-              *pd=(unsigned short *) &dp ,
-              *pt=(unsigned short *) &tmp;
-#endif	/* national */
-
-        *pp &= msign ;
-
-#if defined(__vax__)||defined(tahoe)
-        if( ( *px & mexp ) == ~msign )	/* is x a reserved operand? */
-#else	/* defined(__vax__)||defined(tahoe) */
-        if( ( *px & mexp ) == mexp )
-#endif	/* defined(__vax__)||defined(tahoe) */
-		return  (x-p)-(x-p);	/* create nan if x is inf */
-	if (p == __zero) {
-#if defined(__vax__)||defined(tahoe)
-		return(infnan(EDOM));
-#else	/* defined(__vax__)||defined(tahoe) */
-		return __zero/__zero;
-#endif	/* defined(__vax__)||defined(tahoe) */
-	}
-
-#if defined(__vax__)||defined(tahoe)
-        if( ( *pp & mexp ) == ~msign )	/* is p a reserved operand? */
-#else	/* defined(__vax__)||defined(tahoe) */
-        if( ( *pp & mexp ) == mexp )
-#endif	/* defined(__vax__)||defined(tahoe) */
-		{ if (p != p) return p; else return x;}
-
-        else  if ( ((*pp & mexp)>>gap) <= 1 )
-                /* subnormal p, or almost subnormal p */
-            { double b; b=scalb(1.0,(int)prep1);
-              p *= b; x = drem(x,p); x *= b; return(drem(x,p)/b);}
-        else  if ( p >= novf/2)
-            { p /= 2 ; x /= 2; return(drem(x,p)*2);}
-        else
-            {
-                dp=p+p; hp=p/2;
-                sign= *px & ~msign ;
-                *px &= msign       ;
-                while ( x > dp )
-                    {
-                        k=(*px & mexp) - (*pd & mexp) ;
-                        tmp = dp ;
-                        *pt += k ;
-
-#if defined(__vax__)||defined(tahoe)
-                        if( x < tmp ) *pt -= 128 ;
-#else	/* defined(__vax__)||defined(tahoe) */
-                        if( x < tmp ) *pt -= 16 ;
-#endif	/* defined(__vax__)||defined(tahoe) */
-
-                        x -= tmp ;
-                    }
-                if ( x > hp )
-                    { x -= p ;  if ( x >= hp ) x -= p ; }
-
-#if defined(__vax__)||defined(tahoe)
-		if (x)
-#endif	/* defined(__vax__)||defined(tahoe) */
-			*px ^= sign;
-                return( x);
-
-            }
-}
-
-
-double
-sqrt(double x)
-{
-        double q,s,b,r;
-        double t;
-        int m,n,i;
-#if defined(__vax__)||defined(tahoe)
-        int k=54;
-#else	/* defined(__vax__)||defined(tahoe) */
-        int k=51;
-#endif	/* defined(__vax__)||defined(tahoe) */
-
-    /* sqrt(NaN) is NaN, sqrt(+-0) = +-0 */
-        if(x!=x||x==__zero) return(x);
-
-    /* sqrt(negative) is invalid */
-        if(x<__zero) {
-#if defined(__vax__)||defined(tahoe)
-		return (infnan(EDOM));	/* NaN */
-#else	/* defined(__vax__)||defined(tahoe) */
-		return(__zero/__zero);
-#endif	/* defined(__vax__)||defined(tahoe) */
-	}
-
-    /* sqrt(INF) is INF */
-        if(!finite(x)) return(x);
-
-    /* scale x to [1,4) */
-        n=logb(x);
-        x=scalb(x,-n);
-        if((m=logb(x))!=0) x=scalb(x,-m);       /* subnormal number */
-        m += n;
-        n = m/2;
-        if((n+n)!=m) {x *= 2; m -=1; n=m/2;}
-
-    /* generate sqrt(x) bit by bit (accumulating in q) */
-            q=1.0; s=4.0; x -= 1.0; r=1;
-            for(i=1;i<=k;i++) {
-                t=s+1; x *= 4; r /= 2;
-                if(t<=x) {
-                    s=t+t+2, x -= t; q += r;}
-                else
-                    s *= 2;
-                }
-
-    /* generate the last bit and determine the final rounding */
-            r/=2; x *= 4;
-            if(x==__zero) goto end; 100+r; /* trigger inexact flag */
-            if(s<x) {
-                q+=r; x -=s; s += 2; s *= 2; x *= 4;
-                t = (x-s)-5;
-                b=1.0+3*r/4; if(b==1.0) goto end; /* b==1 : Round-to-zero */
-                b=1.0+r/4;   if(b>1.0) t=1;	/* b>1 : Round-to-(+INF) */
-                if(t>=0) q+=r; }	      /* else: Round-to-nearest */
-            else {
-                s *= 2; x *= 4;
-                t = (x-s)-1;
-                b=1.0+3*r/4; if(b==1.0) goto end;
-                b=1.0+r/4;   if(b>1.0) t=1;
-                if(t>=0) q+=r; }
-
-end:        return(scalb(q,n));
-}
-
-#if 0
-/* DREM(X,Y)
- * RETURN X REM Y =X-N*Y, N=[X/Y] ROUNDED (ROUNDED TO EVEN IN THE HALF WAY CASE)
- * DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
- * INTENDED FOR ASSEMBLY LANGUAGE
- * CODED IN C BY K.C. NG, 3/23/85, 4/8/85.
- *
- * Warning: this code should not get compiled in unless ALL of
- * the following machine-dependent routines are supplied.
- *
- * Required machine dependent functions (not on a VAX):
- *     swapINX(i): save inexact flag and reset it to "i"
- *     swapENI(e): save inexact enable and reset it to "e"
- */
-
-double
-drem(double x, double y)
-{
-
-#ifdef national		/* order of words in floating point number */
-	static const n0=3,n1=2,n2=1,n3=0;
-#else /* VAX, SUN, ZILOG, TAHOE */
-	static const n0=0,n1=1,n2=2,n3=3;
-#endif
-
-    	static const unsigned short mexp =0x7ff0, m25 =0x0190, m57 =0x0390;
-	double hy,y1,t,t1;
-	short k;
-	long n;
-	int i,e;
-	unsigned short xexp,yexp, *px  =(unsigned short *) &x  ,
-	      		nx,nf,	  *py  =(unsigned short *) &y  ,
-	      		sign,	  *pt  =(unsigned short *) &t  ,
-	      			  *pt1 =(unsigned short *) &t1 ;
-
-	xexp = px[n0] & mexp ;	/* exponent of x */
-	yexp = py[n0] & mexp ;	/* exponent of y */
-	sign = px[n0] &0x8000;	/* sign of x     */
-
-/* return NaN if x is NaN, or y is NaN, or x is INF, or y is zero */
-	if(x!=x) return(x); if(y!=y) return(y);	     /* x or y is NaN */
-	if( xexp == mexp )   return(__zero/__zero);      /* x is INF */
-	if(y==__zero) return(y/y);
-
-/* save the inexact flag and inexact enable in i and e respectively
- * and reset them to zero
- */
-	i=swapINX(0);	e=swapENI(0);
-
-/* subnormal number */
-	nx=0;
-	if(yexp==0) {t=1.0,pt[n0]+=m57; y*=t; nx=m57;}
-
-/* if y is tiny (biased exponent <= 57), scale up y to y*2**57 */
-	if( yexp <= m57 ) {py[n0]+=m57; nx+=m57; yexp+=m57;}
-
-	nf=nx;
-	py[n0] &= 0x7fff;
-	px[n0] &= 0x7fff;
-
-/* mask off the least significant 27 bits of y */
-	t=y; pt[n3]=0; pt[n2]&=0xf800; y1=t;
-
-/* LOOP: argument reduction on x whenever x > y */
-loop:
-	while ( x > y )
-	{
-	    t=y;
-	    t1=y1;
-	    xexp=px[n0]&mexp;	  /* exponent of x */
-	    k=xexp-yexp-m25;
-	    if(k>0) 	/* if x/y >= 2**26, scale up y so that x/y < 2**26 */
-		{pt[n0]+=k;pt1[n0]+=k;}
-	    n=x/t; x=(x-n*t1)-n*(t-t1);
-	}
-    /* end while (x > y) */
-
-	if(nx!=0) {t=1.0; pt[n0]+=nx; x*=t; nx=0; goto loop;}
-
-/* final adjustment */
-
-	hy=y/2.0;
-	if(x>hy||((x==hy)&&n%2==1)) x-=y;
-	px[n0] ^= sign;
-	if(nf!=0) { t=1.0; pt[n0]-=nf; x*=t;}
-
-/* restore inexact flag and inexact enable */
-	swapINX(i); swapENI(e);
-
-	return(x);
-}
-#endif
-
-#if 0
-/* SQRT
- * RETURN CORRECTLY ROUNDED (ACCORDING TO THE ROUNDING MODE) SQRT
- * FOR IEEE DOUBLE PRECISION ONLY, INTENDED FOR ASSEMBLY LANGUAGE
- * CODED IN C BY K.C. NG, 3/22/85.
- *
- * Warning: this code should not get compiled in unless ALL of
- * the following machine-dependent routines are supplied.
- *
- * Required machine dependent functions:
- *     swapINX(i)  ...return the status of INEXACT flag and reset it to "i"
- *     swapRM(r)   ...return the current Rounding Mode and reset it to "r"
- *     swapENI(e)  ...return the status of inexact enable and reset it to "e"
- *     addc(t)     ...perform t=t+1 regarding t as a 64 bit unsigned integer
- *     subc(t)     ...perform t=t-1 regarding t as a 64 bit unsigned integer
- */
-
-static const unsigned long table[] = {
-0, 1204, 3062, 5746, 9193, 13348, 18162, 23592, 29598, 36145, 43202, 50740,
-58733, 67158, 75992, 85215, 83599, 71378, 60428, 50647, 41945, 34246, 27478,
-21581, 16499, 12183, 8588, 5674, 3403, 1742, 661, 130, };
-
-double
-newsqrt(double x)
-{
-        double y,z,t,addc(),subc()
-	double const b54=134217728.*134217728.; /* b54=2**54 */
-        long mx,scalx;
-	long const mexp=0x7ff00000;
-        int i,j,r,e,swapINX(),swapRM(),swapENI();
-        unsigned long *py=(unsigned long *) &y   ,
-                      *pt=(unsigned long *) &t   ,
-                      *px=(unsigned long *) &x   ;
-#ifdef national         /* ordering of word in a floating point number */
-        const int n0=1, n1=0;
-#else
-        const int n0=0, n1=1;
-#endif
-/* Rounding Mode:  RN ...round-to-nearest
- *                 RZ ...round-towards 0
- *                 RP ...round-towards +INF
- *		   RM ...round-towards -INF
- */
-        const int RN=0,RZ=1,RP=2,RM=3;
-				/* machine dependent: work on a Zilog Z8070
-                                 * and a National 32081 & 16081
-                                 */
-
-/* exceptions */
-	if(x!=x||x==0.0) return(x);  /* sqrt(NaN) is NaN, sqrt(+-0) = +-0 */
-	if(x<0) return((x-x)/(x-x)); /* sqrt(negative) is invalid */
-        if((mx=px[n0]&mexp)==mexp) return(x);  /* sqrt(+INF) is +INF */
-
-/* save, reset, initialize */
-        e=swapENI(0);   /* ...save and reset the inexact enable */
-        i=swapINX(0);   /* ...save INEXACT flag */
-        r=swapRM(RN);   /* ...save and reset the Rounding Mode to RN */
-        scalx=0;
-
-/* subnormal number, scale up x to x*2**54 */
-        if(mx==0) {x *= b54 ; scalx-=0x01b00000;}
-
-/* scale x to avoid intermediate over/underflow:
- * if (x > 2**512) x=x/2**512; if (x < 2**-512) x=x*2**512 */
-        if(mx>0x5ff00000) {px[n0] -= 0x20000000; scalx+= 0x10000000;}
-        if(mx<0x1ff00000) {px[n0] += 0x20000000; scalx-= 0x10000000;}
-
-/* magic initial approximation to almost 8 sig. bits */
-        py[n0]=(px[n0]>>1)+0x1ff80000;
-        py[n0]=py[n0]-table[(py[n0]>>15)&31];
-
-/* Heron's rule once with correction to improve y to almost 18 sig. bits */
-        t=x/y; y=y+t; py[n0]=py[n0]-0x00100006; py[n1]=0;
-
-/* triple to almost 56 sig. bits; now y approx. sqrt(x) to within 1 ulp */
-        t=y*y; z=t;  pt[n0]+=0x00100000; t+=z; z=(x-z)*y;
-        t=z/(t+x) ;  pt[n0]+=0x00100000; y+=t;
-
-/* twiddle last bit to force y correctly rounded */
-        swapRM(RZ);     /* ...set Rounding Mode to round-toward-zero */
-        swapINX(0);     /* ...clear INEXACT flag */
-        swapENI(e);     /* ...restore inexact enable status */
-        t=x/y;          /* ...chopped quotient, possibly inexact */
-        j=swapINX(i);   /* ...read and restore inexact flag */
-        if(j==0) { if(t==y) goto end; else t=subc(t); }  /* ...t=t-ulp */
-        b54+0.1;        /* ..trigger inexact flag, sqrt(x) is inexact */
-        if(r==RN) t=addc(t);            /* ...t=t+ulp */
-        else if(r==RP) { t=addc(t);y=addc(y);}/* ...t=t+ulp;y=y+ulp; */
-        y=y+t;                          /* ...chopped sum */
-        py[n0]=py[n0]-0x00100000;       /* ...correctly rounded sqrt(x) */
-end:    py[n0]=py[n0]+scalx;            /* ...scale back y */
-        swapRM(r);                      /* ...restore Rounding Mode */
-        return(y);
-}
-#endif
diff --git a/lib/libm/noieee_src/n_tan.c b/lib/libm/noieee_src/n_tan.c
deleted file mode 100644
index 3c0071a27..000000000
--- a/lib/libm/noieee_src/n_tan.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*	$NetBSD: n_tan.c,v 1.5 2003/08/07 16:44:52 agc Exp $	*/
-/*
- * Copyright (c) 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.
- * 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tan.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-#include "mathimpl.h"
-#include "trig.h"
-double
-tan(double x)
-{
-	double a,z,ss,cc,c;
-	int k;
-
-	if(!finite(x))		/* tan(NaN) and tan(INF) must be NaN */
-		return x-x;
-	x = drem(x,PI);			/* reduce x into [-PI/2, PI/2] */
-	a = copysign(x,__one);		/* ... = abs(x) */
-	if (a >= PIo4) {
-		k = 1;
-		x = copysign(PIo2-a,x);
-	}
-	else {
-		k = 0;
-		if (a < __small) {
-			z=__big+a;
-			return x;
-		}
-	}
-	z = x*x;
-	cc = cos__C(z);
-	ss = sin__S(z);
-	z *= __half;			/* Next get c = cos(x) accurately */
-	c = (z >= thresh ? __half-((z-__half)-cc) : __one-(z-cc));
-	if (k == 0)
-		return x+(x*(z-(cc-ss)))/c;	/* ... sin/cos */
-#ifdef national
-	else if (x == __zero)
-		return copysign(fmax,x);	/* no inf on 32k */
-#endif	/* national */
-	else
-		return c/(x+x*ss);		/* ... cos/sin */
-}
diff --git a/lib/libm/noieee_src/n_tanh.c b/lib/libm/noieee_src/n_tanh.c
deleted file mode 100644
index 5b0005ba2..000000000
--- a/lib/libm/noieee_src/n_tanh.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*	$NetBSD: n_tanh.c,v 1.7 2014/03/06 10:59:00 martin Exp $	*/
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tanh.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* not lint */
-
-/* TANH(X)
- * RETURN THE HYPERBOLIC TANGENT OF X
- * DOUBLE PRECISION (VAX D FORMAT 56 BITS, IEEE DOUBLE 53 BITS)
- * CODED IN C BY K.C. NG, 1/8/85;
- * REVISED BY K.C. NG on 2/8/85, 2/11/85, 3/7/85, 3/24/85.
- *
- * Required system supported functions :
- *	copysign(x,y)
- *	finite(x)
- *
- * Required kernel function:
- *	expm1(x)	...exp(x)-1
- *
- * Method :
- *	1. reduce x to non-negative by tanh(-x) = - tanh(x).
- *	2.
- *	    0      <  x <=  1.e-10 :  tanh(x) := x
- *					          -expm1(-2x)
- *	    1.e-10 <  x <=  1      :  tanh(x) := --------------
- *					         expm1(-2x) + 2
- *							  2
- *	    1      <= x <=  22.0   :  tanh(x) := 1 -  ---------------
- *						      expm1(2x) + 2
- *	    22.0   <  x <= INF     :  tanh(x) := 1.
- *
- *	Note: 22 was chosen so that fl(1.0+2/(expm1(2*22)+2)) == 1.
- *
- * Special cases:
- *	tanh(NaN) is NaN;
- *	only tanh(0)=0 is exact for finite argument.
- *
- * Accuracy:
- *	tanh(x) returns the exact hyperbolic tangent of x nealy rounded.
- *	In a test run with 1,024,000 random arguments on a VAX, the maximum
- *	observed error was 2.22 ulps (units in the last place).
- */
-
-#include "mathimpl.h"
-
-double
-tanh(double x)
-{
-	static const double one=1.0, two=2.0, small = 1.0e-10, big = 1.0e10;
-	double t, sign;
-
-#if !defined(__vax__)&&!defined(tahoe)
-	if(x!=x) return(x);	/* x is NaN */
-#endif	/* !defined(__vax__)&&!defined(tahoe) */
-
-	sign=copysign(one,x);
-	x=copysign(x,one);
-	if(x < 22.0)
-	    if( x > one )
-		return(copysign(one-two/(expm1(x+x)+two),sign));
-	    else if ( x > small )
-		{t= -expm1(-(x+x)); return(copysign(t/(two-t),sign));}
-	    else		/* raise the INEXACT flag for non-zero x */
-		{ t = big+x; return(copysign(x,sign));} /* ??? -ragge */
-	else if(finite(x))
-	    return (sign+1.0E-37); /* raise the INEXACT flag */
-	else
-	    return(sign);	/* x is +- INF */
-}
-
-float
-tanhf(float x)
-{
-	return tanh(x);
-}
diff --git a/lib/libm/noieee_src/trig.h b/lib/libm/noieee_src/trig.h
deleted file mode 100644
index 91f87f19a..000000000
--- a/lib/libm/noieee_src/trig.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*	$NetBSD: trig.h,v 1.6 2003/08/07 16:44:53 agc Exp $	*/
-/*
- * Copyright (c) 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.
- * 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.
- *
- *	@(#)trig.h	8.1 (Berkeley) 6/4/93
- */
-
-vc(thresh, 2.6117239648121182150E-1 ,b863,3f85,6ea0,6b02, -1, .85B8636B026EA0)
-vc(PIo4,   7.8539816339744830676E-1 ,0fda,4049,68c2,a221,  0, .C90FDAA22168C2)
-vc(PIo2,   1.5707963267948966135E0  ,0fda,40c9,68c2,a221,  1, .C90FDAA22168C2)
-vc(PI3o4,  2.3561944901923449203E0  ,cbe3,4116,0e92,f999,  2, .96CBE3F9990E92)
-vc(PI,     3.1415926535897932270E0  ,0fda,4149,68c2,a221,  2, .C90FDAA22168C2)
-vc(PI2,    6.2831853071795864540E0  ,0fda,41c9,68c2,a221,  3, .C90FDAA22168C2)
-
-ic(thresh, 2.6117239648121182150E-1 , -2, 1.0B70C6D604DD4)
-ic(PIo4,   7.8539816339744827900E-1 , -1, 1.921FB54442D18)
-ic(PIo2,   1.5707963267948965580E0  ,  0, 1.921FB54442D18)
-ic(PI3o4,  2.3561944901923448370E0  ,  1, 1.2D97C7F3321D2)
-ic(PI,     3.1415926535897931160E0  ,  1, 1.921FB54442D18)
-ic(PI2,    6.2831853071795862320E0  ,  2, 1.921FB54442D18)
-
-#ifdef vccast
-#define	thresh	vccast(thresh)
-#define	PIo4	vccast(PIo4)
-#define	PIo2	vccast(PIo2)
-#define	PI3o4	vccast(PI3o4)
-#define	PI	vccast(PI)
-#define	PI2	vccast(PI2)
-#endif
-
-#ifdef national
-static long fmaxx[]	= { 0xffffffff, 0x7fefffff};
-#define   fmax    (*(double*)fmaxx)
-#endif	/* national */
-
-#ifdef _LIBM_DECLARE
-const double
-	__zero = 0,
-	__one = 1,
-	__negone = -1,
-	__half = 1.0/2.0,
-#ifdef __vax__
-	__small = 1E-9, /* 1+small**2 == 1; better values for small:
-			  *		small	= 1.5E-9 for VAX D
-			  *			= 1.2E-8 for IEEE Double
-			  *			= 2.8E-10 for IEEE Extended
-			  */
-	__big = 1E18;	/* big := 1/(small**2) */
-#else
-	__small = 1E-10, /* 1+small**2 == 1; better values for small:
-			  *		small	= 1.5E-9 for VAX D
-			  *			= 1.2E-8 for IEEE Double
-			  *			= 2.8E-10 for IEEE Extended
-			  */
-	__big = 1E20;	/* big := 1/(small**2) */
-#endif
-#else
-extern const double __zero, __one, __negone, __half, __small, __big;
-#endif
-
-/* sin__S(x*x) ... re-implemented as a macro
- * DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
- * STATIC KERNEL FUNCTION OF SIN(X), COS(X), AND TAN(X)
- * CODED IN C BY K.C. NG, 1/21/85;
- * REVISED BY K.C. NG on 8/13/85.
- *
- *	    sin(x*k) - x
- * RETURN  --------------- on [-PI/4,PI/4] , where k=pi/PI, PI is the rounded
- *	            x
- * value of pi in machine precision:
- *
- *	Decimal:
- *		pi = 3.141592653589793 23846264338327 .....
- *    53 bits   PI = 3.141592653589793 115997963 ..... ,
- *    56 bits   PI = 3.141592653589793 227020265 ..... ,
- *
- *	Hexadecimal:
- *		pi = 3.243F6A8885A308D313198A2E....
- *    53 bits   PI = 3.243F6A8885A30  =  2 * 1.921FB54442D18
- *    56 bits   PI = 3.243F6A8885A308 =  4 * .C90FDAA22168C2
- *
- * Method:
- *	1. Let z=x*x. Create a polynomial approximation to
- *	    (sin(k*x)-x)/x  =  z*(S0 + S1*z^1 + ... + S5*z^5).
- *	Then
- *      sin__S(x*x) = z*(S0 + S1*z^1 + ... + S5*z^5)
- *
- *	The coefficient S's are obtained by a special Remez algorithm.
- *
- * Accuracy:
- *	In the absence of rounding error, the approximation has absolute error
- *	less than 2**(-61.11) for VAX D FORMAT, 2**(-57.45) for IEEE DOUBLE.
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- *
- */
-
-vc(S0, -1.6666666666666646660E-1  ,aaaa,bf2a,aa71,aaaa,  -2, -.AAAAAAAAAAAA71)
-vc(S1,  8.3333333333297230413E-3  ,8888,3d08,477f,8888,  -6,  .8888888888477F)
-vc(S2, -1.9841269838362403710E-4  ,0d00,ba50,1057,cf8a, -12, -.D00D00CF8A1057)
-vc(S3,  2.7557318019967078930E-6  ,ef1c,3738,bedc,a326, -18,  .B8EF1CA326BEDC)
-vc(S4, -2.5051841873876551398E-8  ,3195,b3d7,e1d3,374c, -25, -.D73195374CE1D3)
-vc(S5,  1.6028995389845827653E-10 ,3d9c,3030,cccc,6d26, -32,  .B03D9C6D26CCCC)
-vc(S6, -6.2723499671769283121E-13 ,8d0b,ac30,ea82,7561, -40, -.B08D0B7561EA82)
-
-ic(S0, -1.6666666666666463126E-1  ,  -3, -1.555555555550C)
-ic(S1,  8.3333333332992771264E-3  ,  -7,  1.111111110C461)
-ic(S2, -1.9841269816180999116E-4  , -13, -1.A01A019746345)
-ic(S3,  2.7557309793219876880E-6  , -19,  1.71DE3209CDCD9)
-ic(S4, -2.5050225177523807003E-8  , -26, -1.AE5C0E319A4EF)
-ic(S5,  1.5868926979889205164E-10 , -33,  1.5CF61DF672B13)
-
-#ifdef vccast
-#define	S0	vccast(S0)
-#define	S1	vccast(S1)
-#define	S2	vccast(S2)
-#define	S3	vccast(S3)
-#define	S4	vccast(S4)
-#define	S5	vccast(S5)
-#define	S6	vccast(S6)
-#endif
-
-#if defined(__vax__)||defined(tahoe)
-#  define	sin__S(z)	(z*(S0+z*(S1+z*(S2+z*(S3+z*(S4+z*(S5+z*S6)))))))
-#else 	/* defined(__vax__)||defined(tahoe) */
-#  define	sin__S(z)	(z*(S0+z*(S1+z*(S2+z*(S3+z*(S4+z*S5))))))
-#endif 	/* defined(__vax__)||defined(tahoe) */
-
-/* cos__C(x*x) ... re-implemented as a macro
- * DOUBLE PRECISION (VAX D FORMAT 56 BITS, IEEE DOUBLE 53 BITS)
- * STATIC KERNEL FUNCTION OF SIN(X), COS(X), AND TAN(X)
- * CODED IN C BY K.C. NG, 1/21/85;
- * REVISED BY K.C. NG on 8/13/85.
- *
- *	   		    x*x
- * RETURN   cos(k*x) - 1 + ----- on [-PI/4,PI/4],  where k = pi/PI,
- *	  		     2
- * PI is the rounded value of pi in machine precision :
- *
- *	Decimal:
- *		pi = 3.141592653589793 23846264338327 .....
- *    53 bits   PI = 3.141592653589793 115997963 ..... ,
- *    56 bits   PI = 3.141592653589793 227020265 ..... ,
- *
- *	Hexadecimal:
- *		pi = 3.243F6A8885A308D313198A2E....
- *    53 bits   PI = 3.243F6A8885A30  =  2 * 1.921FB54442D18
- *    56 bits   PI = 3.243F6A8885A308 =  4 * .C90FDAA22168C2
- *
- *
- * Method:
- *	1. Let z=x*x. Create a polynomial approximation to
- *	    cos(k*x)-1+z/2  =  z*z*(C0 + C1*z^1 + ... + C5*z^5)
- *	then
- *      cos__C(z) =  z*z*(C0 + C1*z^1 + ... + C5*z^5)
- *
- *	The coefficient C's are obtained by a special Remez algorithm.
- *
- * Accuracy:
- *	In the absence of rounding error, the approximation has absolute error
- *	less than 2**(-64) for VAX D FORMAT, 2**(-58.3) for IEEE DOUBLE.
- *
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-
-vc(C0,  4.1666666666666504759E-2  ,aaaa,3e2a,a9f0,aaaa,  -4,  .AAAAAAAAAAA9F0)
-vc(C1, -1.3888888888865302059E-3  ,0b60,bbb6,0cca,b60a,  -9, -.B60B60B60A0CCA)
-vc(C2,  2.4801587285601038265E-5  ,0d00,38d0,098f,cdcd, -15,  .D00D00CDCD098F)
-vc(C3, -2.7557313470902390219E-7  ,f27b,b593,e805,b593, -21, -.93F27BB593E805)
-vc(C4,  2.0875623401082232009E-9  ,74c8,320f,3ff0,fa1e, -28,  .8F74C8FA1E3FF0)
-vc(C5, -1.1355178117642986178E-11 ,c32d,ae47,5a63,0a5c, -36, -.C7C32D0A5C5A63)
-
-ic(C0,  4.1666666666666504759E-2  ,  -5,  1.555555555553E)
-ic(C1, -1.3888888888865301516E-3  , -10, -1.6C16C16C14199)
-ic(C2,  2.4801587269650015769E-5  , -16,  1.A01A01971CAEB)
-ic(C3, -2.7557304623183959811E-7  , -22, -1.27E4F1314AD1A)
-ic(C4,  2.0873958177697780076E-9  , -29,  1.1EE3B60DDDC8C)
-ic(C5, -1.1250289076471311557E-11 , -37, -1.8BD5986B2A52E)
-
-#ifdef vccast
-#define	C0	vccast(C0)
-#define	C1	vccast(C1)
-#define	C2	vccast(C2)
-#define	C3	vccast(C3)
-#define	C4	vccast(C4)
-#define	C5	vccast(C5)
-#endif
-
-#define cos__C(z)	(z*z*(C0+z*(C1+z*(C2+z*(C3+z*(C4+z*C5))))))
diff --git a/lib/libm/shlib_version b/lib/libm/shlib_version
deleted file mode 100644
index 1007cd9b3..000000000
--- a/lib/libm/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.14 2014/10/10 00:48:18 christos Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=0
-minor=11
diff --git a/lib/libm/src/b_exp.c b/lib/libm/src/b_exp.c
deleted file mode 100644
index a9e3cc31f..000000000
--- a/lib/libm/src/b_exp.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*	$NetBSD: b_exp.c,v 1.1 2012/05/05 17:54:14 christos Exp $	*/
-
-/*
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-/* @(#)exp.c	8.1 (Berkeley) 6/4/93 */
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: release/9.0.0/lib/msun/bsdsrc/b_exp.c 176449 2008-02-22 02:26:51Z das $");
-#else
-__RCSID("$NetBSD: b_exp.c,v 1.1 2012/05/05 17:54:14 christos Exp $");
-#endif
-
-
-/* EXP(X)
- * RETURN THE EXPONENTIAL OF X
- * DOUBLE PRECISION (IEEE 53 bits, VAX D FORMAT 56 BITS)
- * CODED IN C BY K.C. NG, 1/19/85;
- * REVISED BY K.C. NG on 2/6/85, 2/15/85, 3/7/85, 3/24/85, 4/16/85, 6/14/86.
- *
- * Required system supported functions:
- *	scalb(x,n)
- *	copysign(x,y)
- *	finite(x)
- *
- * Method:
- *	1. Argument Reduction: given the input x, find r and integer k such
- *	   that
- *	                   x = k*ln2 + r,  |r| <= 0.5*ln2 .
- *	   r will be represented as r := z+c for better accuracy.
- *
- *	2. Compute exp(r) by
- *
- *		exp(r) = 1 + r + r*R1/(2-R1),
- *	   where
- *		R1 = x - x^2*(p1+x^2*(p2+x^2*(p3+x^2*(p4+p5*x^2)))).
- *
- *	3. exp(x) = 2^k * exp(r) .
- *
- * Special cases:
- *	exp(INF) is INF, exp(NaN) is NaN;
- *	exp(-INF)=  0;
- *	for finite argument, only exp(0)=1 is exact.
- *
- * Accuracy:
- *	exp(x) returns the exponential of x nearly rounded. In a test run
- *	with 1,156,000 random arguments on a VAX, the maximum observed
- *	error was 0.869 ulps (units in the last place).
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double p1 = 0x1.555555555553ep-3;
-static const double p2 = -0x1.6c16c16bebd93p-9;
-static const double p3 = 0x1.1566aaf25de2cp-14;
-static const double p4 = -0x1.bbd41c5d26bf1p-20;
-static const double p5 = 0x1.6376972bea4d0p-25;
-static const double ln2hi = 0x1.62e42fee00000p-1;
-static const double ln2lo = 0x1.a39ef35793c76p-33;
-static const double lnhuge = 0x1.6602b15b7ecf2p9;
-static const double lntiny = -0x1.77af8ebeae354p9;
-static const double invln2 = 0x1.71547652b82fep0;
-
-/* returns exp(r = x + c) for |c| < |x| with no overlap.  */
-
-double
-__exp__D(double x, double c)
-{
-	double  z,hi,lo;
-	int k;
-
-	if (x != x)	/* x is NaN */
-		return(x);
-	if ( x <= lnhuge ) {
-		if ( x >= lntiny ) {
-
-		    /* argument reduction : x --> x - k*ln2 */
-			z = invln2*x;
-			k = z + copysign(.5, x);
-
-		    /* express (x+c)-k*ln2 as hi-lo and let x=hi-lo rounded */
-
-			hi=(x-k*ln2hi);			/* Exact. */
-			x= hi - (lo = k*ln2lo-c);
-		    /* return 2^k*[1+x+x*c/(2+c)]  */
-			z=x*x;
-			c= x - z*(p1+z*(p2+z*(p3+z*(p4+z*p5))));
-			c = (x*c)/(2.0-c);
-
-			return  scalb(1.+(hi-(lo - c)), k);
-		}
-		/* end of x > lntiny */
-
-		else
-		     /* exp(-big#) underflows to zero */
-		     if(finite(x))  return(scalb(1.0,-5000));
-
-		     /* exp(-INF) is zero */
-		     else return(0.0);
-	}
-	/* end of x < lnhuge */
-
-	else
-	/* exp(INF) is INF, exp(+big#) overflows to INF */
-	    return( finite(x) ?  scalb(1.0,5000)  : x);
-}
diff --git a/lib/libm/src/b_log.c b/lib/libm/src/b_log.c
deleted file mode 100644
index 6afc31762..000000000
--- a/lib/libm/src/b_log.c
+++ /dev/null
@@ -1,406 +0,0 @@
-/*	$NetBSD: b_log.c,v 1.1 2012/05/05 17:54:14 christos Exp $	*/
-
-/*
- * 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.
- * 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.
- */
-
-/* @(#)log.c	8.2 (Berkeley) 11/30/93 */
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: release/9.0.0/lib/msun/bsdsrc/b_log.c 176449 2008-02-22 02:26:51Z das $");
-#else
-__RCSID("$NetBSD: b_log.c,v 1.1 2012/05/05 17:54:14 christos Exp $");
-#endif
-
-#include <errno.h>
-#include "math.h"
-#include "math_private.h"
-
-/* Table-driven natural logarithm.
- *
- * This code was derived, with minor modifications, from:
- *	Peter Tang, "Table-Driven Implementation of the
- *	Logarithm in IEEE Floating-Point arithmetic." ACM Trans.
- *	Math Software, vol 16. no 4, pp 378-400, Dec 1990).
- *
- * Calculates log(2^m*F*(1+f/F)), |f/j| <= 1/256,
- * where F = j/128 for j an integer in [0, 128].
- *
- * log(2^m) = log2_hi*m + log2_tail*m
- * since m is an integer, the dominant term is exact.
- * m has at most 10 digits (for subnormal numbers),
- * and log2_hi has 11 trailing zero bits.
- *
- * log(F) = logF_hi[j] + logF_lo[j] is in tabular form in log_table.h
- * logF_hi[] + 512 is exact.
- *
- * log(1+f/F) = 2*f/(2*F + f) + 1/12 * (2*f/(2*F + f))**3 + ...
- * the leading term is calculated to extra precision in two
- * parts, the larger of which adds exactly to the dominant
- * m and F terms.
- * There are two cases:
- *	1. when m, j are non-zero (m | j), use absolute
- *	   precision for the leading term.
- *	2. when m = j = 0, |1-x| < 1/256, and log(x) ~= (x-1).
- *	   In this case, use a relative precision of 24 bits.
- * (This is done differently in the original paper)
- *
- * Special cases:
- *	0	return signalling -Inf
- *	neg	return signalling NaN
- *	+Inf	return +Inf
-*/
-
-#define N 128
-
-/* Table of log(Fj) = logF_head[j] + logF_tail[j], for Fj = 1+j/128.
- * Used for generation of extend precision logarithms.
- * The constant 35184372088832 is 2^45, so the divide is exact.
- * It ensures correct reading of logF_head, even for inaccurate
- * decimal-to-binary conversion routines.  (Everybody gets the
- * right answer for integers less than 2^53.)
- * Values for log(F) were generated using error < 10^-57 absolute
- * with the bc -l package.
-*/
-static const double	A1 = 	  .08333333333333178827;
-static const double	A2 = 	  .01250000000377174923;
-static const double	A3 =	 .002232139987919447809;
-static const double	A4 =	.0004348877777076145742;
-
-static const double logF_head[N+1] = {
-	0.,
-	.007782140442060381246,
-	.015504186535963526694,
-	.023167059281547608406,
-	.030771658666765233647,
-	.038318864302141264488,
-	.045809536031242714670,
-	.053244514518837604555,
-	.060624621816486978786,
-	.067950661908525944454,
-	.075223421237524235039,
-	.082443669210988446138,
-	.089612158689760690322,
-	.096729626458454731618,
-	.103796793681567578460,
-	.110814366340264314203,
-	.117783035656430001836,
-	.124703478501032805070,
-	.131576357788617315236,
-	.138402322859292326029,
-	.145182009844575077295,
-	.151916042025732167530,
-	.158605030176659056451,
-	.165249572895390883786,
-	.171850256926518341060,
-	.178407657472689606947,
-	.184922338493834104156,
-	.191394852999565046047,
-	.197825743329758552135,
-	.204215541428766300668,
-	.210564769107350002741,
-	.216873938300523150246,
-	.223143551314024080056,
-	.229374101064877322642,
-	.235566071312860003672,
-	.241719936886966024758,
-	.247836163904594286577,
-	.253915209980732470285,
-	.259957524436686071567,
-	.265963548496984003577,
-	.271933715484010463114,
-	.277868451003087102435,
-	.283768173130738432519,
-	.289633292582948342896,
-	.295464212893421063199,
-	.301261330578199704177,
-	.307025035294827830512,
-	.312755710004239517729,
-	.318453731118097493890,
-	.324119468654316733591,
-	.329753286372579168528,
-	.335355541920762334484,
-	.340926586970454081892,
-	.346466767346100823488,
-	.351976423156884266063,
-	.357455888922231679316,
-	.362905493689140712376,
-	.368325561158599157352,
-	.373716409793814818840,
-	.379078352934811846353,
-	.384411698910298582632,
-	.389716751140440464951,
-	.394993808240542421117,
-	.400243164127459749579,
-	.405465108107819105498,
-	.410659924985338875558,
-	.415827895143593195825,
-	.420969294644237379543,
-	.426084395310681429691,
-	.431173464818130014464,
-	.436236766774527495726,
-	.441274560805140936281,
-	.446287102628048160113,
-	.451274644139630254358,
-	.456237433481874177232,
-	.461175715122408291790,
-	.466089729924533457960,
-	.470979715219073113985,
-	.475845904869856894947,
-	.480688529345570714212,
-	.485507815781602403149,
-	.490303988045525329653,
-	.495077266798034543171,
-	.499827869556611403822,
-	.504556010751912253908,
-	.509261901790523552335,
-	.513945751101346104405,
-	.518607764208354637958,
-	.523248143765158602036,
-	.527867089620485785417,
-	.532464798869114019908,
-	.537041465897345915436,
-	.541597282432121573947,
-	.546132437597407260909,
-	.550647117952394182793,
-	.555141507540611200965,
-	.559615787935399566777,
-	.564070138285387656651,
-	.568504735352689749561,
-	.572919753562018740922,
-	.577315365035246941260,
-	.581691739635061821900,
-	.586049045003164792433,
-	.590387446602107957005,
-	.594707107746216934174,
-	.599008189645246602594,
-	.603290851438941899687,
-	.607555250224322662688,
-	.611801541106615331955,
-	.616029877215623855590,
-	.620240409751204424537,
-	.624433288012369303032,
-	.628608659422752680256,
-	.632766669570628437213,
-	.636907462236194987781,
-	.641031179420679109171,
-	.645137961373620782978,
-	.649227946625615004450,
-	.653301272011958644725,
-	.657358072709030238911,
-	.661398482245203922502,
-	.665422632544505177065,
-	.669430653942981734871,
-	.673422675212350441142,
-	.677398823590920073911,
-	.681359224807238206267,
-	.685304003098281100392,
-	.689233281238557538017,
-	.693147180560117703862
-};
-
-static const double logF_tail[N+1] = {
-	0.,
-	-.00000000000000543229938420049,
-	 .00000000000000172745674997061,
-	-.00000000000001323017818229233,
-	-.00000000000001154527628289872,
-	-.00000000000000466529469958300,
-	 .00000000000005148849572685810,
-	-.00000000000002532168943117445,
-	-.00000000000005213620639136504,
-	-.00000000000001819506003016881,
-	 .00000000000006329065958724544,
-	 .00000000000008614512936087814,
-	-.00000000000007355770219435028,
-	 .00000000000009638067658552277,
-	 .00000000000007598636597194141,
-	 .00000000000002579999128306990,
-	-.00000000000004654729747598444,
-	-.00000000000007556920687451336,
-	 .00000000000010195735223708472,
-	-.00000000000017319034406422306,
-	-.00000000000007718001336828098,
-	 .00000000000010980754099855238,
-	-.00000000000002047235780046195,
-	-.00000000000008372091099235912,
-	 .00000000000014088127937111135,
-	 .00000000000012869017157588257,
-	 .00000000000017788850778198106,
-	 .00000000000006440856150696891,
-	 .00000000000016132822667240822,
-	-.00000000000007540916511956188,
-	-.00000000000000036507188831790,
-	 .00000000000009120937249914984,
-	 .00000000000018567570959796010,
-	-.00000000000003149265065191483,
-	-.00000000000009309459495196889,
-	 .00000000000017914338601329117,
-	-.00000000000001302979717330866,
-	 .00000000000023097385217586939,
-	 .00000000000023999540484211737,
-	 .00000000000015393776174455408,
-	-.00000000000036870428315837678,
-	 .00000000000036920375082080089,
-	-.00000000000009383417223663699,
-	 .00000000000009433398189512690,
-	 .00000000000041481318704258568,
-	-.00000000000003792316480209314,
-	 .00000000000008403156304792424,
-	-.00000000000034262934348285429,
-	 .00000000000043712191957429145,
-	-.00000000000010475750058776541,
-	-.00000000000011118671389559323,
-	 .00000000000037549577257259853,
-	 .00000000000013912841212197565,
-	 .00000000000010775743037572640,
-	 .00000000000029391859187648000,
-	-.00000000000042790509060060774,
-	 .00000000000022774076114039555,
-	 .00000000000010849569622967912,
-	-.00000000000023073801945705758,
-	 .00000000000015761203773969435,
-	 .00000000000003345710269544082,
-	-.00000000000041525158063436123,
-	 .00000000000032655698896907146,
-	-.00000000000044704265010452446,
-	 .00000000000034527647952039772,
-	-.00000000000007048962392109746,
-	 .00000000000011776978751369214,
-	-.00000000000010774341461609578,
-	 .00000000000021863343293215910,
-	 .00000000000024132639491333131,
-	 .00000000000039057462209830700,
-	-.00000000000026570679203560751,
-	 .00000000000037135141919592021,
-	-.00000000000017166921336082431,
-	-.00000000000028658285157914353,
-	-.00000000000023812542263446809,
-	 .00000000000006576659768580062,
-	-.00000000000028210143846181267,
-	 .00000000000010701931762114254,
-	 .00000000000018119346366441110,
-	 .00000000000009840465278232627,
-	-.00000000000033149150282752542,
-	-.00000000000018302857356041668,
-	-.00000000000016207400156744949,
-	 .00000000000048303314949553201,
-	-.00000000000071560553172382115,
-	 .00000000000088821239518571855,
-	-.00000000000030900580513238244,
-	-.00000000000061076551972851496,
-	 .00000000000035659969663347830,
-	 .00000000000035782396591276383,
-	-.00000000000046226087001544578,
-	 .00000000000062279762917225156,
-	 .00000000000072838947272065741,
-	 .00000000000026809646615211673,
-	-.00000000000010960825046059278,
-	 .00000000000002311949383800537,
-	-.00000000000058469058005299247,
-	-.00000000000002103748251144494,
-	-.00000000000023323182945587408,
-	-.00000000000042333694288141916,
-	-.00000000000043933937969737844,
-	 .00000000000041341647073835565,
-	 .00000000000006841763641591466,
-	 .00000000000047585534004430641,
-	 .00000000000083679678674757695,
-	-.00000000000085763734646658640,
-	 .00000000000021913281229340092,
-	-.00000000000062242842536431148,
-	-.00000000000010983594325438430,
-	 .00000000000065310431377633651,
-	-.00000000000047580199021710769,
-	-.00000000000037854251265457040,
-	 .00000000000040939233218678664,
-	 .00000000000087424383914858291,
-	 .00000000000025218188456842882,
-	-.00000000000003608131360422557,
-	-.00000000000050518555924280902,
-	 .00000000000078699403323355317,
-	-.00000000000067020876961949060,
-	 .00000000000016108575753932458,
-	 .00000000000058527188436251509,
-	-.00000000000035246757297904791,
-	-.00000000000018372084495629058,
-	 .00000000000088606689813494916,
-	 .00000000000066486268071468700,
-	 .00000000000063831615170646519,
-	 .00000000000025144230728376072,
-	-.00000000000017239444525614834
-};
-
-/*
- * Extra precision variant, returning struct {double a, b;};
- * log(x) = a+b to 63 bits, with a rounded to 26 bits.
- */
-struct Double
-__log__D(double x)
-{
-	int m, j;
-	double F, f, g, q, u, v, u2;
-	volatile double u1;
-	struct Double r;
-
-	/* Argument reduction: 1 <= g < 2; x/2^m = g;	*/
-	/* y = F*(1 + f/F) for |f| <= 2^-8		*/
-
-	m = logb(x);
-	g = ldexp(x, -m);
-	if (m == -1022) {
-		j = logb(g), m += j;
-		g = ldexp(g, -j);
-	}
-	j = N*(g-1) + .5;
-	F = (1.0/N) * j + 1;
-	f = g - F;
-
-	g = 1/(2*F+f);
-	u = 2*f*g;
-	v = u*u;
-	q = u*v*(A1 + v*(A2 + v*(A3 + v*A4)));
-	if (m | j)
-		u1 = u + 513, u1 -= 513;
-	else
-		u1 = u, TRUNC(u1);
-	u2 = (2.0*(f - F*u1) - u1*f) * g;
-
-	u1 += m*logF_head[N] + logF_head[j];
-
-	u2 +=  logF_tail[j]; u2 += q;
-	u2 += logF_tail[N]*m;
-	r.a = u1 + u2;			/* Only difference is here */
-	TRUNC(r.a);
-	r.b = (u1 - r.a) + u2;
-	return (r);
-}
diff --git a/lib/libm/src/b_tgamma.c b/lib/libm/src/b_tgamma.c
deleted file mode 100644
index 448074958..000000000
--- a/lib/libm/src/b_tgamma.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/*	$NetBSD: b_tgamma.c,v 1.1 2012/05/05 17:54:14 christos Exp $	*/
-
-/*-
- * 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.
- * 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.
- */
-
-/* @(#)gamma.c	8.1 (Berkeley) 6/4/93 */
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: release/9.0.0/lib/msun/bsdsrc/b_tgamma.c 176449 2008-02-22 02:26:51Z das $");
-#else
-__RCSID("$NetBSD: b_tgamma.c,v 1.1 2012/05/05 17:54:14 christos Exp $");
-#endif
-
-/*
- * This code by P. McIlroy, Oct 1992;
- *
- * The financial support of UUNET Communications Services is greatfully
- * acknowledged.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-/* METHOD:
- * x < 0: Use reflection formula, G(x) = pi/(sin(pi*x)*x*G(x))
- * 	At negative integers, return NaN and raise invalid.
- *
- * x < 6.5:
- *	Use argument reduction G(x+1) = xG(x) to reach the
- *	range [1.066124,2.066124].  Use a rational
- *	approximation centered at the minimum (x0+1) to
- *	ensure monotonicity.
- *
- * x >= 6.5: Use the asymptotic approximation (Stirling's formula)
- *	adjusted for equal-ripples:
- *
- *	log(G(x)) ~= (x-.5)*(log(x)-1) + .5(log(2*pi)-1) + 1/x*P(1/(x*x))
- *
- *	Keep extra precision in multiplying (x-.5)(log(x)-1), to
- *	avoid premature round-off.
- *
- * Special values:
- *	-Inf:			return NaN and raise invalid;
- *	negative integer:	return NaN and raise invalid;
- *	other x ~< 177.79:	return +-0 and raise underflow;
- *	+-0:			return +-Inf and raise divide-by-zero;
- *	finite x ~> 171.63:	return +Inf and raise overflow;
- *	+Inf:			return +Inf;
- *	NaN: 			return NaN.
- *
- * Accuracy: tgamma(x) is accurate to within
- *	x > 0:  error provably < 0.9ulp.
- *	Maximum observed in 1,000,000 trials was .87ulp.
- *	x < 0:
- *	Maximum observed error < 4ulp in 1,000,000 trials.
- */
-
-static double neg_gam(double);
-static double small_gam(double);
-static double smaller_gam(double);
-static struct Double large_gam(double);
-static struct Double ratfun_gam(double, double);
-
-/*
- * Rational approximation, A0 + x*x*P(x)/Q(x), on the interval
- * [1.066.., 2.066..] accurate to 4.25e-19.
- */
-#define LEFT -.3955078125	/* left boundary for rat. approx */
-#define x0 .461632144968362356785	/* xmin - 1 */
-
-#define a0_hi 0.88560319441088874992
-#define a0_lo -.00000000000000004996427036469019695
-#define P0	 6.21389571821820863029017800727e-01
-#define P1	 2.65757198651533466104979197553e-01
-#define P2	 5.53859446429917461063308081748e-03
-#define P3	 1.38456698304096573887145282811e-03
-#define P4	 2.40659950032711365819348969808e-03
-#define Q0	 1.45019531250000000000000000000e+00
-#define Q1	 1.06258521948016171343454061571e+00
-#define Q2	-2.07474561943859936441469926649e-01
-#define Q3	-1.46734131782005422506287573015e-01
-#define Q4	 3.07878176156175520361557573779e-02
-#define Q5	 5.12449347980666221336054633184e-03
-#define Q6	-1.76012741431666995019222898833e-03
-#define Q7	 9.35021023573788935372153030556e-05
-#define Q8	 6.13275507472443958924745652239e-06
-/*
- * Constants for large x approximation (x in [6, Inf])
- * (Accurate to 2.8*10^-19 absolute)
- */
-#define lns2pi_hi 0.418945312500000
-#define lns2pi_lo -.000006779295327258219670263595
-#define Pa0	 8.33333333333333148296162562474e-02
-#define Pa1	-2.77777777774548123579378966497e-03
-#define Pa2	 7.93650778754435631476282786423e-04
-#define Pa3	-5.95235082566672847950717262222e-04
-#define Pa4	 8.41428560346653702135821806252e-04
-#define Pa5	-1.89773526463879200348872089421e-03
-#define Pa6	 5.69394463439411649408050664078e-03
-#define Pa7	-1.44705562421428915453880392761e-02
-
-static const double zero = 0., one = 1.0, tiny = 1e-300;
-
-double
-tgamma(double x)
-{
-	struct Double u;
-
-	if (x >= 6) {
-		if(x > 171.63)
-			return (x / zero);
-		u = large_gam(x);
-		return(__exp__D(u.a, u.b));
-	} else if (x >= 1.0 + LEFT + x0)
-		return (small_gam(x));
-	else if (x > 1.e-17)
-		return (smaller_gam(x));
-	else if (x > -1.e-17) {
-		if (x != 0.0)
-			u.a = one - tiny;	/* raise inexact */
-		return (one/x);
-	} else if (!finite(x))
-		return (x - x);		/* x is NaN or -Inf */
-	else
-		return (neg_gam(x));
-}
-/*
- * Accurate to max(ulp(1/128) absolute, 2^-66 relative) error.
- */
-static struct Double
-large_gam(double x)
-{
-	double z, p;
-	struct Double t, u, v;
-
-	z = one/(x*x);
-	p = Pa0+z*(Pa1+z*(Pa2+z*(Pa3+z*(Pa4+z*(Pa5+z*(Pa6+z*Pa7))))));
-	p = p/x;
-
-	u = __log__D(x);
-	u.a -= one;
-	v.a = (x -= .5);
-	TRUNC(v.a);
-	v.b = x - v.a;
-	t.a = v.a*u.a;			/* t = (x-.5)*(log(x)-1) */
-	t.b = v.b*u.a + x*u.b;
-	/* return t.a + t.b + lns2pi_hi + lns2pi_lo + p */
-	t.b += lns2pi_lo; t.b += p;
-	u.a = lns2pi_hi + t.b; u.a += t.a;
-	u.b = t.a - u.a;
-	u.b += lns2pi_hi; u.b += t.b;
-	return (u);
-}
-/*
- * Good to < 1 ulp.  (provably .90 ulp; .87 ulp on 1,000,000 runs.)
- * It also has correct monotonicity.
- */
-static double
-small_gam(double x)
-{
-	double y, ym1, t;
-	struct Double yy, r;
-	y = x - one;
-	ym1 = y - one;
-	if (y <= 1.0 + (LEFT + x0)) {
-		yy = ratfun_gam(y - x0, 0);
-		return (yy.a + yy.b);
-	}
-	r.a = y;
-	TRUNC(r.a);
-	yy.a = r.a - one;
-	y = ym1;
-	yy.b = r.b = y - yy.a;
-	/* Argument reduction: G(x+1) = x*G(x) */
-	for (ym1 = y-one; ym1 > LEFT + x0; y = ym1--, yy.a--) {
-		t = r.a*yy.a;
-		r.b = r.a*yy.b + y*r.b;
-		r.a = t;
-		TRUNC(r.a);
-		r.b += (t - r.a);
-	}
-	/* Return r*tgamma(y). */
-	yy = ratfun_gam(y - x0, 0);
-	y = r.b*(yy.a + yy.b) + r.a*yy.b;
-	y += yy.a*r.a;
-	return (y);
-}
-/*
- * Good on (0, 1+x0+LEFT].  Accurate to 1ulp.
- */
-static double
-smaller_gam(double x)
-{
-	double t, d;
-	struct Double r, xx;
-	if (x < x0 + LEFT) {
-		t = x, TRUNC(t);
-		d = (t+x)*(x-t);
-		t *= t;
-		xx.a = (t + x), TRUNC(xx.a);
-		xx.b = x - xx.a; xx.b += t; xx.b += d;
-		t = (one-x0); t += x;
-		d = (one-x0); d -= t; d += x;
-		x = xx.a + xx.b;
-	} else {
-		xx.a =  x, TRUNC(xx.a);
-		xx.b = x - xx.a;
-		t = x - x0;
-		d = (-x0 -t); d += x;
-	}
-	r = ratfun_gam(t, d);
-	d = r.a/x, TRUNC(d);
-	r.a -= d*xx.a; r.a -= d*xx.b; r.a += r.b;
-	return (d + r.a/x);
-}
-/*
- * returns (z+c)^2 * P(z)/Q(z) + a0
- */
-static struct Double
-ratfun_gam(double z, double c)
-{
-	double p, q;
-	struct Double r, t;
-
-	q = Q0 +z*(Q1+z*(Q2+z*(Q3+z*(Q4+z*(Q5+z*(Q6+z*(Q7+z*Q8)))))));
-	p = P0 + z*(P1 + z*(P2 + z*(P3 + z*P4)));
-
-	/* return r.a + r.b = a0 + (z+c)^2*p/q, with r.a truncated to 26 bits. */
-	p = p/q;
-	t.a = z, TRUNC(t.a);		/* t ~= z + c */
-	t.b = (z - t.a) + c;
-	t.b *= (t.a + z);
-	q = (t.a *= t.a);		/* t = (z+c)^2 */
-	TRUNC(t.a);
-	t.b += (q - t.a);
-	r.a = p, TRUNC(r.a);		/* r = P/Q */
-	r.b = p - r.a;
-	t.b = t.b*p + t.a*r.b + a0_lo;
-	t.a *= r.a;			/* t = (z+c)^2*(P/Q) */
-	r.a = t.a + a0_hi, TRUNC(r.a);
-	r.b = ((a0_hi-r.a) + t.a) + t.b;
-	return (r);			/* r = a0 + t */
-}
-
-static double
-neg_gam(double x)
-{
-	int sgn = 1;
-	struct Double lg, lsine;
-	double y, z;
-
-	y = ceil(x);
-	if (y == x)		/* Negative integer. */
-		return ((x - x) / zero);
-	z = y - x;
-	if (z > 0.5)
-		z = one - z;
-	y = 0.5 * y;
-	if (y == ceil(y))
-		sgn = -1;
-	if (z < .25)
-		z = sin(M_PI*z);
-	else
-		z = cos(M_PI*(0.5-z));
-	/* Special case: G(1-x) = Inf; G(x) may be nonzero. */
-	if (x < -170) {
-		if (x < -190)
-			return ((double)sgn*tiny*tiny);
-		y = one - x;		/* exact: 128 < |x| < 255 */
-		lg = large_gam(y);
-		lsine = __log__D(M_PI/z);	/* = TRUNC(log(u)) + small */
-		lg.a -= lsine.a;		/* exact (opposite signs) */
-		lg.b -= lsine.b;
-		y = -(lg.a + lg.b);
-		z = (y + lg.a) + lg.b;
-		y = __exp__D(y, z);
-		if (sgn < 0) y = -y;
-		return (y);
-	}
-	y = one-x;
-	if (one-y == x)
-		y = tgamma(y);
-	else		/* 1-x is inexact */
-		y = -x*tgamma(-x);
-	if (sgn < 0) y = -y;
-	return (M_PI / (y*z));
-}
diff --git a/lib/libm/src/e_acos.c b/lib/libm/src/e_acos.c
deleted file mode 100644
index 5bec66416..000000000
--- a/lib/libm/src/e_acos.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* @(#)e_acos.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_acos.c,v 1.12 2002/05/26 22:01:47 wiz Exp $");
-#endif
-
-/* __ieee754_acos(x)
- * Method :
- *	acos(x)  = pi/2 - asin(x)
- *	acos(-x) = pi/2 + asin(x)
- * For |x|<=0.5
- *	acos(x) = pi/2 - (x + x*x^2*R(x^2))	(see asin.c)
- * For x>0.5
- * 	acos(x) = pi/2 - (pi/2 - 2asin(sqrt((1-x)/2)))
- *		= 2asin(sqrt((1-x)/2))
- *		= 2s + 2s*z*R(z) 	...z=(1-x)/2, s=sqrt(z)
- *		= 2f + (2c + 2s*z*R(z))
- *     where f=hi part of s, and c = (z-f*f)/(s+f) is the correction term
- *     for f so that f+c ~ sqrt(z).
- * For x<-0.5
- *	acos(x) = pi - 2asin(sqrt((1-|x|)/2))
- *		= pi - 0.5*(s+s*z*R(z)), where z=(1-|x|)/2,s=sqrt(z)
- *
- * Special cases:
- *	if x is NaN, return x itself;
- *	if |x|>1, return NaN with invalid signal.
- *
- * Function needed: __ieee754_sqrt
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-one=  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
-pi =  3.14159265358979311600e+00, /* 0x400921FB, 0x54442D18 */
-pio2_hi =  1.57079632679489655800e+00, /* 0x3FF921FB, 0x54442D18 */
-pio2_lo =  6.12323399573676603587e-17, /* 0x3C91A626, 0x33145C07 */
-pS0 =  1.66666666666666657415e-01, /* 0x3FC55555, 0x55555555 */
-pS1 = -3.25565818622400915405e-01, /* 0xBFD4D612, 0x03EB6F7D */
-pS2 =  2.01212532134862925881e-01, /* 0x3FC9C155, 0x0E884455 */
-pS3 = -4.00555345006794114027e-02, /* 0xBFA48228, 0xB5688F3B */
-pS4 =  7.91534994289814532176e-04, /* 0x3F49EFE0, 0x7501B288 */
-pS5 =  3.47933107596021167570e-05, /* 0x3F023DE1, 0x0DFDF709 */
-qS1 = -2.40339491173441421878e+00, /* 0xC0033A27, 0x1C8A2D4B */
-qS2 =  2.02094576023350569471e+00, /* 0x40002AE5, 0x9C598AC8 */
-qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */
-qS4 =  7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */
-
-double
-__ieee754_acos(double x)
-{
-	double z,p,q,r,w,s,c,df;
-	int32_t hx,ix;
-	GET_HIGH_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix>=0x3ff00000) {	/* |x| >= 1 */
-	    u_int32_t lx;
-	    GET_LOW_WORD(lx,x);
-	    if(((ix-0x3ff00000)|lx)==0) {	/* |x|==1 */
-		if(hx>0) return 0.0;		/* acos(1) = 0  */
-		else return pi+2.0*pio2_lo;	/* acos(-1)= pi */
-	    }
-	    return (x-x)/(x-x);		/* acos(|x|>1) is NaN */
-	}
-	if(ix<0x3fe00000) {	/* |x| < 0.5 */
-	    if(ix<=0x3c600000) return pio2_hi+pio2_lo;/*if|x|<2**-57*/
-	    z = x*x;
-	    p = z*(pS0+z*(pS1+z*(pS2+z*(pS3+z*(pS4+z*pS5)))));
-	    q = one+z*(qS1+z*(qS2+z*(qS3+z*qS4)));
-	    r = p/q;
-	    return pio2_hi - (x - (pio2_lo-x*r));
-	} else  if (hx<0) {		/* x < -0.5 */
-	    z = (one+x)*0.5;
-	    p = z*(pS0+z*(pS1+z*(pS2+z*(pS3+z*(pS4+z*pS5)))));
-	    q = one+z*(qS1+z*(qS2+z*(qS3+z*qS4)));
-	    s = __ieee754_sqrt(z);
-	    r = p/q;
-	    w = r*s-pio2_lo;
-	    return pi - 2.0*(s+w);
-	} else {			/* x > 0.5 */
-	    z = (one-x)*0.5;
-	    s = __ieee754_sqrt(z);
-	    df = s;
-	    SET_LOW_WORD(df,0);
-	    c  = (z-df*df)/(s+df);
-	    p = z*(pS0+z*(pS1+z*(pS2+z*(pS3+z*(pS4+z*pS5)))));
-	    q = one+z*(qS1+z*(qS2+z*(qS3+z*qS4)));
-	    r = p/q;
-	    w = r*s+c;
-	    return 2.0*(df+w);
-	}
-}
diff --git a/lib/libm/src/e_acosf.c b/lib/libm/src/e_acosf.c
deleted file mode 100644
index 5c7d34470..000000000
--- a/lib/libm/src/e_acosf.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* e_acosf.c -- float version of e_acos.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_acosf.c,v 1.8 2002/05/26 22:01:48 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-one =  1.0000000000e+00, /* 0x3F800000 */
-pi =  3.1415925026e+00, /* 0x40490fda */
-pio2_hi =  1.5707962513e+00, /* 0x3fc90fda */
-pio2_lo =  7.5497894159e-08, /* 0x33a22168 */
-pS0 =  1.6666667163e-01, /* 0x3e2aaaab */
-pS1 = -3.2556581497e-01, /* 0xbea6b090 */
-pS2 =  2.0121252537e-01, /* 0x3e4e0aa8 */
-pS3 = -4.0055535734e-02, /* 0xbd241146 */
-pS4 =  7.9153501429e-04, /* 0x3a4f7f04 */
-pS5 =  3.4793309169e-05, /* 0x3811ef08 */
-qS1 = -2.4033949375e+00, /* 0xc019d139 */
-qS2 =  2.0209457874e+00, /* 0x4001572d */
-qS3 = -6.8828397989e-01, /* 0xbf303361 */
-qS4 =  7.7038154006e-02; /* 0x3d9dc62e */
-
-float
-__ieee754_acosf(float x)
-{
-	float z,p,q,r,w,s,c,df;
-	int32_t hx,ix;
-	GET_FLOAT_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix==0x3f800000) {		/* |x|==1 */
-	    if(hx>0) return 0.0;	/* acos(1) = 0  */
-	    else return pi+(float)2.0*pio2_lo;	/* acos(-1)= pi */
-	} else if(ix>0x3f800000) {	/* |x| >= 1 */
-	    return (x-x)/(x-x);		/* acos(|x|>1) is NaN */
-	}
-	if(ix<0x3f000000) {	/* |x| < 0.5 */
-	    if(ix<=0x23000000) return pio2_hi+pio2_lo;/*if|x|<2**-57*/
-	    z = x*x;
-	    p = z*(pS0+z*(pS1+z*(pS2+z*(pS3+z*(pS4+z*pS5)))));
-	    q = one+z*(qS1+z*(qS2+z*(qS3+z*qS4)));
-	    r = p/q;
-	    return pio2_hi - (x - (pio2_lo-x*r));
-	} else  if (hx<0) {		/* x < -0.5 */
-	    z = (one+x)*(float)0.5;
-	    p = z*(pS0+z*(pS1+z*(pS2+z*(pS3+z*(pS4+z*pS5)))));
-	    q = one+z*(qS1+z*(qS2+z*(qS3+z*qS4)));
-	    s = __ieee754_sqrtf(z);
-	    r = p/q;
-	    w = r*s-pio2_lo;
-	    return pi - (float)2.0*(s+w);
-	} else {			/* x > 0.5 */
-	    int32_t idf;
-	    z = (one-x)*(float)0.5;
-	    s = __ieee754_sqrtf(z);
-	    df = s;
-	    GET_FLOAT_WORD(idf,df);
-	    SET_FLOAT_WORD(df,idf&0xfffff000);
-	    c  = (z-df*df)/(s+df);
-	    p = z*(pS0+z*(pS1+z*(pS2+z*(pS3+z*(pS4+z*pS5)))));
-	    q = one+z*(qS1+z*(qS2+z*(qS3+z*qS4)));
-	    r = p/q;
-	    w = r*s+c;
-	    return (float)2.0*(df+w);
-	}
-}
diff --git a/lib/libm/src/e_acosh.c b/lib/libm/src/e_acosh.c
deleted file mode 100644
index 8259394e4..000000000
--- a/lib/libm/src/e_acosh.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* @(#)e_acosh.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_acosh.c,v 1.12 2002/05/26 22:01:48 wiz Exp $");
-#endif
-
-/* __ieee754_acosh(x)
- * Method :
- *	Based on
- *		acosh(x) = log [ x + sqrt(x*x-1) ]
- *	we have
- *		acosh(x) := log(x)+ln2,	if x is large; else
- *		acosh(x) := log(2x-1/(sqrt(x*x-1)+x)) if x>2; else
- *		acosh(x) := log1p(t+sqrt(2.0*t+t*t)); where t=x-1.
- *
- * Special cases:
- *	acosh(x) is NaN with signal if x<1.
- *	acosh(NaN) is NaN without signal.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-one	= 1.0,
-ln2	= 6.93147180559945286227e-01;  /* 0x3FE62E42, 0xFEFA39EF */
-
-double
-__ieee754_acosh(double x)
-{
-	double t;
-	int32_t hx;
-	u_int32_t lx;
-	EXTRACT_WORDS(hx,lx,x);
-	if(hx<0x3ff00000) {		/* x < 1 */
-	    return (x-x)/(x-x);
-	} else if(hx >=0x41b00000) {	/* x > 2**28 */
-	    if(hx >=0x7ff00000) {	/* x is inf of NaN */
-	        return x+x;
-	    } else
-		return __ieee754_log(x)+ln2;	/* acosh(huge)=log(2x) */
-	} else if(((hx-0x3ff00000)|lx)==0) {
-	    return 0.0;			/* acosh(1) = 0 */
-	} else if (hx > 0x40000000) {	/* 2**28 > x > 2 */
-	    t=x*x;
-	    return __ieee754_log(2.0*x-one/(x+__ieee754_sqrt(t-one)));
-	} else {			/* 1<x<2 */
-	    t = x-one;
-	    return log1p(t+sqrt(2.0*t+t*t));
-	}
-}
diff --git a/lib/libm/src/e_acoshf.c b/lib/libm/src/e_acoshf.c
deleted file mode 100644
index 8725c85fe..000000000
--- a/lib/libm/src/e_acoshf.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* e_acoshf.c -- float version of e_acosh.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_acoshf.c,v 1.8 2002/05/26 22:01:48 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-one	= 1.0,
-ln2	= 6.9314718246e-01;  /* 0x3f317218 */
-
-float
-__ieee754_acoshf(float x)
-{
-	float t;
-	int32_t hx;
-	GET_FLOAT_WORD(hx,x);
-	if(hx<0x3f800000) {		/* x < 1 */
-	    return (x-x)/(x-x);
-	} else if(hx >=0x4d800000) {	/* x > 2**28 */
-	    if(hx >=0x7f800000) {	/* x is inf of NaN */
-	        return x+x;
-	    } else
-		return __ieee754_logf(x)+ln2;	/* acosh(huge)=log(2x) */
-	} else if (hx==0x3f800000) {
-	    return 0.0;			/* acosh(1) = 0 */
-	} else if (hx > 0x40000000) {	/* 2**28 > x > 2 */
-	    t=x*x;
-	    return __ieee754_logf((float)2.0*x-one/(x+__ieee754_sqrtf(t-one)));
-	} else {			/* 1<x<2 */
-	    t = x-one;
-	    return log1pf(t+sqrtf((float)2.0*t+t*t));
-	}
-}
diff --git a/lib/libm/src/e_asin.c b/lib/libm/src/e_asin.c
deleted file mode 100644
index 42672b112..000000000
--- a/lib/libm/src/e_asin.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* @(#)e_asin.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_asin.c,v 1.12 2002/05/26 22:01:48 wiz Exp $");
-#endif
-
-/* __ieee754_asin(x)
- * Method :
- *	Since  asin(x) = x + x^3/6 + x^5*3/40 + x^7*15/336 + ...
- *	we approximate asin(x) on [0,0.5] by
- *		asin(x) = x + x*x^2*R(x^2)
- *	where
- *		R(x^2) is a rational approximation of (asin(x)-x)/x^3
- *	and its remez error is bounded by
- *		|(asin(x)-x)/x^3 - R(x^2)| < 2^(-58.75)
- *
- *	For x in [0.5,1]
- *		asin(x) = pi/2-2*asin(sqrt((1-x)/2))
- *	Let y = (1-x), z = y/2, s := sqrt(z), and pio2_hi+pio2_lo=pi/2;
- *	then for x>0.98
- *		asin(x) = pi/2 - 2*(s+s*z*R(z))
- *			= pio2_hi - (2*(s+s*z*R(z)) - pio2_lo)
- *	For x<=0.98, let pio4_hi = pio2_hi/2, then
- *		f = hi part of s;
- *		c = sqrt(z) - f = (z-f*f)/(s+f) 	...f+c=sqrt(z)
- *	and
- *		asin(x) = pi/2 - 2*(s+s*z*R(z))
- *			= pio4_hi+(pio4-2s)-(2s*z*R(z)-pio2_lo)
- *			= pio4_hi+(pio4-2f)-(2s*z*R(z)-(pio2_lo+2c))
- *
- * Special cases:
- *	if x is NaN, return x itself;
- *	if |x|>1, return NaN with invalid signal.
- *
- */
-
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-one =  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
-huge =  1.000e+300,
-pio2_hi =  1.57079632679489655800e+00, /* 0x3FF921FB, 0x54442D18 */
-pio2_lo =  6.12323399573676603587e-17, /* 0x3C91A626, 0x33145C07 */
-pio4_hi =  7.85398163397448278999e-01, /* 0x3FE921FB, 0x54442D18 */
-	/* coefficient for R(x^2) */
-pS0 =  1.66666666666666657415e-01, /* 0x3FC55555, 0x55555555 */
-pS1 = -3.25565818622400915405e-01, /* 0xBFD4D612, 0x03EB6F7D */
-pS2 =  2.01212532134862925881e-01, /* 0x3FC9C155, 0x0E884455 */
-pS3 = -4.00555345006794114027e-02, /* 0xBFA48228, 0xB5688F3B */
-pS4 =  7.91534994289814532176e-04, /* 0x3F49EFE0, 0x7501B288 */
-pS5 =  3.47933107596021167570e-05, /* 0x3F023DE1, 0x0DFDF709 */
-qS1 = -2.40339491173441421878e+00, /* 0xC0033A27, 0x1C8A2D4B */
-qS2 =  2.02094576023350569471e+00, /* 0x40002AE5, 0x9C598AC8 */
-qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */
-qS4 =  7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */
-
-double
-__ieee754_asin(double x)
-{
-	double t,w,p,q,c,r,s;
-	int32_t hx,ix;
-
-	t = 0;
-	GET_HIGH_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix>= 0x3ff00000) {		/* |x|>= 1 */
-	    u_int32_t lx;
-	    GET_LOW_WORD(lx,x);
-	    if(((ix-0x3ff00000)|lx)==0)
-		    /* asin(1)=+-pi/2 with inexact */
-		return x*pio2_hi+x*pio2_lo;
-	    return (x-x)/(x-x);		/* asin(|x|>1) is NaN */
-	} else if (ix<0x3fe00000) {	/* |x|<0.5 */
-	    if(ix<0x3e400000) {		/* if |x| < 2**-27 */
-		if(huge+x>one) return x;/* return x with inexact if x!=0*/
-	    } else
-		t = x*x;
-		p = t*(pS0+t*(pS1+t*(pS2+t*(pS3+t*(pS4+t*pS5)))));
-		q = one+t*(qS1+t*(qS2+t*(qS3+t*qS4)));
-		w = p/q;
-		return x+x*w;
-	}
-	/* 1> |x|>= 0.5 */
-	w = one-fabs(x);
-	t = w*0.5;
-	p = t*(pS0+t*(pS1+t*(pS2+t*(pS3+t*(pS4+t*pS5)))));
-	q = one+t*(qS1+t*(qS2+t*(qS3+t*qS4)));
-	s = __ieee754_sqrt(t);
-	if(ix>=0x3FEF3333) { 	/* if |x| > 0.975 */
-	    w = p/q;
-	    t = pio2_hi-(2.0*(s+s*w)-pio2_lo);
-	} else {
-	    w  = s;
-	    SET_LOW_WORD(w,0);
-	    c  = (t-w*w)/(s+w);
-	    r  = p/q;
-	    p  = 2.0*s*r-(pio2_lo-2.0*c);
-	    q  = pio4_hi-2.0*w;
-	    t  = pio4_hi-(p-q);
-	}
-	if(hx>0) return t; else return -t;
-}
diff --git a/lib/libm/src/e_asinf.c b/lib/libm/src/e_asinf.c
deleted file mode 100644
index 859e83ee1..000000000
--- a/lib/libm/src/e_asinf.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* e_asinf.c -- float version of e_asin.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_asinf.c,v 1.8 2002/05/26 22:01:48 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-one =  1.0000000000e+00, /* 0x3F800000 */
-huge =  1.000e+30,
-pio2_hi =  1.5707962513e+00, /* 0x3fc90fda */
-pio2_lo =  7.5497894159e-08, /* 0x33a22168 */
-pio4_hi =  7.8539818525e-01, /* 0x3f490fdb */
-	/* coefficient for R(x^2) */
-pS0 =  1.6666667163e-01, /* 0x3e2aaaab */
-pS1 = -3.2556581497e-01, /* 0xbea6b090 */
-pS2 =  2.0121252537e-01, /* 0x3e4e0aa8 */
-pS3 = -4.0055535734e-02, /* 0xbd241146 */
-pS4 =  7.9153501429e-04, /* 0x3a4f7f04 */
-pS5 =  3.4793309169e-05, /* 0x3811ef08 */
-qS1 = -2.4033949375e+00, /* 0xc019d139 */
-qS2 =  2.0209457874e+00, /* 0x4001572d */
-qS3 = -6.8828397989e-01, /* 0xbf303361 */
-qS4 =  7.7038154006e-02; /* 0x3d9dc62e */
-
-float
-__ieee754_asinf(float x)
-{
-	float t,w,p,q,c,r,s;
-	int32_t hx,ix;
-
-	t = 0;
-	GET_FLOAT_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix==0x3f800000) {
-		/* asin(1)=+-pi/2 with inexact */
-	    return x*pio2_hi+x*pio2_lo;
-	} else if(ix> 0x3f800000) {	/* |x|>= 1 */
-	    return (x-x)/(x-x);		/* asin(|x|>1) is NaN */
-	} else if (ix<0x3f000000) {	/* |x|<0.5 */
-	    if(ix<0x32000000) {		/* if |x| < 2**-27 */
-		if(huge+x>one) return x;/* return x with inexact if x!=0*/
-	    } else
-		t = x*x;
-		p = t*(pS0+t*(pS1+t*(pS2+t*(pS3+t*(pS4+t*pS5)))));
-		q = one+t*(qS1+t*(qS2+t*(qS3+t*qS4)));
-		w = p/q;
-		return x+x*w;
-	}
-	/* 1> |x|>= 0.5 */
-	w = one-fabsf(x);
-	t = w*(float)0.5;
-	p = t*(pS0+t*(pS1+t*(pS2+t*(pS3+t*(pS4+t*pS5)))));
-	q = one+t*(qS1+t*(qS2+t*(qS3+t*qS4)));
-	s = __ieee754_sqrtf(t);
-	if(ix>=0x3F79999A) { 	/* if |x| > 0.975 */
-	    w = p/q;
-	    t = pio2_hi-((float)2.0*(s+s*w)-pio2_lo);
-	} else {
-	    int32_t iw;
-	    w  = s;
-	    GET_FLOAT_WORD(iw,w);
-	    SET_FLOAT_WORD(w,iw&0xfffff000);
-	    c  = (t-w*w)/(s+w);
-	    r  = p/q;
-	    p  = (float)2.0*s*r-(pio2_lo-(float)2.0*c);
-	    q  = pio4_hi-(float)2.0*w;
-	    t  = pio4_hi-(p-q);
-	}
-	if(hx>0) return t; else return -t;
-}
diff --git a/lib/libm/src/e_atan2.c b/lib/libm/src/e_atan2.c
deleted file mode 100644
index 08d8f06da..000000000
--- a/lib/libm/src/e_atan2.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* @(#)e_atan2.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_atan2.c,v 1.12 2002/05/26 22:01:48 wiz Exp $");
-#endif
-
-/* __ieee754_atan2(y,x)
- * Method :
- *	1. Reduce y to positive by atan2(y,x)=-atan2(-y,x).
- *	2. Reduce x to positive by (if x and y are unexceptional):
- *		ARG (x+iy) = arctan(y/x)   	   ... if x > 0,
- *		ARG (x+iy) = pi - arctan[y/(-x)]   ... if x < 0,
- *
- * Special cases:
- *
- *	ATAN2((anything), NaN ) is NaN;
- *	ATAN2(NAN , (anything) ) is NaN;
- *	ATAN2(+-0, +(anything but NaN)) is +-0  ;
- *	ATAN2(+-0, -(anything but NaN)) is +-pi ;
- *	ATAN2(+-(anything but 0 and NaN), 0) is +-pi/2;
- *	ATAN2(+-(anything but INF and NaN), +INF) is +-0 ;
- *	ATAN2(+-(anything but INF and NaN), -INF) is +-pi;
- *	ATAN2(+-INF,+INF ) is +-pi/4 ;
- *	ATAN2(+-INF,-INF ) is +-3pi/4;
- *	ATAN2(+-INF, (anything but,0,NaN, and INF)) is +-pi/2;
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following
- * constants. The decimal values may be used, provided that the
- * compiler will convert from decimal to binary accurately enough
- * to produce the hexadecimal values shown.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-tiny  = 1.0e-300,
-zero  = 0.0,
-pi_o_4  = 7.8539816339744827900E-01, /* 0x3FE921FB, 0x54442D18 */
-pi_o_2  = 1.5707963267948965580E+00, /* 0x3FF921FB, 0x54442D18 */
-pi      = 3.1415926535897931160E+00, /* 0x400921FB, 0x54442D18 */
-pi_lo   = 1.2246467991473531772E-16; /* 0x3CA1A626, 0x33145C07 */
-
-double
-__ieee754_atan2(double y, double x)
-{
-	double z;
-	int32_t k,m,hx,hy,ix,iy;
-	u_int32_t lx,ly;
-
-	EXTRACT_WORDS(hx,lx,x);
-	ix = hx&0x7fffffff;
-	EXTRACT_WORDS(hy,ly,y);
-	iy = hy&0x7fffffff;
-	if(((ix|((lx|-lx)>>31))>0x7ff00000)||
-	   ((iy|((ly|-ly)>>31))>0x7ff00000))	/* x or y is NaN */
-	   return x+y;
-	if(((hx-0x3ff00000)|lx)==0) return atan(y);   /* x=1.0 */
-	m = ((hy>>31)&1)|((hx>>30)&2);	/* 2*sign(x)+sign(y) */
-
-    /* when y = 0 */
-	if((iy|ly)==0) {
-	    switch(m) {
-		case 0:
-		case 1: return y; 	/* atan(+-0,+anything)=+-0 */
-		case 2: return  pi+tiny;/* atan(+0,-anything) = pi */
-		case 3: return -pi-tiny;/* atan(-0,-anything) =-pi */
-	    }
-	}
-    /* when x = 0 */
-	if((ix|lx)==0) return (hy<0)?  -pi_o_2-tiny: pi_o_2+tiny;
-
-    /* when x is INF */
-	if(ix==0x7ff00000) {
-	    if(iy==0x7ff00000) {
-		switch(m) {
-		    case 0: return  pi_o_4+tiny;/* atan(+INF,+INF) */
-		    case 1: return -pi_o_4-tiny;/* atan(-INF,+INF) */
-		    case 2: return  3.0*pi_o_4+tiny;/*atan(+INF,-INF)*/
-		    case 3: return -3.0*pi_o_4-tiny;/*atan(-INF,-INF)*/
-		}
-	    } else {
-		switch(m) {
-		    case 0: return  zero  ;	/* atan(+...,+INF) */
-		    case 1: return -zero  ;	/* atan(-...,+INF) */
-		    case 2: return  pi+tiny  ;	/* atan(+...,-INF) */
-		    case 3: return -pi-tiny  ;	/* atan(-...,-INF) */
-		}
-	    }
-	}
-    /* when y is INF */
-	if(iy==0x7ff00000) return (hy<0)? -pi_o_2-tiny: pi_o_2+tiny;
-
-    /* compute y/x */
-	k = (iy-ix)>>20;
-	if(k > 60) z=pi_o_2+0.5*pi_lo; 	/* |y/x| >  2**60 */
-	else if(hx<0&&k<-60) z=0.0; 	/* |y|/x < -2**60 */
-	else z=atan(fabs(y/x));		/* safe to do y/x */
-	switch (m) {
-	    case 0: return       z  ;	/* atan(+,+) */
-	    case 1: {
-	    	      u_int32_t zh;
-		      GET_HIGH_WORD(zh,z);
-		      SET_HIGH_WORD(z,zh ^ 0x80000000);
-		    }
-		    return       z  ;	/* atan(-,+) */
-	    case 2: return  pi-(z-pi_lo);/* atan(+,-) */
-	    default: /* case 3 */
-	    	    return  (z-pi_lo)-pi;/* atan(-,-) */
-	}
-}
diff --git a/lib/libm/src/e_atan2f.c b/lib/libm/src/e_atan2f.c
deleted file mode 100644
index 3dbd3b6cc..000000000
--- a/lib/libm/src/e_atan2f.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* e_atan2f.c -- float version of e_atan2.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_atan2f.c,v 1.7 2002/05/26 22:01:49 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-tiny  = 1.0e-30,
-zero  = 0.0,
-pi_o_4  = 7.8539818525e-01, /* 0x3f490fdb */
-pi_o_2  = 1.5707963705e+00, /* 0x3fc90fdb */
-pi      = 3.1415925026e+00, /* 0x40490fda */
-pi_lo   = 1.5099578832e-07; /* 0x34222168 */
-
-float
-__ieee754_atan2f(float y, float x)
-{
-	float z;
-	int32_t k,m,hx,hy,ix,iy;
-
-	GET_FLOAT_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	GET_FLOAT_WORD(hy,y);
-	iy = hy&0x7fffffff;
-	if((ix>0x7f800000)||
-	   (iy>0x7f800000))	/* x or y is NaN */
-	   return x+y;
-	if(hx==0x3f800000) return atanf(y);   /* x=1.0 */
-	m = ((hy>>31)&1)|((hx>>30)&2);	/* 2*sign(x)+sign(y) */
-
-    /* when y = 0 */
-	if(iy==0) {
-	    switch(m) {
-		case 0:
-		case 1: return y; 	/* atan(+-0,+anything)=+-0 */
-		case 2: return  pi+tiny;/* atan(+0,-anything) = pi */
-		case 3: return -pi-tiny;/* atan(-0,-anything) =-pi */
-	    }
-	}
-    /* when x = 0 */
-	if(ix==0) return (hy<0)?  -pi_o_2-tiny: pi_o_2+tiny;
-
-    /* when x is INF */
-	if(ix==0x7f800000) {
-	    if(iy==0x7f800000) {
-		switch(m) {
-		    case 0: return  pi_o_4+tiny;/* atan(+INF,+INF) */
-		    case 1: return -pi_o_4-tiny;/* atan(-INF,+INF) */
-		    case 2: return  (float)3.0*pi_o_4+tiny;/*atan(+INF,-INF)*/
-		    case 3: return (float)-3.0*pi_o_4-tiny;/*atan(-INF,-INF)*/
-		}
-	    } else {
-		switch(m) {
-		    case 0: return  zero  ;	/* atan(+...,+INF) */
-		    case 1: return -zero  ;	/* atan(-...,+INF) */
-		    case 2: return  pi+tiny  ;	/* atan(+...,-INF) */
-		    case 3: return -pi-tiny  ;	/* atan(-...,-INF) */
-		}
-	    }
-	}
-    /* when y is INF */
-	if(iy==0x7f800000) return (hy<0)? -pi_o_2-tiny: pi_o_2+tiny;
-
-    /* compute y/x */
-	k = (iy-ix)>>23;
-	if(k > 60) z=pi_o_2+(float)0.5*pi_lo; 	/* |y/x| >  2**60 */
-	else if(hx<0&&k<-60) z=0.0; 	/* |y|/x < -2**60 */
-	else z=atanf(fabsf(y/x));	/* safe to do y/x */
-	switch (m) {
-	    case 0: return       z  ;	/* atan(+,+) */
-	    case 1: {
-	    	      u_int32_t zh;
-		      GET_FLOAT_WORD(zh,z);
-		      SET_FLOAT_WORD(z,zh ^ 0x80000000);
-		    }
-		    return       z  ;	/* atan(-,+) */
-	    case 2: return  pi-(z-pi_lo);/* atan(+,-) */
-	    default: /* case 3 */
-	    	    return  (z-pi_lo)-pi;/* atan(-,-) */
-	}
-}
diff --git a/lib/libm/src/e_atanh.c b/lib/libm/src/e_atanh.c
deleted file mode 100644
index 6c0f33159..000000000
--- a/lib/libm/src/e_atanh.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* @(#)e_atanh.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_atanh.c,v 1.11 2002/05/26 22:01:49 wiz Exp $");
-#endif
-
-/* __ieee754_atanh(x)
- * Method :
- *    1.Reduced x to positive by atanh(-x) = -atanh(x)
- *    2.For x>=0.5
- *                  1              2x                          x
- *	atanh(x) = --- * log(1 + -------) = 0.5 * log1p(2 * --------)
- *                  2             1 - x                      1 - x
- *
- * 	For x<0.5
- *	atanh(x) = 0.5*log1p(2x+2x*x/(1-x))
- *
- * Special cases:
- *	atanh(x) is NaN if |x| > 1 with signal;
- *	atanh(NaN) is that NaN with no signal;
- *	atanh(+-1) is +-INF with signal.
- *
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double one = 1.0, huge = 1e300;
-
-static const double zero = 0.0;
-
-double
-__ieee754_atanh(double x)
-{
-	double t;
-	int32_t hx,ix;
-	u_int32_t lx;
-	EXTRACT_WORDS(hx,lx,x);
-	ix = hx&0x7fffffff;
-	if ((ix|((lx|(-lx))>>31))>0x3ff00000) /* |x|>1 */
-	    return (x-x)/(x-x);
-	if(ix==0x3ff00000)
-	    return x/zero;
-	if(ix<0x3e300000&&(huge+x)>zero) return x;	/* x<2**-28 */
-	SET_HIGH_WORD(x,ix);
-	if(ix<0x3fe00000) {		/* x < 0.5 */
-	    t = x+x;
-	    t = 0.5*log1p(t+t*x/(one-x));
-	} else
-	    t = 0.5*log1p((x+x)/(one-x));
-	if(hx>=0) return t; else return -t;
-}
diff --git a/lib/libm/src/e_atanhf.c b/lib/libm/src/e_atanhf.c
deleted file mode 100644
index 5f225f24d..000000000
--- a/lib/libm/src/e_atanhf.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* e_atanhf.c -- float version of e_atanh.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_atanhf.c,v 1.7 2002/05/26 22:01:49 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float one = 1.0, huge = 1e30;
-
-static const float zero = 0.0;
-
-float
-__ieee754_atanhf(float x)
-{
-	float t;
-	int32_t hx,ix;
-	GET_FLOAT_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if (ix>0x3f800000) 		/* |x|>1 */
-	    return (x-x)/(x-x);
-	if(ix==0x3f800000)
-	    return x/zero;
-	if(ix<0x31800000&&(huge+x)>zero) return x;	/* x<2**-28 */
-	SET_FLOAT_WORD(x,ix);
-	if(ix<0x3f000000) {		/* x < 0.5 */
-	    t = x+x;
-	    t = (float)0.5*log1pf(t+t*x/(one-x));
-	} else
-	    t = (float)0.5*log1pf((x+x)/(one-x));
-	if(hx>=0) return t; else return -t;
-}
diff --git a/lib/libm/src/e_cosh.c b/lib/libm/src/e_cosh.c
deleted file mode 100644
index 1e1a8df6e..000000000
--- a/lib/libm/src/e_cosh.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* @(#)e_cosh.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_cosh.c,v 1.11 2002/05/26 22:01:49 wiz Exp $");
-#endif
-
-/* __ieee754_cosh(x)
- * Method :
- * mathematically cosh(x) if defined to be (exp(x)+exp(-x))/2
- *	1. Replace x by |x| (cosh(x) = cosh(-x)).
- *	2.
- *		                                        [ exp(x) - 1 ]^2
- *	    0        <= x <= ln2/2  :  cosh(x) := 1 + -------------------
- *			       			           2*exp(x)
- *
- *		                                  exp(x) +  1/exp(x)
- *	    ln2/2    <= x <= 22     :  cosh(x) := -------------------
- *			       			          2
- *	    22       <= x <= lnovft :  cosh(x) := exp(x)/2
- *	    lnovft   <= x <= ln2ovft:  cosh(x) := exp(x/2)/2 * exp(x/2)
- *	    ln2ovft  <  x	    :  cosh(x) := huge*huge (overflow)
- *
- * Special cases:
- *	cosh(x) is |x| if x is +INF, -INF, or NaN.
- *	only cosh(0)=1 is exact for finite x.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double one = 1.0, half=0.5, huge = 1.0e300;
-
-double
-__ieee754_cosh(double x)
-{
-	double t,w;
-	int32_t ix;
-	u_int32_t lx;
-
-    /* High word of |x|. */
-	GET_HIGH_WORD(ix,x);
-	ix &= 0x7fffffff;
-
-    /* x is INF or NaN */
-	if(ix>=0x7ff00000) return x*x;
-
-    /* |x| in [0,0.5*ln2], return 1+expm1(|x|)^2/(2*exp(|x|)) */
-	if(ix<0x3fd62e43) {
-	    t = expm1(fabs(x));
-	    w = one+t;
-	    if (ix<0x3c800000) return w;	/* cosh(tiny) = 1 */
-	    return one+(t*t)/(w+w);
-	}
-
-    /* |x| in [0.5*ln2,22], return (exp(|x|)+1/exp(|x|)/2; */
-	if (ix < 0x40360000) {
-		t = __ieee754_exp(fabs(x));
-		return half*t+half/t;
-	}
-
-    /* |x| in [22, log(maxdouble)] return half*exp(|x|) */
-	if (ix < 0x40862E42)  return half*__ieee754_exp(fabs(x));
-
-    /* |x| in [log(maxdouble), overflowthresold] */
-	GET_LOW_WORD(lx,x);
-	if (ix<0x408633CE ||
-	      ((ix==0x408633ce)&&(lx<=(u_int32_t)0x8fb9f87d))) {
-	    w = __ieee754_exp(half*fabs(x));
-	    t = half*w;
-	    return t*w;
-	}
-
-    /* |x| > overflowthresold, cosh(x) overflow */
-	return huge*huge;
-}
diff --git a/lib/libm/src/e_coshf.c b/lib/libm/src/e_coshf.c
deleted file mode 100644
index 32d64c7c1..000000000
--- a/lib/libm/src/e_coshf.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* e_coshf.c -- float version of e_cosh.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_coshf.c,v 1.9 2002/05/26 22:01:49 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float huge = 1.0e30;
-static const float one = 1.0, half=0.5;
-
-float
-__ieee754_coshf(float x)
-{
-	float t,w;
-	int32_t ix;
-
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;
-
-    /* x is INF or NaN */
-	if(ix>=0x7f800000) return x*x;
-
-    /* |x| in [0,0.5*ln2], return 1+expm1(|x|)^2/(2*exp(|x|)) */
-	if(ix<0x3eb17218) {
-	    t = expm1f(fabsf(x));
-	    w = one+t;
-	    if (ix<0x24000000) return w;	/* cosh(tiny) = 1 */
-	    return one+(t*t)/(w+w);
-	}
-
-    /* |x| in [0.5*ln2,22], return (exp(|x|)+1/exp(|x|)/2; */
-	if (ix < 0x41b00000) {
-		t = __ieee754_expf(fabsf(x));
-		return half*t+half/t;
-	}
-
-    /* |x| in [22, log(maxdouble)] return half*exp(|x|) */
-	if (ix < 0x42b17180)  return half*__ieee754_expf(fabsf(x));
-
-    /* |x| in [log(maxdouble), overflowthresold] */
-	if (ix<=0x42b2d4fc) {
-	    w = __ieee754_expf(half*fabsf(x));
-	    t = half*w;
-	    return t*w;
-	}
-
-    /* |x| > overflowthresold, cosh(x) overflow */
-	return huge*huge;
-}
diff --git a/lib/libm/src/e_exp.c b/lib/libm/src/e_exp.c
deleted file mode 100644
index 5c28dd6be..000000000
--- a/lib/libm/src/e_exp.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/* @(#)e_exp.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_exp.c,v 1.11 2002/05/26 22:01:49 wiz Exp $");
-#endif
-
-/* __ieee754_exp(x)
- * Returns the exponential of x.
- *
- * Method
- *   1. Argument reduction:
- *      Reduce x to an r so that |r| <= 0.5*ln2 ~ 0.34658.
- *	Given x, find r and integer k such that
- *
- *               x = k*ln2 + r,  |r| <= 0.5*ln2.
- *
- *      Here r will be represented as r = hi-lo for better
- *	accuracy.
- *
- *   2. Approximation of exp(r) by a special rational function on
- *	the interval [0,0.34658]:
- *	Write
- *	    R(r**2) = r*(exp(r)+1)/(exp(r)-1) = 2 + r*r/6 - r**4/360 + ...
- *      We use a special Reme algorithm on [0,0.34658] to generate
- * 	a polynomial of degree 5 to approximate R. The maximum error
- *	of this polynomial approximation is bounded by 2**-59. In
- *	other words,
- *	    R(z) ~ 2.0 + P1*z + P2*z**2 + P3*z**3 + P4*z**4 + P5*z**5
- *  	(where z=r*r, and the values of P1 to P5 are listed below)
- *	and
- *	    |                  5          |     -59
- *	    | 2.0+P1*z+...+P5*z   -  R(z) | <= 2
- *	    |                             |
- *	The computation of exp(r) thus becomes
- *                             2*r
- *		exp(r) = 1 + -------
- *		              R - r
- *                                 r*R1(r)
- *		       = 1 + r + ----------- (for better accuracy)
- *		                  2 - R1(r)
- *	where
- *			         2       4             10
- *		R1(r) = r - (P1*r  + P2*r  + ... + P5*r   ).
- *
- *   3. Scale back to obtain exp(x):
- *	From step 1, we have
- *	   exp(x) = 2^k * exp(r)
- *
- * Special cases:
- *	exp(INF) is INF, exp(NaN) is NaN;
- *	exp(-INF) is 0, and
- *	for finite argument, only exp(0)=1 is exact.
- *
- * Accuracy:
- *	according to an error analysis, the error is always less than
- *	1 ulp (unit in the last place).
- *
- * Misc. info.
- *	For IEEE double
- *	    if x >  7.09782712893383973096e+02 then exp(x) overflow
- *	    if x < -7.45133219101941108420e+02 then exp(x) underflow
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following
- * constants. The decimal values may be used, provided that the
- * compiler will convert from decimal to binary accurately enough
- * to produce the hexadecimal values shown.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-one	= 1.0,
-halF[2]	= {0.5,-0.5,},
-huge	= 1.0e+300,
-twom1000= 9.33263618503218878990e-302,     /* 2**-1000=0x01700000,0*/
-o_threshold=  7.09782712893383973096e+02,  /* 0x40862E42, 0xFEFA39EF */
-u_threshold= -7.45133219101941108420e+02,  /* 0xc0874910, 0xD52D3051 */
-ln2HI[2]   ={ 6.93147180369123816490e-01,  /* 0x3fe62e42, 0xfee00000 */
-	     -6.93147180369123816490e-01,},/* 0xbfe62e42, 0xfee00000 */
-ln2LO[2]   ={ 1.90821492927058770002e-10,  /* 0x3dea39ef, 0x35793c76 */
-	     -1.90821492927058770002e-10,},/* 0xbdea39ef, 0x35793c76 */
-invln2 =  1.44269504088896338700e+00, /* 0x3ff71547, 0x652b82fe */
-P1   =  1.66666666666666019037e-01, /* 0x3FC55555, 0x5555553E */
-P2   = -2.77777777770155933842e-03, /* 0xBF66C16C, 0x16BEBD93 */
-P3   =  6.61375632143793436117e-05, /* 0x3F11566A, 0xAF25DE2C */
-P4   = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */
-P5   =  4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */
-
-
-double
-__ieee754_exp(double x)	/* default IEEE double exp */
-{
-	double y,hi,lo,c,t;
-	int32_t k,xsb;
-	u_int32_t hx;
-
-	hi = lo = 0;
-	k = 0;
-	GET_HIGH_WORD(hx,x);
-	xsb = (hx>>31)&1;		/* sign bit of x */
-	hx &= 0x7fffffff;		/* high word of |x| */
-
-    /* filter out non-finite argument */
-	if(hx >= 0x40862E42) {			/* if |x|>=709.78... */
-            if(hx>=0x7ff00000) {
-	        u_int32_t lx;
-		GET_LOW_WORD(lx,x);
-		if(((hx&0xfffff)|lx)!=0)
-		     return x+x; 		/* NaN */
-		else return (xsb==0)? x:0.0;	/* exp(+-inf)={inf,0} */
-	    }
-	    if(x > o_threshold) return huge*huge; /* overflow */
-	    if(x < u_threshold) return twom1000*twom1000; /* underflow */
-	}
-
-    /* argument reduction */
-	if(hx > 0x3fd62e42) {		/* if  |x| > 0.5 ln2 */
-	    if(hx < 0x3FF0A2B2) {	/* and |x| < 1.5 ln2 */
-		hi = x-ln2HI[xsb]; lo=ln2LO[xsb]; k = 1-xsb-xsb;
-	    } else {
-		k  = invln2*x+halF[xsb];
-		t  = k;
-		hi = x - t*ln2HI[0];	/* t*ln2HI is exact here */
-		lo = t*ln2LO[0];
-	    }
-	    x  = hi - lo;
-	}
-	else if(hx < 0x3e300000)  {	/* when |x|<2**-28 */
-	    if(huge+x>one) return one+x;/* trigger inexact */
-	}
-	else k = 0;
-
-    /* x is now in primary range */
-	t  = x*x;
-	c  = x - t*(P1+t*(P2+t*(P3+t*(P4+t*P5))));
-	if(k==0) 	return one-((x*c)/(c-2.0)-x);
-	else 		y = one-((lo-(x*c)/(2.0-c))-hi);
-	if(k >= -1021) {
-	    u_int32_t hy;
-	    GET_HIGH_WORD(hy,y);
-	    SET_HIGH_WORD(y,hy+(k<<20));	/* add k to y's exponent */
-	    return y;
-	} else {
-	    u_int32_t hy;
-	    GET_HIGH_WORD(hy,y);
-	    SET_HIGH_WORD(y,hy+((k+1000)<<20));	/* add k to y's exponent */
-	    return y*twom1000;
-	}
-}
diff --git a/lib/libm/src/e_expf.c b/lib/libm/src/e_expf.c
deleted file mode 100644
index d598d4ecf..000000000
--- a/lib/libm/src/e_expf.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* e_expf.c -- float version of e_exp.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_expf.c,v 1.9 2002/05/26 22:01:49 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float huge = 1.0e+30;
-
-static const float
-one	= 1.0,
-halF[2]	= {0.5,-0.5,},
-twom100 = 7.8886090522e-31,      /* 2**-100=0x0d800000 */
-o_threshold=  8.8721679688e+01,  /* 0x42b17180 */
-u_threshold= -1.0397208405e+02,  /* 0xc2cff1b5 */
-ln2HI[2]   ={ 6.9313812256e-01,		/* 0x3f317180 */
-	     -6.9313812256e-01,},	/* 0xbf317180 */
-ln2LO[2]   ={ 9.0580006145e-06,  	/* 0x3717f7d1 */
-	     -9.0580006145e-06,},	/* 0xb717f7d1 */
-invln2 =  1.4426950216e+00, 		/* 0x3fb8aa3b */
-P1   =  1.6666667163e-01, /* 0x3e2aaaab */
-P2   = -2.7777778450e-03, /* 0xbb360b61 */
-P3   =  6.6137559770e-05, /* 0x388ab355 */
-P4   = -1.6533901999e-06, /* 0xb5ddea0e */
-P5   =  4.1381369442e-08; /* 0x3331bb4c */
-
-float
-__ieee754_expf(float x)	/* default IEEE double exp */
-{
-	float y,hi,lo,c,t;
-	int32_t k,xsb;
-	u_int32_t hx;
-
-	hi = lo = 0;
-	k = 0;
-	GET_FLOAT_WORD(hx,x);
-	xsb = (hx>>31)&1;		/* sign bit of x */
-	hx &= 0x7fffffff;		/* high word of |x| */
-
-    /* filter out non-finite argument */
-	if(hx >= 0x42b17218) {			/* if |x|>=88.721... */
-	    if(hx>0x7f800000)
-		 return x+x;	 		/* NaN */
-            if(hx==0x7f800000)
-		return (xsb==0)? x:0.0;		/* exp(+-inf)={inf,0} */
-	    if(x > o_threshold) return huge*huge; /* overflow */
-	    if(x < u_threshold) return twom100*twom100; /* underflow */
-	}
-
-    /* argument reduction */
-	if(hx > 0x3eb17218) {		/* if  |x| > 0.5 ln2 */
-	    if(hx < 0x3F851592) {	/* and |x| < 1.5 ln2 */
-		hi = x-ln2HI[xsb]; lo=ln2LO[xsb]; k = 1-xsb-xsb;
-	    } else {
-		k  = invln2*x+halF[xsb];
-		t  = k;
-		hi = x - t*ln2HI[0];	/* t*ln2HI is exact here */
-		lo = t*ln2LO[0];
-	    }
-	    x  = hi - lo;
-	}
-	else if(hx < 0x31800000)  {	/* when |x|<2**-28 */
-	    if(huge+x>one) return one+x;/* trigger inexact */
-	}
-	else k = 0;
-
-    /* x is now in primary range */
-	t  = x*x;
-	c  = x - t*(P1+t*(P2+t*(P3+t*(P4+t*P5))));
-	if(k==0) 	return one-((x*c)/(c-(float)2.0)-x);
-	else 		y = one-((lo-(x*c)/((float)2.0-c))-hi);
-	if(k >= -125) {
-	    u_int32_t hy;
-	    GET_FLOAT_WORD(hy,y);
-	    SET_FLOAT_WORD(y,hy+(k<<23));	/* add k to y's exponent */
-	    return y;
-	} else {
-	    u_int32_t hy;
-	    GET_FLOAT_WORD(hy,y);
-	    SET_FLOAT_WORD(y,hy+((k+100)<<23));	/* add k to y's exponent */
-	    return y*twom100;
-	}
-}
diff --git a/lib/libm/src/e_fmod.c b/lib/libm/src/e_fmod.c
deleted file mode 100644
index b995fceac..000000000
--- a/lib/libm/src/e_fmod.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* @(#)e_fmod.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_fmod.c,v 1.12 2013/11/19 14:02:59 joerg Exp $");
-#endif
-
-/*
- * __ieee754_fmod(x,y)
- * Return x mod y in exact arithmetic
- * Method: shift and subtract
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double one = 1.0, Zero[] = {0.0, -0.0,};
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(__ieee754_fmodl, __ieee754_fmod)
-#endif
-
-double
-__ieee754_fmod(double x, double y)
-{
-	int32_t n,hx,hy,hz,ix,iy,sx,i;
-	u_int32_t lx,ly,lz;
-
-	EXTRACT_WORDS(hx,lx,x);
-	EXTRACT_WORDS(hy,ly,y);
-	sx = hx&0x80000000;		/* sign of x */
-	hx ^=sx;		/* |x| */
-	hy &= 0x7fffffff;	/* |y| */
-
-    /* purge off exception values */
-	if((hy|ly)==0||(hx>=0x7ff00000)||	/* y=0,or x not finite */
-	  ((hy|((ly|-ly)>>31))>0x7ff00000))	/* or y is NaN */
-	    return (x*y)/(x*y);
-	if(hx<=hy) {
-	    if((hx<hy)||(lx<ly)) return x;	/* |x|<|y| return x */
-	    if(lx==ly)
-		return Zero[(u_int32_t)sx>>31];	/* |x|=|y| return x*0*/
-	}
-
-    /* determine ix = ilogb(x) */
-	if(hx<0x00100000) {	/* subnormal x */
-	    if(hx==0) {
-		for (ix = -1043, i=lx; i>0; i<<=1) ix -=1;
-	    } else {
-		for (ix = -1022,i=(hx<<11); i>0; i<<=1) ix -=1;
-	    }
-	} else ix = (hx>>20)-1023;
-
-    /* determine iy = ilogb(y) */
-	if(hy<0x00100000) {	/* subnormal y */
-	    if(hy==0) {
-		for (iy = -1043, i=ly; i>0; i<<=1) iy -=1;
-	    } else {
-		for (iy = -1022,i=(hy<<11); i>0; i<<=1) iy -=1;
-	    }
-	} else iy = (hy>>20)-1023;
-
-    /* set up {hx,lx}, {hy,ly} and align y to x */
-	if(ix >= -1022)
-	    hx = 0x00100000|(0x000fffff&hx);
-	else {		/* subnormal x, shift x to normal */
-	    n = -1022-ix;
-	    if(n<=31) {
-	        hx = (hx<<n)|(lx>>(32-n));
-	        lx <<= n;
-	    } else {
-		hx = lx<<(n-32);
-		lx = 0;
-	    }
-	}
-	if(iy >= -1022)
-	    hy = 0x00100000|(0x000fffff&hy);
-	else {		/* subnormal y, shift y to normal */
-	    n = -1022-iy;
-	    if(n<=31) {
-	        hy = (hy<<n)|(ly>>(32-n));
-	        ly <<= n;
-	    } else {
-		hy = ly<<(n-32);
-		ly = 0;
-	    }
-	}
-
-    /* fix point fmod */
-	n = ix - iy;
-	while(n--) {
-	    hz=hx-hy;lz=lx-ly; if(lx<ly) hz -= 1;
-	    if(hz<0){hx = hx+hx+(lx>>31); lx = lx+lx;}
-	    else {
-	    	if((hz|lz)==0) 		/* return sign(x)*0 */
-		    return Zero[(u_int32_t)sx>>31];
-	    	hx = hz+hz+(lz>>31); lx = lz+lz;
-	    }
-	}
-	hz=hx-hy;lz=lx-ly; if(lx<ly) hz -= 1;
-	if(hz>=0) {hx=hz;lx=lz;}
-
-    /* convert back to floating value and restore the sign */
-	if((hx|lx)==0) 			/* return sign(x)*0 */
-	    return Zero[(u_int32_t)sx>>31];
-	while(hx<0x00100000) {		/* normalize x */
-	    hx = hx+hx+(lx>>31); lx = lx+lx;
-	    iy -= 1;
-	}
-	if(iy>= -1022) {	/* normalize output */
-	    hx = ((hx-0x00100000)|((iy+1023)<<20));
-	    INSERT_WORDS(x,hx|sx,lx);
-	} else {		/* subnormal output */
-	    n = -1022 - iy;
-	    if(n<=20) {
-		lx = (lx>>n)|((u_int32_t)hx<<(32-n));
-		hx >>= n;
-	    } else if (n<=31) {
-		lx = (hx<<(32-n))|(lx>>n); hx = sx;
-	    } else {
-		lx = hx>>(n-32); hx = sx;
-	    }
-	    INSERT_WORDS(x,hx|sx,lx);
-	    x *= one;		/* create necessary signal */
-	}
-	return x;		/* exact output */
-}
diff --git a/lib/libm/src/e_fmodf.c b/lib/libm/src/e_fmodf.c
deleted file mode 100644
index 5bc02a433..000000000
--- a/lib/libm/src/e_fmodf.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* e_fmodf.c -- float version of e_fmod.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_fmodf.c,v 1.7 2002/05/26 22:01:49 wiz Exp $");
-#endif
-
-/*
- * __ieee754_fmodf(x,y)
- * Return x mod y in exact arithmetic
- * Method: shift and subtract
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const float one = 1.0, Zero[] = {0.0, -0.0,};
-
-float
-__ieee754_fmodf(float x, float y)
-{
-	int32_t n,hx,hy,hz,ix,iy,sx,i;
-
-	GET_FLOAT_WORD(hx,x);
-	GET_FLOAT_WORD(hy,y);
-	sx = hx&0x80000000;		/* sign of x */
-	hx ^=sx;		/* |x| */
-	hy &= 0x7fffffff;	/* |y| */
-
-    /* purge off exception values */
-	if(hy==0||(hx>=0x7f800000)||		/* y=0,or x not finite */
-	   (hy>0x7f800000))			/* or y is NaN */
-	    return (x*y)/(x*y);
-	if(hx<hy) return x;			/* |x|<|y| return x */
-	if(hx==hy)
-	    return Zero[(u_int32_t)sx>>31];	/* |x|=|y| return x*0*/
-
-    /* determine ix = ilogb(x) */
-	if(hx<0x00800000) {	/* subnormal x */
-	    for (ix = -126,i=(hx<<8); i>0; i<<=1) ix -=1;
-	} else ix = (hx>>23)-127;
-
-    /* determine iy = ilogb(y) */
-	if(hy<0x00800000) {	/* subnormal y */
-	    for (iy = -126,i=(hy<<8); i>=0; i<<=1) iy -=1;
-	} else iy = (hy>>23)-127;
-
-    /* set up {hx,lx}, {hy,ly} and align y to x */
-	if(ix >= -126)
-	    hx = 0x00800000|(0x007fffff&hx);
-	else {		/* subnormal x, shift x to normal */
-	    n = -126-ix;
-	    hx = hx<<n;
-	}
-	if(iy >= -126)
-	    hy = 0x00800000|(0x007fffff&hy);
-	else {		/* subnormal y, shift y to normal */
-	    n = -126-iy;
-	    hy = hy<<n;
-	}
-
-    /* fix point fmod */
-	n = ix - iy;
-	while(n--) {
-	    hz=hx-hy;
-	    if(hz<0){hx = hx+hx;}
-	    else {
-	    	if(hz==0) 		/* return sign(x)*0 */
-		    return Zero[(u_int32_t)sx>>31];
-	    	hx = hz+hz;
-	    }
-	}
-	hz=hx-hy;
-	if(hz>=0) {hx=hz;}
-
-    /* convert back to floating value and restore the sign */
-	if(hx==0) 			/* return sign(x)*0 */
-	    return Zero[(u_int32_t)sx>>31];
-	while(hx<0x00800000) {		/* normalize x */
-	    hx = hx+hx;
-	    iy -= 1;
-	}
-	if(iy>= -126) {		/* normalize output */
-	    hx = ((hx-0x00800000)|((iy+127)<<23));
-	    SET_FLOAT_WORD(x,hx|sx);
-	} else {		/* subnormal output */
-	    n = -126 - iy;
-	    hx >>= n;
-	    SET_FLOAT_WORD(x,hx|sx);
-	    x *= one;		/* create necessary signal */
-	}
-	return x;		/* exact output */
-}
diff --git a/lib/libm/src/e_fmodl.c b/lib/libm/src/e_fmodl.c
deleted file mode 100644
index 72d752043..000000000
--- a/lib/libm/src/e_fmodl.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* @(#)e_fmod.c 1.3 95/01/18 */
-/*-
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: e_fmodl.c,v 1.2 2013/11/14 15:25:22 martin Exp $");
-#if 0
-__FBSDID("$FreeBSD: head/lib/msun/src/e_fmodl.c 181063 2008-07-31 20:09:47Z das $");
-#endif
-
-#include "namespace.h"
-
-#include <float.h>
-#include <stdint.h>
-
-#include "math.h"
-#include "math_private.h"
-#include <machine/ieee.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-
-#define	BIAS (LDBL_MAX_EXP - 1)
-
-#if EXT_FRACLBITS > 32
-typedef	uint64_t manl_t;
-#else
-typedef	uint32_t manl_t;
-#endif
-
-#if EXT_FRACHBITS > 32
-typedef	uint64_t manh_t;
-#else
-typedef	uint32_t manh_t;
-#endif
-
-/*
- * These macros add and remove an explicit integer bit in front of the
- * fractional mantissa, if the architecture doesn't have such a bit by
- * default already.
- */
-#ifdef LDBL_IMPLICIT_NBIT
-#define	SET_NBIT(hx)	((hx) | (1ULL << EXT_FRACHBITS))
-#define	HFRAC_BITS	EXT_FRACHBITS
-#define	LDBL_NBIT	0
-#else
-#define	SET_NBIT(hx)	(hx)
-#define	HFRAC_BITS	(EXT_FRACHBITS - 1)
-#endif
-
-#define	MANL_SHIFT	(EXT_FRACLBITS - 1)
-
-static const long double one = 1.0, Zero[] = {0.0, -0.0,};
-
-/*
- * fmodl(x,y)
- * Return x mod y in exact arithmetic
- * Method: shift and subtract
- *
- * Assumptions:
- * - The low part of the mantissa fits in a manl_t exactly.
- * - The high part of the mantissa fits in an int64_t with enough room
- *   for an explicit integer bit in front of the fractional bits.
- */
-long double
-__ieee754_fmodl(long double x, long double y)
-{
-	union ieee_ext_u ux = { .extu_ld = x, };
-	union ieee_ext_u uy = { .extu_ld = y, };
-	int64_t hx,hz;	/* We need a carry bit even if EXT_FRACHBITS is 32. */
-	manh_t hy;
-	manl_t lx,ly,lz;
-	int ix,iy,n,sx;
-
-	sx = ux.extu_sign;
-
-    /* purge off exception values */
-	if((uy.extu_exp|uy.extu_frach|uy.extu_fracl)==0 || /* y=0 */
-	   (ux.extu_exp == BIAS + LDBL_MAX_EXP) ||	 /* or x not finite */
-	   (uy.extu_exp == BIAS + LDBL_MAX_EXP &&
-	    ((uy.extu_frach&~LDBL_NBIT)|uy.extu_fracl)!=0)) /* or y is NaN */
-	    return (x*y)/(x*y);
-	if(ux.extu_exp<=uy.extu_exp) {
-	    if((ux.extu_exp<uy.extu_exp) ||
-	       (ux.extu_frach<=uy.extu_frach &&
-		(ux.extu_frach<uy.extu_frach ||
-		 ux.extu_fracl<uy.extu_fracl))) {
-		return x;		/* |x|<|y| return x or x-y */
-	    }
-	    if(ux.extu_frach==uy.extu_frach && ux.extu_fracl==uy.extu_fracl) {
-		return Zero[sx];	/* |x|=|y| return x*0*/
-	    }
-	}
-
-    /* determine ix = ilogb(x) */
-	if(ux.extu_exp == 0) {	/* subnormal x */
-	    ux.extu_ld *= 0x1.0p512;
-	    ix = ux.extu_exp - (BIAS + 512);
-	} else {
-	    ix = ux.extu_exp - BIAS;
-	}
-
-    /* determine iy = ilogb(y) */
-	if(uy.extu_exp == 0) {	/* subnormal y */
-	    uy.extu_ld *= 0x1.0p512;
-	    iy = uy.extu_exp - (BIAS + 512);
-	} else {
-	    iy = uy.extu_exp - BIAS;
-	}
-
-    /* set up {hx,lx}, {hy,ly} and align y to x */
-	hx = SET_NBIT(ux.extu_frach);
-	hy = SET_NBIT(uy.extu_frach);
-	lx = ux.extu_fracl;
-	ly = uy.extu_fracl;
-
-    /* fix point fmod */
-	n = ix - iy;
-
-	while(n--) {
-	    hz=hx-hy;lz=lx-ly; if(lx<ly) hz -= 1;
-	    if(hz<0){hx = hx+hx+(lx>>MANL_SHIFT); lx = lx+lx;}
-	    else {
-		if ((hz|lz)==0)		/* return sign(x)*0 */
-		    return Zero[sx];
-		hx = hz+hz+(lz>>MANL_SHIFT); lx = lz+lz;
-	    }
-	}
-	hz=hx-hy;lz=lx-ly; if(lx<ly) hz -= 1;
-	if(hz>=0) {hx=hz;lx=lz;}
-
-    /* convert back to floating value and restore the sign */
-	if((hx|lx)==0)			/* return sign(x)*0 */
-	    return Zero[sx];
-	while(hx<(1LL<<HFRAC_BITS)) {	/* normalize x */
-	    hx = hx+hx+(lx>>MANL_SHIFT); lx = lx+lx;
-	    iy -= 1;
-	}
-	ux.extu_frach = hx; /* The mantissa is truncated here if needed. */
-	ux.extu_fracl = lx;
-	if (iy < LDBL_MIN_EXP) {
-	    ux.extu_exp = iy + (BIAS + 512);
-	    ux.extu_ld *= 0x1p-512;
-	} else {
-	    ux.extu_exp = iy + BIAS;
-	}
-	x = ux.extu_ld * one;	/* create necessary signal */
-	return x;		/* exact output */
-}
-
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libm/src/e_hypot.c b/lib/libm/src/e_hypot.c
deleted file mode 100644
index 130c37d23..000000000
--- a/lib/libm/src/e_hypot.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* @(#)e_hypot.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_hypot.c,v 1.13 2008/04/25 22:21:53 christos Exp $");
-#endif
-
-/* __ieee754_hypot(x,y)
- *
- * Method :
- *	If (assume round-to-nearest) z=x*x+y*y
- *	has error less than sqrt(2)/2 ulp, than
- *	sqrt(z) has error less than 1 ulp (exercise).
- *
- *	So, compute sqrt(x*x+y*y) with some care as
- *	follows to get the error below 1 ulp:
- *
- *	Assume x>y>0;
- *	(if possible, set rounding to round-to-nearest)
- *	1. if x > 2y  use
- *		x1*x1+(y*y+(x2*(x+x1))) for x*x+y*y
- *	where x1 = x with lower 32 bits cleared, x2 = x-x1; else
- *	2. if x <= 2y use
- *		t1*yy1+((x-y)*(x-y)+(t1*y2+t2*y))
- *	where t1 = 2x with lower 32 bits cleared, t2 = 2x-t1,
- *	yy1= y with lower 32 bits chopped, y2 = y-yy1.
- *
- *	NOTE: scaling may be necessary if some argument is too
- *	      large or too tiny
- *
- * Special cases:
- *	hypot(x,y) is INF if x or y is +INF or -INF; else
- *	hypot(x,y) is NAN if x or y is NAN.
- *
- * Accuracy:
- * 	hypot(x,y) returns sqrt(x^2+y^2) with error less
- * 	than 1 ulps (units in the last place)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-double
-__ieee754_hypot(double x, double y)
-{
-	double a=x,b=y,t1,t2,yy1,y2,w;
-	int32_t j,k,ha,hb;
-
-	GET_HIGH_WORD(ha,x);
-	ha &= 0x7fffffff;
-	GET_HIGH_WORD(hb,y);
-	hb &= 0x7fffffff;
-	if(hb > ha) {a=y;b=x;j=ha; ha=hb;hb=j;} else {a=x;b=y;}
-	SET_HIGH_WORD(a,ha);	/* a <- |a| */
-	SET_HIGH_WORD(b,hb);	/* b <- |b| */
-	if((ha-hb)>0x3c00000) {return a+b;} /* x/y > 2**60 */
-	k=0;
-	if(ha > 0x5f300000) {	/* a>2**500 */
-	   if(ha >= 0x7ff00000) {	/* Inf or NaN */
-	       u_int32_t low;
-	       w = a+b;			/* for sNaN */
-	       GET_LOW_WORD(low,a);
-	       if(((ha&0xfffff)|low)==0) w = a;
-	       GET_LOW_WORD(low,b);
-	       if(((hb^0x7ff00000)|low)==0) w = b;
-	       return w;
-	   }
-	   /* scale a and b by 2**-600 */
-	   ha -= 0x25800000; hb -= 0x25800000;	k += 600;
-	   SET_HIGH_WORD(a,ha);
-	   SET_HIGH_WORD(b,hb);
-	}
-	if(hb < 0x20b00000) {	/* b < 2**-500 */
-	    if(hb <= 0x000fffff) {	/* subnormal b or 0 */
-	        u_int32_t low;
-		GET_LOW_WORD(low,b);
-		if((hb|low)==0) return a;
-		t1=0;
-		SET_HIGH_WORD(t1,0x7fd00000);	/* t1=2^1022 */
-		b *= t1;
-		a *= t1;
-		k -= 1022;
-	    } else {		/* scale a and b by 2^600 */
-	        ha += 0x25800000; 	/* a *= 2^600 */
-		hb += 0x25800000;	/* b *= 2^600 */
-		k -= 600;
-		SET_HIGH_WORD(a,ha);
-		SET_HIGH_WORD(b,hb);
-	    }
-	}
-    /* medium size a and b */
-	w = a-b;
-	if (w>b) {
-	    t1 = 0;
-	    SET_HIGH_WORD(t1,ha);
-	    t2 = a-t1;
-	    w  = __ieee754_sqrt(t1*t1-(b*(-b)-t2*(a+t1)));
-	} else {
-	    a  = a+a;
-	    yy1 = 0;
-	    SET_HIGH_WORD(yy1,hb);
-	    y2 = b - yy1;
-	    t1 = 0;
-	    SET_HIGH_WORD(t1,ha+0x00100000);
-	    t2 = a - t1;
-	    w  = __ieee754_sqrt(t1*yy1-(w*(-w)-(t1*y2+t2*b)));
-	}
-	if(k!=0) {
-	    u_int32_t high;
-	    t1 = 1.0;
-	    GET_HIGH_WORD(high,t1);
-	    SET_HIGH_WORD(t1,high+(k<<20));
-	    return t1*w;
-	} else return w;
-}
diff --git a/lib/libm/src/e_hypotf.c b/lib/libm/src/e_hypotf.c
deleted file mode 100644
index 23906617d..000000000
--- a/lib/libm/src/e_hypotf.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* e_hypotf.c -- float version of e_hypot.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_hypotf.c,v 1.9 2008/04/25 22:21:53 christos Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-float
-__ieee754_hypotf(float x, float y)
-{
-	float a=x,b=y,t1,t2,yy1,y2,w;
-	int32_t j,k,ha,hb;
-
-	GET_FLOAT_WORD(ha,x);
-	ha &= 0x7fffffff;
-	GET_FLOAT_WORD(hb,y);
-	hb &= 0x7fffffff;
-	if(hb > ha) {a=y;b=x;j=ha; ha=hb;hb=j;} else {a=x;b=y;}
-	SET_FLOAT_WORD(a,ha);	/* a <- |a| */
-	SET_FLOAT_WORD(b,hb);	/* b <- |b| */
-	if((ha-hb)>0xf000000) {return a+b;} /* x/y > 2**30 */
-	k=0;
-	if(ha > 0x58800000) {	/* a>2**50 */
-	   if(ha >= 0x7f800000) {	/* Inf or NaN */
-	       w = a+b;			/* for sNaN */
-	       if(ha == 0x7f800000) w = a;
-	       if(hb == 0x7f800000) w = b;
-	       return w;
-	   }
-	   /* scale a and b by 2**-60 */
-	   ha -= 0x5d800000; hb -= 0x5d800000;	k += 60;
-	   SET_FLOAT_WORD(a,ha);
-	   SET_FLOAT_WORD(b,hb);
-	}
-	if(hb < 0x26800000) {	/* b < 2**-50 */
-	    if(hb <= 0x007fffff) {	/* subnormal b or 0 */
-	        if(hb==0) return a;
-		SET_FLOAT_WORD(t1,0x3f000000);	/* t1=2^126 */
-		b *= t1;
-		a *= t1;
-		k -= 126;
-	    } else {		/* scale a and b by 2^60 */
-	        ha += 0x5d800000; 	/* a *= 2^60 */
-		hb += 0x5d800000;	/* b *= 2^60 */
-		k -= 60;
-		SET_FLOAT_WORD(a,ha);
-		SET_FLOAT_WORD(b,hb);
-	    }
-	}
-    /* medium size a and b */
-	w = a-b;
-	if (w>b) {
-	    SET_FLOAT_WORD(t1,ha&0xfffff000);
-	    t2 = a-t1;
-	    w  = __ieee754_sqrtf(t1*t1-(b*(-b)-t2*(a+t1)));
-	} else {
-	    a  = a+a;
-	    SET_FLOAT_WORD(yy1,hb&0xfffff000);
-	    y2 = b - yy1;
-	    SET_FLOAT_WORD(t1,ha+0x00800000);
-	    t2 = a - t1;
-	    w  = __ieee754_sqrtf(t1*yy1-(w*(-w)-(t1*y2+t2*b)));
-	}
-	if(k!=0) {
-	    SET_FLOAT_WORD(t1,0x3f800000+(k<<23));
-	    return t1*w;
-	} else return w;
-}
diff --git a/lib/libm/src/e_j0.c b/lib/libm/src/e_j0.c
deleted file mode 100644
index 96ade957c..000000000
--- a/lib/libm/src/e_j0.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/* @(#)e_j0.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_j0.c,v 1.12 2007/08/20 16:01:38 drochner Exp $");
-#endif
-
-/* __ieee754_j0(x), __ieee754_y0(x)
- * Bessel function of the first and second kinds of order zero.
- * Method -- j0(x):
- *	1. For tiny x, we use j0(x) = 1 - x^2/4 + x^4/64 - ...
- *	2. Reduce x to |x| since j0(x)=j0(-x),  and
- *	   for x in (0,2)
- *		j0(x) = 1-z/4+ z^2*R0/S0,  where z = x*x;
- *	   (precision:  |j0-1+z/4-z^2R0/S0 |<2**-63.67 )
- *	   for x in (2,inf)
- * 		j0(x) = sqrt(2/(pi*x))*(p0(x)*cos(x0)-q0(x)*sin(x0))
- * 	   where x0 = x-pi/4. It is better to compute sin(x0),cos(x0)
- *	   as follow:
- *		cos(x0) = cos(x)cos(pi/4)+sin(x)sin(pi/4)
- *			= 1/sqrt(2) * (cos(x) + sin(x))
- *		sin(x0) = sin(x)cos(pi/4)-cos(x)sin(pi/4)
- *			= 1/sqrt(2) * (sin(x) - cos(x))
- * 	   (To avoid cancellation, use
- *		sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
- * 	    to compute the worse one.)
- *
- *	3 Special cases
- *		j0(nan)= nan
- *		j0(0) = 1
- *		j0(inf) = 0
- *
- * Method -- y0(x):
- *	1. For x<2.
- *	   Since
- *		y0(x) = 2/pi*(j0(x)*(ln(x/2)+Euler) + x^2/4 - ...)
- *	   therefore y0(x)-2/pi*j0(x)*ln(x) is an even function.
- *	   We use the following function to approximate y0,
- *		y0(x) = U(z)/V(z) + (2/pi)*(j0(x)*ln(x)), z= x^2
- *	   where
- *		U(z) = u00 + u01*z + ... + u06*z^6
- *		V(z) = 1  + v01*z + ... + v04*z^4
- *	   with absolute approximation error bounded by 2**-72.
- *	   Note: For tiny x, U/V = u0 and j0(x)~1, hence
- *		y0(tiny) = u0 + (2/pi)*ln(tiny), (choose tiny<2**-27)
- *	2. For x>=2.
- * 		y0(x) = sqrt(2/(pi*x))*(p0(x)*cos(x0)+q0(x)*sin(x0))
- * 	   where x0 = x-pi/4. It is better to compute sin(x0),cos(x0)
- *	   by the method mentioned above.
- *	3. Special cases: y0(0)=-inf, y0(x<0)=NaN, y0(inf)=0.
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-static double pzero(double), qzero(double);
-
-static const double
-huge 	= 1e300,
-one	= 1.0,
-invsqrtpi=  5.64189583547756279280e-01, /* 0x3FE20DD7, 0x50429B6D */
-tpi      =  6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */
- 		/* R0/S0 on [0, 2.00] */
-R02  =  1.56249999999999947958e-02, /* 0x3F8FFFFF, 0xFFFFFFFD */
-R03  = -1.89979294238854721751e-04, /* 0xBF28E6A5, 0xB61AC6E9 */
-R04  =  1.82954049532700665670e-06, /* 0x3EBEB1D1, 0x0C503919 */
-R05  = -4.61832688532103189199e-09, /* 0xBE33D5E7, 0x73D63FCE */
-S01  =  1.56191029464890010492e-02, /* 0x3F8FFCE8, 0x82C8C2A4 */
-S02  =  1.16926784663337450260e-04, /* 0x3F1EA6D2, 0xDD57DBF4 */
-S03  =  5.13546550207318111446e-07, /* 0x3EA13B54, 0xCE84D5A9 */
-S04  =  1.16614003333790000205e-09; /* 0x3E1408BC, 0xF4745D8F */
-
-static const double zero = 0.0;
-
-double
-__ieee754_j0(double x)
-{
-	double z, s,c,ss,cc,r,u,v;
-	int32_t hx,ix;
-
-	GET_HIGH_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7ff00000) return one/(x*x);
-	x = fabs(x);
-	if(ix >= 0x40000000) {	/* |x| >= 2.0 */
-		s = sin(x);
-		c = cos(x);
-		ss = s-c;
-		cc = s+c;
-		if(ix<0x7fe00000) {  /* make sure x+x not overflow */
-		    z = -cos(x+x);
-		    if ((s*c)<zero) cc = z/ss;
-		    else 	    ss = z/cc;
-		}
-	/*
-	 * j0(x) = 1/sqrt(pi) * (P(0,x)*cc - Q(0,x)*ss) / sqrt(x)
-	 * y0(x) = 1/sqrt(pi) * (P(0,x)*ss + Q(0,x)*cc) / sqrt(x)
-	 */
-		if(ix>0x48000000) z = (invsqrtpi*cc)/sqrt(x);
-		else {
-		    u = pzero(x); v = qzero(x);
-		    z = invsqrtpi*(u*cc-v*ss)/sqrt(x);
-		}
-		return z;
-	}
-	if(ix<0x3f200000) {	/* |x| < 2**-13 */
-	    if(huge+x>one) {	/* raise inexact if x != 0 */
-	        if(ix<0x3e400000) return one;	/* |x|<2**-27 */
-	        else 	      return one - 0.25*x*x;
-	    }
-	}
-	z = x*x;
-	r =  z*(R02+z*(R03+z*(R04+z*R05)));
-	s =  one+z*(S01+z*(S02+z*(S03+z*S04)));
-	if(ix < 0x3FF00000) {	/* |x| < 1.00 */
-	    return one + z*(-0.25+(r/s));
-	} else {
-	    u = 0.5*x;
-	    return((one+u)*(one-u)+z*(r/s));
-	}
-}
-
-static const double
-u00  = -7.38042951086872317523e-02, /* 0xBFB2E4D6, 0x99CBD01F */
-u01  =  1.76666452509181115538e-01, /* 0x3FC69D01, 0x9DE9E3FC */
-u02  = -1.38185671945596898896e-02, /* 0xBF8C4CE8, 0xB16CFA97 */
-u03  =  3.47453432093683650238e-04, /* 0x3F36C54D, 0x20B29B6B */
-u04  = -3.81407053724364161125e-06, /* 0xBECFFEA7, 0x73D25CAD */
-u05  =  1.95590137035022920206e-08, /* 0x3E550057, 0x3B4EABD4 */
-u06  = -3.98205194132103398453e-11, /* 0xBDC5E43D, 0x693FB3C8 */
-v01  =  1.27304834834123699328e-02, /* 0x3F8A1270, 0x91C9C71A */
-v02  =  7.60068627350353253702e-05, /* 0x3F13ECBB, 0xF578C6C1 */
-v03  =  2.59150851840457805467e-07, /* 0x3E91642D, 0x7FF202FD */
-v04  =  4.41110311332675467403e-10; /* 0x3DFE5018, 0x3BD6D9EF */
-
-double
-__ieee754_y0(double x)
-{
-	double z, s,c,ss,cc,u,v;
-	int32_t hx,ix,lx;
-
-	EXTRACT_WORDS(hx,lx,x);
-        ix = 0x7fffffff&hx;
-    /* Y0(NaN) is NaN, y0(-inf) is Nan, y0(inf) is 0  */
-	if(ix>=0x7ff00000) return  one/(x+x*x);
-        if((ix|lx)==0) return -one/zero;
-        if(hx<0) return zero/zero;
-        if(ix >= 0x40000000) {  /* |x| >= 2.0 */
-        /* y0(x) = sqrt(2/(pi*x))*(p0(x)*sin(x0)+q0(x)*cos(x0))
-         * where x0 = x-pi/4
-         *      Better formula:
-         *              cos(x0) = cos(x)cos(pi/4)+sin(x)sin(pi/4)
-         *                      =  1/sqrt(2) * (sin(x) + cos(x))
-         *              sin(x0) = sin(x)cos(3pi/4)-cos(x)sin(3pi/4)
-         *                      =  1/sqrt(2) * (sin(x) - cos(x))
-         * To avoid cancellation, use
-         *              sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
-         * to compute the worse one.
-         */
-                s = sin(x);
-                c = cos(x);
-                ss = s-c;
-                cc = s+c;
-	/*
-	 * j0(x) = 1/sqrt(pi) * (P(0,x)*cc - Q(0,x)*ss) / sqrt(x)
-	 * y0(x) = 1/sqrt(pi) * (P(0,x)*ss + Q(0,x)*cc) / sqrt(x)
-	 */
-                if(ix<0x7fe00000) {  /* make sure x+x not overflow */
-                    z = -cos(x+x);
-                    if ((s*c)<zero) cc = z/ss;
-                    else            ss = z/cc;
-                }
-                if(ix>0x48000000) z = (invsqrtpi*ss)/sqrt(x);
-                else {
-                    u = pzero(x); v = qzero(x);
-                    z = invsqrtpi*(u*ss+v*cc)/sqrt(x);
-                }
-                return z;
-	}
-	if(ix<=0x3e400000) {	/* x < 2**-27 */
-	    return(u00 + tpi*__ieee754_log(x));
-	}
-	z = x*x;
-	u = u00+z*(u01+z*(u02+z*(u03+z*(u04+z*(u05+z*u06)))));
-	v = one+z*(v01+z*(v02+z*(v03+z*v04)));
-	return(u/v + tpi*(__ieee754_j0(x)*__ieee754_log(x)));
-}
-
-/* The asymptotic expansions of pzero is
- *	1 - 9/128 s^2 + 11025/98304 s^4 - ...,	where s = 1/x.
- * For x >= 2, We approximate pzero by
- * 	pzero(x) = 1 + (R/S)
- * where  R = pR0 + pR1*s^2 + pR2*s^4 + ... + pR5*s^10
- * 	  S = 1 + pS0*s^2 + ... + pS4*s^10
- * and
- *	| pzero(x)-1-R/S | <= 2  ** ( -60.26)
- */
-static const double pR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-  0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */
- -7.03124999999900357484e-02, /* 0xBFB1FFFF, 0xFFFFFD32 */
- -8.08167041275349795626e+00, /* 0xC02029D0, 0xB44FA779 */
- -2.57063105679704847262e+02, /* 0xC0701102, 0x7B19E863 */
- -2.48521641009428822144e+03, /* 0xC0A36A6E, 0xCD4DCAFC */
- -5.25304380490729545272e+03, /* 0xC0B4850B, 0x36CC643D */
-};
-static const double pS8[5] = {
-  1.16534364619668181717e+02, /* 0x405D2233, 0x07A96751 */
-  3.83374475364121826715e+03, /* 0x40ADF37D, 0x50596938 */
-  4.05978572648472545552e+04, /* 0x40E3D2BB, 0x6EB6B05F */
-  1.16752972564375915681e+05, /* 0x40FC810F, 0x8F9FA9BD */
-  4.76277284146730962675e+04, /* 0x40E74177, 0x4F2C49DC */
-};
-
-static const double pR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
- -1.14125464691894502584e-11, /* 0xBDA918B1, 0x47E495CC */
- -7.03124940873599280078e-02, /* 0xBFB1FFFF, 0xE69AFBC6 */
- -4.15961064470587782438e+00, /* 0xC010A370, 0xF90C6BBF */
- -6.76747652265167261021e+01, /* 0xC050EB2F, 0x5A7D1783 */
- -3.31231299649172967747e+02, /* 0xC074B3B3, 0x6742CC63 */
- -3.46433388365604912451e+02, /* 0xC075A6EF, 0x28A38BD7 */
-};
-static const double pS5[5] = {
-  6.07539382692300335975e+01, /* 0x404E6081, 0x0C98C5DE */
-  1.05125230595704579173e+03, /* 0x40906D02, 0x5C7E2864 */
-  5.97897094333855784498e+03, /* 0x40B75AF8, 0x8FBE1D60 */
-  9.62544514357774460223e+03, /* 0x40C2CCB8, 0xFA76FA38 */
-  2.40605815922939109441e+03, /* 0x40A2CC1D, 0xC70BE864 */
-};
-
-static const double pR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */
- -2.54704601771951915620e-09, /* 0xBE25E103, 0x6FE1AA86 */
- -7.03119616381481654654e-02, /* 0xBFB1FFF6, 0xF7C0E24B */
- -2.40903221549529611423e+00, /* 0xC00345B2, 0xAEA48074 */
- -2.19659774734883086467e+01, /* 0xC035F74A, 0x4CB94E14 */
- -5.80791704701737572236e+01, /* 0xC04D0A22, 0x420A1A45 */
- -3.14479470594888503854e+01, /* 0xC03F72AC, 0xA892D80F */
-};
-static const double pS3[5] = {
-  3.58560338055209726349e+01, /* 0x4041ED92, 0x84077DD3 */
-  3.61513983050303863820e+02, /* 0x40769839, 0x464A7C0E */
-  1.19360783792111533330e+03, /* 0x4092A66E, 0x6D1061D6 */
-  1.12799679856907414432e+03, /* 0x40919FFC, 0xB8C39B7E */
-  1.73580930813335754692e+02, /* 0x4065B296, 0xFC379081 */
-};
-
-static const double pR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
- -8.87534333032526411254e-08, /* 0xBE77D316, 0xE927026D */
- -7.03030995483624743247e-02, /* 0xBFB1FF62, 0x495E1E42 */
- -1.45073846780952986357e+00, /* 0xBFF73639, 0x8A24A843 */
- -7.63569613823527770791e+00, /* 0xC01E8AF3, 0xEDAFA7F3 */
- -1.11931668860356747786e+01, /* 0xC02662E6, 0xC5246303 */
- -3.23364579351335335033e+00, /* 0xC009DE81, 0xAF8FE70F */
-};
-static const double pS2[5] = {
-  2.22202997532088808441e+01, /* 0x40363865, 0x908B5959 */
-  1.36206794218215208048e+02, /* 0x4061069E, 0x0EE8878F */
-  2.70470278658083486789e+02, /* 0x4070E786, 0x42EA079B */
-  1.53875394208320329881e+02, /* 0x40633C03, 0x3AB6FAFF */
-  1.46576176948256193810e+01, /* 0x402D50B3, 0x44391809 */
-};
-
-static double
-pzero(double x)
-{
-	const double *p,*q;
-	double z,r,s;
-	int32_t ix;
-
-	p = q = 0;
-	GET_HIGH_WORD(ix,x);
-	ix &= 0x7fffffff;
-	if(ix>=0x40200000)     {p = pR8; q= pS8;}
-	else if(ix>=0x40122E8B){p = pR5; q= pS5;}
-	else if(ix>=0x4006DB6D){p = pR3; q= pS3;}
-	else if(ix>=0x40000000){p = pR2; q= pS2;}
-	z = one/(x*x);
-	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*q[4]))));
-	return one+ r/s;
-}
-
-
-/* For x >= 8, the asymptotic expansions of qzero is
- *	-1/8 s + 75/1024 s^3 - ..., where s = 1/x.
- * We approximate pzero by
- * 	qzero(x) = s*(-1.25 + (R/S))
- * where  R = qR0 + qR1*s^2 + qR2*s^4 + ... + qR5*s^10
- * 	  S = 1 + qS0*s^2 + ... + qS5*s^12
- * and
- *	| qzero(x)/s +1.25-R/S | <= 2  ** ( -61.22)
- */
-static const double qR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-  0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */
-  7.32421874999935051953e-02, /* 0x3FB2BFFF, 0xFFFFFE2C */
-  1.17682064682252693899e+01, /* 0x40278952, 0x5BB334D6 */
-  5.57673380256401856059e+02, /* 0x40816D63, 0x15301825 */
-  8.85919720756468632317e+03, /* 0x40C14D99, 0x3E18F46D */
-  3.70146267776887834771e+04, /* 0x40E212D4, 0x0E901566 */
-};
-static const double qS8[6] = {
-  1.63776026895689824414e+02, /* 0x406478D5, 0x365B39BC */
-  8.09834494656449805916e+03, /* 0x40BFA258, 0x4E6B0563 */
-  1.42538291419120476348e+05, /* 0x41016652, 0x54D38C3F */
-  8.03309257119514397345e+05, /* 0x412883DA, 0x83A52B43 */
-  8.40501579819060512818e+05, /* 0x4129A66B, 0x28DE0B3D */
- -3.43899293537866615225e+05, /* 0xC114FD6D, 0x2C9530C5 */
-};
-
-static const double qR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-  1.84085963594515531381e-11, /* 0x3DB43D8F, 0x29CC8CD9 */
-  7.32421766612684765896e-02, /* 0x3FB2BFFF, 0xD172B04C */
-  5.83563508962056953777e+00, /* 0x401757B0, 0xB9953DD3 */
-  1.35111577286449829671e+02, /* 0x4060E392, 0x0A8788E9 */
-  1.02724376596164097464e+03, /* 0x40900CF9, 0x9DC8C481 */
-  1.98997785864605384631e+03, /* 0x409F17E9, 0x53C6E3A6 */
-};
-static const double qS5[6] = {
-  8.27766102236537761883e+01, /* 0x4054B1B3, 0xFB5E1543 */
-  2.07781416421392987104e+03, /* 0x40A03BA0, 0xDA21C0CE */
-  1.88472887785718085070e+04, /* 0x40D267D2, 0x7B591E6D */
-  5.67511122894947329769e+04, /* 0x40EBB5E3, 0x97E02372 */
-  3.59767538425114471465e+04, /* 0x40E19118, 0x1F7A54A0 */
- -5.35434275601944773371e+03, /* 0xC0B4EA57, 0xBEDBC609 */
-};
-
-static const double qR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */
-  4.37741014089738620906e-09, /* 0x3E32CD03, 0x6ADECB82 */
-  7.32411180042911447163e-02, /* 0x3FB2BFEE, 0x0E8D0842 */
-  3.34423137516170720929e+00, /* 0x400AC0FC, 0x61149CF5 */
-  4.26218440745412650017e+01, /* 0x40454F98, 0x962DAEDD */
-  1.70808091340565596283e+02, /* 0x406559DB, 0xE25EFD1F */
-  1.66733948696651168575e+02, /* 0x4064D77C, 0x81FA21E0 */
-};
-static const double qS3[6] = {
-  4.87588729724587182091e+01, /* 0x40486122, 0xBFE343A6 */
-  7.09689221056606015736e+02, /* 0x40862D83, 0x86544EB3 */
-  3.70414822620111362994e+03, /* 0x40ACF04B, 0xE44DFC63 */
-  6.46042516752568917582e+03, /* 0x40B93C6C, 0xD7C76A28 */
-  2.51633368920368957333e+03, /* 0x40A3A8AA, 0xD94FB1C0 */
- -1.49247451836156386662e+02, /* 0xC062A7EB, 0x201CF40F */
-};
-
-static const double qR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-  1.50444444886983272379e-07, /* 0x3E84313B, 0x54F76BDB */
-  7.32234265963079278272e-02, /* 0x3FB2BEC5, 0x3E883E34 */
-  1.99819174093815998816e+00, /* 0x3FFFF897, 0xE727779C */
-  1.44956029347885735348e+01, /* 0x402CFDBF, 0xAAF96FE5 */
-  3.16662317504781540833e+01, /* 0x403FAA8E, 0x29FBDC4A */
-  1.62527075710929267416e+01, /* 0x403040B1, 0x71814BB4 */
-};
-static const double qS2[6] = {
-  3.03655848355219184498e+01, /* 0x403E5D96, 0xF7C07AED */
-  2.69348118608049844624e+02, /* 0x4070D591, 0xE4D14B40 */
-  8.44783757595320139444e+02, /* 0x408A6645, 0x22B3BF22 */
-  8.82935845112488550512e+02, /* 0x408B977C, 0x9C5CC214 */
-  2.12666388511798828631e+02, /* 0x406A9553, 0x0E001365 */
- -5.31095493882666946917e+00, /* 0xC0153E6A, 0xF8B32931 */
-};
-
-static double
-qzero(double x)
-{
-	const double *p,*q;
-	double s,r,z;
-	int32_t ix;
-
-	p = q = 0;
-	GET_HIGH_WORD(ix,x);
-	ix &= 0x7fffffff;
-	if(ix>=0x40200000)     {p = qR8; q= qS8;}
-	else if(ix>=0x40122E8B){p = qR5; q= qS5;}
-	else if(ix>=0x4006DB6D){p = qR3; q= qS3;}
-	else if(ix>=0x40000000){p = qR2; q= qS2;}
-	z = one/(x*x);
-	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*(q[4]+z*q[5])))));
-	return (-.125 + r/s)/x;
-}
diff --git a/lib/libm/src/e_j0f.c b/lib/libm/src/e_j0f.c
deleted file mode 100644
index 96d3a95b5..000000000
--- a/lib/libm/src/e_j0f.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/* e_j0f.c -- float version of e_j0.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_j0f.c,v 1.10 2007/08/20 16:01:38 drochner Exp $");
-#endif
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-static float pzerof(float), qzerof(float);
-
-static const float
-huge 	= 1e30,
-one	= 1.0,
-invsqrtpi=  5.6418961287e-01, /* 0x3f106ebb */
-tpi      =  6.3661974669e-01, /* 0x3f22f983 */
- 		/* R0/S0 on [0, 2.00] */
-R02  =  1.5625000000e-02, /* 0x3c800000 */
-R03  = -1.8997929874e-04, /* 0xb947352e */
-R04  =  1.8295404516e-06, /* 0x35f58e88 */
-R05  = -4.6183270541e-09, /* 0xb19eaf3c */
-S01  =  1.5619102865e-02, /* 0x3c7fe744 */
-S02  =  1.1692678527e-04, /* 0x38f53697 */
-S03  =  5.1354652442e-07, /* 0x3509daa6 */
-S04  =  1.1661400734e-09; /* 0x30a045e8 */
-
-static const float zero = 0.0;
-
-float
-__ieee754_j0f(float x)
-{
-	float z, s,c,ss,cc,r,u,v;
-	int32_t hx,ix;
-
-	GET_FLOAT_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7f800000) return one/(x*x);
-	x = fabsf(x);
-	if(ix >= 0x40000000) {	/* |x| >= 2.0 */
-		s = sinf(x);
-		c = cosf(x);
-		ss = s-c;
-		cc = s+c;
-		if(ix<0x7f000000) {  /* make sure x+x not overflow */
-		    z = -cosf(x+x);
-		    if ((s*c)<zero) cc = z/ss;
-		    else 	    ss = z/cc;
-		}
-	/*
-	 * j0(x) = 1/sqrt(pi) * (P(0,x)*cc - Q(0,x)*ss) / sqrt(x)
-	 * y0(x) = 1/sqrt(pi) * (P(0,x)*ss + Q(0,x)*cc) / sqrt(x)
-	 */
-#ifdef DEAD_CODE
-		if(ix>0x80000000) z = (invsqrtpi*cc)/sqrtf(x);
-		else
-#endif
-		{
-		    u = pzerof(x); v = qzerof(x);
-		    z = invsqrtpi*(u*cc-v*ss)/sqrtf(x);
-		}
-		return z;
-	}
-	if(ix<0x39000000) {	/* |x| < 2**-13 */
-	    if(huge+x>one) {	/* raise inexact if x != 0 */
-	        if(ix<0x32000000) return one;	/* |x|<2**-27 */
-	        else 	      return one - (float)0.25*x*x;
-	    }
-	}
-	z = x*x;
-	r =  z*(R02+z*(R03+z*(R04+z*R05)));
-	s =  one+z*(S01+z*(S02+z*(S03+z*S04)));
-	if(ix < 0x3F800000) {	/* |x| < 1.00 */
-	    return one + z*((float)-0.25+(r/s));
-	} else {
-	    u = (float)0.5*x;
-	    return((one+u)*(one-u)+z*(r/s));
-	}
-}
-
-static const float
-u00  = -7.3804296553e-02, /* 0xbd9726b5 */
-u01  =  1.7666645348e-01, /* 0x3e34e80d */
-u02  = -1.3818567619e-02, /* 0xbc626746 */
-u03  =  3.4745343146e-04, /* 0x39b62a69 */
-u04  = -3.8140706238e-06, /* 0xb67ff53c */
-u05  =  1.9559013964e-08, /* 0x32a802ba */
-u06  = -3.9820518410e-11, /* 0xae2f21eb */
-v01  =  1.2730483897e-02, /* 0x3c509385 */
-v02  =  7.6006865129e-05, /* 0x389f65e0 */
-v03  =  2.5915085189e-07, /* 0x348b216c */
-v04  =  4.4111031494e-10; /* 0x2ff280c2 */
-
-float
-__ieee754_y0f(float x)
-{
-	float z, s,c,ss,cc,u,v;
-	int32_t hx,ix;
-
-	GET_FLOAT_WORD(hx,x);
-        ix = 0x7fffffff&hx;
-    /* Y0(NaN) is NaN, y0(-inf) is Nan, y0(inf) is 0  */
-	if(ix>=0x7f800000) return  one/(x+x*x);
-        if(ix==0) return -one/zero;
-        if(hx<0) return zero/zero;
-        if(ix >= 0x40000000) {  /* |x| >= 2.0 */
-        /* y0(x) = sqrt(2/(pi*x))*(p0(x)*sin(x0)+q0(x)*cos(x0))
-         * where x0 = x-pi/4
-         *      Better formula:
-         *              cos(x0) = cos(x)cos(pi/4)+sin(x)sin(pi/4)
-         *                      =  1/sqrt(2) * (sin(x) + cos(x))
-         *              sin(x0) = sin(x)cos(3pi/4)-cos(x)sin(3pi/4)
-         *                      =  1/sqrt(2) * (sin(x) - cos(x))
-         * To avoid cancellation, use
-         *              sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
-         * to compute the worse one.
-         */
-                s = sinf(x);
-                c = cosf(x);
-                ss = s-c;
-                cc = s+c;
-	/*
-	 * j0(x) = 1/sqrt(pi) * (P(0,x)*cc - Q(0,x)*ss) / sqrt(x)
-	 * y0(x) = 1/sqrt(pi) * (P(0,x)*ss + Q(0,x)*cc) / sqrt(x)
-	 */
-                if(ix<0x7f000000) {  /* make sure x+x not overflow */
-                    z = -cosf(x+x);
-                    if ((s*c)<zero) cc = z/ss;
-                    else            ss = z/cc;
-                }
-#ifdef DEAD_CODE
-                if(ix>0x80000000) z = (invsqrtpi*ss)/sqrtf(x);
-                else
-#endif
-		{
-                    u = pzerof(x); v = qzerof(x);
-                    z = invsqrtpi*(u*ss+v*cc)/sqrtf(x);
-                }
-                return z;
-	}
-	if(ix<=0x32000000) {	/* x < 2**-27 */
-	    return(u00 + tpi*__ieee754_logf(x));
-	}
-	z = x*x;
-	u = u00+z*(u01+z*(u02+z*(u03+z*(u04+z*(u05+z*u06)))));
-	v = one+z*(v01+z*(v02+z*(v03+z*v04)));
-	return(u/v + tpi*(__ieee754_j0f(x)*__ieee754_logf(x)));
-}
-
-/* The asymptotic expansions of pzero is
- *	1 - 9/128 s^2 + 11025/98304 s^4 - ...,	where s = 1/x.
- * For x >= 2, We approximate pzero by
- * 	pzero(x) = 1 + (R/S)
- * where  R = pR0 + pR1*s^2 + pR2*s^4 + ... + pR5*s^10
- * 	  S = 1 + pS0*s^2 + ... + pS4*s^10
- * and
- *	| pzero(x)-1-R/S | <= 2  ** ( -60.26)
- */
-static const float pR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-  0.0000000000e+00, /* 0x00000000 */
- -7.0312500000e-02, /* 0xbd900000 */
- -8.0816707611e+00, /* 0xc1014e86 */
- -2.5706311035e+02, /* 0xc3808814 */
- -2.4852163086e+03, /* 0xc51b5376 */
- -5.2530439453e+03, /* 0xc5a4285a */
-};
-static const float pS8[5] = {
-  1.1653436279e+02, /* 0x42e91198 */
-  3.8337448730e+03, /* 0x456f9beb */
-  4.0597855469e+04, /* 0x471e95db */
-  1.1675296875e+05, /* 0x47e4087c */
-  4.7627726562e+04, /* 0x473a0bba */
-};
-static const float pR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
- -1.1412546255e-11, /* 0xad48c58a */
- -7.0312492549e-02, /* 0xbd8fffff */
- -4.1596107483e+00, /* 0xc0851b88 */
- -6.7674766541e+01, /* 0xc287597b */
- -3.3123129272e+02, /* 0xc3a59d9b */
- -3.4643338013e+02, /* 0xc3ad3779 */
-};
-static const float pS5[5] = {
-  6.0753936768e+01, /* 0x42730408 */
-  1.0512523193e+03, /* 0x44836813 */
-  5.9789707031e+03, /* 0x45bad7c4 */
-  9.6254453125e+03, /* 0x461665c8 */
-  2.4060581055e+03, /* 0x451660ee */
-};
-
-static const float pR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */
- -2.5470459075e-09, /* 0xb12f081b */
- -7.0311963558e-02, /* 0xbd8fffb8 */
- -2.4090321064e+00, /* 0xc01a2d95 */
- -2.1965976715e+01, /* 0xc1afba52 */
- -5.8079170227e+01, /* 0xc2685112 */
- -3.1447946548e+01, /* 0xc1fb9565 */
-};
-static const float pS3[5] = {
-  3.5856033325e+01, /* 0x420f6c94 */
-  3.6151397705e+02, /* 0x43b4c1ca */
-  1.1936077881e+03, /* 0x44953373 */
-  1.1279968262e+03, /* 0x448cffe6 */
-  1.7358093262e+02, /* 0x432d94b8 */
-};
-
-static const float pR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
- -8.8753431271e-08, /* 0xb3be98b7 */
- -7.0303097367e-02, /* 0xbd8ffb12 */
- -1.4507384300e+00, /* 0xbfb9b1cc */
- -7.6356959343e+00, /* 0xc0f4579f */
- -1.1193166733e+01, /* 0xc1331736 */
- -3.2336456776e+00, /* 0xc04ef40d */
-};
-static const float pS2[5] = {
-  2.2220300674e+01, /* 0x41b1c32d */
-  1.3620678711e+02, /* 0x430834f0 */
-  2.7047027588e+02, /* 0x43873c32 */
-  1.5387539673e+02, /* 0x4319e01a */
-  1.4657617569e+01, /* 0x416a859a */
-};
-
-static float
-pzerof(float x)
-{
-	const float *p,*q;
-	float z,r,s;
-	int32_t ix;
-
-	p = q = 0;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;
-	if(ix>=0x41000000)     {p = pR8; q= pS8;}
-	else if(ix>=0x40f71c58){p = pR5; q= pS5;}
-	else if(ix>=0x4036db68){p = pR3; q= pS3;}
-	else if(ix>=0x40000000){p = pR2; q= pS2;}
-	z = one/(x*x);
-	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*q[4]))));
-	return one+ r/s;
-}
-
-
-/* For x >= 8, the asymptotic expansions of qzero is
- *	-1/8 s + 75/1024 s^3 - ..., where s = 1/x.
- * We approximate pzero by
- * 	qzero(x) = s*(-1.25 + (R/S))
- * where  R = qR0 + qR1*s^2 + qR2*s^4 + ... + qR5*s^10
- * 	  S = 1 + qS0*s^2 + ... + qS5*s^12
- * and
- *	| qzero(x)/s +1.25-R/S | <= 2  ** ( -61.22)
- */
-static const float qR8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-  0.0000000000e+00, /* 0x00000000 */
-  7.3242187500e-02, /* 0x3d960000 */
-  1.1768206596e+01, /* 0x413c4a93 */
-  5.5767340088e+02, /* 0x440b6b19 */
-  8.8591972656e+03, /* 0x460a6cca */
-  3.7014625000e+04, /* 0x471096a0 */
-};
-static const float qS8[6] = {
-  1.6377603149e+02, /* 0x4323c6aa */
-  8.0983447266e+03, /* 0x45fd12c2 */
-  1.4253829688e+05, /* 0x480b3293 */
-  8.0330925000e+05, /* 0x49441ed4 */
-  8.4050156250e+05, /* 0x494d3359 */
- -3.4389928125e+05, /* 0xc8a7eb69 */
-};
-
-static const float qR5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-  1.8408595828e-11, /* 0x2da1ec79 */
-  7.3242180049e-02, /* 0x3d95ffff */
-  5.8356351852e+00, /* 0x40babd86 */
-  1.3511157227e+02, /* 0x43071c90 */
-  1.0272437744e+03, /* 0x448067cd */
-  1.9899779053e+03, /* 0x44f8bf4b */
-};
-static const float qS5[6] = {
-  8.2776611328e+01, /* 0x42a58da0 */
-  2.0778142090e+03, /* 0x4501dd07 */
-  1.8847289062e+04, /* 0x46933e94 */
-  5.6751113281e+04, /* 0x475daf1d */
-  3.5976753906e+04, /* 0x470c88c1 */
- -5.3543427734e+03, /* 0xc5a752be */
-};
-
-static const float qR3[6] = {/* for x in [4.547,2.8571]=1/[0.2199,0.35001] */
-  4.3774099900e-09, /* 0x3196681b */
-  7.3241114616e-02, /* 0x3d95ff70 */
-  3.3442313671e+00, /* 0x405607e3 */
-  4.2621845245e+01, /* 0x422a7cc5 */
-  1.7080809021e+02, /* 0x432acedf */
-  1.6673394775e+02, /* 0x4326bbe4 */
-};
-static const float qS3[6] = {
-  4.8758872986e+01, /* 0x42430916 */
-  7.0968920898e+02, /* 0x44316c1c */
-  3.7041481934e+03, /* 0x4567825f */
-  6.4604252930e+03, /* 0x45c9e367 */
-  2.5163337402e+03, /* 0x451d4557 */
- -1.4924745178e+02, /* 0xc3153f59 */
-};
-
-static const float qR2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-  1.5044444979e-07, /* 0x342189db */
-  7.3223426938e-02, /* 0x3d95f62a */
-  1.9981917143e+00, /* 0x3fffc4bf */
-  1.4495602608e+01, /* 0x4167edfd */
-  3.1666231155e+01, /* 0x41fd5471 */
-  1.6252708435e+01, /* 0x4182058c */
-};
-static const float qS2[6] = {
-  3.0365585327e+01, /* 0x41f2ecb8 */
-  2.6934811401e+02, /* 0x4386ac8f */
-  8.4478375244e+02, /* 0x44533229 */
-  8.8293585205e+02, /* 0x445cbbe5 */
-  2.1266638184e+02, /* 0x4354aa98 */
- -5.3109550476e+00, /* 0xc0a9f358 */
-};
-
-static float
-qzerof(float x)
-{
-	const float *p,*q;
-	float s,r,z;
-	int32_t ix;
-
-	p = q = 0;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;
-	if(ix>=0x41000000)     {p = qR8; q= qS8;}
-	else if(ix>=0x40f71c58){p = qR5; q= qS5;}
-	else if(ix>=0x4036db68){p = qR3; q= qS3;}
-	else if(ix>=0x40000000){p = qR2; q= qS2;}
-	z = one/(x*x);
-	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*(q[4]+z*q[5])))));
-	return (-(float).125 + r/s)/x;
-}
diff --git a/lib/libm/src/e_j1.c b/lib/libm/src/e_j1.c
deleted file mode 100644
index e29b397c8..000000000
--- a/lib/libm/src/e_j1.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/* @(#)e_j1.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_j1.c,v 1.12 2007/08/20 16:01:38 drochner Exp $");
-#endif
-
-/* __ieee754_j1(x), __ieee754_y1(x)
- * Bessel function of the first and second kinds of order zero.
- * Method -- j1(x):
- *	1. For tiny x, we use j1(x) = x/2 - x^3/16 + x^5/384 - ...
- *	2. Reduce x to |x| since j1(x)=-j1(-x),  and
- *	   for x in (0,2)
- *		j1(x) = x/2 + x*z*R0/S0,  where z = x*x;
- *	   (precision:  |j1/x - 1/2 - R0/S0 |<2**-61.51 )
- *	   for x in (2,inf)
- * 		j1(x) = sqrt(2/(pi*x))*(p1(x)*cos(x1)-q1(x)*sin(x1))
- * 		y1(x) = sqrt(2/(pi*x))*(p1(x)*sin(x1)+q1(x)*cos(x1))
- * 	   where x1 = x-3*pi/4. It is better to compute sin(x1),cos(x1)
- *	   as follow:
- *		cos(x1) =  cos(x)cos(3pi/4)+sin(x)sin(3pi/4)
- *			=  1/sqrt(2) * (sin(x) - cos(x))
- *		sin(x1) =  sin(x)cos(3pi/4)-cos(x)sin(3pi/4)
- *			= -1/sqrt(2) * (sin(x) + cos(x))
- * 	   (To avoid cancellation, use
- *		sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
- * 	    to compute the worse one.)
- *
- *	3 Special cases
- *		j1(nan)= nan
- *		j1(0) = 0
- *		j1(inf) = 0
- *
- * Method -- y1(x):
- *	1. screen out x<=0 cases: y1(0)=-inf, y1(x<0)=NaN
- *	2. For x<2.
- *	   Since
- *		y1(x) = 2/pi*(j1(x)*(ln(x/2)+Euler)-1/x-x/2+5/64*x^3-...)
- *	   therefore y1(x)-2/pi*j1(x)*ln(x)-1/x is an odd function.
- *	   We use the following function to approximate y1,
- *		y1(x) = x*U(z)/V(z) + (2/pi)*(j1(x)*ln(x)-1/x), z= x^2
- *	   where for x in [0,2] (abs err less than 2**-65.89)
- *		U(z) = U0[0] + U0[1]*z + ... + U0[4]*z^4
- *		V(z) = 1  + v0[0]*z + ... + v0[4]*z^5
- *	   Note: For tiny x, 1/x dominate y1 and hence
- *		y1(tiny) = -2/pi/tiny, (choose tiny<2**-54)
- *	3. For x>=2.
- * 		y1(x) = sqrt(2/(pi*x))*(p1(x)*sin(x1)+q1(x)*cos(x1))
- * 	   where x1 = x-3*pi/4. It is better to compute sin(x1),cos(x1)
- *	   by method mentioned above.
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-static double pone(double), qone(double);
-
-static const double
-huge    = 1e300,
-one	= 1.0,
-invsqrtpi=  5.64189583547756279280e-01, /* 0x3FE20DD7, 0x50429B6D */
-tpi      =  6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */
-	/* R0/S0 on [0,2] */
-r00  = -6.25000000000000000000e-02, /* 0xBFB00000, 0x00000000 */
-r01  =  1.40705666955189706048e-03, /* 0x3F570D9F, 0x98472C61 */
-r02  = -1.59955631084035597520e-05, /* 0xBEF0C5C6, 0xBA169668 */
-r03  =  4.96727999609584448412e-08, /* 0x3E6AAAFA, 0x46CA0BD9 */
-s01  =  1.91537599538363460805e-02, /* 0x3F939D0B, 0x12637E53 */
-s02  =  1.85946785588630915560e-04, /* 0x3F285F56, 0xB9CDF664 */
-s03  =  1.17718464042623683263e-06, /* 0x3EB3BFF8, 0x333F8498 */
-s04  =  5.04636257076217042715e-09, /* 0x3E35AC88, 0xC97DFF2C */
-s05  =  1.23542274426137913908e-11; /* 0x3DAB2ACF, 0xCFB97ED8 */
-
-static const double zero    = 0.0;
-
-double
-__ieee754_j1(double x)
-{
-	double z, s,c,ss,cc,r,u,v,y;
-	int32_t hx,ix;
-
-	GET_HIGH_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7ff00000) return one/x;
-	y = fabs(x);
-	if(ix >= 0x40000000) {	/* |x| >= 2.0 */
-		s = sin(y);
-		c = cos(y);
-		ss = -s-c;
-		cc = s-c;
-		if(ix<0x7fe00000) {  /* make sure y+y not overflow */
-		    z = cos(y+y);
-		    if ((s*c)>zero) cc = z/ss;
-		    else 	    ss = z/cc;
-		}
-	/*
-	 * j1(x) = 1/sqrt(pi) * (P(1,x)*cc - Q(1,x)*ss) / sqrt(x)
-	 * y1(x) = 1/sqrt(pi) * (P(1,x)*ss + Q(1,x)*cc) / sqrt(x)
-	 */
-		if(ix>0x48000000) z = (invsqrtpi*cc)/sqrt(y);
-		else {
-		    u = pone(y); v = qone(y);
-		    z = invsqrtpi*(u*cc-v*ss)/sqrt(y);
-		}
-		if(hx<0) return -z;
-		else  	 return  z;
-	}
-	if(ix<0x3e400000) {	/* |x|<2**-27 */
-	    if(huge+x>one) return 0.5*x;/* inexact if x!=0 necessary */
-	}
-	z = x*x;
-	r =  z*(r00+z*(r01+z*(r02+z*r03)));
-	s =  one+z*(s01+z*(s02+z*(s03+z*(s04+z*s05))));
-	r *= x;
-	return(x*0.5+r/s);
-}
-
-static const double U0[5] = {
- -1.96057090646238940668e-01, /* 0xBFC91866, 0x143CBC8A */
-  5.04438716639811282616e-02, /* 0x3FA9D3C7, 0x76292CD1 */
- -1.91256895875763547298e-03, /* 0xBF5F55E5, 0x4844F50F */
-  2.35252600561610495928e-05, /* 0x3EF8AB03, 0x8FA6B88E */
- -9.19099158039878874504e-08, /* 0xBE78AC00, 0x569105B8 */
-};
-static const double V0[5] = {
-  1.99167318236649903973e-02, /* 0x3F94650D, 0x3F4DA9F0 */
-  2.02552581025135171496e-04, /* 0x3F2A8C89, 0x6C257764 */
-  1.35608801097516229404e-06, /* 0x3EB6C05A, 0x894E8CA6 */
-  6.22741452364621501295e-09, /* 0x3E3ABF1D, 0x5BA69A86 */
-  1.66559246207992079114e-11, /* 0x3DB25039, 0xDACA772A */
-};
-
-double
-__ieee754_y1(double x)
-{
-	double z, s,c,ss,cc,u,v;
-	int32_t hx,ix,lx;
-
-	EXTRACT_WORDS(hx,lx,x);
-        ix = 0x7fffffff&hx;
-    /* if Y1(NaN) is NaN, Y1(-inf) is NaN, Y1(inf) is 0 */
-	if(ix>=0x7ff00000) return  one/(x+x*x);
-        if((ix|lx)==0) return -one/zero;
-        if(hx<0) return zero/zero;
-        if(ix >= 0x40000000) {  /* |x| >= 2.0 */
-                s = sin(x);
-                c = cos(x);
-                ss = -s-c;
-                cc = s-c;
-                if(ix<0x7fe00000) {  /* make sure x+x not overflow */
-                    z = cos(x+x);
-                    if ((s*c)>zero) cc = z/ss;
-                    else            ss = z/cc;
-                }
-        /* y1(x) = sqrt(2/(pi*x))*(p1(x)*sin(x0)+q1(x)*cos(x0))
-         * where x0 = x-3pi/4
-         *      Better formula:
-         *              cos(x0) = cos(x)cos(3pi/4)+sin(x)sin(3pi/4)
-         *                      =  1/sqrt(2) * (sin(x) - cos(x))
-         *              sin(x0) = sin(x)cos(3pi/4)-cos(x)sin(3pi/4)
-         *                      = -1/sqrt(2) * (cos(x) + sin(x))
-         * To avoid cancellation, use
-         *              sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
-         * to compute the worse one.
-         */
-                if(ix>0x48000000) z = (invsqrtpi*ss)/sqrt(x);
-                else {
-                    u = pone(x); v = qone(x);
-                    z = invsqrtpi*(u*ss+v*cc)/sqrt(x);
-                }
-                return z;
-        }
-        if(ix<=0x3c900000) {    /* x < 2**-54 */
-            return(-tpi/x);
-        }
-        z = x*x;
-        u = U0[0]+z*(U0[1]+z*(U0[2]+z*(U0[3]+z*U0[4])));
-        v = one+z*(V0[0]+z*(V0[1]+z*(V0[2]+z*(V0[3]+z*V0[4]))));
-        return(x*(u/v) + tpi*(__ieee754_j1(x)*__ieee754_log(x)-one/x));
-}
-
-/* For x >= 8, the asymptotic expansions of pone is
- *	1 + 15/128 s^2 - 4725/2^15 s^4 - ...,	where s = 1/x.
- * We approximate pone by
- * 	pone(x) = 1 + (R/S)
- * where  R = pr0 + pr1*s^2 + pr2*s^4 + ... + pr5*s^10
- * 	  S = 1 + ps0*s^2 + ... + ps4*s^10
- * and
- *	| pone(x)-1-R/S | <= 2  ** ( -60.06)
- */
-
-static const double pr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-  0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */
-  1.17187499999988647970e-01, /* 0x3FBDFFFF, 0xFFFFFCCE */
-  1.32394806593073575129e+01, /* 0x402A7A9D, 0x357F7FCE */
-  4.12051854307378562225e+02, /* 0x4079C0D4, 0x652EA590 */
-  3.87474538913960532227e+03, /* 0x40AE457D, 0xA3A532CC */
-  7.91447954031891731574e+03, /* 0x40BEEA7A, 0xC32782DD */
-};
-static const double ps8[5] = {
-  1.14207370375678408436e+02, /* 0x405C8D45, 0x8E656CAC */
-  3.65093083420853463394e+03, /* 0x40AC85DC, 0x964D274F */
-  3.69562060269033463555e+04, /* 0x40E20B86, 0x97C5BB7F */
-  9.76027935934950801311e+04, /* 0x40F7D42C, 0xB28F17BB */
-  3.08042720627888811578e+04, /* 0x40DE1511, 0x697A0B2D */
-};
-
-static const double pr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-  1.31990519556243522749e-11, /* 0x3DAD0667, 0xDAE1CA7D */
-  1.17187493190614097638e-01, /* 0x3FBDFFFF, 0xE2C10043 */
-  6.80275127868432871736e+00, /* 0x401B3604, 0x6E6315E3 */
-  1.08308182990189109773e+02, /* 0x405B13B9, 0x452602ED */
-  5.17636139533199752805e+02, /* 0x40802D16, 0xD052D649 */
-  5.28715201363337541807e+02, /* 0x408085B8, 0xBB7E0CB7 */
-};
-static const double ps5[5] = {
-  5.92805987221131331921e+01, /* 0x404DA3EA, 0xA8AF633D */
-  9.91401418733614377743e+02, /* 0x408EFB36, 0x1B066701 */
-  5.35326695291487976647e+03, /* 0x40B4E944, 0x5706B6FB */
-  7.84469031749551231769e+03, /* 0x40BEA4B0, 0xB8A5BB15 */
-  1.50404688810361062679e+03, /* 0x40978030, 0x036F5E51 */
-};
-
-static const double pr3[6] = {
-  3.02503916137373618024e-09, /* 0x3E29FC21, 0xA7AD9EDD */
-  1.17186865567253592491e-01, /* 0x3FBDFFF5, 0x5B21D17B */
-  3.93297750033315640650e+00, /* 0x400F76BC, 0xE85EAD8A */
-  3.51194035591636932736e+01, /* 0x40418F48, 0x9DA6D129 */
-  9.10550110750781271918e+01, /* 0x4056C385, 0x4D2C1837 */
-  4.85590685197364919645e+01, /* 0x4048478F, 0x8EA83EE5 */
-};
-static const double ps3[5] = {
-  3.47913095001251519989e+01, /* 0x40416549, 0xA134069C */
-  3.36762458747825746741e+02, /* 0x40750C33, 0x07F1A75F */
-  1.04687139975775130551e+03, /* 0x40905B7C, 0x5037D523 */
-  8.90811346398256432622e+02, /* 0x408BD67D, 0xA32E31E9 */
-  1.03787932439639277504e+02, /* 0x4059F26D, 0x7C2EED53 */
-};
-
-static const double pr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-  1.07710830106873743082e-07, /* 0x3E7CE9D4, 0xF65544F4 */
-  1.17176219462683348094e-01, /* 0x3FBDFF42, 0xBE760D83 */
-  2.36851496667608785174e+00, /* 0x4002F2B7, 0xF98FAEC0 */
-  1.22426109148261232917e+01, /* 0x40287C37, 0x7F71A964 */
-  1.76939711271687727390e+01, /* 0x4031B1A8, 0x177F8EE2 */
-  5.07352312588818499250e+00, /* 0x40144B49, 0xA574C1FE */
-};
-static const double ps2[5] = {
-  2.14364859363821409488e+01, /* 0x40356FBD, 0x8AD5ECDC */
-  1.25290227168402751090e+02, /* 0x405F5293, 0x14F92CD5 */
-  2.32276469057162813669e+02, /* 0x406D08D8, 0xD5A2DBD9 */
-  1.17679373287147100768e+02, /* 0x405D6B7A, 0xDA1884A9 */
-  8.36463893371618283368e+00, /* 0x4020BAB1, 0xF44E5192 */
-};
-
-static double
-pone(double x)
-{
-	const double *p,*q;
-	double z,r,s;
-        int32_t ix;
-
-	p = q = 0;
-	GET_HIGH_WORD(ix,x);
-	ix &= 0x7fffffff;
-        if(ix>=0x40200000)     {p = pr8; q= ps8;}
-        else if(ix>=0x40122E8B){p = pr5; q= ps5;}
-        else if(ix>=0x4006DB6D){p = pr3; q= ps3;}
-        else if(ix>=0x40000000){p = pr2; q= ps2;}
-        z = one/(x*x);
-        r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-        s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*q[4]))));
-        return one+ r/s;
-}
-
-
-/* For x >= 8, the asymptotic expansions of qone is
- *	3/8 s - 105/1024 s^3 - ..., where s = 1/x.
- * We approximate pone by
- * 	qone(x) = s*(0.375 + (R/S))
- * where  R = qr1*s^2 + qr2*s^4 + ... + qr5*s^10
- * 	  S = 1 + qs1*s^2 + ... + qs6*s^12
- * and
- *	| qone(x)/s -0.375-R/S | <= 2  ** ( -61.13)
- */
-
-static const double qr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-  0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */
- -1.02539062499992714161e-01, /* 0xBFBA3FFF, 0xFFFFFDF3 */
- -1.62717534544589987888e+01, /* 0xC0304591, 0xA26779F7 */
- -7.59601722513950107896e+02, /* 0xC087BCD0, 0x53E4B576 */
- -1.18498066702429587167e+04, /* 0xC0C724E7, 0x40F87415 */
- -4.84385124285750353010e+04, /* 0xC0E7A6D0, 0x65D09C6A */
-};
-static const double qs8[6] = {
-  1.61395369700722909556e+02, /* 0x40642CA6, 0xDE5BCDE5 */
-  7.82538599923348465381e+03, /* 0x40BE9162, 0xD0D88419 */
-  1.33875336287249578163e+05, /* 0x4100579A, 0xB0B75E98 */
-  7.19657723683240939863e+05, /* 0x4125F653, 0x72869C19 */
-  6.66601232617776375264e+05, /* 0x412457D2, 0x7719AD5C */
- -2.94490264303834643215e+05, /* 0xC111F969, 0x0EA5AA18 */
-};
-
-static const double qr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
- -2.08979931141764104297e-11, /* 0xBDB6FA43, 0x1AA1A098 */
- -1.02539050241375426231e-01, /* 0xBFBA3FFF, 0xCB597FEF */
- -8.05644828123936029840e+00, /* 0xC0201CE6, 0xCA03AD4B */
- -1.83669607474888380239e+02, /* 0xC066F56D, 0x6CA7B9B0 */
- -1.37319376065508163265e+03, /* 0xC09574C6, 0x6931734F */
- -2.61244440453215656817e+03, /* 0xC0A468E3, 0x88FDA79D */
-};
-static const double qs5[6] = {
-  8.12765501384335777857e+01, /* 0x405451B2, 0xFF5A11B2 */
-  1.99179873460485964642e+03, /* 0x409F1F31, 0xE77BF839 */
-  1.74684851924908907677e+04, /* 0x40D10F1F, 0x0D64CE29 */
-  4.98514270910352279316e+04, /* 0x40E8576D, 0xAABAD197 */
-  2.79480751638918118260e+04, /* 0x40DB4B04, 0xCF7C364B */
- -4.71918354795128470869e+03, /* 0xC0B26F2E, 0xFCFFA004 */
-};
-
-static const double qr3[6] = {
- -5.07831226461766561369e-09, /* 0xBE35CFA9, 0xD38FC84F */
- -1.02537829820837089745e-01, /* 0xBFBA3FEB, 0x51AEED54 */
- -4.61011581139473403113e+00, /* 0xC01270C2, 0x3302D9FF */
- -5.78472216562783643212e+01, /* 0xC04CEC71, 0xC25D16DA */
- -2.28244540737631695038e+02, /* 0xC06C87D3, 0x4718D55F */
- -2.19210128478909325622e+02, /* 0xC06B66B9, 0x5F5C1BF6 */
-};
-static const double qs3[6] = {
-  4.76651550323729509273e+01, /* 0x4047D523, 0xCCD367E4 */
-  6.73865112676699709482e+02, /* 0x40850EEB, 0xC031EE3E */
-  3.38015286679526343505e+03, /* 0x40AA684E, 0x448E7C9A */
-  5.54772909720722782367e+03, /* 0x40B5ABBA, 0xA61D54A6 */
-  1.90311919338810798763e+03, /* 0x409DBC7A, 0x0DD4DF4B */
- -1.35201191444307340817e+02, /* 0xC060E670, 0x290A311F */
-};
-
-static const double qr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
- -1.78381727510958865572e-07, /* 0xBE87F126, 0x44C626D2 */
- -1.02517042607985553460e-01, /* 0xBFBA3E8E, 0x9148B010 */
- -2.75220568278187460720e+00, /* 0xC0060484, 0x69BB4EDA */
- -1.96636162643703720221e+01, /* 0xC033A9E2, 0xC168907F */
- -4.23253133372830490089e+01, /* 0xC04529A3, 0xDE104AAA */
- -2.13719211703704061733e+01, /* 0xC0355F36, 0x39CF6E52 */
-};
-static const double qs2[6] = {
-  2.95333629060523854548e+01, /* 0x403D888A, 0x78AE64FF */
-  2.52981549982190529136e+02, /* 0x406F9F68, 0xDB821CBA */
-  7.57502834868645436472e+02, /* 0x4087AC05, 0xCE49A0F7 */
-  7.39393205320467245656e+02, /* 0x40871B25, 0x48D4C029 */
-  1.55949003336666123687e+02, /* 0x40637E5E, 0x3C3ED8D4 */
- -4.95949898822628210127e+00, /* 0xC013D686, 0xE71BE86B */
-};
-
-static double
-qone(double x)
-{
-	const double *p,*q;
-	double  s,r,z;
-	int32_t ix;
-
-	p = q = 0;
-	GET_HIGH_WORD(ix,x);
-	ix &= 0x7fffffff;
-	if(ix>=0x40200000)     {p = qr8; q= qs8;}
-	else if(ix>=0x40122E8B){p = qr5; q= qs5;}
-	else if(ix>=0x4006DB6D){p = qr3; q= qs3;}
-	else if(ix>=0x40000000){p = qr2; q= qs2;}
-	z = one/(x*x);
-	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*(q[4]+z*q[5])))));
-	return (.375 + r/s)/x;
-}
diff --git a/lib/libm/src/e_j1f.c b/lib/libm/src/e_j1f.c
deleted file mode 100644
index aef9fe653..000000000
--- a/lib/libm/src/e_j1f.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/* e_j1f.c -- float version of e_j1.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_j1f.c,v 1.11 2007/08/20 16:01:38 drochner Exp $");
-#endif
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-static float ponef(float), qonef(float);
-
-static const float
-huge    = 1e30,
-one	= 1.0,
-invsqrtpi=  5.6418961287e-01, /* 0x3f106ebb */
-tpi      =  6.3661974669e-01, /* 0x3f22f983 */
-	/* R0/S0 on [0,2] */
-r00  = -6.2500000000e-02, /* 0xbd800000 */
-r01  =  1.4070566976e-03, /* 0x3ab86cfd */
-r02  = -1.5995563444e-05, /* 0xb7862e36 */
-r03  =  4.9672799207e-08, /* 0x335557d2 */
-s01  =  1.9153760746e-02, /* 0x3c9ce859 */
-s02  =  1.8594678841e-04, /* 0x3942fab6 */
-s03  =  1.1771846857e-06, /* 0x359dffc2 */
-s04  =  5.0463624390e-09, /* 0x31ad6446 */
-s05  =  1.2354227016e-11; /* 0x2d59567e */
-
-static const float zero    = 0.0;
-
-float
-__ieee754_j1f(float x)
-{
-	float z, s,c,ss,cc,r,u,v,y;
-	int32_t hx,ix;
-
-	GET_FLOAT_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7f800000) return one/x;
-	y = fabsf(x);
-	if(ix >= 0x40000000) {	/* |x| >= 2.0 */
-		s = sinf(y);
-		c = cosf(y);
-		ss = -s-c;
-		cc = s-c;
-		if(ix<0x7f000000) {  /* make sure y+y not overflow */
-		    z = cosf(y+y);
-		    if ((s*c)>zero) cc = z/ss;
-		    else 	    ss = z/cc;
-		}
-	/*
-	 * j1(x) = 1/sqrt(pi) * (P(1,x)*cc - Q(1,x)*ss) / sqrt(x)
-	 * y1(x) = 1/sqrt(pi) * (P(1,x)*ss + Q(1,x)*cc) / sqrt(x)
-	 */
-#ifdef DEAD_CODE
-		if(ix>0x80000000) z = (invsqrtpi*cc)/sqrtf(y);
-		else
-#endif
-		{
-		    u = ponef(y); v = qonef(y);
-		    z = invsqrtpi*(u*cc-v*ss)/sqrtf(y);
-		}
-		if(hx<0) return -z;
-		else  	 return  z;
-	}
-	if(ix<0x32000000) {	/* |x|<2**-27 */
-	    if(huge+x>one) return (float)0.5*x;/* inexact if x!=0 necessary */
-	}
-	z = x*x;
-	r =  z*(r00+z*(r01+z*(r02+z*r03)));
-	s =  one+z*(s01+z*(s02+z*(s03+z*(s04+z*s05))));
-	r *= x;
-	return(x*(float)0.5+r/s);
-}
-
-static const float U0[5] = {
- -1.9605709612e-01, /* 0xbe48c331 */
-  5.0443872809e-02, /* 0x3d4e9e3c */
- -1.9125689287e-03, /* 0xbafaaf2a */
-  2.3525259166e-05, /* 0x37c5581c */
- -9.1909917899e-08, /* 0xb3c56003 */
-};
-static const float V0[5] = {
-  1.9916731864e-02, /* 0x3ca3286a */
-  2.0255257550e-04, /* 0x3954644b */
-  1.3560879779e-06, /* 0x35b602d4 */
-  6.2274145840e-09, /* 0x31d5f8eb */
-  1.6655924903e-11, /* 0x2d9281cf */
-};
-
-float
-__ieee754_y1f(float x)
-{
-	float z, s,c,ss,cc,u,v;
-	int32_t hx,ix;
-
-	GET_FLOAT_WORD(hx,x);
-        ix = 0x7fffffff&hx;
-    /* if Y1(NaN) is NaN, Y1(-inf) is NaN, Y1(inf) is 0 */
-	if(ix>=0x7f800000) return  one/(x+x*x);
-        if(ix==0) return -one/zero;
-        if(hx<0) return zero/zero;
-        if(ix >= 0x40000000) {  /* |x| >= 2.0 */
-                s = sinf(x);
-                c = cosf(x);
-                ss = -s-c;
-                cc = s-c;
-                if(ix<0x7f000000) {  /* make sure x+x not overflow */
-                    z = cosf(x+x);
-                    if ((s*c)>zero) cc = z/ss;
-                    else            ss = z/cc;
-                }
-        /* y1(x) = sqrt(2/(pi*x))*(p1(x)*sin(x0)+q1(x)*cos(x0))
-         * where x0 = x-3pi/4
-         *      Better formula:
-         *              cos(x0) = cos(x)cos(3pi/4)+sin(x)sin(3pi/4)
-         *                      =  1/sqrt(2) * (sin(x) - cos(x))
-         *              sin(x0) = sin(x)cos(3pi/4)-cos(x)sin(3pi/4)
-         *                      = -1/sqrt(2) * (cos(x) + sin(x))
-         * To avoid cancellation, use
-         *              sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
-         * to compute the worse one.
-         */
-                if(ix>0x48000000) z = (invsqrtpi*ss)/sqrtf(x);
-                else {
-                    u = ponef(x); v = qonef(x);
-                    z = invsqrtpi*(u*ss+v*cc)/sqrtf(x);
-                }
-                return z;
-        }
-        if(ix<=0x24800000) {    /* x < 2**-54 */
-            return(-tpi/x);
-        }
-        z = x*x;
-        u = U0[0]+z*(U0[1]+z*(U0[2]+z*(U0[3]+z*U0[4])));
-        v = one+z*(V0[0]+z*(V0[1]+z*(V0[2]+z*(V0[3]+z*V0[4]))));
-        return(x*(u/v) + tpi*(__ieee754_j1f(x)*__ieee754_logf(x)-one/x));
-}
-
-/* For x >= 8, the asymptotic expansions of pone is
- *	1 + 15/128 s^2 - 4725/2^15 s^4 - ...,	where s = 1/x.
- * We approximate pone by
- * 	pone(x) = 1 + (R/S)
- * where  R = pr0 + pr1*s^2 + pr2*s^4 + ... + pr5*s^10
- * 	  S = 1 + ps0*s^2 + ... + ps4*s^10
- * and
- *	| pone(x)-1-R/S | <= 2  ** ( -60.06)
- */
-
-static const float pr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-  0.0000000000e+00, /* 0x00000000 */
-  1.1718750000e-01, /* 0x3df00000 */
-  1.3239480972e+01, /* 0x4153d4ea */
-  4.1205184937e+02, /* 0x43ce06a3 */
-  3.8747453613e+03, /* 0x45722bed */
-  7.9144794922e+03, /* 0x45f753d6 */
-};
-static const float ps8[5] = {
-  1.1420736694e+02, /* 0x42e46a2c */
-  3.6509309082e+03, /* 0x45642ee5 */
-  3.6956207031e+04, /* 0x47105c35 */
-  9.7602796875e+04, /* 0x47bea166 */
-  3.0804271484e+04, /* 0x46f0a88b */
-};
-
-static const float pr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
-  1.3199052094e-11, /* 0x2d68333f */
-  1.1718749255e-01, /* 0x3defffff */
-  6.8027510643e+00, /* 0x40d9b023 */
-  1.0830818176e+02, /* 0x42d89dca */
-  5.1763616943e+02, /* 0x440168b7 */
-  5.2871520996e+02, /* 0x44042dc6 */
-};
-static const float ps5[5] = {
-  5.9280597687e+01, /* 0x426d1f55 */
-  9.9140142822e+02, /* 0x4477d9b1 */
-  5.3532670898e+03, /* 0x45a74a23 */
-  7.8446904297e+03, /* 0x45f52586 */
-  1.5040468750e+03, /* 0x44bc0180 */
-};
-
-static const float pr3[6] = {
-  3.0250391081e-09, /* 0x314fe10d */
-  1.1718686670e-01, /* 0x3defffab */
-  3.9329774380e+00, /* 0x407bb5e7 */
-  3.5119403839e+01, /* 0x420c7a45 */
-  9.1055007935e+01, /* 0x42b61c2a */
-  4.8559066772e+01, /* 0x42423c7c */
-};
-static const float ps3[5] = {
-  3.4791309357e+01, /* 0x420b2a4d */
-  3.3676245117e+02, /* 0x43a86198 */
-  1.0468714600e+03, /* 0x4482dbe3 */
-  8.9081134033e+02, /* 0x445eb3ed */
-  1.0378793335e+02, /* 0x42cf936c */
-};
-
-static const float pr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
-  1.0771083225e-07, /* 0x33e74ea8 */
-  1.1717621982e-01, /* 0x3deffa16 */
-  2.3685150146e+00, /* 0x401795c0 */
-  1.2242610931e+01, /* 0x4143e1bc */
-  1.7693971634e+01, /* 0x418d8d41 */
-  5.0735230446e+00, /* 0x40a25a4d */
-};
-static const float ps2[5] = {
-  2.1436485291e+01, /* 0x41ab7dec */
-  1.2529022980e+02, /* 0x42fa9499 */
-  2.3227647400e+02, /* 0x436846c7 */
-  1.1767937469e+02, /* 0x42eb5bd7 */
-  8.3646392822e+00, /* 0x4105d590 */
-};
-
-static float
-ponef(float x)
-{
-	const float *p,*q;
-	float z,r,s;
-        int32_t ix;
-
-	p = q = 0;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;
-        if(ix>=0x41000000)     {p = pr8; q= ps8;}
-        else if(ix>=0x40f71c58){p = pr5; q= ps5;}
-        else if(ix>=0x4036db68){p = pr3; q= ps3;}
-        else if(ix>=0x40000000){p = pr2; q= ps2;}
-        z = one/(x*x);
-        r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-        s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*q[4]))));
-        return one+ r/s;
-}
-
-
-/* For x >= 8, the asymptotic expansions of qone is
- *	3/8 s - 105/1024 s^3 - ..., where s = 1/x.
- * We approximate pone by
- * 	qone(x) = s*(0.375 + (R/S))
- * where  R = qr1*s^2 + qr2*s^4 + ... + qr5*s^10
- * 	  S = 1 + qs1*s^2 + ... + qs6*s^12
- * and
- *	| qone(x)/s -0.375-R/S | <= 2  ** ( -61.13)
- */
-
-static const float qr8[6] = { /* for x in [inf, 8]=1/[0,0.125] */
-  0.0000000000e+00, /* 0x00000000 */
- -1.0253906250e-01, /* 0xbdd20000 */
- -1.6271753311e+01, /* 0xc1822c8d */
- -7.5960174561e+02, /* 0xc43de683 */
- -1.1849806641e+04, /* 0xc639273a */
- -4.8438511719e+04, /* 0xc73d3683 */
-};
-static const float qs8[6] = {
-  1.6139537048e+02, /* 0x43216537 */
-  7.8253862305e+03, /* 0x45f48b17 */
-  1.3387534375e+05, /* 0x4802bcd6 */
-  7.1965775000e+05, /* 0x492fb29c */
-  6.6660125000e+05, /* 0x4922be94 */
- -2.9449025000e+05, /* 0xc88fcb48 */
-};
-
-static const float qr5[6] = { /* for x in [8,4.5454]=1/[0.125,0.22001] */
- -2.0897993405e-11, /* 0xadb7d219 */
- -1.0253904760e-01, /* 0xbdd1fffe */
- -8.0564479828e+00, /* 0xc100e736 */
- -1.8366960144e+02, /* 0xc337ab6b */
- -1.3731937256e+03, /* 0xc4aba633 */
- -2.6124443359e+03, /* 0xc523471c */
-};
-static const float qs5[6] = {
-  8.1276550293e+01, /* 0x42a28d98 */
-  1.9917987061e+03, /* 0x44f8f98f */
-  1.7468484375e+04, /* 0x468878f8 */
-  4.9851425781e+04, /* 0x4742bb6d */
-  2.7948074219e+04, /* 0x46da5826 */
- -4.7191835938e+03, /* 0xc5937978 */
-};
-
-static const float qr3[6] = { /* for x in [4.5454,2.8570]=1/[0.22001,0.3499] */
- -5.0783124372e-09, /* 0xb1ae7d4f */
- -1.0253783315e-01, /* 0xbdd1ff5b */
- -4.6101160049e+00, /* 0xc0938612 */
- -5.7847221375e+01, /* 0xc267638e */
- -2.2824453735e+02, /* 0xc3643e9a */
- -2.1921012878e+02, /* 0xc35b35cb */
-};
-static const float qs3[6] = {
-  4.7665153503e+01, /* 0x423ea91e */
-  6.7386511230e+02, /* 0x4428775e */
-  3.3801528320e+03, /* 0x45534272 */
-  5.5477290039e+03, /* 0x45ad5dd5 */
-  1.9031191406e+03, /* 0x44ede3d0 */
- -1.3520118713e+02, /* 0xc3073381 */
-};
-
-static const float qr2[6] = {/* for x in [2.8570,2]=1/[0.3499,0.5] */
- -1.7838172539e-07, /* 0xb43f8932 */
- -1.0251704603e-01, /* 0xbdd1f475 */
- -2.7522056103e+00, /* 0xc0302423 */
- -1.9663616180e+01, /* 0xc19d4f16 */
- -4.2325313568e+01, /* 0xc2294d1f */
- -2.1371921539e+01, /* 0xc1aaf9b2 */
-};
-static const float qs2[6] = {
-  2.9533363342e+01, /* 0x41ec4454 */
-  2.5298155212e+02, /* 0x437cfb47 */
-  7.5750280762e+02, /* 0x443d602e */
-  7.3939318848e+02, /* 0x4438d92a */
-  1.5594900513e+02, /* 0x431bf2f2 */
- -4.9594988823e+00, /* 0xc09eb437 */
-};
-
-static float
-qonef(float x)
-{
-	const float *p,*q;
-	float  s,r,z;
-	int32_t ix;
-
-	p = q = 0;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;
-	/* [inf, 8]		(8      41000000) */
-	if(ix>=0x41000000)     {p = qr8; q= qs8;}
-	/* [8, 4.5454]		(4.5454 409173eb) */
-	else if(ix>=0x409173eb){p = qr5; q= qs5;}
-	/* [4.5454, 2.8570] 	(2.8570	4036d917) */
-	else if(ix>=0x4036d917){p = qr3; q= qs3;}
-	/* [2.8570, 2]		(2 	40000000) */
-	else if(ix>=0x40000000){p = qr2; q= qs2;}
-	z = one/(x*x);
-	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
-	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*(q[4]+z*q[5])))));
-	return ((float).375 + r/s)/x;
-}
diff --git a/lib/libm/src/e_jn.c b/lib/libm/src/e_jn.c
deleted file mode 100644
index 07d963a25..000000000
--- a/lib/libm/src/e_jn.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* @(#)e_jn.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_jn.c,v 1.14 2010/11/29 15:10:06 drochner Exp $");
-#endif
-
-/*
- * __ieee754_jn(n, x), __ieee754_yn(n, x)
- * floating point Bessel's function of the 1st and 2nd kind
- * of order n
- *
- * Special cases:
- *	y0(0)=y1(0)=yn(n,0) = -inf with division by zero signal;
- *	y0(-ve)=y1(-ve)=yn(n,-ve) are NaN with invalid signal.
- * Note 2. About jn(n,x), yn(n,x)
- *	For n=0, j0(x) is called,
- *	for n=1, j1(x) is called,
- *	for n<x, forward recursion us used starting
- *	from values of j0(x) and j1(x).
- *	for n>x, a continued fraction approximation to
- *	j(n,x)/j(n-1,x) is evaluated and then backward
- *	recursion is used starting from a supposed value
- *	for j(n,x). The resulting value of j(0,x) is
- *	compared with the actual value to correct the
- *	supposed value of j(n,x).
- *
- *	yn(n,x) is similar in all respects, except
- *	that forward recursion is used for all
- *	values of n>1.
- *
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-static const double
-invsqrtpi=  5.64189583547756279280e-01, /* 0x3FE20DD7, 0x50429B6D */
-two   =  2.00000000000000000000e+00, /* 0x40000000, 0x00000000 */
-one   =  1.00000000000000000000e+00; /* 0x3FF00000, 0x00000000 */
-
-static const double zero  =  0.00000000000000000000e+00;
-
-double
-__ieee754_jn(int n, double x)
-{
-	int32_t i,hx,ix,lx, sgn;
-	double a, b, temp, di;
-	double z, w;
-
-	temp = 0;
-    /* J(-n,x) = (-1)^n * J(n, x), J(n, -x) = (-1)^n * J(n, x)
-     * Thus, J(-n,x) = J(n,-x)
-     */
-	EXTRACT_WORDS(hx,lx,x);
-	ix = 0x7fffffff&hx;
-    /* if J(n,NaN) is NaN */
-	if((ix|((u_int32_t)(lx|-lx))>>31)>0x7ff00000) return x+x;
-	if(n<0){
-		n = -n;
-		x = -x;
-		hx ^= 0x80000000;
-	}
-	if(n==0) return(__ieee754_j0(x));
-	if(n==1) return(__ieee754_j1(x));
-	sgn = (n&1)&(hx>>31);	/* even n -- 0, odd n -- sign(x) */
-	x = fabs(x);
-	if((ix|lx)==0||ix>=0x7ff00000) 	/* if x is 0 or inf */
-	    b = zero;
-	else if((double)n<=x) {
-		/* Safe to use J(n+1,x)=2n/x *J(n,x)-J(n-1,x) */
-	    if(ix>=0x52D00000) { /* x > 2**302 */
-    /* (x >> n**2)
-     *	    Jn(x) = cos(x-(2n+1)*pi/4)*sqrt(2/x*pi)
-     *	    Yn(x) = sin(x-(2n+1)*pi/4)*sqrt(2/x*pi)
-     *	    Let s=sin(x), c=cos(x),
-     *		xn=x-(2n+1)*pi/4, sqt2 = sqrt(2),then
-     *
-     *		   n	sin(xn)*sqt2	cos(xn)*sqt2
-     *		----------------------------------
-     *		   0	 s-c		 c+s
-     *		   1	-s-c 		-c+s
-     *		   2	-s+c		-c-s
-     *		   3	 s+c		 c-s
-     */
-		switch(n&3) {
-		    case 0: temp =  cos(x)+sin(x); break;
-		    case 1: temp = -cos(x)+sin(x); break;
-		    case 2: temp = -cos(x)-sin(x); break;
-		    case 3: temp =  cos(x)-sin(x); break;
-		}
-		b = invsqrtpi*temp/sqrt(x);
-	    } else {
-	        a = __ieee754_j0(x);
-	        b = __ieee754_j1(x);
-	        for(i=1;i<n;i++){
-		    temp = b;
-		    b = b*((double)(i+i)/x) - a; /* avoid underflow */
-		    a = temp;
-	        }
-	    }
-	} else {
-	    if(ix<0x3e100000) {	/* x < 2**-29 */
-    /* x is tiny, return the first Taylor expansion of J(n,x)
-     * J(n,x) = 1/n!*(x/2)^n  - ...
-     */
-		if(n>33)	/* underflow */
-		    b = zero;
-		else {
-		    temp = x*0.5; b = temp;
-		    for (a=one,i=2;i<=n;i++) {
-			a *= (double)i;		/* a = n! */
-			b *= temp;		/* b = (x/2)^n */
-		    }
-		    b = b/a;
-		}
-	    } else {
-		/* use backward recurrence */
-		/* 			x      x^2      x^2
-		 *  J(n,x)/J(n-1,x) =  ----   ------   ------   .....
-		 *			2n  - 2(n+1) - 2(n+2)
-		 *
-		 * 			1      1        1
-		 *  (for large x)   =  ----  ------   ------   .....
-		 *			2n   2(n+1)   2(n+2)
-		 *			-- - ------ - ------ -
-		 *			 x     x         x
-		 *
-		 * Let w = 2n/x and h=2/x, then the above quotient
-		 * is equal to the continued fraction:
-		 *		    1
-		 *	= -----------------------
-		 *		       1
-		 *	   w - -----------------
-		 *			  1
-		 * 	        w+h - ---------
-		 *		       w+2h - ...
-		 *
-		 * To determine how many terms needed, let
-		 * Q(0) = w, Q(1) = w(w+h) - 1,
-		 * Q(k) = (w+k*h)*Q(k-1) - Q(k-2),
-		 * When Q(k) > 1e4	good for single
-		 * When Q(k) > 1e9	good for double
-		 * When Q(k) > 1e17	good for quadruple
-		 */
-	    /* determine k */
-		double t,v;
-		double q0,q1,h,tmp; int32_t k,m;
-		w  = (n+n)/(double)x; h = 2.0/(double)x;
-		q0 = w;  z = w+h; q1 = w*z - 1.0; k=1;
-		while(q1<1.0e9) {
-			k += 1; z += h;
-			tmp = z*q1 - q0;
-			q0 = q1;
-			q1 = tmp;
-		}
-		m = n+n;
-		for(t=zero, i = 2*(n+k); i>=m; i -= 2) t = one/(i/x-t);
-		a = t;
-		b = one;
-		/*  estimate log((2/x)^n*n!) = n*log(2/x)+n*ln(n)
-		 *  Hence, if n*(log(2n/x)) > ...
-		 *  single 8.8722839355e+01
-		 *  double 7.09782712893383973096e+02
-		 *  long double 1.1356523406294143949491931077970765006170e+04
-		 *  then recurrent value may overflow and the result is
-		 *  likely underflow to zero
-		 */
-		tmp = n;
-		v = two/x;
-		tmp = tmp*__ieee754_log(fabs(v*tmp));
-		if(tmp<7.09782712893383973096e+02) {
-	    	    for(i=n-1,di=(double)(i+i);i>0;i--){
-		        temp = b;
-			b *= di;
-			b  = b/x - a;
-		        a = temp;
-			di -= two;
-	     	    }
-		} else {
-	    	    for(i=n-1,di=(double)(i+i);i>0;i--){
-		        temp = b;
-			b *= di;
-			b  = b/x - a;
-		        a = temp;
-			di -= two;
-		    /* scale b to avoid spurious overflow */
-			if(b>1e100) {
-			    a /= b;
-			    t /= b;
-			    b  = one;
-			}
-	     	    }
-		}
-		z = __ieee754_j0(x);
-		w = __ieee754_j1(x);
-		if (fabs(z) >= fabs(w))
-			b = (t*z/b);
-		else
-			b = (t*w/a);
-	    }
-	}
-	if(sgn==1) return -b; else return b;
-}
-
-double
-__ieee754_yn(int n, double x)
-{
-	int32_t i,hx,ix,lx;
-	int32_t sign;
-	double a, b, temp;
-
-	temp = 0;
-	EXTRACT_WORDS(hx,lx,x);
-	ix = 0x7fffffff&hx;
-    /* if Y(n,NaN) is NaN */
-	if((ix|((u_int32_t)(lx|-lx))>>31)>0x7ff00000) return x+x;
-	if((ix|lx)==0) return -one/zero;
-	if(hx<0) return zero/zero;
-	sign = 1;
-	if(n<0){
-		n = -n;
-		sign = 1 - ((n&1)<<1);
-	}
-	if(n==0) return(__ieee754_y0(x));
-	if(n==1) return(sign*__ieee754_y1(x));
-	if(ix==0x7ff00000) return zero;
-	if(ix>=0x52D00000) { /* x > 2**302 */
-    /* (x >> n**2)
-     *	    Jn(x) = cos(x-(2n+1)*pi/4)*sqrt(2/x*pi)
-     *	    Yn(x) = sin(x-(2n+1)*pi/4)*sqrt(2/x*pi)
-     *	    Let s=sin(x), c=cos(x),
-     *		xn=x-(2n+1)*pi/4, sqt2 = sqrt(2),then
-     *
-     *		   n	sin(xn)*sqt2	cos(xn)*sqt2
-     *		----------------------------------
-     *		   0	 s-c		 c+s
-     *		   1	-s-c 		-c+s
-     *		   2	-s+c		-c-s
-     *		   3	 s+c		 c-s
-     */
-		switch(n&3) {
-		    case 0: temp =  sin(x)-cos(x); break;
-		    case 1: temp = -sin(x)-cos(x); break;
-		    case 2: temp = -sin(x)+cos(x); break;
-		    case 3: temp =  sin(x)+cos(x); break;
-		}
-		b = invsqrtpi*temp/sqrt(x);
-	} else {
-	    u_int32_t high;
-	    a = __ieee754_y0(x);
-	    b = __ieee754_y1(x);
-	/* quit if b is -inf */
-	    GET_HIGH_WORD(high,b);
-	    for(i=1;i<n&&high!=0xfff00000;i++){
-		temp = b;
-		b = ((double)(i+i)/x)*b - a;
-		GET_HIGH_WORD(high,b);
-		a = temp;
-	    }
-	}
-	if(sign>0) return b; else return -b;
-}
diff --git a/lib/libm/src/e_jnf.c b/lib/libm/src/e_jnf.c
deleted file mode 100644
index 9263cdfb4..000000000
--- a/lib/libm/src/e_jnf.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/* e_jnf.c -- float version of e_jn.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_jnf.c,v 1.11 2010/11/29 15:10:06 drochner Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-#if 0
-invsqrtpi=  5.6418961287e-01, /* 0x3f106ebb */
-#endif
-two   =  2.0000000000e+00, /* 0x40000000 */
-one   =  1.0000000000e+00; /* 0x3F800000 */
-
-static const float zero  =  0.0000000000e+00;
-
-float
-__ieee754_jnf(int n, float x)
-{
-	int32_t i,hx,ix, sgn;
-	float a, b, temp, di;
-	float z, w;
-
-    /* J(-n,x) = (-1)^n * J(n, x), J(n, -x) = (-1)^n * J(n, x)
-     * Thus, J(-n,x) = J(n,-x)
-     */
-	GET_FLOAT_WORD(hx,x);
-	ix = 0x7fffffff&hx;
-    /* if J(n,NaN) is NaN */
-	if(ix>0x7f800000) return x+x;
-	if(n<0){
-		n = -n;
-		x = -x;
-		hx ^= 0x80000000;
-	}
-	if(n==0) return(__ieee754_j0f(x));
-	if(n==1) return(__ieee754_j1f(x));
-	sgn = (n&1)&(hx>>31);	/* even n -- 0, odd n -- sign(x) */
-	x = fabsf(x);
-	if(ix==0||ix>=0x7f800000) 	/* if x is 0 or inf */
-	    b = zero;
-	else if((float)n<=x) {
-		/* Safe to use J(n+1,x)=2n/x *J(n,x)-J(n-1,x) */
-	    a = __ieee754_j0f(x);
-	    b = __ieee754_j1f(x);
-	    for(i=1;i<n;i++){
-		temp = b;
-		b = b*((float)(i+i)/x) - a; /* avoid underflow */
-		a = temp;
-	    }
-	} else {
-	    if(ix<0x30800000) {	/* x < 2**-29 */
-    /* x is tiny, return the first Taylor expansion of J(n,x)
-     * J(n,x) = 1/n!*(x/2)^n  - ...
-     */
-		if(n>33)	/* underflow */
-		    b = zero;
-		else {
-		    temp = x*(float)0.5; b = temp;
-		    for (a=one,i=2;i<=n;i++) {
-			a *= (float)i;		/* a = n! */
-			b *= temp;		/* b = (x/2)^n */
-		    }
-		    b = b/a;
-		}
-	    } else {
-		/* use backward recurrence */
-		/* 			x      x^2      x^2
-		 *  J(n,x)/J(n-1,x) =  ----   ------   ------   .....
-		 *			2n  - 2(n+1) - 2(n+2)
-		 *
-		 * 			1      1        1
-		 *  (for large x)   =  ----  ------   ------   .....
-		 *			2n   2(n+1)   2(n+2)
-		 *			-- - ------ - ------ -
-		 *			 x     x         x
-		 *
-		 * Let w = 2n/x and h=2/x, then the above quotient
-		 * is equal to the continued fraction:
-		 *		    1
-		 *	= -----------------------
-		 *		       1
-		 *	   w - -----------------
-		 *			  1
-		 * 	        w+h - ---------
-		 *		       w+2h - ...
-		 *
-		 * To determine how many terms needed, let
-		 * Q(0) = w, Q(1) = w(w+h) - 1,
-		 * Q(k) = (w+k*h)*Q(k-1) - Q(k-2),
-		 * When Q(k) > 1e4	good for single
-		 * When Q(k) > 1e9	good for double
-		 * When Q(k) > 1e17	good for quadruple
-		 */
-	    /* determine k */
-		float t,v;
-		float q0,q1,h,tmp; int32_t k,m;
-		w  = (n+n)/(float)x; h = (float)2.0/(float)x;
-		q0 = w;  z = w+h; q1 = w*z - (float)1.0; k=1;
-		while(q1<(float)1.0e9) {
-			k += 1; z += h;
-			tmp = z*q1 - q0;
-			q0 = q1;
-			q1 = tmp;
-		}
-		m = n+n;
-		for(t=zero, i = 2*(n+k); i>=m; i -= 2) t = one/(i/x-t);
-		a = t;
-		b = one;
-		/*  estimate log((2/x)^n*n!) = n*log(2/x)+n*ln(n)
-		 *  Hence, if n*(log(2n/x)) > ...
-		 *  single 8.8722839355e+01
-		 *  double 7.09782712893383973096e+02
-		 *  long double 1.1356523406294143949491931077970765006170e+04
-		 *  then recurrent value may overflow and the result is
-		 *  likely underflow to zero
-		 */
-		tmp = n;
-		v = two/x;
-		tmp = tmp*__ieee754_logf(fabsf(v*tmp));
-		if(tmp<(float)8.8721679688e+01) {
-	    	    for(i=n-1,di=(float)(i+i);i>0;i--){
-		        temp = b;
-			b *= di;
-			b  = b/x - a;
-		        a = temp;
-			di -= two;
-	     	    }
-		} else {
-	    	    for(i=n-1,di=(float)(i+i);i>0;i--){
-		        temp = b;
-			b *= di;
-			b  = b/x - a;
-		        a = temp;
-			di -= two;
-		    /* scale b to avoid spurious overflow */
-			if(b>(float)1e10) {
-			    a /= b;
-			    t /= b;
-			    b  = one;
-			}
-	     	    }
-		}
-		z = __ieee754_j0f(x);
-		w = __ieee754_j1f(x);
-		if (fabsf(z) >= fabsf(w))
-			b = (t*z/b);
-		else
-			b = (t*w/a);
-	    }
-	}
-	if(sgn==1) return -b; else return b;
-}
-
-float
-__ieee754_ynf(int n, float x)
-{
-	int32_t i,hx,ix,ib;
-	int32_t sign;
-	float a, b, temp;
-
-	GET_FLOAT_WORD(hx,x);
-	ix = 0x7fffffff&hx;
-    /* if Y(n,NaN) is NaN */
-	if(ix>0x7f800000) return x+x;
-	if(ix==0) return -one/zero;
-	if(hx<0) return zero/zero;
-	sign = 1;
-	if(n<0){
-		n = -n;
-		sign = 1 - ((n&1)<<1);
-	}
-	if(n==0) return(__ieee754_y0f(x));
-	if(n==1) return(sign*__ieee754_y1f(x));
-	if(ix==0x7f800000) return zero;
-
-	a = __ieee754_y0f(x);
-	b = __ieee754_y1f(x);
-	/* quit if b is -inf */
-	GET_FLOAT_WORD(ib,b);
-	for(i=1;i<n&&(uint32_t)ib!=0xff800000;i++){
-	    temp = b;
-	    b = ((float)(i+i)/x)*b - a;
-	    GET_FLOAT_WORD(ib,b);
-	    a = temp;
-	}
-	if(sign>0) return b; else return -b;
-}
diff --git a/lib/libm/src/e_lgamma_r.c b/lib/libm/src/e_lgamma_r.c
deleted file mode 100644
index 9e70adbaa..000000000
--- a/lib/libm/src/e_lgamma_r.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/* @(#)er_lgamma.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_lgamma_r.c,v 1.10 2002/05/26 22:01:51 wiz Exp $");
-#endif
-
-/* __ieee754_lgamma_r(x, signgamp)
- * Reentrant version of the logarithm of the Gamma function
- * with user provide pointer for the sign of Gamma(x).
- *
- * Method:
- *   1. Argument Reduction for 0 < x <= 8
- * 	Since gamma(1+s)=s*gamma(s), for x in [0,8], we may
- * 	reduce x to a number in [1.5,2.5] by
- * 		lgamma(1+s) = log(s) + lgamma(s)
- *	for example,
- *		lgamma(7.3) = log(6.3) + lgamma(6.3)
- *			    = log(6.3*5.3) + lgamma(5.3)
- *			    = log(6.3*5.3*4.3*3.3*2.3) + lgamma(2.3)
- *   2. Polynomial approximation of lgamma around its
- *	minimun ymin=1.461632144968362245 to maintain monotonicity.
- *	On [ymin-0.23, ymin+0.27] (i.e., [1.23164,1.73163]), use
- *		Let z = x-ymin;
- *		lgamma(x) = -1.214862905358496078218 + z^2*poly(z)
- *	where
- *		poly(z) is a 14 degree polynomial.
- *   2. Rational approximation in the primary interval [2,3]
- *	We use the following approximation:
- *		s = x-2.0;
- *		lgamma(x) = 0.5*s + s*P(s)/Q(s)
- *	with accuracy
- *		|P/Q - (lgamma(x)-0.5s)| < 2**-61.71
- *	Our algorithms are based on the following observation
- *
- *                             zeta(2)-1    2    zeta(3)-1    3
- * lgamma(2+s) = s*(1-Euler) + --------- * s  -  --------- * s  + ...
- *                                 2                 3
- *
- *	where Euler = 0.5771... is the Euler constant, which is very
- *	close to 0.5.
- *
- *   3. For x>=8, we have
- *	lgamma(x)~(x-0.5)log(x)-x+0.5*log(2pi)+1/(12x)-1/(360x**3)+....
- *	(better formula:
- *	   lgamma(x)~(x-0.5)*(log(x)-1)-.5*(log(2pi)-1) + ...)
- *	Let z = 1/x, then we approximation
- *		f(z) = lgamma(x) - (x-0.5)(log(x)-1)
- *	by
- *	  			    3       5             11
- *		w = w0 + w1*z + w2*z  + w3*z  + ... + w6*z
- *	where
- *		|w - f(z)| < 2**-58.74
- *
- *   4. For negative x, since (G is gamma function)
- *		-x*G(-x)*G(x) = pi/sin(pi*x),
- * 	we have
- * 		G(x) = pi/(sin(pi*x)*(-x)*G(-x))
- *	since G(-x) is positive, sign(G(x)) = sign(sin(pi*x)) for x<0
- *	Hence, for x<0, signgam = sign(sin(pi*x)) and
- *		lgamma(x) = log(|Gamma(x)|)
- *			  = log(pi/(|x*sin(pi*x)|)) - lgamma(-x);
- *	Note: one should avoid compute pi*(-x) directly in the
- *	      computation of sin(pi*(-x)).
- *
- *   5. Special Cases
- *		lgamma(2+s) ~ s*(1-Euler) for tiny s
- *		lgamma(1)=lgamma(2)=0
- *		lgamma(x) ~ -log(x) for tiny x
- *		lgamma(0) = lgamma(inf) = inf
- *	 	lgamma(-integer) = +-inf
- *
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-two52=  4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
-half=  5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */
-one =  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
-pi  =  3.14159265358979311600e+00, /* 0x400921FB, 0x54442D18 */
-a0  =  7.72156649015328655494e-02, /* 0x3FB3C467, 0xE37DB0C8 */
-a1  =  3.22467033424113591611e-01, /* 0x3FD4A34C, 0xC4A60FAD */
-a2  =  6.73523010531292681824e-02, /* 0x3FB13E00, 0x1A5562A7 */
-a3  =  2.05808084325167332806e-02, /* 0x3F951322, 0xAC92547B */
-a4  =  7.38555086081402883957e-03, /* 0x3F7E404F, 0xB68FEFE8 */
-a5  =  2.89051383673415629091e-03, /* 0x3F67ADD8, 0xCCB7926B */
-a6  =  1.19270763183362067845e-03, /* 0x3F538A94, 0x116F3F5D */
-a7  =  5.10069792153511336608e-04, /* 0x3F40B6C6, 0x89B99C00 */
-a8  =  2.20862790713908385557e-04, /* 0x3F2CF2EC, 0xED10E54D */
-a9  =  1.08011567247583939954e-04, /* 0x3F1C5088, 0x987DFB07 */
-a10 =  2.52144565451257326939e-05, /* 0x3EFA7074, 0x428CFA52 */
-a11 =  4.48640949618915160150e-05, /* 0x3F07858E, 0x90A45837 */
-tc  =  1.46163214496836224576e+00, /* 0x3FF762D8, 0x6356BE3F */
-tf  = -1.21486290535849611461e-01, /* 0xBFBF19B9, 0xBCC38A42 */
-/* tt = -(tail of tf) */
-tt  = -3.63867699703950536541e-18, /* 0xBC50C7CA, 0xA48A971F */
-t0  =  4.83836122723810047042e-01, /* 0x3FDEF72B, 0xC8EE38A2 */
-t1  = -1.47587722994593911752e-01, /* 0xBFC2E427, 0x8DC6C509 */
-t2  =  6.46249402391333854778e-02, /* 0x3FB08B42, 0x94D5419B */
-t3  = -3.27885410759859649565e-02, /* 0xBFA0C9A8, 0xDF35B713 */
-t4  =  1.79706750811820387126e-02, /* 0x3F9266E7, 0x970AF9EC */
-t5  = -1.03142241298341437450e-02, /* 0xBF851F9F, 0xBA91EC6A */
-t6  =  6.10053870246291332635e-03, /* 0x3F78FCE0, 0xE370E344 */
-t7  = -3.68452016781138256760e-03, /* 0xBF6E2EFF, 0xB3E914D7 */
-t8  =  2.25964780900612472250e-03, /* 0x3F6282D3, 0x2E15C915 */
-t9  = -1.40346469989232843813e-03, /* 0xBF56FE8E, 0xBF2D1AF1 */
-t10 =  8.81081882437654011382e-04, /* 0x3F4CDF0C, 0xEF61A8E9 */
-t11 = -5.38595305356740546715e-04, /* 0xBF41A610, 0x9C73E0EC */
-t12 =  3.15632070903625950361e-04, /* 0x3F34AF6D, 0x6C0EBBF7 */
-t13 = -3.12754168375120860518e-04, /* 0xBF347F24, 0xECC38C38 */
-t14 =  3.35529192635519073543e-04, /* 0x3F35FD3E, 0xE8C2D3F4 */
-u0  = -7.72156649015328655494e-02, /* 0xBFB3C467, 0xE37DB0C8 */
-u1  =  6.32827064025093366517e-01, /* 0x3FE4401E, 0x8B005DFF */
-u2  =  1.45492250137234768737e+00, /* 0x3FF7475C, 0xD119BD6F */
-u3  =  9.77717527963372745603e-01, /* 0x3FEF4976, 0x44EA8450 */
-u4  =  2.28963728064692451092e-01, /* 0x3FCD4EAE, 0xF6010924 */
-u5  =  1.33810918536787660377e-02, /* 0x3F8B678B, 0xBF2BAB09 */
-v1  =  2.45597793713041134822e+00, /* 0x4003A5D7, 0xC2BD619C */
-v2  =  2.12848976379893395361e+00, /* 0x40010725, 0xA42B18F5 */
-v3  =  7.69285150456672783825e-01, /* 0x3FE89DFB, 0xE45050AF */
-v4  =  1.04222645593369134254e-01, /* 0x3FBAAE55, 0xD6537C88 */
-v5  =  3.21709242282423911810e-03, /* 0x3F6A5ABB, 0x57D0CF61 */
-s0  = -7.72156649015328655494e-02, /* 0xBFB3C467, 0xE37DB0C8 */
-s1  =  2.14982415960608852501e-01, /* 0x3FCB848B, 0x36E20878 */
-s2  =  3.25778796408930981787e-01, /* 0x3FD4D98F, 0x4F139F59 */
-s3  =  1.46350472652464452805e-01, /* 0x3FC2BB9C, 0xBEE5F2F7 */
-s4  =  2.66422703033638609560e-02, /* 0x3F9B481C, 0x7E939961 */
-s5  =  1.84028451407337715652e-03, /* 0x3F5E26B6, 0x7368F239 */
-s6  =  3.19475326584100867617e-05, /* 0x3F00BFEC, 0xDD17E945 */
-r1  =  1.39200533467621045958e+00, /* 0x3FF645A7, 0x62C4AB74 */
-r2  =  7.21935547567138069525e-01, /* 0x3FE71A18, 0x93D3DCDC */
-r3  =  1.71933865632803078993e-01, /* 0x3FC601ED, 0xCCFBDF27 */
-r4  =  1.86459191715652901344e-02, /* 0x3F9317EA, 0x742ED475 */
-r5  =  7.77942496381893596434e-04, /* 0x3F497DDA, 0xCA41A95B */
-r6  =  7.32668430744625636189e-06, /* 0x3EDEBAF7, 0xA5B38140 */
-w0  =  4.18938533204672725052e-01, /* 0x3FDACFE3, 0x90C97D69 */
-w1  =  8.33333333333329678849e-02, /* 0x3FB55555, 0x5555553B */
-w2  = -2.77777777728775536470e-03, /* 0xBF66C16C, 0x16B02E5C */
-w3  =  7.93650558643019558500e-04, /* 0x3F4A019F, 0x98CF38B6 */
-w4  = -5.95187557450339963135e-04, /* 0xBF4380CB, 0x8C0FE741 */
-w5  =  8.36339918996282139126e-04, /* 0x3F4B67BA, 0x4CDAD5D1 */
-w6  = -1.63092934096575273989e-03; /* 0xBF5AB89D, 0x0B9E43E4 */
-
-static const double zero=  0.00000000000000000000e+00;
-
-static
-double sin_pi(double x)
-{
-	double y,z;
-	int n,ix;
-
-	GET_HIGH_WORD(ix,x);
-	ix &= 0x7fffffff;
-
-	if(ix<0x3fd00000) return __kernel_sin(pi*x,zero,0);
-	y = -x;		/* x is assume negative */
-
-    /*
-     * argument reduction, make sure inexact flag not raised if input
-     * is an integer
-     */
-	z = floor(y);
-	if(z!=y) {				/* inexact anyway */
-	    y  *= 0.5;
-	    y   = 2.0*(y - floor(y));		/* y = |x| mod 2.0 */
-	    n   = (int) (y*4.0);
-	} else {
-            if(ix>=0x43400000) {
-                y = zero; n = 0;                 /* y must be even */
-            } else {
-                if(ix<0x43300000) z = y+two52;	/* exact */
-		GET_LOW_WORD(n,z);
-		n &= 1;
-                y  = n;
-                n<<= 2;
-            }
-        }
-	switch (n) {
-	    case 0:   y =  __kernel_sin(pi*y,zero,0); break;
-	    case 1:
-	    case 2:   y =  __kernel_cos(pi*(0.5-y),zero); break;
-	    case 3:
-	    case 4:   y =  __kernel_sin(pi*(one-y),zero,0); break;
-	    case 5:
-	    case 6:   y = -__kernel_cos(pi*(y-1.5),zero); break;
-	    default:  y =  __kernel_sin(pi*(y-2.0),zero,0); break;
-	    }
-	return -y;
-}
-
-
-double
-__ieee754_lgamma_r(double x, int *signgamp)
-{
-	double t,y,z,nadj,p,p1,p2,p3,q,r,w;
-	int i,hx,lx,ix;
-
-	nadj = 0;
-	EXTRACT_WORDS(hx,lx,x);
-
-    /* purge off +-inf, NaN, +-0, and negative arguments */
-	*signgamp = 1;
-	ix = hx&0x7fffffff;
-	if(ix>=0x7ff00000) return x*x;
-	if((ix|lx)==0) return one/zero;
-	if(ix<0x3b900000) {	/* |x|<2**-70, return -log(|x|) */
-	    if(hx<0) {
-	        *signgamp = -1;
-	        return -__ieee754_log(-x);
-	    } else return -__ieee754_log(x);
-	}
-	if(hx<0) {
-	    if(ix>=0x43300000) 	/* |x|>=2**52, must be -integer */
-		return one/zero;
-	    t = sin_pi(x);
-	    if(t==zero) return one/zero; /* -integer */
-	    nadj = __ieee754_log(pi/fabs(t*x));
-	    if(t<zero) *signgamp = -1;
-	    x = -x;
-	}
-
-    /* purge off 1 and 2 */
-	if((((ix-0x3ff00000)|lx)==0)||(((ix-0x40000000)|lx)==0)) r = 0;
-    /* for x < 2.0 */
-	else if(ix<0x40000000) {
-	    if(ix<=0x3feccccc) { 	/* lgamma(x) = lgamma(x+1)-log(x) */
-		r = -__ieee754_log(x);
-		if(ix>=0x3FE76944) {y = one-x; i= 0;}
-		else if(ix>=0x3FCDA661) {y= x-(tc-one); i=1;}
-	  	else {y = x; i=2;}
-	    } else {
-	  	r = zero;
-	        if(ix>=0x3FFBB4C3) {y=2.0-x;i=0;} /* [1.7316,2] */
-	        else if(ix>=0x3FF3B4C4) {y=x-tc;i=1;} /* [1.23,1.73] */
-		else {y=x-one;i=2;}
-	    }
-	    switch(i) {
-	      case 0:
-		z = y*y;
-		p1 = a0+z*(a2+z*(a4+z*(a6+z*(a8+z*a10))));
-		p2 = z*(a1+z*(a3+z*(a5+z*(a7+z*(a9+z*a11)))));
-		p  = y*p1+p2;
-		r  += (p-0.5*y); break;
-	      case 1:
-		z = y*y;
-		w = z*y;
-		p1 = t0+w*(t3+w*(t6+w*(t9 +w*t12)));	/* parallel comp */
-		p2 = t1+w*(t4+w*(t7+w*(t10+w*t13)));
-		p3 = t2+w*(t5+w*(t8+w*(t11+w*t14)));
-		p  = z*p1-(tt-w*(p2+y*p3));
-		r += (tf + p); break;
-	      case 2:
-		p1 = y*(u0+y*(u1+y*(u2+y*(u3+y*(u4+y*u5)))));
-		p2 = one+y*(v1+y*(v2+y*(v3+y*(v4+y*v5))));
-		r += (-0.5*y + p1/p2);
-	    }
-	}
-	else if(ix<0x40200000) { 			/* x < 8.0 */
-	    i = (int)x;
-	    t = zero;
-	    y = x-(double)i;
-	    p = y*(s0+y*(s1+y*(s2+y*(s3+y*(s4+y*(s5+y*s6))))));
-	    q = one+y*(r1+y*(r2+y*(r3+y*(r4+y*(r5+y*r6)))));
-	    r = half*y+p/q;
-	    z = one;	/* lgamma(1+s) = log(s) + lgamma(s) */
-	    switch(i) {
-	    case 7: z *= (y+6.0);	/* FALLTHRU */
-	    case 6: z *= (y+5.0);	/* FALLTHRU */
-	    case 5: z *= (y+4.0);	/* FALLTHRU */
-	    case 4: z *= (y+3.0);	/* FALLTHRU */
-	    case 3: z *= (y+2.0);	/* FALLTHRU */
-		    r += __ieee754_log(z); break;
-	    }
-    /* 8.0 <= x < 2**58 */
-	} else if (ix < 0x43900000) {
-	    t = __ieee754_log(x);
-	    z = one/x;
-	    y = z*z;
-	    w = w0+z*(w1+y*(w2+y*(w3+y*(w4+y*(w5+y*w6)))));
-	    r = (x-half)*(t-one)+w;
-	} else
-    /* 2**58 <= x <= inf */
-	    r =  x*(__ieee754_log(x)-one);
-	if(hx<0) r = nadj - r;
-	return r;
-}
diff --git a/lib/libm/src/e_lgammaf_r.c b/lib/libm/src/e_lgammaf_r.c
deleted file mode 100644
index 36d890b21..000000000
--- a/lib/libm/src/e_lgammaf_r.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* e_lgammaf_r.c -- float version of e_lgamma_r.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_lgammaf_r.c,v 1.6 2002/05/26 22:01:51 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-two23=  8.3886080000e+06, /* 0x4b000000 */
-half=  5.0000000000e-01, /* 0x3f000000 */
-one =  1.0000000000e+00, /* 0x3f800000 */
-pi  =  3.1415927410e+00, /* 0x40490fdb */
-a0  =  7.7215664089e-02, /* 0x3d9e233f */
-a1  =  3.2246702909e-01, /* 0x3ea51a66 */
-a2  =  6.7352302372e-02, /* 0x3d89f001 */
-a3  =  2.0580807701e-02, /* 0x3ca89915 */
-a4  =  7.3855509982e-03, /* 0x3bf2027e */
-a5  =  2.8905137442e-03, /* 0x3b3d6ec6 */
-a6  =  1.1927076848e-03, /* 0x3a9c54a1 */
-a7  =  5.1006977446e-04, /* 0x3a05b634 */
-a8  =  2.2086278477e-04, /* 0x39679767 */
-a9  =  1.0801156895e-04, /* 0x38e28445 */
-a10 =  2.5214456400e-05, /* 0x37d383a2 */
-a11 =  4.4864096708e-05, /* 0x383c2c75 */
-tc  =  1.4616321325e+00, /* 0x3fbb16c3 */
-tf  = -1.2148628384e-01, /* 0xbdf8cdcd */
-/* tt = -(tail of tf) */
-tt  =  6.6971006518e-09, /* 0x31e61c52 */
-t0  =  4.8383611441e-01, /* 0x3ef7b95e */
-t1  = -1.4758771658e-01, /* 0xbe17213c */
-t2  =  6.4624942839e-02, /* 0x3d845a15 */
-t3  = -3.2788541168e-02, /* 0xbd064d47 */
-t4  =  1.7970675603e-02, /* 0x3c93373d */
-t5  = -1.0314224288e-02, /* 0xbc28fcfe */
-t6  =  6.1005386524e-03, /* 0x3bc7e707 */
-t7  = -3.6845202558e-03, /* 0xbb7177fe */
-t8  =  2.2596477065e-03, /* 0x3b141699 */
-t9  = -1.4034647029e-03, /* 0xbab7f476 */
-t10 =  8.8108185446e-04, /* 0x3a66f867 */
-t11 = -5.3859531181e-04, /* 0xba0d3085 */
-t12 =  3.1563205994e-04, /* 0x39a57b6b */
-t13 = -3.1275415677e-04, /* 0xb9a3f927 */
-t14 =  3.3552918467e-04, /* 0x39afe9f7 */
-u0  = -7.7215664089e-02, /* 0xbd9e233f */
-u1  =  6.3282704353e-01, /* 0x3f2200f4 */
-u2  =  1.4549225569e+00, /* 0x3fba3ae7 */
-u3  =  9.7771751881e-01, /* 0x3f7a4bb2 */
-u4  =  2.2896373272e-01, /* 0x3e6a7578 */
-u5  =  1.3381091878e-02, /* 0x3c5b3c5e */
-v1  =  2.4559779167e+00, /* 0x401d2ebe */
-v2  =  2.1284897327e+00, /* 0x4008392d */
-v3  =  7.6928514242e-01, /* 0x3f44efdf */
-v4  =  1.0422264785e-01, /* 0x3dd572af */
-v5  =  3.2170924824e-03, /* 0x3b52d5db */
-s0  = -7.7215664089e-02, /* 0xbd9e233f */
-s1  =  2.1498242021e-01, /* 0x3e5c245a */
-s2  =  3.2577878237e-01, /* 0x3ea6cc7a */
-s3  =  1.4635047317e-01, /* 0x3e15dce6 */
-s4  =  2.6642270386e-02, /* 0x3cda40e4 */
-s5  =  1.8402845599e-03, /* 0x3af135b4 */
-s6  =  3.1947532989e-05, /* 0x3805ff67 */
-r1  =  1.3920053244e+00, /* 0x3fb22d3b */
-r2  =  7.2193557024e-01, /* 0x3f38d0c5 */
-r3  =  1.7193385959e-01, /* 0x3e300f6e */
-r4  =  1.8645919859e-02, /* 0x3c98bf54 */
-r5  =  7.7794247773e-04, /* 0x3a4beed6 */
-r6  =  7.3266842264e-06, /* 0x36f5d7bd */
-w0  =  4.1893854737e-01, /* 0x3ed67f1d */
-w1  =  8.3333335817e-02, /* 0x3daaaaab */
-w2  = -2.7777778450e-03, /* 0xbb360b61 */
-w3  =  7.9365057172e-04, /* 0x3a500cfd */
-w4  = -5.9518753551e-04, /* 0xba1c065c */
-w5  =  8.3633989561e-04, /* 0x3a5b3dd2 */
-w6  = -1.6309292987e-03; /* 0xbad5c4e8 */
-
-static const float zero=  0.0000000000e+00;
-
-static float
-sin_pif(float x)
-{
-	float y,z;
-	int n,ix;
-
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;
-
-	if(ix<0x3e800000) return __kernel_sinf(pi*x,zero,0);
-	y = -x;		/* x is assume negative */
-
-    /*
-     * argument reduction, make sure inexact flag not raised if input
-     * is an integer
-     */
-	z = floorf(y);
-	if(z!=y) {				/* inexact anyway */
-	    y  *= (float)0.5;
-	    y   = (float)2.0*(y - floorf(y));	/* y = |x| mod 2.0 */
-	    n   = (int) (y*(float)4.0);
-	} else {
-            if(ix>=0x4b800000) {
-                y = zero; n = 0;                 /* y must be even */
-            } else {
-                if(ix<0x4b000000) z = y+two23;	/* exact */
-		GET_FLOAT_WORD(n,z);
-		n &= 1;
-                y  = n;
-                n<<= 2;
-            }
-        }
-	switch (n) {
-	    case 0:   y =  __kernel_sinf(pi*y,zero,0); break;
-	    case 1:
-	    case 2:   y =  __kernel_cosf(pi*((float)0.5-y),zero); break;
-	    case 3:
-	    case 4:   y =  __kernel_sinf(pi*(one-y),zero,0); break;
-	    case 5:
-	    case 6:   y = -__kernel_cosf(pi*(y-(float)1.5),zero); break;
-	    default:  y =  __kernel_sinf(pi*(y-(float)2.0),zero,0); break;
-	    }
-	return -y;
-}
-
-
-float
-__ieee754_lgammaf_r(float x, int *signgamp)
-{
-	float t,y,z,nadj,p,p1,p2,p3,q,r,w;
-	int i,hx,ix;
-
-	nadj = 0;
-	GET_FLOAT_WORD(hx,x);
-
-    /* purge off +-inf, NaN, +-0, and negative arguments */
-	*signgamp = 1;
-	ix = hx&0x7fffffff;
-	if(ix>=0x7f800000) return x*x;
-	if(ix==0) return one/zero;
-	if(ix<0x1c800000) {	/* |x|<2**-70, return -log(|x|) */
-	    if(hx<0) {
-	        *signgamp = -1;
-	        return -__ieee754_logf(-x);
-	    } else return -__ieee754_logf(x);
-	}
-	if(hx<0) {
-	    if(ix>=0x4b000000) 	/* |x|>=2**23, must be -integer */
-		return one/zero;
-	    t = sin_pif(x);
-	    if(t==zero) return one/zero; /* -integer */
-	    nadj = __ieee754_logf(pi/fabsf(t*x));
-	    if(t<zero) *signgamp = -1;
-	    x = -x;
-	}
-
-    /* purge off 1 and 2 */
-	if (ix==0x3f800000||ix==0x40000000) r = 0;
-    /* for x < 2.0 */
-	else if(ix<0x40000000) {
-	    if(ix<=0x3f666666) { 	/* lgamma(x) = lgamma(x+1)-log(x) */
-		r = -__ieee754_logf(x);
-		if(ix>=0x3f3b4a20) {y = one-x; i= 0;}
-		else if(ix>=0x3e6d3308) {y= x-(tc-one); i=1;}
-	  	else {y = x; i=2;}
-	    } else {
-	  	r = zero;
-	        if(ix>=0x3fdda618) {y=(float)2.0-x;i=0;} /* [1.7316,2] */
-	        else if(ix>=0x3F9da620) {y=x-tc;i=1;} /* [1.23,1.73] */
-		else {y=x-one;i=2;}
-	    }
-	    switch(i) {
-	      case 0:
-		z = y*y;
-		p1 = a0+z*(a2+z*(a4+z*(a6+z*(a8+z*a10))));
-		p2 = z*(a1+z*(a3+z*(a5+z*(a7+z*(a9+z*a11)))));
-		p  = y*p1+p2;
-		r  += (p-(float)0.5*y); break;
-	      case 1:
-		z = y*y;
-		w = z*y;
-		p1 = t0+w*(t3+w*(t6+w*(t9 +w*t12)));	/* parallel comp */
-		p2 = t1+w*(t4+w*(t7+w*(t10+w*t13)));
-		p3 = t2+w*(t5+w*(t8+w*(t11+w*t14)));
-		p  = z*p1-(tt-w*(p2+y*p3));
-		r += (tf + p); break;
-	      case 2:
-		p1 = y*(u0+y*(u1+y*(u2+y*(u3+y*(u4+y*u5)))));
-		p2 = one+y*(v1+y*(v2+y*(v3+y*(v4+y*v5))));
-		r += (-(float)0.5*y + p1/p2);
-	    }
-	}
-	else if(ix<0x41000000) { 			/* x < 8.0 */
-	    i = (int)x;
-	    t = zero;
-	    y = x-(float)i;
-	    p = y*(s0+y*(s1+y*(s2+y*(s3+y*(s4+y*(s5+y*s6))))));
-	    q = one+y*(r1+y*(r2+y*(r3+y*(r4+y*(r5+y*r6)))));
-	    r = half*y+p/q;
-	    z = one;	/* lgamma(1+s) = log(s) + lgamma(s) */
-	    switch(i) {
-	    case 7: z *= (y+(float)6.0);	/* FALLTHRU */
-	    case 6: z *= (y+(float)5.0);	/* FALLTHRU */
-	    case 5: z *= (y+(float)4.0);	/* FALLTHRU */
-	    case 4: z *= (y+(float)3.0);	/* FALLTHRU */
-	    case 3: z *= (y+(float)2.0);	/* FALLTHRU */
-		    r += __ieee754_logf(z); break;
-	    }
-    /* 8.0 <= x < 2**58 */
-	} else if (ix < 0x5c800000) {
-	    t = __ieee754_logf(x);
-	    z = one/x;
-	    y = z*z;
-	    w = w0+z*(w1+y*(w2+y*(w3+y*(w4+y*(w5+y*w6)))));
-	    r = (x-half)*(t-one)+w;
-	} else
-    /* 2**58 <= x <= inf */
-	    r =  x*(__ieee754_logf(x)-one);
-	if(hx<0) r = nadj - r;
-	return r;
-}
diff --git a/lib/libm/src/e_log.c b/lib/libm/src/e_log.c
deleted file mode 100644
index c1dbace9a..000000000
--- a/lib/libm/src/e_log.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* @(#)e_log.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_log.c,v 1.12 2002/05/26 22:01:51 wiz Exp $");
-#endif
-
-/* __ieee754_log(x)
- * Return the logrithm of x
- *
- * Method :
- *   1. Argument Reduction: find k and f such that
- *			x = 2^k * (1+f),
- *	   where  sqrt(2)/2 < 1+f < sqrt(2) .
- *
- *   2. Approximation of log(1+f).
- *	Let s = f/(2+f) ; based on log(1+f) = log(1+s) - log(1-s)
- *		 = 2s + 2/3 s**3 + 2/5 s**5 + .....,
- *	     	 = 2s + s*R
- *      We use a special Reme algorithm on [0,0.1716] to generate
- * 	a polynomial of degree 14 to approximate R The maximum error
- *	of this polynomial approximation is bounded by 2**-58.45. In
- *	other words,
- *		        2      4      6      8      10      12      14
- *	    R(z) ~ Lg1*s +Lg2*s +Lg3*s +Lg4*s +Lg5*s  +Lg6*s  +Lg7*s
- *  	(the values of Lg1 to Lg7 are listed in the program)
- *	and
- *	    |      2          14          |     -58.45
- *	    | Lg1*s +...+Lg7*s    -  R(z) | <= 2
- *	    |                             |
- *	Note that 2s = f - s*f = f - hfsq + s*hfsq, where hfsq = f*f/2.
- *	In order to guarantee error in log below 1ulp, we compute log
- *	by
- *		log(1+f) = f - s*(f - R)	(if f is not too large)
- *		log(1+f) = f - (hfsq - s*(hfsq+R)).	(better accuracy)
- *
- *	3. Finally,  log(x) = k*ln2 + log(1+f).
- *			    = k*ln2_hi+(f-(hfsq-(s*(hfsq+R)+k*ln2_lo)))
- *	   Here ln2 is split into two floating point number:
- *			ln2_hi + ln2_lo,
- *	   where n*ln2_hi is always exact for |n| < 2000.
- *
- * Special cases:
- *	log(x) is NaN with signal if x < 0 (including -INF) ;
- *	log(+INF) is +INF; log(0) is -INF with signal;
- *	log(NaN) is that NaN with no signal.
- *
- * Accuracy:
- *	according to an error analysis, the error is always less than
- *	1 ulp (unit in the last place).
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following
- * constants. The decimal values may be used, provided that the
- * compiler will convert from decimal to binary accurately enough
- * to produce the hexadecimal values shown.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-ln2_hi  =  6.93147180369123816490e-01,	/* 3fe62e42 fee00000 */
-ln2_lo  =  1.90821492927058770002e-10,	/* 3dea39ef 35793c76 */
-two54   =  1.80143985094819840000e+16,  /* 43500000 00000000 */
-Lg1 = 6.666666666666735130e-01,  /* 3FE55555 55555593 */
-Lg2 = 3.999999999940941908e-01,  /* 3FD99999 9997FA04 */
-Lg3 = 2.857142874366239149e-01,  /* 3FD24924 94229359 */
-Lg4 = 2.222219843214978396e-01,  /* 3FCC71C5 1D8E78AF */
-Lg5 = 1.818357216161805012e-01,  /* 3FC74664 96CB03DE */
-Lg6 = 1.531383769920937332e-01,  /* 3FC39A09 D078C69F */
-Lg7 = 1.479819860511658591e-01;  /* 3FC2F112 DF3E5244 */
-
-static const double zero   =  0.0;
-
-double
-__ieee754_log(double x)
-{
-	double hfsq,f,s,z,R,w,t1,t2,dk;
-	int32_t k,hx,i,j;
-	u_int32_t lx;
-
-	EXTRACT_WORDS(hx,lx,x);
-
-	k=0;
-	if (hx < 0x00100000) {			/* x < 2**-1022  */
-	    if (((hx&0x7fffffff)|lx)==0)
-		return -two54/zero;		/* log(+-0)=-inf */
-	    if (hx<0) return (x-x)/zero;	/* log(-#) = NaN */
-	    k -= 54; x *= two54; /* subnormal number, scale up x */
-	    GET_HIGH_WORD(hx,x);
-	}
-	if (hx >= 0x7ff00000) return x+x;
-	k += (hx>>20)-1023;
-	hx &= 0x000fffff;
-	i = (hx+0x95f64)&0x100000;
-	SET_HIGH_WORD(x,hx|(i^0x3ff00000));	/* normalize x or x/2 */
-	k += (i>>20);
-	f = x-1.0;
-	if((0x000fffff&(2+hx))<3) {	/* |f| < 2**-20 */
-	    if(f==zero) { if(k==0) return zero;  else {dk=(double)k;
-				   return dk*ln2_hi+dk*ln2_lo;}
-	    }
-	    R = f*f*(0.5-0.33333333333333333*f);
-	    if(k==0) return f-R; else {dk=(double)k;
-	    	     return dk*ln2_hi-((R-dk*ln2_lo)-f);}
-	}
- 	s = f/(2.0+f);
-	dk = (double)k;
-	z = s*s;
-	i = hx-0x6147a;
-	w = z*z;
-	j = 0x6b851-hx;
-	t1= w*(Lg2+w*(Lg4+w*Lg6));
-	t2= z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7)));
-	i |= j;
-	R = t2+t1;
-	if(i>0) {
-	    hfsq=0.5*f*f;
-	    if(k==0) return f-(hfsq-s*(hfsq+R)); else
-		     return dk*ln2_hi-((hfsq-(s*(hfsq+R)+dk*ln2_lo))-f);
-	} else {
-	    if(k==0) return f-s*(f-R); else
-		     return dk*ln2_hi-((s*(f-R)-dk*ln2_lo)-f);
-	}
-}
diff --git a/lib/libm/src/e_log10.c b/lib/libm/src/e_log10.c
deleted file mode 100644
index 84cfbabbc..000000000
--- a/lib/libm/src/e_log10.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* @(#)e_log10.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_log10.c,v 1.12 2002/05/26 22:01:51 wiz Exp $");
-#endif
-
-/* __ieee754_log10(x)
- * Return the base 10 logarithm of x
- *
- * Method :
- *	Let log10_2hi = leading 40 bits of log10(2) and
- *	    log10_2lo = log10(2) - log10_2hi,
- *	    ivln10   = 1/log(10) rounded.
- *	Then
- *		n = ilogb(x),
- *		if(n<0)  n = n+1;
- *		x = scalbn(x,-n);
- *		log10(x) := n*log10_2hi + (n*log10_2lo + ivln10*log(x))
- *
- * Note 1:
- *	To guarantee log10(10**n)=n, where 10**n is normal, the rounding
- *	mode must set to Round-to-Nearest.
- * Note 2:
- *	[1/log(10)] rounded to 53 bits has error  .198   ulps;
- *	log10 is monotonic at all binary break points.
- *
- * Special cases:
- *	log10(x) is NaN with signal if x < 0;
- *	log10(+INF) is +INF with no signal; log10(0) is -INF with signal;
- *	log10(NaN) is that NaN with no signal;
- *	log10(10**N) = N  for N=0,1,...,22.
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following constants.
- * The decimal values may be used, provided that the compiler will convert
- * from decimal to binary accurately enough to produce the hexadecimal values
- * shown.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-two54      =  1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */
-ivln10     =  4.34294481903251816668e-01, /* 0x3FDBCB7B, 0x1526E50E */
-log10_2hi  =  3.01029995663611771306e-01, /* 0x3FD34413, 0x509F6000 */
-log10_2lo  =  3.69423907715893078616e-13; /* 0x3D59FEF3, 0x11F12B36 */
-
-static const double zero   =  0.0;
-
-double
-__ieee754_log10(double x)
-{
-	double y,z;
-	int32_t i,k,hx;
-	u_int32_t lx;
-
-	EXTRACT_WORDS(hx,lx,x);
-
-        k=0;
-        if (hx < 0x00100000) {                  /* x < 2**-1022  */
-            if (((hx&0x7fffffff)|lx)==0)
-                return -two54/zero;             /* log(+-0)=-inf */
-            if (hx<0) return (x-x)/zero;        /* log(-#) = NaN */
-            k -= 54; x *= two54; /* subnormal number, scale up x */
-	    GET_HIGH_WORD(hx,x);
-        }
-	if (hx >= 0x7ff00000) return x+x;
-	k += (hx>>20)-1023;
-	i  = ((u_int32_t)k&0x80000000)>>31;
-        hx = (hx&0x000fffff)|((0x3ff-i)<<20);
-        y  = (double)(k+i);
-	SET_HIGH_WORD(x,hx);
-	z  = y*log10_2lo + ivln10*__ieee754_log(x);
-	return  z+y*log10_2hi;
-}
diff --git a/lib/libm/src/e_log10f.c b/lib/libm/src/e_log10f.c
deleted file mode 100644
index 1969a63ce..000000000
--- a/lib/libm/src/e_log10f.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* e_log10f.c -- float version of e_log10.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_log10f.c,v 1.8 2002/05/26 22:01:51 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-two25      =  3.3554432000e+07, /* 0x4c000000 */
-ivln10     =  4.3429449201e-01, /* 0x3ede5bd9 */
-log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
-log10_2lo  =  7.9034151668e-07; /* 0x355427db */
-
-static const float zero   =  0.0;
-
-float
-__ieee754_log10f(float x)
-{
-	float y,z;
-	int32_t i,k,hx;
-
-	GET_FLOAT_WORD(hx,x);
-
-        k=0;
-        if (hx < 0x00800000) {                  /* x < 2**-126  */
-            if ((hx&0x7fffffff)==0)
-                return -two25/zero;             /* log(+-0)=-inf */
-            if (hx<0) return (x-x)/zero;        /* log(-#) = NaN */
-            k -= 25; x *= two25; /* subnormal number, scale up x */
-	    GET_FLOAT_WORD(hx,x);
-        }
-	if (hx >= 0x7f800000) return x+x;
-	k += (hx>>23)-127;
-	i  = ((u_int32_t)k&0x80000000)>>31;
-        hx = (hx&0x007fffff)|((0x7f-i)<<23);
-        y  = (float)(k+i);
-	SET_FLOAT_WORD(x,hx);
-	z  = y*log10_2lo + ivln10*__ieee754_logf(x);
-	return  z+y*log10_2hi;
-}
diff --git a/lib/libm/src/e_log2.c b/lib/libm/src/e_log2.c
deleted file mode 100644
index 46da3ca24..000000000
--- a/lib/libm/src/e_log2.c
+++ /dev/null
@@ -1,80 +0,0 @@
-
-/* @(#)e_log.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_log2.c,v 1.1 2005/07/21 12:55:58 christos Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-ln2 = 0.6931471805599452862268,
-two54   =  1.80143985094819840000e+16,  /* 43500000 00000000 */
-Lg1 = 6.666666666666735130e-01,  /* 3FE55555 55555593 */
-Lg2 = 3.999999999940941908e-01,  /* 3FD99999 9997FA04 */
-Lg3 = 2.857142874366239149e-01,  /* 3FD24924 94229359 */
-Lg4 = 2.222219843214978396e-01,  /* 3FCC71C5 1D8E78AF */
-Lg5 = 1.818357216161805012e-01,  /* 3FC74664 96CB03DE */
-Lg6 = 1.531383769920937332e-01,  /* 3FC39A09 D078C69F */
-Lg7 = 1.479819860511658591e-01;  /* 3FC2F112 DF3E5244 */
-
-static const double zero   =  0.0;
-
-double
-__ieee754_log2(double x)
-{
-	double hfsq,f,s,z,R,w,t1,t2,dk;
-	int32_t k,hx,i,j;
-	u_int32_t lx;
-
-	EXTRACT_WORDS(hx,lx,x);
-
-	k=0;
-	if (hx < 0x00100000) {			/* x < 2**-1022  */
-	    if (((hx&0x7fffffff)|lx)==0) 
-		return -two54/zero;		/* log(+-0)=-inf */
-	    if (hx<0) return (x-x)/zero;	/* log(-#) = NaN */
-	    k -= 54; x *= two54; /* subnormal number, scale up x */
-	    GET_HIGH_WORD(hx,x);
-	} 
-	if (hx >= 0x7ff00000) return x+x;
-	k += (hx>>20)-1023;
-	hx &= 0x000fffff;
-	i = (hx+0x95f64)&0x100000;
-	SET_HIGH_WORD(x,hx|(i^0x3ff00000));	/* normalize x or x/2 */
-	k += (i>>20);
-	f = x-1.0;
-	dk = (double)k;
-	if((0x000fffff&(2+hx))<3) {	/* |f| < 2**-20 */
-	    if (f==zero) 
-		    return (dk);
-	    R = f*f*(0.5-0.33333333333333333*f);
-	    return (dk-(R-f)/ln2);
-	}
- 	s = f/(2.0+f); 
-	z = s*s;
-	i = hx-0x6147a;
-	w = z*z;
-	j = 0x6b851-hx;
-	t1= w*(Lg2+w*(Lg4+w*Lg6)); 
-	t2= z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7))); 
-	i |= j;
-	R = t2+t1;
-	if(i>0) {
-	    hfsq=0.5*f*f;
-	    return (dk-(hfsq-s*(hfsq+R)-f)/ln2);
-	} else
-		return (dk-((s*(f-R))-f)/ln2);
-}
diff --git a/lib/libm/src/e_log2f.c b/lib/libm/src/e_log2f.c
deleted file mode 100644
index c521d7b20..000000000
--- a/lib/libm/src/e_log2f.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* e_logf.c -- float version of e_log.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_log2f.c,v 1.1 2005/07/21 12:55:58 christos Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-ln2 = 0.6931471805599452862268, 
-two25 =    3.355443200e+07,	/* 0x4c000000 */
-Lg1 = 6.6666668653e-01,	/* 3F2AAAAB */
-Lg2 = 4.0000000596e-01,	/* 3ECCCCCD */
-Lg3 = 2.8571429849e-01, /* 3E924925 */
-Lg4 = 2.2222198546e-01, /* 3E638E29 */
-Lg5 = 1.8183572590e-01, /* 3E3A3325 */
-Lg6 = 1.5313838422e-01, /* 3E1CD04F */
-Lg7 = 1.4798198640e-01; /* 3E178897 */
-
-static const float zero   =  0.0;
-
-float
-__ieee754_log2f(float x)
-{
-	float hfsq,f,s,z,R,w,t1,t2,dk;
-	int32_t k,ix,i,j;
-
-	GET_FLOAT_WORD(ix,x);
-
-	k=0;
-	if (ix < 0x00800000) {			/* x < 2**-126  */
-	    if ((ix&0x7fffffff)==0)
-		return -two25/zero;		/* log(+-0)=-inf */
-	    if (ix<0) return (x-x)/zero;	/* log(-#) = NaN */
-	    k -= 25; x *= two25; /* subnormal number, scale up x */
-	    GET_FLOAT_WORD(ix,x);
-	}
-	if (ix >= 0x7f800000) return x+x;
-	k += (ix>>23)-127;
-	ix &= 0x007fffff;
-	i = (ix+(0x95f64<<3))&0x800000;
-	SET_FLOAT_WORD(x,ix|(i^0x3f800000));	/* normalize x or x/2 */
-	k += (i>>23);
-	dk = (float)k;
-	f = x-(float)1.0;
-	if((0x007fffff&(15+ix))<16) {	/* |f| < 2**-20 */
-	    if (f==zero) 
-		    return (dk);
-	    R = f*f*((float)0.5-(float)0.33333333333333333*f);
-	    return (dk-(R-f)/ln2);
-	}
- 	s = f/((float)2.0+f);
-	z = s*s;
-	i = ix-(0x6147a<<3);
-	w = z*z;
-	j = (0x6b851<<3)-ix;
-	t1= w*(Lg2+w*(Lg4+w*Lg6));
-	t2= z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7)));
-	i |= j;
-	R = t2+t1;
-	if(i>0) {
-	    hfsq=(float)0.5*f*f;
-	    return (dk-(hfsq-s*(hfsq+R)-f)/ln2);
-	} else
-		return (dk-((s*(f-R))-f)/ln2);
-}
diff --git a/lib/libm/src/e_logf.c b/lib/libm/src/e_logf.c
deleted file mode 100644
index d40f0d659..000000000
--- a/lib/libm/src/e_logf.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* e_logf.c -- float version of e_log.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_logf.c,v 1.8 2002/05/26 22:01:51 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-ln2_hi =   6.9313812256e-01,	/* 0x3f317180 */
-ln2_lo =   9.0580006145e-06,	/* 0x3717f7d1 */
-two25 =    3.355443200e+07,	/* 0x4c000000 */
-Lg1 = 6.6666668653e-01,	/* 3F2AAAAB */
-Lg2 = 4.0000000596e-01,	/* 3ECCCCCD */
-Lg3 = 2.8571429849e-01, /* 3E924925 */
-Lg4 = 2.2222198546e-01, /* 3E638E29 */
-Lg5 = 1.8183572590e-01, /* 3E3A3325 */
-Lg6 = 1.5313838422e-01, /* 3E1CD04F */
-Lg7 = 1.4798198640e-01; /* 3E178897 */
-
-static const float zero   =  0.0;
-
-float
-__ieee754_logf(float x)
-{
-	float hfsq,f,s,z,R,w,t1,t2,dk;
-	int32_t k,ix,i,j;
-
-	GET_FLOAT_WORD(ix,x);
-
-	k=0;
-	if (ix < 0x00800000) {			/* x < 2**-126  */
-	    if ((ix&0x7fffffff)==0)
-		return -two25/zero;		/* log(+-0)=-inf */
-	    if (ix<0) return (x-x)/zero;	/* log(-#) = NaN */
-	    k -= 25; x *= two25; /* subnormal number, scale up x */
-	    GET_FLOAT_WORD(ix,x);
-	}
-	if (ix >= 0x7f800000) return x+x;
-	k += (ix>>23)-127;
-	ix &= 0x007fffff;
-	i = (ix+(0x95f64<<3))&0x800000;
-	SET_FLOAT_WORD(x,ix|(i^0x3f800000));	/* normalize x or x/2 */
-	k += (i>>23);
-	f = x-(float)1.0;
-	if((0x007fffff&(15+ix))<16) {	/* |f| < 2**-20 */
-	    if(f==zero) { if(k==0) return zero;  else {dk=(float)k;
-				   return dk*ln2_hi+dk*ln2_lo;}
-	    }
-	    R = f*f*((float)0.5-(float)0.33333333333333333*f);
-	    if(k==0) return f-R; else {dk=(float)k;
-	    	     return dk*ln2_hi-((R-dk*ln2_lo)-f);}
-	}
- 	s = f/((float)2.0+f);
-	dk = (float)k;
-	z = s*s;
-	i = ix-(0x6147a<<3);
-	w = z*z;
-	j = (0x6b851<<3)-ix;
-	t1= w*(Lg2+w*(Lg4+w*Lg6));
-	t2= z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7)));
-	i |= j;
-	R = t2+t1;
-	if(i>0) {
-	    hfsq=(float)0.5*f*f;
-	    if(k==0) return f-(hfsq-s*(hfsq+R)); else
-		     return dk*ln2_hi-((hfsq-(s*(hfsq+R)+dk*ln2_lo))-f);
-	} else {
-	    if(k==0) return f-s*(f-R); else
-		     return dk*ln2_hi-((s*(f-R)-dk*ln2_lo)-f);
-	}
-}
diff --git a/lib/libm/src/e_pow.c b/lib/libm/src/e_pow.c
deleted file mode 100644
index b9e2a6322..000000000
--- a/lib/libm/src/e_pow.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/* @(#)e_pow.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_pow.c,v 1.16 2010/04/23 19:17:07 drochner Exp $");
-#endif
-
-/* __ieee754_pow(x,y) return x**y
- *
- *		      n
- * Method:  Let x =  2   * (1+f)
- *	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 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
- *	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
- *	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
- *	13. -0 ** (-anything except 0, NAN, odd integer)  is +INF
- *	14. -0 ** (odd integer) = -( +0 ** (odd integer) )
- *	15. +INF ** (+anything except 0,NAN) is +INF
- *	16. +INF ** (-anything except 0,NAN) is +0
- *	17. -INF ** (anything)  = -0 ** (-anything)
- *	18. (-anything) ** (integer) is (-1)**(integer)*(+anything**integer)
- *	19. (-anything except 0 and inf) ** (non-integer) is NAN
- *
- * Accuracy:
- *	pow(x,y) returns x**y nearly rounded. In particular
- *			pow(integer,integer)
- *	always returns the correct integer provided it is
- *	representable.
- *
- * Constants :
- * The hexadecimal values are the intended ones for the following
- * constants. The decimal values may be used, provided that the
- * compiler will convert from decimal to binary accurately enough
- * to produce the hexadecimal values shown.
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-static const double
-bp[] = {1.0, 1.5,},
-dp_h[] = { 0.0, 5.84962487220764160156e-01,}, /* 0x3FE2B803, 0x40000000 */
-dp_l[] = { 0.0, 1.35003920212974897128e-08,}, /* 0x3E4CFDEB, 0x43CFD006 */
-zero    =  0.0,
-one	=  1.0,
-two	=  2.0,
-two53	=  9007199254740992.0,	/* 0x43400000, 0x00000000 */
-huge	=  1.0e300,
-tiny    =  1.0e-300,
-	/* poly coefs for (3/2)*(log(x)-2s-2/3*s**3 */
-L1  =  5.99999999999994648725e-01, /* 0x3FE33333, 0x33333303 */
-L2  =  4.28571428578550184252e-01, /* 0x3FDB6DB6, 0xDB6FABFF */
-L3  =  3.33333329818377432918e-01, /* 0x3FD55555, 0x518F264D */
-L4  =  2.72728123808534006489e-01, /* 0x3FD17460, 0xA91D4101 */
-L5  =  2.30660745775561754067e-01, /* 0x3FCD864A, 0x93C9DB65 */
-L6  =  2.06975017800338417784e-01, /* 0x3FCA7E28, 0x4A454EEF */
-P1   =  1.66666666666666019037e-01, /* 0x3FC55555, 0x5555553E */
-P2   = -2.77777777770155933842e-03, /* 0xBF66C16C, 0x16BEBD93 */
-P3   =  6.61375632143793436117e-05, /* 0x3F11566A, 0xAF25DE2C */
-P4   = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */
-P5   =  4.13813679705723846039e-08, /* 0x3E663769, 0x72BEA4D0 */
-lg2  =  6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */
-lg2_h  =  6.93147182464599609375e-01, /* 0x3FE62E43, 0x00000000 */
-lg2_l  = -1.90465429995776804525e-09, /* 0xBE205C61, 0x0CA86C39 */
-ovt =  8.0085662595372944372e-0017, /* -(1024-log2(ovfl+.5ulp)) */
-cp    =  9.61796693925975554329e-01, /* 0x3FEEC709, 0xDC3A03FD =2/(3ln2) */
-cp_h  =  9.61796700954437255859e-01, /* 0x3FEEC709, 0xE0000000 =(float)cp */
-cp_l  = -7.02846165095275826516e-09, /* 0xBE3E2FE0, 0x145B01F5 =tail of cp_h*/
-ivln2    =  1.44269504088896338700e+00, /* 0x3FF71547, 0x652B82FE =1/ln2 */
-ivln2_h  =  1.44269502162933349609e+00, /* 0x3FF71547, 0x60000000 =24b 1/ln2*/
-ivln2_l  =  1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/
-
-double
-__ieee754_pow(double x, double y)
-{
-	double z,ax,z_h,z_l,p_h,p_l;
-	double yy1,t1,t2,r,s,t,u,v,w;
-	int32_t i,j,k,yisint,n;
-	int32_t hx,hy,ix,iy;
-	u_int32_t lx,ly;
-
-	EXTRACT_WORDS(hx,lx,x);
-	EXTRACT_WORDS(hy,ly,y);
-	ix = hx&0x7fffffff;  iy = hy&0x7fffffff;
-
-    /* y==zero: x**0 = 1 */
-	if((iy|ly)==0) return one;
-
-    /* +-NaN return x+y */
-	if(ix > 0x7ff00000 || ((ix==0x7ff00000)&&(lx!=0)) ||
-	   iy > 0x7ff00000 || ((iy==0x7ff00000)&&(ly!=0)))
-		return x+y;
-
-    /* determine if y is an odd int when x < 0
-     * yisint = 0	... y is not an integer
-     * yisint = 1	... y is an odd int
-     * yisint = 2	... y is an even int
-     */
-	yisint  = 0;
-	if(hx<0) {
-	    if(iy>=0x43400000) yisint = 2; /* even integer y */
-	    else if(iy>=0x3ff00000) {
-		k = (iy>>20)-0x3ff;	   /* exponent */
-		if(k>20) {
-		    j = ly>>(52-k);
-		    if((uint32_t)(j<<(52-k))==ly) yisint = 2-(j&1);
-		} else if(ly==0) {
-		    j = iy>>(20-k);
-		    if((j<<(20-k))==iy) yisint = 2-(j&1);
-		}
-	    }
-	}
-
-    /* special value of y */
-	if(ly==0) {
-	    if (iy==0x7ff00000) {	/* y is +-inf */
-	        if(((ix-0x3ff00000)|lx)==0)
-		    return  y - y;	/* inf**+-1 is NaN */
-	        else if (ix >= 0x3ff00000)/* (|x|>1)**+-inf = inf,0 */
-		    return (hy>=0)? y: zero;
-	        else			/* (|x|<1)**-,+inf = inf,0 */
-		    return (hy<0)?-y: zero;
-	    }
-	    if(iy==0x3ff00000) {	/* y is  +-1 */
-		if(hy<0) return one/x; else return x;
-	    }
-	    if(hy==0x40000000) return x*x; /* y is  2 */
-	    if(hy==0x3fe00000) {	/* y is  0.5 */
-		if(hx>=0)	/* x >= +0 */
-		return __ieee754_sqrt(x);
-	    }
-	}
-
-	ax   = fabs(x);
-    /* special value of x */
-	if(lx==0) {
-	    if(ix==0x7ff00000||ix==0||ix==0x3ff00000){
-		z = ax;			/*x is +-0,+-inf,+-1*/
-		if(hy<0) z = one/z;	/* z = (1/|x|) */
-		if(hx<0) {
-		    if(((ix-0x3ff00000)|yisint)==0) {
-			z = (z-z)/(z-z); /* (-1)**non-int is NaN */
-		    } else if(yisint==1)
-			z = -z;		/* (x<0)**odd = -(|x|**odd) */
-		}
-		return z;
-	    }
-	}
-
-	n = (hx>>31)+1;
-
-    /* (x<0)**(non-int) is NaN */
-	if((n|yisint)==0) return (x-x)/(x-x);
-
-	s = one; /* s (sign of result -ve**odd) = -1 else = 1 */
-	if((n|(yisint-1))==0) s = -one;/* (-ve)**(odd int) */
-
-    /* |y| is huge */
-	if(iy>0x41e00000) { /* if |y| > 2**31 */
-	    if(iy>0x43f00000){	/* if |y| > 2**64, must o/uflow */
-		if(ix<=0x3fefffff) return (hy<0)? huge*huge:tiny*tiny;
-		if(ix>=0x3ff00000) return (hy>0)? huge*huge:tiny*tiny;
-	    }
-	/* over/underflow if x is not close to one */
-	    if(ix<0x3fefffff) return (hy<0)? s*huge*huge:s*tiny*tiny;
-	    if(ix>0x3ff00000) return (hy>0)? s*huge*huge:s*tiny*tiny;
-	/* now |1-x| is tiny <= 2**-20, suffice to compute
-	   log(x) by x-x^2/2+x^3/3-x^4/4 */
-	    t = ax-one;		/* t has 20 trailing zeros */
-	    w = (t*t)*(0.5-t*(0.3333333333333333333333-t*0.25));
-	    u = ivln2_h*t;	/* ivln2_h has 21 sig. bits */
-	    v = t*ivln2_l-w*ivln2;
-	    t1 = u+v;
-	    SET_LOW_WORD(t1,0);
-	    t2 = v-(t1-u);
-	} else {
-	    double ss,s2,s_h,s_l,t_h,t_l;
-	    n = 0;
-	/* take care subnormal number */
-	    if(ix<0x00100000)
-		{ax *= two53; n -= 53; GET_HIGH_WORD(ix,ax); }
-	    n  += ((ix)>>20)-0x3ff;
-	    j  = ix&0x000fffff;
-	/* determine interval */
-	    ix = j|0x3ff00000;		/* normalize ix */
-	    if(j<=0x3988E) k=0;		/* |x|<sqrt(3/2) */
-	    else if(j<0xBB67A) k=1;	/* |x|<sqrt(3)   */
-	    else {k=0;n+=1;ix -= 0x00100000;}
-	    SET_HIGH_WORD(ax,ix);
-
-	/* compute ss = s_h+s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5) */
-	    u = ax-bp[k];		/* bp[0]=1.0, bp[1]=1.5 */
-	    v = one/(ax+bp[k]);
-	    ss = u*v;
-	    s_h = ss;
-	    SET_LOW_WORD(s_h,0);
-	/* t_h=ax+bp[k] High */
-	    t_h = zero;
-	    SET_HIGH_WORD(t_h,((ix>>1)|0x20000000)+0x00080000+(k<<18));
-	    t_l = ax - (t_h-bp[k]);
-	    s_l = v*((u-s_h*t_h)-s_h*t_l);
-	/* compute log(ax) */
-	    s2 = ss*ss;
-	    r = s2*s2*(L1+s2*(L2+s2*(L3+s2*(L4+s2*(L5+s2*L6)))));
-	    r += s_l*(s_h+ss);
-	    s2  = s_h*s_h;
-	    t_h = 3.0+s2+r;
-	    SET_LOW_WORD(t_h,0);
-	    t_l = r-((t_h-3.0)-s2);
-	/* u+v = ss*(1+...) */
-	    u = s_h*t_h;
-	    v = s_l*t_h+t_l*ss;
-	/* 2/(3log2)*(ss+...) */
-	    p_h = u+v;
-	    SET_LOW_WORD(p_h,0);
-	    p_l = v-(p_h-u);
-	    z_h = cp_h*p_h;		/* cp_h+cp_l = 2/(3*log2) */
-	    z_l = cp_l*p_h+p_l*cp+dp_l[k];
-	/* log2(ax) = (ss+..)*2/(3*log2) = n + dp_h + z_h + z_l */
-	    t = (double)n;
-	    t1 = (((z_h+z_l)+dp_h[k])+t);
-	    SET_LOW_WORD(t1,0);
-	    t2 = z_l-(((t1-t)-dp_h[k])-z_h);
-	}
-
-    /* split up y into yy1+y2 and compute (yy1+y2)*(t1+t2) */
-	yy1  = y;
-	SET_LOW_WORD(yy1,0);
-	p_l = (y-yy1)*t1+y*t2;
-	p_h = yy1*t1;
-	z = p_l+p_h;
-	EXTRACT_WORDS(j,i,z);
-	if (j>=0x40900000) {				/* z >= 1024 */
-	    if(((j-0x40900000)|i)!=0)			/* if z > 1024 */
-		return s*huge*huge;			/* overflow */
-	    else {
-		if(p_l+ovt>z-p_h) return s*huge*huge;	/* overflow */
-	    }
-	} else if((j&0x7fffffff)>=0x4090cc00 ) {	/* z <= -1075 */
-	    if(((j-0xc090cc00)|i)!=0) 		/* z < -1075 */
-		return s*tiny*tiny;		/* underflow */
-	    else {
-		if(p_l<=z-p_h) return s*tiny*tiny;	/* underflow */
-	    }
-	}
-    /*
-     * compute 2**(p_h+p_l)
-     */
-	i = j&0x7fffffff;
-	k = (i>>20)-0x3ff;
-	n = 0;
-	if(i>0x3fe00000) {		/* if |z| > 0.5, set n = [z+0.5] */
-	    n = j+(0x00100000>>(k+1));
-	    k = ((n&0x7fffffff)>>20)-0x3ff;	/* new k for n */
-	    t = zero;
-	    SET_HIGH_WORD(t,n&~(0x000fffff>>k));
-	    n = ((n&0x000fffff)|0x00100000)>>(20-k);
-	    if(j<0) n = -n;
-	    p_h -= t;
-	}
-	t = p_l+p_h;
-	SET_LOW_WORD(t,0);
-	u = t*lg2_h;
-	v = (p_l-(t-p_h))*lg2+t*lg2_l;
-	z = u+v;
-	w = v-(z-u);
-	t  = z*z;
-	t1  = z - t*(P1+t*(P2+t*(P3+t*(P4+t*P5))));
-	r  = (z*t1)/(t1-two)-(w+z*w);
-	z  = one-(r-z);
-	GET_HIGH_WORD(j,z);
-	j += (n<<20);
-	if((j>>20)<=0) z = scalbn(z,n);	/* subnormal output */
-	else SET_HIGH_WORD(z,j);
-	return s*z;
-}
diff --git a/lib/libm/src/e_powf.c b/lib/libm/src/e_powf.c
deleted file mode 100644
index b4894e0fb..000000000
--- a/lib/libm/src/e_powf.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/* e_powf.c -- float version of e_pow.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_powf.c,v 1.15 2010/04/23 19:17:07 drochner Exp $");
-#endif
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-static const float huge = 1.0e+30, tiny = 1.0e-30;
-
-static const float
-bp[] = {1.0, 1.5,},
-dp_h[] = { 0.0, 5.84960938e-01,}, /* 0x3f15c000 */
-dp_l[] = { 0.0, 1.56322085e-06,}, /* 0x35d1cfdc */
-zero    =  0.0,
-one	=  1.0,
-two	=  2.0,
-two24	=  16777216.0,	/* 0x4b800000 */
-	/* poly coefs for (3/2)*(log(x)-2s-2/3*s**3 */
-L1  =  6.0000002384e-01, /* 0x3f19999a */
-L2  =  4.2857143283e-01, /* 0x3edb6db7 */
-L3  =  3.3333334327e-01, /* 0x3eaaaaab */
-L4  =  2.7272811532e-01, /* 0x3e8ba305 */
-L5  =  2.3066075146e-01, /* 0x3e6c3255 */
-L6  =  2.0697501302e-01, /* 0x3e53f142 */
-P1   =  1.6666667163e-01, /* 0x3e2aaaab */
-P2   = -2.7777778450e-03, /* 0xbb360b61 */
-P3   =  6.6137559770e-05, /* 0x388ab355 */
-P4   = -1.6533901999e-06, /* 0xb5ddea0e */
-P5   =  4.1381369442e-08, /* 0x3331bb4c */
-lg2  =  6.9314718246e-01, /* 0x3f317218 */
-lg2_h  =  6.93145752e-01, /* 0x3f317200 */
-lg2_l  =  1.42860654e-06, /* 0x35bfbe8c */
-ovt =  4.2995665694e-08, /* -(128-log2(ovfl+.5ulp)) */
-cp    =  9.6179670095e-01, /* 0x3f76384f =2/(3ln2) */
-cp_h  =  9.6179199219e-01, /* 0x3f763800 =head of cp */
-cp_l  =  4.7017383622e-06, /* 0x369dc3a0 =tail of cp_h */
-ivln2    =  1.4426950216e+00, /* 0x3fb8aa3b =1/ln2 */
-ivln2_h  =  1.4426879883e+00, /* 0x3fb8aa00 =16b 1/ln2*/
-ivln2_l  =  7.0526075433e-06; /* 0x36eca570 =1/ln2 tail*/
-
-float
-__ieee754_powf(float x, float y)
-{
-	float z,ax,z_h,z_l,p_h,p_l;
-	float yy1,t1,t2,r,s,t,u,v,w;
-	int32_t i,j,k,yisint,n;
-	int32_t hx,hy,ix,iy,is;
-
-	GET_FLOAT_WORD(hx,x);
-	GET_FLOAT_WORD(hy,y);
-	ix = hx&0x7fffffff;  iy = hy&0x7fffffff;
-
-    /* y==zero: x**0 = 1 */
-	if(iy==0) return one;
-
-    /* +-NaN return x+y */
-	if(ix > 0x7f800000 ||
-	   iy > 0x7f800000)
-		return x+y;
-
-    /* determine if y is an odd int when x < 0
-     * yisint = 0	... y is not an integer
-     * yisint = 1	... y is an odd int
-     * yisint = 2	... y is an even int
-     */
-	yisint  = 0;
-	if(hx<0) {
-	    if(iy>=0x4b800000) yisint = 2; /* even integer y */
-	    else if(iy>=0x3f800000) {
-		k = (iy>>23)-0x7f;	   /* exponent */
-		j = iy>>(23-k);
-		if((j<<(23-k))==iy) yisint = 2-(j&1);
-	    }
-	}
-
-    /* special value of y */
-	if (iy==0x7f800000) {	/* y is +-inf */
-	    if (ix==0x3f800000)
-	        return  y - y;	/* inf**+-1 is NaN */
-	    else if (ix > 0x3f800000)/* (|x|>1)**+-inf = inf,0 */
-	        return (hy>=0)? y: zero;
-	    else			/* (|x|<1)**-,+inf = inf,0 */
-	        return (hy<0)?-y: zero;
-	}
-	if(iy==0x3f800000) {	/* y is  +-1 */
-	    if(hy<0) return one/x; else return x;
-	}
-	if(hy==0x40000000) return x*x; /* y is  2 */
-	if(hy==0x3f000000) {	/* y is  0.5 */
-	    if(hx>=0)	/* x >= +0 */
-	    return __ieee754_sqrtf(x);
-	}
-
-	ax   = fabsf(x);
-    /* special value of x */
-	if(ix==0x7f800000||ix==0||ix==0x3f800000){
-	    z = ax;			/*x is +-0,+-inf,+-1*/
-	    if(hy<0) z = one/z;	/* z = (1/|x|) */
-	    if(hx<0) {
-		if(((ix-0x3f800000)|yisint)==0) {
-		    z = (z-z)/(z-z); /* (-1)**non-int is NaN */
-		} else if(yisint==1)
-		    z = -z;		/* (x<0)**odd = -(|x|**odd) */
-	    }
-	    return z;
-	}
-
-    /* (x<0)**(non-int) is NaN */
-	if(((((u_int32_t)hx>>31)-1)|yisint)==0) return (x-x)/(x-x);
-
-    /* |y| is huge */
-	if(iy>0x4d000000) { /* if |y| > 2**27 */
-	/* over/underflow if x is not close to one */
-	    if(ix<0x3f7ffff8) return (hy<0)? huge*huge:tiny*tiny;
-	    if(ix>0x3f800007) return (hy>0)? huge*huge:tiny*tiny;
-	/* now |1-x| is tiny <= 2**-20, suffice to compute
-	   log(x) by x-x^2/2+x^3/3-x^4/4 */
-	    t = ax-one;		/* t has 20 trailing zeros */
-	    w = (t*t)*((float)0.5-t*((float)0.333333333333-t*(float)0.25));
-	    u = ivln2_h*t;	/* ivln2_h has 16 sig. bits */
-	    v = t*ivln2_l-w*ivln2;
-	    t1 = u+v;
-	    GET_FLOAT_WORD(is,t1);
-	    SET_FLOAT_WORD(t1,is&0xfffff000);
-	    t2 = v-(t1-u);
-	} else {
-	    float s2,s_h,s_l,t_h,t_l;
-	    n = 0;
-	/* take care subnormal number */
-	    if(ix<0x00800000)
-		{ax *= two24; n -= 24; GET_FLOAT_WORD(ix,ax); }
-	    n  += ((ix)>>23)-0x7f;
-	    j  = ix&0x007fffff;
-	/* determine interval */
-	    ix = j|0x3f800000;		/* normalize ix */
-	    if(j<=0x1cc471) k=0;	/* |x|<sqrt(3/2) */
-	    else if(j<0x5db3d7) k=1;	/* |x|<sqrt(3)   */
-	    else {k=0;n+=1;ix -= 0x00800000;}
-	    SET_FLOAT_WORD(ax,ix);
-
-	/* compute s = s_h+s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5) */
-	    u = ax-bp[k];		/* bp[0]=1.0, bp[1]=1.5 */
-	    v = one/(ax+bp[k]);
-	    s = u*v;
-	    s_h = s;
-	    GET_FLOAT_WORD(is,s_h);
-	    SET_FLOAT_WORD(s_h,is&0xfffff000);
-	/* t_h=ax+bp[k] High */
-	    SET_FLOAT_WORD(t_h,((ix>>1)|0x20000000)+0x0040000+(k<<21));
-	    t_l = ax - (t_h-bp[k]);
-	    s_l = v*((u-s_h*t_h)-s_h*t_l);
-	/* compute log(ax) */
-	    s2 = s*s;
-	    r = s2*s2*(L1+s2*(L2+s2*(L3+s2*(L4+s2*(L5+s2*L6)))));
-	    r += s_l*(s_h+s);
-	    s2  = s_h*s_h;
-	    t_h = (float)3.0+s2+r;
-	    GET_FLOAT_WORD(is,t_h);
-	    SET_FLOAT_WORD(t_h,is&0xfffff000);
-	    t_l = r-((t_h-(float)3.0)-s2);
-	/* u+v = s*(1+...) */
-	    u = s_h*t_h;
-	    v = s_l*t_h+t_l*s;
-	/* 2/(3log2)*(s+...) */
-	    p_h = u+v;
-	    GET_FLOAT_WORD(is,p_h);
-	    SET_FLOAT_WORD(p_h,is&0xfffff000);
-	    p_l = v-(p_h-u);
-	    z_h = cp_h*p_h;		/* cp_h+cp_l = 2/(3*log2) */
-	    z_l = cp_l*p_h+p_l*cp+dp_l[k];
-	/* log2(ax) = (s+..)*2/(3*log2) = n + dp_h + z_h + z_l */
-	    t = (float)n;
-	    t1 = (((z_h+z_l)+dp_h[k])+t);
-	    GET_FLOAT_WORD(is,t1);
-	    SET_FLOAT_WORD(t1,is&0xfffff000);
-	    t2 = z_l-(((t1-t)-dp_h[k])-z_h);
-	}
-
-	s = one; /* s (sign of result -ve**odd) = -1 else = 1 */
-	if(((((u_int32_t)hx>>31)-1)|(yisint-1))==0)
-	    s = -one;	/* (-ve)**(odd int) */
-
-    /* split up y into yy1+y2 and compute (yy1+y2)*(t1+t2) */
-	GET_FLOAT_WORD(is,y);
-	SET_FLOAT_WORD(yy1,is&0xfffff000);
-	p_l = (y-yy1)*t1+y*t2;
-	p_h = yy1*t1;
-	z = p_l+p_h;
-	GET_FLOAT_WORD(j,z);
-	if (j>0x43000000)				/* if z > 128 */
-	    return s*huge*huge;				/* overflow */
-	else if (j==0x43000000) {			/* if z == 128 */
-	    if(p_l+ovt>z-p_h) return s*huge*huge;	/* overflow */
-	}
-	else if ((uint32_t)j==0xc3160000){		/* z == -150 */
-	    if(p_l<=z-p_h) return s*tiny*tiny;		/* underflow */
-	}
-	else if ((j&0x7fffffff)>0x43160000)		/* z <= -150 */
-	    return s*tiny*tiny;				/* underflow */
-    /*
-     * compute 2**(p_h+p_l)
-     */
-	i = j&0x7fffffff;
-	k = (i>>23)-0x7f;
-	n = 0;
-	if(i>0x3f000000) {		/* if |z| > 0.5, set n = [z+0.5] */
-	    n = j+(0x00800000>>(k+1));
-	    k = ((n&0x7fffffff)>>23)-0x7f;	/* new k for n */
-	    SET_FLOAT_WORD(t,n&~(0x007fffff>>k));
-	    n = ((n&0x007fffff)|0x00800000)>>(23-k);
-	    if(j<0) n = -n;
-	    p_h -= t;
-	}
-	t = p_l+p_h;
-	GET_FLOAT_WORD(is,t);
-	SET_FLOAT_WORD(t,is&0xfffff000);
-	u = t*lg2_h;
-	v = (p_l-(t-p_h))*lg2+t*lg2_l;
-	z = u+v;
-	w = v-(z-u);
-	t  = z*z;
-	t1  = z - t*(P1+t*(P2+t*(P3+t*(P4+t*P5))));
-	r  = (z*t1)/(t1-two)-(w+z*w);
-	z  = one-(r-z);
-	GET_FLOAT_WORD(j,z);
-	j += (n<<23);
-	if((j>>23)<=0) z = scalbnf(z,n);	/* subnormal output */
-	else SET_FLOAT_WORD(z,j);
-	return s*z;
-}
diff --git a/lib/libm/src/e_rem_pio2.c b/lib/libm/src/e_rem_pio2.c
deleted file mode 100644
index 466e0ba78..000000000
--- a/lib/libm/src/e_rem_pio2.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* @(#)e_rem_pio2.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_rem_pio2.c,v 1.11 2002/05/26 22:01:52 wiz Exp $");
-#endif
-
-/* __ieee754_rem_pio2(x,y)
- *
- * return the remainder of x rem pi/2 in y[0]+y[1]
- * use __kernel_rem_pio2()
- */
-
-#include "math.h"
-#include "math_private.h"
-
-/*
- * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi
- */
-static const int32_t two_over_pi[] = {
-0xA2F983, 0x6E4E44, 0x1529FC, 0x2757D1, 0xF534DD, 0xC0DB62,
-0x95993C, 0x439041, 0xFE5163, 0xABDEBB, 0xC561B7, 0x246E3A,
-0x424DD2, 0xE00649, 0x2EEA09, 0xD1921C, 0xFE1DEB, 0x1CB129,
-0xA73EE8, 0x8235F5, 0x2EBB44, 0x84E99C, 0x7026B4, 0x5F7E41,
-0x3991D6, 0x398353, 0x39F49C, 0x845F8B, 0xBDF928, 0x3B1FF8,
-0x97FFDE, 0x05980F, 0xEF2F11, 0x8B5A0A, 0x6D1F6D, 0x367ECF,
-0x27CB09, 0xB74F46, 0x3F669E, 0x5FEA2D, 0x7527BA, 0xC7EBE5,
-0xF17B3D, 0x0739F7, 0x8A5292, 0xEA6BFB, 0x5FB11F, 0x8D5D08,
-0x560330, 0x46FC7B, 0x6BABF0, 0xCFBC20, 0x9AF436, 0x1DA9E3,
-0x91615E, 0xE61B08, 0x659985, 0x5F14A0, 0x68408D, 0xFFD880,
-0x4D7327, 0x310606, 0x1556CA, 0x73A8C9, 0x60E27B, 0xC08C6B,
-};
-
-static const int32_t npio2_hw[] = {
-0x3FF921FB, 0x400921FB, 0x4012D97C, 0x401921FB, 0x401F6A7A, 0x4022D97C,
-0x4025FDBB, 0x402921FB, 0x402C463A, 0x402F6A7A, 0x4031475C, 0x4032D97C,
-0x40346B9C, 0x4035FDBB, 0x40378FDB, 0x403921FB, 0x403AB41B, 0x403C463A,
-0x403DD85A, 0x403F6A7A, 0x40407E4C, 0x4041475C, 0x4042106C, 0x4042D97C,
-0x4043A28C, 0x40446B9C, 0x404534AC, 0x4045FDBB, 0x4046C6CB, 0x40478FDB,
-0x404858EB, 0x404921FB,
-};
-
-/*
- * invpio2:  53 bits of 2/pi
- * pio2_1:   first  33 bit of pi/2
- * pio2_1t:  pi/2 - pio2_1
- * pio2_2:   second 33 bit of pi/2
- * pio2_2t:  pi/2 - (pio2_1+pio2_2)
- * pio2_3:   third  33 bit of pi/2
- * pio2_3t:  pi/2 - (pio2_1+pio2_2+pio2_3)
- */
-
-static const double
-zero =  0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */
-half =  5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */
-two24 =  1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */
-invpio2 =  6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */
-pio2_1  =  1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */
-pio2_1t =  6.07710050650619224932e-11, /* 0x3DD0B461, 0x1A626331 */
-pio2_2  =  6.07710050630396597660e-11, /* 0x3DD0B461, 0x1A600000 */
-pio2_2t =  2.02226624879595063154e-21, /* 0x3BA3198A, 0x2E037073 */
-pio2_3  =  2.02226624871116645580e-21, /* 0x3BA3198A, 0x2E000000 */
-pio2_3t =  8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */
-
-int32_t
-__ieee754_rem_pio2(double x, double *y)
-{
-	double z,w,t,r,fn;
-	double tx[3];
-	int32_t e0,i,j,nx,n,ix,hx;
-	u_int32_t low;
-
-	z = 0;
-	GET_HIGH_WORD(hx,x);		/* high word of x */
-	ix = hx&0x7fffffff;
-	if(ix<=0x3fe921fb)   /* |x| ~<= pi/4 , no need for reduction */
-	    {y[0] = x; y[1] = 0; return 0;}
-	if(ix<0x4002d97c) {  /* |x| < 3pi/4, special case with n=+-1 */
-	    if(hx>0) {
-		z = x - pio2_1;
-		if(ix!=0x3ff921fb) { 	/* 33+53 bit pi is good enough */
-		    y[0] = z - pio2_1t;
-		    y[1] = (z-y[0])-pio2_1t;
-		} else {		/* near pi/2, use 33+33+53 bit pi */
-		    z -= pio2_2;
-		    y[0] = z - pio2_2t;
-		    y[1] = (z-y[0])-pio2_2t;
-		}
-		return 1;
-	    } else {	/* negative x */
-		z = x + pio2_1;
-		if(ix!=0x3ff921fb) { 	/* 33+53 bit pi is good enough */
-		    y[0] = z + pio2_1t;
-		    y[1] = (z-y[0])+pio2_1t;
-		} else {		/* near pi/2, use 33+33+53 bit pi */
-		    z += pio2_2;
-		    y[0] = z + pio2_2t;
-		    y[1] = (z-y[0])+pio2_2t;
-		}
-		return -1;
-	    }
-	}
-	if(ix<=0x413921fb) { /* |x| ~<= 2^19*(pi/2), medium size */
-	    t  = fabs(x);
-	    n  = (int32_t) (t*invpio2+half);
-	    fn = (double)n;
-	    r  = t-fn*pio2_1;
-	    w  = fn*pio2_1t;	/* 1st round good to 85 bit */
-	    if(n<32&&ix!=npio2_hw[n-1]) {
-		y[0] = r-w;	/* quick check no cancellation */
-	    } else {
-	        u_int32_t high;
-	        j  = ix>>20;
-	        y[0] = r-w;
-		GET_HIGH_WORD(high,y[0]);
-	        i = j-((high>>20)&0x7ff);
-	        if(i>16) {  /* 2nd iteration needed, good to 118 */
-		    t  = r;
-		    w  = fn*pio2_2;
-		    r  = t-w;
-		    w  = fn*pio2_2t-((t-r)-w);
-		    y[0] = r-w;
-		    GET_HIGH_WORD(high,y[0]);
-		    i = j-((high>>20)&0x7ff);
-		    if(i>49)  {	/* 3rd iteration need, 151 bits acc */
-		    	t  = r;	/* will cover all possible cases */
-		    	w  = fn*pio2_3;
-		    	r  = t-w;
-		    	w  = fn*pio2_3t-((t-r)-w);
-		    	y[0] = r-w;
-		    }
-		}
-	    }
-	    y[1] = (r-y[0])-w;
-	    if(hx<0) 	{y[0] = -y[0]; y[1] = -y[1]; return -n;}
-	    else	 return n;
-	}
-    /*
-     * all other (large) arguments
-     */
-	if(ix>=0x7ff00000) {		/* x is inf or NaN */
-	    y[0]=y[1]=x-x; return 0;
-	}
-    /* set z = scalbn(|x|,ilogb(x)-23) */
-	GET_LOW_WORD(low,x);
-	SET_LOW_WORD(z,low);
-	e0 	= (ix>>20)-1046;	/* e0 = ilogb(z)-23; */
-	SET_HIGH_WORD(z, ix - ((int32_t)(e0<<20)));
-	for(i=0;i<2;i++) {
-		tx[i] = (double)((int32_t)(z));
-		z     = (z-tx[i])*two24;
-	}
-	tx[2] = z;
-	nx = 3;
-	while(tx[nx-1]==zero) nx--;	/* skip zero term */
-	n  =  __kernel_rem_pio2(tx,y,e0,nx,2,two_over_pi);
-	if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;}
-	return n;
-}
diff --git a/lib/libm/src/e_rem_pio2f.c b/lib/libm/src/e_rem_pio2f.c
deleted file mode 100644
index c22ad5279..000000000
--- a/lib/libm/src/e_rem_pio2f.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* e_rem_pio2f.c -- float version of e_rem_pio2.c
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_rem_pio2f.c,v 1.9 2009/01/19 06:00:30 lukem Exp $");
-#endif
-
-/* __ieee754_rem_pio2f(x,y)
- *
- * return the remainder of x rem pi/2 in y[0]+y[1]
- * use __kernel_rem_pio2f()
- */
-
-#include "math.h"
-#include "math_private.h"
-
-/*
- * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi
- */
-static const int32_t two_over_pi[] = {
-0xA2, 0xF9, 0x83, 0x6E, 0x4E, 0x44, 0x15, 0x29, 0xFC,
-0x27, 0x57, 0xD1, 0xF5, 0x34, 0xDD, 0xC0, 0xDB, 0x62,
-0x95, 0x99, 0x3C, 0x43, 0x90, 0x41, 0xFE, 0x51, 0x63,
-0xAB, 0xDE, 0xBB, 0xC5, 0x61, 0xB7, 0x24, 0x6E, 0x3A,
-0x42, 0x4D, 0xD2, 0xE0, 0x06, 0x49, 0x2E, 0xEA, 0x09,
-0xD1, 0x92, 0x1C, 0xFE, 0x1D, 0xEB, 0x1C, 0xB1, 0x29,
-0xA7, 0x3E, 0xE8, 0x82, 0x35, 0xF5, 0x2E, 0xBB, 0x44,
-0x84, 0xE9, 0x9C, 0x70, 0x26, 0xB4, 0x5F, 0x7E, 0x41,
-0x39, 0x91, 0xD6, 0x39, 0x83, 0x53, 0x39, 0xF4, 0x9C,
-0x84, 0x5F, 0x8B, 0xBD, 0xF9, 0x28, 0x3B, 0x1F, 0xF8,
-0x97, 0xFF, 0xDE, 0x05, 0x98, 0x0F, 0xEF, 0x2F, 0x11,
-0x8B, 0x5A, 0x0A, 0x6D, 0x1F, 0x6D, 0x36, 0x7E, 0xCF,
-0x27, 0xCB, 0x09, 0xB7, 0x4F, 0x46, 0x3F, 0x66, 0x9E,
-0x5F, 0xEA, 0x2D, 0x75, 0x27, 0xBA, 0xC7, 0xEB, 0xE5,
-0xF1, 0x7B, 0x3D, 0x07, 0x39, 0xF7, 0x8A, 0x52, 0x92,
-0xEA, 0x6B, 0xFB, 0x5F, 0xB1, 0x1F, 0x8D, 0x5D, 0x08,
-0x56, 0x03, 0x30, 0x46, 0xFC, 0x7B, 0x6B, 0xAB, 0xF0,
-0xCF, 0xBC, 0x20, 0x9A, 0xF4, 0x36, 0x1D, 0xA9, 0xE3,
-0x91, 0x61, 0x5E, 0xE6, 0x1B, 0x08, 0x65, 0x99, 0x85,
-0x5F, 0x14, 0xA0, 0x68, 0x40, 0x8D, 0xFF, 0xD8, 0x80,
-0x4D, 0x73, 0x27, 0x31, 0x06, 0x06, 0x15, 0x56, 0xCA,
-0x73, 0xA8, 0xC9, 0x60, 0xE2, 0x7B, 0xC0, 0x8C, 0x6B,
-};
-
-/* This array is like the one in e_rem_pio2.c, but the numbers are
-   single precision and the last 8 bits are forced to 0.  */
-static const int32_t npio2_hw[] = {
-0x3fc90f00, 0x40490f00, 0x4096cb00, 0x40c90f00, 0x40fb5300, 0x4116cb00,
-0x412fed00, 0x41490f00, 0x41623100, 0x417b5300, 0x418a3a00, 0x4196cb00,
-0x41a35c00, 0x41afed00, 0x41bc7e00, 0x41c90f00, 0x41d5a000, 0x41e23100,
-0x41eec200, 0x41fb5300, 0x4203f200, 0x420a3a00, 0x42108300, 0x4216cb00,
-0x421d1400, 0x42235c00, 0x4229a500, 0x422fed00, 0x42363600, 0x423c7e00,
-0x4242c700, 0x42490f00
-};
-
-/*
- * invpio2:  24 bits of 2/pi
- * pio2_1:   first  17 bit of pi/2
- * pio2_1t:  pi/2 - pio2_1
- * pio2_2:   second 17 bit of pi/2
- * pio2_2t:  pi/2 - (pio2_1+pio2_2)
- * pio2_3:   third  17 bit of pi/2
- * pio2_3t:  pi/2 - (pio2_1+pio2_2+pio2_3)
- */
-
-static const float
-zero =  0.0000000000e+00, /* 0x00000000 */
-half =  5.0000000000e-01, /* 0x3f000000 */
-two8 =  2.5600000000e+02, /* 0x43800000 */
-invpio2 =  6.3661980629e-01, /* 0x3f22f984 */
-pio2_1  =  1.5707855225e+00, /* 0x3fc90f80 */
-pio2_1t =  1.0804334124e-05, /* 0x37354443 */
-pio2_2  =  1.0804273188e-05, /* 0x37354400 */
-pio2_2t =  6.0770999344e-11, /* 0x2e85a308 */
-pio2_3  =  6.0770943833e-11, /* 0x2e85a300 */
-pio2_3t =  6.1232342629e-17; /* 0x248d3132 */
-
-int32_t
-__ieee754_rem_pio2f(float x, float *y)
-{
-	float z,w,t,r,fn;
-	float tx[3];
-	int32_t e0,i,j,nx,n,ix,hx;
-
-	GET_FLOAT_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix<=0x3f490fd8)   /* |x| ~<= pi/4 , no need for reduction */
-	    {y[0] = x; y[1] = 0; return 0;}
-	if(ix<0x4016cbe4) {  /* |x| < 3pi/4, special case with n=+-1 */
-	    if(hx>0) {
-		z = x - pio2_1;
-		if((ix&0xfffffff0)!=0x3fc90fd0) { /* 24+24 bit pi OK */
-		    y[0] = z - pio2_1t;
-		    y[1] = (z-y[0])-pio2_1t;
-		} else {		/* near pi/2, use 24+24+24 bit pi */
-		    z -= pio2_2;
-		    y[0] = z - pio2_2t;
-		    y[1] = (z-y[0])-pio2_2t;
-		}
-		return 1;
-	    } else {	/* negative x */
-		z = x + pio2_1;
-		if((ix&0xfffffff0)!=0x3fc90fd0) { /* 24+24 bit pi OK */
-		    y[0] = z + pio2_1t;
-		    y[1] = (z-y[0])+pio2_1t;
-		} else {		/* near pi/2, use 24+24+24 bit pi */
-		    z += pio2_2;
-		    y[0] = z + pio2_2t;
-		    y[1] = (z-y[0])+pio2_2t;
-		}
-		return -1;
-	    }
-	}
-	if(ix<=0x43490f80) { /* |x| ~<= 2^7*(pi/2), medium size */
-	    t  = fabsf(x);
-	    n  = (int32_t) (t*invpio2+half);
-	    fn = (float)n;
-	    r  = t-fn*pio2_1;
-	    w  = fn*pio2_1t;	/* 1st round good to 40 bit */
-	    if(n<32&&(int32_t)(ix&0xffffff00)!=npio2_hw[n-1]) {
-		y[0] = r-w;	/* quick check no cancellation */
-	    } else {
-	        u_int32_t high;
-	        j  = ix>>23;
-	        y[0] = r-w;
-		GET_FLOAT_WORD(high,y[0]);
-	        i = j-((high>>23)&0xff);
-	        if(i>8) {  /* 2nd iteration needed, good to 57 */
-		    t  = r;
-		    w  = fn*pio2_2;
-		    r  = t-w;
-		    w  = fn*pio2_2t-((t-r)-w);
-		    y[0] = r-w;
-		    GET_FLOAT_WORD(high,y[0]);
-		    i = j-((high>>23)&0xff);
-		    if(i>25)  {	/* 3rd iteration need, 74 bits acc */
-		    	t  = r;	/* will cover all possible cases */
-		    	w  = fn*pio2_3;
-		    	r  = t-w;
-		    	w  = fn*pio2_3t-((t-r)-w);
-		    	y[0] = r-w;
-		    }
-		}
-	    }
-	    y[1] = (r-y[0])-w;
-	    if(hx<0) 	{y[0] = -y[0]; y[1] = -y[1]; return -n;}
-	    else	 return n;
-	}
-    /*
-     * all other (large) arguments
-     */
-	if(ix>=0x7f800000) {		/* x is inf or NaN */
-	    y[0]=y[1]=x-x; return 0;
-	}
-    /* set z = scalbn(|x|,ilogb(x)-7) */
-	e0 	= (ix>>23)-134;		/* e0 = ilogb(z)-7; */
-	SET_FLOAT_WORD(z, ix - ((int32_t)(e0<<23)));
-	for(i=0;i<2;i++) {
-		tx[i] = (float)((int32_t)(z));
-		z     = (z-tx[i])*two8;
-	}
-	tx[2] = z;
-	nx = 3;
-	while(tx[nx-1]==zero) nx--;	/* skip zero term */
-	n  =  __kernel_rem_pio2f(tx,y,e0,nx,2,two_over_pi);
-	if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;}
-	return n;
-}
diff --git a/lib/libm/src/e_remainder.c b/lib/libm/src/e_remainder.c
deleted file mode 100644
index 34e0e062c..000000000
--- a/lib/libm/src/e_remainder.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* @(#)e_remainder.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_remainder.c,v 1.11 2002/05/26 22:01:52 wiz Exp $");
-#endif
-
-/* __ieee754_remainder(x,p)
- * Return :
- * 	returns  x REM p  =  x - [x/p]*p as if in infinite
- * 	precise arithmetic, where [x/p] is the (infinite bit)
- *	integer nearest x/p (in half way case choose the even one).
- * Method :
- *	Based on fmod() return x-[x/p]chopped*p exactlp.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double zero = 0.0;
-
-
-double
-__ieee754_remainder(double x, double p)
-{
-	int32_t hx,hp;
-	u_int32_t sx,lx,lp;
-	double p_half;
-
-	EXTRACT_WORDS(hx,lx,x);
-	EXTRACT_WORDS(hp,lp,p);
-	sx = hx&0x80000000;
-	hp &= 0x7fffffff;
-	hx &= 0x7fffffff;
-
-    /* purge off exception values */
-	if((hp|lp)==0) return (x*p)/(x*p); 	/* p = 0 */
-	if((hx>=0x7ff00000)||			/* x not finite */
-	  ((hp>=0x7ff00000)&&			/* p is NaN */
-	  (((hp-0x7ff00000)|lp)!=0)))
-	    return (x*p)/(x*p);
-
-
-	if (hp<=0x7fdfffff) x = __ieee754_fmod(x,p+p);	/* now x < 2p */
-	if (((hx-hp)|(lx-lp))==0) return zero*x;
-	x  = fabs(x);
-	p  = fabs(p);
-	if (hp<0x00200000) {
-	    if(x+x>p) {
-		x-=p;
-		if(x+x>=p) x -= p;
-	    }
-	} else {
-	    p_half = 0.5*p;
-	    if(x>p_half) {
-		x-=p;
-		if(x>=p_half) x -= p;
-	    }
-	}
-	GET_HIGH_WORD(hx,x);
-	SET_HIGH_WORD(x,hx^sx);
-	return x;
-}
diff --git a/lib/libm/src/e_remainderf.c b/lib/libm/src/e_remainderf.c
deleted file mode 100644
index f56fb3096..000000000
--- a/lib/libm/src/e_remainderf.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* e_remainderf.c -- float version of e_remainder.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_remainderf.c,v 1.7 2002/05/26 22:01:52 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float zero = 0.0;
-
-
-float
-__ieee754_remainderf(float x, float p)
-{
-	int32_t hx,hp;
-	u_int32_t sx;
-	float p_half;
-
-	GET_FLOAT_WORD(hx,x);
-	GET_FLOAT_WORD(hp,p);
-	sx = hx&0x80000000;
-	hp &= 0x7fffffff;
-	hx &= 0x7fffffff;
-
-    /* purge off exception values */
-	if(hp==0) return (x*p)/(x*p);	 	/* p = 0 */
-	if((hx>=0x7f800000)||			/* x not finite */
-	  ((hp>0x7f800000)))			/* p is NaN */
-	    return (x*p)/(x*p);
-
-
-	if (hp<=0x7effffff) x = __ieee754_fmodf(x,p+p);	/* now x < 2p */
-	if ((hx-hp)==0) return zero*x;
-	x  = fabsf(x);
-	p  = fabsf(p);
-	if (hp<0x01000000) {
-	    if(x+x>p) {
-		x-=p;
-		if(x+x>=p) x -= p;
-	    }
-	} else {
-	    p_half = (float)0.5*p;
-	    if(x>p_half) {
-		x-=p;
-		if(x>=p_half) x -= p;
-	    }
-	}
-	GET_FLOAT_WORD(hx,x);
-	SET_FLOAT_WORD(x,hx^sx);
-	return x;
-}
diff --git a/lib/libm/src/e_scalb.c b/lib/libm/src/e_scalb.c
deleted file mode 100644
index b3859f3b5..000000000
--- a/lib/libm/src/e_scalb.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* @(#)e_scalb.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_scalb.c,v 1.10 2010/04/23 19:17:07 drochner Exp $");
-#endif
-
-/*
- * __ieee754_scalb(x, fn) is provide for
- * passing various standard test suite. One
- * should use scalbn() instead.
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef _SCALB_INT
-double
-__ieee754_scalb(double x, int fn)
-#else
-double
-__ieee754_scalb(double x, double fn)
-#endif
-{
-#ifdef _SCALB_INT
-	return scalbn(x,fn);
-#else
-	if (isnan(x)||isnan(fn)) return x*fn;
-	if (!finite(fn)) {
-	    if(fn>0.0) return x*fn;
-	    else       return x/(-fn);
-	}
-	if (rint(fn)!=fn) return (fn-fn)/(fn-fn);
-	if ( fn > 65000.0) return scalbn(x, 65000);
-	if (-fn > 65000.0) return scalbn(x,-65000);
-	return scalbn(x,(int)fn);
-#endif
-}
diff --git a/lib/libm/src/e_scalbf.c b/lib/libm/src/e_scalbf.c
deleted file mode 100644
index 1dfa37254..000000000
--- a/lib/libm/src/e_scalbf.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* e_scalbf.c -- float version of e_scalb.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_scalbf.c,v 1.7 2010/04/23 19:17:07 drochner Exp $");
-#endif
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef _SCALB_INT
-float
-__ieee754_scalbf(float x, int fn)
-#else
-float
-__ieee754_scalbf(float x, float fn)
-#endif
-{
-#ifdef _SCALB_INT
-	return scalbnf(x,fn);
-#else
-	if (isnanf(x)||isnanf(fn)) return x*fn;
-	if (!finitef(fn)) {
-	    if(fn>(float)0.0) return x*fn;
-	    else       return x/(-fn);
-	}
-	if (rintf(fn)!=fn) return (fn-fn)/(fn-fn);
-	if ( fn > (float)65000.0) return scalbnf(x, 65000);
-	if (-fn > (float)65000.0) return scalbnf(x,-65000);
-	return scalbnf(x,(int)fn);
-#endif
-}
diff --git a/lib/libm/src/e_sinh.c b/lib/libm/src/e_sinh.c
deleted file mode 100644
index 12c9003d6..000000000
--- a/lib/libm/src/e_sinh.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* @(#)e_sinh.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_sinh.c,v 1.11 2002/05/26 22:01:52 wiz Exp $");
-#endif
-
-/* __ieee754_sinh(x)
- * Method :
- * mathematically sinh(x) if defined to be (exp(x)-exp(-x))/2
- *	1. Replace x by |x| (sinh(-x) = -sinh(x)).
- *	2.
- *		                                    E + E/(E+1)
- *	    0        <= x <= 22     :  sinh(x) := --------------, E=expm1(x)
- *			       			        2
- *
- *	    22       <= x <= lnovft :  sinh(x) := exp(x)/2
- *	    lnovft   <= x <= ln2ovft:  sinh(x) := exp(x/2)/2 * exp(x/2)
- *	    ln2ovft  <  x	    :  sinh(x) := x*shuge (overflow)
- *
- * Special cases:
- *	sinh(x) is |x| if x is +INF, -INF, or NaN.
- *	only sinh(0)=0 is exact for finite x.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double one = 1.0, shuge = 1.0e307;
-
-double
-__ieee754_sinh(double x)
-{
-	double t,w,h;
-	int32_t ix,jx;
-	u_int32_t lx;
-
-    /* High word of |x|. */
-	GET_HIGH_WORD(jx,x);
-	ix = jx&0x7fffffff;
-
-    /* x is INF or NaN */
-	if(ix>=0x7ff00000) return x+x;
-
-	h = 0.5;
-	if (jx<0) h = -h;
-    /* |x| in [0,22], return sign(x)*0.5*(E+E/(E+1))) */
-	if (ix < 0x40360000) {		/* |x|<22 */
-	    if (ix<0x3e300000) 		/* |x|<2**-28 */
-		if(shuge+x>one) return x;/* sinh(tiny) = tiny with inexact */
-	    t = expm1(fabs(x));
-	    if(ix<0x3ff00000) return h*(2.0*t-t*t/(t+one));
-	    return h*(t+t/(t+one));
-	}
-
-    /* |x| in [22, log(maxdouble)] return 0.5*exp(|x|) */
-	if (ix < 0x40862E42)  return h*__ieee754_exp(fabs(x));
-
-    /* |x| in [log(maxdouble), overflowthresold] */
-	GET_LOW_WORD(lx,x);
-	if (ix<0x408633CE || ((ix==0x408633ce)&&(lx<=(u_int32_t)0x8fb9f87d))) {
-	    w = __ieee754_exp(0.5*fabs(x));
-	    t = h*w;
-	    return t*w;
-	}
-
-    /* |x| > overflowthresold, sinh(x) overflow */
-	return x*shuge;
-}
diff --git a/lib/libm/src/e_sinhf.c b/lib/libm/src/e_sinhf.c
deleted file mode 100644
index 639de1562..000000000
--- a/lib/libm/src/e_sinhf.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* e_sinhf.c -- float version of e_sinh.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_sinhf.c,v 1.7 2002/05/26 22:01:52 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float one = 1.0, shuge = 1.0e37;
-
-float
-__ieee754_sinhf(float x)
-{
-	float t,w,h;
-	int32_t ix,jx;
-
-	GET_FLOAT_WORD(jx,x);
-	ix = jx&0x7fffffff;
-
-    /* x is INF or NaN */
-	if(ix>=0x7f800000) return x+x;
-
-	h = 0.5;
-	if (jx<0) h = -h;
-    /* |x| in [0,22], return sign(x)*0.5*(E+E/(E+1))) */
-	if (ix < 0x41b00000) {		/* |x|<22 */
-	    if (ix<0x31800000) 		/* |x|<2**-28 */
-		if(shuge+x>one) return x;/* sinh(tiny) = tiny with inexact */
-	    t = expm1f(fabsf(x));
-	    if(ix<0x3f800000) return h*((float)2.0*t-t*t/(t+one));
-	    return h*(t+t/(t+one));
-	}
-
-    /* |x| in [22, log(maxdouble)] return 0.5*exp(|x|) */
-	if (ix < 0x42b17180)  return h*__ieee754_expf(fabsf(x));
-
-    /* |x| in [log(maxdouble), overflowthresold] */
-	if (ix<=0x42b2d4fc) {
-	    w = __ieee754_expf((float)0.5*fabsf(x));
-	    t = h*w;
-	    return t*w;
-	}
-
-    /* |x| > overflowthresold, sinh(x) overflow */
-	return x*shuge;
-}
diff --git a/lib/libm/src/e_sqrt.c b/lib/libm/src/e_sqrt.c
deleted file mode 100644
index c49d31b04..000000000
--- a/lib/libm/src/e_sqrt.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/* @(#)e_sqrt.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_sqrt.c,v 1.13 2009/02/16 01:19:34 lukem Exp $");
-#endif
-
-/* __ieee754_sqrt(x)
- * Return correctly rounded sqrt.
- *           ------------------------------------------
- *	     |  Use the hardware sqrt if you have one |
- *           ------------------------------------------
- * Method:
- *   Bit by bit method using integer arithmetic. (Slow, but portable)
- *   1. Normalization
- *	Scale x to y in [1,4) with even powers of 2:
- *	find an integer k such that  1 <= (y=x*2^(2k)) < 4, then
- *		sqrt(x) = 2^k * sqrt(y)
- *   2. Bit by bit computation
- *	Let q  = sqrt(y) truncated to i bit after binary point (q = 1),
- *	     i							 0
- *                                     i+1         2
- *	    s  = 2*q , and	y  =  2   * ( y - q  ).		(1)
- *	     i      i            i                 i
- *
- *	To compute q    from q , one checks whether
- *		    i+1       i
- *
- *			      -(i+1) 2
- *			(q + 2      ) <= y.			(2)
- *     			  i
- *							      -(i+1)
- *	If (2) is false, then q   = q ; otherwise q   = q  + 2      .
- *		 	       i+1   i             i+1   i
- *
- *	With some algebric manipulation, it is not difficult to see
- *	that (2) is equivalent to
- *                             -(i+1)
- *			s  +  2       <= y			(3)
- *			 i                i
- *
- *	The advantage of (3) is that s  and y  can be computed by
- *				      i      i
- *	the following recurrence formula:
- *	    if (3) is false
- *
- *	    s     =  s  ,	y    = y   ;			(4)
- *	     i+1      i		 i+1    i
- *
- *	    otherwise,
- *                         -i                     -(i+1)
- *	    s	  =  s  + 2  ,  y    = y  -  s  - 2  		(5)
- *           i+1      i          i+1    i     i
- *
- *	One may easily use induction to prove (4) and (5).
- *	Note. Since the left hand side of (3) contain only i+2 bits,
- *	      it does not necessary to do a full (53-bit) comparison
- *	      in (3).
- *   3. Final rounding
- *	After generating the 53 bits result, we compute one more bit.
- *	Together with the remainder, we can decide whether the
- *	result is exact, bigger than 1/2ulp, or less than 1/2ulp
- *	(it will never equal to 1/2ulp).
- *	The rounding mode can be detected by checking whether
- *	huge + tiny is equal to huge, and whether huge - tiny is
- *	equal to huge for some floating point number "huge" and "tiny".
- *
- * Special cases:
- *	sqrt(+-0) = +-0 	... exact
- *	sqrt(inf) = inf
- *	sqrt(-ve) = NaN		... with invalid signal
- *	sqrt(NaN) = NaN		... with invalid signal for signaling NaN
- *
- * Other methods : see the appended file at the end of the program below.
- *---------------
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static	const double	one	= 1.0, tiny=1.0e-300;
-
-double
-__ieee754_sqrt(double x)
-{
-	double z;
-	int32_t sign = (int)0x80000000;
-	int32_t ix0,s0,q,m,t,i;
-	u_int32_t r,t1,s1,ix1,q1;
-
-	EXTRACT_WORDS(ix0,ix1,x);
-
-    /* take care of Inf and NaN */
-	if((ix0&0x7ff00000)==0x7ff00000) {
-	    return x*x+x;		/* sqrt(NaN)=NaN, sqrt(+inf)=+inf
-					   sqrt(-inf)=sNaN */
-	}
-    /* take care of zero */
-	if(ix0<=0) {
-	    if(((ix0&(~sign))|ix1)==0) return x;/* sqrt(+-0) = +-0 */
-	    else if(ix0<0)
-		return (x-x)/(x-x);		/* sqrt(-ve) = sNaN */
-	}
-    /* normalize x */
-	m = (ix0>>20);
-	if(m==0) {				/* subnormal x */
-	    while(ix0==0) {
-		m -= 21;
-		ix0 |= (ix1>>11); ix1 <<= 21;
-	    }
-	    for(i=0;(ix0&0x00100000)==0;i++) ix0<<=1;
-	    m -= i-1;
-	    ix0 |= (ix1>>(32-i));
-	    ix1 <<= i;
-	}
-	m -= 1023;	/* unbias exponent */
-	ix0 = (ix0&0x000fffff)|0x00100000;
-	if(m&1){	/* odd m, double x to make it even */
-	    ix0 += ix0 + ((ix1&sign)>>31);
-	    ix1 += ix1;
-	}
-	m >>= 1;	/* m = [m/2] */
-
-    /* generate sqrt(x) bit by bit */
-	ix0 += ix0 + ((ix1&sign)>>31);
-	ix1 += ix1;
-	q = q1 = s0 = s1 = 0;	/* [q,q1] = sqrt(x) */
-	r = 0x00200000;		/* r = moving bit from right to left */
-
-	while(r!=0) {
-	    t = s0+r;
-	    if(t<=ix0) {
-		s0   = t+r;
-		ix0 -= t;
-		q   += r;
-	    }
-	    ix0 += ix0 + ((ix1&sign)>>31);
-	    ix1 += ix1;
-	    r>>=1;
-	}
-
-	r = sign;
-	while(r!=0) {
-	    t1 = s1+r;
-	    t  = s0;
-	    if((t<ix0)||((t==ix0)&&(t1<=ix1))) {
-		s1  = t1+r;
-		if(((t1&sign)==(u_int32_t)sign)&&(s1&sign)==0) s0 += 1;
-		ix0 -= t;
-		if (ix1 < t1) ix0 -= 1;
-		ix1 -= t1;
-		q1  += r;
-	    }
-	    ix0 += ix0 + ((ix1&sign)>>31);
-	    ix1 += ix1;
-	    r>>=1;
-	}
-
-    /* use floating add to find out rounding direction */
-	if((ix0|ix1)!=0) {
-	    z = one-tiny; /* trigger inexact flag */
-	    if (z>=one) {
-	        z = one+tiny;
-	        if (q1==(u_int32_t)0xffffffff) { q1=0; q += 1;}
-		else if (z>one) {
-		    if (q1==(u_int32_t)0xfffffffe) q+=1;
-		    q1+=2;
-		} else
-	            q1 += (q1&1);
-	    }
-	}
-	ix0 = (q>>1)+0x3fe00000;
-	ix1 =  q1>>1;
-	if ((q&1)==1) ix1 |= sign;
-	ix0 += (m <<20);
-	INSERT_WORDS(z,ix0,ix1);
-	return z;
-}
-
-/*
-Other methods  (use floating-point arithmetic)
--------------
-(This is a copy of a drafted paper by Prof W. Kahan
-and K.C. Ng, written in May, 1986)
-
-	Two algorithms are given here to implement sqrt(x)
-	(IEEE double precision arithmetic) in software.
-	Both supply sqrt(x) correctly rounded. The first algorithm (in
-	Section A) uses newton iterations and involves four divisions.
-	The second one uses reciproot iterations to avoid division, but
-	requires more multiplications. Both algorithms need the ability
-	to chop results of arithmetic operations instead of round them,
-	and the INEXACT flag to indicate when an arithmetic operation
-	is executed exactly with no roundoff error, all part of the
-	standard (IEEE 754-1985). The ability to perform shift, add,
-	subtract and logical AND operations upon 32-bit words is needed
-	too, though not part of the standard.
-
-A.  sqrt(x) by Newton Iteration
-
-   (1)	Initial approximation
-
-	Let x0 and x1 be the leading and the trailing 32-bit words of
-	a floating point number x (in IEEE double format) respectively
-
-	    1    11		     52				  ...widths
-	   ------------------------------------------------------
-	x: |s|	  e     |	      f				|
-	   ------------------------------------------------------
-	      msb    lsb  msb				      lsb ...order
-
-
-	     ------------------------  	     ------------------------
-	x0:  |s|   e    |    f1     |	 x1: |          f2           |
-	     ------------------------  	     ------------------------
-
-	By performing shifts and subtracts on x0 and x1 (both regarded
-	as integers), we obtain an 8-bit approximation of sqrt(x) as
-	follows.
-
-		k  := (x0>>1) + 0x1ff80000;
-		y0 := k - T1[31&(k>>15)].	... y ~ sqrt(x) to 8 bits
-	Here k is a 32-bit integer and T1[] is an integer array containing
-	correction terms. Now magically the floating value of y (y's
-	leading 32-bit word is y0, the value of its trailing word is 0)
-	approximates sqrt(x) to almost 8-bit.
-
-	Value of T1:
-	static int T1[32]= {
-	0,	1024,	3062,	5746,	9193,	13348,	18162,	23592,
-	29598,	36145,	43202,	50740,	58733,	67158,	75992,	85215,
-	83599,	71378,	60428,	50647,	41945,	34246,	27478,	21581,
-	16499,	12183,	8588,	5674,	3403,	1742,	661,	130,};
-
-    (2)	Iterative refinement
-
-	Apply Heron's rule three times to y, we have y approximates
-	sqrt(x) to within 1 ulp (Unit in the Last Place):
-
-		y := (y+x/y)/2		... almost 17 sig. bits
-		y := (y+x/y)/2		... almost 35 sig. bits
-		y := y-(y-x/y)/2	... within 1 ulp
-
-
-	Remark 1.
-	    Another way to improve y to within 1 ulp is:
-
-		y := (y+x/y)		... almost 17 sig. bits to 2*sqrt(x)
-		y := y - 0x00100006	... almost 18 sig. bits to sqrt(x)
-
-				2
-			    (x-y )*y
-		y := y + 2* ----------	...within 1 ulp
-			       2
-			     3y  + x
-
-
-	This formula has one division fewer than the one above; however,
-	it requires more multiplications and additions. Also x must be
-	scaled in advance to avoid spurious overflow in evaluating the
-	expression 3y*y+x. Hence it is not recommended uless division
-	is slow. If division is very slow, then one should use the
-	reciproot algorithm given in section B.
-
-    (3) Final adjustment
-
-	By twiddling y's last bit it is possible to force y to be
-	correctly rounded according to the prevailing rounding mode
-	as follows. Let r and i be copies of the rounding mode and
-	inexact flag before entering the square root program. Also we
-	use the expression y+-ulp for the next representable floating
-	numbers (up and down) of y. Note that y+-ulp = either fixed
-	point y+-1, or multiply y by nextafter(1,+-inf) in chopped
-	mode.
-
-		I := FALSE;	... reset INEXACT flag I
-		R := RZ;	... set rounding mode to round-toward-zero
-		z := x/y;	... chopped quotient, possibly inexact
-		If(not I) then {	... if the quotient is exact
-		    if(z=y) {
-		        I := i;	 ... restore inexact flag
-		        R := r;  ... restore rounded mode
-		        return sqrt(x):=y.
-		    } else {
-			z := z - ulp;	... special rounding
-		    }
-		}
-		i := TRUE;		... sqrt(x) is inexact
-		If (r=RN) then z=z+ulp	... rounded-to-nearest
-		If (r=RP) then {	... round-toward-+inf
-		    y = y+ulp; z=z+ulp;
-		}
-		y := y+z;		... chopped sum
-		y0:=y0-0x00100000;	... y := y/2 is correctly rounded.
-	        I := i;	 		... restore inexact flag
-	        R := r;  		... restore rounded mode
-	        return sqrt(x):=y.
-
-    (4)	Special cases
-
-	Square root of +inf, +-0, or NaN is itself;
-	Square root of a negative number is NaN with invalid signal.
-
-
-B.  sqrt(x) by Reciproot Iteration
-
-   (1)	Initial approximation
-
-	Let x0 and x1 be the leading and the trailing 32-bit words of
-	a floating point number x (in IEEE double format) respectively
-	(see section A). By performing shifs and subtracts on x0 and y0,
-	we obtain a 7.8-bit approximation of 1/sqrt(x) as follows.
-
-	    k := 0x5fe80000 - (x0>>1);
-	    y0:= k - T2[63&(k>>14)].	... y ~ 1/sqrt(x) to 7.8 bits
-
-	Here k is a 32-bit integer and T2[] is an integer array
-	containing correction terms. Now magically the floating
-	value of y (y's leading 32-bit word is y0, the value of
-	its trailing word y1 is set to zero) approximates 1/sqrt(x)
-	to almost 7.8-bit.
-
-	Value of T2:
-	static int T2[64]= {
-	0x1500,	0x2ef8,	0x4d67,	0x6b02,	0x87be,	0xa395,	0xbe7a,	0xd866,
-	0xf14a,	0x1091b,0x11fcd,0x13552,0x14999,0x15c98,0x16e34,0x17e5f,
-	0x18d03,0x19a01,0x1a545,0x1ae8a,0x1b5c4,0x1bb01,0x1bfde,0x1c28d,
-	0x1c2de,0x1c0db,0x1ba73,0x1b11c,0x1a4b5,0x1953d,0x18266,0x16be0,
-	0x1683e,0x179d8,0x18a4d,0x19992,0x1a789,0x1b445,0x1bf61,0x1c989,
-	0x1d16d,0x1d77b,0x1dddf,0x1e2ad,0x1e5bf,0x1e6e8,0x1e654,0x1e3cd,
-	0x1df2a,0x1d635,0x1cb16,0x1be2c,0x1ae4e,0x19bde,0x1868e,0x16e2e,
-	0x1527f,0x1334a,0x11051,0xe951,	0xbe01,	0x8e0d,	0x5924,	0x1edd,};
-
-    (2)	Iterative refinement
-
-	Apply Reciproot iteration three times to y and multiply the
-	result by x to get an approximation z that matches sqrt(x)
-	to about 1 ulp. To be exact, we will have
-		-1ulp < sqrt(x)-z<1.0625ulp.
-
-	... set rounding mode to Round-to-nearest
-	   y := y*(1.5-0.5*x*y*y)	... almost 15 sig. bits to 1/sqrt(x)
-	   y := y*((1.5-2^-30)+0.5*x*y*y)... about 29 sig. bits to 1/sqrt(x)
-	... special arrangement for better accuracy
-	   z := x*y			... 29 bits to sqrt(x), with z*y<1
-	   z := z + 0.5*z*(1-z*y)	... about 1 ulp to sqrt(x)
-
-	Remark 2. The constant 1.5-2^-30 is chosen to bias the error so that
-	(a) the term z*y in the final iteration is always less than 1;
-	(b) the error in the final result is biased upward so that
-		-1 ulp < sqrt(x) - z < 1.0625 ulp
-	    instead of |sqrt(x)-z|<1.03125ulp.
-
-    (3)	Final adjustment
-
-	By twiddling y's last bit it is possible to force y to be
-	correctly rounded according to the prevailing rounding mode
-	as follows. Let r and i be copies of the rounding mode and
-	inexact flag before entering the square root program. Also we
-	use the expression y+-ulp for the next representable floating
-	numbers (up and down) of y. Note that y+-ulp = either fixed
-	point y+-1, or multiply y by nextafter(1,+-inf) in chopped
-	mode.
-
-	R := RZ;		... set rounding mode to round-toward-zero
-	switch(r) {
-	    case RN:		... round-to-nearest
-	       if(x<= z*(z-ulp)...chopped) z = z - ulp; else
-	       if(x<= z*(z+ulp)...chopped) z = z; else z = z+ulp;
-	       break;
-	    case RZ:case RM:	... round-to-zero or round-to--inf
-	       R:=RP;		... reset rounding mod to round-to-+inf
-	       if(x<z*z ... rounded up) z = z - ulp; else
-	       if(x>=(z+ulp)*(z+ulp) ...rounded up) z = z+ulp;
-	       break;
-	    case RP:		... round-to-+inf
-	       if(x>(z+ulp)*(z+ulp)...chopped) z = z+2*ulp; else
-	       if(x>z*z ...chopped) z = z+ulp;
-	       break;
-	}
-
-	Remark 3. The above comparisons can be done in fixed point. For
-	example, to compare x and w=z*z chopped, it suffices to compare
-	x1 and w1 (the trailing parts of x and w), regarding them as
-	two's complement integers.
-
-	...Is z an exact square root?
-	To determine whether z is an exact square root of x, let z1 be the
-	trailing part of z, and also let x0 and x1 be the leading and
-	trailing parts of x.
-
-	If ((z1&0x03ffffff)!=0)	... not exact if trailing 26 bits of z!=0
-	    I := 1;		... Raise Inexact flag: z is not exact
-	else {
-	    j := 1 - [(x0>>20)&1]	... j = logb(x) mod 2
-	    k := z1 >> 26;		... get z's 25-th and 26-th
-					    fraction bits
-	    I := i or (k&j) or ((k&(j+j+1))!=(x1&3));
-	}
-	R:= r		... restore rounded mode
-	return sqrt(x):=z.
-
-	If multiplication is cheaper than the foregoing red tape, the
-	Inexact flag can be evaluated by
-
-	    I := i;
-	    I := (z*z!=x) or I.
-
-	Note that z*z can overwrite I; this value must be sensed if it is
-	True.
-
-	Remark 4. If z*z = x exactly, then bit 25 to bit 0 of z1 must be
-	zero.
-
-		    --------------------
-		z1: |        f2        |
-		    --------------------
-		bit 31		   bit 0
-
-	Further more, bit 27 and 26 of z1, bit 0 and 1 of x1, and the odd
-	or even of logb(x) have the following relations:
-
-	-------------------------------------------------
-	bit 27,26 of z1		bit 1,0 of x1	logb(x)
-	-------------------------------------------------
-	00			00		odd and even
-	01			01		even
-	10			10		odd
-	10			00		even
-	11			01		even
-	-------------------------------------------------
-
-    (4)	Special cases (see (4) of Section A).
-
- */
-
diff --git a/lib/libm/src/e_sqrtf.c b/lib/libm/src/e_sqrtf.c
deleted file mode 100644
index 3bd705d83..000000000
--- a/lib/libm/src/e_sqrtf.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* e_sqrtf.c -- float version of e_sqrt.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_sqrtf.c,v 1.7 2002/05/26 22:01:53 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static	const float	one	= 1.0, tiny=1.0e-30;
-
-float
-__ieee754_sqrtf(float x)
-{
-	float z;
-	int32_t sign = (int)0x80000000;
-	int32_t ix,s,q,m,t,i;
-	u_int32_t r;
-
-	GET_FLOAT_WORD(ix,x);
-
-    /* take care of Inf and NaN */
-	if((ix&0x7f800000)==0x7f800000) {
-	    return x*x+x;		/* sqrt(NaN)=NaN, sqrt(+inf)=+inf
-					   sqrt(-inf)=sNaN */
-	}
-    /* take care of zero */
-	if(ix<=0) {
-	    if((ix&(~sign))==0) return x;/* sqrt(+-0) = +-0 */
-	    else if(ix<0)
-		return (x-x)/(x-x);		/* sqrt(-ve) = sNaN */
-	}
-    /* normalize x */
-	m = (ix>>23);
-	if(m==0) {				/* subnormal x */
-	    for(i=0;(ix&0x00800000)==0;i++) ix<<=1;
-	    m -= i-1;
-	}
-	m -= 127;	/* unbias exponent */
-	ix = (ix&0x007fffff)|0x00800000;
-	if(m&1)	/* odd m, double x to make it even */
-	    ix += ix;
-	m >>= 1;	/* m = [m/2] */
-
-    /* generate sqrt(x) bit by bit */
-	ix += ix;
-	q = s = 0;		/* q = sqrt(x) */
-	r = 0x01000000;		/* r = moving bit from right to left */
-
-	while(r!=0) {
-	    t = s+r;
-	    if(t<=ix) {
-		s    = t+r;
-		ix  -= t;
-		q   += r;
-	    }
-	    ix += ix;
-	    r>>=1;
-	}
-
-    /* use floating add to find out rounding direction */
-	if(ix!=0) {
-	    z = one-tiny; /* trigger inexact flag */
-	    if (z>=one) {
-	        z = one+tiny;
-		if (z>one)
-		    q += 2;
-		else
-		    q += (q&1);
-	    }
-	}
-	ix = (q>>1)+0x3f000000;
-	ix += (m <<23);
-	SET_FLOAT_WORD(z,ix);
-	return z;
-}
diff --git a/lib/libm/src/e_sqrtl.c b/lib/libm/src/e_sqrtl.c
deleted file mode 100644
index cbaa64f2c..000000000
--- a/lib/libm/src/e_sqrtl.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*-
- * Copyright (c) 2007 Steven G. Kargl
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: head/lib/msun/src/e_sqrtl.c 176720 2008-03-02 01:47:58Z das $");
-#endif
-__RCSID("$NetBSD: e_sqrtl.c,v 1.4 2013/11/22 20:15:06 martin Exp $");
-
-#include <machine/ieee.h>
-#include <float.h>
-
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __HAVE_LONG_DOUBLE
-
-#ifdef HAVE_FENV_H
-#include <fenv.h>
-#endif
-
-#ifdef LDBL_IMPLICIT_NBIT
-#define	LDBL_NBIT	0
-#endif
-
-#ifdef HAVE_FENV_H
-
-/* Return (x + ulp) for normal positive x. Assumes no overflow. */
-static inline long double
-inc(long double x)
-{
-	union ieee_ext_u ux = { .extu_ld = x, };
-
-	if (++ux.extu_fracl == 0) {
-		if (++ux.extu_frach == 0) {
-			ux.extu_exp++;
-			ux.extu_frach |= LDBL_NBIT;
-		}
-	}
-	return (ux.extu_ld);
-}
-
-/* Return (x - ulp) for normal positive x. Assumes no underflow. */
-static inline long double
-dec(long double x)
-{
-	union ieee_ext_u ux = { .extu_ld = x, };
-
-	if (ux.extu_fracl-- == 0) {
-		if (ux.extu_frach-- == LDBL_NBIT) {
-			ux.extu_exp--;
-			ux.extu_frach |= LDBL_NBIT;
-		}
-	}
-	return (ux.extu_ld);
-}
-
-/*
- * This is slow, but simple and portable. You should use hardware sqrt
- * if possible.
- */
-
-long double
-__ieee754_sqrtl(long double x)
-{
-	union ieee_ext_u ux = { .extu_ld = x, };
-	int k, r;
-	long double lo, xn;
-	fenv_t env;
-
-	/* If x = NaN, then sqrt(x) = NaN. */
-	/* If x = Inf, then sqrt(x) = Inf. */
-	/* If x = -Inf, then sqrt(x) = NaN. */
-	if (ux.extu_exp == LDBL_MAX_EXP * 2 - 1)
-		return (x * x + x);
-
-	/* If x = +-0, then sqrt(x) = +-0. */
-	if ((ux.extu_frach | ux.extu_fracl | ux.extu_exp) == 0)
-		return (x);
-
-	/* If x < 0, then raise invalid and return NaN */
-	if (ux.extu_sign)
-		return ((x - x) / (x - x));
-
-	feholdexcept(&env);
-
-	if (ux.extu_exp == 0) {
-		/* Adjust subnormal numbers. */
-		ux.extu_ld *= 0x1.0p514;
-		k = -514;
-	} else {
-		k = 0;
-	}
-	/*
-	 * ux.extu_ld is a normal number, so break it into ux.extu_ld = e*2^n where
-	 * ux.extu_ld = (2*e)*2^2k for odd n and ux.extu_ld = (4*e)*2^2k for even n.
-	 */
-	if ((ux.extu_exp - EXT_EXP_BIAS) & 1) {	/* n is even.     */
-		k += ux.extu_exp - EXT_EXP_BIAS - 1; /* 2k = n - 2.   */
-		ux.extu_exp = EXT_EXP_BIAS + 1;	/* ux.extu_ld in [2,4). */
-	} else {
-		k += ux.extu_exp - EXT_EXP_BIAS;	/* 2k = n - 1.   */
-		ux.extu_exp = EXT_EXP_BIAS;	/* ux.extu_ld in [1,2). */
-	}
-
-	/*
-	 * Newton's iteration.
-	 * Split ux.extu_ld into a high and low part to achieve additional precision.
-	 */
-	xn = sqrt(ux.extu_ld);			/* 53-bit estimate of sqrtl(x). */
-#if LDBL_MANT_DIG > 100
-	xn = (xn + (ux.extu_ld / xn)) * 0.5;	/* 106-bit estimate. */
-#endif
-	lo = ux.extu_ld;
-	ux.extu_fracl = 0;		/* Zero out lower bits. */
-	lo = (lo - ux.extu_ld) / xn;	/* Low bits divided by xn. */
-	xn = xn + (ux.extu_ld / xn);	/* High portion of estimate. */
-	ux.extu_ld = xn + lo;		/* Combine everything. */
-	ux.extu_exp += (k >> 1) - 1;
-
-	feclearexcept(FE_INEXACT);
-	r = fegetround();
-	fesetround(FE_TOWARDZERO);	/* Set to round-toward-zero. */
-	xn = x / ux.extu_ld;		/* Chopped quotient (inexact?). */
-
-	if (!fetestexcept(FE_INEXACT)) { /* Quotient is exact. */
-		if (xn == ux.extu_ld) {
-			fesetenv(&env);
-			return (ux.extu_ld);
-		}
-		/* Round correctly for inputs like x = y**2 - ulp. */
-		xn = dec(xn);		/* xn = xn - ulp. */
-	}
-
-	if (r == FE_TONEAREST) {
-		xn = inc(xn);		/* xn = xn + ulp. */
-	} else if (r == FE_UPWARD) {
-		ux.extu_ld = inc(ux.extu_ld);	/* ux.extu_ld = ux.extu_ld + ulp. */
-		xn = inc(xn);		/* xn  = xn + ulp. */
-	}
-	ux.extu_ld = ux.extu_ld + xn;		/* Chopped sum. */
-	feupdateenv(&env);	/* Restore env and raise inexact */
-	ux.extu_exp--;
-	return (ux.extu_ld);
-}
-
-#else
-
-/*
- * No fenv support:
- * poor man's version: just use double
- */
-long double
-__ieee754_sqrtl(long double x)
-{
-	return __ieee754_sqrt((double)x);
-}
-
-#endif
-
-#endif
diff --git a/lib/libm/src/k_cos.c b/lib/libm/src/k_cos.c
deleted file mode 100644
index 3d5c17536..000000000
--- a/lib/libm/src/k_cos.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* @(#)k_cos.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: k_cos.c,v 1.11 2002/05/26 22:01:53 wiz Exp $");
-#endif
-
-/*
- * __kernel_cos( x,  y )
- * kernel cos function on [-pi/4, pi/4], pi/4 ~ 0.785398164
- * Input x is assumed to be bounded by ~pi/4 in magnitude.
- * Input y is the tail of x.
- *
- * Algorithm
- *	1. Since cos(-x) = cos(x), we need only to consider positive x.
- *	2. if x < 2^-27 (hx<0x3e400000 0), return 1 with inexact if x!=0.
- *	3. cos(x) is approximated by a polynomial of degree 14 on
- *	   [0,pi/4]
- *		  	                 4            14
- *	   	cos(x) ~ 1 - x*x/2 + C1*x + ... + C6*x
- *	   where the remez error is
- *
- * 	|              2     4     6     8     10    12     14 |     -58
- * 	|cos(x)-(1-.5*x +C1*x +C2*x +C3*x +C4*x +C5*x  +C6*x  )| <= 2
- * 	|    					               |
- *
- * 	               4     6     8     10    12     14
- *	4. let r = C1*x +C2*x +C3*x +C4*x +C5*x  +C6*x  , then
- *	       cos(x) = 1 - x*x/2 + r
- *	   since cos(x+y) ~ cos(x) - sin(x)*y
- *			  ~ cos(x) - x*y,
- *	   a correction term is necessary in cos(x) and hence
- *		cos(x+y) = 1 - (x*x/2 - (r - x*y))
- *	   For better accuracy when x > 0.3, let qx = |x|/4 with
- *	   the last 32 bits mask off, and if x > 0.78125, let qx = 0.28125.
- *	   Then
- *		cos(x+y) = (1-qx) - ((x*x/2-qx) - (r-x*y)).
- *	   Note that 1-qx and (x*x/2-qx) is EXACT here, and the
- *	   magnitude of the latter is at least a quarter of x*x/2,
- *	   thus, reducing the rounding error in the subtraction.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-one =  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
-C1  =  4.16666666666666019037e-02, /* 0x3FA55555, 0x5555554C */
-C2  = -1.38888888888741095749e-03, /* 0xBF56C16C, 0x16C15177 */
-C3  =  2.48015872894767294178e-05, /* 0x3EFA01A0, 0x19CB1590 */
-C4  = -2.75573143513906633035e-07, /* 0xBE927E4F, 0x809C52AD */
-C5  =  2.08757232129817482790e-09, /* 0x3E21EE9E, 0xBDB4B1C4 */
-C6  = -1.13596475577881948265e-11; /* 0xBDA8FAE9, 0xBE8838D4 */
-
-double
-__kernel_cos(double x, double y)
-{
-	double a,hz,z,r,qx;
-	int32_t ix;
-	GET_HIGH_WORD(ix,x);
-	ix &= 0x7fffffff;			/* ix = |x|'s high word*/
-	if(ix<0x3e400000) {			/* if x < 2**27 */
-	    if(((int)x)==0) return one;		/* generate inexact */
-	}
-	z  = x*x;
-	r  = z*(C1+z*(C2+z*(C3+z*(C4+z*(C5+z*C6)))));
-	if(ix < 0x3FD33333) 			/* if |x| < 0.3 */
-	    return one - (0.5*z - (z*r - x*y));
-	else {
-	    if(ix > 0x3fe90000) {		/* x > 0.78125 */
-		qx = 0.28125;
-	    } else {
-	        INSERT_WORDS(qx,ix-0x00200000,0);	/* x/4 */
-	    }
-	    hz = 0.5*z-qx;
-	    a  = one-qx;
-	    return a - (hz - (z*r-x*y));
-	}
-}
diff --git a/lib/libm/src/k_cosf.c b/lib/libm/src/k_cosf.c
deleted file mode 100644
index 5fc6f8c25..000000000
--- a/lib/libm/src/k_cosf.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* k_cosf.c -- float version of k_cos.c
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: k_cosf.c,v 1.7 2002/05/26 22:01:53 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-one =  1.0000000000e+00, /* 0x3f800000 */
-C1  =  4.1666667908e-02, /* 0x3d2aaaab */
-C2  = -1.3888889225e-03, /* 0xbab60b61 */
-C3  =  2.4801587642e-05, /* 0x37d00d01 */
-C4  = -2.7557314297e-07, /* 0xb493f27c */
-C5  =  2.0875723372e-09, /* 0x310f74f6 */
-C6  = -1.1359647598e-11; /* 0xad47d74e */
-
-float
-__kernel_cosf(float x, float y)
-{
-	float a,hz,z,r,qx;
-	int32_t ix;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;			/* ix = |x|'s high word*/
-	if(ix<0x32000000) {			/* if x < 2**27 */
-	    if(((int)x)==0) return one;		/* generate inexact */
-	}
-	z  = x*x;
-	r  = z*(C1+z*(C2+z*(C3+z*(C4+z*(C5+z*C6)))));
-	if(ix < 0x3e99999a) 			/* if |x| < 0.3 */
-	    return one - ((float)0.5*z - (z*r - x*y));
-	else {
-	    if(ix > 0x3f480000) {		/* x > 0.78125 */
-		qx = (float)0.28125;
-	    } else {
-	        SET_FLOAT_WORD(qx,ix-0x01000000);	/* x/4 */
-	    }
-	    hz = (float)0.5*z-qx;
-	    a  = one-qx;
-	    return a - (hz - (z*r-x*y));
-	}
-}
diff --git a/lib/libm/src/k_rem_pio2.c b/lib/libm/src/k_rem_pio2.c
deleted file mode 100644
index f19370d8d..000000000
--- a/lib/libm/src/k_rem_pio2.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/* @(#)k_rem_pio2.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: k_rem_pio2.c,v 1.12 2010/04/23 19:17:07 drochner Exp $");
-#endif
-
-/*
- * __kernel_rem_pio2(x,y,e0,nx,prec,ipio2)
- * double x[],y[]; int e0,nx,prec; int ipio2[];
- *
- * __kernel_rem_pio2 return the last three digits of N with
- *		y = x - N*pi/2
- * so that |y| < pi/2.
- *
- * The method is to compute the integer (mod 8) and fraction parts of
- * (2/pi)*x without doing the full multiplication. In general we
- * skip the part of the product that are known to be a huge integer (
- * more accurately, = 0 mod 8 ). Thus the number of operations are
- * independent of the exponent of the input.
- *
- * (2/pi) is represented by an array of 24-bit integers in ipio2[].
- *
- * Input parameters:
- * 	x[]	The input value (must be positive) is broken into nx
- *		pieces of 24-bit integers in double precision format.
- *		x[i] will be the i-th 24 bit of x. The scaled exponent
- *		of x[0] is given in input parameter e0 (i.e., x[0]*2^e0
- *		match x's up to 24 bits.
- *
- *		Example of breaking a double positive z into x[0]+x[1]+x[2]:
- *			e0 = ilogb(z)-23
- *			z  = scalbn(z,-e0)
- *		for i = 0,1,2
- *			x[i] = floor(z)
- *			z    = (z-x[i])*2**24
- *
- *
- *	y[]	output result in an array of double precision numbers.
- *		The dimension of y[] is:
- *			24-bit  precision	1
- *			53-bit  precision	2
- *			64-bit  precision	2
- *			113-bit precision	3
- *		The actual value is the sum of them. Thus for 113-bit
- *		precison, one may have to do something like:
- *
- *		long double t,w,r_head, r_tail;
- *		t = (long double)y[2] + (long double)y[1];
- *		w = (long double)y[0];
- *		r_head = t+w;
- *		r_tail = w - (r_head - t);
- *
- *	e0	The exponent of x[0]
- *
- *	nx	dimension of x[]
- *
- *  	prec	an integer indicating the precision:
- *			0	24  bits (single)
- *			1	53  bits (double)
- *			2	64  bits (extended)
- *			3	113 bits (quad)
- *
- *	ipio2[]
- *		integer array, contains the (24*i)-th to (24*i+23)-th
- *		bit of 2/pi after binary point. The corresponding
- *		floating value is
- *
- *			ipio2[i] * 2^(-24(i+1)).
- *
- * External function:
- *	double scalbn(), floor();
- *
- *
- * Here is the description of some local variables:
- *
- * 	jk	jk+1 is the initial number of terms of ipio2[] needed
- *		in the computation. The recommended value is 2,3,4,
- *		6 for single, double, extended,and quad.
- *
- * 	jz	local integer variable indicating the number of
- *		terms of ipio2[] used.
- *
- *	jx	nx - 1
- *
- *	jv	index for pointing to the suitable ipio2[] for the
- *		computation. In general, we want
- *			( 2^e0*x[0] * ipio2[jv-1]*2^(-24jv) )/8
- *		is an integer. Thus
- *			e0-3-24*jv >= 0 or (e0-3)/24 >= jv
- *		Hence jv = max(0,(e0-3)/24).
- *
- *	jp	jp+1 is the number of terms in PIo2[] needed, jp = jk.
- *
- * 	q[]	double array with integral value, representing the
- *		24-bits chunk of the product of x and 2/pi.
- *
- *	q0	the corresponding exponent of q[0]. Note that the
- *		exponent for q[i] would be q0-24*i.
- *
- *	PIo2[]	double precision array, obtained by cutting pi/2
- *		into 24 bits chunks.
- *
- *	f[]	ipio2[] in floating point
- *
- *	iq[]	integer array by breaking up q[] in 24-bits chunk.
- *
- *	fq[]	final product of x*(2/pi) in fq[0],..,fq[jk]
- *
- *	ih	integer. If >0 it indicates q[] is >= 0.5, hence
- *		it also indicates the *sign* of the result.
- *
- */
-
-
-/*
- * Constants:
- * The hexadecimal values are the intended ones for the following
- * constants. The decimal values may be used, provided that the
- * compiler will convert from decimal to binary accurately enough
- * to produce the hexadecimal values shown.
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-static const int init_jk[] = {2,3,4,6}; /* initial value for jk */
-
-static const double PIo2[] = {
-  1.57079625129699707031e+00, /* 0x3FF921FB, 0x40000000 */
-  7.54978941586159635335e-08, /* 0x3E74442D, 0x00000000 */
-  5.39030252995776476554e-15, /* 0x3CF84698, 0x80000000 */
-  3.28200341580791294123e-22, /* 0x3B78CC51, 0x60000000 */
-  1.27065575308067607349e-29, /* 0x39F01B83, 0x80000000 */
-  1.22933308981111328932e-36, /* 0x387A2520, 0x40000000 */
-  2.73370053816464559624e-44, /* 0x36E38222, 0x80000000 */
-  2.16741683877804819444e-51, /* 0x3569F31D, 0x00000000 */
-};
-
-static const double
-zero   = 0.0,
-one    = 1.0,
-two24   =  1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */
-twon24  =  5.96046447753906250000e-08; /* 0x3E700000, 0x00000000 */
-
-int
-__kernel_rem_pio2(double *x, double *y, int e0, int nx, int prec, const int32_t *ipio2)
-{
-	int32_t jz,jx,jv,jp,jk,carry,n,iq[20],i,j,k,m,q0,ih;
-	double z,fw,f[20],fq[20],q[20];
-
-    /* initialize jk*/
-	jk = init_jk[prec];
-	jp = jk;
-
-    /* determine jx,jv,q0, note that 3>q0 */
-	jx =  nx-1;
-	jv = (e0-3)/24; if(jv<0) jv=0;
-	q0 =  e0-24*(jv+1);
-
-    /* set up f[0] to f[jx+jk] where f[jx+jk] = ipio2[jv+jk] */
-	j = jv-jx; m = jx+jk;
-	for(i=0;i<=m;i++,j++) f[i] = (j<0)? zero : (double) ipio2[j];
-
-    /* compute q[0],q[1],...q[jk] */
-	for (i=0;i<=jk;i++) {
-	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
-	}
-
-	jz = jk;
-recompute:
-    /* distill q[] into iq[] reversingly */
-	for(i=0,j=jz,z=q[jz];j>0;i++,j--) {
-	    fw    =  (double)((int32_t)(twon24* z));
-	    iq[i] =  (int32_t)(z-two24*fw);
-	    z     =  q[j-1]+fw;
-	}
-
-    /* compute n */
-	z  = scalbn(z,q0);		/* actual value of z */
-	z -= 8.0*floor(z*0.125);		/* trim off integer >= 8 */
-	n  = (int32_t) z;
-	z -= (double)n;
-	ih = 0;
-	if(q0>0) {	/* need iq[jz-1] to determine n */
-	    i  = (iq[jz-1]>>(24-q0)); n += i;
-	    iq[jz-1] -= i<<(24-q0);
-	    ih = iq[jz-1]>>(23-q0);
-	}
-	else if(q0==0) ih = iq[jz-1]>>23;
-	else if(z>=0.5) ih=2;
-
-	if(ih>0) {	/* q > 0.5 */
-	    n += 1; carry = 0;
-	    for(i=0;i<jz ;i++) {	/* compute 1-q */
-		j = iq[i];
-		if(carry==0) {
-		    if(j!=0) {
-			carry = 1; iq[i] = 0x1000000- j;
-		    }
-		} else  iq[i] = 0xffffff - j;
-	    }
-	    if(q0>0) {		/* rare case: chance is 1 in 12 */
-	        switch(q0) {
-	        case 1:
-	    	   iq[jz-1] &= 0x7fffff; break;
-	    	case 2:
-	    	   iq[jz-1] &= 0x3fffff; break;
-	        }
-	    }
-	    if(ih==2) {
-		z = one - z;
-		if(carry!=0) z -= scalbn(one,q0);
-	    }
-	}
-
-    /* check if recomputation is needed */
-	if(z==zero) {
-	    j = 0;
-	    for (i=jz-1;i>=jk;i--) j |= iq[i];
-	    if(j==0) { /* need recomputation */
-		for(k=1;iq[jk-k]==0;k++);   /* k = no. of terms needed */
-
-		for(i=jz+1;i<=jz+k;i++) {   /* add q[jz+1] to q[jz+k] */
-		    f[jx+i] = (double) ipio2[jv+i];
-		    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j];
-		    q[i] = fw;
-		}
-		jz += k;
-		goto recompute;
-	    }
-	}
-
-    /* chop off zero terms */
-	if(z==0.0) {
-	    jz -= 1; q0 -= 24;
-	    while(iq[jz]==0) { jz--; q0-=24;}
-	} else { /* break z into 24-bit if necessary */
-	    z = scalbn(z,-q0);
-	    if(z>=two24) {
-		fw = (double)((int32_t)(twon24*z));
-		iq[jz] = (int32_t)(z-two24*fw);
-		jz += 1; q0 += 24;
-		iq[jz] = (int32_t) fw;
-	    } else iq[jz] = (int32_t) z ;
-	}
-
-    /* convert integer "bit" chunk to floating-point value */
-	fw = scalbn(one,q0);
-	for(i=jz;i>=0;i--) {
-	    q[i] = fw*(double)iq[i]; fw*=twon24;
-	}
-
-    /* compute PIo2[0,...,jp]*q[jz,...,0] */
-	for(i=jz;i>=0;i--) {
-	    for(fw=0.0,k=0;k<=jp&&k<=jz-i;k++) fw += PIo2[k]*q[i+k];
-	    fq[jz-i] = fw;
-	}
-
-    /* compress fq[] into y[] */
-	switch(prec) {
-	    case 0:
-		fw = 0.0;
-		for (i=jz;i>=0;i--) fw += fq[i];
-		y[0] = (ih==0)? fw: -fw;
-		break;
-	    case 1:
-	    case 2:
-		fw = 0.0;
-		for (i=jz;i>=0;i--) fw += fq[i];
-		y[0] = (ih==0)? fw: -fw;
-		fw = fq[0]-fw;
-		for (i=1;i<=jz;i++) fw += fq[i];
-		y[1] = (ih==0)? fw: -fw;
-		break;
-	    case 3:	/* painful */
-		for (i=jz;i>0;i--) {
-		    fw      = fq[i-1]+fq[i];
-		    fq[i]  += fq[i-1]-fw;
-		    fq[i-1] = fw;
-		}
-		for (i=jz;i>1;i--) {
-		    fw      = fq[i-1]+fq[i];
-		    fq[i]  += fq[i-1]-fw;
-		    fq[i-1] = fw;
-		}
-		for (fw=0.0,i=jz;i>=2;i--) fw += fq[i];
-		if(ih==0) {
-		    y[0] =  fq[0]; y[1] =  fq[1]; y[2] =  fw;
-		} else {
-		    y[0] = -fq[0]; y[1] = -fq[1]; y[2] = -fw;
-		}
-	}
-	return n&7;
-}
diff --git a/lib/libm/src/k_rem_pio2f.c b/lib/libm/src/k_rem_pio2f.c
deleted file mode 100644
index b5ad2d6eb..000000000
--- a/lib/libm/src/k_rem_pio2f.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* k_rem_pio2f.c -- float version of k_rem_pio2.c
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: k_rem_pio2f.c,v 1.8 2010/04/23 19:17:07 drochner Exp $");
-#endif
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-/* In the float version, the input parameter x contains 8 bit
-   integers, not 24 bit integers.  113 bit precision is not supported.  */
-
-static const int init_jk[] = {4,7,9}; /* initial value for jk */
-
-static const float PIo2[] = {
-  1.5703125000e+00, /* 0x3fc90000 */
-  4.5776367188e-04, /* 0x39f00000 */
-  2.5987625122e-05, /* 0x37da0000 */
-  7.5437128544e-08, /* 0x33a20000 */
-  6.0026650317e-11, /* 0x2e840000 */
-  7.3896444519e-13, /* 0x2b500000 */
-  5.3845816694e-15, /* 0x27c20000 */
-  5.6378512969e-18, /* 0x22d00000 */
-  8.3009228831e-20, /* 0x1fc40000 */
-  3.2756352257e-22, /* 0x1bc60000 */
-  6.3331015649e-25, /* 0x17440000 */
-};
-
-static const float
-zero   = 0.0,
-one    = 1.0,
-two8   =  2.5600000000e+02, /* 0x43800000 */
-twon8  =  3.9062500000e-03; /* 0x3b800000 */
-
-int
-__kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32_t *ipio2)
-{
-	int32_t jz,jx,jv,jp,jk,carry,n,iq[20],i,j,k,m,q0,ih;
-	float z,fw,f[20],fq[20],q[20];
-
-    /* initialize jk*/
-	jk = init_jk[prec];
-	jp = jk;
-
-    /* determine jx,jv,q0, note that 3>q0 */
-	jx =  nx-1;
-	jv = (e0-3)/8; if(jv<0) jv=0;
-	q0 =  e0-8*(jv+1);
-
-    /* set up f[0] to f[jx+jk] where f[jx+jk] = ipio2[jv+jk] */
-	j = jv-jx; m = jx+jk;
-	for(i=0;i<=m;i++,j++) f[i] = (j<0)? zero : (float) ipio2[j];
-
-    /* compute q[0],q[1],...q[jk] */
-	for (i=0;i<=jk;i++) {
-	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
-	}
-
-	jz = jk;
-recompute:
-    /* distill q[] into iq[] reversingly */
-	for(i=0,j=jz,z=q[jz];j>0;i++,j--) {
-	    fw    =  (float)((int32_t)(twon8* z));
-	    iq[i] =  (int32_t)(z-two8*fw);
-	    z     =  q[j-1]+fw;
-	}
-
-    /* compute n */
-	z  = scalbnf(z,q0);		/* actual value of z */
-	z -= (float)8.0*floorf(z*(float)0.125);	/* trim off integer >= 8 */
-	n  = (int32_t) z;
-	z -= (float)n;
-	ih = 0;
-	if(q0>0) {	/* need iq[jz-1] to determine n */
-	    i  = (iq[jz-1]>>(8-q0)); n += i;
-	    iq[jz-1] -= i<<(8-q0);
-	    ih = iq[jz-1]>>(7-q0);
-	}
-	else if(q0==0) ih = iq[jz-1]>>8;
-	else if(z>=(float)0.5) ih=2;
-
-	if(ih>0) {	/* q > 0.5 */
-	    n += 1; carry = 0;
-	    for(i=0;i<jz ;i++) {	/* compute 1-q */
-		j = iq[i];
-		if(carry==0) {
-		    if(j!=0) {
-			carry = 1; iq[i] = 0x100- j;
-		    }
-		} else  iq[i] = 0xff - j;
-	    }
-	    if(q0>0) {		/* rare case: chance is 1 in 12 */
-	        switch(q0) {
-	        case 1:
-	    	   iq[jz-1] &= 0x7f; break;
-	    	case 2:
-	    	   iq[jz-1] &= 0x3f; break;
-	        }
-	    }
-	    if(ih==2) {
-		z = one - z;
-		if(carry!=0) z -= scalbnf(one,q0);
-	    }
-	}
-
-    /* check if recomputation is needed */
-	if(z==zero) {
-	    j = 0;
-	    for (i=jz-1;i>=jk;i--) j |= iq[i];
-	    if(j==0) { /* need recomputation */
-		for(k=1;iq[jk-k]==0;k++);   /* k = no. of terms needed */
-
-		for(i=jz+1;i<=jz+k;i++) {   /* add q[jz+1] to q[jz+k] */
-		    f[jx+i] = (float) ipio2[jv+i];
-		    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j];
-		    q[i] = fw;
-		}
-		jz += k;
-		goto recompute;
-	    }
-	}
-
-    /* chop off zero terms */
-	if(z==(float)0.0) {
-	    jz -= 1; q0 -= 8;
-	    while(iq[jz]==0) { jz--; q0-=8;}
-	} else { /* break z into 8-bit if necessary */
-	    z = scalbnf(z,-q0);
-	    if(z>=two8) {
-		fw = (float)((int32_t)(twon8*z));
-		iq[jz] = (int32_t)(z-two8*fw);
-		jz += 1; q0 += 8;
-		iq[jz] = (int32_t) fw;
-	    } else iq[jz] = (int32_t) z ;
-	}
-
-    /* convert integer "bit" chunk to floating-point value */
-	fw = scalbnf(one,q0);
-	for(i=jz;i>=0;i--) {
-	    q[i] = fw*(float)iq[i]; fw*=twon8;
-	}
-
-    /* compute PIo2[0,...,jp]*q[jz,...,0] */
-	for(i=jz;i>=0;i--) {
-	    for(fw=0.0,k=0;k<=jp&&k<=jz-i;k++) fw += PIo2[k]*q[i+k];
-	    fq[jz-i] = fw;
-	}
-
-    /* compress fq[] into y[] */
-	switch(prec) {
-	    case 0:
-		fw = 0.0;
-		for (i=jz;i>=0;i--) fw += fq[i];
-		y[0] = (ih==0)? fw: -fw;
-		break;
-	    case 1:
-	    case 2:
-		fw = 0.0;
-		for (i=jz;i>=0;i--) fw += fq[i];
-		y[0] = (ih==0)? fw: -fw;
-		fw = fq[0]-fw;
-		for (i=1;i<=jz;i++) fw += fq[i];
-		y[1] = (ih==0)? fw: -fw;
-		break;
-	    case 3:	/* painful */
-		for (i=jz;i>0;i--) {
-		    fw      = fq[i-1]+fq[i];
-		    fq[i]  += fq[i-1]-fw;
-		    fq[i-1] = fw;
-		}
-		for (i=jz;i>1;i--) {
-		    fw      = fq[i-1]+fq[i];
-		    fq[i]  += fq[i-1]-fw;
-		    fq[i-1] = fw;
-		}
-		for (fw=0.0,i=jz;i>=2;i--) fw += fq[i];
-		if(ih==0) {
-		    y[0] =  fq[0]; y[1] =  fq[1]; y[2] =  fw;
-		} else {
-		    y[0] = -fq[0]; y[1] = -fq[1]; y[2] = -fw;
-		}
-	}
-	return n&7;
-}
diff --git a/lib/libm/src/k_sin.c b/lib/libm/src/k_sin.c
deleted file mode 100644
index cb229226d..000000000
--- a/lib/libm/src/k_sin.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* @(#)k_sin.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: k_sin.c,v 1.11 2002/05/26 22:01:53 wiz Exp $");
-#endif
-
-/* __kernel_sin( x, y, iy)
- * kernel sin function on [-pi/4, pi/4], pi/4 ~ 0.7854
- * Input x is assumed to be bounded by ~pi/4 in magnitude.
- * Input y is the tail of x.
- * Input iy indicates whether y is 0. (if iy=0, y assume to be 0).
- *
- * Algorithm
- *	1. Since sin(-x) = -sin(x), we need only to consider positive x.
- *	2. if x < 2^-27 (hx<0x3e400000 0), return x with inexact if x!=0.
- *	3. sin(x) is approximated by a polynomial of degree 13 on
- *	   [0,pi/4]
- *		  	         3            13
- *	   	sin(x) ~ x + S1*x + ... + S6*x
- *	   where
- *
- * 	|sin(x)         2     4     6     8     10     12  |     -58
- * 	|----- - (1+S1*x +S2*x +S3*x +S4*x +S5*x  +S6*x   )| <= 2
- * 	|  x 					           |
- *
- *	4. sin(x+y) = sin(x) + sin'(x')*y
- *		    ~ sin(x) + (1-x*x/2)*y
- *	   For better accuracy, let
- *		     3      2      2      2      2
- *		r = x *(S2+x *(S3+x *(S4+x *(S5+x *S6))))
- *	   then                   3    2
- *		sin(x) = x + (S1*x + (x *(r-y/2)+y))
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-half =  5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */
-S1  = -1.66666666666666324348e-01, /* 0xBFC55555, 0x55555549 */
-S2  =  8.33333333332248946124e-03, /* 0x3F811111, 0x1110F8A6 */
-S3  = -1.98412698298579493134e-04, /* 0xBF2A01A0, 0x19C161D5 */
-S4  =  2.75573137070700676789e-06, /* 0x3EC71DE3, 0x57B1FE7D */
-S5  = -2.50507602534068634195e-08, /* 0xBE5AE5E6, 0x8A2B9CEB */
-S6  =  1.58969099521155010221e-10; /* 0x3DE5D93A, 0x5ACFD57C */
-
-double
-__kernel_sin(double x, double y, int iy)
-{
-	double z,r,v;
-	int32_t ix;
-	GET_HIGH_WORD(ix,x);
-	ix &= 0x7fffffff;			/* high word of x */
-	if(ix<0x3e400000)			/* |x| < 2**-27 */
-	   {if((int)x==0) return x;}		/* generate inexact */
-	z	=  x*x;
-	v	=  z*x;
-	r	=  S2+z*(S3+z*(S4+z*(S5+z*S6)));
-	if(iy==0) return x+v*(S1+z*r);
-	else      return x-((z*(half*y-v*r)-y)-v*S1);
-}
diff --git a/lib/libm/src/k_sinf.c b/lib/libm/src/k_sinf.c
deleted file mode 100644
index 906da3b3f..000000000
--- a/lib/libm/src/k_sinf.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* k_sinf.c -- float version of k_sin.c
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: k_sinf.c,v 1.7 2002/05/26 22:01:53 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-half =  5.0000000000e-01,/* 0x3f000000 */
-S1  = -1.6666667163e-01, /* 0xbe2aaaab */
-S2  =  8.3333337680e-03, /* 0x3c088889 */
-S3  = -1.9841270114e-04, /* 0xb9500d01 */
-S4  =  2.7557314297e-06, /* 0x3638ef1b */
-S5  = -2.5050759689e-08, /* 0xb2d72f34 */
-S6  =  1.5896910177e-10; /* 0x2f2ec9d3 */
-
-float
-__kernel_sinf(float x, float y, int iy)
-{
-	float z,r,v;
-	int32_t ix;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;			/* high word of x */
-	if(ix<0x32000000)			/* |x| < 2**-27 */
-	   {if((int)x==0) return x;}		/* generate inexact */
-	z	=  x*x;
-	v	=  z*x;
-	r	=  S2+z*(S3+z*(S4+z*(S5+z*S6)));
-	if(iy==0) return x+v*(S1+z*r);
-	else      return x-((z*(half*y-v*r)-y)-v*S1);
-}
diff --git a/lib/libm/src/k_standard.c b/lib/libm/src/k_standard.c
deleted file mode 100644
index 5dac9a239..000000000
--- a/lib/libm/src/k_standard.c
+++ /dev/null
@@ -1,827 +0,0 @@
-/* @(#)k_standard.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: k_standard.c,v 1.20 2015/09/08 05:23:31 dholland Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-#include <errno.h>
-
-#ifndef _USE_WRITE
-#include <stdio.h>			/* fputs(), stderr */
-#define	WRITE2(u,v)	fputs(u, stderr)
-#else	/* !defined(_USE_WRITE) */
-#include <unistd.h>			/* write */
-#define	WRITE2(u,v)	write(2, u, v)
-#undef fflush
-#endif	/* !defined(_USE_WRITE) */
-
-static const double zero = 0.0;	/* used as const */
-
-/*
- * Standard conformance (non-IEEE) on exception cases.
- * Mapping:
- *	1 -- acos(|x|>1)
- *	2 -- asin(|x|>1)
- *	3 -- atan2(+-0,+-0)
- *	4 -- hypot overflow
- *	5 -- cosh overflow
- *	6 -- exp overflow
- *	7 -- exp underflow
- *	8 -- y0(0)
- *	9 -- y0(-ve)
- *	10-- y1(0)
- *	11-- y1(-ve)
- *	12-- yn(0)
- *	13-- yn(-ve)
- *	14-- lgamma(finite) overflow
- *	15-- lgamma(-integer)
- *	16-- log(0)
- *	17-- log(x<0)
- *	18-- log10(0)
- *	19-- log10(x<0)
- *	20-- pow(0.0,0.0)
- *	21-- pow(x,y) overflow
- *	22-- pow(x,y) underflow
- *	23-- pow(0,negative)
- *	24-- pow(neg,non-integral)
- *	25-- sinh(finite) overflow
- *	26-- sqrt(negative)
- *      27-- fmod(x,0)
- *      28-- remainder(x,0)
- *	29-- acosh(x<1)
- *	30-- atanh(|x|>1)
- *	31-- atanh(|x|=1)
- *	32-- scalb overflow
- *	33-- scalb underflow
- *	34-- j0(|x|>X_TLOSS)
- *	35-- y0(x>X_TLOSS)
- *	36-- j1(|x|>X_TLOSS)
- *	37-- y1(x>X_TLOSS)
- *	38-- jn(|x|>X_TLOSS, n)
- *	39-- yn(x>X_TLOSS, n)
- *	40-- gamma(finite) overflow
- *	41-- gamma(-integer)
- *	42-- pow(NaN,0.0)
- *	48-- log2(0)
- *	49-- log2(x<0)
- */
-
-
-double
-__kernel_standard(double x, double y, int type)
-{
-	struct exception exc;
-#ifndef HUGE_VAL	/* this is the only routine that uses HUGE_VAL */
-#define HUGE_VAL inf
-	double inf = 0.0;
-
-	SET_HIGH_WORD(inf,0x7ff00000);	/* set inf to infinite */
-#endif
-
-#ifdef _USE_WRITE
-	(void) fflush(stdout);
-#endif
-	exc.arg1 = x;
-	exc.arg2 = y;
-	switch(type) {
-	    case 1:
-	    case 101:
-		/* acos(|x|>1) */
-		exc.type = DOMAIN;
-		exc.name = type < 100 ? "acos" : "acosf";
-		exc.retval = zero;
-		if (_LIB_VERSION == _POSIX_) {
-		  exc.retval = zero/zero;
-		  errno = EDOM;
-		} else if (!matherr(&exc)) {
-		  if(_LIB_VERSION == _SVID_) {
-		    (void) WRITE2("acos: DOMAIN error\n", 19);
-		  }
-		  errno = EDOM;
-		}
-		break;
-	    case 2:
-	    case 102:
-		/* asin(|x|>1) */
-		exc.type = DOMAIN;
-		exc.name = type < 100 ? "asin" : "asinf";
-		exc.retval = zero;
-		if(_LIB_VERSION == _POSIX_) {
-		  exc.retval = zero/zero;
-		  errno = EDOM;
-		} else if (!matherr(&exc)) {
-		  if(_LIB_VERSION == _SVID_) {
-		    	(void) WRITE2("asin: DOMAIN error\n", 19);
-		  }
-		  errno = EDOM;
-		}
-		break;
-	    case 3:
-	    case 103:
-		/* atan2(+-0,+-0) */
-		exc.arg1 = y;
-		exc.arg2 = x;
-		exc.type = DOMAIN;
-		exc.name = type < 100 ? "atan2" : "atan2f";
-		exc.retval = zero;
-		if(_LIB_VERSION == _POSIX_) {
-		  exc.retval = copysign(signbit(y) ? M_PI : zero, x);
-		} else if (!matherr(&exc)) {
-		  if(_LIB_VERSION == _SVID_) {
-			(void) WRITE2("atan2: DOMAIN error\n", 20);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 4:
-	    case 104:
-		/* hypot(finite,finite) overflow */
-		exc.type = OVERFLOW;
-		exc.name = type < 100 ? "hypot" : "hypotf";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = HUGE;
-		else
-		  exc.retval = HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = ERANGE;
-		else if (!matherr(&exc)) {
-			errno = ERANGE;
-		}
-		break;
-	    case 5:
-	    case 105:
-		/* cosh(finite) overflow */
-		exc.type = OVERFLOW;
-		exc.name = type < 100 ? "cosh" : "coshf";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = HUGE;
-		else
-		  exc.retval = HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = ERANGE;
-		else if (!matherr(&exc)) {
-			errno = ERANGE;
-		}
-		break;
-	    case 6:
-	    case 106:
-		/* exp(finite) overflow */
-		exc.type = OVERFLOW;
-		exc.name = type < 100 ? "exp" : "expf";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = HUGE;
-		else
-		  exc.retval = HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = ERANGE;
-		else if (!matherr(&exc)) {
-			errno = ERANGE;
-		}
-		break;
-	    case 7:
-	    case 107:
-		/* exp(finite) underflow */
-		exc.type = UNDERFLOW;
-		exc.name = type < 100 ? "exp" : "expf";
-		exc.retval = zero;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = ERANGE;
-		else if (!matherr(&exc)) {
-			errno = ERANGE;
-		}
-		break;
-	    case 8:
-	    case 108:
-		/* y0(0) = -inf */
-		exc.type = DOMAIN;	/* should be SING for IEEE */
-		exc.name = type < 100 ? "y0" : "y0f";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = EDOM;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("y0: DOMAIN error\n", 17);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 9:
-	    case 109:
-		/* y0(x<0) = NaN */
-		exc.type = DOMAIN;
-		exc.name = type < 100 ? "y0" : "y0f";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = EDOM;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("y0: DOMAIN error\n", 17);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 10:
-	    case 110:
-		/* y1(0) = -inf */
-		exc.type = DOMAIN;	/* should be SING for IEEE */
-		exc.name = type < 100 ? "y1" : "y1f";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = EDOM;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("y1: DOMAIN error\n", 17);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 11:
-	    case 111:
-		/* y1(x<0) = NaN */
-		exc.type = DOMAIN;
-		exc.name = type < 100 ? "y1" : "y1f";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = EDOM;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("y1: DOMAIN error\n", 17);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 12:
-	    case 112:
-		/* yn(n,0) = -inf */
-		exc.type = DOMAIN;	/* should be SING for IEEE */
-		exc.name = type < 100 ? "yn" : "ynf";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = EDOM;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("yn: DOMAIN error\n", 17);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 13:
-	    case 113:
-		/* yn(x<0) = NaN */
-		exc.type = DOMAIN;
-		exc.name = type < 100 ? "yn" : "ynf";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = EDOM;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("yn: DOMAIN error\n", 17);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 14:
-	    case 114:
-		/* lgamma(finite) overflow */
-		exc.type = OVERFLOW;
-		exc.name = type < 100 ? "lgamma" : "lgammaf";
-                if (_LIB_VERSION == _SVID_)
-                  exc.retval = HUGE;
-                else
-                  exc.retval = HUGE_VAL;
-                if (_LIB_VERSION == _POSIX_)
-			errno = ERANGE;
-                else if (!matherr(&exc)) {
-                        errno = ERANGE;
-		}
-		break;
-	    case 15:
-	    case 115:
-		/* lgamma(-integer) or lgamma(0) */
-		exc.type = SING;
-		exc.name = type < 100 ? "lgamma" : "lgammaf";
-                if (_LIB_VERSION == _SVID_)
-                  exc.retval = HUGE;
-                else
-                  exc.retval = HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = EDOM;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("lgamma: SING error\n", 19);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 16:
-	    case 116:
-		/* log(0) */
-		exc.type = SING;
-		exc.name = type < 100 ? "log" : "logf";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = ERANGE;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("log: SING error\n", 16);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 17:
-	    case 117:
-		/* log(x<0) */
-		exc.type = DOMAIN;
-		exc.name = type < 100 ? "log" : "logf";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = zero/zero;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = EDOM;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("log: DOMAIN error\n", 18);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 18:
-	    case 118:
-		/* log10(0) */
-		exc.type = SING;
-		exc.name = type < 100 ? "log10" : "log10f";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = ERANGE;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("log10: SING error\n", 18);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 19:
-	    case 119:
-		/* log10(x<0) */
-		exc.type = DOMAIN;
-		exc.name = type < 100 ? "log10" : "log10f";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = zero/zero;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = EDOM;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("log10: DOMAIN error\n", 20);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 20:
-	    case 120:
-		/* pow(0.0,0.0) */
-		/* error only if _LIB_VERSION == _SVID_ */
-		exc.type = DOMAIN;
-		exc.name = type < 100 ? "pow" : "powf";
-		exc.retval = zero;
-		if (_LIB_VERSION != _SVID_) exc.retval = 1.0;
-		else if (!matherr(&exc)) {
-			(void) WRITE2("pow(0,0): DOMAIN error\n", 23);
-			errno = EDOM;
-		}
-		break;
-	    case 21:
-	    case 121:
-		/* pow(x,y) overflow */
-		exc.type = OVERFLOW;
-		exc.name = type < 100 ? "pow" : "powf";
-		if (_LIB_VERSION == _SVID_) {
-		  exc.retval = HUGE;
-		  y *= 0.5;
-		  if(x<zero&&rint(y)!=y) exc.retval = -HUGE;
-		} else {
-		  exc.retval = HUGE_VAL;
-		  y *= 0.5;
-		  if(x<zero&&rint(y)!=y) exc.retval = -HUGE_VAL;
-		}
-		if (_LIB_VERSION == _POSIX_)
-		  errno = ERANGE;
-		else if (!matherr(&exc)) {
-			errno = ERANGE;
-		}
-		break;
-	    case 22:
-	    case 122:
-		/* pow(x,y) underflow */
-		exc.type = UNDERFLOW;
-		exc.name = type < 100 ? "pow" : "powf";
-		exc.retval =  zero;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = ERANGE;
-		else if (!matherr(&exc)) {
-			errno = ERANGE;
-		}
-		break;
-	    case 23:
-	    case 123:
-		/* 0**neg */
-		exc.type = DOMAIN;
-		exc.name = type < 100 ? "pow" : "powf";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = zero;
-		else
-		  exc.retval = HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = EDOM;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("pow(0,neg): DOMAIN error\n", 25);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 24:
-	    case 124:
-		/* neg**non-integral */
-		exc.type = DOMAIN;
-		exc.name = type < 100 ? "pow" : "powf";
-		if (_LIB_VERSION == _SVID_)
-		    exc.retval = zero;
-		else
-		    exc.retval = zero/zero;	/* X/Open allow NaN */
-		if (_LIB_VERSION == _POSIX_)
-		   errno = EDOM;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("neg**non-integral: DOMAIN error\n", 32);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 25:
-	    case 125:
-		/* sinh(finite) overflow */
-		exc.type = OVERFLOW;
-		exc.name = type < 100 ? "sinh" : "sinhf";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = ( (x>zero) ? HUGE : -HUGE);
-		else
-		  exc.retval = ( (x>zero) ? HUGE_VAL : -HUGE_VAL);
-		if (_LIB_VERSION == _POSIX_)
-		  errno = ERANGE;
-		else if (!matherr(&exc)) {
-			errno = ERANGE;
-		}
-		break;
-	    case 26:
-	    case 126:
-	    case 226:
-		/* sqrt(x<0) */
-		exc.type = DOMAIN;
-		if (type == 26)
-			exc.name = "sqrt";
-		else if (type == 126)
-			exc.name = "sqrtf";
-		else
-			exc.name = "sqrtl";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = zero;
-		else
-		  exc.retval = zero/zero;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = EDOM;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("sqrt: DOMAIN error\n", 19);
-		      }
-		  errno = EDOM;
-		}
-		break;
-            case 27:
-	    case 127:
-	    case 227:
-                /* fmod(x,0) */
-                exc.type = DOMAIN;
-		if (type == 27)
-			exc.name = "fmod";
-		else if (type == 127)
-			exc.name = "fmodf";
-		else
-			exc.name = "fmodl";
-                if (_LIB_VERSION == _SVID_)
-                    exc.retval = x;
-		else
-		    exc.retval = zero/zero;
-                if (_LIB_VERSION == _POSIX_)
-                  errno = EDOM;
-                else if (!matherr(&exc)) {
-                  if (_LIB_VERSION == _SVID_) {
-                    (void) WRITE2("fmod:  DOMAIN error\n", 20);
-                  }
-                  errno = EDOM;
-                }
-                break;
-            case 28:
-	    case 128:
-                /* remainder(x,0) */
-                exc.type = DOMAIN;
-                exc.name = type < 100 ? "remainder" : "remainderf";
-                exc.retval = zero/zero;
-                if (_LIB_VERSION == _POSIX_)
-                  errno = EDOM;
-                else if (!matherr(&exc)) {
-                  if (_LIB_VERSION == _SVID_) {
-                    (void) WRITE2("remainder: DOMAIN error\n", 24);
-                  }
-                  errno = EDOM;
-                }
-                break;
-            case 29:
-	    case 129:
-                /* acosh(x<1) */
-                exc.type = DOMAIN;
-                exc.name = type < 100 ? "acosh" : "acoshf";
-                exc.retval = zero/zero;
-                if (_LIB_VERSION == _POSIX_)
-                  errno = EDOM;
-                else if (!matherr(&exc)) {
-                  if (_LIB_VERSION == _SVID_) {
-                    (void) WRITE2("acosh: DOMAIN error\n", 20);
-                  }
-                  errno = EDOM;
-                }
-                break;
-            case 30:
-	    case 130:
-                /* atanh(|x|>1) */
-                exc.type = DOMAIN;
-                exc.name = type < 100 ? "atanh" : "atanhf";
-                exc.retval = zero/zero;
-                if (_LIB_VERSION == _POSIX_)
-                  errno = EDOM;
-                else if (!matherr(&exc)) {
-                  if (_LIB_VERSION == _SVID_) {
-                    (void) WRITE2("atanh: DOMAIN error\n", 20);
-                  }
-                  errno = EDOM;
-                }
-                break;
-            case 31:
-	    case 131:
-                /* atanh(|x|=1) */
-                exc.type = SING;
-                exc.name = type < 100 ? "atanh" : "atanhf";
-		exc.retval = x/zero;	/* sign(x)*inf */
-                if (_LIB_VERSION == _POSIX_)
-                  errno = EDOM;
-                else if (!matherr(&exc)) {
-                  if (_LIB_VERSION == _SVID_) {
-                    (void) WRITE2("atanh: SING error\n", 18);
-                  }
-                  errno = EDOM;
-                }
-                break;
-	    case 32:
-	    case 132:
-		/* scalb overflow; SVID also returns +-HUGE_VAL */
-		exc.type = OVERFLOW;
-		exc.name = type < 100 ? "scalb" : "scalbf";
-		exc.retval = x > zero ? HUGE_VAL : -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = ERANGE;
-		else if (!matherr(&exc)) {
-			errno = ERANGE;
-		}
-		break;
-	    case 33:
-	    case 133:
-		/* scalb underflow */
-		exc.type = UNDERFLOW;
-		exc.name = type < 100 ? "scalb" : "scalbf";
-		exc.retval = copysign(zero,x);
-		if (_LIB_VERSION == _POSIX_)
-		  errno = ERANGE;
-		else if (!matherr(&exc)) {
-			errno = ERANGE;
-		}
-		break;
-	    case 34:
-	    case 134:
-		/* j0(|x|>X_TLOSS) */
-                exc.type = TLOSS;
-                exc.name = type < 100 ? "j0" : "j0f";
-                exc.retval = zero;
-                if (_LIB_VERSION == _POSIX_)
-                        errno = ERANGE;
-                else if (!matherr(&exc)) {
-                        if (_LIB_VERSION == _SVID_) {
-                                (void) WRITE2(exc.name, 2);
-                                (void) WRITE2(": TLOSS error\n", 14);
-                        }
-                        errno = ERANGE;
-                }
-		break;
-	    case 35:
-	    case 135:
-		/* y0(x>X_TLOSS) */
-                exc.type = TLOSS;
-                exc.name = type < 100 ? "y0" : "y0f";
-                exc.retval = zero;
-                if (_LIB_VERSION == _POSIX_)
-                        errno = ERANGE;
-                else if (!matherr(&exc)) {
-                        if (_LIB_VERSION == _SVID_) {
-                                (void) WRITE2(exc.name, 2);
-                                (void) WRITE2(": TLOSS error\n", 14);
-                        }
-                        errno = ERANGE;
-                }
-		break;
-	    case 36:
-	    case 136:
-		/* j1(|x|>X_TLOSS) */
-                exc.type = TLOSS;
-                exc.name = type < 100 ? "j1" : "j1f";
-                exc.retval = zero;
-                if (_LIB_VERSION == _POSIX_)
-                        errno = ERANGE;
-                else if (!matherr(&exc)) {
-                        if (_LIB_VERSION == _SVID_) {
-                                (void) WRITE2(exc.name, 2);
-                                (void) WRITE2(": TLOSS error\n", 14);
-                        }
-                        errno = ERANGE;
-                }
-		break;
-	    case 37:
-	    case 137:
-		/* y1(x>X_TLOSS) */
-                exc.type = TLOSS;
-                exc.name = type < 100 ? "y1" : "y1f";
-                exc.retval = zero;
-                if (_LIB_VERSION == _POSIX_)
-                        errno = ERANGE;
-                else if (!matherr(&exc)) {
-                        if (_LIB_VERSION == _SVID_) {
-                                (void) WRITE2(exc.name, 2);
-                                (void) WRITE2(": TLOSS error\n", 14);
-                        }
-                        errno = ERANGE;
-                }
-		break;
-	    case 38:
-	    case 138:
-		/* jn(|x|>X_TLOSS) */
-                exc.type = TLOSS;
-                exc.name = type < 100 ? "jn" : "jnf";
-                exc.retval = zero;
-                if (_LIB_VERSION == _POSIX_)
-                        errno = ERANGE;
-                else if (!matherr(&exc)) {
-                        if (_LIB_VERSION == _SVID_) {
-                                (void) WRITE2(exc.name, 2);
-                                (void) WRITE2(": TLOSS error\n", 14);
-                        }
-                        errno = ERANGE;
-                }
-		break;
-	    case 39:
-	    case 139:
-		/* yn(x>X_TLOSS) */
-                exc.type = TLOSS;
-                exc.name = type < 100 ? "yn" : "ynf";
-                exc.retval = zero;
-                if (_LIB_VERSION == _POSIX_)
-                        errno = ERANGE;
-                else if (!matherr(&exc)) {
-                        if (_LIB_VERSION == _SVID_) {
-                                (void) WRITE2(exc.name, 2);
-                                (void) WRITE2(": TLOSS error\n", 14);
-                        }
-                        errno = ERANGE;
-                }
-		break;
-	    case 40:
-	    case 140:
-		/* gamma(finite) overflow */
-		exc.type = OVERFLOW;
-		exc.name = type < 100 ? "gamma" : "gammaf";
-                if (_LIB_VERSION == _SVID_)
-                  exc.retval = HUGE;
-                else
-                  exc.retval = HUGE_VAL;
-                if (_LIB_VERSION == _POSIX_)
-		  errno = ERANGE;
-                else if (!matherr(&exc)) {
-                  errno = ERANGE;
-                }
-		break;
-	    case 41:
-	    case 141:
-		/* gamma(-integer) or gamma(0) */
-		exc.type = SING;
-		exc.name = type < 100 ? "gamma" : "gammaf";
-                if (_LIB_VERSION == _SVID_)
-                  exc.retval = HUGE;
-                else
-                  exc.retval = HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = EDOM;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("gamma: SING error\n", 18);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 42:
-	    case 142:
-		/* pow(NaN,0.0) */
-		/* error only if _LIB_VERSION == _SVID_ & _XOPEN_ */
-		exc.type = DOMAIN;
-		exc.name = type < 100 ? "pow" : "powf";
-		exc.retval = x;
-		if (_LIB_VERSION == _IEEE_ ||
-		    _LIB_VERSION == _POSIX_) exc.retval = 1.0;
-		else if (!matherr(&exc)) {
-			errno = EDOM;
-		}
-		break;
-	    case 48:
-	    case 148:
-		/* log2(0) */
-		exc.type = SING;
-		exc.name = type < 100 ? "log2" : "log2f";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = -HUGE_VAL;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = ERANGE;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("log2: SING error\n", 18);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	    case 49:
-	    case 149:
-		/* log2(x<0) */
-		exc.type = DOMAIN;
-		exc.name = type < 100 ? "log2" : "log2f";
-		if (_LIB_VERSION == _SVID_)
-		  exc.retval = -HUGE;
-		else
-		  exc.retval = zero/zero;
-		if (_LIB_VERSION == _POSIX_)
-		  errno = EDOM;
-		else if (!matherr(&exc)) {
-		  if (_LIB_VERSION == _SVID_) {
-			(void) WRITE2("log2: DOMAIN error\n", 20);
-		      }
-		  errno = EDOM;
-		}
-		break;
-	}
-	return exc.retval;
-}
diff --git a/lib/libm/src/k_tan.c b/lib/libm/src/k_tan.c
deleted file mode 100644
index 5bed57a80..000000000
--- a/lib/libm/src/k_tan.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* @(#)k_tan.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: k_tan.c,v 1.12 2004/07/22 18:24:09 drochner Exp $");
-#endif
-
-/* __kernel_tan( x, y, k )
- * kernel tan function on [-pi/4, pi/4], pi/4 ~ 0.7854
- * Input x is assumed to be bounded by ~pi/4 in magnitude.
- * Input y is the tail of x.
- * Input k indicates whether tan (if k=1) or
- * -1/tan (if k= -1) is returned.
- *
- * Algorithm
- *	1. Since tan(-x) = -tan(x), we need only to consider positive x.
- *	2. if x < 2^-28 (hx<0x3e300000 0), return x with inexact if x!=0.
- *	3. tan(x) is approximated by a odd polynomial of degree 27 on
- *	   [0,0.67434]
- *		  	         3             27
- *	   	tan(x) ~ x + T1*x + ... + T13*x
- *	   where
- *
- * 	        |tan(x)         2     4            26   |     -59.2
- * 	        |----- - (1+T1*x +T2*x +.... +T13*x    )| <= 2
- * 	        |  x 					|
- *
- *	   Note: tan(x+y) = tan(x) + tan'(x)*y
- *		          ~ tan(x) + (1+x*x)*y
- *	   Therefore, for better accuracy in computing tan(x+y), let
- *		     3      2      2       2       2
- *		r = x *(T2+x *(T3+x *(...+x *(T12+x *T13))))
- *	   then
- *		 		    3    2
- *		tan(x+y) = x + (T1*x + (x *(r+y)+y))
- *
- *      4. For x in [0.67434,pi/4],  let y = pi/4 - x, then
- *		tan(x) = tan(pi/4-y) = (1-tan(y))/(1+tan(y))
- *		       = 1 - 2*(tan(y) - (tan(y)^2)/(1+tan(y)))
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double xxx[] = {
-		 3.33333333333334091986e-01,	/* 3FD55555, 55555563 */
-		 1.33333333333201242699e-01,	/* 3FC11111, 1110FE7A */
-		 5.39682539762260521377e-02,	/* 3FABA1BA, 1BB341FE */
-		 2.18694882948595424599e-02,	/* 3F9664F4, 8406D637 */
-		 8.86323982359930005737e-03,	/* 3F8226E3, E96E8493 */
-		 3.59207910759131235356e-03,	/* 3F6D6D22, C9560328 */
-		 1.45620945432529025516e-03,	/* 3F57DBC8, FEE08315 */
-		 5.88041240820264096874e-04,	/* 3F4344D8, F2F26501 */
-		 2.46463134818469906812e-04,	/* 3F3026F7, 1A8D1068 */
-		 7.81794442939557092300e-05,	/* 3F147E88, A03792A6 */
-		 7.14072491382608190305e-05,	/* 3F12B80F, 32F0A7E9 */
-		-1.85586374855275456654e-05,	/* BEF375CB, DB605373 */
-		 2.59073051863633712884e-05,	/* 3EFB2A70, 74BF7AD4 */
-/* one */	 1.00000000000000000000e+00,	/* 3FF00000, 00000000 */
-/* pio4 */	 7.85398163397448278999e-01,	/* 3FE921FB, 54442D18 */
-/* pio4lo */	 3.06161699786838301793e-17	/* 3C81A626, 33145C07 */
-};
-#define	one	xxx[13]
-#define	pio4	xxx[14]
-#define	pio4lo	xxx[15]
-#define	T	xxx
-
-double
-__kernel_tan(double x, double y, int iy)
-{
-	double z, r, v, w, s;
-	int32_t ix, hx;
-
-	GET_HIGH_WORD(hx, x);	/* high word of x */
-	ix = hx & 0x7fffffff;			/* high word of |x| */
-	if (ix < 0x3e300000) {			/* x < 2**-28 */
-		if ((int) x == 0) {		/* generate inexact */
-			u_int32_t low;
-			GET_LOW_WORD(low, x);
-			if(((ix | low) | (iy + 1)) == 0)
-				return one / fabs(x);
-			else {
-				if (iy == 1)
-					return x;
-				else {	/* compute -1 / (x+y) carefully */
-					double a, t;
-
-					z = w = x + y;
-					SET_LOW_WORD(z, 0);
-					v = y - (z - x);
-					t = a = -one / w;
-					SET_LOW_WORD(t, 0);
-					s = one + t * z;
-					return t + a * (s + t * v);
-				}
-			}
-		}
-	}
-	if (ix >= 0x3FE59428) {	/* |x| >= 0.6744 */
-		if (hx < 0) {
-			x = -x;
-			y = -y;
-		}
-		z = pio4 - x;
-		w = pio4lo - y;
-		x = z + w;
-		y = 0.0;
-	}
-	z = x * x;
-	w = z * z;
-	/*
-	 * Break x^5*(T[1]+x^2*T[2]+...) into
-	 * x^5(T[1]+x^4*T[3]+...+x^20*T[11]) +
-	 * x^5(x^2*(T[2]+x^4*T[4]+...+x^22*[T12]))
-	 */
-	r = T[1] + w * (T[3] + w * (T[5] + w * (T[7] + w * (T[9] +
-		w * T[11]))));
-	v = z * (T[2] + w * (T[4] + w * (T[6] + w * (T[8] + w * (T[10] +
-		w * T[12])))));
-	s = z * x;
-	r = y + z * (s * (r + v) + y);
-	r += T[0] * s;
-	w = x + r;
-	if (ix >= 0x3FE59428) {
-		v = (double) iy;
-		return (double) (1 - ((hx >> 30) & 2)) *
-			(v - 2.0 * (x - (w * w / (w + v) - r)));
-	}
-	if (iy == 1)
-		return w;
-	else {
-		/*
-		 * if allow error up to 2 ulp, simply return
-		 * -1.0 / (x+r) here
-		 */
-		/* compute -1.0 / (x+r) accurately */
-		double a, t;
-		z = w;
-		SET_LOW_WORD(z, 0);
-		v = r - (z - x);	/* z+v = r+x */
-		t = a = -1.0 / w;	/* a = -1.0/w */
-		SET_LOW_WORD(t, 0);
-		s = 1.0 + t * z;
-		return t + a * (s + t * v);
-	}
-}
diff --git a/lib/libm/src/k_tanf.c b/lib/libm/src/k_tanf.c
deleted file mode 100644
index a3703a409..000000000
--- a/lib/libm/src/k_tanf.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* k_tanf.c -- float version of k_tan.c
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: k_tanf.c,v 1.7 2002/05/26 22:01:54 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-static const float
-one   =  1.0000000000e+00, /* 0x3f800000 */
-pio4  =  7.8539812565e-01, /* 0x3f490fda */
-pio4lo=  3.7748947079e-08, /* 0x33222168 */
-T[] =  {
-  3.3333334327e-01, /* 0x3eaaaaab */
-  1.3333334029e-01, /* 0x3e088889 */
-  5.3968254477e-02, /* 0x3d5d0dd1 */
-  2.1869488060e-02, /* 0x3cb327a4 */
-  8.8632395491e-03, /* 0x3c11371f */
-  3.5920790397e-03, /* 0x3b6b6916 */
-  1.4562094584e-03, /* 0x3abede48 */
-  5.8804126456e-04, /* 0x3a1a26c8 */
-  2.4646313977e-04, /* 0x398137b9 */
-  7.8179444245e-05, /* 0x38a3f445 */
-  7.1407252108e-05, /* 0x3895c07a */
- -1.8558637748e-05, /* 0xb79bae5f */
-  2.5907305826e-05, /* 0x37d95384 */
-};
-
-float
-__kernel_tanf(float x, float y, int iy)
-{
-	float z,r,v,w,s;
-	int32_t ix,hx;
-	GET_FLOAT_WORD(hx,x);
-	ix = hx&0x7fffffff;	/* high word of |x| */
-	if(ix<0x31800000)			/* x < 2**-28 */
-	    {if((int)x==0) {			/* generate inexact */
-		if((ix|(iy+1))==0) return one/fabsf(x);
-		else return (iy==1)? x: -one/x;
-	    }
-	    }
-	if(ix>=0x3f2ca140) { 			/* |x|>=0.6744 */
-	    if(hx<0) {x = -x; y = -y;}
-	    z = pio4-x;
-	    w = pio4lo-y;
-	    x = z+w; y = 0.0;
-	}
-	z	=  x*x;
-	w 	=  z*z;
-    /* Break x^5*(T[1]+x^2*T[2]+...) into
-     *	  x^5(T[1]+x^4*T[3]+...+x^20*T[11]) +
-     *	  x^5(x^2*(T[2]+x^4*T[4]+...+x^22*[T12]))
-     */
-	r = T[1]+w*(T[3]+w*(T[5]+w*(T[7]+w*(T[9]+w*T[11]))));
-	v = z*(T[2]+w*(T[4]+w*(T[6]+w*(T[8]+w*(T[10]+w*T[12])))));
-	s = z*x;
-	r = y + z*(s*(r+v)+y);
-	r += T[0]*s;
-	w = x+r;
-	if(ix>=0x3f2ca140) {
-	    v = (float)iy;
-	    return (float)(1-((hx>>30)&2))*(v-(float)2.0*(x-(w*w/(w+v)-r)));
-	}
-	if(iy==1) return w;
-	else {		/* if allow error up to 2 ulp,
-			   simply return -1.0/(x+r) here */
-     /*  compute -1.0/(x+r) accurately */
-	    float a,t;
-	    int32_t i;
-	    z  = w;
-	    GET_FLOAT_WORD(i,z);
-	    SET_FLOAT_WORD(z,i&0xfffff000);
-	    v  = r-(z - x); 	/* z+v = r+x */
-	    t = a  = -(float)1.0/w;	/* a = -1.0/w */
-	    GET_FLOAT_WORD(i,t);
-	    SET_FLOAT_WORD(t,i&0xfffff000);
-	    s  = (float)1.0+t*z;
-	    return t+a*(s+t*v);
-	}
-}
diff --git a/lib/libm/src/ldbl_dummy.c b/lib/libm/src/ldbl_dummy.c
deleted file mode 100644
index eab898ae8..000000000
--- a/lib/libm/src/ldbl_dummy.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/* $NetBSD: ldbl_dummy.c,v 1.2 2014/11/13 21:43:27 christos Exp $ */
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Simple long double -> double wrappers for various transcendental functions.
- * They work neither on the additional range of long double nor do they use
- * the additional precision. They exist as stop gap fix for various programs
- * picking up long double, e.g. via the C++ run time.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: ldbl_dummy.c,v 1.2 2014/11/13 21:43:27 christos Exp $");
-
-#include "namespace.h"
-#include <math.h>
-
-__weak_alias(atan2l, _atan2l)
-__weak_alias(hypotl, _hypotl)
-__weak_alias(logl, _logl)
-__weak_alias(log10l, _log10l)
-__weak_alias(expl, _expl)
-__weak_alias(exp2l, _exp2l)
-__weak_alias(powl, _powl)
-__weak_alias(cosl, _cosl)
-__weak_alias(sinl, _sinl)
-__weak_alias(tanl, _tanl)
-__weak_alias(coshl, _coshl)
-__weak_alias(sinhl, _sinhl)
-__weak_alias(tanhl, _tanhl)
-__weak_alias(acosl, _acosl)
-__weak_alias(asinl, _asinl)
-__weak_alias(atanl, _atanl)
-__weak_alias(acoshl, _acoshl)
-__weak_alias(asinhl, _asinhl)
-__weak_alias(atanhl, _atanhl)
-__weak_alias(erfl, _erfl)
-__weak_alias(erfcl, _erfcl)
-
-long double
-atan2l(long double y, long double x)
-{
-	return atan2(y, x);
-}
-
-long double
-hypotl(long double x, long double y)
-{
-	return hypot(x, y);
-}
-
-long double
-logl(long double x)
-{
-	return log(x);
-}
-
-long double
-log10l(long double x)
-{
-	return log10(x);
-}
-
-long double
-expl(long double x)
-{
-	return exp(x);
-}
-
-long double
-exp2l(long double x)
-{
-	return exp2(x);
-}
-
-long double
-powl(long double x, long double y)
-{
-	return pow(x, y);
-}
-
-long double
-cosl(long double x)
-{
-	return cos(x);
-}
-
-long double
-sinl(long double x)
-{
-	return sin(x);
-}
-
-
-long double
-tanl(long double x)
-{
-	return tan(x);
-}
-
-long double
-sinhl(long double x)
-{
-	return sinh(x);
-}
-
-long double
-coshl(long double x)
-{
-	return cosh(x);
-}
-
-long double
-tanhl(long double x)
-{
-	return tanh(x);
-}
-
-long double
-acosl(long double x)
-{
-	return acos(x);
-}
-
-long double
-asinl(long double x)
-{
-	return asin(x);
-}
-
-long double
-atanl(long double x)
-{
-	return atan(x);
-}
-
-long double
-asinhl(long double x)
-{
-	return asinh(x);
-}
-
-long double
-acoshl(long double x)
-{
-	return acosh(x);
-}
-
-long double
-atanhl(long double x)
-{
-	return atanh(x);
-}
-
-long double
-erfl(long double x)
-{
-	return erf(x);
-}
-
-long double
-erfcl(long double x)
-{
-	return erfc(x);
-}
diff --git a/lib/libm/src/llrint.c b/lib/libm/src/llrint.c
deleted file mode 100644
index dba6ae90b..000000000
--- a/lib/libm/src/llrint.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $NetBSD: llrint.c,v 1.2 2004/10/13 15:18:32 drochner Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#define LRINTNAME llrint
-#define RESTYPE long long int
-#define RESTYPE_MIN LLONG_MIN
-#define RESTYPE_MAX LLONG_MAX
-
-#include "lrint.c"
diff --git a/lib/libm/src/llrintf.c b/lib/libm/src/llrintf.c
deleted file mode 100644
index 6a16426ca..000000000
--- a/lib/libm/src/llrintf.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $NetBSD: llrintf.c,v 1.2 2004/10/13 15:18:32 drochner Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#define LRINTNAME llrintf
-#define RESTYPE long long int
-#define RESTYPE_MIN LLONG_MIN
-#define RESTYPE_MAX LLONG_MAX
-
-#include "lrintf.c"
diff --git a/lib/libm/src/llround.c b/lib/libm/src/llround.c
deleted file mode 100644
index 4dc34a48e..000000000
--- a/lib/libm/src/llround.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $NetBSD: llround.c,v 1.2 2004/10/13 15:18:32 drochner Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#define LROUNDNAME llround
-#define RESTYPE long long int
-#define RESTYPE_MIN LLONG_MIN
-#define RESTYPE_MAX LLONG_MAX
-
-#include "lround.c"
diff --git a/lib/libm/src/llroundf.c b/lib/libm/src/llroundf.c
deleted file mode 100644
index bc9dd430b..000000000
--- a/lib/libm/src/llroundf.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $NetBSD: llroundf.c,v 1.2 2004/10/13 15:18:32 drochner Exp $ */
-
-/*
- * Written by Matthias Drochner <drochner@NetBSD.org>.
- * Public domain.
- */
-
-#define LROUNDNAME llroundf
-#define RESTYPE long long int
-#define RESTYPE_MIN LLONG_MIN
-#define RESTYPE_MAX LLONG_MAX
-
-#include "lroundf.c"
diff --git a/lib/libm/src/lrint.c b/lib/libm/src/lrint.c
deleted file mode 100644
index 64246e6b1..000000000
--- a/lib/libm/src/lrint.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* $NetBSD: lrint.c,v 1.5 2015/07/09 06:17:13 nat Exp $ */
-
-/*-
- * Copyright (c) 2004
- *	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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <math.h>
-#include <sys/ieee754.h>
-#include <machine/limits.h>
-#include "math_private.h"
-
-#ifndef LRINTNAME
-#define LRINTNAME lrint
-#define RESTYPE long int
-#define RESTYPE_MIN LONG_MIN
-#define RESTYPE_MAX LONG_MAX
-#endif
-
-#define RESTYPE_BITS (sizeof(RESTYPE) * 8)
-
-static const double
-TWO52[2]={
-  4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
- -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
-};
-
-RESTYPE
-LRINTNAME(double x)
-{
-	u_int32_t i0, i1;
-	int e, s, shift;
-	RESTYPE res;
-
-	GET_HIGH_WORD(i0, x);
-	e = i0 >> 20;
-	s = (uint32_t)e >> DBL_EXPBITS;
-	e = (e & 0x7ff) - DBL_EXP_BIAS;
-
-	/* 1.0 x 2^-1 is the smallest number which can be rounded to 1 */
-	if (e < -1)
-		return (0);
-	/* 1.0 x 2^31 (or 2^63) is already too large */
-	if (e >= (int)RESTYPE_BITS - 1)
-		return (s ? RESTYPE_MIN : RESTYPE_MAX); /* ??? unspecified */
-
-	/* >= 2^52 is already an exact integer */
-	if (e < DBL_FRACBITS) {
-		/* round, using current direction */
-		x += TWO52[s];
-		x -= TWO52[s];
-	} else
-		return x;
-
-	EXTRACT_WORDS(i0, i1, x);
-	e = ((i0 >> 20) & 0x7ff) - DBL_EXP_BIAS;
-	i0 &= 0xfffff;
-	i0 |= (1 << 20);
-
-	shift = e - DBL_FRACBITS;
-	if (shift >=0)
-		res = (shift < 32 ? (RESTYPE)i1 << shift : 0);
-	else
-		res = (shift > -32 ? i1 >> -shift : 0);
-	shift += 32;
-	if (shift >=0)
-		res |= (shift < 32 ? (RESTYPE)i0 << shift : 0);
-	else
-		res |= (shift > -32 ? i0 >> -shift : 0);
-
-	return (s ? -res : res);
-}
diff --git a/lib/libm/src/lrintf.c b/lib/libm/src/lrintf.c
deleted file mode 100644
index 47b7ff890..000000000
--- a/lib/libm/src/lrintf.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* $NetBSD: lrintf.c,v 1.6 2015/07/09 06:17:13 nat Exp $ */
-
-/*-
- * Copyright (c) 2004
- *	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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <math.h>
-#include <sys/ieee754.h>
-#include <machine/limits.h>
-#include "math_private.h"
-
-#ifndef LRINTNAME
-#define LRINTNAME lrintf
-#define RESTYPE long int
-#define RESTYPE_MIN LONG_MIN
-#define RESTYPE_MAX LONG_MAX
-#endif
-
-#define RESTYPE_BITS (sizeof(RESTYPE) * 8)
-
-static const float
-TWO23[2]={
-  8.3886080000e+06, /* 0x4b000000 */
- -8.3886080000e+06, /* 0xcb000000 */
-};
-
-RESTYPE
-LRINTNAME(float x)
-{
-	u_int32_t i0;
-	int e, s, shift;
-	RESTYPE res;
-#ifdef __i386__ /* XXX gcc4 will omit the rounding otherwise */
-	volatile
-#endif
-		float w;
-
-	GET_FLOAT_WORD(i0, x);
-	e = i0 >> SNG_FRACBITS;
-	s = (uint32_t)e >> SNG_EXPBITS;
-	e = (e & 0xff) - SNG_EXP_BIAS;
-
-	/* 1.0 x 2^-1 is the smallest number which can be rounded to 1 */
-	if (e < -1)
-		return (0);
-	/* 1.0 x 2^31 (or 2^63) is already too large */
-	if (e >= (int)RESTYPE_BITS - 1)
-		return (s ? RESTYPE_MIN : RESTYPE_MAX); /* ??? unspecified */
-
-	/* >= 2^23 is already an exact integer */
-	if (e < SNG_FRACBITS) {
-		/* round, using current direction */
-		w = TWO23[s] + x;
-		x = w - TWO23[s];
-	} else
-		return x;
-
-	GET_FLOAT_WORD(i0, x);
-	e = ((i0 >> SNG_FRACBITS) & 0xff) - SNG_EXP_BIAS;
-	i0 &= 0x7fffff;
-	i0 |= (1 << SNG_FRACBITS);
-
-	shift = e - SNG_FRACBITS;
-	if (shift >=0)
-		res = (shift < 32 ? (RESTYPE)i0 << shift : 0);
-	else
-		res = (shift > -32 ? i0 >> -shift : 0);
-
-	return (s ? -res : res);
-}
diff --git a/lib/libm/src/lround.c b/lib/libm/src/lround.c
deleted file mode 100644
index ab7194418..000000000
--- a/lib/libm/src/lround.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* $NetBSD: lround.c,v 1.3 2008/04/26 23:49:50 christos Exp $ */
-
-/*-
- * Copyright (c) 2004
- *	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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <math.h>
-#include <sys/ieee754.h>
-#include <machine/limits.h>
-#include "math_private.h"
-
-#ifndef LROUNDNAME
-#define LROUNDNAME lround
-#define RESTYPE long int
-#define RESTYPE_MIN LONG_MIN
-#define RESTYPE_MAX LONG_MAX
-#endif
-
-#define RESTYPE_BITS (sizeof(RESTYPE) * 8)
-
-RESTYPE
-LROUNDNAME(double x)
-{
-	u_int32_t i0, i1;
-	int e, s, shift;
-	RESTYPE res;
-
-	GET_HIGH_WORD(i0, x);
-	e = i0 >> 20;
-	s = (uint32_t)e >> DBL_EXPBITS;
-	e = (e & 0x7ff) - DBL_EXP_BIAS;
-
-	/* 1.0 x 2^-1 is the smallest number which can be rounded to 1 */
-	if (e < -1)
-		return (0);
-	/* 1.0 x 2^31 (or 2^63) is already too large */
-	if (e >= (int)RESTYPE_BITS - 1)
-		return (s ? RESTYPE_MIN : RESTYPE_MAX); /* ??? unspecified */
-
-	/* >= 2^52 is already an exact integer */
-	if (e < DBL_FRACBITS) {
-		/* add 0.5, extraction below will truncate */
-		x += (s ? -0.5 : 0.5);
-	}
-
-	EXTRACT_WORDS(i0, i1, x);
-	e = ((i0 >> 20) & 0x7ff) - DBL_EXP_BIAS;
-	i0 &= 0xfffff;
-	i0 |= (1 << 20);
-
-	shift = e - DBL_FRACBITS;
-	if (shift >=0)
-		res = (shift < 32 ? (RESTYPE)i1 << shift : 0);
-	else
-		res = (shift > -32 ? i1 >> -shift : 0);
-	shift += 32;
-	if (shift >=0)
-		res |= (shift < 32 ? (RESTYPE)i0 << shift : 0);
-	else
-		res |= (shift > -32 ? i0 >> -shift : 0);
-
-	return (s ? -res : res);
-}
diff --git a/lib/libm/src/lroundf.c b/lib/libm/src/lroundf.c
deleted file mode 100644
index 75fb0299e..000000000
--- a/lib/libm/src/lroundf.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* $NetBSD: lroundf.c,v 1.3 2008/04/26 23:49:50 christos Exp $ */
-
-/*-
- * Copyright (c) 2004
- *	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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <math.h>
-#include <sys/ieee754.h>
-#include <machine/limits.h>
-#include "math_private.h"
-
-#ifndef LROUNDNAME
-#define LROUNDNAME lroundf
-#define RESTYPE long int
-#define RESTYPE_MIN LONG_MIN
-#define RESTYPE_MAX LONG_MAX
-#endif
-
-#define RESTYPE_BITS (sizeof(RESTYPE) * 8)
-
-RESTYPE
-LROUNDNAME(float x)
-{
-	u_int32_t i0;
-	int e, s, shift;
-	RESTYPE res;
-
-	GET_FLOAT_WORD(i0, x);
-	e = i0 >> SNG_FRACBITS;
-	s = (uint32_t)e >> SNG_EXPBITS;
-	e = (e & 0xff) - SNG_EXP_BIAS;
-
-	/* 1.0 x 2^-1 is the smallest number which can be rounded to 1 */
-	if (e < -1)
-		return (0);
-	/* 1.0 x 2^31 (or 2^63) is already too large */
-	if (e >= (int)RESTYPE_BITS - 1)
-		return (s ? RESTYPE_MIN : RESTYPE_MAX); /* ??? unspecified */
-
-	/* >= 2^23 is already an exact integer */
-	if (e < SNG_FRACBITS) {
-		/* add 0.5, extraction below will truncate */
-		x += (s ? -0.5 : 0.5);
-	}
-
-	GET_FLOAT_WORD(i0, x);
-	e = ((i0 >> SNG_FRACBITS) & 0xff) - SNG_EXP_BIAS;
-	i0 &= 0x7fffff;
-	i0 |= (1 << SNG_FRACBITS);
-
-	shift = e - SNG_FRACBITS;
-	if (shift >=0)
-		res = (shift < 32 ? (RESTYPE)i0 << shift : 0);
-	else
-		res = (shift > -32 ? i0 >> -shift : 0);
-
-	return (s ? -res : res);
-}
diff --git a/lib/libm/src/math_private.h b/lib/libm/src/math_private.h
deleted file mode 100644
index f9e0dc2f7..000000000
--- a/lib/libm/src/math_private.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * ====================================================
- * 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.
- * ====================================================
- */
-
-/*
- * from: @(#)fdlibm.h 5.1 93/09/24
- * $NetBSD: math_private.h,v 1.22 2015/03/26 11:59:38 justin Exp $
- */
-
-#ifndef _MATH_PRIVATE_H_
-#define _MATH_PRIVATE_H_
-
-#include <sys/types.h>
-
-/* The original fdlibm code used statements like:
-	n0 = ((*(int*)&one)>>29)^1;		* index of high word *
-	ix0 = *(n0+(int*)&x);			* high word of x *
-	ix1 = *((1-n0)+(int*)&x);		* low word of x *
-   to dig two 32 bit words out of the 64 bit IEEE floating point
-   value.  That is non-ANSI, and, moreover, the gcc instruction
-   scheduler gets it wrong.  We instead use the following macros.
-   Unlike the original code, we determine the endianness at compile
-   time, not at run time; I don't see much benefit to selecting
-   endianness at run time.  */
-
-/* A union which permits us to convert between a double and two 32 bit
-   ints.  */
-
-/*
- * The ARM ports are little endian except for the FPA word order which is
- * big endian.
- */
-
-#if (BYTE_ORDER == BIG_ENDIAN) || (defined(__arm__) && !defined(__VFP_FP__))
-
-typedef union
-{
-  double value;
-  struct
-  {
-    u_int32_t msw;
-    u_int32_t lsw;
-  } parts;
-  struct {
-    u_int64_t w;
-  } xparts;
-} ieee_double_shape_type;
-
-#endif
-
-#if (BYTE_ORDER == LITTLE_ENDIAN) && \
-    !(defined(__arm__) && !defined(__VFP_FP__))
-
-typedef union
-{
-  double value;
-  struct
-  {
-    u_int32_t lsw;
-    u_int32_t msw;
-  } parts;
-  struct {
-    u_int64_t w;
-  } xparts;
-} ieee_double_shape_type;
-
-#endif
-
-/* Get two 32 bit ints from a double.  */
-
-#define EXTRACT_WORDS(ix0,ix1,d)				\
-do {								\
-  ieee_double_shape_type ew_u;					\
-  ew_u.value = (d);						\
-  (ix0) = ew_u.parts.msw;					\
-  (ix1) = ew_u.parts.lsw;					\
-} while (/*CONSTCOND*/0)
-
-/* Get a 64-bit int from a double. */
-#define EXTRACT_WORD64(ix,d)					\
-do {								\
-  ieee_double_shape_type ew_u;					\
-  ew_u.value = (d);						\
-  (ix) = ew_u.xparts.w;						\
-} while (/*CONSTCOND*/0)
-
-
-/* Get the more significant 32 bit int from a double.  */
-
-#define GET_HIGH_WORD(i,d)					\
-do {								\
-  ieee_double_shape_type gh_u;					\
-  gh_u.value = (d);						\
-  (i) = gh_u.parts.msw;						\
-} while (/*CONSTCOND*/0)
-
-/* Get the less significant 32 bit int from a double.  */
-
-#define GET_LOW_WORD(i,d)					\
-do {								\
-  ieee_double_shape_type gl_u;					\
-  gl_u.value = (d);						\
-  (i) = gl_u.parts.lsw;						\
-} while (/*CONSTCOND*/0)
-
-/* Set a double from two 32 bit ints.  */
-
-#define INSERT_WORDS(d,ix0,ix1)					\
-do {								\
-  ieee_double_shape_type iw_u;					\
-  iw_u.parts.msw = (ix0);					\
-  iw_u.parts.lsw = (ix1);					\
-  (d) = iw_u.value;						\
-} while (/*CONSTCOND*/0)
-
-/* Set a double from a 64-bit int. */
-#define INSERT_WORD64(d,ix)					\
-do {								\
-  ieee_double_shape_type iw_u;					\
-  iw_u.xparts.w = (ix);						\
-  (d) = iw_u.value;						\
-} while (/*CONSTCOND*/0)
-
-
-/* Set the more significant 32 bits of a double from an int.  */
-
-#define SET_HIGH_WORD(d,v)					\
-do {								\
-  ieee_double_shape_type sh_u;					\
-  sh_u.value = (d);						\
-  sh_u.parts.msw = (v);						\
-  (d) = sh_u.value;						\
-} while (/*CONSTCOND*/0)
-
-/* Set the less significant 32 bits of a double from an int.  */
-
-#define SET_LOW_WORD(d,v)					\
-do {								\
-  ieee_double_shape_type sl_u;					\
-  sl_u.value = (d);						\
-  sl_u.parts.lsw = (v);						\
-  (d) = sl_u.value;						\
-} while (/*CONSTCOND*/0)
-
-/* A union which permits us to convert between a float and a 32 bit
-   int.  */
-
-typedef union
-{
-  float value;
-  u_int32_t word;
-} ieee_float_shape_type;
-
-/* Get a 32 bit int from a float.  */
-
-#define GET_FLOAT_WORD(i,d)					\
-do {								\
-  ieee_float_shape_type gf_u;					\
-  gf_u.value = (d);						\
-  (i) = gf_u.word;						\
-} while (/*CONSTCOND*/0)
-
-/* Set a float from a 32 bit int.  */
-
-#define SET_FLOAT_WORD(d,i)					\
-do {								\
-  ieee_float_shape_type sf_u;					\
-  sf_u.word = (i);						\
-  (d) = sf_u.value;						\
-} while (/*CONSTCOND*/0)
-
-/*
- * Attempt to get strict C99 semantics for assignment with non-C99 compilers.
- */
-#if FLT_EVAL_METHOD == 0 || __GNUC__ == 0
-#define	STRICT_ASSIGN(type, lval, rval)	((lval) = (rval))
-#else
-#define	STRICT_ASSIGN(type, lval, rval) do {	\
-	volatile type __lval;			\
-						\
-	if (sizeof(type) >= sizeof(long double))	\
-		(lval) = (rval);		\
-	else {					\
-		__lval = (rval);		\
-		(lval) = __lval;		\
-	}					\
-} while (/*CONSTCOND*/0)
-#endif
-
-#ifdef	_COMPLEX_H
-
-/*
- * Quoting from ISO/IEC 9899:TC2:
- *
- * 6.2.5.13 Types
- * Each complex type has the same representation and alignment requirements as
- * an array type containing exactly two elements of the corresponding real type;
- * the first element is equal to the real part, and the second element to the
- * imaginary part, of the complex number.
- */
-typedef union {
-	float complex z;
-	float parts[2];
-} float_complex;
-
-typedef union {
-	double complex z;
-	double parts[2];
-} double_complex;
-
-typedef union {
-	long double complex z;
-	long double parts[2];
-} long_double_complex;
-
-#define	REAL_PART(z)	((z).parts[0])
-#define	IMAG_PART(z)	((z).parts[1])
-
-#endif	/* _COMPLEX_H */
-
-/* ieee style elementary functions */
-extern double __ieee754_sqrt __P((double));
-extern double __ieee754_acos __P((double));
-extern double __ieee754_acosh __P((double));
-extern double __ieee754_log __P((double));
-extern double __ieee754_atanh __P((double));
-extern double __ieee754_asin __P((double));
-extern double __ieee754_atan2 __P((double,double));
-extern double __ieee754_exp __P((double));
-extern double __ieee754_cosh __P((double));
-extern double __ieee754_fmod __P((double,double));
-extern double __ieee754_pow __P((double,double));
-extern double __ieee754_lgamma_r __P((double,int *));
-extern double __ieee754_gamma_r __P((double,int *));
-extern double __ieee754_lgamma __P((double));
-extern double __ieee754_gamma __P((double));
-extern double __ieee754_log10 __P((double));
-extern double __ieee754_log2 __P((double));
-extern double __ieee754_sinh __P((double));
-extern double __ieee754_hypot __P((double,double));
-extern double __ieee754_j0 __P((double));
-extern double __ieee754_j1 __P((double));
-extern double __ieee754_y0 __P((double));
-extern double __ieee754_y1 __P((double));
-extern double __ieee754_jn __P((int,double));
-extern double __ieee754_yn __P((int,double));
-extern double __ieee754_remainder __P((double,double));
-extern int32_t __ieee754_rem_pio2 __P((double,double*));
-extern double __ieee754_scalb __P((double,double));
-
-/* fdlibm kernel function */
-extern double __kernel_standard __P((double,double,int));
-extern double __kernel_sin __P((double,double,int));
-extern double __kernel_cos __P((double,double));
-extern double __kernel_tan __P((double,double,int));
-extern int    __kernel_rem_pio2 __P((double*,double*,int,int,int,const int32_t*));
-
-
-/* ieee style elementary float functions */
-extern float __ieee754_sqrtf __P((float));
-extern float __ieee754_acosf __P((float));
-extern float __ieee754_acoshf __P((float));
-extern float __ieee754_logf __P((float));
-extern float __ieee754_atanhf __P((float));
-extern float __ieee754_asinf __P((float));
-extern float __ieee754_atan2f __P((float,float));
-extern float __ieee754_expf __P((float));
-extern float __ieee754_coshf __P((float));
-extern float __ieee754_fmodf __P((float,float));
-extern float __ieee754_powf __P((float,float));
-extern float __ieee754_lgammaf_r __P((float,int *));
-extern float __ieee754_gammaf_r __P((float,int *));
-extern float __ieee754_lgammaf __P((float));
-extern float __ieee754_gammaf __P((float));
-extern float __ieee754_log10f __P((float));
-extern float __ieee754_log2f __P((float));
-extern float __ieee754_sinhf __P((float));
-extern float __ieee754_hypotf __P((float,float));
-extern float __ieee754_j0f __P((float));
-extern float __ieee754_j1f __P((float));
-extern float __ieee754_y0f __P((float));
-extern float __ieee754_y1f __P((float));
-extern float __ieee754_jnf __P((int,float));
-extern float __ieee754_ynf __P((int,float));
-extern float __ieee754_remainderf __P((float,float));
-extern int32_t __ieee754_rem_pio2f __P((float,float*));
-extern float __ieee754_scalbf __P((float,float));
-
-/* float versions of fdlibm kernel functions */
-extern float __kernel_sinf __P((float,float,int));
-extern float __kernel_cosf __P((float,float));
-extern float __kernel_tanf __P((float,float,int));
-extern int   __kernel_rem_pio2f __P((float*,float*,int,int,int,const int32_t*));
-
-/* ieee style elementary long double functions */
-extern long double __ieee754_fmodl(long double, long double);
-extern long double __ieee754_sqrtl(long double);
-
-/*
- * TRUNC() is a macro that sets the trailing 27 bits in the mantissa of an
- * IEEE double variable to zero.  It must be expression-like for syntactic
- * reasons, and we implement this expression using an inline function
- * instead of a pure macro to avoid depending on the gcc feature of
- * statement-expressions.
- */
-#define	TRUNC(d)	(_b_trunc(&(d)))
-
-static __inline void
-_b_trunc(volatile double *_dp)
-{
-	uint32_t _lw;
-
-	GET_LOW_WORD(_lw, *_dp);
-	SET_LOW_WORD(*_dp, _lw & 0xf8000000);
-}
-
-struct Double {
-	double	a;
-	double	b;
-};
-
-/*
- * Functions internal to the math package, yet not static.
- */
-double	__exp__D(double, double);
-struct Double __log__D(double);
-
-#endif /* _MATH_PRIVATE_H_ */
diff --git a/lib/libm/src/namespace.h b/lib/libm/src/namespace.h
deleted file mode 100644
index e732018e6..000000000
--- a/lib/libm/src/namespace.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* $NetBSD: namespace.h,v 1.13 2014/11/14 14:53:17 joerg Exp $ */
-
-#define atan2 _atan2
-#define atan2f _atan2f
-#define atan2l _atan2l
-#define hypot _hypot
-#define hypotf _hypotf
-#define hypotl _hypotl
-
-#define exp _exp
-#define expf _expf
-#define expl _expl
-#define log _log
-#define logf _logf
-#define logl _logl
-
-#if 0 /* not yet - need to review use in machdep code first */
-#define sin _sin
-#define sinf _sinf
-#define cos _cos
-#define cosf _cosf
-#define finite _finite
-#define finitef _finitef
-#endif /* notyet */
-#define sinh _sinh
-#define sinhf _sinhf
-#define sinhl _sinhl
-#define cosh _cosh
-#define coshf _coshf
-#define coshl _coshl
-#define asin _asin
-#define asinf _asinf
-#define asinl _asinl
-
-#define casin _casin
-#define casinf _casinf
-#define casinl _casinl
-#define catan _catan
-#define catanf _catanf
-#define catanl _catanl
-
-#define scalbn _scalbn
-#define scalbnf _scalbnf
-#define scalbnl _scalbnl
-#define scalbln _scalbln
-#define scalblnf _scalblnf
-#define scalblnl _scalblnl
-
-#define copysignl _copysignl
-#define sqrtl _sqrtl
-#define cbrtl _cbrtl
-#define ceill _ceill
-#define floorl _floorl
-#define roundl _roundl
-#define fmodl _fmodl
-#define modfl _modfl
-#define truncl _truncl
-
-#define exp2l _exp2l
-#define cosl _cosl
-#define sinl _sinl
-#define tanl _tanl
-#define powl _powl
-#define coshl _coshl
-#define sinhl _sinhl
-#define acosl _acosl
-#define atanl _atanl
-#define asinhl _asinhl
-#define acoshl _acoshl
-#define tanhl _tanhl
-#define atanhl _atanhl
-#define log10l _log10l
-
-#define erfl	_erfl
-#define erfcl	_erfcl
diff --git a/lib/libm/src/s_asinh.c b/lib/libm/src/s_asinh.c
deleted file mode 100644
index 01ef74c5d..000000000
--- a/lib/libm/src/s_asinh.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* @(#)s_asinh.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_asinh.c,v 1.12 2002/05/26 22:01:54 wiz Exp $");
-#endif
-
-/* asinh(x)
- * Method :
- *	Based on
- *		asinh(x) = sign(x) * log [ |x| + sqrt(x*x+1) ]
- *	we have
- *	asinh(x) := x  if  1+x*x=1,
- *		 := sign(x)*(log(x)+ln2)) for large |x|, else
- *		 := sign(x)*log(2|x|+1/(|x|+sqrt(x*x+1))) if|x|>2, else
- *		 := sign(x)*log1p(|x| + x^2/(1 + sqrt(1+x^2)))
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-one =  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
-ln2 =  6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */
-huge=  1.00000000000000000000e+300;
-
-double
-asinh(double x)
-{
-	double t,w;
-	int32_t hx,ix;
-	GET_HIGH_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7ff00000) return x+x;	/* x is inf or NaN */
-	if(ix< 0x3e300000) {	/* |x|<2**-28 */
-	    if(huge+x>one) return x;	/* return x inexact except 0 */
-	}
-	if(ix>0x41b00000) {	/* |x| > 2**28 */
-	    w = __ieee754_log(fabs(x))+ln2;
-	} else if (ix>0x40000000) {	/* 2**28 > |x| > 2.0 */
-	    t = fabs(x);
-	    w = __ieee754_log(2.0*t+one/(__ieee754_sqrt(x*x+one)+t));
-	} else {		/* 2.0 > |x| > 2**-28 */
-	    t = x*x;
-	    w =log1p(fabs(x)+t/(one+__ieee754_sqrt(one+t)));
-	}
-	if(hx>0) return w; else return -w;
-}
diff --git a/lib/libm/src/s_asinhf.c b/lib/libm/src/s_asinhf.c
deleted file mode 100644
index 060e7cac9..000000000
--- a/lib/libm/src/s_asinhf.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* s_asinhf.c -- float version of s_asinh.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_asinhf.c,v 1.8 2002/05/26 22:01:54 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-one =  1.0000000000e+00, /* 0x3F800000 */
-ln2 =  6.9314718246e-01, /* 0x3f317218 */
-huge=  1.0000000000e+30;
-
-float
-asinhf(float x)
-{
-	float t,w;
-	int32_t hx,ix;
-	GET_FLOAT_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7f800000) return x+x;	/* x is inf or NaN */
-	if(ix< 0x31800000) {	/* |x|<2**-28 */
-	    if(huge+x>one) return x;	/* return x inexact except 0 */
-	}
-	if(ix>0x4d800000) {	/* |x| > 2**28 */
-	    w = __ieee754_logf(fabsf(x))+ln2;
-	} else if (ix>0x40000000) {	/* 2**28 > |x| > 2.0 */
-	    t = fabsf(x);
-	    w = __ieee754_logf((float)2.0*t+one/(__ieee754_sqrtf(x*x+one)+t));
-	} else {		/* 2.0 > |x| > 2**-28 */
-	    t = x*x;
-	    w =log1pf(fabsf(x)+t/(one+__ieee754_sqrtf(one+t)));
-	}
-	if(hx>0) return w; else return -w;
-}
diff --git a/lib/libm/src/s_atan.c b/lib/libm/src/s_atan.c
deleted file mode 100644
index 18a97e5fd..000000000
--- a/lib/libm/src/s_atan.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* @(#)s_atan.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_atan.c,v 1.11 2002/05/26 22:01:54 wiz Exp $");
-#endif
-
-/* atan(x)
- * Method
- *   1. Reduce x to positive by atan(x) = -atan(-x).
- *   2. According to the integer k=4t+0.25 chopped, t=x, the argument
- *      is further reduced to one of the following intervals and the
- *      arctangent of t is evaluated by the corresponding formula:
- *
- *      [0,7/16]      atan(x) = t-t^3*(a1+t^2*(a2+...(a10+t^2*a11)...)
- *      [7/16,11/16]  atan(x) = atan(1/2) + atan( (t-0.5)/(1+t/2) )
- *      [11/16.19/16] atan(x) = atan( 1 ) + atan( (t-1)/(1+t) )
- *      [19/16,39/16] atan(x) = atan(3/2) + atan( (t-1.5)/(1+1.5t) )
- *      [39/16,INF]   atan(x) = atan(INF) + atan( -1/t )
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following
- * constants. The decimal values may be used, provided that the
- * compiler will convert from decimal to binary accurately enough
- * to produce the hexadecimal values shown.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double atanhi[] = {
-  4.63647609000806093515e-01, /* atan(0.5)hi 0x3FDDAC67, 0x0561BB4F */
-  7.85398163397448278999e-01, /* atan(1.0)hi 0x3FE921FB, 0x54442D18 */
-  9.82793723247329054082e-01, /* atan(1.5)hi 0x3FEF730B, 0xD281F69B */
-  1.57079632679489655800e+00, /* atan(inf)hi 0x3FF921FB, 0x54442D18 */
-};
-
-static const double atanlo[] = {
-  2.26987774529616870924e-17, /* atan(0.5)lo 0x3C7A2B7F, 0x222F65E2 */
-  3.06161699786838301793e-17, /* atan(1.0)lo 0x3C81A626, 0x33145C07 */
-  1.39033110312309984516e-17, /* atan(1.5)lo 0x3C700788, 0x7AF0CBBD */
-  6.12323399573676603587e-17, /* atan(inf)lo 0x3C91A626, 0x33145C07 */
-};
-
-static const double aT[] = {
-  3.33333333333329318027e-01, /* 0x3FD55555, 0x5555550D */
- -1.99999999998764832476e-01, /* 0xBFC99999, 0x9998EBC4 */
-  1.42857142725034663711e-01, /* 0x3FC24924, 0x920083FF */
- -1.11111104054623557880e-01, /* 0xBFBC71C6, 0xFE231671 */
-  9.09088713343650656196e-02, /* 0x3FB745CD, 0xC54C206E */
- -7.69187620504482999495e-02, /* 0xBFB3B0F2, 0xAF749A6D */
-  6.66107313738753120669e-02, /* 0x3FB10D66, 0xA0D03D51 */
- -5.83357013379057348645e-02, /* 0xBFADDE2D, 0x52DEFD9A */
-  4.97687799461593236017e-02, /* 0x3FA97B4B, 0x24760DEB */
- -3.65315727442169155270e-02, /* 0xBFA2B444, 0x2C6A6C2F */
-  1.62858201153657823623e-02, /* 0x3F90AD3A, 0xE322DA11 */
-};
-
-	static const double
-one   = 1.0,
-huge   = 1.0e300;
-
-double
-atan(double x)
-{
-	double w,s1,s2,z;
-	int32_t ix,hx,id;
-
-	GET_HIGH_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix>=0x44100000) {	/* if |x| >= 2^66 */
-	    u_int32_t low;
-	    GET_LOW_WORD(low,x);
-	    if(ix>0x7ff00000||
-		(ix==0x7ff00000&&(low!=0)))
-		return x+x;		/* NaN */
-	    if(hx>0) return  atanhi[3]+atanlo[3];
-	    else     return -atanhi[3]-atanlo[3];
-	} if (ix < 0x3fdc0000) {	/* |x| < 0.4375 */
-	    if (ix < 0x3e200000) {	/* |x| < 2^-29 */
-		if(huge+x>one) return x;	/* raise inexact */
-	    }
-	    id = -1;
-	} else {
-	x = fabs(x);
-	if (ix < 0x3ff30000) {		/* |x| < 1.1875 */
-	    if (ix < 0x3fe60000) {	/* 7/16 <=|x|<11/16 */
-		id = 0; x = (2.0*x-one)/(2.0+x);
-	    } else {			/* 11/16<=|x|< 19/16 */
-		id = 1; x  = (x-one)/(x+one);
-	    }
-	} else {
-	    if (ix < 0x40038000) {	/* |x| < 2.4375 */
-		id = 2; x  = (x-1.5)/(one+1.5*x);
-	    } else {			/* 2.4375 <= |x| < 2^66 */
-		id = 3; x  = -1.0/x;
-	    }
-	}}
-    /* end of argument reduction */
-	z = x*x;
-	w = z*z;
-    /* break sum from i=0 to 10 aT[i]z**(i+1) into odd and even poly */
-	s1 = z*(aT[0]+w*(aT[2]+w*(aT[4]+w*(aT[6]+w*(aT[8]+w*aT[10])))));
-	s2 = w*(aT[1]+w*(aT[3]+w*(aT[5]+w*(aT[7]+w*aT[9]))));
-	if (id<0) return x - x*(s1+s2);
-	else {
-	    z = atanhi[id] - ((x*(s1+s2) - atanlo[id]) - x);
-	    return (hx<0)? -z:z;
-	}
-}
diff --git a/lib/libm/src/s_atanf.c b/lib/libm/src/s_atanf.c
deleted file mode 100644
index 5874ed1c4..000000000
--- a/lib/libm/src/s_atanf.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* s_atanf.c -- float version of s_atan.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_atanf.c,v 1.7 2002/05/26 22:01:54 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float atanhi[] = {
-  4.6364760399e-01, /* atan(0.5)hi 0x3eed6338 */
-  7.8539812565e-01, /* atan(1.0)hi 0x3f490fda */
-  9.8279368877e-01, /* atan(1.5)hi 0x3f7b985e */
-  1.5707962513e+00, /* atan(inf)hi 0x3fc90fda */
-};
-
-static const float atanlo[] = {
-  5.0121582440e-09, /* atan(0.5)lo 0x31ac3769 */
-  3.7748947079e-08, /* atan(1.0)lo 0x33222168 */
-  3.4473217170e-08, /* atan(1.5)lo 0x33140fb4 */
-  7.5497894159e-08, /* atan(inf)lo 0x33a22168 */
-};
-
-static const float aT[] = {
-  3.3333334327e-01, /* 0x3eaaaaaa */
- -2.0000000298e-01, /* 0xbe4ccccd */
-  1.4285714924e-01, /* 0x3e124925 */
- -1.1111110449e-01, /* 0xbde38e38 */
-  9.0908870101e-02, /* 0x3dba2e6e */
- -7.6918758452e-02, /* 0xbd9d8795 */
-  6.6610731184e-02, /* 0x3d886b35 */
- -5.8335702866e-02, /* 0xbd6ef16b */
-  4.9768779427e-02, /* 0x3d4bda59 */
- -3.6531571299e-02, /* 0xbd15a221 */
-  1.6285819933e-02, /* 0x3c8569d7 */
-};
-
-static const float
-one   = 1.0,
-huge   = 1.0e30;
-
-float
-atanf(float x)
-{
-	float w,s1,s2,z;
-	int32_t ix,hx,id;
-
-	GET_FLOAT_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix>=0x50800000) {	/* if |x| >= 2^34 */
-	    if(ix>0x7f800000)
-		return x+x;		/* NaN */
-	    if(hx>0) return  atanhi[3]+atanlo[3];
-	    else     return -atanhi[3]-atanlo[3];
-	} if (ix < 0x3ee00000) {	/* |x| < 0.4375 */
-	    if (ix < 0x31000000) {	/* |x| < 2^-29 */
-		if(huge+x>one) return x;	/* raise inexact */
-	    }
-	    id = -1;
-	} else {
-	x = fabsf(x);
-	if (ix < 0x3f980000) {		/* |x| < 1.1875 */
-	    if (ix < 0x3f300000) {	/* 7/16 <=|x|<11/16 */
-		id = 0; x = ((float)2.0*x-one)/((float)2.0+x);
-	    } else {			/* 11/16<=|x|< 19/16 */
-		id = 1; x  = (x-one)/(x+one);
-	    }
-	} else {
-	    if (ix < 0x401c0000) {	/* |x| < 2.4375 */
-		id = 2; x  = (x-(float)1.5)/(one+(float)1.5*x);
-	    } else {			/* 2.4375 <= |x| < 2^66 */
-		id = 3; x  = -(float)1.0/x;
-	    }
-	}}
-    /* end of argument reduction */
-	z = x*x;
-	w = z*z;
-    /* break sum from i=0 to 10 aT[i]z**(i+1) into odd and even poly */
-	s1 = z*(aT[0]+w*(aT[2]+w*(aT[4]+w*(aT[6]+w*(aT[8]+w*aT[10])))));
-	s2 = w*(aT[1]+w*(aT[3]+w*(aT[5]+w*(aT[7]+w*aT[9]))));
-	if (id<0) return x - x*(s1+s2);
-	else {
-	    z = atanhi[id] - ((x*(s1+s2) - atanlo[id]) - x);
-	    return (hx<0)? -z:z;
-	}
-}
diff --git a/lib/libm/src/s_cbrt.c b/lib/libm/src/s_cbrt.c
deleted file mode 100644
index 49854b73b..000000000
--- a/lib/libm/src/s_cbrt.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* @(#)s_cbrt.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_cbrt.c,v 1.13 2013/11/20 12:29:13 joerg Exp $");
-#endif
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(_cbrtl, cbrt)
-__weak_alias(cbrtl, _cbrtl)
-#endif
-
-/* cbrt(x)
- * Return cube root of x
- */
-static const u_int32_t
-	B1 = 715094163, /* B1 = (682-0.03306235651)*2**20 */
-	B2 = 696219795; /* B2 = (664-0.03306235651)*2**20 */
-
-static const double
-C =  5.42857142857142815906e-01, /* 19/35     = 0x3FE15F15, 0xF15F15F1 */
-D = -7.05306122448979611050e-01, /* -864/1225 = 0xBFE691DE, 0x2532C834 */
-E =  1.41428571428571436819e+00, /* 99/70     = 0x3FF6A0EA, 0x0EA0EA0F */
-F =  1.60714285714285720630e+00, /* 45/28     = 0x3FF9B6DB, 0x6DB6DB6E */
-G =  3.57142857142857150787e-01; /* 5/14      = 0x3FD6DB6D, 0xB6DB6DB7 */
-
-double
-cbrt(double x)
-{
-	int32_t	hx;
-	double r,s,t=0.0,w;
-	u_int32_t sign;
-	u_int32_t high,low;
-
-	GET_HIGH_WORD(hx,x);
-	sign=hx&0x80000000; 		/* sign= sign(x) */
-	hx  ^=sign;
-	if(hx>=0x7ff00000) return(x+x); /* cbrt(NaN,INF) is itself */
-	GET_LOW_WORD(low,x);
-	if((hx|low)==0)
-	    return(x);		/* cbrt(0) is itself */
-
-	SET_HIGH_WORD(x,hx);	/* x <- |x| */
-    /* rough cbrt to 5 bits */
-	if(hx<0x00100000) 		/* subnormal number */
-	  {SET_HIGH_WORD(t,0x43500000);	/* set t= 2**54 */
-	   t*=x; GET_HIGH_WORD(high,t); SET_HIGH_WORD(t,high/3+B2);
-	  }
-	else
-	  SET_HIGH_WORD(t,hx/3+B1);
-
-
-    /* new cbrt to 23 bits, may be implemented in single precision */
-	r=t*t/x;
-	s=C+r*t;
-	t*=G+F/(s+E+D/s);
-
-    /* chopped to 20 bits and make it larger than cbrt(x) */
-	GET_HIGH_WORD(high,t);
-	INSERT_WORDS(t,high+0x00000001,0);
-
-
-    /* one step newton iteration to 53 bits with error less than 0.667 ulps */
-	s=t*t;		/* t*t is exact */
-	r=x/s;
-	w=t+t;
-	r=(r-t)/(w+r);	/* r-s is exact */
-	t=t+t*r;
-
-    /* retore the sign bit */
-	GET_HIGH_WORD(high,t);
-	SET_HIGH_WORD(t,high|sign);
-	return(t);
-}
diff --git a/lib/libm/src/s_cbrtf.c b/lib/libm/src/s_cbrtf.c
deleted file mode 100644
index 83acbde3b..000000000
--- a/lib/libm/src/s_cbrtf.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* s_cbrtf.c -- float version of s_cbrt.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_cbrtf.c,v 1.7 2002/05/26 22:01:54 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-/* cbrtf(x)
- * Return cube root of x
- */
-static const unsigned
-	B1 = 709958130, /* B1 = (84+2/3-0.03306235651)*2**23 */
-	B2 = 642849266; /* B2 = (76+2/3-0.03306235651)*2**23 */
-
-static const float
-C =  5.4285717010e-01, /* 19/35     = 0x3f0af8b0 */
-D = -7.0530611277e-01, /* -864/1225 = 0xbf348ef1 */
-E =  1.4142856598e+00, /* 99/70     = 0x3fb50750 */
-F =  1.6071428061e+00, /* 45/28     = 0x3fcdb6db */
-G =  3.5714286566e-01; /* 5/14      = 0x3eb6db6e */
-
-float
-cbrtf(float x)
-{
-	float r,s,t;
-	int32_t hx;
-	u_int32_t sign;
-	u_int32_t high;
-
-	GET_FLOAT_WORD(hx,x);
-	sign=hx&0x80000000; 		/* sign= sign(x) */
-	hx  ^=sign;
-	if(hx>=0x7f800000) return(x+x); /* cbrt(NaN,INF) is itself */
-	if(hx==0)
-	    return(x);		/* cbrt(0) is itself */
-
-	SET_FLOAT_WORD(x,hx);	/* x <- |x| */
-    /* rough cbrt to 5 bits */
-	if(hx<0x00800000) 		/* subnormal number */
-	  {SET_FLOAT_WORD(t,0x4b800000); /* set t= 2**24 */
-	   t*=x; GET_FLOAT_WORD(high,t); SET_FLOAT_WORD(t,high/3+B2);
-	  }
-	else
-	  SET_FLOAT_WORD(t,hx/3+B1);
-
-
-    /* new cbrt to 23 bits */
-	r=t*t/x;
-	s=C+r*t;
-	t*=G+F/(s+E+D/s);
-
-    /* retore the sign bit */
-	GET_FLOAT_WORD(high,t);
-	SET_FLOAT_WORD(t,high|sign);
-	return(t);
-}
diff --git a/lib/libm/src/s_cbrtl.c b/lib/libm/src/s_cbrtl.c
deleted file mode 100644
index ea68a777f..000000000
--- a/lib/libm/src/s_cbrtl.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*-
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- * Copyright (c) 2009-2011, Bruce D. Evans, Steven G. Kargl, David Schultz.
- *
- * 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.
- * ====================================================
- *
- * The argument reduction and testing for exceptional cases was
- * written by Steven G. Kargl with input from Bruce D. Evans
- * and David A. Schultz.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_cbrtl.c,v 1.1 2013/11/19 19:24:34 joerg Exp $");
-#if 0
-__FBSDID("$FreeBSD: head/lib/msun/src/s_cbrtl.c 238924 2012-07-30 21:58:28Z kargl $");
-#endif
-
-#include "namespace.h"
-#include <machine/ieee.h>
-#include <float.h>
-
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __HAVE_LONG_DOUBLE
-__weak_alias(cbrtl, _cbrtl)
-
-static const unsigned
-    B1 = 709958130;	/* B1 = (127-127.0/3-0.03306235651)*2**23 */
-
-long double
-cbrtl(long double x)
-{
-	union ieee_ext_u ux, vx;
-	long double r, s, t, w;
-	double dr, dt, dx;
-	float ft, fx;
-	uint32_t hx;
-	int k;
-
-	ux.extu_ld = x;
-
-
-	/*
-	 * If x = +-Inf, then cbrt(x) = +-Inf.
-	 * If x = NaN, then cbrt(x) = NaN.
-	 */
-	if (ux.extu_exp == EXT_EXP_INFNAN)
-		return (x + x);
-	if ((ux.extu_frach | ux.extu_fracl | ux.extu_exp) == 0)
-		return (x);
-
-	vx.extu_ld = 1;
-	vx.extu_ext.ext_sign = ux.extu_ext.ext_sign;
-	ux.extu_ext.ext_sign = 0;
-	if (ux.extu_exp == 0) {
-		/* Adjust subnormal numbers. */
-		ux.extu_ld *= 0x1.0p514;
-		k = ux.extu_exp - EXT_EXP_BIAS - 514;
-	} else {
-		k = ux.extu_exp - EXT_EXP_BIAS;
-	}
-
-	ux.extu_exp = EXT_EXP_BIAS;
-	x = ux.extu_ld;
-	switch (k % 3) {
-	case 1:
-	case -2:
-		x = 2*x;
-		k--;
-		break;
-	case 2:
-	case -1:
-		x = 4*x;
-		k -= 2;
-		break;
-	}
-	vx.extu_exp = EXT_EXP_BIAS + k / 3;
-
-	/*
-	 * The following is the guts of s_cbrtf, with the handling of
-	 * special values removed and extra care for accuracy not taken,
-	 * but with most of the extra accuracy not discarded.
-	 */
-
-	/* ~5-bit estimate: */
-	fx = x;
-	GET_FLOAT_WORD(hx, fx);
-	SET_FLOAT_WORD(ft, ((hx & 0x7fffffff) / 3 + B1));
-
-	/* ~16-bit estimate: */
-	dx = x;
-	dt = ft;
-	dr = dt * dt * dt;
-	dt = dt * (dx + dx + dr) / (dx + dr + dr);
-
-	/* ~47-bit estimate: */
-	dr = dt * dt * dt;
-	dt = dt * (dx + dx + dr) / (dx + dr + dr);
-
-#if LDBL_MANT_DIG == 64
-	/*
-	 * dt is cbrtl(x) to ~47 bits (after x has been reduced to 1 <= x < 8).
-	 * Round it away from zero to 32 bits (32 so that t*t is exact, and
-	 * away from zero for technical reasons).
-	 */
-	volatile double vd2 = 0x1.0p32;
-	volatile double vd1 = 0x1.0p-31;
-	#define vd ((long double)vd2 + vd1)
-
-	t = dt + vd - 0x1.0p32;
-#elif LDBL_MANT_DIG == 113
-	/*
-	 * Round dt away from zero to 47 bits.  Since we don't trust the 47,
-	 * add 2 47-bit ulps instead of 1 to round up.  Rounding is slow and
-	 * might be avoidable in this case, since on most machines dt will
-	 * have been evaluated in 53-bit precision and the technical reasons
-	 * for rounding up might not apply to either case in cbrtl() since
-	 * dt is much more accurate than needed.
-	 */
-	t = dt + 0x2.0p-46 + 0x1.0p60L - 0x1.0p60;
-#else
-#error "Unsupported long double format"
-#endif
-
-	/*
-     	 * Final step Newton iteration to 64 or 113 bits with
-	 * error < 0.667 ulps
-	 */
-	s=t*t;				/* t*t is exact */
-	r=x/s;				/* error <= 0.5 ulps; |r| < |t| */
-	w=t+t;				/* t+t is exact */
-	r=(r-t)/(w+r);			/* r-t is exact; w+r ~= 3*t */
-	t=t+t*r;			/* error <= 0.5 + 0.5/3 + epsilon */
-
-	t *= vx.extu_ld;
-	return t;
-}
-
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libm/src/s_ceil.c b/lib/libm/src/s_ceil.c
deleted file mode 100644
index 6057d54dd..000000000
--- a/lib/libm/src/s_ceil.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* @(#)s_ceil.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_ceil.c,v 1.14 2013/11/11 23:57:34 joerg Exp $");
-#endif
-
-/*
- * ceil(x)
- * Return x rounded toward -inf to integral value
- * Method:
- *	Bit twiddling.
- * Exception:
- *	Inexact flag raised if x not equal to ceil(x).
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double huge = 1.0e300;
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(_ceill, ceil)
-__weak_alias(ceill, ceil)
-#endif
-
-double
-ceil(double x)
-{
-	int32_t i0,i1,jj0;
-	u_int32_t i,j;
-	EXTRACT_WORDS(i0,i1,x);
-	jj0 = ((i0>>20)&0x7ff)-0x3ff;
-	if(jj0<20) {
-	    if(jj0<0) { 	/* raise inexact if x != 0 */
-		if(huge+x>0.0) {/* return 0*sign(x) if |x|<1 */
-		    if(i0<0) {i0=0x80000000;i1=0;}
-		    else if((i0|i1)!=0) { i0=0x3ff00000;i1=0;}
-		}
-	    } else {
-		i = (0x000fffff)>>jj0;
-		if(((i0&i)|i1)==0) return x; /* x is integral */
-		if(huge+x>0.0) {	/* raise inexact flag */
-		    if(i0>0) i0 += (0x00100000)>>jj0;
-		    i0 &= (~i); i1=0;
-		}
-	    }
-	} else if (jj0>51) {
-	    if(jj0==0x400) return x+x;	/* inf or NaN */
-	    else return x;		/* x is integral */
-	} else {
-	    i = ((u_int32_t)(0xffffffff))>>(jj0-20);
-	    if((i1&i)==0) return x;	/* x is integral */
-	    if(huge+x>0.0) { 		/* raise inexact flag */
-		if(i0>0) {
-		    if(jj0==20) i0+=1;
-		    else {
-			j = i1 + (1<<(52-jj0));
-			if(j<(u_int32_t)i1) i0+=1;	/* got a carry */
-			i1 = j;
-		    }
-		}
-		i1 &= (~i);
-	    }
-	}
-	INSERT_WORDS(x,i0,i1);
-	return x;
-}
diff --git a/lib/libm/src/s_ceilf.c b/lib/libm/src/s_ceilf.c
deleted file mode 100644
index 81cf80ea5..000000000
--- a/lib/libm/src/s_ceilf.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* s_ceilf.c -- float version of s_ceil.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_ceilf.c,v 1.8 2008/04/25 22:21:53 christos Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float huge = 1.0e30;
-
-float
-ceilf(float x)
-{
-	int32_t i0,jj0;
-	u_int32_t i;
-
-	GET_FLOAT_WORD(i0,x);
-	jj0 = ((i0>>23)&0xff)-0x7f;
-	if(jj0<23) {
-	    if(jj0<0) { 	/* raise inexact if x != 0 */
-		if(huge+x>(float)0.0) {/* return 0*sign(x) if |x|<1 */
-		    if(i0<0) {i0=0x80000000;}
-		    else if(i0!=0) { i0=0x3f800000;}
-		}
-	    } else {
-		i = (0x007fffff)>>jj0;
-		if((i0&i)==0) return x; /* x is integral */
-		if(huge+x>(float)0.0) {	/* raise inexact flag */
-		    if(i0>0) i0 += (0x00800000)>>jj0;
-		    i0 &= (~i);
-		}
-	    }
-	} else {
-	    if(jj0==0x80) return x+x;	/* inf or NaN */
-	    else return x;		/* x is integral */
-	}
-	SET_FLOAT_WORD(x,i0);
-	return x;
-}
diff --git a/lib/libm/src/s_ceill.c b/lib/libm/src/s_ceill.c
deleted file mode 100644
index 2c343c3dc..000000000
--- a/lib/libm/src/s_ceill.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * ====================================================
- * 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.
- * ====================================================
- *
- * From: @(#)s_ceil.c 5.1 93/09/24
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_ceill.c,v 1.1 2013/11/11 23:57:34 joerg Exp $");
-#if 0
-__FBSDID("$FreeBSD: head/lib/msun/src/s_ceill.c 176280 2008-02-14 15:10:34Z bde $");
-#endif
-
-/*
- * ceill(x)
- * Return x rounded toward -inf to integral value
- * Method:
- *	Bit twiddling.
- * Exception:
- *	Inexact flag raised if x not equal to ceill(x).
- */
-#include "namespace.h"
-
-#include <float.h>
-#include <math.h>
-#include <stdint.h>
-#include <machine/ieee.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-
-#ifdef __weak_alias
-__weak_alias(ceill, _ceill)
-#endif
-
-#ifdef LDBL_IMPLICIT_NBIT
-#define	MANH_SIZE	(EXT_FRACHBITS + 1)
-#define	INC_MANH(ux, c)	do {					\
-	uint64_t oi = ux.extu_frach;				\
-	ux.extu_frach += (c);					\
-	if (ux.extu_frach < oi)					\
-		ux.extu_exp++;					\
-} while (0)
-#else
-#define	MANH_SIZE	EXT_FRACHBITS
-#define	INC_MANH(ux, c)	do {					\
-	uint64_t oi = ux.extu_frach;				\
-	ux.extu_frach += (c);					\
-	if (ux.extu_frach < oi) {				\
-		ux.extu_exp++;					\
-		ux.extu_frach |= 1llu << (EXT_FRACHBITS - 1);	\
-	}							\
-} while (0)
-#endif
-
-static const long double huge = 1.0e300;
-
-long double
-ceill(long double x)
-{
-	union ieee_ext_u ux = { .extu_ld = x, };
-	int e = ux.extu_exp - LDBL_MAX_EXP + 1;
-
-	if (e < MANH_SIZE - 1) {
-		if (e < 0) {			/* raise inexact if x != 0 */
-			if (huge + x > 0.0)
-				if (ux.extu_exp > 0 ||
-				    (ux.extu_frach | ux.extu_fracl) != 0)
-					ux.extu_ld = ux.extu_sign ? -0.0 : 1.0;
-		} else {
-			uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1);
-			if (((ux.extu_frach & m) | ux.extu_fracl) == 0)
-				return (x);	/* x is integral */
-			if (!ux.extu_sign) {
-#ifdef LDBL_IMPLICIT_NBIT
-				if (e == 0)
-					ux.extu_exp++;
-				else
-#endif
-				INC_MANH(ux, 1llu << (MANH_SIZE - e - 1));
-			}
-			if (huge + x > 0.0) {	/* raise inexact flag */
-				ux.extu_frach &= ~m;
-				ux.extu_fracl = 0;
-			}
-		}
-	} else if (e < LDBL_MANT_DIG - 1) {
-		uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1);
-		if ((ux.extu_fracl & m) == 0)
-			return (x);	/* x is integral */
-		if (!ux.extu_sign) {
-			if (e == MANH_SIZE - 1)
-				INC_MANH(ux, 1);
-			else {
-				uint64_t o = ux.extu_fracl;
-				ux.extu_fracl += 1llu << (LDBL_MANT_DIG - e - 1);
-				if (ux.extu_fracl < o)	/* got a carry */
-					INC_MANH(ux, 1);
-			}
-		}
-		if (huge + x > 0.0)		/* raise inexact flag */
-			ux.extu_fracl &= ~m;
-	}
-	return (ux.extu_ld);
-}
-
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libm/src/s_copysign.c b/lib/libm/src/s_copysign.c
deleted file mode 100644
index d8d3ec82e..000000000
--- a/lib/libm/src/s_copysign.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* @(#)s_copysign.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_copysign.c,v 1.13 2015/05/14 19:26:12 joerg Exp $");
-#endif
-
-/*
- * copysign(double x, double y)
- * copysign(x,y) returns a value with the magnitude of x and
- * with the sign bit of y.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-#if !defined(__HAVE_LONG_DOUBLE) && !defined(__HAVE_IBM_LONGDOUBLE)
-__strong_alias(_copysignl, copysign)
-__weak_alias(copysignl, copysign)
-#endif
-
-double
-copysign(double x, double y)
-{
-	u_int32_t hx,hy;
-	GET_HIGH_WORD(hx,x);
-	GET_HIGH_WORD(hy,y);
-	SET_HIGH_WORD(x,(hx&0x7fffffff)|(hy&0x80000000));
-        return x;
-}
diff --git a/lib/libm/src/s_copysignf.c b/lib/libm/src/s_copysignf.c
deleted file mode 100644
index f7e1b596c..000000000
--- a/lib/libm/src/s_copysignf.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* s_copysignf.c -- float version of s_copysign.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_copysignf.c,v 1.7 2002/05/26 22:01:54 wiz Exp $");
-#endif
-
-/*
- * copysignf(float x, float y)
- * copysignf(x,y) returns a value with the magnitude of x and
- * with the sign bit of y.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-float
-copysignf(float x, float y)
-{
-	u_int32_t ix,iy;
-	GET_FLOAT_WORD(ix,x);
-	GET_FLOAT_WORD(iy,y);
-	SET_FLOAT_WORD(x,(ix&0x7fffffff)|(iy&0x80000000));
-        return x;
-}
diff --git a/lib/libm/src/s_copysignl.c b/lib/libm/src/s_copysignl.c
deleted file mode 100644
index 16130317b..000000000
--- a/lib/libm/src/s_copysignl.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: s_copysignl.c,v 1.5 2015/05/14 19:26:12 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_copysignl.c,v 1.5 2015/05/14 19:26:12 joerg Exp $");
-#include "namespace.h"
-
-#include <math.h>
-#include <machine/ieee.h>
-
-#if defined(__HAVE_LONG_DOUBLE) || defined(__HAVE_IBM_LONGDOUBLE)
-
-#ifdef __weak_alias
-__weak_alias(copysignl, _copysignl)
-#endif
-
-/*
- * copysignl(long double x, long double y)
- * This function returns a value with the magnitude of x and the sign of y.
- */
-#ifdef EXT_EXP_INFNAN
-long double
-copysignl(long double x, long double y)
-{
-	union ieee_ext_u ux, uy;
-
-	ux.extu_ld = x;
-	uy.extu_ld = y;
-
-	ux.extu_ext.ext_sign = uy.extu_ext.ext_sign;
-
-	return (ux.extu_ld);
-}
-#elif defined(__HAVE_IBM_LONGDOUBLE)
-long double
-copysignl(long double x, long double y)
-{
-	union ldbl_u ux, uy;
-
-	ux.ldblu_ld = x;
-	uy.ldblu_ld = y;
-	ux.ldblu_d[0] = copysign(ux.ldblu_d[0], uy.ldblu_d[0]);
-	ux.ldblu_d[1] = copysign(ux.ldblu_d[1], uy.ldblu_d[1]);
-
-	return ux.ldblu_ld;
-}
-#endif
-#endif /* __HAVE_LONG_DOUBLE || __HAVE_IBM_LONGDOUBLE */
diff --git a/lib/libm/src/s_cos.c b/lib/libm/src/s_cos.c
deleted file mode 100644
index f1f19db8a..000000000
--- a/lib/libm/src/s_cos.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* @(#)s_cos.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_cos.c,v 1.11 2007/08/20 16:01:39 drochner Exp $");
-#endif
-
-/* cos(x)
- * Return cosine function of x.
- *
- * kernel function:
- *	__kernel_sin		... sine function on [-pi/4,pi/4]
- *	__kernel_cos		... cosine function on [-pi/4,pi/4]
- *	__ieee754_rem_pio2	... argument reduction routine
- *
- * Method.
- *      Let S,C and T denote the sin, cos and tan respectively on
- *	[-PI/4, +PI/4]. Reduce the argument x to y1+y2 = x-k*pi/2
- *	in [-pi/4 , +pi/4], and let n = k mod 4.
- *	We have
- *
- *          n        sin(x)      cos(x)        tan(x)
- *     ----------------------------------------------------------
- *	    0	       S	   C		 T
- *	    1	       C	  -S		-1/T
- *	    2	      -S	  -C		 T
- *	    3	      -C	   S		-1/T
- *     ----------------------------------------------------------
- *
- * Special cases:
- *      Let trig be any of sin, cos, or tan.
- *      trig(+-INF)  is NaN, with signals;
- *      trig(NaN)    is that NaN;
- *
- * Accuracy:
- *	TRIG(x) returns trig(x) nearly rounded
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#if 0 /* notyet */
-#ifdef __weak_alias
-__weak_alias(cos, _cos)
-#endif
-#endif
-
-double
-cos(double x)
-{
-	double y[2],z=0.0;
-	int32_t n, ix;
-
-    /* High word of x. */
-	GET_HIGH_WORD(ix,x);
-
-    /* |x| ~< pi/4 */
-	ix &= 0x7fffffff;
-	if(ix <= 0x3fe921fb) return __kernel_cos(x,z);
-
-    /* cos(Inf or NaN) is NaN */
-	else if (ix>=0x7ff00000) return x-x;
-
-    /* argument reduction needed */
-	else {
-	    n = __ieee754_rem_pio2(x,y);
-	    switch(n&3) {
-		case 0: return  __kernel_cos(y[0],y[1]);
-		case 1: return -__kernel_sin(y[0],y[1],1);
-		case 2: return -__kernel_cos(y[0],y[1]);
-		default:
-		        return  __kernel_sin(y[0],y[1],1);
-	    }
-	}
-}
diff --git a/lib/libm/src/s_cosf.c b/lib/libm/src/s_cosf.c
deleted file mode 100644
index b23623c1c..000000000
--- a/lib/libm/src/s_cosf.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* s_cosf.c -- float version of s_cos.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_cosf.c,v 1.9 2007/08/20 16:01:39 drochner Exp $");
-#endif
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#if 0 /* notyet */
-#ifdef __weak_alias
-__weak_alias(cosf, _cosf)
-#endif
-#endif
-
-#if 0
-static const float one=1.0;
-#endif
-
-float
-cosf(float x)
-{
-	float y[2],z=0.0;
-	int32_t n,ix;
-
-	GET_FLOAT_WORD(ix,x);
-
-    /* |x| ~< pi/4 */
-	ix &= 0x7fffffff;
-	if(ix <= 0x3f490fd8) return __kernel_cosf(x,z);
-
-    /* cos(Inf or NaN) is NaN */
-	else if (ix>=0x7f800000) return x-x;
-
-    /* argument reduction needed */
-	else {
-	    n = __ieee754_rem_pio2f(x,y);
-	    switch(n&3) {
-		case 0: return  __kernel_cosf(y[0],y[1]);
-		case 1: return -__kernel_sinf(y[0],y[1],1);
-		case 2: return -__kernel_cosf(y[0],y[1]);
-		default:
-		        return  __kernel_sinf(y[0],y[1],1);
-	    }
-	}
-}
diff --git a/lib/libm/src/s_erf.c b/lib/libm/src/s_erf.c
deleted file mode 100644
index 87743ea6f..000000000
--- a/lib/libm/src/s_erf.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/* @(#)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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_erf.c,v 1.11 2002/05/26 22:01:55 wiz Exp $");
-#endif
-
-/* double erf(double x)
- * double erfc(double x)
- *			     x
- *		      2      |\
- *     erf(x)  =  ---------  | exp(-t*t)dt
- *	 	   sqrt(pi) \|
- *			     0
- *
- *     erfc(x) =  1-erf(x)
- *  Note that
- *		erf(-x) = -erf(x)
- *		erfc(-x) = 2 - erfc(x)
- *
- * Method:
- *	1. For |x| in [0, 0.84375]
- *	    erf(x)  = x + x*R(x^2)
- *          erfc(x) = 1 - erf(x)           if x in [-.84375,0.25]
- *                  = 0.5 + ((0.5-x)-x*R)  if x in [0.25,0.84375]
- *	   where R = P/Q where P is an odd poly of degree 8 and
- *	   Q is an odd poly of degree 10.
- *						 -57.90
- *			| R - (erf(x)-x)/x | <= 2
- *
- *
- *	   Remark. The formula is derived by noting
- *          erf(x) = (2/sqrt(pi))*(x - x^3/3 + x^5/10 - x^7/42 + ....)
- *	   and that
- *          2/sqrt(pi) = 1.128379167095512573896158903121545171688
- *	   is close to one. The interval is chosen because the fix
- *	   point of erf(x) is near 0.6174 (i.e., erf(x)=x when x is
- *	   near 0.6174), and by some experiment, 0.84375 is chosen to
- * 	   guarantee the error is less than one ulp for erf.
- *
- *      2. For |x| in [0.84375,1.25], let s = |x| - 1, and
- *         c = 0.84506291151 rounded to single (24 bits)
- *         	erf(x)  = sign(x) * (c  + P1(s)/Q1(s))
- *         	erfc(x) = (1-c)  - P1(s)/Q1(s) if x > 0
- *			  1+(c+P1(s)/Q1(s))    if x < 0
- *         	|P1/Q1 - (erf(|x|)-c)| <= 2**-59.06
- *	   Remark: here we use the taylor series expansion at x=1.
- *		erf(1+s) = erf(1) + s*Poly(s)
- *			 = 0.845.. + P1(s)/Q1(s)
- *	   That is, we use rational approximation to approximate
- *			erf(1+s) - (c = (single)0.84506291151)
- *	   Note that |P1/Q1|< 0.078 for x in [0.84375,1.25]
- *	   where
- *		P1(s) = degree 6 poly in s
- *		Q1(s) = degree 6 poly in s
- *
- *      3. For x in [1.25,1/0.35(~2.857143)],
- *         	erfc(x) = (1/x)*exp(-x*x-0.5625+R1/S1)
- *         	erf(x)  = 1 - erfc(x)
- *	   where
- *		R1(z) = degree 7 poly in z, (z=1/x^2)
- *		S1(z) = degree 8 poly in z
- *
- *      4. For x in [1/0.35,28]
- *         	erfc(x) = (1/x)*exp(-x*x-0.5625+R2/S2) if x > 0
- *			= 2.0 - (1/x)*exp(-x*x-0.5625+R2/S2) if -6<x<0
- *			= 2.0 - tiny		(if x <= -6)
- *         	erf(x)  = sign(x)*(1.0 - erfc(x)) if x < 6, else
- *         	erf(x)  = sign(x)*(1.0 - tiny)
- *	   where
- *		R2(z) = degree 6 poly in z, (z=1/x^2)
- *		S2(z) = degree 7 poly in z
- *
- *      Note1:
- *	   To compute exp(-x*x-0.5625+R/S), let s be a single
- *	   precision number and s := x; then
- *		-x*x = -s*s + (s-x)*(s+x)
- *	        exp(-x*x-0.5626+R/S) =
- *			exp(-s*s-0.5625)*exp((s-x)*(s+x)+R/S);
- *      Note2:
- *	   Here 4 and 5 make use of the asymptotic series
- *			  exp(-x*x)
- *		erfc(x) ~ ---------- * ( 1 + Poly(1/x^2) )
- *			  x*sqrt(pi)
- *	   We use rational approximation to approximate
- *      	g(s)=f(1/x^2) = log(erfc(x)*x) - x*x + 0.5625
- *	   Here is the error bound for R1/S1 and R2/S2
- *      	|R1/S1 - f(x)|  < 2**(-62.57)
- *      	|R2/S2 - f(x)|  < 2**(-61.52)
- *
- *      5. For inf > x >= 28
- *         	erf(x)  = sign(x) *(1 - tiny)  (raise inexact)
- *         	erfc(x) = tiny*tiny (raise underflow) if x > 0
- *			= 2 - tiny if x<0
- *
- *      7. Special case:
- *         	erf(0)  = 0, erf(inf)  = 1, erf(-inf) = -1,
- *         	erfc(0) = 1, erfc(inf) = 0, erfc(-inf) = 2,
- *	   	erfc/erf(NaN) is NaN
- */
-
-
-#include "math.h"
-#include "math_private.h"
-
-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 */
-erx =  8.45062911510467529297e-01, /* 0x3FEB0AC1, 0x60000000 */
-/*
- * Coefficients for approximation to  erf on [0,0.84375]
- */
-efx =  1.28379167095512586316e-01, /* 0x3FC06EBA, 0x8214DB69 */
-efx8=  1.02703333676410069053e+00, /* 0x3FF06EBA, 0x8214DB69 */
-pp0  =  1.28379167095512558561e-01, /* 0x3FC06EBA, 0x8214DB68 */
-pp1  = -3.25042107247001499370e-01, /* 0xBFD4CD7D, 0x691CB913 */
-pp2  = -2.84817495755985104766e-02, /* 0xBF9D2A51, 0xDBD7194F */
-pp3  = -5.77027029648944159157e-03, /* 0xBF77A291, 0x236668E4 */
-pp4  = -2.37630166566501626084e-05, /* 0xBEF8EAD6, 0x120016AC */
-qq1  =  3.97917223959155352819e-01, /* 0x3FD97779, 0xCDDADC09 */
-qq2  =  6.50222499887672944485e-02, /* 0x3FB0A54C, 0x5536CEBA */
-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]
- */
-pa0  = -2.36211856075265944077e-03, /* 0xBF6359B8, 0xBEF77538 */
-pa1  =  4.14856118683748331666e-01, /* 0x3FDA8D00, 0xAD92B34D */
-pa2  = -3.72207876035701323847e-01, /* 0xBFD7D240, 0xFBB8C3F1 */
-pa3  =  3.18346619901161753674e-01, /* 0x3FD45FCA, 0x805120E4 */
-pa4  = -1.10894694282396677476e-01, /* 0xBFBC6398, 0x3D3E28EC */
-pa5  =  3.54783043256182359371e-02, /* 0x3FA22A36, 0x599795EB */
-pa6  = -2.16637559486879084300e-03, /* 0xBF61BF38, 0x0A96073F */
-qa1  =  1.06420880400844228286e-01, /* 0x3FBB3E66, 0x18EEE323 */
-qa2  =  5.40397917702171048937e-01, /* 0x3FE14AF0, 0x92EB6F33 */
-qa3  =  7.18286544141962662868e-02, /* 0x3FB2635C, 0xD99FE9A7 */
-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]
- */
-ra0  = -9.86494403484714822705e-03, /* 0xBF843412, 0x600D6435 */
-ra1  = -6.93858572707181764372e-01, /* 0xBFE63416, 0xE4BA7360 */
-ra2  = -1.05586262253232909814e+01, /* 0xC0251E04, 0x41B0E726 */
-ra3  = -6.23753324503260060396e+01, /* 0xC04F300A, 0xE4CBA38D */
-ra4  = -1.62396669462573470355e+02, /* 0xC0644CB1, 0x84282266 */
-ra5  = -1.84605092906711035994e+02, /* 0xC067135C, 0xEBCCABB2 */
-ra6  = -8.12874355063065934246e+01, /* 0xC0545265, 0x57E4D2F2 */
-ra7  = -9.81432934416914548592e+00, /* 0xC023A0EF, 0xC69AC25C */
-sa1  =  1.96512716674392571292e+01, /* 0x4033A6B9, 0xBD707687 */
-sa2  =  1.37657754143519042600e+02, /* 0x4061350C, 0x526AE721 */
-sa3  =  4.34565877475229228821e+02, /* 0x407B290D, 0xD58A1A71 */
-sa4  =  6.45387271733267880336e+02, /* 0x40842B19, 0x21EC2868 */
-sa5  =  4.29008140027567833386e+02, /* 0x407AD021, 0x57700314 */
-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]
- */
-rb0  = -9.86494292470009928597e-03, /* 0xBF843412, 0x39E86F4A */
-rb1  = -7.99283237680523006574e-01, /* 0xBFE993BA, 0x70C285DE */
-rb2  = -1.77579549177547519889e+01, /* 0xC031C209, 0x555F995A */
-rb3  = -1.60636384855821916062e+02, /* 0xC064145D, 0x43C5ED98 */
-rb4  = -6.37566443368389627722e+02, /* 0xC083EC88, 0x1375F228 */
-rb5  = -1.02509513161107724954e+03, /* 0xC0900461, 0x6A2E5992 */
-rb6  = -4.83519191608651397019e+02, /* 0xC07E384E, 0x9BDC383F */
-sb1  =  3.03380607434824582924e+01, /* 0x403E568B, 0x261D5190 */
-sb2  =  3.25792512996573918826e+02, /* 0x40745CAE, 0x221B9F0A */
-sb3  =  1.53672958608443695994e+03, /* 0x409802EB, 0x189D5118 */
-sb4  =  3.19985821950859553908e+03, /* 0x40A8FFB7, 0x688C246A */
-sb5  =  2.55305040643316442583e+03, /* 0x40A3F219, 0xCEDF3BE6 */
-sb6  =  4.74528541206955367215e+02, /* 0x407DA874, 0xE79FE763 */
-sb7  = -2.24409524465858183362e+01; /* 0xC03670E2, 0x42712D62 */
-
-double
-erf(double x)
-{
-	int32_t hx,ix,i;
-	double R,S,P,Q,s,y,z,r;
-	GET_HIGH_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7ff00000) {		/* erf(nan)=nan */
-	    i = ((u_int32_t)hx>>31)<<1;
-	    return (double)(1-i)+one/x;	/* erf(+-inf)=+-1 */
-	}
-
-	if(ix < 0x3feb0000) {		/* |x|<0.84375 */
-	    if(ix < 0x3e300000) { 	/* |x|<2**-28 */
-	        if (ix < 0x00800000)
-		    return 0.125*(8.0*x+efx8*x);  /*avoid underflow */
-		return x + efx*x;
-	    }
-	    z = x*x;
-	    r = pp0+z*(pp1+z*(pp2+z*(pp3+z*pp4)));
-	    s = one+z*(qq1+z*(qq2+z*(qq3+z*(qq4+z*qq5))));
-	    y = r/s;
-	    return x + x*y;
-	}
-	if(ix < 0x3ff40000) {		/* 0.84375 <= |x| < 1.25 */
-	    s = fabs(x)-one;
-	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*pa6)))));
-	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*qa6)))));
-	    if(hx>=0) return erx + P/Q; else return -erx - P/Q;
-	}
-	if (ix >= 0x40180000) {		/* inf>|x|>=6 */
-	    if(hx>=0) return one-tiny; else return tiny-one;
-	}
-	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)))))));
-	} 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))))));
-	}
-	z  = x;
-	SET_LOW_WORD(z,0);
-	r  =  __ieee754_exp(-z*z-0.5625)*__ieee754_exp((z-x)*(z+x)+R/S);
-	if(hx>=0) return one-r/x; else return  r/x-one;
-}
-
-double
-erfc(double x)
-{
-	int32_t hx,ix;
-	double R,S,P,Q,s,y,z,r;
-	GET_HIGH_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7ff00000) {			/* erfc(nan)=nan */
-						/* erfc(+-inf)=0,2 */
-	    return (double)(((u_int32_t)hx>>31)<<1)+one/x;
-	}
-
-	if(ix < 0x3feb0000) {		/* |x|<0.84375 */
-	    if(ix < 0x3c700000)  	/* |x|<2**-56 */
-		return one-x;
-	    z = x*x;
-	    r = pp0+z*(pp1+z*(pp2+z*(pp3+z*pp4)));
-	    s = one+z*(qq1+z*(qq2+z*(qq3+z*(qq4+z*qq5))));
-	    y = r/s;
-	    if(hx < 0x3fd00000) {  	/* x<1/4 */
-		return one-(x+x*y);
-	    } else {
-		r = x*y;
-		r += (x-half);
-	        return half - r ;
-	    }
-	}
-	if(ix < 0x3ff40000) {		/* 0.84375 <= |x| < 1.25 */
-	    s = fabs(x)-one;
-	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*pa6)))));
-	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*qa6)))));
-	    if(hx>=0) {
-	        z  = one-erx; return z - P/Q;
-	    } else {
-		z = erx+P/Q; return one+z;
-	    }
-	}
-	if (ix < 0x403c0000) {		/* |x|<28 */
-	    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)))))));
-	    } 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))))));
-	    }
-	    z  = x;
-	    SET_LOW_WORD(z,0);
-	    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;
-	}
-}
diff --git a/lib/libm/src/s_erff.c b/lib/libm/src/s_erff.c
deleted file mode 100644
index b20393134..000000000
--- a/lib/libm/src/s_erff.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* s_erff.c -- float version of s_erf.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_erff.c,v 1.7 2002/05/26 22:01:55 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-tiny	    = 1e-30,
-half=  5.0000000000e-01, /* 0x3F000000 */
-one =  1.0000000000e+00, /* 0x3F800000 */
-two =  2.0000000000e+00, /* 0x40000000 */
-	/* c = (subfloat)0.84506291151 */
-erx =  8.4506291151e-01, /* 0x3f58560b */
-/*
- * Coefficients for approximation to  erf on [0,0.84375]
- */
-efx =  1.2837916613e-01, /* 0x3e0375d4 */
-efx8=  1.0270333290e+00, /* 0x3f8375d4 */
-pp0  =  1.2837916613e-01, /* 0x3e0375d4 */
-pp1  = -3.2504209876e-01, /* 0xbea66beb */
-pp2  = -2.8481749818e-02, /* 0xbce9528f */
-pp3  = -5.7702702470e-03, /* 0xbbbd1489 */
-pp4  = -2.3763017452e-05, /* 0xb7c756b1 */
-qq1  =  3.9791721106e-01, /* 0x3ecbbbce */
-qq2  =  6.5022252500e-02, /* 0x3d852a63 */
-qq3  =  5.0813062117e-03, /* 0x3ba68116 */
-qq4  =  1.3249473704e-04, /* 0x390aee49 */
-qq5  = -3.9602282413e-06, /* 0xb684e21a */
-/*
- * Coefficients for approximation to  erf  in [0.84375,1.25]
- */
-pa0  = -2.3621185683e-03, /* 0xbb1acdc6 */
-pa1  =  4.1485610604e-01, /* 0x3ed46805 */
-pa2  = -3.7220788002e-01, /* 0xbebe9208 */
-pa3  =  3.1834661961e-01, /* 0x3ea2fe54 */
-pa4  = -1.1089469492e-01, /* 0xbde31cc2 */
-pa5  =  3.5478305072e-02, /* 0x3d1151b3 */
-pa6  = -2.1663755178e-03, /* 0xbb0df9c0 */
-qa1  =  1.0642088205e-01, /* 0x3dd9f331 */
-qa2  =  5.4039794207e-01, /* 0x3f0a5785 */
-qa3  =  7.1828655899e-02, /* 0x3d931ae7 */
-qa4  =  1.2617121637e-01, /* 0x3e013307 */
-qa5  =  1.3637083583e-02, /* 0x3c5f6e13 */
-qa6  =  1.1984500103e-02, /* 0x3c445aa3 */
-/*
- * Coefficients for approximation to  erfc in [1.25,1/0.35]
- */
-ra0  = -9.8649440333e-03, /* 0xbc21a093 */
-ra1  = -6.9385856390e-01, /* 0xbf31a0b7 */
-ra2  = -1.0558626175e+01, /* 0xc128f022 */
-ra3  = -6.2375331879e+01, /* 0xc2798057 */
-ra4  = -1.6239666748e+02, /* 0xc322658c */
-ra5  = -1.8460508728e+02, /* 0xc3389ae7 */
-ra6  = -8.1287437439e+01, /* 0xc2a2932b */
-ra7  = -9.8143291473e+00, /* 0xc11d077e */
-sa1  =  1.9651271820e+01, /* 0x419d35ce */
-sa2  =  1.3765776062e+02, /* 0x4309a863 */
-sa3  =  4.3456588745e+02, /* 0x43d9486f */
-sa4  =  6.4538726807e+02, /* 0x442158c9 */
-sa5  =  4.2900814819e+02, /* 0x43d6810b */
-sa6  =  1.0863500214e+02, /* 0x42d9451f */
-sa7  =  6.5702495575e+00, /* 0x40d23f7c */
-sa8  = -6.0424413532e-02, /* 0xbd777f97 */
-/*
- * Coefficients for approximation to  erfc in [1/.35,28]
- */
-rb0  = -9.8649431020e-03, /* 0xbc21a092 */
-rb1  = -7.9928326607e-01, /* 0xbf4c9dd4 */
-rb2  = -1.7757955551e+01, /* 0xc18e104b */
-rb3  = -1.6063638306e+02, /* 0xc320a2ea */
-rb4  = -6.3756646729e+02, /* 0xc41f6441 */
-rb5  = -1.0250950928e+03, /* 0xc480230b */
-rb6  = -4.8351919556e+02, /* 0xc3f1c275 */
-sb1  =  3.0338060379e+01, /* 0x41f2b459 */
-sb2  =  3.2579251099e+02, /* 0x43a2e571 */
-sb3  =  1.5367296143e+03, /* 0x44c01759 */
-sb4  =  3.1998581543e+03, /* 0x4547fdbb */
-sb5  =  2.5530502930e+03, /* 0x451f90ce */
-sb6  =  4.7452853394e+02, /* 0x43ed43a7 */
-sb7  = -2.2440952301e+01; /* 0xc1b38712 */
-
-float
-erff(float x)
-{
-	int32_t hx,ix,i;
-	float R,S,P,Q,s,y,z,r;
-	GET_FLOAT_WORD(hx,x);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7f800000) {		/* erf(nan)=nan */
-	    i = ((u_int32_t)hx>>31)<<1;
-	    return (float)(1-i)+one/x;	/* erf(+-inf)=+-1 */
-	}
-
-	if(ix < 0x3f580000) {		/* |x|<0.84375 */
-	    if(ix < 0x31800000) { 	/* |x|<2**-28 */
-	        if (ix < 0x04000000)
-		    /*avoid underflow */
-		    return (float)0.125*((float)8.0*x+efx8*x);
-		return x + efx*x;
-	    }
-	    z = x*x;
-	    r = pp0+z*(pp1+z*(pp2+z*(pp3+z*pp4)));
-	    s = one+z*(qq1+z*(qq2+z*(qq3+z*(qq4+z*qq5))));
-	    y = r/s;
-	    return x + x*y;
-	}
-	if(ix < 0x3fa00000) {		/* 0.84375 <= |x| < 1.25 */
-	    s = fabsf(x)-one;
-	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*pa6)))));
-	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*qa6)))));
-	    if(hx>=0) return erx + P/Q; else return -erx - P/Q;
-	}
-	if (ix >= 0x40c00000) {		/* inf>|x|>=6 */
-	    if(hx>=0) return one-tiny; else return tiny-one;
-	}
-	x = fabsf(x);
- 	s = one/(x*x);
-	if(ix< 0x4036DB6E) {	/* |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)))))));
-	} 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))))));
-	}
-	GET_FLOAT_WORD(ix,x);
-	SET_FLOAT_WORD(z,ix&0xfffff000);
-	r  =  __ieee754_expf(-z*z-(float)0.5625)*__ieee754_expf((z-x)*(z+x)+R/S);
-	if(hx>=0) return one-r/x; else return  r/x-one;
-}
-
-float
-erfcf(float x)
-{
-	int32_t hx,ix;
-	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 */
-	    return (float)(((u_int32_t)hx>>31)<<1)+one/x;
-	}
-
-	if(ix < 0x3f580000) {		/* |x|<0.84375 */
-	    if(ix < 0x23800000)  	/* |x|<2**-56 */
-		return one-x;
-	    z = x*x;
-	    r = pp0+z*(pp1+z*(pp2+z*(pp3+z*pp4)));
-	    s = one+z*(qq1+z*(qq2+z*(qq3+z*(qq4+z*qq5))));
-	    y = r/s;
-	    if(hx < 0x3e800000) {  	/* x<1/4 */
-		return one-(x+x*y);
-	    } else {
-		r = x*y;
-		r += (x-half);
-	        return half - r ;
-	    }
-	}
-	if(ix < 0x3fa00000) {		/* 0.84375 <= |x| < 1.25 */
-	    s = fabsf(x)-one;
-	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*pa6)))));
-	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*qa6)))));
-	    if(hx>=0) {
-	        z  = one-erx; return z - P/Q;
-	    } else {
-		z = erx+P/Q; return one+z;
-	    }
-	}
-	if (ix < 0x41e00000) {		/* |x|<28 */
-	    x = fabsf(x);
- 	    s = one/(x*x);
-	    if(ix< 0x4036DB6D) {	/* |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)))))));
-	    } else {			/* |x| >= 1/.35 ~ 2.857143 */
-		if(hx<0&&ix>=0x40c00000) 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))))));
-	    }
-	    GET_FLOAT_WORD(ix,x);
-	    SET_FLOAT_WORD(z,ix&0xfffff000);
-	    r  =  __ieee754_expf(-z*z-(float)0.5625)*
-			__ieee754_expf((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;
-	}
-}
diff --git a/lib/libm/src/s_exp2.c b/lib/libm/src/s_exp2.c
deleted file mode 100644
index 03e486f41..000000000
--- a/lib/libm/src/s_exp2.c
+++ /dev/null
@@ -1,417 +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 <sys/cdefs.h>
-__RCSID("$NetBSD: s_exp2.c,v 1.5 2014/03/18 21:52:19 dsl Exp $");
-#ifdef __FBSDID
-__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2.c,v 1.7 2008/02/22 02:27:34 das Exp $");
-#endif
-
-#include <float.h>
-
-#include "math.h"
-#include "math_private.h"
-
-#define	TBLBITS	8
-#define	TBLSIZE	(1 << TBLBITS)
-
-static const double
-    redux    = 0x1.8p52 / TBLSIZE,
-    P1	     = 0x1.62e42fefa39efp-1,
-    P2	     = 0x1.ebfbdff82c575p-3,
-    P3	     = 0x1.c6b08d704a0a6p-5,
-    P4	     = 0x1.3b2ab88f70400p-7,
-    P5	     = 0x1.5d88003875c74p-10;
-
-#ifdef __i386__
-/* The return value is in %st(0) - we need a 'long double' error. */
-static volatile long double huge = 0x1p+16000L;
-static volatile long double tiny = 0x1p-16000L;
-#else
-static volatile double huge = 0x1p+1000;
-static volatile double tiny = 0x1p-1000;
-#endif
-
-static const struct {
-    double exp2;	/* exp2(z + eps) */
-    double eps;		/* eps */
-} tbl[TBLSIZE] = {
-/*	exp2(z + eps)		eps	*/
-	{ 0x1.6a09e667f3d5dp-1,	 0x1.9880p-44 },
-	{ 0x1.6b052fa751744p-1,	 0x1.8000p-50 },
-	{ 0x1.6c012750bd9fep-1,	-0x1.8780p-45 },
-	{ 0x1.6cfdcddd476bfp-1,	 0x1.ec00p-46 },
-	{ 0x1.6dfb23c651a29p-1,	-0x1.8000p-50 },
-	{ 0x1.6ef9298593ae3p-1,	-0x1.c000p-52 },
-	{ 0x1.6ff7df9519386p-1,	-0x1.fd80p-45 },
-	{ 0x1.70f7466f42da3p-1,	-0x1.c880p-45 },
-	{ 0x1.71f75e8ec5fc3p-1,	 0x1.3c00p-46 },
-	{ 0x1.72f8286eacf05p-1,	-0x1.8300p-44 },
-	{ 0x1.73f9a48a58152p-1,	-0x1.0c00p-47 },
-	{ 0x1.74fbd35d7ccfcp-1,	 0x1.f880p-45 },
-	{ 0x1.75feb564267f1p-1,	 0x1.3e00p-47 },
-	{ 0x1.77024b1ab6d48p-1,	-0x1.7d00p-45 },
-	{ 0x1.780694fde5d38p-1,	-0x1.d000p-50 },
-	{ 0x1.790b938ac1d00p-1,	 0x1.3000p-49 },
-	{ 0x1.7a11473eb0178p-1,	-0x1.d000p-49 },
-	{ 0x1.7b17b0976d060p-1,	 0x1.0400p-45 },
-	{ 0x1.7c1ed0130c133p-1,	 0x1.0000p-53 },
-	{ 0x1.7d26a62ff8636p-1,	-0x1.6900p-45 },
-	{ 0x1.7e2f336cf4e3bp-1,	-0x1.2e00p-47 },
-	{ 0x1.7f3878491c3e8p-1,	-0x1.4580p-45 },
-	{ 0x1.80427543e1b4ep-1,	 0x1.3000p-44 },
-	{ 0x1.814d2add1071ap-1,	 0x1.f000p-47 },
-	{ 0x1.82589994ccd7ep-1,	-0x1.1c00p-45 },
-	{ 0x1.8364c1eb942d0p-1,	 0x1.9d00p-45 },
-	{ 0x1.8471a4623cab5p-1,	 0x1.7100p-43 },
-	{ 0x1.857f4179f5bbcp-1,	 0x1.2600p-45 },
-	{ 0x1.868d99b4491afp-1,	-0x1.2c40p-44 },
-	{ 0x1.879cad931a395p-1,	-0x1.3000p-45 },
-	{ 0x1.88ac7d98a65b8p-1,	-0x1.a800p-45 },
-	{ 0x1.89bd0a4785800p-1,	-0x1.d000p-49 },
-	{ 0x1.8ace5422aa223p-1,	 0x1.3280p-44 },
-	{ 0x1.8be05bad619fap-1,	 0x1.2b40p-43 },
-	{ 0x1.8cf3216b54383p-1,	-0x1.ed00p-45 },
-	{ 0x1.8e06a5e08664cp-1,	-0x1.0500p-45 },
-	{ 0x1.8f1ae99157807p-1,	 0x1.8280p-45 },
-	{ 0x1.902fed0282c0ep-1,	-0x1.cb00p-46 },
-	{ 0x1.9145b0b91ff96p-1,	-0x1.5e00p-47 },
-	{ 0x1.925c353aa2ff9p-1,	 0x1.5400p-48 },
-	{ 0x1.93737b0cdc64ap-1,	 0x1.7200p-46 },
-	{ 0x1.948b82b5f98aep-1,	-0x1.9000p-47 },
-	{ 0x1.95a44cbc852cbp-1,	 0x1.5680p-45 },
-	{ 0x1.96bdd9a766f21p-1,	-0x1.6d00p-44 },
-	{ 0x1.97d829fde4e2ap-1,	-0x1.1000p-47 },
-	{ 0x1.98f33e47a23a3p-1,	 0x1.d000p-45 },
-	{ 0x1.9a0f170ca0604p-1,	-0x1.8a40p-44 },
-	{ 0x1.9b2bb4d53ff89p-1,	 0x1.55c0p-44 },
-	{ 0x1.9c49182a3f15bp-1,	 0x1.6b80p-45 },
-	{ 0x1.9d674194bb8c5p-1,	-0x1.c000p-49 },
-	{ 0x1.9e86319e3238ep-1,	 0x1.7d00p-46 },
-	{ 0x1.9fa5e8d07f302p-1,	 0x1.6400p-46 },
-	{ 0x1.a0c667b5de54dp-1,	-0x1.5000p-48 },
-	{ 0x1.a1e7aed8eb8f6p-1,	 0x1.9e00p-47 },
-	{ 0x1.a309bec4a2e27p-1,	 0x1.ad80p-45 },
-	{ 0x1.a42c980460a5dp-1,	-0x1.af00p-46 },
-	{ 0x1.a5503b23e259bp-1,	 0x1.b600p-47 },
-	{ 0x1.a674a8af46213p-1,	 0x1.8880p-44 },
-	{ 0x1.a799e1330b3a7p-1,	 0x1.1200p-46 },
-	{ 0x1.a8bfe53c12e8dp-1,	 0x1.6c00p-47 },
-	{ 0x1.a9e6b5579fcd2p-1,	-0x1.9b80p-45 },
-	{ 0x1.ab0e521356fb8p-1,	 0x1.b700p-45 },
-	{ 0x1.ac36bbfd3f381p-1,	 0x1.9000p-50 },
-	{ 0x1.ad5ff3a3c2780p-1,	 0x1.4000p-49 },
-	{ 0x1.ae89f995ad2a3p-1,	-0x1.c900p-45 },
-	{ 0x1.afb4ce622f367p-1,	 0x1.6500p-46 },
-	{ 0x1.b0e07298db790p-1,	 0x1.fd40p-45 },
-	{ 0x1.b20ce6c9a89a9p-1,	 0x1.2700p-46 },
-	{ 0x1.b33a2b84f1a4bp-1,	 0x1.d470p-43 },
-	{ 0x1.b468415b747e7p-1,	-0x1.8380p-44 },
-	{ 0x1.b59728de5593ap-1,	 0x1.8000p-54 },
-	{ 0x1.b6c6e29f1c56ap-1,	 0x1.ad00p-47 },
-	{ 0x1.b7f76f2fb5e50p-1,	 0x1.e800p-50 },
-	{ 0x1.b928cf22749b2p-1,	-0x1.4c00p-47 },
-	{ 0x1.ba5b030a10603p-1,	-0x1.d700p-47 },
-	{ 0x1.bb8e0b79a6f66p-1,	 0x1.d900p-47 },
-	{ 0x1.bcc1e904bc1ffp-1,	 0x1.2a00p-47 },
-	{ 0x1.bdf69c3f3a16fp-1,	-0x1.f780p-46 },
-	{ 0x1.bf2c25bd71db8p-1,	-0x1.0a00p-46 },
-	{ 0x1.c06286141b2e9p-1,	-0x1.1400p-46 },
-	{ 0x1.c199bdd8552e0p-1,	 0x1.be00p-47 },
-	{ 0x1.c2d1cd9fa64eep-1,	-0x1.9400p-47 },
-	{ 0x1.c40ab5fffd02fp-1,	-0x1.ed00p-47 },
-	{ 0x1.c544778fafd15p-1,	 0x1.9660p-44 },
-	{ 0x1.c67f12e57d0cbp-1,	-0x1.a100p-46 },
-	{ 0x1.c7ba88988c1b6p-1,	-0x1.8458p-42 },
-	{ 0x1.c8f6d9406e733p-1,	-0x1.a480p-46 },
-	{ 0x1.ca3405751c4dfp-1,	 0x1.b000p-51 },
-	{ 0x1.cb720dcef9094p-1,	 0x1.1400p-47 },
-	{ 0x1.ccb0f2e6d1689p-1,	 0x1.0200p-48 },
-	{ 0x1.cdf0b555dc412p-1,	 0x1.3600p-48 },
-	{ 0x1.cf3155b5bab3bp-1,	-0x1.6900p-47 },
-	{ 0x1.d072d4a0789bcp-1,	 0x1.9a00p-47 },
-	{ 0x1.d1b532b08c8fap-1,	-0x1.5e00p-46 },
-	{ 0x1.d2f87080d8a85p-1,	 0x1.d280p-46 },
-	{ 0x1.d43c8eacaa203p-1,	 0x1.1a00p-47 },
-	{ 0x1.d5818dcfba491p-1,	 0x1.f000p-50 },
-	{ 0x1.d6c76e862e6a1p-1,	-0x1.3a00p-47 },
-	{ 0x1.d80e316c9834ep-1,	-0x1.cd80p-47 },
-	{ 0x1.d955d71ff6090p-1,	 0x1.4c00p-48 },
-	{ 0x1.da9e603db32aep-1,	 0x1.f900p-48 },
-	{ 0x1.dbe7cd63a8325p-1,	 0x1.9800p-49 },
-	{ 0x1.dd321f301b445p-1,	-0x1.5200p-48 },
-	{ 0x1.de7d5641c05bfp-1,	-0x1.d700p-46 },
-	{ 0x1.dfc97337b9aecp-1,	-0x1.6140p-46 },
-	{ 0x1.e11676b197d5ep-1,	 0x1.b480p-47 },
-	{ 0x1.e264614f5a3e7p-1,	 0x1.0ce0p-43 },
-	{ 0x1.e3b333b16ee5cp-1,	 0x1.c680p-47 },
-	{ 0x1.e502ee78b3fb4p-1,	-0x1.9300p-47 },
-	{ 0x1.e653924676d68p-1,	-0x1.5000p-49 },
-	{ 0x1.e7a51fbc74c44p-1,	-0x1.7f80p-47 },
-	{ 0x1.e8f7977cdb726p-1,	-0x1.3700p-48 },
-	{ 0x1.ea4afa2a490e8p-1,	 0x1.5d00p-49 },
-	{ 0x1.eb9f4867ccae4p-1,	 0x1.61a0p-46 },
-	{ 0x1.ecf482d8e680dp-1,	 0x1.5500p-48 },
-	{ 0x1.ee4aaa2188514p-1,	 0x1.6400p-51 },
-	{ 0x1.efa1bee615a13p-1,	-0x1.e800p-49 },
-	{ 0x1.f0f9c1cb64106p-1,	-0x1.a880p-48 },
-	{ 0x1.f252b376bb963p-1,	-0x1.c900p-45 },
-	{ 0x1.f3ac948dd7275p-1,	 0x1.a000p-53 },
-	{ 0x1.f50765b6e4524p-1,	-0x1.4f00p-48 },
-	{ 0x1.f6632798844fdp-1,	 0x1.a800p-51 },
-	{ 0x1.f7bfdad9cbe38p-1,	 0x1.abc0p-48 },
-	{ 0x1.f91d802243c82p-1,	-0x1.4600p-50 },
-	{ 0x1.fa7c1819e908ep-1,	-0x1.b0c0p-47 },
-	{ 0x1.fbdba3692d511p-1,	-0x1.0e00p-51 },
-	{ 0x1.fd3c22b8f7194p-1,	-0x1.0de8p-46 },
-	{ 0x1.fe9d96b2a23eep-1,	 0x1.e430p-49 },
-	{ 0x1.0000000000000p+0,	 0x0.0000p+0 },
-	{ 0x1.00b1afa5abcbep+0,	-0x1.3400p-52 },
-	{ 0x1.0163da9fb3303p+0,	-0x1.2170p-46 },
-	{ 0x1.02168143b0282p+0,	 0x1.a400p-52 },
-	{ 0x1.02c9a3e77806cp+0,	 0x1.f980p-49 },
-	{ 0x1.037d42e11bbcap+0,	-0x1.7400p-51 },
-	{ 0x1.04315e86e7f89p+0,	 0x1.8300p-50 },
-	{ 0x1.04e5f72f65467p+0,	-0x1.a3f0p-46 },
-	{ 0x1.059b0d315855ap+0,	-0x1.2840p-47 },
-	{ 0x1.0650a0e3c1f95p+0,	 0x1.1600p-48 },
-	{ 0x1.0706b29ddf71ap+0,	 0x1.5240p-46 },
-	{ 0x1.07bd42b72a82dp+0,	-0x1.9a00p-49 },
-	{ 0x1.0874518759bd0p+0,	 0x1.6400p-49 },
-	{ 0x1.092bdf66607c8p+0,	-0x1.0780p-47 },
-	{ 0x1.09e3ecac6f383p+0,	-0x1.8000p-54 },
-	{ 0x1.0a9c79b1f3930p+0,	 0x1.fa00p-48 },
-	{ 0x1.0b5586cf988fcp+0,	-0x1.ac80p-48 },
-	{ 0x1.0c0f145e46c8ap+0,	 0x1.9c00p-50 },
-	{ 0x1.0cc922b724816p+0,	 0x1.5200p-47 },
-	{ 0x1.0d83b23395dd8p+0,	-0x1.ad00p-48 },
-	{ 0x1.0e3ec32d3d1f3p+0,	 0x1.bac0p-46 },
-	{ 0x1.0efa55fdfa9a6p+0,	-0x1.4e80p-47 },
-	{ 0x1.0fb66affed2f0p+0,	-0x1.d300p-47 },
-	{ 0x1.1073028d7234bp+0,	 0x1.1500p-48 },
-	{ 0x1.11301d0125b5bp+0,	 0x1.c000p-49 },
-	{ 0x1.11edbab5e2af9p+0,	 0x1.6bc0p-46 },
-	{ 0x1.12abdc06c31d5p+0,	 0x1.8400p-49 },
-	{ 0x1.136a814f2047dp+0,	-0x1.ed00p-47 },
-	{ 0x1.1429aaea92de9p+0,	 0x1.8e00p-49 },
-	{ 0x1.14e95934f3138p+0,	 0x1.b400p-49 },
-	{ 0x1.15a98c8a58e71p+0,	 0x1.5300p-47 },
-	{ 0x1.166a45471c3dfp+0,	 0x1.3380p-47 },
-	{ 0x1.172b83c7d5211p+0,	 0x1.8d40p-45 },
-	{ 0x1.17ed48695bb9fp+0,	-0x1.5d00p-47 },
-	{ 0x1.18af9388c8d93p+0,	-0x1.c880p-46 },
-	{ 0x1.1972658375d66p+0,	 0x1.1f00p-46 },
-	{ 0x1.1a35beb6fcba7p+0,	 0x1.0480p-46 },
-	{ 0x1.1af99f81387e3p+0,	-0x1.7390p-43 },
-	{ 0x1.1bbe084045d54p+0,	 0x1.4e40p-45 },
-	{ 0x1.1c82f95281c43p+0,	-0x1.a200p-47 },
-	{ 0x1.1d4873168b9b2p+0,	 0x1.3800p-49 },
-	{ 0x1.1e0e75eb44031p+0,	 0x1.ac00p-49 },
-	{ 0x1.1ed5022fcd938p+0,	 0x1.1900p-47 },
-	{ 0x1.1f9c18438cdf7p+0,	-0x1.b780p-46 },
-	{ 0x1.2063b88628d8fp+0,	 0x1.d940p-45 },
-	{ 0x1.212be3578a81ep+0,	 0x1.8000p-50 },
-	{ 0x1.21f49917ddd41p+0,	 0x1.b340p-45 },
-	{ 0x1.22bdda2791323p+0,	 0x1.9f80p-46 },
-	{ 0x1.2387a6e7561e7p+0,	-0x1.9c80p-46 },
-	{ 0x1.2451ffb821427p+0,	 0x1.2300p-47 },
-	{ 0x1.251ce4fb2a602p+0,	-0x1.3480p-46 },
-	{ 0x1.25e85711eceb0p+0,	 0x1.2700p-46 },
-	{ 0x1.26b4565e27d16p+0,	 0x1.1d00p-46 },
-	{ 0x1.2780e341de00fp+0,	 0x1.1ee0p-44 },
-	{ 0x1.284dfe1f5633ep+0,	-0x1.4c00p-46 },
-	{ 0x1.291ba7591bb30p+0,	-0x1.3d80p-46 },
-	{ 0x1.29e9df51fdf09p+0,	 0x1.8b00p-47 },
-	{ 0x1.2ab8a66d10e9bp+0,	-0x1.27c0p-45 },
-	{ 0x1.2b87fd0dada3ap+0,	 0x1.a340p-45 },
-	{ 0x1.2c57e39771af9p+0,	-0x1.0800p-46 },
-	{ 0x1.2d285a6e402d9p+0,	-0x1.ed00p-47 },
-	{ 0x1.2df961f641579p+0,	-0x1.4200p-48 },
-	{ 0x1.2ecafa93e2ecfp+0,	-0x1.4980p-45 },
-	{ 0x1.2f9d24abd8822p+0,	-0x1.6300p-46 },
-	{ 0x1.306fe0a31b625p+0,	-0x1.2360p-44 },
-	{ 0x1.31432edeea50bp+0,	-0x1.0df8p-40 },
-	{ 0x1.32170fc4cd7b8p+0,	-0x1.2480p-45 },
-	{ 0x1.32eb83ba8e9a2p+0,	-0x1.5980p-45 },
-	{ 0x1.33c08b2641766p+0,	 0x1.ed00p-46 },
-	{ 0x1.3496266e3fa27p+0,	-0x1.c000p-50 },
-	{ 0x1.356c55f929f0fp+0,	-0x1.0d80p-44 },
-	{ 0x1.36431a2de88b9p+0,	 0x1.2c80p-45 },
-	{ 0x1.371a7373aaa39p+0,	 0x1.0600p-45 },
-	{ 0x1.37f26231e74fep+0,	-0x1.6600p-46 },
-	{ 0x1.38cae6d05d838p+0,	-0x1.ae00p-47 },
-	{ 0x1.39a401b713ec3p+0,	-0x1.4720p-43 },
-	{ 0x1.3a7db34e5a020p+0,	 0x1.8200p-47 },
-	{ 0x1.3b57fbfec6e95p+0,	 0x1.e800p-44 },
-	{ 0x1.3c32dc313a8f2p+0,	 0x1.f800p-49 },
-	{ 0x1.3d0e544ede122p+0,	-0x1.7a00p-46 },
-	{ 0x1.3dea64c1234bbp+0,	 0x1.6300p-45 },
-	{ 0x1.3ec70df1c4eccp+0,	-0x1.8a60p-43 },
-	{ 0x1.3fa4504ac7e8cp+0,	-0x1.cdc0p-44 },
-	{ 0x1.40822c367a0bbp+0,	 0x1.5b80p-45 },
-	{ 0x1.4160a21f72e95p+0,	 0x1.ec00p-46 },
-	{ 0x1.423fb27094646p+0,	-0x1.3600p-46 },
-	{ 0x1.431f5d950a920p+0,	 0x1.3980p-45 },
-	{ 0x1.43ffa3f84b9ebp+0,	 0x1.a000p-48 },
-	{ 0x1.44e0860618919p+0,	-0x1.6c00p-48 },
-	{ 0x1.45c2042a7d201p+0,	-0x1.bc00p-47 },
-	{ 0x1.46a41ed1d0016p+0,	-0x1.2800p-46 },
-	{ 0x1.4786d668b3326p+0,	 0x1.0e00p-44 },
-	{ 0x1.486a2b5c13c00p+0,	-0x1.d400p-45 },
-	{ 0x1.494e1e192af04p+0,	 0x1.c200p-47 },
-	{ 0x1.4a32af0d7d372p+0,	-0x1.e500p-46 },
-	{ 0x1.4b17dea6db801p+0,	 0x1.7800p-47 },
-	{ 0x1.4bfdad53629e1p+0,	-0x1.3800p-46 },
-	{ 0x1.4ce41b817c132p+0,	 0x1.0800p-47 },
-	{ 0x1.4dcb299fddddbp+0,	 0x1.c700p-45 },
-	{ 0x1.4eb2d81d8ab96p+0,	-0x1.ce00p-46 },
-	{ 0x1.4f9b2769d2d02p+0,	 0x1.9200p-46 },
-	{ 0x1.508417f4531c1p+0,	-0x1.8c00p-47 },
-	{ 0x1.516daa2cf662ap+0,	-0x1.a000p-48 },
-	{ 0x1.5257de83f51eap+0,	 0x1.a080p-43 },
-	{ 0x1.5342b569d4edap+0,	-0x1.6d80p-45 },
-	{ 0x1.542e2f4f6ac1ap+0,	-0x1.2440p-44 },
-	{ 0x1.551a4ca5d94dbp+0,	 0x1.83c0p-43 },
-	{ 0x1.56070dde9116bp+0,	 0x1.4b00p-45 },
-	{ 0x1.56f4736b529dep+0,	 0x1.15a0p-43 },
-	{ 0x1.57e27dbe2c40ep+0,	-0x1.9e00p-45 },
-	{ 0x1.58d12d497c76fp+0,	-0x1.3080p-45 },
-	{ 0x1.59c0827ff0b4cp+0,	 0x1.dec0p-43 },
-	{ 0x1.5ab07dd485427p+0,	-0x1.4000p-51 },
-	{ 0x1.5ba11fba87af4p+0,	 0x1.0080p-44 },
-	{ 0x1.5c9268a59460bp+0,	-0x1.6c80p-45 },
-	{ 0x1.5d84590998e3fp+0,	 0x1.69a0p-43 },
-	{ 0x1.5e76f15ad20e1p+0,	-0x1.b400p-46 },
-	{ 0x1.5f6a320dcebcap+0,	 0x1.7700p-46 },
-	{ 0x1.605e1b976dcb8p+0,	 0x1.6f80p-45 },
-	{ 0x1.6152ae6cdf715p+0,	 0x1.1000p-47 },
-	{ 0x1.6247eb03a5531p+0,	-0x1.5d00p-46 },
-	{ 0x1.633dd1d1929b5p+0,	-0x1.2d00p-46 },
-	{ 0x1.6434634ccc313p+0,	-0x1.a800p-49 },
-	{ 0x1.652b9febc8efap+0,	-0x1.8600p-45 },
-	{ 0x1.6623882553397p+0,	 0x1.1fe0p-40 },
-	{ 0x1.671c1c708328ep+0,	-0x1.7200p-44 },
-	{ 0x1.68155d44ca97ep+0,	 0x1.6800p-49 },
-	{ 0x1.690f4b19e9471p+0,	-0x1.9780p-45 },
-};
-
-/*
- * exp2(x): compute the base 2 exponential of x
- *
- * Accuracy: Peak error < 0.503 ulp for normalized results.
- *
- * Method: (accurate tables)
- *
- *   Reduce x:
- *     x = 2**k + y, for integer k and |y| <= 1/2.
- *     Thus we have exp2(x) = 2**k * exp2(y).
- *
- *   Reduce y:
- *     y = i/TBLSIZE + z - eps[i] for integer i near y * TBLSIZE.
- *     Thus we have exp2(y) = exp2(i/TBLSIZE) * exp2(z - eps[i]),
- *     with |z - eps[i]| <= 2**-9 + 2**-39 for the table used.
- *
- *   We compute exp2(i/TBLSIZE) via table lookup and exp2(z - eps[i]) via
- *   a degree-5 minimax polynomial with maximum error under 1.3 * 2**-61.
- *   The values in exp2t[] and eps[] are chosen such that
- *   exp2t[i] = exp2(i/TBLSIZE + eps[i]), and eps[i] is a small offset such
- *   that exp2t[i] is accurate to 2**-64.
- *
- *   Note that the range of i is +-TBLSIZE/2, so we actually index the tables
- *   by i0 = i + TBLSIZE/2.
- *
- *   This method is due to Gal, with many details due to Gal and Bachelis:
- *
- *	Gal, S. and Bachelis, B.  An Accurate Elementary Mathematical Library
- *	for the IEEE Floating Point Standard.  TOMS 17(1), 26-46 (1991).
- */
-double
-exp2(double x)
-{
-	volatile ieee_double_shape_type x_p_redux;
-	double r, t, twopk, z;
-	uint32_t hx, ix, lx;
-	int32_t i0;
-	int k;
-
-	/* Filter out exceptional cases. */
-	GET_HIGH_WORD(hx,x);
-	ix = hx & 0x7fffffff;		/* high word of |x| */
-	if(ix >= 0x40900000) {			/* |x| >= 1024 */
-		if(ix >= 0x7ff00000) {
-			/* x is infinity or NaN */
-			GET_LOW_WORD(lx,x);
-			if(((ix & 0xfffff) | lx) != 0 || (hx & 0x80000000) == 0)
-				return (x + x);	/* x is NaN or +Inf */
-			else 
-				return (0.0);	/* x is -Inf */
-		}
-		if(x >= 0x1.0p10)
-			return (huge * huge); /* overflow */
-		if(x <= -0x1.0ccp10)
-			return (tiny * tiny); /* underflow */
-	} else if (ix < 0x3c900000) {		/* |x| < 0x1p-54 */
-		return (1.0 + x);
-	}
-
-	/* Reduce x, computing z, i0, and k. */
-	x_p_redux.value = x + redux;
-	i0 = x_p_redux.parts.lsw;
-
-	i0 += TBLSIZE / 2;
-	k = i0 >> TBLBITS;
-	i0 &= TBLSIZE - 1;
-	z = x - (x_p_redux.value - redux);
-
-	/* Compute r = exp2(y) = exp2t[i0] * p(z - eps[i]). */
-	t = tbl[i0].exp2;
-	z -= tbl[i0].eps;
-	r = t + t * z * (P1 + z * (P2 + z * (P3 + z * (P4 + z * P5))));
-
-	/*
-	 * Scale by 2**k.
-	 * For 'normal' values of 'k' we just multply be the correct value,
-	 * but at the extremes this doesn't work and the multiply must
-	 * be split.
-	 */
-	if (k >= -1021) {
-		if (k == 1024)
-			/* Overflow */
-			return (r * 2.0 * 0x1p1023);
-	} else {
-		/* result might be subnormal */
-		r *= 0x1p-1000;
-		k += 1000;
-	}
-	INSERT_WORDS(twopk, 0x3ff00000 + (k << 20), 0);
-	return (r * twopk);
-}
-
-#ifdef notyet
-#if (LDBL_MANT_DIG == 53)
-__weak_reference(exp2, exp2l);
-#endif
-#endif
diff --git a/lib/libm/src/s_exp2f.c b/lib/libm/src/s_exp2f.c
deleted file mode 100644
index 17cdd197d..000000000
--- a/lib/libm/src/s_exp2f.c
+++ /dev/null
@@ -1,160 +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 <sys/cdefs.h>
-__RCSID("$NetBSD: s_exp2f.c,v 1.2 2014/03/16 22:30:43 dsl Exp $");
-#ifdef __FBSDID
-__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2f.c,v 1.9 2008/02/22 02:27:34 das Exp $");
-#endif
-
-#include <float.h>
-
-#include "math.h"
-#include "math_private.h"
-
-#define	TBLBITS	4
-#define	TBLSIZE	(1 << TBLBITS)
-
-static const float
-    redux   = 0x1.8p23f / TBLSIZE,
-    P1	    = 0x1.62e430p-1f,
-    P2	    = 0x1.ebfbe0p-3f,
-    P3	    = 0x1.c6b348p-5f,
-    P4	    = 0x1.3b2c9cp-7f;
-
-/*
- * For out of range values we need to generate the appropriate
- * underflow or overflow trap as well as generating infinity or zero.
- * This means we have to get the fpu to execute an instruction that
- * will generate the trap (and not have the compiler optimise it away).
- * This is normally done by calculating 'huge * huge' or 'tiny * tiny'.
- *
- * i386 is particularly problematic.
- * The 'float' result is returned on the x87 stack, so is 'long double'.
- * If we just multiply two 'float' values the caller will see 0x1p+/-200
- * (not 0 or infinity). 
- * If we use 'double' the compiler does a store-load which will convert the
- * value and generate the required exception.
- */
-#ifdef __i386__
-static volatile double overflow = 0x1p+1000;
-static volatile double underflow = 0x1p-1000;
-#else
-static volatile float huge = 0x1p+100;
-static volatile float tiny = 0x1p-100;
-#define overflow (huge * huge)
-#define underflow (tiny * tiny)
-#endif
-
-static const double exp2ft[TBLSIZE] = {
-	0x1.6a09e667f3bcdp-1,
-	0x1.7a11473eb0187p-1,
-	0x1.8ace5422aa0dbp-1,
-	0x1.9c49182a3f090p-1,
-	0x1.ae89f995ad3adp-1,
-	0x1.c199bdd85529cp-1,
-	0x1.d5818dcfba487p-1,
-	0x1.ea4afa2a490dap-1,
-	0x1.0000000000000p+0,
-	0x1.0b5586cf9890fp+0,
-	0x1.172b83c7d517bp+0,
-	0x1.2387a6e756238p+0,
-	0x1.306fe0a31b715p+0,
-	0x1.3dea64c123422p+0,
-	0x1.4bfdad5362a27p+0,
-	0x1.5ab07dd485429p+0,
-};
-	
-/*
- * exp2f(x): compute the base 2 exponential of x
- *
- * Accuracy: Peak error < 0.501 ulp; location of peak: -0.030110927.
- *
- * Method: (equally-spaced tables)
- *
- *   Reduce x:
- *     x = 2**k + y, for integer k and |y| <= 1/2.
- *     Thus we have exp2f(x) = 2**k * exp2(y).
- *
- *   Reduce y:
- *     y = i/TBLSIZE + z for integer i near y * TBLSIZE.
- *     Thus we have exp2(y) = exp2(i/TBLSIZE) * exp2(z),
- *     with |z| <= 2**-(TBLSIZE+1).
- *
- *   We compute exp2(i/TBLSIZE) via table lookup and exp2(z) via a
- *   degree-4 minimax polynomial with maximum error under 1.4 * 2**-33.
- *   Using double precision for everything except the reduction makes
- *   roundoff error insignificant and simplifies the scaling step.
- *
- *   This method is due to Tang, but I do not use his suggested parameters:
- *
- *	Tang, P.  Table-driven Implementation of the Exponential Function
- *	in IEEE Floating-Point Arithmetic.  TOMS 15(2), 144-157 (1989).
- */
-float
-exp2f(float x)
-{
-	double tv, twopk, u, z;
-	float t;
-	uint32_t hx, ix, i0;
-	int32_t k;
-
-	/* Filter out exceptional cases. */
-	GET_FLOAT_WORD(hx, x);
-	ix = hx & 0x7fffffff;		/* high word of |x| */
-	if(ix >= 0x43000000) {			/* |x| >= 128 */
-		if(ix >= 0x7f800000) {
-			if ((ix & 0x7fffff) != 0 || (hx & 0x80000000) == 0)
-				return (x + x);	/* x is NaN or +Inf */
-			else 
-				return (0.0);	/* x is -Inf */
-		}
-		if(x >= 0x1.0p7f)
-			return overflow;	/* +infinity with overflow */
-		if(x <= -0x1.2cp7f)
-			return underflow;	/* zero with underflow */
-	} else if (ix <= 0x33000000) {		/* |x| <= 0x1p-25 */
-		return (1.0f + x);
-	}
-
-	/* Reduce x, computing z, i0, and k. */
-	STRICT_ASSIGN(float, t, x + redux);
-	GET_FLOAT_WORD(i0, t);
-	i0 += TBLSIZE / 2;
-	k = (i0 >> TBLBITS) << 20;
-	i0 &= TBLSIZE - 1;
-	t -= redux;
-	z = x - t;
-	INSERT_WORDS(twopk, 0x3ff00000 + k, 0);
-
-	/* Compute r = exp2(y) = exp2ft[i0] * p(z). */
-	tv = exp2ft[i0];
-	u = tv * z;
-	tv = tv + u * (P1 + z * P2) + u * (z * z) * (P3 + z * P4);
-
-	/* Scale by 2**(k>>20). */
-	return (tv * twopk);
-}
diff --git a/lib/libm/src/s_expm1.c b/lib/libm/src/s_expm1.c
deleted file mode 100644
index 7ac6fc90a..000000000
--- a/lib/libm/src/s_expm1.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* @(#)s_expm1.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_expm1.c,v 1.12 2002/05/26 22:01:55 wiz Exp $");
-#endif
-
-/* expm1(x)
- * Returns exp(x)-1, the exponential of x minus 1.
- *
- * Method
- *   1. Argument reduction:
- *	Given x, find r and integer k such that
- *
- *               x = k*ln2 + r,  |r| <= 0.5*ln2 ~ 0.34658
- *
- *      Here a correction term c will be computed to compensate
- *	the error in r when rounded to a floating-point number.
- *
- *   2. Approximating expm1(r) by a special rational function on
- *	the interval [0,0.34658]:
- *	Since
- *	    r*(exp(r)+1)/(exp(r)-1) = 2+ r^2/6 - r^4/360 + ...
- *	we define R1(r*r) by
- *	    r*(exp(r)+1)/(exp(r)-1) = 2+ r^2/6 * R1(r*r)
- *	That is,
- *	    R1(r**2) = 6/r *((exp(r)+1)/(exp(r)-1) - 2/r)
- *		     = 6/r * ( 1 + 2.0*(1/(exp(r)-1) - 1/r))
- *		     = 1 - r^2/60 + r^4/2520 - r^6/100800 + ...
- *      We use a special Reme algorithm on [0,0.347] to generate
- * 	a polynomial of degree 5 in r*r to approximate R1. The
- *	maximum error of this polynomial approximation is bounded
- *	by 2**-61. In other words,
- *	    R1(z) ~ 1.0 + Q1*z + Q2*z**2 + Q3*z**3 + Q4*z**4 + Q5*z**5
- *	where 	Q1  =  -1.6666666666666567384E-2,
- * 		Q2  =   3.9682539681370365873E-4,
- * 		Q3  =  -9.9206344733435987357E-6,
- * 		Q4  =   2.5051361420808517002E-7,
- * 		Q5  =  -6.2843505682382617102E-9;
- *  	(where z=r*r, and the values of Q1 to Q5 are listed below)
- *	with error bounded by
- *	    |                  5           |     -61
- *	    | 1.0+Q1*z+...+Q5*z   -  R1(z) | <= 2
- *	    |                              |
- *
- *	expm1(r) = exp(r)-1 is then computed by the following
- * 	specific way which minimize the accumulation rounding error:
- *			       2     3
- *			      r     r    [ 3 - (R1 + R1*r/2)  ]
- *	      expm1(r) = r + --- + --- * [--------------------]
- *		              2     2    [ 6 - r*(3 - R1*r/2) ]
- *
- *	To compensate the error in the argument reduction, we use
- *		expm1(r+c) = expm1(r) + c + expm1(r)*c
- *			   ~ expm1(r) + c + r*c
- *	Thus c+r*c will be added in as the correction terms for
- *	expm1(r+c). Now rearrange the term to avoid optimization
- * 	screw up:
- *		        (      2                                    2 )
- *		        ({  ( r    [ R1 -  (3 - R1*r/2) ]  )  }    r  )
- *	 expm1(r+c)~r - ({r*(--- * [--------------------]-c)-c} - --- )
- *	                ({  ( 2    [ 6 - r*(3 - R1*r/2) ]  )  }    2  )
- *                      (                                             )
- *
- *		   = r - E
- *   3. Scale back to obtain expm1(x):
- *	From step 1, we have
- *	   expm1(x) = either 2^k*[expm1(r)+1] - 1
- *		    = or     2^k*[expm1(r) + (1-2^-k)]
- *   4. Implementation notes:
- *	(A). To save one multiplication, we scale the coefficient Qi
- *	     to Qi*2^i, and replace z by (x^2)/2.
- *	(B). To achieve maximum accuracy, we compute expm1(x) by
- *	  (i)   if x < -56*ln2, return -1.0, (raise inexact if x!=inf)
- *	  (ii)  if k=0, return r-E
- *	  (iii) if k=-1, return 0.5*(r-E)-0.5
- *        (iv)	if k=1 if r < -0.25, return 2*((r+0.5)- E)
- *	       	       else	     return  1.0+2.0*(r-E);
- *	  (v)   if (k<-2||k>56) return 2^k(1-(E-r)) - 1 (or exp(x)-1)
- *	  (vi)  if k <= 20, return 2^k((1-2^-k)-(E-r)), else
- *	  (vii) return 2^k(1-((E+2^-k)-r))
- *
- * Special cases:
- *	expm1(INF) is INF, expm1(NaN) is NaN;
- *	expm1(-INF) is -1, and
- *	for finite argument, only expm1(0)=0 is exact.
- *
- * Accuracy:
- *	according to an error analysis, the error is always less than
- *	1 ulp (unit in the last place).
- *
- * Misc. info.
- *	For IEEE double
- *	    if x >  7.09782712893383973096e+02 then expm1(x) overflow
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following
- * constants. The decimal values may be used, provided that the
- * compiler will convert from decimal to binary accurately enough
- * to produce the hexadecimal values shown.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-one		= 1.0,
-huge		= 1.0e+300,
-tiny		= 1.0e-300,
-o_threshold	= 7.09782712893383973096e+02,/* 0x40862E42, 0xFEFA39EF */
-ln2_hi		= 6.93147180369123816490e-01,/* 0x3fe62e42, 0xfee00000 */
-ln2_lo		= 1.90821492927058770002e-10,/* 0x3dea39ef, 0x35793c76 */
-invln2		= 1.44269504088896338700e+00,/* 0x3ff71547, 0x652b82fe */
-	/* scaled coefficients related to expm1 */
-Q1  =  -3.33333333333331316428e-02, /* BFA11111 111110F4 */
-Q2  =   1.58730158725481460165e-03, /* 3F5A01A0 19FE5585 */
-Q3  =  -7.93650757867487942473e-05, /* BF14CE19 9EAADBB7 */
-Q4  =   4.00821782732936239552e-06, /* 3ED0CFCA 86E65239 */
-Q5  =  -2.01099218183624371326e-07; /* BE8AFDB7 6E09C32D */
-
-double
-expm1(double x)
-{
-	double y,hi,lo,c,t,e,hxs,hfx,r1;
-	int32_t k,xsb;
-	u_int32_t hx;
-
-	c = 0;
-	GET_HIGH_WORD(hx,x);
-	xsb = hx&0x80000000;		/* sign bit of x */
-	if(xsb==0) y=x; else y= -x;	/* y = |x| */
-	hx &= 0x7fffffff;		/* high word of |x| */
-
-    /* filter out huge and non-finite argument */
-	if(hx >= 0x4043687A) {			/* if |x|>=56*ln2 */
-	    if(hx >= 0x40862E42) {		/* if |x|>=709.78... */
-                if(hx>=0x7ff00000) {
-		    u_int32_t low;
-		    GET_LOW_WORD(low,x);
-		    if(((hx&0xfffff)|low)!=0)
-		         return x+x; 	 /* NaN */
-		    else return (xsb==0)? x:-1.0;/* exp(+-inf)={inf,-1} */
-	        }
-	        if(x > o_threshold) return huge*huge; /* overflow */
-	    }
-	    if(xsb!=0) { /* x < -56*ln2, return -1.0 with inexact */
-		if(x+tiny<0.0)		/* raise inexact */
-		return tiny-one;	/* return -1 */
-	    }
-	}
-
-    /* argument reduction */
-	if(hx > 0x3fd62e42) {		/* if  |x| > 0.5 ln2 */
-	    if(hx < 0x3FF0A2B2) {	/* and |x| < 1.5 ln2 */
-		if(xsb==0)
-		    {hi = x - ln2_hi; lo =  ln2_lo;  k =  1;}
-		else
-		    {hi = x + ln2_hi; lo = -ln2_lo;  k = -1;}
-	    } else {
-		k  = invln2*x+((xsb==0)?0.5:-0.5);
-		t  = k;
-		hi = x - t*ln2_hi;	/* t*ln2_hi is exact here */
-		lo = t*ln2_lo;
-	    }
-	    x  = hi - lo;
-	    c  = (hi-x)-lo;
-	}
-	else if(hx < 0x3c900000) {  	/* when |x|<2**-54, return x */
-	    t = huge+x;	/* return x with inexact flags when x!=0 */
-	    return x - (t-(huge+x));
-	}
-	else k = 0;
-
-    /* x is now in primary range */
-	hfx = 0.5*x;
-	hxs = x*hfx;
-	r1 = one+hxs*(Q1+hxs*(Q2+hxs*(Q3+hxs*(Q4+hxs*Q5))));
-	t  = 3.0-r1*hfx;
-	e  = hxs*((r1-t)/(6.0 - x*t));
-	if(k==0) return x - (x*e-hxs);		/* c is 0 */
-	else {
-	    e  = (x*(e-c)-c);
-	    e -= hxs;
-	    if(k== -1) return 0.5*(x-e)-0.5;
-	    if(k==1)  {
-	       	if(x < -0.25) return -2.0*(e-(x+0.5));
-	       	else 	      return  one+2.0*(x-e);
-	    }
-	    if (k <= -2 || k>56) {   /* suffice to return exp(x)-1 */
-	        u_int32_t high;
-	        y = one-(e-x);
-		GET_HIGH_WORD(high,y);
-		SET_HIGH_WORD(y,high+(k<<20));	/* add k to y's exponent */
-	        return y-one;
-	    }
-	    t = one;
-	    if(k<20) {
-	        u_int32_t high;
-	        SET_HIGH_WORD(t,0x3ff00000 - (0x200000>>k));  /* t=1-2^-k */
-	       	y = t-(e-x);
-		GET_HIGH_WORD(high,y);
-		SET_HIGH_WORD(y,high+(k<<20));	/* add k to y's exponent */
-	   } else {
-	        u_int32_t high;
-		SET_HIGH_WORD(t,((0x3ff-k)<<20));	/* 2^-k */
-	       	y = x-(e+t);
-	       	y += one;
-		GET_HIGH_WORD(high,y);
-		SET_HIGH_WORD(y,high+(k<<20));	/* add k to y's exponent */
-	    }
-	}
-	return y;
-}
diff --git a/lib/libm/src/s_expm1f.c b/lib/libm/src/s_expm1f.c
deleted file mode 100644
index 30ee5ae4f..000000000
--- a/lib/libm/src/s_expm1f.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* s_expm1f.c -- float version of s_expm1.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_expm1f.c,v 1.10 2002/05/26 22:01:55 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float huge = 1.0e+30, tiny = 1.0e-30;
-
-static const float
-one		= 1.0,
-o_threshold	= 8.8721679688e+01,/* 0x42b17180 */
-ln2_hi		= 6.9313812256e-01,/* 0x3f317180 */
-ln2_lo		= 9.0580006145e-06,/* 0x3717f7d1 */
-invln2		= 1.4426950216e+00,/* 0x3fb8aa3b */
-	/* scaled coefficients related to expm1 */
-Q1  =  -3.3333335072e-02, /* 0xbd088889 */
-Q2  =   1.5873016091e-03, /* 0x3ad00d01 */
-Q3  =  -7.9365076090e-05, /* 0xb8a670cd */
-Q4  =   4.0082177293e-06, /* 0x36867e54 */
-Q5  =  -2.0109921195e-07; /* 0xb457edbb */
-
-float
-expm1f(float x)
-{
-	float y,hi,lo,c,t,e,hxs,hfx,r1;
-	int32_t k,xsb;
-	u_int32_t hx;
-
-	c = 0;
-	GET_FLOAT_WORD(hx,x);
-	xsb = hx&0x80000000;		/* sign bit of x */
-	if(xsb==0) y=x; else y= -x;	/* y = |x| */
-	hx &= 0x7fffffff;		/* high word of |x| */
-
-    /* filter out huge and non-finite argument */
-	if(hx >= 0x4195b844) {			/* if |x|>=27*ln2 */
-	    if(hx >= 0x42b17218) {		/* if |x|>=88.721... */
-                if(hx>0x7f800000)
-		    return x+x; 	 /* NaN */
-		if(hx==0x7f800000)
-		    return (xsb==0)? x:-1.0;/* exp(+-inf)={inf,-1} */
-	        if(x > o_threshold) return huge*huge; /* overflow */
-	    }
-	    if(xsb!=0) { /* x < -27*ln2, return -1.0 with inexact */
-		if(x+tiny<(float)0.0)	/* raise inexact */
-		return tiny-one;	/* return -1 */
-	    }
-	}
-
-    /* argument reduction */
-	if(hx > 0x3eb17218) {		/* if  |x| > 0.5 ln2 */
-	    if(hx < 0x3F851592) {	/* and |x| < 1.5 ln2 */
-		if(xsb==0)
-		    {hi = x - ln2_hi; lo =  ln2_lo;  k =  1;}
-		else
-		    {hi = x + ln2_hi; lo = -ln2_lo;  k = -1;}
-	    } else {
-		k  = invln2*x+((xsb==0)?(float)0.5:(float)-0.5);
-		t  = k;
-		hi = x - t*ln2_hi;	/* t*ln2_hi is exact here */
-		lo = t*ln2_lo;
-	    }
-	    x  = hi - lo;
-	    c  = (hi-x)-lo;
-	}
-	else if(hx < 0x33000000) {  	/* when |x|<2**-25, return x */
-	    t = huge+x;	/* return x with inexact flags when x!=0 */
-	    return x - (t-(huge+x));
-	}
-	else k = 0;
-
-    /* x is now in primary range */
-	hfx = (float)0.5*x;
-	hxs = x*hfx;
-	r1 = one+hxs*(Q1+hxs*(Q2+hxs*(Q3+hxs*(Q4+hxs*Q5))));
-	t  = (float)3.0-r1*hfx;
-	e  = hxs*((r1-t)/((float)6.0 - x*t));
-	if(k==0) return x - (x*e-hxs);		/* c is 0 */
-	else {
-	    e  = (x*(e-c)-c);
-	    e -= hxs;
-	    if(k== -1) return (float)0.5*(x-e)-(float)0.5;
-	    if(k==1)  {
-	       	if(x < (float)-0.25) return -(float)2.0*(e-(x+(float)0.5));
-	       	else 	      return  one+(float)2.0*(x-e);
-	    }
-	    if (k <= -2 || k>56) {   /* suffice to return exp(x)-1 */
-	        int32_t i;
-	        y = one-(e-x);
-		GET_FLOAT_WORD(i,y);
-		SET_FLOAT_WORD(y,i+(k<<23));	/* add k to y's exponent */
-	        return y-one;
-	    }
-	    t = one;
-	    if(k<23) {
-	        int32_t i;
-	        SET_FLOAT_WORD(t,0x3f800000 - (0x1000000>>k)); /* t=1-2^-k */
-	       	y = t-(e-x);
-		GET_FLOAT_WORD(i,y);
-		SET_FLOAT_WORD(y,i+(k<<23));	/* add k to y's exponent */
-	   } else {
-	        int32_t i;
-		SET_FLOAT_WORD(t,((0x7f-k)<<23));	/* 2^-k */
-	       	y = x-(e+t);
-	       	y += one;
-		GET_FLOAT_WORD(i,y);
-		SET_FLOAT_WORD(y,i+(k<<23));	/* add k to y's exponent */
-	    }
-	}
-	return y;
-}
diff --git a/lib/libm/src/s_fabs.c b/lib/libm/src/s_fabs.c
deleted file mode 100644
index 67ed8ba55..000000000
--- a/lib/libm/src/s_fabs.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* @(#)s_fabs.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_fabs.c,v 1.11 2013/11/29 22:16:10 joerg Exp $");
-#endif
-
-/*
- * fabs(x) returns the absolute value of x.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(fabsl, fabs)
-#endif
-
-double
-fabs(double x)
-{
-	u_int32_t high;
-	GET_HIGH_WORD(high,x);
-	SET_HIGH_WORD(x,high&0x7fffffff);
-        return x;
-}
diff --git a/lib/libm/src/s_fabsf.c b/lib/libm/src/s_fabsf.c
deleted file mode 100644
index 66f8191c7..000000000
--- a/lib/libm/src/s_fabsf.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* s_fabsf.c -- float version of s_fabs.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_fabsf.c,v 1.7 2002/05/26 22:01:55 wiz Exp $");
-#endif
-
-/*
- * fabsf(x) returns the absolute value of x.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-float
-fabsf(float x)
-{
-	u_int32_t ix;
-	GET_FLOAT_WORD(ix,x);
-	SET_FLOAT_WORD(x,ix&0x7fffffff);
-        return x;
-}
diff --git a/lib/libm/src/s_fabsl.c b/lib/libm/src/s_fabsl.c
deleted file mode 100644
index 57c74891b..000000000
--- a/lib/libm/src/s_fabsl.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: s_fabsl.c,v 1.3 2013/11/29 22:16:10 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_fabsl.c,v 1.3 2013/11/29 22:16:10 joerg Exp $");
-
-#include <math.h>
-#include <machine/ieee.h>
-
-/*
- * fabsl(long double x)
- * This function returns the absolute value of its argumetn x, |x|.
- */
-#ifdef __HAVE_LONG_DOUBLE
-long double
-fabsl(long double x)
-{
-	union ieee_ext_u ux;
-
-	ux.extu_ld = x;
-	ux.extu_ext.ext_sign = 0;
-
-	return (ux.extu_ld);
-}
-#endif
diff --git a/lib/libm/src/s_fdim.c b/lib/libm/src/s_fdim.c
deleted file mode 100644
index 5a7bfc250..000000000
--- a/lib/libm/src/s_fdim.c
+++ /dev/null
@@ -1,49 +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.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD$");
-#ifdef notdef
-__FBSDID("$FreeBSD: src/lib/msun/src/s_fdim.c,v 1.1 2004/06/30 07:04:01 das Exp $");
-#endif
-
-#include <math.h>
-
-#define	DECL(type, fn)			\
-type					\
-fn(type x, type y)			\
-{					\
-					\
-	if (isnan(x))			\
-		return (x);		\
-	if (isnan(y))			\
-		return (y);		\
-	return (x > y ? x - y : 0.0);	\
-}
-
-DECL(double, fdim)
-DECL(float, fdimf)
-DECL(long double, fdiml)
diff --git a/lib/libm/src/s_finite.c b/lib/libm/src/s_finite.c
deleted file mode 100644
index fbc721b02..000000000
--- a/lib/libm/src/s_finite.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* @(#)s_finite.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_finite.c,v 1.12 2013/11/12 17:37:43 joerg Exp $");
-#endif
-
-/*
- * finite(x) returns 1 if x is finite, else 0;
- * no branching!
- */
-
-#include "math.h"
-#include "math_private.h"
-
-int
-finite(double x)
-{
-	int32_t hx;
-	GET_HIGH_WORD(hx,x);
-	return (int)((u_int32_t)((hx&0x7fffffff)-0x7ff00000)>>31);
-}
diff --git a/lib/libm/src/s_finitef.c b/lib/libm/src/s_finitef.c
deleted file mode 100644
index 0bcb62722..000000000
--- a/lib/libm/src/s_finitef.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* s_finitef.c -- float version of s_finite.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_finitef.c,v 1.8 2013/11/12 17:37:43 joerg Exp $");
-#endif
-
-/*
- * finitef(x) returns 1 if x is finite, else 0;
- * no branching!
- */
-
-#include "math.h"
-#include "math_private.h"
-
-int
-finitef(float x)
-{
-	int32_t ix;
-	GET_FLOAT_WORD(ix,x);
-	return (int)((u_int32_t)((ix&0x7fffffff)-0x7f800000)>>31);
-}
diff --git a/lib/libm/src/s_floor.c b/lib/libm/src/s_floor.c
deleted file mode 100644
index 0e253be9e..000000000
--- a/lib/libm/src/s_floor.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* @(#)s_floor.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_floor.c,v 1.14 2013/11/11 23:57:34 joerg Exp $");
-#endif
-
-/*
- * floor(x)
- * Return x rounded toward -inf to integral value
- * Method:
- *	Bit twiddling.
- * Exception:
- *	Inexact flag raised if x not equal to floor(x).
- */
-
-#include "math.h"
-#include "math_private.h"
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(_floorl, floor)
-__weak_alias(floorl, floor)
-#endif
-
-static const double huge = 1.0e300;
-
-double
-floor(double x)
-{
-	int32_t i0,i1,jj0;
-	u_int32_t i,j;
-	EXTRACT_WORDS(i0,i1,x);
-	jj0 = ((i0>>20)&0x7ff)-0x3ff;
-	if(jj0<20) {
-	    if(jj0<0) { 	/* raise inexact if x != 0 */
-		if(huge+x>0.0) {/* return 0*sign(x) if |x|<1 */
-		    if(i0>=0) {i0=i1=0;}
-		    else if(((i0&0x7fffffff)|i1)!=0)
-			{ i0=0xbff00000;i1=0;}
-		}
-	    } else {
-		i = (0x000fffff)>>jj0;
-		if(((i0&i)|i1)==0) return x; /* x is integral */
-		if(huge+x>0.0) {	/* raise inexact flag */
-		    if(i0<0) i0 += (0x00100000)>>jj0;
-		    i0 &= (~i); i1=0;
-		}
-	    }
-	} else if (jj0>51) {
-	    if(jj0==0x400) return x+x;	/* inf or NaN */
-	    else return x;		/* x is integral */
-	} else {
-	    i = ((u_int32_t)(0xffffffff))>>(jj0-20);
-	    if((i1&i)==0) return x;	/* x is integral */
-	    if(huge+x>0.0) { 		/* raise inexact flag */
-		if(i0<0) {
-		    if(jj0==20) i0+=1;
-		    else {
-			j = i1+(1<<(52-jj0));
-			if(j<(u_int32_t)i1) i0 +=1 ; 	/* got a carry */
-			i1=j;
-		    }
-		}
-		i1 &= (~i);
-	    }
-	}
-	INSERT_WORDS(x,i0,i1);
-	return x;
-}
diff --git a/lib/libm/src/s_floorf.c b/lib/libm/src/s_floorf.c
deleted file mode 100644
index 4971e8995..000000000
--- a/lib/libm/src/s_floorf.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* s_floorf.c -- float version of s_floor.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_floorf.c,v 1.8 2008/04/25 22:21:53 christos Exp $");
-#endif
-
-/*
- * floorf(x)
- * Return x rounded toward -inf to integral value
- * Method:
- *	Bit twiddling.
- * Exception:
- *	Inexact flag raised if x not equal to floorf(x).
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const float huge = 1.0e30;
-
-float
-floorf(float x)
-{
-	int32_t i0,jj0;
-	u_int32_t i;
-	GET_FLOAT_WORD(i0,x);
-	jj0 = ((i0>>23)&0xff)-0x7f;
-	if(jj0<23) {
-	    if(jj0<0) { 	/* raise inexact if x != 0 */
-		if(huge+x>(float)0.0) {/* return 0*sign(x) if |x|<1 */
-		    if(i0>=0) {i0=0;}
-		    else if((i0&0x7fffffff)!=0)
-			{ i0=0xbf800000;}
-		}
-	    } else {
-		i = (0x007fffff)>>jj0;
-		if((i0&i)==0) return x; /* x is integral */
-		if(huge+x>(float)0.0) {	/* raise inexact flag */
-		    if(i0<0) i0 += (0x00800000)>>jj0;
-		    i0 &= (~i);
-		}
-	    }
-	} else {
-	    if(jj0==0x80) return x+x;	/* inf or NaN */
-	    else return x;		/* x is integral */
-	}
-	SET_FLOAT_WORD(x,i0);
-	return x;
-}
diff --git a/lib/libm/src/s_floorl.c b/lib/libm/src/s_floorl.c
deleted file mode 100644
index a36dcc059..000000000
--- a/lib/libm/src/s_floorl.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * ====================================================
- * 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.
- * ====================================================
- *
- * From: @(#)s_floor.c 5.1 93/09/24
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_floorl.c,v 1.1 2013/11/11 23:57:34 joerg Exp $");
-#if 0
-__FBSDID("$FreeBSD: head/lib/msun/src/s_floorl.c 176280 2008-02-14 15:10:34Z bde $");
-#endif
-
-/*
- * floorl(x)
- * Return x rounded toward -inf to integral value
- * Method:
- *	Bit twiddling.
- * Exception:
- *	Inexact flag raised if x not equal to floorl(x).
- */
-#include "namespace.h"
-
-#include <float.h>
-#include <math.h>
-#include <stdint.h>
-#include <machine/ieee.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-
-#ifdef __weak_alias
-__weak_alias(floorl, _floorl)
-#endif
-
-#ifdef LDBL_IMPLICIT_NBIT
-#define	MANH_SIZE	(EXT_FRACHBITS + 1)
-#define	INC_MANH(ux, c)	do {					\
-	uint64_t oi = ux.extu_frach;				\
-	ux.extu_frach += (c);					\
-	if (ux.extu_frach < oi)					\
-		ux.extu_exp++;					\
-} while (0)
-#else
-#define	MANH_SIZE	EXT_FRACHBITS
-#define	INC_MANH(ux, c)	do {					\
-	uint64_t oi = ux.extu_frach;				\
-	ux.extu_frach += (c);					\
-	if (ux.extu_frach < oi) {				\
-		ux.extu_exp++;					\
-		ux.extu_frach |= 1llu << (EXT_FRACHBITS - 1);	\
-	}							\
-} while (0)
-#endif
-
-static const long double huge = 1.0e300;
-
-long double
-floorl(long double x)
-{
-	union ieee_ext_u ux = { .extu_ld = x, };
-	int e = ux.extu_exp - LDBL_MAX_EXP + 1;
-
-	if (e < MANH_SIZE - 1) {
-		if (e < 0) {			/* raise inexact if x != 0 */
-			if (huge + x > 0.0)
-				if (ux.extu_exp > 0 ||
-				    (ux.extu_frach | ux.extu_fracl) != 0)
-					ux.extu_ld = ux.extu_sign ? -1.0 : 0.0;
-		} else {
-			uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1);
-			if (((ux.extu_frach & m) | ux.extu_fracl) == 0)
-				return (x);	/* x is integral */
-			if (ux.extu_sign) {
-#ifdef LDBL_IMPLICIT_NBIT
-				if (e == 0)
-					ux.extu_exp++;
-				else
-#endif
-				INC_MANH(ux, 1llu << (MANH_SIZE - e - 1));
-			}
-			if (huge + x > 0.0) {	/* raise inexact flag */
-				ux.extu_frach &= ~m;
-				ux.extu_fracl = 0;
-			}
-		}
-	} else if (e < LDBL_MANT_DIG - 1) {
-		uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1);
-		if ((ux.extu_fracl & m) == 0)
-			return (x);	/* x is integral */
-		if (ux.extu_sign) {
-			if (e == MANH_SIZE - 1)
-				INC_MANH(ux, 1);
-			else {
-				uint64_t o = ux.extu_fracl;
-				ux.extu_fracl += 1llu << (LDBL_MANT_DIG - e - 1);
-				if (ux.extu_fracl < o)	/* got a carry */
-					INC_MANH(ux, 1);
-			}
-		}
-		if (huge + x > 0.0)		/* raise inexact flag */
-			ux.extu_fracl &= ~m;
-	}
-	return (ux.extu_ld);
-}
-
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libm/src/s_fma.c b/lib/libm/src/s_fma.c
deleted file mode 100644
index 7b7c66085..000000000
--- a/lib/libm/src/s_fma.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*	$NetBSD: s_fma.c,v 1.6 2013/02/14 09:24:50 matt Exp $	*/
-
-/*-
- * Copyright (c) 2005-2011 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 <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_fma.c,v 1.8 2011/10/21 06:30:43 das Exp $");
-#else
-__RCSID("$NetBSD: s_fma.c,v 1.6 2013/02/14 09:24:50 matt Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <fenv.h>
-#include <float.h>
-#include <math.h>
-
-#include "math_private.h"
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(fmal, fma)
-#endif
-
-/*
- * A struct dd represents a floating-point number with twice the precision
- * of a double.  We maintain the invariant that "hi" stores the 53 high-order
- * bits of the result.
- */
-struct dd {
-	double hi;
-	double lo;
-};
-
-/*
- * Compute a+b exactly, returning the exact result in a struct dd.  We assume
- * that both a and b are finite, but make no assumptions about their relative
- * magnitudes.
- */
-static inline struct dd
-dd_add(double a, double b)
-{
-	struct dd ret;
-	double s;
-
-	ret.hi = a + b;
-	s = ret.hi - a;
-	ret.lo = (a - (ret.hi - s)) + (b - s);
-	return (ret);
-}
-
-/*
- * Compute a+b, with a small tweak:  The least significant bit of the
- * result is adjusted into a sticky bit summarizing all the bits that
- * were lost to rounding.  This adjustment negates the effects of double
- * rounding when the result is added to another number with a higher
- * exponent.  For an explanation of round and sticky bits, see any reference
- * on FPU design, e.g.,
- *
- *     J. Coonen.  An Implementation Guide to a Proposed Standard for
- *     Floating-Point Arithmetic.  Computer, vol. 13, no. 1, Jan 1980.
- */
-static inline double
-add_adjusted(double a, double b)
-{
-	struct dd sum;
-	uint64_t hibits, lobits;
-
-	sum = dd_add(a, b);
-	if (sum.lo != 0) {
-		EXTRACT_WORD64(hibits, sum.hi);
-		if ((hibits & 1) == 0) {
-			/* hibits += (int)copysign(1.0, sum.hi * sum.lo) */
-			EXTRACT_WORD64(lobits, sum.lo);
-			hibits += 1 - ((hibits ^ lobits) >> 62);
-			INSERT_WORD64(sum.hi, hibits);
-		}
-	}
-	return (sum.hi);
-}
-
-/*
- * Compute ldexp(a+b, scale) with a single rounding error. It is assumed
- * that the result will be subnormal, and care is taken to ensure that
- * double rounding does not occur.
- */
-static inline double
-add_and_denormalize(double a, double b, int scale)
-{
-	struct dd sum;
-	uint64_t hibits, lobits;
-	int bits_lost;
-
-	sum = dd_add(a, b);
-
-	/*
-	 * If we are losing at least two bits of accuracy to denormalization,
-	 * then the first lost bit becomes a round bit, and we adjust the
-	 * lowest bit of sum.hi to make it a sticky bit summarizing all the
-	 * bits in sum.lo. With the sticky bit adjusted, the hardware will
-	 * break any ties in the correct direction.
-	 *
-	 * If we are losing only one bit to denormalization, however, we must
-	 * break the ties manually.
-	 */
-	if (sum.lo != 0) {
-		EXTRACT_WORD64(hibits, sum.hi);
-		bits_lost = -((int)(hibits >> 52) & 0x7ff) - scale + 1;
-		if ((bits_lost != 1) ^ (int)(hibits & 1)) {
-			/* hibits += (int)copysign(1.0, sum.hi * sum.lo) */
-			EXTRACT_WORD64(lobits, sum.lo);
-			hibits += 1 - (((hibits ^ lobits) >> 62) & 2);
-			INSERT_WORD64(sum.hi, hibits);
-		}
-	}
-	return (ldexp(sum.hi, scale));
-}
-
-/*
- * Compute a*b exactly, returning the exact result in a struct dd.  We assume
- * that both a and b are normalized, so no underflow or overflow will occur.
- * The current rounding mode must be round-to-nearest.
- */
-static inline struct dd
-dd_mul(double a, double b)
-{
-	static const double split = 0x1p27 + 1.0;
-	struct dd ret;
-	double ha, hb, la, lb, p, q;
-
-	p = a * split;
-	ha = a - p;
-	ha += p;
-	la = a - ha;
-
-	p = b * split;
-	hb = b - p;
-	hb += p;
-	lb = b - hb;
-
-	p = ha * hb;
-	q = ha * lb + la * hb;
-
-	ret.hi = p + q;
-	ret.lo = p - ret.hi + q + la * lb;
-	return (ret);
-}
-
-/*
- * Fused multiply-add: Compute x * y + z with a single rounding error.
- *
- * We use scaling to avoid overflow/underflow, along with the
- * canonical precision-doubling technique adapted from:
- *
- *	Dekker, T.  A Floating-Point Technique for Extending the
- *	Available Precision.  Numer. Math. 18, 224-242 (1971).
- *
- * This algorithm is sensitive to the rounding precision.  FPUs such
- * as the i387 must be set in double-precision mode if variables are
- * to be stored in FP registers in order to avoid incorrect results.
- * This is the default on FreeBSD, but not on many other systems.
- *
- * Hardware instructions should be used on architectures that support it,
- * since this implementation will likely be several times slower.
- */
-double
-fma(double x, double y, double z)
-{
-	double xs, ys, zs, adj;
-	struct dd xy, r;
-	int oround;
-	int ex, ey, ez;
-	int spread;
-
-	/*
-	 * Handle special cases. The order of operations and the particular
-	 * return values here are crucial in handling special cases involving
-	 * infinities, NaNs, overflows, and signed zeroes correctly.
-	 */
-	if (x == 0.0 || y == 0.0)
-		return (x * y + z);
-	if (z == 0.0)
-		return (x * y);
-	if (!isfinite(x) || !isfinite(y))
-		return (x * y + z);
-	if (!isfinite(z))
-		return (z);
-
-	xs = frexp(x, &ex);
-	ys = frexp(y, &ey);
-	zs = frexp(z, &ez);
-	oround = fegetround();
-	spread = ex + ey - ez;
-
-	/*
-	 * If x * y and z are many orders of magnitude apart, the scaling
-	 * will overflow, so we handle these cases specially.  Rounding
-	 * modes other than FE_TONEAREST are painful.
-	 */
-	if (spread < -DBL_MANT_DIG) {
-		feraiseexcept(FE_INEXACT);
-		if (!isnormal(z))
-			feraiseexcept(FE_UNDERFLOW);
-		switch (oround) {
-		case FE_TONEAREST:
-			return (z);
-		case FE_TOWARDZERO:
-			if ((x > 0.0) ^ (y < 0.0) ^ (z < 0.0))
-				return (z);
-			else
-				return (nextafter(z, 0));
-		case FE_DOWNWARD:
-			if ((x > 0.0) ^ (y < 0.0))
-				return (z);
-			else
-				return (nextafter(z, -INFINITY));
-		default:	/* FE_UPWARD */
-			if ((x > 0.0) ^ (y < 0.0))
-				return (nextafter(z, INFINITY));
-			else
-				return (z);
-		}
-	}
-	if (spread <= DBL_MANT_DIG * 2)
-		zs = ldexp(zs, -spread);
-	else
-		zs = copysign(DBL_MIN, zs);
-
-	fesetround(FE_TONEAREST);
-
-	/*
-	 * Basic approach for round-to-nearest:
-	 *
-	 *     (xy.hi, xy.lo) = x * y		(exact)
-	 *     (r.hi, r.lo)   = xy.hi + z	(exact)
-	 *     adj = xy.lo + r.lo		(inexact; low bit is sticky)
-	 *     result = r.hi + adj		(correctly rounded)
-	 */
-	xy = dd_mul(xs, ys);
-	r = dd_add(xy.hi, zs);
-
-	spread = ex + ey;
-
-	if (r.hi == 0.0) {
-		/*
-		 * When the addends cancel to 0, ensure that the result has
-		 * the correct sign.
-		 */
-		fesetround(oround);
-		{
-		volatile double vzs = zs; /* XXX gcc CSE bug workaround */
-		return (xy.hi + vzs + ldexp(xy.lo, spread));
-		}
-	}
-
-	if (oround != FE_TONEAREST) {
-		/*
-		 * There is no need to worry about double rounding in directed
-		 * rounding modes.
-		 */
-		fesetround(oround);
-		adj = r.lo + xy.lo;
-		return (ldexp(r.hi + adj, spread));
-	}
-
-	adj = add_adjusted(r.lo, xy.lo);
-	if (spread + ilogb(r.hi) > -1023)
-		return (ldexp(r.hi + adj, spread));
-	else
-		return (add_and_denormalize(r.hi, adj, spread));
-}
diff --git a/lib/libm/src/s_fmaf.c b/lib/libm/src/s_fmaf.c
deleted file mode 100644
index 01884d70e..000000000
--- a/lib/libm/src/s_fmaf.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: s_fmaf.c,v 1.2 2013/02/11 01:29:58 christos Exp $	*/
-
-/*-
- * Copyright (c) 2005-2011 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 <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaf.c,v 1.3 2011/10/15 04:16:58 das Exp $");
-#else
-__RCSID("$NetBSD: s_fmaf.c,v 1.2 2013/02/11 01:29:58 christos Exp $");
-#endif
-
-#include <fenv.h>
-
-#include "math.h"
-#include "math_private.h"
-
-/*
- * Fused multiply-add: Compute x * y + z with a single rounding error.
- *
- * A double has more than twice as much precision than a float, so
- * direct double-precision arithmetic suffices, except where double
- * rounding occurs.
- */
-float
-fmaf(float x, float y, float z)
-{
-	double xy, result;
-	uint32_t hr, lr;
-
-	xy = (double)x * y;
-	result = xy + z;
-	EXTRACT_WORDS(hr, lr, result);
-	/* Common case: The double precision result is fine. */
-	if ((lr & 0x1fffffff) != 0x10000000 ||	/* not a halfway case */
-	    (hr & 0x7ff00000) == 0x7ff00000 ||	/* NaN */
-	    result - xy == z ||			/* exact */
-	    fegetround() != FE_TONEAREST)	/* not round-to-nearest */
-		return (result);
-
-	/*
-	 * If result is inexact, and exactly halfway between two float values,
-	 * we need to adjust the low-order bit in the direction of the error.
-	 */
-	fesetround(FE_TOWARDZERO);
-	volatile double vxy = xy;  /* XXX work around gcc CSE bug */
-	double adjusted_result = vxy + z;
-	fesetround(FE_TONEAREST);
-	if (result == adjusted_result)
-		SET_LOW_WORD(adjusted_result, lr + 1);
-	return (adjusted_result);
-}
diff --git a/lib/libm/src/s_fmal.c b/lib/libm/src/s_fmal.c
deleted file mode 100644
index eca2ba85f..000000000
--- a/lib/libm/src/s_fmal.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*	$NetBSD: s_fmal.c,v 1.3 2013/02/12 21:40:19 martin Exp $	*/
-
-/*-
- * Copyright (c) 2005-2011 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 <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.7 2011/10/21 06:30:43 das Exp $");
-#else
-__RCSID("$NetBSD: s_fmal.c,v 1.3 2013/02/12 21:40:19 martin Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <fenv.h>
-#include <float.h>
-#include <math.h>
-
-#include "math_private.h"
-
-#ifdef __HAVE_LONG_DOUBLE
-/*
- * A struct dd represents a floating-point number with twice the precision
- * of a long double.  We maintain the invariant that "hi" stores the high-order
- * bits of the result.
- */
-struct dd {
-	long double hi;
-	long double lo;
-};
-
-/*
- * Compute a+b exactly, returning the exact result in a struct dd.  We assume
- * that both a and b are finite, but make no assumptions about their relative
- * magnitudes.
- */
-static inline struct dd
-dd_add(long double a, long double b)
-{
-	struct dd ret;
-	long double s;
-
-	ret.hi = a + b;
-	s = ret.hi - a;
-	ret.lo = (a - (ret.hi - s)) + (b - s);
-	return (ret);
-}
-
-/*
- * Compute a+b, with a small tweak:  The least significant bit of the
- * result is adjusted into a sticky bit summarizing all the bits that
- * were lost to rounding.  This adjustment negates the effects of double
- * rounding when the result is added to another number with a higher
- * exponent.  For an explanation of round and sticky bits, see any reference
- * on FPU design, e.g.,
- *
- *     J. Coonen.  An Implementation Guide to a Proposed Standard for
- *     Floating-Point Arithmetic.  Computer, vol. 13, no. 1, Jan 1980.
- */
-static inline long double
-add_adjusted(long double a, long double b)
-{
-	struct dd sum;
-	union ieee_ext_u u;
-
-	sum = dd_add(a, b);
-	if (sum.lo != 0) {
-		u.extu_ld = sum.hi;
-		if ((u.extu_ext.ext_fracl & 1) == 0)
-			sum.hi = nextafterl(sum.hi, INFINITY * sum.lo);
-	}
-	return (sum.hi);
-}
-
-/*
- * Compute ldexp(a+b, scale) with a single rounding error. It is assumed
- * that the result will be subnormal, and care is taken to ensure that
- * double rounding does not occur.
- */
-static inline long double
-add_and_denormalize(long double a, long double b, int scale)
-{
-	struct dd sum;
-	int bits_lost;
-	union ieee_ext_u u;
-
-	sum = dd_add(a, b);
-
-	/*
-	 * If we are losing at least two bits of accuracy to denormalization,
-	 * then the first lost bit becomes a round bit, and we adjust the
-	 * lowest bit of sum.hi to make it a sticky bit summarizing all the
-	 * bits in sum.lo. With the sticky bit adjusted, the hardware will
-	 * break any ties in the correct direction.
-	 *
-	 * If we are losing only one bit to denormalization, however, we must
-	 * break the ties manually.
-	 */
-	if (sum.lo != 0) {
-		u.extu_ld = sum.hi;
-		bits_lost = -u.extu_ext.ext_exp - scale + 1;
-		if ((bits_lost != 1) ^ (int)(u.extu_ext.ext_fracl & 1))
-			sum.hi = nextafterl(sum.hi, INFINITY * sum.lo);
-	}
-	return (ldexp((double)sum.hi, scale));
-}
-
-/*
- * Compute a*b exactly, returning the exact result in a struct dd.  We assume
- * that both a and b are normalized, so no underflow or overflow will occur.
- * The current rounding mode must be round-to-nearest.
- */
-static inline struct dd
-dd_mul(long double a, long double b)
-{
-#if LDBL_MANT_DIG == 64
-	static const long double split = 0x1p32L + 1.0;
-#elif LDBL_MANT_DIG == 113
-	static const long double split = 0x1p57L + 1.0;
-#endif
-	struct dd ret;
-	long double ha, hb, la, lb, p, q;
-
-	p = a * split;
-	ha = a - p;
-	ha += p;
-	la = a - ha;
-
-	p = b * split;
-	hb = b - p;
-	hb += p;
-	lb = b - hb;
-
-	p = ha * hb;
-	q = ha * lb + la * hb;
-
-	ret.hi = p + q;
-	ret.lo = p - ret.hi + q + la * lb;
-	return (ret);
-}
-
-/*
- * Fused multiply-add: Compute x * y + z with a single rounding error.
- *
- * We use scaling to avoid overflow/underflow, along with the
- * canonical precision-doubling technique adapted from:
- *
- *	Dekker, T.  A Floating-Point Technique for Extending the
- *	Available Precision.  Numer. Math. 18, 224-242 (1971).
- */
-long double
-fmal(long double x, long double y, long double z)
-{
-	long double xs, ys, zs, adj;
-	struct dd xy, r;
-	int oround;
-	int ex, ey, ez;
-	int spread;
-
-	/*
-	 * Handle special cases. The order of operations and the particular
-	 * return values here are crucial in handling special cases involving
-	 * infinities, NaNs, overflows, and signed zeroes correctly.
-	 */
-	if (x == 0.0 || y == 0.0)
-		return (x * y + z);
-	if (z == 0.0)
-		return (x * y);
-	if (!isfinite(x) || !isfinite(y))
-		return (x * y + z);
-	if (!isfinite(z))
-		return (z);
-
-	xs = frexpl(x, &ex);
-	ys = frexpl(y, &ey);
-	zs = frexpl(z, &ez);
-	oround = fegetround();
-	spread = ex + ey - ez;
-
-	/*
-	 * If x * y and z are many orders of magnitude apart, the scaling
-	 * will overflow, so we handle these cases specially.  Rounding
-	 * modes other than FE_TONEAREST are painful.
-	 */
-	if (spread < -LDBL_MANT_DIG) {
-		feraiseexcept(FE_INEXACT);
-		if (!isnormal(z))
-			feraiseexcept(FE_UNDERFLOW);
-		switch (oround) {
-		case FE_TONEAREST:
-			return (z);
-		case FE_TOWARDZERO:
-			if ((x > 0.0) ^ (y < 0.0) ^ (z < 0.0))
-				return (z);
-			else
-				return (nextafterl(z, 0));
-		case FE_DOWNWARD:
-			if ((x > 0.0) ^ (y < 0.0))
-				return (z);
-			else
-				return (nextafterl(z, (long double)-INFINITY));
-		default:	/* FE_UPWARD */
-			if ((x > 0.0) ^ (y < 0.0))
-				return (nextafterl(z, (long double)INFINITY));
-			else
-				return (z);
-		}
-	}
-	if (spread <= LDBL_MANT_DIG * 2)
-		zs = ldexpl(zs, -spread);
-	else
-		zs = copysignl(LDBL_MIN, zs);
-
-	fesetround(FE_TONEAREST);
-
-	/*
-	 * Basic approach for round-to-nearest:
-	 *
-	 *     (xy.hi, xy.lo) = x * y		(exact)
-	 *     (r.hi, r.lo)   = xy.hi + z	(exact)
-	 *     adj = xy.lo + r.lo		(inexact; low bit is sticky)
-	 *     result = r.hi + adj		(correctly rounded)
-	 */
-	xy = dd_mul(xs, ys);
-	r = dd_add(xy.hi, zs);
-
-	spread = ex + ey;
-
-	if (r.hi == 0.0) {
-		/*
-		 * When the addends cancel to 0, ensure that the result has
-		 * the correct sign.
-		 */
-		fesetround(oround);
-		{
-		volatile long double vzs = zs; /* XXX gcc CSE bug workaround */
-		return (xy.hi + vzs + ldexpl(xy.lo, spread));
-		}
-	}
-
-	if (oround != FE_TONEAREST) {
-		/*
-		 * There is no need to worry about double rounding in directed
-		 * rounding modes.
-		 */
-		fesetround(oround);
-		adj = r.lo + xy.lo;
-		return (ldexpl(r.hi + adj, spread));
-	}
-
-	adj = add_adjusted(r.lo, xy.lo);
-	if (spread + ilogbl(r.hi) > -16383)
-		return (ldexpl(r.hi + adj, spread));
-	else
-		return (add_and_denormalize(r.hi, adj, spread));
-}
-#endif
diff --git a/lib/libm/src/s_fmax.c b/lib/libm/src/s_fmax.c
deleted file mode 100644
index 72f6b5dc1..000000000
--- a/lib/libm/src/s_fmax.c
+++ /dev/null
@@ -1,62 +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.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_fmax.c,v 1.3 2013/11/29 22:16:10 joerg Exp $");
-#ifdef notdef
-__FBSDID("$FreeBSD: src/lib/msun/src/s_fmax.c,v 1.1 2004/06/30 07:04:01 das Exp $");
-#endif
-
-#include <math.h>
-
-#include <machine/ieee.h>
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(fmaxl, fmax)
-#endif
-
-double
-fmax(double x, double y)
-{
-	union ieee_double_u u[2];
-
-	u[0].dblu_d = x;
-	u[1].dblu_d = y;
-
-	/* Check for NaNs to avoid raising spurious exceptions. */
-	if (u[0].dblu_dbl.dbl_exp == DBL_EXP_INFNAN &&
-	    (u[0].dblu_dbl.dbl_frach | u[0].dblu_dbl.dbl_fracl) != 0)
-		return (y);
-	if (u[1].dblu_dbl.dbl_exp == DBL_EXP_INFNAN &&
-	    (u[1].dblu_dbl.dbl_frach | u[1].dblu_dbl.dbl_fracl) != 0)
-		return (x);
-
-	/* Handle comparisons of signed zeroes. */
-	if (u[0].dblu_dbl.dbl_sign != u[1].dblu_dbl.dbl_sign)
-		return (u[u[0].dblu_dbl.dbl_sign].dblu_d);
-
-	return (x > y ? x : y);
-}
diff --git a/lib/libm/src/s_fmaxf.c b/lib/libm/src/s_fmaxf.c
deleted file mode 100644
index a96655a97..000000000
--- a/lib/libm/src/s_fmaxf.c
+++ /dev/null
@@ -1,58 +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.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_fmaxf.c,v 1.2 2010/03/08 01:05:20 snj Exp $");
-#ifdef notdef
-__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaxf.c,v 1.1 2004/06/30 07:04:01 das Exp $");
-#endif
-
-#include <math.h>
-
-#include <machine/ieee.h>
-
-float
-fmaxf(float x, float y)
-{
-	union ieee_single_u u[2];
-
-	u[0].sngu_f = x;
-	u[1].sngu_f = y;
-
-	/* Check for NaNs to avoid raising spurious exceptions. */
-	if (u[0].sngu_sng.sng_exp == SNG_EXP_INFNAN &&
-	    u[0].sngu_sng.sng_frac != 0)
-		return (y);
-	if (u[1].sngu_sng.sng_exp == SNG_EXP_INFNAN &&
-	    u[1].sngu_sng.sng_frac != 0)
-		return (x);
-
-	/* Handle comparisons of sng_signed zeroes. */
-	if (u[0].sngu_sng.sng_sign != u[1].sngu_sng.sng_sign)
-		return (u[u[0].sngu_sng.sng_sign].sngu_f);
-
-	return (x > y ? x : y);
-}
diff --git a/lib/libm/src/s_fmaxl.c b/lib/libm/src/s_fmaxl.c
deleted file mode 100644
index 6a06938d9..000000000
--- a/lib/libm/src/s_fmaxl.c
+++ /dev/null
@@ -1,63 +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.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_fmaxl.c,v 1.4 2013/11/29 22:16:10 joerg Exp $");
-#ifdef notdef
-__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaxl.c,v 1.1 2004/06/30 07:04:01 das Exp $");
-#endif
-
-#include <string.h>
-#include <math.h>
-
-#include <machine/ieee.h>
-#ifdef __HAVE_LONG_DOUBLE
-long double
-fmaxl(long double x, long double y)
-{
-	union ieee_ext_u u[2];
-
-	memset(&u, 0, sizeof u);
-	u[0].extu_ld = x;
-	u[0].extu_ext.ext_frach &= ~0x80000000;
-	u[1].extu_ld = y;
-	u[1].extu_ext.ext_frach &= ~0x80000000;
-
-	/* Check for NaNs to avoid raising spurious exceptions. */
-	if (u[0].extu_ext.ext_exp == EXT_EXP_INFNAN &&
-	    (u[0].extu_ext.ext_frach | u[0].extu_ext.ext_fracl) != 0)
-		return (y);
-	if (u[1].extu_ext.ext_exp == EXT_EXP_INFNAN &&
-	    (u[1].extu_ext.ext_frach | u[1].extu_ext.ext_fracl) != 0)
-		return (x);
-
-	/* Handle comparisons of ext_signed zeroes. */
-	if (u[0].extu_ext.ext_sign != u[1].extu_ext.ext_sign)
-		return (u[0].extu_ext.ext_sign ? y : x);
-
-	return (x > y ? x : y);
-}
-#endif
diff --git a/lib/libm/src/s_fmin.c b/lib/libm/src/s_fmin.c
deleted file mode 100644
index ad4bed611..000000000
--- a/lib/libm/src/s_fmin.c
+++ /dev/null
@@ -1,62 +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.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_fmin.c,v 1.2 2013/11/29 22:16:10 joerg Exp $");
-#ifdef notdef
-__FBSDID("$FreeBSD: src/lib/msun/src/s_fmin.c,v 1.1 2004/06/30 07:04:01 das Exp $");
-#endif
-
-#include <math.h>
-
-#include <machine/ieee.h>
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(fminl, fmin)
-#endif
-
-double
-fmin(double x, double y)
-{
-	union ieee_double_u u[2];
-
-	u[0].dblu_d = x;
-	u[1].dblu_d = y;
-
-	/* Check for NaNs to avoid raising spurious exceptions. */
-	if (u[0].dblu_dbl.dbl_exp == DBL_EXP_INFNAN &&
-	    (u[0].dblu_dbl.dbl_frach | u[0].dblu_dbl.dbl_fracl) != 0)
-		return (y);
-	if (u[1].dblu_dbl.dbl_exp == DBL_EXP_INFNAN &&
-	    (u[1].dblu_dbl.dbl_frach | u[1].dblu_dbl.dbl_fracl) != 0)
-		return (x);
-
-	/* Handle comparisons of signed zeroes. */
-	if (u[0].dblu_dbl.dbl_sign != u[1].dblu_dbl.dbl_sign)
-		return (u[u[1].dblu_dbl.dbl_sign].dblu_d);
-
-	return (x < y ? x : y);
-}
diff --git a/lib/libm/src/s_fminf.c b/lib/libm/src/s_fminf.c
deleted file mode 100644
index 59f6ce3c3..000000000
--- a/lib/libm/src/s_fminf.c
+++ /dev/null
@@ -1,58 +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.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_fminf.c,v 1.2 2010/03/08 01:05:20 snj Exp $");
-#ifdef notdef
-__FBSDID("$FreeBSD: src/lib/msun/src/s_fminf.c,v 1.1 2004/06/30 07:04:01 das Exp $");
-#endif
-
-#include <math.h>
-
-#include <machine/ieee.h>
-
-float
-fminf(float x, float y)
-{
-	union ieee_single_u u[2];
-
-	u[0].sngu_f = x;
-	u[1].sngu_f = y;
-
-	/* Check for NaNs to avoid raising spurious exceptions. */
-	if (u[0].sngu_sng.sng_exp == SNG_EXP_INFNAN &&
-	    u[0].sngu_sng.sng_frac != 0)
-		return (y);
-	if (u[1].sngu_sng.sng_exp == SNG_EXP_INFNAN &&
-	    u[1].sngu_sng.sng_frac != 0)
-		return (x);
-
-	/* Handle comparisons of sng_singed zeroes. */
-	if (u[0].sngu_sng.sng_sign != u[1].sngu_sng.sng_sign)
-		return (u[u[1].sngu_sng.sng_sign].sngu_f);
-
-	return (x < y ? x : y);
-}
diff --git a/lib/libm/src/s_fminl.c b/lib/libm/src/s_fminl.c
deleted file mode 100644
index 8f45b3784..000000000
--- a/lib/libm/src/s_fminl.c
+++ /dev/null
@@ -1,63 +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.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_fminl.c,v 1.4 2013/11/29 22:16:10 joerg Exp $");
-#ifdef notdef
-__FBSDID("$FreeBSD: src/lib/msun/src/s_fminl.c,v 1.1 2004/06/30 07:04:01 das Exp $");
-#endif
-
-#include <math.h>
-#include <string.h>
-
-#include <machine/ieee.h>
-#ifdef __HAVE_LONG_DOUBLE
-long double
-fminl(long double x, long double y)
-{
-	union ieee_ext_u u[2];
-
-	memset(&u, 0, sizeof u);
-	u[0].extu_ld = x;
-	u[0].extu_ext.ext_frach &= ~0x80000000;
-	u[1].extu_ld = y;
-	u[1].extu_ext.ext_frach &= ~0x80000000;
-
-	/* Check for NaNs to avoid raising spurious exceptions. */
-	if (u[0].extu_ext.ext_exp == EXT_EXP_INFNAN &&
-	    (u[0].extu_ext.ext_frach | u[0].extu_ext.ext_fracl) != 0)
-		return (y);
-	if (u[1].extu_ext.ext_exp == EXT_EXP_INFNAN &&
-	    (u[1].extu_ext.ext_frach | u[1].extu_ext.ext_fracl) != 0)
-		return (x);
-
-	/* Handle comparisons of ext_signed zeroes. */
-	if (u[0].extu_ext.ext_sign != u[1].extu_ext.ext_sign)
-		return (u[1].extu_ext.ext_sign ? y : x);
-
-	return (x < y ? x : y);
-}
-#endif
diff --git a/lib/libm/src/s_frexp.c b/lib/libm/src/s_frexp.c
deleted file mode 100644
index 12d07cb8f..000000000
--- a/lib/libm/src/s_frexp.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* @(#)s_frexp.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_frexp.c,v 1.13 2008/09/28 18:54:55 christos Exp $");
-#endif
-
-/*
- * for non-zero x
- *	x = frexp(arg,&exp);
- * return a double fp quantity x such that 0.5 <= |x| <1.0
- * and the corresponding binary exponent "exp". That is
- *	arg = x*2^exp.
- * If arg is inf, 0.0, or NaN, then frexp(arg,&exp) returns arg
- * with *exp=0.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-two54 =  1.80143985094819840000e+16; /* 0x43500000, 0x00000000 */
-
-double
-frexp(double x, int *eptr)
-{
-	int32_t hx, ix, lx;
-	EXTRACT_WORDS(hx,lx,x);
-	ix = 0x7fffffff&hx;
-	*eptr = 0;
-	if(ix>=0x7ff00000||((ix|lx)==0)) return x;	/* 0,inf,nan */
-	if (ix<0x00100000) {		/* subnormal */
-	    x *= two54;
-	    GET_HIGH_WORD(hx,x);
-	    ix = hx&0x7fffffff;
-	    *eptr = -54;
-	}
-	*eptr += ((uint32_t)ix>>20)-1022;
-	hx = (hx&0x800fffff)|0x3fe00000;
-	SET_HIGH_WORD(x,hx);
-	return x;
-}
diff --git a/lib/libm/src/s_frexpf.c b/lib/libm/src/s_frexpf.c
deleted file mode 100644
index a6ee5818c..000000000
--- a/lib/libm/src/s_frexpf.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* s_frexpf.c -- float version of s_frexp.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_frexpf.c,v 1.10 2007/08/21 20:12:27 drochner Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-two25 =  3.3554432000e+07; /* 0x4c000000 */
-
-float
-frexpf(float x, int *eptr)
-{
-	int32_t hx,ix;
-	GET_FLOAT_WORD(hx,x);
-	ix = 0x7fffffff&hx;
-	*eptr = 0;
-	if(ix>=0x7f800000||(ix==0)) return x;	/* 0,inf,nan */
-	if (ix<0x00800000) {		/* subnormal */
-	    x *= two25;
-	    GET_FLOAT_WORD(hx,x);
-	    ix = hx&0x7fffffff;
-	    *eptr = -25;
-	}
-	*eptr += (ix>>23)-126;
-	hx = (hx&0x807fffff)|0x3f000000;
-	SET_FLOAT_WORD(x,hx);
-	return x;
-}
diff --git a/lib/libm/src/s_frexpl.c b/lib/libm/src/s_frexpl.c
deleted file mode 100644
index 7a65d87f6..000000000
--- a/lib/libm/src/s_frexpl.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: s_frexpl.c,v 1.3 2013/02/12 21:40:19 martin Exp $	*/
-
-/*-
- * 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: src/lib/msun/src/s_frexpl.c,v 1.1 2005/03/07 04:54:51 das Exp $
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_frexpl.c,v 1.3 2013/02/12 21:40:19 martin Exp $");
-
-#include <machine/ieee.h>
-#include <float.h>
-#include <math.h>
-
-#include "math_private.h"
-
-#ifdef __HAVE_LONG_DOUBLE
-#if LDBL_MAX_EXP != 0x4000
-#error "Unsupported long double format"
-#endif
-
-long double
-frexpl(long double x, int *ex)
-{
-	union ieee_ext_u u;
-
-	u.extu_ld = x;
-	switch (u.extu_ext.ext_exp) {
-	case 0:		/* 0 or subnormal */
-		if ((u.extu_ext.ext_fracl | u.extu_ext.ext_frach) == 0) {
-			*ex = 0;
-		} else {
-			u.extu_ld *= 0x1.0p514;
-			*ex = u.extu_ext.ext_exp - 0x4200;
-			u.extu_ext.ext_exp = 0x3ffe;
-		}
-		break;
-	case 0x7fff:	/* infinity or NaN; value of *ex is unspecified */
-		break;
-	default:	/* normal */
-		*ex = u.extu_ext.ext_exp - 0x3ffe;
-		u.extu_ext.ext_exp = 0x3ffe;
-		break;
-	}
-	return (u.extu_ld);
-}
-#endif
diff --git a/lib/libm/src/s_ilogb.c b/lib/libm/src/s_ilogb.c
deleted file mode 100644
index 4ae44c2ea..000000000
--- a/lib/libm/src/s_ilogb.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* @(#)s_ilogb.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_ilogb.c,v 1.14 2013/02/09 22:56:00 matt Exp $");
-#endif
-
-/* ilogb(double x)
- * return the binary exponent of non-zero x
- * ilogb(0) = 0x80000001
- * ilogb(inf/NaN) = 0x7fffffff (no signal is raised)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(ilogbl,ilogb)
-#endif
-
-int
-ilogb(double x)
-{
-	int32_t hx,lx,ix;
-
-	GET_HIGH_WORD(hx,x);
-	hx &= 0x7fffffff;
-	if(hx<0x00100000) {
-	    GET_LOW_WORD(lx,x);
-	    if((hx|lx)==0)
-		return FP_ILOGB0;	/* ilogb(0) = 0x80000001 */
-	    else			/* subnormal x */
-		if(hx==0) {
-		    for (ix = -1043; lx>0; lx<<=1) ix -=1;
-		} else {
-		    for (ix = -1022,hx<<=11; hx>0; hx<<=1) ix -=1;
-		}
-	    return ix;
-	}
-	else if (hx<0x7ff00000) return (hx>>20)-1023;
-	else return FP_ILOGBNAN;	/* inf too */
-}
diff --git a/lib/libm/src/s_ilogbf.c b/lib/libm/src/s_ilogbf.c
deleted file mode 100644
index ae52eb6d0..000000000
--- a/lib/libm/src/s_ilogbf.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* s_ilogbf.c -- float version of s_ilogb.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_ilogbf.c,v 1.8 2013/02/09 22:56:00 matt Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-int
-ilogbf(float x)
-{
-	int32_t hx,ix;
-
-	GET_FLOAT_WORD(hx,x);
-	hx &= 0x7fffffff;
-	if(hx<0x00800000) {
-	    if(hx==0)
-		return FP_ILOGB0;	/* ilogb(0) = 0x80000001 */
-	    else			/* subnormal x */
-	        for (ix = -126,hx<<=8; hx>0; hx<<=1) ix -=1;
-	    return ix;
-	}
-	else if (hx<0x7f800000) return (hx>>23)-127;
-	else return FP_ILOGBNAN;	/* inf too */
-}
diff --git a/lib/libm/src/s_ilogbl.c b/lib/libm/src/s_ilogbl.c
deleted file mode 100644
index 47d85721b..000000000
--- a/lib/libm/src/s_ilogbl.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: s_ilogbl.c,v 1.2 2013/02/09 22:56:00 matt Exp $	*/
-
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Joerg Sonnenberger.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_ilogbl.c,v 1.2 2013/02/09 22:56:00 matt Exp $");
-
-#include "namespace.h"
-
-#include <float.h>
-#include <math.h>
-#include <machine/ieee.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-
-#if LDBL_MANT_DIG == 64
-#define	FROM_UNDERFLOW	0x1p65L
-#elif LDBL_MANT_DIG == 113
-#define	FROM_UNDERFLOW	0x1p114L
-#else
-#error Unsupported long double format
-#endif
-
-int
-ilogbl(long double x)
-{
-	union ieee_ext_u u;
-
-	if (x == 0.0L)
-		return FP_ILOGB0;	/* ilogbl(0) = 0x80000001 */
-
-	u.extu_ld = x;
-
-	if (u.extu_ext.ext_exp == EXT_EXP_INFNAN)
-		return FP_ILOGBNAN;	/* inf too */
-
-	if (u.extu_ext.ext_exp == 0) {
-		/*
-		 * Scale denormalized numbers slightly,
-		 * so that they are normal.
-		 */
-		u.extu_ld *= FROM_UNDERFLOW;
-		return u.extu_ext.ext_exp - EXT_EXP_BIAS - LDBL_MANT_DIG - 1;
-	}
-	return u.extu_ext.ext_exp - EXT_EXP_BIAS;
-
-}
-
-#endif
diff --git a/lib/libm/src/s_infinity.c b/lib/libm/src/s_infinity.c
deleted file mode 100644
index af2b64471..000000000
--- a/lib/libm/src/s_infinity.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*	$NetBSD: s_infinity.c,v 1.5 2003/07/26 19:25:05 salo Exp $	*/
-
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <sys/types.h>
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-char __infinity[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x7f };
-#else
-char __infinity[] = { 0x7f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-#endif
diff --git a/lib/libm/src/s_isinf.c b/lib/libm/src/s_isinf.c
deleted file mode 100644
index bb44036c9..000000000
--- a/lib/libm/src/s_isinf.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_isinf.c,v 1.6 2003/07/26 19:25:05 salo Exp $");
-#endif
-
-/*
- * isinf(x) returns 1 is x is inf, else 0;
- * no branching!
- */
-
-#include "math.h"
-#include "math_private.h"
-
-int
-isinf(double x)
-{
-	int32_t hx,lx;
-	EXTRACT_WORDS(hx,lx,x);
-	hx &= 0x7fffffff;
-	hx ^= 0x7ff00000;
-	hx |= lx;
-	return (hx == 0);
-}
diff --git a/lib/libm/src/s_isinff.c b/lib/libm/src/s_isinff.c
deleted file mode 100644
index f289abf70..000000000
--- a/lib/libm/src/s_isinff.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_isinff.c,v 1.6 2003/07/26 19:25:06 salo Exp $");
-#endif
-
-/*
- * isinff(x) returns 1 is x is inf, else 0;
- * no branching!
- */
-
-#include "math.h"
-#include "math_private.h"
-
-int
-isinff(float x)
-{
-	int32_t ix;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;
-	ix ^= 0x7f800000;
-	return (ix == 0);
-}
diff --git a/lib/libm/src/s_isnan.c b/lib/libm/src/s_isnan.c
deleted file mode 100644
index 9a319530e..000000000
--- a/lib/libm/src/s_isnan.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* @(#)s_isnan.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_isnan.c,v 1.11 2002/05/26 22:01:56 wiz Exp $");
-#endif
-
-/*
- * isnan(x) returns 1 is x is nan, else 0;
- * no branching!
- */
-
-#include "math.h"
-#include "math_private.h"
-
-int
-isnan(double x)
-{
-	int32_t hx,lx;
-	EXTRACT_WORDS(hx,lx,x);
-	hx &= 0x7fffffff;
-	hx |= (u_int32_t)(lx|(-lx))>>31;
-	hx = 0x7ff00000 - hx;
-	return (int)((u_int32_t)(hx))>>31;
-}
diff --git a/lib/libm/src/s_isnanf.c b/lib/libm/src/s_isnanf.c
deleted file mode 100644
index 457a414ae..000000000
--- a/lib/libm/src/s_isnanf.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* s_isnanf.c -- float version of s_isnan.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_isnanf.c,v 1.7 2002/05/26 22:01:56 wiz Exp $");
-#endif
-
-/*
- * isnanf(x) returns 1 is x is nan, else 0;
- * no branching!
- */
-
-#include "math.h"
-#include "math_private.h"
-
-int
-isnanf(float x)
-{
-	int32_t ix;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;
-	ix = 0x7f800000 - ix;
-	return (int)(((u_int32_t)(ix))>>31);
-}
diff --git a/lib/libm/src/s_lib_version.c b/lib/libm/src/s_lib_version.c
deleted file mode 100644
index 147a2ef32..000000000
--- a/lib/libm/src/s_lib_version.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* @(#)s_lib_ver.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_lib_version.c,v 1.8 1999/07/02 15:37:43 simonb Exp $");
-#endif
-
-/*
- * MACRO for standards
- */
-
-#include "math.h"
-#include "math_private.h"
-
-/*
- * define and initialize _LIB_VERSION
- */
-#ifdef _POSIX_MODE
-_LIB_VERSION_TYPE _LIB_VERSION = _POSIX_;
-#else
-#ifdef _XOPEN_MODE
-_LIB_VERSION_TYPE _LIB_VERSION = _XOPEN_;
-#else
-#ifdef _SVID3_MODE
-_LIB_VERSION_TYPE _LIB_VERSION = _SVID_;
-#else					/* default _IEEE_MODE */
-_LIB_VERSION_TYPE _LIB_VERSION = _IEEE_;
-#endif
-#endif
-#endif
diff --git a/lib/libm/src/s_log1p.c b/lib/libm/src/s_log1p.c
deleted file mode 100644
index 9d2faf0e4..000000000
--- a/lib/libm/src/s_log1p.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* @(#)s_log1p.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_log1p.c,v 1.12 2002/05/26 22:01:57 wiz Exp $");
-#endif
-
-/* double log1p(double x)
- *
- * Method :
- *   1. Argument Reduction: find k and f such that
- *			1+x = 2^k * (1+f),
- *	   where  sqrt(2)/2 < 1+f < sqrt(2) .
- *
- *      Note. If k=0, then f=x is exact. However, if k!=0, then f
- *	may not be representable exactly. In that case, a correction
- *	term is need. Let u=1+x rounded. Let c = (1+x)-u, then
- *	log(1+x) - log(u) ~ c/u. Thus, we proceed to compute log(u),
- *	and add back the correction term c/u.
- *	(Note: when x > 2**53, one can simply return log(x))
- *
- *   2. Approximation of log1p(f).
- *	Let s = f/(2+f) ; based on log(1+f) = log(1+s) - log(1-s)
- *		 = 2s + 2/3 s**3 + 2/5 s**5 + .....,
- *	     	 = 2s + s*R
- *      We use a special Reme algorithm on [0,0.1716] to generate
- * 	a polynomial of degree 14 to approximate R The maximum error
- *	of this polynomial approximation is bounded by 2**-58.45. In
- *	other words,
- *		        2      4      6      8      10      12      14
- *	    R(z) ~ Lp1*s +Lp2*s +Lp3*s +Lp4*s +Lp5*s  +Lp6*s  +Lp7*s
- *  	(the values of Lp1 to Lp7 are listed in the program)
- *	and
- *	    |      2          14          |     -58.45
- *	    | Lp1*s +...+Lp7*s    -  R(z) | <= 2
- *	    |                             |
- *	Note that 2s = f - s*f = f - hfsq + s*hfsq, where hfsq = f*f/2.
- *	In order to guarantee error in log below 1ulp, we compute log
- *	by
- *		log1p(f) = f - (hfsq - s*(hfsq+R)).
- *
- *	3. Finally, log1p(x) = k*ln2 + log1p(f).
- *		 	     = k*ln2_hi+(f-(hfsq-(s*(hfsq+R)+k*ln2_lo)))
- *	   Here ln2 is split into two floating point number:
- *			ln2_hi + ln2_lo,
- *	   where n*ln2_hi is always exact for |n| < 2000.
- *
- * Special cases:
- *	log1p(x) is NaN with signal if x < -1 (including -INF) ;
- *	log1p(+INF) is +INF; log1p(-1) is -INF with signal;
- *	log1p(NaN) is that NaN with no signal.
- *
- * Accuracy:
- *	according to an error analysis, the error is always less than
- *	1 ulp (unit in the last place).
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following
- * constants. The decimal values may be used, provided that the
- * compiler will convert from decimal to binary accurately enough
- * to produce the hexadecimal values shown.
- *
- * Note: Assuming log() return accurate answer, the following
- * 	 algorithm can be used to compute log1p(x) to within a few ULP:
- *
- *		u = 1+x;
- *		if(u==1.0) return x ; else
- *			   return log(u)*(x/(u-1.0));
- *
- *	 See HP-15C Advanced Functions Handbook, p.193.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-ln2_hi  =  6.93147180369123816490e-01,	/* 3fe62e42 fee00000 */
-ln2_lo  =  1.90821492927058770002e-10,	/* 3dea39ef 35793c76 */
-two54   =  1.80143985094819840000e+16,  /* 43500000 00000000 */
-Lp1 = 6.666666666666735130e-01,  /* 3FE55555 55555593 */
-Lp2 = 3.999999999940941908e-01,  /* 3FD99999 9997FA04 */
-Lp3 = 2.857142874366239149e-01,  /* 3FD24924 94229359 */
-Lp4 = 2.222219843214978396e-01,  /* 3FCC71C5 1D8E78AF */
-Lp5 = 1.818357216161805012e-01,  /* 3FC74664 96CB03DE */
-Lp6 = 1.531383769920937332e-01,  /* 3FC39A09 D078C69F */
-Lp7 = 1.479819860511658591e-01;  /* 3FC2F112 DF3E5244 */
-
-static const double zero = 0.0;
-
-double
-log1p(double x)
-{
-	double hfsq,f,c,s,z,R,u;
-	int32_t k,hx,hu,ax;
-
-	f = c = 0;
-	hu = 0;
-	GET_HIGH_WORD(hx,x);
-	ax = hx&0x7fffffff;
-
-	k = 1;
-	if (hx < 0x3FDA827A) {			/* x < 0.41422  */
-	    if(ax>=0x3ff00000) {		/* x <= -1.0 */
-		if(x==-1.0) return -two54/zero; /* log1p(-1)=+inf */
-		else return (x-x)/(x-x);	/* log1p(x<-1)=NaN */
-	    }
-	    if(ax<0x3e200000) {			/* |x| < 2**-29 */
-		if(two54+x>zero			/* raise inexact */
-	            &&ax<0x3c900000) 		/* |x| < 2**-54 */
-		    return x;
-		else
-		    return x - x*x*0.5;
-	    }
-	    if(hx>0||hx<=((int32_t)0xbfd2bec3)) {
-		k=0;f=x;hu=1;}	/* -0.2929<x<0.41422 */
-	}
-	if (hx >= 0x7ff00000) return x+x;
-	if(k!=0) {
-	    if(hx<0x43400000) {
-		u  = 1.0+x;
-		GET_HIGH_WORD(hu,u);
-	        k  = (hu>>20)-1023;
-	        c  = (k>0)? 1.0-(u-x):x-(u-1.0);/* correction term */
-		c /= u;
-	    } else {
-		u  = x;
-		GET_HIGH_WORD(hu,u);
-	        k  = (hu>>20)-1023;
-		c  = 0;
-	    }
-	    hu &= 0x000fffff;
-	    if(hu<0x6a09e) {
-	        SET_HIGH_WORD(u,hu|0x3ff00000);	/* normalize u */
-	    } else {
-	        k += 1;
-		SET_HIGH_WORD(u,hu|0x3fe00000);	/* normalize u/2 */
-	        hu = (0x00100000-hu)>>2;
-	    }
-	    f = u-1.0;
-	}
-	hfsq=0.5*f*f;
-	if(hu==0) {	/* |f| < 2**-20 */
-	    if(f==zero) { if(k==0) return zero;
-			  else {c += k*ln2_lo; return k*ln2_hi+c;}
-	    }
-	    R = hfsq*(1.0-0.66666666666666666*f);
-	    if(k==0) return f-R; else
-	    	     return k*ln2_hi-((R-(k*ln2_lo+c))-f);
-	}
- 	s = f/(2.0+f);
-	z = s*s;
-	R = z*(Lp1+z*(Lp2+z*(Lp3+z*(Lp4+z*(Lp5+z*(Lp6+z*Lp7))))));
-	if(k==0) return f-(hfsq-s*(hfsq+R)); else
-		 return k*ln2_hi-((hfsq-(s*(hfsq+R)+(k*ln2_lo+c)))-f);
-}
diff --git a/lib/libm/src/s_log1pf.c b/lib/libm/src/s_log1pf.c
deleted file mode 100644
index b7afa8434..000000000
--- a/lib/libm/src/s_log1pf.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* s_log1pf.c -- float version of s_log1p.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_log1pf.c,v 1.8 2002/05/26 22:01:57 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-ln2_hi =   6.9313812256e-01,	/* 0x3f317180 */
-ln2_lo =   9.0580006145e-06,	/* 0x3717f7d1 */
-two25 =    3.355443200e+07,	/* 0x4c000000 */
-Lp1 = 6.6666668653e-01,	/* 3F2AAAAB */
-Lp2 = 4.0000000596e-01,	/* 3ECCCCCD */
-Lp3 = 2.8571429849e-01, /* 3E924925 */
-Lp4 = 2.2222198546e-01, /* 3E638E29 */
-Lp5 = 1.8183572590e-01, /* 3E3A3325 */
-Lp6 = 1.5313838422e-01, /* 3E1CD04F */
-Lp7 = 1.4798198640e-01; /* 3E178897 */
-
-static const float zero = 0.0;
-
-float
-log1pf(float x)
-{
-	float hfsq,f,c,s,z,R,u;
-	int32_t k,hx,hu,ax;
-
-	f = c = 0;
-	hu = 0;
-	GET_FLOAT_WORD(hx,x);
-	ax = hx&0x7fffffff;
-
-	k = 1;
-	if (hx < 0x3ed413d7) {			/* x < 0.41422  */
-	    if(ax>=0x3f800000) {		/* x <= -1.0 */
-		if(x==(float)-1.0) return -two25/zero; /* log1p(-1)=+inf */
-		else return (x-x)/(x-x);	/* log1p(x<-1)=NaN */
-	    }
-	    if(ax<0x31000000) {			/* |x| < 2**-29 */
-		if(two25+x>zero			/* raise inexact */
-	            &&ax<0x24800000) 		/* |x| < 2**-54 */
-		    return x;
-		else
-		    return x - x*x*(float)0.5;
-	    }
-	    if(hx>0||hx<=((int32_t)0xbe95f61f)) {
-		k=0;f=x;hu=1;}	/* -0.2929<x<0.41422 */
-	}
-	if (hx >= 0x7f800000) return x+x;
-	if(k!=0) {
-	    if(hx<0x5a000000) {
-		u  = (float)1.0+x;
-		GET_FLOAT_WORD(hu,u);
-	        k  = (hu>>23)-127;
-		/* correction term */
-	        c  = (k>0)? (float)1.0-(u-x):x-(u-(float)1.0);
-		c /= u;
-	    } else {
-		u  = x;
-		GET_FLOAT_WORD(hu,u);
-	        k  = (hu>>23)-127;
-		c  = 0;
-	    }
-	    hu &= 0x007fffff;
-	    if(hu<0x3504f7) {
-	        SET_FLOAT_WORD(u,hu|0x3f800000);/* normalize u */
-	    } else {
-	        k += 1;
-		SET_FLOAT_WORD(u,hu|0x3f000000);	/* normalize u/2 */
-	        hu = (0x00800000-hu)>>2;
-	    }
-	    f = u-(float)1.0;
-	}
-	hfsq=(float)0.5*f*f;
-	if(hu==0) {	/* |f| < 2**-20 */
-	    if(f==zero) { if(k==0) return zero;
-			  else {c += k*ln2_lo; return k*ln2_hi+c;}
-	    }
-	    R = hfsq*((float)1.0-(float)0.66666666666666666*f);
-	    if(k==0) return f-R; else
-	    	     return k*ln2_hi-((R-(k*ln2_lo+c))-f);
-	}
- 	s = f/((float)2.0+f);
-	z = s*s;
-	R = z*(Lp1+z*(Lp2+z*(Lp3+z*(Lp4+z*(Lp5+z*(Lp6+z*Lp7))))));
-	if(k==0) return f-(hfsq-s*(hfsq+R)); else
-		 return k*ln2_hi-((hfsq-(s*(hfsq+R)+(k*ln2_lo+c)))-f);
-}
diff --git a/lib/libm/src/s_logb.c b/lib/libm/src/s_logb.c
deleted file mode 100644
index 6d89e5428..000000000
--- a/lib/libm/src/s_logb.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* @(#)s_logb.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_logb.c,v 1.12 2011/08/03 14:13:07 joerg Exp $");
-#endif
-
-/*
- * double logb(x)
- * IEEE 754 logb. Included to pass IEEE test suite. Not recommend.
- * Use ilogb instead.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(logbl,logb)
-#endif
-
-double
-logb(double x)
-{
-	int32_t lx,ix;
-	EXTRACT_WORDS(ix,lx,x);
-	ix &= 0x7fffffff;			/* high |x| */
-	if((ix|lx)==0) return -1.0/fabs(x);
-	if(ix>=0x7ff00000) return x*x;
-	if((ix>>=20)==0) 			/* IEEE 754 logb */
-		return -1022.0;
-	else
-		return (double) (ix-1023);
-}
diff --git a/lib/libm/src/s_logbf.c b/lib/libm/src/s_logbf.c
deleted file mode 100644
index 73fdff2e1..000000000
--- a/lib/libm/src/s_logbf.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* s_logbf.c -- float version of s_logb.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_logbf.c,v 1.7 2002/05/26 22:01:57 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-float
-logbf(float x)
-{
-	int32_t ix;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;			/* high |x| */
-	if(ix==0) return (float)-1.0/fabsf(x);
-	if(ix>=0x7f800000) return x*x;
-	if((ix>>=23)==0) 			/* IEEE 754 logb */
-		return -126.0;
-	else
-		return (float) (ix-127);
-}
diff --git a/lib/libm/src/s_logbl.c b/lib/libm/src/s_logbl.c
deleted file mode 100644
index 428999051..000000000
--- a/lib/libm/src/s_logbl.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: s_logbl.c,v 1.1 2011/08/03 14:13:07 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Joerg Sonnenberger.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_logbl.c,v 1.1 2011/08/03 14:13:07 joerg Exp $");
-
-#include "namespace.h"
-
-#include <float.h>
-#include <math.h>
-#include <machine/ieee.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-
-#if LDBL_MANT_DIG == 64
-#define	FROM_UNDERFLOW	0x1p65L
-#elif LDBL_MANT_DIG == 113
-#define	FROM_UNDERFLOW	0x1p114L
-#else
-#error Unsupported long double format
-#endif
-
-long double
-logbl(long double x)
-{
-	union ieee_ext_u u;
-
-	if (x == 0.0L)
-		return -1.0L / fabsl(x); /* -HUGE_VALL + exception */
-
-	u.extu_ld = x;
-
-	if (u.extu_ext.ext_exp == EXT_EXP_INFNAN)
-		return fabsl(x); /* NaN or +Inf */
-
-	if (u.extu_ext.ext_exp == 0) {
-		/*
-		 * Scale denormalized numbers slightly,
-		 * so that they are normal.
-		 */
-		u.extu_ld *= FROM_UNDERFLOW;
-		return u.extu_ext.ext_exp - EXT_EXP_BIAS - LDBL_MANT_DIG - 1;
-	}
-	return u.extu_ext.ext_exp - EXT_EXP_BIAS;
-
-}
-
-#endif
diff --git a/lib/libm/src/s_matherr.c b/lib/libm/src/s_matherr.c
deleted file mode 100644
index f330a1755..000000000
--- a/lib/libm/src/s_matherr.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* @(#)s_matherr.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_matherr.c,v 1.9 2002/05/26 22:01:57 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-int
-matherr(struct exception *x)
-{
-	int n=0;
-	if(x->arg1!=x->arg1) return 0;
-	return n;
-}
diff --git a/lib/libm/src/s_modf.c b/lib/libm/src/s_modf.c
deleted file mode 100644
index a77f59aee..000000000
--- a/lib/libm/src/s_modf.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* @(#)s_modf.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_modf.c,v 1.15 2014/06/16 12:54:43 joerg Exp $");
-#endif
-
-/*
- * modf(double x, double *iptr)
- * return fraction part of x, and return x's integral part in *iptr.
- * Method:
- *	Bit twiddling.
- *
- * Exception:
- *	No exception.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double one = 1.0;
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(_modfl, modf)
-__weak_alias(modfl, modf)
-#endif
-
-double
-modf(double x, double *iptr)
-{
-	int32_t i0,i1,jj0;
-	u_int32_t i;
-	EXTRACT_WORDS(i0,i1,x);
-	jj0 = (((uint32_t)i0>>20)&0x7ff)-0x3ff;	/* exponent of x */
-	if(jj0<20) {			/* integer part in high x */
-	    if(jj0<0) {			/* |x|<1 */
-	        INSERT_WORDS(*iptr,i0&0x80000000,0);	/* *iptr = +-0 */
-		return x;
-	    } else {
-		i = (0x000fffff)>>jj0;
-		if(((i0&i)|i1)==0) {		/* x is integral */
-		    u_int32_t high;
-		    *iptr = x;
-		    GET_HIGH_WORD(high,x);
-		    INSERT_WORDS(x,high&0x80000000,0);	/* return +-0 */
-		    return x;
-		} else {
-		    INSERT_WORDS(*iptr,i0&(~i),0);
-		    return x - *iptr;
-		}
-	    }
-	} else if (jj0>51) {		/* no fraction part */
-	    u_int32_t high;
-	    *iptr = x*one;
-	    if (jj0 == 0x400)		/* +-inf or NaN */
-		return 0.0 / x;		/* +-0 or NaN */
-	    GET_HIGH_WORD(high,x);
-	    INSERT_WORDS(x,high&0x80000000,0);	/* return +-0 */
-	    return x;
-	} else {			/* fraction part in low x */
-	    i = ((u_int32_t)(0xffffffff))>>(jj0-20);
-	    if((i1&i)==0) { 		/* x is integral */
-	        u_int32_t high;
-		*iptr = x;
-		GET_HIGH_WORD(high,x);
-		INSERT_WORDS(x,high&0x80000000,0);	/* return +-0 */
-		return x;
-	    } else {
-	        INSERT_WORDS(*iptr,i0,i1&(~i));
-		return x - *iptr;
-	    }
-	}
-}
diff --git a/lib/libm/src/s_modff.c b/lib/libm/src/s_modff.c
deleted file mode 100644
index 46ddc3877..000000000
--- a/lib/libm/src/s_modff.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* s_modff.c -- float version of s_modf.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_modff.c,v 1.9 2010/01/27 14:07:41 drochner Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float one = 1.0;
-
-float
-modff(float x, float *iptr)
-{
-	int32_t i0,jj0;
-	u_int32_t i;
-	GET_FLOAT_WORD(i0,x);
-	jj0 = ((i0>>23)&0xff)-0x7f;	/* exponent of x */
-	if(jj0<23) {			/* integer part in x */
-	    if(jj0<0) {			/* |x|<1 */
-	        SET_FLOAT_WORD(*iptr,i0&0x80000000);	/* *iptr = +-0 */
-		return x;
-	    } else {
-		i = (0x007fffff)>>jj0;
-		if((i0&i)==0) {			/* x is integral */
-		    u_int32_t ix;
-		    *iptr = x;
-		    GET_FLOAT_WORD(ix,x);
-		    SET_FLOAT_WORD(x,ix&0x80000000);	/* return +-0 */
-		    return x;
-		} else {
-		    SET_FLOAT_WORD(*iptr,i0&(~i));
-		    return x - *iptr;
-		}
-	    }
-	} else {			/* no fraction part */
-	    u_int32_t ix;
-	    *iptr = x*one;
-	    if (jj0 == 0x80)		/* +-inf or NaN */
-		return 0.0 / x;		/* +-0 or NaN */
-	    GET_FLOAT_WORD(ix,x);
-	    SET_FLOAT_WORD(x,ix&0x80000000);	/* return +-0 */
-	    return x;
-	}
-}
diff --git a/lib/libm/src/s_modfl.c b/lib/libm/src/s_modfl.c
deleted file mode 100644
index daaba0913..000000000
--- a/lib/libm/src/s_modfl.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-
- * Copyright (c) 2007 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.
- *
- * Derived from s_modf.c, which has the following Copyright:
- * ====================================================
- * 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.
- * ====================================================
- *
- * $FreeBSD: head/lib/msun/src/s_modfl.c 165855 2007-01-07 07:54:21Z das $
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_modfl.c,v 1.1 2014/06/16 12:54:43 joerg Exp $");
-
-#include "namespace.h"
-
-#include <float.h>
-#include <math.h>
-#include <stdint.h>
-#include <machine/ieee.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-
-#ifdef __weak_alias
-__weak_alias(modfl, _modfl)
-#endif
-
-#if LDBL_MANL_SIZE > 32
-#define	MASK	((uint64_t)-1)
-#else
-#define	MASK	((uint32_t)-1)
-#endif
-/* Return the last n bits of a word, representing the fractional part. */
-#define	GETFRAC(bits, n)	((bits) & ~(MASK << (n)))
-/* The number of fraction bits in manh, not counting the integer bit */
-#define	HIBITS	(LDBL_MANT_DIG - EXT_FRACHBITS)
-
-static const long double zero[] = { 0.0L, -0.0L };
-
-long double
-modfl(long double x, long double *iptr)
-{
-	union ieee_ext_u ux = { .extu_ld = x, };
-	int e = ux.extu_exp - LDBL_MAX_EXP + 1;
-
-	if (e < HIBITS) {			/* Integer part is in manh. */
-		if (e < 0) {			/* |x|<1 */
-			*iptr = zero[ux.extu_sign];
-			return (x);
-		} else {
-			if ((GETFRAC(ux.extu_frach, HIBITS - 1 - e) |
-			     ux.extu_fracl) == 0) {	/* X is an integer. */
-				*iptr = x;
-				return (zero[ux.extu_sign]);
-			} else {
-				/* Clear all but the top e+1 bits. */
-				ux.extu_frach >>= HIBITS - 1 - e;
-				ux.extu_frach <<= HIBITS - 1 - e;
-				ux.extu_fracl = 0;
-				*iptr = ux.extu_ld;
-				return (x - ux.extu_ld);
-			}
-		}
-	} else if (e >= LDBL_MANT_DIG - 1) {	/* x has no fraction part. */
-		*iptr = x;
-		if (x != x)			/* Handle NaNs. */
-			return (x);
-		return (zero[ux.extu_sign]);
-	} else {				/* Fraction part is in manl. */
-		if (GETFRAC(ux.extu_fracl, LDBL_MANT_DIG - 1 - e) == 0) {
-			/* x is integral. */
-			*iptr = x;
-			return (zero[ux.extu_sign]);
-		} else {
-			/* Clear all but the top e+1 bits. */
-			ux.extu_fracl >>= LDBL_MANT_DIG - 1 - e;
-			ux.extu_fracl <<= LDBL_MANT_DIG - 1 - e;
-			*iptr = ux.extu_ld;
-			return (x - ux.extu_ld);
-		}
-	}
-}
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libm/src/s_nan.c b/lib/libm/src/s_nan.c
deleted file mode 100644
index 3560da46e..000000000
--- a/lib/libm/src/s_nan.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*	$NetBSD: s_nan.c,v 1.2 2013/02/09 20:19:13 christos Exp $	*/
-
-/*-
- * Copyright (c) 2007 David Schultz
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/msun/src/s_nan.c,v 1.2 2007/12/18 23:46:32 das Exp $
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_nan.c,v 1.2 2013/02/09 20:19:13 christos Exp $");
-
-#include <sys/endian.h>
-#include <ctype.h>
-#include <float.h>
-#include <math.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "math_private.h"
-
-/* XXX: Locale? not here? in <ctype.h>? */
-static int
-digittoint(char s) {
-	if (isdigit((unsigned char)s))
-		return s - '0';
-	if (islower((unsigned char)s))
-		return s - 'a' + 10;
-	return s - 'A' + 10;
-}
-
-/*
- * Scan a string of hexadecimal digits (the format nan(3) expects) and
- * make a bit array (using the local endianness). We stop when we
- * encounter an invalid character, NUL, etc.  If we overflow, we do
- * the same as gcc's __builtin_nan(), namely, discard the high order bits.
- *
- * The format this routine accepts needs to be compatible with what is used
- * in contrib/gdtoa/hexnan.c (for strtod/scanf) and what is used in
- * __builtin_nan(). In fact, we're only 100% compatible for strings we
- * consider valid, so we might be violating the C standard. But it's
- * impossible to use nan(3) portably anyway, so this seems good enough.
- */
-static void
-_scan_nan(uint32_t *words, int num_words, const char *s)
-{
-	int si;		/* index into s */
-	int bitpos;	/* index into words (in bits) */
-
-	memset(words, 0, num_words * sizeof(*words));
-
-	/* Allow a leading '0x'. (It's expected, but redundant.) */
-	if (s[0] == '0' && (s[1] == 'x' || s[1] == 'X'))
-		s += 2;
-
-	/* Scan forwards in the string, looking for the end of the sequence. */
-	for (si = 0; isxdigit((unsigned char)s[si]); si++)
-		continue;
-
-	/* Scan backwards, filling in the bits in words[] as we go. */
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-	for (bitpos = 0; bitpos < 32 * num_words; bitpos += 4) {
-#else
-	for (bitpos = 32 * num_words - 4; bitpos >= 0; bitpos -= 4) {
-#endif
-		if (--si < 0)
-			break;
-		words[bitpos / 32] |= digittoint(s[si]) << (bitpos % 32);
-	}
-}
-
-double
-nan(const char *s)
-{
-	union {
-		double d;
-		uint32_t bits[2];
-	} u;
-
-	_scan_nan(u.bits, 2, s);
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-	u.bits[1] |= 0x7ff80000;
-#else
-	u.bits[0] |= 0x7ff80000;
-#endif
-	return (u.d);
-}
-
-float
-nanf(const char *s)
-{
-	union {
-		float f;
-		uint32_t bits[1];
-	} u;
-
-	_scan_nan(u.bits, 1, s);
-	u.bits[0] |= 0x7fc00000;
-	return (u.f);
-}
-
-#if (LDBL_MANT_DIG == 53)
-__weak_reference(nan, nanl);
-#endif
diff --git a/lib/libm/src/s_nearbyint.c b/lib/libm/src/s_nearbyint.c
deleted file mode 100644
index 967d4a0b3..000000000
--- a/lib/libm/src/s_nearbyint.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: s_nearbyint.c,v 1.3 2013/02/11 02:45:27 christos Exp $	*/
-
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_nearbyint.c,v 1.2 2008/01/14 02:12:06 das Exp $");
-#else
-__RCSID("$NetBSD: s_nearbyint.c,v 1.3 2013/02/11 02:45:27 christos Exp $");
-#endif
-
-#include <machine/ieee.h>
-#include <fenv.h>
-#include <math.h>
-
-/*
- * We save and restore the floating-point environment to avoid raising
- * an inexact exception.  We can get away with using fesetenv()
- * instead of feclearexcept()/feupdateenv() to restore the environment
- * because the only exception defined for rint() is overflow, and
- * rounding can't overflow as long as emax >= p.
- */
-#define	DECL(type, fn, rint)	\
-type				\
-fn(type x)			\
-{				\
-	type ret;		\
-	fenv_t env;		\
-				\
-	fegetenv(&env);		\
-	ret = rint(x);		\
-	fesetenv(&env);		\
-	return (ret);		\
-}
-
-DECL(double, nearbyint, rint)
-DECL(float, nearbyintf, rintf)
-#ifdef __HAVE_LONG_DOUBLE
-DECL(long double, nearbyintl, rintl)
-#endif
diff --git a/lib/libm/src/s_nextafter.c b/lib/libm/src/s_nextafter.c
deleted file mode 100644
index f84bd9721..000000000
--- a/lib/libm/src/s_nextafter.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* @(#)s_nextafter.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_nextafter.c,v 1.14 2014/03/18 18:20:37 riastradh Exp $");
-#endif
-
-/* IEEE functions
- *	nextafter(x,y)
- *	return the next machine floating-point number of x in the
- *	direction toward y.
- *   Special cases:
- */
-
-#include "math.h"
-#include "math_private.h"
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(nextafterl, nextafter)
-#endif
-
-double
-nextafter(double x, double y)
-{
-	int32_t hx,hy,ix,iy;
-	u_int32_t lx,ly;
-
-	EXTRACT_WORDS(hx,lx,x);
-	EXTRACT_WORDS(hy,ly,y);
-	ix = hx&0x7fffffff;		/* |x| */
-	iy = hy&0x7fffffff;		/* |y| */
-
-	if(((ix>=0x7ff00000)&&((ix-0x7ff00000)|lx)!=0) ||   /* x is nan */
-	   ((iy>=0x7ff00000)&&((iy-0x7ff00000)|ly)!=0))     /* y is nan */
-	   return x+y;
-	if(x==y) return y;		/* x=y, return y */
-	if((ix|lx)==0) {			/* x == 0 */
-	    INSERT_WORDS(x,hy&0x80000000,1);	/* return +-minsubnormal */
-	    y = x*x;
-	    if(y==x) return y; else return x;	/* raise underflow flag */
-	}
-	if(hx>=0) {				/* x > 0 */
-	    if(hx>hy||((hx==hy)&&(lx>ly))) {	/* x > y, x -= ulp */
-		if(lx==0) hx -= 1;
-		lx -= 1;
-	    } else {				/* x < y, x += ulp */
-		lx += 1;
-		if(lx==0) hx += 1;
-	    }
-	} else {				/* x < 0 */
-	    if(hy>=0||hx>hy||((hx==hy)&&(lx>ly))){/* x < y, x -= ulp */
-		if(lx==0) hx -= 1;
-		lx -= 1;
-	    } else {				/* x > y, x += ulp */
-		lx += 1;
-		if(lx==0) hx += 1;
-	    }
-	}
-	hy = hx&0x7ff00000;
-	if(hy>=0x7ff00000) return x+x;	/* overflow  */
-	if(hy<0x00100000) {		/* underflow */
-	    y = x*x;
-	    if(y!=x) {		/* raise underflow flag */
-	        INSERT_WORDS(y,hx,lx);
-		return y;
-	    }
-	}
-	INSERT_WORDS(x,hx,lx);
-	return x;
-}
diff --git a/lib/libm/src/s_nextafterf.c b/lib/libm/src/s_nextafterf.c
deleted file mode 100644
index 3ea03f75b..000000000
--- a/lib/libm/src/s_nextafterf.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* s_nextafterf.c -- float version of s_nextafter.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_nextafterf.c,v 1.8 2011/04/18 15:59:09 drochner Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-float
-nextafterf(float x, float y)
-{
-	int32_t hx,hy,ix,iy;
-
-	GET_FLOAT_WORD(hx,x);
-	GET_FLOAT_WORD(hy,y);
-	ix = hx&0x7fffffff;		/* |x| */
-	iy = hy&0x7fffffff;		/* |y| */
-
-	if((ix>0x7f800000) ||   /* x is nan */
-	   (iy>0x7f800000))     /* y is nan */
-	   return x+y;
-	if(x==y) return y;		/* x=y, return y */
-	if(ix==0) {				/* x == 0 */
-	    SET_FLOAT_WORD(x,(hy&0x80000000)|1);/* return +-minsubnormal */
-	    y = x*x;
-	    if(y==x) return y; else return x;	/* raise underflow flag */
-	}
-	if(hx>=0) {				/* x > 0 */
-	    if(hx>hy) {				/* x > y, x -= ulp */
-		hx -= 1;
-	    } else {				/* x < y, x += ulp */
-		hx += 1;
-	    }
-	} else {				/* x < 0 */
-	    if(hy>=0||hx>hy){			/* x < y, x -= ulp */
-		hx -= 1;
-	    } else {				/* x > y, x += ulp */
-		hx += 1;
-	    }
-	}
-	hy = hx&0x7f800000;
-	if(hy>=0x7f800000) return x+x;	/* overflow  */
-	if(hy<0x00800000) {		/* underflow */
-	    y = x*x;
-	    if(y!=x) {		/* raise underflow flag */
-	        SET_FLOAT_WORD(y,hx);
-		return y;
-	    }
-	}
-	SET_FLOAT_WORD(x,hx);
-	return x;
-}
diff --git a/lib/libm/src/s_nextafterl.c b/lib/libm/src/s_nextafterl.c
deleted file mode 100644
index 97efe4d58..000000000
--- a/lib/libm/src/s_nextafterl.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*	$NetBSD: s_nextafterl.c,v 1.5 2014/01/31 19:38:47 matt Exp $	*/
-
-/* @(#)s_nextafter.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>
-__RCSID("$NetBSD: s_nextafterl.c,v 1.5 2014/01/31 19:38:47 matt Exp $");
-
-#include <float.h>
-#include <math.h>
-#include <machine/ieee.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-
-#ifdef EXT_EXP_INFNAN
-#if LDBL_MAX_EXP != 0x4000
-#error "Unsupported long double format"
-#endif
-
-#ifdef LDBL_IMPLICIT_NBIT
-#define	LDBL_NBIT	0
-#endif
-
-/*
- * IEEE functions
- *      nextafterl(x,y)
- *      return the next machine floating-point number of x in the
- *      direction toward y.
- *   Special cases:
- *	If x == y, y shall be returned
- *	If x or y is NaN, a NaN shall be returned
- */
-long double
-nextafterl(long double x, long double y)
-{
-	volatile long double t;
-	union ieee_ext_u ux, uy;
-
-	ux.extu_ld = x;
-	uy.extu_ld = y;
-
-	if ((ux.extu_exp == EXT_EXP_INFNAN &&
-		((ux.extu_frach &~ LDBL_NBIT)|ux.extu_fracl) != 0) ||
-	    (uy.extu_exp == EXT_EXP_INFNAN &&
-		((uy.extu_frach &~ LDBL_NBIT)|uy.extu_fracl) != 0))
-		return x+y;			/* x or y is nan */
-
-	if (x == y) return y;			/* x=y, return y */
-
-	if (x == 0.0) {
-		ux.extu_frach = 0;		/* return +-minsubnormal */
-		ux.extu_fracl = 1;
-		ux.extu_sign = uy.extu_sign;
-		t = ux.extu_ld * ux.extu_ld;
-		if (t == ux.extu_ld)
-			return t;
-		else
-			return ux.extu_ld;	/* raise underflow flag */
-	}
-
-	if ((x>0.0) ^ (x<y)) {			/* x -= ulp */
-		if (ux.extu_fracl == 0) {
-			if ((ux.extu_frach & ~LDBL_NBIT) == 0)
-				ux.extu_exp -= 1;
-			ux.extu_frach = (ux.extu_frach - 1) |
-					(ux.extu_frach & LDBL_NBIT);
-		}
-		ux.extu_fracl -= 1;
-	} else {				/* x += ulp */
-		ux.extu_fracl += 1;
-		if (ux.extu_fracl == 0) {
-			ux.extu_frach = (ux.extu_frach + 1) |
-					(ux.extu_frach & LDBL_NBIT);
-			if ((ux.extu_frach & ~LDBL_NBIT) == 0)
-				ux.extu_exp += 1;
-		}
-	}
-
-	if (ux.extu_exp == EXT_EXP_INFNAN)
-		return x+x;			/* overflow  */
-
-	if (ux.extu_exp == 0) {			/* underflow */
-#ifndef LDBL_IMPLICIT_NBIT
-		mask_nbit_l(ux);
-#endif
-		t = ux.extu_ld * ux.extu_ld;
-		if (t != ux.extu_ld)		/* raise underflow flag */
-			return ux.extu_ld;
-	}
-
-	return ux.extu_ld;
-}
-#endif
-
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libm/src/s_nexttoward.c b/lib/libm/src/s_nexttoward.c
deleted file mode 100644
index e03dbd46f..000000000
--- a/lib/libm/src/s_nexttoward.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*	$NetBSD: s_nexttoward.c,v 1.2 2013/08/21 13:03:56 martin Exp $	*/
-
-/* @(#)s_nextafter.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>
-__RCSID("$NetBSD: s_nexttoward.c,v 1.2 2013/08/21 13:03:56 martin Exp $");
-
-/*
- * We assume that a long double has a 15-bit exponent.  On systems
- * where long double is the same as double, nexttoward() is an alias
- * for nextafter(), so we don't use this routine.
- */
-#include <float.h>
-
-#include <machine/ieee.h>
-#include "math.h"
-#include "math_private.h"
-
-#if LDBL_MAX_EXP != 0x4000
-#error "Unsupported long double format"
-#endif
-
-#ifdef LDBL_IMPLICIT_NBIT
-#define	LDBL_NBIT	0
-#endif
-
-/*
- * The nexttoward() function is equivalent to nextafter() function,
- * except that the second parameter shall have type long double and
- * the functions shall return y converted to the type of the function
- * if x equals y.
- *
- * Special cases: XXX
- */
-double
-nexttoward(double x, long double y)
-{
-	union ieee_ext_u uy;
-	volatile double t;
-	int32_t hx, ix;
-	uint32_t lx;
-
-	EXTRACT_WORDS(hx, lx, x);
-	ix = hx & 0x7fffffff;			/* |x| */
-	uy.extu_ld = y;
-
-	if (((ix >= 0x7ff00000) && ((ix - 0x7ff00000) | lx) != 0) ||
-	    (uy.extu_exp == 0x7fff &&
-		((uy.extu_frach & ~LDBL_NBIT) | uy.extu_fracl) != 0))
-		return x+y;			/* x or y is nan */
-
-	if (x == y)
-		return (double)y;		/* x=y, return y */
-
-	if (x == 0.0) {
-		INSERT_WORDS(x, uy.extu_sign<<31, 1);	/* return +-minsubnormal */
-		t = x*x;
-		if (t == x)
-			return t;
-		else
-			return x;		/* raise underflow flag */
-	}
-
-	if ((hx > 0.0) ^ (x < y)) {		/* x -= ulp */
-		if (lx == 0) hx -= 1;
-		lx -= 1;
-	} else {				/* x += ulp */
-		lx += 1;
-		if (lx == 0) hx += 1;
-	}
-	ix = hx & 0x7ff00000;
-	if (ix >= 0x7ff00000) return x+x;	/* overflow  */
-	if (ix <  0x00100000) {			/* underflow */
-		t = x*x;
-		if (t != x) {			/* raise underflow flag */
-			INSERT_WORDS(y, hx, lx);
-			return y;
-		}
-	}
-	INSERT_WORDS(x, hx, lx);
-
-	return x;
-}
diff --git a/lib/libm/src/s_nexttowardf.c b/lib/libm/src/s_nexttowardf.c
deleted file mode 100644
index 7eafbc465..000000000
--- a/lib/libm/src/s_nexttowardf.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: s_nexttowardf.c,v 1.3 2013/02/09 23:14:44 christos Exp $	*/
-
-/*
- * ====================================================
- * 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>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_nexttowardf.c,v 1.3 2011/02/10 07:38:38 das Exp $");
-#else
-__RCSID("$NetBSD: s_nexttowardf.c,v 1.3 2013/02/09 23:14:44 christos Exp $");
-#endif
-
-#include <string.h>
-#include <float.h>
-#include <machine/ieee.h>
-
-#include "math.h"
-#include "math_private.h"
-
-#ifdef EXT_EXP_INFNAN
-float
-nexttowardf(float x, long double y)
-{
-	volatile float t;
-	int32_t hx,ix;
-	union ieee_ext_u uy;
-
-	GET_FLOAT_WORD(hx,x);
-	ix = hx&0x7fffffff;		/* |x| */
-
-	memset(&uy, 0, sizeof(uy));
-	uy.extu_ld = y;
-	uy.extu_ext.ext_frach &= ~0x80000000;
-
-	if((ix>0x7f800000) ||
-	   (uy.extu_ext.ext_exp == EXT_EXP_INFNAN &&
-	    (uy.extu_ext.ext_frach | uy.extu_ext.ext_fracl) != 0))
-	   return x+y;	/* x or y is nan */
-	if(x==y) return (float)y;		/* x=y, return y */
-	if(ix==0) {				/* x == 0 */
-	    SET_FLOAT_WORD(x,(uy.extu_ext.ext_sign<<31)|1);/* return +-minsubnormal */
-	    t = x*x;
-	    if(t==x) return t; else return x;	/* raise underflow flag */
-	}
-	if((hx >= 0) ^ (x < y))			/* x -= ulp */
-	    hx -= 1;
-	else					/* x += ulp */
-	    hx += 1;
-	ix = hx&0x7f800000;
-	if(ix>=0x7f800000) return x+x;	/* overflow  */
-	if(ix<0x00800000) {		/* underflow */
-	    t = x*x;
-	    if(t!=x) {		/* raise underflow flag */
-	        SET_FLOAT_WORD(x,hx);
-		return x;
-	    }
-	}
-	SET_FLOAT_WORD(x,hx);
-	return x;
-}
-#endif
diff --git a/lib/libm/src/s_remquo.c b/lib/libm/src/s_remquo.c
deleted file mode 100644
index 9a8374bfe..000000000
--- a/lib/libm/src/s_remquo.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* @(#)e_fmod.c 1.3 95/01/18 */
-/*-
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-#include <sys/cdefs.h>
-
-#include <float.h>
-
-#include "math.h"
-#include "math_private.h"
-
-static const double Zero[] = {0.0, -0.0,};
-
-/*
- * Return the IEEE remainder and set *quo to the last n bits of the
- * quotient, rounded to the nearest integer.  We choose n=31 because
- * we wind up computing all the integer bits of the quotient anyway as
- * a side-effect of computing the remainder by the shift and subtract
- * method.  In practice, this is far more bits than are needed to use
- * remquo in reduction algorithms.
- */
-double
-remquo(double x, double y, int *quo)
-{
-	int32_t n,hx,hy,hz,ix,iy,sx,i;
-	u_int32_t lx,ly,lz,q,sxy;
-
-	EXTRACT_WORDS(hx,lx,x);
-	EXTRACT_WORDS(hy,ly,y);
-	sxy = (hx ^ hy) & 0x80000000;
-	sx = hx&0x80000000;		/* sign of x */
-	hx ^=sx;		/* |x| */
-	hy &= 0x7fffffff;	/* |y| */
-
-    /* purge off exception values */
-	if((hy|ly)==0||(hx>=0x7ff00000)||	/* y=0,or x not finite */
-	  ((hy|((ly|-ly)>>31))>0x7ff00000))	/* or y is NaN */
-	    return (x*y)/(x*y);
-	if(hx<=hy) {
-	    if((hx<hy)||(lx<ly)) {
-		q = 0;
-		goto fixup;	/* |x|<|y| return x or x-y */
-	    }
-	    if(lx==ly) {
-		*quo = 1;
-		return Zero[(u_int32_t)sx>>31];	/* |x|=|y| return x*0*/
-	    }
-	}
-
-    /* determine ix = ilogb(x) */
-	if(hx<0x00100000) {	/* subnormal x */
-	    if(hx==0) {
-		for (ix = -1043, i=lx; i>0; i<<=1) ix -=1;
-	    } else {
-		for (ix = -1022,i=(hx<<11); i>0; i<<=1) ix -=1;
-	    }
-	} else ix = (hx>>20)-1023;
-
-    /* determine iy = ilogb(y) */
-	if(hy<0x00100000) {	/* subnormal y */
-	    if(hy==0) {
-		for (iy = -1043, i=ly; i>0; i<<=1) iy -=1;
-	    } else {
-		for (iy = -1022,i=(hy<<11); i>0; i<<=1) iy -=1;
-	    }
-	} else iy = (hy>>20)-1023;
-
-    /* set up {hx,lx}, {hy,ly} and align y to x */
-	if(ix >= -1022) 
-	    hx = 0x00100000|(0x000fffff&hx);
-	else {		/* subnormal x, shift x to normal */
-	    n = -1022-ix;
-	    if(n<=31) {
-	        hx = (hx<<n)|(lx>>(32-n));
-	        lx <<= n;
-	    } else {
-		hx = lx<<(n-32);
-		lx = 0;
-	    }
-	}
-	if(iy >= -1022) 
-	    hy = 0x00100000|(0x000fffff&hy);
-	else {		/* subnormal y, shift y to normal */
-	    n = -1022-iy;
-	    if(n<=31) {
-	        hy = (hy<<n)|(ly>>(32-n));
-	        ly <<= n;
-	    } else {
-		hy = ly<<(n-32);
-		ly = 0;
-	    }
-	}
-
-    /* fix point fmod */
-	n = ix - iy;
-	q = 0;
-	while(n--) {
-	    hz=hx-hy;lz=lx-ly; if(lx<ly) hz -= 1;
-	    if(hz<0){hx = hx+hx+(lx>>31); lx = lx+lx;}
-	    else {hx = hz+hz+(lz>>31); lx = lz+lz; q++;}
-	    q <<= 1;
-	}
-	hz=hx-hy;lz=lx-ly; if(lx<ly) hz -= 1;
-	if(hz>=0) {hx=hz;lx=lz;q++;}
-
-    /* convert back to floating value and restore the sign */
-	if((hx|lx)==0) {			/* return sign(x)*0 */
-	    *quo = (sxy ? -q : q);
-	    return Zero[(u_int32_t)sx>>31];
-	}
-	while(hx<0x00100000) {		/* normalize x */
-	    hx = hx+hx+(lx>>31); lx = lx+lx;
-	    iy -= 1;
-	}
-	if(iy>= -1022) {	/* normalize output */
-	    hx = ((hx-0x00100000)|((iy+1023)<<20));
-	} else {		/* subnormal output */
-	    n = -1022 - iy;
-	    if(n<=20) {
-		lx = (lx>>n)|((u_int32_t)hx<<(32-n));
-		hx >>= n;
-	    } else if (n<=31) {
-		lx = (hx<<(32-n))|(lx>>n); hx = sx;
-	    } else {
-		lx = hx>>(n-32); hx = sx;
-	    }
-	}
-fixup:
-	INSERT_WORDS(x,hx,lx);
-	y = fabs(y);
-	if (y < 0x1p-1021) {
-	    if (x+x>y || (x+x==y && (q & 1))) {
-		q++;
-		x-=y;
-	    }
-	} else if (x>0.5*y || (x==0.5*y && (q & 1))) {
-	    q++;
-	    x-=y;
-	}
-	GET_HIGH_WORD(hx,x);
-	SET_HIGH_WORD(x,hx^sx);
-	q &= 0x7fffffff;
-	*quo = (sxy ? -q : q);
-	return x;
-}
diff --git a/lib/libm/src/s_remquof.c b/lib/libm/src/s_remquof.c
deleted file mode 100644
index 9e85ad7fe..000000000
--- a/lib/libm/src/s_remquof.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* @(#)e_fmod.c 1.3 95/01/18 */
-/*-
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-#include <sys/cdefs.h>
-
-#include "math.h"
-#include "math_private.h"
-
-static const float Zero[] = {0.0, -0.0,};
-
-/*
- * Return the IEEE remainder and set *quo to the last n bits of the
- * quotient, rounded to the nearest integer.  We choose n=31 because
- * we wind up computing all the integer bits of the quotient anyway as
- * a side-effect of computing the remainder by the shift and subtract
- * method.  In practice, this is far more bits than are needed to use
- * remquo in reduction algorithms.
- */
-float
-remquof(float x, float y, int *quo)
-{
-	int32_t n,hx,hy,hz,ix,iy,sx,i;
-	u_int32_t q,sxy;
-
-	GET_FLOAT_WORD(hx,x);
-	GET_FLOAT_WORD(hy,y);
-	sxy = (hx ^ hy) & 0x80000000;
-	sx = hx&0x80000000;		/* sign of x */
-	hx ^=sx;		/* |x| */
-	hy &= 0x7fffffff;	/* |y| */
-
-    /* purge off exception values */
-	if(hy==0||hx>=0x7f800000||hy>0x7f800000) /* y=0,NaN;or x not finite */
-	    return (x*y)/(x*y);
-	if(hx<hy) {
-	    q = 0;
-	    goto fixup;	/* |x|<|y| return x or x-y */
-	} else if(hx==hy) {
-	    *quo = 1;
-	    return Zero[(u_int32_t)sx>>31];	/* |x|=|y| return x*0*/
-	}
-
-    /* determine ix = ilogb(x) */
-	if(hx<0x00800000) {	/* subnormal x */
-	    for (ix = -126,i=(hx<<8); i>0; i<<=1) ix -=1;
-	} else ix = (hx>>23)-127;
-
-    /* determine iy = ilogb(y) */
-	if(hy<0x00800000) {	/* subnormal y */
-	    for (iy = -126,i=(hy<<8); i>0; i<<=1) iy -=1;
-	} else iy = (hy>>23)-127;
-
-    /* set up {hx,lx}, {hy,ly} and align y to x */
-	if(ix >= -126)
-	    hx = 0x00800000|(0x007fffff&hx);
-	else {		/* subnormal x, shift x to normal */
-	    n = -126-ix;
-	    hx <<= n;
-	}
-	if(iy >= -126)
-	    hy = 0x00800000|(0x007fffff&hy);
-	else {		/* subnormal y, shift y to normal */
-	    n = -126-iy;
-	    hy <<= n;
-	}
-
-    /* fix point fmod */
-	n = ix - iy;
-	q = 0;
-	while(n--) {
-	    hz=hx-hy;
-	    if(hz<0) hx = hx << 1;
-	    else {hx = hz << 1; q++;}
-	    q <<= 1;
-	}
-	hz=hx-hy;
-	if(hz>=0) {hx=hz;q++;}
-
-    /* convert back to floating value and restore the sign */
-	if(hx==0) {				/* return sign(x)*0 */
-	    *quo = (sxy ? -q : q);
-	    return Zero[(u_int32_t)sx>>31];
-	}
-	while(hx<0x00800000) {		/* normalize x */
-	    hx <<= 1;
-	    iy -= 1;
-	}
-	if(iy>= -126) {		/* normalize output */
-	    hx = ((hx-0x00800000)|((iy+127)<<23));
-	} else {		/* subnormal output */
-	    n = -126 - iy;
-	    hx >>= n;
-	}
-fixup:
-	SET_FLOAT_WORD(x,hx);
-	y = fabsf(y);
-	if (y < 0x1p-125f) {
-	    if (x+x>y || (x+x==y && (q & 1))) {
-		q++;
-		x-=y;
-	    }
-	} else if (x>0.5f*y || (x==0.5f*y && (q & 1))) {
-	    q++;
-	    x-=y;
-	}
-	GET_FLOAT_WORD(hx,x);
-	SET_FLOAT_WORD(x,hx^sx);
-	q &= 0x7fffffff;
-	*quo = (sxy ? -q : q);
-	return x;
-}
diff --git a/lib/libm/src/s_rint.c b/lib/libm/src/s_rint.c
deleted file mode 100644
index 276e33c8c..000000000
--- a/lib/libm/src/s_rint.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* @(#)s_rint.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_rint.c,v 1.12 2008/04/25 22:21:53 christos Exp $");
-#endif
-
-/*
- * rint(x)
- * Return x rounded to integral value according to the prevailing
- * rounding mode.
- * Method:
- *	Using floating addition.
- * Exception:
- *	Inexact flag raised if x not equal to rint(x).
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double
-TWO52[2]={
-  4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
- -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
-};
-
-double
-rint(double x)
-{
-	int32_t i0,jj0,sx;
-	u_int32_t i,i1;
-	double w,t;
-	EXTRACT_WORDS(i0,i1,x);
-	sx = (i0>>31)&1;
-	jj0 = ((i0>>20)&0x7ff)-0x3ff;
-	if(jj0<20) {
-	    if(jj0<0) {
-		if(((i0&0x7fffffff)|i1)==0) return x;
-		i1 |= (i0&0x0fffff);
-		i0 &= 0xfffe0000;
-		i0 |= ((i1|-i1)>>12)&0x80000;
-		SET_HIGH_WORD(x,i0);
-	        w = TWO52[sx]+x;
-	        t =  w-TWO52[sx];
-		GET_HIGH_WORD(i0,t);
-		SET_HIGH_WORD(t,(i0&0x7fffffff)|(sx<<31));
-	        return t;
-	    } else {
-		i = (0x000fffff)>>jj0;
-		if(((i0&i)|i1)==0) return x; /* x is integral */
-		i>>=1;
-		if(((i0&i)|i1)!=0) {
-		    if(jj0==19) i1 = 0x40000000; else
-		    i0 = (i0&(~i))|((0x20000)>>jj0);
-		}
-	    }
-	} else if (jj0>51) {
-	    if(jj0==0x400) return x+x;	/* inf or NaN */
-	    else return x;		/* x is integral */
-	} else {
-	    i = ((u_int32_t)(0xffffffff))>>(jj0-20);
-	    if((i1&i)==0) return x;	/* x is integral */
-	    i>>=1;
-	    if((i1&i)!=0) i1 = (i1&(~i))|((0x40000000)>>(jj0-20));
-	}
-	INSERT_WORDS(x,i0,i1);
-	w = TWO52[sx]+x;
-	return w-TWO52[sx];
-}
diff --git a/lib/libm/src/s_rintf.c b/lib/libm/src/s_rintf.c
deleted file mode 100644
index 07573c52d..000000000
--- a/lib/libm/src/s_rintf.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* s_rintf.c -- float version of s_rint.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_rintf.c,v 1.9 2008/04/25 22:21:53 christos Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float
-TWO23[2]={
-  8.3886080000e+06, /* 0x4b000000 */
- -8.3886080000e+06, /* 0xcb000000 */
-};
-
-float
-rintf(float x)
-{
-	int32_t i0,jj0,sx;
-	u_int32_t i,i1;
-#ifdef __i386__ /* XXX gcc4 will omit the rounding otherwise */
-	volatile
-#endif
-		float w;
-	float t;
-	GET_FLOAT_WORD(i0,x);
-	sx = (i0>>31)&1;
-	jj0 = ((i0>>23)&0xff)-0x7f;
-	if(jj0<23) {
-	    if(jj0<0) {
-		if((i0&0x7fffffff)==0) return x;
-		i1 = (i0&0x07fffff);
-		i0 &= 0xfff00000;
-		i0 |= ((i1|-i1)>>9)&0x400000;
-		SET_FLOAT_WORD(x,i0);
-	        w = TWO23[sx]+x;
-	        t =  w-TWO23[sx];
-		GET_FLOAT_WORD(i0,t);
-		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
-	        return t;
-	    } else {
-		i = (0x007fffff)>>jj0;
-		if((i0&i)==0) return x; /* x is integral */
-		i>>=1;
-		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>jj0);
-	    }
-	} else {
-	    if(jj0==0x80) return x+x;	/* inf or NaN */
-	    else return x;		/* x is integral */
-	}
-	SET_FLOAT_WORD(x,i0);
-	w = TWO23[sx]+x;
-	return w-TWO23[sx];
-}
diff --git a/lib/libm/src/s_rintl.c b/lib/libm/src/s_rintl.c
deleted file mode 100644
index c8fbe395a..000000000
--- a/lib/libm/src/s_rintl.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*	$NetBSD: s_rintl.c,v 1.5 2013/08/21 13:04:44 martin Exp $	*/
-
-/*-
- * Copyright (c) 2008 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 <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_rintl.c,v 1.5 2008/02/22 11:59:05 bde Exp $");
-#else
-__RCSID("$NetBSD: s_rintl.c,v 1.5 2013/08/21 13:04:44 martin Exp $");
-#endif
-
-#include <float.h>
-#include <machine/ieee.h>
-
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __HAVE_LONG_DOUBLE
-static const float
-shift[2] = {
-#if EXT_FRACBITS == 64
-	0x1.0p63, -0x1.0p63
-#elif EXT_FRACBITS == 113
-	0x1.0p112, -0x1.0p112
-#elif EXT_FRACBITS == 112
-	0x1.0p111, -0x1.0p111
-#else
-#error "Unsupported long double format"
-#endif
-};
-static const float zero[2] = { 0.0, -0.0 };
-
-long double
-rintl(long double x)
-{
-	union ieee_ext_u u;
-	uint32_t expsign;
-	int ex, sign;
-
-	u.extu_ld = x;
-	u.extu_ext.ext_frach &= ~0x80000000;
-	expsign = u.extu_ext.ext_sign;
-	ex = expsign & 0x7fff;
-
-	if (ex >= EXT_EXP_BIAS + EXT_FRACBITS - 1) {
-		if (ex == EXT_EXP_BIAS + EXT_FRACBITS)
-			return (x + x);	/* Inf, NaN, or unsupported format */
-		return (x);		/* finite and already an integer */
-	}
-	sign = expsign >> 15;
-
-	/*
-	 * The following code assumes that intermediate results are
-	 * evaluated in long double precision. If they are evaluated in
-	 * greater precision, double rounding may occur, and if they are
-	 * evaluated in less precision (as on i386), results will be
-	 * wildly incorrect.
-	 */
-	x += shift[sign];
-	x -= shift[sign];
-
-	/*
-	 * If the result is +-0, then it must have the same sign as x, but
-	 * the above calculation doesn't always give this.  Fix up the sign.
-	 */
-	if (ex < EXT_EXP_BIAS && x == 0.0L)
-		return (zero[sign]);
-
-	return (x);
-}
-#endif
diff --git a/lib/libm/src/s_round.c b/lib/libm/src/s_round.c
deleted file mode 100644
index b81add457..000000000
--- a/lib/libm/src/s_round.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 2003, Steven G. Kargl
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_round.c,v 1.3 2013/11/11 23:57:34 joerg Exp $");
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_round.c,v 1.1 2004/06/07 08:05:36 das Exp $");
-#endif
-#endif
-
-#include <math.h>
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(_roundl, round)
-__weak_alias(roundl, round)
-#endif
-
-double
-round(double x)
-{
-	double t;
-	int i;
-
-	i = fpclassify(x);
-	if (i == FP_INFINITE || i == FP_NAN)
-		return (x);
-
-	if (x >= 0.0) {
-		t = floor(x);
-		if (x - t >= 0.5)
-			t += 1.0;
-		return (t);
-	} else {
-		x = -x;
-		t = floor(x);
-		if (x - t >= 0.5)
-			t += 1.0;
-		return (-t);
-	}
-}
diff --git a/lib/libm/src/s_roundf.c b/lib/libm/src/s_roundf.c
deleted file mode 100644
index a1bbc9f18..000000000
--- a/lib/libm/src/s_roundf.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 2003, Steven G. Kargl
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_roundf.c,v 1.2 2007/08/21 20:10:27 drochner Exp $");
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_roundf.c,v 1.1 2004/06/07 08:05:36 das Exp $");
-#endif
-#endif
-
-#include <math.h>
-
-float
-roundf(float x)
-{
-	float t;
-	int i;
-
-	i = fpclassify(x);
-	if (i == FP_INFINITE || i == FP_NAN)
-		return (x);
-
-	if (x >= 0.0) {
-		t = floorf(x);
-		if (x - t >= 0.5)
-			t += 1.0;
-		return (t);
-	} else {
-		x = -x;
-		t = floorf(x);
-		if (x - t >= 0.5)
-			t += 1.0;
-		return (-t);
-	}
-}
diff --git a/lib/libm/src/s_roundl.c b/lib/libm/src/s_roundl.c
deleted file mode 100644
index 1bcded031..000000000
--- a/lib/libm/src/s_roundl.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 2003, Steven G. Kargl
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_roundl.c,v 1.1 2013/11/11 23:57:34 joerg Exp $");
-#if 0
-__FBSDID("$FreeBSD: head/lib/msun/src/s_roundl.c 153017 2005-12-02 13:45:06Z bde $");
-#endif
-
-#include "namespace.h"
-#include <math.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-
-#ifdef __weak_alias
-__weak_alias(roundl, _roundl)
-#endif
-
-long double
-roundl(long double x)
-{
-	long double t;
-
-	if (!isfinite(x))
-		return (x);
-
-	if (x >= 0.0) {
-		t = floorl(x);
-		if (t - x <= -0.5)
-			t += 1.0;
-		return (t);
-	} else {
-		t = floorl(-x);
-		if (t + x <= -0.5)
-			t += 1.0;
-		return (-t);
-	}
-}
-
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libm/src/s_scalbn.c b/lib/libm/src/s_scalbn.c
deleted file mode 100644
index 19b4d2b81..000000000
--- a/lib/libm/src/s_scalbn.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* @(#)s_scalbn.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_scalbn.c,v 1.18 2013/05/20 19:40:09 joerg Exp $");
-#endif
-
-/*
- * scalbn (double x, int n)
- * scalbn(x,n) returns x* 2**n  computed by  exponent
- * manipulation rather than by actually performing an
- * exponentiation or a multiplication.
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifndef _LP64
-__strong_alias(_scalbn, _scalbln)
-#endif
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(_scalbnl, _scalbn)
-__strong_alias(_scalblnl, _scalbln)
-__weak_alias(scalbnl, _scalbnl)
-__weak_alias(scalblnl, _scalblnl)
-#endif
-
-#ifdef __weak_alias
-__weak_alias(scalbn, _scalbn)
-__weak_alias(scalbln, _scalbln)
-__weak_alias(ldexp, _scalbn)
-#endif
-
-static const double
-two54   =  0x1.0p54,	/* 0x43500000, 0x00000000 */
-twom54  =  0x1.0p-54,	/* 0x3C900000, 0x00000000 */
-huge   = 1.0e+300,
-tiny   = 1.0e-300;
-
-#ifdef _LP64
-double
-scalbn(double x, int n)
-{
-	return scalbln(x, n);
-}
-#endif
-
-double
-scalbln(double x, long n)
-{
-	int32_t k,hx,lx;
-	EXTRACT_WORDS(hx,lx,x);
-        k = ((uint32_t)hx&0x7ff00000)>>20;		/* extract exponent */
-        if (k==0) {				/* 0 or subnormal x */
-            if ((lx|(hx&0x7fffffff))==0) return x; /* +-0 */
-	    x *= two54;
-	    GET_HIGH_WORD(hx,x);
-	    k = (((uint32_t)hx&0x7ff00000)>>20) - 54;
-            if (n< -50000) return tiny*x; 	/*underflow*/
-	    }
-        if (k==0x7ff) return x+x;		/* NaN or Inf */
-        k = k+n;
-        if (k >  0x7fe) return huge*copysign(huge,x); /* overflow  */
-        if (k > 0) 				/* normal result */
-	    {SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); return x;}
-        if (k <= -54) {
-            if (n > 50000) 	/* in case integer overflow in n+k */
-		return huge*copysign(huge,x);	/*overflow*/
-	    else return tiny*copysign(tiny,x); 	/*underflow*/
-	}
-        k += 54;				/* subnormal result */
-	SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20));
-        return x*twom54;
-}
diff --git a/lib/libm/src/s_scalbnf.c b/lib/libm/src/s_scalbnf.c
deleted file mode 100644
index 9b9415685..000000000
--- a/lib/libm/src/s_scalbnf.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* s_scalbnf.c -- float version of s_scalbn.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_scalbnf.c,v 1.12 2013/05/20 19:40:09 joerg Exp $");
-#endif
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifndef _LP64
-__strong_alias(_scalbnf, _scalblnf)
-#endif
-__weak_alias(scalbnf, _scalbnf)
-__weak_alias(scalblnf, _scalblnf)
-__weak_alias(ldexpf, _scalbnf)
-
-static const float
-two25   =  0x1.0p25,	/* 0x4c000000 */
-twom25  =  0x1.0p-25,	/* 0x33000000 */
-huge   = 1.0e+30,
-tiny   = 1.0e-30;
-
-#ifdef _LP64
-float
-scalbnf(float x, int n)
-{
-	return scalblnf(x, n);
-}
-#endif
-
-float
-scalblnf(float x, long n)
-{
-	int32_t k,ix;
-	GET_FLOAT_WORD(ix,x);
-        k = (ix&0x7f800000)>>23;		/* extract exponent */
-        if (k==0) {				/* 0 or subnormal x */
-            if ((ix&0x7fffffff)==0) return x; /* +-0 */
-	    x *= two25;
-	    GET_FLOAT_WORD(ix,x);
-	    k = ((ix&0x7f800000)>>23) - 25;
-            if (n< -50000) return tiny*x; 	/*underflow*/
-	    }
-        if (k==0xff) return x+x;		/* NaN or Inf */
-        k = k+n;
-        if (k >  0xfe) return huge*copysignf(huge,x); /* overflow  */
-        if (k > 0) 				/* normal result */
-	    {SET_FLOAT_WORD(x,(ix&0x807fffff)|(k<<23)); return x;}
-        if (k <= -25) {
-            if (n > 50000) 	/* in case integer overflow in n+k */
-		return huge*copysignf(huge,x);	/*overflow*/
-	    else return tiny*copysignf(tiny,x);	/*underflow*/
-	}
-        k += 25;				/* subnormal result */
-	SET_FLOAT_WORD(x,(ix&0x807fffff)|(k<<23));
-        return x*twom25;
-}
diff --git a/lib/libm/src/s_scalbnl.c b/lib/libm/src/s_scalbnl.c
deleted file mode 100644
index b4a654af7..000000000
--- a/lib/libm/src/s_scalbnl.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*	$NetBSD: s_scalbnl.c,v 1.9 2013/05/20 19:40:09 joerg Exp $	*/
-
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Joerg Sonnenberger.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_scalbnl.c,v 1.9 2013/05/20 19:40:09 joerg Exp $");
-
-#include "namespace.h"
-
-#include <float.h>
-#include <math.h>
-#include <machine/ieee.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-
-#ifdef _LP64
-long double
-scalbnl(long double x, int n)
-{
-	return scalblnl(x, n);
-}
-#else
-__strong_alias(_scalbnl, _scalblnl)
-#endif
-
-__weak_alias(scalbnl, _scalbnl)
-__weak_alias(scalblnl, _scalblnl)
-__weak_alias(ldexpl, _scalbnl)
-
-#if LDBL_MANT_DIG == 64
-#define	FROM_UNDERFLOW	0x1p65L
-#define	TO_UNDERFLOW	0x1p-65L
-#elif LDBL_MANT_DIG == 113
-#define	FROM_UNDERFLOW	0x1p114L
-#define	TO_UNDERFLOW	0x1p-114L
-#else
-#error Unsupported long double format
-#endif
-
-long double
-scalblnl(long double x, long n)
-{
-	union ieee_ext_u u;
-
-	/* Trivial cases first */
-	if (n == 0 || x == 0.0L)
-		return x;
-
-	u.extu_ld = x;
-
-	/* NaN and infinite don't change either, but trigger exception */
-	if (u.extu_ext.ext_exp == EXT_EXP_INFNAN)
-		return x + x;
-
-	/* Protect against integer overflow in calculation of new exponent */
-	if (n > LDBL_MAX_EXP - LDBL_MIN_EXP + LDBL_MANT_DIG)
-		goto overflow;
-	if (n < LDBL_MIN_EXP - LDBL_MAX_EXP - LDBL_MANT_DIG)
-		goto underflow;
-
-	/* Scale denormalized numbers slightly, so that they are normal */
-	if (u.extu_ext.ext_exp == 0) {
-		u.extu_ld *= FROM_UNDERFLOW;
-		n -= LDBL_MANT_DIG + 1;
-	}
-
-	n += u.extu_ext.ext_exp;
-	if (n >= LDBL_MAX_EXP + EXT_EXP_BIAS)
-		goto overflow;
-	/* Positive exponent (incl. bias) means normal result */
-	if (n > 0) {
-		u.extu_ext.ext_exp = n;
-		return u.extu_ld;
-	}
-	/* Shift the exponent and let the multiply below handle subnormal */
-	n += LDBL_MANT_DIG + 1;
-	if (n <= 0)
-		goto underflow;
-	u.extu_ext.ext_exp = n;
-	return u.extu_ld * TO_UNDERFLOW;
-
-underflow:
-	return LDBL_MIN * copysignl(LDBL_MIN, x);
-
-overflow:
-	return LDBL_MAX * copysignl(LDBL_MAX, x);
-}
-
-#endif
diff --git a/lib/libm/src/s_signgam.c b/lib/libm/src/s_signgam.c
deleted file mode 100644
index ad20c577c..000000000
--- a/lib/libm/src/s_signgam.c
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: s_signgam.c,v 1.4 1998/01/09 03:15:46 perry Exp $	*/
-
-#include "math.h"
-#include "math_private.h"
-int signgam = 0;
diff --git a/lib/libm/src/s_significand.c b/lib/libm/src/s_significand.c
deleted file mode 100644
index 467611c6c..000000000
--- a/lib/libm/src/s_significand.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* @(#)s_signif.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_significand.c,v 1.9 2002/05/26 22:01:58 wiz Exp $");
-#endif
-
-/*
- * significand(x) computes just
- * 	scalb(x, (double) -ilogb(x)),
- * for exercising the fraction-part(F) IEEE 754-1985 test vector.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-double
-significand(double x)
-{
-	return __ieee754_scalb(x,(double) -ilogb(x));
-}
diff --git a/lib/libm/src/s_significandf.c b/lib/libm/src/s_significandf.c
deleted file mode 100644
index 27c9bf7bd..000000000
--- a/lib/libm/src/s_significandf.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* s_significandf.c -- float version of s_significand.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_significandf.c,v 1.6 2002/05/26 22:01:58 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-float
-significandf(float x)
-{
-	return __ieee754_scalbf(x,(float) -ilogbf(x));
-}
diff --git a/lib/libm/src/s_sin.c b/lib/libm/src/s_sin.c
deleted file mode 100644
index 9bddce280..000000000
--- a/lib/libm/src/s_sin.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* @(#)s_sin.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_sin.c,v 1.11 2007/08/20 16:01:39 drochner Exp $");
-#endif
-
-/* sin(x)
- * Return sine function of x.
- *
- * kernel function:
- *	__kernel_sin		... sine function on [-pi/4,pi/4]
- *	__kernel_cos		... cose function on [-pi/4,pi/4]
- *	__ieee754_rem_pio2	... argument reduction routine
- *
- * Method.
- *      Let S,C and T denote the sin, cos and tan respectively on
- *	[-PI/4, +PI/4]. Reduce the argument x to y1+y2 = x-k*pi/2
- *	in [-pi/4 , +pi/4], and let n = k mod 4.
- *	We have
- *
- *          n        sin(x)      cos(x)        tan(x)
- *     ----------------------------------------------------------
- *	    0	       S	   C		 T
- *	    1	       C	  -S		-1/T
- *	    2	      -S	  -C		 T
- *	    3	      -C	   S		-1/T
- *     ----------------------------------------------------------
- *
- * Special cases:
- *      Let trig be any of sin, cos, or tan.
- *      trig(+-INF)  is NaN, with signals;
- *      trig(NaN)    is that NaN;
- *
- * Accuracy:
- *	TRIG(x) returns trig(x) nearly rounded
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#if 0 /* notyet */
-#ifdef __weak_alias
-__weak_alias(sin, _sin)
-#endif
-#endif
-
-double
-sin(double x)
-{
-	double y[2],z=0.0;
-	int32_t n, ix;
-
-    /* High word of x. */
-	GET_HIGH_WORD(ix,x);
-
-    /* |x| ~< pi/4 */
-	ix &= 0x7fffffff;
-	if(ix <= 0x3fe921fb) return __kernel_sin(x,z,0);
-
-    /* sin(Inf or NaN) is NaN */
-	else if (ix>=0x7ff00000) return x-x;
-
-    /* argument reduction needed */
-	else {
-	    n = __ieee754_rem_pio2(x,y);
-	    switch(n&3) {
-		case 0: return  __kernel_sin(y[0],y[1],1);
-		case 1: return  __kernel_cos(y[0],y[1]);
-		case 2: return -__kernel_sin(y[0],y[1],1);
-		default:
-			return -__kernel_cos(y[0],y[1]);
-	    }
-	}
-}
diff --git a/lib/libm/src/s_sinf.c b/lib/libm/src/s_sinf.c
deleted file mode 100644
index 9d525be4a..000000000
--- a/lib/libm/src/s_sinf.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* s_sinf.c -- float version of s_sin.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_sinf.c,v 1.8 2007/08/20 16:01:39 drochner Exp $");
-#endif
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#if 0 /* notyet */
-#ifdef __weak_alias
-__weak_alias(sinf, _sinf)
-#endif
-#endif
-
-float
-sinf(float x)
-{
-	float y[2],z=0.0;
-	int32_t n, ix;
-
-	GET_FLOAT_WORD(ix,x);
-
-    /* |x| ~< pi/4 */
-	ix &= 0x7fffffff;
-	if(ix <= 0x3f490fd8) return __kernel_sinf(x,z,0);
-
-    /* sin(Inf or NaN) is NaN */
-	else if (ix>=0x7f800000) return x-x;
-
-    /* argument reduction needed */
-	else {
-	    n = __ieee754_rem_pio2f(x,y);
-	    switch(n&3) {
-		case 0: return  __kernel_sinf(y[0],y[1],1);
-		case 1: return  __kernel_cosf(y[0],y[1]);
-		case 2: return -__kernel_sinf(y[0],y[1],1);
-		default:
-			return -__kernel_cosf(y[0],y[1]);
-	    }
-	}
-}
diff --git a/lib/libm/src/s_tan.c b/lib/libm/src/s_tan.c
deleted file mode 100644
index 51b83330f..000000000
--- a/lib/libm/src/s_tan.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* @(#)s_tan.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_tan.c,v 1.10 2002/05/26 22:01:58 wiz Exp $");
-#endif
-
-/* tan(x)
- * Return tangent function of x.
- *
- * kernel function:
- *	__kernel_tan		... tangent function on [-pi/4,pi/4]
- *	__ieee754_rem_pio2	... argument reduction routine
- *
- * Method.
- *      Let S,C and T denote the sin, cos and tan respectively on
- *	[-PI/4, +PI/4]. Reduce the argument x to y1+y2 = x-k*pi/2
- *	in [-pi/4 , +pi/4], and let n = k mod 4.
- *	We have
- *
- *          n        sin(x)      cos(x)        tan(x)
- *     ----------------------------------------------------------
- *	    0	       S	   C		 T
- *	    1	       C	  -S		-1/T
- *	    2	      -S	  -C		 T
- *	    3	      -C	   S		-1/T
- *     ----------------------------------------------------------
- *
- * Special cases:
- *      Let trig be any of sin, cos, or tan.
- *      trig(+-INF)  is NaN, with signals;
- *      trig(NaN)    is that NaN;
- *
- * Accuracy:
- *	TRIG(x) returns trig(x) nearly rounded
- */
-
-#include "math.h"
-#include "math_private.h"
-
-double
-tan(double x)
-{
-	double y[2],z=0.0;
-	int32_t n, ix;
-
-    /* High word of x. */
-	GET_HIGH_WORD(ix,x);
-
-    /* |x| ~< pi/4 */
-	ix &= 0x7fffffff;
-	if(ix <= 0x3fe921fb) return __kernel_tan(x,z,1);
-
-    /* tan(Inf or NaN) is NaN */
-	else if (ix>=0x7ff00000) return x-x;		/* NaN */
-
-    /* argument reduction needed */
-	else {
-	    n = __ieee754_rem_pio2(x,y);
-	    return __kernel_tan(y[0],y[1],1-((n&1)<<1)); /*   1 -- n even
-							-1 -- n odd */
-	}
-}
diff --git a/lib/libm/src/s_tanf.c b/lib/libm/src/s_tanf.c
deleted file mode 100644
index ecfdc066d..000000000
--- a/lib/libm/src/s_tanf.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* s_tanf.c -- float version of s_tan.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_tanf.c,v 1.7 2002/05/26 22:01:58 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-float
-tanf(float x)
-{
-	float y[2],z=0.0;
-	int32_t n, ix;
-
-	GET_FLOAT_WORD(ix,x);
-
-    /* |x| ~< pi/4 */
-	ix &= 0x7fffffff;
-	if(ix <= 0x3f490fda) return __kernel_tanf(x,z,1);
-
-    /* tan(Inf or NaN) is NaN */
-	else if (ix>=0x7f800000) return x-x;		/* NaN */
-
-    /* argument reduction needed */
-	else {
-	    n = __ieee754_rem_pio2f(x,y);
-	    return __kernel_tanf(y[0],y[1],1-((n&1)<<1)); /*   1 -- n even
-							      -1 -- n odd */
-	}
-}
diff --git a/lib/libm/src/s_tanh.c b/lib/libm/src/s_tanh.c
deleted file mode 100644
index ec1fe2725..000000000
--- a/lib/libm/src/s_tanh.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* @(#)s_tanh.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_tanh.c,v 1.10 2002/05/26 22:01:59 wiz Exp $");
-#endif
-
-/* Tanh(x)
- * Return the Hyperbolic Tangent of x
- *
- * Method :
- *				       x    -x
- *				      e  - e
- *	0. tanh(x) is defined to be -----------
- *				       x    -x
- *				      e  + e
- *	1. reduce x to non-negative by tanh(-x) = -tanh(x).
- *	2.  0      <= x <= 2**-55 : tanh(x) := x*(one+x)
- *					        -t
- *	    2**-55 <  x <=  1     : tanh(x) := -----; t = expm1(-2x)
- *					       t + 2
- *						     2
- *	    1      <= x <=  22.0  : tanh(x) := 1-  ----- ; t=expm1(2x)
- *						   t + 2
- *	    22.0   <  x <= INF    : tanh(x) := 1.
- *
- * Special cases:
- *	tanh(NaN) is NaN;
- *	only tanh(0)=0 is exact for finite argument.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const double one=1.0, two=2.0, tiny = 1.0e-300;
-
-double
-tanh(double x)
-{
-	double t,z;
-	int32_t jx,ix;
-
-    /* High word of |x|. */
-	GET_HIGH_WORD(jx,x);
-	ix = jx&0x7fffffff;
-
-    /* x is INF or NaN */
-	if(ix>=0x7ff00000) {
-	    if (jx>=0) return one/x+one;    /* tanh(+-inf)=+-1 */
-	    else       return one/x-one;    /* tanh(NaN) = NaN */
-	}
-
-    /* |x| < 22 */
-	if (ix < 0x40360000) {		/* |x|<22 */
-	    if (ix<0x3c800000) 		/* |x|<2**-55 */
-		return x*(one+x);    	/* tanh(small) = small */
-	    if (ix>=0x3ff00000) {	/* |x|>=1  */
-		t = expm1(two*fabs(x));
-		z = one - two/(t+two);
-	    } else {
-	        t = expm1(-two*fabs(x));
-	        z= -t/(t+two);
-	    }
-    /* |x| > 22, return +-1 */
-	} else {
-	    z = one - tiny;		/* raised inexact flag */
-	}
-	return (jx>=0)? z: -z;
-}
diff --git a/lib/libm/src/s_tanhf.c b/lib/libm/src/s_tanhf.c
deleted file mode 100644
index 4c42533ed..000000000
--- a/lib/libm/src/s_tanhf.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* s_tanhf.c -- float version of s_tanh.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_tanhf.c,v 1.7 2002/05/26 22:01:59 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-static const float one=1.0, two=2.0, tiny = 1.0e-30;
-
-float
-tanhf(float x)
-{
-	float t,z;
-	int32_t jx,ix;
-
-	GET_FLOAT_WORD(jx,x);
-	ix = jx&0x7fffffff;
-
-    /* x is INF or NaN */
-	if(ix>=0x7f800000) {
-	    if (jx>=0) return one/x+one;    /* tanh(+-inf)=+-1 */
-	    else       return one/x-one;    /* tanh(NaN) = NaN */
-	}
-
-    /* |x| < 22 */
-	if (ix < 0x41b00000) {		/* |x|<22 */
-	    if (ix<0x24000000) 		/* |x|<2**-55 */
-		return x*(one+x);    	/* tanh(small) = small */
-	    if (ix>=0x3f800000) {	/* |x|>=1  */
-		t = expm1f(two*fabsf(x));
-		z = one - two/(t+two);
-	    } else {
-	        t = expm1f(-two*fabsf(x));
-	        z= -t/(t+two);
-	    }
-    /* |x| > 22, return +-1 */
-	} else {
-	    z = one - tiny;		/* raised inexact flag */
-	}
-	return (jx>=0)? z: -z;
-}
diff --git a/lib/libm/src/s_tgammaf.c b/lib/libm/src/s_tgammaf.c
deleted file mode 100644
index bcd0fecc2..000000000
--- a/lib/libm/src/s_tgammaf.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2008 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 <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: release/9.0.0/lib/msun/src/s_tgammaf.c 176388 2008-02-18 17:27:11Z das $");
-#else
-__RCSID("$NetBSD: s_tgammaf.c,v 1.1 2012/05/05 17:54:14 christos Exp $");
-#endif
-
-#include <math.h>
-
-/*
- * We simply call tgamma() rather than bloating the math library with
- * a float-optimized version of it. The reason is that tgammaf() is
- * essentially useless, since the function is superexponential and
- * floats have very limited range.
- */
-float
-tgammaf(float x)
-{
-
-	return (tgamma(x));
-}
diff --git a/lib/libm/src/s_trunc.c b/lib/libm/src/s_trunc.c
deleted file mode 100644
index 5ce1ff0e9..000000000
--- a/lib/libm/src/s_trunc.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* @(#)s_floor.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>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_trunc.c,v 1.1 2004/06/20 09:25:43 das Exp $");
-#endif
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_trunc.c,v 1.4 2013/11/13 12:58:11 joerg Exp $");
-#endif
-
-/*
- * trunc(x)
- * Return x rounded toward 0 to integral value
- * Method:
- *	Bit twiddling.
- * Exception:
- *	Inexact flag raised if x not equal to trunc(x).
- */
-
-#include "math.h"
-#include "math_private.h"
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(_truncl, trunc)
-__weak_alias(truncl, trunc)
-#endif
-
-static const double huge = 1.0e300;
-
-double
-trunc(double x)
-{
-	int32_t i0,i1,jj0;
-	uint32_t i;
-	EXTRACT_WORDS(i0,i1,x);
-	jj0 = ((i0>>20)&0x7ff)-0x3ff;
-	if(jj0<20) {
-	    if(jj0<0) { 	/* raise inexact if x != 0 */
-		if(huge+x>0.0) {/* |x|<1, so return 0*sign(x) */
-		    i0 &= 0x80000000U;
-		    i1 = 0;
-		}
-	    } else {
-		i = (0x000fffff)>>jj0;
-		if(((i0&i)|i1)==0) return x; /* x is integral */
-		if(huge+x>0.0) {	/* raise inexact flag */
-		    i0 &= (~i); i1=0;
-		}
-	    }
-	} else if (jj0>51) {
-	    if(jj0==0x400) return x+x;	/* inf or NaN */
-	    else return x;		/* x is integral */
-	} else {
-	    i = ((u_int32_t)(0xffffffff))>>(jj0-20);
-	    if((i1&i)==0) return x;	/* x is integral */
-	    if(huge+x>0.0)		/* raise inexact flag */
-		i1 &= (~i);
-	}
-	INSERT_WORDS(x,i0,i1);
-	return x;
-}
diff --git a/lib/libm/src/s_truncf.c b/lib/libm/src/s_truncf.c
deleted file mode 100644
index 6ec960932..000000000
--- a/lib/libm/src/s_truncf.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* @(#)s_floor.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>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_truncf.c,v 1.1 2004/06/20 09:25:43 das Exp $");
-#endif
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_truncf.c,v 1.4 2008/04/25 22:21:53 christos Exp $");
-#endif
-
-/*
- * truncf(x)
- * Return x rounded toward 0 to integral value
- * Method:
- *	Bit twiddling.
- * Exception:
- *	Inexact flag raised if x not equal to truncf(x).
- */
-
-#include "math.h"
-#include "math_private.h"
-
-static const float huge = 1.0e30F;
-
-float
-truncf(float x)
-{
-	int32_t i0,jj0;
-	uint32_t i;
-	GET_FLOAT_WORD(i0,x);
-	jj0 = ((i0>>23)&0xff)-0x7f;
-	if(jj0<23) {
-	    if(jj0<0) { 	/* raise inexact if x != 0 */
-		if(huge+x>0.0F)		/* |x|<1, so return 0*sign(x) */
-		    i0 &= 0x80000000;
-	    } else {
-		i = (0x007fffff)>>jj0;
-		if((i0&i)==0) return x; /* x is integral */
-		if(huge+x>0.0F)		/* raise inexact flag */
-		    i0 &= (~i);
-	    }
-	} else {
-	    if(jj0==0x80) return x+x;	/* inf or NaN */
-	    else return x;		/* x is integral */
-	}
-	SET_FLOAT_WORD(x,i0);
-	return x;
-}
diff --git a/lib/libm/src/s_truncl.c b/lib/libm/src/s_truncl.c
deleted file mode 100644
index 138393bec..000000000
--- a/lib/libm/src/s_truncl.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * ====================================================
- * 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.
- * ====================================================
- *
- * From: @(#)s_floor.c 5.1 93/09/24
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_truncl.c,v 1.4 2013/11/13 12:58:11 joerg Exp $");
-#if 0
-__FBSDID("$FreeBSD: head/lib/msun/src/s_truncl.c 176280 2008-02-14 15:10:34Z bde $");
-#endif
-
-/*
- * truncl(x)
- * Return x rounded toward 0 to integral value
- * Method:
- *	Bit twiddling.
- * Exception:
- *	Inexact flag raised if x not equal to truncl(x).
- */
-#include "namespace.h"
-
-#include <float.h>
-#include <math.h>
-#include <stdint.h>
-#include <machine/ieee.h>
-
-#ifdef __HAVE_LONG_DOUBLE
-
-#ifdef __weak_alias
-__weak_alias(truncl, _truncl)
-#endif
-
-#ifdef LDBL_IMPLICIT_NBIT
-#define	MANH_SIZE	(EXT_FRACHBITS + 1)
-#else
-#define	MANH_SIZE	EXT_FRACHBITS
-#endif
-
-static const long double huge = 1.0e300;
-static const float zero[] = { 0.0, -0.0 };
-
-long double
-truncl(long double x)
-{
-	union ieee_ext_u ux = { .extu_ld = x, };
-	int e = ux.extu_exp - LDBL_MAX_EXP + 1;
-
-	if (e < MANH_SIZE - 1) {
-		if (e < 0) {			/* raise inexact if x != 0 */
-			if (huge + x > 0.0)
-				ux.extu_ld = zero[ux.extu_sign];
-		} else {
-			uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1);
-			if (((ux.extu_frach & m) | ux.extu_fracl) == 0)
-				return (x);	/* x is integral */
-			if (huge + x > 0.0) {	/* raise inexact flag */
-				ux.extu_frach &= ~m;
-				ux.extu_fracl = 0;
-			}
-		}
-	} else if (e < LDBL_MANT_DIG - 1) {
-		uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1);
-		if ((ux.extu_fracl & m) == 0)
-			return (x);	/* x is integral */
-		if (huge + x > 0.0)		/* raise inexact flag */
-			ux.extu_fracl &= ~m;
-	}
-	return (ux.extu_ld);
-}
-
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libm/src/w_acos.c b/lib/libm/src/w_acos.c
deleted file mode 100644
index 475c9a4f4..000000000
--- a/lib/libm/src/w_acos.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* @(#)w_acos.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_acos.c,v 1.9 2002/05/26 22:01:59 wiz Exp $");
-#endif
-
-/*
- * wrap_acos(x)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-
-double
-acos(double x)		/* wrapper acos */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_acos(x);
-#else
-	double z;
-	z = __ieee754_acos(x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x)) return z;
-	if(fabs(x)>1.0) {
-	        return __kernel_standard(x,x,1); /* acos(|x|>1) */
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_acosf.c b/lib/libm/src/w_acosf.c
deleted file mode 100644
index 61a1555ab..000000000
--- a/lib/libm/src/w_acosf.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* w_acosf.c -- float version of w_acos.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_acosf.c,v 1.6 2002/05/26 22:01:59 wiz Exp $");
-#endif
-
-/*
- * wrap_acosf(x)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-
-float
-acosf(float x)		/* wrapper acosf */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_acosf(x);
-#else
-	float z;
-	z = __ieee754_acosf(x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x)) return z;
-	if(fabsf(x)>(float)1.0) {
-	        /* acosf(|x|>1) */
-	        return (float)__kernel_standard((double)x,(double)x,101);
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_acosh.c b/lib/libm/src/w_acosh.c
deleted file mode 100644
index 7049a88c9..000000000
--- a/lib/libm/src/w_acosh.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* @(#)w_acosh.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_acosh.c,v 1.9 2002/05/26 22:01:59 wiz Exp $");
-#endif
-
-/*
- * wrapper acosh(x)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-double
-acosh(double x)		/* wrapper acosh */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_acosh(x);
-#else
-	double z;
-	z = __ieee754_acosh(x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x)) return z;
-	if(x<1.0) {
-	        return __kernel_standard(x,x,29); /* acosh(x<1) */
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_acoshf.c b/lib/libm/src/w_acoshf.c
deleted file mode 100644
index 4ed0b41ef..000000000
--- a/lib/libm/src/w_acoshf.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* w_acoshf.c -- float version of w_acosh.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_acoshf.c,v 1.6 2002/05/26 22:01:59 wiz Exp $");
-#endif
-
-/*
- * wrapper acoshf(x)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-float
-acoshf(float x)		/* wrapper acoshf */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_acoshf(x);
-#else
-	float z;
-	z = __ieee754_acoshf(x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x)) return z;
-	if(x<(float)1.0) {
-		/* acosh(x<1) */
-	        return (float)__kernel_standard((double)x,(double)x,129);
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_asin.c b/lib/libm/src/w_asin.c
deleted file mode 100644
index 98fe35c86..000000000
--- a/lib/libm/src/w_asin.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* @(#)w_asin.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_asin.c,v 1.10 2007/08/20 16:01:39 drochner Exp $");
-#endif
-
-/*
- * wrapper asin(x)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __weak_alias
-__weak_alias(asin, _asin)
-#endif
-
-double
-asin(double x)		/* wrapper asin */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_asin(x);
-#else
-	double z;
-	z = __ieee754_asin(x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x)) return z;
-	if(fabs(x)>1.0) {
-	        return __kernel_standard(x,x,2); /* asin(|x|>1) */
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_asinf.c b/lib/libm/src/w_asinf.c
deleted file mode 100644
index e94df621f..000000000
--- a/lib/libm/src/w_asinf.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* w_asinf.c -- float version of w_asin.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_asinf.c,v 1.7 2007/08/20 16:01:39 drochner Exp $");
-#endif
-
-/*
- * wrapper asinf(x)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __weak_alias
-__weak_alias(asinf, _asinf)
-#endif
-
-float
-asinf(float x)		/* wrapper asinf */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_asinf(x);
-#else
-	float z;
-	z = __ieee754_asinf(x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x)) return z;
-	if(fabsf(x)>(float)1.0) {
-	    /* asinf(|x|>1) */
-	    return (float)__kernel_standard((double)x,(double)x,102);
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_atan2.c b/lib/libm/src/w_atan2.c
deleted file mode 100644
index ae46ef3b1..000000000
--- a/lib/libm/src/w_atan2.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* @(#)w_atan2.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_atan2.c,v 1.10 2007/08/10 21:20:36 drochner Exp $");
-#endif
-
-/*
- * wrapper atan2(y,x)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __weak_alias
-__weak_alias(atan2, _atan2)
-#endif
-
-double
-atan2(double y, double x)	/* wrapper atan2 */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_atan2(y,x);
-#else
-	double z;
-	z = __ieee754_atan2(y,x);
-	if(_LIB_VERSION == _IEEE_||isnan(x)||isnan(y)) return z;
-	if(x==0.0&&y==0.0) {
-	        return __kernel_standard(y,x,3); /* atan2(+-0,+-0) */
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_atan2f.c b/lib/libm/src/w_atan2f.c
deleted file mode 100644
index 8461e1e82..000000000
--- a/lib/libm/src/w_atan2f.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* w_atan2f.c -- float version of w_atan2.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_atan2f.c,v 1.7 2007/08/10 21:20:36 drochner Exp $");
-#endif
-
-/*
- * wrapper atan2f(y,x)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __weak_alias
-__weak_alias(atan2f, _atan2f)
-#endif
-
-float
-atan2f(float y, float x)		/* wrapper atan2f */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_atan2f(y,x);
-#else
-	float z;
-	z = __ieee754_atan2f(y,x);
-	if(_LIB_VERSION == _IEEE_||isnanf(x)||isnanf(y)) return z;
-	if(x==(float)0.0&&y==(float)0.0) {
-		/* atan2f(+-0,+-0) */
-	        return (float)__kernel_standard((double)y,(double)x,103);
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_atanh.c b/lib/libm/src/w_atanh.c
deleted file mode 100644
index 0abd7ae97..000000000
--- a/lib/libm/src/w_atanh.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* @(#)w_atanh.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_atanh.c,v 1.9 2002/05/26 22:02:00 wiz Exp $");
-#endif
-
-/*
- * wrapper atanh(x)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-
-double
-atanh(double x)		/* wrapper atanh */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_atanh(x);
-#else
-	double z,y;
-	z = __ieee754_atanh(x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x)) return z;
-	y = fabs(x);
-	if(y>=1.0) {
-	    if(y>1.0)
-	        return __kernel_standard(x,x,30); /* atanh(|x|>1) */
-	    else
-	        return __kernel_standard(x,x,31); /* atanh(|x|==1) */
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_atanhf.c b/lib/libm/src/w_atanhf.c
deleted file mode 100644
index 0bd1c591f..000000000
--- a/lib/libm/src/w_atanhf.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* w_atanhf.c -- float version of w_atanh.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_atanhf.c,v 1.6 2002/05/26 22:02:00 wiz Exp $");
-#endif
-
-/*
- * wrapper atanhf(x)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-
-float
-atanhf(float x)		/* wrapper atanhf */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_atanhf(x);
-#else
-	float z,y;
-	z = __ieee754_atanhf(x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x)) return z;
-	y = fabsf(x);
-	if(y>=(float)1.0) {
-	    if(y>(float)1.0)
-	        /* atanhf(|x|>1) */
-	        return (float)__kernel_standard((double)x,(double)x,130);
-	    else
-	        /* atanhf(|x|==1) */
-	        return (float)__kernel_standard((double)x,(double)x,131);
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_cosh.c b/lib/libm/src/w_cosh.c
deleted file mode 100644
index 887a4b118..000000000
--- a/lib/libm/src/w_cosh.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* @(#)w_cosh.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_cosh.c,v 1.10 2007/08/20 16:01:39 drochner Exp $");
-#endif
-
-/*
- * wrapper cosh(x)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __weak_alias
-__weak_alias(cosh, _cosh)
-#endif
-
-double
-cosh(double x)		/* wrapper cosh */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_cosh(x);
-#else
-	double z;
-	z = __ieee754_cosh(x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x)) return z;
-	if(fabs(x)>7.10475860073943863426e+02) {
-	        return __kernel_standard(x,x,5); /* cosh overflow */
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_coshf.c b/lib/libm/src/w_coshf.c
deleted file mode 100644
index ea5a2e29d..000000000
--- a/lib/libm/src/w_coshf.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* w_coshf.c -- float version of w_cosh.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_coshf.c,v 1.7 2007/08/20 16:01:40 drochner Exp $");
-#endif
-
-/*
- * wrapper coshf(x)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __weak_alias
-__weak_alias(coshf, _coshf)
-#endif
-
-float
-coshf(float x)		/* wrapper coshf */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_coshf(x);
-#else
-	float z;
-	z = __ieee754_coshf(x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x)) return z;
-	if(fabsf(x)>(float)8.9415985107e+01) {
-		/* cosh overflow */
-	        return (float)__kernel_standard((double)x,(double)x,105);
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_drem.c b/lib/libm/src/w_drem.c
deleted file mode 100644
index 12de57af2..000000000
--- a/lib/libm/src/w_drem.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * drem() wrapper for remainder().
- *
- * Written by J.T. Conklin, <jtc@wimsey.com>
- * Placed into the Public Domain, 1994.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_drem.c,v 1.4 2004/06/25 15:57:38 drochner Exp $");
-#endif
-
-#include <math.h>
-
-double
-drem(double x, double y)
-{
-	return remainder(x, y);
-}
diff --git a/lib/libm/src/w_dremf.c b/lib/libm/src/w_dremf.c
deleted file mode 100644
index 9e2303153..000000000
--- a/lib/libm/src/w_dremf.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * dremf() wrapper for remainderf().
- *
- * Written by J.T. Conklin, <jtc@wimsey.com>
- * Placed into the Public Domain, 1994.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_dremf.c,v 1.4 2004/06/25 15:57:38 drochner Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-float
-dremf(float x, float y)
-{
-	return remainderf(x, y);
-}
diff --git a/lib/libm/src/w_exp.c b/lib/libm/src/w_exp.c
deleted file mode 100644
index a6f79fc92..000000000
--- a/lib/libm/src/w_exp.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* @(#)w_exp.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_exp.c,v 1.10 2007/08/20 16:01:40 drochner Exp $");
-#endif
-
-/*
- * wrapper exp(x)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __weak_alias
-__weak_alias(exp, _exp)
-#endif
-
-static const double
-o_threshold=  7.09782712893383973096e+02,  /* 0x40862E42, 0xFEFA39EF */
-u_threshold= -7.45133219101941108420e+02;  /* 0xc0874910, 0xD52D3051 */
-
-double
-exp(double x)		/* wrapper exp */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_exp(x);
-#else
-	double z;
-	z = __ieee754_exp(x);
-	if(_LIB_VERSION == _IEEE_) return z;
-	if(finite(x)) {
-	    if(x>o_threshold)
-	        return __kernel_standard(x,x,6); /* exp overflow */
-	    else if(x<u_threshold)
-	        return __kernel_standard(x,x,7); /* exp underflow */
-	}
-	return z;
-#endif
-}
diff --git a/lib/libm/src/w_expf.c b/lib/libm/src/w_expf.c
deleted file mode 100644
index c99e136aa..000000000
--- a/lib/libm/src/w_expf.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* w_expf.c -- float version of w_exp.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_expf.c,v 1.7 2007/08/20 16:01:40 drochner Exp $");
-#endif
-
-/*
- * wrapper expf(x)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __weak_alias
-__weak_alias(expf, _expf)
-#endif
-
-static const float
-o_threshold=  8.8721679688e+01,  /* 0x42b17180 */
-u_threshold= -1.0397208405e+02;  /* 0xc2cff1b5 */
-
-float
-expf(float x)		/* wrapper expf */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_expf(x);
-#else
-	float z;
-	z = __ieee754_expf(x);
-	if(_LIB_VERSION == _IEEE_) return z;
-	if(finitef(x)) {
-	    if(x>o_threshold)
-	        /* exp overflow */
-	        return (float)__kernel_standard((double)x,(double)x,106);
-	    else if(x<u_threshold)
-	        /* exp underflow */
-	        return (float)__kernel_standard((double)x,(double)x,107);
-	}
-	return z;
-#endif
-}
diff --git a/lib/libm/src/w_fmod.c b/lib/libm/src/w_fmod.c
deleted file mode 100644
index a454152f2..000000000
--- a/lib/libm/src/w_fmod.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* @(#)w_fmod.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_fmod.c,v 1.10 2013/11/12 16:48:39 joerg Exp $");
-#endif
-
-/*
- * wrapper fmod(x,y)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(_fmodl, fmod)
-__weak_alias(fmodl, fmod)
-#endif
-
-double
-fmod(double x, double y)	/* wrapper fmod */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_fmod(x,y);
-#else
-	double z;
-	z = __ieee754_fmod(x,y);
-	if(_LIB_VERSION == _IEEE_ ||isnan(y)||isnan(x)) return z;
-	if(y==0.0) {
-	        return __kernel_standard(x,y,27); /* fmod(x,0) */
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_fmodf.c b/lib/libm/src/w_fmodf.c
deleted file mode 100644
index eb8c4c47d..000000000
--- a/lib/libm/src/w_fmodf.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* w_fmodf.c -- float version of w_fmod.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_fmodf.c,v 1.6 2002/05/26 22:02:00 wiz Exp $");
-#endif
-
-/*
- * wrapper fmodf(x,y)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-
-float
-fmodf(float x, float y)	/* wrapper fmodf */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_fmodf(x,y);
-#else
-	float z;
-	z = __ieee754_fmodf(x,y);
-	if(_LIB_VERSION == _IEEE_ ||isnanf(y)||isnanf(x)) return z;
-	if(y==(float)0.0) {
-		/* fmodf(x,0) */
-	        return (float)__kernel_standard((double)x,(double)y,127);
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_fmodl.c b/lib/libm/src/w_fmodl.c
deleted file mode 100644
index ff9467c05..000000000
--- a/lib/libm/src/w_fmodl.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* @(#)w_fmod.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>
-__RCSID("$NetBSD: w_fmodl.c,v 1.4 2013/11/21 13:41:10 martin Exp $");
-
-/*
- * wrapper fmodl(x,y)
- */
-#include "namespace.h"
-
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __HAVE_LONG_DOUBLE
-
-#ifdef __weak_alias
-__weak_alias(fmodl, _fmodl)
-#endif
-
-long double
-fmodl(long double x, long double y)	/* wrapper fmod */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_fmodl(x,y);
-#else
-	long double z;
-	z = __ieee754_fmodl(x,y);
-	if(_LIB_VERSION == _IEEE_ ||isnan(y)||isnan(x)) return z;
-	if(y==0.0) {
-	        return __kernel_standard(x,y,227); /* fmod(x,0) */
-	} else
-	    return z;
-#endif
-}
-
-#endif
diff --git a/lib/libm/src/w_gamma.c b/lib/libm/src/w_gamma.c
deleted file mode 100644
index 4d1993945..000000000
--- a/lib/libm/src/w_gamma.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* @(#)w_gamma.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_gamma.c,v 1.11 2002/05/26 22:02:00 wiz Exp $");
-#endif
-
-/* double gamma(double x)
- * Return the logarithm of the Gamma function of x.
- *
- * Method: call gamma_r
- */
-
-#include "math.h"
-#include "math_private.h"
-
-double
-gamma(double x)
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_lgamma_r(x,&signgam);
-#else
-        double y;
-        y = __ieee754_lgamma_r(x,&signgam);
-        if(_LIB_VERSION == _IEEE_) return y;
-        if(!finite(y)&&finite(x)) {
-            if(floor(x)==x&&x<=0.0)
-                return __kernel_standard(x,x,41); /* gamma pole */
-            else
-                return __kernel_standard(x,x,40); /* gamma overflow */
-        } else
-            return y;
-#endif
-}
diff --git a/lib/libm/src/w_gamma_r.c b/lib/libm/src/w_gamma_r.c
deleted file mode 100644
index 2ab5f5332..000000000
--- a/lib/libm/src/w_gamma_r.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* @(#)wr_gamma.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_gamma_r.c,v 1.11 2002/05/26 22:02:00 wiz Exp $");
-#endif
-
-/*
- * wrapper double gamma_r(double x, int *signgamp)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-double
-gamma_r(double x, int *signgamp) /* wrapper lgamma_r */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_lgamma_r(x,signgamp);
-#else
-        double y;
-        y = __ieee754_lgamma_r(x,signgamp);
-        if(_LIB_VERSION == _IEEE_) return y;
-        if(!finite(y)&&finite(x)) {
-            if(floor(x)==x&&x<=0.0)
-                return __kernel_standard(x,x,41); /* gamma pole */
-            else
-                return __kernel_standard(x,x,40); /* gamma overflow */
-        } else
-            return y;
-#endif
-}
diff --git a/lib/libm/src/w_gammaf.c b/lib/libm/src/w_gammaf.c
deleted file mode 100644
index 73235fafe..000000000
--- a/lib/libm/src/w_gammaf.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* w_gammaf.c -- float version of w_gamma.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_gammaf.c,v 1.8 2002/05/26 22:02:01 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-float
-gammaf(float x)
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_lgammaf_r(x,&signgam);
-#else
-        float y;
-        y = __ieee754_lgammaf_r(x,&signgam);
-        if(_LIB_VERSION == _IEEE_) return y;
-        if(!finitef(y)&&finitef(x)) {
-            if(floorf(x)==x&&x<=(float)0.0)
-	        /* gammaf pole */
-                return (float)__kernel_standard((double)x,(double)x,141);
-            else
-	        /* gammaf overflow */
-                return (float)__kernel_standard((double)x,(double)x,140);
-        } else
-            return y;
-#endif
-}
diff --git a/lib/libm/src/w_gammaf_r.c b/lib/libm/src/w_gammaf_r.c
deleted file mode 100644
index 1b01d741e..000000000
--- a/lib/libm/src/w_gammaf_r.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* w_gammaf_r.c -- float version of w_gamma_r.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_gammaf_r.c,v 1.8 2002/05/26 22:02:01 wiz Exp $");
-#endif
-
-/*
- * wrapper float gammaf_r(float x, int *signgamp)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-float
-gammaf_r(float x, int *signgamp) /* wrapper lgammaf_r */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_lgammaf_r(x,signgamp);
-#else
-        float y;
-        y = __ieee754_lgammaf_r(x,signgamp);
-        if(_LIB_VERSION == _IEEE_) return y;
-        if(!finitef(y)&&finitef(x)) {
-            if(floorf(x)==x&&x<=(float)0.0)
-	        /* gammaf pole */
-                return (float)__kernel_standard((double)x,(double)x,141);
-            else
-	        /* gamma overflow */
-                return (float)__kernel_standard((double)x,(double)x,140);
-        } else
-            return y;
-#endif
-}
diff --git a/lib/libm/src/w_hypot.c b/lib/libm/src/w_hypot.c
deleted file mode 100644
index 4e25a1f1a..000000000
--- a/lib/libm/src/w_hypot.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* @(#)w_hypot.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_hypot.c,v 1.10 2007/08/10 21:20:36 drochner Exp $");
-#endif
-
-/*
- * wrapper hypot(x,y)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __weak_alias
-__weak_alias(hypot, _hypot)
-#endif
-
-double
-hypot(double x, double y)/* wrapper hypot */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_hypot(x,y);
-#else
-	double z;
-	z = __ieee754_hypot(x,y);
-	if(_LIB_VERSION == _IEEE_) return z;
-	if((!finite(z))&&finite(x)&&finite(y))
-	    return __kernel_standard(x,y,4); /* hypot overflow */
-	else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_hypotf.c b/lib/libm/src/w_hypotf.c
deleted file mode 100644
index 0c88c238c..000000000
--- a/lib/libm/src/w_hypotf.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* w_hypotf.c -- float version of w_hypot.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_hypotf.c,v 1.7 2007/08/10 21:20:36 drochner Exp $");
-#endif
-
-/*
- * wrapper hypotf(x,y)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __weak_alias
-__weak_alias(hypotf, _hypotf)
-#endif
-
-float
-hypotf(float x, float y)	/* wrapper hypotf */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_hypotf(x,y);
-#else
-	float z;
-	z = __ieee754_hypotf(x,y);
-	if(_LIB_VERSION == _IEEE_) return z;
-	if((!finitef(z))&&finitef(x)&&finitef(y))
-	    /* hypot overflow */
-	    return (float)__kernel_standard((double)x,(double)y,104);
-	else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_j0.c b/lib/libm/src/w_j0.c
deleted file mode 100644
index 94679b207..000000000
--- a/lib/libm/src/w_j0.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* @(#)w_j0.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_j0.c,v 1.9 2002/05/26 22:02:01 wiz Exp $");
-#endif
-
-/*
- * wrapper j0(double x), y0(double x)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-double
-j0(double x)		/* wrapper j0 */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_j0(x);
-#else
-	double z = __ieee754_j0(x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x)) return z;
-	if(fabs(x)>X_TLOSS) {
-	        return __kernel_standard(x,x,34); /* j0(|x|>X_TLOSS) */
-	} else
-	    return z;
-#endif
-}
-
-double
-y0(double x)		/* wrapper y0 */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_y0(x);
-#else
-	double z;
-	z = __ieee754_y0(x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x) ) return z;
-        if(x <= 0.0){
-                if(x==0.0)
-                    /* d= -one/(x-x); */
-                    return __kernel_standard(x,x,8);
-                else
-                    /* d = zero/(x-x); */
-                    return __kernel_standard(x,x,9);
-        }
-	if(x>X_TLOSS) {
-	        return __kernel_standard(x,x,35); /* y0(x>X_TLOSS) */
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_j0f.c b/lib/libm/src/w_j0f.c
deleted file mode 100644
index d7798d299..000000000
--- a/lib/libm/src/w_j0f.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* w_j0f.c -- float version of w_j0.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_j0f.c,v 1.6 2002/05/26 22:02:01 wiz Exp $");
-#endif
-
-/*
- * wrapper j0f(float x), y0f(float x)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-float
-j0f(float x)		/* wrapper j0f */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_j0f(x);
-#else
-	float z = __ieee754_j0f(x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x)) return z;
-	if(fabsf(x)>(float)X_TLOSS) {
-		/* j0f(|x|>X_TLOSS) */
-	        return (float)__kernel_standard((double)x,(double)x,134);
-	} else
-	    return z;
-#endif
-}
-
-float
-y0f(float x)		/* wrapper y0f */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_y0f(x);
-#else
-	float z;
-	z = __ieee754_y0f(x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x) ) return z;
-        if(x <= (float)0.0){
-                if(x==(float)0.0)
-                    /* d= -one/(x-x); */
-                    return (float)__kernel_standard((double)x,(double)x,108);
-                else
-                    /* d = zero/(x-x); */
-                    return (float)__kernel_standard((double)x,(double)x,109);
-        }
-	if(x>(float)X_TLOSS) {
-		/* y0(x>X_TLOSS) */
-	        return (float)__kernel_standard((double)x,(double)x,135);
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_j1.c b/lib/libm/src/w_j1.c
deleted file mode 100644
index 5185313e7..000000000
--- a/lib/libm/src/w_j1.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* @(#)w_j1.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_j1.c,v 1.9 2002/05/26 22:02:01 wiz Exp $");
-#endif
-
-/*
- * wrapper of j1,y1
- */
-
-#include "math.h"
-#include "math_private.h"
-
-double
-j1(double x)		/* wrapper j1 */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_j1(x);
-#else
-	double z;
-	z = __ieee754_j1(x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x) ) return z;
-	if(fabs(x)>X_TLOSS) {
-	        return __kernel_standard(x,x,36); /* j1(|x|>X_TLOSS) */
-	} else
-	    return z;
-#endif
-}
-
-double
-y1(double x)		/* wrapper y1 */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_y1(x);
-#else
-	double z;
-	z = __ieee754_y1(x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x) ) return z;
-        if(x <= 0.0){
-                if(x==0.0)
-                    /* d= -one/(x-x); */
-                    return __kernel_standard(x,x,10);
-                else
-                    /* d = zero/(x-x); */
-                    return __kernel_standard(x,x,11);
-        }
-	if(x>X_TLOSS) {
-	        return __kernel_standard(x,x,37); /* y1(x>X_TLOSS) */
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_j1f.c b/lib/libm/src/w_j1f.c
deleted file mode 100644
index bd7da996c..000000000
--- a/lib/libm/src/w_j1f.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* w_j1f.c -- float version of w_j1.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_j1f.c,v 1.6 2002/05/26 22:02:01 wiz Exp $");
-#endif
-
-/*
- * wrapper of j1f,y1f
- */
-
-#include "math.h"
-#include "math_private.h"
-
-float
-j1f(float x)		/* wrapper j1f */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_j1f(x);
-#else
-	float z;
-	z = __ieee754_j1f(x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x) ) return z;
-	if(fabsf(x)>(float)X_TLOSS) {
-		/* j1(|x|>X_TLOSS) */
-	        return (float)__kernel_standard((double)x,(double)x,136);
-	} else
-	    return z;
-#endif
-}
-
-float
-y1f(float x)		/* wrapper y1f */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_y1f(x);
-#else
-	float z;
-	z = __ieee754_y1f(x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x) ) return z;
-        if(x <= (float)0.0){
-                if(x==(float)0.0)
-                    /* d= -one/(x-x); */
-                    return (float)__kernel_standard((double)x,(double)x,110);
-                else
-                    /* d = zero/(x-x); */
-                    return (float)__kernel_standard((double)x,(double)x,111);
-        }
-	if(x>(float)X_TLOSS) {
-		/* y1(x>X_TLOSS) */
-	        return (float)__kernel_standard((double)x,(double)x,137);
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_jn.c b/lib/libm/src/w_jn.c
deleted file mode 100644
index b23ef995e..000000000
--- a/lib/libm/src/w_jn.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* @(#)w_jn.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_jn.c,v 1.9 2002/05/26 22:02:01 wiz Exp $");
-#endif
-
-/*
- * wrapper jn(int n, double x), yn(int n, double x)
- * floating point Bessel's function of the 1st and 2nd kind
- * of order n
- *
- * Special cases:
- *	y0(0)=y1(0)=yn(n,0) = -inf with division by zero signal;
- *	y0(-ve)=y1(-ve)=yn(n,-ve) are NaN with invalid signal.
- * Note 2. About jn(n,x), yn(n,x)
- *	For n=0, j0(x) is called,
- *	for n=1, j1(x) is called,
- *	for n<x, forward recursion us used starting
- *	from values of j0(x) and j1(x).
- *	for n>x, a continued fraction approximation to
- *	j(n,x)/j(n-1,x) is evaluated and then backward
- *	recursion is used starting from a supposed value
- *	for j(n,x). The resulting value of j(0,x) is
- *	compared with the actual value to correct the
- *	supposed value of j(n,x).
- *
- *	yn(n,x) is similar in all respects, except
- *	that forward recursion is used for all
- *	values of n>1.
- *
- */
-
-#include "math.h"
-#include "math_private.h"
-
-double
-jn(int n, double x)	/* wrapper jn */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_jn(n,x);
-#else
-	double z;
-	z = __ieee754_jn(n,x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x) ) return z;
-	if(fabs(x)>X_TLOSS) {
-	    return __kernel_standard((double)n,x,38); /* jn(|x|>X_TLOSS,n) */
-	} else
-	    return z;
-#endif
-}
-
-double
-yn(int n, double x)	/* wrapper yn */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_yn(n,x);
-#else
-	double z;
-	z = __ieee754_yn(n,x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x) ) return z;
-        if(x <= 0.0){
-                if(x==0.0)
-                    /* d= -one/(x-x); */
-                    return __kernel_standard((double)n,x,12);
-                else
-                    /* d = zero/(x-x); */
-                    return __kernel_standard((double)n,x,13);
-        }
-	if(x>X_TLOSS) {
-	    return __kernel_standard((double)n,x,39); /* yn(x>X_TLOSS,n) */
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_jnf.c b/lib/libm/src/w_jnf.c
deleted file mode 100644
index 52a43e142..000000000
--- a/lib/libm/src/w_jnf.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* w_jnf.c -- float version of w_jn.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_jnf.c,v 1.6 2002/05/26 22:02:02 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-float
-jnf(int n, float x)	/* wrapper jnf */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_jnf(n,x);
-#else
-	float z;
-	z = __ieee754_jnf(n,x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x) ) return z;
-	if(fabsf(x)>(float)X_TLOSS) {
-	    /* jn(|x|>X_TLOSS,n) */
-	    return (float)__kernel_standard((double)n,(double)x,138);
-	} else
-	    return z;
-#endif
-}
-
-float
-ynf(int n, float x)	/* wrapper ynf */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_ynf(n,x);
-#else
-	float z;
-	z = __ieee754_ynf(n,x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x) ) return z;
-        if(x <= (float)0.0){
-                if(x==(float)0.0)
-                    /* d= -one/(x-x); */
-                    return (float)__kernel_standard((double)n,(double)x,112);
-                else
-                    /* d = zero/(x-x); */
-                    return (float)__kernel_standard((double)n,(double)x,113);
-        }
-	if(x>(float)X_TLOSS) {
-	    /* yn(x>X_TLOSS,n) */
-	    return (float)__kernel_standard((double)n,(double)x,139);
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_lgamma.c b/lib/libm/src/w_lgamma.c
deleted file mode 100644
index f6ab3891e..000000000
--- a/lib/libm/src/w_lgamma.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* @(#)w_lgamma.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_lgamma.c,v 1.10 2002/05/26 22:02:02 wiz Exp $");
-#endif
-
-/* double lgamma(double x)
- * Return the logarithm of the Gamma function of x.
- *
- * Method: call __ieee754_lgamma_r
- */
-
-#include "math.h"
-#include "math_private.h"
-
-double
-lgamma(double x)
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_lgamma_r(x,&signgam);
-#else
-        double y;
-        y = __ieee754_lgamma_r(x,&signgam);
-        if(_LIB_VERSION == _IEEE_) return y;
-        if(!finite(y)&&finite(x)) {
-            if(floor(x)==x&&x<=0.0)
-                return __kernel_standard(x,x,15); /* lgamma pole */
-            else
-                return __kernel_standard(x,x,14); /* lgamma overflow */
-        } else
-            return y;
-#endif
-}
diff --git a/lib/libm/src/w_lgamma_r.c b/lib/libm/src/w_lgamma_r.c
deleted file mode 100644
index 01860b497..000000000
--- a/lib/libm/src/w_lgamma_r.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* @(#)wr_lgamma.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_lgamma_r.c,v 1.10 2002/05/26 22:02:02 wiz Exp $");
-#endif
-
-/*
- * wrapper double lgamma_r(double x, int *signgamp)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-double
-lgamma_r(double x, int *signgamp) /* wrapper lgamma_r */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_lgamma_r(x,signgamp);
-#else
-        double y;
-        y = __ieee754_lgamma_r(x,signgamp);
-        if(_LIB_VERSION == _IEEE_) return y;
-        if(!finite(y)&&finite(x)) {
-            if(floor(x)==x&&x<=0.0)
-                return __kernel_standard(x,x,15); /* lgamma pole */
-            else
-                return __kernel_standard(x,x,14); /* lgamma overflow */
-        } else
-            return y;
-#endif
-}
diff --git a/lib/libm/src/w_lgammaf.c b/lib/libm/src/w_lgammaf.c
deleted file mode 100644
index bb2bb282b..000000000
--- a/lib/libm/src/w_lgammaf.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* w_lgammaf.c -- float version of w_lgamma.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_lgammaf.c,v 1.7 2002/05/26 22:02:02 wiz Exp $");
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-float
-lgammaf(float x)
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_lgammaf_r(x,&signgam);
-#else
-        float y;
-        y = __ieee754_lgammaf_r(x,&signgam);
-        if(_LIB_VERSION == _IEEE_) return y;
-        if(!finitef(y)&&finitef(x)) {
-            if(floorf(x)==x&&x<=(float)0.0)
-	        /* lgamma pole */
-                return (float)__kernel_standard((double)x,(double)x,115);
-            else
-	        /* lgamma overflow */
-                return (float)__kernel_standard((double)x,(double)x,114);
-        } else
-            return y;
-#endif
-}
diff --git a/lib/libm/src/w_lgammaf_r.c b/lib/libm/src/w_lgammaf_r.c
deleted file mode 100644
index 853504a1c..000000000
--- a/lib/libm/src/w_lgammaf_r.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* w_lgammaf_r.c -- float version of w_lgamma_r.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_lgammaf_r.c,v 1.7 2002/05/26 22:02:02 wiz Exp $");
-#endif
-
-/*
- * wrapper float lgammaf_r(float x, int *signgamp)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-float
-lgammaf_r(float x, int *signgamp) /* wrapper lgammaf_r */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_lgammaf_r(x,signgamp);
-#else
-        float y;
-        y = __ieee754_lgammaf_r(x,signgamp);
-        if(_LIB_VERSION == _IEEE_) return y;
-        if(!finitef(y)&&finitef(x)) {
-            if(floorf(x)==x&&x<=(float)0.0)
-	        /* lgamma pole */
-                return (float)__kernel_standard((double)x,(double)x,115);
-            else
-	        /* lgamma overflow */
-	        return (float)__kernel_standard((double)x,(double)x,114);
-        } else
-            return y;
-#endif
-}
diff --git a/lib/libm/src/w_log.c b/lib/libm/src/w_log.c
deleted file mode 100644
index 9ab1880e0..000000000
--- a/lib/libm/src/w_log.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* @(#)w_log.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_log.c,v 1.10 2007/08/20 16:01:40 drochner Exp $");
-#endif
-
-/*
- * wrapper log(x)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __weak_alias
-__weak_alias(log, _log)
-#endif
-
-double
-log(double x)		/* wrapper log */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_log(x);
-#else
-	double z;
-	z = __ieee754_log(x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x) || x > 0.0) return z;
-	if(x==0.0)
-	    return __kernel_standard(x,x,16); /* log(0) */
-	else
-	    return __kernel_standard(x,x,17); /* log(x<0) */
-#endif
-}
diff --git a/lib/libm/src/w_log10.c b/lib/libm/src/w_log10.c
deleted file mode 100644
index a89e1a98f..000000000
--- a/lib/libm/src/w_log10.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* @(#)w_log10.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_log10.c,v 1.9 2002/05/26 22:02:02 wiz Exp $");
-#endif
-
-/*
- * wrapper log10(X)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-
-double
-log10(double x)		/* wrapper log10 */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_log10(x);
-#else
-	double z;
-	z = __ieee754_log10(x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x)) return z;
-	if(x<=0.0) {
-	    if(x==0.0)
-	        return __kernel_standard(x,x,18); /* log10(0) */
-	    else
-	        return __kernel_standard(x,x,19); /* log10(x<0) */
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_log10f.c b/lib/libm/src/w_log10f.c
deleted file mode 100644
index d6af2a714..000000000
--- a/lib/libm/src/w_log10f.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* w_log10f.c -- float version of w_log10.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_log10f.c,v 1.6 2002/05/26 22:02:02 wiz Exp $");
-#endif
-
-/*
- * wrapper log10f(X)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-
-float
-log10f(float x)		/* wrapper log10f */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_log10f(x);
-#else
-	float z;
-	z = __ieee754_log10f(x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x)) return z;
-	if(x<=(float)0.0) {
-	    if(x==(float)0.0)
-	        /* log10(0) */
-	        return (float)__kernel_standard((double)x,(double)x,118);
-	    else
-	        /* log10(x<0) */
-	        return (float)__kernel_standard((double)x,(double)x,119);
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_log2.c b/lib/libm/src/w_log2.c
deleted file mode 100644
index d828b6180..000000000
--- a/lib/libm/src/w_log2.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* @(#)w_log10.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_log2.c,v 1.1 2005/07/21 16:58:39 christos Exp $");
-#endif
-
-/*
- * wrapper log2(X)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-
-double
-log2(double x)		/* wrapper log10 */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_log2(x);
-#else
-	double z;
-	z = __ieee754_log2(x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x)) return z;
-	if(x<=0.0) {
-	    if(x==0.0)
-	        return __kernel_standard(x,x,48); /* log2(0) */
-	    else
-	        return __kernel_standard(x,x,49); /* log2(x<0) */
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_log2f.c b/lib/libm/src/w_log2f.c
deleted file mode 100644
index 229c6aa99..000000000
--- a/lib/libm/src/w_log2f.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* w_log10f.c -- float version of w_log10.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_log2f.c,v 1.1 2005/07/21 16:58:39 christos Exp $");
-#endif
-
-/*
- * wrapper log2f(X)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-
-float
-log2f(float x)		/* wrapper log2f */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_log2f(x);
-#else
-	float z;
-	z = __ieee754_log2f(x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x)) return z;
-	if(x<=(float)0.0) {
-	    if(x==(float)0.0)
-	        /* log2(0) */
-	        return (float)__kernel_standard((double)x,(double)x,148);
-	    else
-	        /* log2(x<0) */
-	        return (float)__kernel_standard((double)x,(double)x,149);
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_logf.c b/lib/libm/src/w_logf.c
deleted file mode 100644
index e145b1ba5..000000000
--- a/lib/libm/src/w_logf.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* w_logf.c -- float version of w_log.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_logf.c,v 1.7 2007/08/20 16:01:40 drochner Exp $");
-#endif
-
-/*
- * wrapper logf(x)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __weak_alias
-__weak_alias(logf, _logf)
-#endif
-
-float
-logf(float x)		/* wrapper logf */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_logf(x);
-#else
-	float z;
-	z = __ieee754_logf(x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x) || x > (float)0.0) return z;
-	if(x==(float)0.0)
-	    /* logf(0) */
-	    return (float)__kernel_standard((double)x,(double)x,116);
-	else
-	    /* logf(x<0) */
-	    return (float)__kernel_standard((double)x,(double)x,117);
-#endif
-}
diff --git a/lib/libm/src/w_pow.c b/lib/libm/src/w_pow.c
deleted file mode 100644
index fa54b2909..000000000
--- a/lib/libm/src/w_pow.c
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-/* @(#)w_pow.c 5.2 93/10/01 */
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_pow.c,v 1.7 2002/05/26 22:02:02 wiz Exp $");
-#endif
-
-/*
- * wrapper pow(x,y) return x**y
- */
-
-#include "math.h"
-#include "math_private.h"
-
-
-double
-pow(double x, double y)	/* wrapper pow */
-{
-#ifdef _IEEE_LIBM
-	return  __ieee754_pow(x,y);
-#else
-	double z;
-	z=__ieee754_pow(x,y);
-	if(_LIB_VERSION == _IEEE_|| isnan(y)) return z;
-	if(isnan(x)) {
-	    if(y==0.0)
-	        return __kernel_standard(x,y,42); /* pow(NaN,0.0) */
-	    else
-		return z;
-	}
-	if(x==0.0){
-	    if(y==0.0)
-	        return __kernel_standard(x,y,20); /* pow(0.0,0.0) */
-	    if(finite(y)&&y<0.0)
-	        return __kernel_standard(x,y,23); /* pow(0.0,negative) */
-	    return z;
-	}
-	if(!finite(z)) {
-	    if(finite(x)&&finite(y)) {
-	        if(isnan(z))
-	            return __kernel_standard(x,y,24); /* pow neg**non-int */
-	        else
-	            return __kernel_standard(x,y,21); /* pow overflow */
-	    }
-	}
-	if(z==0.0&&finite(x)&&finite(y))
-	    return __kernel_standard(x,y,22); /* pow underflow */
-	return z;
-#endif
-}
diff --git a/lib/libm/src/w_powf.c b/lib/libm/src/w_powf.c
deleted file mode 100644
index 3ec65801a..000000000
--- a/lib/libm/src/w_powf.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* w_powf.c -- float version of w_pow.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_powf.c,v 1.6 2002/05/26 22:02:02 wiz Exp $");
-#endif
-
-/*
- * wrapper powf(x,y) return x**y
- */
-
-#include "math.h"
-#include "math_private.h"
-
-
-float
-powf(float x, float y)	/* wrapper powf */
-{
-#ifdef _IEEE_LIBM
-	return  __ieee754_powf(x,y);
-#else
-	float z;
-	z=__ieee754_powf(x,y);
-	if(_LIB_VERSION == _IEEE_|| isnanf(y)) return z;
-	if(isnanf(x)) {
-	    if(y==(float)0.0)
-	        /* powf(NaN,0.0) */
-	        return (float)__kernel_standard((double)x,(double)y,142);
-	    else
-		return z;
-	}
-	if(x==(float)0.0){
-	    if(y==(float)0.0)
-	        /* powf(0.0,0.0) */
-	        return (float)__kernel_standard((double)x,(double)y,120);
-	    if(finitef(y)&&y<(float)0.0)
-	        /* powf(0.0,negative) */
-	        return (float)__kernel_standard((double)x,(double)y,123);
-	    return z;
-	}
-	if(!finitef(z)) {
-	    if(finitef(x)&&finitef(y)) {
-	        if(isnanf(z))
-		    /* powf neg**non-int */
-	            return (float)__kernel_standard((double)x,(double)y,124);
-	        else
-		    /* powf overflow */
-	            return (float)__kernel_standard((double)x,(double)y,121);
-	    }
-	}
-	if(z==(float)0.0&&finitef(x)&&finitef(y))
-	    /* powf underflow */
-	    return (float)__kernel_standard((double)x,(double)y,122);
-	return z;
-#endif
-}
diff --git a/lib/libm/src/w_remainder.c b/lib/libm/src/w_remainder.c
deleted file mode 100644
index 5438af8c9..000000000
--- a/lib/libm/src/w_remainder.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* @(#)w_remainder.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_remainder.c,v 1.9 2002/05/26 22:02:02 wiz Exp $");
-#endif
-
-/*
- * wrapper remainder(x,p)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-double
-remainder(double x, double y)	/* wrapper remainder */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_remainder(x,y);
-#else
-	double z;
-	z = __ieee754_remainder(x,y);
-	if(_LIB_VERSION == _IEEE_ || isnan(y)) return z;
-	if(y==0.0)
-	    return __kernel_standard(x,y,28); /* remainder(x,0) */
-	else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_remainderf.c b/lib/libm/src/w_remainderf.c
deleted file mode 100644
index 761d8edbf..000000000
--- a/lib/libm/src/w_remainderf.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* w_remainderf.c -- float version of w_remainder.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_remainderf.c,v 1.6 2002/05/26 22:02:02 wiz Exp $");
-#endif
-
-/*
- * wrapper remainderf(x,p)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-float
-remainderf(float x, float y)	/* wrapper remainder */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_remainderf(x,y);
-#else
-	float z;
-	z = __ieee754_remainderf(x,y);
-	if(_LIB_VERSION == _IEEE_ || isnanf(y)) return z;
-	if(y==(float)0.0)
-	    /* remainder(x,0) */
-	    return (float)__kernel_standard((double)x,(double)y,128);
-	else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_scalb.c b/lib/libm/src/w_scalb.c
deleted file mode 100644
index ad8d84d3a..000000000
--- a/lib/libm/src/w_scalb.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* @(#)w_scalb.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_scalb.c,v 1.9 2002/05/26 22:02:02 wiz Exp $");
-#endif
-
-/*
- * wrapper scalb(double x, double fn) is provide for
- * passing various standard test suite. One
- * should use scalbn() instead.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-#include <errno.h>
-
-#ifdef _SCALB_INT
-double
-scalb(double x, int fn)		/* wrapper scalb */
-#else
-double
-scalb(double x, double fn)	/* wrapper scalb */
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_scalb(x,fn);
-#else
-	double z;
-	z = __ieee754_scalb(x,fn);
-	if(_LIB_VERSION == _IEEE_) return z;
-	if(!(finite(z)||isnan(z))&&finite(x)) {
-	    return __kernel_standard(x,(double)fn,32); /* scalb overflow */
-	}
-	if(z==0.0&&z!=x) {
-	    return __kernel_standard(x,(double)fn,33); /* scalb underflow */
-	}
-#ifndef _SCALB_INT
-	if(!finite(fn)) errno = ERANGE;
-#endif
-	return z;
-#endif
-}
diff --git a/lib/libm/src/w_scalbf.c b/lib/libm/src/w_scalbf.c
deleted file mode 100644
index 1fa7db49a..000000000
--- a/lib/libm/src/w_scalbf.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* w_scalbf.c -- float version of w_scalb.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_scalbf.c,v 1.6 2002/05/26 22:02:02 wiz Exp $");
-#endif
-
-/*
- * wrapper scalbf(float x, float fn) is provide for
- * passing various standard test suite. One
- * should use scalbn() instead.
- */
-
-#include "math.h"
-#include "math_private.h"
-
-#include <errno.h>
-
-#ifdef _SCALB_INT
-float
-scalbf(float x, int fn)		/* wrapper scalbf */
-#else
-float
-scalbf(float x, float fn)		/* wrapper scalbf */
-#endif
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_scalbf(x,fn);
-#else
-	float z;
-	z = __ieee754_scalbf(x,fn);
-	if(_LIB_VERSION == _IEEE_) return z;
-	if(!(finitef(z)||isnanf(z))&&finitef(x)) {
-	    /* scalbf overflow */
-	    return (float)__kernel_standard((double)x,(double)fn,132);
-	}
-	if(z==(float)0.0&&z!=x) {
-	    /* scalbf underflow */
-	    return (float)__kernel_standard((double)x,(double)fn,133);
-	}
-#ifndef _SCALB_INT
-	if(!finitef(fn)) errno = ERANGE;
-#endif
-	return z;
-#endif
-}
diff --git a/lib/libm/src/w_sinh.c b/lib/libm/src/w_sinh.c
deleted file mode 100644
index f2f720ff7..000000000
--- a/lib/libm/src/w_sinh.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* @(#)w_sinh.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_sinh.c,v 1.10 2007/08/20 16:01:40 drochner Exp $");
-#endif
-
-/*
- * wrapper sinh(x)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __weak_alias
-__weak_alias(sinh, _sinh)
-#endif
-
-double
-sinh(double x)		/* wrapper sinh */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_sinh(x);
-#else
-	double z;
-	z = __ieee754_sinh(x);
-	if(_LIB_VERSION == _IEEE_) return z;
-	if(!finite(z)&&finite(x)) {
-	    return __kernel_standard(x,x,25); /* sinh overflow */
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_sinhf.c b/lib/libm/src/w_sinhf.c
deleted file mode 100644
index 42dc1218d..000000000
--- a/lib/libm/src/w_sinhf.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* w_sinhf.c -- float version of w_sinh.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_sinhf.c,v 1.7 2007/08/20 16:01:40 drochner Exp $");
-#endif
-
-/*
- * wrapper sinhf(x)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __weak_alias
-__weak_alias(sinhf, _sinhf)
-#endif
-
-float
-sinhf(float x)		/* wrapper sinhf */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_sinhf(x);
-#else
-	float z;
-	z = __ieee754_sinhf(x);
-	if(_LIB_VERSION == _IEEE_) return z;
-	if(!finitef(z)&&finitef(x)) {
-	    /* sinhf overflow */
-	    return (float)__kernel_standard((double)x,(double)x,125);
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_sqrt.c b/lib/libm/src/w_sqrt.c
deleted file mode 100644
index 9a8afff51..000000000
--- a/lib/libm/src/w_sqrt.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* @(#)w_sqrt.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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_sqrt.c,v 1.10 2013/11/19 19:24:34 joerg Exp $");
-#endif
-
-/*
- * wrapper sqrt(x)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifndef __HAVE_LONG_DOUBLE
-__strong_alias(_sqrtl, sqrt)
-__weak_alias(sqrtl, _sqrtl)
-#endif
-
-double
-sqrt(double x)		/* wrapper sqrt */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_sqrt(x);
-#else
-	double z;
-	z = __ieee754_sqrt(x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x)) return z;
-	if(x<0.0) {
-	    return __kernel_standard(x,x,26); /* sqrt(negative) */
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_sqrtf.c b/lib/libm/src/w_sqrtf.c
deleted file mode 100644
index edebe73a8..000000000
--- a/lib/libm/src/w_sqrtf.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* w_sqrtf.c -- float version of w_sqrt.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * 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>
-#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_sqrtf.c,v 1.6 2002/05/26 22:02:03 wiz Exp $");
-#endif
-
-/*
- * wrapper sqrtf(x)
- */
-
-#include "math.h"
-#include "math_private.h"
-
-float
-sqrtf(float x)		/* wrapper sqrtf */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_sqrtf(x);
-#else
-	float z;
-	z = __ieee754_sqrtf(x);
-	if(_LIB_VERSION == _IEEE_ || isnanf(x)) return z;
-	if(x<(float)0.0) {
-	    /* sqrtf(negative) */
-	    return (float)__kernel_standard((double)x,(double)x,126);
-	} else
-	    return z;
-#endif
-}
diff --git a/lib/libm/src/w_sqrtl.c b/lib/libm/src/w_sqrtl.c
deleted file mode 100644
index 186b01059..000000000
--- a/lib/libm/src/w_sqrtl.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* @(#)w_sqrt.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>
-__RCSID("$NetBSD: w_sqrtl.c,v 1.2 2013/11/20 11:39:00 joerg Exp $");
-
-/*
- * wrapper sqrtl(x)
- */
-
-#include "namespace.h"
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __HAVE_LONG_DOUBLE
-
-__weak_alias(sqrtl, _sqrtl)
-
-long double
-sqrtl(long double x)		/* wrapper sqrtl */
-{
-#ifdef _IEEE_LIBM
-	return __ieee754_sqrtl(x);
-#else
-	long double z;
-	z = __ieee754_sqrtl(x);
-	if(_LIB_VERSION == _IEEE_ || isnan(x)) return z;
-	if(x<0.0) {
-	    return __kernel_standard(x,x,226); /* sqrtl(negative) */
-	} else
-	    return z;
-#endif
-}
-
-#endif /* __HAVE_LONG_DOUBLE */
diff --git a/lib/libmenu/Makefile b/lib/libmenu/Makefile
deleted file mode 100644
index e219d6c66..000000000
--- a/lib/libmenu/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#	$NetBSD: Makefile,v 1.9 2012/06/27 22:18:07 jdf Exp $
-#
-
-CPPFLAGS+=-I${.CURDIR}
-.if defined(DEBUG_MENUS)
-CFLAGS+=-g
-CPPFLAGS+=-DDEBUG
-LDFLAGS+=-g
-.endif
-LIB=	menu
-
-LIBDPLIBS+=	curses	${.CURDIR}/../libcurses
-
-SRCS=	menu.c item.c userptr.c internals.c driver.c post.c attributes.c
-MAN=	menu_attributes.3 menu_item_name.3 menu_items.3 menu_userptr.3 \
-	menu_cursor.3 menu_item_new.3 menu_mark.3 menu_win.3 menu_driver.3 \
-	menu_item_opts.3 menu_new.3 menus.3 menu_format.3 menu_item_userptr.3 \
-	menu_opts.3 menu_hook.3 menu_item_value.3 menu_pattern.3 \
-	menu_item_current.3 menu_item_visible.3 menu_post.3
-MLINKS+=	menu_attributes.3 menu_back.3 \
-		menu_attributes.3 menu_fore.3 \
-		menu_attributes.3 menu_grey.3 \
-		menu_attributes.3 menu_pad.3 \
-		menu_attributes.3 set_menu_back.3 \
-		menu_attributes.3 set_menu_fore.3 \
-		menu_attributes.3 set_menu_grey.3 \
-		menu_attributes.3 set_menu_pad.3 \
-		menu_item_name.3 item_description.3 \
-		menu_item_name.3 item_name.3 \
-		menu_items.3 item_count.3 \
-		menu_items.3 set_menu_items.3 \
-		menu_userptr.3 set_menu_userptr.3 \
-		menu_cursor.3 pos_menu_cursor.3 \
-		menu_item_new.3 free_item.3 \
-		menu_item_new.3 new_item.3 \
-		menu_mark.3 menu_unmark.3 \
-		menu_mark.3 set_menu_mark.3 \
-		menu_mark.3 set_menu_unmark.3 \
-		menu_win.3 menu_sub.3 \
-		menu_win.3 scale_menu.3 \
-		menu_win.3 set_menu_sub.3 \
-		menu_win.3 set_menu_win.3 \
-		menu_item_opts.3 item_opts.3 \
-		menu_item_opts.3 item_opts_off.3 \
-		menu_item_opts.3 item_opts_on.3 \
-		menu_new.3 new_menu.3 \
-		menu_new.3 free_menu.3 \
-		menu_format.3 set_menu_format.3 \
-		menu_item_userptr.3 item_userptr.3 \
-		menu_item_userptr.3 set_item_userptr.3 \
-		menu_opts.3 menu_opts_off.3 \
-		menu_opts.3 menu_opts_on.3 \
-		menu_opts.3 set_menu_opts.3 \
-		menu_hook.3 item_init.3 \
-		menu_hook.3 item_term.3 \
-		menu_hook.3 menu_init.3 \
-		menu_hook.3 menu_term.3 \
-		menu_hook.3 set_item_init.3 \
-		menu_hook.3 set_item_term.3 \
-		menu_hook.3 set_menu_init.3 \
-		menu_hook.3 set_menu_term.3 \
-		menu_item_value.3 item_value.3 \
-		menu_item_value.3 set_item_value.3 \
-		menu_item_value.3 item_selected.3 \
-		menu_item_current.3 current_item.3 \
-		menu_item_current.3 item_index.3 \
-		menu_item_current.3 set_current_item.3 \
-		menu_item_current.3 set_top_row.3 \
-		menu_item_current.3 top_row.3 \
-		menu_item_visible.3 item_visible.3 \
-		menu_post.3 post_menu.3 \
-		menu_post.3 unpost_menu.3
-INCS=	menu.h eti.h
-INCSDIR=/usr/include
-
-.include <bsd.lib.mk>
-.include <bsd.subdir.mk>
diff --git a/lib/libmenu/attributes.c b/lib/libmenu/attributes.c
deleted file mode 100644
index f352a6416..000000000
--- a/lib/libmenu/attributes.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*	$NetBSD: attributes.c,v 1.7 2003/03/09 01:08:47 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: attributes.c,v 1.7 2003/03/09 01:08:47 lukem Exp $");
-
-#include <menu.h>
-
-/* defined in menu.c - the default menu struct */
-extern MENU _menui_default_menu;
-
-/*
- * Set the menu foreground attribute
- */
-int
-set_menu_fore(MENU *menu, attr_t attr)
-{
-	if (menu == NULL)
-		_menui_default_menu.fore = attr;
-	else
-		menu->fore = attr;
-        return E_OK;
-}
-
-/*
- * Return the menu foreground attribute
- */
-char
-menu_fore(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.fore;
-	else
-		return menu->fore;
-}
-
-/*
- * Set the menu background attribute
- */
-int
-set_menu_back(MENU *menu, attr_t attr)
-{
-	if (menu == NULL)
-		_menui_default_menu.back = attr;
-	else
-		menu->back = attr;
-        return E_OK;
-}
-
-/*
- * Return the menu background attribute
- */
-char
-menu_back(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.back;
-	else
-		return menu->back;
-}
-
-/*
- * Set the menu greyed out attribute
- */
-int
-set_menu_grey(MENU *menu, attr_t attr)
-{
-	if (menu == NULL)
-		_menui_default_menu.grey = attr;
-	else
-		menu->grey = attr;
-        return E_OK;
-}
-
-/*
- * Return the menu greyed out attribute
- */
-char
-menu_grey(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.grey;
-	else
-		return menu->grey;
-}
-
-/*
- * Set the menu pad character - the filler char between name and description
- */
-int
-set_menu_pad(MENU *menu, int pad)
-{
-	if (menu == NULL)
-		_menui_default_menu.pad = pad;
-	else
-		menu->pad = pad;
-        return E_OK;
-}
-
-/*
- * Return the menu pad character
- */
-int
-menu_pad(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.pad;
-	else
-		return menu->pad;
-}
diff --git a/lib/libmenu/driver.c b/lib/libmenu/driver.c
deleted file mode 100644
index 776135da1..000000000
--- a/lib/libmenu/driver.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*	$NetBSD: driver.c,v 1.9 2003/03/09 01:08:48 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: driver.c,v 1.9 2003/03/09 01:08:48 lukem Exp $");
-
-#include <menu.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include "internals.h"
-
-/*
- * The guts of the menu library.  This function processes the character
- * in c and performs actions based on the value of the character.  If the
- * character is a normal one then the driver attempts to match the character
- * against the items.  If the character is a recognised request then the
- * request is processed by the driver, if the character is not a recognised
- * request and is not printable then it assumed to be a user defined command.
- */
-int
-menu_driver(MENU *menu, int c)
-{
-	int drv_top_row, drv_scroll, i, it, status = E_OK;
-	ITEM *drv_new_item;
-
-	i = 0;
-	
-	if (menu == NULL)
-		return E_BAD_ARGUMENT;
-	if (menu->posted == 0)
-		return E_NOT_POSTED;
-	if (menu->items == NULL)
-		return E_NOT_CONNECTED;
-	if (*menu->items == NULL)
-		return E_NOT_CONNECTED;
-	if (menu->in_init == 1)
-		return E_BAD_STATE;
-
-	  /* this one should never happen but just in case.... */
-	if (menu->items[menu->cur_item] == NULL)
-		return E_SYSTEM_ERROR;
-
-	drv_new_item = menu->items[menu->cur_item];
-	it = menu->cur_item;
-	drv_top_row = menu->top_row;
-	
-	if ((c > REQ_BASE_NUM) && (c <= MAX_COMMAND)) {
-		  /* is a known driver request  - first check if the pattern
-		   * buffer needs to be cleared, we do this on non-search
-		   * type requests.
-		   */
-		if (! ((c == REQ_BACK_PATTERN) || (c == REQ_NEXT_MATCH) ||
-		       (c == REQ_PREV_MATCH))) {
-			if ((c == REQ_CLEAR_PATTERN)
-			    && (menu->pattern == NULL))
-				return E_REQUEST_DENIED;
-			free(menu->pattern);
-			menu->pattern = NULL;
-			menu->plen = 0;
-			menu->match_len = 0;
-		}
-		
-		switch (c) {
-		  case REQ_LEFT_ITEM:
-			  drv_new_item = drv_new_item->left;
-			  break;
-		  case REQ_RIGHT_ITEM:
-			  drv_new_item = drv_new_item->right;
-			  break;
-		  case REQ_UP_ITEM:
-			  drv_new_item = drv_new_item->up;
-			  break;
-		  case REQ_DOWN_ITEM:
-			  drv_new_item = drv_new_item->down;
-			  break;
-		  case REQ_SCR_ULINE:
-			  if (drv_top_row == 0)
-				  return E_REQUEST_DENIED;
-			  drv_top_row--;
-			  drv_new_item = drv_new_item->up;
-			  break;
-		  case REQ_SCR_DLINE:
-			  drv_top_row++;
-			  if ((drv_top_row + menu->rows - 1)> menu->item_rows)
-				  return E_REQUEST_DENIED;
-			  drv_new_item = drv_new_item->down;
-			  break;
-		  case REQ_SCR_DPAGE:
-			  drv_scroll = menu->item_rows - menu->rows
-				  - menu->top_row;
-			  if (drv_scroll > menu->rows) {
-				  drv_scroll = menu->rows;
-			  }
-			  
-			  if (drv_scroll <= 0) {
-				  return E_REQUEST_DENIED;
-			  } else {
-				  drv_top_row += drv_scroll;
-				  while (drv_scroll-- > 0)
-					  drv_new_item = drv_new_item->down;
-			  }
-			  break;
-		  case REQ_SCR_UPAGE:
-			  if (menu->rows < menu->top_row) {
-				  drv_scroll = menu->rows;
-			  } else {
-				  drv_scroll = menu->top_row;
-			  }
-			  if (drv_scroll == 0)
-				  return E_REQUEST_DENIED;
-
-			  drv_top_row -= drv_scroll;
-			  while (drv_scroll-- > 0)
-				  drv_new_item = drv_new_item->up;
-			  break;
-		  case REQ_FIRST_ITEM:
-			  drv_new_item = menu->items[0];
-			  break;
-		  case REQ_LAST_ITEM:
-			  drv_new_item = menu->items[menu->item_count - 1];
-			  break;
-		  case REQ_NEXT_ITEM:
-			  if ((menu->cur_item + 1) >= menu->item_count) {
-				  if ((menu->opts & O_NONCYCLIC)
-				      == O_NONCYCLIC) {
-					  return E_REQUEST_DENIED;
-				  } else {
-					  drv_new_item = menu->items[0];
-				  }
-			  } else {
-				  drv_new_item =
-					  menu->items[menu->cur_item + 1];
-			  }
-			  break;
-		  case REQ_PREV_ITEM:
-			  if (menu->cur_item == 0) {
-				  if ((menu->opts & O_NONCYCLIC)
-				      == O_NONCYCLIC) {
-					  return E_REQUEST_DENIED;
-				  } else {
-					  drv_new_item = menu->items[
-						  menu->item_count - 1];
-				  }
-			  } else {
-				  drv_new_item =
-					  menu->items[menu->cur_item - 1];
-			  }
-			  break;
-		  case REQ_TOGGLE_ITEM:
-			  if ((menu->opts & (O_RADIO | O_ONEVALUE)) != 0) {
-			      if ((menu->opts & O_RADIO) == O_RADIO) {
-				  if ((drv_new_item->opts & O_SELECTABLE)
-							!= O_SELECTABLE)
-					  return E_NOT_SELECTABLE;
-
-				    /* don't deselect selected item */
-				  if (drv_new_item->selected == 1)
-					  return E_REQUEST_DENIED;
-				  
-				  /* deselect all items */
-			          for (i = 0; i < menu->item_count; i++) {
-				      if ((menu->items[i]->selected) &&
-					  (drv_new_item->index != i)) {
-				          menu->items[i]->selected ^= 1;
-					  _menui_draw_item(menu,
-						menu->items[i]->index);
-				      }
-				  }
-
-				    /* turn on selected item */
-				  drv_new_item->selected ^= 1;
-				  _menui_draw_item(menu, drv_new_item->index);
-			      } else {
-			      	  return E_REQUEST_DENIED;
-			      }
-			  } else {
-				  if ((drv_new_item->opts
-				       & O_SELECTABLE) == O_SELECTABLE) {
-					    /* toggle select flag */
-					  drv_new_item->selected ^= 1;
-					    /* update item in menu */
-					  _menui_draw_item(menu,
-						drv_new_item->index);
-				  } else {
-					  return E_NOT_SELECTABLE;
-				  }
-			  }
-			  break;
-		  case REQ_CLEAR_PATTERN:
-			    /* this action is taken before the
-			       case statement */
-			  break;
-		  case REQ_BACK_PATTERN:
-			  if (menu->pattern == NULL)
-				  return E_REQUEST_DENIED;
-			  
-			  if (menu->plen == 0)
-				  return E_REQUEST_DENIED;
-			  menu->pattern[menu->plen--] = '\0';
-			  break;
-		  case REQ_NEXT_MATCH:
-			  if (menu->pattern == NULL)
-				  return E_REQUEST_DENIED;
-
-			  status = _menui_match_pattern(menu, 0,
-							 MATCH_NEXT_FORWARD,
-							 &it);
-			  drv_new_item = menu->items[it];
-			  break;
-		  case REQ_PREV_MATCH:
-			  if (menu->pattern == NULL)
-				  return E_REQUEST_DENIED;
-
-			  status = _menui_match_pattern(menu, 0,
-							 MATCH_NEXT_REVERSE,
-							 &it);
-			  drv_new_item = menu->items[it];
-			  break; 
-		}
-	} else if (c > MAX_COMMAND) {
-		  /* must be a user command */
-		return E_UNKNOWN_COMMAND;
-	} else if (isprint((unsigned char) c)) {
-		  /* otherwise search items for the character. */
-		status = _menui_match_pattern(menu, (unsigned char) c,
-					       MATCH_FORWARD, &it);
-		drv_new_item = menu->items[it];
-
-		  /* update the position of the cursor if we are doing
-		   * show match and the current item has not changed.  If
-		   * we don't do this here it won't get done since the
-		   * display will not be updated due to the current item
-		   * not changing.
-		   */
-		if ((drv_new_item->index == menu->cur_item)
-		    && ((menu->opts & O_SHOWMATCH) == O_SHOWMATCH)) {
-			pos_menu_cursor(menu);
-		}
-		
-			    
-	} else {
-		  /* bad character */
-		return E_BAD_ARGUMENT;
-	}
-
-	if (drv_new_item == NULL)
-		return E_REQUEST_DENIED;
-
-	if (drv_new_item->row < drv_top_row) drv_top_row = drv_new_item->row;
-	if (drv_new_item->row >= (drv_top_row + menu->rows))
-		drv_top_row = drv_new_item->row - menu->rows + 1;
-	
-	if ((drv_new_item->index != menu->cur_item)
-	    || (drv_top_row != menu->top_row))
-		_menui_goto_item(menu, drv_new_item, drv_top_row);
-
-	return status;
-}
-
-		
-	
-		
-	
diff --git a/lib/libmenu/eti.h b/lib/libmenu/eti.h
deleted file mode 100644
index 84cff069c..000000000
--- a/lib/libmenu/eti.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: eti.h,v 1.8 2001/06/13 10:45:59 wiz Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.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. 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.
- *
- *
- */
-
-#ifndef	_ETI_H_
-#define	_ETI_H_
-
-/* common return codes for libmenu and libpanel functions */
-
-#define E_OK              (0)
-#define E_SYSTEM_ERROR    (-1)
-#define E_BAD_ARGUMENT    (-2)
-#define E_POSTED          (-3)
-#define E_CONNECTED       (-4)
-#define E_BAD_STATE       (-5)
-#define E_NO_ROOM         (-6)
-#define E_NOT_POSTED      (-7)
-#define E_UNKNOWN_COMMAND (-8)
-#define E_NO_MATCH        (-9)
-#define E_NOT_SELECTABLE  (-10)
-#define E_NOT_CONNECTED   (-11)
-#define E_REQUEST_DENIED  (-12)
-#define E_INVALID_FIELD   (-13)
-#define E_CURRENT         (-14)
-
-#endif /* !_ETI_H_ */
diff --git a/lib/libmenu/internals.c b/lib/libmenu/internals.c
deleted file mode 100644
index 8dcca55b8..000000000
--- a/lib/libmenu/internals.c
+++ /dev/null
@@ -1,636 +0,0 @@
-/*	$NetBSD: internals.c,v 1.17 2013/10/18 19:53:59 christos Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: internals.c,v 1.17 2013/10/18 19:53:59 christos Exp $");
-
-#include <menu.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include "internals.h"
-
-/* internal function prototypes */
-static void
-_menui_calc_neighbours(MENU *menu, int item_no);
-static void _menui_redraw_menu(MENU *menu, int old_top_row, int old_cur_item);
-
-  /*
-   * Link all the menu items together to speed up navigation.  We need
-   * to calculate the widest item entry, then work out how many columns
-   * of items the window will accommodate and then how many rows there will
-   * be.  Once the layout is determined the neighbours of each item is
-   * calculated and the item structures updated.
-   */
-int
-_menui_stitch_items(MENU *menu)
-{
-	int i, row_major;
-
-	row_major = ((menu->opts & O_ROWMAJOR) == O_ROWMAJOR);
-
-	if (menu->posted == 1)
-		return E_POSTED;
-	if (menu->items == NULL)
-		return E_BAD_ARGUMENT;
-
-	menu->item_rows = menu->item_count / menu->cols;
-	menu->item_cols = menu->cols;
-	if (menu->item_count > (menu->item_rows * menu->item_cols))
-		menu->item_rows += 1;
-
-	_menui_max_item_size(menu);
-
-	for (i = 0; i < menu->item_count; i++) {
-		  /* fill in the row and column value of the item */
-		if (row_major) {
-			menu->items[i]->row = i / menu->item_cols;
-			menu->items[i]->col = i % menu->item_cols;
-		} else {
-			menu->items[i]->row = i % menu->item_rows;
-			menu->items[i]->col = i / menu->item_rows;
-		}
-
-		_menui_calc_neighbours(menu, i);
-	}
-
-	return E_OK;
-}
-
-  /*
-   * Calculate the neighbours for an item in menu.
-   */
-static void
-_menui_calc_neighbours(MENU *menu, int item_no)
-{
-	int neighbour, cycle, row_major, edge;
-	ITEM *item;
-
-	row_major = ((menu->opts & O_ROWMAJOR) == O_ROWMAJOR);
-	cycle = ((menu->opts & O_NONCYCLIC) != O_NONCYCLIC);
-	item = menu->items[item_no];
-
-	if (menu->item_rows < 2) {
-		if (cycle) {
-			item->up = item;
-			item->down = item;
-		} else {
-			item->up = NULL;
-			item->down = NULL;
-		}
-	} else {
-
-		/* up */
-		if (menu->item_cols < 2) {
-			if (item_no == 0) {
-				if (cycle)
-					item->up =
-					    menu->items[menu->item_count - 1];
-				else
-					item->up = NULL;
-			} else
-				item->up = menu->items[item_no - 1];
-		} else {
-			edge = 0;
-			if (row_major) {
-				if (item->row == 0) {
-					neighbour =
-				    	(menu->item_rows - 1) * menu->item_cols
-						+ item->col;
-					if (neighbour >= menu->item_count)
-						neighbour -= menu->item_cols;
-					edge = 1;
-				} else
-					neighbour = item_no - menu->item_cols;
-			} else {
-				if (item->row == 0) {
-					neighbour = menu->item_rows * item->col
-						+ menu->item_rows - 1;
-					if (neighbour >= menu->item_count)
-						neighbour = menu->item_count - 1;
-					edge = 1;
-				} else
-					neighbour = item_no - 1;
-			}
-
-
-			item->up = menu->items[neighbour];
-			if ((!cycle) && (edge == 1))
-				item->up = NULL;
-		}
-
-		/* Down */
-		if (menu->item_cols < 2) {
-			if (item_no == (menu->item_count - 1)) {
-				if (cycle)
-					item->down = menu->items[0];
-				else
-					item->down = NULL;
-			} else
-				item->down = menu->items[item_no + 1];
-		} else {
-			edge = 0;
-			if (row_major) {
-				if (item->row == menu->item_rows - 1) {
-					neighbour = item->col;
-					edge = 1;
-				} else {
-					neighbour = item_no + menu->item_cols;
-					if (neighbour >= menu->item_count) {
-						neighbour = item->col;
-						edge = 1;
-					}
-				}
-			} else {
-				if (item->row == menu->item_rows - 1) {
-					neighbour = item->col * menu->item_rows;
-					edge = 1;
-				} else {
-					neighbour = item_no + 1;
-					if (neighbour >= menu->item_count) {
-						neighbour = item->col
-						    * menu->item_rows;
-						edge = 1;
-					}
-				}
-			}
-
-			item->down = menu->items[neighbour];
-			if ((!cycle) && (edge == 1))
-				item->down = NULL;
-		}
-	}
-
-	if (menu->item_cols < 2) {
-		if (cycle) {
-			item->left = item;
-			item->right = item;
-		} else {
-			item->left = NULL;
-			item->right = NULL;
-		}
-	} else {
-		/* left */
-		if (menu->item_rows < 2) {
-			if (item_no == 0) {
-				if (cycle)
-					item->left =
-					    menu->items[menu->item_count - 1];
-				else
-					item->left = NULL;
-			} else
-				item->left = menu->items[item_no - 1];
-		} else {
-			edge = 0;
-			if (row_major) {
-				if (item->col == 0) {
-					neighbour = item_no + menu->cols - 1;
-					if (neighbour >= menu->item_count)
-						neighbour = menu->item_count - 1;
-					edge = 1;
-				} else
-					neighbour = item_no - 1;
-			} else {
-				if (item->col == 0) {
-					neighbour = menu->item_rows
-					    * (menu->item_cols - 1) + item->row;
-					if (neighbour >= menu->item_count)
-						neighbour -= menu->item_rows;
-					edge = 1;
-				} else
-					neighbour = item_no - menu->item_rows;
-			}
-
-			item->left = menu->items[neighbour];
-			if ((!cycle) && (edge == 1))
-				item->left = NULL;
-		}
-
-		/* right */
-		if (menu->item_rows < 2) {
-			if (item_no == menu->item_count - 1) {
-				if (cycle)
-					item->right = menu->items[0];
-				else
-					item->right = NULL;
-			} else
-				item->right = menu->items[item_no + 1];
-		} else {
-			edge = 0;
-			if (row_major) {
-				if (item->col == menu->item_cols - 1) {
-					neighbour = item_no - menu->item_cols
-					    + 1;
-					edge = 1;
-				} else if (item_no == menu->item_count - 1) {
-					neighbour = item->row * menu->item_cols;
-					edge = 1;
-				} else
-					neighbour = item_no + 1;
-			} else {
-				if (item->col == menu->item_cols - 1) {
-					neighbour = item->row;
-					edge = 1;
-				} else {
-					neighbour = item_no + menu->item_rows;
-					if (neighbour >= menu->item_count) {
-						neighbour = item->row;
-						edge = 1;
-					}
-				}
-			}
-
-			item->right = menu->items[neighbour];
-			if ((!cycle) && (edge == 1))
-				item->right = NULL;
-		}
-	}
-}
-
-/*
- * Goto the item pointed to by item and adjust the menu structure
- * accordingly.  Call the term and init functions if required.
- */
-int
-_menui_goto_item(MENU *menu, ITEM *item, int new_top_row)
-{
-	int old_top_row = menu->top_row, old_cur_item = menu->cur_item;
-
-	  /* If we get a null then the menu is not cyclic so deny request */
-	if (item == NULL)
-		return E_REQUEST_DENIED;
-
-	menu->in_init = 1;
-	if (menu->top_row != new_top_row) {
-		if ((menu->posted == 1) && (menu->menu_term != NULL))
-			menu->menu_term(menu);
-		menu->top_row = new_top_row;
-
-		if ((menu->posted == 1) && (menu->menu_init != NULL))
-			menu->menu_init(menu);
-	}
-
-	  /* this looks like wasted effort but it can happen.... */
-	if (menu->cur_item != item->index) {
-
-		if ((menu->posted == 1) && (menu->item_term != NULL))
-			menu->item_term(menu);
-
-		menu->cur_item = item->index;
-		menu->cur_row = item->row;
-		menu->cur_col = item->col;
-
-		if (menu->posted == 1)
-			_menui_redraw_menu(menu, old_top_row, old_cur_item);
-
-		if ((menu->posted == 1) && (menu->item_init != NULL))
-			menu->item_init(menu);
-
-	}
-
-	menu->in_init = 0;
-	return E_OK;
-}
-
-/*
- * Attempt to match items with the pattern buffer in the direction given
- * by iterating over the menu items.  If a match is found return E_OK
- * otherwise return E_NO_MATCH
- */
-int
-_menui_match_items(MENU *menu, int direction, int *item_matched)
-{
-	int i, caseless;
-
-	caseless = ((menu->opts & O_IGNORECASE) == O_IGNORECASE);
-
-	i = menu->cur_item;
-	if (direction == MATCH_NEXT_FORWARD) {
-		if (++i >= menu->item_count) i = 0;
-	} else if (direction == MATCH_NEXT_REVERSE) {
-		if (--i < 0) i = menu->item_count - 1;
-	}
-
-
-	do {
-		if (menu->items[i]->name.length >= menu->plen) {
-			  /* no chance if pattern is longer */
-			if (caseless) {
-				if (strncasecmp(menu->items[i]->name.string,
-						menu->pattern,
-						(size_t) menu->plen) == 0) {
-					*item_matched = i;
-					menu->match_len = menu->plen;
-					return E_OK;
-				}
-			} else {
-				if (strncmp(menu->items[i]->name.string,
-					    menu->pattern,
-					    (size_t) menu->plen) == 0) {
-					*item_matched = i;
-					menu->match_len = menu->plen;
-					return E_OK;
-				}
-			}
-		}
-
-		if ((direction == MATCH_FORWARD) ||
-		    (direction == MATCH_NEXT_FORWARD)) {
-			if (++i >= menu->item_count) i = 0;
-		} else {
-			if (--i <= 0) i = menu->item_count - 1;
-		}
-	} while (i != menu->cur_item);
-
-	menu->match_len = 0; /* match did not succeed - kill the match len. */
-	return E_NO_MATCH;
-}
-
-/*
- * Attempt to match the pattern buffer against the items.  If c is a
- * printable character then add it to the pattern buffer prior to
- * performing the match.  Direction determines the direction of matching.
- * If the match is successful update the item_matched variable with the
- * index of the item that matched the pattern.
- */
-int
-_menui_match_pattern(MENU *menu, int c, int direction, int *item_matched)
-{
-	if (menu == NULL)
-		return E_BAD_ARGUMENT;
-	if (menu->items == NULL)
-		return E_BAD_ARGUMENT;
-	if (*menu->items == NULL)
-		return E_BAD_ARGUMENT;
-
-	if (isprint(c)) {
-		  /* add char to buffer - first allocate room for it */
-		if ((menu->pattern = (char *)
-		     realloc(menu->pattern,
-			     menu->plen + sizeof(char) +
-			     ((menu->plen > 0)? 0 : 1)))
-		    == NULL)
-			return E_SYSTEM_ERROR;
-		menu->pattern[menu->plen] = c;
-		menu->pattern[++menu->plen] = '\0';
-
-		  /* there is no chance of a match if pattern is longer
-		     than all the items */
-		if (menu->plen >= menu->max_item_width) {
-			menu->pattern[--menu->plen] = '\0';
-			return E_NO_MATCH;
-		}
-
-		if (_menui_match_items(menu, direction,
-					item_matched) == E_NO_MATCH) {
-			menu->pattern[--menu->plen] = '\0';
-			return E_NO_MATCH;
-		} else
-			return E_OK;
-	} else {
-		if (_menui_match_items(menu, direction,
-					item_matched) == E_OK) {
-			return E_OK;
-		} else {
-			return E_NO_MATCH;
-		}
-	}
-}
-
-/*
- * Draw an item in the subwindow complete with appropriate highlighting.
- */
-void
-_menui_draw_item(MENU *menu, int item)
-{
-	int j, pad_len, mark_len;
-
-	mark_len = max(menu->mark.length, menu->unmark.length);
-
-	wmove(menu->scrwin,
-	      menu->items[item]->row - menu->top_row,
-	      menu->items[item]->col * (menu->col_width + 1));
-
-	if (menu->cur_item == item)
-		wattrset(menu->scrwin, menu->fore);
-	if ((menu->items[item]->opts & O_SELECTABLE) != O_SELECTABLE)
-		wattron(menu->scrwin, menu->grey);
-
-	  /* deal with the menu mark, if  one is set.
-	   * We mark the selected items and write blanks for
-	   * all others unless the menu unmark string is set in which
-	   * case the unmark string is written.
-	   */
-	if ((menu->items[item]->selected == 1) ||
-	    (((menu->opts & O_ONEVALUE) == O_ONEVALUE) &&
-		(menu->cur_item == item))) {
-		if (menu->mark.string != NULL) {
-			for (j = 0; j < menu->mark.length; j++) {
-				waddch(menu->scrwin,
-				       menu->mark.string[j]);
-			}
-		}
-		  /* blank any length difference between mark & unmark */
-		for (j = menu->mark.length; j < mark_len; j++)
-			waddch(menu->scrwin, ' ');
-	} else {
-		if (menu->unmark.string != NULL) {
-			for (j = 0; j < menu->unmark.length; j++) {
-				waddch(menu->scrwin,
-				       menu->unmark.string[j]);
-			}
-		}
-		  /* blank any length difference between mark & unmark */
-		for (j = menu->unmark.length; j < mark_len; j++)
-			waddch(menu->scrwin, ' ');
-	}
-
-	  /* add the menu name */
-	for (j=0; j < menu->items[item]->name.length; j++)
-		waddch(menu->scrwin,
-		       menu->items[item]->name.string[j]);
-
-	pad_len = menu->col_width - menu->items[item]->name.length
-		- mark_len - 1;
-	if ((menu->opts & O_SHOWDESC) == O_SHOWDESC) {
-		pad_len -= menu->items[item]->description.length - 1;
-		for (j = 0; j < pad_len; j++)
-			waddch(menu->scrwin, menu->pad);
-		for (j = 0; j < menu->items[item]->description.length; j++) {
-			waddch(menu->scrwin,
-			       menu->items[item]->description.string[j]);
-		}
-	} else {
-		for (j = 0; j < pad_len; j++)
-			waddch(menu->scrwin, ' ');
-	}
-	menu->items[item]->visible = 1;
-
-	  /* kill any special attributes... */
-	wattrset(menu->scrwin, menu->back);
-
-	  /*
-	   * Fill in the spacing between items, annoying but it looks
-	   * odd if the menu items are inverse because the spacings do not
-	   * have the same attributes as the items.
-	   */
-	if ((menu->items[item]->col > 0) &&
-	    (menu->items[item]->col < (menu->item_cols - 1))) {
-		wmove(menu->scrwin,
-		      menu->items[item]->row - menu->top_row,
-		      menu->items[item]->col * (menu->col_width + 1) - 1);
-		waddch(menu->scrwin, ' ');
-	}
-
-	  /* and position the cursor nicely */
-	pos_menu_cursor(menu);
-}
-
-/*
- * Draw the menu in the subwindow provided.
- */
-int
-_menui_draw_menu(MENU *menu)
-{
-	int rowmajor, i, j, k, row = -1, stride;
-	int incr, cur_row, offset, row_count;
-
-	rowmajor = ((menu->opts & O_ROWMAJOR) == O_ROWMAJOR);
-
-	if (rowmajor) {
-		stride = 1;
-		incr = menu->item_cols;
-	} else {
-		stride = menu->item_rows;
-		incr = 1;
-	}
-	row_count = 0;
-
-	for (i = 0;  i < menu->item_count; i += incr) {
-		if (menu->items[i]->row == menu->top_row)
-			break;
-		row_count++;
-		for (j = 0; j < menu->item_cols; j++) {
-			offset = j * stride + i;
-			if (offset >= menu->item_count)
-				break; /* done */
-			menu->items[offset]->visible = 0;
-		}
-	}
-
-	wmove(menu->scrwin, 0, 0);
-
-	menu->col_width = getmaxx(menu->scrwin) / menu->cols;
-
-	for (cur_row = 0; cur_row < menu->rows; cur_row++) {
-		for (j = 0; j < menu->cols; j++) {
-			offset = j * stride + i;
-			if (offset >= menu->item_count) {
-			   /* no more items to draw, write background blanks */
-				wattrset(menu->scrwin, menu->back);
-				if (row < 0) {
-					row = menu->items[menu->item_count - 1]->row;
-				}
-
-				wmove(menu->scrwin, cur_row,
-				      j * (menu->col_width + 1));
-				for (k = 0; k < menu->col_width; k++)
-					waddch(menu->scrwin, ' ');
-			} else {
-				_menui_draw_item(menu, offset);
-			}
-		}
-
-		i += incr;
-		row_count++;
-	}
-
-	if (row_count < menu->item_rows) {
-		for (cur_row = row_count;  cur_row < menu->item_rows; cur_row++) {
-			for (j = 0; j < menu->item_cols; j++) {
-				offset = j * stride + i;
-				if (offset >= menu->item_count)
-					break; /* done */
-				menu->items[offset]->visible = 0;
-			}
-			i += incr;
-		}
-	}
-
-	return E_OK;
-}
-
-
-/*
- * Calculate the widest menu item and stash it in the menu struct.
- *
- */
-void
-_menui_max_item_size(MENU *menu)
-{
-	int i, with_desc, width;
-
-	with_desc = ((menu->opts & O_SHOWDESC) == O_SHOWDESC);
-
-	for (i = 0; i < menu->item_count; i++) {
-		width = menu->items[i]->name.length
-			+ max(menu->mark.length, menu->unmark.length);
-		if (with_desc)
-			width += menu->items[i]->description.length + 1;
-
-		menu->max_item_width = max(menu->max_item_width, width);
-	}
-}
-
-
-/*
- * Redraw the menu on the screen.  If the current item has changed then
- * unhighlight the old item and highlight the new one.
- */
-static void
-_menui_redraw_menu(MENU *menu, int old_top_row, int old_cur_item)
-{
-
-	if (menu->top_row != old_top_row) {
-		  /* top row changed - redo the whole menu
-		   * XXXX this could be improved if we had wscrl implemented.
-
-		   * XXXX we could scroll the window and just fill in the
-		   * XXXX changed lines.
-		   */
-		wclear(menu->scrwin);
-		_menui_draw_menu(menu);
-	} else {
-		if (menu->cur_item != old_cur_item) {
-			  /* redo the old item as a normal one. */
-			_menui_draw_item(menu, old_cur_item);
-		}
-		  /* and then redraw the current item */
-		_menui_draw_item(menu, menu->cur_item);
-	}
-}
diff --git a/lib/libmenu/internals.h b/lib/libmenu/internals.h
deleted file mode 100644
index 11fbc1413..000000000
--- a/lib/libmenu/internals.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: internals.h,v 1.8 2001/06/13 10:45:59 wiz Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.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. 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 <menu.h>
-
-#ifndef INTERNALS_H
-#define INTERNALS_H
-
-#define MATCH_FORWARD 1
-#define MATCH_REVERSE 2
-#define MATCH_NEXT_FORWARD 3
-#define MATCH_NEXT_REVERSE 4
-
-/* stole this from curses.h */
-#define max(a,b)        ((a) > (b) ? a : b)
-
-/* function prototypes */
-
-void _menui_draw_item(MENU *menu, int item);
-int _menui_draw_menu(MENU *menu);
-int _menui_goto_item(MENU *menu, ITEM *item, int new_top_row);
-int _menui_match_pattern(MENU *menu, int c, int direction ,
-			 int *item_matched);
-int _menui_match_items(MENU *menu, int direction, int *item_matched);
-void _menui_max_item_size(MENU *menu);
-int _menui_stitch_items(MENU *menu);
-
-#endif
diff --git a/lib/libmenu/item.c b/lib/libmenu/item.c
deleted file mode 100644
index 0276c7820..000000000
--- a/lib/libmenu/item.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/*	$NetBSD: item.c,v 1.12 2012/03/21 05:33:27 matt Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: item.c,v 1.12 2012/03/21 05:33:27 matt Exp $");
-
-#include <menu.h>
-#include <stdlib.h>
-#include <string.h>
-#include "internals.h"
-
-/* the following is defined in menu.c - it is the default menu struct */
-extern MENU _menui_default_menu;
-
-/* keep default item options for setting in new_item */
-ITEM _menui_default_item = {
-	{NULL, 0}, /* item name struct */
-	{NULL, 0}, /* item description struct */
-	NULL, /* user pointer */
-	0, /* is item visible? */
-	0, /* is item selected? */
-	0, /* row item is on */
-	0, /* column item is on */
-	O_SELECTABLE, /* item options */
-	NULL, /* parent menu item is bound to */
-	-1, /* index number if item attached to a menu */
-	NULL, /* left neighbour */
-	NULL, /* right neighbour */
-	NULL, /* up neighbour */
-	NULL /* down neighbour */
-};
-
-/*
- * Return the item visibility flag
- */
-int
-item_visible(ITEM *item)
-{
-	if (item == NULL)
-		return E_BAD_ARGUMENT;
-	if (item->parent == NULL)
-		return E_NOT_CONNECTED;
-	
-        return item->visible;
-}
-
-/*
- * Return the pointer to the item name
- */
-char *
-item_name(ITEM *item)
-{
-	if (item == NULL)
-		return NULL;
-	
-        return item->name.string;
-}
-
-/*
- * Return the pointer to the item description
- */
-char *
-item_description(ITEM *item)
-{
-	if (item == NULL)
-		return NULL;
-	
-        return item->description.string;
-}
-
-/*
- * Set the application defined function called when the menu is posted or
- * just after the current item changes.
- */
-int
-set_item_init(MENU *menu, Menu_Hook func)
-{
-	if (menu == NULL)
-		_menui_default_menu.item_init = func;
-	else
-		menu->item_init = func;
-        return E_OK;
-}
-
-
-/*
- * Return a pointer to the item initialisation routine.
- */
-Menu_Hook
-item_init(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.item_init;
-	else
-		return menu->item_init;
-}
-
-/*
- * Set the user defined function to be called when menu is unposted or just
- * before the current item changes.
- */
-int
-set_item_term(MENU *menu, Menu_Hook func)
-{
-	if (menu == NULL)
-		_menui_default_menu.item_term = func;
-	else
-		menu->item_term = func;
-        return E_OK;
-}
-
-/*
- * Return a pointer to the termination function
- */
-Menu_Hook
-item_term(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.item_term;
-	else
-		return menu->item_term;
-}
-
-/*
- * Returns the number of items that are selected.
- * The index numbers of the items are placed in the dynamically allocated
- * int array *sel.
- */
-int
-item_selected(MENU *menu, int **sel)
-{
-	int i, j;
-
-	if (menu == NULL)
-		return E_BAD_ARGUMENT;
-
-	/* count selected */
-	for (i = 0, j = 0; i < menu->item_count; i++)
-		if (menu->items[i]->selected)
-			j++;
-
-	if (j == 0) {
-		*sel = NULL;
-		return 0;
-	}
-	
-	if ( (*sel = malloc(sizeof(int) * j)) == NULL)
-		return E_SYSTEM_ERROR;
-
-	for (i = 0, j = 0; i < menu->item_count; i++)
-		if (menu->items[i]->selected)
-			(*sel)[j++] = i;
-
-	return j;
-}
-
-/*
- * Set the item options.  We keep a global copy of the current item options
- * as subsequent new_item calls will use the updated options as their
- * defaults.
- */
-int
-set_item_opts(ITEM *item, OPTIONS opts)
-{
-          /* selectable seems to be the only allowable item opt! */
-        if (opts != O_SELECTABLE)
-                return E_SYSTEM_ERROR;
-
-	if (item == NULL)
-		_menui_default_item.opts = opts;
-	else
-		item->opts = opts;
-        return E_OK;
-}
-
-/*
- * Set item options on.
- */
-int
-item_opts_on(ITEM *item, OPTIONS opts)
-{
-        if (opts != O_SELECTABLE)
-                return E_SYSTEM_ERROR;
-
-        if (item == NULL)
-		_menui_default_item.opts |= opts;
-	else
-		item->opts |= opts;
-        return E_OK;
-}
-
-/*
- * Turn off the named options.
- */
-int
-item_opts_off(ITEM *item, OPTIONS opts)
-{
-        if (opts != O_SELECTABLE)
-                return E_SYSTEM_ERROR;
-
-	if (item == NULL)
-		_menui_default_item.opts &= ~(opts);
-	else
-		item->opts &= ~(opts);
-        return E_OK;
-}
-
-/*
- * Return the current options set in item.
- */
-OPTIONS
-item_opts(ITEM *item)
-{
-	if (item == NULL)
-		return _menui_default_item.opts;
-	else
-		return item->opts;
-}
-
-/*
- * Set the selected flag of the item iff the menu options allow it.
- */
-int
-set_item_value(ITEM *param_item, int flag)
-{
-	ITEM *item = (param_item != NULL) ? param_item : &_menui_default_item;
-	
-          /* not bound to a menu */
-        if (item->parent == NULL)
-                return E_NOT_CONNECTED;
-
-          /* menu options do not allow multi-selection */
-        if ((item->parent->opts & O_ONEVALUE) == O_ONEVALUE)
-                return E_REQUEST_DENIED;
-
-        item->selected = flag;
-	_menui_draw_item(item->parent, item->index);
-        return E_OK;
-}
-
-/*
- * Return the item value of the item.
- */
-int
-item_value(ITEM *item)
-{
-	if (item == NULL)
-		return _menui_default_item.selected;
-	else
-		return item->selected;
-}
-
-/*
- * Allocate a new item and return the pointer to the newly allocated
- * structure.
- */
-ITEM *
-new_item(char *name, char *description)
-{
-        ITEM *new_one;
-
-	if (name == NULL)
-		return NULL;
-
-	  /* allocate a new item structure for ourselves */
-        if ((new_one = (ITEM *)malloc(sizeof(ITEM))) == NULL)
-                return NULL;
-
-	  /* copy in the defaults for the item */
-	(void)memcpy(new_one, &_menui_default_item, sizeof(ITEM));
-	
-	  /* fill in the name structure - first the length and then
-	     allocate room for the string & copy that. */
-	new_one->name.length = strlen(name);
-        if ((new_one->name.string = (char *)
-             malloc(sizeof(char) * new_one->name.length + 1)) == NULL) {
-		  /* uh oh malloc failed - clean up & exit */
-		free(new_one);
-                return NULL;
-        }
-        
-        strcpy(new_one->name.string, name);
-
-	if (description == NULL)
-		new_one->description.length = 0;
-	else {
-	  /* fill in the description structure, stash the length then
-	     allocate room for description string and copy it in */
-        	new_one->description.length = strlen(description);
-        	if ((new_one->description.string =
-		    (char *) malloc(sizeof(char) *
-		    new_one->description.length + 1)) == NULL) {
-		  	/*
-			 * malloc has failed
-			 * - free up allocated memory and return
-			 */
-			free(new_one->name.string);
-			free(new_one);
-			return NULL;
-		}
-	
-		strcpy(new_one->description.string, description);
-	}
-
-	return new_one;
-}
-
-/*
- * Free the allocated storage associated with item.
- */
-int
-free_item(ITEM *item)
-{
-	if (item == NULL)
-		return E_BAD_ARGUMENT;
-	
-	  /* check for connection to menu */
-	if (item->parent != NULL)
-		return E_CONNECTED;
-
-	  /* no connections, so free storage starting with the strings */
-	free(item->name.string);
-	if (item->description.length)
-		free(item->description.string);
-	free(item);
-	return E_OK;
-}
-
-/*
- * Set the menu's current item to the one given.
- */
-int
-set_current_item(MENU *param_menu, ITEM *item)
-{
-	MENU *menu = (param_menu != NULL) ? param_menu : &_menui_default_menu;
-	int i = 0;
-
-	  /* check if we have been called from an init type function */
-	if (menu->in_init == 1)
-		return E_BAD_STATE;
-
-	  /* check we have items in the menu */
-	if (menu->items == NULL)
-		return E_NOT_CONNECTED;
-
-	if ((i = item_index(item)) < 0)
-		  /* item must not be a part of this menu */
-		return E_BAD_ARGUMENT;
-	
-	menu->cur_item = i;
-	return E_OK;
-}
-
-/*
- * Return a pointer to the current item for the menu
- */
-ITEM *
-current_item(MENU *menu)
-{
-	if (menu == NULL)
-		return NULL;
-	
-	if (menu->items == NULL)
-		return NULL;
-	
-	return menu->items[menu->cur_item];
-}
-
-/*
- * Return the index into the item array that matches item.
- */
-int
-item_index(ITEM *item)
-{
-	if (item == NULL)
-		return _menui_default_item.index;
-	else
-		return item->index;
-}
diff --git a/lib/libmenu/menu.c b/lib/libmenu/menu.c
deleted file mode 100644
index e2bb601e9..000000000
--- a/lib/libmenu/menu.c
+++ /dev/null
@@ -1,750 +0,0 @@
-/*	$NetBSD: menu.c,v 1.18 2012/12/30 12:27:09 blymn Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: menu.c,v 1.18 2012/12/30 12:27:09 blymn Exp $");
-
-#include <ctype.h>
-#include <menu.h>
-#include <string.h>
-#include <stdlib.h>
-#include "internals.h"
-
-MENU _menui_default_menu = {
-	16,         /* number of item rows that will fit in window */
-        1,          /* number of columns of items that will fit in window */
-	0,          /* number of rows of items we have */
-	0,          /* number of columns of items we have */
-        0,          /* current cursor row */
-        0,          /* current cursor column */
-        {NULL, 0},  /* mark string */
-        {NULL, 0},  /* unmark string */
-        O_ONEVALUE, /* menu options */
-        NULL,       /* the pattern buffer */
-	0,          /* length of pattern buffer */
-	0,          /* the length of matched buffer */
-        0,          /* is the menu posted? */
-        A_REVERSE, /* menu foreground */
-        A_NORMAL,   /* menu background */
-        A_UNDERLINE,      /* unselectable menu item */
-        ' ',        /* filler between name and description */
-        NULL,       /* user defined pointer */
-	0,          /* top row of menu */
-	0,          /* widest item in the menu */
-	0,          /* the width of a menu column */
-	0,          /* number of items attached to the menu */
-        NULL,       /* items in the menu */
-        0,          /* current menu item */
-	0,          /* currently in a hook function */
-        NULL,       /* function called when menu posted */
-        NULL,       /* function called when menu is unposted */
-        NULL,       /* function called when current item changes */
-        NULL,       /* function called when current item changes */
-        NULL,       /* the menu window */
-	NULL,       /* the menu subwindow */
-	NULL,       /* the window to write to */
-};
-
-
-	
-/*
- * Set the menu mark character
- */
-int
-set_menu_mark(MENU *m, char *mark)
-{
-	MENU *menu = m;
-	
-	if (m == NULL) menu = &_menui_default_menu;
-	
-          /* if there was an old mark string, free it first */
-        if (menu->mark.string != NULL) free(menu->mark.string);
-
-        if ((menu->mark.string = (char *) malloc(strlen(mark) + 1)) == NULL)
-                return E_SYSTEM_ERROR;
-
-        strcpy(menu->mark.string, mark);
-	menu->mark.length = strlen(mark);
-
-	  /* max item size may have changed - recalculate. */
-	_menui_max_item_size(menu);
-        return E_OK;
-}
-
-/*
- * Return the menu mark string for the menu.
- */
-char *
-menu_mark(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.mark.string;
-	else
-		return menu->mark.string;
-}
-
-/*
- * Set the menu unmark character
- */
-int
-set_menu_unmark(MENU *m, char *mark)
-{
-	MENU *menu = m;
-
-	if (m == NULL) menu = &_menui_default_menu;
-	
-          /* if there was an old mark string, free it first */
-        if (menu->unmark.string != NULL) free(menu->unmark.string);
-
-        if ((menu->unmark.string = (char *) malloc(strlen(mark) + 1)) == NULL)
-                return E_SYSTEM_ERROR;
-
-        strcpy(menu->unmark.string, mark);
-	menu->unmark.length = strlen(mark);
-	  /* max item size may have changed - recalculate. */
-	_menui_max_item_size(menu);
-        return E_OK;
-}
-
-/*
- * Return the menu unmark string for the menu.
- */
-char *
-menu_unmark(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.unmark.string;
-	else
-		return menu->unmark.string;
-}
-
-/*
- * Set the menu window to the window passed.
- */
-int
-set_menu_win(MENU *menu, WINDOW *win)
-{
-	if (menu == NULL) {
-		_menui_default_menu.menu_win = win;
-		_menui_default_menu.scrwin = win;
-	} else {
-		if (menu->posted == TRUE) {
-			return E_POSTED;
-		} else {
-			menu->menu_win = win;
-			menu->scrwin = win;
-		}
-	}
-	
-        return E_OK;
-}
-
-/*
- * Return the pointer to the menu window
- */
-WINDOW *
-menu_win(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.menu_win;
-	else
-		return menu->menu_win;
-}
-
-/*
- * Set the menu subwindow for the menu.
- */
-int
-set_menu_sub(MENU *menu, WINDOW *sub)
-{
-	if (menu == NULL) {
-		_menui_default_menu.menu_subwin = sub;
-		_menui_default_menu.scrwin = sub;
-	} else {
-		if (menu->posted == TRUE)
-			return E_POSTED;
-		
-		menu->menu_subwin = sub;
-		menu->scrwin = sub;
-	}
-	
-        return E_OK;
-}
-
-/*
- * Return the subwindow pointer for the menu
- */
-WINDOW *
-menu_sub(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.menu_subwin;
-	else
-		return menu->menu_subwin;
-}
-
-/*
- * Set the maximum number of rows and columns of items that may be displayed.
- */
-int
-set_menu_format(MENU *param_menu, int rows, int cols)
-{
-	MENU *menu = (param_menu != NULL) ? param_menu : &_menui_default_menu;
-	
-        menu->rows = rows;
-        menu->cols = cols;
-
-	if (menu->items != NULL)
-		  /* recalculate the item neighbours */
-		return _menui_stitch_items(menu);
-
-	return E_OK;
-}
-
-/*
- * Return the max number of rows and cols that may be displayed.
- */
-void
-menu_format(MENU *param_menu, int *rows, int *cols)
-{
-	MENU *menu = (param_menu != NULL) ? param_menu : &_menui_default_menu;
-
-        *rows = menu->rows;
-        *cols = menu->cols;
-}
-
-/*
- * Set the user defined function to call when a menu is posted.
- */
-int
-set_menu_init(MENU *menu, Menu_Hook func)
-{
-	if (menu == NULL)
-		_menui_default_menu.menu_init = func;
-	else
-		menu->menu_init = func;
-        return E_OK;
-}
-
-/*
- * Return the pointer to the menu init function.
- */
-Menu_Hook
-menu_init(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.menu_init;
-	else
-		return menu->menu_init;
-}
-
-/*
- * Set the user defined function called when a menu is unposted.
- */
-int
-set_menu_term(MENU *menu, Menu_Hook func)
-{
-	if (menu == NULL)
-		_menui_default_menu.menu_term = func;
-	else
-		menu->menu_term = func;
-        return E_OK;
-}
-
-/*
- * Return the user defined menu termination function pointer.
- */
-Menu_Hook
-menu_term(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.menu_term;
-	else
-		return menu->menu_term;
-}
-
-/*
- * Return the current menu options set.
- */
-OPTIONS
-menu_opts(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.opts;
-	else
-		return menu->opts;
-}
-
-/*
- * Set the menu options to the given options.
- */
-int
-set_menu_opts(MENU *param_menu, OPTIONS opts)
-{
-	int i, seen;
-	MENU *menu = (param_menu != NULL) ? param_menu : &_menui_default_menu;
-	OPTIONS old_opts = menu->opts;
-	
-        menu->opts = opts;
-
-	  /*
-	   * If the radio option is selected then make sure only one
-	   * item is actually selected in the items.
-	   */
-	if (((opts & O_RADIO) == O_RADIO) && (menu->items != NULL) &&
-	    (menu->items[0] != NULL)) {
-		seen = 0;
-		for (i = 0; i < menu->item_count; i++) {
-			if (menu->items[i]->selected == 1) {
-				if (seen == 0) {
-					seen = 1;
-				} else {
-					menu->items[i]->selected = 0;
-				}
-			}
-		}
-
-		  /* if none selected, select the first item */
-		if (seen == 0)
-			menu->items[0]->selected = 1;
-	}
-
- 	if ((menu->opts & O_ROWMAJOR) != (old_opts &  O_ROWMAJOR))
-		  /* changed menu layout - need to recalc neighbours */
-		_menui_stitch_items(menu);
-	
-        return E_OK;
-}
-
-/*
- * Turn on the options in menu given by opts.
- */
-int
-menu_opts_on(MENU *param_menu, OPTIONS opts)
-{
-	int i, seen;
-	MENU *menu = (param_menu != NULL) ? param_menu : &_menui_default_menu;
-	OPTIONS old_opts = menu->opts;
-
-        menu->opts |= opts;
-
-	  /*
-	   * If the radio option is selected then make sure only one
-	   * item is actually selected in the items.
-	   */
-	if (((opts & O_RADIO) == O_RADIO) && (menu->items != NULL) &&
-	    (menu->items[0] != NULL)) {
-		seen = 0;
-		for (i = 0; i < menu->item_count; i++) {
-			if (menu->items[i]->selected == 1) {
-				if (seen == 0) {
-					seen = 1;
-				} else {
-					menu->items[i]->selected = 0;
-				}
-			}
-		}
-		  /* if none selected then select the top item */
-		if (seen == 0)
-			menu->items[0]->selected = 1;
-	}
-
-	if ((menu->items != NULL) &&
-	    (menu->opts & O_ROWMAJOR) != (old_opts &  O_ROWMAJOR))
-		  /* changed menu layout - need to recalc neighbours */
-		_menui_stitch_items(menu);
-	
-        return E_OK;
-}
-
-/*
- * Turn off the menu options given in opts.
- */
-int
-menu_opts_off(MENU *param_menu, OPTIONS opts)
-{
-	MENU *menu = (param_menu != NULL) ? param_menu : &_menui_default_menu;
-	OPTIONS old_opts = menu->opts;
-
-        menu->opts &= ~(opts);
-	
-	if ((menu->items != NULL ) &&
-	    (menu->opts & O_ROWMAJOR) != (old_opts &  O_ROWMAJOR))
-		  /* changed menu layout - need to recalc neighbours */
-		_menui_stitch_items(menu);
-	
-        return E_OK;
-}
-
-/*
- * Return the menu pattern buffer.
- */
-char *
-menu_pattern(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.pattern;
-	else
-		return menu->pattern;
-}
-
-/*
- * Set the menu pattern buffer to pat and attempt to match the pattern in
- * the item list.
- */
-int
-set_menu_pattern(MENU *param_menu, char *pat)
-{
-	MENU *menu = (param_menu != NULL) ? param_menu : &_menui_default_menu;
-	char *p = pat;
-	
-	  /* check pattern is all printable characters */
-	while (*p)
-		if (!isprint((unsigned char) *p++)) return E_BAD_ARGUMENT;
-	
-        if ((menu->pattern = (char *) realloc(menu->pattern,
-                                     sizeof(char) * strlen(pat) + 1)) == NULL)
-                return E_SYSTEM_ERROR;
-
-        strcpy(menu->pattern, pat);
-	menu->plen = strlen(pat);
-	
-          /* search item list for pat here */
-	return _menui_match_items(menu, MATCH_FORWARD, &menu->cur_item);
-}
-
-/*
- * Allocate a new menu structure and fill it in.
- */
-MENU *
-new_menu(ITEM **items)
-{
-        MENU *the_menu;
-        char mark[2];
-
-        if ((the_menu = (MENU *)malloc(sizeof(MENU))) == NULL)
-                return NULL;
-
-          /* copy the defaults */
-	(void)memcpy(the_menu, &_menui_default_menu, sizeof(MENU));
-
-	  /* set a default window if none already set. */
-	if (the_menu->menu_win == NULL)
-		the_menu->scrwin = stdscr;
-
-	  /* make a private copy of the mark string */
-	if (_menui_default_menu.mark.string != NULL) {
-		if ((the_menu->mark.string =
-		     (char *) malloc((unsigned) _menui_default_menu.mark.length + 1))
-		    == NULL) {
-			free(the_menu);
-			return NULL;
-		}
-
-		strlcpy(the_menu->mark.string, _menui_default_menu.mark.string,
-			(unsigned) _menui_default_menu.mark.length + 1);
-	}
-	
-	  /* make a private copy of the unmark string too */
-	if (_menui_default_menu.unmark.string != NULL) {
-		if ((the_menu->unmark.string =
-		     (char *) malloc((unsigned) _menui_default_menu.unmark.length + 1))
-		    == NULL) {
-			free(the_menu);
-			return NULL;
-		}
-
-		strlcpy(the_menu->unmark.string,
-			_menui_default_menu.unmark.string,
-			(unsigned) _menui_default_menu.unmark.length+ 1 );
-	}
-
-	/* default mark needs to be set */
-	mark[0] = '-';
-	mark[1] = '\0';
-
-	set_menu_mark(the_menu, mark);
-
-          /* now attach the items, if any */
-        if (items != NULL) {
-		if(set_menu_items(the_menu, items) < 0) {
-			if (the_menu->mark.string != NULL)
-				free(the_menu->mark.string);
-			if (the_menu->unmark.string != NULL)
-				free(the_menu->unmark.string);
-			free(the_menu);
-			return NULL;
-		}
-	}
-	
-	return the_menu;
-}
-
-/*
- * Free up storage allocated to the menu object and destroy it.
- */
-int
-free_menu(MENU *menu)
-{
-	int i;
-
-	if (menu == NULL)
-		return E_BAD_ARGUMENT;
-	
-	if (menu->posted != 0)
-		return E_POSTED;
-	
-	if (menu->pattern != NULL)
-		free(menu->pattern);
-
-	if (menu->mark.string != NULL)
-		free(menu->mark.string);
-
-	if (menu->items != NULL) {
-		  /* disconnect the items from this menu */
-		for (i = 0; i < menu->item_count; i++) {
-			menu->items[i]->parent = NULL;
-		}
-	}
-	
-	free(menu);
-	return E_OK;
-}
-
-/*
- * Calculate the minimum window size for the menu.
- */
-int
-scale_menu(MENU *param_menu, int *rows, int *cols)
-{
-	MENU *menu = (param_menu != NULL) ? param_menu : &_menui_default_menu;
-	
-	if (menu->items == NULL)
-		return E_BAD_ARGUMENT;
-
-	  /* calculate the max item size */
-	_menui_max_item_size(menu);
-
-	*rows = menu->rows;
-	*cols = menu->cols * menu->max_item_width;
-
-	  /*
-	   * allow for spacing between columns...
-	   */
-	*cols += (menu->cols - 1);
-	
-	return E_OK;
-}
-
-/*
- * Set the menu item list to the one given.
- */
-int
-set_menu_items(MENU *param_menu, ITEM **items)
-{
-	MENU *menu = (param_menu != NULL) ? param_menu : &_menui_default_menu;
-	int i, new_count = 0, sel_count = 0;
-	
-	  /* don't change if menu is posted */
-	if (menu->posted == 1)
-		return E_POSTED;
-
-	  /* count the new items and validate none are connected already */
-	while (items[new_count] != NULL) {
-		if ((items[new_count]->parent != NULL) &&
-		    (items[new_count]->parent != menu))
-			return E_CONNECTED;
-		if (items[new_count]->selected == 1)
-			sel_count++;
-		new_count++;
-	}
-
-	  /*
-	   * don't allow multiple selected items if menu is radio
-	   * button style.
-	   */
-	if (((menu->opts & O_RADIO) == O_RADIO) &&
-	    (sel_count > 1))
-		return E_BAD_ARGUMENT;
-	
-	  /* if there were items connected then disconnect them. */
-	if (menu->items != NULL) {
-		for (i = 0; i < menu->item_count; i++) {
-			menu->items[i]->parent = NULL;
-			menu->items[i]->index = -1;
-		}
-	}
-
-	menu->item_count = new_count;
-
-	  /* connect the new items to the menu */
-	for (i = 0; i < new_count; i++) {
-		items[i]->parent = menu;
-		items[i]->index = i;
-	}
-
-	menu->items = items;
-	menu->cur_item = 0; /* reset current item just in case */
-	menu->top_row = 0; /* and the top row too */
-	if (menu->pattern != NULL) { /* and the pattern buffer....sigh */
-		free(menu->pattern);
-		menu->plen = 0;
-		menu->match_len = 0;
-	}
-	
-	  /*
-	   * make sure at least one item is selected on a radio
-	   * button style menu.
-	   */
-	if (((menu->opts & O_RADIO) == O_RADIO) && (sel_count == 0))
-		menu->items[0]->selected = 1;
-	
-	
-	_menui_stitch_items(menu); /* recalculate the item neighbours */
-	
-	return E_OK;
-}
-
-/*
- * Return the pointer to the menu items array.
- */
-ITEM **
-menu_items(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.items;
-	else
-		return menu->items;
-}
-
-/*
- * Return the count of items connected to the menu
- */
-int
-item_count(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.item_count;
-	else
-		return menu->item_count;
-}
-
-/*
- * Set the menu top row to be the given row.  The current item becomes the
- * leftmost item on that row in the menu.
- */
-int
-set_top_row(MENU *param_menu, int row)
-{
-	MENU *menu = (param_menu != NULL) ? param_menu : &_menui_default_menu;
-	int i, cur_item, state = E_SYSTEM_ERROR;
-	
-	if (row > menu->item_rows)
-		return E_BAD_ARGUMENT;
-
-	if (menu->items == NULL)
-		return E_NOT_CONNECTED;
-
-	if (menu->in_init == 1)
-		return E_BAD_STATE;
-
-	cur_item = 0;
-	
-	for (i = 0; i < menu->item_count; i++) {
-		  /* search for first item that matches row - this will be
-		     the current item. */
-		if (row == menu->items[i]->row) {
-			cur_item = i;
-			state = E_OK;
-			break; /* found what we want - no need to go further */
-		}
-	}
-
-	menu->in_init = 1; /* just in case we call the init/term routines */
-	
-	if (menu->posted == 1) {
-		if (menu->menu_term != NULL)
-			menu->menu_term(menu);
-		if (menu->item_term != NULL)
-			menu->item_term(menu);
-	}
-
-	menu->cur_item = cur_item;
-	menu->top_row = row;
-
-	if (menu->posted == 1) {
-		if (menu->menu_init != NULL)
-			menu->menu_init(menu);
-		if (menu->item_init != NULL)
-			menu->item_init(menu);
-	}
-
-	menu->in_init = 0;
-		
-	  /* this should always be E_OK unless we are really screwed up */
-	return state;
-}
-
-/*
- * Return the current top row number.
- */
-int
-top_row(MENU *param_menu)
-{
-	MENU *menu = (param_menu != NULL) ? param_menu : &_menui_default_menu;
-
-	if (menu->items == NULL)
-		return E_NOT_CONNECTED;
-	
-	return menu->top_row;
-}
-
-/*
- * Position the cursor at the correct place in the menu.
- *
- */
-int
-pos_menu_cursor(MENU *menu)
-{
-	int movx, maxmark;
-	
-	if (menu == NULL)
-		return E_BAD_ARGUMENT;
-
-	maxmark = max(menu->mark.length, menu->unmark.length);
-	movx = maxmark + (menu->items[menu->cur_item]->col
-		* (menu->col_width + 1));
-	
-	if (menu->match_len > 0)
-		movx += menu->match_len - 1;
-	
-	wmove(menu->scrwin,
-	      menu->items[menu->cur_item]->row - menu->top_row, movx);
-
-	return E_OK;
-}
diff --git a/lib/libmenu/menu.h b/lib/libmenu/menu.h
deleted file mode 100644
index 77eceaa5b..000000000
--- a/lib/libmenu/menu.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*	$NetBSD: menu.h,v 1.13 2004/03/22 19:01:09 jdc Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.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. 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.
- *
- *
- */
-
-#ifndef	_MENU_H_
-#define	_MENU_H_
-
-#include <curses.h>
-#include <eti.h>
-
-/* requests for the menu_driver call */
-#define REQ_BASE_NUM      (KEY_MAX + 0x200)
-#define REQ_LEFT_ITEM     (KEY_MAX + 0x201)
-#define REQ_RIGHT_ITEM    (KEY_MAX + 0x202)
-#define REQ_UP_ITEM       (KEY_MAX + 0x203)
-#define REQ_DOWN_ITEM     (KEY_MAX + 0x204)
-#define REQ_SCR_ULINE     (KEY_MAX + 0x205)
-#define REQ_SCR_DLINE     (KEY_MAX + 0x206)
-#define REQ_SCR_DPAGE     (KEY_MAX + 0x207)
-#define REQ_SCR_UPAGE     (KEY_MAX + 0x208)
-#define REQ_FIRST_ITEM    (KEY_MAX + 0x209)
-#define REQ_LAST_ITEM     (KEY_MAX + 0x20a)
-#define REQ_NEXT_ITEM     (KEY_MAX + 0x20b)
-#define REQ_PREV_ITEM     (KEY_MAX + 0x20c)
-#define REQ_TOGGLE_ITEM   (KEY_MAX + 0x20d)
-#define REQ_CLEAR_PATTERN (KEY_MAX + 0x20e)
-#define REQ_BACK_PATTERN  (KEY_MAX + 0x20f)
-#define REQ_NEXT_MATCH    (KEY_MAX + 0x210)
-#define REQ_PREV_MATCH    (KEY_MAX + 0x211)
-
-#define MAX_COMMAND       (KEY_MAX + 0x211) /* last menu driver request
-					       - for application defined
-					       commands */
-
-/* Menu options */
-typedef unsigned int OPTIONS;
-
-/* and the values they can have */
-#define O_ONEVALUE   (0x1)
-#define O_SHOWDESC   (0x2)
-#define O_ROWMAJOR   (0x4)
-#define O_IGNORECASE (0x8)
-#define O_SHOWMATCH  (0x10)
-#define O_NONCYCLIC  (0x20)
-#define O_SELECTABLE (0x40)
-#define O_RADIO      (0x80)
-
-typedef struct __menu_str {
-        char *string;
-        int length;
-} MENU_STR;
-
-typedef struct __menu MENU;
-typedef struct __item ITEM;
-
-typedef void (*Menu_Hook) (MENU *);
-
-struct __item {
-        MENU_STR name;
-        MENU_STR description;
-        char *userptr;
-        int visible;  /* set if item is visible */
-        int selected; /* set if item has been selected */
-	int row; /* menu row this item is on */
-	int col; /* menu column this item is on */
-        OPTIONS opts;
-        MENU *parent; /* menu this item is bound to */
-	int index; /* index number for this item, if attached */
-	  /* The following are the item's neighbours - makes menu
-	     navigation easier */
-	ITEM *left;
-	ITEM *right;
-	ITEM *up;
-	ITEM *down;
-};
-
-struct __menu {
-        int rows; /* max number of rows to be displayed */
-        int cols; /* max number of columns to be displayed */
-	int item_rows; /* number of item rows we have */
-	int item_cols; /* number of item columns we have */
-        int cur_row; /* current cursor row */
-        int cur_col; /* current cursor column */
-        MENU_STR mark; /* menu mark string */
-        MENU_STR unmark; /* menu unmark string */
-        OPTIONS opts; /* options for the menu */
-        char *pattern; /* the pattern buffer */
-	int plen;  /* pattern buffer length */
-	int match_len; /* length of pattern matched */
-        int posted; /* set if menu is posted */
-        attr_t fore; /* menu foreground */
-        attr_t back; /* menu background */
-        attr_t grey; /* greyed out (nonselectable) menu item */
-        int pad;  /* filler char between name and description */
-        char *userptr;
-	int top_row; /* the row that is at the top of the menu */
-	int max_item_width; /* widest item */
-	int col_width; /* width of the menu columns - this is not always
-			  the same as the widest item */
-        int item_count; /* number of items attached */
-        ITEM **items; /* items associated with this menu */
-        int  cur_item; /* item cursor is currently positioned at */
-        int in_init; /* set when processing an init or term function call */
-        Menu_Hook menu_init; /* call this when menu is posted */
-        Menu_Hook menu_term; /* call this when menu is unposted */
-        Menu_Hook item_init; /* call this when menu posted & after
-				       current item changes */
-        Menu_Hook item_term; /* call this when menu unposted & just
-				       before current item changes */
-        WINDOW *menu_win; /* the menu window */
-        WINDOW *menu_subwin; /* the menu subwindow */
-	WINDOW *scrwin; /* the window to write to */
-};
-
-
-/* Public function prototypes. */
-__BEGIN_DECLS
-int  menu_driver(MENU *, int);
-int scale_menu(MENU *, int *, int *);
-int set_top_row(MENU *, int);
-int pos_menu_cursor(MENU *);
-int top_row(MENU *);
-
-int  free_menu(MENU *);
-char menu_back(MENU *);
-char menu_fore(MENU *);
-void menu_format(MENU *, int *, int *);
-char menu_grey(MENU *);
-Menu_Hook menu_init(MENU *);
-char *menu_mark(MENU *);
-OPTIONS menu_opts(MENU *);
-int menu_opts_off(MENU *, OPTIONS);
-int menu_opts_on(MENU *, OPTIONS);
-int menu_pad(MENU *);
-char *menu_pattern(MENU *);
-WINDOW *menu_sub(MENU *);
-Menu_Hook menu_term(MENU *);
-char *menu_unmark (MENU *);
-char *menu_userptr(MENU *);
-WINDOW *menu_win(MENU *);
-MENU *new_menu(ITEM **);
-int post_menu(MENU *);
-int set_menu_back(MENU *, attr_t);
-int set_menu_fore(MENU *, attr_t);
-int set_menu_format(MENU *, int, int);
-int set_menu_grey(MENU *, attr_t);
-int set_menu_init(MENU *, Menu_Hook);
-int set_menu_items(MENU *, ITEM **);
-int set_menu_mark(MENU *, char *);
-int set_menu_opts(MENU *, OPTIONS);
-int set_menu_pad(MENU *, int);
-int set_menu_pattern(MENU *, char *);
-int set_menu_sub(MENU *, WINDOW *);
-int set_menu_term(MENU *, Menu_Hook);
-int set_menu_unmark(MENU *, char *);
-int set_menu_userptr(MENU *, char *);
-int  set_menu_win(MENU *, WINDOW *);
-int unpost_menu(MENU *);
-
-ITEM *current_item(MENU *);
-int free_item(ITEM *);
-int item_count(MENU *);
-char *item_description(ITEM *);
-int item_index(ITEM *);
-Menu_Hook item_init(MENU *);
-char *item_name(ITEM *);
-OPTIONS item_opts(ITEM *);
-int item_opts_off(ITEM *, OPTIONS);
-int item_opts_on(ITEM *, OPTIONS);
-int item_selected(MENU *, int **); /* return the item index of selected */
-Menu_Hook item_term(MENU *);
-char *item_userptr(ITEM *);
-int item_value(ITEM *);
-int item_visible(ITEM *);
-ITEM **menu_items(MENU *);
-ITEM *new_item(char *, char *);
-int set_current_item(MENU *, ITEM *);
-int set_item_init(MENU *, Menu_Hook);
-int set_item_opts(ITEM *, OPTIONS);
-int set_item_term(MENU *, Menu_Hook);
-int set_item_userptr(ITEM *, char *);
-int set_item_value(ITEM *, int);
-
-__END_DECLS
-
-#endif /* !_MENU_H_ */
diff --git a/lib/libmenu/menu_attributes.3 b/lib/libmenu/menu_attributes.3
deleted file mode 100644
index a2d483397..000000000
--- a/lib/libmenu/menu_attributes.3
+++ /dev/null
@@ -1,135 +0,0 @@
-.\"	$NetBSD: menu_attributes.3,v 1.10 2003/04/16 13:35:10 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_ATTRIBUTES 3
-.Os
-.Sh NAME
-.Nm menu_back ,
-.Nm menu_fore ,
-.Nm menu_grey ,
-.Nm menu_pad ,
-.Nm set_menu_back ,
-.Nm set_menu_fore ,
-.Nm set_menu_grey ,
-.Nm set_menu_pad
-.Nd get and set menu attributes
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft char
-.Fn menu_back "MENU *menu"
-.Ft char
-.Fn menu_fore "MENU *menu"
-.Ft char
-.Fn menu_grey "MENU *menu"
-.Ft int
-.Fn menu_pad "MENU *menu"
-.Ft int
-.Fn set_menu_back "MENU *menu" "char attr"
-.Ft int
-.Fn set_menu_fore "MENU *menu" "char attr"
-.Ft int
-.Fn set_menu_grey "MENU *menu" "char attr"
-.Ft int
-.Fn set_menu_pad "MENU *menu" "int pad"
-.Sh DESCRIPTION
-The
-.Fn menu_back
-function returns the value of the background attribute for the menu
-passed.
-This attribute is set by the
-.Fn set_menu_back
-call.
-The
-.Fn menu_fore
-function returns the value of the foreground character attribute for
-the menu passed.
-This attribute is set by the
-.Fn set_menu_fore
-function.
-The
-.Fn menu_grey
-function returns the value of the grey or unselectable character
-attribute for the menu passed.
-This attribute is set by the
-.Fn set_menu_grey
-function.
-The
-.Fn menu_pad
-function returns the padding character that will be used between the
-item name and its description.
-The value of the pad character is set by the
-.Fn set_menu_pad
-function.
-.Sh RETURN VALUES
-The functions return one of the following error values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_SYSTEM_ERROR
-There was a system error during the call.
-.It Er E_BAD_ARGUMENT
-One or more of the arguments passed to the function was incorrect.
-.It Er E_POSTED
-The menu is already posted.
-.It Er E_CONNECTED
-An item was already connected to a menu.
-.It Er E_BAD_STATE
-The function was called from within an initialization or termination
-routine.
-.It Er E_NO_ROOM
-The menu does not fit within the subwindow.
-.It Er E_NOT_POSTED
-The menu is not posted.
-.It Er E_UNKNOWN_COMMAND
-The menu driver does not recognize the request passed to it.
-.It Er E_NO_MATCH
-The character search failed to find a match.
-.It Er E_NOT_SELECTABLE
-The item could not be selected.
-.It Er E_NOT_CONNECTED
-The item is not connected to a menu.
-.It Er E_REQUEST_DENIED
-The menu driver could not process the request.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_cursor.3 b/lib/libmenu/menu_cursor.3
deleted file mode 100644
index b32c307f0..000000000
--- a/lib/libmenu/menu_cursor.3
+++ /dev/null
@@ -1,91 +0,0 @@
-.\"	$NetBSD: menu_cursor.3,v 1.9 2003/04/16 13:35:10 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_CURSOR 3
-.Os
-.Sh NAME
-.Nm pos_menu_cursor
-.Nd position cursor in menu window
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft int
-.Fn pos_menu_cursor "MENU *menu"
-.Sh DESCRIPTION
-The
-.Fn pos_menu_cursor
-function positions the cursor in the menu window.
-This function can be called after other curses calls to restore the cursor
-to its correct position in the menu.
-.Sh RETURN VALUES
-The functions return one of the following error values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_SYSTEM_ERROR
-There was a system error during the call.
-.It Er E_BAD_ARGUMENT
-One or more of the arguments passed to the function was incorrect.
-.It Er E_POSTED
-The menu is already posted.
-.It Er E_CONNECTED
-An item was already connected to a menu.
-.It Er E_BAD_STATE
-The function was called from within an initialization or termination
-routine.
-.It Er E_NO_ROOM
-The menu does not fit within the subwindow.
-.It Er E_NOT_POSTED
-The menu is not posted.
-.It Er E_UNKNOWN_COMMAND
-The menu driver does not recognize the request passed to it.
-.It Er E_NO_MATCH
-The character search failed to find a match.
-.It Er E_NOT_SELECTABLE
-The item could not be selected.
-.It Er E_NOT_CONNECTED
-The item is not connected to a menu.
-.It Er E_REQUEST_DENIED
-The menu driver could not process the request.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_driver.3 b/lib/libmenu/menu_driver.3
deleted file mode 100644
index 9f706f867..000000000
--- a/lib/libmenu/menu_driver.3
+++ /dev/null
@@ -1,136 +0,0 @@
-.\"	$NetBSD: menu_driver.3,v 1.8 2003/04/16 13:35:10 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_DRIVER 3
-.Os
-.Sh NAME
-.Nm menu_driver
-.Nd main menu handling function
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft int
-.Fn menu_driver "MENU *menu" "int c"
-.Sh DESCRIPTION
-The
-.Fn menu_driver
-function is the guts of the menu system.
-It takes the commands passed
-by c parameter and performs the requested action on the menu given.
-The following commands may be given to the menu driver:
-.Pp
-.Bl -tag -width REQ_CLEAR_PATTERN -compact
-.It Command
-Action
-.It REQ_LEFT_ITEM
-Sets the new current item to be the item to the left of the current
-item.
-.It REQ_RIGHT_ITEM
-Sets the new current item to be the item to the rights of the current
-item.
-.It REQ_UP_ITEM
-Sets the new current item to be the item above the current item.
-.It REQ_DOWN_ITEM
-Sets the new current item to be the item below the current item.
-.It REQ_SCR_ULINE
-Scroll the menu one line towards the bottom of the menu window.
-The new current item becomes the item immediately above the current item.
-.It REQ_SCR_DLINE
-Scroll the menu one line towards the top of the menu window.
-The new current item becomes the item immediately below the current item.
-.It REQ_SCR_DPAGE
-Scroll the menu one page towards the bottom of the menu window.
-.It REQ_SCR_UPAGE
-Scroll the menu one page towards the top of the menu window.
-.It REQ_FIRST_ITEM
-Set the current item to be the first item in the menu.
-.It REQ_LAST_ITEM
-Set the current item to be the last item in the menu.
-.It REQ_NEXT_ITEM
-Set the new current item to be the next item in the item array after
-the current item.
-.It REQ_PREV_ITEM
-Set the new current item to be the item before the current item in the
-items array.
-.It REQ_TOGGLE_ITEM
-If the item is selectable then toggle the item's value.
-.It REQ_CLEAR_PATTERN
-Clear all the characters currently in the menu's pattern buffer.
-.It REQ_BACK_PATTERN
-Remove the last character from the pattern buffer.
-.It REQ_NEXT_MATCH
-Attempt to find the next item that matches the pattern buffer.
-.It REQ_PREV_MATCH
-Attempt to find the previous item that matches the pattern buffer.
-.El
-If
-.Fn menu_driver
-is passed a command that is greater than MAX_COMMAND then the command
-passed is assumed to be a user defined command and
-.Fn menu_driver
-returns E_UNKNOWN_COMMAND.
-Otherwise if the command is a printable
-character then the character represented by the command is placed at
-the end of the pattern buffer and an attempt is made to match the
-pattern buffer against the items in the menu.
-.Sh RETURN VALUES
-The functions return one of the following error values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_SYSTEM_ERROR
-There was a system error during the call.
-.It Er E_BAD_ARGUMENT
-One or more of the arguments passed to the function was incorrect.
-.It Er E_NOT_POSTED
-The menu is not posted.
-.It Er E_UNKNOWN_COMMAND
-The menu driver does not recognize the request passed to it.
-.It Er E_NO_MATCH
-The character search failed to find a match.
-.It Er E_NOT_CONNECTED
-The item is not connected to a menu.
-.It Er E_REQUEST_DENIED
-The menu driver could not process the request.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_format.3 b/lib/libmenu/menu_format.3
deleted file mode 100644
index 09356cb7d..000000000
--- a/lib/libmenu/menu_format.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\"	$NetBSD: menu_format.3,v 1.9 2003/04/16 13:35:10 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_FORMAT 3
-.Os
-.Sh NAME
-.Nm menu_format ,
-.Nm set_menu_format
-.Nd get or set number of rows and columns of items
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft void
-.Fn menu_format "MENU *menu" "int *rows" "int *cols"
-.Ft int
-.Fn set_menu_format "MENU *menu" "int rows" "int cols"
-.Sh DESCRIPTION
-The
-.Fn menu_format
-returns the number of rows and columns of items that can be displayed
-by the menu.
-The format is set by the
-.Fn set_menu_format
-function call.
-Note that the rows and columns defined here are not the size of the
-window but rather the number of rows and columns of items.
-.Sh RETURN VALUES
-The functions return one of the following error values:
-.Pp
-.Bl -tag -width E_BAD_ARGUMENT -compact
-.It Er E_OK
-The function was successful.
-.It Er E_BAD_ARGUMENT
-One or more of the arguments passed to the function was incorrect.
-.It Er E_POSTED
-The menu is already posted.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_hook.3 b/lib/libmenu/menu_hook.3
deleted file mode 100644
index 10b3fa00a..000000000
--- a/lib/libmenu/menu_hook.3
+++ /dev/null
@@ -1,103 +0,0 @@
-.\"	$NetBSD: menu_hook.3,v 1.8 2003/04/16 13:35:10 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_HOOK 3
-.Os
-.Sh NAME
-.Nm item_init ,
-.Nm item_term ,
-.Nm menu_init ,
-.Nm menu_term ,
-.Nm set_item_init ,
-.Nm set_item_term ,
-.Nm set_menu_init ,
-.Nm set_menu_term
-.Nd get or set handler functions for menu post/unpost or item change
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft void (*hook)()
-.Fn item_init "MENU *menu"
-.Ft void (*hook)()
-.Fn item_term "MENU *menu"
-.Ft void (*hook)()
-.Fn menu_init "MENU *menu"
-.Ft void (*hook)()
-.Fn menu_term "MENU *menu"
-.Ft int
-.Fn set_item_init "MENU *menu" "void (*hook)())"
-.Ft int
-.Fn set_item_term "MENU *menu" "void (*hook)())"
-.Ft int
-.Fn set_menu_init "MENU *menu" "void (*hook)())"
-.Ft int
-.Fn set_menu_term "MENU *menu" "void (*hook)())"
-.Sh DESCRIPTION
-The
-.Fn item_init
-function returns a pointer to the function that will be called
-whenever the menu is posted and also just after the current item
-changes.
-This is set by the
-.Fn set_item_init
-call.
-The
-.Fn item_term
-function returns a pointer to the function that will be called before
-the menu is unposted and just before the current item changes, this
-pointer is set by the
-.Fn set_item_term
-call.
-The
-.Fn menu_init
-functions returns a pointer to the function that will be called just
-before the menu is posted to the screen.
-This pointer is set by the
-.Fn set_menu_init
-function call.
-The
-.Fn menu_term
-function returns a pointer to the function that will be called just
-after the menu has been unposted, this pointer is set by the
-.Fn set_menu_term
-function.
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_item_current.3 b/lib/libmenu/menu_item_current.3
deleted file mode 100644
index a09ed1aae..000000000
--- a/lib/libmenu/menu_item_current.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\"	$NetBSD: menu_item_current.3,v 1.9 2003/04/16 13:35:10 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_ITEM_CURRENT 3
-.Os
-.Sh NAME
-.Nm current_item ,
-.Nm item_index ,
-.Nm set_current_item ,
-.Nm set_top_row
-.Nm top_row
-.Nd get or set item pointers or top row
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft ITEM *
-.Fn current_item "MENU *menu"
-.Ft int
-.Fn item_index "ITEM *item"
-.Ft int
-.Fn set_current_item "MENU *menu" "ITEM *item"
-.Ft int
-.Fn set_top_row "MENU *menu" "int row"
-.Ft int
-.Fn top_row "MENU *menu"
-.Sh DESCRIPTION
-The
-.Fn current_item
-returns a pointer to the current menu item.
-The
-.Fn set_current_item
-can be used to set this to the item give.
-The
-.Fn item_index
-function returns the index number in the array of items for the item
-pointed to by the
-.Fa item
-parameter.
-The
-.Fn set_top_row
-function sets the top row of the menu displayed to be the row given.
-The current item becomes the leftmost item of the top row.
-The
-.Fn top_row
-call returns the row number that is currently at the top of the
-displayed menu.
-.Sh RETURN VALUES
-.Fn current_item
-returns NULL if no items are attached to the menu.
-.Pp
-.Bl -tag -width E_NOT_CONNECTED -compact
-.It Er E_OK
-The function was successful.
-.It Er E_BAD_ARGUMENT
-One or more of the arguments passed to the function was incorrect.
-.It Er E_BAD_STATE
-The function was called from within an initialization or termination
-routine.
-.It Er E_NOT_CONNECTED
-The item is not connected to a menu.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_item_name.3 b/lib/libmenu/menu_item_name.3
deleted file mode 100644
index 72f02d70b..000000000
--- a/lib/libmenu/menu_item_name.3
+++ /dev/null
@@ -1,71 +0,0 @@
-.\"	$NetBSD: menu_item_name.3,v 1.9 2003/04/16 13:35:10 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_ITEM_NAME 3
-.Os
-.Sh NAME
-.Nm item_description ,
-.Nm item_name
-.Nd get item name or description
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft char *
-.Fn item_description "ITEM *item"
-.Ft char *
-.Fn item_name "ITEM *item"
-.Sh DESCRIPTION
-The
-.Fn item_description
-.Fa menu
-function returns the description string associated with the passed
-item.
-The
-.Fn item_name
-function returns the name string associated with the passed item.
-.Sh RETURN VALUES
-The function
-.Fn item_description
-and
-.Fn item_name
-functions return NULL if the item pointer is not valid.
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_item_new.3 b/lib/libmenu/menu_item_new.3
deleted file mode 100644
index e8be7e4f4..000000000
--- a/lib/libmenu/menu_item_new.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"	$NetBSD: menu_item_new.3,v 1.8 2003/04/16 13:35:10 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_ITEM_NEW 3
-.Os
-.Sh NAME
-.Nm free_item ,
-.Nm new_item
-.Nd create or delete menu item
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft int
-.Fn free_item "ITEM *item"
-.Ft ITEM *
-.Fn new_item "char *name" "char *description"
-.Sh DESCRIPTION
-The
-.Fn free_item
-function destroys the item and frees all allocated storage for that
-item.
-The
-.Fn new_item
-allocates storage for a new item then copies in the item name and
-description for the new item.
-A pointer to the newly created item is returned to the caller.
-.Sh RETURN VALUES
-The
-.Fn new_item
-function returns NULL on failure, the
-.Fn free_item
-returns one of the following error values:
-.Pp
-.Bl -tag -width E_BAD_ARGUMENT -compact
-.It Er E_OK
-The function was successful.
-.It Er E_BAD_ARGUMENT
-One or more of the arguments passed to the function was incorrect.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_item_opts.3 b/lib/libmenu/menu_item_opts.3
deleted file mode 100644
index 0e80e7934..000000000
--- a/lib/libmenu/menu_item_opts.3
+++ /dev/null
@@ -1,82 +0,0 @@
-.\"	$NetBSD: menu_item_opts.3,v 1.8 2003/04/16 13:35:11 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_ITEM_OPTS 3
-.Os
-.Sh NAME
-.Nm item_opts ,
-.Nm item_opts_off ,
-.Nm item_opts_on
-.Nd get or modify options for an item
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft OPTIONS
-.Fn item_opts "ITEM *item"
-.Ft int
-.Fn item_opts_off "ITEM *item" "OPTIONS opts"
-.Ft int
-.Fn item_opts_on "ITEM *item" "OPTIONS opts"
-.Sh DESCRIPTION
-The
-.Fn item_opts
-function returns the options currently set for the given item.
-The
-.Fn item_opts_off
-function turns off the options passed in
-.Fa opts
-for the item passed.
-The
-.Fn item_opts_on
-function turns on the options passed in
-.Fa opts
-for the item given.
-.Sh RETURN VALUES
-The functions return one of the following error values:
-.Pp
-.Bl -tag -width E_SYSTEM_ERROR -compact
-.It Er E_OK
-The function was successful.
-.It Er E_SYSTEM_ERROR
-There was a system error during the call.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_item_userptr.3 b/lib/libmenu/menu_item_userptr.3
deleted file mode 100644
index 01c556dda..000000000
--- a/lib/libmenu/menu_item_userptr.3
+++ /dev/null
@@ -1,72 +0,0 @@
-.\"	$NetBSD: menu_item_userptr.3,v 1.7 2003/04/16 13:35:11 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_ITEM_USERPTR 3
-.Os
-.Sh NAME
-.Nm item_userptr ,
-.Nm set_item_userptr
-.Nd get or set user pointer for an item
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft char *
-.Fn item_userptr "ITEM *item"
-.Ft int
-.Fn set_item_userptr "ITEM *item" "char *userptr"
-.Sh DESCRIPTION
-The
-.Fn item_userptr
-function returns the value of the user defined pointer for the given
-item, this pointer is defined by the
-.Fn set_item_userptr
-function.
-.Sh RETURN VALUES
-The functions return one of the following error values:
-.Pp
-.Bl -tag -width E_SYSTEM_ERROR -compact
-.It Er E_OK
-The function was successful.
-.It Er E_SYSTEM_ERROR
-There was a system error during the call.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_item_value.3 b/lib/libmenu/menu_item_value.3
deleted file mode 100644
index bfd26ac2f..000000000
--- a/lib/libmenu/menu_item_value.3
+++ /dev/null
@@ -1,106 +0,0 @@
-.\"	$NetBSD: menu_item_value.3,v 1.11 2003/04/16 13:35:11 wiz Exp $ .\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_ITEM_VALUE 3
-.Os
-.Sh NAME
-.Nm item_value ,
-.Nm set_item_value ,
-.Nm item_selected
-.Nd get or set value for an item
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft int
-.Fn item_value "ITEM *item"
-.Ft int
-.Fn set_item_value "ITEM *item" "int flag"
-.Ft int
-.Fn item_selected "MENU *menu" "int **array"
-.Sh DESCRIPTION
-The
-.Fn item_value
-function returns value of the item.
-If the item has been selected then this value will be TRUE.
-The value can also be set by calling
-.Fn set_item_value
-to set the value to a defined state.
-Setting the value to a value
-other than TRUE or FALSE will have undefined results.
-The
-.Fn item_selected
-function returns the number of items that are selected in the menu, that
-is the number of items whose value is TRUE.
-The indexes of the selected
-items will be returned in
-.Fa array
-which will be dynamically allocated to hold the number of indexes.
-It is the responsibility of the caller to release this storage by calling
-.Xr free 3
-when the storage is no longer required.
-If there are no elements selected in the items array then
-.Fn item_selected
-will return 0 and
-.Fa array
-will be NULL.
-If an error occurs
-.Fn item_selected
-will return one of the below return values which are less than 0.
-.Sh RETURN VALUES
-The functions return one of the following error values:
-.Pp
-.Bl -tag -width E_REQUEST_DENIED -compact
-.It Er E_OK
-The function was successful.
-.It Er E_NOT_CONNECTED
-The item is not connected to a menu.
-.It Er E_REQUEST_DENIED
-The menu driver could not process the request.
-.It Er E_SYSTEM_ERROR
-A system error occurred whilst processing the request.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
-.Pp
-The function
-.Fn item_selected
-is a
-.Nx
-extension and must not be used in portable code.
diff --git a/lib/libmenu/menu_item_visible.3 b/lib/libmenu/menu_item_visible.3
deleted file mode 100644
index 4b2edc24f..000000000
--- a/lib/libmenu/menu_item_visible.3
+++ /dev/null
@@ -1,67 +0,0 @@
-.\"	$NetBSD: menu_item_visible.3,v 1.7 2003/04/16 13:35:11 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_ITEM_VISIBLE 3
-.Os
-.Sh NAME
-.Nm item_visible
-.Nd get visibility status of an item
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft int
-.Fn item_visible "ITEM *item"
-.Sh DESCRIPTION
-The
-.Fn item_visible
-function returns TRUE if the item passed is currently visible in a
-menu.
-.Sh RETURN VALUES
-The functions return one of the following error values:
-.Pp
-.Bl -tag -width E_NOT_CONNECTED -compact
-.It Er E_BAD_ARGUMENT
-One or more of the arguments passed to the function was incorrect.
-.It Er E_NOT_CONNECTED
-The item is not connected to a menu.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_items.3 b/lib/libmenu/menu_items.3
deleted file mode 100644
index bc9ef38c5..000000000
--- a/lib/libmenu/menu_items.3
+++ /dev/null
@@ -1,90 +0,0 @@
-.\"	$NetBSD: menu_items.3,v 1.10 2012/06/30 09:25:55 jdf Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_ITEMS 3
-.Os
-.Sh NAME
-.Nm item_count ,
-.Nm menu_items ,
-.Nm set_menu_items
-.Nd attach items to menus or check correspondences
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft int
-.Fn item_count "MENU *menu"
-.Ft ITEM **
-.Fn menu_items "MENU *menu"
-.Ft int
-.Fn set_menu_items "MENU *menu" "ITEM **items"
-.Sh DESCRIPTION
-The
-.Fn item_count
-.Fa menu
-function returns the number of items currently attached to the menu
-passed.
-The
-.Fn menu_items
-function returns a pointer to an array of item pointers that represent
-the menu items currently attached to the given menu.
-Apart from using
-.Fn new_menu
-(see
-.Xr menu_new 3 )
-menu items may be attached to a menu by calling
-.Fn set_menu_items
-any items currently attached to the menu will be detached and the NULL
-terminated array of new items will be attached to the menu.
-.Sh RETURN VALUES
-Any function returning a string pointer will return NULL if an error
-occurs.
-Functions returning an integer will return one of the following:
-.Pp
-.Bl -tag -width E_CONNECTED -compact
-.It Er E_OK
-The function was successful.
-.It Er E_POSTED
-The menu is already posted.
-.It Er E_CONNECTED
-An item was already connected to a menu.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_mark.3 b/lib/libmenu/menu_mark.3
deleted file mode 100644
index 730ac32df..000000000
--- a/lib/libmenu/menu_mark.3
+++ /dev/null
@@ -1,112 +0,0 @@
-.\"	$NetBSD: menu_mark.3,v 1.9 2003/04/16 13:35:11 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_MARK 3
-.Os
-.Sh NAME
-.Nm menu_mark ,
-.Nm menu_unmark ,
-.Nm set_menu_mark ,
-.Nm set_menu_unmark
-.Nd get or set strings that show mark status for a menu
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft char *
-.Fn menu_mark "MENU *menu"
-.Ft char *
-.Fn menu_unmark "MENU *menu"
-.Ft int
-.Fn set_menu_mark "MENU *menu" "char *mark"
-.Ft int
-.Fn set_menu_unmark "MENU *menu" "char *mark"
-.Sh DESCRIPTION
-The
-.Fn menu_mark
-function returns a pointer to the character string that is used to
-mark selected items in the menu.
-The mark string is set by the
-.Fn set_menu_mark
-function.
-The
-.Fn menu_unmark
-function returns a pointer to the character string that is used to
-indicate a menu items is not selected, this string is set by the
-.Fn set_menu_unmark
-function.
-The mark and unmark strings may be of differing lengths, the room
-allocated to drawing the mark will be the maximum of the lengths of
-both the mark and unmark strings.
-The shorter of the two strings will be left justified and space padded.
-.Sh RETURN VALUES
-The functions return one of the following error values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_SYSTEM_ERROR
-There was a system error during the call.
-.It Er E_BAD_ARGUMENT
-One or more of the arguments passed to the function was incorrect.
-.It Er E_POSTED
-The menu is already posted.
-.It Er E_CONNECTED
-An item was already connected to a menu.
-.It Er E_BAD_STATE
-The function was called from within an initialization or termination
-routine.
-.It Er E_NO_ROOM
-The menu does not fit within the subwindow.
-.It Er E_NOT_POSTED
-The menu is not posted.
-.It Er E_UNKNOWN_COMMAND
-The menu driver does not recognize the request passed to it.
-.It Er E_NO_MATCH
-The character search failed to find a match.
-.It Er E_NOT_SELECTABLE
-The item could not be selected.
-.It Er E_NOT_CONNECTED
-The item is not connected to a menu.
-.It Er E_REQUEST_DENIED
-The menu driver could not process the request.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_new.3 b/lib/libmenu/menu_new.3
deleted file mode 100644
index 7aa791fde..000000000
--- a/lib/libmenu/menu_new.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"	$NetBSD: menu_new.3,v 1.10 2012/06/30 09:25:55 jdf Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_NEW 3
-.Os
-.Sh NAME
-.Nm free_menu ,
-.Nm new_menu
-.Nd create or delete a menu
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft int
-.Fn free_menu "MENU *menu"
-.Ft MENU *
-.Fn new_menu "ITEM **items"
-.Sh DESCRIPTION
-The
-.Fn free_menu
-.Fa menu
-function destroys the given menu and frees all allocated storage
-associated with the menu.
-All items associated with the menu are
-detached from the menu before it is destroyed.
-The
-.Fn new_menu
-function allocates storage for a new menu and initializes all the
-values to the defined defaults.
-If the items pointer passed is not a NULL then the given NULL terminated
-array of items is attached to the new menu.
-.Sh RETURN VALUES
-The
-.Fn new_menu
-function returns NULL on error, while the
-.Fn free_menu
-function returns one of the following error values:
-.Pp
-.Bl -tag -width E_BAD_ARGUMENT -compact
-.It Er E_OK
-The function was successful.
-.It Er E_BAD_ARGUMENT
-One or more of the arguments passed to the function was incorrect.
-.It Er E_POSTED
-The menu is already posted.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_opts.3 b/lib/libmenu/menu_opts.3
deleted file mode 100644
index a07f47e97..000000000
--- a/lib/libmenu/menu_opts.3
+++ /dev/null
@@ -1,88 +0,0 @@
-.\"	$NetBSD: menu_opts.3,v 1.8 2003/04/16 13:35:11 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_OPTS 3
-.Os
-.Sh NAME
-.Nm menu_opts ,
-.Nm menu_opts_off ,
-.Nm menu_opts_on ,
-.Nm set_menu_opts
-.Nd get or modify options for a menu
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft OPTIONS
-.Fn menu_opts "MENU *menu"
-.Ft int
-.Fn menu_opts_off "MENU *menu" "OPTIONS opts"
-.Ft int
-.Fn menu_opts_on "MENU *menu" "OPTIONS opts"
-.Ft int
-.Fn set_menu_opts "MENU *menu" "OPTIONS opts"
-.Sh DESCRIPTION
-The
-.Fn menu_opts
-function returns the current options set for the menu given.
-The
-.Fn menu_opts_off
-function turns off the menu options given by the opts parameter for
-the menu.
-The
-.Fn menu_opts_on
-function turns on the menu options given by the opts parameter for the
-menu passed.
-The
-.Fn set_menu_opts
-sets the menu options to the value given in opts.
-.Sh RETURN VALUES
-The functions return one of the following error values:
-.Pp
-.Bl -tag -width E_BAD_ARGUMENT -compact
-.It Er E_OK
-The function was successful.
-.It Er E_BAD_ARGUMENT
-One or more of the arguments passed to the function was incorrect.
-.It Er E_POSTED
-The menu is already posted.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_pattern.3 b/lib/libmenu/menu_pattern.3
deleted file mode 100644
index 659fdf677..000000000
--- a/lib/libmenu/menu_pattern.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\"	$NetBSD: menu_pattern.3,v 1.8 2003/04/16 13:35:11 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_PATTERN 3
-.Os
-.Sh NAME
-.Nm menu_pattern ,
-.Nm set_menu_pattern
-.Nd get or set menu pattern
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft char *
-.Fn menu_pattern "MENU *menu"
-.Sh DESCRIPTION
-The
-.Fn menu_pattern
-function returns a pointer to the string that is currently in the menu
-pattern buffer.
-The menu pattern buffer can be set by calling
-.Fn set_menu_pattern
-which will set the pattern buffer to the string passed and then
-attempt to match that string against the names of the items in the
-attached items.
-.Sh RETURN VALUES
-The functions return one of the following error values:
-.Pp
-.Bl -tag -width E_BAD_ARGUMENT -compact
-.It Er E_OK
-The function was successful.
-.It Er E_SYSTEM_ERROR
-There was a system error during the call.
-.It Er E_BAD_ARGUMENT
-One or more of the arguments passed to the function was incorrect.
-.It Er E_NO_MATCH
-The character search failed to find a match.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_post.3 b/lib/libmenu/menu_post.3
deleted file mode 100644
index be0c6dc3b..000000000
--- a/lib/libmenu/menu_post.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\"	$NetBSD: menu_post.3,v 1.10 2009/10/24 11:17:13 reed Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_POST 3
-.Os
-.Sh NAME
-.Nm post_menu ,
-.Nm unpost_menu
-.Nd post (draw) or unpost a menu
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft int
-.Fn post_menu "MENU *menu"
-.Ft int
-.Fn unpost_menu "MENU *menu"
-.Sh DESCRIPTION
-The
-.Fn post_menu
-function causes the menu to be drawn on the screen.
-Any functions defined by either
-.Fn set_menu_init
-or
-.Fn set_item_init
-(see
-.Xr menu_hook 3 )
-are called before the menu is placed on the screen.
-The
-.Fn unpost_menu
-does the opposite, it removes a menu from the screen.
-Any functions defined by both
-.Fn set_menu_term
-and
-.Fn set_item_term
-(see
-.Xr menu_hook 3 )
-are called prior to the menu's removal.
-.Sh RETURN VALUES
-The functions return one of the following error values:
-.Pp
-.Bl -tag -width E_NOT_CONNECTED -compact
-.It Er E_OK
-The function was successful.
-.It Er E_SYSTEM_ERROR
-There was a system error during the call.
-.It Er E_BAD_ARGUMENT
-One or more of the arguments passed to the function was incorrect.
-.It Er E_POSTED
-The menu is already posted.
-.It Er E_BAD_STATE
-The function was called from within an initialization or termination
-routine.
-.It Er E_NO_ROOM
-The menu does not fit within the subwindow.
-.It Er E_NOT_CONNECTED
-The item is not connected to a menu.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menu_hook 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_userptr.3 b/lib/libmenu/menu_userptr.3
deleted file mode 100644
index 87c8e1762..000000000
--- a/lib/libmenu/menu_userptr.3
+++ /dev/null
@@ -1,73 +0,0 @@
-.\"	$NetBSD: menu_userptr.3,v 1.8 2003/04/16 13:35:11 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_USERPTR 3
-.Os
-.Sh NAME
-.Nm menu_userptr ,
-.Nm set_menu_userptr
-.Nd get or set user pointer for a menu
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft char *
-.Fn menu_userptr "MENU *menu"
-.Ft int
-.Fn set_menu_userptr "MENU *menu" "char *ptr"
-.Sh DESCRIPTION
-The
-.Fn menu_userptr
-function returns the pointer to the user defined pointer for the given
-menu.
-This pointer is set by the
-.Fn set_menu_userptr
-function.
-.Sh RETURN VALUES
-The functions return one of the following error values:
-.Pp
-.Bl -tag -width E_SYSTEM_ERROR -compact
-.It Er E_OK
-The function was successful.
-.It Er E_SYSTEM_ERROR
-There was a system error during the call.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menu_win.3 b/lib/libmenu/menu_win.3
deleted file mode 100644
index 984e8e1c4..000000000
--- a/lib/libmenu/menu_win.3
+++ /dev/null
@@ -1,115 +0,0 @@
-.\"	$NetBSD: menu_win.3,v 1.10 2003/04/16 13:35:11 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENU_WIN 3
-.Os
-.Sh NAME
-.Nm menu_sub ,
-.Nm menu_win ,
-.Nm scale_menu ,
-.Nm set_menu_sub ,
-.Nm set_menu_win
-.Nd sub-menu handling
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Ft WINDOW *
-.Fn menu_sub "MENU *menu"
-.Ft WINDOW *
-.Fn menu_win "MENU *menu"
-.Ft int
-.Fn scale_menu "MENU *menu" "int *rows" "int *cols"
-.Ft int
-.Fn set_menu_sub "MENU *menu" "WINDOW *sub"
-.Ft int
-.Fn set_menu_win "MENU *menu" "WINDOW *win"
-.Sh DESCRIPTION
-The
-.Fn menu_sub
-function returns a pointer to the window that will be used to post a
-menu into, this pointer is set by the
-.Fn set_menu_sub
-function.
-The
-.Fn menu_win
-function returns a pointer to the window in which the menu subwindow
-will be created when the menu is posted, this pointer is set by the
-.Fn set_menu_win
-function.
-The
-.Fn scale_menu
-function calculates the minimum size a window needs to be to hold the
-items for a given menu, the parameters rows and cols are set to the
-required number of rows and columns respectively.
-.Sh RETURN VALUES
-The functions return one of the following error values:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_SYSTEM_ERROR
-There was a system error during the call.
-.It Er E_BAD_ARGUMENT
-One or more of the arguments passed to the function was incorrect.
-.It Er E_POSTED
-The menu is already posted.
-.It Er E_CONNECTED
-An item was already connected to a menu.
-.It Er E_BAD_STATE
-The function was called from within an initialization or termination
-routine.
-.It Er E_NO_ROOM
-The menu does not fit within the subwindow.
-.It Er E_NOT_POSTED
-The menu is not posted
-.It Er E_UNKNOWN_COMMAND
-The menu driver does not recognize the request passed to it.
-.It Er E_NO_MATCH
-The character search failed to find a match.
-.It Er E_NOT_SELECTABLE
-The item could not be selected.
-.It Er E_NOT_CONNECTED
-The item is not connected to a menu.
-.It Er E_REQUEST_DENIED
-The menu driver could not process the request.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menus 3
-.Sh NOTES
-The header
-.Pa \*[Lt]menu.h\*[Gt]
-automatically includes both
-.Pa \*[Lt]curses.h\*[Gt]
-and
-.Pa \*[Lt]eti.h\*[Gt] .
diff --git a/lib/libmenu/menus.3 b/lib/libmenu/menus.3
deleted file mode 100644
index 22b8783d7..000000000
--- a/lib/libmenu/menus.3
+++ /dev/null
@@ -1,299 +0,0 @@
-.\"	$NetBSD: menus.3,v 1.15 2003/04/16 13:35:12 wiz Exp $
-.\"
-.\" Copyright (c) 1999
-.\"	Brett Lymn - blymn@baea.com.au, brett_lymn@yahoo.com.au
-.\"
-.\" This code is donated to The NetBSD Foundation by the author.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd September 10, 1999
-.Dt MENUS 3
-.Os
-.Sh NAME
-.Nm menus
-.Nd menu library
-.Sh LIBRARY
-.Lb libmenu
-.Sh SYNOPSIS
-.In menu.h
-.Sh DESCRIPTION
-The
-.Nm
-library provides a terminal independent menu system using the
-.Xr curses 3
-library.
-Before using the
-.Nm
-functions the terminal must be set up by
-.Xr curses 3
-using the
-.Fn initscr
-function or similar.
-Programs using
-.Nm
-functions must be linked with the
-.Xr curses 3
-library.
-.Pp
-The
-.Nm
-library provides facilities for defining menu items, placing a menu on the
-terminal screen, assign pre- and post-change operations and setting the
-attributes of both the menu and its items.
-.Ss Defining default attributes for menus and items
-The
-.Nm
-library allows any settable attribute or option of both the menu and item
-objects to be defined such that any new menu or item automatically inherits
-the value as default.
-Setting the default value will not affect any item or
-menu that has already been created but will be applied to subsequent objects.
-To set the default attribute or option the set routine is passed a NULL
-pointer in the item or menu parameter when calling the set routine.
-The current default value can be retrieved by calling the get routine with a
-NULL pointer for the item or menu parameter.
-.Pp
-.Bl -tag -width item_description -compact
-.It function name
-manual page name
-.It current_item
-.Xr menu_item_current 3
-.It free_item
-.Xr menu_item_new 3
-.It free_menu
-.Xr menu_new 3
-.It item_count
-.Xr menu_items 3
-.It item_description
-.Xr menu_item_name 3
-.It item_index
-.Xr menu_item_current 3
-.It item_init
-.Xr menu_hook 3
-.It item_name
-.Xr menu_item_name 3
-.It item_opts
-.Xr menu_item_opts 3
-.It item_opts_off
-.Xr menu_item_opts 3
-.It item_opts_on
-.Xr menu_item_opts 3
-.It item_selected
-.Xr menu_item_value 3
-.It item_term
-.Xr menu_hook 3
-.It item_userptr
-.Xr menu_item_userptr 3
-.It item_value
-.Xr menu_item_value 3
-.It item_visible
-.Xr menu_item_visible 3
-.It menu_back
-.Xr menu_attributes 3
-.It menu_driver
-.Xr menu_driver 3
-.It menu_fore
-.Xr menu_attributes 3
-.It menu_format
-.Xr menu_format 3
-.It menu_grey
-.Xr menu_attributes 3
-.It menu_init
-.Xr menu_hook 3
-.It menu_items
-.Xr menu_items 3
-.It menu_mark
-.Xr menu_mark 3
-.It menu_opts
-.Xr menu_opts 3
-.It menu_opts_off
-.Xr menu_opts 3
-.It menu_opts_on
-.Xr menu_opts 3
-.It menu_pad
-.Xr menu_attributes 3
-.It menu_pattern
-.Xr menu_pattern 3
-.It menu_sub
-.Xr menu_win 3
-.It menu_term
-.Xr menu_hook 3
-.It menu_unmark
-.Xr menu_mark 3
-.It menu_userptr
-.Xr menu_userptr 3
-.It men_win
-.Xr menu_win 3
-.It new_item
-.Xr menu_item_new 3
-.It new_menu
-.Xr menu_new 3
-.It pos_menu_cursor
-.Xr menu_cursor 3
-.It post_menu
-.Xr menu_post 3
-.It scale_menu
-.Xr menu_win 3
-.It set_current_item
-.Xr menu_item_current 3
-.It set_item_init
-.Xr menu_hook 3
-.It set_item_opts
-.Xr menu_item_opts 3
-.It set_item_term
-.Xr menu_hook 3
-.It set_item_userptr
-.Xr menu_item_userptr 3
-.It set_item_value
-.Xr menu_item_value 3
-.It set_menu_back
-.Xr menu_attributes 3
-.It set_menu_fore
-.Xr menu_attributes 3
-.It set_menu_format
-.Xr menu_format 3
-.It set_menu_grey
-.Xr menu_attributes 3
-.It set_menu_init
-.Xr menu_hook 3
-.It set_menu_items
-.Xr menu_items 3
-.It set_menu_mark
-.Xr menu_mark 3
-.It set_menu_opts
-.Xr menu_opts 3
-.It set_menu_pad
-.Xr menu_attributes 3
-.It set_menu_pattern
-.Xr menu_pattern 3
-.It set_menu_sub
-.Xr menu_win 3
-.It set_menu_term
-.Xr menu_hook 3
-.It set_menu_unmark
-.Xr menu_mark 3
-.It set_menu_userptr
-.Xr menu_userptr 3
-.It set_menu_win
-.Xr menu_win 3
-.It set_top_row
-.Xr menu_item_current 3
-.It top_row
-.Xr menu_item_current 3
-.It unpost_menu
-.Xr menu_post 3
-.El
-.Sh RETURN VALUES
-Any function returning a string pointer will return NULL if an error
-occurs.
-Functions returning an integer will return one of the following:
-.Pp
-.Bl -tag -width E_UNKNOWN_COMMAND -compact
-.It Er E_OK
-The function was successful.
-.It Er E_SYSTEM_ERROR
-There was a system error during the call.
-.It Er E_BAD_ARGUMENT
-One or more of the arguments passed to the function was incorrect.
-.It Er E_POSTED
-The menu is already posted.
-.It Er E_CONNECTED
-An item was already connected to a menu.
-.It Er E_BAD_STATE
-The function was called from within an initialization or termination
-routine.
-.It Er E_NO_ROOM
-The menu does not fit within the subwindow.
-.It Er E_NOT_POSTED
-The menu is not posted.
-.It Er E_UNKNOWN_COMMAND
-The menu driver does not recognize the request passed to it.
-.It Er E_NO_MATCH
-The character search failed to find a match.
-.It Er E_NOT_SELECTABLE
-The item could not be selected.
-.It Er E_NOT_CONNECTED
-The item is not connected to a menu.
-.It Er E_REQUEST_DENIED
-The menu driver could not process the request.
-.El
-.Sh SEE ALSO
-.Xr curses 3 ,
-.Xr menu_attributes 3 ,
-.Xr menu_cursor 3 ,
-.Xr menu_driver 3 ,
-.Xr menu_format 3 ,
-.Xr menu_hook 3 ,
-.Xr menu_item_current 3 ,
-.Xr menu_item_name 3 ,
-.Xr menu_item_new 3 ,
-.Xr menu_item_opts 3 ,
-.Xr menu_item_userptr 3 ,
-.Xr menu_item_value 3 ,
-.Xr menu_item_visible 3 ,
-.Xr menu_items 3 ,
-.Xr menu_mark 3 ,
-.Xr menu_new 3 ,
-.Xr menu_opts 3 ,
-.Xr menu_pattern 3 ,
-.Xr menu_post 3 ,
-.Xr menu_userptr 3 ,
-.Xr menu_win 3
-.Sh NOTES
-This implementation of the menus library does depart in behaviour
-subtly from the original AT \*[Am] T implementation.
-Some of the more notable departures are:
-.Pp
-.Bl -tag -width "item marking" -compact
-.It unmark
-The original implementation did not have a marker for an unmarked field
-the mark was only displayed next to a field when it had been marked using
-the REQ_TOGGLE_ITEM.
-In this implementation a separate marker can be used
-to indicate an unmarked item.
-This can be set using set_menu_unmark function.
-There is no requirement for the mark and unmark strings to be the same
-length.
-Room will be left for the longest of the two.
-The unmark string
-is optional, if it is not set then menus defaults to the old behaviour.
-.It item marking
-In the original implementation the current item was considered selected
-and hence had the mark string displayed next to it.
-This implementation does not do this because the Author considers the
-effect too confusing.
-Especially in the case of a multiple selection menu because there was no
-way to tell if the current item is selected or not without shifting off
-of it.
-Since the current item is displayed using the foreground attribute it was
-deemed unnecessary to also display the mark string against the current item.
-.El
-.Pp
-The option O_RADIO and the function
-.Fn item_selected
-are
-.Nx
-extensions and must not be used in portable code.
diff --git a/lib/libmenu/post.c b/lib/libmenu/post.c
deleted file mode 100644
index 2493b4a2e..000000000
--- a/lib/libmenu/post.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*	$NetBSD: post.c,v 1.12 2003/04/19 12:52:39 blymn Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: post.c,v 1.12 2003/04/19 12:52:39 blymn Exp $");
-
-#include <menu.h>
-#include <stdlib.h>
-#include "internals.h"
-
-/*
- * Post the menu to the screen.  Call any defined init routines and then
- * draw the menu on the screen.
- */
-int
-post_menu(MENU *menu)
-{
-	int maxx, maxy, i;
-	
-	if (menu == NULL)
-		return E_BAD_ARGUMENT;
-	if (menu->posted == 1)
-		return E_POSTED;
-	if (menu->in_init == 1)
-		return E_BAD_STATE;
-	if (menu->items == NULL)
-		return E_NOT_CONNECTED;
-	if (*menu->items == NULL)
-		return E_NOT_CONNECTED;
-
-	menu->in_init = 1;
-	
-	if (menu->menu_init != NULL)
-		menu->menu_init(menu);
-	if (menu->item_init != NULL)
-		menu->item_init(menu);
-
-	menu->in_init = 0;
-
-	getmaxyx(menu->scrwin, maxy, maxx);
-	if ((maxx == ERR) || (maxy == ERR)) return E_SYSTEM_ERROR;
-
-	if ((menu->cols * menu->max_item_width + menu->cols - 1) > maxx)
-		return E_NO_ROOM;
-
-	if ((menu->opts & O_RADIO) != O_RADIO) {
-		for (i = 0; i < menu->item_count; i++) {
-			menu->items[i]->selected = 0;
-		}
-	}
-	
-	menu->posted = 1;
-	return _menui_draw_menu(menu);
-	
-}
-
-/*
- * Unpost the menu.  Call any defined termination routines and remove the
- * menu from the screen.
- */
-int
-unpost_menu(MENU *menu)
-{
-	if (menu == NULL)
-		return E_BAD_ARGUMENT;
-	if (menu->posted != 1)
-		return E_NOT_POSTED;
-	if (menu->in_init == 1)
-		return E_BAD_STATE;
-	if (menu->item_term != NULL)
-		menu->item_term(menu);
-
-	if (menu->menu_term != NULL)
-		menu->menu_term(menu);
-
-	menu->posted = 0;
-	werase(menu->scrwin);
-	wrefresh(menu->scrwin);
-	return E_OK;
-}
-
-	
diff --git a/lib/libmenu/shlib_version b/lib/libmenu/shlib_version
deleted file mode 100644
index dc8e452ba..000000000
--- a/lib/libmenu/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.11 2009/01/11 03:07:48 christos Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=6
-minor=0
diff --git a/lib/libmenu/userptr.c b/lib/libmenu/userptr.c
deleted file mode 100644
index 682b761b5..000000000
--- a/lib/libmenu/userptr.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*	$NetBSD: userptr.c,v 1.9 2003/03/09 01:08:48 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: userptr.c,v 1.9 2003/03/09 01:08:48 lukem Exp $");
-
-#include <menu.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* the following is defined in menu.c */
-extern MENU _menui_default_menu;
-
-/* the following is defined in item.c */
-extern ITEM _menui_default_item;
-
-/*
- * Set the item user pointer data
- */
-int
-set_item_userptr(ITEM *param_item, char *userptr)
-{
-	ITEM *item = (param_item != NULL) ? param_item : &_menui_default_item;
-	
-        item->userptr = userptr;
-        return E_OK;
-}
-
-
-/*
- * Return the item user pointer
- */
-char *
-item_userptr(ITEM *item)
-{
-	if (item == NULL)
-		return _menui_default_item.userptr;
-	else
-		return item->userptr;
-}
-
-/*
- * Return the user pointer for the given menu
- */
-char *
-menu_userptr(MENU *menu)
-{
-	if (menu == NULL)
-		return _menui_default_menu.userptr;
-	else
-		return menu->userptr;
-}
-
-/*
- * Set the user pointer for the given menu
- */
-int
-set_menu_userptr(MENU *param_menu, char *userptr)
-{
-	MENU *menu = (param_menu != NULL) ? param_menu : &_menui_default_menu;
-
-        menu->userptr = userptr;
-
-        return E_OK;
-}
-
diff --git a/lib/libpci/Makefile b/lib/libpci/Makefile
deleted file mode 100644
index b0f903214..000000000
--- a/lib/libpci/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#	$NetBSD: Makefile,v 1.5 2014/09/21 14:32:37 christos Exp $
-
-.include <bsd.own.mk>
-
-LIB=	pci
-
-SRCS=	pci_bus.c pci_device.c pci_drvname.c pci_subr.c dev_verbose.c
-SYSDIR= ${NETBSDSRCDIR}/sys/
-
-.PATH.c: ${SYSDIR}/dev/pci ${SYSDIR}/dev
-CPPFLAGS+= -I${SYSDIR}
-
-MAN=	pci.3
-
-MLINKS=	pci.3 pcibus_conf_read.3 \
-	pci.3 pcibus_conf_write.3 \
-	pci.3 pcidev_conf_read.3 \
-	pci.3 pcidev_conf_write.3 \
-	pci.3 pci_findvendor.3 \
-	pci.3 pci_devinfo.3 \
-	pci.3 pci_conf_print.3
-
-INCSDIR= /usr/include
-INCS=	pci.h
-
-.include <bsd.lib.mk>
diff --git a/lib/libpci/pci.3 b/lib/libpci/pci.3
deleted file mode 100644
index 74979a8af..000000000
--- a/lib/libpci/pci.3
+++ /dev/null
@@ -1,188 +0,0 @@
-.\"	$NetBSD: pci.3,v 1.10 2014/12/16 13:38:36 msaitoh Exp $
-.\"
-.\" Copyright 2001 Wasabi Systems, Inc.
-.\" All rights reserved.
-.\"
-.\" Written by Jason R. Thorpe for Wasabi Systems, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed for the NetBSD Project by
-.\"	Wasabi Systems, Inc.
-.\" 4. The name of Wasabi Systems, Inc. may not be used to endorse
-.\"    or promote products derived from this software without specific prior
-.\"    written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd December 16, 2014
-.Dt PCI 3
-.Os
-.Sh NAME
-.Nm pci
-.Nd library interface for PCI bus access
-.Sh LIBRARY
-.Lb libpci
-.Sh SYNOPSIS
-.In pci.h
-.Ft int
-.Fn pcibus_conf_read "int pcifd" "u_int bus" "u_int dev" "u_int func" \
-"u_int reg" "pcireg_t *valp"
-.Ft int
-.Fn pcibus_conf_write "int pcifd" "u_int bus" "u_int dev" "u_int func" \
-"u_int reg" "pcireg_t val"
-.Ft int
-.Fn pcidev_conf_read "int devfd" "u_int reg" "pcireg_t *valp"
-.Ft int
-.Fn pcidev_conf_write "int devfd" "u_int reg" "pcireg_t val"
-.Ft char *
-.Fn pci_findvendor "pcireg_t id_reg"
-.Ft void
-.Fn pci_devinfo "pcireg_t id_reg" "pcireg_t class_reg" "int showclass" "char *devinfo" "size_t len"
-.Ft void
-.Fn pci_conf_print "int pcifd" "u_int bus" "u_int dev" "u_int func"
-.Ft int
-.Fn pci_drvname "int pcifd" "u_int dev" "u_int func" "char *drvname" "size_t len"
-.Sh DESCRIPTION
-The
-.Nm
-library provides support for accessing the PCI bus by user programs.
-.Pp
-These functions are available in the
-.Nm libpci
-library.
-Programs should be linked with
-.Fl lpci .
-.Sh CONFIGURATION SPACE FUNCTIONS
-The following functions are used to access PCI configuration space:
-.Bl -tag -width 4n
-.It Fn pcibus_conf_read
-Access the PCI configuration register
-.Fa reg
-on the device located at
-.Fa bus ,
-.Fa dev ,
-.Fa func ,
-and place the result in
-.Fa *valp .
-.Fa pcifd
-must be an open file descriptor to a PCI bus within the target PCI domain.
-.It Fn pcibus_conf_write
-Write the value specified by
-.Fa val
-into the PCI configuration register
-.Fa reg
-on the device located at
-.Fa bus ,
-.Fa dev ,
-.Fa func .
-.Fa pcifd
-must be an open file descriptor to a PCI bus within the target PCI domain.
-.It Fn pcidev_conf_read
-Access the PCI configuration register
-.Fa reg
-on the device associated with the open file descriptor
-.Fa devfd
-and place the result in
-.Fa *valp .
-.It Fn pcidev_conf_write
-Write the value specified by
-.Fa val
-into the PCI configuration register
-.Fa reg
-on the device associated with the open file descriptor
-.Fa devfd .
-.El
-.Sh MISCELLANEOUS FUNCTIONS
-The following miscellaneous functions are available:
-.Bl -tag -width 4n
-.It Fn pci_findvendor
-Return an ASCII description of the PCI vendor in the
-PCI ID register
-.Fa id_reg .
-.It Fn pci_devinfo
-Return an ASCII description of the PCI vendor, PCI product,
-and PCI class specified by the PCI ID register
-.Fa id_reg
-and PCI class ID register
-.Fa class_reg .
-The description is placed into the buffer pointed to by
-.Fa devinfo ;
-the size of that buffer is specified in
-.Fa len .
-If
-.Fa showclass
-is not 0, the class, subclass and interface are added into the buffer.
-.It Fn pci_conf_print
-Print the PCI configuration information for the device located
-at
-.Fa bus ,
-.Fa dev ,
-.Fa func .
-.Fa pcifd
-must be an open file descriptor to a PCI bus within the target PCI domain.
-.It Fn pci_drvname
-For the PCI bus opened on
-.Fa pcifd ,
-return the driver name for
-.Fa dev
-and
-.Fa func
-into
-.Fa drvname
-using
-.Fa len
-as the buffer length.
-.El
-.Sh RETURN VALUES
-The
-.Fn pcibus_conf_read ,
-.Fn pcibus_conf_write ,
-.Fn pcidev_conf_read ,
-.Fn pcidev_conf_write ,
-.Fn pci_devinfo ,
-and
-.Fn pci_drvname
-functions return 0 on success and \-1 on failure.
-.Pp
-The
-.Fn pci_findvendor
-function returns
-.Dv NULL
-if the PCI vendor description cannot be found.
-.Sh SEE ALSO
-.Xr pci 4
-.Sh HISTORY
-The
-.Fn pcibus_conf_read ,
-.Fn pcibus_conf_write ,
-.Fn pcidev_conf_read ,
-.Fn pcidev_conf_write ,
-.Fn pci_findvendor ,
-.Fn pci_devinfo ,
-and
-.Fn pci_conf_print
-functions first appeared in
-.Nx 1.6 .
-The
-.Fn pci_drvname
-function first appeared in
-.Nx 7.0 .
diff --git a/lib/libpci/pci.h b/lib/libpci/pci.h
deleted file mode 100644
index 6e3dec3d0..000000000
--- a/lib/libpci/pci.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: pci.h,v 1.6 2014/09/21 14:32:37 christos Exp $	*/
-
-/*
- * Copyright 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project by
- *	Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _PCI_H_
-#define	_PCI_H_
-
-/*
- * Interface to the PCI bus for user programs.
- */
-
-typedef uint32_t pcireg_t;	/* XXX */
-
-/* pci_bus.c */
-int	pcibus_conf_read(int, u_int, u_int, u_int, u_int, pcireg_t *);
-int	pcibus_conf_write(int, u_int, u_int, u_int, u_int, pcireg_t);
-
-/* pci_device.c */
-int	pcidev_conf_read(int, u_int, pcireg_t *);
-int	pcidev_conf_write(int, u_int, pcireg_t);
-
-/* pci_drvname.c */
-int	pci_drvname(int, u_int, u_int, char *, size_t);
-
-/* pci_subr.c */
-void	pci_devinfo(pcireg_t, pcireg_t, int, char *, size_t);
-void	pci_conf_print(int, u_int, u_int, u_int);
-
-#endif /* _PCI_H_ */
diff --git a/lib/libpci/pci_bus.c b/lib/libpci/pci_bus.c
deleted file mode 100644
index c7e4e9ce5..000000000
--- a/lib/libpci/pci_bus.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*	$NetBSD: pci_bus.c,v 1.2 2003/03/08 09:53:45 lukem Exp $	*/
-
-/*
- * Copyright 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project by
- *	Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Interface to PCI config space registers for a PCI domain.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: pci_bus.c,v 1.2 2003/03/08 09:53:45 lukem Exp $");
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#include <pci.h>
-
-#include <dev/pci/pciio.h>
-
-/*
- * pcibus_conf_read:
- *
- *	Read a config word for a given bus/device/function.
- */
-int
-pcibus_conf_read(int fd, u_int bus, u_int device, u_int func, u_int reg,
-    uint32_t *valp)
-{
-	struct pciio_bdf_cfgreg bdfr;
-	int rv;
-
-	bdfr.bus = bus;
-	bdfr.device = device;
-	bdfr.function = func;
-	bdfr.cfgreg.reg = reg;
-
-	rv = ioctl(fd, PCI_IOC_BDF_CFGREAD, &bdfr);
-	if (rv == -1) {
-		/* errno already set. */
-		return (-1);
-	}
-
-	*valp = bdfr.cfgreg.val;
-	return (0);
-}
-
-/*
- * pcibus_conf_write:
- *
- *	Write a config word for a given bus/device/function.
- */
-int
-pcibus_conf_write(int fd, u_int bus, u_int device, u_int func, u_int reg,
-    uint32_t val)
-{
-	struct pciio_bdf_cfgreg bdfr;
-
-	bdfr.bus = bus;
-	bdfr.device = device;
-	bdfr.function = func; 
-	bdfr.cfgreg.reg = reg;
-	bdfr.cfgreg.val = val;
-
-	return (ioctl(fd, PCI_IOC_BDF_CFGWRITE, &bdfr));
-}
diff --git a/lib/libpci/pci_device.c b/lib/libpci/pci_device.c
deleted file mode 100644
index 193cd1637..000000000
--- a/lib/libpci/pci_device.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$NetBSD: pci_device.c,v 1.2 2003/03/08 09:53:45 lukem Exp $	*/
-
-/*
- * Copyright 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project by
- *	Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Interface to PCI config space registers for a specific PCI device.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: pci_device.c,v 1.2 2003/03/08 09:53:45 lukem Exp $");
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#include <pci.h>
-
-#include <dev/pci/pciio.h>
-
-/*
- * pcidev_conf_read:
- *
- *	Read a config word for a given bus/device/function.
- */
-int
-pcidev_conf_read(int fd, u_int reg, uint32_t *valp)
-{
-	struct pciio_cfgreg r;
-	int rv;
-
-	r.reg = reg;
-
-	rv = ioctl(fd, PCI_IOC_CFGREAD, &r);
-	if (rv == -1) {
-		/* errno already set. */
-		return (-1);
-	}
-
-	*valp = r.val;
-	return (0);
-}
-
-/*
- * pcidev_conf_write:
- *
- *	Write a config word for a given bus/device/function.
- */
-int
-pcidev_conf_write(int fd, u_int reg, uint32_t val)
-{
-	struct pciio_cfgreg r;
-
-	r.reg = reg;
-	r.val = val;
-
-	return (ioctl(fd, PCI_IOC_CFGWRITE, &r));
-}
diff --git a/lib/libpci/pci_drvname.c b/lib/libpci/pci_drvname.c
deleted file mode 100644
index ed081e253..000000000
--- a/lib/libpci/pci_drvname.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: pci_drvname.c,v 1.1 2014/07/25 01:38:26 mrg Exp $	*/
-
-/*
- * Copyright (c) 2014 Matthew R. Green
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: pci_drvname.c,v 1.1 2014/07/25 01:38:26 mrg Exp $");
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <string.h>
-
-#include <pci.h>
-
-#include <dev/pci/pciio.h>
-
-/*
- * pci_drvname:
- *
- *	What's the driver name for a PCI device?
- */
-int
-pci_drvname(int fd, u_int device, u_int func, char *name, size_t len)
-{
-	struct pciio_drvname drvname;
-	int rv;
-
-	drvname.device = device;
-	drvname.function = func;
-
-	rv = ioctl(fd, PCI_IOC_DRVNAME, &drvname);
-	if (rv == -1)
-		return -1;
-
-	strlcpy(name, drvname.name, len);
-	return 0;
-}
diff --git a/lib/libpci/shlib_version b/lib/libpci/shlib_version
deleted file mode 100644
index 49500657f..000000000
--- a/lib/libpci/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.4 2014/07/25 01:38:26 mrg Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=2
-minor=1
diff --git a/lib/libprop/Makefile b/lib/libprop/Makefile
deleted file mode 100644
index 9411916a3..000000000
--- a/lib/libprop/Makefile
+++ /dev/null
@@ -1,192 +0,0 @@
-#	$NetBSD: Makefile,v 1.20 2012/03/21 05:37:43 matt Exp $
-
-.include <bsd.own.mk>
-
-WARNS?=5
-USE_SHLIBDIR=	yes
-
-PROPLIBDIR=${NETBSDSRCDIR}/common/lib/libprop
-
-.include "${PROPLIBDIR}/Makefile.inc"
-
-CPPFLAGS+=-D_LIBPROP
-# LSC, for MINIX, _REENTRANT unsupported
-CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libc/include # -D_REENTRANT
-
-LINTFLAGS+=-w
-LIB=	prop
-
-MAN=	prop_array.3 prop_bool.3 prop_data.3 prop_dictionary.3 \
-	prop_ingest.3 prop_number.3 prop_object.3 prop_string.3 proplib.3
-
-MAN+=	prop_copyin_ioctl.9
-MLINKS+= prop_copyin_ioctl.9 prop_array_copyin_ioctl.9
-MLINKS+= prop_copyin_ioctl.9 prop_array_copyout_ioctl.9
-MLINKS+= prop_copyin_ioctl.9 prop_dictionary_copyin_ioctl.9
-MLINKS+= prop_copyin_ioctl.9 prop_dictionary_copyout_ioctl.9
-
-MAN+=	prop_send_ioctl.3
-MLINKS+= prop_send_ioctl.3 prop_array_send_ioctl.3
-MLINKS+= prop_send_ioctl.3 prop_array_recv_ioctl.3
-MLINKS+= prop_send_ioctl.3 prop_dictionary_send_ioctl.3
-MLINKS+= prop_send_ioctl.3 prop_dictionary_recv_ioctl.3
-MLINKS+= prop_send_ioctl.3 prop_dictionary_sendrecv_ioctl.3
-
-MAN+=	prop_send_syscall.3
-MLINKS+= prop_send_syscall.3 prop_array_send_syscall.3
-MLINKS+= prop_send_syscall.3 prop_array_recv_syscall.3
-MLINKS+= prop_send_syscall.3 prop_dictionary_send_syscall.3
-MLINKS+= prop_send_syscall.3 prop_dictionary_recv_syscall.3
-
-MAN+=	prop_dictionary_util.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_get_bool.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_set_bool.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_get_int8.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_get_uint8.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_set_int8.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_set_uint8.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_get_int16.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_get_uint16.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_set_int16.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_set_uint16.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_get_int32.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_get_uint32.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_set_int32.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_set_uint32.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_get_int64.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_get_uint64.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_set_int64.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_set_uint64.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_get_cstring.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_set_cstring.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_get_cstring_nocopy.3
-MLINKS+= prop_dictionary_util.3 prop_dictionary_set_cstring_nocopy.3
-
-MLINKS+= prop_array.3 prop_array_add.3
-MLINKS+= prop_array.3 prop_array_capacity.3
-MLINKS+= prop_array.3 prop_array_copy.3
-MLINKS+= prop_array.3 prop_array_copy_mutable.3
-MLINKS+= prop_array.3 prop_array_count.3
-MLINKS+= prop_array.3 prop_array_create.3
-MLINKS+= prop_array.3 prop_array_create_with_capacity.3
-MLINKS+= prop_array.3 prop_array_ensure_capacity.3
-MLINKS+= prop_array.3 prop_array_equals.3
-MLINKS+= prop_array.3 prop_array_externalize.3
-MLINKS+= prop_array.3 prop_array_externalize_to_file.3
-MLINKS+= prop_array.3 prop_array_externalize_to_pref.3
-MLINKS+= prop_array.3 prop_array_get.3
-MLINKS+= prop_array.3 prop_array_internalize.3
-MLINKS+= prop_array.3 prop_array_internalize_from_file.3
-MLINKS+= prop_array.3 prop_array_internalize_from_pref.3
-MLINKS+= prop_array.3 prop_array_iterator.3
-MLINKS+= prop_array.3 prop_array_make_immutable.3
-MLINKS+= prop_array.3 prop_array_mutable.3
-MLINKS+= prop_array.3 prop_array_remove.3
-MLINKS+= prop_array.3 prop_array_set.3
-
-MAN+=	prop_array_util.3
-MLINKS+= prop_array_util.3 prop_array_get_bool.3
-MLINKS+= prop_array_util.3 prop_array_set_bool.3
-MLINKS+= prop_array_util.3 prop_array_get_int8.3
-MLINKS+= prop_array_util.3 prop_array_get_uint8.3
-MLINKS+= prop_array_util.3 prop_array_set_int8.3
-MLINKS+= prop_array_util.3 prop_array_set_uint8.3
-MLINKS+= prop_array_util.3 prop_array_get_int16.3
-MLINKS+= prop_array_util.3 prop_array_get_uint16.3
-MLINKS+= prop_array_util.3 prop_array_set_int16.3
-MLINKS+= prop_array_util.3 prop_array_set_uint16.3
-MLINKS+= prop_array_util.3 prop_array_get_int32.3
-MLINKS+= prop_array_util.3 prop_array_get_uint32.3
-MLINKS+= prop_array_util.3 prop_array_set_int32.3
-MLINKS+= prop_array_util.3 prop_array_set_uint32.3
-MLINKS+= prop_array_util.3 prop_array_get_int64.3
-MLINKS+= prop_array_util.3 prop_array_get_uint64.3
-MLINKS+= prop_array_util.3 prop_array_set_int64.3
-MLINKS+= prop_array_util.3 prop_array_set_uint64.3
-MLINKS+= prop_array_util.3 prop_array_get_cstring.3
-MLINKS+= prop_array_util.3 prop_array_set_cstring.3
-MLINKS+= prop_array_util.3 prop_array_get_cstring_nocopy.3
-MLINKS+= prop_array_util.3 prop_array_set_cstring_nocopy.3
-
-MLINKS+= prop_bool.3 prop_bool_copy.3
-MLINKS+= prop_bool.3 prop_bool_create.3
-MLINKS+= prop_bool.3 prop_bool_true.3
-
-MLINKS+= prop_data.3 prop_data_copy.3
-MLINKS+= prop_data.3 prop_data_create_data.3
-MLINKS+= prop_data.3 prop_data_create_data_nocopy.3
-MLINKS+= prop_data.3 prop_data_data.3
-MLINKS+= prop_data.3 prop_data_data_nocopy.3
-MLINKS+= prop_data.3 prop_data_equals.3
-MLINKS+= prop_data.3 prop_data_equals_data.3
-MLINKS+= prop_data.3 prop_data_size.3
-
-MLINKS+= prop_dictionary.3 prop_dictionary_all_keys.3
-MLINKS+= prop_dictionary.3 prop_dictionary_capacity.3
-MLINKS+= prop_dictionary.3 prop_dictionary_copy.3
-MLINKS+= prop_dictionary.3 prop_dictionary_copy_mutable.3
-MLINKS+= prop_dictionary.3 prop_dictionary_count.3
-MLINKS+= prop_dictionary.3 prop_dictionary_create.3
-MLINKS+= prop_dictionary.3 prop_dictionary_create_with_capacity.3
-MLINKS+= prop_dictionary.3 prop_dictionary_ensure_capacity.3
-MLINKS+= prop_dictionary.3 prop_dictionary_equals.3
-MLINKS+= prop_dictionary.3 prop_dictionary_externalize.3
-MLINKS+= prop_dictionary.3 prop_dictionary_externalize_to_file.3
-MLINKS+= prop_dictionary.3 prop_dictionary_externalize_to_pref.3
-MLINKS+= prop_dictionary.3 prop_dictionary_get.3
-MLINKS+= prop_dictionary.3 prop_dictionary_get_keysym.3
-MLINKS+= prop_dictionary.3 prop_dictionary_internalize.3
-MLINKS+= prop_dictionary.3 prop_dictionary_internalize_from_file.3
-MLINKS+= prop_dictionary.3 prop_dictionary_internalize_from_pref.3
-MLINKS+= prop_dictionary.3 prop_dictionary_iterator.3
-MLINKS+= prop_dictionary.3 prop_dictionary_keysym_cstring_nocopy.3
-MLINKS+= prop_dictionary.3 prop_dictionary_keysym_equals.3
-MLINKS+= prop_dictionary.3 prop_dictionary_make_immutable.3
-MLINKS+= prop_dictionary.3 prop_dictionary_mutable.3
-MLINKS+= prop_dictionary.3 prop_dictionary_remove.3
-MLINKS+= prop_dictionary.3 prop_dictionary_remove_keysym.3
-MLINKS+= prop_dictionary.3 prop_dictionary_set.3
-MLINKS+= prop_dictionary.3 prop_dictionary_set_keysym.3
-
-MLINKS+= prop_ingest.3 prop_ingest_context_alloc.3
-MLINKS+= prop_ingest.3 prop_ingest_context_error.3
-MLINKS+= prop_ingest.3 prop_ingest_context_free.3
-MLINKS+= prop_ingest.3 prop_ingest_context_key.3
-MLINKS+= prop_ingest.3 prop_ingest_context_private.3
-MLINKS+= prop_ingest.3 prop_ingest_context_type.3
-MLINKS+= prop_ingest.3 prop_dictionary_ingest.3
-
-MLINKS+= prop_number.3 prop_number_copy.3
-MLINKS+= prop_number.3 prop_number_create_integer.3
-MLINKS+= prop_number.3 prop_number_create_unsigned_integer.3
-MLINKS+= prop_number.3 prop_number_equals.3
-MLINKS+= prop_number.3 prop_number_equals_integer.3
-MLINKS+= prop_number.3 prop_number_equals_unsigned_integer.3
-MLINKS+= prop_number.3 prop_number_size.3
-MLINKS+= prop_number.3 prop_number_unsigned.3
-MLINKS+= prop_number.3 prop_number_integer_value.3
-MLINKS+= prop_number.3 prop_number_unsigned_integer_value.3
-
-MLINKS+= prop_object.3 prop_object_equals.3
-MLINKS+= prop_object.3 prop_object_iterator_next.3
-MLINKS+= prop_object.3 prop_object_iterator_release.3
-MLINKS+= prop_object.3 prop_object_iterator_reset.3
-MLINKS+= prop_object.3 prop_object_release.3
-MLINKS+= prop_object.3 prop_object_retain.3
-MLINKS+= prop_object.3 prop_object_type.3
-
-MLINKS+= prop_string.3 prop_string_append.3
-MLINKS+= prop_string.3 prop_string_append_cstring.3
-MLINKS+= prop_string.3 prop_string_copy.3
-MLINKS+= prop_string.3 prop_string_copy_mutable.3
-MLINKS+= prop_string.3 prop_string_create.3
-MLINKS+= prop_string.3 prop_string_create_cstring.3
-MLINKS+= prop_string.3 prop_string_create_cstring_nocopy.3
-MLINKS+= prop_string.3 prop_string_cstring.3
-MLINKS+= prop_string.3 prop_string_cstring_nocopy.3
-MLINKS+= prop_string.3 prop_string_equals.3
-MLINKS+= prop_string.3 prop_string_equals_cstring.3
-MLINKS+= prop_string.3 prop_string_mutable.3
-MLINKS+= prop_string.3 prop_string_size.3
-
-.include <bsd.lib.mk>
diff --git a/lib/libprop/shlib_version b/lib/libprop/shlib_version
deleted file mode 100644
index cb5580554..000000000
--- a/lib/libprop/shlib_version
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: shlib_version,v 1.10 2009/10/10 18:06:54 bad Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-major=1
-minor=1
diff --git a/lib/librefuse/Makefile b/lib/librefuse/Makefile
deleted file mode 100644
index 1a0ab90f2..000000000
--- a/lib/librefuse/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2012/03/21 05:37:43 matt Exp $
-
-USE_FORT?=	yes	# data driven bugs?
-
-LIB=		refuse
-.if !defined(__MINIX)
-LIBDPLIBS+=	puffs	${.CURDIR}/../libpuffs		\
-		pthread	${.CURDIR}/../libpthread
-.else
-LIBDPLIBS+=	puffs	${.CURDIR}/../libpuffs
-.endif # !defined(__MINIX)
-
-.ifdef DEBUG
-FUSE_OPT_DEBUG_FLAGS=	-g -DFUSE_OPT_DEBUG
-.endif
-
-CFLAGS+=	${FUSE_OPT_DEBUG_FLAGS}
-SRCS=		refuse.c refuse_opt.c
-MAN=		refuse.3
-WARNS?=		5
-INCS=           fuse.h fuse_opt.h
-INCSDIR=        /usr/include
-
-.include <bsd.lib.mk>
diff --git a/lib/librefuse/TODO b/lib/librefuse/TODO
deleted file mode 100644
index 918d38b1f..000000000
--- a/lib/librefuse/TODO
+++ /dev/null
@@ -1,25 +0,0 @@
-	$NetBSD: TODO,v 1.3 2007/05/03 21:02:54 agc Exp $
-
-To Do
-=====
-address all XXX
-implement all fuse_opt
-implement proper lookup (pending some libpuffs stuff)
-support fuse_mt (i.e. worker threads, but that'll probably be smarter
-		 to do inside of libpuffs)
-support fuse_ll (i.e. "raw" vfs/vnode export)
-implement all sorts of compat tweaks to appease various file systems
-do proper implementations of dirfillers
-statfs - some fuse file systems want struct statfs and we only have
-         statvfs available natively
-
-Done
-====
-statvfs
-sync
-WARNS=4
-address lint
-special directory handling in open()
-Finish off manual page
-fuse_setup
-fuse_teardown
diff --git a/lib/librefuse/fuse.h b/lib/librefuse/fuse.h
deleted file mode 100644
index 483fea3b0..000000000
--- a/lib/librefuse/fuse.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* $NetBSD: fuse.h,v 1.21 2008/08/01 15:54:09 dillo Exp $ */
-
-/*
- * Copyright © 2007 Alistair Crooks.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-#ifndef FUSE_H_
-#define FUSE_H_	20070123
-
-/* set the default version to use for the fuse interface */
-/* this value determines the API to be used */
-#ifndef FUSE_USE_VERSION
-#define FUSE_USE_VERSION	26
-#endif
-
-#include <sys/types.h>
-
-#include <puffs.h>
-#include <utime.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct fuse;
-struct fuse_args; /* XXXsupportme */
-
-struct fuse_file_info {
-	int32_t		flags;
-	uint32_t	fh_old;
-	int32_t		writepage;
-	uint32_t	direct_io:1;
-	uint32_t	keep_cache:1;
-	uint32_t	flush:1;
-	uint32_t	padding:29;
-	uint64_t	fh;
-	uint64_t	lock_owner;
-};
-
-struct fuse_conn_info {
-	uint32_t proto_major;
-	uint32_t proto_minor;
-	uint32_t async_read;
-	uint32_t max_write;
-	uint32_t max_readahead;
-	uint32_t reserved[27];
-};
-
-/* equivalent'ish of puffs_cc */
-struct fuse_context {
-	struct fuse	*fuse;
-	uid_t		uid;
-	gid_t		gid;
-	pid_t		pid;
-	void		*private_data;
-};
-
-/**
- * Argument list
- */
-struct fuse_args {
-	int	argc;
-	char	**argv;
-	int	allocated;
-};
-
-/**
- * Initializer for 'struct fuse_args'
- */
-#define FUSE_ARGS_INIT(argc, argv) { argc, argv, 0 }
-
-typedef struct puffs_fuse_dirh *fuse_dirh_t;
-
-typedef int (*fuse_fill_dir_t)(void *, const char *, const struct stat *, off_t);
-typedef int (*fuse_dirfil_t)(fuse_dirh_t, const char *, int, ino_t);
-
-#define FUSE_VERSION	26
-#define FUSE_MAJOR_VERSION	2
-#define FUSE_MINOR_VERSION	6
-
-/*
- * These operations shadow those in puffs_usermount, and are used
- * as a table of callbacks to make when file system requests come
- * in.
- *
- * NOTE: keep same order as fuse
- */
-struct fuse_operations {
-	int	(*getattr)(const char *, struct stat *);
-	int	(*readlink)(const char *, char *, size_t);
-	int	(*getdir)(const char *, fuse_dirh_t, fuse_dirfil_t);
-	int	(*mknod)(const char *, mode_t, dev_t);
-	int	(*mkdir)(const char *, mode_t);
-	int	(*unlink)(const char *);
-	int	(*rmdir)(const char *);
-	int	(*symlink)(const char *, const char *);
-	int	(*rename)(const char *, const char *);
-	int	(*link)(const char *, const char *);
-	int	(*chmod)(const char *, mode_t);
-	int	(*chown)(const char *, uid_t, gid_t);
-	int	(*truncate)(const char *, off_t);
-	int	(*utime)(const char *, struct utimbuf *);
-	int	(*open)(const char *, struct fuse_file_info *);
-	int	(*read)(const char *, char *, size_t, off_t, struct fuse_file_info *);
-	int	(*write)(const char *, const char *, size_t, off_t, struct fuse_file_info *);
-	int	(*statfs)(const char *, struct statvfs *);
-	int	(*flush)(const char *, struct fuse_file_info *);
-	int	(*release)(const char *, struct fuse_file_info *);
-	int	(*fsync)(const char *, int, struct fuse_file_info *);
-	int	(*setxattr)(const char *, const char *, const char *, size_t, int);
-	int	(*getxattr)(const char *, const char *, char *, size_t);
-	int	(*listxattr)(const char *, char *, size_t);
-	int	(*removexattr)(const char *, const char *);
-	int	(*opendir)(const char *, struct fuse_file_info *);
-	int	(*readdir)(const char *, void *, fuse_fill_dir_t, off_t, struct fuse_file_info *);
-	int	(*releasedir)(const char *, struct fuse_file_info *);
-	int	(*fsyncdir)(const char *, int, struct fuse_file_info *);
-	void	*(*init)(struct fuse_conn_info *);
-	void	(*destroy)(void *);
-	int	(*access)(const char *, int);
-	int	(*create)(const char *, mode_t, struct fuse_file_info *);
-	int	(*ftruncate)(const char *, off_t, struct fuse_file_info *);
-	int	(*fgetattr)(const char *, struct stat *, struct fuse_file_info *);
-	int	(*lock)(const char *, struct fuse_file_info *, int, struct flock *);
-	int	(*utimens)(const char *, const struct timespec *);
-	int	(*bmap)(const char *, size_t , uint64_t *);
-};
-
-
-struct fuse_chan *fuse_mount(const char *, struct fuse_args *);
-struct fuse *fuse_new(struct fuse_chan *, struct fuse_args *,
-	const struct fuse_operations *, size_t, void *);
-
-int fuse_main_real(int, char **, const struct fuse_operations *, size_t, void *);
-int fuse_loop(struct fuse *);
-struct fuse_context *fuse_get_context(void);
-void fuse_exit(struct fuse *);
-void fuse_destroy(struct fuse *);
-
-void fuse_unmount(const char *, struct fuse_chan *);
-
-struct fuse *fuse_setup(int, char **, const struct fuse_operations *,
-	size_t, char **, int *, int *);
-void fuse_teardown(struct fuse *, char *);
-
-#if FUSE_USE_VERSION == 22
-#define fuse_unmount fuse_unmount_compat22
-#endif
-
-void fuse_unmount_compat22(const char *);
-
-#if FUSE_USE_VERSION >= 26
-#define fuse_main(argc, argv, op, arg) \
-            fuse_main_real(argc, argv, op, sizeof(*(op)), arg)
-#define fuse_setup	fuse_setup26
-#else
-#define fuse_main(argc, argv, op) \
-            fuse_main_real(argc, argv, op, sizeof(*(op)), NULL)
-#endif
-
-struct fuse *fuse_setup26(int, char **, const struct fuse_operations *,
-	size_t, char **, int *, void *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#include <fuse_opt.h>
-
-#endif
diff --git a/lib/librefuse/fuse_opt.h b/lib/librefuse/fuse_opt.h
deleted file mode 100644
index b4d958bb9..000000000
--- a/lib/librefuse/fuse_opt.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: fuse_opt.h,v 1.5 2009/04/19 22:25:29 christos Exp $	*/
-
-/*
- * Copyright (c) 2007 Alistair Crooks.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- */
-
-#ifndef _FUSE_OPT_H_
-#define _FUSE_OPT_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif  
-
-enum {
-	FUSE_OPT_KEY_OPT = -1,
-	FUSE_OPT_KEY_NONOPT = -2,
-	FUSE_OPT_KEY_KEEP = -3,
-	FUSE_OPT_KEY_DISCARD = -4
-};
-
-struct fuse_opt {
-	const char	*templ;
-	int32_t		offset;
-	int32_t		value;
-};
-
-#define FUSE_OPT_KEY(templ, key) { templ, -1U, key }
-#define FUSE_OPT_END { .templ = NULL }
-
-typedef int (*fuse_opt_proc_t)(void *, const char *, int, struct fuse_args *);
-
-
-int fuse_opt_add_arg(struct fuse_args *, const char *);
-struct fuse_args *fuse_opt_deep_copy_args(int, char **);
-void fuse_opt_free_args(struct fuse_args *);
-int fuse_opt_insert_arg(struct fuse_args *, int, const char *);
-int fuse_opt_add_opt(char **, const char *);
-int fuse_opt_parse(struct fuse_args *, void *,
-		   const struct fuse_opt *, fuse_opt_proc_t);
-int fuse_opt_match(const struct fuse_opt *, const char *);
-
-#ifdef __cplusplus
-}
-#endif 
-
-#endif /* _FUSE_OPT_H_ */
diff --git a/lib/librefuse/refuse.3 b/lib/librefuse/refuse.3
deleted file mode 100644
index 7fc767af4..000000000
--- a/lib/librefuse/refuse.3
+++ /dev/null
@@ -1,243 +0,0 @@
-.\"	$NetBSD: refuse.3,v 1.9 2014/03/18 18:20:38 riastradh Exp $
-.\"
-.\" Copyright © 2007 Alistair Crooks.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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.
-.\"
-.Dd April 30, 2007
-.Dt REFUSE 3
-.Os
-.Sh NAME
-.Nm refuse
-.Nd Re-implementation of a file system in userspace system
-.Sh LIBRARY
-.Lb librefuse
-.Sh SYNOPSIS
-.In fuse.h
-.Ft int
-.Fo fuse_main
-.Fa "int argc" "char **argv" "const struct fuse_operations *"
-.Fc
-.Ft int
-.Fo fuse_opt_add_arg
-.Fa "struct fuse_args *args" "const char *arg"
-.Fc
-.Ft int
-.Fo fuse_opt_parse
-.Fa "struct fuse_args *args" "void *userdata"
-.Fa "const struct fuse_opt *descriptions" "fuse_opt_proc_t processingfunc"
-.Fc
-.Ft int
-.Fo fuse_teardown
-.Fa "struct fuse *fuse" "char *mountpoint"
-.Fc
-.Ft struct fuse *
-.Fo fuse_setup
-.Fa "int argc" "char **argv" "const struct fuse_operations *ops"
-.Fa "size_t opssize" "char **mountpoint" "int *multithreaded" "int *fd"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_getattr
-.Fa "const char *path" "struct stat *attrs"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_readlink
-.Fa "const char *path" "char *output" "size_t outlen"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_mknod
-.Fa "const char *path" "mode_t permissions" "dev_t devicenumber"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_mkdir
-.Fa "const char *path" "mode_t permissions"
-.Fc
-.Ft int
-.Fo puffs_fuse_unlink
-.Fa "const char *path"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_rmdir
-.Fa "const char *path"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_symlink
-.Fa "const char *path" "const char *target"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_rename
-.Fa "const char *from" "const char *to"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_link
-.Fa "const char *from" "const char *to"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_chmod
-.Fa "const char *path" "mode_t permissions"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_own
-.Fa "const char *path" "uid_t owner" "gid_t group"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_truncate
-.Fa "const char *path" "off_t newsize"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_utime
-.Fa "const char *path" "struct utimbuf *newtimes"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_open
-.Fa "const char *path" "struct fuse_file_info *fileinfo"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_read
-.Fa "const char *path" "char *buffer" "size_t bufferlen" "off_t startoffset"
-.Fa "struct fuse_file_info *fileinfo"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_write
-.Fa "const char *path" "char *buffer" "size_t bufferlen" "off_t startoffset"
-.Fa "struct fuse_file_info *fileinfo"
-.Fc
-.Ft int
-.Fo puffs_fuse_fs_statfs
-.Fa "const char *path" "struct statvfs *vfsinfo"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_flush
-.Fa "const char *path" "struct fuse_file_info *fileinfo"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_fsync
-.Fa "const char *path" "int flags" "struct fuse_file_info *fileinfo"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_setxattr
-.Fa "const char *path" "const char *attrname" "const char *attrvalue"
-.Fa "size_t attrsize" "int flags"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_getxattr
-.Fa "const char *path" "const char *attrname" "const char *attrvalue"
-.Fa "size_t attrvaluesize"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_listxattr
-.Fa "const char *path" "const char *attrname"
-.Fa "size_t attrvaluesize"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_removexattr
-.Fa "const char *path" "const char *attrname"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_opendir
-.Fa "const char *path" "struct fuse_file_info *fileinfo"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_readdir
-.Fa "const char *path" "void *data" "fuse_fill_dir_t fillinfo"
-.Fa "off_t offset" "struct fuse_file_info *fileinfo"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_releasedir
-.Fa "const char *path" "struct fuse_file_info *fileinfo"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_fsyncdir
-.Fa "const char *path" "int flags" "struct fuse_file_info *fileinfo"
-.Fc
-.Ft void *
-.Fo puffs_fuse_fs_init
-.Fa "struct fuse_conn_info *connectioninfo"
-.Fc
-.Ft void
-.Fo puffs_fuse_node_destroy
-.Fa "void *connection"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_access
-.Fa "const char *path" "int accesstype"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_create
-.Fa "const char *path" "mode_t permissions" "struct fuse_file_info *fileinfo"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_ftruncate
-.Fa "const char *path" "off_t offset" "struct fuse_file_info *fileinfo"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_fgetattr
-.Fa "const char *path" "struct stat *attrs" "struct fuse_file_info *fileinfo"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_lock
-.Fa "const char *path" "struct fuse_file_info *fileinfo"
-.Fa "int locktype" "struct flock *lockinfo"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_utimens
-.Fa "const char *path" "const struct timespec *newtimes"
-.Fc
-.Ft int
-.Fo puffs_fuse_node_bmap
-.Fa "const char *path" "size_t mapsize" "uint64_t offset"
-.Fc
-.Sh DESCRIPTION
-.Nm
-is a reimplementation of the file system in user space subsystem.
-Operations are transported from the kernel virtual file system layer
-to the concrete implementation behind
-.Nm ,
-where they are processed and results are sent back to the kernel.
-.Pp
-It uses the framework provided by the
-.Xr puffs 3
-subsystem, and, through that, the kernel interface provided by
-.Xr puffs 4 .
-.Sh SEE ALSO
-.Xr puffs 3 ,
-.Xr puffs 4
-.Rs
-.%A Antti Kantee
-.%A Alistair Crooks
-.%D September 2007
-.%J EuroBSDCon 2007
-.%T ReFUSE: Userspace FUSE Reimplementation Using puffs
-.Re
-.Sh HISTORY
-An unsupported experimental version of
-.Nm
-first appeared in
-.Nx 5.0 .
-.Sh AUTHORS
-.An Alistair Crooks Aq Mt agc@NetBSD.org ,
-.An Antti Kantee Aq Mt pooka@NetBSD.org
-.Sh BUGS
-Many, legion, but well-loved.
diff --git a/lib/librefuse/refuse.c b/lib/librefuse/refuse.c
deleted file mode 100644
index a615518b8..000000000
--- a/lib/librefuse/refuse.c
+++ /dev/null
@@ -1,1447 +0,0 @@
-/*	$NetBSD: refuse.c,v 1.96 2012/12/30 10:04:22 tron Exp $	*/
-
-/*
- * Copyright © 2007 Alistair Crooks.  All rights reserved.
- * Copyright © 2007 Antti Kantee.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote
- *    products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if !defined(lint)
-__RCSID("$NetBSD: refuse.c,v 1.96 2012/12/30 10:04:22 tron Exp $");
-#endif /* !lint */
-
-#include <sys/types.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <fuse.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#ifdef MULTITHREADED_REFUSE
-#include <pthread.h>
-#endif
-
-typedef uint64_t	 fuse_ino_t;
-
-struct fuse_config {
-	uid_t		uid;
-	gid_t		gid;
-	mode_t		umask;
-	double		entry_timeout;
-	double		negative_timeout;
-	double		attr_timeout;
-	double		ac_attr_timeout;
-	int		ac_attr_timeout_set;
-	int		debug;
-	int		hard_remove;
-	int		use_ino;
-	int		readdir_ino;
-	int		set_mode;
-	int		set_uid;
-	int		set_gid;
-	int		direct_io;
-	int		kernel_cache;
-	int		auto_cache;
-	int		intr;
-	int		intr_signal;
-};
-
-struct fuse_chan {
-	const char		*dir;
-	struct fuse_args	*args;
-	struct puffs_usermount	*pu;
-	int 			dead;
-};
-
-/* this is the private fuse structure */
-struct fuse {
-	struct fuse_chan	*fc;		/* fuse channel pointer */
-	struct fuse_operations	op;		/* switch table of operations */
-	int			compat;		/* compat level -
-						 * not used in puffs_fuse */
-	struct node		**name_table;
-	size_t			name_table_size;
-	struct node		**id_table;
-	size_t			id_table_size;
-	fuse_ino_t		ctr;
-	unsigned int		generation;
-	unsigned int		hidectr;
-#if !defined(__minix)
-	pthread_mutex_t		lock;
-	pthread_rwlock_t	tree_lock;
-#endif /* !defined(__minix) */
-	void			*user_data;
-	struct fuse_config	conf;
-	int			intr_installed;
-};
-
-struct puffs_fuse_dirh {
-	void *dbuf;
-	struct dirent *d;
-
-	size_t reslen;
-	size_t bufsize;
-};
-
-struct refusenode {
-	struct fuse_file_info	file_info;
-	struct puffs_fuse_dirh	dirh;
-	int opencount;
-	int flags;
-};
-#define RN_ROOT		0x01
-#define RN_OPEN		0x02	/* XXX: could just use opencount */
-
-static int fuse_setattr(struct fuse *, struct puffs_node *,
-			const char *, const struct vattr *);
-
-static struct puffs_node *
-newrn(struct puffs_usermount *pu)
-{
-	struct puffs_node *pn;
-	struct refusenode *rn;
-
-	if ((rn = calloc(1, sizeof(*rn))) == NULL) {
-		err(EXIT_FAILURE, "newrn");
-	}
-	pn = puffs_pn_new(pu, rn);
-
-	return pn;
-}
-
-static void
-nukern(struct puffs_node *pn)
-{
-	struct refusenode *rn = pn->pn_data;
-
-	free(rn->dirh.dbuf);
-	free(rn);
-	puffs_pn_put(pn);
-}
-
-/* XXX - not threadsafe */
-static ino_t fakeino = 3;
-
-/***************** start of pthread context routines ************************/
-
-/*
- * Notes on fuse_context:
- * we follow fuse's lead and use the pthread specific information to hold
- * a reference to the fuse_context structure for this thread.
- */
-#ifdef MULTITHREADED_REFUSE
-static pthread_mutex_t		context_mutex = PTHREAD_MUTEX_INITIALIZER;
-static pthread_key_t		context_key;
-static unsigned long		context_refc;
-#endif
-
-/* return the fuse_context struct related to this thread */
-struct fuse_context *
-fuse_get_context(void)
-{
-#ifdef MULTITHREADED_REFUSE
-	struct fuse_context	*ctxt;
-
-	if ((ctxt = pthread_getspecific(context_key)) == NULL) {
-		if ((ctxt = calloc(1, sizeof(struct fuse_context))) == NULL) {
-			abort();
-		}
-		pthread_setspecific(context_key, ctxt);
-	}
-	return ctxt;
-#else
-	static struct fuse_context	fcon;
-
-	return &fcon;
-#endif
-}
-
-/* used as a callback function */
-#ifdef MULTITHREADED_REFUSE
-static void
-free_context(void *ctxt)
-{   
-	free(ctxt);
-}
-#endif
-
-/*
- * Create the pthread key.  The reason for the complexity is to
- * enable use of multiple fuse instances within a single process.
- */
-static int
-create_context_key(void)
-{   
-#ifdef MULTITHREADED_REFUSE
-	int rv;
-
-	rv = pthread_mutex_lock(&context_mutex);
-	assert(rv == 0);
-
-	if (context_refc == 0) {
-		if (pthread_key_create(&context_key, free_context) != 0) {
-			warnx("create_context_key: pthread_key_create failed");
-			pthread_mutex_unlock(&context_mutex);
-			return 0;
-		}
-	}
-	context_refc += 1;
-	pthread_mutex_unlock(&context_mutex);
-	return 1;
-#else
-	return 1;
-#endif
-}
-
-static void
-delete_context_key(void)
-{   
-#ifdef MULTITHREADED_REFUSE
-	pthread_mutex_lock(&context_mutex);
-	/* If we are the last fuse instances using the key, delete it */
-	if (--context_refc == 0) {
-		free(pthread_getspecific(context_key));
-		pthread_key_delete(context_key);
-	}
-	pthread_mutex_unlock(&context_mutex);
-#endif
-}
-
-/* set the uid and gid of the calling process in the current fuse context */
-static void
-set_fuse_context_uid_gid(const struct puffs_cred *cred)
-{
-	struct fuse_context	*fusectx;
-	uid_t			 uid;
-	gid_t			 gid;
-
-	fusectx = fuse_get_context();
-	if (puffs_cred_getuid(cred, &uid) == 0) {
-		fusectx->uid = uid;
-	}
-	if (puffs_cred_getgid(cred, &gid) == 0) {
-		fusectx->gid = gid;
-	}
-}
-
-/* set the pid of the calling process in the current fuse context */
-static void
-set_fuse_context_pid(struct puffs_usermount *pu)
-{
-	struct puffs_cc		*pcc = puffs_cc_getcc(pu);
-	struct fuse_context	*fusectx;
-
-	fusectx = fuse_get_context();
-	puffs_cc_getcaller(pcc, &fusectx->pid, NULL);
-}
-
-/***************** end of pthread context routines ************************/
-
-#define DIR_CHUNKSIZE 4096
-static int
-fill_dirbuf(struct puffs_fuse_dirh *dh, const char *name, ino_t dino,
-	uint8_t dtype)
-{
-
-	/* initial? */
-	if (dh->bufsize == 0) {
-		if ((dh->dbuf = calloc(1, DIR_CHUNKSIZE)) == NULL) {
-			abort();
-		}
-		dh->d = dh->dbuf;
-		dh->reslen = dh->bufsize = DIR_CHUNKSIZE;
-	}
-
-	if (puffs_nextdent(&dh->d, name, dino, dtype, &dh->reslen)) {
-		return 0;
-	}
-
-	/* try to increase buffer space */
-	dh->dbuf = realloc(dh->dbuf, dh->bufsize + DIR_CHUNKSIZE);
-	if (dh->dbuf == NULL) {
-		abort();
-	}
-	dh->d = (void *)((uint8_t *)dh->dbuf + (dh->bufsize - dh->reslen));
-	dh->reslen += DIR_CHUNKSIZE;
-	dh->bufsize += DIR_CHUNKSIZE;
-
-	return !puffs_nextdent(&dh->d, name, dino, dtype, &dh->reslen);
-}
-
-/* ARGSUSED3 */
-/* XXX: I have no idea how "off" is supposed to be used */
-static int
-puffs_fuse_fill_dir(void *buf, const char *name,
-	const struct stat *stbuf, off_t off)
-{
-	struct puffs_fuse_dirh *deh = buf;
-	ino_t dino;
-	uint8_t dtype;
-
-	if (stbuf == NULL) {
-		dtype = DT_UNKNOWN;
-		dino = fakeino++;
-	} else {
-		dtype = puffs_vtype2dt(puffs_mode2vt(stbuf->st_mode));
-		dino = stbuf->st_ino;
-
-		/*
-		 * Some FUSE file systems like to always use 0 as the
-		 * inode number.   Our readdir() doesn't like to show
-		 * directory entries with inode number 0 ==> workaround.
-		 */
-		if (dino == 0) {
-			dino = fakeino++;
-		}
-	}
-
-	return fill_dirbuf(deh, name, dino, dtype);
-}
-
-static int
-puffs_fuse_dirfil(fuse_dirh_t h, const char *name, int type, ino_t ino)
-{
-	ino_t dino;
-	int dtype;
-
-	if ((dtype = type) == 0) {
-		dtype = DT_UNKNOWN;
-	}
-
-	dino = (ino) ? ino : fakeino++;
-
-	return fill_dirbuf(h, name, dino, dtype);
-}
-
-/* place the refuse file system name into `name' */
-static void
-set_refuse_mount_name(char **argv, char *name, size_t size)
-{
-	char	*slash;
-
-	if (argv == NULL || *argv == NULL) {
-		(void) strlcpy(name, "refuse", size);
-	} else {
-		if ((slash = strrchr(*argv, '/')) == NULL) {
-			slash = *argv;
-		} else {
-			slash += 1;
-		}
-		if (strncmp(*argv, "refuse:", 7) == 0) {
-			/* we've already done this */
-			(void) strlcpy(name, *argv, size);
-		} else {
-			(void) snprintf(name, size, "refuse:%s", slash);
-		}
-	}
-}
-
-
-/* this function exposes struct fuse to userland */
-static struct fuse *
-fuse_setup_real(int argc, char **argv, const struct fuse_operations *ops,
-	size_t size, char **mountpoint, int *multithreaded, int *fd,
-        void *user_data)
-{
-	struct fuse_chan	*fc;
-	struct fuse_args	*args;
-	struct fuse		*fuse;
-	char			 name[64];
-	int			 i;
-
-	/* set up the proper name */
-	set_refuse_mount_name(argv, name, sizeof(name));
-
-	/* grab the pthread context key */
-	if (!create_context_key()) {
-		return NULL;
-	}
-
-	/* stuff name into fuse_args */
-	args = fuse_opt_deep_copy_args(argc, argv);
-	if (args->argc > 0) {
-		free(args->argv[0]);
-	}
-	if ((args->argv[0] = strdup(name)) == NULL) {
-		fuse_opt_free_args(args);
-		return NULL;
-	}
-
-	/* count back from the end over arguments starting with '-' */
-	for (i = argc - 1 ; i > 0 && *argv[i] == '-' ; --i) {
-	}
-
-	fc = fuse_mount(*mountpoint = argv[i], args);
-	fuse = fuse_new(fc, args, ops, size, user_data);
-
-	fuse_opt_free_args(args);
-	free(args);
-
-	/* XXX - wait for puffs to become multi-threaded */
-	if (multithreaded) {
-		*multithreaded = 0;
-	}
-
-	/* XXX - this is unused */
-	if (fd) {
-		*fd = 0;
-	}
-
-	return fuse;
-}
-
-#ifdef fuse_setup
-#undef fuse_setup
-#endif
-
-struct fuse *
-fuse_setup(int argc, char **argv, const struct fuse_operations *ops,
-	size_t size, char **mountpoint, int *multithreaded, int *fd)
-{
-    return fuse_setup_real(argc, argv, ops, size, mountpoint,
-	multithreaded, fd, NULL);
-}
-
-struct fuse *
-fuse_setup26(int argc, char **argv, const struct fuse_operations *ops,
-	size_t size, char **mountpoint, int *multithreaded, void *user_data)
-{
-    return fuse_setup_real(argc, argv, ops, size, mountpoint,
-	multithreaded, NULL, user_data);
-}
-
-#define FUSE_ERR_UNLINK(fuse, file) if (fuse->op.unlink) fuse->op.unlink(file)
-#define FUSE_ERR_RMDIR(fuse, dir) if (fuse->op.rmdir) fuse->op.rmdir(dir)
-
-/* ARGSUSED1 */
-static int
-fuse_getattr(struct fuse *fuse, struct puffs_node *pn, const char *path,
-	struct vattr *va)
-{
-	struct stat		 st;
-	int			ret;
-
-	if (fuse->op.getattr == NULL) {
-		return ENOSYS;
-	}
-
-	/* wrap up return code */
-	memset(&st, 0, sizeof(st));
-	ret = (*fuse->op.getattr)(path, &st);
-
-	if (ret == 0) {
-		if (st.st_blksize == 0)
-			st.st_blksize = DEV_BSIZE;
-		puffs_stat2vattr(va, &st);
-	}
-
-	return -ret;
-}
-
-/* utility function to set various elements of the attribute */
-static int
-fuse_setattr(struct fuse *fuse, struct puffs_node *pn, const char *path,
-	const struct vattr *va)
-{
-	struct refusenode	*rn = pn->pn_data;
-	mode_t			mode;
-	uid_t			uid;
-	gid_t			gid;
-	int			error, ret;
-
-	error = 0;
-
-	mode = va->va_mode;
-	uid = va->va_uid;
-	gid = va->va_gid;
-
-	if (mode != (mode_t)PUFFS_VNOVAL) {
-		ret = 0;
-
-		if (fuse->op.chmod == NULL) {
-			error = -ENOSYS;
-		} else {
-			ret = fuse->op.chmod(path, mode);
-			if (ret)
-				error = ret;
-		}
-	}
-	if (uid != (uid_t)PUFFS_VNOVAL || gid != (gid_t)PUFFS_VNOVAL) {
-		ret = 0;
-
-		if (fuse->op.chown == NULL) {
-			error = -ENOSYS;
-		} else {
-			ret = fuse->op.chown(path, uid, gid);
-			if (ret)
-				error = ret;
-		}
-	}
-	if (va->va_atime.tv_sec != (time_t)PUFFS_VNOVAL
-	    || va->va_mtime.tv_sec != (long)PUFFS_VNOVAL) {
-		ret = 0;
-
-		if (fuse->op.utimens) {
-			struct timespec tv[2];
-
-			tv[0].tv_sec = va->va_atime.tv_sec;
-			tv[0].tv_nsec = va->va_atime.tv_nsec;
-			tv[1].tv_sec = va->va_mtime.tv_sec;
-			tv[1].tv_nsec = va->va_mtime.tv_nsec;
-
-			ret = fuse->op.utimens(path, tv);
-		} else if (fuse->op.utime) {
-			struct utimbuf timbuf;
-
-			timbuf.actime = va->va_atime.tv_sec;
-			timbuf.modtime = va->va_mtime.tv_sec;
-
-			ret = fuse->op.utime(path, &timbuf);
-		} else {
-			error = -ENOSYS;
-		}
-
-		if (ret)
-			error = ret;
-	}
-	if (va->va_size != (u_quad_t)PUFFS_VNOVAL) {
-		ret = 0;
-
-		if (fuse->op.truncate) {
-			ret = fuse->op.truncate(path, (off_t)va->va_size);
-		} else if (fuse->op.ftruncate) {
-			ret = fuse->op.ftruncate(path, (off_t)va->va_size,
-			    &rn->file_info);
-		} else {
-			error = -ENOSYS;
-		}
-
-		if (ret)
-			error = ret;
-	}
-	/* XXX: no reflection with reality */
-	puffs_setvattr(&pn->pn_va, va);
-
-	return -error;
-
-}
-
-static int
-fuse_newnode(struct puffs_usermount *pu, const char *path,
-	const struct vattr *va, struct fuse_file_info *fi,
-	struct puffs_newinfo *pni, struct puffs_node **pn_new)
-{
-	struct puffs_node	*pn;
-	struct refusenode	*rn;
-	struct vattr		 newva;
-	struct fuse		*fuse;
-
-	fuse = puffs_getspecific(pu);
-
-	/* fix up nodes */
-	pn = newrn(pu);
-	if (pn == NULL) {
-		if (va->va_type == VDIR) {
-			FUSE_ERR_RMDIR(fuse, path);
-		} else {
-			FUSE_ERR_UNLINK(fuse, path);
-		}
-		return ENOMEM;
-	}
-	fuse_setattr(fuse, pn, path, va);
-	if (fuse_getattr(fuse, pn, path, &newva) == 0)
-		puffs_setvattr(&pn->pn_va, &newva);
-
-	rn = pn->pn_data;
-	if (fi)
-		memcpy(&rn->file_info, fi, sizeof(struct fuse_file_info));
-
-	puffs_newinfo_setcookie(pni, pn);
-	if (pn_new)
-		*pn_new = pn;
-
-	return 0;
-}
-
-
-/* operation wrappers start here */
-
-/* lookup the path */
-/* ARGSUSED1 */
-static int
-puffs_fuse_node_lookup(struct puffs_usermount *pu, void *opc,
-	struct puffs_newinfo *pni, const struct puffs_cn *pcn)
-{
-	struct puffs_node	*pn_res;
-	struct stat		 st;
-	struct fuse		*fuse;
-	const char		*path = PCNPATH(pcn);
-	int			 ret;
-
-	fuse = puffs_getspecific(pu);
-
-	set_fuse_context_uid_gid(pcn->pcn_cred);
-
-	ret = fuse->op.getattr(path, &st);
-
-	if (ret != 0) {
-		return -ret;
-	}
-
-	/* XXX: fiXXXme unconst */
-	pn_res = puffs_pn_nodewalk(pu, puffs_path_walkcmp,
-	    __UNCONST(&pcn->pcn_po_full));
-	if (pn_res == NULL) {
-		pn_res = newrn(pu);
-		if (pn_res == NULL)
-			return errno;
-		puffs_stat2vattr(&pn_res->pn_va, &st);
-	}
-
-	puffs_newinfo_setcookie(pni, pn_res);
-	puffs_newinfo_setvtype(pni, pn_res->pn_va.va_type);
-	puffs_newinfo_setsize(pni, (voff_t)pn_res->pn_va.va_size);
-	puffs_newinfo_setrdev(pni, pn_res->pn_va.va_rdev);
-
-	return 0;
-}
-
-/* get attributes for the path name */
-/* ARGSUSED3 */
-static int
-puffs_fuse_node_getattr(struct puffs_usermount *pu, void *opc, struct vattr *va,
-	const struct puffs_cred *pcr) 
-{
-	struct puffs_node	*pn = opc;
-	struct fuse		*fuse;
-	const char		*path = PNPATH(pn);
-
-	fuse = puffs_getspecific(pu);
-
-	set_fuse_context_uid_gid(pcr);
-
-	return fuse_getattr(fuse, pn, path, va);
-}
-
-/* read the contents of the symbolic link */
-/* ARGSUSED2 */
-static int
-puffs_fuse_node_readlink(struct puffs_usermount *pu, void *opc,
-	const struct puffs_cred *cred, char *linkname, size_t *linklen)
-{
-	struct puffs_node	*pn = opc;
-	struct fuse		*fuse;
-	const char		*path = PNPATH(pn), *p;
-	int			ret;
-
-	fuse = puffs_getspecific(pu);
-	if (fuse->op.readlink == NULL) {
-		return ENOSYS;
-	}
-
-	set_fuse_context_uid_gid(cred);
-
-	/* wrap up return code */
-	ret = (*fuse->op.readlink)(path, linkname, *linklen);
-
-	if (ret == 0) {
-		p = memchr(linkname, '\0', *linklen);
-		if (!p)
-			return EINVAL;
-
-		*linklen = p - linkname;
-	}
-
-	return -ret;
-}
-
-/* make the special node */
-/* ARGSUSED1 */
-static int
-puffs_fuse_node_mknod(struct puffs_usermount *pu, void *opc,
-	struct puffs_newinfo *pni, const struct puffs_cn *pcn,
-	const struct vattr *va)
-{
-	struct fuse		*fuse;
-	mode_t			 mode;
-	const char		*path = PCNPATH(pcn);
-	int			ret;
-
-	fuse = puffs_getspecific(pu);
-	if (fuse->op.mknod == NULL) {
-		return ENOSYS;
-	}
-
-	set_fuse_context_uid_gid(pcn->pcn_cred);
-
-	/* wrap up return code */
-	mode = puffs_addvtype2mode(va->va_mode, va->va_type);
-	ret = (*fuse->op.mknod)(path, mode, va->va_rdev);
-
-	if (ret == 0) {
-		ret = fuse_newnode(pu, path, va, NULL, pni, NULL);
-	}
-
-	return -ret;
-}
-
-/* make a directory */
-/* ARGSUSED1 */
-static int
-puffs_fuse_node_mkdir(struct puffs_usermount *pu, void *opc,
-	struct puffs_newinfo *pni, const struct puffs_cn *pcn,
-	const struct vattr *va)
-{
-	struct fuse		*fuse;
-	mode_t			 mode = va->va_mode;
-	const char		*path = PCNPATH(pcn);
-	int			ret;
-
-	fuse = puffs_getspecific(pu);
-
-	set_fuse_context_uid_gid(pcn->pcn_cred);
-
-	if (fuse->op.mkdir == NULL) {
-		return ENOSYS;
-	}
-
-	/* wrap up return code */
-	ret = (*fuse->op.mkdir)(path, mode);
-
-	if (ret == 0) {
-		ret = fuse_newnode(pu, path, va, NULL, pni, NULL);
-	}
-
-	return -ret;
-}
-
-/*
- * create a regular file
- *
- * since linux/fuse sports using mknod for creating regular files
- * instead of having a separate call for it in some versions, if
- * we don't have create, just jump to op->mknod.
- */
-/*ARGSUSED1*/
-static int
-puffs_fuse_node_create(struct puffs_usermount *pu, void *opc,
-	struct puffs_newinfo *pni, const struct puffs_cn *pcn,
-	const struct vattr *va)
-{
-	struct fuse		*fuse;
-	struct fuse_file_info	fi;
-	struct puffs_node	*pn;
-	mode_t			mode = va->va_mode;
-	const char		*path = PCNPATH(pcn);
-	int			ret, created;
-
-	fuse = puffs_getspecific(pu);
-
-	set_fuse_context_uid_gid(pcn->pcn_cred);
-
-	created = 0;
-	if (fuse->op.create) {
-		ret = fuse->op.create(path, mode | S_IFREG, &fi);
-		if (ret == 0)
-			created = 1;
-
-	} else if (fuse->op.mknod) {
-		ret = fuse->op.mknod(path, mode | S_IFREG, 0);
-
-	} else {
-		ret = -ENOSYS;
-	}
-
-	if (ret == 0) {
-		ret = fuse_newnode(pu, path, va, &fi, pni, &pn);
-
-		/* sweet..  create also open the file */
-		if (created) {
-			struct refusenode *rn;
-
-			rn = pn->pn_data;
-			rn->flags |= RN_OPEN;
-			rn->opencount++;
-		}
-	}
-
-	return -ret;
-}
-
-/* remove the directory entry */
-/* ARGSUSED1 */
-static int
-puffs_fuse_node_remove(struct puffs_usermount *pu, void *opc, void *targ,
-	const struct puffs_cn *pcn)
-{
-	struct puffs_node	*pn_targ = targ;
-	struct fuse		*fuse;
-	const char		*path = PNPATH(pn_targ);
-	int			ret;
-
-	fuse = puffs_getspecific(pu);
-
-	set_fuse_context_uid_gid(pcn->pcn_cred);
-
-	if (fuse->op.unlink == NULL) {
-		return ENOSYS;
-	}
-
-	/* wrap up return code */
-	ret = (*fuse->op.unlink)(path);
-
-	return -ret;
-}
-
-/* remove the directory */
-/* ARGSUSED1 */
-static int
-puffs_fuse_node_rmdir(struct puffs_usermount *pu, void *opc, void *targ,
-	const struct puffs_cn *pcn)
-{
-	struct puffs_node	*pn_targ = targ;
-	struct fuse		*fuse;
-	const char		*path = PNPATH(pn_targ);
-	int			ret;
-
-	fuse = puffs_getspecific(pu);
-
-	set_fuse_context_uid_gid(pcn->pcn_cred);
-
-	if (fuse->op.rmdir == NULL) {
-		return ENOSYS;
-	}
-
-	/* wrap up return code */
-	ret = (*fuse->op.rmdir)(path);
-
-	return -ret;
-}
-
-/* create a symbolic link */
-/* ARGSUSED1 */
-static int
-puffs_fuse_node_symlink(struct puffs_usermount *pu, void *opc,
-	struct puffs_newinfo *pni, const struct puffs_cn *pcn_src,
-	const struct vattr *va, const char *link_target)
-{
-	struct fuse		*fuse;
-	const char		*path = PCNPATH(pcn_src);
-	int			ret;
-
-	fuse = puffs_getspecific(pu);
-
-	set_fuse_context_uid_gid(pcn_src->pcn_cred);
-
-	if (fuse->op.symlink == NULL) {
-		return ENOSYS;
-	}
-
-	/* wrap up return code */
-	ret = fuse->op.symlink(link_target, path);
-
-	if (ret == 0) {
-		ret = fuse_newnode(pu, path, va, NULL, pni, NULL);
-	}
-
-	return -ret;
-}
-
-/* rename a directory entry */
-/* ARGSUSED1 */
-static int
-puffs_fuse_node_rename(struct puffs_usermount *pu, void *opc, void *src,
-	const struct puffs_cn *pcn_src, void *targ_dir, void *targ,
-	const struct puffs_cn *pcn_targ)
-{
-	struct fuse		*fuse;
-	const char		*path_src = PCNPATH(pcn_src);
-	const char		*path_dest = PCNPATH(pcn_targ);
-	int			ret;
-
-	fuse = puffs_getspecific(pu);
-
-	set_fuse_context_uid_gid(pcn_targ->pcn_cred);
-
-	if (fuse->op.rename == NULL) {
-		return ENOSYS;
-	}
-
-	ret = fuse->op.rename(path_src, path_dest);
-
-	if (ret == 0) {
-	}
-
-	return -ret;
-}
-
-/* create a link in the file system */
-/* ARGSUSED1 */
-static int
-puffs_fuse_node_link(struct puffs_usermount *pu, void *opc, void *targ,
-	const struct puffs_cn *pcn)
-{
-	struct puffs_node	*pn = targ;
-	struct fuse		*fuse;
-	int			ret;
-
-	fuse = puffs_getspecific(pu);
-
-	set_fuse_context_uid_gid(pcn->pcn_cred);
-
-	if (fuse->op.link == NULL) {
-		return ENOSYS;
-	}
-
-	/* wrap up return code */
-	ret = (*fuse->op.link)(PNPATH(pn), PCNPATH(pcn));
-
-	return -ret;
-}
-
-/*
- * fuse's regular interface provides chmod(), chown(), utimes()
- * and truncate() + some variations, so try to fit the square block
- * in the circle hole and the circle block .... something like that
- */
-/* ARGSUSED3 */
-static int
-puffs_fuse_node_setattr(struct puffs_usermount *pu, void *opc,
-	const struct vattr *va, const struct puffs_cred *pcr)
-{
-	struct puffs_node	*pn = opc;
-	struct fuse		*fuse;
-	const char		*path = PNPATH(pn);
-
-	fuse = puffs_getspecific(pu);
-
-	set_fuse_context_uid_gid(pcr);
-
-	return fuse_setattr(fuse, pn, path, va);
-}
-
-/* ARGSUSED2 */
-static int
-puffs_fuse_node_open(struct puffs_usermount *pu, void *opc, int mode,
-	const struct puffs_cred *cred)
-{
-	struct puffs_node	*pn = opc;
-	struct refusenode	*rn = pn->pn_data;
-	struct fuse_file_info	*fi = &rn->file_info;
-	struct fuse		*fuse;
-	const char		*path = PNPATH(pn);
-
-	fuse = puffs_getspecific(pu);
-
-	set_fuse_context_uid_gid(cred);
-
-	/* if open, don't open again, lest risk nuking file private info */
-	if (rn->flags & RN_OPEN) {
-		rn->opencount++;
-		return 0;
-	}
-
-	/* OFLAGS(), need to convert FREAD/FWRITE to O_RD/WR */
-	fi->flags = (mode & ~(O_CREAT | O_EXCL | O_TRUNC)) - 1;
-
-	if (pn->pn_va.va_type == VDIR) {
-		if (fuse->op.opendir)
-			fuse->op.opendir(path, fi);
-	} else {
-		if (fuse->op.open)
-			fuse->op.open(path, fi);
-	}
-
-	rn->flags |= RN_OPEN;
-	rn->opencount++;
-
-	return 0;
-}
-
-/* ARGSUSED2 */
-static int
-puffs_fuse_node_close(struct puffs_usermount *pu, void *opc, int fflag,
-	const struct puffs_cred *pcr)
-{
-	struct puffs_node	*pn = opc;
-	struct refusenode	*rn = pn->pn_data;
-	struct fuse		*fuse;
-	struct fuse_file_info	*fi;
-	const char		*path = PNPATH(pn);
-	int			ret;
-
-	fuse = puffs_getspecific(pu);
-	fi = &rn->file_info;
-	ret = 0;
-
-	set_fuse_context_uid_gid(pcr);
-
-	if (rn->flags & RN_OPEN) {
-		if (pn->pn_va.va_type == VDIR) {
-			if (fuse->op.releasedir)
-				ret = fuse->op.releasedir(path, fi);
-		} else {
-			if (fuse->op.release)
-				ret = fuse->op.release(path, fi);
-		}
-	}
-	rn->flags &= ~RN_OPEN;
-	rn->opencount--;
-
-	return ret;
-}
-
-/* read some more from the file */
-/* ARGSUSED5 */
-static int
-puffs_fuse_node_read(struct puffs_usermount *pu, void *opc, uint8_t *buf,
-	off_t offset, size_t *resid, const struct puffs_cred *pcr,
-	int ioflag)
-{
-	struct puffs_node	*pn = opc;
-	struct refusenode	*rn = pn->pn_data;
-	struct fuse		*fuse;
-	const char		*path = PNPATH(pn);
-	size_t			maxread;
-	int			ret;
-
-	fuse = puffs_getspecific(pu);
-	if (fuse->op.read == NULL) {
-		return ENOSYS;
-	}
-
-	set_fuse_context_uid_gid(pcr);
-
-	maxread = *resid;
-	if (maxread > pn->pn_va.va_size - offset) {
-		/*LINTED*/
-		maxread = pn->pn_va.va_size - offset;
-	}
-	if (maxread == 0)
-		return 0;
-
-	ret = (*fuse->op.read)(path, (char *)buf, maxread, offset,
-	    &rn->file_info);
-
-	if (ret > 0) {
-		*resid -= ret;
-		ret = 0;
-	}
-
-	return -ret;
-}
-
-/* write to the file */
-/* ARGSUSED0 */
-static int
-puffs_fuse_node_write(struct puffs_usermount *pu, void *opc, uint8_t *buf,
-	off_t offset, size_t *resid, const struct puffs_cred *pcr,
-	int ioflag)
-{
-	struct puffs_node	*pn = opc;
-	struct refusenode	*rn = pn->pn_data;
-	struct fuse		*fuse;
-	const char		*path = PNPATH(pn);
-	int			ret;
-
-	fuse = puffs_getspecific(pu);
-	if (fuse->op.write == NULL) {
-		return ENOSYS;
-	}
-
-	set_fuse_context_uid_gid(pcr);
-
-	if (ioflag & PUFFS_IO_APPEND)
-		offset = pn->pn_va.va_size;
-
-	ret = (*fuse->op.write)(path, (char *)buf, *resid, offset,
-	    &rn->file_info);
-
-	if (ret >= 0) {
-		if ((uint64_t)(offset + ret) > pn->pn_va.va_size)
-			pn->pn_va.va_size = offset + ret;
-		*resid -= ret;
-		ret = (*resid == 0) ? 0 : ENOSPC;
-	} else {
-		ret = -ret;
-	}
-
-	return ret;
-}
-
-
-/* ARGSUSED3 */
-static int
-puffs_fuse_node_readdir(struct puffs_usermount *pu, void *opc,
-	struct dirent *dent, off_t *readoff, size_t *reslen,
-	const struct puffs_cred *pcr, int *eofflag,
-	off_t *cookies, size_t *ncookies)
-{
-	struct puffs_node	*pn = opc;
-	struct refusenode	*rn = pn->pn_data;
-	struct puffs_fuse_dirh	*dirh;
-	struct fuse		*fuse;
-	struct dirent		*fromdent;
-	const char		*path = PNPATH(pn);
-	int			ret;
-
-	fuse = puffs_getspecific(pu);
-	if (fuse->op.readdir == NULL && fuse->op.getdir == NULL) {
-		return ENOSYS;
-	}
-
-	set_fuse_context_uid_gid(pcr);
-
-	if (pn->pn_va.va_type != VDIR)
-		return ENOTDIR;
-
-	dirh = &rn->dirh;
-
-	/*
-	 * if we are starting from the beginning, slurp entire directory
-	 * into our buffers
-	 */
-	if (*readoff == 0) {
-		/* free old buffers */
-		free(dirh->dbuf);
-		memset(dirh, 0, sizeof(struct puffs_fuse_dirh));
-
-		if (fuse->op.readdir)
-			ret = fuse->op.readdir(path, dirh, puffs_fuse_fill_dir,
-			    0, &rn->file_info);
-		else
-			ret = fuse->op.getdir(path, dirh, puffs_fuse_dirfil);
-		if (ret)
-			return -ret;
-	}
-
-        /* Both op.readdir and op.getdir read full directory */
-        *eofflag = 1;
-
-	/* now, stuff results into the kernel buffers */
-	while (*readoff < (off_t)(dirh->bufsize - dirh->reslen)) {
-		/*LINTED*/
-		fromdent = (struct dirent *)((uint8_t *)dirh->dbuf + *readoff);
-
-		if (*reslen < _DIRENT_SIZE(fromdent))
-			break;
-
-		memcpy(dent, fromdent, _DIRENT_SIZE(fromdent));
-		*readoff += _DIRENT_SIZE(fromdent);
-		*reslen -= _DIRENT_SIZE(fromdent);
-
-		dent = _DIRENT_NEXT(dent);
-	}
-
-	return 0;
-}
-
-/* ARGSUSED */
-static int
-puffs_fuse_node_reclaim(struct puffs_usermount *pu, void *opc)
-{
-	struct puffs_node	*pn = opc;
-
-	nukern(pn);
-	return 0;
-}
-
-/* ARGSUSED1 */
-static int
-puffs_fuse_fs_unmount(struct puffs_usermount *pu, int flags)
-{
-	struct fuse		*fuse;
-
-	fuse = puffs_getspecific(pu);
-	if (fuse->op.destroy == NULL) {
-		return 0;
-	}
-	(*fuse->op.destroy)(fuse);
-        return 0;
-}
-
-/* ARGSUSED0 */
-static int
-puffs_fuse_fs_sync(struct puffs_usermount *pu, int flags,
-            const struct puffs_cred *cr)
-{
-	set_fuse_context_uid_gid(cr);
-        return 0;
-}
-
-/* ARGSUSED2 */
-static int
-puffs_fuse_fs_statvfs(struct puffs_usermount *pu, struct statvfs *svfsb)
-{
-	struct fuse		*fuse;
-	int			ret;
-
-	fuse = puffs_getspecific(pu);
-	if (fuse->op.statfs == NULL) {
-		if ((ret = statvfs(PNPATH(puffs_getroot(pu)), svfsb)) == -1) {
-			return errno;
-		}
-	} else {
-		ret = fuse->op.statfs(PNPATH(puffs_getroot(pu)), svfsb);
-	}
-
-        return -ret;
-}
-
-
-/* End of puffs_fuse operations */
-/* ARGSUSED3 */
-int
-fuse_main_real(int argc, char **argv, const struct fuse_operations *ops,
-	size_t size, void *userdata)
-{
-	struct fuse	*fuse;
-	char		*mountpoint;
-	int		 multithreaded;
-	int		 fd;
-
-	fuse = fuse_setup_real(argc, argv, ops, size, &mountpoint,
-	    &multithreaded, &fd, userdata);
-
-	return fuse_loop(fuse);
-}
-
-/*
- * XXX: just defer the operation until fuse_new() when we have more
- * info on our hands.  The real beef is why's this separate in fuse in
- * the first place?
- */
-/* ARGSUSED1 */
-struct fuse_chan *
-fuse_mount(const char *dir, struct fuse_args *args)
-{
- 	struct fuse_chan	*fc;
-	char			 name[64];
-
-	if ((fc = calloc(1, sizeof(*fc))) == NULL) {
-		err(EXIT_FAILURE, "fuse_mount");
-	}
-	fc->dead = 0;
-
-	if ((fc->dir = strdup(dir)) == NULL) {
-		err(EXIT_FAILURE, "fuse_mount");
-	}
-
-	/*
-	 * we need to deep copy the args struct - some fuse file
-	 * systems "clean up" the argument vector for "security
-	 * reasons"
-	 */
-	fc->args = fuse_opt_deep_copy_args(args->argc, args->argv);
-
-	if (args->argc > 0) {
-		set_refuse_mount_name(args->argv, name, sizeof(name));
-		if ((args->argv[0] = strdup(name)) == NULL)
-			err(1, "fuse_mount");
-	}
-	
-	return fc;
-}
-
-/* ARGSUSED1 */
-struct fuse *
-fuse_new(struct fuse_chan *fc, struct fuse_args *args,
-	const struct fuse_operations *ops, size_t size, void *userdata)
-{
-	struct puffs_usermount	*pu;
-	struct fuse_context	*fusectx;
-	struct puffs_pathobj	*po_root;
-	struct puffs_node	*pn_root;
-	struct puffs_ops	*pops;
-	struct refusenode	*rn_root;
-	struct statvfs		 svfsb;
-	struct stat		 st;
-	struct fuse		*fuse;
-	extern int		 puffs_fakecc;
-	char			 name[64];
-	char			*argv0;
-
-	if ((fuse = calloc(1, sizeof(*fuse))) == NULL) {
-		err(EXIT_FAILURE, "fuse_new");
-	}
-
-	/* copy fuse ops to their own structure */
-	(void) memcpy(&fuse->op, ops, sizeof(fuse->op));
-
-	fusectx = fuse_get_context();
-	fusectx->fuse = fuse;
-	fusectx->uid = 0;
-	fusectx->gid = 0;
-	fusectx->pid = 0;
-	fusectx->private_data = userdata;
-
-	fuse->fc = fc;
-
-	if (fuse->op.init != NULL)
-		fusectx->private_data = fuse->op.init(NULL); /* XXX */
-
-	/* initialise the puffs operations structure */
-        PUFFSOP_INIT(pops);
-
-        PUFFSOP_SET(pops, puffs_fuse, fs, sync);
-        PUFFSOP_SET(pops, puffs_fuse, fs, statvfs);
-        PUFFSOP_SET(pops, puffs_fuse, fs, unmount);
-
-	/*
-	 * XXX: all of these don't possibly need to be
-	 * unconditionally set
-	 */
-        PUFFSOP_SET(pops, puffs_fuse, node, lookup);
-        PUFFSOP_SET(pops, puffs_fuse, node, getattr);
-        PUFFSOP_SET(pops, puffs_fuse, node, setattr);
-        PUFFSOP_SET(pops, puffs_fuse, node, readdir);
-        PUFFSOP_SET(pops, puffs_fuse, node, readlink);
-        PUFFSOP_SET(pops, puffs_fuse, node, mknod);
-        PUFFSOP_SET(pops, puffs_fuse, node, create);
-        PUFFSOP_SET(pops, puffs_fuse, node, remove);
-        PUFFSOP_SET(pops, puffs_fuse, node, mkdir);
-        PUFFSOP_SET(pops, puffs_fuse, node, rmdir);
-        PUFFSOP_SET(pops, puffs_fuse, node, symlink);
-        PUFFSOP_SET(pops, puffs_fuse, node, rename);
-        PUFFSOP_SET(pops, puffs_fuse, node, link);
-        PUFFSOP_SET(pops, puffs_fuse, node, open);
-        PUFFSOP_SET(pops, puffs_fuse, node, close);
-        PUFFSOP_SET(pops, puffs_fuse, node, read);
-        PUFFSOP_SET(pops, puffs_fuse, node, write);
-        PUFFSOP_SET(pops, puffs_fuse, node, reclaim);
-
-	argv0 = (*args->argv[0] == 0x0) ? fc->args->argv[0] : args->argv[0];
-	set_refuse_mount_name(&argv0, name, sizeof(name));
-
-	puffs_fakecc = 1; /* XXX */
-	pu = puffs_init(pops, _PATH_PUFFS, name, fuse,
-			 PUFFS_FLAG_BUILDPATH
-			   | PUFFS_FLAG_HASHPATH
-			   | PUFFS_KFLAG_NOCACHE);
-	if (pu == NULL) {
-		err(EXIT_FAILURE, "puffs_init");
-	}
-	fc->pu = pu;
-
-	pn_root = newrn(pu);
-	puffs_setroot(pu, pn_root);
-	rn_root = pn_root->pn_data;
-	rn_root->flags |= RN_ROOT;
-
-	po_root = puffs_getrootpathobj(pu);
-	if ((po_root->po_path = strdup("/")) == NULL)
-		err(1, "fuse_new");
-	po_root->po_len = 1;
-	puffs_path_buildhash(pu, po_root);
-
-	/* sane defaults */
-	puffs_vattr_null(&pn_root->pn_va);
-	pn_root->pn_va.va_type = VDIR;
-	pn_root->pn_va.va_mode = 0755;
-	if (fuse->op.getattr)
-		if (fuse->op.getattr(po_root->po_path, &st) == 0)
-			puffs_stat2vattr(&pn_root->pn_va, &st);
-	assert(pn_root->pn_va.va_type == VDIR);
-
-	puffs_set_prepost(pu, set_fuse_context_pid, NULL);
-
-	puffs_zerostatvfs(&svfsb);
-	if (puffs_mount(pu, fc->dir, MNT_NODEV | MNT_NOSUID, pn_root) == -1) {
-		err(EXIT_FAILURE, "puffs_mount: directory \"%s\"", fc->dir);
-	}
-
-	return fuse;
-}
-
-int
-fuse_loop(struct fuse *fuse)
-{
-
-	return puffs_mainloop(fuse->fc->pu);
-}
-
-void
-fuse_destroy(struct fuse *fuse)
-{
-
-	/*
-	 * TODO: needs to assert the fs is quiescent, i.e. no other
-	 * threads exist
-	 */
-
-	delete_context_key();
-	/* XXXXXX: missing stuff */
-	free(fuse);
-}
-
-void
-fuse_exit(struct fuse *fuse)
-{
-	
-	/* XXX: puffs_exit() is WRONG */
-	if (fuse->fc->dead == 0)
-		puffs_exit(fuse->fc->pu, 1);
-	fuse->fc->dead = 1;
-}
-
-/*
- * XXX: obviously not the most perfect of functions, but needs some
- * puffs tweaking for a better tomorrow
- */
-/*ARGSUSED*/
-void
-fuse_unmount(const char *mp, struct fuse_chan *fc)
-{
-
-	/* XXX: puffs_exit() is WRONG */
-	if (fc->dead == 0)
-		puffs_exit(fc->pu, 1);
-	fc->dead = 1;
-}
-
-/*ARGSUSED*/
-void
-fuse_unmount_compat22(const char *mp)
-{
-
-	return;
-}
-
-/* The next function "exposes" struct fuse to userland.  Not much
-* that we can do about this, as we're conforming to a defined
-* interface.  */
-
-void
-fuse_teardown(struct fuse *fuse, char *mountpoint)
-{
-	fuse_unmount(mountpoint, fuse->fc);
-	fuse_destroy(fuse);
-}
diff --git a/lib/librefuse/refuse_opt.c b/lib/librefuse/refuse_opt.c
deleted file mode 100644
index 5b222585d..000000000
--- a/lib/librefuse/refuse_opt.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/* 	$NetBSD: refuse_opt.c,v 1.15 2011/03/01 11:23:42 soda Exp $	*/
-
-/*-
- * Copyright (c) 2007 Juan Romero Pardines.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-/*
- * TODO:
- * 	* -oblah,foo... works, but the options are not enabled.
- * 	* -ofoo=%s (accepts a string) or -ofoo=%u (int) is not
- * 	  supported for now.
- * 	* void *data: how is it used? I think it's used to enable
- * 	  options or pass values for the matching options.
- */
-
-#include <sys/types.h>
-
-#include <err.h>
-#include <fuse.h>
-#include <fuse_opt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef FUSE_OPT_DEBUG
-#define DPRINTF(x)	do { printf x; } while ( /* CONSTCOND */ 0)
-#else
-#define DPRINTF(x)
-#endif
-
-enum {
-	KEY_HELP,
-	KEY_VERBOSE,
-	KEY_VERSION
-};
-
-struct fuse_opt_option {
-	const struct fuse_opt *fop;
-	char *option;
-	int key;
-	void *data;
-};
-
-static int fuse_opt_popt(struct fuse_opt_option *, const struct fuse_opt *);
-
-/* 
- * Public API.
- *
- * The following functions always return 0:
- *
- * int	fuse_opt_add_opt(char **, const char *);
- *
- * We implement the next ones:
- *
- * int	fuse_opt_add_arg(struct fuse_args *, const char *);
- * void	fuse_opt_free_args(struct fuse_args *);
- * int	fuse_opt_insert_arg(struct fuse_args *, const char *);
- * int	fuse_opt_match(const struct fuse_opt *, const char *);
- * int	fuse_opt_parse(struct fuse_args *, void *,
- * 		       const struct fuse_opt *, fuse_opt_proc_t);
- *
- */
-
-/* ARGSUSED */
-int
-fuse_opt_add_arg(struct fuse_args *args, const char *arg)
-{
-	struct fuse_args	*ap;
-
-	if (args->allocated == 0) {
-		ap = fuse_opt_deep_copy_args(args->argc, args->argv);
-		args->argv = ap->argv;
-		args->argc = ap->argc;
-		args->allocated = ap->allocated;
-		(void) free(ap);
-	} else if (args->allocated == args->argc) {
-		void *a;
-		int na = args->allocated + 10;
-
-		if ((a = realloc(args->argv, na * sizeof(*args->argv))) == NULL)
-			return -1;
-
-		args->argv = a;
-		args->allocated = na;
-	}
-	DPRINTF(("%s: arguments passed: [arg:%s]\n", __func__, arg));
-	if ((args->argv[args->argc++] = strdup(arg)) == NULL)
-		err(1, "fuse_opt_add_arg");
-	args->argv[args->argc] = NULL;
-        return 0;
-}
-
-struct fuse_args *
-fuse_opt_deep_copy_args(int argc, char **argv)
-{
-	struct fuse_args	*ap;
-	int			 i;
-
-	if ((ap = malloc(sizeof(*ap))) == NULL)
-		err(1, "_fuse_deep_copy_args");
-	/* deep copy args structure into channel args */
-	ap->allocated = ((argc / 10) + 1) * 10;
-
-	if ((ap->argv = calloc((size_t)ap->allocated,
-	    sizeof(*ap->argv))) == NULL)
-		err(1, "_fuse_deep_copy_args");
-
-	for (i = 0; i < argc; i++) {
-		if ((ap->argv[i] = strdup(argv[i])) == NULL)
-			err(1, "_fuse_deep_copy_args");
-	}
-	ap->argv[ap->argc = i] = NULL;
-	return ap;
-}
-
-void
-fuse_opt_free_args(struct fuse_args *ap)
-{
-	int	i;
-
-	for (i = 0; i < ap->argc; i++) {
-		free(ap->argv[i]);
-	}
-	free(ap->argv);
-	ap->argv = NULL;
-	ap->allocated = ap->argc = 0;
-}
-
-/* ARGSUSED */
-int
-fuse_opt_insert_arg(struct fuse_args *args, int pos, const char *arg)
-{
-	int	i;
-	int	na;
-	void   *a;
-
-	DPRINTF(("%s: arguments passed: [pos=%d] [arg=%s]\n",
-	    __func__, pos, arg));
-	if (args->argv == NULL) {
-		na = 10;
-		a = malloc(na * sizeof(*args->argv));
-	} else {
-		na = args->allocated + 10;
-		a = realloc(args->argv, na * sizeof(*args->argv));
-	}
-	if (a == NULL) {
-		warn("fuse_opt_insert_arg");
-		return -1;
-	}
-	args->argv = a;
-	args->allocated = na;
-
-	for (i = args->argc++; i > pos; --i) {
-		args->argv[i] = args->argv[i - 1];
-	}
-	if ((args->argv[pos] = strdup(arg)) == NULL)
-		err(1, "fuse_opt_insert_arg");
-	args->argv[args->argc] = NULL;
-	return 0;
-}
-
-/* ARGSUSED */
-int fuse_opt_add_opt(char **opts, const char *opt)
-{
-	DPRINTF(("%s: arguments passed: [opts=%s] [opt=%s]\n",
-	    __func__, *opts, opt));
-	return 0;
-}
-
-/*
- * Returns 0 if opt was matched with any option from opts,
- * otherwise returns 1.
- */
-int
-fuse_opt_match(const struct fuse_opt *opts, const char *opt)
-{
-	while (opts++) {
-		if (strcmp(opt, opts->templ) == 0)
-			return 0;
-	}
-
-	return 1;
-}
-
-/*
- * Returns 0 if foo->option was matched with any option from opts,
- * and sets the following on match:
- *
- * 	* foo->key is set to the foo->fop->value if offset == -1.
- * 	* foo->fop points to the matched struct opts.
- *
- * otherwise returns 1.
- */
-static int
-fuse_opt_popt(struct fuse_opt_option *foo, const struct fuse_opt *opts)
-{
-	int i, found = 0;
-	char *match;
-	
-	if (!foo->option) {
-		(void)fprintf(stderr, "fuse: missing argument after -o\n");
-		return 1;
-	}
-	/* 
-	 * iterate over argv and opts to see
-	 * if there's a match with any template.
-	 */
-	for (match = strtok(foo->option, ",");
-	     match; match = strtok(NULL, ",")) {
-
-		DPRINTF(("%s: specified option='%s'\n", __func__, match));
-		found = 0;
-
-		for (i = 0; opts && opts->templ; opts++, i++) {
-
-			DPRINTF(("%s: opts->templ='%s' opts->offset=%d "
-			    "opts->value=%d\n", __func__, opts->templ,
-			    opts->offset, opts->value));
-
-			/* option is ok */
-			if (strcmp(match, opts->templ) == 0) {
-				DPRINTF(("%s: option matched='%s'\n",
-				    __func__, match));
-				found++;
-				/*
-				 * our fop pointer now points 
-				 * to the matched struct opts.
-				 */
-				foo->fop = opts;
-				/* 
-				 * assign default key value, necessary for
-				 * KEY_HELP, KEY_VERSION and KEY_VERBOSE.
-				 */
-				if (foo->fop->offset == -1)
-					foo->key = foo->fop->value;
-				/* reset counter */
-				opts -= i;
-				break;
-			}
-		}
-		/* invalid option */
-		if (!found) {
-			(void)fprintf(stderr, "fuse: '%s' is not a "
-			    "valid option\n", match);
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-/* ARGSUSED1 */
-int
-fuse_opt_parse(struct fuse_args *args, void *data,
-        const struct fuse_opt *opts, fuse_opt_proc_t proc)
-{
-	struct fuse_opt_option foo;
-	char *buf;
-	int i, rv = 0;
-
-	if (!args || !args->argv || !args->argc || !proc)
-		return 0;
-
-	foo.data = data;
-	if (args->argc == 1)
-		return proc(foo.data, *args->argv, FUSE_OPT_KEY_OPT, args);
-
-	/* the real loop to process the arguments */
-	for (i = 1; i < args->argc; i++) {
-
-		/* assign current argv string */
-		foo.option = buf = args->argv[i];
-
-		/* argvn != -foo... */
-		if (buf[0] != '-') {
-
-			foo.key = FUSE_OPT_KEY_NONOPT;
-			rv = proc(foo.data, foo.option, foo.key, args);
-			if (rv != 0)
-				break;
-
-		/* -o was specified... */
-		} else if (buf[0] == '-' && buf[1] == 'o') {
-
-			/* -oblah,foo... */
-			if (buf[2]) {
-				/* skip -o */
-				foo.option = args->argv[i] + 2;
-			/* -o blah,foo... */
-			} else {
-				/* 
-			 	 * skip current argv and pass to the
-			 	 * next one to parse the options.
-				 */
-				++i;
-				foo.option = args->argv[i];
-			}
-
-			rv = fuse_opt_popt(&foo, opts);
-			if (rv != 0)
-				break;
-
-		/* help/version/verbose argument */
-		} else if (buf[0] == '-' && buf[1] != 'o') {
-			/* 
-			 * check if the argument matches
-			 * with any template in opts.
-			 */
-			rv = fuse_opt_popt(&foo, opts);
-			if (rv != 0) {
-				break;
-			} else {
-				DPRINTF(("%s: foo.fop->templ='%s' "
-			    	    "foo.fop->offset: %d "
-			    	    "foo.fop->value: %d\n",
-			    	    __func__, foo.fop->templ,
-			    	    foo.fop->offset, foo.fop->value));
-
-				/* argument needs to be discarded */
-				if (foo.key == FUSE_OPT_KEY_DISCARD) {
-					rv = 1;
-					break;
-				}
-
-				/* process help/version argument */
-				if (foo.key != KEY_VERBOSE &&
-				    foo.key != FUSE_OPT_KEY_KEEP) {
-					rv = proc(foo.data, foo.option,
-				    		  foo.key, args);
-					break;
-				} else {
-					/* process verbose argument */
-					rv = proc(foo.data, foo.option,
-						       foo.key, args);
-					if (rv != 0)
-						break;
-				}
-			}
-		/* unknown option, how could that happen? */
-		} else {
-			DPRINTF(("%s: unknown option\n", __func__));
-			rv = 1;
-			break;
-		}
-	}
-
-	return rv;
-}
diff --git a/lib/librefuse/shlib_version b/lib/librefuse/shlib_version
deleted file mode 100644
index b82cf9365..000000000
--- a/lib/librefuse/shlib_version
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: shlib_version,v 1.3 2010/05/21 10:53:41 pooka Exp $
-#
-major=2
-minor=0
diff --git a/lib/libtelnet/forward.c b/lib/libtelnet/forward.c
deleted file mode 100644
index b97418dbc..000000000
--- a/lib/libtelnet/forward.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * appl/telnet/libtelnet/forward.c
- */
-
-/*
- * Copyright (c) 1983 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-
-/* General-purpose forwarding routines. These routines may be put into */
-/* libkrb5.a to allow widespread use */ 
-
-#if defined(KERBEROS) || defined(KRB5)
-#include <stdio.h>
-#include <netdb.h>
- 
-#include "k5-int.h"
- 
-extern char *line;		/* see sys_term.c */
-
-krb5_error_code rd_and_store_for_creds(krb5_context, krb5_auth_context, krb5_data *, krb5_ticket *);
-
-/* Decode, decrypt and store the forwarded creds in the local ccache. */
-krb5_error_code
-rd_and_store_for_creds(context, auth_context, inbuf, ticket)
-    krb5_context context;
-    krb5_auth_context auth_context;
-    krb5_data *inbuf;
-    krb5_ticket *ticket;
-{
-    krb5_creds **creds;
-    krb5_error_code retval;
-    char ccname[35];
-    krb5_ccache ccache = NULL;
-
-    if ((retval = krb5_rd_cred(context, auth_context, inbuf, &creds, NULL)) != 0) 
-	return(retval);
-
-    snprintf(ccname, sizeof(ccname), "FILE:/tmp/krb5cc_p%d", getpid());
-    setenv(KRB5_ENV_CCNAME, ccname, 1);
-
-    if ((retval = krb5_cc_resolve(context, ccname, &ccache)) != 0)
-	goto cleanup;
-
-    if ((retval = krb5_cc_initialize(context, ccache, ticket->enc_part2->client)) != 0)
-	goto cleanup;
-
-    if ((retval = krb5_cc_store_cred(context, ccache, *creds)) != 0) 
-	goto cleanup;
-
-cleanup:
-    krb5_free_creds(context, *creds);
-    return retval;
-}
-
-#endif /* defined(KRB5) && defined(FORWARD) */
diff --git a/lib/libtelnet/pk.h b/lib/libtelnet/pk.h
deleted file mode 100644
index f47b447af..000000000
--- a/lib/libtelnet/pk.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *      Dave Safford.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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: src/contrib/telnet/libtelnet/pk.h,v 1.6 2001/11/30 21:06:34 markm Exp $
- */
-
-/* header for the des routines that we will use */
-
-typedef unsigned char byte, DesData[ 8], IdeaData[16];
-#define DesKeys des_key_schedule
-
-#define DES_DECRYPT 0
-#define DES_ENCRYPT 1
-
-/* public key routines */
-/* functions:
-	genkeys(char *public, char *secret)
-	common_key(char *secret, char *public, desData *deskey)
-      where
-	char public[HEXKEYBYTES + 1];
-	char secret[HEXKEYBYTES + 1];
- */
-
-#define HEXMODULUS "d4a0ba0250b6fd2ec626e7efd637df76c716e22d0944b88b"
-#define HEXKEYBYTES 48
-#define KEYSIZE 192
-#define KEYBYTES 24
-#define PROOT 3
-
-extern void genkeys(char *public, char *secret);
-extern void common_key(char *secret, char *public, IdeaData *common,
-  DesData *deskey);
-extern void pk_encode(const char *in, char *out, DesData *deskey);
-extern void pk_decode(const char *in, char *out, DesData *deskey);
diff --git a/lib/libtelnet/sra.c b/lib/libtelnet/sra.c
deleted file mode 100644
index fcef2570a..000000000
--- a/lib/libtelnet/sra.c
+++ /dev/null
@@ -1,637 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *      Dave Safford.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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>
-#ifdef notdef
-__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/sra.c,v 1.16 2002/05/06 09:48:02 markm Exp $");
-#else
-__RCSID("$NetBSD: sra.c,v 1.11 2012/01/09 15:25:34 christos Exp $");
-#endif
-
-#ifdef	SRA
-#ifdef	ENCRYPTION
-#include <sys/types.h>
-#include <arpa/telnet.h>
-#include <paths.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <ttyent.h>
-
-#ifndef NOPAM
-#include <security/pam_appl.h>
-#else
-#include <unistd.h>
-#endif
-
-#include "auth.h"
-#include "misc.h"
-#include "encrypt.h"
-#include "pk.h"
-
-char pka[HEXKEYBYTES+1], ska[HEXKEYBYTES+1], pkb[HEXKEYBYTES+1];
-char *user, *pass, *xuser, *xpass;
-char *passprompt, *xpassprompt;
-DesData ck;
-IdeaData ik;
-
-extern int auth_debug_mode;
-extern char *line; 		/* see sys_term.c */
-
-static int sra_valid = 0;
-static int passwd_sent = 0;
-
-static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0,
-			  		AUTHTYPE_SRA, };
-
-#define SMALL_LEN	256
-#define XSMALL_LEN	513
-#define SRA_KEY	0
-#define SRA_USER 1
-#define SRA_CONTINUE 2
-#define SRA_PASS 3
-#define SRA_ACCEPT 4
-#define SRA_REJECT 5
-
-static int check_user(char *, const char *);
-
-/* support routine to send out authentication message */
-static int
-Data(Authenticator *ap, int type, void *d, int c)
-{
-        unsigned char *p = str_data + 4;
-	unsigned char *cd = d;
-
-	if (c == -1)
-		c = strlen(d);
-
-        if (auth_debug_mode) {
-                printf("%s:%d: [%d] (%d)",
-		    str_data[3] == TELQUAL_IS ? ">>>IS" : ">>>REPLY",
-		    str_data[3], type, c);
-                printd(d, c);
-                printf("\r\n");
-        }
-	*p++ = ap->type;
-	*p++ = ap->way;
-	*p++ = type;
-        while (c-- > 0) {
-                if ((*p++ = *cd++) == IAC)
-                        *p++ = IAC;
-        }
-        *p++ = IAC;
-        *p++ = SE;
-	if (str_data[3] == TELQUAL_IS)
-		printsub('>', &str_data[2], p - (&str_data[2]));
-        return telnet_net_write(str_data, p - str_data);
-}
-
-int
-sra_init(Authenticator *ap __unused, int server)
-{
-	if (server)
-		str_data[3] = TELQUAL_REPLY;
-	else
-		str_data[3] = TELQUAL_IS;
-
-	user = malloc(SMALL_LEN);
-	xuser = malloc(XSMALL_LEN);
-	pass = malloc(SMALL_LEN);
-	xpass = malloc(XSMALL_LEN);
-	passprompt = malloc(SMALL_LEN);
-	xpassprompt = malloc(XSMALL_LEN);
-
-	if (user == NULL || xuser == NULL || pass == NULL || xpass ==
-	    NULL || passprompt == NULL || xpassprompt == NULL)
-		return 0; /* malloc failed */
-
-	passwd_sent = 0;
-	
-	genkeys(pka, ska);
-	return 1;
-}
-
-/* client received a go-ahead for sra */
-int
-sra_send(Authenticator *ap)
-{
-	/* send PKA */
-
-	if (auth_debug_mode)
-		printf("Sent PKA to server.\r\n" );
-	printf("Trying SRA secure login:\r\n");
-	if (!Data(ap, SRA_KEY, (void *)pka, HEXKEYBYTES)) {
-		if (auth_debug_mode)
-			printf("Not enough room for authentication data\r\n");
-		return 0;
-	}
-
-	return 1;
-}
-
-/* server received an IS -- could be SRA KEY, USER, or PASS */
-void
-sra_is(Authenticator *ap, unsigned char *data, int cnt)
-{
-	int valid;
-	Session_Key skey;
-
-	if (cnt-- < 1)
-		goto bad;
-	switch (*data++) {
-
-	case SRA_KEY:
-		if (cnt < HEXKEYBYTES) {
-			Data(ap, SRA_REJECT, (void *)0, 0);
-			auth_finished(ap, AUTH_USER);
-			if (auth_debug_mode) {
-				printf("SRA user rejected for bad PKB\r\n");
-			}
-			return;
-		}
-		if (auth_debug_mode)
-			printf("Sent pka\r\n");
-		if (!Data(ap, SRA_KEY, (void *)pka, HEXKEYBYTES)) {
-			if (auth_debug_mode)
-				printf("Not enough room\r\n");
-			return;
-		}
-		memcpy(pkb, data, HEXKEYBYTES);
-		pkb[HEXKEYBYTES] = '\0';
-		common_key(ska, pkb, &ik, &ck);
-		return;
-
-	case SRA_USER:
-		/* decode KAB(u) */
-		if (cnt > XSMALL_LEN - 1) /* Attempted buffer overflow */
-			break;
-		memcpy(xuser, data, cnt);
-		xuser[cnt] = '\0';
-		pk_decode(xuser, user, &ck);
-		auth_encrypt_user(user);
-#ifndef NOPAM
-		(void)check_user(user, "*");
-#endif
-		pk_encode(passprompt, xpassprompt, &ck);
-		Data(ap, SRA_CONTINUE, xpassprompt, XSMALL_LEN - 1);
-
-		return;
-
-	case SRA_PASS:
-		if (cnt > XSMALL_LEN - 1) /* Attempted buffer overflow */
-			break;
-		/* decode KAB(P) */
-		memcpy(xpass, data, cnt);
-		xpass[cnt] = '\0';
-		pk_decode(xpass, pass, &ck);
-
-		/* check user's password */
-		valid = check_user(user, pass);
-
-		if(valid) {
-			/* PAM (via check_user()) may have changed 'user' */
-			auth_encrypt_user(user);
-			Data(ap, SRA_ACCEPT, (void *)0, 0);
-			skey.data = ck;
-			skey.type = SK_DES;
-			skey.length = 8;
-			encrypt_session_key(&skey, 1);
-
-			sra_valid = 1;
-			auth_finished(ap, AUTH_VALID);
-			if (auth_debug_mode) {
-				printf("SRA user accepted\r\n");
-			}
-		}
-		else {
-			pk_encode(passprompt, xpassprompt, &ck);
-			Data(ap, SRA_CONTINUE, (void *)xpassprompt,
-			    XSMALL_LEN - 1);
-			if (auth_debug_mode) {
-				printf("SRA user failed\r\n");
-			}
-		}
-		return;
-
-	default:
-		if (auth_debug_mode)
-			printf("Unknown SRA option %d\r\n", data[-1]);
-	}
-bad:
-	Data(ap, SRA_REJECT, 0, 0);
-	sra_valid = 0;
-	auth_finished(ap, AUTH_REJECT);
-}
-
-/* client received REPLY -- could be SRA KEY, CONTINUE, ACCEPT, or REJECT */
-void
-sra_reply(Authenticator *ap, unsigned char *data, int cnt)
-{
-	char uprompt[SMALL_LEN], tuser[SMALL_LEN];
-	Session_Key skey;
-	size_t i;
-
-	if (cnt-- < 1)
-		return;
-	switch (*data++) {
-
-	case SRA_KEY:
-		/* calculate common key */
-		if (cnt < HEXKEYBYTES) {
-			if (auth_debug_mode) {
-				printf("SRA user rejected for bad PKB\r\n");
-			}
-			return;
-		}
-		memcpy(pkb, data, HEXKEYBYTES);
-		pkb[HEXKEYBYTES] = '\0'; 		
-
-		common_key(ska, pkb, &ik, &ck);
-
-	enc_user:
-
-		/* encode user */
-		memset(tuser, 0, sizeof(tuser));
-		snprintf(uprompt, sizeof(uprompt), "User (%s): ",
-		    UserNameRequested);
-		if (telnet_gets(uprompt, tuser, SMALL_LEN - 1, 1) == NULL) {
-			printf("\n");
-			exit(1);
-		}
-		if (tuser[0] == '\n' || tuser[0] == '\r' )
-			strlcpy(user, UserNameRequested, SMALL_LEN);
-		else {
-			/* telnet_gets leaves the newline on */
-			for(i = 0; i < sizeof(tuser); i++) {
-				if (tuser[i] == '\n') {
-					tuser[i] = '\0';
-					break;
-				}
-			}
-			strlcpy(user, tuser, SMALL_LEN);
-		}
-		pk_encode(user, xuser, &ck);
-
-		/* send it off */
-		if (auth_debug_mode)
-			printf("Sent KAB(U)\r\n");
-		if (!Data(ap, SRA_USER, (void *)xuser, strlen(xuser))) {
-			if (auth_debug_mode)
-				printf("Not enough room\r\n");
-			return;
-		}
-		break;
-
-	case SRA_CONTINUE:
-		if (passwd_sent) {
-			passwd_sent = 0;
-			printf("[ SRA login failed ]\r\n");
-			goto enc_user;
-		}
-		if (cnt > XSMALL_LEN - 1) { 
-			break;
-		} else if (cnt > 0) {
-			(void)memcpy(xpassprompt, data, cnt);
-			pk_decode(xpassprompt, passprompt, &ck);
-		} else {
-			(void)strlcpy(passprompt, "Password: ", SMALL_LEN);
-		}
-		/* encode password */
-		memset(pass, 0, SMALL_LEN);
-		if (telnet_gets(passprompt, pass, SMALL_LEN - 1, 0) == NULL) {
-			printf("\n");
-			exit(1);
-		}
-		pk_encode(pass, xpass, &ck);
-		/* send it off */
-		if (auth_debug_mode)
-			printf("Sent KAB(P)\r\n");
-		if (!Data(ap, SRA_PASS, (void *)xpass, strlen(xpass))) {
-			if (auth_debug_mode)
-				printf("Not enough room\r\n");
-			return;
-		}
-		passwd_sent = 1;
-		break;
-
-	case SRA_REJECT:
-		printf("[ SRA refuses authentication ]\r\n");
-		printf("Trying plaintext login:\r\n");
-		auth_finished(0, AUTH_REJECT);
-		return;
-
-	case SRA_ACCEPT:
-		printf("[ SRA accepts you ]\r\n");
-		skey.data = ck;
-		skey.type = SK_DES;
-		skey.length = 8;
-		encrypt_session_key(&skey, 0);
-
-		auth_finished(ap, AUTH_VALID);
-		return;
-	default:
-		if (auth_debug_mode)
-			printf("Unknown SRA option %d\r\n", data[-1]);
-		return;
-	}
-}
-
-int
-sra_status(Authenticator *ap __unused, char *name, size_t len, int level)
-{
-	if (level < AUTH_USER)
-		return level;
-	if (UserNameRequested && sra_valid) {
-		strlcpy(name, UserNameRequested, len);
-		return AUTH_VALID;
-	} else
-		return AUTH_USER;
-}
-
-#define	BUMP(buf, len)		while (*(buf)) { ++(buf), --(len); }
-#define	ADDC(buf, len, c)	if ((len) > 0) { *(buf)++ = (c); --(len); }
-
-void
-sra_printsub(unsigned char *data, int cnt, unsigned char *ubuf, int buflen)
-{
-	char lbuf[32], *buf = (char *)ubuf;
-	int i;
-
-	buf[buflen - 1] = '\0'; 		/* make sure its NULL terminated */
-	buflen -= 1;
-
-	switch(data[3]) {
-
-	case SRA_CONTINUE:
-		strncpy(buf, " CONTINUE ", buflen);
-		goto common;
-
-	case SRA_REJECT:		/* Rejected (reason might follow) */
-		strncpy(buf, " REJECT ", buflen);
-		goto common;
-
-	case SRA_ACCEPT:		/* Accepted (name might follow) */
-		strncpy(buf, " ACCEPT ", buflen);
-
-	common:
-		BUMP(buf, buflen);
-		if (cnt <= 4)
-			break;
-		ADDC(buf, buflen, '"');
-		for (i = 4; i < cnt; i++)
-			ADDC(buf, buflen, data[i]);
-		ADDC(buf, buflen, '"');
-		ADDC(buf, buflen, '\0');
-		break;
-
-	case SRA_KEY:			/* Authentication data follows */
-		strncpy(buf, " KEY ", buflen);
-		goto common2;
-
-	case SRA_USER:
-		strncpy(buf, " USER ", buflen);
-		goto common2;
-
-	case SRA_PASS:
-		strncpy(buf, " PASS ", buflen);
-		goto common2;
-
-	default:
-		snprintf(lbuf, sizeof(lbuf), " %d (unknown)", data[3]);
-		strncpy(buf, lbuf, buflen);
-	common2:
-		BUMP(buf, buflen);
-		for (i = 4; i < cnt; i++) {
-			snprintf(lbuf, sizeof(lbuf), " %d", data[i]);
-			strncpy(buf, lbuf, buflen);
-			BUMP(buf, buflen);
-		}
-		break;
-	}
-}
-
-#ifdef NOPAM
-static int
-isroot(const char *usr)
-{
-	struct passwd pws, *pwd;
-	char pwbuf[1024];
-
-	if (getpwnam_r(usr, &pws, pwbuf, sizeof(pwbuf), &pwd) != 0 ||
-	    pwd == NULL)
-		return 0;
-	return (!pwd->pw_uid);
-}
-
-static int
-rootterm(const char *ttyname)
-{
-	struct ttyent *t;
-	const char *ttyn;
-
-	ttyn = ttyname;
-	if (strncmp(ttyn, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
-		ttyn += sizeof(_PATH_DEV) - 1;
-
-	return ((t = getttynam(ttyn)) && t->ty_status & TTY_SECURE);
-}
-
-static int
-check_user(char *name, const char *cred)
-{
-	struct passwd pws, *pw;
-	char pwbuf[1024];
-	char *xpasswd, *salt;
-
-	if (isroot(name) && !rootterm(line))
-	{
-		crypt("AA", "*"); /* Waste some time to simulate success */
-		return 0;
-	}
-
-	if (getpwnam_r(name, &pws, pwbuf, sizeof(pwbuf), &pw) == 0 &&
-	    pw != NULL) {
-		if (pw->pw_shell == NULL) {
-			return 0;
-		}
-
-		salt = pw->pw_passwd;
-		xpasswd = crypt(cred, salt);
-		/* The strcmp does not catch null passwords! */
-		if (*pw->pw_passwd == '\0' || strcmp(xpasswd, pw->pw_passwd)) {
-			return 0;
-		}
-		return 1;
-	}
-	return 0;
-}
-#else	/* !NOPAM */
-
-/*
- * The following is stolen from ftpd, which stole it from the imap-uw
- * PAM module and login.c. It is needed because we can't really
- * "converse" with the user, having already gone to the trouble of
- * getting their username and password through an encrypted channel.
- */
-
-#define COPY_STRING(s) (s ? strdup(s) : NULL)
-
-struct cred_t {
-	const char *uname;
-	const char *pass;
-};
-typedef struct cred_t cred_t;
-
-static int
-auth_conv(int num_msg, const struct pam_message **msg,
-    struct pam_response **resp, void *appdata)
-{
-	int i;
-	cred_t *cred = appdata;
-	struct pam_response *reply = malloc(sizeof(*reply) * num_msg);
-
-	if (reply == NULL)
-		return PAM_BUF_ERR;
-
-	for (i = 0; i < num_msg; i++) {
-		switch (msg[i]->msg_style) {
-		case PAM_PROMPT_ECHO_ON:        /* assume want user name */
-			reply[i].resp_retcode = PAM_SUCCESS;
-			reply[i].resp = COPY_STRING(cred->uname);
-			/* PAM frees resp. */
-			break;
-		case PAM_PROMPT_ECHO_OFF:       /* assume want password */
-		    (void)strlcpy(passprompt, msg[i]->msg, SMALL_LEN);
-		    reply[i].resp_retcode = PAM_SUCCESS;
-		    reply[i].resp = COPY_STRING(cred->pass);
-		    /* PAM frees resp. */
-		    break;
-		case PAM_TEXT_INFO:
-		case PAM_ERROR_MSG:
-			reply[i].resp_retcode = PAM_SUCCESS;
-			reply[i].resp = NULL;
-			break;
-		default:                        /* unknown message style */
-			free(reply);
-			return PAM_CONV_ERR;
-		}
-	}
-
-	*resp = reply;
-	return PAM_SUCCESS;
-}
-
-/*
- * The PAM version as a side effect may put a new username in *name.
- */
-static int
-check_user(char *name, const char *cred)
-{
-	pam_handle_t *pamh = NULL;
-	const void *item;
-	int rval;
-	int e;
-	cred_t auth_cred = { name, cred };
-	struct pam_conv conv = { &auth_conv, &auth_cred };
-
-	e = pam_start("telnetd", name, &conv, &pamh);
-	if (e != PAM_SUCCESS) {
-		syslog(LOG_ERR, "pam_start: %s", pam_strerror(pamh, e));
-		return 0;
-	}
-
-#if 0 /* Where can we find this value? */
-	e = pam_set_item(pamh, PAM_RHOST, remotehost);
-	if (e != PAM_SUCCESS) {
-		syslog(LOG_ERR, "pam_set_item(PAM_RHOST): %s",
-			pam_strerror(pamh, e));
-		return 0;
-	}
-#endif
-
-	e = pam_authenticate(pamh, 0);
-	switch (e) {
-	case PAM_SUCCESS:
-		/*
-		 * With PAM we support the concept of a "template"
-		 * user.  The user enters a login name which is
-		 * authenticated by PAM, usually via a remote service
-		 * such as RADIUS or TACACS+.  If authentication
-		 * succeeds, a different but related "template" name
-		 * is used for setting the credentials, shell, and
-		 * home directory.  The name the user enters need only
-		 * exist on the remote authentication server, but the
-		 * template name must be present in the local password
-		 * database.
-		 *
-		 * This is supported by two various mechanisms in the
-		 * individual modules.  However, from the application's
-		 * point of view, the template user is always passed
-		 * back as a changed value of the PAM_USER item.
-		 */
-		if ((e = pam_get_item(pamh, PAM_USER, &item)) == 
-		    PAM_SUCCESS) {
-			strlcpy(name, item, SMALL_LEN);
-		} else
-			syslog(LOG_ERR, "Couldn't get PAM_USER: %s",
-			pam_strerror(pamh, e));
-#if 0	/* pam_securetty(8) should be used to enforce this */
-		if (isroot(name) && !rootterm(line))
-			rval = 0;
-		else
-#endif
-			rval = 1;
-		break;
-
-	case PAM_AUTH_ERR:
-	case PAM_USER_UNKNOWN:
-	case PAM_MAXTRIES:
-		rval = 0;
-	break;
-
-	default:
-		syslog(LOG_ERR, "auth_pam: %s", pam_strerror(pamh, e));
-		rval = 0;
-		break;
-	}
-
-	if ((e = pam_end(pamh, e)) != PAM_SUCCESS) {
-		syslog(LOG_ERR, "pam_end: %s", pam_strerror(pamh, e));
-		rval = 0;
-	}
-	return rval;
-}
-
-#endif /* !NOPAM */
-
-#endif /* ENCRYPTION */
-#endif /* SRA */
diff --git a/lib/libterminfo/Makefile b/lib/libterminfo/Makefile
deleted file mode 100644
index d80faf3ab..000000000
--- a/lib/libterminfo/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-#	$NetBSD: Makefile,v 1.22 2012/03/21 05:37:44 matt Exp $
-
-.include <bsd.own.mk>
-
-USE_SHLIBDIR=	yes
-
-LIB=		terminfo
-WARNS?=		5
-
-CPPFLAGS+=	-I${.CURDIR}
-
-SRCS=		term.c ti.c setupterm.c curterm.c tparm.c tputs.c
-SRCS+=		compile.c hash.c
-INCS=		term.h
-INCSDIR=	/usr/include
-
-COPTS.tparm.c = -Wno-format-nonliteral
-
-MAN=		terminfo.3 terminfo.5
-MLINKS=		terminfo.3 setupterm.3 \
-		terminfo.3 set_curterm.3 terminfo.3 del_curterm.3 \
-		terminfo.3 termname.3 terminfo.3 longname.3 \
-		terminfo.3 tigetnum.3 terminfo.3 tigetflag.3 \
-		terminfo.3 tigetstr.3 terminfo.3 tparm.3 terminfo.3 tputs.3 \
-		terminfo.3 putp.3 \
-		terminfo.3 ti_setupterm.3 terminfo.3 ti_getflag.3 \
-		terminfo.3 ti_getnum.3 terminfo.3 ti_getstr.3 \
-		terminfo.3 tiparm.3 terminfo.3 ti_tiparm.3 \
-		terminfo.3 ti_puts.3 terminfo.3 ti_putp.3
-
-# Build in termcap emulation
-SRCS+=		termcap.c
-INCS+=		termcap.h
-MAN+=		termcap.3
-MLINKS+=	termcap.3 tgetent.3 termcap.3 tgetflag.3 termcap.3 tgetnum.3 \
-		termcap.3 tgetstr.3 termcap.3 tgoto.3
-
-CPPFLAGS+=	-I${.OBJDIR}
-
-.include <Makefile.hash>
-
-# Generate our man pages
-terminfo.5: genman terminfo.5.in term.h termcap_map.c
-		@echo "Generating terminfo man pages"
-		${SCRIPT_ENV} ${HOST_SH} ${.ALLSRC} > ${.TARGET}
-
-CLEANFILES+=	terminfo.5
-
-man: terminfo.5
-
-.include <bsd.shlib.mk>
-
-.if ${MKLINKLIB} != "no"
-SYMLINKS+=	libterminfo.a ${LIBDIR}/libtermcap.a
-SYMLINKS+=	libterminfo.a ${LIBDIR}/libtermlib.a
-.endif
-
-.if ${MKPROFILE} != "no"
-SYMLINKS+=	libterminfo_p.a ${LIBDIR}/libtermcap_p.a
-SYMLINKS+=	libterminfo_p.a ${LIBDIR}/libtermlib_p.a
-.endif
-
-.if ${MKPIC} != "no"
-
-.if ${MKPICINSTALL} != "no"
-SYMLINKS+=	libterminfo_pic.a ${LIBDIR}/libtermcap_pic.a
-SYMLINKS+=	libterminfo_pic.a ${LIBDIR}/libtermlib_pic.a
-.endif
-
-.if exists(${.CURDIR}/shlib_version)
-SYMLINKS+=	libterminfo.so.${SHLIB_FULLVERSION} \
-		${_LIBSODIR}/libtermcap.so.0.6
-SYMLINKS+=	libterminfo.so.${SHLIB_FULLVERSION} \
-		${_LIBSODIR}/libtermlib.so.0.6
-.if ${_LIBSODIR} != ${LIBDIR}
-SYMLINKS+=	libterminfo.so.${SHLIB_FULLVERSION} \
-		${LIBDIR}/libtermcap.so.0.6
-SYMLINKS+=	libterminfo.so.${SHLIB_FULLVERSION} \
-		${LIBDIR}/libtermlib.so.0.6
-.endif
-
-SYMLINKS+=	libterminfo.so.${SHLIB_MAJOR} \
-		${_LIBSODIR}/libtermcap.so.0
-SYMLINKS+=	libterminfo.so ${_LIBSODIR}/libtermcap.so
-SYMLINKS+=	libterminfo.so.${SHLIB_MAJOR} \
-		${_LIBSODIR}/libtermlib.so.0
-SYMLINKS+=	libterminfo.so ${_LIBSODIR}/libtermlib.so
-.if ${_LIBSODIR} != ${LIBDIR}
-SYMLINKS+=	libterminfo.so.${SHLIB_MAJOR} \
-		${LIBDIR}/libtermcap.so.0
-SYMLINKS+=	libterminfo.so ${LIBDIR}/libtermcap.so
-SYMLINKS+=	libterminfo.so.${SHLIB_MAJOR} \
-		${LIBDIR}/libtermlib.so.0
-SYMLINKS+=	libterminfo.so ${LIBDIR}/libtermlib.so
-.endif
-.endif	# exists shlib_version
-
-.endif	# ${MKPIC} != "no"
-
-.include <bsd.lib.mk>
diff --git a/lib/libterminfo/Makefile.hash b/lib/libterminfo/Makefile.hash
deleted file mode 100644
index 1bea6570e..000000000
--- a/lib/libterminfo/Makefile.hash
+++ /dev/null
@@ -1,32 +0,0 @@
-#	$NetBSD: Makefile.hash,v 1.7 2013/01/24 14:17:40 roy Exp $
-
-SCRIPT_ENV=	\
-	NETBSDSRCDIR=${NETBSDSRCDIR:Q} \
-	TOOL_AWK=${TOOL_AWK:Q} \
-	TOOL_NBPERF=${TOOL_NBPERF:Q} \
-	TOOL_SED=${TOOL_SED:Q} \
-	TOOL_SORT=${TOOL_SORT:Q} \
-	TOOL_TIC=${TOOL_TIC:Q}
-
-PARSEDIR:=${.PARSEDIR}
-# Generate our string and hash tables
-hash.c: genhash term.h
-		@echo "Generating terminfo hash"
-		${SCRIPT_ENV} ${HOST_SH} ${.ALLSRC} > ${.TARGET}
-
-termcap_hash.c: genthash termcap_map.c
-		@echo "Generating termcap hash"
-		${SCRIPT_ENV} ${HOST_SH} ${.ALLSRC} > ${.TARGET}
-
-# Allow terminfo descriptions to be compiled into libterminfo
-compiled_terms.c: genterms term.h ${NETBSDSRCDIR}/share/terminfo/terminfo
-		@echo "Generating compiled terminfo descriptions"
-		${SCRIPT_ENV} ${HOST_SH} ${.ALLSRC} > ${.TARGET}
-
-.if ${USETOOLS} == "yes"
-compiled_terms.c: ${TOOL_TIC}
-.endif
-
-DPSRCS+=	hash.c termcap_hash.c compiled_terms.c
-
-CLEANFILES+=	hash.c termcap_hash.c compiled_terms.c
diff --git a/lib/libterminfo/compile.c b/lib/libterminfo/compile.c
deleted file mode 100644
index 2adb4c71b..000000000
--- a/lib/libterminfo/compile.c
+++ /dev/null
@@ -1,662 +0,0 @@
-/* $NetBSD: compile.c,v 1.9 2013/06/07 13:16:18 roy Exp $ */
-
-/*
- * Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Roy Marples.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: compile.c,v 1.9 2013/06/07 13:16:18 roy Exp $");
-
-#if !HAVE_NBTOOL_CONFIG_H || HAVE_SYS_ENDIAN_H
-#include <sys/endian.h>
-#endif
-
-#include <assert.h>
-#include <ctype.h>
-#include <err.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <term_private.h>
-#include <term.h>
-
-static void __printflike(2, 3)
-dowarn(int flags, const char *fmt, ...)
-{
-	va_list va;
-
-	errno = EINVAL;
-	if (flags & TIC_WARNING) {
-		va_start(va, fmt);
-		vwarnx(fmt, va);
-		va_end(va);
-	}
-}
-
-char *
-_ti_grow_tbuf(TBUF *tbuf, size_t len)
-{
-	char *buf;
-	size_t l;
-
-	_DIAGASSERT(tbuf != NULL);
-
-	l = tbuf->bufpos + len;
-	if (l > tbuf->buflen) {
-		if (tbuf->buflen == 0)
-			buf = malloc(l);
-		else
-			buf = realloc(tbuf->buf, l);
-		if (buf == NULL)
-			return NULL;
-		tbuf->buf = buf;
-		tbuf->buflen = l;
-	}
-	return tbuf->buf;
-}
-
-char *
-_ti_find_cap(TBUF *tbuf, char type, short ind)
-{
-	size_t n;
-	short num;
-	char *cap;
-
-	_DIAGASSERT(tbuf != NULL);
-
-	cap = tbuf->buf;
-	for (n = tbuf->entries; n > 0; n--) {
-		num = le16dec(cap);
-		cap += sizeof(uint16_t);
-		if (num == ind)
-			return cap;
-		switch (type) {
-		case 'f':
-			cap++;
-			break;
-		case 'n':
-			cap += sizeof(uint16_t);
-			break;
-		case 's':
-			num = le16dec(cap);
-			cap += sizeof(uint16_t);
-			cap += num;
-			break;
-		}
-	}
-
-	errno = ESRCH;
-	return NULL;
-}
-
-char *
-_ti_find_extra(TBUF *tbuf, const char *code)
-{
-	size_t n;
-	short num;
-	char *cap;
-
-	_DIAGASSERT(tbuf != NULL);
-	_DIAGASSERT(code != NULL);
-
-	cap = tbuf->buf;
-	for (n = tbuf->entries; n > 0; n--) {
-		num = le16dec(cap);
-		cap += sizeof(uint16_t);
-		if (strcmp(cap, code) == 0)
-			return cap + num;
-		cap += num;
-		switch (*cap++) {
-		case 'f':
-			cap++;
-			break;
-		case 'n':
-			cap += sizeof(uint16_t);
-			break;
-		case 's':
-			num = le16dec(cap);
-			cap += sizeof(uint16_t);
-			cap += num;
-			break;
-		}
-	}
-
-	errno = ESRCH;
-	return NULL;
-}
-
-size_t
-_ti_store_extra(TIC *tic, int wrn, char *id, char type, char flag, short num,
-    char *str, size_t strl, int flags)
-{
-	size_t l;
-
-	_DIAGASSERT(tic != NULL);
-
-	if (strcmp(id, "use") != 0) {
-		if (_ti_find_extra(&tic->extras, id) != NULL)
-			return 0;
-		if (!(flags & TIC_EXTRA)) {
-			if (wrn != 0)
-				dowarn(flags, "%s: %s: unknown capability",
-				    tic->name, id);
-			return 0;
-		}
-	}
-
-	l = strlen(id) + 1;
-	if (l > UINT16_T_MAX) {
-		dowarn(flags, "%s: %s: cap name is too long", tic->name, id);
-		return 0;
-	}
-
-	if (!_ti_grow_tbuf(&tic->extras,
-		l + strl + (sizeof(uint16_t) * 2) + 1))
-		return 0;
-	le16enc(tic->extras.buf + tic->extras.bufpos, l);
-	tic->extras.bufpos += sizeof(uint16_t);
-	memcpy(tic->extras.buf + tic->extras.bufpos, id, l);
-	tic->extras.bufpos += l;
-	tic->extras.buf[tic->extras.bufpos++] = type;
-	switch (type) {
-	case 'f':
-		tic->extras.buf[tic->extras.bufpos++] = flag;
-		break;
-	case 'n':
-		le16enc(tic->extras.buf + tic->extras.bufpos, num);
-		tic->extras.bufpos += sizeof(uint16_t);
-		break;
-	case 's':
-		le16enc(tic->extras.buf + tic->extras.bufpos, strl);
-		tic->extras.bufpos += sizeof(uint16_t);
-		memcpy(tic->extras.buf + tic->extras.bufpos, str, strl);
-		tic->extras.bufpos += strl;
-		break;
-	}
-	tic->extras.entries++;
-	return 1;
-}
-
-ssize_t
-_ti_flatten(uint8_t **buf, const TIC *tic)
-{
-	size_t buflen, len, alen, dlen;
-	uint8_t *cap;
-
-	_DIAGASSERT(buf != NULL);
-	_DIAGASSERT(tic != NULL);
-
-	len = strlen(tic->name) + 1;
-	if (tic->alias == NULL)
-		alen = 0;
-	else
-		alen = strlen(tic->alias) + 1;
-	if (tic->desc == NULL)
-		dlen = 0;
-	else
-		dlen = strlen(tic->desc) + 1;
-	buflen = sizeof(char) +
-	    sizeof(uint16_t) + len +
-	    sizeof(uint16_t) + alen +
-	    sizeof(uint16_t) + dlen +
-	    (sizeof(uint16_t) * 2) + tic->flags.bufpos +
-	    (sizeof(uint16_t) * 2) + tic->nums.bufpos +
-	    (sizeof(uint16_t) * 2) + tic->strs.bufpos +
-	    (sizeof(uint16_t) * 2) + tic->extras.bufpos;
-	*buf = malloc(buflen);
-	if (*buf == NULL)
-		return -1;
-
-	cap = *buf;
-	*cap++ = 1;
-	le16enc(cap, len);
-	cap += sizeof(uint16_t);
-	memcpy(cap, tic->name, len);
-	cap += len;
-
-	le16enc(cap, alen);
-	cap += sizeof(uint16_t);
-	if (tic->alias != NULL) {
-		memcpy(cap, tic->alias, alen);
-		cap += alen;
-	}
-	le16enc(cap, dlen);
-	cap += sizeof(uint16_t);
-	if (tic->desc != NULL) {
-		memcpy(cap, tic->desc, dlen);
-		cap += dlen;
-	}
-
-	if (tic->flags.entries == 0) {
-		le16enc(cap, 0);
-		cap += sizeof(uint16_t);
-	} else {
-		le16enc(cap, (tic->flags.bufpos + sizeof(uint16_t)));
-		cap += sizeof(uint16_t);
-		le16enc(cap, tic->flags.entries);
-		cap += sizeof(uint16_t);
-		memcpy(cap, tic->flags.buf, tic->flags.bufpos);
-		cap += tic->flags.bufpos;
-	}
-
-	if (tic->nums.entries == 0) {
-		le16enc(cap, 0);
-		cap += sizeof(uint16_t);
-	} else {
-		le16enc(cap, (tic->nums.bufpos + sizeof(uint16_t)));
-		cap += sizeof(uint16_t);
-		le16enc(cap, tic->nums.entries);
-		cap += sizeof(uint16_t);
-		memcpy(cap, tic->nums.buf, tic->nums.bufpos);
-		cap += tic->nums.bufpos;
-	}
-
-	if (tic->strs.entries == 0) {
-		le16enc(cap, 0);
-		cap += sizeof(uint16_t);
-	} else {
-		le16enc(cap, (tic->strs.bufpos + sizeof(uint16_t)));
-		cap += sizeof(uint16_t);
-		le16enc(cap, tic->strs.entries);
-		cap += sizeof(uint16_t);
-		memcpy(cap, tic->strs.buf, tic->strs.bufpos);
-		cap += tic->strs.bufpos;
-	}
-
-	if (tic->extras.entries == 0) {
-		le16enc(cap, 0);
-		cap += sizeof(uint16_t);
-	} else {
-		le16enc(cap, (tic->extras.bufpos + sizeof(uint16_t)));
-		cap += sizeof(uint16_t);
-		le16enc(cap, tic->extras.entries);
-		cap += sizeof(uint16_t);
-		memcpy(cap, tic->extras.buf, tic->extras.bufpos);
-		cap += tic->extras.bufpos;
-	}
-
-	return cap - *buf;
-}
-
-static int
-encode_string(const char *term, const char *cap, TBUF *tbuf, const char *str,
-    int flags)
-{
-	int slash, i, num;
-	char ch, *p, *s, last;
-
-	if (_ti_grow_tbuf(tbuf, strlen(str) + 1) == NULL)
-		return -1;
-	p = s = tbuf->buf + tbuf->bufpos;
-	slash = 0;
-	last = '\0';
-	/* Convert escape codes */
-	while ((ch = *str++) != '\0') {
-		if (slash == 0 && ch == '\\') {
-			slash = 1;
-			continue;
-		}
-		if (slash == 0) {
-			if (last != '%' && ch == '^') {
-				ch = *str++;
-				if (((unsigned char)ch) >= 128)
-					dowarn(flags,
-					    "%s: %s: illegal ^ character",
-					    term, cap);
-				if (ch == '\0')
-					break;
-				if (ch == '?')
-					ch = '\177';
-				else if ((ch &= 037) == 0)
-					ch = (char)128;
-			}
-			*p++ = ch;
-			last = ch;
-			continue;
-		}
-		slash = 0;
-		if (ch >= '0' && ch <= '7') {
-			num = ch - '0';
-			for (i = 0; i < 2; i++) {
-				if (*str < '0' || *str > '7') {
-					if (isdigit((unsigned char)*str))
-						dowarn(flags,
-						    "%s: %s: non octal"
-						    " digit", term, cap);
-					else
-						break;
-				}
-				num = num * 8 + *str++ - '0';
-			}
-			if (num == 0)
-				num = 0200;
-			*p++ = (char)num;
-			continue;
-		}
-		switch (ch) {
-		case 'a':
-			*p++ = '\a';
-			break;
-		case 'b':
-			*p++ = '\b';
-			break;
-		case 'e': /* FALLTHROUGH */
-		case 'E':
-			*p++ = '\033';
-			break;
-		case 'f':
-			*p++ = '\014';
-			break;
-		case 'l': /* FALLTHROUGH */
-		case 'n':
-			*p++ = '\n';
-			break;
-		case 'r':
-			*p++ = '\r';
-			break;
-		case 's':
-			*p++ = ' ';
-			break;
-		case 't':
-			*p++ = '\t';
-			break;
-		default:
-			/* We should warn here */
-		case '^':
-		case ',':
-		case ':':
-		case '|':
-			*p++ = ch;
-			break;
-		}
-		last = ch;
-	}
-	*p++ = '\0';
-	tbuf->bufpos += p - s;
-	return 0;
-}
-
-char *
-_ti_get_token(char **cap, char sep)
-{
-	char esc, *token;
-
-	while (isspace((unsigned char)**cap))
-		(*cap)++;
-	if (**cap == '\0')
-		return NULL;
-
-	/* We can't use stresep(3) as ^ we need two escape chars */
-	esc = '\0';
-	for (token = *cap;
-	     **cap != '\0' && (esc != '\0' || **cap != sep);
-	     (*cap)++)
-	{
-		if (esc == '\0') {
-			if (**cap == '\\' || **cap == '^')
-				esc = **cap;
-		} else {
-			/* termcap /E/ is valid */
-			if (sep == ':' && esc == '\\' && **cap == 'E')
-				esc = 'x';
-			else
-				esc = '\0';
-		}
-	}
-
-	if (**cap != '\0')
-		*(*cap)++ = '\0';
-
-	return token;
-}
-
-TIC *
-_ti_compile(char *cap, int flags)
-{
-	char *token, *p, *e, *name, *desc, *alias;
-	signed char flag;
-	long cnum;
-	short num;
-	ssize_t ind;
-	size_t len;
-	TBUF buf;
-	TIC *tic;
-
-	_DIAGASSERT(cap != NULL);
-
-	name = _ti_get_token(&cap, ',');
-	if (name == NULL) {
-		dowarn(flags, "no seperator found: %s", cap);
-		return NULL;
-	}
-	desc = strrchr(name, '|');
-	if (desc != NULL)
-		*desc++ = '\0';
-	alias = strchr(name, '|');
-	if (alias != NULL)
-		*alias++ = '\0';
-
-	tic = calloc(sizeof(*tic), 1);
-	if (tic == NULL)
-		return NULL;
-
-	buf.buf = NULL;
-	buf.buflen = 0;
-
-	tic->name = strdup(name);
-	if (tic->name == NULL)
-		goto error;
-	if (alias != NULL && flags & TIC_ALIAS) {
-		tic->alias = strdup(alias);
-		if (tic->alias == NULL)
-			goto error;
-	}
-	if (desc != NULL && flags & TIC_DESCRIPTION) {
-		tic->desc = strdup(desc);
-		if (tic->desc == NULL)
-			goto error;
-	}
-
-	for (token = _ti_get_token(&cap, ',');
-	     token != NULL && *token != '\0';
-	     token = _ti_get_token(&cap, ','))
-	{
-		/* Skip commented caps */
-		if (!(flags & TIC_COMMENT) && token[0] == '.')
-			continue;
-
-		/* Obsolete entries */
-		if (token[0] == 'O' && token[1] == 'T') {
-			if (!(flags & TIC_EXTRA))
-				continue;
-			token += 2;
-		}
-
-		/* str cap */
-		p = strchr(token, '=');
-		if (p != NULL) {
-			*p++ = '\0';
-			/* Don't use the string if we already have it */
-			ind = _ti_strindex(token);
-			if (ind != -1 &&
-			    _ti_find_cap(&tic->strs, 's', ind) != NULL)
-				continue;
-
-			/* Encode the string to our scratch buffer */
-			buf.bufpos = 0;
-			if (encode_string(tic->name, token,
-				&buf, p, flags) == -1)
-				goto error;
-			if (buf.bufpos > UINT16_T_MAX) {
-				dowarn(flags, "%s: %s: string is too long",
-				    tic->name, token);
-				continue;
-			}
-			if (!VALID_STRING(buf.buf)) {
-				dowarn(flags, "%s: %s: invalid string",
-				    tic->name, token);
-				continue;
-			}
-
-			if (ind == -1)
-				_ti_store_extra(tic, 1, token, 's', -1, -2,
-				    buf.buf, buf.bufpos, flags);
-			else {
-				if (!_ti_grow_tbuf(&tic->strs,
-					(sizeof(uint16_t) * 2) + buf.bufpos))
-					goto error;
-				le16enc(tic->strs.buf + tic->strs.bufpos, ind);
-				tic->strs.bufpos += sizeof(uint16_t);
-				le16enc(tic->strs.buf + tic->strs.bufpos,
-				    buf.bufpos);
-				tic->strs.bufpos += sizeof(uint16_t);
-				memcpy(tic->strs.buf + tic->strs.bufpos,
-				    buf.buf, buf.bufpos);
-				tic->strs.bufpos += buf.bufpos;
-				tic->strs.entries++;
-			}
-			continue;
-		}
-
-		/* num cap */
-		p = strchr(token, '#');
-		if (p != NULL) {
-			*p++ = '\0';
-			/* Don't use the number if we already have it */
-			ind = _ti_numindex(token);
-			if (ind != -1 &&
-			    _ti_find_cap(&tic->nums, 'n', ind) != NULL)
-				continue;
-
-			cnum = strtol(p, &e, 0);
-			if (*e != '\0') {
-				dowarn(flags, "%s: %s: not a number",
-				    tic->name, token);
-				continue;
-			}
-			if (!VALID_NUMERIC(cnum)) {
-				dowarn(flags, "%s: %s: number out of range",
-				    tic->name, token);
-				continue;
-			}
-			num = (short)cnum;
-			if (ind == -1)
-				_ti_store_extra(tic, 1, token, 'n', -1,
-				    num, NULL, 0, flags);
-			else {
-				if (_ti_grow_tbuf(&tic->nums,
-					sizeof(uint16_t) * 2) == NULL)
-					goto error;
-				le16enc(tic->nums.buf + tic->nums.bufpos, ind);
-				tic->nums.bufpos += sizeof(uint16_t);
-				le16enc(tic->nums.buf + tic->nums.bufpos, num);
-				tic->nums.bufpos += sizeof(uint16_t);
-				tic->nums.entries++;
-			}
-			continue;
-		}
-
-		flag = 1;
-		len = strlen(token) - 1;
-		if (token[len] == '@') {
-			flag = CANCELLED_BOOLEAN;
-			token[len] = '\0';
-		}
-		ind = _ti_flagindex(token);
-		if (ind == -1 && flag == CANCELLED_BOOLEAN) {
-			if ((ind = _ti_numindex(token)) != -1) {
-				if (_ti_find_cap(&tic->nums, 'n', ind) != NULL)
-					continue;
-				if (_ti_grow_tbuf(&tic->nums,
-					sizeof(uint16_t) * 2) == NULL)
-					goto error;
-				le16enc(tic->nums.buf + tic->nums.bufpos, ind);
-				tic->nums.bufpos += sizeof(uint16_t);
-				le16enc(tic->nums.buf + tic->nums.bufpos,
-					(uint16_t)CANCELLED_NUMERIC);
-				tic->nums.bufpos += sizeof(uint16_t);
-				tic->nums.entries++;
-				continue;
-			} else if ((ind = _ti_strindex(token)) != -1) {
-				if (_ti_find_cap(&tic->strs, 's', ind) != NULL)
-					continue;
-				if (_ti_grow_tbuf(&tic->strs,
-					(sizeof(uint16_t) * 2) + 1) == NULL)
-					goto error;
-				le16enc(tic->strs.buf + tic->strs.bufpos, ind);
-				tic->strs.bufpos += sizeof(uint16_t);
-				le16enc(tic->strs.buf + tic->strs.bufpos, 0);
-				tic->strs.bufpos += sizeof(uint16_t);
-				tic->strs.entries++;
-				continue;
-			}
-		}
-		if (ind == -1)
-			_ti_store_extra(tic, 1, token, 'f', flag, 0, NULL, 0,
-			    flags);
-		else if (_ti_find_cap(&tic->flags, 'f', ind) == NULL) {
-			if (_ti_grow_tbuf(&tic->flags, sizeof(uint16_t) + 1)
-			    == NULL)
-				goto error;
-			le16enc(tic->flags.buf + tic->flags.bufpos, ind);
-			tic->flags.bufpos += sizeof(uint16_t);
-			tic->flags.buf[tic->flags.bufpos++] = flag;
-			tic->flags.entries++;
-		}
-	}
-
-	free(buf.buf);
-	return tic;
-
-error:
-	free(buf.buf);
-	_ti_freetic(tic);
-	return NULL;
-}
-
-void
-_ti_freetic(TIC *tic)
-{
-
-	if (tic != NULL) {
-		free(tic->name);
-		free(tic->alias);
-		free(tic->desc);
-		free(tic->extras.buf);
-		free(tic->flags.buf);
-		free(tic->nums.buf);
-		free(tic->strs.buf);
-		free(tic);
-	}
-}
diff --git a/lib/libterminfo/curterm.c b/lib/libterminfo/curterm.c
deleted file mode 100644
index 2b00c6354..000000000
--- a/lib/libterminfo/curterm.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* $NetBSD: curterm.c,v 1.10 2013/11/18 20:51:03 joerg Exp $ */
-
-/*
- * Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Roy Marples.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: curterm.c,v 1.10 2013/11/18 20:51:03 joerg Exp $");
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <term_private.h>
-#include <term.h>
-#include <termios.h>
-#include <stdio.h>
-
-TERMINAL *cur_term;
-
-/*
- * There is no standard way of getting a list of aliases for the
- * terminal. However, some applications such as telnet want to know this.
- * ncurses dumps the terminfo header into an undefined variable ttytype
- * and these applications then parse it to work out the aliases.
- * We should do the same for now, until a standard mechanism for getting
- * the information is available or the need for it goes away.
- */
-#define NAMESIZE	256
-char ttytype[NAMESIZE];
-
-static const speed_t bauds[] = {
-	0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 2400, 4800, 9600,
-	19200, 38400, 57600, 115200, 230400, 460800, 921600
-};
-
-void
-_ti_setospeed(TERMINAL *term)
-{
-	struct termios termios;
-	speed_t os;
-	size_t i;
-
-	_DIAGASSERT(term != NULL);
-
-	term->_ospeed = 0;
-	if (tcgetattr(term->fildes, &termios) == 0) {
-		os = cfgetospeed(&termios);
-		for (i = 0; i < __arraycount(bauds); i++)
-			if (bauds[i] == os) {
-				term->_ospeed = i;
-				break;
-			}
-	}
-}
-
-TERMINAL *
-set_curterm(TERMINAL *nterm)
-{
-	TERMINAL *oterm;
-	size_t l, n;
-	char *p;
-
-	oterm = cur_term;
-	cur_term = nterm;
-
-	ospeed = 0;
-	if (cur_term == NULL)
-		PC = '\0';
-	else {
-		if (pad_char == NULL)
-			PC = '\0';
-		else
-			PC = *pad_char;
-		_ti_setospeed(nterm);
-		ospeed = nterm->_ospeed;
-
-		p = ttytype;
-		l = sizeof(ttytype);
-		if ((n = strlcpy(p, nterm->name, l)) == strlen(p)) {
-			p += n;
-			l -= n;
-			*p++ = '|';
-			l--;
-			if (nterm->_alias  &&
-				(n = strlcpy(p, nterm->_alias, l)) == strlen(p))
-			{
-				p += n;
-				l -= n;
-				*p++ = '|';
-				l--;
-			}
-			if (nterm->desc  &&
-				(n = strlcpy(p, nterm->desc, l)) == strlen(p))
-			{
-				p += n;
-				l -= n;
-				*p++ = '|';
-				l--;
-			}
-			p--;
-		}
-		*p = '\0';
-	}
-
-	return oterm;
-}
-
-int
-del_curterm(TERMINAL *oterm)
-{
-
-	if (oterm == NULL)
-		return ERR;
-	free(oterm->_area);
-	free(oterm->strs);
-	free(oterm->nums);
-	free(oterm->flags);
-	free(oterm->_userdefs);
-	free(oterm);
-	return OK;
-}
-
-char *
-termname(void)
-{
-
-        _DIAGASSERT(cur_term != NULL);
-	return __UNCONST(cur_term->name);
-}
-
-static const char * nullname = "";
-
-char *
-longname(void)
-{
-
-	_DIAGASSERT(cur_term != NULL);
-	if (cur_term->desc == NULL)
-		return __UNCONST(nullname);
-	return __UNCONST(cur_term->desc);
-}
diff --git a/lib/libterminfo/genhash b/lib/libterminfo/genhash
deleted file mode 100755
index 75730a978..000000000
--- a/lib/libterminfo/genhash
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-# $NetBSD: genhash,v 1.8 2011/11/02 12:09:25 roy Exp $
-
-# Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Roy Marples.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list 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.
-
-
-# Generate string and hash tables for our terminfo strings in term.h
-# We don't expose the hash or tables directly, but instead via functions.
-# This allows us to freely change how we hash or store our string tables
-# in the future.
-
-set -e
-: ${TOOL_AWK:=awk}
-: ${TOOL_NBPERF:=nbperf}
-: ${TOOL_SED:=sed}
-
-TERMH=${1:-term.h}
-
-genent()
-{
-	local name=$1 NAME=$2 len=
-
-	# Calculate the maximum word length plus terminator
-	len=$($TOOL_SED -e "1,/enum TI${NAME}/d" -e '/};/,$d' \
-            -e 's/.*TICODE_\([^,]*\).*/\1X/' $TERMH | \
-	    $TOOL_AWK \
-	    'BEGIN {L=0} {if (length($1)>L) L=length($1)} END {print L}')
-
-	echo
-	echo "static const char _ti_${name}ids[][${len}] = {"
-	$TOOL_SED -e "1,/enum TI${NAME}/d" -e '/};/,$d' \
-            -e 's/.*TICODE_\([^,]*\).*/	"\1",/' $TERMH
-	echo "};"
-	echo
-	$TOOL_SED -e "1,/enum TI${NAME}/d" -e '/};/,$d' \
-	    -e 's/.*TICODE_\([^,]*\).*/\1/' $TERMH | \
-	    $TOOL_NBPERF -p -s -n _ti_${name}hash;
-
-	cat <<EOF
-
-const char *
-_ti_${name}id(ssize_t idx)
-{
-
-	if ((size_t)idx > __arraycount(_ti_${name}ids))
-		return NULL;
-	return _ti_${name}ids[idx];
-}
-
-ssize_t
-_ti_${name}index(const char *key)
-{
-	uint32_t idx;
-
-	idx = _ti_${name}hash((const unsigned char *)key, strlen(key));
-	if (idx > __arraycount(_ti_${name}ids) ||
-	    strcmp(key, _ti_${name}ids[idx]) != 0)
-		return -1;
-	return idx;
-}
-EOF
-}
-
-cat <<EOF
-/* DO NOT EDIT
- * Automatically generated from term.h */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <term_private.h>
-#include <term.h>
-EOF
-
-genent flag FLAG
-genent num NUM
-genent str STR
diff --git a/lib/libterminfo/genman b/lib/libterminfo/genman
deleted file mode 100755
index ac95e8494..000000000
--- a/lib/libterminfo/genman
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-# $NetBSD: genman,v 1.5 2013/01/25 12:52:45 roy Exp $
-
-# Copyright (c) 2009, 2013 The NetBSD Foundation, Inc.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Roy Marples.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list 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.
-
-
-# Generate variable tables for terminfo.5 from our source files.
-
-set -e
-: ${TOOL_SED:=sed}
-: ${TOOL_SORT:=sort}
-
-TERMM=${1:-terminfo.5.in}
-TERMH=${2:-term.h}
-TERMC=${3:-termcap_map.c}
-
-gentab()
-{
-	local ti=$1 tc=$2 tab=$3
-
-	# Generate a list of long names and codes
-	$TOOL_SED -n \
-	-e "s/#define t_\([^(]*\).*>$tab\[TICODE_\([^]]*\).*/\1 \2/p" \
-	$ti | $TOOL_SORT | while read name code foo; do
-		cap=$($TOOL_SED -ne "s/.*{ \"\(..\)\", TICODE_$code }.*/\1/p" \
-		    $tc | head -n 1)
-		desc=$($TOOL_SED -ne "s/ \* $name\: \(.*\)/\1/p" $ti)
-		echo ".It \"\\&$name\" Ta Sy \"\\&$code\" Ta Sy \"\\&$cap\" Ta \"\\&$desc\""
-	done
-}
-
-boolcaps=$(gentab $TERMH $TERMC flags)
-numcaps=$(gentab $TERMH $TERMC nums)
-strcaps=$(gentab $TERMH $TERMC strs)
-
-echo ".\\\"DO NOT EDIT"
-echo ".\\\"Automatically generated from termcap.5.in"
-echo ".\\\""
-
-while read -r line; do
-	case "$line" in
-	"@BOOLCAPS@")	echo "$boolcaps";;
-	"@NUMCAPS@")	echo "$numcaps";;
-	"@STRCAPS@")	echo "$strcaps";;
-	*)		echo "$line";;
-	esac
-done <$TERMM
diff --git a/lib/libterminfo/genterms b/lib/libterminfo/genterms
deleted file mode 100755
index c64433ea1..000000000
--- a/lib/libterminfo/genterms
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# $NetBSD: genterms,v 1.4 2011/11/02 12:09:25 roy Exp $
-
-# Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Roy Marples.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list 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.
-
-
-# Generate compiled terminfo descriptions to embed into libterminfo
-
-set -e
-: ${TOOL_TIC:=tic}
-: ${NETBSDSRCDIR:=/usr/src}
-: ${TERMINFO:=${NETBSDSRCDIR}/share/terminfo/terminfo}
-
-echo "/* DO NOT EDIT"
-echo " * Automatically generated from terminfo */"
-echo
-${TOOL_TIC} -Sx ${TERMINFO} ansi dumb minix screen screen-256color rxvt rxvt-256color vt100 vt220 wsvt25 xterm
diff --git a/lib/libterminfo/genthash b/lib/libterminfo/genthash
deleted file mode 100755
index 27d70e9a1..000000000
--- a/lib/libterminfo/genthash
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-# $NetBSD: genthash,v 1.5 2011/11/02 12:09:25 roy Exp $
-
-# Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Roy Marples.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list 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.
-
-
-# Generate string and hash tables for our termcap strings in termcap.c
-
-set -e
-: ${TOOL_NBPERF:=nbperf}
-: ${TOOL_SED:=sed}
-
-TERMCAPC=${1:-termcap_map.c}
-
-cat <<EOF
-/* DO NOT EDIT
- * Automatically generated from termcap.c */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <term_private.h>
-
-EOF
-
-$TOOL_SED -n -e "1,/_ti_cap_flagids/d" -e '/};/,$d' \
-	-e 's/.*"\([^"]*\)".*/\1/p' $TERMCAPC | \
-	$TOOL_NBPERF -p -s -n _t_flaghash
-echo
-$TOOL_SED -n -e "1,/_ti_cap_numids/d" -e '/};/,$d' \
-	-e 's/.*"\([^"]*\)".*/\1/p' $TERMCAPC | \
-	$TOOL_NBPERF -p -s -n _t_numhash
-echo
-$TOOL_SED -n -e "1,/_ti_cap_strids/d" -e '/};/,$d' \
-	-e 's/.*"\([^"]*\)".*/\1/p' $TERMCAPC | \
-	$TOOL_NBPERF -p -s -n _t_strhash
diff --git a/lib/libterminfo/setupterm.c b/lib/libterminfo/setupterm.c
deleted file mode 100644
index 16fc2a02c..000000000
--- a/lib/libterminfo/setupterm.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* $NetBSD: setupterm.c,v 1.4 2013/06/07 13:16:18 roy Exp $ */
-
-/*
- * Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Roy Marples.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: setupterm.c,v 1.4 2013/06/07 13:16:18 roy Exp $");
-
-#include <assert.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <strings.h>
-#include <unistd.h>
-#include <term_private.h>
-#include <term.h>
-
-#define reterr(code, msg)						      \
-	do {								      \
-		if (errret == NULL)					      \
-			errx(EXIT_FAILURE, msg);			      \
-		else {							      \
-			*errret = code;					      \
-			return ERR;					      \
-		}							      \
-	} while (0 /* CONSTCOND */)
-
-#define reterrarg(code, msg, arg) \
-	do {								      \
-		if (errret == NULL)					      \
-			errx(EXIT_FAILURE, msg, arg);			      \
-		else {							      \
-			*errret = code;					      \
-			return ERR;					      \
-		}							      \
-	} while (0 /* CONSTCOND */)
-
-
-int
-ti_setupterm(TERMINAL **nterm, const char *term, int fildes, int *errret)
-{
-	int error;
-
-	_DIAGASSERT(nterm != NULL);
-
-	if (term == NULL)
-		term = getenv("TERM");
-	if (term == NULL || *term == '\0') {
-		*nterm = NULL;
-		reterr(0, "TERM environment variable not set");
-	}
-	if (fildes == STDOUT_FILENO && !isatty(fildes))
-		fildes = STDERR_FILENO;
-
-	*nterm = calloc(1, sizeof(**nterm));
-	if (*nterm == NULL)
-		reterr(-1, "not enough memory to create terminal structure");
-
-	error = _ti_getterm(*nterm, term, 0);
-	if (error != 1) {
-		del_curterm(*nterm);
-		*nterm = NULL;
-		switch (error) {
-		case -1:
-			reterr(error, "cannot access the terminfo database");
-			/* NOTREACHED */
-		case 0:
-			reterrarg(error,
-			    "%s: terminal not listed in terminfo datase",
-			    term);
-			/* NOTREACHED */
-		default:
-			reterr(-1, "unknown error");
-			/* NOTREACHED */
-		}
-	}
-
-	(*nterm)->fildes = fildes;
-	_ti_setospeed(*nterm);
-	if (t_generic_type(*nterm))
-		reterrarg(0, "%s: generic terminal", term);
-	if (t_hard_copy(*nterm))
-		reterrarg(1, "%s: hardcopy terminal", term);
-	/* POSIX requires 1 for success */
-	if (errret)
-		*errret = 1;
-	return OK;
-}
-
-int
-setupterm(const char *term, int fildes, int *errret)
-{
-	TERMINAL *nterm;
-	int ret;
-
-	if (errret != NULL)
-		*errret = ERR;
-	ret = ti_setupterm(&nterm, term, fildes, errret);
-	if (nterm != NULL)
-		set_curterm(nterm);
-	return ret;
-}
diff --git a/lib/libterminfo/shlib_version b/lib/libterminfo/shlib_version
deleted file mode 100644
index 9592ee5d8..000000000
--- a/lib/libterminfo/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.1 2010/02/03 15:16:32 roy Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=1
-minor=0
diff --git a/lib/libterminfo/term.c b/lib/libterminfo/term.c
deleted file mode 100644
index 840d03c87..000000000
--- a/lib/libterminfo/term.c
+++ /dev/null
@@ -1,416 +0,0 @@
-/* $NetBSD: term.c,v 1.17 2013/06/07 13:16:18 roy Exp $ */
-
-/*
- * Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Roy Marples.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: term.c,v 1.17 2013/06/07 13:16:18 roy Exp $");
-
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <cdbr.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <term_private.h>
-#include <term.h>
-
-#if !defined(__minix)
-#define _PATH_TERMINFO		"/usr/share/misc/terminfo"
-#else
-#define _PATH_TERMINFO		"/usr/share/terminfo/terminfo"
-#endif /* !defined(__minix) */
-
-static char database[PATH_MAX];
-static char pathbuf[PATH_MAX];
-const char *_ti_database;
-
-/* Include a generated list of pre-compiled terminfo descriptions. */
-#include "compiled_terms.c"
-
-static int
-_ti_readterm(TERMINAL *term, const char *cap, size_t caplen, int flags)
-{
-	uint8_t ver;
-	uint16_t ind, num;
-	size_t len;
-	TERMUSERDEF *ud;
-
-	ver = *cap++;
-	/* Only read version 1 structures */
-	if (ver != 1) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	term->flags = calloc(TIFLAGMAX + 1, sizeof(char));
-	if (term->flags == NULL)
-		return -1;
-	term->nums = malloc((TINUMMAX + 1) * sizeof(short));
-	if (term->nums == NULL)
-		return -1;
-	memset(term->nums, (short)-1, (TINUMMAX + 1) * sizeof(short));
-	term->strs = calloc(TISTRMAX + 1, sizeof(char *));
-	if (term->strs == NULL)
-		return -1;
-	term->_arealen = caplen;
-	term->_area = malloc(term->_arealen);
-	if (term->_area == NULL)
-		return -1;
-	memcpy(term->_area, cap, term->_arealen);
-
-	cap = term->_area;
-	len = le16dec(cap);
-	cap += sizeof(uint16_t);
-	term->name = cap;
-	cap += len;
-	len = le16dec(cap);
-	cap += sizeof(uint16_t);
-	if (len == 0)
-		term->_alias = NULL;
-	else {
-		term->_alias = cap;
-		cap += len;
-	}
-	len = le16dec(cap);
-	cap += sizeof(uint16_t);
-	if (len == 0)
-		term->desc = NULL;
-	else {
-		term->desc = cap;
-		cap += len;
-	}
-
-	num = le16dec(cap);
-	cap += sizeof(uint16_t);
-	if (num != 0) {
-		num = le16dec(cap);
-		cap += sizeof(uint16_t);
-		for (; num != 0; num--) {
-			ind = le16dec(cap);
-			cap += sizeof(uint16_t);
-			term->flags[ind] = *cap++;
-			if (flags == 0 && !VALID_BOOLEAN(term->flags[ind]))
-				term->flags[ind] = 0;
-		}
-	}
-
-	num = le16dec(cap);
-	cap += sizeof(uint16_t);
-	if (num != 0) {
-		num = le16dec(cap);
-		cap += sizeof(uint16_t);
-		for (; num != 0; num--) {
-			ind = le16dec(cap);
-			cap += sizeof(uint16_t);
-			term->nums[ind] = le16dec(cap);
-			if (flags == 0 && !VALID_NUMERIC(term->nums[ind]))
-				term->nums[ind] = ABSENT_NUMERIC;
-			cap += sizeof(uint16_t);
-		}
-	}
-
-	num = le16dec(cap);
-	cap += sizeof(uint16_t);
-	if (num != 0) {
-		num = le16dec(cap);
-		cap += sizeof(uint16_t);
-		for (; num != 0; num--) {
-			ind = le16dec(cap);
-			cap += sizeof(uint16_t);
-			len = le16dec(cap);
-			cap += sizeof(uint16_t);
-			if (len > 0)
-				term->strs[ind] = cap;
-			else if (flags == 0)
-				term->strs[ind] = ABSENT_STRING;
-			else
-				term->strs[ind] = CANCELLED_STRING;
-			cap += len;
-		}
-	}
-
-	num = le16dec(cap);
-	cap += sizeof(uint16_t);
-	if (num != 0) {
-		term->_nuserdefs = le16dec(cap);
-		term->_userdefs = malloc(sizeof(*term->_userdefs) * num);
-		cap += sizeof(uint16_t);
-		for (num = 0; num < term->_nuserdefs; num++) {
-			ud = &term->_userdefs[num];
-			len = le16dec(cap);
-			cap += sizeof(uint16_t);
-			ud->id = cap;
-			cap += len;
-			ud->type = *cap++;
-			switch (ud->type) {
-			case 'f':
-				ud->flag = *cap++;
-				if (flags == 0 &&
-				    !VALID_BOOLEAN(ud->flag))
-					ud->flag = 0;
-				ud->num = ABSENT_NUMERIC;
-				ud->str = ABSENT_STRING;
-				break;
-			case 'n':
-				ud->flag = ABSENT_BOOLEAN;
-				ud->num = le16dec(cap);
-				if (flags == 0 &&
-				    !VALID_NUMERIC(ud->num))
-					ud->num = ABSENT_NUMERIC;
-				ud->str = ABSENT_STRING;
-				cap += sizeof(uint16_t);
-				break;
-			case 's':
-				ud->flag = ABSENT_BOOLEAN;
-				ud->num = ABSENT_NUMERIC;
-				len = le16dec(cap);
-				cap += sizeof(uint16_t);
-				if (len > 0)
-					ud->str = cap;
-				else if (flags == 0)
-					ud->str = ABSENT_STRING;
-				else
-					ud->str = CANCELLED_STRING;
-				cap += len;
-				break;
-			default:
-				errno = EINVAL;
-				return -1;
-			}
-		}
-	}
-	return 1;
-}
-
-static int
-_ti_dbgetterm(TERMINAL *term, const char *path, const char *name, int flags)
-{
-	struct cdbr *db;
-	const void *data;
-	char *db_name;
-	const uint8_t *data8;
-	size_t len, klen;
-	int r;
-
-	if (asprintf(&db_name, "%s.cdb", path) < 0)
-		return -1;
-
-	db = cdbr_open(db_name, CDBR_DEFAULT);
-	free(db_name);
-	if (db == NULL)
-		return -1;
-
-	klen = strlen(name) + 1;
-	if (cdbr_find(db, name, klen, &data, &len) == -1)
-		goto fail;
-	data8 = data;
-	if (len == 0)
-		goto fail;
-	/* Check for alias first, fall through to processing normal entries. */
-	if (data8[0] == 2) {
-		if (klen + 7 > len || le16dec(data8 + 5) != klen)
-			goto fail;
-		if (memcmp(data8 + 7, name, klen))
-			goto fail;
-		if (cdbr_get(db, le32dec(data8 + 1), &data, &len))
-			goto fail;
-		data8 = data;
-		if (data8[0] != 1)
-			goto fail;
-	} else if (data8[0] != 1)
-		goto fail;
-	else if (klen + 3 >= len || le16dec(data8 + 1) != klen)
-		goto fail;
-	else if (memcmp(data8 + 3, name, klen))
-		goto fail;
-
-	strlcpy(database, path, sizeof(database));
-	_ti_database = database;
-
-	r = _ti_readterm(term, data, len, flags);
-	cdbr_close(db);
-	return r;
-
- fail:
-	cdbr_close(db);
-	return 0;
-}
-
-static int
-_ti_dbgettermp(TERMINAL *term, const char *path, const char *name, int flags)
-{
-	const char *p;
-	size_t l;
-	int r, e;
-
-	e = -1;
-	r = 0;
-	do {
-		for (p = path; *path != '\0' && *path != ':'; path++)
-			continue;
-		l = path - p;
-		if (l != 0 && l + 1 < sizeof(pathbuf)) {
-			memcpy(pathbuf, p, l);
-			pathbuf[l] = '\0';
-			r = _ti_dbgetterm(term, pathbuf, name, flags);
-			if (r == 1)
-				return 1;
-			if (r == 0)
-				e = 0;
-		}
-	} while (*path++ == ':');
-	return e;
-}
-
-static int
-ticcmp(const TIC *tic, const char *name)
-{
-	char *alias, *s;
-	size_t len, l;
-
-	if (strcmp(tic->name, name) == 0)
-		return 0;
-	if (tic->alias == NULL)
-		return -1;
-
-	len = strlen(name);
-	alias = tic->alias;
-	while (*alias != '\0') {
-		s = strchr(alias, '|');
-		if (s == NULL)
-			l = strlen(alias);
-		else
-			l = s - alias;
-		if (len == l && memcmp(alias, name, l) == 0)
-			return 0;
-		if (s == NULL)
-			break;
-		alias = s + 1;
-	}
-	return 1;
-}
-
-static int
-_ti_findterm(TERMINAL *term, const char *name, int flags)
-{
-	int r;
-	char *c, *e, h[PATH_MAX];
-	TIC *tic;
-	uint8_t *f;
-	ssize_t len;
-
-	_DIAGASSERT(term != NULL);
-	_DIAGASSERT(name != NULL);
-
-	database[0] = '\0';
-	_ti_database = NULL;
-	r = 0;
-
-	if ((e = getenv("TERMINFO")) != NULL && *e != '\0')
-		if (e[0] == '/')
-			return _ti_dbgetterm(term, e, name, flags);
-
-	c = NULL;
-	if (e == NULL && (c = getenv("TERMCAP")) != NULL) {
-		if (*c != '\0' && *c != '/') {
-			c = strdup(c);
-			if (c != NULL) {
-				e = captoinfo(c);
-				free(c);
-			}
-		}
-	}
-
-	if (e != NULL) {
-		if (c == NULL)
-			e = strdup(e); /* So we don't destroy env */
-		if (e  == NULL)
-			tic = NULL;
-		else
-			tic = _ti_compile(e, TIC_WARNING |
-			    TIC_ALIAS | TIC_DESCRIPTION | TIC_EXTRA);
-		if (c == NULL && e != NULL)
-			free(e);
-		if (tic != NULL && ticcmp(tic, name) == 0) {
-			len = _ti_flatten(&f, tic);
-			if (len != -1) {
-				r = _ti_readterm(term, (char *)f, (size_t)len,
-				    flags);
-				free(f);
-			}
-		}
-		_ti_freetic(tic);
-		if (r == 1) {
-			if (c == NULL)
-				_ti_database = "$TERMINFO";
-			else
-				_ti_database = "$TERMCAP";
-			return r;
-		}
-	}
-
-	if ((e = getenv("TERMINFO_DIRS")) != NULL)
-		return _ti_dbgettermp(term, e, name, flags);
-
-	if ((e = getenv("HOME")) != NULL) {
-		snprintf(h, sizeof(h), "%s/.terminfo", e);
-		r = _ti_dbgetterm(term, h, name, flags);
-	}
-	if (r != 1)
-		r = _ti_dbgettermp(term, _PATH_TERMINFO, name, flags);
-
-	return r;
-
-}
-
-int
-_ti_getterm(TERMINAL *term, const char *name, int flags)
-{
-	int r;
-	size_t i;
-	const struct compiled_term *t;
-
-	r = _ti_findterm(term, name, flags);
-	if (r == 1)
-		return r;
-
-	for (i = 0; i < __arraycount(compiled_terms); i++) {
-		t = &compiled_terms[i];
-		if (strcmp(name, t->name) == 0) {
-			r = _ti_readterm(term, t->cap, t->caplen, flags);
-			break;
-		}
-	}
-
-	return r;
-}
diff --git a/lib/libterminfo/term.h b/lib/libterminfo/term.h
deleted file mode 100644
index 02815a1a7..000000000
--- a/lib/libterminfo/term.h
+++ /dev/null
@@ -1,2007 +0,0 @@
-/*
- * Copyright (c) 1987, 1997, 2006,
- * Vrije Universiteit, Amsterdam, The Netherlands.
- * All rights reserved. Redistribution and use of the MINIX 3 operating system
- * in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of the Vrije Universiteit nor the names of the software
- *     authors or contributors may be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *   * Any deviations from these conditions require written permission from the
- *     copyright holder in advance
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, AUTHORS, AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
- * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL PRENTICE HALL OR ANY
- * AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Contributions by Roy Marples.
- */
-
-#ifndef _TERM_H_
-#define _TERM_H_
-
-#ifndef ERR
-#define ERR (-1) /* Error return */
-#define OK (0)   /* Success return */
-#endif
-
-/* Define available terminfo flags */
-enum TIFLAGS {
-  TICODE_bw,
-  TICODE_am,
-  TICODE_bce,
-  TICODE_ccc,
-  TICODE_xhp,
-  TICODE_xhpa,
-  TICODE_cpix,
-  TICODE_crxm,
-  TICODE_xt,
-  TICODE_xenl,
-  TICODE_eo,
-  TICODE_gn,
-  TICODE_hc,
-  TICODE_chts,
-  TICODE_km,
-  TICODE_daisy,
-  TICODE_hs,
-  TICODE_hls,
-  TICODE_in,
-  TICODE_lpix,
-  TICODE_da,
-  TICODE_db,
-  TICODE_mir,
-  TICODE_msgr,
-  TICODE_nxon,
-  TICODE_xsb,
-  TICODE_npc,
-  TICODE_ndscr,
-  TICODE_nrrmc,
-  TICODE_os,
-  TICODE_mc5i,
-  TICODE_xvpa,
-  TICODE_sam,
-  TICODE_eslok,
-  TICODE_hz,
-  TICODE_ul,
-  TICODE_xon
-};
-#define TIFLAGMAX TICODE_xon
-
-#define t_auto_left_margin(t) (t)->flags[TICODE_bw]
-#define t_auto_right_margin(t) (t)->flags[TICODE_am]
-#define t_back_color_erase(t) (t)->flags[TICODE_bce]
-#define t_can_change(t) (t)->flags[TICODE_ccc]
-#define t_ceol_standout_glitch(t) (t)->flags[TICODE_xhp]
-#define t_col_addr_glitch(t) (t)->flags[TICODE_xhpa]
-#define t_cpi_changes_res(t) (t)->flags[TICODE_cpix]
-#define t_cr_cancels_micro_mode(t) (t)->flags[TICODE_crxm]
-#define t_dest_tabs_magic_smso(t) (t)->flags[TICODE_xt]
-#define t_eat_newline_glitch(t) (t)->flags[TICODE_xenl]
-#define t_erase_overstrike(t) (t)->flags[TICODE_eo]
-#define t_generic_type(t) (t)->flags[TICODE_gn]
-#define t_hard_copy(t) (t)->flags[TICODE_hc]
-#define t_hard_cursor(t) (t)->flags[TICODE_chts]
-#define t_has_meta_key(t) (t)->flags[TICODE_km]
-#define t_has_print_wheel(t) (t)->flags[TICODE_daisy]
-#define t_has_status_line(t) (t)->flags[TICODE_hs]
-#define t_hue_light_saturation(t) (t)->flags[TICODE_hls]
-#define t_insert_null_glitch(t) (t)->flags[TICODE_in]
-#define t_lpi_changes_yes(t) (t)->flags[TICODE_lpix]
-#define t_memory_above(t) (t)->flags[TICODE_da]
-#define t_memory_below(t) (t)->flags[TICODE_db]
-#define t_move_insert_mode(t) (t)->flags[TICODE_mir]
-#define t_move_standout_mode(t) (t)->flags[TICODE_msgr]
-#define t_needs_xon_xoff(t) (t)->flags[TICODE_nxon]
-#define t_no_esc_ctlc(t) (t)->flags[TICODE_xsb]
-#define t_no_pad_char(t) (t)->flags[TICODE_npc]
-#define t_non_dest_scroll_region(t) (t)->flags[TICODE_ndscr]
-#define t_non_rev_rmcup(t) (t)->flags[TICODE_nrrmc]
-#define t_over_strike(t) (t)->flags[TICODE_os]
-#define t_prtr_silent(t) (t)->flags[TICODE_mc5i]
-#define t_row_addr_glitch(t) (t)->flags[TICODE_xvpa]
-#define t_semi_auto_right_margin(t) (t)->flags[TICODE_sam]
-#define t_status_line_esc_ok(t) (t)->flags[TICODE_eslok]
-#define t_tilde_glitch(t) (t)->flags[TICODE_hz]
-#define t_transparent_underline(t) (t)->flags[TICODE_ul]
-#define t_xon_xoff(t) (t)->flags[TICODE_xon]
-
-#define auto_left_margin t_auto_left_margin(cur_term)
-#define auto_right_margin t_auto_right_margin(cur_term)
-#define back_color_erase t_back_color_erase(cur_term)
-#define can_change t_can_change(cur_term)
-#define ceol_standout_glitch t_ceol_standout_glitch(cur_term)
-#define col_addr_glitch t_col_addr_glitch(cur_term)
-#define cpi_changes_res t_cpi_changes_res(cur_term)
-#define cr_cancels_micro_mode t_cr_cancels_micro_mode(cur_term)
-#define dest_tabs_magic_smso t_dest_tabs_magic_smso(cur_term)
-#define eat_newline_glitch t_eat_newline_glitch(cur_term)
-#define erase_overstrike t_erase_overstrike(cur_term)
-#define generic_type t_generic_type(cur_term)
-#define hard_copy t_hard_copy(cur_term)
-#define hard_cursor t_hard_cursor(cur_term)
-#define has_meta_key t_has_meta_key(cur_term)
-#define has_print_wheel t_has_print_wheel(cur_term)
-#define has_status_line t_has_status_line(cur_term)
-#define hue_light_saturation t_hue_light_saturation(cur_term)
-#define insert_null_glitch t_insert_null_glitch(cur_term)
-#define lpi_changes_yes t_lpi_changes_yes(cur_term)
-#define memory_above t_memory_above(cur_term)
-#define memory_below t_memory_below(cur_term)
-#define move_insert_mode t_move_insert_mode(cur_term)
-#define move_standout_mode t_move_standout_mode(cur_term)
-#define needs_xon_xoff t_needs_xon_xoff(cur_term)
-#define no_esc_ctlc t_no_esc_ctlc(cur_term)
-#define no_pad_char t_no_pad_char(cur_term)
-#define non_dest_scroll_region t_non_dest_scroll_region(cur_term)
-#define non_rev_rmcup t_non_rev_rmcup(cur_term)
-#define over_strike t_over_strike(cur_term)
-#define prtr_silent t_prtr_silent(cur_term)
-#define row_addr_glitch t_row_addr_glitch(cur_term)
-#define semi_auto_right_margin t_semi_auto_right_margin(cur_term)
-#define status_line_esc_ok t_status_line_esc_ok(cur_term)
-#define tilde_glitch t_tilde_glitch(cur_term)
-#define transparent_underline t_transparent_underline(cur_term)
-#define xon_xoff t_xon_xoff(cur_term)
-
-/*
- * BOOLEAN DESCRIPTIONS
- *
- * auto_left_margin: cub1 wraps from column 0 to last column
- * auto_right_margin: Terminal has automatic margins
- * back_color_erase: Screen erased with background colour
- * can_change: Terminal can re-define existing colour
- * ceol_standout_glitch: Standout not erased by overwriting (hp)
- * col_addr_glitch: Only positive motion for hpa/mhba caps
- * cpi_changes_res: Changing character pitch changes resolution
- * cr_cancels_micro_mode: Using cr turns off micro mode
- * dest_tabs_magic_smso: Destructive tabs, magic smso char (t1061)
- * eat_newline_glitch: Newline ignored after 80 columns (Concept)
- * erase_overstrike: Can erase overstrikes with a blank line
- * generic_type: Generic line type (e.g. dialup, switch)
- * hard_copy: Hardcopy terminal
- * hard_cursor: Cursor is hard to see
- * has_meta_key: Has a meta key (shift, sets parity bit)
- * has_print_wheel: Printer needs operator to change character set
- * has_status_line: Has extra "status line"
- * hue_light_saturation: Terminal only uses HLS colour notion (Tektronix)
- * insert_null_glitch: Insert mode distinguishes nulls
- * lpi_changes_yes: Changing line pitch changes resolution
- * memory_above: Display may be retained above the screen
- * memory_below: Display may be retained below the screen
- * move_insert_mode: Safe to move while in insert mode
- * move_standout_mode: Safe to move in standout modes
- * needs_xon_xoff: Padding won't work, xon/xoff required
- * no_esc_ctlc: Beehive (f1=escape, f2=ctrl C)
- * no_pad_char: Pad character doesn't exist
- * non_dest_scroll_region: Scrolling region is nondestructive
- * non_rev_rmcup: smcup does not reverse rmcup
- * over_strike: Terminal overstrikes on hard-copy terminal
- * prtr_silent: Printer won't echo on screen
- * row_addr_glitch: Only positive motion for vpa/mvpa caps
- * semi_auto_right_margin: Printing in last column causes cr
- * status_line_esc_ok: Escape can be used on the status line
- * tilde_glitch: Hazeltine; can't print tilde (~)
- * transparent_underline: Underline character overstrikes
- * xon_xoff: Terminal uses xon/xoff handshaking
- */
-
-/* Define available terminfo numbers */
-enum TINUMS {
-  TICODE_bitwin,
-  TICODE_bitype,
-  TICODE_bufsz,
-  TICODE_btns,
-  TICODE_cols,
-  TICODE_spinh,
-  TICODE_spinv,
-  TICODE_it,
-  TICODE_lh,
-  TICODE_lw,
-  TICODE_lines,
-  TICODE_lm,
-  TICODE_ma,
-  TICODE_xmc,
-  TICODE_colors,
-  TICODE_maddr,
-  TICODE_mjump,
-  TICODE_pairs,
-  TICODE_wnum,
-  TICODE_mcs,
-  TICODE_mls,
-  TICODE_ncv,
-  TICODE_nlab,
-  TICODE_npins,
-  TICODE_orc,
-  TICODE_orl,
-  TICODE_orhi,
-  TICODE_orvi,
-  TICODE_pb,
-  TICODE_cps,
-  TICODE_vt,
-  TICODE_widcs,
-  TICODE_wsl
-};
-#define TINUMMAX TICODE_wsl
-
-#define t_bit_image_entwining(t) (t)->nums[TICODE_bitwin]
-#define t_bit_image_type(t) (t)->nums[TICODE_bitype]
-#define t_buffer_capacity(t) (t)->nums[TICODE_bufsz]
-#define t_buttons(t) (t)->nums[TICODE_btns]
-#define t_columns(t) (t)->nums[TICODE_cols]
-#define t_dot_horz_spacing(t) (t)->nums[TICODE_spinh]
-#define t_dot_vert_spacing(t) (t)->nums[TICODE_spinv]
-#define t_init_tabs(t) (t)->nums[TICODE_it]
-#define t_label_height(t) (t)->nums[TICODE_lh]
-#define t_label_width(t) (t)->nums[TICODE_lw]
-#define t_lines(t) (t)->nums[TICODE_lines]
-#define t_lines_of_memory(t) (t)->nums[TICODE_lm]
-#define t_max_attributes(t) (t)->nums[TICODE_ma]
-#define t_magic_cookie_glitch(t) (t)->nums[TICODE_xmc]
-#define t_max_colors(t) (t)->nums[TICODE_colors]
-#define t_max_micro_address(t) (t)->nums[TICODE_maddr]
-#define t_max_micro_jump(t) (t)->nums[TICODE_mjump]
-#define t_max_pairs(t) (t)->nums[TICODE_pairs]
-#define t_maximum_windows(t) (t)->nums[TICODE_wnum]
-#define t_micro_col_size(t) (t)->nums[TICODE_mcs]
-#define t_micro_line_size(t) (t)->nums[TICODE_mls]
-#define t_no_color_video(t) (t)->nums[TICODE_ncv]
-#define t_num_labels(t) (t)->nums[TICODE_nlab]
-#define t_number_of_pins(t) (t)->nums[TICODE_npins]
-#define t_output_res_char(t) (t)->nums[TICODE_orc]
-#define t_output_res_line(t) (t)->nums[TICODE_orl]
-#define t_output_res_horz_inch(t) (t)->nums[TICODE_orhi]
-#define t_output_res_vert_inch(t) (t)->nums[TICODE_orvi]
-#define t_padding_baud_rate(t) (t)->nums[TICODE_pb]
-#define t_print_rate(t) (t)->nums[TICODE_cps]
-#define t_virtual_terminal(t) (t)->nums[TICODE_vt]
-#define t_wide_char_size(t) (t)->nums[TICODE_widcs]
-#define t_width_status_line(t) (t)->nums[TICODE_wsl]
-
-#define bit_image_entwining t_bit_image_entwining(cur_term)
-#define bit_image_type t_bit_image_type(cur_term)
-#define buffer_capacity t_buffer_capacity(cur_term)
-#define buttons t_buttons(cur_term)
-#define columns t_columns(cur_term)
-#define dot_horz_spacing t_dot_horz_spacing(cur_term)
-#define dot_vert_spacing t_dot_vert_spacing(cur_term)
-#define init_tabs t_init_tabs(cur_term)
-#define label_height t_label_height(cur_term)
-#define label_width t_label_width(cur_term)
-#define lines t_lines(cur_term)
-#define lines_of_memory t_lines_of_memory(cur_term)
-#define max_attributes t_max_attributes(cur_term)
-#define magic_cookie_glitch t_magic_cookie_glitch(cur_term)
-#define max_colors t_max_colors(cur_term)
-#define max_micro_address t_max_micro_address(cur_term)
-#define max_micro_jump t_max_micro_jump(cur_term)
-#define max_pairs t_max_pairs(cur_term)
-#define maximum_windows t_maximum_windows(cur_term)
-#define micro_col_size t_micro_col_size(cur_term)
-#define micro_line_size t_micro_line_size(cur_term)
-#define no_color_video t_no_color_video(cur_term)
-#define num_labels t_num_labels(cur_term)
-#define number_of_pins t_number_of_pins(cur_term)
-#define output_res_char t_output_res_char(cur_term)
-#define output_res_line t_output_res_line(cur_term)
-#define output_res_horz_inch t_output_res_horz_inch(cur_term)
-#define output_res_vert_inch t_output_res_vert_inch(cur_term)
-#define padding_baud_rate t_padding_baud_rate(cur_term)
-#define print_rate t_print_rate(cur_term)
-#define virtual_terminal t_virtual_terminal(cur_term)
-#define wide_char_size t_wide_char_size(cur_term)
-#define width_status_line t_width_status_line(cur_term)
-
-/*
- * NUMBER DESCRIPTIONS
- *
- * bit_image_entwining: Number of passes for each bit-map row
- * bit_image_type: Type of bit image device
- * buffer_capacity: Number of bytes buffered before printing
- * buttons: Number of buttons on the mouse
- * columns: Number of columns in a line
- * dot_horz_spacing: Spacing of dots horizontally in dots per inch
- * dot_vert_spacing: Spacing of pins vertically in pins per inch
- * init_tabs: Tabs initially every #1 spaces
- * label_height: Number of rows in each label
- * label_width: Numbre of columns in each label
- * lines: Number of lines on a screen or a page
- * lines_of_memory: Lines of memory of > lines; 0 means varies
- * max_attributes: Maximum combined video attributes terminal can display
- * magic_cookie_glitch: Number of blank characters left by smso or rmso
- * max_colors: Maximum number of colours on the screen
- * max_micro_address: Maximum value in micro_..._addresss
- * max_micro_jump: Maximum value in parm_..._micro
- * max_pairs: Maximum number of colour-pairs on the screen
- * maximum_windows: Maximum number of definable windows
- * micro_col_size: Character step size when in micro mode
- * micro_line_size: Line step size when in micro mode
- * no_color_video: Video attributes that can't be used with colours
- * num_labels: Number of labels on screen (start at 1)
- * number_of_pins: Number of pins in print-head
- * output_res_char: Horizontal resolution in units per character
- * output_res_line: Vertical resolution in units per line
- * output_res_horz_inch: Horizontal resolution in units per inch
- * output_res_vert_inch: Vertical resolution in units per inch
- * padding_baud_rate: Lowest baud rate where padding needed
- * print_rate: Print rate in characters per second
- * virtual_terminal: Virtual terminal number
- * wide_char_size: Character step size when in double-wide mode
- * width_status_line: Number of columns in status line
- */
-
-/* Define available terminfo strings */
-enum TISTRS {
-  TICODE_acsc,
-  TICODE_scesa,
-  TICODE_cbt,
-  TICODE_bel,
-  TICODE_bicr,
-  TICODE_binel,
-  TICODE_birep,
-  TICODE_cr,
-  TICODE_cpi,
-  TICODE_lpi,
-  TICODE_chr,
-  TICODE_cvr,
-  TICODE_csr,
-  TICODE_rmp,
-  TICODE_csnm,
-  TICODE_tbc,
-  TICODE_mgc,
-  TICODE_clear,
-  TICODE_el1,
-  TICODE_el,
-  TICODE_ed,
-  TICODE_csin,
-  TICODE_colornm,
-  TICODE_hpa,
-  TICODE_cmdch,
-  TICODE_cwin,
-  TICODE_cup,
-  TICODE_cud1,
-  TICODE_home,
-  TICODE_civis,
-  TICODE_cub1,
-  TICODE_mrcup,
-  TICODE_cnorm,
-  TICODE_cuf1,
-  TICODE_ll,
-  TICODE_cuu1,
-  TICODE_cvvis,
-  TICODE_defbi,
-  TICODE_defc,
-  TICODE_dch1,
-  TICODE_dl1,
-  TICODE_devt,
-  TICODE_dial,
-  TICODE_dsl,
-  TICODE_dclk,
-  TICODE_dispc,
-  TICODE_hd,
-  TICODE_enacs,
-  TICODE_endbi,
-  TICODE_smacs,
-  TICODE_smam,
-  TICODE_blink,
-  TICODE_bold,
-  TICODE_smcup,
-  TICODE_smdc,
-  TICODE_dim,
-  TICODE_swidm,
-  TICODE_sdrfq,
-  TICODE_ehhlm,
-  TICODE_smir,
-  TICODE_sitm,
-  TICODE_elhlm,
-  TICODE_slm,
-  TICODE_elohlm,
-  TICODE_smicm,
-  TICODE_snlq,
-  TICODE_snrmq,
-  TICODE_smpch,
-  TICODE_prot,
-  TICODE_rev,
-  TICODE_erhlm,
-  TICODE_smsc,
-  TICODE_invis,
-  TICODE_sshm,
-  TICODE_smso,
-  TICODE_ssubm,
-  TICODE_ssupm,
-  TICODE_ethlm,
-  TICODE_smul,
-  TICODE_sum,
-  TICODE_evhlm,
-  TICODE_smxon,
-  TICODE_ech,
-  TICODE_rmacs,
-  TICODE_rmam,
-  TICODE_sgr0,
-  TICODE_rmcup,
-  TICODE_rmdc,
-  TICODE_rwidm,
-  TICODE_rmir,
-  TICODE_ritm,
-  TICODE_rlm,
-  TICODE_rmicm,
-  TICODE_rmpch,
-  TICODE_rmsc,
-  TICODE_rshm,
-  TICODE_rmso,
-  TICODE_rsubm,
-  TICODE_rsupm,
-  TICODE_rmul,
-  TICODE_rum,
-  TICODE_rmxon,
-  TICODE_pause,
-  TICODE_hook,
-  TICODE_flash,
-  TICODE_ff,
-  TICODE_fsl,
-  TICODE_getm,
-  TICODE_wingo,
-  TICODE_hup,
-  TICODE_is1,
-  TICODE_is2,
-  TICODE_is3,
-  TICODE_if,
-  TICODE_iprog,
-  TICODE_initc,
-  TICODE_initp,
-  TICODE_ich1,
-  TICODE_il1,
-  TICODE_ip,
-  TICODE_ka1,
-  TICODE_ka3,
-  TICODE_kb2,
-  TICODE_kbs,
-  TICODE_kbeg,
-  TICODE_kcbt,
-  TICODE_kc1,
-  TICODE_kc3,
-  TICODE_kcan,
-  TICODE_ktbc,
-  TICODE_kclr,
-  TICODE_kclo,
-  TICODE_kcmd,
-  TICODE_kcpy,
-  TICODE_kcrt,
-  TICODE_kctab,
-  TICODE_kdch1,
-  TICODE_kdl1,
-  TICODE_kcud1,
-  TICODE_krmir,
-  TICODE_kend,
-  TICODE_kent,
-  TICODE_kel,
-  TICODE_ked,
-  TICODE_kext,
-  TICODE_kf0,
-  TICODE_kf1,
-  TICODE_kf2,
-  TICODE_kf3,
-  TICODE_kf4,
-  TICODE_kf5,
-  TICODE_kf6,
-  TICODE_kf7,
-  TICODE_kf8,
-  TICODE_kf9,
-  TICODE_kf10,
-  TICODE_kf11,
-  TICODE_kf12,
-  TICODE_kf13,
-  TICODE_kf14,
-  TICODE_kf15,
-  TICODE_kf16,
-  TICODE_kf17,
-  TICODE_kf18,
-  TICODE_kf19,
-  TICODE_kf20,
-  TICODE_kf21,
-  TICODE_kf22,
-  TICODE_kf23,
-  TICODE_kf24,
-  TICODE_kf25,
-  TICODE_kf26,
-  TICODE_kf27,
-  TICODE_kf28,
-  TICODE_kf29,
-  TICODE_kf30,
-  TICODE_kf31,
-  TICODE_kf32,
-  TICODE_kf33,
-  TICODE_kf34,
-  TICODE_kf35,
-  TICODE_kf36,
-  TICODE_kf37,
-  TICODE_kf38,
-  TICODE_kf39,
-  TICODE_kf40,
-  TICODE_kf41,
-  TICODE_kf42,
-  TICODE_kf43,
-  TICODE_kf44,
-  TICODE_kf45,
-  TICODE_kf46,
-  TICODE_kf47,
-  TICODE_kf48,
-  TICODE_kf49,
-  TICODE_kf50,
-  TICODE_kf51,
-  TICODE_kf52,
-  TICODE_kf53,
-  TICODE_kf54,
-  TICODE_kf55,
-  TICODE_kf56,
-  TICODE_kf57,
-  TICODE_kf58,
-  TICODE_kf59,
-  TICODE_kf60,
-  TICODE_kf61,
-  TICODE_kf62,
-  TICODE_kf63,
-  TICODE_kfnd,
-  TICODE_khlp,
-  TICODE_khome,
-  TICODE_kich1,
-  TICODE_kil1,
-  TICODE_kcub1,
-  TICODE_kll,
-  TICODE_kmrk,
-  TICODE_kmsg,
-  TICODE_kmous,
-  TICODE_kmov,
-  TICODE_knxt,
-  TICODE_knp,
-  TICODE_kopn,
-  TICODE_kopt,
-  TICODE_kpp,
-  TICODE_kprv,
-  TICODE_kprt,
-  TICODE_krdo,
-  TICODE_kref,
-  TICODE_krfr,
-  TICODE_krpl,
-  TICODE_krst,
-  TICODE_kres,
-  TICODE_kcuf1,
-  TICODE_ksav,
-  TICODE_kBEG,
-  TICODE_kCAN,
-  TICODE_kCMD,
-  TICODE_kCPY,
-  TICODE_kCRT,
-  TICODE_kDC,
-  TICODE_kDL,
-  TICODE_kslt,
-  TICODE_kEND,
-  TICODE_kEOL,
-  TICODE_kEXT,
-  TICODE_kind,
-  TICODE_kFND,
-  TICODE_kHLP,
-  TICODE_kHOM,
-  TICODE_kIC,
-  TICODE_kLFT,
-  TICODE_kMSG,
-  TICODE_kMOV,
-  TICODE_kNXT,
-  TICODE_kOPT,
-  TICODE_kPRV,
-  TICODE_kPRT,
-  TICODE_kri,
-  TICODE_kRDO,
-  TICODE_kRPL,
-  TICODE_kRIT,
-  TICODE_kRES,
-  TICODE_kSAV,
-  TICODE_kSPD,
-  TICODE_khts,
-  TICODE_kUND,
-  TICODE_kspd,
-  TICODE_kund,
-  TICODE_kcuu1,
-  TICODE_rmkx,
-  TICODE_smkx,
-  TICODE_lf0,
-  TICODE_lf1,
-  TICODE_lf2,
-  TICODE_lf3,
-  TICODE_lf4,
-  TICODE_lf5,
-  TICODE_lf6,
-  TICODE_lf7,
-  TICODE_lf8,
-  TICODE_lf9,
-  TICODE_lf10,
-  TICODE_fln,
-  TICODE_rmln,
-  TICODE_smln,
-  TICODE_rmm,
-  TICODE_smm,
-  TICODE_mhpa,
-  TICODE_mcud1,
-  TICODE_mcub1,
-  TICODE_mcuf1,
-  TICODE_mvpa,
-  TICODE_mcuu1,
-  TICODE_minfo,
-  TICODE_nel,
-  TICODE_porder,
-  TICODE_oc,
-  TICODE_op,
-  TICODE_pad,
-  TICODE_dch,
-  TICODE_dl,
-  TICODE_cud,
-  TICODE_mcud,
-  TICODE_ich,
-  TICODE_indn,
-  TICODE_il,
-  TICODE_cub,
-  TICODE_mcub,
-  TICODE_cuf,
-  TICODE_mcuf,
-  TICODE_rin,
-  TICODE_cuu,
-  TICODE_mcuu,
-  TICODE_pctrm,
-  TICODE_pfkey,
-  TICODE_pfloc,
-  TICODE_pfxl,
-  TICODE_pfx,
-  TICODE_pln,
-  TICODE_mc0,
-  TICODE_mc5p,
-  TICODE_mc4,
-  TICODE_mc5,
-  TICODE_pulse,
-  TICODE_qdial,
-  TICODE_rmclk,
-  TICODE_rep,
-  TICODE_rfi,
-  TICODE_reqmp,
-  TICODE_rs1,
-  TICODE_rs2,
-  TICODE_rs3,
-  TICODE_rf,
-  TICODE_rc,
-  TICODE_vpa,
-  TICODE_sc,
-  TICODE_scesc,
-  TICODE_ind,
-  TICODE_ri,
-  TICODE_scs,
-  TICODE_s0ds,
-  TICODE_s1ds,
-  TICODE_s2ds,
-  TICODE_s3ds,
-  TICODE_sgr1,
-  TICODE_setab,
-  TICODE_setaf,
-  TICODE_sgr,
-  TICODE_setb,
-  TICODE_smgb,
-  TICODE_smgbp,
-  TICODE_sclk,
-  TICODE_setcolor,
-  TICODE_scp,
-  TICODE_setf,
-  TICODE_smgl,
-  TICODE_smglp,
-  TICODE_smglr,
-  TICODE_slines,
-  TICODE_slength,
-  TICODE_smgr,
-  TICODE_smgrp,
-  TICODE_hts,
-  TICODE_smgtb,
-  TICODE_smgt,
-  TICODE_smgtp,
-  TICODE_wind,
-  TICODE_sbim,
-  TICODE_scsd,
-  TICODE_rbim,
-  TICODE_rcsd,
-  TICODE_subcs,
-  TICODE_supcs,
-  TICODE_ht,
-  TICODE_docr,
-  TICODE_tsl,
-  TICODE_tone,
-  TICODE_u0,
-  TICODE_u1,
-  TICODE_u2,
-  TICODE_u3,
-  TICODE_u4,
-  TICODE_u5,
-  TICODE_u6,
-  TICODE_u7,
-  TICODE_u8,
-  TICODE_u9,
-  TICODE_uc,
-  TICODE_hu,
-  TICODE_wait,
-  TICODE_xoffc,
-  TICODE_xonc,
-  TICODE_zerom
-};
-#define TISTRMAX TICODE_zerom
-
-#define t_acs_chars(t) (t)->strs[TICODE_acsc]
-#define t_alt_scancode_esc(t) (t)->strs[TICODE_scesa]
-#define t_back_tab(t) (t)->strs[TICODE_cbt]
-#define t_bell(t) (t)->strs[TICODE_bel]
-#define t_bit_image_carriage_return(t) (t)->strs[TICODE_bicr]
-#define t_bit_image_newline(t) (t)->strs[TICODE_binel]
-#define t_bit_image_repeat(t) (t)->strs[TICODE_birep]
-#define t_carriage_return(t) (t)->strs[TICODE_cr]
-#define t_change_char_pitch(t) (t)->strs[TICODE_cpi]
-#define t_change_line_pitch(t) (t)->strs[TICODE_lpi]
-#define t_change_res_horz(t) (t)->strs[TICODE_chr]
-#define t_change_res_vert(t) (t)->strs[TICODE_cvr]
-#define t_change_scroll_region(t) (t)->strs[TICODE_csr]
-#define t_char_padding(t) (t)->strs[TICODE_rmp]
-#define t_char_set_names(t) (t)->strs[TICODE_csnm]
-#define t_clear_all_tabs(t) (t)->strs[TICODE_tbc]
-#define t_clear_margins(t) (t)->strs[TICODE_mgc]
-#define t_clear_screen(t) (t)->strs[TICODE_clear]
-#define t_clr_bol(t) (t)->strs[TICODE_el1]
-#define t_clr_eol(t) (t)->strs[TICODE_el]
-#define t_clr_eos(t) (t)->strs[TICODE_ed]
-#define t_code_set_init(t) (t)->strs[TICODE_csin]
-#define t_color_names(t) (t)->strs[TICODE_colornm]
-#define t_column_address(t) (t)->strs[TICODE_hpa]
-#define t_command_character(t) (t)->strs[TICODE_cmdch]
-#define t_create_window(t) (t)->strs[TICODE_cwin]
-#define t_cursor_address(t) (t)->strs[TICODE_cup]
-#define t_cursor_down(t) (t)->strs[TICODE_cud1]
-#define t_cursor_home(t) (t)->strs[TICODE_home]
-#define t_cursor_invisible(t) (t)->strs[TICODE_civis]
-#define t_cursor_left(t) (t)->strs[TICODE_cub1]
-#define t_cursor_mem_address(t) (t)->strs[TICODE_mrcup]
-#define t_cursor_normal(t) (t)->strs[TICODE_cnorm]
-#define t_cursor_right(t) (t)->strs[TICODE_cuf1]
-#define t_cursor_to_ll(t) (t)->strs[TICODE_ll]
-#define t_cursor_up(t) (t)->strs[TICODE_cuu1]
-#define t_cursor_visible(t) (t)->strs[TICODE_cvvis]
-#define t_define_bit_image_region(t) (t)->strs[TICODE_defbi]
-#define t_define_char(t) (t)->strs[TICODE_defc]
-#define t_delete_character(t) (t)->strs[TICODE_dch1]
-#define t_delete_line(t) (t)->strs[TICODE_dl1]
-#define t_device_type(t) (t)->strs[TICODE_devt]
-#define t_dial_phone(t) (t)->strs[TICODE_dial]
-#define t_dis_status_line(t) (t)->strs[TICODE_dsl]
-#define t_display_clock(t) (t)->strs[TICODE_dclk]
-#define t_display_pc_char(t) (t)->strs[TICODE_dispc]
-#define t_down_half_time(t) (t)->strs[TICODE_hd]
-#define t_ena_acs(t) (t)->strs[TICODE_enacs]
-#define t_end_bit_image_region(t) (t)->strs[TICODE_endbi]
-#define t_enter_alt_charset_mode(t) (t)->strs[TICODE_smacs]
-#define t_enter_am_mode(t) (t)->strs[TICODE_smam]
-#define t_enter_blink_mode(t) (t)->strs[TICODE_blink]
-#define t_enter_bold_mode(t) (t)->strs[TICODE_bold]
-#define t_enter_ca_mode(t) (t)->strs[TICODE_smcup]
-#define t_enter_delete_mode(t) (t)->strs[TICODE_smdc]
-#define t_enter_dim_mode(t) (t)->strs[TICODE_dim]
-#define t_enter_doublewide_mode(t) (t)->strs[TICODE_swidm]
-#define t_enter_draft_quality(t) (t)->strs[TICODE_sdrfq]
-#define t_enter_horizontal_hl_mode(t) (t)->strs[TICODE_ehhlm]
-#define t_enter_insert_mode(t) (t)->strs[TICODE_smir]
-#define t_enter_italics_mode(t) (t)->strs[TICODE_sitm]
-#define t_enter_left_hl_mode(t) (t)->strs[TICODE_elhlm]
-#define t_enter_leftward_mode(t) (t)->strs[TICODE_slm]
-#define t_enter_low_hl_mode(t) (t)->strs[TICODE_elohlm]
-#define t_enter_micro_mode(t) (t)->strs[TICODE_smicm]
-#define t_enter_near_quality_letter(t) (t)->strs[TICODE_snlq]
-#define t_enter_normal_quality(t) (t)->strs[TICODE_snrmq]
-#define t_enter_pc_charset_mode(t) (t)->strs[TICODE_smpch]
-#define t_enter_protected_mode(t) (t)->strs[TICODE_prot]
-#define t_enter_reverse_mode(t) (t)->strs[TICODE_rev]
-#define t_enter_right_hl_mode(t) (t)->strs[TICODE_erhlm]
-#define t_enter_scancode_mode(t) (t)->strs[TICODE_smsc]
-#define t_enter_secure_mode(t) (t)->strs[TICODE_invis]
-#define t_enter_shadow_mode(t) (t)->strs[TICODE_sshm]
-#define t_enter_standout_mode(t) (t)->strs[TICODE_smso]
-#define t_enter_subscript_mode(t) (t)->strs[TICODE_ssubm]
-#define t_enter_superscript_mode(t) (t)->strs[TICODE_ssupm]
-#define t_enter_top_hl_mode(t) (t)->strs[TICODE_ethlm]
-#define t_enter_underline_mode(t) (t)->strs[TICODE_smul]
-#define t_enter_upward_mode(t) (t)->strs[TICODE_sum]
-#define t_enter_vertical_hl_mode(t) (t)->strs[TICODE_evhlm]
-#define t_enter_xon_mode(t) (t)->strs[TICODE_smxon]
-#define t_erase_chars(t) (t)->strs[TICODE_ech]
-#define t_exit_alt_charset_mode(t) (t)->strs[TICODE_rmacs]
-#define t_exit_am_mode(t) (t)->strs[TICODE_rmam]
-#define t_exit_attribute_mode(t) (t)->strs[TICODE_sgr0]
-#define t_exit_ca_mode(t) (t)->strs[TICODE_rmcup]
-#define t_exit_delete_mode(t) (t)->strs[TICODE_rmdc]
-#define t_exit_doublewide_mode(t) (t)->strs[TICODE_rwidm]
-#define t_exit_insert_mode(t) (t)->strs[TICODE_rmir]
-#define t_exit_italics_mode(t) (t)->strs[TICODE_ritm]
-#define t_exit_leftward_mode(t) (t)->strs[TICODE_rlm]
-#define t_exit_micro_mode(t) (t)->strs[TICODE_rmicm]
-#define t_exit_pc_charset_mode(t) (t)->strs[TICODE_rmpch]
-#define t_exit_scancode_mode(t) (t)->strs[TICODE_rmsc]
-#define t_exit_shadow_mode(t) (t)->strs[TICODE_rshm]
-#define t_exit_standout_mode(t) (t)->strs[TICODE_rmso]
-#define t_exit_subscript_mode(t) (t)->strs[TICODE_rsubm]
-#define t_exit_superscript_mode(t) (t)->strs[TICODE_rsupm]
-#define t_exit_underline_mode(t) (t)->strs[TICODE_rmul]
-#define t_exit_upward_mode(t) (t)->strs[TICODE_rum]
-#define t_exit_xon_mode(t) (t)->strs[TICODE_rmxon]
-#define t_fixed_pause(t) (t)->strs[TICODE_pause]
-#define t_flash_hook(t) (t)->strs[TICODE_hook]
-#define t_flash_screen(t) (t)->strs[TICODE_flash]
-#define t_form_feed(t) (t)->strs[TICODE_ff]
-#define t_from_status_line(t) (t)->strs[TICODE_fsl]
-#define t_get_mouse(t) (t)->strs[TICODE_getm]
-#define t_goto_window(t) (t)->strs[TICODE_wingo]
-#define t_hangup(t) (t)->strs[TICODE_hup]
-#define t_init_1string(t) (t)->strs[TICODE_is1]
-#define t_init_2string(t) (t)->strs[TICODE_is2]
-#define t_init_3string(t) (t)->strs[TICODE_is3]
-#define t_init_file(t) (t)->strs[TICODE_if]
-#define t_init_prog(t) (t)->strs[TICODE_iprog]
-#define t_initialize_color(t) (t)->strs[TICODE_initc]
-#define t_initialize_pair(t) (t)->strs[TICODE_initp]
-#define t_insert_character(t) (t)->strs[TICODE_ich1]
-#define t_insert_line(t) (t)->strs[TICODE_il1]
-#define t_insert_padding(t) (t)->strs[TICODE_ip]
-#define t_key_a1(t) (t)->strs[TICODE_ka1]
-#define t_key_a3(t) (t)->strs[TICODE_ka3]
-#define t_key_b2(t) (t)->strs[TICODE_kb2]
-#define t_key_backspace(t) (t)->strs[TICODE_kbs]
-#define t_key_beg(t) (t)->strs[TICODE_kbeg]
-#define t_key_btab(t) (t)->strs[TICODE_kcbt]
-#define t_key_c1(t) (t)->strs[TICODE_kc1]
-#define t_key_c3(t) (t)->strs[TICODE_kc3]
-#define t_key_cancel(t) (t)->strs[TICODE_kcan]
-#define t_key_catab(t) (t)->strs[TICODE_ktbc]
-#define t_key_clear(t) (t)->strs[TICODE_kclr]
-#define t_key_close(t) (t)->strs[TICODE_kclo]
-#define t_key_command(t) (t)->strs[TICODE_kcmd]
-#define t_key_copy(t) (t)->strs[TICODE_kcpy]
-#define t_key_create(t) (t)->strs[TICODE_kcrt]
-#define t_key_ctab(t) (t)->strs[TICODE_kctab]
-#define t_key_dc(t) (t)->strs[TICODE_kdch1]
-#define t_key_dl(t) (t)->strs[TICODE_kdl1]
-#define t_key_down(t) (t)->strs[TICODE_kcud1]
-#define t_key_eic(t) (t)->strs[TICODE_krmir]
-#define t_key_end(t) (t)->strs[TICODE_kend]
-#define t_key_enter(t) (t)->strs[TICODE_kent]
-#define t_key_eol(t) (t)->strs[TICODE_kel]
-#define t_key_eos(t) (t)->strs[TICODE_ked]
-#define t_key_exit(t) (t)->strs[TICODE_kext]
-#define t_key_f0(t) (t)->strs[TICODE_kf0]
-#define t_key_f1(t) (t)->strs[TICODE_kf1]
-#define t_key_f2(t) (t)->strs[TICODE_kf2]
-#define t_key_f3(t) (t)->strs[TICODE_kf3]
-#define t_key_f4(t) (t)->strs[TICODE_kf4]
-#define t_key_f5(t) (t)->strs[TICODE_kf5]
-#define t_key_f6(t) (t)->strs[TICODE_kf6]
-#define t_key_f7(t) (t)->strs[TICODE_kf7]
-#define t_key_f8(t) (t)->strs[TICODE_kf8]
-#define t_key_f9(t) (t)->strs[TICODE_kf9]
-#define t_key_f10(t) (t)->strs[TICODE_kf10]
-#define t_key_f11(t) (t)->strs[TICODE_kf11]
-#define t_key_f12(t) (t)->strs[TICODE_kf12]
-#define t_key_f13(t) (t)->strs[TICODE_kf13]
-#define t_key_f14(t) (t)->strs[TICODE_kf14]
-#define t_key_f15(t) (t)->strs[TICODE_kf15]
-#define t_key_f16(t) (t)->strs[TICODE_kf16]
-#define t_key_f17(t) (t)->strs[TICODE_kf17]
-#define t_key_f18(t) (t)->strs[TICODE_kf18]
-#define t_key_f19(t) (t)->strs[TICODE_kf19]
-#define t_key_f20(t) (t)->strs[TICODE_kf20]
-#define t_key_f21(t) (t)->strs[TICODE_kf21]
-#define t_key_f22(t) (t)->strs[TICODE_kf22]
-#define t_key_f23(t) (t)->strs[TICODE_kf23]
-#define t_key_f24(t) (t)->strs[TICODE_kf24]
-#define t_key_f25(t) (t)->strs[TICODE_kf25]
-#define t_key_f26(t) (t)->strs[TICODE_kf26]
-#define t_key_f27(t) (t)->strs[TICODE_kf27]
-#define t_key_f28(t) (t)->strs[TICODE_kf28]
-#define t_key_f29(t) (t)->strs[TICODE_kf29]
-#define t_key_f30(t) (t)->strs[TICODE_kf30]
-#define t_key_f31(t) (t)->strs[TICODE_kf31]
-#define t_key_f32(t) (t)->strs[TICODE_kf32]
-#define t_key_f33(t) (t)->strs[TICODE_kf33]
-#define t_key_f34(t) (t)->strs[TICODE_kf34]
-#define t_key_f35(t) (t)->strs[TICODE_kf35]
-#define t_key_f36(t) (t)->strs[TICODE_kf36]
-#define t_key_f37(t) (t)->strs[TICODE_kf37]
-#define t_key_f38(t) (t)->strs[TICODE_kf38]
-#define t_key_f39(t) (t)->strs[TICODE_kf39]
-#define t_key_f40(t) (t)->strs[TICODE_kf40]
-#define t_key_f41(t) (t)->strs[TICODE_kf41]
-#define t_key_f42(t) (t)->strs[TICODE_kf42]
-#define t_key_f43(t) (t)->strs[TICODE_kf43]
-#define t_key_f44(t) (t)->strs[TICODE_kf44]
-#define t_key_f45(t) (t)->strs[TICODE_kf45]
-#define t_key_f46(t) (t)->strs[TICODE_kf46]
-#define t_key_f47(t) (t)->strs[TICODE_kf47]
-#define t_key_f48(t) (t)->strs[TICODE_kf48]
-#define t_key_f49(t) (t)->strs[TICODE_kf49]
-#define t_key_f50(t) (t)->strs[TICODE_kf50]
-#define t_key_f51(t) (t)->strs[TICODE_kf51]
-#define t_key_f52(t) (t)->strs[TICODE_kf52]
-#define t_key_f53(t) (t)->strs[TICODE_kf53]
-#define t_key_f54(t) (t)->strs[TICODE_kf54]
-#define t_key_f55(t) (t)->strs[TICODE_kf55]
-#define t_key_f56(t) (t)->strs[TICODE_kf56]
-#define t_key_f57(t) (t)->strs[TICODE_kf57]
-#define t_key_f58(t) (t)->strs[TICODE_kf58]
-#define t_key_f59(t) (t)->strs[TICODE_kf59]
-#define t_key_f60(t) (t)->strs[TICODE_kf60]
-#define t_key_f61(t) (t)->strs[TICODE_kf61]
-#define t_key_f62(t) (t)->strs[TICODE_kf62]
-#define t_key_f63(t) (t)->strs[TICODE_kf63]
-#define t_key_find(t) (t)->strs[TICODE_kfnd]
-#define t_key_help(t) (t)->strs[TICODE_khlp]
-#define t_key_home(t) (t)->strs[TICODE_khome]
-#define t_key_ic(t) (t)->strs[TICODE_kich1]
-#define t_key_il(t) (t)->strs[TICODE_kil1]
-#define t_key_left(t) (t)->strs[TICODE_kcub1]
-#define t_key_ll(t) (t)->strs[TICODE_kll]
-#define t_key_mark(t) (t)->strs[TICODE_kmrk]
-#define t_key_message(t) (t)->strs[TICODE_kmsg]
-#define t_key_mouse(t) (t)->strs[TICODE_kmous]
-#define t_key_move(t) (t)->strs[TICODE_kmov]
-#define t_key_next(t) (t)->strs[TICODE_knxt]
-#define t_key_npage(t) (t)->strs[TICODE_knp]
-#define t_key_open(t) (t)->strs[TICODE_kopn]
-#define t_key_options(t) (t)->strs[TICODE_kopt]
-#define t_key_ppage(t) (t)->strs[TICODE_kpp]
-#define t_key_previous(t) (t)->strs[TICODE_kprv]
-#define t_key_print(t) (t)->strs[TICODE_kprt]
-#define t_key_redo(t) (t)->strs[TICODE_krdo]
-#define t_key_reference(t) (t)->strs[TICODE_kref]
-#define t_key_refresh(t) (t)->strs[TICODE_krfr]
-#define t_key_replace(t) (t)->strs[TICODE_krpl]
-#define t_key_restart(t) (t)->strs[TICODE_krst]
-#define t_key_resume(t) (t)->strs[TICODE_kres]
-#define t_key_right(t) (t)->strs[TICODE_kcuf1]
-#define t_key_save(t) (t)->strs[TICODE_ksav]
-#define t_key_sbeg(t) (t)->strs[TICODE_kBEG]
-#define t_key_scancel(t) (t)->strs[TICODE_kCAN]
-#define t_key_scommand(t) (t)->strs[TICODE_kCMD]
-#define t_key_scopy(t) (t)->strs[TICODE_kCPY]
-#define t_key_screate(t) (t)->strs[TICODE_kCRT]
-#define t_key_sdc(t) (t)->strs[TICODE_kDC]
-#define t_key_sdl(t) (t)->strs[TICODE_kDL]
-#define t_key_select(t) (t)->strs[TICODE_kslt]
-#define t_key_send(t) (t)->strs[TICODE_kEND]
-#define t_key_seol(t) (t)->strs[TICODE_kEOL]
-#define t_key_sexit(t) (t)->strs[TICODE_kEXT]
-#define t_key_sf(t) (t)->strs[TICODE_kind]
-#define t_key_sfind(t) (t)->strs[TICODE_kFND]
-#define t_key_shelp(t) (t)->strs[TICODE_kHLP]
-#define t_key_shome(t) (t)->strs[TICODE_kHOM]
-#define t_key_sic(t) (t)->strs[TICODE_kIC]
-#define t_key_sleft(t) (t)->strs[TICODE_kLFT]
-#define t_key_smessage(t) (t)->strs[TICODE_kMSG]
-#define t_key_smove(t) (t)->strs[TICODE_kMOV]
-#define t_key_snext(t) (t)->strs[TICODE_kNXT]
-#define t_key_soptions(t) (t)->strs[TICODE_kOPT]
-#define t_key_sprevious(t) (t)->strs[TICODE_kPRV]
-#define t_key_sprint(t) (t)->strs[TICODE_kPRT]
-#define t_key_sr(t) (t)->strs[TICODE_kri]
-#define t_key_sredo(t) (t)->strs[TICODE_kRDO]
-#define t_key_sreplace(t) (t)->strs[TICODE_kRPL]
-#define t_key_sright(t) (t)->strs[TICODE_kRIT]
-#define t_key_srsume(t) (t)->strs[TICODE_kRES]
-#define t_key_ssave(t) (t)->strs[TICODE_kSAV]
-#define t_key_ssuspend(t) (t)->strs[TICODE_kSPD]
-#define t_key_stab(t) (t)->strs[TICODE_khts]
-#define t_key_sundo(t) (t)->strs[TICODE_kUND]
-#define t_key_suspend(t) (t)->strs[TICODE_kspd]
-#define t_key_undo(t) (t)->strs[TICODE_kund]
-#define t_key_up(t) (t)->strs[TICODE_kcuu1]
-#define t_keypad_local(t) (t)->strs[TICODE_rmkx]
-#define t_keypad_xmit(t) (t)->strs[TICODE_smkx]
-#define t_lab_f0(t) (t)->strs[TICODE_lf0]
-#define t_lab_f1(t) (t)->strs[TICODE_lf1]
-#define t_lab_f2(t) (t)->strs[TICODE_lf2]
-#define t_lab_f3(t) (t)->strs[TICODE_lf3]
-#define t_lab_f4(t) (t)->strs[TICODE_lf4]
-#define t_lab_f5(t) (t)->strs[TICODE_lf5]
-#define t_lab_f6(t) (t)->strs[TICODE_lf6]
-#define t_lab_f7(t) (t)->strs[TICODE_lf7]
-#define t_lab_f8(t) (t)->strs[TICODE_lf8]
-#define t_lab_f9(t) (t)->strs[TICODE_lf9]
-#define t_lab_f10(t) (t)->strs[TICODE_lf10]
-#define t_label_format(t) (t)->strs[TICODE_fln]
-#define t_label_off(t) (t)->strs[TICODE_rmln]
-#define t_label_on(t) (t)->strs[TICODE_smln]
-#define t_meta_off(t) (t)->strs[TICODE_rmm]
-#define t_meta_on(t) (t)->strs[TICODE_smm]
-#define t_micro_column_address(t) (t)->strs[TICODE_mhpa]
-#define t_micro_down(t) (t)->strs[TICODE_mcud1]
-#define t_micro_left(t) (t)->strs[TICODE_mcub1]
-#define t_micro_right(t) (t)->strs[TICODE_mcuf1]
-#define t_micro_row_address(t) (t)->strs[TICODE_mvpa]
-#define t_micro_up(t) (t)->strs[TICODE_mcuu1]
-#define t_mouse_info(t) (t)->strs[TICODE_minfo]
-#define t_newline(t) (t)->strs[TICODE_nel]
-#define t_order_of_pins(t) (t)->strs[TICODE_porder]
-#define t_orig_colors(t) (t)->strs[TICODE_oc]
-#define t_orig_pair(t) (t)->strs[TICODE_op]
-#define t_pad_char(t) (t)->strs[TICODE_pad]
-#define t_parm_dch(t) (t)->strs[TICODE_dch]
-#define t_parm_delete_line(t) (t)->strs[TICODE_dl]
-#define t_parm_down_cursor(t) (t)->strs[TICODE_cud]
-#define t_parm_down_micro(t) (t)->strs[TICODE_mcud]
-#define t_parm_ich(t) (t)->strs[TICODE_ich]
-#define t_parm_index(t) (t)->strs[TICODE_indn]
-#define t_parm_insert_line(t) (t)->strs[TICODE_il]
-#define t_parm_left_cursor(t) (t)->strs[TICODE_cub]
-#define t_parm_left_micro(t) (t)->strs[TICODE_mcub]
-#define t_parm_right_cursor(t) (t)->strs[TICODE_cuf]
-#define t_parm_right_micro(t) (t)->strs[TICODE_mcuf]
-#define t_parm_rindex(t) (t)->strs[TICODE_rin]
-#define t_parm_up_cursor(t) (t)->strs[TICODE_cuu]
-#define t_parm_up_micro(t) (t)->strs[TICODE_mcuu]
-#define t_pc_term_options(t) (t)->strs[TICODE_pctrm]
-#define t_pkey_key(t) (t)->strs[TICODE_pfkey]
-#define t_pkey_local(t) (t)->strs[TICODE_pfloc]
-#define t_pkey_plab(t) (t)->strs[TICODE_pfxl]
-#define t_pkey_xmit(t) (t)->strs[TICODE_pfx]
-#define t_pkey_norm(t) (t)->strs[TICODE_pln]
-#define t_print_screen(t) (t)->strs[TICODE_mc0]
-#define t_ptr_non(t) (t)->strs[TICODE_mc5p]
-#define t_ptr_off(t) (t)->strs[TICODE_mc4]
-#define t_ptr_on(t) (t)->strs[TICODE_mc5]
-#define t_pulse(t) (t)->strs[TICODE_pulse]
-#define t_quick_dial(t) (t)->strs[TICODE_qdial]
-#define t_remove_clock(t) (t)->strs[TICODE_rmclk]
-#define t_repeat_char(t) (t)->strs[TICODE_rep]
-#define t_req_for_input(t) (t)->strs[TICODE_rfi]
-#define t_req_mouse_pos(t) (t)->strs[TICODE_reqmp]
-#define t_reset_1string(t) (t)->strs[TICODE_rs1]
-#define t_reset_2string(t) (t)->strs[TICODE_rs2]
-#define t_reset_3string(t) (t)->strs[TICODE_rs3]
-#define t_reset_file(t) (t)->strs[TICODE_rf]
-#define t_restore_cursor(t) (t)->strs[TICODE_rc]
-#define t_row_address(t) (t)->strs[TICODE_vpa]
-#define t_save_cursor(t) (t)->strs[TICODE_sc]
-#define t_scancode_escape(t) (t)->strs[TICODE_scesc]
-#define t_scroll_forward(t) (t)->strs[TICODE_ind]
-#define t_scroll_reverse(t) (t)->strs[TICODE_ri]
-#define t_select_char_set(t) (t)->strs[TICODE_scs]
-#define t_set0_des_seq(t) (t)->strs[TICODE_s0ds]
-#define t_set1_des_seq(t) (t)->strs[TICODE_s1ds]
-#define t_set2_des_seq(t) (t)->strs[TICODE_s2ds]
-#define t_set3_des_seq(t) (t)->strs[TICODE_s3ds]
-#define t_set_a_attributes(t) (t)->strs[TICODE_sgr1]
-#define t_set_a_background(t) (t)->strs[TICODE_setab]
-#define t_set_a_foreground(t) (t)->strs[TICODE_setaf]
-#define t_set_attributes(t) (t)->strs[TICODE_sgr]
-#define t_set_background(t) (t)->strs[TICODE_setb]
-#define t_set_bottom_margin(t) (t)->strs[TICODE_smgb]
-#define t_set_bottom_margin_parm(t) (t)->strs[TICODE_smgbp]
-#define t_set_clock(t) (t)->strs[TICODE_sclk]
-#define t_set_color_band(t) (t)->strs[TICODE_setcolor]
-#define t_set_color_pair(t) (t)->strs[TICODE_scp]
-#define t_set_foreground(t) (t)->strs[TICODE_setf]
-#define t_set_left_margin(t) (t)->strs[TICODE_smgl]
-#define t_set_left_margin_parm(t) (t)->strs[TICODE_smglp]
-#define t_set_lr_margin(t) (t)->strs[TICODE_smglr]
-#define t_set_page_length(t) (t)->strs[TICODE_slines]
-#define t_set_pglen_inch(t) (t)->strs[TICODE_slength]
-#define t_set_right_margin(t) (t)->strs[TICODE_smgr]
-#define t_set_right_margin_parm(t) (t)->strs[TICODE_smgrp]
-#define t_set_tab(t) (t)->strs[TICODE_hts]
-#define t_set_tb_margin(t) (t)->strs[TICODE_smgtb]
-#define t_set_top_margin(t) (t)->strs[TICODE_smgt]
-#define t_set_top_margin_parm(t) (t)->strs[TICODE_smgtp]
-#define t_set_window(t) (t)->strs[TICODE_wind]
-#define t_start_bit_image(t) (t)->strs[TICODE_sbim]
-#define t_start_char_set_def(t) (t)->strs[TICODE_scsd]
-#define t_stop_bit_image(t) (t)->strs[TICODE_rbim]
-#define t_stop_char_set_def(t) (t)->strs[TICODE_rcsd]
-#define t_subscript_characters(t) (t)->strs[TICODE_subcs]
-#define t_superscript_characters(t) (t)->strs[TICODE_supcs]
-#define t_tab(t) (t)->strs[TICODE_ht]
-#define t_these_cause_cr(t) (t)->strs[TICODE_docr]
-#define t_to_status_line(t) (t)->strs[TICODE_tsl]
-#define t_tone(t) (t)->strs[TICODE_tone]
-#define t_user0(t) (t)->strs[TICODE_u0]
-#define t_user1(t) (t)->strs[TICODE_u1]
-#define t_user2(t) (t)->strs[TICODE_u2]
-#define t_user3(t) (t)->strs[TICODE_u3]
-#define t_user4(t) (t)->strs[TICODE_u4]
-#define t_user5(t) (t)->strs[TICODE_u5]
-#define t_user6(t) (t)->strs[TICODE_u6]
-#define t_user7(t) (t)->strs[TICODE_u7]
-#define t_user8(t) (t)->strs[TICODE_u8]
-#define t_user9(t) (t)->strs[TICODE_u9]
-#define t_underline_char(t) (t)->strs[TICODE_uc]
-#define t_up_half_line(t) (t)->strs[TICODE_hu]
-#define t_wait_tone(t) (t)->strs[TICODE_wait]
-#define t_xoff_character(t) (t)->strs[TICODE_xoffc]
-#define t_xon_character(t) (t)->strs[TICODE_xonc]
-#define t_zero_motion(t) (t)->strs[TICODE_zerom]
-
-#define acs_chars t_acs_chars(cur_term)
-#define alt_scancode_esc t_alt_scancode_esc(cur_term)
-#define back_tab t_back_tab(cur_term)
-#define bell t_bell(cur_term)
-#define bit_image_carriage_return t_bit_image_carriage_return(cur_term)
-#define bit_image_newline t_bit_image_newline(cur_term)
-#define bit_image_repeat t_bit_image_repeat(cur_term)
-#define carriage_return t_carriage_return(cur_term)
-#define change_char_pitch t_change_char_pitch(cur_term)
-#define change_line_pitch t_change_line_pitch(cur_term)
-#define change_res_horz t_change_res_horz(cur_term)
-#define change_res_vert t_change_res_vert(cur_term)
-#define change_scroll_region t_change_scroll_region(cur_term)
-#define char_padding t_char_padding(cur_term)
-#define char_set_names t_char_set_names(cur_term)
-#define clear_all_tabs t_clear_all_tabs(cur_term)
-#define clear_margins t_clear_margins(cur_term)
-#define clear_screen t_clear_screen(cur_term)
-#define clr_bol t_clr_bol(cur_term)
-#define clr_eol t_clr_eol(cur_term)
-#define clr_eos t_clr_eos(cur_term)
-#define code_set_init t_code_set_init(cur_term)
-#define color_names t_color_names(cur_term)
-#define column_address t_column_address(cur_term)
-#define command_character t_command_character(cur_term)
-#define create_window t_create_window(cur_term)
-#define cursor_address t_cursor_address(cur_term)
-#define cursor_down t_cursor_down(cur_term)
-#define cursor_home t_cursor_home(cur_term)
-#define cursor_invisible t_cursor_invisible(cur_term)
-#define cursor_left t_cursor_left(cur_term)
-#define cursor_mem_address t_cursor_mem_address(cur_term)
-#define cursor_normal t_cursor_normal(cur_term)
-#define cursor_right t_cursor_right(cur_term)
-#define cursor_to_ll t_cursor_to_ll(cur_term)
-#define cursor_up t_cursor_up(cur_term)
-#define cursor_visible t_cursor_visible(cur_term)
-#define define_bit_image_region t_define_bit_image_region(cur_term)
-#define define_char t_define_char(cur_term)
-#define delete_character t_delete_character(cur_term)
-#define delete_line t_delete_line(cur_term)
-#define device_type t_device_type(cur_term)
-#define dial_phone t_dial_phone(cur_term)
-#define dis_status_line t_dis_status_line(cur_term)
-#define display_clock t_display_clock(cur_term)
-#define display_pc_char t_display_pc_char(cur_term)
-#define down_half_time t_down_half_time(cur_term)
-#define ena_acs t_ena_acs(cur_term)
-#define end_bit_image_region t_end_bit_image_region(cur_term)
-#define enter_alt_charset_mode t_enter_alt_charset_mode(cur_term)
-#define enter_am_mode t_enter_am_mode(cur_term)
-#define enter_blink_mode t_enter_blink_mode(cur_term)
-#define enter_bold_mode t_enter_bold_mode(cur_term)
-#define enter_ca_mode t_enter_ca_mode(cur_term)
-#define enter_delete_mode t_enter_delete_mode(cur_term)
-#define enter_dim_mode t_enter_dim_mode(cur_term)
-#define enter_doublewide_mode t_enter_doublewide_mode(cur_term)
-#define enter_draft_quality t_enter_draft_quality(cur_term)
-#define enter_horizontal_hl_mode t_enter_horizontal_hl_mode(cur_term)
-#define enter_insert_mode t_enter_insert_mode(cur_term)
-#define enter_italics_mode t_enter_italics_mode(cur_term)
-#define enter_left_hl_mode t_enter_left_hl_mode(cur_term)
-#define enter_leftward_mode t_enter_leftward_mode(cur_term)
-#define enter_low_hl_mode t_enter_low_hl_mode(cur_term)
-#define enter_micro_mode t_enter_micro_mode(cur_term)
-#define enter_near_quality_letter t_enter_near_quality_letter(cur_term)
-#define enter_normal_quality t_enter_normal_quality(cur_term)
-#define enter_pc_charset_mode t_enter_pc_charset_mode(cur_term)
-#define enter_protected_mode t_enter_protected_mode(cur_term)
-#define enter_reverse_mode t_enter_reverse_mode(cur_term)
-#define enter_right_hl_mode t_enter_right_hl_mode(cur_term)
-#define enter_scancode_mode t_enter_scancode_mode(cur_term)
-#define enter_secure_mode t_enter_secure_mode(cur_term)
-#define enter_shadow_mode t_enter_shadow_mode(cur_term)
-#define enter_standout_mode t_enter_standout_mode(cur_term)
-#define enter_subscript_mode t_enter_subscript_mode(cur_term)
-#define enter_superscript_mode t_enter_superscript_mode(cur_term)
-#define enter_top_hl_mode t_enter_top_hl_mode(cur_term)
-#define enter_underline_mode t_enter_underline_mode(cur_term)
-#define enter_upward_mode t_enter_upward_mode(cur_term)
-#define enter_vertical_hl_mode t_enter_vertical_hl_mode(cur_term)
-#define enter_xon_mode t_enter_xon_mode(cur_term)
-#define erase_chars t_erase_chars(cur_term)
-#define exit_alt_charset_mode t_exit_alt_charset_mode(cur_term)
-#define exit_am_mode t_exit_am_mode(cur_term)
-#define exit_attribute_mode t_exit_attribute_mode(cur_term)
-#define exit_ca_mode t_exit_ca_mode(cur_term)
-#define exit_delete_mode t_exit_delete_mode(cur_term)
-#define exit_doublewide_mode t_exit_doublewide_mode(cur_term)
-#define exit_insert_mode t_exit_insert_mode(cur_term)
-#define exit_italics_mode t_exit_italics_mode(cur_term)
-#define exit_leftward_mode t_exit_leftward_mode(cur_term)
-#define exit_micro_mode t_exit_micro_mode(cur_term)
-#define exit_pc_charset_mode t_exit_pc_charset_mode(cur_term)
-#define exit_scancode_mode t_exit_scancode_mode(cur_term)
-#define exit_shadow_mode t_exit_shadow_mode(cur_term)
-#define exit_standout_mode t_exit_standout_mode(cur_term)
-#define exit_subscript_mode t_exit_subscript_mode(cur_term)
-#define exit_superscript_mode t_exit_superscript_mode(cur_term)
-#define exit_underline_mode t_exit_underline_mode(cur_term)
-#define exit_upward_mode t_exit_upward_mode(cur_term)
-#define exit_xon_mode t_exit_xon_mode(cur_term)
-#define fixed_pause t_fixed_pause(cur_term)
-#define flash_hook t_flash_hook(cur_term)
-#define flash_screen t_flash_screen(cur_term)
-#define form_feed t_form_feed(cur_term)
-#define from_status_line t_from_status_line(cur_term)
-#define get_mouse t_get_mouse(cur_term)
-#define goto_window t_goto_window(cur_term)
-#define hangup t_hangup(cur_term)
-#define init_1string t_init_1string(cur_term)
-#define init_2string t_init_2string(cur_term)
-#define init_3string t_init_3string(cur_term)
-#define init_file t_init_file(cur_term)
-#define init_prog t_init_prog(cur_term)
-#define initialize_color t_initialize_color(cur_term)
-#define initialize_pair t_initialize_pair(cur_term)
-#define insert_character t_insert_character(cur_term)
-#define insert_line t_insert_line(cur_term)
-#define insert_padding t_insert_padding(cur_term)
-#define key_a1 t_key_a1(cur_term)
-#define key_a3 t_key_a3(cur_term)
-#define key_b2 t_key_b2(cur_term)
-#define key_backspace t_key_backspace(cur_term)
-#define key_beg t_key_beg(cur_term)
-#define key_btab t_key_btab(cur_term)
-#define key_c1 t_key_c1(cur_term)
-#define key_c3 t_key_c3(cur_term)
-#define key_cancel t_key_cancel(cur_term)
-#define key_catab t_key_catab(cur_term)
-#define key_clear t_key_clear(cur_term)
-#define key_close t_key_close(cur_term)
-#define key_command t_key_command(cur_term)
-#define key_copy t_key_copy(cur_term)
-#define key_create t_key_create(cur_term)
-#define key_ctab t_key_ctab(cur_term)
-#define key_dc t_key_dc(cur_term)
-#define key_dl t_key_dl(cur_term)
-#define key_down t_key_down(cur_term)
-#define key_eic t_key_eic(cur_term)
-#define key_end t_key_end(cur_term)
-#define key_enter t_key_enter(cur_term)
-#define key_eol t_key_eol(cur_term)
-#define key_eos t_key_eos(cur_term)
-#define key_exit t_key_exit(cur_term)
-#define key_f0 t_key_f0(cur_term)
-#define key_f1 t_key_f1(cur_term)
-#define key_f2 t_key_f2(cur_term)
-#define key_f3 t_key_f3(cur_term)
-#define key_f4 t_key_f4(cur_term)
-#define key_f5 t_key_f5(cur_term)
-#define key_f6 t_key_f6(cur_term)
-#define key_f7 t_key_f7(cur_term)
-#define key_f8 t_key_f8(cur_term)
-#define key_f9 t_key_f9(cur_term)
-#define key_f10 t_key_f10(cur_term)
-#define key_f11 t_key_f11(cur_term)
-#define key_f12 t_key_f12(cur_term)
-#define key_f13 t_key_f13(cur_term)
-#define key_f14 t_key_f14(cur_term)
-#define key_f15 t_key_f15(cur_term)
-#define key_f16 t_key_f16(cur_term)
-#define key_f17 t_key_f17(cur_term)
-#define key_f18 t_key_f18(cur_term)
-#define key_f19 t_key_f19(cur_term)
-#define key_f20 t_key_f20(cur_term)
-#define key_f21 t_key_f21(cur_term)
-#define key_f22 t_key_f22(cur_term)
-#define key_f23 t_key_f23(cur_term)
-#define key_f24 t_key_f24(cur_term)
-#define key_f25 t_key_f25(cur_term)
-#define key_f26 t_key_f26(cur_term)
-#define key_f27 t_key_f27(cur_term)
-#define key_f28 t_key_f28(cur_term)
-#define key_f29 t_key_f29(cur_term)
-#define key_f30 t_key_f30(cur_term)
-#define key_f31 t_key_f31(cur_term)
-#define key_f32 t_key_f32(cur_term)
-#define key_f33 t_key_f33(cur_term)
-#define key_f34 t_key_f34(cur_term)
-#define key_f35 t_key_f35(cur_term)
-#define key_f36 t_key_f36(cur_term)
-#define key_f37 t_key_f37(cur_term)
-#define key_f38 t_key_f38(cur_term)
-#define key_f39 t_key_f39(cur_term)
-#define key_f40 t_key_f40(cur_term)
-#define key_f41 t_key_f41(cur_term)
-#define key_f42 t_key_f42(cur_term)
-#define key_f43 t_key_f43(cur_term)
-#define key_f44 t_key_f44(cur_term)
-#define key_f45 t_key_f45(cur_term)
-#define key_f46 t_key_f46(cur_term)
-#define key_f47 t_key_f47(cur_term)
-#define key_f48 t_key_f48(cur_term)
-#define key_f49 t_key_f49(cur_term)
-#define key_f50 t_key_f50(cur_term)
-#define key_f51 t_key_f51(cur_term)
-#define key_f52 t_key_f52(cur_term)
-#define key_f53 t_key_f53(cur_term)
-#define key_f54 t_key_f54(cur_term)
-#define key_f55 t_key_f55(cur_term)
-#define key_f56 t_key_f56(cur_term)
-#define key_f57 t_key_f57(cur_term)
-#define key_f58 t_key_f58(cur_term)
-#define key_f59 t_key_f59(cur_term)
-#define key_f60 t_key_f60(cur_term)
-#define key_f61 t_key_f61(cur_term)
-#define key_f62 t_key_f62(cur_term)
-#define key_f63 t_key_f63(cur_term)
-#define key_find t_key_find(cur_term)
-#define key_help t_key_help(cur_term)
-#define key_home t_key_home(cur_term)
-#define key_ic t_key_ic(cur_term)
-#define key_il t_key_il(cur_term)
-#define key_left t_key_left(cur_term)
-#define key_ll t_key_ll(cur_term)
-#define key_mark t_key_mark(cur_term)
-#define key_message t_key_message(cur_term)
-#define key_mouse t_key_mouse(cur_term)
-#define key_move t_key_move(cur_term)
-#define key_next t_key_next(cur_term)
-#define key_npage t_key_npage(cur_term)
-#define key_open t_key_open(cur_term)
-#define key_options t_key_options(cur_term)
-#define key_ppage t_key_ppage(cur_term)
-#define key_previous t_key_previous(cur_term)
-#define key_print t_key_print(cur_term)
-#define key_redo t_key_redo(cur_term)
-#define key_reference t_key_reference(cur_term)
-#define key_refresh t_key_refresh(cur_term)
-#define key_replace t_key_replace(cur_term)
-#define key_restart t_key_restart(cur_term)
-#define key_resume t_key_resume(cur_term)
-#define key_right t_key_right(cur_term)
-#define key_save t_key_save(cur_term)
-#define key_sbeg t_key_sbeg(cur_term)
-#define key_scancel t_key_scancel(cur_term)
-#define key_scommand t_key_scommand(cur_term)
-#define key_scopy t_key_scopy(cur_term)
-#define key_screate t_key_screate(cur_term)
-#define key_sdc t_key_sdc(cur_term)
-#define key_sdl t_key_sdl(cur_term)
-#define key_select t_key_select(cur_term)
-#define key_send t_key_send(cur_term)
-#define key_seol t_key_seol(cur_term)
-#define key_sexit t_key_sexit(cur_term)
-#define key_sf t_key_sf(cur_term)
-#define key_sfind t_key_sfind(cur_term)
-#define key_shelp t_key_shelp(cur_term)
-#define key_shome t_key_shome(cur_term)
-#define key_sic t_key_sic(cur_term)
-#define key_sleft t_key_sleft(cur_term)
-#define key_smessage t_key_smessage(cur_term)
-#define key_smove t_key_smove(cur_term)
-#define key_snext t_key_snext(cur_term)
-#define key_soptions t_key_soptions(cur_term)
-#define key_sprevious t_key_sprevious(cur_term)
-#define key_sprint t_key_sprint(cur_term)
-#define key_sr t_key_sr(cur_term)
-#define key_sredo t_key_sredo(cur_term)
-#define key_sreplace t_key_sreplace(cur_term)
-#define key_sright t_key_sright(cur_term)
-#define key_srsume t_key_srsume(cur_term)
-#define key_ssave t_key_ssave(cur_term)
-#define key_ssuspend t_key_ssuspend(cur_term)
-#define key_stab t_key_stab(cur_term)
-#define key_sundo t_key_sundo(cur_term)
-#define key_suspend t_key_suspend(cur_term)
-#define key_undo t_key_undo(cur_term)
-#define key_up t_key_up(cur_term)
-#define keypad_local t_keypad_local(cur_term)
-#define keypad_xmit t_keypad_xmit(cur_term)
-#define lab_f0 t_lab_f0(cur_term)
-#define lab_f1 t_lab_f1(cur_term)
-#define lab_f2 t_lab_f2(cur_term)
-#define lab_f3 t_lab_f3(cur_term)
-#define lab_f4 t_lab_f4(cur_term)
-#define lab_f5 t_lab_f5(cur_term)
-#define lab_f6 t_lab_f6(cur_term)
-#define lab_f7 t_lab_f7(cur_term)
-#define lab_f8 t_lab_f8(cur_term)
-#define lab_f9 t_lab_f9(cur_term)
-#define lab_f10 t_lab_f10(cur_term)
-#define label_format t_label_format(cur_term)
-#define label_off t_label_off(cur_term)
-#define label_on t_label_on(cur_term)
-#define meta_off t_meta_off(cur_term)
-#define meta_on t_meta_on(cur_term)
-#define micro_column_address t_micro_column_address(cur_term)
-#define micro_down t_micro_down(cur_term)
-#define micro_left t_micro_left(cur_term)
-#define micro_right t_micro_right(cur_term)
-#define micro_row_address t_micro_row_address(cur_term)
-#define micro_up t_micro_up(cur_term)
-#define mouse_info t_mouse_info(cur_term)
-#define newline t_newline(cur_term)
-#define order_of_pins t_order_of_pins(cur_term)
-#define orig_colors t_orig_colors(cur_term)
-#define orig_pair t_orig_pair(cur_term)
-#define pad_char t_pad_char(cur_term)
-#define parm_dch t_parm_dch(cur_term)
-#define parm_delete_line t_parm_delete_line(cur_term)
-#define parm_down_cursor t_parm_down_cursor(cur_term)
-#define parm_down_micro t_parm_down_micro(cur_term)
-#define parm_ich t_parm_ich(cur_term)
-#define parm_index t_parm_index(cur_term)
-#define parm_insert_line t_parm_insert_line(cur_term)
-#define parm_left_cursor t_parm_left_cursor(cur_term)
-#define parm_left_micro t_parm_left_micro(cur_term)
-#define parm_right_cursor t_parm_right_cursor(cur_term)
-#define parm_right_micro t_parm_right_micro(cur_term)
-#define parm_rindex t_parm_rindex(cur_term)
-#define parm_up_cursor t_parm_up_cursor(cur_term)
-#define parm_up_micro t_parm_up_micro(cur_term)
-#define pc_term_options t_pc_term_options(cur_term)
-#define pkey_key t_pkey_key(cur_term)
-#define pkey_local t_pkey_local(cur_term)
-#define pkey_plab t_pkey_plab(cur_term)
-#define pkey_xmit t_pkey_xmit(cur_term)
-#define pkey_norm t_pkey_norm(cur_term)
-#define print_screen t_print_screen(cur_term)
-#define ptr_non t_ptr_non(cur_term)
-#define ptr_off t_ptr_off(cur_term)
-#define ptr_on t_ptr_on(cur_term)
-#define pulse t_pulse(cur_term)
-#define quick_dial t_quick_dial(cur_term)
-#define remove_clock t_remove_clock(cur_term)
-#define repeat_char t_repeat_char(cur_term)
-#define req_for_input t_req_for_input(cur_term)
-#define req_mouse_pos t_req_mouse_pos(cur_term)
-#define reset_1string t_reset_1string(cur_term)
-#define reset_2string t_reset_2string(cur_term)
-#define reset_3string t_reset_3string(cur_term)
-#define reset_file t_reset_file(cur_term)
-#define restore_cursor t_restore_cursor(cur_term)
-#define row_address t_row_address(cur_term)
-#define save_cursor t_save_cursor(cur_term)
-#define scancode_escape t_scancode_escape(cur_term)
-#define scroll_forward t_scroll_forward(cur_term)
-#define scroll_reverse t_scroll_reverse(cur_term)
-#define select_char_set t_select_char_set(cur_term)
-#define set0_des_seq t_set0_des_seq(cur_term)
-#define set1_des_seq t_set1_des_seq(cur_term)
-#define set2_des_seq t_set2_des_seq(cur_term)
-#define set3_des_seq t_set3_des_seq(cur_term)
-#define set_a_attributes t_set_a_attributes(cur_term)
-#define set_a_background t_set_a_background(cur_term)
-#define set_a_foreground t_set_a_foreground(cur_term)
-#define set_attributes t_set_attributes(cur_term)
-#define set_background t_set_background(cur_term)
-#define set_bottom_margin t_set_bottom_margin(cur_term)
-#define set_bottom_margin_parm t_set_bottom_margin_parm(cur_term)
-#define set_clock t_set_clock(cur_term)
-#define set_color_band t_set_color_band(cur_term)
-#define set_color_pair t_set_color_pair(cur_term)
-#define set_foreground t_set_foreground(cur_term)
-#define set_left_margin t_set_left_margin(cur_term)
-#define set_left_margin_parm t_set_left_margin_parm(cur_term)
-#define set_lr_margin t_set_lr_margin(cur_term)
-#define set_page_length t_set_page_length(cur_term)
-#define set_pglen_inch t_set_pglen_inch(cur_term)
-#define set_right_margin t_set_right_margin(cur_term)
-#define set_right_margin_parm t_set_right_margin_parm(cur_term)
-#define set_tab t_set_tab(cur_term)
-#define set_tb_margin t_set_tb_margin(cur_term)
-#define set_top_margin t_set_top_margin(cur_term)
-#define set_top_margin_parm t_set_top_margin_parm(cur_term)
-#define set_window t_set_window(cur_term)
-#define start_bit_image t_start_bit_image(cur_term)
-#define start_char_set_def t_start_char_set_def(cur_term)
-#define stop_bit_image t_stop_bit_image(cur_term)
-#define stop_char_set_def t_stop_char_set_def(cur_term)
-#define subscript_characters t_subscript_characters(cur_term)
-#define superscript_characters t_superscript_characters(cur_term)
-#define tab t_tab(cur_term)
-#define these_cause_cr t_these_cause_cr(cur_term)
-#define to_status_line t_to_status_line(cur_term)
-#define tone t_tone(cur_term)
-#define user0 t_user0(cur_term)
-#define user1 t_user1(cur_term)
-#define user2 t_user2(cur_term)
-#define user3 t_user3(cur_term)
-#define user4 t_user4(cur_term)
-#define user5 t_user5(cur_term)
-#define user6 t_user6(cur_term)
-#define user7 t_user7(cur_term)
-#define user8 t_user8(cur_term)
-#define user9 t_user9(cur_term)
-#define underline_char t_underline_char(cur_term)
-#define up_half_line t_up_half_line(cur_term)
-#define wait_tone t_wait_tone(cur_term)
-#define xoff_character t_xoff_character(cur_term)
-#define xon_character t_xon_character(cur_term)
-#define zero_motion t_zero_motion(cur_term)
-
-/*
- * STRING DESCRIPTIONS
- *
- * acs_chars: Graphic charset pairs aAbBcC
- * alt_scancode_esc: Alternate escape for scancode emulation
- * back_tab: Back tab
- * bell: Audible signal (bell)
- * bit_image_carriage_return: Move to beginning of same row
- * bit_image_newline: Move to next row of the bit image
- * bit_image_repeat: Repeat bit-image cell #1 #2 times
- * carriage_return: Carriage return
- * change_char_pitch: Change number of characters per inch
- * change_line_pitch: Change number of lines per inch
- * change_res_horz: Change horizontal resolution
- * change_res_vert: Change vertical resolution
- * change_scroll_region: Change to lines #1 through #2 (VT100)
- * char_padding: Like ip but when in replace mode
- * char_set_names: Returns a list of character set names
- * clear_all_tabs: Clear all tab stops
- * clear_margins: Clear all margins (top, bottom and sides)
- * clear_screen: Clear screen and home cursor
- * clr_bol: Clear to beginning of line, inclusive
- * clr_eol: Clear to end of line
- * clr_eos: Clear to end of display
- * code_set_init: Init sequence for multiple codesets
- * color_names: Give name for colour #1
- * column_address: Set horizontal position to absolute #1
- * command_character: Terminal settable cmd character in prototype
- * create_window: Define win #1 to go from #2,#3 to #4,#5
- * cursor_address: Move to row #1, col #2
- * cursor_down: Down one line
- * cursor_home: Home cursor (if no cup)
- * cursor_invisible: Make cursor invisible
- * cursor_left: Move left one space
- * cursor_mem_address: Memory relative cursor addressing
- * cursor_normal: Make cursor appear normal (under vs/vi)
- * cursor_right: Non-destructive space (cursor or carriage right)
- * cursor_to_ll: Last line, first column (if no cup)
- * cursor_up: Upline (cursor up)
- * cursor_visible: Make cursor very visible
- * define_bit_image_region: Define rectangular bit-image region
- * define_char: Define a character in a character set
- * delete_character: Delete character
- * delete_line: Delete line
- * device_type: Indicate language/codeset support
- * dial_phone: Dial phone number #1
- * dis_status_line: Disable status line
- * display_clock: Display time-of-day clock
- * display_pc_char: Display PC character
- * down_half_time: Half-line down (forward 1/2 linefeed)
- * ena_acs: Enable alternate character set
- * end_bit_image_region: End a bit-image region
- * enter_alt_charset_mode: Start alternate character set
- * enter_am_mode: Turn on automatic margins
- * enter_blink_mode: Turn on blinking
- * enter_bold_mode: Turn on bold (extra bright) mode
- * enter_ca_mode: String to begin programs that use cup
- * enter_delete_mode: Delete mode (enter)
- * enter_dim_mode: Turn on half-bright mode
- * enter_doublewide_mode: Enable double wide printing
- * enter_draft_quality: Set draft qualify print
- * enter_horizontal_hl_mode: Turn on horizontal highlight mode
- * enter_insert_mode: Insert mode (enter)
- * enter_italics_mode: Enable italics
- * enter_left_hl_mode: Turn on left highlight mode
- * enter_leftward_mode: Enable leftward carriage motion
- * enter_low_hl_mode: Turn on low highlight mode
- * enter_micro_mode: Enable micro motion capabilities
- * enter_near_quality_letter: Set near-letter quality print
- * enter_normal_quality: Set normal quality print
- * enter_pc_charset_mode: Enter PC character display mode
- * enter_protected_mode: Turn on protected mode
- * enter_reverse_mode: Turn on reverse video mode
- * enter_right_hl_mode: Turn on right highlight mode
- * enter_scancode_mode: Enter PC scancode mode
- * enter_secure_mode: Turn on blank mode (characters invisible)
- * enter_shadow_mode: Enable shadow printing
- * enter_standout_mode: Begin standout mode
- * enter_subscript_mode: Enable subscript printing
- * enter_superscript_mode: Enable superscript printing
- * enter_top_hl_mode: Turn on top highlight mode
- * enter_underline_mode: Start underscore mode
- * enter_upward_mode: Enable upward carriage motion
- * enter_vertical_hl_mode: Turn on verticle highlight mode
- * enter_xon_mode: Turn on xon/xoff handshaking
- * erase_chars: Erase #1 characters
- * exit_alt_charset_mode: End alternate character set
- * exit_am_mode: Turn off automatic margins
- * exit_attribute_mode: Turn off all attributes
- * exit_ca_mode: String to end programs that use cup
- * exit_delete_mode: End delete mode
- * exit_doublewide_mode: Disable double wide printing
- * exit_insert_mode: End insert mode
- * exit_italics_mode: Disable italics
- * exit_leftward_mode: Enable rightward (normal) carriage motion
- * exit_micro_mode: Disable micro motion capabilities
- * exit_pc_charset_mode: Disable PC character display mode
- * exit_scancode_mode: Disable PC scancode mode
- * exit_shadow_mode: Disable shadow printing
- * exit_standout_mode: End standout mode
- * exit_subscript_mode: Disable subscript printing
- * exit_superscript_mode: Disable superscript printing
- * exit_underline_mode: End underscore mode
- * exit_upward_mode: Enable downward (normal) carriage motion
- * exit_xon_mode: Turn off xon/xoff handshaking
- * fixed_pause: Pause for 2-3 seconds
- * flash_hook: Flash the switch hook
- * flash_screen: Visible bell (may move cursor)
- * form_feed: Hardcopy terminal eject page
- * from_status_line: Return from status line
- * get_mouse: Curses should get button events
- * goto_window: Go to window #1
- * hangup: Hang-up phone
- * init_1string: Terminal or printer initialisation string
- * init_2string: Terminal or printer initialisation string
- * init_3string: Terminal or printer initialisation string
- * init_file: Name of initialisation file
- * init_prog: Path name of program for initialisation
- * initialize_color: Set colour #1 to RGB #2, #3, #4
- * initialize_pair: Set colour-pair #1 to fg #2, bg #3
- * insert_character: Insert character
- * insert_line: Add new blank line
- * insert_padding: Insert pad after character inserted
- * key_a1: upper left of keypad
- * key_a3: upper right of keypad
- * key_b2: center of keypad
- * key_backspace: set by backspace key
- * key_beg: 1
- * key_btab: sent by back-tab key
- * key_c1: lower left of keypad
- * key_c3: lower right of keypad
- * key_cancel: 2
- * key_catab: sent by clear-all-tabs key
- * key_clear: sent by clear-screen or erase key
- * key_close: 3
- * key_command: 4
- * key_copy: 5
- * key_create: 6
- * key_ctab: sent by clear-tab key
- * key_dc: sent by delete-character key
- * key_dl: sent by delete-line key
- * key_down: sent by terminal down-arrow key
- * key_eic: sent by rmir or smir in insert mode
- * key_end: 7
- * key_enter: 8
- * key_eol: sent by clear-to-end-of-line key
- * key_eos: sent by clear-to-end-of-screen key
- * key_exit: 9
- * key_f0: sent by function key f0
- * key_f1: sent by function key f1
- * key_f2: sent by function key f2
- * key_f3: sent by function key f3
- * key_f4: sent by function key f4
- * key_f5: sent by function key f5
- * key_f6: sent by function key f6
- * key_f7: sent by function key f7
- * key_f8: sent by function key f8
- * key_f9: sent by function key f9
- * key_f10: sent by function key f10
- * key_f11: sent by function key f11
- * key_f12: sent by function key f12
- * key_f13: sent by function key f13
- * key_f14: sent by function key f14
- * key_f15: sent by function key f15
- * key_f16: sent by function key f16
- * key_f17: sent by function key f17
- * key_f18: sent by function key f18
- * key_f19: sent by function key f19
- * key_f20: sent by function key f20
- * key_f21: sent by function key f21
- * key_f22: sent by function key f22
- * key_f23: sent by function key f23
- * key_f24: sent by function key f24
- * key_f25: sent by function key f25
- * key_f26: sent by function key f26
- * key_f27: sent by function key f27
- * key_f28: sent by function key f28
- * key_f29: sent by function key f29
- * key_f30: sent by function key f30
- * key_f31: sent by function key f31
- * key_f32: sent by function key f32
- * key_f33: sent by function key f33
- * key_f34: sent by function key f34
- * key_f35: sent by function key f35
- * key_f36: sent by function key f36
- * key_f37: sent by function key f37
- * key_f38: sent by function key f38
- * key_f39: sent by function key f39
- * key_f40: sent by function key f40
- * key_f41: sent by function key f41
- * key_f42: sent by function key f42
- * key_f43: sent by function key f43
- * key_f44: sent by function key f44
- * key_f45: sent by function key f45
- * key_f46: sent by function key f46
- * key_f47: sent by function key f47
- * key_f48: sent by function key f48
- * key_f49: sent by function key f49
- * key_f50: sent by function key f50
- * key_f51: sent by function key f51
- * key_f52: sent by function key f52
- * key_f53: sent by function key f53
- * key_f54: sent by function key f54
- * key_f55: sent by function key f55
- * key_f56: sent by function key f56
- * key_f57: sent by function key f57
- * key_f58: sent by function key f58
- * key_f59: sent by function key f59
- * key_f60: sent by function key f60
- * key_f61: sent by function key f61
- * key_f62: sent by function key f62
- * key_f63: sent by function key f63
- * key_find: 0
- * key_help: sent by help key
- * key_home: sent by home key
- * key_ic: sent by ins-char/enter ins-mode key
- * key_il: sent by insert-line key
- * key_left: sent by terminal left-arrow key
- * key_ll: sent by home-down key
- * key_mark: sent by mark key
- * key_message: sent by message key
- * key_mouse: 0631, Mouse event has occured
- * key_move: sent by move key
- * key_next: sent by next-object key
- * key_npage: sent by next-page key
- * key_open: sent by open key
- * key_options: sent by options key
- * key_ppage: sent by previous-page key
- * key_previous: sent by previous-object key
- * key_print: sent by print or copy key
- * key_redo: sent by redo key
- * key_reference: sent by ref(erence) key
- * key_refresh: sent by refresh key
- * key_replace: sent by replace key
- * key_restart: sent by restart key
- * key_resume: sent by resume key
- * key_right: sent by terminal right-arrow key
- * key_save: sent by save key
- * key_sbeg: sent by shifted beginning key
- * key_scancel: sent by shifted cancel key
- * key_scommand: sent by shifted command key
- * key_scopy: sent by shifted copy key
- * key_screate: sent by shifted create key
- * key_sdc: sent by shifted delete-char key
- * key_sdl: sent by shifted delete-line key
- * key_select: sent by select key
- * key_send: sent by shifted end key
- * key_seol: sent by shifted clear-line key
- * key_sexit: sent by shited exit key
- * key_sf: sent by scroll-forward/down key
- * key_sfind: sent by shifted find key
- * key_shelp: sent by shifted help key
- * key_shome: sent by shifted home key
- * key_sic: sent by shifted input key
- * key_sleft: sent by shifted left-arrow key
- * key_smessage: sent by shifted message key
- * key_smove: sent by shifted move key
- * key_snext: sent by shifted next key
- * key_soptions: sent by shifted options key
- * key_sprevious: sent by shifted prev key
- * key_sprint: sent by shifted print key
- * key_sr: sent by scroll-backwards/up key
- * key_sredo: sent by shifted redo key
- * key_sreplace: sent by shifted replace key
- * key_sright: sent by shifted right-arrow key
- * key_srsume: sent by shifted resume key
- * key_ssave: sent by shifted save key
- * key_ssuspend: sent by shifted suspend key
- * key_stab: sent by set-tab key
- * key_sundo: sent by shifted undo key
- * key_suspend: sent by suspend key
- * key_undo: sent by undo key
- * key_up: sent by terminal up-arrow key
- * keypad_local: Out of "keypad-transmit" mode
- * keypad_xmit: Put terminal in "keypad-transmit" mode
- * lab_f0: Labels on function key f0 if not f0
- * lab_f1: Labels on function key f1 if not f1
- * lab_f2: Labels on function key f2 if not f2
- * lab_f3: Labels on function key f3 if not f3
- * lab_f4: Labels on function key f4 if not f4
- * lab_f5: Labels on function key f5 if not f5
- * lab_f6: Labels on function key f6 if not f6
- * lab_f7: Labels on function key f7 if not f7
- * lab_f8: Labels on function key f8 if not f8
- * lab_f9: Labels on function key f9 if not f9
- * lab_f10: Labels on function key f10 if not f10
- * label_format: Label format
- * label_off: Turn off soft labels
- * label_on: Turn on soft labels
- * meta_off: Turn off "meta mode"
- * meta_on: Turn on "meta mode" (8th bit)
- * micro_column_address: Like column_address for micro adjustment
- * micro_down: Like cursor_down for micro adjustment
- * micro_left: Like cursor_left for micro adjustment
- * micro_right: Like cursor_right for micro adjustment
- * micro_row_address: Like row_address for micro adjustment
- * micro_up: Like cursor_up for micro adjustment
- * mouse_info: Mouse status information
- * newline: Newline (behaves like cr followed by lf)
- * order_of_pins: Matches software bits to print-head pins
- * orig_colors: Set all colour(-pair)s to original ones
- * orig_pair: Set default colour-pair to the original one
- * pad_char: Pad character (rather than NULL)
- * parm_dch: Delete #1 chars
- * parm_delete_line: Delete #1 lines
- * parm_down_cursor: Move down #1 lines
- * parm_down_micro: Like parm_down_cursor for micro adjustment
- * parm_ich: Insert #1 blank chars
- * parm_index: Scroll forward #1 lines
- * parm_insert_line: Add #1 new blank lines
- * parm_left_cursor: Move cursor left #1 lines
- * parm_left_micro: Like parm_left_cursor for micro adjustment
- * parm_right_cursor: Move right #1 spaces
- * parm_right_micro: Like parm_right_cursor for micro adjustment
- * parm_rindex: Scroll backward #1 lines
- * parm_up_cursor: Move cursor up #1 lines
- * parm_up_micro: Like parm_up_cursor for micro adjustment
- * pc_term_options: PC terminal options
- * pkey_key: Prog funct key #1 to type string #2
- * pkey_local: Prog funct key #1 to execute string #2
- * pkey_plab: Prog key #1 to xmit string #2 and show string #3
- * pkey_xmit: Prog funct key #1 to xmit string #2
- * pkey_norm: Prog label #1 to show string #3
- * print_screen: Print contents of screen
- * ptr_non: Turn off printer for #1 bytes
- * ptr_off: Turn off the printer
- * ptr_on: Turn on the printer
- * pulse: Select pulse dialing
- * quick_dial: Dial phone number #1, without progress detection
- * remove_clock: Remove time-of-day clock
- * repeat_char: Repeat char #1 #2 times
- * req_for_input: Send next input char (for ptys)
- * req_mouse_pos: Request mouse position report
- * reset_1string: Reset terminal completely to sane modes
- * reset_2string: Reset terminal completely to sane modes
- * reset_3string: Reset terminal completely to sane modes
- * reset_file: Name of file containing reset string
- * restore_cursor: Restore cursor to position of last sc
- * row_address: Set vertical position to absolute #1
- * save_cursor: Save cursor position
- * scancode_escape: Escape for scancode emulation
- * scroll_forward: Scroll text up
- * scroll_reverse: Scroll text down
- * select_char_set: Select character set
- * set0_des_seq: Shift into codeset 0 (EUC set 0, ASCII)
- * set1_des_seq: Shift into codeset 1
- * set2_des_seq: Shift into codeset 2
- * set3_des_seq: Shift into codeset 3
- * set_a_attributes: Define second set of video attributes #1-#6
- * set_a_background: Set background colour to #1 using ANSI escape
- * set_a_foreground: Set foreground colour to #1 using ANSI escape
- * set_attributes: Define first set of video attributes #1-#9
- * set_background: Set background colour to #1
- * set_bottom_margin: Set bottom margin at current line
- * set_bottom_margin_parm: Set bottom margin at line #1 or #2 lines from bottom
- * set_clock: Set clock to hours (#1), minutes (#2), seconds (#3)
- * set_color_band: Change ribbon to colour #1
- * set_color_pair: Set current colour pair to #1
- * set_foreground: Set foreground colour to #1
- * set_left_margin: Set left margin at current column
- * set_left_margin_parm: Set left (right) margin at column #1 (#2)
- * set_lr_margin: Sets both left and right margins
- * set_page_length: Set page length to #1 lines
- * set_pglen_inch: Set page length to #1 hundredth of an inch
- * set_right_margin: Set right margin at current column
- * set_right_margin_parm: Set right margin at #1
- * set_tab: Set a tab in all rows, current column
- * set_tb_margin: Sets both top and bottom margins
- * set_top_margin: Set top margin at current line
- * set_top_margin_parm: Set top (bottom) margin at line #1 (#2)
- * set_window: Current window is lines #1-#2 cols #3-#4
- * start_bit_image: Start printing bit image graphics
- * start_char_set_def: Start definition of a character set
- * stop_bit_image: End printing bit image graphics
- * stop_char_set_def: End definition of a character set
- * subscript_characters: List of "subscript-able" characters
- * superscript_characters: List of "superscript-able" characters
- * tab: Tab to next 8-space hardware tab stop
- * these_cause_cr: Printing any of these characters causes cr
- * to_status_line: Go to status line, col #1
- * tone: Select tone touch dialing
- * user0: User string 0
- * user1: User string 1
- * user2: User string 2
- * user3: User string 3
- * user4: User string 4
- * user5: User string 5
- * user6: User string 6
- * user7: User string 7
- * user8: User string 8
- * user9: User string 9
- * underline_char: Underscore one char and move past it
- * up_half_line: Half-line up (reverse 1/2 linefeed)
- * wait_tone: Wait for dial tone
- * xoff_character: X-off character
- * xon_character: X-on character
- * zero_motion: No motion for the subsequent character
- */
-
-#ifndef _TERMINFO
-typedef struct {
-  int fildes;
-  /* We need to expose these so that the macros work */
-  const char *name;
-  const char *desc;
-  const signed char *flags;
-  const short *nums;
-  const char **strs;
-} TERMINAL;
-#endif
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-
-extern TERMINAL *cur_term;
-
-/* setup functions */
-int setupterm(const char *, int, int *);
-TERMINAL *set_curterm(TERMINAL *);
-int del_curterm(TERMINAL *);
-char *termname(void);
-char *longname(void);
-
-/* information functions */
-int tigetflag(const char *);
-int tigetnum(const char *);
-char *tigetstr(const char *);
-/* You should note that the spec allows stuffing a char * into a long
- * if the platform allows and the %pN is followed immediately by %l or %s */
-char *tparm(const char *, long, long, long, long, long, long, long, long, long);
-
-/* Non standard functions, but provide a level of thread safety */
-int ti_setupterm(TERMINAL **, const char *, int, int *);
-int ti_getflag(const TERMINAL *, const char *);
-int ti_getnum(const TERMINAL *, const char *);
-const char *ti_getstr(const TERMINAL *, const char *);
-char *ti_parm(TERMINAL *, const char *, long, long, long, long, long, long,
-              long, long, long);
-
-/* These functions do not use PC or speed, but the terminal */
-int ti_puts(const TERMINAL *, const char *, int, int (*)(int, void *), void *);
-int ti_putp(const TERMINAL *, const char *);
-
-/* Using tparm can be kunkly, so provide a variadic function
- * Numbers have to be passed as int */
-/* This is not standard, but ncurses also provides this */
-char *tiparm(const char *, ...);
-/* And a thread safe version */
-char *ti_tiparm(TERMINAL *, const char *, ...);
-
-#ifdef TPARM_TLPARM
-/* Same as the above, but numbers have to be passed as long */
-char *tlparm(const char *, ...);
-/* And a thread safe version */
-char *ti_tlparm(TERMINAL *, const char *, ...);
-#endif
-
-/* Default to X/Open tparm, but allow it to be variadic also */
-#ifdef TPARM_VARARGS
-#define tparm tiparm
-#define ti_parm ti_tiparm
-#endif
-
-/* Convert a termcap string into a terminfo string.
- * The passed string is destroyed and the return string needs to be freed. */
-char *captoinfo(char *);
-
-/* POSIX says that term.h should also pull in our termcap definitions. */
-#include <termcap.h>
-
-__END_DECLS
-#endif
diff --git a/lib/libterminfo/term_private.h b/lib/libterminfo/term_private.h
deleted file mode 100644
index ed5b5c7f3..000000000
--- a/lib/libterminfo/term_private.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* $NetBSD: term_private.h,v 1.11 2013/01/24 10:41:28 roy Exp $ */
-
-/*
- * Copyright (c) 2009, 2010, 2013 The NetBSD Foundation, Inc.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Roy Marples.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-#ifndef _TERM_PRIVATE_H_
-#define	_TERM_PRIVATE_H_
-
-/* This header should only be used by libterminfo, tic and infocmp. */
-
-/* The terminfo database structure is private to us,
- * so it's documented here.
- * terminfo defines the largest number as 32767 and the largest
- * compiled entry as 4093 bytes long.
- * Thus, we store all numbers as uint16_t, including string length.
- * All strings are prefixed by length, including the null terminator.
- * The largest string length we can handle is 65535 bytes,
- * including the null terminator.
- * The largest capability block we can handle is 65535 bytes.
- * This means that we exceed the current terminfo defined limits.
- *
- * Version 1 capabilities are defined as:
- * header byte (always 1)
- * name
- * description,
- * cap length, num flags, index, char,
- * cap length, num numbers, index, number,
- * cap length, num strings, index, string,
- * cap length, num undefined caps, name, type (char), flag, number, string
- *
- * Version 2 entries are aliases and defined as:
- * header byte (always 2)
- * 32bit id of the corresponding terminal in the file
- * name
- *
- * The database itself is created using cdbw(3) and the numbers are
- * always stored as little endian.
- */
-
-#include <sys/types.h>
-
-#define _TERMINFO
-
-/* We use the same ncurses tic macros so that our data is identical
- * when a caller uses the long name macros to access te terminfo data
- * directly. */
-#define ABSENT_BOOLEAN		((signed char)-1)       /* 255 */
-#define ABSENT_NUMERIC		(-1)
-#define ABSENT_STRING		(char *)0
-#define CANCELLED_BOOLEAN	((signed char)-2)       /* 254 */
-#define CANCELLED_NUMERIC	(-2)
-#define CANCELLED_STRING	(char *)(-1)
-#define VALID_BOOLEAN(s) ((unsigned char)(s) <= 1)	/* reject "-1" */
-#define VALID_NUMERIC(s) ((s) >= 0)
-#define VALID_STRING(s)  ((s) != CANCELLED_STRING && (s) != ABSENT_STRING)
-
-typedef struct {
-	const char *id;
-	char type;
-	char flag;
-	short num;
-	const char *str;
-} TERMUSERDEF;
-
-typedef struct {
-	int fildes;
-	/* We need to expose these so that the macros work */
-	const char *name;
-	const char *desc;
-	signed char *flags;
-	short *nums;
-	const char **strs;
-	/* Storage area for terminfo data */
-	char *_area;
-	size_t _arealen;
-	size_t _nuserdefs;
-	TERMUSERDEF *_userdefs;
-	/* So we don't rely on the global ospeed */
-	short _ospeed;
-	/* Output buffer for tparm */
-	char *_buf;
-	size_t _buflen;
-	size_t _bufpos;
-	/* A-Z static variables for tparm  */
-	long _snums[26];
-	/* aliases of the terminal, | separated */
-	const char *_alias;
-} TERMINAL;
-
-extern const char *	_ti_database;
-
-ssize_t		_ti_flagindex(const char *);
-ssize_t		_ti_numindex(const char *);
-ssize_t		_ti_strindex(const char *);
-const char *	_ti_flagid(ssize_t);
-const char *	_ti_numid(ssize_t);
-const char *	_ti_strid(ssize_t);
-int		_ti_getterm(TERMINAL *, const char *, int);
-void		_ti_setospeed(TERMINAL *);
-
-/* libterminfo can compile terminfo strings too */
-#define TIC_WARNING	(1 << 0)
-#define TIC_DESCRIPTION	(1 << 1)
-#define TIC_ALIAS	(1 << 2)
-#define TIC_COMMENT	(1 << 3)
-#define TIC_EXTRA	(1 << 4)
-
-#define UINT16_T_MAX 0xffff
-
-typedef struct {
-	char *buf;
-	size_t buflen;
-	size_t bufpos;
-	size_t entries;
-} TBUF;
-
-typedef struct {
-	char *name;
-	char *alias;
-	char *desc;
-	TBUF flags;
-	TBUF nums;
-	TBUF strs;
-	TBUF extras;
-} TIC;
-
-char *_ti_grow_tbuf(TBUF *, size_t);
-char *_ti_get_token(char **, char);
-char *_ti_find_cap(TBUF *, char,  short);
-char *_ti_find_extra(TBUF *, const char *);
-size_t _ti_store_extra(TIC *, int, char *, char, char, short,
-    char *, size_t, int);
-TIC *_ti_compile(char *, int);
-ssize_t _ti_flatten(uint8_t **, const TIC *);
-void _ti_freetic(TIC *);
-
-#define TPARM_MAX 9	/* not likely to change */
-int _ti_parm_analyse(const char *, int *, int);
-#endif
diff --git a/lib/libterminfo/termcap.3 b/lib/libterminfo/termcap.3
deleted file mode 100644
index bf2629c54..000000000
--- a/lib/libterminfo/termcap.3
+++ /dev/null
@@ -1,156 +0,0 @@
-.\"	$NetBSD: termcap.3,v 1.8 2014/03/18 18:20:38 riastradh Exp $
-.\"
-.\" Copyright (c) 2009 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Roy Marples.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd March 14, 2011
-.Dt TERMCAP 3
-.Os
-.Sh NAME
-.Nm tgetent ,
-.Nm tgetnum ,
-.Nm tgetflag ,
-.Nm tgetstr ,
-.Nm tgoto ,
-.Nm tputs
-.Nd terminal independent operation routines
-.Sh LIBRARY
-.Lb libtermcap
-.Sh SYNOPSIS
-.In termcap.h
-.Vt char PC ;
-.Vt char *BC ;
-.Vt char *UP ;
-.Ft int
-.Fn tgetent "char *bp" "const char *name"
-.Ft int
-.Fn tgetnum "const char *id"
-.Ft int
-.Fn tgetflag "const char *id"
-.Ft char *
-.Fn tgetstr "const char *id" "char **area"
-.Ft char *
-.Fn tgoto "const char *cm" "int destcol" "int destline"
-.Sh DESCRIPTION
-These functions extract and use capabilities from a terminal capability
-database.
-They exist as wrappers around equivalent
-.Xr terminfo 3
-functions, which new code should use.
-These are low level routines; see
-.Xr curses 3
-for a higher level package.
-.Pp
-The
-.Fn tgetent
-function calls
-.Fn setupterm
-and configures
-.Va PC ,
-.Va UP
-and
-.Va BC .
-Only
-.Va PC
-is actually used internally.
-The
-.Fn tgetent
-function returns \-1 if none of the
-.Nm terminfo
-data base files could be opened,
-0 if the terminal name given does not match an entry,
-and 1 if all goes well.
-The
-.Fa bp
-argument is not used.
-.Pp
-The
-.Fn tgetnum
-function gets the numeric value of the capability
-.Fa id ,
-returning \-1 if it is not given for the terminal.
-The
-.Fn tgetflag
-function returns 1 if the specified capability is present in the terminal's
-entry, 0 if it is not.
-The
-.Fn tgetstr
-function returns the string value of the capability
-.Fa id .
-This is a
-.Xr terminfo 5
-string and not a
-.Nm termcap
-string;
-as such it should only be processed by
-.Fn tgoto .
-The
-.Fn tgetstr
-function returns
-.Dv NULL
-if the capability was not found.
-The
-.Fa area
-argument is unused.
-.Pp
-The
-.Fn tgoto
-function returns a cursor addressing string decoded from
-.Fa cm
-to go to column
-.Fa destcol
-in line
-.Fa destline ,
-or
-.Dv NULL
-on error conditions such as out of memory.
-Please note that
-.Fn tgoto
-can return an incomplete value on a malformed input sequence.
-Historically
-.Fn tgoto
-used to return
-.Dq OOPS
-on those conditions, so newer programs should now be checking the return
-value.
-.Sh SEE ALSO
-.Xr terminfo 3 ,
-.Xr terminfo 5
-.Sh HISTORY
-.Nm termcap
-first appeared in 4.0BSD.
-.Nx 1.5
-introduced some
-.Nm termcap
-.Fn t_*
-extensions which were removed in
-.Nx 6.0
-when
-.Xr terminfo 3
-was introduced.
-.Sh AUTHORS
-.An Roy Marples Aq Mt roy@NetBSD.org
diff --git a/lib/libterminfo/termcap.c b/lib/libterminfo/termcap.c
deleted file mode 100644
index aed608017..000000000
--- a/lib/libterminfo/termcap.c
+++ /dev/null
@@ -1,592 +0,0 @@
-/* $NetBSD: termcap.c,v 1.17 2011/11/13 15:24:04 christos Exp $ */
-
-/*
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Roy Marples.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: termcap.c,v 1.17 2011/11/13 15:24:04 christos Exp $");
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdint.h>
-#include <string.h>
-#include <term_private.h>
-#include <term.h>
-#include <termcap.h>
-#include <unistd.h>
-#include <stdio.h>
-
-#include "termcap_map.c"
-#include "termcap_hash.c"
-
-char *UP;
-char *BC;
-
-/* ARGSUSED */
-int
-tgetent(__unused char *bp, const char *name)
-{
-	int errret;
-	static TERMINAL *last = NULL;
-
-	_DIAGASSERT(name != NULL);
-
-	/* Free the old term */
-	if (last != NULL) {
-		del_curterm(last);
-		last = NULL;
-	}
-	errret = -1;
-	if (setupterm(name, STDOUT_FILENO, &errret) != 0)
-		return errret;
-	last = cur_term;
-
-	if (pad_char != NULL)
-		PC = pad_char[0];
-	UP = __UNCONST(cursor_up);
-	BC = __UNCONST(cursor_left);
-	return 1;
-}
-
-int
-tgetflag(const char *id2)
-{
-	uint32_t ind;
-	size_t i;
-	TERMUSERDEF *ud;
-	const char id[] = { id2[0], id2[0] ? id2[1] : '\0', '\0' };
-
-	if (cur_term == NULL)
-		return 0;
-
-	ind = _t_flaghash((const unsigned char *)id, strlen(id));
-	if (ind <= __arraycount(_ti_cap_flagids)) {
-		if (strcmp(id, _ti_cap_flagids[ind].id) == 0)
-			return cur_term->flags[_ti_cap_flagids[ind].ti];
-	}
-	for (i = 0; i < cur_term->_nuserdefs; i++) {
-		ud = &cur_term->_userdefs[i];
-		if (ud->type == 'f' && strcmp(ud->id, id) == 0)
-			return ud->flag;
-	}
-	return 0;
-}
-
-int
-tgetnum(const char *id2)
-{
-	uint32_t ind;
-	size_t i;
-	TERMUSERDEF *ud;
-	const TENTRY *te;
-	const char id[] = { id2[0], id2[0] ? id2[1] : '\0', '\0' };
-
-	if (cur_term == NULL)
-		return -1;
-
-	ind = _t_numhash((const unsigned char *)id, strlen(id));
-	if (ind <= __arraycount(_ti_cap_numids)) {
-		te = &_ti_cap_numids[ind];
-		if (strcmp(id, te->id) == 0) {
-			if (!VALID_NUMERIC(cur_term->nums[te->ti]))
-				return ABSENT_NUMERIC;
-			return cur_term->nums[te->ti];
-		}
-	}
-	for (i = 0; i < cur_term->_nuserdefs; i++) {
-		ud = &cur_term->_userdefs[i];
-		if (ud->type == 'n' && strcmp(ud->id, id) == 0) {
-			if (!VALID_NUMERIC(ud->num))
-				return ABSENT_NUMERIC;
-			return ud->num;
-		}
-	}
-	return -1;
-}
-
-char *
-tgetstr(const char *id2, char **area)
-{
-	uint32_t ind;
-	size_t i;
-	TERMUSERDEF *ud;
-	const char *str;
-	const char id[] = { id2[0], id2[0] ? id2[1] : '\0', '\0' };
-
-	if (cur_term == NULL)
-		return NULL;
-
-	str = NULL;
-	ind = _t_strhash((const unsigned char *)id, strlen(id));
-	if (ind <= __arraycount(_ti_cap_strids)) {
-		if (strcmp(id, _ti_cap_strids[ind].id) == 0) {
-			str = cur_term->strs[_ti_cap_strids[ind].ti];
-			if (str == NULL)
-				return NULL;
-		}
-	}
-	if (str != NULL)
-		for (i = 0; i < cur_term->_nuserdefs; i++) {
-			ud = &cur_term->_userdefs[i];
-			if (ud->type == 's' && strcmp(ud->id, id) == 0)
-				str = ud->str;
-		}
-
-	/* XXX: FXIXME
-	 * We should fix sgr0(me) as it has a slightly different meaning
-	 * for termcap. */
-
-	if (str != NULL && area != NULL && *area != NULL) {
-		char *s;
-		s = *area;
-		strcpy(*area, str);
-		*area += strlen(*area) + 1;
-		return s;
-	}
-
-	return __UNCONST(str);
-}
-
-char *
-tgoto(const char *cm, int destcol, int destline)
-{
-	_DIAGASSERT(cm != NULL);
-	return tiparm(cm, destline, destcol);
-}
-
-static const char *
-flagname(const char *key)
-{
-	uint32_t idx;
-
-	idx = _t_flaghash((const unsigned char *)key, strlen(key));
-	if (idx <= __arraycount(_ti_cap_flagids) &&
-	    strcmp(key, _ti_cap_flagids[idx].id) == 0)
-		return _ti_flagid(_ti_cap_flagids[idx].ti);
-	return key;
-}
-
-static const char *
-numname(const char *key)
-{
-	uint32_t idx;
-
-	idx = _t_numhash((const unsigned char *)key, strlen(key));
-	if (idx <= __arraycount(_ti_cap_numids) && 
-	    strcmp(key, _ti_cap_numids[idx].id) == 0)
-		return _ti_numid(_ti_cap_numids[idx].ti);
-	return key;
-}
-
-static const char *
-strname(const char *key)
-{
-	uint32_t idx;
-
-	idx = _t_strhash((const unsigned char *)key, strlen(key));
-	if (idx <= __arraycount(_ti_cap_strids) &&
-	    strcmp(key, _ti_cap_strids[idx].id) == 0)
-		return _ti_strid(_ti_cap_strids[idx].ti);
-
-	if (strcmp(key, "tc") == 0)
-		return "use";
-
-	return key;
-}
-
-/* Print a parameter if needed */
-static int
-printparam(char **dst, char p, int *nop)
-{
-	if (*nop != 0) {
-		*nop = 0;
-		return 0;
-	}
-
-	*(*dst)++ = '%';
-	*(*dst)++ = 'p';
-	*(*dst)++ = '0' + p;
-	return 3;
-}
-
-/* Convert a termcap character into terminfo equivalents */
-static int
-printchar(char **dst, const char **src)
-{
-	unsigned char v;
-	int l;
-
-	l = 4;
-	v = (unsigned char) *++(*src);
-	if (v == '\\') {
-		v = (unsigned char) *++(*src);
-		switch (v) {
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-			v = 0;
-			while (isdigit((unsigned char) **src))	
-				v = 8 * v + ((unsigned char) *(*src)++ - '0');
-			(*src)--;
-			break;
-		case '\0':
-			v = '\\';
-			break;
-		}
-	} else if (v == '^')
-		v = (unsigned char) (*++(*src) & 0x1f);
-	*(*dst)++ = '%';
-	if (isgraph(v) && v != ',' && v != '\'' && v != '\\' && v != ':') {
-		*(*dst)++ = '\'';
-		*(*dst)++ = v;
-		*(*dst)++ = '\'';
-	} else {
-		*(*dst)++ = '{';
-		if (v > 99) {
-			*(*dst)++ = '0'+ v / 100;
-			l++;
-		}
-		if (v > 9) {
-			*(*dst)++ = '0' + ((int) (v / 10)) % 10;
-			l++;
-		}
-		*(*dst)++ = '0' + v % 10;
-		*(*dst)++ = '}';
-	}
-	return l;
-}
-
-/* Convert termcap commands into terminfo commands */
-static const char fmtB[] = "%p0%{10}%/%{16}%*%p0%{10}%m%+";
-static const char fmtD[] = "%p0%p0%{2}%*%-";
-static const char fmtIf[] = "%p0%p0%?";
-static const char fmtThen[] = "%>%t";
-static const char fmtElse[] = "%+%;";
-
-static char *
-strval(const char *val)
-{
-	char *info, *ip, c;
-	const char *ps, *pe;
-	int p, nop;
-	size_t len, l;
-
-	len = 1024; /* no single string should be bigger */
-	info = ip = malloc(len);
-	if (info == NULL)
-		return 0;
-
-	/* Move the = */
-	*ip++ = *val++;
-
-	/* Set ps and pe to point to the start and end of the padding */
-	if (isdigit((unsigned char)*val)) {
-		for (ps = pe = val;
-		     isdigit((unsigned char)*val) || *val == '.';
-		     val++)
-			pe++;
-		if (*val == '*') {
-			val++;
-			pe++;
-		}
-	} else
-		ps = pe  = NULL;
-
-	l = nop = 0;
-	p = 1;
-	for (; *val != '\0'; val++) {
-		if (l + 2 > len)
-			goto elen;
-		if (*val != '%') {
-			if (*val == ',') {
-				if (l + 3 > len)
-					goto elen;
-				*ip++ = '\\';
-				l++;
-			}
-			*ip++ = *val;
-			l++;
-			continue;
-		}
-		switch (c = *++(val)) {
-		case 'B':
-			if (l + sizeof(fmtB) > len)
-				goto elen;
-			memcpy(ip, fmtB, sizeof(fmtB) - 1);
-			/* Replace the embedded parameters with real ones */
-			ip[2] += p;
-			ip[19] += p;
-			ip += sizeof(fmtB) - 1;
-			l += sizeof(fmtB) - 1;
-			nop = 1;
-			continue;
-		case 'D':
-			if (l + sizeof(fmtD) > len)
-				goto elen;
-			memcpy(ip, fmtD, sizeof(fmtD) - 1);
-			/* Replace the embedded parameters with real ones */
-			ip[2] += p;
-			ip[5] += p;
-			ip += sizeof(fmtD) - 1;
-			l += sizeof(fmtD) - 1;
-			nop = 1;
-			continue;
-		case 'r':
-			/* non op as switched below */
-			break;
-		case '2': /* FALLTHROUGH */
-		case '3': /* FALLTHROUGH */
-		case 'd':
-			if (l + 7 > len)
-				goto elen;
-			l += printparam(&ip, p, &nop);
-			*ip++ = '%';
-			if (c != 'd') {
-				*ip++ = c;
-				l++;
-			}
-			*ip++ = 'd';
-			l += 2;
-			break;
-		case '+':
-			if (l + 13 > len)
-				goto elen;
-			l += printparam(&ip, p, &nop);
-			l += printchar(&ip, &val);
-			*ip++ = '%';
-			*ip++ = c; 
-			*ip++ = '%';
-			*ip++ = 'c';
-			l += 7;
-			break;
-		case '>':
-			if (l + sizeof(fmtIf) + sizeof(fmtThen) +
-			    sizeof(fmtElse) + (6 * 2) > len)
-				goto elen;
-
-			memcpy(ip, fmtIf, sizeof(fmtIf) - 1);
-			/* Replace the embedded parameters with real ones */
-			ip[2] += p;
-			ip[5] += p;
-			ip += sizeof(fmtIf) - 1;
-			l += sizeof(fmtIf) - 1;
-			l += printchar(&ip, &val);
-			memcpy(ip, fmtThen, sizeof(fmtThen) - 1);
-			ip += sizeof(fmtThen) - 1;
-			l += sizeof(fmtThen) - 1;
-			l += printchar(&ip, &val);
-			memcpy(ip, fmtElse, sizeof(fmtElse) - 1);
-			ip += sizeof(fmtElse) - 1;
-			l += sizeof(fmtElse) - 1;
-			l += 16;
-			nop = 1;
-			continue;
-		case '.':
-			if (l + 6 > len)
-				goto elen;
-			l += printparam(&ip, p, &nop);
-			*ip++ = '%';
-			*ip++ = 'c';
-			l += 2;
-			break;
-		default:
-			/* Hope it matches a terminfo command. */
-			*ip++ = '%';
-			*ip++ = c;
-			l += 2;
-			if (c == 'i')
-				continue;
-			break;
-		}
-		/* Swap p1 and p2 */
-		p = 3 - p;
-	}
-
-	/* \E\ is valid termcap.
-	 * We need to escape the final \ for terminfo. */
-	if (l > 2 && info[l - 1] == '\\' &&
-	    (info[l - 2] != '\\' && info[l - 2] != '^'))
-	{
-		if (l + 1 > len)
-			goto elen;
-		*ip++ = '\\';
-	}
-
-	/* Add our padding at the end. */
-	if (ps != NULL) {
-		size_t n = pe - ps;
-		if (l + n + 4 > len)
-			goto elen;
-		*ip++ = '$';
-		*ip++ = '<';
-		strncpy(ip, ps, n);
-		ip += n;
-		*ip++ = '/';
-		*ip++ = '>';
-	}
-
-	*ip = '\0';
-	return info;
-
-elen:
-	free(info);
-	errno = ENOMEM;
-	return NULL;
-}
-
-typedef struct {
-	const char *name;
-	const char *cap;
-} DEF_INFO;
-
-static DEF_INFO def_infos[] = {
-	{ "bel",	"^G" },
-	{ "cr",		"^M" },
-	{ "cud1",	"^J" },
-	{ "ht",		"^I" },
-	{ "ind",	"^J" },
-	{ "kbs",	"^H" },
-	{ "kcub1",	"^H" },
-	{ "kcud1",	"^J" },
-	{ "nel",	"^M^J" }
-};
-
-char *
-captoinfo(char *cap)
-{
-	char *info, *ip, *token, *val, *p, tok[3];
-	const char *name;
-	size_t len, lp, nl, vl, rl;
-	int defs[__arraycount(def_infos)], fv;
-
-	_DIAGASSERT(cap != NULL);
-
-	len = strlen(cap) * 2;
-	len += __arraycount(def_infos) * (5 + 4 + 3); /* reserve for defs */
-	info = ip = malloc(len);
-	if (info == NULL)
-		return NULL;
-
-	memset(defs, 0, sizeof(defs));
-	lp = 0;
-	tok[2] = '\0';
-	for (token = _ti_get_token(&cap, ':');
-	     token != NULL;
-	     token = _ti_get_token(&cap, ':'))
-	{
-		if (token[0] == '\0')
-			continue;
-		name = token;
-		val = p = NULL;
-		fv = nl = 0;
-		if (token[1] != '\0') {
-			tok[0] = token[0];
-			tok[1] = token[1];
-			nl = 1;
-			if (token[2] == '\0') {
-				name = flagname(tok);
-				val = NULL;
-			} else if (token[2] == '#') {
-				name = numname(tok);
-				val = token + 2;
-			} else if (token[2] == '=') {
-				name = strname(tok);
-				val = strval(token + 2);
-				fv = 1;
-			} else
-				nl = 0;
-		}
-		/* If not matched we may need to convert padding still. */
-		if (nl == 0) {
-			p = strchr(name, '=');
-			if (p != NULL) {
-				val = strval(p);
-				*p = '\0';
-				fv = 1;
-			}
-		}
-
-		/* See if this sets a default. */
-		for (nl = 0; nl < __arraycount(def_infos); nl++) {
-			if (strcmp(name, def_infos[nl].name) == 0) {
-				defs[nl] = 1;
-				break;
-			}
-		}
-
-		nl = strlen(name);
-		if (val == NULL)
-			vl = 0;
-		else
-			vl = strlen(val);
-		rl = nl + vl + 3; /* , \0 */
-
-		if (lp + rl > len) {
-			if (rl < 256)
-				len += 256;
-			else
-				len += rl;
-			p = realloc(info, len);
-			if (p == NULL)
-				return NULL;
-			info = p;
-		}
-
-		if (ip != info) {
-			*ip++ = ',';
-			*ip++ = ' ';
-		}
-
-		strcpy(ip, name);
-		ip += nl;
-		if (val != NULL) {
-			strcpy(ip, val);
-			ip += vl;
-			if (fv == 1)
-				free(val);
-		}
-	}
-
-	/* Add any defaults not set above. */
-	for (nl = 0; nl < __arraycount(def_infos); nl++) {
-		if (defs[nl] == 0) {
-			*ip++ = ',';
-			*ip++ = ' ';
-			strcpy(ip, def_infos[nl].name);
-			ip += strlen(def_infos[nl].name);
-			*ip++ = '=';
-			strcpy(ip, def_infos[nl].cap);
-			ip += strlen(def_infos[nl].cap);
-		}
-	}
-
-	*ip = '\0';
-	return info;
-}
-
diff --git a/lib/libterminfo/termcap.h b/lib/libterminfo/termcap.h
deleted file mode 100644
index d64c8741a..000000000
--- a/lib/libterminfo/termcap.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $NetBSD: termcap.h,v 1.2 2011/04/11 21:13:09 roy Exp $ */
-
-/*
- * Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Roy Marples.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-#ifndef _TERMCAP_H_
-#define	_TERMCAP_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-
-/* Output functions.
- * These are still valid for terminfo. */
-int		putp(const char *);
-int		tputs(const char *, int, int (*)(int));
-
-extern short ospeed;
-extern char PC;
-extern char *BC;
-extern char *UP;
-
-int		tgetent(char *, const char *);
-char *		tgetstr(const char *, char **);
-int		tgetflag(const char *);
-int		tgetnum(const char *);
-char *		tgoto(const char *, int, int);
-
-__END_DECLS
-#endif
diff --git a/lib/libterminfo/termcap_map.c b/lib/libterminfo/termcap_map.c
deleted file mode 100644
index 00814ad39..000000000
--- a/lib/libterminfo/termcap_map.c
+++ /dev/null
@@ -1,511 +0,0 @@
-/* $NetBSD: termcap_map.c,v 1.3 2010/09/22 06:10:51 roy Exp $ */
-
-/*
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Roy Marples.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: termcap_map.c,v 1.3 2010/09/22 06:10:51 roy Exp $");
-
-typedef struct {
-	const char id[3];
-	int ti;
-} TENTRY;
-
-static const TENTRY _ti_cap_flagids[] = {
-	{ "bw", TICODE_bw },
-	{ "am", TICODE_am },
-	{ "ut", TICODE_bce },
-	{ "cc", TICODE_ccc },
-	{ "xs", TICODE_xhp },
-	{ "YA", TICODE_xhpa },
-	{ "YF", TICODE_cpix },
-	{ "YB", TICODE_crxm },
-	{ "xt", TICODE_xt },
-	{ "xn", TICODE_xenl },
-	{ "eo", TICODE_eo },
-	{ "gn", TICODE_gn },
-	{ "hc", TICODE_hc },
-	{ "HC", TICODE_chts },
-	{ "km", TICODE_km },
-	{ "YC", TICODE_daisy },
-	{ "hs", TICODE_hs },
-	{ "hl", TICODE_hls },
-	{ "in", TICODE_in },
-	{ "YG", TICODE_lpix },
-	{ "da", TICODE_da },
-	{ "db", TICODE_db },
-	{ "mi", TICODE_mir },
-	{ "ms", TICODE_msgr },
-	{ "nx", TICODE_nxon },
-	{ "xb", TICODE_xsb },
-	{ "NP", TICODE_npc },
-	{ "ND", TICODE_ndscr },
-	{ "NR", TICODE_nrrmc },
-	{ "os", TICODE_os } ,
-	{ "5i", TICODE_mc5i },
-	{ "YD", TICODE_xvpa },
-	{ "YE", TICODE_sam },
-	{ "es", TICODE_eslok },
-	{ "hz", TICODE_hz },
-	{ "ul", TICODE_ul },
-	{ "xo", TICODE_xon }
-};
-
-static const TENTRY _ti_cap_numids[] = {
-	{ "Yo", TICODE_bitwin },
-	{ "Yp", TICODE_bitype },
-	{ "Ya", TICODE_bufsz },
-	{ "BT", TICODE_btns },
-	{ "co", TICODE_cols },
-	{ "Yc", TICODE_spinh },
-	{ "Yb", TICODE_spinv },
-	{ "it", TICODE_it },
-	{ "lh", TICODE_lh },
-	{ "lw", TICODE_lw },
-	{ "li", TICODE_lines },
-	{ "lm", TICODE_lm },
-	{ "ma", TICODE_ma },
-	{ "sg", TICODE_xmc },
-	{ "Co", TICODE_colors },
-	{ "Yd", TICODE_maddr },
-	{ "Ye", TICODE_mjump },
-	{ "pa", TICODE_pairs },
-	{ "MW", TICODE_wnum },
-	{ "Yf", TICODE_mcs },
-	{ "Yg", TICODE_mls },
-	{ "NC", TICODE_ncv },
-	{ "Nl", TICODE_nlab },
-	{ "Yh", TICODE_npins },
-	{ "Yi", TICODE_orc },
-	{ "Yj", TICODE_orl },
-	{ "Yk", TICODE_orhi },
-	{ "Yl", TICODE_orvi },
-	{ "pb", TICODE_pb },
-	{ "Ym", TICODE_cps },
-	{ "vt", TICODE_vt },
-	{ "Yn", TICODE_widcs },
-	{ "ws", TICODE_wsl }
-};
-
-static const TENTRY _ti_cap_strids[] = {
-	{ "ac", TICODE_acsc },
-	{ "S8", TICODE_scesa },
-	{ "bt", TICODE_cbt },
-	{ "bl", TICODE_bel },
-	{ "Yv", TICODE_bicr },
-	{ "Zz", TICODE_binel },
-	{ "Xy", TICODE_birep },
-	{ "cr", TICODE_cr },
-	{ "ZA", TICODE_cpi },
-	{ "ZB", TICODE_lpi },
-	{ "ZC", TICODE_chr },
-	{ "ZD", TICODE_cvr },
-	{ "cs", TICODE_csr },
-	{ "rP", TICODE_rmp },
-	{ "Zy", TICODE_csnm },
-	{ "ct", TICODE_tbc },
-	{ "MC", TICODE_mgc },
-	{ "cl", TICODE_clear },
-	{ "cb", TICODE_el1 },
-	{ "ce", TICODE_el },
-	{ "cd", TICODE_ed },
-	{ "ci", TICODE_csin },
-	{ "Yw", TICODE_colornm },
-	{ "ch", TICODE_hpa },
-	{ "CC", TICODE_cmdch },
-	{ "cm", TICODE_cup },
-	{ "do", TICODE_cud1 },
-	{ "ho", TICODE_home },
-	{ "vi", TICODE_civis },
-	{ "le", TICODE_cub1 },
-	{ "CM", TICODE_mrcup },
-	{ "ve", TICODE_cnorm },
-	{ "nd", TICODE_cuf1 },
-	{ "ll", TICODE_ll },
-	{ "up", TICODE_cuu1 },
-	{ "vs", TICODE_cvvis },
-	{ "Yx", TICODE_defbi },
-	{ "ZE", TICODE_defc },
-	{ "dc", TICODE_dch1 },
-	{ "dl", TICODE_dl1 },
-	{ "dv", TICODE_devt },
-	{ "DI", TICODE_dial },
-	{ "ds", TICODE_dsl },
-	{ "DK", TICODE_dclk },
-	{ "S1", TICODE_dispc },
-	{ "hd", TICODE_hd },
-	{ "eA", TICODE_enacs },
-	{ "Yy", TICODE_endbi },
-	{ "as", TICODE_smacs },
-	{ "SA", TICODE_smam },
-	{ "mb", TICODE_blink },
-	{ "md", TICODE_bold },
-	{ "ti", TICODE_smcup },
-	{ "dm", TICODE_smdc },
-	{ "mh", TICODE_dim },
-	{ "ZF", TICODE_swidm },
-	{ "ZG", TICODE_sdrfq },
-	{ "Xh", TICODE_ehhlm },
-	{ "im", TICODE_smir },
-	{ "ZH", TICODE_sitm },
-	{ "Xl", TICODE_elhlm },
-	{ "ZI", TICODE_slm },
-	{ "Xo", TICODE_elohlm },
-	{ "ZJ", TICODE_smicm },
-	{ "ZK", TICODE_snlq },
-	{ "ZL", TICODE_snrmq },
-	{ "S2", TICODE_smpch },
-	{ "mp", TICODE_prot },
-	{ "mr", TICODE_rev },
-	{ "Xr", TICODE_erhlm },
-	{ "S4", TICODE_smsc },
-	{ "mk", TICODE_invis },
-	{ "ZM", TICODE_sshm },
-	{ "so", TICODE_smso },
-	{ "ZN", TICODE_ssubm },
-	{ "ZO", TICODE_ssupm },
-	{ "Xt", TICODE_ethlm },
-	{ "us", TICODE_smul },
-	{ "ZP", TICODE_sum },
-	{ "Xv", TICODE_evhlm },
-	{ "SX", TICODE_smxon },
-	{ "ec", TICODE_ech },
-	{ "ae", TICODE_rmacs },
-	{ "RA", TICODE_rmam },
-	{ "me", TICODE_sgr0 },
-	{ "te", TICODE_rmcup },
-	{ "ed", TICODE_rmdc },
-	{ "ZQ", TICODE_rwidm },
-	{ "ei", TICODE_rmir },
-	{ "ZR", TICODE_ritm },
-	{ "ZS", TICODE_rlm },
-	{ "ZT", TICODE_rmicm },
-	{ "S3", TICODE_rmpch },
-	{ "S5", TICODE_rmsc },
-	{ "ZU", TICODE_rshm },
-	{ "se", TICODE_rmso },
-	{ "ZV", TICODE_rsubm },
-	{ "ZW", TICODE_rsupm },
-	{ "ue", TICODE_rmul },
-	{ "ZX", TICODE_rum },
-	{ "RX", TICODE_rmxon },
-	{ "PA", TICODE_pause },
-	{ "fh", TICODE_hook },
-	{ "vb", TICODE_flash },
-	{ "ff", TICODE_ff },
-	{ "fs", TICODE_fsl },
-	{ "Gm", TICODE_getm },
-	{ "WG", TICODE_wingo },
-	{ "HU", TICODE_hup },
-	{ "i1", TICODE_is1 },
-	{ "i2", TICODE_is2 },
-	{ "i3", TICODE_is3 },
-	{ "is", TICODE_is2 },
-	{ "if", TICODE_if },
-	{ "iP", TICODE_iprog },
-	{ "Ic", TICODE_initc },
-	{ "Ip", TICODE_initp },
-	{ "ic", TICODE_ich1 },
-	{ "al", TICODE_il1 },
-	{ "ip", TICODE_ip },
-	{ "K1", TICODE_ka1 },
-	{ "K3", TICODE_ka3 },
-	{ "K2", TICODE_kb2 },
-	{ "kb", TICODE_kbs },
-	{ "kB", TICODE_kcbt },
-	{ "K4", TICODE_kc1 },
-	{ "K5", TICODE_kc3 },
-	{ "ka", TICODE_ktbc },
-	{ "kC", TICODE_kclr },
-	{ "kt", TICODE_kctab },
-	{ "kD", TICODE_kdch1 },
-	{ "kL", TICODE_kdl1 },
-	{ "kd", TICODE_kcud1 },
-	{ "kM", TICODE_krmir },
-	{ "kE", TICODE_kel },
-	{ "kS", TICODE_ked },
-	{ "k0", TICODE_kf0 },
-	{ "k1", TICODE_kf1 },
-	{ "k2", TICODE_kf2 },
-	{ "k3", TICODE_kf3 },
-	{ "k4", TICODE_kf4 },
-	{ "k5", TICODE_kf5 },
-	{ "k6", TICODE_kf6 },
-	{ "k7", TICODE_kf7 },
-	{ "k8", TICODE_kf8 },
-	{ "k9", TICODE_kf9 },
-	{ "k;", TICODE_kf10 },
-	{ "F1", TICODE_kf11 },
-	{ "F2", TICODE_kf12 },
-	{ "F3", TICODE_kf13 },
-	{ "F4", TICODE_kf14 },
-	{ "F5", TICODE_kf15 },
-	{ "F6", TICODE_kf16 },
-	{ "F7", TICODE_kf17 },
-	{ "F8", TICODE_kf18 },
-	{ "F9", TICODE_kf19 },
-	{ "FA", TICODE_kf20 },
-	{ "FB", TICODE_kf21 },
-	{ "FC", TICODE_kf22 },
-	{ "FD", TICODE_kf23 },
-	{ "FE", TICODE_kf24 },
-	{ "FF", TICODE_kf25 },
-	{ "FG", TICODE_kf26 },
-	{ "FH", TICODE_kf27 },
-	{ "FI", TICODE_kf28 },
-	{ "FJ", TICODE_kf29 },
-	{ "FK", TICODE_kf30 },
-	{ "FL", TICODE_kf31 },
-	{ "FM", TICODE_kf32 },
-	{ "FN", TICODE_kf33 },
-	{ "FO", TICODE_kf34 },
-	{ "FP", TICODE_kf35 },
-	{ "FQ", TICODE_kf36 },
-	{ "FR", TICODE_kf37 },
-	{ "FS", TICODE_kf38 },
-	{ "FT", TICODE_kf39 },
-	{ "FU", TICODE_kf40 },
-	{ "FV", TICODE_kf41 },
-	{ "FW", TICODE_kf42 },
-	{ "FX", TICODE_kf43 },
-	{ "FY", TICODE_kf44 },
-	{ "FZ", TICODE_kf45 },
-	{ "Fa", TICODE_kf46 },
-	{ "Fb", TICODE_kf47 },
-	{ "Fc", TICODE_kf48 },
-	{ "Fd", TICODE_kf49 },
-	{ "Fe", TICODE_kf50 },
-	{ "Ff", TICODE_kf51 },
-	{ "Fg", TICODE_kf52 },
-	{ "Fh", TICODE_kf53 },
-	{ "Fi", TICODE_kf54 },
-	{ "Fj", TICODE_kf55 },
-	{ "Fk", TICODE_kf56 },
-	{ "Fl", TICODE_kf57 },
-	{ "Fm", TICODE_kf58 },
-	{ "Fn", TICODE_kf59 },
-	{ "Fo", TICODE_kf60 },
-	{ "Fp", TICODE_kf61 },
-	{ "Fq", TICODE_kf62 },
-	{ "Fr", TICODE_kf63 },
-	{ "%1", TICODE_khlp },
-	{ "kh", TICODE_khome },
-	{ "kI", TICODE_kich1 },
-	{ "kA", TICODE_kil1 },
-	{ "kl", TICODE_kcub1 },
-	{ "kH", TICODE_kll },
-	{ "%2", TICODE_kmrk },
-	{ "%3", TICODE_kmsg },
-	{ "Km", TICODE_kmous },
-	{ "%4", TICODE_kmov },
-	{ "%5", TICODE_knxt },
-	{ "kN", TICODE_knp },
-	{ "%6", TICODE_kopn },
-	{ "%7", TICODE_kopt },
-	{ "kP", TICODE_kpp },
-	{ "%8", TICODE_kprv },
-	{ "%9", TICODE_kprt },
-	{ "%0", TICODE_krdo },
-	{ "&1", TICODE_kref },
-	{ "&2", TICODE_krfr },
-	{ "&3", TICODE_krpl },
-	{ "&4", TICODE_krst },
-	{ "&5", TICODE_kres },
-	{ "kr", TICODE_kcuf1 },
-	{ "&6", TICODE_ksav },
-	{ "&9", TICODE_kBEG },
-	{ "&0", TICODE_kCAN },
-	{ "*1", TICODE_kCMD },
-	{ "*2", TICODE_kCPY },
-	{ "*3", TICODE_kCRT },
-	{ "*4", TICODE_kDC },
-	{ "*5", TICODE_kDL },
-	{ "*6", TICODE_kslt },
-	{ "*7", TICODE_kEND },
-	{ "*8", TICODE_kEOL },
-	{ "*9", TICODE_kEXT },
-	{ "kF", TICODE_kind },
-	{ "*0", TICODE_kFND },
-	{ "#1", TICODE_kHLP },
-	{ "#2", TICODE_kHOM },
-	{ "#3", TICODE_kIC },
-	{ "#4", TICODE_kLFT },
-	{ "%a", TICODE_kMSG },
-	{ "%b", TICODE_kMOV },
-	{ "%c", TICODE_kNXT },
-	{ "%d", TICODE_kOPT },
-	{ "%e", TICODE_kPRV },
-	{ "%f", TICODE_kPRT },
-	{ "kR", TICODE_kri },
-	{ "%g", TICODE_kRDO },
-	{ "%h", TICODE_kRPL },
-	{ "%i", TICODE_kRIT },
-	{ "%j", TICODE_kRES },
-	{ "!1", TICODE_kSAV },
-	{ "!2", TICODE_kSPD },
-	{ "kT", TICODE_khts },
-	{ "!3", TICODE_kUND },
-	{ "&7", TICODE_kspd },
-	{ "&8", TICODE_kund },
-	{ "ku", TICODE_kcuu1 },
-	{ "ke", TICODE_rmkx },
-	{ "ks", TICODE_smkx },
-	{ "l0", TICODE_lf0 },
-	{ "l1", TICODE_lf1 },
-	{ "l2", TICODE_lf2 },
-	{ "l3", TICODE_lf3 },
-	{ "l4", TICODE_lf4 },
-	{ "l5", TICODE_lf5 },
-	{ "l6", TICODE_lf6 },
-	{ "l7", TICODE_lf7 },
-	{ "l8", TICODE_lf8 },
-	{ "l9", TICODE_lf9 },
-	{ "la", TICODE_lf10 },
-	{ "Lf", TICODE_fln },
-	{ "LF", TICODE_rmln },
-	{ "LO", TICODE_smln },
-	{ "mo", TICODE_rmm },
-	{ "mm", TICODE_smm },
-	{ "ZY", TICODE_mhpa },
-	{ "ZZ", TICODE_mcud1 },
-	{ "Za", TICODE_mcub1 },
-	{ "Zb", TICODE_mcuf1 },
-	{ "Zc", TICODE_mvpa },
-	{ "Zd", TICODE_mcuu1 },
-	{ "Mi", TICODE_minfo },
-	{ "nw", TICODE_nel },
-	{ "Ze", TICODE_porder },
-	{ "oc", TICODE_oc },
-	{ "op", TICODE_op },
-	{ "pc", TICODE_pad },
-	{ "DC", TICODE_dch },
-	{ "DL", TICODE_dl },
-	{ "DO", TICODE_cud },
-	{ "Zf", TICODE_mcud },
-	{ "IC", TICODE_ich },
-	{ "SF", TICODE_indn },
-	{ "AL", TICODE_il },
-	{ "LE", TICODE_cub },
-	{ "Zg", TICODE_mcub },
-	{ "RI", TICODE_cuf },
-	{ "Zh", TICODE_mcuf },
-	{ "SR", TICODE_rin },
-	{ "UP", TICODE_cuu },
-	{ "Zi", TICODE_mcuu },
-	{ "S6", TICODE_pctrm },
-	{ "pk", TICODE_pfkey },
-	{ "pl", TICODE_pfloc },
-	{ "xl", TICODE_pfxl },
-	{ "px", TICODE_pfx },
-	{ "pn", TICODE_pln },
-	{ "ps", TICODE_mc0 },
-	{ "pO", TICODE_mc5p },
-	{ "pf", TICODE_mc4 },
-	{ "po", TICODE_mc5 },
-	{ "PU", TICODE_pulse },
-	{ "QD", TICODE_qdial },
-	{ "RC", TICODE_rmclk },
-	{ "rp", TICODE_rep },
-	{ "RF", TICODE_rfi },
-	{ "RQ", TICODE_reqmp },
-	{ "r1", TICODE_rs1 },
-	{ "r2", TICODE_rs2 },
-	{ "r3", TICODE_rs3 },
-	{ "rf", TICODE_rf },
-	{ "rc", TICODE_rc },
-	{ "cv", TICODE_vpa },
-	{ "sc", TICODE_sc },
-	{ "S7", TICODE_scesc },
-	{ "sf", TICODE_ind },
-	{ "sr", TICODE_ri },
-	{ "Zj", TICODE_scs },
-	{ "s0", TICODE_s0ds },
-	{ "s1", TICODE_s1ds },
-	{ "s2", TICODE_s2ds },
-	{ "s3", TICODE_s3ds },
-	{ "sA", TICODE_sgr1 },
-	{ "AB", TICODE_setab },
-	{ "AF", TICODE_setaf },
-	{ "sa", TICODE_sgr },
-	{ "Sb", TICODE_setb },
-	{ "Zk", TICODE_smgb },
-	{ "Zl", TICODE_smgbp },
-	{ "SC", TICODE_sclk },
-	{ "Yz", TICODE_slines },
-	{ "sL", TICODE_slength },
-	{ "sp", TICODE_scp },
-	{ "Sf", TICODE_setf },
-	{ "ML", TICODE_smgl }, /* We should fallback to TICODE_smglr */
-	{ "Zm", TICODE_smglp },
-	{ "YZ", TICODE_slines },
-	{ "YI", TICODE_slength },
-	{ "MR", TICODE_smgr },
-	{ "Zn", TICODE_smgrp },
-	{ "st", TICODE_hts },
-	{ "MT", TICODE_smgtb },
-	{ "Zo", TICODE_smgt },
-	{ "Zp", TICODE_smgtp },
-	{ "wi", TICODE_wind },
-	{ "Zq", TICODE_sbim },
-	{ "Zr", TICODE_scsd },
-	{ "Zs", TICODE_rbim },
-	{ "Zt", TICODE_rcsd },
-	{ "Zu", TICODE_subcs },
-	{ "Zv", TICODE_supcs },
-	{ "ta", TICODE_ht },
-	{ "Zw", TICODE_docr },
-	{ "ts", TICODE_tsl },
-	{ "TO", TICODE_tone },
-	{ "u0", TICODE_u0 },
-	{ "u1", TICODE_u1 },
-	{ "u2", TICODE_u2 },
-	{ "u3", TICODE_u3 },
-	{ "u4", TICODE_u4 },
-	{ "u5", TICODE_u5 },
-	{ "u6", TICODE_u6 },
-	{ "u7", TICODE_u7 },
-	{ "u8", TICODE_u8 },
-	{ "u9", TICODE_u9 },
-	{ "uc", TICODE_uc },
-	{ "hu", TICODE_hu },
-	{ "WA", TICODE_wait },
-	{ "XF", TICODE_xoffc },
-	{ "XN", TICODE_xonc },
-	{ "Zx", TICODE_zerom },
-
-	/* NetBSD extensions */
-	{ "@0", TICODE_kfnd },
-	{ "@1", TICODE_kbeg },
-	{ "@2", TICODE_kcan },
-	{ "@3", TICODE_kclo },
-	{ "@4", TICODE_kcmd },
-	{ "@5", TICODE_kcpy },
-	{ "@6", TICODE_kcrt },
-	{ "@7", TICODE_kend },
-	{ "@8", TICODE_kent },
-	{ "@9", TICODE_kext },
-};
diff --git a/lib/libterminfo/terminfo.3 b/lib/libterminfo/terminfo.3
deleted file mode 100644
index 3816e63c5..000000000
--- a/lib/libterminfo/terminfo.3
+++ /dev/null
@@ -1,248 +0,0 @@
-.\"	$NetBSD: terminfo.3,v 1.12 2014/03/18 18:20:38 riastradh Exp $
-.\"
-.\" Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Roy Marples.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 25, 2013
-.Dt TERMINFO 3
-.Os
-.Sh NAME
-.Nm setupterm ,
-.Nm set_curterm ,
-.Nm del_curterm ,
-.Nm termname ,
-.Nm longname ,
-.Nm tigetflag ,
-.Nm tigetnum ,
-.Nm tigetstr ,
-.Nm tparm ,
-.Nm tputs ,
-.Nm putp
-.Nd terminal independent operation routines
-.Sh LIBRARY
-.Lb libterminfo
-.Sh SYNOPSIS
-.In term.h
-.Vt char PC ;
-.Vt short ospeed ;
-.Vt TERMINAL *cur_term ;
-.Ft int
-.Fn setupterm "const char *name" "int fildes" "int *errret"
-.Ft TERMINAL *
-.Fn set_curterm "TERMINAL *nterm"
-.Ft int
-.Fn del_curterm "TERMINAL *oterm"
-.Ft char *
-.Fn termname "void"
-.Ft char *
-.Fn longname "void"
-.Ft int
-.Fn tigetnum "const char *id"
-.Ft int
-.Fn tigetflag "const char *id"
-.Ft char *
-.Fn tigetstr "const char *id"
-.Ft char *
-.Fn tparm "const char *cm" "long p1" "long p2" "long p3" "long p4" "long p5" "long p6" "long p7" "long p8" "long p9"
-.Ft int
-.Fn tputs "const char *cp" "int affcnt" "int (*outc)(int)"
-.Ft int
-.Fn putp "const char *cp"
-.Ft int
-.Fn ti_setupterm "TERMINAL **" "const char *name" "int fildes" "int *error"
-.Ft int
-.Fn ti_getflag "const TERMINAL *" "const char *id"
-.Ft int
-.Fn ti_getnum "const TERMINAL *" "const char *id"
-.Ft const char *
-.Fn ti_getstr "const TERMINAL *" "const char *id"
-.Ft char *
-.Fn tiparm "const char *cm" "..."
-.Ft char *
-.Fn ti_tiparm "TERMINAL *" "const char *cm" "..."
-.Ft int
-.Fn ti_puts "const TERMINAL *term" "const char *str" "int affcnt" "int (*outc)(int, void *)"
-.Ft int
-.Fn ti_putp "const TERMINAL *term" "const char *str"
-.Sh DESCRIPTION
-These functions extract and use capabilities from a terminal capability
-database, usually
-.Pa /usr/share/misc/terminfo ,
-the format of which is described in
-.Xr terminfo 5 .
-These are low level routines;
-see
-.Xr curses 3
-for a higher level package.
-.Pp
-The
-.Fn setupterm
-function extracts the entry for terminal
-.Fa name
-and then calls
-.Fn set_curterm
-to set
-.Va cur_term
-to it.
-If
-.Fa name
-is
-.Dv NULL
-then it is replaced by the environment variable
-.Ev TERM .
-The
-.Fn setupterm
-function returns 0 on success and \-1 on error.
-.Va errret
-is set to \-1 if the
-.Nm terminfo
-database could not be opened,
-0 if the terminal could not be found in the database, and
-1 if all went well.
-.Pp
-The
-.Fn set_curterm
-function sets the variable
-.Va cur_term
-to
-.Va nterm
-and makes all of the
-.Nm terminfo
-boolean, numeric and string variables use the values from
-.Va nterm .
-The global variables
-.Va PC
-and
-.Va ospeed
-are then set.
-The old value of
-.Va cur_term
-is returned.
-The
-.Fn del_curterm
-function frees space pointed to by
-.Va oterm .
-.Pp
-The
-.Fn termname
-function returns the name of
-.Va cur_term .
-The
-.Fn longname
-function returns the description of
-.Va cur_term .
-.Pp
-The
-.Fn tigetflag
-function gets the boolean value of capability
-.Va id ,
-returning \-1 if it is not a valid capability.
-The
-.Fn tigetnum
-function gets the numeric value of the capability
-.Va id ,
-returning \-2 if it is not a valid capability.
-The
-.Fn tigetstr
-function returns the string value of the capability
-.Va id ,
-returning (char *)-1 if it is not a valid capability.
-.Pp
-The
-.Fn tparm
-function returns a string decoded from
-.Va cm
-with the parameters
-.Va p1
-\&...
-.Va p9
-applied.
-Some capabilities require string parameters and only platforms that can fit
-a
-.Vt char *
-pointer inside a
-.Vt long
-can use them.
-For platforms which don't support this,
-.Dv NULL
-is returned and
-.Va errno
-is set to
-.Er ENOTSUPP .
-The string encoding and parameter application is described in
-.Xr terminfo 5 .
-.Pp
-The
-.Fn tputs
-function applies padding information to the string
-.Va cp ;
-.Va affcnt
-gives the number of lines affected by the operation,
-or 1 if this is not applicable;
-.Va outc
-is a function which is called by each character in turn.
-The external variable
-.Va ospeed
-controls how many padding characters are sent in relation to the terminal
-speed.
-The
-.Fn putp
-function calls tputs(str, 1, putchar).
-The output from
-.Fn putp
-always goes to stdout.
-.Ss NetBSD Extensions To Terminfo
-The
-.Fn tiparm
-function allows variadic parameters instead of 9 fixed longs.
-Numeric parameters must be passed as
-.Vt int .
-String parameters must be passed as
-.Vt char *
-and works on all platforms, unlike
-.Fn tparm .
-.Pp
-The
-.Fn ti_*
-functions correspond to the standard
-.Fn t*
-functions but take an additional
-.Ft TERMINAL *
-parameter so that the terminal can be specified instead of assuming
-.Va cur_term .
-These functions use private variables to the
-.Ft TERMINAL
-instead of the global variables, such as
-.Va PC
-and
-.Va ospeed .
-.Sh SEE ALSO
-.Xr ex 1 ,
-.Xr curses 3 ,
-.Xr terminfo 5
-.Sh AUTHORS
-.An Roy Marples Aq Mt roy@NetBSD.org
diff --git a/lib/libterminfo/terminfo.5.in b/lib/libterminfo/terminfo.5.in
deleted file mode 100644
index e51111e0f..000000000
--- a/lib/libterminfo/terminfo.5.in
+++ /dev/null
@@ -1,263 +0,0 @@
-.\"	$NetBSD: terminfo.5.in,v 1.20 2014/03/18 18:20:38 riastradh Exp $
-.\"
-.\" Copyright (c) 2009, 2010, 2011, 2013 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Roy Marples.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 25, 2013
-.Dt TERMINFO 5
-.Os
-.Sh NAME
-.Nm terminfo
-.Nd terminal capability definition
-.Sh DESCRIPTION
-.Nm
-describes the capabilities of terminals, used by programs such as
-.Xr vi 1 ,
-.Xr rogue 6
-and libraries such as
-.Xr curses 3 .
-The
-.Nm
-source described here needs to be compiled with
-.Xr tic 1
-to be of any use.
-.Pp
-Entries in
-.Nm
-consist of a number of comma separated fields.
-White space after each comma is ignored.
-Embedded commas must be escaped by using a backslash.
-Lines beginning with
-.Sq #
-in the first column are treated as comments.
-Blank lines are ignored.
-.Pp
-The header line must begin in column one and end with a comma.
-Inside the header line are terminal name and aliases,
-separated by vertical bars, the last one being the long
-description of the terminal.
-.Pp
-Capability lines then follow, starting on column two and ending with a comma.
-Each capability is listed by its name, followed by its value if applicable.
-Booleans have no values, numeric values are prefixed by
-.Sq #
-and strings are prefixed by
-.Sq = .
-Numbers can range from 0 to 32767 and string values can be up to 1000
-characters long.
-This implementation supports strings upto 32767 characters long, including the
-.Dv NUL
-terminator.
-.Pp
-Some escapes are available for strings - both
-.Sy \eE
-and
-.Sy \ee
-map to the
-.Dv ESC
-character,
-.Sy ^X
-maps to a control-X for any appropriate X, and the sequences
-.Sy \en ,
-.Sy \er ,
-.Sy \et ,
-.Sy \eb
-and
-.Sy \ef
-map to linefeed, return, tab, backspace, and formfeed respectively.
-Any character can be escaped in octal, such as
-.Sy \e072 .
-If you need to encode a
-.Dv NUL
-character, it should be escaped as
-.Sy \e200 .
-.Pp
-A delay in milliseconds may appear anywhere in a string capability,
-prefixed with a dollar sign and enclosed by angled brackets, such as
-.Sy $\*[Lt]5\*[Gt] .
-.Ss String Parameters
-String capabilities sometimes require parameters.
-Normally this just involves replacing the parameter with a supplied
-variable; however, there are cases where the variable needs to be manipulated
-or used in conditional expressions.
-A stack is also provided for simple pop and push operations.
-.Pp
-The below % encodings have the following meanings:
-.Bl -tag -width %P[a-z]
-.It Sy %%
-outputs %
-.It Sy %[[:]flags][width[.precision]][doxXs]
-flags are
-.Dq [-+#] .
-Prefix with
-.Sq \&:
-to avoid interpreting
-.Dq %-
-as an operator.
-.It Sy %c
-pop a parameter and print the character representation of it.
-.It Sy %s
-pop a parameter and print the string representation of it.
-.It Sy %p[1-9]
-push the parameter [1-9].
-.It Sy %P[a-z]
-pop a parameter and push it to dynamic variable [a-z].
-.It Sy %g[a-z]
-push the dynamic variable [a-z].
-.It Sy %P[A-Z]
-pop a parameter and push it to static variable [a-z].
-.It Sy %g[A-Z]
-push the dynamic variable [A-Z].
-.Pp
-Static variables persist over
-.Fn tparm
-whereas dynamic variables do not.
-.It Sy %'c'
-char constant c.
-.It Sy %{nn}
-integer constant nn.
-.It Sy %l
-push the string length of the previously popped parameter.
-.It Sy %+ Sy %- Sy %* Sy %/ Sy %m
-arithmetic: pop two parameters and push the result.
-.It Sy %& Sy %| Sy %^
-bit operations: pop two parameters and push the result.
-.It Sy %! Sy %~
-unary operations: pop two parameters and push the result.
-.It Sy %i
-add 1 to parameters 1 and 2.
-.It Sy %? Va expr Sy %t Ic then Sy %e Ic else Sy %;
-If expr equates to zero then control passes to the optional else part.
-.El
-.Ss Boolean Capabilities
-.Bl -column "enter_near_quality_letter" "setcolor" "TC" "desc"
-.It Sy "Long name" Ta Sy "Code" Ta Sy "TC" Ta Sy "Description"
-@BOOLCAPS@
-.El
-.Ss Numeric Capabilities
-.Bl -column "enter_near_quality_letter" "setcolor" "TC" "Desc"
-.It Sy "Long name" Ta Sy "Code" Ta Sy "TC" Ta Sy "Description"
-@NUMCAPS@
-.El
-.Ss String Capabilities
-.Bl -column "enter_near_quality_letter" "setcolor" "TC" "Desc"
-.It Sy "Long name" Ta Sy "Code" Ta Sy "TC" Ta Sy "Description"
-@STRCAPS@
-.El
-.Ss A Sample Entry
-.Bd -literal
-vt100\||dec vt100 (w/advanced video),
-am, xenl, msgr, mc5i, xon,
-cols#80, it#8, lines#24, vt#3,
-acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G,
-cr=^M, csr=\eE[%i%p1%d;%p2%dr, tbc=\eE[3g, clear=\eE[H\eE[J$\*[Lt]50\*[Gt],
-el1=\eE[1K$\*[Lt]3\*[Gt], el=\eE[K$\*[Lt]3\*[Gt], ed=\eE[J$\*[Lt]50\*[Gt],
-cup=\eE[%i%p1%d;%p2%dH$\*[Lt]5\*[Gt], cud1=^J, home=\eE[H, cub1=^H,
-cuf1=\eE[C$\*[Lt]2\*[Gt], cuu1=\eE[A$\*[Lt]2\*[Gt], enacs=\eE(B\eE)0, smacs=^N,
-smam=\eE[?7h, blink=\eE[5m$\*[Lt]2\*[Gt], bold=\eE[1m$\*[Lt]2\*[Gt], rev=\eE[7m$\*[Lt]2\*[Gt],
-smso=\eE[7m$\*[Lt]2\*[Gt], smul=\eE[4m$\*[Lt]2\*[Gt], rmacs=^O, rmam=\eE[?7l,
-sgr0=\eE[m017$\*[Lt]2\*[Gt], rmso=\eE[m$\*[Lt]2\*[Gt], rmul=\eE[m$\*[Lt]2\*[Gt], ka1=\eEOq,
-ka3=\eEOs, kb2=\eEOr, kbs=^H, kc1=\eEOp, kc3=\eEOn, kcud1=\eEOB,
-kent=\eEOM, kf0=\eEOy, kf1=\eEOP, kf2=\eEOQ, kf3=\eEOR, kf4=\eEOS,
-kf5=\eEOt, kf6=\eEOu, kf7=\eEOv, kf8=\eEOl, kf9=\eEOw, kf10=\eEOx,
-kcub1=\eEOD, kcuf1=\eEOC, kcuu1=\eEOA, rmkx=\eE[?1l\eE\*[Gt],
-smkx=\eE[?1h\eE=, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4,
-cud=\eE[%p1%dB, cub=\eE[%p1%dD, cuf=\eE[%p1%dC, cuu=\eE[%p1%dA,
-mc0=\eE[0i, mc4=\eE[4i, mc5=\eE[5i,
-rs2=\eE\*[Gt]\eE[?3l\eE[?4l\eE[?5l\eE[?7h\eE[?8h, rc=\eE8, sc=\eE7,
-ind=^J, ri=\eEM$\*[Lt]5\*[Gt],
-sgr=\eE[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t016%e017%;$\*[Lt]2\*[Gt],
-hts=\eEH, ht=^I,
-.Ed
-.Ss Fetching Compiled Descriptions
-This implementation uses hashed databases managed by
-.Xr cdb 5
-instead of directories.
-To maintain compatability with other implementations,
-.Pa .cdb
-is appended to each file checked.
-.Pp
-If the environment variable
-.Ev TERMINFO
-is available, does not begin with
-.Pq Sq / ,
-can be compiled with the above rules and whose name matches
-.Ev TERM
-then it is used.
-.Pp
-If the environment variable
-.Ev TERMCAP
-is available and does not begin with a slash
-.Pq Sq /
-then it will be translated into
-terminfo and compiled as above.
-If its name matches
-.Ev TERM
-then it is used.
-.Pp
-If the environment variable
-.Ev TERMINFO
-is available and begins with a slash
-.Pq Sq /
-then only this file is searched.
-Otherwise
-.Nm
-will first look for
-.Pa $HOME/.terminfo ,
-followed by
-.Pa /usr/share/misc/terminfo
-unless
-.Ev TERMINFO_DIRS
-is available.
-If a matching description is not found then a small embedded database is
-searched, which currently holds descriptions for ansi, dumb, vt100, vt220,
-wsvt25, and xterm.
-.Sh FILES
-.Bl -tag -width /usr/share/misc/terminfo.cdb -compact
-.It Pa $HOME/.terminfo.cdb
-Database of terminal descriptions for personal use.
-.It Pa /usr/share/misc/terminfo
-File containing terminal descriptions.
-.It Pa /usr/share/misc/terminfo.cdb
-Database of terminal descriptions.
-.El
-.Sh SEE ALSO
-.Xr infocmp 1 ,
-.Xr tic 1 ,
-.Xr tput 1 ,
-.Xr curses 3 ,
-.Xr cdb 5
-.Sh STANDARDS
-.Nm
-complies with the
-.St -xcurses4.2
-standard.
-.Pp
-Extensions to the standard are noted in
-.Xr tic 1 .
-.Sh AUTHORS
-.An Roy Marples Aq Mt roy@NetBSD.org
diff --git a/lib/libterminfo/ti.c b/lib/libterminfo/ti.c
deleted file mode 100644
index a4bb631ea..000000000
--- a/lib/libterminfo/ti.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* $NetBSD: ti.c,v 1.3 2013/06/07 13:16:18 roy Exp $ */
-
-/*
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- *
- * This id is derived from software contributed to The NetBSD Foundation
- * by Roy Marples.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source id must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: ti.c,v 1.3 2013/06/07 13:16:18 roy Exp $");
-
-#include <assert.h>
-#include <string.h>
-#include <term_private.h>
-#include <term.h>
-
-int
-ti_getflag(const TERMINAL *term, const char *id)
-{
-	ssize_t ind;
-	size_t i;
-	TERMUSERDEF *ud;
-
-	_DIAGASSERT(term != NULL);
-	_DIAGASSERT(id != NULL);
-
-	ind = _ti_flagindex(id);
-	if (ind != -1)
-		return term->flags[ind];
-	for (i = 0; i < term->_nuserdefs; i++) {
-		ud = &term->_userdefs[i];
-		if (ud->type == 'f' && strcmp(ud->id, id) == 0)
-			return ud->flag;
-	}
-	return ABSENT_BOOLEAN;
-}
-
-int
-tigetflag(const char *id)
-{
-
-	_DIAGASSERT(id != NULL);
-	if (cur_term != NULL)
-		return ti_getflag(cur_term, id);
-	return ABSENT_BOOLEAN;
-}
-
-int
-ti_getnum(const TERMINAL *term, const char *id)
-{
-	ssize_t ind;
-	size_t i;
-	TERMUSERDEF *ud;
-
-	_DIAGASSERT(term != NULL);
-	_DIAGASSERT(id != NULL);
-
-	ind = _ti_numindex(id);
-	if (ind != -1) {
-		if (!VALID_NUMERIC(term->nums[ind]))
-			return ABSENT_NUMERIC;
-		return term->nums[ind];
-	}
-	for (i = 0; i < term->_nuserdefs; i++) {
-		ud = &term->_userdefs[i];
-		if (ud->type == 'n' && strcmp(ud->id, id) == 0) {
-			if (!VALID_NUMERIC(ud->num))
-			    return ABSENT_NUMERIC;
-			return ud->num;
-		}
-	}
-	return CANCELLED_NUMERIC;
-}
-
-int
-tigetnum(const char *id)
-{
-
-	_DIAGASSERT(id != NULL);
-	if (cur_term != NULL)
-		return ti_getnum(cur_term, id);
-	return CANCELLED_NUMERIC;
-}
-
-const char *
-ti_getstr(const TERMINAL *term, const char *id)
-{
-	ssize_t ind;
-	size_t i;
-	TERMUSERDEF *ud;
-
-	_DIAGASSERT(term != NULL);
-	_DIAGASSERT(id != NULL);
-
-	ind = _ti_strindex(id);
-	if (ind != -1)
-		return term->strs[ind];
-	for (i = 0; i < term->_nuserdefs; i++) {
-		ud = &term->_userdefs[i];
-		if (ud->type == 's' && strcmp(ud->id, id) == 0)
-			return ud->str;
-	}
-	return (const char *)CANCELLED_STRING;
-}
-
-char *
-tigetstr(const char *id)
-{
-
-	_DIAGASSERT(id != NULL);
-	if (cur_term != NULL)
-		return __UNCONST(ti_getstr(cur_term, id));
-	return (char *)CANCELLED_STRING;
-}
diff --git a/lib/libterminfo/tparm.c b/lib/libterminfo/tparm.c
deleted file mode 100644
index c4f4df440..000000000
--- a/lib/libterminfo/tparm.c
+++ /dev/null
@@ -1,626 +0,0 @@
-/* $NetBSD: tparm.c,v 1.15 2013/06/07 13:16:18 roy Exp $ */
-
-/*
- * Copyright (c) 2009, 2011, 2013 The NetBSD Foundation, Inc.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Roy Marples.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: tparm.c,v 1.15 2013/06/07 13:16:18 roy Exp $");
-#include <sys/param.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <term_private.h>
-#include <term.h>
-
-#define LONG_STR_MAX ((CHAR_BIT * sizeof(long)) / 3)
-#define BUFINC 128	/* Size to increament the terminal buffer by */
-
-#define VA_LONG_LONG	1
-#define VA_CHAR_INT	2
-//#define VA_CHAR_LONG	3	/* No need for this yet */
-
-static TERMINAL *dumbterm; /* For non thread safe functions */
-
-typedef struct {
-	long nums[20];
-	char *strings[20];
-	size_t offset;
-} TPSTACK;
-
-typedef struct {
-	long num;
-	char *string;
-} TPVAR;
-
-static int
-push(long num, char *string, TPSTACK *stack)
-{
-	if (stack->offset >= sizeof(stack->nums)) {
-		errno = E2BIG;
-		return -1;
-	}
-	stack->nums[stack->offset] = num;
-	stack->strings[stack->offset] = string;
-	stack->offset++;
-	return 0;
-}
-
-static int
-pop(long *num, char **string, TPSTACK *stack)
-{
-	if (stack->offset == 0) {
-		if (num)
-			*num = 0;
-		if (string)
-			*string = NULL;
-		errno = E2BIG;
-		return -1;
-	}
-	stack->offset--;
-	if (num)
-		*num = stack->nums[stack->offset];
-	if (string)
-		*string = stack->strings[stack->offset];
-	return 0;
-}
-
-static char *
-checkbuf(TERMINAL *term, size_t len)
-{
-	char *buf;
-
-	if (term->_bufpos + len >= term->_buflen) {
-		len = term->_buflen + MAX(len, BUFINC);
-		buf = realloc(term->_buf, len);
-		if (buf == NULL)
-			return NULL;
-		term->_buf = buf;
-		term->_buflen = len;
-	}
-	return term->_buf;
-}
-
-static size_t
-ochar(TERMINAL *term, int c)
-{
-	if (c == 0)
-		c = 0200;
-	/* Check we have space and a terminator */
-	if (checkbuf(term, 2) == NULL)
-		return 0;
-	term->_buf[term->_bufpos++] = (char)c;
-	return 1;
-}
-
-static size_t
-onum(TERMINAL *term, const char *fmt, int num, unsigned int len)
-{
-	size_t l;
-
-	if (len < LONG_STR_MAX)
-		len = LONG_STR_MAX;
-	if (checkbuf(term, len + 2) == NULL)
-		return 0;
-	l = sprintf(term->_buf + term->_bufpos, fmt, num);
-	term->_bufpos += l;
-	return l;
-}
-
-/*
-  Make a pass through the string so we can work out
-  which parameters are ints and which are char *.
-  Basically we only use char * if %p[1-9] is followed by %l or %s.
-*/
-int
-_ti_parm_analyse(const char *str, int *piss, int piss_len)
-{
-	int nparm, lpop;
-	char c;
-
-	nparm = 0;
-	lpop = -1;
-	while ((c = *str++) != '\0') {
-		if (c != '%')
-			continue;
-		c = *str++;
-		switch (c) {
-			case 'l': /* FALLTHROUGH */
-			case 's':
-				if (lpop > 0) {
-					if (lpop <= piss_len)
-						piss[lpop - 1] = 1;
-					else if (piss)
-						errno = E2BIG;
-				}
-				break;
-			case 'p':
-				c = *str++;
-				if (c < '1' || c > '9') {
-					errno = EINVAL;
-					continue;
-				} else {
-					lpop = c - '0';
-					if (lpop > nparm)
-						nparm = lpop;
-				}
-				break;
-			default:
-				lpop = -1;
-		}
-	}
-
-	return nparm;
-}
-
-static char *
-_ti_tiparm(TERMINAL *term, const char *str, int va_type, va_list parms)
-{
-	char c, fmt[64], *fp, *ostr;
-	long val, val2;
-	long dnums[26]; /* dynamic variables a-z, not preserved */
-	size_t l, max;
-	TPSTACK stack;
-	TPVAR params[TPARM_MAX];
-	unsigned int done, dot, minus, width, precision, olen;
-	int piss[TPARM_MAX]; /* Parameter IS String - piss ;) */
-
-	if (str == NULL)
-		return NULL;
-
-	/*
-	  If not passed a terminal, malloc a dummy one.
-	  This means we can preserve buffers and variables per terminal and
-	  still work with non thread safe functions (which sadly are still the
-	  norm and standard).
-	*/
-	if (term == NULL) {
-		if (dumbterm == NULL) {
-			dumbterm = malloc(sizeof(*dumbterm));
-			if (dumbterm == NULL)
-				return NULL;
-			dumbterm->_buflen = 0;
-		}
-		term = dumbterm;
-	}
-
-	term->_bufpos = 0;
-	/* Ensure we have an initial buffer */
-	if (term->_buflen == 0) {
-		term->_buf = malloc(BUFINC);
-		if (term->_buf == NULL)
-			return NULL;
-		term->_buflen = BUFINC;
-	}
-
-	memset(&piss, 0, sizeof(piss));
-	max = _ti_parm_analyse(str, piss, TPARM_MAX);
-
-	/* Put our parameters into variables */
-	memset(&params, 0, sizeof(params));
-	for (l = 0; l < max; l++) {
-		if (piss[l]) {
-			if (va_type == VA_LONG_LONG) {
-				/* This only works if char * fits into a long
-				 * on this platform. */
-				if (sizeof(char *) <= sizeof(long)/*CONSTCOND*/)
-					params[l].string =
-					    (char *)va_arg(parms, long);
-				else {
-					errno = ENOTSUP;
-					return NULL;
-				}
-			} else
-				params[l].string = va_arg(parms, char *);
-		} else {
-			if (va_type == VA_CHAR_INT)
-				params[l].num = (long)va_arg(parms, int);
-			else
-				params[l].num = va_arg(parms, long);
-		}
-	}
-
-	memset(&stack, 0, sizeof(stack));
-	while ((c = *str++) != '\0') {
-		if (c != '%' || (c = *str++) == '%') {
-			if (c == '\0')
-				break;
-			if (ochar(term, c) == 0)
-				return NULL;
-			continue;
-		}
-
-		/* Handle formatting. */
-		fp = fmt;
-		*fp++ = '%';
-		done = dot = minus = width = precision = 0;
-		val = 0;
-		while (done == 0 && (size_t)(fp - fmt) < sizeof(fmt)) {
-			switch (c) {
-			case 'c': /* FALLTHROUGH */
-			case 's':
-				*fp++ = c;
-				done = 1;
-				break;
-			case 'd': /* FALLTHROUGH */
-			case 'o': /* FALLTHROUGH */
-			case 'x': /* FALLTHROUGH */
-			case 'X': /* FALLTHROUGH */
-				*fp++ = 'l';
-				*fp++ = c;
-				done = 1;
-				break;
-			case '#': /* FALLTHROUGH */
-			case ' ':
-				*fp++ = c;
-				break;
-			case '.':
-				*fp++ = c;
-				if (dot == 0) {
-					dot = 1;
-					width = val;
-				} else
-					done = 2;
-				val = 0;
-				break;
-			case ':':
-				minus = 1;
-				break;
-			case '-':
-				if (minus)
-					*fp++ = c;
-				else
-					done = 1;
-				break;
-			default:
-				if (isdigit((unsigned char)c)) {
-					val = (val * 10) + (c - '0');
-					if (val > 10000)
-						done = 2;
-					else
-						*fp++ = c;
-				} else
-					done = 1;
-			}
-			if (done == 0)
-				c = *str++;
-		}
-		if (done == 2) {
-			/* Found an error in the format */
-			fp = fmt + 1;
-			*fp = *str;
-			olen = 0;
-		} else {
-			if (dot == 0)
-				width = val;
-			else
-				precision = val;
-			olen = MAX(width, precision);
-		}
-		*fp++ = '\0';
-
-		/* Handle commands */
-		switch (c) {
-		case 'c':
-			pop(&val, NULL, &stack);
-			if (ochar(term, (unsigned char)val) == 0)
-				return NULL;
-			break;
-		case 's':
-			pop(NULL, &ostr, &stack);
-			if (ostr != NULL) {
-				l = strlen(ostr);
-				if (l < (size_t)olen)
-					l = olen;
-				if (checkbuf(term, (size_t)(l + 1)) == NULL)
-					return NULL;
-				l = sprintf(term->_buf + term->_bufpos,
-				    fmt, ostr);
-				term->_bufpos += l;
-			}
-			break;
-		case 'l':
-			pop(NULL, &ostr, &stack);
-			if (ostr == NULL)
-				l = 0;
-			else
-				l = strlen(ostr);
-#ifdef NCURSES_COMPAT_57
-			if (onum(term, "%ld", (long)l, 0) == 0)
-				return NULL;
-#else
-			push((long)l, NULL, &stack);
-#endif
-			break;
-		case 'd': /* FALLTHROUGH */
-		case 'o': /* FALLTHROUGH */
-		case 'x': /* FALLTHROUGH */
-		case 'X':
-			pop(&val, NULL, &stack);
-			if (onum(term, fmt, (int)val, olen) == 0)
-				return NULL;
-			break;
-		case 'p':
-			if (*str < '1' || *str > '9')
-				break;
-			l = *str++ - '1';
-			if (push(params[l].num, params[l].string, &stack))
-				return NULL;
-			break;
-		case 'P':
-			pop(&val, NULL, &stack);
-			if (*str >= 'a' && *str <= 'z')
-				dnums[*str - 'a'] = val;
-			else if (*str >= 'A' && *str <= 'Z')
-				term->_snums[*str - 'A'] = val;
-			break;
-		case 'g':
-			if (*str >= 'a' && *str <= 'z') {
-				if (push(dnums[*str - 'a'], NULL, &stack))
-					return NULL;
-			} else if (*str >= 'A' && *str <= 'Z') {
-				if (push(term->_snums[*str - 'A'],
-					NULL, &stack))
-					return NULL;
-			}
-			break;
-		case 'i':
-			if (piss[0] == 0)
-				params[0].num++;
-			if (piss[1] == 0)
-				params[1].num++;
-			break;
-		case '\'':
-			if (push((long)(unsigned char)*str++, NULL, &stack))
-				return NULL;
-			while (*str != '\0' && *str != '\'')
-				str++;
-			if (*str == '\'')
-				str++;
-			break;
-		case '{':
-			val = 0;
-			for (; isdigit((unsigned char)*str);  str++)
-				val = (val * 10) + (*str - '0');
-			if (push(val, NULL, &stack))
-				return NULL;
-			while (*str != '\0' && *str != '}')
-				str++;
-			if (*str == '}')
-				str++;
-			break;
-		case '+': /* FALLTHROUGH */
-		case '-': /* FALLTHROUGH */
-		case '*': /* FALLTHROUGH */
-		case '/': /* FALLTHROUGH */
-		case 'm': /* FALLTHROUGH */
-		case 'A': /* FALLTHROUGH */
-		case 'O': /* FALLTHROUGH */
-		case '&': /* FALLTHROUGH */
-		case '|': /* FALLTHROUGH */
-		case '^': /* FALLTHROUGH */
-		case '=': /* FALLTHROUGH */
-		case '<': /* FALLTHROUGH */
-		case '>':
-			pop(&val, NULL, &stack);
-			pop(&val2, NULL, &stack);
-			switch (c) {
-			case '+':
-				val = val + val2;
-				break;
-			case '-':
-				val = val2 - val;
-				break;
-			case '*':
-				val = val * val2;
-				break;
-			case '/':
-				val = val ? val2 / val : 0;
-				break;
-			case 'm':
-				val = val ? val2 % val : 0;
-				break;
-			case 'A':
-				val = val && val2;
-				break;
-			case 'O':
-				val = val || val2;
-				break;
-			case '&':
-				val = val & val2;
-				break;
-			case '|':
-				val = val | val2;
-				break;
-			case '^':
-				val = val ^ val2;
-				break;
-			case '=':
-				val = val == val2;
-				break;
-			case '<':
-				val = val2 < val;
-				break;
-			case '>':
-				val = val2 > val;
-				break;
-			}
-			if (push(val, NULL, &stack))
-				return NULL;
-			break;
-		case '!':
-		case '~':
-			pop(&val, NULL, &stack);
-			switch (c) {
-			case '!':
-				val = !val;
-				break;
-			case '~':
-				val = ~val;
-				break;
-			}
-			if (push(val, NULL, &stack))
-				return NULL;
-			break;
-		case '?': /* if */
-			break;
-		case 't': /* then */
-			pop(&val, NULL, &stack);
-			if (val == 0) {
-				l = 0;
-				for (; *str != '\0'; str++) {
-					if (*str != '%')
-						continue;
-					str++;
-					if (*str == '?')
-						l++;
-					else if (*str == ';') {
-						if (l > 0)
-							l--;
-						else {
-							str++;
-							break;
-						}
-					} else if (*str == 'e' && l == 0) {
-						str++;
-						break;
-					}
-				}
-			}
-			break;
-		case 'e': /* else */
-			l = 0;
-			for (; *str != '\0'; str++) {
-				if (*str != '%')
-					continue;
-				str++;
-				if (*str == '?')
-					l++;
-				else if (*str == ';') {
-					if (l > 0)
-						l--;
-					else {
-						str++;
-						break;
-					}
-				}
-			}
-			break;
-		case ';': /* fi */
-			break;
-		}
-	}
-	term->_buf[term->_bufpos] = '\0';
-	return term->_buf;
-}
-
-char *
-ti_tiparm(TERMINAL *term, const char *str, ...)
-{
-	va_list va;
-	char *ret;
-
-	_DIAGASSERT(term != NULL);
-	_DIAGASSERT(str != NULL);
-
-	va_start(va, str);
-	ret = _ti_tiparm(term, str, VA_CHAR_INT, va);
-	va_end(va);
-	return ret;
-}
-
-char *
-tiparm(const char *str, ...)
-{
-	va_list va;
-	char *ret;
-
-	_DIAGASSERT(str != NULL);
-
-	va_start(va, str);
-	ret = _ti_tiparm(NULL, str, VA_CHAR_INT, va);
-	va_end(va);
-	return ret;
-}
-
-#ifdef VA_CHAR_LONG
-char *
-ti_tlparm(TERMINAL *term, const char *str, ...)
-{
-	va_list va;
-	char *ret;
-
-	_DIAGASSERT(term != NULL);
-	_DIAGASSERT(str != NULL);
-
-	va_start(va, str);
-	ret = _ti_tiparm(term, str, VA_CHAR_LONG, va);
-	va_end(va);
-	return ret;
-}
-
-char *
-tlparm(const char *str, ...)
-{
-	va_list va;
-	char *ret;
-
-	_DIAGASSERT(str != NULL);
-
-	va_start(va, str);
-	ret = _ti_tiparm(NULL, str, VA_CHAR_LONG, va);
-	va_end(va);
-	return ret;
-}
-#endif
-
-static char *
-_tparm(const char *str, ...)
-{
-	va_list va;
-	char *ret;
-
-	_DIAGASSERT(str != NULL);
-
-	va_start(va, str);
-	ret = _ti_tiparm(NULL, str, VA_LONG_LONG, va);
-	va_end(va);
-	return ret;
-}
-
-char *
-tparm(const char *str,
-    long p1, long p2, long p3, long p4, long p5,
-    long p6, long p7, long p8, long p9)
-{
-
-	return _tparm(str, p1, p2, p3, p4, p5, p6, p7, p8, p9);
-}
diff --git a/lib/libterminfo/tputs.c b/lib/libterminfo/tputs.c
deleted file mode 100644
index b08da3f0b..000000000
--- a/lib/libterminfo/tputs.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* $NetBSD: tputs.c,v 1.3 2013/06/07 13:16:18 roy Exp $ */
-
-/*
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Roy Marples.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: tputs.c,v 1.3 2013/06/07 13:16:18 roy Exp $");
-
-#include <assert.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <term_private.h>
-#include <term.h>
-
-/*
- * The following array gives the number of tens of milliseconds per
- * character for each speed as returned by gtty.  Thus since 300
- * baud returns a 7, there are 33.3 milliseconds per char at 300 baud.
- */
-static const short tmspc10[] = {
-	0, 2000, 1333, 909, 743, 666, 500, 333, 166, 83, 55, 41, 20, 10, 5
-};
-
-short ospeed;
-char PC;
-
-static int
-_ti_calcdelay(const char **str, int affcnt, int *mand)
-{
-	int i;
-
-	i = 0;
-	/* Convert the delay */
-	while (isdigit(*(const unsigned char *)*str))
-		i = i * 10 + *(*str)++ - '0';
-	i *= 10;
-	if (*(*str) == '.') {
-		(*str)++;
-		if (isdigit(*(const unsigned char *)*str))
-			i += *(*str) - '0';
-		while (isdigit(*(const unsigned char *)*str))
-			(*str)++;
-	}
-	if (*(*str) == '*') {
-		(*str)++;
-		i *= affcnt;
-	} else if (*(*str) == '/') {
-		(*str)++;
-		if (mand != NULL)
-			*mand = 1;
-	}
-	return i;
-}
-
-static void
-_ti_outputdelay(int delay, short os, char pc,
-    int (*outc)(int, void *), void *args)
-{
-	int mspc10;
-
-	if (delay < 1 || os < 1 || (size_t)os >= __arraycount(tmspc10))
-		return;
-
-	mspc10 = tmspc10[os];
-	delay += mspc10 / 2;
-	for (delay /= mspc10; delay > 0; delay--)
-		outc(pc, args);
-}
-
-static int
-_ti_puts(int dodelay, int os, int pc,
-    const char *str, int affcnt, int (*outc)(int, void *), void *args)
-{
-	int taildelay, delay, mand;
-
-	if (str == NULL)
-		return OK;
-
-	taildelay = _ti_calcdelay(&str, affcnt, NULL);
-
-	/* Output the string with embedded delays */
-	for (; *str != '\0'; str++) {
-		if (str[0] != '$' ||
-		    str[1] != '<' ||
-		    !(isdigit((const unsigned char)str[2]) || str[2] == '.') ||
-		    strchr(str + 3, '>') == NULL)
-		{
-			outc(*str, args);
-		} else {
-			str += 2;
-			mand = 0;
-			delay = _ti_calcdelay(&str, affcnt, &mand);
-			if (dodelay != 0 || mand != 0)
-				_ti_outputdelay(delay, os, pc, outc, args);
-		}
-	}
-
-	/* Delay if needed */
-	if (dodelay)
-		_ti_outputdelay(taildelay, os, pc, outc, args);
-
-	return OK;
-}
-
-int
-ti_puts(const TERMINAL *term, const char *str, int affcnt,
-    int (*outc)(int, void *), void *args)
-{
-	int dodelay;
-	char pc;
-
-	_DIAGASSERT(term != NULL);
-	_DIAGASSERT(str != NULL);
-	_DIAGASSERT(outc != NULL);
-
-	dodelay = (str == t_bell(term) ||
-	    str == t_flash_screen(term) ||
-	    (t_xon_xoff(term) == 0 && t_padding_baud_rate(term) != 0));
-
-	if (t_pad_char(term) == NULL)
-	    pc = '\0';
-	else
-	    pc = *t_pad_char(term);
-	return _ti_puts(dodelay, term->_ospeed, pc,
-	    str, affcnt, outc, args);
-}
-
-int
-ti_putp(const TERMINAL *term, const char *str)
-{
-
-	_DIAGASSERT(term != NULL);
-	_DIAGASSERT(str != NULL);
-	return ti_puts(term, str, 1, (int (*)(int, void *))putchar, NULL);
-}
-
-int
-tputs(const char *str, int affcnt, int (*outc)(int))
-{
-
-	_DIAGASSERT(str != NULL);
-	_DIAGASSERT(outc != NULL);
-	return _ti_puts(1, ospeed, PC, str, affcnt,
-	    (int (*)(int, void *))outc, NULL);
-}
-
-int
-putp(const char *str)
-{
-
-	_DIAGASSERT(str != NULL);
-	return tputs(str, 1, putchar);
-}
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
deleted file mode 100644
index d1af38fd2..000000000
--- a/lib/libutil/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-#	$NetBSD: Makefile,v 1.78 2015/09/24 14:39:20 christos Exp $
-#	@(#)Makefile	8.1 (Berkeley) 6/4/93
-
-USE_SHLIBDIR=	yes
-
-.include <bsd.own.mk>
-
-.include "${NETBSDSRCDIR}/common/lib/libutil/Makefile.inc"
-
-WARNS?=	5
-LIB=	util
-CPPFLAGS+=-DLIBC_SCCS -I${.CURDIR}
-LINTFLAGS+=-w
-SRCS+=	efun.c \
-	\
-	getfsspecname.c getmntopts.c getmaxpartitions.c \
-	\
-	if_media.c \
-	login.c loginx.c login_cap.c login_tty.c logout.c logoutx.c \
-	logwtmp.c logwtmpx.c opendisk.c parsedate.y \
-	passwd.c pw_scan.c pidfile.c pidlock.c pty.c \
-	raise_default_signal.c \
-	secure_path.c sockaddr_snprintf.c stat_flags.c \
-	strpct.c ttyaction.c ttymsg.c
-
-MAN=	efun.3 \
-	\
-	getmaxpartitions.3 getmntopts.3 \
-	getfsspecname.3 \
-	login.3 login_cap.3 loginx.3 \
-	\
-	opendisk.3 openpty.3 parsedate.3 pidfile.3 pidlock.3 \
-	proc_compare.3 pw_getconf.3 pw_init.3 pw_lock.3 secure_path.3 \
-	raise_default_signal.3 \
-	snprintb.3 sockaddr_snprintf.3 stat_flags.3 strpct.3 ttyaction.3 \
-	ttymsg.3 util.3
-
-YPREFIX=__pd
-.PATH:	${NETBSDSRCDIR}/lib/libc/gen
-
-.if !defined(__MINIX)
-.include "compat/Makefile.inc"
-.endif
-
-.if !defined(__MINIX)
-MLINKS+=getlabelsector.3 getlabeloffset.3
-MLINKS+=getlabelsector.3 getlabelusesmbr.3
-MLINKS+=getdiskrawname.3 getdiskcookedname.3
-.endif
-MLINKS+=login.3 logout.3
-MLINKS+=login.3 logwtmp.3
-MLINKS+=login_cap.3 login_getclass.3
-MLINKS+=login_cap.3 login_getcapbool.3
-MLINKS+=login_cap.3 login_getcapnum.3
-MLINKS+=login_cap.3 login_getcapsize.3
-MLINKS+=login_cap.3 login_getcapstr.3
-MLINKS+=login_cap.3 login_getcaptime.3
-MLINKS+=login_cap.3 login_getpwclass.3
-MLINKS+=login_cap.3 login_close.3
-MLINKS+=login_cap.3 setclasscontext.3
-MLINKS+=login_cap.3 setusercontext.3
-MLINKS+=loginx.3 logoutx.3 loginx.3 logwtmpx.3
-MLINKS+=openpty.3 login_tty.3
-MLINKS+=openpty.3 forkpty.3
-MLINKS+=pw_getconf.3 pw_getpwconf.3
-MLINKS+=pw_init.3 pw_edit.3
-MLINKS+=pw_init.3 pw_prompt.3
-MLINKS+=pw_init.3 pw_copy.3
-MLINKS+=pw_init.3 pw_copyx.3
-MLINKS+=pw_init.3 pw_scan.3
-MLINKS+=pw_init.3 pw_error.3
-MLINKS+=pw_lock.3 pw_mkdb.3
-MLINKS+=pw_lock.3 pw_abort.3
-MLINKS+=pw_lock.3 pw_getprefix.3
-MLINKS+=pw_lock.3 pw_setprefix.3
-MLINKS+=pidlock.3 ttylock.3
-MLINKS+=pidlock.3 ttyunlock.3
-MLINKS+=efun.3 esetfunc.3
-MLINKS+=efun.3 easprintf.3
-MLINKS+=efun.3 estrlcpy.3
-MLINKS+=efun.3 estrlcat.3
-MLINKS+=efun.3 estrdup.3
-MLINKS+=efun.3 estrndup.3
-MLINKS+=efun.3 estrtoi.3
-MLINKS+=efun.3 estrtou.3
-MLINKS+=efun.3 emalloc.3
-MLINKS+=efun.3 ecalloc.3
-MLINKS+=efun.3 erealloc.3
-MLINKS+=efun.3 ereallocarr.3
-MLINKS+=efun.3 efopen.3
-MLINKS+=efun.3 evasprintf.3
-MLINKS+=stat_flags.3 string_to_flags.3
-MLINKS+=stat_flags.3 flags_to_string.3
-MLINKS+=snprintb.3 snprintb_m.3
-MLINKS+=util.3 libutil.3
-MLINKS+=strpct.3 strspct.3
-
-.include <bsd.lib.mk>
diff --git a/lib/libutil/compat/Makefile.inc b/lib/libutil/compat/Makefile.inc
deleted file mode 100644
index 9e0f550a1..000000000
--- a/lib/libutil/compat/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2009/01/11 02:57:18 christos Exp $
-
-.PATH: ${.CURDIR}/compat
-
-CPPFLAGS+=-I${.CURDIR}/../libc -I${.CURDIR}/../../sys
-SRCS+=compat_passwd.c compat_loginx.c compat_login.c compat_parsedate.c \
-    compat_login_cap.c
diff --git a/lib/libutil/compat/compat_gepwconf.c b/lib/libutil/compat/compat_gepwconf.c
deleted file mode 100644
index 770df54ca..000000000
--- a/lib/libutil/compat/compat_gepwconf.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: compat_gepwconf.c,v 1.2 2009/01/11 02:57:18 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_gepwconf.c,v 1.2 2009/01/11 02:57:18 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pwd.h>
-#include <compat/include/pwd.h>
-#include <util.h>
-#include <compat/util.h>
-
-__warn_references(pw_getpwconf,
-    "warning: reference to compatibility pw_getpwconf(); "
-    "include <pwd.h> to generate correct reference")
-
-void
-pw_getpwconf(char *buf, size_t len, const struct passwd50 *p, const char *opt)
-{
-	struct passwd px;
-	passwd50_to_passwd(p, &px);
-	__pw_getpwconf50(buf, len, &px, opt);
-}
diff --git a/lib/libutil/compat/compat_login.c b/lib/libutil/compat/compat_login.c
deleted file mode 100644
index 25876e99c..000000000
--- a/lib/libutil/compat/compat_login.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*	$NetBSD: compat_login.c,v 1.2 2009/01/11 02:57:18 christos 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)login.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: compat_login.c,v 1.2 2009/01/11 02:57:18 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <util.h>
-#include <compat/util.h>
-#include <utmp.h>
-#include <compat/include/utmp.h>
-
-__warn_references(login,
-    "warning: reference to compatibility login(); include <util.h> to generate correct reference")
-
-void
-login(const struct utmp50 *ut50)
-{
-	int fd;
-	int tty;
-	struct utmp ut;
-
-	utmp50_to_utmp(ut50, &ut);
-
-	tty = ttyslot();
-	if (tty > 0 && (fd = open(_PATH_UTMP, O_WRONLY|O_CREAT, 0644)) >= 0) {
-		(void)lseek(fd, (off_t)(tty * sizeof(struct utmp)), SEEK_SET);
-		(void)write(fd, &ut, sizeof(ut));
-		(void)close(fd);
-	}
-	if ((fd = open(_PATH_WTMP, O_WRONLY|O_APPEND, 0)) >= 0) {
-		(void)write(fd, &ut, sizeof(ut));
-		(void)close(fd);
-	}
-}
diff --git a/lib/libutil/compat/compat_login_cap.c b/lib/libutil/compat/compat_login_cap.c
deleted file mode 100644
index c0ed68a08..000000000
--- a/lib/libutil/compat/compat_login_cap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: compat_login_cap.c,v 1.2 2009/01/11 02:57:18 christos Exp $	*/
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#define __LIBC12_SOURCE__
-#include <sys/types.h>
-#include <login_cap.h>
-#include <compat/login_cap.h>
-#include <pwd.h>
-#include <compat/include/pwd.h>
-
-__warn_references(login_getpwclass,
-    "warning: reference to compatibility login_getpwclass();"
-    " include <login_cap.h> for correct reference")
-__warn_references(setusercontext,
-    "warning: reference to compatibility setusercontext();"
-    " include <login_cap.h> for correct reference")
-
-login_cap_t *
-login_getpwclass(const struct passwd50 *pw50)
-{
-	struct passwd pw;
-
-	passwd50_to_passwd(pw50, &pw);
-	return __login_getpwclass50(&pw);
-}
-
-int
-setusercontext(login_cap_t *lc, struct passwd50 *pw50, uid_t uid, u_int flags)
-{
-	struct passwd pw;
-
-	passwd50_to_passwd(pw50, &pw);
-	return __setusercontext50(lc, &pw, uid, flags);
-}
diff --git a/lib/libutil/compat/compat_loginx.c b/lib/libutil/compat/compat_loginx.c
deleted file mode 100644
index e0b6a944a..000000000
--- a/lib/libutil/compat/compat_loginx.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$NetBSD: compat_loginx.c,v 1.3 2012/11/04 13:08:56 christos 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_loginx.c,v 1.3 2012/11/04 13:08:56 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-
-#define __LIBC12_SOURCE__
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <utmpx.h>
-#include <compat/include/utmpx.h>
-#include <util.h>
-#include <compat/util.h>
-
-__warn_references(loginx,
-    "warning: reference to compatibility loginx(); include <util.h> to generate correct reference")
-
-void
-loginx(const struct utmpx50 *ut50)
-{
-	struct utmpx ut;
-	utmpx50_to_utmpx(ut50, &ut);
-	(void)__pututxline50(&ut);
-	(void)__updwtmpx50(_PATH_WTMPX, &ut);
-}
diff --git a/lib/libutil/compat/compat_logoutx.c b/lib/libutil/compat/compat_logoutx.c
deleted file mode 100644
index ce2e35a5f..000000000
--- a/lib/libutil/compat/compat_logoutx.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*	$NetBSD: compat_logoutx.c,v 1.2 2009/01/11 02:57:18 christos 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)logout.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: compat_logoutx.c,v 1.2 2009/01/11 02:57:18 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-
-#include <assert.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <util.h>
-#include <utmp.h>
-#include <utmpx.h>
-
-int
-logoutx(const char *line, int status, int type)
-{
-	struct utmpx *utp, ut;
-	(void)strlcpy(ut.ut_line, line, sizeof(ut.ut_line));
-	if ((utp = getutxline(&ut)) == NULL) {
-		endutxent();
-		return 0;
-	}
-	utp->ut_type = type;
-	if (WIFEXITED(status))
-		utp->ut_exit.e_exit = (uint16_t)WEXITSTATUS(status);
-	if (WIFSIGNALED(status))
-		utp->ut_exit.e_termination = (uint16_t)WTERMSIG(status);
-	(void)gettimeofday(&utp->ut_tv, NULL);
-	(void)pututxline(utp);
-	endutxent();
-	return 1;
-}
diff --git a/lib/libutil/compat/compat_parsedate.c b/lib/libutil/compat/compat_parsedate.c
deleted file mode 100644
index ed076ea62..000000000
--- a/lib/libutil/compat/compat_parsedate.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: compat_parsedate.c,v 1.2 2009/01/11 02:57:18 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-
-#define __LIBC12_SOURCE__
-#include <string.h>
-#include <time.h>
-#include <sys/time.h>
-#include <compat/include/time.h>
-#include <compat/sys/time.h>
-#include <util.h>
-#include <compat/util.h>
-
-__warn_references(parsedate,
-    "warning: reference to compatibility parsedate();"
-    " include <util.h> for correct reference")
-
-int32_t
-parsedate(const char *str, const int32_t *t50, const int *tzoff)
-{
-	time_t t;
-	if (t50)
-		t = *t50;
-	return (int32_t)__parsedate50(str, t50 ? &t : NULL, tzoff);
-}
diff --git a/lib/libutil/compat/compat_passwd.c b/lib/libutil/compat/compat_passwd.c
deleted file mode 100644
index 572d0ebb5..000000000
--- a/lib/libutil/compat/compat_passwd.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*	$NetBSD: compat_passwd.c,v 1.2 2009/01/11 02:57:18 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_passwd.c,v 1.2 2009/01/11 02:57:18 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#define __LIBC12_SOURCE__
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pwd.h>
-#include <compat/include/pwd.h>
-#include <util.h>
-#include <compat/util.h>
-
-__warn_references(pw_scan,
-    "warning: reference to compatibility pw_scan(); "
-    "include <pwd.h> to generate correct reference")
-__warn_references(pw_copy,
-    "warning: reference to compatibility pw_copy(); "
-    "include <util.h> to generate correct reference")
-__warn_references(pw_copyx,
-    "warning: reference to compatibility pw_copyx(); "
-    "include <util.h> to generate correct reference")
-__warn_references(pw_getpwconf,
-    "warning: reference to compatibility pw_getpwconf(); "
-    "include <pwd.h> to generate correct reference")
-
-int
-pw_scan(char *buf, struct passwd50 *p, int *flags)
-{
-	struct passwd px;
-	int rv = __pw_scan50(buf, &px, flags);
-	passwd_to_passwd50(&px, p);
-	return rv;
-}
-
-void
-pw_copy(int ffd, int tfd, struct passwd50 *pw50, struct passwd50 *opw50)
-{
-	struct passwd pw, opw;
-	passwd50_to_passwd(pw50, &pw);
-	if (opw50)
-		passwd50_to_passwd(opw50, &opw);
-	__pw_copy50(ffd, tfd, &pw, opw50 ? &opw : NULL);
-}
-
-int
-pw_copyx(int ffd, int tfd, struct passwd50 *pw50, struct passwd50 *opw50,
-    char *errbuf, size_t errbufsiz)
-{
-	struct passwd pw, opw;
-	passwd50_to_passwd(pw50, &pw);
-	if (opw50)
-		passwd50_to_passwd(opw50, &opw);
-	return __pw_copyx50(ffd, tfd, &pw, opw50 ? &opw : NULL, errbuf,
-	    errbufsiz);
-}
-
-void
-pw_getpwconf(char *buf, size_t len, const struct passwd50 *p, const char *opt)
-{
-	struct passwd px;
-	passwd50_to_passwd(p, &px);
-	__pw_getpwconf50(buf, len, &px, opt);
-}
diff --git a/lib/libutil/compat/login_cap.h b/lib/libutil/compat/login_cap.h
deleted file mode 100644
index d2d48ac2e..000000000
--- a/lib/libutil/compat/login_cap.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: login_cap.h,v 1.2 2009/01/11 02:57:18 christos Exp $	*/
-
-/*-
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _COMPAT_LOGIN_CAP_H_
-#define _COMPAT_LOGIN_CAP_H_
-
-struct passwd;
-struct passwd50;
-
-__BEGIN_DECLS
-login_cap_t *login_getpwclass(const struct passwd50 *);
-login_cap_t *__login_getpwclass50(const struct passwd *);
-int setusercontext(login_cap_t *, struct passwd50 *, uid_t, u_int);
-int __setusercontext50(login_cap_t *, struct passwd *, uid_t, u_int);
-__END_DECLS
-
-#endif	/* !_COMPAT_LOGIN_CAP_H_ */
diff --git a/lib/libutil/compat/util.h b/lib/libutil/compat/util.h
deleted file mode 100644
index 1df130c7d..000000000
--- a/lib/libutil/compat/util.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: util.h,v 1.3 2012/11/04 13:08:57 christos Exp $	*/
-
-/*-
- * Copyright (c) 1995
- *	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.
- */
-
-#ifndef _COMPAT_UTIL_H_
-#define	_COMPAT_UTIL_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/inttypes.h>
-#include <sys/ansi.h>
-
-struct utmp50;
-struct utmpx50;
-struct passwd50;
-struct utmp;
-struct utmpx;
-struct passwd;
-
-void		login(const struct utmp50 *);
-void		loginx(const struct utmpx50 *);
-
-int32_t		parsedate(const char *, const int32_t *, const int *);
-
-void		pw_copy(int, int, struct passwd50 *, struct passwd50 *);
-int		pw_copyx(int, int, struct passwd50 *, struct passwd50 *,
-    char *, size_t);
-void		pw_getpwconf(char *, size_t, const struct passwd50 *,
-    const char *);
-
-void		__login50(const struct utmp *);
-void		__loginx50(const struct utmpx *);
-
-time_t		__parsedate50(const char *, const time_t *, const int *);
-
-void		__pw_copy50(int, int, struct passwd *, struct passwd *);
-int		__pw_copyx50(int, int, struct passwd *, struct passwd *,
-    char *, size_t);
-void		__pw_getpwconf50(char *, size_t, const struct passwd *,
-    const char *);
-#endif /* !_COMPAT_UTIL_H_ */
diff --git a/lib/libutil/disklabel_dkcksum.3 b/lib/libutil/disklabel_dkcksum.3
deleted file mode 100644
index de9c48169..000000000
--- a/lib/libutil/disklabel_dkcksum.3
+++ /dev/null
@@ -1,56 +0,0 @@
-.\"	$NetBSD: disklabel_dkcksum.3,v 1.8 2010/05/04 06:41:27 jruoho Exp $
-.\"
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Roland C. Dowdeswell.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 4, 2010
-.Dt DISKLABEL_DKCKSUM 3
-.Os
-.Sh NAME
-.Nm disklabel_dkcksum
-.Nd compute the checksum for a disklabel
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft uint16_t
-.Fo disklabel_dkcksum
-.Fa "struct disklabel *lp"
-.Fc
-.Sh DESCRIPTION
-.Fn disklabel_dkcksum
-computes the checksum for the disklabel passed in as
-.Fa lp .
-.Sh RETURN VALUES
-The
-.Fn disklabel_dkcksum
-returns the computed checksum.
-.Sh HISTORY
-The
-.Fn disklabel_dkcksum
-function call appeared in
-.Nx 2.0 .
diff --git a/lib/libutil/disklabel_dkcksum.c b/lib/libutil/disklabel_dkcksum.c
deleted file mode 100644
index d6883dea0..000000000
--- a/lib/libutil/disklabel_dkcksum.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: disklabel_dkcksum.c,v 1.4 2005/05/15 21:01:34 thorpej Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dkcksum.c	8.1 (Berkeley) 6/5/93";
-#else
-__RCSID("$NetBSD: disklabel_dkcksum.c,v 1.4 2005/05/15 21:01:34 thorpej Exp $");
-#endif
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <sys/disklabel.h>
-
-#include <util.h>
-
-uint16_t
-disklabel_dkcksum(struct disklabel *lp)
-{
-	uint16_t *start, *end;
-	uint16_t sum;
-
-	sum = 0;
-	start = (uint16_t *)(void *)lp;
-	end = (uint16_t *)(void *)&lp->d_partitions[lp->d_npartitions];
-	while (start < end)
-		sum ^= *start++;
-	return (sum);
-}
diff --git a/lib/libutil/disklabel_scan.3 b/lib/libutil/disklabel_scan.3
deleted file mode 100644
index 53c08885c..000000000
--- a/lib/libutil/disklabel_scan.3
+++ /dev/null
@@ -1,59 +0,0 @@
-.\"	$NetBSD: disklabel_scan.3,v 1.6 2010/05/04 06:41:27 jruoho Exp $
-.\"
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Roland C. Dowdeswell.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 4, 2010
-.Dt DISKLABEL_SCAN 3
-.Os
-.Sh NAME
-.Nm disklabel_scan
-.Nd scan a buffer for a valid disklabel
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft int
-.Fn disklabel_scan "struct disklabel *lp" "char *buf" "size_t buflen"
-.Sh DESCRIPTION
-.Fn disklabel_scan
-scans the memory region specified by
-.Fa buf
-and
-.Fa buflen
-for a valid disklabel.
-If such a label is found, it is copied into
-.Fa lp .
-.Sh RETURN VALUES
-The
-.Fn disklabel_scan
-function returns 0 if a valid disklabel was found and 1 if not.
-.Sh HISTORY
-The
-.Fn disklabel_scan
-function call appeared in
-.Nx 2.0 .
diff --git a/lib/libutil/disklabel_scan.c b/lib/libutil/disklabel_scan.c
deleted file mode 100644
index 953e14891..000000000
--- a/lib/libutil/disklabel_scan.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* $NetBSD: disklabel_scan.c,v 1.3 2009/01/18 12:13:03 lukem Exp $ */
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Roland C. Dowdeswell.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT(
-"@(#) Copyright (c) 2002\
-	The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: disklabel_scan.c,v 1.3 2009/01/18 12:13:03 lukem Exp $");
-#endif
-
-#include <string.h>
-#include <unistd.h>
-#include <util.h>
-
-#include <sys/disklabel.h>
-
-#define SCAN_INCR	4
-
-int
-disklabel_scan(struct disklabel *lp, char *buf, size_t buflen)
-{
-	size_t	i;
-
-	/* scan for the correct magic numbers. */
-
-	for (i=0; i <= buflen - sizeof(*lp); i += SCAN_INCR) {
-		memcpy(lp, buf + i, sizeof(*lp));
-		if (lp->d_magic == DISKMAGIC && lp->d_magic2 == DISKMAGIC)
-			goto sanity;
-	}
-
-	return 1;
-
-sanity:
-	/* we've found something, let's sanity check it */
-	if (lp->d_npartitions > MAXPARTITIONS || disklabel_dkcksum(lp))
-		return 1;
-
-	return 0;
-}
diff --git a/lib/libutil/efun.3 b/lib/libutil/efun.3
deleted file mode 100644
index 231e33947..000000000
--- a/lib/libutil/efun.3
+++ /dev/null
@@ -1,140 +0,0 @@
-.\"     $NetBSD: efun.3,v 1.14 2015/07/26 17:37:38 kamil Exp $
-.\"
-.\" Copyright (c) 2006 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd July 26, 2015
-.Dt EFUN 3
-.Os
-.Sh NAME
-.Nm esetfunc ,
-.Nm easprintf ,
-.Nm efopen ,
-.Nm emalloc ,
-.Nm ecalloc ,
-.Nm erealloc ,
-.Nm ereallocarr ,
-.Nm estrdup ,
-.Nm estrndup ,
-.Nm estrlcat ,
-.Nm estrlcpy ,
-.Nm estrtoi ,
-.Nm estrtou ,
-.Nm evasprintf
-.Nd error-checked utility functions
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft void (*)(int, const char *, ...)
-.Fn esetfunc "void (*)(int, const char *, ...)"
-.Ft int
-.Fn easprintf "char ** restrict str" "const char * restrict fmt" "..."
-.Ft FILE *
-.Fn efopen "const char *p" "const char *m"
-.Ft void *
-.Fn ecalloc "size_t n" "size_t s"
-.Ft void *
-.Fn emalloc "size_t n"
-.Ft void *
-.Fn erealloc "void *p" "size_t n"
-.Ft void
-.Fn ereallocarr "void *p" "size_t n" "size_t s"
-.Ft char *
-.Fn estrdup "const char *s"
-.Ft char *
-.Fn estrndup "const char *s" "size_t len"
-.Ft size_t
-.Fn estrlcat "char *dst" "const char *src" "size_t len"
-.Ft size_t
-.Fn estrlcpy "char *dst" "const char *src" "size_t len"
-.Ft intmax_t
-.Fn estrtoi "const char * nptr" "int base" "intmax_t lo" "intmax_t hi"
-.Ft uintmax_t
-.Fn estrtou "const char * nptr" "int base" "uintmax_t lo" "uintmax_t hi"
-.Ft int
-.Fn evasprintf "char ** restrict str" "const char * restrict fmt" "..."
-.Sh DESCRIPTION
-The
-.Fn easprintf ,
-.Fn efopen ,
-.Fn ecalloc ,
-.Fn emalloc ,
-.Fn erealloc ,
-.Fn ereallocarr ,
-.Fn estrdup ,
-.Fn estrndup ,
-.Fn estrlcat ,
-.Fn estrlcpy ,
-.Fn estrtoi ,
-.Fn estrtou ,
-and
-.Fn evasprintf
-functions
-operate exactly as the corresponding functions that do not start with an
-.Sq e
-except that in case of an error, they call
-the installed error handler that can be configured with
-.Fn esetfunc .
-.Pp
-For the string handling functions, it is an error when the destination
-buffer is not large enough to hold the complete string.
-For functions that allocate memory or open a file, it is an error when
-they would return a null pointer.
-The default error handler is
-.Xr err 3 .
-The function
-.Fn esetfunc
-returns the previous error handler function.
-A
-.Dv NULL
-error handler will just call
-.Xr exit 3 .
-.Sh SEE ALSO
-.Xr asprintf 3 ,
-.Xr calloc 3 ,
-.Xr err 3 ,
-.Xr exit 3 ,
-.Xr fopen 3 ,
-.Xr malloc 3 ,
-.Xr realloc 3 ,
-.Xr reallocarr 3 ,
-.Xr strdup 3 ,
-.Xr strlcat 3 ,
-.Xr strlcpy 3 ,
-.Xr strndup 3 ,
-.Xr strtoi 3 ,
-.Xr strtou 3 ,
-.Xr vasprintf 3
-.Sh HISTORY
-The
-.Fn estrtoi ,
-.Fn estrtou
-and
-.Fn ereallocarr
-functions were added in
-.Nx 8 .
diff --git a/lib/libutil/efun.c b/lib/libutil/efun.c
deleted file mode 100644
index 9c30a429c..000000000
--- a/lib/libutil/efun.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*	$NetBSD: efun.c,v 1.10 2015/07/26 02:20:30 kamil Exp $	*/
-
-/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#ifdef __RCSID
-__RCSID("$NetBSD: efun.c,v 1.10 2015/07/26 02:20:30 kamil Exp $");
-#endif
-
-#include <err.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <util.h>
-
-static void (*efunc)(int, const char *, ...) = err;
-
-void (*
-esetfunc(void (*ef)(int, const char *, ...)))(int, const char *, ...)
-{
-	void (*of)(int, const char *, ...) = efunc;
-	efunc = ef == NULL ? (void (*)(int, const char *, ...))exit : ef;
-	return of;
-}
-
-size_t
-estrlcpy(char *dst, const char *src, size_t len)
-{
-	size_t rv;
-	if ((rv = strlcpy(dst, src, len)) >= len) {
-		errno = ENAMETOOLONG;
-		(*efunc)(1,
-		    "Cannot copy string; %zu chars needed %zu provided",
-		    rv, len);
-	}
-	return rv;
-}
-
-size_t
-estrlcat(char *dst, const char *src, size_t len)
-{
-	size_t rv;
-	if ((rv = strlcat(dst, src, len)) >= len) {
-		errno = ENAMETOOLONG;
-		(*efunc)(1,
-		    "Cannot append to string; %zu chars needed %zu provided",
-		    rv, len);
-	}
-	return rv;
-}
-
-char *
-estrdup(const char *s)
-{
-	char *d = strdup(s);
-	if (d == NULL)
-		(*efunc)(1, "Cannot copy string");
-	return d;
-}
-
-char *
-estrndup(const char *s, size_t len)
-{
-	char *d = strndup(s, len);
-	if (d == NULL)
-		(*efunc)(1, "Cannot copy string");
-	return d;
-}
-
-void *
-emalloc(size_t n)
-{
-	void *p = malloc(n);
-	if (p == NULL && n != 0)
-		(*efunc)(1, "Cannot allocate %zu bytes", n);
-	return p;
-}
-
-void *
-ecalloc(size_t n, size_t s)
-{
-	void *p = calloc(n, s);
-	if (p == NULL && n != 0 && s != 0)
-		(*efunc)(1, "Cannot allocate %zu blocks of size %zu", n, s);
-	return p;
-}
-
-void *
-erealloc(void *p, size_t n)
-{
-	void *q = realloc(p, n);
-	if (q == NULL && n != 0)
-		(*efunc)(1, "Cannot re-allocate %zu bytes", n);
-	return q;
-}
-
-void
-ereallocarr(void *p, size_t n, size_t s)
-{
-	int rv = reallocarr(p, n, s);
-	if (rv != 0) {
-		errno = rv;
-		(*efunc)(1, "Cannot re-allocate %zu * %zu bytes", n, s);
-	}
-}
-
-FILE *
-efopen(const char *p, const char *m)
-{
-	FILE *fp = fopen(p, m);
-	if (fp == NULL)
-		(*efunc)(1, "Cannot open `%s'", p);
-	return fp;
-}
-
-int
-easprintf(char ** __restrict ret, const char * __restrict format, ...)
-{
-	int rv;
-	va_list ap;
-	va_start(ap, format);
-	if ((rv = vasprintf(ret, format, ap)) == -1)
-		(*efunc)(1, "Cannot format string");
-	va_end(ap);
-	return rv;
-}
-
-int
-evasprintf(char ** __restrict ret, const char * __restrict format, va_list ap)
-{
-	int rv;
-	if ((rv = vasprintf(ret, format, ap)) == -1)
-		(*efunc)(1, "Cannot format string");
-	return rv;
-}
-
-intmax_t
-estrtoi(const char * nptr, int base, intmax_t lo, intmax_t hi)
-{
-	int e;
-	intmax_t rv = strtoi(nptr, NULL, base, lo, hi, &e);
-	if (e != 0) {
-		errno = e;
-		(*efunc)(1,
-		    "Cannot convert string value '%s' with base %d to a number in range [%jd .. %jd]",
-		    nptr, base, lo, hi);
-	}
-	return rv;
-}
-
-uintmax_t
-estrtou(const char * nptr, int base, uintmax_t lo, uintmax_t hi)
-{
-	int e;
-	uintmax_t rv = strtou(nptr, NULL, base, lo, hi, &e);
-	if (e != 0) {
-		errno = e;
-		(*efunc)(1,
-		    "Cannot convert string value '%s' with base %d to a number in range [%ju .. %ju]",
-		    nptr, base, lo, hi);
-	}
-	return rv;
-}
diff --git a/lib/libutil/getbootfile.3 b/lib/libutil/getbootfile.3
deleted file mode 100644
index a47149767..000000000
--- a/lib/libutil/getbootfile.3
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"	$NetBSD: getbootfile.3,v 1.9 2010/05/04 06:41:27 jruoho Exp $
-.\"
-.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Thomas Klausner.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 4, 2010
-.Dt GETBOOTFILE 3
-.Os
-.Sh NAME
-.Nm getbootfile
-.Nd get the name of the booted kernel file
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft const char *
-.Fn getbootfile void
-.Sh DESCRIPTION
-.Fn getbootfile
-returns a static pointer to the full path name of the file from which
-the current kernel was loaded.
-If it can not be determined, or the file is not ``secure'' (see
-.Xr secure_path 3 ) ,
-.Dv _PATH_UNIX
-from
-.In paths.h
-is returned instead.
-.Sh SEE ALSO
-.Xr secure_path 3 ,
-.Xr sysctl 3
-.Sh HISTORY
-The
-.Fn getbootfile
-function call appeared in
-.Fx 2.0
-and
-.Nx 1.6 .
diff --git a/lib/libutil/getbootfile.c b/lib/libutil/getbootfile.c
deleted file mode 100644
index 8b296f3e0..000000000
--- a/lib/libutil/getbootfile.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*	$NetBSD: getbootfile.c,v 1.5 2008/04/28 20:23:02 martin Exp $	*/
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Thomas Klausner.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getbootfile.c,v 1.5 2008/04/28 20:23:02 martin Exp $");
-#endif
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <machine/cpu.h>
-#include <string.h>
-#include <paths.h>
-#include <util.h>
-
-#ifdef CPU_BOOTED_KERNEL
-static char name[MAXPATHLEN]; 
-#endif
-
-const char *
-getbootfile(void)
-{
-#ifdef CPU_BOOTED_KERNEL
-	int mib[2];
-	size_t size;
-#endif
-	const char *kernel;
-
-	kernel = _PATH_UNIX;
-#ifdef CPU_BOOTED_KERNEL
-	/* find real boot-kernel name */
-	mib[0] = CTL_MACHDEP;
-	mib[1] = CPU_BOOTED_KERNEL;
-	size = sizeof(name) - 1;
-	if (sysctl(mib, 2, name + 1, &size, NULL, 0) == 0) {
-		/*
-		 * traditionally, this sysctl returns the relative
-		 * path of the kernel with the leading slash stripped
-		 * -- could be empty, though (e.g. when netbooting).
-		 */
-		if (name[1] != '\0') {
-			name[0] = '/';
-			kernel = name;
-		}
-
-		/* check if we got a valid and 'secure' filename */
-		if (strcmp(kernel, _PATH_UNIX) != 0 && 
-		    secure_path(kernel) != 0) {
-			/* doesn't seems so, fall back to default */
-			kernel = _PATH_UNIX;
-		}
-	}
-#endif
-
-	return (kernel);
-}
diff --git a/lib/libutil/getbyteorder.3 b/lib/libutil/getbyteorder.3
deleted file mode 100644
index 21661cbfc..000000000
--- a/lib/libutil/getbyteorder.3
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"	$NetBSD: getbyteorder.3,v 1.4 2014/03/18 18:20:38 riastradh Exp $
-.\"
-.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 1, 2013
-.Dt GETBYTEORDER 3
-.Os
-.Sh NAME
-.Nm getbyteorder
-.Nd get the current byte order
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.In sys/endian.h
-.Ft int
-.Fn getbyteorder void
-.Sh DESCRIPTION
-.Fn getbyteorder
-returns
-.Dv LITTLE_ENDIAN ,
-.Dv BIG_ENDIAN ,
-or \-1 in case of an error, setting the global
-.Va errno
-variable.
-The possible values for
-.Va errno
-are the same as in
-.Xr sysctl 3 .
-.Sh SEE ALSO
-.Xr sysctl 3
-.Sh HISTORY
-The
-.Fn getbyteorder
-function call appeared in
-.Nx 7.0 .
diff --git a/lib/libutil/getbyteorder.c b/lib/libutil/getbyteorder.c
deleted file mode 100644
index e29928020..000000000
--- a/lib/libutil/getbyteorder.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: getbyteorder.c,v 1.1 2013/05/02 07:17:10 matt Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getbyteorder.c,v 1.1 2013/05/02 07:17:10 matt Exp $");
-#endif
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <util.h>
-
-int
-getbyteorder(void)
-{
-	int byteorder, mib[2];
-	size_t varlen;
-
-	mib[0] = CTL_HW;
-	mib[1] = HW_BYTEORDER;
-	varlen = sizeof(byteorder);
-	if (sysctl(mib, 2, &byteorder, &varlen, NULL, (size_t)0) < 0)
-		return (-1);
-
-	return (byteorder);
-}
diff --git a/lib/libutil/getdiskrawname.3 b/lib/libutil/getdiskrawname.3
deleted file mode 100644
index bb71354fa..000000000
--- a/lib/libutil/getdiskrawname.3
+++ /dev/null
@@ -1,71 +0,0 @@
-.\"	$NetBSD: getdiskrawname.3,v 1.2 2012/04/08 16:06:23 wiz Exp $
-.\"
-.\" Copyright (c) 2012 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"
-.Dd March 7, 2012
-.Dt GETDISKRAWNAME 3
-.Os
-.Sh NAME
-.Nm getdiskrawname
-.Nd get the the block/character device name for a disk
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft const char *
-.Fn getdiskrawname "char *buf" "size_t buflen" "const char *name"
-.Ft const char *
-.Fn getdiskcookedname "char *buf" "size_t buflen" "const char *name"
-.Sh DESCRIPTION
-The
-.Fn getdiskrawname
-function converts the
-.Fa name
-argument thar contains a path to a disk block device node to the
-path that contains the corresponding character device node.
-The
-.Fn getdiskcookedname
-function converts the
-.Fa name
-argument thar contains a path to a disk character device node to the
-path that contains the corresponding block device node.
-.Sh RETURN VALUES
-On success the absolute pathname of the underlying device node is returned.
-On failure
-.Dv NULL
-is returned and
-.Va errno
-contains the reason for the error.
-.Sh HISTORY
-The
-.Fn getdiskrawname
-and
-.Fn getdiskcookedname
-functions appeared in
-.Nx 7.0 .
diff --git a/lib/libutil/getdiskrawname.c b/lib/libutil/getdiskrawname.c
deleted file mode 100644
index baedcc094..000000000
--- a/lib/libutil/getdiskrawname.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*	$NetBSD: getdiskrawname.c,v 1.5 2014/09/17 23:54:42 christos Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: getdiskrawname.c,v 1.5 2014/09/17 23:54:42 christos Exp $");
-
-#include <sys/stat.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <util.h>
-#include <limits.h>
-#include <unistd.h>
-
-static const char *
-resolve_link(char *buf, size_t bufsiz, const char *name)
-{
-	const char *dp;
-	size_t nlen;
-	ssize_t dlen;
-
-	dlen = readlink(name, buf, bufsiz - 1);
-	if (dlen == -1)
-		return name;
-
-	buf[dlen] = '\0';
-
-	if (buf[0] != '/') {
-		dp = strrchr(name, '/');
-		if (dp != NULL) {
-			nlen = dp - name + 1;
-			if (nlen + 1 > bufsiz)
-				return NULL;
-			if (nlen + dlen + 1 > bufsiz)
-				return NULL;
-
-			memmove(buf + nlen, buf, (size_t)dlen + 1);
-			memcpy(buf, name, nlen);
-		}
-	}
-
-	return buf;
-}
-
-const char *
-getdiskrawname(char *buf, size_t bufsiz, const char *name)
-{
-	const char *dp;
-	struct stat st;
-	char dest[PATH_MAX];
-
-	if ((name = resolve_link(dest, sizeof(dest), name)) == NULL) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	dp = strrchr(name, '/');
-
-	if (stat(name, &st) == -1)
-		return NULL;
-
-	if (!S_ISBLK(st.st_mode)) {
-		errno = EFTYPE;
-		return NULL;
-	}
-
-	if (dp != NULL)
-		(void)snprintf(buf, bufsiz, "%.*s/r%s", (int)(dp - name), name, dp + 1);
-	else
-		(void)snprintf(buf, bufsiz, "r%s", name);
-
-	return buf;
-}
-
-const char *
-getdiskcookedname(char *buf, size_t bufsiz, const char *name)
-{
-	const char *dp;
-	struct stat st;
-	char dest[PATH_MAX];
-
-	if ((name = resolve_link(dest, sizeof(dest), name)) == NULL) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	dp = strrchr(name, '/');
-
-	if ((dp != NULL && dp[1] != 'r') || (dp == NULL && name[0] != 'r')) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	if (stat(name, &st) == -1)
-		return NULL;
-
-	if (!S_ISCHR(st.st_mode)) {
-		errno = EFTYPE;
-		return NULL;
-	}
-
-	if (dp != NULL)
-		(void)snprintf(buf, bufsiz, "%.*s/%s", (int)(dp - name), name, dp + 2);
-	else
-		(void)snprintf(buf, bufsiz, "%s", name + 1);
-
-	return buf;
-}
diff --git a/lib/libutil/getfsspecname.3 b/lib/libutil/getfsspecname.3
deleted file mode 100644
index 1f3617135..000000000
--- a/lib/libutil/getfsspecname.3
+++ /dev/null
@@ -1,84 +0,0 @@
-.\"	$NetBSD: getfsspecname.3,v 1.5 2015/06/13 19:52:58 dholland Exp $
-.\"
-.\" Copyright (c) 2012 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"
-.Dd August 18, 2014
-.Dt GETFSSPECNAME 3
-.Os
-.Sh NAME
-.Nm getfsspecname
-.Nd get the underlying wedge name from a label
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft const char *
-.Fn getfsspecname "char *buf" "size_t buflen" "const char *spec"
-.Sh DESCRIPTION
-The
-.Fn getfsspecname
-function translates an
-.Ft fs_spec
-field in the
-.Fa spec
-argument of the form
-.Dq NAME=wedgename
-to the underlying
-.Xr dk 4
-device node, and places the resulting pathname in
-.Fa buf
-up to len
-.Fa buflen .
-.Pp
-If the
-.Fa spec
-argument is not of the form
-.Dq NAME=wedgename ,
-.Fa spec
-is copied
-to
-.Fa buf
-and returned.
-.Sh RETURN VALUES
-On success the absolute pathname of the underlying wedge device is returned,
-or the original
-.Fa spec
-argument.
-On failure
-.Dv NULL
-is returned and
-.Fa buf
-contains the reason for the error.
-.Sh SEE ALSO
-.Xr fstab 5
-.Sh HISTORY
-The
-.Fn getfsspecname
-function appeared in
-.Nx 7.0 .
diff --git a/lib/libutil/getfsspecname.c b/lib/libutil/getfsspecname.c
deleted file mode 100644
index 8523e8cf8..000000000
--- a/lib/libutil/getfsspecname.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*	$NetBSD: getfsspecname.c,v 1.5 2014/05/25 13:46:07 christos Exp $	*/
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: getfsspecname.c,v 1.5 2014/05/25 13:46:07 christos Exp $");
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/sysctl.h>
-#include <sys/disk.h>
-
-#include <stdio.h>
-#include <vis.h>
-#include <string.h>
-#include <fstab.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <util.h>
-
-#if !defined(__minix)
-#define COMPAT_DKWEDGE	/* To be removed */
-#endif /* !defined(__minix) */
-
-const char *
-getfsspecname(char *buf, size_t bufsiz, const char *name)
-{
-	static const int mib[] = { CTL_HW, HW_DISKNAMES };
-	static const unsigned int miblen = __arraycount(mib);
-	char *drives, *dk, *p;
-	size_t len;
-	int fd, savee = errno;
-	char *vname;
-
-	p = drives = vname = NULL;
-	if (strncasecmp(name, "NAME=", 5) != 0) {
-#ifdef COMPAT_DKWEDGE
-		/*
-		 * We try to open the disk name, and if we fail with EBUSY
-		 * we use the name as the label to find the wedge.
-		 */
-		char rbuf[MAXPATHLEN];
-		if (name[0] == '/') {
-			if (getdiskrawname(rbuf, sizeof(rbuf), name) != NULL) {
-				if ((fd = open(rbuf, O_RDONLY)) == -1) {
-					if (errno == EBUSY) {
-						name = strrchr(name, '/') + 1;
-						goto search;
-					}
-				} else
-					close(fd);
-			}
-		}
-#endif
-		strlcpy(buf, name, bufsiz);
-		return buf;
-	} else
-		name += 5;
-
-#ifdef COMPAT_DKWEDGE
-search:
-#endif
-	vname = malloc(strlen(name) * 4 + 1);
-	if (vname == NULL) {
-		savee = errno;
-		strlcpy(buf, "malloc failed", bufsiz);
-		goto out;
-	}
-
-	strunvis(vname, name);
-
-	if (sysctl(mib, miblen, NULL, &len, NULL, 0) == -1) {
-		savee = errno;
-		strlcpy(buf, "sysctl hw.disknames failed", bufsiz);
-		goto out;
-	}
-
-	drives = malloc(len);
-	if (drives == NULL) {
-		savee = errno;
-		strlcpy(buf, "malloc failed", bufsiz);
-		goto out;
-	}
-	if (sysctl(mib, miblen, drives, &len, NULL, 0) == -1) {
-		savee = errno;
-		strlcpy(buf, "sysctl hw.disknames failed", bufsiz);
-		goto out;
-	}
-
-	for (dk = strtok(drives, " "); dk != NULL; dk = strtok(NULL, " ")) {
-		struct dkwedge_info dkw;
-		if (strncmp(dk, "dk", 2) != 0)
-			continue;
-		fd = opendisk(dk, O_RDONLY, buf, bufsiz, 0);
-		if (fd == -1)
-			continue;
-		if (ioctl(fd, DIOCGWEDGEINFO, &dkw) == -1) {
-			savee = errno;
-			snprintf(buf, bufsiz, "%s: getwedgeinfo", dk);
-			(void)close(fd);
-			goto out;
-		}
-		(void)close(fd);
-		if (strcmp(vname, (char *)dkw.dkw_wname) == 0) {
-			p = strstr(buf, "/rdk");
-			goto good;
-		}
-	}
-#ifdef COMPAT_DKWEDGE
-	/* Last ditch effort assuming NAME=label, and label is a disk name */
-	fd = opendisk(name, O_RDONLY, buf, bufsiz, 0);
-	if (fd != -1) {
-		close(fd);
-		p = strstr(buf, "/r");
-		goto good;
-	}
-#endif
-	savee = ESRCH;
-	snprintf(buf, bufsiz, "no match for `%s'", vname);
-out:
-	buf = NULL;
-good:
-	if (p++ != NULL) 
-		strcpy(p, p + 1);
-	free(drives);
-	free(vname);
-	errno = savee;
-	return buf;
-}
diff --git a/lib/libutil/getfstypename.3 b/lib/libutil/getfstypename.3
deleted file mode 100644
index 068d254f3..000000000
--- a/lib/libutil/getfstypename.3
+++ /dev/null
@@ -1,55 +0,0 @@
-.\"	$NetBSD: getfstypename.3,v 1.3 2011/11/18 04:15:41 christos Exp $
-.\"
-.\" Copyright (c) 2011 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd November 13, 2011
-.Dt GETFSTYPENAME 3
-.Os
-.Sh NAME
-.Nm getfstypename
-.Nd convert a partition file system type integer to a wedge partition type name
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft const char *
-.Fn getfstypename "int fstype"
-.Sh DESCRIPTION
-.Fn getfstypename
-returns the disk wedge partitition type name corresponding to the
-.Ar fstype
-argument as specified in
-.In sys/disk.h
-or
-.Dv DKW_PTYPE_UNKNOWN
-if none is found.
-.Sh HISTORY
-The
-.Fn getfstypename
-function call appeared in
-.Nx 6.0 .
diff --git a/lib/libutil/getlabelsector.3 b/lib/libutil/getlabelsector.3
deleted file mode 100644
index ed2a722ce..000000000
--- a/lib/libutil/getlabelsector.3
+++ /dev/null
@@ -1,83 +0,0 @@
-.\"	$NetBSD: getlabelsector.3,v 1.8 2011/09/14 11:43:29 njoly Exp $
-.\"
-.\"
-.\" Copyright 2002 Wasabi Systems, Inc.
-.\" All rights reserved.
-.\"
-.\" Written by Steve C. Woodford for Wasabi Systems, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed for the NetBSD Project by
-.\"      Wasabi Systems, Inc.
-.\" 4. The name of Wasabi Systems, Inc. may not be used to endorse
-.\"    or promote products derived from this software without specific prior
-.\"    written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd August 25, 2011
-.Dt GETLABELSECTOR 3
-.Os
-.Sh NAME
-.Nm getlabelsector ,
-.Nm getlabeloffset ,
-.Nm getlabelusesmbr
-.Nd get disklabel location informations
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft daddr_t
-.Fn getlabelsector void
-.Ft off_t
-.Fn getlabeloffset void
-.Ft int
-.Fn getlabelusesmbr void
-.Sh DESCRIPTION
-The
-.Fn getlabelsector
-and
-.Fn getlabeloffset
-functions return values which describe the exact on-disk location of the
-.Xr disklabel 5
-on the current system, or \-1 on error.
-These functions supersede the hardcoded
-.Dv LABELSECTOR
-and
-.Dv LABELOFFSET
-definitions previously used to derive the location of the
-.Xr disklabel 5 .
-.Pp
-The
-.Fn getlabelusesmbr
-returns 1 if the disklabel is located inside a MBR partition, 0 if it's stored
-relative to the start of the disk, or \-1 on error.
-.Sh SEE ALSO
-.Xr sysctl 3 ,
-.Xr disklabel 5
-.Sh HISTORY
-The
-.Fn getlabelsector
-and
-.Fn getlabeloffset
-functions appeared in
-.Nx 2.0 .
diff --git a/lib/libutil/getlabelsector.c b/lib/libutil/getlabelsector.c
deleted file mode 100644
index 114f9bd82..000000000
--- a/lib/libutil/getlabelsector.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$NetBSD: getlabelsector.c,v 1.5 2011/09/04 12:34:49 jmcneill Exp $	*/
-
-/*
- * Copyright 2002 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Steve C. Woodford for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getlabelsector.c,v 1.5 2011/09/04 12:34:49 jmcneill Exp $");
-#endif
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <util.h>
-
-int
-getlabelsector(void)
-{
-	int sector, mib[2];
-	size_t varlen;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_LABELSECTOR;
-	varlen = sizeof(sector);
-	if (sysctl(mib, 2, &sector, &varlen, NULL, (size_t)0) < 0)
-		return (-1);
-
-	return sector;
-}
-
-off_t
-getlabeloffset(void)
-{
-	int offset, mib[2];
-	size_t varlen;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_LABELOFFSET;
-	varlen = sizeof(offset);
-	if (sysctl(mib, 2, &offset, &varlen, NULL, (size_t)0) < 0)
-		return (-1);
-
-	return ((off_t)offset);
-}
-
-int
-getlabelusesmbr(void)
-{
-	int use;
-	size_t uselen;
-
-	uselen = sizeof(use);
-	if (sysctlbyname("kern.labelusesmbr", &use, &uselen,
-	    NULL, (size_t)0) < 0)
-		return (-1);
-
-	return use;
-}
diff --git a/lib/libutil/getmaxpartitions.3 b/lib/libutil/getmaxpartitions.3
deleted file mode 100644
index 9a439e259..000000000
--- a/lib/libutil/getmaxpartitions.3
+++ /dev/null
@@ -1,59 +0,0 @@
-.\"	$NetBSD: getmaxpartitions.3,v 1.10 2010/05/04 06:41:27 jruoho Exp $
-.\"
-.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 4, 2010
-.Dt GETMAXPARTITIONS 3
-.Os
-.Sh NAME
-.Nm getmaxpartitions
-.Nd get the maximum number of partitions allowed per disk
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft int
-.Fn getmaxpartitions void
-.Sh DESCRIPTION
-.Fn getmaxpartitions
-returns the number of partitions that are allowed per disk on the
-system, or \-1 in case of an error, setting the global
-.Va errno
-variable.
-The possible values for
-.Va errno
-are the same as in
-.Xr sysctl 3 .
-.Sh SEE ALSO
-.Xr getrawpartition 3 ,
-.Xr sysctl 3
-.Sh HISTORY
-The
-.Fn getmaxpartitions
-function call appeared in
-.Nx 1.2 .
diff --git a/lib/libutil/getmaxpartitions.c b/lib/libutil/getmaxpartitions.c
deleted file mode 100644
index ceb49c7ec..000000000
--- a/lib/libutil/getmaxpartitions.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: getmaxpartitions.c,v 1.6 2008/04/28 20:23:02 martin Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getmaxpartitions.c,v 1.6 2008/04/28 20:23:02 martin Exp $");
-#endif
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <util.h>
-
-int
-getmaxpartitions(void)
-{
-	int maxpart, mib[2];
-	size_t varlen;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_MAXPARTITIONS;
-	varlen = sizeof(maxpart);
-	if (sysctl(mib, 2, &maxpart, &varlen, NULL, (size_t)0) < 0)
-		return (-1);
-
-	return (maxpart);
-}
diff --git a/lib/libutil/getmntopts.3 b/lib/libutil/getmntopts.3
deleted file mode 100644
index 6ad3ab6b7..000000000
--- a/lib/libutil/getmntopts.3
+++ /dev/null
@@ -1,277 +0,0 @@
-.\"	$NetBSD: getmntopts.3,v 1.12 2010/08/24 12:05:01 christos Exp $
-.\"
-.\" Copyright (c) 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	@(#)getmntopts.3	8.3 (Berkeley) 3/30/95
-.\"
-.Dd May 4, 2010
-.Dt GETMNTOPTS 3
-.Os
-.Sh NAME
-.Nm getmntopts
-.Nd scan mount options
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In mntopts.h
-.Ft mntoptparse_t
-.Fn getmntopts "const char *options" "const struct mntopt *mopts" "int *flagp" "int *altflagp"
-.Ft const char *
-.Fn getmntoptstr "mntoptparse_t mp" "const char *opt"
-.Ft long
-.Fn getmntoptnum "mntoptparse_t mp" "const char *opt"
-.Ft void
-.Fn freemntopts "mntoptparse_t mp"
-.Sh DESCRIPTION
-The
-.Fn getmntopts
-function takes a comma separated option list and a list
-of valid option names, and computes the bitmasks
-corresponding to the requested set of options.
-.Pp
-The string
-.Ar options
-is broken down into a sequence of comma separated tokens.
-Each token is looked up in the table described by
-.Ar mopts
-and the bits in
-the word referenced by either
-.Ar flagp
-or
-.Ar altflagp
-(depending on the
-.Dv m_altloc
-field of the option's table entry)
-are updated.
-The flag words are not initialized by
-.Fn getmntopts .
-The table,
-.Ar mopts ,
-has the following format:
-.Bd -literal
-struct mntopt {
-	const char *m_option;	/* option name */
-	int m_inverse;		/* negative option, e.g., "dev" */
-	int m_flag;		/* bit to set, e.g., MNT_RDONLY */
-	int m_altloc;		/* use altflagp rather than flagp */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width m_inverse
-.It Fa m_option
-the option name,
-for example
-.Dq suid .
-.It Fa m_inverse
-tells
-.Fn getmntopts
-that the name has the inverse meaning of the bit.
-For example,
-.Dq suid
-is the string, whereas the mount flag is
-.Dv MNT_NOSUID .
-In this case, the sense of the string and the flag
-are inverted, so the
-.Fa m_inverse
-flag should be set.
-.It Fa m_flag
-the value of the bit to be set or cleared in
-the flag word when the option is recognized.
-The bit is set when the option is discovered,
-but cleared if the option name was preceded
-by the letters
-.Dq no .
-The
-.Fa m_inverse
-flag causes these two operations to be reversed.
-.It Fa m_altloc
-the bit should be set or cleared in
-.Ar altflagp
-rather than
-.Ar flagp .
-.El
-.Pp
-Each of the user visible
-.Dv MNT_
-flags has a corresponding
-.Dv MOPT_
-macro which defines an appropriate
-.Li "struct mntopt"
-entry.
-To simplify the program interface and ensure consistency across all
-programs, a general purpose macro,
-.Dv MOPT_STDOPTS ,
-is defined which contains an entry for all the generic VFS options.
-In addition, the macros
-.Dv MOPT_FORCE
-and
-.Dv MOPT_UPDATE
-exist to enable the
-.Dv MNT_FORCE
-and
-.Dv MNT_UPDATE
-flags to be set.
-Finally, the table must be terminated by an entry with a
-.Dv NULL
-first element.
-.Pp
-.Fn getmntopts
-returns a
-.Li "mntoptparse_t"
-handle that can be used in subsequent
-.Fn getmntoptstr
-and
-.Fn getmntoptnum
-calls to fetch a value for an option and that must be freed with a call
-to
-.Fn freemntopts .
-If an error occurred, then if the external integer value
-.Va getmnt_silent
-is zero then
-.Fn getmntopts
-prints an error message and exits;
-if
-.Va getmnt_silent
-is non-zero then
-.Fn getmntopts
-returns
-.Dv NULL .
-.Pp
-The
-.Fn getmntoptstr
-function returns the string value of the named option, if such a value
-was set in the option string.
-If the value was not set, then if the external integer value
-.Va getmnt_silent
-is zero then
-.Fn getmntoptstr
-prints an error message and exits;
-if
-.Va getmnt_silent
-is non-zero then
-.Fn getmntoptstr
-returns
-.Dv NULL .
-.Pp
-The
-.Fn getmntoptnum
-returns the long value of the named option, if such a value was set in the
-option string.
-If the value was not set, or could not be converted from a string to a
-long, then if the external integer value
-.Va getmnt_silent
-is zero then
-.Fn getmntoptnum
-prints an error message and exits;
-if
-.Va getmnt_silent
-is non-zero then
-.Fn getmntoptnum
-returns \-1.
-.Pp
-The
-.Fn freemntopts
-frees the storage used by
-.Fn getmntopts .
-.Sh RETURN VALUES
-.Fn getmntopts
-returns
-.Dv NULL
-if an error occurred.
-Note that some bits may already have been set in
-.Va flagp
-and
-.Va altflagp
-even if
-.Dv NULL
-is returned.
-.Fn getmntoptstr
-returns
-.Dv NULL
-if an error occurred.
-.Fn getmntoptnum
-returns \-1 if an error occurred.
-.Sh EXAMPLES
-Most commands will use the standard option set.
-Local filesystems which support the
-.Dv MNT_UPDATE
-flag, would also have an
-.Dv MOPT_UPDATE
-entry.
-This can be declared and used as follows:
-.Bd -literal -offset indent
-#include \*[Lt]mntopts.h\*[Gt]
-
-static const struct mntopt mopts[] = {
-	MOPT_STDOPTS,
-	MOPT_UPDATE,
-	{ NULL }
-};
-
-\&...
-
-long val;
-mntoptparse_t mp;
-mntflags = mntaltflags = 0;
-
-\&...
-
-mp = getmntopts(options, mopts, \*[Am]mntflags, \*[Am]mntaltflags);
-
-if (mp == NULL)
-	err(EXIT_FAILURE, "getmntopts");
-
-\&...
-
-val = getmntoptnum(mp, "rsize");
-freemntopts(mp);
-.Ed
-.Sh DIAGNOSTICS
-If the external integer variable
-.Va getmnt_silent
-is zero then the
-.Fn getmntopts ,
-.Fn getmntoptstr ,
-and
-.Fn getmntoptnum
-functions display an error message and exit if an error occurred.
-By default
-.Va getmnt_silent
-is zero.
-.Sh SEE ALSO
-.Xr err 3 ,
-.Xr mount 8
-.Sh HISTORY
-The
-.Fn getmntopts
-function appeared in
-.Bx 4.4 .
-It was moved to the utilities library and enhanced to retrieve option
-values in
-.Nx 2.0 .
diff --git a/lib/libutil/getmntopts.c b/lib/libutil/getmntopts.c
deleted file mode 100644
index 9c948306f..000000000
--- a/lib/libutil/getmntopts.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*	$NetBSD: getmntopts.c,v 1.4 2007/08/26 22:46:15 pooka Exp $	*/
-
-/*-
- * Copyright (c) 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)getmntopts.c	8.3 (Berkeley) 3/29/95";
-#else
-__RCSID("$NetBSD: getmntopts.c,v 1.4 2007/08/26 22:46:15 pooka Exp $");
-#endif
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/mount.h>
-
-#include <err.h>
-#include <errno.h>
-#include <fstab.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <mntopts.h>
-
-int getmnt_silent = 0;
-
-static const char errmsg[] = "-o %s: option not supported";
-
-struct mntoptparse {
-	const char *options;
-	const struct mntopt *mopts;
-	char *optbuf;
-	char **optarg;
-};
-
-const char *
-getmntoptstr(mntoptparse_t mp, const char *opt)
-{
-	const struct mntopt *m;
-
-	for (m = mp->mopts; m->m_option != NULL; m++)
-		if (strcasecmp(opt, m->m_option) == 0)
-			break;
-
-	if (m->m_option == NULL) {
-		if (getmnt_silent == 0)
-			errx(1, errmsg, opt);
-		else
-			return NULL;
-	}
-
-	return mp->optarg[m - mp->mopts];
-}
-
-long
-getmntoptnum(mntoptparse_t mp, const char *opt)
-{
-	char *ep;
-	long rv;
-	void (*fun)(int, const char *, ...) = NULL;
-	const char *val = getmntoptstr(mp, opt);
-
-	if (val == NULL) {
-		if (getmnt_silent == 0)
-			errx(1, "Missing %s argument", opt);
-		else
-			return -1;
-	}
-
-	errno = 0;
-	rv = strtol(val, &ep, 0);
-
-	if (*ep)
-		fun = errx;
-
-	if (errno == ERANGE && (rv == LONG_MAX || rv == LONG_MIN))
-		fun = err;
-
-	if (fun) {
-		if (getmnt_silent != 0)
-			return -1;
-		(*fun)(1, "Invalid %s argument `%s'", opt, val);
-	}
-	return rv;
-}
-
-void
-freemntopts(mntoptparse_t mp)
-{
-	free(mp->optbuf);
-	free(mp->optarg);
-	free(mp);
-}
-
-mntoptparse_t
-getmntopts(const char *options, const struct mntopt *m0, int *flagp,
-    int *altflagp)
-{
-	const struct mntopt *m;
-	int negative;
-	char *opt, *p;
-	int *thisflagp;
-	size_t nopts;
-	mntoptparse_t mp;
-
-	for (nopts = 0, m = m0; m->m_option != NULL; ++m, nopts++)
-		continue;
-	
-	if ((mp = malloc(sizeof(struct mntoptparse))) == NULL)
-		return NULL;
-
-	/* Copy option string, since it is about to be torn asunder... */
-	if ((mp->optbuf = strdup(options)) == NULL) {
-		free(mp);
-		return NULL;
-	}
-
-	if ((mp->optarg = calloc(nopts, sizeof(char *))) == NULL) {
-		free(mp->optbuf);
-		free(mp);
-		return NULL;
-	}
-
-	mp->mopts = m0;
-	mp->options = options;
-
-	for (opt = mp->optbuf; (opt = strtok(opt, ",")) != NULL; opt = NULL) {
-		/* Check for "no" prefix. */
-		if (opt[0] == 'n' && opt[1] == 'o') {
-			negative = 1;
-			opt += 2;
-		} else
-			negative = 0;
-
-		/*
-		 * for options with assignments in them (ie. quotas)
-		 * ignore the assignment as it's handled elsewhere
-		 */
-		p = strchr(opt, '=');
-		if (p) {
-			 *p++ = '\0';
-		}
-
-		/* Scan option table. */
-		for (m = m0; m->m_option != NULL; ++m)
-			if (strcasecmp(opt, m->m_option) == 0)
-				break;
-
-		/* Save flag, or fail if option is not recognised. */
-		if (m->m_option) {
-			mp->optarg[m - m0] = p;
-			thisflagp = m->m_altloc ? altflagp : flagp;
-			if (negative == m->m_inverse)
-				*thisflagp |= m->m_flag;
-			else
-				*thisflagp &= ~m->m_flag;
-		} else if (!getmnt_silent) {
-			errx(1, errmsg, opt);
-		} else {
-			free(mp->optbuf);
-			free(mp);
-
-			return NULL;
-		}
-	}
-	return mp;
-}
diff --git a/lib/libutil/getrawpartition.3 b/lib/libutil/getrawpartition.3
deleted file mode 100644
index 78790cff2..000000000
--- a/lib/libutil/getrawpartition.3
+++ /dev/null
@@ -1,71 +0,0 @@
-.\"	$NetBSD: getrawpartition.3,v 1.11 2010/05/04 06:41:27 jruoho Exp $
-.\"
-.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 4, 2010
-.Dt GETRAWPARTITION 3
-.Os
-.Sh NAME
-.Nm getrawpartition
-.Nd get the system
-.Dq raw
-partition
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft int
-.Fn getrawpartition void
-.Sh DESCRIPTION
-.Fn getrawpartition
-returns the partition number (
-.Sq a
-== 0,
-.Sq b
-== 1, ...) of the
-.Dq raw
-partition of the system's disks,
-or \-1 in case of an error, setting the global
-.Va errno
-variable.
-The possible values for
-.Va errno
-are the same as in
-.Xr sysctl 3 .
-The
-.Dq raw
-partition is defined as the partition which provides access to the entire
-disk, regardless of the disk's partition map.
-.Sh SEE ALSO
-.Xr getmaxpartitions 3 ,
-.Xr sysctl 3
-.Sh HISTORY
-The
-.Fn getrawpartition
-function call appeared in
-.Nx 1.2 .
diff --git a/lib/libutil/getrawpartition.c b/lib/libutil/getrawpartition.c
deleted file mode 100644
index 85238430d..000000000
--- a/lib/libutil/getrawpartition.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: getrawpartition.c,v 1.7 2012/06/25 22:32:47 abs Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getrawpartition.c,v 1.7 2012/06/25 22:32:47 abs Exp $");
-#endif
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <util.h>
-
-int
-getrawpartition(void)
-{
-	int rawpart, mib[2];
-	size_t varlen;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_RAWPARTITION;
-	varlen = sizeof(rawpart);
-	if (sysctl(mib, 2, &rawpart, &varlen, NULL, (size_t)0) < 0)
-		return (-1);
-
-	return (rawpart);
-}
diff --git a/lib/libutil/if_media.c b/lib/libutil/if_media.c
deleted file mode 100644
index a68782624..000000000
--- a/lib/libutil/if_media.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*	$NetBSD: if_media.c,v 1.2 2008/04/28 20:23:03 martin Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: if_media.c,v 1.2 2008/04/28 20:23:03 martin Exp $");
-#endif 
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <net/if_media.h>
-
-struct ifmedia_description ifm_mode_descriptions[] =
-    IFM_MODE_DESCRIPTIONS;
-
-struct ifmedia_description ifm_type_descriptions[] =
-    IFM_TYPE_DESCRIPTIONS;
-
-struct ifmedia_description ifm_subtype_descriptions[] =
-    IFM_SUBTYPE_DESCRIPTIONS;
-
-struct ifmedia_description ifm_option_descriptions[] =
-    IFM_OPTION_DESCRIPTIONS;
-
-const char *
-get_media_type_string(int mword)
-{
-	struct ifmedia_description *desc;
-
-	for (desc = ifm_type_descriptions; desc->ifmt_string != NULL; desc++) {
-		if (IFM_TYPE(mword) == desc->ifmt_word)
-			return (desc->ifmt_string);
-	}
-	return "<unknown type>";
-}
-
-const char *
-get_media_subtype_string(int mword)
-{
-	struct ifmedia_description *desc;
-
-	for (desc = ifm_subtype_descriptions; desc->ifmt_string != NULL;
-	     desc++) {
-		if (IFM_TYPE_MATCH(desc->ifmt_word, mword) &&
-		    IFM_SUBTYPE(desc->ifmt_word) == IFM_SUBTYPE(mword))
-			return desc->ifmt_string;
-	}
-	return "<unknown subtype>";
-}
-
-const char *
-get_media_mode_string(int mword)
-{
-	struct ifmedia_description *desc;
-
-	for (desc = ifm_mode_descriptions; desc->ifmt_string != NULL; desc++) {
-		if (IFM_TYPE_MATCH(desc->ifmt_word, mword) &&
-		    IFM_MODE(mword) == IFM_MODE(desc->ifmt_word))
-			return desc->ifmt_string;
-	}
-	return NULL;
-}
-
-const char *
-get_media_option_string(int *mwordp)
-{
-	struct ifmedia_description *desc;
-	int mword = *mwordp;
-
-	for (desc = ifm_option_descriptions; desc->ifmt_string != NULL;
-	     desc++) {
-		if (!IFM_TYPE_MATCH(desc->ifmt_word, mword))
-			continue;
-		if (mword & IFM_OPTIONS(desc->ifmt_word)) {
-			*mwordp = mword & ~IFM_OPTIONS(desc->ifmt_word);
-			return desc->ifmt_string;
-		}
-	}
-
-	/* Historical behaviour is to ignore unknown option bits! */
-	*mwordp = mword & ~IFM_OPTIONS(~0);
-	return NULL;
-}
-
-int
-lookup_media_word(struct ifmedia_description *desc, int type, const char *val)
-{
-
-	for (; desc->ifmt_string != NULL; desc++) {
-		if (IFM_TYPE_MATCH(desc->ifmt_word, type) &&
-		    strcasecmp(desc->ifmt_string, val) == 0)
-			return (desc->ifmt_word);
-	}
-	return -1;
-}
-
-int
-get_media_mode(int type, const char *val)
-{
-
-	return lookup_media_word(ifm_mode_descriptions, type, val);
-}
-
-int
-get_media_subtype(int type, const char *val)
-{
-
-	return lookup_media_word(ifm_subtype_descriptions, type, val);
-}
-
-int
-get_media_options(int type, const char *val, char **invalid)
-{
-	char *optlist, *str;
-	int option, rval = 0;
-
-	/* We muck with the string, so copy it. */
-	optlist = strdup(val);
-	if (optlist == NULL) {
-		if (invalid != NULL)
-			*invalid = NULL;
-		return -1;
-	}
-	str = optlist;
-
-	/*
-	 * Look up the options in the user-provided comma-separated list.
-	 */
-	type = IFM_TYPE(type);
-	for (; (str = strtok(str, ",")) != NULL; str = NULL) {
-		option = lookup_media_word(ifm_option_descriptions, type, str);
-		if (option != -1) {
-			rval |= IFM_OPTIONS(option);
-			continue;
-		}
-		rval = -1;
-		if (invalid == NULL)
-			break;
-		/* Pass invalid option at start of malloced buffer */
-		if (str != optlist)
-			memmove(optlist, str, strlen(str) + 1);
-		/* Caller should free() or exit() */
-		*invalid = optlist;
-		return rval;
-	}
-
-	free(optlist);
-	return (rval);
-}
diff --git a/lib/libutil/kinfo_getvmmap.3 b/lib/libutil/kinfo_getvmmap.3
deleted file mode 100644
index e0851c70f..000000000
--- a/lib/libutil/kinfo_getvmmap.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\"	$NetBSD: kinfo_getvmmap.3,v 1.1 2015/09/24 14:39:20 christos Exp $
-.\"
-.\" Copyright (c) 2008 Peter Wemm
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: head/lib/libutil/kinfo_getvmmap.3 283622 2015-05-27 17:51:06Z jhb $
-.\"
-.Dd September 16, 2015
-.Dt KINFO_GETVMMAP 3
-.Os
-.Sh NAME
-.Nm kinfo_getvmmap
-.Nd function for getting per-process memory map information
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/sysctl.h
-.In util.h
-.Ft struct kinfo_vmentry *
-.Fn kinfo_getvmmap "pid_t pid" "size_t *cntp"
-.Sh DESCRIPTION
-This function is used for obtaining virtual memory mapping information
-of a particular process.
-.Pp
-The
-.Ar pid
-field contains the process identifier.
-This should be the a process that you have privilege to access.
-The
-.Ar cntp
-field is allows the caller to know how many records are returned.
-.Pp
-This function is a wrapper around
-.Xr sysctl 3
-with the
-.Dv KERN_PROC_VMMAP
-mib.
-While the kernel returns a packed structure, this function expands the
-data into a fixed record format.
-.Sh RETURN VALUES
-On success the
-.Fn kinfo_getvmmap
-function returns a pointer to an array of
-.Vt struct kinfo_vmentry
-structures as defined by
-.In sys/sysctl.h .
-The array was obtained by an internal call to
-.Xr malloc 3
-and must be freed by the caller with a call to
-.Xr free 3 .
-On failure the
-.Fn kinfo_getvmmap
-function returns
-.Dv NULL .
-.Sh SEE ALSO
-.Xr free 3 ,
-.\" .Xr kinfo_getfile 3 ,
-.Xr malloc 3
diff --git a/lib/libutil/kinfo_getvmmap.c b/lib/libutil/kinfo_getvmmap.c
deleted file mode 100644
index 8b817e8dd..000000000
--- a/lib/libutil/kinfo_getvmmap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <sys/cdefs.h>
-#ifdef __FBSDID
-__FBSDID("$FreeBSD: head/lib/libutil/kinfo_getvmmap.c 186512 2008-12-27 11:12:23Z rwatson $");
-#endif
-__RCSID("$NetBSD: kinfo_getvmmap.c,v 1.3 2015/09/26 20:28:55 christos Exp $");
-
-#include <sys/param.h>
-#include <sys/user.h>
-#include <sys/sysctl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <util.h>
-#include <uvm/uvm_param.h>
-
-struct kinfo_vmentry *
-kinfo_getvmmap(pid_t pid, size_t *cntp)
-{
-	int mib[5];
-	int error;
-	size_t len;
-	struct kinfo_vmentry *kiv;
-
-	*cntp = 0;
-	len = 0;
-	mib[0] = CTL_VM;
-	mib[1] = VM_PROC;
-	mib[2] = VM_PROC_MAP;
-	mib[3] = pid;
-	mib[4] = sizeof(*kiv);
-
-	error = sysctl(mib, (u_int)__arraycount(mib), NULL, &len, NULL, 0);
-	if (error)
-		return NULL;
-
-	len = len * 4 / 3;
-
-	kiv = malloc(len);
-	if (kiv == NULL)
-		return NULL;
-
-	error = sysctl(mib, (u_int)__arraycount(mib), kiv, &len, NULL, 0);
-	if (error) {
-		free(kiv);
-		return NULL;
-	}
-
-	*cntp = len / sizeof(*kiv);
-	return kiv;	/* Caller must free() return value */
-}
diff --git a/lib/libutil/login.3 b/lib/libutil/login.3
deleted file mode 100644
index 0bcd42e1e..000000000
--- a/lib/libutil/login.3
+++ /dev/null
@@ -1,107 +0,0 @@
-.\"	$NetBSD: login.3,v 1.6 2003/08/07 16:44:58 agc Exp $
-.\"
-.\" Copyright (c) 1995
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software 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.
-.\" 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.
-.\"
-.Dd December 14, 1995
-.Dt LOGIN 3
-.Os
-.Sh NAME
-.Nm login ,
-.Nm logout ,
-.Nm logwtmp
-.Nd login utility functions
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft void
-.Fn login "struct utmp *ut"
-.Ft int
-.Fn logout "const char *line"
-.Ft void
-.Fn logwtmp "const char *line" "const char *name" "const char *host"
-.Sh DESCRIPTION
-The
-.Fn login ,
-.Fn logout ,
-and
-.Fn logwtmp
-functions operate on the database of current users in
-.Pa /var/run/utmp
-and on the logfile
-.Pa /var/log/wtmp
-of logins and logouts.
-.Pp
-The
-.Fn login
-function updates the
-.Pa /var/run/utmp
-and
-.Pa /var/log/wtmp
-files with user information contained in
-.Fa ut .
-.Pp
-The
-.Fn logout
-function removes the entry from
-.Pa /var/run/utmp
-corresponding to the device
-.Fa line .
-.Pp
-The
-.Fn logwtmp
-function adds an entry to
-.Pa /var/log/wtmp .
-Since
-.Fn login
-will add the appropriate entry for
-.Pa /var/log/wtmp
-during a login,
-.Fn logwtmp
-is usually used for logouts.
-.Sh RETURN VALUES
-.Fn logout
-returns non-zero if it was able to find and delete an entry for
-.Fa line ,
-and zero if there is no entry for
-.Fa line
-in
-.Pa /var/run/utmp .
-.Sh FILES
-.Bl -tag -width /var/run/wtmp -compact
-.It Pa /dev/\(**
-.It Pa /etc/ttys
-.It Pa /var/run/utmp
-.It Pa /var/log/wtmp
-.El
-.Sh SEE ALSO
-.Xr utmp 5
diff --git a/lib/libutil/login.c b/lib/libutil/login.c
deleted file mode 100644
index 5068a808f..000000000
--- a/lib/libutil/login.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$NetBSD: login.c,v 1.16 2003/08/07 16:44:58 agc 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)login.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: login.c,v 1.16 2003/08/07 16:44:58 agc Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <util.h>
-#include <utmp.h>
-
-void
-login(const struct utmp *ut)
-{
-	int fd;
-	int tty;
-
-	_DIAGASSERT(ut != NULL);
-
-	tty = ttyslot();
-	if (tty > 0 && (fd = open(_PATH_UTMP, O_WRONLY|O_CREAT, 0644)) >= 0) {
-		(void)lseek(fd, (off_t)(tty * sizeof(struct utmp)), SEEK_SET);
-		(void)write(fd, ut, sizeof(struct utmp));
-		(void)close(fd);
-	}
-	if ((fd = open(_PATH_WTMP, O_WRONLY|O_APPEND, 0)) >= 0) {
-		(void)write(fd, ut, sizeof(struct utmp));
-		(void)close(fd);
-	}
-}
diff --git a/lib/libutil/login_cap.3 b/lib/libutil/login_cap.3
deleted file mode 100644
index 9c6e5b7ed..000000000
--- a/lib/libutil/login_cap.3
+++ /dev/null
@@ -1,297 +0,0 @@
-.\" $NetBSD: login_cap.3,v 1.21 2013/06/23 08:38:41 wiz Exp $
-.\"
-.\" Copyright (c) 1996,1997 Berkeley Software Design, Inc. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by Berkeley Software Design,
-.\"	Inc.
-.\" 4. The name of Berkeley Software Design, Inc.  may not be used to endorse
-.\"    or promote products derived from this software without specific prior
-.\"    written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN, INC. ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL BERKELEY SOFTWARE DESIGN, INC. BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" BSDI login_cap.3,v 1.4 1997/11/07 16:22:27 jch Exp
-.\"
-.Dd June 20, 2013
-.Dt LOGIN_CAP 3
-.Os
-.Sh NAME
-.Nm login_getclass ,
-.Nm login_getcapbool ,
-.Nm login_getcapnum ,
-.Nm login_getcapsize ,
-.Nm login_getcapstr ,
-.Nm login_getcaptime ,
-.Nm login_getpwclass ,
-.Nm login_close ,
-.Nm setclasscontext ,
-.Nm setusercontext
-.Nd query login.conf database about a user class
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In sys/types.h
-.In login_cap.h
-.Ft login_cap_t *
-.Fn login_getclass "char *class"
-.Ft int
-.Fn login_getcapbool "login_cap_t *lc" "const char *cap" "u_int def"
-.Ft quad_t
-.Fn login_getcapnum "login_cap_t *lc" "const char *cap" "quad_t def" "quad_t err"
-.Ft quad_t
-.Fn login_getcapsize "login_cap_t *lc" "const char *cap" "quad_t def" "quad_t err"
-.Ft char *
-.Fn login_getcapstr "login_cap_t *lc" "const char *cap" "char *def" "char *err"
-.Ft quad_t
-.Fn login_getcaptime "login_cap_t *lc" "const char *cap" "quad_t def" "quad_t err"
-.Ft login_cap_t *
-.Fn login_getpwclass "struct passwd *pwd"
-.Ft void
-.Fn login_close "login_cap_t *lc"
-.Ft int
-.Fn setclasscontext "const char *class" "u_int flags"
-.Ft int
-.Fn setusercontext "login_cap_t *lc" "const struct passwd *pwd" "uid_t uid" "u_int flags"
-.Sh DESCRIPTION
-The
-.Fn login_getclass
-function extracts the entry specified by
-.Ar class
-(or
-.Li default
-if
-.Ar class
-is
-.Dv NULL
-or the empty string)
-from
-.Pa /etc/login.conf
-(see
-.Xr login.conf 5 ) .
-If the entry is found, a
-.Li login_cap_t
-pointer is returned.
-.Dv NULL
-is returned if the user class is not found.
-When the
-.Li login_cap_t
-structure is no longer needed, it should be freed by the
-.Fn login_close
-function.
-.Pp
-The
-.Fn login_getpwclass
-function is equivalent to:
-.Dl login_getclass(pwd\ ? pwd->pw_class\ : NULL)
-.Pp
-Once
-.Ar lc
-has been returned by
-.Fn login_getclass ,
-any of the other
-.Fn login_*
-functions may be called.
-.Pp
-The
-.Fn login_getcapnum ,
-.Fn login_getcapsize ,
-.Fn login_getcapstr ,
-and
-.Fn login_getcaptime
-functions all query the database entry for a field named
-.Ar cap .
-If the field is found, its value is returned.
-If the field is not found, the value specified by
-.Ar def
-is returned.
-If an error is encountered while trying to find the field,
-.Ar err
-is returned.
-See
-.Xr login.conf 5
-for a discussion of the various textual forms the value may take.
-The
-.Fn login_getcapbool
-function is slightly different.
-It returns
-.Ar def
-if no capabilities were found for this class (typically meaning that
-the default class was used and the
-.Li /etc/login.conf
-file is missing).
-It returns a non-zero value if
-.Ar cap ,
-with no value, was found,
-zero otherwise.
-.Pp
-The
-.Fn setclasscontext
-function takes
-.Ar class ,
-the name of a user class,
-and sets the resources defined by that class according to
-.Ar flags .
-Only the
-.Dv LOGIN_SETPATH ,
-.Dv LOGIN_SETPRIORITY ,
-.Dv LOGIN_SETRESOURCES ,
-and
-.Dv LOGIN_SETUMASK
-bits are used.
-(See
-.Fn setusercontext
-below).
-It returns 0 on success and -1 on failure.
-.Pp
-The
-.Fn setusercontext
-function
-sets the resources according to
-.Ar flags .
-The
-.Ar lc
-argument, if not
-.Dv NULL ,
-contains the class information that should
-be used.
-The
-.Ar pwd
-argument, if not
-.Dv NULL ,
-provides information about the user.
-Both
-.Ar lc
-and
-.Ar pwd
-cannot be
-.Dv NULL .
-The
-.Ar uid
-argument is used in place of the user id contained in the
-.Ar pwd
-structure when calling
-.Xr setuid 2 .
-The various bits available to be or-ed together to make up
-.Ar flags
-are:
-.Bl -tag -width LOGIN_SETRESOURCESXX
-.It LOGIN_SETGID
-Set the group id.
-Requires the
-.Ar pwd
-field be specified.
-.It LOGIN_SETGROUPS
-Set the group membership list by calling
-.Xr initgroups 3 .
-Requires the
-.Ar pwd
-field be specified.
-.It LOGIN_SETGROUP
-Set the group id and call
-.Xr initgroups 3 .
-Requires the
-.Ar pwd
-field be specified.
-.It LOGIN_SETLOGIN
-Sets the login name by
-.Xr setlogin 2 .
-Requires the
-.Ar pwd
-field be specified.
-.It LOGIN_SETPATH
-Sets the
-.Ev PATH
-environment variable.
-.It LOGIN_SETPRIORITY
-Sets the priority by
-.Xr setpriority 2 .
-.It LOGIN_SETRESOURCES
-Sets the various system resources by
-.Xr setrlimit 2 .
-.It LOGIN_SETUMASK
-Sets the umask by
-.Xr umask 2 .
-.It LOGIN_SETUSER
-Sets the user id to
-.Ar uid
-by
-.Xr setuid 2 .
-.It LOGIN_SETENV
-Sets the environment variables as defined by the setenv keyword, by
-.Xr setenv 3 .
-.It LOGIN_SETALL
-Sets all of the above.
-.El
-.Sh SEE ALSO
-.Xr setlogin 2 ,
-.Xr setpriority 2 ,
-.Xr setrlimit 2 ,
-.Xr setuid 2 ,
-.Xr umask 2 ,
-.Xr initgroups 3 ,
-.Xr secure_path 3 ,
-.Xr login.conf 5
-.Sh HISTORY
-The
-.Nm
-family of functions are largely based on the
-.Bsx
-implementation of same, and appeared in
-.Nx 1.5
-by kind permission.
-.Sh CAVEATS
-The string returned by
-.Fn login_getcapstr
-is allocated via
-.Xr malloc 3
-when the specified capability is present and thus it is the responsibility
-of the caller to
-.Fn free
-this space.
-However, if the capability was not found or an error occurred and
-.Fa def
-or
-.Fa err
-(whichever is relevant) are
-.Pf non- Dv NULL
-the returned value is simply what was passed in to
-.Fn login_getcapstr .
-Therefore it is not possible to blindly
-.Fn free
-the return value without first checking it against
-.Fa def
-and
-.Fa err .
-.Pp
-The same warnings set forth in
-.Xr setlogin 2
-apply to
-.Fn setusercontext
-when the
-.Dv LOGIN_SETLOGIN
-flag is used.
-Specifically, changing the login name affects all processes in the current
-session, not just the current process.
-See
-.Xr setlogin 2
-for more information.
diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
deleted file mode 100644
index eaac4481d..000000000
--- a/lib/libutil/login_cap.c
+++ /dev/null
@@ -1,991 +0,0 @@
-/*	$NetBSD: login_cap.c,v 1.32 2015/07/11 09:21:22 kamil Exp $	*/
-
-/*-
- * Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Berkeley Software Design,
- *	Inc.
- * 4. The name of Berkeley Software Design, Inc.  may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL BERKELEY SOFTWARE DESIGN, INC. BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	BSDI login_cap.c,v 2.13 1998/02/07 03:17:05 prb Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: login_cap.c,v 1.32 2015/07/11 09:21:22 kamil Exp $");
-#endif /* LIBC_SCCS and not lint */
- 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/param.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <login_cap.h>
-#include <paths.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-#include <util.h>
-
-static u_quad_t	multiply(u_quad_t, u_quad_t);
-static u_quad_t	strtolimit(const char *, char **, int);
-static u_quad_t	strtosize(const char *, char **, int);
-static int	gsetrl(login_cap_t *, int, const char *, int type);
-static int	isinfinite(const char *);
-static int	envset(void *, const char *, const char *, int);
-
-login_cap_t *
-login_getclass(const char *class)
-{
-	const char *classfiles[2];
-	login_cap_t *lc;
-	int res;
-
-	/* class may be NULL */
-
-	if (secure_path(_PATH_LOGIN_CONF) == 0) {
-		classfiles[0] = _PATH_LOGIN_CONF;
-		classfiles[1] = NULL;
-	} else {
-		classfiles[0] = NULL;
-	}
-
-	if ((lc = malloc(sizeof(login_cap_t))) == NULL) {
-		syslog(LOG_ERR, "%s:%d malloc: %m", __FILE__, __LINE__);
-		return (0);
-	}
-
-	lc->lc_cap = 0;
-	lc->lc_style = 0;
-
-	if (class == NULL || class[0] == '\0')
-		class = LOGIN_DEFCLASS;
-
-    	if ((lc->lc_class = strdup(class)) == NULL) {
-		syslog(LOG_ERR, "%s:%d strdup: %m", __FILE__, __LINE__);
-		free(lc);
-		return (0);
-	}
-
-	/*
-	 * Not having a login.conf file is not an error condition.
-	 * The individual routines deal reasonably with missing
-	 * capabilities and use default values.
-	 */
-	if (classfiles[0] == NULL)
-		return(lc);
-
-	if ((res = cgetent(&lc->lc_cap, classfiles, lc->lc_class)) != 0) {
-		lc->lc_cap = 0;
-		switch (res) {
-		case 1: 
-			syslog(LOG_ERR, "%s: couldn't resolve 'tc'",
-				lc->lc_class);
-			break;
-		case -1:
-			if (strcmp(lc->lc_class, LOGIN_DEFCLASS) == 0)
-				return (lc);
-			syslog(LOG_ERR, "%s: unknown class", lc->lc_class);
-			break;
-		case -2:
-			syslog(LOG_ERR, "%s: getting class information: %m",
-				lc->lc_class);
-			break;
-		case -3:
-			syslog(LOG_ERR, "%s: 'tc' reference loop",
-				lc->lc_class);
-			break;
-		default:
-			syslog(LOG_ERR, "%s: unexpected cgetent error",
-				lc->lc_class);
-			break;
-		}
-		free(lc->lc_class);
-		free(lc);
-		return (0);
-	}
-	return (lc);
-}
-
-login_cap_t *
-login_getpwclass(const struct passwd *pwd)
-{
-
-	/* pwd may be NULL */
-
-	return login_getclass(pwd ? pwd->pw_class : NULL);
-}
-
-char *
-login_getcapstr(login_cap_t *lc, const char *cap, char *def, char *e)
-{
-	char *res = NULL;
-	int status;
-
-	errno = 0;
-
-	_DIAGASSERT(cap != NULL);
-
-	if (!lc || !lc->lc_cap)
-		return (def);
-
-	switch (status = cgetstr(lc->lc_cap, cap, &res)) {
-	case -1:
-		if (res)
-			free(res);
-		return (def);
-	case -2:
-		syslog(LOG_ERR, "%s: getting capability %s: %m",
-		    lc->lc_class, cap);
-		if (res)
-			free(res);
-		return (e);
-	default:
-		if (status >= 0) 
-			return (res);
-		syslog(LOG_ERR, "%s: unexpected error with capability %s",
-		    lc->lc_class, cap);
-		if (res)
-			free(res);
-		return (e);
-	}
-}
-
-quad_t
-login_getcaptime(login_cap_t *lc, const char *cap, quad_t def, quad_t e)
-{
-	char *ep;
-	char *res = NULL, *sres;
-	int status;
-	quad_t q, r;
-
-	_DIAGASSERT(cap != NULL);
-
-	errno = 0;
-	if (!lc || !lc->lc_cap)
-		return (def);
-
-	switch (status = cgetstr(lc->lc_cap, cap, &res)) {
-	case -1:
-		if (res)
-			free(res);
-		return (def);
-	case -2:
-		syslog(LOG_ERR, "%s: getting capability %s: %m",
-		    lc->lc_class, cap);
-		errno = ERANGE;
-		if (res)
-			free(res);
-		return (e);
-	default:
-		if (status >= 0) 
-			break;
-		syslog(LOG_ERR, "%s: unexpected error with capability %s",
-		    lc->lc_class, cap);
-		errno = ERANGE;
-		if (res)
-			free(res);
-		return (e);
-	}
-
-	if (isinfinite(res))
-		return (RLIM_INFINITY);
-
-	errno = 0;
-
-	q = 0;
-	sres = res;
-	while (*res) {
-		r = strtoq(res, &ep, 0);
-		if (!ep || ep == res ||
-		    ((r == QUAD_MIN || r == QUAD_MAX) && errno == ERANGE)) {
-invalid:
-			syslog(LOG_ERR, "%s:%s=%s: invalid time",
-			    lc->lc_class, cap, sres);
-			errno = ERANGE;
-			free(sres);
-			return (e);
-		}
-		switch (*ep++) {
-		case '\0':
-			--ep;
-			break;
-		case 's': case 'S':
-			break;
-		case 'm': case 'M':
-			r *= 60;
-			break;
-		case 'h': case 'H':
-			r *= 60 * 60;
-			break;
-		case 'd': case 'D':
-			r *= 60 * 60 * 24;
-			break;
-		case 'w': case 'W':
-			r *= 60 * 60 * 24 * 7;
-			break;
-		case 'y': case 'Y':	/* Pretty absurd */
-			r *= 60 * 60 * 24 * 365;
-			break;
-		default:
-			goto invalid;
-		}
-		res = ep;
-		q += r;
-	}
-	free(sres);
-	return (q);
-}
-
-quad_t
-login_getcapnum(login_cap_t *lc, const char *cap, quad_t def, quad_t e)
-{
-	char *ep;
-	char *res = NULL;
-	int status;
-	quad_t q;
-
-	_DIAGASSERT(cap != NULL);
-
-	errno = 0;
-	if (!lc || !lc->lc_cap)
-		return (def);
-
-	switch (status = cgetstr(lc->lc_cap, cap, &res)) {
-	case -1:
-		if (res)
-			free(res);
-		return (def);
-	case -2:
-		syslog(LOG_ERR, "%s: getting capability %s: %m",
-		    lc->lc_class, cap);
-		errno = ERANGE;
-		if (res)
-			free(res);
-		return (e);
-	default:
-		if (status >= 0) 
-			break;
-		syslog(LOG_ERR, "%s: unexpected error with capability %s",
-		    lc->lc_class, cap);
-		errno = ERANGE;
-		if (res)
-			free(res);
-		return (e);
-	}
-
-	if (isinfinite(res))
-		return (RLIM_INFINITY);
-
-	errno = 0;
-    	q = strtoq(res, &ep, 0);
-	if (!ep || ep == res || ep[0] ||
-	    ((q == QUAD_MIN || q == QUAD_MAX) && errno == ERANGE)) {
-		syslog(LOG_ERR, "%s:%s=%s: invalid number",
-		    lc->lc_class, cap, res);
-		errno = ERANGE;
-		free(res);
-		return (e);
-	}
-	free(res);
-	return (q);
-}
-
-quad_t
-login_getcapsize(login_cap_t *lc, const char *cap, quad_t def, quad_t e)
-{
-	char *ep;
-	char *res = NULL;
-	int status;
-	quad_t q;
-
-	_DIAGASSERT(cap != NULL);
-
-	errno = 0;
-
-	if (!lc || !lc->lc_cap)
-		return (def);
-
-	switch (status = cgetstr(lc->lc_cap, cap, &res)) {
-	case -1:
-		if (res)
-			free(res);
-		return (def);
-	case -2:
-		syslog(LOG_ERR, "%s: getting capability %s: %m",
-		    lc->lc_class, cap);
-		errno = ERANGE;
-		if (res)
-			free(res);
-		return (e);
-	default:
-		if (status >= 0) 
-			break;
-		syslog(LOG_ERR, "%s: unexpected error with capability %s",
-		    lc->lc_class, cap);
-		errno = ERANGE;
-		if (res)
-			free(res);
-		return (e);
-	}
-
-	errno = 0;
-	q = strtolimit(res, &ep, 0);
-	if (!ep || ep == res || (ep[0] && ep[1]) ||
-	    ((q == QUAD_MIN || q == QUAD_MAX) && errno == ERANGE)) {
-		syslog(LOG_ERR, "%s:%s=%s: invalid size",
-		    lc->lc_class, cap, res);
-		errno = ERANGE;
-		free(res);
-		return (e);
-	}
-	free(res);
-	return (q);
-}
-
-int
-login_getcapbool(login_cap_t *lc, const char *cap, u_int def)
-{
-
-	_DIAGASSERT(cap != NULL);
-
-	if (!lc || !lc->lc_cap)
-		return (def);
-
-	return (cgetcap(lc->lc_cap, cap, ':') != NULL);
-}
-
-void
-login_close(login_cap_t *lc)
-{
-
-	if (lc) {
-		if (lc->lc_class)
-			free(lc->lc_class);
-		if (lc->lc_cap)
-			free(lc->lc_cap);
-		if (lc->lc_style)
-			free(lc->lc_style);
-		free(lc);
-	}
-}
-
-#define	R_CTIME	1
-#define	R_CSIZE	2
-#define	R_CNUMB	3
-
-static struct {
-	int	what;
-	int	type;
-	const char *name;
-} r_list[] = {
-	{ RLIMIT_CPU,		R_CTIME, "cputime", },
-	{ RLIMIT_FSIZE,		R_CSIZE, "filesize", },
-	{ RLIMIT_DATA,		R_CSIZE, "datasize", },
-	{ RLIMIT_STACK,		R_CSIZE, "stacksize", },
-	{ RLIMIT_RSS,		R_CSIZE, "memoryuse", },
-	{ RLIMIT_MEMLOCK,	R_CSIZE, "memorylocked", },
-	{ RLIMIT_NPROC,		R_CNUMB, "maxproc", },
-	{ RLIMIT_NTHR,		R_CNUMB, "maxthread", },
-	{ RLIMIT_NOFILE,	R_CNUMB, "openfiles", },
-	{ RLIMIT_CORE,		R_CSIZE, "coredumpsize", },
-	{ RLIMIT_SBSIZE,	R_CSIZE, "sbsize", },
-	{ RLIMIT_AS,		R_CSIZE, "vmemoryuse", },
-	{ -1, 0, 0 }
-};
-
-static int
-gsetrl(login_cap_t *lc, int what, const char *name, int type)
-{
-	struct rlimit rl;
-	struct rlimit r;
-	char name_cur[32];
-	char name_max[32];
-
-	_DIAGASSERT(name != NULL);
-
-	(void)snprintf(name_cur, sizeof(name_cur), "%s-cur", name);
-	(void)snprintf(name_max, sizeof(name_max), "%s-max", name);
-
-	if (getrlimit(what, &r)) {
-		syslog(LOG_ERR, "getting resource limit: %m");
-		return (-1);
-	}
-
-#define	RCUR	((quad_t)r.rlim_cur)
-#define	RMAX	((quad_t)r.rlim_max)
-
-	switch (type) {
-	case R_CTIME:
-		r.rlim_cur = login_getcaptime(lc, name, RCUR, RCUR);
-		r.rlim_max = login_getcaptime(lc, name, RMAX, RMAX);
-		rl.rlim_cur = login_getcaptime(lc, name_cur, RCUR, RCUR);
-		rl.rlim_max = login_getcaptime(lc, name_max, RMAX, RMAX);
-		break;
-	case R_CSIZE:
-		r.rlim_cur = login_getcapsize(lc, name, RCUR, RCUR);
-		r.rlim_max = login_getcapsize(lc, name, RMAX, RMAX);
-		rl.rlim_cur = login_getcapsize(lc, name_cur, RCUR, RCUR);
-		rl.rlim_max = login_getcapsize(lc, name_max, RMAX, RMAX);
-		break;
-	case R_CNUMB:
-		r.rlim_cur = login_getcapnum(lc, name, RCUR, RCUR);
-		r.rlim_max = login_getcapnum(lc, name, RMAX, RMAX);
-		rl.rlim_cur = login_getcapnum(lc, name_cur, RCUR, RCUR);
-		rl.rlim_max = login_getcapnum(lc, name_max, RMAX, RMAX);
-		break;
-	default:
-		syslog(LOG_ERR, "%s: invalid type %d setting resource limit %s",
-		    lc->lc_class, type, name);
-		return (-1);
-	}
-
-	if (setrlimit(what, &rl)) {
-		syslog(LOG_ERR, "%s: setting resource limit %s: %m",
-		    lc->lc_class, name);
-		return (-1);
-	}
-#undef	RCUR
-#undef	RMAX
-	return (0);
-}
-
-static int
-/*ARGSUSED*/
-envset(void *envp __unused, const char *name, const char *value, int overwrite)
-{
-	return setenv(name, value, overwrite);	
-}
-
-int
-setuserenv(login_cap_t *lc, envfunc_t senv, void *envp)
-{
-	const char *stop = ", \t";
-	size_t i, count;
-	char *ptr;
-	char **res;
-	char *str = login_getcapstr(lc, "setenv", NULL, NULL);
-		  
-	if (str == NULL || *str == '\0')
-		return 0;
-	
-	/*
-	 * count the sub-strings, this may over-count since we don't
-	 * account for escaped delimiters.
-	 */
-	for (i = 1, ptr = str; *ptr; i++) {
-		ptr += strcspn(ptr, stop);
-		if (*ptr)
-			ptr++;
-	}
-
-	/* allocate ptr array and string */
-	count = i;
-	res = malloc(count * sizeof(*res) + strlen(str) + 1);
-
-	if (!res)
-		return -1;
-	
-	ptr = (char *)(void *)&res[count];
-	(void)strcpy(ptr, str);
-
-	/* split string */
-	for (i = 0; (res[i] = stresep(&ptr, stop, '\\')) != NULL; )
-		if (*res[i])
-			i++;
-	
-	count = i;
-
-	for (i = 0; i < count; i++) {
-		if ((ptr = strchr(res[i], '=')) != NULL)
-			*ptr++ = '\0';
-		else 
-			ptr = NULL;
-		(void)(*senv)(envp, res[i], ptr ? ptr : "", 1);
-	}
-	
-	free(res);
-	return 0;
-}
-
-int
-setclasscontext(const char *class, u_int flags)
-{
-	int ret;
-	login_cap_t *lc;
-
-	flags &= LOGIN_SETRESOURCES | LOGIN_SETPRIORITY | LOGIN_SETUMASK |
-	    LOGIN_SETPATH;
-
-	lc = login_getclass(class);
-	ret = lc ? setusercontext(lc, NULL, 0, flags) : -1;
-	login_close(lc);
-	return (ret);
-}
-
-int
-setusercontext(login_cap_t *lc, struct passwd *pwd, uid_t uid, u_int flags)
-{
-	char per_user_tmp[MAXPATHLEN + 1];
-	const char *component_name;
-	login_cap_t *flc;
-	quad_t p;
-	int i;
-	ssize_t len;
-
-	flc = NULL;
-
-	if (!lc)
-		flc = lc = login_getclass(pwd ? pwd->pw_class : NULL);
-
-	/*
-	 * Without the pwd entry being passed we cannot set either
-	 * the group or the login.  We could complain about it.
-	 */
-	if (pwd == NULL)
-		flags &= ~(LOGIN_SETGROUP|LOGIN_SETLOGIN);
-
-#ifdef LOGIN_OSETGROUP
-	if (pwd == NULL)
-		flags &= ~LOGIN_OSETGROUP;
-	if (flags & LOGIN_OSETGROUP)
-		flags = (flags & ~LOGIN_OSETGROUP) | LOGIN_SETGROUP;
-#endif
-	if (flags & LOGIN_SETRESOURCES)
-		for (i = 0; r_list[i].name; ++i) 
-			(void)gsetrl(lc, r_list[i].what, r_list[i].name,
-			    r_list[i].type);
-
-	if (flags & LOGIN_SETPRIORITY) {
-		p = login_getcapnum(lc, "priority", (quad_t)0, (quad_t)0);
-
-		if (setpriority(PRIO_PROCESS, 0, (int)p) == -1)
-			syslog(LOG_ERR, "%s: setpriority: %m", lc->lc_class);
-	}
-
-	if (flags & LOGIN_SETUMASK) {
-		p = login_getcapnum(lc, "umask", (quad_t) LOGIN_DEFUMASK,
-		    (quad_t)LOGIN_DEFUMASK);
-		umask((mode_t)p);
-	}
-
-	if (flags & LOGIN_SETGID) {
-		if (setgid(pwd->pw_gid) == -1) {
-			syslog(LOG_ERR, "setgid(%d): %m", pwd->pw_gid);
-			login_close(flc);
-			return (-1);
-		}
-	}
-
-	if (flags & LOGIN_SETGROUPS) {
-		if (initgroups(pwd->pw_name, pwd->pw_gid) == -1) {
-			syslog(LOG_ERR, "initgroups(%s,%d): %m",
-			    pwd->pw_name, pwd->pw_gid);
-			login_close(flc);
-			return (-1);
-		}
-	}
-
-	/* Create per-user temporary directories if needed. */
-	if ((len = readlink("/tmp", per_user_tmp, 
-	    sizeof(per_user_tmp) - 6)) != -1) {
-
-		static const char atuid[] = "/@ruid";
-		char *lp;
-
-		/* readlink does not nul-terminate the string */
-		per_user_tmp[len] = '\0';
-
-		/* Check if it's magic symlink. */
-		lp = strstr(per_user_tmp, atuid);
-		if (lp != NULL && *(lp + (sizeof(atuid) - 1)) == '\0') {
-			lp++;
-
-			if (snprintf(lp, 11, "/%u", pwd->pw_uid) > 10) {
-				syslog(LOG_ERR, "real temporary path too long");
-				login_close(flc);
-				return (-1);
-			}
-			if (mkdir(per_user_tmp, S_IRWXU) != -1) {
-				if (chown(per_user_tmp, pwd->pw_uid,
-				    pwd->pw_gid)) {
-					component_name = "chown";
-					goto out;
-				}
-
-				/* 
-			 	 * Must set sticky bit for tmp directory, some
-			 	 * programs rely on this.
-			 	 */
-				if(chmod(per_user_tmp, S_IRWXU | S_ISVTX)) {
-					component_name = "chmod";
-					goto out;
-				}
-			} else {
-				if (errno != EEXIST) {
-					component_name = "mkdir";
-					goto out;
-				} else {
-					/* 
-					 * We must ensure that we own the
-					 * directory and that is has the correct
-					 * permissions, otherwise a DOS attack
-					 * is possible.
-					 */
-					struct stat sb;
-					if (stat(per_user_tmp, &sb) == -1) {
-						component_name = "stat";
-						goto out;
-					}
-
-					if (sb.st_uid != pwd->pw_uid) {
-						if (chown(per_user_tmp, 
-						    pwd->pw_uid, pwd->pw_gid)) {
-							component_name = "chown";
-							goto out;
-						}
-					}
-
-					if (sb.st_mode != (S_IRWXU | S_ISVTX)) {
-						if (chmod(per_user_tmp, 
-						    S_IRWXU | S_ISVTX)) {
-							component_name = "chmod";
-							goto out;
-						}
-					}
-				}
-			}
-		}
-	}
-	errno = 0;
-
-#if !defined(__minix)
-	if (flags & LOGIN_SETLOGIN)
-		if (setlogin(pwd->pw_name) == -1) {
-			syslog(LOG_ERR, "setlogin(%s) failure: %m",
-			    pwd->pw_name);
-			login_close(flc);
-			return (-1);
-		}
-#endif /* !defined(__minix) */
-
-	if (flags & LOGIN_SETUSER)
-		if (setuid(uid) == -1) {
-			syslog(LOG_ERR, "setuid(%d): %m", uid);
-			login_close(flc);
-			return (-1);
-		}
-
-	if (flags & LOGIN_SETENV)
-		setuserenv(lc, envset, NULL);
-
-	if (flags & LOGIN_SETPATH)
-		setuserpath(lc, pwd ? pwd->pw_dir : "", envset, NULL);
-
-	login_close(flc);
-	return (0);
-
-out:
-	if (component_name != NULL) {
-		syslog(LOG_ERR, "%s %s: %m", component_name, per_user_tmp);
-		login_close(flc);
-		return (-1);
-	} else {
-		syslog(LOG_ERR, "%s: %m", per_user_tmp);
-		login_close(flc);
-		return (-1);
-	}
-}
-
-void
-setuserpath(login_cap_t *lc, const char *home, envfunc_t senv, void *envp)
-{
-	size_t hlen, plen;
-	int cnt = 0;
-	char *path;
-	const char *cpath;
-	char *p, *q;
-
-	_DIAGASSERT(home != NULL);
-
-	hlen = strlen(home);
-
-	p = path = login_getcapstr(lc, "path", NULL, NULL);
-	if (p) {
-		while (*p)
-			if (*p++ == '~')
-				++cnt;
-		plen = (p - path) + cnt * (hlen + 1) + 1;
-		p = path;
-		q = path = malloc(plen);
-		if (q) {
-			while (*p) {
-				p += strspn(p, " \t");
-				if (*p == '\0')
-					break;
-				plen = strcspn(p, " \t");
-				if (hlen == 0 && *p == '~') {
-					p += plen;
-					continue;
-				}
-				if (q != path)
-					*q++ = ':';
-				if (*p == '~') {
-					strcpy(q, home);
-					q += hlen;
-					++p;
-					--plen;
-				}
-				memcpy(q, p, plen);
-				p += plen;
-				q += plen;
-			}
-			*q = '\0';
-			cpath = path;
-		} else
-			cpath = _PATH_DEFPATH;
-	} else
-		cpath = _PATH_DEFPATH;
-	if ((*senv)(envp, "PATH", cpath, 1))
-		warn("could not set PATH");
-}
-
-/*
- * Convert an expression of the following forms
- * 	1) A number.
- *	2) A number followed by a b (mult by 512).
- *	3) A number followed by a k (mult by 1024).
- *	5) A number followed by a m (mult by 1024 * 1024).
- *	6) A number followed by a g (mult by 1024 * 1024 * 1024).
- *	7) A number followed by a t (mult by 1024 * 1024 * 1024 * 1024).
- *	8) Two or more numbers (with/without k,b,m,g, or t).
- *	   separated by x (also * for backwards compatibility), specifying
- *	   the product of the indicated values.
- */
-static u_quad_t
-strtosize(const char *str, char **endptr, int radix)
-{
-	u_quad_t num, num2;
-	char *expr, *expr2;
-
-	_DIAGASSERT(str != NULL);
-	/* endptr may be NULL */
-
-	errno = 0;
-	num = strtouq(str, &expr, radix);
-	if (errno || expr == str) {
-		if (endptr)
-			*endptr = expr;
-		return (num);
-	}
-
-	switch(*expr) {
-	case 'b': case 'B':
-		num = multiply(num, (u_quad_t)512);
-		++expr;
-		break;
-	case 'k': case 'K':
-		num = multiply(num, (u_quad_t)1024);
-		++expr;
-		break;
-	case 'm': case 'M':
-		num = multiply(num, (u_quad_t)1024 * 1024);
-		++expr;
-		break;
-	case 'g': case 'G':
-		num = multiply(num, (u_quad_t)1024 * 1024 * 1024);
-		++expr;
-		break;
-	case 't': case 'T':
-		num = multiply(num, (u_quad_t)1024 * 1024);
-		num = multiply(num, (u_quad_t)1024 * 1024);
-		++expr;
-		break;
-	}
-
-	if (errno)
-		goto erange;
-
-	switch(*expr) {
-	case '*':			/* Backward compatible. */
-	case 'x':
-		num2 = strtosize(expr+1, &expr2, radix);
-		if (errno) {
-			expr = expr2;
-			goto erange;
-		}
-
-		if (expr2 == expr + 1) {
-			if (endptr)
-				*endptr = expr;
-			return (num);
-		}
-		expr = expr2;
-		num = multiply(num, num2);
-		if (errno)
-			goto erange;
-		break;
-	}
-	if (endptr)
-		*endptr = expr;
-	return (num);
-erange:
-	if (endptr)
-		*endptr = expr;
-	errno = ERANGE;
-	return (UQUAD_MAX);
-}
-
-static u_quad_t
-strtolimit(const char *str, char **endptr, int radix)
-{
-
-	_DIAGASSERT(str != NULL);
-	/* endptr may be NULL */
-
-	if (isinfinite(str)) {
-		if (endptr)
-			*endptr = (char *)__UNCONST(str) + strlen(str);
-		return ((u_quad_t)RLIM_INFINITY);
-	}
-	return (strtosize(str, endptr, radix));
-}
-
-static int
-isinfinite(const char *s)
-{
-	static const char *infs[] = {
-		"infinity",
-		"inf",
-		"unlimited",
-		"unlimit",
-		NULL
-	};
-	const char **i;
-
-	_DIAGASSERT(s != NULL);
-
-	for (i = infs; *i; i++) {
-		if (!strcasecmp(s, *i))
-			return 1;
-	}
-	return 0;
-}
-
-static u_quad_t
-multiply(u_quad_t n1, u_quad_t n2)
-{
-	static int bpw = 0;
-	u_quad_t m;
-	u_quad_t r;
-	int b1, b2;
-
-	/*
-	 * Get rid of the simple cases
-	 */
-	if (n1 == 0 || n2 == 0)
-		return (0);
-	if (n1 == 1)
-		return (n2);
-	if (n2 == 1)
-		return (n1);
-
-	/*
-	 * sizeof() returns number of bytes needed for storage.
-	 * This may be different from the actual number of useful bits.
-	 */
-	if (!bpw) {
-		bpw = sizeof(u_quad_t) * 8;
-		while (((u_quad_t)1 << (bpw-1)) == 0)
-			--bpw;
-	}
-
-	/*
-	 * First check the magnitude of each number.  If the sum of the
-	 * magnatude is way to high, reject the number.  (If this test
-	 * is not done then the first multiply below may overflow.)
-	 */
-	for (b1 = bpw; (((u_quad_t)1 << (b1-1)) & n1) == 0; --b1)
-		; 
-	for (b2 = bpw; (((u_quad_t)1 << (b2-1)) & n2) == 0; --b2)
-		; 
-	if (b1 + b2 - 2 > bpw) {
-		errno = ERANGE;
-		return (UQUAD_MAX);
-	}
-
-	/*
-	 * Decompose the multiplication to be:
-	 * h1 = n1 & ~1
-	 * h2 = n2 & ~1
-	 * l1 = n1 & 1
-	 * l2 = n2 & 1
-	 * (h1 + l1) * (h2 + l2)
-	 * (h1 * h2) + (h1 * l2) + (l1 * h2) + (l1 * l2)
-	 *
-	 * Since h1 && h2 do not have the low bit set, we can then say:
-	 *
-	 * (h1>>1 * h2>>1 * 4) + ...
-	 *
-	 * So if (h1>>1 * h2>>1) > (1<<(bpw - 2)) then the result will
-	 * overflow.
-	 *
-	 * Finally, if MAX - ((h1 * l2) + (l1 * h2) + (l1 * l2)) < (h1*h2)
-	 * then adding in residual amout will cause an overflow.
-	 */
-
-	m = (n1 >> 1) * (n2 >> 1);
-
-	if (m >= ((u_quad_t)1 << (bpw-2))) {
-		errno = ERANGE;
-		return (UQUAD_MAX);
-	}
-
-	m *= 4;
-
-	r = (n1 & n2 & 1)
-	  + (n2 & 1) * (n1 & ~(u_quad_t)1)
-	  + (n1 & 1) * (n2 & ~(u_quad_t)1);
-
-	if ((u_quad_t)(m + r) < m) {
-		errno = ERANGE;
-		return (UQUAD_MAX);
-	}
-	m += r;
-
-	return (m);
-}
diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c
deleted file mode 100644
index 354fae94c..000000000
--- a/lib/libutil/login_tty.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: login_tty.c,v 1.13 2011/09/16 16:13:16 plunky Exp $	*/
-
-/*-
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)login_tty.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: login_tty.c,v 1.13 2011/09/16 16:13:16 plunky Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/ioctl.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <unistd.h>
-#include <util.h>
-
-int
-login_tty(int fd)
-{
-
-	_DIAGASSERT(fd != -1);
-
-	(void) setsid();
-	if (ioctl(fd, TIOCSCTTY, NULL) == -1)
-		return (-1);
-	(void) dup2(fd, STDIN_FILENO);
-	(void) dup2(fd, STDOUT_FILENO);
-	(void) dup2(fd, STDERR_FILENO);
-	if (fd != STDIN_FILENO && fd != STDOUT_FILENO && fd != STDERR_FILENO)
-		(void) close(fd);
-	return (0);
-}
diff --git a/lib/libutil/loginx.3 b/lib/libutil/loginx.3
deleted file mode 100644
index 5924bdec6..000000000
--- a/lib/libutil/loginx.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\"	$NetBSD: loginx.3,v 1.3 2008/04/30 13:10:52 martin Exp $
-.\"
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Thomas Klausner.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 26, 2002
-.Dt LOGINX 3
-.Os
-.Sh NAME
-.Nm loginx ,
-.Nm logoutx ,
-.Nm logwtmpx
-.Nd login utility functions
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft void
-.Fn loginx "const struct utmpx *ut"
-.Ft int
-.Fn logoutx "const char *line" "int status" "int type"
-.Ft void
-.Fn logwtmpx "const char *line" "const char *name" "const char *host" "int status" "int type"
-.Sh DESCRIPTION
-The
-.Fn loginx ,
-.Fn logoutx ,
-and
-.Fn logwtmpx
-operate on the
-.Xr utmpx 5
-database of currently logged in users, and the
-.Xr wtmpx 5
-database of logins and logouts.
-.Pp
-The
-.Fn loginx
-function updates the
-.Pa /var/run/utmpx
-and
-.Pa /var/log/wtmpx
-databases with the information from
-.Fa ut .
-.Pp
-.Fn logoutx
-updates the entry corresponding to
-.Fa line
-with the type and status from
-.Fa type
-and
-.Fa status .
-.Pp
-.Fn logwtmpx
-writes an entry filled with data from
-.Fa line ,
-.Fa name ,
-.Fa host ,
-.Fa status ,
-and
-.Fa type
-to the
-.Xr wtmpx 5
-database.
-.Sh RETURN VALUES
-.Fn logoutx
-returns 1 on success, and 0 if no corresponding entry was found.
-.Sh SEE ALSO
-.Xr endutxent 3 ,
-.Xr utmpx 5
diff --git a/lib/libutil/loginx.c b/lib/libutil/loginx.c
deleted file mode 100644
index 3e1cc12b1..000000000
--- a/lib/libutil/loginx.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: loginx.c,v 1.2 2003/08/07 16:44:59 agc 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: loginx.c,v 1.2 2003/08/07 16:44:59 agc Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <util.h>
-#include <utmp.h>
-#include <utmpx.h>
-
-void
-loginx(const struct utmpx *ut)
-{
-	(void)pututxline(ut);
-	(void)updwtmpx(_PATH_WTMPX, ut);
-}
diff --git a/lib/libutil/logout.c b/lib/libutil/logout.c
deleted file mode 100644
index f324b1005..000000000
--- a/lib/libutil/logout.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: logout.c,v 1.16 2005/08/27 17:07:17 elad 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)logout.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: logout.c,v 1.16 2005/08/27 17:07:17 elad Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <assert.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <util.h>
-#include <utmp.h>
-
-int
-logout(const char *line)
-{
-	int fd, rval;
-	struct utmp ut;
-
-	_DIAGASSERT(line != NULL);
-
-	if ((fd = open(_PATH_UTMP, O_RDWR, 0)) < 0)
-		return(0);
-	rval = 0;
-	while (read(fd, &ut, sizeof(ut)) == sizeof(ut)) {
-		if (!ut.ut_name[0] || strncmp(ut.ut_line, line,
-					      (size_t)UT_LINESIZE))
-			continue;
-		memset(ut.ut_name, 0, (size_t)UT_NAMESIZE);
-		memset(ut.ut_host, 0, (size_t)UT_HOSTSIZE);
-		(void)time(&ut.ut_time);
-		(void)lseek(fd, -(off_t)sizeof(ut), SEEK_CUR);
-		(void)write(fd, &ut, sizeof(ut));
-		rval = 1;
-	}
-	(void)close(fd);
-	return(rval);
-}
diff --git a/lib/libutil/logoutx.c b/lib/libutil/logoutx.c
deleted file mode 100644
index 5160a00cd..000000000
--- a/lib/libutil/logoutx.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*	$NetBSD: logoutx.c,v 1.2 2003/08/07 16:44:59 agc 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)logout.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: logoutx.c,v 1.2 2003/08/07 16:44:59 agc Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-
-#include <assert.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <util.h>
-#include <utmp.h>
-#include <utmpx.h>
-
-int
-logoutx(const char *line, int status, int type)
-{
-	struct utmpx *utp, ut;
-	(void)strlcpy(ut.ut_line, line, sizeof(ut.ut_line));
-	if ((utp = getutxline(&ut)) == NULL) {
-		endutxent();
-		return 0;
-	}
-	utp->ut_type = type;
-	if (WIFEXITED(status))
-		utp->ut_exit.e_exit = (uint16_t)WEXITSTATUS(status);
-	if (WIFSIGNALED(status))
-		utp->ut_exit.e_termination = (uint16_t)WTERMSIG(status);
-	(void)gettimeofday(&utp->ut_tv, NULL);
-	(void)pututxline(utp);
-	endutxent();
-	return 1;
-}
diff --git a/lib/libutil/logwtmp.c b/lib/libutil/logwtmp.c
deleted file mode 100644
index 3e9137828..000000000
--- a/lib/libutil/logwtmp.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$NetBSD: logwtmp.c,v 1.14 2003/08/07 16:44:59 agc 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: logwtmp.c,v 1.14 2003/08/07 16:44:59 agc Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <utmp.h>
-#include <util.h>
-
-void
-logwtmp(const char *line, const char *name, const char *host)
-{
-	struct utmp ut;
-	struct stat buf;
-	int fd;
-
-	_DIAGASSERT(line != NULL);
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(host != NULL);
-
-	if ((fd = open(_PATH_WTMP, O_WRONLY|O_APPEND, 0)) < 0)
-		return;
-	if (fstat(fd, &buf) == 0) {
-		(void) strncpy(ut.ut_line, line, sizeof(ut.ut_line));
-		(void) strncpy(ut.ut_name, name, sizeof(ut.ut_name));
-		(void) strncpy(ut.ut_host, host, sizeof(ut.ut_host));
-		(void) time(&ut.ut_time);
-		if (write(fd, &ut, sizeof(struct utmp)) != sizeof(struct utmp))
-			(void) ftruncate(fd, buf.st_size);
-	}
-	(void) close(fd);
-}
diff --git a/lib/libutil/logwtmpx.c b/lib/libutil/logwtmpx.c
deleted file mode 100644
index 57d3ede1d..000000000
--- a/lib/libutil/logwtmpx.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: logwtmpx.c,v 1.2 2003/08/07 16:44:59 agc 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: logwtmpx.c,v 1.2 2003/08/07 16:44:59 agc Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <assert.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <utmp.h>
-#include <utmpx.h>
-#include <util.h>
-
-void
-logwtmpx(const char *line, const char *name, const char *host, int status,
-    int type)
-{
-	struct utmpx ut;
-
-	_DIAGASSERT(line != NULL);
-	_DIAGASSERT(name != NULL);
-	_DIAGASSERT(host != NULL);
-
-	(void)memset(&ut, 0, sizeof(ut));
-	(void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
-	(void)strncpy(ut.ut_name, name, sizeof(ut.ut_name));
-	(void)strncpy(ut.ut_host, host, sizeof(ut.ut_host));
-	ut.ut_type = type;
-	if (WIFEXITED(status))
-		ut.ut_exit.e_exit = (uint16_t)WEXITSTATUS(status);
-	if (WIFSIGNALED(status))
-		ut.ut_exit.e_termination = (uint16_t)WTERMSIG(status);
-	(void)gettimeofday(&ut.ut_tv, NULL);
-	(void)updwtmpx(_PATH_WTMPX, &ut);
-}
diff --git a/lib/libutil/opendisk.3 b/lib/libutil/opendisk.3
deleted file mode 100644
index 63c3dc34f..000000000
--- a/lib/libutil/opendisk.3
+++ /dev/null
@@ -1,172 +0,0 @@
-.\"	$NetBSD: opendisk.3,v 1.11 2008/04/30 13:10:52 martin Exp $
-.\"
-.\" Copyright (c) 1997, 2001 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Luke Mewburn.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd December 11, 2001
-.Dt OPENDISK 3
-.Os
-.Sh NAME
-.Nm opendisk
-.Nd open a disk partition
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft int
-.Fo opendisk
-.Fa "const char *path"
-.Fa "int flags"
-.Fa "char *buf"
-.Fa "size_t buflen"
-.Fa "int iscooked"
-.Fc
-.Sh DESCRIPTION
-.Fn opendisk
-opens
-.Fa path ,
-for reading and/or writing as specified by the argument
-.Fa flags
-using
-.Xr open 2 ,
-and the file descriptor is returned to the caller.
-.Fa buf
-is used to store the resultant filename.
-.Fa buflen
-is the size, in bytes, of the array referenced by
-.Fa buf
-(usually
-.Dv MAXPATHLEN
-bytes).
-.Fa iscooked
-controls which paths in
-.Pa /dev
-are tried.
-.Pp
-.Fn opendisk
-attempts to open the following variations of
-.Fa path ,
-in order:
-.Bl -tag -width "/dev/rpathX"
-.It Pa path
-The pathname as given.
-.It Pa path Ns Em X
-.Fa path
-with a suffix of
-.Sq Em X ,
-where
-.Sq Em X
-represents the raw partition of the device, as determined by
-.Xr getrawpartition 3 ,
-usually
-.Dq c .
-.El
-.Pp
-If
-.Fa path
-does not contain a
-slash
-.Pq Dq / ,
-the following variations are attempted:
-.Pp
-.Bl -dash -offset indent
-.It
-If
-.Fa iscooked
-is zero:
-.Pp
-.Bl -tag -width "/dev/rpathX"
-.It Pa /dev/rpath
-.Fa path
-with a prefix of
-.Dq Pa /dev/r .
-.It Pa /dev/rpath Ns Em X
-.Fa path
-with a prefix of
-.Dq Pa /dev/r
-and a suffix of
-.Sq Em X
-(q.v.).
-.El
-.It
-If
-.Fa iscooked
-is non-zero:
-.Bl -tag -width "/dev/rpathX"
-.It Pa /dev/path
-.Fa path
-with a prefix of
-.Dq Pa /dev/ .
-.It Pa /dev/path Ns Em X
-.Fa path
-with a prefix of
-.Dq Pa /dev/
-and a suffix of
-.Sq Em X
-(q.v.).
-.El
-.El
-.Sh RETURN VALUES
-An open file descriptor, or -1 if the
-.Xr open 2
-failed.
-.Sh ERRORS
-.Fn opendisk
-may set
-.Va errno
-to one of the following values:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-.Dv O_CREAT
-was set in
-.Fa flags ,
-or
-.Xr getrawpartition 3
-didn't return a valid partition.
-.It Bq Er EFAULT
-.Fa buf
-was the
-.Dv NULL
-pointer.
-.El
-.Pp
-The
-.Fn opendisk
-function
-may also set
-.Va errno
-to any value specified by the
-.Xr open 2
-function.
-.Sh SEE ALSO
-.Xr open 2 ,
-.Xr getrawpartition 3
-.Sh HISTORY
-The
-.Fn opendisk
-function first appeared in
-.Nx 1.3 .
diff --git a/lib/libutil/opendisk.c b/lib/libutil/opendisk.c
deleted file mode 100644
index ca7f15450..000000000
--- a/lib/libutil/opendisk.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*	$NetBSD: opendisk.c,v 1.13 2014/09/29 21:04:52 christos Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: opendisk.c,v 1.13 2014/09/29 21:04:52 christos Exp $");
-#endif
-
-#include <sys/param.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#ifndef HAVE_NBTOOL_CONFIG_H
-#include <util.h>
-#include <paths.h>
-#else
-#include "opendisk.h"
-#endif
-#include <stdio.h>
-#include <string.h>
-
-static int
-__opendisk(const char *path, int flags, char *buf, size_t buflen, int iscooked,
-	int (*ofn)(const char *, int, ...))
-{
-#if !defined(__minix)
-	int f, rawpart;
-#else
-	int f;
-#endif /* !defined(__minix) */
-
-#if defined(__minix)
-	/*
-	 * MINIX does not have the cooked/raw distinction.  Do not prepend 'r'
-	 * to the device name when generating a full path.
-	 */
-	iscooked = 1;
-#endif /* defined(__minix) */
-
-	if (buf == NULL) {
-		errno = EFAULT;
-		return (-1);
-	}
-	snprintf(buf, buflen, "%s", path);
-
-	if ((flags & O_CREAT) != 0) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-#if !defined(__minix)
-	rawpart = getrawpartition();
-	if (rawpart < 0)
-		return (-1);	/* sysctl(3) in getrawpartition sets errno */
-#endif /* !defined(__minix) */
-
-	f = ofn(buf, flags, 0);
-	if (f != -1 || errno != ENOENT)
-		return (f);
-
-#if !defined(__minix)
-	snprintf(buf, buflen, "%s%c", path, 'a' + rawpart);
-	f = ofn(buf, flags, 0);
-	if (f != -1 || errno != ENOENT)
-		return (f);
-#endif /* !defined(__minix) */
-
-	if (strchr(path, '/') != NULL)
-		return (-1);
-
-	snprintf(buf, buflen, "%s%s%s", _PATH_DEV, iscooked ? "" : "r", path);
-	f = ofn(buf, flags, 0);
-	if (f != -1 || errno != ENOENT)
-		return (f);
-
-#if !defined(__minix)
-	snprintf(buf, buflen, "%s%s%s%c", _PATH_DEV, iscooked ? "" : "r", path,
-	    'a' + rawpart);
-	f = ofn(buf, flags, 0);
-#endif /* !defined(__minix) */
-	return (f);
-}
-
-int
-opendisk(const char *path, int flags, char *buf, size_t buflen, int iscooked)
-{
-
-	return __opendisk(path, flags, buf, buflen, iscooked, open);
-}
-
-int
-opendisk1(const char *path, int flags, char *buf, size_t buflen, int iscooked,
-	int (*ofn)(const char *, int, ...))
-{
-
-	return __opendisk(path, flags, buf, buflen, iscooked, ofn);
-}
diff --git a/lib/libutil/openpty.3 b/lib/libutil/openpty.3
deleted file mode 100644
index f0c540510..000000000
--- a/lib/libutil/openpty.3
+++ /dev/null
@@ -1,178 +0,0 @@
-.\"	$NetBSD: openpty.3,v 1.17 2012/07/27 21:33:46 christos Exp $
-.\"
-.\" Copyright (c) 1995
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software 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.
-.\" 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.
-.\"
-.Dd July 27, 2012
-.Dt OPENPTY 3
-.Os
-.Sh NAME
-.Nm openpty ,
-.Nm login_tty ,
-.Nm forkpty
-.Nd tty utility functions
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft int
-.Fn openpty "int *amaster" "int *aslave" "char *name" "struct termios *termp" "struct winsize *winp"
-.Ft int
-.Fn login_tty "int fd"
-.Ft pid_t
-.Fn forkpty "int *amaster" "char *name" "struct termios *termp" "struct winsize *winp"
-.Sh DESCRIPTION
-The
-.Fn openpty ,
-.Fn login_tty ,
-and
-.Fn forkpty
-functions perform manipulations on ttys and pseudo-ttys.
-.Pp
-The
-.Fn openpty
-function finds an available pseudo-tty and returns file descriptors
-for the master and slave in
-.Fa amaster
-and
-.Fa aslave .
-If
-.Fa name
-is non-null, the filename of the slave is returned in
-.Fa name .
-The length of
-.Fa name
-is limited to
-.Dv PATH_MAX
-as any other regular path name, so a buffer of this size should be used.
-.\" .Dv 16
-.\" characters in the current
-.\" .Xr ptm 4
-.\" device driver (including the terminating
-.\" .Dv NUL )
-.\" which limits the maximum to
-.\" .Dv 100,000
-.\" ptys.
-If
-.Fa termp
-is non-null, the terminal parameters of the slave will be set to the
-values in
-.Fa termp .
-If
-.Fa winp
-is non-null, the window size of the slave will be set to the values in
-.Fa winp .
-.Pp
-The
-.Fn login_tty
-function prepares for a login on the tty
-.Fa fd
-(which may be a real tty device, or the slave of a pseudo-tty as
-returned by
-.Fn openpty )
-by creating a new session, making
-.Fa fd
-the controlling terminal for the current process, setting
-.Fa fd
-to be the standard input, output, and error streams of the current
-process, and closing
-.Fa fd .
-.Pp
-The
-.Fn forkpty
-function combines
-.Fn openpty ,
-.Fn fork ,
-and
-.Fn login_tty
-to create a new process operating in a pseudo-tty.
-The file descriptor of the master side of the pseudo-tty is returned
-(to the parent process only) in
-.Fa amaster .
-The filename of the slave is returned (to both the parent and child
-processes) in
-.Fa name
-if
-.Fa name
-is non-null.
-The
-.Fa termp
-and
-.Fa winp
-parameters, if non-null, will determine the terminal attributes and
-window size of the slave side of the pseudo-tty.
-.Sh RETURN VALUES
-If a call to
-.Fn openpty ,
-.Fn login_tty ,
-or
-.Fn forkpty
-is not successful, -1 is returned and
-.Va errno
-is set to indicate the error.
-Otherwise,
-.Fn openpty ,
-.Fn login_tty ,
-and the child process of
-.Fn forkpty
-return 0, and the parent process of
-.Fn forkpty
-returns the process ID of the child process.
-.Sh FILES
-.Bl -tag -width /dev/[pt]ty[p-zP-T][0-9a-zA-Z] -compact
-.It Pa /dev/[pt]ty[p-zP-T][0-9a-zA-Z]
-.El
-.Sh ERRORS
-.Fn openpty
-will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOENT
-There are no available ttys.
-.It Bq Er EPERM
-The caller was not the superuser and the
-.Xr ptm 4
-device is missing or not configured.
-.El
-.Pp
-.Fn login_tty
-will fail if
-.Fn ioctl
-fails to set
-.Fa fd
-to the controlling terminal of the current process.
-.Fn forkpty
-will fail if either
-.Fn openpty
-or
-.Fn fork
-fails.
-.Sh SEE ALSO
-.Xr fork 2
diff --git a/lib/libutil/parsedate.3 b/lib/libutil/parsedate.3
deleted file mode 100644
index 2c8a4d748..000000000
--- a/lib/libutil/parsedate.3
+++ /dev/null
@@ -1,299 +0,0 @@
-.\"     $NetBSD: parsedate.3,v 1.15 2014/10/08 22:10:04 wiz Exp $
-.\"
-.\" Copyright (c) 2006 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd October 8, 2014
-.Dt PARSEDATE 3
-.Os
-.Sh NAME
-.Nm parsedate
-.Nd date parsing function
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft time_t
-.Fn parsedate "const char *datestr" "const time_t *time" "const int *tzoff"
-.Sh DESCRIPTION
-The
-.Fn parsedate
-function parses a datetime from
-.Ar datestr
-described in English relative to an optional
-.Ar time
-point,
-and an optional timezone offset (in minutes behind/west of UTC)
-specified in
-.Ar tzoff .
-If
-.Ar time
-is
-.Dv NULL
-then the current time is used.
-If
-.Ar tzoff
-is
-.Dv NULL ,
-then the current time zone is used.
-.Pp
-The
-.Ar datestr
-is a sequence of white-space separated items.
-The white-space is optional the concatenated items are not ambiguous.
-An empty
-.Ar datestr
-is equivalent to midnight today (the beginning of this day).
-.Pp
-The following words have the indicated numeric meanings:
-.Dv last =
-\-1,
-.Dv this =
-0,
-.Dv first, next, or one =
-1,
-.Dv second
-is unused so that it is not confused with
-.Dq seconds ,
-.Dv two =
-2,
-.Dv third or three =
-3,
-.Dv fourth or four =
-4,
-.Dv fifth or five  =
-5,
-.Dv sixth or six  =
-6,
-.Dv seventh or seven =
-7,
-.Dv eighth or eight =
-8,
-.Dv ninth or nine =
-9,
-.Dv tenth or ten =
-10,
-.Dv eleventh or eleven =
-11,
-.Dv twelfth or twelve =
-12.
-.Pp
-The following words are recognized in English only:
-.Dv AM ,
-.Dv PM ,
-.Dv a.m. ,
-.Dv p.m.
-.Pp
-The months:
-.Dv january ,
-.Dv february ,
-.Dv march ,
-.Dv april ,
-.Dv may ,
-.Dv june ,
-.Dv july ,
-.Dv august ,
-.Dv september ,
-.Dv sept ,
-.Dv october ,
-.Dv november ,
-.Dv december ,
-.Pp
-The days of the week:
-.Dv sunday ,
-.Dv monday ,
-.Dv tuesday ,
-.Dv tues ,
-.Dv wednesday ,
-.Dv wednes ,
-.Dv thursday ,
-.Dv thur ,
-.Dv thurs ,
-.Dv friday ,
-.Dv saturday .
-.Pp
-Time units:
-.Dv year ,
-.Dv month ,
-.Dv fortnight ,
-.Dv week ,
-.Dv day ,
-.Dv hour ,
-.Dv minute ,
-.Dv min ,
-.Dv second ,
-.Dv sec ,
-.Dv tomorrow ,
-.Dv yesterday .
-.Pp
-Timezone names:
-.Dv gmt ,
-.Dv ut ,
-.Dv utc ,
-.Dv wet ,
-.Dv bst ,
-.Dv wat ,
-.Dv at ,
-.Dv ast ,
-.Dv adt ,
-.Dv est ,
-.Dv edt ,
-.Dv cst ,
-.Dv cdt ,
-.Dv mst ,
-.Dv mdt ,
-.Dv pst ,
-.Dv pdt ,
-.Dv yst ,
-.Dv ydt ,
-.Dv hst ,
-.Dv hdt ,
-.Dv cat ,
-.Dv ahst ,
-.Dv nt ,
-.Dv idlw ,
-.Dv cet ,
-.Dv met ,
-.Dv mewt ,
-.Dv mest ,
-.Dv swt ,
-.Dv sst ,
-.Dv fwt ,
-.Dv fst ,
-.Dv eet ,
-.Dv bt ,
-.Dv zp4 ,
-.Dv zp5 ,
-.Dv zp6 ,
-.Dv wast ,
-.Dv wadt ,
-.Dv cct ,
-.Dv jst ,
-.Dv east ,
-.Dv eadt ,
-.Dv gst ,
-.Dv nzt ,
-.Dv nzst ,
-.Dv nzdt ,
-.Dv idle .
-.Pp
-A variety of unambiguous dates are recognized:
-.Bl -tag -compact -width "20 Jun 1994"
-.It 9/10/69
-For years between 69-99 we assume 1900+ and for years between 0-68
-we assume 2000+.
-.It 2006-11-17
-An ISO-8601 date.
-.It 69-09-10
-The year in an ISO-8601 date is always taken literally,
-so this is the year 69, not 2069.
-.It 10/1/2000
-October 10, 2000; the common US format.
-.It 20 Jun 1994
-.It 23jun2001
-.It 1-sep-06
-Other common abbreviations.
-.It 1/11
-The year can be omitted.
-This is the US month/day format.
-.El
-.Pp
-As well as times:
-.Bl -tag -compact -width 12:11:01.000012
-.It 10:01
-.It 10:12pm
-.It 12:11:01.000012
-.It 12:21-0500
-.El
-.Pp
-Relative items are also supported:
-.Bl -tag -compact -width "this thursday"
-.It -1 month
-.It last friday
-.It one week ago
-.It this thursday
-.It next sunday
-.It +2 years
-.El
-.Pp
-Seconds since epoch (also known as UNIX time) are also supported:
-.Bl -tag -compact -width "@735275209"
-.It @735275209
-Tue Apr 20 03:06:49 UTC 1993
-.El
-.Sh RETURN VALUES
-.Fn parsedate
-returns the number of seconds passed since the Epoch, or
-.Dv \-1
-if the date could not be parsed properly.
-A non-error result of
-.Dv \-1
-can be distinguished from an error by setting
-.Va errno
-to
-.Dv 0
-before calling
-.Fn parsedate ,
-and checking the value of
-.Va errno
-afterwards.
-.Sh SEE ALSO
-.Xr date 1 ,
-.Xr errno 2 ,
-.Xr eeprom 8
-.Sh HISTORY
-The parser used in
-.Fn parsedate
-was originally written by Steven M. Bellovin while at the University
-of North Carolina at Chapel Hill.
-It was later tweaked by a couple of people on Usenet.
-Completely overhauled by Rich $alz and Jim Berets in August, 1990.
-.Pp
-The
-.Fn parsedate
-function first appeared in
-.Nx 4.0 .
-.Sh BUGS
-.Bl -tag -compact -width 1
-.It 1
-The
-.Fn parsedate
-function is not re-entrant or thread-safe.
-.It 2
-The
-.Fn parsedate
-function cannot compute days before the unix epoch (19700101).
-.It 3
-The
-.Fn parsedate
-function assumes years less than 0 mean -
-.Fa year ,
-years less than 70 mean 2000 +
-.Fa year ,
-years less than 100 mean 1900 +
-.Fa year .
-.El
diff --git a/lib/libutil/parsedate.y b/lib/libutil/parsedate.y
deleted file mode 100644
index f282fd6f9..000000000
--- a/lib/libutil/parsedate.y
+++ /dev/null
@@ -1,1016 +0,0 @@
-%{
-/*
-**  Originally written by Steven M. Bellovin <smb@research.att.com> while
-**  at the University of North Carolina at Chapel Hill.  Later tweaked by
-**  a couple of people on Usenet.  Completely overhauled by Rich $alz
-**  <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990;
-**
-**  This grammar has 10 shift/reduce conflicts.
-**
-**  This code is in the public domain and has no copyright.
-*/
-/* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */
-/* SUPPRESS 288 on yyerrlab *//* Label unused */
-
-#include <sys/cdefs.h>
-#ifdef __RCSID
-__RCSID("$NetBSD: parsedate.y,v 1.20 2014/10/08 17:38:28 apb Exp $");
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <time.h>
-#include <util.h>
-#include <stdlib.h>
-
-/* NOTES on rebuilding parsedate.c (particularly for inclusion in CVS
-   releases):
-
-   We don't want to mess with all the portability hassles of alloca.
-   In particular, most (all?) versions of bison will use alloca in
-   their parser.  If bison works on your system (e.g. it should work
-   with gcc), then go ahead and use it, but the more general solution
-   is to use byacc instead of bison, which should generate a portable
-   parser.  I played with adding "#define alloca dont_use_alloca", to
-   give an error if the parser generator uses alloca (and thus detect
-   unportable parsedate.c's), but that seems to cause as many problems
-   as it solves.  */
-
-#define EPOCH		1970
-#define HOUR(x)		((time_t)(x) * 60)
-#define SECSPERDAY	(24L * 60L * 60L)
-
-#define USE_LOCAL_TIME	99999 /* special case for Convert() and yyTimezone */
-
-/*
-**  An entry in the lexical lookup table.
-*/
-typedef struct _TABLE {
-    const char	*name;
-    int		type;
-    time_t	value;
-} TABLE;
-
-
-/*
-**  Daylight-savings mode:  on, off, or not yet known.
-*/
-typedef enum _DSTMODE {
-    DSTon, DSToff, DSTmaybe
-} DSTMODE;
-
-/*
-**  Meridian:  am, pm, or 24-hour style.
-*/
-typedef enum _MERIDIAN {
-    MERam, MERpm, MER24
-} MERIDIAN;
-
-
-struct dateinfo {
-	DSTMODE	yyDSTmode;	/* DST on/off/maybe */
-	time_t	yyDayOrdinal;
-	time_t	yyDayNumber;
-	int	yyHaveDate;
-	int	yyHaveFullYear;	/* if true, year is not abbreviated. */
-				/* if false, need to call AdjustYear(). */
-	int	yyHaveDay;
-	int	yyHaveRel;
-	int	yyHaveTime;
-	int	yyHaveZone;
-	time_t	yyTimezone;	/* Timezone as minutes ahead/east of UTC */
-	time_t	yyDay;		/* Day of month [1-31] */
-	time_t	yyHour;		/* Hour of day [0-24] or [1-12] */
-	time_t	yyMinutes;	/* Minute of hour [0-59] */
-	time_t	yyMonth;	/* Month of year [1-12] */
-	time_t	yySeconds;	/* Second of minute [0-60] */
-	time_t	yyYear;		/* Year, see also yyHaveFullYear */
-	MERIDIAN yyMeridian;	/* Interpret yyHour as AM/PM/24 hour clock */
-	time_t	yyRelMonth;
-	time_t	yyRelSeconds;
-};
-%}
-
-%union {
-    time_t		Number;
-    enum _MERIDIAN	Meridian;
-}
-
-%token	tAGO tDAY tDAYZONE tID tMERIDIAN tMINUTE_UNIT tMONTH tMONTH_UNIT
-%token	tSEC_UNIT tSNUMBER tUNUMBER tZONE tDST AT_SIGN
-
-%type	<Number>	tDAY tDAYZONE tMINUTE_UNIT tMONTH tMONTH_UNIT
-%type	<Number>	tSEC_UNIT tSNUMBER tUNUMBER tZONE
-%type	<Meridian>	tMERIDIAN o_merid
-
-%parse-param	{ struct dateinfo *param }
-%parse-param 	{ const char **yyInput }
-%lex-param	{ const char **yyInput }
-%pure-parser
-
-%%
-
-spec	: /* NULL */
-	| spec item
-	;
-
-item	: time {
-	    param->yyHaveTime++;
-	}
-	| time_numericzone {
-	    param->yyHaveTime++;
-	    param->yyHaveZone++;
-	}
-	| zone {
-	    param->yyHaveZone++;
-	}
-	| date {
-	    param->yyHaveDate++;
-	}
-	| day {
-	    param->yyHaveDay++;
-	}
-	| rel {
-	    param->yyHaveRel++;
-	}
-	| cvsstamp {
-	    param->yyHaveTime++;
-	    param->yyHaveDate++;
-	    param->yyHaveZone++;
-	}
-	| epochdate {
-	    param->yyHaveTime++;
-	    param->yyHaveDate++;
-	    param->yyHaveZone++;
-	}
-	| number
-	;
-
-cvsstamp: tUNUMBER '.' tUNUMBER '.' tUNUMBER '.' tUNUMBER '.' tUNUMBER '.' tUNUMBER {
-	    param->yyYear = $1;
-	    if (param->yyYear < 100) param->yyYear += 1900;
-	    param->yyHaveFullYear = 1;
-	    param->yyMonth = $3;
-	    param->yyDay = $5;
-	    param->yyHour = $7;
-	    param->yyMinutes = $9;
-	    param->yySeconds = $11;
-	    param->yyDSTmode = DSToff;
-	    param->yyTimezone = 0;
-	}
-	;
-
-epochdate: AT_SIGN at_number {
-            time_t    when = $<Number>2;
-            struct tm tmbuf;
-            if (gmtime_r(&when, &tmbuf) != NULL) {
-		param->yyYear = tmbuf.tm_year + 1900;
-		param->yyMonth = tmbuf.tm_mon + 1;
-		param->yyDay = tmbuf.tm_mday;
-
-		param->yyHour = tmbuf.tm_hour;
-		param->yyMinutes = tmbuf.tm_min;
-		param->yySeconds = tmbuf.tm_sec;
-	    } else {
-		param->yyYear = EPOCH;
-		param->yyMonth = 1;
-		param->yyDay = 1;
-
-		param->yyHour = 0;
-		param->yyMinutes = 0;
-		param->yySeconds = 0;
-	    }
-	    param->yyHaveFullYear = 1;
-	    param->yyDSTmode = DSToff;
-	    param->yyTimezone = 0;
-	}
-	;
-
-at_number : tUNUMBER | tSNUMBER ;
-
-time	: tUNUMBER tMERIDIAN {
-	    param->yyHour = $1;
-	    param->yyMinutes = 0;
-	    param->yySeconds = 0;
-	    param->yyMeridian = $2;
-	}
-	| tUNUMBER ':' tUNUMBER o_merid {
-	    param->yyHour = $1;
-	    param->yyMinutes = $3;
-	    param->yySeconds = 0;
-	    param->yyMeridian = $4;
-	}
-	| tUNUMBER ':' tUNUMBER ':' tUNUMBER o_merid {
-	    param->yyHour = $1;
-	    param->yyMinutes = $3;
-	    param->yySeconds = $5;
-	    param->yyMeridian = $6;
-	}
-	| tUNUMBER ':' tUNUMBER ':' tUNUMBER '.' tUNUMBER {
-	    param->yyHour = $1;
-	    param->yyMinutes = $3;
-	    param->yySeconds = $5;
-	    param->yyMeridian = MER24;
-/* XXX: Do nothing with millis */
-	}
-	;
-
-time_numericzone : tUNUMBER ':' tUNUMBER tSNUMBER {
-	    param->yyHour = $1;
-	    param->yyMinutes = $3;
-	    param->yyMeridian = MER24;
-	    param->yyDSTmode = DSToff;
-	    param->yyTimezone = - ($4 % 100 + ($4 / 100) * 60);
-	}
-	| tUNUMBER ':' tUNUMBER ':' tUNUMBER tSNUMBER {
-	    param->yyHour = $1;
-	    param->yyMinutes = $3;
-	    param->yySeconds = $5;
-	    param->yyMeridian = MER24;
-	    param->yyDSTmode = DSToff;
-	    param->yyTimezone = - ($6 % 100 + ($6 / 100) * 60);
-	}
-	;
-
-zone	: tZONE {
-	    param->yyTimezone = $1;
-	    param->yyDSTmode = DSToff;
-	}
-	| tDAYZONE {
-	    param->yyTimezone = $1;
-	    param->yyDSTmode = DSTon;
-	}
-	|
-	  tZONE tDST {
-	    param->yyTimezone = $1;
-	    param->yyDSTmode = DSTon;
-	}
-	;
-
-day	: tDAY {
-	    param->yyDayOrdinal = 1;
-	    param->yyDayNumber = $1;
-	}
-	| tDAY ',' {
-	    param->yyDayOrdinal = 1;
-	    param->yyDayNumber = $1;
-	}
-	| tUNUMBER tDAY {
-	    param->yyDayOrdinal = $1;
-	    param->yyDayNumber = $2;
-	}
-	;
-
-date	: tUNUMBER '/' tUNUMBER {
-	    param->yyMonth = $1;
-	    param->yyDay = $3;
-	}
-	| tUNUMBER '/' tUNUMBER '/' tUNUMBER {
-	    if ($1 >= 100) {
-		param->yyYear = $1;
-		param->yyMonth = $3;
-		param->yyDay = $5;
-	    } else {
-		param->yyMonth = $1;
-		param->yyDay = $3;
-		param->yyYear = $5;
-	    }
-	}
-	| tUNUMBER tSNUMBER tSNUMBER {
-	    /* ISO 8601 format.  yyyy-mm-dd.  */
-	    param->yyYear = $1;
-	    param->yyHaveFullYear = 1;
-	    param->yyMonth = -$2;
-	    param->yyDay = -$3;
-	}
-	| tUNUMBER tMONTH tSNUMBER {
-	    /* e.g. 17-JUN-1992.  */
-	    param->yyDay = $1;
-	    param->yyMonth = $2;
-	    param->yyYear = -$3;
-	}
-	| tMONTH tUNUMBER {
-	    param->yyMonth = $1;
-	    param->yyDay = $2;
-	}
-	| tMONTH tUNUMBER ',' tUNUMBER {
-	    param->yyMonth = $1;
-	    param->yyDay = $2;
-	    param->yyYear = $4;
-	}
-	| tUNUMBER tMONTH {
-	    param->yyMonth = $2;
-	    param->yyDay = $1;
-	}
-	| tUNUMBER tMONTH tUNUMBER {
-	    param->yyMonth = $2;
-	    param->yyDay = $1;
-	    param->yyYear = $3;
-	}
-	;
-
-rel	: relunit tAGO {
-	    param->yyRelSeconds = -param->yyRelSeconds;
-	    param->yyRelMonth = -param->yyRelMonth;
-	}
-	| relunit
-	;
-
-relunit	: tUNUMBER tMINUTE_UNIT {
-	    param->yyRelSeconds += $1 * $2 * 60L;
-	}
-	| tSNUMBER tMINUTE_UNIT {
-	    param->yyRelSeconds += $1 * $2 * 60L;
-	}
-	| tMINUTE_UNIT {
-	    param->yyRelSeconds += $1 * 60L;
-	}
-	| tSNUMBER tSEC_UNIT {
-	    param->yyRelSeconds += $1;
-	}
-	| tUNUMBER tSEC_UNIT {
-	    param->yyRelSeconds += $1;
-	}
-	| tSEC_UNIT {
-	    param->yyRelSeconds++;
-	}
-	| tSNUMBER tMONTH_UNIT {
-	    param->yyRelMonth += $1 * $2;
-	}
-	| tUNUMBER tMONTH_UNIT {
-	    param->yyRelMonth += $1 * $2;
-	}
-	| tMONTH_UNIT {
-	    param->yyRelMonth += $1;
-	}
-	;
-
-number	: tUNUMBER {
-	    if (param->yyHaveTime && param->yyHaveDate && !param->yyHaveRel)
-		param->yyYear = $1;
-	    else {
-		if($1>10000) {
-		    param->yyHaveDate++;
-		    param->yyDay= ($1)%100;
-		    param->yyMonth= ($1/100)%100;
-		    param->yyYear = $1/10000;
-		}
-		else {
-		    param->yyHaveTime++;
-		    if ($1 < 100) {
-			param->yyHour = $1;
-			param->yyMinutes = 0;
-		    }
-		    else {
-		    	param->yyHour = $1 / 100;
-		    	param->yyMinutes = $1 % 100;
-		    }
-		    param->yySeconds = 0;
-		    param->yyMeridian = MER24;
-	        }
-	    }
-	}
-	;
-
-o_merid	: /* NULL */ {
-	    $$ = MER24;
-	}
-	| tMERIDIAN {
-	    $$ = $1;
-	}
-	;
-
-%%
-
-/* Month and day table. */
-static const TABLE MonthDayTable[] = {
-    { "january",	tMONTH,  1 },
-    { "february",	tMONTH,  2 },
-    { "march",		tMONTH,  3 },
-    { "april",		tMONTH,  4 },
-    { "may",		tMONTH,  5 },
-    { "june",		tMONTH,  6 },
-    { "july",		tMONTH,  7 },
-    { "august",		tMONTH,  8 },
-    { "september",	tMONTH,  9 },
-    { "sept",		tMONTH,  9 },
-    { "october",	tMONTH, 10 },
-    { "november",	tMONTH, 11 },
-    { "december",	tMONTH, 12 },
-    { "sunday",		tDAY, 0 },
-    { "monday",		tDAY, 1 },
-    { "tuesday",	tDAY, 2 },
-    { "tues",		tDAY, 2 },
-    { "wednesday",	tDAY, 3 },
-    { "wednes",		tDAY, 3 },
-    { "thursday",	tDAY, 4 },
-    { "thur",		tDAY, 4 },
-    { "thurs",		tDAY, 4 },
-    { "friday",		tDAY, 5 },
-    { "saturday",	tDAY, 6 },
-    { NULL,		0,    0 }
-};
-
-/* Time units table. */
-static const TABLE UnitsTable[] = {
-    { "year",		tMONTH_UNIT,	12 },
-    { "month",		tMONTH_UNIT,	1 },
-    { "fortnight",	tMINUTE_UNIT,	14 * 24 * 60 },
-    { "week",		tMINUTE_UNIT,	7 * 24 * 60 },
-    { "day",		tMINUTE_UNIT,	1 * 24 * 60 },
-    { "hour",		tMINUTE_UNIT,	60 },
-    { "minute",		tMINUTE_UNIT,	1 },
-    { "min",		tMINUTE_UNIT,	1 },
-    { "second",		tSEC_UNIT,	1 },
-    { "sec",		tSEC_UNIT,	1 },
-    { NULL,		0,		0 }
-};
-
-/* Assorted relative-time words. */
-static const TABLE OtherTable[] = {
-    { "tomorrow",	tMINUTE_UNIT,	1 * 24 * 60 },
-    { "yesterday",	tMINUTE_UNIT,	-1 * 24 * 60 },
-    { "today",		tMINUTE_UNIT,	0 },
-    { "now",		tMINUTE_UNIT,	0 },
-    { "last",		tUNUMBER,	-1 },
-    { "this",		tMINUTE_UNIT,	0 },
-    { "next",		tUNUMBER,	2 },
-    { "first",		tUNUMBER,	1 },
-    { "one",		tUNUMBER,	1 },
-/*  { "second",		tUNUMBER,	2 }, */
-    { "two",		tUNUMBER,	2 },
-    { "third",		tUNUMBER,	3 },
-    { "three",		tUNUMBER,	3 },
-    { "fourth",		tUNUMBER,	4 },
-    { "four",		tUNUMBER,	4 },
-    { "fifth",		tUNUMBER,	5 },
-    { "five",		tUNUMBER,	5 },
-    { "sixth",		tUNUMBER,	6 },
-    { "six",		tUNUMBER,	6 },
-    { "seventh",	tUNUMBER,	7 },
-    { "seven",		tUNUMBER,	7 },
-    { "eighth",		tUNUMBER,	8 },
-    { "eight",		tUNUMBER,	8 },
-    { "ninth",		tUNUMBER,	9 },
-    { "nine",		tUNUMBER,	9 },
-    { "tenth",		tUNUMBER,	10 },
-    { "ten",		tUNUMBER,	10 },
-    { "eleventh",	tUNUMBER,	11 },
-    { "eleven",		tUNUMBER,	11 },
-    { "twelfth",	tUNUMBER,	12 },
-    { "twelve",		tUNUMBER,	12 },
-    { "ago",		tAGO,	1 },
-    { NULL,		0,	0 }
-};
-
-/* The timezone table. */
-/* Some of these are commented out because a time_t can't store a float. */
-static const TABLE TimezoneTable[] = {
-    { "gmt",	tZONE,     HOUR( 0) },	/* Greenwich Mean */
-    { "ut",	tZONE,     HOUR( 0) },	/* Universal (Coordinated) */
-    { "utc",	tZONE,     HOUR( 0) },
-    { "wet",	tZONE,     HOUR( 0) },	/* Western European */
-    { "bst",	tDAYZONE,  HOUR( 0) },	/* British Summer */
-    { "wat",	tZONE,     HOUR( 1) },	/* West Africa */
-    { "at",	tZONE,     HOUR( 2) },	/* Azores */
-#if	0
-    /* For completeness.  BST is also British Summer, and GST is
-     * also Guam Standard. */
-    { "bst",	tZONE,     HOUR( 3) },	/* Brazil Standard */
-    { "gst",	tZONE,     HOUR( 3) },	/* Greenland Standard */
-#endif
-#if 0
-    { "nft",	tZONE,     HOUR(3.5) },	/* Newfoundland */
-    { "nst",	tZONE,     HOUR(3.5) },	/* Newfoundland Standard */
-    { "ndt",	tDAYZONE,  HOUR(3.5) },	/* Newfoundland Daylight */
-#endif
-    { "ast",	tZONE,     HOUR( 4) },	/* Atlantic Standard */
-    { "adt",	tDAYZONE,  HOUR( 4) },	/* Atlantic Daylight */
-    { "est",	tZONE,     HOUR( 5) },	/* Eastern Standard */
-    { "edt",	tDAYZONE,  HOUR( 5) },	/* Eastern Daylight */
-    { "cst",	tZONE,     HOUR( 6) },	/* Central Standard */
-    { "cdt",	tDAYZONE,  HOUR( 6) },	/* Central Daylight */
-    { "mst",	tZONE,     HOUR( 7) },	/* Mountain Standard */
-    { "mdt",	tDAYZONE,  HOUR( 7) },	/* Mountain Daylight */
-    { "pst",	tZONE,     HOUR( 8) },	/* Pacific Standard */
-    { "pdt",	tDAYZONE,  HOUR( 8) },	/* Pacific Daylight */
-    { "yst",	tZONE,     HOUR( 9) },	/* Yukon Standard */
-    { "ydt",	tDAYZONE,  HOUR( 9) },	/* Yukon Daylight */
-    { "hst",	tZONE,     HOUR(10) },	/* Hawaii Standard */
-    { "hdt",	tDAYZONE,  HOUR(10) },	/* Hawaii Daylight */
-    { "cat",	tZONE,     HOUR(10) },	/* Central Alaska */
-    { "ahst",	tZONE,     HOUR(10) },	/* Alaska-Hawaii Standard */
-    { "nt",	tZONE,     HOUR(11) },	/* Nome */
-    { "idlw",	tZONE,     HOUR(12) },	/* International Date Line West */
-    { "cet",	tZONE,     -HOUR(1) },	/* Central European */
-    { "met",	tZONE,     -HOUR(1) },	/* Middle European */
-    { "mewt",	tZONE,     -HOUR(1) },	/* Middle European Winter */
-    { "mest",	tDAYZONE,  -HOUR(1) },	/* Middle European Summer */
-    { "swt",	tZONE,     -HOUR(1) },	/* Swedish Winter */
-    { "sst",	tDAYZONE,  -HOUR(1) },	/* Swedish Summer */
-    { "fwt",	tZONE,     -HOUR(1) },	/* French Winter */
-    { "fst",	tDAYZONE,  -HOUR(1) },	/* French Summer */
-    { "eet",	tZONE,     -HOUR(2) },	/* Eastern Europe, USSR Zone 1 */
-    { "bt",	tZONE,     -HOUR(3) },	/* Baghdad, USSR Zone 2 */
-#if 0
-    { "it",	tZONE,     -HOUR(3.5) },/* Iran */
-#endif
-    { "zp4",	tZONE,     -HOUR(4) },	/* USSR Zone 3 */
-    { "zp5",	tZONE,     -HOUR(5) },	/* USSR Zone 4 */
-#if 0
-    { "ist",	tZONE,     -HOUR(5.5) },/* Indian Standard */
-#endif
-    { "zp6",	tZONE,     -HOUR(6) },	/* USSR Zone 5 */
-#if	0
-    /* For completeness.  NST is also Newfoundland Stanard, and SST is
-     * also Swedish Summer. */
-    { "nst",	tZONE,     -HOUR(6.5) },/* North Sumatra */
-    { "sst",	tZONE,     -HOUR(7) },	/* South Sumatra, USSR Zone 6 */
-#endif	/* 0 */
-    { "wast",	tZONE,     -HOUR(7) },	/* West Australian Standard */
-    { "wadt",	tDAYZONE,  -HOUR(7) },	/* West Australian Daylight */
-#if 0
-    { "jt",	tZONE,     -HOUR(7.5) },/* Java (3pm in Cronusland!) */
-#endif
-    { "cct",	tZONE,     -HOUR(8) },	/* China Coast, USSR Zone 7 */
-    { "jst",	tZONE,     -HOUR(9) },	/* Japan Standard, USSR Zone 8 */
-#if 0
-    { "cast",	tZONE,     -HOUR(9.5) },/* Central Australian Standard */
-    { "cadt",	tDAYZONE,  -HOUR(9.5) },/* Central Australian Daylight */
-#endif
-    { "east",	tZONE,     -HOUR(10) },	/* Eastern Australian Standard */
-    { "eadt",	tDAYZONE,  -HOUR(10) },	/* Eastern Australian Daylight */
-    { "gst",	tZONE,     -HOUR(10) },	/* Guam Standard, USSR Zone 9 */
-    { "nzt",	tZONE,     -HOUR(12) },	/* New Zealand */
-    { "nzst",	tZONE,     -HOUR(12) },	/* New Zealand Standard */
-    { "nzdt",	tDAYZONE,  -HOUR(12) },	/* New Zealand Daylight */
-    { "idle",	tZONE,     -HOUR(12) },	/* International Date Line East */
-    {  NULL,	0,	    0 }
-};
-
-/* Military timezone table. */
-static const TABLE MilitaryTable[] = {
-    { "a",	tZONE,	HOUR(  1) },
-    { "b",	tZONE,	HOUR(  2) },
-    { "c",	tZONE,	HOUR(  3) },
-    { "d",	tZONE,	HOUR(  4) },
-    { "e",	tZONE,	HOUR(  5) },
-    { "f",	tZONE,	HOUR(  6) },
-    { "g",	tZONE,	HOUR(  7) },
-    { "h",	tZONE,	HOUR(  8) },
-    { "i",	tZONE,	HOUR(  9) },
-    { "k",	tZONE,	HOUR( 10) },
-    { "l",	tZONE,	HOUR( 11) },
-    { "m",	tZONE,	HOUR( 12) },
-    { "n",	tZONE,	HOUR(- 1) },
-    { "o",	tZONE,	HOUR(- 2) },
-    { "p",	tZONE,	HOUR(- 3) },
-    { "q",	tZONE,	HOUR(- 4) },
-    { "r",	tZONE,	HOUR(- 5) },
-    { "s",	tZONE,	HOUR(- 6) },
-    { "t",	tZONE,	HOUR(- 7) },
-    { "u",	tZONE,	HOUR(- 8) },
-    { "v",	tZONE,	HOUR(- 9) },
-    { "w",	tZONE,	HOUR(-10) },
-    { "x",	tZONE,	HOUR(-11) },
-    { "y",	tZONE,	HOUR(-12) },
-    { "z",	tZONE,	HOUR(  0) },
-    { NULL,	0,	0 }
-};
-
-
-
-
-/* ARGSUSED */
-static int
-yyerror(struct dateinfo *param, const char **inp, const char *s __unused)
-{
-  return 0;
-}
-
-
-/* Adjust year from a value that might be abbreviated, to a full value.
- * e.g. convert 70 to 1970.
- * Input Year is either:
- *  - A negative number, which means to use its absolute value (why?)
- *  - A number from 0 to 99, which means a year from 1900 to 1999, or
- *  - The actual year (>=100).
- * Returns the full year. */
-static time_t
-AdjustYear(time_t Year)
-{
-    /* XXX Y2K */
-    if (Year < 0)
-	Year = -Year;
-    if (Year < 70)
-	Year += 2000;
-    else if (Year < 100)
-	Year += 1900;
-    return Year;
-}
-
-static time_t
-Convert(
-    time_t	Month,		/* month of year [1-12] */
-    time_t	Day,		/* day of month [1-31] */
-    time_t	Year,		/* year, not abbreviated in any way */
-    time_t	Hours,		/* Hour of day [0-24] */
-    time_t	Minutes,	/* Minute of hour [0-59] */
-    time_t	Seconds,	/* Second of minute [0-60] */
-    time_t	Timezone,	/* Timezone as minutes east of UTC,
-				 * or USE_LOCAL_TIME special case */
-    MERIDIAN	Meridian,	/* Hours are am/pm/24 hour clock */
-    DSTMODE	DSTmode		/* DST on/off/maybe */
-)
-{
-    struct tm tm = {.tm_sec = 0};
-    time_t result;
-
-    tm.tm_sec = Seconds;
-    tm.tm_min = Minutes;
-    tm.tm_hour = Hours + (Meridian == MERpm ? 12 : 0);
-    tm.tm_mday = Day;
-    tm.tm_mon = Month - 1;
-    tm.tm_year = Year - 1900;
-    switch (DSTmode) {
-    case DSTon:  tm.tm_isdst = 1; break;
-    case DSToff: tm.tm_isdst = 0; break;
-    default:     tm.tm_isdst = -1; break;
-    }
-
-    if (Timezone == USE_LOCAL_TIME) {
-	    result = mktime(&tm);
-    } else {
-	    /* We rely on mktime_z(NULL, ...) working in UTC */
-	    result = mktime_z(NULL, &tm);
-	    result += Timezone * 60;
-    }
-
-#if PARSEDATE_DEBUG
-    fprintf(stderr, "%s(M=%jd D=%jd Y=%jd H=%jd M=%jd S=%jd Z=%jd"
-		    " mer=%d DST=%d)",
-	__func__,
-	(intmax_t)Month, (intmax_t)Day, (intmax_t)Year,
-	(intmax_t)Hours, (intmax_t)Minutes, (intmax_t)Seconds,
-	(intmax_t)Timezone, (int)Meridian, (int)DSTmode);
-    fprintf(stderr, " -> %jd", (intmax_t)result);
-    fprintf(stderr, " %s", ctime(&result));
-#endif
-
-    return result;
-}
-
-
-static time_t
-DSTcorrect(
-    time_t	Start,
-    time_t	Future
-)
-{
-    time_t	StartDay;
-    time_t	FutureDay;
-    struct tm  *tm;
-
-    if ((tm = localtime(&Start)) == NULL)
-	return -1;
-    StartDay = (tm->tm_hour + 1) % 24;
-
-    if ((tm = localtime(&Future)) == NULL)
-	return -1;
-    FutureDay = (tm->tm_hour + 1) % 24;
-
-    return (Future - Start) + (StartDay - FutureDay) * 60L * 60L;
-}
-
-
-static time_t
-RelativeDate(
-    time_t	Start,
-    time_t	DayOrdinal,
-    time_t	DayNumber
-)
-{
-    struct tm	*tm;
-    time_t	now;
-
-    now = Start;
-    tm = localtime(&now);
-    now += SECSPERDAY * ((DayNumber - tm->tm_wday + 7) % 7);
-    now += 7 * SECSPERDAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1);
-    return DSTcorrect(Start, now);
-}
-
-
-static time_t
-RelativeMonth(
-    time_t	Start,
-    time_t	RelMonth,
-    time_t	Timezone
-)
-{
-    struct tm	*tm;
-    time_t	Month;
-    time_t	Year;
-
-    if (RelMonth == 0)
-	return 0;
-    tm = localtime(&Start);
-    if (tm == NULL)
-	return -1;
-    Month = 12 * (tm->tm_year + 1900) + tm->tm_mon + RelMonth;
-    Year = Month / 12;
-    Month = Month % 12 + 1;
-    return DSTcorrect(Start,
-	    Convert(Month, (time_t)tm->tm_mday, Year,
-		(time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec,
-		Timezone, MER24, DSTmaybe));
-}
-
-
-static int
-LookupWord(YYSTYPE *yylval, char *buff)
-{
-    register char	*p;
-    register char	*q;
-    register const TABLE	*tp;
-    int			i;
-    int			abbrev;
-
-    /* Make it lowercase. */
-    for (p = buff; *p; p++)
-	if (isupper((unsigned char)*p))
-	    *p = tolower((unsigned char)*p);
-
-    if (strcmp(buff, "am") == 0 || strcmp(buff, "a.m.") == 0) {
-	yylval->Meridian = MERam;
-	return tMERIDIAN;
-    }
-    if (strcmp(buff, "pm") == 0 || strcmp(buff, "p.m.") == 0) {
-	yylval->Meridian = MERpm;
-	return tMERIDIAN;
-    }
-
-    /* See if we have an abbreviation for a month. */
-    if (strlen(buff) == 3)
-	abbrev = 1;
-    else if (strlen(buff) == 4 && buff[3] == '.') {
-	abbrev = 1;
-	buff[3] = '\0';
-    }
-    else
-	abbrev = 0;
-
-    for (tp = MonthDayTable; tp->name; tp++) {
-	if (abbrev) {
-	    if (strncmp(buff, tp->name, 3) == 0) {
-		yylval->Number = tp->value;
-		return tp->type;
-	    }
-	}
-	else if (strcmp(buff, tp->name) == 0) {
-	    yylval->Number = tp->value;
-	    return tp->type;
-	}
-    }
-
-    for (tp = TimezoneTable; tp->name; tp++)
-	if (strcmp(buff, tp->name) == 0) {
-	    yylval->Number = tp->value;
-	    return tp->type;
-	}
-
-    if (strcmp(buff, "dst") == 0) 
-	return tDST;
-
-    for (tp = UnitsTable; tp->name; tp++)
-	if (strcmp(buff, tp->name) == 0) {
-	    yylval->Number = tp->value;
-	    return tp->type;
-	}
-
-    /* Strip off any plural and try the units table again. */
-    i = strlen(buff) - 1;
-    if (buff[i] == 's') {
-	buff[i] = '\0';
-	for (tp = UnitsTable; tp->name; tp++)
-	    if (strcmp(buff, tp->name) == 0) {
-		yylval->Number = tp->value;
-		return tp->type;
-	    }
-	buff[i] = 's';		/* Put back for "this" in OtherTable. */
-    }
-
-    for (tp = OtherTable; tp->name; tp++)
-	if (strcmp(buff, tp->name) == 0) {
-	    yylval->Number = tp->value;
-	    return tp->type;
-	}
-
-    /* Military timezones. */
-    if (buff[1] == '\0' && isalpha((unsigned char)*buff)) {
-	for (tp = MilitaryTable; tp->name; tp++)
-	    if (strcmp(buff, tp->name) == 0) {
-		yylval->Number = tp->value;
-		return tp->type;
-	    }
-    }
-
-    /* Drop out any periods and try the timezone table again. */
-    for (i = 0, p = q = buff; *q; q++)
-	if (*q != '.')
-	    *p++ = *q;
-	else
-	    i++;
-    *p = '\0';
-    if (i)
-	for (tp = TimezoneTable; tp->name; tp++)
-	    if (strcmp(buff, tp->name) == 0) {
-		yylval->Number = tp->value;
-		return tp->type;
-	    }
-
-    return tID;
-}
-
-
-static int
-yylex(YYSTYPE *yylval, const char **yyInput)
-{
-    register char	c;
-    register char	*p;
-    char		buff[20];
-    int			Count;
-    int			sign;
-    const char		*inp = *yyInput;
-
-    for ( ; ; ) {
-	while (isspace((unsigned char)*inp))
-	    inp++;
-
-	if (isdigit((unsigned char)(c = *inp)) || c == '-' || c == '+') {
-	    if (c == '-' || c == '+') {
-		sign = c == '-' ? -1 : 1;
-		if (!isdigit((unsigned char)*++inp))
-		    /* skip the '-' sign */
-		    continue;
-	    }
-	    else
-		sign = 0;
-	    for (yylval->Number = 0; isdigit((unsigned char)(c = *inp++)); )
-		yylval->Number = 10 * yylval->Number + c - '0';
-	    if (sign < 0)
-		yylval->Number = -yylval->Number;
-	    *yyInput = --inp;
-	    return sign ? tSNUMBER : tUNUMBER;
-	}
-	if (isalpha((unsigned char)c)) {
-	    for (p = buff; isalpha((unsigned char)(c = *inp++)) || c == '.'; )
-		if (p < &buff[sizeof buff - 1])
-		    *p++ = c;
-	    *p = '\0';
-	    *yyInput = --inp;
-	    return LookupWord(yylval, buff);
-	}
-	if (c == '@') {
-	    *yyInput = ++inp;
-	    return AT_SIGN;
-	}
-	if (c != '(') {
-	    *yyInput = ++inp;
-	    return c;
-	}
-	Count = 0;
-	do {
-	    c = *inp++;
-	    if (c == '\0')
-		return c;
-	    if (c == '(')
-		Count++;
-	    else if (c == ')')
-		Count--;
-	} while (Count > 0);
-    }
-}
-
-#define TM_YEAR_ORIGIN 1900
-
-time_t
-parsedate(const char *p, const time_t *now, const int *zone)
-{
-    struct tm		local, *tm;
-    time_t		nowt;
-    int			zonet;
-    time_t		Start;
-    time_t		tod, rm;
-    struct dateinfo	param;
-    int			saved_errno;
-    
-    saved_errno = errno;
-    errno = 0;
-
-    if (now == NULL) {
-        now = &nowt;
-	(void)time(&nowt);
-    }
-    if (zone == NULL) {
-	zone = &zonet;
-	zonet = USE_LOCAL_TIME;
-	if ((tm = localtime_r(now, &local)) == NULL)
-	    return -1;
-    } else {
-	/*
-	 * Should use the specified zone, not localtime.
-	 * Fake it using gmtime and arithmetic.
-	 * This is good enough because we use only the year/month/day,
-	 * not other fields of struct tm.
-	 */
-	time_t fake = *now + (*zone * 60);
-	if ((tm = gmtime_r(&fake, &local)) == NULL)
-	    return -1;
-    }
-    param.yyYear = tm->tm_year + 1900;
-    param.yyMonth = tm->tm_mon + 1;
-    param.yyDay = tm->tm_mday;
-    param.yyTimezone = *zone;
-    param.yyDSTmode = DSTmaybe;
-    param.yyHour = 0;
-    param.yyMinutes = 0;
-    param.yySeconds = 0;
-    param.yyMeridian = MER24;
-    param.yyRelSeconds = 0;
-    param.yyRelMonth = 0;
-    param.yyHaveDate = 0;
-    param.yyHaveFullYear = 0;
-    param.yyHaveDay = 0;
-    param.yyHaveRel = 0;
-    param.yyHaveTime = 0;
-    param.yyHaveZone = 0;
-
-    if (yyparse(&param, &p) || param.yyHaveTime > 1 || param.yyHaveZone > 1 ||
-	param.yyHaveDate > 1 || param.yyHaveDay > 1) {
-	errno = EINVAL;
-	return -1;
-    }
-
-    if (param.yyHaveDate || param.yyHaveTime || param.yyHaveDay) {
-	if (! param.yyHaveFullYear) {
-		param.yyYear = AdjustYear(param.yyYear);
-		param.yyHaveFullYear = 1;
-	}
-	Start = Convert(param.yyMonth, param.yyDay, param.yyYear, param.yyHour,
-	    param.yyMinutes, param.yySeconds, param.yyTimezone,
-	    param.yyMeridian, param.yyDSTmode);
-	if (Start == -1 && errno != 0)
-	    return -1;
-    }
-    else {
-	Start = *now;
-	if (!param.yyHaveRel)
-	    Start -= ((tm->tm_hour * 60L + tm->tm_min) * 60L) + tm->tm_sec;
-    }
-
-    Start += param.yyRelSeconds;
-    rm = RelativeMonth(Start, param.yyRelMonth, param.yyTimezone);
-    if (rm == -1 && errno != 0)
-	return -1;
-    Start += rm;
-
-    if (param.yyHaveDay && !param.yyHaveDate) {
-	tod = RelativeDate(Start, param.yyDayOrdinal, param.yyDayNumber);
-	Start += tod;
-    }
-
-    if (errno == 0)
-	errno = saved_errno;
-    return Start;
-}
-
-
-#if	defined(TEST)
-
-/* ARGSUSED */
-int
-main(int ac, char *av[])
-{
-    char	buff[128];
-    time_t	d;
-
-    (void)printf("Enter date, or blank line to exit.\n\t> ");
-    (void)fflush(stdout);
-    while (fgets(buff, sizeof(buff), stdin) && buff[0] != '\n') {
-	errno = 0;
-	d = parsedate(buff, NULL, NULL);
-	if (d == -1 && errno != 0)
-	    (void)printf("Bad format - couldn't convert: %s\n",
-	        strerror(errno));
-	else
-	    (void)printf("%jd\t%s", (intmax_t)d, ctime(&d));
-	(void)printf("\t> ");
-	(void)fflush(stdout);
-    }
-    exit(0);
-    /* NOTREACHED */
-}
-#endif	/* defined(TEST) */
diff --git a/lib/libutil/passwd.c b/lib/libutil/passwd.c
deleted file mode 100644
index 9cc1d481a..000000000
--- a/lib/libutil/passwd.c
+++ /dev/null
@@ -1,661 +0,0 @@
-/*	$NetBSD: passwd.c,v 1.52 2012/06/25 22:32:47 abs Exp $	*/
-
-/*
- * Copyright (c) 1987, 1993, 1994, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: passwd.c,v 1.52 2012/06/25 22:32:47 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/wait.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <paths.h>
-#include <pwd.h>
-#include <grp.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <util.h>
-
-static const char      *pw_filename(const char *filename);
-static void		pw_cont(int sig);
-static const char *	pw_equal(char *buf, struct passwd *old_pw);
-static const char      *pw_default(const char *option);
-static int		read_line(FILE *fp, char *line, int max);
-static void		trim_whitespace(char *line);
-
-static	char	pw_prefix[MAXPATHLEN];
-
-const char *
-pw_getprefix(void)
-{
-
-	return(pw_prefix);
-}
-
-int
-pw_setprefix(const char *new_prefix)
-{
-	size_t length;
-
-	_DIAGASSERT(new_prefix != NULL);
-
-	length = strlen(new_prefix);
-	if (length < sizeof(pw_prefix)) {
-		(void)strcpy(pw_prefix, new_prefix);
-		while (length > 0 && pw_prefix[length - 1] == '/')
-			pw_prefix[--length] = '\0';
-		return(0);
-	}
-	errno = ENAMETOOLONG;
-	return(-1);
-}
-
-static const char *
-pw_filename(const char *filename)
-{
-	static char newfilename[MAXPATHLEN];
-
-	_DIAGASSERT(filename != NULL);
-
-	if (pw_prefix[0] == '\0')
-		return filename;
-
-	if (strlen(pw_prefix) + strlen(filename) < sizeof(newfilename))
-		return strcat(strcpy(newfilename, pw_prefix), filename);
-
-	errno = ENAMETOOLONG;
-	return(NULL);
-}
-
-int
-pw_lock(int retries)
-{
-	const char *filename;
-	int i, fd;
-	mode_t old_mode;
-	int oerrno;
-
-	/* Acquire the lock file. */
-	filename = pw_filename(_PATH_MASTERPASSWD_LOCK);
-	if (filename == NULL)
-		return(-1);
-	old_mode = umask(0);
-	fd = open(filename, O_WRONLY|O_CREAT|O_EXCL, 0600);
-	for (i = 0; i < retries && fd < 0 && errno == EEXIST; i++) {
-		sleep(1);
-		fd = open(filename, O_WRONLY|O_CREAT|O_EXCL,
-			  0600);
-	}
-	oerrno = errno;
-	(void)umask(old_mode);
-	errno = oerrno;
-	return(fd);
-}
-
-int
-pw_mkdb(const char *username, int secureonly)
-{
-	const char *args[9];
-	int pstat, i;
-	pid_t pid;
-
-	pid = vfork();
-	if (pid == -1)
-		return -1;
-
-	if (pid == 0) {
-		args[0] = "pwd_mkdb";
-		args[1] = "-d";
-		args[2] = pw_prefix;
-		args[3] = "-pl";
-		i = 4;
-
-		if (secureonly)
-			args[i++] = "-s";
-		if (username != NULL) {
-			args[i++] = "-u";
-			args[i++] = username;
-		}
-
-		args[i++] = pw_filename(_PATH_MASTERPASSWD_LOCK);
-		args[i] = NULL;
-		execv(_PATH_PWD_MKDB, (char * const *)__UNCONST(args));
-		_exit(1);
-	}
-	pid = waitpid(pid, &pstat, 0);
-	if (pid == -1) {
-		warn("error waiting for pid %lu", (unsigned long)pid);
-		return -1;
-	}
-	if (WIFEXITED(pstat)) {
-		if (WEXITSTATUS(pstat) != 0) {
-			warnx("pwd_mkdb exited with status %d",
-			    WEXITSTATUS(pstat));
-			return -1;
-		}
-	} else if (WIFSIGNALED(pstat)) {
-		warnx("pwd_mkdb exited with signal %d", WTERMSIG(pstat));
-		return -1;
-	}
-	return 0;
-}
-
-int
-pw_abort(void)
-{
-	const char *filename;
-
-	filename = pw_filename(_PATH_MASTERPASSWD_LOCK);
-	return((filename == NULL) ? -1 : unlink(filename));
-}
-
-/* Everything below this point is intended for the convenience of programs
- * which allow a user to interactively edit the passwd file.  Errors in the
- * routines below will cause the process to abort. */
-
-static pid_t editpid = -1;
-
-static void
-pw_cont(int sig)
-{
-
-	if (editpid != -1)
-		kill(editpid, sig);
-}
-
-void
-pw_init(void)
-{
-	struct rlimit rlim;
-
-	/* Unlimited resource limits. */
-	rlim.rlim_cur = rlim.rlim_max = RLIM_INFINITY;
-	(void)setrlimit(RLIMIT_CPU, &rlim);
-	(void)setrlimit(RLIMIT_FSIZE, &rlim);
-	(void)setrlimit(RLIMIT_STACK, &rlim);
-	(void)setrlimit(RLIMIT_DATA, &rlim);
-	(void)setrlimit(RLIMIT_RSS, &rlim);
-
-	/* Don't drop core (not really necessary, but GP's). */
-	rlim.rlim_cur = rlim.rlim_max = 0;
-	(void)setrlimit(RLIMIT_CORE, &rlim);
-
-	/* Turn off signals. */
-	(void)signal(SIGALRM, SIG_IGN);
-	(void)signal(SIGHUP, SIG_IGN);
-	(void)signal(SIGINT, SIG_IGN);
-	(void)signal(SIGPIPE, SIG_IGN);
-	(void)signal(SIGQUIT, SIG_IGN);
-	(void)signal(SIGTERM, SIG_IGN);
-	(void)signal(SIGCONT, pw_cont);
-}
-
-void
-pw_edit(int notsetuid, const char *filename)
-{
-	int pstat;
-	char *p;
-	const char * volatile editor;
-	const char *argp[] = { "sh", "-c", NULL, NULL };
-
-	if (filename == NULL)
-		filename = _PATH_MASTERPASSWD_LOCK;
-
-	filename = pw_filename(filename);
-	if (filename == NULL)
-		return;
-
-	if ((editor = getenv("EDITOR")) == NULL)
-		editor = _PATH_VI;
-
-	p = malloc(strlen(editor) + 1 + strlen(filename) + 1);
-	if (p == NULL)
-		return;
-
-	sprintf(p, "%s %s", editor, filename);
-	argp[2] = p;
-
-	switch(editpid = vfork()) {
-	case -1:
-		free(p);
-		return;
-	case 0:
-		if (notsetuid) {
-			setgid(getgid());
-			setuid(getuid());
-		}
-		execvp(_PATH_BSHELL, (char *const *)__UNCONST(argp));
-		_exit(1);
-	}
-
-	free(p);
-
-	for (;;) {
-		editpid = waitpid(editpid, (int *)&pstat, WUNTRACED);
-		if (editpid == -1)
-			pw_error(editor, 1, 1);
-		else if (WIFSTOPPED(pstat))
-			raise(WSTOPSIG(pstat));
-		else if (WIFEXITED(pstat) && WEXITSTATUS(pstat) == 0)
-			break;
-		else
-			pw_error(editor, 1, 1);
-	}
-	editpid = -1;
-}
-
-void
-pw_prompt(void)
-{
-	int c;
-
-	(void)printf("re-edit the password file? [y]: ");
-	(void)fflush(stdout);
-	c = getchar();
-	if (c != EOF && c != '\n')
-		while (getchar() != '\n');
-	if (c == 'n')
-		pw_error(NULL, 0, 0);
-}
-
-/* for use in pw_copy(). Compare a pw entry to a pw struct. */
-/* returns a character string labelling the miscompared field or 0 */
-static const char *
-pw_equal(char *buf, struct passwd *pw)
-{
-	struct passwd buf_pw;
-	size_t len;
-
-	_DIAGASSERT(buf != NULL);
-	_DIAGASSERT(pw != NULL);
-
-	len = strlen (buf);
-	if (buf[len-1] == '\n')
-		buf[len-1] = '\0';
-	if (!pw_scan(buf, &buf_pw, NULL))
-		return "corrupt line";
-	if (strcmp(pw->pw_name, buf_pw.pw_name) != 0)
-		return "name";
-	if (pw->pw_uid != buf_pw.pw_uid)
-		return "uid";
-	if (pw->pw_gid != buf_pw.pw_gid)
-		return "gid";
-	if (strcmp( pw->pw_class, buf_pw.pw_class) != 0)
-		return "class";
-	if (pw->pw_change != buf_pw.pw_change)
-		return "change";
-	if (pw->pw_expire != buf_pw.pw_expire)
-		return "expire";
-	if (strcmp( pw->pw_gecos, buf_pw.pw_gecos) != 0)
-		return "gecos";
-	if (strcmp( pw->pw_dir, buf_pw.pw_dir) != 0)
-		return "dir";
-	if (strcmp( pw->pw_shell, buf_pw.pw_shell) != 0)
-		return "shell";
-	return (char *)0;
-}
-
-void
-pw_copy(int ffd, int tfd, struct passwd *pw, struct passwd *old_pw)
-{
-	char errbuf[200];
-	int rv;
-
-	rv = pw_copyx(ffd, tfd, pw, old_pw, errbuf, sizeof(errbuf));
-	if (rv == 0) {
-		warnx("%s", errbuf);
-		pw_error(NULL, 0, 1);
-	}
-}
-
-static void
-pw_print(FILE *to, const struct passwd *pw)
-{
-	(void)fprintf(to, "%s:%s:%d:%d:%s:%lld:%lld:%s:%s:%s\n",
-	    pw->pw_name, pw->pw_passwd, pw->pw_uid, pw->pw_gid,
-	    pw->pw_class, (long long)pw->pw_change,
-	    (long long)pw->pw_expire,
-	    pw->pw_gecos, pw->pw_dir, pw->pw_shell);
-}
-
-int
-pw_copyx(int ffd, int tfd, struct passwd *pw, struct passwd *old_pw,
-    char *errbuf, size_t errbufsz)
-{
-	const char *filename;
-	char mpwd[MAXPATHLEN], mpwdl[MAXPATHLEN], *p, buf[8192];
-	FILE *from, *to;
-	int done;
-
-	_DIAGASSERT(pw != NULL);
-	_DIAGASSERT(errbuf != NULL);
-	/* old_pw may be NULL */
-
-	if ((filename = pw_filename(_PATH_MASTERPASSWD)) == NULL) {
-		snprintf(errbuf, errbufsz, "%s: %s", pw_prefix,
-		    strerror(errno));
-		return (0);
-	}
-	(void)strcpy(mpwd, filename);
-	if ((filename = pw_filename(_PATH_MASTERPASSWD_LOCK)) == NULL) {
-		snprintf(errbuf, errbufsz, "%s: %s", pw_prefix,
-		    strerror(errno));
-		return (0);
-	}
-	(void)strcpy(mpwdl, filename);
-
-	if (!(from = fdopen(ffd, "r"))) {
-		snprintf(errbuf, errbufsz, "%s: %s", mpwd, strerror(errno));
-		return (0);
-	}
-	if (!(to = fdopen(tfd, "w"))) {
-		snprintf(errbuf, errbufsz, "%s: %s", mpwdl, strerror(errno));
-		(void)fclose(from);
-		return (0);
-	}
-
-	for (done = 0; fgets(buf, (int)sizeof(buf), from);) {
-		const char *neq;
-		if (!strchr(buf, '\n')) {
-			snprintf(errbuf, errbufsz, "%s: line too long", mpwd);
-			(void)fclose(from);
-			(void)fclose(to);
-			return (0);
-		}
-		if (done) {
-			(void)fprintf(to, "%s", buf);
-			if (ferror(to)) {
-				snprintf(errbuf, errbufsz, "%s",
-				    strerror(errno));
-				(void)fclose(from);
-				(void)fclose(to);
-				return (0);
-			}
-			continue;
-		}
-		if (!(p = strchr(buf, ':'))) {
-			snprintf(errbuf, errbufsz, "%s: corrupted entry", mpwd);
-			(void)fclose(from);
-			(void)fclose(to);
-			return (0);
-		}
-		*p = '\0';
-		if (strcmp(buf, pw->pw_name)) {
-			*p = ':';
-			(void)fprintf(to, "%s", buf);
-			if (ferror(to)) {
-				snprintf(errbuf, errbufsz, "%s",
-				    strerror(errno));
-				(void)fclose(from);
-				(void)fclose(to);
-				return (0);
-			}
-			continue;
-		}
-		*p = ':';
-		if (old_pw && (neq = pw_equal(buf, old_pw)) != NULL) {
-			if (strcmp(neq, "corrupt line") == 0)
-				(void)snprintf(errbuf, errbufsz,
-				    "%s: entry %s corrupted", mpwd,
-				    pw->pw_name);
-			else
-				(void)snprintf(errbuf, errbufsz,
-				    "%s: entry %s inconsistent %s",
-				    mpwd, pw->pw_name, neq);
-			(void)fclose(from);
-			(void)fclose(to);
-			return (0);
-		}
-		pw_print(to, pw);
-		done = 1;
-		if (ferror(to)) {
-			snprintf(errbuf, errbufsz, "%s", strerror(errno));
-			(void)fclose(from);
-			(void)fclose(to);
-			return (0);
-		}
-	}
-	/* Only append a new entry if real uid is root! */
-	if (!done) {
-		if (getuid() == 0) {
-			pw_print(to, pw);
-			done = 1;
-		} else {
-			snprintf(errbuf, errbufsz,
-			    "%s: changes not made, no such entry", mpwd);
-		}
-	}
-
-	if (ferror(to)) {
-		snprintf(errbuf, errbufsz, "%s", strerror(errno));
-		(void)fclose(from);
-		(void)fclose(to);
-		return (0);
-	}
-	(void)fclose(from);
-	(void)fclose(to);
-
-	return (done);
-}
-
-void
-pw_error(const char *name, int error, int eval)
-{
-
-	if (error) {
-		if (name)
-			warn("%s", name);
-		else
-			warn(NULL);
-	}
-
-	warnx("%s%s: unchanged", pw_prefix, _PATH_MASTERPASSWD);
-	pw_abort();
-	exit(eval);
-}
-
-/* Removes head and/or tail spaces. */
-static void
-trim_whitespace(char *line)
-{
-	char *p;
-
-	_DIAGASSERT(line != NULL);
-
-	/* Remove leading spaces */
-	p = line;
-	while (isspace((unsigned char) *p))
-		p++;
-	memmove(line, p, strlen(p) + 1);
-
-	/* Remove trailing spaces */
-	p = line + strlen(line) - 1;
-	while (isspace((unsigned char) *p))
-		p--;
-	*(p + 1) = '\0';
-}
-
-
-/* Get one line, remove spaces from front and tail */
-static int
-read_line(FILE *fp, char *line, int max)
-{
-	char   *p;
-
-	_DIAGASSERT(fp != NULL);
-	_DIAGASSERT(line != NULL);
-
-	/* Read one line of config */
-	if (fgets(line, max, fp) == NULL)
-		return (0);
-
-	if ((p = strchr(line, '\n')) == NULL) {
-		warnx("line too long");
-		return (0);
-	}
-	*p = '\0';
-
-	/* Remove comments */
-	if ((p = strchr(line, '#')) != NULL)
-		*p = '\0';
-
-	trim_whitespace(line);
-	return (1);
-}
-
-static const char *
-pw_default(const char *option)
-{
-	static const char *options[][2] = {
-		{ "localcipher",	"old" },
-		{ "ypcipher",		"old" },
-	};
-	size_t i;
-
-	_DIAGASSERT(option != NULL);
-	for (i = 0; i < sizeof(options) / sizeof(options[0]); i++)
-		if (strcmp(options[i][0], option) == 0)
-			return (options[i][1]);
-
-	return (NULL);
-}
-
-/*
- * Retrieve password information from the /etc/passwd.conf file, at the
- * moment this is only for choosing the cipher to use.  It could easily be
- * used for other authentication methods as well.
- */
-void
-pw_getconf(char *data, size_t max, const char *key, const char *option)
-{
-	FILE *fp;
-	char line[LINE_MAX], *p, *p2;
-	static char result[LINE_MAX];
-	int got, found;
-	const char *cp;
-
-	_DIAGASSERT(data != NULL);
-	_DIAGASSERT(key != NULL);
-	_DIAGASSERT(option != NULL);
-
-	got = 0;
-	found = 0;
-	result[0] = '\0';
-
-	if ((fp = fopen(_PATH_PASSWD_CONF, "r")) == NULL) {
-		if ((cp = pw_default(option)) != NULL)
-			strlcpy(data, cp, max);
-		else
-			data[0] = '\0';
-		return;
-	}
-
-	while (!found && (got || read_line(fp, line, LINE_MAX))) {
-		got = 0;
-
-		if (strncmp(key, line, strlen(key)) != 0 ||
-		    line[strlen(key)] != ':')
-			continue;
-
-		/* Now we found our specified key */
-		while (read_line(fp, line, LINE_MAX)) {
-			/* Leaving key field */
-			if (line[0] != '\0' && strchr(line + 1, ':') != NULL) {
-				got = 1;
-				break;
-			}
-			p2 = line;
-			if ((p = strsep(&p2, "=")) == NULL || p2 == NULL)
-				continue;
-			trim_whitespace(p);
-
-			if (!strncmp(p, option, strlen(option))) {
-				trim_whitespace(p2);
-				strcpy(result, p2);
-				found = 1;
-				break;
-			}
-		}
-	}
-	fclose(fp);
-
-	if (!found)
-		errno = ENOENT;
-	if (!got)
-		errno = ENOTDIR;
-
-	/* 
-	 * If we got no result and were looking for a default
-	 * value, try hard coded defaults.
-	 */
-
-	if (strlen(result) == 0 && strcmp(key, "default") == 0 &&
-	    (cp = pw_default(option)) != NULL)
-		strlcpy(data, cp, max);
-	else 
-		strlcpy(data, result, max);
-}
-
-void
-pw_getpwconf(char *data, size_t max, const struct passwd *pwd,
-    const char *option)
-{
-	char grpkey[LINE_MAX];
-	struct group grs, *grp;
-	char grbuf[1024];
-
-	pw_getconf(data, max, pwd->pw_name, option);
-
-	/* Try to find an entry for the group */
-	if (*data == '\0') {
-		(void)getgrgid_r(pwd->pw_gid, &grs, grbuf, sizeof(grbuf), &grp);
-		if (grp != NULL) {
-			(void)snprintf(grpkey, sizeof(grpkey), ":%s",
-			    grp->gr_name);
-			pw_getconf(data, max, grpkey, option);
-		}
-		if (*data == '\0')
-		        pw_getconf(data, max, "default", option);
-	}
-}
diff --git a/lib/libutil/pidfile.3 b/lib/libutil/pidfile.3
deleted file mode 100644
index b1ca92c44..000000000
--- a/lib/libutil/pidfile.3
+++ /dev/null
@@ -1,105 +0,0 @@
-.\"	$NetBSD: pidfile.3,v 1.13 2011/03/29 13:55:37 jmmv Exp $
-.\"
-.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd March 23, 2011
-.Dt PIDFILE 3
-.Os
-.Sh NAME
-.Nm pidfile
-.Nd write a daemon pid file
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft int
-.Fn pidfile "const char *path"
-.Sh DESCRIPTION
-.Fn pidfile
-creates a file containing the process ID of the caller program.
-The pid file can be used as a quick reference if
-the process needs to be sent a signal.
-When the program exits, the pid file is removed automatically, unless
-the program receives a fatal signal.
-.Pp
-If
-.Ar path
-is
-.Dv NULL
-or a plain basename (a name containing no directory components), the pid file
-is created in the
-.Pa /var/run
-directory.
-The file name has the form
-.Pa /var/run/basename.pid .
-The basename part is either the value of
-.Ar path
-if it was not
-.Dv NULL ,
-or the program name as returned by
-.Xr getprogname 3
-otherwise.
-.Pp
-If
-.Ar path
-is an absolute or relative path (i.e. it contains the
-.Sq /
-character),
-the pid file is created in the provided location.
-.Pp
-Note that only the first invocation of
-.Fn pidfile
-causes a pid file to be written; subsequent invocations have no effect
-unless a new
-.Ar path
-is supplied.
-If called with a new
-.Ar path ,
-.Fn pidfile
-will remove the old pid file and write the new one.
-.Sh RETURN VALUES
-.Fn pidfile
-returns 0 on success and -1 on failure.
-.Sh SEE ALSO
-.Xr atexit 3
-.Sh HISTORY
-The
-.Fn pidfile
-function call appeared in
-.Nx 1.5 .
-Support for creating pid files in any arbitrary path was added in
-.Nx 6.0 .
-.Sh BUGS
-.Fn pidfile
-uses
-.Xr atexit 3
-to ensure the pid file is unlinked at program exit.
-However, programs that use the
-.Xr _exit 2
-function (for example, in signal handlers)
-will not trigger this behaviour.
diff --git a/lib/libutil/pidfile.c b/lib/libutil/pidfile.c
deleted file mode 100644
index c0cdecc4f..000000000
--- a/lib/libutil/pidfile.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*	$NetBSD: pidfile.c,v 1.11 2015/01/22 19:04:28 christos Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe, Matthias Scheler and Julio Merino.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pidfile.c,v 1.11 2015/01/22 19:04:28 christos Exp $");
-#endif
-
-#include <sys/param.h>
-
-#include <paths.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <util.h>
-
-static pid_t pidfile_pid;
-static char *pidfile_path;
-
-/* Deletes an existent pidfile iff it was created by this process. */
-static void
-pidfile_cleanup(void)
-{
-
-	if ((pidfile_path != NULL) && (pidfile_pid == getpid()))
-		(void) unlink(pidfile_path);
-}
-
-/* Registers an atexit(3) handler to delete the pidfile we have generated.
- * We only register the handler when we create a pidfile, so we can assume
- * that the pidfile exists.
- *
- * Returns 0 on success or -1 if the handler could not be registered. */
-static int
-register_atexit_handler(void)
-{
-	static bool done = false;
-
-	if (!done) {
-		if (atexit(pidfile_cleanup) < 0)
-			return -1;
-		done = true;
-	}
-
-	return 0;
-}
-
-/* Given a new pidfile name in 'path', deletes any previously-created pidfile
- * if the previous file differs to the new one.
- *
- * If a previous file is deleted, returns 1, which means that a new pidfile
- * must be created.  Otherwise, this returns 0, which means that the existing
- * file does not need to be touched. */
-static int
-cleanup_old_pidfile(const char* path)
-{
-	if (pidfile_path != NULL) {
-		if (strcmp(pidfile_path, path) != 0) {
-			pidfile_cleanup();
-
-			free(pidfile_path);
-			pidfile_path = NULL;
-
-			return 1;
-		} else
-			return 0;
-	} else
-		return 1;
-}
-
-/* Constructs a name for a pidfile in the default location (/var/run).  If
- * 'bname' is NULL, uses the name of the current program for the name of
- * the pidfile.
- *
- * Returns a pointer to a dynamically-allocatd string containing the absolute
- * path to the pidfile; NULL on failure. */
-static char *
-generate_varrun_path(const char *bname)
-{
-	char *path;
-
-	if (bname == NULL)
-		bname = getprogname();
-
-	/* _PATH_VARRUN includes trailing / */
-	if (asprintf(&path, "%s%s.pid", _PATH_VARRUN, bname) == -1)
-		return NULL;
-	return path;
-}
-
-/* Creates a pidfile with the provided name.  The new pidfile is "registered"
- * in the global variables pidfile_path and pidfile_pid so that any further
- * call to pidfile(3) can check if we are recreating the same file or a new
- * one.
- *
- * Returns 0 on success or -1 if there is any error. */
-static int
-create_pidfile(const char* path)
-{
-	FILE *f;
-
-	if (register_atexit_handler() == -1)
-		return -1;
-
-	if (cleanup_old_pidfile(path) == 0)
-		return 0;
-
-	pidfile_path = strdup(path);
-	if (pidfile_path == NULL)
-		return -1;
-
-	if ((f = fopen(path, "w")) == NULL) {
-		free(pidfile_path);
-		pidfile_path = NULL;
-		return -1;
-	}
-
-	pidfile_pid = getpid();
-
-	(void) fprintf(f, "%d\n", pidfile_pid);
-	(void) fclose(f);
-
-	return 0;
-}
-
-int
-pidfile(const char *path)
-{
-
-	if (path == NULL || strchr(path, '/') == NULL) {
-		char *default_path;
-
-		if ((default_path = generate_varrun_path(path)) == NULL)
-			return -1;
-
-		if (create_pidfile(default_path) == -1) {
-			free(default_path);
-			return -1;
-		}
-
-		free(default_path);
-		return 0;
-	} else
-		return create_pidfile(path);
-}
diff --git a/lib/libutil/pidlock.3 b/lib/libutil/pidlock.3
deleted file mode 100644
index 192173490..000000000
--- a/lib/libutil/pidlock.3
+++ /dev/null
@@ -1,184 +0,0 @@
-.\"	$NetBSD: pidlock.3,v 1.12 2009/03/09 19:24:27 joerg Exp $
-.\"
-.\" Copyright 1996, 1997 by Curt Sampson <cjs@NetBSD.org>
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd March 19, 2006
-.Dt PIDLOCK 3
-.Os
-.Sh NAME
-.Nm pidlock ,
-.Nm ttylock ,
-.Nm ttyunlock
-.Nd locks based on files containing PIDs
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft int
-.Fn pidlock "const char *lockfile" "int flags" "pid_t *locker" "const char *info"
-.Ft int
-.Fn ttylock "const char *tty" "int flags" "pid_t *locker"
-.Ft int
-.Fn ttyunlock "const char *tty"
-.Sh DESCRIPTION
-The
-.Fn pidlock
-.Fn ttylock ,
-and
-.Fn ttyunlock
-functions attempt to create a lockfile for an arbitrary resource that
-only one program may hold at a time.
-(In the case of
-.Fn ttylock ,
-this is access to a tty device.)
-If the
-function succeeds in creating the lockfile, it will succeed for
-no other program calling it with the same lockfile until the original
-calling program has removed the lockfile or exited.
-The
-.Fn ttyunlock
-function will remove the lockfile created by
-.Fn ttylock .
-.Pp
-These functions use the method of creating a lockfile traditionally
-used by UUCP software.
-This is described as follows in the documentation for Taylor UUCP:
-.Bd -filled -offset indent
-The lock file normally contains the process ID of the locking process.
-This makes it easy to determine whether a lock is still valid.
-The algorithm is to create a temporary file and then link
-it to the name that must be locked.
-If the link fails because a file with that name already exists,
-the existing file is read to get the process ID.
-If the process still exists, the lock attempt fails.
-Otherwise the lock file is deleted and the locking algorithm
-is retried.
-.Ed
-.Pp
-The PID is stored in ASCII format, with leading spaces to pad it
-out to ten characters, and a terminating newline.
-This implementation has been extended to put the hostname
-on the second line of the file, terminated with a newline, and
-optionally an arbitrary comment on the third line of the file, also
-terminated with a newline.
-If a comment is given, but
-.Dv PIDLOCK_NONBLOCK
-is not, a blank line will be written as the second line of the file.
-.Pp
-The
-.Fn pidlock
-function will attempt to create the file
-.Fa lockfile
-and put the current process's pid in it.
-The
-.Fn ttylock
-function will do the same, but should be passed only the base name
-(with no leading directory prefix) of the
-.Fa tty
-to be locked; it will test that the tty exists in
-.Pa /dev
-and is a character device, and then create
-the file in the
-.Pa /var/spool/lock
-directory and prefix the filename with
-.Pa LCK.. .
-Use the
-.Fn ttyunlock
-function to remove this lock.
-.Pp
-The following flags may be passed in
-.Pa flags :
-.Bl -tag -width Dv -offset indent
-.It Dv PIDLOCK_NONBLOCK
-The function should return immediately when a lock is held by another
-active process.
-Otherwise the function will wait (forever, if necessary)
-for the lock to be freed.
-.It Dv PIDLOCK_USEHOSTNAME
-The hostname should be compared against the hostname in the second
-line of the file (if present), and if they differ, no attempt at
-checking for a living process holding the lock will be made, and
-the lockfile will never be deleted.
-(The process is assumed to be alive.)
-This is used for locking on NFS or other remote filesystems.
-(The function will never create a lock if
-.Dv PIDLOCK_USEHOSTNAME
-is specified and no hostname is present.)
-.El
-.Pp
-If
-.Pa locker
-is non-null, it will contain the PID of the locking process, if there
-is one, on return.
-.Pp
-If
-.Pa info
-is non-null and the lock succeeds, the string it points to will be
-written as the third line of the lock file.
-.Sh RETURN VALUES
-Zero is returned if the operation was successful; on an error a -1
-is returned and a standard error code is left in the global location
-.Va errno .
-.Sh ERRORS
-In addition to the errors that are returned from
-.Xr stat 2 ,
-.Xr open 2 ,
-.Xr read 2 ,
-.Xr write 2 ,
-and
-.Xr link 2 ,
-.Fn pidlock
-or
-.Fn ttylock
-can set
-.Va errno
-to the following values on failure:
-.Bl -tag -width Er
-.It Bq Er EWOULDBLOCK
-Another running process has a lock and the
-.Dv PIDLOCK_NONBLOCK
-flag was specified.
-.It Bq Er EFTYPE
-The
-.Fa tty
-specified in
-.Fn ttylock
-is not a character special device.
-.El
-.\" .Sh SEE ALSO
-.Sh HISTORY
-The
-.Fn pidlock
-and
-.Fn ttylock
-functions appeared in
-.Nx 1.3 .
-.Sh AUTHORS
-.An Curt Sampson
-.Aq cjs@NetBSD.org .
-.Sh BUGS
-The lockfile format breaks if a pid is longer than ten digits when
-printed in decimal form.
-.Pp
-The PID returned will be the pid of the locker on the remote machine if
-.Dv PIDLOCK_USEHOSTNAME
-is specified, but there is no indication that this is not on the local
-machine.
diff --git a/lib/libutil/pidlock.c b/lib/libutil/pidlock.c
deleted file mode 100644
index adef5990e..000000000
--- a/lib/libutil/pidlock.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*	$NetBSD: pidlock.c,v 1.16 2012/04/07 16:17:17 christos Exp $ */
-
-/*
- * Copyright 1996, 1997 by Curt Sampson <cjs@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 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>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pidlock.c,v 1.16 2012/04/07 16:17:17 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <util.h>
-#include <paths.h>
-
-/*
- * Create a lockfile. Return 0 when locked, -1 on error.
- */
-int
-pidlock(const char *lockfile, int flags, pid_t *locker, const char *info)
-{
-	char	tempfile[MAXPATHLEN];
-	char	hostname[MAXHOSTNAMELEN + 1];
-	pid_t	pid2 = -1;
-	struct	stat st;
-	ssize_t	n;
-	int	f = -1, savee;
-	char	s[256];
-	char	*p;
-	size_t	len;
-
-	_DIAGASSERT(lockfile != NULL);
-	/* locker may be NULL */
-	/* info may be NULL */
-
-
-	if (gethostname(hostname, sizeof(hostname)))
-		return -1;
-	hostname[sizeof(hostname) - 1] = '\0';
-
-	/*
-	 * Build a path to the temporary file.
-	 * We use the path with the PID and hostname appended.
-	 * XXX This is not thread safe.
-	 */
-	if (snprintf(tempfile, sizeof(tempfile), "%s.%d.%s", lockfile,
-	    (int) getpid(), hostname) >= (int)sizeof(tempfile))  {
-		errno = ENAMETOOLONG;
-		return -1;
-	}
-
-	/* Open it, write pid, hostname, info. */
-	if ((f = open(tempfile, O_WRONLY|O_CREAT|O_TRUNC, 0600)) == -1)
-		goto out;
-
-	(void)snprintf(s, sizeof(s), "%10d\n", getpid());	/* pid */
-	if (write(f, s, (size_t)11) != 11)
-		goto out;
-
-	if ((flags & PIDLOCK_USEHOSTNAME))  {		/* hostname */
-		len = strlen(hostname);
-		if ((size_t)write(f, hostname, len) != len
-		    || write(f, "\n", (size_t)1) != 1)
-			goto out;
-	}
-	if (info)  {					/* info */
-		if (!(flags & PIDLOCK_USEHOSTNAME))  {
-			/* write blank line because there's no hostname */
-			if (write(f, "\n", (size_t)1) != 1)
-				goto out;
-		}
-		len = strlen(info);
-		if ((size_t)write(f, info, len) != len ||
-		    write(f, "\n", (size_t)1) != 1)
-			goto out;
-	}
-	(void)close(f);
-	f = -1;
-
-	/* Hard link the temporary file to the real lock file. */
-	/* This is an atomic operation. */
-lockfailed:
-	while (link(tempfile, lockfile) == -1)  {
-		if (errno != EEXIST)
-			goto out;
-		/* Find out who has this lockfile. */
-		if ((f = open(lockfile, O_RDONLY, 0)) != -1)  {
-			if ((n = read(f, s, (size_t)11)) == -1)
-				goto out;
-			if (n == 0) {
-				errno = EINVAL;
-				goto out;
-			}
-			pid2 = atoi(s);
-			if ((n = read(f, s, sizeof(s) - 2)) == -1)
-				goto out;
-			if (n == 0)
-				*s = '\0';
-			s[sizeof(s) - 1] = '\0';
-			if ((p = strchr(s, '\n')) != NULL)
-				*p = '\0';
-			(void)close(f);
-			f = -1;
-
-			if ((flags & PIDLOCK_USEHOSTNAME) == 0 ||
-			    strcmp(s, hostname) == 0)  {
-				if (kill(pid2, 0) == -1 && errno == ESRCH)  {
-					/* process doesn't exist */
-					(void)unlink(lockfile);
-					continue;
-				}
-			}
-		}
-		if (flags & PIDLOCK_NONBLOCK)  {
-			if (locker)
-				*locker = pid2;
-			errno = EWOULDBLOCK;
-			goto out;
-		} else
-			sleep(5);
-	}
-	/*
-	 * Check to see that we really were successful (in case we're
-	 * using NFS) by making sure that something really is linked
-	 * to our tempfile (reference count is two).
-	 */
-	if (stat(tempfile, &st) == -1)
-		goto out;
-	if (st.st_nlink != 2)
-		goto lockfailed;
-
-	(void)unlink(tempfile);
- 	if (locker)
- 		*locker = getpid();	/* return this process's PID on lock */
-	errno = 0;
-	return 0;
-out:
-	savee = errno;
-	if (f != -1)
-		(void)close(f);
-	(void)unlink(tempfile);
-	errno = savee;
-	return -1;
-}
-
-static int
-checktty(const char *tty)
-{
-	char	ttyfile[MAXPATHLEN];
-	struct stat sb;
-
-	(void)strlcpy(ttyfile, _PATH_DEV, sizeof(ttyfile));
-	(void)strlcat(ttyfile, tty, sizeof(ttyfile));
-
-	/* make sure the tty exists */
-	if (stat(ttyfile, &sb) == -1)
-		return -1;
-	if (!S_ISCHR(sb.st_mode))  {
-		errno = EFTYPE;
-		return -1;
-	}
-	return 0;
-}
-
-#define LOCKPATH	"/var/spool/lock/LCK.."
-
-static char *
-makelock(char *buf, size_t bufsiz, const char *tty)
-{
-	(void)strlcpy(buf, LOCKPATH, bufsiz);
-	(void)strlcat(buf, tty, bufsiz);
-	return buf;
-}
-
-/*ARGSUSED*/
-int
-ttylock(const char *tty, int flags, pid_t *locker)
-{
-	char	lockfile[MAXPATHLEN];
-
-	_DIAGASSERT(tty != NULL);
-
-	if (checktty(tty) != 0)
-		return -1;
-
-	/* do the lock */
-	return pidlock(makelock(lockfile, sizeof(lockfile), tty),
-	    flags, locker, 0);
-}
-
-int
-ttyunlock(const char *tty)
-{
-	char	lockfile[MAXPATHLEN];
-
-	_DIAGASSERT(tty != NULL);
-
-	if (checktty(tty) != 0)
-		return -1;
-
-	/* remove the lock */
-	return unlink(makelock(lockfile, sizeof(lockfile), tty));
-}
diff --git a/lib/libutil/proc_compare.3 b/lib/libutil/proc_compare.3
deleted file mode 100644
index c845502d7..000000000
--- a/lib/libutil/proc_compare.3
+++ /dev/null
@@ -1,107 +0,0 @@
-.\"     $NetBSD: proc_compare.3,v 1.2 2011/10/21 12:58:53 wiz Exp $
-.\"
-.\" Copyright (c) 2011 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"        This product includes software developed by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"
-.Dd October 20, 2011
-.Dt PROC_COMPARE 3
-.Os
-.Sh NAME
-.Nm proc_compare
-.Nd compare two processes' interactivity
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In sys/sysctl.h
-.Ft int
-.Fn "proc_compare" "const struct kinfo_proc2 *p1" "const struct kinfo_lwp *l1" \
-"const struct kinfo_proc2 *p2" "const struct kinfo_lwp *l2"
-.Sh DESCRIPTION
-The
-.Fn proc_compare
-function compares two processes that are on the same terminal for their
-interactivity.
-This means that the process returned is the one that has a better chance
-being the active foreground process on that tty.
-This algorithm is used in the kernel for
-.Dv SIGINFO
-reporting and in userland by
-.Xr w 1 .
-.Pp
-The algorithm used is as follows:
-.Bl -bullet -compact -offset indent
-.It
-If one of them is runnable, it is preferred.
-.It
-If both are runnable, the one with the largest CPU percent is preferred.
-.It
-In a CPU percent tie, the one started more recently wins.
-.It
-If none are runnable, and one of them is a zombie, the non-zombie is preferred
-.It
-If both are zombies, the one started more recently wins.
-.It
-If neither is a zombie, the one with the smaller sleep time wins.
-.It
-In a tie, and one is sleeping in non-interruptible sleep, prefer that one.
-.It
-If both are in the same state, the one started more recently is preferred.
-.El
-In all cases where the most recently started wins, if there was no winner,
-the one with the largest PID wins.
-.Sh RETURN VALUES
-The
-.Fn proc_compare
-function returns
-.Dv 0
-if
-.Fa p1
-is to be preferred
-and
-.Dv 1
-if
-.Fa p2
-is to be preferred.
-.Sh SEE ALSO
-.Xr w 1
-.Sh HISTORY
-The
-.Fn proc_compare
-was extracted from
-.Pa src/sys/kern/tty.c
-and
-.Pa src/usr.bin/w/proc_compare.c
-and merged in
-.Nx 6.0 .
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
deleted file mode 100644
index 795ff37e4..000000000
--- a/lib/libutil/pty.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*	$NetBSD: pty.c,v 1.31 2009/02/20 16:44:06 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)pty.c	8.3 (Berkeley) 5/16/94";
-#else
-__RCSID("$NetBSD: pty.c,v 1.31 2009/02/20 16:44:06 christos Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-
-#if defined(__minix)
-#include <stdlib.h>
-#endif /* defined(__minix) */
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <stdio.h>
-#include <string.h>
-#include <termios.h>
-#include <unistd.h>
-#include <util.h>
-
-/*
- * XXX: `v' removed until no ports are using console devices which use ttyv0
- */
-#define TTY_LETTERS	"pqrstuwxyzPQRST"
-#define TTY_OLD_SUFFIX	"0123456789abcdef"
-#define TTY_NEW_SUFFIX	"ghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-
-int
-openpty(int *amaster, int *aslave, char *name, struct termios *term,
-	struct winsize *winp)
-{
-	char line[] = "/dev/XtyXX";
-	const char *cp1, *cp2, *cp, *linep;
-	int master, slave;
-	gid_t ttygid;
-	mode_t mode;
-	struct group grs, *grp;
-	char grbuf[1024];
-
-	_DIAGASSERT(amaster != NULL);
-	_DIAGASSERT(aslave != NULL);
-	/* name may be NULL */
-	/* term may be NULL */
-	/* winp may be NULL */
-
-#if !defined(__minix)
-	if ((master = open("/dev/ptm", O_RDWR)) != -1) {
-		struct ptmget pt;
-		if (ioctl(master, TIOCPTMGET, &pt) != -1) {
-			(void)close(master);
-			master = pt.cfd;
-			slave = pt.sfd;
-			linep = pt.sn;
-			goto gotit;
-		}
-		(void)close(master);
-	}
-#else
-	/*
-	 * On MINIX3, we implement non-root openpty(3) using Unix98 PTYs.
-	 * If this fails, the fallback code below works for root only.
-	 */
-	if ((master = posix_openpt(O_RDWR | O_NOCTTY)) != -1) {
-		if (grantpt(master) != -1 && unlockpt(master) != -1 &&
-		    (linep = ptsname(master)) != NULL &&
-		    (slave = open(linep, O_RDWR | O_NOCTTY)) != -1)
-			goto gotit;
-		(void)close(master);
-	}
-#endif /* !defined(__minix) */
-
-	(void)getgrnam_r("tty", &grs, grbuf, sizeof(grbuf), &grp);
-	if (grp != NULL) {
-		ttygid = grp->gr_gid;
-		mode = S_IRUSR|S_IWUSR|S_IWGRP;
-	} else {
-		ttygid = getgid();
-		mode = S_IRUSR|S_IWUSR;
-	}
-
-	for (cp1 = TTY_LETTERS; *cp1; cp1++) {
-		line[8] = *cp1;
-		for (cp = cp2 = TTY_OLD_SUFFIX TTY_NEW_SUFFIX; *cp2; cp2++) {
-			line[5] = 'p';
-			line[9] = *cp2;
-#if defined(__minix)
-			if ((master = open(line, O_RDWR | O_NOCTTY, 0)) == -1) {
-#else
-			if ((master = open(line, O_RDWR, 0)) == -1) {
-#endif /* defined(__minix) */
-				if (errno != ENOENT)
-					continue;	/* busy */
-				if ((size_t)(cp2 - cp + 1) < sizeof(TTY_OLD_SUFFIX))
-					return -1; /* out of ptys */
-				else	
-					break;	/* out of ptys in this group */
-			}
-			line[5] = 't';
-			linep = line;
-			if (chown(line, getuid(), ttygid) == 0 &&
-			    chmod(line, mode) == 0 &&
-#if !defined(__minix)
-			    revoke(line) == 0 &&
-#endif /* !defined(__minix) */
-#if defined(__minix)
-			(slave = open(line, O_RDWR | O_NOCTTY, 0)) != -1) {
-#else
-			    (slave = open(line, O_RDWR, 0)) != -1) {
-#endif /* defined(__minix) */
-gotit:
-				*amaster = master;
-				*aslave = slave;
-				if (name)
-					(void)strcpy(name, linep);
-				if (term)
-					(void)tcsetattr(slave, TCSAFLUSH, term);
-				if (winp)
-					(void)ioctl(slave, TIOCSWINSZ, winp);
-				return 0;
-			}
-			(void)close(master);
-		}
-	}
-	errno = ENOENT;	/* out of ptys */
-	return -1;
-}
-
-pid_t
-forkpty(int *amaster, char *name, struct termios *term, struct winsize *winp)
-{
-	int master, slave;
-	pid_t pid;
-
-	_DIAGASSERT(amaster != NULL);
-	/* name may be NULL */
-	/* term may be NULL */
-	/* winp may be NULL */
-
-	if (openpty(&master, &slave, name, term, winp) == -1)
-		return -1;
-	switch (pid = fork()) {
-	case -1:
-		return -1;
-	case 0:
-		/*
-		 * child
-		 */
-		(void)close(master);
-		login_tty(slave);
-		return 0;
-	}
-	/*
-	 * parent
-	 */
-	*amaster = master;
-	(void)close(slave);
-	return pid;
-}
diff --git a/lib/libutil/pw_getconf.3 b/lib/libutil/pw_getconf.3
deleted file mode 100644
index c0b7cd3d9..000000000
--- a/lib/libutil/pw_getconf.3
+++ /dev/null
@@ -1,114 +0,0 @@
-.\"	$NetBSD: pw_getconf.3,v 1.12 2010/05/04 06:41:27 jruoho Exp $
-.\"
-.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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 Niels Provos.
-.\" 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.
-.\"
-.\" from OpenBSD: pw_getconf.3,v 1.5 1999/09/21 04:52:46 csapuntz Exp
-.\"
-.Dd May 4, 2010
-.Dt PW_GETCONF 3
-.Os
-.Sh NAME
-.Nm pw_getconf ,
-.Nm pw_getpwconf
-.Nd password encryption configuration access function
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft void
-.Fn pw_getconf "char *data" "size_t len" "const char *key" "const char *option"
-.Ft void
-.Fn pw_getpwconf "char *data" "size_t len" "const struct passwd *pwd" "const char *option"
-.Sh DESCRIPTION
-The
-.Fn pw_getconf
-function reads
-.Pa /etc/passwd.conf
-and retrieves the value of the option specified
-by
-.Pa option
-from the section given by
-.Pa key .
-If no suitable entry is found
-for the
-.Pa key
-an empty string will be returned in data.
-.Pp
-To retrieve default values the key
-.Pa default
-can be used.
-In this case, if
-.Pa /etc/passwd.conf
-does not exist or does not contain a
-.Pa default
-section, the built-in defaults will be returned.
-They are as follows:
-.Bl -column localcipher data -offset indent
-.It Sy option	data
-.It ypcipher	old
-.It localcipher	old
-.El
-.Pp
-An empty string is returned for all errors.
-.Pp
-.Fn pw_getpwconf
-returns the value for the option specified for the particular user
-specified in
-.Ar pwd .
-If that option is not found, then it tries to find the option in
-the primary group of that user, and if that fails, then it returns
-the default entry.
-.Sh FILES
-.Bl -tag -width /etc/passwd.conf -compact
-.It Pa /etc/passwd.conf
-.El
-.Sh ERRORS
-.Fn pw_getconf
-and
-.Fn pw_getpwconf
-will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOENT
-There is no option named
-.Pa option
-in the specified key.
-.It Bq Er ENOTDIR
-There is no key in
-.Pa /etc/passwd.conf
-named
-.Pa key .
-.El
-.Sh SEE ALSO
-.Xr passwd 5 ,
-.Xr passwd.conf 5
-.Sh HISTORY
-The
-.Fn pw_getconf
-function first appeared in
-.Nx 1.6 .
diff --git a/lib/libutil/pw_init.3 b/lib/libutil/pw_init.3
deleted file mode 100644
index d7e3099c5..000000000
--- a/lib/libutil/pw_init.3
+++ /dev/null
@@ -1,229 +0,0 @@
-.\"	$NetBSD: pw_init.3,v 1.15 2010/05/05 22:05:31 wiz Exp $
-.\"
-.\" Copyright (c) 1995
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software 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.
-.\" 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.
-.\"
-.Dd August 1, 2004
-.Dt PW_INIT 3
-.Os
-.Sh NAME
-.Nm pw_init ,
-.Nm pw_edit ,
-.Nm pw_prompt ,
-.Nm pw_copy ,
-.Nm pw_copyx ,
-.Nm pw_scan ,
-.Nm pw_error
-.Nd utility functions for interactive passwd file updates
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In pwd.h
-.In util.h
-.Ft void
-.Fn pw_init "void"
-.Ft void
-.Fn pw_edit "int notsetuid" "const char *filename"
-.Ft void
-.Fn pw_prompt "void"
-.Ft void
-.Fn pw_copy "int ffd" "int tfd" "struct passwd *pw" "struct passwd *old_pw"
-.Ft int
-.Fn pw_copyx "int ffd" "int tfd" "struct passwd *pw" "struct passwd *old_pw" \
-    "char *errbuf" "size_t errbufsz"
-.Ft int
-.Fn pw_scan "char *bp" "struct passwd *pw" "int *flags"
-.Ft void
-.Fn pw_error "const char *name" "int err" "int eval"
-.Sh DESCRIPTION
-These functions are designed as conveniences for interactive programs
-which update the passwd file and do nothing else.
-They generally handle errors by printing out a message to the standard error
-stream and possibly aborting the process.
-.Pp
-The
-.Fn pw_init
-function prepares for a passwd update by unlimiting all resource
-constraints, disabling core dumps (thus preventing dumping the
-contents of the passwd database into a world-readable file), and
-disabling most signals.
-.Pp
-The
-.Fn pw_edit
-function runs an editor (named by the environment variable EDITOR, or
-.Pa /usr/bin/vi
-if EDITOR is not set) on the file
-.Fa filename
-(or
-.Pa /etc/ptmp
-if
-.Fa filename
-is
-.Dv NULL ) .
-If
-.Fa notsetuid
-is nonzero,
-.Fn pw_edit
-will set the effective user and group ID to the real user and group ID
-before running the editor.
-.Pp
-The
-.Fn pw_prompt
-function asks the user whether he or she wants to re-edit the password
-file; if the answer is no,
-.Fn pw_prompt
-deletes the lock file and exits the process.
-.Pp
-The
-.Fn pw_copy
-function reads a passwd file from
-.Fa ffd
-and writes it to
-.Fa tfd ,
-updating the entry corresponding to pw-\*[Gt]pw_name with the information
-in
-.Fa pw .
-If
-.Fa old_pw
-is not
-.Dv NULL ,
-it checks to make sure the old entry is the same as
-the one described in
-.Fa old_pw
-or the process is aborted.
-If an entry is not found to match
-.Fa pw ,
-a new entry is appended to the passwd file only if the real user
-ID is 0.
-If an error occurs,
-.Fn pw_copy
-will display a message on
-.Dv stderr
-and call
-.Fn pw_error .
-.Pp
-The
-.Fn pw_copyx
-function performs the same operation as
-.Fn pw_copy
-with the exception of error handling.
-Upon an error,
-.Fn pw_copyx
-will write an error message into the buffer pointed to by
-.Fa errbuf
-which has the size
-.Fa errbufsz .
-.Pp
-The
-.Fn pw_scan
-function accepts in
-.Fa bp
-a passwd entry as it would be represented in
-.Pa /etc/master.passwd
-and fills in
-.Fa pw
-with corresponding values; string fields in
-.Fa pw
-will be pointers into
-.Fa bp .
-Some characters in
-.Fa bp
-will be overwritten with 0s in order to terminate the strings pointed
-to by
-.Fa pw .
-If
-.Fa flags
-is non-null, it should be cleared and the following options
-enabled if required:
-.Bl -tag -offset indent -width _PASSWORD_OLDFMT
-.It Dv _PASSWORD_NOWARN
-Don't print warnings.
-.It Dv _PASSWORD_OLDFMT
-Parse
-.Fa bp
-as an old format entry as found in
-.Pa /etc/passwd .
-.El
-.Pp
-Upon return it is cleared, and filled in with the following flags:
-.Bl -tag -offset indent -width _PASSWORD_NOGID
-.It Dv _PASSWORD_NOUID
-The uid field of
-.Fa bp
-is empty.
-.It Dv _PASSWORD_NOGID
-The gid field of
-.Fa bp
-is empty.
-.It Dv _PASSWORD_NOCHG
-The change field of
-.Fa bp
-is empty.
-.It Dv _PASSWORD_NOEXP
-The expire field of
-.Fa bp
-is empty.
-.El
-.Pp
-The
-.Fn pw_error
-function displays an error message, aborts the current passwd update,
-and exits the current process.
-If
-.Fa err
-is non-zero, a warning message beginning with
-.Fa name
-is printed for the current value of
-.Va errno .
-The process exits with status
-.Fa eval .
-.Sh RETURN VALUES
-The
-.Fn pw_copyx
-function returns 1 if the new password entry was successfully written
-to the destination file, and 0 otherwise.
-.Pp
-The
-.Fn pw_scan
-function prints a warning message and returns 0 if the string in the
-.Fa bp
-argument is not a valid passwd string.
-Otherwise,
-.Fn pw_scan
-returns 1.
-.Sh FILES
-.Bl -tag -width /etc/master.passwd -compact
-.It Pa /etc/master.passwd
-.It Pa /etc/ptmp
-.El
-.Sh SEE ALSO
-.Xr pw_lock 3 ,
-.Xr passwd 5
diff --git a/lib/libutil/pw_lock.3 b/lib/libutil/pw_lock.3
deleted file mode 100644
index e57d37dbb..000000000
--- a/lib/libutil/pw_lock.3
+++ /dev/null
@@ -1,139 +0,0 @@
-.\"	$NetBSD: pw_lock.3,v 1.14 2010/05/05 22:05:31 wiz Exp $
-.\"
-.\" Copyright (c) 1995
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software 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.
-.\" 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.
-.\"
-.Dd February 17, 2007
-.Dt PW_LOCK 3
-.Os
-.Sh NAME
-.Nm pw_lock ,
-.Nm pw_mkdb ,
-.Nm pw_abort ,
-.Nm pw_setprefix ,
-.Nm pw_getprefix
-.Nd passwd file update functions
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft int
-.Fn pw_lock "int retries"
-.Ft int
-.Fn pw_mkdb "const char *username" "int secureonly"
-.Ft void
-.Fn pw_abort "void"
-.Ft int
-.Fn pw_setprefix "const char *new_prefix"
-.Ft "const char *"
-.Fn pw_getprefix "void"
-.Sh DESCRIPTION
-The
-.Fn pw_lock ,
-.Fn pw_mkdb ,
-and
-.Fn pw_abort
-functions allow a program to update the system passwd database.
-.Pp
-The
-.Fn pw_lock
-function attempts to lock the passwd database by creating the file
-.Pa /etc/ptmp ,
-and returns the file descriptor of that file.
-If
-.Fa retries
-is greater than zero,
-.Fn pw_lock
-will try multiple times to open
-.Pa /etc/ptmp ,
-waiting one second between tries.
-In addition to being a lock file,
-.Pa /etc/ptmp
-will also hold the contents of the new passwd file.
-.Pp
-The
-.Fn pw_mkdb
-function updates the passwd file from the contents of
-.Pa /etc/ptmp .
-You should finish writing to and close the file descriptor returned by
-.Fn pw_lock
-before calling
-.Fn pw_mkdb .
-If
-.Fn pw_mkdb
-fails and you do not wish to retry, you should make sure to call
-.Fn pw_abort
-to clean up the lock file.
-If the
-.Ar username
-argument is not
-.Dv NULL ,
-only database entries pertaining to the specified user
-will be modified.
-If the
-.Ar secureonly
-argument is non-zero, only the secure database will be updated.
-.Pp
-The
-.Fn pw_abort
-function aborts a passwd file update by deleting
-.Pa /etc/ptmp .
-The passwd database remains unchanged.
-.Pp
-The
-.Fn pw_setprefix
-function defines the root directory used for passwd file updates.
-If the prefix is set to
-.Pa /newroot
-.Fn pw_lock
-will operate on
-.Pa /newroot/etc/ptmp
-afterwards.
-The default prefix is an empty string.
-.Pp
-The
-.Fn pw_getprefix
-function returns the root directory which is currently used for passwd file
-updates.
-.Sh RETURN VALUES
-The
-.Fn pw_lock
-and
-.Fn pw_mkdb
-functions return -1 if they are unable to complete properly.
-.Sh FILES
-.Bl -tag -width /etc/master.passwd -compact
-.It Pa /etc/master.passwd
-.It Pa /etc/ptmp
-.El
-.Sh SEE ALSO
-.Xr pw_init 3 ,
-.Xr pwd_mkdb 8
diff --git a/lib/libutil/raise_default_signal.3 b/lib/libutil/raise_default_signal.3
deleted file mode 100644
index 9b2c0a885..000000000
--- a/lib/libutil/raise_default_signal.3
+++ /dev/null
@@ -1,116 +0,0 @@
-.\"	$NetBSD: raise_default_signal.3,v 1.3 2011/03/27 12:53:16 njoly Exp $
-.\"
-.\" Copyright (c) 2007 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Luke Mewburn.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 25, 2007
-.Dt RAISE_DEFAULT_SIGNAL 3
-.Os
-.Sh NAME
-.Nm raise_default_signal
-.Nd raise the default signal handler
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft int
-.Fo raise_default_signal
-.Fa "int sig"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn raise_default_signal
-function raises the default signal handler for the signal
-.Fa sig .
-This function may be used by a user-defined signal handler router
-to ensure that a parent process receives the correct notification
-of a process termination by a signal.
-This can be used to avoid a common programming mistake
-when terminating a process from a custom
-.Dv SIGINT
-or
-.Dv SIGQUIT
-signal handler.
-.Pp
-The operations performed are:
-.Bl -enum -offset indent
-.It
-Block all signals, using
-.Xr sigprocmask 2 .
-.It
-Set the signal handler for signal
-.Fa sig
-to the default signal handler
-.Dv ( SIG_DFL ) .
-.It
-.Xr raise 3
-signal
-.Fa sig .
-.It
-Unblock signal
-.Fa sig
-to deliver it.
-.It
-Restore the original signal mask and handler,
-even if there was a failure.
-.El
-.Pp
-See
-.Xr signal 7
-for a table of signals and default actions.
-.Pp
-The
-.Fn raise_default_signal
-function should be async-signal-safe.
-.Sh RETURN VALUES
-Upon successful completion, a value of 0 is returned.
-Otherwise, a value of \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn raise_default_signal
-function may fail and set
-.Va errno
-for any of the errors specified for the functions
-.Xr sigemptyset 3 ,
-.Xr sigfillset 3 ,
-.Xr sigaddset 3 ,
-.Xr sigprocmask 2 ,
-.Xr sigaction 2 ,
-or
-.Xr raise 3 .
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr sigprocmask 2 ,
-.Xr raise 3 ,
-.Xr signal 7
-.Sh HISTORY
-The
-.Fn raise_default_signal
-function first appeared in
-.Nx 5.0 .
diff --git a/lib/libutil/raise_default_signal.c b/lib/libutil/raise_default_signal.c
deleted file mode 100644
index 50cffd440..000000000
--- a/lib/libutil/raise_default_signal.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*	$NetBSD: raise_default_signal.c,v 1.3 2008/04/28 20:23:03 martin Exp $	 */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: raise_default_signal.c,v 1.3 2008/04/28 20:23:03 martin Exp $");
-#endif
-
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-#include <util.h>
-
-#if ! HAVE_RAISE_DEFAULT_SIGNAL
-/*
- * raise_default_signal sig
- *	Raise the default signal handler for sig, by
- *	- block all signals
- *	- set the signal handler to SIG_DFL
- *	- raise the signal
- *	- unblock the signal to deliver it
- *
- *	The original signal mask and signal handler is restored on exit
- *	(whether successful or not).
- *
- *	Returns 0 on success, or -1 on failure with errno set to
- *	on of the values for sigemptyset(), sigaddset(), sigprocmask(),
- *	sigaction(), or raise().
- */
-int
-raise_default_signal(int sig)
-{
-	struct sigaction origact, act;
-	sigset_t origmask, fullmask, mask;
-	int retval, oerrno;
-
-	retval = -1;
-
-		/* Setup data structures */
-		/* XXX memset(3) isn't async-safe according to signal(7) */
-	(void)memset(&act, 0, sizeof(act));
-	act.sa_handler = SIG_DFL;
-	act.sa_flags = 0;
-	if ((sigemptyset(&act.sa_mask) == -1) ||
-	    (sigfillset(&fullmask) == -1) ||
-	    (sigemptyset(&mask) == -1) ||
-	    (sigaddset(&mask, sig) == -1))
-		goto restore_none;
-
-		/* Block all signals */
-	if (sigprocmask(SIG_BLOCK, &fullmask, &origmask) == -1)
-		goto restore_none;
-		/* (use 'goto restore_mask' to restore state) */
-
-		/* Enable the SIG_DFL handler */
-	if (sigaction(sig, &act, &origact) == -1)
-		goto restore_mask;
-		/* (use 'goto restore_act' to restore state) */
-
-		/* Raise the signal, and unblock the signal to deliver it */
-	if ((raise(sig) == -1) ||
-	    (sigprocmask(SIG_UNBLOCK, &mask, NULL) == -1))
-		goto restore_act;
-
-		/* Flag successful raise() */
-	retval = 0;
-
-		/* Restore the original handler */
- restore_act:
-	oerrno = errno;
-	(void)sigaction(sig, &origact, NULL);
-	errno = oerrno;
-
-		/* Restore the original mask */
- restore_mask:
-	oerrno = errno;
-	(void)sigprocmask(SIG_SETMASK, &origmask, NULL);
-	errno = oerrno;
-
- restore_none:
-	return retval;
-}
-
-#endif	/* ! HAVE_RAISE_DEFAULT_SIGNAL */
diff --git a/lib/libutil/secure_path.3 b/lib/libutil/secure_path.3
deleted file mode 100644
index 1506c3b1f..000000000
--- a/lib/libutil/secure_path.3
+++ /dev/null
@@ -1,71 +0,0 @@
-.\"	$NetBSD: secure_path.3,v 1.10 2010/05/04 06:41:27 jruoho Exp $
-.\"
-.\" Copyright (c) 1996,1997 Berkeley Software Design, Inc. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by Berkeley Software Design,
-.\"	Inc.
-.\" 4. The name of Berkeley Software Design, Inc.  may not be used to endorse
-.\"    or promote products derived from this software without specific prior
-.\"    written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN, INC. ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL BERKELEY SOFTWARE DESIGN, INC. BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" from BSDI: login_cap.3,v 1.4 1997/11/07 16:22:27 jch Exp
-.\"
-.Dd May 4, 2010
-.Dt SECURE_PATH 3
-.Os
-.Sh NAME
-.Nm secure_path
-.Nd determine if a file appears to be ``secure''
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft int
-.Fn secure_path "const char *path"
-.Sh DESCRIPTION
-The
-.Fn secure_path
-function takes a path name and returns zero if the referenced file is
-.Dq secure ,
-non-zero if not.
-Any
-.Dq insecurity ,
-other than failure to access
-the referenced file, will be logged to the system log.
-.Pp
-To be
-.Dq secure ,
-the referenced file must exist, be a regular file (and not a
-directory), owned by the super-user, and writable only by the super-user.
-.Sh SEE ALSO
-.Xr openlog 3
-.Sh HISTORY
-The
-.Fn secure_path
-function is based on the
-.Bsx
-implementation of same, and appeared in
-.Nx 1.5
-by kind permission.
diff --git a/lib/libutil/secure_path.c b/lib/libutil/secure_path.c
deleted file mode 100644
index 52ae92b16..000000000
--- a/lib/libutil/secure_path.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: secure_path.c,v 1.2 2003/01/06 20:30:30 wiz Exp $	*/
-
-/*-
- * Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Berkeley Software Design,
- *	Inc.
- * 4. The name of Berkeley Software Design, Inc.  may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL BERKELEY SOFTWARE DESIGN, INC. BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	BSDI login_cap.c,v 2.13 1998/02/07 03:17:05 prb Exp
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: secure_path.c,v 1.2 2003/01/06 20:30:30 wiz Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <syslog.h>
-#include <util.h>
-
-int
-secure_path(const char *path)
-{
-	struct stat sb;
-
-	_DIAGASSERT(path != NULL);
-
-	/*
-	 * If not a regular file, or is owned/writable by someone
-	 * other than root, quit.
-	 */
-	if (lstat(path, &sb) < 0)
-		/* syslog(LOG_ERR, "cannot stat %s: %m", path) */;
-	else if (!S_ISREG(sb.st_mode))
-		syslog(LOG_ERR, "%s: not a regular file", path);
-	else if (sb.st_uid != 0)
-		syslog(LOG_ERR, "%s: not owned by root", path);
-	else if ((sb.st_mode & (S_IWGRP | S_IWOTH)) != 0)
-		syslog(LOG_ERR, "%s: writable by non-root", path);
-	else
-		return (0);
-
-	return (-1);
-}
diff --git a/lib/libutil/shlib_version b/lib/libutil/shlib_version
deleted file mode 100644
index 656fe5923..000000000
--- a/lib/libutil/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.53 2015/09/24 14:39:20 christos Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=7
-minor=23
diff --git a/lib/libutil/snprintb.3 b/lib/libutil/snprintb.3
deleted file mode 100644
index a973ed1ad..000000000
--- a/lib/libutil/snprintb.3
+++ /dev/null
@@ -1,289 +0,0 @@
-.\"     $NetBSD: snprintb.3,v 1.16 2013/08/07 23:22:28 pgoyette Exp $
-.\"
-.\" Copyright (c) 1998 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jeremy Cooper.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 7, 2009
-.Dt SNPRINTB 3
-.Os
-.Sh NAME
-.Nm snprintb
-.Nd bitmask output conversion
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft int
-.Fn "snprintb" "char *buf" "size_t buflen" "const char *fmt" "uint64_t val"
-.Ft int
-.Fn "snprintb_m" "char *buf" "size_t buflen" "const char *fmt" "uint64_t val" \
-"size_t max"
-.Sh DESCRIPTION
-The
-.Fn snprintb
-function formats a bitmask into a mnemonic form suitable for printing.
-.Pp
-This conversion is useful for decoding bit fields in device registers.
-It formats the integer
-.Fa val
-into the buffer
-.Fa buf ,
-of size
-.Fa buflen ,
-using a specified radix and an interpretation of
-the bits within that integer as though they were flags.
-The buffer is always NUL-terminated.
-If the buffer
-.Fa buf
-is too small to hold the formatted output,
-.Fn snprintb
-will fill as much as it can, and return the number of bytes
-that would have written if the buffer was long enough excluding the
-terminating NUL.
-.Pp
-The decoding directive string
-.Fa fmt
-describes how the bitfield is to be interpreted and displayed.
-It follows two possible syntaxes, referred to as
-.Dq old
-and
-.Dq new .
-The main advantage of the
-.Dq new
-formatting is that it is capable of handling multi-bit fields.
-.Pp
-The first character of
-.Fa fmt
-may be
-.Li \e177 ,
-indicating that the remainder of the format string follows the
-.Dq new
-syntax.
-The second character
-.Pq the first for the old format
-is a binary character representation of the
-output numeral base in which the bitfield will be printed before it is decoded.
-Recognized radix values
-.Pq in C escape-character format
-are
-.Li \e10
-.Pq octal ,
-.Li \e12
-.Pq decimal ,
-and
-.Li \e20
-.Pq hexadecimal .
-.Pp
-The remaining characters in
-.Fa fmt
-are interpreted as a list of bit-position\(endescription pairs.
-From here the syntaxes diverge.
-.Pp
-The
-.Dq old
-format syntax is series of bit-position\(endescription pairs.
-Each begins with a binary character value that represents the position
-of the bit being described.
-A bit position value of one describes the least significant bit.
-Whereas a position value of 32
-.Pq octal 40, hexadecimal 20, the ASCII space character
-describes the most significant bit.
-.Pp
-The remaining characters in a bit-position\(endescription pair are the
-characters to print should the bit being described be set.
-Description strings are delimited by the next bit position value character
-encountered
-.Pq distinguishable by its value being \*[Le] 32 ,
-or the end of the decoding directive string itself.
-.Pp
-For the
-.Dq new
-format syntax, a bit-position\(endescription begins with a field type
-followed by a binary bit-position and possibly a field length.
-The least significant bit is bit-position zero, unlike the
-.Dq old
-syntax where it is one.
-.Bl -tag -width "xxxxx"
-.It Cm b\eB
-Describes a bit position.
-The bit-position
-.Fa B
-indicates the corresponding bit, as in the
-.Dq old
-format.
-.It Cm f\eB\eL
-Describes a multi-bit field beginning at bit-position
-.Fa B
-and having a bit-length of
-.Fa L .
-The remaining characters are printed as a description of the field
-followed by
-.Sq \&=
-and the value of the field.
-The value of the field is printed in the base specified as the second
-character of the decoding directive string
-.Ar fmt .
-.It Cm F\eB\eL
-Describes a multi-bit field like
-.Sq f ,
-but just extracts the value for use with the
-.Sq \&=
-and
-.Sq \&:
-formatting directives described below.
-.It Cm \&=\eV
-The field previously extracted by the last
-.Sq f
-or
-.Sq F
-operator is compared to the byte
-.Sq Cm V
-.Pq for values 0 through 255 .
-If they are equal,
-.Sq \&=
-followed by the string following
-.Sq Cm V
-is printed.
-This and the
-.Sq \&:
-operator may be repeated to annotate multiple possible values.
-.It Cm :\eV
-Operates like the
-.Sq \&=
-operator, but omits the leading
-.Sq \&= .
-.El
-.Pp
-Finally, each field is delimited by a NUL
-.Pq Sq \e0
-character.
-By convention, the format string has an additional NUL character at
-the end, following that delimiting the last bit-position\(endescription
-pair.
-.Pp
-The
-.Fn snprintb_m
-function accepts an additional
-.Fa max
-argument.
-If this argument is zero, the
-.Fn snprintb_m
-function returns exactly the same results in the
-.Fa buf
-as the
-.Fn snprintb
-function.
-If the
-.Fa max
-argument is present and has a non-zero value, it represents the maximum
-length of a formatted string.
-If the formatted string would require more than
-.Fa max
-characters, the
-.Fn snprintb_m
-function returns multiple formatted strings in the output buffer
-.Fa buf .
-Each string is NUL-terminated, and the last string is followed by an
-additional NUL character (or, if you prefer, a zero-length string).
-.Sh RETURN VALUES
-The
-.Fn snprintb
-and
-.Fn snprintb_m
-functions return the number of bytes that would have written to the buffer
-if there was adequate space, excluding the final terminating NUL, or \-1 in
-case an error occurred.
-For
-.Fn snprintb_m ,
-the NUL characters terminating each individual string are included in the
-total number of bytes.
-.Sh EXAMPLES
-Two examples of the old formatting style:
-.Bd -literal -offset indent
-snprintb(buf, buflen, "\e10\e2BITTWO\e1BITONE", 3)
-\(rA "03<BITTWO,BITONE>"
-
-snprintb(buf, buflen,
-       "\e20\ex10NOTBOOT\ex0f" "FPP\ex0eSDVMA\ex0cVIDEO"
-       "\ex0bLORES\ex0a" "FPA\ex09" "DIAG\ex07" "CACHE"
-       "\ex06IOCACHE\ex05LOOPBACK\ex04" "DBGCACHE",
-       0xe860)
-\(rA "0xe860<NOTBOOT,FPP,SDVMA,VIDEO,CACHE,IOCACHE>"
-.Ed
-.Pp
-An example of the new formatting style:
-.Bd -literal -offset indent
-snprintb(buf, buflen,
-       "\e177\e020b\e0LSB\e0b\e1_BITONE\e0f\e4\e4NIBBLE2\e0"
-       "f\ex10\e4BURST\e0=\e4FOUR\e0=\exfSIXTEEN\e0"
-       "b\ex1fMSB\e0\e0",
-       0x800f0701)
-\(rA "0x800f0701<LSB,NIBBLE2=0x0,BURST=0xf=SIXTEEN,MSB>"
-.Ed
-.Pp
-An example using snprintb_m:
-.Bd -literal -offset indent
-snprintb_m(buf, buflen,
-       "\e177\e020b\e0LSB\e0b\e1_BITONE\e0f\e4\e4NIBBLE2\e0"
-       "f\ex10\e4BURST\e0=\e4FOUR\e0=\exfSIXTEEN\e0"
-       "b\ex1fMSB\e0\e0",
-       0x800f0701, 34)
-\(rA "0x800f0701<LSB,NIBBLE2=0x0>\e00x800f0701<BURST=0xf=SIXTEEN,MSB>\e0"
-.Ed
-.Sh ERRORS
-.Fn snprintb
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The leading character does not describe a supported format,
-or
-.Fn snprintf
-failed.
-.El
-.Sh SEE ALSO
-.Xr printf 3 ,
-.Xr snprintf 3
-.Sh HISTORY
-The
-.Fn snprintb
-function was originally implemented as a non-standard
-.Li %b
-format string for the kernel
-.Fn printf
-function in
-.Nx 1.5
-and earlier releases.
-It was called
-.Fn bitmask_snprintf
-in
-.Nx 5.0
-and earlier releases.
-.Sh AUTHORS
-The
-.Dq new
-format was the invention of
-.An Chris Torek .
diff --git a/lib/libutil/sockaddr_snprintf.3 b/lib/libutil/sockaddr_snprintf.3
deleted file mode 100644
index e26ed47be..000000000
--- a/lib/libutil/sockaddr_snprintf.3
+++ /dev/null
@@ -1,240 +0,0 @@
-.\"     $NetBSD: sockaddr_snprintf.3,v 1.8 2013/06/07 17:23:26 christos Exp $
-.\"
-.\" Copyright (c) 2004 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd June 7, 2013
-.Dt SOCKADDR_SNPRINTF 3
-.Os
-.Sh NAME
-.Nm sockaddr_snprintf
-.Nd formatting function for socket address structures
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft int
-.Fn sockaddr_snprintf "char *buf" "size_t buflen" "const char *fmt" "const struct sockaddr *sa"
-.Sh DESCRIPTION
-The
-.Fn sockaddr_snprintf
-function formats a socket address into a form suitable for printing.
-.Pp
-This function is convenient because it is protocol independent, i.e. one does
-not need to know the address family of the sockaddr in order to print it.
-The
-.Xr printf 3
-like format string specifies how the address is going to be printed.
-Some formatting characters are only supported by some address families.
-If a certain formatting character is not supported, then the string
-.Dq N/A
-is printed.
-.Pp
-The resulting formatted string is placed into
-.Fa buf .
-Up to
-.Fa buflen
-characters are placed in
-.Fa buf .
-.Pp
-The following formatting characters are supported (immediately
-after a percent
-.Pq Sq %
-sign):
-.Bl -tag -width %a
-.It a
-The node address portion of the socket address is printed numerically.
-For
-.Dv AF_INET
-the address is printed as:
-.Dq A.B.C.D
-and
-for AF_INET6
-the address is printed as:
-.Dq A:B...[%if]
-using
-.Xr getnameinfo 3
-internally with
-.Dv NI_NUMERICHOST .
-For
-.Dv AF_APPLETALK
-the address is printed as:
-.Dq A.B
-For
-.Dv AF_LOCAL
-.Pq Dv AF_UNIX
-the address is printed as:
-.Dq socket-path
-For
-.Dv AF_LINK
-the address is printed as:
-.Dq a.b.c.d.e.f
-using
-.Xr link_ntoa 3 ,
-but the interface portion is skipped (see below).
-For
-.Dv AF_UNSPEC
-nothing is printed.
-.It A
-The symbolic name of the address is printed.
-For
-.Dv AF_INET
-and
-.Dv AF_INET6
-this is the hostname associated with the address.
-For all other address families, it is the same as the
-.Dq a
-format.
-.It D
-Debugging output:
-For all addresses, print all their fields as
-.Dq field_name=value .
-.It f
-The numeric value of the family of the address is printed.
-.It l
-The length of the socket address is printed.
-.It p
-For
-.Dv AF_INET ,
-.Dv AF_INET6 ,
-and
-.Dv AF_APPLETALK
-the numeric value of the port portion of the address is printed.
-.It P
-For
-.Dv AF_INET
-and
-.Dv AF_INET6
-this is the name of the service associated with the port number, if
-available.
-For all other address families, it is the same as the
-.Dq p
-format.
-.It I
-For
-.Dv AF_LINK
-addresses, the interface name portion is printed.
-.It F
-For
-.Dv AF_INET6
-addresses, the flowinfo portion of the address is printed numerically.
-.It R
-For
-.Dv AF_APPLETALK
-addresses, the netrange portion of the address is printed as:
-.Dq phase:[firstnet,lastnet]
-.It S
-For
-.Dv AF_INET6
-addresses, the scope portion of the address is printed numerically.
-.It ?
-If present between
-.Dq %
-and the format character, and the selected format does not apply to
-the given address family, the
-.Dq N/A
-string is elided and no output results.
-.El
-.Sh RETURN VALUES
-The
-.Fn sockaddr_snprintf
-function returns the number of characters that are required to format the
-value
-.Fa val
-given the format string
-.Fa fmt
-excluding the terminating NUL.
-The returned string in
-.Fa buf
-is always NUL-terminated.
-If the address family is not supported,
-.Fn sockaddr_snprintf
-returns \-1 and sets
-.Va errno
-to
-.Dv EAFNOSUPPORT .
-For
-.Dv AF_INET
-and
-.Dv AF_INET6
-addresses
-.Fn sockaddr_snprintf
-returns \-1 if the
-.Xr getnameinfo 3
-conversion failed, and
-.Fa errno
-is set to the error value from
-.Xr getnameinfo 3 .
-.Sh ERRORS
-If the buffer
-.Fa buf
-is too small to hold the formatted output,
-.Fn sockaddr_snprintf
-will still return the buffer, containing a truncated string.
-.Sh SEE ALSO
-.Xr getaddrinfo 3 ,
-.Xr getnameinfo 3 ,
-.Xr link_ntoa 3 ,
-.Xr snprintf 3
-.Sh HISTORY
-The
-.Fn sockaddr_snprintf
-first appeared in
-.Nx 3.0 .
-.Sh BUGS
-The
-.Fn sockaddr_snprintf
-interface is experimental and might change in the future.
-.Pp
-There is no way to specify different formatting styles for particular
-addresses.
-For example it would be useful to print
-.Dv AF_LINK
-addresses as
-.Dq %.2x:%.2x...
-instead of
-.Dq %x.%x...
-.Pp
-This function is supposed to be quick, but
-.Xr getnameinfo 3
-might use system calls to convert the scope number to an interface
-name and the
-.Dq A
-and
-.Dq P
-format characters call
-.Xr getaddrinfo 3
-which may block for a noticeable period of time.
-.Pp
-Not all formatting characters are supported by all address families and
-printing
-.Dq N/A
-is not very convenient.
-The
-.Dq \&?
-character can suppress this, but other formatting (e.g., spacing or
-punctuation) will remain.
diff --git a/lib/libutil/sockaddr_snprintf.c b/lib/libutil/sockaddr_snprintf.c
deleted file mode 100644
index 0dcd0eba9..000000000
--- a/lib/libutil/sockaddr_snprintf.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/*	$NetBSD: sockaddr_snprintf.c,v 1.11 2013/12/31 12:58:02 mlelstv Exp $	*/
-
-/*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.11 2013/12/31 12:58:02 mlelstv Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-#include <netinet/in.h>
-#include <netatalk/at.h>
-#include <net/if_dl.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <util.h>
-#include <netdb.h>
-
-static int
-debug_at(char *str, size_t len, const struct sockaddr_at *sat)
-{
-	return snprintf(str, len, "sat_len=%u, sat_family=%u, sat_port=%u, "
-	    "sat_addr.s_net=%u, sat_addr.s_node=%u, "
-	    "sat_range.r_netrange.nr_phase=%u, "
-	    "sat_range.r_netrange.nr_firstnet=%u, "
-	    "sat_range.r_netrange.nr_lastnet=%u",
-	    sat->sat_len, sat->sat_family, sat->sat_port,
-	    sat->sat_addr.s_net, sat->sat_addr.s_node,
-	    sat->sat_range.r_netrange.nr_phase,
-	    sat->sat_range.r_netrange.nr_firstnet,
-	    sat->sat_range.r_netrange.nr_lastnet);
-}
-
-static int
-debug_in(char *str, size_t len, const struct sockaddr_in *sin)
-{
-	return snprintf(str, len, "sin_len=%u, sin_family=%u, sin_port=%u, "
-	    "sin_addr.s_addr=%08x",
-	    sin->sin_len, sin->sin_family, sin->sin_port,
-	    sin->sin_addr.s_addr);
-}
-
-static int
-debug_in6(char *str, size_t len, const struct sockaddr_in6 *sin6)
-{
-	const uint8_t *s = sin6->sin6_addr.s6_addr;
-
-	return snprintf(str, len, "sin6_len=%u, sin6_family=%u, sin6_port=%u, "
-	    "sin6_flowinfo=%u, "
-	    "sin6_addr=%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:"
-	    "%02x:%02x:%02x:%02x:%02x:%02x, sin6_scope_id=%u",
-	    sin6->sin6_len, sin6->sin6_family, sin6->sin6_port,
-	    sin6->sin6_flowinfo, s[0x0], s[0x1], s[0x2], s[0x3], s[0x4], s[0x5],
-	    s[0x6], s[0x7], s[0x8], s[0x9], s[0xa], s[0xb], s[0xc], s[0xd],
-	    s[0xe], s[0xf], sin6->sin6_scope_id);
-}
-
-static int
-debug_un(char *str, size_t len, const struct sockaddr_un *sun)
-{
-	return snprintf(str, len, "sun_len=%u, sun_family=%u, sun_path=%*s",
-	    sun->sun_len, sun->sun_family, (int)sizeof(sun->sun_path),
-	    sun->sun_path);
-}
-
-static int
-debug_dl(char *str, size_t len, const struct sockaddr_dl *sdl)
-{
-	const uint8_t *s = (const void *)sdl->sdl_data;
-
-	return snprintf(str, len, "sdl_len=%u, sdl_family=%u, sdl_index=%u, "
-	    "sdl_type=%u, sdl_nlen=%u, sdl_alen=%u, sdl_slen=%u, sdl_data="
-	    "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
-	    sdl->sdl_len, sdl->sdl_family, sdl->sdl_index,
-	    sdl->sdl_type, sdl->sdl_nlen, sdl->sdl_alen, sdl->sdl_slen,
-	    s[0x0], s[0x1], s[0x2], s[0x3], s[0x4], s[0x5],
-	    s[0x6], s[0x7], s[0x8], s[0x9], s[0xa], s[0xb]);
-}
-
-int
-sockaddr_snprintf(char * const sbuf, const size_t len, const char * const fmt,
-    const struct sockaddr * const sa)
-{
-	const void *a = NULL;
-	char abuf[1024], nbuf[1024], *addr = NULL, *w = NULL;
-	char Abuf[1024], pbuf[32], *name = NULL, *port = NULL;
-	char *ebuf = &sbuf[len - 1], *buf = sbuf;
-	const char *ptr, *s;
-	int p = -1;
-	const struct sockaddr_at *sat = NULL;
-	const struct sockaddr_in *sin4 = NULL;
-	const struct sockaddr_in6 *sin6 = NULL;
-	const struct sockaddr_un *sun = NULL;
-	const struct sockaddr_dl *sdl = NULL;
-	int na = 1;
-
-#define ADDC(c) do { if (buf < ebuf) *buf++ = c; else buf++; } \
-	while (/*CONSTCOND*/0)
-#define ADDS(p) do { for (s = p; *s; s++) ADDC(*s); } \
-	while (/*CONSTCOND*/0)
-#define ADDNA() do { if (na) ADDS("N/A"); } \
-	while (/*CONSTCOND*/0)
-
-	switch (sa->sa_family) {
-	case AF_UNSPEC:
-		goto done;
-	case AF_APPLETALK:
-		sat = ((const struct sockaddr_at *)(const void *)sa);
-		p = ntohs(sat->sat_port);
-		(void)snprintf(addr = abuf, sizeof(abuf), "%u.%u",
-			ntohs(sat->sat_addr.s_net), sat->sat_addr.s_node);
-		(void)snprintf(port = pbuf, sizeof(pbuf), "%d", p);
-		break;
-	case AF_LOCAL:
-		sun = ((const struct sockaddr_un *)(const void *)sa);
-		(void)strlcpy(addr = abuf, sun->sun_path, sizeof(abuf));
-		break;
-	case AF_INET:
-		sin4 = ((const struct sockaddr_in *)(const void *)sa);
-		p = ntohs(sin4->sin_port);
-		a = &sin4->sin_addr;
-		break;
-	case AF_INET6:
-		sin6 = ((const struct sockaddr_in6 *)(const void *)sa);
-		p = ntohs(sin6->sin6_port);
-		a = &sin6->sin6_addr;
-		break;
-	case AF_LINK:
-		sdl = ((const struct sockaddr_dl *)(const void *)sa);
-		(void)strlcpy(addr = abuf, link_ntoa(sdl), sizeof(abuf));
-		if ((w = strchr(addr, ':')) != 0) {
-			*w++ = '\0';
-			addr = w;
-		}
-		break;
-	default:
-		errno = EAFNOSUPPORT;
-		return -1;
-	}
-
-	if (addr == abuf)
-		name = addr;
-
-	if (a && getnameinfo(sa, (socklen_t)sa->sa_len, addr = abuf,
-	    (unsigned int)sizeof(abuf), NULL, 0,
-	    NI_NUMERICHOST|NI_NUMERICSERV) != 0)
-		return -1;
-
-	for (ptr = fmt; *ptr; ptr++) {
-		if (*ptr != '%') {
-			ADDC(*ptr);
-			continue;
-		}
-	  next_char:
-		switch (*++ptr) {
-		case '?':
-			na = 0;
-			goto next_char;
-		case 'a':
-			ADDS(addr);
-			break;
-		case 'p':
-			if (p != -1) {
-				(void)snprintf(nbuf, sizeof(nbuf), "%d", p);
-				ADDS(nbuf);
-			} else
-				ADDNA();
-			break;
-		case 'f':
-			(void)snprintf(nbuf, sizeof(nbuf), "%d", sa->sa_family);
-			ADDS(nbuf);
-			break;
-		case 'l':
-			(void)snprintf(nbuf, sizeof(nbuf), "%d", sa->sa_len);
-			ADDS(nbuf);
-			break;
-		case 'A':
-			if (name)
-				ADDS(name);
-			else if (!a)
-				ADDNA();
-			else {
-				getnameinfo(sa, (socklen_t)sa->sa_len,
-					name = Abuf,
-					(unsigned int)sizeof(nbuf), NULL, 0, 0);
-				ADDS(name);
-			}
-			break;
-		case 'P':
-			if (port)
-				ADDS(port);
-			else if (p == -1)
-				ADDNA();
-			else {
-				getnameinfo(sa, (socklen_t)sa->sa_len, NULL, 0,
-					port = pbuf,
-					(unsigned int)sizeof(pbuf), 0);
-				ADDS(port);
-			}
-			break;
-		case 'I':
-			if (sdl && addr != abuf) {
-				ADDS(abuf);
-			} else {
-				ADDNA();
-			}
-			break;
-		case 'F':
-			if (sin6) {
-				(void)snprintf(nbuf, sizeof(nbuf), "%d",
-				    sin6->sin6_flowinfo);
-				ADDS(nbuf);
-				break;
-			} else {
-				ADDNA();
-			}
-			break;
-		case 'S':
-			if (sin6) {
-				(void)snprintf(nbuf, sizeof(nbuf), "%d",
-				    sin6->sin6_scope_id);
-				ADDS(nbuf);
-				break;
-			} else {
-				ADDNA();
-			}
-			break;
-		case 'R':
-			if (sat) {
-				const struct netrange *n =
-				    &sat->sat_range.r_netrange;
-				(void)snprintf(nbuf, sizeof(nbuf),
-				    "%d:[%d,%d]", n->nr_phase , n->nr_firstnet,
-				    n->nr_lastnet);
-				ADDS(nbuf);
-			} else {
-				ADDNA();
-			}
-			break;
-		case 'D':
-			switch (sa->sa_family) {
-			case AF_APPLETALK:
-				debug_at(nbuf, sizeof(nbuf), sat);
-				break;
-			case AF_LOCAL:
-				debug_un(nbuf, sizeof(nbuf), sun);
-				break;
-			case AF_INET:
-				debug_in(nbuf, sizeof(nbuf), sin4);
-				break;
-			case AF_INET6:
-				debug_in6(nbuf, sizeof(nbuf), sin6);
-				break;
-			case AF_LINK:
-				debug_dl(nbuf, sizeof(nbuf), sdl);
-				break;
-			default:
-				abort();
-			}
-			ADDS(nbuf);
-			break;
-		default:
-			ADDC('%');
-			if (na == 0)
-				ADDC('?');
-			if (*ptr == '\0')
-				goto done;
-			/*FALLTHROUGH*/
-		case '%':
-			ADDC(*ptr);
-			break;
-		}
-		na = 1;
-	}
-done:
-	if (buf < ebuf)
-		*buf = '\0';
-	else if (len != 0)
-		sbuf[len - 1] = '\0';
-	return (int)(buf - sbuf);
-}
diff --git a/lib/libutil/stat_flags.3 b/lib/libutil/stat_flags.3
deleted file mode 100644
index 4b30d423a..000000000
--- a/lib/libutil/stat_flags.3
+++ /dev/null
@@ -1,126 +0,0 @@
-.\" $NetBSD: stat_flags.3,v 1.8 2012/09/19 23:22:56 wiz Exp $
-.\"
-.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 20, 2012
-.Dt STAT_FLAGS 3
-.Os
-.Sh NAME
-.Nm string_to_flags ,
-.Nm flags_to_string
-.Nd Stat flags parsing and printing functions
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft char *
-.Fn flags_to_string "u_long flags" "const char *def"
-.Ft int
-.Fn string_to_flags "char **stringp" "u_long *setp" "u_long *clrp"
-.Sh DESCRIPTION
-The
-.Fn flags_to_string
-and
-.Fn string_to_flags
-functions are used by
-programs such as
-.Xr ls 1 ,
-.Xr mtree 8 ,
-.Xr makefs 8 ,
-etc., to parse and/or print the
-.Dv st_flags field in the
-.Xr stat 2
-structure.
-.Pp
-They recognize the following flags:
-.Bl -column -offset indent "uappnd " "SF_IMMUTABLE" "xxx"
-.It Sy String Ta Sy Flag Ta Sy Description
-.It Va arch Ta Dv SF_ARCHIVED Ta file is archived
-.It Va nodump Ta Dv UF_NODUMP Ta do not dump file
-.It Va opaque Ta Dv UF_OPAQUE Ta directory is opaque in union filesystems
-.It Va sappnd Ta Dv SF_APPEND Ta writes to the file may only append
-.It Va schg Ta Dv SF_IMMUTABLE Ta file cannot be changed; it is immutable
-.It Va snap Ta Dv SF_SNAPSHOT Ta file is a snapshot inode
-.It Va uappnd Ta Dv UF_APPEND Ta writes to the file may only append
-.It Va uchg Ta Dv UF_IMMUTABLE Ta file cannot be changed; it is immutable
-.El
-.Pp
-The
-.Dv SF_APPEND
-and
-.Dv SF_IMMUTABLE
-flags are for the superuser only, whereas
-.Dv UF_APPEND
-and
-.Dv UF_IMMUTABLE
-are for the user only.
-.Pp
-The
-.Fn flags_to_string
-function converts the bits set in the
-.Fa flags
-argument to a comma-separated string and returns it.
-If no flags are set, then the
-.Fa def
-string is returned.
-The returned string is allocated via
-.Xr malloc 3
-and it is the responsibility of the caller to
-.Xr free 3
-it.
-.Pp
-The
-.Fn string_to_flags
-function takes a
-.Fa stringp
-of space, comma, or tab separated flag names
-and places their bit value on the
-.Fa setp
-argument.
-If the flag name is prefixed by:
-.Dq no ,
-then the bit value is placed on the
-.Fa clrp
-argument.
-.Sh RETURN VALUES
-.Fn flags_to_string
-returns the symbolic representation of flags, the default string, or
-.Dv NULL
-if allocation failed.
-.Pp
-.Fn string_to_flags
-returns
-.Dv 0
-on success and
-.Dv 1
-if it fails to parse the string, setting
-.Fa stringp
-to point to the first string that it failed to parse.
-.Sh SEE ALSO
-.Xr chflags 2 ,
-.Xr stat 2
diff --git a/lib/libutil/stat_flags.c b/lib/libutil/stat_flags.c
deleted file mode 100644
index d2c298e5f..000000000
--- a/lib/libutil/stat_flags.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*	$NetBSD: stat_flags.c,v 1.2 2007/01/16 17:34:02 cbiere Exp $	*/
-
-/*-
- * 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#else
-#define HAVE_STRUCT_STAT_ST_FLAGS 1
-#endif
-
-#include <sys/cdefs.h>
-#if !defined(lint)
-#if 0
-static char sccsid[] = "@(#)stat_flags.c	8.2 (Berkeley) 7/28/94";
-#else
-__RCSID("$NetBSD: stat_flags.c,v 1.2 2007/01/16 17:34:02 cbiere Exp $");
-#endif
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fts.h>
-#include <stddef.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "util.h"
-
-#define	SAPPEND(s) do {							\
-	if (prefix != NULL)						\
-		(void)strlcat(string, prefix, sizeof(string));		\
-	(void)strlcat(string, s, sizeof(string));			\
-	prefix = ",";							\
-} while (/* CONSTCOND */ 0)
-
-/*
- * flags_to_string --
- *	Convert stat flags to a comma-separated string.  If no flags
- *	are set, return the default string.
- */
-char *
-flags_to_string(u_long flags, const char *def)
-{
-	char string[128];
-	const char *prefix;
-
-	string[0] = '\0';
-	prefix = NULL;
-#if HAVE_STRUCT_STAT_ST_FLAGS
-	if (flags & UF_APPEND)
-		SAPPEND("uappnd");
-	if (flags & UF_IMMUTABLE)
-		SAPPEND("uchg");
-	if (flags & UF_NODUMP)
-		SAPPEND("nodump");
-	if (flags & UF_OPAQUE)
-		SAPPEND("opaque");
-	if (flags & SF_APPEND)
-		SAPPEND("sappnd");
-	if (flags & SF_ARCHIVED)
-		SAPPEND("arch");
-	if (flags & SF_IMMUTABLE)
-		SAPPEND("schg");
-#ifdef SF_SNAPSHOT
-	if (flags & SF_SNAPSHOT)
-		SAPPEND("snap");
-#endif
-#endif
-	if (prefix != NULL)
-		return strdup(string);
-	return strdup(def);
-}
-
-#define	TEST(a, b, f) {							\
-	if (!strcmp(a, b)) {						\
-		if (clear) {						\
-			if (clrp)					\
-				*clrp |= (f);				\
-			if (setp)					\
-				*setp &= ~(f);				\
-		} else {						\
-			if (setp)					\
-				*setp |= (f);				\
-			if (clrp)					\
-				*clrp &= ~(f);				\
-		}							\
-		break;							\
-	}								\
-}
-
-/*
- * string_to_flags --
- *	Take string of arguments and return stat flags.  Return 0 on
- *	success, 1 on failure.  On failure, stringp is set to point
- *	to the offending token.
- */
-int
-string_to_flags(char **stringp, u_long *setp, u_long *clrp)
-{
-	int clear;
-	char *string, *p;
-
-	if (setp)
-		*setp = 0;
-	if (clrp)
-		*clrp = 0;
-
-#if HAVE_STRUCT_STAT_ST_FLAGS
-	string = *stringp;
-	while ((p = strsep(&string, "\t ,")) != NULL) {
-		clear = 0;
-		*stringp = p;
-		if (*p == '\0')
-			continue;
-		if (p[0] == 'n' && p[1] == 'o') {
-			clear = 1;
-			p += 2;
-		}
-		switch (p[0]) {
-		case 'a':
-			TEST(p, "arch", SF_ARCHIVED);
-			TEST(p, "archived", SF_ARCHIVED);
-			return (1);
-		case 'd':
-			clear = !clear;
-			TEST(p, "dump", UF_NODUMP);
-			return (1);
-		case 'n':
-				/*
-				 * Support `nonodump'. Note that
-				 * the state of clear is not changed.
-				 */
-			TEST(p, "nodump", UF_NODUMP);
-			return (1);
-		case 'o':
-			TEST(p, "opaque", UF_OPAQUE);
-			return (1);
-		case 's':
-			TEST(p, "sappnd", SF_APPEND);
-			TEST(p, "sappend", SF_APPEND);
-			TEST(p, "schg", SF_IMMUTABLE);
-			TEST(p, "schange", SF_IMMUTABLE);
-			TEST(p, "simmutable", SF_IMMUTABLE);
-			return (1);
-		case 'u':
-			TEST(p, "uappnd", UF_APPEND);
-			TEST(p, "uappend", UF_APPEND);
-			TEST(p, "uchg", UF_IMMUTABLE);
-			TEST(p, "uchange", UF_IMMUTABLE);
-			TEST(p, "uimmutable", UF_IMMUTABLE);
-			return (1);
-		default:
-			return (1);
-		}
-	}
-#endif
-
-	return (0);
-}
diff --git a/lib/libutil/strpct.3 b/lib/libutil/strpct.3
deleted file mode 100644
index 22e04a1b7..000000000
--- a/lib/libutil/strpct.3
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" $NetBSD: strpct.3,v 1.6 2014/03/18 18:20:38 riastradh Exp $
-.\"
-.\" Copyright (c) 2011 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This file was contributed to The NetBSD Foundation by Christos Zoulas.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 7, 2012
-.Dt STRPCT 3
-.Os
-.Sh NAME
-.Nm strpct ,
-.Nm strspct
-.Nd decimal percent formatters
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft char *
-.Fn strpct "char *buf" "size_t bufsiz" "uintmax_t numerator" "uintmax_t denominator" "size_t precision"
-.Ft char *
-.Fn strspct "char *buf" "size_t bufsiz" "intmax_t numerator" "intmax_t denominator" "size_t precision"
-.Sh DESCRIPTION
-The
-.Fn strpct
-function formats the fraction represented by
-.Fa numerator
-and
-.Fa denominator
-into a percentage representation with given number of digits of
-.Fa precision
-without using floating point arithmetic.
-.Sh RETURN VALUES
-.Fn strpct
-and
-.Fn strspct
-always return a pointer to a NUL-terminated (unless
-.Fa buflen
-is
-.Dv 0 )
-formatted string which
-is placed in
-.Fa buf
-and is up to
-.Fa buflen
-characters.
-If there was an overflow, the formatted string will reflect that precision
-loss.
-.Sh EXAMPLES
-.Bd -literal -offset indent
-strpct(buf, buflen, 1, 16, 3);
-\(rA "6.250"
-strpct(buf, buflen, 1, 2, 0);
-\(rA "50"
-.Ed
-.Sh HISTORY
-.Fn strpct
-was originally implemented in
-.Xr csh 1
-for
-.Nx 1.3 .
-It printed into a static buffer, was not locale aware, handled
-.Ft unsigned long
-numbers, and printed a
-.Dq %
-at the end of the number.
-Other programs such as
-.Xr df 1
-and
-.Xr time 1
-started using it.
-.Fn strpct
-and
-.Fn strspct
-appeared separately in libutil for
-.Nx 6.0 .
-.Sh AUTHORS
-.An Erik E. Fair Aq Mt fair@netbsd.org
diff --git a/lib/libutil/strpct.c b/lib/libutil/strpct.c
deleted file mode 100644
index b13806e18..000000000
--- a/lib/libutil/strpct.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* $NetBSD: strpct.c,v 1.3 2012/01/07 18:40:56 christos Exp $ */
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Erik E. Fair
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Calculate a percentage without resorting to floating point
- * and return a pointer to a string
- *
- * "digits" is the number of digits past the decimal place you want
- * (zero being the straight percentage with no decimals)
- *
- * Erik E. Fair <fair@clock.org>, May 8, 1997
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: strpct.c,v 1.3 2012/01/07 18:40:56 christos Exp $");
-
-#include <stdint.h>
-#include <locale.h>
-#include <limits.h>
-#include <stdio.h>
-#include <errno.h>
-#include <util.h>
-
-char *
-strspct(char *buf, size_t bufsiz, intmax_t numerator, intmax_t denominator,
-    size_t digits)
-{
-	int sign;
-
-	switch (bufsiz) {
-	case 1:
-		*buf = '\0';
-		/*FALLTHROUGH*/
-	case 0:
-		return buf;
-	default:
-		break;
-	}
-
-	if (denominator < 0) {
-		denominator = -denominator;
-		sign = 1;
-	} else
-		sign = 0;
-
-	if (numerator < 0) {
-		numerator = -numerator;
-		sign++;
-	}
-
-	sign &= 1;
-	(void)strpct(buf + sign, bufsiz - sign, (uintmax_t)numerator,
-	    (uintmax_t)denominator, digits);
-	if (sign)
-		*buf = '-';
-	return buf;
-}
-
-char *
-strpct(char *buf, size_t bufsiz, uintmax_t numerator, uintmax_t denominator,
-    size_t digits)
-{
-	uintmax_t factor, result;
-	size_t u;
-
-	factor = 100;
-	for (u = 0; u < digits; u++) {
-		/* watch out for overflow! */
-		if (factor < (UINTMAX_MAX / 10))
-			factor *= 10;
-		else
-			break;
-	}
-
-	/* watch out for overflow! */
-	if (numerator < (UINTMAX_MAX / factor))
-		numerator *= factor;
-	else {
-		/* toss some of the bits of lesser significance */
-		denominator /= factor;
-	}
-
-	if (denominator == 0)
-		denominator = 1;
-
-	result = numerator / denominator;
-
-	if (digits == 0)
-		(void)snprintf(buf, bufsiz, "%ju", result);
-	else {
-		factor /= 100;		/* undo initialization */
-
-		(void)snprintf(buf, bufsiz, "%ju%s%0*ju",
-		    result / factor, localeconv()->decimal_point, (int)u,
-		    result % factor);
-	}       
-
-	return buf;
-}
diff --git a/lib/libutil/ttyaction.3 b/lib/libutil/ttyaction.3
deleted file mode 100644
index 318ca3e9d..000000000
--- a/lib/libutil/ttyaction.3
+++ /dev/null
@@ -1,108 +0,0 @@
-.\" $NetBSD: ttyaction.3,v 1.15 2010/05/04 06:41:27 jruoho Exp $
-.\"
-.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Gordon W. Ross.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 4, 2010
-.Dt TTYACTION 3
-.Os
-.Sh NAME
-.Nm ttyaction
-.Nd ttyaction utility function
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft int
-.Fn ttyaction "char *ttyname" "char *action" "char *username"
-.Sh DESCRIPTION
-The
-.Fn ttyaction
-function is used by
-.Xr login 1 ,
-.Xr getty 8 ,
-.Xr telnetd 8
-and
-.Xr rlogind 8
-to execute site-specific commands
-when a login session begins and ends.
-.Pp
-The
-.Fn ttyaction
-function scans the
-.Pa /etc/ttyaction
-file for any records that match the current
-.Fa ttyname
-and
-.Fa action
-parameters, and for each matching record,
-runs the shell command shown in that record.
-The record format is described in
-.Xr ttyaction 5 .
-The parameter
-.Fa username
-is the name of the new owner of the
-.Fa ttyname
-device.
-Note that the
-.Fa ttyname
-parameter may be passed as a fully qualified pathname, and the
-.Fn ttyaction
-function will skip the leading "/dev/" part of the string.
-(This is a convenience for login and getty.)
-.Sh RETURN VALUES
-.Fn ttyaction
-returns the status of the last command it executed,
-or zero if no matching commands were found.
-.Sh FILES
-.Bl -tag -width /etc/ttyaction -compact
-.It Pa /dev/\(**
-.It Pa /etc/ttyaction
-.El
-.Sh SEE ALSO
-.Xr ttyaction 5
-.Sh AUTHORS
-.An Gordon W. Ross
-.Aq gwr@NetBSD.org ,
-.An Chris G. Demetriou
-.Aq cgd@NetBSD.org ,
-.An Ty Sarna
-.Aq tsarna@NetBSD.org .
-.Sh BUGS
-There should be some
-.Em other
-mechanism to allow selection of different access control policies
-on a per-line basis.
-It has been suggested that the same
-.Fn ttyaction
-mechanism should also be used for determining access control, but
-it was decided (after much discussion) that
-.Fn ttyaction
-should only describe actions to be performed
-.Em after
-the system has decided to change the ownership of some tty.
-Access control policies will be handled by a separate mechanism.
diff --git a/lib/libutil/ttyaction.c b/lib/libutil/ttyaction.c
deleted file mode 100644
index dd6680127..000000000
--- a/lib/libutil/ttyaction.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*	$NetBSD: ttyaction.c,v 1.19 2008/04/28 20:23:03 martin Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Gordon W. Ross.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For each matching "tty" and "action" run the "command."
- * See fnmatch() for matching the tty name.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ttyaction.c,v 1.19 2008/04/28 20:23:03 martin Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <fnmatch.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "util.h"
-
-#ifndef _PATH_TTYACTION
-#define _PATH_TTYACTION "/etc/ttyaction"
-#endif
-
-static const char *actfile = _PATH_TTYACTION;
-static const char *pathenv = "PATH=" _PATH_STDPATH;
-
-int
-ttyaction(const char *tty, const char *act, const char *user)
-{
-	FILE *fp;
-	char *p1, *p2;
-	const char *argv[4];
-	const char *envp[8];
-	char *lastp;
-	char line[1024];
-	char env_tty[64];
-	char env_act[64];
-	char env_user[256];
-	int error, linenum, status;
-	pid_t pid;
-
-	_DIAGASSERT(tty != NULL);
-	_DIAGASSERT(act != NULL);
-	_DIAGASSERT(user != NULL);
-
-	fp = fopen(actfile, "r");
-	if (fp == NULL)
-		return 0;
-
-	/* Skip the "/dev/" part of the first arg. */
-	if (!strncmp(tty, "/dev/", (size_t)5))
-		tty += 5;
-
-	/* Args will be: "sh -c ..." */
-	argv[0] = _PATH_BSHELL;
-	argv[1] = "-c";
-	argv[2] = NULL;	/* see below */
-	argv[3] = NULL;
-
-	/*
-	 * Environment needs: TTY, ACT, USER
-	 */
-	snprintf(env_tty, sizeof(env_tty), "TTY=%s", tty);
-	snprintf(env_act, sizeof(env_act), "ACT=%s", act);
-	snprintf(env_user, sizeof(env_user), "USER=%s", user);
-	envp[0] = pathenv;
-	envp[1] = env_tty;
-	envp[2] = env_act;
-	envp[3] = env_user;
-	envp[4] = NULL;
-
-	linenum = 0;
-	status = 0;
-	while (fgets(line, (int)sizeof(line), fp)) {
-		linenum++;
-
-		/* Allow comment lines. */
-		if (line[0] == '#')
-			continue;
-
-		p1 = strtok_r(line, " \t", &lastp);
-		p2 = strtok_r(NULL, " \t", &lastp);
-		/* This arg goes to end of line. */
-		argv[2] = strtok_r(NULL, "\n", &lastp);
-		if (!p1 || !p2 || !argv[2]) {
-			warnx("%s: line %d format error", actfile, linenum);
-			continue;
-		}
-		if (fnmatch(p1, tty, 0) || fnmatch(p2, act, 0))
-			continue;
-		/* OK, this is a match.  Run the command. */
-		pid = fork();
-		if (pid == -1) {
-			warnx("fork failed: %s", strerror(errno));
-			continue;
-		}
-		if (pid == 0) {
-			/* This is the child. */
-			error = execve(argv[0], 
-			    (char *const *)__UNCONST(argv),
-			    (char *const *)__UNCONST(envp));
-			/* If we get here, it is an error. */
-			warnx("%s: line %d: exec failed: %s",
-				  actfile, linenum, strerror(errno));
-			_exit(1);
-		}
-		/* This is the parent. */
-		error = waitpid(pid, &status, 0);
-		if (error == -1) {
-			warnx("%s: line %d: wait failed: %s",
-				  actfile, linenum, strerror(errno));
-			continue;
-		}
-		if (WTERMSIG(status)) {
-			warnx("%s: line %d: child died with signal %d",
-				  actfile, linenum, WTERMSIG(status));
-			continue;
-		}
-	}
-	fclose(fp);
-	return status;
-}
diff --git a/lib/libutil/ttymsg.3 b/lib/libutil/ttymsg.3
deleted file mode 100644
index 8fd2e06b8..000000000
--- a/lib/libutil/ttymsg.3
+++ /dev/null
@@ -1,68 +0,0 @@
-.\" $NetBSD: ttymsg.3,v 1.13 2013/01/16 06:44:27 wiz Exp $
-.\"
-.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 15, 2013
-.Dt TTYMSG 3
-.Os
-.Sh NAME
-.Nm ttymsg
-.Nd ttymsg utility function
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In util.h
-.Ft char *
-.Fn ttymsg "struct iovec *iov" "int iovlen" "const char *tty" "int tmout"
-.Sh DESCRIPTION
-The
-.Fn ttymsg
-function is used by
-programs such as
-.Xr talkd 8 ,
-.Xr syslogd 8 ,
-.Xr wall 1 ,
-etc., to display the contents of a uio structure on a terminal.
-.Fn ttymsg
-forks and finishes in the child if the write would block after
-waiting up to
-.Fa tmout
-seconds.
-.Sh RETURN VALUES
-.Fn ttymsg
-returns a pointer to an error string on unexpected
-error; the string is not newline-terminated.
-Various "normal" errors are
-ignored (exclusive-use, lack of permission, etc.).
-.Sh SEE ALSO
-.Xr writev 2
-.Sh BUGS
-.Nm
-could grow some flags and a username/uid who is the expected owner
-of the tty.
-If the flags say so then the owner should be checked against the tty
-owner, and the message should not be sent if there is a mismatch.
-Also another flag could say check against group writable, and don't
-send a message.
diff --git a/lib/libutil/ttymsg.c b/lib/libutil/ttymsg.c
deleted file mode 100644
index 12b2071c8..000000000
--- a/lib/libutil/ttymsg.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/*	$NetBSD: ttymsg.c,v 1.23 2009/01/18 12:13:04 lukem Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)ttymsg.c	8.2 (Berkeley) 11/16/93";
-#else
-__RCSID("$NetBSD: ttymsg.c,v 1.23 2009/01/18 12:13:04 lukem Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <sys/uio.h>
-
-#include <assert.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <util.h>
-
-/*
- * Display the contents of a uio structure on a terminal.  Used by wall(1),
- * syslogd(8), and talkd(8).  Forks and finishes in child if write would block,
- * waiting up to tmout seconds.  Returns pointer to error string on unexpected
- * error; string is not newline-terminated.  Various "normal" errors are
- * ignored (exclusive-use, lack of permission, etc.).
- */
-char *
-ttymsg(struct iovec *iov, int iovcnt, const char *line, int tmout)
-{
-	static char errbuf[1024];
-	char device[MAXNAMLEN];
-	const char *ptr;
-	int fd, ret;
-	struct iovec localiov[32];
-	sigset_t nset;
-	int forked = 0;
-	size_t cnt, left, wret;
-
-	_DIAGASSERT(iov != NULL);
-	_DIAGASSERT(iovcnt >= 0);
-	_DIAGASSERT(line != NULL);
-
-	if (iovcnt < 0) {
-		(void)snprintf(errbuf, sizeof(errbuf),
-		    "%s: negative iovcnt", __func__);
-		return errbuf;
-	}
-
-	if ((size_t)iovcnt >= sizeof(localiov) / sizeof(localiov[0])) {
-		(void)snprintf(errbuf, sizeof(errbuf),
-		    "%s: too many iov's (%d) max is %zu", __func__,
-		    iovcnt, sizeof(localiov) / sizeof(localiov[0]));
-		return errbuf;
-	}
-
-	ptr = strncmp(line, "pts/", (size_t)4) == 0 ? line + 4 : line;
-	if (strcspn(ptr, "./") != strlen(ptr)) {
-		/* A slash or dot is an attempt to break security... */
-		(void)snprintf(errbuf, sizeof(errbuf),
-		    "%s: '/' or '.' in \"%s\"", __func__, line);
-		return errbuf;
-	}
-	ret = snprintf(device, sizeof(device), "%s%s", _PATH_DEV, line);
-	if (ret == -1 || ret >= (int)sizeof(device)) {
-		(void) snprintf(errbuf, sizeof(errbuf),
-		    "%s: line `%s' too long", __func__, line);
-		return errbuf;
-	}
-	cnt = (size_t)ret;
-
-	/*
-	 * open will fail on slip lines or exclusive-use lines
-	 * if not running as root; not an error.
-	 */
-	if ((fd = open(device, O_WRONLY|O_NONBLOCK, 0)) < 0) {
-		if (errno == EBUSY || errno == EACCES)
-			return NULL;
-		(void)snprintf(errbuf, sizeof(errbuf),
-		    "%s: Cannot open `%s' (%s)",
-		    __func__, device, strerror(errno));
-		return errbuf;
-	}
-	if (!isatty(fd)) {
-		(void)snprintf(errbuf, sizeof(errbuf),
-		    "%s: line `%s' is not a tty device", __func__, device);
-		(void)close(fd);
-		return errbuf;
-	}
-
-	for (cnt = left = 0; cnt < (size_t)iovcnt; ++cnt)
-		left += iov[cnt].iov_len;
-
-	for (;;) {
-		wret = writev(fd, iov, iovcnt);
-		if (wret >= left)
-			break;
-		if (wret > 0) {
-			left -= wret;
-			if (iov != localiov) {
-				(void)memcpy(localiov, iov,
-				    iovcnt * sizeof(struct iovec));
-				iov = localiov;
-			}
-			for (cnt = 0; wret >= iov->iov_len; ++cnt) {
-				wret -= iov->iov_len;
-				++iov;
-				--iovcnt;
-			}
-			if (wret) {
-				iov->iov_base =
-				    (char *)iov->iov_base + wret;
-				iov->iov_len -= wret;
-			}
-			continue;
-		} else if (wret == 0) {
-			(void)snprintf(errbuf, sizeof(errbuf),
-			    "%s: failed writing %zu bytes to `%s'", __func__,
-			    left, device);
-			(void) close(fd);
-			if (forked)
-				_exit(1);
-			return errbuf;
-		}
-		if (errno == EWOULDBLOCK) {
-			pid_t cpid;
-
-			if (forked) {
-				(void)close(fd);
-				_exit(1);
-			}
-			cpid = fork();
-			if (cpid < 0) {
-				(void)snprintf(errbuf, sizeof(errbuf),
-				    "%s: Cannot fork (%s)", __func__,
-				    strerror(errno));
-				(void)close(fd);
-				return errbuf;
-			}
-			if (cpid) {	/* parent */
-				(void)close(fd);
-				return NULL;
-			}
-			forked++;
-			/* wait at most tmout seconds */
-			(void)signal(SIGALRM, SIG_DFL);
-			(void)signal(SIGTERM, SIG_DFL); /* XXX */
-			sigfillset(&nset);
-			(void)sigprocmask(SIG_UNBLOCK, &nset, NULL);
-			(void)alarm((u_int)tmout);
-			(void)fcntl(fd, F_SETFL, 0);	/* clear O_NONBLOCK */
-			continue;
-		}
-		/*
-		 * We get ENODEV on a slip line if we're running as root,
-		 * and EIO if the line just went away.
-		 */
-		if (errno == ENODEV || errno == EIO)
-			break;
-		(void) close(fd);
-		if (forked)
-			_exit(1);
-		(void)snprintf(errbuf, sizeof(errbuf),
-		    "%s: Write to line `%s' failed (%s)", __func__,
-		    device, strerror(errno));
-		return errbuf;
-	}
-
-	(void) close(fd);
-	if (forked)
-		_exit(0);
-	return NULL;
-}
diff --git a/lib/libutil/util.3 b/lib/libutil/util.3
deleted file mode 100644
index 6e1d76fb6..000000000
--- a/lib/libutil/util.3
+++ /dev/null
@@ -1,122 +0,0 @@
-.\"     $NetBSD: util.3,v 1.24 2011/08/29 12:39:50 jruoho Exp $
-.\"
-.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Gregory McGarry.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd August 29, 2011
-.Dt UTIL 3
-.Os
-.Sh NAME
-.Nm util ,
-.Nm libutil
-.Nd system utilities library
-.Sh LIBRARY
-.Lb libutil
-.Sh DESCRIPTION
-The
-.Nm
-library is the system utilities library and contains various
-system-dependent utility routines used in a wide variety of system daemons.
-The abstracted functions are mostly related to pseudo-terminals
-and login accounting.
-These routines are
-.Nx Ns -specific
-and are not portable.
-Their use should be restricted.
-.Pp
-Declarations for these functions may be obtained from the include file
-.In util.h .
-The
-.Nm
-library and the associated functions are implemented within the
-.Pa /usr/src/lib/libutil
-directory.
-.Sh LIST OF FUNCTIONS
-.Bl -column ".Xr sockaddr_snprintf 3" -compact
-.It Sy Name	Description
-.It Xr disklabel_dkcksum 3 Ta compute the checksum for a disklabel
-.It Xr disklabel_scan 3 Ta scan a buffer for a valid disklabel
-.It Xr forkpty 3 Ta tty utility function
-.It Xr getbootfile 3 Ta get the name of the booted kernel file
-.It Xr getlabeloffset 3 Ta get the sector number and offset of the disklabel
-.It Xr getlabelsector 3 Ta get the sector number and offset of the disklabel
-.It Xr getmaxpartitions 3 Ta get the maximum number of partitions allowed per disk
-.It Xr getrawpartition 3 Ta get the system ``raw'' partition
-.It Xr login 3 Ta login utility function
-.It Xr login_cap 3 Ta query login.conf database about a user class
-.It Xr login_close 3 Ta query login.conf database about a user class
-.It Xr login_getcapbool 3 Ta query login.conf database about a user class
-.It Xr login_getcapnum 3 Ta query login.conf database about a user class
-.It Xr login_getcapsize 3 Ta query login.conf database about a user class
-.It Xr login_getcapstr 3 Ta query login.conf database about a user class
-.It Xr login_getcaptime 3 Ta query login.conf database about a user class
-.It Xr login_getclass 3 Ta query login.conf database about a user class
-.It Xr login_tty 3 Ta tty utility function
-.It Xr loginx 3 Ta login utility function
-.It Xr logout 3 Ta login utility function
-.It Xr logoutx 3 Ta login utility function
-.It Xr logwtmp 3 Ta login utility function
-.It Xr logwtmpx 3 Ta login utility function
-.It Xr opendisk 3 Ta open a disk partition
-.It Xr openpty 3 Ta tty utility function
-.It Xr pidfile 3 Ta write a daemon pid file
-.It Xr pidlock 3 Ta locks based on files containing PIDs
-.It Xr pw_abort 3 Ta passwd file update function
-.It Xr pw_copy 3 Ta utility function for interactive passwd file updates
-.It Xr pw_edit 3 Ta utility function for interactive passwd file updates
-.It Xr pw_error 3 Ta utility function for interactive passwd file updates
-.It Xr pw_getconf 3 Ta password encryption configuration access function
-.It Xr pw_getprefix 3 Ta passwd file update function
-.It Xr pw_init 3 Ta utility function for interactive passwd file updates
-.It Xr pw_lock 3 Ta passwd file update function
-.It Xr pw_mkdb 3 Ta passwd file update function
-.It Xr pw_prompt 3 Ta utility function for interactive passwd file updates
-.It Xr pw_scan 3 Ta utility function for interactive passwd file updates
-.It Xr pw_setprefix 3 Ta passwd file update function
-.It Xr secure_path 3 Ta determine if a file appears to be ``secure''
-.It Xr setclasscontext 3 Ta query login.conf database about a user class
-.It Xr setusercontext 3 Ta query login.conf database about a user class
-.It Xr snprintb 3 Ta bitmask output conversion
-.It Xr sockaddr_snprintf 3 Ta socket address formatting function
-.It Xr strpct 3 Ta decimal percent formatter
-.It Xr ttyaction 3 Ta ttyaction utility function
-.It Xr ttylock 3 Ta locks based on files containing PIDs
-.It Xr ttymsg 3 Ta ttymsg utility function
-.It Xr ttyunlock 3 Ta locks based on files containing PIDs
-.El
-.Sh FILES
-.Bl -tag -width /usr/lib/libutil_p.a -compact
-.It Pa /usr/lib/libutil.a
-static util library
-.It Pa /usr/lib/libutil.so
-dynamic util library
-.It Pa /usr/lib/libutil_p.a
-static util library compiled for profiling
-.El
-.Sh SEE ALSO
-.Xr efun 3 ,
-.Xr intro 3
diff --git a/lib/libwrap/DISCLAIMER b/lib/libwrap/DISCLAIMER
deleted file mode 100644
index 17780ab79..000000000
--- a/lib/libwrap/DISCLAIMER
+++ /dev/null
@@ -1,17 +0,0 @@
-/*	$NetBSD: DISCLAIMER,v 1.3 2001/06/02 05:20:56 itojun Exp $	*/
-/************************************************************************
-* Copyright 1995 by Wietse Venema.  All rights reserved.  Some individual
-* files may be covered by other copyrights.
-*
-* This material was originally written and compiled by Wietse Venema at
-* Eindhoven University of Technology, The Netherlands, in 1990, 1991,
-* 1992, 1993, 1994 and 1995.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that this entire copyright notice
-* is duplicated in all such copies.
-*
-* This software is provided "as is" and without any expressed or implied
-* warranties, including, without limitation, the implied warranties of
-* merchantibility and fitness for any particular purpose.
-************************************************************************/
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
deleted file mode 100644
index f1387e1c8..000000000
--- a/lib/libwrap/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#	$NetBSD: Makefile,v 1.10 2007/05/28 12:06:22 tls Exp $
-
-USE_FORT?= yes	# network server
-
-LIB=	wrap
-
-SRCS=	hosts_access.c options.c shell_cmd.c rfc931.c eval.c hosts_ctl.c \
-	refuse.c percent_x.c clean_exit.c fix_options.c socket.c \
-	update.c misc.c diag.c
-MAN=	hosts_access.3 hosts_access.5 hosts_options.5
-MLINKS+=hosts_access.5 hosts.allow.5
-MLINKS+=hosts_access.5 hosts.deny.5
-MLINKS+=hosts_access.3 hosts_ctl.3
-MLINKS+=hosts_access.3 request_init.3
-MLINKS+=hosts_access.3 request_set.3
-
-INCS= tcpd.h
-INCSDIR=/usr/include
-
-.include "Makefile.cflags"
-
-.include <bsd.lib.mk>
diff --git a/lib/libwrap/Makefile.cflags b/lib/libwrap/Makefile.cflags
deleted file mode 100644
index fc3c6a0ea..000000000
--- a/lib/libwrap/Makefile.cflags
+++ /dev/null
@@ -1,23 +0,0 @@
-#	$NetBSD: Makefile.cflags,v 1.8 2005/01/10 02:58:58 lukem Exp $
-
-.include <bsd.own.mk>
-
-CPPFLAGS+=-DFACILITY=LOG_AUTHPRIV -DSEVERITY=LOG_INFO
-CPPFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" -DHOSTS_ACCESS -DDAEMON_UMASK=022
-CPPFLAGS+=-DRFC931_TIMEOUT=10 -DALWAYS_HOSTNAME
-CPPFLAGS+=-DHOSTS_ALLOW=\"/etc/hosts.allow\" -DHOSTS_DENY=\"/etc/hosts.deny\"
-CPPFLAGS+=-DPROCESS_OPTIONS
-
-.if (${USE_YP} != "no")
-CPPFLAGS+=-DNETGROUP
-.endif
-
-# -DPARANOID is not used by libwrap, only by programs that use it.
-# in this case inetd does not use it (probably rightly so) and so
-# we don't want to use it in wrapper-related utilities (such as
-# tcpdmatch) that include this file.
-#CPPFLAGS+=-DPARANOID
-
-.if (${USE_INET6} != "no")
-CPPFLAGS+=-DINET6
-.endif
diff --git a/lib/libwrap/clean_exit.c b/lib/libwrap/clean_exit.c
deleted file mode 100644
index 467ba9333..000000000
--- a/lib/libwrap/clean_exit.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: clean_exit.c,v 1.5 2012/03/21 10:10:37 matt Exp $	*/
-
- /*
-  * clean_exit() cleans up and terminates the program. It should be called
-  * instead of exit() when for some reason the real network daemon will not or
-  * cannot be run. Reason: in the case of a datagram-oriented service we must
-  * discard the not-yet received data from the client. Otherwise, inetd will
-  * see the same datagram again and again, and go into a loop.
-  * 
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) clean_exit.c 1.4 94/12/28 17:42:19";
-#else
-__RCSID("$NetBSD: clean_exit.c,v 1.5 2012/03/21 10:10:37 matt Exp $");
-#endif
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "tcpd.h"
-
-/* clean_exit - clean up and exit */
-
-void
-clean_exit(struct request_info *request)
-{
-
-    /*
-     * In case of unconnected protocols we must eat up the not-yet received
-     * data or inetd will loop.
-     */
-
-    if (request->sink)
-	request->sink(request->fd);
-
-    /*
-     * Be kind to the inetd. We already reported the problem via the syslogd,
-     * and there is no need for additional garbage in the logfile.
-     */
-
-    sleep(5);
-    exit(0);
-}
diff --git a/lib/libwrap/diag.c b/lib/libwrap/diag.c
deleted file mode 100644
index caacb72cc..000000000
--- a/lib/libwrap/diag.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*	$NetBSD: diag.c,v 1.10 2012/03/22 22:58:15 joerg Exp $	*/
-
- /*
-  * Routines to report various classes of problems. Each report is decorated
-  * with the current context (file name and line number), if available.
-  * 
-  * tcpd_warn() reports a problem and proceeds.
-  * 
-  * tcpd_jump() reports a problem and jumps.
-  * 
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) diag.c 1.1 94/12/28 17:42:20";
-#else
-__RCSID("$NetBSD: diag.c,v 1.10 2012/03/22 22:58:15 joerg Exp $");
-#endif
-#endif
-
-/* System libraries */
-
-#include <syslog.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <setjmp.h>
-#include <string.h>
-#include <errno.h>
-
-/* Local stuff */
-
-#include "tcpd.h"
-
-struct tcpd_context tcpd_context;
-jmp_buf tcpd_buf;
-
-static void tcpd_diag(int, const char *, const char *, va_list)
-    __printflike(3,0);
-
-/* tcpd_diag - centralize error reporter */
-
-static void
-tcpd_diag(int severity, const char *tag, const char *fmt, va_list ap)
-{
-    char *buf;
-    int     oerrno;
-
-    /* save errno in case we need it */
-    oerrno = errno;
-
-    if (vasprintf(&buf, fmt, ap) == -1)
-	buf = __UNCONST(fmt);
-
-    errno = oerrno;
-
-    /* contruct the tag for the log entry */
-    if (tcpd_context.file)
-	syslog(severity, "%s: %s, line %d: %s",
-	    tag, tcpd_context.file, tcpd_context.line, buf);
-    else
-	syslog(severity, "%s: %s", tag, buf);
-
-    if (buf != fmt)
-        free(buf);
-}
-
-/* tcpd_warn - report problem of some sort and proceed */
-
-void
-tcpd_warn(const char *format, ...)
-{
-    va_list ap;
-
-    va_start(ap, format);
-    tcpd_diag(LOG_ERR, "warning", format, ap);
-    va_end(ap);
-}
-
-/* tcpd_jump - report serious problem and jump */
-
-void
-tcpd_jump(const char *format, ...)
-{
-    va_list ap;
-
-    va_start(ap, format);
-    tcpd_diag(LOG_ERR, "error", format, ap);
-    va_end(ap);
-    longjmp(tcpd_buf, AC_ERROR);
-}
diff --git a/lib/libwrap/eval.c b/lib/libwrap/eval.c
deleted file mode 100644
index db10d588a..000000000
--- a/lib/libwrap/eval.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*	$NetBSD: eval.c,v 1.7 2012/03/21 10:10:37 matt Exp $	*/
-
- /*
-  * Routines for controlled evaluation of host names, user names, and so on.
-  * They are, in fact, wrappers around the functions that are specific for
-  * the sockets or TLI programming interfaces. The request_info and host_info
-  * structures are used for result cacheing.
-  * 
-  * These routines allows us to postpone expensive operations until their
-  * results are really needed. Examples are hostname lookups and double
-  * checks, or username lookups. Information that cannot be retrieved is
-  * given the value "unknown" ("paranoid" in case of hostname problems).
-  * 
-  * When ALWAYS_HOSTNAME is off, hostname lookup is done only when required by
-  * tcpd paranoid mode, by access control patterns, or by %letter expansions.
-  * 
-  * When ALWAYS_RFC931 mode is off, user lookup is done only when required by
-  * access control patterns or %letter expansions.
-  * 
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) eval.c 1.3 95/01/30 19:51:45";
-#else
-__RCSID("$NetBSD: eval.c,v 1.7 2012/03/21 10:10:37 matt Exp $");
-#endif
-#endif
-
-/* System libraries. */
-
-#include <stdio.h>
-#include <string.h>
-
-/* Local stuff. */
-
-#include "tcpd.h"
-
- /*
-  * When a string has the value STRING_UNKNOWN, it means: don't bother, I
-  * tried to look up the data but it was unavailable for some reason. When a
-  * host name has the value STRING_PARANOID it means there was a name/address
-  * conflict.
-  */
-char    unknown[] = STRING_UNKNOWN;
-char    paranoid[] = STRING_PARANOID;
-
-/* eval_user - look up user name */
-
-char   *
-eval_user(struct request_info *request)
-{
-    if (request->user[0] == 0) {
-	(void)strlcpy(request->user, unknown, sizeof(request->user));
-	if (request->sink == 0 && request->client->sin && request->server->sin)
-	    rfc931(request->client->sin, request->server->sin, request->user);
-    }
-    return (request->user);
-}
-
-/* eval_hostaddr - look up printable address */
-
-char   *
-eval_hostaddr(struct host_info *host)
-{
-    if (host->addr[0] == 0) {
-	(void)strlcpy(host->addr, unknown, sizeof(host->addr));
-	if (host->request->hostaddr != 0)
-	    host->request->hostaddr(host);
-    }
-    return (host->addr);
-}
-
-/* eval_hostname - look up host name */
-
-char   *
-eval_hostname(struct host_info *host)
-{
-    if (host->name[0] == 0) {
-	(void)strlcpy(host->name, unknown, sizeof(host->name));
-	if (host->request->hostname != 0)
-	    host->request->hostname(host);
-    }
-    return (host->name);
-}
-
-/* eval_hostinfo - return string with host name (preferred) or address */
-
-char   *
-eval_hostinfo(struct host_info *host)
-{
-    char   *hostname;
-
-#ifndef ALWAYS_HOSTNAME				/* no implicit host lookups */
-    if (host->name[0] == 0)
-	return (eval_hostaddr(host));
-#endif
-    hostname = eval_hostname(host);
-    if (HOSTNAME_KNOWN(hostname)) {
-	return (host->name);
-    } else {
-	return (eval_hostaddr(host));
-    }
-}
-
-/* eval_client - return string with as much about the client as we know */
-
-char   *
-eval_client(struct request_info *request)
-{
-    static char both[2 * STRING_LENGTH];
-    char   *hostinfo = eval_hostinfo(request->client);
-
-#ifndef ALWAYS_RFC931				/* no implicit user lookups */
-    if (request->user[0] == 0)
-	return (hostinfo);
-#endif
-    if (STR_NE(eval_user(request), unknown)) {
-	(void)snprintf(both, sizeof both, "%s@%s", request->user, hostinfo);
-	return (both);
-    } else {
-	return (hostinfo);
-    }
-}
-
-/* eval_server - return string with as much about the server as we know */
-
-char   *
-eval_server(struct request_info *request)
-{
-    static char both[2 * STRING_LENGTH];
-    char   *host = eval_hostinfo(request->server);
-    char   *daemon = eval_daemon(request);
-
-    if (STR_NE(host, unknown)) {
-	(void)snprintf(both, sizeof both, "%s@%s", daemon, host);
-	return (both);
-    } else {
-	return (daemon);
-    }
-}
diff --git a/lib/libwrap/fix_options.c b/lib/libwrap/fix_options.c
deleted file mode 100644
index 51f24d0be..000000000
--- a/lib/libwrap/fix_options.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*	$NetBSD: fix_options.c,v 1.11 2012/03/21 10:10:37 matt Exp $	*/
-
- /*
-  * Routine to disable IP-level socket options. This code was taken from 4.4BSD
-  * rlogind and kernel source, but all mistakes in it are my fault.
-  *
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) fix_options.c 1.6 97/04/08 02:29:19";
-#else
-__RCSID("$NetBSD: fix_options.c,v 1.11 2012/03/21 10:10:37 matt Exp $");
-#endif
-#endif
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <syslog.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#ifndef IPOPT_OPTVAL
-#define IPOPT_OPTVAL	0
-#define IPOPT_OLEN	1
-#endif
-
-#include "tcpd.h"
-
-#define BUFFER_SIZE	512		/* Was: BUFSIZ */
-
-/* fix_options - get rid of IP-level socket options */
-
-void
-fix_options(struct request_info *request)
-{
-#ifdef IP_OPTIONS
-    unsigned char optbuf[BUFFER_SIZE / 3], *cp;
-    char    lbuf[BUFFER_SIZE], *lp;
-    int     ipproto;
-    socklen_t optsize = sizeof(optbuf);
-    struct protoent *ip;
-    int     fd = request->fd;
-    int     len = sizeof lbuf;
-    unsigned int opt;
-    int     optlen;
-    struct in_addr dummy;
-    struct sockaddr_storage ss;
-    socklen_t sslen;
-
-    /*
-     * check if this is AF_INET socket
-     * XXX IPv6 support?
-     */
-    sslen = sizeof(ss);
-    if (getsockname(fd, (struct sockaddr *)(void *)&ss, &sslen) < 0) {
-	syslog(LOG_ERR, "getsockname: %m");
-	clean_exit(request);
-    }
-    if (ss.ss_family != AF_INET)
-	return;
-  
-    if ((ip = getprotobyname("ip")) != 0)
-	ipproto = ip->p_proto;
-    else
-	ipproto = IPPROTO_IP;
-
-    if (getsockopt(fd, ipproto, IP_OPTIONS, optbuf, &optsize) == 0
-	&& optsize != 0) {
-
-	/*
-	 * Horror! 4.[34] BSD getsockopt() prepends the first-hop destination
-	 * address to the result IP options list when source routing options
-	 * are present (see <netinet/ip_var.h>), but produces no output for
-	 * other IP options. Solaris 2.x getsockopt() does produce output for
-	 * non-routing IP options, and uses the same format as BSD even when
-	 * the space for the destination address is unused. The code below
-	 * does the right thing with 4.[34]BSD derivatives and Solaris 2, but
-	 * may occasionally miss source routing options on incompatible
-	 * systems such as Linux. Their choice.
-	 * 
-	 * Look for source routing options. Drop the connection when one is
-	 * found. Just wiping the IP options is insufficient: we would still
-	 * help the attacker by providing a real TCP sequence number, and the
-	 * attacker would still be able to send packets (blind spoofing). I
-	 * discussed this attack with Niels Provos, half a year before the
-	 * attack was described in open mailing lists.
-	 * 
-	 * It would be cleaner to just return a yes/no reply and let the caller
-	 * decide how to deal with it. Resident servers should not terminate.
-	 * However I am not prepared to make changes to internal interfaces
-	 * on short notice.
-	 */
-#define ADDR_LEN sizeof(dummy.s_addr)
-
-	for (cp = optbuf + ADDR_LEN; cp < optbuf + optsize; cp += optlen) {
-	    opt = cp[IPOPT_OPTVAL];
-	    if (opt == IPOPT_LSRR || opt == IPOPT_SSRR) {
-		syslog(LOG_WARNING,
-		   "refused connect from %s with IP source routing options",
-		       eval_client(request));
-		shutdown(fd, 2);
-		return;
-	    }
-	    if (opt == IPOPT_EOL)
-		break;
-	    if (opt == IPOPT_NOP) {
-		optlen = 1;
-	    } else if (&cp[IPOPT_OLEN] < optbuf + optsize) {
-		optlen = cp[IPOPT_OLEN];
-		if (optlen < 2 || cp + optlen >= optbuf + optsize) {
-		    syslog(LOG_WARNING,
-		       "refused connect from %s with malformed IP options",
-			   eval_client(request));
-		    shutdown(fd, 2);
-		    return;
-		}
-	    } else {
-		syslog(LOG_WARNING,
-		   "refused connect from %s with malformed IP options",
-		       eval_client(request));
-		shutdown(fd, 2);
-		return;
-	    }
-	}
-	lp = lbuf;
-	for (cp = optbuf; optsize > 0; cp++, optsize--, lp += 3)
-	    len -= snprintf(lp, len, " %2.2x", *cp);
-	syslog(LOG_NOTICE,
-	       "connect from %s with IP options (ignored):%s",
-	       eval_client(request), lbuf);
-	if (setsockopt(fd, ipproto, IP_OPTIONS, (char *) 0, optsize) != 0) {
-	    syslog(LOG_ERR, "setsockopt IP_OPTIONS NULL: %m");
-	    shutdown(fd, 2);
-	}
-    }
-#endif
-}
diff --git a/lib/libwrap/hosts_access.3 b/lib/libwrap/hosts_access.3
deleted file mode 100644
index 684a73776..000000000
--- a/lib/libwrap/hosts_access.3
+++ /dev/null
@@ -1,96 +0,0 @@
-.\"	$NetBSD: hosts_access.3,v 1.7 2002/10/01 19:38:46 wiz Exp $
-.\"
-.TH HOSTS_ACCESS 3
-.SH NAME
-hosts_access, hosts_ctl, request_init, request_set \- access control library
-.SH SYNOPSIS
-.nf
-#include "tcpd.h"
-
-extern int allow_severity;
-extern int deny_severity;
-
-struct request_info *request_init(request, key, value, ..., 0)
-struct request_info *request;
-
-struct request_info *request_set(request, key, value, ..., 0)
-struct request_info *request;
-
-int hosts_access(request)
-struct request_info *request;
-
-int hosts_ctl(daemon, client_name, client_addr, client_user)
-char *daemon;
-char *client_name;
-char *client_addr;
-char *client_user;
-.fi
-.SH DESCRIPTION
-The routines described in this document are part
-of the \fIlibwrap.a\fR library.
-They implement a rule-based access control language with
-optional shell commands that are executed when a rule fires.
-.PP
-request_init() initializes a structure with
-information about a client request.
-request_set() updates an already initialized request structure.
-Both functions take a variable-length list of key-value
-pairs and return their first argument.
-The argument lists are terminated with a zero key value.
-All string-valued arguments are copied.
-The expected keys (and corresponding value types) are:
-.IP "RQ_FILE (int)"
-The file descriptor associated with the request.
-.IP "RQ_CLIENT_NAME (char *)"
-The client host name.
-.IP "RQ_CLIENT_ADDR (char *)"
-A printable representation of the client network address.
-.IP "RQ_CLIENT_SIN (struct sockaddr_in *)"
-An internal representation of the client network address and port.
-The contents of the structure are not copied.
-.IP "RQ_SERVER_NAME (char *)"
-The hostname associated with the server endpoint address.
-.IP "RQ_SERVER_ADDR (char *)"
-A printable representation of the server endpoint address.
-.IP "RQ_SERVER_SIN (struct sockaddr_in *)"
-An internal representation of the server endpoint address and port.
-The contents of the structure are not copied.
-.IP "RQ_DAEMON (char *)"
-The name of the daemon process running on the server host.
-.IP "RQ_USER (char *)"
-The name of the user on whose behalf the client host makes the request.
-.PP
-hosts_access() consults the access control tables described in the
-\fIhosts_access(5)\fR manual page.
-When internal endpoint information is available, host names
-and client user names are looked up on demand,
-using the request structure as a cache.
-hosts_access() returns zero if access should be denied.
-.PP
-hosts_ctl() is a wrapper around the request_init() and hosts_access()
-routines with a perhaps more convenient interface (though it does not
-pass on enough information to support automated client username lookups).
-The client host address, client host name and username
-arguments should contain valid data or STRING_UNKNOWN.
-hosts_ctl() returns zero if access should be denied.
-.PP
-The \fIallow_severity\fR and \fIdeny_severity\fR variables determine
-how accepted and rejected requests may be logged.
-They must be provided by the caller and may be modified
-by rules in the access control tables.
-.SH DIAGNOSTICS
-Problems are reported via the syslog daemon.
-.SH SEE ALSO
-hosts_access(5), format of the access control tables.
-hosts_options(5), optional extensions to the base language.
-.SH FILES
-/etc/hosts.allow, /etc/hosts.deny, access control tables.
-.SH AUTHOR
-.na
-.nf
-Wietse Venema (wietse@wzv.win.tue.nl)
-Department of Mathematics and Computing Science
-Eindhoven University of Technology
-Den Dolech 2, P.O. Box 513,
-5600 MB Eindhoven, The Netherlands
-\" @(#) hosts_access.3 1.8 96/02/11 17:01:26
diff --git a/lib/libwrap/hosts_access.5 b/lib/libwrap/hosts_access.5
deleted file mode 100644
index 97ce5f2b9..000000000
--- a/lib/libwrap/hosts_access.5
+++ /dev/null
@@ -1,424 +0,0 @@
-.TH HOSTS_ACCESS 5
-.SH NAME
-hosts_access,
-hosts.allow,
-hosts.deny \- format of host access control files
-.SH DESCRIPTION
-This manual page describes a simple access control language that is
-based on client (host name/address, user name), and server (process
-name, host name/address) patterns.
-Examples are given at the end.
-The impatient reader is encouraged to skip to the EXAMPLES section for a
-quick introduction.
-.PP
-Note that in a `stock' installation of the tcp_wrappers package, a
-program called \fItcpd\fR is called from \fI/etc/inetd.conf\fR, and
-this program performs the wrapper checks and then executes the daemon.
-In NetBSD \fIinetd\fR(8) has been modified to perform this check
-internally, and so tcpd is neither used nor supplied.
-.PP
-Also note that libwrap under NetBSD uses the extensions to the access
-control language as described in the \fIhosts_options\fR(5).
-.PP
-In the following text, \fIdaemon\fR is the process name of a
-network daemon process, and \fIclient\fR is the name and/or address of
-a host requesting service.
-Network daemon process names are specified in the inetd configuration file.
-.SH "ACCESS CONTROL FILES"
-The access control software consults two files.
-The search stops at the first match:
-.IP \(bu
-Access will be granted when a (daemon,client) pair matches an entry in
-the \fI/etc/hosts.allow\fR file.
-.IP \(bu
-Otherwise, access will be denied when a (daemon,client) pair matches an
-entry in the \fI/etc/hosts.deny\fR file.
-.IP \(bu
-Otherwise, access will be granted.
-.PP
-A non-existing access control file is treated as if it were an empty
-file.
-Thus, access control can be turned off by providing no access
-control files.
-.SH "ACCESS CONTROL RULES"
-Each access control file consists of zero or more lines of text.
-These lines are processed in order of appearance.
-The search terminates when a match is found.
-.IP \(bu
-A newline character is ignored when it is preceded by a backslash character.
-This permits you to break up long lines so that they are easier to edit.
-\fBWARNING:\fP  The total length of an entry can be no
-more than 2047 characters long including the final newline.
-.IP \(bu
-Blank lines or lines that begin with a `#\' character are ignored.
-This permits you to insert comments and whitespace so that the tables
-are easier to read.
-.IP \(bu
-All other lines should satisfy the following format, things between []
-being optional:
-.sp
-.ti +3
-daemon_list : client_list : option : option ...
-.PP
-\fIdaemon_list\fR is a list of one or more daemon process names
-(argv[0] values) or wildcards (see below).
-.PP
-\fIclient_list\fR is a list
-of one or more host names, host addresses, patterns or wildcards (see
-below) that will be matched against the client host name or address.
-When a client_list item needs to include colon character (for IPv6 addresses),
-the item needs to be wrapped with square bracket.
-.PP
-The more complex forms \fIdaemon@host\fR and \fIuser@host\fR are
-explained in the sections on server endpoint patterns and on client
-username lookups, respectively.
-.PP
-List elements should be separated by blanks and/or commas.
-.PP
-With the exception of NIS (YP) netgroup lookups, all access control
-checks are case insensitive.
-.ne 4
-.SH PATTERNS
-The access control language implements the following patterns:
-.IP \(bu
-A string that begins with a `.\' character.
-A host name is matched if
-the last components of its name match the specified pattern.
-For example, the pattern `.tue.nl\' matches the host name
-`wzv.win.tue.nl\'.
-.IP \(bu
-A string that ends with a `.\' character.
-A host address is matched if
-its first numeric fields match the given string.
-For example, the
-pattern `131.155.\' matches the address of (almost) every host on the
-Eind\%hoven University network (131.155.x.x).
-.IP \(bu
-A string that begins with an `@\' character is treated as an NIS
-(formerly YP) netgroup name.
-A host name is matched if it is a host member of the specified netgroup.
-Netgroup matches are not supported
-for daemon process names or for client user names.
-.IP \(bu
-An expression of the form `n.n.n.n/m.m.m.m\' is interpreted as a
-`net/mask\' pair.
-A host address is matched if `net\' is equal to the
-bitwise AND of the address and the `mask\'.
-For example, the net/mask
-pattern `131.155.72.0/255.255.254.0\' matches every address in the
-range `131.155.72.0\' through `131.155.73.255\'.
-Note that `m.m.m.m\' portion must always be specified.
-.IP \(bu
-An expression of the form `ipv6-addr/ipv6-mask\' is interpreted as
-masked IPv6 address match, just like masked IPv4 address match (see above).
-Note that `ipv6-mask\' portion must always be specified.
-.IP \(bu
-An expression of the form `ipv6-addr/prefixlen\' is interpreted as
-masked IPv6 address match (with mask specified by numeric prefixlen),
-just like masked IPv4 address match (see above).
-Note that `prefixlen\' portion must always be specified.
-.IP \(bu
-A string that begins with a `/\' character is treated as a file
-name. A host name or address is matched if it matches any host name
-or address pattern listed in the named file. The file format is
-zero or more lines with zero or more host name or address patterns
-separated by whitespace.  A file name pattern can be used anywhere
-a host name or address pattern can be used.
-.SH WILDCARDS
-The access control language supports explicit wildcards:
-.IP ALL
-The universal wildcard, always matches.
-.IP LOCAL
-Matches any host whose name does not contain a dot character.
-.IP UNKNOWN
-Matches any user whose name is unknown, and matches any host whose name
-\fIor\fR address are unknown.
-This pattern should be used with care:
-host names may be unavailable due to temporary name server problems.
-A network address will be unavailable when the software cannot figure out
-what type of network it is talking to.
-.IP KNOWN
-Matches any user whose name is known, and matches any host whose name
-\fIand\fR address are known.
-This pattern should be used with care:
-host names may be unavailable due to temporary name server problems.
-A network address will be unavailable when the software cannot figure out
-what type of network it is talking to.
-.IP PARANOID
-Matches any host whose name does not match its address.
-Note that unlike the default mode of \fItcpd\fR, NetBSD \fIinetd\fR
-does not automatically drop these requests; you must explicitly
-drop them in your \fI/etc/hosts.allow\fR or \fI/etc/hosts.deny\fR file.
-.IP "{RBL}.\fIdomain\fR"
-Matches any host whose reversed address appears in the DNS under
-\fIdomain\fR.
-The primary such domain used for blocking unsolicited
-commercial e-mail (spam) is `.rbl.maps.vix.com\'.
-.ne 6
-.SH OPERATORS
-.IP EXCEPT
-Intended use is of the form: `list_1 EXCEPT list_2\'; this construct
-matches anything that matches \fIlist_1\fR unless it matches
-\fIlist_2\fR.
-The EXCEPT operator can be used in daemon_lists and in client_lists.
-The EXCEPT operator can be nested: if the control
-language would permit the use of parentheses, `a EXCEPT b EXCEPT c\'
-would parse as `(a EXCEPT (b EXCEPT c))\'.
-.br
-.ne 6
-.SH % EXPANSIONS
-The following expansions are available within some options:
-.IP "%a (%A)"
-The client (server) host address.
-.IP %c
-Client information: user@host, user@address, a host name, or just an
-address, depending on how much information is available.
-.IP %d
-The daemon process name (argv[0] value).
-.IP "%h (%H)"
-The client (server) host name or address, if the host name is
-unavailable.
-.IP "%n (%N)"
-The client (server) host name (or "unknown" or "paranoid").
-.IP %p
-The daemon process id.
-.IP %s
-Server information: daemon@host, daemon@address, or just a daemon name,
-depending on how much information is available.
-.IP %u
-The client user name (or "unknown").
-.IP %%
-Expands to a single `%\' character.
-.PP
-Characters in % expansions that may confuse the shell are replaced by
-underscores.
-.SH "SERVER ENDPOINT PATTERNS"
-In order to distinguish clients by the network address that they
-connect to, use patterns of the form:
-.sp
-.ti +3
-process_name@host_pattern : client_list ...
-.sp
-Patterns like these can be used when the machine has different internet
-addresses with different internet hostnames.
-Service providers can use
-this facility to offer FTP, GOPHER or WWW archives with internet names
-that may even belong to different organizations.
-See also the `twist' option in the hosts_options(5) document.
-Some systems (Solaris, FreeBSD, NetBSD) can have more than one
-internet address on one physical interface; with other systems
-you may have to resort to SLIP or PPP pseudo interfaces that
-live in a dedicated network address space.
-.sp
-The host_pattern obeys the same syntax rules as host names and
-addresses in client_list context.
-Usually, server endpoint information
-is available only with connection-oriented services.
-.SH "CLIENT USERNAME LOOKUP"
-When the client host supports the RFC 931 protocol or one of its
-descendants (TAP, IDENT, RFC 1413) the wrapper programs can retrieve
-additional information about the owner of a connection.
-Client username information, when available,
-is logged together with the client host
-name, and can be used to match patterns like:
-.PP
-.ti +3
-daemon_list : ... user_pattern@host_pattern ...
-.PP
-The daemon wrappers can be configured at compile time to perform
-rule-driven username lookups (default) or to always interrogate the
-client host.
-In the case of rule-driven username lookups, the above
-rule would cause username lookup only when both the \fIdaemon_list\fR
-and the \fIhost_pattern\fR match.
-.PP
-A user pattern has the same syntax as a daemon process pattern, so the
-same wildcards apply (netgroup membership is not supported).
-One should not get carried away with username lookups, though.
-.IP \(bu
-The client username information cannot be trusted when it is needed
-most, i.e. when the client system has been compromised.
-In general,
-ALL and (UN)KNOWN are the only user name patterns that make sense.
-.IP \(bu
-Username lookups are possible only with TCP-based services, and only
-when the client host runs a suitable daemon; in all other cases the
-result is "unknown".
-.IP \(bu
-A well-known UNIX kernel bug may cause loss of service when username
-lookups are blocked by a firewall.
-The wrapper README document
-describes a procedure to find out if your kernel has this bug.
-.IP \(bu
-Username lookups may cause noticeable delays for non-UNIX users.
-The default timeout for username lookups is 10 seconds: too short to cope
-with slow networks, but long enough to irritate PC users.
-.PP
-Selective username lookups can alleviate the last problem.
-For example, a rule like:
-.PP
-.ti +3
-daemon_list : @pcnetgroup ALL@ALL
-.PP
-would match members of the pc netgroup without doing username lookups,
-but would perform username lookups with all other systems.
-.SH "DETECTING ADDRESS SPOOFING ATTACKS"
-A flaw in the sequence number generator of many TCP/IP implementations
-allows intruders to easily impersonate trusted hosts and to break in
-via, for example, the remote shell service.
-The IDENT (RFC 931 etc.) service can be used to detect such and
-other host address spoofing attacks.
-.PP
-Before accepting a client request, the wrappers can use the IDENT
-service to find out that the client did not send the request at all.
-When the client host provides IDENT service, a negative IDENT lookup
-result (the client matches `UNKNOWN@host') is strong evidence of a host
-spoofing attack.
-.PP
-A positive IDENT lookup result (the client matches `KNOWN@host') is
-less trustworthy.
-It is possible for an intruder to spoof both the
-client connection and the IDENT lookup, although doing so is much
-harder than spoofing just a client connection.
-It may also be that the client\'s IDENT server is lying.
-.PP
-Note: IDENT lookups don\'t work with UDP services.
-.SH EXAMPLES
-The language is flexible enough that different types of access control
-policy can be expressed with a minimum of fuss.
-Although the language
-uses two access control tables, the most common policies can be
-implemented with one of the tables being trivial or even empty.
-.PP
-When reading the examples below it is important to realize that the
-allow table is scanned before the deny table, that the search
-terminates when a match is found, and that access is granted when no
-match is found at all.
-.PP
-The examples use host and domain names.
-They can be improved by
-including address and/or network/netmask information, to reduce the
-impact of temporary name server lookup failures.
-.SH "MOSTLY CLOSED"
-In this case, access is denied by default.
-Only explicitly authorized hosts are permitted access.
-.PP
-The default policy (no access) is implemented with a trivial deny file:
-.PP
-.ne 2
-/etc/hosts.deny:
-.in +3
-ALL: ALL
-.PP
-This denies all service to all hosts, unless they are permitted access
-by entries in the allow file.
-.PP
-The explicitly authorized hosts are listed in the allow file.
-For example:
-.PP
-.ne 2
-/etc/hosts.allow:
-.in +3
-ALL: LOCAL @some_netgroup
-.br
-ALL: .foobar.edu EXCEPT terminalserver.foobar.edu
-.PP
-The first rule permits access from hosts in the local domain (no `.\'
-in the host name) and from members of the \fIsome_netgroup\fP netgroup.
-The second rule permits access from all hosts in the
-\fIfoobar.edu\fP domain (notice the leading dot), with the exception of
-\fIterminalserver.foobar.edu\fP.
-.SH "MOSTLY OPEN"
-Here, access is granted by default; only explicitly specified hosts are
-refused service.
-.PP
-The default policy (access granted) makes the allow file redundant so
-that it can be omitted.
-The explicitly non-authorized hosts are listed in the deny file.
-For example:
-.PP
-/etc/hosts.deny:
-.in +3
-ALL: some.host.name, .some.domain
-.br
-ALL EXCEPT in.fingerd: other.host.name, .other.domain
-.PP
-The first rule denies some hosts and domains all services; the second
-rule still permits finger requests from other hosts and domains.
-.SH "BOOBY TRAPS"
-The next example permits tftp requests from hosts in the local domain
-(notice the leading dot).
-Requests from any other hosts are denied.
-Instead of the requested file, a finger probe is sent to the offending host.
-The result is mailed to the superuser.
-.PP
-.ne 2
-/etc/hosts.allow:
-.in +3
-.nf
-in.tftpd: LOCAL, .my.domain
-.PP
-.ne 2
-/etc/hosts.deny:
-.in +3
-.nf
-in.tftpd: ALL: spawn (/some/where/safe_finger -l @%h | \\
-	/usr/ucb/mail -s %d-%h root) \*[Am]
-.fi
-.PP
-(The safe_finger command can be gotten from the tcp_wrappers package and
-installed in a suitable place.
-It limits possible damage from data sent by the remote finger server.
-It gives better protection than the standard finger command.)
-.PP
-The expansion of the %h (client host) and %d (service name) sequences
-is described in the section on shell commands.
-.PP
-Warning: do not booby-trap your finger daemon, unless you are prepared
-for infinite finger loops.
-.PP
-On network firewall systems this trick can be carried even further.
-The typical network firewall only provides a limited set of services to
-the outer world.
-All other services can be "bugged" just like the above tftp example.
-The result is an excellent early-warning system.
-.br
-.ne 4
-.SH DIAGNOSTICS
-An error is reported when a syntax error is found in a host access
-control rule; when the length of an access control rule exceeds the
-capacity of an internal buffer; when an access control rule is not
-terminated by a newline character; when the result of %\*[Lt]letter\*[Gt]
-expansion would overflow an internal buffer; when a system call fails
-that shouldn\'t.
-All problems are reported via the syslog daemon.
-.SH FILES
-.na
-.nf
-/etc/hosts.allow, (daemon,client) pairs that are granted access.
-/etc/hosts.deny, (daemon,client) pairs that are denied access.
-.ad
-.fi
-.SH "SEE ALSO"
-.nf
-hosts_options(5), hosts_access(3)
-tcpdchk(8), tcpdmatch(8), test programs.
-.SH BUGS
-If a name server lookup times out, the host name will not be available
-to the access control software, even though the host is registered.
-.PP
-Domain name server lookups are case insensitive; NIS (formerly YP)
-netgroup lookups are case sensitive.
-.PP
-The total length of an entry can be no more than 2047 characters long,
-including the final newline.
-.SH AUTHOR
-.na
-.nf
-Wietse Venema (wietse@wzv.win.tue.nl)
-Department of Mathematics and Computing Science
-Eindhoven University of Technology
-Den Dolech 2, P.O. Box 513,
-5600 MB Eindhoven, The Netherlands
-.\" @(#) hosts_access.5 1.20 95/01/30 19:51:46
-.\"	$NetBSD: hosts_access.5,v 1.16 2008/12/18 20:16:52 christos Exp $
diff --git a/lib/libwrap/hosts_access.c b/lib/libwrap/hosts_access.c
deleted file mode 100644
index 441b7f16c..000000000
--- a/lib/libwrap/hosts_access.c
+++ /dev/null
@@ -1,569 +0,0 @@
-/*	$NetBSD: hosts_access.c,v 1.20 2012/03/21 10:10:37 matt Exp $	*/
-
- /*
-  * This module implements a simple access control language that is based on
-  * host (or domain) names, NIS (host) netgroup names, IP addresses (or
-  * network numbers) and daemon process names. When a match is found the
-  * search is terminated, and depending on whether PROCESS_OPTIONS is defined,
-  * a list of options is executed or an optional shell command is executed.
-  * 
-  * Host and user names are looked up on demand, provided that suitable endpoint
-  * information is available as sockaddr_in structures or TLI netbufs. As a
-  * side effect, the pattern matching process may change the contents of
-  * request structure fields.
-  * 
-  * Diagnostics are reported through syslog(3).
-  * 
-  * Compile with -DNETGROUP if your library provides support for netgroups.
-  * 
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) hosts_access.c 1.21 97/02/12 02:13:22";
-#else
-__RCSID("$NetBSD: hosts_access.c,v 1.20 2012/03/21 10:10:37 matt Exp $");
-#endif
-#endif
-
-/* System libraries. */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#ifdef INET6
-#include <sys/socket.h>
-#endif
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <syslog.h>
-#include <ctype.h>
-#include <errno.h>
-#include <setjmp.h>
-#include <string.h>
-#include <netdb.h>
-#ifdef  NETGROUP
-#include <netgroup.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-/* Local stuff. */
-
-#include "tcpd.h"
-
-/* Error handling. */
-
-extern jmp_buf tcpd_buf;
-
-/* Delimiters for lists of daemons or clients. */
-
-static char sep[] = ", \t\r\n";
-
-/* Constants to be used in assignments only, not in comparisons... */
-
-#define	YES		1
-#define	NO		0
-
- /*
-  * These variables are globally visible so that they can be redirected in
-  * verification mode.
-  */
-
-const char   *hosts_allow_table = HOSTS_ALLOW;
-const char   *hosts_deny_table = HOSTS_DENY;
-int     hosts_access_verbose = 0;
-
- /*
-  * In a long-running process, we are not at liberty to just go away.
-  */
-
-int     resident = (-1);		/* -1, 0: unknown; +1: yes */
-
-/* Forward declarations. */
-
-static int table_match(const char *, struct request_info *);
-static int list_match(char *, struct request_info *,
-    int (*)(char *, struct request_info *));
-static int server_match(char *, struct request_info *);
-static int client_match(char *, struct request_info *);
-static int host_match(char *, struct host_info *);
-static int hostfile_match(char *, struct host_info *);
-static int rbl_match(char *, char *);
-static int string_match(char *, char *);
-static int masked_match(char *, char *, char *);
-static int masked_match4(char *, char *, char *);
-#ifdef INET6
-static int masked_match6(char *, char *, char *);
-#endif
-
-/* Size of logical line buffer. */
-
-#define	BUFLEN 2048
-
-/* hosts_access - host access control facility */
-
-int
-hosts_access(struct request_info *request)
-{
-    int     verdict;
-
-    /*
-     * If the (daemon, client) pair is matched by an entry in the file
-     * /etc/hosts.allow, access is granted. Otherwise, if the (daemon,
-     * client) pair is matched by an entry in the file /etc/hosts.deny,
-     * access is denied. Otherwise, access is granted. A non-existent
-     * access-control file is treated as an empty file.
-     * 
-     * After a rule has been matched, the optional language extensions may
-     * decide to grant or refuse service anyway. Or, while a rule is being
-     * processed, a serious error is found, and it seems better to play safe
-     * and deny service. All this is done by jumping back into the
-     * hosts_access() routine, bypassing the regular return from the
-     * table_match() function calls below.
-     */
-
-    if (resident <= 0)
-	resident++;
-    verdict = setjmp(tcpd_buf);
-    if (verdict != 0)
-	return (verdict == AC_PERMIT);
-    if (table_match(hosts_allow_table, request))
-	return (YES);
-    if (table_match(hosts_deny_table, request))
-	return (NO);
-    return (YES);
-}
-
-/* table_match - match table entries with (daemon, client) pair */
-
-static int
-table_match(const char *table, struct request_info *request)
-{
-    FILE   *fp;
-    char    sv_list[BUFLEN];		/* becomes list of daemons */
-    char   *cl_list;			/* becomes list of clients */
-    char   *sh_cmd = NULL;		/* becomes optional shell command */
-    int     match = NO;
-    struct tcpd_context saved_context;
-
-    saved_context = tcpd_context;		/* stupid compilers */
-
-    /*
-     * Between the fopen() and fclose() calls, avoid jumps that may cause
-     * file descriptor leaks.
-     */
-
-    if ((fp = fopen(table, "r")) != 0) {
-	tcpd_context.file = table;
-	tcpd_context.line = 0;
-	while (match == NO && xgets(sv_list, sizeof(sv_list), fp) != 0) {
-	    if (sv_list[strlen(sv_list) - 1] != '\n') {
-		tcpd_warn("missing newline or line too long");
-		continue;
-	    }
-	    if (sv_list[0] == '#' || sv_list[strspn(sv_list, " \t\r\n")] == 0)
-		continue;
-	    if ((cl_list = split_at(sv_list, ':')) == 0) {
-		tcpd_warn("missing \":\" separator");
-		continue;
-	    }
-	    sh_cmd = split_at(cl_list, ':');
-	    match = list_match(sv_list, request, server_match)
-		&& list_match(cl_list, request, client_match);
-	}
-	(void) fclose(fp);
-    } else if (errno != ENOENT) {
-	tcpd_warn("cannot open %s: %m", table);
-    }
-    if (match) {
-	if (hosts_access_verbose > 1)
-	    syslog(LOG_DEBUG, "matched:  %s line %d",
-		   tcpd_context.file, tcpd_context.line);
-	if (sh_cmd) {
-#ifdef PROCESS_OPTIONS
-	    process_options(sh_cmd, request);
-#else
-	    char    cmd[BUFSIZ];
-	    shell_cmd(percent_x(cmd, sizeof(cmd), sh_cmd, request));
-#endif
-	}
-    }
-    tcpd_context = saved_context;
-    return (match);
-}
-
-/* list_match - match a request against a list of patterns with exceptions */
-
-static int
-list_match(char *list, struct request_info *request,
-    int (*match_fn)(char *, struct request_info *))
-{
-    char   *tok;
-    static char *last;
-    int l;
-
-    /*
-     * Process tokens one at a time. We have exhausted all possible matches
-     * when we reach an "EXCEPT" token or the end of the list. If we do find
-     * a match, look for an "EXCEPT" list and recurse to determine whether
-     * the match is affected by any exceptions.
-     */
-
-    for (tok = strtok_r(list, sep, &last); tok != 0;
-      tok = strtok_r(NULL, sep, &last)) {
-	if (STR_EQ(tok, "EXCEPT"))		/* EXCEPT: give up */
-	    return (NO);
-	l = strlen(tok);
-	if (*tok == '[' && tok[l - 1] == ']') {
-	    tok[l - 1] = '\0';
-	    tok++;
-	}
-	if (match_fn(tok, request)) {		/* YES: look for exceptions */
-	    while ((tok = strtok_r(NULL, sep, &last)) && STR_NE(tok, "EXCEPT"))
-		 /* VOID */ ;
-	    return (tok == 0 || list_match(NULL, request, match_fn) == 0);
-	}
-    }
-    return (NO);
-}
-
-/* server_match - match server information */
-
-static int
-server_match(char *tok, struct request_info *request)
-{
-    char   *host;
-
-    if ((host = split_at(tok + 1, '@')) == 0) {	/* plain daemon */
-	return (string_match(tok, eval_daemon(request)));
-    } else {					/* daemon@host */
-	return (string_match(tok, eval_daemon(request))
-		&& host_match(host, request->server));
-    }
-}
-
-/* client_match - match client information */
-
-static int
-client_match(char *tok, struct request_info *request)
-{
-    char   *host;
-
-    if ((host = split_at(tok + 1, '@')) == 0) {	/* plain host */
-	return (host_match(tok, request->client));
-    } else {					/* user@host */
-	return (host_match(host, request->client)
-		&& string_match(tok, eval_user(request)));
-    }
-}
-
-/* host_match - match host name and/or address against pattern */
-
-static int
-host_match(char *tok, struct host_info *host)
-{
-    char   *mask;
-
-    /*
-     * This code looks a little hairy because we want to avoid unnecessary
-     * hostname lookups.
-     * 
-     * The KNOWN pattern requires that both address AND name be known; some
-     * patterns are specific to host names or to host addresses; all other
-     * patterns are satisfied when either the address OR the name match.
-     */
-
-    if (tok[0] == '@') {			/* netgroup: look it up */
-#ifdef  NETGROUP
-	static char *mydomain = 0;
-	if (mydomain == 0)
-	    yp_get_default_domain(&mydomain);
-	return (innetgr(tok + 1, eval_hostname(host), NULL, mydomain));
-#else
-	tcpd_warn("netgroup support is disabled");	/* not tcpd_jump() */
-	return (NO);
-#endif
-    } else if (tok[0] == '/') {			/* /file hack */
-	return (hostfile_match(tok, host));
-    } else if (STR_EQ(tok, "KNOWN")) {		/* check address and name */
-	char   *name = eval_hostname(host);
-	return (STR_NE(eval_hostaddr(host), unknown) && HOSTNAME_KNOWN(name));
-    } else if (STR_EQ(tok, "LOCAL")) {		/* local: no dots in name */
-	char   *name = eval_hostname(host);
-	return (strchr(name, '.') == 0 && HOSTNAME_KNOWN(name));
-    } else if (strncmp(tok, "{RBL}.", 6) == 0) { /* RBL lookup in domain */
-	return rbl_match(tok+6, eval_hostaddr(host));
-    } else if ((mask = split_at(tok, '/')) != 0) {	/* net/mask */
-	return (masked_match(tok, mask, eval_hostaddr(host)));
-    } else {					/* anything else */
-	return (string_match(tok, eval_hostaddr(host))
-	    || (NOT_INADDR(tok) && string_match(tok, eval_hostname(host))));
-    }
-}
-
-/* hostfile_match - look up host patterns from file */
-
-static int
-hostfile_match(char *path, struct host_info *host)
-{
-    char    tok[BUFSIZ];
-    int     match = NO;
-    FILE   *fp;
-
-    if ((fp = fopen(path, "r")) != 0) {
-	while (fscanf(fp, "%s", tok) == 1 && !(match = host_match(tok, host)))
-	     /* void */ ;
-	fclose(fp);
-    } else if (errno != ENOENT) {
-	tcpd_warn("open %s: %m", path);
-    }
-    return (match);
-}
-
-/* rbl_match() - match host by looking up in RBL domain */
-
-static int
-rbl_match(
-    char   *rbl_domain,			/* RBL domain */
-    char   *rbl_hostaddr)		/* hostaddr */
-{
-    char *rbl_name;
-    unsigned long host_address;
-    int ret = NO;
-    size_t len = strlen(rbl_domain) + (4 * 4) + 2;
- 
-    if (dot_quad_addr(rbl_hostaddr, &host_address) != 0) {
-	tcpd_warn("unable to convert %s to address", rbl_hostaddr);
-	return (NO);
-    }
-    host_address = ntohl(host_address);
-    /*  construct the rbl name to look up */
-    if ((rbl_name = malloc(len)) == NULL) {
-	tcpd_jump("not enough memory to build RBL name for %s in %s", rbl_hostaddr, rbl_domain);
-	/* NOTREACHED */
-    }
-    snprintf(rbl_name, len, "%u.%u.%u.%u.%s",
-	    (unsigned int) ((host_address) & 0xff),
-	    (unsigned int) ((host_address >> 8) & 0xff),
-	    (unsigned int) ((host_address >> 16) & 0xff),
-	    (unsigned int) ((host_address >> 24) & 0xff),
-	    rbl_domain);
-    /* look it up */
-    if (gethostbyname(rbl_name) != NULL) {
-	/* successful lookup - they're on the RBL list */
-	ret = YES;
-    }
-    free(rbl_name);
-
-    return ret;
-}
-
-/* string_match - match string against pattern */
-
-static int
-string_match(char *tok, char *string)
-{
-    int     n;
-
-    if (tok[0] == '.') {			/* suffix */
-	n = strlen(string) - strlen(tok);
-	return (n > 0 && STR_EQ(tok, string + n));
-    } else if (STR_EQ(tok, "ALL")) {		/* all: match any */
-	return (YES);
-    } else if (STR_EQ(tok, "KNOWN")) {		/* not unknown */
-	return (STR_NE(string, unknown));
-    } else if (tok[(n = strlen(tok)) - 1] == '.') {	/* prefix */
-	return (STRN_EQ(tok, string, n));
-    } else {					/* exact match */
-	return (STR_EQ(tok, string));
-    }
-}
-
-/* masked_match - match address against netnumber/netmask */
-
-static int
-masked_match(char *net_tok, char *mask_tok, char *string)
-{
-#ifndef INET6
-    return masked_match4(net_tok, mask_tok, string);
-#else
-    /*
-     * masked_match4() is kept just for supporting shortened IPv4 address form.
-     * If we could get rid of shortened IPv4 form, we could just always use
-     * masked_match6().
-     */
-    if (dot_quad_addr(net_tok, NULL) != -1 &&
-        dot_quad_addr(mask_tok, NULL) != -1 &&
-        dot_quad_addr(string, NULL) != -1) {
-	return masked_match4(net_tok, mask_tok, string);
-    } else
-	return masked_match6(net_tok, mask_tok, string);
-#endif
-}
-
-static int
-masked_match4(char *net_tok, char *mask_tok, char *string)
-{
-    unsigned long net;
-    unsigned long mask;
-    unsigned long addr;
-
-    /*
-     * Disallow forms other than dotted quad: the treatment that inet_addr()
-     * gives to forms with less than four components is inconsistent with the
-     * access control language. John P. Rouillard <rouilj@cs.umb.edu>.
-     */
-
-    if (dot_quad_addr(string, &addr) != 0)
-	return (NO);
-    if (dot_quad_addr(net_tok, &net) != 0 ||
-        dot_quad_addr(mask_tok, &mask) != 0) {
-	tcpd_warn("bad net/mask expression: %s/%s", net_tok, mask_tok);
-	return (NO);				/* not tcpd_jump() */
-    }
-
-    if ((net & ~mask) != 0)
-	tcpd_warn("host bits not all zero in %s/%s", net_tok, mask_tok);
-
-    return ((addr & mask) == net);
-}
-
-#ifdef INET6
-static int
-masked_match6(char *net_tok, char *mask_tok, char *string)
-{
-    union {
-	struct sockaddr sa;
-	struct sockaddr_in sin;
-	struct sockaddr_in6 sin6;
-    } net, mask, addr;
-    struct addrinfo hints, *res;
-    unsigned long masklen;
-    char *ep;
-    size_t i;
-    char *np, *mp, *ap;
-    size_t alen;
-
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = PF_UNSPEC;
-    hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-    hints.ai_flags = AI_NUMERICHOST;
-    if (getaddrinfo(net_tok, "0", &hints, &res) == 0) {
-	if (res->ai_addrlen > sizeof(net) || res->ai_next) {
-	    freeaddrinfo(res);
-	    return NO;
-	}
-	memcpy(&net, res->ai_addr, res->ai_addrlen);
-	freeaddrinfo(res);
-    } else
-	return NO;
-
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = net.sa.sa_family;
-    hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-    hints.ai_flags = AI_NUMERICHOST;
-    ep = NULL;
-    if (getaddrinfo(mask_tok, "0", &hints, &res) == 0) {
-	if (res->ai_family == AF_INET6 &&
-	    ((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id) {
-	    freeaddrinfo(res);
-	    return NO;
-	}
-	if (res->ai_addrlen > sizeof(mask) || res->ai_next) {
-	    freeaddrinfo(res);
-	    return NO;
-	}
-	memcpy(&mask, res->ai_addr, res->ai_addrlen);
-	freeaddrinfo(res);
-    } else {
-	ep = NULL;
-	masklen = strtoul(mask_tok, &ep, 10);
-	if (ep && !*ep) {
-	    memset(&mask, 0, sizeof(mask));
-	    mask.sa.sa_family = net.sa.sa_family;
-	    mask.sa.sa_len = net.sa.sa_len;
-	    switch (mask.sa.sa_family) {
-	    case AF_INET:
-		mp = (char *)&mask.sin.sin_addr;
-		alen = sizeof(mask.sin.sin_addr);
-		break;
-	    case AF_INET6:
-		mp = (char *)&mask.sin6.sin6_addr;
-		alen = sizeof(mask.sin6.sin6_addr);
-		break;
-	    default:
-		return NO;
-	    }
-	    if (masklen / 8 > alen)
-		return NO;
-	    memset(mp, 0xff, masklen / 8);
-	    if (masklen % 8)
-		mp[masklen / 8] = 0xff00 >> (masklen % 8);
-	} else
-	    return NO;
-    }
-
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = PF_UNSPEC;
-    hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-    hints.ai_flags = AI_NUMERICHOST;
-    if (getaddrinfo(string, "0", &hints, &res) == 0) {
-	if (res->ai_addrlen > sizeof(addr) || res->ai_next) {
-	    freeaddrinfo(res);
-	    return NO;
-	}
-	/* special case - IPv4 mapped address */
-	if (net.sa.sa_family == AF_INET && res->ai_family == AF_INET6 && 
-	    IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)res->ai_addr)->sin6_addr)) {
-	    memset(&addr, 0, sizeof(addr));
-	    addr.sa.sa_family = net.sa.sa_family;
-	    addr.sa.sa_len = net.sa.sa_len;
-	    memcpy(&addr.sin.sin_addr,
-	        &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr.s6_addr[12],
-		sizeof(addr.sin.sin_addr));
-	} else
-	    memcpy(&addr, res->ai_addr, res->ai_addrlen);
-	freeaddrinfo(res);
-    } else
-	return NO;
-
-    if (net.sa.sa_family != mask.sa.sa_family ||
-        net.sa.sa_family != addr.sa.sa_family) {
-	return NO;
-    }
-     
-    switch (net.sa.sa_family) {
-    case AF_INET:
-	np = (char *)&net.sin.sin_addr;
-	mp = (char *)&mask.sin.sin_addr;
-	ap = (char *)&addr.sin.sin_addr;
-	alen = sizeof(net.sin.sin_addr);
-	break;
-    case AF_INET6:
-	np = (char *)&net.sin6.sin6_addr;
-	mp = (char *)&mask.sin6.sin6_addr;
-	ap = (char *)&addr.sin6.sin6_addr;
-	alen = sizeof(net.sin6.sin6_addr);
-	break;
-    default:
-	return NO;
-    }
-
-    for (i = 0; i < alen; i++)
-	if (np[i] & ~mp[i]) {
-	    tcpd_warn("host bits not all zero in %s/%s", net_tok, mask_tok);
-	    break;
-	}
-
-    for (i = 0; i < alen; i++)
-	ap[i] &= mp[i];
-
-    if (addr.sa.sa_family == AF_INET6 && addr.sin6.sin6_scope_id &&
-        addr.sin6.sin6_scope_id != net.sin6.sin6_scope_id)
-	return NO;
-    return (memcmp(ap, np, alen) == 0);
-}
-#endif
diff --git a/lib/libwrap/hosts_ctl.c b/lib/libwrap/hosts_ctl.c
deleted file mode 100644
index 0bc10208d..000000000
--- a/lib/libwrap/hosts_ctl.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: hosts_ctl.c,v 1.5 2012/03/21 10:10:37 matt Exp $	*/
-
- /*
-  * hosts_ctl() combines common applications of the host access control
-  * library routines. It bundles its arguments then calls the hosts_access()
-  * access control checker. The host name and user name arguments should be
-  * empty strings, STRING_UNKNOWN or real data. If a match is found, the
-  * optional shell command is executed.
-  * 
-  * Restriction: this interface does not pass enough information to support
-  * selective remote username lookups or selective hostname double checks.
-  * 
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) hosts_ctl.c 1.4 94/12/28 17:42:27";
-#else
-__RCSID("$NetBSD: hosts_ctl.c,v 1.5 2012/03/21 10:10:37 matt Exp $");
-#endif
-#endif
-
-#include <stdio.h>
-
-#include "tcpd.h"
-
-/* hosts_ctl - limited interface to the hosts_access() routine */
-
-int
-hosts_ctl(char *daemon, char *name, char *addr, char *user)
-{
-    struct request_info request;
-
-    return (hosts_access(request_init(&request,
-				      RQ_DAEMON, daemon,
-				      RQ_CLIENT_NAME, name,
-				      RQ_CLIENT_ADDR, addr,
-				      RQ_USER, user,
-				      0)));
-}
diff --git a/lib/libwrap/hosts_options.5 b/lib/libwrap/hosts_options.5
deleted file mode 100644
index f8fb3bd6c..000000000
--- a/lib/libwrap/hosts_options.5
+++ /dev/null
@@ -1,189 +0,0 @@
-.\"	$NetBSD: hosts_options.5,v 1.8 2002/10/01 19:38:46 wiz Exp $
-.\"
-.TH HOSTS_OPTIONS 5
-.SH NAME
-hosts_options \- host access control language extensions
-.SH DESCRIPTION
-This document describes optional extensions to the language described
-in the hosts_access(5) document.
-The extensions are enabled at program build time.
-For example, by editing the Makefile and turning on the
-PROCESS_OPTIONS compile-time option.
-.PP
-The extensible language uses the following format:
-.sp
-.ti +3
-daemon_list : client_list : option : option ...
-.PP
-The first two fields are described in the hosts_access(5) manual page.
-The remainder of the rules is a list of zero or more options.
-Any ":" characters within options should be protected with a backslash.
-.PP
-An option is of the form "keyword" or "keyword value".
-Options are processed in the specified order.
-Some options are subjected to
-%\*[Lt]letter\*[Gt] substitutions.
-For the sake of backwards compatibility with
-earlier versions, an "=" is permitted between keyword and value.
-.SH LOGGING
-.IP "severity mail.info"
-.IP "severity notice"
-Change the severity level at which the event will be logged.
-Facility names (such as mail) are optional, and are not supported on systems
-with older syslog implementations.
-The severity option can be used to emphasize or to ignore specific events.
-.SH ACCESS CONTROL
-.IP "allow"
-.IP "deny"
-Grant (deny) service.
-These options must appear at the end of a rule.
-.PP
-The \fIallow\fR and \fIdeny\fR keywords make it possible to keep all
-access control rules within a single file, for example in the
-\fIhosts.allow\fR file.
-.sp
-To permit access from specific hosts only:
-.sp
-.ne 2
-.ti +3
-ALL: .friendly.domain: ALLOW
-.ti +3
-ALL: ALL: DENY
-.sp
-To permit access from all hosts except a few trouble makers:
-.sp
-.ne 2
-.ti +3
-ALL: .bad.domain: DENY
-.ti +3
-ALL: ALL: ALLOW
-.sp
-Notice the leading dot on the domain name patterns.
-.SH RUNNING OTHER COMMANDS
-.IP "spawn shell_command"
-Execute, in a child process, the specified shell command, after
-performing the %\*[Lt]letter\*[Gt] expansions described in the hosts_access(5)
-manual page.
-The command is executed with stdin, stdout and stderr
-connected to the null device, so that it won\'t mess up the
-conversation with the client host.
-Example:
-.sp
-.nf
-.ti +3
-spawn (/some/where/safe_finger -l @%h | /usr/ucb/mail root) \*[Am]
-.fi
-.sp
-executes, in a background child process, the shell command "safe_finger
--l @%h | mail root" after replacing %h by the name or address of the
-remote host.
-.sp
-The example uses the "safe_finger" command instead of the regular
-"finger" command, to limit possible damage from data sent by the finger server.
-The "safe_finger" command is part of the daemon wrapper
-package; it is a wrapper around the regular finger command that filters
-the data sent by the remote host.
-.IP "twist shell_command"
-Replace the current process by an instance of the specified shell
-command, after performing the %\*[Lt]letter\*[Gt] expansions described in the
-hosts_access(5) manual page.
-Stdin, stdout and stderr are connected to the client process.
-This option must appear at the end of a rule.
-.sp
-To send a customized bounce message to the client instead of
-running the real ftp daemon:
-.sp
-.nf
-.ti +3
-in.ftpd : ... : twist /bin/echo 421 Some bounce message
-.fi
-.sp
-For an alternative way to talk to client processes, see the
-\fIbanners\fR option below.
-.sp
-To run /some/other/in.telnetd without polluting its command-line
-array or its process environment:
-.sp
-.nf
-.ti +3
-in.telnetd : ... : twist PATH=/some/other; exec in.telnetd
-.fi
-.sp
-Warning:  in case of UDP services, do not twist to commands that use
-the standard I/O or the read(2)/write(2) routines to communicate with
-the client process; UDP requires other I/O primitives.
-.SH NETWORK OPTIONS
-.IP "keepalive"
-Causes the server to periodically send a message to the client.
-The connection is considered broken when the client does not respond.
-The keepalive option can be useful when users turn off their
-machine while it is still connected to a server.
-The keepalive option is not useful for datagram (UDP) services.
-.IP "linger number_of_seconds"
-Specifies how long the kernel will try to deliver not-yet delivered
-data after the server process closes a connection.
-.SH USERNAME LOOKUP
-.IP "rfc931 [ timeout_in_seconds ]"
-Look up the client user name with the RFC 931 (TAP, IDENT, RFC 1413)
-protocol.
-This option is silently ignored in case of services based on
-transports other than TCP.
-It requires that the client system runs an RFC 931 (IDENT, etc.)
--compliant daemon, and may cause noticeable
-delays with connections from non-UNIX clients.
-The timeout period is optional.
-If no timeout is specified a compile-time defined default
-value is taken.
-.SH MISCELLANEOUS
-.IP "banners /some/directory"
-Look for a file in `/some/directory' with the same name as the daemon
-process (for example in.telnetd for the telnet service), and copy its
-contents to the client.
-Newline characters are replaced by carriage-return newline,
-and %\*[Lt]letter\*[Gt] sequences are expanded (see
-the hosts_access(5) manual page).
-.sp
-The tcp wrappers source code distribution provides a sample makefile
-(Banners.Makefile) for convenient banner maintenance.
-.sp
-Warning: banners are supported for connection-oriented (TCP) network
-services only.
-.IP "nice [ number ]"
-Change the nice value of the process (default 10).
-Specify a positive value to spend more CPU resources on other processes.
-.IP "setenv name value"
-Place a (name, value) pair into the process environment.
-The value is subjected to %\*[Lt]letter\*[Gt] expansions and
-may contain whitespace (but leading and trailing blanks are stripped off).
-.sp
-Warning: many network daemons reset their environment before spawning a
-login or shell process.
-.IP "umask 022"
-Like the umask command that is built into the shell.
-An umask of 022 prevents the creation of files with group
-and world write permission.
-The umask argument should be an octal number.
-.IP "user nobody"
-.IP "user nobody.kmem"
-Assume the privileges of the "nobody" userid (or user "nobody", group
-"kmem").
-The first form is useful with inetd implementations that run
-all services with root privilege.
-The second form is useful for services that need
-special group privileges only.
-.SH DIAGNOSTICS
-When a syntax error is found in an access control rule, the error
-is reported to the syslog daemon; further options will be ignored,
-and service is denied.
-.SH SEE ALSO
-hosts_access(3)
-hosts_access(5), the default access control language
-.SH AUTHOR
-.na
-.nf
-Wietse Venema (wietse@wzv.win.tue.nl)
-Department of Mathematics and Computing Science
-Eindhoven University of Technology
-Den Dolech 2, P.O. Box 513,
-5600 MB Eindhoven, The Netherlands
-\" @(#) hosts_options.5 1.10 94/12/28 17:42:28
diff --git a/lib/libwrap/misc.c b/lib/libwrap/misc.c
deleted file mode 100644
index c3d901620..000000000
--- a/lib/libwrap/misc.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*	$NetBSD: misc.c,v 1.10 2012/03/21 10:10:37 matt Exp $	*/
-
- /*
-  * Misc routines that are used by tcpd and by tcpdchk.
-  * 
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsic[] = "@(#) misc.c 1.2 96/02/11 17:01:29";
-#else
-__RCSID("$NetBSD: misc.c,v 1.10 2012/03/21 10:10:37 matt Exp $");
-#endif
-#endif
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "tcpd.h"
-
-/* xgets - fgets() with backslash-newline stripping */
-
-char *
-xgets(char *ptr, int len, FILE   *fp)
-{
-    int     got;
-    char   *start = ptr;
-
-    while (len > 1 && fgets(ptr, len, fp)) {
-	got = strlen(ptr);
-	if (got >= 1 && ptr[got - 1] == '\n') {
-	    tcpd_context.line++;
-	    if (got >= 2 && ptr[got - 2] == '\\') {
-		got -= 2;
-	    } else {
-		return (start);
-	    }
-	}
-	ptr += got;
-	len -= got;
-	ptr[0] = 0;
-    }
-    return (ptr > start ? start : 0);
-}
-
-/* split_at - break string at delimiter or return NULL */
-
-char *
-split_at(char *string, int delimiter)
-{
-    char *cp;
-    int bracket;
-
-    bracket = 0;
-    for (cp = string; cp && *cp; cp++) {
-	switch (*cp) {
-	case '[':
-	    bracket++;
-	    break;
-	case ']':
-	    bracket--;
-	    break;
-	default:
-	    if (bracket == 0 && *cp == delimiter) {
-		*cp++ = 0;
-		return cp;
-	    }
-	    break;
-	}
-    }
-    return NULL;
-}
-
-/* dot_quad_addr - convert dotted quad to internal form */
-
-int
-dot_quad_addr(char *str, unsigned long *addr)
-{
-    struct in_addr a;
-
-    if (!inet_aton(str, &a))
-	return -1;
-    if (addr)
-	*addr = a.s_addr;
-    return 0;
-}
diff --git a/lib/libwrap/mystdarg.h b/lib/libwrap/mystdarg.h
deleted file mode 100644
index f22969dea..000000000
--- a/lib/libwrap/mystdarg.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*	$NetBSD: mystdarg.h,v 1.2 1997/10/09 21:20:37 christos Exp $	*/
-
- /*
-  * What follows is an attempt to unify varargs.h and stdarg.h. I'd rather
-  * have this than #ifdefs all over the code.
-  */
-
-#ifdef __STDC__
-#include <stdarg.h>
-#define VARARGS(func,type,arg) func(type arg, ...)
-#define VASTART(ap,type,name)  va_start(ap,name)
-#define VAEND(ap)              va_end(ap)
-#else
-#include <varargs.h>
-#define VARARGS(func,type,arg) func(va_alist) va_dcl
-#define VASTART(ap,type,name)  {type name; va_start(ap); name = va_arg(ap, type)
-#define VAEND(ap)              va_end(ap);}
-#endif
diff --git a/lib/libwrap/options.c b/lib/libwrap/options.c
deleted file mode 100644
index 1350dc4c9..000000000
--- a/lib/libwrap/options.c
+++ /dev/null
@@ -1,634 +0,0 @@
-/*	$NetBSD: options.c,v 1.16 2012/03/22 22:59:43 joerg Exp $	*/
-
- /*
-  * General skeleton for adding options to the access control language. The
-  * features offered by this module are documented in the hosts_options(5)
-  * manual page (source file: hosts_options.5, "nroff -man" format).
-  * 
-  * Notes and warnings for those who want to add features:
-  * 
-  * In case of errors, abort options processing and deny access. There are too
-  * many irreversible side effects to make error recovery feasible. For
-  * example, it makes no sense to continue after we have already changed the
-  * userid.
-  * 
-  * In case of errors, do not terminate the process: the routines might be
-  * called from a long-running daemon that should run forever. Instead, call
-  * tcpd_jump() which does a non-local goto back into the hosts_access()
-  * routine.
-  * 
-  * In case of severe errors, use clean_exit() instead of directly calling
-  * exit(), or the inetd may loop on an UDP request.
-  * 
-  * In verification mode (for example, with the "tcpdmatch" command) the
-  * "dry_run" flag is set. In this mode, an option function should just "say"
-  * what it is going to do instead of really doing it.
-  * 
-  * Some option functions do not return (for example, the twist option passes
-  * control to another program). In verification mode (dry_run flag is set)
-  * such options should clear the "dry_run" flag to inform the caller of this
-  * course of action.
-  */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) options.c 1.17 96/02/11 17:01:31";
-#else
-__RCSID("$NetBSD: options.c,v 1.16 2012/03/22 22:59:43 joerg Exp $");
-#endif
-#endif
-
-/* System libraries. */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <syslog.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <pwd.h>
-#include <grp.h>
-#include <ctype.h>
-#include <setjmp.h>
-#include <string.h>
-
-/* Local stuff. */
-
-#include "tcpd.h"
-
-/* Options runtime support. */
-
-int     dry_run = 0;			/* flag set in verification mode */
-extern jmp_buf tcpd_buf;		/* tcpd_jump() support */
-
-/* Options parser support. */
-
-static char whitespace_eq[] = "= \t\r\n";
-#define whitespace (whitespace_eq + 1)
-
-static char *get_field			/* chew :-delimited field off string */
-		(char *);
-static char *chop_string		/* strip leading and trailing blanks */
-		(char *);
-struct syslog_names;
-static int severity_map 
-		(const struct syslog_names *, char *);
-
-/* List of functions that implement the options. Add yours here. */
-
-static void user_option			/* execute "user name.group" option */
-		(char *, struct request_info *);
-static void group_option		/* execute "group name" option */
-		(char *, struct request_info *);
-static void umask_option		/* execute "umask mask" option */
-		(char *, struct request_info *);
-static void linger_option		/* execute "linger time" option */
-		(char *, struct request_info *);
-static void keepalive_option		/* execute "keepalive" option */
-		(char *, struct request_info *);
-static void spawn_option		/* execute "spawn command" option */
-		(char *, struct request_info *);
-static void twist_option		/* execute "twist command" option */
-		(char *, struct request_info *);
-static void rfc931_option		/* execute "rfc931" option */
-		(char *, struct request_info *);
-static void setenv_option		/* execute "setenv name value" */
-		(char *, struct request_info *);
-static void nice_option			/* execute "nice" option */
-		(char *, struct request_info *);
-static void severity_option		/* execute "severity value" */
-		(char *, struct request_info *);
-__dead static void allow_option		/* execute "allow" option */
-		(char *, struct request_info *);
-__dead static void deny_option			/* execute "deny" option */
-		(char *, struct request_info *);
-static void banners_option		/* execute "banners path" option */
-		(char *, struct request_info *);
-
-/* Structure of the options table. */
-
-struct option {
-    const char *name;			/* keyword name, case is ignored */
-    void  (*func)			/* function that does the real work */
-		(char *, struct request_info *);
-    int     flags;			/* see below... */
-};
-
-#define NEED_ARG	(1<<1)		/* option requires argument */
-#define USE_LAST	(1<<2)		/* option must be last */
-#define OPT_ARG		(1<<3)		/* option has optional argument */
-#define EXPAND_ARG	(1<<4)		/* do %x expansion on argument */
-
-#define need_arg(o)	((o)->flags & NEED_ARG)
-#define opt_arg(o)	((o)->flags & OPT_ARG)
-#define permit_arg(o)	((o)->flags & (NEED_ARG | OPT_ARG))
-#define use_last(o)	((o)->flags & USE_LAST)
-#define expand_arg(o)	((o)->flags & EXPAND_ARG)
-
-/* List of known keywords. Add yours here. */
-
-static struct option option_table[] = {
-    { "user", user_option, NEED_ARG },
-    { "group", group_option, NEED_ARG },
-    { "umask", umask_option, NEED_ARG },
-    { "linger", linger_option, NEED_ARG },
-    { "keepalive", keepalive_option, 0 },
-    { "spawn", spawn_option, NEED_ARG | EXPAND_ARG },
-    { "twist", twist_option, NEED_ARG | EXPAND_ARG | USE_LAST },
-    { "rfc931", rfc931_option, OPT_ARG },
-    { "setenv", setenv_option, NEED_ARG | EXPAND_ARG },
-    { "nice", nice_option, OPT_ARG },
-    { "severity", severity_option, NEED_ARG },
-    { "allow", allow_option, USE_LAST },
-    { "deny", deny_option, USE_LAST },
-    { "banners", banners_option, NEED_ARG },
-    { NULL, NULL, 0 }
-};
-
-/* process_options - process access control options */
-
-void
-process_options(char *options, struct request_info *request)
-{
-    char   *key;
-    char   *value;
-    char   *curr_opt;
-    char   *next_opt;
-    struct option *op;
-    char    bf[BUFSIZ];
-
-    for (curr_opt = get_field(options); curr_opt; curr_opt = next_opt) {
-	next_opt = get_field((char *) 0);
-
-	/*
-	 * Separate the option into name and value parts. For backwards
-	 * compatibility we ignore exactly one '=' between name and value.
-	 */
-	curr_opt = chop_string(curr_opt);
-	if (*(value = curr_opt + strcspn(curr_opt, whitespace_eq))) {
-	    if (*value != '=') {
-		*value++ = 0;
-		value += strspn(value, whitespace);
-	    }
-	    if (*value == '=') {
-		*value++ = 0;
-		value += strspn(value, whitespace);
-	    }
-	}
-	if (*value == 0)
-	    value = 0;
-	key = curr_opt;
-
-	/*
-	 * Disallow missing option names (and empty option fields).
-	 */
-	if (*key == 0)
-	    tcpd_jump("missing option name");
-
-	/*
-	 * Lookup the option-specific info and do some common error checks.
-	 * Delegate option-specific processing to the specific functions.
-	 */
-
-	for (op = option_table; op->name && STR_NE(op->name, key); op++)
-	     /* VOID */ ;
-	if (op->name == 0)
-	    tcpd_jump("bad option name: \"%s\"", key);
-	if (!value && need_arg(op))
-	    tcpd_jump("option \"%s\" requires value", key);
-	if (value && !permit_arg(op))
-	    tcpd_jump("option \"%s\" requires no value", key);
-	if (next_opt && use_last(op))
-	    tcpd_jump("option \"%s\" must be at end", key);
-	if (value && expand_arg(op))
-	    value = chop_string(percent_x(bf, sizeof(bf), value, request));
-	if (hosts_access_verbose)
-	    syslog(LOG_DEBUG, "option:   %s %s", key, value ? value : "");
-	(*(op->func)) (value, request);
-    }
-}
-
-/* allow_option - grant access */
-
-/* ARGSUSED */
-
-static void
-allow_option(char *value, struct request_info *request)
-{
-    longjmp(tcpd_buf, AC_PERMIT);
-}
-
-/* deny_option - deny access */
-
-/* ARGSUSED */
-
-static void
-deny_option(char *value, struct request_info *request)
-{
-    longjmp(tcpd_buf, AC_DENY);
-}
-
-/* banners_option - expand %<char>, terminate each line with CRLF */
-
-static void
-banners_option(char *value, struct request_info *request)
-{
-    char    path[MAXPATHLEN];
-    char    ibuf[BUFSIZ];
-    char    obuf[2 * BUFSIZ];
-    struct stat st;
-    int     ch;
-    FILE   *fp;
-
-    (void)snprintf(path, sizeof path, "%s/%s", value, eval_daemon(request));
-    if ((fp = fopen(path, "r")) != 0) {
-	while ((ch = fgetc(fp)) == 0)
-	    write(request->fd, "", 1);
-	ungetc(ch, fp);
-	while (fgets(ibuf, sizeof(ibuf) - 2, fp)) {
-	    if (split_at(ibuf, '\n'))
-		strcat(ibuf, "\r\n");	/* XXX strcat is safe */
-	    percent_x(obuf, sizeof(obuf), ibuf, request);
-	    write(request->fd, obuf, strlen(obuf));
-	}
-	fclose(fp);
-    } else if (stat(value, &st) < 0) {
-	tcpd_warn("%s: %m", value);
-    }
-}
-
-/* group_option - switch group id */
-
-/* ARGSUSED */
-
-static void
-group_option(char *value, struct request_info *request)
-{
-    struct group grs, *grp;
-    char grbuf[1024];
-
-    (void)getgrnam_r(value, &grs, grbuf, sizeof(grbuf), &grp);
-    if (grp == NULL)
-	tcpd_jump("unknown group: \"%s\"", value);
-
-    if (dry_run == 0 && setgid(grp->gr_gid))
-	tcpd_jump("setgid(%s): %m", value);
-}
-
-/* user_option - switch user id */
-
-/* ARGSUSED */
-
-static void
-user_option(char *value, struct request_info *request)
-{
-    struct passwd *pwd, pws;
-    char   *group;
-    char   pwbuf[1024];
-
-    if ((group = split_at(value, '.')) != 0)
-	group_option(group, request);
-    (void)getpwnam_r(value, &pws, pwbuf, sizeof(pwbuf), &pwd);
-    if (pwd == NULL)
-	tcpd_jump("unknown user: \"%s\"", value);
-
-    if (dry_run == 0 && setuid(pwd->pw_uid))
-	tcpd_jump("setuid(%s): %m", value);
-}
-
-/* umask_option - set file creation mask */
-
-/* ARGSUSED */
-
-static void
-umask_option(char *value, struct request_info *request)
-{
-    unsigned mask;
-    char    junk;
-
-    if (sscanf(value, "%o%c", &mask, &junk) != 1 || (mask & 0777) != mask)
-	tcpd_jump("bad umask value: \"%s\"", value);
-    (void) umask(mask);
-}
-
-/* spawn_option - spawn a shell command and wait */
-
-/* ARGSUSED */
-
-static void
-spawn_option(char *value, struct request_info *request)
-{
-    if (dry_run == 0)
-	shell_cmd(value);
-}
-
-/* linger_option - set the socket linger time (Marc Boucher <marc@cam.org>) */
-
-/* ARGSUSED */
-
-static void
-linger_option(char *value, struct request_info *request)
-{
-    struct linger linger;
-    char    junk;
-
-    if (sscanf(value, "%d%c", &linger.l_linger, &junk) != 1
-	|| linger.l_linger < 0)
-	tcpd_jump("bad linger value: \"%s\"", value);
-    if (dry_run == 0) {
-	linger.l_onoff = (linger.l_linger != 0);
-	if (setsockopt(request->fd, SOL_SOCKET, SO_LINGER, (char *) &linger,
-		       sizeof(linger)) < 0)
-	    tcpd_warn("setsockopt SO_LINGER %d: %m", linger.l_linger);
-    }
-}
-
-/* keepalive_option - set the socket keepalive option */
-
-/* ARGSUSED */
-
-static void
-keepalive_option(char *value, struct request_info *request)
-{
-    static int on = 1;
-
-    if (dry_run == 0 && setsockopt(request->fd, SOL_SOCKET, SO_KEEPALIVE,
-				   (char *) &on, sizeof(on)) < 0)
-	tcpd_warn("setsockopt SO_KEEPALIVE: %m");
-}
-
-/* nice_option - set nice value */
-
-/* ARGSUSED */
-
-static void
-nice_option(char *value, struct request_info *request)
-{
-    int     niceval = 10;
-    char    junk;
-
-    if (value != 0 && sscanf(value, "%d%c", &niceval, &junk) != 1)
-	tcpd_jump("bad nice value: \"%s\"", value);
-    if (dry_run == 0 && nice(niceval) < 0)
-	tcpd_warn("nice(%d): %m", niceval);
-}
-
-/* twist_option - replace process by shell command */
-
-static void
-twist_option(char *value, struct request_info *request)
-{
-    if (dry_run != 0) {
-	dry_run = 0;
-    } else {
-	if (resident > 0)
-	    tcpd_jump("twist option in resident process");
-
-	syslog(deny_severity, "twist %s to %s", eval_client(request), value);
-
-	/* Before switching to the shell, set up stdin, stdout and stderr. */
-
-#define maybe_dup2(from, to) ((from == to) ? to : (close(to), dup(from)))
-
-	if (maybe_dup2(request->fd, 0) != 0 ||
-	    maybe_dup2(request->fd, 1) != 1 ||
-	    maybe_dup2(request->fd, 2) != 2) {
-	    tcpd_warn("twist_option: dup: %m");
-	} else {
-	    if (request->fd > 2)
-		close(request->fd);
-	    (void) execl("/bin/sh", "sh", "-c", value, (char *) 0);
-	    tcpd_warn("twist_option: /bin/sh: %m");
-	}
-
-	/* Something went wrong: we MUST terminate the process. */
-	clean_exit(request);
-    }
-}
-
-/* rfc931_option - look up remote user name */
-
-static void
-rfc931_option(char *value, struct request_info *request)
-{
-    int     timeout;
-    char    junk;
-
-    if (value != 0) {
-	if (sscanf(value, "%d%c", &timeout, &junk) != 1 || timeout <= 0)
-	    tcpd_jump("bad rfc931 timeout: \"%s\"", value);
-	rfc931_timeout = timeout;
-    }
-    (void) eval_user(request);
-}
-
-/* setenv_option - set environment variable */
-
-/* ARGSUSED */
-
-static void
-setenv_option(char *value, struct request_info *request)
-{
-    char   *var_value;
-
-    if (*(var_value = value + strcspn(value, whitespace)))
-	*var_value++ = 0;
-    if (setenv(chop_string(value), chop_string(var_value), 1))
-	tcpd_jump("memory allocation failure");
-}
-
- /*
-  * The severity option goes last because it comes with a huge amount of ugly
-  * #ifdefs and tables.
-  */
-
-struct syslog_names {
-    const char *name;
-    int value;
-};
-
-static const struct syslog_names log_fac[] = {
-#ifdef LOG_KERN
-    { "kern", LOG_KERN },
-#endif
-#ifdef LOG_USER
-    { "user", LOG_USER },
-#endif
-#ifdef LOG_MAIL
-    { "mail", LOG_MAIL },
-#endif
-#ifdef LOG_DAEMON
-    { "daemon", LOG_DAEMON },
-#endif
-#ifdef LOG_AUTH
-    { "auth", LOG_AUTH },
-#endif
-#ifdef LOG_LPR
-    { "lpr", LOG_LPR },
-#endif
-#ifdef LOG_NEWS
-    { "news", LOG_NEWS },
-#endif
-#ifdef LOG_UUCP
-    { "uucp", LOG_UUCP },
-#endif
-#ifdef LOG_CRON
-    { "cron", LOG_CRON },
-#endif
-#ifdef LOG_AUTHPRIV
-    { "authpriv", LOG_AUTHPRIV },
-#endif
-#ifdef LOG_FTP
-    { "ftp", LOG_FTP },
-#endif
-#ifdef LOG_LOCAL0
-    { "local0", LOG_LOCAL0 },
-#endif
-#ifdef LOG_LOCAL1
-    { "local1", LOG_LOCAL1 },
-#endif
-#ifdef LOG_LOCAL2
-    { "local2", LOG_LOCAL2 },
-#endif
-#ifdef LOG_LOCAL3
-    { "local3", LOG_LOCAL3 },
-#endif
-#ifdef LOG_LOCAL4
-    { "local4", LOG_LOCAL4 },
-#endif
-#ifdef LOG_LOCAL5
-    { "local5", LOG_LOCAL5 },
-#endif
-#ifdef LOG_LOCAL6
-    { "local6", LOG_LOCAL6 },
-#endif
-#ifdef LOG_LOCAL7
-    { "local7", LOG_LOCAL7 },
-#endif
-    { NULL, 0 }
-};
-
-static const struct syslog_names log_sev[] = {
-#ifdef LOG_EMERG
-    { "emerg", LOG_EMERG },
-#endif
-#ifdef LOG_ALERT
-    { "alert", LOG_ALERT },
-#endif
-#ifdef LOG_CRIT
-    { "crit", LOG_CRIT },
-#endif
-#ifdef LOG_ERR
-    { "err", LOG_ERR },
-#endif
-#ifdef LOG_WARNING
-    { "warning", LOG_WARNING },
-#endif
-#ifdef LOG_NOTICE
-    { "notice", LOG_NOTICE },
-#endif
-#ifdef LOG_INFO
-    { "info", LOG_INFO },
-#endif
-#ifdef LOG_DEBUG
-    { "debug", LOG_DEBUG },
-#endif
-    { NULL, 0 }
-};
-
-/* severity_map - lookup facility or severity value */
-
-static int
-severity_map(const struct syslog_names *table, char *name)
-{
-    const struct syslog_names *t;
-
-    for (t = table; t->name; t++)
-	if (STR_EQ(t->name, name))
-	    return (t->value);
-    tcpd_jump("bad syslog facility or severity: \"%s\"", name);
-    /* NOTREACHED */
-    return -1;
-}
-
-/* severity_option - change logging severity for this event (Dave Mitchell) */
-
-/* ARGSUSED */
-
-static void
-severity_option(char *value, struct request_info *request)
-{
-    char   *level = split_at(value, '.');
-
-    allow_severity = deny_severity = level ?
-	severity_map(log_fac, value) | severity_map(log_sev, level) :
-	severity_map(log_sev, value);
-}
-
-/* get_field - return pointer to next field in string */
-
-static char *
-get_field(char *string)
-{
-    static char nul = '\0';
-    static char *last = &nul;
-    char   *src;
-    char   *dst;
-    char   *ret;
-    int     ch;
-
-    /*
-     * This function returns pointers to successive fields within a given
-     * string. ":" is the field separator; warn if the rule ends in one. It
-     * replaces a "\:" sequence by ":", without treating the result of
-     * substitution as field terminator. A null argument means resume search
-     * where the previous call terminated. This function destroys its
-     * argument.
-     * 
-     * Work from explicit source or from memory. While processing \: we
-     * overwrite the input. This way we do not have to maintain buffers for
-     * copies of input fields.
-     */
-
-    src = dst = ret = (string ? string : last);
-    if (src[0] == 0)
-	return (0);
-
-    while ((ch = *src) != '\0') {
-	if (ch == ':') {
-	    if (*++src == 0)
-		tcpd_warn("rule ends in \":\"");
-	    break;
-	}
-	if (ch == '\\' && src[1] == ':')
-	    src++;
-	*dst++ = *src++;
-    }
-    last = src;
-    *dst = 0;
-    return (ret);
-}
-
-/* chop_string - strip leading and trailing blanks from string */
-
-static char *
-chop_string(register char *string)
-{
-    char   *start = NULL;
-    char   *end = NULL;
-    char   *cp;
-
-    for (cp = string; *cp; cp++) {
-	if (!isspace((unsigned char) *cp)) {
-	    if (start == 0)
-		start = cp;
-	    end = cp;
-	}
-    }
-    return (start ? (end[1] = 0, start) : cp);
-}
diff --git a/lib/libwrap/percent_x.c b/lib/libwrap/percent_x.c
deleted file mode 100644
index e9915c256..000000000
--- a/lib/libwrap/percent_x.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*	$NetBSD: percent_x.c,v 1.5 2012/03/21 10:10:37 matt Exp $	*/
-
- /*
-  * percent_x() takes a string and performs %<char> expansions. It aborts the
-  * program when the expansion would overflow the output buffer. The result
-  * of %<char> expansion may be passed on to a shell process. For this
-  * reason, characters with a special meaning to shells are replaced by
-  * underscores.
-  * 
-  * Diagnostics are reported through syslog(3).
-  * 
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) percent_x.c 1.4 94/12/28 17:42:37";
-#else
-__RCSID("$NetBSD: percent_x.c,v 1.5 2012/03/21 10:10:37 matt Exp $");
-#endif
-#endif
-
-/* System libraries. */
-
-#include <stdio.h>
-#include <syslog.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-/* Local stuff. */
-
-#include "tcpd.h"
-
-/* percent_x - do %<char> expansion, abort if result buffer is too small */
-
-char *
-percent_x(char *result, int result_len, char *string,
-    struct request_info *request)
-{
-    char   *bp = result;
-    char   *end = result + result_len - 1;	/* end of result buffer */
-    char   *expansion;
-    size_t  expansion_len;
-    static const char ok_chars[] = "1234567890!@%-_=+:,./"
-	"abcdefghijklmnopqrstuvwxyz"
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-    char   *str = string;
-    char   *cp;
-    int     ch;
-
-    /*
-     * Warning: we may be called from a child process or after pattern
-     * matching, so we cannot use clean_exit() or tcpd_jump().
-     */
-
-    while (*str) {
-	if (*str == '%' && (ch = str[1]) != 0) {
-	    str += 2;
-	    expansion =
-		ch == 'a' ? eval_hostaddr(request->client) :
-		ch == 'A' ? eval_hostaddr(request->server) :
-		ch == 'c' ? eval_client(request) :
-		ch == 'd' ? eval_daemon(request) :
-		ch == 'h' ? eval_hostinfo(request->client) :
-		ch == 'H' ? eval_hostinfo(request->server) :
-		ch == 'n' ? eval_hostname(request->client) :
-		ch == 'N' ? eval_hostname(request->server) :
-		ch == 'p' ? eval_pid(request) :
-		ch == 's' ? eval_server(request) :
-		ch == 'u' ? eval_user(request) :
-		ch == '%' ? __UNCONST("%")
-		          : (tcpd_warn("unrecognized %%%c", ch), __UNCONST(""));
-	    for (cp = expansion; *(cp += strspn(cp, ok_chars)); /* */ )
-		*cp = '_';
-	    expansion_len = cp - expansion;
-	} else {
-	    expansion = str++;
-	    expansion_len = 1;
-	}
-	if (bp + expansion_len >= end) {
-	    tcpd_warn("percent_x: expansion too long: %.30s...", result);
-	    sleep(5);
-	    exit(0);
-	}
-	memcpy(bp, expansion, expansion_len);
-	bp += expansion_len;
-    }
-    *bp = 0;
-    return (result);
-}
diff --git a/lib/libwrap/refuse.c b/lib/libwrap/refuse.c
deleted file mode 100644
index 1b5408bcf..000000000
--- a/lib/libwrap/refuse.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*	$NetBSD: refuse.c,v 1.5 2012/03/21 10:10:37 matt Exp $	*/
-
- /*
-  * refuse() reports a refused connection, and takes the consequences: in
-  * case of a datagram-oriented service, the unread datagram is taken from
-  * the input queue (or inetd would see the same datagram again and again);
-  * the program is terminated.
-  * 
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) refuse.c 1.5 94/12/28 17:42:39";
-#else
-__RCSID("$NetBSD: refuse.c,v 1.5 2012/03/21 10:10:37 matt Exp $");
-#endif
-#endif
-
-/* System libraries. */
-
-#include <stdio.h>
-#include <syslog.h>
-
-/* Local stuff. */
-
-#include "tcpd.h"
-
-/* refuse - refuse request */
-
-void
-refuse(struct request_info *request)
-{
-    syslog(deny_severity, "refused connect from %s", eval_client(request));
-    clean_exit(request);
-    /* NOTREACHED */
-}
-
diff --git a/lib/libwrap/rfc931.c b/lib/libwrap/rfc931.c
deleted file mode 100644
index 800df7217..000000000
--- a/lib/libwrap/rfc931.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*	$NetBSD: rfc931.c,v 1.10 2012/03/22 22:59:43 joerg Exp $	*/
-
- /*
-  * rfc931() speaks a common subset of the RFC 931, AUTH, TAP, IDENT and RFC
-  * 1413 protocols. It queries an RFC 931 etc. compatible daemon on a remote
-  * host to look up the owner of a connection. The information should not be
-  * used for authentication purposes. This routine intercepts alarm signals.
-  * 
-  * Diagnostics are reported through syslog(3).
-  * 
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) rfc931.c 1.10 95/01/02 16:11:34";
-#else
-__RCSID("$NetBSD: rfc931.c,v 1.10 2012/03/22 22:59:43 joerg Exp $");
-#endif
-#endif
-
-/* System libraries. */
-
-#include <stdio.h>
-#include <syslog.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <string.h>
-
-/* Local stuff. */
-
-#include "tcpd.h"
-
-#define	RFC931_PORT	113		/* Semi-well-known port */
-#define	ANY_PORT	0		/* Any old port will do */
-
-int     rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */
-
-static jmp_buf timebuf;
-
-static FILE *fsocket(int, int, int);
-static void timeout(int) __dead;
-
-/* fsocket - open stdio stream on top of socket */
-
-static FILE *
-fsocket(int domain, int type, int protocol)
-{
-    int     s;
-    FILE   *fp;
-
-    if ((s = socket(domain, type, protocol)) < 0) {
-	tcpd_warn("socket: %m");
-	return (0);
-    } else {
-	if ((fp = fdopen(s, "r+")) == 0) {
-	    tcpd_warn("fdopen: %m");
-	    close(s);
-	}
-	return (fp);
-    }
-}
-
-/* timeout - handle timeouts */
-
-static void
-timeout(int sig)
-{
-    longjmp(timebuf, sig);
-}
-
-/* rfc931 - return remote user name, given socket structures */
-
-void
-rfc931(struct sockaddr *rmt_sin, struct sockaddr *our_sin, char *dest)
-{
-    unsigned rmt_port;
-    unsigned our_port;
-    struct sockaddr_storage rmt_query_sin;
-    struct sockaddr_storage our_query_sin;
-    char    user[256];			/* XXX */
-    char    buffer[512];		/* XXX */
-    char   *cp;
-    char   *result = unknown;
-    FILE   *fp;
-    volatile int salen;
-    u_short * volatile rmt_portp;
-    u_short * volatile our_portp;
-
-    /* address family must be the same */
-    if (rmt_sin->sa_family != our_sin->sa_family) {
-	strlcpy(dest, result, STRING_LENGTH);
-	return;
-    }
-    switch (rmt_sin->sa_family) {
-    case AF_INET:
-	salen = sizeof(struct sockaddr_in);
-	rmt_portp = &(((struct sockaddr_in *)rmt_sin)->sin_port);
-	break;
-#ifdef INET6
-    case AF_INET6:
-	salen = sizeof(struct sockaddr_in6);
-	rmt_portp = &(((struct sockaddr_in6 *)rmt_sin)->sin6_port);
-	break;
-#endif
-    default:
-	strlcpy(dest, result, STRING_LENGTH);
-	return;
-    }
-    switch (our_sin->sa_family) {
-    case AF_INET:
-	our_portp = &(((struct sockaddr_in *)our_sin)->sin_port);
-	break;
-#ifdef INET6
-    case AF_INET6:
-	our_portp = &(((struct sockaddr_in6 *)our_sin)->sin6_port);
-	break;
-#endif
-    default:
-	strlcpy(dest, result, STRING_LENGTH);
-	return;
-    }
-
-#ifdef __GNUC__
-    (void)&result; /* Avoid longjmp clobbering */
-    (void)&fp;	/* XXX gcc */
-#endif
-
-    /*
-     * Use one unbuffered stdio stream for writing to and for reading from
-     * the RFC931 etc. server. This is done because of a bug in the SunOS
-     * 4.1.x stdio library. The bug may live in other stdio implementations,
-     * too. When we use a single, buffered, bidirectional stdio stream ("r+"
-     * or "w+" mode) we read our own output. Such behaviour would make sense
-     * with resources that support random-access operations, but not with
-     * sockets.
-     */
-
-    if ((fp = fsocket(rmt_sin->sa_family, SOCK_STREAM, 0)) != 0) {
-	setbuf(fp, (char *) 0);
-
-	/*
-	 * Set up a timer so we won't get stuck while waiting for the server.
-	 */
-
-	if (setjmp(timebuf) == 0) {
-	    signal(SIGALRM, timeout);
-	    alarm(rfc931_timeout);
-
-	    /*
-	     * Bind the local and remote ends of the query socket to the same
-	     * IP addresses as the connection under investigation. We go
-	     * through all this trouble because the local or remote system
-	     * might have more than one network address. The RFC931 etc.
-	     * client sends only port numbers; the server takes the IP
-	     * addresses from the query socket.
-	     */
-
-	    memcpy(&our_query_sin, our_sin, salen);
-	    switch (our_query_sin.ss_family) {
-	    case AF_INET:
-		((struct sockaddr_in *)&our_query_sin)->sin_port =
-			htons(ANY_PORT);
-		break;
-#ifdef INET6
-	    case AF_INET6:
-		((struct sockaddr_in6 *)&our_query_sin)->sin6_port =
-			htons(ANY_PORT);
-		break;
-#endif
-	    }
-	    memcpy(&rmt_query_sin, rmt_sin, salen);
-	    switch (rmt_query_sin.ss_family) {
-	    case AF_INET:
-		((struct sockaddr_in *)&rmt_query_sin)->sin_port =
-			htons(RFC931_PORT);
-		break;
-#ifdef INET6
-	    case AF_INET6:
-		((struct sockaddr_in6 *)&rmt_query_sin)->sin6_port = 
-			htons(RFC931_PORT);
-		break;
-#endif
-	    }
-
-	    if (bind(fileno(fp), (struct sockaddr *) & our_query_sin,
-		     salen) >= 0 &&
-		connect(fileno(fp), (struct sockaddr *) & rmt_query_sin,
-			salen) >= 0) {
-
-		/*
-		 * Send query to server. Neglect the risk that a 13-byte
-		 * write would have to be fragmented by the local system and
-		 * cause trouble with buggy System V stdio libraries.
-		 */
-
-		fprintf(fp, "%u,%u\r\n",
-			ntohs(*rmt_portp),
-			ntohs(*our_portp));
-		fflush(fp);
-
-		/*
-		 * Read response from server. Use fgets()/sscanf() so we can
-		 * work around System V stdio libraries that incorrectly
-		 * assume EOF when a read from a socket returns less than
-		 * requested.
-		 */
-
-		if (fgets(buffer, sizeof(buffer), fp) != 0
-		    && ferror(fp) == 0 && feof(fp) == 0
-		    && sscanf(buffer, "%u , %u : USERID :%*[^:]:%255s",
-			      &rmt_port, &our_port, user) == 3
-		    && ntohs(*rmt_portp) == rmt_port
-		    && ntohs(*our_portp) == our_port) {
-
-		    /*
-		     * Strip trailing carriage return. It is part of the
-		     * protocol, not part of the data.
-		     */
-
-		    if ((cp = strchr(user, '\r')) != NULL)
-			*cp = '\0';
-		    result = user;
-		}
-	    }
-	    alarm(0);
-	}
-	fclose(fp);
-    }
-    strlcpy(dest, result, STRING_LENGTH);
-}
diff --git a/lib/libwrap/shell_cmd.c b/lib/libwrap/shell_cmd.c
deleted file mode 100644
index 8396e22af..000000000
--- a/lib/libwrap/shell_cmd.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$NetBSD: shell_cmd.c,v 1.7 2012/03/22 22:59:43 joerg Exp $	*/
-
- /*
-  * shell_cmd() takes a shell command after %<character> substitutions. The
-  * command is executed by a /bin/sh child process, with standard input,
-  * standard output and standard error connected to /dev/null.
-  * 
-  * Diagnostics are reported through syslog(3).
-  * 
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) shell_cmd.c 1.5 94/12/28 17:42:44";
-#else
-__RCSID("$NetBSD: shell_cmd.c,v 1.7 2012/03/22 22:59:43 joerg Exp $");
-#endif
-#endif
-
-/* System libraries. */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <syslog.h>
-#include <string.h>
-
-/* Local stuff. */
-
-#include "tcpd.h"
-
-/* Forward declarations. */
-
-static void do_child(char *) __dead;
-
-/* shell_cmd - execute shell command */
-
-void
-shell_cmd(char *command)
-{
-    int     child_pid;
-    int     wait_pid;
-
-    /*
-     * Most of the work is done within the child process, to minimize the
-     * risk of damage to the parent.
-     */
-
-    switch (child_pid = fork()) {
-    case -1:					/* error */
-	tcpd_warn("cannot fork: %m");
-	break;
-    case 00:					/* child */
-	do_child(command);
-	/* NOTREACHED */
-    default:					/* parent */
-	while ((wait_pid = wait((int *) 0)) != -1 && wait_pid != child_pid)
-	     /* void */ ;
-    }
-}
-
-/* do_child - exec command with { stdin, stdout, stderr } to /dev/null */
-
-static void
-do_child(char *command)
-{
-    int     tmp_fd;
-
-    /*
-     * Systems with POSIX sessions may send a SIGHUP to grandchildren if the
-     * child exits first. This is sick, sessions were invented for terminals.
-     */
-
-    signal(SIGHUP, SIG_IGN);
-
-    /* Set up new stdin, stdout, stderr, and exec the shell command. */
-
-    for (tmp_fd = 0; tmp_fd < 3; tmp_fd++)
-	(void) close(tmp_fd);
-    if (open("/dev/null", 2) != 0) {
-	tcpd_warn("open /dev/null: %m");
-    } else if (dup(0) != 1 || dup(0) != 2) {
-	tcpd_warn("dup: %m");
-    } else {
-	(void) execl("/bin/sh", "sh", "-c", command, (char *) 0);
-	tcpd_warn("execl /bin/sh: %m");
-    }
-
-    /* Something went wrong. We MUST terminate the child process. */
-    _exit(0);
-}
diff --git a/lib/libwrap/shlib_version b/lib/libwrap/shlib_version
deleted file mode 100644
index 6c1ff4bec..000000000
--- a/lib/libwrap/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.6 2009/01/11 03:07:50 christos Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=1
-minor=0
diff --git a/lib/libwrap/socket.c b/lib/libwrap/socket.c
deleted file mode 100644
index 3b5129a3e..000000000
--- a/lib/libwrap/socket.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*	$NetBSD: socket.c,v 1.19 2012/03/21 10:10:37 matt Exp $	*/
-
- /*
-  * This module determines the type of socket (datagram, stream), the client
-  * socket address and port, the server socket address and port. In addition,
-  * it provides methods to map a transport address to a printable host name
-  * or address. Socket address information results are in static memory.
-  * 
-  * The result from the hostname lookup method is STRING_PARANOID when a host
-  * pretends to have someone elses name, or when a host name is available but
-  * could not be verified.
-  * 
-  * When lookup or conversion fails the result is set to STRING_UNKNOWN.
-  * 
-  * Diagnostics are reported through syslog(3).
-  * 
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) socket.c 1.15 97/03/21 19:27:24";
-#else
-__RCSID("$NetBSD: socket.c,v 1.19 2012/03/21 10:10:37 matt Exp $");
-#endif
-#endif
-
-/* System libraries. */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
-#include <arpa/inet.h>
-
-/* Local stuff. */
-
-#include "tcpd.h"
-
-/* Forward declarations. */
-
-#ifdef APPEND_DOT
-static const char *append_dot __P((const char *));
-#endif
-static void sock_sink __P((int));
-
-#ifdef APPEND_DOT
- /*
-  * Speed up DNS lookups by terminating the host name with a dot. Should be
-  * done with care. The speedup can give problems with lookups from sources
-  * that lack DNS-style trailing dot magic, such as local files or NIS maps.
-  */
-
-static const char *
-append_dot(name)
-const char *name;
-{
-    static char hbuf[MAXHOSTNAMELEN + 1];
-
-    /*
-     * Don't append dots to unqualified names. Such names are likely to come
-     * from local hosts files or from NIS.
-     */
-
-    if (strchr(name, '.') == 0 || strlen(name) + 2 > sizeof(hbuf))
-	strlcpy(hbuf, name, sizeof(hbuf));
-    else
-	(void)snprintf(hbuf, sizeof(hbuf), "%s.", name);
-    return hbuf;
-}
-#endif
-
-/* sock_host - look up endpoint addresses and install conversion methods */
-
-void
-sock_host(struct request_info *request)
-{
-    static struct sockaddr_storage client;
-    static struct sockaddr_storage server;
-    socklen_t     len;
-    char    buf[BUFSIZ];
-    int     fd = request->fd;
-
-    sock_methods(request);
-
-    /*
-     * Look up the client host address. Hal R. Brand <BRAND@addvax.llnl.gov>
-     * suggested how to get the client host info in case of UDP connections:
-     * peek at the first message without actually looking at its contents. We
-     * really should verify that client.sin_family gets the value AF_INET,
-     * but this program has already caused too much grief on systems with
-     * broken library code.
-     *
-     * XXX the last sentence is untrue as we support AF_INET6 as well :-)
-     */
-
-    if (request->client->sin == NULL) {
-        len = sizeof(client);
-        if (getpeername(fd, (struct sockaddr *)(void *)& client, &len) < 0) {
-	    request->sink = sock_sink;
-	    len = sizeof(client);
-	    if (recvfrom(fd, buf, sizeof(buf), MSG_PEEK,
-		         (struct sockaddr *) & client, &len) < 0) {
-	        tcpd_warn("can't get client address: %m");
-	        return;				/* give up */
-	    }
-#ifdef really_paranoid
-	    memset(buf, 0, sizeof(buf));
-#endif
-        }
-        request->client->sin = (struct sockaddr *)&client;
-    }
-
-    /*
-     * Determine the server binding. This is used for client username
-     * lookups, and for access control rules that trigger on the server
-     * address or name.
-     */
-
-    if (request->server->sin == NULL) {
-        len = sizeof(server);
-        if (getsockname(fd, (struct sockaddr *) & server, &len) < 0) {
-	    tcpd_warn("getsockname: %m");
-	    return;
-        }
-        request->server->sin = (struct sockaddr *)&server;
-    }
-}
-
-/* sock_hostaddr - map endpoint address to printable form */
-
-void
-sock_hostaddr(struct host_info *host)
-{
-    struct sockaddr *sa = host->sin;
-
-    if (!sa)
-	return;
-    host->addr[0] = '\0';
-    getnameinfo(sa, sa->sa_len, host->addr, sizeof(host->addr),
-	NULL, 0, NI_NUMERICHOST);
-}
-
-/* sock_hostname - map endpoint address to host name */
-
-void
-sock_hostname(struct host_info *host)
-{
-    struct sockaddr *sa = host->sin;
-    char h1[NI_MAXHOST], h2[NI_MAXHOST];
-    struct addrinfo hints, *res, *res0;
-#ifdef INET6
-    struct sockaddr_in tmp;
-#endif
-
-    if (!sa)
-	return;
-#ifdef INET6
-    /* special case on reverse lookup: mapped addr.  I hate it */
-    if (sa->sa_family == AF_INET6 &&
-        IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)sa)->sin6_addr)) {
-	memset(&tmp, 0, sizeof(tmp));
-	tmp.sin_family = AF_INET;
-	tmp.sin_len = sizeof(struct sockaddr_in);
-	memcpy(&tmp.sin_addr,
-	    &((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr[12], 4);
-	sa = (struct sockaddr *)&tmp;
-    }
-#endif
-    if (getnameinfo(sa, sa->sa_len, h1, sizeof(h1), NULL, 0,
-        NI_NUMERICHOST) != 0) {
-	return;
-    }
-    if (getnameinfo(sa, sa->sa_len, host->name, sizeof(host->name), NULL, 0,
-        NI_NAMEREQD) == 0) {
-	/*
-	 * if reverse lookup result looks like a numeric hostname,
-	 * someone is trying to trick us by PTR record like following:
-	 *	1.1.1.10.in-addr.arpa.  IN PTR  2.3.4.5
-	 */
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-	hints.ai_flags = AI_NUMERICHOST;
-#ifdef APPEND_DOT
-	if (getaddrinfo(append_dot(host->name), "0", &hints, &res0) == 0)
-#else
-	if (getaddrinfo(host->name, "0", &hints, &res0) == 0)
-#endif
-	{
-	    tcpd_warn("Nasty PTR record is configured");
-	    freeaddrinfo(res0);
-	    /* name is bad, clobber it */
-	    (void)strlcpy(host->name, paranoid, sizeof(host->name));
-	    return;
-	}
-	 
-	/*
-	 * Verify that the address is a member of the address list returned
-	 * by getaddrinfo(hostname).
-	 * 
-	 * Verify also that getnameinfo() and getaddrinfo() return the same
-	 * hostname, or rshd and rlogind may still end up being spoofed.
-	 * 
-	 * On some sites, getaddrinfo("localhost") returns "localhost.domain".
-	 * This is a DNS artefact. We treat it as a special case. When we
-	 * can't believe the address list from getaddrinfo("localhost")
-	 * we're in big trouble anyway.
-	 */
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = sa->sa_family;
-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-	hints.ai_flags = AI_CANONNAME;
-#ifdef APPEND_DOT
-	if (getaddrinfo(append_dot(host->name), "0", &hints, &res0) != 0)
-#else
-	if (getaddrinfo(host->name, "0", &hints, &res0) != 0)
-#endif
-	{
-	    /*
-	     * Unable to verify that the host name matches the address. This
-	     * may be a transient problem or a botched name server setup.
-	     */
-
-	    tcpd_warn("can't verify hostname: getaddrinfo(%s, %d) failed",
-	        host->name, hints.ai_family);
-	} else if (res0->ai_canonname &&
-	    STR_NE(host->name, res0->ai_canonname) &&
-	    STR_NE(host->name, "localhost")) {
-	    /*
-	     * The getnameinfo() and getaddrinfo() calls did not return
-	     * the same hostname. This could be a nameserver configuration
-	     * problem. It could also be that someone is trying to spoof us.
-	     */
-
-	    tcpd_warn("host name/name mismatch: %s != %s",
-		host->name, res0->ai_canonname);
-	    freeaddrinfo(res0);
-	} else {
-	    /*
-	     * The address should be a member of the address list returned by
-	     * getaddrinfo().
-	     */
-
-	    for (res = res0; res; res = res->ai_next) {
-		if (getnameinfo(res->ai_addr, res->ai_addrlen, h2, sizeof(h2),
-		    NULL, 0, NI_NUMERICHOST) != 0) {
-		    continue;
-		}
-		if (STR_EQ(h1, h2)) {
-		    freeaddrinfo(res0);
-		    return;
-		}
-	    }
-
-	    /*
-	     * The host name does not map to the initial address. Perhaps
-	     * someone has messed up. Perhaps someone compromised a name
-	     * server.
-	     */
-
-	    tcpd_warn("host name/address mismatch: %s != %s", h1,
-		res0->ai_canonname ? res0->ai_canonname : "?");
-
-	    freeaddrinfo(res0);
-	}
-	/* name is bad, clobber it */
-	(void)strlcpy(host->name, paranoid, sizeof(host->name));
-    }
-}
-
-/* sock_sink - absorb unreceived IP datagram */
-
-static void
-sock_sink(int fd)
-{
-    char    buf[BUFSIZ];
-    struct sockaddr_storage ss;
-    socklen_t size = sizeof(ss);
-
-    /*
-     * Eat up the not-yet received datagram. Some systems insist on a
-     * non-zero source address argument in the recvfrom() call below.
-     */
-
-    (void) recvfrom(fd, buf, sizeof(buf), 0, (struct sockaddr *) & ss, &size);
-}
diff --git a/lib/libwrap/tcpd.h b/lib/libwrap/tcpd.h
deleted file mode 100644
index 58a44a0d2..000000000
--- a/lib/libwrap/tcpd.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*	$NetBSD: tcpd.h,v 1.14 2012/03/22 22:59:43 joerg Exp $	*/
- /*
-  * @(#) tcpd.h 1.5 96/03/19 16:22:24
-  * 
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include <sys/cdefs.h>
-#include <stdio.h>
-
-/* Structure to describe one communications endpoint. */
-
-#define STRING_LENGTH	128		/* hosts, users, processes */
-
-struct host_info {
-    char    name[STRING_LENGTH];	/* access via eval_hostname(host) */
-    char    addr[STRING_LENGTH];	/* access via eval_hostaddr(host) */
-    struct sockaddr *sin;		/* socket address or 0 */
-    struct t_unitdata *unit;		/* TLI transport address or 0 */
-    struct request_info *request;	/* for shared information */
-};
-
-/* Structure to describe what we know about a service request. */
-
-struct request_info {
-    int     fd;				/* socket handle */
-    char    user[STRING_LENGTH];	/* access via eval_user(request) */
-    char    daemon[STRING_LENGTH];	/* access via eval_daemon(request) */
-    char    pid[10];			/* access via eval_pid(request) */
-    struct host_info client[1];		/* client endpoint info */
-    struct host_info server[1];		/* server endpoint info */
-    void (*sink)(int);			/* datagram sink function or 0 */
-    void (*hostname)(struct host_info *); /* address to printable hostname */
-    void (*hostaddr)(struct host_info *); /* address to printable address */
-    void (*cleanup)(void);		/* cleanup function or 0 */
-    struct netconfig *config;		/* netdir handle */
-};
-
-/* Common string operations. Less clutter should be more readable. */
-
-#define STRN_CPY(d,s,l)	{ strncpy((d),(s),(l)); (d)[(l)-1] = 0; }
-
-#define STRN_EQ(x,y,l)	(strncasecmp((x),(y),(l)) == 0)
-#define STRN_NE(x,y,l)	(strncasecmp((x),(y),(l)) != 0)
-#define STR_EQ(x,y)	(strcasecmp((x),(y)) == 0)
-#define STR_NE(x,y)	(strcasecmp((x),(y)) != 0)
-
- /*
-  * Initially, all above strings have the empty value. Information that
-  * cannot be determined at runtime is set to "unknown", so that we can
-  * distinguish between `unavailable' and `not yet looked up'. A hostname
-  * that we do not believe in is set to "paranoid".
-  */
-
-#define STRING_UNKNOWN	"unknown"	/* lookup failed */
-#define STRING_PARANOID	"paranoid"	/* hostname conflict */
-
-__BEGIN_DECLS
-extern char unknown[];
-extern char paranoid[];
-__END_DECLS
-
-#define HOSTNAME_KNOWN(s) (STR_NE((s),unknown) && STR_NE((s),paranoid))
-
-#define NOT_INADDR(s) (s[strspn(s,"01234567890./")] != 0)
-
-/* Global functions. */
-
-__BEGIN_DECLS
-#define fromhost sock_host		/* no TLI support needed */
-
-extern int hosts_access			/* access control */
-		(struct request_info *);
-extern int hosts_ctl			/* limited interface to hosts_access */
-		(char *, char *, char *, char *);
-extern void shell_cmd			/* execute shell command */
-		(char *);
-extern char *percent_x			/* do %<char> expansion */
-		(char *, int, char *, struct request_info *);
-extern void rfc931			/* client name from RFC 931 daemon */
-		(struct sockaddr *, struct sockaddr *, char *);
-__dead extern void clean_exit		/* clean up and exit */
-		(struct request_info *);
-__dead extern void refuse		/* clean up and exit */
-		(struct request_info *);
-extern char *xgets			/* fgets() on steroids */
-		(char *, int, FILE *);
-extern char *split_at			/* strchr() and split */
-		(char *, int);
-extern int dot_quad_addr	/* restricted inet_aton() */
-		(char *, unsigned long *);
-
-/* Global variables. */
-
-extern int allow_severity;		/* for connection logging */
-extern int deny_severity;		/* for connection logging */
-extern const char *hosts_allow_table;	/* for verification mode redirection */
-extern const char *hosts_deny_table;	/* for verification mode redirection */
-extern int hosts_access_verbose;	/* for verbose matching mode */
-extern int rfc931_timeout;		/* user lookup timeout */
-extern int resident;			/* > 0 if resident process */
-
- /*
-  * Routines for controlled initialization and update of request structure
-  * attributes. Each attribute has its own key.
-  */
-
-extern struct request_info *request_init	/* initialize request */
-		(struct request_info *,...);
-extern struct request_info *request_set		/* update request structure */
-		(struct request_info *,...);
-
-#define RQ_FILE		1		/* file descriptor */
-#define RQ_DAEMON	2		/* server process (argv[0]) */
-#define RQ_USER		3		/* client user name */
-#define RQ_CLIENT_NAME	4		/* client host name */
-#define RQ_CLIENT_ADDR	5		/* client host address */
-#define RQ_CLIENT_SIN	6		/* client endpoint (internal) */
-#define RQ_SERVER_NAME	7		/* server host name */
-#define RQ_SERVER_ADDR	8		/* server host address */
-#define RQ_SERVER_SIN	9		/* server endpoint (internal) */
-
- /*
-  * Routines for delayed evaluation of request attributes. Each attribute
-  * type has its own access method. The trivial ones are implemented by
-  * macros. The other ones are wrappers around the transport-specific host
-  * name, address, and client user lookup methods. The request_info and
-  * host_info structures serve as caches for the lookup results.
-  */
-
-extern char *eval_user			/* client user */
-		(struct request_info *);
-extern char *eval_hostname		/* printable hostname */
-		(struct host_info *);
-extern char *eval_hostaddr		/* printable host address */
-		(struct host_info *);
-extern char *eval_hostinfo		/* host name or address */
-		(struct host_info *);
-extern char *eval_client		/* whatever is available */
-		(struct request_info *);
-extern char *eval_server		/* whatever is available */
-		(struct request_info *);
-#define eval_daemon(r)	((r)->daemon)	/* daemon process name */
-#define eval_pid(r)	((r)->pid)	/* process id */
-
-/* Socket-specific methods, including DNS hostname lookups. */
-
-extern void sock_host			/* look up endpoint addresses */
-		(struct request_info *);
-extern void sock_hostname		/* translate address to hostname */
-		(struct host_info *);
-extern void sock_hostaddr		/* address to printable address */
-		(struct host_info *);
-#define sock_methods(r) \
-	{ (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
-
-/* The System V Transport-Level Interface (TLI) interface. */
-
-#if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
-extern void tli_host			/* look up endpoint addresses etc. */
-		(struct request_info *);
-#endif
-
- /*
-  * Problem reporting interface. Additional file/line context is reported
-  * when available. The jump buffer (tcpd_buf) is not declared here, or
-  * everyone would have to include <setjmp.h>.
-  */
-
-/* Report problem and proceed */
-void tcpd_warn(const char *, ...) __printflike(1, 2);
-
-/* Report problem and jump */
-void tcpd_jump(const char *, ...) __dead __printflike(1, 2);
-__END_DECLS
-
-struct tcpd_context {
-    const char *file;			/* current file */
-    int     line;			/* current line */
-};
-__BEGIN_DECLS
-extern struct tcpd_context tcpd_context;
-__END_DECLS
-
- /*
-  * While processing access control rules, error conditions are handled by
-  * jumping back into the hosts_access() routine. This is cleaner than
-  * checking the return value of each and every silly little function. The
-  * (-1) returns are here because zero is already taken by longjmp().
-  */
-
-#define AC_PERMIT	1		/* permit access */
-#define AC_DENY		(-1)		/* deny_access */
-#define AC_ERROR	AC_DENY		/* XXX */
-
- /*
-  * In verification mode an option function should just say what it would do,
-  * instead of really doing it. An option function that would not return
-  * should clear the dry_run flag to inform the caller of this unusual
-  * behavior.
-  */
-
-__BEGIN_DECLS
-extern void process_options		/* execute options */
-		(char *, struct request_info *);
-extern int dry_run;			/* verification flag */
-extern void fix_options			/* get rid of IP-level socket options */
-		(struct request_info *);
-__END_DECLS
diff --git a/lib/libwrap/update.c b/lib/libwrap/update.c
deleted file mode 100644
index 42d59fe42..000000000
--- a/lib/libwrap/update.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*	$NetBSD: update.c,v 1.9 2012/03/21 10:10:37 matt Exp $	*/
-
- /*
-  * Routines for controlled update/initialization of request structures.
-  * 
-  * request_init() initializes its argument. Pointers and string-valued members
-  * are initialized to zero, to indicate that no lookup has been attempted.
-  * 
-  * request_set() adds information to an already initialized request structure.
-  * 
-  * Both functions take a variable-length name-value list.
-  * 
-  * Diagnostics are reported through syslog(3).
-  * 
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) update.c 1.1 94/12/28 17:42:56";
-#else
-__RCSID("$NetBSD: update.c,v 1.9 2012/03/21 10:10:37 matt Exp $");
-#endif
-#endif
-
-/* System libraries */
-
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
-#include <unistd.h>
-
-/* Local stuff. */
-
-#include "mystdarg.h"
-#include "tcpd.h"
-
-static struct request_info *request_fill(struct request_info *, va_list);
-
-/* request_fill - request update engine */
-
-static struct request_info *
-request_fill(struct request_info *request, va_list ap)
-{
-    int     key;
-    char   *ptr;
-
-    while ((key = va_arg(ap, int)) > 0) {
-	switch (key) {
-	default:
-	    tcpd_warn("request_fill: invalid key: %d", key);
-	    return (request);
-	case RQ_FILE:
-	    request->fd = va_arg(ap, int);
-	    continue;
-	case RQ_CLIENT_SIN:
-	    request->client->sin = va_arg(ap, struct sockaddr *);
-	    continue;
-	case RQ_SERVER_SIN:
-	    request->server->sin = va_arg(ap, struct sockaddr *);
-	    continue;
-
-	    /*
-	     * All other fields are strings with the same maximal length.
-	     */
-
-	case RQ_DAEMON:
-	    ptr = request->daemon;
-	    break;
-	case RQ_USER:
-	    ptr = request->user;
-	    break;
-	case RQ_CLIENT_NAME:
-	    ptr = request->client->name;
-	    break;
-	case RQ_CLIENT_ADDR:
-	    ptr = request->client->addr;
-	    break;
-	case RQ_SERVER_NAME:
-	    ptr = request->server->name;
-	    break;
-	case RQ_SERVER_ADDR:
-	    ptr = request->server->addr;
-	    break;
-	}
-	strlcpy(ptr, va_arg(ap, char *), STRING_LENGTH);
-    }
-    return (request);
-}
-
-/* request_init - initialize request structure */
-
-struct request_info *VARARGS(request_init, struct request_info *, request)
-{
-    static struct request_info default_info;
-    struct request_info *r;
-    va_list ap;
-
-    /*
-     * Initialize data members. We do not assign default function pointer
-     * members, to avoid pulling in the whole socket module when it is not
-     * really needed.
-     */
-    VASTART(ap, struct request_info *, request);
-    *request = default_info;
-    request->fd = -1;
-    (void)strlcpy(request->daemon, unknown, sizeof(request->daemon));
-    (void)snprintf(request->pid, sizeof(request->pid), "%d", getpid());
-    request->client->request = request;
-    request->server->request = request;
-    r = request_fill(request, ap);
-    VAEND(ap);
-    return (r);
-}
-
-/* request_set - update request structure */
-
-struct request_info *VARARGS(request_set, struct request_info *, request)
-{
-    struct request_info *r;
-    va_list ap;
-
-    VASTART(ap, struct request_info *, request);
-    r = request_fill(request, ap);
-    VAEND(ap);
-    return (r);
-}
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
deleted file mode 100644
index 55edd9974..000000000
--- a/lib/libz/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#	$NetBSD: Makefile,v 1.22 2014/01/30 06:49:16 wiz Exp $
-
-WARNS=	3
-
-USE_FORT?= yes	# data-driven bugs?
-
-.include <bsd.own.mk>
-
-USE_SHLIBDIR=	yes
-
-ZLIBDIR=${NETBSDSRCDIR}/common/dist/zlib
-.PATH: ${ZLIBDIR}
-LIB=		z
-
-SRCS=	adler32.c compress.c crc32.c deflate.c gzio.c infback.c inffast.c \
-	inflate.c inftrees.c trees.c uncompr.c zutil.c 
-MAN=	zlib.3
-
-CPPFLAGS+=	-I${ZLIBDIR}
-CLEANFILES+=	minigzip
-
-INCS=		zconf.h zlib.h
-INCSDIR=	/usr/include
-
-FILES+=			zlib.pc
-FILESOWN_zlib.pc=	${BINOWN}
-FILESGRP_zlib.pc=	${BINGRP}
-FILESMODE_zlib.pc=	${NONBINMODE}
-FILESDIR_zlib.pc=	/usr/lib/pkgconfig
-
-.include <bsd.lib.mk>
-
-test: minigzip
-	echo hello world | ./minigzip | ./minigzip -d
-
-# Note: CFLAGS ommitted by intention!
-# This is to verify that zlib.h works standalone.
-minigzip: minigzip.c libz.a
-	${CC} -o minigzip ${.CURDIR}/minigzip.c libz.a
diff --git a/lib/libz/shlib_version b/lib/libz/shlib_version
deleted file mode 100644
index 765ae384b..000000000
--- a/lib/libz/shlib_version
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.10 2006/01/14 20:12:36 christos Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=1
-minor=0
diff --git a/lib/libz/zlib.3 b/lib/libz/zlib.3
deleted file mode 100644
index fccdf56d7..000000000
--- a/lib/libz/zlib.3
+++ /dev/null
@@ -1,1644 +0,0 @@
-.\"	$NetBSD: zlib.3,v 1.10 2014/03/18 18:20:38 riastradh Exp $
-.\"	$OpenBSD: zlib.3,v 1.1 2003/09/25 09:12:09 jmc Exp $
-.\"
-.\"  Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
-.\"
-.\"  This software is provided 'as-is', without any express or implied
-.\"  warranty.  In no event will the authors be held liable for any damages
-.\"  arising from the use of this software.
-.\"
-.\"  Permission is granted to anyone to use this software for any purpose,
-.\"  including commercial applications, and to alter it and redistribute it
-.\"  freely, subject to the following restrictions:
-.\"
-.\"  The origin of this software must not be misrepresented; you must not
-.\"  claim that you wrote the original software. If you use this software
-.\"  in a product, an acknowledgment in the product documentation would be
-.\"  appreciated but is not required.
-.\"  Altered source versions must be plainly marked as such, and must not be
-.\"  misrepresented as being the original software.
-.\"  This notice may not be removed or altered from any source distribution.
-.\"
-.\" Converted to mdoc format for the OpenBSD project
-.\" by Jason McIntyre <jmc@openbsd.org>
-.\"
-.Dd May 1, 2004
-.Dt ZLIB 3
-.Os
-.Sh NAME
-.Nm zlib
-.Nd general purpose compression library
-.Sh SYNOPSIS
-.In zlib.h
-.Ss Basic functions
-.Ft const char *
-.Fn zlibVersion "void"
-.Ft int
-.Fn deflateInit "z_streamp strm" "int level"
-.Ft int
-.Fn deflate "z_streamp strm" "int flush"
-.Ft int
-.Fn deflateEnd "z_streamp strm"
-.Ft int
-.Fn inflateInit "z_streamp strm"
-.Ft int
-.Fn inflate "z_streamp strm" "int flush"
-.Ft int
-.Fn inflateEnd "z_streamp strm"
-.Ss Advanced functions
-.Ft int
-.Fn deflateInit2 "z_streamp strm" "int level" "int method" \
-"int windowBits" "int memLevel" "int strategy"
-.Ft int
-.Fn deflateSetDictionary "z_streamp strm" "const Bytef *dictionary" \
-"uInt dictLength"
-.Ft int
-.Fn deflateCopy "z_streamp dest" "z_streamp source"
-.Ft int
-.Fn deflateReset "z_streamp strm"
-.Ft int
-.Fn deflateParams "z_streamp strm" "int level" "int strategy"
-.Ft int
-.Fn inflateInit2 "z_streamp strm" "int windowBits"
-.Ft int
-.Fn inflateSetDictionary "z_streamp strm" "const Bytef *dictionary" "uInt dictLength"
-.Ft int
-.Fn inflateSync "z_streamp strm"
-.Ft int
-.Fn inflateReset "z_streamp strm"
-.Ss Utility functions
-.Fd typedef voidp gzFile ;
-.Pp
-.Ft int
-.Fn compress "Bytef *dest" "uLongf *destLen" "const Bytef *source" "uLong sourceLen"
-.Ft int
-.Fn compress2 "Bytef *dest" "uLongf *destLen" "const Bytef *source" "uLong sourceLen" "int level"
-.Ft int
-.Fn uncompress "Bytef *dest" "uLongf *destLen" "const Bytef *source" "uLong sourceLen"
-.Ft gzFile
-.Fn gzopen "const char *path" "const char *mode"
-.Ft gzFile
-.Fn gzdopen "int fd" "const char *mode"
-.Ft int
-.Fn gzsetparams "gzFile file" "int level" "int strategy"
-.Ft int
-.Fn gzread "gzFile file" "voidp buf" "unsigned len"
-.Ft int
-.Fn gzwrite "gzFile file" "const voidp buf" "unsigned len"
-.Ft int
-.Fn gzprintf "gzFile file" "const char *format" "..."
-.Ft int
-.Fn gzputs "gzFile file" "const char *s"
-.Ft char *
-.Fn gzgets "gzFile file" "char *buf" "int len"
-.Ft int
-.Fn gzputc "gzFile file" "int c"
-.Ft int
-.Fn gzgetc "gzFile file"
-.Ft int
-.Fn gzflush "gzFile file" "int flush"
-.Ft z_off_t
-.Fn gzseek "gzFile file" "z_off_t offset" "int whence"
-.Ft int
-.Fn gzrewind "gzFile file"
-.Ft z_off_t
-.Fn gztell "gzFile file"
-.Ft int
-.Fn gzeof "gzFile file"
-.Ft int
-.Fn gzclose "gzFile file"
-.Ft const char *
-.Fn gzerror "gzFile file" "int *errnum"
-.Ss Checksum functions
-.Ft uLong
-.Fn adler32 "uLong adler" "const Bytef *buf" "uInt len"
-.Ft uLong
-.Fn crc32 "uLong crc" "const Bytef *buf" "uInt len"
-.Sh DESCRIPTION
-This manual page describes the
-.Nm
-general purpose compression library, version 1.1.4.
-.Pp
-The
-.Nm
-compression library provides in-memory compression and decompression functions,
-including integrity checks of the uncompressed data.
-This version of the library supports only one compression method
-.Pq deflation
-but other algorithms will be added later and will have the same
-stream interface.
-.Pp
-Compression can be done in a single step if the buffers are large enough
-.Pq for example if an input file is mmap'ed ,
-or can be done by repeated calls of the compression function.
-In the latter case, the application must provide more input
-and/or consume the output
-.Pq providing more output space
-before each call.
-.Pp
-The library also supports reading and writing files in
-.Xr gzip 1
-.Pq .gz
-format with an interface similar to that of
-.Xr stdio 3 .
-.Pp
-The library does not install any signal handler.
-The decoder checks the consistency of the compressed data,
-so the library should never crash even in case of corrupted input.
-.Pp
-The functions within the library are divided into the following sections:
-.Pp
-.Bl -dash -offset indent -compact
-.It
-Basic functions
-.It
-Advanced functions
-.It
-Utility functions
-.It
-Checksum functions
-.El
-.Sh BASIC FUNCTIONS
-.Bl -tag -width Ds
-.It Fa const char * Fn zlibVersion "void" ;
-.Pp
-The application can compare
-.Fn zlibVersion
-and
-.Dv ZLIB_VERSION
-for consistency.
-If the first character differs, the library code actually used is
-not compatible with the
-.In zlib.h
-header file used by the application.
-This check is automatically made by
-.Fn deflateInit
-and
-.Fn inflateInit .
-.It Fa int Fn deflateInit "z_streamp strm" "int level" ;
-.Pp
-The
-.Fn deflateInit
-function initializes the internal stream state for compression.
-The fields
-.Fa zalloc ,
-.Fa zfree ,
-and
-.Fa opaque
-must be initialized before by the caller.
-If
-.Fa zalloc
-and
-.Fa zfree
-are set to
-.Dv Z_NULL ,
-.Fn deflateInit
-updates them to use default allocation functions.
-.Pp
-The compression level must be
-.Dv Z_DEFAULT_COMPRESSION ,
-or between 0 and 9:
-1 gives best speed, 9 gives best compression, 0 gives no compression at all
-(the input data is simply copied a block at a time).
-.Pp
-.Dv Z_DEFAULT_COMPRESSION
-requests a default compromise between speed and compression
-.Pq currently equivalent to level 6 .
-.Pp
-.Fn deflateInit
-returns
-.Dv Z_OK
-if successful,
-.Dv Z_MEM_ERROR
-if there was not enough memory,
-.Dv Z_STREAM_ERROR
-if level is not a valid compression level,
-.Dv Z_VERSION_ERROR
-if the
-.Nm
-library version
-.Pq zlib_version
-is incompatible with the version assumed by the caller
-.Pq ZLIB_VERSION .
-.Fa msg
-is set to null if there is no error message.
-.Fn deflateInit
-does not perform any compression: this will be done by
-.Fn deflate .
-.It Fa int Fn deflate "z_streamp strm" "int flush" ;
-.Pp
-.Fn deflate
-compresses as much data as possible, and stops when the input
-buffer becomes empty or the output buffer becomes full.
-It may introduce some output latency
-.Pq reading input without producing any output
-except when forced to flush.
-.Pp
-The detailed semantics are as follows.
-.Fn deflate
-performs one or both of the following actions:
-.Pp
-Compress more input starting at
-.Fa next_in
-and update
-.Fa next_in
-and
-.Fa avail_in
-accordingly.
-If not all input can be processed
-(because there is not enough room in the output buffer),
-.Fa next_in
-and
-.Fa avail_in
-are updated and processing will resume at this point for the next call to
-.Fn deflate .
-.Pp
-Provide more output starting at
-.Fa next_out
-and update
-.Fa next_out
-and
-.Fa avail_out
-accordingly.
-This action is forced if the parameter
-.Fa flush
-is non-zero.
-Forcing
-.Fa flush
-frequently degrades the compression ratio,
-so this parameter should be set only when necessary
-.Pq in interactive applications .
-Some output may be provided even if
-.Fa flush
-is not set.
-.Pp
-Before the call to
-.Fn deflate ,
-the application should ensure that at least
-one of the actions is possible, by providing more input and/or consuming
-more output, and updating
-.Fa avail_in
-or
-.Fa avail_out
-accordingly;
-.Fa avail_out
-should never be zero before the call.
-The application can consume the compressed output when it wants,
-for example when the output buffer is full
-.Pq avail_out == 0 ,
-or after each call to
-.Fn deflate .
-If
-.Fn deflate
-returns
-.Dv Z_OK
-and with zero
-.Fa avail_out ,
-it must be called again after making room in the
-output buffer because there might be more output pending.
-.Pp
-If the parameter
-.Fa flush
-is set to
-.Dv Z_SYNC_FLUSH ,
-all pending output is flushed to the output buffer and the output
-is aligned on a byte boundary, so that the decompressor can get all
-input data available so far.
-(In particular,
-.Fa avail_in
-is zero after the call if enough output space
-has been provided before the call.)
-Flushing may degrade compression for some compression algorithms
-and so it should be used only when necessary.
-.Pp
-If
-.Fa flush
-is set to
-.Dv Z_FULL_FLUSH ,
-all output is flushed as with
-.Dv Z_SYNC_FLUSH ,
-and the compression state is reset so that decompression can restart from this
-point if previous compressed data has been damaged or if random access
-is desired.
-Using
-.Dv Z_FULL_FLUSH
-too often can seriously degrade the compression.
-.Pp
-If
-.Fn deflate
-returns with avail_out == 0, this function must be called again
-with the same value of the flush parameter and more output space
-(updated
-.Fa avail_out ) ,
-until the flush is complete
-.Pf ( Fn deflate
-returns with non-zero
-.Fa avail_out ) .
-.Pp
-If the parameter
-.Fa flush
-is set to
-.Dv Z_FINISH ,
-pending input is processed, pending output is flushed and
-.Fn deflate
-returns with
-.Dv Z_STREAM_END
-if there was enough output space; if
-.Fn deflate
-returns with
-.Dv Z_OK ,
-this function must be called again with
-.Dv Z_FINISH
-and more output space
-(updated
-.Fa avail_out
-but no more input data, until it returns with
-.Dv Z_STREAM_END
-or an error.
-After
-.Fn deflate
-has returned
-.Dv Z_STREAM_END ,
-the only possible operations on the stream are
-.Fn deflateReset
-or
-.Fn deflateEnd .
-.Pp
-.Dv Z_FINISH
-can be used immediately after
-.Fn deflateInit
-if all the compression is to be done in a single step.
-In this case,
-.Fa avail_out
-must be at least 0.1% larger than
-.Fa avail_in
-plus 12 bytes.
-If
-.Fn deflate
-does not return
-.Dv Z_STREAM_END ,
-then it must be called again as described above.
-.Pp
-.Fn deflate
-sets strm-\*[Gt]adler to the Adler-32 checksum of all input read so far
-(that is,
-.Fa total_in
-bytes).
-.Pp
-.Fn deflate
-may update
-.Fa data_type
-if it can make a good guess about the input data type
-.Pq Z_ASCII or Z_BINARY .
-If in doubt, the data is considered binary.
-This field is only for information purposes and does not affect
-the compression algorithm in any manner.
-.Pp
-.Fn deflate
-returns
-.Dv Z_OK
-if some progress has been made
-.Pq more input processed or more output produced ,
-.Dv Z_STREAM_END
-if all input has been consumed and all output has been produced
-(only when
-.Fa flush
-is set to
-.Dv Z_FINISH ) ,
-.Dv Z_STREAM_ERROR
-if the stream state was inconsistent
-(for example, if
-.Fa next_in
-or
-.Fa next_out
-was
-.Dv NULL ) ,
-.Dv Z_BUF_ERROR
-if no progress is possible
-(for example,
-.Fa avail_in
-or
-.Fa avail_out
-was zero).
-.It Fa int Fn deflateEnd "z_streamp strm" ;
-.Pp
-All dynamically allocated data structures for this stream are freed.
-This function discards any unprocessed input and does not flush any
-pending output.
-.Pp
-.Fn deflateEnd
-returns
-.Dv Z_OK
-if successful,
-.Dv Z_STREAM_ERROR
-if the stream state was inconsistent,
-.Dv Z_DATA_ERROR
-if the stream was freed prematurely
-.Pq some input or output was discarded .
-In the error case,
-.Fa msg
-may be set but then points to a static string
-.Pq which must not be deallocated .
-.It Fa int Fn inflateInit "z_streamp strm" ;
-The
-.Fn inflateInit
-function initializes the internal stream state for decompression.
-The fields
-.Fa next_in ,
-.Fa avail_in ,
-.Fa zalloc ,
-.Fa zfree ,
-and
-.Fa opaque
-must be initialized before by the caller.
-If
-.Fa next_in
-is not
-.Dv Z_NULL
-and
-.Fa avail_in
-is large enough
-.Pq the exact value depends on the compression method ,
-.Fn inflateInit
-determines the compression method from the
-.Nm
-header and allocates all data structures accordingly;
-otherwise the allocation will be deferred to the first call to
-.Fn inflate .
-If
-.Fa zalloc
-and
-.Fa zfree
-are set to
-.Dv Z_NULL ,
-.Fn inflateInit
-updates them to use default allocation functions.
-.Pp
-.Fn inflateInit
-returns
-.Dv Z_OK
-if successful,
-.Dv Z_MEM_ERROR
-if there was not enough memory,
-.Dv Z_VERSION_ERROR
-if the
-.Nm
-library version is incompatible with the version assumed by the caller.
-.Fa msg
-is set to null if there is no error message.
-.Fn inflateInit
-does not perform any decompression apart from reading the
-.Nm
-header if present: this will be done by
-.Fn inflate .
-(So
-.Fa next_in
-and
-.Fa avail_in
-may be modified,
-but
-.Fa next_out
-and
-.Fa avail_out
-are unchanged.)
-.It Fa int Fn inflate "z_streamp strm" "int flush" ;
-.Fn inflate
-decompresses as much data as possible, and stops when the input
-buffer becomes empty or the output buffer becomes full.
-It may introduce some output latency
-.Pq reading input without producing any output
-except when forced to flush.
-.Pp
-The detailed semantics are as follows.
-.Fn inflate
-performs one or both of the following actions:
-.Pp
-Decompress more input starting at
-.Fa next_in
-and update
-.Fa next_in
-and
-.Fa avail_in
-accordingly.
-If not all input can be processed
-(because there is not enough room in the output buffer),
-.Fa next_in
-is updated and processing will resume at this point for the next call to
-.Fn inflate .
-.Pp
-Provide more output starting at
-.Fa next_out
-and update
-.Fa next_out
-and
-.Fa avail_out
-accordingly.
-.Fn inflate
-provides as much output as possible,
-until there is no more input data or no more space in the output buffer
-.Pq see below about the flush parameter .
-.Pp
-Before the call to
-.Fn inflate ,
-the application should ensure that at least one of the actions is possible,
-by providing more input and/or consuming more output,
-and updating the next_* and avail_* values accordingly.
-The application can consume the uncompressed output when it wants,
-for example when the output buffer is full (avail_out == 0),
-or after each call to
-.Fn inflate .
-If
-.Fn inflate
-returns
-.Dv Z_OK
-and with zero
-.Fa avail_out ,
-it must be called again after making room
-in the output buffer because there might be more output pending.
-.Pp
-If the parameter
-.Fa flush
-is set to
-.Dv Z_SYNC_FLUSH ,
-.Fn inflate
-flushes as much output as possible to the output buffer.
-The flushing behavior of
-.Fn inflate
-is not specified for values of the flush parameter other than
-.Dv Z_SYNC_FLUSH
-and
-.Dv Z_FINISH ,
-but the current implementation actually flushes as much output
-as possible anyway.
-.Pp
-.Fn inflate
-should normally be called until it returns
-.Dv Z_STREAM_END
-or an error.
-However if all decompression is to be performed in a single step
-.Pq a single call to inflate ,
-the parameter
-.Fa flush
-should be set to
-.Dv Z_FINISH .
-In this case all pending input is processed and all pending output is flushed;
-.Fa avail_out
-must be large enough to hold all the uncompressed data.
-(The size of the uncompressed data may have been saved
-by the compressor for this purpose.)
-The next operation on this stream must be
-.Fn inflateEnd
-to deallocate the decompression state.
-The use of
-.Dv Z_FINISH
-is never required, but can be used to inform
-.Fn inflate
-that a faster routine may be used for the single
-.Fn inflate
-call.
-.Pp
-If a preset dictionary is needed at this point (see
-.Fn inflateSetDictionary
-below),
-.Fn inflate
-sets strm-\*[Gt]adler to the Adler-32 checksum of the dictionary
-chosen by the compressor and returns
-.Dv Z_NEED_DICT ;
-otherwise it sets strm-\*[Gt]adler to the Adler-32 checksum of all output produced
-so far
-(that is,
-.Fa total_out
-bytes)
-and returns
-.Dv Z_OK ,
-.Dv Z_STREAM_END ,
-or an error code as described below.
-At the end of the stream,
-.Fn inflate
-checks that its computed Adler-32 checksum is equal to that saved by the
-compressor and returns
-.Dv Z_STREAM_END
-only if the checksum is correct.
-.Pp
-.Fn inflate
-returns
-.Dv Z_OK
-if some progress has been made
-.Pq more input processed or more output produced ,
-.Dv Z_STREAM_END
-if the end of the compressed data has been reached and all uncompressed output
-has been produced,
-.Dv Z_NEED_DICT
-if a preset dictionary is needed at this point,
-.Dv Z_DATA_ERROR
-if the input data was corrupted (input stream not conforming to the
-.Nm
-format or incorrect Adler-32 checksum),
-.Dv Z_STREAM_ERROR
-if the stream structure was inconsistent
-(for example, if
-.Fa next_in
-or
-.Fa next_out
-was
-.Dv NULL ) ,
-.Dv Z_MEM_ERROR
-if there was not enough memory,
-.Dv Z_BUF_ERROR
-if no progress is possible or if there was not enough room in the output buffer
-when
-.Dv Z_FINISH
-is used.
-In the
-.Dv Z_DATA_ERROR
-case, the application may then call
-.Fn inflateSync
-to look for a good compression block.
-.It Fa int Fn inflateEnd "z_streamp strm" ;
-All dynamically allocated data structures for this stream are freed.
-This function discards any unprocessed input and does not flush any
-pending output.
-.Pp
-.Fn inflateEnd
-returns
-.Dv Z_OK
-if successful, or
-.Dv Z_STREAM_ERROR
-if the stream state was inconsistent.
-In the error case,
-.Fa msg
-may be set but then points to a static string
-.Pq which must not be deallocated .
-.El
-.Sh ADVANCED FUNCTIONS
-The following functions are needed only in some special applications.
-.Bl -tag -width Ds
-.It Fa int Fn deflateInit2 "z_streamp strm" "int level" "int method" \
-"int windowBits" "int memLevel" "int strategy" ;
-.Pp
-This is another version of
-.Fn deflateInit
-with more compression options.
-The fields
-.Fa next_in ,
-.Fa zalloc ,
-.Fa zfree ,
-and
-.Fa opaque
-must be initialized before by the caller.
-.Pp
-The
-.Fa method
-parameter is the compression method.
-It must be
-.Dv Z_DEFLATED
-in this version of the library.
-.Pp
-The
-.Fa windowBits
-parameter is the base two logarithm of the window size
-.Pq the size of the history buffer .
-It should be in the range 8..15 for this version of the library.
-Larger values of this parameter result in better compression
-at the expense of memory usage.
-The default value is 15 if
-.Fn deflateInit
-is used instead.
-.Pp
-The
-.Fa memLevel
-parameter specifies how much memory should be allocated
-for the internal compression state.
-memLevel=1 uses minimum memory but is slow and reduces compression ratio;
-memLevel=9 uses maximum memory for optimal speed.
-The default value is 8.
-See
-.In zconf.h
-for total memory usage as a function of
-.Fa windowBits
-and
-.Fa memLevel .
-.Pp
-The
-.Fa strategy
-parameter is used to tune the compression algorithm.
-Use the value
-.Dv Z_DEFAULT_STRATEGY
-for normal data;
-.Dv Z_FILTERED
-for data produced by a filter
-.Pq or predictor ;
-or
-.Dv Z_HUFFMAN_ONLY
-to force Huffman encoding only
-.Pq no string match .
-Filtered data consists mostly of small values with a
-somewhat random distribution.
-In this case, the compression algorithm is tuned to compress them better.
-The effect of
-.Dv Z_FILTERED
-is to force more Huffman coding and less string matching;
-it is somewhat intermediate between
-.Dv Z_DEFAULT
-and
-.Dv Z_HUFFMAN_ONLY .
-The
-.Fa strategy
-parameter only affects the compression ratio but not the correctness of the
-compressed output, even if it is not set appropriately.
-.Pp
-.Fn deflateInit2
-returns
-.Dv Z_OK
-if successful,
-.Dv Z_MEM_ERROR
-if there was not enough memory,
-.Dv Z_STREAM_ERROR
-if a parameter is invalid
-.Pq such as an invalid method .
-.Fa msg
-is set to null if there is no error message.
-.Fn deflateInit2
-does not perform any compression: this will be done by
-.Fn deflate .
-.It Fa int Fn deflateSetDictionary "z_streamp strm" \
-"const Bytef *dictionary" "uInt dictLength" ;
-.Pp
-Initializes the compression dictionary from the given byte sequence
-without producing any compressed output.
-This function must be called immediately after
-.Fn deflateInit ,
-.Fn deflateInit2 ,
-or
-.Fn deflateReset ,
-before any call to
-.Fn deflate .
-The compressor and decompressor must use exactly the same dictionary
-(see
-.Fn inflateSetDictionary ) .
-.Pp
-The dictionary should consist of strings
-.Pq byte sequences
-that are likely to be encountered later in the data to be compressed,
-with the most commonly used strings preferably put towards
-the end of the dictionary.
-Using a dictionary is most useful when the data to be compressed is short
-and can be predicted with good accuracy;
-the data can then be compressed better than with the default empty dictionary.
-.Pp
-Depending on the size of the compression data structures selected by
-.Fn deflateInit
-or
-.Fn deflateInit2 ,
-a part of the dictionary may in effect be discarded,
-for example if the dictionary is larger than the window size in
-.Fn deflate
-or
-.Fn deflate2 .
-Thus the strings most likely to be useful should be
-put at the end of the dictionary, not at the front.
-.Pp
-Upon return of this function, strm-\*[Gt]adler is set to the Adler-32 value
-of the dictionary; the decompressor may later use this value to determine
-which dictionary has been used by the compressor.
-(The Adler-32 value applies to the whole dictionary even if only a subset
-of the dictionary is actually used by the compressor.)
-.Pp
-.Fn deflateSetDictionary
-returns
-.Dv Z_OK
-if successful,
-or
-.Dv Z_STREAM_ERROR
-if a parameter is invalid
-.Pq such as NULL dictionary
-or the stream state is inconsistent
-(for example if
-.Fn deflate
-has already been called for this stream or if the compression method is bsort).
-.Fn deflateSetDictionary
-does not perform any compression: this will be done by
-.Fn deflate .
-.It Fa int Fn deflateCopy "z_streamp dest" "z_streamp source" ;
-.Pp
-The
-.Fn deflateCopy
-function sets the destination stream as a complete copy of the source stream.
-.Pp
-This function can be useful when several compression strategies will be
-tried, for example when there are several ways of pre-processing the input
-data with a filter.
-The streams that will be discarded should then be freed by calling
-.Fn deflateEnd .
-Note that
-.Fn deflateCopy
-duplicates the internal compression state which can be quite large,
-so this strategy is slow and can consume lots of memory.
-.Pp
-.Fn deflateCopy
-returns
-.Dv Z_OK
-if successful,
-.Dv Z_MEM_ERROR
-if there was not enough memory,
-.Dv Z_STREAM_ERROR
-if the source stream state was inconsistent
-(such as
-.Fa zalloc
-being NULL).
-.Fa msg
-is left unchanged in both source and destination.
-.It Fa int Fn deflateReset "z_streamp strm" ;
-.Pp
-This function is equivalent to
-.Fn deflateEnd
-followed by
-.Fn deflateInit ,
-but does not free and reallocate all the internal compression state.
-The stream will keep the same compression level and any other attributes
-that may have been set by
-.Fn deflateInit2 .
-.Pp
-.Fn deflateReset
-returns
-.Dv Z_OK
-if successful, or
-.Dv Z_STREAM_ERROR
-if the source stream state was inconsistent
-(such as
-.Fa zalloc
-or
-.Fa state
-being NULL).
-.It Fa int Fn deflateParams "z_streamp strm" "int level" "int strategy" ;
-.Pp
-The
-.Fn deflateParams
-function dynamically updates the compression level and compression strategy.
-The interpretation of level and strategy is as in
-.Fn deflateInit2 .
-This can be used to switch between compression and straight copy
-of the input data, or to switch to a different kind of input data
-requiring a different strategy.
-If the compression level is changed, the input available so far
-is compressed with the old level
-.Pq and may be flushed ;
-the new level will take effect only at the next call to
-.Fn deflate .
-.Pp
-Before the call to
-.Fn deflateParams ,
-the stream state must be set as for a call to
-.Fn deflate ,
-since the currently available input may have to be compressed and flushed.
-In particular, strm-\*[Gt]avail_out must be non-zero.
-.Pp
-.Fn deflateParams
-returns
-.Dv Z_OK
-if successful,
-.Dv Z_STREAM_ERROR
-if the source stream state was inconsistent or if a parameter was invalid, or
-.Dv Z_BUF_ERROR
-if strm-\*[Gt]avail_out was zero.
-.It Fa int Fn inflateInit2 "z_streamp strm" "int windowBits" ;
-.Pp
-This is another version of
-.Fn inflateInit
-with an extra parameter.
-The fields
-.Fa next_in ,
-.Fa avail_in ,
-.Fa zalloc ,
-.Fa zfree ,
-and
-.Fa opaque
-must be initialized before by the caller.
-.Pp
-The
-.Fa windowBits
-parameter is the base two logarithm of the maximum window size
-.Pq the size of the history buffer .
-It should be in the range 8..15 for this version of the library.
-The default value is 15 if
-.Fn inflateInit
-is used instead.
-If a compressed stream with a larger window size is given as input,
-.Fn inflate
-will return with the error code
-.Dv Z_DATA_ERROR
-instead of trying to allocate a larger window.
-.Pp
-.Fn inflateInit2
-returns
-.Dv Z_OK
-if successful,
-.Dv Z_MEM_ERROR
-if there was not enough memory,
-.Dv Z_STREAM_ERROR
-if a parameter is invalid
-(such as a negative
-.Fa memLevel ) .
-.Fa msg
-is set to null if there is no error message.
-.Fn inflateInit2
-does not perform any decompression apart from reading the
-.Nm
-header if present: this will be done by
-.Fn inflate .
-(So
-.Fa next_in
-and
-.Fa avail_in
-may be modified, but
-.Fa next_out
-and
-.Fa avail_out
-are unchanged.)
-.It Fa int Fn inflateSetDictionary "z_streamp strm" \
-"const Bytef *dictionary" "uInt dictLength" ;
-.Pp
-Initializes the decompression dictionary from the given uncompressed byte
-sequence.
-This function must be called immediately after a call to
-.Fn inflate
-if this call returned
-.Dv Z_NEED_DICT .
-The dictionary chosen by the compressor can be determined from the
-Adler-32 value returned by this call to
-.Fn inflate .
-The compressor and decompressor must use exactly the same dictionary
-(see
-.Fn deflateSetDictionary ) .
-.Pp
-.Fn inflateSetDictionary
-returns
-.Dv Z_OK
-if successful,
-.Dv Z_STREAM_ERROR
-if a parameter is invalid
-.Pq such as NULL dictionary
-or the stream state is inconsistent,
-.Dv Z_DATA_ERROR
-if the given dictionary doesn't match the expected one
-.Pq incorrect Adler-32 value .
-.Fn inflateSetDictionary
-does not perform any decompression: this will be done by subsequent calls of
-.Fn inflate .
-.It Fa int Fn inflateSync "z_streamp strm" ;
-.Pp
-Skips invalid compressed data until a full flush point
-(see above the description of
-.Fn deflate
-with
-.Dv Z_FULL_FLUSH )
-can be found, or until all available input is skipped.
-No output is provided.
-.Pp
-.Fn inflateSync
-returns
-.Dv Z_OK
-if a full flush point has been found,
-.Dv Z_BUF_ERROR
-if no more input was provided,
-.Dv Z_DATA_ERROR
-if no flush point has been found, or
-.Dv Z_STREAM_ERROR
-if the stream structure was inconsistent.
-In the success case, the application may save the current value of
-.Fa total_in
-which indicates where valid compressed data was found.
-In the error case, the application may repeatedly call
-.Fn inflateSync ,
-providing more input each time, until success or end of the input data.
-.It Fa int Fn inflateReset "z_streamp strm" ;
-.Pp
-This function is equivalent to
-.Fn inflateEnd
-followed by
-.Fn inflateInit ,
-but does not free and reallocate all the internal decompression state.
-The stream will keep attributes that may have been set by
-.Fn inflateInit2 .
-.Pp
-.Fn inflateReset
-returns
-.Dv Z_OK
-if successful, or
-.Dv Z_STREAM_ERROR
-if the source stream state was inconsistent
-(such as
-.Fa zalloc
-or
-.Fa state
-being NULL).
-.El
-.Sh UTILITY FUNCTIONS
-The following utility functions are implemented on top of the
-basic stream-oriented functions.
-To simplify the interface,
-some default options are assumed (compression level and memory usage,
-standard memory allocation functions).
-The source code of these utility functions can easily be modified
-if you need special options.
-.Bl -tag -width Ds
-.It Fa int Fn compress "Bytef *dest" "uLongf *destLen" \
-"const Bytef *source" "uLong sourceLen" ;
-.Pp
-The
-.Fn compress
-function compresses the source buffer into the destination buffer.
-.Fa sourceLen
-is the byte length of the source buffer.
-Upon entry,
-.Fa destLen
-is the total size of the destination buffer,
-which must be at least 0.1% larger than
-.Fa sourceLen
-plus 12 bytes.
-Upon exit,
-.Fa destLen
-is the actual size of the compressed buffer.
-This function can be used to compress a whole file at once if the
-input file is mmap'ed.
-.Pp
-.Fn compress
-returns
-.Dv Z_OK
-if successful,
-.Dv Z_MEM_ERROR
-if there was not enough memory, or
-.Dv Z_BUF_ERROR
-if there was not enough room in the output buffer.
-.It Fa int Fn compress2 "Bytef *dest" "uLongf *destLen" \
-"const Bytef *source" "uLong sourceLen" "int level" ;
-.Pp
-The
-.Fn compress2
-function compresses the source buffer into the destination buffer.
-The
-.Fa level
-parameter has the same meaning as in
-.Fn deflateInit .
-.Fa sourceLen
-is the byte length of the source buffer.
-Upon entry,
-.Fa destLen
-is the total size of the destination buffer,
-which must be at least 0.1% larger than
-.Fa sourceLen
-plus 12 bytes.
-Upon exit,
-.Fa destLen
-is the actual size of the compressed buffer.
-.Pp
-.Fn compress2
-returns
-.Dv Z_OK
-if successful,
-.Dv Z_MEM_ERROR
-if there was not enough memory,
-.Dv Z_BUF_ERROR
-if there was not enough room in the output buffer, or
-.Dv Z_STREAM_ERROR
-if the level parameter is invalid.
-.It Fa int Fn uncompress "Bytef *dest" "uLongf *destLen" \
-"const Bytef *source" "uLong sourceLen" ;
-.Pp
-The
-.Fn uncompress
-function decompresses the source buffer into the destination buffer.
-.Fa sourceLen
-is the byte length of the source buffer.
-Upon entry,
-.Fa destLen
-is the total size of the destination buffer,
-which must be large enough to hold the entire uncompressed data.
-(The size of the uncompressed data must have been saved previously
-by the compressor and transmitted to the decompressor
-by some mechanism outside the scope of this compression library.)
-Upon exit,
-.Fa destLen
-is the actual size of the compressed buffer.
-This function can be used to decompress a whole file at once if the
-input file is mmap'ed.
-.Pp
-.Fn uncompress
-returns
-.Dv Z_OK
-if successful,
-.Dv Z_MEM_ERROR
-if there was not enough memory,
-.Dv Z_BUF_ERROR
-if there was not enough room in the output buffer, or
-.Dv Z_DATA_ERROR
-if the input data was corrupted.
-.It Fa gzFile Fn gzopen "const char *path" "const char *mode" ;
-.Pp
-The
-.Fn gzopen
-function opens a gzip
-.Pq .gz
-file for reading or writing.
-The mode parameter is as in
-.Xr fopen 3
-.Po
-.Qq rb
-or
-.Qq wb
-.Pc
-but can also include a compression level
-.Pq Qq wb9
-or a strategy:
-.Sq f
-for filtered data, as in
-.Qq wb6f ;
-.Sq h
-for Huffman only compression, as in
-.Qq wb1h .
-(See the description of
-.Fn deflateInit2
-for more information about the strategy parameter.)
-.Pp
-.Fn gzopen
-can be used to read a file which is not in gzip format;
-in this case
-.Fn gzread
-will directly read from the file without decompression.
-.Pp
-.Fn gzopen
-returns
-.Dv NULL
-if the file could not be opened or if there was
-insufficient memory to allocate the (de)compression state;
-errno can be checked to distinguish the two cases (if errno is zero, the
-.Nm
-error is
-.Dv Z_MEM_ERROR ) .
-.It Fa gzFile Fn gzdopen "int fd" "const char *mode" ;
-.Pp
-The
-.Fn gzdopen
-function associates a gzFile with the file descriptor
-.Fa fd .
-File descriptors are obtained from calls like
-.Xr open 2 ,
-.Xr dup 2 ,
-.Xr creat 3 ,
-.Xr pipe 2 ,
-or
-.Xr fileno 3
-(if the file has been previously opened with
-.Xr fopen 3 ) .
-The
-.Fa mode
-parameter is as in
-.Fn gzopen .
-.Pp
-The next call to
-.Fn gzclose
-on the returned gzFile will also close the file descriptor fd,
-just like fclose(fdopen(fd), mode) closes the file descriptor fd.
-If you want to keep fd open, use gzdopen(dup(fd), mode).
-.Pp
-.Fn gzdopen
-returns
-.Dv NULL
-if there was insufficient memory to allocate the (de)compression state.
-.It Fa int Fn gzsetparams "gzFile file" "int level" "int strategy" ;
-.Pp
-The
-.Fn gzsetparams
-function dynamically updates the compression level or strategy.
-See the description of
-.Fn deflateInit2
-for the meaning of these parameters.
-.Pp
-.Fn gzsetparams
-returns
-.Dv Z_OK
-if successful, or
-.Dv Z_STREAM_ERROR
-if the file was not opened for writing.
-.It Fa int Fn gzread "gzFile file" "voidp buf" "unsigned len" ;
-.Pp
-The
-.Fn gzread
-function reads the given number of uncompressed bytes from the compressed file.
-If the input file was not in gzip format,
-.Fn gzread
-copies the given number of bytes into the buffer.
-.Pp
-.Fn gzread
-returns the number of uncompressed bytes actually read
-(0 for end of file, \-1 for error).
-.It Fa int Fn gzwrite "gzFile file" "const voidp buf" "unsigned len" ;
-.Pp
-The
-.Fn gzwrite
-function writes the given number of uncompressed bytes into the compressed file.
-.Fn gzwrite
-returns the number of uncompressed bytes actually written
-.Pq 0 in case of error .
-.It Fa int Fn gzprintf "gzFile file" "const char *format" "..." ;
-.Pp
-The
-.Fn gzprintf
-function converts, formats, and writes the args to the compressed file
-under control of the format string, as in
-.Xr fprintf 3 .
-.Fn gzprintf
-returns the number of uncompressed bytes actually written
-.Pq 0 in case of error .
-.It Fa int Fn gzputs "gzFile file" "const char *s" ;
-.Pp
-The
-.Fn gzputs
-function writes the given null-terminated string to the compressed file,
-excluding the terminating null character.
-.Pp
-.Fn gzputs
-returns the number of characters written, or \-1 in case of error.
-.It Fa char * Fn gzgets "gzFile file" "char *buf" "int len" ;
-.Pp
-The
-.Fn gzgets
-function reads bytes from the compressed file until len\-1 characters are read,
-or a newline character is read and transferred to
-.Fa buf ,
-or an end-of-file condition is encountered.
-The string is then terminated with a null character.
-.Pp
-.Fn gzgets
-returns
-.Fa buf ,
-or
-.Dv Z_NULL
-in case of error.
-.It Fa int Fn gzputc "gzFile file" "int c" ;
-.Pp
-The
-.Fn gzputc
-function writes
-.Fa c ,
-converted to an unsigned char, into the compressed file.
-.Fn gzputc
-returns the value that was written, or \-1 in case of error.
-.It Fa int Fn gzgetc "gzFile file" ;
-.Pp
-The
-.Fn gzgetc
-function reads one byte from the compressed file.
-.Fn gzgetc
-returns this byte or \-1 in case of end of file or error.
-.It Fa int Fn gzflush "gzFile file" "int flush" ;
-.Pp
-The
-.Fn gzflush
-function flushes all pending output into the compressed file.
-The parameter
-.Fa flush
-is as in the
-.Fn deflate
-function.
-The return value is the
-.Nm
-error number (see function
-.Fn gzerror
-below).
-.Fn gzflush
-returns
-.Dv Z_OK
-if the flush parameter is
-.Dv Z_FINISH
-and all output could be flushed.
-.Pp
-.Fn gzflush
-should be called only when strictly necessary because it can
-degrade compression.
-.It Fa z_off_t Fn gzseek "gzFile file" "z_off_t offset" "int whence" ;
-.Pp
-Sets the starting position for the next
-.Fn gzread
-or
-.Fn gzwrite
-on the given compressed file.
-The offset represents a number of bytes in the uncompressed data stream.
-The whence parameter is defined as in
-.Xr lseek 2 ;
-the value
-.Dv SEEK_END
-is not supported.
-.Pp
-If the file is opened for reading, this function is emulated but can be
-extremely slow.
-If the file is opened for writing, only forward seeks are supported;
-.Fn gzseek
-then compresses a sequence of zeroes up to the new starting position.
-.Pp
-.Fn gzseek
-returns the resulting offset location as measured in bytes from
-the beginning of the uncompressed stream, or \-1 in case of error,
-in particular if the file is opened for writing and the new starting position
-would be before the current position.
-.It Fa int Fn gzrewind "gzFile file" ;
-.Pp
-The
-.Fn gzrewind
-function rewinds the given
-.Fa file .
-This function is supported only for reading.
-.Pp
-gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET).
-.It Fa z_off_t Fn gztell "gzFile file" ;
-.Pp
-The
-.Fn gztell
-function returns the starting position for the next
-.Fn gzread
-or
-.Fn gzwrite
-on the given compressed file.
-This position represents a number of bytes in the uncompressed data stream.
-.Pp
-gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR).
-.It Fa int Fn gzeof "gzFile file" ;
-.Pp
-The
-.Fn gzeof
-function returns 1 when
-.Dv EOF
-has previously been detected reading the given input stream, otherwise zero.
-.It Fa int Fn gzclose "gzFile file" ;
-.Pp
-The
-.Fn gzclose
-function flushes all pending output if necessary, closes the compressed file
-and deallocates all the (de)compression state.
-The return value is the
-.Nm
-error number (see function
-.Fn gzerror
-below).
-.It Fa const char * Fn gzerror "gzFile file" "int *errnum" ;
-.Pp
-The
-.Fn gzerror
-function returns the error message for the last error which occurred on the
-given compressed
-.Fa file .
-.Fa errnum
-is set to the
-.Nm
-error number.
-If an error occurred in the file system and not in the compression library,
-.Fa errnum
-is set to
-.Dv Z_ERRNO
-and the application may consult errno to get the exact error code.
-.El
-.Sh CHECKSUM FUNCTIONS
-These functions are not related to compression but are exported
-anyway because they might be useful in applications using the
-compression library.
-.Bl -tag -width Ds
-.It Fa uLong Fn adler32 "uLong adler" "const Bytef *buf" "uInt len" ;
-The
-.Fn adler32
-function updates a running Adler-32 checksum with the bytes buf[0..len-1]
-and returns the updated checksum.
-If
-.Fa buf
-is
-.Dv NULL ,
-this function returns the required initial value for the checksum.
-.Pp
-An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-much faster.
-Usage example:
-.Bd -literal -offset indent
-uLong adler = adler32(0L, Z_NULL, 0);
-
-while (read_buffer(buffer, length) != EOF) {
-adler = adler32(adler, buffer, length);
-}
-if (adler != original_adler) error();
-.Ed
-.It Fa uLong Fn crc32 "uLong crc" "const Bytef *buf" "uInt len" ;
-The
-.Fn crc32
-function updates a running CRC with the bytes buf[0..len-1]
-and returns the updated CRC.
-If
-.Fa buf
-is
-.Dv NULL ,
-this function returns the required initial value for the CRC.
-Pre- and post-conditioning
-.Pq one's complement
-is performed within this function so it shouldn't be done by the application.
-Usage example:
-.Bd -literal -offset indent
-uLong crc = crc32(0L, Z_NULL, 0);
-
-while (read_buffer(buffer, length) != EOF) {
-crc = crc32(crc, buffer, length);
-}
-if (crc != original_crc) error();
-.Ed
-.El
-.Sh STRUCTURES
-.Bd -literal
-struct internal_state;
-
-typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
-
-    char     *msg;      /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree*/
-
-    int     data_type;  /*best guess about the data type: ascii or binary*/
-    uLong   adler;      /* Adler-32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR * z_streamp;
-.Ed
-.Pp
-The application must update
-.Fa next_in
-and
-.Fa avail_in
-when
-.Fa avail_in
-has dropped to zero.
-It must update
-.Fa next_out
-and
-.Fa avail_out
-when
-.Fa avail_out
-has dropped to zero.
-The application must initialize
-.Fa zalloc ,
-.Fa zfree ,
-and
-.Fa opaque
-before calling the init function.
-All other fields are set by the compression library
-and must not be updated by the application.
-.Pp
-The
-.Fa opaque
-value provided by the application will be passed as the first
-parameter for calls to
-.Fn zalloc
-and
-.Fn zfree .
-This can be useful for custom memory management.
-The compression library attaches no meaning to the
-.Fa opaque
-value.
-.Pp
-.Fa zalloc
-must return
-.Dv Z_NULL
-if there is not enough memory for the object.
-If
-.Nm
-is used in a multi-threaded application,
-.Fa zalloc
-and
-.Fa zfree
-must be thread safe.
-.Pp
-On 16-bit systems, the functions
-.Fa zalloc
-and
-.Fa zfree
-must be able to allocate exactly 65536 bytes,
-but will not be required to allocate more than this if the symbol MAXSEG_64K
-is defined (see
-.In zconf.h ) .
-.Pp
-WARNING: On MSDOS, pointers returned by
-.Fa zalloc
-for objects of exactly 65536 bytes *must* have their offset normalized to zero.
-The default allocation function provided by this library ensures this (see
-.Pa zutil.c ) .
-To reduce memory requirements and avoid any allocation of 64K objects,
-at the expense of compression ratio,
-compile the library with -DMAX_WBITS=14 (see
-.In zconf.h ) .
-.Pp
-The fields
-.Fa total_in
-and
-.Fa total_out
-can be used for statistics or progress reports.
-After compression,
-.Fa total_in
-holds the total size of the uncompressed data and may be saved for use
-in the decompressor
-(particularly if the decompressor wants to decompress everything
-in a single step).
-.Sh CONSTANTS
-.Bd -literal
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-/* Allowed flush values; see deflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions.
- * Negative values are errors,
- * positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_ASCII    1
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field */
-
-#define Z_DEFLATED   8
-/* The deflate compression method
- * (the only one supported in this version)
-*/
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions \*[Lt] 1.0.2 */
-.Ed
-.Sh VARIOUS HACKS
-deflateInit and inflateInit are macros to allow checking the
-.Nm
-version and the compiler's view of
-.Fa z_stream .
-.Bl -tag -width Ds
-.It Fa int Fn deflateInit_ "z_stream strm" "int level" \
-"const char *version" "int stream_size" ;
-.It Fa int Fn inflateInit_ "z_stream strm" "const char *version" \
-"int stream_size" ;
-.It Fa int Fn deflateInit2_ "z_stream strm" "int level" "int method" \
-"int windowBits" "int memLevel" "int strategy" "const char *version" \
-"int stream_size" ;
-.It Fa int Fn inflateInit2_ "z_stream strm" "int windowBits" \
-"const char *version" "int stream_size" ;
-.It Fa const char * Fn zError "int err" ;
-.It Fa int Fn inflateSyncPoint "z_streamp z" ;
-.It Fa const uLongf * Fn "get_crc_table" "void" ;
-.El
-.Sh SEE ALSO
-.Bl -tag -width 12n -compact
-.It RFC 1950
-ZLIB Compressed Data Format Specification.
-.It RFC 1951
-DEFLATE Compressed Data Format Specification.
-.It RFC 1952
-GZIP File Format Specification.
-.El
-.Pp
-.Lk http://www.gzip.org/zlib/ "zlib"
-.Sh HISTORY
-This manual page is based on an HTML version of
-.In zlib.h
-converted by
-.An piaip Aq Mt piaip@csie.ntu.edu.tw
-and was converted to mdoc format by the
-.Ox
-project.
-.Sh AUTHORS
-.An Jean-loup Gailly Aq Mt jloup@gzip.org
-.An Mark Adler Aq Mt madler@alumni.caltech.edu
diff --git a/lib/libz/zlib.pc b/lib/libz/zlib.pc
deleted file mode 100644
index 47b08b1ea..000000000
--- a/lib/libz/zlib.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-sharedlibdir=${libdir}
-includedir=${prefix}/include
-
-Name: zlib
-Description: zlib compression library
-Version: 1.2.3
-
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lz
-Cflags: -I${includedir}
diff --git a/lib/lua/Makefile b/lib/lua/Makefile
deleted file mode 100644
index 381b80896..000000000
--- a/lib/lua/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$NetBSD: Makefile,v 1.6 2013/11/13 09:49:08 mbalmer Exp $
-
-.include <bsd.own.mk>
-
-.if ${MKPIC} != "no"
-# No support for shared libraries and pic code.
-SUBDIR+=	gpio sqlite syslog
-.endif
-
-.include <bsd.subdir.mk>
diff --git a/lib/lua/Makefile.inc b/lib/lua/Makefile.inc
deleted file mode 100644
index 3dfe878d4..000000000
--- a/lib/lua/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2011/10/11 07:10:15 plunky Exp $
-
-WARNS?=	4
diff --git a/lib/lua/gpio/Makefile b/lib/lua/gpio/Makefile
deleted file mode 100644
index fae134ca5..000000000
--- a/lib/lua/gpio/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile,v 1.3 2011/10/11 07:10:15 plunky Exp $
-
-LUA_MODULES=	gpio
-LUA_SRCS.gpio=	gpio.c
-
-.include <bsd.lua.mk>
diff --git a/lib/lua/gpio/gpio.c b/lib/lua/gpio/gpio.c
deleted file mode 100644
index 1538e2621..000000000
--- a/lib/lua/gpio/gpio.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/*	$NetBSD: gpio.c,v 1.9 2014/07/19 18:38:34 lneto Exp $ */
-
-/*
- * Copyright (c) 2011 Marc Balmer <marc@msys.ch>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-/* GPIO interface for Lua */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
-
-#include <sys/gpio.h>
-#include <sys/ioctl.h>
-
-#define GPIO_METATABLE "GPIO object methods"
-
-static __printflike(2, 3) void
-gpio_error(lua_State *L, const char *fmt, ...)
-{
-	va_list ap;
-	int len;
-	char *msg;
-
-	va_start(ap, fmt);
-	len = vasprintf(&msg, fmt, ap);
-	va_end(ap);
-
-	if (len != -1) {
-		lua_pushstring(L, msg);
-		free(msg);
-	} else
-		lua_pushstring(L, "vasprintf failed");
-	lua_error(L);
-}
-
-static int
-gpio_open(lua_State *L)
-{
-	int *fd;
-
-	fd = lua_newuserdata(L, sizeof(int));
-	*fd = open(luaL_checkstring(L, -2), O_RDWR);
-	if (*fd == -1) {
-		gpio_error(L, "%s", strerror(errno));
-		/* NOTREACHED */
-		return 0;
-	}
-	luaL_getmetatable(L, GPIO_METATABLE);
-	lua_setmetatable(L, -2);
-	return 1;
-}
-
-static int
-gpio_close(lua_State *L)
-{
-	int *fd;
-
-	fd = luaL_checkudata(L, 1, GPIO_METATABLE);
-	if (*fd != -1) {
-		close(*fd);
-		*fd = -1;
-	}
-	return 0;
-}
-
-static int
-gpio_info(lua_State *L)
-{
-	struct gpio_info info;
-	int *fd;
-
-	fd = luaL_checkudata(L, 1, GPIO_METATABLE);
-	if (ioctl(*fd, GPIOINFO, &info) == -1)
-		gpio_error(L, "GPIOINFO");
-	lua_pushinteger(L, info.gpio_npins);
-	return 1;
-}
-
-static void
-gpio_get_pin(lua_State *L, int n, struct gpio_req *req)
-{
-	switch (lua_type(L, n)) {
-	case LUA_TNUMBER:
-		req->gp_pin = (int)lua_tointeger(L, n);	/* not 1 based! */
-		break;
-	case LUA_TSTRING:
-		strlcpy(req->gp_name, lua_tostring(L, n), sizeof(req->gp_name));
-		break;
-	default:
-		luaL_argerror(L, n, "expected string or integer");
-		/* NOTREACHED */
-	}
-}
-
-static int
-gpio_set(lua_State *L)
-{
-	struct gpio_set set;
-	int *fd;
-
-	fd = luaL_checkudata(L, 1, GPIO_METATABLE);
-	memset(&set, 0, sizeof(set));
-	gpio_get_pin(L, 2, (void *)&set);
-	set.gp_flags = (int)luaL_checkinteger(L, 3);
-	if (ioctl(*fd, GPIOSET, &set) == -1)
-		gpio_error(L, "GPIOSET");
-	return 0;
-}
-
-static int
-gpio_unset(lua_State *L)
-{
-	struct gpio_set set;
-	int *fd;
-
-	fd = luaL_checkudata(L, 1, GPIO_METATABLE);
-	memset(&set, 0, sizeof(set));
-	gpio_get_pin(L, 2, (void *)&set);
-	if (ioctl(*fd, GPIOUNSET, &set) == -1)
-		gpio_error(L, "GPIOUNSET");
-	return 0;
-}
-
-static int
-gpio_read(lua_State *L)
-{
-	struct gpio_req req;
-	int *fd;
-
-	fd = luaL_checkudata(L, 1, GPIO_METATABLE);
-	memset(&req, 0, sizeof(req));
-	gpio_get_pin(L, 2, &req);
-	if (ioctl(*fd, GPIOREAD, &req) == -1)
-		gpio_error(L, "GPIOREAD");
-	lua_pushinteger(L, req.gp_value);
-	return 1;
-}
-
-
-static int
-gpio_write(lua_State *L)
-{
-	struct gpio_req req;
-	int *fd, val;
-
-	fd = luaL_checkudata(L, 1, GPIO_METATABLE);
-	val = (int)luaL_checkinteger(L, 3);
-	if (val != GPIO_PIN_HIGH && val != GPIO_PIN_LOW)
-		gpio_error(L, "%d: invalid value", val);
-	memset(&req, 0, sizeof(req));
-	gpio_get_pin(L, 2, &req);
-	req.gp_value = val;
-	if (ioctl(*fd, GPIOWRITE, &req) == -1)
-		gpio_error(L, "GPIOWRITE");
-	lua_pushinteger(L, req.gp_value);
-	return 1;
-}
-
-static int
-gpio_toggle(lua_State *L)
-{
-	struct gpio_req req;
-	int *fd;
-
-	fd = luaL_checkudata(L, 1, GPIO_METATABLE);
-	memset(&req, 0, sizeof(req));
-	gpio_get_pin(L, 2, &req);
-	if (ioctl(*fd, GPIOTOGGLE, &req) == -1)
-		gpio_error(L, "GPIOTOGGLE");
-	lua_pushinteger(L, req.gp_value);
-	return 1;
-}
-
-static int
-gpio_attach(lua_State *L)
-{
-	struct gpio_attach attach;
-	int *fd;
-
-	fd = luaL_checkudata(L, 1, GPIO_METATABLE);
-	memset(&attach, 0, sizeof(attach));
-	strlcpy(attach.ga_dvname, luaL_checkstring(L, 2),
-	    sizeof(attach.ga_dvname));
-	attach.ga_offset = (int)luaL_checkinteger(L, 3);
-	attach.ga_mask = (int)luaL_checkinteger(L, 4);
-	if (lua_gettop(L) > 4)
-		attach.ga_flags = (int)luaL_checkinteger(L, 5);
-	else
-		attach.ga_flags = 0;
-
-	if (ioctl(*fd, GPIOATTACH, &attach) == -1)
-		gpio_error(L, "GPIOATTACH");
-	return 0;
-}
-
-struct constant {
-	const char *name;
-	int value;
-};
-
-static const struct constant gpio_constant[] = {
-	/* GPIO pin states */
-	{ "PIN_LOW",		GPIO_PIN_LOW },
-	{ "PIN_HIGH",		GPIO_PIN_HIGH },
-
-	/* GPIO pin configuration flags */
-	{ "PIN_INPUT",		GPIO_PIN_INPUT },
-	{ "PIN_OUTPUT",		GPIO_PIN_OUTPUT },
-	{ "PIN_INOUT",		GPIO_PIN_INOUT },
-	{ "PIN_OPENDRAIN",	GPIO_PIN_OPENDRAIN },
-	{ "PIN_PUSHPULL",	GPIO_PIN_PUSHPULL },
-	{ "PIN_TRISTATE",	GPIO_PIN_TRISTATE },
-	{ "PIN_PULLUP",		GPIO_PIN_PULLUP },
-	{ "PIN_PULLDOWN",	GPIO_PIN_PULLDOWN },
-	{ "PIN_INVIN",		GPIO_PIN_INVIN },
-	{ "PIN_INVOUT",		GPIO_PIN_INVOUT },
-	{ "PIN_USER",		GPIO_PIN_USER },
-	{ "PIN_PULSATE",	GPIO_PIN_PULSATE },
-	{ "PIN_SET",		GPIO_PIN_SET },
-	{ NULL,			0 }
-};
-
-static void
-gpio_set_info(lua_State *L)
-{
-	lua_pushliteral(L, "_COPYRIGHT");
-	lua_pushliteral(L, "Copyright (C) 2011, 2013 Marc Balmer "
-	    "<marc@msys.ch>");
-	lua_settable(L, -3);
-	lua_pushliteral(L, "_DESCRIPTION");
-	lua_pushliteral(L, "GPIO interface for Lua");
-	lua_settable(L, -3);
-	lua_pushliteral(L, "_VERSION");
-	lua_pushliteral(L, "gpio 1.0.2");
-	lua_settable(L, -3);
-}
-
-int luaopen_gpio(lua_State*);
-
-int
-luaopen_gpio(lua_State* L)
-{
-	static const struct luaL_Reg methods[] = {
-		{ "open",	gpio_open },
-		{ NULL,		NULL }
-	};
-	static const struct luaL_Reg gpio_methods[] = {
-		{ "info",	gpio_info },
-		{ "close",	gpio_close },
-		{ "set",	gpio_set },
-		{ "unset",	gpio_unset },
-		{ "read",	gpio_read },
-		{ "write",	gpio_write },
-		{ "toggle",	gpio_toggle },
-		{ "attach",	gpio_attach },
-		{ NULL,		NULL }
-	};
-	int n;
-
-	luaL_newlib(L, methods);
-	luaL_setfuncs(L, gpio_methods, 0);
-	gpio_set_info(L);
-
-	/* The gpio metatable */
-	if (luaL_newmetatable(L, GPIO_METATABLE)) {
-		luaL_setfuncs(L, gpio_methods, 0);
-
-		lua_pushliteral(L, "__gc");
-		lua_pushcfunction(L, gpio_close);
-		lua_settable(L, -3);
-
-		lua_pushliteral(L, "__index");
-		lua_pushvalue(L, -2);
-		lua_settable(L, -3);
-
-		lua_pushliteral(L, "__metatable");
-		lua_pushliteral(L, "must not access this metatable");
-		lua_settable(L, -3);
-	}
-	lua_pop(L, 1);
-
-	for (n = 0; gpio_constant[n].name != NULL; n++) {
-		lua_pushinteger(L, gpio_constant[n].value);
-		lua_setfield(L, -2, gpio_constant[n].name);
-	};
-	return 1;
-}
diff --git a/lib/lua/sqlite/Makefile b/lib/lua/sqlite/Makefile
deleted file mode 100644
index 29ae20820..000000000
--- a/lib/lua/sqlite/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$NetBSD: Makefile,v 1.3 2012/03/03 11:32:14 mbalmer Exp $
-
-LUA_MODULES=		sqlite
-LUA_SRCS.sqlite=	sqlite.c
-
-LUA_DPLIBS+=		sqlite3 \
-			${.CURDIR}/../../../external/public-domain/sqlite/lib
-
-.include <bsd.lua.mk>
diff --git a/lib/lua/sqlite/sqlite.c b/lib/lua/sqlite/sqlite.c
deleted file mode 100644
index e3bc14e78..000000000
--- a/lib/lua/sqlite/sqlite.c
+++ /dev/null
@@ -1,495 +0,0 @@
-/*	$NetBSD: sqlite.c,v 1.7 2014/07/19 18:38:34 lneto Exp $ */
-
-/*
- * Copyright (c) 2011, 2013 Marc Balmer <marc@msys.ch>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-/* SQLite interface for Lua */
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sqlite3.h>
-
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
-
-#define SQLITE_DB_METATABLE "SQLite database connection methods"
-#define SQLITE_STMT_METATABLE "SQLite statement methods"
-
-int luaopen_sqlite(lua_State*);
-
-static __printflike(2, 3) void
-sqlite_error(lua_State *L, const char *fmt, ...)
-{
-	va_list ap;
-	int len;
-	char *msg;
-
-	va_start(ap, fmt);
-	len = vasprintf(&msg, fmt, ap);
-	va_end(ap);
-
-	if (len != -1) {
-		lua_pushstring(L, msg);
-		free(msg);
-	} else
-		lua_pushstring(L, "vasprintf failed");
-	lua_error(L);
-}
-
-static int
-sqlite_initialize(lua_State *L)
-{
-	lua_pushinteger(L, sqlite3_initialize());
-	return 1;
-}
-
-static int
-sqlite_shutdown(lua_State *L)
-{
-	lua_pushinteger(L, sqlite3_shutdown());
-	return 1;
-}
-
-static int
-sqlite_open(lua_State *L)
-{
-	sqlite3 **db;
-
-	db = lua_newuserdata(L, sizeof(sqlite3 *));
-	luaL_getmetatable(L, SQLITE_DB_METATABLE);
-	lua_setmetatable(L, -2);
-
-	if (lua_gettop(L) > 2)
-		lua_pushinteger(L, sqlite3_open_v2(luaL_checkstring(L, -3), db,
-		    (int)luaL_checkinteger(L, -2), NULL));
-	else
-		lua_pushinteger(L, sqlite3_open(luaL_checkstring(L, -2), db));
-	return 2;
-
-}
-
-static int
-sqlite_libversion(lua_State *L)
-{
-	lua_pushstring(L, sqlite3_libversion());
-	return 1;
-}
-
-static int
-sqlite_libversion_number(lua_State *L)
-{
-	lua_pushinteger(L, sqlite3_libversion_number());
-	return 1;
-}
-
-static int
-sqlite_sourceid(lua_State *L)
-{
-	lua_pushstring(L, sqlite3_sourceid());
-	return 1;
-}
-
-static int
-db_close(lua_State *L)
-{
-	sqlite3 **db;
-
-	db = luaL_checkudata(L, 1, SQLITE_DB_METATABLE);
-	lua_pushinteger(L, sqlite3_close(*db));
-	return 1;
-
-}
-
-static int
-db_prepare(lua_State *L)
-{
-	sqlite3 **db;
-	sqlite3_stmt **stmt;
-	const char *sql;
-
-	db = luaL_checkudata(L, 1, SQLITE_DB_METATABLE);
-	stmt = lua_newuserdata(L, sizeof(sqlite3_stmt *));
-	sql = luaL_checkstring(L, 2);
-	lua_pushinteger(L, sqlite3_prepare_v2(*db, sql,
-	    (int)strlen(sql) + 1, stmt, NULL));
-	luaL_getmetatable(L, SQLITE_STMT_METATABLE);
-	lua_setmetatable(L, -3);
-	return 2;
-
-}
-
-static int
-db_exec(lua_State *L)
-{
-	sqlite3 **db;
-
-	db = luaL_checkudata(L, 1, SQLITE_DB_METATABLE);
-	lua_pushinteger(L, sqlite3_exec(*db, lua_tostring(L, 2), NULL,
-	    NULL, NULL));
-	return 1;
-}
-
-static int
-db_errcode(lua_State *L)
-{
-	sqlite3 **db;
-
-	db = luaL_checkudata(L, 1, SQLITE_DB_METATABLE);
-	lua_pushinteger(L, sqlite3_errcode(*db));
-	return 1;
-}
-
-static int
-db_errmsg(lua_State *L)
-{
-	sqlite3 **db;
-
-	db = luaL_checkudata(L, 1, SQLITE_DB_METATABLE);
-	lua_pushstring(L, sqlite3_errmsg(*db));
-	return 1;
-}
-
-static int
-db_get_autocommit(lua_State *L)
-{
-	sqlite3 **db;
-
-	db = luaL_checkudata(L, 1, SQLITE_DB_METATABLE);
-	lua_pushboolean(L, sqlite3_get_autocommit(*db));
-	return 1;
-}
-
-static int
-db_changes(lua_State *L)
-{
-	sqlite3 **db;
-
-	db = luaL_checkudata(L, 1, SQLITE_DB_METATABLE);
-	lua_pushinteger(L, sqlite3_changes(*db));
-	return 1;
-}
-
-static int
-stmt_bind(lua_State *L)
-{
-	sqlite3_stmt **stmt;
-	int pidx;
-
-	stmt = luaL_checkudata(L, 1, SQLITE_STMT_METATABLE);
-	pidx = (int)luaL_checkinteger(L, 2);
-
-	switch (lua_type(L, 3)) {
-	case LUA_TNUMBER:
-		lua_pushinteger(L, sqlite3_bind_double(*stmt, pidx,
-		    lua_tonumber(L, 3)));
-		break;
-	case LUA_TSTRING:
-		lua_pushinteger(L, sqlite3_bind_text(*stmt, pidx,
-		    lua_tostring(L, 3), -1, SQLITE_TRANSIENT));
-		break;
-	case LUA_TNIL:
-		lua_pushinteger(L, sqlite3_bind_null(*stmt, pidx));
-		break;
-	default:
-		sqlite_error(L, "unsupported data type %s",
-		    luaL_typename(L, 3));
-	}
-	return 1;
-}
-
-static int
-stmt_bind_parameter_count(lua_State *L)
-{
-	sqlite3_stmt **stmt;
-
-	stmt = luaL_checkudata(L, 1, SQLITE_STMT_METATABLE);
-	lua_pushinteger(L, sqlite3_bind_parameter_count(*stmt));
-	return 1;
-}
-
-static int
-stmt_bind_parameter_index(lua_State *L)
-{
-	sqlite3_stmt **stmt;
-
-	stmt = luaL_checkudata(L, 1, SQLITE_STMT_METATABLE);
-	lua_pushinteger(L, sqlite3_bind_parameter_index(*stmt,
-	    lua_tostring(L, 2)));
-	return 1;
-}
-
-static int
-stmt_bind_parameter_name(lua_State *L)
-{
-	sqlite3_stmt **stmt;
-	int pidx;
-
-	stmt = luaL_checkudata(L, 1, SQLITE_STMT_METATABLE);
-	pidx = (int)luaL_checkinteger(L, 2);
-	lua_pushstring(L, sqlite3_bind_parameter_name(*stmt, pidx));
-	return 1;
-}
-
-static int
-stmt_step(lua_State *L)
-{
-	sqlite3_stmt **stmt;
-
-	stmt = luaL_checkudata(L, 1, SQLITE_STMT_METATABLE);
-	lua_pushinteger(L, sqlite3_step(*stmt));
-	return 1;
-}
-
-static int
-stmt_column_name(lua_State *L)
-{
-	sqlite3_stmt **stmt;
-	int cidx;
-
-	stmt = luaL_checkudata(L, 1, SQLITE_STMT_METATABLE);
-	cidx = (int)luaL_checkinteger(L, 2) - 1;
-
-	lua_pushstring(L, sqlite3_column_name(*stmt, cidx));
-	return 1;
-}
-
-static int
-stmt_column_count(lua_State *L)
-{
-	sqlite3_stmt **stmt;
-
-	stmt = luaL_checkudata(L, 1, SQLITE_STMT_METATABLE);
-	lua_pushinteger(L, sqlite3_column_count(*stmt));
-	return 1;
-}
-
-static int
-stmt_column(lua_State *L)
-{
-	sqlite3_stmt **stmt;
-	int cidx;
-
-	stmt = luaL_checkudata(L, 1, SQLITE_STMT_METATABLE);
-	cidx = (int)luaL_checkinteger(L, 2) - 1;
-
-	switch (sqlite3_column_type(*stmt, cidx)) {
-	case SQLITE_INTEGER:
-		lua_pushinteger(L, sqlite3_column_int(*stmt, cidx));
-		break;
-	case SQLITE_FLOAT:
-		lua_pushnumber(L, sqlite3_column_double(*stmt, cidx));
-		break;
-	case SQLITE_TEXT:
-		lua_pushstring(L, (const char *)sqlite3_column_text(*stmt,
-		    cidx));
-		break;
-	case SQLITE_BLOB:
-	case SQLITE_NULL:
-		lua_pushnil(L);
-		break;
-	}
-	return 1;
-}
-
-static int
-stmt_reset(lua_State *L)
-{
-	sqlite3_stmt **stmt;
-
-	stmt = luaL_checkudata(L, 1, SQLITE_STMT_METATABLE);
-	sqlite3_reset(*stmt);
-	return 0;
-}
-
-static int
-stmt_clear_bindings(lua_State *L)
-{
-	sqlite3_stmt **stmt;
-
-	stmt = luaL_checkudata(L, 1, SQLITE_STMT_METATABLE);
-	sqlite3_clear_bindings(*stmt);
-	return 0;
-}
-
-static int
-stmt_finalize(lua_State *L)
-{
-	sqlite3_stmt **stmt;
-
-	stmt = luaL_checkudata(L, 1, SQLITE_STMT_METATABLE);
-	sqlite3_finalize(*stmt);
-	return 0;
-}
-
-struct constant {
-	const char *name;
-	int value;
-};
-
-static const struct constant sqlite_constant[] = {
-	/* SQLite return codes */
-	{ "OK",			SQLITE_OK },
-	{ "ERROR",		SQLITE_ERROR },
-	{ "INTERNAL",		SQLITE_INTERNAL },
-	{ "PERM",		SQLITE_PERM },
-	{ "ABORT",		SQLITE_ABORT },
-	{ "BUSY",		SQLITE_BUSY },
-	{ "LOCKED",		SQLITE_LOCKED },
-	{ "NOMEM",		SQLITE_NOMEM },
-	{ "READONLY",		SQLITE_READONLY },
-	{ "INTERRUPT",		SQLITE_INTERRUPT },
-	{ "IOERR",		SQLITE_IOERR },
-	{ "CORRUPT",		SQLITE_CORRUPT },
-	{ "NOTFOUND",		SQLITE_NOTFOUND },
-	{ "FULL",		SQLITE_FULL },
-	{ "CANTOPEN",		SQLITE_CANTOPEN },
-	{ "PROTOCOL",		SQLITE_PROTOCOL },
-	{ "EMPTY",		SQLITE_EMPTY },
-	{ "SCHEMA",		SQLITE_SCHEMA },
-	{ "TOOBIG",		SQLITE_TOOBIG },
-	{ "CONSTRAINT",		SQLITE_CONSTRAINT },
-	{ "MISMATCH",		SQLITE_MISMATCH },
-	{ "MISUSE",		SQLITE_MISUSE },
-	{ "NOLFS",		SQLITE_NOLFS },
-	{ "AUTH",		SQLITE_AUTH },
-	{ "FORMAT",		SQLITE_FORMAT },
-	{ "RANGE",		SQLITE_RANGE },
-	{ "NOTADB",		SQLITE_NOTADB },
-	{ "ROW",		SQLITE_ROW },
-	{ "DONE",		SQLITE_DONE },
-
-	/* File modes */
-	{ "OPEN_READONLY",	SQLITE_OPEN_READONLY },
-	{ "OPEN_READWRITE",	SQLITE_OPEN_READWRITE },
-	{ "OPEN_CREATE",	SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE },
-
-	{ NULL,			0 }
-};
-
-static void
-gpio_set_info(lua_State *L)
-{
-	lua_pushliteral(L, "_COPYRIGHT");
-	lua_pushliteral(L, "Copyright (C) 2011, 2012, 2013 by "
-	    "Marc Balmer <marc@msys.ch>");
-	lua_settable(L, -3);
-	lua_pushliteral(L, "_DESCRIPTION");
-	lua_pushliteral(L, "SQLite interface for Lua");
-	lua_settable(L, -3);
-	lua_pushliteral(L, "_VERSION");
-	lua_pushliteral(L, "sqlite 1.0.3");
-	lua_settable(L, -3);
-}
-
-int
-luaopen_sqlite(lua_State* L)
-{
-	static const struct luaL_Reg sqlite_methods[] = {
-		{ "initialize",			sqlite_initialize },
-		{ "shutdown",			sqlite_shutdown },
-		{ "open",			sqlite_open },
-		{ "libversion",			sqlite_libversion },
-		{ "libversion_number",		sqlite_libversion_number },
-		{ "sourceid",			sqlite_sourceid },
-		{ NULL,				NULL }
-	};
-	static const struct luaL_Reg db_methods[] = {
-		{ "close",			db_close },
-		{ "prepare",			db_prepare },
-		{ "exec",			db_exec },
-		{ "errcode",			db_errcode },
-		{ "errmsg",			db_errmsg },
-		{ "get_autocommit",		db_get_autocommit },
-		{ "changes",			db_changes },
-		{ NULL,				NULL }
-	};
-	static const struct luaL_Reg stmt_methods[] = {
-		{ "bind",			stmt_bind },
-		{ "bind_parameter_count",	stmt_bind_parameter_count },
-		{ "bind_parameter_index",	stmt_bind_parameter_index },
-		{ "bind_parameter_name",	stmt_bind_parameter_name },
-		{ "step",			stmt_step },
-		{ "column",			stmt_column },
-		{ "reset",			stmt_reset },
-		{ "clear_bindings",		stmt_clear_bindings },
-		{ "finalize",			stmt_finalize },
-		{ "column_name",		stmt_column_name },
-		{ "column_count",		stmt_column_count },
-		{ NULL,		NULL }
-	};
-	int n;
-
-	sqlite3_initialize();
-
-	luaL_newlib(L, sqlite_methods);
-	luaL_setfuncs(L, db_methods, 0);
-	luaL_setfuncs(L, stmt_methods, 0);
-	gpio_set_info(L);
-
-	/* The database connection metatable */
-	if (luaL_newmetatable(L, SQLITE_DB_METATABLE)) {
-		luaL_setfuncs(L, db_methods, 0);
-
-		lua_pushliteral(L, "__gc");
-		lua_pushcfunction(L, db_close);
-		lua_settable(L, -3);
-
-		lua_pushliteral(L, "__index");
-		lua_pushvalue(L, -2);
-		lua_settable(L, -3);
-
-		lua_pushliteral(L, "__metatable");
-		lua_pushliteral(L, "must not access this metatable");
-		lua_settable(L, -3);
-	}
-	lua_pop(L, 1);
-
-	/* The statement metatable */
-	if (luaL_newmetatable(L, SQLITE_STMT_METATABLE)) {
-		luaL_setfuncs(L, stmt_methods, 0);
-
-		lua_pushliteral(L, "__gc");
-		lua_pushcfunction(L, stmt_finalize);
-		lua_settable(L, -3);
-
-		lua_pushliteral(L, "__index");
-		lua_pushvalue(L, -2);
-		lua_settable(L, -3);
-
-		lua_pushliteral(L, "__metatable");
-		lua_pushliteral(L, "must not access this metatable");
-		lua_settable(L, -3);
-	}
-	lua_pop(L, 1);
-
-	for (n = 0; sqlite_constant[n].name != NULL; n++) {
-		lua_pushinteger(L, sqlite_constant[n].value);
-		lua_setfield(L, -2, sqlite_constant[n].name);
-	};
-	return 1;
-}
diff --git a/lib/lua/syslog/Makefile b/lib/lua/syslog/Makefile
deleted file mode 100644
index 172ce1230..000000000
--- a/lib/lua/syslog/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2013/11/12 14:32:03 mbalmer Exp $
-
-LUA_MODULES=		syslog
-LUA_SRCS.syslog=	syslog.c
-
-.include <bsd.lua.mk>
diff --git a/lib/lua/syslog/syslog.c b/lib/lua/syslog/syslog.c
deleted file mode 100644
index f182838f9..000000000
--- a/lib/lua/syslog/syslog.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*	$NetBSD: syslog.c,v 1.2 2015/02/02 14:03:05 lneto Exp $ */
-
-/*
- * Copyright (c) 2013 Marc Balmer <marc@msys.ch>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list 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.
- */
-
-/* Lua binding for syslog */
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <lua.h>
-#include <lauxlib.h>
-#include <stdlib.h>
-#include <syslog.h>
-#include <unistd.h>
-
-int luaopen_syslog(lua_State *);
-
-static int
-syslog_openlog(lua_State *L)
-{
-	const char *ident;
-	int option;
-	int facility;
-
-	ident = luaL_checkstring(L, 1);
-	option = luaL_checkinteger(L, 2);
-	facility = luaL_checkinteger(L, 3);
-	openlog(ident, option, facility);
-	return 0;
-}
-
-static int
-syslog_syslog(lua_State *L)
-{
-	syslog((int) luaL_checkinteger(L, 1), "%s", luaL_checkstring(L, 2));
-	return 0;
-}
-
-static int
-syslog_closelog(lua_State *L)
-{
-	closelog();
-	return 0;
-}
-
-static int
-syslog_setlogmask(lua_State *L)
-{
-	lua_pushinteger(L, setlogmask((int) luaL_checkinteger(L, 1)));
-	return 1;
-}
-
-static void
-syslog_set_info(lua_State *L)
-{
-	lua_pushliteral(L, "_COPYRIGHT");
-	lua_pushliteral(L, "Copyright (C) 2013 by "
-	    "Marc Balmer <marc@msys.ch>");
-	lua_settable(L, -3);
-	lua_pushliteral(L, "_DESCRIPTION");
-	lua_pushliteral(L, "syslog binding for Lua");
-	lua_settable(L, -3);
-	lua_pushliteral(L, "_VERSION");
-	lua_pushliteral(L, "syslog 1.0.0");
-	lua_settable(L, -3);
-}
-
-struct constant {
-	const char *name;
-	int value;
-};
-
-#define CONSTANT(NAME)		{ #NAME, NAME }
-
-static struct constant syslog_constant[] = {
-	/* syslog options */
-	CONSTANT(LOG_CONS),
-	CONSTANT(LOG_NDELAY),
-	CONSTANT(LOG_NOWAIT),
-	CONSTANT(LOG_ODELAY),
-	CONSTANT(LOG_PERROR),
-	CONSTANT(LOG_PID),
-
-	/* syslog facilities */
-	CONSTANT(LOG_AUTH),
-	CONSTANT(LOG_AUTHPRIV),
-	CONSTANT(LOG_CRON),
-	CONSTANT(LOG_DAEMON),
-	CONSTANT(LOG_FTP),
-	CONSTANT(LOG_KERN),
-	CONSTANT(LOG_LOCAL0),
-	CONSTANT(LOG_LOCAL1),
-	CONSTANT(LOG_LOCAL2),
-	CONSTANT(LOG_LOCAL3),
-	CONSTANT(LOG_LOCAL4),
-	CONSTANT(LOG_LOCAL5),
-	CONSTANT(LOG_LOCAL6),
-	CONSTANT(LOG_LOCAL7),
-	CONSTANT(LOG_LPR),
-	CONSTANT(LOG_MAIL),
-	CONSTANT(LOG_NEWS),
-	CONSTANT(LOG_SYSLOG),
-	CONSTANT(LOG_USER),
-	CONSTANT(LOG_UUCP),
-
-	/* syslog levels */
-	CONSTANT(LOG_EMERG),
-	CONSTANT(LOG_ALERT),
-	CONSTANT(LOG_CRIT),
-	CONSTANT(LOG_ERR),
-	CONSTANT(LOG_WARNING),
-	CONSTANT(LOG_NOTICE),
-	CONSTANT(LOG_INFO),
-	CONSTANT(LOG_DEBUG),
-
-	{ NULL, 0 }
-};
-
-int
-luaopen_syslog(lua_State *L)
-{
-	int n;
-	struct luaL_Reg luasyslog[] = {
-		{ "openlog",	syslog_openlog },
-		{ "syslog",	syslog_syslog },
-		{ "closelog",	syslog_closelog },
-		{ "setlogmask",	syslog_setlogmask },
-		{ NULL, NULL }
-	};
-
-#if LUA_VERSION_NUM >= 502
-	luaL_newlib(L, luasyslog);
-#else
-	luaL_register(L, "syslog", luasyslog);
-#endif
-	syslog_set_info(L);
-	for (n = 0; syslog_constant[n].name != NULL; n++) {
-		lua_pushinteger(L, syslog_constant[n].value);
-		lua_setfield(L, -2, syslog_constant[n].name);
-	};
-	return 1;
-}